GeoDirectory /
geodirectory
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | /** |
| 11 | 11 | * Get All Plugin functions from WordPress |
| 12 | 12 | */ |
| 13 | -include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); |
|
| 13 | +include_once(ABSPATH.'wp-admin/includes/plugin.php'); |
|
| 14 | 14 | |
| 15 | 15 | /*-----------------------------------------------------------------------------------*/ |
| 16 | 16 | /* Helper functions */ |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | * @return string example url eg: http://wpgeo.directory/wp-content/plugins/geodirectory |
| 28 | 28 | */ |
| 29 | 29 | function geodir_plugin_url() {
|
| 30 | - return plugins_url( '', dirname( __FILE__ ) ); |
|
| 30 | + return plugins_url('', dirname(__FILE__));
|
|
| 31 | 31 | /* |
| 32 | 32 | if ( is_ssl() ) : |
| 33 | 33 | return str_replace( 'http://', 'https://', WP_PLUGIN_URL ) . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) ); |
@@ -47,10 +47,10 @@ discard block |
||
| 47 | 47 | * @return string example url eg: /home/geo/public_html/wp-content/plugins/geodirectory |
| 48 | 48 | */ |
| 49 | 49 | function geodir_plugin_path() {
|
| 50 | - if ( defined( 'GD_TESTING_MODE' ) && GD_TESTING_MODE ) {
|
|
| 51 | - return dirname( dirname( __FILE__ ) ); |
|
| 50 | + if (defined('GD_TESTING_MODE') && GD_TESTING_MODE) {
|
|
| 51 | + return dirname(dirname(__FILE__)); |
|
| 52 | 52 | } else {
|
| 53 | - return WP_PLUGIN_DIR . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) ); |
|
| 53 | + return WP_PLUGIN_DIR."/".plugin_basename(dirname(dirname(__FILE__))); |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | |
@@ -65,10 +65,10 @@ discard block |
||
| 65 | 65 | * @return bool true or false. |
| 66 | 66 | * @todo check if this is faster than normal WP check and remove if not. |
| 67 | 67 | */ |
| 68 | -function geodir_is_plugin_active( $plugin ) {
|
|
| 69 | - $active_plugins = get_option( 'active_plugins' ); |
|
| 70 | - foreach ( $active_plugins as $key => $active_plugin ) {
|
|
| 71 | - if ( strstr( $active_plugin, $plugin ) ) {
|
|
| 68 | +function geodir_is_plugin_active($plugin) {
|
|
| 69 | + $active_plugins = get_option('active_plugins');
|
|
| 70 | + foreach ($active_plugins as $key => $active_plugin) {
|
|
| 71 | + if (strstr($active_plugin, $plugin)) {
|
|
| 72 | 72 | return true; |
| 73 | 73 | } |
| 74 | 74 | } |
@@ -90,8 +90,8 @@ discard block |
||
| 90 | 90 | * |
| 91 | 91 | * @return bool|int|string the formatted date. |
| 92 | 92 | */ |
| 93 | -function geodir_get_formated_date( $date ) {
|
|
| 94 | - return mysql2date( get_option( 'date_format' ), $date ); |
|
| 93 | +function geodir_get_formated_date($date) {
|
|
| 94 | + return mysql2date(get_option('date_format'), $date);
|
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | /** |
@@ -107,8 +107,8 @@ discard block |
||
| 107 | 107 | * |
| 108 | 108 | * @return bool|int|string the formatted time. |
| 109 | 109 | */ |
| 110 | -function geodir_get_formated_time( $time ) {
|
|
| 111 | - return mysql2date( get_option( 'time_format' ), $time, $translate = true ); |
|
| 110 | +function geodir_get_formated_time($time) {
|
|
| 111 | + return mysql2date(get_option('time_format'), $time, $translate = true);
|
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | |
@@ -126,35 +126,35 @@ discard block |
||
| 126 | 126 | * |
| 127 | 127 | * @return string Formatted link. |
| 128 | 128 | */ |
| 129 | -function geodir_getlink( $url, $params = array(), $use_existing_arguments = false ) {
|
|
| 130 | - if ( $use_existing_arguments ) {
|
|
| 129 | +function geodir_getlink($url, $params = array(), $use_existing_arguments = false) {
|
|
| 130 | + if ($use_existing_arguments) {
|
|
| 131 | 131 | $params = $params + $_GET; |
| 132 | 132 | } |
| 133 | - if ( ! $params ) {
|
|
| 133 | + if (!$params) {
|
|
| 134 | 134 | return $url; |
| 135 | 135 | } |
| 136 | 136 | $link = $url; |
| 137 | - if ( strpos( $link, '?' ) === false ) {
|
|
| 137 | + if (strpos($link, '?') === false) {
|
|
| 138 | 138 | $link .= '?'; |
| 139 | 139 | } //If there is no '?' add one at the end |
| 140 | - elseif ( strpos( $link, '//maps.google.com/maps/api/js?language=' ) ) {
|
|
| 140 | + elseif (strpos($link, '//maps.google.com/maps/api/js?language=')) {
|
|
| 141 | 141 | $link .= '&'; |
| 142 | 142 | } //If there is no '&' at the END, add one. |
| 143 | - elseif ( ! preg_match( '/(\?|\&(amp;)?)$/', $link ) ) {
|
|
| 143 | + elseif (!preg_match('/(\?|\&(amp;)?)$/', $link)) {
|
|
| 144 | 144 | $link .= '&'; |
| 145 | 145 | } //If there is no '&' at the END, add one. |
| 146 | 146 | |
| 147 | 147 | $params_arr = array(); |
| 148 | - foreach ( $params as $key => $value ) {
|
|
| 149 | - if ( gettype( $value ) == 'array' ) { //Handle array data properly
|
|
| 150 | - foreach ( $value as $val ) {
|
|
| 151 | - $params_arr[] = $key . '[]=' . urlencode( $val ); |
|
| 148 | + foreach ($params as $key => $value) {
|
|
| 149 | + if (gettype($value) == 'array') { //Handle array data properly
|
|
| 150 | + foreach ($value as $val) {
|
|
| 151 | + $params_arr[] = $key.'[]='.urlencode($val); |
|
| 152 | 152 | } |
| 153 | 153 | } else {
|
| 154 | - $params_arr[] = $key . '=' . urlencode( $value ); |
|
| 154 | + $params_arr[] = $key.'='.urlencode($value); |
|
| 155 | 155 | } |
| 156 | 156 | } |
| 157 | - $link .= implode( '&', $params_arr ); |
|
| 157 | + $link .= implode('&', $params_arr);
|
|
| 158 | 158 | |
| 159 | 159 | return $link; |
| 160 | 160 | } |
@@ -171,18 +171,18 @@ discard block |
||
| 171 | 171 | * |
| 172 | 172 | * @return string Listing page url if valid. Otherwise home url will be returned. |
| 173 | 173 | */ |
| 174 | -function geodir_get_addlisting_link( $post_type = '' ) {
|
|
| 174 | +function geodir_get_addlisting_link($post_type = '') {
|
|
| 175 | 175 | global $wpdb; |
| 176 | 176 | |
| 177 | 177 | //$check_pkg = $wpdb->get_var("SELECT pid FROM ".GEODIR_PRICE_TABLE." WHERE post_type='".$post_type."' and status != '0'");
|
| 178 | 178 | $check_pkg = 1; |
| 179 | - if ( post_type_exists( $post_type ) && $check_pkg ) {
|
|
| 179 | + if (post_type_exists($post_type) && $check_pkg) {
|
|
| 180 | 180 | |
| 181 | - $add_listing_link = get_page_link( geodir_add_listing_page_id() ); |
|
| 181 | + $add_listing_link = get_page_link(geodir_add_listing_page_id()); |
|
| 182 | 182 | |
| 183 | - return esc_url( add_query_arg( array( 'listing_type' => $post_type ), $add_listing_link ) ); |
|
| 183 | + return esc_url(add_query_arg(array('listing_type' => $post_type), $add_listing_link));
|
|
| 184 | 184 | } else {
|
| 185 | - return get_bloginfo( 'url' ); |
|
| 185 | + return get_bloginfo('url');
|
|
| 186 | 186 | } |
| 187 | 187 | } |
| 188 | 188 | |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | if (!empty($_SERVER['PHP_SELF']) && !empty($_SERVER['REQUEST_URI'])) {
|
| 211 | 211 | // To build the entire URI we need to prepend the protocol, and the http host |
| 212 | 212 | // to the URI string. |
| 213 | - $pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; |
|
| 213 | + $pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; |
|
| 214 | 214 | } else {
|
| 215 | 215 | /* |
| 216 | 216 | * Since we do not have REQUEST_URI to work with, we will assume we are |
@@ -219,11 +219,11 @@ discard block |
||
| 219 | 219 | * |
| 220 | 220 | * IIS uses the SCRIPT_NAME variable instead of a REQUEST_URI variable... thanks, MS |
| 221 | 221 | */ |
| 222 | - $pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']; |
|
| 222 | + $pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME']; |
|
| 223 | 223 | |
| 224 | 224 | // If the query string exists append it to the URI string |
| 225 | 225 | if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
|
| 226 | - $pageURL .= '?' . $_SERVER['QUERY_STRING']; |
|
| 226 | + $pageURL .= '?'.$_SERVER['QUERY_STRING']; |
|
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | 229 | |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | * |
| 235 | 235 | * @param string $pageURL The URL of the current page. |
| 236 | 236 | */ |
| 237 | - return apply_filters( 'geodir_curPageURL', $pageURL ); |
|
| 237 | + return apply_filters('geodir_curPageURL', $pageURL);
|
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | /** |
@@ -249,12 +249,12 @@ discard block |
||
| 249 | 249 | * |
| 250 | 250 | * @return string Cleaned variable. |
| 251 | 251 | */ |
| 252 | -function geodir_clean( $string ) {
|
|
| 252 | +function geodir_clean($string) {
|
|
| 253 | 253 | |
| 254 | - $string = trim( strip_tags( stripslashes( $string ) ) ); |
|
| 255 | - $string = str_replace( " ", "-", $string ); // Replaces all spaces with hyphens. |
|
| 256 | - $string = preg_replace( '/[^A-Za-z0-9\-\_]/', '', $string ); // Removes special chars. |
|
| 257 | - $string = preg_replace( '/-+/', '-', $string ); // Replaces multiple hyphens with single one. |
|
| 254 | + $string = trim(strip_tags(stripslashes($string))); |
|
| 255 | + $string = str_replace(" ", "-", $string); // Replaces all spaces with hyphens.
|
|
| 256 | + $string = preg_replace('/[^A-Za-z0-9\-\_]/', '', $string); // Removes special chars.
|
|
| 257 | + $string = preg_replace('/-+/', '-', $string); // Replaces multiple hyphens with single one.
|
|
| 258 | 258 | |
| 259 | 259 | return $string; |
| 260 | 260 | } |
@@ -268,13 +268,13 @@ discard block |
||
| 268 | 268 | */ |
| 269 | 269 | function geodir_get_weekday() {
|
| 270 | 270 | return array( |
| 271 | - __( 'Sunday', 'geodirectory' ), |
|
| 272 | - __( 'Monday', 'geodirectory' ), |
|
| 273 | - __( 'Tuesday', 'geodirectory' ), |
|
| 274 | - __( 'Wednesday', 'geodirectory' ), |
|
| 275 | - __( 'Thursday', 'geodirectory' ), |
|
| 276 | - __( 'Friday', 'geodirectory' ), |
|
| 277 | - __( 'Saturday', 'geodirectory' ) |
|
| 271 | + __('Sunday', 'geodirectory'),
|
|
| 272 | + __('Monday', 'geodirectory'),
|
|
| 273 | + __('Tuesday', 'geodirectory'),
|
|
| 274 | + __('Wednesday', 'geodirectory'),
|
|
| 275 | + __('Thursday', 'geodirectory'),
|
|
| 276 | + __('Friday', 'geodirectory'),
|
|
| 277 | + __('Saturday', 'geodirectory')
|
|
| 278 | 278 | ); |
| 279 | 279 | } |
| 280 | 280 | |
@@ -287,11 +287,11 @@ discard block |
||
| 287 | 287 | */ |
| 288 | 288 | function geodir_get_weeks() {
|
| 289 | 289 | return array( |
| 290 | - __( 'First', 'geodirectory' ), |
|
| 291 | - __( 'Second', 'geodirectory' ), |
|
| 292 | - __( 'Third', 'geodirectory' ), |
|
| 293 | - __( 'Fourth', 'geodirectory' ), |
|
| 294 | - __( 'Last', 'geodirectory' ) |
|
| 290 | + __('First', 'geodirectory'),
|
|
| 291 | + __('Second', 'geodirectory'),
|
|
| 292 | + __('Third', 'geodirectory'),
|
|
| 293 | + __('Fourth', 'geodirectory'),
|
|
| 294 | + __('Last', 'geodirectory')
|
|
| 295 | 295 | ); |
| 296 | 296 | } |
| 297 | 297 | |
@@ -310,112 +310,112 @@ discard block |
||
| 310 | 310 | * |
| 311 | 311 | * @return bool If valid returns true. Otherwise false. |
| 312 | 312 | */ |
| 313 | -function geodir_is_page( $gdpage = '' ) {
|
|
| 313 | +function geodir_is_page($gdpage = '') {
|
|
| 314 | 314 | |
| 315 | 315 | global $wp_query, $post, $wp; |
| 316 | 316 | //if(!is_admin()): |
| 317 | 317 | |
| 318 | - switch ( $gdpage ): |
|
| 318 | + switch ($gdpage): |
|
| 319 | 319 | case 'add-listing': |
| 320 | 320 | |
| 321 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_add_listing_page_id() ) {
|
|
| 321 | + if (is_page() && get_query_var('page_id') == geodir_add_listing_page_id()) {
|
|
| 322 | 322 | return true; |
| 323 | - } elseif ( is_page() && isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {
|
|
| 323 | + } elseif (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
|
|
| 324 | 324 | return true; |
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | break; |
| 328 | 328 | case 'preview': |
| 329 | - if ( ( is_page() && get_query_var( 'page_id' ) == geodir_preview_page_id() ) && isset( $_REQUEST['listing_type'] ) |
|
| 330 | - && in_array( $_REQUEST['listing_type'], geodir_get_posttypes() ) |
|
| 329 | + if ((is_page() && get_query_var('page_id') == geodir_preview_page_id()) && isset($_REQUEST['listing_type'])
|
|
| 330 | + && in_array($_REQUEST['listing_type'], geodir_get_posttypes()) |
|
| 331 | 331 | ) {
|
| 332 | 332 | return true; |
| 333 | 333 | } |
| 334 | 334 | break; |
| 335 | 335 | case 'listing-success': |
| 336 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_success_page_id() ) {
|
|
| 336 | + if (is_page() && get_query_var('page_id') == geodir_success_page_id()) {
|
|
| 337 | 337 | return true; |
| 338 | 338 | } |
| 339 | 339 | break; |
| 340 | 340 | case 'detail': |
| 341 | - $post_type = get_query_var( 'post_type' ); |
|
| 342 | - if ( is_array( $post_type ) ) {
|
|
| 343 | - $post_type = reset( $post_type ); |
|
| 341 | + $post_type = get_query_var('post_type');
|
|
| 342 | + if (is_array($post_type)) {
|
|
| 343 | + $post_type = reset($post_type); |
|
| 344 | 344 | } |
| 345 | - if ( is_single() && in_array( $post_type, geodir_get_posttypes() ) ) {
|
|
| 345 | + if (is_single() && in_array($post_type, geodir_get_posttypes())) {
|
|
| 346 | 346 | return true; |
| 347 | 347 | } |
| 348 | 348 | break; |
| 349 | 349 | case 'pt': |
| 350 | - $post_type = get_query_var( 'post_type' ); |
|
| 351 | - if ( is_array( $post_type ) ) {
|
|
| 352 | - $post_type = reset( $post_type ); |
|
| 350 | + $post_type = get_query_var('post_type');
|
|
| 351 | + if (is_array($post_type)) {
|
|
| 352 | + $post_type = reset($post_type); |
|
| 353 | 353 | } |
| 354 | - if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) && ! is_tax() ) {
|
|
| 354 | + if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes()) && !is_tax()) {
|
|
| 355 | 355 | return true; |
| 356 | 356 | } |
| 357 | 357 | |
| 358 | 358 | break; |
| 359 | 359 | case 'listing': |
| 360 | - if ( is_tax() && geodir_get_taxonomy_posttype() ) {
|
|
| 360 | + if (is_tax() && geodir_get_taxonomy_posttype()) {
|
|
| 361 | 361 | global $current_term, $taxonomy, $term; |
| 362 | 362 | |
| 363 | 363 | return true; |
| 364 | 364 | } |
| 365 | - $post_type = get_query_var( 'post_type' ); |
|
| 366 | - if ( is_array( $post_type ) ) {
|
|
| 367 | - $post_type = reset( $post_type ); |
|
| 365 | + $post_type = get_query_var('post_type');
|
|
| 366 | + if (is_array($post_type)) {
|
|
| 367 | + $post_type = reset($post_type); |
|
| 368 | 368 | } |
| 369 | - if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) ) {
|
|
| 369 | + if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes())) {
|
|
| 370 | 370 | return true; |
| 371 | 371 | } |
| 372 | 372 | |
| 373 | 373 | break; |
| 374 | 374 | case 'home': |
| 375 | 375 | |
| 376 | - if ( ( is_page() && get_query_var( 'page_id' ) == geodir_home_page_id() ) || is_page_geodir_home() ) {
|
|
| 376 | + if ((is_page() && get_query_var('page_id') == geodir_home_page_id()) || is_page_geodir_home()) {
|
|
| 377 | 377 | return true; |
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | break; |
| 381 | 381 | case 'location': |
| 382 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_location_page_id() ) {
|
|
| 382 | + if (is_page() && get_query_var('page_id') == geodir_location_page_id()) {
|
|
| 383 | 383 | return true; |
| 384 | 384 | } |
| 385 | 385 | break; |
| 386 | 386 | case 'author': |
| 387 | - if ( is_author() && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 387 | + if (is_author() && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 388 | 388 | return true; |
| 389 | 389 | } |
| 390 | 390 | |
| 391 | - if ( function_exists( 'bp_loggedin_user_id' ) && function_exists( 'bp_displayed_user_id' ) && $my_id = (int) bp_loggedin_user_id() ) {
|
|
| 392 | - if ( ( (bool) bp_is_current_component( 'listings' ) || (bool) bp_is_current_component( 'favorites' ) ) && $my_id > 0 && $my_id == (int) bp_displayed_user_id() ) {
|
|
| 391 | + if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int) bp_loggedin_user_id()) {
|
|
| 392 | + if (((bool) bp_is_current_component('listings') || (bool) bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int) bp_displayed_user_id()) {
|
|
| 393 | 393 | return true; |
| 394 | 394 | } |
| 395 | 395 | } |
| 396 | 396 | break; |
| 397 | 397 | case 'search': |
| 398 | - if ( is_search() && isset( $_REQUEST['geodir_search'] ) ) {
|
|
| 398 | + if (is_search() && isset($_REQUEST['geodir_search'])) {
|
|
| 399 | 399 | return true; |
| 400 | 400 | } |
| 401 | 401 | break; |
| 402 | 402 | case 'info': |
| 403 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_info_page_id() ) {
|
|
| 403 | + if (is_page() && get_query_var('page_id') == geodir_info_page_id()) {
|
|
| 404 | 404 | return true; |
| 405 | 405 | } |
| 406 | 406 | break; |
| 407 | 407 | case 'login': |
| 408 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_login_page_id() ) {
|
|
| 408 | + if (is_page() && get_query_var('page_id') == geodir_login_page_id()) {
|
|
| 409 | 409 | return true; |
| 410 | 410 | } |
| 411 | 411 | break; |
| 412 | 412 | case 'checkout': |
| 413 | - if ( is_page() && function_exists( 'geodir_payment_checkout_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_checkout_page_id() ) {
|
|
| 413 | + if (is_page() && function_exists('geodir_payment_checkout_page_id') && get_query_var('page_id') == geodir_payment_checkout_page_id()) {
|
|
| 414 | 414 | return true; |
| 415 | 415 | } |
| 416 | 416 | break; |
| 417 | 417 | case 'invoices': |
| 418 | - if ( is_page() && function_exists( 'geodir_payment_invoices_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_invoices_page_id() ) {
|
|
| 418 | + if (is_page() && function_exists('geodir_payment_invoices_page_id') && get_query_var('page_id') == geodir_payment_invoices_page_id()) {
|
|
| 419 | 419 | return true; |
| 420 | 420 | } |
| 421 | 421 | break; |
@@ -440,25 +440,25 @@ discard block |
||
| 440 | 440 | * |
| 441 | 441 | * @param object $wp WordPress object. |
| 442 | 442 | */ |
| 443 | -function geodir_set_is_geodir_page( $wp ) {
|
|
| 444 | - if ( ! is_admin() ) {
|
|
| 443 | +function geodir_set_is_geodir_page($wp) {
|
|
| 444 | + if (!is_admin()) {
|
|
| 445 | 445 | //$wp->query_vars['gd_is_geodir_page'] = false; |
| 446 | 446 | //print_r() |
| 447 | - if ( empty( $wp->query_vars ) || ! array_diff( array_keys( $wp->query_vars ), array( |
|
| 447 | + if (empty($wp->query_vars) || !array_diff(array_keys($wp->query_vars), array( |
|
| 448 | 448 | 'preview', |
| 449 | 449 | 'page', |
| 450 | 450 | 'paged', |
| 451 | 451 | 'cpage' |
| 452 | - ) ) |
|
| 452 | + )) |
|
| 453 | 453 | ) {
|
| 454 | - if ( geodir_is_page( 'home' ) ) {
|
|
| 454 | + if (geodir_is_page('home')) {
|
|
| 455 | 455 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 456 | 456 | } |
| 457 | 457 | |
| 458 | 458 | |
| 459 | 459 | } |
| 460 | 460 | |
| 461 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['page_id'] ) ) {
|
|
| 461 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['page_id'])) {
|
|
| 462 | 462 | if ( |
| 463 | 463 | $wp->query_vars['page_id'] == geodir_add_listing_page_id() |
| 464 | 464 | || $wp->query_vars['page_id'] == geodir_preview_page_id() |
@@ -467,26 +467,26 @@ discard block |
||
| 467 | 467 | || $wp->query_vars['page_id'] == geodir_home_page_id() |
| 468 | 468 | || $wp->query_vars['page_id'] == geodir_info_page_id() |
| 469 | 469 | || $wp->query_vars['page_id'] == geodir_login_page_id() |
| 470 | - || ( function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() ) |
|
| 471 | - || ( function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() ) |
|
| 470 | + || (function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())
|
|
| 471 | + || (function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())
|
|
| 472 | 472 | ) {
|
| 473 | 473 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 474 | 474 | } |
| 475 | 475 | } |
| 476 | 476 | |
| 477 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['pagename'] ) ) {
|
|
| 478 | - $page = get_page_by_path( $wp->query_vars['pagename'] ); |
|
| 477 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['pagename'])) {
|
|
| 478 | + $page = get_page_by_path($wp->query_vars['pagename']); |
|
| 479 | 479 | |
| 480 | - if ( ! empty( $page ) && ( |
|
| 480 | + if (!empty($page) && ( |
|
| 481 | 481 | $page->ID == geodir_add_listing_page_id() |
| 482 | 482 | || $page->ID == geodir_preview_page_id() |
| 483 | 483 | || $page->ID == geodir_success_page_id() |
| 484 | 484 | || $page->ID == geodir_location_page_id() |
| 485 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_home_page_id() ) |
|
| 486 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_info_page_id() ) |
|
| 487 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_login_page_id() ) |
|
| 488 | - || ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() ) |
|
| 489 | - || ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() ) |
|
| 485 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_home_page_id()) |
|
| 486 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_info_page_id()) |
|
| 487 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_login_page_id()) |
|
| 488 | + || (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())
|
|
| 489 | + || (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())
|
|
| 490 | 490 | ) |
| 491 | 491 | ) {
|
| 492 | 492 | $wp->query_vars['gd_is_geodir_page'] = true; |
@@ -494,20 +494,20 @@ discard block |
||
| 494 | 494 | } |
| 495 | 495 | |
| 496 | 496 | |
| 497 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['post_type'] ) && $wp->query_vars['post_type'] != '' ) {
|
|
| 497 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {
|
|
| 498 | 498 | $requested_post_type = $wp->query_vars['post_type']; |
| 499 | 499 | // check if this post type is geodirectory post types |
| 500 | 500 | $post_type_array = geodir_get_posttypes(); |
| 501 | - if ( in_array( $requested_post_type, $post_type_array ) ) {
|
|
| 501 | + if (in_array($requested_post_type, $post_type_array)) {
|
|
| 502 | 502 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 503 | 503 | } |
| 504 | 504 | } |
| 505 | 505 | |
| 506 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) ) {
|
|
| 507 | - $geodir_taxonomis = geodir_get_taxonomies( '', true ); |
|
| 508 | - if ( ! empty( $geodir_taxonomis ) ) {
|
|
| 509 | - foreach ( $geodir_taxonomis as $taxonomy ) {
|
|
| 510 | - if ( array_key_exists( $taxonomy, $wp->query_vars ) ) {
|
|
| 506 | + if (!isset($wp->query_vars['gd_is_geodir_page'])) {
|
|
| 507 | + $geodir_taxonomis = geodir_get_taxonomies('', true);
|
|
| 508 | + if (!empty($geodir_taxonomis)) {
|
|
| 509 | + foreach ($geodir_taxonomis as $taxonomy) {
|
|
| 510 | + if (array_key_exists($taxonomy, $wp->query_vars)) {
|
|
| 511 | 511 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 512 | 512 | break; |
| 513 | 513 | } |
@@ -516,20 +516,20 @@ discard block |
||
| 516 | 516 | |
| 517 | 517 | } |
| 518 | 518 | |
| 519 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['author_name'] ) && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 519 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['author_name']) && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 520 | 520 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 521 | 521 | } |
| 522 | 522 | |
| 523 | 523 | |
| 524 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $_REQUEST['geodir_search'] ) ) {
|
|
| 524 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($_REQUEST['geodir_search'])) {
|
|
| 525 | 525 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 526 | 526 | } |
| 527 | 527 | |
| 528 | 528 | |
| 529 | 529 | //check if homepage |
| 530 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) |
|
| 531 | - && ! isset( $wp->query_vars['page_id'] ) |
|
| 532 | - && ! isset( $wp->query_vars['pagename'] ) |
|
| 530 | + if (!isset($wp->query_vars['gd_is_geodir_page']) |
|
| 531 | + && !isset($wp->query_vars['page_id']) |
|
| 532 | + && !isset($wp->query_vars['pagename']) |
|
| 533 | 533 | && is_page_geodir_home() |
| 534 | 534 | ) {
|
| 535 | 535 | $wp->query_vars['gd_is_geodir_page'] = true; |
@@ -553,14 +553,14 @@ discard block |
||
| 553 | 553 | */ |
| 554 | 554 | function geodir_is_geodir_page() {
|
| 555 | 555 | global $wp; |
| 556 | - if ( isset( $wp->query_vars['gd_is_geodir_page'] ) && $wp->query_vars['gd_is_geodir_page'] ) {
|
|
| 556 | + if (isset($wp->query_vars['gd_is_geodir_page']) && $wp->query_vars['gd_is_geodir_page']) {
|
|
| 557 | 557 | return true; |
| 558 | 558 | } else {
|
| 559 | 559 | return false; |
| 560 | 560 | } |
| 561 | 561 | } |
| 562 | 562 | |
| 563 | -if ( ! function_exists( 'geodir_get_imagesize' ) ) {
|
|
| 563 | +if (!function_exists('geodir_get_imagesize')) {
|
|
| 564 | 564 | /** |
| 565 | 565 | * Get image size using the size key . |
| 566 | 566 | * |
@@ -571,13 +571,13 @@ discard block |
||
| 571 | 571 | * |
| 572 | 572 | * @return array|mixed|void|WP_Error If valid returns image size. Else returns error. |
| 573 | 573 | */ |
| 574 | - function geodir_get_imagesize( $size = '' ) {
|
|
| 574 | + function geodir_get_imagesize($size = '') {
|
|
| 575 | 575 | |
| 576 | 576 | $imagesizes = array( |
| 577 | - 'list-thumb' => array( 'w' => 283, 'h' => 188 ), |
|
| 578 | - 'thumbnail' => array( 'w' => 125, 'h' => 125 ), |
|
| 579 | - 'widget-thumb' => array( 'w' => 50, 'h' => 50 ), |
|
| 580 | - 'slider-thumb' => array( 'w' => 100, 'h' => 100 ) |
|
| 577 | + 'list-thumb' => array('w' => 283, 'h' => 188),
|
|
| 578 | + 'thumbnail' => array('w' => 125, 'h' => 125),
|
|
| 579 | + 'widget-thumb' => array('w' => 50, 'h' => 50),
|
|
| 580 | + 'slider-thumb' => array('w' => 100, 'h' => 100)
|
|
| 581 | 581 | ); |
| 582 | 582 | |
| 583 | 583 | /** |
@@ -587,9 +587,9 @@ discard block |
||
| 587 | 587 | * |
| 588 | 588 | * @param array $imagesizes Image size array. |
| 589 | 589 | */ |
| 590 | - $imagesizes = apply_filters( 'geodir_imagesizes', $imagesizes ); |
|
| 590 | + $imagesizes = apply_filters('geodir_imagesizes', $imagesizes);
|
|
| 591 | 591 | |
| 592 | - if ( ! empty( $size ) && array_key_exists( $size, $imagesizes ) ) {
|
|
| 592 | + if (!empty($size) && array_key_exists($size, $imagesizes)) {
|
|
| 593 | 593 | /** |
| 594 | 594 | * Filters image size of the passed key. |
| 595 | 595 | * |
@@ -597,11 +597,11 @@ discard block |
||
| 597 | 597 | * |
| 598 | 598 | * @param array $imagesizes [$size] Image size array of the passed key. |
| 599 | 599 | */ |
| 600 | - return apply_filters( 'geodir_get_imagesize_' . $size, $imagesizes[ $size ] ); |
|
| 600 | + return apply_filters('geodir_get_imagesize_'.$size, $imagesizes[$size]);
|
|
| 601 | 601 | |
| 602 | - } elseif ( ! empty( $size ) ) {
|
|
| 602 | + } elseif (!empty($size)) {
|
|
| 603 | 603 | |
| 604 | - return new WP_Error( 'geodir_no_imagesize', __( "Given image size is not valid", 'geodirectory' ) ); |
|
| 604 | + return new WP_Error('geodir_no_imagesize', __("Given image size is not valid", 'geodirectory'));
|
|
| 605 | 605 | |
| 606 | 606 | } |
| 607 | 607 | |
@@ -625,7 +625,7 @@ discard block |
||
| 625 | 625 | */ |
| 626 | 626 | |
| 627 | 627 | |
| 628 | -if ( ! function_exists( 'createRandomString' ) ) {
|
|
| 628 | +if (!function_exists('createRandomString')) {
|
|
| 629 | 629 | /** |
| 630 | 630 | * Creates random string. |
| 631 | 631 | * |
@@ -635,21 +635,21 @@ discard block |
||
| 635 | 635 | */ |
| 636 | 636 | function createRandomString() {
|
| 637 | 637 | $chars = "abcdefghijkmlnopqrstuvwxyz1023456789"; |
| 638 | - srand( (double) microtime() * 1000000 ); |
|
| 638 | + srand((double) microtime() * 1000000); |
|
| 639 | 639 | $i = 0; |
| 640 | 640 | $rstring = ''; |
| 641 | - while ( $i <= 25 ) {
|
|
| 641 | + while ($i <= 25) {
|
|
| 642 | 642 | $num = rand() % 33; |
| 643 | - $tmp = substr( $chars, $num, 1 ); |
|
| 644 | - $rstring = $rstring . $tmp; |
|
| 645 | - $i ++; |
|
| 643 | + $tmp = substr($chars, $num, 1); |
|
| 644 | + $rstring = $rstring.$tmp; |
|
| 645 | + $i++; |
|
| 646 | 646 | } |
| 647 | 647 | |
| 648 | 648 | return $rstring; |
| 649 | 649 | } |
| 650 | 650 | } |
| 651 | 651 | |
| 652 | -if ( ! function_exists( 'geodir_getDistanceRadius' ) ) {
|
|
| 652 | +if (!function_exists('geodir_getDistanceRadius')) {
|
|
| 653 | 653 | /** |
| 654 | 654 | * Calculates the distance radius. |
| 655 | 655 | * |
@@ -660,9 +660,9 @@ discard block |
||
| 660 | 660 | * |
| 661 | 661 | * @return float The mean radius. |
| 662 | 662 | */ |
| 663 | - function geodir_getDistanceRadius( $uom = 'km' ) {
|
|
| 663 | + function geodir_getDistanceRadius($uom = 'km') {
|
|
| 664 | 664 | // Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude |
| 665 | - switch ( geodir_strtolower( $uom ) ): |
|
| 665 | + switch (geodir_strtolower($uom)): |
|
| 666 | 666 | case 'km' : |
| 667 | 667 | $earthMeanRadius = 6371.009; // km |
| 668 | 668 | break; |
@@ -694,7 +694,7 @@ discard block |
||
| 694 | 694 | } |
| 695 | 695 | |
| 696 | 696 | |
| 697 | -if ( ! function_exists( 'geodir_calculateDistanceFromLatLong' ) ) {
|
|
| 697 | +if (!function_exists('geodir_calculateDistanceFromLatLong')) {
|
|
| 698 | 698 | /** |
| 699 | 699 | * Calculate the great circle distance between two points identified by longitude and latitude. |
| 700 | 700 | * |
@@ -707,17 +707,17 @@ discard block |
||
| 707 | 707 | * |
| 708 | 708 | * @return float The distance. |
| 709 | 709 | */ |
| 710 | - function geodir_calculateDistanceFromLatLong( $point1, $point2, $uom = 'km' ) {
|
|
| 710 | + function geodir_calculateDistanceFromLatLong($point1, $point2, $uom = 'km') {
|
|
| 711 | 711 | // Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude |
| 712 | 712 | |
| 713 | - $earthMeanRadius = geodir_getDistanceRadius( $uom ); |
|
| 713 | + $earthMeanRadius = geodir_getDistanceRadius($uom); |
|
| 714 | 714 | |
| 715 | - $deltaLatitude = deg2rad( (float) $point2['latitude'] - (float) $point1['latitude'] ); |
|
| 716 | - $deltaLongitude = deg2rad( (float) $point2['longitude'] - (float) $point1['longitude'] ); |
|
| 717 | - $a = sin( $deltaLatitude / 2 ) * sin( $deltaLatitude / 2 ) + |
|
| 718 | - cos( deg2rad( (float) $point1['latitude'] ) ) * cos( deg2rad( (float) $point2['latitude'] ) ) * |
|
| 719 | - sin( $deltaLongitude / 2 ) * sin( $deltaLongitude / 2 ); |
|
| 720 | - $c = 2 * atan2( sqrt( $a ), sqrt( 1 - $a ) ); |
|
| 715 | + $deltaLatitude = deg2rad((float) $point2['latitude'] - (float) $point1['latitude']); |
|
| 716 | + $deltaLongitude = deg2rad((float) $point2['longitude'] - (float) $point1['longitude']); |
|
| 717 | + $a = sin($deltaLatitude / 2) * sin($deltaLatitude / 2) + |
|
| 718 | + cos(deg2rad((float) $point1['latitude'])) * cos(deg2rad((float) $point2['latitude'])) * |
|
| 719 | + sin($deltaLongitude / 2) * sin($deltaLongitude / 2); |
|
| 720 | + $c = 2 * atan2(sqrt($a), sqrt(1 - $a)); |
|
| 721 | 721 | $distance = $earthMeanRadius * $c; |
| 722 | 722 | |
| 723 | 723 | return $distance; |
@@ -726,7 +726,7 @@ discard block |
||
| 726 | 726 | } |
| 727 | 727 | |
| 728 | 728 | |
| 729 | -if ( ! function_exists( 'geodir_sendEmail' ) ) {
|
|
| 729 | +if (!function_exists('geodir_sendEmail')) {
|
|
| 730 | 730 | /** |
| 731 | 731 | * The main function that send transactional emails using the args provided. |
| 732 | 732 | * |
@@ -745,92 +745,92 @@ discard block |
||
| 745 | 745 | * @param string $post_id The post ID. |
| 746 | 746 | * @param string $user_id The user ID. |
| 747 | 747 | */ |
| 748 | - function geodir_sendEmail( $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '' ) {
|
|
| 748 | + function geodir_sendEmail($fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '') {
|
|
| 749 | 749 | $login_details = ''; |
| 750 | 750 | |
| 751 | 751 | // strip slashes from subject & message text |
| 752 | - $to_subject = stripslashes_deep( $to_subject ); |
|
| 753 | - $to_message = stripslashes_deep( $to_message ); |
|
| 752 | + $to_subject = stripslashes_deep($to_subject); |
|
| 753 | + $to_message = stripslashes_deep($to_message); |
|
| 754 | 754 | |
| 755 | - if ( $message_type == 'send_enquiry' ) {
|
|
| 756 | - $subject = get_option( 'geodir_email_enquiry_subject' ); |
|
| 757 | - $message = get_option( 'geodir_email_enquiry_content' ); |
|
| 755 | + if ($message_type == 'send_enquiry') {
|
|
| 756 | + $subject = get_option('geodir_email_enquiry_subject');
|
|
| 757 | + $message = get_option('geodir_email_enquiry_content');
|
|
| 758 | 758 | |
| 759 | 759 | // change to name in some cases |
| 760 | - $post_author = get_post_field( 'post_author', $post_id ); |
|
| 761 | - if(is_super_admin( $post_author )){// if admin probably not the post author so change name
|
|
| 762 | - $toEmailName = __('Business Owner','geodirectory');
|
|
| 763 | - }elseif(defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id,'claimed')!='1'){// if claim manager installed but listing not claimed
|
|
| 764 | - $toEmailName = __('Business Owner','geodirectory');
|
|
| 760 | + $post_author = get_post_field('post_author', $post_id);
|
|
| 761 | + if (is_super_admin($post_author)) {// if admin probably not the post author so change name
|
|
| 762 | + $toEmailName = __('Business Owner', 'geodirectory');
|
|
| 763 | + }elseif (defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id, 'claimed') != '1') {// if claim manager installed but listing not claimed
|
|
| 764 | + $toEmailName = __('Business Owner', 'geodirectory');
|
|
| 765 | 765 | } |
| 766 | 766 | |
| 767 | 767 | |
| 768 | - } elseif ( $message_type == 'forgot_password' ) {
|
|
| 769 | - $subject = get_option( 'geodir_forgot_password_subject' ); |
|
| 770 | - $message = get_option( 'geodir_forgot_password_content' ); |
|
| 768 | + } elseif ($message_type == 'forgot_password') {
|
|
| 769 | + $subject = get_option('geodir_forgot_password_subject');
|
|
| 770 | + $message = get_option('geodir_forgot_password_content');
|
|
| 771 | 771 | $login_details = $to_message; |
| 772 | - } elseif ( $message_type == 'registration' ) {
|
|
| 773 | - $subject = get_option( 'geodir_registration_success_email_subject' ); |
|
| 774 | - $message = get_option( 'geodir_registration_success_email_content' ); |
|
| 772 | + } elseif ($message_type == 'registration') {
|
|
| 773 | + $subject = get_option('geodir_registration_success_email_subject');
|
|
| 774 | + $message = get_option('geodir_registration_success_email_content');
|
|
| 775 | 775 | $login_details = $to_message; |
| 776 | - } elseif ( $message_type == 'post_submit' ) {
|
|
| 777 | - $subject = get_option( 'geodir_post_submited_success_email_subject' ); |
|
| 778 | - $message = get_option( 'geodir_post_submited_success_email_content' ); |
|
| 779 | - } elseif ( $message_type == 'listing_published' ) {
|
|
| 780 | - $subject = get_option( 'geodir_post_published_email_subject' ); |
|
| 781 | - $message = get_option( 'geodir_post_published_email_content' ); |
|
| 782 | - } elseif ( $message_type == 'listing_edited' ) {
|
|
| 783 | - $subject = get_option( 'geodir_post_edited_email_subject_admin' ); |
|
| 784 | - $message = get_option( 'geodir_post_edited_email_content_admin' ); |
|
| 776 | + } elseif ($message_type == 'post_submit') {
|
|
| 777 | + $subject = get_option('geodir_post_submited_success_email_subject');
|
|
| 778 | + $message = get_option('geodir_post_submited_success_email_content');
|
|
| 779 | + } elseif ($message_type == 'listing_published') {
|
|
| 780 | + $subject = get_option('geodir_post_published_email_subject');
|
|
| 781 | + $message = get_option('geodir_post_published_email_content');
|
|
| 782 | + } elseif ($message_type == 'listing_edited') {
|
|
| 783 | + $subject = get_option('geodir_post_edited_email_subject_admin');
|
|
| 784 | + $message = get_option('geodir_post_edited_email_content_admin');
|
|
| 785 | 785 | } |
| 786 | 786 | |
| 787 | - if ( ! empty( $subject ) ) {
|
|
| 788 | - $subject = __( stripslashes_deep( $subject ), 'geodirectory' ); |
|
| 787 | + if (!empty($subject)) {
|
|
| 788 | + $subject = __(stripslashes_deep($subject), 'geodirectory'); |
|
| 789 | 789 | } |
| 790 | 790 | |
| 791 | - if ( ! empty( $message ) ) {
|
|
| 792 | - $message = __( stripslashes_deep( $message ), 'geodirectory' ); |
|
| 791 | + if (!empty($message)) {
|
|
| 792 | + $message = __(stripslashes_deep($message), 'geodirectory'); |
|
| 793 | 793 | } |
| 794 | 794 | |
| 795 | - $to_message = nl2br( $to_message ); |
|
| 796 | - $sitefromEmail = get_option( 'site_email' ); |
|
| 795 | + $to_message = nl2br($to_message); |
|
| 796 | + $sitefromEmail = get_option('site_email');
|
|
| 797 | 797 | $sitefromEmailName = get_site_emailName(); |
| 798 | - $productlink = get_permalink( $post_id ); |
|
| 798 | + $productlink = get_permalink($post_id); |
|
| 799 | 799 | |
| 800 | 800 | $user_login = ''; |
| 801 | - if ( $user_id > 0 && $user_info = get_userdata( $user_id ) ) {
|
|
| 801 | + if ($user_id > 0 && $user_info = get_userdata($user_id)) {
|
|
| 802 | 802 | $user_login = $user_info->user_login; |
| 803 | 803 | } |
| 804 | 804 | |
| 805 | 805 | $posted_date = ''; |
| 806 | 806 | $listingLink = ''; |
| 807 | 807 | |
| 808 | - $post_info = get_post( $post_id ); |
|
| 808 | + $post_info = get_post($post_id); |
|
| 809 | 809 | |
| 810 | - if ( $post_info ) {
|
|
| 810 | + if ($post_info) {
|
|
| 811 | 811 | $posted_date = $post_info->post_date; |
| 812 | - $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>'; |
|
| 812 | + $listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>'; |
|
| 813 | 813 | } |
| 814 | 814 | $siteurl = home_url(); |
| 815 | - $siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>'; |
|
| 815 | + $siteurl_link = '<a href="'.$siteurl.'">'.$siteurl.'</a>'; |
|
| 816 | 816 | $loginurl = geodir_login_url(); |
| 817 | - $loginurl_link = '<a href="' . $loginurl . '">login</a>'; |
|
| 817 | + $loginurl_link = '<a href="'.$loginurl.'">login</a>'; |
|
| 818 | 818 | |
| 819 | - $post_author_id = ! empty( $post_info ) ? $post_info->post_author : 0; |
|
| 820 | - $post_author_data = $post_author_id ? get_userdata( $post_author_id ) : NULL; |
|
| 821 | - $post_author_name = geodir_get_client_name( $post_author_id ); |
|
| 822 | - $post_author_email = !empty( $post_author_data->user_email ) ? $post_author_data->user_email : ''; |
|
| 823 | - $current_date = date_i18n( 'Y-m-d H:i:s', current_time( 'timestamp' ) ); |
|
| 824 | - |
|
| 825 | - if ( $fromEmail == '' ) {
|
|
| 826 | - $fromEmail = get_option( 'site_email' ); |
|
| 819 | + $post_author_id = !empty($post_info) ? $post_info->post_author : 0; |
|
| 820 | + $post_author_data = $post_author_id ? get_userdata($post_author_id) : NULL; |
|
| 821 | + $post_author_name = geodir_get_client_name($post_author_id); |
|
| 822 | + $post_author_email = !empty($post_author_data->user_email) ? $post_author_data->user_email : ''; |
|
| 823 | + $current_date = date_i18n('Y-m-d H:i:s', current_time('timestamp'));
|
|
| 824 | + |
|
| 825 | + if ($fromEmail == '') {
|
|
| 826 | + $fromEmail = get_option('site_email');
|
|
| 827 | 827 | } |
| 828 | 828 | |
| 829 | - if ( $fromEmailName == '' ) {
|
|
| 830 | - $fromEmailName = get_option( 'site_email_name' ); |
|
| 829 | + if ($fromEmailName == '') {
|
|
| 830 | + $fromEmailName = get_option('site_email_name');
|
|
| 831 | 831 | } |
| 832 | 832 | |
| 833 | - $search_array = array( |
|
| 833 | + $search_array = array( |
|
| 834 | 834 | '[#listing_link#]', |
| 835 | 835 | '[#site_name_url#]', |
| 836 | 836 | '[#post_id#]', |
@@ -872,7 +872,7 @@ discard block |
||
| 872 | 872 | $post_author_email, |
| 873 | 873 | $current_date, |
| 874 | 874 | ); |
| 875 | - $message = str_replace( $search_array, $replace_array, $message ); |
|
| 875 | + $message = str_replace($search_array, $replace_array, $message); |
|
| 876 | 876 | |
| 877 | 877 | $search_array = array( |
| 878 | 878 | '[#listing_link#]', |
@@ -910,12 +910,12 @@ discard block |
||
| 910 | 910 | $post_author_email, |
| 911 | 911 | $current_date |
| 912 | 912 | ); |
| 913 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 913 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 914 | 914 | |
| 915 | - $headers = array(); |
|
| 915 | + $headers = array(); |
|
| 916 | 916 | $headers[] = 'Content-type: text/html; charset=UTF-8'; |
| 917 | - $headers[] = "Reply-To: " . $fromEmail; |
|
| 918 | - $headers[] = 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>'; |
|
| 917 | + $headers[] = "Reply-To: ".$fromEmail; |
|
| 918 | + $headers[] = 'From: '.$sitefromEmailName.' <'.$sitefromEmail.'>'; |
|
| 919 | 919 | |
| 920 | 920 | $to = $toEmail; |
| 921 | 921 | |
@@ -937,7 +937,7 @@ discard block |
||
| 937 | 937 | * @param string $post_id The post ID. |
| 938 | 938 | * @param string $user_id The user ID. |
| 939 | 939 | */ |
| 940 | - $to = apply_filters( 'geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 940 | + $to = apply_filters('geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 941 | 941 | /** |
| 942 | 942 | * Filter the client email subject. |
| 943 | 943 | * |
@@ -956,7 +956,7 @@ discard block |
||
| 956 | 956 | * @param string $post_id The post ID. |
| 957 | 957 | * @param string $user_id The user ID. |
| 958 | 958 | */ |
| 959 | - $subject = apply_filters( 'geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 959 | + $subject = apply_filters('geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 960 | 960 | /** |
| 961 | 961 | * Filter the client email message. |
| 962 | 962 | * |
@@ -975,7 +975,7 @@ discard block |
||
| 975 | 975 | * @param string $post_id The post ID. |
| 976 | 976 | * @param string $user_id The user ID. |
| 977 | 977 | */ |
| 978 | - $message = apply_filters( 'geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 978 | + $message = apply_filters('geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 979 | 979 | /** |
| 980 | 980 | * Filter the client email headers. |
| 981 | 981 | * |
@@ -994,39 +994,39 @@ discard block |
||
| 994 | 994 | * @param string $post_id The post ID. |
| 995 | 995 | * @param string $user_id The user ID. |
| 996 | 996 | */ |
| 997 | - $headers = apply_filters( 'geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 997 | + $headers = apply_filters('geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 998 | 998 | |
| 999 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 999 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1000 | 1000 | |
| 1001 | - if ( ! $sent ) {
|
|
| 1002 | - if ( is_array( $to ) ) {
|
|
| 1003 | - $to = implode( ',', $to ); |
|
| 1001 | + if (!$sent) {
|
|
| 1002 | + if (is_array($to)) {
|
|
| 1003 | + $to = implode(',', $to);
|
|
| 1004 | 1004 | } |
| 1005 | 1005 | $log_message = sprintf( |
| 1006 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1006 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1007 | 1007 | $message_type, |
| 1008 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1008 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1009 | 1009 | $to, |
| 1010 | 1010 | $subject |
| 1011 | 1011 | ); |
| 1012 | - geodir_error_log( $log_message ); |
|
| 1012 | + geodir_error_log($log_message); |
|
| 1013 | 1013 | } |
| 1014 | 1014 | |
| 1015 | 1015 | ///////// ADMIN BCC EMIALS |
| 1016 | - $adminEmail = get_bloginfo( 'admin_email' ); |
|
| 1016 | + $adminEmail = get_bloginfo('admin_email');
|
|
| 1017 | 1017 | $to = $adminEmail; |
| 1018 | 1018 | |
| 1019 | 1019 | $admin_bcc = false; |
| 1020 | - if ( $message_type == 'registration' ) {
|
|
| 1021 | - $message_raw = explode( __( "Password:", 'geodirectory' ), $message ); |
|
| 1022 | - $message_raw2 = explode( "</p>", $message_raw[1], 2 ); |
|
| 1023 | - $message = $message_raw[0] . __( 'Password:', 'geodirectory' ) . ' **********</p>' . $message_raw2[1]; |
|
| 1020 | + if ($message_type == 'registration') {
|
|
| 1021 | + $message_raw = explode(__("Password:", 'geodirectory'), $message);
|
|
| 1022 | + $message_raw2 = explode("</p>", $message_raw[1], 2);
|
|
| 1023 | + $message = $message_raw[0].__('Password:', 'geodirectory').' **********</p>'.$message_raw2[1];
|
|
| 1024 | 1024 | } |
| 1025 | - if ( $message_type == 'post_submit' && ( get_option( 'geodir_notify_post_submit' ) || get_option( 'geodir_notify_post_submit', '-1' ) == '-1' ) ) {
|
|
| 1026 | - $subject = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_subject_admin' ) ), 'geodirectory' ); |
|
| 1027 | - $message = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_content_admin' ) ), 'geodirectory' ); |
|
| 1025 | + if ($message_type == 'post_submit' && (get_option('geodir_notify_post_submit') || get_option('geodir_notify_post_submit', '-1') == '-1')) {
|
|
| 1026 | + $subject = __(stripslashes_deep(get_option('geodir_post_submited_success_email_subject_admin')), 'geodirectory');
|
|
| 1027 | + $message = __(stripslashes_deep(get_option('geodir_post_submited_success_email_content_admin')), 'geodirectory');
|
|
| 1028 | 1028 | |
| 1029 | - $search_array = array( |
|
| 1029 | + $search_array = array( |
|
| 1030 | 1030 | '[#listing_link#]', |
| 1031 | 1031 | '[#site_name_url#]', |
| 1032 | 1032 | '[#post_id#]', |
@@ -1062,7 +1062,7 @@ discard block |
||
| 1062 | 1062 | $user_login, |
| 1063 | 1063 | $post_author_email, |
| 1064 | 1064 | ); |
| 1065 | - $message = str_replace( $search_array, $replace_array, $message ); |
|
| 1065 | + $message = str_replace($search_array, $replace_array, $message); |
|
| 1066 | 1066 | |
| 1067 | 1067 | $search_array = array( |
| 1068 | 1068 | '[#listing_link#]', |
@@ -1094,23 +1094,23 @@ discard block |
||
| 1094 | 1094 | $user_login, |
| 1095 | 1095 | $post_author_email, |
| 1096 | 1096 | ); |
| 1097 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 1097 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 1098 | 1098 | |
| 1099 | 1099 | $subject .= ' - ADMIN BCC COPY'; |
| 1100 | 1100 | $admin_bcc = true; |
| 1101 | 1101 | |
| 1102 | - } elseif ( $message_type == 'registration' && get_option( 'geodir_bcc_new_user' ) ) {
|
|
| 1102 | + } elseif ($message_type == 'registration' && get_option('geodir_bcc_new_user')) {
|
|
| 1103 | 1103 | $subject .= ' - ADMIN BCC COPY'; |
| 1104 | 1104 | $admin_bcc = true; |
| 1105 | - } elseif ( $message_type == 'send_enquiry' && get_option( 'geodir_bcc_enquiry' ) ) {
|
|
| 1105 | + } elseif ($message_type == 'send_enquiry' && get_option('geodir_bcc_enquiry')) {
|
|
| 1106 | 1106 | $subject .= ' - ADMIN BCC COPY'; |
| 1107 | 1107 | $admin_bcc = true; |
| 1108 | - } elseif ( $message_type == 'listing_published' && get_option( 'geodir_bcc_listing_published' ) ) {
|
|
| 1108 | + } elseif ($message_type == 'listing_published' && get_option('geodir_bcc_listing_published')) {
|
|
| 1109 | 1109 | $subject .= ' - ADMIN BCC COPY'; |
| 1110 | 1110 | $admin_bcc = true; |
| 1111 | 1111 | } |
| 1112 | 1112 | |
| 1113 | - if ( $admin_bcc === true ) {
|
|
| 1113 | + if ($admin_bcc === true) {
|
|
| 1114 | 1114 | |
| 1115 | 1115 | /** |
| 1116 | 1116 | * Filter the client email subject. |
@@ -1130,7 +1130,7 @@ discard block |
||
| 1130 | 1130 | * @param string $post_id The post ID. |
| 1131 | 1131 | * @param string $user_id The user ID. |
| 1132 | 1132 | */ |
| 1133 | - $subject = apply_filters( 'geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1133 | + $subject = apply_filters('geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1134 | 1134 | /** |
| 1135 | 1135 | * Filter the client email message. |
| 1136 | 1136 | * |
@@ -1149,23 +1149,23 @@ discard block |
||
| 1149 | 1149 | * @param string $post_id The post ID. |
| 1150 | 1150 | * @param string $user_id The user ID. |
| 1151 | 1151 | */ |
| 1152 | - $message = apply_filters( 'geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1152 | + $message = apply_filters('geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1153 | 1153 | |
| 1154 | 1154 | |
| 1155 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1155 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1156 | 1156 | |
| 1157 | - if ( ! $sent ) {
|
|
| 1158 | - if ( is_array( $to ) ) {
|
|
| 1159 | - $to = implode( ',', $to ); |
|
| 1157 | + if (!$sent) {
|
|
| 1158 | + if (is_array($to)) {
|
|
| 1159 | + $to = implode(',', $to);
|
|
| 1160 | 1160 | } |
| 1161 | 1161 | $log_message = sprintf( |
| 1162 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1162 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1163 | 1163 | $message_type, |
| 1164 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1164 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1165 | 1165 | $to, |
| 1166 | 1166 | $subject |
| 1167 | 1167 | ); |
| 1168 | - geodir_error_log( $log_message ); |
|
| 1168 | + geodir_error_log($log_message); |
|
| 1169 | 1169 | } |
| 1170 | 1170 | } |
| 1171 | 1171 | |
@@ -1181,51 +1181,51 @@ discard block |
||
| 1181 | 1181 | */ |
| 1182 | 1182 | function geodir_taxonomy_breadcrumb() {
|
| 1183 | 1183 | |
| 1184 | - $term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) ); |
|
| 1184 | + $term = get_term_by('slug', get_query_var('term'), get_query_var('taxonomy'));
|
|
| 1185 | 1185 | $parent = $term->parent; |
| 1186 | 1186 | |
| 1187 | - while ( $parent ): |
|
| 1187 | + while ($parent): |
|
| 1188 | 1188 | $parents[] = $parent; |
| 1189 | - $new_parent = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); |
|
| 1189 | + $new_parent = get_term_by('id', $parent, get_query_var('taxonomy'));
|
|
| 1190 | 1190 | $parent = $new_parent->parent; |
| 1191 | 1191 | endwhile; |
| 1192 | 1192 | |
| 1193 | - if ( ! empty( $parents ) ): |
|
| 1194 | - $parents = array_reverse( $parents ); |
|
| 1193 | + if (!empty($parents)): |
|
| 1194 | + $parents = array_reverse($parents); |
|
| 1195 | 1195 | |
| 1196 | - foreach ( $parents as $parent ): |
|
| 1197 | - $item = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); |
|
| 1198 | - $url = get_term_link( $item, get_query_var( 'taxonomy' ) ); |
|
| 1199 | - echo '<li> > <a href="' . $url . '">' . $item->name . '</a></li>'; |
|
| 1196 | + foreach ($parents as $parent): |
|
| 1197 | + $item = get_term_by('id', $parent, get_query_var('taxonomy'));
|
|
| 1198 | + $url = get_term_link($item, get_query_var('taxonomy'));
|
|
| 1199 | + echo '<li> > <a href="'.$url.'">'.$item->name.'</a></li>'; |
|
| 1200 | 1200 | endforeach; |
| 1201 | 1201 | |
| 1202 | 1202 | endif; |
| 1203 | 1203 | |
| 1204 | - echo '<li> > ' . $term->name . '</li>'; |
|
| 1204 | + echo '<li> > '.$term->name.'</li>'; |
|
| 1205 | 1205 | } |
| 1206 | 1206 | |
| 1207 | -function geodir_wpml_post_type_archive_link($link, $post_type){
|
|
| 1207 | +function geodir_wpml_post_type_archive_link($link, $post_type) {
|
|
| 1208 | 1208 | if (geodir_is_wpml()) {
|
| 1209 | - $post_types = get_option( 'geodir_post_types' ); |
|
| 1209 | + $post_types = get_option('geodir_post_types');
|
|
| 1210 | 1210 | |
| 1211 | - if ( isset( $post_types[ $post_type ] ) ) {
|
|
| 1212 | - $slug = $post_types[ $post_type ]['rewrite']['slug']; |
|
| 1211 | + if (isset($post_types[$post_type])) {
|
|
| 1212 | + $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1213 | 1213 | |
| 1214 | 1214 | // Alter the CPT slug if WPML is set to do so |
| 1215 | - if ( geodir_wpml_is_post_type_translated( $post_type ) ) {
|
|
| 1216 | - if ( gd_wpml_slug_translation_turned_on( $post_type ) && $language_code = gd_wpml_get_lang_from_url( $link) ) {
|
|
| 1215 | + if (geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 1216 | + if (gd_wpml_slug_translation_turned_on($post_type) && $language_code = gd_wpml_get_lang_from_url($link)) {
|
|
| 1217 | 1217 | |
| 1218 | 1218 | $org_slug = $slug; |
| 1219 | - $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1219 | + $slug = apply_filters('wpml_translate_single_string',
|
|
| 1220 | 1220 | $slug, |
| 1221 | 1221 | 'WordPress', |
| 1222 | - 'URL slug: ' . $slug, |
|
| 1223 | - $language_code ); |
|
| 1222 | + 'URL slug: '.$slug, |
|
| 1223 | + $language_code); |
|
| 1224 | 1224 | |
| 1225 | - if ( ! $slug ) {
|
|
| 1225 | + if (!$slug) {
|
|
| 1226 | 1226 | $slug = $org_slug; |
| 1227 | 1227 | } else {
|
| 1228 | - $link = str_replace( $org_slug, $slug, $link ); |
|
| 1228 | + $link = str_replace($org_slug, $slug, $link); |
|
| 1229 | 1229 | } |
| 1230 | 1230 | } |
| 1231 | 1231 | } |
@@ -1234,7 +1234,7 @@ discard block |
||
| 1234 | 1234 | |
| 1235 | 1235 | return $link; |
| 1236 | 1236 | } |
| 1237 | -add_filter( 'post_type_archive_link','geodir_wpml_post_type_archive_link', 1000, 2); |
|
| 1237 | +add_filter('post_type_archive_link', 'geodir_wpml_post_type_archive_link', 1000, 2);
|
|
| 1238 | 1238 | |
| 1239 | 1239 | /** |
| 1240 | 1240 | * Main function that generates breadcrumb for all pages. |
@@ -1255,9 +1255,9 @@ discard block |
||
| 1255 | 1255 | * |
| 1256 | 1256 | * @since 1.0.0 |
| 1257 | 1257 | */ |
| 1258 | - $separator = apply_filters( 'geodir_breadcrumb_separator', ' > ' ); |
|
| 1258 | + $separator = apply_filters('geodir_breadcrumb_separator', ' > ');
|
|
| 1259 | 1259 | |
| 1260 | - if ( ! geodir_is_page( 'home' ) ) {
|
|
| 1260 | + if (!geodir_is_page('home')) {
|
|
| 1261 | 1261 | $breadcrumb = ''; |
| 1262 | 1262 | $url_categoris = ''; |
| 1263 | 1263 | $breadcrumb .= '<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">'; |
@@ -1266,167 +1266,167 @@ discard block |
||
| 1266 | 1266 | * |
| 1267 | 1267 | * @since 1.0.0 |
| 1268 | 1268 | */ |
| 1269 | - $breadcrumb .= '<li>' . apply_filters( 'geodir_breadcrumb_first_link', '<a href="' . home_url() . '">' . __( 'Home', 'geodirectory' ) . '</a>' ) . '</li>'; |
|
| 1269 | + $breadcrumb .= '<li>'.apply_filters('geodir_breadcrumb_first_link', '<a href="'.home_url().'">'.__('Home', 'geodirectory').'</a>').'</li>';
|
|
| 1270 | 1270 | |
| 1271 | 1271 | $gd_post_type = geodir_get_current_posttype(); |
| 1272 | - $post_type_info = get_post_type_object( $gd_post_type ); |
|
| 1272 | + $post_type_info = get_post_type_object($gd_post_type); |
|
| 1273 | 1273 | |
| 1274 | - remove_filter( 'post_type_archive_link', 'geodir_get_posttype_link' ); |
|
| 1274 | + remove_filter('post_type_archive_link', 'geodir_get_posttype_link');
|
|
| 1275 | 1275 | |
| 1276 | - $listing_link = get_post_type_archive_link( $gd_post_type ); |
|
| 1276 | + $listing_link = get_post_type_archive_link($gd_post_type); |
|
| 1277 | 1277 | |
| 1278 | - add_filter( 'post_type_archive_link', 'geodir_get_posttype_link', 10, 2 ); |
|
| 1279 | - $listing_link = rtrim( $listing_link, '/' ); |
|
| 1278 | + add_filter('post_type_archive_link', 'geodir_get_posttype_link', 10, 2);
|
|
| 1279 | + $listing_link = rtrim($listing_link, '/'); |
|
| 1280 | 1280 | $listing_link .= '/'; |
| 1281 | 1281 | |
| 1282 | 1282 | $post_type_for_location_link = $listing_link; |
| 1283 | - $location_terms = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 1283 | + $location_terms = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 1284 | 1284 | |
| 1285 | 1285 | global $wp, $gd_session; |
| 1286 | 1286 | $location_link = $post_type_for_location_link; |
| 1287 | 1287 | |
| 1288 | - if ( geodir_is_page( 'detail' ) || geodir_is_page( 'listing' ) ) {
|
|
| 1288 | + if (geodir_is_page('detail') || geodir_is_page('listing')) {
|
|
| 1289 | 1289 | global $post; |
| 1290 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; |
|
| 1291 | - $neighbourhood_active = $location_manager && get_option( 'location_neighbourhoods' ) ? true : false; |
|
| 1290 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 1291 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 1292 | 1292 | |
| 1293 | - if ( geodir_is_page( 'detail' ) && isset( $post->country_slug ) ) {
|
|
| 1293 | + if (geodir_is_page('detail') && isset($post->country_slug)) {
|
|
| 1294 | 1294 | $location_terms = array( |
| 1295 | 1295 | 'gd_country' => $post->country_slug, |
| 1296 | 1296 | 'gd_region' => $post->region_slug, |
| 1297 | 1297 | 'gd_city' => $post->city_slug |
| 1298 | 1298 | ); |
| 1299 | 1299 | |
| 1300 | - if ( $neighbourhood_active && ! empty( $location_terms['gd_city'] ) && $gd_ses_neighbourhood = $gd_session->get( 'gd_neighbourhood' ) ) {
|
|
| 1300 | + if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
|
|
| 1301 | 1301 | $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; |
| 1302 | 1302 | } |
| 1303 | 1303 | } |
| 1304 | 1304 | |
| 1305 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); |
|
| 1305 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1306 | 1306 | |
| 1307 | 1307 | $hide_url_part = array(); |
| 1308 | - if ( $location_manager ) {
|
|
| 1309 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); |
|
| 1310 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); |
|
| 1311 | - |
|
| 1312 | - if ( $hide_region_part && $hide_country_part ) {
|
|
| 1313 | - $hide_url_part = array( 'gd_country', 'gd_region' ); |
|
| 1314 | - } else if ( $hide_region_part && ! $hide_country_part ) {
|
|
| 1315 | - $hide_url_part = array( 'gd_region' ); |
|
| 1316 | - } else if ( ! $hide_region_part && $hide_country_part ) {
|
|
| 1317 | - $hide_url_part = array( 'gd_country' ); |
|
| 1308 | + if ($location_manager) {
|
|
| 1309 | + $hide_country_part = get_option('geodir_location_hide_country_part');
|
|
| 1310 | + $hide_region_part = get_option('geodir_location_hide_region_part');
|
|
| 1311 | + |
|
| 1312 | + if ($hide_region_part && $hide_country_part) {
|
|
| 1313 | + $hide_url_part = array('gd_country', 'gd_region');
|
|
| 1314 | + } else if ($hide_region_part && !$hide_country_part) {
|
|
| 1315 | + $hide_url_part = array('gd_region');
|
|
| 1316 | + } else if (!$hide_region_part && $hide_country_part) {
|
|
| 1317 | + $hide_url_part = array('gd_country');
|
|
| 1318 | 1318 | } |
| 1319 | 1319 | } |
| 1320 | 1320 | |
| 1321 | 1321 | $hide_text_part = array(); |
| 1322 | - if ( $geodir_show_location_url == 'country_city' ) {
|
|
| 1323 | - $hide_text_part = array( 'gd_region' ); |
|
| 1322 | + if ($geodir_show_location_url == 'country_city') {
|
|
| 1323 | + $hide_text_part = array('gd_region');
|
|
| 1324 | 1324 | |
| 1325 | - if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
|
|
| 1326 | - unset( $location_terms['gd_region'] ); |
|
| 1325 | + if (isset($location_terms['gd_region']) && !$location_manager) {
|
|
| 1326 | + unset($location_terms['gd_region']); |
|
| 1327 | 1327 | } |
| 1328 | - } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
| 1329 | - $hide_text_part = array( 'gd_country' ); |
|
| 1328 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 1329 | + $hide_text_part = array('gd_country');
|
|
| 1330 | 1330 | |
| 1331 | - if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
|
|
| 1332 | - unset( $location_terms['gd_country'] ); |
|
| 1331 | + if (isset($location_terms['gd_country']) && !$location_manager) {
|
|
| 1332 | + unset($location_terms['gd_country']); |
|
| 1333 | 1333 | } |
| 1334 | - } else if ( $geodir_show_location_url == 'city' ) {
|
|
| 1335 | - $hide_text_part = array( 'gd_country', 'gd_region' ); |
|
| 1334 | + } else if ($geodir_show_location_url == 'city') {
|
|
| 1335 | + $hide_text_part = array('gd_country', 'gd_region');
|
|
| 1336 | 1336 | |
| 1337 | - if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
|
|
| 1338 | - unset( $location_terms['gd_country'] ); |
|
| 1337 | + if (isset($location_terms['gd_country']) && !$location_manager) {
|
|
| 1338 | + unset($location_terms['gd_country']); |
|
| 1339 | 1339 | } |
| 1340 | - if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
|
|
| 1341 | - unset( $location_terms['gd_region'] ); |
|
| 1340 | + if (isset($location_terms['gd_region']) && !$location_manager) {
|
|
| 1341 | + unset($location_terms['gd_region']); |
|
| 1342 | 1342 | } |
| 1343 | 1343 | } |
| 1344 | 1344 | |
| 1345 | 1345 | $is_location_last = ''; |
| 1346 | 1346 | $is_taxonomy_last = ''; |
| 1347 | 1347 | $breadcrumb .= '<li>'; |
| 1348 | - if ( get_query_var( $gd_post_type . 'category' ) ) {
|
|
| 1349 | - $gd_taxonomy = $gd_post_type . 'category'; |
|
| 1350 | - } elseif ( get_query_var( $gd_post_type . '_tags' ) ) {
|
|
| 1351 | - $gd_taxonomy = $gd_post_type . '_tags'; |
|
| 1348 | + if (get_query_var($gd_post_type.'category')) {
|
|
| 1349 | + $gd_taxonomy = $gd_post_type.'category'; |
|
| 1350 | + } elseif (get_query_var($gd_post_type.'_tags')) {
|
|
| 1351 | + $gd_taxonomy = $gd_post_type.'_tags'; |
|
| 1352 | 1352 | } |
| 1353 | 1353 | |
| 1354 | - $breadcrumb .= $separator . '<a href="' . $listing_link . '">' . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; |
|
| 1355 | - if ( ! empty( $gd_taxonomy ) || geodir_is_page( 'detail' ) ) {
|
|
| 1354 | + $breadcrumb .= $separator.'<a href="'.$listing_link.'">'.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory').'</a>'; |
|
| 1355 | + if (!empty($gd_taxonomy) || geodir_is_page('detail')) {
|
|
| 1356 | 1356 | $is_location_last = false; |
| 1357 | 1357 | } else {
|
| 1358 | 1358 | $is_location_last = true; |
| 1359 | 1359 | } |
| 1360 | 1360 | |
| 1361 | - if ( ! empty( $gd_taxonomy ) && geodir_is_page( 'listing' ) ) {
|
|
| 1361 | + if (!empty($gd_taxonomy) && geodir_is_page('listing')) {
|
|
| 1362 | 1362 | $is_taxonomy_last = true; |
| 1363 | 1363 | } else {
|
| 1364 | 1364 | $is_taxonomy_last = false; |
| 1365 | 1365 | } |
| 1366 | 1366 | |
| 1367 | - if ( ! empty( $location_terms ) ) {
|
|
| 1368 | - $geodir_get_locations = function_exists( 'get_actual_location_name' ) ? true : false; |
|
| 1367 | + if (!empty($location_terms)) {
|
|
| 1368 | + $geodir_get_locations = function_exists('get_actual_location_name') ? true : false;
|
|
| 1369 | 1369 | |
| 1370 | - foreach ( $location_terms as $key => $location_term ) {
|
|
| 1371 | - if ( $location_term != '' ) {
|
|
| 1372 | - if ( ! empty( $hide_url_part ) && in_array( $key, $hide_url_part ) ) { // Hide location part from url & breadcrumb.
|
|
| 1370 | + foreach ($location_terms as $key => $location_term) {
|
|
| 1371 | + if ($location_term != '') {
|
|
| 1372 | + if (!empty($hide_url_part) && in_array($key, $hide_url_part)) { // Hide location part from url & breadcrumb.
|
|
| 1373 | 1373 | continue; |
| 1374 | 1374 | } |
| 1375 | 1375 | |
| 1376 | - $gd_location_link_text = preg_replace( '/-(\d+)$/', '', $location_term ); |
|
| 1377 | - $gd_location_link_text = preg_replace( '/[_-]/', ' ', $gd_location_link_text ); |
|
| 1378 | - $gd_location_link_text = geodir_utf8_ucfirst( $gd_location_link_text ); |
|
| 1376 | + $gd_location_link_text = preg_replace('/-(\d+)$/', '', $location_term);
|
|
| 1377 | + $gd_location_link_text = preg_replace('/[_-]/', ' ', $gd_location_link_text);
|
|
| 1378 | + $gd_location_link_text = geodir_utf8_ucfirst($gd_location_link_text); |
|
| 1379 | 1379 | |
| 1380 | 1380 | $location_term_actual_country = ''; |
| 1381 | 1381 | $location_term_actual_region = ''; |
| 1382 | 1382 | $location_term_actual_city = ''; |
| 1383 | 1383 | $location_term_actual_neighbourhood = ''; |
| 1384 | - if ( $geodir_get_locations ) {
|
|
| 1385 | - if ( $key == 'gd_country' ) {
|
|
| 1386 | - $location_term_actual_country = get_actual_location_name( 'country', $location_term, true ); |
|
| 1387 | - } else if ( $key == 'gd_region' ) {
|
|
| 1388 | - $location_term_actual_region = get_actual_location_name( 'region', $location_term, true ); |
|
| 1389 | - } else if ( $key == 'gd_city' ) {
|
|
| 1390 | - $location_term_actual_city = get_actual_location_name( 'city', $location_term, true ); |
|
| 1391 | - } else if ( $key == 'gd_neighbourhood' ) {
|
|
| 1392 | - $location_term_actual_neighbourhood = get_actual_location_name( 'neighbourhood', $location_term, true ); |
|
| 1384 | + if ($geodir_get_locations) {
|
|
| 1385 | + if ($key == 'gd_country') {
|
|
| 1386 | + $location_term_actual_country = get_actual_location_name('country', $location_term, true);
|
|
| 1387 | + } else if ($key == 'gd_region') {
|
|
| 1388 | + $location_term_actual_region = get_actual_location_name('region', $location_term, true);
|
|
| 1389 | + } else if ($key == 'gd_city') {
|
|
| 1390 | + $location_term_actual_city = get_actual_location_name('city', $location_term, true);
|
|
| 1391 | + } else if ($key == 'gd_neighbourhood') {
|
|
| 1392 | + $location_term_actual_neighbourhood = get_actual_location_name('neighbourhood', $location_term, true);
|
|
| 1393 | 1393 | } |
| 1394 | 1394 | } else {
|
| 1395 | 1395 | $location_info = geodir_get_location(); |
| 1396 | 1396 | |
| 1397 | - if ( ! empty( $location_info ) && isset( $location_info->location_id ) ) {
|
|
| 1398 | - if ( $key == 'gd_country' ) {
|
|
| 1399 | - $location_term_actual_country = __( $location_info->country, 'geodirectory' ); |
|
| 1400 | - } else if ( $key == 'gd_region' ) {
|
|
| 1401 | - $location_term_actual_region = __( $location_info->region, 'geodirectory' ); |
|
| 1402 | - } else if ( $key == 'gd_city' ) {
|
|
| 1403 | - $location_term_actual_city = __( $location_info->city, 'geodirectory' ); |
|
| 1397 | + if (!empty($location_info) && isset($location_info->location_id)) {
|
|
| 1398 | + if ($key == 'gd_country') {
|
|
| 1399 | + $location_term_actual_country = __($location_info->country, 'geodirectory'); |
|
| 1400 | + } else if ($key == 'gd_region') {
|
|
| 1401 | + $location_term_actual_region = __($location_info->region, 'geodirectory'); |
|
| 1402 | + } else if ($key == 'gd_city') {
|
|
| 1403 | + $location_term_actual_city = __($location_info->city, 'geodirectory'); |
|
| 1404 | 1404 | } |
| 1405 | 1405 | } |
| 1406 | 1406 | } |
| 1407 | 1407 | |
| 1408 | - 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'] != '' ) ) {
|
|
| 1409 | - $breadcrumb .= $location_term_actual_country != '' ? $separator . $location_term_actual_country : $separator . $gd_location_link_text; |
|
| 1410 | - } else if ( $is_location_last && $key == 'gd_region' && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {
|
|
| 1411 | - $breadcrumb .= $location_term_actual_region != '' ? $separator . $location_term_actual_region : $separator . $gd_location_link_text; |
|
| 1412 | - } else if ( $is_location_last && $key == 'gd_city' && empty( $location_terms['gd_neighbourhood'] ) ) {
|
|
| 1413 | - $breadcrumb .= $location_term_actual_city != '' ? $separator . $location_term_actual_city : $separator . $gd_location_link_text; |
|
| 1414 | - } else if ( $is_location_last && $key == 'gd_neighbourhood' ) {
|
|
| 1415 | - $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator . $location_term_actual_neighbourhood : $separator . $gd_location_link_text; |
|
| 1408 | + 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'] != '')) {
|
|
| 1409 | + $breadcrumb .= $location_term_actual_country != '' ? $separator.$location_term_actual_country : $separator.$gd_location_link_text; |
|
| 1410 | + } else if ($is_location_last && $key == 'gd_region' && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {
|
|
| 1411 | + $breadcrumb .= $location_term_actual_region != '' ? $separator.$location_term_actual_region : $separator.$gd_location_link_text; |
|
| 1412 | + } else if ($is_location_last && $key == 'gd_city' && empty($location_terms['gd_neighbourhood'])) {
|
|
| 1413 | + $breadcrumb .= $location_term_actual_city != '' ? $separator.$location_term_actual_city : $separator.$gd_location_link_text; |
|
| 1414 | + } else if ($is_location_last && $key == 'gd_neighbourhood') {
|
|
| 1415 | + $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator.$location_term_actual_neighbourhood : $separator.$gd_location_link_text; |
|
| 1416 | 1416 | } else {
|
| 1417 | - if ( get_option( 'permalink_structure' ) != '' ) {
|
|
| 1418 | - $location_link .= $location_term . '/'; |
|
| 1417 | + if (get_option('permalink_structure') != '') {
|
|
| 1418 | + $location_link .= $location_term.'/'; |
|
| 1419 | 1419 | } else {
|
| 1420 | - $location_link .= "&$key=" . $location_term; |
|
| 1420 | + $location_link .= "&$key=".$location_term; |
|
| 1421 | 1421 | } |
| 1422 | 1422 | |
| 1423 | - if ( $key == 'gd_country' && $location_term_actual_country != '' ) {
|
|
| 1423 | + if ($key == 'gd_country' && $location_term_actual_country != '') {
|
|
| 1424 | 1424 | $gd_location_link_text = $location_term_actual_country; |
| 1425 | - } else if ( $key == 'gd_region' && $location_term_actual_region != '' ) {
|
|
| 1425 | + } else if ($key == 'gd_region' && $location_term_actual_region != '') {
|
|
| 1426 | 1426 | $gd_location_link_text = $location_term_actual_region; |
| 1427 | - } else if ( $key == 'gd_city' && $location_term_actual_city != '' ) {
|
|
| 1427 | + } else if ($key == 'gd_city' && $location_term_actual_city != '') {
|
|
| 1428 | 1428 | $gd_location_link_text = $location_term_actual_city; |
| 1429 | - } else if ( $key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '' ) {
|
|
| 1429 | + } else if ($key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '') {
|
|
| 1430 | 1430 | $gd_location_link_text = $location_term_actual_neighbourhood; |
| 1431 | 1431 | } |
| 1432 | 1432 | |
@@ -1436,77 +1436,77 @@ discard block |
||
| 1436 | 1436 | } |
| 1437 | 1437 | */ |
| 1438 | 1438 | |
| 1439 | - $breadcrumb .= $separator . '<a href="' . $location_link . '">' . $gd_location_link_text . '</a>'; |
|
| 1439 | + $breadcrumb .= $separator.'<a href="'.$location_link.'">'.$gd_location_link_text.'</a>'; |
|
| 1440 | 1440 | } |
| 1441 | 1441 | } |
| 1442 | 1442 | } |
| 1443 | 1443 | } |
| 1444 | 1444 | |
| 1445 | - if ( ! empty( $gd_taxonomy ) ) {
|
|
| 1445 | + if (!empty($gd_taxonomy)) {
|
|
| 1446 | 1446 | $term_index = 1; |
| 1447 | 1447 | |
| 1448 | 1448 | //if(get_option('geodir_add_categories_url'))
|
| 1449 | 1449 | {
|
| 1450 | - if ( get_query_var( $gd_post_type . '_tags' ) ) {
|
|
| 1451 | - $cat_link = $listing_link . 'tags/'; |
|
| 1450 | + if (get_query_var($gd_post_type.'_tags')) {
|
|
| 1451 | + $cat_link = $listing_link.'tags/'; |
|
| 1452 | 1452 | } else {
|
| 1453 | 1453 | $cat_link = $listing_link; |
| 1454 | 1454 | } |
| 1455 | 1455 | |
| 1456 | - foreach ( $location_terms as $key => $location_term ) {
|
|
| 1457 | - if ( $location_manager && in_array( $key, $hide_url_part ) ) {
|
|
| 1456 | + foreach ($location_terms as $key => $location_term) {
|
|
| 1457 | + if ($location_manager && in_array($key, $hide_url_part)) {
|
|
| 1458 | 1458 | continue; |
| 1459 | 1459 | } |
| 1460 | 1460 | |
| 1461 | - if ( $location_term != '' ) {
|
|
| 1462 | - if ( get_option( 'permalink_structure' ) != '' ) {
|
|
| 1463 | - $cat_link .= $location_term . '/'; |
|
| 1461 | + if ($location_term != '') {
|
|
| 1462 | + if (get_option('permalink_structure') != '') {
|
|
| 1463 | + $cat_link .= $location_term.'/'; |
|
| 1464 | 1464 | } |
| 1465 | 1465 | } |
| 1466 | 1466 | } |
| 1467 | 1467 | |
| 1468 | - $term_array = explode( "/", trim( $wp_query->query[ $gd_taxonomy ], "/" ) ); |
|
| 1469 | - foreach ( $term_array as $term ) {
|
|
| 1470 | - $term_link_text = preg_replace( '/-(\d+)$/', '', $term ); |
|
| 1471 | - $term_link_text = preg_replace( '/[_-]/', ' ', $term_link_text ); |
|
| 1468 | + $term_array = explode("/", trim($wp_query->query[$gd_taxonomy], "/"));
|
|
| 1469 | + foreach ($term_array as $term) {
|
|
| 1470 | + $term_link_text = preg_replace('/-(\d+)$/', '', $term);
|
|
| 1471 | + $term_link_text = preg_replace('/[_-]/', ' ', $term_link_text);
|
|
| 1472 | 1472 | |
| 1473 | 1473 | // get term actual name |
| 1474 | - $term_info = get_term_by( 'slug', $term, $gd_taxonomy, 'ARRAY_A' ); |
|
| 1475 | - if ( ! empty( $term_info ) && isset( $term_info['name'] ) && $term_info['name'] != '' ) {
|
|
| 1476 | - $term_link_text = urldecode( $term_info['name'] ); |
|
| 1474 | + $term_info = get_term_by('slug', $term, $gd_taxonomy, 'ARRAY_A');
|
|
| 1475 | + if (!empty($term_info) && isset($term_info['name']) && $term_info['name'] != '') {
|
|
| 1476 | + $term_link_text = urldecode($term_info['name']); |
|
| 1477 | 1477 | } else {
|
| 1478 | 1478 | continue; |
| 1479 | 1479 | //$term_link_text = wp_strip_all_tags(geodir_ucwords(urldecode($term_link_text))); |
| 1480 | 1480 | } |
| 1481 | 1481 | |
| 1482 | - if ( $term_index == count( $term_array ) && $is_taxonomy_last ) {
|
|
| 1483 | - $breadcrumb .= $separator . $term_link_text; |
|
| 1482 | + if ($term_index == count($term_array) && $is_taxonomy_last) {
|
|
| 1483 | + $breadcrumb .= $separator.$term_link_text; |
|
| 1484 | 1484 | } else {
|
| 1485 | - $cat_link .= $term . '/'; |
|
| 1486 | - $breadcrumb .= $separator . '<a href="' . $cat_link . '">' . $term_link_text . '</a>'; |
|
| 1485 | + $cat_link .= $term.'/'; |
|
| 1486 | + $breadcrumb .= $separator.'<a href="'.$cat_link.'">'.$term_link_text.'</a>'; |
|
| 1487 | 1487 | } |
| 1488 | - $term_index ++; |
|
| 1488 | + $term_index++; |
|
| 1489 | 1489 | } |
| 1490 | 1490 | } |
| 1491 | 1491 | |
| 1492 | 1492 | |
| 1493 | 1493 | } |
| 1494 | 1494 | |
| 1495 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 1496 | - $breadcrumb .= $separator . get_the_title(); |
|
| 1495 | + if (geodir_is_page('detail')) {
|
|
| 1496 | + $breadcrumb .= $separator.get_the_title(); |
|
| 1497 | 1497 | } |
| 1498 | 1498 | |
| 1499 | 1499 | $breadcrumb .= '</li>'; |
| 1500 | 1500 | |
| 1501 | 1501 | |
| 1502 | - } elseif ( geodir_is_page( 'author' ) ) {
|
|
| 1502 | + } elseif (geodir_is_page('author')) {
|
|
| 1503 | 1503 | $dashboard_post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : $gd_post_type; |
| 1504 | 1504 | $user_id = get_current_user_id(); |
| 1505 | - $author_link = get_author_posts_url( $user_id ); |
|
| 1506 | - $default_author_link = geodir_getlink( $author_link, array( |
|
| 1505 | + $author_link = get_author_posts_url($user_id); |
|
| 1506 | + $default_author_link = geodir_getlink($author_link, array( |
|
| 1507 | 1507 | 'geodir_dashbord' => 'true', |
| 1508 | 1508 | 'stype' => $dashboard_post_type |
| 1509 | - ), false ); |
|
| 1509 | + ), false); |
|
| 1510 | 1510 | |
| 1511 | 1511 | /** |
| 1512 | 1512 | * Filter author page link. |
@@ -1516,16 +1516,16 @@ discard block |
||
| 1516 | 1516 | * @param string $default_author_link Default author link. |
| 1517 | 1517 | * @param int $user_id Author ID. |
| 1518 | 1518 | */ |
| 1519 | - $default_author_link = apply_filters( 'geodir_dashboard_author_link', $default_author_link, $user_id ); |
|
| 1519 | + $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_id);
|
|
| 1520 | 1520 | |
| 1521 | 1521 | $breadcrumb .= '<li>'; |
| 1522 | - $breadcrumb .= $separator . '<a href="' . $default_author_link . '">' . __( 'My Dashboard', 'geodirectory' ) . '</a>'; |
|
| 1522 | + $breadcrumb .= $separator.'<a href="'.$default_author_link.'">'.__('My Dashboard', 'geodirectory').'</a>';
|
|
| 1523 | 1523 | |
| 1524 | - if ( isset( $_REQUEST['list'] ) ) {
|
|
| 1525 | - $author_link = geodir_getlink( $author_link, array( |
|
| 1524 | + if (isset($_REQUEST['list'])) {
|
|
| 1525 | + $author_link = geodir_getlink($author_link, array( |
|
| 1526 | 1526 | 'geodir_dashbord' => 'true', |
| 1527 | 1527 | 'stype' => $_REQUEST['stype'] |
| 1528 | - ), false ); |
|
| 1528 | + ), false); |
|
| 1529 | 1529 | |
| 1530 | 1530 | /** |
| 1531 | 1531 | * Filter author page link. |
@@ -1536,64 +1536,64 @@ discard block |
||
| 1536 | 1536 | * @param int $user_id Author ID. |
| 1537 | 1537 | * @param string $_REQUEST ['stype'] Post type. |
| 1538 | 1538 | */ |
| 1539 | - $author_link = apply_filters( 'geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype'] ); |
|
| 1539 | + $author_link = apply_filters('geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype']);
|
|
| 1540 | 1540 | |
| 1541 | - $breadcrumb .= $separator . '<a href="' . $author_link . '">' . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; |
|
| 1542 | - if($_REQUEST['list']=='favourite'){
|
|
| 1543 | - $breadcrumb .= $separator . MY_FAVOURITE_TEXT; |
|
| 1541 | + $breadcrumb .= $separator.'<a href="'.$author_link.'">'.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory').'</a>'; |
|
| 1542 | + if ($_REQUEST['list'] == 'favourite') {
|
|
| 1543 | + $breadcrumb .= $separator.MY_FAVOURITE_TEXT; |
|
| 1544 | 1544 | } |
| 1545 | 1545 | |
| 1546 | 1546 | } else {
|
| 1547 | - $breadcrumb .= $separator . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' ); |
|
| 1547 | + $breadcrumb .= $separator.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory'); |
|
| 1548 | 1548 | } |
| 1549 | 1549 | |
| 1550 | 1550 | $breadcrumb .= '</li>'; |
| 1551 | - } elseif ( is_category() || is_single() ) {
|
|
| 1551 | + } elseif (is_category() || is_single()) {
|
|
| 1552 | 1552 | $category = get_the_category(); |
| 1553 | - if ( is_category() ) {
|
|
| 1554 | - $breadcrumb .= '<li>' . $separator . $category[0]->cat_name . '</li>'; |
|
| 1553 | + if (is_category()) {
|
|
| 1554 | + $breadcrumb .= '<li>'.$separator.$category[0]->cat_name.'</li>'; |
|
| 1555 | 1555 | } |
| 1556 | - if ( is_single() ) {
|
|
| 1557 | - $breadcrumb .= '<li>' . $separator . '<a href="' . get_category_link( $category[0]->term_id ) . '">' . $category[0]->cat_name . '</a></li>'; |
|
| 1558 | - $breadcrumb .= '<li>' . $separator . get_the_title() . '</li>'; |
|
| 1556 | + if (is_single()) {
|
|
| 1557 | + $breadcrumb .= '<li>'.$separator.'<a href="'.get_category_link($category[0]->term_id).'">'.$category[0]->cat_name.'</a></li>'; |
|
| 1558 | + $breadcrumb .= '<li>'.$separator.get_the_title().'</li>'; |
|
| 1559 | 1559 | } |
| 1560 | 1560 | /* End of my version ##################################################### */ |
| 1561 | - } else if ( is_page() ) {
|
|
| 1561 | + } else if (is_page()) {
|
|
| 1562 | 1562 | $page_title = get_the_title(); |
| 1563 | 1563 | |
| 1564 | - if ( geodir_is_page( 'location' ) ) {
|
|
| 1564 | + if (geodir_is_page('location')) {
|
|
| 1565 | 1565 | $location_page_id = geodir_location_page_id(); |
| 1566 | - $loc_post = get_post( $location_page_id ); |
|
| 1566 | + $loc_post = get_post($location_page_id); |
|
| 1567 | 1567 | $post_name = $loc_post->post_name; |
| 1568 | - $slug = ucwords( str_replace( '-', ' ', $post_name ) ); |
|
| 1569 | - $page_title = ! empty( $slug ) ? $slug : __( 'Location', 'geodirectory' ); |
|
| 1568 | + $slug = ucwords(str_replace('-', ' ', $post_name));
|
|
| 1569 | + $page_title = !empty($slug) ? $slug : __('Location', 'geodirectory');
|
|
| 1570 | 1570 | } |
| 1571 | 1571 | |
| 1572 | - $breadcrumb .= '<li>' . $separator; |
|
| 1573 | - $breadcrumb .= stripslashes_deep( $page_title ); |
|
| 1572 | + $breadcrumb .= '<li>'.$separator; |
|
| 1573 | + $breadcrumb .= stripslashes_deep($page_title); |
|
| 1574 | 1574 | $breadcrumb .= '</li>'; |
| 1575 | - } else if ( is_tag() ) {
|
|
| 1576 | - $breadcrumb .= "<li> " . $separator . single_tag_title( '', false ) . '</li>'; |
|
| 1577 | - } else if ( is_day() ) {
|
|
| 1578 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1579 | - the_time( 'F jS, Y' ); |
|
| 1575 | + } else if (is_tag()) {
|
|
| 1576 | + $breadcrumb .= "<li> ".$separator.single_tag_title('', false).'</li>';
|
|
| 1577 | + } else if (is_day()) {
|
|
| 1578 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1579 | + the_time('F jS, Y');
|
|
| 1580 | 1580 | $breadcrumb .= '</li>'; |
| 1581 | - } else if ( is_month() ) {
|
|
| 1582 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1583 | - the_time( 'F, Y' ); |
|
| 1581 | + } else if (is_month()) {
|
|
| 1582 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1583 | + the_time('F, Y');
|
|
| 1584 | 1584 | $breadcrumb .= '</li>'; |
| 1585 | - } else if ( is_year() ) {
|
|
| 1586 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1587 | - the_time( 'Y' ); |
|
| 1585 | + } else if (is_year()) {
|
|
| 1586 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1587 | + the_time('Y');
|
|
| 1588 | 1588 | $breadcrumb .= '</li>'; |
| 1589 | - } else if ( is_author() ) {
|
|
| 1590 | - $breadcrumb .= "<li> " . $separator . __( " Author Archive", 'geodirectory' ); |
|
| 1589 | + } else if (is_author()) {
|
|
| 1590 | + $breadcrumb .= "<li> ".$separator.__(" Author Archive", 'geodirectory');
|
|
| 1591 | 1591 | $breadcrumb .= '</li>'; |
| 1592 | - } else if ( isset( $_GET['paged'] ) && ! empty( $_GET['paged'] ) ) {
|
|
| 1593 | - $breadcrumb .= "<li>" . $separator . __( "Blog Archives", 'geodirectory' ); |
|
| 1592 | + } else if (isset($_GET['paged']) && !empty($_GET['paged'])) {
|
|
| 1593 | + $breadcrumb .= "<li>".$separator.__("Blog Archives", 'geodirectory');
|
|
| 1594 | 1594 | $breadcrumb .= '</li>'; |
| 1595 | - } else if ( is_search() ) {
|
|
| 1596 | - $breadcrumb .= "<li> " . $separator . __( " Search Results", 'geodirectory' ); |
|
| 1595 | + } else if (is_search()) {
|
|
| 1596 | + $breadcrumb .= "<li> ".$separator.__(" Search Results", 'geodirectory');
|
|
| 1597 | 1597 | $breadcrumb .= '</li>'; |
| 1598 | 1598 | } |
| 1599 | 1599 | $breadcrumb .= '</ul></div>'; |
@@ -1606,13 +1606,13 @@ discard block |
||
| 1606 | 1606 | * @param string $breadcrumb Breadcrumb HTML. |
| 1607 | 1607 | * @param string $separator Breadcrumb separator. |
| 1608 | 1608 | */ |
| 1609 | - echo $breadcrumb = apply_filters( 'geodir_breadcrumb', $breadcrumb, $separator ); |
|
| 1609 | + echo $breadcrumb = apply_filters('geodir_breadcrumb', $breadcrumb, $separator);
|
|
| 1610 | 1610 | } |
| 1611 | 1611 | } |
| 1612 | 1612 | |
| 1613 | 1613 | |
| 1614 | -add_action( "admin_init", "geodir_allow_wpadmin" ); // check user is admin |
|
| 1615 | -if ( ! function_exists( 'geodir_allow_wpadmin' ) ) {
|
|
| 1614 | +add_action("admin_init", "geodir_allow_wpadmin"); // check user is admin
|
|
| 1615 | +if (!function_exists('geodir_allow_wpadmin')) {
|
|
| 1616 | 1616 | /** |
| 1617 | 1617 | * Allow only admins to access wp-admin. |
| 1618 | 1618 | * |
@@ -1624,12 +1624,12 @@ discard block |
||
| 1624 | 1624 | */ |
| 1625 | 1625 | function geodir_allow_wpadmin() {
|
| 1626 | 1626 | global $wpdb; |
| 1627 | - if ( get_option( 'geodir_allow_wpadmin' ) == '0' && is_user_logged_in() && ( ! defined( 'DOING_AJAX' ) ) ) // checking action in request to allow ajax request go through |
|
| 1627 | + if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && (!defined('DOING_AJAX'))) // checking action in request to allow ajax request go through
|
|
| 1628 | 1628 | {
|
| 1629 | - if ( current_user_can( 'administrator' ) ) {
|
|
| 1629 | + if (current_user_can('administrator')) {
|
|
| 1630 | 1630 | } else {
|
| 1631 | 1631 | |
| 1632 | - wp_redirect( home_url() ); |
|
| 1632 | + wp_redirect(home_url()); |
|
| 1633 | 1633 | exit; |
| 1634 | 1634 | } |
| 1635 | 1635 | |
@@ -1648,23 +1648,23 @@ discard block |
||
| 1648 | 1648 | * |
| 1649 | 1649 | * @return array|WP_Error The uploaded data as array. When failure returns error. |
| 1650 | 1650 | */ |
| 1651 | -function fetch_remote_file( $url ) {
|
|
| 1651 | +function fetch_remote_file($url) {
|
|
| 1652 | 1652 | // extract the file name and extension from the url |
| 1653 | - require_once( ABSPATH . 'wp-includes/pluggable.php' ); |
|
| 1654 | - $file_name = basename( $url ); |
|
| 1655 | - if ( strpos( $file_name, '?' ) !== false ) {
|
|
| 1656 | - list( $file_name ) = explode( '?', $file_name ); |
|
| 1653 | + require_once(ABSPATH.'wp-includes/pluggable.php'); |
|
| 1654 | + $file_name = basename($url); |
|
| 1655 | + if (strpos($file_name, '?') !== false) {
|
|
| 1656 | + list($file_name) = explode('?', $file_name);
|
|
| 1657 | 1657 | } |
| 1658 | 1658 | $dummy = false; |
| 1659 | 1659 | $add_to_cache = false; |
| 1660 | 1660 | $key = null; |
| 1661 | - if ( strpos( $url, '/dummy/' ) !== false ) {
|
|
| 1661 | + if (strpos($url, '/dummy/') !== false) {
|
|
| 1662 | 1662 | $dummy = true; |
| 1663 | - $key = "dummy_" . str_replace( '.', '_', $file_name ); |
|
| 1664 | - $value = get_transient( 'cached_dummy_images' ); |
|
| 1665 | - if ( $value ) {
|
|
| 1666 | - if ( isset( $value[ $key ] ) ) {
|
|
| 1667 | - return $value[ $key ]; |
|
| 1663 | + $key = "dummy_".str_replace('.', '_', $file_name);
|
|
| 1664 | + $value = get_transient('cached_dummy_images');
|
|
| 1665 | + if ($value) {
|
|
| 1666 | + if (isset($value[$key])) {
|
|
| 1667 | + return $value[$key]; |
|
| 1668 | 1668 | } else {
|
| 1669 | 1669 | $add_to_cache = true; |
| 1670 | 1670 | } |
@@ -1675,62 +1675,62 @@ discard block |
||
| 1675 | 1675 | |
| 1676 | 1676 | // get placeholder file in the upload dir with a unique, sanitized filename |
| 1677 | 1677 | |
| 1678 | - $post_upload_date = isset( $post['upload_date'] ) ? $post['upload_date'] : ''; |
|
| 1678 | + $post_upload_date = isset($post['upload_date']) ? $post['upload_date'] : ''; |
|
| 1679 | 1679 | |
| 1680 | - $upload = wp_upload_bits( $file_name, 0, '', $post_upload_date ); |
|
| 1681 | - if ( $upload['error'] ) {
|
|
| 1682 | - return new WP_Error( 'upload_dir_error', $upload['error'] ); |
|
| 1680 | + $upload = wp_upload_bits($file_name, 0, '', $post_upload_date); |
|
| 1681 | + if ($upload['error']) {
|
|
| 1682 | + return new WP_Error('upload_dir_error', $upload['error']);
|
|
| 1683 | 1683 | } |
| 1684 | 1684 | |
| 1685 | 1685 | |
| 1686 | - sleep( 0.3 );// if multiple remote file this can cause the remote server to timeout so we add a slight delay |
|
| 1686 | + sleep(0.3); // if multiple remote file this can cause the remote server to timeout so we add a slight delay |
|
| 1687 | 1687 | |
| 1688 | 1688 | // fetch the remote url and write it to the placeholder file |
| 1689 | - $headers = wp_remote_get( $url, array( 'stream' => true, 'filename' => $upload['file'] ) ); |
|
| 1689 | + $headers = wp_remote_get($url, array('stream' => true, 'filename' => $upload['file']));
|
|
| 1690 | 1690 | |
| 1691 | 1691 | $log_message = ''; |
| 1692 | - if ( is_wp_error( $headers ) ) {
|
|
| 1693 | - echo 'file: ' . $url; |
|
| 1692 | + if (is_wp_error($headers)) {
|
|
| 1693 | + echo 'file: '.$url; |
|
| 1694 | 1694 | |
| 1695 | - return new WP_Error( 'import_file_error', $headers->get_error_message() ); |
|
| 1695 | + return new WP_Error('import_file_error', $headers->get_error_message());
|
|
| 1696 | 1696 | } |
| 1697 | 1697 | |
| 1698 | 1698 | // clear cache to make compat with EWWW Image Optimizer |
| 1699 | - if(defined( 'EWWW_IMAGE_OPTIMIZER_PLUGIN_FILE')){
|
|
| 1699 | + if (defined('EWWW_IMAGE_OPTIMIZER_PLUGIN_FILE')) {
|
|
| 1700 | 1700 | clearstatcache(); |
| 1701 | 1701 | } |
| 1702 | - $filesize = filesize( $upload['file'] ); |
|
| 1702 | + $filesize = filesize($upload['file']); |
|
| 1703 | 1703 | // request failed |
| 1704 | - if ( ! $headers ) {
|
|
| 1705 | - $log_message = __( 'Remote server did not respond', 'geodirectory' ); |
|
| 1704 | + if (!$headers) {
|
|
| 1705 | + $log_message = __('Remote server did not respond', 'geodirectory');
|
|
| 1706 | 1706 | } // make sure the fetch was successful |
| 1707 | - elseif ( $headers['response']['code'] != '200' ) {
|
|
| 1708 | - $log_message = sprintf( __( 'Remote server returned error response %1$d %2$s', 'geodirectory' ), esc_html( $headers['response'] ), get_status_header_desc( $headers['response'] ) ); |
|
| 1709 | - } elseif ( isset( $headers['headers']['content-length'] ) && $filesize != $headers['headers']['content-length'] ) {
|
|
| 1710 | - $log_message = __( 'Remote file is incorrect size', 'geodirectory' ); |
|
| 1711 | - } elseif ( 0 == $filesize ) {
|
|
| 1712 | - $log_message = __( 'Zero size file downloaded', 'geodirectory' ); |
|
| 1713 | - } |
|
| 1714 | - |
|
| 1715 | - if ( $log_message ) {
|
|
| 1716 | - $del = unlink( $upload['file'] ); |
|
| 1717 | - if ( ! $del ) {
|
|
| 1718 | - geodir_error_log( __( 'GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory' ) ); |
|
| 1707 | + elseif ($headers['response']['code'] != '200') {
|
|
| 1708 | + $log_message = sprintf(__('Remote server returned error response %1$d %2$s', 'geodirectory'), esc_html($headers['response']), get_status_header_desc($headers['response']));
|
|
| 1709 | + } elseif (isset($headers['headers']['content-length']) && $filesize != $headers['headers']['content-length']) {
|
|
| 1710 | + $log_message = __('Remote file is incorrect size', 'geodirectory');
|
|
| 1711 | + } elseif (0 == $filesize) {
|
|
| 1712 | + $log_message = __('Zero size file downloaded', 'geodirectory');
|
|
| 1713 | + } |
|
| 1714 | + |
|
| 1715 | + if ($log_message) {
|
|
| 1716 | + $del = unlink($upload['file']); |
|
| 1717 | + if (!$del) {
|
|
| 1718 | + geodir_error_log(__('GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory'));
|
|
| 1719 | 1719 | } |
| 1720 | 1720 | |
| 1721 | - return new WP_Error( 'import_file_error', $log_message ); |
|
| 1721 | + return new WP_Error('import_file_error', $log_message);
|
|
| 1722 | 1722 | } |
| 1723 | 1723 | |
| 1724 | - if ( $dummy && $add_to_cache && is_array( $upload ) ) {
|
|
| 1725 | - $images = get_transient( 'cached_dummy_images' ); |
|
| 1726 | - if ( is_array( $images ) ) {
|
|
| 1727 | - $images[ $key ] = $upload; |
|
| 1724 | + if ($dummy && $add_to_cache && is_array($upload)) {
|
|
| 1725 | + $images = get_transient('cached_dummy_images');
|
|
| 1726 | + if (is_array($images)) {
|
|
| 1727 | + $images[$key] = $upload; |
|
| 1728 | 1728 | } else {
|
| 1729 | - $images = array( $key => $upload ); |
|
| 1729 | + $images = array($key => $upload); |
|
| 1730 | 1730 | } |
| 1731 | 1731 | |
| 1732 | 1732 | //setting the cache using the WP Transient API |
| 1733 | - set_transient( 'cached_dummy_images', $images, 60 * 10 ); //10 minutes cache |
|
| 1733 | + set_transient('cached_dummy_images', $images, 60 * 10); //10 minutes cache
|
|
| 1734 | 1734 | } |
| 1735 | 1735 | |
| 1736 | 1736 | return $upload; |
@@ -1744,12 +1744,12 @@ discard block |
||
| 1744 | 1744 | * @return string|void Max upload size. |
| 1745 | 1745 | */ |
| 1746 | 1746 | function geodir_max_upload_size() {
|
| 1747 | - $max_filesize = (float) get_option( 'geodir_upload_max_filesize', 2 ); |
|
| 1747 | + $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);
|
|
| 1748 | 1748 | |
| 1749 | - if ( $max_filesize > 0 && $max_filesize < 1 ) {
|
|
| 1750 | - $max_filesize = (int) ( $max_filesize * 1024 ) . 'kb'; |
|
| 1749 | + if ($max_filesize > 0 && $max_filesize < 1) {
|
|
| 1750 | + $max_filesize = (int) ($max_filesize * 1024).'kb'; |
|
| 1751 | 1751 | } else {
|
| 1752 | - $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb'; |
|
| 1752 | + $max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb'; |
|
| 1753 | 1753 | } |
| 1754 | 1754 | |
| 1755 | 1755 | /** |
@@ -1759,7 +1759,7 @@ discard block |
||
| 1759 | 1759 | * |
| 1760 | 1760 | * @param string $max_filesize Max file upload size. Ex. 10mb, 512kb. |
| 1761 | 1761 | */ |
| 1762 | - return apply_filters( 'geodir_default_image_upload_size_limit', $max_filesize ); |
|
| 1762 | + return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
|
|
| 1763 | 1763 | } |
| 1764 | 1764 | |
| 1765 | 1765 | /** |
@@ -1772,8 +1772,8 @@ discard block |
||
| 1772 | 1772 | * @return bool If dummy folder exists returns true, else false. |
| 1773 | 1773 | */ |
| 1774 | 1774 | function geodir_dummy_folder_exists() {
|
| 1775 | - $path = geodir_plugin_path() . '/geodirectory-admin/dummy/'; |
|
| 1776 | - if ( ! is_dir( $path ) ) {
|
|
| 1775 | + $path = geodir_plugin_path().'/geodirectory-admin/dummy/'; |
|
| 1776 | + if (!is_dir($path)) {
|
|
| 1777 | 1777 | return false; |
| 1778 | 1778 | } else {
|
| 1779 | 1779 | return true; |
@@ -1792,17 +1792,17 @@ discard block |
||
| 1792 | 1792 | * |
| 1793 | 1793 | * @return object Author info. |
| 1794 | 1794 | */ |
| 1795 | -function geodir_get_author_info( $aid ) {
|
|
| 1795 | +function geodir_get_author_info($aid) {
|
|
| 1796 | 1796 | global $wpdb; |
| 1797 | 1797 | /*$infosql = "select * from $wpdb->users where ID=$aid";*/ |
| 1798 | - $infosql = $wpdb->prepare( "select * from $wpdb->users where ID=%d", array( $aid ) ); |
|
| 1799 | - $info = $wpdb->get_results( $infosql ); |
|
| 1800 | - if ( $info ) {
|
|
| 1798 | + $infosql = $wpdb->prepare("select * from $wpdb->users where ID=%d", array($aid));
|
|
| 1799 | + $info = $wpdb->get_results($infosql); |
|
| 1800 | + if ($info) {
|
|
| 1801 | 1801 | return $info[0]; |
| 1802 | 1802 | } |
| 1803 | 1803 | } |
| 1804 | 1804 | |
| 1805 | -if ( ! function_exists( 'adminEmail' ) ) {
|
|
| 1805 | +if (!function_exists('adminEmail')) {
|
|
| 1806 | 1806 | /** |
| 1807 | 1807 | * Send emails to client on post submission, renew etc. |
| 1808 | 1808 | * |
@@ -1815,67 +1815,67 @@ discard block |
||
| 1815 | 1815 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1816 | 1816 | * @param string $custom_1 Custom data to be sent. |
| 1817 | 1817 | */ |
| 1818 | - function adminEmail( $page_id, $user_id, $message_type, $custom_1 = '' ) {
|
|
| 1818 | + function adminEmail($page_id, $user_id, $message_type, $custom_1 = '') {
|
|
| 1819 | 1819 | global $wpdb; |
| 1820 | - if ( $message_type == 'expiration' ) {
|
|
| 1821 | - $subject = stripslashes( __( get_option( 'renew_email_subject' ), 'geodirectory' ) ); |
|
| 1822 | - $client_message = stripslashes( __( get_option( 'renew_email_content' ), 'geodirectory' ) ); |
|
| 1823 | - } elseif ( $message_type == 'post_submited' ) {
|
|
| 1824 | - $subject = __( get_option( 'post_submited_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1825 | - $client_message = __( get_option( 'post_submited_success_email_content_admin' ), 'geodirectory' ); |
|
| 1826 | - } elseif ( $message_type == 'renew' ) {
|
|
| 1827 | - $subject = __( get_option( 'post_renew_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1828 | - $client_message = __( get_option( 'post_renew_success_email_content_admin' ), 'geodirectory' ); |
|
| 1829 | - } elseif ( $message_type == 'upgrade' ) {
|
|
| 1830 | - $subject = __( get_option( 'post_upgrade_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1831 | - $client_message = __( get_option( 'post_upgrade_success_email_content_admin' ), 'geodirectory' ); |
|
| 1832 | - } elseif ( $message_type == 'claim_approved' ) {
|
|
| 1833 | - $subject = __( get_option( 'claim_approved_email_subject' ), 'geodirectory' ); |
|
| 1834 | - $client_message = __( get_option( 'claim_approved_email_content' ), 'geodirectory' ); |
|
| 1835 | - } elseif ( $message_type == 'claim_rejected' ) {
|
|
| 1836 | - $subject = __( get_option( 'claim_rejected_email_subject' ), 'geodirectory' ); |
|
| 1837 | - $client_message = __( get_option( 'claim_rejected_email_content' ), 'geodirectory' ); |
|
| 1838 | - } elseif ( $message_type == 'claim_requested' ) {
|
|
| 1839 | - $subject = __( get_option( 'claim_email_subject_admin' ), 'geodirectory' ); |
|
| 1840 | - $client_message = __( get_option( 'claim_email_content_admin' ), 'geodirectory' ); |
|
| 1841 | - } elseif ( $message_type == 'auto_claim' ) {
|
|
| 1842 | - $subject = __( get_option( 'auto_claim_email_subject' ), 'geodirectory' ); |
|
| 1843 | - $client_message = __( get_option( 'auto_claim_email_content' ), 'geodirectory' ); |
|
| 1844 | - } elseif ( $message_type == 'payment_success' ) {
|
|
| 1845 | - $subject = __( get_option( 'post_payment_success_admin_email_subject' ), 'geodirectory' ); |
|
| 1846 | - $client_message = __( get_option( 'post_payment_success_admin_email_content' ), 'geodirectory' ); |
|
| 1847 | - } elseif ( $message_type == 'payment_fail' ) {
|
|
| 1848 | - $subject = __( get_option( 'post_payment_fail_admin_email_subject' ), 'geodirectory' ); |
|
| 1849 | - $client_message = __( get_option( 'post_payment_fail_admin_email_content' ), 'geodirectory' ); |
|
| 1820 | + if ($message_type == 'expiration') {
|
|
| 1821 | + $subject = stripslashes(__(get_option('renew_email_subject'), 'geodirectory'));
|
|
| 1822 | + $client_message = stripslashes(__(get_option('renew_email_content'), 'geodirectory'));
|
|
| 1823 | + } elseif ($message_type == 'post_submited') {
|
|
| 1824 | + $subject = __(get_option('post_submited_success_email_subject_admin'), 'geodirectory');
|
|
| 1825 | + $client_message = __(get_option('post_submited_success_email_content_admin'), 'geodirectory');
|
|
| 1826 | + } elseif ($message_type == 'renew') {
|
|
| 1827 | + $subject = __(get_option('post_renew_success_email_subject_admin'), 'geodirectory');
|
|
| 1828 | + $client_message = __(get_option('post_renew_success_email_content_admin'), 'geodirectory');
|
|
| 1829 | + } elseif ($message_type == 'upgrade') {
|
|
| 1830 | + $subject = __(get_option('post_upgrade_success_email_subject_admin'), 'geodirectory');
|
|
| 1831 | + $client_message = __(get_option('post_upgrade_success_email_content_admin'), 'geodirectory');
|
|
| 1832 | + } elseif ($message_type == 'claim_approved') {
|
|
| 1833 | + $subject = __(get_option('claim_approved_email_subject'), 'geodirectory');
|
|
| 1834 | + $client_message = __(get_option('claim_approved_email_content'), 'geodirectory');
|
|
| 1835 | + } elseif ($message_type == 'claim_rejected') {
|
|
| 1836 | + $subject = __(get_option('claim_rejected_email_subject'), 'geodirectory');
|
|
| 1837 | + $client_message = __(get_option('claim_rejected_email_content'), 'geodirectory');
|
|
| 1838 | + } elseif ($message_type == 'claim_requested') {
|
|
| 1839 | + $subject = __(get_option('claim_email_subject_admin'), 'geodirectory');
|
|
| 1840 | + $client_message = __(get_option('claim_email_content_admin'), 'geodirectory');
|
|
| 1841 | + } elseif ($message_type == 'auto_claim') {
|
|
| 1842 | + $subject = __(get_option('auto_claim_email_subject'), 'geodirectory');
|
|
| 1843 | + $client_message = __(get_option('auto_claim_email_content'), 'geodirectory');
|
|
| 1844 | + } elseif ($message_type == 'payment_success') {
|
|
| 1845 | + $subject = __(get_option('post_payment_success_admin_email_subject'), 'geodirectory');
|
|
| 1846 | + $client_message = __(get_option('post_payment_success_admin_email_content'), 'geodirectory');
|
|
| 1847 | + } elseif ($message_type == 'payment_fail') {
|
|
| 1848 | + $subject = __(get_option('post_payment_fail_admin_email_subject'), 'geodirectory');
|
|
| 1849 | + $client_message = __(get_option('post_payment_fail_admin_email_content'), 'geodirectory');
|
|
| 1850 | 1850 | } |
| 1851 | 1851 | $transaction_details = $custom_1; |
| 1852 | - $fromEmail = get_option( 'site_email' ); |
|
| 1852 | + $fromEmail = get_option('site_email');
|
|
| 1853 | 1853 | $fromEmailName = get_site_emailName(); |
| 1854 | 1854 | //$alivedays = get_post_meta($page_id,'alive_days',true); |
| 1855 | - $pkg_limit = get_property_price_info_listing( $page_id ); |
|
| 1855 | + $pkg_limit = get_property_price_info_listing($page_id); |
|
| 1856 | 1856 | $alivedays = $pkg_limit['days']; |
| 1857 | - $productlink = get_permalink( $page_id ); |
|
| 1858 | - $post_info = get_post( $page_id ); |
|
| 1859 | - $post_date = date( 'dS F,Y', strtotime( $post_info->post_date ) ); |
|
| 1860 | - $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>'; |
|
| 1857 | + $productlink = get_permalink($page_id); |
|
| 1858 | + $post_info = get_post($page_id); |
|
| 1859 | + $post_date = date('dS F,Y', strtotime($post_info->post_date));
|
|
| 1860 | + $listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>'; |
|
| 1861 | 1861 | $loginurl = geodir_login_url(); |
| 1862 | - $loginurl_link = '<a href="' . $loginurl . '">login</a>'; |
|
| 1862 | + $loginurl_link = '<a href="'.$loginurl.'">login</a>'; |
|
| 1863 | 1863 | $siteurl = home_url(); |
| 1864 | - $siteurl_link = '<a href="' . $siteurl . '">' . $fromEmailName . '</a>'; |
|
| 1865 | - $user_info = get_userdata( $user_id ); |
|
| 1864 | + $siteurl_link = '<a href="'.$siteurl.'">'.$fromEmailName.'</a>'; |
|
| 1865 | + $user_info = get_userdata($user_id); |
|
| 1866 | 1866 | $user_email = $user_info->user_email; |
| 1867 | - $display_name = geodir_get_client_name( $user_id ); |
|
| 1867 | + $display_name = geodir_get_client_name($user_id); |
|
| 1868 | 1868 | $user_login = $user_info->user_login; |
| 1869 | - $number_of_grace_days = get_option( 'ptthemes_listing_preexpiry_notice_days' ); |
|
| 1870 | - if ( $number_of_grace_days == '' ) {
|
|
| 1869 | + $number_of_grace_days = get_option('ptthemes_listing_preexpiry_notice_days');
|
|
| 1870 | + if ($number_of_grace_days == '') {
|
|
| 1871 | 1871 | $number_of_grace_days = 1; |
| 1872 | 1872 | } |
| 1873 | - if ( $post_info->post_type == 'event' ) {
|
|
| 1873 | + if ($post_info->post_type == 'event') {
|
|
| 1874 | 1874 | $post_type = 'event'; |
| 1875 | 1875 | } else {
|
| 1876 | 1876 | $post_type = 'listing'; |
| 1877 | 1877 | } |
| 1878 | - $renew_link = '<a href="' . $siteurl . '?ptype=post_' . $post_type . '&renew=1&pid=' . $page_id . '">' . RENEW_LINK . '</a>'; |
|
| 1878 | + $renew_link = '<a href="'.$siteurl.'?ptype=post_'.$post_type.'&renew=1&pid='.$page_id.'">'.RENEW_LINK.'</a>'; |
|
| 1879 | 1879 | $search_array = array( |
| 1880 | 1880 | '[#client_name#]', |
| 1881 | 1881 | '[#listing_link#]', |
@@ -1891,7 +1891,7 @@ discard block |
||
| 1891 | 1891 | '[#site_name#]', |
| 1892 | 1892 | '[#transaction_details#]' |
| 1893 | 1893 | ); |
| 1894 | - $replace_array = array( |
|
| 1894 | + $replace_array = array( |
|
| 1895 | 1895 | $display_name, |
| 1896 | 1896 | $listingLink, |
| 1897 | 1897 | $post_date, |
@@ -1906,13 +1906,13 @@ discard block |
||
| 1906 | 1906 | $fromEmailName, |
| 1907 | 1907 | $transaction_details |
| 1908 | 1908 | ); |
| 1909 | - $client_message = str_replace( $search_array, $replace_array, $client_message ); |
|
| 1910 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 1909 | + $client_message = str_replace($search_array, $replace_array, $client_message); |
|
| 1910 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 1911 | 1911 | |
| 1912 | 1912 | |
| 1913 | - $headers = array(); |
|
| 1913 | + $headers = array(); |
|
| 1914 | 1914 | $headers[] = 'Content-type: text/html; charset=UTF-8'; |
| 1915 | - $headers[] = 'From: ' . $fromEmailName . ' <' . $fromEmail . '>'; |
|
| 1915 | + $headers[] = 'From: '.$fromEmailName.' <'.$fromEmail.'>'; |
|
| 1916 | 1916 | |
| 1917 | 1917 | $to = $fromEmail; |
| 1918 | 1918 | $message = $client_message; |
@@ -1930,7 +1930,7 @@ discard block |
||
| 1930 | 1930 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1931 | 1931 | * @param string $custom_1 Custom data to be sent. |
| 1932 | 1932 | */ |
| 1933 | - $to = apply_filters( 'geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1933 | + $to = apply_filters('geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1934 | 1934 | /** |
| 1935 | 1935 | * Filter the admin email subject. |
| 1936 | 1936 | * |
@@ -1943,7 +1943,7 @@ discard block |
||
| 1943 | 1943 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1944 | 1944 | * @param string $custom_1 Custom data to be sent. |
| 1945 | 1945 | */ |
| 1946 | - $subject = apply_filters( 'geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1946 | + $subject = apply_filters('geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1947 | 1947 | /** |
| 1948 | 1948 | * Filter the admin email message. |
| 1949 | 1949 | * |
@@ -1956,7 +1956,7 @@ discard block |
||
| 1956 | 1956 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1957 | 1957 | * @param string $custom_1 Custom data to be sent. |
| 1958 | 1958 | */ |
| 1959 | - $message = apply_filters( 'geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1959 | + $message = apply_filters('geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1960 | 1960 | /** |
| 1961 | 1961 | * Filter the admin email headers. |
| 1962 | 1962 | * |
@@ -1969,22 +1969,22 @@ discard block |
||
| 1969 | 1969 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1970 | 1970 | * @param string $custom_1 Custom data to be sent. |
| 1971 | 1971 | */ |
| 1972 | - $headers = apply_filters( 'geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1972 | + $headers = apply_filters('geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1973 | 1973 | |
| 1974 | 1974 | |
| 1975 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1976 | - if ( ! $sent ) {
|
|
| 1977 | - if ( is_array( $to ) ) {
|
|
| 1978 | - $to = implode( ',', $to ); |
|
| 1975 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1976 | + if (!$sent) {
|
|
| 1977 | + if (is_array($to)) {
|
|
| 1978 | + $to = implode(',', $to);
|
|
| 1979 | 1979 | } |
| 1980 | 1980 | $log_message = sprintf( |
| 1981 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1981 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1982 | 1982 | $message_type, |
| 1983 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1983 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1984 | 1984 | $to, |
| 1985 | 1985 | $subject |
| 1986 | 1986 | ); |
| 1987 | - geodir_error_log( $log_message ); |
|
| 1987 | + geodir_error_log($log_message); |
|
| 1988 | 1988 | } |
| 1989 | 1989 | } |
| 1990 | 1990 | } |
@@ -2004,12 +2004,12 @@ discard block |
||
| 2004 | 2004 | * |
| 2005 | 2005 | * @return array Category IDs. |
| 2006 | 2006 | */ |
| 2007 | -function gd_lang_object_ids( $ids_array, $type ) {
|
|
| 2008 | - if ( geodir_is_wpml() ) {
|
|
| 2007 | +function gd_lang_object_ids($ids_array, $type) {
|
|
| 2008 | + if (geodir_is_wpml()) {
|
|
| 2009 | 2009 | $res = array(); |
| 2010 | - foreach ( $ids_array as $id ) {
|
|
| 2011 | - $xlat = geodir_wpml_object_id( $id, $type, false ); |
|
| 2012 | - if ( ! is_null( $xlat ) ) {
|
|
| 2010 | + foreach ($ids_array as $id) {
|
|
| 2011 | + $xlat = geodir_wpml_object_id($id, $type, false); |
|
| 2012 | + if (!is_null($xlat)) {
|
|
| 2013 | 2013 | $res[] = $xlat; |
| 2014 | 2014 | } |
| 2015 | 2015 | } |
@@ -2033,20 +2033,20 @@ discard block |
||
| 2033 | 2033 | * |
| 2034 | 2034 | * @return array Modified Body CSS classes. |
| 2035 | 2035 | */ |
| 2036 | -function geodir_custom_posts_body_class( $classes ) {
|
|
| 2036 | +function geodir_custom_posts_body_class($classes) {
|
|
| 2037 | 2037 | global $wpdb, $wp; |
| 2038 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 2039 | - if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {
|
|
| 2038 | + $post_types = geodir_get_posttypes('object');
|
|
| 2039 | + if (!empty($post_types) && count((array) $post_types) > 1) {
|
|
| 2040 | 2040 | $classes[] = 'geodir_custom_posts'; |
| 2041 | 2041 | } |
| 2042 | 2042 | |
| 2043 | 2043 | // fix body class for signup page |
| 2044 | - if ( geodir_is_page( 'login' ) ) {
|
|
| 2044 | + if (geodir_is_page('login')) {
|
|
| 2045 | 2045 | $new_classes = array(); |
| 2046 | 2046 | $new_classes[] = 'signup page-geodir-signup'; |
| 2047 | - if ( ! empty( $classes ) ) {
|
|
| 2048 | - foreach ( $classes as $class ) {
|
|
| 2049 | - if ( $class && $class != 'home' && $class != 'blog' ) {
|
|
| 2047 | + if (!empty($classes)) {
|
|
| 2048 | + foreach ($classes as $class) {
|
|
| 2049 | + if ($class && $class != 'home' && $class != 'blog') {
|
|
| 2050 | 2050 | $new_classes[] = $class; |
| 2051 | 2051 | } |
| 2052 | 2052 | } |
@@ -2054,14 +2054,14 @@ discard block |
||
| 2054 | 2054 | $classes = $new_classes; |
| 2055 | 2055 | } |
| 2056 | 2056 | |
| 2057 | - if ( geodir_is_geodir_page() ) {
|
|
| 2057 | + if (geodir_is_geodir_page()) {
|
|
| 2058 | 2058 | $classes[] = 'geodir-page'; |
| 2059 | 2059 | } |
| 2060 | 2060 | |
| 2061 | 2061 | return $classes; |
| 2062 | 2062 | } |
| 2063 | 2063 | |
| 2064 | -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 |
|
| 2064 | +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
|
|
| 2065 | 2065 | |
| 2066 | 2066 | |
| 2067 | 2067 | /** |
@@ -2077,7 +2077,7 @@ discard block |
||
| 2077 | 2077 | * |
| 2078 | 2078 | * @since 1.0.0 |
| 2079 | 2079 | */ |
| 2080 | - return apply_filters( 'geodir_map_zoom_level', array( |
|
| 2080 | + return apply_filters('geodir_map_zoom_level', array(
|
|
| 2081 | 2081 | 1, |
| 2082 | 2082 | 2, |
| 2083 | 2083 | 3, |
@@ -2097,7 +2097,7 @@ discard block |
||
| 2097 | 2097 | 17, |
| 2098 | 2098 | 18, |
| 2099 | 2099 | 19 |
| 2100 | - ) ); |
|
| 2100 | + )); |
|
| 2101 | 2101 | |
| 2102 | 2102 | } |
| 2103 | 2103 | |
@@ -2110,12 +2110,12 @@ discard block |
||
| 2110 | 2110 | * |
| 2111 | 2111 | * @param string $geodir_option_name Option key. |
| 2112 | 2112 | */ |
| 2113 | -function geodir_option_version_backup( $geodir_option_name ) {
|
|
| 2113 | +function geodir_option_version_backup($geodir_option_name) {
|
|
| 2114 | 2114 | $version_date = time(); |
| 2115 | - $geodir_option = get_option( $geodir_option_name ); |
|
| 2115 | + $geodir_option = get_option($geodir_option_name); |
|
| 2116 | 2116 | |
| 2117 | - if ( ! empty( $geodir_option ) ) {
|
|
| 2118 | - add_option( $geodir_option_name . '_' . $version_date, $geodir_option ); |
|
| 2117 | + if (!empty($geodir_option)) {
|
|
| 2118 | + add_option($geodir_option_name.'_'.$version_date, $geodir_option); |
|
| 2119 | 2119 | } |
| 2120 | 2120 | } |
| 2121 | 2121 | |
@@ -2129,10 +2129,10 @@ discard block |
||
| 2129 | 2129 | * |
| 2130 | 2130 | * @return int Page ID. |
| 2131 | 2131 | */ |
| 2132 | -function get_page_id_geodir_add_listing_page( $page_id ) {
|
|
| 2133 | - if ( geodir_wpml_multilingual_status() ) {
|
|
| 2132 | +function get_page_id_geodir_add_listing_page($page_id) {
|
|
| 2133 | + if (geodir_wpml_multilingual_status()) {
|
|
| 2134 | 2134 | $post_type = 'post_page'; |
| 2135 | - $page_id = geodir_get_wpml_element_id( $page_id, $post_type ); |
|
| 2135 | + $page_id = geodir_get_wpml_element_id($page_id, $post_type); |
|
| 2136 | 2136 | } |
| 2137 | 2137 | |
| 2138 | 2138 | return $page_id; |
@@ -2146,7 +2146,7 @@ discard block |
||
| 2146 | 2146 | * @return bool Returns true when sitepress multilingual CMS active. else returns false. |
| 2147 | 2147 | */ |
| 2148 | 2148 | function geodir_wpml_multilingual_status() {
|
| 2149 | - if ( geodir_is_wpml() ) {
|
|
| 2149 | + if (geodir_is_wpml()) {
|
|
| 2150 | 2150 | return true; |
| 2151 | 2151 | } |
| 2152 | 2152 | |
@@ -2164,19 +2164,19 @@ discard block |
||
| 2164 | 2164 | * |
| 2165 | 2165 | * @return int Element ID when exists. Else the page id. |
| 2166 | 2166 | */ |
| 2167 | -function geodir_get_wpml_element_id( $page_id, $post_type ) {
|
|
| 2167 | +function geodir_get_wpml_element_id($page_id, $post_type) {
|
|
| 2168 | 2168 | global $sitepress; |
| 2169 | - if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {
|
|
| 2170 | - $trid = $sitepress->get_element_trid( $page_id, $post_type ); |
|
| 2169 | + if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {
|
|
| 2170 | + $trid = $sitepress->get_element_trid($page_id, $post_type); |
|
| 2171 | 2171 | |
| 2172 | - if ( $trid > 0 ) {
|
|
| 2173 | - $translations = $sitepress->get_element_translations( $trid, $post_type ); |
|
| 2172 | + if ($trid > 0) {
|
|
| 2173 | + $translations = $sitepress->get_element_translations($trid, $post_type); |
|
| 2174 | 2174 | |
| 2175 | 2175 | $lang = $sitepress->get_current_language(); |
| 2176 | 2176 | $lang = $lang ? $lang : $sitepress->get_default_language(); |
| 2177 | 2177 | |
| 2178 | - if ( ! empty( $translations ) && ! empty( $lang ) && isset( $translations[ $lang ] ) && isset( $translations[ $lang ]->element_id ) && ! empty( $translations[ $lang ]->element_id ) ) {
|
|
| 2179 | - $page_id = $translations[ $lang ]->element_id; |
|
| 2178 | + if (!empty($translations) && !empty($lang) && isset($translations[$lang]) && isset($translations[$lang]->element_id) && !empty($translations[$lang]->element_id)) {
|
|
| 2179 | + $page_id = $translations[$lang]->element_id; |
|
| 2180 | 2180 | } |
| 2181 | 2181 | } |
| 2182 | 2182 | } |
@@ -2193,15 +2193,15 @@ discard block |
||
| 2193 | 2193 | */ |
| 2194 | 2194 | function geodir_wpml_check_element_id() {
|
| 2195 | 2195 | global $sitepress; |
| 2196 | - if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {
|
|
| 2196 | + if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {
|
|
| 2197 | 2197 | $el_type = 'post_page'; |
| 2198 | - $el_id = get_option( 'geodir_add_listing_page' ); |
|
| 2198 | + $el_id = get_option('geodir_add_listing_page');
|
|
| 2199 | 2199 | $default_lang = $sitepress->get_default_language(); |
| 2200 | - $el_details = $sitepress->get_element_language_details( $el_id, $el_type ); |
|
| 2200 | + $el_details = $sitepress->get_element_language_details($el_id, $el_type); |
|
| 2201 | 2201 | |
| 2202 | - if ( ! ( $el_id > 0 && $default_lang && ! empty( $el_details ) && isset( $el_details->language_code ) && $el_details->language_code == $default_lang ) ) {
|
|
| 2203 | - if ( ! $el_details->source_language_code ) {
|
|
| 2204 | - $sitepress->set_element_language_details( $el_id, $el_type, '', $default_lang ); |
|
| 2202 | + if (!($el_id > 0 && $default_lang && !empty($el_details) && isset($el_details->language_code) && $el_details->language_code == $default_lang)) {
|
|
| 2203 | + if (!$el_details->source_language_code) {
|
|
| 2204 | + $sitepress->set_element_language_details($el_id, $el_type, '', $default_lang); |
|
| 2205 | 2205 | $sitepress->icl_translations_cache->clear(); |
| 2206 | 2206 | } |
| 2207 | 2207 | } |
@@ -2221,44 +2221,44 @@ discard block |
||
| 2221 | 2221 | * |
| 2222 | 2222 | * @return string Orderby SQL. |
| 2223 | 2223 | */ |
| 2224 | -function geodir_widget_listings_get_order( $query_args ) {
|
|
| 2224 | +function geodir_widget_listings_get_order($query_args) {
|
|
| 2225 | 2225 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2226 | 2226 | |
| 2227 | 2227 | $query_args = $gd_query_args_widgets; |
| 2228 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2229 | - return $wpdb->posts . ".post_date DESC, "; |
|
| 2228 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2229 | + return $wpdb->posts.".post_date DESC, "; |
|
| 2230 | 2230 | } |
| 2231 | 2231 | |
| 2232 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2233 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2232 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2233 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2234 | 2234 | |
| 2235 | - $sort_by = ! empty( $query_args['order_by'] ) ? $query_args['order_by'] : ''; |
|
| 2235 | + $sort_by = !empty($query_args['order_by']) ? $query_args['order_by'] : ''; |
|
| 2236 | 2236 | |
| 2237 | - switch ( $sort_by ) {
|
|
| 2237 | + switch ($sort_by) {
|
|
| 2238 | 2238 | case 'latest': |
| 2239 | 2239 | case 'newest': |
| 2240 | - $orderby = $wpdb->posts . ".post_date DESC, "; |
|
| 2240 | + $orderby = $wpdb->posts.".post_date DESC, "; |
|
| 2241 | 2241 | break; |
| 2242 | 2242 | case 'featured': |
| 2243 | - $orderby = $table . ".is_featured ASC, ". $wpdb->posts . ".post_date DESC, "; |
|
| 2243 | + $orderby = $table.".is_featured ASC, ".$wpdb->posts.".post_date DESC, "; |
|
| 2244 | 2244 | break; |
| 2245 | 2245 | case 'az': |
| 2246 | - $orderby = $wpdb->posts . ".post_title ASC, "; |
|
| 2246 | + $orderby = $wpdb->posts.".post_title ASC, "; |
|
| 2247 | 2247 | break; |
| 2248 | 2248 | case 'high_review': |
| 2249 | - $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
| 2249 | + $orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, "; |
|
| 2250 | 2250 | break; |
| 2251 | 2251 | case 'high_rating': |
| 2252 | - $orderby = "( " . $table . ".overall_rating ) DESC, "; |
|
| 2252 | + $orderby = "( ".$table.".overall_rating ) DESC, "; |
|
| 2253 | 2253 | break; |
| 2254 | 2254 | case 'random': |
| 2255 | 2255 | $orderby = "RAND(), "; |
| 2256 | 2256 | break; |
| 2257 | 2257 | default: |
| 2258 | - if ( $custom_orderby = geodir_prepare_custom_sorting( $sort_by, $table ) ) {
|
|
| 2259 | - $orderby = $custom_orderby . ", "; |
|
| 2258 | + if ($custom_orderby = geodir_prepare_custom_sorting($sort_by, $table)) {
|
|
| 2259 | + $orderby = $custom_orderby.", "; |
|
| 2260 | 2260 | } else {
|
| 2261 | - $orderby = $wpdb->posts . ".post_title ASC, "; |
|
| 2261 | + $orderby = $wpdb->posts.".post_title ASC, "; |
|
| 2262 | 2262 | } |
| 2263 | 2263 | break; |
| 2264 | 2264 | } |
@@ -2283,16 +2283,16 @@ discard block |
||
| 2283 | 2283 | * |
| 2284 | 2284 | * @return mixed Result object. |
| 2285 | 2285 | */ |
| 2286 | -function geodir_get_widget_listings( $query_args = array(), $count_only = false ) {
|
|
| 2286 | +function geodir_get_widget_listings($query_args = array(), $count_only = false) {
|
|
| 2287 | 2287 | global $wpdb, $plugin_prefix, $table_prefix; |
| 2288 | 2288 | $GLOBALS['gd_query_args_widgets'] = $query_args; |
| 2289 | 2289 | $gd_query_args_widgets = $query_args; |
| 2290 | 2290 | |
| 2291 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2292 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2293 | - $supports_wpml = geodir_wpml_is_post_type_translated( $post_type ); |
|
| 2291 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2292 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2293 | + $supports_wpml = geodir_wpml_is_post_type_translated($post_type); |
|
| 2294 | 2294 | |
| 2295 | - $fields = $wpdb->posts . ".*, " . $table . ".*"; |
|
| 2295 | + $fields = $wpdb->posts.".*, ".$table.".*"; |
|
| 2296 | 2296 | /** |
| 2297 | 2297 | * Filter widget listing fields string part that is being used for query. |
| 2298 | 2298 | * |
@@ -2302,17 +2302,17 @@ discard block |
||
| 2302 | 2302 | * @param string $table Table name. |
| 2303 | 2303 | * @param string $post_type Post type. |
| 2304 | 2304 | */ |
| 2305 | - $fields = apply_filters( 'geodir_filter_widget_listings_fields', $fields, $table, $post_type ); |
|
| 2305 | + $fields = apply_filters('geodir_filter_widget_listings_fields', $fields, $table, $post_type);
|
|
| 2306 | 2306 | |
| 2307 | - $join = "INNER JOIN " . $table . " ON (" . $table . ".post_id = " . $wpdb->posts . ".ID)";
|
|
| 2307 | + $join = "INNER JOIN ".$table." ON (".$table.".post_id = ".$wpdb->posts.".ID)";
|
|
| 2308 | 2308 | |
| 2309 | 2309 | ########### WPML ########### |
| 2310 | 2310 | |
| 2311 | - if ( $supports_wpml ) {
|
|
| 2311 | + if ($supports_wpml) {
|
|
| 2312 | 2312 | global $sitepress; |
| 2313 | 2313 | $lang_code = ICL_LANGUAGE_CODE; |
| 2314 | - if ( $lang_code ) {
|
|
| 2315 | - $join .= " JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 2314 | + if ($lang_code) {
|
|
| 2315 | + $join .= " JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID"; |
|
| 2316 | 2316 | } |
| 2317 | 2317 | } |
| 2318 | 2318 | |
@@ -2326,15 +2326,15 @@ discard block |
||
| 2326 | 2326 | * @param string $join Join clause string. |
| 2327 | 2327 | * @param string $post_type Post type. |
| 2328 | 2328 | */ |
| 2329 | - $join = apply_filters( 'geodir_filter_widget_listings_join', $join, $post_type ); |
|
| 2329 | + $join = apply_filters('geodir_filter_widget_listings_join', $join, $post_type);
|
|
| 2330 | 2330 | |
| 2331 | - $post_status = is_super_admin() ? " OR " . $wpdb->posts . ".post_status = 'private'" : ''; |
|
| 2331 | + $post_status = is_super_admin() ? " OR ".$wpdb->posts.".post_status = 'private'" : ''; |
|
| 2332 | 2332 | |
| 2333 | - $where = " AND ( " . $wpdb->posts . ".post_status = 'publish' " . $post_status . " ) AND " . $wpdb->posts . ".post_type = '" . $post_type . "'"; |
|
| 2333 | + $where = " AND ( ".$wpdb->posts.".post_status = 'publish' ".$post_status." ) AND ".$wpdb->posts.".post_type = '".$post_type."'"; |
|
| 2334 | 2334 | |
| 2335 | 2335 | ########### WPML ########### |
| 2336 | - if ( $supports_wpml ) {
|
|
| 2337 | - if ( $lang_code ) {
|
|
| 2336 | + if ($supports_wpml) {
|
|
| 2337 | + if ($lang_code) {
|
|
| 2338 | 2338 | $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type = 'post_$post_type' "; |
| 2339 | 2339 | } |
| 2340 | 2340 | } |
@@ -2347,8 +2347,8 @@ discard block |
||
| 2347 | 2347 | * @param string $where Where clause string. |
| 2348 | 2348 | * @param string $post_type Post type. |
| 2349 | 2349 | */ |
| 2350 | - $where = apply_filters( 'geodir_filter_widget_listings_where', $where, $post_type ); |
|
| 2351 | - $where = $where != '' ? " WHERE 1=1 " . $where : ''; |
|
| 2350 | + $where = apply_filters('geodir_filter_widget_listings_where', $where, $post_type);
|
|
| 2351 | + $where = $where != '' ? " WHERE 1=1 ".$where : ''; |
|
| 2352 | 2352 | |
| 2353 | 2353 | $groupby = " GROUP BY $wpdb->posts.ID "; //@todo is this needed? faster without |
| 2354 | 2354 | /** |
@@ -2359,15 +2359,15 @@ discard block |
||
| 2359 | 2359 | * @param string $groupby Group by clause string. |
| 2360 | 2360 | * @param string $post_type Post type. |
| 2361 | 2361 | */ |
| 2362 | - $groupby = apply_filters( 'geodir_filter_widget_listings_groupby', $groupby, $post_type ); |
|
| 2362 | + $groupby = apply_filters('geodir_filter_widget_listings_groupby', $groupby, $post_type);
|
|
| 2363 | 2363 | |
| 2364 | - if ( $count_only ) {
|
|
| 2365 | - $sql = "SELECT COUNT(DISTINCT " . $wpdb->posts . ".ID) AS total FROM " . $wpdb->posts . " |
|
| 2366 | - " . $join . " |
|
| 2364 | + if ($count_only) {
|
|
| 2365 | + $sql = "SELECT COUNT(DISTINCT ".$wpdb->posts.".ID) AS total FROM ".$wpdb->posts." |
|
| 2366 | + " . $join." |
|
| 2367 | 2367 | " . $where; |
| 2368 | - $rows = (int) $wpdb->get_var( $sql ); |
|
| 2368 | + $rows = (int) $wpdb->get_var($sql); |
|
| 2369 | 2369 | } else {
|
| 2370 | - $orderby = geodir_widget_listings_get_order( $query_args ); |
|
| 2370 | + $orderby = geodir_widget_listings_get_order($query_args); |
|
| 2371 | 2371 | /** |
| 2372 | 2372 | * Filter widget listing orderby clause string part that is being used for query. |
| 2373 | 2373 | * |
@@ -2377,33 +2377,33 @@ discard block |
||
| 2377 | 2377 | * @param string $table Table name. |
| 2378 | 2378 | * @param string $post_type Post type. |
| 2379 | 2379 | */ |
| 2380 | - $orderby = apply_filters( 'geodir_filter_widget_listings_orderby', $orderby, $table, $post_type ); |
|
| 2380 | + $orderby = apply_filters('geodir_filter_widget_listings_orderby', $orderby, $table, $post_type);
|
|
| 2381 | 2381 | |
| 2382 | 2382 | $second_orderby = array(); |
| 2383 | - if ( strpos( $orderby, strtolower( $table . ".is_featured" ) ) === false ) {
|
|
| 2384 | - $second_orderby[] = $table . ".is_featured ASC"; |
|
| 2383 | + if (strpos($orderby, strtolower($table.".is_featured")) === false) {
|
|
| 2384 | + $second_orderby[] = $table.".is_featured ASC"; |
|
| 2385 | 2385 | } |
| 2386 | 2386 | |
| 2387 | - if ( strpos( $orderby, strtolower( $wpdb->posts . ".post_date" ) ) === false ) {
|
|
| 2388 | - $second_orderby[] = $wpdb->posts . ".post_date DESC"; |
|
| 2387 | + if (strpos($orderby, strtolower($wpdb->posts.".post_date")) === false) {
|
|
| 2388 | + $second_orderby[] = $wpdb->posts.".post_date DESC"; |
|
| 2389 | 2389 | } |
| 2390 | 2390 | |
| 2391 | - if ( strpos( $orderby, strtolower( $wpdb->posts . ".post_title" ) ) === false ) {
|
|
| 2392 | - $second_orderby[] = $wpdb->posts . ".post_title ASC"; |
|
| 2391 | + if (strpos($orderby, strtolower($wpdb->posts.".post_title")) === false) {
|
|
| 2392 | + $second_orderby[] = $wpdb->posts.".post_title ASC"; |
|
| 2393 | 2393 | } |
| 2394 | 2394 | |
| 2395 | - if ( !empty( $second_orderby ) ) {
|
|
| 2396 | - $orderby .= implode( ', ', $second_orderby ); |
|
| 2395 | + if (!empty($second_orderby)) {
|
|
| 2396 | + $orderby .= implode(', ', $second_orderby);
|
|
| 2397 | 2397 | } |
| 2398 | 2398 | |
| 2399 | - if ( !empty( $orderby ) ) {
|
|
| 2400 | - $orderby = trim( $orderby ); |
|
| 2401 | - $orderby = rtrim( $orderby, "," ); |
|
| 2399 | + if (!empty($orderby)) {
|
|
| 2400 | + $orderby = trim($orderby); |
|
| 2401 | + $orderby = rtrim($orderby, ","); |
|
| 2402 | 2402 | } |
| 2403 | 2403 | |
| 2404 | - $orderby = $orderby != '' ? " ORDER BY " . $orderby : ''; |
|
| 2404 | + $orderby = $orderby != '' ? " ORDER BY ".$orderby : ''; |
|
| 2405 | 2405 | |
| 2406 | - $limit = ! empty( $query_args['posts_per_page'] ) ? $query_args['posts_per_page'] : 5; |
|
| 2406 | + $limit = !empty($query_args['posts_per_page']) ? $query_args['posts_per_page'] : 5; |
|
| 2407 | 2407 | /** |
| 2408 | 2408 | * Filter widget listing limit that is being used for query. |
| 2409 | 2409 | * |
@@ -2412,27 +2412,27 @@ discard block |
||
| 2412 | 2412 | * @param int $limit Query results limit. |
| 2413 | 2413 | * @param string $post_type Post type. |
| 2414 | 2414 | */ |
| 2415 | - $limit = apply_filters( 'geodir_filter_widget_listings_limit', $limit, $post_type ); |
|
| 2415 | + $limit = apply_filters('geodir_filter_widget_listings_limit', $limit, $post_type);
|
|
| 2416 | 2416 | |
| 2417 | - $page = ! empty( $query_args['pageno'] ) ? absint( $query_args['pageno'] ) : 1; |
|
| 2418 | - if ( ! $page ) {
|
|
| 2417 | + $page = !empty($query_args['pageno']) ? absint($query_args['pageno']) : 1; |
|
| 2418 | + if (!$page) {
|
|
| 2419 | 2419 | $page = 1; |
| 2420 | 2420 | } |
| 2421 | 2421 | |
| 2422 | - $limit = (int) $limit > 0 ? " LIMIT " . absint( ( $page - 1 ) * (int) $limit ) . ", " . (int) $limit : ""; |
|
| 2422 | + $limit = (int) $limit > 0 ? " LIMIT ".absint(($page - 1) * (int) $limit).", ".(int) $limit : ""; |
|
| 2423 | 2423 | |
| 2424 | 2424 | //@todo removed SQL_CALC_FOUND_ROWS from below as don't think it is needed and query is faster without |
| 2425 | - $sql = "SELECT " . $fields . " FROM " . $wpdb->posts . " |
|
| 2426 | - " . $join . " |
|
| 2427 | - " . $where . " |
|
| 2428 | - " . $groupby . " |
|
| 2429 | - " . $orderby . " |
|
| 2425 | + $sql = "SELECT ".$fields." FROM ".$wpdb->posts." |
|
| 2426 | + " . $join." |
|
| 2427 | + " . $where." |
|
| 2428 | + " . $groupby." |
|
| 2429 | + " . $orderby." |
|
| 2430 | 2430 | " . $limit; |
| 2431 | - $rows = $wpdb->get_results( $sql ); |
|
| 2431 | + $rows = $wpdb->get_results($sql); |
|
| 2432 | 2432 | } |
| 2433 | 2433 | |
| 2434 | - unset( $GLOBALS['gd_query_args_widgets'] ); |
|
| 2435 | - unset( $gd_query_args_widgets ); |
|
| 2434 | + unset($GLOBALS['gd_query_args_widgets']); |
|
| 2435 | + unset($gd_query_args_widgets); |
|
| 2436 | 2436 | |
| 2437 | 2437 | return $rows; |
| 2438 | 2438 | } |
@@ -2449,11 +2449,11 @@ discard block |
||
| 2449 | 2449 | * |
| 2450 | 2450 | * @return string Modified fields SQL. |
| 2451 | 2451 | */ |
| 2452 | -function geodir_function_widget_listings_fields( $fields ) {
|
|
| 2452 | +function geodir_function_widget_listings_fields($fields) {
|
|
| 2453 | 2453 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2454 | 2454 | |
| 2455 | 2455 | $query_args = $gd_query_args_widgets; |
| 2456 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2456 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2457 | 2457 | return $fields; |
| 2458 | 2458 | } |
| 2459 | 2459 | |
@@ -2472,24 +2472,24 @@ discard block |
||
| 2472 | 2472 | * |
| 2473 | 2473 | * @return string Modified join clause SQL. |
| 2474 | 2474 | */ |
| 2475 | -function geodir_function_widget_listings_join( $join ) {
|
|
| 2475 | +function geodir_function_widget_listings_join($join) {
|
|
| 2476 | 2476 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2477 | 2477 | |
| 2478 | 2478 | $query_args = $gd_query_args_widgets; |
| 2479 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2479 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2480 | 2480 | return $join; |
| 2481 | 2481 | } |
| 2482 | 2482 | |
| 2483 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2484 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2483 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2484 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2485 | 2485 | |
| 2486 | - if ( ! empty( $query_args['with_pics_only'] ) ) {
|
|
| 2487 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 2486 | + if (!empty($query_args['with_pics_only'])) {
|
|
| 2487 | + $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )"; |
|
| 2488 | 2488 | } |
| 2489 | 2489 | |
| 2490 | - if ( ! empty( $query_args['tax_query'] ) ) {
|
|
| 2491 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); |
|
| 2492 | - if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
|
|
| 2490 | + if (!empty($query_args['tax_query'])) {
|
|
| 2491 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); |
|
| 2492 | + if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
|
|
| 2493 | 2493 | $join .= $tax_queries['join']; |
| 2494 | 2494 | } |
| 2495 | 2495 | } |
@@ -2510,67 +2510,67 @@ discard block |
||
| 2510 | 2510 | * |
| 2511 | 2511 | * @return string Modified where clause SQL. |
| 2512 | 2512 | */ |
| 2513 | -function geodir_function_widget_listings_where( $where ) {
|
|
| 2513 | +function geodir_function_widget_listings_where($where) {
|
|
| 2514 | 2514 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2515 | 2515 | |
| 2516 | 2516 | $query_args = $gd_query_args_widgets; |
| 2517 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2517 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2518 | 2518 | return $where; |
| 2519 | 2519 | } |
| 2520 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2521 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2520 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2521 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2522 | 2522 | |
| 2523 | - if ( ! empty( $query_args ) ) {
|
|
| 2524 | - if ( ! empty( $query_args['gd_location'] ) && function_exists( 'geodir_default_location_where' ) ) {
|
|
| 2525 | - $where = geodir_default_location_where( $where, $table ); |
|
| 2523 | + if (!empty($query_args)) {
|
|
| 2524 | + if (!empty($query_args['gd_location']) && function_exists('geodir_default_location_where')) {
|
|
| 2525 | + $where = geodir_default_location_where($where, $table); |
|
| 2526 | 2526 | } |
| 2527 | 2527 | |
| 2528 | - if ( ! empty( $query_args['post_author'] ) ) {
|
|
| 2529 | - $where .= " AND " . $wpdb->posts . ".post_author = " . (int) $query_args['post_author']; |
|
| 2528 | + if (!empty($query_args['post_author'])) {
|
|
| 2529 | + $where .= " AND ".$wpdb->posts.".post_author = ".(int) $query_args['post_author']; |
|
| 2530 | 2530 | } |
| 2531 | 2531 | |
| 2532 | - if ( ! empty( $query_args['show_featured_only'] ) ) {
|
|
| 2533 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 2532 | + if (!empty($query_args['show_featured_only'])) {
|
|
| 2533 | + $where .= " AND ".$table.".is_featured = '1'"; |
|
| 2534 | 2534 | } |
| 2535 | 2535 | |
| 2536 | - if ( ! empty( $query_args['show_special_only'] ) ) {
|
|
| 2537 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 2536 | + if (!empty($query_args['show_special_only'])) {
|
|
| 2537 | + $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )"; |
|
| 2538 | 2538 | } |
| 2539 | 2539 | |
| 2540 | - if ( ! empty( $query_args['with_pics_only'] ) ) {
|
|
| 2541 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL "; |
|
| 2540 | + if (!empty($query_args['with_pics_only'])) {
|
|
| 2541 | + $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL "; |
|
| 2542 | 2542 | } |
| 2543 | 2543 | |
| 2544 | - if ( ! empty( $query_args['featured_image_only'] ) ) {
|
|
| 2545 | - $where .= " AND " . $table . ".featured_image IS NOT NULL AND " . $table . ".featured_image!='' "; |
|
| 2544 | + if (!empty($query_args['featured_image_only'])) {
|
|
| 2545 | + $where .= " AND ".$table.".featured_image IS NOT NULL AND ".$table.".featured_image!='' "; |
|
| 2546 | 2546 | } |
| 2547 | 2547 | |
| 2548 | - if ( ! empty( $query_args['with_videos_only'] ) ) {
|
|
| 2549 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 2548 | + if (!empty($query_args['with_videos_only'])) {
|
|
| 2549 | + $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )"; |
|
| 2550 | 2550 | } |
| 2551 | 2551 | |
| 2552 | - if ( ! empty( $query_args['show_favorites_only'] ) ) {
|
|
| 2552 | + if (!empty($query_args['show_favorites_only'])) {
|
|
| 2553 | 2553 | $user_favorites = '-1'; |
| 2554 | 2554 | |
| 2555 | - if ( !empty( $query_args['favorites_by_user'] ) ) {
|
|
| 2555 | + if (!empty($query_args['favorites_by_user'])) {
|
|
| 2556 | 2556 | |
| 2557 | 2557 | $site_id = ''; |
| 2558 | - if ( is_multisite() ) {
|
|
| 2558 | + if (is_multisite()) {
|
|
| 2559 | 2559 | $blog_id = get_current_blog_id(); |
| 2560 | - if($blog_id && $blog_id!='1'){$site_id = '_' . $blog_id ;}
|
|
| 2560 | + if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }
|
|
| 2561 | 2561 | } |
| 2562 | 2562 | |
| 2563 | - $user_favorites = geodir_get_user_favourites( (int)$query_args['favorites_by_user'] ); |
|
| 2563 | + $user_favorites = geodir_get_user_favourites((int) $query_args['favorites_by_user']); |
|
| 2564 | 2564 | $user_favorites = !empty($user_favorites) && is_array($user_favorites) ? implode("','", $user_favorites) : '-1';
|
| 2565 | 2565 | } |
| 2566 | 2566 | |
| 2567 | - $where .= " AND `" . $wpdb->posts . "`.`ID` IN('" . $user_favorites . "')";
|
|
| 2567 | + $where .= " AND `".$wpdb->posts."`.`ID` IN('".$user_favorites."')";
|
|
| 2568 | 2568 | } |
| 2569 | 2569 | |
| 2570 | - if ( ! empty( $query_args['tax_query'] ) ) {
|
|
| 2571 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); |
|
| 2570 | + if (!empty($query_args['tax_query'])) {
|
|
| 2571 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); |
|
| 2572 | 2572 | |
| 2573 | - if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
|
|
| 2573 | + if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
|
|
| 2574 | 2574 | $where .= $tax_queries['where']; |
| 2575 | 2575 | } |
| 2576 | 2576 | } |
@@ -2591,11 +2591,11 @@ discard block |
||
| 2591 | 2591 | * |
| 2592 | 2592 | * @return string Modified orderby clause SQL. |
| 2593 | 2593 | */ |
| 2594 | -function geodir_function_widget_listings_orderby( $orderby ) {
|
|
| 2594 | +function geodir_function_widget_listings_orderby($orderby) {
|
|
| 2595 | 2595 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2596 | 2596 | |
| 2597 | 2597 | $query_args = $gd_query_args_widgets; |
| 2598 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2598 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2599 | 2599 | return $orderby; |
| 2600 | 2600 | } |
| 2601 | 2601 | |
@@ -2614,15 +2614,15 @@ discard block |
||
| 2614 | 2614 | * |
| 2615 | 2615 | * @return int Query limit. |
| 2616 | 2616 | */ |
| 2617 | -function geodir_function_widget_listings_limit( $limit ) {
|
|
| 2617 | +function geodir_function_widget_listings_limit($limit) {
|
|
| 2618 | 2618 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2619 | 2619 | |
| 2620 | 2620 | $query_args = $gd_query_args_widgets; |
| 2621 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2621 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2622 | 2622 | return $limit; |
| 2623 | 2623 | } |
| 2624 | 2624 | |
| 2625 | - if ( ! empty( $query_args ) && ! empty( $query_args['posts_per_page'] ) ) {
|
|
| 2625 | + if (!empty($query_args) && !empty($query_args['posts_per_page'])) {
|
|
| 2626 | 2626 | $limit = (int) $query_args['posts_per_page']; |
| 2627 | 2627 | } |
| 2628 | 2628 | |
@@ -2640,12 +2640,12 @@ discard block |
||
| 2640 | 2640 | * |
| 2641 | 2641 | * @return int Large size width. |
| 2642 | 2642 | */ |
| 2643 | -function geodir_media_image_large_width( $default = 800, $params = '' ) {
|
|
| 2644 | - $large_size_w = get_option( 'large_size_w' ); |
|
| 2643 | +function geodir_media_image_large_width($default = 800, $params = '') {
|
|
| 2644 | + $large_size_w = get_option('large_size_w');
|
|
| 2645 | 2645 | $large_size_w = $large_size_w > 0 ? $large_size_w : $default; |
| 2646 | - $large_size_w = absint( $large_size_w ); |
|
| 2646 | + $large_size_w = absint($large_size_w); |
|
| 2647 | 2647 | |
| 2648 | - if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
|
|
| 2648 | + if (!get_option('geodir_use_wp_media_large_size')) {
|
|
| 2649 | 2649 | $large_size_w = 800; |
| 2650 | 2650 | } |
| 2651 | 2651 | |
@@ -2658,7 +2658,7 @@ discard block |
||
| 2658 | 2658 | * @param int $default Default width. |
| 2659 | 2659 | * @param string|array $params Image parameters. |
| 2660 | 2660 | */ |
| 2661 | - $large_size_w = apply_filters( 'geodir_filter_media_image_large_width', $large_size_w, $default, $params ); |
|
| 2661 | + $large_size_w = apply_filters('geodir_filter_media_image_large_width', $large_size_w, $default, $params);
|
|
| 2662 | 2662 | |
| 2663 | 2663 | return $large_size_w; |
| 2664 | 2664 | } |
@@ -2674,12 +2674,12 @@ discard block |
||
| 2674 | 2674 | * |
| 2675 | 2675 | * @return int Large size height. |
| 2676 | 2676 | */ |
| 2677 | -function geodir_media_image_large_height( $default = 800, $params = '' ) {
|
|
| 2678 | - $large_size_h = get_option( 'large_size_h' ); |
|
| 2677 | +function geodir_media_image_large_height($default = 800, $params = '') {
|
|
| 2678 | + $large_size_h = get_option('large_size_h');
|
|
| 2679 | 2679 | $large_size_h = $large_size_h > 0 ? $large_size_h : $default; |
| 2680 | - $large_size_h = absint( $large_size_h ); |
|
| 2680 | + $large_size_h = absint($large_size_h); |
|
| 2681 | 2681 | |
| 2682 | - if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
|
|
| 2682 | + if (!get_option('geodir_use_wp_media_large_size')) {
|
|
| 2683 | 2683 | $large_size_h = 800; |
| 2684 | 2684 | } |
| 2685 | 2685 | |
@@ -2692,7 +2692,7 @@ discard block |
||
| 2692 | 2692 | * @param int $default Default height. |
| 2693 | 2693 | * @param string|array $params Image parameters. |
| 2694 | 2694 | */ |
| 2695 | - $large_size_h = apply_filters( 'geodir_filter_media_image_large_height', $large_size_h, $default, $params ); |
|
| 2695 | + $large_size_h = apply_filters('geodir_filter_media_image_large_height', $large_size_h, $default, $params);
|
|
| 2696 | 2696 | |
| 2697 | 2697 | return $large_size_h; |
| 2698 | 2698 | } |
@@ -2709,8 +2709,8 @@ discard block |
||
| 2709 | 2709 | * |
| 2710 | 2710 | * @return string Sanitized name. |
| 2711 | 2711 | */ |
| 2712 | -function geodir_sanitize_location_name( $type, $name, $translate = true ) {
|
|
| 2713 | - if ( $name == '' ) {
|
|
| 2712 | +function geodir_sanitize_location_name($type, $name, $translate = true) {
|
|
| 2713 | + if ($name == '') {
|
|
| 2714 | 2714 | return null; |
| 2715 | 2715 | } |
| 2716 | 2716 | |
@@ -2719,13 +2719,13 @@ discard block |
||
| 2719 | 2719 | $type = $type == 'gd_city' ? 'city' : $type; |
| 2720 | 2720 | |
| 2721 | 2721 | $return = $name; |
| 2722 | - if ( function_exists( 'get_actual_location_name' ) ) {
|
|
| 2723 | - $return = get_actual_location_name( $type, $name, $translate ); |
|
| 2722 | + if (function_exists('get_actual_location_name')) {
|
|
| 2723 | + $return = get_actual_location_name($type, $name, $translate); |
|
| 2724 | 2724 | } else {
|
| 2725 | - $return = preg_replace( '/-(\d+)$/', '', $return ); |
|
| 2726 | - $return = preg_replace( '/[_-]/', ' ', $return ); |
|
| 2727 | - $return = geodir_ucwords( $return ); |
|
| 2728 | - $return = $translate ? __( $return, 'geodirectory' ) : $return; |
|
| 2725 | + $return = preg_replace('/-(\d+)$/', '', $return);
|
|
| 2726 | + $return = preg_replace('/[_-]/', ' ', $return);
|
|
| 2727 | + $return = geodir_ucwords($return); |
|
| 2728 | + $return = $translate ? __($return, 'geodirectory') : $return; |
|
| 2729 | 2729 | } |
| 2730 | 2730 | |
| 2731 | 2731 | return $return; |
@@ -2743,26 +2743,26 @@ discard block |
||
| 2743 | 2743 | * |
| 2744 | 2744 | * @param int $number Comments number. |
| 2745 | 2745 | */ |
| 2746 | -function geodir_comments_number( $number ) {
|
|
| 2746 | +function geodir_comments_number($number) {
|
|
| 2747 | 2747 | global $post; |
| 2748 | 2748 | |
| 2749 | - if ( !empty( $post->post_type ) && geodir_cpt_has_rating_disabled( $post->post_type ) ) {
|
|
| 2749 | + if (!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type)) {
|
|
| 2750 | 2750 | $number = get_comments_number(); |
| 2751 | 2751 | |
| 2752 | - if ( $number > 1 ) {
|
|
| 2753 | - $output = str_replace( '%', number_format_i18n( $number ), __( '% Comments', 'geodirectory' ) ); |
|
| 2754 | - } elseif ( $number == 0 || $number == '' ) {
|
|
| 2755 | - $output = __( 'No Comments', 'geodirectory' ); |
|
| 2752 | + if ($number > 1) {
|
|
| 2753 | + $output = str_replace('%', number_format_i18n($number), __('% Comments', 'geodirectory'));
|
|
| 2754 | + } elseif ($number == 0 || $number == '') {
|
|
| 2755 | + $output = __('No Comments', 'geodirectory');
|
|
| 2756 | 2756 | } else { // must be one
|
| 2757 | - $output = __( '1 Comment', 'geodirectory' ); |
|
| 2757 | + $output = __('1 Comment', 'geodirectory');
|
|
| 2758 | 2758 | } |
| 2759 | 2759 | } else {
|
| 2760 | - if ( $number > 1 ) {
|
|
| 2761 | - $output = str_replace( '%', number_format_i18n( $number ), __( '% Reviews', 'geodirectory' ) ); |
|
| 2762 | - } elseif ( $number == 0 || $number == '' ) {
|
|
| 2763 | - $output = __( 'No Reviews', 'geodirectory' ); |
|
| 2760 | + if ($number > 1) {
|
|
| 2761 | + $output = str_replace('%', number_format_i18n($number), __('% Reviews', 'geodirectory'));
|
|
| 2762 | + } elseif ($number == 0 || $number == '') {
|
|
| 2763 | + $output = __('No Reviews', 'geodirectory');
|
|
| 2764 | 2764 | } else { // must be one
|
| 2765 | - $output = __( '1 Review', 'geodirectory' ); |
|
| 2765 | + $output = __('1 Review', 'geodirectory');
|
|
| 2766 | 2766 | } |
| 2767 | 2767 | } |
| 2768 | 2768 | |
@@ -2779,18 +2779,18 @@ discard block |
||
| 2779 | 2779 | */ |
| 2780 | 2780 | function is_page_geodir_home() {
|
| 2781 | 2781 | global $wpdb; |
| 2782 | - $cur_url = str_replace( array( "https://", "http://", "www." ), array( '', '', '' ), geodir_curPageURL() ); |
|
| 2783 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 2784 | - remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
| 2782 | + $cur_url = str_replace(array("https://", "http://", "www."), array('', '', ''), geodir_curPageURL());
|
|
| 2783 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 2784 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 2785 | 2785 | } |
| 2786 | - $home_url = home_url( '', 'http' ); |
|
| 2787 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 2788 | - add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
| 2786 | + $home_url = home_url('', 'http');
|
|
| 2787 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 2788 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 2789 | 2789 | } |
| 2790 | - $home_url = str_replace( "www.", "", $home_url ); |
|
| 2791 | - 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' ) ) ) {
|
|
| 2790 | + $home_url = str_replace("www.", "", $home_url);
|
|
| 2791 | + 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'))) {
|
|
| 2792 | 2792 | return true; |
| 2793 | - } 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' ) ) {
|
|
| 2793 | + } 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')) {
|
|
| 2794 | 2794 | return true; |
| 2795 | 2795 | } else {
|
| 2796 | 2796 | return false; |
@@ -2810,18 +2810,18 @@ discard block |
||
| 2810 | 2810 | * |
| 2811 | 2811 | * @return string The canonical URL. |
| 2812 | 2812 | */ |
| 2813 | -function geodir_wpseo_homepage_canonical( $url ) {
|
|
| 2813 | +function geodir_wpseo_homepage_canonical($url) {
|
|
| 2814 | 2814 | global $post; |
| 2815 | 2815 | |
| 2816 | - if ( is_page_geodir_home() ) {
|
|
| 2816 | + if (is_page_geodir_home()) {
|
|
| 2817 | 2817 | return home_url(); |
| 2818 | 2818 | } |
| 2819 | 2819 | |
| 2820 | 2820 | return $url; |
| 2821 | 2821 | } |
| 2822 | 2822 | |
| 2823 | -add_filter( 'wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10 ); |
|
| 2824 | -add_filter( 'aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10 ); |
|
| 2823 | +add_filter('wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10);
|
|
| 2824 | +add_filter('aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10);
|
|
| 2825 | 2825 | |
| 2826 | 2826 | /** |
| 2827 | 2827 | * Add extra fields to google maps script call. |
@@ -2834,20 +2834,20 @@ discard block |
||
| 2834 | 2834 | * |
| 2835 | 2835 | * @return string Modified extra string. |
| 2836 | 2836 | */ |
| 2837 | -function geodir_googlemap_script_extra_details_page( $extra ) {
|
|
| 2837 | +function geodir_googlemap_script_extra_details_page($extra) {
|
|
| 2838 | 2838 | global $post; |
| 2839 | 2839 | $add_google_places_api = false; |
| 2840 | - if ( isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {
|
|
| 2840 | + if (isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
|
|
| 2841 | 2841 | $add_google_places_api = true; |
| 2842 | 2842 | } |
| 2843 | - if ( ! str_replace( 'libraries=places', '', $extra ) && ( geodir_is_page( 'detail' ) || $add_google_places_api ) ) {
|
|
| 2843 | + if (!str_replace('libraries=places', '', $extra) && (geodir_is_page('detail') || $add_google_places_api)) {
|
|
| 2844 | 2844 | $extra .= "&libraries=places"; |
| 2845 | 2845 | } |
| 2846 | 2846 | |
| 2847 | 2847 | return $extra; |
| 2848 | 2848 | } |
| 2849 | 2849 | |
| 2850 | -add_filter( 'geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1 ); |
|
| 2850 | +add_filter('geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1);
|
|
| 2851 | 2851 | |
| 2852 | 2852 | |
| 2853 | 2853 | /** |
@@ -2866,122 +2866,122 @@ discard block |
||
| 2866 | 2866 | * after_widget. |
| 2867 | 2867 | * @param array|string $instance The settings for the particular instance of the widget. |
| 2868 | 2868 | */ |
| 2869 | -function geodir_popular_post_category_output( $args = '', $instance = '' ) {
|
|
| 2869 | +function geodir_popular_post_category_output($args = '', $instance = '') {
|
|
| 2870 | 2870 | // prints the widget |
| 2871 | 2871 | global $wpdb, $plugin_prefix, $geodir_post_category_str; |
| 2872 | - extract( $args, EXTR_SKIP ); |
|
| 2872 | + extract($args, EXTR_SKIP); |
|
| 2873 | 2873 | |
| 2874 | 2874 | echo $before_widget; |
| 2875 | 2875 | |
| 2876 | 2876 | /** This filter is documented in geodirectory_widgets.php */ |
| 2877 | - $title = empty( $instance['title'] ) ? __( 'Popular Categories', 'geodirectory' ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 2877 | + $title = empty($instance['title']) ? __('Popular Categories', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 2878 | 2878 | |
| 2879 | 2879 | $gd_post_type = geodir_get_current_posttype(); |
| 2880 | 2880 | |
| 2881 | - $category_limit = isset( $instance['category_limit'] ) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; |
|
| 2881 | + $category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; |
|
| 2882 | 2882 | if (!isset($category_restrict)) {
|
| 2883 | 2883 | $category_restrict = false; |
| 2884 | 2884 | } |
| 2885 | - if ( ! empty( $gd_post_type ) ) {
|
|
| 2885 | + if (!empty($gd_post_type)) {
|
|
| 2886 | 2886 | $default_post_type = $gd_post_type; |
| 2887 | - } elseif ( isset( $instance['default_post_type'] ) && gdsc_is_post_type_valid( $instance['default_post_type'] ) ) {
|
|
| 2887 | + } elseif (isset($instance['default_post_type']) && gdsc_is_post_type_valid($instance['default_post_type'])) {
|
|
| 2888 | 2888 | $default_post_type = $instance['default_post_type']; |
| 2889 | 2889 | } else {
|
| 2890 | 2890 | $all_gd_post_type = geodir_get_posttypes(); |
| 2891 | - $default_post_type = ( isset( $all_gd_post_type[0] ) ) ? $all_gd_post_type[0] : ''; |
|
| 2891 | + $default_post_type = (isset($all_gd_post_type[0])) ? $all_gd_post_type[0] : ''; |
|
| 2892 | 2892 | } |
| 2893 | - $parent_only = !empty( $instance['parent_only'] ) ? true : false; |
|
| 2893 | + $parent_only = !empty($instance['parent_only']) ? true : false; |
|
| 2894 | 2894 | |
| 2895 | 2895 | $taxonomy = array(); |
| 2896 | - if ( ! empty( $gd_post_type ) ) {
|
|
| 2897 | - $taxonomy[] = $gd_post_type . "category"; |
|
| 2896 | + if (!empty($gd_post_type)) {
|
|
| 2897 | + $taxonomy[] = $gd_post_type."category"; |
|
| 2898 | 2898 | } else {
|
| 2899 | - $taxonomy = geodir_get_taxonomies( $gd_post_type ); |
|
| 2899 | + $taxonomy = geodir_get_taxonomies($gd_post_type); |
|
| 2900 | 2900 | } |
| 2901 | 2901 | |
| 2902 | 2902 | $taxonomy = apply_filters('geodir_pp_category_taxonomy', $taxonomy);
|
| 2903 | 2903 | |
| 2904 | - $term_args = array( 'taxonomy' => $taxonomy ); |
|
| 2905 | - if ( $parent_only ) {
|
|
| 2904 | + $term_args = array('taxonomy' => $taxonomy);
|
|
| 2905 | + if ($parent_only) {
|
|
| 2906 | 2906 | $term_args['parent'] = 0; |
| 2907 | 2907 | } |
| 2908 | 2908 | |
| 2909 | - $terms = get_terms( $term_args ); |
|
| 2909 | + $terms = get_terms($term_args); |
|
| 2910 | 2910 | $a_terms = array(); |
| 2911 | 2911 | $b_terms = array(); |
| 2912 | 2912 | |
| 2913 | - foreach ( $terms as $term ) {
|
|
| 2914 | - if ( $term->count > 0 ) {
|
|
| 2915 | - $a_terms[ $term->taxonomy ][] = $term; |
|
| 2913 | + foreach ($terms as $term) {
|
|
| 2914 | + if ($term->count > 0) {
|
|
| 2915 | + $a_terms[$term->taxonomy][] = $term; |
|
| 2916 | 2916 | } |
| 2917 | 2917 | } |
| 2918 | 2918 | |
| 2919 | - if ( ! empty( $a_terms ) ) {
|
|
| 2919 | + if (!empty($a_terms)) {
|
|
| 2920 | 2920 | // Sort CPT taxonomies in categories widget. |
| 2921 | - if ( !empty( $taxonomy ) && is_array( $taxonomy ) && count( $taxonomy ) > 1 ) {
|
|
| 2921 | + if (!empty($taxonomy) && is_array($taxonomy) && count($taxonomy) > 1) {
|
|
| 2922 | 2922 | $gd_post_types = geodir_get_posttypes(); |
| 2923 | 2923 | $sort_taxonomies = array(); |
| 2924 | 2924 | |
| 2925 | - foreach ( $gd_post_types as $gd_post_type ) {
|
|
| 2926 | - $taxonomy_name = $gd_post_type . 'category'; |
|
| 2925 | + foreach ($gd_post_types as $gd_post_type) {
|
|
| 2926 | + $taxonomy_name = $gd_post_type.'category'; |
|
| 2927 | 2927 | |
| 2928 | - if ( !empty( $a_terms[$taxonomy_name] ) ) {
|
|
| 2928 | + if (!empty($a_terms[$taxonomy_name])) {
|
|
| 2929 | 2929 | $sort_taxonomies[$taxonomy_name] = $a_terms[$taxonomy_name]; |
| 2930 | 2930 | } |
| 2931 | 2931 | } |
| 2932 | - $a_terms = !empty( $sort_taxonomies ) ? $sort_taxonomies : $a_terms; |
|
| 2932 | + $a_terms = !empty($sort_taxonomies) ? $sort_taxonomies : $a_terms; |
|
| 2933 | 2933 | } |
| 2934 | 2934 | |
| 2935 | 2935 | $sort_by = apply_filters('geodir_pp_category_sort', 'count');
|
| 2936 | - foreach ( $a_terms as $b_key => $b_val ) {
|
|
| 2937 | - $b_terms[ $b_key ] = geodir_sort_terms( $b_val, $sort_by ); |
|
| 2936 | + foreach ($a_terms as $b_key => $b_val) {
|
|
| 2937 | + $b_terms[$b_key] = geodir_sort_terms($b_val, $sort_by); |
|
| 2938 | 2938 | } |
| 2939 | 2939 | |
| 2940 | - $default_taxonomy = $default_post_type != '' && isset( $b_terms[ $default_post_type . 'category' ] ) ? $default_post_type . 'category' : ''; |
|
| 2940 | + $default_taxonomy = $default_post_type != '' && isset($b_terms[$default_post_type.'category']) ? $default_post_type.'category' : ''; |
|
| 2941 | 2941 | |
| 2942 | 2942 | $tax_change_output = ''; |
| 2943 | - if ( count( $b_terms ) > 1 ) {
|
|
| 2944 | - $tax_change_output .= "<select data-limit='$category_limit' data-parent='" . (int)$parent_only . "' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; |
|
| 2945 | - foreach ( $b_terms as $key => $val ) {
|
|
| 2946 | - $ptype = get_post_type_object( str_replace( "category", "", $key ) ); |
|
| 2947 | - $cpt_name = __( $ptype->labels->singular_name, 'geodirectory' ); |
|
| 2948 | - $tax_change_output .= "<option value='$key' " . selected( $key, $default_taxonomy, false ) . ">" . sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name ) . "</option>"; |
|
| 2943 | + if (count($b_terms) > 1) {
|
|
| 2944 | + $tax_change_output .= "<select data-limit='$category_limit' data-parent='".(int) $parent_only."' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; |
|
| 2945 | + foreach ($b_terms as $key => $val) {
|
|
| 2946 | + $ptype = get_post_type_object(str_replace("category", "", $key));
|
|
| 2947 | + $cpt_name = __($ptype->labels->singular_name, 'geodirectory'); |
|
| 2948 | + $tax_change_output .= "<option value='$key' ".selected($key, $default_taxonomy, false).">".sprintf(__('%s Categories', 'geodirectory'), $cpt_name)."</option>";
|
|
| 2949 | 2949 | } |
| 2950 | 2950 | $tax_change_output .= "</select>"; |
| 2951 | 2951 | } |
| 2952 | 2952 | |
| 2953 | - if ( ! empty( $b_terms ) ) {
|
|
| 2954 | - $terms = $default_taxonomy != '' && isset( $b_terms[ $default_taxonomy ] ) ? $b_terms[ $default_taxonomy ] : reset( $b_terms );// get the first array |
|
| 2955 | - global $cat_count;//make global so we can change via function |
|
| 2953 | + if (!empty($b_terms)) {
|
|
| 2954 | + $terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms); // get the first array |
|
| 2955 | + global $cat_count; //make global so we can change via function |
|
| 2956 | 2956 | $cat_count = 0; |
| 2957 | 2957 | ?> |
| 2958 | 2958 | <div class="geodir-category-list-in clearfix"> |
| 2959 | 2959 | <div class="geodir-cat-list clearfix"> |
| 2960 | 2960 | <?php |
| 2961 | - echo $before_title . __( $title ) . $after_title; |
|
| 2961 | + echo $before_title.__($title).$after_title; |
|
| 2962 | 2962 | |
| 2963 | 2963 | echo $tax_change_output; |
| 2964 | 2964 | |
| 2965 | 2965 | echo '<ul class="geodir-popular-cat-list">'; |
| 2966 | 2966 | |
| 2967 | - geodir_helper_cat_list_output( $terms, $category_limit, $category_restrict); |
|
| 2967 | + geodir_helper_cat_list_output($terms, $category_limit, $category_restrict); |
|
| 2968 | 2968 | |
| 2969 | 2969 | echo '</ul>'; |
| 2970 | 2970 | ?> |
| 2971 | 2971 | </div> |
| 2972 | 2972 | <?php |
| 2973 | - if ( empty( $category_restrict ) ) {
|
|
| 2973 | + if (empty($category_restrict)) {
|
|
| 2974 | 2974 | $hide = ''; |
| 2975 | - if ( $cat_count < $category_limit ) {
|
|
| 2975 | + if ($cat_count < $category_limit) {
|
|
| 2976 | 2976 | $hide = 'style="display:none;"'; |
| 2977 | 2977 | } |
| 2978 | 2978 | echo "<div class='geodir-cat-list-more' $hide >"; |
| 2979 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">' . __( 'More Categories', 'geodirectory' ) . '</a>'; |
|
| 2980 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">' . __( 'Less Categories', 'geodirectory' ) . '</a>'; |
|
| 2979 | + echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">'.__('More Categories', 'geodirectory').'</a>';
|
|
| 2980 | + echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">'.__('Less Categories', 'geodirectory').'</a>';
|
|
| 2981 | 2981 | echo "</div>"; |
| 2982 | 2982 | } |
| 2983 | 2983 | /* add scripts */ |
| 2984 | - add_action( 'wp_footer', 'geodir_popular_category_add_scripts', 100 ); |
|
| 2984 | + add_action('wp_footer', 'geodir_popular_category_add_scripts', 100);
|
|
| 2985 | 2985 | ?> |
| 2986 | 2986 | </div> |
| 2987 | 2987 | <?php |
@@ -3001,28 +3001,28 @@ discard block |
||
| 3001 | 3001 | * @param int $category_limit Number of categories to display by default. |
| 3002 | 3002 | * @param bool $category_restrict If the cat limit should be hidden or not shown. |
| 3003 | 3003 | */ |
| 3004 | -function geodir_helper_cat_list_output( $terms, $category_limit , $category_restrict=false) {
|
|
| 3004 | +function geodir_helper_cat_list_output($terms, $category_limit, $category_restrict = false) {
|
|
| 3005 | 3005 | global $geodir_post_category_str, $cat_count; |
| 3006 | 3006 | $term_icons = geodir_get_term_icon(); |
| 3007 | 3007 | |
| 3008 | 3008 | $geodir_post_category_str = array(); |
| 3009 | 3009 | |
| 3010 | 3010 | |
| 3011 | - foreach ( $terms as $cat ) {
|
|
| 3012 | - $post_type = str_replace( "category", "", $cat->taxonomy ); |
|
| 3013 | - $term_icon_url = ! empty( $term_icons ) && isset( $term_icons[ $cat->term_id ] ) ? $term_icons[ $cat->term_id ] : ''; |
|
| 3011 | + foreach ($terms as $cat) {
|
|
| 3012 | + $post_type = str_replace("category", "", $cat->taxonomy);
|
|
| 3013 | + $term_icon_url = !empty($term_icons) && isset($term_icons[$cat->term_id]) ? $term_icons[$cat->term_id] : ''; |
|
| 3014 | 3014 | |
| 3015 | - $cat_count ++; |
|
| 3015 | + $cat_count++; |
|
| 3016 | 3016 | |
| 3017 | - $geodir_post_category_str[] = array( 'posttype' => $post_type, 'termid' => $cat->term_id ); |
|
| 3017 | + $geodir_post_category_str[] = array('posttype' => $post_type, 'termid' => $cat->term_id);
|
|
| 3018 | 3018 | |
| 3019 | - $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; |
|
| 3020 | - if($category_restrict && $cat_count > $category_limit ){
|
|
| 3019 | + $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; |
|
| 3020 | + if ($category_restrict && $cat_count > $category_limit) {
|
|
| 3021 | 3021 | continue; |
| 3022 | 3022 | } |
| 3023 | 3023 | $total_post = $cat->count; |
| 3024 | 3024 | |
| 3025 | - $term_link = get_term_link( $cat, $cat->taxonomy ); |
|
| 3025 | + $term_link = get_term_link($cat, $cat->taxonomy); |
|
| 3026 | 3026 | /** |
| 3027 | 3027 | * Filer the category term link. |
| 3028 | 3028 | * |
@@ -3032,11 +3032,11 @@ discard block |
||
| 3032 | 3032 | * @param int $cat ->term_id The term id. |
| 3033 | 3033 | * @param string $post_type Wordpress post type. |
| 3034 | 3034 | */ |
| 3035 | - $term_link = apply_filters( 'geodir_category_term_link', $term_link, $cat->term_id, $post_type ); |
|
| 3035 | + $term_link = apply_filters('geodir_category_term_link', $term_link, $cat->term_id, $post_type);
|
|
| 3036 | 3036 | |
| 3037 | - echo '<li class="' . $class_row . '"><a href="' . $term_link . '">'; |
|
| 3038 | - echo '<img alt="' . esc_attr( $cat->name ) . ' icon" style="height:20px;vertical-align:middle;" src="' . $term_icon_url . '"/> <span class="cat-link">'; |
|
| 3039 | - echo $cat->name . '</span> <span class="geodir_term_class geodir_link_span geodir_category_class_' . $post_type . '_' . $cat->term_id . '">(' . $total_post . ')</span> ';
|
|
| 3037 | + echo '<li class="'.$class_row.'"><a href="'.$term_link.'">'; |
|
| 3038 | + echo '<img alt="'.esc_attr($cat->name).' icon" style="height:20px;vertical-align:middle;" src="'.$term_icon_url.'"/> <span class="cat-link">'; |
|
| 3039 | + echo $cat->name.'</span> <span class="geodir_term_class geodir_link_span geodir_category_class_'.$post_type.'_'.$cat->term_id.'">('.$total_post.')</span> ';
|
|
| 3040 | 3040 | echo '</a></li>'; |
| 3041 | 3041 | } |
| 3042 | 3042 | } |
@@ -3051,14 +3051,14 @@ discard block |
||
| 3051 | 3051 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. |
| 3052 | 3052 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3053 | 3053 | */ |
| 3054 | -function geodir_listing_slider_widget_output( $args = '', $instance = '' ) {
|
|
| 3054 | +function geodir_listing_slider_widget_output($args = '', $instance = '') {
|
|
| 3055 | 3055 | // prints the widget |
| 3056 | - extract( $args, EXTR_SKIP ); |
|
| 3056 | + extract($args, EXTR_SKIP); |
|
| 3057 | 3057 | |
| 3058 | 3058 | echo $before_widget; |
| 3059 | 3059 | |
| 3060 | 3060 | /** This filter is documented in geodirectory_widgets.php */ |
| 3061 | - $title = empty( $instance['title'] ) ? '' : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3061 | + $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3062 | 3062 | /** |
| 3063 | 3063 | * Filter the widget post type. |
| 3064 | 3064 | * |
@@ -3066,7 +3066,7 @@ discard block |
||
| 3066 | 3066 | * |
| 3067 | 3067 | * @param string $instance ['post_type'] Post type of listing. |
| 3068 | 3068 | */ |
| 3069 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); |
|
| 3069 | + $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
|
|
| 3070 | 3070 | /** |
| 3071 | 3071 | * Filter the widget's term. |
| 3072 | 3072 | * |
@@ -3074,7 +3074,7 @@ discard block |
||
| 3074 | 3074 | * |
| 3075 | 3075 | * @param string $instance ['category'] Filter by term. Can be any valid term. |
| 3076 | 3076 | */ |
| 3077 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); |
|
| 3077 | + $category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
|
|
| 3078 | 3078 | /** |
| 3079 | 3079 | * Filter widget's "add_location_filter" value. |
| 3080 | 3080 | * |
@@ -3082,7 +3082,7 @@ discard block |
||
| 3082 | 3082 | * |
| 3083 | 3083 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. |
| 3084 | 3084 | */ |
| 3085 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); |
|
| 3085 | + $add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
|
|
| 3086 | 3086 | /** |
| 3087 | 3087 | * Filter the widget listings limit. |
| 3088 | 3088 | * |
@@ -3090,7 +3090,7 @@ discard block |
||
| 3090 | 3090 | * |
| 3091 | 3091 | * @param string $instance ['post_number'] Number of listings to display. |
| 3092 | 3092 | */ |
| 3093 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); |
|
| 3093 | + $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
|
|
| 3094 | 3094 | /** |
| 3095 | 3095 | * Filter the widget listings limit shown at one time. |
| 3096 | 3096 | * |
@@ -3098,7 +3098,7 @@ discard block |
||
| 3098 | 3098 | * |
| 3099 | 3099 | * @param string $instance ['max_show'] Number of listings to display on screen. |
| 3100 | 3100 | */ |
| 3101 | - $max_show = empty( $instance['max_show'] ) ? '1' : apply_filters( 'widget_max_show', $instance['max_show'] ); |
|
| 3101 | + $max_show = empty($instance['max_show']) ? '1' : apply_filters('widget_max_show', $instance['max_show']);
|
|
| 3102 | 3102 | /** |
| 3103 | 3103 | * Filter the widget slide width. |
| 3104 | 3104 | * |
@@ -3106,7 +3106,7 @@ discard block |
||
| 3106 | 3106 | * |
| 3107 | 3107 | * @param string $instance ['slide_width'] Width of the slides shown. |
| 3108 | 3108 | */ |
| 3109 | - $slide_width = empty( $instance['slide_width'] ) ? '' : apply_filters( 'widget_slide_width', $instance['slide_width'] ); |
|
| 3109 | + $slide_width = empty($instance['slide_width']) ? '' : apply_filters('widget_slide_width', $instance['slide_width']);
|
|
| 3110 | 3110 | /** |
| 3111 | 3111 | * Filter widget's "show title" value. |
| 3112 | 3112 | * |
@@ -3114,7 +3114,7 @@ discard block |
||
| 3114 | 3114 | * |
| 3115 | 3115 | * @param string|bool $instance ['show_title'] Do you want to display title? Can be 1 or 0. |
| 3116 | 3116 | */ |
| 3117 | - $show_title = empty( $instance['show_title'] ) ? '' : apply_filters( 'widget_show_title', $instance['show_title'] ); |
|
| 3117 | + $show_title = empty($instance['show_title']) ? '' : apply_filters('widget_show_title', $instance['show_title']);
|
|
| 3118 | 3118 | /** |
| 3119 | 3119 | * Filter widget's "slideshow" value. |
| 3120 | 3120 | * |
@@ -3122,7 +3122,7 @@ discard block |
||
| 3122 | 3122 | * |
| 3123 | 3123 | * @param int $instance ['slideshow'] Setup a slideshow for the slider to animate automatically. |
| 3124 | 3124 | */ |
| 3125 | - $slideshow = empty( $instance['slideshow'] ) ? 0 : apply_filters( 'widget_slideshow', $instance['slideshow'] ); |
|
| 3125 | + $slideshow = empty($instance['slideshow']) ? 0 : apply_filters('widget_slideshow', $instance['slideshow']);
|
|
| 3126 | 3126 | /** |
| 3127 | 3127 | * Filter widget's "animationLoop" value. |
| 3128 | 3128 | * |
@@ -3130,7 +3130,7 @@ discard block |
||
| 3130 | 3130 | * |
| 3131 | 3131 | * @param int $instance ['animationLoop'] Gives the slider a seamless infinite loop. |
| 3132 | 3132 | */ |
| 3133 | - $animationLoop = empty( $instance['animationLoop'] ) ? 0 : apply_filters( 'widget_animationLoop', $instance['animationLoop'] ); |
|
| 3133 | + $animationLoop = empty($instance['animationLoop']) ? 0 : apply_filters('widget_animationLoop', $instance['animationLoop']);
|
|
| 3134 | 3134 | /** |
| 3135 | 3135 | * Filter widget's "directionNav" value. |
| 3136 | 3136 | * |
@@ -3138,7 +3138,7 @@ discard block |
||
| 3138 | 3138 | * |
| 3139 | 3139 | * @param int $instance ['directionNav'] Enable previous/next arrow navigation?. Can be 1 or 0. |
| 3140 | 3140 | */ |
| 3141 | - $directionNav = empty( $instance['directionNav'] ) ? 0 : apply_filters( 'widget_directionNav', $instance['directionNav'] ); |
|
| 3141 | + $directionNav = empty($instance['directionNav']) ? 0 : apply_filters('widget_directionNav', $instance['directionNav']);
|
|
| 3142 | 3142 | /** |
| 3143 | 3143 | * Filter widget's "slideshowSpeed" value. |
| 3144 | 3144 | * |
@@ -3146,7 +3146,7 @@ discard block |
||
| 3146 | 3146 | * |
| 3147 | 3147 | * @param int $instance ['slideshowSpeed'] Set the speed of the slideshow cycling, in milliseconds. |
| 3148 | 3148 | */ |
| 3149 | - $slideshowSpeed = empty( $instance['slideshowSpeed'] ) ? 5000 : apply_filters( 'widget_slideshowSpeed', $instance['slideshowSpeed'] ); |
|
| 3149 | + $slideshowSpeed = empty($instance['slideshowSpeed']) ? 5000 : apply_filters('widget_slideshowSpeed', $instance['slideshowSpeed']);
|
|
| 3150 | 3150 | /** |
| 3151 | 3151 | * Filter widget's "animationSpeed" value. |
| 3152 | 3152 | * |
@@ -3154,7 +3154,7 @@ discard block |
||
| 3154 | 3154 | * |
| 3155 | 3155 | * @param int $instance ['animationSpeed'] Set the speed of animations, in milliseconds. |
| 3156 | 3156 | */ |
| 3157 | - $animationSpeed = empty( $instance['animationSpeed'] ) ? 600 : apply_filters( 'widget_animationSpeed', $instance['animationSpeed'] ); |
|
| 3157 | + $animationSpeed = empty($instance['animationSpeed']) ? 600 : apply_filters('widget_animationSpeed', $instance['animationSpeed']);
|
|
| 3158 | 3158 | /** |
| 3159 | 3159 | * Filter widget's "animation" value. |
| 3160 | 3160 | * |
@@ -3162,7 +3162,7 @@ discard block |
||
| 3162 | 3162 | * |
| 3163 | 3163 | * @param string $instance ['animation'] Controls the animation type, "fade" or "slide". |
| 3164 | 3164 | */ |
| 3165 | - $animation = empty( $instance['animation'] ) ? 'slide' : apply_filters( 'widget_animation', $instance['animation'] ); |
|
| 3165 | + $animation = empty($instance['animation']) ? 'slide' : apply_filters('widget_animation', $instance['animation']);
|
|
| 3166 | 3166 | /** |
| 3167 | 3167 | * Filter widget's "list_sort" type. |
| 3168 | 3168 | * |
@@ -3170,10 +3170,10 @@ discard block |
||
| 3170 | 3170 | * |
| 3171 | 3171 | * @param string $instance ['list_sort'] Listing sort by type. |
| 3172 | 3172 | */ |
| 3173 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); |
|
| 3174 | - $show_featured_only = ! empty( $instance['show_featured_only'] ) ? 1 : null; |
|
| 3173 | + $list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
|
|
| 3174 | + $show_featured_only = !empty($instance['show_featured_only']) ? 1 : null; |
|
| 3175 | 3175 | |
| 3176 | - wp_enqueue_script( 'geodirectory-jquery-flexslider-js' ); |
|
| 3176 | + wp_enqueue_script('geodirectory-jquery-flexslider-js');
|
|
| 3177 | 3177 | ?> |
| 3178 | 3178 | <script type="text/javascript"> |
| 3179 | 3179 | jQuery(window).load(function () {
|
@@ -3192,7 +3192,7 @@ discard block |
||
| 3192 | 3192 | itemWidth: 75, |
| 3193 | 3193 | itemMargin: 5, |
| 3194 | 3194 | asNavFor: '#geodir_widget_slider', |
| 3195 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?>, |
|
| 3195 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?>, |
|
| 3196 | 3196 | start: function (slider) {
|
| 3197 | 3197 | // chrome 53 introduced a bug, so we need to repaint the slider when shown. |
| 3198 | 3198 | jQuery('.geodir-slides', jQuery(slider)).removeClass('flexslider-fix-rtl');
|
@@ -3200,19 +3200,19 @@ discard block |
||
| 3200 | 3200 | }); |
| 3201 | 3201 | |
| 3202 | 3202 | jQuery('#geodir_widget_slider').flexslider({
|
| 3203 | - animation: "<?php echo $animation;?>", |
|
| 3203 | + animation: "<?php echo $animation; ?>", |
|
| 3204 | 3204 | selector: ".geodir-slides > li", |
| 3205 | 3205 | namespace: "geodir-", |
| 3206 | 3206 | controlNav: true, |
| 3207 | - animationLoop: <?php echo $animationLoop;?>, |
|
| 3208 | - slideshow: <?php echo $slideshow;?>, |
|
| 3209 | - slideshowSpeed: <?php echo $slideshowSpeed;?>, |
|
| 3210 | - animationSpeed: <?php echo $animationSpeed;?>, |
|
| 3211 | - directionNav: <?php echo $directionNav;?>, |
|
| 3212 | - maxItems: <?php echo $max_show;?>, |
|
| 3207 | + animationLoop: <?php echo $animationLoop; ?>, |
|
| 3208 | + slideshow: <?php echo $slideshow; ?>, |
|
| 3209 | + slideshowSpeed: <?php echo $slideshowSpeed; ?>, |
|
| 3210 | + animationSpeed: <?php echo $animationSpeed; ?>, |
|
| 3211 | + directionNav: <?php echo $directionNav; ?>, |
|
| 3212 | + maxItems: <?php echo $max_show; ?>, |
|
| 3213 | 3213 | move: 1, |
| 3214 | - <?php if ( $slide_width ) {
|
|
| 3215 | - echo "itemWidth: " . $slide_width . ","; |
|
| 3214 | + <?php if ($slide_width) {
|
|
| 3215 | + echo "itemWidth: ".$slide_width.","; |
|
| 3216 | 3216 | }?> |
| 3217 | 3217 | sync: "#geodir_widget_carousel", |
| 3218 | 3218 | start: function (slider) {
|
@@ -3223,7 +3223,7 @@ discard block |
||
| 3223 | 3223 | jQuery('#geodir_widget_slider').css({'visibility': 'visible'});
|
| 3224 | 3224 | jQuery('#geodir_widget_carousel').css({'visibility': 'visible'});
|
| 3225 | 3225 | }, |
| 3226 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?> |
|
| 3226 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?> |
|
| 3227 | 3227 | }); |
| 3228 | 3228 | }); |
| 3229 | 3229 | </script> |
@@ -3236,62 +3236,62 @@ discard block |
||
| 3236 | 3236 | 'order_by' => $list_sort |
| 3237 | 3237 | ); |
| 3238 | 3238 | |
| 3239 | - if ( $show_featured_only ) {
|
|
| 3239 | + if ($show_featured_only) {
|
|
| 3240 | 3240 | $query_args['show_featured_only'] = 1; |
| 3241 | 3241 | } |
| 3242 | 3242 | |
| 3243 | - if ( $category != 0 || $category != '' ) {
|
|
| 3244 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 3243 | + if ($category != 0 || $category != '') {
|
|
| 3244 | + $category_taxonomy = geodir_get_taxonomies($post_type); |
|
| 3245 | 3245 | $tax_query = array( |
| 3246 | 3246 | 'taxonomy' => $category_taxonomy[0], |
| 3247 | 3247 | 'field' => 'id', |
| 3248 | 3248 | 'terms' => $category |
| 3249 | 3249 | ); |
| 3250 | 3250 | |
| 3251 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 3251 | + $query_args['tax_query'] = array($tax_query); |
|
| 3252 | 3252 | } |
| 3253 | 3253 | |
| 3254 | 3254 | // we want listings with featured image only |
| 3255 | 3255 | $query_args['featured_image_only'] = 1; |
| 3256 | 3256 | |
| 3257 | - if ( $post_type == 'gd_event' ) {
|
|
| 3257 | + if ($post_type == 'gd_event') {
|
|
| 3258 | 3258 | $query_args['gedir_event_listing_filter'] = 'upcoming'; |
| 3259 | 3259 | }// show only upcoming events |
| 3260 | 3260 | |
| 3261 | - $widget_listings = geodir_get_widget_listings( $query_args ); |
|
| 3262 | - if ( ! empty( $widget_listings ) || ( isset( $with_no_results ) && $with_no_results ) ) {
|
|
| 3263 | - if ( $title ) {
|
|
| 3264 | - echo $before_title . $title . $after_title; |
|
| 3261 | + $widget_listings = geodir_get_widget_listings($query_args); |
|
| 3262 | + if (!empty($widget_listings) || (isset($with_no_results) && $with_no_results)) {
|
|
| 3263 | + if ($title) {
|
|
| 3264 | + echo $before_title.$title.$after_title; |
|
| 3265 | 3265 | } |
| 3266 | 3266 | |
| 3267 | 3267 | global $post; |
| 3268 | 3268 | |
| 3269 | - $current_post = $post;// keep current post info |
|
| 3269 | + $current_post = $post; // keep current post info |
|
| 3270 | 3270 | |
| 3271 | 3271 | $widget_main_slides = ''; |
| 3272 | 3272 | $nav_slides = ''; |
| 3273 | 3273 | $widget_slides = 0; |
| 3274 | 3274 | |
| 3275 | - foreach ( $widget_listings as $widget_listing ) {
|
|
| 3275 | + foreach ($widget_listings as $widget_listing) {
|
|
| 3276 | 3276 | global $gd_widget_listing_type; |
| 3277 | 3277 | $post = $widget_listing; |
| 3278 | - $widget_image = geodir_get_featured_image( $post->ID, 'thumbnail', get_option( 'geodir_listing_no_img' ) ); |
|
| 3278 | + $widget_image = geodir_get_featured_image($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
|
|
| 3279 | 3279 | |
| 3280 | - if ( ! empty( $widget_image ) ) {
|
|
| 3281 | - if ( $widget_image->height >= 200 ) {
|
|
| 3280 | + if (!empty($widget_image)) {
|
|
| 3281 | + if ($widget_image->height >= 200) {
|
|
| 3282 | 3282 | $widget_spacer_height = 0; |
| 3283 | 3283 | } else {
|
| 3284 | - $widget_spacer_height = ( ( 200 - $widget_image->height ) / 2 ); |
|
| 3284 | + $widget_spacer_height = ((200 - $widget_image->height) / 2); |
|
| 3285 | 3285 | } |
| 3286 | 3286 | |
| 3287 | - $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" />'; |
|
| 3287 | + $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" />'; |
|
| 3288 | 3288 | |
| 3289 | 3289 | $title = ''; |
| 3290 | - if ( $show_title ) {
|
|
| 3291 | - $title_html = '<div class="geodir-slider-title"><a href="' . get_permalink( $post->ID ) . '">' . get_the_title( $post->ID ) . '</a></div>'; |
|
| 3290 | + if ($show_title) {
|
|
| 3291 | + $title_html = '<div class="geodir-slider-title"><a href="'.get_permalink($post->ID).'">'.get_the_title($post->ID).'</a></div>'; |
|
| 3292 | 3292 | $post_id = $post->ID; |
| 3293 | - $post_permalink = get_permalink( $post->ID ); |
|
| 3294 | - $post_title = get_the_title( $post->ID ); |
|
| 3293 | + $post_permalink = get_permalink($post->ID); |
|
| 3294 | + $post_title = get_the_title($post->ID); |
|
| 3295 | 3295 | /** |
| 3296 | 3296 | * Filter the listing slider widget title. |
| 3297 | 3297 | * |
@@ -3302,12 +3302,12 @@ discard block |
||
| 3302 | 3302 | * @param string $post_permalink The post permalink url. |
| 3303 | 3303 | * @param string $post_title The post title text. |
| 3304 | 3304 | */ |
| 3305 | - $title = apply_filters( 'geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title ); |
|
| 3305 | + $title = apply_filters('geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title);
|
|
| 3306 | 3306 | } |
| 3307 | 3307 | |
| 3308 | - $widget_main_slides .= $title . '<a href="' . get_permalink( $post->ID ) . '"><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:200px;margin:0 auto;" /></a></li>'; |
|
| 3309 | - $nav_slides .= '<li><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 3310 | - $widget_slides ++; |
|
| 3308 | + $widget_main_slides .= $title.'<a href="'.get_permalink($post->ID).'"><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:200px;margin:0 auto;" /></a></li>'; |
|
| 3309 | + $nav_slides .= '<li><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 3310 | + $widget_slides++; |
|
| 3311 | 3311 | } |
| 3312 | 3312 | } |
| 3313 | 3313 | ?> |
@@ -3316,7 +3316,7 @@ discard block |
||
| 3316 | 3316 | <div id="geodir_widget_slider" class="geodir_flexslider"> |
| 3317 | 3317 | <ul class="geodir-slides clearfix"><?php echo $widget_main_slides; ?></ul> |
| 3318 | 3318 | </div> |
| 3319 | - <?php if ( $widget_slides > 1 ) { ?>
|
|
| 3319 | + <?php if ($widget_slides > 1) { ?>
|
|
| 3320 | 3320 | <div id="geodir_widget_carousel" class="geodir_flexslider"> |
| 3321 | 3321 | <ul class="geodir-slides clearfix"><?php echo $nav_slides; ?></ul> |
| 3322 | 3322 | </div> |
@@ -3324,7 +3324,7 @@ discard block |
||
| 3324 | 3324 | </div> |
| 3325 | 3325 | <?php |
| 3326 | 3326 | $GLOBALS['post'] = $current_post; |
| 3327 | - setup_postdata( $current_post ); |
|
| 3327 | + setup_postdata($current_post); |
|
| 3328 | 3328 | } |
| 3329 | 3329 | echo $after_widget; |
| 3330 | 3330 | } |
@@ -3340,50 +3340,50 @@ discard block |
||
| 3340 | 3340 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. |
| 3341 | 3341 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3342 | 3342 | */ |
| 3343 | -function geodir_loginwidget_output( $args = '', $instance = '' ) {
|
|
| 3343 | +function geodir_loginwidget_output($args = '', $instance = '') {
|
|
| 3344 | 3344 | //print_r($args); |
| 3345 | 3345 | //print_r($instance); |
| 3346 | 3346 | // prints the widget |
| 3347 | - extract( $args, EXTR_SKIP ); |
|
| 3347 | + extract($args, EXTR_SKIP); |
|
| 3348 | 3348 | |
| 3349 | 3349 | /** This filter is documented in geodirectory_widgets.php */ |
| 3350 | - $title = empty( $instance['title'] ) ? __( 'My Dashboard', 'geodirectory' ) : apply_filters( 'my_dashboard_widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3350 | + $title = empty($instance['title']) ? __('My Dashboard', 'geodirectory') : apply_filters('my_dashboard_widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3351 | 3351 | |
| 3352 | 3352 | echo $before_widget; |
| 3353 | - echo $before_title . $title . $after_title; |
|
| 3353 | + echo $before_title.$title.$after_title; |
|
| 3354 | 3354 | |
| 3355 | 3355 | // global $gd_session; |
| 3356 | 3356 | // print_r($gd_session); |
| 3357 | 3357 | // print_r($_SESSION); |
| 3358 | 3358 | |
| 3359 | - if ( is_user_logged_in() ) {
|
|
| 3359 | + if (is_user_logged_in()) {
|
|
| 3360 | 3360 | global $current_user; |
| 3361 | 3361 | |
| 3362 | - $author_link = get_author_posts_url( $current_user->data->ID ); |
|
| 3363 | - $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false ); |
|
| 3362 | + $author_link = get_author_posts_url($current_user->data->ID); |
|
| 3363 | + $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
|
|
| 3364 | 3364 | |
| 3365 | 3365 | echo '<ul class="geodir-loginbox-list">'; |
| 3366 | 3366 | ob_start(); |
| 3367 | 3367 | ?> |
| 3368 | 3368 | <li><a class="signin" |
| 3369 | - href="<?php echo wp_logout_url( home_url() ); ?>"><?php _e( 'Logout', 'geodirectory' ); ?></a></li> |
|
| 3369 | + href="<?php echo wp_logout_url(home_url()); ?>"><?php _e('Logout', 'geodirectory'); ?></a></li>
|
|
| 3370 | 3370 | <?php |
| 3371 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 3372 | - $show_add_listing_post_types_main_nav = get_option( 'geodir_add_listing_link_user_dashboard' ); |
|
| 3373 | - $geodir_allow_posttype_frontend = get_option( 'geodir_allow_posttype_frontend' ); |
|
| 3371 | + $post_types = geodir_get_posttypes('object');
|
|
| 3372 | + $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_user_dashboard');
|
|
| 3373 | + $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 3374 | 3374 | |
| 3375 | - if ( ! empty( $show_add_listing_post_types_main_nav ) ) {
|
|
| 3375 | + if (!empty($show_add_listing_post_types_main_nav)) {
|
|
| 3376 | 3376 | $addlisting_links = ''; |
| 3377 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3377 | + foreach ($post_types as $key => $postobj) {
|
|
| 3378 | 3378 | |
| 3379 | - if ( in_array( $key, $show_add_listing_post_types_main_nav ) ) {
|
|
| 3379 | + if (in_array($key, $show_add_listing_post_types_main_nav)) {
|
|
| 3380 | 3380 | |
| 3381 | - if ( $add_link = geodir_get_addlisting_link( $key ) ) {
|
|
| 3381 | + if ($add_link = geodir_get_addlisting_link($key)) {
|
|
| 3382 | 3382 | |
| 3383 | 3383 | $name = $postobj->labels->name; |
| 3384 | 3384 | |
| 3385 | 3385 | $selected = ''; |
| 3386 | - if ( geodir_get_current_posttype() == $key && geodir_is_page( 'add-listing' ) ) {
|
|
| 3386 | + if (geodir_get_current_posttype() == $key && geodir_is_page('add-listing')) {
|
|
| 3387 | 3387 | $selected = 'selected="selected"'; |
| 3388 | 3388 | } |
| 3389 | 3389 | |
@@ -3396,23 +3396,23 @@ discard block |
||
| 3396 | 3396 | * @param string $key Add listing array key. |
| 3397 | 3397 | * @param int $current_user ->ID Current user ID. |
| 3398 | 3398 | */ |
| 3399 | - $add_link = apply_filters( 'geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID ); |
|
| 3400 | - $name = apply_filters( 'geodir_dashboard_label_add_listing', $name, $key, $current_user->ID ); |
|
| 3399 | + $add_link = apply_filters('geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID);
|
|
| 3400 | + $name = apply_filters('geodir_dashboard_label_add_listing', $name, $key, $current_user->ID);
|
|
| 3401 | 3401 | |
| 3402 | - $addlisting_links .= '<option ' . $selected . ' value="' . $add_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3402 | + $addlisting_links .= '<option '.$selected.' value="'.$add_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>'; |
|
| 3403 | 3403 | |
| 3404 | 3404 | } |
| 3405 | 3405 | } |
| 3406 | 3406 | |
| 3407 | 3407 | } |
| 3408 | 3408 | |
| 3409 | - if ( $addlisting_links != '' ) { ?>
|
|
| 3409 | + if ($addlisting_links != '') { ?>
|
|
| 3410 | 3410 | |
| 3411 | 3411 | <li><select id="geodir_add_listing" class="chosen_select" onchange="window.location.href=this.value" |
| 3412 | 3412 | option-autoredirect="1" name="geodir_add_listing" option-ajaxchosen="false" |
| 3413 | - data-placeholder="<?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?>"> |
|
| 3413 | + data-placeholder="<?php echo esc_attr(__('Add Listing', 'geodirectory')); ?>">
|
|
| 3414 | 3414 | <option value="" disabled="disabled" selected="selected" |
| 3415 | - style='display:none;'><?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?></option> |
|
| 3415 | + style='display:none;'><?php echo esc_attr(__('Add Listing', 'geodirectory')); ?></option>
|
|
| 3416 | 3416 | <?php echo $addlisting_links; ?> |
| 3417 | 3417 | </select></li> <?php |
| 3418 | 3418 | |
@@ -3420,24 +3420,24 @@ discard block |
||
| 3420 | 3420 | |
| 3421 | 3421 | } |
| 3422 | 3422 | // My Favourites in Dashboard |
| 3423 | - $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' ); |
|
| 3423 | + $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
|
|
| 3424 | 3424 | $user_favourite = geodir_user_favourite_listing_count(); |
| 3425 | 3425 | |
| 3426 | - if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
|
|
| 3426 | + if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
|
|
| 3427 | 3427 | $favourite_links = ''; |
| 3428 | 3428 | |
| 3429 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3430 | - if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
|
|
| 3429 | + foreach ($post_types as $key => $postobj) {
|
|
| 3430 | + if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
|
|
| 3431 | 3431 | $name = $postobj->labels->name; |
| 3432 | 3432 | $fav_author_link = apply_filters('gd_dash_fav_author_link', $author_link, $current_user->data->ID);
|
| 3433 | - $post_type_link = geodir_getlink( $fav_author_link, array( |
|
| 3433 | + $post_type_link = geodir_getlink($fav_author_link, array( |
|
| 3434 | 3434 | 'stype' => $key, |
| 3435 | 3435 | 'list' => 'favourite' |
| 3436 | - ), false ); |
|
| 3436 | + ), false); |
|
| 3437 | 3437 | |
| 3438 | 3438 | $selected = ''; |
| 3439 | 3439 | |
| 3440 | - if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 3440 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 3441 | 3441 | $selected = 'selected="selected"'; |
| 3442 | 3442 | } |
| 3443 | 3443 | /** |
@@ -3449,20 +3449,20 @@ discard block |
||
| 3449 | 3449 | * @param string $key Favorite listing array key. |
| 3450 | 3450 | * @param int $current_user ->ID Current user ID. |
| 3451 | 3451 | */ |
| 3452 | - $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID ); |
|
| 3452 | + $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID);
|
|
| 3453 | 3453 | |
| 3454 | - $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3454 | + $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>'; |
|
| 3455 | 3455 | } |
| 3456 | 3456 | } |
| 3457 | 3457 | |
| 3458 | - if ( $favourite_links != '' ) {
|
|
| 3458 | + if ($favourite_links != '') {
|
|
| 3459 | 3459 | ?> |
| 3460 | 3460 | <li> |
| 3461 | 3461 | <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" |
| 3462 | 3462 | option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" |
| 3463 | - data-placeholder="<?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?>"> |
|
| 3463 | + data-placeholder="<?php echo esc_attr(__('My Favorites', 'geodirectory')); ?>">
|
|
| 3464 | 3464 | <option value="" disabled="disabled" selected="selected" |
| 3465 | - style='display:none;'><?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?></option> |
|
| 3465 | + style='display:none;'><?php echo esc_attr(__('My Favorites', 'geodirectory')); ?></option>
|
|
| 3466 | 3466 | <?php echo $favourite_links; ?> |
| 3467 | 3467 | </select> |
| 3468 | 3468 | </li> |
@@ -3471,20 +3471,20 @@ discard block |
||
| 3471 | 3471 | } |
| 3472 | 3472 | |
| 3473 | 3473 | |
| 3474 | - $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' ); |
|
| 3474 | + $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
|
|
| 3475 | 3475 | $user_listing = geodir_user_post_listing_count(); |
| 3476 | 3476 | |
| 3477 | - if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
|
|
| 3477 | + if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
|
|
| 3478 | 3478 | $listing_links = ''; |
| 3479 | 3479 | |
| 3480 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3481 | - if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
|
|
| 3480 | + foreach ($post_types as $key => $postobj) {
|
|
| 3481 | + if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
|
|
| 3482 | 3482 | $name = $postobj->labels->name; |
| 3483 | 3483 | $listing_author_link = apply_filters('gd_dash_listing_author_link', $author_link, $current_user->data->ID);
|
| 3484 | - $listing_link = geodir_getlink( $listing_author_link, array( 'stype' => $key ), false ); |
|
| 3484 | + $listing_link = geodir_getlink($listing_author_link, array('stype' => $key), false);
|
|
| 3485 | 3485 | |
| 3486 | 3486 | $selected = ''; |
| 3487 | - if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
|
|
| 3487 | + if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
|
|
| 3488 | 3488 | $selected = 'selected="selected"'; |
| 3489 | 3489 | } |
| 3490 | 3490 | |
@@ -3497,20 +3497,20 @@ discard block |
||
| 3497 | 3497 | * @param string $key My listing array key. |
| 3498 | 3498 | * @param int $current_user ->ID Current user ID. |
| 3499 | 3499 | */ |
| 3500 | - $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID ); |
|
| 3500 | + $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID);
|
|
| 3501 | 3501 | |
| 3502 | - $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3502 | + $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>'; |
|
| 3503 | 3503 | } |
| 3504 | 3504 | } |
| 3505 | 3505 | |
| 3506 | - if ( $listing_links != '' ) {
|
|
| 3506 | + if ($listing_links != '') {
|
|
| 3507 | 3507 | ?> |
| 3508 | 3508 | <li> |
| 3509 | 3509 | <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" |
| 3510 | 3510 | option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" |
| 3511 | - data-placeholder="<?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?>"> |
|
| 3511 | + data-placeholder="<?php echo esc_attr(__('My Listings', 'geodirectory')); ?>">
|
|
| 3512 | 3512 | <option value="" disabled="disabled" selected="selected" |
| 3513 | - style='display:none;'><?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?></option> |
|
| 3513 | + style='display:none;'><?php echo esc_attr(__('My Listings', 'geodirectory')); ?></option>
|
|
| 3514 | 3514 | <?php echo $listing_links; ?> |
| 3515 | 3515 | </select> |
| 3516 | 3516 | </li> |
@@ -3526,7 +3526,7 @@ discard block |
||
| 3526 | 3526 | * |
| 3527 | 3527 | * @param string $dashboard_link Dashboard links HTML. |
| 3528 | 3528 | */ |
| 3529 | - echo apply_filters( 'geodir_dashboard_links', $dashboard_link ); |
|
| 3529 | + echo apply_filters('geodir_dashboard_links', $dashboard_link);
|
|
| 3530 | 3530 | echo '</ul>'; |
| 3531 | 3531 | |
| 3532 | 3532 | /** |
@@ -3534,7 +3534,7 @@ discard block |
||
| 3534 | 3534 | * |
| 3535 | 3535 | * @since 1.6.6 |
| 3536 | 3536 | */ |
| 3537 | - do_action( 'geodir_after_loginwidget_form_logged_in' ); |
|
| 3537 | + do_action('geodir_after_loginwidget_form_logged_in');
|
|
| 3538 | 3538 | |
| 3539 | 3539 | |
| 3540 | 3540 | } else {
|
@@ -3549,18 +3549,18 @@ discard block |
||
| 3549 | 3549 | <form name="loginform" class="loginform1" |
| 3550 | 3550 | action="<?php echo geodir_login_url(); ?>" |
| 3551 | 3551 | method="post"> |
| 3552 | - <div class="geodir_form_row"><input placeholder="<?php echo apply_filters('gd_login_wid_login_placeholder', __( 'Email', 'geodirectory' )); ?>" name="<?php echo apply_filters('gd_login_wid_login_name', 'log'); ?>"
|
|
| 3552 | + <div class="geodir_form_row"><input placeholder="<?php echo apply_filters('gd_login_wid_login_placeholder', __('Email', 'geodirectory')); ?>" name="<?php echo apply_filters('gd_login_wid_login_name', 'log'); ?>"
|
|
| 3553 | 3553 | type="text" class="textfield user_login1"/> <span |
| 3554 | 3554 | class="user_loginInfo"></span></div> |
| 3555 | - <div class="geodir_form_row"><input placeholder="<?php _e( 'Password', 'geodirectory' ); ?>" |
|
| 3555 | + <div class="geodir_form_row"><input placeholder="<?php _e('Password', 'geodirectory'); ?>"
|
|
| 3556 | 3556 | name="<?php echo apply_filters('gd_login_wid_login_pwd', 'pwd'); ?>" type="password"
|
| 3557 | 3557 | class="textfield user_pass1 input-text"/><span |
| 3558 | 3558 | class="user_passInfo"></span></div> |
| 3559 | 3559 | |
| 3560 | - <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars( geodir_curPageURL() ); ?>"/> |
|
| 3560 | + <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars(geodir_curPageURL()); ?>"/> |
|
| 3561 | 3561 | <input type="hidden" name="testcookie" value="1"/> |
| 3562 | 3562 | |
| 3563 | - <?php do_action( 'login_form' ); ?> |
|
| 3563 | + <?php do_action('login_form'); ?>
|
|
| 3564 | 3564 | |
| 3565 | 3565 | <div class="geodir_form_row clearfix"><input type="submit" name="submit" |
| 3566 | 3566 | value="<?php echo SIGN_IN_BUTTON; ?>" class="b_signin"/> |
@@ -3572,11 +3572,11 @@ discard block |
||
| 3572 | 3572 | * |
| 3573 | 3573 | * @since 1.0.0 |
| 3574 | 3574 | */ |
| 3575 | - $is_enable_signup = get_option( 'users_can_register' ); |
|
| 3575 | + $is_enable_signup = get_option('users_can_register');
|
|
| 3576 | 3576 | |
| 3577 | - if ( $is_enable_signup ) {
|
|
| 3577 | + if ($is_enable_signup) {
|
|
| 3578 | 3578 | ?> |
| 3579 | - <a href="<?php echo geodir_login_url( array( 'signup' => true ) ); ?>" |
|
| 3579 | + <a href="<?php echo geodir_login_url(array('signup' => true)); ?>"
|
|
| 3580 | 3580 | class="goedir-newuser-link"><?php echo NEW_USER_TEXT; ?></a> |
| 3581 | 3581 | |
| 3582 | 3582 | <?php |
@@ -3587,7 +3587,7 @@ discard block |
||
| 3587 | 3587 | * @since 1.0.0 |
| 3588 | 3588 | */ |
| 3589 | 3589 | ?> |
| 3590 | - <a href="<?php echo geodir_login_url( array( 'forgot' => true ) ); ?>" |
|
| 3590 | + <a href="<?php echo geodir_login_url(array('forgot' => true)); ?>"
|
|
| 3591 | 3591 | class="goedir-forgot-link"><?php echo FORGOT_PW_TEXT; ?></a></p></div> |
| 3592 | 3592 | </form> |
| 3593 | 3593 | <?php |
@@ -3596,7 +3596,7 @@ discard block |
||
| 3596 | 3596 | * |
| 3597 | 3597 | * @since 1.6.6 |
| 3598 | 3598 | */ |
| 3599 | - do_action( 'geodir_after_loginwidget_form_logged_out' ); |
|
| 3599 | + do_action('geodir_after_loginwidget_form_logged_out');
|
|
| 3600 | 3600 | } |
| 3601 | 3601 | |
| 3602 | 3602 | echo $after_widget; |
@@ -3619,13 +3619,13 @@ discard block |
||
| 3619 | 3619 | * after_widget. |
| 3620 | 3620 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3621 | 3621 | */ |
| 3622 | -function geodir_popular_postview_output( $args = '', $instance = '' ) {
|
|
| 3622 | +function geodir_popular_postview_output($args = '', $instance = '') {
|
|
| 3623 | 3623 | global $gd_session; |
| 3624 | 3624 | |
| 3625 | 3625 | // prints the widget |
| 3626 | - extract( $args, EXTR_SKIP ); |
|
| 3626 | + extract($args, EXTR_SKIP); |
|
| 3627 | 3627 | /** This filter is documented in geodirectory_widgets.php */ |
| 3628 | - $title = empty( $instance['title'] ) ? geodir_ucwords( $instance['category_title'] ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3628 | + $title = empty($instance['title']) ? geodir_ucwords($instance['category_title']) : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3629 | 3629 | /** |
| 3630 | 3630 | * Filter the widget post type. |
| 3631 | 3631 | * |
@@ -3633,7 +3633,7 @@ discard block |
||
| 3633 | 3633 | * |
| 3634 | 3634 | * @param string $instance ['post_type'] Post type of listing. |
| 3635 | 3635 | */ |
| 3636 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); |
|
| 3636 | + $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
|
|
| 3637 | 3637 | /** |
| 3638 | 3638 | * Filter the widget's term. |
| 3639 | 3639 | * |
@@ -3641,7 +3641,7 @@ discard block |
||
| 3641 | 3641 | * |
| 3642 | 3642 | * @param string $instance ['category'] Filter by term. Can be any valid term. |
| 3643 | 3643 | */ |
| 3644 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); |
|
| 3644 | + $category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
|
|
| 3645 | 3645 | /** |
| 3646 | 3646 | * Filter the widget listings limit. |
| 3647 | 3647 | * |
@@ -3649,7 +3649,7 @@ discard block |
||
| 3649 | 3649 | * |
| 3650 | 3650 | * @param string $instance ['post_number'] Number of listings to display. |
| 3651 | 3651 | */ |
| 3652 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); |
|
| 3652 | + $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
|
|
| 3653 | 3653 | /** |
| 3654 | 3654 | * Filter widget's "layout" type. |
| 3655 | 3655 | * |
@@ -3657,7 +3657,7 @@ discard block |
||
| 3657 | 3657 | * |
| 3658 | 3658 | * @param string $instance ['layout'] Widget layout type. |
| 3659 | 3659 | */ |
| 3660 | - $layout = empty( $instance['layout'] ) ? 'gridview_onehalf' : apply_filters( 'widget_layout', $instance['layout'] ); |
|
| 3660 | + $layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);
|
|
| 3661 | 3661 | /** |
| 3662 | 3662 | * Filter widget's "add_location_filter" value. |
| 3663 | 3663 | * |
@@ -3665,7 +3665,7 @@ discard block |
||
| 3665 | 3665 | * |
| 3666 | 3666 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. |
| 3667 | 3667 | */ |
| 3668 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); |
|
| 3668 | + $add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
|
|
| 3669 | 3669 | /** |
| 3670 | 3670 | * Filter widget's listing width. |
| 3671 | 3671 | * |
@@ -3673,7 +3673,7 @@ discard block |
||
| 3673 | 3673 | * |
| 3674 | 3674 | * @param string $instance ['listing_width'] Listing width. |
| 3675 | 3675 | */ |
| 3676 | - $listing_width = empty( $instance['listing_width'] ) ? '' : apply_filters( 'widget_listing_width', $instance['listing_width'] ); |
|
| 3676 | + $listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);
|
|
| 3677 | 3677 | /** |
| 3678 | 3678 | * Filter widget's "list_sort" type. |
| 3679 | 3679 | * |
@@ -3681,7 +3681,7 @@ discard block |
||
| 3681 | 3681 | * |
| 3682 | 3682 | * @param string $instance ['list_sort'] Listing sort by type. |
| 3683 | 3683 | */ |
| 3684 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); |
|
| 3684 | + $list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
|
|
| 3685 | 3685 | /** |
| 3686 | 3686 | * Filter widget's "title_tag" type. |
| 3687 | 3687 | * |
@@ -3689,36 +3689,36 @@ discard block |
||
| 3689 | 3689 | * |
| 3690 | 3690 | * @param string $instance ['title_tag'] Listing title tag. |
| 3691 | 3691 | */ |
| 3692 | - $title_tag = empty( $instance['title_tag'] ) ? 'h3' : apply_filters( 'widget_title_tag', $instance['title_tag'] ); |
|
| 3693 | - $use_viewing_post_type = ! empty( $instance['use_viewing_post_type'] ) ? true : false; |
|
| 3692 | + $title_tag = empty($instance['title_tag']) ? 'h3' : apply_filters('widget_title_tag', $instance['title_tag']);
|
|
| 3693 | + $use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false; |
|
| 3694 | 3694 | |
| 3695 | 3695 | // set post type to current viewing post type |
| 3696 | - if ( $use_viewing_post_type ) {
|
|
| 3696 | + if ($use_viewing_post_type) {
|
|
| 3697 | 3697 | $current_post_type = geodir_get_current_posttype(); |
| 3698 | - if ( $current_post_type != '' && $current_post_type != $post_type ) {
|
|
| 3698 | + if ($current_post_type != '' && $current_post_type != $post_type) {
|
|
| 3699 | 3699 | $post_type = $current_post_type; |
| 3700 | 3700 | $category = array(); // old post type category will not work for current changed post type |
| 3701 | 3701 | } |
| 3702 | 3702 | } |
| 3703 | 3703 | // replace widget title dynamically |
| 3704 | - $posttype_plural_label = __( get_post_type_plural_label( $post_type ), 'geodirectory' ); |
|
| 3705 | - $posttype_singular_label = __( get_post_type_singular_label( $post_type ), 'geodirectory' ); |
|
| 3704 | + $posttype_plural_label = __(get_post_type_plural_label($post_type), 'geodirectory'); |
|
| 3705 | + $posttype_singular_label = __(get_post_type_singular_label($post_type), 'geodirectory'); |
|
| 3706 | 3706 | |
| 3707 | - $title = str_replace( "%posttype_plural_label%", $posttype_plural_label, $title ); |
|
| 3708 | - $title = str_replace( "%posttype_singular_label%", $posttype_singular_label, $title ); |
|
| 3707 | + $title = str_replace("%posttype_plural_label%", $posttype_plural_label, $title);
|
|
| 3708 | + $title = str_replace("%posttype_singular_label%", $posttype_singular_label, $title);
|
|
| 3709 | 3709 | |
| 3710 | 3710 | $categories = $category; |
| 3711 | - if ( ! empty( $category ) && $category[0] != '0' ) {
|
|
| 3712 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 3711 | + if (!empty($category) && $category[0] != '0') {
|
|
| 3712 | + $category_taxonomy = geodir_get_taxonomies($post_type); |
|
| 3713 | 3713 | |
| 3714 | 3714 | ######### WPML ######### |
| 3715 | - if ( geodir_wpml_is_taxonomy_translated( $category_taxonomy[0] ) ) {
|
|
| 3716 | - $category = gd_lang_object_ids( $category, $category_taxonomy[0] ); |
|
| 3715 | + if (geodir_wpml_is_taxonomy_translated($category_taxonomy[0])) {
|
|
| 3716 | + $category = gd_lang_object_ids($category, $category_taxonomy[0]); |
|
| 3717 | 3717 | } |
| 3718 | 3718 | ######### WPML ######### |
| 3719 | 3719 | } |
| 3720 | 3720 | |
| 3721 | - if ( isset( $instance['character_count'] ) ) {
|
|
| 3721 | + if (isset($instance['character_count'])) {
|
|
| 3722 | 3722 | /** |
| 3723 | 3723 | * Filter the widget's excerpt character count. |
| 3724 | 3724 | * |
@@ -3726,38 +3726,38 @@ discard block |
||
| 3726 | 3726 | * |
| 3727 | 3727 | * @param int $instance ['character_count'] Excerpt character count. |
| 3728 | 3728 | */ |
| 3729 | - $character_count = apply_filters( 'widget_list_character_count', $instance['character_count'] ); |
|
| 3729 | + $character_count = apply_filters('widget_list_character_count', $instance['character_count']);
|
|
| 3730 | 3730 | } else {
|
| 3731 | 3731 | $character_count = ''; |
| 3732 | 3732 | } |
| 3733 | 3733 | |
| 3734 | - if ( empty( $title ) || $title == 'All' ) {
|
|
| 3735 | - $post_type_name = __( get_post_type_plural_label( $post_type ), 'geodirectory' ); |
|
| 3736 | - $title = !empty( $title ) ? wp_sprintf( __( 'All %s', 'geodirectory' ), $post_type_name ) : $post_type_name; |
|
| 3734 | + if (empty($title) || $title == 'All') {
|
|
| 3735 | + $post_type_name = __(get_post_type_plural_label($post_type), 'geodirectory'); |
|
| 3736 | + $title = !empty($title) ? wp_sprintf(__('All %s', 'geodirectory'), $post_type_name) : $post_type_name;
|
|
| 3737 | 3737 | } |
| 3738 | 3738 | |
| 3739 | 3739 | $location_url = array(); |
| 3740 | - $city = get_query_var( 'gd_city' ); |
|
| 3741 | - if ( ! empty( $city ) ) {
|
|
| 3742 | - $country = get_query_var( 'gd_country' ); |
|
| 3743 | - $region = get_query_var( 'gd_region' ); |
|
| 3740 | + $city = get_query_var('gd_city');
|
|
| 3741 | + if (!empty($city)) {
|
|
| 3742 | + $country = get_query_var('gd_country');
|
|
| 3743 | + $region = get_query_var('gd_region');
|
|
| 3744 | 3744 | |
| 3745 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); |
|
| 3745 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 3746 | 3746 | |
| 3747 | - if ( $geodir_show_location_url == 'all' ) {
|
|
| 3748 | - if ( $country != '' ) {
|
|
| 3747 | + if ($geodir_show_location_url == 'all') {
|
|
| 3748 | + if ($country != '') {
|
|
| 3749 | 3749 | $location_url[] = $country; |
| 3750 | 3750 | } |
| 3751 | 3751 | |
| 3752 | - if ( $region != '' ) {
|
|
| 3752 | + if ($region != '') {
|
|
| 3753 | 3753 | $location_url[] = $region; |
| 3754 | 3754 | } |
| 3755 | - } else if ( $geodir_show_location_url == 'country_city' ) {
|
|
| 3756 | - if ( $country != '' ) {
|
|
| 3755 | + } else if ($geodir_show_location_url == 'country_city') {
|
|
| 3756 | + if ($country != '') {
|
|
| 3757 | 3757 | $location_url[] = $country; |
| 3758 | 3758 | } |
| 3759 | - } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
| 3760 | - if ( $region != '' ) {
|
|
| 3759 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 3760 | + if ($region != '') {
|
|
| 3761 | 3761 | $location_url[] = $region; |
| 3762 | 3762 | } |
| 3763 | 3763 | } |
@@ -3765,54 +3765,54 @@ discard block |
||
| 3765 | 3765 | $location_url[] = $city; |
| 3766 | 3766 | } |
| 3767 | 3767 | |
| 3768 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 3769 | - $location_url = implode( '/', $location_url ); |
|
| 3768 | + $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
|
|
| 3769 | + $location_url = implode('/', $location_url);
|
|
| 3770 | 3770 | $skip_location = false; |
| 3771 | - if ( ! $add_location_filter && $gd_session->get( 'gd_multi_location' ) ) {
|
|
| 3771 | + if (!$add_location_filter && $gd_session->get('gd_multi_location')) {
|
|
| 3772 | 3772 | $skip_location = true; |
| 3773 | - $gd_session->un_set( 'gd_multi_location' ); |
|
| 3773 | + $gd_session->un_set('gd_multi_location');
|
|
| 3774 | 3774 | } |
| 3775 | 3775 | |
| 3776 | - if ( $location_allowed && $add_location_filter && $gd_session->get( 'all_near_me' ) && geodir_is_page( 'location' ) ) {
|
|
| 3777 | - $viewall_url = add_query_arg( array( |
|
| 3776 | + if ($location_allowed && $add_location_filter && $gd_session->get('all_near_me') && geodir_is_page('location')) {
|
|
| 3777 | + $viewall_url = add_query_arg(array( |
|
| 3778 | 3778 | 'geodir_search' => 1, |
| 3779 | 3779 | 'stype' => $post_type, |
| 3780 | 3780 | 's' => '', |
| 3781 | - 'snear' => __( 'Near:', 'geodiradvancesearch' ) . ' ' . __( 'Me', 'geodiradvancesearch' ), |
|
| 3782 | - 'sgeo_lat' => $gd_session->get( 'user_lat' ), |
|
| 3783 | - 'sgeo_lon' => $gd_session->get( 'user_lon' ) |
|
| 3784 | - ), geodir_search_page_base_url() ); |
|
| 3781 | + 'snear' => __('Near:', 'geodiradvancesearch').' '.__('Me', 'geodiradvancesearch'),
|
|
| 3782 | + 'sgeo_lat' => $gd_session->get('user_lat'),
|
|
| 3783 | + 'sgeo_lon' => $gd_session->get('user_lon')
|
|
| 3784 | + ), geodir_search_page_base_url()); |
|
| 3785 | 3785 | |
| 3786 | - if ( ! empty( $category ) && !in_array( '0', $category ) ) {
|
|
| 3787 | - $viewall_url = add_query_arg( array( 's' . $post_type . 'category' => $category ), $viewall_url ); |
|
| 3786 | + if (!empty($category) && !in_array('0', $category)) {
|
|
| 3787 | + $viewall_url = add_query_arg(array('s'.$post_type.'category' => $category), $viewall_url);
|
|
| 3788 | 3788 | } |
| 3789 | 3789 | } else {
|
| 3790 | - if ( get_option( 'permalink_structure' ) ) {
|
|
| 3791 | - $viewall_url = get_post_type_archive_link( $post_type ); |
|
| 3790 | + if (get_option('permalink_structure')) {
|
|
| 3791 | + $viewall_url = get_post_type_archive_link($post_type); |
|
| 3792 | 3792 | } else {
|
| 3793 | - $viewall_url = get_post_type_archive_link( $post_type ); |
|
| 3793 | + $viewall_url = get_post_type_archive_link($post_type); |
|
| 3794 | 3794 | } |
| 3795 | 3795 | |
| 3796 | - if ( ! empty( $category ) && $category[0] != '0' ) {
|
|
| 3796 | + if (!empty($category) && $category[0] != '0') {
|
|
| 3797 | 3797 | global $geodir_add_location_url; |
| 3798 | 3798 | |
| 3799 | 3799 | $geodir_add_location_url = '0'; |
| 3800 | 3800 | |
| 3801 | - if ( $add_location_filter != '0' ) {
|
|
| 3801 | + if ($add_location_filter != '0') {
|
|
| 3802 | 3802 | $geodir_add_location_url = '1'; |
| 3803 | 3803 | } |
| 3804 | 3804 | |
| 3805 | - $viewall_url = get_term_link( (int) $category[0], $post_type . 'category' ); |
|
| 3805 | + $viewall_url = get_term_link((int) $category[0], $post_type.'category'); |
|
| 3806 | 3806 | |
| 3807 | 3807 | $geodir_add_location_url = null; |
| 3808 | 3808 | } |
| 3809 | 3809 | } |
| 3810 | 3810 | |
| 3811 | - if ( $skip_location ) {
|
|
| 3812 | - $gd_session->set( 'gd_multi_location', 1 ); |
|
| 3811 | + if ($skip_location) {
|
|
| 3812 | + $gd_session->set('gd_multi_location', 1);
|
|
| 3813 | 3813 | } |
| 3814 | 3814 | |
| 3815 | - if ( is_wp_error( $viewall_url ) ) {
|
|
| 3815 | + if (is_wp_error($viewall_url)) {
|
|
| 3816 | 3816 | $viewall_url = ''; |
| 3817 | 3817 | } |
| 3818 | 3818 | |
@@ -3824,43 +3824,43 @@ discard block |
||
| 3824 | 3824 | 'order_by' => $list_sort |
| 3825 | 3825 | ); |
| 3826 | 3826 | |
| 3827 | - if ( $character_count ) {
|
|
| 3827 | + if ($character_count) {
|
|
| 3828 | 3828 | $query_args['excerpt_length'] = $character_count; |
| 3829 | 3829 | } |
| 3830 | 3830 | |
| 3831 | - if ( ! empty( $instance['show_featured_only'] ) ) {
|
|
| 3831 | + if (!empty($instance['show_featured_only'])) {
|
|
| 3832 | 3832 | $query_args['show_featured_only'] = 1; |
| 3833 | 3833 | } |
| 3834 | 3834 | |
| 3835 | - if ( ! empty( $instance['show_special_only'] ) ) {
|
|
| 3835 | + if (!empty($instance['show_special_only'])) {
|
|
| 3836 | 3836 | $query_args['show_special_only'] = 1; |
| 3837 | 3837 | } |
| 3838 | 3838 | |
| 3839 | - if ( ! empty( $instance['with_pics_only'] ) ) {
|
|
| 3839 | + if (!empty($instance['with_pics_only'])) {
|
|
| 3840 | 3840 | $query_args['with_pics_only'] = 0; |
| 3841 | 3841 | $query_args['featured_image_only'] = 1; |
| 3842 | 3842 | } |
| 3843 | 3843 | |
| 3844 | - if ( ! empty( $instance['with_videos_only'] ) ) {
|
|
| 3844 | + if (!empty($instance['with_videos_only'])) {
|
|
| 3845 | 3845 | $query_args['with_videos_only'] = 1; |
| 3846 | 3846 | } |
| 3847 | - $hide_if_empty = ! empty( $instance['hide_if_empty'] ) ? true : false; |
|
| 3847 | + $hide_if_empty = !empty($instance['hide_if_empty']) ? true : false; |
|
| 3848 | 3848 | |
| 3849 | - if ( ! empty( $categories ) && $categories[0] != '0' && !empty( $category_taxonomy ) ) {
|
|
| 3849 | + if (!empty($categories) && $categories[0] != '0' && !empty($category_taxonomy)) {
|
|
| 3850 | 3850 | $tax_query = array( |
| 3851 | 3851 | 'taxonomy' => $category_taxonomy[0], |
| 3852 | 3852 | 'field' => 'id', |
| 3853 | 3853 | 'terms' => $category |
| 3854 | 3854 | ); |
| 3855 | 3855 | |
| 3856 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 3856 | + $query_args['tax_query'] = array($tax_query); |
|
| 3857 | 3857 | } |
| 3858 | 3858 | |
| 3859 | 3859 | global $gridview_columns_widget, $geodir_is_widget_listing; |
| 3860 | 3860 | |
| 3861 | - $widget_listings = geodir_get_widget_listings( $query_args ); |
|
| 3861 | + $widget_listings = geodir_get_widget_listings($query_args); |
|
| 3862 | 3862 | |
| 3863 | - if ( $hide_if_empty && empty( $widget_listings ) ) {
|
|
| 3863 | + if ($hide_if_empty && empty($widget_listings)) {
|
|
| 3864 | 3864 | return; |
| 3865 | 3865 | } |
| 3866 | 3866 | |
@@ -3875,11 +3875,11 @@ discard block |
||
| 3875 | 3875 | * |
| 3876 | 3876 | * @since 1.0.0 |
| 3877 | 3877 | */ |
| 3878 | - do_action( 'geodir_before_view_all_link_in_widget' ); ?> |
|
| 3878 | + do_action('geodir_before_view_all_link_in_widget'); ?>
|
|
| 3879 | 3879 | <div class="geodir_list_heading clearfix"> |
| 3880 | - <?php echo $before_title . $title . $after_title; ?> |
|
| 3880 | + <?php echo $before_title.$title.$after_title; ?> |
|
| 3881 | 3881 | <a href="<?php echo $viewall_url; ?>" |
| 3882 | - class="geodir-viewall"><?php _e( 'View all', 'geodirectory' ); ?></a> |
|
| 3882 | + class="geodir-viewall"><?php _e('View all', 'geodirectory'); ?></a>
|
|
| 3883 | 3883 | </div> |
| 3884 | 3884 | <?php |
| 3885 | 3885 | /** |
@@ -3887,10 +3887,10 @@ discard block |
||
| 3887 | 3887 | * |
| 3888 | 3888 | * @since 1.0.0 |
| 3889 | 3889 | */ |
| 3890 | - do_action( 'geodir_after_view_all_link_in_widget' ); ?> |
|
| 3890 | + do_action('geodir_after_view_all_link_in_widget'); ?>
|
|
| 3891 | 3891 | <?php |
| 3892 | - if ( strstr( $layout, 'gridview' ) ) {
|
|
| 3893 | - $listing_view_exp = explode( '_', $layout ); |
|
| 3892 | + if (strstr($layout, 'gridview')) {
|
|
| 3893 | + $listing_view_exp = explode('_', $layout);
|
|
| 3894 | 3894 | $gridview_columns_widget = $layout; |
| 3895 | 3895 | $layout = $listing_view_exp[0]; |
| 3896 | 3896 | } else {
|
@@ -3901,8 +3901,8 @@ discard block |
||
| 3901 | 3901 | * |
| 3902 | 3902 | * @since 1.0.0 |
| 3903 | 3903 | */ |
| 3904 | - $template = apply_filters( "geodir_template_part-widget-listing-listview", geodir_locate_template( 'widget-listing-listview' ) ); |
|
| 3905 | - if ( ! isset( $character_count ) ) {
|
|
| 3904 | + $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
|
|
| 3905 | + if (!isset($character_count)) {
|
|
| 3906 | 3906 | /** |
| 3907 | 3907 | * Filter the widget's excerpt character count. |
| 3908 | 3908 | * |
@@ -3910,7 +3910,7 @@ discard block |
||
| 3910 | 3910 | * |
| 3911 | 3911 | * @param int $instance ['character_count'] Excerpt character count. |
| 3912 | 3912 | */ |
| 3913 | - $character_count = $character_count == '' ? 50 : apply_filters( 'widget_character_count', $character_count ); |
|
| 3913 | + $character_count = $character_count == '' ? 50 : apply_filters('widget_character_count', $character_count);
|
|
| 3914 | 3914 | } |
| 3915 | 3915 | |
| 3916 | 3916 | global $post, $map_jason, $map_canvas_arr; |
@@ -3925,13 +3925,13 @@ discard block |
||
| 3925 | 3925 | * |
| 3926 | 3926 | * @since 1.0.0 |
| 3927 | 3927 | */ |
| 3928 | - include( $template ); |
|
| 3928 | + include($template); |
|
| 3929 | 3929 | |
| 3930 | 3930 | $geodir_is_widget_listing = false; |
| 3931 | 3931 | |
| 3932 | 3932 | $GLOBALS['post'] = $current_post; |
| 3933 | - if ( ! empty( $current_post ) ) {
|
|
| 3934 | - setup_postdata( $current_post ); |
|
| 3933 | + if (!empty($current_post)) {
|
|
| 3934 | + setup_postdata($current_post); |
|
| 3935 | 3935 | } |
| 3936 | 3936 | $map_jason = $current_map_jason; |
| 3937 | 3937 | $map_canvas_arr = $current_map_canvas_arr; |
@@ -3960,12 +3960,12 @@ discard block |
||
| 3960 | 3960 | * |
| 3961 | 3961 | * @return int Reviews count. |
| 3962 | 3962 | */ |
| 3963 | -function geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ) {
|
|
| 3963 | +function geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type) {
|
|
| 3964 | 3964 | global $wpdb, $plugin_prefix; |
| 3965 | 3965 | |
| 3966 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 3966 | + $detail_table = $plugin_prefix.$post_type.'_detail'; |
|
| 3967 | 3967 | |
| 3968 | - $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 . ")";
|
|
| 3968 | + $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.")";
|
|
| 3969 | 3969 | |
| 3970 | 3970 | /** |
| 3971 | 3971 | * Filter count review sql query. |
@@ -3977,9 +3977,9 @@ discard block |
||
| 3977 | 3977 | * @param int $taxonomy The taxonomy Id. |
| 3978 | 3978 | * @param string $post_type The post type. |
| 3979 | 3979 | */ |
| 3980 | - $sql = apply_filters( 'geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type ); |
|
| 3980 | + $sql = apply_filters('geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type);
|
|
| 3981 | 3981 | |
| 3982 | - $count = $wpdb->get_var( $sql ); |
|
| 3982 | + $count = $wpdb->get_var($sql); |
|
| 3983 | 3983 | |
| 3984 | 3984 | return $count; |
| 3985 | 3985 | } |
@@ -3997,7 +3997,7 @@ discard block |
||
| 3997 | 3997 | * |
| 3998 | 3998 | * @return array Term array data. |
| 3999 | 3999 | */ |
| 4000 | -function geodir_count_reviews_by_terms( $force_update = false, $post_ID = 0 ) {
|
|
| 4000 | +function geodir_count_reviews_by_terms($force_update = false, $post_ID = 0) {
|
|
| 4001 | 4001 | /** |
| 4002 | 4002 | * Filter review count option data. |
| 4003 | 4003 | * |
@@ -4007,78 +4007,78 @@ discard block |
||
| 4007 | 4007 | * @param bool $force_update Force update option value?. Default.false. |
| 4008 | 4008 | * @param int $post_ID The post id to update if any. |
| 4009 | 4009 | */ |
| 4010 | - $option_data = apply_filters( 'geodir_count_reviews_by_terms_before', '', $force_update, $post_ID ); |
|
| 4011 | - if ( ! empty( $option_data ) ) {
|
|
| 4010 | + $option_data = apply_filters('geodir_count_reviews_by_terms_before', '', $force_update, $post_ID);
|
|
| 4011 | + if (!empty($option_data)) {
|
|
| 4012 | 4012 | return $option_data; |
| 4013 | 4013 | } |
| 4014 | 4014 | |
| 4015 | - $option_data = get_option( 'geodir_global_review_count' ); |
|
| 4015 | + $option_data = get_option('geodir_global_review_count');
|
|
| 4016 | 4016 | |
| 4017 | - if ( ! $option_data || $force_update ) {
|
|
| 4018 | - if ( (int) $post_ID > 0 ) { // Update reviews count for specific post categories only.
|
|
| 4017 | + if (!$option_data || $force_update) {
|
|
| 4018 | + if ((int) $post_ID > 0) { // Update reviews count for specific post categories only.
|
|
| 4019 | 4019 | global $gd_session; |
| 4020 | 4020 | $term_array = (array) $option_data; |
| 4021 | - $post_type = get_post_type( $post_ID ); |
|
| 4022 | - $taxonomy = $post_type . 'category'; |
|
| 4023 | - $terms = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) ); |
|
| 4024 | - |
|
| 4025 | - if ( ! empty( $terms ) && ! is_wp_error( $terms ) ) {
|
|
| 4026 | - foreach ( $terms as $term_id ) {
|
|
| 4027 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); |
|
| 4028 | - $children = get_term_children( $term_id, $taxonomy ); |
|
| 4029 | - $term_array[ $term_id ] = $count; |
|
| 4021 | + $post_type = get_post_type($post_ID); |
|
| 4022 | + $taxonomy = $post_type.'category'; |
|
| 4023 | + $terms = wp_get_object_terms($post_ID, $taxonomy, array('fields' => 'ids'));
|
|
| 4024 | + |
|
| 4025 | + if (!empty($terms) && !is_wp_error($terms)) {
|
|
| 4026 | + foreach ($terms as $term_id) {
|
|
| 4027 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); |
|
| 4028 | + $children = get_term_children($term_id, $taxonomy); |
|
| 4029 | + $term_array[$term_id] = $count; |
|
| 4030 | 4030 | } |
| 4031 | 4031 | } |
| 4032 | 4032 | |
| 4033 | - $session_listing = $gd_session->get( 'listing' ); |
|
| 4033 | + $session_listing = $gd_session->get('listing');
|
|
| 4034 | 4034 | |
| 4035 | 4035 | $terms = array(); |
| 4036 | - if ( isset( $_POST['post_category'][ $taxonomy ] ) ) {
|
|
| 4037 | - $terms = (array) $_POST['post_category'][ $taxonomy ]; |
|
| 4038 | - } else if ( ! empty( $session_listing ) && isset( $session_listing['post_category'][ $taxonomy ] ) ) {
|
|
| 4039 | - $terms = (array) $session_listing['post_category'][ $taxonomy ]; |
|
| 4036 | + if (isset($_POST['post_category'][$taxonomy])) {
|
|
| 4037 | + $terms = (array) $_POST['post_category'][$taxonomy]; |
|
| 4038 | + } else if (!empty($session_listing) && isset($session_listing['post_category'][$taxonomy])) {
|
|
| 4039 | + $terms = (array) $session_listing['post_category'][$taxonomy]; |
|
| 4040 | 4040 | } |
| 4041 | 4041 | |
| 4042 | - if ( ! empty( $terms ) ) {
|
|
| 4043 | - foreach ( $terms as $term_id ) {
|
|
| 4044 | - if ( $term_id > 0 ) {
|
|
| 4045 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); |
|
| 4046 | - $children = get_term_children( $term_id, $taxonomy ); |
|
| 4047 | - $term_array[ $term_id ] = $count; |
|
| 4042 | + if (!empty($terms)) {
|
|
| 4043 | + foreach ($terms as $term_id) {
|
|
| 4044 | + if ($term_id > 0) {
|
|
| 4045 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); |
|
| 4046 | + $children = get_term_children($term_id, $taxonomy); |
|
| 4047 | + $term_array[$term_id] = $count; |
|
| 4048 | 4048 | } |
| 4049 | 4049 | } |
| 4050 | 4050 | } |
| 4051 | 4051 | } else { // Update reviews count for all post categories.
|
| 4052 | 4052 | $term_array = array(); |
| 4053 | 4053 | $post_types = geodir_get_posttypes(); |
| 4054 | - foreach ( $post_types as $post_type ) {
|
|
| 4054 | + foreach ($post_types as $post_type) {
|
|
| 4055 | 4055 | |
| 4056 | - $taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 4056 | + $taxonomy = geodir_get_taxonomies($post_type); |
|
| 4057 | 4057 | $taxonomy = $taxonomy[0]; |
| 4058 | 4058 | |
| 4059 | 4059 | $args = array( |
| 4060 | 4060 | 'hide_empty' => false |
| 4061 | 4061 | ); |
| 4062 | 4062 | |
| 4063 | - $terms = get_terms( $taxonomy, $args ); |
|
| 4063 | + $terms = get_terms($taxonomy, $args); |
|
| 4064 | 4064 | |
| 4065 | - foreach ( $terms as $term ) {
|
|
| 4066 | - $count = geodir_count_reviews_by_term_id( $term->term_id, $taxonomy, $post_type ); |
|
| 4067 | - $children = get_term_children( $term->term_id, $taxonomy ); |
|
| 4065 | + foreach ($terms as $term) {
|
|
| 4066 | + $count = geodir_count_reviews_by_term_id($term->term_id, $taxonomy, $post_type); |
|
| 4067 | + $children = get_term_children($term->term_id, $taxonomy); |
|
| 4068 | 4068 | /*if ( is_array( $children ) ) {
|
| 4069 | 4069 | foreach ( $children as $child_id ) {
|
| 4070 | 4070 | $child_count = geodir_count_reviews_by_term_id($child_id, $taxonomy, $post_type); |
| 4071 | 4071 | $count = $count + $child_count; |
| 4072 | 4072 | } |
| 4073 | 4073 | }*/ |
| 4074 | - $term_array[ $term->term_id ] = $count; |
|
| 4074 | + $term_array[$term->term_id] = $count; |
|
| 4075 | 4075 | } |
| 4076 | 4076 | } |
| 4077 | 4077 | } |
| 4078 | 4078 | |
| 4079 | - update_option( 'geodir_global_review_count', $term_array ); |
|
| 4079 | + update_option('geodir_global_review_count', $term_array);
|
|
| 4080 | 4080 | //clear cache |
| 4081 | - wp_cache_delete( 'geodir_global_review_count' ); |
|
| 4081 | + wp_cache_delete('geodir_global_review_count');
|
|
| 4082 | 4082 | |
| 4083 | 4083 | return $term_array; |
| 4084 | 4084 | } else {
|
@@ -4094,39 +4094,39 @@ discard block |
||
| 4094 | 4094 | * @package GeoDirectory |
| 4095 | 4095 | * @return bool |
| 4096 | 4096 | */ |
| 4097 | -function geodir_term_review_count_force_update( $new_status, $old_status = '', $post = '' ) {
|
|
| 4098 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'geodir_import_export' ) {
|
|
| 4097 | +function geodir_term_review_count_force_update($new_status, $old_status = '', $post = '') {
|
|
| 4098 | + if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'geodir_import_export') {
|
|
| 4099 | 4099 | return; // do not run if importing listings |
| 4100 | 4100 | } |
| 4101 | 4101 | |
| 4102 | - if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
|
|
| 4102 | + if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
|
|
| 4103 | 4103 | return; |
| 4104 | 4104 | } |
| 4105 | 4105 | |
| 4106 | 4106 | $post_ID = 0; |
| 4107 | - if ( ! empty( $post ) ) {
|
|
| 4108 | - if ( isset( $post->post_type ) && strpos( $post->post_type, 'gd_' ) !== 0 ) {
|
|
| 4107 | + if (!empty($post)) {
|
|
| 4108 | + if (isset($post->post_type) && strpos($post->post_type, 'gd_') !== 0) {
|
|
| 4109 | 4109 | return; |
| 4110 | 4110 | } |
| 4111 | 4111 | |
| 4112 | - if ( $new_status == 'auto-draft' && $old_status == 'new' ) {
|
|
| 4112 | + if ($new_status == 'auto-draft' && $old_status == 'new') {
|
|
| 4113 | 4113 | return; |
| 4114 | 4114 | } |
| 4115 | 4115 | |
| 4116 | - if ( ! empty( $post->ID ) ) {
|
|
| 4116 | + if (!empty($post->ID)) {
|
|
| 4117 | 4117 | $post_ID = $post->ID; |
| 4118 | 4118 | } |
| 4119 | 4119 | } |
| 4120 | 4120 | |
| 4121 | - if ( $new_status != $old_status ) {
|
|
| 4122 | - geodir_count_reviews_by_terms( true, $post_ID ); |
|
| 4121 | + if ($new_status != $old_status) {
|
|
| 4122 | + geodir_count_reviews_by_terms(true, $post_ID); |
|
| 4123 | 4123 | } |
| 4124 | 4124 | |
| 4125 | 4125 | return true; |
| 4126 | 4126 | } |
| 4127 | 4127 | |
| 4128 | -function geodir_term_review_count_force_update_single_post( $post_id ) {
|
|
| 4129 | - geodir_count_reviews_by_terms( true, $post_id ); |
|
| 4128 | +function geodir_term_review_count_force_update_single_post($post_id) {
|
|
| 4129 | + geodir_count_reviews_by_terms(true, $post_id); |
|
| 4130 | 4130 | } |
| 4131 | 4131 | |
| 4132 | 4132 | /*-----------------------------------------------------------------------------------*/ |
@@ -4143,11 +4143,11 @@ discard block |
||
| 4143 | 4143 | * |
| 4144 | 4144 | * @return int Post count. |
| 4145 | 4145 | */ |
| 4146 | -function geodir_count_posts_by_term( $data, $term ) {
|
|
| 4146 | +function geodir_count_posts_by_term($data, $term) {
|
|
| 4147 | 4147 | |
| 4148 | - if ( $data ) {
|
|
| 4149 | - if ( isset( $data[ $term->term_id ] ) ) {
|
|
| 4150 | - return $data[ $term->term_id ]; |
|
| 4148 | + if ($data) {
|
|
| 4149 | + if (isset($data[$term->term_id])) {
|
|
| 4150 | + return $data[$term->term_id]; |
|
| 4151 | 4151 | } else {
|
| 4152 | 4152 | return 0; |
| 4153 | 4153 | } |
@@ -4164,8 +4164,8 @@ discard block |
||
| 4164 | 4164 | * param array $terms An array of term objects. |
| 4165 | 4165 | * @return array Sorted terms array. |
| 4166 | 4166 | */ |
| 4167 | -function geodir_sort_terms_by_count( $terms ) {
|
|
| 4168 | - usort( $terms, "geodir_sort_by_count_obj" ); |
|
| 4167 | +function geodir_sort_terms_by_count($terms) {
|
|
| 4168 | + usort($terms, "geodir_sort_by_count_obj"); |
|
| 4169 | 4169 | |
| 4170 | 4170 | return $terms; |
| 4171 | 4171 | } |
@@ -4180,8 +4180,8 @@ discard block |
||
| 4180 | 4180 | * |
| 4181 | 4181 | * @return array Sorted terms array. |
| 4182 | 4182 | */ |
| 4183 | -function geodir_sort_terms_by_review_count( $terms ) {
|
|
| 4184 | - usort( $terms, "geodir_sort_by_review_count_obj" ); |
|
| 4183 | +function geodir_sort_terms_by_review_count($terms) {
|
|
| 4184 | + usort($terms, "geodir_sort_by_review_count_obj"); |
|
| 4185 | 4185 | |
| 4186 | 4186 | return $terms; |
| 4187 | 4187 | } |
@@ -4197,12 +4197,12 @@ discard block |
||
| 4197 | 4197 | * |
| 4198 | 4198 | * @return array Sorted terms array. |
| 4199 | 4199 | */ |
| 4200 | -function geodir_sort_terms( $terms, $sort = 'count' ) {
|
|
| 4201 | - if ( $sort == 'count' ) {
|
|
| 4202 | - return geodir_sort_terms_by_count( $terms ); |
|
| 4200 | +function geodir_sort_terms($terms, $sort = 'count') {
|
|
| 4201 | + if ($sort == 'count') {
|
|
| 4202 | + return geodir_sort_terms_by_count($terms); |
|
| 4203 | 4203 | } |
| 4204 | - if ( $sort == 'review_count' ) {
|
|
| 4205 | - return geodir_sort_terms_by_review_count( $terms ); |
|
| 4204 | + if ($sort == 'review_count') {
|
|
| 4205 | + return geodir_sort_terms_by_review_count($terms); |
|
| 4206 | 4206 | } |
| 4207 | 4207 | return $terms; |
| 4208 | 4208 | } |
@@ -4221,7 +4221,7 @@ discard block |
||
| 4221 | 4221 | * |
| 4222 | 4222 | * @return bool |
| 4223 | 4223 | */ |
| 4224 | -function geodir_sort_by_count( $a, $b ) {
|
|
| 4224 | +function geodir_sort_by_count($a, $b) {
|
|
| 4225 | 4225 | return $a['count'] < $b['count']; |
| 4226 | 4226 | } |
| 4227 | 4227 | |
@@ -4236,7 +4236,7 @@ discard block |
||
| 4236 | 4236 | * |
| 4237 | 4237 | * @return bool |
| 4238 | 4238 | */ |
| 4239 | -function geodir_sort_by_count_obj( $a, $b ) {
|
|
| 4239 | +function geodir_sort_by_count_obj($a, $b) {
|
|
| 4240 | 4240 | return $a->count < $b->count; |
| 4241 | 4241 | } |
| 4242 | 4242 | |
@@ -4251,7 +4251,7 @@ discard block |
||
| 4251 | 4251 | * |
| 4252 | 4252 | * @return bool |
| 4253 | 4253 | */ |
| 4254 | -function geodir_sort_by_review_count_obj( $a, $b ) {
|
|
| 4254 | +function geodir_sort_by_review_count_obj($a, $b) {
|
|
| 4255 | 4255 | return $a->review_count < $b->review_count; |
| 4256 | 4256 | } |
| 4257 | 4257 | |
@@ -4268,35 +4268,35 @@ discard block |
||
| 4268 | 4268 | * @since 1.4.2 |
| 4269 | 4269 | * @package GeoDirectory |
| 4270 | 4270 | */ |
| 4271 | - $locale = apply_filters( 'plugin_locale', get_locale(), 'geodirectory' ); |
|
| 4271 | + $locale = apply_filters('plugin_locale', get_locale(), 'geodirectory');
|
|
| 4272 | 4272 | |
| 4273 | - load_textdomain( 'geodirectory', WP_LANG_DIR . '/' . 'geodirectory' . '/' . 'geodirectory' . '-' . $locale . '.mo' ); |
|
| 4274 | - load_plugin_textdomain( 'geodirectory', false, plugin_basename( dirname( dirname( __FILE__ ) ) ) . '/geodirectory-languages' ); |
|
| 4273 | + load_textdomain('geodirectory', WP_LANG_DIR.'/'.'geodirectory'.'/'.'geodirectory'.'-'.$locale.'.mo');
|
|
| 4274 | + load_plugin_textdomain('geodirectory', false, plugin_basename(dirname(dirname(__FILE__))).'/geodirectory-languages');
|
|
| 4275 | 4275 | |
| 4276 | 4276 | /** |
| 4277 | 4277 | * Define language constants. |
| 4278 | 4278 | * |
| 4279 | 4279 | * @since 1.0.0 |
| 4280 | 4280 | */ |
| 4281 | - require_once( geodir_plugin_path() . '/language.php' ); |
|
| 4281 | + require_once(geodir_plugin_path().'/language.php'); |
|
| 4282 | 4282 | |
| 4283 | - $language_file = geodir_plugin_path() . '/db-language.php'; |
|
| 4283 | + $language_file = geodir_plugin_path().'/db-language.php'; |
|
| 4284 | 4284 | |
| 4285 | 4285 | // Load language string file if not created yet |
| 4286 | - if ( ! file_exists( $language_file ) ) {
|
|
| 4286 | + if (!file_exists($language_file)) {
|
|
| 4287 | 4287 | geodirectory_load_db_language(); |
| 4288 | 4288 | } |
| 4289 | 4289 | |
| 4290 | - if ( file_exists( $language_file ) ) {
|
|
| 4290 | + if (file_exists($language_file)) {
|
|
| 4291 | 4291 | /** |
| 4292 | 4292 | * Language strings from database. |
| 4293 | 4293 | * |
| 4294 | 4294 | * @since 1.4.2 |
| 4295 | 4295 | */ |
| 4296 | 4296 | try {
|
| 4297 | - require_once( $language_file ); |
|
| 4298 | - } catch ( Exception $e ) {
|
|
| 4299 | - error_log( 'Language Error: ' . $e->getMessage() ); |
|
| 4297 | + require_once($language_file); |
|
| 4298 | + } catch (Exception $e) {
|
|
| 4299 | + error_log('Language Error: '.$e->getMessage());
|
|
| 4300 | 4300 | } |
| 4301 | 4301 | } |
| 4302 | 4302 | } |
@@ -4313,19 +4313,19 @@ discard block |
||
| 4313 | 4313 | */ |
| 4314 | 4314 | function geodirectory_load_db_language() {
|
| 4315 | 4315 | global $wp_filesystem; |
| 4316 | - if ( empty( $wp_filesystem ) ) {
|
|
| 4317 | - require_once( ABSPATH . '/wp-admin/includes/file.php' ); |
|
| 4316 | + if (empty($wp_filesystem)) {
|
|
| 4317 | + require_once(ABSPATH.'/wp-admin/includes/file.php'); |
|
| 4318 | 4318 | WP_Filesystem(); |
| 4319 | 4319 | global $wp_filesystem; |
| 4320 | 4320 | } |
| 4321 | 4321 | |
| 4322 | - $language_file = geodir_plugin_path() . '/db-language.php'; |
|
| 4322 | + $language_file = geodir_plugin_path().'/db-language.php'; |
|
| 4323 | 4323 | |
| 4324 | - if ( is_file( $language_file ) && ! is_writable( $language_file ) ) {
|
|
| 4324 | + if (is_file($language_file) && !is_writable($language_file)) {
|
|
| 4325 | 4325 | return false; |
| 4326 | 4326 | } // Not possible to create. |
| 4327 | 4327 | |
| 4328 | - if ( ! is_file( $language_file ) && ! is_writable( dirname( $language_file ) ) ) {
|
|
| 4328 | + if (!is_file($language_file) && !is_writable(dirname($language_file))) {
|
|
| 4329 | 4329 | return false; |
| 4330 | 4330 | } // Not possible to create. |
| 4331 | 4331 | |
@@ -4339,9 +4339,9 @@ discard block |
||
| 4339 | 4339 | * |
| 4340 | 4340 | * @param array $contents_strings Array of strings. |
| 4341 | 4341 | */ |
| 4342 | - $contents_strings = apply_filters( 'geodir_load_db_language', $contents_strings ); |
|
| 4342 | + $contents_strings = apply_filters('geodir_load_db_language', $contents_strings);
|
|
| 4343 | 4343 | |
| 4344 | - $contents_strings = array_unique( $contents_strings ); |
|
| 4344 | + $contents_strings = array_unique($contents_strings); |
|
| 4345 | 4345 | |
| 4346 | 4346 | $contents_head = array(); |
| 4347 | 4347 | $contents_head[] = "<?php"; |
@@ -4358,21 +4358,21 @@ discard block |
||
| 4358 | 4358 | $contents_foot[] = ""; |
| 4359 | 4359 | $contents_foot[] = ""; |
| 4360 | 4360 | |
| 4361 | - $contents = implode( PHP_EOL, $contents_head ); |
|
| 4361 | + $contents = implode(PHP_EOL, $contents_head); |
|
| 4362 | 4362 | |
| 4363 | - if ( ! empty( $contents_strings ) ) {
|
|
| 4364 | - foreach ( $contents_strings as $string ) {
|
|
| 4365 | - if ( is_scalar( $string ) && $string != '' ) {
|
|
| 4366 | - $string = str_replace( "'", "\'", $string ); |
|
| 4367 | - geodir_wpml_register_string( $string ); |
|
| 4368 | - $contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";
|
|
| 4363 | + if (!empty($contents_strings)) {
|
|
| 4364 | + foreach ($contents_strings as $string) {
|
|
| 4365 | + if (is_scalar($string) && $string != '') {
|
|
| 4366 | + $string = str_replace("'", "\'", $string);
|
|
| 4367 | + geodir_wpml_register_string($string); |
|
| 4368 | + $contents .= PHP_EOL."__('".$string."', 'geodirectory');";
|
|
| 4369 | 4369 | } |
| 4370 | 4370 | } |
| 4371 | 4371 | } |
| 4372 | 4372 | |
| 4373 | - $contents .= implode( PHP_EOL, $contents_foot ); |
|
| 4373 | + $contents .= implode(PHP_EOL, $contents_foot); |
|
| 4374 | 4374 | |
| 4375 | - if ( $wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE ) ) {
|
|
| 4375 | + if ($wp_filesystem->put_contents($language_file, $contents, FS_CHMOD_FILE)) {
|
|
| 4376 | 4376 | return false; |
| 4377 | 4377 | } // Failure; could not write file. |
| 4378 | 4378 | |
@@ -4393,49 +4393,49 @@ discard block |
||
| 4393 | 4393 | * |
| 4394 | 4394 | * @return array Translation texts. |
| 4395 | 4395 | */ |
| 4396 | -function geodir_load_custom_field_translation( $translation_texts = array() ) {
|
|
| 4396 | +function geodir_load_custom_field_translation($translation_texts = array()) {
|
|
| 4397 | 4397 | global $wpdb; |
| 4398 | 4398 | |
| 4399 | 4399 | // Custom fields table |
| 4400 | - $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM " . GEODIR_CUSTOM_FIELDS_TABLE; |
|
| 4401 | - $rows = $wpdb->get_results( $sql ); |
|
| 4400 | + $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM ".GEODIR_CUSTOM_FIELDS_TABLE; |
|
| 4401 | + $rows = $wpdb->get_results($sql); |
|
| 4402 | 4402 | |
| 4403 | - if ( ! empty( $rows ) ) {
|
|
| 4404 | - foreach ( $rows as $row ) {
|
|
| 4405 | - if ( ! empty( $row->admin_title ) ) {
|
|
| 4406 | - $translation_texts[] = stripslashes_deep( $row->admin_title ); |
|
| 4403 | + if (!empty($rows)) {
|
|
| 4404 | + foreach ($rows as $row) {
|
|
| 4405 | + if (!empty($row->admin_title)) {
|
|
| 4406 | + $translation_texts[] = stripslashes_deep($row->admin_title); |
|
| 4407 | 4407 | } |
| 4408 | 4408 | |
| 4409 | - if ( ! empty( $row->admin_desc ) ) {
|
|
| 4410 | - $translation_texts[] = stripslashes_deep( $row->admin_desc ); |
|
| 4409 | + if (!empty($row->admin_desc)) {
|
|
| 4410 | + $translation_texts[] = stripslashes_deep($row->admin_desc); |
|
| 4411 | 4411 | } |
| 4412 | 4412 | |
| 4413 | - if ( ! empty( $row->site_title ) ) {
|
|
| 4414 | - $translation_texts[] = stripslashes_deep( $row->site_title ); |
|
| 4413 | + if (!empty($row->site_title)) {
|
|
| 4414 | + $translation_texts[] = stripslashes_deep($row->site_title); |
|
| 4415 | 4415 | } |
| 4416 | 4416 | |
| 4417 | - if ( ! empty( $row->clabels ) ) {
|
|
| 4418 | - $translation_texts[] = stripslashes_deep( $row->clabels ); |
|
| 4417 | + if (!empty($row->clabels)) {
|
|
| 4418 | + $translation_texts[] = stripslashes_deep($row->clabels); |
|
| 4419 | 4419 | } |
| 4420 | 4420 | |
| 4421 | - if ( ! empty( $row->required_msg ) ) {
|
|
| 4422 | - $translation_texts[] = stripslashes_deep( $row->required_msg ); |
|
| 4421 | + if (!empty($row->required_msg)) {
|
|
| 4422 | + $translation_texts[] = stripslashes_deep($row->required_msg); |
|
| 4423 | 4423 | } |
| 4424 | 4424 | |
| 4425 | - if ( ! empty( $row->validation_msg ) ) {
|
|
| 4426 | - $translation_texts[] = stripslashes_deep( $row->validation_msg ); |
|
| 4425 | + if (!empty($row->validation_msg)) {
|
|
| 4426 | + $translation_texts[] = stripslashes_deep($row->validation_msg); |
|
| 4427 | 4427 | } |
| 4428 | 4428 | |
| 4429 | - if ( ! empty( $row->default_value ) ) {
|
|
| 4430 | - $translation_texts[] = stripslashes_deep( $row->default_value ); |
|
| 4429 | + if (!empty($row->default_value)) {
|
|
| 4430 | + $translation_texts[] = stripslashes_deep($row->default_value); |
|
| 4431 | 4431 | } |
| 4432 | 4432 | |
| 4433 | - if ( ! empty( $row->option_values ) ) {
|
|
| 4434 | - $option_values = geodir_string_values_to_options( stripslashes_deep( $row->option_values ) ); |
|
| 4433 | + if (!empty($row->option_values)) {
|
|
| 4434 | + $option_values = geodir_string_values_to_options(stripslashes_deep($row->option_values)); |
|
| 4435 | 4435 | |
| 4436 | - if ( ! empty( $option_values ) ) {
|
|
| 4437 | - foreach ( $option_values as $option_value ) {
|
|
| 4438 | - if ( ! empty( $option_value['label'] ) ) {
|
|
| 4436 | + if (!empty($option_values)) {
|
|
| 4437 | + foreach ($option_values as $option_value) {
|
|
| 4438 | + if (!empty($option_value['label'])) {
|
|
| 4439 | 4439 | $translation_texts[] = $option_value['label']; |
| 4440 | 4440 | } |
| 4441 | 4441 | } |
@@ -4445,56 +4445,56 @@ discard block |
||
| 4445 | 4445 | } |
| 4446 | 4446 | |
| 4447 | 4447 | // Custom sorting fields table |
| 4448 | - $sql = "SELECT site_title, asc_title, desc_title FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE; |
|
| 4449 | - $rows = $wpdb->get_results( $sql ); |
|
| 4448 | + $sql = "SELECT site_title, asc_title, desc_title FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE; |
|
| 4449 | + $rows = $wpdb->get_results($sql); |
|
| 4450 | 4450 | |
| 4451 | - if ( ! empty( $rows ) ) {
|
|
| 4452 | - foreach ( $rows as $row ) {
|
|
| 4453 | - if ( ! empty( $row->site_title ) ) {
|
|
| 4454 | - $translation_texts[] = stripslashes_deep( $row->site_title ); |
|
| 4451 | + if (!empty($rows)) {
|
|
| 4452 | + foreach ($rows as $row) {
|
|
| 4453 | + if (!empty($row->site_title)) {
|
|
| 4454 | + $translation_texts[] = stripslashes_deep($row->site_title); |
|
| 4455 | 4455 | } |
| 4456 | 4456 | |
| 4457 | - if ( ! empty( $row->asc_title ) ) {
|
|
| 4458 | - $translation_texts[] = stripslashes_deep( $row->asc_title ); |
|
| 4457 | + if (!empty($row->asc_title)) {
|
|
| 4458 | + $translation_texts[] = stripslashes_deep($row->asc_title); |
|
| 4459 | 4459 | } |
| 4460 | 4460 | |
| 4461 | - if ( ! empty( $row->desc_title ) ) {
|
|
| 4462 | - $translation_texts[] = stripslashes_deep( $row->desc_title ); |
|
| 4461 | + if (!empty($row->desc_title)) {
|
|
| 4462 | + $translation_texts[] = stripslashes_deep($row->desc_title); |
|
| 4463 | 4463 | } |
| 4464 | 4464 | } |
| 4465 | 4465 | } |
| 4466 | 4466 | |
| 4467 | 4467 | // Advance search filter fields table |
| 4468 | - if ( defined( 'GEODIR_ADVANCE_SEARCH_TABLE' ) ) {
|
|
| 4469 | - $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM " . GEODIR_ADVANCE_SEARCH_TABLE; |
|
| 4470 | - $rows = $wpdb->get_results( $sql ); |
|
| 4471 | - |
|
| 4472 | - if ( ! empty( $rows ) ) {
|
|
| 4473 | - foreach ( $rows as $row ) {
|
|
| 4474 | - if ( ! empty( $row->field_site_name ) ) {
|
|
| 4475 | - $translation_texts[] = stripslashes_deep( $row->field_site_name ); |
|
| 4468 | + if (defined('GEODIR_ADVANCE_SEARCH_TABLE')) {
|
|
| 4469 | + $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM ".GEODIR_ADVANCE_SEARCH_TABLE; |
|
| 4470 | + $rows = $wpdb->get_results($sql); |
|
| 4471 | + |
|
| 4472 | + if (!empty($rows)) {
|
|
| 4473 | + foreach ($rows as $row) {
|
|
| 4474 | + if (!empty($row->field_site_name)) {
|
|
| 4475 | + $translation_texts[] = stripslashes_deep($row->field_site_name); |
|
| 4476 | 4476 | } |
| 4477 | 4477 | |
| 4478 | - if ( ! empty( $row->front_search_title ) ) {
|
|
| 4479 | - $translation_texts[] = stripslashes_deep( $row->front_search_title ); |
|
| 4478 | + if (!empty($row->front_search_title)) {
|
|
| 4479 | + $translation_texts[] = stripslashes_deep($row->front_search_title); |
|
| 4480 | 4480 | } |
| 4481 | 4481 | |
| 4482 | - if ( ! empty( $row->first_search_text ) ) {
|
|
| 4483 | - $translation_texts[] = stripslashes_deep( $row->first_search_text ); |
|
| 4482 | + if (!empty($row->first_search_text)) {
|
|
| 4483 | + $translation_texts[] = stripslashes_deep($row->first_search_text); |
|
| 4484 | 4484 | } |
| 4485 | 4485 | |
| 4486 | - if ( ! empty( $row->last_search_text ) ) {
|
|
| 4487 | - $translation_texts[] = stripslashes_deep( $row->last_search_text ); |
|
| 4486 | + if (!empty($row->last_search_text)) {
|
|
| 4487 | + $translation_texts[] = stripslashes_deep($row->last_search_text); |
|
| 4488 | 4488 | } |
| 4489 | 4489 | |
| 4490 | - if ( ! empty( $row->field_desc ) ) {
|
|
| 4491 | - $translation_texts[] = stripslashes_deep( $row->field_desc ); |
|
| 4490 | + if (!empty($row->field_desc)) {
|
|
| 4491 | + $translation_texts[] = stripslashes_deep($row->field_desc); |
|
| 4492 | 4492 | } |
| 4493 | 4493 | } |
| 4494 | 4494 | } |
| 4495 | 4495 | } |
| 4496 | 4496 | |
| 4497 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; |
|
| 4497 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 4498 | 4498 | |
| 4499 | 4499 | return $translation_texts; |
| 4500 | 4500 | } |
@@ -4516,7 +4516,7 @@ discard block |
||
| 4516 | 4516 | * |
| 4517 | 4517 | * @param array $geodir_allowed_mime_types and file extensions. |
| 4518 | 4518 | */ |
| 4519 | - return apply_filters( 'geodir_allowed_mime_types', array( |
|
| 4519 | + return apply_filters('geodir_allowed_mime_types', array(
|
|
| 4520 | 4520 | 'Image' => array( // Image formats. |
| 4521 | 4521 | 'jpg' => 'image/jpeg', |
| 4522 | 4522 | 'jpe' => 'image/jpeg', |
@@ -4585,18 +4585,18 @@ discard block |
||
| 4585 | 4585 | * |
| 4586 | 4586 | * @return string User display name. |
| 4587 | 4587 | */ |
| 4588 | -function geodir_get_client_name( $user_id ) {
|
|
| 4588 | +function geodir_get_client_name($user_id) {
|
|
| 4589 | 4589 | $client_name = ''; |
| 4590 | 4590 | |
| 4591 | - $user_data = get_userdata( $user_id ); |
|
| 4591 | + $user_data = get_userdata($user_id); |
|
| 4592 | 4592 | |
| 4593 | - if ( ! empty( $user_data ) ) {
|
|
| 4594 | - if ( isset( $user_data->display_name ) && trim( $user_data->display_name ) != '' ) {
|
|
| 4595 | - $client_name = trim( $user_data->display_name ); |
|
| 4596 | - } else if ( isset( $user_data->user_nicename ) && trim( $user_data->user_nicename ) != '' ) {
|
|
| 4597 | - $client_name = trim( $user_data->user_nicename ); |
|
| 4593 | + if (!empty($user_data)) {
|
|
| 4594 | + if (isset($user_data->display_name) && trim($user_data->display_name) != '') {
|
|
| 4595 | + $client_name = trim($user_data->display_name); |
|
| 4596 | + } else if (isset($user_data->user_nicename) && trim($user_data->user_nicename) != '') {
|
|
| 4597 | + $client_name = trim($user_data->user_nicename); |
|
| 4598 | 4598 | } else {
|
| 4599 | - $client_name = trim( $user_data->user_login ); |
|
| 4599 | + $client_name = trim($user_data->user_login); |
|
| 4600 | 4600 | } |
| 4601 | 4601 | } |
| 4602 | 4602 | |
@@ -4604,17 +4604,17 @@ discard block |
||
| 4604 | 4604 | } |
| 4605 | 4605 | |
| 4606 | 4606 | |
| 4607 | -add_filter( 'wpseo_replacements', 'geodir_wpseo_replacements', 10, 1 ); |
|
| 4607 | +add_filter('wpseo_replacements', 'geodir_wpseo_replacements', 10, 1);
|
|
| 4608 | 4608 | /* |
| 4609 | 4609 | * Add location variables to wpseo replacements. |
| 4610 | 4610 | * |
| 4611 | 4611 | * @since 1.5.4 |
| 4612 | 4612 | */ |
| 4613 | -function geodir_wpseo_replacements( $vars ) {
|
|
| 4613 | +function geodir_wpseo_replacements($vars) {
|
|
| 4614 | 4614 | |
| 4615 | 4615 | // location variables |
| 4616 | 4616 | $gd_post_type = geodir_get_current_posttype(); |
| 4617 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 4617 | + $location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 4618 | 4618 | /** |
| 4619 | 4619 | * Filter the title variables location variables array |
| 4620 | 4620 | * |
@@ -4624,7 +4624,7 @@ discard block |
||
| 4624 | 4624 | * @param array $location_array The array of location variables. |
| 4625 | 4625 | * @param array $vars The page title variables. |
| 4626 | 4626 | */ |
| 4627 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr_seo', $location_array, $vars ); |
|
| 4627 | + $location_array = apply_filters('geodir_filter_title_variables_location_arr_seo', $location_array, $vars);
|
|
| 4628 | 4628 | |
| 4629 | 4629 | |
| 4630 | 4630 | $location_replace_vars = geodir_location_replace_vars($location_array, NULL, ''); |
@@ -4639,13 +4639,13 @@ discard block |
||
| 4639 | 4639 | * @param string $vars The title with variables. |
| 4640 | 4640 | * @param array $location_array The array of location variables. |
| 4641 | 4641 | */ |
| 4642 | - return apply_filters( 'geodir_wpseo_replacements_vars', $vars, $location_array ); |
|
| 4642 | + return apply_filters('geodir_wpseo_replacements_vars', $vars, $location_array);
|
|
| 4643 | 4643 | } |
| 4644 | 4644 | |
| 4645 | 4645 | |
| 4646 | -add_filter( 'geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3 ); |
|
| 4647 | -add_filter( 'geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2 ); |
|
| 4648 | -add_filter( 'geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3 ); |
|
| 4646 | +add_filter('geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3);
|
|
| 4647 | +add_filter('geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2);
|
|
| 4648 | +add_filter('geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3);
|
|
| 4649 | 4649 | |
| 4650 | 4650 | /** |
| 4651 | 4651 | * Filter the title variables. |
@@ -4687,14 +4687,14 @@ discard block |
||
| 4687 | 4687 | * |
| 4688 | 4688 | * @return string Title after filtered variables. |
| 4689 | 4689 | */ |
| 4690 | -function geodir_filter_title_variables( $title, $gd_page, $sep = '' ) {
|
|
| 4690 | +function geodir_filter_title_variables($title, $gd_page, $sep = '') {
|
|
| 4691 | 4691 | global $wp, $post; |
| 4692 | 4692 | |
| 4693 | - if ( ! $gd_page || ! $title ) {
|
|
| 4693 | + if (!$gd_page || !$title) {
|
|
| 4694 | 4694 | return $title; // if no a GD page then bail. |
| 4695 | 4695 | } |
| 4696 | 4696 | |
| 4697 | - if ( $sep == '' ) {
|
|
| 4697 | + if ($sep == '') {
|
|
| 4698 | 4698 | /** |
| 4699 | 4699 | * Filter the page title separator. |
| 4700 | 4700 | * |
@@ -4703,100 +4703,100 @@ discard block |
||
| 4703 | 4703 | * |
| 4704 | 4704 | * @param string $sep The separator, default: `|`. |
| 4705 | 4705 | */ |
| 4706 | - $sep = apply_filters( 'geodir_page_title_separator', '|' ); |
|
| 4706 | + $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 4707 | 4707 | } |
| 4708 | 4708 | |
| 4709 | - if ( strpos( $title, '%%title%%' ) !== false ) {
|
|
| 4710 | - $title = str_replace( "%%title%%", $post->post_title, $title ); |
|
| 4709 | + if (strpos($title, '%%title%%') !== false) {
|
|
| 4710 | + $title = str_replace("%%title%%", $post->post_title, $title);
|
|
| 4711 | 4711 | } |
| 4712 | 4712 | |
| 4713 | - if ( strpos( $title, '%%sitename%%' ) !== false ) {
|
|
| 4714 | - $title = str_replace( "%%sitename%%", get_bloginfo( 'name' ), $title ); |
|
| 4713 | + if (strpos($title, '%%sitename%%') !== false) {
|
|
| 4714 | + $title = str_replace("%%sitename%%", get_bloginfo('name'), $title);
|
|
| 4715 | 4715 | } |
| 4716 | 4716 | |
| 4717 | - if ( strpos( $title, '%%sitedesc%%' ) !== false ) {
|
|
| 4718 | - $title = str_replace( "%%sitedesc%%", get_bloginfo( 'description' ), $title ); |
|
| 4717 | + if (strpos($title, '%%sitedesc%%') !== false) {
|
|
| 4718 | + $title = str_replace("%%sitedesc%%", get_bloginfo('description'), $title);
|
|
| 4719 | 4719 | } |
| 4720 | 4720 | |
| 4721 | - if ( strpos( $title, '%%excerpt%%' ) !== false ) {
|
|
| 4722 | - $title = str_replace( "%%excerpt%%", strip_tags( get_the_excerpt() ), $title ); |
|
| 4721 | + if (strpos($title, '%%excerpt%%') !== false) {
|
|
| 4722 | + $title = str_replace("%%excerpt%%", strip_tags(get_the_excerpt()), $title);
|
|
| 4723 | 4723 | } |
| 4724 | 4724 | |
| 4725 | - if ( $gd_page == 'search' || $gd_page == 'author' ) {
|
|
| 4726 | - $post_type = isset( $_REQUEST['stype'] ) ? sanitize_text_field( $_REQUEST['stype'] ) : ''; |
|
| 4727 | - } else if ( $gd_page == 'add-listing' ) {
|
|
| 4728 | - $post_type = ( isset( $_REQUEST['listing_type'] ) ) ? sanitize_text_field( $_REQUEST['listing_type'] ) : ''; |
|
| 4729 | - $post_type = ! $post_type && ! empty( $_REQUEST['pid'] ) ? get_post_type( (int) $_REQUEST['pid'] ) : $post_type; |
|
| 4730 | - } else if ( isset( $post->post_type ) && $post->post_type && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 4725 | + if ($gd_page == 'search' || $gd_page == 'author') {
|
|
| 4726 | + $post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : ''; |
|
| 4727 | + } else if ($gd_page == 'add-listing') {
|
|
| 4728 | + $post_type = (isset($_REQUEST['listing_type'])) ? sanitize_text_field($_REQUEST['listing_type']) : ''; |
|
| 4729 | + $post_type = !$post_type && !empty($_REQUEST['pid']) ? get_post_type((int) $_REQUEST['pid']) : $post_type; |
|
| 4730 | + } else if (isset($post->post_type) && $post->post_type && in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 4731 | 4731 | $post_type = $post->post_type; |
| 4732 | 4732 | } else {
|
| 4733 | - $post_type = get_query_var( 'post_type' ); |
|
| 4733 | + $post_type = get_query_var('post_type');
|
|
| 4734 | 4734 | } |
| 4735 | 4735 | |
| 4736 | - if ( strpos( $title, '%%pt_single%%' ) !== false ) {
|
|
| 4736 | + if (strpos($title, '%%pt_single%%') !== false) {
|
|
| 4737 | 4737 | $singular_name = ''; |
| 4738 | - if ( $post_type && $singular_name = get_post_type_singular_label( $post_type ) ) {
|
|
| 4739 | - $singular_name = __( $singular_name, 'geodirectory' ); |
|
| 4738 | + if ($post_type && $singular_name = get_post_type_singular_label($post_type)) {
|
|
| 4739 | + $singular_name = __($singular_name, 'geodirectory'); |
|
| 4740 | 4740 | } |
| 4741 | 4741 | |
| 4742 | - $title = str_replace( "%%pt_single%%", $singular_name, $title ); |
|
| 4742 | + $title = str_replace("%%pt_single%%", $singular_name, $title);
|
|
| 4743 | 4743 | } |
| 4744 | 4744 | |
| 4745 | - if ( strpos( $title, '%%pt_plural%%' ) !== false ) {
|
|
| 4745 | + if (strpos($title, '%%pt_plural%%') !== false) {
|
|
| 4746 | 4746 | $plural_name = ''; |
| 4747 | - if ( $post_type && $plural_name = get_post_type_plural_label( $post_type ) ) {
|
|
| 4748 | - $plural_name = __( $plural_name, 'geodirectory' ); |
|
| 4747 | + if ($post_type && $plural_name = get_post_type_plural_label($post_type)) {
|
|
| 4748 | + $plural_name = __($plural_name, 'geodirectory'); |
|
| 4749 | 4749 | } |
| 4750 | 4750 | |
| 4751 | - $title = str_replace( "%%pt_plural%%", $plural_name, $title ); |
|
| 4751 | + $title = str_replace("%%pt_plural%%", $plural_name, $title);
|
|
| 4752 | 4752 | } |
| 4753 | 4753 | |
| 4754 | - if ( strpos( $title, '%%category%%' ) !== false ) {
|
|
| 4754 | + if (strpos($title, '%%category%%') !== false) {
|
|
| 4755 | 4755 | $cat_name = ''; |
| 4756 | 4756 | |
| 4757 | - if ( $gd_page == 'detail' ) {
|
|
| 4758 | - if ( $post->default_category ) {
|
|
| 4759 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); |
|
| 4760 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; |
|
| 4757 | + if ($gd_page == 'detail') {
|
|
| 4758 | + if ($post->default_category) {
|
|
| 4759 | + $cat = get_term($post->default_category, $post->post_type.'category'); |
|
| 4760 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; |
|
| 4761 | 4761 | } |
| 4762 | - } else if ( $gd_page == 'listing' ) {
|
|
| 4762 | + } else if ($gd_page == 'listing') {
|
|
| 4763 | 4763 | $queried_object = get_queried_object(); |
| 4764 | - if ( isset( $queried_object->name ) ) {
|
|
| 4764 | + if (isset($queried_object->name)) {
|
|
| 4765 | 4765 | $cat_name = $queried_object->name; |
| 4766 | 4766 | } |
| 4767 | 4767 | } |
| 4768 | - $title = str_replace( "%%category%%", $cat_name, $title ); |
|
| 4768 | + $title = str_replace("%%category%%", $cat_name, $title);
|
|
| 4769 | 4769 | } |
| 4770 | 4770 | |
| 4771 | - if ( strpos( $title, '%%tag%%' ) !== false ) {
|
|
| 4771 | + if (strpos($title, '%%tag%%') !== false) {
|
|
| 4772 | 4772 | $cat_name = ''; |
| 4773 | 4773 | |
| 4774 | - if ( $gd_page == 'detail' ) {
|
|
| 4775 | - if ( $post->default_category ) {
|
|
| 4776 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); |
|
| 4777 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; |
|
| 4774 | + if ($gd_page == 'detail') {
|
|
| 4775 | + if ($post->default_category) {
|
|
| 4776 | + $cat = get_term($post->default_category, $post->post_type.'category'); |
|
| 4777 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; |
|
| 4778 | 4778 | } |
| 4779 | - } else if ( $gd_page == 'listing' ) {
|
|
| 4779 | + } else if ($gd_page == 'listing') {
|
|
| 4780 | 4780 | $queried_object = get_queried_object(); |
| 4781 | - if ( isset( $queried_object->name ) ) {
|
|
| 4781 | + if (isset($queried_object->name)) {
|
|
| 4782 | 4782 | $cat_name = $queried_object->name; |
| 4783 | 4783 | } |
| 4784 | 4784 | } |
| 4785 | - $title = str_replace( "%%tag%%", $cat_name, $title ); |
|
| 4785 | + $title = str_replace("%%tag%%", $cat_name, $title);
|
|
| 4786 | 4786 | } |
| 4787 | 4787 | |
| 4788 | - if ( strpos( $title, '%%id%%' ) !== false ) {
|
|
| 4789 | - $ID = ( isset( $post->ID ) ) ? $post->ID : ''; |
|
| 4790 | - $title = str_replace( "%%id%%", $ID, $title ); |
|
| 4788 | + if (strpos($title, '%%id%%') !== false) {
|
|
| 4789 | + $ID = (isset($post->ID)) ? $post->ID : ''; |
|
| 4790 | + $title = str_replace("%%id%%", $ID, $title);
|
|
| 4791 | 4791 | } |
| 4792 | 4792 | |
| 4793 | - if ( strpos( $title, '%%sep%%' ) !== false ) {
|
|
| 4794 | - $title = str_replace( "%%sep%%", $sep, $title ); |
|
| 4793 | + if (strpos($title, '%%sep%%') !== false) {
|
|
| 4794 | + $title = str_replace("%%sep%%", $sep, $title);
|
|
| 4795 | 4795 | } |
| 4796 | 4796 | |
| 4797 | 4797 | // location variables |
| 4798 | 4798 | $gd_post_type = geodir_get_current_posttype(); |
| 4799 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 4799 | + $location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 4800 | 4800 | |
| 4801 | 4801 | /** |
| 4802 | 4802 | * Filter the title variables location variables array |
@@ -4809,20 +4809,20 @@ discard block |
||
| 4809 | 4809 | * @param string $gd_page The page being filtered. |
| 4810 | 4810 | * @param string $sep The separator, default: `|`. |
| 4811 | 4811 | */ |
| 4812 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep ); |
|
| 4812 | + $location_array = apply_filters('geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep);
|
|
| 4813 | 4813 | |
| 4814 | - if ( $gd_page == 'location' && get_query_var( 'gd_country_full' ) ) {
|
|
| 4815 | - if ( get_query_var( 'gd_country_full' ) ) {
|
|
| 4816 | - $location_array['gd_country'] = get_query_var( 'gd_country_full' ); |
|
| 4814 | + if ($gd_page == 'location' && get_query_var('gd_country_full')) {
|
|
| 4815 | + if (get_query_var('gd_country_full')) {
|
|
| 4816 | + $location_array['gd_country'] = get_query_var('gd_country_full');
|
|
| 4817 | 4817 | } |
| 4818 | - if ( get_query_var( 'gd_region_full' ) ) {
|
|
| 4819 | - $location_array['gd_region'] = get_query_var( 'gd_region_full' ); |
|
| 4818 | + if (get_query_var('gd_region_full')) {
|
|
| 4819 | + $location_array['gd_region'] = get_query_var('gd_region_full');
|
|
| 4820 | 4820 | } |
| 4821 | - if ( get_query_var( 'gd_city_full' ) ) {
|
|
| 4822 | - $location_array['gd_city'] = get_query_var( 'gd_city_full' ); |
|
| 4821 | + if (get_query_var('gd_city_full')) {
|
|
| 4822 | + $location_array['gd_city'] = get_query_var('gd_city_full');
|
|
| 4823 | 4823 | } |
| 4824 | - if ( get_query_var( 'gd_neighbourhood_full' ) ) {
|
|
| 4825 | - $location_array['gd_neighbourhood'] = get_query_var( 'gd_neighbourhood_full' ); |
|
| 4824 | + if (get_query_var('gd_neighbourhood_full')) {
|
|
| 4825 | + $location_array['gd_neighbourhood'] = get_query_var('gd_neighbourhood_full');
|
|
| 4826 | 4826 | } |
| 4827 | 4827 | } |
| 4828 | 4828 | |
@@ -4837,58 +4837,58 @@ discard block |
||
| 4837 | 4837 | * @param string $gd_page The page being filtered. |
| 4838 | 4838 | * @param string $sep The separator, default: `|`. |
| 4839 | 4839 | */ |
| 4840 | - $title = apply_filters( 'geodir_replace_location_variables', $title, $location_array, $gd_page, $sep ); |
|
| 4840 | + $title = apply_filters('geodir_replace_location_variables', $title, $location_array, $gd_page, $sep);
|
|
| 4841 | 4841 | |
| 4842 | - if ( strpos( $title, '%%search_term%%' ) !== false ) {
|
|
| 4842 | + if (strpos($title, '%%search_term%%') !== false) {
|
|
| 4843 | 4843 | $search_term = ''; |
| 4844 | - if ( isset( $_REQUEST['s'] ) ) {
|
|
| 4845 | - $search_term = esc_attr( $_REQUEST['s'] ); |
|
| 4846 | - $search_term = str_replace(array("%E2%80%99","’"),array("%27","'"),$search_term);
|
|
| 4844 | + if (isset($_REQUEST['s'])) {
|
|
| 4845 | + $search_term = esc_attr($_REQUEST['s']); |
|
| 4846 | + $search_term = str_replace(array("%E2%80%99", "’"), array("%27", "'"), $search_term);
|
|
| 4847 | 4847 | } |
| 4848 | - $title = str_replace( "%%search_term%%", $search_term, $title ); |
|
| 4848 | + $title = str_replace("%%search_term%%", $search_term, $title);
|
|
| 4849 | 4849 | } |
| 4850 | 4850 | |
| 4851 | - if ( strpos( $title, '%%search_near%%' ) !== false ) {
|
|
| 4851 | + if (strpos($title, '%%search_near%%') !== false) {
|
|
| 4852 | 4852 | $search_term = ''; |
| 4853 | - if ( isset( $_REQUEST['snear'] ) ) {
|
|
| 4854 | - $search_term = esc_attr( $_REQUEST['snear'] ); |
|
| 4853 | + if (isset($_REQUEST['snear'])) {
|
|
| 4854 | + $search_term = esc_attr($_REQUEST['snear']); |
|
| 4855 | 4855 | } |
| 4856 | - $title = str_replace( "%%search_near%%", $search_term, $title ); |
|
| 4856 | + $title = str_replace("%%search_near%%", $search_term, $title);
|
|
| 4857 | 4857 | } |
| 4858 | 4858 | |
| 4859 | - if ( strpos( $title, '%%name%%' ) !== false ) {
|
|
| 4860 | - if ( is_author() ) {
|
|
| 4861 | - $curauth = ( get_query_var( 'author_name' ) ) ? get_user_by( 'slug', get_query_var( 'author_name' ) ) : get_userdata( get_query_var( 'author' ) ); |
|
| 4859 | + if (strpos($title, '%%name%%') !== false) {
|
|
| 4860 | + if (is_author()) {
|
|
| 4861 | + $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 4862 | 4862 | $author_name = $curauth->display_name; |
| 4863 | 4863 | } else {
|
| 4864 | 4864 | $author_name = get_the_author(); |
| 4865 | 4865 | } |
| 4866 | - if ( ! $author_name || $author_name === '' ) {
|
|
| 4866 | + if (!$author_name || $author_name === '') {
|
|
| 4867 | 4867 | $queried_object = get_queried_object(); |
| 4868 | 4868 | |
| 4869 | - if ( isset( $queried_object->data->user_nicename ) ) {
|
|
| 4869 | + if (isset($queried_object->data->user_nicename)) {
|
|
| 4870 | 4870 | $author_name = $queried_object->data->display_name; |
| 4871 | 4871 | } |
| 4872 | 4872 | } |
| 4873 | - $title = str_replace( "%%name%%", $author_name, $title ); |
|
| 4873 | + $title = str_replace("%%name%%", $author_name, $title);
|
|
| 4874 | 4874 | } |
| 4875 | 4875 | |
| 4876 | - if ( strpos( $title, '%%page%%' ) !== false ) {
|
|
| 4877 | - $page = geodir_title_meta_page( $sep ); |
|
| 4878 | - $title = str_replace( "%%page%%", $page, $title ); |
|
| 4876 | + if (strpos($title, '%%page%%') !== false) {
|
|
| 4877 | + $page = geodir_title_meta_page($sep); |
|
| 4878 | + $title = str_replace("%%page%%", $page, $title);
|
|
| 4879 | 4879 | } |
| 4880 | - if ( strpos( $title, '%%pagenumber%%' ) !== false ) {
|
|
| 4880 | + if (strpos($title, '%%pagenumber%%') !== false) {
|
|
| 4881 | 4881 | $pagenumber = geodir_title_meta_pagenumber(); |
| 4882 | - $title = str_replace( "%%pagenumber%%", $pagenumber, $title ); |
|
| 4882 | + $title = str_replace("%%pagenumber%%", $pagenumber, $title);
|
|
| 4883 | 4883 | } |
| 4884 | - if ( strpos( $title, '%%pagetotal%%' ) !== false ) {
|
|
| 4884 | + if (strpos($title, '%%pagetotal%%') !== false) {
|
|
| 4885 | 4885 | $pagetotal = geodir_title_meta_pagetotal(); |
| 4886 | - $title = str_replace( "%%pagetotal%%", $pagetotal, $title ); |
|
| 4886 | + $title = str_replace("%%pagetotal%%", $pagetotal, $title);
|
|
| 4887 | 4887 | } |
| 4888 | 4888 | |
| 4889 | - $title = wptexturize( $title ); |
|
| 4890 | - $title = convert_chars( $title ); |
|
| 4891 | - $title = esc_html( $title ); |
|
| 4889 | + $title = wptexturize($title); |
|
| 4890 | + $title = convert_chars($title); |
|
| 4891 | + $title = esc_html($title); |
|
| 4892 | 4892 | |
| 4893 | 4893 | /** |
| 4894 | 4894 | * Filter the title variables after standard ones have been filtered. |
@@ -4902,7 +4902,7 @@ discard block |
||
| 4902 | 4902 | * @param string $sep The separator, default: `|`. |
| 4903 | 4903 | */ |
| 4904 | 4904 | |
| 4905 | - return apply_filters( 'geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep ); |
|
| 4905 | + return apply_filters('geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep);
|
|
| 4906 | 4906 | } |
| 4907 | 4907 | |
| 4908 | 4908 | /** |
@@ -4915,82 +4915,82 @@ discard block |
||
| 4915 | 4915 | * |
| 4916 | 4916 | * @return array Translation texts. |
| 4917 | 4917 | */ |
| 4918 | -function geodir_load_cpt_text_translation( $translation_texts = array() ) {
|
|
| 4919 | - $gd_post_types = geodir_get_posttypes( 'array' ); |
|
| 4918 | +function geodir_load_cpt_text_translation($translation_texts = array()) {
|
|
| 4919 | + $gd_post_types = geodir_get_posttypes('array');
|
|
| 4920 | 4920 | |
| 4921 | - if ( ! empty( $gd_post_types ) ) {
|
|
| 4922 | - foreach ( $gd_post_types as $post_type => $cpt_info ) {
|
|
| 4923 | - $labels = isset( $cpt_info['labels'] ) ? $cpt_info['labels'] : ''; |
|
| 4924 | - $description = isset( $cpt_info['description'] ) ? $cpt_info['description'] : ''; |
|
| 4925 | - $seo = isset( $cpt_info['seo'] ) ? $cpt_info['seo'] : ''; |
|
| 4921 | + if (!empty($gd_post_types)) {
|
|
| 4922 | + foreach ($gd_post_types as $post_type => $cpt_info) {
|
|
| 4923 | + $labels = isset($cpt_info['labels']) ? $cpt_info['labels'] : ''; |
|
| 4924 | + $description = isset($cpt_info['description']) ? $cpt_info['description'] : ''; |
|
| 4925 | + $seo = isset($cpt_info['seo']) ? $cpt_info['seo'] : ''; |
|
| 4926 | 4926 | |
| 4927 | - if ( ! empty( $labels ) ) {
|
|
| 4928 | - if ( $labels['name'] != '' && ! in_array( $labels['name'], $translation_texts ) ) {
|
|
| 4927 | + if (!empty($labels)) {
|
|
| 4928 | + if ($labels['name'] != '' && !in_array($labels['name'], $translation_texts)) {
|
|
| 4929 | 4929 | $translation_texts[] = $labels['name']; |
| 4930 | 4930 | } |
| 4931 | - if ( $labels['singular_name'] != '' && ! in_array( $labels['singular_name'], $translation_texts ) ) {
|
|
| 4931 | + if ($labels['singular_name'] != '' && !in_array($labels['singular_name'], $translation_texts)) {
|
|
| 4932 | 4932 | $translation_texts[] = $labels['singular_name']; |
| 4933 | 4933 | } |
| 4934 | - if ( $labels['add_new'] != '' && ! in_array( $labels['add_new'], $translation_texts ) ) {
|
|
| 4934 | + if ($labels['add_new'] != '' && !in_array($labels['add_new'], $translation_texts)) {
|
|
| 4935 | 4935 | $translation_texts[] = $labels['add_new']; |
| 4936 | 4936 | } |
| 4937 | - if ( $labels['add_new_item'] != '' && ! in_array( $labels['add_new_item'], $translation_texts ) ) {
|
|
| 4937 | + if ($labels['add_new_item'] != '' && !in_array($labels['add_new_item'], $translation_texts)) {
|
|
| 4938 | 4938 | $translation_texts[] = $labels['add_new_item']; |
| 4939 | 4939 | } |
| 4940 | - if ( $labels['edit_item'] != '' && ! in_array( $labels['edit_item'], $translation_texts ) ) {
|
|
| 4940 | + if ($labels['edit_item'] != '' && !in_array($labels['edit_item'], $translation_texts)) {
|
|
| 4941 | 4941 | $translation_texts[] = $labels['edit_item']; |
| 4942 | 4942 | } |
| 4943 | - if ( $labels['new_item'] != '' && ! in_array( $labels['new_item'], $translation_texts ) ) {
|
|
| 4943 | + if ($labels['new_item'] != '' && !in_array($labels['new_item'], $translation_texts)) {
|
|
| 4944 | 4944 | $translation_texts[] = $labels['new_item']; |
| 4945 | 4945 | } |
| 4946 | - if ( $labels['view_item'] != '' && ! in_array( $labels['view_item'], $translation_texts ) ) {
|
|
| 4946 | + if ($labels['view_item'] != '' && !in_array($labels['view_item'], $translation_texts)) {
|
|
| 4947 | 4947 | $translation_texts[] = $labels['view_item']; |
| 4948 | 4948 | } |
| 4949 | - if ( $labels['search_items'] != '' && ! in_array( $labels['search_items'], $translation_texts ) ) {
|
|
| 4949 | + if ($labels['search_items'] != '' && !in_array($labels['search_items'], $translation_texts)) {
|
|
| 4950 | 4950 | $translation_texts[] = $labels['search_items']; |
| 4951 | 4951 | } |
| 4952 | - if ( $labels['not_found'] != '' && ! in_array( $labels['not_found'], $translation_texts ) ) {
|
|
| 4952 | + if ($labels['not_found'] != '' && !in_array($labels['not_found'], $translation_texts)) {
|
|
| 4953 | 4953 | $translation_texts[] = $labels['not_found']; |
| 4954 | 4954 | } |
| 4955 | - if ( $labels['not_found_in_trash'] != '' && ! in_array( $labels['not_found_in_trash'], $translation_texts ) ) {
|
|
| 4955 | + if ($labels['not_found_in_trash'] != '' && !in_array($labels['not_found_in_trash'], $translation_texts)) {
|
|
| 4956 | 4956 | $translation_texts[] = $labels['not_found_in_trash']; |
| 4957 | 4957 | } |
| 4958 | - if ( isset( $labels['label_post_profile'] ) && $labels['label_post_profile'] != '' && ! in_array( $labels['label_post_profile'], $translation_texts ) ) {
|
|
| 4958 | + if (isset($labels['label_post_profile']) && $labels['label_post_profile'] != '' && !in_array($labels['label_post_profile'], $translation_texts)) {
|
|
| 4959 | 4959 | $translation_texts[] = $labels['label_post_profile']; |
| 4960 | 4960 | } |
| 4961 | - if ( isset( $labels['label_post_info'] ) && $labels['label_post_info'] != '' && ! in_array( $labels['label_post_info'], $translation_texts ) ) {
|
|
| 4961 | + if (isset($labels['label_post_info']) && $labels['label_post_info'] != '' && !in_array($labels['label_post_info'], $translation_texts)) {
|
|
| 4962 | 4962 | $translation_texts[] = $labels['label_post_info']; |
| 4963 | 4963 | } |
| 4964 | - if ( isset( $labels['label_post_images'] ) && $labels['label_post_images'] != '' && ! in_array( $labels['label_post_images'], $translation_texts ) ) {
|
|
| 4964 | + if (isset($labels['label_post_images']) && $labels['label_post_images'] != '' && !in_array($labels['label_post_images'], $translation_texts)) {
|
|
| 4965 | 4965 | $translation_texts[] = $labels['label_post_images']; |
| 4966 | 4966 | } |
| 4967 | - if ( isset( $labels['label_post_map'] ) && $labels['label_post_map'] != '' && ! in_array( $labels['label_post_map'], $translation_texts ) ) {
|
|
| 4967 | + if (isset($labels['label_post_map']) && $labels['label_post_map'] != '' && !in_array($labels['label_post_map'], $translation_texts)) {
|
|
| 4968 | 4968 | $translation_texts[] = $labels['label_post_map']; |
| 4969 | 4969 | } |
| 4970 | - if ( isset( $labels['label_reviews'] ) && $labels['label_reviews'] != '' && ! in_array( $labels['label_reviews'], $translation_texts ) ) {
|
|
| 4970 | + if (isset($labels['label_reviews']) && $labels['label_reviews'] != '' && !in_array($labels['label_reviews'], $translation_texts)) {
|
|
| 4971 | 4971 | $translation_texts[] = $labels['label_reviews']; |
| 4972 | 4972 | } |
| 4973 | - if ( isset( $labels['label_related_listing'] ) && $labels['label_related_listing'] != '' && ! in_array( $labels['label_related_listing'], $translation_texts ) ) {
|
|
| 4973 | + if (isset($labels['label_related_listing']) && $labels['label_related_listing'] != '' && !in_array($labels['label_related_listing'], $translation_texts)) {
|
|
| 4974 | 4974 | $translation_texts[] = $labels['label_related_listing']; |
| 4975 | 4975 | } |
| 4976 | 4976 | } |
| 4977 | 4977 | |
| 4978 | - if ( $description != '' && ! in_array( $description, $translation_texts ) ) {
|
|
| 4979 | - $translation_texts[] = normalize_whitespace( $description ); |
|
| 4978 | + if ($description != '' && !in_array($description, $translation_texts)) {
|
|
| 4979 | + $translation_texts[] = normalize_whitespace($description); |
|
| 4980 | 4980 | } |
| 4981 | 4981 | |
| 4982 | - if ( ! empty( $seo ) ) {
|
|
| 4983 | - if ( isset( $seo['meta_keyword'] ) && $seo['meta_keyword'] != '' && ! in_array( $seo['meta_keyword'], $translation_texts ) ) {
|
|
| 4984 | - $translation_texts[] = normalize_whitespace( $seo['meta_keyword'] ); |
|
| 4982 | + if (!empty($seo)) {
|
|
| 4983 | + if (isset($seo['meta_keyword']) && $seo['meta_keyword'] != '' && !in_array($seo['meta_keyword'], $translation_texts)) {
|
|
| 4984 | + $translation_texts[] = normalize_whitespace($seo['meta_keyword']); |
|
| 4985 | 4985 | } |
| 4986 | 4986 | |
| 4987 | - if ( isset( $seo['meta_description'] ) && $seo['meta_description'] != '' && ! in_array( $seo['meta_description'], $translation_texts ) ) {
|
|
| 4988 | - $translation_texts[] = normalize_whitespace( $seo['meta_description'] ); |
|
| 4987 | + if (isset($seo['meta_description']) && $seo['meta_description'] != '' && !in_array($seo['meta_description'], $translation_texts)) {
|
|
| 4988 | + $translation_texts[] = normalize_whitespace($seo['meta_description']); |
|
| 4989 | 4989 | } |
| 4990 | 4990 | } |
| 4991 | 4991 | } |
| 4992 | 4992 | } |
| 4993 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; |
|
| 4993 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 4994 | 4994 | |
| 4995 | 4995 | return $translation_texts; |
| 4996 | 4996 | } |
@@ -5005,27 +5005,27 @@ discard block |
||
| 5005 | 5005 | * |
| 5006 | 5006 | * @return array Location terms. |
| 5007 | 5007 | */ |
| 5008 | -function geodir_remove_location_terms( $location_terms = array() ) {
|
|
| 5009 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; |
|
| 5008 | +function geodir_remove_location_terms($location_terms = array()) {
|
|
| 5009 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 5010 | 5010 | |
| 5011 | - if ( ! empty( $location_terms ) && $location_manager ) {
|
|
| 5012 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); |
|
| 5013 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); |
|
| 5011 | + if (!empty($location_terms) && $location_manager) {
|
|
| 5012 | + $hide_country_part = get_option('geodir_location_hide_country_part');
|
|
| 5013 | + $hide_region_part = get_option('geodir_location_hide_region_part');
|
|
| 5014 | 5014 | |
| 5015 | - if ( $hide_region_part && $hide_country_part ) {
|
|
| 5016 | - if ( isset( $location_terms['gd_country'] ) ) {
|
|
| 5017 | - unset( $location_terms['gd_country'] ); |
|
| 5015 | + if ($hide_region_part && $hide_country_part) {
|
|
| 5016 | + if (isset($location_terms['gd_country'])) {
|
|
| 5017 | + unset($location_terms['gd_country']); |
|
| 5018 | 5018 | } |
| 5019 | - if ( isset( $location_terms['gd_region'] ) ) {
|
|
| 5020 | - unset( $location_terms['gd_region'] ); |
|
| 5019 | + if (isset($location_terms['gd_region'])) {
|
|
| 5020 | + unset($location_terms['gd_region']); |
|
| 5021 | 5021 | } |
| 5022 | - } else if ( $hide_region_part && ! $hide_country_part ) {
|
|
| 5023 | - if ( isset( $location_terms['gd_region'] ) ) {
|
|
| 5024 | - unset( $location_terms['gd_region'] ); |
|
| 5022 | + } else if ($hide_region_part && !$hide_country_part) {
|
|
| 5023 | + if (isset($location_terms['gd_region'])) {
|
|
| 5024 | + unset($location_terms['gd_region']); |
|
| 5025 | 5025 | } |
| 5026 | - } else if ( ! $hide_region_part && $hide_country_part ) {
|
|
| 5027 | - if ( isset( $location_terms['gd_country'] ) ) {
|
|
| 5028 | - unset( $location_terms['gd_country'] ); |
|
| 5026 | + } else if (!$hide_region_part && $hide_country_part) {
|
|
| 5027 | + if (isset($location_terms['gd_country'])) {
|
|
| 5028 | + unset($location_terms['gd_country']); |
|
| 5029 | 5029 | } |
| 5030 | 5030 | } |
| 5031 | 5031 | } |
@@ -5036,7 +5036,7 @@ discard block |
||
| 5036 | 5036 | * @since 1.6.22 |
| 5037 | 5037 | * @param array $location_terms The array of location terms. |
| 5038 | 5038 | */ |
| 5039 | - return apply_filters('geodir_remove_location_terms',$location_terms);
|
|
| 5039 | + return apply_filters('geodir_remove_location_terms', $location_terms);
|
|
| 5040 | 5040 | } |
| 5041 | 5041 | |
| 5042 | 5042 | /** |
@@ -5053,32 +5053,32 @@ discard block |
||
| 5053 | 5053 | * @param WP_Post $post Post object. |
| 5054 | 5054 | * @param bool $update Whether this is an existing listing being updated or not. |
| 5055 | 5055 | */ |
| 5056 | -function geodir_on_wp_insert_post( $post_ID, $post, $update ) {
|
|
| 5056 | +function geodir_on_wp_insert_post($post_ID, $post, $update) {
|
|
| 5057 | 5057 | global $gd_set_listing_edited; |
| 5058 | 5058 | |
| 5059 | - if ( ! $update ) {
|
|
| 5059 | + if (!$update) {
|
|
| 5060 | 5060 | return; |
| 5061 | 5061 | } |
| 5062 | 5062 | |
| 5063 | - $action = isset( $_REQUEST['action'] ) ? sanitize_text_field( $_REQUEST['action'] ) : ''; |
|
| 5064 | - $is_admin = is_admin() && ( ! defined( 'DOING_AJAX' ) || ( defined( 'DOING_AJAX' ) && ! DOING_AJAX ) ) ? true : false; |
|
| 5063 | + $action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : ''; |
|
| 5064 | + $is_admin = is_admin() && (!defined('DOING_AJAX') || (defined('DOING_AJAX') && !DOING_AJAX)) ? true : false;
|
|
| 5065 | 5065 | $inline_save = $action == 'inline-save' ? true : false; |
| 5066 | 5066 | |
| 5067 | - if ( empty( $post->post_type ) || $is_admin || $inline_save || ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) ) {
|
|
| 5067 | + if (empty($post->post_type) || $is_admin || $inline_save || (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)) {
|
|
| 5068 | 5068 | return; |
| 5069 | 5069 | } |
| 5070 | 5070 | |
| 5071 | - if ( $action != '' && in_array( $action, array( 'geodir_import_export' ) ) ) {
|
|
| 5071 | + if ($action != '' && in_array($action, array('geodir_import_export'))) {
|
|
| 5072 | 5072 | return; |
| 5073 | 5073 | } |
| 5074 | 5074 | |
| 5075 | 5075 | $user_id = (int) get_current_user_id(); |
| 5076 | 5076 | |
| 5077 | - if ( $user_id > 0 && get_option( 'geodir_notify_post_edited' ) && ! wp_is_post_revision( $post_ID ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 5078 | - $author_id = ! empty( $post->post_author ) ? $post->post_author : 0; |
|
| 5077 | + if ($user_id > 0 && get_option('geodir_notify_post_edited') && !wp_is_post_revision($post_ID) && in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 5078 | + $author_id = !empty($post->post_author) ? $post->post_author : 0; |
|
| 5079 | 5079 | |
| 5080 | - if ( $user_id == $author_id && ! is_super_admin() && empty( $gd_set_listing_edited[$post_ID] ) ) {
|
|
| 5081 | - if ( !empty( $gd_set_listing_edited ) ) {
|
|
| 5080 | + if ($user_id == $author_id && !is_super_admin() && empty($gd_set_listing_edited[$post_ID])) {
|
|
| 5081 | + if (!empty($gd_set_listing_edited)) {
|
|
| 5082 | 5082 | $gd_set_listing_edited = array(); |
| 5083 | 5083 | } |
| 5084 | 5084 | $gd_set_listing_edited[$post_ID] = true; |
@@ -5096,14 +5096,14 @@ discard block |
||
| 5096 | 5096 | * |
| 5097 | 5097 | * @return string|null The current page start & end numbering. |
| 5098 | 5098 | */ |
| 5099 | -function geodir_title_meta_page( $sep ) {
|
|
| 5099 | +function geodir_title_meta_page($sep) {
|
|
| 5100 | 5100 | $replacement = null; |
| 5101 | 5101 | |
| 5102 | - $max = geodir_title_meta_pagenumbering( 'max' ); |
|
| 5103 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); |
|
| 5102 | + $max = geodir_title_meta_pagenumbering('max');
|
|
| 5103 | + $nr = geodir_title_meta_pagenumbering('nr');
|
|
| 5104 | 5104 | |
| 5105 | - if ( $max > 1 && $nr > 1 ) {
|
|
| 5106 | - $replacement = sprintf( $sep . ' ' . __( 'Page %1$d of %2$d', 'geodirectory' ), $nr, $max ); |
|
| 5105 | + if ($max > 1 && $nr > 1) {
|
|
| 5106 | + $replacement = sprintf($sep.' '.__('Page %1$d of %2$d', 'geodirectory'), $nr, $max);
|
|
| 5107 | 5107 | } |
| 5108 | 5108 | |
| 5109 | 5109 | return $replacement; |
@@ -5120,8 +5120,8 @@ discard block |
||
| 5120 | 5120 | function geodir_title_meta_pagenumber() {
|
| 5121 | 5121 | $replacement = null; |
| 5122 | 5122 | |
| 5123 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); |
|
| 5124 | - if ( isset( $nr ) && $nr > 0 ) {
|
|
| 5123 | + $nr = geodir_title_meta_pagenumbering('nr');
|
|
| 5124 | + if (isset($nr) && $nr > 0) {
|
|
| 5125 | 5125 | $replacement = (string) $nr; |
| 5126 | 5126 | } |
| 5127 | 5127 | |
@@ -5139,8 +5139,8 @@ discard block |
||
| 5139 | 5139 | function geodir_title_meta_pagetotal() {
|
| 5140 | 5140 | $replacement = null; |
| 5141 | 5141 | |
| 5142 | - $max = geodir_title_meta_pagenumbering( 'max' ); |
|
| 5143 | - if ( isset( $max ) && $max > 0 ) {
|
|
| 5142 | + $max = geodir_title_meta_pagenumbering('max');
|
|
| 5143 | + if (isset($max) && $max > 0) {
|
|
| 5144 | 5144 | $replacement = (string) $max; |
| 5145 | 5145 | } |
| 5146 | 5146 | |
@@ -5160,36 +5160,36 @@ discard block |
||
| 5160 | 5160 | * |
| 5161 | 5161 | * @return int|null The current page numbering. |
| 5162 | 5162 | */ |
| 5163 | -function geodir_title_meta_pagenumbering( $request = 'nr' ) {
|
|
| 5163 | +function geodir_title_meta_pagenumbering($request = 'nr') {
|
|
| 5164 | 5164 | global $wp_query, $post; |
| 5165 | 5165 | $max_num_pages = null; |
| 5166 | 5166 | $page_number = null; |
| 5167 | 5167 | |
| 5168 | 5168 | $max_num_pages = 1; |
| 5169 | 5169 | |
| 5170 | - if ( ! is_singular() ) {
|
|
| 5171 | - $page_number = get_query_var( 'paged' ); |
|
| 5172 | - if ( $page_number === 0 || $page_number === '' ) {
|
|
| 5170 | + if (!is_singular()) {
|
|
| 5171 | + $page_number = get_query_var('paged');
|
|
| 5172 | + if ($page_number === 0 || $page_number === '') {
|
|
| 5173 | 5173 | $page_number = 1; |
| 5174 | 5174 | } |
| 5175 | 5175 | |
| 5176 | - if ( isset( $wp_query->max_num_pages ) && ( $wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0 ) ) {
|
|
| 5176 | + if (isset($wp_query->max_num_pages) && ($wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0)) {
|
|
| 5177 | 5177 | $max_num_pages = $wp_query->max_num_pages; |
| 5178 | 5178 | } |
| 5179 | 5179 | } else {
|
| 5180 | - $page_number = get_query_var( 'page' ); |
|
| 5181 | - if ( $page_number === 0 || $page_number === '' ) {
|
|
| 5180 | + $page_number = get_query_var('page');
|
|
| 5181 | + if ($page_number === 0 || $page_number === '') {
|
|
| 5182 | 5182 | $page_number = 1; |
| 5183 | 5183 | } |
| 5184 | 5184 | |
| 5185 | - if ( isset( $post->post_content ) ) {
|
|
| 5186 | - $max_num_pages = ( substr_count( $post->post_content, '<!--nextpage-->' ) + 1 ); |
|
| 5185 | + if (isset($post->post_content)) {
|
|
| 5186 | + $max_num_pages = (substr_count($post->post_content, '<!--nextpage-->') + 1); |
|
| 5187 | 5187 | } |
| 5188 | 5188 | } |
| 5189 | 5189 | |
| 5190 | 5190 | $return = null; |
| 5191 | 5191 | |
| 5192 | - switch ( $request ) {
|
|
| 5192 | + switch ($request) {
|
|
| 5193 | 5193 | case 'nr': |
| 5194 | 5194 | $return = $page_number; |
| 5195 | 5195 | break; |
@@ -5210,14 +5210,14 @@ discard block |
||
| 5210 | 5210 | * |
| 5211 | 5211 | * @return array Terms. |
| 5212 | 5212 | */ |
| 5213 | -function geodir_filter_empty_terms( $terms ) {
|
|
| 5214 | - if ( empty( $terms ) ) {
|
|
| 5213 | +function geodir_filter_empty_terms($terms) {
|
|
| 5214 | + if (empty($terms)) {
|
|
| 5215 | 5215 | return $terms; |
| 5216 | 5216 | } |
| 5217 | 5217 | |
| 5218 | 5218 | $return = array(); |
| 5219 | - foreach ( $terms as $term ) {
|
|
| 5220 | - if ( isset( $term->count ) && $term->count > 0 ) {
|
|
| 5219 | + foreach ($terms as $term) {
|
|
| 5220 | + if (isset($term->count) && $term->count > 0) {
|
|
| 5221 | 5221 | $return[] = $term; |
| 5222 | 5222 | } else {
|
| 5223 | 5223 | /** |
@@ -5228,7 +5228,7 @@ discard block |
||
| 5228 | 5228 | * @param array $return The array of terms to return. |
| 5229 | 5229 | * @param object $term The term object. |
| 5230 | 5230 | */ |
| 5231 | - $return = apply_filters( 'geodir_filter_empty_terms_filter', $return, $term ); |
|
| 5231 | + $return = apply_filters('geodir_filter_empty_terms_filter', $return, $term);
|
|
| 5232 | 5232 | } |
| 5233 | 5233 | } |
| 5234 | 5234 | |
@@ -5245,15 +5245,15 @@ discard block |
||
| 5245 | 5245 | * |
| 5246 | 5246 | * @return array |
| 5247 | 5247 | */ |
| 5248 | -function geodir_remove_hentry( $class ) {
|
|
| 5249 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 5250 | - $class = array_diff( $class, array( 'hentry' ) ); |
|
| 5248 | +function geodir_remove_hentry($class) {
|
|
| 5249 | + if (geodir_is_page('detail')) {
|
|
| 5250 | + $class = array_diff($class, array('hentry'));
|
|
| 5251 | 5251 | } |
| 5252 | 5252 | |
| 5253 | 5253 | return $class; |
| 5254 | 5254 | } |
| 5255 | 5255 | |
| 5256 | -add_filter( 'post_class', 'geodir_remove_hentry' ); |
|
| 5256 | +add_filter('post_class', 'geodir_remove_hentry');
|
|
| 5257 | 5257 | |
| 5258 | 5258 | /** |
| 5259 | 5259 | * Registers a individual text string for WPML translation. |
@@ -5265,8 +5265,8 @@ discard block |
||
| 5265 | 5265 | * @param string $domain The plugin domain. Default geodirectory. |
| 5266 | 5266 | * @param string $name The name of the string which helps to know what's being translated. |
| 5267 | 5267 | */ |
| 5268 | -function geodir_wpml_register_string( $string, $domain = 'geodirectory', $name = '' ) {
|
|
| 5269 | - do_action( 'wpml_register_single_string', $domain, $name, $string ); |
|
| 5268 | +function geodir_wpml_register_string($string, $domain = 'geodirectory', $name = '') {
|
|
| 5269 | + do_action('wpml_register_single_string', $domain, $name, $string);
|
|
| 5270 | 5270 | } |
| 5271 | 5271 | |
| 5272 | 5272 | /** |
@@ -5281,8 +5281,8 @@ discard block |
||
| 5281 | 5281 | * @param string $language_code Return the translation in this language. Default is NULL which returns the current language. |
| 5282 | 5282 | * @return string The translated string. |
| 5283 | 5283 | */ |
| 5284 | -function geodir_wpml_translate_string( $string, $domain = 'geodirectory', $name = '', $language_code = NULL ) {
|
|
| 5285 | - return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code ); |
|
| 5284 | +function geodir_wpml_translate_string($string, $domain = 'geodirectory', $name = '', $language_code = NULL) {
|
|
| 5285 | + return apply_filters('wpml_translate_single_string', $string, $domain, $name, $language_code);
|
|
| 5286 | 5286 | } |
| 5287 | 5287 | |
| 5288 | 5288 | /** |
@@ -5297,19 +5297,19 @@ discard block |
||
| 5297 | 5297 | * @param int $post_ID Post ID. |
| 5298 | 5298 | * @param array $data Post data. |
| 5299 | 5299 | */ |
| 5300 | -function geodir_send_listing_edited_notification( $post_ID, $data ) {
|
|
| 5300 | +function geodir_send_listing_edited_notification($post_ID, $data) {
|
|
| 5301 | 5301 | global $gd_notified_edited, $gd_set_listing_edited; |
| 5302 | 5302 | |
| 5303 | - if ( !empty( $gd_set_listing_edited[ $post_ID ] ) && empty( $gd_notified_edited[ $post_ID ] ) ) {
|
|
| 5304 | - if ( !empty( $gd_notified_edited ) ) {
|
|
| 5303 | + if (!empty($gd_set_listing_edited[$post_ID]) && empty($gd_notified_edited[$post_ID])) {
|
|
| 5304 | + if (!empty($gd_notified_edited)) {
|
|
| 5305 | 5305 | $gd_notified_edited = array(); |
| 5306 | 5306 | } |
| 5307 | - $gd_notified_edited[ $post_ID ] = true; |
|
| 5307 | + $gd_notified_edited[$post_ID] = true; |
|
| 5308 | 5308 | |
| 5309 | - $from_email = get_option( 'site_email' ); |
|
| 5309 | + $from_email = get_option('site_email');
|
|
| 5310 | 5310 | $from_name = get_site_emailName(); |
| 5311 | - $to_email = get_option( 'admin_email' ); |
|
| 5312 | - $to_name = get_option( 'name' ); |
|
| 5311 | + $to_email = get_option('admin_email');
|
|
| 5312 | + $to_name = get_option('name');
|
|
| 5313 | 5313 | $message_type = 'listing_edited'; |
| 5314 | 5314 | |
| 5315 | 5315 | $notify_edited = true; |
@@ -5321,11 +5321,11 @@ discard block |
||
| 5321 | 5321 | * @param bool $notify_edited Notify on listing edited by author? |
| 5322 | 5322 | * @param object $post The current post object. |
| 5323 | 5323 | */ |
| 5324 | - $notify_edited = apply_filters( 'geodir_notify_on_listing_edited', $notify_edited, $post_ID ); |
|
| 5324 | + $notify_edited = apply_filters('geodir_notify_on_listing_edited', $notify_edited, $post_ID);
|
|
| 5325 | 5325 | |
| 5326 | - if ( $notify_edited ) {
|
|
| 5327 | - geodir_sendEmail( $from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID ); |
|
| 5326 | + if ($notify_edited) {
|
|
| 5327 | + geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID); |
|
| 5328 | 5328 | } |
| 5329 | 5329 | } |
| 5330 | 5330 | } |
| 5331 | -add_action( 'geodir_after_save_listing', 'geodir_send_listing_edited_notification', 1000, 2 ); |
|
| 5332 | 5331 | \ No newline at end of file |
| 5332 | +add_action('geodir_after_save_listing', 'geodir_send_listing_edited_notification', 1000, 2); |
|
| 5333 | 5333 | \ No newline at end of file |
@@ -2389,12 +2389,12 @@ |
||
| 2389 | 2389 | ?> |
| 2390 | 2390 | <input class="search_text" name="s" |
| 2391 | 2391 | value="<?php if ( isset( $_REQUEST['s'] ) && trim( $_REQUEST['s'] ) != '' ) {
|
| 2392 | - $search_term = esc_attr( stripslashes_deep( $_REQUEST['s'] ) ); |
|
| 2393 | - $search_term = str_replace(array("%E2%80%99","’"),array("%27","'"),$search_term);
|
|
| 2394 | - echo $search_term; |
|
| 2395 | - } else {
|
|
| 2396 | - echo $default_search_for_text; |
|
| 2397 | - } ?>" type="text" |
|
| 2392 | + $search_term = esc_attr( stripslashes_deep( $_REQUEST['s'] ) ); |
|
| 2393 | + $search_term = str_replace(array("%E2%80%99","’"),array("%27","'"),$search_term);
|
|
| 2394 | + echo $search_term; |
|
| 2395 | + } else {
|
|
| 2396 | + echo $default_search_for_text; |
|
| 2397 | + } ?>" type="text" |
|
| 2398 | 2398 | onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql( $default_search_for_text ); ?>';}"
|
| 2399 | 2399 | onfocus="if (this.value == '<?php echo esc_sql( $default_search_for_text ); ?>') {this.value = '';}"
|
| 2400 | 2400 | onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);"> |
@@ -52,31 +52,31 @@ discard block |
||
| 52 | 52 | jQuery(listSel).children('li').switchClass('gridview_onehalf gridview_onethird gridview_onefourth', 'gridview_onefifth', 600);
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - jQuery.post("<?php echo geodir_get_ajax_url();?>&gd_listing_view=" + val, function (data) {
|
|
| 55 | + jQuery.post("<?php echo geodir_get_ajax_url(); ?>&gd_listing_view=" + val, function (data) {
|
|
| 56 | 56 | //alert(data ); |
| 57 | 57 | }); |
| 58 | 58 | } |
| 59 | 59 | </script> |
| 60 | 60 | <div class="geodir-list-view-select"> |
| 61 | 61 | <select name="gd_list_view" id="gd_list_view" onchange="geodir_list_view_select(this);"> |
| 62 | - <?php $listing_view = (int) $gd_session->get( 'gd_listing_view' ); ?> |
|
| 63 | - <option value=""><?php _e( 'View:', 'geodirectory' ); ?></option> |
|
| 62 | + <?php $listing_view = (int) $gd_session->get('gd_listing_view'); ?>
|
|
| 63 | + <option value=""><?php _e('View:', 'geodirectory'); ?></option>
|
|
| 64 | 64 | <option |
| 65 | - value="1" <?php selected( 1, $listing_view ); ?>><?php _e( 'View: List', 'geodirectory' ); ?></option> |
|
| 65 | + value="1" <?php selected(1, $listing_view); ?>><?php _e('View: List', 'geodirectory'); ?></option>
|
|
| 66 | 66 | <option |
| 67 | - value="2" <?php selected( 2, $listing_view ); ?>><?php _e( 'View: Grid 2', 'geodirectory' ); ?></option> |
|
| 67 | + value="2" <?php selected(2, $listing_view); ?>><?php _e('View: Grid 2', 'geodirectory'); ?></option>
|
|
| 68 | 68 | <option |
| 69 | - value="3" <?php selected( 3, $listing_view ); ?>><?php _e( 'View: Grid 3', 'geodirectory' ); ?></option> |
|
| 69 | + value="3" <?php selected(3, $listing_view); ?>><?php _e('View: Grid 3', 'geodirectory'); ?></option>
|
|
| 70 | 70 | <option |
| 71 | - value="4" <?php selected( 4, $listing_view ); ?>><?php _e( 'View: Grid 4', 'geodirectory' ); ?></option> |
|
| 71 | + value="4" <?php selected(4, $listing_view); ?>><?php _e('View: Grid 4', 'geodirectory'); ?></option>
|
|
| 72 | 72 | <option |
| 73 | - value="5" <?php selected( 5, $listing_view ); ?>><?php _e( 'View: Grid 5', 'geodirectory' ); ?></option> |
|
| 73 | + value="5" <?php selected(5, $listing_view); ?>><?php _e('View: Grid 5', 'geodirectory'); ?></option>
|
|
| 74 | 74 | </select> |
| 75 | 75 | </div> |
| 76 | 76 | <?php |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | -add_action( 'geodir_before_listing', 'geodir_list_view_select', 100 ); |
|
| 79 | +add_action('geodir_before_listing', 'geodir_list_view_select', 100);
|
|
| 80 | 80 | |
| 81 | 81 | /** |
| 82 | 82 | * Limit the listing excerpt. |
@@ -91,9 +91,9 @@ discard block |
||
| 91 | 91 | * @global object $post The current post object. |
| 92 | 92 | * @return string The modified excerpt. |
| 93 | 93 | */ |
| 94 | -function geodir_max_excerpt( $charlength ) {
|
|
| 94 | +function geodir_max_excerpt($charlength) {
|
|
| 95 | 95 | global $post; |
| 96 | - if ( $charlength == '0' ) {
|
|
| 96 | + if ($charlength == '0') {
|
|
| 97 | 97 | return; |
| 98 | 98 | } |
| 99 | 99 | $out = ''; |
@@ -101,46 +101,46 @@ discard block |
||
| 101 | 101 | $temp_post = $post; |
| 102 | 102 | $excerpt = get_the_excerpt(); |
| 103 | 103 | |
| 104 | - $charlength ++; |
|
| 105 | - $excerpt_more = function_exists( 'geodirf_excerpt_more' ) ? geodirf_excerpt_more( '' ) : geodir_excerpt_more( '' ); |
|
| 106 | - if ( geodir_utf8_strlen( $excerpt ) > $charlength ) {
|
|
| 107 | - if ( geodir_utf8_strlen( $excerpt_more ) > 0 && geodir_utf8_strpos( $excerpt, $excerpt_more ) !== false ) {
|
|
| 108 | - $excut = - ( geodir_utf8_strlen( $excerpt_more ) ); |
|
| 109 | - $subex = geodir_utf8_substr( $excerpt, 0, $excut ); |
|
| 110 | - if ( $charlength > 0 && geodir_utf8_strlen( $subex ) > $charlength ) {
|
|
| 111 | - $subex = geodir_utf8_substr( $subex, 0, $charlength ); |
|
| 104 | + $charlength++; |
|
| 105 | + $excerpt_more = function_exists('geodirf_excerpt_more') ? geodirf_excerpt_more('') : geodir_excerpt_more('');
|
|
| 106 | + if (geodir_utf8_strlen($excerpt) > $charlength) {
|
|
| 107 | + if (geodir_utf8_strlen($excerpt_more) > 0 && geodir_utf8_strpos($excerpt, $excerpt_more) !== false) {
|
|
| 108 | + $excut = - (geodir_utf8_strlen($excerpt_more)); |
|
| 109 | + $subex = geodir_utf8_substr($excerpt, 0, $excut); |
|
| 110 | + if ($charlength > 0 && geodir_utf8_strlen($subex) > $charlength) {
|
|
| 111 | + $subex = geodir_utf8_substr($subex, 0, $charlength); |
|
| 112 | 112 | } |
| 113 | 113 | $out .= $subex; |
| 114 | 114 | } else {
|
| 115 | - $subex = geodir_utf8_substr( $excerpt, 0, $charlength - 5 ); |
|
| 116 | - $exwords = explode( ' ', $subex ); |
|
| 117 | - $excut = - ( geodir_utf8_strlen( $exwords[ count( $exwords ) - 1 ] ) ); |
|
| 118 | - if ( $excut < 0 ) {
|
|
| 119 | - $out .= geodir_utf8_substr( $subex, 0, $excut ); |
|
| 115 | + $subex = geodir_utf8_substr($excerpt, 0, $charlength - 5); |
|
| 116 | + $exwords = explode(' ', $subex);
|
|
| 117 | + $excut = - (geodir_utf8_strlen($exwords[count($exwords) - 1])); |
|
| 118 | + if ($excut < 0) {
|
|
| 119 | + $out .= geodir_utf8_substr($subex, 0, $excut); |
|
| 120 | 120 | } else {
|
| 121 | 121 | $out .= $subex; |
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | - $out .= ' <a class="excerpt-read-more" href="' . get_permalink() . '" title="' . get_the_title() . '">'; |
|
| 124 | + $out .= ' <a class="excerpt-read-more" href="'.get_permalink().'" title="'.get_the_title().'">'; |
|
| 125 | 125 | /** |
| 126 | 126 | * Filter excerpt read more text. |
| 127 | 127 | * |
| 128 | 128 | * @since 1.0.0 |
| 129 | 129 | */ |
| 130 | - $out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) ); |
|
| 130 | + $out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));
|
|
| 131 | 131 | $out .= '</a>'; |
| 132 | 132 | |
| 133 | 133 | } else {
|
| 134 | - if ( geodir_utf8_strlen( $excerpt_more ) > 0 && geodir_utf8_strpos( $excerpt, $excerpt_more ) !== false ) {
|
|
| 135 | - $excut = - ( geodir_utf8_strlen( $excerpt_more ) ); |
|
| 136 | - $out .= geodir_utf8_substr( $excerpt, 0, $excut ); |
|
| 137 | - $out .= ' <a class="excerpt-read-more" href="' . get_permalink() . '" title="' . get_the_title() . '">'; |
|
| 134 | + if (geodir_utf8_strlen($excerpt_more) > 0 && geodir_utf8_strpos($excerpt, $excerpt_more) !== false) {
|
|
| 135 | + $excut = - (geodir_utf8_strlen($excerpt_more)); |
|
| 136 | + $out .= geodir_utf8_substr($excerpt, 0, $excut); |
|
| 137 | + $out .= ' <a class="excerpt-read-more" href="'.get_permalink().'" title="'.get_the_title().'">'; |
|
| 138 | 138 | /** |
| 139 | 139 | * Filter excerpt read more text. |
| 140 | 140 | * |
| 141 | 141 | * @since 1.0.0 |
| 142 | 142 | */ |
| 143 | - $out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) ); |
|
| 143 | + $out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));
|
|
| 144 | 144 | $out .= '</a>'; |
| 145 | 145 | } else {
|
| 146 | 146 | $out .= $excerpt; |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | * |
| 164 | 164 | * @return object Returns filtered package info as an object. |
| 165 | 165 | */ |
| 166 | -function geodir_post_package_info( $package_info, $post = '', $post_type = '' ) {
|
|
| 166 | +function geodir_post_package_info($package_info, $post = '', $post_type = '') {
|
|
| 167 | 167 | $package_info['pid'] = 0; |
| 168 | 168 | $package_info['days'] = 0; |
| 169 | 169 | $package_info['amount'] = 0; |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | * @param object|string $post The post object. |
| 193 | 193 | * @param string $post_type The post type. |
| 194 | 194 | */ |
| 195 | - return (object) apply_filters( 'geodir_post_package_info', $package_info, $post, $post_type ); |
|
| 195 | + return (object) apply_filters('geodir_post_package_info', $package_info, $post, $post_type);
|
|
| 196 | 196 | |
| 197 | 197 | } |
| 198 | 198 | |
@@ -220,11 +220,11 @@ discard block |
||
| 220 | 220 | * |
| 221 | 221 | * } |
| 222 | 222 | */ |
| 223 | -function geodir_send_inquiry( $request ) {
|
|
| 223 | +function geodir_send_inquiry($request) {
|
|
| 224 | 224 | global $wpdb; |
| 225 | 225 | |
| 226 | 226 | // strip slashes from text |
| 227 | - $request = ! empty( $request ) ? stripslashes_deep( $request ) : $request; |
|
| 227 | + $request = !empty($request) ? stripslashes_deep($request) : $request; |
|
| 228 | 228 | |
| 229 | 229 | $yourname = sanitize_text_field($request['inq_name']); |
| 230 | 230 | $youremail = sanitize_email($request['inq_email']); |
@@ -232,25 +232,25 @@ discard block |
||
| 232 | 232 | $frnd_comments = sanitize_text_field($request['inq_msg']); |
| 233 | 233 | $pid = absint($request['pid']); |
| 234 | 234 | |
| 235 | - $author_id = ''; |
|
| 235 | + $author_id = ''; |
|
| 236 | 236 | |
| 237 | - if ( $pid && 'publish' == get_post_status ( $pid ) ) {
|
|
| 237 | + if ($pid && 'publish' == get_post_status($pid)) {
|
|
| 238 | 238 | |
| 239 | - check_ajax_referer( 'send_inquiry_'.$pid ); |
|
| 239 | + check_ajax_referer('send_inquiry_'.$pid);
|
|
| 240 | 240 | |
| 241 | 241 | $p_post = get_post($pid); |
| 242 | 242 | |
| 243 | - $author_id = $p_post->post_author; |
|
| 243 | + $author_id = $p_post->post_author; |
|
| 244 | 244 | |
| 245 | - }else{
|
|
| 245 | + } else {
|
|
| 246 | 246 | gd_die(); |
| 247 | 247 | } |
| 248 | 248 | |
| 249 | - $to_email = geodir_get_post_meta( $pid, 'geodir_email', true ); |
|
| 250 | - $to_name = geodir_get_client_name( $author_id ); |
|
| 249 | + $to_email = geodir_get_post_meta($pid, 'geodir_email', true); |
|
| 250 | + $to_name = geodir_get_client_name($author_id); |
|
| 251 | 251 | |
| 252 | - if ( $to_email == '' ) {
|
|
| 253 | - $to_email = get_option( 'admin_email' ); |
|
| 252 | + if ($to_email == '') {
|
|
| 253 | + $to_email = get_option('admin_email');
|
|
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | /** |
@@ -271,10 +271,10 @@ discard block |
||
| 271 | 271 | * } |
| 272 | 272 | * @param string $type The form type, default: `Enquiry`. |
| 273 | 273 | */ |
| 274 | - do_action( 'geodir_after_send_enquiry', $request, 'Enquiry' ); |
|
| 274 | + do_action('geodir_after_send_enquiry', $request, 'Enquiry');
|
|
| 275 | 275 | |
| 276 | 276 | $client_message = $frnd_comments; |
| 277 | - $client_message .= '<br>' . __( 'From :', 'geodirectory' ) . ' ' . $yourname . '<br>' . __( 'Phone :', 'geodirectory' ) . ' ' . $inq_phone . '<br>' . __( 'Email :', 'geodirectory' ) . ' ' . $youremail . '<br><br>' . __( 'Sent from', 'geodirectory' ) . ' - <b><a href="' . trailingslashit( home_url() ) . '">' . get_option( 'blogname' ) . '</a></b>.'; |
|
| 277 | + $client_message .= '<br>'.__('From :', 'geodirectory').' '.$yourname.'<br>'.__('Phone :', 'geodirectory').' '.$inq_phone.'<br>'.__('Email :', 'geodirectory').' '.$youremail.'<br><br>'.__('Sent from', 'geodirectory').' - <b><a href="'.trailingslashit(home_url()).'">'.get_option('blogname').'</a></b>.';
|
|
| 278 | 278 | /** |
| 279 | 279 | * Filter client message text. |
| 280 | 280 | * |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | * |
| 283 | 283 | * @param string $client_message Client message text. |
| 284 | 284 | */ |
| 285 | - $client_message = apply_filters( 'geodir_inquiry_email_msg', $client_message ); |
|
| 285 | + $client_message = apply_filters('geodir_inquiry_email_msg', $client_message);
|
|
| 286 | 286 | |
| 287 | 287 | /** |
| 288 | 288 | * Called before the send enquiry email is sent. |
@@ -301,12 +301,12 @@ discard block |
||
| 301 | 301 | * |
| 302 | 302 | * } |
| 303 | 303 | */ |
| 304 | - do_action( 'geodir_before_send_enquiry_email', $request ); |
|
| 305 | - if ( $to_email ) {
|
|
| 304 | + do_action('geodir_before_send_enquiry_email', $request);
|
|
| 305 | + if ($to_email) {
|
|
| 306 | 306 | // strip slashes message |
| 307 | - $client_message = stripslashes_deep( $client_message ); |
|
| 307 | + $client_message = stripslashes_deep($client_message); |
|
| 308 | 308 | |
| 309 | - geodir_sendEmail( $youremail, $yourname, $to_email, $to_name, '', $client_message, $extra = '', 'send_enquiry', $request['pid'] );//To client email |
|
| 309 | + geodir_sendEmail($youremail, $yourname, $to_email, $to_name, '', $client_message, $extra = '', 'send_enquiry', $request['pid']); //To client email |
|
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | /** |
@@ -326,12 +326,12 @@ discard block |
||
| 326 | 326 | * |
| 327 | 327 | * } |
| 328 | 328 | */ |
| 329 | - do_action( 'geodir_after_send_enquiry_email', $request ); |
|
| 330 | - $url = get_permalink( $pid ); |
|
| 331 | - if ( strstr( $url, '?' ) ) {
|
|
| 332 | - $url = $url . "&send_inquiry=success"; |
|
| 329 | + do_action('geodir_after_send_enquiry_email', $request);
|
|
| 330 | + $url = get_permalink($pid); |
|
| 331 | + if (strstr($url, '?')) {
|
|
| 332 | + $url = $url."&send_inquiry=success"; |
|
| 333 | 333 | } else {
|
| 334 | - $url = $url . "?send_inquiry=success"; |
|
| 334 | + $url = $url."?send_inquiry=success"; |
|
| 335 | 335 | } |
| 336 | 336 | /** |
| 337 | 337 | * Filter redirect url after the send enquiry email is sent. |
@@ -340,8 +340,8 @@ discard block |
||
| 340 | 340 | * |
| 341 | 341 | * @param string $url Redirect url. |
| 342 | 342 | */ |
| 343 | - $url = apply_filters( 'geodir_send_enquiry_after_submit_redirect', $url ); |
|
| 344 | - wp_redirect( $url ); |
|
| 343 | + $url = apply_filters('geodir_send_enquiry_after_submit_redirect', $url);
|
|
| 344 | + wp_redirect($url); |
|
| 345 | 345 | gd_die(); |
| 346 | 346 | |
| 347 | 347 | } |
@@ -372,11 +372,11 @@ discard block |
||
| 372 | 372 | * |
| 373 | 373 | * @deprecated 1.6.26 |
| 374 | 374 | */ |
| 375 | -function geodir_send_friend( $request ) {
|
|
| 375 | +function geodir_send_friend($request) {
|
|
| 376 | 376 | global $wpdb; |
| 377 | 377 | |
| 378 | 378 | // strip slashes from text |
| 379 | - $request = ! empty( $request ) ? stripslashes_deep( $request ) : $request; |
|
| 379 | + $request = !empty($request) ? stripslashes_deep($request) : $request; |
|
| 380 | 380 | |
| 381 | 381 | $yourname = sanitize_text_field($request['yourname']); |
| 382 | 382 | $youremail = sanitize_email($request['youremail']); |
@@ -385,11 +385,11 @@ discard block |
||
| 385 | 385 | $pid = absint($request['pid']); |
| 386 | 386 | $to_email = sanitize_email($request['to_email']); |
| 387 | 387 | $to_name = sanitize_text_field($request['to_name']); |
| 388 | - if ( $pid && 'publish' == get_post_status ( $pid ) ) {
|
|
| 388 | + if ($pid && 'publish' == get_post_status($pid)) {
|
|
| 389 | 389 | |
| 390 | - check_ajax_referer( 'send_to_frnd_'.$pid ); |
|
| 390 | + check_ajax_referer('send_to_frnd_'.$pid);
|
|
| 391 | 391 | |
| 392 | - }else{
|
|
| 392 | + } else {
|
|
| 393 | 393 | gd_die(); |
| 394 | 394 | } |
| 395 | 395 | |
@@ -412,8 +412,8 @@ discard block |
||
| 412 | 412 | * |
| 413 | 413 | * } |
| 414 | 414 | */ |
| 415 | - do_action( 'geodir_before_send_to_friend_email', $request ); |
|
| 416 | - geodir_sendEmail( $youremail, $yourname, $to_email, $to_name, $frnd_subject, $frnd_comments, $extra = '', 'send_friend', $request['pid'] );//To client email |
|
| 415 | + do_action('geodir_before_send_to_friend_email', $request);
|
|
| 416 | + geodir_sendEmail($youremail, $yourname, $to_email, $to_name, $frnd_subject, $frnd_comments, $extra = '', 'send_friend', $request['pid']); //To client email |
|
| 417 | 417 | |
| 418 | 418 | /** |
| 419 | 419 | * Called after the send to friend email is sent. |
@@ -434,13 +434,13 @@ discard block |
||
| 434 | 434 | * |
| 435 | 435 | * } |
| 436 | 436 | */ |
| 437 | - do_action( 'geodir_after_send_to_friend_email', $request ); |
|
| 437 | + do_action('geodir_after_send_to_friend_email', $request);
|
|
| 438 | 438 | |
| 439 | - $url = get_permalink( $pid ); |
|
| 440 | - if ( strstr( $url, '?' ) ) {
|
|
| 441 | - $url = $url . "&sendtofrnd=success"; |
|
| 439 | + $url = get_permalink($pid); |
|
| 440 | + if (strstr($url, '?')) {
|
|
| 441 | + $url = $url."&sendtofrnd=success"; |
|
| 442 | 442 | } else {
|
| 443 | - $url = $url . "?sendtofrnd=success"; |
|
| 443 | + $url = $url."?sendtofrnd=success"; |
|
| 444 | 444 | } |
| 445 | 445 | /** |
| 446 | 446 | * Filter redirect url after the send to friend email is sent. |
@@ -449,8 +449,8 @@ discard block |
||
| 449 | 449 | * |
| 450 | 450 | * @param string $url Redirect url. |
| 451 | 451 | */ |
| 452 | - $url = apply_filters( 'geodir_send_to_friend_after_submit_redirect', $url ); |
|
| 453 | - wp_redirect( $url ); |
|
| 452 | + $url = apply_filters('geodir_send_to_friend_after_submit_redirect', $url);
|
|
| 453 | + wp_redirect($url); |
|
| 454 | 454 | gd_die(); |
| 455 | 455 | } |
| 456 | 456 | |
@@ -464,8 +464,8 @@ discard block |
||
| 464 | 464 | * |
| 465 | 465 | * @param string $hash_key |
| 466 | 466 | */ |
| 467 | -function geodir_before_tab_content( $hash_key ) {
|
|
| 468 | - switch ( $hash_key ) {
|
|
| 467 | +function geodir_before_tab_content($hash_key) {
|
|
| 468 | + switch ($hash_key) {
|
|
| 469 | 469 | case 'post_info' : |
| 470 | 470 | echo '<div class="geodir-company_info field-group">'; |
| 471 | 471 | break; |
@@ -475,7 +475,7 @@ discard block |
||
| 475 | 475 | * |
| 476 | 476 | * @since 1.0.0 |
| 477 | 477 | */ |
| 478 | - echo ' <div id="' . apply_filters( 'geodir_post_gallery_id', 'geodir-post-gallery' ) . '" class="clearfix" >'; |
|
| 478 | + echo ' <div id="'.apply_filters('geodir_post_gallery_id', 'geodir-post-gallery').'" class="clearfix" >';
|
|
| 479 | 479 | break; |
| 480 | 480 | case 'reviews' : |
| 481 | 481 | echo '<div id="reviews-wrap" class="clearfix"> '; |
@@ -499,8 +499,8 @@ discard block |
||
| 499 | 499 | * |
| 500 | 500 | * @param string $hash_key |
| 501 | 501 | */ |
| 502 | -function geodir_after_tab_content( $hash_key ) {
|
|
| 503 | - switch ( $hash_key ) {
|
|
| 502 | +function geodir_after_tab_content($hash_key) {
|
|
| 503 | + switch ($hash_key) {
|
|
| 504 | 504 | case 'post_info' : |
| 505 | 505 | echo '</div>'; |
| 506 | 506 | break; |
@@ -531,25 +531,25 @@ discard block |
||
| 531 | 531 | * @global object $wpdb WordPress Database object. |
| 532 | 532 | * @return bool|null|string Returns default sort results, when the post type is valid. Otherwise returns false. |
| 533 | 533 | */ |
| 534 | -function geodir_get_posts_default_sort( $post_type ) {
|
|
| 534 | +function geodir_get_posts_default_sort($post_type) {
|
|
| 535 | 535 | |
| 536 | 536 | global $wpdb; |
| 537 | 537 | |
| 538 | - if ( $post_type != '' ) {
|
|
| 538 | + if ($post_type != '') {
|
|
| 539 | 539 | |
| 540 | 540 | $all_postypes = geodir_get_posttypes(); |
| 541 | 541 | |
| 542 | - if ( ! in_array( $post_type, $all_postypes ) ) {
|
|
| 542 | + if (!in_array($post_type, $all_postypes)) {
|
|
| 543 | 543 | return false; |
| 544 | 544 | } |
| 545 | 545 | |
| 546 | - $sort_field_info = $wpdb->get_var( $wpdb->prepare( "select default_order from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type= %s and is_active=%d and is_default=%d", array( |
|
| 546 | + $sort_field_info = $wpdb->get_var($wpdb->prepare("select default_order from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where post_type= %s and is_active=%d and is_default=%d", array(
|
|
| 547 | 547 | $post_type, |
| 548 | 548 | 1, |
| 549 | 549 | 1 |
| 550 | - ) ) ); |
|
| 550 | + ))); |
|
| 551 | 551 | |
| 552 | - if ( ! empty( $sort_field_info ) ) {
|
|
| 552 | + if (!empty($sort_field_info)) {
|
|
| 553 | 553 | return $sort_field_info; |
| 554 | 554 | } |
| 555 | 555 | |
@@ -569,20 +569,20 @@ discard block |
||
| 569 | 569 | * @global object $wpdb WordPress Database object. |
| 570 | 570 | * @return bool|mixed|void Returns sort results, when the post type is valid. Otherwise returns false. |
| 571 | 571 | */ |
| 572 | -function geodir_get_sort_options( $post_type ) {
|
|
| 572 | +function geodir_get_sort_options($post_type) {
|
|
| 573 | 573 | global $wpdb; |
| 574 | 574 | |
| 575 | - if ( $post_type != '' ) {
|
|
| 575 | + if ($post_type != '') {
|
|
| 576 | 576 | $all_postypes = geodir_get_posttypes(); |
| 577 | 577 | |
| 578 | - if ( ! in_array( $post_type, $all_postypes ) ) {
|
|
| 578 | + if (!in_array($post_type, $all_postypes)) {
|
|
| 579 | 579 | return false; |
| 580 | 580 | } |
| 581 | 581 | |
| 582 | - $sort_field_info = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type=%s AND is_active=%d AND (sort_asc=1 || sort_desc=1 || field_type='random') AND field_type != 'address' ORDER BY sort_order ASC", array( |
|
| 582 | + $sort_field_info = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type=%s AND is_active=%d AND (sort_asc=1 || sort_desc=1 || field_type='random') AND field_type != 'address' ORDER BY sort_order ASC", array(
|
|
| 583 | 583 | $post_type, |
| 584 | 584 | 1 |
| 585 | - ) ) ); |
|
| 585 | + ))); |
|
| 586 | 586 | |
| 587 | 587 | /** |
| 588 | 588 | * Filter post sort options. |
@@ -592,7 +592,7 @@ discard block |
||
| 592 | 592 | * @param array $sort_field_info Unfiltered sort field array. |
| 593 | 593 | * @param string $post_type Post type. |
| 594 | 594 | */ |
| 595 | - return apply_filters( 'geodir_get_sort_options', $sort_field_info, $post_type ); |
|
| 595 | + return apply_filters('geodir_get_sort_options', $sort_field_info, $post_type);
|
|
| 596 | 596 | } |
| 597 | 597 | |
| 598 | 598 | } |
@@ -613,63 +613,63 @@ discard block |
||
| 613 | 613 | * |
| 614 | 614 | * @since 1.4.4 |
| 615 | 615 | */ |
| 616 | - if ( is_search() ) {
|
|
| 616 | + if (is_search()) {
|
|
| 617 | 617 | return; |
| 618 | 618 | } |
| 619 | 619 | |
| 620 | 620 | $sort_by = ''; |
| 621 | 621 | |
| 622 | - if ( isset( $_REQUEST['sort_by'] ) ) {
|
|
| 622 | + if (isset($_REQUEST['sort_by'])) {
|
|
| 623 | 623 | $sort_by = $_REQUEST['sort_by']; |
| 624 | 624 | } |
| 625 | 625 | |
| 626 | 626 | $gd_post_type = geodir_get_current_posttype(); |
| 627 | 627 | |
| 628 | - $sort_options = geodir_get_sort_options( $gd_post_type ); |
|
| 628 | + $sort_options = geodir_get_sort_options($gd_post_type); |
|
| 629 | 629 | |
| 630 | 630 | |
| 631 | 631 | $sort_field_options = ''; |
| 632 | 632 | |
| 633 | - if ( ! empty( $sort_options ) ) {
|
|
| 634 | - foreach ( $sort_options as $sort ) {
|
|
| 635 | - $sort = stripslashes_deep( $sort ); // strip slashes |
|
| 633 | + if (!empty($sort_options)) {
|
|
| 634 | + foreach ($sort_options as $sort) {
|
|
| 635 | + $sort = stripslashes_deep($sort); // strip slashes |
|
| 636 | 636 | |
| 637 | - $label = __( $sort->site_title, 'geodirectory' ); |
|
| 637 | + $label = __($sort->site_title, 'geodirectory'); |
|
| 638 | 638 | |
| 639 | - if ( $sort->field_type == 'random' ) {
|
|
| 639 | + if ($sort->field_type == 'random') {
|
|
| 640 | 640 | $key = $sort->field_type; |
| 641 | - ( $sort_by == $key || ( $sort->is_default == '1' && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = ''; |
|
| 642 | - $sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>'; |
|
| 641 | + ($sort_by == $key || ($sort->is_default == '1' && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = ''; |
|
| 642 | + $sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';
|
|
| 643 | 643 | } |
| 644 | 644 | |
| 645 | - if ( $sort->htmlvar_name == 'comment_count' ) {
|
|
| 645 | + if ($sort->htmlvar_name == 'comment_count') {
|
|
| 646 | 646 | $sort->htmlvar_name = 'rating_count'; |
| 647 | 647 | } |
| 648 | 648 | |
| 649 | - if ( $sort->sort_asc ) {
|
|
| 650 | - $key = $sort->htmlvar_name . '_asc'; |
|
| 649 | + if ($sort->sort_asc) {
|
|
| 650 | + $key = $sort->htmlvar_name.'_asc'; |
|
| 651 | 651 | $label = $sort->site_title; |
| 652 | - if ( $sort->asc_title ) {
|
|
| 652 | + if ($sort->asc_title) {
|
|
| 653 | 653 | $label = $sort->asc_title; |
| 654 | 654 | } |
| 655 | - ( $sort_by == $key || ( $sort->is_default == '1' && $sort->default_order == $key && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = ''; |
|
| 656 | - $sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>'; |
|
| 655 | + ($sort_by == $key || ($sort->is_default == '1' && $sort->default_order == $key && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = ''; |
|
| 656 | + $sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';
|
|
| 657 | 657 | } |
| 658 | 658 | |
| 659 | - if ( $sort->sort_desc ) {
|
|
| 660 | - $key = $sort->htmlvar_name . '_desc'; |
|
| 659 | + if ($sort->sort_desc) {
|
|
| 660 | + $key = $sort->htmlvar_name.'_desc'; |
|
| 661 | 661 | $label = $sort->site_title; |
| 662 | - if ( $sort->desc_title ) {
|
|
| 662 | + if ($sort->desc_title) {
|
|
| 663 | 663 | $label = $sort->desc_title; |
| 664 | 664 | } |
| 665 | - ( $sort_by == $key || ( $sort->is_default == '1' && $sort->default_order == $key && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = ''; |
|
| 666 | - $sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>'; |
|
| 665 | + ($sort_by == $key || ($sort->is_default == '1' && $sort->default_order == $key && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = ''; |
|
| 666 | + $sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';
|
|
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | } |
| 670 | 670 | } |
| 671 | 671 | |
| 672 | - if ( $sort_field_options != '' ) {
|
|
| 672 | + if ($sort_field_options != '') {
|
|
| 673 | 673 | |
| 674 | 674 | ?> |
| 675 | 675 | |
@@ -678,9 +678,9 @@ discard block |
||
| 678 | 678 | <select name="sort_by" id="sort_by" onchange="javascript:window.location=this.value;"> |
| 679 | 679 | |
| 680 | 680 | <option |
| 681 | - value="<?php echo esc_url( add_query_arg( 'sort_by', '' ) ); ?>" <?php if ( $sort_by == '' ) {
|
|
| 681 | + value="<?php echo esc_url(add_query_arg('sort_by', '')); ?>" <?php if ($sort_by == '') {
|
|
| 682 | 682 | echo 'selected="selected"'; |
| 683 | - } ?>><?php _e( 'Sort By', 'geodirectory' ); ?></option><?php |
|
| 683 | + } ?>><?php _e('Sort By', 'geodirectory'); ?></option><?php
|
|
| 684 | 684 | |
| 685 | 685 | echo $sort_field_options; ?> |
| 686 | 686 | |
@@ -708,9 +708,9 @@ discard block |
||
| 708 | 708 | * |
| 709 | 709 | * @return string Returns the section title. |
| 710 | 710 | */ |
| 711 | -function geodir_advance_customfields_heading( $title, $field_type ) {
|
|
| 711 | +function geodir_advance_customfields_heading($title, $field_type) {
|
|
| 712 | 712 | |
| 713 | - if ( in_array( $field_type, array( 'multiselect', 'textarea', 'taxonomy' ) ) ) {
|
|
| 713 | + if (in_array($field_type, array('multiselect', 'textarea', 'taxonomy'))) {
|
|
| 714 | 714 | $title = ''; |
| 715 | 715 | } |
| 716 | 716 | |
@@ -732,30 +732,30 @@ discard block |
||
| 732 | 732 | * @global object $gd_session GeoDirectory Session object. |
| 733 | 733 | * @return string Returns related posts html. |
| 734 | 734 | */ |
| 735 | -function geodir_related_posts_display( $request ) {
|
|
| 736 | - if ( ! empty( $request ) ) {
|
|
| 737 | - $before_title = ( isset( $request['before_title'] ) && ! empty( $request['before_title'] ) ) ? $request['before_title'] : ''; |
|
| 738 | - $after_title = ( isset( $request['after_title'] ) && ! empty( $request['after_title'] ) ) ? $request['after_title'] : ''; |
|
| 739 | - |
|
| 740 | - $title = ( isset( $request['title'] ) && ! empty( $request['title'] ) ) ? $request['title'] : __( 'Related Listings', 'geodirectory' ); |
|
| 741 | - $post_number = ( isset( $request['post_number'] ) && ! empty( $request['post_number'] ) ) ? $request['post_number'] : '5'; |
|
| 742 | - $relate_to = ( isset( $request['relate_to'] ) && ! empty( $request['relate_to'] ) ) ? $request['relate_to'] : 'category'; |
|
| 743 | - $layout = ( isset( $request['layout'] ) && ! empty( $request['layout'] ) ) ? $request['layout'] : 'gridview_onehalf'; |
|
| 744 | - $add_location_filter = ( isset( $request['add_location_filter'] ) && ! empty( $request['add_location_filter'] ) ) ? $request['add_location_filter'] : '0'; |
|
| 745 | - $listing_width = ( isset( $request['listing_width'] ) && ! empty( $request['listing_width'] ) ) ? $request['listing_width'] : ''; |
|
| 746 | - $list_sort = ( isset( $request['list_sort'] ) && ! empty( $request['list_sort'] ) ) ? $request['list_sort'] : 'latest'; |
|
| 747 | - $character_count = ( isset( $request['character_count'] ) && ! empty( $request['character_count'] ) ) ? $request['character_count'] : ''; |
|
| 735 | +function geodir_related_posts_display($request) {
|
|
| 736 | + if (!empty($request)) {
|
|
| 737 | + $before_title = (isset($request['before_title']) && !empty($request['before_title'])) ? $request['before_title'] : ''; |
|
| 738 | + $after_title = (isset($request['after_title']) && !empty($request['after_title'])) ? $request['after_title'] : ''; |
|
| 739 | + |
|
| 740 | + $title = (isset($request['title']) && !empty($request['title'])) ? $request['title'] : __('Related Listings', 'geodirectory');
|
|
| 741 | + $post_number = (isset($request['post_number']) && !empty($request['post_number'])) ? $request['post_number'] : '5'; |
|
| 742 | + $relate_to = (isset($request['relate_to']) && !empty($request['relate_to'])) ? $request['relate_to'] : 'category'; |
|
| 743 | + $layout = (isset($request['layout']) && !empty($request['layout'])) ? $request['layout'] : 'gridview_onehalf'; |
|
| 744 | + $add_location_filter = (isset($request['add_location_filter']) && !empty($request['add_location_filter'])) ? $request['add_location_filter'] : '0'; |
|
| 745 | + $listing_width = (isset($request['listing_width']) && !empty($request['listing_width'])) ? $request['listing_width'] : ''; |
|
| 746 | + $list_sort = (isset($request['list_sort']) && !empty($request['list_sort'])) ? $request['list_sort'] : 'latest'; |
|
| 747 | + $character_count = (isset($request['character_count']) && !empty($request['character_count'])) ? $request['character_count'] : ''; |
|
| 748 | 748 | |
| 749 | 749 | global $wpdb, $post, $gd_session, $related_nearest, $related_parent_lat, $related_parent_lon; |
| 750 | - $related_parent_lat = !empty($post->post_latitude) && geodir_is_page( 'detail' ) ? $post->post_latitude : ''; |
|
| 751 | - $related_parent_lon = !empty($post->post_longitude) && geodir_is_page( 'detail' ) ? $post->post_longitude : ''; |
|
| 750 | + $related_parent_lat = !empty($post->post_latitude) && geodir_is_page('detail') ? $post->post_latitude : '';
|
|
| 751 | + $related_parent_lon = !empty($post->post_longitude) && geodir_is_page('detail') ? $post->post_longitude : '';
|
|
| 752 | 752 | $arr_detail_page_tabs = geodir_detail_page_tabs_list(); |
| 753 | 753 | |
| 754 | 754 | $related_listing_array = array(); |
| 755 | - if ( get_option( 'geodir_add_related_listing_posttypes' ) ) {
|
|
| 756 | - $related_listing_array = get_option( 'geodir_add_related_listing_posttypes' ); |
|
| 755 | + if (get_option('geodir_add_related_listing_posttypes')) {
|
|
| 756 | + $related_listing_array = get_option('geodir_add_related_listing_posttypes');
|
|
| 757 | 757 | } |
| 758 | - if ( isset($post->post_type) && in_array( $post->post_type, $related_listing_array ) ) {
|
|
| 758 | + if (isset($post->post_type) && in_array($post->post_type, $related_listing_array)) {
|
|
| 759 | 759 | $arr_detail_page_tabs['related_listing']['is_display'] = true; |
| 760 | 760 | } |
| 761 | 761 | |
@@ -767,90 +767,90 @@ discard block |
||
| 767 | 767 | $tax_field = 'id'; |
| 768 | 768 | $category = array(); |
| 769 | 769 | |
| 770 | - if ( isset( $_REQUEST['backandedit'] ) ) {
|
|
| 771 | - $post = (object) $gd_session->get( 'listing' ); |
|
| 770 | + if (isset($_REQUEST['backandedit'])) {
|
|
| 771 | + $post = (object) $gd_session->get('listing');
|
|
| 772 | 772 | $post_type = $post->listing_type; |
| 773 | - if ( isset( $_REQUEST['pid'] ) && $_REQUEST['pid'] != '' ) {
|
|
| 773 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 774 | 774 | $post_id = $_REQUEST['pid']; |
| 775 | 775 | } |
| 776 | - } elseif ( isset( $_REQUEST['pid'] ) && $_REQUEST['pid'] != '' ) {
|
|
| 777 | - $post = geodir_get_post_info( $_REQUEST['pid'] ); |
|
| 776 | + } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 777 | + $post = geodir_get_post_info($_REQUEST['pid']); |
|
| 778 | 778 | $post_type = $post->post_type; |
| 779 | 779 | $post_id = $_REQUEST['pid']; |
| 780 | - } elseif ( isset( $post->post_type ) && $post->post_type != '' ) {
|
|
| 780 | + } elseif (isset($post->post_type) && $post->post_type != '') {
|
|
| 781 | 781 | $post_type = $post->post_type; |
| 782 | 782 | $post_id = $post->ID; |
| 783 | 783 | } |
| 784 | 784 | |
| 785 | - if ( $relate_to == 'category' ) {
|
|
| 785 | + if ($relate_to == 'category') {
|
|
| 786 | 786 | |
| 787 | - $category_taxonomy = $post_type . $relate_to; |
|
| 788 | - if ( isset( $post->{$category_taxonomy} ) && $post->{$category_taxonomy} != '' ) {
|
|
| 789 | - $category = explode( ',', trim( $post->{$category_taxonomy}, ',' ) );
|
|
| 787 | + $category_taxonomy = $post_type.$relate_to; |
|
| 788 | + if (isset($post->{$category_taxonomy} ) && $post->{$category_taxonomy} != '') {
|
|
| 789 | + $category = explode(',', trim($post->{$category_taxonomy}, ','));
|
|
| 790 | 790 | } |
| 791 | 791 | |
| 792 | - } elseif ( $relate_to == 'tags' ) {
|
|
| 792 | + } elseif ($relate_to == 'tags') {
|
|
| 793 | 793 | |
| 794 | - $category_taxonomy = $post_type . '_' . $relate_to; |
|
| 795 | - if ( $post->post_tags != '' ) {
|
|
| 796 | - $category = explode( ',', trim( $post->post_tags, ',' ) ); |
|
| 794 | + $category_taxonomy = $post_type.'_'.$relate_to; |
|
| 795 | + if ($post->post_tags != '') {
|
|
| 796 | + $category = explode(',', trim($post->post_tags, ','));
|
|
| 797 | 797 | } |
| 798 | 798 | $tax_field = 'name'; |
| 799 | 799 | } |
| 800 | 800 | |
| 801 | 801 | /* --- return false in invalid request --- */ |
| 802 | - if ( empty( $category ) ) {
|
|
| 802 | + if (empty($category)) {
|
|
| 803 | 803 | return false; |
| 804 | 804 | } |
| 805 | 805 | |
| 806 | 806 | $all_postypes = geodir_get_posttypes(); |
| 807 | 807 | |
| 808 | - if ( ! in_array( $post_type, $all_postypes ) ) {
|
|
| 808 | + if (!in_array($post_type, $all_postypes)) {
|
|
| 809 | 809 | return false; |
| 810 | 810 | } |
| 811 | 811 | |
| 812 | 812 | /* --- return false in invalid request --- */ |
| 813 | 813 | |
| 814 | 814 | $location_url = ''; |
| 815 | - if ( $add_location_filter != '0' ) {
|
|
| 815 | + if ($add_location_filter != '0') {
|
|
| 816 | 816 | $location_url = array(); |
| 817 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); |
|
| 817 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 818 | 818 | |
| 819 | - $gd_city = get_query_var( 'gd_city' ); |
|
| 819 | + $gd_city = get_query_var('gd_city');
|
|
| 820 | 820 | |
| 821 | - if ( $gd_city ) {
|
|
| 822 | - $gd_country = get_query_var( 'gd_country' ); |
|
| 823 | - $gd_region = get_query_var( 'gd_region' ); |
|
| 821 | + if ($gd_city) {
|
|
| 822 | + $gd_country = get_query_var('gd_country');
|
|
| 823 | + $gd_region = get_query_var('gd_region');
|
|
| 824 | 824 | } else {
|
| 825 | 825 | $location = geodir_get_default_location(); |
| 826 | 826 | |
| 827 | - $gd_country = isset( $location->country_slug ) ? $location->country_slug : ''; |
|
| 828 | - $gd_region = isset( $location->region_slug ) ? $location->region_slug : ''; |
|
| 829 | - $gd_city = isset( $location->city_slug ) ? $location->city_slug : ''; |
|
| 827 | + $gd_country = isset($location->country_slug) ? $location->country_slug : ''; |
|
| 828 | + $gd_region = isset($location->region_slug) ? $location->region_slug : ''; |
|
| 829 | + $gd_city = isset($location->city_slug) ? $location->city_slug : ''; |
|
| 830 | 830 | } |
| 831 | 831 | |
| 832 | - if ( $geodir_show_location_url == 'all' ) {
|
|
| 832 | + if ($geodir_show_location_url == 'all') {
|
|
| 833 | 833 | $location_url[] = $gd_country; |
| 834 | 834 | $location_url[] = $gd_region; |
| 835 | - } else if ( $geodir_show_location_url == 'country_city' ) {
|
|
| 835 | + } else if ($geodir_show_location_url == 'country_city') {
|
|
| 836 | 836 | $location_url[] = $gd_country; |
| 837 | - } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
| 837 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 838 | 838 | $location_url[] = $gd_region; |
| 839 | 839 | } |
| 840 | 840 | |
| 841 | 841 | $location_url[] = $gd_city; |
| 842 | 842 | |
| 843 | - $location_url = implode( '/', $location_url ); |
|
| 843 | + $location_url = implode('/', $location_url);
|
|
| 844 | 844 | } |
| 845 | 845 | |
| 846 | 846 | |
| 847 | - if ( ! empty( $category ) ) {
|
|
| 847 | + if (!empty($category)) {
|
|
| 848 | 848 | global $geodir_add_location_url; |
| 849 | 849 | $geodir_add_location_url = '0'; |
| 850 | - if ( $add_location_filter != '0' ) {
|
|
| 850 | + if ($add_location_filter != '0') {
|
|
| 851 | 851 | $geodir_add_location_url = '1'; |
| 852 | 852 | } |
| 853 | - $viewall_url = get_term_link( (int) $category[0], $post_type . $category_taxonomy ); |
|
| 853 | + $viewall_url = get_term_link((int) $category[0], $post_type.$category_taxonomy); |
|
| 854 | 854 | $geodir_add_location_url = null; |
| 855 | 855 | } |
| 856 | 856 | ob_start(); |
@@ -860,24 +860,24 @@ discard block |
||
| 860 | 860 | <div class="geodir_locations geodir_location_listing"> |
| 861 | 861 | |
| 862 | 862 | <?php |
| 863 | - if ( isset( $request['is_widget'] ) && $request['is_widget'] == '1' ) {
|
|
| 863 | + if (isset($request['is_widget']) && $request['is_widget'] == '1') {
|
|
| 864 | 864 | /** geodir_before_title filter Documented in geodirectory_widgets.php */ |
| 865 | - $before_title = isset( $before_title ) ? $before_title : apply_filters( 'geodir_before_title', '<h3 class="widget-title">' ); |
|
| 865 | + $before_title = isset($before_title) ? $before_title : apply_filters('geodir_before_title', '<h3 class="widget-title">');
|
|
| 866 | 866 | /** geodir_after_title filter Documented in geodirectory_widgets.php */ |
| 867 | - $after_title = isset( $after_title ) ? $after_title : apply_filters( 'geodir_after_title', '</h3>' ); |
|
| 867 | + $after_title = isset($after_title) ? $after_title : apply_filters('geodir_after_title', '</h3>');
|
|
| 868 | 868 | ?> |
| 869 | 869 | <div class="location_list_heading clearfix"> |
| 870 | - <?php echo $before_title . $title . $after_title; ?> |
|
| 870 | + <?php echo $before_title.$title.$after_title; ?> |
|
| 871 | 871 | </div> |
| 872 | 872 | <?php |
| 873 | 873 | } |
| 874 | 874 | $query_args = array( |
| 875 | 875 | 'posts_per_page' => $post_number, |
| 876 | 876 | 'is_geodir_loop' => true, |
| 877 | - 'gd_location' => ( $add_location_filter ) ? true : false, |
|
| 877 | + 'gd_location' => ($add_location_filter) ? true : false, |
|
| 878 | 878 | 'post_type' => $post_type, |
| 879 | 879 | 'order_by' => $list_sort, |
| 880 | - 'post__not_in' => array( $post_id ), |
|
| 880 | + 'post__not_in' => array($post_id), |
|
| 881 | 881 | 'excerpt_length' => $character_count, |
| 882 | 882 | 'related_listings' => $is_display |
| 883 | 883 | ); |
@@ -888,7 +888,7 @@ discard block |
||
| 888 | 888 | 'terms' => $category |
| 889 | 889 | ); |
| 890 | 890 | |
| 891 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 891 | + $query_args['tax_query'] = array($tax_query); |
|
| 892 | 892 | |
| 893 | 893 | global $gridview_columns_widget, $post; |
| 894 | 894 | |
@@ -900,21 +900,21 @@ discard block |
||
| 900 | 900 | * @param array $query_args The query array. |
| 901 | 901 | * @param array $request Related posts request array. |
| 902 | 902 | */ |
| 903 | - $query_args = apply_filters( 'geodir_related_posts_widget_query_args', $query_args, $request ); |
|
| 903 | + $query_args = apply_filters('geodir_related_posts_widget_query_args', $query_args, $request);
|
|
| 904 | 904 | |
| 905 | - query_posts( $query_args ); |
|
| 905 | + query_posts($query_args); |
|
| 906 | 906 | |
| 907 | - if ( strstr( $layout, 'gridview' ) ) {
|
|
| 908 | - $listing_view_exp = explode( '_', $layout ); |
|
| 907 | + if (strstr($layout, 'gridview')) {
|
|
| 908 | + $listing_view_exp = explode('_', $layout);
|
|
| 909 | 909 | $gridview_columns_widget = $layout; |
| 910 | 910 | $layout = $listing_view_exp[0]; |
| 911 | - } else if ( $layout == 'list' ) {
|
|
| 911 | + } else if ($layout == 'list') {
|
|
| 912 | 912 | $gridview_columns_widget = ''; |
| 913 | 913 | } |
| 914 | 914 | $related_posts = true; |
| 915 | 915 | |
| 916 | 916 | $related_nearest = false; |
| 917 | - if ( $list_sort == 'nearest' ) {
|
|
| 917 | + if ($list_sort == 'nearest') {
|
|
| 918 | 918 | $related_nearest = true; |
| 919 | 919 | } |
| 920 | 920 | |
@@ -931,14 +931,14 @@ discard block |
||
| 931 | 931 | * |
| 932 | 932 | * @since 1.0.0 |
| 933 | 933 | */ |
| 934 | - $template = apply_filters( "geodir_template_part-related-listing-listview", geodir_locate_template( 'widget-listing-listview' ) ); |
|
| 934 | + $template = apply_filters("geodir_template_part-related-listing-listview", geodir_locate_template('widget-listing-listview'));
|
|
| 935 | 935 | |
| 936 | 936 | /** |
| 937 | 937 | * Includes related listing listview template. |
| 938 | 938 | * |
| 939 | 939 | * @since 1.0.0 |
| 940 | 940 | */ |
| 941 | - include( $template ); |
|
| 941 | + include($template); |
|
| 942 | 942 | |
| 943 | 943 | wp_reset_query(); |
| 944 | 944 | $post = $origi_post; |
@@ -966,12 +966,12 @@ discard block |
||
| 966 | 966 | function geodir_category_count_script() {
|
| 967 | 967 | global $geodir_post_category_str; |
| 968 | 968 | |
| 969 | - if ( ! empty( $geodir_post_category_str ) ) {
|
|
| 970 | - $geodir_post_category_str = serialize( $geodir_post_category_str ); |
|
| 969 | + if (!empty($geodir_post_category_str)) {
|
|
| 970 | + $geodir_post_category_str = serialize($geodir_post_category_str); |
|
| 971 | 971 | } |
| 972 | 972 | |
| 973 | - $all_var['post_category_array'] = html_entity_decode( (string) $geodir_post_category_str, ENT_QUOTES, 'UTF-8' ); |
|
| 974 | - $script = "var post_category_array = " . json_encode( $all_var ) . ';'; |
|
| 973 | + $all_var['post_category_array'] = html_entity_decode((string) $geodir_post_category_str, ENT_QUOTES, 'UTF-8'); |
|
| 974 | + $script = "var post_category_array = ".json_encode($all_var).';'; |
|
| 975 | 975 | echo '<script>'; |
| 976 | 976 | echo $script; |
| 977 | 977 | echo '</script>'; |
@@ -986,8 +986,8 @@ discard block |
||
| 986 | 986 | * @return string Returns the default language. |
| 987 | 987 | */ |
| 988 | 988 | function geodir_get_map_default_language() {
|
| 989 | - $geodir_default_map_language = get_option( 'geodir_default_map_language' ); |
|
| 990 | - if ( empty( $geodir_default_map_language ) ) {
|
|
| 989 | + $geodir_default_map_language = get_option('geodir_default_map_language');
|
|
| 990 | + if (empty($geodir_default_map_language)) {
|
|
| 991 | 991 | $geodir_default_map_language = 'en'; |
| 992 | 992 | } |
| 993 | 993 | |
@@ -998,7 +998,7 @@ discard block |
||
| 998 | 998 | * |
| 999 | 999 | * @param string $geodir_default_map_language Default map language. |
| 1000 | 1000 | */ |
| 1001 | - return apply_filters( 'geodir_default_map_language', $geodir_default_map_language ); |
|
| 1001 | + return apply_filters('geodir_default_map_language', $geodir_default_map_language);
|
|
| 1002 | 1002 | } |
| 1003 | 1003 | |
| 1004 | 1004 | /** |
@@ -1009,7 +1009,7 @@ discard block |
||
| 1009 | 1009 | * @return string Returns the api key. |
| 1010 | 1010 | */ |
| 1011 | 1011 | function geodir_get_map_api_key() {
|
| 1012 | - $key = get_option( 'geodir_google_api_key' ); |
|
| 1012 | + $key = get_option('geodir_google_api_key');
|
|
| 1013 | 1013 | |
| 1014 | 1014 | /** |
| 1015 | 1015 | * Filter Google maps api key. |
@@ -1018,7 +1018,7 @@ discard block |
||
| 1018 | 1018 | * |
| 1019 | 1019 | * @param string $key Google maps api key. |
| 1020 | 1020 | */ |
| 1021 | - return apply_filters( 'geodir_google_api_key', $key ); |
|
| 1021 | + return apply_filters('geodir_google_api_key', $key);
|
|
| 1022 | 1022 | } |
| 1023 | 1023 | |
| 1024 | 1024 | |
@@ -1038,20 +1038,20 @@ discard block |
||
| 1038 | 1038 | global $wp, $post, $wp_query, $wpdb, $geodir_addon_list; |
| 1039 | 1039 | |
| 1040 | 1040 | $is_geodir_page = geodir_is_geodir_page(); |
| 1041 | - if ( ! $is_geodir_page ) {
|
|
| 1041 | + if (!$is_geodir_page) {
|
|
| 1042 | 1042 | return; |
| 1043 | 1043 | }// if non GD page, bail |
| 1044 | 1044 | |
| 1045 | 1045 | $use_gd_meta = true; |
| 1046 | - if ( ( class_exists( 'WPSEO_Frontend' ) || class_exists( 'All_in_One_SEO_Pack' ) ) && !geodir_disable_yoast_seo_metas() ) {
|
|
| 1046 | + if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
|
|
| 1047 | 1047 | $use_gd_meta = false; |
| 1048 | 1048 | |
| 1049 | - if ( geodir_is_page( 'search' ) ) {
|
|
| 1049 | + if (geodir_is_page('search')) {
|
|
| 1050 | 1050 | $use_gd_meta = true; |
| 1051 | 1051 | } |
| 1052 | 1052 | } |
| 1053 | 1053 | |
| 1054 | - if ( ! $use_gd_meta ) {
|
|
| 1054 | + if (!$use_gd_meta) {
|
|
| 1055 | 1055 | return; |
| 1056 | 1056 | }// bail if Yoast Wordpress SEO or All_in_One_SEO_Pack active. |
| 1057 | 1057 | |
@@ -1059,68 +1059,68 @@ discard block |
||
| 1059 | 1059 | |
| 1060 | 1060 | $all_postypes = geodir_get_posttypes(); |
| 1061 | 1061 | |
| 1062 | - $geodir_taxonomies = geodir_get_taxonomies( '', true ); |
|
| 1062 | + $geodir_taxonomies = geodir_get_taxonomies('', true);
|
|
| 1063 | 1063 | |
| 1064 | 1064 | $meta_desc = ''; |
| 1065 | 1065 | $meta_key = ''; |
| 1066 | - if ( isset( $current_term->ID ) && $current_term->ID == geodir_location_page_id() ) {
|
|
| 1066 | + if (isset($current_term->ID) && $current_term->ID == geodir_location_page_id()) {
|
|
| 1067 | 1067 | /** |
| 1068 | 1068 | * Filter SEO meta location description. |
| 1069 | 1069 | * |
| 1070 | 1070 | * @since 1.0.0 |
| 1071 | 1071 | */ |
| 1072 | - $meta_desc = apply_filters( 'geodir_seo_meta_location_description', '' ); |
|
| 1072 | + $meta_desc = apply_filters('geodir_seo_meta_location_description', '');
|
|
| 1073 | 1073 | $meta_desc .= ''; |
| 1074 | 1074 | } |
| 1075 | - if ( have_posts() && is_single() OR is_page() ) {
|
|
| 1076 | - while ( have_posts() ) {
|
|
| 1075 | + if (have_posts() && is_single() OR is_page()) {
|
|
| 1076 | + while (have_posts()) {
|
|
| 1077 | 1077 | the_post(); |
| 1078 | 1078 | |
| 1079 | - if ( has_excerpt() ) {
|
|
| 1080 | - $out_excerpt = strip_tags( strip_shortcodes( get_the_excerpt() ) ); |
|
| 1081 | - if ( empty( $out_excerpt ) ) {
|
|
| 1082 | - $out_excerpt = strip_tags( do_shortcode( get_the_excerpt() ) ); |
|
| 1079 | + if (has_excerpt()) {
|
|
| 1080 | + $out_excerpt = strip_tags(strip_shortcodes(get_the_excerpt())); |
|
| 1081 | + if (empty($out_excerpt)) {
|
|
| 1082 | + $out_excerpt = strip_tags(do_shortcode(get_the_excerpt())); |
|
| 1083 | 1083 | } |
| 1084 | - $out_excerpt = str_replace( array( "\r\n", "\r", "\n" ), "", $out_excerpt ); |
|
| 1084 | + $out_excerpt = str_replace(array("\r\n", "\r", "\n"), "", $out_excerpt);
|
|
| 1085 | 1085 | } else {
|
| 1086 | - $out_excerpt = str_replace( array( "\r\n", "\r", "\n" ), "", $post->post_content ); |
|
| 1087 | - $out_excerpt = strip_tags( strip_shortcodes( $out_excerpt ) ); |
|
| 1088 | - if ( empty( $out_excerpt ) ) {
|
|
| 1089 | - $out_excerpt = strip_tags( do_shortcode( $out_excerpt ) ); // parse short code from content |
|
| 1086 | + $out_excerpt = str_replace(array("\r\n", "\r", "\n"), "", $post->post_content);
|
|
| 1087 | + $out_excerpt = strip_tags(strip_shortcodes($out_excerpt)); |
|
| 1088 | + if (empty($out_excerpt)) {
|
|
| 1089 | + $out_excerpt = strip_tags(do_shortcode($out_excerpt)); // parse short code from content |
|
| 1090 | 1090 | } |
| 1091 | - $out_excerpt = trim( wp_trim_words( $out_excerpt, 35, '' ), '.!?,;:-' ); |
|
| 1091 | + $out_excerpt = trim(wp_trim_words($out_excerpt, 35, ''), '.!?,;:-'); |
|
| 1092 | 1092 | } |
| 1093 | 1093 | |
| 1094 | 1094 | $meta_desc .= $out_excerpt; |
| 1095 | 1095 | } |
| 1096 | - } elseif ( ( is_category() || is_tag() ) && isset( $current_term->taxonomy ) && in_array( $current_term->taxonomy, $geodir_taxonomies ) ) {
|
|
| 1097 | - if ( is_category() ) {
|
|
| 1098 | - $meta_desc .= __( "Posts related to Category:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_cat_title( "", false ) ); |
|
| 1099 | - } elseif ( is_tag() ) {
|
|
| 1100 | - $meta_desc .= __( "Posts related to Tag:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_tag_title( "", false ) ); |
|
| 1096 | + } elseif ((is_category() || is_tag()) && isset($current_term->taxonomy) && in_array($current_term->taxonomy, $geodir_taxonomies)) {
|
|
| 1097 | + if (is_category()) {
|
|
| 1098 | + $meta_desc .= __("Posts related to Category:", 'geodirectory')." ".geodir_utf8_ucfirst(single_cat_title("", false));
|
|
| 1099 | + } elseif (is_tag()) {
|
|
| 1100 | + $meta_desc .= __("Posts related to Tag:", 'geodirectory')." ".geodir_utf8_ucfirst(single_tag_title("", false));
|
|
| 1101 | 1101 | } |
| 1102 | - } elseif ( isset( $current_term->taxonomy ) && in_array( $current_term->taxonomy, $geodir_taxonomies ) ) {
|
|
| 1103 | - $meta_desc .= isset( $current_term->description ) ? $current_term->description : ''; |
|
| 1102 | + } elseif (isset($current_term->taxonomy) && in_array($current_term->taxonomy, $geodir_taxonomies)) {
|
|
| 1103 | + $meta_desc .= isset($current_term->description) ? $current_term->description : ''; |
|
| 1104 | 1104 | } |
| 1105 | 1105 | |
| 1106 | 1106 | |
| 1107 | 1107 | $geodir_post_type = geodir_get_current_posttype(); |
| 1108 | - $geodir_post_type_info = get_post_type_object( $geodir_post_type ); |
|
| 1109 | - $geodir_is_page_listing = geodir_is_page( 'listing' ) ? true : false; |
|
| 1110 | - |
|
| 1111 | - $category_taxonomy = geodir_get_taxonomies( $geodir_post_type ); |
|
| 1112 | - $tag_taxonomy = geodir_get_taxonomies( $geodir_post_type, true ); |
|
| 1113 | - |
|
| 1114 | - $geodir_is_category = isset( $category_taxonomy[0] ) && get_query_var( $category_taxonomy[0] ) ? get_query_var( $category_taxonomy[0] ) : false; |
|
| 1115 | - $geodir_is_tag = isset( $tag_taxonomy[0] ) && get_query_var( $tag_taxonomy[0] ) ? true : false; |
|
| 1116 | - |
|
| 1117 | - $geodir_is_search = geodir_is_page( 'search' ) ? true : false; |
|
| 1118 | - $geodir_is_location = geodir_is_page( 'location' ) ? true : false; |
|
| 1119 | - $geodir_location_manager = isset( $geodir_addon_list['geodir_location_manager'] ) && $geodir_addon_list['geodir_location_manager'] = 'yes' ? true : false; |
|
| 1120 | - $godir_location_terms = geodir_get_current_location_terms( 'query_vars' ); |
|
| 1121 | - $gd_city = $geodir_location_manager && isset( $godir_location_terms['gd_city'] ) ? $godir_location_terms['gd_city'] : null; |
|
| 1122 | - $gd_region = $geodir_location_manager && isset( $godir_location_terms['gd_region'] ) ? $godir_location_terms['gd_region'] : null; |
|
| 1123 | - $gd_country = $geodir_location_manager && isset( $godir_location_terms['gd_country'] ) ? $godir_location_terms['gd_country'] : null; |
|
| 1108 | + $geodir_post_type_info = get_post_type_object($geodir_post_type); |
|
| 1109 | + $geodir_is_page_listing = geodir_is_page('listing') ? true : false;
|
|
| 1110 | + |
|
| 1111 | + $category_taxonomy = geodir_get_taxonomies($geodir_post_type); |
|
| 1112 | + $tag_taxonomy = geodir_get_taxonomies($geodir_post_type, true); |
|
| 1113 | + |
|
| 1114 | + $geodir_is_category = isset($category_taxonomy[0]) && get_query_var($category_taxonomy[0]) ? get_query_var($category_taxonomy[0]) : false; |
|
| 1115 | + $geodir_is_tag = isset($tag_taxonomy[0]) && get_query_var($tag_taxonomy[0]) ? true : false; |
|
| 1116 | + |
|
| 1117 | + $geodir_is_search = geodir_is_page('search') ? true : false;
|
|
| 1118 | + $geodir_is_location = geodir_is_page('location') ? true : false;
|
|
| 1119 | + $geodir_location_manager = isset($geodir_addon_list['geodir_location_manager']) && $geodir_addon_list['geodir_location_manager'] = 'yes' ? true : false; |
|
| 1120 | + $godir_location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1121 | + $gd_city = $geodir_location_manager && isset($godir_location_terms['gd_city']) ? $godir_location_terms['gd_city'] : null; |
|
| 1122 | + $gd_region = $geodir_location_manager && isset($godir_location_terms['gd_region']) ? $godir_location_terms['gd_region'] : null; |
|
| 1123 | + $gd_country = $geodir_location_manager && isset($godir_location_terms['gd_country']) ? $godir_location_terms['gd_country'] : null; |
|
| 1124 | 1124 | /** |
| 1125 | 1125 | * Filter the Everywhere text in location description. |
| 1126 | 1126 | * |
@@ -1128,108 +1128,108 @@ discard block |
||
| 1128 | 1128 | * |
| 1129 | 1129 | * @param string $replace_location Everywhere text. |
| 1130 | 1130 | */ |
| 1131 | - $replace_location = apply_filters( 'geodir_location_description_everywhere_text', __( 'Everywhere', 'geodirectory' ) ); |
|
| 1131 | + $replace_location = apply_filters('geodir_location_description_everywhere_text', __('Everywhere', 'geodirectory'));
|
|
| 1132 | 1132 | $location_id = null; |
| 1133 | - if ( $geodir_location_manager ) {
|
|
| 1134 | - $sql = $wpdb->prepare( "SELECT location_id FROM " . POST_LOCATION_TABLE . " WHERE city_slug=%s ORDER BY location_id ASC LIMIT 1", array( $gd_city ) ); |
|
| 1135 | - $location_id = (int) $wpdb->get_var( $sql ); |
|
| 1133 | + if ($geodir_location_manager) {
|
|
| 1134 | + $sql = $wpdb->prepare("SELECT location_id FROM ".POST_LOCATION_TABLE." WHERE city_slug=%s ORDER BY location_id ASC LIMIT 1", array($gd_city));
|
|
| 1135 | + $location_id = (int) $wpdb->get_var($sql); |
|
| 1136 | 1136 | $location_type = geodir_what_is_current_location(); |
| 1137 | - if ( $location_type == 'city' ) {
|
|
| 1138 | - $replace_location = geodir_get_current_location( array( 'what' => 'city', 'echo' => false ) ); |
|
| 1139 | - } elseif ( $location_type == 'region' ) {
|
|
| 1140 | - $replace_location = geodir_get_current_location( array( 'what' => 'region', 'echo' => false ) ); |
|
| 1141 | - } elseif ( $location_type == 'country' ) {
|
|
| 1142 | - $replace_location = geodir_get_current_location( array( 'what' => 'country', 'echo' => false ) ); |
|
| 1143 | - $replace_location = __( $replace_location, 'geodirectory' ); |
|
| 1144 | - } |
|
| 1145 | - $country = get_query_var( 'gd_country' ); |
|
| 1146 | - $region = get_query_var( 'gd_region' ); |
|
| 1147 | - $city = get_query_var( 'gd_city' ); |
|
| 1137 | + if ($location_type == 'city') {
|
|
| 1138 | + $replace_location = geodir_get_current_location(array('what' => 'city', 'echo' => false));
|
|
| 1139 | + } elseif ($location_type == 'region') {
|
|
| 1140 | + $replace_location = geodir_get_current_location(array('what' => 'region', 'echo' => false));
|
|
| 1141 | + } elseif ($location_type == 'country') {
|
|
| 1142 | + $replace_location = geodir_get_current_location(array('what' => 'country', 'echo' => false));
|
|
| 1143 | + $replace_location = __($replace_location, 'geodirectory'); |
|
| 1144 | + } |
|
| 1145 | + $country = get_query_var('gd_country');
|
|
| 1146 | + $region = get_query_var('gd_region');
|
|
| 1147 | + $city = get_query_var('gd_city');
|
|
| 1148 | 1148 | $current_location = ''; |
| 1149 | - if ( $country != '' ) {
|
|
| 1150 | - $current_location = get_actual_location_name( 'country', $country, true ); |
|
| 1149 | + if ($country != '') {
|
|
| 1150 | + $current_location = get_actual_location_name('country', $country, true);
|
|
| 1151 | 1151 | } |
| 1152 | - if ( $region != '' ) {
|
|
| 1153 | - $current_location = get_actual_location_name( 'region', $region ); |
|
| 1152 | + if ($region != '') {
|
|
| 1153 | + $current_location = get_actual_location_name('region', $region);
|
|
| 1154 | 1154 | } |
| 1155 | - if ( $city != '' ) {
|
|
| 1156 | - $current_location = get_actual_location_name( 'city', $city ); |
|
| 1155 | + if ($city != '') {
|
|
| 1156 | + $current_location = get_actual_location_name('city', $city);
|
|
| 1157 | 1157 | } |
| 1158 | 1158 | $replace_location = $current_location != '' ? $current_location : $replace_location; |
| 1159 | 1159 | } |
| 1160 | 1160 | |
| 1161 | 1161 | $geodir_meta_keys = ''; |
| 1162 | 1162 | $geodir_meta_desc = ''; |
| 1163 | - if ( $is_geodir_page && ! empty( $geodir_post_type_info ) ) {
|
|
| 1164 | - if ( $geodir_is_page_listing || $geodir_is_search || geodir_is_page( 'add-listing' ) ) {
|
|
| 1165 | - $geodir_meta_keys = isset( $geodir_post_type_info->seo['meta_keyword'] ) && $geodir_post_type_info->seo['meta_keyword'] != '' ? $geodir_post_type_info->seo['meta_keyword'] : $geodir_meta_keys; |
|
| 1163 | + if ($is_geodir_page && !empty($geodir_post_type_info)) {
|
|
| 1164 | + if ($geodir_is_page_listing || $geodir_is_search || geodir_is_page('add-listing')) {
|
|
| 1165 | + $geodir_meta_keys = isset($geodir_post_type_info->seo['meta_keyword']) && $geodir_post_type_info->seo['meta_keyword'] != '' ? $geodir_post_type_info->seo['meta_keyword'] : $geodir_meta_keys; |
|
| 1166 | 1166 | |
| 1167 | - $geodir_meta_desc = isset( $geodir_post_type_info->description ) ? $geodir_post_type_info->description : $geodir_meta_desc; |
|
| 1168 | - $geodir_meta_desc = isset( $geodir_post_type_info->seo['meta_description'] ) && $geodir_post_type_info->seo['meta_description'] != '' ? $geodir_post_type_info->seo['meta_description'] : $geodir_meta_desc; |
|
| 1167 | + $geodir_meta_desc = isset($geodir_post_type_info->description) ? $geodir_post_type_info->description : $geodir_meta_desc; |
|
| 1168 | + $geodir_meta_desc = isset($geodir_post_type_info->seo['meta_description']) && $geodir_post_type_info->seo['meta_description'] != '' ? $geodir_post_type_info->seo['meta_description'] : $geodir_meta_desc; |
|
| 1169 | 1169 | |
| 1170 | - if ( $geodir_is_category ) {
|
|
| 1171 | - $category = $geodir_is_category ? get_term_by( 'slug', $geodir_is_category, $category_taxonomy[0] ) : null; |
|
| 1172 | - if ( isset( $category->term_id ) && ! empty( $category->term_id ) ) {
|
|
| 1170 | + if ($geodir_is_category) {
|
|
| 1171 | + $category = $geodir_is_category ? get_term_by('slug', $geodir_is_category, $category_taxonomy[0]) : null;
|
|
| 1172 | + if (isset($category->term_id) && !empty($category->term_id)) {
|
|
| 1173 | 1173 | $category_id = $category->term_id; |
| 1174 | - $category_desc = trim( $category->description ) != '' ? trim( $category->description ) : geodir_get_tax_meta( $category_id, 'ct_cat_top_desc', false, $geodir_post_type ); |
|
| 1175 | - if ( $location_id ) {
|
|
| 1176 | - $option_name = 'geodir_cat_loc_' . $geodir_post_type . '_' . $category_id; |
|
| 1177 | - $cat_loc_option = get_option( $option_name ); |
|
| 1178 | - |
|
| 1179 | - $gd_cat_loc_default = ! empty( $cat_loc_option ) && isset( $cat_loc_option['gd_cat_loc_default'] ) && $cat_loc_option['gd_cat_loc_default'] > 0 ? true : false; |
|
| 1180 | - if ( ! $gd_cat_loc_default ) {
|
|
| 1181 | - $option_name = 'geodir_cat_loc_' . $geodir_post_type . '_' . $category_id . '_' . $location_id; |
|
| 1182 | - $option = get_option( $option_name ); |
|
| 1183 | - $category_desc = isset( $option['gd_cat_loc_desc'] ) && trim( $option['gd_cat_loc_desc'] ) != '' ? trim( $option['gd_cat_loc_desc'] ) : $category_desc; |
|
| 1174 | + $category_desc = trim($category->description) != '' ? trim($category->description) : geodir_get_tax_meta($category_id, 'ct_cat_top_desc', false, $geodir_post_type); |
|
| 1175 | + if ($location_id) {
|
|
| 1176 | + $option_name = 'geodir_cat_loc_'.$geodir_post_type.'_'.$category_id; |
|
| 1177 | + $cat_loc_option = get_option($option_name); |
|
| 1178 | + |
|
| 1179 | + $gd_cat_loc_default = !empty($cat_loc_option) && isset($cat_loc_option['gd_cat_loc_default']) && $cat_loc_option['gd_cat_loc_default'] > 0 ? true : false; |
|
| 1180 | + if (!$gd_cat_loc_default) {
|
|
| 1181 | + $option_name = 'geodir_cat_loc_'.$geodir_post_type.'_'.$category_id.'_'.$location_id; |
|
| 1182 | + $option = get_option($option_name); |
|
| 1183 | + $category_desc = isset($option['gd_cat_loc_desc']) && trim($option['gd_cat_loc_desc']) != '' ? trim($option['gd_cat_loc_desc']) : $category_desc; |
|
| 1184 | 1184 | } |
| 1185 | 1185 | } |
| 1186 | - $geodir_meta_desc = __( "Posts related to Category:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_cat_title( "", false ) ) . '. ' . $category_desc; |
|
| 1186 | + $geodir_meta_desc = __("Posts related to Category:", 'geodirectory')." ".geodir_utf8_ucfirst(single_cat_title("", false)).'. '.$category_desc;
|
|
| 1187 | 1187 | } |
| 1188 | - } else if ( $geodir_is_tag ) {
|
|
| 1189 | - $geodir_meta_desc = __( "Posts related to Tag:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_tag_title( "", false ) ) . '. ' . $geodir_meta_desc; |
|
| 1188 | + } else if ($geodir_is_tag) {
|
|
| 1189 | + $geodir_meta_desc = __("Posts related to Tag:", 'geodirectory')." ".geodir_utf8_ucfirst(single_tag_title("", false)).'. '.$geodir_meta_desc;
|
|
| 1190 | 1190 | } |
| 1191 | 1191 | } |
| 1192 | 1192 | } |
| 1193 | 1193 | |
| 1194 | 1194 | |
| 1195 | 1195 | $gd_page = ''; |
| 1196 | - if ( geodir_is_page( 'home' ) ) {
|
|
| 1196 | + if (geodir_is_page('home')) {
|
|
| 1197 | 1197 | $gd_page = 'home'; |
| 1198 | - $meta_desc = ( get_option( 'geodir_meta_desc_homepage' ) ) ? get_option( 'geodir_meta_desc_homepage' ) : $meta_desc; |
|
| 1199 | - } elseif ( geodir_is_page( 'detail' ) ) {
|
|
| 1198 | + $meta_desc = (get_option('geodir_meta_desc_homepage')) ? get_option('geodir_meta_desc_homepage') : $meta_desc;
|
|
| 1199 | + } elseif (geodir_is_page('detail')) {
|
|
| 1200 | 1200 | $gd_page = 'detail'; |
| 1201 | - $meta_desc = ( get_option( 'geodir_meta_desc_detail' ) ) ? get_option( 'geodir_meta_desc_detail' ) : $meta_desc; |
|
| 1202 | - } elseif ( geodir_is_page( 'pt' ) ) {
|
|
| 1201 | + $meta_desc = (get_option('geodir_meta_desc_detail')) ? get_option('geodir_meta_desc_detail') : $meta_desc;
|
|
| 1202 | + } elseif (geodir_is_page('pt')) {
|
|
| 1203 | 1203 | $gd_page = 'pt'; |
| 1204 | - $meta_desc = ( get_option( 'geodir_meta_desc_pt' ) ) ? get_option( 'geodir_meta_desc_pt' ) : $meta_desc; |
|
| 1205 | - } elseif ( geodir_is_page( 'listing' ) ) {
|
|
| 1204 | + $meta_desc = (get_option('geodir_meta_desc_pt')) ? get_option('geodir_meta_desc_pt') : $meta_desc;
|
|
| 1205 | + } elseif (geodir_is_page('listing')) {
|
|
| 1206 | 1206 | $gd_page = 'listing'; |
| 1207 | - $meta_desc = ( get_option( 'geodir_meta_desc_listing' ) ) ? get_option( 'geodir_meta_desc_listing' ) : $meta_desc; |
|
| 1208 | - } elseif ( geodir_is_page( 'location' ) ) {
|
|
| 1207 | + $meta_desc = (get_option('geodir_meta_desc_listing')) ? get_option('geodir_meta_desc_listing') : $meta_desc;
|
|
| 1208 | + } elseif (geodir_is_page('location')) {
|
|
| 1209 | 1209 | $gd_page = 'location'; |
| 1210 | - $meta_desc = ( get_option( 'geodir_meta_desc_location' ) ) ? get_option( 'geodir_meta_desc_location' ) : $meta_desc; |
|
| 1211 | - $meta_desc = apply_filters( 'geodir_seo_meta_location_description', $meta_desc ); |
|
| 1210 | + $meta_desc = (get_option('geodir_meta_desc_location')) ? get_option('geodir_meta_desc_location') : $meta_desc;
|
|
| 1211 | + $meta_desc = apply_filters('geodir_seo_meta_location_description', $meta_desc);
|
|
| 1212 | 1212 | |
| 1213 | - } elseif ( geodir_is_page( 'search' ) ) {
|
|
| 1213 | + } elseif (geodir_is_page('search')) {
|
|
| 1214 | 1214 | $gd_page = 'search'; |
| 1215 | - $meta_desc = ( get_option( 'geodir_meta_desc_search' ) ) ? get_option( 'geodir_meta_desc_search' ) : $meta_desc; |
|
| 1216 | - } elseif ( geodir_is_page( 'add-listing' ) ) {
|
|
| 1215 | + $meta_desc = (get_option('geodir_meta_desc_search')) ? get_option('geodir_meta_desc_search') : $meta_desc;
|
|
| 1216 | + } elseif (geodir_is_page('add-listing')) {
|
|
| 1217 | 1217 | $gd_page = 'add-listing'; |
| 1218 | - $meta_desc = ( get_option( 'geodir_meta_desc_add-listing' ) ) ? get_option( 'geodir_meta_desc_add-listing' ) : $meta_desc; |
|
| 1219 | - } elseif ( geodir_is_page( 'author' ) ) {
|
|
| 1218 | + $meta_desc = (get_option('geodir_meta_desc_add-listing')) ? get_option('geodir_meta_desc_add-listing') : $meta_desc;
|
|
| 1219 | + } elseif (geodir_is_page('author')) {
|
|
| 1220 | 1220 | $gd_page = 'author'; |
| 1221 | - $meta_desc = ( get_option( 'geodir_meta_desc_author' ) ) ? get_option( 'geodir_meta_desc_author' ) : $meta_desc; |
|
| 1222 | - } elseif ( geodir_is_page( 'login' ) ) {
|
|
| 1221 | + $meta_desc = (get_option('geodir_meta_desc_author')) ? get_option('geodir_meta_desc_author') : $meta_desc;
|
|
| 1222 | + } elseif (geodir_is_page('login')) {
|
|
| 1223 | 1223 | $gd_page = 'login'; |
| 1224 | - $meta_desc = ( get_option( 'geodir_meta_desc_login' ) ) ? get_option( 'geodir_meta_desc_login' ) : $meta_desc; |
|
| 1225 | - } elseif ( geodir_is_page( 'listing-success' ) ) {
|
|
| 1224 | + $meta_desc = (get_option('geodir_meta_desc_login')) ? get_option('geodir_meta_desc_login') : $meta_desc;
|
|
| 1225 | + } elseif (geodir_is_page('listing-success')) {
|
|
| 1226 | 1226 | $gd_page = 'listing-success'; |
| 1227 | - $meta_desc = ( get_option( 'geodir_meta_desc_listing-success' ) ) ? get_option( 'geodir_meta_desc_listing-success' ) : $meta_desc; |
|
| 1227 | + $meta_desc = (get_option('geodir_meta_desc_listing-success')) ? get_option('geodir_meta_desc_listing-success') : $meta_desc;
|
|
| 1228 | 1228 | } |
| 1229 | 1229 | |
| 1230 | 1230 | |
| 1231 | - if ( $meta_desc ) {
|
|
| 1232 | - $meta_desc = stripslashes_deep( $meta_desc ); |
|
| 1231 | + if ($meta_desc) {
|
|
| 1232 | + $meta_desc = stripslashes_deep($meta_desc); |
|
| 1233 | 1233 | /** |
| 1234 | 1234 | * Filter page description to replace variables. |
| 1235 | 1235 | * |
@@ -1238,7 +1238,7 @@ discard block |
||
| 1238 | 1238 | * @param string $title The page description including variables. |
| 1239 | 1239 | * @param string $gd_page The GeoDirectory page type if any. |
| 1240 | 1240 | */ |
| 1241 | - $meta_desc = apply_filters( 'geodir_seo_meta_description_pre', __( $meta_desc, 'geodirectory' ), $gd_page, '' ); |
|
| 1241 | + $meta_desc = apply_filters('geodir_seo_meta_description_pre', __($meta_desc, 'geodirectory'), $gd_page, '');
|
|
| 1242 | 1242 | |
| 1243 | 1243 | /** |
| 1244 | 1244 | * Filter SEO meta description. |
@@ -1247,20 +1247,20 @@ discard block |
||
| 1247 | 1247 | * |
| 1248 | 1248 | * @param string $meta_desc Meta description content. |
| 1249 | 1249 | */ |
| 1250 | - echo apply_filters( 'geodir_seo_meta_description', '<meta name="description" content="' . $meta_desc . '" />', $meta_desc ); |
|
| 1250 | + echo apply_filters('geodir_seo_meta_description', '<meta name="description" content="'.$meta_desc.'" />', $meta_desc);
|
|
| 1251 | 1251 | } |
| 1252 | 1252 | |
| 1253 | 1253 | // meta keywords |
| 1254 | - if ( isset( $post->post_type ) && in_array( $post->post_type, $all_postypes ) ) {
|
|
| 1255 | - $place_tags = wp_get_post_terms( $post->ID, $post->post_type . '_tags', array( "fields" => "names" ) ); |
|
| 1256 | - $place_cats = wp_get_post_terms( $post->ID, $post->post_type . 'category', array( "fields" => "names" ) ); |
|
| 1254 | + if (isset($post->post_type) && in_array($post->post_type, $all_postypes)) {
|
|
| 1255 | + $place_tags = wp_get_post_terms($post->ID, $post->post_type.'_tags', array("fields" => "names"));
|
|
| 1256 | + $place_cats = wp_get_post_terms($post->ID, $post->post_type.'category', array("fields" => "names"));
|
|
| 1257 | 1257 | |
| 1258 | - $meta_key .= implode( ", ", array_merge( (array) $place_cats, (array) $place_tags ) ); |
|
| 1258 | + $meta_key .= implode(", ", array_merge((array) $place_cats, (array) $place_tags));
|
|
| 1259 | 1259 | } else {
|
| 1260 | 1260 | $posttags = get_the_tags(); |
| 1261 | - if ( $posttags ) {
|
|
| 1262 | - foreach ( $posttags as $tag ) {
|
|
| 1263 | - $meta_key .= $tag->name . ' '; |
|
| 1261 | + if ($posttags) {
|
|
| 1262 | + foreach ($posttags as $tag) {
|
|
| 1263 | + $meta_key .= $tag->name.' '; |
|
| 1264 | 1264 | } |
| 1265 | 1265 | } else {
|
| 1266 | 1266 | // $tags = get_tags( array( 'orderby' => 'count', 'order' => 'DESC' ) ); |
@@ -1276,20 +1276,20 @@ discard block |
||
| 1276 | 1276 | } |
| 1277 | 1277 | } |
| 1278 | 1278 | |
| 1279 | - $meta_key = $meta_key != '' ? rtrim( trim( $meta_key ), "," ) : $meta_key; |
|
| 1280 | - $geodir_meta_keys = $geodir_meta_keys != '' ? ( $meta_key != '' ? $meta_key . ', ' . $geodir_meta_keys : $geodir_meta_keys ) : $meta_key; |
|
| 1281 | - if ( $geodir_meta_keys != '' ) {
|
|
| 1282 | - $geodir_meta_keys = strip_tags( $geodir_meta_keys ); |
|
| 1283 | - $geodir_meta_keys = esc_html( $geodir_meta_keys ); |
|
| 1284 | - $geodir_meta_keys = geodir_strtolower( $geodir_meta_keys ); |
|
| 1285 | - $geodir_meta_keys = wp_html_excerpt( $geodir_meta_keys, 1000, '' ); |
|
| 1286 | - $geodir_meta_keys = str_replace( '%location%', $replace_location, $geodir_meta_keys ); |
|
| 1279 | + $meta_key = $meta_key != '' ? rtrim(trim($meta_key), ",") : $meta_key; |
|
| 1280 | + $geodir_meta_keys = $geodir_meta_keys != '' ? ($meta_key != '' ? $meta_key.', '.$geodir_meta_keys : $geodir_meta_keys) : $meta_key; |
|
| 1281 | + if ($geodir_meta_keys != '') {
|
|
| 1282 | + $geodir_meta_keys = strip_tags($geodir_meta_keys); |
|
| 1283 | + $geodir_meta_keys = esc_html($geodir_meta_keys); |
|
| 1284 | + $geodir_meta_keys = geodir_strtolower($geodir_meta_keys); |
|
| 1285 | + $geodir_meta_keys = wp_html_excerpt($geodir_meta_keys, 1000, ''); |
|
| 1286 | + $geodir_meta_keys = str_replace('%location%', $replace_location, $geodir_meta_keys);
|
|
| 1287 | 1287 | |
| 1288 | - $meta_key = rtrim( trim( $geodir_meta_keys ), "," ); |
|
| 1288 | + $meta_key = rtrim(trim($geodir_meta_keys), ","); |
|
| 1289 | 1289 | } |
| 1290 | 1290 | |
| 1291 | - if ( $meta_key ) {
|
|
| 1292 | - $meta_key = stripslashes_deep( $meta_key ); |
|
| 1291 | + if ($meta_key) {
|
|
| 1292 | + $meta_key = stripslashes_deep($meta_key); |
|
| 1293 | 1293 | /** |
| 1294 | 1294 | * Filter SEO meta keywords. |
| 1295 | 1295 | * |
@@ -1297,7 +1297,7 @@ discard block |
||
| 1297 | 1297 | * |
| 1298 | 1298 | * @param string $meta_desc Meta keywords. |
| 1299 | 1299 | */ |
| 1300 | - echo apply_filters( 'geodir_seo_meta_keywords', '<meta name="keywords" content="' . $meta_key . '" />', $meta_key ); |
|
| 1300 | + echo apply_filters('geodir_seo_meta_keywords', '<meta name="keywords" content="'.$meta_key.'" />', $meta_key);
|
|
| 1301 | 1301 | } |
| 1302 | 1302 | |
| 1303 | 1303 | } |
@@ -1317,8 +1317,8 @@ discard block |
||
| 1317 | 1317 | |
| 1318 | 1318 | $geodir_detail_page_tabs_array = geodir_detail_page_tabs_array(); |
| 1319 | 1319 | |
| 1320 | - foreach ( $geodir_detail_page_tabs_array as $key => $tabs_obj ) {
|
|
| 1321 | - $geodir_detail_page_tabs_key_value_array[ $key ] = $tabs_obj['heading_text']; |
|
| 1320 | + foreach ($geodir_detail_page_tabs_array as $key => $tabs_obj) {
|
|
| 1321 | + $geodir_detail_page_tabs_key_value_array[$key] = $tabs_obj['heading_text']; |
|
| 1322 | 1322 | } |
| 1323 | 1323 | |
| 1324 | 1324 | return $geodir_detail_page_tabs_key_value_array; |
@@ -1340,57 +1340,57 @@ discard block |
||
| 1340 | 1340 | * @since 1.0.0 |
| 1341 | 1341 | */ |
| 1342 | 1342 | $arr_tabs['post_profile'] = array( |
| 1343 | - 'heading_text' => __( 'Profile', 'geodirectory' ), |
|
| 1343 | + 'heading_text' => __('Profile', 'geodirectory'),
|
|
| 1344 | 1344 | 'is_active_tab' => true, |
| 1345 | - 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_profile' ), |
|
| 1345 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'post_profile'),
|
|
| 1346 | 1346 | 'tab_content' => '' |
| 1347 | 1347 | ); |
| 1348 | - $arr_tabs['post_info'] = array( |
|
| 1349 | - 'heading_text' => __( 'More Info', 'geodirectory' ), |
|
| 1348 | + $arr_tabs['post_info'] = array( |
|
| 1349 | + 'heading_text' => __('More Info', 'geodirectory'),
|
|
| 1350 | 1350 | 'is_active_tab' => false, |
| 1351 | - 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_info' ), |
|
| 1351 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'post_info'),
|
|
| 1352 | 1352 | 'tab_content' => '' |
| 1353 | 1353 | ); |
| 1354 | 1354 | |
| 1355 | 1355 | $arr_tabs['post_images'] = array( |
| 1356 | - 'heading_text' => __( 'Photos', 'geodirectory' ), |
|
| 1356 | + 'heading_text' => __('Photos', 'geodirectory'),
|
|
| 1357 | 1357 | 'is_active_tab' => false, |
| 1358 | - 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_images' ), |
|
| 1358 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'post_images'),
|
|
| 1359 | 1359 | 'tab_content' => '' |
| 1360 | 1360 | ); |
| 1361 | 1361 | |
| 1362 | 1362 | $arr_tabs['post_video'] = array( |
| 1363 | - 'heading_text' => __( 'Video', 'geodirectory' ), |
|
| 1363 | + 'heading_text' => __('Video', 'geodirectory'),
|
|
| 1364 | 1364 | 'is_active_tab' => false, |
| 1365 | - 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_video' ), |
|
| 1365 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'post_video'),
|
|
| 1366 | 1366 | 'tab_content' => '' |
| 1367 | 1367 | ); |
| 1368 | 1368 | |
| 1369 | 1369 | $arr_tabs['special_offers'] = array( |
| 1370 | - 'heading_text' => __( 'Special Offers', 'geodirectory' ), |
|
| 1370 | + 'heading_text' => __('Special Offers', 'geodirectory'),
|
|
| 1371 | 1371 | 'is_active_tab' => false, |
| 1372 | - 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'special_offers' ), |
|
| 1372 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'special_offers'),
|
|
| 1373 | 1373 | 'tab_content' => '' |
| 1374 | 1374 | ); |
| 1375 | 1375 | |
| 1376 | 1376 | $arr_tabs['post_map'] = array( |
| 1377 | - 'heading_text' => __( 'Map', 'geodirectory' ), |
|
| 1377 | + 'heading_text' => __('Map', 'geodirectory'),
|
|
| 1378 | 1378 | 'is_active_tab' => false, |
| 1379 | - 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_map' ), |
|
| 1379 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'post_map'),
|
|
| 1380 | 1380 | 'tab_content' => '' |
| 1381 | 1381 | ); |
| 1382 | 1382 | |
| 1383 | 1383 | $arr_tabs['reviews'] = array( |
| 1384 | - 'heading_text' => __( 'Reviews', 'geodirectory' ), |
|
| 1384 | + 'heading_text' => __('Reviews', 'geodirectory'),
|
|
| 1385 | 1385 | 'is_active_tab' => false, |
| 1386 | - 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'reviews' ), |
|
| 1386 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'reviews'),
|
|
| 1387 | 1387 | 'tab_content' => 'review display' |
| 1388 | 1388 | ); |
| 1389 | 1389 | |
| 1390 | 1390 | $arr_tabs['related_listing'] = array( |
| 1391 | - 'heading_text' => __( 'Related Listing', 'geodirectory' ), |
|
| 1391 | + 'heading_text' => __('Related Listing', 'geodirectory'),
|
|
| 1392 | 1392 | 'is_active_tab' => false, |
| 1393 | - 'is_display' => apply_filters( 'geodir_detail_page_tab_is_display', true, 'related_listing' ), |
|
| 1393 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, 'related_listing'),
|
|
| 1394 | 1394 | 'tab_content' => '' |
| 1395 | 1395 | ); |
| 1396 | 1396 | |
@@ -1399,7 +1399,7 @@ discard block |
||
| 1399 | 1399 | * |
| 1400 | 1400 | * @since 1.0.0 |
| 1401 | 1401 | */ |
| 1402 | - return apply_filters( 'geodir_detail_page_tab_list_extend', $arr_tabs ); |
|
| 1402 | + return apply_filters('geodir_detail_page_tab_list_extend', $arr_tabs);
|
|
| 1403 | 1403 | |
| 1404 | 1404 | |
| 1405 | 1405 | } |
@@ -1413,13 +1413,13 @@ discard block |
||
| 1413 | 1413 | * @return mixed|array Tabs array. |
| 1414 | 1414 | */ |
| 1415 | 1415 | function geodir_detail_page_tabs_list() {
|
| 1416 | - $tabs_excluded = get_option( 'geodir_detail_page_tabs_excluded' ); |
|
| 1416 | + $tabs_excluded = get_option('geodir_detail_page_tabs_excluded');
|
|
| 1417 | 1417 | $tabs_array = geodir_detail_page_tabs_array(); |
| 1418 | 1418 | |
| 1419 | - if ( ! empty( $tabs_excluded ) ) {
|
|
| 1420 | - foreach ( $tabs_excluded as $tab ) {
|
|
| 1421 | - if ( array_key_exists( $tab, $tabs_array ) ) {
|
|
| 1422 | - unset( $tabs_array[ $tab ] ); |
|
| 1419 | + if (!empty($tabs_excluded)) {
|
|
| 1420 | + foreach ($tabs_excluded as $tab) {
|
|
| 1421 | + if (array_key_exists($tab, $tabs_array)) {
|
|
| 1422 | + unset($tabs_array[$tab]); |
|
| 1423 | 1423 | } |
| 1424 | 1424 | } |
| 1425 | 1425 | } |
@@ -1443,66 +1443,66 @@ discard block |
||
| 1443 | 1443 | function geodir_show_detail_page_tabs() {
|
| 1444 | 1444 | global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields, $preview; |
| 1445 | 1445 | |
| 1446 | - $post_id = ! empty( $post ) && isset( $post->ID ) ? (int) $post->ID : 0; |
|
| 1447 | - $request_post_id = ! empty( $_REQUEST['p'] ) ? (int) $_REQUEST['p'] : 0; |
|
| 1448 | - $is_backend_preview = ( is_single() && ! empty( $_REQUEST['post_type'] ) && ! empty( $_REQUEST['preview'] ) && ! empty( $_REQUEST['p'] ) ) && is_super_admin() ? true : false; // skip if preview from backend |
|
| 1446 | + $post_id = !empty($post) && isset($post->ID) ? (int) $post->ID : 0; |
|
| 1447 | + $request_post_id = !empty($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0; |
|
| 1448 | + $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend |
|
| 1449 | 1449 | |
| 1450 | - if ( $is_backend_preview && ! $post_id > 0 && $request_post_id > 0 ) {
|
|
| 1451 | - $post = geodir_get_post_info( $request_post_id ); |
|
| 1452 | - setup_postdata( $post ); |
|
| 1450 | + if ($is_backend_preview && !$post_id > 0 && $request_post_id > 0) {
|
|
| 1451 | + $post = geodir_get_post_info($request_post_id); |
|
| 1452 | + setup_postdata($post); |
|
| 1453 | 1453 | } |
| 1454 | 1454 | |
| 1455 | - $geodir_post_detail_fields = geodir_show_listing_info( 'moreinfo' ); |
|
| 1455 | + $geodir_post_detail_fields = geodir_show_listing_info('moreinfo');
|
|
| 1456 | 1456 | |
| 1457 | 1457 | $package_info = geodir_post_package_info(array(), $post, (!empty($post->post_type) ? $post->post_type : '')); |
| 1458 | 1458 | $image_limit = ''; |
| 1459 | 1459 | if (defined('GEODIRPAYMENT_VERSION') && !empty($package_info) && isset($package_info->image_limit) && $package_info->image_limit !== '') {
|
| 1460 | - $image_limit = (int)$package_info->image_limit; |
|
| 1460 | + $image_limit = (int) $package_info->image_limit; |
|
| 1461 | 1461 | } |
| 1462 | 1462 | |
| 1463 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 1464 | - $video = geodir_get_video( $post->ID ); |
|
| 1465 | - $special_offers = geodir_get_special_offers( $post->ID ); |
|
| 1463 | + if (geodir_is_page('detail')) {
|
|
| 1464 | + $video = geodir_get_video($post->ID); |
|
| 1465 | + $special_offers = geodir_get_special_offers($post->ID); |
|
| 1466 | 1466 | $related_listing_array = array(); |
| 1467 | - if ( get_option( 'geodir_add_related_listing_posttypes' ) ) {
|
|
| 1468 | - $related_listing_array = get_option( 'geodir_add_related_listing_posttypes' ); |
|
| 1467 | + if (get_option('geodir_add_related_listing_posttypes')) {
|
|
| 1468 | + $related_listing_array = get_option('geodir_add_related_listing_posttypes');
|
|
| 1469 | 1469 | } |
| 1470 | 1470 | |
| 1471 | - $excluded_tabs = get_option( 'geodir_detail_page_tabs_excluded' ); |
|
| 1472 | - if ( ! $excluded_tabs ) {
|
|
| 1471 | + $excluded_tabs = get_option('geodir_detail_page_tabs_excluded');
|
|
| 1472 | + if (!$excluded_tabs) {
|
|
| 1473 | 1473 | $excluded_tabs = array(); |
| 1474 | 1474 | } |
| 1475 | 1475 | |
| 1476 | 1476 | $related_listing = ''; |
| 1477 | - if ( in_array( $post->post_type, $related_listing_array ) && ! in_array( 'related_listing', $excluded_tabs ) ) {
|
|
| 1477 | + if (in_array($post->post_type, $related_listing_array) && !in_array('related_listing', $excluded_tabs)) {
|
|
| 1478 | 1478 | $request = array( |
| 1479 | - 'post_number' => get_option( 'geodir_related_post_count' ), |
|
| 1480 | - 'relate_to' => get_option( 'geodir_related_post_relate_to' ), |
|
| 1481 | - 'layout' => get_option( 'geodir_related_post_listing_view' ), |
|
| 1482 | - 'add_location_filter' => get_option( 'geodir_related_post_location_filter' ), |
|
| 1483 | - 'list_sort' => get_option( 'geodir_related_post_sortby' ), |
|
| 1484 | - 'character_count' => get_option( 'geodir_related_post_excerpt' ) |
|
| 1479 | + 'post_number' => get_option('geodir_related_post_count'),
|
|
| 1480 | + 'relate_to' => get_option('geodir_related_post_relate_to'),
|
|
| 1481 | + 'layout' => get_option('geodir_related_post_listing_view'),
|
|
| 1482 | + 'add_location_filter' => get_option('geodir_related_post_location_filter'),
|
|
| 1483 | + 'list_sort' => get_option('geodir_related_post_sortby'),
|
|
| 1484 | + 'character_count' => get_option('geodir_related_post_excerpt')
|
|
| 1485 | 1485 | ); |
| 1486 | 1486 | |
| 1487 | - if ( $post->post_type == 'gd_event' && defined( 'GDEVENTS_VERSION' ) ) {
|
|
| 1488 | - $related_listing = geodir_get_detail_page_related_events( $request ); |
|
| 1487 | + if ($post->post_type == 'gd_event' && defined('GDEVENTS_VERSION')) {
|
|
| 1488 | + $related_listing = geodir_get_detail_page_related_events($request); |
|
| 1489 | 1489 | } else {
|
| 1490 | - $related_listing = geodir_related_posts_display( $request ); |
|
| 1490 | + $related_listing = geodir_related_posts_display($request); |
|
| 1491 | 1491 | } |
| 1492 | 1492 | |
| 1493 | 1493 | } |
| 1494 | 1494 | |
| 1495 | - $post_images = geodir_get_images( $post->ID, 'thumbnail' ); |
|
| 1495 | + $post_images = geodir_get_images($post->ID, 'thumbnail'); |
|
| 1496 | 1496 | $thumb_image = ''; |
| 1497 | - if ( ! empty( $post_images ) ) {
|
|
| 1497 | + if (!empty($post_images)) {
|
|
| 1498 | 1498 | $count = 1; |
| 1499 | - foreach ( $post_images as $image ) {
|
|
| 1499 | + foreach ($post_images as $image) {
|
|
| 1500 | 1500 | if ($image_limit !== '' && $count > $image_limit) {
|
| 1501 | 1501 | break; |
| 1502 | 1502 | } |
| 1503 | - $caption = ( ! empty( $image->caption ) ) ? $image->caption : ''; |
|
| 1504 | - $thumb_image .= '<a href="' . $image->src . '" title="' . $caption . '">'; |
|
| 1505 | - $thumb_image .= geodir_show_image( $image, 'thumbnail', true, false ); |
|
| 1503 | + $caption = (!empty($image->caption)) ? $image->caption : ''; |
|
| 1504 | + $thumb_image .= '<a href="'.$image->src.'" title="'.$caption.'">'; |
|
| 1505 | + $thumb_image .= geodir_show_image($image, 'thumbnail', true, false); |
|
| 1506 | 1506 | $thumb_image .= '</a>'; |
| 1507 | 1507 | $count++; |
| 1508 | 1508 | } |
@@ -1512,11 +1512,11 @@ discard block |
||
| 1512 | 1512 | $map_args['map_canvas_name'] = 'detail_page_map_canvas'; |
| 1513 | 1513 | $map_args['width'] = '600'; |
| 1514 | 1514 | $map_args['height'] = '300'; |
| 1515 | - if ( $post->post_mapzoom ) {
|
|
| 1516 | - $map_args['zoom'] = '' . $post->post_mapzoom . ''; |
|
| 1515 | + if ($post->post_mapzoom) {
|
|
| 1516 | + $map_args['zoom'] = ''.$post->post_mapzoom.''; |
|
| 1517 | 1517 | } |
| 1518 | 1518 | $map_args['autozoom'] = false; |
| 1519 | - $map_args['scrollwheel'] = ( get_option( 'geodir_add_listing_mouse_scroll' ) ) ? 0 : 1; |
|
| 1519 | + $map_args['scrollwheel'] = (get_option('geodir_add_listing_mouse_scroll')) ? 0 : 1;
|
|
| 1520 | 1520 | $map_args['child_collapse'] = '0'; |
| 1521 | 1521 | $map_args['enable_cat_filters'] = false; |
| 1522 | 1522 | $map_args['enable_text_search'] = false; |
@@ -1525,29 +1525,29 @@ discard block |
||
| 1525 | 1525 | $map_args['enable_jason_on_load'] = true; |
| 1526 | 1526 | $map_args['enable_map_direction'] = true; |
| 1527 | 1527 | $map_args['map_class_name'] = 'geodir-map-detail-page'; |
| 1528 | - $map_args['maptype'] = ( ! empty( $post->post_mapview ) ) ? $post->post_mapview : 'ROADMAP'; |
|
| 1529 | - } else if ( geodir_is_page( 'preview' ) ) {
|
|
| 1530 | - $video = isset( $post->geodir_video ) ? $post->geodir_video : ''; |
|
| 1531 | - $special_offers = isset( $post->geodir_special_offers ) ? $post->geodir_special_offers : ''; |
|
| 1528 | + $map_args['maptype'] = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP'; |
|
| 1529 | + } else if (geodir_is_page('preview')) {
|
|
| 1530 | + $video = isset($post->geodir_video) ? $post->geodir_video : ''; |
|
| 1531 | + $special_offers = isset($post->geodir_special_offers) ? $post->geodir_special_offers : ''; |
|
| 1532 | 1532 | |
| 1533 | - if ( isset( $post->post_images ) ) {
|
|
| 1534 | - $post->post_images = trim( $post->post_images, "," ); |
|
| 1533 | + if (isset($post->post_images)) {
|
|
| 1534 | + $post->post_images = trim($post->post_images, ","); |
|
| 1535 | 1535 | } |
| 1536 | 1536 | |
| 1537 | - if ( isset( $post->post_images ) && ! empty( $post->post_images ) ) {
|
|
| 1538 | - $post_images = explode( ",", $post->post_images ); |
|
| 1537 | + if (isset($post->post_images) && !empty($post->post_images)) {
|
|
| 1538 | + $post_images = explode(",", $post->post_images);
|
|
| 1539 | 1539 | } |
| 1540 | 1540 | |
| 1541 | 1541 | $thumb_image = ''; |
| 1542 | - if ( ! empty( $post_images ) ) {
|
|
| 1542 | + if (!empty($post_images)) {
|
|
| 1543 | 1543 | $count = 1; |
| 1544 | - foreach ( $post_images as $image ) {
|
|
| 1545 | - if ( $image != '' ) {
|
|
| 1544 | + foreach ($post_images as $image) {
|
|
| 1545 | + if ($image != '') {
|
|
| 1546 | 1546 | if ($image_limit !== '' && $count > $image_limit) {
|
| 1547 | 1547 | break; |
| 1548 | 1548 | } |
| 1549 | - $thumb_image .= '<a href="' . $image . '">'; |
|
| 1550 | - $thumb_image .= geodir_show_image( array( 'src' => $image ), 'thumbnail', true, false ); |
|
| 1549 | + $thumb_image .= '<a href="'.$image.'">'; |
|
| 1550 | + $thumb_image .= geodir_show_image(array('src' => $image), 'thumbnail', true, false);
|
|
| 1551 | 1551 | $thumb_image .= '</a>'; |
| 1552 | 1552 | $count++; |
| 1553 | 1553 | } |
@@ -1555,18 +1555,18 @@ discard block |
||
| 1555 | 1555 | } |
| 1556 | 1556 | |
| 1557 | 1557 | global $map_jason; |
| 1558 | - $marker_json = $post->marker_json != '' ? json_decode( $post->marker_json, true ) : array(); |
|
| 1559 | - $marker_icon = ( ! empty( $marker_json ) && ! empty( $marker_json['i'] ) ) ? $marker_json['i'] : ''; |
|
| 1560 | - $icon_size = geodir_get_marker_size( $marker_icon ); |
|
| 1558 | + $marker_json = $post->marker_json != '' ? json_decode($post->marker_json, true) : array(); |
|
| 1559 | + $marker_icon = (!empty($marker_json) && !empty($marker_json['i'])) ? $marker_json['i'] : ''; |
|
| 1560 | + $icon_size = geodir_get_marker_size($marker_icon); |
|
| 1561 | 1561 | $marker_json['w'] = $icon_size['w']; |
| 1562 | 1562 | $marker_json['h'] = $icon_size['h']; |
| 1563 | - $map_jason[] = json_encode( $marker_json ); |
|
| 1563 | + $map_jason[] = json_encode($marker_json); |
|
| 1564 | 1564 | |
| 1565 | - $address_latitude = isset( $post->post_latitude ) ? $post->post_latitude : ''; |
|
| 1566 | - $address_longitude = isset( $post->post_longitude ) ? $post->post_longitude : ''; |
|
| 1567 | - $mapview = isset( $post->post_mapview ) ? $post->post_mapview : ''; |
|
| 1568 | - $mapzoom = isset( $post->post_mapzoom ) ? $post->post_mapzoom : ''; |
|
| 1569 | - if ( ! $mapzoom ) {
|
|
| 1565 | + $address_latitude = isset($post->post_latitude) ? $post->post_latitude : ''; |
|
| 1566 | + $address_longitude = isset($post->post_longitude) ? $post->post_longitude : ''; |
|
| 1567 | + $mapview = isset($post->post_mapview) ? $post->post_mapview : ''; |
|
| 1568 | + $mapzoom = isset($post->post_mapzoom) ? $post->post_mapzoom : ''; |
|
| 1569 | + if (!$mapzoom) {
|
|
| 1570 | 1570 | $mapzoom = 12; |
| 1571 | 1571 | } |
| 1572 | 1572 | |
@@ -1589,37 +1589,37 @@ discard block |
||
| 1589 | 1589 | $map_args['map_class_name'] = 'geodir-map-preview-page'; |
| 1590 | 1590 | } |
| 1591 | 1591 | |
| 1592 | - $arr_detail_page_tabs = geodir_detail_page_tabs_list();// get this sooner so we can get the active tab for the user |
|
| 1592 | + $arr_detail_page_tabs = geodir_detail_page_tabs_list(); // get this sooner so we can get the active tab for the user |
|
| 1593 | 1593 | |
| 1594 | 1594 | $active_tab = ''; |
| 1595 | 1595 | $active_tab_name = ''; |
| 1596 | 1596 | $default_tab = ''; |
| 1597 | 1597 | $default_tab_name = ''; |
| 1598 | - foreach ( $arr_detail_page_tabs as $tab_index => $tabs ) {
|
|
| 1599 | - if ( isset( $tabs['is_active_tab'] ) && $tabs['is_active_tab'] && ! empty( $tabs['is_display'] ) && isset( $tabs['heading_text'] ) && $tabs['heading_text'] ) {
|
|
| 1598 | + foreach ($arr_detail_page_tabs as $tab_index => $tabs) {
|
|
| 1599 | + if (isset($tabs['is_active_tab']) && $tabs['is_active_tab'] && !empty($tabs['is_display']) && isset($tabs['heading_text']) && $tabs['heading_text']) {
|
|
| 1600 | 1600 | $active_tab = $tab_index; |
| 1601 | - $active_tab_name = __( $tabs['heading_text'], 'geodirectory' ); |
|
| 1601 | + $active_tab_name = __($tabs['heading_text'], 'geodirectory'); |
|
| 1602 | 1602 | } |
| 1603 | 1603 | |
| 1604 | - if ( $default_tab === '' && ! empty( $tabs['is_display'] ) && ! empty( $tabs['heading_text'] ) ) {
|
|
| 1604 | + if ($default_tab === '' && !empty($tabs['is_display']) && !empty($tabs['heading_text'])) {
|
|
| 1605 | 1605 | $default_tab = $tab_index; |
| 1606 | - $default_tab_name = __( $tabs['heading_text'], 'geodirectory' ); |
|
| 1606 | + $default_tab_name = __($tabs['heading_text'], 'geodirectory'); |
|
| 1607 | 1607 | } |
| 1608 | 1608 | } |
| 1609 | 1609 | |
| 1610 | - if ( $active_tab === '' && $default_tab !== '' ) { // Make first tab as a active tab if not any tab is active.
|
|
| 1611 | - if ( isset( $arr_detail_page_tabs[ $active_tab ] ) && isset( $arr_detail_page_tabs[ $active_tab ]['is_active_tab'] ) ) {
|
|
| 1612 | - $arr_detail_page_tabs[ $active_tab ]['is_active_tab'] = false; |
|
| 1610 | + if ($active_tab === '' && $default_tab !== '') { // Make first tab as a active tab if not any tab is active.
|
|
| 1611 | + if (isset($arr_detail_page_tabs[$active_tab]) && isset($arr_detail_page_tabs[$active_tab]['is_active_tab'])) {
|
|
| 1612 | + $arr_detail_page_tabs[$active_tab]['is_active_tab'] = false; |
|
| 1613 | 1613 | } |
| 1614 | 1614 | |
| 1615 | - $arr_detail_page_tabs[ $default_tab ]['is_active_tab'] = true; |
|
| 1615 | + $arr_detail_page_tabs[$default_tab]['is_active_tab'] = true; |
|
| 1616 | 1616 | $active_tab = $default_tab; |
| 1617 | 1617 | $active_tab_name = $default_tab_name; |
| 1618 | 1618 | } |
| 1619 | - $tab_list = ( get_option( 'geodir_disable_tabs', false ) ) ? true : false; |
|
| 1619 | + $tab_list = (get_option('geodir_disable_tabs', false)) ? true : false;
|
|
| 1620 | 1620 | ?> |
| 1621 | 1621 | <div class="geodir-tabs" id="gd-tabs" style="position:relative;"> |
| 1622 | - <?php if ( ! $tab_list ){ ?>
|
|
| 1622 | + <?php if (!$tab_list) { ?>
|
|
| 1623 | 1623 | <div id="geodir-tab-mobile-menu"> |
| 1624 | 1624 | <i class="fa fa-bars"></i> |
| 1625 | 1625 | <span class="geodir-mobile-active-tab"><?php echo $active_tab_name; ?></span> |
@@ -1634,26 +1634,26 @@ discard block |
||
| 1634 | 1634 | * @since 1.0.0 |
| 1635 | 1635 | * @see 'geodir_after_tab_list' |
| 1636 | 1636 | */ |
| 1637 | - do_action( 'geodir_before_tab_list' ); ?> |
|
| 1637 | + do_action('geodir_before_tab_list'); ?>
|
|
| 1638 | 1638 | <?php |
| 1639 | 1639 | |
| 1640 | - foreach ( $arr_detail_page_tabs as $tab_index => $detail_page_tab ) {
|
|
| 1641 | - if ( $detail_page_tab['is_display'] ) {
|
|
| 1640 | + foreach ($arr_detail_page_tabs as $tab_index => $detail_page_tab) {
|
|
| 1641 | + if ($detail_page_tab['is_display']) {
|
|
| 1642 | 1642 | |
| 1643 | - if ( ! $tab_list ) {
|
|
| 1643 | + if (!$tab_list) {
|
|
| 1644 | 1644 | ?> |
| 1645 | 1645 | <dt></dt> <!-- added to comply with validation --> |
| 1646 | - <dd <?php if ( $detail_page_tab['is_active_tab'] ){ ?>class="geodir-tab-active"<?php } ?> ><a
|
|
| 1646 | + <dd <?php if ($detail_page_tab['is_active_tab']) { ?>class="geodir-tab-active"<?php } ?> ><a
|
|
| 1647 | 1647 | data-tab="#<?php echo $tab_index; ?>" |
| 1648 | - data-status="enable"><?php _e( $detail_page_tab['heading_text'], 'geodirectory' ); ?></a> |
|
| 1648 | + data-status="enable"><?php _e($detail_page_tab['heading_text'], 'geodirectory'); ?></a> |
|
| 1649 | 1649 | </dd> |
| 1650 | 1650 | <?php |
| 1651 | 1651 | } |
| 1652 | 1652 | ob_start() // start tab content buffering |
| 1653 | 1653 | ?> |
| 1654 | 1654 | <li id="<?php echo $tab_index; ?>Tab"> |
| 1655 | - <?php if ( $tab_list ) {
|
|
| 1656 | - $tab_title = '<span class="gd-tab-list-title" ><a href="#' . $tab_index . '">' . __( $detail_page_tab['heading_text'], 'geodirectory' ) . '</a></span><hr />'; |
|
| 1655 | + <?php if ($tab_list) {
|
|
| 1656 | + $tab_title = '<span class="gd-tab-list-title" ><a href="#'.$tab_index.'">'.__($detail_page_tab['heading_text'], 'geodirectory').'</a></span><hr />'; |
|
| 1657 | 1657 | /** |
| 1658 | 1658 | * Filter the tab list title html. |
| 1659 | 1659 | * |
@@ -1663,7 +1663,7 @@ discard block |
||
| 1663 | 1663 | * @param string $tab_index The tab index type. |
| 1664 | 1664 | * @param array $detail_page_tab The array of values including title text. |
| 1665 | 1665 | */ |
| 1666 | - echo apply_filters( 'geodir_tab_list_title', $tab_title, $tab_index, $detail_page_tab ); |
|
| 1666 | + echo apply_filters('geodir_tab_list_title', $tab_title, $tab_index, $detail_page_tab);
|
|
| 1667 | 1667 | } ?> |
| 1668 | 1668 | <div id="<?php echo $tab_index; ?>" class="hash-offset"></div> |
| 1669 | 1669 | <?php |
@@ -1674,7 +1674,7 @@ discard block |
||
| 1674 | 1674 | * |
| 1675 | 1675 | * @param string $tab_index The tab name ID. |
| 1676 | 1676 | */ |
| 1677 | - do_action( 'geodir_before_tab_content', $tab_index ); |
|
| 1677 | + do_action('geodir_before_tab_content', $tab_index);
|
|
| 1678 | 1678 | |
| 1679 | 1679 | /** |
| 1680 | 1680 | * Called before the details tab content is output per tab. |
@@ -1684,21 +1684,21 @@ discard block |
||
| 1684 | 1684 | * @since 1.0.0 |
| 1685 | 1685 | * @todo do we need this if we have the hook above? 'geodir_before_tab_content' |
| 1686 | 1686 | */ |
| 1687 | - do_action( 'geodir_before_' . $tab_index . '_tab_content' ); |
|
| 1687 | + do_action('geodir_before_'.$tab_index.'_tab_content');
|
|
| 1688 | 1688 | /// write a code to generate content of each tab |
| 1689 | - switch ( $tab_index ) {
|
|
| 1689 | + switch ($tab_index) {
|
|
| 1690 | 1690 | case 'post_profile': |
| 1691 | 1691 | /** |
| 1692 | 1692 | * Called before the listing description content on the details page tab. |
| 1693 | 1693 | * |
| 1694 | 1694 | * @since 1.0.0 |
| 1695 | 1695 | */ |
| 1696 | - do_action( 'geodir_before_description_on_listing_detail' ); |
|
| 1697 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 1696 | + do_action('geodir_before_description_on_listing_detail');
|
|
| 1697 | + if (geodir_is_page('detail')) {
|
|
| 1698 | 1698 | the_content(); |
| 1699 | 1699 | } else {
|
| 1700 | 1700 | /** This action is documented in geodirectory_template_actions.php */ |
| 1701 | - echo apply_filters( 'the_content', stripslashes( $post->post_desc ) ); |
|
| 1701 | + echo apply_filters('the_content', stripslashes($post->post_desc));
|
|
| 1702 | 1702 | } |
| 1703 | 1703 | |
| 1704 | 1704 | /** |
@@ -1706,7 +1706,7 @@ discard block |
||
| 1706 | 1706 | * |
| 1707 | 1707 | * @since 1.0.0 |
| 1708 | 1708 | */ |
| 1709 | - do_action( 'geodir_after_description_on_listing_detail' ); |
|
| 1709 | + do_action('geodir_after_description_on_listing_detail');
|
|
| 1710 | 1710 | break; |
| 1711 | 1711 | case 'post_info': |
| 1712 | 1712 | echo $geodir_post_detail_fields; |
@@ -1716,32 +1716,32 @@ discard block |
||
| 1716 | 1716 | break; |
| 1717 | 1717 | case 'post_video': |
| 1718 | 1718 | // some browsers hide $_POST data if used for embeds so we replace with a placeholder |
| 1719 | - if ( $preview ) {
|
|
| 1720 | - if ( $video ) {
|
|
| 1721 | - echo "<span class='gd-video-embed-preview' ><p class='gd-video-preview-text'><i class=\"fa fa-video-camera\" aria-hidden=\"true\"></i><br />" . __( 'Video Preview Placeholder', 'geodirectory' ) . "</p></span>"; |
|
| 1719 | + if ($preview) {
|
|
| 1720 | + if ($video) {
|
|
| 1721 | + echo "<span class='gd-video-embed-preview' ><p class='gd-video-preview-text'><i class=\"fa fa-video-camera\" aria-hidden=\"true\"></i><br />".__('Video Preview Placeholder', 'geodirectory')."</p></span>";
|
|
| 1722 | 1722 | } |
| 1723 | 1723 | } else {
|
| 1724 | 1724 | |
| 1725 | 1725 | // stop payment manager filtering content length |
| 1726 | - $filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' ); |
|
| 1727 | - if ( false !== $filter_priority ) {
|
|
| 1728 | - remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority ); |
|
| 1726 | + $filter_priority = has_filter('the_content', 'geodir_payments_the_content');
|
|
| 1727 | + if (false !== $filter_priority) {
|
|
| 1728 | + remove_filter('the_content', 'geodir_payments_the_content', $filter_priority);
|
|
| 1729 | 1729 | } |
| 1730 | 1730 | |
| 1731 | 1731 | /** This action is documented in geodirectory_template_actions.php */ |
| 1732 | - echo apply_filters( 'the_content', stripslashes( $video ) );// we apply the_content filter so oembed works also; |
|
| 1732 | + echo apply_filters('the_content', stripslashes($video)); // we apply the_content filter so oembed works also;
|
|
| 1733 | 1733 | |
| 1734 | - if ( false !== $filter_priority ) {
|
|
| 1735 | - add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority ); |
|
| 1734 | + if (false !== $filter_priority) {
|
|
| 1735 | + add_filter('the_content', 'geodir_payments_the_content', $filter_priority);
|
|
| 1736 | 1736 | } |
| 1737 | 1737 | } |
| 1738 | 1738 | break; |
| 1739 | 1739 | case 'special_offers': |
| 1740 | - echo apply_filters( 'gd_special_offers_content', wpautop( stripslashes( $special_offers ) ) ); |
|
| 1740 | + echo apply_filters('gd_special_offers_content', wpautop(stripslashes($special_offers)));
|
|
| 1741 | 1741 | |
| 1742 | 1742 | break; |
| 1743 | 1743 | case 'post_map': |
| 1744 | - geodir_draw_map( $map_args ); |
|
| 1744 | + geodir_draw_map($map_args); |
|
| 1745 | 1745 | break; |
| 1746 | 1746 | case 'reviews': |
| 1747 | 1747 | comments_template(); |
@@ -1750,7 +1750,7 @@ discard block |
||
| 1750 | 1750 | echo $related_listing; |
| 1751 | 1751 | break; |
| 1752 | 1752 | default: {
|
| 1753 | - if ( ( isset( $post->{$tab_index} ) || ( ! isset( $post->{$tab_index} ) && ( strpos( $tab_index, 'gd_tab_' ) !== false || $tab_index == 'link_business' ) ) ) && ! empty( $detail_page_tab['tab_content'] ) ) {
|
|
| 1753 | + if ((isset($post->{$tab_index} ) || (!isset($post->{$tab_index} ) && (strpos($tab_index, 'gd_tab_') !== false || $tab_index == 'link_business'))) && !empty($detail_page_tab['tab_content'])) {
|
|
| 1754 | 1754 | echo $detail_page_tab['tab_content']; |
| 1755 | 1755 | } |
| 1756 | 1756 | } |
@@ -1762,7 +1762,7 @@ discard block |
||
| 1762 | 1762 | * |
| 1763 | 1763 | * @since 1.0.0 |
| 1764 | 1764 | */ |
| 1765 | - do_action( 'geodir_after_tab_content', $tab_index ); |
|
| 1765 | + do_action('geodir_after_tab_content', $tab_index);
|
|
| 1766 | 1766 | |
| 1767 | 1767 | /** |
| 1768 | 1768 | * Called after the details tab content is output per tab. |
@@ -1772,7 +1772,7 @@ discard block |
||
| 1772 | 1772 | * @since 1.0.0 |
| 1773 | 1773 | * @todo do we need this if we have the hook above? 'geodir_after_tab_content' |
| 1774 | 1774 | */ |
| 1775 | - do_action( 'geodir_after_' . $tab_index . '_tab_content' ); |
|
| 1775 | + do_action('geodir_after_'.$tab_index.'_tab_content');
|
|
| 1776 | 1776 | ?> </li> |
| 1777 | 1777 | <?php |
| 1778 | 1778 | /** |
@@ -1780,7 +1780,7 @@ discard block |
||
| 1780 | 1780 | * |
| 1781 | 1781 | * @since 1.0.0 |
| 1782 | 1782 | */ |
| 1783 | - $arr_detail_page_tabs[ $tab_index ]['tab_content'] = apply_filters( "geodir_modify_" . $detail_page_tab['tab_content'] . "_tab_content", ob_get_clean() ); |
|
| 1783 | + $arr_detail_page_tabs[$tab_index]['tab_content'] = apply_filters("geodir_modify_".$detail_page_tab['tab_content']."_tab_content", ob_get_clean());
|
|
| 1784 | 1784 | } // end of if for is_display |
| 1785 | 1785 | }// end of foreach |
| 1786 | 1786 | |
@@ -1790,14 +1790,14 @@ discard block |
||
| 1790 | 1790 | * @since 1.0.0 |
| 1791 | 1791 | * @see 'geodir_before_tab_list' |
| 1792 | 1792 | */ |
| 1793 | - do_action( 'geodir_after_tab_list' ); |
|
| 1793 | + do_action('geodir_after_tab_list');
|
|
| 1794 | 1794 | ?> |
| 1795 | - <?php if ( ! $tab_list ){ ?></dl><?php } ?>
|
|
| 1796 | - <ul class="geodir-tabs-content entry-content <?php if ( $tab_list ) { ?>geodir-tabs-list<?php } ?>"
|
|
| 1795 | + <?php if (!$tab_list) { ?></dl><?php } ?>
|
|
| 1796 | + <ul class="geodir-tabs-content entry-content <?php if ($tab_list) { ?>geodir-tabs-list<?php } ?>"
|
|
| 1797 | 1797 | style="position:relative;"> |
| 1798 | 1798 | <?php |
| 1799 | - foreach ( $arr_detail_page_tabs as $detail_page_tab ) {
|
|
| 1800 | - if ( $detail_page_tab['is_display'] && ! empty( $detail_page_tab['tab_content'] ) ) {
|
|
| 1799 | + foreach ($arr_detail_page_tabs as $detail_page_tab) {
|
|
| 1800 | + if ($detail_page_tab['is_display'] && !empty($detail_page_tab['tab_content'])) {
|
|
| 1801 | 1801 | echo $detail_page_tab['tab_content']; |
| 1802 | 1802 | }// end of if |
| 1803 | 1803 | }// end of foreach |
@@ -1807,11 +1807,11 @@ discard block |
||
| 1807 | 1807 | * |
| 1808 | 1808 | * @since 1.0.0 |
| 1809 | 1809 | */ |
| 1810 | - do_action( 'geodir_add_tab_content' ); ?> |
|
| 1810 | + do_action('geodir_add_tab_content'); ?>
|
|
| 1811 | 1811 | </ul> |
| 1812 | 1812 | <!--gd-tabs-content ul end--> |
| 1813 | 1813 | </div> |
| 1814 | - <?php if ( ! $tab_list ) { ?>
|
|
| 1814 | + <?php if (!$tab_list) { ?>
|
|
| 1815 | 1815 | <script> |
| 1816 | 1816 | if (window.location.hash && window.location.hash.indexOf('&') === -1 && jQuery(window.location.hash + 'Tab').length) {
|
| 1817 | 1817 | hashVal = window.location.hash; |
@@ -1843,31 +1843,31 @@ discard block |
||
| 1843 | 1843 | * |
| 1844 | 1844 | * @return mixed Image file. |
| 1845 | 1845 | */ |
| 1846 | -function geodir_exif( $file ) {
|
|
| 1847 | - if ( empty( $file ) || ! is_array( $file ) ) {
|
|
| 1846 | +function geodir_exif($file) {
|
|
| 1847 | + if (empty($file) || !is_array($file)) {
|
|
| 1848 | 1848 | return $file; |
| 1849 | 1849 | } |
| 1850 | 1850 | |
| 1851 | - $file_path = ! empty( $file['tmp_name'] ) ? sanitize_text_field( $file['tmp_name'] ) : ''; |
|
| 1852 | - if ( ! ( $file_path && file_exists( $file_path ) ) ) {
|
|
| 1851 | + $file_path = !empty($file['tmp_name']) ? sanitize_text_field($file['tmp_name']) : ''; |
|
| 1852 | + if (!($file_path && file_exists($file_path))) {
|
|
| 1853 | 1853 | return $file; |
| 1854 | 1854 | } |
| 1855 | 1855 | $file['file'] = $file_path; |
| 1856 | 1856 | |
| 1857 | - if ( ! file_is_valid_image( $file_path ) ) {
|
|
| 1857 | + if (!file_is_valid_image($file_path)) {
|
|
| 1858 | 1858 | return $file; // Bail if file is not an image. |
| 1859 | 1859 | } |
| 1860 | 1860 | |
| 1861 | - if ( ! function_exists( 'wp_get_image_editor' ) ) {
|
|
| 1861 | + if (!function_exists('wp_get_image_editor')) {
|
|
| 1862 | 1862 | return $file; |
| 1863 | 1863 | } |
| 1864 | 1864 | |
| 1865 | 1865 | $mime_type = $file['type']; |
| 1866 | 1866 | $exif = array(); |
| 1867 | - if ( $mime_type == 'image/jpeg' && function_exists( 'exif_read_data' ) ) {
|
|
| 1867 | + if ($mime_type == 'image/jpeg' && function_exists('exif_read_data')) {
|
|
| 1868 | 1868 | try {
|
| 1869 | - $exif = exif_read_data( $file_path ); |
|
| 1870 | - } catch ( Exception $e ) {
|
|
| 1869 | + $exif = exif_read_data($file_path); |
|
| 1870 | + } catch (Exception $e) {
|
|
| 1871 | 1871 | $exif = array(); |
| 1872 | 1872 | } |
| 1873 | 1873 | } |
@@ -1876,13 +1876,13 @@ discard block |
||
| 1876 | 1876 | $flip = false; |
| 1877 | 1877 | $modify = false; |
| 1878 | 1878 | $orientation = 0; |
| 1879 | - if ( ! empty( $exif ) && isset( $exif['Orientation'] ) ) {
|
|
| 1880 | - switch ( (int) $exif['Orientation'] ) {
|
|
| 1879 | + if (!empty($exif) && isset($exif['Orientation'])) {
|
|
| 1880 | + switch ((int) $exif['Orientation']) {
|
|
| 1881 | 1881 | case 1: |
| 1882 | 1882 | // do nothing |
| 1883 | 1883 | break; |
| 1884 | 1884 | case 2: |
| 1885 | - $flip = array( false, true ); |
|
| 1885 | + $flip = array(false, true); |
|
| 1886 | 1886 | $modify = true; |
| 1887 | 1887 | break; |
| 1888 | 1888 | case 3: |
@@ -1891,13 +1891,13 @@ discard block |
||
| 1891 | 1891 | $modify = true; |
| 1892 | 1892 | break; |
| 1893 | 1893 | case 4: |
| 1894 | - $flip = array( true, false ); |
|
| 1894 | + $flip = array(true, false); |
|
| 1895 | 1895 | $modify = true; |
| 1896 | 1896 | break; |
| 1897 | 1897 | case 5: |
| 1898 | 1898 | $orientation = - 90; |
| 1899 | 1899 | $rotate = true; |
| 1900 | - $flip = array( false, true ); |
|
| 1900 | + $flip = array(false, true); |
|
| 1901 | 1901 | $modify = true; |
| 1902 | 1902 | break; |
| 1903 | 1903 | case 6: |
@@ -1908,7 +1908,7 @@ discard block |
||
| 1908 | 1908 | case 7: |
| 1909 | 1909 | $orientation = - 270; |
| 1910 | 1910 | $rotate = true; |
| 1911 | - $flip = array( false, true ); |
|
| 1911 | + $flip = array(false, true); |
|
| 1912 | 1912 | $modify = true; |
| 1913 | 1913 | break; |
| 1914 | 1914 | case 8: |
@@ -1934,31 +1934,31 @@ discard block |
||
| 1934 | 1934 | * @param int|null $quality Image Compression quality between 1-100% scale. Default null. |
| 1935 | 1935 | * @param string $quality Image mime type. |
| 1936 | 1936 | */ |
| 1937 | - $quality = apply_filters( 'geodir_image_upload_set_quality', $quality, $mime_type ); |
|
| 1938 | - if ( $quality !== null ) {
|
|
| 1937 | + $quality = apply_filters('geodir_image_upload_set_quality', $quality, $mime_type);
|
|
| 1938 | + if ($quality !== null) {
|
|
| 1939 | 1939 | $modify = true; |
| 1940 | 1940 | } |
| 1941 | 1941 | |
| 1942 | - if ( ! $modify ) {
|
|
| 1942 | + if (!$modify) {
|
|
| 1943 | 1943 | return $file; // no change |
| 1944 | 1944 | } |
| 1945 | 1945 | |
| 1946 | - $image = wp_get_image_editor( $file_path ); |
|
| 1947 | - if ( ! is_wp_error( $image ) ) {
|
|
| 1948 | - if ( $rotate ) {
|
|
| 1949 | - $image->rotate( $orientation ); |
|
| 1946 | + $image = wp_get_image_editor($file_path); |
|
| 1947 | + if (!is_wp_error($image)) {
|
|
| 1948 | + if ($rotate) {
|
|
| 1949 | + $image->rotate($orientation); |
|
| 1950 | 1950 | } |
| 1951 | 1951 | |
| 1952 | - if ( ! empty( $flip ) ) {
|
|
| 1953 | - $image->flip( $flip[0], $flip[1] ); |
|
| 1952 | + if (!empty($flip)) {
|
|
| 1953 | + $image->flip($flip[0], $flip[1]); |
|
| 1954 | 1954 | } |
| 1955 | 1955 | |
| 1956 | - if ( $quality !== null ) {
|
|
| 1957 | - $image->set_quality( (int) $quality ); |
|
| 1956 | + if ($quality !== null) {
|
|
| 1957 | + $image->set_quality((int) $quality); |
|
| 1958 | 1958 | } |
| 1959 | 1959 | |
| 1960 | - $result = $image->save( $file_path ); |
|
| 1961 | - if ( ! is_wp_error( $result ) ) {
|
|
| 1960 | + $result = $image->save($file_path); |
|
| 1961 | + if (!is_wp_error($result)) {
|
|
| 1962 | 1962 | $file['file'] = $result['path']; |
| 1963 | 1963 | $file['tmp_name'] = $result['path']; |
| 1964 | 1964 | } |
@@ -1986,7 +1986,7 @@ discard block |
||
| 1986 | 1986 | * |
| 1987 | 1987 | * @return string Returns the recent reviews html. |
| 1988 | 1988 | */ |
| 1989 | -function geodir_get_recent_reviews( $g_size = 60, $no_comments = 5, $comment_lenth = 60, $show_pass_post = false ) {
|
|
| 1989 | +function geodir_get_recent_reviews($g_size = 60, $no_comments = 5, $comment_lenth = 60, $show_pass_post = false) {
|
|
| 1990 | 1990 | global $wpdb, $tablecomments, $tableposts, $rating_table_name, $gd_session, $table_prefix; |
| 1991 | 1991 | $tablecomments = $wpdb->comments; |
| 1992 | 1992 | $tableposts = $wpdb->posts; |
@@ -1996,17 +1996,17 @@ discard block |
||
| 1996 | 1996 | $region_filter = ''; |
| 1997 | 1997 | $country_filter = ''; |
| 1998 | 1998 | |
| 1999 | - if ( $gd_session->get( 'gd_multi_location' ) ) {
|
|
| 2000 | - if ( $gd_ses_country = $gd_session->get( 'gd_country' ) ) {
|
|
| 2001 | - $country_filter = $wpdb->prepare( " AND r.post_country=%s ", str_replace( "-", " ", $gd_ses_country ) ); |
|
| 1999 | + if ($gd_session->get('gd_multi_location')) {
|
|
| 2000 | + if ($gd_ses_country = $gd_session->get('gd_country')) {
|
|
| 2001 | + $country_filter = $wpdb->prepare(" AND r.post_country=%s ", str_replace("-", " ", $gd_ses_country));
|
|
| 2002 | 2002 | } |
| 2003 | 2003 | |
| 2004 | - if ( $gd_ses_region = $gd_session->get( 'gd_region' ) ) {
|
|
| 2005 | - $region_filter = $wpdb->prepare( " AND r.post_region=%s ", str_replace( "-", " ", $gd_ses_region ) ); |
|
| 2004 | + if ($gd_ses_region = $gd_session->get('gd_region')) {
|
|
| 2005 | + $region_filter = $wpdb->prepare(" AND r.post_region=%s ", str_replace("-", " ", $gd_ses_region));
|
|
| 2006 | 2006 | } |
| 2007 | 2007 | |
| 2008 | - if ( $gd_ses_city = $gd_session->get( 'gd_city' ) ) {
|
|
| 2009 | - $city_filter = $wpdb->prepare( " AND r.post_city=%s ", str_replace( "-", " ", $gd_ses_city ) ); |
|
| 2008 | + if ($gd_ses_city = $gd_session->get('gd_city')) {
|
|
| 2009 | + $city_filter = $wpdb->prepare(" AND r.post_city=%s ", str_replace("-", " ", $gd_ses_city));
|
|
| 2010 | 2010 | } |
| 2011 | 2011 | } |
| 2012 | 2012 | |
@@ -2017,84 +2017,84 @@ discard block |
||
| 2017 | 2017 | $lang_code = ICL_LANGUAGE_CODE; |
| 2018 | 2018 | |
| 2019 | 2019 | if ($lang_code) {
|
| 2020 | - $join .= " JOIN " . $table_prefix . "icl_translations AS icltr2 ON icltr2.element_id = c.comment_post_ID AND p.ID = icltr2.element_id AND CONCAT('post_', p.post_type) = icltr2.element_type LEFT JOIN " . $table_prefix . "icl_translations AS icltr_comment ON icltr_comment.element_id = c.comment_ID AND icltr_comment.element_type = 'comment'";
|
|
| 2021 | - $where .= " AND icltr2.language_code = '" . $lang_code . "' AND (icltr_comment.language_code IS NULL OR icltr_comment.language_code = icltr2.language_code)"; |
|
| 2020 | + $join .= " JOIN ".$table_prefix."icl_translations AS icltr2 ON icltr2.element_id = c.comment_post_ID AND p.ID = icltr2.element_id AND CONCAT('post_', p.post_type) = icltr2.element_type LEFT JOIN ".$table_prefix."icl_translations AS icltr_comment ON icltr_comment.element_id = c.comment_ID AND icltr_comment.element_type = 'comment'";
|
|
| 2021 | + $where .= " AND icltr2.language_code = '".$lang_code."' AND (icltr_comment.language_code IS NULL OR icltr_comment.language_code = icltr2.language_code)"; |
|
| 2022 | 2022 | } |
| 2023 | 2023 | } |
| 2024 | 2024 | |
| 2025 | - $request = "SELECT r.id AS ID, r.post_type, r.comment_id AS comment_ID, r.post_date AS comment_date, r.overall_rating, r.user_id, r.post_id FROM " . GEODIR_REVIEW_TABLE . " AS r JOIN " . $wpdb->comments . " AS c ON c.comment_ID = r.comment_id JOIN " . $wpdb->posts . " AS p ON p.ID = c.comment_post_ID " . $join . " WHERE c.comment_parent = 0 AND c.comment_approved = 1 AND r.status = 1 AND r.overall_rating >= 1 AND p.post_status = 'publish' " . $where . " ORDER BY r.post_date DESC, r.id DESC LIMIT ". $no_comments; |
|
| 2025 | + $request = "SELECT r.id AS ID, r.post_type, r.comment_id AS comment_ID, r.post_date AS comment_date, r.overall_rating, r.user_id, r.post_id FROM ".GEODIR_REVIEW_TABLE." AS r JOIN ".$wpdb->comments." AS c ON c.comment_ID = r.comment_id JOIN ".$wpdb->posts." AS p ON p.ID = c.comment_post_ID ".$join." WHERE c.comment_parent = 0 AND c.comment_approved = 1 AND r.status = 1 AND r.overall_rating >= 1 AND p.post_status = 'publish' ".$where." ORDER BY r.post_date DESC, r.id DESC LIMIT ".$no_comments; |
|
| 2026 | 2026 | |
| 2027 | - $comments = $wpdb->get_results( $request ); |
|
| 2027 | + $comments = $wpdb->get_results($request); |
|
| 2028 | 2028 | |
| 2029 | - foreach ( $comments as $comment ) {
|
|
| 2029 | + foreach ($comments as $comment) {
|
|
| 2030 | 2030 | // Set the extra comment info needed. |
| 2031 | - $comment_extra = $wpdb->get_row( "SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID" ); |
|
| 2031 | + $comment_extra = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID");
|
|
| 2032 | 2032 | $comment->comment_content = $comment_extra->comment_content; |
| 2033 | 2033 | $comment->comment_author = $comment_extra->comment_author; |
| 2034 | 2034 | $comment->comment_author_email = $comment_extra->comment_author_email; |
| 2035 | 2035 | |
| 2036 | 2036 | $comment_id = ''; |
| 2037 | 2037 | $comment_id = $comment->comment_ID; |
| 2038 | - $comment_content = strip_tags( $comment->comment_content ); |
|
| 2038 | + $comment_content = strip_tags($comment->comment_content); |
|
| 2039 | 2039 | |
| 2040 | - $comment_content = preg_replace( '#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_content ); |
|
| 2040 | + $comment_content = preg_replace('#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_content);
|
|
| 2041 | 2041 | |
| 2042 | - $permalink = get_permalink( $comment->ID ) . "#comment-" . $comment->comment_ID; |
|
| 2042 | + $permalink = get_permalink($comment->ID)."#comment-".$comment->comment_ID; |
|
| 2043 | 2043 | $comment_author_email = $comment->comment_author_email; |
| 2044 | 2044 | $comment_post_ID = $comment->post_id; |
| 2045 | 2045 | |
| 2046 | - $post_title = get_the_title( $comment_post_ID ); |
|
| 2047 | - $permalink = get_permalink( $comment_post_ID ); |
|
| 2048 | - $comment_permalink = $permalink . "#comment-" . $comment->comment_ID; |
|
| 2049 | - $read_more = '<a class="comment_excerpt" href="' . $comment_permalink . '">' . __( 'Read more', 'geodirectory' ) . '</a>'; |
|
| 2046 | + $post_title = get_the_title($comment_post_ID); |
|
| 2047 | + $permalink = get_permalink($comment_post_ID); |
|
| 2048 | + $comment_permalink = $permalink."#comment-".$comment->comment_ID; |
|
| 2049 | + $read_more = '<a class="comment_excerpt" href="'.$comment_permalink.'">'.__('Read more', 'geodirectory').'</a>';
|
|
| 2050 | 2050 | |
| 2051 | - $comment_content_length = strlen( $comment_content ); |
|
| 2052 | - if ( $comment_content_length > $comment_lenth ) {
|
|
| 2053 | - $comment_excerpt = geodir_utf8_substr( $comment_content, 0, $comment_lenth ) . '... ' . $read_more; |
|
| 2051 | + $comment_content_length = strlen($comment_content); |
|
| 2052 | + if ($comment_content_length > $comment_lenth) {
|
|
| 2053 | + $comment_excerpt = geodir_utf8_substr($comment_content, 0, $comment_lenth).'... '.$read_more; |
|
| 2054 | 2054 | } else {
|
| 2055 | 2055 | $comment_excerpt = $comment_content; |
| 2056 | 2056 | } |
| 2057 | 2057 | |
| 2058 | - if ( $comment->user_id ) {
|
|
| 2059 | - $user_profile_url = get_author_posts_url( $comment->user_id ); |
|
| 2058 | + if ($comment->user_id) {
|
|
| 2059 | + $user_profile_url = get_author_posts_url($comment->user_id); |
|
| 2060 | 2060 | } else {
|
| 2061 | 2061 | $user_profile_url = ''; |
| 2062 | 2062 | } |
| 2063 | 2063 | |
| 2064 | - if ( $comment_id ) {
|
|
| 2064 | + if ($comment_id) {
|
|
| 2065 | 2065 | $comments_echo .= '<li class="clearfix">'; |
| 2066 | - $comments_echo .= "<span class=\"li" . $comment_id . " geodir_reviewer_image\">"; |
|
| 2067 | - if ( function_exists( 'get_avatar' ) ) {
|
|
| 2068 | - if ( ! isset( $comment->comment_type ) ) {
|
|
| 2069 | - if ( $user_profile_url ) {
|
|
| 2070 | - $comments_echo .= '<a href="' . $user_profile_url . '">'; |
|
| 2066 | + $comments_echo .= "<span class=\"li".$comment_id." geodir_reviewer_image\">"; |
|
| 2067 | + if (function_exists('get_avatar')) {
|
|
| 2068 | + if (!isset($comment->comment_type)) {
|
|
| 2069 | + if ($user_profile_url) {
|
|
| 2070 | + $comments_echo .= '<a href="'.$user_profile_url.'">'; |
|
| 2071 | 2071 | } |
| 2072 | - $comments_echo .= get_avatar( $comment->comment_author_email, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' ); |
|
| 2073 | - if ( $user_profile_url ) {
|
|
| 2072 | + $comments_echo .= get_avatar($comment->comment_author_email, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png'); |
|
| 2073 | + if ($user_profile_url) {
|
|
| 2074 | 2074 | $comments_echo .= '</a>'; |
| 2075 | 2075 | } |
| 2076 | - } elseif ( ( isset( $comment->comment_type ) && $comment->comment_type == 'trackback' ) || ( isset( $comment->comment_type ) && $comment->comment_type == 'pingback' ) ) {
|
|
| 2077 | - if ( $user_profile_url ) {
|
|
| 2078 | - $comments_echo .= '<a href="' . $user_profile_url . '">'; |
|
| 2076 | + } elseif ((isset($comment->comment_type) && $comment->comment_type == 'trackback') || (isset($comment->comment_type) && $comment->comment_type == 'pingback')) {
|
|
| 2077 | + if ($user_profile_url) {
|
|
| 2078 | + $comments_echo .= '<a href="'.$user_profile_url.'">'; |
|
| 2079 | 2079 | } |
| 2080 | - $comments_echo .= get_avatar( $comment->comment_author_url, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' ); |
|
| 2080 | + $comments_echo .= get_avatar($comment->comment_author_url, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png'); |
|
| 2081 | 2081 | } |
| 2082 | - } elseif ( function_exists( 'gravatar' ) ) {
|
|
| 2083 | - if ( $user_profile_url ) {
|
|
| 2084 | - $comments_echo .= '<a href="' . $user_profile_url . '">'; |
|
| 2082 | + } elseif (function_exists('gravatar')) {
|
|
| 2083 | + if ($user_profile_url) {
|
|
| 2084 | + $comments_echo .= '<a href="'.$user_profile_url.'">'; |
|
| 2085 | 2085 | } |
| 2086 | 2086 | $comments_echo .= "<img src=\""; |
| 2087 | - if ( '' == $comment->comment_type ) {
|
|
| 2088 | - $comments_echo .= gravatar( $comment->comment_author_email, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' ); |
|
| 2089 | - if ( $user_profile_url ) {
|
|
| 2087 | + if ('' == $comment->comment_type) {
|
|
| 2088 | + $comments_echo .= gravatar($comment->comment_author_email, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png'); |
|
| 2089 | + if ($user_profile_url) {
|
|
| 2090 | 2090 | $comments_echo .= '</a>'; |
| 2091 | 2091 | } |
| 2092 | - } elseif ( ( 'trackback' == $comment->comment_type ) || ( 'pingback' == $comment->comment_type ) ) {
|
|
| 2093 | - if ( $user_profile_url ) {
|
|
| 2094 | - $comments_echo .= '<a href="' . $user_profile_url . '">'; |
|
| 2092 | + } elseif (('trackback' == $comment->comment_type) || ('pingback' == $comment->comment_type)) {
|
|
| 2093 | + if ($user_profile_url) {
|
|
| 2094 | + $comments_echo .= '<a href="'.$user_profile_url.'">'; |
|
| 2095 | 2095 | } |
| 2096 | - $comments_echo .= gravatar( $comment->comment_author_url, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' ); |
|
| 2097 | - if ( $user_profile_url ) {
|
|
| 2096 | + $comments_echo .= gravatar($comment->comment_author_url, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png'); |
|
| 2097 | + if ($user_profile_url) {
|
|
| 2098 | 2098 | $comments_echo .= '</a>'; |
| 2099 | 2099 | } |
| 2100 | 2100 | } |
@@ -2105,17 +2105,17 @@ discard block |
||
| 2105 | 2105 | |
| 2106 | 2106 | $comments_echo .= '<span class="geodir_reviewer_content">'; |
| 2107 | 2107 | $author_link = apply_filters('geodir_reviewer_content_author_link', true);
|
| 2108 | - if ( $comment->user_id && $author_link ) {
|
|
| 2109 | - $comments_echo .= '<a href="' . get_author_posts_url( $comment->user_id ) . '">'; |
|
| 2108 | + if ($comment->user_id && $author_link) {
|
|
| 2109 | + $comments_echo .= '<a href="'.get_author_posts_url($comment->user_id).'">'; |
|
| 2110 | 2110 | } |
| 2111 | - $comments_echo .= '<span class="geodir_reviewer_author">' . $comment->comment_author . '</span> '; |
|
| 2112 | - if ( $comment->user_id && $author_link ) {
|
|
| 2111 | + $comments_echo .= '<span class="geodir_reviewer_author">'.$comment->comment_author.'</span> '; |
|
| 2112 | + if ($comment->user_id && $author_link) {
|
|
| 2113 | 2113 | $comments_echo .= '</a>'; |
| 2114 | 2114 | } |
| 2115 | - $comments_echo .= '<span class="geodir_reviewer_reviewed">' . __( 'reviewed', 'geodirectory' ) . '</span> '; |
|
| 2116 | - $comments_echo .= '<a href="' . $permalink . '" class="geodir_reviewer_title">' . $post_title . '</a>'; |
|
| 2117 | - $comments_echo .= geodir_get_rating_stars( $comment->overall_rating, $comment_post_ID ); |
|
| 2118 | - $comments_echo .= '<p class="geodir_reviewer_text">' . $comment_excerpt . ''; |
|
| 2115 | + $comments_echo .= '<span class="geodir_reviewer_reviewed">'.__('reviewed', 'geodirectory').'</span> ';
|
|
| 2116 | + $comments_echo .= '<a href="'.$permalink.'" class="geodir_reviewer_title">'.$post_title.'</a>'; |
|
| 2117 | + $comments_echo .= geodir_get_rating_stars($comment->overall_rating, $comment_post_ID); |
|
| 2118 | + $comments_echo .= '<p class="geodir_reviewer_text">'.$comment_excerpt.''; |
|
| 2119 | 2119 | //echo preg_replace('#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_excerpt);
|
| 2120 | 2120 | $comments_echo .= '</p>'; |
| 2121 | 2121 | |
@@ -2135,25 +2135,25 @@ discard block |
||
| 2135 | 2135 | * @return array Returns post categories as an array. |
| 2136 | 2136 | */ |
| 2137 | 2137 | function geodir_home_map_cats_key_value_array() {
|
| 2138 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 2138 | + $post_types = geodir_get_posttypes('object');
|
|
| 2139 | 2139 | |
| 2140 | 2140 | $return = array(); |
| 2141 | - if ( ! empty( $post_types ) ) {
|
|
| 2142 | - foreach ( $post_types as $key => $post_type ) {
|
|
| 2143 | - $cpt_name = __( $post_type->labels->singular_name, 'geodirectory' ); |
|
| 2144 | - $post_type_name = sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name ); |
|
| 2145 | - $taxonomies = geodir_get_taxonomies( $key ); |
|
| 2146 | - $cat_taxonomy = ! empty( $taxonomies[0] ) ? $taxonomies[0] : null; |
|
| 2147 | - $cat_terms = $cat_taxonomy ? get_terms( $cat_taxonomy ) : null; |
|
| 2148 | - |
|
| 2149 | - if ( ! empty( $cat_terms ) ) {
|
|
| 2150 | - $return[ 'optgroup_start-' . $key ] = $post_type_name; |
|
| 2151 | - |
|
| 2152 | - foreach ( $cat_terms as $cat_term ) {
|
|
| 2153 | - $return[ $key . '_' . $cat_term->term_id ] = $cat_term->name; |
|
| 2141 | + if (!empty($post_types)) {
|
|
| 2142 | + foreach ($post_types as $key => $post_type) {
|
|
| 2143 | + $cpt_name = __($post_type->labels->singular_name, 'geodirectory'); |
|
| 2144 | + $post_type_name = sprintf(__('%s Categories', 'geodirectory'), $cpt_name);
|
|
| 2145 | + $taxonomies = geodir_get_taxonomies($key); |
|
| 2146 | + $cat_taxonomy = !empty($taxonomies[0]) ? $taxonomies[0] : null; |
|
| 2147 | + $cat_terms = $cat_taxonomy ? get_terms($cat_taxonomy) : null; |
|
| 2148 | + |
|
| 2149 | + if (!empty($cat_terms)) {
|
|
| 2150 | + $return['optgroup_start-'.$key] = $post_type_name; |
|
| 2151 | + |
|
| 2152 | + foreach ($cat_terms as $cat_term) {
|
|
| 2153 | + $return[$key.'_'.$cat_term->term_id] = $cat_term->name; |
|
| 2154 | 2154 | } |
| 2155 | 2155 | |
| 2156 | - $return[ 'optgroup_end-' . $key ] = $post_type_name; |
|
| 2156 | + $return['optgroup_end-'.$key] = $post_type_name; |
|
| 2157 | 2157 | } |
| 2158 | 2158 | } |
| 2159 | 2159 | } |
@@ -2169,14 +2169,14 @@ discard block |
||
| 2169 | 2169 | * @package GeoDirectory |
| 2170 | 2170 | */ |
| 2171 | 2171 | function geodir_twitter_tweet_button() {
|
| 2172 | - if ( isset( $_GET['gde'] ) ) {
|
|
| 2173 | - $link = '?url=' . urlencode( geodir_curPageURL() ); |
|
| 2172 | + if (isset($_GET['gde'])) {
|
|
| 2173 | + $link = '?url='.urlencode(geodir_curPageURL()); |
|
| 2174 | 2174 | } else {
|
| 2175 | 2175 | $link = ''; |
| 2176 | 2176 | } |
| 2177 | 2177 | ?> |
| 2178 | 2178 | <a href="http://twitter.com/share<?php echo $link; ?>" |
| 2179 | - class="twitter-share-button"><?php _e( 'Tweet', 'geodirectory' ); ?></a> |
|
| 2179 | + class="twitter-share-button"><?php _e('Tweet', 'geodirectory'); ?></a>
|
|
| 2180 | 2180 | <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script> |
| 2181 | 2181 | <?php |
| 2182 | 2182 | } |
@@ -2193,10 +2193,10 @@ discard block |
||
| 2193 | 2193 | function geodir_fb_like_button() {
|
| 2194 | 2194 | global $post; |
| 2195 | 2195 | ?> |
| 2196 | - <iframe <?php if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false ) ) {
|
|
| 2196 | + <iframe <?php if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)) {
|
|
| 2197 | 2197 | echo 'allowtransparency="true"'; |
| 2198 | 2198 | } ?> class="facebook" |
| 2199 | - src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode( get_permalink( $post->ID ) ); ?>&layout=button_count&show_faces=false&width=100&action=like&colorscheme=light" |
|
| 2199 | + src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode(get_permalink($post->ID)); ?>&layout=button_count&show_faces=false&width=100&action=like&colorscheme=light" |
|
| 2200 | 2200 | style="border:none; overflow:hidden; width:100px; height:20px"></iframe> |
| 2201 | 2201 | <?php |
| 2202 | 2202 | } |
@@ -2227,7 +2227,7 @@ discard block |
||
| 2227 | 2227 | |
| 2228 | 2228 | |
| 2229 | 2229 | function geodir_listing_bounce_map_pin_on_hover() {
|
| 2230 | - if ( get_option( 'geodir_listing_hover_bounce_map_pin', true ) ) {
|
|
| 2230 | + if (get_option('geodir_listing_hover_bounce_map_pin', true)) {
|
|
| 2231 | 2231 | ?> |
| 2232 | 2232 | <script> |
| 2233 | 2233 | jQuery(function ($) {
|
@@ -2250,44 +2250,44 @@ discard block |
||
| 2250 | 2250 | } |
| 2251 | 2251 | } |
| 2252 | 2252 | |
| 2253 | -add_action( 'geodir_after_listing_listview', 'geodir_listing_bounce_map_pin_on_hover', 10 ); |
|
| 2253 | +add_action('geodir_after_listing_listview', 'geodir_listing_bounce_map_pin_on_hover', 10);
|
|
| 2254 | 2254 | |
| 2255 | -add_action( 'geodir_after_favorite_html', 'geodir_output_favourite_html_listings', 1, 1 ); |
|
| 2256 | -function geodir_output_favourite_html_listings( $post_id ) {
|
|
| 2257 | - geodir_favourite_html( '', $post_id ); |
|
| 2255 | +add_action('geodir_after_favorite_html', 'geodir_output_favourite_html_listings', 1, 1);
|
|
| 2256 | +function geodir_output_favourite_html_listings($post_id) {
|
|
| 2257 | + geodir_favourite_html('', $post_id);
|
|
| 2258 | 2258 | } |
| 2259 | 2259 | |
| 2260 | -add_action( 'geodir_listing_after_pinpoint', 'geodir_output_pinpoint_html_listings', 1, 2 ); |
|
| 2261 | -function geodir_output_pinpoint_html_listings( $post_id, $post = array() ) {
|
|
| 2260 | +add_action('geodir_listing_after_pinpoint', 'geodir_output_pinpoint_html_listings', 1, 2);
|
|
| 2261 | +function geodir_output_pinpoint_html_listings($post_id, $post = array()) {
|
|
| 2262 | 2262 | global $wp_query; |
| 2263 | 2263 | |
| 2264 | 2264 | $show_pin_point = $wp_query->is_main_query(); |
| 2265 | 2265 | |
| 2266 | - if ( ! empty( $post ) && ! empty( $show_pin_point ) && is_active_widget( false, "", "geodir_map_v3_listing_map" ) ) {
|
|
| 2267 | - $term_icon_url = geodir_get_tax_meta( $post->default_category, 'ct_cat_icon', false, $post->post_type ); |
|
| 2268 | - $marker_icon = isset( $term_icon_url['src'] ) ? $term_icon_url['src'] : get_option( 'geodir_default_marker_icon' ); |
|
| 2266 | + if (!empty($post) && !empty($show_pin_point) && is_active_widget(false, "", "geodir_map_v3_listing_map")) {
|
|
| 2267 | + $term_icon_url = geodir_get_tax_meta($post->default_category, 'ct_cat_icon', false, $post->post_type); |
|
| 2268 | + $marker_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : get_option('geodir_default_marker_icon');
|
|
| 2269 | 2269 | ?> |
| 2270 | 2270 | <span class="geodir-pinpoint" |
| 2271 | - style="background:url('<?php echo $marker_icon; ?>') no-repeat scroll left top transparent;background-size:auto 100%; -webkit-background-size:auto 100%;-moz-background-size:auto 100%;height:9px;width:14px;"><?php echo apply_filters( 'geodir_listing_listview_pinpoint_inner_content', '', 'listing' ); ?></span>
|
|
| 2271 | + style="background:url('<?php echo $marker_icon; ?>') no-repeat scroll left top transparent;background-size:auto 100%; -webkit-background-size:auto 100%;-moz-background-size:auto 100%;height:9px;width:14px;"><?php echo apply_filters('geodir_listing_listview_pinpoint_inner_content', '', 'listing'); ?></span>
|
|
| 2272 | 2272 | <a class="geodir-pinpoint-link" href="javascript:void(0)" |
| 2273 | 2273 | onclick="if(typeof openMarker=='function'){openMarker('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"
|
| 2274 | 2274 | onmouseover="if(typeof animate_marker=='function'){animate_marker('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"
|
| 2275 | - onmouseout="if(typeof stop_marker_animation=='function'){stop_marker_animation('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"><?php _e( 'Pinpoint', 'geodirectory' ); ?></a>
|
|
| 2275 | + onmouseout="if(typeof stop_marker_animation=='function'){stop_marker_animation('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"><?php _e('Pinpoint', 'geodirectory'); ?></a>
|
|
| 2276 | 2276 | <?php |
| 2277 | 2277 | } |
| 2278 | 2278 | } |
| 2279 | 2279 | |
| 2280 | 2280 | function geodir_search_form_submit_button() {
|
| 2281 | 2281 | |
| 2282 | - $new_style = get_option( 'geodir_show_search_old_search_from' ) ? false : true; |
|
| 2282 | + $new_style = get_option('geodir_show_search_old_search_from') ? false : true;
|
|
| 2283 | 2283 | |
| 2284 | - if ( $new_style ) {
|
|
| 2284 | + if ($new_style) {
|
|
| 2285 | 2285 | $default_search_button_label = '<i class="fa fa-search" aria-hidden="true"></i>'; |
| 2286 | - }else{
|
|
| 2286 | + } else {
|
|
| 2287 | 2287 | $default_search_button_label = 'Search'; |
| 2288 | 2288 | } |
| 2289 | - if ( get_option( 'geodir_search_button_label' ) && get_option( 'geodir_search_button_label' ) != 'Search' ) {
|
|
| 2290 | - $default_search_button_label = __( get_option( 'geodir_search_button_label' ), 'geodirectory' ); |
|
| 2289 | + if (get_option('geodir_search_button_label') && get_option('geodir_search_button_label') != 'Search') {
|
|
| 2290 | + $default_search_button_label = __(get_option('geodir_search_button_label'), 'geodirectory');
|
|
| 2291 | 2291 | } |
| 2292 | 2292 | |
| 2293 | 2293 | /** |
@@ -2299,78 +2299,78 @@ discard block |
||
| 2299 | 2299 | * |
| 2300 | 2300 | * @param string $default_search_button_label The current search button text. |
| 2301 | 2301 | */ |
| 2302 | - $default_search_button_label = apply_filters( 'geodir_search_default_search_button_text', $default_search_button_label ); |
|
| 2302 | + $default_search_button_label = apply_filters('geodir_search_default_search_button_text', $default_search_button_label);
|
|
| 2303 | 2303 | |
| 2304 | 2304 | $fa_class = ''; |
| 2305 | - if ( strpos( $default_search_button_label, '&#' ) !== false ) {
|
|
| 2305 | + if (strpos($default_search_button_label, '&#') !== false) {
|
|
| 2306 | 2306 | $fa_class = 'fa'; |
| 2307 | 2307 | } |
| 2308 | 2308 | |
| 2309 | 2309 | |
| 2310 | - if ( $new_style ) {
|
|
| 2310 | + if ($new_style) {
|
|
| 2311 | 2311 | ?> |
| 2312 | - <button class="geodir_submit_search <?php echo $fa_class; ?>"><?php _e( $default_search_button_label ,'geodirectory'); ?></button> |
|
| 2313 | - <?php }else{?>
|
|
| 2314 | - <input type="button" value="<?php esc_attr_e( $default_search_button_label ); ?>" |
|
| 2312 | + <button class="geodir_submit_search <?php echo $fa_class; ?>"><?php _e($default_search_button_label, 'geodirectory'); ?></button> |
|
| 2313 | + <?php } else {?>
|
|
| 2314 | + <input type="button" value="<?php esc_attr_e($default_search_button_label); ?>" |
|
| 2315 | 2315 | class="geodir_submit_search <?php echo $fa_class; ?>"/> |
| 2316 | 2316 | <?php } |
| 2317 | 2317 | } |
| 2318 | 2318 | |
| 2319 | -add_action( 'geodir_before_search_button', 'geodir_search_form_submit_button', 5000 ); |
|
| 2319 | +add_action('geodir_before_search_button', 'geodir_search_form_submit_button', 5000);
|
|
| 2320 | 2320 | |
| 2321 | 2321 | function geodir_search_form_post_type_input() {
|
| 2322 | 2322 | global $geodir_search_post_type; |
| 2323 | - $post_types = apply_filters( 'geodir_search_form_post_types', geodir_get_posttypes( 'object' ) ); |
|
| 2323 | + $post_types = apply_filters('geodir_search_form_post_types', geodir_get_posttypes('object'));
|
|
| 2324 | 2324 | $curr_post_type = $geodir_search_post_type; |
| 2325 | 2325 | |
| 2326 | - if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {
|
|
| 2326 | + if (!empty($post_types) && count((array) $post_types) > 1) {
|
|
| 2327 | 2327 | |
| 2328 | - foreach ( $post_types as $post_type => $info ){
|
|
| 2328 | + foreach ($post_types as $post_type => $info) {
|
|
| 2329 | 2329 | global $wpdb; |
| 2330 | - $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) ); |
|
| 2331 | - if ( ! $has_posts ) {
|
|
| 2330 | + $has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));
|
|
| 2331 | + if (!$has_posts) {
|
|
| 2332 | 2332 | unset($post_types->{$post_type});
|
| 2333 | 2333 | } |
| 2334 | 2334 | } |
| 2335 | 2335 | |
| 2336 | - if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {
|
|
| 2336 | + if (!empty($post_types) && count((array) $post_types) > 1) {
|
|
| 2337 | 2337 | |
| 2338 | - $new_style = get_option( 'geodir_show_search_old_search_from' ) ? false : true; |
|
| 2339 | - if ( $new_style ) {
|
|
| 2338 | + $new_style = get_option('geodir_show_search_old_search_from') ? false : true;
|
|
| 2339 | + if ($new_style) {
|
|
| 2340 | 2340 | echo "<div class='gd-search-input-wrapper gd-search-field-cpt'>"; |
| 2341 | 2341 | } |
| 2342 | 2342 | ?> |
| 2343 | 2343 | <select name="stype" class="search_by_post"> |
| 2344 | - <?php foreach ( $post_types as $post_type => $info ): |
|
| 2344 | + <?php foreach ($post_types as $post_type => $info): |
|
| 2345 | 2345 | global $wpdb; |
| 2346 | 2346 | ?> |
| 2347 | 2347 | |
| 2348 | - <option data-label="<?php echo get_post_type_archive_link( $post_type ); ?>" |
|
| 2349 | - value="<?php echo $post_type; ?>" <?php if ( isset( $_REQUEST['stype'] ) ) {
|
|
| 2350 | - if ( $post_type == $_REQUEST['stype'] ) {
|
|
| 2348 | + <option data-label="<?php echo get_post_type_archive_link($post_type); ?>" |
|
| 2349 | + value="<?php echo $post_type; ?>" <?php if (isset($_REQUEST['stype'])) {
|
|
| 2350 | + if ($post_type == $_REQUEST['stype']) {
|
|
| 2351 | 2351 | echo 'selected="selected"'; |
| 2352 | 2352 | } |
| 2353 | - } elseif ( $curr_post_type == $post_type ) {
|
|
| 2353 | + } elseif ($curr_post_type == $post_type) {
|
|
| 2354 | 2354 | echo 'selected="selected"'; |
| 2355 | - } ?>><?php _e( geodir_utf8_ucfirst( $info->labels->name ), 'geodirectory' ); ?></option> |
|
| 2355 | + } ?>><?php _e(geodir_utf8_ucfirst($info->labels->name), 'geodirectory'); ?></option> |
|
| 2356 | 2356 | |
| 2357 | 2357 | <?php endforeach; ?> |
| 2358 | 2358 | </select> |
| 2359 | 2359 | <?php |
| 2360 | - if ( $new_style ) {
|
|
| 2360 | + if ($new_style) {
|
|
| 2361 | 2361 | echo "</div>"; |
| 2362 | 2362 | } |
| 2363 | - }else{
|
|
| 2364 | - if(! empty( $post_types )){
|
|
| 2365 | - $pt_arr = (array)$post_types; |
|
| 2366 | - echo '<input type="hidden" name="stype" value="' . key( $pt_arr ) . '" />'; |
|
| 2367 | - }else{
|
|
| 2363 | + } else {
|
|
| 2364 | + if (!empty($post_types)) {
|
|
| 2365 | + $pt_arr = (array) $post_types; |
|
| 2366 | + echo '<input type="hidden" name="stype" value="'.key($pt_arr).'" />'; |
|
| 2367 | + } else {
|
|
| 2368 | 2368 | echo '<input type="hidden" name="stype" value="gd_place" />'; |
| 2369 | 2369 | } |
| 2370 | 2370 | |
| 2371 | 2371 | } |
| 2372 | 2372 | |
| 2373 | - }elseif ( ! empty( $post_types ) ) {
|
|
| 2373 | + }elseif (!empty($post_types)) {
|
|
| 2374 | 2374 | echo '<input type="hidden" name="stype" value="gd_place" />'; |
| 2375 | 2375 | } |
| 2376 | 2376 | } |
@@ -2378,28 +2378,28 @@ discard block |
||
| 2378 | 2378 | function geodir_search_form_search_input() {
|
| 2379 | 2379 | |
| 2380 | 2380 | $default_search_for_text = SEARCH_FOR_TEXT; |
| 2381 | - if ( get_option( 'geodir_search_field_default_text' ) ) {
|
|
| 2382 | - $default_search_for_text = __( get_option( 'geodir_search_field_default_text' ), 'geodirectory' ); |
|
| 2381 | + if (get_option('geodir_search_field_default_text')) {
|
|
| 2382 | + $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
|
|
| 2383 | 2383 | } |
| 2384 | 2384 | |
| 2385 | 2385 | $new_style = get_option('geodir_show_search_old_search_from') ? false : true;
|
| 2386 | - if($new_style){
|
|
| 2386 | + if ($new_style) {
|
|
| 2387 | 2387 | echo "<div class='gd-search-input-wrapper gd-search-field-search'>"; |
| 2388 | 2388 | } |
| 2389 | 2389 | ?> |
| 2390 | 2390 | <input class="search_text" name="s" |
| 2391 | - value="<?php if ( isset( $_REQUEST['s'] ) && trim( $_REQUEST['s'] ) != '' ) {
|
|
| 2392 | - $search_term = esc_attr( stripslashes_deep( $_REQUEST['s'] ) ); |
|
| 2393 | - $search_term = str_replace(array("%E2%80%99","’"),array("%27","'"),$search_term);
|
|
| 2391 | + value="<?php if (isset($_REQUEST['s']) && trim($_REQUEST['s']) != '') {
|
|
| 2392 | + $search_term = esc_attr(stripslashes_deep($_REQUEST['s'])); |
|
| 2393 | + $search_term = str_replace(array("%E2%80%99", "’"), array("%27", "'"), $search_term);
|
|
| 2394 | 2394 | echo $search_term; |
| 2395 | 2395 | } else {
|
| 2396 | 2396 | echo $default_search_for_text; |
| 2397 | 2397 | } ?>" type="text" |
| 2398 | - onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql( $default_search_for_text ); ?>';}"
|
|
| 2399 | - onfocus="if (this.value == '<?php echo esc_sql( $default_search_for_text ); ?>') {this.value = '';}"
|
|
| 2398 | + onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql($default_search_for_text); ?>';}"
|
|
| 2399 | + onfocus="if (this.value == '<?php echo esc_sql($default_search_for_text); ?>') {this.value = '';}"
|
|
| 2400 | 2400 | onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);"> |
| 2401 | 2401 | <?php |
| 2402 | - if($new_style){
|
|
| 2402 | + if ($new_style) {
|
|
| 2403 | 2403 | echo "</div>"; |
| 2404 | 2404 | } |
| 2405 | 2405 | } |
@@ -2407,12 +2407,12 @@ discard block |
||
| 2407 | 2407 | function geodir_search_form_near_input() {
|
| 2408 | 2408 | |
| 2409 | 2409 | $default_near_text = NEAR_TEXT; |
| 2410 | - if ( get_option( 'geodir_near_field_default_text' ) ) {
|
|
| 2411 | - $default_near_text = __( get_option( 'geodir_near_field_default_text' ), 'geodirectory' ); |
|
| 2410 | + if (get_option('geodir_near_field_default_text')) {
|
|
| 2411 | + $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
|
|
| 2412 | 2412 | } |
| 2413 | 2413 | |
| 2414 | - if ( isset( $_REQUEST['snear'] ) && $_REQUEST['snear'] != '' ) {
|
|
| 2415 | - $near = esc_attr( stripslashes_deep( $_REQUEST['snear'] ) ); |
|
| 2414 | + if (isset($_REQUEST['snear']) && $_REQUEST['snear'] != '') {
|
|
| 2415 | + $near = esc_attr(stripslashes_deep($_REQUEST['snear'])); |
|
| 2416 | 2416 | } else {
|
| 2417 | 2417 | $near = $default_near_text; |
| 2418 | 2418 | } |
@@ -2426,7 +2426,7 @@ discard block |
||
| 2426 | 2426 | * @since 1.6.9 |
| 2427 | 2427 | * @param string $curr_post_type The current post type. |
| 2428 | 2428 | */ |
| 2429 | - $near_input_extra = apply_filters('geodir_near_input_extra','',$curr_post_type);
|
|
| 2429 | + $near_input_extra = apply_filters('geodir_near_input_extra', '', $curr_post_type);
|
|
| 2430 | 2430 | |
| 2431 | 2431 | |
| 2432 | 2432 | /** |
@@ -2439,7 +2439,7 @@ discard block |
||
| 2439 | 2439 | * @param string $near The current near value. |
| 2440 | 2440 | * @param string $default_near_text The default near value. |
| 2441 | 2441 | */ |
| 2442 | - $near = apply_filters( 'geodir_search_near_text', $near, $default_near_text ); |
|
| 2442 | + $near = apply_filters('geodir_search_near_text', $near, $default_near_text);
|
|
| 2443 | 2443 | /** |
| 2444 | 2444 | * Filter the default "Near" text value for the search form. |
| 2445 | 2445 | * |
@@ -2450,7 +2450,7 @@ discard block |
||
| 2450 | 2450 | * @param string $near The current near value. |
| 2451 | 2451 | * @param string $default_near_text The default near value. |
| 2452 | 2452 | */ |
| 2453 | - $default_near_text = apply_filters( 'geodir_search_default_near_text', $default_near_text, $near ); |
|
| 2453 | + $default_near_text = apply_filters('geodir_search_default_near_text', $default_near_text, $near);
|
|
| 2454 | 2454 | /** |
| 2455 | 2455 | * Filter the class for the near search input. |
| 2456 | 2456 | * |
@@ -2458,10 +2458,10 @@ discard block |
||
| 2458 | 2458 | * |
| 2459 | 2459 | * @param string $class The class for the HTML near input, default is blank. |
| 2460 | 2460 | */ |
| 2461 | - $near_class = apply_filters( 'geodir_search_near_class', '' ); |
|
| 2461 | + $near_class = apply_filters('geodir_search_near_class', '');
|
|
| 2462 | 2462 | |
| 2463 | 2463 | $new_style = get_option('geodir_show_search_old_search_from') ? false : true;
|
| 2464 | - if($new_style){
|
|
| 2464 | + if ($new_style) {
|
|
| 2465 | 2465 | echo "<div class='gd-search-input-wrapper gd-search-field-near' $near_input_extra>"; |
| 2466 | 2466 | |
| 2467 | 2467 | do_action('geodir_before_near_input');
|
@@ -2469,30 +2469,30 @@ discard block |
||
| 2469 | 2469 | |
| 2470 | 2470 | ?> |
| 2471 | 2471 | <input name="snear" class="snear <?php echo $near_class; ?>" type="text" value="<?php echo $near; ?>" |
| 2472 | - onblur="if (this.value.trim() == '') {this.value = ('<?php echo esc_sql( $near ); ?>' != '' ? '<?php echo esc_sql( $near ); ?>' : '<?php echo $default_near_text; ?>');}"
|
|
| 2473 | - onfocus="if (this.value == '<?php echo $default_near_text; ?>' || this.value =='<?php echo esc_sql( $near ); ?>') {this.value = '';}"
|
|
| 2474 | - onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);" <?php echo $near_input_extra;?>/> |
|
| 2472 | + onblur="if (this.value.trim() == '') {this.value = ('<?php echo esc_sql($near); ?>' != '' ? '<?php echo esc_sql($near); ?>' : '<?php echo $default_near_text; ?>');}"
|
|
| 2473 | + onfocus="if (this.value == '<?php echo $default_near_text; ?>' || this.value =='<?php echo esc_sql($near); ?>') {this.value = '';}"
|
|
| 2474 | + onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);" <?php echo $near_input_extra; ?>/> |
|
| 2475 | 2475 | <?php |
| 2476 | - if($new_style){
|
|
| 2476 | + if ($new_style) {
|
|
| 2477 | 2477 | do_action('geodir_after_near_input');
|
| 2478 | 2478 | |
| 2479 | 2479 | echo "</div>"; |
| 2480 | 2480 | } |
| 2481 | 2481 | } |
| 2482 | 2482 | |
| 2483 | -add_action( 'geodir_search_form_inputs', 'geodir_search_form_post_type_input', 10 ); |
|
| 2484 | -add_action( 'geodir_search_form_inputs', 'geodir_search_form_search_input', 20 ); |
|
| 2485 | -add_action( 'geodir_search_form_inputs', 'geodir_search_form_near_input', 30 ); |
|
| 2483 | +add_action('geodir_search_form_inputs', 'geodir_search_form_post_type_input', 10);
|
|
| 2484 | +add_action('geodir_search_form_inputs', 'geodir_search_form_search_input', 20);
|
|
| 2485 | +add_action('geodir_search_form_inputs', 'geodir_search_form_near_input', 30);
|
|
| 2486 | 2486 | |
| 2487 | -function geodir_get_search_post_type($pt=''){
|
|
| 2487 | +function geodir_get_search_post_type($pt = '') {
|
|
| 2488 | 2488 | global $geodir_search_post_type; |
| 2489 | 2489 | |
| 2490 | - if($pt!=''){return $geodir_search_post_type = $pt;}
|
|
| 2491 | - if(!empty($geodir_search_post_type)){ return $geodir_search_post_type;}
|
|
| 2490 | + if ($pt != '') {return $geodir_search_post_type = $pt; }
|
|
| 2491 | + if (!empty($geodir_search_post_type)) { return $geodir_search_post_type; }
|
|
| 2492 | 2492 | |
| 2493 | 2493 | $geodir_search_post_type = geodir_get_current_posttype(); |
| 2494 | 2494 | |
| 2495 | - if(!$geodir_search_post_type) {
|
|
| 2495 | + if (!$geodir_search_post_type) {
|
|
| 2496 | 2496 | $geodir_search_post_type = geodir_get_default_posttype(); |
| 2497 | 2497 | } |
| 2498 | 2498 | |
@@ -2500,7 +2500,7 @@ discard block |
||
| 2500 | 2500 | return $geodir_search_post_type; |
| 2501 | 2501 | } |
| 2502 | 2502 | |
| 2503 | -function geodir_search_form(){
|
|
| 2503 | +function geodir_search_form() {
|
|
| 2504 | 2504 | |
| 2505 | 2505 | geodir_get_search_post_type(); |
| 2506 | 2506 | |
@@ -2510,8 +2510,8 @@ discard block |
||
| 2510 | 2510 | die(); |
| 2511 | 2511 | } |
| 2512 | 2512 | |
| 2513 | -add_action( 'wp_ajax_geodir_search_form', 'geodir_search_form' ); |
|
| 2514 | -add_action( 'wp_ajax_nopriv_geodir_search_form', 'geodir_search_form' ); |
|
| 2513 | +add_action('wp_ajax_geodir_search_form', 'geodir_search_form');
|
|
| 2514 | +add_action('wp_ajax_nopriv_geodir_search_form', 'geodir_search_form');
|
|
| 2515 | 2515 | |
| 2516 | 2516 | /** |
| 2517 | 2517 | * Check wpml active or not. |
@@ -2585,7 +2585,7 @@ discard block |
||
| 2585 | 2585 | } |
| 2586 | 2586 | } |
| 2587 | 2587 | } |
| 2588 | -add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 ); |
|
| 2588 | +add_filter('icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4);
|
|
| 2589 | 2589 | |
| 2590 | 2590 | /** |
| 2591 | 2591 | * Duplicate post listing manually after listing saved. |
@@ -2609,7 +2609,7 @@ discard block |
||
| 2609 | 2609 | foreach ($post_duplicates as $lang => $dup_post_id) {
|
| 2610 | 2610 | geodir_icl_make_duplicate($post_id, $lang, $request_info, $dup_post_id, true); |
| 2611 | 2611 | } |
| 2612 | - do_action( 'geodir_wpml_listing_duplicated', $post_id, $request_info ); |
|
| 2612 | + do_action('geodir_wpml_listing_duplicated', $post_id, $request_info);
|
|
| 2613 | 2613 | } |
| 2614 | 2614 | } |
| 2615 | 2615 | |
@@ -2628,7 +2628,7 @@ discard block |
||
| 2628 | 2628 | function geodir_wpml_duplicate_post_reviews($master_post_id, $tr_post_id, $lang) {
|
| 2629 | 2629 | global $wpdb; |
| 2630 | 2630 | |
| 2631 | - $reviews = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id=%d ORDER BY id ASC", $master_post_id), ARRAY_A);
|
|
| 2631 | + $reviews = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM ".GEODIR_REVIEW_TABLE." WHERE post_id=%d ORDER BY id ASC", $master_post_id), ARRAY_A);
|
|
| 2632 | 2632 | |
| 2633 | 2633 | if (!empty($reviews)) {
|
| 2634 | 2634 | foreach ($reviews as $review) {
|
@@ -2657,15 +2657,15 @@ discard block |
||
| 2657 | 2657 | global $wpdb, $plugin_prefix; |
| 2658 | 2658 | |
| 2659 | 2659 | $post_type = get_post_type($master_post_id); |
| 2660 | - $post_table = $plugin_prefix . $post_type . '_detail'; |
|
| 2660 | + $post_table = $plugin_prefix.$post_type.'_detail'; |
|
| 2661 | 2661 | |
| 2662 | - $query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));
|
|
| 2663 | - $data = (array)$wpdb->get_row($query); |
|
| 2662 | + $query = $wpdb->prepare("SELECT * FROM ".$post_table." WHERE post_id = %d", array($master_post_id));
|
|
| 2663 | + $data = (array) $wpdb->get_row($query); |
|
| 2664 | 2664 | |
| 2665 | - if ( !empty( $data ) ) {
|
|
| 2666 | - $data = apply_filters( 'geodir_icl_duplicate_post_data', $data, $master_post_id, $tr_post_id, $lang ); |
|
| 2665 | + if (!empty($data)) {
|
|
| 2666 | + $data = apply_filters('geodir_icl_duplicate_post_data', $data, $master_post_id, $tr_post_id, $lang);
|
|
| 2667 | 2667 | $data['post_id'] = $tr_post_id; |
| 2668 | - unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category']); |
|
| 2668 | + unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type.'category']); |
|
| 2669 | 2669 | $wpdb->update($post_table, $data, array('post_id' => $tr_post_id));
|
| 2670 | 2670 | return true; |
| 2671 | 2671 | } |
@@ -2690,7 +2690,7 @@ discard block |
||
| 2690 | 2690 | global $sitepress, $wpdb; |
| 2691 | 2691 | $post_type = get_post_type($master_post_id); |
| 2692 | 2692 | |
| 2693 | - remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language
|
|
| 2693 | + remove_filter('get_term', array($sitepress, 'get_term_adjust_id')); // AVOID filtering to current language
|
|
| 2694 | 2694 | |
| 2695 | 2695 | $taxonomies = get_object_taxonomies($post_type); |
| 2696 | 2696 | foreach ($taxonomies as $taxonomy) {
|
@@ -2699,9 +2699,9 @@ discard block |
||
| 2699 | 2699 | |
| 2700 | 2700 | if ($terms) {
|
| 2701 | 2701 | foreach ($terms as $term) {
|
| 2702 | - $tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang); |
|
| 2702 | + $tr_id = apply_filters('translate_object_id', $term->term_id, $taxonomy, false, $lang);
|
|
| 2703 | 2703 | |
| 2704 | - if (!is_null($tr_id)){
|
|
| 2704 | + if (!is_null($tr_id)) {
|
|
| 2705 | 2705 | // not using get_term - unfiltered get_term |
| 2706 | 2706 | $translated_term = $wpdb->get_row($wpdb->prepare("
|
| 2707 | 2707 | SELECT * FROM {$wpdb->terms} t JOIN {$wpdb->term_taxonomy} x ON x.term_id = t.term_id WHERE t.term_id = %d AND x.taxonomy = %s", $tr_id, $taxonomy));
|
@@ -2710,14 +2710,14 @@ discard block |
||
| 2710 | 2710 | } |
| 2711 | 2711 | } |
| 2712 | 2712 | |
| 2713 | - if (!is_taxonomy_hierarchical($taxonomy)){
|
|
| 2714 | - $terms_array = array_unique( array_map( 'intval', $terms_array ) ); |
|
| 2713 | + if (!is_taxonomy_hierarchical($taxonomy)) {
|
|
| 2714 | + $terms_array = array_unique(array_map('intval', $terms_array));
|
|
| 2715 | 2715 | } |
| 2716 | 2716 | |
| 2717 | 2717 | wp_set_post_terms($tr_post_id, $terms_array, $taxonomy); |
| 2718 | 2718 | |
| 2719 | - if ($taxonomy == $post_type . 'category') {
|
|
| 2720 | - geodir_set_postcat_structure($tr_post_id, $post_type . 'category'); |
|
| 2719 | + if ($taxonomy == $post_type.'category') {
|
|
| 2720 | + geodir_set_postcat_structure($tr_post_id, $post_type.'category'); |
|
| 2721 | 2721 | } |
| 2722 | 2722 | } |
| 2723 | 2723 | } |
@@ -2738,15 +2738,15 @@ discard block |
||
| 2738 | 2738 | function geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang) {
|
| 2739 | 2739 | global $wpdb; |
| 2740 | 2740 | |
| 2741 | - $query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));
|
|
| 2741 | + $query = $wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));
|
|
| 2742 | 2742 | $wpdb->query($query); |
| 2743 | 2743 | |
| 2744 | - $query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));
|
|
| 2744 | + $query = $wpdb->prepare("SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));
|
|
| 2745 | 2745 | $post_images = $wpdb->get_results($query); |
| 2746 | 2746 | |
| 2747 | - if ( !empty( $post_images ) ) {
|
|
| 2748 | - foreach ( $post_images as $post_image) {
|
|
| 2749 | - $image_data = (array)$post_image; |
|
| 2747 | + if (!empty($post_images)) {
|
|
| 2748 | + foreach ($post_images as $post_image) {
|
|
| 2749 | + $image_data = (array) $post_image; |
|
| 2750 | 2750 | unset($image_data['ID']); |
| 2751 | 2751 | $image_data['post_id'] = $tr_post_id; |
| 2752 | 2752 | |
@@ -2779,13 +2779,13 @@ discard block |
||
| 2779 | 2779 | function geodir_wpml_duplicate_post_review($master_comment_id, $master_post_id, $tr_post_id, $lang) {
|
| 2780 | 2780 | global $wpdb, $plugin_prefix, $sitepress; |
| 2781 | 2781 | |
| 2782 | - $review = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d ORDER BY id ASC", $master_comment_id), ARRAY_A);
|
|
| 2782 | + $review = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id=%d ORDER BY id ASC", $master_comment_id), ARRAY_A);
|
|
| 2783 | 2783 | |
| 2784 | 2784 | if (empty($review)) {
|
| 2785 | 2785 | return false; |
| 2786 | 2786 | } |
| 2787 | 2787 | if ($review['post_id'] != $master_post_id) {
|
| 2788 | - $wpdb->query($wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET post_id=%d WHERE comment_id=%d", $master_post_id, $master_comment_id));
|
|
| 2788 | + $wpdb->query($wpdb->prepare("UPDATE ".GEODIR_REVIEW_TABLE." SET post_id=%d WHERE comment_id=%d", $master_post_id, $master_comment_id));
|
|
| 2789 | 2789 | geodir_update_postrating($master_post_id, $post_type); |
| 2790 | 2790 | } |
| 2791 | 2791 | |
@@ -2796,9 +2796,9 @@ discard block |
||
| 2796 | 2796 | } |
| 2797 | 2797 | |
| 2798 | 2798 | $post_type = get_post_type($master_post_id); |
| 2799 | - $post_table = $plugin_prefix . $post_type . '_detail'; |
|
| 2799 | + $post_table = $plugin_prefix.$post_type.'_detail'; |
|
| 2800 | 2800 | |
| 2801 | - $translated_post = $wpdb->get_row($wpdb->prepare("SELECT post_title, post_latitude, post_longitude, post_city, post_region, post_country FROM " . $post_table . " WHERE post_id = %d", $tr_post_id), ARRAY_A);
|
|
| 2801 | + $translated_post = $wpdb->get_row($wpdb->prepare("SELECT post_title, post_latitude, post_longitude, post_city, post_region, post_country FROM ".$post_table." WHERE post_id = %d", $tr_post_id), ARRAY_A);
|
|
| 2802 | 2802 | if (empty($translated_post)) {
|
| 2803 | 2803 | return false; |
| 2804 | 2804 | } |
@@ -2816,7 +2816,7 @@ discard block |
||
| 2816 | 2816 | unset($review['id']); |
| 2817 | 2817 | } |
| 2818 | 2818 | |
| 2819 | - $tr_review_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d AND post_id=%d ORDER BY id ASC", $tr_comment_id, $tr_post_id));
|
|
| 2819 | + $tr_review_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id=%d AND post_id=%d ORDER BY id ASC", $tr_comment_id, $tr_post_id));
|
|
| 2820 | 2820 | |
| 2821 | 2821 | if ($tr_review_id) { // update review
|
| 2822 | 2822 | $wpdb->update(GEODIR_REVIEW_TABLE, $review, array('id' => $tr_review_id));
|
@@ -2829,8 +2829,8 @@ discard block |
||
| 2829 | 2829 | geodir_update_postrating($tr_post_id, $post_type); |
| 2830 | 2830 | |
| 2831 | 2831 | if (defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_review') && $sitepress->get_setting('sync_comments_on_duplicates')) {
|
| 2832 | - $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_COMMENTS_REVIEWS_TABLE . " WHERE comment_id = %d", array($tr_comment_id)));
|
|
| 2833 | - $likes = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_COMMENTS_REVIEWS_TABLE . " WHERE comment_id=%d ORDER BY like_date ASC", $master_comment_id, $tr_post_id), ARRAY_A);
|
|
| 2832 | + $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_COMMENTS_REVIEWS_TABLE." WHERE comment_id = %d", array($tr_comment_id)));
|
|
| 2833 | + $likes = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_COMMENTS_REVIEWS_TABLE." WHERE comment_id=%d ORDER BY like_date ASC", $master_comment_id, $tr_post_id), ARRAY_A);
|
|
| 2834 | 2834 | |
| 2835 | 2835 | if (!empty($likes)) {
|
| 2836 | 2836 | foreach ($likes as $like) {
|
@@ -2932,7 +2932,7 @@ discard block |
||
| 2932 | 2932 | * @return bool True if review star disabled, otherwise false. |
| 2933 | 2933 | */ |
| 2934 | 2934 | function geodir_rating_disabled_post_types() {
|
| 2935 | - $post_types = get_option( 'geodir_disable_rating_cpt' ); |
|
| 2935 | + $post_types = get_option('geodir_disable_rating_cpt');
|
|
| 2936 | 2936 | |
| 2937 | 2937 | /** |
| 2938 | 2938 | * Filter the post types array which have rating disabled. |
@@ -2941,7 +2941,7 @@ discard block |
||
| 2941 | 2941 | * |
| 2942 | 2942 | * @param array $post_types Array of post types which have rating starts disabled. |
| 2943 | 2943 | */ |
| 2944 | - return apply_filters( 'geodir_rating_disabled_post_types', $post_types ); |
|
| 2944 | + return apply_filters('geodir_rating_disabled_post_types', $post_types);
|
|
| 2945 | 2945 | } |
| 2946 | 2946 | |
| 2947 | 2947 | /** |
@@ -2953,30 +2953,30 @@ discard block |
||
| 2953 | 2953 | * @param bool $taxonomy Whether $post_type is taxonomy or not. |
| 2954 | 2954 | * @return bool True if review star disabled, otherwise false. |
| 2955 | 2955 | */ |
| 2956 | -function geodir_cpt_has_rating_disabled( $post_type = '', $taxonomy = false ) {
|
|
| 2956 | +function geodir_cpt_has_rating_disabled($post_type = '', $taxonomy = false) {
|
|
| 2957 | 2957 | $post_types = geodir_rating_disabled_post_types(); |
| 2958 | 2958 | |
| 2959 | - if ( empty( $post_types ) ) {
|
|
| 2959 | + if (empty($post_types)) {
|
|
| 2960 | 2960 | return false; |
| 2961 | 2961 | } |
| 2962 | 2962 | |
| 2963 | - if ( is_int( $post_type ) ) {
|
|
| 2964 | - $post_type = get_post_type( $post_type ); |
|
| 2963 | + if (is_int($post_type)) {
|
|
| 2964 | + $post_type = get_post_type($post_type); |
|
| 2965 | 2965 | } |
| 2966 | 2966 | |
| 2967 | - if ( $taxonomy && !empty( $post_types ) ) {
|
|
| 2967 | + if ($taxonomy && !empty($post_types)) {
|
|
| 2968 | 2968 | $posttypes = array(); |
| 2969 | 2969 | |
| 2970 | - foreach ( $post_types as $posttype ) {
|
|
| 2971 | - $posttypes[] = $posttype . 'category'; |
|
| 2972 | - $posttypes[] = $posttype . '_tags'; |
|
| 2970 | + foreach ($post_types as $posttype) {
|
|
| 2971 | + $posttypes[] = $posttype.'category'; |
|
| 2972 | + $posttypes[] = $posttype.'_tags'; |
|
| 2973 | 2973 | } |
| 2974 | 2974 | |
| 2975 | 2975 | $post_types = $posttypes; |
| 2976 | 2976 | } |
| 2977 | 2977 | |
| 2978 | 2978 | $return = false; |
| 2979 | - if ( $post_type != '' && !empty( $post_types ) && in_array( $post_type, $post_types ) ) {
|
|
| 2979 | + if ($post_type != '' && !empty($post_types) && in_array($post_type, $post_types)) {
|
|
| 2980 | 2980 | $return = true; |
| 2981 | 2981 | } |
| 2982 | 2982 | |
@@ -2991,7 +2991,7 @@ discard block |
||
| 2991 | 2991 | * @return bool True if Yoast SEO disabled on GD pages. |
| 2992 | 2992 | */ |
| 2993 | 2993 | function geodir_disable_yoast_seo_metas() {
|
| 2994 | - return (bool)get_option( 'geodir_disable_yoast_meta' ); |
|
| 2994 | + return (bool) get_option('geodir_disable_yoast_meta');
|
|
| 2995 | 2995 | } |
| 2996 | 2996 | |
| 2997 | 2997 | /** |
@@ -3002,30 +3002,30 @@ discard block |
||
| 3002 | 3002 | * @param int $post_id The post ID. |
| 3003 | 3003 | * @return bool True if allowed. |
| 3004 | 3004 | */ |
| 3005 | -function geodir_wpml_allowed_to_duplicate( $post_id ) {
|
|
| 3005 | +function geodir_wpml_allowed_to_duplicate($post_id) {
|
|
| 3006 | 3006 | $allowed = false; |
| 3007 | 3007 | |
| 3008 | - if ( !geodir_is_wpml() || empty( $post_id ) ) {
|
|
| 3008 | + if (!geodir_is_wpml() || empty($post_id)) {
|
|
| 3009 | 3009 | return $allowed; |
| 3010 | 3010 | } |
| 3011 | 3011 | |
| 3012 | - $user_id = (int)get_current_user_id(); |
|
| 3012 | + $user_id = (int) get_current_user_id(); |
|
| 3013 | 3013 | |
| 3014 | - if ( empty( $user_id ) ) {
|
|
| 3014 | + if (empty($user_id)) {
|
|
| 3015 | 3015 | return $allowed; |
| 3016 | 3016 | } |
| 3017 | 3017 | |
| 3018 | - $post_type = get_post_type( $post_id ); |
|
| 3019 | - if ( !geodir_wpml_is_post_type_translated( $post_type ) || get_post_meta( $post_id, '_icl_lang_duplicate_of', true ) ) {
|
|
| 3018 | + $post_type = get_post_type($post_id); |
|
| 3019 | + if (!geodir_wpml_is_post_type_translated($post_type) || get_post_meta($post_id, '_icl_lang_duplicate_of', true)) {
|
|
| 3020 | 3020 | return $allowed; |
| 3021 | 3021 | } |
| 3022 | 3022 | |
| 3023 | - if ( geodir_listing_belong_to_current_user( $post_id ) ) {
|
|
| 3023 | + if (geodir_listing_belong_to_current_user($post_id)) {
|
|
| 3024 | 3024 | $allowed = true; |
| 3025 | 3025 | } |
| 3026 | 3026 | |
| 3027 | - $disable_cpts = get_option( 'geodir_wpml_disable_duplicate' ); |
|
| 3028 | - if ( $allowed && !empty( $disable_cpts ) && in_array( $post_type, $disable_cpts ) ) {
|
|
| 3027 | + $disable_cpts = get_option('geodir_wpml_disable_duplicate');
|
|
| 3028 | + if ($allowed && !empty($disable_cpts) && in_array($post_type, $disable_cpts)) {
|
|
| 3029 | 3029 | $allowed = false; |
| 3030 | 3030 | } |
| 3031 | 3031 | |
@@ -3035,7 +3035,7 @@ discard block |
||
| 3035 | 3035 | * @param bool $allowed True if allowed. |
| 3036 | 3036 | * @param int $post_id The post ID. |
| 3037 | 3037 | */ |
| 3038 | - return apply_filters( 'geodir_wpml_allowed_to_duplicate', $allowed, $post_id ); |
|
| 3038 | + return apply_filters('geodir_wpml_allowed_to_duplicate', $allowed, $post_id);
|
|
| 3039 | 3039 | } |
| 3040 | 3040 | |
| 3041 | 3041 | /** |
@@ -3050,61 +3050,61 @@ discard block |
||
| 3050 | 3050 | * @param string $content_html The output html of the geodir_edit_post_link() function. |
| 3051 | 3051 | * @return string Filtered html of the geodir_edit_post_link() function. |
| 3052 | 3052 | */ |
| 3053 | -function geodir_wpml_frontend_duplicate_listing( $content_html ) {
|
|
| 3053 | +function geodir_wpml_frontend_duplicate_listing($content_html) {
|
|
| 3054 | 3054 | global $post, $preview, $sitepress; |
| 3055 | 3055 | |
| 3056 | - if ( !empty( $post->ID ) && !$preview && geodir_is_page( 'detail' ) && geodir_wpml_allowed_to_duplicate( $post->ID ) ) {
|
|
| 3056 | + if (!empty($post->ID) && !$preview && geodir_is_page('detail') && geodir_wpml_allowed_to_duplicate($post->ID)) {
|
|
| 3057 | 3057 | $post_id = $post->ID; |
| 3058 | - $element_type = 'post_' . get_post_type( $post_id ); |
|
| 3059 | - $original_post_id = $sitepress->get_original_element_id( $post_id, $element_type ); |
|
| 3058 | + $element_type = 'post_'.get_post_type($post_id); |
|
| 3059 | + $original_post_id = $sitepress->get_original_element_id($post_id, $element_type); |
|
| 3060 | 3060 | |
| 3061 | - if ( $original_post_id == $post_id ) {
|
|
| 3061 | + if ($original_post_id == $post_id) {
|
|
| 3062 | 3062 | $wpml_languages = $sitepress->get_active_languages(); |
| 3063 | - $post_language = $sitepress->get_language_for_element( $post_id, $element_type ); |
|
| 3063 | + $post_language = $sitepress->get_language_for_element($post_id, $element_type); |
|
| 3064 | 3064 | |
| 3065 | - if ( !empty( $wpml_languages ) && isset( $wpml_languages[ $post_language ] ) ) {
|
|
| 3066 | - unset( $wpml_languages[ $post_language ] ); |
|
| 3065 | + if (!empty($wpml_languages) && isset($wpml_languages[$post_language])) {
|
|
| 3066 | + unset($wpml_languages[$post_language]); |
|
| 3067 | 3067 | } |
| 3068 | 3068 | |
| 3069 | - if ( !empty( $wpml_languages ) ) {
|
|
| 3070 | - $trid = $sitepress->get_element_trid( $post_id, $element_type ); |
|
| 3071 | - $element_translations = $sitepress->get_element_translations( $trid, $element_type ); |
|
| 3072 | - $duplicates = $sitepress->get_duplicates( $post_id ); |
|
| 3069 | + if (!empty($wpml_languages)) {
|
|
| 3070 | + $trid = $sitepress->get_element_trid($post_id, $element_type); |
|
| 3071 | + $element_translations = $sitepress->get_element_translations($trid, $element_type); |
|
| 3072 | + $duplicates = $sitepress->get_duplicates($post_id); |
|
| 3073 | 3073 | |
| 3074 | - $wpml_content = '<div class="geodir-company_info gd-detail-duplicate"><h3 class="widget-title">' . __( 'Translate Listing', 'geodirectory' ) . '</h3>'; |
|
| 3074 | + $wpml_content = '<div class="geodir-company_info gd-detail-duplicate"><h3 class="widget-title">'.__('Translate Listing', 'geodirectory').'</h3>';
|
|
| 3075 | 3075 | $wpml_content .= '<table class="gd-duplicate-table" style="width:100%;margin:0"><tbody>'; |
| 3076 | - $wpml_content .= '<tr style="border-bottom:solid 1px #efefef"><th style="padding:0 2px 2px 2px">' . __( 'Language', 'geodirectory' ) . '</th><th style="width:25px;"></th><th style="width:5em;text-align:center">' . __( 'Translate', 'geodirectory' ) . '</th></tr>'; |
|
| 3076 | + $wpml_content .= '<tr style="border-bottom:solid 1px #efefef"><th style="padding:0 2px 2px 2px">'.__('Language', 'geodirectory').'</th><th style="width:25px;"></th><th style="width:5em;text-align:center">'.__('Translate', 'geodirectory').'</th></tr>';
|
|
| 3077 | 3077 | |
| 3078 | 3078 | $needs_translation = false; |
| 3079 | 3079 | |
| 3080 | - foreach ( $wpml_languages as $lang_code => $lang ) {
|
|
| 3080 | + foreach ($wpml_languages as $lang_code => $lang) {
|
|
| 3081 | 3081 | $duplicates_text = ''; |
| 3082 | 3082 | $translated = false; |
| 3083 | 3083 | |
| 3084 | - if ( !empty( $element_translations ) && isset( $element_translations[$lang_code] ) ) {
|
|
| 3084 | + if (!empty($element_translations) && isset($element_translations[$lang_code])) {
|
|
| 3085 | 3085 | $translated = true; |
| 3086 | 3086 | |
| 3087 | - if ( !empty( $duplicates ) && isset( $duplicates[$lang_code] ) ) {
|
|
| 3088 | - $duplicates_text = ' ' . __( '(duplicate)', 'geodirectory' ); |
|
| 3087 | + if (!empty($duplicates) && isset($duplicates[$lang_code])) {
|
|
| 3088 | + $duplicates_text = ' '.__('(duplicate)', 'geodirectory');
|
|
| 3089 | 3089 | } |
| 3090 | 3090 | } else {
|
| 3091 | 3091 | $needs_translation = true; |
| 3092 | 3092 | } |
| 3093 | 3093 | |
| 3094 | - $wpml_content .= '<tr><td style="padding:4px">' . $lang['english_name'] . $duplicates_text . '</td><td> </td><td style="text-align:center;">'; |
|
| 3094 | + $wpml_content .= '<tr><td style="padding:4px">'.$lang['english_name'].$duplicates_text.'</td><td> </td><td style="text-align:center;">'; |
|
| 3095 | 3095 | |
| 3096 | - if ( $translated ) {
|
|
| 3096 | + if ($translated) {
|
|
| 3097 | 3097 | $wpml_content .= '<i class="fa fa-check" style="color:orange"></i>'; |
| 3098 | 3098 | } else {
|
| 3099 | - $wpml_content .= '<input name="gd_icl_dup[]" value="' . $lang_code . '" title="' . esc_attr__( 'Create duplicate', 'geodirectory' ) . '" type="checkbox">'; |
|
| 3099 | + $wpml_content .= '<input name="gd_icl_dup[]" value="'.$lang_code.'" title="'.esc_attr__('Create duplicate', 'geodirectory').'" type="checkbox">';
|
|
| 3100 | 3100 | } |
| 3101 | 3101 | |
| 3102 | 3102 | $wpml_content .= '</td></tr>'; |
| 3103 | 3103 | } |
| 3104 | 3104 | |
| 3105 | - if ( $needs_translation ) {
|
|
| 3106 | - $nonce = wp_create_nonce( 'geodir_duplicate_nonce' ); |
|
| 3107 | - $wpml_content .= '<tr><td> </td><td style="vertical-align:middle;padding-top:13px"><i style="display:none" class="fa fa-spin fa-refresh"></i></td><td style="padding:15px 3px 3px 3px;text-align:right"><button data-nonce="' . esc_attr( $nonce ) . '" data-post-id="' . $post_id . '" id="gd_make_duplicates" class="button-secondary">' . __( 'Duplicate', 'geodirectory' ) . '</button></td></tr>'; |
|
| 3105 | + if ($needs_translation) {
|
|
| 3106 | + $nonce = wp_create_nonce('geodir_duplicate_nonce');
|
|
| 3107 | + $wpml_content .= '<tr><td> </td><td style="vertical-align:middle;padding-top:13px"><i style="display:none" class="fa fa-spin fa-refresh"></i></td><td style="padding:15px 3px 3px 3px;text-align:right"><button data-nonce="'.esc_attr($nonce).'" data-post-id="'.$post_id.'" id="gd_make_duplicates" class="button-secondary">'.__('Duplicate', 'geodirectory').'</button></td></tr>';
|
|
| 3108 | 3108 | } |
| 3109 | 3109 | |
| 3110 | 3110 | $wpml_content .= '</tbody></table>'; |
@@ -3126,12 +3126,12 @@ discard block |
||
| 3126 | 3126 | * @param array $settings GD design settings array. |
| 3127 | 3127 | * @return array Filtered GD design settings array.. |
| 3128 | 3128 | */ |
| 3129 | -function geodir_wpml_duplicate_settings( $settings = array() ) {
|
|
| 3129 | +function geodir_wpml_duplicate_settings($settings = array()) {
|
|
| 3130 | 3130 | $new_settings = array(); |
| 3131 | 3131 | |
| 3132 | - foreach ( $settings as $key => $setting ) {
|
|
| 3132 | + foreach ($settings as $key => $setting) {
|
|
| 3133 | 3133 | |
| 3134 | - if ( isset( $setting['type'] ) && $setting['type'] == 'sectionend' && $setting['id'] == 'detail_page_settings' ) {
|
|
| 3134 | + if (isset($setting['type']) && $setting['type'] == 'sectionend' && $setting['id'] == 'detail_page_settings') {
|
|
| 3135 | 3135 | $new_settings[] = array( |
| 3136 | 3136 | 'name' => __('Disable WPML duplicate translation', 'geodirectory'),
|
| 3137 | 3137 | 'desc' => __('Select post types to disable front end WPML duplicate translation. For selected post types the WPML duplicate option will be disabled from listing detail page sidebar.', 'geodirectory'),
|
@@ -3159,12 +3159,12 @@ discard block |
||
| 3159 | 3159 | * @param string $taxonomy name/slug of a taxonomy. |
| 3160 | 3160 | * @return bool true if the taxonomy is currently set to being translatable in WPML. |
| 3161 | 3161 | */ |
| 3162 | -function geodir_wpml_is_taxonomy_translated( $taxonomy ) {
|
|
| 3163 | - if ( empty( $taxonomy ) || !geodir_is_wpml() || !function_exists( 'is_taxonomy_translated' ) ) {
|
|
| 3162 | +function geodir_wpml_is_taxonomy_translated($taxonomy) {
|
|
| 3163 | + if (empty($taxonomy) || !geodir_is_wpml() || !function_exists('is_taxonomy_translated')) {
|
|
| 3164 | 3164 | return false; |
| 3165 | 3165 | } |
| 3166 | 3166 | |
| 3167 | - if ( is_taxonomy_translated( $taxonomy ) ) {
|
|
| 3167 | + if (is_taxonomy_translated($taxonomy)) {
|
|
| 3168 | 3168 | return true; |
| 3169 | 3169 | } |
| 3170 | 3170 | |
@@ -3179,12 +3179,12 @@ discard block |
||
| 3179 | 3179 | * @param string $post_type name/slug of a post_type. |
| 3180 | 3180 | * @return bool true if the post_type is currently set to being translatable in WPML. |
| 3181 | 3181 | */ |
| 3182 | -function geodir_wpml_is_post_type_translated( $post_type ) {
|
|
| 3183 | - if ( empty( $post_type ) || !geodir_is_wpml() || !function_exists( 'is_post_type_translated' ) ) {
|
|
| 3182 | +function geodir_wpml_is_post_type_translated($post_type) {
|
|
| 3183 | + if (empty($post_type) || !geodir_is_wpml() || !function_exists('is_post_type_translated')) {
|
|
| 3184 | 3184 | return false; |
| 3185 | 3185 | } |
| 3186 | 3186 | |
| 3187 | - if ( is_post_type_translated( $post_type ) ) {
|
|
| 3187 | + if (is_post_type_translated($post_type)) {
|
|
| 3188 | 3188 | return true; |
| 3189 | 3189 | } |
| 3190 | 3190 | |
@@ -3206,12 +3206,12 @@ discard block |
||
| 3206 | 3206 | * |
| 3207 | 3207 | * @return int|NULL |
| 3208 | 3208 | */ |
| 3209 | -function geodir_wpml_object_id( $element_id, $element_type = 'post', $return_original_if_missing = false, $ulanguage_code = null ) {
|
|
| 3210 | - if ( geodir_is_wpml() ) {
|
|
| 3211 | - if ( function_exists( 'wpml_object_id_filter' ) ) {
|
|
| 3212 | - return apply_filters( 'wpml_object_id', $element_id, $element_type, $return_original_if_missing, $ulanguage_code ); |
|
| 3209 | +function geodir_wpml_object_id($element_id, $element_type = 'post', $return_original_if_missing = false, $ulanguage_code = null) {
|
|
| 3210 | + if (geodir_is_wpml()) {
|
|
| 3211 | + if (function_exists('wpml_object_id_filter')) {
|
|
| 3212 | + return apply_filters('wpml_object_id', $element_id, $element_type, $return_original_if_missing, $ulanguage_code);
|
|
| 3213 | 3213 | } else {
|
| 3214 | - return icl_object_id( $element_id, $element_type, $return_original_if_missing, $ulanguage_code ); |
|
| 3214 | + return icl_object_id($element_id, $element_type, $return_original_if_missing, $ulanguage_code); |
|
| 3215 | 3215 | } |
| 3216 | 3216 | } |
| 3217 | 3217 | |
@@ -16,10 +16,10 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | function geodir_session_start() |
| 18 | 18 | {
|
| 19 | - if (!session_id()) session_start(); |
|
| 20 | - global $geodir_add_location_url; |
|
| 19 | + if (!session_id()) session_start(); |
|
| 20 | + global $geodir_add_location_url; |
|
| 21 | 21 | |
| 22 | - $geodir_add_location_url = NULL; |
|
| 22 | + $geodir_add_location_url = NULL; |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | /** |
@@ -33,18 +33,18 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | function geodir_modified_query($query) |
| 35 | 35 | {
|
| 36 | - if ($query->is_main_query() && ( |
|
| 37 | - (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
|
|
| 38 | - || geodir_is_page('listing')
|
|
| 39 | - || geodir_is_page('author')
|
|
| 40 | - || geodir_is_page('search')
|
|
| 41 | - || geodir_is_page('detail'))
|
|
| 42 | - ) {
|
|
| 43 | - |
|
| 44 | - $query->set('is_geodir_loop', true);
|
|
| 45 | - } |
|
| 36 | + if ($query->is_main_query() && ( |
|
| 37 | + (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
|
|
| 38 | + || geodir_is_page('listing')
|
|
| 39 | + || geodir_is_page('author')
|
|
| 40 | + || geodir_is_page('search')
|
|
| 41 | + || geodir_is_page('detail'))
|
|
| 42 | + ) {
|
|
| 43 | + |
|
| 44 | + $query->set('is_geodir_loop', true);
|
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - return $query; |
|
| 47 | + return $query; |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -67,82 +67,82 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | function set_listing_request($query ) |
| 69 | 69 | {
|
| 70 | - global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA; |
|
| 70 | + global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA; |
|
| 71 | 71 | |
| 72 | 72 | |
| 73 | - // fix woocommerce shop products filtered by language for GD + WPML + Woocommerce |
|
| 74 | - if (!geodir_is_geodir_page()) {
|
|
| 75 | - return; |
|
| 76 | - } |
|
| 73 | + // fix woocommerce shop products filtered by language for GD + WPML + Woocommerce |
|
| 74 | + if (!geodir_is_geodir_page()) {
|
|
| 75 | + return; |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | - /* remove all pre filters */ |
|
| 79 | - remove_all_filters('query');
|
|
| 80 | - remove_all_filters('posts_search');
|
|
| 81 | - remove_all_filters('posts_fields');
|
|
| 82 | - remove_all_filters('posts_join');
|
|
| 83 | - remove_all_filters('posts_orderby');
|
|
| 84 | - remove_all_filters('posts_where');
|
|
| 78 | + /* remove all pre filters */ |
|
| 79 | + remove_all_filters('query');
|
|
| 80 | + remove_all_filters('posts_search');
|
|
| 81 | + remove_all_filters('posts_fields');
|
|
| 82 | + remove_all_filters('posts_join');
|
|
| 83 | + remove_all_filters('posts_orderby');
|
|
| 84 | + remove_all_filters('posts_where');
|
|
| 85 | 85 | |
| 86 | 86 | |
| 87 | - if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')): |
|
| 87 | + if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')): |
|
| 88 | 88 | |
| 89 | - if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = ''; |
|
| 90 | - //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = ''; |
|
| 89 | + if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = ''; |
|
| 90 | + //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = ''; |
|
| 91 | 91 | |
| 92 | - if (isset($_REQUEST['sdist'])) {
|
|
| 93 | - ($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000; |
|
| 94 | - } elseif (get_option('geodir_search_dist') != '') {
|
|
| 95 | - $dist = get_option('geodir_search_dist');
|
|
| 92 | + if (isset($_REQUEST['sdist'])) {
|
|
| 93 | + ($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000; |
|
| 94 | + } elseif (get_option('geodir_search_dist') != '') {
|
|
| 95 | + $dist = get_option('geodir_search_dist');
|
|
| 96 | 96 | |
| 97 | - } else {
|
|
| 98 | - $dist = 25000; |
|
| 99 | - } // Distance |
|
| 97 | + } else {
|
|
| 98 | + $dist = 25000; |
|
| 99 | + } // Distance |
|
| 100 | 100 | |
| 101 | - if (isset($_REQUEST['sgeo_lat'])) {
|
|
| 102 | - $mylat = (float)esc_attr($_REQUEST['sgeo_lat']); |
|
| 103 | - } else {
|
|
| 104 | - $mylat = (float)geodir_get_current_city_lat(); |
|
| 105 | - } // Latitude |
|
| 101 | + if (isset($_REQUEST['sgeo_lat'])) {
|
|
| 102 | + $mylat = (float)esc_attr($_REQUEST['sgeo_lat']); |
|
| 103 | + } else {
|
|
| 104 | + $mylat = (float)geodir_get_current_city_lat(); |
|
| 105 | + } // Latitude |
|
| 106 | 106 | |
| 107 | - if (isset($_REQUEST['sgeo_lon'])) {
|
|
| 108 | - $mylon = (float)esc_attr($_REQUEST['sgeo_lon']); |
|
| 109 | - } else {
|
|
| 110 | - $mylon = (float)geodir_get_current_city_lng(); |
|
| 111 | - } // Distance |
|
| 107 | + if (isset($_REQUEST['sgeo_lon'])) {
|
|
| 108 | + $mylon = (float)esc_attr($_REQUEST['sgeo_lon']); |
|
| 109 | + } else {
|
|
| 110 | + $mylon = (float)geodir_get_current_city_lng(); |
|
| 111 | + } // Distance |
|
| 112 | 112 | |
| 113 | - if (isset($_REQUEST['snear'])) {
|
|
| 114 | - $snear = trim(esc_attr($_REQUEST['snear'])); |
|
| 115 | - } |
|
| 113 | + if (isset($_REQUEST['snear'])) {
|
|
| 114 | + $snear = trim(esc_attr($_REQUEST['snear'])); |
|
| 115 | + } |
|
| 116 | 116 | |
| 117 | - if (isset($_REQUEST['s'])) {
|
|
| 118 | - $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s']))); |
|
| 119 | - $s = str_replace(array("%E2%80%99","’"),array("%27","'"),$s);
|
|
| 120 | - } |
|
| 117 | + if (isset($_REQUEST['s'])) {
|
|
| 118 | + $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s']))); |
|
| 119 | + $s = str_replace(array("%E2%80%99","’"),array("%27","'"),$s);
|
|
| 120 | + } |
|
| 121 | 121 | |
| 122 | - if ($snear == 'NEAR ME') {
|
|
| 123 | - $ip = $_SERVER['REMOTE_ADDR']; |
|
| 124 | - $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));
|
|
| 125 | - $mylat = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_latitude])); |
|
| 126 | - $mylon = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_longitude])); |
|
| 127 | - } |
|
| 122 | + if ($snear == 'NEAR ME') {
|
|
| 123 | + $ip = $_SERVER['REMOTE_ADDR']; |
|
| 124 | + $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));
|
|
| 125 | + $mylat = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_latitude])); |
|
| 126 | + $mylon = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_longitude])); |
|
| 127 | + } |
|
| 128 | 128 | |
| 129 | 129 | |
| 130 | - if (strstr($s, ',')) {
|
|
| 131 | - $s_AA = str_replace(" ", "", $s);
|
|
| 132 | - $s_A = explode(",", $s_AA);
|
|
| 133 | - $s_A = implode('","', $s_A);
|
|
| 134 | - $s_A = '"' . $s_A . '"'; |
|
| 135 | - } else {
|
|
| 136 | - $s_A = '"' . $s . '"'; |
|
| 137 | - } |
|
| 130 | + if (strstr($s, ',')) {
|
|
| 131 | + $s_AA = str_replace(" ", "", $s);
|
|
| 132 | + $s_A = explode(",", $s_AA);
|
|
| 133 | + $s_A = implode('","', $s_A);
|
|
| 134 | + $s_A = '"' . $s_A . '"'; |
|
| 135 | + } else {
|
|
| 136 | + $s_A = '"' . $s . '"'; |
|
| 137 | + } |
|
| 138 | 138 | |
| 139 | - if (strstr($s, ' ')) {
|
|
| 140 | - $s_SA = explode(" ", $s);
|
|
| 141 | - } else {
|
|
| 142 | - $s_SA = ''; |
|
| 143 | - } |
|
| 139 | + if (strstr($s, ' ')) {
|
|
| 140 | + $s_SA = explode(" ", $s);
|
|
| 141 | + } else {
|
|
| 142 | + $s_SA = ''; |
|
| 143 | + } |
|
| 144 | 144 | |
| 145 | - endif; |
|
| 145 | + endif; |
|
| 146 | 146 | |
| 147 | 147 | |
| 148 | 148 | |
@@ -163,56 +163,56 @@ discard block |
||
| 163 | 163 | */ |
| 164 | 164 | function geodir_listing_loop_filter($query) |
| 165 | 165 | {
|
| 166 | - global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term; |
|
| 166 | + global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term; |
|
| 167 | 167 | |
| 168 | - // fix wp_reset_query for popular post view widget |
|
| 169 | - if (!geodir_is_geodir_page()) {
|
|
| 170 | - return; |
|
| 171 | - } |
|
| 168 | + // fix wp_reset_query for popular post view widget |
|
| 169 | + if (!geodir_is_geodir_page()) {
|
|
| 170 | + return; |
|
| 171 | + } |
|
| 172 | 172 | |
| 173 | - $geodir_post_type = geodir_get_current_posttype(); |
|
| 174 | - |
|
| 175 | - if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
|
|
| 176 | - $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy'); |
|
| 177 | - |
|
| 178 | - if (isset($wp_query->query[$taxonomies[0]])) {
|
|
| 179 | - $request_term = explode("/", $wp_query->query[$taxonomies[0]]);
|
|
| 180 | - $request_term = end($request_term); |
|
| 181 | - if (!term_exists($request_term)) {
|
|
| 182 | - $args = array('number' => '1',);
|
|
| 183 | - $terms_arr = get_terms($taxonomies[0], $args); |
|
| 184 | - foreach ($terms_arr as $location_term) {
|
|
| 185 | - $term_arr = $location_term; |
|
| 186 | - $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
|
|
| 187 | - } |
|
| 188 | - $wp_query->queried_object_id = 1; |
|
| 189 | - $wp_query->queried_object = $term_arr; |
|
| 190 | - //print_r($wp_query) ; |
|
| 191 | - } |
|
| 192 | - } |
|
| 173 | + $geodir_post_type = geodir_get_current_posttype(); |
|
| 174 | + |
|
| 175 | + if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
|
|
| 176 | + $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy'); |
|
| 177 | + |
|
| 178 | + if (isset($wp_query->query[$taxonomies[0]])) {
|
|
| 179 | + $request_term = explode("/", $wp_query->query[$taxonomies[0]]);
|
|
| 180 | + $request_term = end($request_term); |
|
| 181 | + if (!term_exists($request_term)) {
|
|
| 182 | + $args = array('number' => '1',);
|
|
| 183 | + $terms_arr = get_terms($taxonomies[0], $args); |
|
| 184 | + foreach ($terms_arr as $location_term) {
|
|
| 185 | + $term_arr = $location_term; |
|
| 186 | + $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
|
|
| 187 | + } |
|
| 188 | + $wp_query->queried_object_id = 1; |
|
| 189 | + $wp_query->queried_object = $term_arr; |
|
| 190 | + //print_r($wp_query) ; |
|
| 191 | + } |
|
| 192 | + } |
|
| 193 | 193 | |
| 194 | - } |
|
| 195 | - if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
|
|
| 196 | - |
|
| 197 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 198 | - |
|
| 199 | - add_filter('posts_fields', 'geodir_posts_fields', 1);
|
|
| 200 | - add_filter('posts_join', 'geodir_posts_join', 1);
|
|
| 201 | - geodir_post_where(); |
|
| 202 | - if (!is_admin()) |
|
| 203 | - add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 204 | - |
|
| 205 | - // advanced filter for popular post view widget |
|
| 206 | - global $wp_query; |
|
| 207 | - if (!is_admin()) {
|
|
| 208 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 209 | - add_filter('posts_join', 'geodir_filter_widget_join', 1000);
|
|
| 210 | - } |
|
| 211 | - add_filter('posts_where', 'geodir_filter_widget_where', 1000);
|
|
| 212 | - } |
|
| 194 | + } |
|
| 195 | + if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
|
|
| 213 | 196 | |
| 214 | - } |
|
| 215 | - return $query; |
|
| 197 | + $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 198 | + |
|
| 199 | + add_filter('posts_fields', 'geodir_posts_fields', 1);
|
|
| 200 | + add_filter('posts_join', 'geodir_posts_join', 1);
|
|
| 201 | + geodir_post_where(); |
|
| 202 | + if (!is_admin()) |
|
| 203 | + add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 204 | + |
|
| 205 | + // advanced filter for popular post view widget |
|
| 206 | + global $wp_query; |
|
| 207 | + if (!is_admin()) {
|
|
| 208 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 209 | + add_filter('posts_join', 'geodir_filter_widget_join', 1000);
|
|
| 210 | + } |
|
| 211 | + add_filter('posts_where', 'geodir_filter_widget_where', 1000);
|
|
| 212 | + } |
|
| 213 | + |
|
| 214 | + } |
|
| 215 | + return $query; |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | |
@@ -231,67 +231,67 @@ discard block |
||
| 231 | 231 | * @return string Modified fields query string. |
| 232 | 232 | */ |
| 233 | 233 | function geodir_posts_fields($fields) {
|
| 234 | - global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session; |
|
| 234 | + global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session; |
|
| 235 | 235 | |
| 236 | - // Filter-Location-Manager to add location table. |
|
| 237 | - $fields .= ", " . $table . ".* "; |
|
| 236 | + // Filter-Location-Manager to add location table. |
|
| 237 | + $fields .= ", " . $table . ".* "; |
|
| 238 | 238 | |
| 239 | 239 | if ($snear != '' || $gd_session->get('all_near_me')) {
|
| 240 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 240 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 241 | 241 | |
| 242 | 242 | if ($gd_session->get('all_near_me')) {
|
| 243 | - $mylat = $gd_session->get('user_lat');
|
|
| 244 | - $mylon = $gd_session->get('user_lon');
|
|
| 245 | - } |
|
| 246 | - |
|
| 247 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 248 | - } |
|
| 249 | - |
|
| 250 | - global $s; |
|
| 251 | - if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 252 | - $keywords = explode(" ", $s);
|
|
| 253 | - |
|
| 254 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 255 | - foreach($keywords as $kkey=>$kword){
|
|
| 256 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 257 | - unset($keywords[$kkey]); |
|
| 258 | - } |
|
| 259 | - } |
|
| 260 | - } |
|
| 243 | + $mylat = $gd_session->get('user_lat');
|
|
| 244 | + $mylon = $gd_session->get('user_lon');
|
|
| 245 | + } |
|
| 261 | 246 | |
| 247 | + $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 248 | + } |
|
| 262 | 249 | |
| 263 | - if (count($keywords) > 1) {
|
|
| 264 | - $parts = array( |
|
| 265 | - 'AND' => 'gd_alltitlematch_part', |
|
| 266 | - 'OR' => 'gd_titlematch_part' |
|
| 267 | - ); |
|
| 268 | - $gd_titlematch_part = ""; |
|
| 269 | - foreach ($parts as $key => $part) {
|
|
| 270 | - $gd_titlematch_part .= " CASE WHEN "; |
|
| 271 | - $count = 0; |
|
| 272 | - foreach ($keywords as $keyword) {
|
|
| 273 | - $keyword = trim($keyword); |
|
| 274 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 250 | + global $s; |
|
| 251 | + if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 252 | + $keywords = explode(" ", $s);
|
|
| 253 | + |
|
| 254 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 255 | + foreach($keywords as $kkey=>$kword){
|
|
| 256 | + if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 257 | + unset($keywords[$kkey]); |
|
| 258 | + } |
|
| 259 | + } |
|
| 260 | + } |
|
| 261 | + |
|
| 262 | + |
|
| 263 | + if (count($keywords) > 1) {
|
|
| 264 | + $parts = array( |
|
| 265 | + 'AND' => 'gd_alltitlematch_part', |
|
| 266 | + 'OR' => 'gd_titlematch_part' |
|
| 267 | + ); |
|
| 268 | + $gd_titlematch_part = ""; |
|
| 269 | + foreach ($parts as $key => $part) {
|
|
| 270 | + $gd_titlematch_part .= " CASE WHEN "; |
|
| 271 | + $count = 0; |
|
| 272 | + foreach ($keywords as $keyword) {
|
|
| 273 | + $keyword = trim($keyword); |
|
| 274 | + $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 275 | 275 | $count++; |
| 276 | - if ($count < count($keywords)) {
|
|
| 277 | - // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " "; |
|
| 276 | + if ($count < count($keywords)) {
|
|
| 277 | + // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " "; |
|
| 278 | 278 | $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " "; |
| 279 | - } else {
|
|
| 280 | - //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' "; |
|
| 279 | + } else {
|
|
| 280 | + //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' "; |
|
| 281 | 281 | $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) "; |
| 282 | - } |
|
| 283 | - } |
|
| 284 | - $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ","; |
|
| 285 | - } |
|
| 286 | - } else {
|
|
| 287 | - $gd_titlematch_part = ""; |
|
| 288 | - } |
|
| 289 | - $s = stripslashes_deep( $s ); |
|
| 290 | - $s = wp_specialchars_decode($s,ENT_QUOTES); |
|
| 282 | + } |
|
| 283 | + } |
|
| 284 | + $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ","; |
|
| 285 | + } |
|
| 286 | + } else {
|
|
| 287 | + $gd_titlematch_part = ""; |
|
| 288 | + } |
|
| 289 | + $s = stripslashes_deep( $s ); |
|
| 290 | + $s = wp_specialchars_decode($s,ENT_QUOTES); |
|
| 291 | 291 | $fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));
|
| 292 | - } |
|
| 292 | + } |
|
| 293 | 293 | |
| 294 | - return $fields; |
|
| 294 | + return $fields; |
|
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | |
@@ -308,26 +308,26 @@ discard block |
||
| 308 | 308 | */ |
| 309 | 309 | function geodir_posts_join($join) |
| 310 | 310 | {
|
| 311 | - global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix; |
|
| 311 | + global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix; |
|
| 312 | 312 | |
| 313 | - ########### WPML ########### |
|
| 313 | + ########### WPML ########### |
|
| 314 | 314 | |
| 315 | - if ( geodir_wpml_is_post_type_translated( $geodir_post_type ) ) {
|
|
| 316 | - global $sitepress; |
|
| 317 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 318 | - $default_lang_code = $sitepress->get_default_language(); |
|
| 319 | - if ($lang_code) {
|
|
| 320 | - $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 321 | - } |
|
| 315 | + if ( geodir_wpml_is_post_type_translated( $geodir_post_type ) ) {
|
|
| 316 | + global $sitepress; |
|
| 317 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 318 | + $default_lang_code = $sitepress->get_default_language(); |
|
| 319 | + if ($lang_code) {
|
|
| 320 | + $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 321 | + } |
|
| 322 | 322 | |
| 323 | - } |
|
| 324 | - ########### WPML ########### |
|
| 323 | + } |
|
| 324 | + ########### WPML ########### |
|
| 325 | 325 | |
| 326 | - $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID) ";
|
|
| 327 | - //===old code start |
|
| 328 | - //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id) " ;//===old code end
|
|
| 326 | + $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID) ";
|
|
| 327 | + //===old code start |
|
| 328 | + //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id) " ;//===old code end
|
|
| 329 | 329 | |
| 330 | - return $join; |
|
| 330 | + return $join; |
|
| 331 | 331 | } |
| 332 | 332 | |
| 333 | 333 | |
@@ -345,15 +345,15 @@ discard block |
||
| 345 | 345 | */ |
| 346 | 346 | function geodir_posts_orderby($orderby) |
| 347 | 347 | {
|
| 348 | - global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort; |
|
| 348 | + global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort; |
|
| 349 | 349 | |
| 350 | - $sort_by = ''; |
|
| 351 | - $orderby = ' '; |
|
| 350 | + $sort_by = ''; |
|
| 351 | + $orderby = ' '; |
|
| 352 | 352 | |
| 353 | - if (get_query_var('order_by'))
|
|
| 354 | - $sort_by = get_query_var('order_by');
|
|
| 353 | + if (get_query_var('order_by'))
|
|
| 354 | + $sort_by = get_query_var('order_by');
|
|
| 355 | 355 | |
| 356 | - /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){
|
|
| 356 | + /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){
|
|
| 357 | 357 | $current_term = $wp_query->get_queried_object(); |
| 358 | 358 | } |
| 359 | 359 | |
@@ -367,133 +367,133 @@ discard block |
||
| 367 | 367 | }*/ |
| 368 | 368 | |
| 369 | 369 | |
| 370 | - if ($snear != '') {
|
|
| 371 | - $orderby .= " distance,"; |
|
| 372 | - } |
|
| 370 | + if ($snear != '') {
|
|
| 371 | + $orderby .= " distance,"; |
|
| 372 | + } |
|
| 373 | 373 | |
| 374 | - if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) |
|
| 375 | - $sort_by = esc_attr($_REQUEST['sort_by']); |
|
| 374 | + if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) |
|
| 375 | + $sort_by = esc_attr($_REQUEST['sort_by']); |
|
| 376 | 376 | |
| 377 | 377 | |
| 378 | - if ($sort_by == '') {
|
|
| 379 | - $default_sort = geodir_get_posts_default_sort($geodir_post_type); |
|
| 380 | - if (!empty($default_sort)) |
|
| 381 | - $sort_by = $default_sort; |
|
| 382 | - } |
|
| 378 | + if ($sort_by == '') {
|
|
| 379 | + $default_sort = geodir_get_posts_default_sort($geodir_post_type); |
|
| 380 | + if (!empty($default_sort)) |
|
| 381 | + $sort_by = $default_sort; |
|
| 382 | + } |
|
| 383 | 383 | |
| 384 | - /* |
|
| 384 | + /* |
|
| 385 | 385 | if search by term & no location then order always "relevance" |
| 386 | 386 | if search by location then order always "nearest" |
| 387 | 387 | */ |
| 388 | - if (is_main_query() && geodir_is_page('search')) {
|
|
| 389 | - $search_term = get_query_var('s');
|
|
| 388 | + if (is_main_query() && geodir_is_page('search')) {
|
|
| 389 | + $search_term = get_query_var('s');
|
|
| 390 | 390 | |
| 391 | - if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {
|
|
| 392 | - $sort_by = 'az'; |
|
| 393 | - } |
|
| 391 | + if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {
|
|
| 392 | + $sort_by = 'az'; |
|
| 393 | + } |
|
| 394 | 394 | |
| 395 | - if ($snear != '' && $sort_by!='farthest') {
|
|
| 396 | - $sort_by = 'nearest'; |
|
| 397 | - } |
|
| 398 | - } |
|
| 399 | - |
|
| 400 | - switch ($sort_by): |
|
| 401 | - case 'newest': |
|
| 402 | - $orderby = "$wpdb->posts.post_date desc, "; |
|
| 403 | - break; |
|
| 404 | - case 'oldest': |
|
| 405 | - $orderby = "$wpdb->posts.post_date asc, "; |
|
| 406 | - break; |
|
| 407 | - case 'low_review': |
|
| 408 | - case 'rating_count_asc': |
|
| 409 | - $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, "; |
|
| 410 | - break; |
|
| 411 | - case 'high_review': |
|
| 412 | - case 'rating_count_desc': |
|
| 413 | - $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
| 414 | - break; |
|
| 415 | - case 'low_rating': |
|
| 416 | - $orderby = "( " . $table . ".overall_rating ) ASC, " . $table . ".rating_count ASC, "; |
|
| 417 | - break; |
|
| 418 | - case 'high_rating': |
|
| 419 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 420 | - break; |
|
| 421 | - case 'featured': |
|
| 422 | - $orderby = $table . ".is_featured asc, "; |
|
| 423 | - break; |
|
| 424 | - case 'nearest': |
|
| 425 | - $orderby = " distance asc, "; |
|
| 426 | - break; |
|
| 427 | - case 'farthest': |
|
| 428 | - $orderby = " distance desc, "; |
|
| 429 | - break; |
|
| 430 | - case 'random': |
|
| 431 | - $orderby = " rand(), "; |
|
| 432 | - break; |
|
| 433 | - case 'az': |
|
| 434 | - $orderby = "$wpdb->posts.post_title asc, "; |
|
| 435 | - break; |
|
| 436 | - // sort by rating |
|
| 437 | - case 'overall_rating_desc': |
|
| 438 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 439 | - break; |
|
| 440 | - case 'overall_rating_asc': |
|
| 441 | - $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, "; |
|
| 442 | - break; |
|
| 443 | - default: |
|
| 444 | - |
|
| 445 | - break; |
|
| 446 | - endswitch; |
|
| 447 | - |
|
| 448 | - if ($sort_by != '' && geodir_cpt_has_rating_disabled($geodir_post_type)) {
|
|
| 449 | - if (in_array($sort_by, array('high_review', 'rating_count_desc', 'high_rating', 'overall_rating_desc'))) {
|
|
| 450 | - $orderby = "$wpdb->posts.comment_count DESC, "; |
|
| 451 | - $sort_by = 'comment_count_desc'; |
|
| 452 | - } else if (in_array($sort_by, array('low_review', 'rating_count_asc', 'low_rating', 'overall_rating_asc'))) {
|
|
| 453 | - $orderby = "$wpdb->posts.comment_count ASC, "; |
|
| 454 | - $sort_by = 'comment_count_asc'; |
|
| 455 | - } |
|
| 456 | - } |
|
| 395 | + if ($snear != '' && $sort_by!='farthest') {
|
|
| 396 | + $sort_by = 'nearest'; |
|
| 397 | + } |
|
| 398 | + } |
|
| 457 | 399 | |
| 458 | - global $s; |
|
| 400 | + switch ($sort_by): |
|
| 401 | + case 'newest': |
|
| 402 | + $orderby = "$wpdb->posts.post_date desc, "; |
|
| 403 | + break; |
|
| 404 | + case 'oldest': |
|
| 405 | + $orderby = "$wpdb->posts.post_date asc, "; |
|
| 406 | + break; |
|
| 407 | + case 'low_review': |
|
| 408 | + case 'rating_count_asc': |
|
| 409 | + $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, "; |
|
| 410 | + break; |
|
| 411 | + case 'high_review': |
|
| 412 | + case 'rating_count_desc': |
|
| 413 | + $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
| 414 | + break; |
|
| 415 | + case 'low_rating': |
|
| 416 | + $orderby = "( " . $table . ".overall_rating ) ASC, " . $table . ".rating_count ASC, "; |
|
| 417 | + break; |
|
| 418 | + case 'high_rating': |
|
| 419 | + $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 420 | + break; |
|
| 421 | + case 'featured': |
|
| 422 | + $orderby = $table . ".is_featured asc, "; |
|
| 423 | + break; |
|
| 424 | + case 'nearest': |
|
| 425 | + $orderby = " distance asc, "; |
|
| 426 | + break; |
|
| 427 | + case 'farthest': |
|
| 428 | + $orderby = " distance desc, "; |
|
| 429 | + break; |
|
| 430 | + case 'random': |
|
| 431 | + $orderby = " rand(), "; |
|
| 432 | + break; |
|
| 433 | + case 'az': |
|
| 434 | + $orderby = "$wpdb->posts.post_title asc, "; |
|
| 435 | + break; |
|
| 436 | + // sort by rating |
|
| 437 | + case 'overall_rating_desc': |
|
| 438 | + $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 439 | + break; |
|
| 440 | + case 'overall_rating_asc': |
|
| 441 | + $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, "; |
|
| 442 | + break; |
|
| 443 | + default: |
|
| 444 | + |
|
| 445 | + break; |
|
| 446 | + endswitch; |
|
| 447 | + |
|
| 448 | + if ($sort_by != '' && geodir_cpt_has_rating_disabled($geodir_post_type)) {
|
|
| 449 | + if (in_array($sort_by, array('high_review', 'rating_count_desc', 'high_rating', 'overall_rating_desc'))) {
|
|
| 450 | + $orderby = "$wpdb->posts.comment_count DESC, "; |
|
| 451 | + $sort_by = 'comment_count_desc'; |
|
| 452 | + } else if (in_array($sort_by, array('low_review', 'rating_count_asc', 'low_rating', 'overall_rating_asc'))) {
|
|
| 453 | + $orderby = "$wpdb->posts.comment_count ASC, "; |
|
| 454 | + $sort_by = 'comment_count_asc'; |
|
| 455 | + } |
|
| 456 | + } |
|
| 459 | 457 | |
| 460 | - if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 461 | - $keywords = explode(" ", $s);
|
|
| 462 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 463 | - foreach($keywords as $kkey=>$kword){
|
|
| 464 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 465 | - unset($keywords[$kkey]); |
|
| 466 | - } |
|
| 467 | - } |
|
| 468 | - } |
|
| 469 | - if ($sort_by == 'nearest' || $sort_by == 'farthest') {
|
|
| 470 | - if (count($keywords) > 1) {
|
|
| 471 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
| 472 | - } else {
|
|
| 473 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
| 474 | - } |
|
| 475 | - } else {
|
|
| 476 | - if (count($keywords) > 1) {
|
|
| 477 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby; |
|
| 478 | - } else {
|
|
| 479 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby; |
|
| 480 | - } |
|
| 481 | - } |
|
| 482 | - } |
|
| 458 | + global $s; |
|
| 459 | + |
|
| 460 | + if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 461 | + $keywords = explode(" ", $s);
|
|
| 462 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 463 | + foreach($keywords as $kkey=>$kword){
|
|
| 464 | + if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 465 | + unset($keywords[$kkey]); |
|
| 466 | + } |
|
| 467 | + } |
|
| 468 | + } |
|
| 469 | + if ($sort_by == 'nearest' || $sort_by == 'farthest') {
|
|
| 470 | + if (count($keywords) > 1) {
|
|
| 471 | + $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
| 472 | + } else {
|
|
| 473 | + $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
| 474 | + } |
|
| 475 | + } else {
|
|
| 476 | + if (count($keywords) > 1) {
|
|
| 477 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby; |
|
| 478 | + } else {
|
|
| 479 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby; |
|
| 480 | + } |
|
| 481 | + } |
|
| 482 | + } |
|
| 483 | 483 | |
| 484 | - /** |
|
| 485 | - * Filter order by SQL. |
|
| 486 | - * |
|
| 487 | - * @since 1.0.0 |
|
| 488 | - * @param string $orderby The orderby query string. |
|
| 489 | - * @param string $sort_by Sortby query string. |
|
| 490 | - * @param string $table Listing table name. |
|
| 491 | - */ |
|
| 492 | - $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);
|
|
| 484 | + /** |
|
| 485 | + * Filter order by SQL. |
|
| 486 | + * |
|
| 487 | + * @since 1.0.0 |
|
| 488 | + * @param string $orderby The orderby query string. |
|
| 489 | + * @param string $sort_by Sortby query string. |
|
| 490 | + * @param string $table Listing table name. |
|
| 491 | + */ |
|
| 492 | + $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);
|
|
| 493 | 493 | |
| 494 | - $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
| 494 | + $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
| 495 | 495 | |
| 496 | - return $orderby; |
|
| 496 | + return $orderby; |
|
| 497 | 497 | } |
| 498 | 498 | |
| 499 | 499 | |
@@ -511,78 +511,78 @@ discard block |
||
| 511 | 511 | function geodir_posts_order_by_custom_sort($orderby, $sort_by, $table) |
| 512 | 512 | {
|
| 513 | 513 | |
| 514 | - global $wpdb; |
|
| 514 | + global $wpdb; |
|
| 515 | 515 | |
| 516 | - if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' || $_REQUEST['s']==' ') ) )) {
|
|
| 516 | + if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' || $_REQUEST['s']==' ') ) )) {
|
|
| 517 | 517 | |
| 518 | - $sort_array = explode('_', $sort_by);
|
|
| 518 | + $sort_array = explode('_', $sort_by);
|
|
| 519 | 519 | |
| 520 | - $sort_by_count = count($sort_array); |
|
| 520 | + $sort_by_count = count($sort_array); |
|
| 521 | 521 | |
| 522 | - $order = $sort_array[$sort_by_count - 1]; |
|
| 522 | + $order = $sort_array[$sort_by_count - 1]; |
|
| 523 | 523 | |
| 524 | - if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {
|
|
| 524 | + if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {
|
|
| 525 | 525 | |
| 526 | - $sort_by = str_replace('_' . $order, '', $sort_by);
|
|
| 526 | + $sort_by = str_replace('_' . $order, '', $sort_by);
|
|
| 527 | 527 | |
| 528 | - switch ($sort_by): |
|
| 528 | + switch ($sort_by): |
|
| 529 | 529 | |
| 530 | - case 'post_date': |
|
| 531 | - case 'comment_count': |
|
| 530 | + case 'post_date': |
|
| 531 | + case 'comment_count': |
|
| 532 | 532 | |
| 533 | - $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", "; |
|
| 534 | - break; |
|
| 533 | + $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", "; |
|
| 534 | + break; |
|
| 535 | 535 | |
| 536 | - case 'distance': |
|
| 537 | - $orderby = $sort_by . " " . $order . ", "; |
|
| 538 | - break; |
|
| 536 | + case 'distance': |
|
| 537 | + $orderby = $sort_by . " " . $order . ", "; |
|
| 538 | + break; |
|
| 539 | 539 | |
| 540 | 540 | |
| 541 | - // sort by rating |
|
| 542 | - case 'overall_rating': |
|
| 541 | + // sort by rating |
|
| 542 | + case 'overall_rating': |
|
| 543 | 543 | |
| 544 | - $use_bayesian = apply_filters('gd_use_bayesian',true,$table);
|
|
| 545 | - $avg_rating = 0; |
|
| 546 | - if($use_bayesian){
|
|
| 547 | - $avg_num_votes = get_transient( 'gd_avg_num_votes_'.$table ); |
|
| 548 | - if(!$avg_num_votes){
|
|
| 549 | - $avg_num_votes = $wpdb->get_var("SELECT SUM(rating_count) FROM $table");
|
|
| 550 | - if($avg_num_votes){
|
|
| 544 | + $use_bayesian = apply_filters('gd_use_bayesian',true,$table);
|
|
| 545 | + $avg_rating = 0; |
|
| 546 | + if($use_bayesian){
|
|
| 547 | + $avg_num_votes = get_transient( 'gd_avg_num_votes_'.$table ); |
|
| 548 | + if(!$avg_num_votes){
|
|
| 549 | + $avg_num_votes = $wpdb->get_var("SELECT SUM(rating_count) FROM $table");
|
|
| 550 | + if($avg_num_votes){
|
|
| 551 | 551 | |
| 552 | - $avg_rating = get_transient( 'gd_avg_rating_'.$table ); |
|
| 553 | - if(!$avg_rating){
|
|
| 554 | - $avg_rating = $wpdb->get_var("SELECT SUM(overall_rating) FROM $table")/$avg_num_votes;
|
|
| 555 | - } |
|
| 556 | - set_transient( 'gd_avg_num_votes_'.$table, $avg_num_votes, 12 * HOUR_IN_SECONDS ); |
|
| 557 | - set_transient( 'gd_avg_rating_'.$table, $avg_rating , 12 * HOUR_IN_SECONDS ); |
|
| 558 | - } |
|
| 559 | - } |
|
| 552 | + $avg_rating = get_transient( 'gd_avg_rating_'.$table ); |
|
| 553 | + if(!$avg_rating){
|
|
| 554 | + $avg_rating = $wpdb->get_var("SELECT SUM(overall_rating) FROM $table")/$avg_num_votes;
|
|
| 555 | + } |
|
| 556 | + set_transient( 'gd_avg_num_votes_'.$table, $avg_num_votes, 12 * HOUR_IN_SECONDS ); |
|
| 557 | + set_transient( 'gd_avg_rating_'.$table, $avg_rating , 12 * HOUR_IN_SECONDS ); |
|
| 558 | + } |
|
| 559 | + } |
|
| 560 | 560 | |
| 561 | - if(!$avg_num_votes){ $avg_num_votes = 0;}
|
|
| 561 | + if(!$avg_num_votes){ $avg_num_votes = 0;}
|
|
| 562 | 562 | |
| 563 | - $orderby = " (( $avg_num_votes * $avg_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating )) / ( $avg_num_votes + " . $table . ".rating_count ) $order , ";
|
|
| 563 | + $orderby = " (( $avg_num_votes * $avg_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating )) / ( $avg_num_votes + " . $table . ".rating_count ) $order , ";
|
|
| 564 | 564 | |
| 565 | - //$orderby = " ( " . $table . ".rating_count * " . $table . ".overall_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating ) / ( " . $table . ".rating_count + " . $table . ".rating_count ) $order , "; // seems to work mostly with no extra overheads
|
|
| 566 | - }else{
|
|
| 567 | - $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
| 568 | - } |
|
| 565 | + //$orderby = " ( " . $table . ".rating_count * " . $table . ".overall_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating ) / ( " . $table . ".rating_count + " . $table . ".rating_count ) $order , "; // seems to work mostly with no extra overheads
|
|
| 566 | + }else{
|
|
| 567 | + $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
| 568 | + } |
|
| 569 | 569 | |
| 570 | - break; |
|
| 570 | + break; |
|
| 571 | 571 | |
| 572 | 572 | |
| 573 | - default: |
|
| 574 | - if (geodir_column_exist($table, $sort_by)) {
|
|
| 573 | + default: |
|
| 574 | + if (geodir_column_exist($table, $sort_by)) {
|
|
| 575 | 575 | $orderby = $table . "." . $sort_by . " " . $order . ", "; |
| 576 | 576 | } |
| 577 | - break; |
|
| 577 | + break; |
|
| 578 | 578 | |
| 579 | - endswitch; |
|
| 579 | + endswitch; |
|
| 580 | 580 | |
| 581 | - } |
|
| 581 | + } |
|
| 582 | 582 | |
| 583 | - } |
|
| 583 | + } |
|
| 584 | 584 | |
| 585 | - return $orderby; |
|
| 585 | + return $orderby; |
|
| 586 | 586 | } |
| 587 | 587 | |
| 588 | 588 | /** |
@@ -597,34 +597,34 @@ discard block |
||
| 597 | 597 | {
|
| 598 | 598 | |
| 599 | 599 | |
| 600 | - global $wpdb, $geodir_post_type, $table, $s, $snear; |
|
| 600 | + global $wpdb, $geodir_post_type, $table, $s, $snear; |
|
| 601 | 601 | |
| 602 | - if (!is_admin()) {
|
|
| 602 | + if (!is_admin()) {
|
|
| 603 | 603 | |
| 604 | - if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 605 | - add_filter('posts_where', 'geodir_edit_listing_where', 1);
|
|
| 604 | + if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 605 | + add_filter('posts_where', 'geodir_edit_listing_where', 1);
|
|
| 606 | 606 | |
| 607 | - } elseif ((is_search() && $_REQUEST['geodir_search'])) {
|
|
| 607 | + } elseif ((is_search() && $_REQUEST['geodir_search'])) {
|
|
| 608 | 608 | |
| 609 | - add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 609 | + add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 610 | 610 | |
| 611 | - if ($snear != '') |
|
| 612 | - add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 611 | + if ($snear != '') |
|
| 612 | + add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 613 | 613 | |
| 614 | - add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 614 | + add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 615 | 615 | |
| 616 | - } elseif (geodir_is_page('author')) {
|
|
| 616 | + } elseif (geodir_is_page('author')) {
|
|
| 617 | 617 | |
| 618 | - add_filter('posts_where', 'author_filter_where', 1);
|
|
| 618 | + add_filter('posts_where', 'author_filter_where', 1);
|
|
| 619 | 619 | |
| 620 | - } |
|
| 620 | + } |
|
| 621 | 621 | |
| 622 | - //if (!geodir_is_page('detail'))
|
|
| 623 | - add_filter('posts_where', 'geodir_default_where', 1);/**/
|
|
| 622 | + //if (!geodir_is_page('detail'))
|
|
| 623 | + add_filter('posts_where', 'geodir_default_where', 1);/**/
|
|
| 624 | 624 | |
| 625 | - //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
|
| 625 | + //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
|
| 626 | 626 | |
| 627 | - } |
|
| 627 | + } |
|
| 628 | 628 | } |
| 629 | 629 | |
| 630 | 630 | /** |
@@ -639,13 +639,13 @@ discard block |
||
| 639 | 639 | */ |
| 640 | 640 | function geodir_preview_post_cap($allcaps, $caps, $args) |
| 641 | 641 | {
|
| 642 | - $user_id = get_current_user_id(); |
|
| 643 | - if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {
|
|
| 642 | + $user_id = get_current_user_id(); |
|
| 643 | + if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {
|
|
| 644 | 644 | |
| 645 | - $allcaps['edit_posts'] = true; |
|
| 646 | - } |
|
| 647 | - //print_r($allcaps); |
|
| 648 | - return $allcaps; |
|
| 645 | + $allcaps['edit_posts'] = true; |
|
| 646 | + } |
|
| 647 | + //print_r($allcaps); |
|
| 648 | + return $allcaps; |
|
| 649 | 649 | } |
| 650 | 650 | |
| 651 | 651 | |
@@ -660,9 +660,9 @@ discard block |
||
| 660 | 660 | */ |
| 661 | 661 | function geodir_edit_listing_where($where) |
| 662 | 662 | {
|
| 663 | - global $wpdb; |
|
| 664 | - $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);
|
|
| 665 | - return $where; |
|
| 663 | + global $wpdb; |
|
| 664 | + $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);
|
|
| 665 | + return $where; |
|
| 666 | 666 | } |
| 667 | 667 | |
| 668 | 668 | |
@@ -679,29 +679,29 @@ discard block |
||
| 679 | 679 | */ |
| 680 | 680 | function geodir_default_where($where) |
| 681 | 681 | {
|
| 682 | - global $wp_query, $wpdb; |
|
| 683 | - |
|
| 684 | - //print_r($wp_query); |
|
| 685 | - ########### WPML ########### |
|
| 686 | - |
|
| 687 | - if (geodir_is_wpml()) {
|
|
| 688 | - global $sitepress, $table_prefix; |
|
| 689 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 690 | - $default_lang_code = $sitepress->get_default_language(); |
|
| 691 | - $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
|
| 692 | - //echo '##########'.$q_post_type; |
|
| 693 | - if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) {
|
|
| 694 | - $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";
|
|
| 695 | - //$where .= " AND icl_t.language_code = '$lang_code' "; |
|
| 696 | - } |
|
| 682 | + global $wp_query, $wpdb; |
|
| 697 | 683 | |
| 698 | - } |
|
| 699 | - ########### WPML ########### |
|
| 684 | + //print_r($wp_query); |
|
| 685 | + ########### WPML ########### |
|
| 700 | 686 | |
| 687 | + if (geodir_is_wpml()) {
|
|
| 688 | + global $sitepress, $table_prefix; |
|
| 689 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 690 | + $default_lang_code = $sitepress->get_default_language(); |
|
| 691 | + $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
|
| 692 | + //echo '##########'.$q_post_type; |
|
| 693 | + if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) {
|
|
| 694 | + $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";
|
|
| 695 | + //$where .= " AND icl_t.language_code = '$lang_code' "; |
|
| 696 | + } |
|
| 697 | + |
|
| 698 | + } |
|
| 699 | + ########### WPML ########### |
|
| 701 | 700 | |
| 702 | - return $where = str_replace("0 = 1", "1=1", $where);
|
|
| 703 | 701 | |
| 704 | - /* ====== old code start === |
|
| 702 | + return $where = str_replace("0 = 1", "1=1", $where);
|
|
| 703 | + |
|
| 704 | + /* ====== old code start === |
|
| 705 | 705 | $where = str_replace("0 = 1", "1=1", $where);
|
| 706 | 706 | $country = get_query_var('gd_country');
|
| 707 | 707 | $region = get_query_var('gd_region');
|
@@ -742,92 +742,92 @@ discard block |
||
| 742 | 742 | * @return string Modified where query string. |
| 743 | 743 | */ |
| 744 | 744 | function searching_filter_where($where) {
|
| 745 | - global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session; |
|
| 745 | + global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session; |
|
| 746 | 746 | |
| 747 | - $search_term = 'OR'; |
|
| 748 | - $search_term = 'AND'; |
|
| 749 | - $geodir_custom_search = ''; |
|
| 750 | - $category_search_range = ''; |
|
| 747 | + $search_term = 'OR'; |
|
| 748 | + $search_term = 'AND'; |
|
| 749 | + $geodir_custom_search = ''; |
|
| 750 | + $category_search_range = ''; |
|
| 751 | 751 | |
| 752 | - if (is_single() && get_query_var('post_type')) {
|
|
| 752 | + if (is_single() && get_query_var('post_type')) {
|
|
| 753 | 753 | return $where; |
| 754 | 754 | } |
| 755 | 755 | |
| 756 | - if (is_tax()) {
|
|
| 756 | + if (is_tax()) {
|
|
| 757 | 757 | return $where; |
| 758 | 758 | } |
| 759 | 759 | |
| 760 | 760 | $s = trim($s); |
| 761 | - $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
| 762 | - $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
| 763 | - |
|
| 764 | - $where = ''; |
|
| 765 | - $better_search_terms = ''; |
|
| 766 | - if (isset($_REQUEST['stype'])) |
|
| 767 | - $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
| 768 | - else |
|
| 769 | - $post_types = 'gd_place'; |
|
| 770 | - |
|
| 771 | - if ($s != '') {
|
|
| 772 | - $keywords = explode(" ", $s);
|
|
| 773 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 774 | - foreach($keywords as $kkey=>$kword){
|
|
| 775 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 776 | - unset($keywords[$kkey]); |
|
| 777 | - } |
|
| 778 | - } |
|
| 779 | - } |
|
| 761 | + $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
| 762 | + $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
| 780 | 763 | |
| 781 | - if (!empty($keywords)) {
|
|
| 782 | - foreach ($keywords as $keyword) {
|
|
| 783 | - $keyword = trim($keyword); |
|
| 784 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 785 | - if ($keyword != '') {
|
|
| 786 | - /** |
|
| 787 | - * Filter the search query keywords SQL. |
|
| 788 | - * |
|
| 789 | - * @since 1.5.9 |
|
| 790 | - * @package GeoDirectory |
|
| 791 | - * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`. |
|
| 792 | - * @param array $keywords The array of keywords for the query. |
|
| 793 | - * @param string $keyword The single keyword being searched. |
|
| 794 | - */ |
|
| 764 | + $where = ''; |
|
| 765 | + $better_search_terms = ''; |
|
| 766 | + if (isset($_REQUEST['stype'])) |
|
| 767 | + $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
| 768 | + else |
|
| 769 | + $post_types = 'gd_place'; |
|
| 770 | + |
|
| 771 | + if ($s != '') {
|
|
| 772 | + $keywords = explode(" ", $s);
|
|
| 773 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 774 | + foreach($keywords as $kkey=>$kword){
|
|
| 775 | + if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 776 | + unset($keywords[$kkey]); |
|
| 777 | + } |
|
| 778 | + } |
|
| 779 | + } |
|
| 780 | + |
|
| 781 | + if (!empty($keywords)) {
|
|
| 782 | + foreach ($keywords as $keyword) {
|
|
| 783 | + $keyword = trim($keyword); |
|
| 784 | + $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 785 | + if ($keyword != '') {
|
|
| 786 | + /** |
|
| 787 | + * Filter the search query keywords SQL. |
|
| 788 | + * |
|
| 789 | + * @since 1.5.9 |
|
| 790 | + * @package GeoDirectory |
|
| 791 | + * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`. |
|
| 792 | + * @param array $keywords The array of keywords for the query. |
|
| 793 | + * @param string $keyword The single keyword being searched. |
|
| 794 | + */ |
|
| 795 | 795 | $better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword);
|
| 796 | - } |
|
| 797 | - } |
|
| 798 | - } |
|
| 799 | - } |
|
| 796 | + } |
|
| 797 | + } |
|
| 798 | + } |
|
| 799 | + } |
|
| 800 | 800 | |
| 801 | - /* get taxonomy */ |
|
| 802 | - $taxonomies = geodir_get_taxonomies($post_types, true); |
|
| 803 | - if($taxonomies) {
|
|
| 804 | - $taxonomies = implode("','", $taxonomies);
|
|
| 805 | - $taxonomies = "'" . $taxonomies . "'"; |
|
| 806 | - }else{$taxonomies='';}
|
|
| 801 | + /* get taxonomy */ |
|
| 802 | + $taxonomies = geodir_get_taxonomies($post_types, true); |
|
| 803 | + if($taxonomies) {
|
|
| 804 | + $taxonomies = implode("','", $taxonomies);
|
|
| 805 | + $taxonomies = "'" . $taxonomies . "'"; |
|
| 806 | + }else{$taxonomies='';}
|
|
| 807 | 807 | |
| 808 | - $content_where = $terms_where = ''; |
|
| 808 | + $content_where = $terms_where = ''; |
|
| 809 | 809 | if ($s != '') {
|
| 810 | - /** |
|
| 811 | - * Filter the search query content where values. |
|
| 812 | - * |
|
| 813 | - * @since 1.5.0 |
|
| 814 | - * @package GeoDirectory |
|
| 815 | - * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`. |
|
| 816 | - */ |
|
| 810 | + /** |
|
| 811 | + * Filter the search query content where values. |
|
| 812 | + * |
|
| 813 | + * @since 1.5.0 |
|
| 814 | + * @package GeoDirectory |
|
| 815 | + * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`. |
|
| 816 | + */ |
|
| 817 | 817 | $content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");
|
| 818 | - /** |
|
| 819 | - * Filter the search query term values. |
|
| 820 | - * |
|
| 821 | - * @since 1.5.0 |
|
| 822 | - * @package GeoDirectory |
|
| 823 | - * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`. |
|
| 824 | - */ |
|
| 825 | - $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");
|
|
| 818 | + /** |
|
| 819 | + * Filter the search query term values. |
|
| 820 | + * |
|
| 821 | + * @since 1.5.0 |
|
| 822 | + * @package GeoDirectory |
|
| 823 | + * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`. |
|
| 824 | + */ |
|
| 825 | + $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");
|
|
| 826 | 826 | } |
| 827 | 827 | |
| 828 | 828 | |
| 829 | - // get term sql |
|
| 830 | - $term_sql = "SELECT $wpdb->term_taxonomy.term_id, $wpdb->terms.name, $wpdb->term_taxonomy.taxonomy |
|
| 829 | + // get term sql |
|
| 830 | + $term_sql = "SELECT $wpdb->term_taxonomy.term_id, $wpdb->terms.name, $wpdb->term_taxonomy.taxonomy |
|
| 831 | 831 | FROM $wpdb->term_taxonomy, $wpdb->terms, $wpdb->term_relationships |
| 832 | 832 | WHERE $wpdb->term_taxonomy.term_id = $wpdb->terms.term_id |
| 833 | 833 | AND $wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id |
@@ -835,45 +835,45 @@ discard block |
||
| 835 | 835 | $terms_where |
| 836 | 836 | GROUP BY $wpdb->term_taxonomy.term_id"; |
| 837 | 837 | |
| 838 | - $term_results = $wpdb->get_results($term_sql); |
|
| 839 | - $term_ids = array(); |
|
| 840 | - $terms_sql = ''; |
|
| 841 | - |
|
| 842 | - if(!empty($term_results)){
|
|
| 843 | - foreach($term_results as $term_id){
|
|
| 844 | - $term_ids[] = $term_id; |
|
| 845 | - } |
|
| 846 | - if (!empty($term_ids)) {
|
|
| 847 | - foreach($term_ids as $term){
|
|
| 848 | - if ($term->taxonomy == $post_types.'_tags') {
|
|
| 849 | - $terms_sql .= $wpdb->prepare(" OR FIND_IN_SET(%s , " . $table . ".post_tags) ", $term->name);
|
|
| 850 | - } else {
|
|
| 851 | - $terms_sql .= " OR FIND_IN_SET($term->term_id , " . $table . "." . $post_types . "category) "; |
|
| 852 | - } |
|
| 853 | - } |
|
| 854 | - } |
|
| 855 | - } |
|
| 838 | + $term_results = $wpdb->get_results($term_sql); |
|
| 839 | + $term_ids = array(); |
|
| 840 | + $terms_sql = ''; |
|
| 841 | + |
|
| 842 | + if(!empty($term_results)){
|
|
| 843 | + foreach($term_results as $term_id){
|
|
| 844 | + $term_ids[] = $term_id; |
|
| 845 | + } |
|
| 846 | + if (!empty($term_ids)) {
|
|
| 847 | + foreach($term_ids as $term){
|
|
| 848 | + if ($term->taxonomy == $post_types.'_tags') {
|
|
| 849 | + $terms_sql .= $wpdb->prepare(" OR FIND_IN_SET(%s , " . $table . ".post_tags) ", $term->name);
|
|
| 850 | + } else {
|
|
| 851 | + $terms_sql .= " OR FIND_IN_SET($term->term_id , " . $table . "." . $post_types . "category) "; |
|
| 852 | + } |
|
| 853 | + } |
|
| 854 | + } |
|
| 855 | + } |
|
| 856 | 856 | |
| 857 | 857 | |
| 858 | - if ($snear != '') {
|
|
| 858 | + if ($snear != '') {
|
|
| 859 | 859 | |
| 860 | 860 | |
| 861 | - if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {
|
|
| 862 | - $dist = $gd_session->get('near_me_range');
|
|
| 863 | - } |
|
| 864 | - $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 865 | - $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 866 | - $lat1 = $mylat - ($dist / 69); |
|
| 867 | - $lat2 = $mylat + ($dist / 69); |
|
| 861 | + if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {
|
|
| 862 | + $dist = $gd_session->get('near_me_range');
|
|
| 863 | + } |
|
| 864 | + $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 865 | + $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 866 | + $lat1 = $mylat - ($dist / 69); |
|
| 867 | + $lat2 = $mylat + ($dist / 69); |
|
| 868 | 868 | |
| 869 | - $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : ''; |
|
| 870 | - $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : ''; |
|
| 871 | - $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : ''; |
|
| 872 | - $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : ''; |
|
| 869 | + $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : ''; |
|
| 870 | + $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : ''; |
|
| 871 | + $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : ''; |
|
| 872 | + $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : ''; |
|
| 873 | 873 | |
| 874 | 874 | |
| 875 | 875 | |
| 876 | - $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 876 | + $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 877 | 877 | $content_where |
| 878 | 878 | $terms_sql |
| 879 | 879 | ) |
@@ -882,35 +882,35 @@ discard block |
||
| 882 | 882 | AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 ) |
| 883 | 883 | AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) "; |
| 884 | 884 | |
| 885 | - if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
|
| 886 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 887 | - $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;
|
|
| 888 | - } |
|
| 885 | + if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
|
| 886 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 887 | + $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;
|
|
| 888 | + } |
|
| 889 | 889 | |
| 890 | - } else {
|
|
| 890 | + } else {
|
|
| 891 | 891 | |
| 892 | 892 | |
| 893 | 893 | |
| 894 | - $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 894 | + $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 895 | 895 | $content_where |
| 896 | 896 | $terms_sql |
| 897 | 897 | ) |
| 898 | 898 | |
| 899 | 899 | AND $wpdb->posts.post_type in ('$post_types')
|
| 900 | 900 | AND ($wpdb->posts.post_status = 'publish') "; |
| 901 | - } |
|
| 901 | + } |
|
| 902 | 902 | |
| 903 | 903 | ########### WPML ########### |
| 904 | - if ( geodir_wpml_is_post_type_translated( $post_types ) ) {
|
|
| 904 | + if ( geodir_wpml_is_post_type_translated( $post_types ) ) {
|
|
| 905 | 905 | $lang_code = ICL_LANGUAGE_CODE; |
| 906 | 906 | |
| 907 | 907 | if ($lang_code && $post_types) {
|
| 908 | - $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 909 | - } |
|
| 910 | - } |
|
| 911 | - ########### WPML ########### |
|
| 908 | + $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 909 | + } |
|
| 910 | + } |
|
| 911 | + ########### WPML ########### |
|
| 912 | 912 | |
| 913 | - return $where; |
|
| 913 | + return $where; |
|
| 914 | 914 | } |
| 915 | 915 | |
| 916 | 916 | |
@@ -925,45 +925,45 @@ discard block |
||
| 925 | 925 | * @return string Modified where query string. |
| 926 | 926 | */ |
| 927 | 927 | function author_filter_where($where) {
|
| 928 | - global $wpdb, $geodir_post_type, $table, $curr; |
|
| 928 | + global $wpdb, $geodir_post_type, $table, $curr; |
|
| 929 | 929 | |
| 930 | - $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 931 | - $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 930 | + $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 931 | + $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 932 | 932 | |
| 933 | - if (isset($_REQUEST['stype'])) {
|
|
| 934 | - $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 935 | - } else {
|
|
| 936 | - $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
|
| 937 | - } |
|
| 933 | + if (isset($_REQUEST['stype'])) {
|
|
| 934 | + $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 935 | + } else {
|
|
| 936 | + $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
|
| 937 | + } |
|
| 938 | 938 | |
| 939 | - if ($user_id > 0) {
|
|
| 940 | - if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 941 | - $user_fav_posts = geodir_get_user_favourites($user_id); |
|
| 942 | - $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';
|
|
| 943 | - $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";
|
|
| 944 | - } else |
|
| 945 | - $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
| 946 | - |
|
| 947 | - if ($user_id == (int)get_current_user_id()) {
|
|
| 948 | - $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
|
| 949 | - } else {
|
|
| 950 | - $where .= " AND $wpdb->posts.post_status = 'publish' "; |
|
| 951 | - } |
|
| 952 | - } else {
|
|
| 953 | - $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' "; |
|
| 954 | - } |
|
| 939 | + if ($user_id > 0) {
|
|
| 940 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 941 | + $user_fav_posts = geodir_get_user_favourites($user_id); |
|
| 942 | + $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';
|
|
| 943 | + $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";
|
|
| 944 | + } else |
|
| 945 | + $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
| 946 | + |
|
| 947 | + if ($user_id == (int)get_current_user_id()) {
|
|
| 948 | + $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
|
| 949 | + } else {
|
|
| 950 | + $where .= " AND $wpdb->posts.post_status = 'publish' "; |
|
| 951 | + } |
|
| 952 | + } else {
|
|
| 953 | + $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' "; |
|
| 954 | + } |
|
| 955 | 955 | |
| 956 | - ########### WPML ########### |
|
| 957 | - if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) {
|
|
| 958 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 959 | - if ($lang_code) {
|
|
| 960 | - $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 961 | - } |
|
| 956 | + ########### WPML ########### |
|
| 957 | + if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) {
|
|
| 958 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 959 | + if ($lang_code) {
|
|
| 960 | + $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 961 | + } |
|
| 962 | 962 | |
| 963 | - } |
|
| 964 | - ########### WPML ########### |
|
| 963 | + } |
|
| 964 | + ########### WPML ########### |
|
| 965 | 965 | |
| 966 | - return $where; |
|
| 966 | + return $where; |
|
| 967 | 967 | } |
| 968 | 968 | |
| 969 | 969 | /** |
@@ -978,11 +978,11 @@ discard block |
||
| 978 | 978 | */ |
| 979 | 979 | function geodir_filter_widget_join($join) |
| 980 | 980 | {
|
| 981 | - global $wp_query, $table; |
|
| 982 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 983 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 984 | - } |
|
| 985 | - return $join; |
|
| 981 | + global $wp_query, $table; |
|
| 982 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 983 | + $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 984 | + } |
|
| 985 | + return $join; |
|
| 986 | 986 | } |
| 987 | 987 | |
| 988 | 988 | /** |
@@ -997,43 +997,43 @@ discard block |
||
| 997 | 997 | */ |
| 998 | 998 | function geodir_filter_widget_where($where) |
| 999 | 999 | {
|
| 1000 | - global $wp_query, $table; |
|
| 1001 | - if (!empty($wp_query->query['show_featured_only'])) {
|
|
| 1002 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 1003 | - } |
|
| 1004 | - if (!empty($wp_query->query['show_special_only'])) {
|
|
| 1005 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 1006 | - } |
|
| 1007 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 1008 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 1009 | - } |
|
| 1010 | - if (!empty($wp_query->query['with_videos_only'])) {
|
|
| 1011 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 1012 | - } |
|
| 1013 | - return $where; |
|
| 1000 | + global $wp_query, $table; |
|
| 1001 | + if (!empty($wp_query->query['show_featured_only'])) {
|
|
| 1002 | + $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 1003 | + } |
|
| 1004 | + if (!empty($wp_query->query['show_special_only'])) {
|
|
| 1005 | + $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 1006 | + } |
|
| 1007 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 1008 | + $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 1009 | + } |
|
| 1010 | + if (!empty($wp_query->query['with_videos_only'])) {
|
|
| 1011 | + $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 1012 | + } |
|
| 1013 | + return $where; |
|
| 1014 | 1014 | } |
| 1015 | 1015 | |
| 1016 | 1016 | |
| 1017 | 1017 | function geodir_related_posts_fields($fields) {
|
| 1018 | - global $wp_query, $wpdb, $table, $post; |
|
| 1018 | + global $wp_query, $wpdb, $table, $post; |
|
| 1019 | 1019 | |
| 1020 | - $fields .= ", " . $table . ".* "; |
|
| 1020 | + $fields .= ", " . $table . ".* "; |
|
| 1021 | 1021 | |
| 1022 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 1022 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 1023 | 1023 | |
| 1024 | - $mylat = $post->post_latitude; |
|
| 1025 | - $mylon = $post->post_longitude; |
|
| 1024 | + $mylat = $post->post_latitude; |
|
| 1025 | + $mylon = $post->post_longitude; |
|
| 1026 | 1026 | |
| 1027 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 1028 | - return $fields; |
|
| 1027 | + $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 1028 | + return $fields; |
|
| 1029 | 1029 | } |
| 1030 | 1030 | function geodir_related_posts_fields_filter($query) {
|
| 1031 | - if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 1032 | - && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
|
| 1033 | - && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
|
| 1034 | - ) {
|
|
| 1035 | - add_filter('posts_fields', 'geodir_related_posts_fields', 1);
|
|
| 1036 | - } |
|
| 1031 | + if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 1032 | + && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
|
| 1033 | + && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
|
| 1034 | + ) {
|
|
| 1035 | + add_filter('posts_fields', 'geodir_related_posts_fields', 1);
|
|
| 1036 | + } |
|
| 1037 | 1037 | } |
| 1038 | 1038 | add_action('pre_get_posts', 'geodir_related_posts_fields_filter', 1);
|
| 1039 | 1039 | |
@@ -1048,30 +1048,30 @@ discard block |
||
| 1048 | 1048 | * @return string|null If field exists in table returns order by clause else returns empty. |
| 1049 | 1049 | */ |
| 1050 | 1050 | function geodir_prepare_custom_sorting( $sorting, $table ) {
|
| 1051 | - $orderby = ''; |
|
| 1051 | + $orderby = ''; |
|
| 1052 | 1052 | |
| 1053 | - if ( empty( $sorting ) || empty( $table ) ) {
|
|
| 1054 | - return $orderby; |
|
| 1055 | - } |
|
| 1053 | + if ( empty( $sorting ) || empty( $table ) ) {
|
|
| 1054 | + return $orderby; |
|
| 1055 | + } |
|
| 1056 | 1056 | |
| 1057 | - if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {
|
|
| 1058 | - $sorting_array = explode( '_', $sorting ); |
|
| 1057 | + if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {
|
|
| 1058 | + $sorting_array = explode( '_', $sorting ); |
|
| 1059 | 1059 | |
| 1060 | - if ( ( $count = count( $sorting_array ) ) > 1 ) {
|
|
| 1061 | - $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
| 1062 | - array_pop( $sorting_array ); |
|
| 1060 | + if ( ( $count = count( $sorting_array ) ) > 1 ) {
|
|
| 1061 | + $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
| 1062 | + array_pop( $sorting_array ); |
|
| 1063 | 1063 | |
| 1064 | - if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {
|
|
| 1065 | - $sort_by = implode( '_', $sorting_array ); |
|
| 1064 | + if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {
|
|
| 1065 | + $sort_by = implode( '_', $sorting_array ); |
|
| 1066 | 1066 | |
| 1067 | - if ( geodir_column_exist( $table, $sort_by ) ) {
|
|
| 1068 | - $orderby = $table . "." . $sort_by . " " . $order; |
|
| 1069 | - } |
|
| 1070 | - } |
|
| 1071 | - } |
|
| 1072 | - } |
|
| 1067 | + if ( geodir_column_exist( $table, $sort_by ) ) {
|
|
| 1068 | + $orderby = $table . "." . $sort_by . " " . $order; |
|
| 1069 | + } |
|
| 1070 | + } |
|
| 1071 | + } |
|
| 1072 | + } |
|
| 1073 | 1073 | |
| 1074 | - return $orderby; |
|
| 1074 | + return $orderby; |
|
| 1075 | 1075 | } |
| 1076 | 1076 | |
| 1077 | 1077 | /** |
@@ -1091,21 +1091,21 @@ discard block |
||
| 1091 | 1091 | * @return string Modified fields SQL. |
| 1092 | 1092 | */ |
| 1093 | 1093 | function geodir_search_widget_location_filter_fields( $fields, $table, $post_type ) {
|
| 1094 | - global $wpdb, $gd_query_args_widgets, $snear, $gd_session; |
|
| 1094 | + global $wpdb, $gd_query_args_widgets, $snear, $gd_session; |
|
| 1095 | 1095 | |
| 1096 | - if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1097 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1096 | + if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1097 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1098 | 1098 | |
| 1099 | - if ( $location_allowed && strpos( strtolower( $fields ), ' as distance ' ) === false && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1100 | - $latitude = sanitize_text_field( $_REQUEST['sgeo_lat'] ); |
|
| 1101 | - $longitude = sanitize_text_field( $_REQUEST['sgeo_lon'] ); |
|
| 1102 | - $radius = geodir_getDistanceRadius( get_option( 'geodir_search_dist_1' ) ); |
|
| 1099 | + if ( $location_allowed && strpos( strtolower( $fields ), ' as distance ' ) === false && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1100 | + $latitude = sanitize_text_field( $_REQUEST['sgeo_lat'] ); |
|
| 1101 | + $longitude = sanitize_text_field( $_REQUEST['sgeo_lon'] ); |
|
| 1102 | + $radius = geodir_getDistanceRadius( get_option( 'geodir_search_dist_1' ) ); |
|
| 1103 | 1103 | |
| 1104 | - $fields .= $wpdb->prepare( ", (" . $radius . " * 2 * ASIN(SQRT(POWER(SIN((ABS(%s) - ABS(" . $table . ".post_latitude)) * PI() / 180 / 2), 2) + COS(ABS(%s) * PI() / 180) * COS(ABS(" . $table . ".post_latitude) * PI() / 180) * POWER(SIN((%s - " . $table . ".post_longitude) * PI() / 180 / 2), 2)))) AS distance ", $latitude, $latitude, $longitude );
|
|
| 1105 | - } |
|
| 1106 | - } |
|
| 1104 | + $fields .= $wpdb->prepare( ", (" . $radius . " * 2 * ASIN(SQRT(POWER(SIN((ABS(%s) - ABS(" . $table . ".post_latitude)) * PI() / 180 / 2), 2) + COS(ABS(%s) * PI() / 180) * COS(ABS(" . $table . ".post_latitude) * PI() / 180) * POWER(SIN((%s - " . $table . ".post_longitude) * PI() / 180 / 2), 2)))) AS distance ", $latitude, $latitude, $longitude );
|
|
| 1105 | + } |
|
| 1106 | + } |
|
| 1107 | 1107 | |
| 1108 | - return $fields; |
|
| 1108 | + return $fields; |
|
| 1109 | 1109 | } |
| 1110 | 1110 | |
| 1111 | 1111 | /** |
@@ -1124,17 +1124,17 @@ discard block |
||
| 1124 | 1124 | * @return string Modified fields SQL. |
| 1125 | 1125 | */ |
| 1126 | 1126 | function geodir_search_widget_location_filter_orderby( $orderby, $table, $post_type ) {
|
| 1127 | - global $gd_query_args_widgets, $snear, $gd_session; |
|
| 1127 | + global $gd_query_args_widgets, $snear, $gd_session; |
|
| 1128 | 1128 | |
| 1129 | - if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1130 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1129 | + if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1130 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1131 | 1131 | |
| 1132 | - if ( $location_allowed && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1133 | - $orderby = "distance ASC, " . $orderby; |
|
| 1134 | - } |
|
| 1135 | - } |
|
| 1132 | + if ( $location_allowed && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1133 | + $orderby = "distance ASC, " . $orderby; |
|
| 1134 | + } |
|
| 1135 | + } |
|
| 1136 | 1136 | |
| 1137 | - return $orderby; |
|
| 1137 | + return $orderby; |
|
| 1138 | 1138 | } |
| 1139 | 1139 | |
| 1140 | 1140 | /** |
@@ -1145,21 +1145,21 @@ discard block |
||
| 1145 | 1145 | * @return string Filtered url. |
| 1146 | 1146 | */ |
| 1147 | 1147 | function geodir_search_page_base_url() {
|
| 1148 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 1149 | - remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
| 1150 | - } |
|
| 1148 | + if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 1149 | + remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
| 1150 | + } |
|
| 1151 | 1151 | |
| 1152 | - if ( defined( 'DOING_AJAX' ) && DOING_AJAX && geodir_is_wpml() ) {
|
|
| 1153 | - $url = icl_get_home_url(); |
|
| 1154 | - } else {
|
|
| 1155 | - $url = get_home_url(); |
|
| 1156 | - } |
|
| 1152 | + if ( defined( 'DOING_AJAX' ) && DOING_AJAX && geodir_is_wpml() ) {
|
|
| 1153 | + $url = icl_get_home_url(); |
|
| 1154 | + } else {
|
|
| 1155 | + $url = get_home_url(); |
|
| 1156 | + } |
|
| 1157 | 1157 | |
| 1158 | - $url = trailingslashit( $url ); |
|
| 1158 | + $url = trailingslashit( $url ); |
|
| 1159 | 1159 | |
| 1160 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 1161 | - add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
| 1162 | - } |
|
| 1160 | + if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 1161 | + add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
| 1162 | + } |
|
| 1163 | 1163 | |
| 1164 | - return apply_filters( 'geodir_search_page_base_url', $url ); |
|
| 1164 | + return apply_filters( 'geodir_search_page_base_url', $url ); |
|
| 1165 | 1165 | } |
| 1166 | 1166 | \ No newline at end of file |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | * @global string $s_A Extra parameters. |
| 66 | 66 | * @global string $s_SA Extra parameters. |
| 67 | 67 | */ |
| 68 | -function set_listing_request($query ) |
|
| 68 | +function set_listing_request($query) |
|
| 69 | 69 | {
|
| 70 | 70 | global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA; |
| 71 | 71 | |
@@ -99,15 +99,15 @@ discard block |
||
| 99 | 99 | } // Distance |
| 100 | 100 | |
| 101 | 101 | if (isset($_REQUEST['sgeo_lat'])) {
|
| 102 | - $mylat = (float)esc_attr($_REQUEST['sgeo_lat']); |
|
| 102 | + $mylat = (float) esc_attr($_REQUEST['sgeo_lat']); |
|
| 103 | 103 | } else {
|
| 104 | - $mylat = (float)geodir_get_current_city_lat(); |
|
| 104 | + $mylat = (float) geodir_get_current_city_lat(); |
|
| 105 | 105 | } // Latitude |
| 106 | 106 | |
| 107 | 107 | if (isset($_REQUEST['sgeo_lon'])) {
|
| 108 | - $mylon = (float)esc_attr($_REQUEST['sgeo_lon']); |
|
| 108 | + $mylon = (float) esc_attr($_REQUEST['sgeo_lon']); |
|
| 109 | 109 | } else {
|
| 110 | - $mylon = (float)geodir_get_current_city_lng(); |
|
| 110 | + $mylon = (float) geodir_get_current_city_lng(); |
|
| 111 | 111 | } // Distance |
| 112 | 112 | |
| 113 | 113 | if (isset($_REQUEST['snear'])) {
|
@@ -116,12 +116,12 @@ discard block |
||
| 116 | 116 | |
| 117 | 117 | if (isset($_REQUEST['s'])) {
|
| 118 | 118 | $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s']))); |
| 119 | - $s = str_replace(array("%E2%80%99","’"),array("%27","'"),$s);
|
|
| 119 | + $s = str_replace(array("%E2%80%99", "’"), array("%27", "'"), $s);
|
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | if ($snear == 'NEAR ME') {
|
| 123 | 123 | $ip = $_SERVER['REMOTE_ADDR']; |
| 124 | - $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));
|
|
| 124 | + $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip='.$ip));
|
|
| 125 | 125 | $mylat = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_latitude])); |
| 126 | 126 | $mylon = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_longitude])); |
| 127 | 127 | } |
@@ -131,9 +131,9 @@ discard block |
||
| 131 | 131 | $s_AA = str_replace(" ", "", $s);
|
| 132 | 132 | $s_A = explode(",", $s_AA);
|
| 133 | 133 | $s_A = implode('","', $s_A);
|
| 134 | - $s_A = '"' . $s_A . '"'; |
|
| 134 | + $s_A = '"'.$s_A.'"'; |
|
| 135 | 135 | } else {
|
| 136 | - $s_A = '"' . $s . '"'; |
|
| 136 | + $s_A = '"'.$s.'"'; |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | if (strstr($s, ' ')) {
|
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | } |
| 195 | 195 | if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
|
| 196 | 196 | |
| 197 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 197 | + $table = $plugin_prefix.$geodir_post_type.'_detail'; |
|
| 198 | 198 | |
| 199 | 199 | add_filter('posts_fields', 'geodir_posts_fields', 1);
|
| 200 | 200 | add_filter('posts_join', 'geodir_posts_join', 1);
|
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session; |
| 235 | 235 | |
| 236 | 236 | // Filter-Location-Manager to add location table. |
| 237 | - $fields .= ", " . $table . ".* "; |
|
| 237 | + $fields .= ", ".$table.".* "; |
|
| 238 | 238 | |
| 239 | 239 | if ($snear != '' || $gd_session->get('all_near_me')) {
|
| 240 | 240 | $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
@@ -244,16 +244,16 @@ discard block |
||
| 244 | 244 | $mylon = $gd_session->get('user_lon');
|
| 245 | 245 | } |
| 246 | 246 | |
| 247 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 247 | + $fields .= " , (".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 248 | 248 | } |
| 249 | 249 | |
| 250 | 250 | global $s; |
| 251 | 251 | if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
| 252 | 252 | $keywords = explode(" ", $s);
|
| 253 | 253 | |
| 254 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 255 | - foreach($keywords as $kkey=>$kword){
|
|
| 256 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 254 | + if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {
|
|
| 255 | + foreach ($keywords as $kkey=>$kword) {
|
|
| 256 | + if (geodir_utf8_strlen($kword) <= $klimit) {
|
|
| 257 | 257 | unset($keywords[$kkey]); |
| 258 | 258 | } |
| 259 | 259 | } |
@@ -271,24 +271,24 @@ discard block |
||
| 271 | 271 | $count = 0; |
| 272 | 272 | foreach ($keywords as $keyword) {
|
| 273 | 273 | $keyword = trim($keyword); |
| 274 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 274 | + $keyword = wp_specialchars_decode($keyword, ENT_QUOTES); |
|
| 275 | 275 | $count++; |
| 276 | 276 | if ($count < count($keywords)) {
|
| 277 | 277 | // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " "; |
| 278 | - $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " "; |
|
| 278 | + $gd_titlematch_part .= "( ".$wpdb->posts.".post_title LIKE '".$keyword."' OR ".$wpdb->posts.".post_title LIKE '".$keyword."%%' OR ".$wpdb->posts.".post_title LIKE '%% ".$keyword."%%' ) ".$key." "; |
|
| 279 | 279 | } else {
|
| 280 | 280 | //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' "; |
| 281 | - $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) "; |
|
| 281 | + $gd_titlematch_part .= "( ".$wpdb->posts.".post_title LIKE '".$keyword."' OR ".$wpdb->posts.".post_title LIKE '".$keyword."%%' OR ".$wpdb->posts.".post_title LIKE '%% ".$keyword."%%' ) "; |
|
| 282 | 282 | } |
| 283 | 283 | } |
| 284 | - $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ","; |
|
| 284 | + $gd_titlematch_part .= "THEN 1 ELSE 0 END AS ".$part.","; |
|
| 285 | 285 | } |
| 286 | 286 | } else {
|
| 287 | 287 | $gd_titlematch_part = ""; |
| 288 | 288 | } |
| 289 | - $s = stripslashes_deep( $s ); |
|
| 290 | - $s = wp_specialchars_decode($s,ENT_QUOTES); |
|
| 291 | - $fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));
|
|
| 289 | + $s = stripslashes_deep($s); |
|
| 290 | + $s = wp_specialchars_decode($s, ENT_QUOTES); |
|
| 291 | + $fields .= $wpdb->prepare(", CASE WHEN ".$table.".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN ".$wpdb->posts.".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle,".$gd_titlematch_part." CASE WHEN ( ".$wpdb->posts.".post_title LIKE %s OR ".$wpdb->posts.".post_title LIKE %s OR ".$wpdb->posts.".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s.'%', '% '.$s.'%', $s, $s.' %', '% '.$s.' %', '% '.$s));
|
|
| 292 | 292 | } |
| 293 | 293 | |
| 294 | 294 | return $fields; |
@@ -312,18 +312,18 @@ discard block |
||
| 312 | 312 | |
| 313 | 313 | ########### WPML ########### |
| 314 | 314 | |
| 315 | - if ( geodir_wpml_is_post_type_translated( $geodir_post_type ) ) {
|
|
| 315 | + if (geodir_wpml_is_post_type_translated($geodir_post_type)) {
|
|
| 316 | 316 | global $sitepress; |
| 317 | 317 | $lang_code = ICL_LANGUAGE_CODE; |
| 318 | 318 | $default_lang_code = $sitepress->get_default_language(); |
| 319 | 319 | if ($lang_code) {
|
| 320 | - $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 320 | + $join .= "JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID"; |
|
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | } |
| 324 | 324 | ########### WPML ########### |
| 325 | 325 | |
| 326 | - $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID) ";
|
|
| 326 | + $join .= " INNER JOIN ".$table." ON (".$table.".post_id = $wpdb->posts.ID) ";
|
|
| 327 | 327 | //===old code start |
| 328 | 328 | //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id) " ;//===old code end
|
| 329 | 329 | |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | $sort_by = 'az'; |
| 393 | 393 | } |
| 394 | 394 | |
| 395 | - if ($snear != '' && $sort_by!='farthest') {
|
|
| 395 | + if ($snear != '' && $sort_by != 'farthest') {
|
|
| 396 | 396 | $sort_by = 'nearest'; |
| 397 | 397 | } |
| 398 | 398 | } |
@@ -406,20 +406,20 @@ discard block |
||
| 406 | 406 | break; |
| 407 | 407 | case 'low_review': |
| 408 | 408 | case 'rating_count_asc': |
| 409 | - $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, "; |
|
| 409 | + $orderby = $table.".rating_count ASC, ".$table.".overall_rating ASC, "; |
|
| 410 | 410 | break; |
| 411 | 411 | case 'high_review': |
| 412 | 412 | case 'rating_count_desc': |
| 413 | - $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
| 413 | + $orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, "; |
|
| 414 | 414 | break; |
| 415 | 415 | case 'low_rating': |
| 416 | - $orderby = "( " . $table . ".overall_rating ) ASC, " . $table . ".rating_count ASC, "; |
|
| 416 | + $orderby = "( ".$table.".overall_rating ) ASC, ".$table.".rating_count ASC, "; |
|
| 417 | 417 | break; |
| 418 | 418 | case 'high_rating': |
| 419 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 419 | + $orderby = " ".$table.".overall_rating DESC, ".$table.".rating_count DESC, "; |
|
| 420 | 420 | break; |
| 421 | 421 | case 'featured': |
| 422 | - $orderby = $table . ".is_featured asc, "; |
|
| 422 | + $orderby = $table.".is_featured asc, "; |
|
| 423 | 423 | break; |
| 424 | 424 | case 'nearest': |
| 425 | 425 | $orderby = " distance asc, "; |
@@ -435,10 +435,10 @@ discard block |
||
| 435 | 435 | break; |
| 436 | 436 | // sort by rating |
| 437 | 437 | case 'overall_rating_desc': |
| 438 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 438 | + $orderby = " ".$table.".overall_rating DESC, ".$table.".rating_count DESC, "; |
|
| 439 | 439 | break; |
| 440 | 440 | case 'overall_rating_asc': |
| 441 | - $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, "; |
|
| 441 | + $orderby = " ".$table.".overall_rating ASC, ".$table.".rating_count ASC, "; |
|
| 442 | 442 | break; |
| 443 | 443 | default: |
| 444 | 444 | |
@@ -459,24 +459,24 @@ discard block |
||
| 459 | 459 | |
| 460 | 460 | if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
| 461 | 461 | $keywords = explode(" ", $s);
|
| 462 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 463 | - foreach($keywords as $kkey=>$kword){
|
|
| 464 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 462 | + if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {
|
|
| 463 | + foreach ($keywords as $kkey=>$kword) {
|
|
| 464 | + if (geodir_utf8_strlen($kword) <= $klimit) {
|
|
| 465 | 465 | unset($keywords[$kkey]); |
| 466 | 466 | } |
| 467 | 467 | } |
| 468 | 468 | } |
| 469 | 469 | if ($sort_by == 'nearest' || $sort_by == 'farthest') {
|
| 470 | 470 | if (count($keywords) > 1) {
|
| 471 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
| 471 | + $orderby = $orderby." ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
| 472 | 472 | } else {
|
| 473 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
| 473 | + $orderby = $orderby." ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
| 474 | 474 | } |
| 475 | 475 | } else {
|
| 476 | 476 | if (count($keywords) > 1) {
|
| 477 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby; |
|
| 477 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ".$orderby; |
|
| 478 | 478 | } else {
|
| 479 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby; |
|
| 479 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ".$orderby; |
|
| 480 | 480 | } |
| 481 | 481 | } |
| 482 | 482 | } |
@@ -491,7 +491,7 @@ discard block |
||
| 491 | 491 | */ |
| 492 | 492 | $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);
|
| 493 | 493 | |
| 494 | - $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
| 494 | + $orderby .= $table.".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
| 495 | 495 | |
| 496 | 496 | return $orderby; |
| 497 | 497 | } |
@@ -513,7 +513,7 @@ discard block |
||
| 513 | 513 | |
| 514 | 514 | global $wpdb; |
| 515 | 515 | |
| 516 | - if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' || $_REQUEST['s']==' ') ) )) {
|
|
| 516 | + if ($sort_by != '' && (!is_search() || (isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear'] == '' && ($_REQUEST['s'] == '' || $_REQUEST['s'] == ' ')))) {
|
|
| 517 | 517 | |
| 518 | 518 | $sort_array = explode('_', $sort_by);
|
| 519 | 519 | |
@@ -523,48 +523,48 @@ discard block |
||
| 523 | 523 | |
| 524 | 524 | if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {
|
| 525 | 525 | |
| 526 | - $sort_by = str_replace('_' . $order, '', $sort_by);
|
|
| 526 | + $sort_by = str_replace('_'.$order, '', $sort_by);
|
|
| 527 | 527 | |
| 528 | 528 | switch ($sort_by): |
| 529 | 529 | |
| 530 | 530 | case 'post_date': |
| 531 | 531 | case 'comment_count': |
| 532 | 532 | |
| 533 | - $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", "; |
|
| 533 | + $orderby = "$wpdb->posts.".$sort_by." ".$order.", ".$table.".overall_rating ".$order.", "; |
|
| 534 | 534 | break; |
| 535 | 535 | |
| 536 | 536 | case 'distance': |
| 537 | - $orderby = $sort_by . " " . $order . ", "; |
|
| 537 | + $orderby = $sort_by." ".$order.", "; |
|
| 538 | 538 | break; |
| 539 | 539 | |
| 540 | 540 | |
| 541 | 541 | // sort by rating |
| 542 | 542 | case 'overall_rating': |
| 543 | 543 | |
| 544 | - $use_bayesian = apply_filters('gd_use_bayesian',true,$table);
|
|
| 544 | + $use_bayesian = apply_filters('gd_use_bayesian', true, $table);
|
|
| 545 | 545 | $avg_rating = 0; |
| 546 | - if($use_bayesian){
|
|
| 547 | - $avg_num_votes = get_transient( 'gd_avg_num_votes_'.$table ); |
|
| 548 | - if(!$avg_num_votes){
|
|
| 546 | + if ($use_bayesian) {
|
|
| 547 | + $avg_num_votes = get_transient('gd_avg_num_votes_'.$table);
|
|
| 548 | + if (!$avg_num_votes) {
|
|
| 549 | 549 | $avg_num_votes = $wpdb->get_var("SELECT SUM(rating_count) FROM $table");
|
| 550 | - if($avg_num_votes){
|
|
| 550 | + if ($avg_num_votes) {
|
|
| 551 | 551 | |
| 552 | - $avg_rating = get_transient( 'gd_avg_rating_'.$table ); |
|
| 553 | - if(!$avg_rating){
|
|
| 554 | - $avg_rating = $wpdb->get_var("SELECT SUM(overall_rating) FROM $table")/$avg_num_votes;
|
|
| 552 | + $avg_rating = get_transient('gd_avg_rating_'.$table);
|
|
| 553 | + if (!$avg_rating) {
|
|
| 554 | + $avg_rating = $wpdb->get_var("SELECT SUM(overall_rating) FROM $table") / $avg_num_votes;
|
|
| 555 | 555 | } |
| 556 | - set_transient( 'gd_avg_num_votes_'.$table, $avg_num_votes, 12 * HOUR_IN_SECONDS ); |
|
| 557 | - set_transient( 'gd_avg_rating_'.$table, $avg_rating , 12 * HOUR_IN_SECONDS ); |
|
| 556 | + set_transient('gd_avg_num_votes_'.$table, $avg_num_votes, 12 * HOUR_IN_SECONDS);
|
|
| 557 | + set_transient('gd_avg_rating_'.$table, $avg_rating, 12 * HOUR_IN_SECONDS);
|
|
| 558 | 558 | } |
| 559 | 559 | } |
| 560 | 560 | |
| 561 | - if(!$avg_num_votes){ $avg_num_votes = 0;}
|
|
| 561 | + if (!$avg_num_votes) { $avg_num_votes = 0; }
|
|
| 562 | 562 | |
| 563 | - $orderby = " (( $avg_num_votes * $avg_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating )) / ( $avg_num_votes + " . $table . ".rating_count ) $order , ";
|
|
| 563 | + $orderby = " (( $avg_num_votes * $avg_rating ) + (".$table.".rating_count * ".$table.".overall_rating )) / ( $avg_num_votes + ".$table.".rating_count ) $order , ";
|
|
| 564 | 564 | |
| 565 | 565 | //$orderby = " ( " . $table . ".rating_count * " . $table . ".overall_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating ) / ( " . $table . ".rating_count + " . $table . ".rating_count ) $order , "; // seems to work mostly with no extra overheads
|
| 566 | - }else{
|
|
| 567 | - $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
| 566 | + } else {
|
|
| 567 | + $orderby = " ".$table.".".$sort_by." ".$order.", ".$table.".rating_count ".$order.", "; |
|
| 568 | 568 | } |
| 569 | 569 | |
| 570 | 570 | break; |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | |
| 573 | 573 | default: |
| 574 | 574 | if (geodir_column_exist($table, $sort_by)) {
|
| 575 | - $orderby = $table . "." . $sort_by . " " . $order . ", "; |
|
| 575 | + $orderby = $table.".".$sort_by." ".$order.", "; |
|
| 576 | 576 | } |
| 577 | 577 | break; |
| 578 | 578 | |
@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | } |
| 621 | 621 | |
| 622 | 622 | //if (!geodir_is_page('detail'))
|
| 623 | - add_filter('posts_where', 'geodir_default_where', 1);/**/
|
|
| 623 | + add_filter('posts_where', 'geodir_default_where', 1); /**/
|
|
| 624 | 624 | |
| 625 | 625 | //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
| 626 | 626 | |
@@ -691,7 +691,7 @@ discard block |
||
| 691 | 691 | $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
| 692 | 692 | //echo '##########'.$q_post_type; |
| 693 | 693 | if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) {
|
| 694 | - $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";
|
|
| 694 | + $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_".$q_post_type."') ";
|
|
| 695 | 695 | //$where .= " AND icl_t.language_code = '$lang_code' "; |
| 696 | 696 | } |
| 697 | 697 | |
@@ -758,8 +758,8 @@ discard block |
||
| 758 | 758 | } |
| 759 | 759 | |
| 760 | 760 | $s = trim($s); |
| 761 | - $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
| 762 | - $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
| 761 | + $s = wp_specialchars_decode($s, ENT_QUOTES); |
|
| 762 | + $s_A = wp_specialchars_decode($s_A, ENT_QUOTES); |
|
| 763 | 763 | |
| 764 | 764 | $where = ''; |
| 765 | 765 | $better_search_terms = ''; |
@@ -770,9 +770,9 @@ discard block |
||
| 770 | 770 | |
| 771 | 771 | if ($s != '') {
|
| 772 | 772 | $keywords = explode(" ", $s);
|
| 773 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 774 | - foreach($keywords as $kkey=>$kword){
|
|
| 775 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 773 | + if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {
|
|
| 774 | + foreach ($keywords as $kkey=>$kword) {
|
|
| 775 | + if (geodir_utf8_strlen($kword) <= $klimit) {
|
|
| 776 | 776 | unset($keywords[$kkey]); |
| 777 | 777 | } |
| 778 | 778 | } |
@@ -781,7 +781,7 @@ discard block |
||
| 781 | 781 | if (!empty($keywords)) {
|
| 782 | 782 | foreach ($keywords as $keyword) {
|
| 783 | 783 | $keyword = trim($keyword); |
| 784 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 784 | + $keyword = wp_specialchars_decode($keyword, ENT_QUOTES); |
|
| 785 | 785 | if ($keyword != '') {
|
| 786 | 786 | /** |
| 787 | 787 | * Filter the search query keywords SQL. |
@@ -792,7 +792,7 @@ discard block |
||
| 792 | 792 | * @param array $keywords The array of keywords for the query. |
| 793 | 793 | * @param string $keyword The single keyword being searched. |
| 794 | 794 | */ |
| 795 | - $better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword);
|
|
| 795 | + $better_search_terms .= apply_filters("geodir_search_better_search_terms", ' OR ( '.$wpdb->posts.'.post_title LIKE "'.$keyword.'" OR '.$wpdb->posts.'.post_title LIKE "'.$keyword.'%" OR '.$wpdb->posts.'.post_title LIKE "% '.$keyword.'%" )', $keywords, $keyword);
|
|
| 796 | 796 | } |
| 797 | 797 | } |
| 798 | 798 | } |
@@ -800,10 +800,10 @@ discard block |
||
| 800 | 800 | |
| 801 | 801 | /* get taxonomy */ |
| 802 | 802 | $taxonomies = geodir_get_taxonomies($post_types, true); |
| 803 | - if($taxonomies) {
|
|
| 803 | + if ($taxonomies) {
|
|
| 804 | 804 | $taxonomies = implode("','", $taxonomies);
|
| 805 | - $taxonomies = "'" . $taxonomies . "'"; |
|
| 806 | - }else{$taxonomies='';}
|
|
| 805 | + $taxonomies = "'".$taxonomies."'"; |
|
| 806 | + } else {$taxonomies = ''; }
|
|
| 807 | 807 | |
| 808 | 808 | $content_where = $terms_where = ''; |
| 809 | 809 | if ($s != '') {
|
@@ -814,7 +814,7 @@ discard block |
||
| 814 | 814 | * @package GeoDirectory |
| 815 | 815 | * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`. |
| 816 | 816 | */ |
| 817 | - $content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");
|
|
| 817 | + $content_where = apply_filters("geodir_search_content_where", " OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");
|
|
| 818 | 818 | /** |
| 819 | 819 | * Filter the search query term values. |
| 820 | 820 | * |
@@ -822,7 +822,7 @@ discard block |
||
| 822 | 822 | * @package GeoDirectory |
| 823 | 823 | * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`. |
| 824 | 824 | */ |
| 825 | - $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");
|
|
| 825 | + $terms_where = apply_filters("geodir_search_terms_where", " AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");
|
|
| 826 | 826 | } |
| 827 | 827 | |
| 828 | 828 | |
@@ -839,16 +839,16 @@ discard block |
||
| 839 | 839 | $term_ids = array(); |
| 840 | 840 | $terms_sql = ''; |
| 841 | 841 | |
| 842 | - if(!empty($term_results)){
|
|
| 843 | - foreach($term_results as $term_id){
|
|
| 842 | + if (!empty($term_results)) {
|
|
| 843 | + foreach ($term_results as $term_id) {
|
|
| 844 | 844 | $term_ids[] = $term_id; |
| 845 | 845 | } |
| 846 | 846 | if (!empty($term_ids)) {
|
| 847 | - foreach($term_ids as $term){
|
|
| 847 | + foreach ($term_ids as $term) {
|
|
| 848 | 848 | if ($term->taxonomy == $post_types.'_tags') {
|
| 849 | - $terms_sql .= $wpdb->prepare(" OR FIND_IN_SET(%s , " . $table . ".post_tags) ", $term->name);
|
|
| 849 | + $terms_sql .= $wpdb->prepare(" OR FIND_IN_SET(%s , ".$table.".post_tags) ", $term->name);
|
|
| 850 | 850 | } else {
|
| 851 | - $terms_sql .= " OR FIND_IN_SET($term->term_id , " . $table . "." . $post_types . "category) "; |
|
| 851 | + $terms_sql .= " OR FIND_IN_SET($term->term_id , ".$table.".".$post_types."category) "; |
|
| 852 | 852 | } |
| 853 | 853 | } |
| 854 | 854 | } |
@@ -879,12 +879,12 @@ discard block |
||
| 879 | 879 | ) |
| 880 | 880 | AND $wpdb->posts.post_type in ('{$post_types}')
|
| 881 | 881 | AND ($wpdb->posts.post_status = 'publish') |
| 882 | - AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 ) |
|
| 883 | - AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) "; |
|
| 882 | + AND ( ".$table.".post_latitude between $rlat1 and $rlat2 ) |
|
| 883 | + AND ( ".$table.".post_longitude between $rlon1 and $rlon2 ) "; |
|
| 884 | 884 | |
| 885 | 885 | if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
| 886 | 886 | $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
| 887 | - $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;
|
|
| 887 | + $where .= " AND CONVERT((".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= ".$dist;
|
|
| 888 | 888 | } |
| 889 | 889 | |
| 890 | 890 | } else {
|
@@ -901,11 +901,11 @@ discard block |
||
| 901 | 901 | } |
| 902 | 902 | |
| 903 | 903 | ########### WPML ########### |
| 904 | - if ( geodir_wpml_is_post_type_translated( $post_types ) ) {
|
|
| 904 | + if (geodir_wpml_is_post_type_translated($post_types)) {
|
|
| 905 | 905 | $lang_code = ICL_LANGUAGE_CODE; |
| 906 | 906 | |
| 907 | 907 | if ($lang_code && $post_types) {
|
| 908 | - $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 908 | + $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_".$post_types."') ";
|
|
| 909 | 909 | } |
| 910 | 910 | } |
| 911 | 911 | ########### WPML ########### |
@@ -928,10 +928,10 @@ discard block |
||
| 928 | 928 | global $wpdb, $geodir_post_type, $table, $curr; |
| 929 | 929 | |
| 930 | 930 | $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
| 931 | - $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 931 | + $user_id = !empty($curauth->ID) ? (int) $curauth->ID : 0; |
|
| 932 | 932 | |
| 933 | 933 | if (isset($_REQUEST['stype'])) {
|
| 934 | - $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 934 | + $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ", $_REQUEST['stype']);
|
|
| 935 | 935 | } else {
|
| 936 | 936 | $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
| 937 | 937 | } |
@@ -944,7 +944,7 @@ discard block |
||
| 944 | 944 | } else |
| 945 | 945 | $where .= " AND $wpdb->posts.post_author = $user_id"; |
| 946 | 946 | |
| 947 | - if ($user_id == (int)get_current_user_id()) {
|
|
| 947 | + if ($user_id == (int) get_current_user_id()) {
|
|
| 948 | 948 | $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
| 949 | 949 | } else {
|
| 950 | 950 | $where .= " AND $wpdb->posts.post_status = 'publish' "; |
@@ -957,7 +957,7 @@ discard block |
||
| 957 | 957 | if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) {
|
| 958 | 958 | $lang_code = ICL_LANGUAGE_CODE; |
| 959 | 959 | if ($lang_code) {
|
| 960 | - $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 960 | + $where .= " AND icl_t.language_code='".$lang_code."' "; |
|
| 961 | 961 | } |
| 962 | 962 | |
| 963 | 963 | } |
@@ -980,7 +980,7 @@ discard block |
||
| 980 | 980 | {
|
| 981 | 981 | global $wp_query, $table; |
| 982 | 982 | if (!empty($wp_query->query['with_pics_only'])) {
|
| 983 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 983 | + $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )"; |
|
| 984 | 984 | } |
| 985 | 985 | return $join; |
| 986 | 986 | } |
@@ -999,16 +999,16 @@ discard block |
||
| 999 | 999 | {
|
| 1000 | 1000 | global $wp_query, $table; |
| 1001 | 1001 | if (!empty($wp_query->query['show_featured_only'])) {
|
| 1002 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 1002 | + $where .= " AND ".$table.".is_featured = '1'"; |
|
| 1003 | 1003 | } |
| 1004 | 1004 | if (!empty($wp_query->query['show_special_only'])) {
|
| 1005 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 1005 | + $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )"; |
|
| 1006 | 1006 | } |
| 1007 | 1007 | if (!empty($wp_query->query['with_pics_only'])) {
|
| 1008 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 1008 | + $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL GROUP BY ".$table.".post_id"; |
|
| 1009 | 1009 | } |
| 1010 | 1010 | if (!empty($wp_query->query['with_videos_only'])) {
|
| 1011 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 1011 | + $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )"; |
|
| 1012 | 1012 | } |
| 1013 | 1013 | return $where; |
| 1014 | 1014 | } |
@@ -1017,18 +1017,18 @@ discard block |
||
| 1017 | 1017 | function geodir_related_posts_fields($fields) {
|
| 1018 | 1018 | global $wp_query, $wpdb, $table, $post; |
| 1019 | 1019 | |
| 1020 | - $fields .= ", " . $table . ".* "; |
|
| 1020 | + $fields .= ", ".$table.".* "; |
|
| 1021 | 1021 | |
| 1022 | 1022 | $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
| 1023 | 1023 | |
| 1024 | 1024 | $mylat = $post->post_latitude; |
| 1025 | 1025 | $mylon = $post->post_longitude; |
| 1026 | 1026 | |
| 1027 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 1027 | + $fields .= " , (".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 1028 | 1028 | return $fields; |
| 1029 | 1029 | } |
| 1030 | 1030 | function geodir_related_posts_fields_filter($query) {
|
| 1031 | - if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 1031 | + if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 1032 | 1032 | && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
| 1033 | 1033 | && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
| 1034 | 1034 | ) {
|
@@ -1047,25 +1047,25 @@ discard block |
||
| 1047 | 1047 | * @param string $table Listing table name. |
| 1048 | 1048 | * @return string|null If field exists in table returns order by clause else returns empty. |
| 1049 | 1049 | */ |
| 1050 | -function geodir_prepare_custom_sorting( $sorting, $table ) {
|
|
| 1050 | +function geodir_prepare_custom_sorting($sorting, $table) {
|
|
| 1051 | 1051 | $orderby = ''; |
| 1052 | 1052 | |
| 1053 | - if ( empty( $sorting ) || empty( $table ) ) {
|
|
| 1053 | + if (empty($sorting) || empty($table)) {
|
|
| 1054 | 1054 | return $orderby; |
| 1055 | 1055 | } |
| 1056 | 1056 | |
| 1057 | - if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {
|
|
| 1058 | - $sorting_array = explode( '_', $sorting ); |
|
| 1057 | + if (strpos(strtoupper($sorting), '_ASC') !== false || strpos(strtoupper($sorting), '_DESC') !== false) {
|
|
| 1058 | + $sorting_array = explode('_', $sorting);
|
|
| 1059 | 1059 | |
| 1060 | - if ( ( $count = count( $sorting_array ) ) > 1 ) {
|
|
| 1061 | - $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
| 1062 | - array_pop( $sorting_array ); |
|
| 1060 | + if (($count = count($sorting_array)) > 1) {
|
|
| 1061 | + $order = !empty($sorting_array[$count - 1]) ? strtoupper($sorting_array[$count - 1]) : ''; |
|
| 1062 | + array_pop($sorting_array); |
|
| 1063 | 1063 | |
| 1064 | - if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {
|
|
| 1065 | - $sort_by = implode( '_', $sorting_array ); |
|
| 1064 | + if (!empty($sorting_array) && ($order == 'ASC' || $order == 'DESC')) {
|
|
| 1065 | + $sort_by = implode('_', $sorting_array);
|
|
| 1066 | 1066 | |
| 1067 | - if ( geodir_column_exist( $table, $sort_by ) ) {
|
|
| 1068 | - $orderby = $table . "." . $sort_by . " " . $order; |
|
| 1067 | + if (geodir_column_exist($table, $sort_by)) {
|
|
| 1068 | + $orderby = $table.".".$sort_by." ".$order; |
|
| 1069 | 1069 | } |
| 1070 | 1070 | } |
| 1071 | 1071 | } |
@@ -1090,18 +1090,18 @@ discard block |
||
| 1090 | 1090 | * |
| 1091 | 1091 | * @return string Modified fields SQL. |
| 1092 | 1092 | */ |
| 1093 | -function geodir_search_widget_location_filter_fields( $fields, $table, $post_type ) {
|
|
| 1093 | +function geodir_search_widget_location_filter_fields($fields, $table, $post_type) {
|
|
| 1094 | 1094 | global $wpdb, $gd_query_args_widgets, $snear, $gd_session; |
| 1095 | 1095 | |
| 1096 | - if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1097 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1096 | + if (!empty($gd_query_args_widgets['gd_location']) && geodir_is_page('search') && !empty($_REQUEST['sgeo_lat']) && !empty($_REQUEST['sgeo_lon'])) {
|
|
| 1097 | + $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
|
|
| 1098 | 1098 | |
| 1099 | - if ( $location_allowed && strpos( strtolower( $fields ), ' as distance ' ) === false && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1100 | - $latitude = sanitize_text_field( $_REQUEST['sgeo_lat'] ); |
|
| 1101 | - $longitude = sanitize_text_field( $_REQUEST['sgeo_lon'] ); |
|
| 1102 | - $radius = geodir_getDistanceRadius( get_option( 'geodir_search_dist_1' ) ); |
|
| 1099 | + if ($location_allowed && strpos(strtolower($fields), ' as distance ') === false && ($snear != '' || $gd_session->get('all_near_me'))) {
|
|
| 1100 | + $latitude = sanitize_text_field($_REQUEST['sgeo_lat']); |
|
| 1101 | + $longitude = sanitize_text_field($_REQUEST['sgeo_lon']); |
|
| 1102 | + $radius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 1103 | 1103 | |
| 1104 | - $fields .= $wpdb->prepare( ", (" . $radius . " * 2 * ASIN(SQRT(POWER(SIN((ABS(%s) - ABS(" . $table . ".post_latitude)) * PI() / 180 / 2), 2) + COS(ABS(%s) * PI() / 180) * COS(ABS(" . $table . ".post_latitude) * PI() / 180) * POWER(SIN((%s - " . $table . ".post_longitude) * PI() / 180 / 2), 2)))) AS distance ", $latitude, $latitude, $longitude );
|
|
| 1104 | + $fields .= $wpdb->prepare(", (".$radius." * 2 * ASIN(SQRT(POWER(SIN((ABS(%s) - ABS(".$table.".post_latitude)) * PI() / 180 / 2), 2) + COS(ABS(%s) * PI() / 180) * COS(ABS(".$table.".post_latitude) * PI() / 180) * POWER(SIN((%s - ".$table.".post_longitude) * PI() / 180 / 2), 2)))) AS distance ", $latitude, $latitude, $longitude);
|
|
| 1105 | 1105 | } |
| 1106 | 1106 | } |
| 1107 | 1107 | |
@@ -1123,14 +1123,14 @@ discard block |
||
| 1123 | 1123 | * |
| 1124 | 1124 | * @return string Modified fields SQL. |
| 1125 | 1125 | */ |
| 1126 | -function geodir_search_widget_location_filter_orderby( $orderby, $table, $post_type ) {
|
|
| 1126 | +function geodir_search_widget_location_filter_orderby($orderby, $table, $post_type) {
|
|
| 1127 | 1127 | global $gd_query_args_widgets, $snear, $gd_session; |
| 1128 | 1128 | |
| 1129 | - if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1130 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1129 | + if (!empty($gd_query_args_widgets['gd_location']) && geodir_is_page('search') && !empty($_REQUEST['sgeo_lat']) && !empty($_REQUEST['sgeo_lon'])) {
|
|
| 1130 | + $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
|
|
| 1131 | 1131 | |
| 1132 | - if ( $location_allowed && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1133 | - $orderby = "distance ASC, " . $orderby; |
|
| 1132 | + if ($location_allowed && ($snear != '' || $gd_session->get('all_near_me'))) {
|
|
| 1133 | + $orderby = "distance ASC, ".$orderby; |
|
| 1134 | 1134 | } |
| 1135 | 1135 | } |
| 1136 | 1136 | |
@@ -1145,21 +1145,21 @@ discard block |
||
| 1145 | 1145 | * @return string Filtered url. |
| 1146 | 1146 | */ |
| 1147 | 1147 | function geodir_search_page_base_url() {
|
| 1148 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 1149 | - remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
| 1148 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1149 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 1150 | 1150 | } |
| 1151 | 1151 | |
| 1152 | - if ( defined( 'DOING_AJAX' ) && DOING_AJAX && geodir_is_wpml() ) {
|
|
| 1152 | + if (defined('DOING_AJAX') && DOING_AJAX && geodir_is_wpml()) {
|
|
| 1153 | 1153 | $url = icl_get_home_url(); |
| 1154 | 1154 | } else {
|
| 1155 | 1155 | $url = get_home_url(); |
| 1156 | 1156 | } |
| 1157 | 1157 | |
| 1158 | - $url = trailingslashit( $url ); |
|
| 1158 | + $url = trailingslashit($url); |
|
| 1159 | 1159 | |
| 1160 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 1161 | - add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
| 1160 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1161 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 1162 | 1162 | } |
| 1163 | 1163 | |
| 1164 | - return apply_filters( 'geodir_search_page_base_url', $url ); |
|
| 1164 | + return apply_filters('geodir_search_page_base_url', $url);
|
|
| 1165 | 1165 | } |
| 1166 | 1166 | \ No newline at end of file |
@@ -13,133 +13,133 @@ discard block |
||
| 13 | 13 | * @package GeoDirectory |
| 14 | 14 | */ |
| 15 | 15 | function geodir_deactivation() {
|
| 16 | - // Update installed variable |
|
| 17 | - update_option("geodir_installed", 0);
|
|
| 16 | + // Update installed variable |
|
| 17 | + update_option("geodir_installed", 0);
|
|
| 18 | 18 | |
| 19 | - // Remove rewrite rules and then recreate rewrite rules. |
|
| 20 | - flush_rewrite_rules(); |
|
| 19 | + // Remove rewrite rules and then recreate rewrite rules. |
|
| 20 | + flush_rewrite_rules(); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | if (!function_exists('geodir_admin_styles')) {
|
| 24 | - /** |
|
| 25 | - * Enqueue Admin Styles. |
|
| 26 | - * |
|
| 27 | - * @since 1.0.0 |
|
| 28 | - * @package GeoDirectory |
|
| 29 | - */ |
|
| 30 | - function geodir_admin_styles() {
|
|
| 31 | - wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
|
|
| 32 | - wp_enqueue_style('geodirectory-admin-css');
|
|
| 24 | + /** |
|
| 25 | + * Enqueue Admin Styles. |
|
| 26 | + * |
|
| 27 | + * @since 1.0.0 |
|
| 28 | + * @package GeoDirectory |
|
| 29 | + */ |
|
| 30 | + function geodir_admin_styles() {
|
|
| 31 | + wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
|
|
| 32 | + wp_enqueue_style('geodirectory-admin-css');
|
|
| 33 | 33 | |
| 34 | - wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
|
|
| 35 | - wp_enqueue_style('geodirectory-frontend-style');
|
|
| 34 | + wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
|
|
| 35 | + wp_enqueue_style('geodirectory-frontend-style');
|
|
| 36 | 36 | |
| 37 | - wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
|
|
| 38 | - wp_enqueue_style('geodir-chosen-style');
|
|
| 37 | + wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
|
|
| 38 | + wp_enqueue_style('geodir-chosen-style');
|
|
| 39 | 39 | |
| 40 | - wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
|
|
| 41 | - wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');
|
|
| 40 | + wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
|
|
| 41 | + wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');
|
|
| 42 | 42 | |
| 43 | - wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
|
|
| 44 | - wp_enqueue_style('geodirectory-jquery-ui-css');
|
|
| 43 | + wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
|
|
| 44 | + wp_enqueue_style('geodirectory-jquery-ui-css');
|
|
| 45 | 45 | |
| 46 | - wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
|
|
| 47 | - wp_enqueue_style('geodirectory-custom-fields-css');
|
|
| 46 | + wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
|
|
| 47 | + wp_enqueue_style('geodirectory-custom-fields-css');
|
|
| 48 | 48 | |
| 49 | - wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
|
|
| 50 | - wp_enqueue_style('geodirectory-pluplodar-css');
|
|
| 49 | + wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
|
|
| 50 | + wp_enqueue_style('geodirectory-pluplodar-css');
|
|
| 51 | 51 | |
| 52 | - wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
|
|
| 53 | - wp_enqueue_style('geodir-rating-style');
|
|
| 52 | + wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
|
|
| 53 | + wp_enqueue_style('geodir-rating-style');
|
|
| 54 | 54 | |
| 55 | - wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
|
|
| 56 | - wp_enqueue_style('geodir-rtl-style');
|
|
| 57 | - } |
|
| 55 | + wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
|
|
| 56 | + wp_enqueue_style('geodir-rtl-style');
|
|
| 57 | + } |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | if (!function_exists('geodir_admin_styles_req')) {
|
| 61 | - /** |
|
| 62 | - * Loads stylesheets from CDN. |
|
| 63 | - * |
|
| 64 | - * @since 1.0.0 |
|
| 65 | - * @package GeoDirectory |
|
| 66 | - */ |
|
| 67 | - function geodir_admin_styles_req() |
|
| 68 | - {
|
|
| 61 | + /** |
|
| 62 | + * Loads stylesheets from CDN. |
|
| 63 | + * |
|
| 64 | + * @since 1.0.0 |
|
| 65 | + * @package GeoDirectory |
|
| 66 | + */ |
|
| 67 | + function geodir_admin_styles_req() |
|
| 68 | + {
|
|
| 69 | 69 | |
| 70 | - wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
|
|
| 71 | - wp_enqueue_style('font-awesome');
|
|
| 70 | + wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
|
|
| 71 | + wp_enqueue_style('font-awesome');
|
|
| 72 | 72 | |
| 73 | - wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 74 | - wp_enqueue_script('geodirectory-admin');
|
|
| 73 | + wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 74 | + wp_enqueue_script('geodirectory-admin');
|
|
| 75 | 75 | |
| 76 | - } |
|
| 76 | + } |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | if (!function_exists('geodir_admin_scripts')) {
|
| 80 | - /** |
|
| 81 | - * Enqueue Admin Scripts. |
|
| 82 | - * |
|
| 83 | - * @since 1.0.0 |
|
| 84 | - * @package GeoDirectory |
|
| 85 | - */ |
|
| 86 | - function geodir_admin_scripts() |
|
| 87 | - {
|
|
| 88 | - $geodir_map_name = geodir_map_name(); |
|
| 80 | + /** |
|
| 81 | + * Enqueue Admin Scripts. |
|
| 82 | + * |
|
| 83 | + * @since 1.0.0 |
|
| 84 | + * @package GeoDirectory |
|
| 85 | + */ |
|
| 86 | + function geodir_admin_scripts() |
|
| 87 | + {
|
|
| 88 | + $geodir_map_name = geodir_map_name(); |
|
| 89 | 89 | |
| 90 | - wp_enqueue_script('jquery');
|
|
| 90 | + wp_enqueue_script('jquery');
|
|
| 91 | 91 | |
| 92 | - wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);
|
|
| 92 | + wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);
|
|
| 93 | 93 | |
| 94 | - wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 95 | - wp_enqueue_script('chosen');
|
|
| 94 | + wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 95 | + wp_enqueue_script('chosen');
|
|
| 96 | 96 | |
| 97 | - wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
|
|
| 98 | - wp_enqueue_script('geodirectory-choose-ajax');
|
|
| 97 | + wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
|
|
| 98 | + wp_enqueue_script('geodirectory-choose-ajax');
|
|
| 99 | 99 | |
| 100 | - if (isset($_REQUEST['listing_type'])) {
|
|
| 101 | - wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
|
|
| 102 | - } |
|
| 100 | + if (isset($_REQUEST['listing_type'])) {
|
|
| 101 | + wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
|
|
| 102 | + } |
|
| 103 | 103 | |
| 104 | - wp_enqueue_script('geodirectory-custom-fields-script');
|
|
| 105 | - $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions'; |
|
| 104 | + wp_enqueue_script('geodirectory-custom-fields-script');
|
|
| 105 | + $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions'; |
|
| 106 | 106 | |
| 107 | - wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);
|
|
| 107 | + wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);
|
|
| 108 | 108 | |
| 109 | - if (in_array($geodir_map_name, array('auto', 'google'))) {
|
|
| 110 | - $map_lang = "&language=" . geodir_get_map_default_language(); |
|
| 111 | - $map_key = "&key=" . geodir_get_map_api_key(); |
|
| 112 | - /** This filter is documented in geodirectory_template_tags.php */ |
|
| 113 | - $map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
|
| 114 | - wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);
|
|
| 109 | + if (in_array($geodir_map_name, array('auto', 'google'))) {
|
|
| 110 | + $map_lang = "&language=" . geodir_get_map_default_language(); |
|
| 111 | + $map_key = "&key=" . geodir_get_map_api_key(); |
|
| 112 | + /** This filter is documented in geodirectory_template_tags.php */ |
|
| 113 | + $map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
|
| 114 | + wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);
|
|
| 115 | 115 | |
| 116 | - // Overlapping Marker Spiderfier |
|
| 117 | - wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 118 | - wp_enqueue_script('geodirectory-g-overlappingmarker-script');
|
|
| 119 | - } |
|
| 116 | + // Overlapping Marker Spiderfier |
|
| 117 | + wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 118 | + wp_enqueue_script('geodirectory-g-overlappingmarker-script');
|
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | - if ($geodir_map_name == 'osm') {
|
|
| 122 | - // Leaflet OpenStreetMap |
|
| 123 | - wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 124 | - wp_enqueue_style('geodirectory-leaflet-style');
|
|
| 121 | + if ($geodir_map_name == 'osm') {
|
|
| 122 | + // Leaflet OpenStreetMap |
|
| 123 | + wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 124 | + wp_enqueue_style('geodirectory-leaflet-style');
|
|
| 125 | 125 | |
| 126 | - wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 127 | - wp_enqueue_script('geodirectory-leaflet-script');
|
|
| 126 | + wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 127 | + wp_enqueue_script('geodirectory-leaflet-script');
|
|
| 128 | 128 | |
| 129 | - wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
| 130 | - wp_enqueue_script('geodirectory-leaflet-geo-script');
|
|
| 129 | + wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
| 130 | + wp_enqueue_script('geodirectory-leaflet-geo-script');
|
|
| 131 | 131 | |
| 132 | - // Overlapping Marker Spiderfier Leaflet |
|
| 133 | - wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 134 | - wp_enqueue_script('geodirectory-o-overlappingmarker-script');
|
|
| 135 | - } |
|
| 136 | - wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 132 | + // Overlapping Marker Spiderfier Leaflet |
|
| 133 | + wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 134 | + wp_enqueue_script('geodirectory-o-overlappingmarker-script');
|
|
| 135 | + } |
|
| 136 | + wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 137 | 137 | |
| 138 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 139 | - wp_enqueue_script('geodirectory-goMap-script');
|
|
| 138 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 139 | + wp_enqueue_script('geodirectory-goMap-script');
|
|
| 140 | 140 | |
| 141 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
| 142 | - wp_enqueue_script('geodirectory-goMap-script');
|
|
| 141 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
| 142 | + wp_enqueue_script('geodirectory-goMap-script');
|
|
| 143 | 143 | |
| 144 | 144 | // font awesome rating script |
| 145 | 145 | if (get_option('geodir_reviewrating_enable_font_awesome')) {
|
@@ -150,167 +150,167 @@ discard block |
||
| 150 | 150 | wp_enqueue_script('geodir-jRating-js');
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 154 | - wp_enqueue_script('geodir-on-document-load');
|
|
| 155 | - |
|
| 156 | - |
|
| 157 | - // SCRIPT FOR UPLOAD |
|
| 158 | - wp_enqueue_script('plupload-all');
|
|
| 159 | - wp_enqueue_script('jquery-ui-sortable');
|
|
| 160 | - |
|
| 161 | - wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
| 162 | - wp_enqueue_script('geodirectory-plupload-script');
|
|
| 163 | - |
|
| 164 | - // SCRIPT FOR UPLOAD END |
|
| 165 | - |
|
| 166 | - |
|
| 167 | - // place js config array for plupload |
|
| 168 | - $plupload_init = array( |
|
| 169 | - 'runtimes' => 'html5,silverlight,html4', |
|
| 170 | - 'browse_button' => 'plupload-browse-button', // will be adjusted per uploader |
|
| 171 | - 'container' => 'plupload-upload-ui', // will be adjusted per uploader |
|
| 172 | - 'drop_element' => 'dropbox', // will be adjusted per uploader |
|
| 173 | - 'file_data_name' => 'async-upload', // will be adjusted per uploader |
|
| 174 | - 'multiple_queues' => true, |
|
| 175 | - 'max_file_size' => geodir_max_upload_size(), |
|
| 176 | - 'url' => admin_url('admin-ajax.php'),
|
|
| 177 | - 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
|
|
| 178 | - 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
|
|
| 179 | - 'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
|
|
| 180 | - 'multipart' => true, |
|
| 181 | - 'urlstream_upload' => true, |
|
| 182 | - 'multi_selection' => false, // will be added per uploader |
|
| 183 | - // additional post data to send to our ajax hook |
|
| 184 | - 'multipart_params' => array( |
|
| 185 | - '_ajax_nonce' => "", // will be added per uploader |
|
| 186 | - 'action' => 'plupload_action', // the ajax action name |
|
| 187 | - 'imgid' => 0 // will be added per uploader |
|
| 188 | - ) |
|
| 189 | - ); |
|
| 190 | - $base_plupload_config = json_encode($plupload_init); |
|
| 191 | - |
|
| 192 | - |
|
| 193 | - $thumb_img_arr = array(); |
|
| 194 | - |
|
| 195 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 196 | - $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
| 197 | - |
|
| 198 | - $totImg = ''; |
|
| 199 | - $image_limit = ''; |
|
| 200 | - if (!empty($thumb_img_arr)) {
|
|
| 201 | - $totImg = count($thumb_img_arr); |
|
| 202 | - } |
|
| 153 | + wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 154 | + wp_enqueue_script('geodir-on-document-load');
|
|
| 155 | + |
|
| 156 | + |
|
| 157 | + // SCRIPT FOR UPLOAD |
|
| 158 | + wp_enqueue_script('plupload-all');
|
|
| 159 | + wp_enqueue_script('jquery-ui-sortable');
|
|
| 160 | + |
|
| 161 | + wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
| 162 | + wp_enqueue_script('geodirectory-plupload-script');
|
|
| 163 | + |
|
| 164 | + // SCRIPT FOR UPLOAD END |
|
| 165 | + |
|
| 166 | + |
|
| 167 | + // place js config array for plupload |
|
| 168 | + $plupload_init = array( |
|
| 169 | + 'runtimes' => 'html5,silverlight,html4', |
|
| 170 | + 'browse_button' => 'plupload-browse-button', // will be adjusted per uploader |
|
| 171 | + 'container' => 'plupload-upload-ui', // will be adjusted per uploader |
|
| 172 | + 'drop_element' => 'dropbox', // will be adjusted per uploader |
|
| 173 | + 'file_data_name' => 'async-upload', // will be adjusted per uploader |
|
| 174 | + 'multiple_queues' => true, |
|
| 175 | + 'max_file_size' => geodir_max_upload_size(), |
|
| 176 | + 'url' => admin_url('admin-ajax.php'),
|
|
| 177 | + 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
|
|
| 178 | + 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
|
|
| 179 | + 'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
|
|
| 180 | + 'multipart' => true, |
|
| 181 | + 'urlstream_upload' => true, |
|
| 182 | + 'multi_selection' => false, // will be added per uploader |
|
| 183 | + // additional post data to send to our ajax hook |
|
| 184 | + 'multipart_params' => array( |
|
| 185 | + '_ajax_nonce' => "", // will be added per uploader |
|
| 186 | + 'action' => 'plupload_action', // the ajax action name |
|
| 187 | + 'imgid' => 0 // will be added per uploader |
|
| 188 | + ) |
|
| 189 | + ); |
|
| 190 | + $base_plupload_config = json_encode($plupload_init); |
|
| 191 | + |
|
| 192 | + |
|
| 193 | + $thumb_img_arr = array(); |
|
| 194 | + |
|
| 195 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 196 | + $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
| 197 | + |
|
| 198 | + $totImg = ''; |
|
| 199 | + $image_limit = ''; |
|
| 200 | + if (!empty($thumb_img_arr)) {
|
|
| 201 | + $totImg = count($thumb_img_arr); |
|
| 202 | + } |
|
| 203 | 203 | |
| 204 | - $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
|
|
| 205 | - 'totalImg' => $totImg, |
|
| 206 | - 'image_limit' => $image_limit, |
|
| 207 | - 'upload_img_size' => geodir_max_upload_size()); |
|
| 204 | + $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
|
|
| 205 | + 'totalImg' => $totImg, |
|
| 206 | + 'image_limit' => $image_limit, |
|
| 207 | + 'upload_img_size' => geodir_max_upload_size()); |
|
| 208 | 208 | |
| 209 | - wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
|
| 209 | + wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
|
| 210 | 210 | |
| 211 | - $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));
|
|
| 212 | - wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);
|
|
| 211 | + $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));
|
|
| 212 | + wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);
|
|
| 213 | 213 | |
| 214 | 214 | |
| 215 | - wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
| 216 | - wp_enqueue_script('geodirectory-admin-script');
|
|
| 215 | + wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
| 216 | + wp_enqueue_script('geodirectory-admin-script');
|
|
| 217 | 217 | |
| 218 | - wp_enqueue_style('farbtastic');
|
|
| 219 | - wp_enqueue_script('farbtastic');
|
|
| 218 | + wp_enqueue_style('farbtastic');
|
|
| 219 | + wp_enqueue_script('farbtastic');
|
|
| 220 | 220 | |
| 221 | - $screen = get_current_screen(); |
|
| 222 | - if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {
|
|
| 223 | - wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');
|
|
| 224 | - } |
|
| 221 | + $screen = get_current_screen(); |
|
| 222 | + if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {
|
|
| 223 | + wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');
|
|
| 224 | + } |
|
| 225 | 225 | |
| 226 | - $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
|
|
| 227 | - wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
|
|
| 226 | + $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
|
|
| 227 | + wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
|
|
| 228 | 228 | |
| 229 | - } |
|
| 229 | + } |
|
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | if (!function_exists('geodir_admin_menu')) {
|
| 233 | - /** |
|
| 234 | - * Admin Menus |
|
| 235 | - * |
|
| 236 | - * Sets up the admin menus in wordpress. |
|
| 237 | - * |
|
| 238 | - * @since 1.0.0 |
|
| 239 | - * @package GeoDirectory |
|
| 240 | - * @global array $menu Menu array. |
|
| 241 | - * @global object $geodirectory GeoDirectory plugin object. |
|
| 242 | - */ |
|
| 243 | - function geodir_admin_menu() |
|
| 244 | - {
|
|
| 245 | - global $menu, $geodirectory; |
|
| 233 | + /** |
|
| 234 | + * Admin Menus |
|
| 235 | + * |
|
| 236 | + * Sets up the admin menus in wordpress. |
|
| 237 | + * |
|
| 238 | + * @since 1.0.0 |
|
| 239 | + * @package GeoDirectory |
|
| 240 | + * @global array $menu Menu array. |
|
| 241 | + * @global object $geodirectory GeoDirectory plugin object. |
|
| 242 | + */ |
|
| 243 | + function geodir_admin_menu() |
|
| 244 | + {
|
|
| 245 | + global $menu, $geodirectory; |
|
| 246 | 246 | |
| 247 | - if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
|
|
| 247 | + if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
|
|
| 248 | 248 | |
| 249 | - add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
|
|
| 249 | + add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
|
|
| 250 | 250 | |
| 251 | 251 | |
| 252 | - } |
|
| 252 | + } |
|
| 253 | 253 | } |
| 254 | 254 | |
| 255 | 255 | if (!function_exists('geodir_admin_menu_order')) {
|
| 256 | - /** |
|
| 257 | - * Order admin menus. |
|
| 258 | - * |
|
| 259 | - * @since 1.0.0 |
|
| 260 | - * @package GeoDirectory |
|
| 261 | - * @param array $menu_order Menu order array. |
|
| 262 | - * @return array Modified menu order array. |
|
| 263 | - */ |
|
| 264 | - function geodir_admin_menu_order($menu_order) |
|
| 265 | - {
|
|
| 266 | - |
|
| 267 | - // Initialize our custom order array |
|
| 268 | - $geodir_menu_order = array(); |
|
| 269 | - |
|
| 270 | - // Get the index of our custom separator |
|
| 271 | - $geodir_separator = array_search('separator-geodirectory', $menu_order);
|
|
| 272 | - |
|
| 273 | - // Get index of posttype menu |
|
| 274 | - $post_types = geodir_get_posttypes(); |
|
| 275 | - |
|
| 276 | - // Loop through menu order and do some rearranging |
|
| 277 | - foreach ($menu_order as $index => $item) : |
|
| 278 | - |
|
| 279 | - if ((('geodirectory') == $item)) :
|
|
| 280 | - $geodir_menu_order[] = 'separator-geodirectory'; |
|
| 281 | - if (!empty($post_types)) {
|
|
| 282 | - foreach ($post_types as $post_type) {
|
|
| 283 | - $geodir_menu_order[] = 'edit.php?post_type=' . $post_type; |
|
| 284 | - } |
|
| 285 | - } |
|
| 286 | - $geodir_menu_order[] = $item; |
|
| 256 | + /** |
|
| 257 | + * Order admin menus. |
|
| 258 | + * |
|
| 259 | + * @since 1.0.0 |
|
| 260 | + * @package GeoDirectory |
|
| 261 | + * @param array $menu_order Menu order array. |
|
| 262 | + * @return array Modified menu order array. |
|
| 263 | + */ |
|
| 264 | + function geodir_admin_menu_order($menu_order) |
|
| 265 | + {
|
|
| 287 | 266 | |
| 288 | - unset($menu_order[$geodir_separator]); |
|
| 289 | - //unset( $menu_order[$geodir_places] ); |
|
| 290 | - elseif (!in_array($item, array('separator-geodirectory'))) :
|
|
| 291 | - $geodir_menu_order[] = $item; |
|
| 292 | - endif; |
|
| 267 | + // Initialize our custom order array |
|
| 268 | + $geodir_menu_order = array(); |
|
| 293 | 269 | |
| 294 | - endforeach; |
|
| 270 | + // Get the index of our custom separator |
|
| 271 | + $geodir_separator = array_search('separator-geodirectory', $menu_order);
|
|
| 295 | 272 | |
| 296 | - // Return order |
|
| 297 | - return $geodir_menu_order; |
|
| 298 | - } |
|
| 273 | + // Get index of posttype menu |
|
| 274 | + $post_types = geodir_get_posttypes(); |
|
| 275 | + |
|
| 276 | + // Loop through menu order and do some rearranging |
|
| 277 | + foreach ($menu_order as $index => $item) : |
|
| 278 | + |
|
| 279 | + if ((('geodirectory') == $item)) :
|
|
| 280 | + $geodir_menu_order[] = 'separator-geodirectory'; |
|
| 281 | + if (!empty($post_types)) {
|
|
| 282 | + foreach ($post_types as $post_type) {
|
|
| 283 | + $geodir_menu_order[] = 'edit.php?post_type=' . $post_type; |
|
| 284 | + } |
|
| 285 | + } |
|
| 286 | + $geodir_menu_order[] = $item; |
|
| 287 | + |
|
| 288 | + unset($menu_order[$geodir_separator]); |
|
| 289 | + //unset( $menu_order[$geodir_places] ); |
|
| 290 | + elseif (!in_array($item, array('separator-geodirectory'))) :
|
|
| 291 | + $geodir_menu_order[] = $item; |
|
| 292 | + endif; |
|
| 293 | + |
|
| 294 | + endforeach; |
|
| 295 | + |
|
| 296 | + // Return order |
|
| 297 | + return $geodir_menu_order; |
|
| 298 | + } |
|
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | if (!function_exists('geodir_admin_custom_menu_order')) {
|
| 302 | - /** |
|
| 303 | - * Enables custom menu order. |
|
| 304 | - * |
|
| 305 | - * @since 1.0.0 |
|
| 306 | - * @package GeoDirectory |
|
| 307 | - * @return bool |
|
| 308 | - */ |
|
| 309 | - function geodir_admin_custom_menu_order() |
|
| 310 | - {
|
|
| 311 | - if (!current_user_can('manage_options')) return false;
|
|
| 312 | - return true; |
|
| 313 | - } |
|
| 302 | + /** |
|
| 303 | + * Enables custom menu order. |
|
| 304 | + * |
|
| 305 | + * @since 1.0.0 |
|
| 306 | + * @package GeoDirectory |
|
| 307 | + * @return bool |
|
| 308 | + */ |
|
| 309 | + function geodir_admin_custom_menu_order() |
|
| 310 | + {
|
|
| 311 | + if (!current_user_can('manage_options')) return false;
|
|
| 312 | + return true; |
|
| 313 | + } |
|
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | /** |
@@ -321,51 +321,51 @@ discard block |
||
| 321 | 321 | */ |
| 322 | 322 | function geodir_before_admin_panel() |
| 323 | 323 | {
|
| 324 | - if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
|
|
| 325 | - echo '<div id="message" class="updated fade"> |
|
| 324 | + if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
|
|
| 325 | + echo '<div id="message" class="updated fade"> |
|
| 326 | 326 | <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p>
|
| 327 | 327 | <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>
|
| 328 | 328 | </div>'; |
| 329 | 329 | |
| 330 | - } |
|
| 330 | + } |
|
| 331 | 331 | |
| 332 | - if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
|
|
| 333 | - switch ($_REQUEST['msg']) {
|
|
| 334 | - case 'success': |
|
| 335 | - echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
|
|
| 336 | - flush_rewrite_rules(false); |
|
| 332 | + if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
|
|
| 333 | + switch ($_REQUEST['msg']) {
|
|
| 334 | + case 'success': |
|
| 335 | + echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
|
|
| 336 | + flush_rewrite_rules(false); |
|
| 337 | 337 | |
| 338 | - break; |
|
| 338 | + break; |
|
| 339 | 339 | case 'fail': |
| 340 | 340 | $gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : ''; |
| 341 | 341 | |
| 342 | 342 | if ($gderr == 21) |
| 343 | - echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';
|
|
| 343 | + echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';
|
|
| 344 | 344 | else |
| 345 | 345 | echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
|
| 346 | - break; |
|
| 347 | - } |
|
| 348 | - } |
|
| 346 | + break; |
|
| 347 | + } |
|
| 348 | + } |
|
| 349 | 349 | |
| 350 | - $geodir_load_map = get_option('geodir_load_map');
|
|
| 351 | - $need_map_key = false; |
|
| 352 | - if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
|
|
| 353 | - $need_map_key = true; |
|
| 354 | - } |
|
| 350 | + $geodir_load_map = get_option('geodir_load_map');
|
|
| 351 | + $need_map_key = false; |
|
| 352 | + if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
|
|
| 353 | + $need_map_key = true; |
|
| 354 | + } |
|
| 355 | 355 | |
| 356 | - if (!geodir_get_map_api_key() && $need_map_key) {
|
|
| 357 | - echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 358 | - } |
|
| 356 | + if (!geodir_get_map_api_key() && $need_map_key) {
|
|
| 357 | + echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 358 | + } |
|
| 359 | 359 | |
| 360 | - if (!geodir_is_default_location_set()) {
|
|
| 361 | - echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 360 | + if (!geodir_is_default_location_set()) {
|
|
| 361 | + echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 362 | 362 | |
| 363 | - } |
|
| 363 | + } |
|
| 364 | 364 | |
| 365 | - if (!function_exists('curl_init')) {
|
|
| 366 | - echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';
|
|
| 365 | + if (!function_exists('curl_init')) {
|
|
| 366 | + echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';
|
|
| 367 | 367 | |
| 368 | - } |
|
| 368 | + } |
|
| 369 | 369 | |
| 370 | 370 | |
| 371 | 371 | |
@@ -382,19 +382,19 @@ discard block |
||
| 382 | 382 | */ |
| 383 | 383 | function geodir_handle_option_form_submit($current_tab) |
| 384 | 384 | {
|
| 385 | - global $geodir_settings; |
|
| 386 | - if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
|
|
| 387 | - /** |
|
| 388 | - * Contains settings array for current tab. |
|
| 389 | - * |
|
| 390 | - * @since 1.0.0 |
|
| 391 | - * @package GeoDirectory |
|
| 392 | - */ |
|
| 393 | - include_once('option-pages/' . $current_tab . '_array.php');
|
|
| 394 | - } |
|
| 395 | - if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') : |
|
| 396 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 397 | - if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 385 | + global $geodir_settings; |
|
| 386 | + if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
|
|
| 387 | + /** |
|
| 388 | + * Contains settings array for current tab. |
|
| 389 | + * |
|
| 390 | + * @since 1.0.0 |
|
| 391 | + * @package GeoDirectory |
|
| 392 | + */ |
|
| 393 | + include_once('option-pages/' . $current_tab . '_array.php');
|
|
| 394 | + } |
|
| 395 | + if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') : |
|
| 396 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 397 | + if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 398 | 398 | |
| 399 | 399 | /** |
| 400 | 400 | * Fires before updating geodirectory admin settings. |
@@ -406,38 +406,38 @@ discard block |
||
| 406 | 406 | */ |
| 407 | 407 | do_action('geodir_before_update_options', $current_tab, $geodir_settings);
|
| 408 | 408 | |
| 409 | - if (!empty($geodir_settings[$current_tab])) |
|
| 410 | - geodir_update_options($geodir_settings[$current_tab]); |
|
| 409 | + if (!empty($geodir_settings[$current_tab])) |
|
| 410 | + geodir_update_options($geodir_settings[$current_tab]); |
|
| 411 | 411 | |
| 412 | - /** |
|
| 413 | - * Called after GeoDirectory options settings are updated. |
|
| 414 | - * |
|
| 415 | - * @since 1.0.0 |
|
| 416 | - * @param array $geodir_settings The array of GeoDirectory settings. |
|
| 417 | - * @see 'geodir_before_update_options' |
|
| 418 | - */ |
|
| 419 | - do_action('geodir_update_options', $geodir_settings);
|
|
| 412 | + /** |
|
| 413 | + * Called after GeoDirectory options settings are updated. |
|
| 414 | + * |
|
| 415 | + * @since 1.0.0 |
|
| 416 | + * @param array $geodir_settings The array of GeoDirectory settings. |
|
| 417 | + * @see 'geodir_before_update_options' |
|
| 418 | + */ |
|
| 419 | + do_action('geodir_update_options', $geodir_settings);
|
|
| 420 | 420 | |
| 421 | - /** |
|
| 422 | - * Called after GeoDirectory options settings are updated. |
|
| 423 | - * |
|
| 424 | - * Provides tab specific settings. |
|
| 425 | - * |
|
| 426 | - * @since 1.0.0 |
|
| 427 | - * @param string $current_tab The current settings tab name. |
|
| 428 | - * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab. |
|
| 429 | - */ |
|
| 430 | - do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
|
|
| 421 | + /** |
|
| 422 | + * Called after GeoDirectory options settings are updated. |
|
| 423 | + * |
|
| 424 | + * Provides tab specific settings. |
|
| 425 | + * |
|
| 426 | + * @since 1.0.0 |
|
| 427 | + * @param string $current_tab The current settings tab name. |
|
| 428 | + * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab. |
|
| 429 | + */ |
|
| 430 | + do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
|
|
| 431 | 431 | |
| 432 | - flush_rewrite_rules(false); |
|
| 432 | + flush_rewrite_rules(false); |
|
| 433 | 433 | |
| 434 | - $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : ''; |
|
| 434 | + $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : ''; |
|
| 435 | 435 | |
| 436 | - $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');
|
|
| 436 | + $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');
|
|
| 437 | 437 | |
| 438 | - wp_redirect($redirect_url); |
|
| 439 | - exit(); |
|
| 440 | - endif; |
|
| 438 | + wp_redirect($redirect_url); |
|
| 439 | + exit(); |
|
| 440 | + endif; |
|
| 441 | 441 | |
| 442 | 442 | |
| 443 | 443 | } |
@@ -455,144 +455,144 @@ discard block |
||
| 455 | 455 | * @return bool Returns true if saved. |
| 456 | 456 | */ |
| 457 | 457 | function geodir_update_options($options, $dummy = false) {
|
| 458 | - if ((!isset($_POST) || !$_POST) && !$dummy) return false; |
|
| 458 | + if ((!isset($_POST) || !$_POST) && !$dummy) return false; |
|
| 459 | 459 | |
| 460 | - foreach ($options as $value) {
|
|
| 461 | - if ($dummy && isset($value['std'])) |
|
| 462 | - $_POST[$value['id']] = $value['std']; |
|
| 460 | + foreach ($options as $value) {
|
|
| 461 | + if ($dummy && isset($value['std'])) |
|
| 462 | + $_POST[$value['id']] = $value['std']; |
|
| 463 | 463 | |
| 464 | 464 | |
| 465 | - if (isset($value['type']) && $value['type'] == 'checkbox') : |
|
| 465 | + if (isset($value['type']) && $value['type'] == 'checkbox') : |
|
| 466 | 466 | |
| 467 | - if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 468 | - update_option($value['id'], $_POST[$value['id']]); |
|
| 469 | - } else {
|
|
| 470 | - update_option($value['id'], 0); |
|
| 471 | - } |
|
| 467 | + if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 468 | + update_option($value['id'], $_POST[$value['id']]); |
|
| 469 | + } else {
|
|
| 470 | + update_option($value['id'], 0); |
|
| 471 | + } |
|
| 472 | 472 | |
| 473 | - elseif (isset($value['type']) && $value['type'] == 'image_width') : |
|
| 473 | + elseif (isset($value['type']) && $value['type'] == 'image_width') : |
|
| 474 | 474 | |
| 475 | - if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
|
|
| 476 | - update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']); |
|
| 477 | - update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']); |
|
| 478 | - if (isset($_POST[$value['id'] . '_crop'])) : |
|
| 479 | - update_option($value['id'] . '_crop', 1); |
|
| 480 | - else : |
|
| 481 | - update_option($value['id'] . '_crop', 0); |
|
| 482 | - endif; |
|
| 483 | - } else {
|
|
| 484 | - update_option($value['id'] . '_width', $value['std']); |
|
| 485 | - update_option($value['id'] . '_height', $value['std']); |
|
| 486 | - update_option($value['id'] . '_crop', 1); |
|
| 487 | - } |
|
| 475 | + if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
|
|
| 476 | + update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']); |
|
| 477 | + update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']); |
|
| 478 | + if (isset($_POST[$value['id'] . '_crop'])) : |
|
| 479 | + update_option($value['id'] . '_crop', 1); |
|
| 480 | + else : |
|
| 481 | + update_option($value['id'] . '_crop', 0); |
|
| 482 | + endif; |
|
| 483 | + } else {
|
|
| 484 | + update_option($value['id'] . '_width', $value['std']); |
|
| 485 | + update_option($value['id'] . '_height', $value['std']); |
|
| 486 | + update_option($value['id'] . '_crop', 1); |
|
| 487 | + } |
|
| 488 | 488 | |
| 489 | - elseif (isset($value['type']) && $value['type'] == 'map') : |
|
| 490 | - $post_types = array(); |
|
| 491 | - $categories = array(); |
|
| 489 | + elseif (isset($value['type']) && $value['type'] == 'map') : |
|
| 490 | + $post_types = array(); |
|
| 491 | + $categories = array(); |
|
| 492 | 492 | |
| 493 | - if (!empty($_POST['home_map_post_types'])) : |
|
| 494 | - foreach ($_POST['home_map_post_types'] as $post_type) : |
|
| 495 | - $post_types[] = $post_type; |
|
| 496 | - endforeach; |
|
| 497 | - endif; |
|
| 493 | + if (!empty($_POST['home_map_post_types'])) : |
|
| 494 | + foreach ($_POST['home_map_post_types'] as $post_type) : |
|
| 495 | + $post_types[] = $post_type; |
|
| 496 | + endforeach; |
|
| 497 | + endif; |
|
| 498 | 498 | |
| 499 | - update_option('geodir_exclude_post_type_on_map', $post_types);
|
|
| 499 | + update_option('geodir_exclude_post_type_on_map', $post_types);
|
|
| 500 | 500 | |
| 501 | - if (!empty($_POST['post_category'])) : |
|
| 502 | - foreach ($_POST['post_category'] as $texonomy => $cat_arr) : |
|
| 503 | - $categories[$texonomy] = array(); |
|
| 504 | - foreach ($cat_arr as $category) : |
|
| 505 | - $categories[$texonomy][] = $category; |
|
| 506 | - endforeach; |
|
| 507 | - $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array(); |
|
| 508 | - endforeach; |
|
| 509 | - endif; |
|
| 510 | - update_option('geodir_exclude_cat_on_map', $categories);
|
|
| 511 | - update_option('geodir_exclude_cat_on_map_upgrade', 1);
|
|
| 512 | - elseif (isset($value['type']) && $value['type'] == 'map_default_settings') : |
|
| 501 | + if (!empty($_POST['post_category'])) : |
|
| 502 | + foreach ($_POST['post_category'] as $texonomy => $cat_arr) : |
|
| 503 | + $categories[$texonomy] = array(); |
|
| 504 | + foreach ($cat_arr as $category) : |
|
| 505 | + $categories[$texonomy][] = $category; |
|
| 506 | + endforeach; |
|
| 507 | + $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array(); |
|
| 508 | + endforeach; |
|
| 509 | + endif; |
|
| 510 | + update_option('geodir_exclude_cat_on_map', $categories);
|
|
| 511 | + update_option('geodir_exclude_cat_on_map_upgrade', 1);
|
|
| 512 | + elseif (isset($value['type']) && $value['type'] == 'map_default_settings') : |
|
| 513 | 513 | |
| 514 | 514 | |
| 515 | - if (!empty($_POST['geodir_default_map_language'])): |
|
| 516 | - update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);
|
|
| 517 | - endif; |
|
| 515 | + if (!empty($_POST['geodir_default_map_language'])): |
|
| 516 | + update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);
|
|
| 517 | + endif; |
|
| 518 | 518 | |
| 519 | 519 | |
| 520 | - if (!empty($_POST['geodir_default_map_search_pt'])): |
|
| 521 | - update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);
|
|
| 522 | - endif; |
|
| 520 | + if (!empty($_POST['geodir_default_map_search_pt'])): |
|
| 521 | + update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);
|
|
| 522 | + endif; |
|
| 523 | 523 | |
| 524 | 524 | |
| 525 | - elseif (isset($value['type']) && $value['type'] == 'file') : |
|
| 525 | + elseif (isset($value['type']) && $value['type'] == 'file') : |
|
| 526 | 526 | |
| 527 | 527 | |
| 528 | - if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file
|
|
| 528 | + if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file
|
|
| 529 | 529 | |
| 530 | - if (get_option($value['id'])) {
|
|
| 531 | - $image_name_arr = explode('/', get_option($value['id']));
|
|
| 532 | - $noimg_name = end($image_name_arr); |
|
| 533 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 534 | - if (file_exists($img_path)) |
|
| 535 | - unlink($img_path); |
|
| 536 | - } |
|
| 530 | + if (get_option($value['id'])) {
|
|
| 531 | + $image_name_arr = explode('/', get_option($value['id']));
|
|
| 532 | + $noimg_name = end($image_name_arr); |
|
| 533 | + $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 534 | + if (file_exists($img_path)) |
|
| 535 | + unlink($img_path); |
|
| 536 | + } |
|
| 537 | 537 | |
| 538 | - update_option($value['id'], ''); |
|
| 539 | - } |
|
| 538 | + update_option($value['id'], ''); |
|
| 539 | + } |
|
| 540 | 540 | |
| 541 | - $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : ''; |
|
| 542 | - $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : ''; |
|
| 543 | - |
|
| 544 | - if (!empty($filename)): |
|
| 545 | - $ext = pathinfo($filename, PATHINFO_EXTENSION); |
|
| 546 | - $uplaods = array(); |
|
| 547 | - |
|
| 548 | - foreach ($uploadedfile as $key => $uplaod): |
|
| 549 | - if ($key == 'name'): |
|
| 550 | - $uplaods[$key] = $filename; |
|
| 551 | - else : |
|
| 552 | - $uplaods[$key] = $uplaod; |
|
| 553 | - endif; |
|
| 554 | - endforeach; |
|
| 555 | - |
|
| 556 | - $uploads = wp_upload_dir(); |
|
| 557 | - |
|
| 558 | - if (get_option($value['id'])) {
|
|
| 559 | - $image_name_arr = explode('/', get_option($value['id']));
|
|
| 560 | - $noimg_name = end($image_name_arr); |
|
| 561 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 562 | - if (file_exists($img_path)) |
|
| 563 | - unlink($img_path); |
|
| 564 | - } |
|
| 541 | + $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : ''; |
|
| 542 | + $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : ''; |
|
| 543 | + |
|
| 544 | + if (!empty($filename)): |
|
| 545 | + $ext = pathinfo($filename, PATHINFO_EXTENSION); |
|
| 546 | + $uplaods = array(); |
|
| 547 | + |
|
| 548 | + foreach ($uploadedfile as $key => $uplaod): |
|
| 549 | + if ($key == 'name'): |
|
| 550 | + $uplaods[$key] = $filename; |
|
| 551 | + else : |
|
| 552 | + $uplaods[$key] = $uplaod; |
|
| 553 | + endif; |
|
| 554 | + endforeach; |
|
| 555 | + |
|
| 556 | + $uploads = wp_upload_dir(); |
|
| 557 | + |
|
| 558 | + if (get_option($value['id'])) {
|
|
| 559 | + $image_name_arr = explode('/', get_option($value['id']));
|
|
| 560 | + $noimg_name = end($image_name_arr); |
|
| 561 | + $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 562 | + if (file_exists($img_path)) |
|
| 563 | + unlink($img_path); |
|
| 564 | + } |
|
| 565 | 565 | |
| 566 | - $upload_overrides = array('test_form' => false);
|
|
| 567 | - $movefile = wp_handle_upload($uplaods, $upload_overrides); |
|
| 566 | + $upload_overrides = array('test_form' => false);
|
|
| 567 | + $movefile = wp_handle_upload($uplaods, $upload_overrides); |
|
| 568 | 568 | |
| 569 | - update_option($value['id'], $movefile['url']); |
|
| 569 | + update_option($value['id'], $movefile['url']); |
|
| 570 | 570 | |
| 571 | - endif; |
|
| 571 | + endif; |
|
| 572 | 572 | |
| 573 | - if (!get_option($value['id']) && isset($value['value'])): |
|
| 574 | - update_option($value['id'], $value['value']); |
|
| 575 | - endif; |
|
| 573 | + if (!get_option($value['id']) && isset($value['value'])): |
|
| 574 | + update_option($value['id'], $value['value']); |
|
| 575 | + endif; |
|
| 576 | 576 | |
| 577 | 577 | |
| 578 | - else : |
|
| 579 | - // same menu setting per theme. |
|
| 580 | - if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
|
|
| 581 | - $theme = wp_get_theme(); |
|
| 582 | - update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
|
|
| 583 | - } |
|
| 578 | + else : |
|
| 579 | + // same menu setting per theme. |
|
| 580 | + if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
|
|
| 581 | + $theme = wp_get_theme(); |
|
| 582 | + update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
|
|
| 583 | + } |
|
| 584 | 584 | |
| 585 | - if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 586 | - update_option($value['id'], $_POST[$value['id']]); |
|
| 587 | - } else {
|
|
| 588 | - delete_option($value['id']); |
|
| 589 | - } |
|
| 585 | + if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 586 | + update_option($value['id'], $_POST[$value['id']]); |
|
| 587 | + } else {
|
|
| 588 | + delete_option($value['id']); |
|
| 589 | + } |
|
| 590 | 590 | |
| 591 | - endif; |
|
| 592 | - } |
|
| 593 | - if ($dummy) |
|
| 594 | - $_POST = array(); |
|
| 595 | - return true; |
|
| 591 | + endif; |
|
| 592 | + } |
|
| 593 | + if ($dummy) |
|
| 594 | + $_POST = array(); |
|
| 595 | + return true; |
|
| 596 | 596 | |
| 597 | 597 | } |
| 598 | 598 | |
@@ -641,33 +641,33 @@ discard block |
||
| 641 | 641 | function places_custom_fields_tab($tabs) |
| 642 | 642 | {
|
| 643 | 643 | |
| 644 | - $geodir_post_types = get_option('geodir_post_types');
|
|
| 644 | + $geodir_post_types = get_option('geodir_post_types');
|
|
| 645 | 645 | |
| 646 | - if (!empty($geodir_post_types)) {
|
|
| 646 | + if (!empty($geodir_post_types)) {
|
|
| 647 | 647 | |
| 648 | - foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info): |
|
| 648 | + foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info): |
|
| 649 | 649 | |
| 650 | - $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory'); |
|
| 650 | + $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory'); |
|
| 651 | 651 | |
| 652 | - $tabs[$geodir_post_type . '_fields_settings'] = array( |
|
| 653 | - 'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),
|
|
| 654 | - 'subtabs' => array( |
|
| 655 | - array('subtab' => 'custom_fields',
|
|
| 656 | - 'label' => __('Custom Fields', 'geodirectory'),
|
|
| 657 | - 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 658 | - array('subtab' => 'sorting_options',
|
|
| 659 | - 'label' => __('Sorting Options', 'geodirectory'),
|
|
| 660 | - 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 661 | - ), |
|
| 662 | - 'tab_index' => 9, |
|
| 663 | - 'request' => array('listing_type' => $geodir_post_type)
|
|
| 664 | - ); |
|
| 652 | + $tabs[$geodir_post_type . '_fields_settings'] = array( |
|
| 653 | + 'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),
|
|
| 654 | + 'subtabs' => array( |
|
| 655 | + array('subtab' => 'custom_fields',
|
|
| 656 | + 'label' => __('Custom Fields', 'geodirectory'),
|
|
| 657 | + 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 658 | + array('subtab' => 'sorting_options',
|
|
| 659 | + 'label' => __('Sorting Options', 'geodirectory'),
|
|
| 660 | + 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 661 | + ), |
|
| 662 | + 'tab_index' => 9, |
|
| 663 | + 'request' => array('listing_type' => $geodir_post_type)
|
|
| 664 | + ); |
|
| 665 | 665 | |
| 666 | - endforeach; |
|
| 666 | + endforeach; |
|
| 667 | 667 | |
| 668 | - } |
|
| 668 | + } |
|
| 669 | 669 | |
| 670 | - return $tabs; |
|
| 670 | + return $tabs; |
|
| 671 | 671 | } |
| 672 | 672 | |
| 673 | 673 | |
@@ -683,9 +683,9 @@ discard block |
||
| 683 | 683 | */ |
| 684 | 684 | function geodir_tools_setting_tab($tabs) |
| 685 | 685 | {
|
| 686 | - wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
| 687 | - $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
|
|
| 688 | - return $tabs; |
|
| 686 | + wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
| 687 | + $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
|
|
| 688 | + return $tabs; |
|
| 689 | 689 | } |
| 690 | 690 | |
| 691 | 691 | /** |
@@ -700,8 +700,8 @@ discard block |
||
| 700 | 700 | */ |
| 701 | 701 | function geodir_compatibility_setting_tab($tabs) |
| 702 | 702 | {
|
| 703 | - $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));
|
|
| 704 | - return $tabs; |
|
| 703 | + $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));
|
|
| 704 | + return $tabs; |
|
| 705 | 705 | } |
| 706 | 706 | |
| 707 | 707 | |
@@ -717,144 +717,144 @@ discard block |
||
| 717 | 717 | */ |
| 718 | 718 | function geodir_extend_geodirectory_setting_tab($tabs) |
| 719 | 719 | {
|
| 720 | - $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
| 721 | - return $tabs; |
|
| 720 | + $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
| 721 | + return $tabs; |
|
| 722 | 722 | } |
| 723 | 723 | |
| 724 | 724 | |
| 725 | 725 | if (!function_exists('geodir_edit_post_columns')) {
|
| 726 | - /** |
|
| 727 | - * Modify admin post listing page columns. |
|
| 728 | - * |
|
| 729 | - * @since 1.0.0 |
|
| 730 | - * @package GeoDirectory |
|
| 731 | - * @param array $columns The column array. |
|
| 732 | - * @return array Altered column array. |
|
| 733 | - */ |
|
| 734 | - function geodir_edit_post_columns($columns) |
|
| 735 | - {
|
|
| 736 | - |
|
| 737 | - $new_columns = array('location' => __('Location (ID)', 'geodirectory'),
|
|
| 738 | - 'categorys' => __('Categories', 'geodirectory'));
|
|
| 739 | - |
|
| 740 | - if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist
|
|
| 741 | - {
|
|
| 742 | - $offset = 0; // should we prepend $array with $data? |
|
| 743 | - $offset = count($columns); // or should we append $array with $data? lets pick this one... |
|
| 744 | - } |
|
| 726 | + /** |
|
| 727 | + * Modify admin post listing page columns. |
|
| 728 | + * |
|
| 729 | + * @since 1.0.0 |
|
| 730 | + * @package GeoDirectory |
|
| 731 | + * @param array $columns The column array. |
|
| 732 | + * @return array Altered column array. |
|
| 733 | + */ |
|
| 734 | + function geodir_edit_post_columns($columns) |
|
| 735 | + {
|
|
| 745 | 736 | |
| 746 | - $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset)); |
|
| 737 | + $new_columns = array('location' => __('Location (ID)', 'geodirectory'),
|
|
| 738 | + 'categorys' => __('Categories', 'geodirectory'));
|
|
| 747 | 739 | |
| 748 | - $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));
|
|
| 740 | + if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist
|
|
| 741 | + {
|
|
| 742 | + $offset = 0; // should we prepend $array with $data? |
|
| 743 | + $offset = count($columns); // or should we append $array with $data? lets pick this one... |
|
| 744 | + } |
|
| 749 | 745 | |
| 750 | - return $columns; |
|
| 751 | - } |
|
| 746 | + $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset)); |
|
| 747 | + |
|
| 748 | + $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));
|
|
| 749 | + |
|
| 750 | + return $columns; |
|
| 751 | + } |
|
| 752 | 752 | } |
| 753 | 753 | |
| 754 | 754 | |
| 755 | 755 | if (!function_exists('geodir_manage_post_columns')) {
|
| 756 | - /** |
|
| 757 | - * Adds content to our custom post listing page columns. |
|
| 758 | - * |
|
| 759 | - * @since 1.0.0 |
|
| 760 | - * @package GeoDirectory |
|
| 761 | - * @global object $wpdb WordPress Database object. |
|
| 762 | - * @global object $post WordPress Post object. |
|
| 763 | - * @param string $column The column name. |
|
| 764 | - * @param int $post_id The post ID. |
|
| 765 | - */ |
|
| 766 | - function geodir_manage_post_columns($column, $post_id) |
|
| 767 | - {
|
|
| 768 | - global $post, $wpdb; |
|
| 769 | - |
|
| 770 | - switch ($column): |
|
| 771 | - /* If displaying the 'city' column. */ |
|
| 772 | - case 'location' : |
|
| 773 | - $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true); |
|
| 774 | - $location = geodir_get_location($location_id); |
|
| 775 | - /* If no city is found, output a default message. */ |
|
| 776 | - if (empty($location)) {
|
|
| 777 | - _e('Unknown', 'geodirectory');
|
|
| 778 | - } else {
|
|
| 779 | - /* If there is a city id, append 'city name' to the text string. */ |
|
| 780 | - $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';
|
|
| 781 | - echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id); |
|
| 782 | - } |
|
| 783 | - break; |
|
| 784 | - |
|
| 785 | - /* If displaying the 'expire' column. */ |
|
| 786 | - case 'expire' : |
|
| 787 | - $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true); |
|
| 788 | - $d1 = $expire_date; // get expire_date |
|
| 789 | - $d2 = date('Y-m-d'); // get current date
|
|
| 790 | - $state = __('days left', 'geodirectory');
|
|
| 791 | - $date_diff_text = ''; |
|
| 792 | - $expire_class = 'expire_left'; |
|
| 793 | - if ($expire_date != 'Never') {
|
|
| 794 | - if (strtotime($d1) < strtotime($d2)) {
|
|
| 795 | - $state = __('days overdue', 'geodirectory');
|
|
| 796 | - $expire_class = 'expire_over'; |
|
| 797 | - } |
|
| 798 | - $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days |
|
| 799 | - $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
|
|
| 800 | - } |
|
| 801 | - /* If no expire_date is found, output a default message. */ |
|
| 802 | - if (empty($expire_date)) |
|
| 803 | - echo __('Unknown', 'geodirectory');
|
|
| 804 | - /* If there is a expire_date, append 'days left' to the text string. */ |
|
| 805 | - else |
|
| 806 | - echo $expire_date . $date_diff_text; |
|
| 807 | - break; |
|
| 808 | - |
|
| 809 | - /* If displaying the 'categorys' column. */ |
|
| 810 | - case 'categorys' : |
|
| 811 | - |
|
| 812 | - /* Get the categorys for the post. */ |
|
| 813 | - |
|
| 814 | - |
|
| 815 | - $terms = wp_get_object_terms($post_id, get_object_taxonomies($post)); |
|
| 816 | - |
|
| 817 | - /* If terms were found. */ |
|
| 818 | - if (!empty($terms)) {
|
|
| 819 | - $out = array(); |
|
| 820 | - /* Loop through each term, linking to the 'edit posts' page for the specific term. */ |
|
| 821 | - foreach ($terms as $term) {
|
|
| 822 | - if (!strstr($term->taxonomy, 'tag')) {
|
|
| 823 | - $out[] = sprintf('<a href="%s">%s</a>',
|
|
| 824 | - esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),
|
|
| 825 | - esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))
|
|
| 826 | - ); |
|
| 827 | - } |
|
| 828 | - } |
|
| 829 | - /* Join the terms, separating them with a comma. */ |
|
| 830 | - echo(join(', ', $out));
|
|
| 831 | - } /* If no terms were found, output a default message. */ |
|
| 832 | - else {
|
|
| 833 | - _e('No Categories', 'geodirectory');
|
|
| 834 | - } |
|
| 835 | - break; |
|
| 756 | + /** |
|
| 757 | + * Adds content to our custom post listing page columns. |
|
| 758 | + * |
|
| 759 | + * @since 1.0.0 |
|
| 760 | + * @package GeoDirectory |
|
| 761 | + * @global object $wpdb WordPress Database object. |
|
| 762 | + * @global object $post WordPress Post object. |
|
| 763 | + * @param string $column The column name. |
|
| 764 | + * @param int $post_id The post ID. |
|
| 765 | + */ |
|
| 766 | + function geodir_manage_post_columns($column, $post_id) |
|
| 767 | + {
|
|
| 768 | + global $post, $wpdb; |
|
| 769 | + |
|
| 770 | + switch ($column): |
|
| 771 | + /* If displaying the 'city' column. */ |
|
| 772 | + case 'location' : |
|
| 773 | + $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true); |
|
| 774 | + $location = geodir_get_location($location_id); |
|
| 775 | + /* If no city is found, output a default message. */ |
|
| 776 | + if (empty($location)) {
|
|
| 777 | + _e('Unknown', 'geodirectory');
|
|
| 778 | + } else {
|
|
| 779 | + /* If there is a city id, append 'city name' to the text string. */ |
|
| 780 | + $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';
|
|
| 781 | + echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id); |
|
| 782 | + } |
|
| 783 | + break; |
|
| 784 | + |
|
| 785 | + /* If displaying the 'expire' column. */ |
|
| 786 | + case 'expire' : |
|
| 787 | + $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true); |
|
| 788 | + $d1 = $expire_date; // get expire_date |
|
| 789 | + $d2 = date('Y-m-d'); // get current date
|
|
| 790 | + $state = __('days left', 'geodirectory');
|
|
| 791 | + $date_diff_text = ''; |
|
| 792 | + $expire_class = 'expire_left'; |
|
| 793 | + if ($expire_date != 'Never') {
|
|
| 794 | + if (strtotime($d1) < strtotime($d2)) {
|
|
| 795 | + $state = __('days overdue', 'geodirectory');
|
|
| 796 | + $expire_class = 'expire_over'; |
|
| 797 | + } |
|
| 798 | + $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days |
|
| 799 | + $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
|
|
| 800 | + } |
|
| 801 | + /* If no expire_date is found, output a default message. */ |
|
| 802 | + if (empty($expire_date)) |
|
| 803 | + echo __('Unknown', 'geodirectory');
|
|
| 804 | + /* If there is a expire_date, append 'days left' to the text string. */ |
|
| 805 | + else |
|
| 806 | + echo $expire_date . $date_diff_text; |
|
| 807 | + break; |
|
| 836 | 808 | |
| 837 | - endswitch; |
|
| 838 | - } |
|
| 809 | + /* If displaying the 'categorys' column. */ |
|
| 810 | + case 'categorys' : |
|
| 811 | + |
|
| 812 | + /* Get the categorys for the post. */ |
|
| 813 | + |
|
| 814 | + |
|
| 815 | + $terms = wp_get_object_terms($post_id, get_object_taxonomies($post)); |
|
| 816 | + |
|
| 817 | + /* If terms were found. */ |
|
| 818 | + if (!empty($terms)) {
|
|
| 819 | + $out = array(); |
|
| 820 | + /* Loop through each term, linking to the 'edit posts' page for the specific term. */ |
|
| 821 | + foreach ($terms as $term) {
|
|
| 822 | + if (!strstr($term->taxonomy, 'tag')) {
|
|
| 823 | + $out[] = sprintf('<a href="%s">%s</a>',
|
|
| 824 | + esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),
|
|
| 825 | + esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))
|
|
| 826 | + ); |
|
| 827 | + } |
|
| 828 | + } |
|
| 829 | + /* Join the terms, separating them with a comma. */ |
|
| 830 | + echo(join(', ', $out));
|
|
| 831 | + } /* If no terms were found, output a default message. */ |
|
| 832 | + else {
|
|
| 833 | + _e('No Categories', 'geodirectory');
|
|
| 834 | + } |
|
| 835 | + break; |
|
| 836 | + |
|
| 837 | + endswitch; |
|
| 838 | + } |
|
| 839 | 839 | } |
| 840 | 840 | |
| 841 | 841 | |
| 842 | 842 | if (!function_exists('geodir_post_sortable_columns')) {
|
| 843 | - /** |
|
| 844 | - * Makes admin post listing page columns sortable. |
|
| 845 | - * |
|
| 846 | - * @since 1.0.0 |
|
| 847 | - * @package GeoDirectory |
|
| 848 | - * @param array $columns The column array. |
|
| 849 | - * @return array Altered column array. |
|
| 850 | - */ |
|
| 851 | - function geodir_post_sortable_columns($columns) |
|
| 852 | - {
|
|
| 853 | - |
|
| 854 | - $columns['expire'] = 'expire'; |
|
| 855 | - |
|
| 856 | - return $columns; |
|
| 857 | - } |
|
| 843 | + /** |
|
| 844 | + * Makes admin post listing page columns sortable. |
|
| 845 | + * |
|
| 846 | + * @since 1.0.0 |
|
| 847 | + * @package GeoDirectory |
|
| 848 | + * @param array $columns The column array. |
|
| 849 | + * @return array Altered column array. |
|
| 850 | + */ |
|
| 851 | + function geodir_post_sortable_columns($columns) |
|
| 852 | + {
|
|
| 853 | + |
|
| 854 | + $columns['expire'] = 'expire'; |
|
| 855 | + |
|
| 856 | + return $columns; |
|
| 857 | + } |
|
| 858 | 858 | } |
| 859 | 859 | |
| 860 | 860 | /** |
@@ -868,32 +868,32 @@ discard block |
||
| 868 | 868 | * @param int $post_id The post ID. |
| 869 | 869 | */ |
| 870 | 870 | function geodir_post_information_save($post_id, $post) {
|
| 871 | - global $wpdb, $current_user; |
|
| 871 | + global $wpdb, $current_user; |
|
| 872 | 872 | |
| 873 | - if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {
|
|
| 874 | - return; |
|
| 875 | - } |
|
| 873 | + if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {
|
|
| 874 | + return; |
|
| 875 | + } |
|
| 876 | 876 | |
| 877 | - $geodir_posttypes = geodir_get_posttypes(); |
|
| 877 | + $geodir_posttypes = geodir_get_posttypes(); |
|
| 878 | 878 | |
| 879 | - if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
|
|
| 880 | - return; |
|
| 879 | + if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
|
|
| 880 | + return; |
|
| 881 | 881 | |
| 882 | - if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {
|
|
| 883 | - if (isset($_REQUEST['_status'])) |
|
| 884 | - geodir_change_post_status($post_id, $_REQUEST['_status']); |
|
| 882 | + if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {
|
|
| 883 | + if (isset($_REQUEST['_status'])) |
|
| 884 | + geodir_change_post_status($post_id, $_REQUEST['_status']); |
|
| 885 | 885 | |
| 886 | - if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) |
|
| 887 | - return; |
|
| 886 | + if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) |
|
| 887 | + return; |
|
| 888 | 888 | |
| 889 | - if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) |
|
| 890 | - return; |
|
| 889 | + if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) |
|
| 890 | + return; |
|
| 891 | 891 | |
| 892 | - if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) |
|
| 893 | - return; |
|
| 892 | + if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) |
|
| 893 | + return; |
|
| 894 | 894 | |
| 895 | - geodir_save_listing($_REQUEST); |
|
| 896 | - } |
|
| 895 | + geodir_save_listing($_REQUEST); |
|
| 896 | + } |
|
| 897 | 897 | } |
| 898 | 898 | |
| 899 | 899 | /** |
@@ -909,102 +909,102 @@ discard block |
||
| 909 | 909 | */ |
| 910 | 910 | function geodir_admin_fields($options) |
| 911 | 911 | {
|
| 912 | - global $geodirectory; |
|
| 913 | - |
|
| 914 | - $first_title = true; |
|
| 915 | - $tab_id = ''; |
|
| 916 | - $i = 0; |
|
| 917 | - foreach ($options as $value) : |
|
| 918 | - if (!isset($value['name'])) $value['name'] = ''; |
|
| 919 | - if (!isset($value['class'])) $value['class'] = ''; |
|
| 920 | - if (!isset($value['css'])) $value['css'] = ''; |
|
| 921 | - if (!isset($value['std'])) $value['std'] = ''; |
|
| 922 | - $desc = ''; |
|
| 923 | - switch ($value['type']) : |
|
| 924 | - case 'dummy_installer': |
|
| 925 | - $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place'; |
|
| 926 | - geodir_autoinstall_admin_header($post_type); |
|
| 927 | - break; |
|
| 928 | - case 'title': |
|
| 929 | - |
|
| 930 | - if ($i == 0) {
|
|
| 931 | - echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>'; |
|
| 932 | - echo '<div class="inner_content_tab_main">'; |
|
| 933 | - } |
|
| 912 | + global $geodirectory; |
|
| 913 | + |
|
| 914 | + $first_title = true; |
|
| 915 | + $tab_id = ''; |
|
| 916 | + $i = 0; |
|
| 917 | + foreach ($options as $value) : |
|
| 918 | + if (!isset($value['name'])) $value['name'] = ''; |
|
| 919 | + if (!isset($value['class'])) $value['class'] = ''; |
|
| 920 | + if (!isset($value['css'])) $value['css'] = ''; |
|
| 921 | + if (!isset($value['std'])) $value['std'] = ''; |
|
| 922 | + $desc = ''; |
|
| 923 | + switch ($value['type']) : |
|
| 924 | + case 'dummy_installer': |
|
| 925 | + $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place'; |
|
| 926 | + geodir_autoinstall_admin_header($post_type); |
|
| 927 | + break; |
|
| 928 | + case 'title': |
|
| 929 | + |
|
| 930 | + if ($i == 0) {
|
|
| 931 | + echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>'; |
|
| 932 | + echo '<div class="inner_content_tab_main">'; |
|
| 933 | + } |
|
| 934 | 934 | |
| 935 | - $i++; |
|
| 935 | + $i++; |
|
| 936 | 936 | |
| 937 | - if (isset($value['id']) && $value['id']) |
|
| 938 | - $tab_id = $value['id']; |
|
| 937 | + if (isset($value['id']) && $value['id']) |
|
| 938 | + $tab_id = $value['id']; |
|
| 939 | 939 | |
| 940 | - if (isset($value['desc']) && $value['desc']) |
|
| 941 | - $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
| 940 | + if (isset($value['desc']) && $value['desc']) |
|
| 941 | + $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
| 942 | 942 | |
| 943 | - if (isset($value['name']) && $value['name']) {
|
|
| 944 | - if ($first_title === true) {
|
|
| 945 | - $first_title = false; |
|
| 946 | - } else {
|
|
| 947 | - echo '</div>'; |
|
| 948 | - } |
|
| 949 | - echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>'; |
|
| 943 | + if (isset($value['name']) && $value['name']) {
|
|
| 944 | + if ($first_title === true) {
|
|
| 945 | + $first_title = false; |
|
| 946 | + } else {
|
|
| 947 | + echo '</div>'; |
|
| 948 | + } |
|
| 949 | + echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>'; |
|
| 950 | 950 | |
| 951 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 952 | - } |
|
| 951 | + echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 952 | + } |
|
| 953 | 953 | |
| 954 | - /** |
|
| 955 | - * Called after a GeoDirectory settings title is output in the GD settings page. |
|
| 956 | - * |
|
| 957 | - * The action is called dynamically geodir_settings_$value['id']. |
|
| 958 | - * |
|
| 959 | - * @since 1.0.0 |
|
| 960 | - */ |
|
| 961 | - do_action('geodir_settings_' . sanitize_title($value['id']));
|
|
| 962 | - break; |
|
| 963 | - |
|
| 964 | - case 'no_tabs': |
|
| 965 | - |
|
| 966 | - echo '<div class="inner_content_tab_main">'; |
|
| 967 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 968 | - |
|
| 969 | - break; |
|
| 970 | - |
|
| 971 | - case 'sectionstart': |
|
| 972 | - if (isset($value['desc']) && $value['desc']) |
|
| 973 | - $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
| 974 | - if (isset($value['name']) && $value['name']) |
|
| 975 | - echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
| 976 | - /** |
|
| 977 | - * Called after a GeoDirectory settings sectionstart is output in the GD settings page. |
|
| 978 | - * |
|
| 979 | - * The action is called dynamically geodir_settings_$value['id']_start. |
|
| 980 | - * |
|
| 981 | - * @since 1.0.0 |
|
| 982 | - */ |
|
| 983 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
|
|
| 984 | - echo '<table class="form-table">' . "\n\n"; |
|
| 985 | - |
|
| 986 | - break; |
|
| 987 | - case 'sectionend': |
|
| 988 | - /** |
|
| 989 | - * Called before a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 990 | - * |
|
| 991 | - * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 992 | - * |
|
| 993 | - * @since 1.0.0 |
|
| 994 | - */ |
|
| 995 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
|
|
| 996 | - echo '</table>'; |
|
| 997 | - /** |
|
| 998 | - * Called after a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 999 | - * |
|
| 1000 | - * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 1001 | - * |
|
| 1002 | - * @since 1.0.0 |
|
| 1003 | - */ |
|
| 1004 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
|
|
| 1005 | - break; |
|
| 1006 | - case 'text': |
|
| 1007 | - ?> |
|
| 954 | + /** |
|
| 955 | + * Called after a GeoDirectory settings title is output in the GD settings page. |
|
| 956 | + * |
|
| 957 | + * The action is called dynamically geodir_settings_$value['id']. |
|
| 958 | + * |
|
| 959 | + * @since 1.0.0 |
|
| 960 | + */ |
|
| 961 | + do_action('geodir_settings_' . sanitize_title($value['id']));
|
|
| 962 | + break; |
|
| 963 | + |
|
| 964 | + case 'no_tabs': |
|
| 965 | + |
|
| 966 | + echo '<div class="inner_content_tab_main">'; |
|
| 967 | + echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 968 | + |
|
| 969 | + break; |
|
| 970 | + |
|
| 971 | + case 'sectionstart': |
|
| 972 | + if (isset($value['desc']) && $value['desc']) |
|
| 973 | + $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
| 974 | + if (isset($value['name']) && $value['name']) |
|
| 975 | + echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
| 976 | + /** |
|
| 977 | + * Called after a GeoDirectory settings sectionstart is output in the GD settings page. |
|
| 978 | + * |
|
| 979 | + * The action is called dynamically geodir_settings_$value['id']_start. |
|
| 980 | + * |
|
| 981 | + * @since 1.0.0 |
|
| 982 | + */ |
|
| 983 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
|
|
| 984 | + echo '<table class="form-table">' . "\n\n"; |
|
| 985 | + |
|
| 986 | + break; |
|
| 987 | + case 'sectionend': |
|
| 988 | + /** |
|
| 989 | + * Called before a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 990 | + * |
|
| 991 | + * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 992 | + * |
|
| 993 | + * @since 1.0.0 |
|
| 994 | + */ |
|
| 995 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
|
|
| 996 | + echo '</table>'; |
|
| 997 | + /** |
|
| 998 | + * Called after a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 999 | + * |
|
| 1000 | + * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 1001 | + * |
|
| 1002 | + * @since 1.0.0 |
|
| 1003 | + */ |
|
| 1004 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
|
|
| 1005 | + break; |
|
| 1006 | + case 'text': |
|
| 1007 | + ?> |
|
| 1008 | 1008 | <tr valign="top"> |
| 1009 | 1009 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1010 | 1010 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1013,15 +1013,15 @@ discard block |
||
| 1013 | 1013 | <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
| 1014 | 1014 | style=" <?php echo esc_attr($value['css']); ?>" |
| 1015 | 1015 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1016 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1017 | - } else {
|
|
| 1018 | - echo esc_attr($value['std']); |
|
| 1019 | - } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1016 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1017 | + } else {
|
|
| 1018 | + echo esc_attr($value['std']); |
|
| 1019 | + } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1020 | 1020 | </tr><?php |
| 1021 | - break; |
|
| 1021 | + break; |
|
| 1022 | 1022 | |
| 1023 | - case 'map-key': |
|
| 1024 | - ?> |
|
| 1023 | + case 'map-key': |
|
| 1024 | + ?> |
|
| 1025 | 1025 | <tr valign="top"> |
| 1026 | 1026 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1027 | 1027 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1030,18 +1030,18 @@ discard block |
||
| 1030 | 1030 | <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
| 1031 | 1031 | style=" <?php echo esc_attr($value['css']); ?>" |
| 1032 | 1032 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1033 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1034 | - } else {
|
|
| 1035 | - echo esc_attr($value['std']); |
|
| 1036 | - } ?>"/> |
|
| 1033 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1034 | + } else {
|
|
| 1035 | + echo esc_attr($value['std']); |
|
| 1036 | + } ?>"/> |
|
| 1037 | 1037 | <?php $gm_api_url = 'https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]';?> |
| 1038 | 1038 | <a id="gd-api-key" onclick='window.open("<?php echo wp_slash($gm_api_url);?>", "newwindow", "width=600, height=400"); return false;' href='<?php echo $gm_api_url;?>' class="button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )','geodirectory');?>" ><?php _e('Generate API Key','geodirectory');?></a>
|
| 1039 | 1039 | <span class="description"><?php echo $value['desc']; ?></span></td> |
| 1040 | 1040 | </tr><?php |
| 1041 | - break; |
|
| 1041 | + break; |
|
| 1042 | 1042 | |
| 1043 | - case 'password': |
|
| 1044 | - ?> |
|
| 1043 | + case 'password': |
|
| 1044 | + ?> |
|
| 1045 | 1045 | <tr valign="top"> |
| 1046 | 1046 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1047 | 1047 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1050,42 +1050,42 @@ discard block |
||
| 1050 | 1050 | <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
| 1051 | 1051 | style="<?php echo esc_attr($value['css']); ?>" |
| 1052 | 1052 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1053 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1054 | - } else {
|
|
| 1055 | - echo esc_attr($value['std']); |
|
| 1056 | - } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1053 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1054 | + } else {
|
|
| 1055 | + echo esc_attr($value['std']); |
|
| 1056 | + } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1057 | 1057 | </tr><?php |
| 1058 | - break; |
|
| 1058 | + break; |
|
| 1059 | 1059 | |
| 1060 | - case 'html_content': |
|
| 1061 | - ?> |
|
| 1060 | + case 'html_content': |
|
| 1061 | + ?> |
|
| 1062 | 1062 | <tr valign="top"> |
| 1063 | 1063 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1064 | 1064 | <td class="forminp"><span class="description"><?php echo $value['desc']; ?></span></td> |
| 1065 | 1065 | </tr><?php |
| 1066 | - break; |
|
| 1066 | + break; |
|
| 1067 | 1067 | |
| 1068 | - case 'color' : |
|
| 1069 | - ?> |
|
| 1068 | + case 'color' : |
|
| 1069 | + ?> |
|
| 1070 | 1070 | <tr valign="top"> |
| 1071 | 1071 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1072 | 1072 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
| 1073 | 1073 | id="<?php echo esc_attr($value['id']); ?>" type="text" |
| 1074 | 1074 | style="<?php echo esc_attr($value['css']); ?>" |
| 1075 | 1075 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1076 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1077 | - } else {
|
|
| 1078 | - echo esc_attr($value['std']); |
|
| 1079 | - } ?>" class="colorpick"/> <span |
|
| 1076 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1077 | + } else {
|
|
| 1078 | + echo esc_attr($value['std']); |
|
| 1079 | + } ?>" class="colorpick"/> <span |
|
| 1080 | 1080 | class="description"><?php echo $value['desc']; ?></span> |
| 1081 | 1081 | |
| 1082 | 1082 | <div id="colorPickerDiv_<?php echo esc_attr($value['id']); ?>" class="colorpickdiv" |
| 1083 | 1083 | style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"></div> |
| 1084 | 1084 | </td> |
| 1085 | 1085 | </tr><?php |
| 1086 | - break; |
|
| 1087 | - case 'image_width' : |
|
| 1088 | - ?> |
|
| 1086 | + break; |
|
| 1087 | + case 'image_width' : |
|
| 1088 | + ?> |
|
| 1089 | 1089 | <tr valign="top"> |
| 1090 | 1090 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1091 | 1091 | <td class="forminp"> |
@@ -1107,11 +1107,11 @@ discard block |
||
| 1107 | 1107 | |
| 1108 | 1108 | <span class="description"><?php echo $value['desc'] ?></span></td> |
| 1109 | 1109 | </tr><?php |
| 1110 | - break; |
|
| 1111 | - case 'select': |
|
| 1112 | - $option_value = get_option($value['id']); |
|
| 1113 | - $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value; |
|
| 1114 | - ?> |
|
| 1110 | + break; |
|
| 1111 | + case 'select': |
|
| 1112 | + $option_value = get_option($value['id']); |
|
| 1113 | + $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value; |
|
| 1114 | + ?> |
|
| 1115 | 1115 | <tr valign="top"> |
| 1116 | 1116 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1117 | 1117 | <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>" |
@@ -1120,33 +1120,33 @@ discard block |
||
| 1120 | 1120 | class="<?php if (isset($value['class'])) echo $value['class']; ?>" |
| 1121 | 1121 | option-ajaxchosen="false"> |
| 1122 | 1122 | <?php |
| 1123 | - foreach ($value['options'] as $key => $val) {
|
|
| 1124 | - $geodir_select_value = ''; |
|
| 1125 | - if ($option_value != '') {
|
|
| 1126 | - if ($option_value != '' && $option_value == $key) |
|
| 1127 | - $geodir_select_value = ' selected="selected" '; |
|
| 1128 | - } else {
|
|
| 1129 | - if ($value['std'] == $key) |
|
| 1130 | - $geodir_select_value = ' selected="selected" '; |
|
| 1131 | - } |
|
| 1132 | - ?> |
|
| 1123 | + foreach ($value['options'] as $key => $val) {
|
|
| 1124 | + $geodir_select_value = ''; |
|
| 1125 | + if ($option_value != '') {
|
|
| 1126 | + if ($option_value != '' && $option_value == $key) |
|
| 1127 | + $geodir_select_value = ' selected="selected" '; |
|
| 1128 | + } else {
|
|
| 1129 | + if ($value['std'] == $key) |
|
| 1130 | + $geodir_select_value = ' selected="selected" '; |
|
| 1131 | + } |
|
| 1132 | + ?> |
|
| 1133 | 1133 | <option |
| 1134 | 1134 | value="<?php echo esc_attr($key); ?>" <?php echo $geodir_select_value; ?> ><?php echo geodir_utf8_ucfirst($val) ?></option> |
| 1135 | 1135 | <?php |
| 1136 | - } |
|
| 1137 | - ?> |
|
| 1136 | + } |
|
| 1137 | + ?> |
|
| 1138 | 1138 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
| 1139 | 1139 | </td> |
| 1140 | 1140 | </tr><?php |
| 1141 | - break; |
|
| 1141 | + break; |
|
| 1142 | 1142 | |
| 1143 | - case 'multiselect': |
|
| 1144 | - $option_values = get_option($value['id']); |
|
| 1145 | - if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {
|
|
| 1146 | - $option_values = $value['std']; |
|
| 1147 | - } |
|
| 1148 | - $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values; |
|
| 1149 | - ?> |
|
| 1143 | + case 'multiselect': |
|
| 1144 | + $option_values = get_option($value['id']); |
|
| 1145 | + if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {
|
|
| 1146 | + $option_values = $value['std']; |
|
| 1147 | + } |
|
| 1148 | + $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values; |
|
| 1149 | + ?> |
|
| 1150 | 1150 | <tr valign="top"> |
| 1151 | 1151 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1152 | 1152 | <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]" |
@@ -1156,26 +1156,26 @@ discard block |
||
| 1156 | 1156 | data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>" |
| 1157 | 1157 | option-ajaxchosen="false"> |
| 1158 | 1158 | <?php |
| 1159 | - foreach ($value['options'] as $key => $val) {
|
|
| 1160 | - if (strpos($key, 'optgroup_start-') === 0) {
|
|
| 1161 | - ?><optgroup label="<?php echo geodir_utf8_ucfirst($val); ?>"><?php |
|
| 1162 | - } else if (strpos($key, 'optgroup_end-') === 0) {
|
|
| 1163 | - ?></optgroup><?php |
|
| 1164 | - } else {
|
|
| 1165 | - ?> |
|
| 1159 | + foreach ($value['options'] as $key => $val) {
|
|
| 1160 | + if (strpos($key, 'optgroup_start-') === 0) {
|
|
| 1161 | + ?><optgroup label="<?php echo geodir_utf8_ucfirst($val); ?>"><?php |
|
| 1162 | + } else if (strpos($key, 'optgroup_end-') === 0) {
|
|
| 1163 | + ?></optgroup><?php |
|
| 1164 | + } else {
|
|
| 1165 | + ?> |
|
| 1166 | 1166 | <option value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>> |
| 1167 | 1167 | <?php echo geodir_utf8_ucfirst($val) ?> |
| 1168 | 1168 | </option> |
| 1169 | 1169 | <?php |
| 1170 | - } |
|
| 1171 | - } |
|
| 1172 | - ?> |
|
| 1170 | + } |
|
| 1171 | + } |
|
| 1172 | + ?> |
|
| 1173 | 1173 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
| 1174 | 1174 | </td> |
| 1175 | 1175 | </tr><?php |
| 1176 | - break; |
|
| 1177 | - case 'file': |
|
| 1178 | - ?> |
|
| 1176 | + break; |
|
| 1177 | + case 'file': |
|
| 1178 | + ?> |
|
| 1179 | 1179 | <tr valign="top"> |
| 1180 | 1180 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1181 | 1181 | <td class="forminp"> |
@@ -1195,87 +1195,87 @@ discard block |
||
| 1195 | 1195 | <?php } ?> |
| 1196 | 1196 | </td> |
| 1197 | 1197 | </tr><?php |
| 1198 | - break; |
|
| 1199 | - case 'map_default_settings' : |
|
| 1200 | - ?> |
|
| 1198 | + break; |
|
| 1199 | + case 'map_default_settings' : |
|
| 1200 | + ?> |
|
| 1201 | 1201 | |
| 1202 | 1202 | <tr valign="top"> |
| 1203 | 1203 | <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>
|
| 1204 | 1204 | <td width="60%"> |
| 1205 | 1205 | <select name="geodir_default_map_language" style="width:60%"> |
| 1206 | 1206 | <?php |
| 1207 | - $arr_map_langages = array( |
|
| 1208 | - 'ar' => __('ARABIC', 'geodirectory'),
|
|
| 1209 | - 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1210 | - 'bg' => __('BULGARIAN', 'geodirectory'),
|
|
| 1211 | - 'bn' => __('BENGALI', 'geodirectory'),
|
|
| 1212 | - 'ca' => __('CATALAN', 'geodirectory'),
|
|
| 1213 | - 'cs' => __('CZECH', 'geodirectory'),
|
|
| 1214 | - 'da' => __('DANISH', 'geodirectory'),
|
|
| 1215 | - 'de' => __('GERMAN', 'geodirectory'),
|
|
| 1216 | - 'el' => __('GREEK', 'geodirectory'),
|
|
| 1217 | - 'en' => __('ENGLISH', 'geodirectory'),
|
|
| 1218 | - 'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),
|
|
| 1219 | - 'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),
|
|
| 1220 | - 'es' => __('SPANISH', 'geodirectory'),
|
|
| 1221 | - 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1222 | - 'fa' => __('FARSI', 'geodirectory'),
|
|
| 1223 | - 'fi' => __('FINNISH', 'geodirectory'),
|
|
| 1224 | - 'fil' => __('FILIPINO', 'geodirectory'),
|
|
| 1225 | - 'fr' => __('FRENCH', 'geodirectory'),
|
|
| 1226 | - 'gl' => __('GALICIAN', 'geodirectory'),
|
|
| 1227 | - 'gu' => __('GUJARATI', 'geodirectory'),
|
|
| 1228 | - 'hi' => __('HINDI', 'geodirectory'),
|
|
| 1229 | - 'hr' => __('CROATIAN', 'geodirectory'),
|
|
| 1230 | - 'hu' => __('HUNGARIAN', 'geodirectory'),
|
|
| 1231 | - 'id' => __('INDONESIAN', 'geodirectory'),
|
|
| 1232 | - 'it' => __('ITALIAN', 'geodirectory'),
|
|
| 1233 | - 'iw' => __('HEBREW', 'geodirectory'),
|
|
| 1234 | - 'ja' => __('JAPANESE', 'geodirectory'),
|
|
| 1235 | - 'kn' => __('KANNADA', 'geodirectory'),
|
|
| 1236 | - 'ko' => __('KOREAN', 'geodirectory'),
|
|
| 1237 | - 'lt' => __('LITHUANIAN', 'geodirectory'),
|
|
| 1238 | - 'lv' => __('LATVIAN', 'geodirectory'),
|
|
| 1239 | - 'ml' => __('MALAYALAM', 'geodirectory'),
|
|
| 1240 | - 'mr' => __('MARATHI', 'geodirectory'),
|
|
| 1241 | - 'nl' => __('DUTCH', 'geodirectory'),
|
|
| 1242 | - 'no' => __('NORWEGIAN', 'geodirectory'),
|
|
| 1243 | - 'pl' => __('POLISH', 'geodirectory'),
|
|
| 1244 | - 'pt' => __('PORTUGUESE', 'geodirectory'),
|
|
| 1245 | - 'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),
|
|
| 1246 | - 'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),
|
|
| 1247 | - 'ro' => __('ROMANIAN', 'geodirectory'),
|
|
| 1248 | - 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1249 | - 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1250 | - 'sk' => __('SLOVAK', 'geodirectory'),
|
|
| 1251 | - 'sl' => __('SLOVENIAN', 'geodirectory'),
|
|
| 1252 | - 'sr' => __('SERBIAN', 'geodirectory'),
|
|
| 1253 | - 'sv' => __(' SWEDISH', 'geodirectory'),
|
|
| 1254 | - 'tl' => __('TAGALOG', 'geodirectory'),
|
|
| 1255 | - 'ta' => __('TAMIL', 'geodirectory'),
|
|
| 1256 | - 'te' => __('TELUGU', 'geodirectory'),
|
|
| 1257 | - 'th' => __('THAI', 'geodirectory'),
|
|
| 1258 | - 'tr' => __('TURKISH', 'geodirectory'),
|
|
| 1259 | - 'uk' => __('UKRAINIAN', 'geodirectory'),
|
|
| 1260 | - 'vi' => __('VIETNAMESE', 'geodirectory'),
|
|
| 1261 | - 'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),
|
|
| 1262 | - 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),
|
|
| 1263 | - ); |
|
| 1264 | - $geodir_default_map_language = get_option('geodir_default_map_language');
|
|
| 1265 | - if (empty($geodir_default_map_language)) |
|
| 1266 | - $geodir_default_map_language = 'en'; |
|
| 1267 | - foreach ($arr_map_langages as $language_key => $language_txt) {
|
|
| 1268 | - if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) |
|
| 1269 | - $geodir_default_language_selected = "selected='selected'"; |
|
| 1270 | - else |
|
| 1271 | - $geodir_default_language_selected = ''; |
|
| 1272 | - |
|
| 1273 | - ?> |
|
| 1207 | + $arr_map_langages = array( |
|
| 1208 | + 'ar' => __('ARABIC', 'geodirectory'),
|
|
| 1209 | + 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1210 | + 'bg' => __('BULGARIAN', 'geodirectory'),
|
|
| 1211 | + 'bn' => __('BENGALI', 'geodirectory'),
|
|
| 1212 | + 'ca' => __('CATALAN', 'geodirectory'),
|
|
| 1213 | + 'cs' => __('CZECH', 'geodirectory'),
|
|
| 1214 | + 'da' => __('DANISH', 'geodirectory'),
|
|
| 1215 | + 'de' => __('GERMAN', 'geodirectory'),
|
|
| 1216 | + 'el' => __('GREEK', 'geodirectory'),
|
|
| 1217 | + 'en' => __('ENGLISH', 'geodirectory'),
|
|
| 1218 | + 'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),
|
|
| 1219 | + 'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),
|
|
| 1220 | + 'es' => __('SPANISH', 'geodirectory'),
|
|
| 1221 | + 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1222 | + 'fa' => __('FARSI', 'geodirectory'),
|
|
| 1223 | + 'fi' => __('FINNISH', 'geodirectory'),
|
|
| 1224 | + 'fil' => __('FILIPINO', 'geodirectory'),
|
|
| 1225 | + 'fr' => __('FRENCH', 'geodirectory'),
|
|
| 1226 | + 'gl' => __('GALICIAN', 'geodirectory'),
|
|
| 1227 | + 'gu' => __('GUJARATI', 'geodirectory'),
|
|
| 1228 | + 'hi' => __('HINDI', 'geodirectory'),
|
|
| 1229 | + 'hr' => __('CROATIAN', 'geodirectory'),
|
|
| 1230 | + 'hu' => __('HUNGARIAN', 'geodirectory'),
|
|
| 1231 | + 'id' => __('INDONESIAN', 'geodirectory'),
|
|
| 1232 | + 'it' => __('ITALIAN', 'geodirectory'),
|
|
| 1233 | + 'iw' => __('HEBREW', 'geodirectory'),
|
|
| 1234 | + 'ja' => __('JAPANESE', 'geodirectory'),
|
|
| 1235 | + 'kn' => __('KANNADA', 'geodirectory'),
|
|
| 1236 | + 'ko' => __('KOREAN', 'geodirectory'),
|
|
| 1237 | + 'lt' => __('LITHUANIAN', 'geodirectory'),
|
|
| 1238 | + 'lv' => __('LATVIAN', 'geodirectory'),
|
|
| 1239 | + 'ml' => __('MALAYALAM', 'geodirectory'),
|
|
| 1240 | + 'mr' => __('MARATHI', 'geodirectory'),
|
|
| 1241 | + 'nl' => __('DUTCH', 'geodirectory'),
|
|
| 1242 | + 'no' => __('NORWEGIAN', 'geodirectory'),
|
|
| 1243 | + 'pl' => __('POLISH', 'geodirectory'),
|
|
| 1244 | + 'pt' => __('PORTUGUESE', 'geodirectory'),
|
|
| 1245 | + 'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),
|
|
| 1246 | + 'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),
|
|
| 1247 | + 'ro' => __('ROMANIAN', 'geodirectory'),
|
|
| 1248 | + 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1249 | + 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1250 | + 'sk' => __('SLOVAK', 'geodirectory'),
|
|
| 1251 | + 'sl' => __('SLOVENIAN', 'geodirectory'),
|
|
| 1252 | + 'sr' => __('SERBIAN', 'geodirectory'),
|
|
| 1253 | + 'sv' => __(' SWEDISH', 'geodirectory'),
|
|
| 1254 | + 'tl' => __('TAGALOG', 'geodirectory'),
|
|
| 1255 | + 'ta' => __('TAMIL', 'geodirectory'),
|
|
| 1256 | + 'te' => __('TELUGU', 'geodirectory'),
|
|
| 1257 | + 'th' => __('THAI', 'geodirectory'),
|
|
| 1258 | + 'tr' => __('TURKISH', 'geodirectory'),
|
|
| 1259 | + 'uk' => __('UKRAINIAN', 'geodirectory'),
|
|
| 1260 | + 'vi' => __('VIETNAMESE', 'geodirectory'),
|
|
| 1261 | + 'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),
|
|
| 1262 | + 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),
|
|
| 1263 | + ); |
|
| 1264 | + $geodir_default_map_language = get_option('geodir_default_map_language');
|
|
| 1265 | + if (empty($geodir_default_map_language)) |
|
| 1266 | + $geodir_default_map_language = 'en'; |
|
| 1267 | + foreach ($arr_map_langages as $language_key => $language_txt) {
|
|
| 1268 | + if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) |
|
| 1269 | + $geodir_default_language_selected = "selected='selected'"; |
|
| 1270 | + else |
|
| 1271 | + $geodir_default_language_selected = ''; |
|
| 1272 | + |
|
| 1273 | + ?> |
|
| 1274 | 1274 | <option |
| 1275 | 1275 | value="<?php echo $language_key?>" <?php echo $geodir_default_language_selected; ?>><?php echo $language_txt; ?></option> |
| 1276 | 1276 | |
| 1277 | 1277 | <?php } |
| 1278 | - ?> |
|
| 1278 | + ?> |
|
| 1279 | 1279 | </select> |
| 1280 | 1280 | </td> |
| 1281 | 1281 | </tr> |
@@ -1286,46 +1286,46 @@ discard block |
||
| 1286 | 1286 | <td width="60%"> |
| 1287 | 1287 | <select name="geodir_default_map_search_pt" style="width:60%"> |
| 1288 | 1288 | <?php |
| 1289 | - $post_types = geodir_get_posttypes('array');
|
|
| 1290 | - $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');
|
|
| 1291 | - if (empty($geodir_default_map_search_pt)) |
|
| 1292 | - $geodir_default_map_search_pt = 'gd_place'; |
|
| 1293 | - if (is_array($post_types)) {
|
|
| 1294 | - foreach ($post_types as $key => $post_types_obj) {
|
|
| 1295 | - if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) |
|
| 1296 | - $geodir_search_pt_selected = "selected='selected'"; |
|
| 1297 | - else |
|
| 1298 | - $geodir_search_pt_selected = ''; |
|
| 1299 | - |
|
| 1300 | - ?> |
|
| 1289 | + $post_types = geodir_get_posttypes('array');
|
|
| 1290 | + $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');
|
|
| 1291 | + if (empty($geodir_default_map_search_pt)) |
|
| 1292 | + $geodir_default_map_search_pt = 'gd_place'; |
|
| 1293 | + if (is_array($post_types)) {
|
|
| 1294 | + foreach ($post_types as $key => $post_types_obj) {
|
|
| 1295 | + if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) |
|
| 1296 | + $geodir_search_pt_selected = "selected='selected'"; |
|
| 1297 | + else |
|
| 1298 | + $geodir_search_pt_selected = ''; |
|
| 1299 | + |
|
| 1300 | + ?> |
|
| 1301 | 1301 | <option |
| 1302 | 1302 | value="<?php echo $key?>" <?php echo $geodir_search_pt_selected; ?>><?php echo __($post_types_obj['labels']['singular_name'], 'geodirectory'); ?></option> |
| 1303 | 1303 | |
| 1304 | 1304 | <?php } |
| 1305 | 1305 | |
| 1306 | - } |
|
| 1306 | + } |
|
| 1307 | 1307 | |
| 1308 | - ?> |
|
| 1308 | + ?> |
|
| 1309 | 1309 | </select> |
| 1310 | 1310 | </td> |
| 1311 | 1311 | </tr> |
| 1312 | 1312 | |
| 1313 | 1313 | <?php |
| 1314 | - break; |
|
| 1314 | + break; |
|
| 1315 | 1315 | |
| 1316 | - case 'map': |
|
| 1317 | - ?> |
|
| 1316 | + case 'map': |
|
| 1317 | + ?> |
|
| 1318 | 1318 | <tr valign="top"> |
| 1319 | 1319 | <td class="forminp"> |
| 1320 | 1320 | <?php |
| 1321 | - global $post_cat, $cat_display; |
|
| 1322 | - $post_types = geodir_get_posttypes('object');
|
|
| 1323 | - $cat_display = 'checkbox'; |
|
| 1324 | - $gd_post_types = get_option('geodir_exclude_post_type_on_map');
|
|
| 1325 | - $gd_cats = get_option('geodir_exclude_cat_on_map');
|
|
| 1326 | - $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 1327 | - $count = 1; |
|
| 1328 | - ?> |
|
| 1321 | + global $post_cat, $cat_display; |
|
| 1322 | + $post_types = geodir_get_posttypes('object');
|
|
| 1323 | + $cat_display = 'checkbox'; |
|
| 1324 | + $gd_post_types = get_option('geodir_exclude_post_type_on_map');
|
|
| 1325 | + $gd_cats = get_option('geodir_exclude_cat_on_map');
|
|
| 1326 | + $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 1327 | + $count = 1; |
|
| 1328 | + ?> |
|
| 1329 | 1329 | <table width="70%" class="widefat"> |
| 1330 | 1330 | <thead> |
| 1331 | 1331 | <tr> |
@@ -1334,18 +1334,18 @@ discard block |
||
| 1334 | 1334 | <th><b><?php echo DESIGN_POST_TYPE_CAT; ?></b></th> |
| 1335 | 1335 | </tr> |
| 1336 | 1336 | <?php |
| 1337 | - $gd_categs = $gd_cats; |
|
| 1338 | - foreach ($post_types as $key => $post_types_obj) : |
|
| 1339 | - $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : ''; |
|
| 1340 | - $gd_taxonomy = geodir_get_taxonomies($key); |
|
| 1341 | - if ($gd_cats_upgrade) {
|
|
| 1342 | - $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : ''; |
|
| 1343 | - $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array(); |
|
| 1344 | - $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array(); |
|
| 1345 | - } |
|
| 1346 | - $post_cat = implode(',', $gd_cats);
|
|
| 1347 | - $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy); |
|
| 1348 | - ?> |
|
| 1337 | + $gd_categs = $gd_cats; |
|
| 1338 | + foreach ($post_types as $key => $post_types_obj) : |
|
| 1339 | + $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : ''; |
|
| 1340 | + $gd_taxonomy = geodir_get_taxonomies($key); |
|
| 1341 | + if ($gd_cats_upgrade) {
|
|
| 1342 | + $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : ''; |
|
| 1343 | + $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array(); |
|
| 1344 | + $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array(); |
|
| 1345 | + } |
|
| 1346 | + $post_cat = implode(',', $gd_cats);
|
|
| 1347 | + $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy); |
|
| 1348 | + ?> |
|
| 1349 | 1349 | <tr> |
| 1350 | 1350 | <td valign="top" width="5%"><?php echo $count; ?></td> |
| 1351 | 1351 | <td valign="top" width="25%" id="td_post_types"><input type="checkbox" |
@@ -1366,19 +1366,19 @@ discard block |
||
| 1366 | 1366 | </td> |
| 1367 | 1367 | </tr> |
| 1368 | 1368 | <?php |
| 1369 | - break; |
|
| 1369 | + break; |
|
| 1370 | 1370 | |
| 1371 | - case 'checkbox' : |
|
| 1371 | + case 'checkbox' : |
|
| 1372 | 1372 | |
| 1373 | - if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) : |
|
| 1374 | - ?> |
|
| 1373 | + if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) : |
|
| 1374 | + ?> |
|
| 1375 | 1375 | <tr valign="top"> |
| 1376 | 1376 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1377 | 1377 | <td class="forminp"> |
| 1378 | 1378 | <?php |
| 1379 | - endif; |
|
| 1379 | + endif; |
|
| 1380 | 1380 | |
| 1381 | - ?> |
|
| 1381 | + ?> |
|
| 1382 | 1382 | <fieldset> |
| 1383 | 1383 | <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend> |
| 1384 | 1384 | <label for="<?php echo $value['id'] ?>"> |
@@ -1388,49 +1388,49 @@ discard block |
||
| 1388 | 1388 | </fieldset> |
| 1389 | 1389 | <?php |
| 1390 | 1390 | |
| 1391 | - if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) : |
|
| 1392 | - ?> |
|
| 1391 | + if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) : |
|
| 1392 | + ?> |
|
| 1393 | 1393 | </td> |
| 1394 | 1394 | </tr> |
| 1395 | 1395 | <?php |
| 1396 | - endif; |
|
| 1396 | + endif; |
|
| 1397 | 1397 | |
| 1398 | - break; |
|
| 1398 | + break; |
|
| 1399 | 1399 | |
| 1400 | - case 'radio' : |
|
| 1400 | + case 'radio' : |
|
| 1401 | 1401 | |
| 1402 | - if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) : |
|
| 1403 | - ?> |
|
| 1402 | + if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) : |
|
| 1403 | + ?> |
|
| 1404 | 1404 | <tr valign="top"> |
| 1405 | 1405 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1406 | 1406 | <td class="forminp"> |
| 1407 | 1407 | <?php |
| 1408 | - endif; |
|
| 1408 | + endif; |
|
| 1409 | 1409 | |
| 1410 | - ?> |
|
| 1410 | + ?> |
|
| 1411 | 1411 | <fieldset> |
| 1412 | 1412 | <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend> |
| 1413 | 1413 | <label for="<?php echo $value['id'];?>"> |
| 1414 | 1414 | <input name="<?php echo esc_attr($value['id']); ?>" |
| 1415 | 1415 | id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio" |
| 1416 | 1416 | value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {
|
| 1417 | - echo 'checked="checked"'; |
|
| 1418 | - }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
|
|
| 1417 | + echo 'checked="checked"'; |
|
| 1418 | + }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
|
|
| 1419 | 1419 | <?php echo $value['desc']; ?></label><br> |
| 1420 | 1420 | </fieldset> |
| 1421 | 1421 | <?php |
| 1422 | 1422 | |
| 1423 | - if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) : |
|
| 1424 | - ?> |
|
| 1423 | + if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) : |
|
| 1424 | + ?> |
|
| 1425 | 1425 | </td> |
| 1426 | 1426 | </tr> |
| 1427 | 1427 | <?php |
| 1428 | - endif; |
|
| 1428 | + endif; |
|
| 1429 | 1429 | |
| 1430 | - break; |
|
| 1430 | + break; |
|
| 1431 | 1431 | |
| 1432 | - case 'textarea': |
|
| 1433 | - ?> |
|
| 1432 | + case 'textarea': |
|
| 1433 | + ?> |
|
| 1434 | 1434 | <tr valign="top"> |
| 1435 | 1435 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1436 | 1436 | <td class="forminp"> |
@@ -1443,30 +1443,30 @@ discard block |
||
| 1443 | 1443 | |
| 1444 | 1444 | </td> |
| 1445 | 1445 | </tr><?php |
| 1446 | - break; |
|
| 1446 | + break; |
|
| 1447 | 1447 | |
| 1448 | - case 'editor': |
|
| 1449 | - ?> |
|
| 1448 | + case 'editor': |
|
| 1449 | + ?> |
|
| 1450 | 1450 | <tr valign="top"> |
| 1451 | 1451 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1452 | 1452 | <td class="forminp"><?php |
| 1453 | - if (get_option($value['id'])) |
|
| 1454 | - $content = stripslashes(get_option($value['id'])); |
|
| 1455 | - else |
|
| 1456 | - $content = $value['std']; |
|
| 1453 | + if (get_option($value['id'])) |
|
| 1454 | + $content = stripslashes(get_option($value['id'])); |
|
| 1455 | + else |
|
| 1456 | + $content = $value['std']; |
|
| 1457 | 1457 | |
| 1458 | - $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
|
|
| 1458 | + $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
|
|
| 1459 | 1459 | |
| 1460 | - wp_editor($content, esc_attr($value['id']), $editor_settings); |
|
| 1460 | + wp_editor($content, esc_attr($value['id']), $editor_settings); |
|
| 1461 | 1461 | |
| 1462 | - ?> <span class="description"><?php echo $value['desc'] ?></span> |
|
| 1462 | + ?> <span class="description"><?php echo $value['desc'] ?></span> |
|
| 1463 | 1463 | |
| 1464 | 1464 | </td> |
| 1465 | 1465 | </tr><?php |
| 1466 | - break; |
|
| 1466 | + break; |
|
| 1467 | 1467 | |
| 1468 | - case 'single_select_page' : |
|
| 1469 | - // WPML |
|
| 1468 | + case 'single_select_page' : |
|
| 1469 | + // WPML |
|
| 1470 | 1470 | $switch_lang = false; |
| 1471 | 1471 | $disabled = ''; |
| 1472 | 1472 | if (geodir_is_wpml() && isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {
|
@@ -1484,18 +1484,18 @@ discard block |
||
| 1484 | 1484 | // |
| 1485 | 1485 | $page_setting = (int)get_option($value['id']); |
| 1486 | 1486 | |
| 1487 | - $args = array('name' => $value['id'],
|
|
| 1488 | - 'id' => $value['id'], |
|
| 1489 | - 'sort_column' => 'menu_order', |
|
| 1490 | - 'sort_order' => 'ASC', |
|
| 1491 | - 'show_option_none' => ' ', |
|
| 1492 | - 'class' => $value['class'], |
|
| 1493 | - 'echo' => false, |
|
| 1494 | - 'selected' => $page_setting); |
|
| 1487 | + $args = array('name' => $value['id'],
|
|
| 1488 | + 'id' => $value['id'], |
|
| 1489 | + 'sort_column' => 'menu_order', |
|
| 1490 | + 'sort_order' => 'ASC', |
|
| 1491 | + 'show_option_none' => ' ', |
|
| 1492 | + 'class' => $value['class'], |
|
| 1493 | + 'echo' => false, |
|
| 1494 | + 'selected' => $page_setting); |
|
| 1495 | 1495 | |
| 1496 | - if (isset($value['args'])) $args = wp_parse_args($value['args'], $args); |
|
| 1496 | + if (isset($value['args'])) $args = wp_parse_args($value['args'], $args); |
|
| 1497 | 1497 | |
| 1498 | - ?> |
|
| 1498 | + ?> |
|
| 1499 | 1499 | <tr valign="top" class="single_select_page"> |
| 1500 | 1500 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1501 | 1501 | <td class="forminp"> |
@@ -1506,17 +1506,17 @@ discard block |
||
| 1506 | 1506 | if ($switch_lang) {
|
| 1507 | 1507 | $sitepress->switch_lang($switch_lang, true); |
| 1508 | 1508 | } |
| 1509 | - break; |
|
| 1510 | - case 'single_select_country' : |
|
| 1511 | - $country_setting = (string)get_option($value['id']); |
|
| 1512 | - if (strstr($country_setting, ':')) : |
|
| 1513 | - $country = current(explode(':', $country_setting));
|
|
| 1514 | - $state = end(explode(':', $country_setting));
|
|
| 1515 | - else : |
|
| 1516 | - $country = $country_setting; |
|
| 1517 | - $state = '*'; |
|
| 1518 | - endif; |
|
| 1519 | - ?> |
|
| 1509 | + break; |
|
| 1510 | + case 'single_select_country' : |
|
| 1511 | + $country_setting = (string)get_option($value['id']); |
|
| 1512 | + if (strstr($country_setting, ':')) : |
|
| 1513 | + $country = current(explode(':', $country_setting));
|
|
| 1514 | + $state = end(explode(':', $country_setting));
|
|
| 1515 | + else : |
|
| 1516 | + $country = $country_setting; |
|
| 1517 | + $state = '*'; |
|
| 1518 | + endif; |
|
| 1519 | + ?> |
|
| 1520 | 1520 | <tr valign="top"> |
| 1521 | 1521 | <th scope="rpw" class="titledesc"><?php echo $value['name'] ?></th> |
| 1522 | 1522 | <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>" |
@@ -1527,12 +1527,12 @@ discard block |
||
| 1527 | 1527 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
| 1528 | 1528 | </td> |
| 1529 | 1529 | </tr><?php |
| 1530 | - break; |
|
| 1531 | - case 'multi_select_countries' : |
|
| 1532 | - $countries = $geodirectory->countries->countries; |
|
| 1533 | - asort($countries); |
|
| 1534 | - $selections = (array)get_option($value['id']); |
|
| 1535 | - ?> |
|
| 1530 | + break; |
|
| 1531 | + case 'multi_select_countries' : |
|
| 1532 | + $countries = $geodirectory->countries->countries; |
|
| 1533 | + asort($countries); |
|
| 1534 | + $selections = (array)get_option($value['id']); |
|
| 1535 | + ?> |
|
| 1536 | 1536 | <tr valign="top"> |
| 1537 | 1537 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1538 | 1538 | <td class="forminp"> |
@@ -1540,21 +1540,21 @@ discard block |
||
| 1540 | 1540 | data-placeholder="<?php _e('Choose countries…', 'geodirectory'); ?>"
|
| 1541 | 1541 | title="Country" class="chosen_select"> |
| 1542 | 1542 | <?php |
| 1543 | - if ($countries) foreach ($countries as $key => $val) : |
|
| 1544 | - echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
| 1545 | - endforeach; |
|
| 1546 | - ?> |
|
| 1543 | + if ($countries) foreach ($countries as $key => $val) : |
|
| 1544 | + echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
| 1545 | + endforeach; |
|
| 1546 | + ?> |
|
| 1547 | 1547 | </select> |
| 1548 | 1548 | </td> |
| 1549 | 1549 | </tr> |
| 1550 | 1550 | |
| 1551 | 1551 | <?php |
| 1552 | 1552 | |
| 1553 | - break; |
|
| 1553 | + break; |
|
| 1554 | 1554 | |
| 1555 | - case 'google_analytics' : |
|
| 1556 | - $selections = (array)get_option($value['id']); |
|
| 1557 | - ?> |
|
| 1555 | + case 'google_analytics' : |
|
| 1556 | + $selections = (array)get_option($value['id']); |
|
| 1557 | + ?> |
|
| 1558 | 1558 | <tr valign="top"> |
| 1559 | 1559 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1560 | 1560 | <td class="forminp"> |
@@ -1562,62 +1562,62 @@ discard block |
||
| 1562 | 1562 | |
| 1563 | 1563 | <?php |
| 1564 | 1564 | |
| 1565 | - $oAuthURL = "https://accounts.google.com/o/oauth2/auth?"; |
|
| 1566 | - $scope = "scope=https://www.googleapis.com/auth/analytics.readonly"; |
|
| 1567 | - $state = "&state=123";//any string |
|
| 1568 | - $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 1569 | - $response_type = "&response_type=code"; |
|
| 1570 | - $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
| 1571 | - $access_type = "&access_type=offline"; |
|
| 1572 | - $approval_prompt = "&approval_prompt=force"; |
|
| 1565 | + $oAuthURL = "https://accounts.google.com/o/oauth2/auth?"; |
|
| 1566 | + $scope = "scope=https://www.googleapis.com/auth/analytics.readonly"; |
|
| 1567 | + $state = "&state=123";//any string |
|
| 1568 | + $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 1569 | + $response_type = "&response_type=code"; |
|
| 1570 | + $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
| 1571 | + $access_type = "&access_type=offline"; |
|
| 1572 | + $approval_prompt = "&approval_prompt=force"; |
|
| 1573 | 1573 | |
| 1574 | - $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt; |
|
| 1574 | + $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt; |
|
| 1575 | 1575 | |
| 1576 | 1576 | |
| 1577 | - if (get_option('geodir_ga_auth_token')) {
|
|
| 1578 | - ?> |
|
| 1577 | + if (get_option('geodir_ga_auth_token')) {
|
|
| 1578 | + ?> |
|
| 1579 | 1579 | <span class="button-primary" |
| 1580 | 1580 | onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize');?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>
|
| 1581 | 1581 | <span style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>
|
| 1582 | 1582 | <?php |
| 1583 | - global $gd_ga_errors; |
|
| 1584 | - if(!empty($gd_ga_errors)){
|
|
| 1585 | - print_r($gd_ga_errors); |
|
| 1586 | - } |
|
| 1587 | - } else {
|
|
| 1588 | - ?> |
|
| 1583 | + global $gd_ga_errors; |
|
| 1584 | + if(!empty($gd_ga_errors)){
|
|
| 1585 | + print_r($gd_ga_errors); |
|
| 1586 | + } |
|
| 1587 | + } else {
|
|
| 1588 | + ?> |
|
| 1589 | 1589 | <span class="button-primary" |
| 1590 | 1590 | onclick="window.open('<?php echo geodir_ga_activation_url();?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory');?></span>
|
| 1591 | 1591 | <?php |
| 1592 | - } |
|
| 1593 | - ?> |
|
| 1592 | + } |
|
| 1593 | + ?> |
|
| 1594 | 1594 | </td> |
| 1595 | 1595 | </tr> |
| 1596 | 1596 | |
| 1597 | 1597 | <?php |
| 1598 | 1598 | |
| 1599 | 1599 | |
| 1600 | - break; |
|
| 1600 | + break; |
|
| 1601 | 1601 | |
| 1602 | - case 'field_seperator' : |
|
| 1602 | + case 'field_seperator' : |
|
| 1603 | 1603 | |
| 1604 | - ?> |
|
| 1604 | + ?> |
|
| 1605 | 1605 | <tr valign="top"> |
| 1606 | 1606 | <td colspan="2" class="forminp geodir_line_seperator"></td> |
| 1607 | 1607 | </tr> |
| 1608 | 1608 | <?php |
| 1609 | 1609 | |
| 1610 | - break; |
|
| 1610 | + break; |
|
| 1611 | 1611 | |
| 1612 | - endswitch; |
|
| 1612 | + endswitch; |
|
| 1613 | 1613 | |
| 1614 | - endforeach; |
|
| 1614 | + endforeach; |
|
| 1615 | 1615 | |
| 1616 | - if ($first_title === false) {
|
|
| 1617 | - echo "</div>"; |
|
| 1618 | - } |
|
| 1616 | + if ($first_title === false) {
|
|
| 1617 | + echo "</div>"; |
|
| 1618 | + } |
|
| 1619 | 1619 | |
| 1620 | - ?> |
|
| 1620 | + ?> |
|
| 1621 | 1621 | |
| 1622 | 1622 | <script type="text/javascript"> |
| 1623 | 1623 | |
@@ -1677,33 +1677,33 @@ discard block |
||
| 1677 | 1677 | */ |
| 1678 | 1678 | function geodir_post_info_setting() |
| 1679 | 1679 | {
|
| 1680 | - global $post, $post_id; |
|
| 1681 | - |
|
| 1682 | - $post_type = get_post_type(); |
|
| 1683 | - |
|
| 1684 | - $package_info = array(); |
|
| 1685 | - |
|
| 1686 | - $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1687 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename'); |
|
| 1688 | - echo '<div id="geodir_wrapper">'; |
|
| 1689 | - /** |
|
| 1690 | - * Called before the GD custom fields are output in the wp-admin area. |
|
| 1691 | - * |
|
| 1692 | - * @since 1.0.0 |
|
| 1693 | - * @see 'geodir_after_default_field_in_meta_box' |
|
| 1694 | - */ |
|
| 1695 | - do_action('geodir_before_default_field_in_meta_box');
|
|
| 1696 | - //geodir_get_custom_fields_html($package_info->pid,'default',$post_type); |
|
| 1697 | - // to display all fields in one information box |
|
| 1698 | - geodir_get_custom_fields_html($package_info->pid, 'all', $post_type); |
|
| 1699 | - /** |
|
| 1700 | - * Called after the GD custom fields are output in the wp-admin area. |
|
| 1701 | - * |
|
| 1702 | - * @since 1.0.0 |
|
| 1703 | - * @see 'geodir_before_default_field_in_meta_box' |
|
| 1704 | - */ |
|
| 1705 | - do_action('geodir_after_default_field_in_meta_box');
|
|
| 1706 | - echo '</div>'; |
|
| 1680 | + global $post, $post_id; |
|
| 1681 | + |
|
| 1682 | + $post_type = get_post_type(); |
|
| 1683 | + |
|
| 1684 | + $package_info = array(); |
|
| 1685 | + |
|
| 1686 | + $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1687 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename'); |
|
| 1688 | + echo '<div id="geodir_wrapper">'; |
|
| 1689 | + /** |
|
| 1690 | + * Called before the GD custom fields are output in the wp-admin area. |
|
| 1691 | + * |
|
| 1692 | + * @since 1.0.0 |
|
| 1693 | + * @see 'geodir_after_default_field_in_meta_box' |
|
| 1694 | + */ |
|
| 1695 | + do_action('geodir_before_default_field_in_meta_box');
|
|
| 1696 | + //geodir_get_custom_fields_html($package_info->pid,'default',$post_type); |
|
| 1697 | + // to display all fields in one information box |
|
| 1698 | + geodir_get_custom_fields_html($package_info->pid, 'all', $post_type); |
|
| 1699 | + /** |
|
| 1700 | + * Called after the GD custom fields are output in the wp-admin area. |
|
| 1701 | + * |
|
| 1702 | + * @since 1.0.0 |
|
| 1703 | + * @see 'geodir_before_default_field_in_meta_box' |
|
| 1704 | + */ |
|
| 1705 | + do_action('geodir_after_default_field_in_meta_box');
|
|
| 1706 | + echo '</div>'; |
|
| 1707 | 1707 | } |
| 1708 | 1708 | |
| 1709 | 1709 | /** |
@@ -1716,18 +1716,18 @@ discard block |
||
| 1716 | 1716 | */ |
| 1717 | 1717 | function geodir_post_addinfo_setting() |
| 1718 | 1718 | {
|
| 1719 | - global $post, $post_id; |
|
| 1719 | + global $post, $post_id; |
|
| 1720 | 1720 | |
| 1721 | - $post_type = get_post_type(); |
|
| 1721 | + $post_type = get_post_type(); |
|
| 1722 | 1722 | |
| 1723 | - $package_info = array(); |
|
| 1723 | + $package_info = array(); |
|
| 1724 | 1724 | |
| 1725 | - $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1725 | + $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1726 | 1726 | |
| 1727 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename'); |
|
| 1728 | - echo '<div id="geodir_wrapper">'; |
|
| 1729 | - geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type); |
|
| 1730 | - echo '</div>'; |
|
| 1727 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename'); |
|
| 1728 | + echo '<div id="geodir_wrapper">'; |
|
| 1729 | + geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type); |
|
| 1730 | + echo '</div>'; |
|
| 1731 | 1731 | |
| 1732 | 1732 | } |
| 1733 | 1733 | |
@@ -1741,60 +1741,60 @@ discard block |
||
| 1741 | 1741 | */ |
| 1742 | 1742 | function geodir_post_attachments() |
| 1743 | 1743 | {
|
| 1744 | - global $post, $post_id; |
|
| 1744 | + global $post, $post_id; |
|
| 1745 | 1745 | |
| 1746 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename'); |
|
| 1746 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename'); |
|
| 1747 | 1747 | |
| 1748 | - if (geodir_get_featured_image($post_id, 'thumbnail')) {
|
|
| 1749 | - echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
|
|
| 1750 | - geodir_show_featured_image($post_id, 'thumbnail'); |
|
| 1751 | - } |
|
| 1748 | + if (geodir_get_featured_image($post_id, 'thumbnail')) {
|
|
| 1749 | + echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
|
|
| 1750 | + geodir_show_featured_image($post_id, 'thumbnail'); |
|
| 1751 | + } |
|
| 1752 | 1752 | |
| 1753 | - $image_limit = 0; |
|
| 1753 | + $image_limit = 0; |
|
| 1754 | 1754 | |
| 1755 | - ?> |
|
| 1755 | + ?> |
|
| 1756 | 1756 | |
| 1757 | 1757 | |
| 1758 | 1758 | <h5 class="form_title"> |
| 1759 | 1759 | <?php if ($image_limit != 0 && $image_limit == 1) {
|
| 1760 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 1761 | - } ?> |
|
| 1760 | + echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 1761 | + } ?> |
|
| 1762 | 1762 | <?php if ($image_limit != 0 && $image_limit > 1) {
|
| 1763 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 1764 | - } ?> |
|
| 1763 | + echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 1764 | + } ?> |
|
| 1765 | 1765 | <?php if ($image_limit == 0) {
|
| 1766 | - echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 1767 | - } ?> |
|
| 1766 | + echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 1767 | + } ?> |
|
| 1768 | 1768 | </h5> |
| 1769 | 1769 | |
| 1770 | 1770 | |
| 1771 | 1771 | <?php |
| 1772 | 1772 | |
| 1773 | - $curImages = geodir_get_images($post_id); |
|
| 1774 | - $place_img_array = array(); |
|
| 1773 | + $curImages = geodir_get_images($post_id); |
|
| 1774 | + $place_img_array = array(); |
|
| 1775 | 1775 | |
| 1776 | - if (!empty($curImages)): |
|
| 1777 | - foreach ($curImages as $p_img): |
|
| 1778 | - $place_img_array[] = $p_img->src; |
|
| 1779 | - endforeach; |
|
| 1780 | - endif; |
|
| 1776 | + if (!empty($curImages)): |
|
| 1777 | + foreach ($curImages as $p_img): |
|
| 1778 | + $place_img_array[] = $p_img->src; |
|
| 1779 | + endforeach; |
|
| 1780 | + endif; |
|
| 1781 | 1781 | |
| 1782 | - if (!empty($place_img_array)) |
|
| 1783 | - $curImages = implode(',', $place_img_array);
|
|
| 1782 | + if (!empty($place_img_array)) |
|
| 1783 | + $curImages = implode(',', $place_img_array);
|
|
| 1784 | 1784 | |
| 1785 | 1785 | |
| 1786 | - // adjust values here |
|
| 1787 | - $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls |
|
| 1786 | + // adjust values here |
|
| 1787 | + $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls |
|
| 1788 | 1788 | |
| 1789 | - $svalue = $curImages; // this will be initial value of the above form field. Image urls. |
|
| 1789 | + $svalue = $curImages; // this will be initial value of the above form field. Image urls. |
|
| 1790 | 1790 | |
| 1791 | - $multiple = true; // allow multiple files upload |
|
| 1791 | + $multiple = true; // allow multiple files upload |
|
| 1792 | 1792 | |
| 1793 | - $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels) |
|
| 1793 | + $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels) |
|
| 1794 | 1794 | |
| 1795 | - $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels) |
|
| 1795 | + $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels) |
|
| 1796 | 1796 | |
| 1797 | - ?> |
|
| 1797 | + ?> |
|
| 1798 | 1798 | |
| 1799 | 1799 | <div class="gtd-form_row clearfix" id="<?php echo $id; ?>dropbox" style="border:1px solid #999999;padding:5px;text-align:center;"> |
| 1800 | 1800 | <input type="hidden" name="<?php echo $id; ?>" id="<?php echo $id; ?>" value="<?php echo $svalue; ?>"/> |
@@ -1836,13 +1836,13 @@ discard block |
||
| 1836 | 1836 | */ |
| 1837 | 1837 | function geodir_action_post_updated($post_ID, $post_after, $post_before) |
| 1838 | 1838 | {
|
| 1839 | - $post_type = get_post_type($post_ID); |
|
| 1839 | + $post_type = get_post_type($post_ID); |
|
| 1840 | 1840 | |
| 1841 | - if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
|
| 1842 | - if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {
|
|
| 1843 | - geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title); |
|
| 1844 | - } |
|
| 1845 | - } |
|
| 1841 | + if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
|
| 1842 | + if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {
|
|
| 1843 | + geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title); |
|
| 1844 | + } |
|
| 1845 | + } |
|
| 1846 | 1846 | } |
| 1847 | 1847 | |
| 1848 | 1848 | /** |
@@ -1857,39 +1857,39 @@ discard block |
||
| 1857 | 1857 | */ |
| 1858 | 1858 | function geodir_notification_add_bcc_option($settings) |
| 1859 | 1859 | {
|
| 1860 | - if (!empty($settings)) {
|
|
| 1861 | - $new_settings = array(); |
|
| 1862 | - foreach ($settings as $setting) {
|
|
| 1863 | - if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {
|
|
| 1864 | - $geodir_bcc_listing_published_yes = array( |
|
| 1865 | - 'name' => __('Listing published', 'geodirectory'),
|
|
| 1866 | - 'desc' => __('Yes', 'geodirectory'),
|
|
| 1867 | - 'id' => 'geodir_bcc_listing_published', |
|
| 1868 | - 'std' => 'yes', |
|
| 1869 | - 'type' => 'radio', |
|
| 1870 | - 'value' => '1', |
|
| 1871 | - 'radiogroup' => 'start' |
|
| 1872 | - ); |
|
| 1873 | - |
|
| 1874 | - $geodir_bcc_listing_published_no = array( |
|
| 1875 | - 'name' => __('Listing published', 'geodirectory'),
|
|
| 1876 | - 'desc' => __('No', 'geodirectory'),
|
|
| 1877 | - 'id' => 'geodir_bcc_listing_published', |
|
| 1878 | - 'std' => 'yes', |
|
| 1879 | - 'type' => 'radio', |
|
| 1880 | - 'value' => '0', |
|
| 1881 | - 'radiogroup' => 'end' |
|
| 1882 | - ); |
|
| 1883 | - |
|
| 1884 | - $new_settings[] = $geodir_bcc_listing_published_yes; |
|
| 1885 | - $new_settings[] = $geodir_bcc_listing_published_no; |
|
| 1886 | - } |
|
| 1887 | - $new_settings[] = $setting; |
|
| 1888 | - } |
|
| 1889 | - $settings = $new_settings; |
|
| 1890 | - } |
|
| 1860 | + if (!empty($settings)) {
|
|
| 1861 | + $new_settings = array(); |
|
| 1862 | + foreach ($settings as $setting) {
|
|
| 1863 | + if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {
|
|
| 1864 | + $geodir_bcc_listing_published_yes = array( |
|
| 1865 | + 'name' => __('Listing published', 'geodirectory'),
|
|
| 1866 | + 'desc' => __('Yes', 'geodirectory'),
|
|
| 1867 | + 'id' => 'geodir_bcc_listing_published', |
|
| 1868 | + 'std' => 'yes', |
|
| 1869 | + 'type' => 'radio', |
|
| 1870 | + 'value' => '1', |
|
| 1871 | + 'radiogroup' => 'start' |
|
| 1872 | + ); |
|
| 1873 | + |
|
| 1874 | + $geodir_bcc_listing_published_no = array( |
|
| 1875 | + 'name' => __('Listing published', 'geodirectory'),
|
|
| 1876 | + 'desc' => __('No', 'geodirectory'),
|
|
| 1877 | + 'id' => 'geodir_bcc_listing_published', |
|
| 1878 | + 'std' => 'yes', |
|
| 1879 | + 'type' => 'radio', |
|
| 1880 | + 'value' => '0', |
|
| 1881 | + 'radiogroup' => 'end' |
|
| 1882 | + ); |
|
| 1883 | + |
|
| 1884 | + $new_settings[] = $geodir_bcc_listing_published_yes; |
|
| 1885 | + $new_settings[] = $geodir_bcc_listing_published_no; |
|
| 1886 | + } |
|
| 1887 | + $new_settings[] = $setting; |
|
| 1888 | + } |
|
| 1889 | + $settings = $new_settings; |
|
| 1890 | + } |
|
| 1891 | 1891 | |
| 1892 | - return $settings; |
|
| 1892 | + return $settings; |
|
| 1893 | 1893 | } |
| 1894 | 1894 | |
| 1895 | 1895 | |
@@ -1904,19 +1904,19 @@ discard block |
||
| 1904 | 1904 | */ |
| 1905 | 1905 | function get_gd_theme_compat_callback() |
| 1906 | 1906 | {
|
| 1907 | - global $wpdb; |
|
| 1908 | - $themes = get_option('gd_theme_compats');
|
|
| 1909 | - |
|
| 1910 | - if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {
|
|
| 1911 | - if (isset($_POST['export'])) {
|
|
| 1912 | - echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']])); |
|
| 1913 | - } else {
|
|
| 1914 | - echo json_encode($themes[$_POST['theme']]); |
|
| 1915 | - } |
|
| 1907 | + global $wpdb; |
|
| 1908 | + $themes = get_option('gd_theme_compats');
|
|
| 1916 | 1909 | |
| 1917 | - } |
|
| 1910 | + if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {
|
|
| 1911 | + if (isset($_POST['export'])) {
|
|
| 1912 | + echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']])); |
|
| 1913 | + } else {
|
|
| 1914 | + echo json_encode($themes[$_POST['theme']]); |
|
| 1915 | + } |
|
| 1916 | + |
|
| 1917 | + } |
|
| 1918 | 1918 | |
| 1919 | - die(); |
|
| 1919 | + die(); |
|
| 1920 | 1920 | } |
| 1921 | 1921 | |
| 1922 | 1922 | add_action('wp_ajax_get_gd_theme_compat_import_callback', 'get_gd_theme_compat_import_callback');
|
@@ -1930,20 +1930,20 @@ discard block |
||
| 1930 | 1930 | */ |
| 1931 | 1931 | function get_gd_theme_compat_import_callback() |
| 1932 | 1932 | {
|
| 1933 | - global $wpdb; |
|
| 1934 | - $themes = get_option('gd_theme_compats');
|
|
| 1935 | - if (isset($_POST['theme']) && !empty($_POST['theme'])) {
|
|
| 1936 | - $json = json_decode(stripslashes($_POST['theme']), true); |
|
| 1937 | - if (!empty($json) && is_array($json)) {
|
|
| 1938 | - $key = sanitize_text_field(key($json)); |
|
| 1939 | - $themes[$key] = $json[$key]; |
|
| 1940 | - update_option('gd_theme_compats', $themes);
|
|
| 1941 | - echo $key; |
|
| 1942 | - die(); |
|
| 1943 | - } |
|
| 1944 | - } |
|
| 1945 | - echo '0'; |
|
| 1946 | - die(); |
|
| 1933 | + global $wpdb; |
|
| 1934 | + $themes = get_option('gd_theme_compats');
|
|
| 1935 | + if (isset($_POST['theme']) && !empty($_POST['theme'])) {
|
|
| 1936 | + $json = json_decode(stripslashes($_POST['theme']), true); |
|
| 1937 | + if (!empty($json) && is_array($json)) {
|
|
| 1938 | + $key = sanitize_text_field(key($json)); |
|
| 1939 | + $themes[$key] = $json[$key]; |
|
| 1940 | + update_option('gd_theme_compats', $themes);
|
|
| 1941 | + echo $key; |
|
| 1942 | + die(); |
|
| 1943 | + } |
|
| 1944 | + } |
|
| 1945 | + echo '0'; |
|
| 1946 | + die(); |
|
| 1947 | 1947 | } |
| 1948 | 1948 | |
| 1949 | 1949 | |
@@ -1956,39 +1956,39 @@ discard block |
||
| 1956 | 1956 | */ |
| 1957 | 1957 | function gd_set_theme_compat() |
| 1958 | 1958 | {
|
| 1959 | - global $wpdb; |
|
| 1960 | - $theme = wp_get_theme(); |
|
| 1959 | + global $wpdb; |
|
| 1960 | + $theme = wp_get_theme(); |
|
| 1961 | 1961 | |
| 1962 | - if ($theme->parent()) {
|
|
| 1963 | - $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));
|
|
| 1964 | - } else {
|
|
| 1965 | - $theme_name = str_replace(" ", "_", $theme->get('Name'));
|
|
| 1966 | - } |
|
| 1962 | + if ($theme->parent()) {
|
|
| 1963 | + $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));
|
|
| 1964 | + } else {
|
|
| 1965 | + $theme_name = str_replace(" ", "_", $theme->get('Name'));
|
|
| 1966 | + } |
|
| 1967 | 1967 | |
| 1968 | - $theme_compats = get_option('gd_theme_compats');
|
|
| 1969 | - $current_compat = get_option('gd_theme_compat');
|
|
| 1970 | - $current_compat = str_replace("_custom", "", $current_compat);
|
|
| 1968 | + $theme_compats = get_option('gd_theme_compats');
|
|
| 1969 | + $current_compat = get_option('gd_theme_compat');
|
|
| 1970 | + $current_compat = str_replace("_custom", "", $current_compat);
|
|
| 1971 | 1971 | |
| 1972 | - if ($current_compat == $theme_name && strpos(get_option('gd_theme_compat'), "_custom") !== false) {
|
|
| 1973 | - return; |
|
| 1974 | - }// if already running correct compat then bail |
|
| 1972 | + if ($current_compat == $theme_name && strpos(get_option('gd_theme_compat'), "_custom") !== false) {
|
|
| 1973 | + return; |
|
| 1974 | + }// if already running correct compat then bail |
|
| 1975 | 1975 | |
| 1976 | - if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it
|
|
| 1977 | - update_option('gd_theme_compat', $theme_name);
|
|
| 1978 | - update_option('theme_compatibility_setting', $theme_compats[$theme_name]);
|
|
| 1976 | + if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it
|
|
| 1977 | + update_option('gd_theme_compat', $theme_name);
|
|
| 1978 | + update_option('theme_compatibility_setting', $theme_compats[$theme_name]);
|
|
| 1979 | 1979 | |
| 1980 | - // if there are default options to set then set them |
|
| 1981 | - if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {
|
|
| 1980 | + // if there are default options to set then set them |
|
| 1981 | + if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {
|
|
| 1982 | 1982 | |
| 1983 | - foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {
|
|
| 1984 | - update_option($key, $val); |
|
| 1985 | - } |
|
| 1986 | - } |
|
| 1983 | + foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {
|
|
| 1984 | + update_option($key, $val); |
|
| 1985 | + } |
|
| 1986 | + } |
|
| 1987 | 1987 | |
| 1988 | - } else {
|
|
| 1989 | - update_option('gd_theme_compat', '');
|
|
| 1990 | - update_option('theme_compatibility_setting', '');
|
|
| 1991 | - } |
|
| 1988 | + } else {
|
|
| 1989 | + update_option('gd_theme_compat', '');
|
|
| 1990 | + update_option('theme_compatibility_setting', '');
|
|
| 1991 | + } |
|
| 1992 | 1992 | |
| 1993 | 1993 | |
| 1994 | 1994 | } |
@@ -2003,9 +2003,9 @@ discard block |
||
| 2003 | 2003 | */ |
| 2004 | 2004 | function gd_check_avada_compat() |
| 2005 | 2005 | {
|
| 2006 | - if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {
|
|
| 2007 | - add_action('admin_notices', 'gd_avada_compat_warning');
|
|
| 2008 | - } |
|
| 2006 | + if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {
|
|
| 2007 | + add_action('admin_notices', 'gd_avada_compat_warning');
|
|
| 2008 | + } |
|
| 2009 | 2009 | } |
| 2010 | 2010 | |
| 2011 | 2011 | |
@@ -2018,22 +2018,22 @@ discard block |
||
| 2018 | 2018 | function gd_avada_compat_warning() |
| 2019 | 2019 | {
|
| 2020 | 2020 | |
| 2021 | - /* |
|
| 2021 | + /* |
|
| 2022 | 2022 | $msg_type = error |
| 2023 | 2023 | $msg_type = updated fade |
| 2024 | 2024 | $msg_type = update-nag |
| 2025 | 2025 | */ |
| 2026 | 2026 | |
| 2027 | - $plugin = 'avada-nag'; |
|
| 2028 | - $timestamp = 'avada-nag1234'; |
|
| 2029 | - $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');
|
|
| 2030 | - echo '<div id="' . $timestamp . '" class="error">'; |
|
| 2031 | - echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>'; |
|
| 2032 | - echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";
|
|
| 2033 | - echo "<p>$message</p>"; |
|
| 2034 | - echo "</div>"; |
|
| 2027 | + $plugin = 'avada-nag'; |
|
| 2028 | + $timestamp = 'avada-nag1234'; |
|
| 2029 | + $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');
|
|
| 2030 | + echo '<div id="' . $timestamp . '" class="error">'; |
|
| 2031 | + echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>'; |
|
| 2032 | + echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";
|
|
| 2033 | + echo "<p>$message</p>"; |
|
| 2034 | + echo "</div>"; |
|
| 2035 | 2035 | |
| 2036 | - ?> |
|
| 2036 | + ?> |
|
| 2037 | 2037 | <script> |
| 2038 | 2038 | function gdRemoveANotification($plugin, $timestamp) {
|
| 2039 | 2039 | |
@@ -2101,10 +2101,10 @@ discard block |
||
| 2101 | 2101 | */ |
| 2102 | 2102 | function geodir_avada_remove_notification() |
| 2103 | 2103 | {
|
| 2104 | - update_option('avada_nag', TRUE);
|
|
| 2104 | + update_option('avada_nag', TRUE);
|
|
| 2105 | 2105 | |
| 2106 | - // Always die in functions echoing ajax content |
|
| 2107 | - die(); |
|
| 2106 | + // Always die in functions echoing ajax content |
|
| 2107 | + die(); |
|
| 2108 | 2108 | } |
| 2109 | 2109 | |
| 2110 | 2110 | |
@@ -2126,11 +2126,11 @@ discard block |
||
| 2126 | 2126 | global $post, $typenow, $current_screen; |
| 2127 | 2127 | |
| 2128 | 2128 | $post_type = NULL; |
| 2129 | - if (isset($_REQUEST['post_type'])) |
|
| 2129 | + if (isset($_REQUEST['post_type'])) |
|
| 2130 | 2130 | $post_type = sanitize_key($_REQUEST['post_type']); |
| 2131 | - elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) |
|
| 2131 | + elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) |
|
| 2132 | 2132 | $post_type = get_post_type($_REQUEST['post']); |
| 2133 | - elseif ($post && isset($post->post_type)) |
|
| 2133 | + elseif ($post && isset($post->post_type)) |
|
| 2134 | 2134 | $post_type = $post->post_type; |
| 2135 | 2135 | elseif ($typenow) |
| 2136 | 2136 | $post_type = $typenow; |
@@ -2164,7 +2164,7 @@ discard block |
||
| 2164 | 2164 | // Don't allow same slug url for listing and location |
| 2165 | 2165 | if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {
|
| 2166 | 2166 | $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');
|
| 2167 | - wp_redirect($redirect_url); |
|
| 2167 | + wp_redirect($redirect_url); |
|
| 2168 | 2168 | exit; |
| 2169 | 2169 | } |
| 2170 | 2170 | |
@@ -2194,10 +2194,10 @@ discard block |
||
| 2194 | 2194 | * @package GeoDirectory |
| 2195 | 2195 | */ |
| 2196 | 2196 | function geodir_hide_admin_preview_button() {
|
| 2197 | - global $post_type; |
|
| 2198 | - $post_types = geodir_get_posttypes(); |
|
| 2199 | - if(in_array($post_type, $post_types)) |
|
| 2200 | - echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
|
|
| 2197 | + global $post_type; |
|
| 2198 | + $post_types = geodir_get_posttypes(); |
|
| 2199 | + if(in_array($post_type, $post_types)) |
|
| 2200 | + echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
|
|
| 2201 | 2201 | } |
| 2202 | 2202 | add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' ); |
| 2203 | 2203 | add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' ); |
@@ -2212,7 +2212,7 @@ discard block |
||
| 2212 | 2212 | */ |
| 2213 | 2213 | function geodir_import_export_tab( $tabs ) {
|
| 2214 | 2214 | $tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) ); |
| 2215 | - return $tabs; |
|
| 2215 | + return $tabs; |
|
| 2216 | 2216 | } |
| 2217 | 2217 | |
| 2218 | 2218 | /** |
@@ -2227,26 +2227,26 @@ discard block |
||
| 2227 | 2227 | function geodir_import_export_page() {
|
| 2228 | 2228 | $nonce = wp_create_nonce( 'geodir_import_export_nonce' ); |
| 2229 | 2229 | $gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv'; |
| 2230 | - /** |
|
| 2231 | - * Filter sample category data csv file url. |
|
| 2232 | - * |
|
| 2233 | - * @since 1.0.0 |
|
| 2234 | - * @package GeoDirectory |
|
| 2235 | - * |
|
| 2236 | - * @param string $gd_cats_sample_csv Sample category data csv file url. |
|
| 2237 | - */ |
|
| 2230 | + /** |
|
| 2231 | + * Filter sample category data csv file url. |
|
| 2232 | + * |
|
| 2233 | + * @since 1.0.0 |
|
| 2234 | + * @package GeoDirectory |
|
| 2235 | + * |
|
| 2236 | + * @param string $gd_cats_sample_csv Sample category data csv file url. |
|
| 2237 | + */ |
|
| 2238 | 2238 | $gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv ); |
| 2239 | 2239 | |
| 2240 | 2240 | $gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv'; |
| 2241 | - /** |
|
| 2242 | - * Filter sample post data csv file url. |
|
| 2243 | - * |
|
| 2244 | - * @since 1.0.0 |
|
| 2245 | - * @package GeoDirectory |
|
| 2246 | - * |
|
| 2247 | - * @param string $gd_posts_sample_csv Sample post data csv file url. |
|
| 2248 | - */ |
|
| 2249 | - $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv ); |
|
| 2241 | + /** |
|
| 2242 | + * Filter sample post data csv file url. |
|
| 2243 | + * |
|
| 2244 | + * @since 1.0.0 |
|
| 2245 | + * @package GeoDirectory |
|
| 2246 | + * |
|
| 2247 | + * @param string $gd_posts_sample_csv Sample post data csv file url. |
|
| 2248 | + */ |
|
| 2249 | + $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv ); |
|
| 2250 | 2250 | |
| 2251 | 2251 | $gd_posttypes = geodir_get_posttypes( 'array' ); |
| 2252 | 2252 | |
@@ -2269,14 +2269,14 @@ discard block |
||
| 2269 | 2269 | $gd_chunksize_options[100000] = 100000; |
| 2270 | 2270 | |
| 2271 | 2271 | /** |
| 2272 | - * Filter max entries per export csv file. |
|
| 2273 | - * |
|
| 2274 | - * @since 1.5.6 |
|
| 2275 | - * @package GeoDirectory |
|
| 2276 | - * |
|
| 2277 | - * @param string $gd_chunksize_options Entries options. |
|
| 2278 | - */ |
|
| 2279 | - $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options ); |
|
| 2272 | + * Filter max entries per export csv file. |
|
| 2273 | + * |
|
| 2274 | + * @since 1.5.6 |
|
| 2275 | + * @package GeoDirectory |
|
| 2276 | + * |
|
| 2277 | + * @param string $gd_chunksize_options Entries options. |
|
| 2278 | + */ |
|
| 2279 | + $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options ); |
|
| 2280 | 2280 | |
| 2281 | 2281 | $gd_chunksize_option = ''; |
| 2282 | 2282 | foreach ($gd_chunksize_options as $value => $title) {
|
@@ -2293,12 +2293,12 @@ discard block |
||
| 2293 | 2293 | <div class="gd-content-heading"> |
| 2294 | 2294 | |
| 2295 | 2295 | <?php |
| 2296 | - @ini_set('max_execution_time', 999999);
|
|
| 2297 | - $ini_max_execution_time_check = @ini_get( 'max_execution_time' ); |
|
| 2298 | - @ini_restore('max_execution_time');
|
|
| 2296 | + @ini_set('max_execution_time', 999999);
|
|
| 2297 | + $ini_max_execution_time_check = @ini_get( 'max_execution_time' ); |
|
| 2298 | + @ini_restore('max_execution_time');
|
|
| 2299 | 2299 | |
| 2300 | - if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting
|
|
| 2301 | - ?> |
|
| 2300 | + if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting
|
|
| 2301 | + ?> |
|
| 2302 | 2302 | <div id="gd_ie_reqs" class="metabox-holder"> |
| 2303 | 2303 | <div class="meta-box-sortables ui-sortable"> |
| 2304 | 2304 | <div class="postbox"> |
@@ -2473,7 +2473,7 @@ discard block |
||
| 2473 | 2473 | * Called just after the sample CSV download link. |
| 2474 | 2474 | * |
| 2475 | 2475 | * @since 1.0.0 |
| 2476 | - * @package GeoDirectory |
|
| 2476 | + * @package GeoDirectory |
|
| 2477 | 2477 | */ |
| 2478 | 2478 | do_action('geodir_sample_cats_csv_download_link');
|
| 2479 | 2479 | ?> |
@@ -2558,11 +2558,11 @@ discard block |
||
| 2558 | 2558 | * |
| 2559 | 2559 | * Called after the last setting on the GD > Import & Export page. |
| 2560 | 2560 | * @since 1.4.6 |
| 2561 | - * @package GeoDirectory |
|
| 2561 | + * @package GeoDirectory |
|
| 2562 | 2562 | * |
| 2563 | 2563 | * @param array $gd_posttypes GD post types. |
| 2564 | - * @param array $gd_chunksize_options File chunk size options. |
|
| 2565 | - * @param string $nonce Wordpress security token for GD import & export. |
|
| 2564 | + * @param array $gd_chunksize_options File chunk size options. |
|
| 2565 | + * @param string $nonce Wordpress security token for GD import & export. |
|
| 2566 | 2566 | */ |
| 2567 | 2567 | do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce ); |
| 2568 | 2568 | ?> |
@@ -3249,44 +3249,44 @@ discard block |
||
| 3249 | 3249 | function geodir_init_filesystem() |
| 3250 | 3250 | {
|
| 3251 | 3251 | |
| 3252 | - if(!function_exists('get_filesystem_method')){
|
|
| 3253 | - require_once(ABSPATH."/wp-admin/includes/file.php"); |
|
| 3254 | - } |
|
| 3255 | - $access_type = get_filesystem_method(); |
|
| 3256 | - if ($access_type === 'direct') {
|
|
| 3257 | - /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */ |
|
| 3258 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3259 | - |
|
| 3260 | - /* initialize the API */ |
|
| 3261 | - if (!WP_Filesystem($creds)) {
|
|
| 3262 | - /* any problems and we exit */ |
|
| 3263 | - //return '@@@3'; |
|
| 3264 | - return false; |
|
| 3265 | - } |
|
| 3252 | + if(!function_exists('get_filesystem_method')){
|
|
| 3253 | + require_once(ABSPATH."/wp-admin/includes/file.php"); |
|
| 3254 | + } |
|
| 3255 | + $access_type = get_filesystem_method(); |
|
| 3256 | + if ($access_type === 'direct') {
|
|
| 3257 | + /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */ |
|
| 3258 | + $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3259 | + |
|
| 3260 | + /* initialize the API */ |
|
| 3261 | + if (!WP_Filesystem($creds)) {
|
|
| 3262 | + /* any problems and we exit */ |
|
| 3263 | + //return '@@@3'; |
|
| 3264 | + return false; |
|
| 3265 | + } |
|
| 3266 | 3266 | |
| 3267 | - global $wp_filesystem; |
|
| 3268 | - return $wp_filesystem; |
|
| 3269 | - /* do our file manipulations below */ |
|
| 3270 | - } elseif (defined('FTP_USER')) {
|
|
| 3271 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3267 | + global $wp_filesystem; |
|
| 3268 | + return $wp_filesystem; |
|
| 3269 | + /* do our file manipulations below */ |
|
| 3270 | + } elseif (defined('FTP_USER')) {
|
|
| 3271 | + $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3272 | + |
|
| 3273 | + /* initialize the API */ |
|
| 3274 | + if (!WP_Filesystem($creds)) {
|
|
| 3275 | + /* any problems and we exit */ |
|
| 3276 | + //return '@@@33'; |
|
| 3277 | + return false; |
|
| 3278 | + } |
|
| 3272 | 3279 | |
| 3273 | - /* initialize the API */ |
|
| 3274 | - if (!WP_Filesystem($creds)) {
|
|
| 3275 | - /* any problems and we exit */ |
|
| 3276 | - //return '@@@33'; |
|
| 3277 | - return false; |
|
| 3278 | - } |
|
| 3280 | + global $wp_filesystem; |
|
| 3281 | + //return '@@@1'; |
|
| 3282 | + return $wp_filesystem; |
|
| 3279 | 3283 | |
| 3280 | - global $wp_filesystem; |
|
| 3281 | - //return '@@@1'; |
|
| 3282 | - return $wp_filesystem; |
|
| 3283 | - |
|
| 3284 | - } else {
|
|
| 3285 | - //return '@@@2'; |
|
| 3286 | - /* don't have direct write access. Prompt user with our notice */ |
|
| 3287 | - add_action('admin_notice', 'geodir_filesystem_notice');
|
|
| 3288 | - return false; |
|
| 3289 | - } |
|
| 3284 | + } else {
|
|
| 3285 | + //return '@@@2'; |
|
| 3286 | + /* don't have direct write access. Prompt user with our notice */ |
|
| 3287 | + add_action('admin_notice', 'geodir_filesystem_notice');
|
|
| 3288 | + return false; |
|
| 3289 | + } |
|
| 3290 | 3290 | |
| 3291 | 3291 | } |
| 3292 | 3292 | |
@@ -3304,10 +3304,10 @@ discard block |
||
| 3304 | 3304 | */ |
| 3305 | 3305 | function geodir_filesystem_notice() |
| 3306 | 3306 | { if ( defined( 'DOING_AJAX' ) ){return;}
|
| 3307 | - $access_type = get_filesystem_method(); |
|
| 3308 | - if ($access_type === 'direct') {
|
|
| 3309 | - } elseif (!defined('FTP_USER')) {
|
|
| 3310 | - ?> |
|
| 3307 | + $access_type = get_filesystem_method(); |
|
| 3308 | + if ($access_type === 'direct') {
|
|
| 3309 | + } elseif (!defined('FTP_USER')) {
|
|
| 3310 | + ?> |
|
| 3311 | 3311 | <div class="error"> |
| 3312 | 3312 | <p><?php _e('GeoDirectory does not have access to your filesystem, thing like import/export will not work. Please define your details in wp-config.php as explained here', 'geodirectory'); ?>
|
| 3313 | 3313 | <a target="_blank" href="http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants">http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants</a> |
@@ -3335,1280 +3335,1280 @@ discard block |
||
| 3335 | 3335 | * @return string Json data. |
| 3336 | 3336 | */ |
| 3337 | 3337 | function geodir_ajax_import_export() {
|
| 3338 | - global $wpdb, $plugin_prefix, $current_user, $wp_filesystem; |
|
| 3338 | + global $wpdb, $plugin_prefix, $current_user, $wp_filesystem; |
|
| 3339 | 3339 | |
| 3340 | - error_reporting(0); |
|
| 3340 | + error_reporting(0); |
|
| 3341 | 3341 | |
| 3342 | - $xstart = microtime(true); |
|
| 3342 | + $xstart = microtime(true); |
|
| 3343 | 3343 | |
| 3344 | - // try to set higher limits for import |
|
| 3345 | - $max_input_time = ini_get('max_input_time');
|
|
| 3346 | - $max_execution_time = ini_get('max_execution_time');
|
|
| 3347 | - $memory_limit= ini_get('memory_limit');
|
|
| 3344 | + // try to set higher limits for import |
|
| 3345 | + $max_input_time = ini_get('max_input_time');
|
|
| 3346 | + $max_execution_time = ini_get('max_execution_time');
|
|
| 3347 | + $memory_limit= ini_get('memory_limit');
|
|
| 3348 | 3348 | |
| 3349 | - if(!$max_input_time || $max_input_time<3000){
|
|
| 3350 | - @ini_set('max_input_time', 3000);
|
|
| 3351 | - } |
|
| 3349 | + if(!$max_input_time || $max_input_time<3000){
|
|
| 3350 | + @ini_set('max_input_time', 3000);
|
|
| 3351 | + } |
|
| 3352 | 3352 | |
| 3353 | - if(!$max_execution_time || $max_execution_time<3000){
|
|
| 3354 | - @ini_set('max_execution_time', 3000);
|
|
| 3355 | - } |
|
| 3353 | + if(!$max_execution_time || $max_execution_time<3000){
|
|
| 3354 | + @ini_set('max_execution_time', 3000);
|
|
| 3355 | + } |
|
| 3356 | 3356 | |
| 3357 | - if($memory_limit && str_replace('M','',$memory_limit)){
|
|
| 3358 | - if(str_replace('M','',$memory_limit)<256){
|
|
| 3359 | - @ini_set('memory_limit', '256M');
|
|
| 3360 | - } |
|
| 3361 | - } |
|
| 3357 | + if($memory_limit && str_replace('M','',$memory_limit)){
|
|
| 3358 | + if(str_replace('M','',$memory_limit)<256){
|
|
| 3359 | + @ini_set('memory_limit', '256M');
|
|
| 3360 | + } |
|
| 3361 | + } |
|
| 3362 | 3362 | |
| 3363 | - $json = array(); |
|
| 3363 | + $json = array(); |
|
| 3364 | 3364 | |
| 3365 | - if ( !current_user_can( 'manage_options' ) ) {
|
|
| 3366 | - wp_send_json( $json ); |
|
| 3367 | - } |
|
| 3365 | + if ( !current_user_can( 'manage_options' ) ) {
|
|
| 3366 | + wp_send_json( $json ); |
|
| 3367 | + } |
|
| 3368 | 3368 | |
| 3369 | - $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL; |
|
| 3370 | - $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL; |
|
| 3371 | - $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false; |
|
| 3369 | + $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL; |
|
| 3370 | + $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL; |
|
| 3371 | + $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false; |
|
| 3372 | 3372 | |
| 3373 | - if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {
|
|
| 3374 | - wp_send_json( $json ); |
|
| 3375 | - } |
|
| 3373 | + if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {
|
|
| 3374 | + wp_send_json( $json ); |
|
| 3375 | + } |
|
| 3376 | 3376 | |
| 3377 | - $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL; |
|
| 3378 | - $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL; |
|
| 3379 | - $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page; |
|
| 3380 | - $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1; |
|
| 3377 | + $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL; |
|
| 3378 | + $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL; |
|
| 3379 | + $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page; |
|
| 3380 | + $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1; |
|
| 3381 | 3381 | |
| 3382 | - $wp_filesystem = geodir_init_filesystem(); |
|
| 3383 | - if (!$wp_filesystem) {
|
|
| 3384 | - $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' ); |
|
| 3385 | - wp_send_json( $json ); |
|
| 3386 | - } |
|
| 3382 | + $wp_filesystem = geodir_init_filesystem(); |
|
| 3383 | + if (!$wp_filesystem) {
|
|
| 3384 | + $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' ); |
|
| 3385 | + wp_send_json( $json ); |
|
| 3386 | + } |
|
| 3387 | 3387 | |
| 3388 | - if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
|
|
| 3389 | - $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' ); |
|
| 3390 | - wp_send_json( $json ); |
|
| 3391 | - } |
|
| 3388 | + if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
|
|
| 3389 | + $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' ); |
|
| 3390 | + wp_send_json( $json ); |
|
| 3391 | + } |
|
| 3392 | 3392 | |
| 3393 | - $csv_file_dir = geodir_path_import_export( false ); |
|
| 3394 | - if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {
|
|
| 3395 | - if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {
|
|
| 3396 | - $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3397 | - wp_send_json( $json ); |
|
| 3398 | - } |
|
| 3399 | - } |
|
| 3393 | + $csv_file_dir = geodir_path_import_export( false ); |
|
| 3394 | + if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {
|
|
| 3395 | + if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {
|
|
| 3396 | + $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3397 | + wp_send_json( $json ); |
|
| 3398 | + } |
|
| 3399 | + } |
|
| 3400 | 3400 | |
| 3401 | - $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
|
| 3402 | - $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 3403 | - |
|
| 3404 | - switch ( $task ) {
|
|
| 3405 | - case 'export_posts': {
|
|
| 3406 | - // WPML |
|
| 3407 | - $is_wpml = geodir_is_wpml(); |
|
| 3408 | - if ($is_wpml) {
|
|
| 3409 | - global $sitepress; |
|
| 3410 | - $active_lang = ICL_LANGUAGE_CODE; |
|
| 3401 | + $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
|
| 3402 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 3403 | + |
|
| 3404 | + switch ( $task ) {
|
|
| 3405 | + case 'export_posts': {
|
|
| 3406 | + // WPML |
|
| 3407 | + $is_wpml = geodir_is_wpml(); |
|
| 3408 | + if ($is_wpml) {
|
|
| 3409 | + global $sitepress; |
|
| 3410 | + $active_lang = ICL_LANGUAGE_CODE; |
|
| 3411 | 3411 | |
| 3412 | - $sitepress->switch_lang('all', true);
|
|
| 3413 | - } |
|
| 3414 | - // WPML |
|
| 3415 | - if ( $post_type == 'gd_event' ) {
|
|
| 3416 | - add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 ); |
|
| 3417 | - } |
|
| 3418 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 3412 | + $sitepress->switch_lang('all', true);
|
|
| 3413 | + } |
|
| 3414 | + // WPML |
|
| 3415 | + if ( $post_type == 'gd_event' ) {
|
|
| 3416 | + add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 ); |
|
| 3417 | + } |
|
| 3418 | + $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 3419 | 3419 | |
| 3420 | - $file_name = $post_type . '_' . date( 'dmyHi' ); |
|
| 3421 | - if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {
|
|
| 3422 | - $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) ); |
|
| 3423 | - } |
|
| 3424 | - $posts_count = geodir_get_posts_count( $post_type ); |
|
| 3425 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3426 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3427 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3428 | - $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv'; |
|
| 3420 | + $file_name = $post_type . '_' . date( 'dmyHi' ); |
|
| 3421 | + if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {
|
|
| 3422 | + $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) ); |
|
| 3423 | + } |
|
| 3424 | + $posts_count = geodir_get_posts_count( $post_type ); |
|
| 3425 | + $file_url_base = geodir_path_import_export() . '/'; |
|
| 3426 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3427 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3428 | + $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv'; |
|
| 3429 | 3429 | |
| 3430 | - $chunk_file_paths = array(); |
|
| 3430 | + $chunk_file_paths = array(); |
|
| 3431 | 3431 | |
| 3432 | - if ( isset( $_REQUEST['_c'] ) ) {
|
|
| 3433 | - $json['total'] = $posts_count; |
|
| 3434 | - // WPML |
|
| 3435 | - if ($is_wpml) {
|
|
| 3436 | - $sitepress->switch_lang($active_lang, true); |
|
| 3437 | - } |
|
| 3438 | - // WPML |
|
| 3439 | - wp_send_json( $json ); |
|
| 3440 | - gd_die(); |
|
| 3441 | - } else if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3442 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3443 | - $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0; |
|
| 3444 | - $percentage = min( $percentage, 100 ); |
|
| 3432 | + if ( isset( $_REQUEST['_c'] ) ) {
|
|
| 3433 | + $json['total'] = $posts_count; |
|
| 3434 | + // WPML |
|
| 3435 | + if ($is_wpml) {
|
|
| 3436 | + $sitepress->switch_lang($active_lang, true); |
|
| 3437 | + } |
|
| 3438 | + // WPML |
|
| 3439 | + wp_send_json( $json ); |
|
| 3440 | + gd_die(); |
|
| 3441 | + } else if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3442 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3443 | + $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0; |
|
| 3444 | + $percentage = min( $percentage, 100 ); |
|
| 3445 | 3445 | |
| 3446 | - $json['percentage'] = $percentage; |
|
| 3447 | - // WPML |
|
| 3448 | - if ($is_wpml) {
|
|
| 3449 | - $sitepress->switch_lang($active_lang, true); |
|
| 3450 | - } |
|
| 3451 | - // WPML |
|
| 3452 | - wp_send_json( $json ); |
|
| 3453 | - gd_die(); |
|
| 3454 | - } else {
|
|
| 3455 | - if ( !$posts_count > 0 ) {
|
|
| 3456 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3457 | - } else {
|
|
| 3458 | - $total_posts = $posts_count; |
|
| 3459 | - if ($chunk_per_page > $total_posts) {
|
|
| 3460 | - $chunk_per_page = $total_posts; |
|
| 3461 | - } |
|
| 3462 | - $chunk_total_pages = ceil( $total_posts / $chunk_per_page ); |
|
| 3446 | + $json['percentage'] = $percentage; |
|
| 3447 | + // WPML |
|
| 3448 | + if ($is_wpml) {
|
|
| 3449 | + $sitepress->switch_lang($active_lang, true); |
|
| 3450 | + } |
|
| 3451 | + // WPML |
|
| 3452 | + wp_send_json( $json ); |
|
| 3453 | + gd_die(); |
|
| 3454 | + } else {
|
|
| 3455 | + if ( !$posts_count > 0 ) {
|
|
| 3456 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3457 | + } else {
|
|
| 3458 | + $total_posts = $posts_count; |
|
| 3459 | + if ($chunk_per_page > $total_posts) {
|
|
| 3460 | + $chunk_per_page = $total_posts; |
|
| 3461 | + } |
|
| 3462 | + $chunk_total_pages = ceil( $total_posts / $chunk_per_page ); |
|
| 3463 | 3463 | |
| 3464 | - $j = $chunk_page_no; |
|
| 3465 | - $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j ); |
|
| 3464 | + $j = $chunk_page_no; |
|
| 3465 | + $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j ); |
|
| 3466 | 3466 | |
| 3467 | - $per_page = 500; |
|
| 3468 | - if ($per_page > $chunk_per_page) {
|
|
| 3469 | - $per_page = $chunk_per_page; |
|
| 3470 | - } |
|
| 3471 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3467 | + $per_page = 500; |
|
| 3468 | + if ($per_page > $chunk_per_page) {
|
|
| 3469 | + $per_page = $chunk_per_page; |
|
| 3470 | + } |
|
| 3471 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3472 | 3472 | |
| 3473 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3474 | - $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page ); |
|
| 3473 | + for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3474 | + $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page ); |
|
| 3475 | 3475 | |
| 3476 | - $clear = $i == 0 ? true : false; |
|
| 3477 | - geodir_save_csv_data( $file_path_temp, $save_posts, $clear ); |
|
| 3478 | - } |
|
| 3476 | + $clear = $i == 0 ? true : false; |
|
| 3477 | + geodir_save_csv_data( $file_path_temp, $save_posts, $clear ); |
|
| 3478 | + } |
|
| 3479 | 3479 | |
| 3480 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3481 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3482 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3483 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3484 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3480 | + if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3481 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3482 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3483 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3484 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3485 | 3485 | |
| 3486 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3487 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3488 | - } |
|
| 3486 | + $file_url = $file_url_base . $chunk_file_name; |
|
| 3487 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3488 | + } |
|
| 3489 | 3489 | |
| 3490 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3491 | - $json['total'] = $posts_count; |
|
| 3492 | - $json['files'] = $chunk_file_paths; |
|
| 3493 | - } else {
|
|
| 3494 | - if ($j > 1) {
|
|
| 3495 | - $json['total'] = $posts_count; |
|
| 3496 | - $json['files'] = array(); |
|
| 3497 | - } else {
|
|
| 3498 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3499 | - } |
|
| 3500 | - } |
|
| 3501 | - } |
|
| 3502 | - // WPML |
|
| 3503 | - if ($is_wpml) {
|
|
| 3504 | - $sitepress->switch_lang($active_lang, true); |
|
| 3505 | - } |
|
| 3506 | - // WPML |
|
| 3507 | - wp_send_json( $json ); |
|
| 3508 | - } |
|
| 3509 | - } |
|
| 3510 | - break; |
|
| 3511 | - case 'export_cats': {
|
|
| 3512 | - // WPML |
|
| 3513 | - $is_wpml = geodir_is_wpml(); |
|
| 3514 | - if ($is_wpml) {
|
|
| 3515 | - global $sitepress; |
|
| 3516 | - $active_lang = ICL_LANGUAGE_CODE; |
|
| 3490 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3491 | + $json['total'] = $posts_count; |
|
| 3492 | + $json['files'] = $chunk_file_paths; |
|
| 3493 | + } else {
|
|
| 3494 | + if ($j > 1) {
|
|
| 3495 | + $json['total'] = $posts_count; |
|
| 3496 | + $json['files'] = array(); |
|
| 3497 | + } else {
|
|
| 3498 | + $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3499 | + } |
|
| 3500 | + } |
|
| 3501 | + } |
|
| 3502 | + // WPML |
|
| 3503 | + if ($is_wpml) {
|
|
| 3504 | + $sitepress->switch_lang($active_lang, true); |
|
| 3505 | + } |
|
| 3506 | + // WPML |
|
| 3507 | + wp_send_json( $json ); |
|
| 3508 | + } |
|
| 3509 | + } |
|
| 3510 | + break; |
|
| 3511 | + case 'export_cats': {
|
|
| 3512 | + // WPML |
|
| 3513 | + $is_wpml = geodir_is_wpml(); |
|
| 3514 | + if ($is_wpml) {
|
|
| 3515 | + global $sitepress; |
|
| 3516 | + $active_lang = ICL_LANGUAGE_CODE; |
|
| 3517 | 3517 | |
| 3518 | - $sitepress->switch_lang('all', true);
|
|
| 3519 | - } |
|
| 3520 | - // WPML |
|
| 3521 | - $file_name = $post_type . 'category_' . date( 'dmyHi' ); |
|
| 3518 | + $sitepress->switch_lang('all', true);
|
|
| 3519 | + } |
|
| 3520 | + // WPML |
|
| 3521 | + $file_name = $post_type . 'category_' . date( 'dmyHi' ); |
|
| 3522 | 3522 | |
| 3523 | - $terms_count = geodir_get_terms_count( $post_type ); |
|
| 3524 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3525 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3526 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3527 | - $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv'; |
|
| 3523 | + $terms_count = geodir_get_terms_count( $post_type ); |
|
| 3524 | + $file_url_base = geodir_path_import_export() . '/'; |
|
| 3525 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3526 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3527 | + $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv'; |
|
| 3528 | 3528 | |
| 3529 | - $chunk_file_paths = array(); |
|
| 3529 | + $chunk_file_paths = array(); |
|
| 3530 | 3530 | |
| 3531 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3532 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3533 | - $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0; |
|
| 3534 | - $percentage = min( $percentage, 100 ); |
|
| 3531 | + if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3532 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3533 | + $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0; |
|
| 3534 | + $percentage = min( $percentage, 100 ); |
|
| 3535 | 3535 | |
| 3536 | - $json['percentage'] = $percentage; |
|
| 3537 | - // WPML |
|
| 3538 | - if ($is_wpml) {
|
|
| 3539 | - $sitepress->switch_lang($active_lang, true); |
|
| 3540 | - } |
|
| 3541 | - // WPML |
|
| 3542 | - wp_send_json( $json ); |
|
| 3543 | - } else {
|
|
| 3544 | - if ( !$terms_count > 0 ) {
|
|
| 3545 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3546 | - } else {
|
|
| 3547 | - $total_terms = $terms_count; |
|
| 3548 | - if ($chunk_per_page > $terms_count) {
|
|
| 3549 | - $chunk_per_page = $terms_count; |
|
| 3550 | - } |
|
| 3551 | - $chunk_total_pages = ceil( $total_terms / $chunk_per_page ); |
|
| 3536 | + $json['percentage'] = $percentage; |
|
| 3537 | + // WPML |
|
| 3538 | + if ($is_wpml) {
|
|
| 3539 | + $sitepress->switch_lang($active_lang, true); |
|
| 3540 | + } |
|
| 3541 | + // WPML |
|
| 3542 | + wp_send_json( $json ); |
|
| 3543 | + } else {
|
|
| 3544 | + if ( !$terms_count > 0 ) {
|
|
| 3545 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3546 | + } else {
|
|
| 3547 | + $total_terms = $terms_count; |
|
| 3548 | + if ($chunk_per_page > $terms_count) {
|
|
| 3549 | + $chunk_per_page = $terms_count; |
|
| 3550 | + } |
|
| 3551 | + $chunk_total_pages = ceil( $total_terms / $chunk_per_page ); |
|
| 3552 | 3552 | |
| 3553 | - $j = $chunk_page_no; |
|
| 3554 | - $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j ); |
|
| 3553 | + $j = $chunk_page_no; |
|
| 3554 | + $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j ); |
|
| 3555 | 3555 | |
| 3556 | - $per_page = 500; |
|
| 3557 | - if ($per_page > $chunk_per_page) {
|
|
| 3558 | - $per_page = $chunk_per_page; |
|
| 3559 | - } |
|
| 3560 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3556 | + $per_page = 500; |
|
| 3557 | + if ($per_page > $chunk_per_page) {
|
|
| 3558 | + $per_page = $chunk_per_page; |
|
| 3559 | + } |
|
| 3560 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3561 | 3561 | |
| 3562 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3563 | - $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page ); |
|
| 3562 | + for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3563 | + $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page ); |
|
| 3564 | 3564 | |
| 3565 | - $clear = $i == 0 ? true : false; |
|
| 3566 | - geodir_save_csv_data( $file_path_temp, $save_terms, $clear ); |
|
| 3567 | - } |
|
| 3565 | + $clear = $i == 0 ? true : false; |
|
| 3566 | + geodir_save_csv_data( $file_path_temp, $save_terms, $clear ); |
|
| 3567 | + } |
|
| 3568 | 3568 | |
| 3569 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3570 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3571 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3572 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3573 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3569 | + if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3570 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3571 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3572 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3573 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3574 | 3574 | |
| 3575 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3576 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3577 | - } |
|
| 3575 | + $file_url = $file_url_base . $chunk_file_name; |
|
| 3576 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3577 | + } |
|
| 3578 | 3578 | |
| 3579 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3580 | - $json['total'] = $terms_count; |
|
| 3581 | - $json['files'] = $chunk_file_paths; |
|
| 3582 | - } else {
|
|
| 3583 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3584 | - } |
|
| 3585 | - } |
|
| 3586 | - // WPML |
|
| 3587 | - if ($is_wpml) {
|
|
| 3588 | - $sitepress->switch_lang($active_lang, true); |
|
| 3589 | - } |
|
| 3590 | - // WPML |
|
| 3591 | - wp_send_json( $json ); |
|
| 3592 | - } |
|
| 3593 | - } |
|
| 3594 | - break; |
|
| 3595 | - case 'export_locations': {
|
|
| 3596 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3597 | - $file_name = 'gd_locations_' . date( 'dmyHi' ); |
|
| 3598 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3599 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3600 | - $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv'; |
|
| 3579 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3580 | + $json['total'] = $terms_count; |
|
| 3581 | + $json['files'] = $chunk_file_paths; |
|
| 3582 | + } else {
|
|
| 3583 | + $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3584 | + } |
|
| 3585 | + } |
|
| 3586 | + // WPML |
|
| 3587 | + if ($is_wpml) {
|
|
| 3588 | + $sitepress->switch_lang($active_lang, true); |
|
| 3589 | + } |
|
| 3590 | + // WPML |
|
| 3591 | + wp_send_json( $json ); |
|
| 3592 | + } |
|
| 3593 | + } |
|
| 3594 | + break; |
|
| 3595 | + case 'export_locations': {
|
|
| 3596 | + $file_url_base = geodir_path_import_export() . '/'; |
|
| 3597 | + $file_name = 'gd_locations_' . date( 'dmyHi' ); |
|
| 3598 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3599 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3600 | + $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv'; |
|
| 3601 | 3601 | |
| 3602 | - $items_count = (int)geodir_location_imex_count_locations(); |
|
| 3602 | + $items_count = (int)geodir_location_imex_count_locations(); |
|
| 3603 | 3603 | |
| 3604 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3605 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3606 | - $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3607 | - $percentage = min( $percentage, 100 ); |
|
| 3604 | + if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3605 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3606 | + $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3607 | + $percentage = min( $percentage, 100 ); |
|
| 3608 | 3608 | |
| 3609 | - $json['percentage'] = $percentage; |
|
| 3610 | - wp_send_json( $json ); |
|
| 3611 | - } else {
|
|
| 3612 | - $chunk_file_paths = array(); |
|
| 3609 | + $json['percentage'] = $percentage; |
|
| 3610 | + wp_send_json( $json ); |
|
| 3611 | + } else {
|
|
| 3612 | + $chunk_file_paths = array(); |
|
| 3613 | 3613 | |
| 3614 | - if ( !$items_count > 0 ) {
|
|
| 3615 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3616 | - } else {
|
|
| 3617 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3618 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3614 | + if ( !$items_count > 0 ) {
|
|
| 3615 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3616 | + } else {
|
|
| 3617 | + $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3618 | + $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3619 | 3619 | |
| 3620 | - $j = $chunk_page_no; |
|
| 3621 | - $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j ); |
|
| 3620 | + $j = $chunk_page_no; |
|
| 3621 | + $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j ); |
|
| 3622 | 3622 | |
| 3623 | - $per_page = 500; |
|
| 3624 | - $per_page = min( $per_page, $chunk_per_page ); |
|
| 3625 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3623 | + $per_page = 500; |
|
| 3624 | + $per_page = min( $per_page, $chunk_per_page ); |
|
| 3625 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3626 | 3626 | |
| 3627 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3628 | - $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3627 | + for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3628 | + $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3629 | 3629 | |
| 3630 | - $clear = $i == 0 ? true : false; |
|
| 3631 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3632 | - } |
|
| 3630 | + $clear = $i == 0 ? true : false; |
|
| 3631 | + geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3632 | + } |
|
| 3633 | 3633 | |
| 3634 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3635 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3636 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3637 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3638 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3634 | + if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3635 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3636 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3637 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3638 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3639 | 3639 | |
| 3640 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3641 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3642 | - } |
|
| 3640 | + $file_url = $file_url_base . $chunk_file_name; |
|
| 3641 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3642 | + } |
|
| 3643 | 3643 | |
| 3644 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3645 | - $json['total'] = $items_count; |
|
| 3646 | - $json['files'] = $chunk_file_paths; |
|
| 3647 | - } else {
|
|
| 3648 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3649 | - } |
|
| 3650 | - } |
|
| 3651 | - wp_send_json( $json ); |
|
| 3652 | - } |
|
| 3653 | - } |
|
| 3654 | - break; |
|
| 3655 | - case 'export_hoods': {
|
|
| 3656 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3657 | - $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' ); |
|
| 3658 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3659 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3660 | - $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv'; |
|
| 3644 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3645 | + $json['total'] = $items_count; |
|
| 3646 | + $json['files'] = $chunk_file_paths; |
|
| 3647 | + } else {
|
|
| 3648 | + $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3649 | + } |
|
| 3650 | + } |
|
| 3651 | + wp_send_json( $json ); |
|
| 3652 | + } |
|
| 3653 | + } |
|
| 3654 | + break; |
|
| 3655 | + case 'export_hoods': {
|
|
| 3656 | + $file_url_base = geodir_path_import_export() . '/'; |
|
| 3657 | + $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' ); |
|
| 3658 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3659 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3660 | + $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv'; |
|
| 3661 | 3661 | |
| 3662 | - $items_count = (int)geodir_location_imex_count_neighbourhoods(); |
|
| 3662 | + $items_count = (int)geodir_location_imex_count_neighbourhoods(); |
|
| 3663 | 3663 | |
| 3664 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3665 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3666 | - $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3667 | - $percentage = min( $percentage, 100 ); |
|
| 3664 | + if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3665 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3666 | + $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3667 | + $percentage = min( $percentage, 100 ); |
|
| 3668 | 3668 | |
| 3669 | - $json['percentage'] = $percentage; |
|
| 3670 | - wp_send_json( $json ); |
|
| 3671 | - } else {
|
|
| 3672 | - $chunk_file_paths = array(); |
|
| 3669 | + $json['percentage'] = $percentage; |
|
| 3670 | + wp_send_json( $json ); |
|
| 3671 | + } else {
|
|
| 3672 | + $chunk_file_paths = array(); |
|
| 3673 | 3673 | |
| 3674 | - if ( !$items_count > 0 ) {
|
|
| 3675 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3676 | - } else {
|
|
| 3677 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3678 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3674 | + if ( !$items_count > 0 ) {
|
|
| 3675 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3676 | + } else {
|
|
| 3677 | + $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3678 | + $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3679 | 3679 | |
| 3680 | - $j = $chunk_page_no; |
|
| 3681 | - $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j ); |
|
| 3680 | + $j = $chunk_page_no; |
|
| 3681 | + $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j ); |
|
| 3682 | 3682 | |
| 3683 | - $per_page = 500; |
|
| 3684 | - $per_page = min( $per_page, $chunk_per_page ); |
|
| 3685 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3683 | + $per_page = 500; |
|
| 3684 | + $per_page = min( $per_page, $chunk_per_page ); |
|
| 3685 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3686 | 3686 | |
| 3687 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3688 | - $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3687 | + for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3688 | + $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3689 | 3689 | |
| 3690 | - $clear = $i == 0 ? true : false; |
|
| 3691 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3692 | - } |
|
| 3690 | + $clear = $i == 0 ? true : false; |
|
| 3691 | + geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3692 | + } |
|
| 3693 | 3693 | |
| 3694 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3695 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3696 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3697 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3698 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3694 | + if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3695 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3696 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3697 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3698 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3699 | 3699 | |
| 3700 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3701 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3702 | - } |
|
| 3700 | + $file_url = $file_url_base . $chunk_file_name; |
|
| 3701 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3702 | + } |
|
| 3703 | 3703 | |
| 3704 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3705 | - $json['total'] = $items_count; |
|
| 3706 | - $json['files'] = $chunk_file_paths; |
|
| 3707 | - } else {
|
|
| 3708 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3709 | - } |
|
| 3710 | - } |
|
| 3711 | - wp_send_json( $json ); |
|
| 3712 | - } |
|
| 3713 | - } |
|
| 3714 | - break; |
|
| 3715 | - case 'prepare_import': |
|
| 3716 | - case 'import_cat': |
|
| 3717 | - case 'import_post': |
|
| 3718 | - case 'import_loc': |
|
| 3719 | - case 'import_hood': {
|
|
| 3720 | - // WPML |
|
| 3721 | - $is_wpml = geodir_is_wpml(); |
|
| 3722 | - if ($is_wpml) {
|
|
| 3723 | - global $sitepress; |
|
| 3724 | - $active_lang = ICL_LANGUAGE_CODE; |
|
| 3725 | - } |
|
| 3726 | - // WPML |
|
| 3704 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3705 | + $json['total'] = $items_count; |
|
| 3706 | + $json['files'] = $chunk_file_paths; |
|
| 3707 | + } else {
|
|
| 3708 | + $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3709 | + } |
|
| 3710 | + } |
|
| 3711 | + wp_send_json( $json ); |
|
| 3712 | + } |
|
| 3713 | + } |
|
| 3714 | + break; |
|
| 3715 | + case 'prepare_import': |
|
| 3716 | + case 'import_cat': |
|
| 3717 | + case 'import_post': |
|
| 3718 | + case 'import_loc': |
|
| 3719 | + case 'import_hood': {
|
|
| 3720 | + // WPML |
|
| 3721 | + $is_wpml = geodir_is_wpml(); |
|
| 3722 | + if ($is_wpml) {
|
|
| 3723 | + global $sitepress; |
|
| 3724 | + $active_lang = ICL_LANGUAGE_CODE; |
|
| 3725 | + } |
|
| 3726 | + // WPML |
|
| 3727 | 3727 | |
| 3728 | - @ini_set( 'auto_detect_line_endings', true ); |
|
| 3728 | + @ini_set( 'auto_detect_line_endings', true ); |
|
| 3729 | 3729 | |
| 3730 | - $uploads = wp_upload_dir(); |
|
| 3731 | - $uploads_dir = $uploads['path']; |
|
| 3732 | - $uploads_subdir = $uploads['subdir']; |
|
| 3730 | + $uploads = wp_upload_dir(); |
|
| 3731 | + $uploads_dir = $uploads['path']; |
|
| 3732 | + $uploads_subdir = $uploads['subdir']; |
|
| 3733 | 3733 | |
| 3734 | - $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL; |
|
| 3735 | - $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip'; |
|
| 3734 | + $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL; |
|
| 3735 | + $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip'; |
|
| 3736 | 3736 | |
| 3737 | - $csv_file_arr = explode( '/', $csv_file ); |
|
| 3738 | - $csv_filename = end( $csv_file_arr ); |
|
| 3739 | - $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename; |
|
| 3737 | + $csv_file_arr = explode( '/', $csv_file ); |
|
| 3738 | + $csv_filename = end( $csv_file_arr ); |
|
| 3739 | + $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename; |
|
| 3740 | 3740 | |
| 3741 | - $json['file'] = $csv_file; |
|
| 3742 | - $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' ); |
|
| 3743 | - $file = array(); |
|
| 3744 | - |
|
| 3745 | - if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {
|
|
| 3746 | - $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename ); |
|
| 3747 | - |
|
| 3748 | - if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
| 3749 | - $json['error'] = NULL; |
|
| 3750 | - |
|
| 3751 | - $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line |
|
| 3752 | - setlocale(LC_ALL, 'en_US.UTF-8'); |
|
| 3753 | - if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {
|
|
| 3754 | - while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {
|
|
| 3755 | - if ( !empty( $data ) ) {
|
|
| 3756 | - $file[] = $data; |
|
| 3757 | - } |
|
| 3758 | - } |
|
| 3759 | - fclose($handle); |
|
| 3760 | - } |
|
| 3761 | - setlocale(LC_ALL, $lc_all); |
|
| 3741 | + $json['file'] = $csv_file; |
|
| 3742 | + $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' ); |
|
| 3743 | + $file = array(); |
|
| 3744 | + |
|
| 3745 | + if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {
|
|
| 3746 | + $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename ); |
|
| 3747 | + |
|
| 3748 | + if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
| 3749 | + $json['error'] = NULL; |
|
| 3750 | + |
|
| 3751 | + $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line |
|
| 3752 | + setlocale(LC_ALL, 'en_US.UTF-8'); |
|
| 3753 | + if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {
|
|
| 3754 | + while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {
|
|
| 3755 | + if ( !empty( $data ) ) {
|
|
| 3756 | + $file[] = $data; |
|
| 3757 | + } |
|
| 3758 | + } |
|
| 3759 | + fclose($handle); |
|
| 3760 | + } |
|
| 3761 | + setlocale(LC_ALL, $lc_all); |
|
| 3762 | 3762 | |
| 3763 | - $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
| 3763 | + $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
| 3764 | 3764 | |
| 3765 | - if (!$json['rows'] > 0) {
|
|
| 3766 | - $json['error'] = __('No data found in csv file.', 'geodirectory');
|
|
| 3767 | - } |
|
| 3768 | - } else {
|
|
| 3769 | - wp_send_json( $json ); |
|
| 3770 | - } |
|
| 3771 | - } else {
|
|
| 3772 | - wp_send_json( $json ); |
|
| 3773 | - } |
|
| 3765 | + if (!$json['rows'] > 0) {
|
|
| 3766 | + $json['error'] = __('No data found in csv file.', 'geodirectory');
|
|
| 3767 | + } |
|
| 3768 | + } else {
|
|
| 3769 | + wp_send_json( $json ); |
|
| 3770 | + } |
|
| 3771 | + } else {
|
|
| 3772 | + wp_send_json( $json ); |
|
| 3773 | + } |
|
| 3774 | 3774 | |
| 3775 | - if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
|
|
| 3776 | - wp_send_json( $json ); |
|
| 3777 | - } |
|
| 3775 | + if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
|
|
| 3776 | + wp_send_json( $json ); |
|
| 3777 | + } |
|
| 3778 | 3778 | |
| 3779 | - $total = $json['rows']; |
|
| 3780 | - $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1; |
|
| 3781 | - $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0; |
|
| 3779 | + $total = $json['rows']; |
|
| 3780 | + $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1; |
|
| 3781 | + $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0; |
|
| 3782 | 3782 | |
| 3783 | - $count = $limit; |
|
| 3783 | + $count = $limit; |
|
| 3784 | 3784 | |
| 3785 | - if ($count < $total) {
|
|
| 3786 | - $count = $processed + $count; |
|
| 3787 | - if ($count > $total) {
|
|
| 3788 | - $count = $total; |
|
| 3789 | - } |
|
| 3790 | - } else {
|
|
| 3791 | - $count = $total; |
|
| 3792 | - } |
|
| 3785 | + if ($count < $total) {
|
|
| 3786 | + $count = $processed + $count; |
|
| 3787 | + if ($count > $total) {
|
|
| 3788 | + $count = $total; |
|
| 3789 | + } |
|
| 3790 | + } else {
|
|
| 3791 | + $count = $total; |
|
| 3792 | + } |
|
| 3793 | 3793 | |
| 3794 | - $created = 0; |
|
| 3795 | - $updated = 0; |
|
| 3796 | - $skipped = 0; |
|
| 3797 | - $invalid = 0; |
|
| 3798 | - $invalid_addr = 0; |
|
| 3799 | - $images = 0; |
|
| 3794 | + $created = 0; |
|
| 3795 | + $updated = 0; |
|
| 3796 | + $skipped = 0; |
|
| 3797 | + $invalid = 0; |
|
| 3798 | + $invalid_addr = 0; |
|
| 3799 | + $images = 0; |
|
| 3800 | 3800 | |
| 3801 | - $gd_post_info = array(); |
|
| 3802 | - $countpost = 0; |
|
| 3801 | + $gd_post_info = array(); |
|
| 3802 | + $countpost = 0; |
|
| 3803 | 3803 | |
| 3804 | - $post_types = geodir_get_posttypes(); |
|
| 3804 | + $post_types = geodir_get_posttypes(); |
|
| 3805 | 3805 | |
| 3806 | - if ( $task == 'import_cat' ) {
|
|
| 3807 | - if (!empty($file)) {
|
|
| 3808 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 3806 | + if ( $task == 'import_cat' ) {
|
|
| 3807 | + if (!empty($file)) {
|
|
| 3808 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 3809 | 3809 | |
| 3810 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 3811 | - $json['error'] = CSV_INVAILD_FILE; |
|
| 3812 | - wp_send_json( $json ); |
|
| 3813 | - exit; |
|
| 3814 | - } |
|
| 3810 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 3811 | + $json['error'] = CSV_INVAILD_FILE; |
|
| 3812 | + wp_send_json( $json ); |
|
| 3813 | + exit; |
|
| 3814 | + } |
|
| 3815 | 3815 | |
| 3816 | - $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');
|
|
| 3816 | + $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');
|
|
| 3817 | 3817 | |
| 3818 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 3819 | - $index = $processed + $i; |
|
| 3818 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 3819 | + $index = $processed + $i; |
|
| 3820 | 3820 | |
| 3821 | - if (isset($file[$index])) {
|
|
| 3822 | - $row = $file[$index]; |
|
| 3823 | - $row = array_map( 'trim', $row ); |
|
| 3824 | - //$row = array_map( 'utf8_encode', $row ); |
|
| 3821 | + if (isset($file[$index])) {
|
|
| 3822 | + $row = $file[$index]; |
|
| 3823 | + $row = array_map( 'trim', $row ); |
|
| 3824 | + //$row = array_map( 'utf8_encode', $row ); |
|
| 3825 | 3825 | |
| 3826 | - $cat_id = ''; |
|
| 3827 | - $cat_name = ''; |
|
| 3828 | - $cat_slug = ''; |
|
| 3829 | - $cat_posttype = ''; |
|
| 3830 | - $cat_parent = ''; |
|
| 3831 | - $cat_description = ''; |
|
| 3832 | - $cat_schema = ''; |
|
| 3833 | - $cat_top_description = ''; |
|
| 3834 | - $cat_image = ''; |
|
| 3835 | - $cat_icon = ''; |
|
| 3836 | - $cat_language = ''; |
|
| 3837 | - $cat_id_original = ''; |
|
| 3826 | + $cat_id = ''; |
|
| 3827 | + $cat_name = ''; |
|
| 3828 | + $cat_slug = ''; |
|
| 3829 | + $cat_posttype = ''; |
|
| 3830 | + $cat_parent = ''; |
|
| 3831 | + $cat_description = ''; |
|
| 3832 | + $cat_schema = ''; |
|
| 3833 | + $cat_top_description = ''; |
|
| 3834 | + $cat_image = ''; |
|
| 3835 | + $cat_icon = ''; |
|
| 3836 | + $cat_language = ''; |
|
| 3837 | + $cat_id_original = ''; |
|
| 3838 | 3838 | |
| 3839 | - $c = 0; |
|
| 3840 | - foreach ($columns as $column ) {
|
|
| 3841 | - if ( $column == 'cat_id' ) {
|
|
| 3842 | - $cat_id = (int)$row[$c]; |
|
| 3843 | - } else if ( $column == 'cat_name' ) {
|
|
| 3844 | - $cat_name = $row[$c]; |
|
| 3845 | - } else if ( $column == 'cat_slug' ) {
|
|
| 3846 | - $cat_slug = $row[$c]; |
|
| 3847 | - } else if ( $column == 'cat_posttype' ) {
|
|
| 3848 | - $cat_posttype = $row[$c]; |
|
| 3849 | - } else if ( $column == 'cat_parent' ) {
|
|
| 3850 | - $cat_parent = trim($row[$c]); |
|
| 3851 | - } else if ( $column == 'cat_schema' && $row[$c] != '' ) {
|
|
| 3852 | - $cat_schema = $row[$c]; |
|
| 3853 | - } else if ( $column == 'cat_description' ) {
|
|
| 3854 | - $cat_description = $row[$c]; |
|
| 3855 | - } else if ( $column == 'cat_top_description' ) {
|
|
| 3856 | - $cat_top_description = $row[$c]; |
|
| 3857 | - } else if ( $column == 'cat_image' ) {
|
|
| 3858 | - $cat_image = $row[$c]; |
|
| 3859 | - } else if ( $column == 'cat_icon' ) {
|
|
| 3860 | - $cat_icon = $row[$c]; |
|
| 3861 | - } |
|
| 3862 | - // WPML |
|
| 3863 | - if ( $is_wpml ) {
|
|
| 3864 | - if ( $column == 'cat_language' ) {
|
|
| 3865 | - $cat_language = geodir_strtolower( trim( $row[$c] ) ); |
|
| 3866 | - } else if ( $column == 'cat_id_original' ) {
|
|
| 3867 | - $cat_id_original = (int)$row[$c]; |
|
| 3868 | - } |
|
| 3869 | - } |
|
| 3870 | - // WPML |
|
| 3871 | - $c++; |
|
| 3872 | - } |
|
| 3839 | + $c = 0; |
|
| 3840 | + foreach ($columns as $column ) {
|
|
| 3841 | + if ( $column == 'cat_id' ) {
|
|
| 3842 | + $cat_id = (int)$row[$c]; |
|
| 3843 | + } else if ( $column == 'cat_name' ) {
|
|
| 3844 | + $cat_name = $row[$c]; |
|
| 3845 | + } else if ( $column == 'cat_slug' ) {
|
|
| 3846 | + $cat_slug = $row[$c]; |
|
| 3847 | + } else if ( $column == 'cat_posttype' ) {
|
|
| 3848 | + $cat_posttype = $row[$c]; |
|
| 3849 | + } else if ( $column == 'cat_parent' ) {
|
|
| 3850 | + $cat_parent = trim($row[$c]); |
|
| 3851 | + } else if ( $column == 'cat_schema' && $row[$c] != '' ) {
|
|
| 3852 | + $cat_schema = $row[$c]; |
|
| 3853 | + } else if ( $column == 'cat_description' ) {
|
|
| 3854 | + $cat_description = $row[$c]; |
|
| 3855 | + } else if ( $column == 'cat_top_description' ) {
|
|
| 3856 | + $cat_top_description = $row[$c]; |
|
| 3857 | + } else if ( $column == 'cat_image' ) {
|
|
| 3858 | + $cat_image = $row[$c]; |
|
| 3859 | + } else if ( $column == 'cat_icon' ) {
|
|
| 3860 | + $cat_icon = $row[$c]; |
|
| 3861 | + } |
|
| 3862 | + // WPML |
|
| 3863 | + if ( $is_wpml ) {
|
|
| 3864 | + if ( $column == 'cat_language' ) {
|
|
| 3865 | + $cat_language = geodir_strtolower( trim( $row[$c] ) ); |
|
| 3866 | + } else if ( $column == 'cat_id_original' ) {
|
|
| 3867 | + $cat_id_original = (int)$row[$c]; |
|
| 3868 | + } |
|
| 3869 | + } |
|
| 3870 | + // WPML |
|
| 3871 | + $c++; |
|
| 3872 | + } |
|
| 3873 | 3873 | |
| 3874 | - if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {
|
|
| 3875 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 3874 | + if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {
|
|
| 3875 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 3876 | 3876 | |
| 3877 | - $invalid++; |
|
| 3878 | - continue; |
|
| 3879 | - } |
|
| 3877 | + $invalid++; |
|
| 3878 | + continue; |
|
| 3879 | + } |
|
| 3880 | 3880 | |
| 3881 | - // WPML |
|
| 3882 | - if ($is_wpml && $cat_language != '') {
|
|
| 3883 | - $sitepress->switch_lang($cat_language, true); |
|
| 3884 | - } |
|
| 3885 | - // WPML |
|
| 3881 | + // WPML |
|
| 3882 | + if ($is_wpml && $cat_language != '') {
|
|
| 3883 | + $sitepress->switch_lang($cat_language, true); |
|
| 3884 | + } |
|
| 3885 | + // WPML |
|
| 3886 | 3886 | |
| 3887 | - $term_data = array(); |
|
| 3888 | - $term_data['name'] = $cat_name; |
|
| 3889 | - $term_data['slug'] = $cat_slug; |
|
| 3890 | - $term_data['description'] = $cat_description; |
|
| 3891 | - $term_data['cat_schema'] = $cat_schema; |
|
| 3892 | - $term_data['top_description'] = $cat_top_description; |
|
| 3893 | - $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : ''; |
|
| 3894 | - $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : ''; |
|
| 3887 | + $term_data = array(); |
|
| 3888 | + $term_data['name'] = $cat_name; |
|
| 3889 | + $term_data['slug'] = $cat_slug; |
|
| 3890 | + $term_data['description'] = $cat_description; |
|
| 3891 | + $term_data['cat_schema'] = $cat_schema; |
|
| 3892 | + $term_data['top_description'] = $cat_top_description; |
|
| 3893 | + $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : ''; |
|
| 3894 | + $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : ''; |
|
| 3895 | 3895 | |
| 3896 | - //$term_data = array_map( 'utf8_encode', $term_data ); |
|
| 3896 | + //$term_data = array_map( 'utf8_encode', $term_data ); |
|
| 3897 | 3897 | |
| 3898 | - $taxonomy = $cat_posttype . 'category'; |
|
| 3898 | + $taxonomy = $cat_posttype . 'category'; |
|
| 3899 | 3899 | |
| 3900 | - $term_data['taxonomy'] = $taxonomy; |
|
| 3900 | + $term_data['taxonomy'] = $taxonomy; |
|
| 3901 | 3901 | |
| 3902 | - $term_parent_id = 0; |
|
| 3903 | - if ($cat_parent != "" || (int)$cat_parent > 0) {
|
|
| 3904 | - $term_parent = ''; |
|
| 3902 | + $term_parent_id = 0; |
|
| 3903 | + if ($cat_parent != "" || (int)$cat_parent > 0) {
|
|
| 3904 | + $term_parent = ''; |
|
| 3905 | 3905 | |
| 3906 | - if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
|
|
| 3907 | - // |
|
| 3908 | - } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
|
|
| 3909 | - // |
|
| 3910 | - } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
|
|
| 3911 | - // |
|
| 3912 | - } else {
|
|
| 3913 | - $term_parent_data = array(); |
|
| 3914 | - $term_parent_data['name'] = $cat_parent; |
|
| 3915 | - //$term_parent_data = array_map( 'utf8_encode', $term_parent_data ); |
|
| 3916 | - $term_parent_data['taxonomy'] = $taxonomy; |
|
| 3906 | + if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
|
|
| 3907 | + // |
|
| 3908 | + } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
|
|
| 3909 | + // |
|
| 3910 | + } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
|
|
| 3911 | + // |
|
| 3912 | + } else {
|
|
| 3913 | + $term_parent_data = array(); |
|
| 3914 | + $term_parent_data['name'] = $cat_parent; |
|
| 3915 | + //$term_parent_data = array_map( 'utf8_encode', $term_parent_data ); |
|
| 3916 | + $term_parent_data['taxonomy'] = $taxonomy; |
|
| 3917 | 3917 | |
| 3918 | - $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data ); |
|
| 3919 | - } |
|
| 3918 | + $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data ); |
|
| 3919 | + } |
|
| 3920 | 3920 | |
| 3921 | - if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
|
|
| 3922 | - $term_parent_id = (int)$term_parent->term_id; |
|
| 3923 | - } |
|
| 3924 | - } |
|
| 3925 | - $term_data['parent'] = (int)$term_parent_id; |
|
| 3921 | + if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
|
|
| 3922 | + $term_parent_id = (int)$term_parent->term_id; |
|
| 3923 | + } |
|
| 3924 | + } |
|
| 3925 | + $term_data['parent'] = (int)$term_parent_id; |
|
| 3926 | 3926 | |
| 3927 | - $term_id = NULL; |
|
| 3928 | - if ( $import_choice == 'update' ) {
|
|
| 3929 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3930 | - $term_data['term_id'] = $term['term_id']; |
|
| 3927 | + $term_id = NULL; |
|
| 3928 | + if ( $import_choice == 'update' ) {
|
|
| 3929 | + if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3930 | + $term_data['term_id'] = $term['term_id']; |
|
| 3931 | 3931 | |
| 3932 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3933 | - $updated++; |
|
| 3934 | - } else {
|
|
| 3935 | - $invalid++; |
|
| 3936 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3937 | - } |
|
| 3938 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3939 | - $term_data['term_id'] = $term['term_id']; |
|
| 3932 | + if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3933 | + $updated++; |
|
| 3934 | + } else {
|
|
| 3935 | + $invalid++; |
|
| 3936 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3937 | + } |
|
| 3938 | + } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3939 | + $term_data['term_id'] = $term['term_id']; |
|
| 3940 | 3940 | |
| 3941 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3942 | - $updated++; |
|
| 3943 | - } else {
|
|
| 3944 | - $invalid++; |
|
| 3945 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3946 | - } |
|
| 3947 | - } else {
|
|
| 3948 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3949 | - $created++; |
|
| 3950 | - } else {
|
|
| 3951 | - $invalid++; |
|
| 3952 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3953 | - } |
|
| 3954 | - } |
|
| 3955 | - } else if ( $import_choice == 'skip' ) {
|
|
| 3956 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3957 | - $skipped++; |
|
| 3958 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3959 | - $skipped++; |
|
| 3960 | - } else {
|
|
| 3961 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3962 | - $created++; |
|
| 3963 | - } else {
|
|
| 3964 | - $invalid++; |
|
| 3965 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3966 | - } |
|
| 3967 | - } |
|
| 3968 | - } else {
|
|
| 3969 | - $invalid++; |
|
| 3970 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3971 | - } |
|
| 3941 | + if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3942 | + $updated++; |
|
| 3943 | + } else {
|
|
| 3944 | + $invalid++; |
|
| 3945 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3946 | + } |
|
| 3947 | + } else {
|
|
| 3948 | + if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3949 | + $created++; |
|
| 3950 | + } else {
|
|
| 3951 | + $invalid++; |
|
| 3952 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3953 | + } |
|
| 3954 | + } |
|
| 3955 | + } else if ( $import_choice == 'skip' ) {
|
|
| 3956 | + if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3957 | + $skipped++; |
|
| 3958 | + } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3959 | + $skipped++; |
|
| 3960 | + } else {
|
|
| 3961 | + if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3962 | + $created++; |
|
| 3963 | + } else {
|
|
| 3964 | + $invalid++; |
|
| 3965 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3966 | + } |
|
| 3967 | + } |
|
| 3968 | + } else {
|
|
| 3969 | + $invalid++; |
|
| 3970 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3971 | + } |
|
| 3972 | 3972 | |
| 3973 | - if ( $term_id ) {
|
|
| 3974 | - // WPML |
|
| 3975 | - if ($is_wpml && geodir_wpml_is_taxonomy_translated($taxonomy) && $cat_id_original > 0 && $cat_language != '') {
|
|
| 3976 | - $wpml_element_type = 'tax_' . $taxonomy; |
|
| 3977 | - $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type ); |
|
| 3978 | - $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 3979 | - |
|
| 3980 | - $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type ); |
|
| 3973 | + if ( $term_id ) {
|
|
| 3974 | + // WPML |
|
| 3975 | + if ($is_wpml && geodir_wpml_is_taxonomy_translated($taxonomy) && $cat_id_original > 0 && $cat_language != '') {
|
|
| 3976 | + $wpml_element_type = 'tax_' . $taxonomy; |
|
| 3977 | + $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type ); |
|
| 3978 | + $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 3979 | + |
|
| 3980 | + $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type ); |
|
| 3981 | 3981 | |
| 3982 | - $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language ); |
|
| 3983 | - } |
|
| 3984 | - // WPML |
|
| 3982 | + $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language ); |
|
| 3983 | + } |
|
| 3984 | + // WPML |
|
| 3985 | 3985 | |
| 3986 | - if ( isset( $term_data['top_description'] ) ) {
|
|
| 3987 | - geodir_update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype ); |
|
| 3988 | - } |
|
| 3986 | + if ( isset( $term_data['top_description'] ) ) {
|
|
| 3987 | + geodir_update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype ); |
|
| 3988 | + } |
|
| 3989 | 3989 | |
| 3990 | - if ( isset( $term_data['cat_schema'] ) ) {
|
|
| 3991 | - geodir_update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype ); |
|
| 3992 | - } |
|
| 3990 | + if ( isset( $term_data['cat_schema'] ) ) {
|
|
| 3991 | + geodir_update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype ); |
|
| 3992 | + } |
|
| 3993 | 3993 | |
| 3994 | - $attachment = false; |
|
| 3995 | - if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {
|
|
| 3996 | - $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype ); |
|
| 3997 | - $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
| 3994 | + $attachment = false; |
|
| 3995 | + if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {
|
|
| 3996 | + $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype ); |
|
| 3997 | + $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
| 3998 | 3998 | |
| 3999 | - if ( basename($cat_image) != $term_data['image'] ) {
|
|
| 4000 | - $attachment = true; |
|
| 4001 | - geodir_update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype ); |
|
| 4002 | - } |
|
| 4003 | - } |
|
| 3999 | + if ( basename($cat_image) != $term_data['image'] ) {
|
|
| 4000 | + $attachment = true; |
|
| 4001 | + geodir_update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype ); |
|
| 4002 | + } |
|
| 4003 | + } |
|
| 4004 | 4004 | |
| 4005 | - if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {
|
|
| 4006 | - $cat_icon = geodir_get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype ); |
|
| 4007 | - $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
| 4008 | - |
|
| 4009 | - if ( basename($cat_icon) != $term_data['icon'] ) {
|
|
| 4010 | - $attachment = true; |
|
| 4011 | - geodir_update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype ); |
|
| 4012 | - } |
|
| 4013 | - } |
|
| 4005 | + if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {
|
|
| 4006 | + $cat_icon = geodir_get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype ); |
|
| 4007 | + $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
| 4008 | + |
|
| 4009 | + if ( basename($cat_icon) != $term_data['icon'] ) {
|
|
| 4010 | + $attachment = true; |
|
| 4011 | + geodir_update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype ); |
|
| 4012 | + } |
|
| 4013 | + } |
|
| 4014 | 4014 | |
| 4015 | - if ( $attachment ) {
|
|
| 4016 | - $images++; |
|
| 4017 | - } |
|
| 4018 | - } |
|
| 4015 | + if ( $attachment ) {
|
|
| 4016 | + $images++; |
|
| 4017 | + } |
|
| 4018 | + } |
|
| 4019 | 4019 | |
| 4020 | - // WPML |
|
| 4021 | - if ($is_wpml && $cat_language != '') {
|
|
| 4022 | - $sitepress->switch_lang($active_lang, true); |
|
| 4023 | - } |
|
| 4024 | - // WPML |
|
| 4025 | - } |
|
| 4026 | - } |
|
| 4027 | - } |
|
| 4020 | + // WPML |
|
| 4021 | + if ($is_wpml && $cat_language != '') {
|
|
| 4022 | + $sitepress->switch_lang($active_lang, true); |
|
| 4023 | + } |
|
| 4024 | + // WPML |
|
| 4025 | + } |
|
| 4026 | + } |
|
| 4027 | + } |
|
| 4028 | 4028 | |
| 4029 | - $json = array(); |
|
| 4030 | - $json['processed'] = $limit; |
|
| 4031 | - $json['created'] = $created; |
|
| 4032 | - $json['updated'] = $updated; |
|
| 4033 | - $json['skipped'] = $skipped; |
|
| 4034 | - $json['invalid'] = $invalid; |
|
| 4035 | - $json['images'] = $images; |
|
| 4029 | + $json = array(); |
|
| 4030 | + $json['processed'] = $limit; |
|
| 4031 | + $json['created'] = $created; |
|
| 4032 | + $json['updated'] = $updated; |
|
| 4033 | + $json['skipped'] = $skipped; |
|
| 4034 | + $json['invalid'] = $invalid; |
|
| 4035 | + $json['images'] = $images; |
|
| 4036 | 4036 | |
| 4037 | - wp_send_json( $json ); |
|
| 4038 | - exit; |
|
| 4039 | - } else if ( $task == 'import_post' ) {
|
|
| 4040 | - $xtimings['###1'] = microtime(true)-$xstart; |
|
| 4041 | - //run some stuff to make the import quicker |
|
| 4042 | - wp_defer_term_counting( true ); |
|
| 4043 | - wp_defer_comment_counting( true ); |
|
| 4044 | - $wpdb->query( 'SET autocommit = 0;' ); |
|
| 4037 | + wp_send_json( $json ); |
|
| 4038 | + exit; |
|
| 4039 | + } else if ( $task == 'import_post' ) {
|
|
| 4040 | + $xtimings['###1'] = microtime(true)-$xstart; |
|
| 4041 | + //run some stuff to make the import quicker |
|
| 4042 | + wp_defer_term_counting( true ); |
|
| 4043 | + wp_defer_comment_counting( true ); |
|
| 4044 | + $wpdb->query( 'SET autocommit = 0;' ); |
|
| 4045 | 4045 | // |
| 4046 | 4046 | // remove_all_actions('publish_post');
|
| 4047 | 4047 | // remove_all_actions('transition_post_status');
|
| 4048 | 4048 | // remove_all_actions('publish_future_post');
|
| 4049 | 4049 | |
| 4050 | - if (!empty($file)) {
|
|
| 4051 | - $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 4052 | - $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
|
| 4053 | - $default_status = 'publish'; |
|
| 4054 | - $current_date = date_i18n( 'Y-m-d', time() ); |
|
| 4050 | + if (!empty($file)) {
|
|
| 4051 | + $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 4052 | + $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
|
| 4053 | + $default_status = 'publish'; |
|
| 4054 | + $current_date = date_i18n( 'Y-m-d', time() ); |
|
| 4055 | 4055 | |
| 4056 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4056 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4057 | 4057 | |
| 4058 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4059 | - $json['error'] = CSV_INVAILD_FILE; |
|
| 4060 | - wp_send_json( $json ); |
|
| 4061 | - exit; |
|
| 4062 | - } |
|
| 4063 | - $xtimings['###2'] = microtime(true)-$xstart; |
|
| 4064 | - $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
|
|
| 4065 | - $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' ); |
|
| 4066 | - $processed_actual = 0; |
|
| 4067 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 4068 | - $index = $processed + $i; |
|
| 4069 | - $gd_post = array(); |
|
| 4058 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4059 | + $json['error'] = CSV_INVAILD_FILE; |
|
| 4060 | + wp_send_json( $json ); |
|
| 4061 | + exit; |
|
| 4062 | + } |
|
| 4063 | + $xtimings['###2'] = microtime(true)-$xstart; |
|
| 4064 | + $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
|
|
| 4065 | + $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' ); |
|
| 4066 | + $processed_actual = 0; |
|
| 4067 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 4068 | + $index = $processed + $i; |
|
| 4069 | + $gd_post = array(); |
|
| 4070 | 4070 | |
| 4071 | - if (isset($file[$index])) {
|
|
| 4072 | - $processed_actual++; |
|
| 4073 | - $row = $file[$index]; |
|
| 4074 | - $row = array_map( 'trim', $row ); |
|
| 4075 | - //$row = array_map( 'utf8_encode', $row ); |
|
| 4076 | - $row = array_map( 'addslashes_gpc', $row ); |
|
| 4071 | + if (isset($file[$index])) {
|
|
| 4072 | + $processed_actual++; |
|
| 4073 | + $row = $file[$index]; |
|
| 4074 | + $row = array_map( 'trim', $row ); |
|
| 4075 | + //$row = array_map( 'utf8_encode', $row ); |
|
| 4076 | + $row = array_map( 'addslashes_gpc', $row ); |
|
| 4077 | 4077 | |
| 4078 | - $post_id = ''; |
|
| 4079 | - $post_title = ''; |
|
| 4080 | - $post_date = ''; |
|
| 4081 | - $post_author = ''; |
|
| 4082 | - $post_content = ''; |
|
| 4083 | - $post_category_arr = array(); |
|
| 4084 | - $default_category = ''; |
|
| 4085 | - $post_tags = array(); |
|
| 4086 | - $post_type = ''; |
|
| 4087 | - $post_status = ''; |
|
| 4088 | - $is_featured = 0; |
|
| 4089 | - $geodir_video = ''; |
|
| 4090 | - $post_address = ''; |
|
| 4091 | - $post_city = ''; |
|
| 4092 | - $post_region = ''; |
|
| 4093 | - $post_country = ''; |
|
| 4094 | - $post_zip = ''; |
|
| 4095 | - $post_latitude = ''; |
|
| 4096 | - $post_longitude = ''; |
|
| 4097 | - $post_neighbourhood = ''; |
|
| 4098 | - $neighbourhood_latitude = ''; |
|
| 4099 | - $neighbourhood_longitude = ''; |
|
| 4100 | - $geodir_timing = ''; |
|
| 4101 | - $geodir_contact = ''; |
|
| 4102 | - $geodir_email = ''; |
|
| 4103 | - $geodir_website = ''; |
|
| 4104 | - $geodir_twitter = ''; |
|
| 4105 | - $geodir_facebook = ''; |
|
| 4106 | - $geodir_twitter = ''; |
|
| 4107 | - $geodir_link_business = null; |
|
| 4108 | - $post_images = array(); |
|
| 4078 | + $post_id = ''; |
|
| 4079 | + $post_title = ''; |
|
| 4080 | + $post_date = ''; |
|
| 4081 | + $post_author = ''; |
|
| 4082 | + $post_content = ''; |
|
| 4083 | + $post_category_arr = array(); |
|
| 4084 | + $default_category = ''; |
|
| 4085 | + $post_tags = array(); |
|
| 4086 | + $post_type = ''; |
|
| 4087 | + $post_status = ''; |
|
| 4088 | + $is_featured = 0; |
|
| 4089 | + $geodir_video = ''; |
|
| 4090 | + $post_address = ''; |
|
| 4091 | + $post_city = ''; |
|
| 4092 | + $post_region = ''; |
|
| 4093 | + $post_country = ''; |
|
| 4094 | + $post_zip = ''; |
|
| 4095 | + $post_latitude = ''; |
|
| 4096 | + $post_longitude = ''; |
|
| 4097 | + $post_neighbourhood = ''; |
|
| 4098 | + $neighbourhood_latitude = ''; |
|
| 4099 | + $neighbourhood_longitude = ''; |
|
| 4100 | + $geodir_timing = ''; |
|
| 4101 | + $geodir_contact = ''; |
|
| 4102 | + $geodir_email = ''; |
|
| 4103 | + $geodir_website = ''; |
|
| 4104 | + $geodir_twitter = ''; |
|
| 4105 | + $geodir_facebook = ''; |
|
| 4106 | + $geodir_twitter = ''; |
|
| 4107 | + $geodir_link_business = null; |
|
| 4108 | + $post_images = array(); |
|
| 4109 | 4109 | |
| 4110 | - $expire_date = 'Never'; |
|
| 4110 | + $expire_date = 'Never'; |
|
| 4111 | 4111 | |
| 4112 | - $language = ''; |
|
| 4113 | - $original_post_id = ''; |
|
| 4112 | + $language = ''; |
|
| 4113 | + $original_post_id = ''; |
|
| 4114 | 4114 | |
| 4115 | - $c = 0; |
|
| 4116 | - foreach ($columns as $column ) {
|
|
| 4117 | - $gd_post[$column] = $row[$c]; |
|
| 4115 | + $c = 0; |
|
| 4116 | + foreach ($columns as $column ) {
|
|
| 4117 | + $gd_post[$column] = $row[$c]; |
|
| 4118 | 4118 | |
| 4119 | - if ( $column == 'post_id' ) {
|
|
| 4120 | - $post_id = $row[$c]; |
|
| 4121 | - } else if ( $column == 'post_title' ) {
|
|
| 4122 | - $post_title = sanitize_text_field($row[$c]); |
|
| 4123 | - } else if ( $column == 'post_author' ) {
|
|
| 4124 | - $post_author = $row[$c]; |
|
| 4125 | - } else if ( $column == 'post_date' ) {
|
|
| 4126 | - $post_date = $row[$c]; |
|
| 4127 | - } else if ( $column == 'post_content' ) {
|
|
| 4128 | - $post_content = $row[$c]; |
|
| 4129 | - } else if ( $column == 'post_category' && $row[$c] != '' ) {
|
|
| 4130 | - $post_category_arr = explode( ',', $row[$c] ); |
|
| 4131 | - } else if ( $column == 'default_category' ) {
|
|
| 4132 | - $default_category = wp_kses_normalize_entities($row[$c]); |
|
| 4133 | - } else if ( $column == 'post_tags' && $row[$c] != '' ) {
|
|
| 4134 | - $post_tags = explode( ',', sanitize_text_field($row[$c]) ); |
|
| 4135 | - } else if ( $column == 'post_type' ) {
|
|
| 4136 | - $post_type = $row[$c]; |
|
| 4137 | - } else if ( $column == 'post_status' ) {
|
|
| 4138 | - $post_status = sanitize_key( $row[$c] ); |
|
| 4139 | - } else if ( $column == 'is_featured' ) {
|
|
| 4140 | - $is_featured = (int)$row[$c]; |
|
| 4141 | - } else if ( $column == 'geodir_video' ) {
|
|
| 4142 | - $geodir_video = $row[$c]; |
|
| 4143 | - } else if ( $column == 'post_address' ) {
|
|
| 4144 | - $post_address = sanitize_text_field($row[$c]); |
|
| 4145 | - } else if ( $column == 'post_city' ) {
|
|
| 4146 | - $post_city = sanitize_text_field($row[$c]); |
|
| 4147 | - } else if ( $column == 'post_region' ) {
|
|
| 4148 | - $post_region = sanitize_text_field($row[$c]); |
|
| 4149 | - } else if ( $column == 'post_country' ) {
|
|
| 4150 | - $post_country = sanitize_text_field($row[$c]); |
|
| 4151 | - } else if ( $column == 'post_zip' ) {
|
|
| 4152 | - $post_zip = sanitize_text_field($row[$c]); |
|
| 4153 | - } else if ( $column == 'post_latitude' ) {
|
|
| 4154 | - $post_latitude = sanitize_text_field($row[$c]); |
|
| 4155 | - } else if ( $column == 'post_longitude' ) {
|
|
| 4156 | - $post_longitude = sanitize_text_field($row[$c]); |
|
| 4157 | - } else if ( $column == 'post_neighbourhood' ) {
|
|
| 4158 | - $post_neighbourhood = sanitize_text_field($row[$c]); |
|
| 4159 | - unset($gd_post[$column]); |
|
| 4160 | - } else if ( $column == 'neighbourhood_latitude' ) {
|
|
| 4161 | - $neighbourhood_latitude = sanitize_text_field($row[$c]); |
|
| 4162 | - } else if ( $column == 'neighbourhood_longitude' ) {
|
|
| 4163 | - $neighbourhood_longitude = sanitize_text_field($row[$c]); |
|
| 4164 | - } else if ( $column == 'geodir_timing' ) {
|
|
| 4165 | - $geodir_timing = sanitize_text_field($row[$c]); |
|
| 4166 | - } else if ( $column == 'geodir_contact' ) {
|
|
| 4167 | - $geodir_contact = sanitize_text_field($row[$c]); |
|
| 4168 | - } else if ( $column == 'geodir_email' ) {
|
|
| 4169 | - $geodir_email = sanitize_email($row[$c]); |
|
| 4170 | - } else if ( $column == 'geodir_website' ) {
|
|
| 4171 | - $geodir_website = sanitize_text_field($row[$c]); |
|
| 4172 | - } else if ( $column == 'geodir_twitter' ) {
|
|
| 4173 | - $geodir_twitter = sanitize_text_field($row[$c]); |
|
| 4174 | - } else if ( $column == 'geodir_facebook' ) {
|
|
| 4175 | - $geodir_facebook = sanitize_text_field($row[$c]); |
|
| 4176 | - } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
|
|
| 4177 | - $post_images[] = $row[$c]; |
|
| 4178 | - } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
|
|
| 4179 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) ); |
|
| 4180 | - } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
|
|
| 4181 | - $row[$c] = str_replace('/', '-', $row[$c]);
|
|
| 4182 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) ); |
|
| 4183 | - } else if ( strpos( $column, 'linked_' ) === 0 ) {
|
|
| 4184 | - $geodir_link_business = (int)$row[$c]; |
|
| 4185 | - } |
|
| 4186 | - // WPML |
|
| 4187 | - if ($is_wpml) {
|
|
| 4188 | - if ($column == 'language') {
|
|
| 4189 | - $language = geodir_strtolower(trim($row[$c])); |
|
| 4190 | - } else if ($column == 'original_post_id') {
|
|
| 4191 | - $original_post_id = (int)$row[$c]; |
|
| 4192 | - } |
|
| 4193 | - } |
|
| 4194 | - // WPML |
|
| 4195 | - $c++; |
|
| 4196 | - } |
|
| 4197 | - // listing claimed or not |
|
| 4198 | - if ($is_claim_active && isset($gd_post['claimed'])) {
|
|
| 4199 | - $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4200 | - } |
|
| 4119 | + if ( $column == 'post_id' ) {
|
|
| 4120 | + $post_id = $row[$c]; |
|
| 4121 | + } else if ( $column == 'post_title' ) {
|
|
| 4122 | + $post_title = sanitize_text_field($row[$c]); |
|
| 4123 | + } else if ( $column == 'post_author' ) {
|
|
| 4124 | + $post_author = $row[$c]; |
|
| 4125 | + } else if ( $column == 'post_date' ) {
|
|
| 4126 | + $post_date = $row[$c]; |
|
| 4127 | + } else if ( $column == 'post_content' ) {
|
|
| 4128 | + $post_content = $row[$c]; |
|
| 4129 | + } else if ( $column == 'post_category' && $row[$c] != '' ) {
|
|
| 4130 | + $post_category_arr = explode( ',', $row[$c] ); |
|
| 4131 | + } else if ( $column == 'default_category' ) {
|
|
| 4132 | + $default_category = wp_kses_normalize_entities($row[$c]); |
|
| 4133 | + } else if ( $column == 'post_tags' && $row[$c] != '' ) {
|
|
| 4134 | + $post_tags = explode( ',', sanitize_text_field($row[$c]) ); |
|
| 4135 | + } else if ( $column == 'post_type' ) {
|
|
| 4136 | + $post_type = $row[$c]; |
|
| 4137 | + } else if ( $column == 'post_status' ) {
|
|
| 4138 | + $post_status = sanitize_key( $row[$c] ); |
|
| 4139 | + } else if ( $column == 'is_featured' ) {
|
|
| 4140 | + $is_featured = (int)$row[$c]; |
|
| 4141 | + } else if ( $column == 'geodir_video' ) {
|
|
| 4142 | + $geodir_video = $row[$c]; |
|
| 4143 | + } else if ( $column == 'post_address' ) {
|
|
| 4144 | + $post_address = sanitize_text_field($row[$c]); |
|
| 4145 | + } else if ( $column == 'post_city' ) {
|
|
| 4146 | + $post_city = sanitize_text_field($row[$c]); |
|
| 4147 | + } else if ( $column == 'post_region' ) {
|
|
| 4148 | + $post_region = sanitize_text_field($row[$c]); |
|
| 4149 | + } else if ( $column == 'post_country' ) {
|
|
| 4150 | + $post_country = sanitize_text_field($row[$c]); |
|
| 4151 | + } else if ( $column == 'post_zip' ) {
|
|
| 4152 | + $post_zip = sanitize_text_field($row[$c]); |
|
| 4153 | + } else if ( $column == 'post_latitude' ) {
|
|
| 4154 | + $post_latitude = sanitize_text_field($row[$c]); |
|
| 4155 | + } else if ( $column == 'post_longitude' ) {
|
|
| 4156 | + $post_longitude = sanitize_text_field($row[$c]); |
|
| 4157 | + } else if ( $column == 'post_neighbourhood' ) {
|
|
| 4158 | + $post_neighbourhood = sanitize_text_field($row[$c]); |
|
| 4159 | + unset($gd_post[$column]); |
|
| 4160 | + } else if ( $column == 'neighbourhood_latitude' ) {
|
|
| 4161 | + $neighbourhood_latitude = sanitize_text_field($row[$c]); |
|
| 4162 | + } else if ( $column == 'neighbourhood_longitude' ) {
|
|
| 4163 | + $neighbourhood_longitude = sanitize_text_field($row[$c]); |
|
| 4164 | + } else if ( $column == 'geodir_timing' ) {
|
|
| 4165 | + $geodir_timing = sanitize_text_field($row[$c]); |
|
| 4166 | + } else if ( $column == 'geodir_contact' ) {
|
|
| 4167 | + $geodir_contact = sanitize_text_field($row[$c]); |
|
| 4168 | + } else if ( $column == 'geodir_email' ) {
|
|
| 4169 | + $geodir_email = sanitize_email($row[$c]); |
|
| 4170 | + } else if ( $column == 'geodir_website' ) {
|
|
| 4171 | + $geodir_website = sanitize_text_field($row[$c]); |
|
| 4172 | + } else if ( $column == 'geodir_twitter' ) {
|
|
| 4173 | + $geodir_twitter = sanitize_text_field($row[$c]); |
|
| 4174 | + } else if ( $column == 'geodir_facebook' ) {
|
|
| 4175 | + $geodir_facebook = sanitize_text_field($row[$c]); |
|
| 4176 | + } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
|
|
| 4177 | + $post_images[] = $row[$c]; |
|
| 4178 | + } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
|
|
| 4179 | + $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) ); |
|
| 4180 | + } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
|
|
| 4181 | + $row[$c] = str_replace('/', '-', $row[$c]);
|
|
| 4182 | + $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) ); |
|
| 4183 | + } else if ( strpos( $column, 'linked_' ) === 0 ) {
|
|
| 4184 | + $geodir_link_business = (int)$row[$c]; |
|
| 4185 | + } |
|
| 4186 | + // WPML |
|
| 4187 | + if ($is_wpml) {
|
|
| 4188 | + if ($column == 'language') {
|
|
| 4189 | + $language = geodir_strtolower(trim($row[$c])); |
|
| 4190 | + } else if ($column == 'original_post_id') {
|
|
| 4191 | + $original_post_id = (int)$row[$c]; |
|
| 4192 | + } |
|
| 4193 | + } |
|
| 4194 | + // WPML |
|
| 4195 | + $c++; |
|
| 4196 | + } |
|
| 4197 | + // listing claimed or not |
|
| 4198 | + if ($is_claim_active && isset($gd_post['claimed'])) {
|
|
| 4199 | + $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4200 | + } |
|
| 4201 | 4201 | |
| 4202 | - // WPML |
|
| 4203 | - if ($is_wpml && $language != '') {
|
|
| 4204 | - $sitepress->switch_lang($language, true); |
|
| 4205 | - } |
|
| 4206 | - // WPML |
|
| 4202 | + // WPML |
|
| 4203 | + if ($is_wpml && $language != '') {
|
|
| 4204 | + $sitepress->switch_lang($language, true); |
|
| 4205 | + } |
|
| 4206 | + // WPML |
|
| 4207 | 4207 | |
| 4208 | - $gd_post['IMAGE'] = $post_images; |
|
| 4208 | + $gd_post['IMAGE'] = $post_images; |
|
| 4209 | 4209 | |
| 4210 | - $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 4211 | - $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 4210 | + $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 4211 | + $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 4212 | 4212 | |
| 4213 | - $valid = true; |
|
| 4213 | + $valid = true; |
|
| 4214 | 4214 | |
| 4215 | - if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
|
|
| 4216 | - $invalid++; |
|
| 4217 | - $valid = false; |
|
| 4218 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 4219 | - } |
|
| 4220 | - $xtimings['###3'] = microtime(true)-$xstart; |
|
| 4221 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 4222 | - if ( $location_allowed ) {
|
|
| 4223 | - $location_result = geodir_get_default_location(); |
|
| 4224 | - if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
|
|
| 4225 | - $invalid_addr++; |
|
| 4226 | - $valid = false; |
|
| 4227 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4228 | - } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
|
|
| 4229 | - if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {
|
|
| 4230 | - $invalid_addr++; |
|
| 4231 | - $valid = false; |
|
| 4232 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4233 | - } else {
|
|
| 4234 | - if (!$location_manager) {
|
|
| 4235 | - $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated. |
|
| 4236 | - } |
|
| 4237 | - } |
|
| 4238 | - } |
|
| 4239 | - } |
|
| 4240 | - $xtimings['###4'] = microtime(true)-$xstart; |
|
| 4241 | - if ( !$valid ) {
|
|
| 4242 | - continue; |
|
| 4243 | - } |
|
| 4215 | + if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
|
|
| 4216 | + $invalid++; |
|
| 4217 | + $valid = false; |
|
| 4218 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 4219 | + } |
|
| 4220 | + $xtimings['###3'] = microtime(true)-$xstart; |
|
| 4221 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 4222 | + if ( $location_allowed ) {
|
|
| 4223 | + $location_result = geodir_get_default_location(); |
|
| 4224 | + if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
|
|
| 4225 | + $invalid_addr++; |
|
| 4226 | + $valid = false; |
|
| 4227 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4228 | + } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
|
|
| 4229 | + if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {
|
|
| 4230 | + $invalid_addr++; |
|
| 4231 | + $valid = false; |
|
| 4232 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4233 | + } else {
|
|
| 4234 | + if (!$location_manager) {
|
|
| 4235 | + $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated. |
|
| 4236 | + } |
|
| 4237 | + } |
|
| 4238 | + } |
|
| 4239 | + } |
|
| 4240 | + $xtimings['###4'] = microtime(true)-$xstart; |
|
| 4241 | + if ( !$valid ) {
|
|
| 4242 | + continue; |
|
| 4243 | + } |
|
| 4244 | 4244 | |
| 4245 | - $cat_taxonomy = $post_type . 'category'; |
|
| 4246 | - $tags_taxonomy = $post_type . '_tags'; |
|
| 4245 | + $cat_taxonomy = $post_type . 'category'; |
|
| 4246 | + $tags_taxonomy = $post_type . '_tags'; |
|
| 4247 | 4247 | |
| 4248 | - if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
|
|
| 4249 | - $post_category_arr = array_merge(array($default_category), $post_category_arr); |
|
| 4250 | - } |
|
| 4248 | + if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
|
|
| 4249 | + $post_category_arr = array_merge(array($default_category), $post_category_arr); |
|
| 4250 | + } |
|
| 4251 | 4251 | |
| 4252 | - $post_category = array(); |
|
| 4253 | - $default_category_id = NULL; |
|
| 4254 | - if ( !empty( $post_category_arr ) ) {
|
|
| 4255 | - foreach ( $post_category_arr as $value ) {
|
|
| 4256 | - $category_name = wp_kses_normalize_entities( trim( $value ) ); |
|
| 4252 | + $post_category = array(); |
|
| 4253 | + $default_category_id = NULL; |
|
| 4254 | + if ( !empty( $post_category_arr ) ) {
|
|
| 4255 | + foreach ( $post_category_arr as $value ) {
|
|
| 4256 | + $category_name = wp_kses_normalize_entities( trim( $value ) ); |
|
| 4257 | 4257 | |
| 4258 | - if ( $category_name != '' ) {
|
|
| 4259 | - $term_category = array(); |
|
| 4258 | + if ( $category_name != '' ) {
|
|
| 4259 | + $term_category = array(); |
|
| 4260 | 4260 | |
| 4261 | - if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
|
|
| 4262 | - $term_category = $term; |
|
| 4263 | - } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
|
|
| 4264 | - $term_category = $term; |
|
| 4265 | - } else {
|
|
| 4266 | - $term_data = array(); |
|
| 4267 | - $term_data['name'] = $category_name; |
|
| 4268 | - $term_data['taxonomy'] = $cat_taxonomy; |
|
| 4261 | + if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
|
|
| 4262 | + $term_category = $term; |
|
| 4263 | + } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
|
|
| 4264 | + $term_category = $term; |
|
| 4265 | + } else {
|
|
| 4266 | + $term_data = array(); |
|
| 4267 | + $term_data['name'] = $category_name; |
|
| 4268 | + $term_data['taxonomy'] = $cat_taxonomy; |
|
| 4269 | 4269 | |
| 4270 | - $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data ); |
|
| 4271 | - if ( $term_id ) {
|
|
| 4272 | - $term_category = get_term( $term_id, $cat_taxonomy ); |
|
| 4273 | - } |
|
| 4274 | - } |
|
| 4270 | + $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data ); |
|
| 4271 | + if ( $term_id ) {
|
|
| 4272 | + $term_category = get_term( $term_id, $cat_taxonomy ); |
|
| 4273 | + } |
|
| 4274 | + } |
|
| 4275 | 4275 | |
| 4276 | - if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
|
|
| 4277 | - $post_category[] = intval($term_category->term_id); |
|
| 4276 | + if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
|
|
| 4277 | + $post_category[] = intval($term_category->term_id); |
|
| 4278 | 4278 | |
| 4279 | - if ($category_name == $default_category) {
|
|
| 4280 | - $default_category_id = intval($term_category->term_id); |
|
| 4281 | - } |
|
| 4282 | - } |
|
| 4283 | - } |
|
| 4284 | - } |
|
| 4285 | - } |
|
| 4286 | - $xtimings['###5'] = microtime(true)-$xstart; |
|
| 4287 | - $save_post = array(); |
|
| 4288 | - $save_post['post_title'] = $post_title; |
|
| 4289 | - if (!empty($post_date)) {
|
|
| 4290 | - $post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format. |
|
| 4279 | + if ($category_name == $default_category) {
|
|
| 4280 | + $default_category_id = intval($term_category->term_id); |
|
| 4281 | + } |
|
| 4282 | + } |
|
| 4283 | + } |
|
| 4284 | + } |
|
| 4285 | + } |
|
| 4286 | + $xtimings['###5'] = microtime(true)-$xstart; |
|
| 4287 | + $save_post = array(); |
|
| 4288 | + $save_post['post_title'] = $post_title; |
|
| 4289 | + if (!empty($post_date)) {
|
|
| 4290 | + $post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format. |
|
| 4291 | 4291 | |
| 4292 | - $save_post['post_date'] = $post_date; |
|
| 4293 | - $save_post['post_date_gmt'] = get_gmt_from_date( $post_date ); |
|
| 4294 | - } |
|
| 4295 | - $save_post['post_content'] = $post_content; |
|
| 4296 | - $save_post['post_type'] = $post_type; |
|
| 4297 | - $save_post['post_author'] = $post_author; |
|
| 4298 | - $save_post['post_status'] = $post_status; |
|
| 4299 | - $save_post['post_category'] = $post_category; |
|
| 4300 | - $save_post['post_tags'] = $post_tags; |
|
| 4301 | - |
|
| 4302 | - $saved_post_id = NULL; |
|
| 4303 | - if ( $import_choice == 'update' ) {
|
|
| 4304 | - $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' ); |
|
| 4292 | + $save_post['post_date'] = $post_date; |
|
| 4293 | + $save_post['post_date_gmt'] = get_gmt_from_date( $post_date ); |
|
| 4294 | + } |
|
| 4295 | + $save_post['post_content'] = $post_content; |
|
| 4296 | + $save_post['post_type'] = $post_type; |
|
| 4297 | + $save_post['post_author'] = $post_author; |
|
| 4298 | + $save_post['post_status'] = $post_status; |
|
| 4299 | + $save_post['post_category'] = $post_category; |
|
| 4300 | + $save_post['post_tags'] = $post_tags; |
|
| 4301 | + |
|
| 4302 | + $saved_post_id = NULL; |
|
| 4303 | + if ( $import_choice == 'update' ) {
|
|
| 4304 | + $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' ); |
|
| 4305 | 4305 | |
| 4306 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4307 | - $save_post['ID'] = $post_id; |
|
| 4306 | + if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4307 | + $save_post['ID'] = $post_id; |
|
| 4308 | 4308 | |
| 4309 | - if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
|
|
| 4310 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4311 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4312 | - $saved_post_id = 0; |
|
| 4313 | - } else {
|
|
| 4314 | - $saved_post_id = $post_id; |
|
| 4315 | - $updated++; |
|
| 4316 | - } |
|
| 4317 | - } |
|
| 4318 | - } else {
|
|
| 4319 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4320 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4321 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4322 | - $saved_post_id = 0; |
|
| 4323 | - } else {
|
|
| 4324 | - $created++; |
|
| 4325 | - } |
|
| 4326 | - } |
|
| 4327 | - } |
|
| 4309 | + if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
|
|
| 4310 | + if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4311 | + $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4312 | + $saved_post_id = 0; |
|
| 4313 | + } else {
|
|
| 4314 | + $saved_post_id = $post_id; |
|
| 4315 | + $updated++; |
|
| 4316 | + } |
|
| 4317 | + } |
|
| 4318 | + } else {
|
|
| 4319 | + if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4320 | + if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4321 | + $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4322 | + $saved_post_id = 0; |
|
| 4323 | + } else {
|
|
| 4324 | + $created++; |
|
| 4325 | + } |
|
| 4326 | + } |
|
| 4327 | + } |
|
| 4328 | 4328 | |
| 4329 | - if ( !$saved_post_id > 0 ) {
|
|
| 4330 | - $invalid++; |
|
| 4331 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error ); |
|
| 4332 | - } |
|
| 4333 | - } else if ( $import_choice == 'skip' ) {
|
|
| 4334 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4335 | - $skipped++; |
|
| 4336 | - } else {
|
|
| 4337 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4338 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4339 | - $invalid++; |
|
| 4329 | + if ( !$saved_post_id > 0 ) {
|
|
| 4330 | + $invalid++; |
|
| 4331 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error ); |
|
| 4332 | + } |
|
| 4333 | + } else if ( $import_choice == 'skip' ) {
|
|
| 4334 | + if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4335 | + $skipped++; |
|
| 4336 | + } else {
|
|
| 4337 | + if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4338 | + if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4339 | + $invalid++; |
|
| 4340 | 4340 | |
| 4341 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error ); |
|
| 4342 | - $saved_post_id = 0; |
|
| 4343 | - } else {
|
|
| 4344 | - $created++; |
|
| 4345 | - } |
|
| 4346 | - } else {
|
|
| 4347 | - $invalid++; |
|
| 4341 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error ); |
|
| 4342 | + $saved_post_id = 0; |
|
| 4343 | + } else {
|
|
| 4344 | + $created++; |
|
| 4345 | + } |
|
| 4346 | + } else {
|
|
| 4347 | + $invalid++; |
|
| 4348 | 4348 | |
| 4349 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4350 | - } |
|
| 4351 | - } |
|
| 4352 | - } else {
|
|
| 4353 | - $invalid++; |
|
| 4349 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4350 | + } |
|
| 4351 | + } |
|
| 4352 | + } else {
|
|
| 4353 | + $invalid++; |
|
| 4354 | 4354 | |
| 4355 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4356 | - } |
|
| 4357 | - $xtimings['###6'] = microtime(true)-$xstart; |
|
| 4358 | - if ( (int)$saved_post_id > 0 ) {
|
|
| 4359 | - // WPML |
|
| 4360 | - if ($is_wpml && geodir_wpml_is_post_type_translated($post_type) && $original_post_id > 0 && $language != '') {
|
|
| 4361 | - $wpml_post_type = 'post_' . $post_type; |
|
| 4362 | - $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type ); |
|
| 4363 | - $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 4364 | - |
|
| 4365 | - $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type ); |
|
| 4355 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4356 | + } |
|
| 4357 | + $xtimings['###6'] = microtime(true)-$xstart; |
|
| 4358 | + if ( (int)$saved_post_id > 0 ) {
|
|
| 4359 | + // WPML |
|
| 4360 | + if ($is_wpml && geodir_wpml_is_post_type_translated($post_type) && $original_post_id > 0 && $language != '') {
|
|
| 4361 | + $wpml_post_type = 'post_' . $post_type; |
|
| 4362 | + $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type ); |
|
| 4363 | + $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 4364 | + |
|
| 4365 | + $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type ); |
|
| 4366 | 4366 | |
| 4367 | - $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language ); |
|
| 4368 | - } |
|
| 4369 | - // WPML |
|
| 4370 | - $gd_post_info = geodir_get_post_info( $saved_post_id ); |
|
| 4367 | + $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language ); |
|
| 4368 | + } |
|
| 4369 | + // WPML |
|
| 4370 | + $gd_post_info = geodir_get_post_info( $saved_post_id ); |
|
| 4371 | 4371 | |
| 4372 | - $gd_post['post_id'] = $saved_post_id; |
|
| 4373 | - $gd_post['ID'] = $saved_post_id; |
|
| 4374 | - $gd_post['post_tags'] = $post_tags; |
|
| 4375 | - $gd_post['post_title'] = $post_title; |
|
| 4376 | - $gd_post['post_status'] = $post_status; |
|
| 4377 | - $gd_post['submit_time'] = time(); |
|
| 4378 | - $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
| 4372 | + $gd_post['post_id'] = $saved_post_id; |
|
| 4373 | + $gd_post['ID'] = $saved_post_id; |
|
| 4374 | + $gd_post['post_tags'] = $post_tags; |
|
| 4375 | + $gd_post['post_title'] = $post_title; |
|
| 4376 | + $gd_post['post_status'] = $post_status; |
|
| 4377 | + $gd_post['submit_time'] = time(); |
|
| 4378 | + $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
| 4379 | 4379 | |
| 4380 | - // post location |
|
| 4381 | - $post_location_id = 0; |
|
| 4382 | - if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
|
|
| 4383 | - $gd_post['post_neighbourhood'] = ''; |
|
| 4380 | + // post location |
|
| 4381 | + $post_location_id = 0; |
|
| 4382 | + if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
|
|
| 4383 | + $gd_post['post_neighbourhood'] = ''; |
|
| 4384 | 4384 | |
| 4385 | - $post_location_info = array( |
|
| 4386 | - 'city' => $post_city, |
|
| 4387 | - 'region' => $post_region, |
|
| 4388 | - 'country' => $post_country, |
|
| 4389 | - 'geo_lat' => $post_latitude, |
|
| 4390 | - 'geo_lng' => $post_longitude |
|
| 4391 | - ); |
|
| 4392 | - if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
|
|
| 4393 | - $post_location_id = $location_id; |
|
| 4394 | - } |
|
| 4385 | + $post_location_info = array( |
|
| 4386 | + 'city' => $post_city, |
|
| 4387 | + 'region' => $post_region, |
|
| 4388 | + 'country' => $post_country, |
|
| 4389 | + 'geo_lat' => $post_latitude, |
|
| 4390 | + 'geo_lng' => $post_longitude |
|
| 4391 | + ); |
|
| 4392 | + if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
|
|
| 4393 | + $post_location_id = $location_id; |
|
| 4394 | + } |
|
| 4395 | 4395 | |
| 4396 | - if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {
|
|
| 4397 | - $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id); |
|
| 4396 | + if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {
|
|
| 4397 | + $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id); |
|
| 4398 | 4398 | |
| 4399 | - $hood_data = array(); |
|
| 4400 | - $hood_data['hood_location_id'] = $post_location_id; |
|
| 4401 | - $hood_data['hood_name'] = $post_neighbourhood; |
|
| 4399 | + $hood_data = array(); |
|
| 4400 | + $hood_data['hood_location_id'] = $post_location_id; |
|
| 4401 | + $hood_data['hood_name'] = $post_neighbourhood; |
|
| 4402 | 4402 | |
| 4403 | - if (!empty($neighbourhood_info)) {
|
|
| 4404 | - $hood_data['hood_id'] = $neighbourhood_info->hood_id; |
|
| 4405 | - $hood_data['hood_slug'] = $neighbourhood_info->hood_slug; |
|
| 4403 | + if (!empty($neighbourhood_info)) {
|
|
| 4404 | + $hood_data['hood_id'] = $neighbourhood_info->hood_id; |
|
| 4405 | + $hood_data['hood_slug'] = $neighbourhood_info->hood_slug; |
|
| 4406 | 4406 | |
| 4407 | - if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4408 | - $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4409 | - $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4410 | - } |
|
| 4411 | - } |
|
| 4407 | + if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4408 | + $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4409 | + $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4410 | + } |
|
| 4411 | + } |
|
| 4412 | 4412 | |
| 4413 | - if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4414 | - $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4415 | - $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4416 | - } |
|
| 4413 | + if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4414 | + $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4415 | + $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4416 | + } |
|
| 4417 | 4417 | |
| 4418 | - $hood_data['hood_latitude'] = $post_latitude; |
|
| 4419 | - $hood_data['hood_longitude'] = $post_longitude; |
|
| 4420 | - |
|
| 4421 | - $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data); |
|
| 4422 | - if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {
|
|
| 4423 | - $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug; |
|
| 4424 | - } |
|
| 4425 | - } |
|
| 4426 | - } |
|
| 4427 | - $gd_post['post_location_id'] = $post_location_id; |
|
| 4418 | + $hood_data['hood_latitude'] = $post_latitude; |
|
| 4419 | + $hood_data['hood_longitude'] = $post_longitude; |
|
| 4420 | + |
|
| 4421 | + $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data); |
|
| 4422 | + if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {
|
|
| 4423 | + $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug; |
|
| 4424 | + } |
|
| 4425 | + } |
|
| 4426 | + } |
|
| 4427 | + $gd_post['post_location_id'] = $post_location_id; |
|
| 4428 | 4428 | |
| 4429 | - if ($geodir_link_business !== null) {
|
|
| 4430 | - $gd_post['geodir_link_business'] = $geodir_link_business > 0 ? $geodir_link_business : ''; |
|
| 4431 | - } |
|
| 4429 | + if ($geodir_link_business !== null) {
|
|
| 4430 | + $gd_post['geodir_link_business'] = $geodir_link_business > 0 ? $geodir_link_business : ''; |
|
| 4431 | + } |
|
| 4432 | 4432 | |
| 4433 | - // post package info |
|
| 4434 | - $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0; |
|
| 4435 | - if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
|
|
| 4436 | - $package_id = $gd_post_info->package_id; |
|
| 4437 | - } |
|
| 4433 | + // post package info |
|
| 4434 | + $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0; |
|
| 4435 | + if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
|
|
| 4436 | + $package_id = $gd_post_info->package_id; |
|
| 4437 | + } |
|
| 4438 | 4438 | |
| 4439 | - $package_info = array(); |
|
| 4440 | - if ($package_id && function_exists('geodir_get_package_info_by_id')) {
|
|
| 4441 | - $package_info = (array)geodir_get_package_info_by_id($package_id); |
|
| 4439 | + $package_info = array(); |
|
| 4440 | + if ($package_id && function_exists('geodir_get_package_info_by_id')) {
|
|
| 4441 | + $package_info = (array)geodir_get_package_info_by_id($package_id); |
|
| 4442 | 4442 | |
| 4443 | - if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
|
|
| 4444 | - $package_info = array(); |
|
| 4445 | - } |
|
| 4446 | - } |
|
| 4443 | + if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
|
|
| 4444 | + $package_info = array(); |
|
| 4445 | + } |
|
| 4446 | + } |
|
| 4447 | 4447 | |
| 4448 | - if (empty($package_info)) {
|
|
| 4449 | - $package_info = (array)geodir_post_package_info( array(), '', $post_type ); |
|
| 4450 | - } |
|
| 4448 | + if (empty($package_info)) {
|
|
| 4449 | + $package_info = (array)geodir_post_package_info( array(), '', $post_type ); |
|
| 4450 | + } |
|
| 4451 | 4451 | |
| 4452 | - if (!empty($package_info)) {
|
|
| 4453 | - $package_id = $package_info['pid']; |
|
| 4452 | + if (!empty($package_info)) {
|
|
| 4453 | + $package_id = $package_info['pid']; |
|
| 4454 | 4454 | |
| 4455 | - if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
|
|
| 4456 | - $gd_post['expire_date'] = $expire_date; |
|
| 4457 | - } else {
|
|
| 4458 | - if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
|
|
| 4459 | - $gd_post['alive_days'] = (int)$package_info['days']; |
|
| 4460 | - $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) ); |
|
| 4461 | - } else {
|
|
| 4462 | - $gd_post['expire_date'] = 'Never'; |
|
| 4463 | - } |
|
| 4464 | - } |
|
| 4455 | + if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
|
|
| 4456 | + $gd_post['expire_date'] = $expire_date; |
|
| 4457 | + } else {
|
|
| 4458 | + if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
|
|
| 4459 | + $gd_post['alive_days'] = (int)$package_info['days']; |
|
| 4460 | + $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) ); |
|
| 4461 | + } else {
|
|
| 4462 | + $gd_post['expire_date'] = 'Never'; |
|
| 4463 | + } |
|
| 4464 | + } |
|
| 4465 | 4465 | |
| 4466 | - $gd_post['package_id'] = $package_id; |
|
| 4467 | - } |
|
| 4466 | + $gd_post['package_id'] = $package_id; |
|
| 4467 | + } |
|
| 4468 | 4468 | |
| 4469 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 4469 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 4470 | 4470 | |
| 4471 | - if ($post_type == 'gd_event') {
|
|
| 4472 | - $gd_post = geodir_imex_process_event_data($gd_post); |
|
| 4473 | - } |
|
| 4471 | + if ($post_type == 'gd_event') {
|
|
| 4472 | + $gd_post = geodir_imex_process_event_data($gd_post); |
|
| 4473 | + } |
|
| 4474 | 4474 | |
| 4475 | - if (isset($gd_post['post_id'])) {
|
|
| 4476 | - unset($gd_post['post_id']); |
|
| 4477 | - } |
|
| 4475 | + if (isset($gd_post['post_id'])) {
|
|
| 4476 | + unset($gd_post['post_id']); |
|
| 4477 | + } |
|
| 4478 | 4478 | |
| 4479 | - // Export franchise fields |
|
| 4480 | - $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 4481 | - if ($is_franchise_active) {
|
|
| 4482 | - if ( isset( $gd_post['gd_is_franchise'] ) && empty( $gd_post['franchise'] ) ) {
|
|
| 4483 | - if ( absint( $gd_post['gd_is_franchise'] ) != 0 ) {
|
|
| 4484 | - $gd_franchise_lock = array(); |
|
| 4479 | + // Export franchise fields |
|
| 4480 | + $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 4481 | + if ($is_franchise_active) {
|
|
| 4482 | + if ( isset( $gd_post['gd_is_franchise'] ) && empty( $gd_post['franchise'] ) ) {
|
|
| 4483 | + if ( absint( $gd_post['gd_is_franchise'] ) != 0 ) {
|
|
| 4484 | + $gd_franchise_lock = array(); |
|
| 4485 | 4485 | |
| 4486 | - if ( isset( $gd_post['gd_franchise_lock'] ) ) {
|
|
| 4487 | - $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
|
|
| 4488 | - $gd_franchise_lock = trim( $gd_franchise_lock ); |
|
| 4489 | - $gd_franchise_lock = explode( ",", $gd_franchise_lock ); |
|
| 4490 | - } |
|
| 4486 | + if ( isset( $gd_post['gd_franchise_lock'] ) ) {
|
|
| 4487 | + $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
|
|
| 4488 | + $gd_franchise_lock = trim( $gd_franchise_lock ); |
|
| 4489 | + $gd_franchise_lock = explode( ",", $gd_franchise_lock ); |
|
| 4490 | + } |
|
| 4491 | 4491 | |
| 4492 | - update_post_meta( $saved_post_id, 'gd_is_franchise', 1 ); |
|
| 4493 | - update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock ); |
|
| 4494 | - } else {
|
|
| 4495 | - if ( function_exists( 'geodir_franchise_remove_franchise' ) ) {
|
|
| 4496 | - geodir_franchise_remove_franchise( $saved_post_id ); |
|
| 4497 | - } |
|
| 4498 | - } |
|
| 4499 | - } else {
|
|
| 4500 | - if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
|
|
| 4501 | - geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] ); |
|
| 4502 | - } |
|
| 4503 | - } |
|
| 4504 | - } |
|
| 4492 | + update_post_meta( $saved_post_id, 'gd_is_franchise', 1 ); |
|
| 4493 | + update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock ); |
|
| 4494 | + } else {
|
|
| 4495 | + if ( function_exists( 'geodir_franchise_remove_franchise' ) ) {
|
|
| 4496 | + geodir_franchise_remove_franchise( $saved_post_id ); |
|
| 4497 | + } |
|
| 4498 | + } |
|
| 4499 | + } else {
|
|
| 4500 | + if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
|
|
| 4501 | + geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] ); |
|
| 4502 | + } |
|
| 4503 | + } |
|
| 4504 | + } |
|
| 4505 | 4505 | |
| 4506 | - if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
|
|
| 4507 | - $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) ); |
|
| 4508 | - if ($default_category_id) {
|
|
| 4509 | - $save_post['post_default_category'] = $default_category_id; |
|
| 4510 | - $gd_post['default_category'] = $default_category_id; |
|
| 4511 | - } |
|
| 4512 | - $gd_post[$cat_taxonomy] = $save_post['post_category']; |
|
| 4513 | - } |
|
| 4514 | - $xtimings['###7'] = microtime(true)-$xstart; |
|
| 4515 | - // Save post info |
|
| 4516 | - geodir_save_post_info( $saved_post_id, $gd_post ); |
|
| 4517 | - $xtimings['###8'] = microtime(true)-$xstart; |
|
| 4518 | - // post taxonomies |
|
| 4519 | - if ( !empty( $save_post['post_category'] ) ) {
|
|
| 4520 | - wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy ); |
|
| 4506 | + if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
|
|
| 4507 | + $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) ); |
|
| 4508 | + if ($default_category_id) {
|
|
| 4509 | + $save_post['post_default_category'] = $default_category_id; |
|
| 4510 | + $gd_post['default_category'] = $default_category_id; |
|
| 4511 | + } |
|
| 4512 | + $gd_post[$cat_taxonomy] = $save_post['post_category']; |
|
| 4513 | + } |
|
| 4514 | + $xtimings['###7'] = microtime(true)-$xstart; |
|
| 4515 | + // Save post info |
|
| 4516 | + geodir_save_post_info( $saved_post_id, $gd_post ); |
|
| 4517 | + $xtimings['###8'] = microtime(true)-$xstart; |
|
| 4518 | + // post taxonomies |
|
| 4519 | + if ( !empty( $save_post['post_category'] ) ) {
|
|
| 4520 | + wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy ); |
|
| 4521 | 4521 | |
| 4522 | - $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : ''; |
|
| 4523 | - if ($default_category_id) {
|
|
| 4524 | - $post_default_category = $default_category_id; |
|
| 4525 | - } |
|
| 4526 | - $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy); |
|
| 4527 | - $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
|
|
| 4528 | - $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
|
|
| 4522 | + $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : ''; |
|
| 4523 | + if ($default_category_id) {
|
|
| 4524 | + $post_default_category = $default_category_id; |
|
| 4525 | + } |
|
| 4526 | + $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy); |
|
| 4527 | + $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
|
|
| 4528 | + $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
|
|
| 4529 | 4529 | |
| 4530 | - if ($post_category_str != '' && $post_default_category) {
|
|
| 4531 | - $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str); |
|
| 4532 | - } |
|
| 4530 | + if ($post_category_str != '' && $post_default_category) {
|
|
| 4531 | + $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str); |
|
| 4532 | + } |
|
| 4533 | 4533 | |
| 4534 | - $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : ''; |
|
| 4534 | + $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : ''; |
|
| 4535 | 4535 | |
| 4536 | - geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str ); |
|
| 4537 | - } |
|
| 4538 | - $xtimings['###8.1'] = microtime(true)-$xstart; |
|
| 4539 | - if ( !empty( $save_post['post_tags'] ) ) {
|
|
| 4540 | - wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy ); |
|
| 4541 | - } |
|
| 4542 | - $xtimings['###9'] = microtime(true)-$xstart; |
|
| 4543 | - // Post images |
|
| 4544 | - if ( !empty( $post_images ) ) {
|
|
| 4545 | - $post_images = array_unique($post_images); |
|
| 4536 | + geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str ); |
|
| 4537 | + } |
|
| 4538 | + $xtimings['###8.1'] = microtime(true)-$xstart; |
|
| 4539 | + if ( !empty( $save_post['post_tags'] ) ) {
|
|
| 4540 | + wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy ); |
|
| 4541 | + } |
|
| 4542 | + $xtimings['###9'] = microtime(true)-$xstart; |
|
| 4543 | + // Post images |
|
| 4544 | + if ( !empty( $post_images ) ) {
|
|
| 4545 | + $post_images = array_unique($post_images); |
|
| 4546 | 4546 | |
| 4547 | - $old_post_images_arr = array(); |
|
| 4548 | - $saved_post_images_arr = array(); |
|
| 4547 | + $old_post_images_arr = array(); |
|
| 4548 | + $saved_post_images_arr = array(); |
|
| 4549 | 4549 | |
| 4550 | - $order = 1; |
|
| 4550 | + $order = 1; |
|
| 4551 | 4551 | |
| 4552 | - $old_post_images = geodir_get_images( $saved_post_id ); |
|
| 4553 | - $xtimings['###9.1'] = microtime(true)-$xstart; |
|
| 4554 | - if (!empty($old_post_images)) {
|
|
| 4555 | - foreach( $old_post_images as $old_post_image ) {
|
|
| 4556 | - if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
|
|
| 4557 | - $old_post_images_arr[] = $old_post_image->file; |
|
| 4558 | - } |
|
| 4559 | - } |
|
| 4560 | - } |
|
| 4552 | + $old_post_images = geodir_get_images( $saved_post_id ); |
|
| 4553 | + $xtimings['###9.1'] = microtime(true)-$xstart; |
|
| 4554 | + if (!empty($old_post_images)) {
|
|
| 4555 | + foreach( $old_post_images as $old_post_image ) {
|
|
| 4556 | + if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
|
|
| 4557 | + $old_post_images_arr[] = $old_post_image->file; |
|
| 4558 | + } |
|
| 4559 | + } |
|
| 4560 | + } |
|
| 4561 | 4561 | |
| 4562 | - foreach ( $post_images as $post_image ) {
|
|
| 4563 | - $image_name = basename( $post_image ); |
|
| 4564 | - $saved_post_images_arr[] = $image_name; |
|
| 4562 | + foreach ( $post_images as $post_image ) {
|
|
| 4563 | + $image_name = basename( $post_image ); |
|
| 4564 | + $saved_post_images_arr[] = $image_name; |
|
| 4565 | 4565 | |
| 4566 | - if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
|
|
| 4567 | - continue; // Skip if image already exists. |
|
| 4568 | - } |
|
| 4566 | + if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
|
|
| 4567 | + continue; // Skip if image already exists. |
|
| 4568 | + } |
|
| 4569 | 4569 | |
| 4570 | - $image_name_parts = explode( '.', $image_name ); |
|
| 4571 | - array_pop( $image_name_parts ); |
|
| 4572 | - $proper_image_name = implode( '.', $image_name_parts ); |
|
| 4573 | - $xtimings['###9.2'] = microtime(true)-$xstart; |
|
| 4574 | - $arr_file_type = wp_check_filetype( $image_name ); |
|
| 4575 | - $xtimings['###9.3'] = microtime(true)-$xstart; |
|
| 4576 | - if ( !empty( $arr_file_type ) ) {
|
|
| 4577 | - $uploaded_file_type = $arr_file_type['type']; |
|
| 4570 | + $image_name_parts = explode( '.', $image_name ); |
|
| 4571 | + array_pop( $image_name_parts ); |
|
| 4572 | + $proper_image_name = implode( '.', $image_name_parts ); |
|
| 4573 | + $xtimings['###9.2'] = microtime(true)-$xstart; |
|
| 4574 | + $arr_file_type = wp_check_filetype( $image_name ); |
|
| 4575 | + $xtimings['###9.3'] = microtime(true)-$xstart; |
|
| 4576 | + if ( !empty( $arr_file_type ) ) {
|
|
| 4577 | + $uploaded_file_type = $arr_file_type['type']; |
|
| 4578 | 4578 | |
| 4579 | - $attachment = array(); |
|
| 4580 | - $attachment['post_id'] = $saved_post_id; |
|
| 4581 | - $attachment['title'] = $proper_image_name; |
|
| 4582 | - $attachment['content'] = ''; |
|
| 4583 | - $attachment['file'] = $uploads_subdir . '/' . $image_name; |
|
| 4584 | - $attachment['mime_type'] = $uploaded_file_type; |
|
| 4585 | - $attachment['menu_order'] = $order; |
|
| 4586 | - $attachment['is_featured'] = 0; |
|
| 4587 | - |
|
| 4588 | - $attachment_set = ''; |
|
| 4589 | - foreach ( $attachment as $key => $val ) {
|
|
| 4590 | - if ( $val != '' ) {
|
|
| 4591 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 4592 | - } |
|
| 4593 | - } |
|
| 4594 | - $attachment_set = trim( $attachment_set, ", " ); |
|
| 4579 | + $attachment = array(); |
|
| 4580 | + $attachment['post_id'] = $saved_post_id; |
|
| 4581 | + $attachment['title'] = $proper_image_name; |
|
| 4582 | + $attachment['content'] = ''; |
|
| 4583 | + $attachment['file'] = $uploads_subdir . '/' . $image_name; |
|
| 4584 | + $attachment['mime_type'] = $uploaded_file_type; |
|
| 4585 | + $attachment['menu_order'] = $order; |
|
| 4586 | + $attachment['is_featured'] = 0; |
|
| 4587 | + |
|
| 4588 | + $attachment_set = ''; |
|
| 4589 | + foreach ( $attachment as $key => $val ) {
|
|
| 4590 | + if ( $val != '' ) {
|
|
| 4591 | + $attachment_set .= $key . " = '" . $val . "', "; |
|
| 4592 | + } |
|
| 4593 | + } |
|
| 4594 | + $attachment_set = trim( $attachment_set, ", " ); |
|
| 4595 | 4595 | |
| 4596 | - // Add new attachment |
|
| 4597 | - $xtimings['###9.4'] = microtime(true)-$xstart; |
|
| 4598 | - $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set ); |
|
| 4599 | - $xtimings['###9.5'] = microtime(true)-$xstart; |
|
| 4600 | - $order++; |
|
| 4601 | - } |
|
| 4602 | - } |
|
| 4603 | - |
|
| 4604 | - $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : '';
|
|
| 4605 | - // Remove previous attachment |
|
| 4606 | - $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql ); |
|
| 4607 | - $xtimings['###9.6'] = microtime(true)-$xstart; |
|
| 4608 | - if ( !empty( $saved_post_images_arr ) ) {
|
|
| 4609 | - geodir_set_wp_featured_image($saved_post_id); |
|
| 4610 | - $xtimings['###9.7'] = microtime(true)-$xstart; |
|
| 4611 | - /* |
|
| 4596 | + // Add new attachment |
|
| 4597 | + $xtimings['###9.4'] = microtime(true)-$xstart; |
|
| 4598 | + $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set ); |
|
| 4599 | + $xtimings['###9.5'] = microtime(true)-$xstart; |
|
| 4600 | + $order++; |
|
| 4601 | + } |
|
| 4602 | + } |
|
| 4603 | + |
|
| 4604 | + $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : '';
|
|
| 4605 | + // Remove previous attachment |
|
| 4606 | + $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql ); |
|
| 4607 | + $xtimings['###9.6'] = microtime(true)-$xstart; |
|
| 4608 | + if ( !empty( $saved_post_images_arr ) ) {
|
|
| 4609 | + geodir_set_wp_featured_image($saved_post_id); |
|
| 4610 | + $xtimings['###9.7'] = microtime(true)-$xstart; |
|
| 4611 | + /* |
|
| 4612 | 4612 | $menu_order = 1; |
| 4613 | 4613 | |
| 4614 | 4614 | foreach ( $saved_post_images_arr as $img_name ) {
|
@@ -4621,288 +4621,288 @@ discard block |
||
| 4621 | 4621 | } |
| 4622 | 4622 | $menu_order++; |
| 4623 | 4623 | }*/ |
| 4624 | - } |
|
| 4624 | + } |
|
| 4625 | 4625 | |
| 4626 | - if ( $order > 1 ) {
|
|
| 4627 | - $images++; |
|
| 4628 | - } |
|
| 4629 | - } |
|
| 4630 | - $xtimings['###10'] = microtime(true)-$xstart; |
|
| 4631 | - /** This action is documented in geodirectory-functions/post-functions.php */ |
|
| 4632 | - do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post ); |
|
| 4633 | - $xtimings['###11'] = microtime(true)-$xstart; |
|
| 4634 | - if (isset($is_featured)) {
|
|
| 4635 | - geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured); |
|
| 4636 | - } |
|
| 4637 | - if (isset($gd_post['alive_days'])) {
|
|
| 4638 | - geodir_save_post_meta($saved_post_id, 'alive_days', $gd_post['alive_days']); |
|
| 4639 | - } |
|
| 4640 | - if (isset($gd_post['expire_date'])) {
|
|
| 4641 | - geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']); |
|
| 4642 | - } |
|
| 4643 | - $xtimings['###12'] = microtime(true)-$xstart; |
|
| 4644 | - } |
|
| 4626 | + if ( $order > 1 ) {
|
|
| 4627 | + $images++; |
|
| 4628 | + } |
|
| 4629 | + } |
|
| 4630 | + $xtimings['###10'] = microtime(true)-$xstart; |
|
| 4631 | + /** This action is documented in geodirectory-functions/post-functions.php */ |
|
| 4632 | + do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post ); |
|
| 4633 | + $xtimings['###11'] = microtime(true)-$xstart; |
|
| 4634 | + if (isset($is_featured)) {
|
|
| 4635 | + geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured); |
|
| 4636 | + } |
|
| 4637 | + if (isset($gd_post['alive_days'])) {
|
|
| 4638 | + geodir_save_post_meta($saved_post_id, 'alive_days', $gd_post['alive_days']); |
|
| 4639 | + } |
|
| 4640 | + if (isset($gd_post['expire_date'])) {
|
|
| 4641 | + geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']); |
|
| 4642 | + } |
|
| 4643 | + $xtimings['###12'] = microtime(true)-$xstart; |
|
| 4644 | + } |
|
| 4645 | 4645 | |
| 4646 | - // WPML |
|
| 4647 | - if ($is_wpml && $language != '') {
|
|
| 4648 | - $sitepress->switch_lang($active_lang, true); |
|
| 4649 | - } |
|
| 4650 | - // WPML |
|
| 4651 | - } |
|
| 4652 | - } |
|
| 4653 | - } |
|
| 4646 | + // WPML |
|
| 4647 | + if ($is_wpml && $language != '') {
|
|
| 4648 | + $sitepress->switch_lang($active_lang, true); |
|
| 4649 | + } |
|
| 4650 | + // WPML |
|
| 4651 | + } |
|
| 4652 | + } |
|
| 4653 | + } |
|
| 4654 | 4654 | |
| 4655 | - //undo some stuff to make the import quicker |
|
| 4656 | - wp_defer_term_counting( false ); |
|
| 4657 | - wp_defer_comment_counting( false ); |
|
| 4658 | - $wpdb->query( 'COMMIT;' ); |
|
| 4659 | - $wpdb->query( 'SET autocommit = 1;' ); |
|
| 4660 | - $xtimings['###13'] = microtime(true)-$xstart; |
|
| 4661 | - $json = array(); |
|
| 4662 | - $json['processed'] = $processed_actual; |
|
| 4663 | - $json['created'] = $created; |
|
| 4664 | - $json['updated'] = $updated; |
|
| 4665 | - $json['skipped'] = $skipped; |
|
| 4666 | - $json['invalid'] = $invalid; |
|
| 4667 | - $json['invalid_addr'] = $invalid_addr; |
|
| 4668 | - $json['images'] = $images; |
|
| 4669 | - $json['timing'] = microtime(true)-$xstart; |
|
| 4670 | - $json['timings'] = $xtimings; |
|
| 4655 | + //undo some stuff to make the import quicker |
|
| 4656 | + wp_defer_term_counting( false ); |
|
| 4657 | + wp_defer_comment_counting( false ); |
|
| 4658 | + $wpdb->query( 'COMMIT;' ); |
|
| 4659 | + $wpdb->query( 'SET autocommit = 1;' ); |
|
| 4660 | + $xtimings['###13'] = microtime(true)-$xstart; |
|
| 4661 | + $json = array(); |
|
| 4662 | + $json['processed'] = $processed_actual; |
|
| 4663 | + $json['created'] = $created; |
|
| 4664 | + $json['updated'] = $updated; |
|
| 4665 | + $json['skipped'] = $skipped; |
|
| 4666 | + $json['invalid'] = $invalid; |
|
| 4667 | + $json['invalid_addr'] = $invalid_addr; |
|
| 4668 | + $json['images'] = $images; |
|
| 4669 | + $json['timing'] = microtime(true)-$xstart; |
|
| 4670 | + $json['timings'] = $xtimings; |
|
| 4671 | 4671 | |
| 4672 | 4672 | |
| 4673 | - wp_send_json( $json ); |
|
| 4674 | - exit; |
|
| 4675 | - } else if ( $task == 'import_loc' ) {
|
|
| 4676 | - global $gd_post_types; |
|
| 4677 | - $gd_post_types = $post_types; |
|
| 4673 | + wp_send_json( $json ); |
|
| 4674 | + exit; |
|
| 4675 | + } else if ( $task == 'import_loc' ) {
|
|
| 4676 | + global $gd_post_types; |
|
| 4677 | + $gd_post_types = $post_types; |
|
| 4678 | 4678 | |
| 4679 | - if (!empty($file)) {
|
|
| 4680 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4679 | + if (!empty($file)) {
|
|
| 4680 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4681 | 4681 | |
| 4682 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4683 | - $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
|
| 4684 | - wp_send_json( $json ); |
|
| 4685 | - } |
|
| 4682 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4683 | + $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
|
| 4684 | + wp_send_json( $json ); |
|
| 4685 | + } |
|
| 4686 | 4686 | |
| 4687 | - $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
|
|
| 4688 | - $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' ); |
|
| 4689 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 4690 | - $index = $processed + $i; |
|
| 4687 | + $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
|
|
| 4688 | + $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' ); |
|
| 4689 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 4690 | + $index = $processed + $i; |
|
| 4691 | 4691 | |
| 4692 | - if (isset($file[$index])) {
|
|
| 4693 | - $row = $file[$index]; |
|
| 4694 | - $row = array_map( 'trim', $row ); |
|
| 4695 | - $data = array(); |
|
| 4692 | + if (isset($file[$index])) {
|
|
| 4693 | + $row = $file[$index]; |
|
| 4694 | + $row = array_map( 'trim', $row ); |
|
| 4695 | + $data = array(); |
|
| 4696 | 4696 | |
| 4697 | - foreach ($columns as $c => $column ) {
|
|
| 4698 | - if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {
|
|
| 4699 | - $data[$column] = $row[$c]; |
|
| 4700 | - } |
|
| 4701 | - } |
|
| 4697 | + foreach ($columns as $c => $column ) {
|
|
| 4698 | + if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {
|
|
| 4699 | + $data[$column] = $row[$c]; |
|
| 4700 | + } |
|
| 4701 | + } |
|
| 4702 | 4702 | |
| 4703 | - if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
|
|
| 4704 | - $invalid++; |
|
| 4705 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4706 | - continue; |
|
| 4707 | - } |
|
| 4703 | + if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
|
|
| 4704 | + $invalid++; |
|
| 4705 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4706 | + continue; |
|
| 4707 | + } |
|
| 4708 | 4708 | |
| 4709 | - $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0; |
|
| 4709 | + $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0; |
|
| 4710 | 4710 | |
| 4711 | - if ( $import_choice == 'update' ) {
|
|
| 4712 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4713 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4714 | - $updated++; |
|
| 4715 | - } else {
|
|
| 4716 | - $invalid++; |
|
| 4717 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4718 | - } |
|
| 4719 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4720 | - $data['location_id'] = (int)$location->location_id; |
|
| 4711 | + if ( $import_choice == 'update' ) {
|
|
| 4712 | + if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4713 | + if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4714 | + $updated++; |
|
| 4715 | + } else {
|
|
| 4716 | + $invalid++; |
|
| 4717 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4718 | + } |
|
| 4719 | + } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4720 | + $data['location_id'] = (int)$location->location_id; |
|
| 4721 | 4721 | |
| 4722 | - if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
|
|
| 4723 | - $data['location_id'] = (int)$location->location_id; |
|
| 4724 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
|
|
| 4725 | - $data['location_id'] = (int)$location->location_id; |
|
| 4726 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
|
|
| 4727 | - $data['location_id'] = (int)$location->location_id; |
|
| 4728 | - } |
|
| 4722 | + if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
|
|
| 4723 | + $data['location_id'] = (int)$location->location_id; |
|
| 4724 | + } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
|
|
| 4725 | + $data['location_id'] = (int)$location->location_id; |
|
| 4726 | + } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
|
|
| 4727 | + $data['location_id'] = (int)$location->location_id; |
|
| 4728 | + } |
|
| 4729 | 4729 | |
| 4730 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4731 | - $updated++; |
|
| 4732 | - } else {
|
|
| 4733 | - $invalid++; |
|
| 4734 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4735 | - } |
|
| 4736 | - } else {
|
|
| 4737 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4738 | - $created++; |
|
| 4739 | - } else {
|
|
| 4740 | - $invalid++; |
|
| 4741 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4742 | - } |
|
| 4743 | - } |
|
| 4744 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4745 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4746 | - $skipped++; |
|
| 4747 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4748 | - $skipped++; |
|
| 4749 | - } else {
|
|
| 4750 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4751 | - $created++; |
|
| 4752 | - } else {
|
|
| 4753 | - $invalid++; |
|
| 4754 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4755 | - } |
|
| 4756 | - } |
|
| 4757 | - } else {
|
|
| 4758 | - $invalid++; |
|
| 4759 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4760 | - } |
|
| 4761 | - } |
|
| 4762 | - } |
|
| 4763 | - } |
|
| 4730 | + if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4731 | + $updated++; |
|
| 4732 | + } else {
|
|
| 4733 | + $invalid++; |
|
| 4734 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4735 | + } |
|
| 4736 | + } else {
|
|
| 4737 | + if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4738 | + $created++; |
|
| 4739 | + } else {
|
|
| 4740 | + $invalid++; |
|
| 4741 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4742 | + } |
|
| 4743 | + } |
|
| 4744 | + } elseif ( $import_choice == 'skip' ) {
|
|
| 4745 | + if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4746 | + $skipped++; |
|
| 4747 | + } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4748 | + $skipped++; |
|
| 4749 | + } else {
|
|
| 4750 | + if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4751 | + $created++; |
|
| 4752 | + } else {
|
|
| 4753 | + $invalid++; |
|
| 4754 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4755 | + } |
|
| 4756 | + } |
|
| 4757 | + } else {
|
|
| 4758 | + $invalid++; |
|
| 4759 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4760 | + } |
|
| 4761 | + } |
|
| 4762 | + } |
|
| 4763 | + } |
|
| 4764 | 4764 | |
| 4765 | - $json = array(); |
|
| 4766 | - $json['processed'] = $limit; |
|
| 4767 | - $json['created'] = $created; |
|
| 4768 | - $json['updated'] = $updated; |
|
| 4769 | - $json['skipped'] = $skipped; |
|
| 4770 | - $json['invalid'] = $invalid; |
|
| 4771 | - $json['images'] = $images; |
|
| 4765 | + $json = array(); |
|
| 4766 | + $json['processed'] = $limit; |
|
| 4767 | + $json['created'] = $created; |
|
| 4768 | + $json['updated'] = $updated; |
|
| 4769 | + $json['skipped'] = $skipped; |
|
| 4770 | + $json['invalid'] = $invalid; |
|
| 4771 | + $json['images'] = $images; |
|
| 4772 | 4772 | |
| 4773 | - wp_send_json( $json ); |
|
| 4774 | - } else if ( $task == 'import_hood' ) {
|
|
| 4775 | - if (!empty($file)) {
|
|
| 4776 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4773 | + wp_send_json( $json ); |
|
| 4774 | + } else if ( $task == 'import_hood' ) {
|
|
| 4775 | + if (!empty($file)) {
|
|
| 4776 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4777 | 4777 | |
| 4778 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4779 | - $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
|
| 4780 | - wp_send_json( $json ); |
|
| 4781 | - } |
|
| 4778 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4779 | + $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
|
| 4780 | + wp_send_json( $json ); |
|
| 4781 | + } |
|
| 4782 | 4782 | |
| 4783 | - $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
|
|
| 4784 | - $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ); |
|
| 4785 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 4786 | - $index = $processed + $i; |
|
| 4783 | + $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
|
|
| 4784 | + $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ); |
|
| 4785 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 4786 | + $index = $processed + $i; |
|
| 4787 | 4787 | |
| 4788 | - if (isset($file[$index])) {
|
|
| 4789 | - $row = $file[$index]; |
|
| 4790 | - $row = array_map( 'trim', $row ); |
|
| 4791 | - $data = array(); |
|
| 4788 | + if (isset($file[$index])) {
|
|
| 4789 | + $row = $file[$index]; |
|
| 4790 | + $row = array_map( 'trim', $row ); |
|
| 4791 | + $data = array(); |
|
| 4792 | 4792 | |
| 4793 | - foreach ($columns as $c => $column) {
|
|
| 4794 | - if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {
|
|
| 4795 | - $data[$column] = sanitize_text_field($row[$c]); |
|
| 4796 | - } |
|
| 4797 | - } |
|
| 4793 | + foreach ($columns as $c => $column) {
|
|
| 4794 | + if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {
|
|
| 4795 | + $data[$column] = sanitize_text_field($row[$c]); |
|
| 4796 | + } |
|
| 4797 | + } |
|
| 4798 | 4798 | |
| 4799 | - if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
|
|
| 4800 | - $invalid++; |
|
| 4801 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4802 | - continue; |
|
| 4803 | - } |
|
| 4799 | + if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
|
|
| 4800 | + $invalid++; |
|
| 4801 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4802 | + continue; |
|
| 4803 | + } |
|
| 4804 | 4804 | |
| 4805 | - $location_info = array(); |
|
| 4806 | - if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
|
|
| 4807 | - $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
|
|
| 4808 | - } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
|
|
| 4809 | - $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
|
|
| 4810 | - } |
|
| 4805 | + $location_info = array(); |
|
| 4806 | + if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
|
|
| 4807 | + $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
|
|
| 4808 | + } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
|
|
| 4809 | + $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
|
|
| 4810 | + } |
|
| 4811 | 4811 | |
| 4812 | - if (empty($location_info)) {
|
|
| 4813 | - $invalid++; |
|
| 4814 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4815 | - continue; |
|
| 4816 | - } |
|
| 4812 | + if (empty($location_info)) {
|
|
| 4813 | + $invalid++; |
|
| 4814 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4815 | + continue; |
|
| 4816 | + } |
|
| 4817 | 4817 | |
| 4818 | - $location_id = $location_info->location_id; |
|
| 4818 | + $location_id = $location_info->location_id; |
|
| 4819 | 4819 | |
| 4820 | - $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0; |
|
| 4820 | + $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0; |
|
| 4821 | 4821 | |
| 4822 | - $hood_data = array(); |
|
| 4823 | - $hood_data['hood_name'] = $data['neighbourhood_name']; |
|
| 4824 | - $hood_data['hood_slug'] = $data['neighbourhood_slug']; |
|
| 4825 | - $hood_data['hood_latitude'] = $data['latitude']; |
|
| 4826 | - $hood_data['hood_longitude'] = $data['longitude']; |
|
| 4827 | - $hood_data['hood_location_id'] = $location_id; |
|
| 4822 | + $hood_data = array(); |
|
| 4823 | + $hood_data['hood_name'] = $data['neighbourhood_name']; |
|
| 4824 | + $hood_data['hood_slug'] = $data['neighbourhood_slug']; |
|
| 4825 | + $hood_data['hood_latitude'] = $data['latitude']; |
|
| 4826 | + $hood_data['hood_longitude'] = $data['longitude']; |
|
| 4827 | + $hood_data['hood_location_id'] = $location_id; |
|
| 4828 | 4828 | |
| 4829 | - if ( $import_choice == 'update' ) {
|
|
| 4830 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4831 | - $hood_data['hood_id'] = (int)$data['neighbourhood_id']; |
|
| 4829 | + if ( $import_choice == 'update' ) {
|
|
| 4830 | + if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4831 | + $hood_data['hood_id'] = (int)$data['neighbourhood_id']; |
|
| 4832 | 4832 | |
| 4833 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4834 | - $updated++; |
|
| 4835 | - } else {
|
|
| 4836 | - $invalid++; |
|
| 4837 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4838 | - } |
|
| 4839 | - } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4840 | - $hood_data['hood_id'] = (int)$neighbourhood->hood_id; |
|
| 4833 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4834 | + $updated++; |
|
| 4835 | + } else {
|
|
| 4836 | + $invalid++; |
|
| 4837 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4838 | + } |
|
| 4839 | + } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4840 | + $hood_data['hood_id'] = (int)$neighbourhood->hood_id; |
|
| 4841 | 4841 | |
| 4842 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4843 | - $updated++; |
|
| 4844 | - } else {
|
|
| 4845 | - $invalid++; |
|
| 4846 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4847 | - } |
|
| 4848 | - } else {
|
|
| 4849 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4850 | - $created++; |
|
| 4851 | - } else {
|
|
| 4852 | - $invalid++; |
|
| 4853 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4854 | - } |
|
| 4855 | - } |
|
| 4856 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4857 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4858 | - $skipped++; |
|
| 4859 | - } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4860 | - $skipped++; |
|
| 4861 | - } else {
|
|
| 4842 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4843 | + $updated++; |
|
| 4844 | + } else {
|
|
| 4845 | + $invalid++; |
|
| 4846 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4847 | + } |
|
| 4848 | + } else {
|
|
| 4849 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4850 | + $created++; |
|
| 4851 | + } else {
|
|
| 4852 | + $invalid++; |
|
| 4853 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4854 | + } |
|
| 4855 | + } |
|
| 4856 | + } elseif ( $import_choice == 'skip' ) {
|
|
| 4857 | + if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4858 | + $skipped++; |
|
| 4859 | + } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4860 | + $skipped++; |
|
| 4861 | + } else {
|
|
| 4862 | 4862 | |
| 4863 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4864 | - $created++; |
|
| 4865 | - } else {
|
|
| 4866 | - $invalid++; |
|
| 4867 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4868 | - } |
|
| 4869 | - } |
|
| 4870 | - } else {
|
|
| 4871 | - $invalid++; |
|
| 4872 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4873 | - } |
|
| 4874 | - } |
|
| 4875 | - } |
|
| 4876 | - } |
|
| 4863 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4864 | + $created++; |
|
| 4865 | + } else {
|
|
| 4866 | + $invalid++; |
|
| 4867 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4868 | + } |
|
| 4869 | + } |
|
| 4870 | + } else {
|
|
| 4871 | + $invalid++; |
|
| 4872 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4873 | + } |
|
| 4874 | + } |
|
| 4875 | + } |
|
| 4876 | + } |
|
| 4877 | 4877 | |
| 4878 | - $json = array(); |
|
| 4879 | - $json['processed'] = $limit; |
|
| 4880 | - $json['created'] = $created; |
|
| 4881 | - $json['updated'] = $updated; |
|
| 4882 | - $json['skipped'] = $skipped; |
|
| 4883 | - $json['invalid'] = $invalid; |
|
| 4884 | - $json['images'] = $images; |
|
| 4878 | + $json = array(); |
|
| 4879 | + $json['processed'] = $limit; |
|
| 4880 | + $json['created'] = $created; |
|
| 4881 | + $json['updated'] = $updated; |
|
| 4882 | + $json['skipped'] = $skipped; |
|
| 4883 | + $json['invalid'] = $invalid; |
|
| 4884 | + $json['images'] = $images; |
|
| 4885 | 4885 | |
| 4886 | - wp_send_json( $json ); |
|
| 4887 | - } |
|
| 4888 | - } |
|
| 4889 | - break; |
|
| 4890 | - case 'import_finish':{
|
|
| 4891 | - /** |
|
| 4892 | - * Run an action when an import finishes. |
|
| 4893 | - * |
|
| 4894 | - * This action can be used to fire functions after an import ends. |
|
| 4895 | - * |
|
| 4896 | - * @since 1.5.3 |
|
| 4897 | - * @package GeoDirectory |
|
| 4898 | - */ |
|
| 4899 | - do_action('geodir_import_finished');
|
|
| 4900 | - } |
|
| 4901 | - break; |
|
| 4886 | + wp_send_json( $json ); |
|
| 4887 | + } |
|
| 4888 | + } |
|
| 4889 | + break; |
|
| 4890 | + case 'import_finish':{
|
|
| 4891 | + /** |
|
| 4892 | + * Run an action when an import finishes. |
|
| 4893 | + * |
|
| 4894 | + * This action can be used to fire functions after an import ends. |
|
| 4895 | + * |
|
| 4896 | + * @since 1.5.3 |
|
| 4897 | + * @package GeoDirectory |
|
| 4898 | + */ |
|
| 4899 | + do_action('geodir_import_finished');
|
|
| 4900 | + } |
|
| 4901 | + break; |
|
| 4902 | 4902 | |
| 4903 | - } |
|
| 4904 | - echo '0'; |
|
| 4905 | - gd_die(); |
|
| 4903 | + } |
|
| 4904 | + echo '0'; |
|
| 4905 | + gd_die(); |
|
| 4906 | 4906 | } |
| 4907 | 4907 | |
| 4908 | 4908 | /** |
@@ -4946,12 +4946,12 @@ discard block |
||
| 4946 | 4946 | $args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args ); |
| 4947 | 4947 | } |
| 4948 | 4948 | |
| 4949 | - if( !empty( $term ) ) {
|
|
| 4949 | + if( !empty( $term ) ) {
|
|
| 4950 | 4950 | $result = wp_insert_term( $term, $taxonomy, $args ); |
| 4951 | - if( !is_wp_error( $result ) ) {
|
|
| 4952 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4953 | - } |
|
| 4954 | - } |
|
| 4951 | + if( !is_wp_error( $result ) ) {
|
|
| 4952 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4953 | + } |
|
| 4954 | + } |
|
| 4955 | 4955 | |
| 4956 | 4956 | return false; |
| 4957 | 4957 | } |
@@ -4997,16 +4997,16 @@ discard block |
||
| 4997 | 4997 | $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
| 4998 | 4998 | |
| 4999 | 4999 | if( !is_wp_error( $result ) ) {
|
| 5000 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 5001 | - } |
|
| 5000 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 5001 | + } |
|
| 5002 | 5002 | } else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
| 5003 | 5003 | $term_data['term_id'] = $term_info['term_id']; |
| 5004 | 5004 | |
| 5005 | 5005 | $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
| 5006 | 5006 | |
| 5007 | 5007 | if( !is_wp_error( $result ) ) {
|
| 5008 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 5009 | - } |
|
| 5008 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 5009 | + } |
|
| 5010 | 5010 | } else {
|
| 5011 | 5011 | return geodir_imex_insert_term( $taxonomy, $term_data ); |
| 5012 | 5012 | } |
@@ -5028,47 +5028,47 @@ discard block |
||
| 5028 | 5028 | * @return int Posts count. |
| 5029 | 5029 | */ |
| 5030 | 5030 | function geodir_get_posts_count( $post_type ) {
|
| 5031 | - global $wpdb, $plugin_prefix; |
|
| 5031 | + global $wpdb, $plugin_prefix; |
|
| 5032 | 5032 | |
| 5033 | - if ( !post_type_exists( $post_type ) ) {
|
|
| 5034 | - return 0; |
|
| 5035 | - } |
|
| 5033 | + if ( !post_type_exists( $post_type ) ) {
|
|
| 5034 | + return 0; |
|
| 5035 | + } |
|
| 5036 | 5036 | |
| 5037 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5037 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5038 | 5038 | |
| 5039 | - // Skip listing with statuses trash, auto-draft etc... |
|
| 5040 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5041 | - $where_statuses = ''; |
|
| 5042 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5043 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5044 | - } |
|
| 5039 | + // Skip listing with statuses trash, auto-draft etc... |
|
| 5040 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5041 | + $where_statuses = ''; |
|
| 5042 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5043 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5044 | + } |
|
| 5045 | 5045 | |
| 5046 | - /** |
|
| 5047 | - * Filter the SQL where clause part to filter posts count in import/export. |
|
| 5048 | - * |
|
| 5049 | - * @since 1.6.4 |
|
| 5050 | - * @package GeoDirectory |
|
| 5051 | - * |
|
| 5052 | - * @param string $where SQL where clause part. |
|
| 5053 | - */ |
|
| 5054 | - $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type ); |
|
| 5055 | - |
|
| 5056 | - $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );
|
|
| 5057 | - |
|
| 5058 | - $posts_count = (int)$wpdb->get_var( $query ); |
|
| 5046 | + /** |
|
| 5047 | + * Filter the SQL where clause part to filter posts count in import/export. |
|
| 5048 | + * |
|
| 5049 | + * @since 1.6.4 |
|
| 5050 | + * @package GeoDirectory |
|
| 5051 | + * |
|
| 5052 | + * @param string $where SQL where clause part. |
|
| 5053 | + */ |
|
| 5054 | + $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type ); |
|
| 5055 | + |
|
| 5056 | + $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );
|
|
| 5057 | + |
|
| 5058 | + $posts_count = (int)$wpdb->get_var( $query ); |
|
| 5059 | 5059 | |
| 5060 | - /** |
|
| 5061 | - * Modify returned post counts for the current post type. |
|
| 5062 | - * |
|
| 5063 | - * @since 1.4.6 |
|
| 5064 | - * @package GeoDirectory |
|
| 5065 | - * |
|
| 5066 | - * @param int $posts_count Post counts. |
|
| 5067 | - * @param string $post_type Post type. |
|
| 5068 | - */ |
|
| 5069 | - $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type ); |
|
| 5070 | - |
|
| 5071 | - return $posts_count; |
|
| 5060 | + /** |
|
| 5061 | + * Modify returned post counts for the current post type. |
|
| 5062 | + * |
|
| 5063 | + * @since 1.4.6 |
|
| 5064 | + * @package GeoDirectory |
|
| 5065 | + * |
|
| 5066 | + * @param int $posts_count Post counts. |
|
| 5067 | + * @param string $post_type Post type. |
|
| 5068 | + */ |
|
| 5069 | + $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type ); |
|
| 5070 | + |
|
| 5071 | + return $posts_count; |
|
| 5072 | 5072 | } |
| 5073 | 5073 | |
| 5074 | 5074 | /** |
@@ -5136,7 +5136,7 @@ discard block |
||
| 5136 | 5136 | } |
| 5137 | 5137 | $csv_row[] = 'post_status'; |
| 5138 | 5138 | $csv_row[] = 'is_featured'; |
| 5139 | - // Export claim listing field |
|
| 5139 | + // Export claim listing field |
|
| 5140 | 5140 | if ($is_claim_active) {
|
| 5141 | 5141 | $csv_row[] = 'claimed'; |
| 5142 | 5142 | } |
@@ -5145,7 +5145,7 @@ discard block |
||
| 5145 | 5145 | $csv_row[] = 'alive_days'; |
| 5146 | 5146 | $csv_row[] = 'expire_date'; |
| 5147 | 5147 | } |
| 5148 | - $csv_row[] = 'post_date'; |
|
| 5148 | + $csv_row[] = 'post_date'; |
|
| 5149 | 5149 | $csv_row[] = 'post_address'; |
| 5150 | 5150 | $csv_row[] = 'post_city'; |
| 5151 | 5151 | $csv_row[] = 'post_region'; |
@@ -5153,11 +5153,11 @@ discard block |
||
| 5153 | 5153 | $csv_row[] = 'post_zip'; |
| 5154 | 5154 | $csv_row[] = 'post_latitude'; |
| 5155 | 5155 | $csv_row[] = 'post_longitude'; |
| 5156 | - if ($neighbourhood_active) {
|
|
| 5157 | - $csv_row[] = 'post_neighbourhood'; |
|
| 5158 | - $csv_row[] = 'neighbourhood_latitude'; |
|
| 5159 | - $csv_row[] = 'neighbourhood_longitude'; |
|
| 5160 | - } |
|
| 5156 | + if ($neighbourhood_active) {
|
|
| 5157 | + $csv_row[] = 'post_neighbourhood'; |
|
| 5158 | + $csv_row[] = 'neighbourhood_latitude'; |
|
| 5159 | + $csv_row[] = 'neighbourhood_longitude'; |
|
| 5160 | + } |
|
| 5161 | 5161 | $csv_row[] = 'geodir_timing'; |
| 5162 | 5162 | $csv_row[] = 'geodir_contact'; |
| 5163 | 5163 | $csv_row[] = 'geodir_email'; |
@@ -5192,21 +5192,21 @@ discard block |
||
| 5192 | 5192 | $csv_row[] = 'franchise'; |
| 5193 | 5193 | } |
| 5194 | 5194 | |
| 5195 | - /** |
|
| 5196 | - * Filter columns field names of gd export listings csv. |
|
| 5197 | - * |
|
| 5198 | - * @since 1.6.5 |
|
| 5199 | - * @package GeoDirectory |
|
| 5200 | - * |
|
| 5201 | - * @param array $csv_row Column names being exported in csv. |
|
| 5202 | - * @param string $post_type The post type. |
|
| 5203 | - */ |
|
| 5204 | - $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);
|
|
| 5195 | + /** |
|
| 5196 | + * Filter columns field names of gd export listings csv. |
|
| 5197 | + * |
|
| 5198 | + * @since 1.6.5 |
|
| 5199 | + * @package GeoDirectory |
|
| 5200 | + * |
|
| 5201 | + * @param array $csv_row Column names being exported in csv. |
|
| 5202 | + * @param string $post_type The post type. |
|
| 5203 | + */ |
|
| 5204 | + $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);
|
|
| 5205 | 5205 | |
| 5206 | 5206 | $csv_rows[] = $csv_row; |
| 5207 | 5207 | |
| 5208 | 5208 | $images_count = 5; |
| 5209 | - $xx=0; |
|
| 5209 | + $xx=0; |
|
| 5210 | 5210 | foreach ( $posts as $post ) {$xx++;
|
| 5211 | 5211 | $post_id = $post['ID']; |
| 5212 | 5212 | |
@@ -5337,15 +5337,15 @@ discard block |
||
| 5337 | 5337 | } |
| 5338 | 5338 | $csv_row[] = $post_info['post_status']; // post_status |
| 5339 | 5339 | $csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured |
| 5340 | - if ($is_claim_active) {
|
|
| 5341 | - $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5342 | - } |
|
| 5340 | + if ($is_claim_active) {
|
|
| 5341 | + $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5342 | + } |
|
| 5343 | 5343 | if ($is_payment_plugin) {
|
| 5344 | 5344 | $csv_row[] = (int)$post_info['package_id']; // package_id |
| 5345 | 5345 | $csv_row[] = $post_info['alive_days'] !== '' ? absint($post_info['alive_days']) : ''; // alive_days |
| 5346 | 5346 | $csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date
|
| 5347 | 5347 | } |
| 5348 | - $csv_row[] = $post_info['post_date']; // post_date |
|
| 5348 | + $csv_row[] = $post_info['post_date']; // post_date |
|
| 5349 | 5349 | $csv_row[] = stripslashes($post_info['post_address']); // post_address |
| 5350 | 5350 | $csv_row[] = stripslashes($post_info['post_city']); // post_city |
| 5351 | 5351 | $csv_row[] = stripslashes($post_info['post_region']); // post_region |
@@ -5353,21 +5353,21 @@ discard block |
||
| 5353 | 5353 | $csv_row[] = stripslashes($post_info['post_zip']); // post_zip |
| 5354 | 5354 | $csv_row[] = $post_info['post_latitude']; // post_latitude |
| 5355 | 5355 | $csv_row[] = $post_info['post_longitude']; // post_longitude |
| 5356 | - if ($neighbourhood_active) {
|
|
| 5357 | - $post_neighbourhood = ''; |
|
| 5358 | - $neighbourhood_latitude = ''; |
|
| 5359 | - $neighbourhood_longitude = ''; |
|
| 5360 | - if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {
|
|
| 5361 | - if (!empty($hood_info)) {
|
|
| 5362 | - $post_neighbourhood = $hood_info->hood_name; |
|
| 5363 | - $neighbourhood_latitude = $hood_info->hood_latitude; |
|
| 5364 | - $neighbourhood_longitude = $hood_info->hood_longitude; |
|
| 5365 | - } |
|
| 5366 | - } |
|
| 5367 | - $csv_row[] = stripslashes($post_neighbourhood); // post_neighbourhood |
|
| 5368 | - $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude |
|
| 5369 | - $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude |
|
| 5370 | - } |
|
| 5356 | + if ($neighbourhood_active) {
|
|
| 5357 | + $post_neighbourhood = ''; |
|
| 5358 | + $neighbourhood_latitude = ''; |
|
| 5359 | + $neighbourhood_longitude = ''; |
|
| 5360 | + if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {
|
|
| 5361 | + if (!empty($hood_info)) {
|
|
| 5362 | + $post_neighbourhood = $hood_info->hood_name; |
|
| 5363 | + $neighbourhood_latitude = $hood_info->hood_latitude; |
|
| 5364 | + $neighbourhood_longitude = $hood_info->hood_longitude; |
|
| 5365 | + } |
|
| 5366 | + } |
|
| 5367 | + $csv_row[] = stripslashes($post_neighbourhood); // post_neighbourhood |
|
| 5368 | + $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude |
|
| 5369 | + $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude |
|
| 5370 | + } |
|
| 5371 | 5371 | $csv_row[] = stripslashes($post_info['geodir_timing']); // geodir_timing |
| 5372 | 5372 | $csv_row[] = stripslashes($post_info['geodir_contact']); // geodir_contact |
| 5373 | 5373 | $csv_row[] = stripslashes($post_info['geodir_email']); // geodir_email |
@@ -5410,16 +5410,16 @@ discard block |
||
| 5410 | 5410 | $csv_row[] = (int)$franchise; // franchise id |
| 5411 | 5411 | } |
| 5412 | 5412 | |
| 5413 | - /** |
|
| 5414 | - * Filter columns values of gd export listings csv file |
|
| 5415 | - * |
|
| 5416 | - * @since 1.6.5 |
|
| 5417 | - * @package GeoDirectory |
|
| 5418 | - * |
|
| 5419 | - * @param array $csv_row Field values being exported in csv. |
|
| 5420 | - * @param array $post_info The post info. |
|
| 5421 | - */ |
|
| 5422 | - $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
|
|
| 5413 | + /** |
|
| 5414 | + * Filter columns values of gd export listings csv file |
|
| 5415 | + * |
|
| 5416 | + * @since 1.6.5 |
|
| 5417 | + * @package GeoDirectory |
|
| 5418 | + * |
|
| 5419 | + * @param array $csv_row Field values being exported in csv. |
|
| 5420 | + * @param array $post_info The post info. |
|
| 5421 | + */ |
|
| 5422 | + $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
|
|
| 5423 | 5423 | |
| 5424 | 5424 | for ( $c = 0; $c < $images_count; $c++ ) {
|
| 5425 | 5425 | $csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE |
@@ -5452,64 +5452,64 @@ discard block |
||
| 5452 | 5452 | * @return array Array of posts data. |
| 5453 | 5453 | */ |
| 5454 | 5454 | function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {
|
| 5455 | - global $wpdb, $plugin_prefix; |
|
| 5455 | + global $wpdb, $plugin_prefix; |
|
| 5456 | 5456 | |
| 5457 | - if ( ! post_type_exists( $post_type ) ) |
|
| 5458 | - return new stdClass; |
|
| 5457 | + if ( ! post_type_exists( $post_type ) ) |
|
| 5458 | + return new stdClass; |
|
| 5459 | 5459 | |
| 5460 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5460 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5461 | 5461 | |
| 5462 | - $limit = ''; |
|
| 5463 | - if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5464 | - $offset = ( $page_no - 1 ) * $per_page; |
|
| 5462 | + $limit = ''; |
|
| 5463 | + if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5464 | + $offset = ( $page_no - 1 ) * $per_page; |
|
| 5465 | 5465 | |
| 5466 | - if ( $offset > 0 ) {
|
|
| 5467 | - $limit = " LIMIT " . $offset . "," . $per_page; |
|
| 5468 | - } else {
|
|
| 5469 | - $limit = " LIMIT " . $per_page; |
|
| 5470 | - } |
|
| 5471 | - } |
|
| 5466 | + if ( $offset > 0 ) {
|
|
| 5467 | + $limit = " LIMIT " . $offset . "," . $per_page; |
|
| 5468 | + } else {
|
|
| 5469 | + $limit = " LIMIT " . $per_page; |
|
| 5470 | + } |
|
| 5471 | + } |
|
| 5472 | 5472 | |
| 5473 | - // Skip listing with statuses trash, auto-draft etc... |
|
| 5474 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5475 | - $where_statuses = ''; |
|
| 5476 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5477 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5478 | - } |
|
| 5473 | + // Skip listing with statuses trash, auto-draft etc... |
|
| 5474 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5475 | + $where_statuses = ''; |
|
| 5476 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5477 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5478 | + } |
|
| 5479 | 5479 | |
| 5480 | - /** |
|
| 5481 | - * Filter the SQL where clause part to filter posts in import/export. |
|
| 5482 | - * |
|
| 5483 | - * @since 1.6.4 |
|
| 5484 | - * @package GeoDirectory |
|
| 5485 | - * |
|
| 5486 | - * @param string $where SQL where clause part. |
|
| 5487 | - */ |
|
| 5488 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5489 | - |
|
| 5490 | - $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );
|
|
| 5491 | - /** |
|
| 5492 | - * Modify returned posts SQL query for the current post type. |
|
| 5493 | - * |
|
| 5494 | - * @since 1.4.6 |
|
| 5495 | - * @package GeoDirectory |
|
| 5496 | - * |
|
| 5497 | - * @param int $query The SQL query. |
|
| 5498 | - * @param string $post_type Post type. |
|
| 5499 | - */ |
|
| 5500 | - $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type ); |
|
| 5501 | - $results = (array)$wpdb->get_results( $query, ARRAY_A ); |
|
| 5502 | - |
|
| 5503 | - /** |
|
| 5504 | - * Modify returned post results for the current post type. |
|
| 5505 | - * |
|
| 5506 | - * @since 1.4.6 |
|
| 5507 | - * @package GeoDirectory |
|
| 5508 | - * |
|
| 5509 | - * @param object $results An object containing all post ids. |
|
| 5510 | - * @param string $post_type Post type. |
|
| 5511 | - */ |
|
| 5512 | - return apply_filters( 'geodir_export_posts', $results, $post_type ); |
|
| 5480 | + /** |
|
| 5481 | + * Filter the SQL where clause part to filter posts in import/export. |
|
| 5482 | + * |
|
| 5483 | + * @since 1.6.4 |
|
| 5484 | + * @package GeoDirectory |
|
| 5485 | + * |
|
| 5486 | + * @param string $where SQL where clause part. |
|
| 5487 | + */ |
|
| 5488 | + $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5489 | + |
|
| 5490 | + $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );
|
|
| 5491 | + /** |
|
| 5492 | + * Modify returned posts SQL query for the current post type. |
|
| 5493 | + * |
|
| 5494 | + * @since 1.4.6 |
|
| 5495 | + * @package GeoDirectory |
|
| 5496 | + * |
|
| 5497 | + * @param int $query The SQL query. |
|
| 5498 | + * @param string $post_type Post type. |
|
| 5499 | + */ |
|
| 5500 | + $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type ); |
|
| 5501 | + $results = (array)$wpdb->get_results( $query, ARRAY_A ); |
|
| 5502 | + |
|
| 5503 | + /** |
|
| 5504 | + * Modify returned post results for the current post type. |
|
| 5505 | + * |
|
| 5506 | + * @since 1.4.6 |
|
| 5507 | + * @package GeoDirectory |
|
| 5508 | + * |
|
| 5509 | + * @param object $results An object containing all post ids. |
|
| 5510 | + * @param string $post_type Post type. |
|
| 5511 | + */ |
|
| 5512 | + return apply_filters( 'geodir_export_posts', $results, $post_type ); |
|
| 5513 | 5513 | } |
| 5514 | 5514 | |
| 5515 | 5515 | /** |
@@ -5528,26 +5528,26 @@ discard block |
||
| 5528 | 5528 | * @return string The SQL query. |
| 5529 | 5529 | */ |
| 5530 | 5530 | function geodir_imex_get_events_query( $query, $post_type ) {
|
| 5531 | - if ( $post_type == 'gd_event' ) {
|
|
| 5532 | - global $wpdb, $plugin_prefix; |
|
| 5531 | + if ( $post_type == 'gd_event' ) {
|
|
| 5532 | + global $wpdb, $plugin_prefix; |
|
| 5533 | 5533 | |
| 5534 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5535 | - $schedule_table = EVENT_SCHEDULE; |
|
| 5534 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5535 | + $schedule_table = EVENT_SCHEDULE; |
|
| 5536 | 5536 | |
| 5537 | - // Skip listing with statuses trash, auto-draft etc... |
|
| 5538 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5539 | - $where_statuses = ''; |
|
| 5540 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5541 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5542 | - } |
|
| 5537 | + // Skip listing with statuses trash, auto-draft etc... |
|
| 5538 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5539 | + $where_statuses = ''; |
|
| 5540 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5541 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5542 | + } |
|
| 5543 | 5543 | |
| 5544 | - /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */ |
|
| 5545 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5544 | + /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */ |
|
| 5545 | + $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5546 | 5546 | |
| 5547 | - $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );
|
|
| 5548 | - } |
|
| 5547 | + $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );
|
|
| 5548 | + } |
|
| 5549 | 5549 | |
| 5550 | - return $query; |
|
| 5550 | + return $query; |
|
| 5551 | 5551 | } |
| 5552 | 5552 | |
| 5553 | 5553 | /** |
@@ -5569,36 +5569,36 @@ discard block |
||
| 5569 | 5569 | * @return int Total terms count. |
| 5570 | 5570 | */ |
| 5571 | 5571 | function geodir_get_terms_count( $post_type ) {
|
| 5572 | - $args = array( 'hide_empty' => 0 ); |
|
| 5572 | + $args = array( 'hide_empty' => 0 ); |
|
| 5573 | 5573 | |
| 5574 | - remove_all_filters( 'get_terms' ); |
|
| 5574 | + remove_all_filters( 'get_terms' ); |
|
| 5575 | 5575 | |
| 5576 | - $taxonomy = $post_type . 'category'; |
|
| 5576 | + $taxonomy = $post_type . 'category'; |
|
| 5577 | 5577 | |
| 5578 | - // WPML |
|
| 5579 | - $is_wpml = geodir_is_wpml(); |
|
| 5580 | - $active_lang = 'all'; |
|
| 5581 | - if ( $is_wpml ) {
|
|
| 5582 | - global $sitepress; |
|
| 5583 | - $active_lang = $sitepress->get_current_language(); |
|
| 5578 | + // WPML |
|
| 5579 | + $is_wpml = geodir_is_wpml(); |
|
| 5580 | + $active_lang = 'all'; |
|
| 5581 | + if ( $is_wpml ) {
|
|
| 5582 | + global $sitepress; |
|
| 5583 | + $active_lang = $sitepress->get_current_language(); |
|
| 5584 | 5584 | |
| 5585 | - if ( $active_lang != 'all' ) {
|
|
| 5586 | - $sitepress->switch_lang( 'all', true ); |
|
| 5587 | - } |
|
| 5588 | - } |
|
| 5589 | - // WPML |
|
| 5585 | + if ( $active_lang != 'all' ) {
|
|
| 5586 | + $sitepress->switch_lang( 'all', true ); |
|
| 5587 | + } |
|
| 5588 | + } |
|
| 5589 | + // WPML |
|
| 5590 | 5590 | |
| 5591 | - $count_terms = wp_count_terms( $taxonomy, $args ); |
|
| 5591 | + $count_terms = wp_count_terms( $taxonomy, $args ); |
|
| 5592 | 5592 | |
| 5593 | - // WPML |
|
| 5594 | - if ( $is_wpml && $active_lang !== 'all' ) {
|
|
| 5595 | - global $sitepress; |
|
| 5596 | - $sitepress->switch_lang( $active_lang, true ); |
|
| 5597 | - } |
|
| 5598 | - // WPML |
|
| 5599 | - $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0; |
|
| 5593 | + // WPML |
|
| 5594 | + if ( $is_wpml && $active_lang !== 'all' ) {
|
|
| 5595 | + global $sitepress; |
|
| 5596 | + $sitepress->switch_lang( $active_lang, true ); |
|
| 5597 | + } |
|
| 5598 | + // WPML |
|
| 5599 | + $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0; |
|
| 5600 | 5600 | |
| 5601 | - return $count_terms; |
|
| 5601 | + return $count_terms; |
|
| 5602 | 5602 | } |
| 5603 | 5603 | |
| 5604 | 5604 | /** |
@@ -5637,11 +5637,11 @@ discard block |
||
| 5637 | 5637 | $csv_row[] = 'cat_posttype'; |
| 5638 | 5638 | $csv_row[] = 'cat_parent'; |
| 5639 | 5639 | $csv_row[] = 'cat_schema'; |
| 5640 | - // WPML |
|
| 5640 | + // WPML |
|
| 5641 | 5641 | $is_wpml = geodir_wpml_is_taxonomy_translated( $taxonomy ); |
| 5642 | 5642 | if ($is_wpml) {
|
| 5643 | 5643 | $csv_row[] = 'cat_language'; |
| 5644 | - $csv_row[] = 'cat_id_original'; |
|
| 5644 | + $csv_row[] = 'cat_id_original'; |
|
| 5645 | 5645 | } |
| 5646 | 5646 | // WPML |
| 5647 | 5647 | $csv_row[] = 'cat_description'; |
@@ -5671,10 +5671,10 @@ discard block |
||
| 5671 | 5671 | $csv_row[] = $post_type; |
| 5672 | 5672 | $csv_row[] = $cat_parent; |
| 5673 | 5673 | $csv_row[] = geodir_get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type ); |
| 5674 | - // WPML |
|
| 5674 | + // WPML |
|
| 5675 | 5675 | if ($is_wpml) {
|
| 5676 | 5676 | $csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy ); |
| 5677 | - $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5677 | + $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5678 | 5678 | } |
| 5679 | 5679 | // WPML |
| 5680 | 5680 | $csv_row[] = $term->description; |
@@ -6092,43 +6092,43 @@ discard block |
||
| 6092 | 6092 | * @param string $status Post status. |
| 6093 | 6093 | */ |
| 6094 | 6094 | function geodir_create_page($slug, $option, $page_title = '', $page_content = '', $post_parent = 0, $status = 'publish') {
|
| 6095 | - global $wpdb, $current_user; |
|
| 6096 | - |
|
| 6097 | - $option_value = get_option($option); |
|
| 6098 | - |
|
| 6099 | - if ($option_value > 0) : |
|
| 6100 | - if (get_post($option_value)) : |
|
| 6101 | - // Page exists |
|
| 6102 | - return; |
|
| 6103 | - endif; |
|
| 6104 | - endif; |
|
| 6105 | - |
|
| 6106 | - $page_found = $wpdb->get_var( |
|
| 6107 | - $wpdb->prepare( |
|
| 6108 | - "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 6109 | - array($slug) |
|
| 6110 | - ) |
|
| 6111 | - ); |
|
| 6112 | - |
|
| 6113 | - if ($page_found) : |
|
| 6114 | - // Page exists |
|
| 6115 | - if (!$option_value) update_option($option, $page_found); |
|
| 6116 | - return; |
|
| 6117 | - endif; |
|
| 6118 | - |
|
| 6119 | - $page_data = array( |
|
| 6120 | - 'post_status' => $status, |
|
| 6121 | - 'post_type' => 'page', |
|
| 6122 | - 'post_author' => $current_user->ID, |
|
| 6123 | - 'post_name' => $slug, |
|
| 6124 | - 'post_title' => $page_title, |
|
| 6125 | - 'post_content' => $page_content, |
|
| 6126 | - 'post_parent' => $post_parent, |
|
| 6127 | - 'comment_status' => 'closed' |
|
| 6128 | - ); |
|
| 6129 | - $page_id = wp_insert_post($page_data); |
|
| 6130 | - |
|
| 6131 | - add_option($option, $page_id); |
|
| 6095 | + global $wpdb, $current_user; |
|
| 6096 | + |
|
| 6097 | + $option_value = get_option($option); |
|
| 6098 | + |
|
| 6099 | + if ($option_value > 0) : |
|
| 6100 | + if (get_post($option_value)) : |
|
| 6101 | + // Page exists |
|
| 6102 | + return; |
|
| 6103 | + endif; |
|
| 6104 | + endif; |
|
| 6105 | + |
|
| 6106 | + $page_found = $wpdb->get_var( |
|
| 6107 | + $wpdb->prepare( |
|
| 6108 | + "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 6109 | + array($slug) |
|
| 6110 | + ) |
|
| 6111 | + ); |
|
| 6112 | + |
|
| 6113 | + if ($page_found) : |
|
| 6114 | + // Page exists |
|
| 6115 | + if (!$option_value) update_option($option, $page_found); |
|
| 6116 | + return; |
|
| 6117 | + endif; |
|
| 6118 | + |
|
| 6119 | + $page_data = array( |
|
| 6120 | + 'post_status' => $status, |
|
| 6121 | + 'post_type' => 'page', |
|
| 6122 | + 'post_author' => $current_user->ID, |
|
| 6123 | + 'post_name' => $slug, |
|
| 6124 | + 'post_title' => $page_title, |
|
| 6125 | + 'post_content' => $page_content, |
|
| 6126 | + 'post_parent' => $post_parent, |
|
| 6127 | + 'comment_status' => 'closed' |
|
| 6128 | + ); |
|
| 6129 | + $page_id = wp_insert_post($page_data); |
|
| 6130 | + |
|
| 6131 | + add_option($option, $page_id); |
|
| 6132 | 6132 | |
| 6133 | 6133 | } |
| 6134 | 6134 | |
@@ -6159,9 +6159,9 @@ discard block |
||
| 6159 | 6159 | * @package GeoDirectory |
| 6160 | 6160 | */ |
| 6161 | 6161 | function geodir_admin_upgrade_notice() {
|
| 6162 | - $class = "error"; |
|
| 6163 | - $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
|
|
| 6164 | - echo"<div class=\"$class\"> <p>$message</p></div>"; |
|
| 6162 | + $class = "error"; |
|
| 6163 | + $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
|
|
| 6164 | + echo"<div class=\"$class\"> <p>$message</p></div>"; |
|
| 6165 | 6165 | } |
| 6166 | 6166 | |
| 6167 | 6167 | /** |
@@ -6174,18 +6174,18 @@ discard block |
||
| 6174 | 6174 | */ |
| 6175 | 6175 | function geodire_admin_upgrade_notice( $plugin_data, $r ) |
| 6176 | 6176 | {
|
| 6177 | - // readme contents |
|
| 6178 | - $args = array( |
|
| 6179 | - 'timeout' => 15, |
|
| 6180 | - 'redirection' => 5 |
|
| 6181 | - ); |
|
| 6182 | - $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt"; |
|
| 6183 | - $data = wp_remote_get( $url, $args ); |
|
| 6177 | + // readme contents |
|
| 6178 | + $args = array( |
|
| 6179 | + 'timeout' => 15, |
|
| 6180 | + 'redirection' => 5 |
|
| 6181 | + ); |
|
| 6182 | + $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt"; |
|
| 6183 | + $data = wp_remote_get( $url, $args ); |
|
| 6184 | 6184 | |
| 6185 | - if (!is_wp_error($data) && $data['response']['code'] == 200) {
|
|
| 6185 | + if (!is_wp_error($data) && $data['response']['code'] == 200) {
|
|
| 6186 | 6186 | |
| 6187 | - geodir_in_plugin_update_message($data['body']); |
|
| 6188 | - } |
|
| 6187 | + geodir_in_plugin_update_message($data['body']); |
|
| 6188 | + } |
|
| 6189 | 6189 | } |
| 6190 | 6190 | |
| 6191 | 6191 | |
@@ -6193,28 +6193,28 @@ discard block |
||
| 6193 | 6193 | * @param string $content http response body |
| 6194 | 6194 | */ |
| 6195 | 6195 | function geodir_in_plugin_update_message($content) {
|
| 6196 | - // Output Upgrade Notice |
|
| 6197 | - $matches = null; |
|
| 6198 | - $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis'; |
|
| 6199 | - $upgrade_notice = ''; |
|
| 6200 | - if ( preg_match( $regexp, $content, $matches ) ) {
|
|
| 6201 | - if(empty($matches)){return;}
|
|
| 6202 | - |
|
| 6203 | - $version = trim( $matches[1] ); |
|
| 6204 | - if($version && $version>GEODIRECTORY_VERSION){
|
|
| 6205 | - |
|
| 6206 | - |
|
| 6207 | - $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
|
|
| 6208 | - if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
|
|
| 6209 | - $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">'; |
|
| 6210 | - foreach ( $notices as $index => $line ) {
|
|
| 6211 | - $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
|
|
| 6212 | - } |
|
| 6213 | - $upgrade_notice .= '</div> '; |
|
| 6214 | - } |
|
| 6215 | - } |
|
| 6216 | - } |
|
| 6217 | - echo $upgrade_notice; |
|
| 6196 | + // Output Upgrade Notice |
|
| 6197 | + $matches = null; |
|
| 6198 | + $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis'; |
|
| 6199 | + $upgrade_notice = ''; |
|
| 6200 | + if ( preg_match( $regexp, $content, $matches ) ) {
|
|
| 6201 | + if(empty($matches)){return;}
|
|
| 6202 | + |
|
| 6203 | + $version = trim( $matches[1] ); |
|
| 6204 | + if($version && $version>GEODIRECTORY_VERSION){
|
|
| 6205 | + |
|
| 6206 | + |
|
| 6207 | + $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
|
|
| 6208 | + if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
|
|
| 6209 | + $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">'; |
|
| 6210 | + foreach ( $notices as $index => $line ) {
|
|
| 6211 | + $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
|
|
| 6212 | + } |
|
| 6213 | + $upgrade_notice .= '</div> '; |
|
| 6214 | + } |
|
| 6215 | + } |
|
| 6216 | + } |
|
| 6217 | + echo $upgrade_notice; |
|
| 6218 | 6218 | } |
| 6219 | 6219 | |
| 6220 | 6220 | /** |
@@ -6247,19 +6247,19 @@ discard block |
||
| 6247 | 6247 | * @param array Listing statuses to be skipped. |
| 6248 | 6248 | */ |
| 6249 | 6249 | function geodir_imex_export_skip_statuses() {
|
| 6250 | - $statuses = array( 'trash', 'auto-draft' ); |
|
| 6250 | + $statuses = array( 'trash', 'auto-draft' ); |
|
| 6251 | 6251 | |
| 6252 | - /** |
|
| 6253 | - * Filter the statuses to skip during GD export listings. |
|
| 6254 | - * |
|
| 6255 | - * @since 1.6.0 |
|
| 6256 | - * @package GeoDirectory |
|
| 6257 | - * |
|
| 6258 | - * @param array $statuses Listing statuses to be skipped. |
|
| 6259 | - */ |
|
| 6260 | - $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses ); |
|
| 6252 | + /** |
|
| 6253 | + * Filter the statuses to skip during GD export listings. |
|
| 6254 | + * |
|
| 6255 | + * @since 1.6.0 |
|
| 6256 | + * @package GeoDirectory |
|
| 6257 | + * |
|
| 6258 | + * @param array $statuses Listing statuses to be skipped. |
|
| 6259 | + */ |
|
| 6260 | + $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses ); |
|
| 6261 | 6261 | |
| 6262 | - return $statuses; |
|
| 6262 | + return $statuses; |
|
| 6263 | 6263 | } |
| 6264 | 6264 | |
| 6265 | 6265 | /** |
@@ -6275,42 +6275,42 @@ discard block |
||
| 6275 | 6275 | * @global string $typenow Current post type. |
| 6276 | 6276 | */ |
| 6277 | 6277 | function geodir_admin_dequeue_scripts() {
|
| 6278 | - global $typenow; |
|
| 6278 | + global $typenow; |
|
| 6279 | 6279 | |
| 6280 | - // EDD |
|
| 6281 | - if (wp_script_is('jquery-chosen', 'enqueued')) {
|
|
| 6282 | - wp_dequeue_script('jquery-chosen');
|
|
| 6283 | - } |
|
| 6280 | + // EDD |
|
| 6281 | + if (wp_script_is('jquery-chosen', 'enqueued')) {
|
|
| 6282 | + wp_dequeue_script('jquery-chosen');
|
|
| 6283 | + } |
|
| 6284 | 6284 | |
| 6285 | - // Ultimate Addons for Visual Composer |
|
| 6286 | - if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {
|
|
| 6287 | - wp_dequeue_script('ultimate-vc-backend-script');
|
|
| 6288 | - } |
|
| 6285 | + // Ultimate Addons for Visual Composer |
|
| 6286 | + if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {
|
|
| 6287 | + wp_dequeue_script('ultimate-vc-backend-script');
|
|
| 6288 | + } |
|
| 6289 | 6289 | |
| 6290 | - // VC editor conflicts |
|
| 6291 | - if (class_exists('Vc_Role_Access_Controller') && wp_script_is('dfd_vc_damin_scripts', 'enqueued')) {
|
|
| 6292 | - wp_dequeue_script('dfd_vc_damin_scripts');
|
|
| 6293 | - } |
|
| 6290 | + // VC editor conflicts |
|
| 6291 | + if (class_exists('Vc_Role_Access_Controller') && wp_script_is('dfd_vc_damin_scripts', 'enqueued')) {
|
|
| 6292 | + wp_dequeue_script('dfd_vc_damin_scripts');
|
|
| 6293 | + } |
|
| 6294 | 6294 | |
| 6295 | - // Ultimate chosen |
|
| 6296 | - if (wp_script_is('ultimate-chosen-script', 'enqueued')) {
|
|
| 6297 | - wp_dequeue_script('ultimate-chosen-script');
|
|
| 6298 | - } |
|
| 6295 | + // Ultimate chosen |
|
| 6296 | + if (wp_script_is('ultimate-chosen-script', 'enqueued')) {
|
|
| 6297 | + wp_dequeue_script('ultimate-chosen-script');
|
|
| 6298 | + } |
|
| 6299 | 6299 | |
| 6300 | - // Crum composer choosen |
|
| 6301 | - if (wp_script_is('crum-composer-choosen', 'enqueued')) {
|
|
| 6302 | - wp_dequeue_script('crum-composer-choosen');
|
|
| 6303 | - } |
|
| 6300 | + // Crum composer choosen |
|
| 6301 | + if (wp_script_is('crum-composer-choosen', 'enqueued')) {
|
|
| 6302 | + wp_dequeue_script('crum-composer-choosen');
|
|
| 6303 | + } |
|
| 6304 | 6304 | |
| 6305 | - // Fix conflict Fusion Builder jquery chosen with GD jquery chosen. |
|
| 6306 | - if (class_exists('FusionBuilder') && wp_script_is('fusion_builder_chosen_js', 'enqueued')) {
|
|
| 6307 | - wp_dequeue_script('fusion_builder_chosen_js');
|
|
| 6308 | - } |
|
| 6305 | + // Fix conflict Fusion Builder jquery chosen with GD jquery chosen. |
|
| 6306 | + if (class_exists('FusionBuilder') && wp_script_is('fusion_builder_chosen_js', 'enqueued')) {
|
|
| 6307 | + wp_dequeue_script('fusion_builder_chosen_js');
|
|
| 6308 | + } |
|
| 6309 | 6309 | |
| 6310 | - // Fix conflicts timepicker & setting date value. |
|
| 6311 | - if (class_exists('acf') && wp_script_is('acf-timepicker', 'enqueued')) {
|
|
| 6312 | - wp_dequeue_script('acf-timepicker');
|
|
| 6313 | - } |
|
| 6310 | + // Fix conflicts timepicker & setting date value. |
|
| 6311 | + if (class_exists('acf') && wp_script_is('acf-timepicker', 'enqueued')) {
|
|
| 6312 | + wp_dequeue_script('acf-timepicker');
|
|
| 6313 | + } |
|
| 6314 | 6314 | } |
| 6315 | 6315 | |
| 6316 | 6316 | /** |
@@ -6326,48 +6326,48 @@ discard block |
||
| 6326 | 6326 | * @return string SQL where clause part. |
| 6327 | 6327 | */ |
| 6328 | 6328 | function geodir_imex_get_filter_where($where = '', $post_type = '') {
|
| 6329 | - global $wpdb; |
|
| 6329 | + global $wpdb; |
|
| 6330 | 6330 | |
| 6331 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6331 | + $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6332 | 6332 | |
| 6333 | - if ( !empty( $filters ) ) {
|
|
| 6334 | - foreach ( $filters as $field => $value ) {
|
|
| 6335 | - switch ($field) {
|
|
| 6336 | - case 'start_date': |
|
| 6337 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'"; |
|
| 6338 | - break; |
|
| 6339 | - case 'end_date': |
|
| 6340 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'"; |
|
| 6341 | - break; |
|
| 6342 | - } |
|
| 6343 | - } |
|
| 6344 | - } |
|
| 6333 | + if ( !empty( $filters ) ) {
|
|
| 6334 | + foreach ( $filters as $field => $value ) {
|
|
| 6335 | + switch ($field) {
|
|
| 6336 | + case 'start_date': |
|
| 6337 | + $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'"; |
|
| 6338 | + break; |
|
| 6339 | + case 'end_date': |
|
| 6340 | + $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'"; |
|
| 6341 | + break; |
|
| 6342 | + } |
|
| 6343 | + } |
|
| 6344 | + } |
|
| 6345 | 6345 | |
| 6346 | - return $where; |
|
| 6346 | + return $where; |
|
| 6347 | 6347 | } |
| 6348 | 6348 | add_filter('geodir_get_posts_count', 'geodir_imex_get_filter_where', 10, 2);
|
| 6349 | 6349 | add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);
|
| 6350 | 6350 | |
| 6351 | 6351 | |
| 6352 | 6352 | function geodir_fix_for_primer_theme(){
|
| 6353 | - if(!defined( 'PRIMER_VERSION' )){return;}
|
|
| 6354 | - global $pagenow; |
|
| 6353 | + if(!defined( 'PRIMER_VERSION' )){return;}
|
|
| 6354 | + global $pagenow; |
|
| 6355 | 6355 | |
| 6356 | - if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){
|
|
| 6356 | + if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){
|
|
| 6357 | 6357 | |
| 6358 | - $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] ); |
|
| 6358 | + $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] ); |
|
| 6359 | 6359 | |
| 6360 | - $post_types = geodir_get_posttypes(); |
|
| 6361 | - if ($post_type && in_array($post_type, $post_types) ) {
|
|
| 6362 | - global $primer_customizer_layouts; |
|
| 6363 | - remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10); |
|
| 6364 | - } |
|
| 6365 | - } |
|
| 6360 | + $post_types = geodir_get_posttypes(); |
|
| 6361 | + if ($post_type && in_array($post_type, $post_types) ) {
|
|
| 6362 | + global $primer_customizer_layouts; |
|
| 6363 | + remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10); |
|
| 6364 | + } |
|
| 6365 | + } |
|
| 6366 | 6366 | |
| 6367 | 6367 | } |
| 6368 | 6368 | |
| 6369 | 6369 | if(is_admin()){
|
| 6370 | - add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
|
|
| 6370 | + add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
|
|
| 6371 | 6371 | } |
| 6372 | 6372 | |
| 6373 | 6373 | |
@@ -6500,96 +6500,96 @@ discard block |
||
| 6500 | 6500 | |
| 6501 | 6501 | function geodir_ga_activation_url() {
|
| 6502 | 6502 | |
| 6503 | - return add_query_arg( array( |
|
| 6504 | - 'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
|
|
| 6505 | - 'scope' => GEODIR_GA_SCOPE, |
|
| 6506 | - 'response_type' => 'code', |
|
| 6507 | - 'redirect_uri' => GEODIR_GA_REDIRECT, |
|
| 6508 | - 'client_id' => GEODIR_GA_CLIENTID, |
|
| 6509 | - ), 'https://accounts.google.com/o/oauth2/auth' ); |
|
| 6503 | + return add_query_arg( array( |
|
| 6504 | + 'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
|
|
| 6505 | + 'scope' => GEODIR_GA_SCOPE, |
|
| 6506 | + 'response_type' => 'code', |
|
| 6507 | + 'redirect_uri' => GEODIR_GA_REDIRECT, |
|
| 6508 | + 'client_id' => GEODIR_GA_CLIENTID, |
|
| 6509 | + ), 'https://accounts.google.com/o/oauth2/auth' ); |
|
| 6510 | 6510 | |
| 6511 | - return $url; |
|
| 6511 | + return $url; |
|
| 6512 | 6512 | } |
| 6513 | 6513 | |
| 6514 | 6514 | function geodir_gd_accounts(){
|
| 6515 | - $accounts = array(); |
|
| 6516 | - $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true ); |
|
| 6517 | - if($useAuth){
|
|
| 6518 | - try {
|
|
| 6519 | - $accounts = geodir_ga_get_analytics_accounts(); |
|
| 6520 | - } catch (Exception $e) {
|
|
| 6521 | - geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 6522 | - } |
|
| 6515 | + $accounts = array(); |
|
| 6516 | + $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true ); |
|
| 6517 | + if($useAuth){
|
|
| 6518 | + try {
|
|
| 6519 | + $accounts = geodir_ga_get_analytics_accounts(); |
|
| 6520 | + } catch (Exception $e) {
|
|
| 6521 | + geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 6522 | + } |
|
| 6523 | 6523 | |
| 6524 | - if(is_array($accounts)){
|
|
| 6525 | - $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
|
|
| 6526 | - }elseif(get_option('geodir_ga_account_id')){
|
|
| 6527 | - $accounts = array(); |
|
| 6528 | - $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6529 | - } |
|
| 6530 | - } |
|
| 6531 | - return $accounts; |
|
| 6524 | + if(is_array($accounts)){
|
|
| 6525 | + $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
|
|
| 6526 | + }elseif(get_option('geodir_ga_account_id')){
|
|
| 6527 | + $accounts = array(); |
|
| 6528 | + $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6529 | + } |
|
| 6530 | + } |
|
| 6531 | + return $accounts; |
|
| 6532 | 6532 | } |
| 6533 | 6533 | |
| 6534 | 6534 | function geodir_ga_get_analytics_accounts() |
| 6535 | 6535 | {
|
| 6536 | - global $gd_ga_errors; |
|
| 6537 | - $accounts = array(); |
|
| 6536 | + global $gd_ga_errors; |
|
| 6537 | + $accounts = array(); |
|
| 6538 | 6538 | |
| 6539 | - if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
|
|
| 6539 | + if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
|
|
| 6540 | 6540 | |
| 6541 | 6541 | |
| 6542 | - if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
|
|
| 6543 | - return get_option('geodir_gd_uids');
|
|
| 6544 | - } |
|
| 6542 | + if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
|
|
| 6543 | + return get_option('geodir_gd_uids');
|
|
| 6544 | + } |
|
| 6545 | 6545 | |
| 6546 | - # Create a new Gdata call |
|
| 6547 | - if ( trim(get_option('geodir_ga_auth_code')) != '' )
|
|
| 6548 | - $stats = new GDGoogleAnalyticsStats(); |
|
| 6549 | - else |
|
| 6550 | - return false; |
|
| 6546 | + # Create a new Gdata call |
|
| 6547 | + if ( trim(get_option('geodir_ga_auth_code')) != '' )
|
|
| 6548 | + $stats = new GDGoogleAnalyticsStats(); |
|
| 6549 | + else |
|
| 6550 | + return false; |
|
| 6551 | 6551 | |
| 6552 | - # Check if Google sucessfully logged in |
|
| 6553 | - if ( ! $stats->checkLogin() ) |
|
| 6554 | - return false; |
|
| 6552 | + # Check if Google sucessfully logged in |
|
| 6553 | + if ( ! $stats->checkLogin() ) |
|
| 6554 | + return false; |
|
| 6555 | 6555 | |
| 6556 | - # Get a list of accounts |
|
| 6557 | - try {
|
|
| 6558 | - $accounts = $stats->getAllProfiles(); |
|
| 6559 | - } catch (Exception $e) {
|
|
| 6560 | - $gd_ga_errors[] = $e->getMessage(); |
|
| 6561 | - return false; |
|
| 6562 | - } |
|
| 6556 | + # Get a list of accounts |
|
| 6557 | + try {
|
|
| 6558 | + $accounts = $stats->getAllProfiles(); |
|
| 6559 | + } catch (Exception $e) {
|
|
| 6560 | + $gd_ga_errors[] = $e->getMessage(); |
|
| 6561 | + return false; |
|
| 6562 | + } |
|
| 6563 | 6563 | |
| 6564 | 6564 | |
| 6565 | - natcasesort ($accounts); |
|
| 6565 | + natcasesort ($accounts); |
|
| 6566 | 6566 | |
| 6567 | - # Return the account array if there are accounts |
|
| 6568 | - if ( count($accounts) > 0 ){
|
|
| 6569 | - update_option('geodir_gd_uids',$accounts);
|
|
| 6570 | - return $accounts; |
|
| 6571 | - } |
|
| 6572 | - else |
|
| 6573 | - return false; |
|
| 6567 | + # Return the account array if there are accounts |
|
| 6568 | + if ( count($accounts) > 0 ){
|
|
| 6569 | + update_option('geodir_gd_uids',$accounts);
|
|
| 6570 | + return $accounts; |
|
| 6571 | + } |
|
| 6572 | + else |
|
| 6573 | + return false; |
|
| 6574 | 6574 | } |
| 6575 | 6575 | |
| 6576 | 6576 | add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' ); |
| 6577 | 6577 | function geodir_ga_deauthorize(){
|
| 6578 | 6578 | |
| 6579 | - if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
|
|
| 6579 | + if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
|
|
| 6580 | 6580 | |
| 6581 | - die( 'Security check' ); |
|
| 6581 | + die( 'Security check' ); |
|
| 6582 | 6582 | |
| 6583 | - } else {
|
|
| 6584 | - update_option('geodir_ga_auth_token','');
|
|
| 6585 | - update_option('geodir_ga_auth_code','');
|
|
| 6586 | - update_option('geodir_gd_uids','');
|
|
| 6583 | + } else {
|
|
| 6584 | + update_option('geodir_ga_auth_token','');
|
|
| 6585 | + update_option('geodir_ga_auth_code','');
|
|
| 6586 | + update_option('geodir_gd_uids','');
|
|
| 6587 | 6587 | |
| 6588 | 6588 | |
| 6589 | - echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
|
|
| 6590 | - } |
|
| 6589 | + echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
|
|
| 6590 | + } |
|
| 6591 | 6591 | |
| 6592 | - die(); |
|
| 6592 | + die(); |
|
| 6593 | 6593 | } |
| 6594 | 6594 | |
| 6595 | 6595 | |
@@ -6600,14 +6600,14 @@ discard block |
||
| 6600 | 6600 | * @package GeoDirectory |
| 6601 | 6601 | */ |
| 6602 | 6602 | function geodir_post_type_setting_fun() {
|
| 6603 | - $post_type_arr = array(); |
|
| 6603 | + $post_type_arr = array(); |
|
| 6604 | 6604 | |
| 6605 | - $post_types = geodir_get_posttypes('object');
|
|
| 6605 | + $post_types = geodir_get_posttypes('object');
|
|
| 6606 | 6606 | |
| 6607 | - foreach ($post_types as $key => $post_types_obj) {
|
|
| 6608 | - $post_type_arr[$key] = $post_types_obj->labels->singular_name; |
|
| 6609 | - } |
|
| 6610 | - return $post_type_arr; |
|
| 6607 | + foreach ($post_types as $key => $post_types_obj) {
|
|
| 6608 | + $post_type_arr[$key] = $post_types_obj->labels->singular_name; |
|
| 6609 | + } |
|
| 6610 | + return $post_type_arr; |
|
| 6611 | 6611 | } |
| 6612 | 6612 | |
| 6613 | 6613 | /** |
@@ -6618,35 +6618,35 @@ discard block |
||
| 6618 | 6618 | */ |
| 6619 | 6619 | function geodir_listing_image_size_arr(){
|
| 6620 | 6620 | |
| 6621 | - global $_wp_additional_image_sizes; |
|
| 6622 | - |
|
| 6623 | - $sizes = array(); |
|
| 6624 | - |
|
| 6625 | - foreach ( get_intermediate_image_sizes() as $_size ) {
|
|
| 6626 | - if ( in_array( $_size, array('thumbnail', 'medium', 'medium_large', 'large') ) ) {
|
|
| 6627 | - $sizes[ $_size ]['width'] = get_option( "{$_size}_size_w" );
|
|
| 6628 | - $sizes[ $_size ]['height'] = get_option( "{$_size}_size_h" );
|
|
| 6629 | - $sizes[ $_size ]['crop'] = (bool) get_option( "{$_size}_crop" );
|
|
| 6630 | - } elseif ( isset( $_wp_additional_image_sizes[ $_size ] ) ) {
|
|
| 6631 | - $sizes[ $_size ] = array( |
|
| 6632 | - 'width' => $_wp_additional_image_sizes[ $_size ]['width'], |
|
| 6633 | - 'height' => $_wp_additional_image_sizes[ $_size ]['height'], |
|
| 6634 | - 'crop' => $_wp_additional_image_sizes[ $_size ]['crop'], |
|
| 6635 | - ); |
|
| 6636 | - } |
|
| 6637 | - } |
|
| 6621 | + global $_wp_additional_image_sizes; |
|
| 6622 | + |
|
| 6623 | + $sizes = array(); |
|
| 6624 | + |
|
| 6625 | + foreach ( get_intermediate_image_sizes() as $_size ) {
|
|
| 6626 | + if ( in_array( $_size, array('thumbnail', 'medium', 'medium_large', 'large') ) ) {
|
|
| 6627 | + $sizes[ $_size ]['width'] = get_option( "{$_size}_size_w" );
|
|
| 6628 | + $sizes[ $_size ]['height'] = get_option( "{$_size}_size_h" );
|
|
| 6629 | + $sizes[ $_size ]['crop'] = (bool) get_option( "{$_size}_crop" );
|
|
| 6630 | + } elseif ( isset( $_wp_additional_image_sizes[ $_size ] ) ) {
|
|
| 6631 | + $sizes[ $_size ] = array( |
|
| 6632 | + 'width' => $_wp_additional_image_sizes[ $_size ]['width'], |
|
| 6633 | + 'height' => $_wp_additional_image_sizes[ $_size ]['height'], |
|
| 6634 | + 'crop' => $_wp_additional_image_sizes[ $_size ]['crop'], |
|
| 6635 | + ); |
|
| 6636 | + } |
|
| 6637 | + } |
|
| 6638 | 6638 | |
| 6639 | 6639 | |
| 6640 | 6640 | |
| 6641 | - $options = array(); |
|
| 6641 | + $options = array(); |
|
| 6642 | 6642 | |
| 6643 | - $options['default'] = __('GD Default', 'geodirectory');
|
|
| 6643 | + $options['default'] = __('GD Default', 'geodirectory');
|
|
| 6644 | 6644 | |
| 6645 | - if(!empty($sizes)){
|
|
| 6646 | - foreach($sizes as $key=>$val){
|
|
| 6647 | - $options[$key] = $key. ' ( '.$val['width'].' x '.$val['height']. ' )'; |
|
| 6648 | - } |
|
| 6649 | - } |
|
| 6645 | + if(!empty($sizes)){
|
|
| 6646 | + foreach($sizes as $key=>$val){
|
|
| 6647 | + $options[$key] = $key. ' ( '.$val['width'].' x '.$val['height']. ' )'; |
|
| 6648 | + } |
|
| 6649 | + } |
|
| 6650 | 6650 | |
| 6651 | - return $options; |
|
| 6651 | + return $options; |
|
| 6652 | 6652 | } |
| 6653 | 6653 | \ No newline at end of file |
@@ -28,31 +28,31 @@ discard block |
||
| 28 | 28 | * @package GeoDirectory |
| 29 | 29 | */ |
| 30 | 30 | function geodir_admin_styles() {
|
| 31 | - wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
|
|
| 31 | + wp_register_style('geodirectory-admin-css', geodir_plugin_url().'/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
|
|
| 32 | 32 | wp_enqueue_style('geodirectory-admin-css');
|
| 33 | 33 | |
| 34 | - wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
|
|
| 34 | + wp_register_style('geodirectory-frontend-style', geodir_plugin_url().'/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
|
|
| 35 | 35 | wp_enqueue_style('geodirectory-frontend-style');
|
| 36 | 36 | |
| 37 | - wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
|
|
| 37 | + wp_register_style('geodir-chosen-style', geodir_plugin_url().'/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
|
|
| 38 | 38 | wp_enqueue_style('geodir-chosen-style');
|
| 39 | 39 | |
| 40 | - wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
|
|
| 40 | + wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url().'/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
|
|
| 41 | 41 | wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');
|
| 42 | 42 | |
| 43 | - wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
|
|
| 43 | + wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url().'/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
|
|
| 44 | 44 | wp_enqueue_style('geodirectory-jquery-ui-css');
|
| 45 | 45 | |
| 46 | - wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
|
|
| 46 | + wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url().'/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
|
|
| 47 | 47 | wp_enqueue_style('geodirectory-custom-fields-css');
|
| 48 | 48 | |
| 49 | - wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
|
|
| 49 | + wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url().'/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
|
|
| 50 | 50 | wp_enqueue_style('geodirectory-pluplodar-css');
|
| 51 | 51 | |
| 52 | - wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
|
|
| 52 | + wp_register_style('geodir-rating-style', geodir_plugin_url().'/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
|
|
| 53 | 53 | wp_enqueue_style('geodir-rating-style');
|
| 54 | 54 | |
| 55 | - wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
|
|
| 55 | + wp_register_style('geodir-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
|
|
| 56 | 56 | wp_enqueue_style('geodir-rtl-style');
|
| 57 | 57 | } |
| 58 | 58 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
|
| 71 | 71 | wp_enqueue_style('font-awesome');
|
| 72 | 72 | |
| 73 | - wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 73 | + wp_register_script('geodirectory-admin', geodir_plugin_url().'/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 74 | 74 | wp_enqueue_script('geodirectory-admin');
|
| 75 | 75 | |
| 76 | 76 | } |
@@ -89,68 +89,68 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | wp_enqueue_script('jquery');
|
| 91 | 91 | |
| 92 | - wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);
|
|
| 92 | + wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);
|
|
| 93 | 93 | |
| 94 | - wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 94 | + wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 95 | 95 | wp_enqueue_script('chosen');
|
| 96 | 96 | |
| 97 | - wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
|
|
| 97 | + wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
|
|
| 98 | 98 | wp_enqueue_script('geodirectory-choose-ajax');
|
| 99 | 99 | |
| 100 | 100 | if (isset($_REQUEST['listing_type'])) {
|
| 101 | - wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
|
|
| 101 | + wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url().'/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
|
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | wp_enqueue_script('geodirectory-custom-fields-script');
|
| 105 | - $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions'; |
|
| 105 | + $plugin_path = geodir_plugin_url().'/geodirectory-functions/cat-meta-functions'; |
|
| 106 | 106 | |
| 107 | - wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);
|
|
| 107 | + wp_enqueue_script('tax-meta-clss', $plugin_path.'/js/tax-meta-clss.js', array('jquery'), null, true);
|
|
| 108 | 108 | |
| 109 | 109 | if (in_array($geodir_map_name, array('auto', 'google'))) {
|
| 110 | - $map_lang = "&language=" . geodir_get_map_default_language(); |
|
| 111 | - $map_key = "&key=" . geodir_get_map_api_key(); |
|
| 110 | + $map_lang = "&language=".geodir_get_map_default_language(); |
|
| 111 | + $map_key = "&key=".geodir_get_map_api_key(); |
|
| 112 | 112 | /** This filter is documented in geodirectory_template_tags.php */ |
| 113 | 113 | $map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
| 114 | - wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);
|
|
| 114 | + wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);
|
|
| 115 | 115 | |
| 116 | 116 | // Overlapping Marker Spiderfier |
| 117 | - wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 117 | + wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 118 | 118 | wp_enqueue_script('geodirectory-g-overlappingmarker-script');
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | if ($geodir_map_name == 'osm') {
|
| 122 | 122 | // Leaflet OpenStreetMap |
| 123 | - wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 123 | + wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 124 | 124 | wp_enqueue_style('geodirectory-leaflet-style');
|
| 125 | 125 | |
| 126 | - wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 126 | + wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 127 | 127 | wp_enqueue_script('geodirectory-leaflet-script');
|
| 128 | 128 | |
| 129 | - wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
| 129 | + wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
| 130 | 130 | wp_enqueue_script('geodirectory-leaflet-geo-script');
|
| 131 | 131 | |
| 132 | 132 | // Overlapping Marker Spiderfier Leaflet |
| 133 | - wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 133 | + wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 134 | 134 | wp_enqueue_script('geodirectory-o-overlappingmarker-script');
|
| 135 | 135 | } |
| 136 | - wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 136 | + wp_enqueue_script('jquery-ui-autocomplete');
|
|
| 137 | 137 | |
| 138 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 138 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 139 | 139 | wp_enqueue_script('geodirectory-goMap-script');
|
| 140 | 140 | |
| 141 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
| 141 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
| 142 | 142 | wp_enqueue_script('geodirectory-goMap-script');
|
| 143 | 143 | |
| 144 | 144 | // font awesome rating script |
| 145 | 145 | if (get_option('geodir_reviewrating_enable_font_awesome')) {
|
| 146 | - wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 146 | + wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 147 | 147 | wp_enqueue_script('geodir-barrating-js');
|
| 148 | 148 | } else { // default rating script
|
| 149 | - wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);
|
|
| 149 | + wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);
|
|
| 150 | 150 | wp_enqueue_script('geodir-jRating-js');
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 153 | + wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 154 | 154 | wp_enqueue_script('geodir-on-document-load');
|
| 155 | 155 | |
| 156 | 156 | |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | wp_enqueue_script('plupload-all');
|
| 159 | 159 | wp_enqueue_script('jquery-ui-sortable');
|
| 160 | 160 | |
| 161 | - wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
| 161 | + wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
| 162 | 162 | wp_enqueue_script('geodirectory-plupload-script');
|
| 163 | 163 | |
| 164 | 164 | // SCRIPT FOR UPLOAD END |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);
|
| 213 | 213 | |
| 214 | 214 | |
| 215 | - wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
| 215 | + wp_register_script('geodirectory-admin-script', geodir_plugin_url().'/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
| 216 | 216 | wp_enqueue_script('geodirectory-admin-script');
|
| 217 | 217 | |
| 218 | 218 | wp_enqueue_style('farbtastic');
|
@@ -220,10 +220,10 @@ discard block |
||
| 220 | 220 | |
| 221 | 221 | $screen = get_current_screen(); |
| 222 | 222 | if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {
|
| 223 | - wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');
|
|
| 223 | + wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation_admin.js');
|
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | - $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
|
|
| 226 | + $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl').'?geodir_ajax=true')));
|
|
| 227 | 227 | wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
|
| 228 | 228 | |
| 229 | 229 | } |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | |
| 247 | 247 | if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
|
| 248 | 248 | |
| 249 | - add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
|
|
| 249 | + add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url().'/geodirectory-assets/images/favicon.ico', '55.1984');
|
|
| 250 | 250 | |
| 251 | 251 | |
| 252 | 252 | } |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | $geodir_menu_order[] = 'separator-geodirectory'; |
| 281 | 281 | if (!empty($post_types)) {
|
| 282 | 282 | foreach ($post_types as $post_type) {
|
| 283 | - $geodir_menu_order[] = 'edit.php?post_type=' . $post_type; |
|
| 283 | + $geodir_menu_order[] = 'edit.php?post_type='.$post_type; |
|
| 284 | 284 | } |
| 285 | 285 | } |
| 286 | 286 | $geodir_menu_order[] = $item; |
@@ -323,8 +323,8 @@ discard block |
||
| 323 | 323 | {
|
| 324 | 324 | if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
|
| 325 | 325 | echo '<div id="message" class="updated fade"> |
| 326 | - <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p>
|
|
| 327 | - <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>
|
|
| 326 | + <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory').' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">'.__('Support us by leaving a rating!', 'geodirectory').'</a></p>
|
|
| 327 | + <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory').'</strong></p>
|
|
| 328 | 328 | </div>'; |
| 329 | 329 | |
| 330 | 330 | } |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
|
| 333 | 333 | switch ($_REQUEST['msg']) {
|
| 334 | 334 | case 'success': |
| 335 | - echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
|
|
| 335 | + echo '<div id="message" class="updated fade"><p><strong>'.__('Your settings have been saved.', 'geodirectory').'</strong></p></div>';
|
|
| 336 | 336 | flush_rewrite_rules(false); |
| 337 | 337 | |
| 338 | 338 | break; |
@@ -340,30 +340,30 @@ discard block |
||
| 340 | 340 | $gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : ''; |
| 341 | 341 | |
| 342 | 342 | if ($gderr == 21) |
| 343 | - echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';
|
|
| 343 | + echo '<div id="message" class="error fade"><p><strong>'.__('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory').'</strong></p></div>';
|
|
| 344 | 344 | else |
| 345 | - echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
|
|
| 345 | + echo '<div id="message" class="error fade"><p><strong>'.__('Error: Your settings have not been saved, please try again.', 'geodirectory').'</strong></p></div>';
|
|
| 346 | 346 | break; |
| 347 | 347 | } |
| 348 | 348 | } |
| 349 | 349 | |
| 350 | 350 | $geodir_load_map = get_option('geodir_load_map');
|
| 351 | 351 | $need_map_key = false; |
| 352 | - if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
|
|
| 352 | + if ($geodir_load_map == '' || $geodir_load_map == 'google' || $geodir_load_map == 'auto') {
|
|
| 353 | 353 | $need_map_key = true; |
| 354 | 354 | } |
| 355 | 355 | |
| 356 | 356 | if (!geodir_get_map_api_key() && $need_map_key) {
|
| 357 | - echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 357 | + echo '<div class="error"><p><strong>'.sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings').'\'>', '</a>').'</strong></p></div>';
|
|
| 358 | 358 | } |
| 359 | 359 | |
| 360 | 360 | if (!geodir_is_default_location_set()) {
|
| 361 | - echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 361 | + echo '<div class="updated fade"><p><strong>'.sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>').'</strong></p></div>';
|
|
| 362 | 362 | |
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | if (!function_exists('curl_init')) {
|
| 366 | - echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';
|
|
| 366 | + echo '<div class="error"><p><strong>'.__('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory').'</strong></p></div>';
|
|
| 367 | 367 | |
| 368 | 368 | } |
| 369 | 369 | |
@@ -383,18 +383,18 @@ discard block |
||
| 383 | 383 | function geodir_handle_option_form_submit($current_tab) |
| 384 | 384 | {
|
| 385 | 385 | global $geodir_settings; |
| 386 | - if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
|
|
| 386 | + if (file_exists(dirname(__FILE__).'/option-pages/'.$current_tab.'_array.php')) {
|
|
| 387 | 387 | /** |
| 388 | 388 | * Contains settings array for current tab. |
| 389 | 389 | * |
| 390 | 390 | * @since 1.0.0 |
| 391 | 391 | * @package GeoDirectory |
| 392 | 392 | */ |
| 393 | - include_once('option-pages/' . $current_tab . '_array.php');
|
|
| 393 | + include_once('option-pages/'.$current_tab.'_array.php');
|
|
| 394 | 394 | } |
| 395 | 395 | if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') : |
| 396 | 396 | if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
| 397 | - if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 397 | + if (!wp_verify_nonce($_REQUEST['_wpnonce-'.$current_tab], 'geodir-settings-'.$current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 398 | 398 | |
| 399 | 399 | /** |
| 400 | 400 | * Fires before updating geodirectory admin settings. |
@@ -427,13 +427,13 @@ discard block |
||
| 427 | 427 | * @param string $current_tab The current settings tab name. |
| 428 | 428 | * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab. |
| 429 | 429 | */ |
| 430 | - do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
|
|
| 430 | + do_action('geodir_update_options_'.$current_tab, $geodir_settings[$current_tab]);
|
|
| 431 | 431 | |
| 432 | 432 | flush_rewrite_rules(false); |
| 433 | 433 | |
| 434 | 434 | $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : ''; |
| 435 | 435 | |
| 436 | - $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');
|
|
| 436 | + $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$_REQUEST['active_tab'].'&msg=success');
|
|
| 437 | 437 | |
| 438 | 438 | wp_redirect($redirect_url); |
| 439 | 439 | exit(); |
@@ -472,18 +472,18 @@ discard block |
||
| 472 | 472 | |
| 473 | 473 | elseif (isset($value['type']) && $value['type'] == 'image_width') : |
| 474 | 474 | |
| 475 | - if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
|
|
| 476 | - update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']); |
|
| 477 | - update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']); |
|
| 478 | - if (isset($_POST[$value['id'] . '_crop'])) : |
|
| 479 | - update_option($value['id'] . '_crop', 1); |
|
| 475 | + if (isset($value['id']) && isset($_POST[$value['id'].'_width'])) {
|
|
| 476 | + update_option($value['id'].'_width', $_POST[$value['id'].'_width']); |
|
| 477 | + update_option($value['id'].'_height', $_POST[$value['id'].'_height']); |
|
| 478 | + if (isset($_POST[$value['id'].'_crop'])) : |
|
| 479 | + update_option($value['id'].'_crop', 1); |
|
| 480 | 480 | else : |
| 481 | - update_option($value['id'] . '_crop', 0); |
|
| 481 | + update_option($value['id'].'_crop', 0); |
|
| 482 | 482 | endif; |
| 483 | 483 | } else {
|
| 484 | - update_option($value['id'] . '_width', $value['std']); |
|
| 485 | - update_option($value['id'] . '_height', $value['std']); |
|
| 486 | - update_option($value['id'] . '_crop', 1); |
|
| 484 | + update_option($value['id'].'_width', $value['std']); |
|
| 485 | + update_option($value['id'].'_height', $value['std']); |
|
| 486 | + update_option($value['id'].'_crop', 1); |
|
| 487 | 487 | } |
| 488 | 488 | |
| 489 | 489 | elseif (isset($value['type']) && $value['type'] == 'map') : |
@@ -525,12 +525,12 @@ discard block |
||
| 525 | 525 | elseif (isset($value['type']) && $value['type'] == 'file') : |
| 526 | 526 | |
| 527 | 527 | |
| 528 | - if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file
|
|
| 528 | + if (isset($_POST[$value['id'].'_remove']) && $_POST[$value['id'].'_remove']) {// if remove is set then remove the file
|
|
| 529 | 529 | |
| 530 | 530 | if (get_option($value['id'])) {
|
| 531 | 531 | $image_name_arr = explode('/', get_option($value['id']));
|
| 532 | 532 | $noimg_name = end($image_name_arr); |
| 533 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 533 | + $img_path = $uploads['path'].'/'.$noimg_name; |
|
| 534 | 534 | if (file_exists($img_path)) |
| 535 | 535 | unlink($img_path); |
| 536 | 536 | } |
@@ -558,7 +558,7 @@ discard block |
||
| 558 | 558 | if (get_option($value['id'])) {
|
| 559 | 559 | $image_name_arr = explode('/', get_option($value['id']));
|
| 560 | 560 | $noimg_name = end($image_name_arr); |
| 561 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 561 | + $img_path = $uploads['path'].'/'.$noimg_name; |
|
| 562 | 562 | if (file_exists($img_path)) |
| 563 | 563 | unlink($img_path); |
| 564 | 564 | } |
@@ -579,7 +579,7 @@ discard block |
||
| 579 | 579 | // same menu setting per theme. |
| 580 | 580 | if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
|
| 581 | 581 | $theme = wp_get_theme(); |
| 582 | - update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
|
|
| 582 | + update_option('geodir_theme_location_nav_'.$theme->name, $_POST[$value['id']]);
|
|
| 583 | 583 | } |
| 584 | 584 | |
| 585 | 585 | if (isset($value['id']) && isset($_POST[$value['id']])) {
|
@@ -649,7 +649,7 @@ discard block |
||
| 649 | 649 | |
| 650 | 650 | $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory'); |
| 651 | 651 | |
| 652 | - $tabs[$geodir_post_type . '_fields_settings'] = array( |
|
| 652 | + $tabs[$geodir_post_type.'_fields_settings'] = array( |
|
| 653 | 653 | 'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),
|
| 654 | 654 | 'subtabs' => array( |
| 655 | 655 | array('subtab' => 'custom_fields',
|
@@ -683,7 +683,7 @@ discard block |
||
| 683 | 683 | */ |
| 684 | 684 | function geodir_tools_setting_tab($tabs) |
| 685 | 685 | {
|
| 686 | - wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
| 686 | + wp_enqueue_script('jquery-ui-progressbar');
|
|
| 687 | 687 | $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
|
| 688 | 688 | return $tabs; |
| 689 | 689 | } |
@@ -717,7 +717,7 @@ discard block |
||
| 717 | 717 | */ |
| 718 | 718 | function geodir_extend_geodirectory_setting_tab($tabs) |
| 719 | 719 | {
|
| 720 | - $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
| 720 | + $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory').' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
| 721 | 721 | return $tabs; |
| 722 | 722 | } |
| 723 | 723 | |
@@ -777,8 +777,8 @@ discard block |
||
| 777 | 777 | _e('Unknown', 'geodirectory');
|
| 778 | 778 | } else {
|
| 779 | 779 | /* If there is a city id, append 'city name' to the text string. */ |
| 780 | - $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';
|
|
| 781 | - echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id); |
|
| 780 | + $add_location_id = $location_id > 0 ? ' ('.$location_id.')' : '';
|
|
| 781 | + echo(__($location->country, 'geodirectory').'-'.$location->region.'-'.$location->city.$add_location_id); |
|
| 782 | 782 | } |
| 783 | 783 | break; |
| 784 | 784 | |
@@ -796,14 +796,14 @@ discard block |
||
| 796 | 796 | $expire_class = 'expire_over'; |
| 797 | 797 | } |
| 798 | 798 | $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days |
| 799 | - $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
|
|
| 799 | + $date_diff_text = '<br /><span class="'.$expire_class.'">('.$date_diff.' '.$state.')</span>';
|
|
| 800 | 800 | } |
| 801 | 801 | /* If no expire_date is found, output a default message. */ |
| 802 | 802 | if (empty($expire_date)) |
| 803 | 803 | echo __('Unknown', 'geodirectory');
|
| 804 | 804 | /* If there is a expire_date, append 'days left' to the text string. */ |
| 805 | 805 | else |
| 806 | - echo $expire_date . $date_diff_text; |
|
| 806 | + echo $expire_date.$date_diff_text; |
|
| 807 | 807 | break; |
| 808 | 808 | |
| 809 | 809 | /* If displaying the 'categorys' column. */ |
@@ -870,7 +870,7 @@ discard block |
||
| 870 | 870 | function geodir_post_information_save($post_id, $post) {
|
| 871 | 871 | global $wpdb, $current_user; |
| 872 | 872 | |
| 873 | - if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {
|
|
| 873 | + if (isset($post->post_type) && ($post->post_type == 'nav_menu_item' || $post->post_type == 'page' || $post->post_type == 'post')) {
|
|
| 874 | 874 | return; |
| 875 | 875 | } |
| 876 | 876 | |
@@ -938,7 +938,7 @@ discard block |
||
| 938 | 938 | $tab_id = $value['id']; |
| 939 | 939 | |
| 940 | 940 | if (isset($value['desc']) && $value['desc']) |
| 941 | - $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
| 941 | + $desc = '<span style=" text-transform:none;">:- '.$value['desc'].'</span>'; |
|
| 942 | 942 | |
| 943 | 943 | if (isset($value['name']) && $value['name']) {
|
| 944 | 944 | if ($first_title === true) {
|
@@ -946,9 +946,9 @@ discard block |
||
| 946 | 946 | } else {
|
| 947 | 947 | echo '</div>'; |
| 948 | 948 | } |
| 949 | - echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>'; |
|
| 949 | + echo '<dd id="'.trim($tab_id).'" class="geodir_option_tabs" ><a href="javascript:void(0);">'.$value['name'].'</a></dd>'; |
|
| 950 | 950 | |
| 951 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 951 | + echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 952 | 952 | } |
| 953 | 953 | |
| 954 | 954 | /** |
@@ -958,21 +958,21 @@ discard block |
||
| 958 | 958 | * |
| 959 | 959 | * @since 1.0.0 |
| 960 | 960 | */ |
| 961 | - do_action('geodir_settings_' . sanitize_title($value['id']));
|
|
| 961 | + do_action('geodir_settings_'.sanitize_title($value['id']));
|
|
| 962 | 962 | break; |
| 963 | 963 | |
| 964 | 964 | case 'no_tabs': |
| 965 | 965 | |
| 966 | 966 | echo '<div class="inner_content_tab_main">'; |
| 967 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 967 | + echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 968 | 968 | |
| 969 | 969 | break; |
| 970 | 970 | |
| 971 | 971 | case 'sectionstart': |
| 972 | 972 | if (isset($value['desc']) && $value['desc']) |
| 973 | - $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
| 973 | + $desc = '<span style=" text-transform:none;"> - '.$value['desc'].'</span>'; |
|
| 974 | 974 | if (isset($value['name']) && $value['name']) |
| 975 | - echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
| 975 | + echo '<h3>'.$value['name'].$desc.'</h3>'; |
|
| 976 | 976 | /** |
| 977 | 977 | * Called after a GeoDirectory settings sectionstart is output in the GD settings page. |
| 978 | 978 | * |
@@ -980,8 +980,8 @@ discard block |
||
| 980 | 980 | * |
| 981 | 981 | * @since 1.0.0 |
| 982 | 982 | */ |
| 983 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
|
|
| 984 | - echo '<table class="form-table">' . "\n\n"; |
|
| 983 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_start');
|
|
| 984 | + echo '<table class="form-table">'."\n\n"; |
|
| 985 | 985 | |
| 986 | 986 | break; |
| 987 | 987 | case 'sectionend': |
@@ -992,7 +992,7 @@ discard block |
||
| 992 | 992 | * |
| 993 | 993 | * @since 1.0.0 |
| 994 | 994 | */ |
| 995 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
|
|
| 995 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_end');
|
|
| 996 | 996 | echo '</table>'; |
| 997 | 997 | /** |
| 998 | 998 | * Called after a GeoDirectory settings sectionend is output in the GD settings page. |
@@ -1001,7 +1001,7 @@ discard block |
||
| 1001 | 1001 | * |
| 1002 | 1002 | * @since 1.0.0 |
| 1003 | 1003 | */ |
| 1004 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
|
|
| 1004 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_after');
|
|
| 1005 | 1005 | break; |
| 1006 | 1006 | case 'text': |
| 1007 | 1007 | ?> |
@@ -1010,7 +1010,7 @@ discard block |
||
| 1010 | 1010 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
| 1011 | 1011 | id="<?php echo esc_attr($value['id']); ?>" |
| 1012 | 1012 | type="<?php echo esc_attr($value['type']); ?>" |
| 1013 | - <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1013 | + <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1014 | 1014 | style=" <?php echo esc_attr($value['css']); ?>" |
| 1015 | 1015 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1016 | 1016 | echo esc_attr(stripslashes(get_option($value['id']))); |
@@ -1027,15 +1027,15 @@ discard block |
||
| 1027 | 1027 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
| 1028 | 1028 | id="<?php echo esc_attr($value['id']); ?>" |
| 1029 | 1029 | type="<?php echo esc_attr($value['type']); ?>" |
| 1030 | - <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1030 | + <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1031 | 1031 | style=" <?php echo esc_attr($value['css']); ?>" |
| 1032 | 1032 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1033 | 1033 | echo esc_attr(stripslashes(get_option($value['id']))); |
| 1034 | 1034 | } else {
|
| 1035 | 1035 | echo esc_attr($value['std']); |
| 1036 | 1036 | } ?>"/> |
| 1037 | - <?php $gm_api_url = 'https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]';?> |
|
| 1038 | - <a id="gd-api-key" onclick='window.open("<?php echo wp_slash($gm_api_url);?>", "newwindow", "width=600, height=400"); return false;' href='<?php echo $gm_api_url;?>' class="button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )','geodirectory');?>" ><?php _e('Generate API Key','geodirectory');?></a>
|
|
| 1037 | + <?php $gm_api_url = 'https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]'; ?> |
|
| 1038 | + <a id="gd-api-key" onclick='window.open("<?php echo wp_slash($gm_api_url); ?>", "newwindow", "width=600, height=400"); return false;' href='<?php echo $gm_api_url; ?>' class="button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )', 'geodirectory'); ?>" ><?php _e('Generate API Key', 'geodirectory'); ?></a>
|
|
| 1039 | 1039 | <span class="description"><?php echo $value['desc']; ?></span></td> |
| 1040 | 1040 | </tr><?php |
| 1041 | 1041 | break; |
@@ -1047,7 +1047,7 @@ discard block |
||
| 1047 | 1047 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
| 1048 | 1048 | id="<?php echo esc_attr($value['id']); ?>" |
| 1049 | 1049 | type="<?php echo esc_attr($value['type']); ?>" |
| 1050 | - <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1050 | + <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1051 | 1051 | style="<?php echo esc_attr($value['css']); ?>" |
| 1052 | 1052 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1053 | 1053 | echo esc_attr(stripslashes(get_option($value['id']))); |
@@ -1093,17 +1093,17 @@ discard block |
||
| 1093 | 1093 | <?php _e('Width', 'geodirectory'); ?> <input
|
| 1094 | 1094 | name="<?php echo esc_attr($value['id']); ?>_width" |
| 1095 | 1095 | id="<?php echo esc_attr($value['id']); ?>_width" type="text" size="3" |
| 1096 | - value="<?php if ($size = get_option($value['id'] . '_width')) echo stripslashes($size); else echo $value['std']; ?>"/> |
|
| 1096 | + value="<?php if ($size = get_option($value['id'].'_width')) echo stripslashes($size); else echo $value['std']; ?>"/> |
|
| 1097 | 1097 | |
| 1098 | 1098 | <?php _e('Height', 'geodirectory'); ?> <input
|
| 1099 | 1099 | name="<?php echo esc_attr($value['id']); ?>_height" |
| 1100 | 1100 | id="<?php echo esc_attr($value['id']); ?>_height" type="text" size="3" |
| 1101 | - value="<?php if ($size = get_option($value['id'] . '_height')) echo stripslashes($size); else echo $value['std']; ?>"/> |
|
| 1101 | + value="<?php if ($size = get_option($value['id'].'_height')) echo stripslashes($size); else echo $value['std']; ?>"/> |
|
| 1102 | 1102 | |
| 1103 | 1103 | <label><?php _e('Hard Crop', 'geodirectory'); ?> <input
|
| 1104 | 1104 | name="<?php echo esc_attr($value['id']); ?>_crop" |
| 1105 | 1105 | id="<?php echo esc_attr($value['id']); ?>_crop" |
| 1106 | - type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label> |
|
| 1106 | + type="checkbox" <?php if (get_option($value['id'].'_crop') != '') checked(get_option($value['id'].'_crop'), 1); else checked(1); ?> /></label> |
|
| 1107 | 1107 | |
| 1108 | 1108 | <span class="description"><?php echo $value['desc'] ?></span></td> |
| 1109 | 1109 | </tr><?php |
@@ -1153,7 +1153,7 @@ discard block |
||
| 1153 | 1153 | id="<?php echo esc_attr($value['id']); ?>" |
| 1154 | 1154 | style="<?php echo esc_attr($value['css']); ?>" |
| 1155 | 1155 | class="<?php if (isset($value['class'])) echo $value['class']; ?>" |
| 1156 | - data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>" |
|
| 1156 | + data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text']; ?>" |
|
| 1157 | 1157 | option-ajaxchosen="false"> |
| 1158 | 1158 | <?php |
| 1159 | 1159 | foreach ($value['options'] as $key => $val) {
|
@@ -1163,7 +1163,7 @@ discard block |
||
| 1163 | 1163 | ?></optgroup><?php |
| 1164 | 1164 | } else {
|
| 1165 | 1165 | ?> |
| 1166 | - <option value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>> |
|
| 1166 | + <option value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values))); ?>> |
|
| 1167 | 1167 | <?php echo geodir_utf8_ucfirst($val) ?> |
| 1168 | 1168 | </option> |
| 1169 | 1169 | <?php |
@@ -1200,7 +1200,7 @@ discard block |
||
| 1200 | 1200 | ?> |
| 1201 | 1201 | |
| 1202 | 1202 | <tr valign="top"> |
| 1203 | - <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>
|
|
| 1203 | + <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory'); ?></th>
|
|
| 1204 | 1204 | <td width="60%"> |
| 1205 | 1205 | <select name="geodir_default_map_language" style="width:60%"> |
| 1206 | 1206 | <?php |
@@ -1282,7 +1282,7 @@ discard block |
||
| 1282 | 1282 | |
| 1283 | 1283 | <tr valign="top"> |
| 1284 | 1284 | <th class="titledesc" |
| 1285 | - width="40%"><?php _e('Default post type search on map', 'geodirectory');?></th>
|
|
| 1285 | + width="40%"><?php _e('Default post type search on map', 'geodirectory'); ?></th>
|
|
| 1286 | 1286 | <td width="60%"> |
| 1287 | 1287 | <select name="geodir_default_map_search_pt" style="width:60%"> |
| 1288 | 1288 | <?php |
@@ -1323,7 +1323,7 @@ discard block |
||
| 1323 | 1323 | $cat_display = 'checkbox'; |
| 1324 | 1324 | $gd_post_types = get_option('geodir_exclude_post_type_on_map');
|
| 1325 | 1325 | $gd_cats = get_option('geodir_exclude_cat_on_map');
|
| 1326 | - $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 1326 | + $gd_cats_upgrade = (int) get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 1327 | 1327 | $count = 1; |
| 1328 | 1328 | ?> |
| 1329 | 1329 | <table width="70%" class="widefat"> |
@@ -1352,7 +1352,7 @@ discard block |
||
| 1352 | 1352 | name="home_map_post_types[]" |
| 1353 | 1353 | id="<?php echo esc_attr($value['id']); ?>" |
| 1354 | 1354 | value="<?php echo $key; ?>" |
| 1355 | - class="map_post_type" <?php echo $checked;?> /> |
|
| 1355 | + class="map_post_type" <?php echo $checked; ?> /> |
|
| 1356 | 1356 | <?php echo __($post_types_obj->labels->singular_name, 'geodirectory'); ?></td> |
| 1357 | 1357 | <td width="40%"> |
| 1358 | 1358 | <div class="home_map_category" style="overflow:auto;width:200px;height:100px;" |
@@ -1410,12 +1410,12 @@ discard block |
||
| 1410 | 1410 | ?> |
| 1411 | 1411 | <fieldset> |
| 1412 | 1412 | <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend> |
| 1413 | - <label for="<?php echo $value['id'];?>"> |
|
| 1413 | + <label for="<?php echo $value['id']; ?>"> |
|
| 1414 | 1414 | <input name="<?php echo esc_attr($value['id']); ?>" |
| 1415 | - id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio" |
|
| 1415 | + id="<?php echo esc_attr($value['id'].$value['value']); ?>" type="radio" |
|
| 1416 | 1416 | value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {
|
| 1417 | 1417 | echo 'checked="checked"'; |
| 1418 | - }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
|
|
| 1418 | + }elseif (get_option($value['id']) == '' && $value['std'] == $value['value']) {echo 'checked="checked"'; } ?> />
|
|
| 1419 | 1419 | <?php echo $value['desc']; ?></label><br> |
| 1420 | 1420 | </fieldset> |
| 1421 | 1421 | <?php |
@@ -1435,9 +1435,9 @@ discard block |
||
| 1435 | 1435 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1436 | 1436 | <td class="forminp"> |
| 1437 | 1437 | <textarea |
| 1438 | - <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>" |
|
| 1438 | + <?php if (isset($value['args'])) echo $value['args'].' '; ?>name="<?php echo esc_attr($value['id']); ?>" |
|
| 1439 | 1439 | id="<?php echo esc_attr($value['id']); ?>" |
| 1440 | - <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1440 | + <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1441 | 1441 | style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) echo esc_textarea(stripslashes(get_option($value['id']))); else echo esc_textarea($value['std']); ?></textarea><span |
| 1442 | 1442 | class="description"><?php echo $value['desc'] ?></span> |
| 1443 | 1443 | |
@@ -1482,7 +1482,7 @@ discard block |
||
| 1482 | 1482 | } |
| 1483 | 1483 | } |
| 1484 | 1484 | // |
| 1485 | - $page_setting = (int)get_option($value['id']); |
|
| 1485 | + $page_setting = (int) get_option($value['id']); |
|
| 1486 | 1486 | |
| 1487 | 1487 | $args = array('name' => $value['id'],
|
| 1488 | 1488 | 'id' => $value['id'], |
@@ -1499,7 +1499,7 @@ discard block |
||
| 1499 | 1499 | <tr valign="top" class="single_select_page"> |
| 1500 | 1500 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1501 | 1501 | <td class="forminp"> |
| 1502 | - <?php echo str_replace(' id=', " data-placeholder='" . __('Select a page...', 'geodirectory') . "' style='" . $value['css'] . "' class='" . $value['class'] . "' " . $disabled . " id=", wp_dropdown_pages($args)); ?>
|
|
| 1502 | + <?php echo str_replace(' id=', " data-placeholder='".__('Select a page...', 'geodirectory')."' style='".$value['css']."' class='".$value['class']."' ".$disabled." id=", wp_dropdown_pages($args)); ?>
|
|
| 1503 | 1503 | <span class="description"><?php echo $value['desc'] ?></span> |
| 1504 | 1504 | </td> |
| 1505 | 1505 | </tr><?php |
@@ -1508,7 +1508,7 @@ discard block |
||
| 1508 | 1508 | } |
| 1509 | 1509 | break; |
| 1510 | 1510 | case 'single_select_country' : |
| 1511 | - $country_setting = (string)get_option($value['id']); |
|
| 1511 | + $country_setting = (string) get_option($value['id']); |
|
| 1512 | 1512 | if (strstr($country_setting, ':')) : |
| 1513 | 1513 | $country = current(explode(':', $country_setting));
|
| 1514 | 1514 | $state = end(explode(':', $country_setting));
|
@@ -1531,7 +1531,7 @@ discard block |
||
| 1531 | 1531 | case 'multi_select_countries' : |
| 1532 | 1532 | $countries = $geodirectory->countries->countries; |
| 1533 | 1533 | asort($countries); |
| 1534 | - $selections = (array)get_option($value['id']); |
|
| 1534 | + $selections = (array) get_option($value['id']); |
|
| 1535 | 1535 | ?> |
| 1536 | 1536 | <tr valign="top"> |
| 1537 | 1537 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
@@ -1541,7 +1541,7 @@ discard block |
||
| 1541 | 1541 | title="Country" class="chosen_select"> |
| 1542 | 1542 | <?php |
| 1543 | 1543 | if ($countries) foreach ($countries as $key => $val) : |
| 1544 | - echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
| 1544 | + echo '<option value="'.$key.'" '.selected(in_array($key, $selections), true, false).'>'.$val.'</option>'; |
|
| 1545 | 1545 | endforeach; |
| 1546 | 1546 | ?> |
| 1547 | 1547 | </select> |
@@ -1553,7 +1553,7 @@ discard block |
||
| 1553 | 1553 | break; |
| 1554 | 1554 | |
| 1555 | 1555 | case 'google_analytics' : |
| 1556 | - $selections = (array)get_option($value['id']); |
|
| 1556 | + $selections = (array) get_option($value['id']); |
|
| 1557 | 1557 | ?> |
| 1558 | 1558 | <tr valign="top"> |
| 1559 | 1559 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
@@ -1564,30 +1564,30 @@ discard block |
||
| 1564 | 1564 | |
| 1565 | 1565 | $oAuthURL = "https://accounts.google.com/o/oauth2/auth?"; |
| 1566 | 1566 | $scope = "scope=https://www.googleapis.com/auth/analytics.readonly"; |
| 1567 | - $state = "&state=123";//any string |
|
| 1568 | - $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 1567 | + $state = "&state=123"; //any string |
|
| 1568 | + $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";
|
|
| 1569 | 1569 | $response_type = "&response_type=code"; |
| 1570 | 1570 | $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
| 1571 | 1571 | $access_type = "&access_type=offline"; |
| 1572 | 1572 | $approval_prompt = "&approval_prompt=force"; |
| 1573 | 1573 | |
| 1574 | - $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt; |
|
| 1574 | + $auth_url = $oAuthURL.$scope.$state.$redirect_uri.$response_type.$client_id.$access_type.$approval_prompt; |
|
| 1575 | 1575 | |
| 1576 | 1576 | |
| 1577 | 1577 | if (get_option('geodir_ga_auth_token')) {
|
| 1578 | 1578 | ?> |
| 1579 | 1579 | <span class="button-primary" |
| 1580 | - onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize');?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>
|
|
| 1580 | + onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize'); ?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>
|
|
| 1581 | 1581 | <span style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>
|
| 1582 | 1582 | <?php |
| 1583 | 1583 | global $gd_ga_errors; |
| 1584 | - if(!empty($gd_ga_errors)){
|
|
| 1584 | + if (!empty($gd_ga_errors)) {
|
|
| 1585 | 1585 | print_r($gd_ga_errors); |
| 1586 | 1586 | } |
| 1587 | 1587 | } else {
|
| 1588 | 1588 | ?> |
| 1589 | 1589 | <span class="button-primary" |
| 1590 | - onclick="window.open('<?php echo geodir_ga_activation_url();?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory');?></span>
|
|
| 1590 | + onclick="window.open('<?php echo geodir_ga_activation_url(); ?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory'); ?></span>
|
|
| 1591 | 1591 | <?php |
| 1592 | 1592 | } |
| 1593 | 1593 | ?> |
@@ -1658,9 +1658,9 @@ discard block |
||
| 1658 | 1658 | |
| 1659 | 1659 | <?php if (isset($_REQUEST['active_tab']) && $_REQUEST['active_tab'] != '') { ?>
|
| 1660 | 1660 | jQuery('.geodir_option_tabs').removeClass('gd-tab-active');
|
| 1661 | - jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').addClass('gd-tab-active');
|
|
| 1661 | + jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').addClass('gd-tab-active');
|
|
| 1662 | 1662 | jQuery('.gd-content-heading').hide();
|
| 1663 | - jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').show();
|
|
| 1663 | + jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').show();
|
|
| 1664 | 1664 | <?php } ?> |
| 1665 | 1665 | }); |
| 1666 | 1666 | </script> |
@@ -1746,7 +1746,7 @@ discard block |
||
| 1746 | 1746 | wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename'); |
| 1747 | 1747 | |
| 1748 | 1748 | if (geodir_get_featured_image($post_id, 'thumbnail')) {
|
| 1749 | - echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
|
|
| 1749 | + echo '<h4>'.__('Featured Image', 'geodirectory').'</h4>';
|
|
| 1750 | 1750 | geodir_show_featured_image($post_id, 'thumbnail'); |
| 1751 | 1751 | } |
| 1752 | 1752 | |
@@ -1757,13 +1757,13 @@ discard block |
||
| 1757 | 1757 | |
| 1758 | 1758 | <h5 class="form_title"> |
| 1759 | 1759 | <?php if ($image_limit != 0 && $image_limit == 1) {
|
| 1760 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 1760 | + echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('image with this package', 'geodirectory').')</small>';
|
|
| 1761 | 1761 | } ?> |
| 1762 | 1762 | <?php if ($image_limit != 0 && $image_limit > 1) {
|
| 1763 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 1763 | + echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('images with this package', 'geodirectory').')</small>';
|
|
| 1764 | 1764 | } ?> |
| 1765 | 1765 | <?php if ($image_limit == 0) {
|
| 1766 | - echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 1766 | + echo '<br /><small>('.__('You can upload unlimited images with this package', 'geodirectory').')</small>';
|
|
| 1767 | 1767 | } ?> |
| 1768 | 1768 | </h5> |
| 1769 | 1769 | |
@@ -1802,10 +1802,10 @@ discard block |
||
| 1802 | 1802 | <div |
| 1803 | 1803 | class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>" |
| 1804 | 1804 | id="<?php echo $id; ?>plupload-upload-ui"> |
| 1805 | - <h4><?php _e('Drop files to upload', 'geodirectory');?></h4>
|
|
| 1805 | + <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4>
|
|
| 1806 | 1806 | <input id="<?php echo $id; ?>plupload-browse-button" type="button" |
| 1807 | 1807 | value="<?php _e('Select Files', 'geodirectory'); ?>" class="button"/>
|
| 1808 | - <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span> |
|
| 1808 | + <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id.'pluploadan'); ?>"></span> |
|
| 1809 | 1809 | <?php if ($width && $height): ?> |
| 1810 | 1810 | <span class="plupload-resize"></span> |
| 1811 | 1811 | <span class="plupload-width" id="plupload-width<?php echo $width; ?>"></span> |
@@ -1817,7 +1817,7 @@ discard block |
||
| 1817 | 1817 | id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;"> |
| 1818 | 1818 | </div> |
| 1819 | 1819 | <span |
| 1820 | - id="upload-msg"><?php _e('Please drag & drop the images to rearrange the order', 'geodirectory');?></span>
|
|
| 1820 | + id="upload-msg"><?php _e('Please drag & drop the images to rearrange the order', 'geodirectory'); ?></span>
|
|
| 1821 | 1821 | <span id="<?php echo $id; ?>upload-error" style="display:none"></span> |
| 1822 | 1822 | </div> |
| 1823 | 1823 | |
@@ -2027,9 +2027,9 @@ discard block |
||
| 2027 | 2027 | $plugin = 'avada-nag'; |
| 2028 | 2028 | $timestamp = 'avada-nag1234'; |
| 2029 | 2029 | $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');
|
| 2030 | - echo '<div id="' . $timestamp . '" class="error">'; |
|
| 2031 | - echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>'; |
|
| 2032 | - echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";
|
|
| 2030 | + echo '<div id="'.$timestamp.'" class="error">'; |
|
| 2031 | + echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\''.$plugin.'\',\''.$timestamp.'\');" ><i class="fa fa-times"></i></span>'; |
|
| 2032 | + echo "<img class='gd-icon-noti' src='".plugin_dir_url('')."geodirectory/geodirectory-assets/images/favicon.ico' > ";
|
|
| 2033 | 2033 | echo "<p>$message</p>"; |
| 2034 | 2034 | echo "</div>"; |
| 2035 | 2035 | |
@@ -2163,7 +2163,7 @@ discard block |
||
| 2163 | 2163 | |
| 2164 | 2164 | // Don't allow same slug url for listing and location |
| 2165 | 2165 | if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {
|
| 2166 | - $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');
|
|
| 2166 | + $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab.'&msg=fail&gderr=21');
|
|
| 2167 | 2167 | wp_redirect($redirect_url); |
| 2168 | 2168 | exit; |
| 2169 | 2169 | } |
@@ -2175,7 +2175,7 @@ discard block |
||
| 2175 | 2175 | $default_language = $sitepress->get_default_language(); |
| 2176 | 2176 | |
| 2177 | 2177 | if ($current_language != 'all' && $current_language != $default_language) {
|
| 2178 | - $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab);
|
|
| 2178 | + $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab);
|
|
| 2179 | 2179 | wp_redirect($redirect_url); |
| 2180 | 2180 | exit; |
| 2181 | 2181 | } |
@@ -2196,11 +2196,11 @@ discard block |
||
| 2196 | 2196 | function geodir_hide_admin_preview_button() {
|
| 2197 | 2197 | global $post_type; |
| 2198 | 2198 | $post_types = geodir_get_posttypes(); |
| 2199 | - if(in_array($post_type, $post_types)) |
|
| 2199 | + if (in_array($post_type, $post_types)) |
|
| 2200 | 2200 | echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
|
| 2201 | 2201 | } |
| 2202 | -add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' ); |
|
| 2203 | -add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' ); |
|
| 2202 | +add_action('admin_head-post-new.php', 'geodir_hide_admin_preview_button');
|
|
| 2203 | +add_action('admin_head-post.php', 'geodir_hide_admin_preview_button');
|
|
| 2204 | 2204 | |
| 2205 | 2205 | /** |
| 2206 | 2206 | * Add the tab in left sidebar menu fro import & export page. |
@@ -2210,8 +2210,8 @@ discard block |
||
| 2210 | 2210 | * |
| 2211 | 2211 | * @return array Array of tab data. |
| 2212 | 2212 | */ |
| 2213 | -function geodir_import_export_tab( $tabs ) {
|
|
| 2214 | - $tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) ); |
|
| 2213 | +function geodir_import_export_tab($tabs) {
|
|
| 2214 | + $tabs['import_export'] = array('label' => __('Import & Export', 'geodirectory'));
|
|
| 2215 | 2215 | return $tabs; |
| 2216 | 2216 | } |
| 2217 | 2217 | |
@@ -2225,8 +2225,8 @@ discard block |
||
| 2225 | 2225 | * @return string Html content. |
| 2226 | 2226 | */ |
| 2227 | 2227 | function geodir_import_export_page() {
|
| 2228 | - $nonce = wp_create_nonce( 'geodir_import_export_nonce' ); |
|
| 2229 | - $gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv'; |
|
| 2228 | + $nonce = wp_create_nonce('geodir_import_export_nonce');
|
|
| 2229 | + $gd_cats_sample_csv = geodir_plugin_url().'/geodirectory-assets/gd_sample_categories.csv'; |
|
| 2230 | 2230 | /** |
| 2231 | 2231 | * Filter sample category data csv file url. |
| 2232 | 2232 | * |
@@ -2235,9 +2235,9 @@ discard block |
||
| 2235 | 2235 | * |
| 2236 | 2236 | * @param string $gd_cats_sample_csv Sample category data csv file url. |
| 2237 | 2237 | */ |
| 2238 | - $gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv ); |
|
| 2238 | + $gd_cats_sample_csv = apply_filters('geodir_export_cats_sample_csv', $gd_cats_sample_csv);
|
|
| 2239 | 2239 | |
| 2240 | - $gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv'; |
|
| 2240 | + $gd_posts_sample_csv = geodir_plugin_url().'/geodirectory-assets/place_listing.csv'; |
|
| 2241 | 2241 | /** |
| 2242 | 2242 | * Filter sample post data csv file url. |
| 2243 | 2243 | * |
@@ -2246,15 +2246,15 @@ discard block |
||
| 2246 | 2246 | * |
| 2247 | 2247 | * @param string $gd_posts_sample_csv Sample post data csv file url. |
| 2248 | 2248 | */ |
| 2249 | - $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv ); |
|
| 2249 | + $gd_posts_sample_csv = apply_filters('geodir_export_posts_sample_csv', $gd_posts_sample_csv);
|
|
| 2250 | 2250 | |
| 2251 | - $gd_posttypes = geodir_get_posttypes( 'array' ); |
|
| 2251 | + $gd_posttypes = geodir_get_posttypes('array');
|
|
| 2252 | 2252 | |
| 2253 | 2253 | $gd_posttypes_option = ''; |
| 2254 | - foreach ( $gd_posttypes as $gd_posttype => $row ) {
|
|
| 2255 | - $gd_posttypes_option .= '<option value="' . $gd_posttype . '" data-cats="' . (int)geodir_get_terms_count( $gd_posttype ) . '" data-posts="' . (int)geodir_get_posts_count( $gd_posttype ) . '">' . __( $row['labels']['name'], 'geodirectory' ) . '</option>'; |
|
| 2254 | + foreach ($gd_posttypes as $gd_posttype => $row) {
|
|
| 2255 | + $gd_posttypes_option .= '<option value="'.$gd_posttype.'" data-cats="'.(int) geodir_get_terms_count($gd_posttype).'" data-posts="'.(int) geodir_get_posts_count($gd_posttype).'">'.__($row['labels']['name'], 'geodirectory').'</option>'; |
|
| 2256 | 2256 | } |
| 2257 | - wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
| 2257 | + wp_enqueue_script('jquery-ui-progressbar');
|
|
| 2258 | 2258 | |
| 2259 | 2259 | $gd_chunksize_options = array(); |
| 2260 | 2260 | $gd_chunksize_options[100] = 100; |
@@ -2276,50 +2276,50 @@ discard block |
||
| 2276 | 2276 | * |
| 2277 | 2277 | * @param string $gd_chunksize_options Entries options. |
| 2278 | 2278 | */ |
| 2279 | - $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options ); |
|
| 2279 | + $gd_chunksize_options = apply_filters('geodir_export_csv_chunksize_options', $gd_chunksize_options);
|
|
| 2280 | 2280 | |
| 2281 | 2281 | $gd_chunksize_option = ''; |
| 2282 | 2282 | foreach ($gd_chunksize_options as $value => $title) {
|
| 2283 | - $gd_chunksize_option .= '<option value="' . $value . '" ' . selected($value, 5000, false) . '>' . $title . '</option>'; |
|
| 2283 | + $gd_chunksize_option .= '<option value="'.$value.'" '.selected($value, 5000, false).'>'.$title.'</option>'; |
|
| 2284 | 2284 | } |
| 2285 | 2285 | |
| 2286 | 2286 | $uploads = wp_upload_dir(); |
| 2287 | - $upload_dir = wp_sprintf( CSV_TRANSFER_IMG_FOLDER, str_replace( ABSPATH, '', $uploads['path'] ) ); |
|
| 2287 | + $upload_dir = wp_sprintf(CSV_TRANSFER_IMG_FOLDER, str_replace(ABSPATH, '', $uploads['path'])); |
|
| 2288 | 2288 | ?> |
| 2289 | 2289 | </form> |
| 2290 | 2290 | <div class="inner_content_tab_main gd-import-export"> |
| 2291 | - <h3><?php _e( 'GD Import & Export CSV', 'geodirectory' ) ;?></h3> |
|
| 2292 | - <span class="description"><?php _e( 'Import & export csv for GD listings & categories.', 'geodirectory' ) ;?></span> |
|
| 2291 | + <h3><?php _e('GD Import & Export CSV', 'geodirectory'); ?></h3>
|
|
| 2292 | + <span class="description"><?php _e('Import & export csv for GD listings & categories.', 'geodirectory'); ?></span>
|
|
| 2293 | 2293 | <div class="gd-content-heading"> |
| 2294 | 2294 | |
| 2295 | 2295 | <?php |
| 2296 | 2296 | @ini_set('max_execution_time', 999999);
|
| 2297 | - $ini_max_execution_time_check = @ini_get( 'max_execution_time' ); |
|
| 2297 | + $ini_max_execution_time_check = @ini_get('max_execution_time');
|
|
| 2298 | 2298 | @ini_restore('max_execution_time');
|
| 2299 | 2299 | |
| 2300 | - if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting
|
|
| 2300 | + if ($ini_max_execution_time_check != 999999) { // only show these setting to the user if we can't change the ini setting
|
|
| 2301 | 2301 | ?> |
| 2302 | 2302 | <div id="gd_ie_reqs" class="metabox-holder"> |
| 2303 | 2303 | <div class="meta-box-sortables ui-sortable"> |
| 2304 | 2304 | <div class="postbox"> |
| 2305 | - <h3 class="hndle"><span style='vertical-align:top;'><?php echo __( 'PHP Requirements for GD Import & Export CSV', 'geodirectory' );?></span></h3> |
|
| 2305 | + <h3 class="hndle"><span style='vertical-align:top;'><?php echo __('PHP Requirements for GD Import & Export CSV', 'geodirectory'); ?></span></h3>
|
|
| 2306 | 2306 | <div class="inside"> |
| 2307 | - <span class="description"><?php echo __( 'Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory' );?></span> |
|
| 2307 | + <span class="description"><?php echo __('Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory'); ?></span>
|
|
| 2308 | 2308 | <table class="form-table"> |
| 2309 | 2309 | <thead> |
| 2310 | 2310 | <tr> |
| 2311 | - <th><?php _e( 'PHP Settings', 'geodirectory' );?></th><th><?php _e( 'Current Value', 'geodirectory' );?></th><th><?php _e( 'Recommended Value', 'geodirectory' );?></th> |
|
| 2311 | + <th><?php _e('PHP Settings', 'geodirectory'); ?></th><th><?php _e('Current Value', 'geodirectory'); ?></th><th><?php _e('Recommended Value', 'geodirectory'); ?></th>
|
|
| 2312 | 2312 | </tr> |
| 2313 | 2313 | </thead> |
| 2314 | 2314 | <tbody> |
| 2315 | 2315 | <tr> |
| 2316 | - <td>max_input_time</td><td><?php echo @ini_get( 'max_input_time' );?></td><td>3000</td> |
|
| 2316 | + <td>max_input_time</td><td><?php echo @ini_get('max_input_time'); ?></td><td>3000</td>
|
|
| 2317 | 2317 | </tr> |
| 2318 | 2318 | <tr> |
| 2319 | - <td>max_execution_time</td><td><?php echo @ini_get( 'max_execution_time' );?></td><td>3000</td> |
|
| 2319 | + <td>max_execution_time</td><td><?php echo @ini_get('max_execution_time'); ?></td><td>3000</td>
|
|
| 2320 | 2320 | </tr> |
| 2321 | 2321 | <tr> |
| 2322 | - <td>memory_limit</td><td><?php echo @ini_get( 'memory_limit' );?></td><td>256M</td> |
|
| 2322 | + <td>memory_limit</td><td><?php echo @ini_get('memory_limit'); ?></td><td>256M</td>
|
|
| 2323 | 2323 | </tr> |
| 2324 | 2324 | </tbody> |
| 2325 | 2325 | </table> |
@@ -2331,21 +2331,21 @@ discard block |
||
| 2331 | 2331 | <div id="gd_ie_imposts" class="metabox-holder"> |
| 2332 | 2332 | <div class="meta-box-sortables ui-sortable"> |
| 2333 | 2333 | <div id="gd_ie_im_posts" class="postbox gd-hndle-pbox"> |
| 2334 | - <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Listings: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button> |
|
| 2335 | - <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Import CSV', 'geodirectory' );?></span></h3> |
|
| 2334 | + <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Listings: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
| 2335 | + <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Import CSV', 'geodirectory'); ?></span></h3>
|
|
| 2336 | 2336 | <div class="inside"> |
| 2337 | 2337 | <table class="form-table"> |
| 2338 | 2338 | <tbody> |
| 2339 | 2339 | <tr> |
| 2340 | 2340 | <td class="gd-imex-box"> |
| 2341 | 2341 | <div class="gd-im-choices"> |
| 2342 | - <p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e( 'Update listing if post with post_id already exists.', 'geodirectory' );?></label></p> |
|
| 2343 | - <p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e( 'Ignore listing if post with post_id already exists.', 'geodirectory' );?></label></p> |
|
| 2342 | + <p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e('Update listing if post with post_id already exists.', 'geodirectory'); ?></label></p>
|
|
| 2343 | + <p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e('Ignore listing if post with post_id already exists.', 'geodirectory'); ?></label></p>
|
|
| 2344 | 2344 | </div> |
| 2345 | 2345 | <div class="plupload-upload-uic hide-if-no-js" id="gd_im_postplupload-upload-ui"> |
| 2346 | 2346 | <input type="text" readonly="readonly" name="gd_im_post_file" class="gd-imex-file gd_im_post_file" id="gd_im_post" onclick="jQuery('#gd_im_postplupload-browse-button').trigger('click');" />
|
| 2347 | - <input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample"> |
|
| 2348 | - <input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv;?>" /> |
|
| 2347 | + <input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">
|
|
| 2348 | + <input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv; ?>" /> |
|
| 2349 | 2349 | <input type="hidden" id="gd_im_post_allowed_types" data-exts=".csv" value="csv" /> |
| 2350 | 2350 | <?php |
| 2351 | 2351 | /** |
@@ -2355,7 +2355,7 @@ discard block |
||
| 2355 | 2355 | */ |
| 2356 | 2356 | do_action('geodir_sample_csv_download_link');
|
| 2357 | 2357 | ?> |
| 2358 | - <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_postpluploadan' ); ?>"></span> |
|
| 2358 | + <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_postpluploadan'); ?>"></span>
|
|
| 2359 | 2359 | <div class="filelist"></div> |
| 2360 | 2360 | </div> |
| 2361 | 2361 | <span id="gd_im_postupload-error" style="display:none"></span> |
@@ -2373,7 +2373,7 @@ discard block |
||
| 2373 | 2373 | <input type="hidden" id="gd_terminateaction" value="continue"/> |
| 2374 | 2374 | </div> |
| 2375 | 2375 | <div class="gd-import-progress" id="gd-import-progress" style="display:none"> |
| 2376 | - <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font
|
|
| 2376 | + <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font
|
|
| 2377 | 2377 | id="gd-import-done">0</font> / <font id="gd-import-total">0</font> ( <font |
| 2378 | 2378 | id="gd-import-perc">0%</font> ) |
| 2379 | 2379 | <div class="gd-fileprogress"></div> |
@@ -2385,10 +2385,10 @@ discard block |
||
| 2385 | 2385 | <div class="gd-imex-btns" style="display:none;"> |
| 2386 | 2386 | <input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/> |
| 2387 | 2387 | <input onclick="gd_imex_PrepareImport(this, 'post')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" /> |
| 2388 | - <input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/> |
|
| 2389 | - <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>
|
|
| 2388 | + <input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>
|
|
| 2389 | + <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>
|
|
| 2390 | 2390 | <div id="gd_process_data" style="display:none"> |
| 2391 | - <span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>
|
|
| 2391 | + <span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>
|
|
| 2392 | 2392 | </div> |
| 2393 | 2393 | </div> |
| 2394 | 2394 | </td> |
@@ -2402,30 +2402,30 @@ discard block |
||
| 2402 | 2402 | <div id="gd_ie_excategs" class="metabox-holder"> |
| 2403 | 2403 | <div class="meta-box-sortables ui-sortable"> |
| 2404 | 2404 | <div id="gd_ie_ex_posts" class="postbox gd-hndle-pbox"> |
| 2405 | - <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - Listings: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button> |
|
| 2406 | - <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Export CSV', 'geodirectory' );?></span></h3> |
|
| 2405 | + <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - Listings: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
| 2406 | + <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Export CSV', 'geodirectory'); ?></span></h3>
|
|
| 2407 | 2407 | <div class="inside"> |
| 2408 | 2408 | <table class="form-table"> |
| 2409 | 2409 | <tbody> |
| 2410 | 2410 | <tr> |
| 2411 | 2411 | <td class="fld"><label for="gd_post_type"> |
| 2412 | - <?php _e( 'Post Type:', 'geodirectory' );?> |
|
| 2412 | + <?php _e('Post Type:', 'geodirectory'); ?>
|
|
| 2413 | 2413 | </label></td> |
| 2414 | 2414 | <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"> |
| 2415 | - <?php echo $gd_posttypes_option;?> |
|
| 2415 | + <?php echo $gd_posttypes_option; ?> |
|
| 2416 | 2416 | </select></td> |
| 2417 | 2417 | </tr> |
| 2418 | 2418 | <tr> |
| 2419 | - <td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td> |
|
| 2420 | - <td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td> |
|
| 2419 | + <td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>
|
|
| 2420 | + <td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>
|
|
| 2421 | 2421 | </tr> |
| 2422 | 2422 | <tr class="gd-imex-dates"> |
| 2423 | - <td class="fld"><label><?php _e( 'Published Date:', 'geodirectory' );?></label></td> |
|
| 2424 | - <td><label><span class="label-responsive"><?php _e( 'Start date:', 'geodirectory' );?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e( 'End date:', 'geodirectory' );?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td> |
|
| 2423 | + <td class="fld"><label><?php _e('Published Date:', 'geodirectory'); ?></label></td>
|
|
| 2424 | + <td><label><span class="label-responsive"><?php _e('Start date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e('End date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>
|
|
| 2425 | 2425 | </tr> |
| 2426 | 2426 | <tr> |
| 2427 | 2427 | <td class="fld" style="vertical-align:top"><label> |
| 2428 | - <?php _e( 'Progress:', 'geodirectory' );?> |
|
| 2428 | + <?php _e('Progress:', 'geodirectory'); ?>
|
|
| 2429 | 2429 | </label></td> |
| 2430 | 2430 | <td><div id='gd_progressbar_box'> |
| 2431 | 2431 | <div id="gd_progressbar" class="gd_progressbar"> |
@@ -2433,13 +2433,13 @@ discard block |
||
| 2433 | 2433 | </div> |
| 2434 | 2434 | </div> |
| 2435 | 2435 | <p style="display:inline-block"> |
| 2436 | - <?php _e( 'Elapsed Time:', 'geodirectory' );?> |
|
| 2436 | + <?php _e('Elapsed Time:', 'geodirectory'); ?>
|
|
| 2437 | 2437 | </p> |
| 2438 | 2438 | |
| 2439 | 2439 | <p id="gd_timer" class="gd_timer">00:00:00</p></td> |
| 2440 | 2440 | </tr> |
| 2441 | 2441 | <tr class="gd-ie-actions"> |
| 2442 | - <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit"> |
|
| 2442 | + <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">
|
|
| 2443 | 2443 | </td> |
| 2444 | 2444 | <td id="gd_ie_ex_files" class="gd-ie-files"></td> |
| 2445 | 2445 | </tr> |
@@ -2452,21 +2452,21 @@ discard block |
||
| 2452 | 2452 | <div id="gd_ie_imcategs" class="metabox-holder"> |
| 2453 | 2453 | <div class="meta-box-sortables ui-sortable"> |
| 2454 | 2454 | <div id="gd_ie_imcats" class="postbox gd-hndle-pbox"> |
| 2455 | - <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button> |
|
| 2456 | - <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Import CSV', 'geodirectory' );?></span></h3> |
|
| 2455 | + <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
| 2456 | + <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Import CSV', 'geodirectory'); ?></span></h3>
|
|
| 2457 | 2457 | <div class="inside"> |
| 2458 | 2458 | <table class="form-table"> |
| 2459 | 2459 | <tbody> |
| 2460 | 2460 | <tr> |
| 2461 | 2461 | <td class="gd-imex-box"> |
| 2462 | 2462 | <div class="gd-im-choices"> |
| 2463 | - <p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e( 'Update item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p> |
|
| 2464 | - <p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e( 'Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p> |
|
| 2463 | + <p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e('Update item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>
|
|
| 2464 | + <p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e('Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>
|
|
| 2465 | 2465 | </div> |
| 2466 | 2466 | <div class="plupload-upload-uic hide-if-no-js" id="gd_im_catplupload-upload-ui"> |
| 2467 | 2467 | <input type="text" readonly="readonly" name="gd_im_cat_file" class="gd-imex-file gd_im_cat_file" id="gd_im_cat" onclick="jQuery('#gd_im_catplupload-browse-button').trigger('click');" />
|
| 2468 | - <input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample"> |
|
| 2469 | - <input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv;?>" /> |
|
| 2468 | + <input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">
|
|
| 2469 | + <input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv; ?>" /> |
|
| 2470 | 2470 | <input type="hidden" id="gd_im_cat_allowed_types" data-exts=".csv" value="csv" /> |
| 2471 | 2471 | <?php |
| 2472 | 2472 | /** |
@@ -2477,7 +2477,7 @@ discard block |
||
| 2477 | 2477 | */ |
| 2478 | 2478 | do_action('geodir_sample_cats_csv_download_link');
|
| 2479 | 2479 | ?> |
| 2480 | - <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_catpluploadan' ); ?>"></span> |
|
| 2480 | + <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_catpluploadan'); ?>"></span>
|
|
| 2481 | 2481 | <div class="filelist"></div> |
| 2482 | 2482 | </div> |
| 2483 | 2483 | <span id="gd_im_catupload-error" style="display:none"></span> |
@@ -2494,7 +2494,7 @@ discard block |
||
| 2494 | 2494 | <input type="hidden" id="gd_terminateaction" value="continue"/> |
| 2495 | 2495 | </div> |
| 2496 | 2496 | <div class="gd-import-progress" id="gd-import-progress" style="display:none"> |
| 2497 | - <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font
|
|
| 2497 | + <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font
|
|
| 2498 | 2498 | id="gd-import-done">0</font> / <font id="gd-import-total">0</font> ( <font |
| 2499 | 2499 | id="gd-import-perc">0%</font> ) |
| 2500 | 2500 | <div class="gd-fileprogress"></div> |
@@ -2506,10 +2506,10 @@ discard block |
||
| 2506 | 2506 | <div class="gd-imex-btns" style="display:none;"> |
| 2507 | 2507 | <input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/> |
| 2508 | 2508 | <input onclick="gd_imex_PrepareImport(this, 'cat')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" /> |
| 2509 | - <input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/> |
|
| 2510 | - <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>
|
|
| 2509 | + <input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>
|
|
| 2510 | + <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>
|
|
| 2511 | 2511 | <div id="gd_process_data" style="display:none"> |
| 2512 | - <span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>
|
|
| 2512 | + <span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>
|
|
| 2513 | 2513 | </div> |
| 2514 | 2514 | </div> |
| 2515 | 2515 | </td> |
@@ -2523,26 +2523,26 @@ discard block |
||
| 2523 | 2523 | <div id="gd_ie_excategs" class="metabox-holder"> |
| 2524 | 2524 | <div class="meta-box-sortables ui-sortable"> |
| 2525 | 2525 | <div id="gd_ie_ex_cats" class="postbox gd-hndle-pbox"> |
| 2526 | - <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button> |
|
| 2527 | - <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Export CSV', 'geodirectory' );?></span></h3> |
|
| 2526 | + <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
| 2527 | + <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Export CSV', 'geodirectory'); ?></span></h3>
|
|
| 2528 | 2528 | <div class="inside"> |
| 2529 | 2529 | <table class="form-table"> |
| 2530 | 2530 | <tbody> |
| 2531 | 2531 | <tr> |
| 2532 | - <td class="fld"><label for="gd_post_type"><?php _e( 'Post Type:', 'geodirectory' );?></label></td> |
|
| 2533 | - <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option;?></select></td> |
|
| 2532 | + <td class="fld"><label for="gd_post_type"><?php _e('Post Type:', 'geodirectory'); ?></label></td>
|
|
| 2533 | + <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option; ?></select></td> |
|
| 2534 | 2534 | </tr> |
| 2535 | 2535 | <tr> |
| 2536 | - <td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td> |
|
| 2537 | - <td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td> |
|
| 2536 | + <td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>
|
|
| 2537 | + <td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>
|
|
| 2538 | 2538 | </tr> |
| 2539 | 2539 | <tr> |
| 2540 | - <td class="fld" style="vertical-align:top"><label><?php _e( 'Progress:', 'geodirectory' );?></label></td> |
|
| 2541 | - <td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e( 'Elapsed Time:', 'geodirectory' );?></p> <p id="gd_timer" class="gd_timer">00:00:00</p></td> |
|
| 2540 | + <td class="fld" style="vertical-align:top"><label><?php _e('Progress:', 'geodirectory'); ?></label></td>
|
|
| 2541 | + <td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e('Elapsed Time:', 'geodirectory'); ?></p> <p id="gd_timer" class="gd_timer">00:00:00</p></td>
|
|
| 2542 | 2542 | </tr> |
| 2543 | 2543 | <tr class="gd-ie-actions"> |
| 2544 | 2544 | <td style="vertical-align:top"> |
| 2545 | - <input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit"> |
|
| 2545 | + <input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">
|
|
| 2546 | 2546 | </td> |
| 2547 | 2547 | <td id="gd_ie_ex_files" class="gd-ie-files"></td> |
| 2548 | 2548 | </tr> |
@@ -2564,7 +2564,7 @@ discard block |
||
| 2564 | 2564 | * @param array $gd_chunksize_options File chunk size options. |
| 2565 | 2565 | * @param string $nonce Wordpress security token for GD import & export. |
| 2566 | 2566 | */ |
| 2567 | - do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce ); |
|
| 2567 | + do_action('geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce);
|
|
| 2568 | 2568 | ?> |
| 2569 | 2569 | </div> |
| 2570 | 2570 | </div> |
@@ -2583,7 +2583,7 @@ discard block |
||
| 2583 | 2583 | jQuery.ajax({
|
| 2584 | 2584 | url: ajaxurl, |
| 2585 | 2585 | type: "POST", |
| 2586 | - data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce;?>', |
|
| 2586 | + data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce; ?>', |
|
| 2587 | 2587 | dataType: 'json', |
| 2588 | 2588 | cache: false, |
| 2589 | 2589 | success: function(data) {
|
@@ -2635,7 +2635,7 @@ discard block |
||
| 2635 | 2635 | |
| 2636 | 2636 | jQuery(cont).find('.filelist .file').remove();
|
| 2637 | 2637 | |
| 2638 | - jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr( PLZ_SELECT_CSV_FILE );?></p>");
|
|
| 2638 | + jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr(PLZ_SELECT_CSV_FILE); ?></p>");
|
|
| 2639 | 2639 | jQuery('#gd-import-msg', cont).show();
|
| 2640 | 2640 | |
| 2641 | 2641 | return false; |
@@ -2694,7 +2694,7 @@ discard block |
||
| 2694 | 2694 | jQuery.ajax({
|
| 2695 | 2695 | url: ajaxurl, |
| 2696 | 2696 | type: "POST", |
| 2697 | - data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce;?>', |
|
| 2697 | + data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce; ?>', |
|
| 2698 | 2698 | dataType : 'json', |
| 2699 | 2699 | cache: false, |
| 2700 | 2700 | success: function (data) {
|
@@ -2883,27 +2883,27 @@ discard block |
||
| 2883 | 2883 | |
| 2884 | 2884 | var gdMsg = '<p></p>'; |
| 2885 | 2885 | if ( processed > 0 ) {
|
| 2886 | - var msgParse = '<p><?php echo addslashes( sprintf( __( 'Total %s item(s) found.', 'geodirectory' ), '%s' ) );?></p>'; |
|
| 2886 | + var msgParse = '<p><?php echo addslashes(sprintf(__('Total %s item(s) found.', 'geodirectory'), '%s')); ?></p>';
|
|
| 2887 | 2887 | msgParse = msgParse.replace("%s", processed);
|
| 2888 | 2888 | gdMsg += msgParse; |
| 2889 | 2889 | } |
| 2890 | 2890 | |
| 2891 | 2891 | if ( updated > 0 ) {
|
| 2892 | - var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) updated.', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2892 | + var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) updated.', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2893 | 2893 | msgParse = msgParse.replace("%s", updated);
|
| 2894 | 2894 | msgParse = msgParse.replace("%d", processed);
|
| 2895 | 2895 | gdMsg += msgParse; |
| 2896 | 2896 | } |
| 2897 | 2897 | |
| 2898 | 2898 | if ( created > 0 ) {
|
| 2899 | - var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) added.', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2899 | + var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) added.', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2900 | 2900 | msgParse = msgParse.replace("%s", created);
|
| 2901 | 2901 | msgParse = msgParse.replace("%d", processed);
|
| 2902 | 2902 | gdMsg += msgParse; |
| 2903 | 2903 | } |
| 2904 | 2904 | |
| 2905 | 2905 | if ( skipped > 0 ) {
|
| 2906 | - var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) ignored due to already exists.', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2906 | + var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) ignored due to already exists.', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2907 | 2907 | msgParse = msgParse.replace("%s", skipped);
|
| 2908 | 2908 | msgParse = msgParse.replace("%d", processed);
|
| 2909 | 2909 | gdMsg += msgParse; |
@@ -2913,17 +2913,17 @@ discard block |
||
| 2913 | 2913 | if (type=='loc') {
|
| 2914 | 2914 | invalid_addr = invalid; |
| 2915 | 2915 | } |
| 2916 | - var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2916 | + var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2917 | 2917 | msgParse = msgParse.replace("%s", invalid_addr);
|
| 2918 | 2918 | msgParse = msgParse.replace("%d", total);
|
| 2919 | 2919 | gdMsg += msgParse; |
| 2920 | 2920 | } |
| 2921 | 2921 | |
| 2922 | 2922 | if (invalid > 0 && type!='loc') {
|
| 2923 | - var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2923 | + var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2924 | 2924 | |
| 2925 | 2925 | if (type=='hood') {
|
| 2926 | - msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2926 | + msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2927 | 2927 | } |
| 2928 | 2928 | msgParse = msgParse.replace("%s", invalid);
|
| 2929 | 2929 | msgParse = msgParse.replace("%d", total);
|
@@ -2931,7 +2931,7 @@ discard block |
||
| 2931 | 2931 | } |
| 2932 | 2932 | |
| 2933 | 2933 | if (images > 0) {
|
| 2934 | - gdMsg += '<p><?php echo addslashes( $upload_dir );?></p>'; |
|
| 2934 | + gdMsg += '<p><?php echo addslashes($upload_dir); ?></p>'; |
|
| 2935 | 2935 | } |
| 2936 | 2936 | gdMsg += '<p></p>'; |
| 2937 | 2937 | jQuery('#gd-import-msg', cont).find('#message').removeClass('error').addClass('updated').html(gdMsg);
|
@@ -3095,9 +3095,9 @@ discard block |
||
| 3095 | 3095 | if (typeof filters !== 'undefined' && filters && doFilter) {
|
| 3096 | 3096 | getTotal = true; |
| 3097 | 3097 | attach += '&_c=1'; |
| 3098 | - gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Preparing...', 'geodirectory' ) );?>'); |
|
| 3098 | + gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Preparing...', 'geodirectory')); ?>');
|
|
| 3099 | 3099 | } else {
|
| 3100 | - gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>'); |
|
| 3100 | + gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');
|
|
| 3101 | 3101 | } |
| 3102 | 3102 | jQuery(el).find('#gd_timer').text('00:00:01');
|
| 3103 | 3103 | jQuery('#gd_ie_ex_files', el).html('');
|
@@ -3106,7 +3106,7 @@ discard block |
||
| 3106 | 3106 | jQuery.ajax({
|
| 3107 | 3107 | url: ajaxurl, |
| 3108 | 3108 | type: "POST", |
| 3109 | - data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page + attach, |
|
| 3109 | + data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page + attach, |
|
| 3110 | 3110 | dataType : 'json', |
| 3111 | 3111 | cache: false, |
| 3112 | 3112 | beforeSend: function (jqXHR, settings) {},
|
@@ -3131,11 +3131,11 @@ discard block |
||
| 3131 | 3131 | } else {
|
| 3132 | 3132 | if (pages < page || pages == page) {
|
| 3133 | 3133 | window.clearInterval(timer_posts); |
| 3134 | - gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');
|
|
| 3134 | + gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');
|
|
| 3135 | 3135 | } else {
|
| 3136 | 3136 | var percentage = Math.round(((page * chunk_size) / total_posts) * 100); |
| 3137 | 3137 | percentage = percentage > 100 ? 100 : percentage; |
| 3138 | - gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');
|
|
| 3138 | + gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');
|
|
| 3139 | 3139 | } |
| 3140 | 3140 | if (typeof data.files != 'undefined' && jQuery(data.files).length ) {
|
| 3141 | 3141 | var obj_files = data.files; |
@@ -3166,7 +3166,7 @@ discard block |
||
| 3166 | 3166 | |
| 3167 | 3167 | function gd_process_export_cats(el, post_type, total_cats, chunk_size, pages, page) {
|
| 3168 | 3168 | if (page < 2) {
|
| 3169 | - gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>'); |
|
| 3169 | + gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');
|
|
| 3170 | 3170 | jQuery(el).find('#gd_timer').text('00:00:01');
|
| 3171 | 3171 | jQuery('#gd_ie_ex_files', el).html('');
|
| 3172 | 3172 | } |
@@ -3174,7 +3174,7 @@ discard block |
||
| 3174 | 3174 | jQuery.ajax({
|
| 3175 | 3175 | url: ajaxurl, |
| 3176 | 3176 | type: "POST", |
| 3177 | - data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page, |
|
| 3177 | + data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page, |
|
| 3178 | 3178 | dataType : 'json', |
| 3179 | 3179 | cache: false, |
| 3180 | 3180 | beforeSend: function (jqXHR, settings) {},
|
@@ -3188,11 +3188,11 @@ discard block |
||
| 3188 | 3188 | } else {
|
| 3189 | 3189 | if (pages < page || pages == page) {
|
| 3190 | 3190 | window.clearInterval(timer_cats); |
| 3191 | - gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');
|
|
| 3191 | + gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');
|
|
| 3192 | 3192 | } else {
|
| 3193 | 3193 | var percentage = Math.round(((page * chunk_size) / total_cats) * 100); |
| 3194 | 3194 | percentage = percentage > 100 ? 100 : percentage; |
| 3195 | - gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e( 'Exporting...', 'geodirectory' );?>');
|
|
| 3195 | + gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e('Exporting...', 'geodirectory'); ?>');
|
|
| 3196 | 3196 | } |
| 3197 | 3197 | if (typeof data.files != 'undefined' && jQuery(data.files).length ) {
|
| 3198 | 3198 | var obj_files = data.files; |
@@ -3249,13 +3249,13 @@ discard block |
||
| 3249 | 3249 | function geodir_init_filesystem() |
| 3250 | 3250 | {
|
| 3251 | 3251 | |
| 3252 | - if(!function_exists('get_filesystem_method')){
|
|
| 3252 | + if (!function_exists('get_filesystem_method')) {
|
|
| 3253 | 3253 | require_once(ABSPATH."/wp-admin/includes/file.php"); |
| 3254 | 3254 | } |
| 3255 | 3255 | $access_type = get_filesystem_method(); |
| 3256 | 3256 | if ($access_type === 'direct') {
|
| 3257 | 3257 | /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */ |
| 3258 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3258 | + $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array()); |
|
| 3259 | 3259 | |
| 3260 | 3260 | /* initialize the API */ |
| 3261 | 3261 | if (!WP_Filesystem($creds)) {
|
@@ -3268,7 +3268,7 @@ discard block |
||
| 3268 | 3268 | return $wp_filesystem; |
| 3269 | 3269 | /* do our file manipulations below */ |
| 3270 | 3270 | } elseif (defined('FTP_USER')) {
|
| 3271 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3271 | + $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array()); |
|
| 3272 | 3272 | |
| 3273 | 3273 | /* initialize the API */ |
| 3274 | 3274 | if (!WP_Filesystem($creds)) {
|
@@ -3303,7 +3303,7 @@ discard block |
||
| 3303 | 3303 | * @package GeoDirectory |
| 3304 | 3304 | */ |
| 3305 | 3305 | function geodir_filesystem_notice() |
| 3306 | -{ if ( defined( 'DOING_AJAX' ) ){return;}
|
|
| 3306 | +{ if (defined('DOING_AJAX')) {return; }
|
|
| 3307 | 3307 | $access_type = get_filesystem_method(); |
| 3308 | 3308 | if ($access_type === 'direct') {
|
| 3309 | 3309 | } elseif (!defined('FTP_USER')) {
|
@@ -3344,64 +3344,64 @@ discard block |
||
| 3344 | 3344 | // try to set higher limits for import |
| 3345 | 3345 | $max_input_time = ini_get('max_input_time');
|
| 3346 | 3346 | $max_execution_time = ini_get('max_execution_time');
|
| 3347 | - $memory_limit= ini_get('memory_limit');
|
|
| 3347 | + $memory_limit = ini_get('memory_limit');
|
|
| 3348 | 3348 | |
| 3349 | - if(!$max_input_time || $max_input_time<3000){
|
|
| 3349 | + if (!$max_input_time || $max_input_time < 3000) {
|
|
| 3350 | 3350 | @ini_set('max_input_time', 3000);
|
| 3351 | 3351 | } |
| 3352 | 3352 | |
| 3353 | - if(!$max_execution_time || $max_execution_time<3000){
|
|
| 3353 | + if (!$max_execution_time || $max_execution_time < 3000) {
|
|
| 3354 | 3354 | @ini_set('max_execution_time', 3000);
|
| 3355 | 3355 | } |
| 3356 | 3356 | |
| 3357 | - if($memory_limit && str_replace('M','',$memory_limit)){
|
|
| 3358 | - if(str_replace('M','',$memory_limit)<256){
|
|
| 3357 | + if ($memory_limit && str_replace('M', '', $memory_limit)) {
|
|
| 3358 | + if (str_replace('M', '', $memory_limit) < 256) {
|
|
| 3359 | 3359 | @ini_set('memory_limit', '256M');
|
| 3360 | 3360 | } |
| 3361 | 3361 | } |
| 3362 | 3362 | |
| 3363 | 3363 | $json = array(); |
| 3364 | 3364 | |
| 3365 | - if ( !current_user_can( 'manage_options' ) ) {
|
|
| 3366 | - wp_send_json( $json ); |
|
| 3365 | + if (!current_user_can('manage_options')) {
|
|
| 3366 | + wp_send_json($json); |
|
| 3367 | 3367 | } |
| 3368 | 3368 | |
| 3369 | - $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL; |
|
| 3370 | - $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL; |
|
| 3371 | - $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false; |
|
| 3369 | + $task = isset($_REQUEST['task']) ? $_REQUEST['task'] : NULL; |
|
| 3370 | + $nonce = isset($_REQUEST['_nonce']) ? $_REQUEST['_nonce'] : NULL; |
|
| 3371 | + $stat = isset($_REQUEST['_st']) ? $_REQUEST['_st'] : false; |
|
| 3372 | 3372 | |
| 3373 | - if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {
|
|
| 3374 | - wp_send_json( $json ); |
|
| 3373 | + if (!wp_verify_nonce($nonce, 'geodir_import_export_nonce')) {
|
|
| 3374 | + wp_send_json($json); |
|
| 3375 | 3375 | } |
| 3376 | 3376 | |
| 3377 | - $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL; |
|
| 3378 | - $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL; |
|
| 3377 | + $post_type = isset($_REQUEST['_pt']) ? $_REQUEST['_pt'] : NULL; |
|
| 3378 | + $chunk_per_page = isset($_REQUEST['_n']) ? absint($_REQUEST['_n']) : NULL; |
|
| 3379 | 3379 | $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page; |
| 3380 | - $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1; |
|
| 3380 | + $chunk_page_no = isset($_REQUEST['_p']) ? absint($_REQUEST['_p']) : 1; |
|
| 3381 | 3381 | |
| 3382 | 3382 | $wp_filesystem = geodir_init_filesystem(); |
| 3383 | 3383 | if (!$wp_filesystem) {
|
| 3384 | - $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' ); |
|
| 3385 | - wp_send_json( $json ); |
|
| 3384 | + $json['error'] = __('Filesystem ERROR: Could not access filesystem.', 'geodirectory');
|
|
| 3385 | + wp_send_json($json); |
|
| 3386 | 3386 | } |
| 3387 | 3387 | |
| 3388 | 3388 | if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
|
| 3389 | - $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' ); |
|
| 3390 | - wp_send_json( $json ); |
|
| 3389 | + $json['error'] = __('Filesystem ERROR: '.$wp_filesystem->errors->get_error_message(), 'geodirectory');
|
|
| 3390 | + wp_send_json($json); |
|
| 3391 | 3391 | } |
| 3392 | 3392 | |
| 3393 | - $csv_file_dir = geodir_path_import_export( false ); |
|
| 3394 | - if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {
|
|
| 3395 | - if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {
|
|
| 3396 | - $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3397 | - wp_send_json( $json ); |
|
| 3393 | + $csv_file_dir = geodir_path_import_export(false); |
|
| 3394 | + if (!$wp_filesystem->is_dir($csv_file_dir)) {
|
|
| 3395 | + if (!$wp_filesystem->mkdir($csv_file_dir, FS_CHMOD_DIR)) {
|
|
| 3396 | + $json['error'] = __('ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory');
|
|
| 3397 | + wp_send_json($json); |
|
| 3398 | 3398 | } |
| 3399 | 3399 | } |
| 3400 | 3400 | |
| 3401 | 3401 | $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
| 3402 | 3402 | $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
| 3403 | 3403 | |
| 3404 | - switch ( $task ) {
|
|
| 3404 | + switch ($task) {
|
|
| 3405 | 3405 | case 'export_posts': {
|
| 3406 | 3406 | // WPML |
| 3407 | 3407 | $is_wpml = geodir_is_wpml(); |
@@ -3412,36 +3412,36 @@ discard block |
||
| 3412 | 3412 | $sitepress->switch_lang('all', true);
|
| 3413 | 3413 | } |
| 3414 | 3414 | // WPML |
| 3415 | - if ( $post_type == 'gd_event' ) {
|
|
| 3416 | - add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 ); |
|
| 3415 | + if ($post_type == 'gd_event') {
|
|
| 3416 | + add_filter('geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2);
|
|
| 3417 | 3417 | } |
| 3418 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 3418 | + $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL; |
|
| 3419 | 3419 | |
| 3420 | - $file_name = $post_type . '_' . date( 'dmyHi' ); |
|
| 3421 | - if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {
|
|
| 3422 | - $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) ); |
|
| 3420 | + $file_name = $post_type.'_'.date('dmyHi');
|
|
| 3421 | + if ($filters && isset($filters['start_date']) && isset($filters['end_date'])) {
|
|
| 3422 | + $file_name = $post_type.'_'.date_i18n('dmy', strtotime($filters['start_date'])).'_'.date_i18n('dmy', strtotime($filters['end_date']));
|
|
| 3423 | 3423 | } |
| 3424 | - $posts_count = geodir_get_posts_count( $post_type ); |
|
| 3425 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3426 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3427 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3428 | - $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv'; |
|
| 3424 | + $posts_count = geodir_get_posts_count($post_type); |
|
| 3425 | + $file_url_base = geodir_path_import_export().'/'; |
|
| 3426 | + $file_url = $file_url_base.$file_name.'.csv'; |
|
| 3427 | + $file_path = $csv_file_dir.'/'.$file_name.'.csv'; |
|
| 3428 | + $file_path_temp = $csv_file_dir.'/'.$post_type.'_'.$nonce.'.csv'; |
|
| 3429 | 3429 | |
| 3430 | 3430 | $chunk_file_paths = array(); |
| 3431 | 3431 | |
| 3432 | - if ( isset( $_REQUEST['_c'] ) ) {
|
|
| 3432 | + if (isset($_REQUEST['_c'])) {
|
|
| 3433 | 3433 | $json['total'] = $posts_count; |
| 3434 | 3434 | // WPML |
| 3435 | 3435 | if ($is_wpml) {
|
| 3436 | 3436 | $sitepress->switch_lang($active_lang, true); |
| 3437 | 3437 | } |
| 3438 | 3438 | // WPML |
| 3439 | - wp_send_json( $json ); |
|
| 3439 | + wp_send_json($json); |
|
| 3440 | 3440 | gd_die(); |
| 3441 | - } else if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3442 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3443 | - $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0; |
|
| 3444 | - $percentage = min( $percentage, 100 ); |
|
| 3441 | + } else if (isset($_REQUEST['_st'])) {
|
|
| 3442 | + $line_count = (int) geodir_import_export_line_count($file_path_temp); |
|
| 3443 | + $percentage = count($posts_count) > 0 && $line_count > 0 ? ceil($line_count / $posts_count) * 100 : 0; |
|
| 3444 | + $percentage = min($percentage, 100); |
|
| 3445 | 3445 | |
| 3446 | 3446 | $json['percentage'] = $percentage; |
| 3447 | 3447 | // WPML |
@@ -3449,45 +3449,45 @@ discard block |
||
| 3449 | 3449 | $sitepress->switch_lang($active_lang, true); |
| 3450 | 3450 | } |
| 3451 | 3451 | // WPML |
| 3452 | - wp_send_json( $json ); |
|
| 3452 | + wp_send_json($json); |
|
| 3453 | 3453 | gd_die(); |
| 3454 | 3454 | } else {
|
| 3455 | - if ( !$posts_count > 0 ) {
|
|
| 3456 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3455 | + if (!$posts_count > 0) {
|
|
| 3456 | + $json['error'] = __('No records to export.', 'geodirectory');
|
|
| 3457 | 3457 | } else {
|
| 3458 | 3458 | $total_posts = $posts_count; |
| 3459 | 3459 | if ($chunk_per_page > $total_posts) {
|
| 3460 | 3460 | $chunk_per_page = $total_posts; |
| 3461 | 3461 | } |
| 3462 | - $chunk_total_pages = ceil( $total_posts / $chunk_per_page ); |
|
| 3462 | + $chunk_total_pages = ceil($total_posts / $chunk_per_page); |
|
| 3463 | 3463 | |
| 3464 | 3464 | $j = $chunk_page_no; |
| 3465 | - $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j ); |
|
| 3465 | + $chunk_save_posts = geodir_imex_get_posts($post_type, $chunk_per_page, $j); |
|
| 3466 | 3466 | |
| 3467 | 3467 | $per_page = 500; |
| 3468 | 3468 | if ($per_page > $chunk_per_page) {
|
| 3469 | 3469 | $per_page = $chunk_per_page; |
| 3470 | 3470 | } |
| 3471 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3471 | + $total_pages = ceil($chunk_per_page / $per_page); |
|
| 3472 | 3472 | |
| 3473 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3474 | - $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page ); |
|
| 3473 | + for ($i = 0; $i <= $total_pages; $i++) {
|
|
| 3474 | + $save_posts = array_slice($chunk_save_posts, ($i * $per_page), $per_page); |
|
| 3475 | 3475 | |
| 3476 | 3476 | $clear = $i == 0 ? true : false; |
| 3477 | - geodir_save_csv_data( $file_path_temp, $save_posts, $clear ); |
|
| 3477 | + geodir_save_csv_data($file_path_temp, $save_posts, $clear); |
|
| 3478 | 3478 | } |
| 3479 | 3479 | |
| 3480 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3481 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3482 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3483 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3484 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3480 | + if ($wp_filesystem->exists($file_path_temp)) {
|
|
| 3481 | + $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : ''; |
|
| 3482 | + $chunk_file_name = $file_name.$chunk_page_no.'.csv'; |
|
| 3483 | + $file_path = $csv_file_dir.'/'.$chunk_file_name; |
|
| 3484 | + $wp_filesystem->move($file_path_temp, $file_path, true); |
|
| 3485 | 3485 | |
| 3486 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3487 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3486 | + $file_url = $file_url_base.$chunk_file_name; |
|
| 3487 | + $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3488 | 3488 | } |
| 3489 | 3489 | |
| 3490 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3490 | + if (!empty($chunk_file_paths)) {
|
|
| 3491 | 3491 | $json['total'] = $posts_count; |
| 3492 | 3492 | $json['files'] = $chunk_file_paths; |
| 3493 | 3493 | } else {
|
@@ -3495,7 +3495,7 @@ discard block |
||
| 3495 | 3495 | $json['total'] = $posts_count; |
| 3496 | 3496 | $json['files'] = array(); |
| 3497 | 3497 | } else {
|
| 3498 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3498 | + $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');
|
|
| 3499 | 3499 | } |
| 3500 | 3500 | } |
| 3501 | 3501 | } |
@@ -3504,7 +3504,7 @@ discard block |
||
| 3504 | 3504 | $sitepress->switch_lang($active_lang, true); |
| 3505 | 3505 | } |
| 3506 | 3506 | // WPML |
| 3507 | - wp_send_json( $json ); |
|
| 3507 | + wp_send_json($json); |
|
| 3508 | 3508 | } |
| 3509 | 3509 | } |
| 3510 | 3510 | break; |
@@ -3518,20 +3518,20 @@ discard block |
||
| 3518 | 3518 | $sitepress->switch_lang('all', true);
|
| 3519 | 3519 | } |
| 3520 | 3520 | // WPML |
| 3521 | - $file_name = $post_type . 'category_' . date( 'dmyHi' ); |
|
| 3521 | + $file_name = $post_type.'category_'.date('dmyHi');
|
|
| 3522 | 3522 | |
| 3523 | - $terms_count = geodir_get_terms_count( $post_type ); |
|
| 3524 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3525 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3526 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3527 | - $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv'; |
|
| 3523 | + $terms_count = geodir_get_terms_count($post_type); |
|
| 3524 | + $file_url_base = geodir_path_import_export().'/'; |
|
| 3525 | + $file_url = $file_url_base.$file_name.'.csv'; |
|
| 3526 | + $file_path = $csv_file_dir.'/'.$file_name.'.csv'; |
|
| 3527 | + $file_path_temp = $csv_file_dir.'/'.$post_type.'category_'.$nonce.'.csv'; |
|
| 3528 | 3528 | |
| 3529 | 3529 | $chunk_file_paths = array(); |
| 3530 | 3530 | |
| 3531 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3532 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3533 | - $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0; |
|
| 3534 | - $percentage = min( $percentage, 100 ); |
|
| 3531 | + if (isset($_REQUEST['_st'])) {
|
|
| 3532 | + $line_count = (int) geodir_import_export_line_count($file_path_temp); |
|
| 3533 | + $percentage = count($terms_count) > 0 && $line_count > 0 ? ceil($line_count / $terms_count) * 100 : 0; |
|
| 3534 | + $percentage = min($percentage, 100); |
|
| 3535 | 3535 | |
| 3536 | 3536 | $json['percentage'] = $percentage; |
| 3537 | 3537 | // WPML |
@@ -3539,48 +3539,48 @@ discard block |
||
| 3539 | 3539 | $sitepress->switch_lang($active_lang, true); |
| 3540 | 3540 | } |
| 3541 | 3541 | // WPML |
| 3542 | - wp_send_json( $json ); |
|
| 3542 | + wp_send_json($json); |
|
| 3543 | 3543 | } else {
|
| 3544 | - if ( !$terms_count > 0 ) {
|
|
| 3545 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3544 | + if (!$terms_count > 0) {
|
|
| 3545 | + $json['error'] = __('No records to export.', 'geodirectory');
|
|
| 3546 | 3546 | } else {
|
| 3547 | 3547 | $total_terms = $terms_count; |
| 3548 | 3548 | if ($chunk_per_page > $terms_count) {
|
| 3549 | 3549 | $chunk_per_page = $terms_count; |
| 3550 | 3550 | } |
| 3551 | - $chunk_total_pages = ceil( $total_terms / $chunk_per_page ); |
|
| 3551 | + $chunk_total_pages = ceil($total_terms / $chunk_per_page); |
|
| 3552 | 3552 | |
| 3553 | 3553 | $j = $chunk_page_no; |
| 3554 | - $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j ); |
|
| 3554 | + $chunk_save_terms = geodir_imex_get_terms($post_type, $chunk_per_page, $j); |
|
| 3555 | 3555 | |
| 3556 | 3556 | $per_page = 500; |
| 3557 | 3557 | if ($per_page > $chunk_per_page) {
|
| 3558 | 3558 | $per_page = $chunk_per_page; |
| 3559 | 3559 | } |
| 3560 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3560 | + $total_pages = ceil($chunk_per_page / $per_page); |
|
| 3561 | 3561 | |
| 3562 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3563 | - $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page ); |
|
| 3562 | + for ($i = 0; $i <= $total_pages; $i++) {
|
|
| 3563 | + $save_terms = array_slice($chunk_save_terms, ($i * $per_page), $per_page); |
|
| 3564 | 3564 | |
| 3565 | 3565 | $clear = $i == 0 ? true : false; |
| 3566 | - geodir_save_csv_data( $file_path_temp, $save_terms, $clear ); |
|
| 3566 | + geodir_save_csv_data($file_path_temp, $save_terms, $clear); |
|
| 3567 | 3567 | } |
| 3568 | 3568 | |
| 3569 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3570 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3571 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3572 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3573 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3569 | + if ($wp_filesystem->exists($file_path_temp)) {
|
|
| 3570 | + $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : ''; |
|
| 3571 | + $chunk_file_name = $file_name.$chunk_page_no.'.csv'; |
|
| 3572 | + $file_path = $csv_file_dir.'/'.$chunk_file_name; |
|
| 3573 | + $wp_filesystem->move($file_path_temp, $file_path, true); |
|
| 3574 | 3574 | |
| 3575 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3576 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3575 | + $file_url = $file_url_base.$chunk_file_name; |
|
| 3576 | + $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3577 | 3577 | } |
| 3578 | 3578 | |
| 3579 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3579 | + if (!empty($chunk_file_paths)) {
|
|
| 3580 | 3580 | $json['total'] = $terms_count; |
| 3581 | 3581 | $json['files'] = $chunk_file_paths; |
| 3582 | 3582 | } else {
|
| 3583 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3583 | + $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');
|
|
| 3584 | 3584 | } |
| 3585 | 3585 | } |
| 3586 | 3586 | // WPML |
@@ -3588,127 +3588,127 @@ discard block |
||
| 3588 | 3588 | $sitepress->switch_lang($active_lang, true); |
| 3589 | 3589 | } |
| 3590 | 3590 | // WPML |
| 3591 | - wp_send_json( $json ); |
|
| 3591 | + wp_send_json($json); |
|
| 3592 | 3592 | } |
| 3593 | 3593 | } |
| 3594 | 3594 | break; |
| 3595 | 3595 | case 'export_locations': {
|
| 3596 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3597 | - $file_name = 'gd_locations_' . date( 'dmyHi' ); |
|
| 3598 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3599 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3600 | - $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv'; |
|
| 3596 | + $file_url_base = geodir_path_import_export().'/'; |
|
| 3597 | + $file_name = 'gd_locations_'.date('dmyHi');
|
|
| 3598 | + $file_url = $file_url_base.$file_name.'.csv'; |
|
| 3599 | + $file_path = $csv_file_dir.'/'.$file_name.'.csv'; |
|
| 3600 | + $file_path_temp = $csv_file_dir.'/gd_locations_'.$nonce.'.csv'; |
|
| 3601 | 3601 | |
| 3602 | - $items_count = (int)geodir_location_imex_count_locations(); |
|
| 3602 | + $items_count = (int) geodir_location_imex_count_locations(); |
|
| 3603 | 3603 | |
| 3604 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3605 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3606 | - $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3607 | - $percentage = min( $percentage, 100 ); |
|
| 3604 | + if (isset($_REQUEST['_st'])) {
|
|
| 3605 | + $line_count = (int) geodir_import_export_line_count($file_path_temp); |
|
| 3606 | + $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0; |
|
| 3607 | + $percentage = min($percentage, 100); |
|
| 3608 | 3608 | |
| 3609 | 3609 | $json['percentage'] = $percentage; |
| 3610 | - wp_send_json( $json ); |
|
| 3610 | + wp_send_json($json); |
|
| 3611 | 3611 | } else {
|
| 3612 | 3612 | $chunk_file_paths = array(); |
| 3613 | 3613 | |
| 3614 | - if ( !$items_count > 0 ) {
|
|
| 3615 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3614 | + if (!$items_count > 0) {
|
|
| 3615 | + $json['error'] = __('No records to export.', 'geodirectory');
|
|
| 3616 | 3616 | } else {
|
| 3617 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3618 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3617 | + $chunk_per_page = min($chunk_per_page, $items_count); |
|
| 3618 | + $chunk_total_pages = ceil($items_count / $chunk_per_page); |
|
| 3619 | 3619 | |
| 3620 | 3620 | $j = $chunk_page_no; |
| 3621 | - $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j ); |
|
| 3621 | + $chunk_save_items = geodir_location_imex_locations_data($chunk_per_page, $j); |
|
| 3622 | 3622 | |
| 3623 | 3623 | $per_page = 500; |
| 3624 | - $per_page = min( $per_page, $chunk_per_page ); |
|
| 3625 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3624 | + $per_page = min($per_page, $chunk_per_page); |
|
| 3625 | + $total_pages = ceil($chunk_per_page / $per_page); |
|
| 3626 | 3626 | |
| 3627 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3628 | - $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3627 | + for ($i = 0; $i <= $total_pages; $i++) {
|
|
| 3628 | + $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page); |
|
| 3629 | 3629 | |
| 3630 | 3630 | $clear = $i == 0 ? true : false; |
| 3631 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3631 | + geodir_save_csv_data($file_path_temp, $save_items, $clear); |
|
| 3632 | 3632 | } |
| 3633 | 3633 | |
| 3634 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3635 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3636 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3637 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3638 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3634 | + if ($wp_filesystem->exists($file_path_temp)) {
|
|
| 3635 | + $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : ''; |
|
| 3636 | + $chunk_file_name = $file_name.$chunk_page_no.'.csv'; |
|
| 3637 | + $file_path = $csv_file_dir.'/'.$chunk_file_name; |
|
| 3638 | + $wp_filesystem->move($file_path_temp, $file_path, true); |
|
| 3639 | 3639 | |
| 3640 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3641 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3640 | + $file_url = $file_url_base.$chunk_file_name; |
|
| 3641 | + $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3642 | 3642 | } |
| 3643 | 3643 | |
| 3644 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3644 | + if (!empty($chunk_file_paths)) {
|
|
| 3645 | 3645 | $json['total'] = $items_count; |
| 3646 | 3646 | $json['files'] = $chunk_file_paths; |
| 3647 | 3647 | } else {
|
| 3648 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3648 | + $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');
|
|
| 3649 | 3649 | } |
| 3650 | 3650 | } |
| 3651 | - wp_send_json( $json ); |
|
| 3651 | + wp_send_json($json); |
|
| 3652 | 3652 | } |
| 3653 | 3653 | } |
| 3654 | 3654 | break; |
| 3655 | 3655 | case 'export_hoods': {
|
| 3656 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3657 | - $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' ); |
|
| 3658 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3659 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3660 | - $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv'; |
|
| 3656 | + $file_url_base = geodir_path_import_export().'/'; |
|
| 3657 | + $file_name = 'gd_neighbourhoods_'.date('dmyHi');
|
|
| 3658 | + $file_url = $file_url_base.$file_name.'.csv'; |
|
| 3659 | + $file_path = $csv_file_dir.'/'.$file_name.'.csv'; |
|
| 3660 | + $file_path_temp = $csv_file_dir.'/gd_neighbourhoods_'.$nonce.'.csv'; |
|
| 3661 | 3661 | |
| 3662 | - $items_count = (int)geodir_location_imex_count_neighbourhoods(); |
|
| 3662 | + $items_count = (int) geodir_location_imex_count_neighbourhoods(); |
|
| 3663 | 3663 | |
| 3664 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3665 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3666 | - $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3667 | - $percentage = min( $percentage, 100 ); |
|
| 3664 | + if (isset($_REQUEST['_st'])) {
|
|
| 3665 | + $line_count = (int) geodir_import_export_line_count($file_path_temp); |
|
| 3666 | + $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0; |
|
| 3667 | + $percentage = min($percentage, 100); |
|
| 3668 | 3668 | |
| 3669 | 3669 | $json['percentage'] = $percentage; |
| 3670 | - wp_send_json( $json ); |
|
| 3670 | + wp_send_json($json); |
|
| 3671 | 3671 | } else {
|
| 3672 | 3672 | $chunk_file_paths = array(); |
| 3673 | 3673 | |
| 3674 | - if ( !$items_count > 0 ) {
|
|
| 3675 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3674 | + if (!$items_count > 0) {
|
|
| 3675 | + $json['error'] = __('No records to export.', 'geodirectory');
|
|
| 3676 | 3676 | } else {
|
| 3677 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3678 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3677 | + $chunk_per_page = min($chunk_per_page, $items_count); |
|
| 3678 | + $chunk_total_pages = ceil($items_count / $chunk_per_page); |
|
| 3679 | 3679 | |
| 3680 | 3680 | $j = $chunk_page_no; |
| 3681 | - $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j ); |
|
| 3681 | + $chunk_save_items = geodir_location_imex_neighbourhoods_data($chunk_per_page, $j); |
|
| 3682 | 3682 | |
| 3683 | 3683 | $per_page = 500; |
| 3684 | - $per_page = min( $per_page, $chunk_per_page ); |
|
| 3685 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3684 | + $per_page = min($per_page, $chunk_per_page); |
|
| 3685 | + $total_pages = ceil($chunk_per_page / $per_page); |
|
| 3686 | 3686 | |
| 3687 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3688 | - $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3687 | + for ($i = 0; $i <= $total_pages; $i++) {
|
|
| 3688 | + $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page); |
|
| 3689 | 3689 | |
| 3690 | 3690 | $clear = $i == 0 ? true : false; |
| 3691 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3691 | + geodir_save_csv_data($file_path_temp, $save_items, $clear); |
|
| 3692 | 3692 | } |
| 3693 | 3693 | |
| 3694 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3695 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3696 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3697 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3698 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3694 | + if ($wp_filesystem->exists($file_path_temp)) {
|
|
| 3695 | + $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : ''; |
|
| 3696 | + $chunk_file_name = $file_name.$chunk_page_no.'.csv'; |
|
| 3697 | + $file_path = $csv_file_dir.'/'.$chunk_file_name; |
|
| 3698 | + $wp_filesystem->move($file_path_temp, $file_path, true); |
|
| 3699 | 3699 | |
| 3700 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3701 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3700 | + $file_url = $file_url_base.$chunk_file_name; |
|
| 3701 | + $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3702 | 3702 | } |
| 3703 | 3703 | |
| 3704 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3704 | + if (!empty($chunk_file_paths)) {
|
|
| 3705 | 3705 | $json['total'] = $items_count; |
| 3706 | 3706 | $json['files'] = $chunk_file_paths; |
| 3707 | 3707 | } else {
|
| 3708 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3708 | + $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');
|
|
| 3709 | 3709 | } |
| 3710 | 3710 | } |
| 3711 | - wp_send_json( $json ); |
|
| 3711 | + wp_send_json($json); |
|
| 3712 | 3712 | } |
| 3713 | 3713 | } |
| 3714 | 3714 | break; |
@@ -3725,34 +3725,34 @@ discard block |
||
| 3725 | 3725 | } |
| 3726 | 3726 | // WPML |
| 3727 | 3727 | |
| 3728 | - @ini_set( 'auto_detect_line_endings', true ); |
|
| 3728 | + @ini_set('auto_detect_line_endings', true);
|
|
| 3729 | 3729 | |
| 3730 | 3730 | $uploads = wp_upload_dir(); |
| 3731 | 3731 | $uploads_dir = $uploads['path']; |
| 3732 | 3732 | $uploads_subdir = $uploads['subdir']; |
| 3733 | 3733 | |
| 3734 | - $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL; |
|
| 3735 | - $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip'; |
|
| 3734 | + $csv_file = isset($_POST['_file']) ? $_POST['_file'] : NULL; |
|
| 3735 | + $import_choice = isset($_REQUEST['_ch']) ? $_REQUEST['_ch'] : 'skip'; |
|
| 3736 | 3736 | |
| 3737 | - $csv_file_arr = explode( '/', $csv_file ); |
|
| 3738 | - $csv_filename = end( $csv_file_arr ); |
|
| 3739 | - $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename; |
|
| 3737 | + $csv_file_arr = explode('/', $csv_file);
|
|
| 3738 | + $csv_filename = end($csv_file_arr); |
|
| 3739 | + $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$csv_filename; |
|
| 3740 | 3740 | |
| 3741 | 3741 | $json['file'] = $csv_file; |
| 3742 | - $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' ); |
|
| 3742 | + $json['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
|
|
| 3743 | 3743 | $file = array(); |
| 3744 | 3744 | |
| 3745 | - if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {
|
|
| 3746 | - $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename ); |
|
| 3745 | + if ($csv_file && $wp_filesystem->is_file($target_path) && $wp_filesystem->exists($target_path)) {
|
|
| 3746 | + $wp_filetype = wp_check_filetype_and_ext($target_path, $csv_filename); |
|
| 3747 | 3747 | |
| 3748 | 3748 | if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
| 3749 | 3749 | $json['error'] = NULL; |
| 3750 | 3750 | |
| 3751 | 3751 | $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line |
| 3752 | 3752 | setlocale(LC_ALL, 'en_US.UTF-8'); |
| 3753 | - if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {
|
|
| 3754 | - while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {
|
|
| 3755 | - if ( !empty( $data ) ) {
|
|
| 3753 | + if (($handle = fopen($target_path, "r")) !== FALSE) {
|
|
| 3754 | + while (($data = fgetcsv($handle, 100000, ",")) !== FALSE) {
|
|
| 3755 | + if (!empty($data)) {
|
|
| 3756 | 3756 | $file[] = $data; |
| 3757 | 3757 | } |
| 3758 | 3758 | } |
@@ -3766,19 +3766,19 @@ discard block |
||
| 3766 | 3766 | $json['error'] = __('No data found in csv file.', 'geodirectory');
|
| 3767 | 3767 | } |
| 3768 | 3768 | } else {
|
| 3769 | - wp_send_json( $json ); |
|
| 3769 | + wp_send_json($json); |
|
| 3770 | 3770 | } |
| 3771 | 3771 | } else {
|
| 3772 | - wp_send_json( $json ); |
|
| 3772 | + wp_send_json($json); |
|
| 3773 | 3773 | } |
| 3774 | 3774 | |
| 3775 | - if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
|
|
| 3776 | - wp_send_json( $json ); |
|
| 3775 | + if ($task == 'prepare_import' || !empty($json['error'])) {
|
|
| 3776 | + wp_send_json($json); |
|
| 3777 | 3777 | } |
| 3778 | 3778 | |
| 3779 | 3779 | $total = $json['rows']; |
| 3780 | - $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1; |
|
| 3781 | - $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0; |
|
| 3780 | + $limit = isset($_POST['limit']) ? (int) $_POST['limit'] : 1; |
|
| 3781 | + $processed = isset($_POST['processed']) ? (int) $_POST['processed'] : 0; |
|
| 3782 | 3782 | |
| 3783 | 3783 | $count = $limit; |
| 3784 | 3784 | |
@@ -3803,13 +3803,13 @@ discard block |
||
| 3803 | 3803 | |
| 3804 | 3804 | $post_types = geodir_get_posttypes(); |
| 3805 | 3805 | |
| 3806 | - if ( $task == 'import_cat' ) {
|
|
| 3806 | + if ($task == 'import_cat') {
|
|
| 3807 | 3807 | if (!empty($file)) {
|
| 3808 | 3808 | $columns = isset($file[0]) ? $file[0] : NULL; |
| 3809 | 3809 | |
| 3810 | 3810 | if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
| 3811 | 3811 | $json['error'] = CSV_INVAILD_FILE; |
| 3812 | - wp_send_json( $json ); |
|
| 3812 | + wp_send_json($json); |
|
| 3813 | 3813 | exit; |
| 3814 | 3814 | } |
| 3815 | 3815 | |
@@ -3820,7 +3820,7 @@ discard block |
||
| 3820 | 3820 | |
| 3821 | 3821 | if (isset($file[$index])) {
|
| 3822 | 3822 | $row = $file[$index]; |
| 3823 | - $row = array_map( 'trim', $row ); |
|
| 3823 | + $row = array_map('trim', $row);
|
|
| 3824 | 3824 | //$row = array_map( 'utf8_encode', $row ); |
| 3825 | 3825 | |
| 3826 | 3826 | $cat_id = ''; |
@@ -3837,42 +3837,42 @@ discard block |
||
| 3837 | 3837 | $cat_id_original = ''; |
| 3838 | 3838 | |
| 3839 | 3839 | $c = 0; |
| 3840 | - foreach ($columns as $column ) {
|
|
| 3841 | - if ( $column == 'cat_id' ) {
|
|
| 3842 | - $cat_id = (int)$row[$c]; |
|
| 3843 | - } else if ( $column == 'cat_name' ) {
|
|
| 3840 | + foreach ($columns as $column) {
|
|
| 3841 | + if ($column == 'cat_id') {
|
|
| 3842 | + $cat_id = (int) $row[$c]; |
|
| 3843 | + } else if ($column == 'cat_name') {
|
|
| 3844 | 3844 | $cat_name = $row[$c]; |
| 3845 | - } else if ( $column == 'cat_slug' ) {
|
|
| 3845 | + } else if ($column == 'cat_slug') {
|
|
| 3846 | 3846 | $cat_slug = $row[$c]; |
| 3847 | - } else if ( $column == 'cat_posttype' ) {
|
|
| 3847 | + } else if ($column == 'cat_posttype') {
|
|
| 3848 | 3848 | $cat_posttype = $row[$c]; |
| 3849 | - } else if ( $column == 'cat_parent' ) {
|
|
| 3849 | + } else if ($column == 'cat_parent') {
|
|
| 3850 | 3850 | $cat_parent = trim($row[$c]); |
| 3851 | - } else if ( $column == 'cat_schema' && $row[$c] != '' ) {
|
|
| 3851 | + } else if ($column == 'cat_schema' && $row[$c] != '') {
|
|
| 3852 | 3852 | $cat_schema = $row[$c]; |
| 3853 | - } else if ( $column == 'cat_description' ) {
|
|
| 3853 | + } else if ($column == 'cat_description') {
|
|
| 3854 | 3854 | $cat_description = $row[$c]; |
| 3855 | - } else if ( $column == 'cat_top_description' ) {
|
|
| 3855 | + } else if ($column == 'cat_top_description') {
|
|
| 3856 | 3856 | $cat_top_description = $row[$c]; |
| 3857 | - } else if ( $column == 'cat_image' ) {
|
|
| 3857 | + } else if ($column == 'cat_image') {
|
|
| 3858 | 3858 | $cat_image = $row[$c]; |
| 3859 | - } else if ( $column == 'cat_icon' ) {
|
|
| 3859 | + } else if ($column == 'cat_icon') {
|
|
| 3860 | 3860 | $cat_icon = $row[$c]; |
| 3861 | 3861 | } |
| 3862 | 3862 | // WPML |
| 3863 | - if ( $is_wpml ) {
|
|
| 3864 | - if ( $column == 'cat_language' ) {
|
|
| 3865 | - $cat_language = geodir_strtolower( trim( $row[$c] ) ); |
|
| 3866 | - } else if ( $column == 'cat_id_original' ) {
|
|
| 3867 | - $cat_id_original = (int)$row[$c]; |
|
| 3863 | + if ($is_wpml) {
|
|
| 3864 | + if ($column == 'cat_language') {
|
|
| 3865 | + $cat_language = geodir_strtolower(trim($row[$c])); |
|
| 3866 | + } else if ($column == 'cat_id_original') {
|
|
| 3867 | + $cat_id_original = (int) $row[$c]; |
|
| 3868 | 3868 | } |
| 3869 | 3869 | } |
| 3870 | 3870 | // WPML |
| 3871 | 3871 | $c++; |
| 3872 | 3872 | } |
| 3873 | 3873 | |
| 3874 | - if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {
|
|
| 3875 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 3874 | + if ($cat_name == '' || !in_array($cat_posttype, $post_types)) {
|
|
| 3875 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));
|
|
| 3876 | 3876 | |
| 3877 | 3877 | $invalid++; |
| 3878 | 3878 | continue; |
@@ -3890,24 +3890,24 @@ discard block |
||
| 3890 | 3890 | $term_data['description'] = $cat_description; |
| 3891 | 3891 | $term_data['cat_schema'] = $cat_schema; |
| 3892 | 3892 | $term_data['top_description'] = $cat_top_description; |
| 3893 | - $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : ''; |
|
| 3894 | - $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : ''; |
|
| 3893 | + $term_data['image'] = $cat_image != '' ? basename($cat_image) : ''; |
|
| 3894 | + $term_data['icon'] = $cat_icon != '' ? basename($cat_icon) : ''; |
|
| 3895 | 3895 | |
| 3896 | 3896 | //$term_data = array_map( 'utf8_encode', $term_data ); |
| 3897 | 3897 | |
| 3898 | - $taxonomy = $cat_posttype . 'category'; |
|
| 3898 | + $taxonomy = $cat_posttype.'category'; |
|
| 3899 | 3899 | |
| 3900 | 3900 | $term_data['taxonomy'] = $taxonomy; |
| 3901 | 3901 | |
| 3902 | 3902 | $term_parent_id = 0; |
| 3903 | - if ($cat_parent != "" || (int)$cat_parent > 0) {
|
|
| 3903 | + if ($cat_parent != "" || (int) $cat_parent > 0) {
|
|
| 3904 | 3904 | $term_parent = ''; |
| 3905 | 3905 | |
| 3906 | - if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
|
|
| 3906 | + if ($term_parent = get_term_by('name', $cat_parent, $taxonomy)) {
|
|
| 3907 | 3907 | // |
| 3908 | - } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
|
|
| 3908 | + } else if ($term_parent = get_term_by('slug', $cat_parent, $taxonomy)) {
|
|
| 3909 | 3909 | // |
| 3910 | - } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
|
|
| 3910 | + } else if ($term_parent = get_term_by('id', $cat_parent, $taxonomy)) {
|
|
| 3911 | 3911 | // |
| 3912 | 3912 | } else {
|
| 3913 | 3913 | $term_parent_data = array(); |
@@ -3915,104 +3915,104 @@ discard block |
||
| 3915 | 3915 | //$term_parent_data = array_map( 'utf8_encode', $term_parent_data ); |
| 3916 | 3916 | $term_parent_data['taxonomy'] = $taxonomy; |
| 3917 | 3917 | |
| 3918 | - $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data ); |
|
| 3918 | + $term_parent_id = (int) geodir_imex_insert_term($taxonomy, $term_parent_data); |
|
| 3919 | 3919 | } |
| 3920 | 3920 | |
| 3921 | - if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
|
|
| 3922 | - $term_parent_id = (int)$term_parent->term_id; |
|
| 3921 | + if (!empty($term_parent) && !is_wp_error($term_parent)) {
|
|
| 3922 | + $term_parent_id = (int) $term_parent->term_id; |
|
| 3923 | 3923 | } |
| 3924 | 3924 | } |
| 3925 | - $term_data['parent'] = (int)$term_parent_id; |
|
| 3925 | + $term_data['parent'] = (int) $term_parent_id; |
|
| 3926 | 3926 | |
| 3927 | 3927 | $term_id = NULL; |
| 3928 | - if ( $import_choice == 'update' ) {
|
|
| 3929 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3928 | + if ($import_choice == 'update') {
|
|
| 3929 | + if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {
|
|
| 3930 | 3930 | $term_data['term_id'] = $term['term_id']; |
| 3931 | 3931 | |
| 3932 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3932 | + if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {
|
|
| 3933 | 3933 | $updated++; |
| 3934 | 3934 | } else {
|
| 3935 | 3935 | $invalid++; |
| 3936 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3936 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));
|
|
| 3937 | 3937 | } |
| 3938 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3938 | + } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {
|
|
| 3939 | 3939 | $term_data['term_id'] = $term['term_id']; |
| 3940 | 3940 | |
| 3941 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3941 | + if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {
|
|
| 3942 | 3942 | $updated++; |
| 3943 | 3943 | } else {
|
| 3944 | 3944 | $invalid++; |
| 3945 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3945 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));
|
|
| 3946 | 3946 | } |
| 3947 | 3947 | } else {
|
| 3948 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3948 | + if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {
|
|
| 3949 | 3949 | $created++; |
| 3950 | 3950 | } else {
|
| 3951 | 3951 | $invalid++; |
| 3952 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3952 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));
|
|
| 3953 | 3953 | } |
| 3954 | 3954 | } |
| 3955 | - } else if ( $import_choice == 'skip' ) {
|
|
| 3956 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3955 | + } else if ($import_choice == 'skip') {
|
|
| 3956 | + if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {
|
|
| 3957 | 3957 | $skipped++; |
| 3958 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3958 | + } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {
|
|
| 3959 | 3959 | $skipped++; |
| 3960 | 3960 | } else {
|
| 3961 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3961 | + if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {
|
|
| 3962 | 3962 | $created++; |
| 3963 | 3963 | } else {
|
| 3964 | 3964 | $invalid++; |
| 3965 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3965 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));
|
|
| 3966 | 3966 | } |
| 3967 | 3967 | } |
| 3968 | 3968 | } else {
|
| 3969 | 3969 | $invalid++; |
| 3970 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3970 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));
|
|
| 3971 | 3971 | } |
| 3972 | 3972 | |
| 3973 | - if ( $term_id ) {
|
|
| 3973 | + if ($term_id) {
|
|
| 3974 | 3974 | // WPML |
| 3975 | 3975 | if ($is_wpml && geodir_wpml_is_taxonomy_translated($taxonomy) && $cat_id_original > 0 && $cat_language != '') {
|
| 3976 | - $wpml_element_type = 'tax_' . $taxonomy; |
|
| 3977 | - $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type ); |
|
| 3976 | + $wpml_element_type = 'tax_'.$taxonomy; |
|
| 3977 | + $source_language = geodir_get_language_for_element($cat_id_original, $wpml_element_type); |
|
| 3978 | 3978 | $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
| 3979 | 3979 | |
| 3980 | - $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type ); |
|
| 3980 | + $trid = $sitepress->get_element_trid($cat_id_original, $wpml_element_type); |
|
| 3981 | 3981 | |
| 3982 | - $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language ); |
|
| 3982 | + $sitepress->set_element_language_details($term_id, $wpml_element_type, $trid, $cat_language, $source_language); |
|
| 3983 | 3983 | } |
| 3984 | 3984 | // WPML |
| 3985 | 3985 | |
| 3986 | - if ( isset( $term_data['top_description'] ) ) {
|
|
| 3987 | - geodir_update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype ); |
|
| 3986 | + if (isset($term_data['top_description'])) {
|
|
| 3987 | + geodir_update_tax_meta($term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype); |
|
| 3988 | 3988 | } |
| 3989 | 3989 | |
| 3990 | - if ( isset( $term_data['cat_schema'] ) ) {
|
|
| 3991 | - geodir_update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype ); |
|
| 3990 | + if (isset($term_data['cat_schema'])) {
|
|
| 3991 | + geodir_update_tax_meta($term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype); |
|
| 3992 | 3992 | } |
| 3993 | 3993 | |
| 3994 | 3994 | $attachment = false; |
| 3995 | - if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {
|
|
| 3996 | - $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype ); |
|
| 3997 | - $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
| 3995 | + if (isset($term_data['image']) && $term_data['image'] != '') {
|
|
| 3996 | + $cat_image = geodir_get_default_catimage($term_id, $cat_posttype); |
|
| 3997 | + $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : ''; |
|
| 3998 | 3998 | |
| 3999 | - if ( basename($cat_image) != $term_data['image'] ) {
|
|
| 3999 | + if (basename($cat_image) != $term_data['image']) {
|
|
| 4000 | 4000 | $attachment = true; |
| 4001 | - geodir_update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype ); |
|
| 4001 | + geodir_update_tax_meta($term_id, 'ct_cat_default_img', array('id' => 'image', 'src' => $uploads['url'].'/'.$term_data['image']), $cat_posttype);
|
|
| 4002 | 4002 | } |
| 4003 | 4003 | } |
| 4004 | 4004 | |
| 4005 | - if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {
|
|
| 4006 | - $cat_icon = geodir_get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype ); |
|
| 4007 | - $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
| 4005 | + if (isset($term_data['icon']) && $term_data['icon'] != '') {
|
|
| 4006 | + $cat_icon = geodir_get_tax_meta($term_id, 'ct_cat_icon', false, $cat_posttype); |
|
| 4007 | + $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : ''; |
|
| 4008 | 4008 | |
| 4009 | - if ( basename($cat_icon) != $term_data['icon'] ) {
|
|
| 4009 | + if (basename($cat_icon) != $term_data['icon']) {
|
|
| 4010 | 4010 | $attachment = true; |
| 4011 | - geodir_update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype ); |
|
| 4011 | + geodir_update_tax_meta($term_id, 'ct_cat_icon', array('id' => 'icon', 'src' => $uploads['url'].'/'.$term_data['icon']), $cat_posttype);
|
|
| 4012 | 4012 | } |
| 4013 | 4013 | } |
| 4014 | 4014 | |
| 4015 | - if ( $attachment ) {
|
|
| 4015 | + if ($attachment) {
|
|
| 4016 | 4016 | $images++; |
| 4017 | 4017 | } |
| 4018 | 4018 | } |
@@ -4034,35 +4034,35 @@ discard block |
||
| 4034 | 4034 | $json['invalid'] = $invalid; |
| 4035 | 4035 | $json['images'] = $images; |
| 4036 | 4036 | |
| 4037 | - wp_send_json( $json ); |
|
| 4037 | + wp_send_json($json); |
|
| 4038 | 4038 | exit; |
| 4039 | - } else if ( $task == 'import_post' ) {
|
|
| 4040 | - $xtimings['###1'] = microtime(true)-$xstart; |
|
| 4039 | + } else if ($task == 'import_post') {
|
|
| 4040 | + $xtimings['###1'] = microtime(true) - $xstart; |
|
| 4041 | 4041 | //run some stuff to make the import quicker |
| 4042 | - wp_defer_term_counting( true ); |
|
| 4043 | - wp_defer_comment_counting( true ); |
|
| 4044 | - $wpdb->query( 'SET autocommit = 0;' ); |
|
| 4042 | + wp_defer_term_counting(true); |
|
| 4043 | + wp_defer_comment_counting(true); |
|
| 4044 | + $wpdb->query('SET autocommit = 0;');
|
|
| 4045 | 4045 | // |
| 4046 | 4046 | // remove_all_actions('publish_post');
|
| 4047 | 4047 | // remove_all_actions('transition_post_status');
|
| 4048 | 4048 | // remove_all_actions('publish_future_post');
|
| 4049 | 4049 | |
| 4050 | 4050 | if (!empty($file)) {
|
| 4051 | - $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 4051 | + $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 4052 | 4052 | $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
| 4053 | 4053 | $default_status = 'publish'; |
| 4054 | - $current_date = date_i18n( 'Y-m-d', time() ); |
|
| 4054 | + $current_date = date_i18n('Y-m-d', time());
|
|
| 4055 | 4055 | |
| 4056 | 4056 | $columns = isset($file[0]) ? $file[0] : NULL; |
| 4057 | 4057 | |
| 4058 | 4058 | if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
| 4059 | 4059 | $json['error'] = CSV_INVAILD_FILE; |
| 4060 | - wp_send_json( $json ); |
|
| 4060 | + wp_send_json($json); |
|
| 4061 | 4061 | exit; |
| 4062 | 4062 | } |
| 4063 | - $xtimings['###2'] = microtime(true)-$xstart; |
|
| 4063 | + $xtimings['###2'] = microtime(true) - $xstart; |
|
| 4064 | 4064 | $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
|
| 4065 | - $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' ); |
|
| 4065 | + $wp_chars_error = __('(check & remove if any invalid characters used in data)', 'geodirectory');
|
|
| 4066 | 4066 | $processed_actual = 0; |
| 4067 | 4067 | for ($i = 1; $i <= $limit; $i++) {
|
| 4068 | 4068 | $index = $processed + $i; |
@@ -4071,9 +4071,9 @@ discard block |
||
| 4071 | 4071 | if (isset($file[$index])) {
|
| 4072 | 4072 | $processed_actual++; |
| 4073 | 4073 | $row = $file[$index]; |
| 4074 | - $row = array_map( 'trim', $row ); |
|
| 4074 | + $row = array_map('trim', $row);
|
|
| 4075 | 4075 | //$row = array_map( 'utf8_encode', $row ); |
| 4076 | - $row = array_map( 'addslashes_gpc', $row ); |
|
| 4076 | + $row = array_map('addslashes_gpc', $row);
|
|
| 4077 | 4077 | |
| 4078 | 4078 | $post_id = ''; |
| 4079 | 4079 | $post_title = ''; |
@@ -4113,82 +4113,82 @@ discard block |
||
| 4113 | 4113 | $original_post_id = ''; |
| 4114 | 4114 | |
| 4115 | 4115 | $c = 0; |
| 4116 | - foreach ($columns as $column ) {
|
|
| 4116 | + foreach ($columns as $column) {
|
|
| 4117 | 4117 | $gd_post[$column] = $row[$c]; |
| 4118 | 4118 | |
| 4119 | - if ( $column == 'post_id' ) {
|
|
| 4119 | + if ($column == 'post_id') {
|
|
| 4120 | 4120 | $post_id = $row[$c]; |
| 4121 | - } else if ( $column == 'post_title' ) {
|
|
| 4121 | + } else if ($column == 'post_title') {
|
|
| 4122 | 4122 | $post_title = sanitize_text_field($row[$c]); |
| 4123 | - } else if ( $column == 'post_author' ) {
|
|
| 4123 | + } else if ($column == 'post_author') {
|
|
| 4124 | 4124 | $post_author = $row[$c]; |
| 4125 | - } else if ( $column == 'post_date' ) {
|
|
| 4125 | + } else if ($column == 'post_date') {
|
|
| 4126 | 4126 | $post_date = $row[$c]; |
| 4127 | - } else if ( $column == 'post_content' ) {
|
|
| 4127 | + } else if ($column == 'post_content') {
|
|
| 4128 | 4128 | $post_content = $row[$c]; |
| 4129 | - } else if ( $column == 'post_category' && $row[$c] != '' ) {
|
|
| 4130 | - $post_category_arr = explode( ',', $row[$c] ); |
|
| 4131 | - } else if ( $column == 'default_category' ) {
|
|
| 4129 | + } else if ($column == 'post_category' && $row[$c] != '') {
|
|
| 4130 | + $post_category_arr = explode(',', $row[$c]);
|
|
| 4131 | + } else if ($column == 'default_category') {
|
|
| 4132 | 4132 | $default_category = wp_kses_normalize_entities($row[$c]); |
| 4133 | - } else if ( $column == 'post_tags' && $row[$c] != '' ) {
|
|
| 4134 | - $post_tags = explode( ',', sanitize_text_field($row[$c]) ); |
|
| 4135 | - } else if ( $column == 'post_type' ) {
|
|
| 4133 | + } else if ($column == 'post_tags' && $row[$c] != '') {
|
|
| 4134 | + $post_tags = explode(',', sanitize_text_field($row[$c]));
|
|
| 4135 | + } else if ($column == 'post_type') {
|
|
| 4136 | 4136 | $post_type = $row[$c]; |
| 4137 | - } else if ( $column == 'post_status' ) {
|
|
| 4138 | - $post_status = sanitize_key( $row[$c] ); |
|
| 4139 | - } else if ( $column == 'is_featured' ) {
|
|
| 4140 | - $is_featured = (int)$row[$c]; |
|
| 4141 | - } else if ( $column == 'geodir_video' ) {
|
|
| 4137 | + } else if ($column == 'post_status') {
|
|
| 4138 | + $post_status = sanitize_key($row[$c]); |
|
| 4139 | + } else if ($column == 'is_featured') {
|
|
| 4140 | + $is_featured = (int) $row[$c]; |
|
| 4141 | + } else if ($column == 'geodir_video') {
|
|
| 4142 | 4142 | $geodir_video = $row[$c]; |
| 4143 | - } else if ( $column == 'post_address' ) {
|
|
| 4143 | + } else if ($column == 'post_address') {
|
|
| 4144 | 4144 | $post_address = sanitize_text_field($row[$c]); |
| 4145 | - } else if ( $column == 'post_city' ) {
|
|
| 4145 | + } else if ($column == 'post_city') {
|
|
| 4146 | 4146 | $post_city = sanitize_text_field($row[$c]); |
| 4147 | - } else if ( $column == 'post_region' ) {
|
|
| 4147 | + } else if ($column == 'post_region') {
|
|
| 4148 | 4148 | $post_region = sanitize_text_field($row[$c]); |
| 4149 | - } else if ( $column == 'post_country' ) {
|
|
| 4149 | + } else if ($column == 'post_country') {
|
|
| 4150 | 4150 | $post_country = sanitize_text_field($row[$c]); |
| 4151 | - } else if ( $column == 'post_zip' ) {
|
|
| 4151 | + } else if ($column == 'post_zip') {
|
|
| 4152 | 4152 | $post_zip = sanitize_text_field($row[$c]); |
| 4153 | - } else if ( $column == 'post_latitude' ) {
|
|
| 4153 | + } else if ($column == 'post_latitude') {
|
|
| 4154 | 4154 | $post_latitude = sanitize_text_field($row[$c]); |
| 4155 | - } else if ( $column == 'post_longitude' ) {
|
|
| 4155 | + } else if ($column == 'post_longitude') {
|
|
| 4156 | 4156 | $post_longitude = sanitize_text_field($row[$c]); |
| 4157 | - } else if ( $column == 'post_neighbourhood' ) {
|
|
| 4157 | + } else if ($column == 'post_neighbourhood') {
|
|
| 4158 | 4158 | $post_neighbourhood = sanitize_text_field($row[$c]); |
| 4159 | 4159 | unset($gd_post[$column]); |
| 4160 | - } else if ( $column == 'neighbourhood_latitude' ) {
|
|
| 4160 | + } else if ($column == 'neighbourhood_latitude') {
|
|
| 4161 | 4161 | $neighbourhood_latitude = sanitize_text_field($row[$c]); |
| 4162 | - } else if ( $column == 'neighbourhood_longitude' ) {
|
|
| 4162 | + } else if ($column == 'neighbourhood_longitude') {
|
|
| 4163 | 4163 | $neighbourhood_longitude = sanitize_text_field($row[$c]); |
| 4164 | - } else if ( $column == 'geodir_timing' ) {
|
|
| 4164 | + } else if ($column == 'geodir_timing') {
|
|
| 4165 | 4165 | $geodir_timing = sanitize_text_field($row[$c]); |
| 4166 | - } else if ( $column == 'geodir_contact' ) {
|
|
| 4166 | + } else if ($column == 'geodir_contact') {
|
|
| 4167 | 4167 | $geodir_contact = sanitize_text_field($row[$c]); |
| 4168 | - } else if ( $column == 'geodir_email' ) {
|
|
| 4168 | + } else if ($column == 'geodir_email') {
|
|
| 4169 | 4169 | $geodir_email = sanitize_email($row[$c]); |
| 4170 | - } else if ( $column == 'geodir_website' ) {
|
|
| 4170 | + } else if ($column == 'geodir_website') {
|
|
| 4171 | 4171 | $geodir_website = sanitize_text_field($row[$c]); |
| 4172 | - } else if ( $column == 'geodir_twitter' ) {
|
|
| 4172 | + } else if ($column == 'geodir_twitter') {
|
|
| 4173 | 4173 | $geodir_twitter = sanitize_text_field($row[$c]); |
| 4174 | - } else if ( $column == 'geodir_facebook' ) {
|
|
| 4174 | + } else if ($column == 'geodir_facebook') {
|
|
| 4175 | 4175 | $geodir_facebook = sanitize_text_field($row[$c]); |
| 4176 | - } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
|
|
| 4176 | + } else if ($column == 'IMAGE' && !empty($row[$c]) && $row[$c] != '') {
|
|
| 4177 | 4177 | $post_images[] = $row[$c]; |
| 4178 | - } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
|
|
| 4179 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) ); |
|
| 4180 | - } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
|
|
| 4178 | + } else if ($column == 'alive_days' && (int) $row[$c] > 0) {
|
|
| 4179 | + $expire_date = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $row[$c].' days'));
|
|
| 4180 | + } else if ($column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never') {
|
|
| 4181 | 4181 | $row[$c] = str_replace('/', '-', $row[$c]);
|
| 4182 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) ); |
|
| 4183 | - } else if ( strpos( $column, 'linked_' ) === 0 ) {
|
|
| 4184 | - $geodir_link_business = (int)$row[$c]; |
|
| 4182 | + $expire_date = date_i18n('Y-m-d', strtotime($row[$c]));
|
|
| 4183 | + } else if (strpos($column, 'linked_') === 0) {
|
|
| 4184 | + $geodir_link_business = (int) $row[$c]; |
|
| 4185 | 4185 | } |
| 4186 | 4186 | // WPML |
| 4187 | 4187 | if ($is_wpml) {
|
| 4188 | 4188 | if ($column == 'language') {
|
| 4189 | 4189 | $language = geodir_strtolower(trim($row[$c])); |
| 4190 | 4190 | } else if ($column == 'original_post_id') {
|
| 4191 | - $original_post_id = (int)$row[$c]; |
|
| 4191 | + $original_post_id = (int) $row[$c]; |
|
| 4192 | 4192 | } |
| 4193 | 4193 | } |
| 4194 | 4194 | // WPML |
@@ -4196,7 +4196,7 @@ discard block |
||
| 4196 | 4196 | } |
| 4197 | 4197 | // listing claimed or not |
| 4198 | 4198 | if ($is_claim_active && isset($gd_post['claimed'])) {
|
| 4199 | - $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4199 | + $gd_post['claimed'] = (int) $gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4200 | 4200 | } |
| 4201 | 4201 | |
| 4202 | 4202 | // WPML |
@@ -4207,43 +4207,43 @@ discard block |
||
| 4207 | 4207 | |
| 4208 | 4208 | $gd_post['IMAGE'] = $post_images; |
| 4209 | 4209 | |
| 4210 | - $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 4211 | - $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 4210 | + $post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status; |
|
| 4211 | + $post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status; |
|
| 4212 | 4212 | |
| 4213 | 4213 | $valid = true; |
| 4214 | 4214 | |
| 4215 | - if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
|
|
| 4215 | + if ($post_title == '' || !in_array($post_type, $post_types)) {
|
|
| 4216 | 4216 | $invalid++; |
| 4217 | 4217 | $valid = false; |
| 4218 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 4218 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));
|
|
| 4219 | 4219 | } |
| 4220 | - $xtimings['###3'] = microtime(true)-$xstart; |
|
| 4221 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 4222 | - if ( $location_allowed ) {
|
|
| 4220 | + $xtimings['###3'] = microtime(true) - $xstart; |
|
| 4221 | + $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
|
|
| 4222 | + if ($location_allowed) {
|
|
| 4223 | 4223 | $location_result = geodir_get_default_location(); |
| 4224 | - if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
|
|
| 4224 | + if ($post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '') {
|
|
| 4225 | 4225 | $invalid_addr++; |
| 4226 | 4226 | $valid = false; |
| 4227 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4228 | - } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
|
|
| 4229 | - if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {
|
|
| 4227 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));
|
|
| 4228 | + } else if (!empty($location_result) && $location_result->location_id == 0) {
|
|
| 4229 | + if ((geodir_strtolower($post_city) != geodir_strtolower($location_result->city)) || (geodir_strtolower($post_region) != geodir_strtolower($location_result->region)) || (geodir_strtolower($post_country) != geodir_strtolower($location_result->country))) {
|
|
| 4230 | 4230 | $invalid_addr++; |
| 4231 | 4231 | $valid = false; |
| 4232 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4232 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));
|
|
| 4233 | 4233 | } else {
|
| 4234 | 4234 | if (!$location_manager) {
|
| 4235 | - $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated. |
|
| 4235 | + $gd_post['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // Set the default location when location manager not activated. |
|
| 4236 | 4236 | } |
| 4237 | 4237 | } |
| 4238 | 4238 | } |
| 4239 | 4239 | } |
| 4240 | - $xtimings['###4'] = microtime(true)-$xstart; |
|
| 4241 | - if ( !$valid ) {
|
|
| 4240 | + $xtimings['###4'] = microtime(true) - $xstart; |
|
| 4241 | + if (!$valid) {
|
|
| 4242 | 4242 | continue; |
| 4243 | 4243 | } |
| 4244 | 4244 | |
| 4245 | - $cat_taxonomy = $post_type . 'category'; |
|
| 4246 | - $tags_taxonomy = $post_type . '_tags'; |
|
| 4245 | + $cat_taxonomy = $post_type.'category'; |
|
| 4246 | + $tags_taxonomy = $post_type.'_tags'; |
|
| 4247 | 4247 | |
| 4248 | 4248 | if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
|
| 4249 | 4249 | $post_category_arr = array_merge(array($default_category), $post_category_arr); |
@@ -4251,29 +4251,29 @@ discard block |
||
| 4251 | 4251 | |
| 4252 | 4252 | $post_category = array(); |
| 4253 | 4253 | $default_category_id = NULL; |
| 4254 | - if ( !empty( $post_category_arr ) ) {
|
|
| 4255 | - foreach ( $post_category_arr as $value ) {
|
|
| 4256 | - $category_name = wp_kses_normalize_entities( trim( $value ) ); |
|
| 4254 | + if (!empty($post_category_arr)) {
|
|
| 4255 | + foreach ($post_category_arr as $value) {
|
|
| 4256 | + $category_name = wp_kses_normalize_entities(trim($value)); |
|
| 4257 | 4257 | |
| 4258 | - if ( $category_name != '' ) {
|
|
| 4258 | + if ($category_name != '') {
|
|
| 4259 | 4259 | $term_category = array(); |
| 4260 | 4260 | |
| 4261 | - if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
|
|
| 4261 | + if ($term = get_term_by('name', $category_name, $cat_taxonomy)) {
|
|
| 4262 | 4262 | $term_category = $term; |
| 4263 | - } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
|
|
| 4263 | + } else if ($term = get_term_by('slug', $category_name, $cat_taxonomy)) {
|
|
| 4264 | 4264 | $term_category = $term; |
| 4265 | 4265 | } else {
|
| 4266 | 4266 | $term_data = array(); |
| 4267 | 4267 | $term_data['name'] = $category_name; |
| 4268 | 4268 | $term_data['taxonomy'] = $cat_taxonomy; |
| 4269 | 4269 | |
| 4270 | - $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data ); |
|
| 4271 | - if ( $term_id ) {
|
|
| 4272 | - $term_category = get_term( $term_id, $cat_taxonomy ); |
|
| 4270 | + $term_id = geodir_imex_insert_term($cat_taxonomy, $term_data); |
|
| 4271 | + if ($term_id) {
|
|
| 4272 | + $term_category = get_term($term_id, $cat_taxonomy); |
|
| 4273 | 4273 | } |
| 4274 | 4274 | } |
| 4275 | 4275 | |
| 4276 | - if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
|
|
| 4276 | + if (!empty($term_category) && !is_wp_error($term_category)) {
|
|
| 4277 | 4277 | $post_category[] = intval($term_category->term_id); |
| 4278 | 4278 | |
| 4279 | 4279 | if ($category_name == $default_category) {
|
@@ -4283,14 +4283,14 @@ discard block |
||
| 4283 | 4283 | } |
| 4284 | 4284 | } |
| 4285 | 4285 | } |
| 4286 | - $xtimings['###5'] = microtime(true)-$xstart; |
|
| 4286 | + $xtimings['###5'] = microtime(true) - $xstart; |
|
| 4287 | 4287 | $save_post = array(); |
| 4288 | 4288 | $save_post['post_title'] = $post_title; |
| 4289 | 4289 | if (!empty($post_date)) {
|
| 4290 | - $post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format. |
|
| 4290 | + $post_date = geodir_date($post_date, 'Y-m-d H:i:s'); // convert to mysql date format. |
|
| 4291 | 4291 | |
| 4292 | 4292 | $save_post['post_date'] = $post_date; |
| 4293 | - $save_post['post_date_gmt'] = get_gmt_from_date( $post_date ); |
|
| 4293 | + $save_post['post_date_gmt'] = get_gmt_from_date($post_date); |
|
| 4294 | 4294 | } |
| 4295 | 4295 | $save_post['post_content'] = $post_content; |
| 4296 | 4296 | $save_post['post_type'] = $post_type; |
@@ -4300,15 +4300,15 @@ discard block |
||
| 4300 | 4300 | $save_post['post_tags'] = $post_tags; |
| 4301 | 4301 | |
| 4302 | 4302 | $saved_post_id = NULL; |
| 4303 | - if ( $import_choice == 'update' ) {
|
|
| 4304 | - $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' ); |
|
| 4303 | + if ($import_choice == 'update') {
|
|
| 4304 | + $gd_wp_error = __('Unable to add listing, please check the listing data.', 'geodirectory');
|
|
| 4305 | 4305 | |
| 4306 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4306 | + if ($post_id > 0 && get_post($post_id)) {
|
|
| 4307 | 4307 | $save_post['ID'] = $post_id; |
| 4308 | 4308 | |
| 4309 | - if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
|
|
| 4310 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4311 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4309 | + if ($saved_post_id = wp_update_post($save_post, true)) {
|
|
| 4310 | + if (is_wp_error($saved_post_id)) {
|
|
| 4311 | + $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error; |
|
| 4312 | 4312 | $saved_post_id = 0; |
| 4313 | 4313 | } else {
|
| 4314 | 4314 | $saved_post_id = $post_id; |
@@ -4316,9 +4316,9 @@ discard block |
||
| 4316 | 4316 | } |
| 4317 | 4317 | } |
| 4318 | 4318 | } else {
|
| 4319 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4320 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4321 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4319 | + if ($saved_post_id = wp_insert_post($save_post, true)) {
|
|
| 4320 | + if (is_wp_error($saved_post_id)) {
|
|
| 4321 | + $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error; |
|
| 4322 | 4322 | $saved_post_id = 0; |
| 4323 | 4323 | } else {
|
| 4324 | 4324 | $created++; |
@@ -4326,19 +4326,19 @@ discard block |
||
| 4326 | 4326 | } |
| 4327 | 4327 | } |
| 4328 | 4328 | |
| 4329 | - if ( !$saved_post_id > 0 ) {
|
|
| 4329 | + if (!$saved_post_id > 0) {
|
|
| 4330 | 4330 | $invalid++; |
| 4331 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error ); |
|
| 4331 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_wp_error); |
|
| 4332 | 4332 | } |
| 4333 | - } else if ( $import_choice == 'skip' ) {
|
|
| 4334 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4333 | + } else if ($import_choice == 'skip') {
|
|
| 4334 | + if ($post_id > 0 && get_post($post_id)) {
|
|
| 4335 | 4335 | $skipped++; |
| 4336 | 4336 | } else {
|
| 4337 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4338 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4337 | + if ($saved_post_id = wp_insert_post($save_post, true)) {
|
|
| 4338 | + if (is_wp_error($saved_post_id)) {
|
|
| 4339 | 4339 | $invalid++; |
| 4340 | 4340 | |
| 4341 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error ); |
|
| 4341 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$saved_post_id->get_error_message().' '.$wp_chars_error); |
|
| 4342 | 4342 | $saved_post_id = 0; |
| 4343 | 4343 | } else {
|
| 4344 | 4344 | $created++; |
@@ -4346,28 +4346,28 @@ discard block |
||
| 4346 | 4346 | } else {
|
| 4347 | 4347 | $invalid++; |
| 4348 | 4348 | |
| 4349 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4349 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error); |
|
| 4350 | 4350 | } |
| 4351 | 4351 | } |
| 4352 | 4352 | } else {
|
| 4353 | 4353 | $invalid++; |
| 4354 | 4354 | |
| 4355 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4355 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error); |
|
| 4356 | 4356 | } |
| 4357 | - $xtimings['###6'] = microtime(true)-$xstart; |
|
| 4358 | - if ( (int)$saved_post_id > 0 ) {
|
|
| 4357 | + $xtimings['###6'] = microtime(true) - $xstart; |
|
| 4358 | + if ((int) $saved_post_id > 0) {
|
|
| 4359 | 4359 | // WPML |
| 4360 | 4360 | if ($is_wpml && geodir_wpml_is_post_type_translated($post_type) && $original_post_id > 0 && $language != '') {
|
| 4361 | - $wpml_post_type = 'post_' . $post_type; |
|
| 4362 | - $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type ); |
|
| 4361 | + $wpml_post_type = 'post_'.$post_type; |
|
| 4362 | + $source_language = geodir_get_language_for_element($original_post_id, $wpml_post_type); |
|
| 4363 | 4363 | $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
| 4364 | 4364 | |
| 4365 | - $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type ); |
|
| 4365 | + $trid = $sitepress->get_element_trid($original_post_id, $wpml_post_type); |
|
| 4366 | 4366 | |
| 4367 | - $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language ); |
|
| 4367 | + $sitepress->set_element_language_details($saved_post_id, $wpml_post_type, $trid, $language, $source_language); |
|
| 4368 | 4368 | } |
| 4369 | 4369 | // WPML |
| 4370 | - $gd_post_info = geodir_get_post_info( $saved_post_id ); |
|
| 4370 | + $gd_post_info = geodir_get_post_info($saved_post_id); |
|
| 4371 | 4371 | |
| 4372 | 4372 | $gd_post['post_id'] = $saved_post_id; |
| 4373 | 4373 | $gd_post['ID'] = $saved_post_id; |
@@ -4379,7 +4379,7 @@ discard block |
||
| 4379 | 4379 | |
| 4380 | 4380 | // post location |
| 4381 | 4381 | $post_location_id = 0; |
| 4382 | - if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
|
|
| 4382 | + if ($location_allowed && !empty($location_result) && $location_result->location_id > 0) {
|
|
| 4383 | 4383 | $gd_post['post_neighbourhood'] = ''; |
| 4384 | 4384 | |
| 4385 | 4385 | $post_location_info = array( |
@@ -4389,7 +4389,7 @@ discard block |
||
| 4389 | 4389 | 'geo_lat' => $post_latitude, |
| 4390 | 4390 | 'geo_lng' => $post_longitude |
| 4391 | 4391 | ); |
| 4392 | - if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
|
|
| 4392 | + if ($location_id = (int) geodir_add_new_location($post_location_info)) {
|
|
| 4393 | 4393 | $post_location_id = $location_id; |
| 4394 | 4394 | } |
| 4395 | 4395 | |
@@ -4431,14 +4431,14 @@ discard block |
||
| 4431 | 4431 | } |
| 4432 | 4432 | |
| 4433 | 4433 | // post package info |
| 4434 | - $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0; |
|
| 4434 | + $package_id = isset($gd_post['package_id']) && !empty($gd_post['package_id']) ? (int) $gd_post['package_id'] : 0; |
|
| 4435 | 4435 | if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
|
| 4436 | 4436 | $package_id = $gd_post_info->package_id; |
| 4437 | 4437 | } |
| 4438 | 4438 | |
| 4439 | 4439 | $package_info = array(); |
| 4440 | 4440 | if ($package_id && function_exists('geodir_get_package_info_by_id')) {
|
| 4441 | - $package_info = (array)geodir_get_package_info_by_id($package_id); |
|
| 4441 | + $package_info = (array) geodir_get_package_info_by_id($package_id); |
|
| 4442 | 4442 | |
| 4443 | 4443 | if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
|
| 4444 | 4444 | $package_info = array(); |
@@ -4446,18 +4446,18 @@ discard block |
||
| 4446 | 4446 | } |
| 4447 | 4447 | |
| 4448 | 4448 | if (empty($package_info)) {
|
| 4449 | - $package_info = (array)geodir_post_package_info( array(), '', $post_type ); |
|
| 4449 | + $package_info = (array) geodir_post_package_info(array(), '', $post_type); |
|
| 4450 | 4450 | } |
| 4451 | 4451 | |
| 4452 | - if (!empty($package_info)) {
|
|
| 4452 | + if (!empty($package_info)) {
|
|
| 4453 | 4453 | $package_id = $package_info['pid']; |
| 4454 | 4454 | |
| 4455 | 4455 | if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
|
| 4456 | 4456 | $gd_post['expire_date'] = $expire_date; |
| 4457 | 4457 | } else {
|
| 4458 | - if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
|
|
| 4459 | - $gd_post['alive_days'] = (int)$package_info['days']; |
|
| 4460 | - $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) ); |
|
| 4458 | + if (isset($package_info['days']) && (int) $package_info['days'] > 0) {
|
|
| 4459 | + $gd_post['alive_days'] = (int) $package_info['days']; |
|
| 4460 | + $gd_post['expire_date'] = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $package_info['days'].' days'));
|
|
| 4461 | 4461 | } else {
|
| 4462 | 4462 | $gd_post['expire_date'] = 'Never'; |
| 4463 | 4463 | } |
@@ -4466,7 +4466,7 @@ discard block |
||
| 4466 | 4466 | $gd_post['package_id'] = $package_id; |
| 4467 | 4467 | } |
| 4468 | 4468 | |
| 4469 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 4469 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 4470 | 4470 | |
| 4471 | 4471 | if ($post_type == 'gd_event') {
|
| 4472 | 4472 | $gd_post = geodir_imex_process_event_data($gd_post); |
@@ -4477,71 +4477,71 @@ discard block |
||
| 4477 | 4477 | } |
| 4478 | 4478 | |
| 4479 | 4479 | // Export franchise fields |
| 4480 | - $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 4480 | + $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;
|
|
| 4481 | 4481 | if ($is_franchise_active) {
|
| 4482 | - if ( isset( $gd_post['gd_is_franchise'] ) && empty( $gd_post['franchise'] ) ) {
|
|
| 4483 | - if ( absint( $gd_post['gd_is_franchise'] ) != 0 ) {
|
|
| 4482 | + if (isset($gd_post['gd_is_franchise']) && empty($gd_post['franchise'])) {
|
|
| 4483 | + if (absint($gd_post['gd_is_franchise']) != 0) {
|
|
| 4484 | 4484 | $gd_franchise_lock = array(); |
| 4485 | 4485 | |
| 4486 | - if ( isset( $gd_post['gd_franchise_lock'] ) ) {
|
|
| 4487 | - $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
|
|
| 4488 | - $gd_franchise_lock = trim( $gd_franchise_lock ); |
|
| 4489 | - $gd_franchise_lock = explode( ",", $gd_franchise_lock ); |
|
| 4486 | + if (isset($gd_post['gd_franchise_lock'])) {
|
|
| 4487 | + $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock']);
|
|
| 4488 | + $gd_franchise_lock = trim($gd_franchise_lock); |
|
| 4489 | + $gd_franchise_lock = explode(",", $gd_franchise_lock);
|
|
| 4490 | 4490 | } |
| 4491 | 4491 | |
| 4492 | - update_post_meta( $saved_post_id, 'gd_is_franchise', 1 ); |
|
| 4493 | - update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock ); |
|
| 4492 | + update_post_meta($saved_post_id, 'gd_is_franchise', 1); |
|
| 4493 | + update_post_meta($saved_post_id, 'gd_franchise_lock', $gd_franchise_lock); |
|
| 4494 | 4494 | } else {
|
| 4495 | - if ( function_exists( 'geodir_franchise_remove_franchise' ) ) {
|
|
| 4496 | - geodir_franchise_remove_franchise( $saved_post_id ); |
|
| 4495 | + if (function_exists('geodir_franchise_remove_franchise')) {
|
|
| 4496 | + geodir_franchise_remove_franchise($saved_post_id); |
|
| 4497 | 4497 | } |
| 4498 | 4498 | } |
| 4499 | 4499 | } else {
|
| 4500 | - if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
|
|
| 4501 | - geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] ); |
|
| 4500 | + if (isset($gd_post['franchise']) && (int) $gd_post['franchise'] > 0 && geodir_franchise_check((int) $gd_post['franchise'])) {
|
|
| 4501 | + geodir_save_post_meta($saved_post_id, 'franchise', (int) $gd_post['franchise']); |
|
| 4502 | 4502 | } |
| 4503 | 4503 | } |
| 4504 | 4504 | } |
| 4505 | 4505 | |
| 4506 | 4506 | if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
|
| 4507 | - $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) ); |
|
| 4507 | + $save_post['post_category'] = array_unique(array_map('intval', $save_post['post_category']));
|
|
| 4508 | 4508 | if ($default_category_id) {
|
| 4509 | 4509 | $save_post['post_default_category'] = $default_category_id; |
| 4510 | 4510 | $gd_post['default_category'] = $default_category_id; |
| 4511 | 4511 | } |
| 4512 | 4512 | $gd_post[$cat_taxonomy] = $save_post['post_category']; |
| 4513 | 4513 | } |
| 4514 | - $xtimings['###7'] = microtime(true)-$xstart; |
|
| 4514 | + $xtimings['###7'] = microtime(true) - $xstart; |
|
| 4515 | 4515 | // Save post info |
| 4516 | - geodir_save_post_info( $saved_post_id, $gd_post ); |
|
| 4517 | - $xtimings['###8'] = microtime(true)-$xstart; |
|
| 4516 | + geodir_save_post_info($saved_post_id, $gd_post); |
|
| 4517 | + $xtimings['###8'] = microtime(true) - $xstart; |
|
| 4518 | 4518 | // post taxonomies |
| 4519 | - if ( !empty( $save_post['post_category'] ) ) {
|
|
| 4520 | - wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy ); |
|
| 4519 | + if (!empty($save_post['post_category'])) {
|
|
| 4520 | + wp_set_object_terms($saved_post_id, $save_post['post_category'], $cat_taxonomy); |
|
| 4521 | 4521 | |
| 4522 | - $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : ''; |
|
| 4522 | + $post_default_category = isset($save_post['post_default_category']) ? $save_post['post_default_category'] : ''; |
|
| 4523 | 4523 | if ($default_category_id) {
|
| 4524 | 4524 | $post_default_category = $default_category_id; |
| 4525 | 4525 | } |
| 4526 | 4526 | $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy); |
| 4527 | 4527 | $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
|
| 4528 | - $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
|
|
| 4528 | + $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']).',y:' : '';
|
|
| 4529 | 4529 | |
| 4530 | 4530 | if ($post_category_str != '' && $post_default_category) {
|
| 4531 | - $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str); |
|
| 4531 | + $post_category_str = str_replace($post_default_category.',y:', $post_default_category.',y,d:', $post_category_str); |
|
| 4532 | 4532 | } |
| 4533 | 4533 | |
| 4534 | 4534 | $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : ''; |
| 4535 | 4535 | |
| 4536 | - geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str ); |
|
| 4536 | + geodir_set_postcat_structure($saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str); |
|
| 4537 | 4537 | } |
| 4538 | - $xtimings['###8.1'] = microtime(true)-$xstart; |
|
| 4539 | - if ( !empty( $save_post['post_tags'] ) ) {
|
|
| 4540 | - wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy ); |
|
| 4538 | + $xtimings['###8.1'] = microtime(true) - $xstart; |
|
| 4539 | + if (!empty($save_post['post_tags'])) {
|
|
| 4540 | + wp_set_object_terms($saved_post_id, $save_post['post_tags'], $tags_taxonomy); |
|
| 4541 | 4541 | } |
| 4542 | - $xtimings['###9'] = microtime(true)-$xstart; |
|
| 4542 | + $xtimings['###9'] = microtime(true) - $xstart; |
|
| 4543 | 4543 | // Post images |
| 4544 | - if ( !empty( $post_images ) ) {
|
|
| 4544 | + if (!empty($post_images)) {
|
|
| 4545 | 4545 | $post_images = array_unique($post_images); |
| 4546 | 4546 | |
| 4547 | 4547 | $old_post_images_arr = array(); |
@@ -4549,65 +4549,65 @@ discard block |
||
| 4549 | 4549 | |
| 4550 | 4550 | $order = 1; |
| 4551 | 4551 | |
| 4552 | - $old_post_images = geodir_get_images( $saved_post_id ); |
|
| 4553 | - $xtimings['###9.1'] = microtime(true)-$xstart; |
|
| 4552 | + $old_post_images = geodir_get_images($saved_post_id); |
|
| 4553 | + $xtimings['###9.1'] = microtime(true) - $xstart; |
|
| 4554 | 4554 | if (!empty($old_post_images)) {
|
| 4555 | - foreach( $old_post_images as $old_post_image ) {
|
|
| 4555 | + foreach ($old_post_images as $old_post_image) {
|
|
| 4556 | 4556 | if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
|
| 4557 | 4557 | $old_post_images_arr[] = $old_post_image->file; |
| 4558 | 4558 | } |
| 4559 | 4559 | } |
| 4560 | 4560 | } |
| 4561 | 4561 | |
| 4562 | - foreach ( $post_images as $post_image ) {
|
|
| 4563 | - $image_name = basename( $post_image ); |
|
| 4562 | + foreach ($post_images as $post_image) {
|
|
| 4563 | + $image_name = basename($post_image); |
|
| 4564 | 4564 | $saved_post_images_arr[] = $image_name; |
| 4565 | 4565 | |
| 4566 | - if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
|
|
| 4566 | + if (!empty($old_post_images_arr) && in_array($image_name, $old_post_images_arr)) {
|
|
| 4567 | 4567 | continue; // Skip if image already exists. |
| 4568 | 4568 | } |
| 4569 | 4569 | |
| 4570 | - $image_name_parts = explode( '.', $image_name ); |
|
| 4571 | - array_pop( $image_name_parts ); |
|
| 4572 | - $proper_image_name = implode( '.', $image_name_parts ); |
|
| 4573 | - $xtimings['###9.2'] = microtime(true)-$xstart; |
|
| 4574 | - $arr_file_type = wp_check_filetype( $image_name ); |
|
| 4575 | - $xtimings['###9.3'] = microtime(true)-$xstart; |
|
| 4576 | - if ( !empty( $arr_file_type ) ) {
|
|
| 4570 | + $image_name_parts = explode('.', $image_name);
|
|
| 4571 | + array_pop($image_name_parts); |
|
| 4572 | + $proper_image_name = implode('.', $image_name_parts);
|
|
| 4573 | + $xtimings['###9.2'] = microtime(true) - $xstart; |
|
| 4574 | + $arr_file_type = wp_check_filetype($image_name); |
|
| 4575 | + $xtimings['###9.3'] = microtime(true) - $xstart; |
|
| 4576 | + if (!empty($arr_file_type)) {
|
|
| 4577 | 4577 | $uploaded_file_type = $arr_file_type['type']; |
| 4578 | 4578 | |
| 4579 | 4579 | $attachment = array(); |
| 4580 | 4580 | $attachment['post_id'] = $saved_post_id; |
| 4581 | 4581 | $attachment['title'] = $proper_image_name; |
| 4582 | 4582 | $attachment['content'] = ''; |
| 4583 | - $attachment['file'] = $uploads_subdir . '/' . $image_name; |
|
| 4583 | + $attachment['file'] = $uploads_subdir.'/'.$image_name; |
|
| 4584 | 4584 | $attachment['mime_type'] = $uploaded_file_type; |
| 4585 | 4585 | $attachment['menu_order'] = $order; |
| 4586 | 4586 | $attachment['is_featured'] = 0; |
| 4587 | 4587 | |
| 4588 | 4588 | $attachment_set = ''; |
| 4589 | - foreach ( $attachment as $key => $val ) {
|
|
| 4590 | - if ( $val != '' ) {
|
|
| 4591 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 4589 | + foreach ($attachment as $key => $val) {
|
|
| 4590 | + if ($val != '') {
|
|
| 4591 | + $attachment_set .= $key." = '".$val."', "; |
|
| 4592 | 4592 | } |
| 4593 | 4593 | } |
| 4594 | - $attachment_set = trim( $attachment_set, ", " ); |
|
| 4594 | + $attachment_set = trim($attachment_set, ", "); |
|
| 4595 | 4595 | |
| 4596 | 4596 | // Add new attachment |
| 4597 | - $xtimings['###9.4'] = microtime(true)-$xstart; |
|
| 4598 | - $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set ); |
|
| 4599 | - $xtimings['###9.5'] = microtime(true)-$xstart; |
|
| 4597 | + $xtimings['###9.4'] = microtime(true) - $xstart; |
|
| 4598 | + $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
|
|
| 4599 | + $xtimings['###9.5'] = microtime(true) - $xstart; |
|
| 4600 | 4600 | $order++; |
| 4601 | 4601 | } |
| 4602 | 4602 | } |
| 4603 | 4603 | |
| 4604 | - $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : '';
|
|
| 4604 | + $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/".implode("' AND file NOT LIKE '%/", $saved_post_images_arr)."' )" : '';
|
|
| 4605 | 4605 | // Remove previous attachment |
| 4606 | - $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql ); |
|
| 4607 | - $xtimings['###9.6'] = microtime(true)-$xstart; |
|
| 4608 | - if ( !empty( $saved_post_images_arr ) ) {
|
|
| 4606 | + $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = ".(int) $saved_post_id." ".$saved_post_images_sql);
|
|
| 4607 | + $xtimings['###9.6'] = microtime(true) - $xstart; |
|
| 4608 | + if (!empty($saved_post_images_arr)) {
|
|
| 4609 | 4609 | geodir_set_wp_featured_image($saved_post_id); |
| 4610 | - $xtimings['###9.7'] = microtime(true)-$xstart; |
|
| 4610 | + $xtimings['###9.7'] = microtime(true) - $xstart; |
|
| 4611 | 4611 | /* |
| 4612 | 4612 | $menu_order = 1; |
| 4613 | 4613 | |
@@ -4623,14 +4623,14 @@ discard block |
||
| 4623 | 4623 | }*/ |
| 4624 | 4624 | } |
| 4625 | 4625 | |
| 4626 | - if ( $order > 1 ) {
|
|
| 4626 | + if ($order > 1) {
|
|
| 4627 | 4627 | $images++; |
| 4628 | 4628 | } |
| 4629 | 4629 | } |
| 4630 | - $xtimings['###10'] = microtime(true)-$xstart; |
|
| 4630 | + $xtimings['###10'] = microtime(true) - $xstart; |
|
| 4631 | 4631 | /** This action is documented in geodirectory-functions/post-functions.php */ |
| 4632 | - do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post ); |
|
| 4633 | - $xtimings['###11'] = microtime(true)-$xstart; |
|
| 4632 | + do_action('geodir_after_save_listing', $saved_post_id, $gd_post);
|
|
| 4633 | + $xtimings['###11'] = microtime(true) - $xstart; |
|
| 4634 | 4634 | if (isset($is_featured)) {
|
| 4635 | 4635 | geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured); |
| 4636 | 4636 | } |
@@ -4640,7 +4640,7 @@ discard block |
||
| 4640 | 4640 | if (isset($gd_post['expire_date'])) {
|
| 4641 | 4641 | geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']); |
| 4642 | 4642 | } |
| 4643 | - $xtimings['###12'] = microtime(true)-$xstart; |
|
| 4643 | + $xtimings['###12'] = microtime(true) - $xstart; |
|
| 4644 | 4644 | } |
| 4645 | 4645 | |
| 4646 | 4646 | // WPML |
@@ -4653,11 +4653,11 @@ discard block |
||
| 4653 | 4653 | } |
| 4654 | 4654 | |
| 4655 | 4655 | //undo some stuff to make the import quicker |
| 4656 | - wp_defer_term_counting( false ); |
|
| 4657 | - wp_defer_comment_counting( false ); |
|
| 4658 | - $wpdb->query( 'COMMIT;' ); |
|
| 4659 | - $wpdb->query( 'SET autocommit = 1;' ); |
|
| 4660 | - $xtimings['###13'] = microtime(true)-$xstart; |
|
| 4656 | + wp_defer_term_counting(false); |
|
| 4657 | + wp_defer_comment_counting(false); |
|
| 4658 | + $wpdb->query('COMMIT;');
|
|
| 4659 | + $wpdb->query('SET autocommit = 1;');
|
|
| 4660 | + $xtimings['###13'] = microtime(true) - $xstart; |
|
| 4661 | 4661 | $json = array(); |
| 4662 | 4662 | $json['processed'] = $processed_actual; |
| 4663 | 4663 | $json['created'] = $created; |
@@ -4666,13 +4666,13 @@ discard block |
||
| 4666 | 4666 | $json['invalid'] = $invalid; |
| 4667 | 4667 | $json['invalid_addr'] = $invalid_addr; |
| 4668 | 4668 | $json['images'] = $images; |
| 4669 | - $json['timing'] = microtime(true)-$xstart; |
|
| 4669 | + $json['timing'] = microtime(true) - $xstart; |
|
| 4670 | 4670 | $json['timings'] = $xtimings; |
| 4671 | 4671 | |
| 4672 | 4672 | |
| 4673 | - wp_send_json( $json ); |
|
| 4673 | + wp_send_json($json); |
|
| 4674 | 4674 | exit; |
| 4675 | - } else if ( $task == 'import_loc' ) {
|
|
| 4675 | + } else if ($task == 'import_loc') {
|
|
| 4676 | 4676 | global $gd_post_types; |
| 4677 | 4677 | $gd_post_types = $post_types; |
| 4678 | 4678 | |
@@ -4681,82 +4681,82 @@ discard block |
||
| 4681 | 4681 | |
| 4682 | 4682 | if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
| 4683 | 4683 | $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
| 4684 | - wp_send_json( $json ); |
|
| 4684 | + wp_send_json($json); |
|
| 4685 | 4685 | } |
| 4686 | 4686 | |
| 4687 | 4687 | $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
|
| 4688 | - $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' ); |
|
| 4688 | + $gd_error_location = __('Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory');
|
|
| 4689 | 4689 | for ($i = 1; $i <= $limit; $i++) {
|
| 4690 | 4690 | $index = $processed + $i; |
| 4691 | 4691 | |
| 4692 | 4692 | if (isset($file[$index])) {
|
| 4693 | 4693 | $row = $file[$index]; |
| 4694 | - $row = array_map( 'trim', $row ); |
|
| 4694 | + $row = array_map('trim', $row);
|
|
| 4695 | 4695 | $data = array(); |
| 4696 | 4696 | |
| 4697 | - foreach ($columns as $c => $column ) {
|
|
| 4697 | + foreach ($columns as $c => $column) {
|
|
| 4698 | 4698 | if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {
|
| 4699 | 4699 | $data[$column] = $row[$c]; |
| 4700 | 4700 | } |
| 4701 | 4701 | } |
| 4702 | 4702 | |
| 4703 | - if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
|
|
| 4703 | + if (empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude'])) {
|
|
| 4704 | 4704 | $invalid++; |
| 4705 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4705 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4706 | 4706 | continue; |
| 4707 | 4707 | } |
| 4708 | 4708 | |
| 4709 | 4709 | $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0; |
| 4710 | 4710 | |
| 4711 | - if ( $import_choice == 'update' ) {
|
|
| 4712 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4713 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4711 | + if ($import_choice == 'update') {
|
|
| 4712 | + if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {
|
|
| 4713 | + if ($location_id = geodir_location_update_city($data, true, $location)) {
|
|
| 4714 | 4714 | $updated++; |
| 4715 | 4715 | } else {
|
| 4716 | 4716 | $invalid++; |
| 4717 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4717 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4718 | 4718 | } |
| 4719 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4720 | - $data['location_id'] = (int)$location->location_id; |
|
| 4719 | + } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {
|
|
| 4720 | + $data['location_id'] = (int) $location->location_id; |
|
| 4721 | 4721 | |
| 4722 | - if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
|
|
| 4723 | - $data['location_id'] = (int)$location->location_id; |
|
| 4724 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
|
|
| 4725 | - $data['location_id'] = (int)$location->location_id; |
|
| 4726 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
|
|
| 4727 | - $data['location_id'] = (int)$location->location_id; |
|
| 4722 | + if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region']))) {
|
|
| 4723 | + $data['location_id'] = (int) $location->location_id; |
|
| 4724 | + } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'region' => $data['region']))) {
|
|
| 4725 | + $data['location_id'] = (int) $location->location_id; |
|
| 4726 | + } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country']))) {
|
|
| 4727 | + $data['location_id'] = (int) $location->location_id; |
|
| 4728 | 4728 | } |
| 4729 | 4729 | |
| 4730 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4730 | + if ($location_id = geodir_location_update_city($data, true, $location)) {
|
|
| 4731 | 4731 | $updated++; |
| 4732 | 4732 | } else {
|
| 4733 | 4733 | $invalid++; |
| 4734 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4734 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4735 | 4735 | } |
| 4736 | 4736 | } else {
|
| 4737 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4737 | + if ($location_id = geodir_location_insert_city($data, true)) {
|
|
| 4738 | 4738 | $created++; |
| 4739 | 4739 | } else {
|
| 4740 | 4740 | $invalid++; |
| 4741 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4741 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4742 | 4742 | } |
| 4743 | 4743 | } |
| 4744 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4745 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4744 | + } elseif ($import_choice == 'skip') {
|
|
| 4745 | + if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {
|
|
| 4746 | 4746 | $skipped++; |
| 4747 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4747 | + } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {
|
|
| 4748 | 4748 | $skipped++; |
| 4749 | 4749 | } else {
|
| 4750 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4750 | + if ($location_id = geodir_location_insert_city($data, true)) {
|
|
| 4751 | 4751 | $created++; |
| 4752 | 4752 | } else {
|
| 4753 | 4753 | $invalid++; |
| 4754 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4754 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4755 | 4755 | } |
| 4756 | 4756 | } |
| 4757 | 4757 | } else {
|
| 4758 | 4758 | $invalid++; |
| 4759 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4759 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4760 | 4760 | } |
| 4761 | 4761 | } |
| 4762 | 4762 | } |
@@ -4770,24 +4770,24 @@ discard block |
||
| 4770 | 4770 | $json['invalid'] = $invalid; |
| 4771 | 4771 | $json['images'] = $images; |
| 4772 | 4772 | |
| 4773 | - wp_send_json( $json ); |
|
| 4774 | - } else if ( $task == 'import_hood' ) {
|
|
| 4773 | + wp_send_json($json); |
|
| 4774 | + } else if ($task == 'import_hood') {
|
|
| 4775 | 4775 | if (!empty($file)) {
|
| 4776 | 4776 | $columns = isset($file[0]) ? $file[0] : NULL; |
| 4777 | 4777 | |
| 4778 | 4778 | if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
| 4779 | 4779 | $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
| 4780 | - wp_send_json( $json ); |
|
| 4780 | + wp_send_json($json); |
|
| 4781 | 4781 | } |
| 4782 | 4782 | |
| 4783 | 4783 | $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
|
| 4784 | - $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ); |
|
| 4784 | + $gd_error_hood = __('Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory');
|
|
| 4785 | 4785 | for ($i = 1; $i <= $limit; $i++) {
|
| 4786 | 4786 | $index = $processed + $i; |
| 4787 | 4787 | |
| 4788 | 4788 | if (isset($file[$index])) {
|
| 4789 | 4789 | $row = $file[$index]; |
| 4790 | - $row = array_map( 'trim', $row ); |
|
| 4790 | + $row = array_map('trim', $row);
|
|
| 4791 | 4791 | $data = array(); |
| 4792 | 4792 | |
| 4793 | 4793 | foreach ($columns as $c => $column) {
|
@@ -4798,20 +4798,20 @@ discard block |
||
| 4798 | 4798 | |
| 4799 | 4799 | if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
|
| 4800 | 4800 | $invalid++; |
| 4801 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4801 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4802 | 4802 | continue; |
| 4803 | 4803 | } |
| 4804 | 4804 | |
| 4805 | 4805 | $location_info = array(); |
| 4806 | - if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
|
|
| 4807 | - $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
|
|
| 4806 | + if (!empty($data['location_id']) && (int) $data['location_id'] > 0) {
|
|
| 4807 | + $location_info = geodir_get_location_by_id('', (int) $data['location_id']);
|
|
| 4808 | 4808 | } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
|
| 4809 | 4809 | $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
|
| 4810 | 4810 | } |
| 4811 | 4811 | |
| 4812 | 4812 | if (empty($location_info)) {
|
| 4813 | 4813 | $invalid++; |
| 4814 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4814 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4815 | 4815 | continue; |
| 4816 | 4816 | } |
| 4817 | 4817 | |
@@ -4826,35 +4826,35 @@ discard block |
||
| 4826 | 4826 | $hood_data['hood_longitude'] = $data['longitude']; |
| 4827 | 4827 | $hood_data['hood_location_id'] = $location_id; |
| 4828 | 4828 | |
| 4829 | - if ( $import_choice == 'update' ) {
|
|
| 4830 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4831 | - $hood_data['hood_id'] = (int)$data['neighbourhood_id']; |
|
| 4829 | + if ($import_choice == 'update') {
|
|
| 4830 | + if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {
|
|
| 4831 | + $hood_data['hood_id'] = (int) $data['neighbourhood_id']; |
|
| 4832 | 4832 | |
| 4833 | 4833 | if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
| 4834 | 4834 | $updated++; |
| 4835 | 4835 | } else {
|
| 4836 | 4836 | $invalid++; |
| 4837 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4837 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4838 | 4838 | } |
| 4839 | 4839 | } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
| 4840 | - $hood_data['hood_id'] = (int)$neighbourhood->hood_id; |
|
| 4840 | + $hood_data['hood_id'] = (int) $neighbourhood->hood_id; |
|
| 4841 | 4841 | |
| 4842 | 4842 | if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
| 4843 | 4843 | $updated++; |
| 4844 | 4844 | } else {
|
| 4845 | 4845 | $invalid++; |
| 4846 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4846 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4847 | 4847 | } |
| 4848 | 4848 | } else {
|
| 4849 | 4849 | if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
| 4850 | 4850 | $created++; |
| 4851 | 4851 | } else {
|
| 4852 | 4852 | $invalid++; |
| 4853 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4853 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4854 | 4854 | } |
| 4855 | 4855 | } |
| 4856 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4857 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4856 | + } elseif ($import_choice == 'skip') {
|
|
| 4857 | + if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {
|
|
| 4858 | 4858 | $skipped++; |
| 4859 | 4859 | } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
| 4860 | 4860 | $skipped++; |
@@ -4864,12 +4864,12 @@ discard block |
||
| 4864 | 4864 | $created++; |
| 4865 | 4865 | } else {
|
| 4866 | 4866 | $invalid++; |
| 4867 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4867 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4868 | 4868 | } |
| 4869 | 4869 | } |
| 4870 | 4870 | } else {
|
| 4871 | 4871 | $invalid++; |
| 4872 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4872 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4873 | 4873 | } |
| 4874 | 4874 | } |
| 4875 | 4875 | } |
@@ -4883,7 +4883,7 @@ discard block |
||
| 4883 | 4883 | $json['invalid'] = $invalid; |
| 4884 | 4884 | $json['images'] = $images; |
| 4885 | 4885 | |
| 4886 | - wp_send_json( $json ); |
|
| 4886 | + wp_send_json($json); |
|
| 4887 | 4887 | } |
| 4888 | 4888 | } |
| 4889 | 4889 | break; |
@@ -4927,29 +4927,29 @@ discard block |
||
| 4927 | 4927 | * } |
| 4928 | 4928 | * @return int|bool Term id when success, false when fail. |
| 4929 | 4929 | */ |
| 4930 | -function geodir_imex_insert_term( $taxonomy, $term_data ) {
|
|
| 4931 | - if ( empty( $taxonomy ) || empty( $term_data ) ) {
|
|
| 4930 | +function geodir_imex_insert_term($taxonomy, $term_data) {
|
|
| 4931 | + if (empty($taxonomy) || empty($term_data)) {
|
|
| 4932 | 4932 | return false; |
| 4933 | 4933 | } |
| 4934 | 4934 | |
| 4935 | - $term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : ''; |
|
| 4935 | + $term = isset($term_data['name']) && !empty($term_data['name']) ? $term_data['name'] : ''; |
|
| 4936 | 4936 | $args = array(); |
| 4937 | - $args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : ''; |
|
| 4938 | - $args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : ''; |
|
| 4939 | - $args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : ''; |
|
| 4937 | + $args['description'] = isset($term_data['description']) ? $term_data['description'] : ''; |
|
| 4938 | + $args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : ''; |
|
| 4939 | + $args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : ''; |
|
| 4940 | 4940 | |
| 4941 | - if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {
|
|
| 4942 | - $term_args = array_merge( $term_data, $args ); |
|
| 4943 | - $defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => ''); |
|
| 4944 | - $term_args = wp_parse_args( $term_args, $defaults ); |
|
| 4945 | - $term_args = sanitize_term( $term_args, $taxonomy, 'db' ); |
|
| 4946 | - $args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args ); |
|
| 4941 | + if ((!empty($args['slug']) && term_exists($args['slug'], $taxonomy)) || empty($args['slug'])) {
|
|
| 4942 | + $term_args = array_merge($term_data, $args); |
|
| 4943 | + $defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
|
|
| 4944 | + $term_args = wp_parse_args($term_args, $defaults); |
|
| 4945 | + $term_args = sanitize_term($term_args, $taxonomy, 'db'); |
|
| 4946 | + $args['slug'] = wp_unique_term_slug($args['slug'], (object) $term_args); |
|
| 4947 | 4947 | } |
| 4948 | 4948 | |
| 4949 | - if( !empty( $term ) ) {
|
|
| 4950 | - $result = wp_insert_term( $term, $taxonomy, $args ); |
|
| 4951 | - if( !is_wp_error( $result ) ) {
|
|
| 4952 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4949 | + if (!empty($term)) {
|
|
| 4950 | + $result = wp_insert_term($term, $taxonomy, $args); |
|
| 4951 | + if (!is_wp_error($result)) {
|
|
| 4952 | + return isset($result['term_id']) ? $result['term_id'] : 0; |
|
| 4953 | 4953 | } |
| 4954 | 4954 | } |
| 4955 | 4955 | |
@@ -4979,36 +4979,36 @@ discard block |
||
| 4979 | 4979 | * } |
| 4980 | 4980 | * @return int|bool Term id when success, false when fail. |
| 4981 | 4981 | */ |
| 4982 | -function geodir_imex_update_term( $taxonomy, $term_data ) {
|
|
| 4983 | - if ( empty( $taxonomy ) || empty( $term_data ) ) {
|
|
| 4982 | +function geodir_imex_update_term($taxonomy, $term_data) {
|
|
| 4983 | + if (empty($taxonomy) || empty($term_data)) {
|
|
| 4984 | 4984 | return false; |
| 4985 | 4985 | } |
| 4986 | 4986 | |
| 4987 | - $term_id = isset( $term_data['term_id'] ) && !empty( $term_data['term_id'] ) ? $term_data['term_id'] : 0; |
|
| 4987 | + $term_id = isset($term_data['term_id']) && !empty($term_data['term_id']) ? $term_data['term_id'] : 0; |
|
| 4988 | 4988 | |
| 4989 | 4989 | $args = array(); |
| 4990 | - $args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : ''; |
|
| 4991 | - $args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : ''; |
|
| 4992 | - $args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : ''; |
|
| 4990 | + $args['description'] = isset($term_data['description']) ? $term_data['description'] : ''; |
|
| 4991 | + $args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : ''; |
|
| 4992 | + $args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : ''; |
|
| 4993 | 4993 | |
| 4994 | - if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {
|
|
| 4994 | + if ($term_id > 0 && $term_info = (array) get_term($term_id, $taxonomy)) {
|
|
| 4995 | 4995 | $term_data['term_id'] = $term_info['term_id']; |
| 4996 | 4996 | |
| 4997 | - $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
|
| 4997 | + $result = wp_update_term($term_data['term_id'], $taxonomy, $term_data); |
|
| 4998 | 4998 | |
| 4999 | - if( !is_wp_error( $result ) ) {
|
|
| 5000 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4999 | + if (!is_wp_error($result)) {
|
|
| 5000 | + return isset($result['term_id']) ? $result['term_id'] : 0; |
|
| 5001 | 5001 | } |
| 5002 | - } else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 5002 | + } else if ($term_data['slug'] != '' && $term_info = (array) term_exists($term_data['slug'], $taxonomy)) {
|
|
| 5003 | 5003 | $term_data['term_id'] = $term_info['term_id']; |
| 5004 | 5004 | |
| 5005 | - $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
|
| 5005 | + $result = wp_update_term($term_data['term_id'], $taxonomy, $term_data); |
|
| 5006 | 5006 | |
| 5007 | - if( !is_wp_error( $result ) ) {
|
|
| 5008 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 5007 | + if (!is_wp_error($result)) {
|
|
| 5008 | + return isset($result['term_id']) ? $result['term_id'] : 0; |
|
| 5009 | 5009 | } |
| 5010 | 5010 | } else {
|
| 5011 | - return geodir_imex_insert_term( $taxonomy, $term_data ); |
|
| 5011 | + return geodir_imex_insert_term($taxonomy, $term_data); |
|
| 5012 | 5012 | } |
| 5013 | 5013 | |
| 5014 | 5014 | return false; |
@@ -5027,20 +5027,20 @@ discard block |
||
| 5027 | 5027 | * @param string $post_type Post type. |
| 5028 | 5028 | * @return int Posts count. |
| 5029 | 5029 | */ |
| 5030 | -function geodir_get_posts_count( $post_type ) {
|
|
| 5030 | +function geodir_get_posts_count($post_type) {
|
|
| 5031 | 5031 | global $wpdb, $plugin_prefix; |
| 5032 | 5032 | |
| 5033 | - if ( !post_type_exists( $post_type ) ) {
|
|
| 5033 | + if (!post_type_exists($post_type)) {
|
|
| 5034 | 5034 | return 0; |
| 5035 | 5035 | } |
| 5036 | 5036 | |
| 5037 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5037 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 5038 | 5038 | |
| 5039 | 5039 | // Skip listing with statuses trash, auto-draft etc... |
| 5040 | 5040 | $skip_statuses = geodir_imex_export_skip_statuses(); |
| 5041 | 5041 | $where_statuses = ''; |
| 5042 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5043 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5042 | + if (!empty($skip_statuses) && is_array($skip_statuses)) {
|
|
| 5043 | + $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
|
|
| 5044 | 5044 | } |
| 5045 | 5045 | |
| 5046 | 5046 | /** |
@@ -5051,11 +5051,11 @@ discard block |
||
| 5051 | 5051 | * |
| 5052 | 5052 | * @param string $where SQL where clause part. |
| 5053 | 5053 | */ |
| 5054 | - $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type ); |
|
| 5054 | + $where_statuses = apply_filters('geodir_get_posts_count', $where_statuses, $post_type);
|
|
| 5055 | 5055 | |
| 5056 | - $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );
|
|
| 5056 | + $query = $wpdb->prepare("SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses, $post_type);
|
|
| 5057 | 5057 | |
| 5058 | - $posts_count = (int)$wpdb->get_var( $query ); |
|
| 5058 | + $posts_count = (int) $wpdb->get_var($query); |
|
| 5059 | 5059 | |
| 5060 | 5060 | /** |
| 5061 | 5061 | * Modify returned post counts for the current post type. |
@@ -5066,7 +5066,7 @@ discard block |
||
| 5066 | 5066 | * @param int $posts_count Post counts. |
| 5067 | 5067 | * @param string $post_type Post type. |
| 5068 | 5068 | */ |
| 5069 | - $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type ); |
|
| 5069 | + $posts_count = apply_filters('geodir_imex_count_posts', $posts_count, $post_type);
|
|
| 5070 | 5070 | |
| 5071 | 5071 | return $posts_count; |
| 5072 | 5072 | } |
@@ -5088,19 +5088,19 @@ discard block |
||
| 5088 | 5088 | * @param int $page_no Page number. Default 0. |
| 5089 | 5089 | * @return array Array of posts data. |
| 5090 | 5090 | */ |
| 5091 | -function geodir_imex_get_posts( $post_type, $per_page = 0, $page_no = 0 ) {
|
|
| 5091 | +function geodir_imex_get_posts($post_type, $per_page = 0, $page_no = 0) {
|
|
| 5092 | 5092 | global $wp_filesystem; |
| 5093 | 5093 | |
| 5094 | - $posts = geodir_get_export_posts( $post_type, $per_page, $page_no ); |
|
| 5094 | + $posts = geodir_get_export_posts($post_type, $per_page, $page_no); |
|
| 5095 | 5095 | |
| 5096 | 5096 | $csv_rows = array(); |
| 5097 | 5097 | |
| 5098 | - if ( !empty( $posts ) ) {
|
|
| 5099 | - $is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' ); |
|
| 5098 | + if (!empty($posts)) {
|
|
| 5099 | + $is_payment_plugin = is_plugin_active('geodir_payment_manager/geodir_payment_manager.php');
|
|
| 5100 | 5100 | $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
| 5101 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 5101 | + $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
|
|
| 5102 | 5102 | $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;
|
| 5103 | - $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 5103 | + $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 5104 | 5104 | $is_events_active = function_exists('geodir_event_plugin_activated') ? true : false;
|
| 5105 | 5105 | $is_custom_posts_active = function_exists('geodir_custom_post_type_plugin_activated') ? true : false;
|
| 5106 | 5106 | |
@@ -5115,7 +5115,7 @@ discard block |
||
| 5115 | 5115 | $csv_row[] = 'default_category'; |
| 5116 | 5116 | $csv_row[] = 'post_tags'; |
| 5117 | 5117 | $csv_row[] = 'post_type'; |
| 5118 | - if ( $post_type == 'gd_event' ) {
|
|
| 5118 | + if ($post_type == 'gd_event') {
|
|
| 5119 | 5119 | $csv_row[] = 'event_date'; |
| 5120 | 5120 | $csv_row[] = 'event_enddate'; |
| 5121 | 5121 | $csv_row[] = 'starttime'; |
@@ -5167,25 +5167,25 @@ discard block |
||
| 5167 | 5167 | $csv_row[] = 'geodir_video'; |
| 5168 | 5168 | $csv_row[] = 'geodir_special_offers'; |
| 5169 | 5169 | if ($is_events_active || $is_custom_posts_active) {
|
| 5170 | - $csv_row[] = !empty($post_ypes[$post_type]['linkable_to']) ? 'linked_' . $post_ypes[$post_type]['linkable_to'] . '_ID' : 'linked_cpt_ID'; |
|
| 5170 | + $csv_row[] = !empty($post_ypes[$post_type]['linkable_to']) ? 'linked_'.$post_ypes[$post_type]['linkable_to'].'_ID' : 'linked_cpt_ID'; |
|
| 5171 | 5171 | } |
| 5172 | 5172 | // WPML |
| 5173 | - $is_wpml = geodir_wpml_is_post_type_translated( $post_type ); |
|
| 5173 | + $is_wpml = geodir_wpml_is_post_type_translated($post_type); |
|
| 5174 | 5174 | if ($is_wpml) {
|
| 5175 | 5175 | $csv_row[] = 'language'; |
| 5176 | 5176 | $csv_row[] = 'original_post_id'; |
| 5177 | 5177 | } |
| 5178 | 5178 | // WPML |
| 5179 | 5179 | |
| 5180 | - $custom_fields = geodir_imex_get_custom_fields( $post_type ); |
|
| 5181 | - if ( !empty( $custom_fields ) ) {
|
|
| 5182 | - foreach ( $custom_fields as $custom_field ) {
|
|
| 5180 | + $custom_fields = geodir_imex_get_custom_fields($post_type); |
|
| 5181 | + if (!empty($custom_fields)) {
|
|
| 5182 | + foreach ($custom_fields as $custom_field) {
|
|
| 5183 | 5183 | $csv_row[] = $custom_field->htmlvar_name; |
| 5184 | 5184 | } |
| 5185 | 5185 | } |
| 5186 | 5186 | |
| 5187 | 5187 | // Export franchise fields |
| 5188 | - $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 5188 | + $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;
|
|
| 5189 | 5189 | if ($is_franchise_active) {
|
| 5190 | 5190 | $csv_row[] = 'gd_is_franchise'; |
| 5191 | 5191 | $csv_row[] = 'gd_franchise_lock'; |
@@ -5206,28 +5206,28 @@ discard block |
||
| 5206 | 5206 | $csv_rows[] = $csv_row; |
| 5207 | 5207 | |
| 5208 | 5208 | $images_count = 5; |
| 5209 | - $xx=0; |
|
| 5210 | - foreach ( $posts as $post ) {$xx++;
|
|
| 5209 | + $xx = 0; |
|
| 5210 | + foreach ($posts as $post) {$xx++;
|
|
| 5211 | 5211 | $post_id = $post['ID']; |
| 5212 | 5212 | |
| 5213 | - $gd_post_info = geodir_get_post_info( $post_id ); |
|
| 5214 | - $post_info = (array)$gd_post_info; |
|
| 5213 | + $gd_post_info = geodir_get_post_info($post_id); |
|
| 5214 | + $post_info = (array) $gd_post_info; |
|
| 5215 | 5215 | |
| 5216 | - $taxonomy_category = $post_type . 'category'; |
|
| 5217 | - $taxonomy_tags = $post_type . '_tags'; |
|
| 5216 | + $taxonomy_category = $post_type.'category'; |
|
| 5217 | + $taxonomy_tags = $post_type.'_tags'; |
|
| 5218 | 5218 | |
| 5219 | 5219 | $post_category = ''; |
| 5220 | 5220 | $default_category_id = $gd_post_info->default_category; |
| 5221 | 5221 | $default_category = ''; |
| 5222 | 5222 | $post_tags = ''; |
| 5223 | - $terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) ); |
|
| 5223 | + $terms = wp_get_post_terms($post_id, array($taxonomy_category, $taxonomy_tags)); |
|
| 5224 | 5224 | |
| 5225 | - if ( !empty( $terms ) && !is_wp_error( $terms ) ) {
|
|
| 5225 | + if (!empty($terms) && !is_wp_error($terms)) {
|
|
| 5226 | 5226 | $post_category = array(); |
| 5227 | 5227 | $post_tags = array(); |
| 5228 | 5228 | |
| 5229 | - foreach ( $terms as $term ) {
|
|
| 5230 | - if ( $term->taxonomy == $taxonomy_category ) {
|
|
| 5229 | + foreach ($terms as $term) {
|
|
| 5230 | + if ($term->taxonomy == $taxonomy_category) {
|
|
| 5231 | 5231 | $post_category[] = $term->name; |
| 5232 | 5232 | |
| 5233 | 5233 | if ($default_category_id == $term->term_id) {
|
@@ -5235,7 +5235,7 @@ discard block |
||
| 5235 | 5235 | } |
| 5236 | 5236 | } |
| 5237 | 5237 | |
| 5238 | - if ( $term->taxonomy == $taxonomy_tags ) {
|
|
| 5238 | + if ($term->taxonomy == $taxonomy_tags) {
|
|
| 5239 | 5239 | $post_tags[] = $term->name; |
| 5240 | 5240 | } |
| 5241 | 5241 | } |
@@ -5243,47 +5243,47 @@ discard block |
||
| 5243 | 5243 | if (empty($default_category) && !empty($post_category)) {
|
| 5244 | 5244 | $default_category = $post_category[0]; // Set first one as default category. |
| 5245 | 5245 | } |
| 5246 | - $post_category = !empty( $post_category ) ? implode( ',', $post_category ) : ''; |
|
| 5247 | - $post_tags = !empty( $post_tags ) ? implode( ',', $post_tags ) : ''; |
|
| 5246 | + $post_category = !empty($post_category) ? implode(',', $post_category) : '';
|
|
| 5247 | + $post_tags = !empty($post_tags) ? implode(',', $post_tags) : '';
|
|
| 5248 | 5248 | } |
| 5249 | 5249 | |
| 5250 | 5250 | // Franchise data |
| 5251 | - if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {
|
|
| 5251 | + if ($is_franchise_active && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 && geodir_franchise_check((int) $post_info['franchise'])) {
|
|
| 5252 | 5252 | $franchise_id = $post_info['franchise']; |
| 5253 | 5253 | $gd_franchise_info = geodir_get_post_info($franchise_id); |
| 5254 | 5254 | |
| 5255 | 5255 | if (geodir_franchise_pkg_is_active($gd_franchise_info)) {
|
| 5256 | - $franchise_info = (array)$gd_franchise_info; |
|
| 5256 | + $franchise_info = (array) $gd_franchise_info; |
|
| 5257 | 5257 | $locked_fields = geodir_franchise_get_locked_fields($franchise_id, true); |
| 5258 | 5258 | |
| 5259 | 5259 | if (!empty($locked_fields)) {
|
| 5260 | - foreach( $locked_fields as $locked_field) {
|
|
| 5260 | + foreach ($locked_fields as $locked_field) {
|
|
| 5261 | 5261 | if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {
|
| 5262 | 5262 | $post_info[$locked_field] = $franchise_info[$locked_field]; |
| 5263 | 5263 | } |
| 5264 | 5264 | |
| 5265 | 5265 | if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {
|
| 5266 | - $franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) ); |
|
| 5266 | + $franchise_terms = wp_get_post_terms($franchise_id, array($taxonomy_category, $taxonomy_tags)); |
|
| 5267 | 5267 | |
| 5268 | - if ( !empty( $franchise_terms ) && !is_wp_error( $franchise_terms ) ) {
|
|
| 5268 | + if (!empty($franchise_terms) && !is_wp_error($franchise_terms)) {
|
|
| 5269 | 5269 | $franchise_post_category = array(); |
| 5270 | 5270 | $franchise_post_tags = array(); |
| 5271 | 5271 | |
| 5272 | - foreach ( $franchise_terms as $franchise_term ) {
|
|
| 5273 | - if ( $franchise_term->taxonomy == $taxonomy_category ) {
|
|
| 5272 | + foreach ($franchise_terms as $franchise_term) {
|
|
| 5273 | + if ($franchise_term->taxonomy == $taxonomy_category) {
|
|
| 5274 | 5274 | $franchise_post_category[] = $franchise_term->name; |
| 5275 | 5275 | } |
| 5276 | 5276 | |
| 5277 | - if ( $franchise_term->taxonomy == $taxonomy_tags ) {
|
|
| 5277 | + if ($franchise_term->taxonomy == $taxonomy_tags) {
|
|
| 5278 | 5278 | $franchise_post_tags[] = $franchise_term->name; |
| 5279 | 5279 | } |
| 5280 | 5280 | } |
| 5281 | 5281 | |
| 5282 | 5282 | if (in_array($taxonomy_category, $locked_fields)) {
|
| 5283 | - $post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : ''; |
|
| 5283 | + $post_category = !empty($franchise_post_category) ? implode(',', $franchise_post_category) : '';
|
|
| 5284 | 5284 | } |
| 5285 | 5285 | if (in_array('post_tags', $locked_fields)) {
|
| 5286 | - $post_tags = !empty( $franchise_post_tags ) ? implode( ',', $franchise_post_tags ) : ''; |
|
| 5286 | + $post_tags = !empty($franchise_post_tags) ? implode(',', $franchise_post_tags) : '';
|
|
| 5287 | 5287 | } |
| 5288 | 5288 | } |
| 5289 | 5289 | } |
@@ -5292,18 +5292,18 @@ discard block |
||
| 5292 | 5292 | } |
| 5293 | 5293 | } |
| 5294 | 5294 | |
| 5295 | - $post_images = geodir_get_images( $post_id ); |
|
| 5295 | + $post_images = geodir_get_images($post_id); |
|
| 5296 | 5296 | $current_images = array(); |
| 5297 | - if ( !empty( $post_images ) ) {
|
|
| 5298 | - foreach ( $post_images as $post_image ) {
|
|
| 5299 | - $post_image = (array)$post_image; |
|
| 5300 | - $image = !empty( $post_image ) && isset( $post_image['path'] ) && $wp_filesystem->is_file( $post_image['path'] ) && $wp_filesystem->exists( $post_image['path'] ) ? $post_image['src'] : ''; |
|
| 5301 | - if ( $image ) {
|
|
| 5297 | + if (!empty($post_images)) {
|
|
| 5298 | + foreach ($post_images as $post_image) {
|
|
| 5299 | + $post_image = (array) $post_image; |
|
| 5300 | + $image = !empty($post_image) && isset($post_image['path']) && $wp_filesystem->is_file($post_image['path']) && $wp_filesystem->exists($post_image['path']) ? $post_image['src'] : ''; |
|
| 5301 | + if ($image) {
|
|
| 5302 | 5302 | $current_images[] = $image; |
| 5303 | 5303 | } |
| 5304 | 5304 | } |
| 5305 | 5305 | |
| 5306 | - $images_count = max( $images_count, count( $current_images ) ); |
|
| 5306 | + $images_count = max($images_count, count($current_images)); |
|
| 5307 | 5307 | } |
| 5308 | 5308 | |
| 5309 | 5309 | $csv_row = array(); |
@@ -5315,7 +5315,7 @@ discard block |
||
| 5315 | 5315 | $csv_row[] = $default_category; // default_category |
| 5316 | 5316 | $csv_row[] = $post_tags; // post_tags |
| 5317 | 5317 | $csv_row[] = $post_type; // post_type |
| 5318 | - if ( $post_type == 'gd_event' ) {
|
|
| 5318 | + if ($post_type == 'gd_event') {
|
|
| 5319 | 5319 | $event_data = geodir_imex_get_event_data($post, $gd_post_info); |
| 5320 | 5320 | $csv_row[] = $event_data['event_date']; // event_date |
| 5321 | 5321 | $csv_row[] = $event_data['event_enddate']; // enddate |
@@ -5336,12 +5336,12 @@ discard block |
||
| 5336 | 5336 | $csv_row[] = $event_data['recurring_end_date']; // repeat_end |
| 5337 | 5337 | } |
| 5338 | 5338 | $csv_row[] = $post_info['post_status']; // post_status |
| 5339 | - $csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured |
|
| 5339 | + $csv_row[] = (int) $post_info['is_featured'] == 1 ? 1 : ''; // is_featured |
|
| 5340 | 5340 | if ($is_claim_active) {
|
| 5341 | - $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5341 | + $csv_row[] = !empty($post_info['claimed']) && (int) $post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5342 | 5342 | } |
| 5343 | 5343 | if ($is_payment_plugin) {
|
| 5344 | - $csv_row[] = (int)$post_info['package_id']; // package_id |
|
| 5344 | + $csv_row[] = (int) $post_info['package_id']; // package_id |
|
| 5345 | 5345 | $csv_row[] = $post_info['alive_days'] !== '' ? absint($post_info['alive_days']) : ''; // alive_days |
| 5346 | 5346 | $csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date
|
| 5347 | 5347 | } |
@@ -5377,18 +5377,18 @@ discard block |
||
| 5377 | 5377 | $csv_row[] = stripslashes($post_info['geodir_video']); // geodir_video |
| 5378 | 5378 | $csv_row[] = stripslashes($post_info['geodir_special_offers']); // geodir_special_offers |
| 5379 | 5379 | if ($is_events_active || $is_custom_posts_active) {
|
| 5380 | - $csv_row[] = !empty($post_info['geodir_link_business']) ? (int)$post_info['geodir_link_business'] : ''; // linked business |
|
| 5380 | + $csv_row[] = !empty($post_info['geodir_link_business']) ? (int) $post_info['geodir_link_business'] : ''; // linked business |
|
| 5381 | 5381 | } |
| 5382 | 5382 | // WPML |
| 5383 | 5383 | if ($is_wpml) {
|
| 5384 | - $csv_row[] = geodir_get_language_for_element( $post_id, 'post_' . $post_type ); |
|
| 5385 | - $csv_row[] = geodir_imex_original_post_id( $post_id, 'post_' . $post_type ); |
|
| 5384 | + $csv_row[] = geodir_get_language_for_element($post_id, 'post_'.$post_type); |
|
| 5385 | + $csv_row[] = geodir_imex_original_post_id($post_id, 'post_'.$post_type); |
|
| 5386 | 5386 | } |
| 5387 | 5387 | // WPML |
| 5388 | 5388 | |
| 5389 | - if ( !empty( $custom_fields ) ) {
|
|
| 5390 | - foreach ( $custom_fields as $custom_field ) {
|
|
| 5391 | - $csv_row[] = isset( $post_info[$custom_field->htmlvar_name] ) ? $post_info[$custom_field->htmlvar_name] : ''; |
|
| 5389 | + if (!empty($custom_fields)) {
|
|
| 5390 | + foreach ($custom_fields as $custom_field) {
|
|
| 5391 | + $csv_row[] = isset($post_info[$custom_field->htmlvar_name]) ? $post_info[$custom_field->htmlvar_name] : ''; |
|
| 5392 | 5392 | } |
| 5393 | 5393 | } |
| 5394 | 5394 | |
@@ -5399,15 +5399,15 @@ discard block |
||
| 5399 | 5399 | $franchise = ''; |
| 5400 | 5400 | |
| 5401 | 5401 | if (geodir_franchise_pkg_is_active($gd_post_info)) {
|
| 5402 | - $gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true ); |
|
| 5403 | - $locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : ''; |
|
| 5402 | + $gd_is_franchise = (int) get_post_meta($post_id, 'gd_is_franchise', true); |
|
| 5403 | + $locaked_fields = $gd_is_franchise ? get_post_meta($post_id, 'gd_franchise_lock', true) : ''; |
|
| 5404 | 5404 | $locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');
|
| 5405 | - $franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id |
|
| 5405 | + $franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 ? (int) $post_info['franchise'] : 0; // franchise id |
|
| 5406 | 5406 | } |
| 5407 | 5407 | |
| 5408 | - $csv_row[] = (int)$gd_is_franchise; // gd_is_franchise |
|
| 5408 | + $csv_row[] = (int) $gd_is_franchise; // gd_is_franchise |
|
| 5409 | 5409 | $csv_row[] = $locaked_fields; // gd_franchise_lock fields |
| 5410 | - $csv_row[] = (int)$franchise; // franchise id |
|
| 5410 | + $csv_row[] = (int) $franchise; // franchise id |
|
| 5411 | 5411 | } |
| 5412 | 5412 | |
| 5413 | 5413 | /** |
@@ -5421,15 +5421,15 @@ discard block |
||
| 5421 | 5421 | */ |
| 5422 | 5422 | $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
|
| 5423 | 5423 | |
| 5424 | - for ( $c = 0; $c < $images_count; $c++ ) {
|
|
| 5425 | - $csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE |
|
| 5424 | + for ($c = 0; $c < $images_count; $c++) {
|
|
| 5425 | + $csv_row[] = isset($current_images[$c]) ? $current_images[$c] : ''; // IMAGE |
|
| 5426 | 5426 | } |
| 5427 | 5427 | |
| 5428 | 5428 | $csv_rows[] = $csv_row; |
| 5429 | 5429 | |
| 5430 | 5430 | } |
| 5431 | 5431 | |
| 5432 | - for ( $c = 0; $c < $images_count; $c++ ) {
|
|
| 5432 | + for ($c = 0; $c < $images_count; $c++) {
|
|
| 5433 | 5433 | $csv_rows[0][] = 'IMAGE'; |
| 5434 | 5434 | } |
| 5435 | 5435 | } |
@@ -5451,30 +5451,30 @@ discard block |
||
| 5451 | 5451 | * @param int $page_no Page number. Default 0. |
| 5452 | 5452 | * @return array Array of posts data. |
| 5453 | 5453 | */ |
| 5454 | -function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {
|
|
| 5454 | +function geodir_get_export_posts($post_type, $per_page = 0, $page_no = 0) {
|
|
| 5455 | 5455 | global $wpdb, $plugin_prefix; |
| 5456 | 5456 | |
| 5457 | - if ( ! post_type_exists( $post_type ) ) |
|
| 5457 | + if (!post_type_exists($post_type)) |
|
| 5458 | 5458 | return new stdClass; |
| 5459 | 5459 | |
| 5460 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5460 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 5461 | 5461 | |
| 5462 | 5462 | $limit = ''; |
| 5463 | - if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5464 | - $offset = ( $page_no - 1 ) * $per_page; |
|
| 5463 | + if ($per_page > 0 && $page_no > 0) {
|
|
| 5464 | + $offset = ($page_no - 1) * $per_page; |
|
| 5465 | 5465 | |
| 5466 | - if ( $offset > 0 ) {
|
|
| 5467 | - $limit = " LIMIT " . $offset . "," . $per_page; |
|
| 5466 | + if ($offset > 0) {
|
|
| 5467 | + $limit = " LIMIT ".$offset.",".$per_page; |
|
| 5468 | 5468 | } else {
|
| 5469 | - $limit = " LIMIT " . $per_page; |
|
| 5469 | + $limit = " LIMIT ".$per_page; |
|
| 5470 | 5470 | } |
| 5471 | 5471 | } |
| 5472 | 5472 | |
| 5473 | 5473 | // Skip listing with statuses trash, auto-draft etc... |
| 5474 | 5474 | $skip_statuses = geodir_imex_export_skip_statuses(); |
| 5475 | 5475 | $where_statuses = ''; |
| 5476 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5477 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5476 | + if (!empty($skip_statuses) && is_array($skip_statuses)) {
|
|
| 5477 | + $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
|
|
| 5478 | 5478 | } |
| 5479 | 5479 | |
| 5480 | 5480 | /** |
@@ -5485,9 +5485,9 @@ discard block |
||
| 5485 | 5485 | * |
| 5486 | 5486 | * @param string $where SQL where clause part. |
| 5487 | 5487 | */ |
| 5488 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5488 | + $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);
|
|
| 5489 | 5489 | |
| 5490 | - $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );
|
|
| 5490 | + $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." ORDER BY {$wpdb->posts}.ID ASC".$limit, $post_type);
|
|
| 5491 | 5491 | /** |
| 5492 | 5492 | * Modify returned posts SQL query for the current post type. |
| 5493 | 5493 | * |
@@ -5497,8 +5497,8 @@ discard block |
||
| 5497 | 5497 | * @param int $query The SQL query. |
| 5498 | 5498 | * @param string $post_type Post type. |
| 5499 | 5499 | */ |
| 5500 | - $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type ); |
|
| 5501 | - $results = (array)$wpdb->get_results( $query, ARRAY_A ); |
|
| 5500 | + $query = apply_filters('geodir_imex_export_posts_query', $query, $post_type);
|
|
| 5501 | + $results = (array) $wpdb->get_results($query, ARRAY_A); |
|
| 5502 | 5502 | |
| 5503 | 5503 | /** |
| 5504 | 5504 | * Modify returned post results for the current post type. |
@@ -5509,7 +5509,7 @@ discard block |
||
| 5509 | 5509 | * @param object $results An object containing all post ids. |
| 5510 | 5510 | * @param string $post_type Post type. |
| 5511 | 5511 | */ |
| 5512 | - return apply_filters( 'geodir_export_posts', $results, $post_type ); |
|
| 5512 | + return apply_filters('geodir_export_posts', $results, $post_type);
|
|
| 5513 | 5513 | } |
| 5514 | 5514 | |
| 5515 | 5515 | /** |
@@ -5527,24 +5527,24 @@ discard block |
||
| 5527 | 5527 | * @param string $post_type Post type. |
| 5528 | 5528 | * @return string The SQL query. |
| 5529 | 5529 | */ |
| 5530 | -function geodir_imex_get_events_query( $query, $post_type ) {
|
|
| 5531 | - if ( $post_type == 'gd_event' ) {
|
|
| 5530 | +function geodir_imex_get_events_query($query, $post_type) {
|
|
| 5531 | + if ($post_type == 'gd_event') {
|
|
| 5532 | 5532 | global $wpdb, $plugin_prefix; |
| 5533 | 5533 | |
| 5534 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5534 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 5535 | 5535 | $schedule_table = EVENT_SCHEDULE; |
| 5536 | 5536 | |
| 5537 | 5537 | // Skip listing with statuses trash, auto-draft etc... |
| 5538 | 5538 | $skip_statuses = geodir_imex_export_skip_statuses(); |
| 5539 | 5539 | $where_statuses = ''; |
| 5540 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5541 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5540 | + if (!empty($skip_statuses) && is_array($skip_statuses)) {
|
|
| 5541 | + $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
|
|
| 5542 | 5542 | } |
| 5543 | 5543 | |
| 5544 | 5544 | /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */ |
| 5545 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5545 | + $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);
|
|
| 5546 | 5546 | |
| 5547 | - $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );
|
|
| 5547 | + $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type);
|
|
| 5548 | 5548 | } |
| 5549 | 5549 | |
| 5550 | 5550 | return $query; |
@@ -5568,35 +5568,35 @@ discard block |
||
| 5568 | 5568 | * @param string $post_type Post type. |
| 5569 | 5569 | * @return int Total terms count. |
| 5570 | 5570 | */ |
| 5571 | -function geodir_get_terms_count( $post_type ) {
|
|
| 5572 | - $args = array( 'hide_empty' => 0 ); |
|
| 5571 | +function geodir_get_terms_count($post_type) {
|
|
| 5572 | + $args = array('hide_empty' => 0);
|
|
| 5573 | 5573 | |
| 5574 | - remove_all_filters( 'get_terms' ); |
|
| 5574 | + remove_all_filters('get_terms');
|
|
| 5575 | 5575 | |
| 5576 | - $taxonomy = $post_type . 'category'; |
|
| 5576 | + $taxonomy = $post_type.'category'; |
|
| 5577 | 5577 | |
| 5578 | 5578 | // WPML |
| 5579 | 5579 | $is_wpml = geodir_is_wpml(); |
| 5580 | 5580 | $active_lang = 'all'; |
| 5581 | - if ( $is_wpml ) {
|
|
| 5581 | + if ($is_wpml) {
|
|
| 5582 | 5582 | global $sitepress; |
| 5583 | 5583 | $active_lang = $sitepress->get_current_language(); |
| 5584 | 5584 | |
| 5585 | - if ( $active_lang != 'all' ) {
|
|
| 5586 | - $sitepress->switch_lang( 'all', true ); |
|
| 5585 | + if ($active_lang != 'all') {
|
|
| 5586 | + $sitepress->switch_lang('all', true);
|
|
| 5587 | 5587 | } |
| 5588 | 5588 | } |
| 5589 | 5589 | // WPML |
| 5590 | 5590 | |
| 5591 | - $count_terms = wp_count_terms( $taxonomy, $args ); |
|
| 5591 | + $count_terms = wp_count_terms($taxonomy, $args); |
|
| 5592 | 5592 | |
| 5593 | 5593 | // WPML |
| 5594 | - if ( $is_wpml && $active_lang !== 'all' ) {
|
|
| 5594 | + if ($is_wpml && $active_lang !== 'all') {
|
|
| 5595 | 5595 | global $sitepress; |
| 5596 | - $sitepress->switch_lang( $active_lang, true ); |
|
| 5596 | + $sitepress->switch_lang($active_lang, true); |
|
| 5597 | 5597 | } |
| 5598 | 5598 | // WPML |
| 5599 | - $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0; |
|
| 5599 | + $count_terms = !is_wp_error($count_terms) ? $count_terms : 0; |
|
| 5600 | 5600 | |
| 5601 | 5601 | return $count_terms; |
| 5602 | 5602 | } |
@@ -5613,23 +5613,23 @@ discard block |
||
| 5613 | 5613 | * @param int $page_no Page number. Default 0. |
| 5614 | 5614 | * @return array Array of terms data. |
| 5615 | 5615 | */ |
| 5616 | -function geodir_imex_get_terms( $post_type, $per_page = 0, $page_no = 0 ) {
|
|
| 5617 | - $args = array( 'hide_empty' => 0, 'orderby' => 'id' ); |
|
| 5616 | +function geodir_imex_get_terms($post_type, $per_page = 0, $page_no = 0) {
|
|
| 5617 | + $args = array('hide_empty' => 0, 'orderby' => 'id');
|
|
| 5618 | 5618 | |
| 5619 | - remove_all_filters( 'get_terms' ); |
|
| 5619 | + remove_all_filters('get_terms');
|
|
| 5620 | 5620 | |
| 5621 | - $taxonomy = $post_type . 'category'; |
|
| 5621 | + $taxonomy = $post_type.'category'; |
|
| 5622 | 5622 | |
| 5623 | - if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5624 | - $args['offset'] = ( $page_no - 1 ) * $per_page; |
|
| 5623 | + if ($per_page > 0 && $page_no > 0) {
|
|
| 5624 | + $args['offset'] = ($page_no - 1) * $per_page; |
|
| 5625 | 5625 | $args['number'] = $per_page; |
| 5626 | 5626 | } |
| 5627 | 5627 | |
| 5628 | - $terms = get_terms( $taxonomy, $args ); |
|
| 5628 | + $terms = get_terms($taxonomy, $args); |
|
| 5629 | 5629 | |
| 5630 | 5630 | $csv_rows = array(); |
| 5631 | 5631 | |
| 5632 | - if ( !empty( $terms ) ) {
|
|
| 5632 | + if (!empty($terms)) {
|
|
| 5633 | 5633 | $csv_row = array(); |
| 5634 | 5634 | $csv_row[] = 'cat_id'; |
| 5635 | 5635 | $csv_row[] = 'cat_name'; |
@@ -5638,7 +5638,7 @@ discard block |
||
| 5638 | 5638 | $csv_row[] = 'cat_parent'; |
| 5639 | 5639 | $csv_row[] = 'cat_schema'; |
| 5640 | 5640 | // WPML |
| 5641 | - $is_wpml = geodir_wpml_is_taxonomy_translated( $taxonomy ); |
|
| 5641 | + $is_wpml = geodir_wpml_is_taxonomy_translated($taxonomy); |
|
| 5642 | 5642 | if ($is_wpml) {
|
| 5643 | 5643 | $csv_row[] = 'cat_language'; |
| 5644 | 5644 | $csv_row[] = 'cat_id_original'; |
@@ -5651,16 +5651,16 @@ discard block |
||
| 5651 | 5651 | |
| 5652 | 5652 | $csv_rows[] = $csv_row; |
| 5653 | 5653 | |
| 5654 | - foreach ( $terms as $term ) {
|
|
| 5655 | - $cat_icon = geodir_get_tax_meta( $term->term_id, 'ct_cat_icon', false, $post_type ); |
|
| 5656 | - $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
| 5654 | + foreach ($terms as $term) {
|
|
| 5655 | + $cat_icon = geodir_get_tax_meta($term->term_id, 'ct_cat_icon', false, $post_type); |
|
| 5656 | + $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : ''; |
|
| 5657 | 5657 | |
| 5658 | - $cat_image = geodir_get_default_catimage( $term->term_id, $post_type ); |
|
| 5659 | - $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
| 5658 | + $cat_image = geodir_get_default_catimage($term->term_id, $post_type); |
|
| 5659 | + $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : ''; |
|
| 5660 | 5660 | |
| 5661 | 5661 | $cat_parent = ''; |
| 5662 | - if (isset($term->parent) && (int)$term->parent > 0 && term_exists((int)$term->parent, $taxonomy)) {
|
|
| 5663 | - $parent_term = (array)get_term_by( 'id', (int)$term->parent, $taxonomy ); |
|
| 5662 | + if (isset($term->parent) && (int) $term->parent > 0 && term_exists((int) $term->parent, $taxonomy)) {
|
|
| 5663 | + $parent_term = (array) get_term_by('id', (int) $term->parent, $taxonomy);
|
|
| 5664 | 5664 | $cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : ''; |
| 5665 | 5665 | } |
| 5666 | 5666 | |
@@ -5670,15 +5670,15 @@ discard block |
||
| 5670 | 5670 | $csv_row[] = $term->slug; |
| 5671 | 5671 | $csv_row[] = $post_type; |
| 5672 | 5672 | $csv_row[] = $cat_parent; |
| 5673 | - $csv_row[] = geodir_get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type ); |
|
| 5673 | + $csv_row[] = geodir_get_tax_meta($term->term_id, 'ct_cat_schema', false, $post_type); |
|
| 5674 | 5674 | // WPML |
| 5675 | 5675 | if ($is_wpml) {
|
| 5676 | - $csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5677 | - $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5676 | + $csv_row[] = geodir_get_language_for_element($term->term_id, 'tax_'.$taxonomy); |
|
| 5677 | + $csv_row[] = geodir_imex_original_post_id($term->term_id, 'tax_'.$taxonomy); |
|
| 5678 | 5678 | } |
| 5679 | 5679 | // WPML |
| 5680 | 5680 | $csv_row[] = $term->description; |
| 5681 | - $csv_row[] = geodir_get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type ); |
|
| 5681 | + $csv_row[] = geodir_get_tax_meta($term->term_id, 'ct_cat_top_desc', false, $post_type); |
|
| 5682 | 5682 | $csv_row[] = $cat_image; |
| 5683 | 5683 | $csv_row[] = $cat_icon; |
| 5684 | 5684 | |
@@ -5697,10 +5697,10 @@ discard block |
||
| 5697 | 5697 | * @param bool $relative True for relative path & False for absolute path. |
| 5698 | 5698 | * @return string Path to the cache directory. |
| 5699 | 5699 | */ |
| 5700 | -function geodir_path_import_export( $relative = true ) {
|
|
| 5700 | +function geodir_path_import_export($relative = true) {
|
|
| 5701 | 5701 | $upload_dir = wp_upload_dir(); |
| 5702 | 5702 | |
| 5703 | - return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache'; |
|
| 5703 | + return $relative ? $upload_dir['baseurl'].'/cache' : $upload_dir['basedir'].'/cache'; |
|
| 5704 | 5704 | } |
| 5705 | 5705 | |
| 5706 | 5706 | /** |
@@ -5716,8 +5716,8 @@ discard block |
||
| 5716 | 5716 | * @param bool $clear If true then it overwrite data otherwise add rows at the end of file. |
| 5717 | 5717 | * @return bool true if success otherwise false. |
| 5718 | 5718 | */ |
| 5719 | -function geodir_save_csv_data( $file_path, $csv_data = array(), $clear = true ) {
|
|
| 5720 | - if ( empty( $csv_data ) ) {
|
|
| 5719 | +function geodir_save_csv_data($file_path, $csv_data = array(), $clear = true) {
|
|
| 5720 | + if (empty($csv_data)) {
|
|
| 5721 | 5721 | return false; |
| 5722 | 5722 | } |
| 5723 | 5723 | |
@@ -5725,17 +5725,17 @@ discard block |
||
| 5725 | 5725 | |
| 5726 | 5726 | $mode = $clear ? 'w+' : 'a+'; |
| 5727 | 5727 | |
| 5728 | - if ( function_exists( 'fputcsv' ) ) {
|
|
| 5729 | - $file = fopen( $file_path, $mode ); |
|
| 5730 | - foreach( $csv_data as $csv_row ) {
|
|
| 5728 | + if (function_exists('fputcsv')) {
|
|
| 5729 | + $file = fopen($file_path, $mode); |
|
| 5730 | + foreach ($csv_data as $csv_row) {
|
|
| 5731 | 5731 | //$csv_row = array_map( 'utf8_decode', $csv_row ); |
| 5732 | - $write_successful = fputcsv( $file, $csv_row, ",", $enclosure = '"' ); |
|
| 5732 | + $write_successful = fputcsv($file, $csv_row, ",", $enclosure = '"'); |
|
| 5733 | 5733 | } |
| 5734 | - fclose( $file ); |
|
| 5734 | + fclose($file); |
|
| 5735 | 5735 | } else {
|
| 5736 | - foreach( $csv_data as $csv_row ) {
|
|
| 5736 | + foreach ($csv_data as $csv_row) {
|
|
| 5737 | 5737 | //$csv_row = array_map( 'utf8_decode', $csv_row ); |
| 5738 | - $wp_filesystem->put_contents( $file_path, $csv_row ); |
|
| 5738 | + $wp_filesystem->put_contents($file_path, $csv_row); |
|
| 5739 | 5739 | } |
| 5740 | 5740 | } |
| 5741 | 5741 | |
@@ -5753,14 +5753,14 @@ discard block |
||
| 5753 | 5753 | * @param string $file Full path to file. |
| 5754 | 5754 | * @return int No of file rows. |
| 5755 | 5755 | */ |
| 5756 | -function geodir_import_export_line_count( $file ) {
|
|
| 5756 | +function geodir_import_export_line_count($file) {
|
|
| 5757 | 5757 | global $wp_filesystem; |
| 5758 | 5758 | |
| 5759 | - if ( $wp_filesystem->is_file( $file ) && $wp_filesystem->exists( $file ) ) {
|
|
| 5760 | - $contents = $wp_filesystem->get_contents_array( $file ); |
|
| 5759 | + if ($wp_filesystem->is_file($file) && $wp_filesystem->exists($file)) {
|
|
| 5760 | + $contents = $wp_filesystem->get_contents_array($file); |
|
| 5761 | 5761 | |
| 5762 | - if ( !empty( $contents ) && is_array( $contents ) ) {
|
|
| 5763 | - return count( $contents ) - 1; |
|
| 5762 | + if (!empty($contents) && is_array($contents)) {
|
|
| 5763 | + return count($contents) - 1; |
|
| 5764 | 5764 | } |
| 5765 | 5765 | } |
| 5766 | 5766 | |
@@ -5777,11 +5777,11 @@ discard block |
||
| 5777 | 5777 | * @param string $post_type The post type. |
| 5778 | 5778 | * @return object Queried object. |
| 5779 | 5779 | */ |
| 5780 | -function geodir_imex_get_custom_fields( $post_type ) {
|
|
| 5780 | +function geodir_imex_get_custom_fields($post_type) {
|
|
| 5781 | 5781 | global $wpdb; |
| 5782 | 5782 | |
| 5783 | - $sql = $wpdb->prepare("SELECT htmlvar_name FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array( $post_type ) );
|
|
| 5784 | - $rows = $wpdb->get_results( $sql ); |
|
| 5783 | + $sql = $wpdb->prepare("SELECT htmlvar_name FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array($post_type));
|
|
| 5784 | + $rows = $wpdb->get_results($sql); |
|
| 5785 | 5785 | |
| 5786 | 5786 | return $rows; |
| 5787 | 5787 | } |
@@ -5797,10 +5797,10 @@ discard block |
||
| 5797 | 5797 | * @return array Event data array. |
| 5798 | 5798 | */ |
| 5799 | 5799 | function geodir_imex_get_event_data($post, $gd_post_info) {
|
| 5800 | - $event_date = isset( $post['event_date'] ) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $post['event_date'] ) ) : ''; |
|
| 5800 | + $event_date = isset($post['event_date']) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($post['event_date'])) : '';
|
|
| 5801 | 5801 | $event_enddate = $event_date; |
| 5802 | - $starttime = isset( $post['starttime'] ) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['starttime'] ) ) : ''; |
|
| 5803 | - $endtime = isset( $post['endtime'] ) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['endtime'] ) ) : ''; |
|
| 5802 | + $starttime = isset($post['starttime']) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['starttime'])) : '';
|
|
| 5803 | + $endtime = isset($post['endtime']) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['endtime'])) : '';
|
|
| 5804 | 5804 | |
| 5805 | 5805 | $is_recurring_event = ''; |
| 5806 | 5806 | $event_duration_days = ''; |
@@ -5817,15 +5817,15 @@ discard block |
||
| 5817 | 5817 | |
| 5818 | 5818 | $recurring_data = isset($gd_post_info->recurring_dates) ? maybe_unserialize($gd_post_info->recurring_dates) : array(); |
| 5819 | 5819 | if (!empty($recurring_data)) {
|
| 5820 | - $event_date = isset( $recurring_data['event_start'] ) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_start'] ) ) : $event_date; |
|
| 5821 | - $event_enddate = isset( $recurring_data['event_end'] ) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_end'] ) ) : $event_date; |
|
| 5822 | - $starttime = isset( $recurring_data['starttime'] ) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['starttime'] ) ) : $starttime; |
|
| 5823 | - $endtime = isset( $recurring_data['endtime'] ) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['endtime'] ) ) : $endtime; |
|
| 5820 | + $event_date = isset($recurring_data['event_start']) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_start'])) : $event_date;
|
|
| 5821 | + $event_enddate = isset($recurring_data['event_end']) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_end'])) : $event_date;
|
|
| 5822 | + $starttime = isset($recurring_data['starttime']) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['starttime'])) : $starttime;
|
|
| 5823 | + $endtime = isset($recurring_data['endtime']) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['endtime'])) : $endtime;
|
|
| 5824 | 5824 | $is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : ''; |
| 5825 | 5825 | $different_times = !empty($recurring_data['different_times']) ? true : false; |
| 5826 | 5826 | |
| 5827 | - $recurring_pkg = geodir_event_recurring_pkg( $gd_post_info ); |
|
| 5828 | - $is_recurring = isset( $gd_post_info->is_recurring ) && (int)$gd_post_info->is_recurring == 0 ? false : true; |
|
| 5827 | + $recurring_pkg = geodir_event_recurring_pkg($gd_post_info); |
|
| 5828 | + $is_recurring = isset($gd_post_info->is_recurring) && (int) $gd_post_info->is_recurring == 0 ? false : true; |
|
| 5829 | 5829 | |
| 5830 | 5830 | if ($recurring_pkg && $is_recurring) {
|
| 5831 | 5831 | $recurring_dates = $event_date; |
@@ -5835,13 +5835,13 @@ discard block |
||
| 5835 | 5835 | $recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';
|
| 5836 | 5836 | |
| 5837 | 5837 | if (!empty($recurring_data['event_recurring_dates'])) {
|
| 5838 | - $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] ); |
|
| 5838 | + $event_recurring_dates = explode(',', $recurring_data['event_recurring_dates']);
|
|
| 5839 | 5839 | |
| 5840 | 5840 | if (!empty($event_recurring_dates)) {
|
| 5841 | 5841 | $recurring_dates = array(); |
| 5842 | 5842 | |
| 5843 | 5843 | foreach ($event_recurring_dates as $date) {
|
| 5844 | - $recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) ); |
|
| 5844 | + $recurring_dates[] = date_i18n('d/m/Y', strtotime($date));
|
|
| 5845 | 5845 | } |
| 5846 | 5846 | |
| 5847 | 5847 | $recurring_dates = implode(",", $recurring_dates);
|
@@ -5857,7 +5857,7 @@ discard block |
||
| 5857 | 5857 | $times = array(); |
| 5858 | 5858 | |
| 5859 | 5859 | foreach ($recurring_data['starttimes'] as $time) {
|
| 5860 | - $times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00'; |
|
| 5860 | + $times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';
|
|
| 5861 | 5861 | } |
| 5862 | 5862 | |
| 5863 | 5863 | $event_starttimes = implode(",", $times);
|
@@ -5867,7 +5867,7 @@ discard block |
||
| 5867 | 5867 | $times = array(); |
| 5868 | 5868 | |
| 5869 | 5869 | foreach ($recurring_data['endtimes'] as $time) {
|
| 5870 | - $times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00'; |
|
| 5870 | + $times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';
|
|
| 5871 | 5871 | } |
| 5872 | 5872 | |
| 5873 | 5873 | $event_endtimes = implode(",", $times);
|
@@ -5879,8 +5879,8 @@ discard block |
||
| 5879 | 5879 | } |
| 5880 | 5880 | } |
| 5881 | 5881 | } else {
|
| 5882 | - $event_duration_days = isset($recurring_data['duration_x']) ? (int)$recurring_data['duration_x'] : 1; |
|
| 5883 | - $recurring_interval = !empty($recurring_data['repeat_x']) && (int)$recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1; |
|
| 5882 | + $event_duration_days = isset($recurring_data['duration_x']) ? (int) $recurring_data['duration_x'] : 1; |
|
| 5883 | + $recurring_interval = !empty($recurring_data['repeat_x']) && (int) $recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1; |
|
| 5884 | 5884 | |
| 5885 | 5885 | if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {
|
| 5886 | 5886 | $week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');
|
@@ -5896,11 +5896,11 @@ discard block |
||
| 5896 | 5896 | } |
| 5897 | 5897 | |
| 5898 | 5898 | $recurring_week_nos = $recurring_type == 'month' && !empty($recurring_data['repeat_weeks']) ? implode(",", $recurring_data['repeat_weeks']) : $recurring_week_nos;
|
| 5899 | - if (!empty($recurring_data['repeat_end_type']) && (int)$recurring_data['repeat_end_type'] == 1) {
|
|
| 5900 | - $recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['repeat_end'] ) ) : ''; |
|
| 5899 | + if (!empty($recurring_data['repeat_end_type']) && (int) $recurring_data['repeat_end_type'] == 1) {
|
|
| 5900 | + $recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['repeat_end'])) : '';
|
|
| 5901 | 5901 | $max_recurring_count = empty($recurring_end_date) ? 1 : ''; |
| 5902 | 5902 | } else {
|
| 5903 | - $max_recurring_count = (!empty($recurring_data['max_repeat']) && (int)$recurring_data['max_repeat'] > 0 ? (int)$recurring_data['max_repeat'] : 1); |
|
| 5903 | + $max_recurring_count = (!empty($recurring_data['max_repeat']) && (int) $recurring_data['max_repeat'] > 0 ? (int) $recurring_data['max_repeat'] : 1); |
|
| 5904 | 5904 | } |
| 5905 | 5905 | } |
| 5906 | 5906 | } |
@@ -5964,9 +5964,9 @@ discard block |
||
| 5964 | 5964 | * @return array Event data array. |
| 5965 | 5965 | */ |
| 5966 | 5966 | function geodir_imex_process_event_data($gd_post) {
|
| 5967 | - $recurring_pkg = geodir_event_recurring_pkg( (object)$gd_post ); |
|
| 5967 | + $recurring_pkg = geodir_event_recurring_pkg((object) $gd_post); |
|
| 5968 | 5968 | |
| 5969 | - $is_recurring = isset( $gd_post['is_recurring_event'] ) && (int)$gd_post['is_recurring_event'] == 0 ? false : true; |
|
| 5969 | + $is_recurring = isset($gd_post['is_recurring_event']) && (int) $gd_post['is_recurring_event'] == 0 ? false : true; |
|
| 5970 | 5970 | $event_date = isset($gd_post['event_date']) && $gd_post['event_date'] != '' ? geodir_date($gd_post['event_date'], 'Y-m-d') : ''; |
| 5971 | 5971 | $event_enddate = isset($gd_post['event_enddate']) && $gd_post['event_enddate'] != '' ? geodir_date($gd_post['event_enddate'], 'Y-m-d') : $event_date; |
| 5972 | 5972 | $all_day = isset($gd_post['is_whole_day_event']) && !empty($gd_post['is_whole_day_event']) ? true : false; |
@@ -6013,17 +6013,17 @@ discard block |
||
| 6013 | 6013 | $event_recurring_dates = implode(",", $event_recurring_dates);
|
| 6014 | 6014 | } |
| 6015 | 6015 | } else {
|
| 6016 | - $duration_x = !empty( $gd_post['event_duration_days'] ) ? (int)$gd_post['event_duration_days'] : 1; |
|
| 6017 | - $repeat_x = !empty( $gd_post['recurring_interval'] ) ? (int)$gd_post['recurring_interval'] : 1; |
|
| 6018 | - $max_repeat = !empty( $gd_post['max_recurring_count'] ) ? (int)$gd_post['max_recurring_count'] : 1; |
|
| 6019 | - $repeat_end = !empty( $gd_post['recurring_end_date'] ) ? geodir_date($gd_post['recurring_end_date'], 'Y-m-d') : ''; |
|
| 6016 | + $duration_x = !empty($gd_post['event_duration_days']) ? (int) $gd_post['event_duration_days'] : 1; |
|
| 6017 | + $repeat_x = !empty($gd_post['recurring_interval']) ? (int) $gd_post['recurring_interval'] : 1; |
|
| 6018 | + $max_repeat = !empty($gd_post['max_recurring_count']) ? (int) $gd_post['max_recurring_count'] : 1; |
|
| 6019 | + $repeat_end = !empty($gd_post['recurring_end_date']) ? geodir_date($gd_post['recurring_end_date'], 'Y-m-d') : ''; |
|
| 6020 | 6020 | |
| 6021 | 6021 | $repeat_end_type = $repeat_end != '' ? 1 : 0; |
| 6022 | 6022 | $max_repeat = $repeat_end != '' ? '' : $max_repeat; |
| 6023 | 6023 | |
| 6024 | 6024 | $week_days = array_flip(array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'));
|
| 6025 | 6025 | |
| 6026 | - $a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days'])!='' ? explode(',', trim($gd_post['recurring_week_days'])) : array();
|
|
| 6026 | + $a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days']) != '' ? explode(',', trim($gd_post['recurring_week_days'])) : array();
|
|
| 6027 | 6027 | $repeat_days = array(); |
| 6028 | 6028 | if (!empty($a_repeat_days)) {
|
| 6029 | 6029 | foreach ($a_repeat_days as $repeat_day) {
|
@@ -6041,7 +6041,7 @@ discard block |
||
| 6041 | 6041 | $repeat_weeks = array(); |
| 6042 | 6042 | if (!empty($a_repeat_weeks)) {
|
| 6043 | 6043 | foreach ($a_repeat_weeks as $repeat_week) {
|
| 6044 | - $repeat_weeks[] = (int)$repeat_week; |
|
| 6044 | + $repeat_weeks[] = (int) $repeat_week; |
|
| 6045 | 6045 | } |
| 6046 | 6046 | |
| 6047 | 6047 | $repeat_weeks = array_unique($repeat_weeks); |
@@ -6105,7 +6105,7 @@ discard block |
||
| 6105 | 6105 | |
| 6106 | 6106 | $page_found = $wpdb->get_var( |
| 6107 | 6107 | $wpdb->prepare( |
| 6108 | - "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 6108 | + "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;", |
|
| 6109 | 6109 | array($slug) |
| 6110 | 6110 | ) |
| 6111 | 6111 | ); |
@@ -6160,7 +6160,7 @@ discard block |
||
| 6160 | 6160 | */ |
| 6161 | 6161 | function geodir_admin_upgrade_notice() {
|
| 6162 | 6162 | $class = "error"; |
| 6163 | - $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
|
|
| 6163 | + $message = __("Please update core GeoDirectory or some addons may not function correctly.", "geodirectory");
|
|
| 6164 | 6164 | echo"<div class=\"$class\"> <p>$message</p></div>"; |
| 6165 | 6165 | } |
| 6166 | 6166 | |
@@ -6172,7 +6172,7 @@ discard block |
||
| 6172 | 6172 | * @param (object) $r |
| 6173 | 6173 | * @return (string) $output |
| 6174 | 6174 | */ |
| 6175 | -function geodire_admin_upgrade_notice( $plugin_data, $r ) |
|
| 6175 | +function geodire_admin_upgrade_notice($plugin_data, $r) |
|
| 6176 | 6176 | {
|
| 6177 | 6177 | // readme contents |
| 6178 | 6178 | $args = array( |
@@ -6180,7 +6180,7 @@ discard block |
||
| 6180 | 6180 | 'redirection' => 5 |
| 6181 | 6181 | ); |
| 6182 | 6182 | $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt"; |
| 6183 | - $data = wp_remote_get( $url, $args ); |
|
| 6183 | + $data = wp_remote_get($url, $args); |
|
| 6184 | 6184 | |
| 6185 | 6185 | if (!is_wp_error($data) && $data['response']['code'] == 200) {
|
| 6186 | 6186 | |
@@ -6195,20 +6195,20 @@ discard block |
||
| 6195 | 6195 | function geodir_in_plugin_update_message($content) {
|
| 6196 | 6196 | // Output Upgrade Notice |
| 6197 | 6197 | $matches = null; |
| 6198 | - $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis'; |
|
| 6198 | + $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*'.preg_quote(GEODIRECTORY_VERSION).'\s*=|$)~Uis'; |
|
| 6199 | 6199 | $upgrade_notice = ''; |
| 6200 | - if ( preg_match( $regexp, $content, $matches ) ) {
|
|
| 6201 | - if(empty($matches)){return;}
|
|
| 6200 | + if (preg_match($regexp, $content, $matches)) {
|
|
| 6201 | + if (empty($matches)) {return; }
|
|
| 6202 | 6202 | |
| 6203 | - $version = trim( $matches[1] ); |
|
| 6204 | - if($version && $version>GEODIRECTORY_VERSION){
|
|
| 6203 | + $version = trim($matches[1]); |
|
| 6204 | + if ($version && $version > GEODIRECTORY_VERSION) {
|
|
| 6205 | 6205 | |
| 6206 | 6206 | |
| 6207 | - $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
|
|
| 6208 | - if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
|
|
| 6207 | + $notices = (array) preg_split('~[\r\n]+~', trim($matches[2]));
|
|
| 6208 | + if (version_compare(GEODIRECTORY_VERSION, $version, '<')) {
|
|
| 6209 | 6209 | $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">'; |
| 6210 | - foreach ( $notices as $index => $line ) {
|
|
| 6211 | - $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
|
|
| 6210 | + foreach ($notices as $index => $line) {
|
|
| 6211 | + $upgrade_notice .= wp_kses_post(preg_replace('~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line));
|
|
| 6212 | 6212 | } |
| 6213 | 6213 | $upgrade_notice .= '</div> '; |
| 6214 | 6214 | } |
@@ -6232,7 +6232,7 @@ discard block |
||
| 6232 | 6232 | $default_language = $sitepress->get_default_language(); |
| 6233 | 6233 | if ($current_language != 'all' && $current_language != $default_language) {
|
| 6234 | 6234 | ?> |
| 6235 | - <div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory');?></strong></p></div>
|
|
| 6235 | + <div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory'); ?></strong></p></div>
|
|
| 6236 | 6236 | <?php |
| 6237 | 6237 | } |
| 6238 | 6238 | } |
@@ -6247,7 +6247,7 @@ discard block |
||
| 6247 | 6247 | * @param array Listing statuses to be skipped. |
| 6248 | 6248 | */ |
| 6249 | 6249 | function geodir_imex_export_skip_statuses() {
|
| 6250 | - $statuses = array( 'trash', 'auto-draft' ); |
|
| 6250 | + $statuses = array('trash', 'auto-draft');
|
|
| 6251 | 6251 | |
| 6252 | 6252 | /** |
| 6253 | 6253 | * Filter the statuses to skip during GD export listings. |
@@ -6257,7 +6257,7 @@ discard block |
||
| 6257 | 6257 | * |
| 6258 | 6258 | * @param array $statuses Listing statuses to be skipped. |
| 6259 | 6259 | */ |
| 6260 | - $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses ); |
|
| 6260 | + $statuses = apply_filters('geodir_imex_export_skip_statuses', $statuses);
|
|
| 6261 | 6261 | |
| 6262 | 6262 | return $statuses; |
| 6263 | 6263 | } |
@@ -6328,16 +6328,16 @@ discard block |
||
| 6328 | 6328 | function geodir_imex_get_filter_where($where = '', $post_type = '') {
|
| 6329 | 6329 | global $wpdb; |
| 6330 | 6330 | |
| 6331 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6331 | + $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6332 | 6332 | |
| 6333 | - if ( !empty( $filters ) ) {
|
|
| 6334 | - foreach ( $filters as $field => $value ) {
|
|
| 6333 | + if (!empty($filters)) {
|
|
| 6334 | + foreach ($filters as $field => $value) {
|
|
| 6335 | 6335 | switch ($field) {
|
| 6336 | 6336 | case 'start_date': |
| 6337 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'"; |
|
| 6337 | + $where .= " AND `".$wpdb->posts."`.`post_date` >= '".sanitize_text_field($value)." 00:00:00'"; |
|
| 6338 | 6338 | break; |
| 6339 | 6339 | case 'end_date': |
| 6340 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'"; |
|
| 6340 | + $where .= " AND `".$wpdb->posts."`.`post_date` <= '".sanitize_text_field($value)." 23:59:59'"; |
|
| 6341 | 6341 | break; |
| 6342 | 6342 | } |
| 6343 | 6343 | } |
@@ -6349,25 +6349,25 @@ discard block |
||
| 6349 | 6349 | add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);
|
| 6350 | 6350 | |
| 6351 | 6351 | |
| 6352 | -function geodir_fix_for_primer_theme(){
|
|
| 6353 | - if(!defined( 'PRIMER_VERSION' )){return;}
|
|
| 6352 | +function geodir_fix_for_primer_theme() {
|
|
| 6353 | + if (!defined('PRIMER_VERSION')) {return; }
|
|
| 6354 | 6354 | global $pagenow; |
| 6355 | 6355 | |
| 6356 | - if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){
|
|
| 6356 | + if (('post.php' === $pagenow || 'post-new.php' === $pagenow) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']))) {
|
|
| 6357 | 6357 | |
| 6358 | - $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] ); |
|
| 6358 | + $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type($_GET['post']); |
|
| 6359 | 6359 | |
| 6360 | 6360 | $post_types = geodir_get_posttypes(); |
| 6361 | - if ($post_type && in_array($post_type, $post_types) ) {
|
|
| 6361 | + if ($post_type && in_array($post_type, $post_types)) {
|
|
| 6362 | 6362 | global $primer_customizer_layouts; |
| 6363 | - remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10); |
|
| 6363 | + remove_action('add_meta_boxes', array($primer_customizer_layouts, 'add_meta_box'), 10);
|
|
| 6364 | 6364 | } |
| 6365 | 6365 | } |
| 6366 | 6366 | |
| 6367 | 6367 | } |
| 6368 | 6368 | |
| 6369 | -if(is_admin()){
|
|
| 6370 | - add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
|
|
| 6369 | +if (is_admin()) {
|
|
| 6370 | + add_action('add_meta_boxes', 'geodir_fix_for_primer_theme', 0);
|
|
| 6371 | 6371 | } |
| 6372 | 6372 | |
| 6373 | 6373 | |
@@ -6500,32 +6500,32 @@ discard block |
||
| 6500 | 6500 | |
| 6501 | 6501 | function geodir_ga_activation_url() {
|
| 6502 | 6502 | |
| 6503 | - return add_query_arg( array( |
|
| 6503 | + return add_query_arg(array( |
|
| 6504 | 6504 | 'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
|
| 6505 | 6505 | 'scope' => GEODIR_GA_SCOPE, |
| 6506 | 6506 | 'response_type' => 'code', |
| 6507 | 6507 | 'redirect_uri' => GEODIR_GA_REDIRECT, |
| 6508 | 6508 | 'client_id' => GEODIR_GA_CLIENTID, |
| 6509 | - ), 'https://accounts.google.com/o/oauth2/auth' ); |
|
| 6509 | + ), 'https://accounts.google.com/o/oauth2/auth'); |
|
| 6510 | 6510 | |
| 6511 | 6511 | return $url; |
| 6512 | 6512 | } |
| 6513 | 6513 | |
| 6514 | -function geodir_gd_accounts(){
|
|
| 6514 | +function geodir_gd_accounts() {
|
|
| 6515 | 6515 | $accounts = array(); |
| 6516 | - $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true ); |
|
| 6517 | - if($useAuth){
|
|
| 6516 | + $useAuth = (get_option('geodir_ga_auth_code') == '' ? false : true);
|
|
| 6517 | + if ($useAuth) {
|
|
| 6518 | 6518 | try {
|
| 6519 | 6519 | $accounts = geodir_ga_get_analytics_accounts(); |
| 6520 | 6520 | } catch (Exception $e) {
|
| 6521 | - geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 6521 | + geodir_error_log(wp_sprintf(__('GD Google Analytics API Error(%s) : %s', 'geodirectory'), $e->getCode(), $e->getMessage()));
|
|
| 6522 | 6522 | } |
| 6523 | 6523 | |
| 6524 | - if(is_array($accounts)){
|
|
| 6525 | - $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
|
|
| 6526 | - }elseif(get_option('geodir_ga_account_id')){
|
|
| 6524 | + if (is_array($accounts)) {
|
|
| 6525 | + $accounts = array_merge(array(__('Select Account', 'geodirectory')), $accounts);
|
|
| 6526 | + }elseif (get_option('geodir_ga_account_id')) {
|
|
| 6527 | 6527 | $accounts = array(); |
| 6528 | - $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6528 | + $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required', 'geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6529 | 6529 | } |
| 6530 | 6530 | } |
| 6531 | 6531 | return $accounts; |
@@ -6536,21 +6536,21 @@ discard block |
||
| 6536 | 6536 | global $gd_ga_errors; |
| 6537 | 6537 | $accounts = array(); |
| 6538 | 6538 | |
| 6539 | - if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
|
|
| 6539 | + if (get_option('geodir_ga_auth_token') === false) {update_option('geodir_ga_auth_token', ''); }
|
|
| 6540 | 6540 | |
| 6541 | 6541 | |
| 6542 | - if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
|
|
| 6542 | + if (get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])) {
|
|
| 6543 | 6543 | return get_option('geodir_gd_uids');
|
| 6544 | 6544 | } |
| 6545 | 6545 | |
| 6546 | 6546 | # Create a new Gdata call |
| 6547 | - if ( trim(get_option('geodir_ga_auth_code')) != '' )
|
|
| 6547 | + if (trim(get_option('geodir_ga_auth_code')) != '')
|
|
| 6548 | 6548 | $stats = new GDGoogleAnalyticsStats(); |
| 6549 | 6549 | else |
| 6550 | 6550 | return false; |
| 6551 | 6551 | |
| 6552 | 6552 | # Check if Google sucessfully logged in |
| 6553 | - if ( ! $stats->checkLogin() ) |
|
| 6553 | + if (!$stats->checkLogin()) |
|
| 6554 | 6554 | return false; |
| 6555 | 6555 | |
| 6556 | 6556 | # Get a list of accounts |
@@ -6562,28 +6562,28 @@ discard block |
||
| 6562 | 6562 | } |
| 6563 | 6563 | |
| 6564 | 6564 | |
| 6565 | - natcasesort ($accounts); |
|
| 6565 | + natcasesort($accounts); |
|
| 6566 | 6566 | |
| 6567 | 6567 | # Return the account array if there are accounts |
| 6568 | - if ( count($accounts) > 0 ){
|
|
| 6569 | - update_option('geodir_gd_uids',$accounts);
|
|
| 6568 | + if (count($accounts) > 0) {
|
|
| 6569 | + update_option('geodir_gd_uids', $accounts);
|
|
| 6570 | 6570 | return $accounts; |
| 6571 | 6571 | } |
| 6572 | 6572 | else |
| 6573 | 6573 | return false; |
| 6574 | 6574 | } |
| 6575 | 6575 | |
| 6576 | -add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' ); |
|
| 6577 | -function geodir_ga_deauthorize(){
|
|
| 6576 | +add_action('wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize');
|
|
| 6577 | +function geodir_ga_deauthorize() {
|
|
| 6578 | 6578 | |
| 6579 | - if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
|
|
| 6579 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'gd_ga_deauthorize')) {
|
|
| 6580 | 6580 | |
| 6581 | - die( 'Security check' ); |
|
| 6581 | + die('Security check');
|
|
| 6582 | 6582 | |
| 6583 | 6583 | } else {
|
| 6584 | - update_option('geodir_ga_auth_token','');
|
|
| 6585 | - update_option('geodir_ga_auth_code','');
|
|
| 6586 | - update_option('geodir_gd_uids','');
|
|
| 6584 | + update_option('geodir_ga_auth_token', '');
|
|
| 6585 | + update_option('geodir_ga_auth_code', '');
|
|
| 6586 | + update_option('geodir_gd_uids', '');
|
|
| 6587 | 6587 | |
| 6588 | 6588 | |
| 6589 | 6589 | echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
|
@@ -6616,22 +6616,22 @@ discard block |
||
| 6616 | 6616 | * @since 1.6.21 |
| 6617 | 6617 | * @return array |
| 6618 | 6618 | */ |
| 6619 | -function geodir_listing_image_size_arr(){
|
|
| 6619 | +function geodir_listing_image_size_arr() {
|
|
| 6620 | 6620 | |
| 6621 | 6621 | global $_wp_additional_image_sizes; |
| 6622 | 6622 | |
| 6623 | 6623 | $sizes = array(); |
| 6624 | 6624 | |
| 6625 | - foreach ( get_intermediate_image_sizes() as $_size ) {
|
|
| 6626 | - if ( in_array( $_size, array('thumbnail', 'medium', 'medium_large', 'large') ) ) {
|
|
| 6627 | - $sizes[ $_size ]['width'] = get_option( "{$_size}_size_w" );
|
|
| 6628 | - $sizes[ $_size ]['height'] = get_option( "{$_size}_size_h" );
|
|
| 6629 | - $sizes[ $_size ]['crop'] = (bool) get_option( "{$_size}_crop" );
|
|
| 6630 | - } elseif ( isset( $_wp_additional_image_sizes[ $_size ] ) ) {
|
|
| 6631 | - $sizes[ $_size ] = array( |
|
| 6632 | - 'width' => $_wp_additional_image_sizes[ $_size ]['width'], |
|
| 6633 | - 'height' => $_wp_additional_image_sizes[ $_size ]['height'], |
|
| 6634 | - 'crop' => $_wp_additional_image_sizes[ $_size ]['crop'], |
|
| 6625 | + foreach (get_intermediate_image_sizes() as $_size) {
|
|
| 6626 | + if (in_array($_size, array('thumbnail', 'medium', 'medium_large', 'large'))) {
|
|
| 6627 | + $sizes[$_size]['width'] = get_option("{$_size}_size_w");
|
|
| 6628 | + $sizes[$_size]['height'] = get_option("{$_size}_size_h");
|
|
| 6629 | + $sizes[$_size]['crop'] = (bool) get_option("{$_size}_crop");
|
|
| 6630 | + } elseif (isset($_wp_additional_image_sizes[$_size])) {
|
|
| 6631 | + $sizes[$_size] = array( |
|
| 6632 | + 'width' => $_wp_additional_image_sizes[$_size]['width'], |
|
| 6633 | + 'height' => $_wp_additional_image_sizes[$_size]['height'], |
|
| 6634 | + 'crop' => $_wp_additional_image_sizes[$_size]['crop'], |
|
| 6635 | 6635 | ); |
| 6636 | 6636 | } |
| 6637 | 6637 | } |
@@ -6642,9 +6642,9 @@ discard block |
||
| 6642 | 6642 | |
| 6643 | 6643 | $options['default'] = __('GD Default', 'geodirectory');
|
| 6644 | 6644 | |
| 6645 | - if(!empty($sizes)){
|
|
| 6646 | - foreach($sizes as $key=>$val){
|
|
| 6647 | - $options[$key] = $key. ' ( '.$val['width'].' x '.$val['height']. ' )'; |
|
| 6645 | + if (!empty($sizes)) {
|
|
| 6646 | + foreach ($sizes as $key=>$val) {
|
|
| 6647 | + $options[$key] = $key.' ( '.$val['width'].' x '.$val['height'].' )'; |
|
| 6648 | 6648 | } |
| 6649 | 6649 | } |
| 6650 | 6650 | |
