| @@ -10,7 +10,7 @@ discard block | ||
| 10 | 10 | /** | 
| 11 | 11 | * Get All Plugin functions from WordPress | 
| 12 | 12 | */ | 
| 13 | -include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); | |
| 13 | +include_once(ABSPATH.'wp-admin/includes/plugin.php'); | |
| 14 | 14 | |
| 15 | 15 | /*-----------------------------------------------------------------------------------*/ | 
| 16 | 16 | /* Helper functions */ | 
| @@ -27,7 +27,7 @@ discard block | ||
| 27 | 27 | * @return string example url eg: http://wpgeo.directory/wp-content/plugins/geodirectory | 
| 28 | 28 | */ | 
| 29 | 29 |  function geodir_plugin_url() {
 | 
| 30 | - return plugins_url( '', dirname( __FILE__ ) ); | |
| 30 | +	return plugins_url('', dirname(__FILE__));
 | |
| 31 | 31 | /* | 
| 32 | 32 | if ( is_ssl() ) : | 
| 33 | 33 | return str_replace( 'http://', 'https://', WP_PLUGIN_URL ) . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) ); | 
| @@ -47,10 +47,10 @@ discard block | ||
| 47 | 47 | * @return string example url eg: /home/geo/public_html/wp-content/plugins/geodirectory | 
| 48 | 48 | */ | 
| 49 | 49 |  function geodir_plugin_path() {
 | 
| 50 | -	if ( defined( 'GD_TESTING_MODE' ) && GD_TESTING_MODE ) {
 | |
| 51 | - return dirname( dirname( __FILE__ ) ); | |
| 50 | +	if (defined('GD_TESTING_MODE') && GD_TESTING_MODE) {
 | |
| 51 | + return dirname(dirname(__FILE__)); | |
| 52 | 52 |  	} else {
 | 
| 53 | - return WP_PLUGIN_DIR . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) ); | |
| 53 | + return WP_PLUGIN_DIR."/".plugin_basename(dirname(dirname(__FILE__))); | |
| 54 | 54 | } | 
| 55 | 55 | } | 
| 56 | 56 | |
| @@ -65,10 +65,10 @@ discard block | ||
| 65 | 65 | * @return bool true or false. | 
| 66 | 66 | * @todo check if this is faster than normal WP check and remove if not. | 
| 67 | 67 | */ | 
| 68 | -function geodir_is_plugin_active( $plugin ) {
 | |
| 69 | - $active_plugins = get_option( 'active_plugins' ); | |
| 70 | -	foreach ( $active_plugins as $key => $active_plugin ) {
 | |
| 71 | -		if ( strstr( $active_plugin, $plugin ) ) {
 | |
| 68 | +function geodir_is_plugin_active($plugin) {
 | |
| 69 | +	$active_plugins = get_option('active_plugins');
 | |
| 70 | +	foreach ($active_plugins as $key => $active_plugin) {
 | |
| 71 | +		if (strstr($active_plugin, $plugin)) {
 | |
| 72 | 72 | return true; | 
| 73 | 73 | } | 
| 74 | 74 | } | 
| @@ -90,8 +90,8 @@ discard block | ||
| 90 | 90 | * | 
| 91 | 91 | * @return bool|int|string the formatted date. | 
| 92 | 92 | */ | 
| 93 | -function geodir_get_formated_date( $date ) {
 | |
| 94 | - return mysql2date( get_option( 'date_format' ), $date ); | |
| 93 | +function geodir_get_formated_date($date) {
 | |
| 94 | +	return mysql2date(get_option('date_format'), $date);
 | |
| 95 | 95 | } | 
| 96 | 96 | |
| 97 | 97 | /** | 
| @@ -107,8 +107,8 @@ discard block | ||
| 107 | 107 | * | 
| 108 | 108 | * @return bool|int|string the formatted time. | 
| 109 | 109 | */ | 
| 110 | -function geodir_get_formated_time( $time ) {
 | |
| 111 | - return mysql2date( get_option( 'time_format' ), $time, $translate = true ); | |
| 110 | +function geodir_get_formated_time($time) {
 | |
| 111 | +	return mysql2date(get_option('time_format'), $time, $translate = true);
 | |
| 112 | 112 | } | 
| 113 | 113 | |
| 114 | 114 | |
| @@ -126,35 +126,35 @@ discard block | ||
| 126 | 126 | * | 
| 127 | 127 | * @return string Formatted link. | 
| 128 | 128 | */ | 
| 129 | -function geodir_getlink( $url, $params = array(), $use_existing_arguments = false ) {
 | |
| 130 | -	if ( $use_existing_arguments ) {
 | |
| 129 | +function geodir_getlink($url, $params = array(), $use_existing_arguments = false) {
 | |
| 130 | +	if ($use_existing_arguments) {
 | |
| 131 | 131 | $params = $params + $_GET; | 
| 132 | 132 | } | 
| 133 | -	if ( ! $params ) {
 | |
| 133 | +	if (!$params) {
 | |
| 134 | 134 | return $url; | 
| 135 | 135 | } | 
| 136 | 136 | $link = $url; | 
| 137 | -	if ( strpos( $link, '?' ) === false ) {
 | |
| 137 | +	if (strpos($link, '?') === false) {
 | |
| 138 | 138 | $link .= '?'; | 
| 139 | 139 | } //If there is no '?' add one at the end | 
| 140 | -	elseif ( strpos( $link, '//maps.google.com/maps/api/js?language=' ) ) {
 | |
| 140 | +	elseif (strpos($link, '//maps.google.com/maps/api/js?language=')) {
 | |
| 141 | 141 | $link .= '&'; | 
| 142 | 142 | } //If there is no '&' at the END, add one. | 
| 143 | -	elseif ( ! preg_match( '/(\?|\&(amp;)?)$/', $link ) ) {
 | |
| 143 | +	elseif (!preg_match('/(\?|\&(amp;)?)$/', $link)) {
 | |
| 144 | 144 | $link .= '&'; | 
| 145 | 145 | } //If there is no '&' at the END, add one. | 
| 146 | 146 | |
| 147 | 147 | $params_arr = array(); | 
| 148 | -	foreach ( $params as $key => $value ) {
 | |
| 149 | -		if ( gettype( $value ) == 'array' ) { //Handle array data properly
 | |
| 150 | -			foreach ( $value as $val ) {
 | |
| 151 | - $params_arr[] = $key . '[]=' . urlencode( $val ); | |
| 148 | +	foreach ($params as $key => $value) {
 | |
| 149 | +		if (gettype($value) == 'array') { //Handle array data properly
 | |
| 150 | +			foreach ($value as $val) {
 | |
| 151 | + $params_arr[] = $key.'[]='.urlencode($val); | |
| 152 | 152 | } | 
| 153 | 153 |  		} else {
 | 
| 154 | - $params_arr[] = $key . '=' . urlencode( $value ); | |
| 154 | + $params_arr[] = $key.'='.urlencode($value); | |
| 155 | 155 | } | 
| 156 | 156 | } | 
| 157 | - $link .= implode( '&', $params_arr ); | |
| 157 | +	$link .= implode('&', $params_arr);
 | |
| 158 | 158 | |
| 159 | 159 | return $link; | 
| 160 | 160 | } | 
| @@ -171,18 +171,18 @@ discard block | ||
| 171 | 171 | * | 
| 172 | 172 | * @return string Listing page url if valid. Otherwise home url will be returned. | 
| 173 | 173 | */ | 
| 174 | -function geodir_get_addlisting_link( $post_type = '' ) {
 | |
| 174 | +function geodir_get_addlisting_link($post_type = '') {
 | |
| 175 | 175 | global $wpdb; | 
| 176 | 176 | |
| 177 | 177 |  	//$check_pkg  = $wpdb->get_var("SELECT pid FROM ".GEODIR_PRICE_TABLE." WHERE post_type='".$post_type."' and status != '0'");
 | 
| 178 | 178 | $check_pkg = 1; | 
| 179 | -	if ( post_type_exists( $post_type ) && $check_pkg ) {
 | |
| 179 | +	if (post_type_exists($post_type) && $check_pkg) {
 | |
| 180 | 180 | |
| 181 | - $add_listing_link = get_page_link( geodir_add_listing_page_id() ); | |
| 181 | + $add_listing_link = get_page_link(geodir_add_listing_page_id()); | |
| 182 | 182 | |
| 183 | - return esc_url( add_query_arg( array( 'listing_type' => $post_type ), $add_listing_link ) ); | |
| 183 | +		return esc_url(add_query_arg(array('listing_type' => $post_type), $add_listing_link));
 | |
| 184 | 184 |  	} else {
 | 
| 185 | - return get_bloginfo( 'url' ); | |
| 185 | +		return get_bloginfo('url');
 | |
| 186 | 186 | } | 
| 187 | 187 | } | 
| 188 | 188 | |
| @@ -210,7 +210,7 @@ discard block | ||
| 210 | 210 |  	if (!empty($_SERVER['PHP_SELF']) && !empty($_SERVER['REQUEST_URI'])) {
 | 
| 211 | 211 | // To build the entire URI we need to prepend the protocol, and the http host | 
| 212 | 212 | // to the URI string. | 
| 213 | - $pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; | |
| 213 | + $pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; | |
| 214 | 214 |  	} else {
 | 
| 215 | 215 | /* | 
| 216 | 216 | * Since we do not have REQUEST_URI to work with, we will assume we are | 
| @@ -219,11 +219,11 @@ discard block | ||
| 219 | 219 | * | 
| 220 | 220 | * IIS uses the SCRIPT_NAME variable instead of a REQUEST_URI variable... thanks, MS | 
| 221 | 221 | */ | 
| 222 | - $pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']; | |
| 222 | + $pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME']; | |
| 223 | 223 | |
| 224 | 224 | // If the query string exists append it to the URI string | 
| 225 | 225 |  		if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
 | 
| 226 | - $pageURL .= '?' . $_SERVER['QUERY_STRING']; | |
| 226 | + $pageURL .= '?'.$_SERVER['QUERY_STRING']; | |
| 227 | 227 | } | 
| 228 | 228 | } | 
| 229 | 229 | |
| @@ -234,7 +234,7 @@ discard block | ||
| 234 | 234 | * | 
| 235 | 235 | * @param string $pageURL The URL of the current page. | 
| 236 | 236 | */ | 
| 237 | - return apply_filters( 'geodir_curPageURL', $pageURL ); | |
| 237 | +	return apply_filters('geodir_curPageURL', $pageURL);
 | |
| 238 | 238 | } | 
| 239 | 239 | |
| 240 | 240 | /** | 
| @@ -249,12 +249,12 @@ discard block | ||
| 249 | 249 | * | 
| 250 | 250 | * @return string Cleaned variable. | 
| 251 | 251 | */ | 
| 252 | -function geodir_clean( $string ) {
 | |
| 252 | +function geodir_clean($string) {
 | |
| 253 | 253 | |
| 254 | - $string = trim( strip_tags( stripslashes( $string ) ) ); | |
| 255 | - $string = str_replace( " ", "-", $string ); // Replaces all spaces with hyphens. | |
| 256 | - $string = preg_replace( '/[^A-Za-z0-9\-\_]/', '', $string ); // Removes special chars. | |
| 257 | - $string = preg_replace( '/-+/', '-', $string ); // Replaces multiple hyphens with single one. | |
| 254 | + $string = trim(strip_tags(stripslashes($string))); | |
| 255 | +	$string = str_replace(" ", "-", $string); // Replaces all spaces with hyphens.
 | |
| 256 | +	$string = preg_replace('/[^A-Za-z0-9\-\_]/', '', $string); // Removes special chars.
 | |
| 257 | +	$string = preg_replace('/-+/', '-', $string); // Replaces multiple hyphens with single one.
 | |
| 258 | 258 | |
| 259 | 259 | return $string; | 
| 260 | 260 | } | 
| @@ -268,13 +268,13 @@ discard block | ||
| 268 | 268 | */ | 
| 269 | 269 |  function geodir_get_weekday() {
 | 
| 270 | 270 | return array( | 
| 271 | - __( 'Sunday', 'geodirectory' ), | |
| 272 | - __( 'Monday', 'geodirectory' ), | |
| 273 | - __( 'Tuesday', 'geodirectory' ), | |
| 274 | - __( 'Wednesday', 'geodirectory' ), | |
| 275 | - __( 'Thursday', 'geodirectory' ), | |
| 276 | - __( 'Friday', 'geodirectory' ), | |
| 277 | - __( 'Saturday', 'geodirectory' ) | |
| 271 | +		__('Sunday', 'geodirectory'),
 | |
| 272 | +		__('Monday', 'geodirectory'),
 | |
| 273 | +		__('Tuesday', 'geodirectory'),
 | |
| 274 | +		__('Wednesday', 'geodirectory'),
 | |
| 275 | +		__('Thursday', 'geodirectory'),
 | |
| 276 | +		__('Friday', 'geodirectory'),
 | |
| 277 | +		__('Saturday', 'geodirectory')
 | |
| 278 | 278 | ); | 
| 279 | 279 | } | 
| 280 | 280 | |
| @@ -287,11 +287,11 @@ discard block | ||
| 287 | 287 | */ | 
| 288 | 288 |  function geodir_get_weeks() {
 | 
| 289 | 289 | return array( | 
| 290 | - __( 'First', 'geodirectory' ), | |
| 291 | - __( 'Second', 'geodirectory' ), | |
| 292 | - __( 'Third', 'geodirectory' ), | |
| 293 | - __( 'Fourth', 'geodirectory' ), | |
| 294 | - __( 'Last', 'geodirectory' ) | |
| 290 | +		__('First', 'geodirectory'),
 | |
| 291 | +		__('Second', 'geodirectory'),
 | |
| 292 | +		__('Third', 'geodirectory'),
 | |
| 293 | +		__('Fourth', 'geodirectory'),
 | |
| 294 | +		__('Last', 'geodirectory')
 | |
| 295 | 295 | ); | 
| 296 | 296 | } | 
| 297 | 297 | |
| @@ -310,112 +310,112 @@ discard block | ||
| 310 | 310 | * | 
| 311 | 311 | * @return bool If valid returns true. Otherwise false. | 
| 312 | 312 | */ | 
| 313 | -function geodir_is_page( $gdpage = '' ) {
 | |
| 313 | +function geodir_is_page($gdpage = '') {
 | |
| 314 | 314 | |
| 315 | 315 | global $wp_query, $post, $wp; | 
| 316 | 316 | //if(!is_admin()): | 
| 317 | 317 | |
| 318 | - switch ( $gdpage ): | |
| 318 | + switch ($gdpage): | |
| 319 | 319 | case 'add-listing': | 
| 320 | 320 | |
| 321 | -			if ( is_page() && get_query_var( 'page_id' ) == geodir_add_listing_page_id() ) {
 | |
| 321 | +			if (is_page() && get_query_var('page_id') == geodir_add_listing_page_id()) {
 | |
| 322 | 322 | return true; | 
| 323 | -			} elseif ( is_page() && isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {
 | |
| 323 | +			} elseif (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
 | |
| 324 | 324 | return true; | 
| 325 | 325 | } | 
| 326 | 326 | |
| 327 | 327 | break; | 
| 328 | 328 | case 'preview': | 
| 329 | - if ( ( is_page() && get_query_var( 'page_id' ) == geodir_preview_page_id() ) && isset( $_REQUEST['listing_type'] ) | |
| 330 | - && in_array( $_REQUEST['listing_type'], geodir_get_posttypes() ) | |
| 329 | +			if ((is_page() && get_query_var('page_id') == geodir_preview_page_id()) && isset($_REQUEST['listing_type'])
 | |
| 330 | + && in_array($_REQUEST['listing_type'], geodir_get_posttypes()) | |
| 331 | 331 |  			) {
 | 
| 332 | 332 | return true; | 
| 333 | 333 | } | 
| 334 | 334 | break; | 
| 335 | 335 | case 'listing-success': | 
| 336 | -			if ( is_page() && get_query_var( 'page_id' ) == geodir_success_page_id() ) {
 | |
| 336 | +			if (is_page() && get_query_var('page_id') == geodir_success_page_id()) {
 | |
| 337 | 337 | return true; | 
| 338 | 338 | } | 
| 339 | 339 | break; | 
| 340 | 340 | case 'detail': | 
| 341 | - $post_type = get_query_var( 'post_type' ); | |
| 342 | -			if ( is_array( $post_type ) ) {
 | |
| 343 | - $post_type = reset( $post_type ); | |
| 341 | +			$post_type = get_query_var('post_type');
 | |
| 342 | +			if (is_array($post_type)) {
 | |
| 343 | + $post_type = reset($post_type); | |
| 344 | 344 | } | 
| 345 | -			if ( is_single() && in_array( $post_type, geodir_get_posttypes() ) ) {
 | |
| 345 | +			if (is_single() && in_array($post_type, geodir_get_posttypes())) {
 | |
| 346 | 346 | return true; | 
| 347 | 347 | } | 
| 348 | 348 | break; | 
| 349 | 349 | case 'pt': | 
| 350 | - $post_type = get_query_var( 'post_type' ); | |
| 351 | -			if ( is_array( $post_type ) ) {
 | |
| 352 | - $post_type = reset( $post_type ); | |
| 350 | +			$post_type = get_query_var('post_type');
 | |
| 351 | +			if (is_array($post_type)) {
 | |
| 352 | + $post_type = reset($post_type); | |
| 353 | 353 | } | 
| 354 | -			if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) && ! is_tax() ) {
 | |
| 354 | +			if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes()) && !is_tax()) {
 | |
| 355 | 355 | return true; | 
| 356 | 356 | } | 
| 357 | 357 | |
| 358 | 358 | break; | 
| 359 | 359 | case 'listing': | 
| 360 | -			if ( is_tax() && geodir_get_taxonomy_posttype() ) {
 | |
| 360 | +			if (is_tax() && geodir_get_taxonomy_posttype()) {
 | |
| 361 | 361 | global $current_term, $taxonomy, $term; | 
| 362 | 362 | |
| 363 | 363 | return true; | 
| 364 | 364 | } | 
| 365 | - $post_type = get_query_var( 'post_type' ); | |
| 366 | -			if ( is_array( $post_type ) ) {
 | |
| 367 | - $post_type = reset( $post_type ); | |
| 365 | +			$post_type = get_query_var('post_type');
 | |
| 366 | +			if (is_array($post_type)) {
 | |
| 367 | + $post_type = reset($post_type); | |
| 368 | 368 | } | 
| 369 | -			if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) ) {
 | |
| 369 | +			if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes())) {
 | |
| 370 | 370 | return true; | 
| 371 | 371 | } | 
| 372 | 372 | |
| 373 | 373 | break; | 
| 374 | 374 | case 'home': | 
| 375 | 375 | |
| 376 | -			if ( ( is_page() && get_query_var( 'page_id' ) == geodir_home_page_id() ) || is_page_geodir_home() ) {
 | |
| 376 | +			if ((is_page() && get_query_var('page_id') == geodir_home_page_id()) || is_page_geodir_home()) {
 | |
| 377 | 377 | return true; | 
| 378 | 378 | } | 
| 379 | 379 | |
| 380 | 380 | break; | 
| 381 | 381 | case 'location': | 
| 382 | -			if ( is_page() && get_query_var( 'page_id' ) == geodir_location_page_id() ) {
 | |
| 382 | +			if (is_page() && get_query_var('page_id') == geodir_location_page_id()) {
 | |
| 383 | 383 | return true; | 
| 384 | 384 | } | 
| 385 | 385 | break; | 
| 386 | 386 | case 'author': | 
| 387 | -			if ( is_author() && isset( $_REQUEST['geodir_dashbord'] ) ) {
 | |
| 387 | +			if (is_author() && isset($_REQUEST['geodir_dashbord'])) {
 | |
| 388 | 388 | return true; | 
| 389 | 389 | } | 
| 390 | 390 | |
| 391 | -			if ( function_exists( 'bp_loggedin_user_id' ) && function_exists( 'bp_displayed_user_id' ) && $my_id = (int) bp_loggedin_user_id() ) {
 | |
| 392 | -				if ( ( (bool) bp_is_current_component( 'listings' ) || (bool) bp_is_current_component( 'favorites' ) ) && $my_id > 0 && $my_id == (int) bp_displayed_user_id() ) {
 | |
| 391 | +			if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int) bp_loggedin_user_id()) {
 | |
| 392 | +				if (((bool) bp_is_current_component('listings') || (bool) bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int) bp_displayed_user_id()) {
 | |
| 393 | 393 | return true; | 
| 394 | 394 | } | 
| 395 | 395 | } | 
| 396 | 396 | break; | 
| 397 | 397 | case 'search': | 
| 398 | -			if ( is_search() && isset( $_REQUEST['geodir_search'] ) ) {
 | |
| 398 | +			if (is_search() && isset($_REQUEST['geodir_search'])) {
 | |
| 399 | 399 | return true; | 
| 400 | 400 | } | 
| 401 | 401 | break; | 
| 402 | 402 | case 'info': | 
| 403 | -			if ( is_page() && get_query_var( 'page_id' ) == geodir_info_page_id() ) {
 | |
| 403 | +			if (is_page() && get_query_var('page_id') == geodir_info_page_id()) {
 | |
| 404 | 404 | return true; | 
| 405 | 405 | } | 
| 406 | 406 | break; | 
| 407 | 407 | case 'login': | 
| 408 | -			if ( is_page() && get_query_var( 'page_id' ) == geodir_login_page_id() ) {
 | |
| 408 | +			if (is_page() && get_query_var('page_id') == geodir_login_page_id()) {
 | |
| 409 | 409 | return true; | 
| 410 | 410 | } | 
| 411 | 411 | break; | 
| 412 | 412 | case 'checkout': | 
| 413 | -			if ( is_page() && function_exists( 'geodir_payment_checkout_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_checkout_page_id() ) {
 | |
| 413 | +			if (is_page() && function_exists('geodir_payment_checkout_page_id') && get_query_var('page_id') == geodir_payment_checkout_page_id()) {
 | |
| 414 | 414 | return true; | 
| 415 | 415 | } | 
| 416 | 416 | break; | 
| 417 | 417 | case 'invoices': | 
| 418 | -			if ( is_page() && function_exists( 'geodir_payment_invoices_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_invoices_page_id() ) {
 | |
| 418 | +			if (is_page() && function_exists('geodir_payment_invoices_page_id') && get_query_var('page_id') == geodir_payment_invoices_page_id()) {
 | |
| 419 | 419 | return true; | 
| 420 | 420 | } | 
| 421 | 421 | break; | 
| @@ -440,25 +440,25 @@ discard block | ||
| 440 | 440 | * | 
| 441 | 441 | * @param object $wp WordPress object. | 
| 442 | 442 | */ | 
| 443 | -function geodir_set_is_geodir_page( $wp ) {
 | |
| 444 | -	if ( ! is_admin() ) {
 | |
| 443 | +function geodir_set_is_geodir_page($wp) {
 | |
| 444 | +	if (!is_admin()) {
 | |
| 445 | 445 | //$wp->query_vars['gd_is_geodir_page'] = false; | 
| 446 | 446 | //print_r() | 
| 447 | - if ( empty( $wp->query_vars ) || ! array_diff( array_keys( $wp->query_vars ), array( | |
| 447 | + if (empty($wp->query_vars) || !array_diff(array_keys($wp->query_vars), array( | |
| 448 | 448 | 'preview', | 
| 449 | 449 | 'page', | 
| 450 | 450 | 'paged', | 
| 451 | 451 | 'cpage' | 
| 452 | - ) ) | |
| 452 | + )) | |
| 453 | 453 |  		) {
 | 
| 454 | -			if ( geodir_is_page( 'home' ) ) {
 | |
| 454 | +			if (geodir_is_page('home')) {
 | |
| 455 | 455 | $wp->query_vars['gd_is_geodir_page'] = true; | 
| 456 | 456 | } | 
| 457 | 457 | |
| 458 | 458 | |
| 459 | 459 | } | 
| 460 | 460 | |
| 461 | -		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['page_id'] ) ) {
 | |
| 461 | +		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['page_id'])) {
 | |
| 462 | 462 | if ( | 
| 463 | 463 | $wp->query_vars['page_id'] == geodir_add_listing_page_id() | 
| 464 | 464 | || $wp->query_vars['page_id'] == geodir_preview_page_id() | 
| @@ -467,26 +467,26 @@ discard block | ||
| 467 | 467 | || $wp->query_vars['page_id'] == geodir_home_page_id() | 
| 468 | 468 | || $wp->query_vars['page_id'] == geodir_info_page_id() | 
| 469 | 469 | || $wp->query_vars['page_id'] == geodir_login_page_id() | 
| 470 | - || ( function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() ) | |
| 471 | - || ( function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() ) | |
| 470 | +				|| (function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())
 | |
| 471 | +				|| (function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())
 | |
| 472 | 472 |  			) {
 | 
| 473 | 473 | $wp->query_vars['gd_is_geodir_page'] = true; | 
| 474 | 474 | } | 
| 475 | 475 | } | 
| 476 | 476 | |
| 477 | -		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['pagename'] ) ) {
 | |
| 478 | - $page = get_page_by_path( $wp->query_vars['pagename'] ); | |
| 477 | +		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['pagename'])) {
 | |
| 478 | + $page = get_page_by_path($wp->query_vars['pagename']); | |
| 479 | 479 | |
| 480 | - if ( ! empty( $page ) && ( | |
| 480 | + if (!empty($page) && ( | |
| 481 | 481 | $page->ID == geodir_add_listing_page_id() | 
| 482 | 482 | || $page->ID == geodir_preview_page_id() | 
| 483 | 483 | || $page->ID == geodir_success_page_id() | 
| 484 | 484 | || $page->ID == geodir_location_page_id() | 
| 485 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_home_page_id() ) | |
| 486 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_info_page_id() ) | |
| 487 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_login_page_id() ) | |
| 488 | - || ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() ) | |
| 489 | - || ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() ) | |
| 485 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_home_page_id()) | |
| 486 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_info_page_id()) | |
| 487 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_login_page_id()) | |
| 488 | +					|| (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())
 | |
| 489 | +					|| (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())
 | |
| 490 | 490 | ) | 
| 491 | 491 |  			) {
 | 
| 492 | 492 | $wp->query_vars['gd_is_geodir_page'] = true; | 
| @@ -494,20 +494,20 @@ discard block | ||
| 494 | 494 | } | 
| 495 | 495 | |
| 496 | 496 | |
| 497 | -		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['post_type'] ) && $wp->query_vars['post_type'] != '' ) {
 | |
| 497 | +		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {
 | |
| 498 | 498 | $requested_post_type = $wp->query_vars['post_type']; | 
| 499 | 499 | // check if this post type is geodirectory post types | 
| 500 | 500 | $post_type_array = geodir_get_posttypes(); | 
| 501 | -			if ( in_array( $requested_post_type, $post_type_array ) ) {
 | |
| 501 | +			if (in_array($requested_post_type, $post_type_array)) {
 | |
| 502 | 502 | $wp->query_vars['gd_is_geodir_page'] = true; | 
| 503 | 503 | } | 
| 504 | 504 | } | 
| 505 | 505 | |
| 506 | -		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) ) {
 | |
| 507 | - $geodir_taxonomis = geodir_get_taxonomies( '', true ); | |
| 508 | -			if ( ! empty( $geodir_taxonomis ) ) {
 | |
| 509 | -				foreach ( $geodir_taxonomis as $taxonomy ) {
 | |
| 510 | -					if ( array_key_exists( $taxonomy, $wp->query_vars ) ) {
 | |
| 506 | +		if (!isset($wp->query_vars['gd_is_geodir_page'])) {
 | |
| 507 | +			$geodir_taxonomis = geodir_get_taxonomies('', true);
 | |
| 508 | +			if (!empty($geodir_taxonomis)) {
 | |
| 509 | +				foreach ($geodir_taxonomis as $taxonomy) {
 | |
| 510 | +					if (array_key_exists($taxonomy, $wp->query_vars)) {
 | |
| 511 | 511 | $wp->query_vars['gd_is_geodir_page'] = true; | 
| 512 | 512 | break; | 
| 513 | 513 | } | 
| @@ -516,20 +516,20 @@ discard block | ||
| 516 | 516 | |
| 517 | 517 | } | 
| 518 | 518 | |
| 519 | -		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['author_name'] ) && isset( $_REQUEST['geodir_dashbord'] ) ) {
 | |
| 519 | +		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['author_name']) && isset($_REQUEST['geodir_dashbord'])) {
 | |
| 520 | 520 | $wp->query_vars['gd_is_geodir_page'] = true; | 
| 521 | 521 | } | 
| 522 | 522 | |
| 523 | 523 | |
| 524 | -		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $_REQUEST['geodir_search'] ) ) {
 | |
| 524 | +		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($_REQUEST['geodir_search'])) {
 | |
| 525 | 525 | $wp->query_vars['gd_is_geodir_page'] = true; | 
| 526 | 526 | } | 
| 527 | 527 | |
| 528 | 528 | |
| 529 | 529 | //check if homepage | 
| 530 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) | |
| 531 | - && ! isset( $wp->query_vars['page_id'] ) | |
| 532 | - && ! isset( $wp->query_vars['pagename'] ) | |
| 530 | + if (!isset($wp->query_vars['gd_is_geodir_page']) | |
| 531 | + && !isset($wp->query_vars['page_id']) | |
| 532 | + && !isset($wp->query_vars['pagename']) | |
| 533 | 533 | && is_page_geodir_home() | 
| 534 | 534 |  		) {
 | 
| 535 | 535 | $wp->query_vars['gd_is_geodir_page'] = true; | 
| @@ -553,14 +553,14 @@ discard block | ||
| 553 | 553 | */ | 
| 554 | 554 |  function geodir_is_geodir_page() {
 | 
| 555 | 555 | global $wp; | 
| 556 | -	if ( isset( $wp->query_vars['gd_is_geodir_page'] ) && $wp->query_vars['gd_is_geodir_page'] ) {
 | |
| 556 | +	if (isset($wp->query_vars['gd_is_geodir_page']) && $wp->query_vars['gd_is_geodir_page']) {
 | |
| 557 | 557 | return true; | 
| 558 | 558 |  	} else {
 | 
| 559 | 559 | return false; | 
| 560 | 560 | } | 
| 561 | 561 | } | 
| 562 | 562 | |
| 563 | -if ( ! function_exists( 'geodir_get_imagesize' ) ) {
 | |
| 563 | +if (!function_exists('geodir_get_imagesize')) {
 | |
| 564 | 564 | /** | 
| 565 | 565 | * Get image size using the size key . | 
| 566 | 566 | * | 
| @@ -571,13 +571,13 @@ discard block | ||
| 571 | 571 | * | 
| 572 | 572 | * @return array|mixed|void|WP_Error If valid returns image size. Else returns error. | 
| 573 | 573 | */ | 
| 574 | -	function geodir_get_imagesize( $size = '' ) {
 | |
| 574 | +	function geodir_get_imagesize($size = '') {
 | |
| 575 | 575 | |
| 576 | 576 | $imagesizes = array( | 
| 577 | - 'list-thumb' => array( 'w' => 283, 'h' => 188 ), | |
| 578 | - 'thumbnail' => array( 'w' => 125, 'h' => 125 ), | |
| 579 | - 'widget-thumb' => array( 'w' => 50, 'h' => 50 ), | |
| 580 | - 'slider-thumb' => array( 'w' => 100, 'h' => 100 ) | |
| 577 | +			'list-thumb'   => array('w' => 283, 'h' => 188),
 | |
| 578 | +			'thumbnail'    => array('w' => 125, 'h' => 125),
 | |
| 579 | +			'widget-thumb' => array('w' => 50, 'h' => 50),
 | |
| 580 | +			'slider-thumb' => array('w' => 100, 'h' => 100)
 | |
| 581 | 581 | ); | 
| 582 | 582 | |
| 583 | 583 | /** | 
| @@ -587,9 +587,9 @@ discard block | ||
| 587 | 587 | * | 
| 588 | 588 | * @param array $imagesizes Image size array. | 
| 589 | 589 | */ | 
| 590 | - $imagesizes = apply_filters( 'geodir_imagesizes', $imagesizes ); | |
| 590 | +		$imagesizes = apply_filters('geodir_imagesizes', $imagesizes);
 | |
| 591 | 591 | |
| 592 | -		if ( ! empty( $size ) && array_key_exists( $size, $imagesizes ) ) {
 | |
| 592 | +		if (!empty($size) && array_key_exists($size, $imagesizes)) {
 | |
| 593 | 593 | /** | 
| 594 | 594 | * Filters image size of the passed key. | 
| 595 | 595 | * | 
| @@ -597,11 +597,11 @@ discard block | ||
| 597 | 597 | * | 
| 598 | 598 | * @param array $imagesizes [$size] Image size array of the passed key. | 
| 599 | 599 | */ | 
| 600 | - return apply_filters( 'geodir_get_imagesize_' . $size, $imagesizes[ $size ] ); | |
| 600 | +			return apply_filters('geodir_get_imagesize_'.$size, $imagesizes[$size]);
 | |
| 601 | 601 | |
| 602 | -		} elseif ( ! empty( $size ) ) {
 | |
| 602 | +		} elseif (!empty($size)) {
 | |
| 603 | 603 | |
| 604 | - return new WP_Error( 'geodir_no_imagesize', __( "Given image size is not valid", 'geodirectory' ) ); | |
| 604 | +			return new WP_Error('geodir_no_imagesize', __("Given image size is not valid", 'geodirectory'));
 | |
| 605 | 605 | |
| 606 | 606 | } | 
| 607 | 607 | |
| @@ -625,7 +625,7 @@ discard block | ||
| 625 | 625 | */ | 
| 626 | 626 | |
| 627 | 627 | |
| 628 | -if ( ! function_exists( 'createRandomString' ) ) {
 | |
| 628 | +if (!function_exists('createRandomString')) {
 | |
| 629 | 629 | /** | 
| 630 | 630 | * Creates random string. | 
| 631 | 631 | * | 
| @@ -635,21 +635,21 @@ discard block | ||
| 635 | 635 | */ | 
| 636 | 636 |  	function createRandomString() {
 | 
| 637 | 637 | $chars = "abcdefghijkmlnopqrstuvwxyz1023456789"; | 
| 638 | - srand( (double) microtime() * 1000000 ); | |
| 638 | + srand((double) microtime() * 1000000); | |
| 639 | 639 | $i = 0; | 
| 640 | 640 | $rstring = ''; | 
| 641 | -		while ( $i <= 25 ) {
 | |
| 641 | +		while ($i <= 25) {
 | |
| 642 | 642 | $num = rand() % 33; | 
| 643 | - $tmp = substr( $chars, $num, 1 ); | |
| 644 | - $rstring = $rstring . $tmp; | |
| 645 | - $i ++; | |
| 643 | + $tmp = substr($chars, $num, 1); | |
| 644 | + $rstring = $rstring.$tmp; | |
| 645 | + $i++; | |
| 646 | 646 | } | 
| 647 | 647 | |
| 648 | 648 | return $rstring; | 
| 649 | 649 | } | 
| 650 | 650 | } | 
| 651 | 651 | |
| 652 | -if ( ! function_exists( 'geodir_getDistanceRadius' ) ) {
 | |
| 652 | +if (!function_exists('geodir_getDistanceRadius')) {
 | |
| 653 | 653 | /** | 
| 654 | 654 | * Calculates the distance radius. | 
| 655 | 655 | * | 
| @@ -660,9 +660,9 @@ discard block | ||
| 660 | 660 | * | 
| 661 | 661 | * @return float The mean radius. | 
| 662 | 662 | */ | 
| 663 | -	function geodir_getDistanceRadius( $uom = 'km' ) {
 | |
| 663 | +	function geodir_getDistanceRadius($uom = 'km') {
 | |
| 664 | 664 | // Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude | 
| 665 | - switch ( geodir_strtolower( $uom ) ): | |
| 665 | + switch (geodir_strtolower($uom)): | |
| 666 | 666 | case 'km' : | 
| 667 | 667 | $earthMeanRadius = 6371.009; // km | 
| 668 | 668 | break; | 
| @@ -694,7 +694,7 @@ discard block | ||
| 694 | 694 | } | 
| 695 | 695 | |
| 696 | 696 | |
| 697 | -if ( ! function_exists( 'geodir_calculateDistanceFromLatLong' ) ) {
 | |
| 697 | +if (!function_exists('geodir_calculateDistanceFromLatLong')) {
 | |
| 698 | 698 | /** | 
| 699 | 699 | * Calculate the great circle distance between two points identified by longitude and latitude. | 
| 700 | 700 | * | 
| @@ -707,17 +707,17 @@ discard block | ||
| 707 | 707 | * | 
| 708 | 708 | * @return float The distance. | 
| 709 | 709 | */ | 
| 710 | -	function geodir_calculateDistanceFromLatLong( $point1, $point2, $uom = 'km' ) {
 | |
| 710 | +	function geodir_calculateDistanceFromLatLong($point1, $point2, $uom = 'km') {
 | |
| 711 | 711 | // Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude | 
| 712 | 712 | |
| 713 | - $earthMeanRadius = geodir_getDistanceRadius( $uom ); | |
| 713 | + $earthMeanRadius = geodir_getDistanceRadius($uom); | |
| 714 | 714 | |
| 715 | - $deltaLatitude = deg2rad( (float) $point2['latitude'] - (float) $point1['latitude'] ); | |
| 716 | - $deltaLongitude = deg2rad( (float) $point2['longitude'] - (float) $point1['longitude'] ); | |
| 717 | - $a = sin( $deltaLatitude / 2 ) * sin( $deltaLatitude / 2 ) + | |
| 718 | - cos( deg2rad( (float) $point1['latitude'] ) ) * cos( deg2rad( (float) $point2['latitude'] ) ) * | |
| 719 | - sin( $deltaLongitude / 2 ) * sin( $deltaLongitude / 2 ); | |
| 720 | - $c = 2 * atan2( sqrt( $a ), sqrt( 1 - $a ) ); | |
| 715 | + $deltaLatitude = deg2rad((float) $point2['latitude'] - (float) $point1['latitude']); | |
| 716 | + $deltaLongitude = deg2rad((float) $point2['longitude'] - (float) $point1['longitude']); | |
| 717 | + $a = sin($deltaLatitude / 2) * sin($deltaLatitude / 2) + | |
| 718 | + cos(deg2rad((float) $point1['latitude'])) * cos(deg2rad((float) $point2['latitude'])) * | |
| 719 | + sin($deltaLongitude / 2) * sin($deltaLongitude / 2); | |
| 720 | + $c = 2 * atan2(sqrt($a), sqrt(1 - $a)); | |
| 721 | 721 | $distance = $earthMeanRadius * $c; | 
| 722 | 722 | |
| 723 | 723 | return $distance; | 
| @@ -726,7 +726,7 @@ discard block | ||
| 726 | 726 | } | 
| 727 | 727 | |
| 728 | 728 | |
| 729 | -if ( ! function_exists( 'geodir_sendEmail' ) ) {
 | |
| 729 | +if (!function_exists('geodir_sendEmail')) {
 | |
| 730 | 730 | /** | 
| 731 | 731 | * The main function that send transactional emails using the args provided. | 
| 732 | 732 | * | 
| @@ -745,95 +745,95 @@ discard block | ||
| 745 | 745 | * @param string $post_id The post ID. | 
| 746 | 746 | * @param string $user_id The user ID. | 
| 747 | 747 | */ | 
| 748 | -	function geodir_sendEmail( $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '' ) {
 | |
| 748 | +	function geodir_sendEmail($fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '') {
 | |
| 749 | 749 | $login_details = ''; | 
| 750 | 750 | |
| 751 | 751 | // strip slashes from subject & message text | 
| 752 | - $to_subject = stripslashes_deep( $to_subject ); | |
| 753 | - $to_message = stripslashes_deep( $to_message ); | |
| 752 | + $to_subject = stripslashes_deep($to_subject); | |
| 753 | + $to_message = stripslashes_deep($to_message); | |
| 754 | 754 | |
| 755 | -		if ( $message_type == 'send_friend' ) {
 | |
| 756 | - $subject = get_option( 'geodir_email_friend_subject' ); | |
| 757 | - $message = get_option( 'geodir_email_friend_content' ); | |
| 758 | -		} elseif ( $message_type == 'send_enquiry' ) {
 | |
| 759 | - $subject = get_option( 'geodir_email_enquiry_subject' ); | |
| 760 | - $message = get_option( 'geodir_email_enquiry_content' ); | |
| 755 | +		if ($message_type == 'send_friend') {
 | |
| 756 | +			$subject = get_option('geodir_email_friend_subject');
 | |
| 757 | +			$message = get_option('geodir_email_friend_content');
 | |
| 758 | +		} elseif ($message_type == 'send_enquiry') {
 | |
| 759 | +			$subject = get_option('geodir_email_enquiry_subject');
 | |
| 760 | +			$message = get_option('geodir_email_enquiry_content');
 | |
| 761 | 761 | |
| 762 | 762 | // change to name in some cases | 
| 763 | - $post_author = get_post_field( 'post_author', $post_id ); | |
| 764 | -			if(is_super_admin( $post_author  )){// if admin probably not the post author so change name
 | |
| 765 | -				$toEmailName = __('Business Owner','geodirectory');
 | |
| 766 | -			}elseif(defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id,'claimed')!='1'){// if claim manager installed but listing not claimed
 | |
| 767 | -				$toEmailName = __('Business Owner','geodirectory');
 | |
| 763 | +			$post_author = get_post_field('post_author', $post_id);
 | |
| 764 | +			if (is_super_admin($post_author)) {// if admin probably not the post author so change name
 | |
| 765 | +				$toEmailName = __('Business Owner', 'geodirectory');
 | |
| 766 | +			}elseif (defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id, 'claimed') != '1') {// if claim manager installed but listing not claimed
 | |
| 767 | +				$toEmailName = __('Business Owner', 'geodirectory');
 | |
| 768 | 768 | } | 
| 769 | 769 | |
| 770 | 770 | |
| 771 | -		} elseif ( $message_type == 'forgot_password' ) {
 | |
| 772 | - $subject = get_option( 'geodir_forgot_password_subject' ); | |
| 773 | - $message = get_option( 'geodir_forgot_password_content' ); | |
| 771 | +		} elseif ($message_type == 'forgot_password') {
 | |
| 772 | +			$subject       = get_option('geodir_forgot_password_subject');
 | |
| 773 | +			$message       = get_option('geodir_forgot_password_content');
 | |
| 774 | 774 | $login_details = $to_message; | 
| 775 | -		} elseif ( $message_type == 'registration' ) {
 | |
| 776 | - $subject = get_option( 'geodir_registration_success_email_subject' ); | |
| 777 | - $message = get_option( 'geodir_registration_success_email_content' ); | |
| 775 | +		} elseif ($message_type == 'registration') {
 | |
| 776 | +			$subject       = get_option('geodir_registration_success_email_subject');
 | |
| 777 | +			$message       = get_option('geodir_registration_success_email_content');
 | |
| 778 | 778 | $login_details = $to_message; | 
| 779 | -		} elseif ( $message_type == 'post_submit' ) {
 | |
| 780 | - $subject = get_option( 'geodir_post_submited_success_email_subject' ); | |
| 781 | - $message = get_option( 'geodir_post_submited_success_email_content' ); | |
| 782 | -		} elseif ( $message_type == 'listing_published' ) {
 | |
| 783 | - $subject = get_option( 'geodir_post_published_email_subject' ); | |
| 784 | - $message = get_option( 'geodir_post_published_email_content' ); | |
| 785 | -		} elseif ( $message_type == 'listing_edited' ) {
 | |
| 786 | - $subject = get_option( 'geodir_post_edited_email_subject_admin' ); | |
| 787 | - $message = get_option( 'geodir_post_edited_email_content_admin' ); | |
| 779 | +		} elseif ($message_type == 'post_submit') {
 | |
| 780 | +			$subject = get_option('geodir_post_submited_success_email_subject');
 | |
| 781 | +			$message = get_option('geodir_post_submited_success_email_content');
 | |
| 782 | +		} elseif ($message_type == 'listing_published') {
 | |
| 783 | +			$subject = get_option('geodir_post_published_email_subject');
 | |
| 784 | +			$message = get_option('geodir_post_published_email_content');
 | |
| 785 | +		} elseif ($message_type == 'listing_edited') {
 | |
| 786 | +			$subject = get_option('geodir_post_edited_email_subject_admin');
 | |
| 787 | +			$message = get_option('geodir_post_edited_email_content_admin');
 | |
| 788 | 788 | } | 
| 789 | 789 | |
| 790 | -		if ( ! empty( $subject ) ) {
 | |
| 791 | - $subject = __( stripslashes_deep( $subject ), 'geodirectory' ); | |
| 790 | +		if (!empty($subject)) {
 | |
| 791 | + $subject = __(stripslashes_deep($subject), 'geodirectory'); | |
| 792 | 792 | } | 
| 793 | 793 | |
| 794 | -		if ( ! empty( $message ) ) {
 | |
| 795 | - $message = __( stripslashes_deep( $message ), 'geodirectory' ); | |
| 794 | +		if (!empty($message)) {
 | |
| 795 | + $message = __(stripslashes_deep($message), 'geodirectory'); | |
| 796 | 796 | } | 
| 797 | 797 | |
| 798 | - $to_message = nl2br( $to_message ); | |
| 799 | - $sitefromEmail = get_option( 'site_email' ); | |
| 798 | + $to_message = nl2br($to_message); | |
| 799 | +		$sitefromEmail     = get_option('site_email');
 | |
| 800 | 800 | $sitefromEmailName = get_site_emailName(); | 
| 801 | - $productlink = get_permalink( $post_id ); | |
| 801 | + $productlink = get_permalink($post_id); | |
| 802 | 802 | |
| 803 | 803 | $user_login = ''; | 
| 804 | -		if ( $user_id > 0 && $user_info = get_userdata( $user_id ) ) {
 | |
| 804 | +		if ($user_id > 0 && $user_info = get_userdata($user_id)) {
 | |
| 805 | 805 | $user_login = $user_info->user_login; | 
| 806 | 806 | } | 
| 807 | 807 | |
| 808 | 808 | $posted_date = ''; | 
| 809 | 809 | $listingLink = ''; | 
| 810 | 810 | |
| 811 | - $post_info = get_post( $post_id ); | |
| 811 | + $post_info = get_post($post_id); | |
| 812 | 812 | |
| 813 | -		if ( $post_info ) {
 | |
| 813 | +		if ($post_info) {
 | |
| 814 | 814 | $posted_date = $post_info->post_date; | 
| 815 | - $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>'; | |
| 815 | + $listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>'; | |
| 816 | 816 | } | 
| 817 | 817 | $siteurl = home_url(); | 
| 818 | - $siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>'; | |
| 818 | + $siteurl_link = '<a href="'.$siteurl.'">'.$siteurl.'</a>'; | |
| 819 | 819 | $loginurl = geodir_login_url(); | 
| 820 | - $loginurl_link = '<a href="' . $loginurl . '">login</a>'; | |
| 820 | + $loginurl_link = '<a href="'.$loginurl.'">login</a>'; | |
| 821 | 821 | |
| 822 | - $post_author_id = ! empty( $post_info ) ? $post_info->post_author : 0; | |
| 823 | - $post_author_data = $post_author_id ? get_userdata( $post_author_id ) : NULL; | |
| 824 | - $post_author_name = geodir_get_client_name( $post_author_id ); | |
| 825 | - $post_author_email = !empty( $post_author_data->user_email ) ? $post_author_data->user_email : ''; | |
| 826 | - $current_date = date_i18n( 'Y-m-d H:i:s', current_time( 'timestamp' ) ); | |
| 827 | - | |
| 828 | -		if ( $fromEmail == '' ) {
 | |
| 829 | - $fromEmail = get_option( 'site_email' ); | |
| 822 | + $post_author_id = !empty($post_info) ? $post_info->post_author : 0; | |
| 823 | + $post_author_data = $post_author_id ? get_userdata($post_author_id) : NULL; | |
| 824 | + $post_author_name = geodir_get_client_name($post_author_id); | |
| 825 | + $post_author_email = !empty($post_author_data->user_email) ? $post_author_data->user_email : ''; | |
| 826 | +		$current_date     = date_i18n('Y-m-d H:i:s', current_time('timestamp'));
 | |
| 827 | + | |
| 828 | +		if ($fromEmail == '') {
 | |
| 829 | +			$fromEmail = get_option('site_email');
 | |
| 830 | 830 | } | 
| 831 | 831 | |
| 832 | -		if ( $fromEmailName == '' ) {
 | |
| 833 | - $fromEmailName = get_option( 'site_email_name' ); | |
| 832 | +		if ($fromEmailName == '') {
 | |
| 833 | +			$fromEmailName = get_option('site_email_name');
 | |
| 834 | 834 | } | 
| 835 | 835 | |
| 836 | - $search_array = array( | |
| 836 | + $search_array = array( | |
| 837 | 837 | '[#listing_link#]', | 
| 838 | 838 | '[#site_name_url#]', | 
| 839 | 839 | '[#post_id#]', | 
| @@ -875,7 +875,7 @@ discard block | ||
| 875 | 875 | $post_author_email, | 
| 876 | 876 | $current_date, | 
| 877 | 877 | ); | 
| 878 | - $message = str_replace( $search_array, $replace_array, $message ); | |
| 878 | + $message = str_replace($search_array, $replace_array, $message); | |
| 879 | 879 | |
| 880 | 880 | $search_array = array( | 
| 881 | 881 | '[#listing_link#]', | 
| @@ -913,12 +913,12 @@ discard block | ||
| 913 | 913 | $post_author_email, | 
| 914 | 914 | $current_date | 
| 915 | 915 | ); | 
| 916 | - $subject = str_replace( $search_array, $replace_array, $subject ); | |
| 916 | + $subject = str_replace($search_array, $replace_array, $subject); | |
| 917 | 917 | |
| 918 | - $headers = array(); | |
| 918 | + $headers = array(); | |
| 919 | 919 | $headers[] = 'Content-type: text/html; charset=UTF-8'; | 
| 920 | - $headers[] = "Reply-To: " . $fromEmail; | |
| 921 | - $headers[] = 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>'; | |
| 920 | + $headers[] = "Reply-To: ".$fromEmail; | |
| 921 | + $headers[] = 'From: '.$sitefromEmailName.' <'.$sitefromEmail.'>'; | |
| 922 | 922 | |
| 923 | 923 | $to = $toEmail; | 
| 924 | 924 | |
| @@ -940,7 +940,7 @@ discard block | ||
| 940 | 940 | * @param string $post_id The post ID. | 
| 941 | 941 | * @param string $user_id The user ID. | 
| 942 | 942 | */ | 
| 943 | - $to = apply_filters( 'geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); | |
| 943 | +		$to = apply_filters('geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
 | |
| 944 | 944 | /** | 
| 945 | 945 | * Filter the client email subject. | 
| 946 | 946 | * | 
| @@ -959,7 +959,7 @@ discard block | ||
| 959 | 959 | * @param string $post_id The post ID. | 
| 960 | 960 | * @param string $user_id The user ID. | 
| 961 | 961 | */ | 
| 962 | - $subject = apply_filters( 'geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); | |
| 962 | +		$subject = apply_filters('geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
 | |
| 963 | 963 | /** | 
| 964 | 964 | * Filter the client email message. | 
| 965 | 965 | * | 
| @@ -978,7 +978,7 @@ discard block | ||
| 978 | 978 | * @param string $post_id The post ID. | 
| 979 | 979 | * @param string $user_id The user ID. | 
| 980 | 980 | */ | 
| 981 | - $message = apply_filters( 'geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); | |
| 981 | +		$message = apply_filters('geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
 | |
| 982 | 982 | /** | 
| 983 | 983 | * Filter the client email headers. | 
| 984 | 984 | * | 
| @@ -997,39 +997,39 @@ discard block | ||
| 997 | 997 | * @param string $post_id The post ID. | 
| 998 | 998 | * @param string $user_id The user ID. | 
| 999 | 999 | */ | 
| 1000 | - $headers = apply_filters( 'geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); | |
| 1000 | +		$headers = apply_filters('geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
 | |
| 1001 | 1001 | |
| 1002 | - $sent = wp_mail( $to, $subject, $message, $headers ); | |
| 1002 | + $sent = wp_mail($to, $subject, $message, $headers); | |
| 1003 | 1003 | |
| 1004 | -		if ( ! $sent ) {
 | |
| 1005 | -			if ( is_array( $to ) ) {
 | |
| 1006 | - $to = implode( ',', $to ); | |
| 1004 | +		if (!$sent) {
 | |
| 1005 | +			if (is_array($to)) {
 | |
| 1006 | +				$to = implode(',', $to);
 | |
| 1007 | 1007 | } | 
| 1008 | 1008 | $log_message = sprintf( | 
| 1009 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), | |
| 1009 | +				__("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
 | |
| 1010 | 1010 | $message_type, | 
| 1011 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), | |
| 1011 | +				date_i18n('F j Y H:i:s', current_time('timestamp')),
 | |
| 1012 | 1012 | $to, | 
| 1013 | 1013 | $subject | 
| 1014 | 1014 | ); | 
| 1015 | - geodir_error_log( $log_message ); | |
| 1015 | + geodir_error_log($log_message); | |
| 1016 | 1016 | } | 
| 1017 | 1017 | |
| 1018 | 1018 | ///////// ADMIN BCC EMIALS | 
| 1019 | - $adminEmail = get_bloginfo( 'admin_email' ); | |
| 1019 | +		$adminEmail = get_bloginfo('admin_email');
 | |
| 1020 | 1020 | $to = $adminEmail; | 
| 1021 | 1021 | |
| 1022 | 1022 | $admin_bcc = false; | 
| 1023 | -		if ( $message_type == 'registration' ) {
 | |
| 1024 | - $message_raw = explode( __( "Password:", 'geodirectory' ), $message ); | |
| 1025 | - $message_raw2 = explode( "</p>", $message_raw[1], 2 ); | |
| 1026 | - $message = $message_raw[0] . __( 'Password:', 'geodirectory' ) . ' **********</p>' . $message_raw2[1]; | |
| 1023 | +		if ($message_type == 'registration') {
 | |
| 1024 | +			$message_raw  = explode(__("Password:", 'geodirectory'), $message);
 | |
| 1025 | +			$message_raw2 = explode("</p>", $message_raw[1], 2);
 | |
| 1026 | +			$message      = $message_raw[0].__('Password:', 'geodirectory').' **********</p>'.$message_raw2[1];
 | |
| 1027 | 1027 | } | 
| 1028 | -		if ( $message_type == 'post_submit' ) {
 | |
| 1029 | - $subject = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_subject_admin' ) ), 'geodirectory' ); | |
| 1030 | - $message = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_content_admin' ) ), 'geodirectory' ); | |
| 1028 | +		if ($message_type == 'post_submit') {
 | |
| 1029 | +			$subject = __(stripslashes_deep(get_option('geodir_post_submited_success_email_subject_admin')), 'geodirectory');
 | |
| 1030 | +			$message = __(stripslashes_deep(get_option('geodir_post_submited_success_email_content_admin')), 'geodirectory');
 | |
| 1031 | 1031 | |
| 1032 | - $search_array = array( | |
| 1032 | + $search_array = array( | |
| 1033 | 1033 | '[#listing_link#]', | 
| 1034 | 1034 | '[#site_name_url#]', | 
| 1035 | 1035 | '[#post_id#]', | 
| @@ -1065,7 +1065,7 @@ discard block | ||
| 1065 | 1065 | $user_login, | 
| 1066 | 1066 | $post_author_email, | 
| 1067 | 1067 | ); | 
| 1068 | - $message = str_replace( $search_array, $replace_array, $message ); | |
| 1068 | + $message = str_replace($search_array, $replace_array, $message); | |
| 1069 | 1069 | |
| 1070 | 1070 | $search_array = array( | 
| 1071 | 1071 | '[#listing_link#]', | 
| @@ -1097,26 +1097,26 @@ discard block | ||
| 1097 | 1097 | $user_login, | 
| 1098 | 1098 | $post_author_email, | 
| 1099 | 1099 | ); | 
| 1100 | - $subject = str_replace( $search_array, $replace_array, $subject ); | |
| 1100 | + $subject = str_replace($search_array, $replace_array, $subject); | |
| 1101 | 1101 | |
| 1102 | 1102 | $subject .= ' - ADMIN BCC COPY'; | 
| 1103 | 1103 | $admin_bcc = true; | 
| 1104 | 1104 | |
| 1105 | -		} elseif ( $message_type == 'registration' && get_option( 'geodir_bcc_new_user' ) ) {
 | |
| 1105 | +		} elseif ($message_type == 'registration' && get_option('geodir_bcc_new_user')) {
 | |
| 1106 | 1106 | $subject .= ' - ADMIN BCC COPY'; | 
| 1107 | 1107 | $admin_bcc = true; | 
| 1108 | -		} elseif ( $message_type == 'send_friend' && get_option( 'geodir_bcc_friend' ) ) {
 | |
| 1108 | +		} elseif ($message_type == 'send_friend' && get_option('geodir_bcc_friend')) {
 | |
| 1109 | 1109 | $subject .= ' - ADMIN BCC COPY'; | 
| 1110 | 1110 | $admin_bcc = true; | 
| 1111 | -		} elseif ( $message_type == 'send_enquiry' && get_option( 'geodir_bcc_enquiry' ) ) {
 | |
| 1111 | +		} elseif ($message_type == 'send_enquiry' && get_option('geodir_bcc_enquiry')) {
 | |
| 1112 | 1112 | $subject .= ' - ADMIN BCC COPY'; | 
| 1113 | 1113 | $admin_bcc = true; | 
| 1114 | -		} elseif ( $message_type == 'listing_published' && get_option( 'geodir_bcc_listing_published' ) ) {
 | |
| 1114 | +		} elseif ($message_type == 'listing_published' && get_option('geodir_bcc_listing_published')) {
 | |
| 1115 | 1115 | $subject .= ' - ADMIN BCC COPY'; | 
| 1116 | 1116 | $admin_bcc = true; | 
| 1117 | 1117 | } | 
| 1118 | 1118 | |
| 1119 | -		if ( $admin_bcc === true ) {
 | |
| 1119 | +		if ($admin_bcc === true) {
 | |
| 1120 | 1120 | |
| 1121 | 1121 | /** | 
| 1122 | 1122 | * Filter the client email subject. | 
| @@ -1136,7 +1136,7 @@ discard block | ||
| 1136 | 1136 | * @param string $post_id The post ID. | 
| 1137 | 1137 | * @param string $user_id The user ID. | 
| 1138 | 1138 | */ | 
| 1139 | - $subject = apply_filters( 'geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); | |
| 1139 | +			$subject = apply_filters('geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
 | |
| 1140 | 1140 | /** | 
| 1141 | 1141 | * Filter the client email message. | 
| 1142 | 1142 | * | 
| @@ -1155,23 +1155,23 @@ discard block | ||
| 1155 | 1155 | * @param string $post_id The post ID. | 
| 1156 | 1156 | * @param string $user_id The user ID. | 
| 1157 | 1157 | */ | 
| 1158 | - $message = apply_filters( 'geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); | |
| 1158 | +			$message = apply_filters('geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
 | |
| 1159 | 1159 | |
| 1160 | 1160 | |
| 1161 | - $sent = wp_mail( $to, $subject, $message, $headers ); | |
| 1161 | + $sent = wp_mail($to, $subject, $message, $headers); | |
| 1162 | 1162 | |
| 1163 | -			if ( ! $sent ) {
 | |
| 1164 | -				if ( is_array( $to ) ) {
 | |
| 1165 | - $to = implode( ',', $to ); | |
| 1163 | +			if (!$sent) {
 | |
| 1164 | +				if (is_array($to)) {
 | |
| 1165 | +					$to = implode(',', $to);
 | |
| 1166 | 1166 | } | 
| 1167 | 1167 | $log_message = sprintf( | 
| 1168 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), | |
| 1168 | +					__("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
 | |
| 1169 | 1169 | $message_type, | 
| 1170 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), | |
| 1170 | +					date_i18n('F j Y H:i:s', current_time('timestamp')),
 | |
| 1171 | 1171 | $to, | 
| 1172 | 1172 | $subject | 
| 1173 | 1173 | ); | 
| 1174 | - geodir_error_log( $log_message ); | |
| 1174 | + geodir_error_log($log_message); | |
| 1175 | 1175 | } | 
| 1176 | 1176 | } | 
| 1177 | 1177 | |
| @@ -1187,49 +1187,49 @@ discard block | ||
| 1187 | 1187 | */ | 
| 1188 | 1188 |  function geodir_taxonomy_breadcrumb() {
 | 
| 1189 | 1189 | |
| 1190 | - $term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) ); | |
| 1190 | +	$term   = get_term_by('slug', get_query_var('term'), get_query_var('taxonomy'));
 | |
| 1191 | 1191 | $parent = $term->parent; | 
| 1192 | 1192 | |
| 1193 | - while ( $parent ): | |
| 1193 | + while ($parent): | |
| 1194 | 1194 | $parents[] = $parent; | 
| 1195 | - $new_parent = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); | |
| 1195 | +		$new_parent = get_term_by('id', $parent, get_query_var('taxonomy'));
 | |
| 1196 | 1196 | $parent = $new_parent->parent; | 
| 1197 | 1197 | endwhile; | 
| 1198 | 1198 | |
| 1199 | - if ( ! empty( $parents ) ): | |
| 1200 | - $parents = array_reverse( $parents ); | |
| 1199 | + if (!empty($parents)): | |
| 1200 | + $parents = array_reverse($parents); | |
| 1201 | 1201 | |
| 1202 | - foreach ( $parents as $parent ): | |
| 1203 | - $item = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); | |
| 1204 | - $url = get_term_link( $item, get_query_var( 'taxonomy' ) ); | |
| 1205 | - echo '<li> > <a href="' . $url . '">' . $item->name . '</a></li>'; | |
| 1202 | + foreach ($parents as $parent): | |
| 1203 | +			$item = get_term_by('id', $parent, get_query_var('taxonomy'));
 | |
| 1204 | +			$url  = get_term_link($item, get_query_var('taxonomy'));
 | |
| 1205 | + echo '<li> > <a href="'.$url.'">'.$item->name.'</a></li>'; | |
| 1206 | 1206 | endforeach; | 
| 1207 | 1207 | |
| 1208 | 1208 | endif; | 
| 1209 | 1209 | |
| 1210 | - echo '<li> > ' . $term->name . '</li>'; | |
| 1210 | + echo '<li> > '.$term->name.'</li>'; | |
| 1211 | 1211 | } | 
| 1212 | 1212 | |
| 1213 | -function geodir_wpml_post_type_archive_link($link, $post_type){
 | |
| 1213 | +function geodir_wpml_post_type_archive_link($link, $post_type) {
 | |
| 1214 | 1214 |  	if (function_exists('icl_object_id')) {
 | 
| 1215 | - $post_types = get_option( 'geodir_post_types' ); | |
| 1216 | - $slug = $post_types[ $post_type ]['rewrite']['slug']; | |
| 1215 | +		$post_types   = get_option('geodir_post_types');
 | |
| 1216 | + $slug = $post_types[$post_type]['rewrite']['slug']; | |
| 1217 | 1217 | |
| 1218 | 1218 | // Alter the CPT slug if WPML is set to do so | 
| 1219 | -		if ( function_exists( 'icl_object_id' ) ) {
 | |
| 1220 | -			if ( gd_wpml_slug_translation_turned_on( $post_type ) && $language_code = gd_wpml_get_lang_from_url( $link) ) {
 | |
| 1219 | +		if (function_exists('icl_object_id')) {
 | |
| 1220 | +			if (gd_wpml_slug_translation_turned_on($post_type) && $language_code = gd_wpml_get_lang_from_url($link)) {
 | |
| 1221 | 1221 | |
| 1222 | 1222 | $org_slug = $slug; | 
| 1223 | - $slug = apply_filters( 'wpml_translate_single_string', | |
| 1223 | +				$slug     = apply_filters('wpml_translate_single_string',
 | |
| 1224 | 1224 | $slug, | 
| 1225 | 1225 | 'WordPress', | 
| 1226 | - 'URL slug: ' . $slug, | |
| 1227 | - $language_code ); | |
| 1226 | + 'URL slug: '.$slug, | |
| 1227 | + $language_code); | |
| 1228 | 1228 | |
| 1229 | -				if ( ! $slug ) {
 | |
| 1229 | +				if (!$slug) {
 | |
| 1230 | 1230 | $slug = $org_slug; | 
| 1231 | 1231 |  				} else {
 | 
| 1232 | - $link = str_replace( $org_slug, $slug, $link ); | |
| 1232 | + $link = str_replace($org_slug, $slug, $link); | |
| 1233 | 1233 | } | 
| 1234 | 1234 | } | 
| 1235 | 1235 | } | 
| @@ -1237,7 +1237,7 @@ discard block | ||
| 1237 | 1237 | |
| 1238 | 1238 | return $link; | 
| 1239 | 1239 | } | 
| 1240 | -add_filter( 'post_type_archive_link','geodir_wpml_post_type_archive_link', 1000, 2); | |
| 1240 | +add_filter('post_type_archive_link', 'geodir_wpml_post_type_archive_link', 1000, 2);
 | |
| 1241 | 1241 | |
| 1242 | 1242 | /** | 
| 1243 | 1243 | * Main function that generates breadcrumb for all pages. | 
| @@ -1258,9 +1258,9 @@ discard block | ||
| 1258 | 1258 | * | 
| 1259 | 1259 | * @since 1.0.0 | 
| 1260 | 1260 | */ | 
| 1261 | - $separator = apply_filters( 'geodir_breadcrumb_separator', ' > ' ); | |
| 1261 | +	$separator = apply_filters('geodir_breadcrumb_separator', ' > ');
 | |
| 1262 | 1262 | |
| 1263 | -	if ( ! geodir_is_page( 'home' ) ) {
 | |
| 1263 | +	if (!geodir_is_page('home')) {
 | |
| 1264 | 1264 | $breadcrumb = ''; | 
| 1265 | 1265 | $url_categoris = ''; | 
| 1266 | 1266 | $breadcrumb .= '<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">'; | 
| @@ -1269,167 +1269,167 @@ discard block | ||
| 1269 | 1269 | * | 
| 1270 | 1270 | * @since 1.0.0 | 
| 1271 | 1271 | */ | 
| 1272 | - $breadcrumb .= '<li>' . apply_filters( 'geodir_breadcrumb_first_link', '<a href="' . home_url() . '">' . __( 'Home', 'geodirectory' ) . '</a>' ) . '</li>'; | |
| 1272 | +		$breadcrumb .= '<li>'.apply_filters('geodir_breadcrumb_first_link', '<a href="'.home_url().'">'.__('Home', 'geodirectory').'</a>').'</li>';
 | |
| 1273 | 1273 | |
| 1274 | 1274 | $gd_post_type = geodir_get_current_posttype(); | 
| 1275 | - $post_type_info = get_post_type_object( $gd_post_type ); | |
| 1275 | + $post_type_info = get_post_type_object($gd_post_type); | |
| 1276 | 1276 | |
| 1277 | - remove_filter( 'post_type_archive_link', 'geodir_get_posttype_link' ); | |
| 1277 | +		remove_filter('post_type_archive_link', 'geodir_get_posttype_link');
 | |
| 1278 | 1278 | |
| 1279 | - $listing_link = get_post_type_archive_link( $gd_post_type ); | |
| 1279 | + $listing_link = get_post_type_archive_link($gd_post_type); | |
| 1280 | 1280 | |
| 1281 | - add_filter( 'post_type_archive_link', 'geodir_get_posttype_link', 10, 2 ); | |
| 1282 | - $listing_link = rtrim( $listing_link, '/' ); | |
| 1281 | +		add_filter('post_type_archive_link', 'geodir_get_posttype_link', 10, 2);
 | |
| 1282 | + $listing_link = rtrim($listing_link, '/'); | |
| 1283 | 1283 | $listing_link .= '/'; | 
| 1284 | 1284 | |
| 1285 | 1285 | $post_type_for_location_link = $listing_link; | 
| 1286 | - $location_terms = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); | |
| 1286 | +		$location_terms              = geodir_get_current_location_terms('query_vars', $gd_post_type);
 | |
| 1287 | 1287 | |
| 1288 | 1288 | global $wp, $gd_session; | 
| 1289 | 1289 | $location_link = $post_type_for_location_link; | 
| 1290 | 1290 | |
| 1291 | -		if ( geodir_is_page( 'detail' ) || geodir_is_page( 'listing' ) ) {
 | |
| 1291 | +		if (geodir_is_page('detail') || geodir_is_page('listing')) {
 | |
| 1292 | 1292 | global $post; | 
| 1293 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; | |
| 1294 | - $neighbourhood_active = $location_manager && get_option( 'location_neighbourhoods' ) ? true : false; | |
| 1293 | +			$location_manager     = defined('POST_LOCATION_TABLE') ? true : false;
 | |
| 1294 | +			$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
 | |
| 1295 | 1295 | |
| 1296 | -			if ( geodir_is_page( 'detail' ) && isset( $post->country_slug ) ) {
 | |
| 1296 | +			if (geodir_is_page('detail') && isset($post->country_slug)) {
 | |
| 1297 | 1297 | $location_terms = array( | 
| 1298 | 1298 | 'gd_country' => $post->country_slug, | 
| 1299 | 1299 | 'gd_region' => $post->region_slug, | 
| 1300 | 1300 | 'gd_city' => $post->city_slug | 
| 1301 | 1301 | ); | 
| 1302 | 1302 | |
| 1303 | -				if ( $neighbourhood_active && ! empty( $location_terms['gd_city'] ) && $gd_ses_neighbourhood = $gd_session->get( 'gd_neighbourhood' ) ) {
 | |
| 1303 | +				if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
 | |
| 1304 | 1304 | $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; | 
| 1305 | 1305 | } | 
| 1306 | 1306 | } | 
| 1307 | 1307 | |
| 1308 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); | |
| 1308 | +			$geodir_show_location_url = get_option('geodir_show_location_url');
 | |
| 1309 | 1309 | |
| 1310 | 1310 | $hide_url_part = array(); | 
| 1311 | -			if ( $location_manager ) {
 | |
| 1312 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); | |
| 1313 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); | |
| 1314 | - | |
| 1315 | -				if ( $hide_region_part && $hide_country_part ) {
 | |
| 1316 | - $hide_url_part = array( 'gd_country', 'gd_region' ); | |
| 1317 | -				} else if ( $hide_region_part && ! $hide_country_part ) {
 | |
| 1318 | - $hide_url_part = array( 'gd_region' ); | |
| 1319 | -				} else if ( ! $hide_region_part && $hide_country_part ) {
 | |
| 1320 | - $hide_url_part = array( 'gd_country' ); | |
| 1311 | +			if ($location_manager) {
 | |
| 1312 | +				$hide_country_part = get_option('geodir_location_hide_country_part');
 | |
| 1313 | +				$hide_region_part  = get_option('geodir_location_hide_region_part');
 | |
| 1314 | + | |
| 1315 | +				if ($hide_region_part && $hide_country_part) {
 | |
| 1316 | +					$hide_url_part = array('gd_country', 'gd_region');
 | |
| 1317 | +				} else if ($hide_region_part && !$hide_country_part) {
 | |
| 1318 | +					$hide_url_part = array('gd_region');
 | |
| 1319 | +				} else if (!$hide_region_part && $hide_country_part) {
 | |
| 1320 | +					$hide_url_part = array('gd_country');
 | |
| 1321 | 1321 | } | 
| 1322 | 1322 | } | 
| 1323 | 1323 | |
| 1324 | 1324 | $hide_text_part = array(); | 
| 1325 | -			if ( $geodir_show_location_url == 'country_city' ) {
 | |
| 1326 | - $hide_text_part = array( 'gd_region' ); | |
| 1325 | +			if ($geodir_show_location_url == 'country_city') {
 | |
| 1326 | +				$hide_text_part = array('gd_region');
 | |
| 1327 | 1327 | |
| 1328 | -				if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
 | |
| 1329 | - unset( $location_terms['gd_region'] ); | |
| 1328 | +				if (isset($location_terms['gd_region']) && !$location_manager) {
 | |
| 1329 | + unset($location_terms['gd_region']); | |
| 1330 | 1330 | } | 
| 1331 | -			} else if ( $geodir_show_location_url == 'region_city' ) {
 | |
| 1332 | - $hide_text_part = array( 'gd_country' ); | |
| 1331 | +			} else if ($geodir_show_location_url == 'region_city') {
 | |
| 1332 | +				$hide_text_part = array('gd_country');
 | |
| 1333 | 1333 | |
| 1334 | -				if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
 | |
| 1335 | - unset( $location_terms['gd_country'] ); | |
| 1334 | +				if (isset($location_terms['gd_country']) && !$location_manager) {
 | |
| 1335 | + unset($location_terms['gd_country']); | |
| 1336 | 1336 | } | 
| 1337 | -			} else if ( $geodir_show_location_url == 'city' ) {
 | |
| 1338 | - $hide_text_part = array( 'gd_country', 'gd_region' ); | |
| 1337 | +			} else if ($geodir_show_location_url == 'city') {
 | |
| 1338 | +				$hide_text_part = array('gd_country', 'gd_region');
 | |
| 1339 | 1339 | |
| 1340 | -				if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
 | |
| 1341 | - unset( $location_terms['gd_country'] ); | |
| 1340 | +				if (isset($location_terms['gd_country']) && !$location_manager) {
 | |
| 1341 | + unset($location_terms['gd_country']); | |
| 1342 | 1342 | } | 
| 1343 | -				if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
 | |
| 1344 | - unset( $location_terms['gd_region'] ); | |
| 1343 | +				if (isset($location_terms['gd_region']) && !$location_manager) {
 | |
| 1344 | + unset($location_terms['gd_region']); | |
| 1345 | 1345 | } | 
| 1346 | 1346 | } | 
| 1347 | 1347 | |
| 1348 | 1348 | $is_location_last = ''; | 
| 1349 | 1349 | $is_taxonomy_last = ''; | 
| 1350 | 1350 | $breadcrumb .= '<li>'; | 
| 1351 | -			if ( get_query_var( $gd_post_type . 'category' ) ) {
 | |
| 1352 | - $gd_taxonomy = $gd_post_type . 'category'; | |
| 1353 | -			} elseif ( get_query_var( $gd_post_type . '_tags' ) ) {
 | |
| 1354 | - $gd_taxonomy = $gd_post_type . '_tags'; | |
| 1351 | +			if (get_query_var($gd_post_type.'category')) {
 | |
| 1352 | + $gd_taxonomy = $gd_post_type.'category'; | |
| 1353 | +			} elseif (get_query_var($gd_post_type.'_tags')) {
 | |
| 1354 | + $gd_taxonomy = $gd_post_type.'_tags'; | |
| 1355 | 1355 | } | 
| 1356 | 1356 | |
| 1357 | - $breadcrumb .= $separator . '<a href="' . $listing_link . '">' . __( ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; | |
| 1358 | -			if ( ! empty( $gd_taxonomy ) || geodir_is_page( 'detail' ) ) {
 | |
| 1357 | + $breadcrumb .= $separator.'<a href="'.$listing_link.'">'.__(ucfirst($post_type_info->label), 'geodirectory').'</a>'; | |
| 1358 | +			if (!empty($gd_taxonomy) || geodir_is_page('detail')) {
 | |
| 1359 | 1359 | $is_location_last = false; | 
| 1360 | 1360 |  			} else {
 | 
| 1361 | 1361 | $is_location_last = true; | 
| 1362 | 1362 | } | 
| 1363 | 1363 | |
| 1364 | -			if ( ! empty( $gd_taxonomy ) && geodir_is_page( 'listing' ) ) {
 | |
| 1364 | +			if (!empty($gd_taxonomy) && geodir_is_page('listing')) {
 | |
| 1365 | 1365 | $is_taxonomy_last = true; | 
| 1366 | 1366 |  			} else {
 | 
| 1367 | 1367 | $is_taxonomy_last = false; | 
| 1368 | 1368 | } | 
| 1369 | 1369 | |
| 1370 | -			if ( ! empty( $location_terms ) ) {
 | |
| 1371 | - $geodir_get_locations = function_exists( 'get_actual_location_name' ) ? true : false; | |
| 1370 | +			if (!empty($location_terms)) {
 | |
| 1371 | +				$geodir_get_locations = function_exists('get_actual_location_name') ? true : false;
 | |
| 1372 | 1372 | |
| 1373 | -				foreach ( $location_terms as $key => $location_term ) {
 | |
| 1374 | -					if ( $location_term != '' ) {
 | |
| 1375 | -						if ( ! empty( $hide_url_part ) && in_array( $key, $hide_url_part ) ) { // Hide location part from url & breadcrumb.
 | |
| 1373 | +				foreach ($location_terms as $key => $location_term) {
 | |
| 1374 | +					if ($location_term != '') {
 | |
| 1375 | +						if (!empty($hide_url_part) && in_array($key, $hide_url_part)) { // Hide location part from url & breadcrumb.
 | |
| 1376 | 1376 | continue; | 
| 1377 | 1377 | } | 
| 1378 | 1378 | |
| 1379 | - $gd_location_link_text = preg_replace( '/-(\d+)$/', '', $location_term ); | |
| 1380 | - $gd_location_link_text = preg_replace( '/[_-]/', ' ', $gd_location_link_text ); | |
| 1381 | - $gd_location_link_text = ucfirst( $gd_location_link_text ); | |
| 1379 | +						$gd_location_link_text = preg_replace('/-(\d+)$/', '', $location_term);
 | |
| 1380 | +						$gd_location_link_text = preg_replace('/[_-]/', ' ', $gd_location_link_text);
 | |
| 1381 | + $gd_location_link_text = ucfirst($gd_location_link_text); | |
| 1382 | 1382 | |
| 1383 | 1383 | $location_term_actual_country = ''; | 
| 1384 | 1384 | $location_term_actual_region = ''; | 
| 1385 | 1385 | $location_term_actual_city = ''; | 
| 1386 | 1386 | $location_term_actual_neighbourhood = ''; | 
| 1387 | -						if ( $geodir_get_locations ) {
 | |
| 1388 | -							if ( $key == 'gd_country' ) {
 | |
| 1389 | - $location_term_actual_country = get_actual_location_name( 'country', $location_term, true ); | |
| 1390 | -							} else if ( $key == 'gd_region' ) {
 | |
| 1391 | - $location_term_actual_region = get_actual_location_name( 'region', $location_term, true ); | |
| 1392 | -							} else if ( $key == 'gd_city' ) {
 | |
| 1393 | - $location_term_actual_city = get_actual_location_name( 'city', $location_term, true ); | |
| 1394 | -							} else if ( $key == 'gd_neighbourhood' ) {
 | |
| 1395 | - $location_term_actual_neighbourhood = get_actual_location_name( 'neighbourhood', $location_term, true ); | |
| 1387 | +						if ($geodir_get_locations) {
 | |
| 1388 | +							if ($key == 'gd_country') {
 | |
| 1389 | +								$location_term_actual_country = get_actual_location_name('country', $location_term, true);
 | |
| 1390 | +							} else if ($key == 'gd_region') {
 | |
| 1391 | +								$location_term_actual_region = get_actual_location_name('region', $location_term, true);
 | |
| 1392 | +							} else if ($key == 'gd_city') {
 | |
| 1393 | +								$location_term_actual_city = get_actual_location_name('city', $location_term, true);
 | |
| 1394 | +							} else if ($key == 'gd_neighbourhood') {
 | |
| 1395 | +								$location_term_actual_neighbourhood = get_actual_location_name('neighbourhood', $location_term, true);
 | |
| 1396 | 1396 | } | 
| 1397 | 1397 |  						} else {
 | 
| 1398 | 1398 | $location_info = geodir_get_location(); | 
| 1399 | 1399 | |
| 1400 | -							if ( ! empty( $location_info ) && isset( $location_info->location_id ) ) {
 | |
| 1401 | -								if ( $key == 'gd_country' ) {
 | |
| 1402 | - $location_term_actual_country = __( $location_info->country, 'geodirectory' ); | |
| 1403 | -								} else if ( $key == 'gd_region' ) {
 | |
| 1404 | - $location_term_actual_region = __( $location_info->region, 'geodirectory' ); | |
| 1405 | -								} else if ( $key == 'gd_city' ) {
 | |
| 1406 | - $location_term_actual_city = __( $location_info->city, 'geodirectory' ); | |
| 1400 | +							if (!empty($location_info) && isset($location_info->location_id)) {
 | |
| 1401 | +								if ($key == 'gd_country') {
 | |
| 1402 | + $location_term_actual_country = __($location_info->country, 'geodirectory'); | |
| 1403 | +								} else if ($key == 'gd_region') {
 | |
| 1404 | + $location_term_actual_region = __($location_info->region, 'geodirectory'); | |
| 1405 | +								} else if ($key == 'gd_city') {
 | |
| 1406 | + $location_term_actual_city = __($location_info->city, 'geodirectory'); | |
| 1407 | 1407 | } | 
| 1408 | 1408 | } | 
| 1409 | 1409 | } | 
| 1410 | 1410 | |
| 1411 | -						if ( $is_location_last && $key == 'gd_country' && ! ( isset( $location_terms['gd_region'] ) && $location_terms['gd_region'] != '' ) && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {
 | |
| 1412 | - $breadcrumb .= $location_term_actual_country != '' ? $separator . $location_term_actual_country : $separator . $gd_location_link_text; | |
| 1413 | -						} else if ( $is_location_last && $key == 'gd_region' && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {
 | |
| 1414 | - $breadcrumb .= $location_term_actual_region != '' ? $separator . $location_term_actual_region : $separator . $gd_location_link_text; | |
| 1415 | -						} else if ( $is_location_last && $key == 'gd_city' && empty( $location_terms['gd_neighbourhood'] ) ) {
 | |
| 1416 | - $breadcrumb .= $location_term_actual_city != '' ? $separator . $location_term_actual_city : $separator . $gd_location_link_text; | |
| 1417 | -						} else if ( $is_location_last && $key == 'gd_neighbourhood' ) {
 | |
| 1418 | - $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator . $location_term_actual_neighbourhood : $separator . $gd_location_link_text; | |
| 1411 | +						if ($is_location_last && $key == 'gd_country' && !(isset($location_terms['gd_region']) && $location_terms['gd_region'] != '') && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {
 | |
| 1412 | + $breadcrumb .= $location_term_actual_country != '' ? $separator.$location_term_actual_country : $separator.$gd_location_link_text; | |
| 1413 | +						} else if ($is_location_last && $key == 'gd_region' && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {
 | |
| 1414 | + $breadcrumb .= $location_term_actual_region != '' ? $separator.$location_term_actual_region : $separator.$gd_location_link_text; | |
| 1415 | +						} else if ($is_location_last && $key == 'gd_city' && empty($location_terms['gd_neighbourhood'])) {
 | |
| 1416 | + $breadcrumb .= $location_term_actual_city != '' ? $separator.$location_term_actual_city : $separator.$gd_location_link_text; | |
| 1417 | +						} else if ($is_location_last && $key == 'gd_neighbourhood') {
 | |
| 1418 | + $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator.$location_term_actual_neighbourhood : $separator.$gd_location_link_text; | |
| 1419 | 1419 |  						} else {
 | 
| 1420 | -							if ( get_option( 'permalink_structure' ) != '' ) {
 | |
| 1421 | - $location_link .= $location_term . '/'; | |
| 1420 | +							if (get_option('permalink_structure') != '') {
 | |
| 1421 | + $location_link .= $location_term.'/'; | |
| 1422 | 1422 |  							} else {
 | 
| 1423 | - $location_link .= "&$key=" . $location_term; | |
| 1423 | + $location_link .= "&$key=".$location_term; | |
| 1424 | 1424 | } | 
| 1425 | 1425 | |
| 1426 | -							if ( $key == 'gd_country' && $location_term_actual_country != '' ) {
 | |
| 1426 | +							if ($key == 'gd_country' && $location_term_actual_country != '') {
 | |
| 1427 | 1427 | $gd_location_link_text = $location_term_actual_country; | 
| 1428 | -							} else if ( $key == 'gd_region' && $location_term_actual_region != '' ) {
 | |
| 1428 | +							} else if ($key == 'gd_region' && $location_term_actual_region != '') {
 | |
| 1429 | 1429 | $gd_location_link_text = $location_term_actual_region; | 
| 1430 | -							} else if ( $key == 'gd_city' && $location_term_actual_city != '' ) {
 | |
| 1430 | +							} else if ($key == 'gd_city' && $location_term_actual_city != '') {
 | |
| 1431 | 1431 | $gd_location_link_text = $location_term_actual_city; | 
| 1432 | -							} else if ( $key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '' ) {
 | |
| 1432 | +							} else if ($key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '') {
 | |
| 1433 | 1433 | $gd_location_link_text = $location_term_actual_neighbourhood; | 
| 1434 | 1434 | } | 
| 1435 | 1435 | |
| @@ -1439,76 +1439,76 @@ discard block | ||
| 1439 | 1439 | } | 
| 1440 | 1440 | */ | 
| 1441 | 1441 | |
| 1442 | - $breadcrumb .= $separator . '<a href="' . $location_link . '">' . $gd_location_link_text . '</a>'; | |
| 1442 | + $breadcrumb .= $separator.'<a href="'.$location_link.'">'.$gd_location_link_text.'</a>'; | |
| 1443 | 1443 | } | 
| 1444 | 1444 | } | 
| 1445 | 1445 | } | 
| 1446 | 1446 | } | 
| 1447 | 1447 | |
| 1448 | -			if ( ! empty( $gd_taxonomy ) ) {
 | |
| 1448 | +			if (!empty($gd_taxonomy)) {
 | |
| 1449 | 1449 | $term_index = 1; | 
| 1450 | 1450 | |
| 1451 | 1451 |  				//if(get_option('geodir_add_categories_url'))
 | 
| 1452 | 1452 |  				{
 | 
| 1453 | -					if ( get_query_var( $gd_post_type . '_tags' ) ) {
 | |
| 1454 | - $cat_link = $listing_link . 'tags/'; | |
| 1453 | +					if (get_query_var($gd_post_type.'_tags')) {
 | |
| 1454 | + $cat_link = $listing_link.'tags/'; | |
| 1455 | 1455 |  					} else {
 | 
| 1456 | 1456 | $cat_link = $listing_link; | 
| 1457 | 1457 | } | 
| 1458 | 1458 | |
| 1459 | -					foreach ( $location_terms as $key => $location_term ) {
 | |
| 1460 | -						if ( $location_manager && in_array( $key, $hide_url_part ) ) {
 | |
| 1459 | +					foreach ($location_terms as $key => $location_term) {
 | |
| 1460 | +						if ($location_manager && in_array($key, $hide_url_part)) {
 | |
| 1461 | 1461 | continue; | 
| 1462 | 1462 | } | 
| 1463 | 1463 | |
| 1464 | -						if ( $location_term != '' ) {
 | |
| 1465 | -							if ( get_option( 'permalink_structure' ) != '' ) {
 | |
| 1466 | - $cat_link .= $location_term . '/'; | |
| 1464 | +						if ($location_term != '') {
 | |
| 1465 | +							if (get_option('permalink_structure') != '') {
 | |
| 1466 | + $cat_link .= $location_term.'/'; | |
| 1467 | 1467 | } | 
| 1468 | 1468 | } | 
| 1469 | 1469 | } | 
| 1470 | 1470 | |
| 1471 | - $term_array = explode( "/", trim( $wp_query->query[ $gd_taxonomy ], "/" ) ); | |
| 1472 | -					foreach ( $term_array as $term ) {
 | |
| 1473 | - $term_link_text = preg_replace( '/-(\d+)$/', '', $term ); | |
| 1474 | - $term_link_text = preg_replace( '/[_-]/', ' ', $term_link_text ); | |
| 1471 | +					$term_array = explode("/", trim($wp_query->query[$gd_taxonomy], "/"));
 | |
| 1472 | +					foreach ($term_array as $term) {
 | |
| 1473 | +						$term_link_text = preg_replace('/-(\d+)$/', '', $term);
 | |
| 1474 | +						$term_link_text = preg_replace('/[_-]/', ' ', $term_link_text);
 | |
| 1475 | 1475 | |
| 1476 | 1476 | // get term actual name | 
| 1477 | - $term_info = get_term_by( 'slug', $term, $gd_taxonomy, 'ARRAY_A' ); | |
| 1478 | -						if ( ! empty( $term_info ) && isset( $term_info['name'] ) && $term_info['name'] != '' ) {
 | |
| 1479 | - $term_link_text = urldecode( $term_info['name'] ); | |
| 1477 | +						$term_info = get_term_by('slug', $term, $gd_taxonomy, 'ARRAY_A');
 | |
| 1478 | +						if (!empty($term_info) && isset($term_info['name']) && $term_info['name'] != '') {
 | |
| 1479 | + $term_link_text = urldecode($term_info['name']); | |
| 1480 | 1480 |  						} else {
 | 
| 1481 | 1481 | continue; | 
| 1482 | 1482 | //$term_link_text = wp_strip_all_tags(geodir_ucwords(urldecode($term_link_text))); | 
| 1483 | 1483 | } | 
| 1484 | 1484 | |
| 1485 | -						if ( $term_index == count( $term_array ) && $is_taxonomy_last ) {
 | |
| 1486 | - $breadcrumb .= $separator . $term_link_text; | |
| 1485 | +						if ($term_index == count($term_array) && $is_taxonomy_last) {
 | |
| 1486 | + $breadcrumb .= $separator.$term_link_text; | |
| 1487 | 1487 |  						} else {
 | 
| 1488 | - $cat_link .= $term . '/'; | |
| 1489 | - $breadcrumb .= $separator . '<a href="' . $cat_link . '">' . $term_link_text . '</a>'; | |
| 1488 | + $cat_link .= $term.'/'; | |
| 1489 | + $breadcrumb .= $separator.'<a href="'.$cat_link.'">'.$term_link_text.'</a>'; | |
| 1490 | 1490 | } | 
| 1491 | - $term_index ++; | |
| 1491 | + $term_index++; | |
| 1492 | 1492 | } | 
| 1493 | 1493 | } | 
| 1494 | 1494 | |
| 1495 | 1495 | |
| 1496 | 1496 | } | 
| 1497 | 1497 | |
| 1498 | -			if ( geodir_is_page( 'detail' ) ) {
 | |
| 1499 | - $breadcrumb .= $separator . get_the_title(); | |
| 1498 | +			if (geodir_is_page('detail')) {
 | |
| 1499 | + $breadcrumb .= $separator.get_the_title(); | |
| 1500 | 1500 | } | 
| 1501 | 1501 | |
| 1502 | 1502 | $breadcrumb .= '</li>'; | 
| 1503 | 1503 | |
| 1504 | 1504 | |
| 1505 | -		} elseif ( geodir_is_page( 'author' ) ) {
 | |
| 1505 | +		} elseif (geodir_is_page('author')) {
 | |
| 1506 | 1506 | $user_id = get_current_user_id(); | 
| 1507 | - $author_link = get_author_posts_url( $user_id ); | |
| 1508 | - $default_author_link = geodir_getlink( $author_link, array( | |
| 1507 | + $author_link = get_author_posts_url($user_id); | |
| 1508 | + $default_author_link = geodir_getlink($author_link, array( | |
| 1509 | 1509 | 'geodir_dashbord' => 'true', | 
| 1510 | 1510 | 'stype' => 'gd_place' | 
| 1511 | - ), false ); | |
| 1511 | + ), false); | |
| 1512 | 1512 | |
| 1513 | 1513 | /** | 
| 1514 | 1514 | * Filter author page link. | 
| @@ -1518,16 +1518,16 @@ discard block | ||
| 1518 | 1518 | * @param string $default_author_link Default author link. | 
| 1519 | 1519 | * @param int $user_id Author ID. | 
| 1520 | 1520 | */ | 
| 1521 | - $default_author_link = apply_filters( 'geodir_dashboard_author_link', $default_author_link, $user_id ); | |
| 1521 | +			$default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_id);
 | |
| 1522 | 1522 | |
| 1523 | 1523 | $breadcrumb .= '<li>'; | 
| 1524 | - $breadcrumb .= $separator . '<a href="' . $default_author_link . '">' . __( 'My Dashboard', 'geodirectory' ) . '</a>'; | |
| 1524 | +			$breadcrumb .= $separator.'<a href="'.$default_author_link.'">'.__('My Dashboard', 'geodirectory').'</a>';
 | |
| 1525 | 1525 | |
| 1526 | -			if ( isset( $_REQUEST['list'] ) ) {
 | |
| 1527 | - $author_link = geodir_getlink( $author_link, array( | |
| 1526 | +			if (isset($_REQUEST['list'])) {
 | |
| 1527 | + $author_link = geodir_getlink($author_link, array( | |
| 1528 | 1528 | 'geodir_dashbord' => 'true', | 
| 1529 | 1529 | 'stype' => $_REQUEST['stype'] | 
| 1530 | - ), false ); | |
| 1530 | + ), false); | |
| 1531 | 1531 | |
| 1532 | 1532 | /** | 
| 1533 | 1533 | * Filter author page link. | 
| @@ -1538,61 +1538,61 @@ discard block | ||
| 1538 | 1538 | * @param int $user_id Author ID. | 
| 1539 | 1539 | * @param string $_REQUEST ['stype'] Post type. | 
| 1540 | 1540 | */ | 
| 1541 | - $author_link = apply_filters( 'geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype'] ); | |
| 1541 | +				$author_link = apply_filters('geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype']);
 | |
| 1542 | 1542 | |
| 1543 | - $breadcrumb .= $separator . '<a href="' . $author_link . '">' . __( ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; | |
| 1544 | - $breadcrumb .= $separator . ucfirst( __( 'My', 'geodirectory' ) . ' ' . $_REQUEST['list'] ); | |
| 1543 | + $breadcrumb .= $separator.'<a href="'.$author_link.'">'.__(ucfirst($post_type_info->label), 'geodirectory').'</a>'; | |
| 1544 | +				$breadcrumb .= $separator.ucfirst(__('My', 'geodirectory').' '.$_REQUEST['list']);
 | |
| 1545 | 1545 |  			} else {
 | 
| 1546 | - $breadcrumb .= $separator . __( ucfirst( $post_type_info->label ), 'geodirectory' ); | |
| 1546 | + $breadcrumb .= $separator.__(ucfirst($post_type_info->label), 'geodirectory'); | |
| 1547 | 1547 | } | 
| 1548 | 1548 | |
| 1549 | 1549 | $breadcrumb .= '</li>'; | 
| 1550 | -		} elseif ( is_category() || is_single() ) {
 | |
| 1550 | +		} elseif (is_category() || is_single()) {
 | |
| 1551 | 1551 | $category = get_the_category(); | 
| 1552 | -			if ( is_category() ) {
 | |
| 1553 | - $breadcrumb .= '<li>' . $separator . $category[0]->cat_name . '</li>'; | |
| 1552 | +			if (is_category()) {
 | |
| 1553 | + $breadcrumb .= '<li>'.$separator.$category[0]->cat_name.'</li>'; | |
| 1554 | 1554 | } | 
| 1555 | -			if ( is_single() ) {
 | |
| 1556 | - $breadcrumb .= '<li>' . $separator . '<a href="' . get_category_link( $category[0]->term_id ) . '">' . $category[0]->cat_name . '</a></li>'; | |
| 1557 | - $breadcrumb .= '<li>' . $separator . get_the_title() . '</li>'; | |
| 1555 | +			if (is_single()) {
 | |
| 1556 | + $breadcrumb .= '<li>'.$separator.'<a href="'.get_category_link($category[0]->term_id).'">'.$category[0]->cat_name.'</a></li>'; | |
| 1557 | + $breadcrumb .= '<li>'.$separator.get_the_title().'</li>'; | |
| 1558 | 1558 | } | 
| 1559 | 1559 | /* End of my version ##################################################### */ | 
| 1560 | -		} else if ( is_page() ) {
 | |
| 1560 | +		} else if (is_page()) {
 | |
| 1561 | 1561 | $page_title = get_the_title(); | 
| 1562 | 1562 | |
| 1563 | -			if ( geodir_is_page( 'location' ) ) {
 | |
| 1563 | +			if (geodir_is_page('location')) {
 | |
| 1564 | 1564 | $location_page_id = geodir_location_page_id(); | 
| 1565 | - $loc_post = get_post( $location_page_id ); | |
| 1565 | + $loc_post = get_post($location_page_id); | |
| 1566 | 1566 | $post_name = $loc_post->post_name; | 
| 1567 | - $slug = ucwords( str_replace( '-', ' ', $post_name ) ); | |
| 1568 | - $page_title = ! empty( $slug ) ? $slug : __( 'Location', 'geodirectory' ); | |
| 1567 | +				$slug             = ucwords(str_replace('-', ' ', $post_name));
 | |
| 1568 | +				$page_title       = !empty($slug) ? $slug : __('Location', 'geodirectory');
 | |
| 1569 | 1569 | } | 
| 1570 | 1570 | |
| 1571 | - $breadcrumb .= '<li>' . $separator; | |
| 1572 | - $breadcrumb .= stripslashes_deep( $page_title ); | |
| 1571 | + $breadcrumb .= '<li>'.$separator; | |
| 1572 | + $breadcrumb .= stripslashes_deep($page_title); | |
| 1573 | 1573 | $breadcrumb .= '</li>'; | 
| 1574 | -		} else if ( is_tag() ) {
 | |
| 1575 | - $breadcrumb .= "<li> " . $separator . single_tag_title( '', false ) . '</li>'; | |
| 1576 | -		} else if ( is_day() ) {
 | |
| 1577 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; | |
| 1578 | - the_time( 'F jS, Y' ); | |
| 1574 | +		} else if (is_tag()) {
 | |
| 1575 | +			$breadcrumb .= "<li> ".$separator.single_tag_title('', false).'</li>';
 | |
| 1576 | +		} else if (is_day()) {
 | |
| 1577 | +			$breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
 | |
| 1578 | +			the_time('F jS, Y');
 | |
| 1579 | 1579 | $breadcrumb .= '</li>'; | 
| 1580 | -		} else if ( is_month() ) {
 | |
| 1581 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; | |
| 1582 | - the_time( 'F, Y' ); | |
| 1580 | +		} else if (is_month()) {
 | |
| 1581 | +			$breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
 | |
| 1582 | +			the_time('F, Y');
 | |
| 1583 | 1583 | $breadcrumb .= '</li>'; | 
| 1584 | -		} else if ( is_year() ) {
 | |
| 1585 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; | |
| 1586 | - the_time( 'Y' ); | |
| 1584 | +		} else if (is_year()) {
 | |
| 1585 | +			$breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
 | |
| 1586 | +			the_time('Y');
 | |
| 1587 | 1587 | $breadcrumb .= '</li>'; | 
| 1588 | -		} else if ( is_author() ) {
 | |
| 1589 | - $breadcrumb .= "<li> " . $separator . __( " Author Archive", 'geodirectory' ); | |
| 1588 | +		} else if (is_author()) {
 | |
| 1589 | +			$breadcrumb .= "<li> ".$separator.__(" Author Archive", 'geodirectory');
 | |
| 1590 | 1590 | $breadcrumb .= '</li>'; | 
| 1591 | -		} else if ( isset( $_GET['paged'] ) && ! empty( $_GET['paged'] ) ) {
 | |
| 1592 | - $breadcrumb .= "<li>" . $separator . __( "Blog Archives", 'geodirectory' ); | |
| 1591 | +		} else if (isset($_GET['paged']) && !empty($_GET['paged'])) {
 | |
| 1592 | +			$breadcrumb .= "<li>".$separator.__("Blog Archives", 'geodirectory');
 | |
| 1593 | 1593 | $breadcrumb .= '</li>'; | 
| 1594 | -		} else if ( is_search() ) {
 | |
| 1595 | - $breadcrumb .= "<li> " . $separator . __( " Search Results", 'geodirectory' ); | |
| 1594 | +		} else if (is_search()) {
 | |
| 1595 | +			$breadcrumb .= "<li> ".$separator.__(" Search Results", 'geodirectory');
 | |
| 1596 | 1596 | $breadcrumb .= '</li>'; | 
| 1597 | 1597 | } | 
| 1598 | 1598 | $breadcrumb .= '</ul></div>'; | 
| @@ -1605,13 +1605,13 @@ discard block | ||
| 1605 | 1605 | * @param string $breadcrumb Breadcrumb HTML. | 
| 1606 | 1606 | * @param string $separator Breadcrumb separator. | 
| 1607 | 1607 | */ | 
| 1608 | - echo $breadcrumb = apply_filters( 'geodir_breadcrumb', $breadcrumb, $separator ); | |
| 1608 | +		echo $breadcrumb = apply_filters('geodir_breadcrumb', $breadcrumb, $separator);
 | |
| 1609 | 1609 | } | 
| 1610 | 1610 | } | 
| 1611 | 1611 | |
| 1612 | 1612 | |
| 1613 | -add_action( "admin_init", "geodir_allow_wpadmin" ); // check user is admin | |
| 1614 | -if ( ! function_exists( 'geodir_allow_wpadmin' ) ) {
 | |
| 1613 | +add_action("admin_init", "geodir_allow_wpadmin"); // check user is admin
 | |
| 1614 | +if (!function_exists('geodir_allow_wpadmin')) {
 | |
| 1615 | 1615 | /** | 
| 1616 | 1616 | * Allow only admins to access wp-admin. | 
| 1617 | 1617 | * | 
| @@ -1623,12 +1623,12 @@ discard block | ||
| 1623 | 1623 | */ | 
| 1624 | 1624 |  	function geodir_allow_wpadmin() {
 | 
| 1625 | 1625 | global $wpdb; | 
| 1626 | - if ( get_option( 'geodir_allow_wpadmin' ) == '0' && is_user_logged_in() && ( ! defined( 'DOING_AJAX' ) ) ) // checking action in request to allow ajax request go through | |
| 1626 | +		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 | 1627 |  		{
 | 
| 1628 | -			if ( current_user_can( 'administrator' ) ) {
 | |
| 1628 | +			if (current_user_can('administrator')) {
 | |
| 1629 | 1629 |  			} else {
 | 
| 1630 | 1630 | |
| 1631 | - wp_redirect( home_url() ); | |
| 1631 | + wp_redirect(home_url()); | |
| 1632 | 1632 | exit; | 
| 1633 | 1633 | } | 
| 1634 | 1634 | |
| @@ -1647,23 +1647,23 @@ discard block | ||
| 1647 | 1647 | * | 
| 1648 | 1648 | * @return array|WP_Error The uploaded data as array. When failure returns error. | 
| 1649 | 1649 | */ | 
| 1650 | -function fetch_remote_file( $url ) {
 | |
| 1650 | +function fetch_remote_file($url) {
 | |
| 1651 | 1651 | // extract the file name and extension from the url | 
| 1652 | - require_once( ABSPATH . 'wp-includes/pluggable.php' ); | |
| 1653 | - $file_name = basename( $url ); | |
| 1654 | -	if ( strpos( $file_name, '?' ) !== false ) {
 | |
| 1655 | - list( $file_name ) = explode( '?', $file_name ); | |
| 1652 | + require_once(ABSPATH.'wp-includes/pluggable.php'); | |
| 1653 | + $file_name = basename($url); | |
| 1654 | +	if (strpos($file_name, '?') !== false) {
 | |
| 1655 | +		list($file_name) = explode('?', $file_name);
 | |
| 1656 | 1656 | } | 
| 1657 | 1657 | $dummy = false; | 
| 1658 | 1658 | $add_to_cache = false; | 
| 1659 | 1659 | $key = null; | 
| 1660 | -	if ( strpos( $url, '/dummy/' ) !== false ) {
 | |
| 1660 | +	if (strpos($url, '/dummy/') !== false) {
 | |
| 1661 | 1661 | $dummy = true; | 
| 1662 | - $key = "dummy_" . str_replace( '.', '_', $file_name ); | |
| 1663 | - $value = get_transient( 'cached_dummy_images' ); | |
| 1664 | -		if ( $value ) {
 | |
| 1665 | -			if ( isset( $value[ $key ] ) ) {
 | |
| 1666 | - return $value[ $key ]; | |
| 1662 | +		$key   = "dummy_".str_replace('.', '_', $file_name);
 | |
| 1663 | +		$value = get_transient('cached_dummy_images');
 | |
| 1664 | +		if ($value) {
 | |
| 1665 | +			if (isset($value[$key])) {
 | |
| 1666 | + return $value[$key]; | |
| 1667 | 1667 |  			} else {
 | 
| 1668 | 1668 | $add_to_cache = true; | 
| 1669 | 1669 | } | 
| @@ -1674,58 +1674,58 @@ discard block | ||
| 1674 | 1674 | |
| 1675 | 1675 | // get placeholder file in the upload dir with a unique, sanitized filename | 
| 1676 | 1676 | |
| 1677 | - $post_upload_date = isset( $post['upload_date'] ) ? $post['upload_date'] : ''; | |
| 1677 | + $post_upload_date = isset($post['upload_date']) ? $post['upload_date'] : ''; | |
| 1678 | 1678 | |
| 1679 | - $upload = wp_upload_bits( $file_name, 0, '', $post_upload_date ); | |
| 1680 | -	if ( $upload['error'] ) {
 | |
| 1681 | - return new WP_Error( 'upload_dir_error', $upload['error'] ); | |
| 1679 | + $upload = wp_upload_bits($file_name, 0, '', $post_upload_date); | |
| 1680 | +	if ($upload['error']) {
 | |
| 1681 | +		return new WP_Error('upload_dir_error', $upload['error']);
 | |
| 1682 | 1682 | } | 
| 1683 | 1683 | |
| 1684 | 1684 | |
| 1685 | - sleep( 0.3 );// if multiple remote file this can cause the remote server to timeout so we add a slight delay | |
| 1685 | + sleep(0.3); // if multiple remote file this can cause the remote server to timeout so we add a slight delay | |
| 1686 | 1686 | |
| 1687 | 1687 | // fetch the remote url and write it to the placeholder file | 
| 1688 | - $headers = wp_remote_get( $url, array( 'stream' => true, 'filename' => $upload['file'] ) ); | |
| 1688 | +	$headers = wp_remote_get($url, array('stream' => true, 'filename' => $upload['file']));
 | |
| 1689 | 1689 | |
| 1690 | 1690 | $log_message = ''; | 
| 1691 | -	if ( is_wp_error( $headers ) ) {
 | |
| 1692 | - echo 'file: ' . $url; | |
| 1691 | +	if (is_wp_error($headers)) {
 | |
| 1692 | + echo 'file: '.$url; | |
| 1693 | 1693 | |
| 1694 | - return new WP_Error( 'import_file_error', $headers->get_error_message() ); | |
| 1694 | +		return new WP_Error('import_file_error', $headers->get_error_message());
 | |
| 1695 | 1695 | } | 
| 1696 | 1696 | |
| 1697 | - $filesize = filesize( $upload['file'] ); | |
| 1697 | + $filesize = filesize($upload['file']); | |
| 1698 | 1698 | // request failed | 
| 1699 | -	if ( ! $headers ) {
 | |
| 1700 | - $log_message = __( 'Remote server did not respond', 'geodirectory' ); | |
| 1699 | +	if (!$headers) {
 | |
| 1700 | +		$log_message = __('Remote server did not respond', 'geodirectory');
 | |
| 1701 | 1701 | } // make sure the fetch was successful | 
| 1702 | -	elseif ( $headers['response']['code'] != '200' ) {
 | |
| 1703 | - $log_message = sprintf( __( 'Remote server returned error response %1$d %2$s', 'geodirectory' ), esc_html( $headers['response'] ), get_status_header_desc( $headers['response'] ) ); | |
| 1704 | -	} elseif ( isset( $headers['headers']['content-length'] ) && $filesize != $headers['headers']['content-length'] ) {
 | |
| 1705 | - $log_message = __( 'Remote file is incorrect size', 'geodirectory' ); | |
| 1706 | -	} elseif ( 0 == $filesize ) {
 | |
| 1707 | - $log_message = __( 'Zero size file downloaded', 'geodirectory' ); | |
| 1708 | - } | |
| 1709 | - | |
| 1710 | -	if ( $log_message ) {
 | |
| 1711 | - $del = unlink( $upload['file'] ); | |
| 1712 | -		if ( ! $del ) {
 | |
| 1713 | - geodir_error_log( __( 'GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory' ) ); | |
| 1702 | +	elseif ($headers['response']['code'] != '200') {
 | |
| 1703 | +		$log_message = sprintf(__('Remote server returned error response %1$d %2$s', 'geodirectory'), esc_html($headers['response']), get_status_header_desc($headers['response']));
 | |
| 1704 | +	} elseif (isset($headers['headers']['content-length']) && $filesize != $headers['headers']['content-length']) {
 | |
| 1705 | +		$log_message = __('Remote file is incorrect size', 'geodirectory');
 | |
| 1706 | +	} elseif (0 == $filesize) {
 | |
| 1707 | +		$log_message = __('Zero size file downloaded', 'geodirectory');
 | |
| 1708 | + } | |
| 1709 | + | |
| 1710 | +	if ($log_message) {
 | |
| 1711 | + $del = unlink($upload['file']); | |
| 1712 | +		if (!$del) {
 | |
| 1713 | +			geodir_error_log(__('GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory'));
 | |
| 1714 | 1714 | } | 
| 1715 | 1715 | |
| 1716 | - return new WP_Error( 'import_file_error', $log_message ); | |
| 1716 | +		return new WP_Error('import_file_error', $log_message);
 | |
| 1717 | 1717 | } | 
| 1718 | 1718 | |
| 1719 | -	if ( $dummy && $add_to_cache && is_array( $upload ) ) {
 | |
| 1720 | - $images = get_transient( 'cached_dummy_images' ); | |
| 1721 | -		if ( is_array( $images ) ) {
 | |
| 1722 | - $images[ $key ] = $upload; | |
| 1719 | +	if ($dummy && $add_to_cache && is_array($upload)) {
 | |
| 1720 | +		$images = get_transient('cached_dummy_images');
 | |
| 1721 | +		if (is_array($images)) {
 | |
| 1722 | + $images[$key] = $upload; | |
| 1723 | 1723 |  		} else {
 | 
| 1724 | - $images = array( $key => $upload ); | |
| 1724 | + $images = array($key => $upload); | |
| 1725 | 1725 | } | 
| 1726 | 1726 | |
| 1727 | 1727 | //setting the cache using the WP Transient API | 
| 1728 | - set_transient( 'cached_dummy_images', $images, 60 * 10 ); //10 minutes cache | |
| 1728 | +		set_transient('cached_dummy_images', $images, 60 * 10); //10 minutes cache
 | |
| 1729 | 1729 | } | 
| 1730 | 1730 | |
| 1731 | 1731 | return $upload; | 
| @@ -1739,12 +1739,12 @@ discard block | ||
| 1739 | 1739 | * @return string|void Max upload size. | 
| 1740 | 1740 | */ | 
| 1741 | 1741 |  function geodir_max_upload_size() {
 | 
| 1742 | - $max_filesize = (float) get_option( 'geodir_upload_max_filesize', 2 ); | |
| 1742 | +	$max_filesize = (float) get_option('geodir_upload_max_filesize', 2);
 | |
| 1743 | 1743 | |
| 1744 | -	if ( $max_filesize > 0 && $max_filesize < 1 ) {
 | |
| 1745 | - $max_filesize = (int) ( $max_filesize * 1024 ) . 'kb'; | |
| 1744 | +	if ($max_filesize > 0 && $max_filesize < 1) {
 | |
| 1745 | + $max_filesize = (int) ($max_filesize * 1024).'kb'; | |
| 1746 | 1746 |  	} else {
 | 
| 1747 | - $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb'; | |
| 1747 | + $max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb'; | |
| 1748 | 1748 | } | 
| 1749 | 1749 | |
| 1750 | 1750 | /** | 
| @@ -1754,7 +1754,7 @@ discard block | ||
| 1754 | 1754 | * | 
| 1755 | 1755 | * @param string $max_filesize Max file upload size. Ex. 10mb, 512kb. | 
| 1756 | 1756 | */ | 
| 1757 | - return apply_filters( 'geodir_default_image_upload_size_limit', $max_filesize ); | |
| 1757 | +	return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
 | |
| 1758 | 1758 | } | 
| 1759 | 1759 | |
| 1760 | 1760 | /** | 
| @@ -1767,8 +1767,8 @@ discard block | ||
| 1767 | 1767 | * @return bool If dummy folder exists returns true, else false. | 
| 1768 | 1768 | */ | 
| 1769 | 1769 |  function geodir_dummy_folder_exists() {
 | 
| 1770 | - $path = geodir_plugin_path() . '/geodirectory-admin/dummy/'; | |
| 1771 | -	if ( ! is_dir( $path ) ) {
 | |
| 1770 | + $path = geodir_plugin_path().'/geodirectory-admin/dummy/'; | |
| 1771 | +	if (!is_dir($path)) {
 | |
| 1772 | 1772 | return false; | 
| 1773 | 1773 |  	} else {
 | 
| 1774 | 1774 | return true; | 
| @@ -1787,17 +1787,17 @@ discard block | ||
| 1787 | 1787 | * | 
| 1788 | 1788 | * @return object Author info. | 
| 1789 | 1789 | */ | 
| 1790 | -function geodir_get_author_info( $aid ) {
 | |
| 1790 | +function geodir_get_author_info($aid) {
 | |
| 1791 | 1791 | global $wpdb; | 
| 1792 | 1792 | /*$infosql = "select * from $wpdb->users where ID=$aid";*/ | 
| 1793 | - $infosql = $wpdb->prepare( "select * from $wpdb->users where ID=%d", array( $aid ) ); | |
| 1794 | - $info = $wpdb->get_results( $infosql ); | |
| 1795 | -	if ( $info ) {
 | |
| 1793 | +	$infosql = $wpdb->prepare("select * from $wpdb->users where ID=%d", array($aid));
 | |
| 1794 | + $info = $wpdb->get_results($infosql); | |
| 1795 | +	if ($info) {
 | |
| 1796 | 1796 | return $info[0]; | 
| 1797 | 1797 | } | 
| 1798 | 1798 | } | 
| 1799 | 1799 | |
| 1800 | -if ( ! function_exists( 'adminEmail' ) ) {
 | |
| 1800 | +if (!function_exists('adminEmail')) {
 | |
| 1801 | 1801 | /** | 
| 1802 | 1802 | * Send emails to client on post submission, renew etc. | 
| 1803 | 1803 | * | 
| @@ -1810,67 +1810,67 @@ discard block | ||
| 1810 | 1810 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. | 
| 1811 | 1811 | * @param string $custom_1 Custom data to be sent. | 
| 1812 | 1812 | */ | 
| 1813 | -	function adminEmail( $page_id, $user_id, $message_type, $custom_1 = '' ) {
 | |
| 1813 | +	function adminEmail($page_id, $user_id, $message_type, $custom_1 = '') {
 | |
| 1814 | 1814 | global $wpdb; | 
| 1815 | -		if ( $message_type == 'expiration' ) {
 | |
| 1816 | - $subject = stripslashes( __( get_option( 'renew_email_subject' ), 'geodirectory' ) ); | |
| 1817 | - $client_message = stripslashes( __( get_option( 'renew_email_content' ), 'geodirectory' ) ); | |
| 1818 | -		} elseif ( $message_type == 'post_submited' ) {
 | |
| 1819 | - $subject = __( get_option( 'post_submited_success_email_subject_admin' ), 'geodirectory' ); | |
| 1820 | - $client_message = __( get_option( 'post_submited_success_email_content_admin' ), 'geodirectory' ); | |
| 1821 | -		} elseif ( $message_type == 'renew' ) {
 | |
| 1822 | - $subject = __( get_option( 'post_renew_success_email_subject_admin' ), 'geodirectory' ); | |
| 1823 | - $client_message = __( get_option( 'post_renew_success_email_content_admin' ), 'geodirectory' ); | |
| 1824 | -		} elseif ( $message_type == 'upgrade' ) {
 | |
| 1825 | - $subject = __( get_option( 'post_upgrade_success_email_subject_admin' ), 'geodirectory' ); | |
| 1826 | - $client_message = __( get_option( 'post_upgrade_success_email_content_admin' ), 'geodirectory' ); | |
| 1827 | -		} elseif ( $message_type == 'claim_approved' ) {
 | |
| 1828 | - $subject = __( get_option( 'claim_approved_email_subject' ), 'geodirectory' ); | |
| 1829 | - $client_message = __( get_option( 'claim_approved_email_content' ), 'geodirectory' ); | |
| 1830 | -		} elseif ( $message_type == 'claim_rejected' ) {
 | |
| 1831 | - $subject = __( get_option( 'claim_rejected_email_subject' ), 'geodirectory' ); | |
| 1832 | - $client_message = __( get_option( 'claim_rejected_email_content' ), 'geodirectory' ); | |
| 1833 | -		} elseif ( $message_type == 'claim_requested' ) {
 | |
| 1834 | - $subject = __( get_option( 'claim_email_subject_admin' ), 'geodirectory' ); | |
| 1835 | - $client_message = __( get_option( 'claim_email_content_admin' ), 'geodirectory' ); | |
| 1836 | -		} elseif ( $message_type == 'auto_claim' ) {
 | |
| 1837 | - $subject = __( get_option( 'auto_claim_email_subject' ), 'geodirectory' ); | |
| 1838 | - $client_message = __( get_option( 'auto_claim_email_content' ), 'geodirectory' ); | |
| 1839 | -		} elseif ( $message_type == 'payment_success' ) {
 | |
| 1840 | - $subject = __( get_option( 'post_payment_success_admin_email_subject' ), 'geodirectory' ); | |
| 1841 | - $client_message = __( get_option( 'post_payment_success_admin_email_content' ), 'geodirectory' ); | |
| 1842 | -		} elseif ( $message_type == 'payment_fail' ) {
 | |
| 1843 | - $subject = __( get_option( 'post_payment_fail_admin_email_subject' ), 'geodirectory' ); | |
| 1844 | - $client_message = __( get_option( 'post_payment_fail_admin_email_content' ), 'geodirectory' ); | |
| 1815 | +		if ($message_type == 'expiration') {
 | |
| 1816 | +			$subject        = stripslashes(__(get_option('renew_email_subject'), 'geodirectory'));
 | |
| 1817 | +			$client_message = stripslashes(__(get_option('renew_email_content'), 'geodirectory'));
 | |
| 1818 | +		} elseif ($message_type == 'post_submited') {
 | |
| 1819 | +			$subject        = __(get_option('post_submited_success_email_subject_admin'), 'geodirectory');
 | |
| 1820 | +			$client_message = __(get_option('post_submited_success_email_content_admin'), 'geodirectory');
 | |
| 1821 | +		} elseif ($message_type == 'renew') {
 | |
| 1822 | +			$subject        = __(get_option('post_renew_success_email_subject_admin'), 'geodirectory');
 | |
| 1823 | +			$client_message = __(get_option('post_renew_success_email_content_admin'), 'geodirectory');
 | |
| 1824 | +		} elseif ($message_type == 'upgrade') {
 | |
| 1825 | +			$subject        = __(get_option('post_upgrade_success_email_subject_admin'), 'geodirectory');
 | |
| 1826 | +			$client_message = __(get_option('post_upgrade_success_email_content_admin'), 'geodirectory');
 | |
| 1827 | +		} elseif ($message_type == 'claim_approved') {
 | |
| 1828 | +			$subject        = __(get_option('claim_approved_email_subject'), 'geodirectory');
 | |
| 1829 | +			$client_message = __(get_option('claim_approved_email_content'), 'geodirectory');
 | |
| 1830 | +		} elseif ($message_type == 'claim_rejected') {
 | |
| 1831 | +			$subject        = __(get_option('claim_rejected_email_subject'), 'geodirectory');
 | |
| 1832 | +			$client_message = __(get_option('claim_rejected_email_content'), 'geodirectory');
 | |
| 1833 | +		} elseif ($message_type == 'claim_requested') {
 | |
| 1834 | +			$subject        = __(get_option('claim_email_subject_admin'), 'geodirectory');
 | |
| 1835 | +			$client_message = __(get_option('claim_email_content_admin'), 'geodirectory');
 | |
| 1836 | +		} elseif ($message_type == 'auto_claim') {
 | |
| 1837 | +			$subject        = __(get_option('auto_claim_email_subject'), 'geodirectory');
 | |
| 1838 | +			$client_message = __(get_option('auto_claim_email_content'), 'geodirectory');
 | |
| 1839 | +		} elseif ($message_type == 'payment_success') {
 | |
| 1840 | +			$subject        = __(get_option('post_payment_success_admin_email_subject'), 'geodirectory');
 | |
| 1841 | +			$client_message = __(get_option('post_payment_success_admin_email_content'), 'geodirectory');
 | |
| 1842 | +		} elseif ($message_type == 'payment_fail') {
 | |
| 1843 | +			$subject        = __(get_option('post_payment_fail_admin_email_subject'), 'geodirectory');
 | |
| 1844 | +			$client_message = __(get_option('post_payment_fail_admin_email_content'), 'geodirectory');
 | |
| 1845 | 1845 | } | 
| 1846 | 1846 | $transaction_details = $custom_1; | 
| 1847 | - $fromEmail = get_option( 'site_email' ); | |
| 1847 | +		$fromEmail           = get_option('site_email');
 | |
| 1848 | 1848 | $fromEmailName = get_site_emailName(); | 
| 1849 | 1849 | //$alivedays = get_post_meta($page_id,'alive_days',true); | 
| 1850 | - $pkg_limit = get_property_price_info_listing( $page_id ); | |
| 1850 | + $pkg_limit = get_property_price_info_listing($page_id); | |
| 1851 | 1851 | $alivedays = $pkg_limit['days']; | 
| 1852 | - $productlink = get_permalink( $page_id ); | |
| 1853 | - $post_info = get_post( $page_id ); | |
| 1854 | - $post_date = date( 'dS F,Y', strtotime( $post_info->post_date ) ); | |
| 1855 | - $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>'; | |
| 1852 | + $productlink = get_permalink($page_id); | |
| 1853 | + $post_info = get_post($page_id); | |
| 1854 | +		$post_date            = date('dS F,Y', strtotime($post_info->post_date));
 | |
| 1855 | + $listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>'; | |
| 1856 | 1856 | $loginurl = geodir_login_url(); | 
| 1857 | - $loginurl_link = '<a href="' . $loginurl . '">login</a>'; | |
| 1857 | + $loginurl_link = '<a href="'.$loginurl.'">login</a>'; | |
| 1858 | 1858 | $siteurl = home_url(); | 
| 1859 | - $siteurl_link = '<a href="' . $siteurl . '">' . $fromEmailName . '</a>'; | |
| 1860 | - $user_info = get_userdata( $user_id ); | |
| 1859 | + $siteurl_link = '<a href="'.$siteurl.'">'.$fromEmailName.'</a>'; | |
| 1860 | + $user_info = get_userdata($user_id); | |
| 1861 | 1861 | $user_email = $user_info->user_email; | 
| 1862 | - $display_name = geodir_get_client_name( $user_id ); | |
| 1862 | + $display_name = geodir_get_client_name($user_id); | |
| 1863 | 1863 | $user_login = $user_info->user_login; | 
| 1864 | - $number_of_grace_days = get_option( 'ptthemes_listing_preexpiry_notice_days' ); | |
| 1865 | -		if ( $number_of_grace_days == '' ) {
 | |
| 1864 | +		$number_of_grace_days = get_option('ptthemes_listing_preexpiry_notice_days');
 | |
| 1865 | +		if ($number_of_grace_days == '') {
 | |
| 1866 | 1866 | $number_of_grace_days = 1; | 
| 1867 | 1867 | } | 
| 1868 | -		if ( $post_info->post_type == 'event' ) {
 | |
| 1868 | +		if ($post_info->post_type == 'event') {
 | |
| 1869 | 1869 | $post_type = 'event'; | 
| 1870 | 1870 |  		} else {
 | 
| 1871 | 1871 | $post_type = 'listing'; | 
| 1872 | 1872 | } | 
| 1873 | - $renew_link = '<a href="' . $siteurl . '?ptype=post_' . $post_type . '&renew=1&pid=' . $page_id . '">' . RENEW_LINK . '</a>'; | |
| 1873 | + $renew_link = '<a href="'.$siteurl.'?ptype=post_'.$post_type.'&renew=1&pid='.$page_id.'">'.RENEW_LINK.'</a>'; | |
| 1874 | 1874 | $search_array = array( | 
| 1875 | 1875 | '[#client_name#]', | 
| 1876 | 1876 | '[#listing_link#]', | 
| @@ -1886,7 +1886,7 @@ discard block | ||
| 1886 | 1886 | '[#site_name#]', | 
| 1887 | 1887 | '[#transaction_details#]' | 
| 1888 | 1888 | ); | 
| 1889 | - $replace_array = array( | |
| 1889 | + $replace_array = array( | |
| 1890 | 1890 | $display_name, | 
| 1891 | 1891 | $listingLink, | 
| 1892 | 1892 | $post_date, | 
| @@ -1901,13 +1901,13 @@ discard block | ||
| 1901 | 1901 | $fromEmailName, | 
| 1902 | 1902 | $transaction_details | 
| 1903 | 1903 | ); | 
| 1904 | - $client_message = str_replace( $search_array, $replace_array, $client_message ); | |
| 1905 | - $subject = str_replace( $search_array, $replace_array, $subject ); | |
| 1904 | + $client_message = str_replace($search_array, $replace_array, $client_message); | |
| 1905 | + $subject = str_replace($search_array, $replace_array, $subject); | |
| 1906 | 1906 | |
| 1907 | 1907 | |
| 1908 | - $headers = array(); | |
| 1908 | + $headers = array(); | |
| 1909 | 1909 | $headers[] = 'Content-type: text/html; charset=UTF-8'; | 
| 1910 | - $headers[] = 'From: ' . $fromEmailName . ' <' . $fromEmail . '>'; | |
| 1910 | + $headers[] = 'From: '.$fromEmailName.' <'.$fromEmail.'>'; | |
| 1911 | 1911 | |
| 1912 | 1912 | $to = $fromEmail; | 
| 1913 | 1913 | $message = $client_message; | 
| @@ -1925,7 +1925,7 @@ discard block | ||
| 1925 | 1925 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. | 
| 1926 | 1926 | * @param string $custom_1 Custom data to be sent. | 
| 1927 | 1927 | */ | 
| 1928 | - $to = apply_filters( 'geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1 ); | |
| 1928 | +		$to = apply_filters('geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1);
 | |
| 1929 | 1929 | /** | 
| 1930 | 1930 | * Filter the admin email subject. | 
| 1931 | 1931 | * | 
| @@ -1938,7 +1938,7 @@ discard block | ||
| 1938 | 1938 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. | 
| 1939 | 1939 | * @param string $custom_1 Custom data to be sent. | 
| 1940 | 1940 | */ | 
| 1941 | - $subject = apply_filters( 'geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1 ); | |
| 1941 | +		$subject = apply_filters('geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1);
 | |
| 1942 | 1942 | /** | 
| 1943 | 1943 | * Filter the admin email message. | 
| 1944 | 1944 | * | 
| @@ -1951,7 +1951,7 @@ discard block | ||
| 1951 | 1951 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. | 
| 1952 | 1952 | * @param string $custom_1 Custom data to be sent. | 
| 1953 | 1953 | */ | 
| 1954 | - $message = apply_filters( 'geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1 ); | |
| 1954 | +		$message = apply_filters('geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1);
 | |
| 1955 | 1955 | /** | 
| 1956 | 1956 | * Filter the admin email headers. | 
| 1957 | 1957 | * | 
| @@ -1964,22 +1964,22 @@ discard block | ||
| 1964 | 1964 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. | 
| 1965 | 1965 | * @param string $custom_1 Custom data to be sent. | 
| 1966 | 1966 | */ | 
| 1967 | - $headers = apply_filters( 'geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1 ); | |
| 1967 | +		$headers = apply_filters('geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1);
 | |
| 1968 | 1968 | |
| 1969 | 1969 | |
| 1970 | - $sent = wp_mail( $to, $subject, $message, $headers ); | |
| 1971 | -		if ( ! $sent ) {
 | |
| 1972 | -			if ( is_array( $to ) ) {
 | |
| 1973 | - $to = implode( ',', $to ); | |
| 1970 | + $sent = wp_mail($to, $subject, $message, $headers); | |
| 1971 | +		if (!$sent) {
 | |
| 1972 | +			if (is_array($to)) {
 | |
| 1973 | +				$to = implode(',', $to);
 | |
| 1974 | 1974 | } | 
| 1975 | 1975 | $log_message = sprintf( | 
| 1976 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), | |
| 1976 | +				__("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
 | |
| 1977 | 1977 | $message_type, | 
| 1978 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), | |
| 1978 | +				date_i18n('F j Y H:i:s', current_time('timestamp')),
 | |
| 1979 | 1979 | $to, | 
| 1980 | 1980 | $subject | 
| 1981 | 1981 | ); | 
| 1982 | - geodir_error_log( $log_message ); | |
| 1982 | + geodir_error_log($log_message); | |
| 1983 | 1983 | } | 
| 1984 | 1984 | } | 
| 1985 | 1985 | } | 
| @@ -1999,12 +1999,12 @@ discard block | ||
| 1999 | 1999 | * | 
| 2000 | 2000 | * @return array Category IDs. | 
| 2001 | 2001 | */ | 
| 2002 | -function gd_lang_object_ids( $ids_array, $type ) {
 | |
| 2003 | -	if ( function_exists( 'icl_object_id' ) ) {
 | |
| 2002 | +function gd_lang_object_ids($ids_array, $type) {
 | |
| 2003 | +	if (function_exists('icl_object_id')) {
 | |
| 2004 | 2004 | $res = array(); | 
| 2005 | -		foreach ( $ids_array as $id ) {
 | |
| 2006 | - $xlat = icl_object_id( $id, $type, false ); | |
| 2007 | -			if ( ! is_null( $xlat ) ) {
 | |
| 2005 | +		foreach ($ids_array as $id) {
 | |
| 2006 | + $xlat = icl_object_id($id, $type, false); | |
| 2007 | +			if (!is_null($xlat)) {
 | |
| 2008 | 2008 | $res[] = $xlat; | 
| 2009 | 2009 | } | 
| 2010 | 2010 | } | 
| @@ -2028,20 +2028,20 @@ discard block | ||
| 2028 | 2028 | * | 
| 2029 | 2029 | * @return array Modified Body CSS classes. | 
| 2030 | 2030 | */ | 
| 2031 | -function geodir_custom_posts_body_class( $classes ) {
 | |
| 2031 | +function geodir_custom_posts_body_class($classes) {
 | |
| 2032 | 2032 | global $wpdb, $wp; | 
| 2033 | - $post_types = geodir_get_posttypes( 'object' ); | |
| 2034 | -	if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {
 | |
| 2033 | +	$post_types = geodir_get_posttypes('object');
 | |
| 2034 | +	if (!empty($post_types) && count((array) $post_types) > 1) {
 | |
| 2035 | 2035 | $classes[] = 'geodir_custom_posts'; | 
| 2036 | 2036 | } | 
| 2037 | 2037 | |
| 2038 | 2038 | // fix body class for signup page | 
| 2039 | -	if ( geodir_is_page( 'login' ) ) {
 | |
| 2039 | +	if (geodir_is_page('login')) {
 | |
| 2040 | 2040 | $new_classes = array(); | 
| 2041 | 2041 | $new_classes[] = 'signup page-geodir-signup'; | 
| 2042 | -		if ( ! empty( $classes ) ) {
 | |
| 2043 | -			foreach ( $classes as $class ) {
 | |
| 2044 | -				if ( $class && $class != 'home' && $class != 'blog' ) {
 | |
| 2042 | +		if (!empty($classes)) {
 | |
| 2043 | +			foreach ($classes as $class) {
 | |
| 2044 | +				if ($class && $class != 'home' && $class != 'blog') {
 | |
| 2045 | 2045 | $new_classes[] = $class; | 
| 2046 | 2046 | } | 
| 2047 | 2047 | } | 
| @@ -2049,14 +2049,14 @@ discard block | ||
| 2049 | 2049 | $classes = $new_classes; | 
| 2050 | 2050 | } | 
| 2051 | 2051 | |
| 2052 | -	if ( geodir_is_geodir_page() ) {
 | |
| 2052 | +	if (geodir_is_geodir_page()) {
 | |
| 2053 | 2053 | $classes[] = 'geodir-page'; | 
| 2054 | 2054 | } | 
| 2055 | 2055 | |
| 2056 | 2056 | return $classes; | 
| 2057 | 2057 | } | 
| 2058 | 2058 | |
| 2059 | -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 | |
| 2059 | +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
 | |
| 2060 | 2060 | |
| 2061 | 2061 | |
| 2062 | 2062 | /** | 
| @@ -2072,7 +2072,7 @@ discard block | ||
| 2072 | 2072 | * | 
| 2073 | 2073 | * @since 1.0.0 | 
| 2074 | 2074 | */ | 
| 2075 | - return apply_filters( 'geodir_map_zoom_level', array( | |
| 2075 | +	return apply_filters('geodir_map_zoom_level', array(
 | |
| 2076 | 2076 | 1, | 
| 2077 | 2077 | 2, | 
| 2078 | 2078 | 3, | 
| @@ -2092,7 +2092,7 @@ discard block | ||
| 2092 | 2092 | 17, | 
| 2093 | 2093 | 18, | 
| 2094 | 2094 | 19 | 
| 2095 | - ) ); | |
| 2095 | + )); | |
| 2096 | 2096 | |
| 2097 | 2097 | } | 
| 2098 | 2098 | |
| @@ -2105,12 +2105,12 @@ discard block | ||
| 2105 | 2105 | * | 
| 2106 | 2106 | * @param string $geodir_option_name Option key. | 
| 2107 | 2107 | */ | 
| 2108 | -function geodir_option_version_backup( $geodir_option_name ) {
 | |
| 2108 | +function geodir_option_version_backup($geodir_option_name) {
 | |
| 2109 | 2109 | $version_date = time(); | 
| 2110 | - $geodir_option = get_option( $geodir_option_name ); | |
| 2110 | + $geodir_option = get_option($geodir_option_name); | |
| 2111 | 2111 | |
| 2112 | -	if ( ! empty( $geodir_option ) ) {
 | |
| 2113 | - add_option( $geodir_option_name . '_' . $version_date, $geodir_option ); | |
| 2112 | +	if (!empty($geodir_option)) {
 | |
| 2113 | + add_option($geodir_option_name.'_'.$version_date, $geodir_option); | |
| 2114 | 2114 | } | 
| 2115 | 2115 | } | 
| 2116 | 2116 | |
| @@ -2124,10 +2124,10 @@ discard block | ||
| 2124 | 2124 | * | 
| 2125 | 2125 | * @return int Page ID. | 
| 2126 | 2126 | */ | 
| 2127 | -function get_page_id_geodir_add_listing_page( $page_id ) {
 | |
| 2128 | -	if ( geodir_wpml_multilingual_status() ) {
 | |
| 2127 | +function get_page_id_geodir_add_listing_page($page_id) {
 | |
| 2128 | +	if (geodir_wpml_multilingual_status()) {
 | |
| 2129 | 2129 | $post_type = 'post_page'; | 
| 2130 | - $page_id = geodir_get_wpml_element_id( $page_id, $post_type ); | |
| 2130 | + $page_id = geodir_get_wpml_element_id($page_id, $post_type); | |
| 2131 | 2131 | } | 
| 2132 | 2132 | |
| 2133 | 2133 | return $page_id; | 
| @@ -2141,7 +2141,7 @@ discard block | ||
| 2141 | 2141 | * @return bool Returns true when sitepress multilingual CMS active. else returns false. | 
| 2142 | 2142 | */ | 
| 2143 | 2143 |  function geodir_wpml_multilingual_status() {
 | 
| 2144 | -	if ( function_exists( 'icl_object_id' ) ) {
 | |
| 2144 | +	if (function_exists('icl_object_id')) {
 | |
| 2145 | 2145 | return true; | 
| 2146 | 2146 | } | 
| 2147 | 2147 | |
| @@ -2159,19 +2159,19 @@ discard block | ||
| 2159 | 2159 | * | 
| 2160 | 2160 | * @return int Element ID when exists. Else the page id. | 
| 2161 | 2161 | */ | 
| 2162 | -function geodir_get_wpml_element_id( $page_id, $post_type ) {
 | |
| 2162 | +function geodir_get_wpml_element_id($page_id, $post_type) {
 | |
| 2163 | 2163 | global $sitepress; | 
| 2164 | -	if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {
 | |
| 2165 | - $trid = $sitepress->get_element_trid( $page_id, $post_type ); | |
| 2164 | +	if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {
 | |
| 2165 | + $trid = $sitepress->get_element_trid($page_id, $post_type); | |
| 2166 | 2166 | |
| 2167 | -		if ( $trid > 0 ) {
 | |
| 2168 | - $translations = $sitepress->get_element_translations( $trid, $post_type ); | |
| 2167 | +		if ($trid > 0) {
 | |
| 2168 | + $translations = $sitepress->get_element_translations($trid, $post_type); | |
| 2169 | 2169 | |
| 2170 | 2170 | $lang = $sitepress->get_current_language(); | 
| 2171 | 2171 | $lang = $lang ? $lang : $sitepress->get_default_language(); | 
| 2172 | 2172 | |
| 2173 | -			if ( ! empty( $translations ) && ! empty( $lang ) && isset( $translations[ $lang ] ) && isset( $translations[ $lang ]->element_id ) && ! empty( $translations[ $lang ]->element_id ) ) {
 | |
| 2174 | - $page_id = $translations[ $lang ]->element_id; | |
| 2173 | +			if (!empty($translations) && !empty($lang) && isset($translations[$lang]) && isset($translations[$lang]->element_id) && !empty($translations[$lang]->element_id)) {
 | |
| 2174 | + $page_id = $translations[$lang]->element_id; | |
| 2175 | 2175 | } | 
| 2176 | 2176 | } | 
| 2177 | 2177 | } | 
| @@ -2188,15 +2188,15 @@ discard block | ||
| 2188 | 2188 | */ | 
| 2189 | 2189 |  function geodir_wpml_check_element_id() {
 | 
| 2190 | 2190 | global $sitepress; | 
| 2191 | -	if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {
 | |
| 2191 | +	if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {
 | |
| 2192 | 2192 | $el_type = 'post_page'; | 
| 2193 | - $el_id = get_option( 'geodir_add_listing_page' ); | |
| 2193 | +		$el_id        = get_option('geodir_add_listing_page');
 | |
| 2194 | 2194 | $default_lang = $sitepress->get_default_language(); | 
| 2195 | - $el_details = $sitepress->get_element_language_details( $el_id, $el_type ); | |
| 2195 | + $el_details = $sitepress->get_element_language_details($el_id, $el_type); | |
| 2196 | 2196 | |
| 2197 | -		if ( ! ( $el_id > 0 && $default_lang && ! empty( $el_details ) && isset( $el_details->language_code ) && $el_details->language_code == $default_lang ) ) {
 | |
| 2198 | -			if ( ! $el_details->source_language_code ) {
 | |
| 2199 | - $sitepress->set_element_language_details( $el_id, $el_type, '', $default_lang ); | |
| 2197 | +		if (!($el_id > 0 && $default_lang && !empty($el_details) && isset($el_details->language_code) && $el_details->language_code == $default_lang)) {
 | |
| 2198 | +			if (!$el_details->source_language_code) {
 | |
| 2199 | + $sitepress->set_element_language_details($el_id, $el_type, '', $default_lang); | |
| 2200 | 2200 | $sitepress->icl_translations_cache->clear(); | 
| 2201 | 2201 | } | 
| 2202 | 2202 | } | 
| @@ -2215,41 +2215,41 @@ discard block | ||
| 2215 | 2215 | * | 
| 2216 | 2216 | * @return string Orderby SQL. | 
| 2217 | 2217 | */ | 
| 2218 | -function geodir_widget_listings_get_order( $query_args ) {
 | |
| 2218 | +function geodir_widget_listings_get_order($query_args) {
 | |
| 2219 | 2219 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; | 
| 2220 | 2220 | |
| 2221 | 2221 | $query_args = $gd_query_args_widgets; | 
| 2222 | -	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
 | |
| 2223 | - return $wpdb->posts . ".post_date DESC, "; | |
| 2222 | +	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
 | |
| 2223 | + return $wpdb->posts.".post_date DESC, "; | |
| 2224 | 2224 | } | 
| 2225 | 2225 | |
| 2226 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; | |
| 2227 | - $table = $plugin_prefix . $post_type . '_detail'; | |
| 2226 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; | |
| 2227 | + $table = $plugin_prefix.$post_type.'_detail'; | |
| 2228 | 2228 | |
| 2229 | - $sort_by = ! empty( $query_args['order_by'] ) ? $query_args['order_by'] : ''; | |
| 2229 | + $sort_by = !empty($query_args['order_by']) ? $query_args['order_by'] : ''; | |
| 2230 | 2230 | |
| 2231 | -	switch ( $sort_by ) {
 | |
| 2231 | +	switch ($sort_by) {
 | |
| 2232 | 2232 | case 'latest': | 
| 2233 | 2233 | case 'newest': | 
| 2234 | - $orderby = $wpdb->posts . ".post_date DESC, "; | |
| 2234 | + $orderby = $wpdb->posts.".post_date DESC, "; | |
| 2235 | 2235 | break; | 
| 2236 | 2236 | case 'featured': | 
| 2237 | - $orderby = $table . ".is_featured ASC, ". $wpdb->posts . ".post_date DESC, "; | |
| 2237 | + $orderby = $table.".is_featured ASC, ".$wpdb->posts.".post_date DESC, "; | |
| 2238 | 2238 | break; | 
| 2239 | 2239 | case 'az': | 
| 2240 | - $orderby = $wpdb->posts . ".post_title ASC, "; | |
| 2240 | + $orderby = $wpdb->posts.".post_title ASC, "; | |
| 2241 | 2241 | break; | 
| 2242 | 2242 | case 'high_review': | 
| 2243 | - $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; | |
| 2243 | + $orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, "; | |
| 2244 | 2244 | break; | 
| 2245 | 2245 | case 'high_rating': | 
| 2246 | - $orderby = "( " . $table . ".overall_rating ) DESC, "; | |
| 2246 | + $orderby = "( ".$table.".overall_rating ) DESC, "; | |
| 2247 | 2247 | break; | 
| 2248 | 2248 | case 'random': | 
| 2249 | 2249 | $orderby = "RAND(), "; | 
| 2250 | 2250 | break; | 
| 2251 | 2251 | default: | 
| 2252 | - $orderby = $wpdb->posts . ".post_title ASC, "; | |
| 2252 | + $orderby = $wpdb->posts.".post_title ASC, "; | |
| 2253 | 2253 | break; | 
| 2254 | 2254 | } | 
| 2255 | 2255 | |
| @@ -2272,15 +2272,15 @@ discard block | ||
| 2272 | 2272 | * | 
| 2273 | 2273 | * @return mixed Result object. | 
| 2274 | 2274 | */ | 
| 2275 | -function geodir_get_widget_listings( $query_args = array(), $count_only = false ) {
 | |
| 2275 | +function geodir_get_widget_listings($query_args = array(), $count_only = false) {
 | |
| 2276 | 2276 | global $wpdb, $plugin_prefix, $table_prefix; | 
| 2277 | 2277 | $GLOBALS['gd_query_args_widgets'] = $query_args; | 
| 2278 | 2278 | $gd_query_args_widgets = $query_args; | 
| 2279 | 2279 | |
| 2280 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; | |
| 2281 | - $table = $plugin_prefix . $post_type . '_detail'; | |
| 2280 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; | |
| 2281 | + $table = $plugin_prefix.$post_type.'_detail'; | |
| 2282 | 2282 | |
| 2283 | - $fields = $wpdb->posts . ".*, " . $table . ".*"; | |
| 2283 | + $fields = $wpdb->posts.".*, ".$table.".*"; | |
| 2284 | 2284 | /** | 
| 2285 | 2285 | * Filter widget listing fields string part that is being used for query. | 
| 2286 | 2286 | * | 
| @@ -2290,17 +2290,17 @@ discard block | ||
| 2290 | 2290 | * @param string $table Table name. | 
| 2291 | 2291 | * @param string $post_type Post type. | 
| 2292 | 2292 | */ | 
| 2293 | - $fields = apply_filters( 'geodir_filter_widget_listings_fields', $fields, $table, $post_type ); | |
| 2293 | +	$fields = apply_filters('geodir_filter_widget_listings_fields', $fields, $table, $post_type);
 | |
| 2294 | 2294 | |
| 2295 | -	$join = "INNER JOIN " . $table . " ON (" . $table . ".post_id = " . $wpdb->posts . ".ID)";
 | |
| 2295 | +	$join = "INNER JOIN ".$table." ON (".$table.".post_id = ".$wpdb->posts.".ID)";
 | |
| 2296 | 2296 | |
| 2297 | 2297 | ########### WPML ########### | 
| 2298 | 2298 | |
| 2299 | -	if ( function_exists( 'icl_object_id' ) ) {
 | |
| 2299 | +	if (function_exists('icl_object_id')) {
 | |
| 2300 | 2300 | global $sitepress; | 
| 2301 | 2301 | $lang_code = ICL_LANGUAGE_CODE; | 
| 2302 | -		if ( $lang_code ) {
 | |
| 2303 | - $join .= " JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; | |
| 2302 | +		if ($lang_code) {
 | |
| 2303 | + $join .= " JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID"; | |
| 2304 | 2304 | } | 
| 2305 | 2305 | } | 
| 2306 | 2306 | |
| @@ -2314,15 +2314,15 @@ discard block | ||
| 2314 | 2314 | * @param string $join Join clause string. | 
| 2315 | 2315 | * @param string $post_type Post type. | 
| 2316 | 2316 | */ | 
| 2317 | - $join = apply_filters( 'geodir_filter_widget_listings_join', $join, $post_type ); | |
| 2317 | +	$join = apply_filters('geodir_filter_widget_listings_join', $join, $post_type);
 | |
| 2318 | 2318 | |
| 2319 | - $post_status = is_super_admin() ? " OR " . $wpdb->posts . ".post_status = 'private'" : ''; | |
| 2319 | + $post_status = is_super_admin() ? " OR ".$wpdb->posts.".post_status = 'private'" : ''; | |
| 2320 | 2320 | |
| 2321 | - $where = " AND ( " . $wpdb->posts . ".post_status = 'publish' " . $post_status . " ) AND " . $wpdb->posts . ".post_type = '" . $post_type . "'"; | |
| 2321 | + $where = " AND ( ".$wpdb->posts.".post_status = 'publish' ".$post_status." ) AND ".$wpdb->posts.".post_type = '".$post_type."'"; | |
| 2322 | 2322 | |
| 2323 | 2323 | ########### WPML ########### | 
| 2324 | -	if ( function_exists( 'icl_object_id' ) ) {
 | |
| 2325 | -		if ( $lang_code ) {
 | |
| 2324 | +	if (function_exists('icl_object_id')) {
 | |
| 2325 | +		if ($lang_code) {
 | |
| 2326 | 2326 | $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type = 'post_$post_type' "; | 
| 2327 | 2327 | } | 
| 2328 | 2328 | } | 
| @@ -2335,8 +2335,8 @@ discard block | ||
| 2335 | 2335 | * @param string $where Where clause string. | 
| 2336 | 2336 | * @param string $post_type Post type. | 
| 2337 | 2337 | */ | 
| 2338 | - $where = apply_filters( 'geodir_filter_widget_listings_where', $where, $post_type ); | |
| 2339 | - $where = $where != '' ? " WHERE 1=1 " . $where : ''; | |
| 2338 | +	$where = apply_filters('geodir_filter_widget_listings_where', $where, $post_type);
 | |
| 2339 | + $where = $where != '' ? " WHERE 1=1 ".$where : ''; | |
| 2340 | 2340 | |
| 2341 | 2341 | $groupby = " GROUP BY $wpdb->posts.ID "; //@todo is this needed? faster withotu | 
| 2342 | 2342 | /** | 
| @@ -2347,15 +2347,15 @@ discard block | ||
| 2347 | 2347 | * @param string $groupby Group by clause string. | 
| 2348 | 2348 | * @param string $post_type Post type. | 
| 2349 | 2349 | */ | 
| 2350 | - $groupby = apply_filters( 'geodir_filter_widget_listings_groupby', $groupby, $post_type ); | |
| 2350 | +	$groupby = apply_filters('geodir_filter_widget_listings_groupby', $groupby, $post_type);
 | |
| 2351 | 2351 | |
| 2352 | -	if ( $count_only ) {
 | |
| 2353 | - $sql = "SELECT COUNT(DISTINCT " . $wpdb->posts . ".ID) AS total FROM " . $wpdb->posts . " | |
| 2354 | - " . $join . " | |
| 2352 | +	if ($count_only) {
 | |
| 2353 | + $sql = "SELECT COUNT(DISTINCT ".$wpdb->posts.".ID) AS total FROM ".$wpdb->posts." | |
| 2354 | + " . $join." | |
| 2355 | 2355 | " . $where; | 
| 2356 | - $rows = (int) $wpdb->get_var( $sql ); | |
| 2356 | + $rows = (int) $wpdb->get_var($sql); | |
| 2357 | 2357 |  	} else {
 | 
| 2358 | - $orderby = geodir_widget_listings_get_order( $query_args ); | |
| 2358 | + $orderby = geodir_widget_listings_get_order($query_args); | |
| 2359 | 2359 | /** | 
| 2360 | 2360 | * Filter widget listing orderby clause string part that is being used for query. | 
| 2361 | 2361 | * | 
| @@ -2365,11 +2365,11 @@ discard block | ||
| 2365 | 2365 | * @param string $table Table name. | 
| 2366 | 2366 | * @param string $post_type Post type. | 
| 2367 | 2367 | */ | 
| 2368 | - $orderby = apply_filters( 'geodir_filter_widget_listings_orderby', $orderby, $table, $post_type ); | |
| 2369 | - $orderby .= $wpdb->posts . ".post_title ASC"; | |
| 2370 | - $orderby = $orderby != '' ? " ORDER BY " . $orderby : ''; | |
| 2368 | +		$orderby = apply_filters('geodir_filter_widget_listings_orderby', $orderby, $table, $post_type);
 | |
| 2369 | + $orderby .= $wpdb->posts.".post_title ASC"; | |
| 2370 | + $orderby = $orderby != '' ? " ORDER BY ".$orderby : ''; | |
| 2371 | 2371 | |
| 2372 | - $limit = ! empty( $query_args['posts_per_page'] ) ? $query_args['posts_per_page'] : 5; | |
| 2372 | + $limit = !empty($query_args['posts_per_page']) ? $query_args['posts_per_page'] : 5; | |
| 2373 | 2373 | /** | 
| 2374 | 2374 | * Filter widget listing limit that is being used for query. | 
| 2375 | 2375 | * | 
| @@ -2378,27 +2378,27 @@ discard block | ||
| 2378 | 2378 | * @param int $limit Query results limit. | 
| 2379 | 2379 | * @param string $post_type Post type. | 
| 2380 | 2380 | */ | 
| 2381 | - $limit = apply_filters( 'geodir_filter_widget_listings_limit', $limit, $post_type ); | |
| 2381 | +		$limit = apply_filters('geodir_filter_widget_listings_limit', $limit, $post_type);
 | |
| 2382 | 2382 | |
| 2383 | - $page = ! empty( $query_args['pageno'] ) ? absint( $query_args['pageno'] ) : 1; | |
| 2384 | -		if ( ! $page ) {
 | |
| 2383 | + $page = !empty($query_args['pageno']) ? absint($query_args['pageno']) : 1; | |
| 2384 | +		if (!$page) {
 | |
| 2385 | 2385 | $page = 1; | 
| 2386 | 2386 | } | 
| 2387 | 2387 | |
| 2388 | - $limit = (int) $limit > 0 ? " LIMIT " . absint( ( $page - 1 ) * (int) $limit ) . ", " . (int) $limit : ""; | |
| 2388 | + $limit = (int) $limit > 0 ? " LIMIT ".absint(($page - 1) * (int) $limit).", ".(int) $limit : ""; | |
| 2389 | 2389 | |
| 2390 | 2390 | //@todo removed SQL_CALC_FOUND_ROWS from below as don't think it is needed and query is faster without | 
| 2391 | - $sql = "SELECT " . $fields . " FROM " . $wpdb->posts . " | |
| 2392 | - " . $join . " | |
| 2393 | - " . $where . " | |
| 2394 | - " . $groupby . " | |
| 2395 | - " . $orderby . " | |
| 2391 | + $sql = "SELECT ".$fields." FROM ".$wpdb->posts." | |
| 2392 | + " . $join." | |
| 2393 | + " . $where." | |
| 2394 | + " . $groupby." | |
| 2395 | + " . $orderby." | |
| 2396 | 2396 | " . $limit; | 
| 2397 | - $rows = $wpdb->get_results( $sql ); | |
| 2397 | + $rows = $wpdb->get_results($sql); | |
| 2398 | 2398 | } | 
| 2399 | 2399 | |
| 2400 | - unset( $GLOBALS['gd_query_args_widgets'] ); | |
| 2401 | - unset( $gd_query_args_widgets ); | |
| 2400 | + unset($GLOBALS['gd_query_args_widgets']); | |
| 2401 | + unset($gd_query_args_widgets); | |
| 2402 | 2402 | |
| 2403 | 2403 | return $rows; | 
| 2404 | 2404 | } | 
| @@ -2415,11 +2415,11 @@ discard block | ||
| 2415 | 2415 | * | 
| 2416 | 2416 | * @return string Modified fields SQL. | 
| 2417 | 2417 | */ | 
| 2418 | -function geodir_function_widget_listings_fields( $fields ) {
 | |
| 2418 | +function geodir_function_widget_listings_fields($fields) {
 | |
| 2419 | 2419 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; | 
| 2420 | 2420 | |
| 2421 | 2421 | $query_args = $gd_query_args_widgets; | 
| 2422 | -	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
 | |
| 2422 | +	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
 | |
| 2423 | 2423 | return $fields; | 
| 2424 | 2424 | } | 
| 2425 | 2425 | |
| @@ -2438,24 +2438,24 @@ discard block | ||
| 2438 | 2438 | * | 
| 2439 | 2439 | * @return string Modified join clause SQL. | 
| 2440 | 2440 | */ | 
| 2441 | -function geodir_function_widget_listings_join( $join ) {
 | |
| 2441 | +function geodir_function_widget_listings_join($join) {
 | |
| 2442 | 2442 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; | 
| 2443 | 2443 | |
| 2444 | 2444 | $query_args = $gd_query_args_widgets; | 
| 2445 | -	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
 | |
| 2445 | +	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
 | |
| 2446 | 2446 | return $join; | 
| 2447 | 2447 | } | 
| 2448 | 2448 | |
| 2449 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; | |
| 2450 | - $table = $plugin_prefix . $post_type . '_detail'; | |
| 2449 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; | |
| 2450 | + $table = $plugin_prefix.$post_type.'_detail'; | |
| 2451 | 2451 | |
| 2452 | -	if ( ! empty( $query_args['with_pics_only'] ) ) {
 | |
| 2453 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; | |
| 2452 | +	if (!empty($query_args['with_pics_only'])) {
 | |
| 2453 | + $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )"; | |
| 2454 | 2454 | } | 
| 2455 | 2455 | |
| 2456 | -	if ( ! empty( $query_args['tax_query'] ) ) {
 | |
| 2457 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); | |
| 2458 | -		if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
 | |
| 2456 | +	if (!empty($query_args['tax_query'])) {
 | |
| 2457 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); | |
| 2458 | +		if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
 | |
| 2459 | 2459 | $join .= $tax_queries['join']; | 
| 2460 | 2460 | } | 
| 2461 | 2461 | } | 
| @@ -2475,49 +2475,49 @@ discard block | ||
| 2475 | 2475 | * | 
| 2476 | 2476 | * @return string Modified where clause SQL. | 
| 2477 | 2477 | */ | 
| 2478 | -function geodir_function_widget_listings_where( $where ) {
 | |
| 2478 | +function geodir_function_widget_listings_where($where) {
 | |
| 2479 | 2479 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; | 
| 2480 | 2480 | |
| 2481 | 2481 | $query_args = $gd_query_args_widgets; | 
| 2482 | -	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
 | |
| 2482 | +	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
 | |
| 2483 | 2483 | return $where; | 
| 2484 | 2484 | } | 
| 2485 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; | |
| 2486 | - $table = $plugin_prefix . $post_type . '_detail'; | |
| 2485 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; | |
| 2486 | + $table = $plugin_prefix.$post_type.'_detail'; | |
| 2487 | 2487 | |
| 2488 | -	if ( ! empty( $query_args ) ) {
 | |
| 2489 | -		if ( ! empty( $query_args['gd_location'] ) && function_exists( 'geodir_default_location_where' ) ) {
 | |
| 2490 | - $where = geodir_default_location_where( $where, $table ); | |
| 2488 | +	if (!empty($query_args)) {
 | |
| 2489 | +		if (!empty($query_args['gd_location']) && function_exists('geodir_default_location_where')) {
 | |
| 2490 | + $where = geodir_default_location_where($where, $table); | |
| 2491 | 2491 | } | 
| 2492 | 2492 | |
| 2493 | -		if ( ! empty( $query_args['post_author'] ) ) {
 | |
| 2494 | - $where .= " AND " . $wpdb->posts . ".post_author = " . (int) $query_args['post_author']; | |
| 2493 | +		if (!empty($query_args['post_author'])) {
 | |
| 2494 | + $where .= " AND ".$wpdb->posts.".post_author = ".(int) $query_args['post_author']; | |
| 2495 | 2495 | } | 
| 2496 | 2496 | |
| 2497 | -		if ( ! empty( $query_args['show_featured_only'] ) ) {
 | |
| 2498 | - $where .= " AND " . $table . ".is_featured = '1'"; | |
| 2497 | +		if (!empty($query_args['show_featured_only'])) {
 | |
| 2498 | + $where .= " AND ".$table.".is_featured = '1'"; | |
| 2499 | 2499 | } | 
| 2500 | 2500 | |
| 2501 | -		if ( ! empty( $query_args['show_special_only'] ) ) {
 | |
| 2502 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; | |
| 2501 | +		if (!empty($query_args['show_special_only'])) {
 | |
| 2502 | + $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )"; | |
| 2503 | 2503 | } | 
| 2504 | 2504 | |
| 2505 | -		if ( ! empty( $query_args['with_pics_only'] ) ) {
 | |
| 2506 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL "; | |
| 2505 | +		if (!empty($query_args['with_pics_only'])) {
 | |
| 2506 | + $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL "; | |
| 2507 | 2507 | } | 
| 2508 | 2508 | |
| 2509 | -		if ( ! empty( $query_args['featured_image_only'] ) ) {
 | |
| 2510 | - $where .= " AND " . $table . ".featured_image IS NOT NULL AND " . $table . ".featured_image!='' "; | |
| 2509 | +		if (!empty($query_args['featured_image_only'])) {
 | |
| 2510 | + $where .= " AND ".$table.".featured_image IS NOT NULL AND ".$table.".featured_image!='' "; | |
| 2511 | 2511 | } | 
| 2512 | 2512 | |
| 2513 | -		if ( ! empty( $query_args['with_videos_only'] ) ) {
 | |
| 2514 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; | |
| 2513 | +		if (!empty($query_args['with_videos_only'])) {
 | |
| 2514 | + $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )"; | |
| 2515 | 2515 | } | 
| 2516 | 2516 | |
| 2517 | -		if ( ! empty( $query_args['tax_query'] ) ) {
 | |
| 2518 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); | |
| 2517 | +		if (!empty($query_args['tax_query'])) {
 | |
| 2518 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); | |
| 2519 | 2519 | |
| 2520 | -			if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
 | |
| 2520 | +			if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
 | |
| 2521 | 2521 | $where .= $tax_queries['where']; | 
| 2522 | 2522 | } | 
| 2523 | 2523 | } | 
| @@ -2538,11 +2538,11 @@ discard block | ||
| 2538 | 2538 | * | 
| 2539 | 2539 | * @return string Modified orderby clause SQL. | 
| 2540 | 2540 | */ | 
| 2541 | -function geodir_function_widget_listings_orderby( $orderby ) {
 | |
| 2541 | +function geodir_function_widget_listings_orderby($orderby) {
 | |
| 2542 | 2542 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; | 
| 2543 | 2543 | |
| 2544 | 2544 | $query_args = $gd_query_args_widgets; | 
| 2545 | -	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
 | |
| 2545 | +	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
 | |
| 2546 | 2546 | return $orderby; | 
| 2547 | 2547 | } | 
| 2548 | 2548 | |
| @@ -2561,15 +2561,15 @@ discard block | ||
| 2561 | 2561 | * | 
| 2562 | 2562 | * @return int Query limit. | 
| 2563 | 2563 | */ | 
| 2564 | -function geodir_function_widget_listings_limit( $limit ) {
 | |
| 2564 | +function geodir_function_widget_listings_limit($limit) {
 | |
| 2565 | 2565 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; | 
| 2566 | 2566 | |
| 2567 | 2567 | $query_args = $gd_query_args_widgets; | 
| 2568 | -	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
 | |
| 2568 | +	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
 | |
| 2569 | 2569 | return $limit; | 
| 2570 | 2570 | } | 
| 2571 | 2571 | |
| 2572 | -	if ( ! empty( $query_args ) && ! empty( $query_args['posts_per_page'] ) ) {
 | |
| 2572 | +	if (!empty($query_args) && !empty($query_args['posts_per_page'])) {
 | |
| 2573 | 2573 | $limit = (int) $query_args['posts_per_page']; | 
| 2574 | 2574 | } | 
| 2575 | 2575 | |
| @@ -2587,12 +2587,12 @@ discard block | ||
| 2587 | 2587 | * | 
| 2588 | 2588 | * @return int Large size width. | 
| 2589 | 2589 | */ | 
| 2590 | -function geodir_media_image_large_width( $default = 800, $params = '' ) {
 | |
| 2591 | - $large_size_w = get_option( 'large_size_w' ); | |
| 2590 | +function geodir_media_image_large_width($default = 800, $params = '') {
 | |
| 2591 | +	$large_size_w = get_option('large_size_w');
 | |
| 2592 | 2592 | $large_size_w = $large_size_w > 0 ? $large_size_w : $default; | 
| 2593 | - $large_size_w = absint( $large_size_w ); | |
| 2593 | + $large_size_w = absint($large_size_w); | |
| 2594 | 2594 | |
| 2595 | -	if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
 | |
| 2595 | +	if (!get_option('geodir_use_wp_media_large_size')) {
 | |
| 2596 | 2596 | $large_size_w = 800; | 
| 2597 | 2597 | } | 
| 2598 | 2598 | |
| @@ -2605,7 +2605,7 @@ discard block | ||
| 2605 | 2605 | * @param int $default Default width. | 
| 2606 | 2606 | * @param string|array $params Image parameters. | 
| 2607 | 2607 | */ | 
| 2608 | - $large_size_w = apply_filters( 'geodir_filter_media_image_large_width', $large_size_w, $default, $params ); | |
| 2608 | +	$large_size_w = apply_filters('geodir_filter_media_image_large_width', $large_size_w, $default, $params);
 | |
| 2609 | 2609 | |
| 2610 | 2610 | return $large_size_w; | 
| 2611 | 2611 | } | 
| @@ -2621,12 +2621,12 @@ discard block | ||
| 2621 | 2621 | * | 
| 2622 | 2622 | * @return int Large size height. | 
| 2623 | 2623 | */ | 
| 2624 | -function geodir_media_image_large_height( $default = 800, $params = '' ) {
 | |
| 2625 | - $large_size_h = get_option( 'large_size_h' ); | |
| 2624 | +function geodir_media_image_large_height($default = 800, $params = '') {
 | |
| 2625 | +	$large_size_h = get_option('large_size_h');
 | |
| 2626 | 2626 | $large_size_h = $large_size_h > 0 ? $large_size_h : $default; | 
| 2627 | - $large_size_h = absint( $large_size_h ); | |
| 2627 | + $large_size_h = absint($large_size_h); | |
| 2628 | 2628 | |
| 2629 | -	if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
 | |
| 2629 | +	if (!get_option('geodir_use_wp_media_large_size')) {
 | |
| 2630 | 2630 | $large_size_h = 800; | 
| 2631 | 2631 | } | 
| 2632 | 2632 | |
| @@ -2639,7 +2639,7 @@ discard block | ||
| 2639 | 2639 | * @param int $default Default height. | 
| 2640 | 2640 | * @param string|array $params Image parameters. | 
| 2641 | 2641 | */ | 
| 2642 | - $large_size_h = apply_filters( 'geodir_filter_media_image_large_height', $large_size_h, $default, $params ); | |
| 2642 | +	$large_size_h = apply_filters('geodir_filter_media_image_large_height', $large_size_h, $default, $params);
 | |
| 2643 | 2643 | |
| 2644 | 2644 | return $large_size_h; | 
| 2645 | 2645 | } | 
| @@ -2656,8 +2656,8 @@ discard block | ||
| 2656 | 2656 | * | 
| 2657 | 2657 | * @return string Sanitized name. | 
| 2658 | 2658 | */ | 
| 2659 | -function geodir_sanitize_location_name( $type, $name, $translate = true ) {
 | |
| 2660 | -	if ( $name == '' ) {
 | |
| 2659 | +function geodir_sanitize_location_name($type, $name, $translate = true) {
 | |
| 2660 | +	if ($name == '') {
 | |
| 2661 | 2661 | return null; | 
| 2662 | 2662 | } | 
| 2663 | 2663 | |
| @@ -2666,13 +2666,13 @@ discard block | ||
| 2666 | 2666 | $type = $type == 'gd_city' ? 'city' : $type; | 
| 2667 | 2667 | |
| 2668 | 2668 | $return = $name; | 
| 2669 | -	if ( function_exists( 'get_actual_location_name' ) ) {
 | |
| 2670 | - $return = get_actual_location_name( $type, $name, $translate ); | |
| 2669 | +	if (function_exists('get_actual_location_name')) {
 | |
| 2670 | + $return = get_actual_location_name($type, $name, $translate); | |
| 2671 | 2671 |  	} else {
 | 
| 2672 | - $return = preg_replace( '/-(\d+)$/', '', $return ); | |
| 2673 | - $return = preg_replace( '/[_-]/', ' ', $return ); | |
| 2674 | - $return = geodir_ucwords( $return ); | |
| 2675 | - $return = $translate ? __( $return, 'geodirectory' ) : $return; | |
| 2672 | +		$return = preg_replace('/-(\d+)$/', '', $return);
 | |
| 2673 | +		$return = preg_replace('/[_-]/', ' ', $return);
 | |
| 2674 | + $return = geodir_ucwords($return); | |
| 2675 | + $return = $translate ? __($return, 'geodirectory') : $return; | |
| 2676 | 2676 | } | 
| 2677 | 2677 | |
| 2678 | 2678 | return $return; | 
| @@ -2690,26 +2690,26 @@ discard block | ||
| 2690 | 2690 | * | 
| 2691 | 2691 | * @param int $number Comments number. | 
| 2692 | 2692 | */ | 
| 2693 | -function geodir_comments_number( $number ) {
 | |
| 2693 | +function geodir_comments_number($number) {
 | |
| 2694 | 2694 | global $post; | 
| 2695 | 2695 | |
| 2696 | -	if ( !empty( $post->post_type ) && geodir_cpt_has_rating_disabled( $post->post_type ) ) {
 | |
| 2696 | +	if (!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type)) {
 | |
| 2697 | 2697 | $number = get_comments_number(); | 
| 2698 | 2698 | |
| 2699 | -		if ( $number > 1 ) {
 | |
| 2700 | - $output = str_replace( '%', number_format_i18n( $number ), __( '% Comments', 'geodirectory' ) ); | |
| 2701 | -		} elseif ( $number == 0 || $number == '' ) {
 | |
| 2702 | - $output = __( 'No Comments', 'geodirectory' ); | |
| 2699 | +		if ($number > 1) {
 | |
| 2700 | +			$output = str_replace('%', number_format_i18n($number), __('% Comments', 'geodirectory'));
 | |
| 2701 | +		} elseif ($number == 0 || $number == '') {
 | |
| 2702 | +			$output = __('No Comments', 'geodirectory');
 | |
| 2703 | 2703 |  		} else { // must be one
 | 
| 2704 | - $output = __( '1 Comment', 'geodirectory' ); | |
| 2704 | +			$output = __('1 Comment', 'geodirectory');
 | |
| 2705 | 2705 | } | 
| 2706 | 2706 |  	} else {    
 | 
| 2707 | -		if ( $number > 1 ) {
 | |
| 2708 | - $output = str_replace( '%', number_format_i18n( $number ), __( '% Reviews', 'geodirectory' ) ); | |
| 2709 | -		} elseif ( $number == 0 || $number == '' ) {
 | |
| 2710 | - $output = __( 'No Reviews', 'geodirectory' ); | |
| 2707 | +		if ($number > 1) {
 | |
| 2708 | +			$output = str_replace('%', number_format_i18n($number), __('% Reviews', 'geodirectory'));
 | |
| 2709 | +		} elseif ($number == 0 || $number == '') {
 | |
| 2710 | +			$output = __('No Reviews', 'geodirectory');
 | |
| 2711 | 2711 |  		} else { // must be one
 | 
| 2712 | - $output = __( '1 Review', 'geodirectory' ); | |
| 2712 | +			$output = __('1 Review', 'geodirectory');
 | |
| 2713 | 2713 | } | 
| 2714 | 2714 | } | 
| 2715 | 2715 | |
| @@ -2726,18 +2726,18 @@ discard block | ||
| 2726 | 2726 | */ | 
| 2727 | 2727 |  function is_page_geodir_home() {
 | 
| 2728 | 2728 | global $wpdb; | 
| 2729 | - $cur_url = str_replace( array( "https://", "http://", "www." ), array( '', '', '' ), geodir_curPageURL() ); | |
| 2730 | -	if ( function_exists( 'geodir_location_geo_home_link' ) ) {
 | |
| 2731 | - remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); | |
| 2729 | +	$cur_url = str_replace(array("https://", "http://", "www."), array('', '', ''), geodir_curPageURL());
 | |
| 2730 | +	if (function_exists('geodir_location_geo_home_link')) {
 | |
| 2731 | +		remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
 | |
| 2732 | 2732 | } | 
| 2733 | - $home_url = home_url( '', 'http' ); | |
| 2734 | -	if ( function_exists( 'geodir_location_geo_home_link' ) ) {
 | |
| 2735 | - add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); | |
| 2733 | +	$home_url = home_url('', 'http');
 | |
| 2734 | +	if (function_exists('geodir_location_geo_home_link')) {
 | |
| 2735 | +		add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
 | |
| 2736 | 2736 | } | 
| 2737 | - $home_url = str_replace( "www.", "", $home_url ); | |
| 2738 | -	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' ) ) ) {
 | |
| 2737 | +	$home_url = str_replace("www.", "", $home_url);
 | |
| 2738 | +	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'))) {
 | |
| 2739 | 2739 | return true; | 
| 2740 | -	} 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' ) ) {
 | |
| 2740 | +	} 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')) {
 | |
| 2741 | 2741 | return true; | 
| 2742 | 2742 |  	} else {
 | 
| 2743 | 2743 | return false; | 
| @@ -2757,18 +2757,18 @@ discard block | ||
| 2757 | 2757 | * | 
| 2758 | 2758 | * @return string The canonical URL. | 
| 2759 | 2759 | */ | 
| 2760 | -function geodir_wpseo_homepage_canonical( $url ) {
 | |
| 2760 | +function geodir_wpseo_homepage_canonical($url) {
 | |
| 2761 | 2761 | global $post; | 
| 2762 | 2762 | |
| 2763 | -	if ( is_page_geodir_home() ) {
 | |
| 2763 | +	if (is_page_geodir_home()) {
 | |
| 2764 | 2764 | return home_url(); | 
| 2765 | 2765 | } | 
| 2766 | 2766 | |
| 2767 | 2767 | return $url; | 
| 2768 | 2768 | } | 
| 2769 | 2769 | |
| 2770 | -add_filter( 'wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10 ); | |
| 2771 | -add_filter( 'aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10 ); | |
| 2770 | +add_filter('wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10);
 | |
| 2771 | +add_filter('aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10);
 | |
| 2772 | 2772 | |
| 2773 | 2773 | /** | 
| 2774 | 2774 | * Add extra fields to google maps script call. | 
| @@ -2781,20 +2781,20 @@ discard block | ||
| 2781 | 2781 | * | 
| 2782 | 2782 | * @return string Modified extra string. | 
| 2783 | 2783 | */ | 
| 2784 | -function geodir_googlemap_script_extra_details_page( $extra ) {
 | |
| 2784 | +function geodir_googlemap_script_extra_details_page($extra) {
 | |
| 2785 | 2785 | global $post; | 
| 2786 | 2786 | $add_google_places_api = false; | 
| 2787 | -	if ( isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {
 | |
| 2787 | +	if (isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
 | |
| 2788 | 2788 | $add_google_places_api = true; | 
| 2789 | 2789 | } | 
| 2790 | -	if ( ! str_replace( 'libraries=places', '', $extra ) && ( geodir_is_page( 'detail' ) || $add_google_places_api ) ) {
 | |
| 2790 | +	if (!str_replace('libraries=places', '', $extra) && (geodir_is_page('detail') || $add_google_places_api)) {
 | |
| 2791 | 2791 | $extra .= "&libraries=places"; | 
| 2792 | 2792 | } | 
| 2793 | 2793 | |
| 2794 | 2794 | return $extra; | 
| 2795 | 2795 | } | 
| 2796 | 2796 | |
| 2797 | -add_filter( 'geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1 ); | |
| 2797 | +add_filter('geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1);
 | |
| 2798 | 2798 | |
| 2799 | 2799 | |
| 2800 | 2800 | /** | 
| @@ -2812,104 +2812,104 @@ discard block | ||
| 2812 | 2812 | * after_widget. | 
| 2813 | 2813 | * @param array|string $instance The settings for the particular instance of the widget. | 
| 2814 | 2814 | */ | 
| 2815 | -function geodir_popular_post_category_output( $args = '', $instance = '' ) {
 | |
| 2815 | +function geodir_popular_post_category_output($args = '', $instance = '') {
 | |
| 2816 | 2816 | // prints the widget | 
| 2817 | 2817 | global $wpdb, $plugin_prefix, $geodir_post_category_str; | 
| 2818 | - extract( $args, EXTR_SKIP ); | |
| 2818 | + extract($args, EXTR_SKIP); | |
| 2819 | 2819 | |
| 2820 | 2820 | echo $before_widget; | 
| 2821 | 2821 | |
| 2822 | 2822 | /** This filter is documented in geodirectory_widgets.php */ | 
| 2823 | - $title = empty( $instance['title'] ) ? __( 'Popular Categories', 'geodirectory' ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); | |
| 2823 | +	$title = empty($instance['title']) ? __('Popular Categories', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
 | |
| 2824 | 2824 | |
| 2825 | 2825 | $gd_post_type = geodir_get_current_posttype(); | 
| 2826 | 2826 | |
| 2827 | - $category_limit = isset( $instance['category_limit'] ) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; | |
| 2827 | + $category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; | |
| 2828 | 2828 |  	if (!isset($category_restrict)) {
 | 
| 2829 | 2829 | $category_restrict = false; | 
| 2830 | 2830 | } | 
| 2831 | -	if ( ! empty( $gd_post_type ) ) {
 | |
| 2831 | +	if (!empty($gd_post_type)) {
 | |
| 2832 | 2832 | $default_post_type = $gd_post_type; | 
| 2833 | -	} elseif ( isset( $instance['default_post_type'] ) && gdsc_is_post_type_valid( $instance['default_post_type'] ) ) {
 | |
| 2833 | +	} elseif (isset($instance['default_post_type']) && gdsc_is_post_type_valid($instance['default_post_type'])) {
 | |
| 2834 | 2834 | $default_post_type = $instance['default_post_type']; | 
| 2835 | 2835 |  	} else {
 | 
| 2836 | 2836 | $all_gd_post_type = geodir_get_posttypes(); | 
| 2837 | - $default_post_type = ( isset( $all_gd_post_type[0] ) ) ? $all_gd_post_type[0] : ''; | |
| 2837 | + $default_post_type = (isset($all_gd_post_type[0])) ? $all_gd_post_type[0] : ''; | |
| 2838 | 2838 | } | 
| 2839 | - $parent_only = !empty( $instance['parent_only'] ) ? true : false; | |
| 2839 | + $parent_only = !empty($instance['parent_only']) ? true : false; | |
| 2840 | 2840 | |
| 2841 | 2841 | $taxonomy = array(); | 
| 2842 | -	if ( ! empty( $gd_post_type ) ) {
 | |
| 2843 | - $taxonomy[] = $gd_post_type . "category"; | |
| 2842 | +	if (!empty($gd_post_type)) {
 | |
| 2843 | + $taxonomy[] = $gd_post_type."category"; | |
| 2844 | 2844 |  	} else {
 | 
| 2845 | - $taxonomy = geodir_get_taxonomies( $gd_post_type ); | |
| 2845 | + $taxonomy = geodir_get_taxonomies($gd_post_type); | |
| 2846 | 2846 | } | 
| 2847 | 2847 | |
| 2848 | 2848 |  	$taxonomy = apply_filters('geodir_pp_category_taxonomy', $taxonomy);
 | 
| 2849 | 2849 | |
| 2850 | - $term_args = array( 'taxonomy' => $taxonomy ); | |
| 2851 | -	if ( $parent_only ) {
 | |
| 2850 | +	$term_args = array('taxonomy' => $taxonomy);
 | |
| 2851 | +	if ($parent_only) {
 | |
| 2852 | 2852 | $term_args['parent'] = 0; | 
| 2853 | 2853 | } | 
| 2854 | 2854 | |
| 2855 | - $terms = get_terms( $term_args ); | |
| 2855 | + $terms = get_terms($term_args); | |
| 2856 | 2856 | $a_terms = array(); | 
| 2857 | 2857 | $b_terms = array(); | 
| 2858 | 2858 | |
| 2859 | -	foreach ( $terms as $term ) {
 | |
| 2860 | -		if ( $term->count > 0 ) {
 | |
| 2861 | - $a_terms[ $term->taxonomy ][] = $term; | |
| 2859 | +	foreach ($terms as $term) {
 | |
| 2860 | +		if ($term->count > 0) {
 | |
| 2861 | + $a_terms[$term->taxonomy][] = $term; | |
| 2862 | 2862 | } | 
| 2863 | 2863 | } | 
| 2864 | 2864 | |
| 2865 | -	if ( ! empty( $a_terms ) ) {
 | |
| 2866 | -		foreach ( $a_terms as $b_key => $b_val ) {
 | |
| 2867 | - $b_terms[ $b_key ] = geodir_sort_terms( $b_val, 'count' ); | |
| 2865 | +	if (!empty($a_terms)) {
 | |
| 2866 | +		foreach ($a_terms as $b_key => $b_val) {
 | |
| 2867 | + $b_terms[$b_key] = geodir_sort_terms($b_val, 'count'); | |
| 2868 | 2868 | } | 
| 2869 | 2869 | |
| 2870 | - $default_taxonomy = $default_post_type != '' && isset( $b_terms[ $default_post_type . 'category' ] ) ? $default_post_type . 'category' : ''; | |
| 2870 | + $default_taxonomy = $default_post_type != '' && isset($b_terms[$default_post_type.'category']) ? $default_post_type.'category' : ''; | |
| 2871 | 2871 | |
| 2872 | 2872 | $tax_change_output = ''; | 
| 2873 | -		if ( count( $b_terms ) > 1 ) {
 | |
| 2874 | - $tax_change_output .= "<select data-limit='$category_limit' data-parent='" . (int)$parent_only . "' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; | |
| 2875 | -			foreach ( $b_terms as $key => $val ) {
 | |
| 2876 | - $ptype = get_post_type_object( str_replace( "category", "", $key ) ); | |
| 2877 | - $cpt_name = __( $ptype->labels->singular_name, 'geodirectory' ); | |
| 2878 | - $tax_change_output .= "<option value='$key' " . selected( $key, $default_taxonomy, false ) . ">" . sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name ) . "</option>"; | |
| 2873 | +		if (count($b_terms) > 1) {
 | |
| 2874 | + $tax_change_output .= "<select data-limit='$category_limit' data-parent='".(int) $parent_only."' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; | |
| 2875 | +			foreach ($b_terms as $key => $val) {
 | |
| 2876 | +				$ptype    = get_post_type_object(str_replace("category", "", $key));
 | |
| 2877 | + $cpt_name = __($ptype->labels->singular_name, 'geodirectory'); | |
| 2878 | +				$tax_change_output .= "<option value='$key' ".selected($key, $default_taxonomy, false).">".sprintf(__('%s Categories', 'geodirectory'), $cpt_name)."</option>";
 | |
| 2879 | 2879 | } | 
| 2880 | 2880 | $tax_change_output .= "</select>"; | 
| 2881 | 2881 | } | 
| 2882 | 2882 | |
| 2883 | -		if ( ! empty( $b_terms ) ) {
 | |
| 2884 | - $terms = $default_taxonomy != '' && isset( $b_terms[ $default_taxonomy ] ) ? $b_terms[ $default_taxonomy ] : reset( $b_terms );// get the first array | |
| 2885 | - global $cat_count;//make global so we can change via function | |
| 2883 | +		if (!empty($b_terms)) {
 | |
| 2884 | + $terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms); // get the first array | |
| 2885 | + global $cat_count; //make global so we can change via function | |
| 2886 | 2886 | $cat_count = 0; | 
| 2887 | 2887 | ?> | 
| 2888 | 2888 | <div class="geodir-category-list-in clearfix"> | 
| 2889 | 2889 | <div class="geodir-cat-list clearfix"> | 
| 2890 | 2890 | <?php | 
| 2891 | - echo $before_title . __( $title ) . $after_title; | |
| 2891 | + echo $before_title.__($title).$after_title; | |
| 2892 | 2892 | |
| 2893 | 2893 | echo $tax_change_output; | 
| 2894 | 2894 | |
| 2895 | 2895 | echo '<ul class="geodir-popular-cat-list">'; | 
| 2896 | 2896 | |
| 2897 | - geodir_helper_cat_list_output( $terms, $category_limit, $category_restrict); | |
| 2897 | + geodir_helper_cat_list_output($terms, $category_limit, $category_restrict); | |
| 2898 | 2898 | |
| 2899 | 2899 | echo '</ul>'; | 
| 2900 | 2900 | ?> | 
| 2901 | 2901 | </div> | 
| 2902 | 2902 | <?php | 
| 2903 | 2903 | $hide = ''; | 
| 2904 | -				if ( $cat_count < $category_limit ) {
 | |
| 2904 | +				if ($cat_count < $category_limit) {
 | |
| 2905 | 2905 | $hide = 'style="display:none;"'; | 
| 2906 | 2906 | } | 
| 2907 | 2907 | echo "<div class='geodir-cat-list-more' $hide >"; | 
| 2908 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">' . __( 'More Categories', 'geodirectory' ) . '</a>'; | |
| 2909 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">' . __( 'Less Categories', 'geodirectory' ) . '</a>'; | |
| 2908 | +				echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">'.__('More Categories', 'geodirectory').'</a>';
 | |
| 2909 | +				echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">'.__('Less Categories', 'geodirectory').'</a>';
 | |
| 2910 | 2910 | echo "</div>"; | 
| 2911 | 2911 | /* add scripts */ | 
| 2912 | - add_action( 'wp_footer', 'geodir_popular_category_add_scripts', 100 ); | |
| 2912 | +				add_action('wp_footer', 'geodir_popular_category_add_scripts', 100);
 | |
| 2913 | 2913 | ?> | 
| 2914 | 2914 | </div> | 
| 2915 | 2915 | <?php | 
| @@ -2929,28 +2929,28 @@ discard block | ||
| 2929 | 2929 | * @param int $category_limit Number of categories to display by default. | 
| 2930 | 2930 | * @param bool $category_restrict If the cat limit shoudl be hidden or not shown. | 
| 2931 | 2931 | */ | 
| 2932 | -function geodir_helper_cat_list_output( $terms, $category_limit , $category_restrict=false) {
 | |
| 2932 | +function geodir_helper_cat_list_output($terms, $category_limit, $category_restrict = false) {
 | |
| 2933 | 2933 | global $geodir_post_category_str, $cat_count; | 
| 2934 | 2934 | $term_icons = geodir_get_term_icon(); | 
| 2935 | 2935 | |
| 2936 | 2936 | $geodir_post_category_str = array(); | 
| 2937 | 2937 | |
| 2938 | 2938 | |
| 2939 | -	foreach ( $terms as $cat ) {
 | |
| 2940 | - $post_type = str_replace( "category", "", $cat->taxonomy ); | |
| 2941 | - $term_icon_url = ! empty( $term_icons ) && isset( $term_icons[ $cat->term_id ] ) ? $term_icons[ $cat->term_id ] : ''; | |
| 2939 | +	foreach ($terms as $cat) {
 | |
| 2940 | +		$post_type     = str_replace("category", "", $cat->taxonomy);
 | |
| 2941 | + $term_icon_url = !empty($term_icons) && isset($term_icons[$cat->term_id]) ? $term_icons[$cat->term_id] : ''; | |
| 2942 | 2942 | |
| 2943 | - $cat_count ++; | |
| 2943 | + $cat_count++; | |
| 2944 | 2944 | |
| 2945 | - $geodir_post_category_str[] = array( 'posttype' => $post_type, 'termid' => $cat->term_id ); | |
| 2945 | +		$geodir_post_category_str[] = array('posttype' => $post_type, 'termid' => $cat->term_id);
 | |
| 2946 | 2946 | |
| 2947 | - $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; | |
| 2948 | -		if($category_restrict && $cat_count > $category_limit ){
 | |
| 2947 | + $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; | |
| 2948 | +		if ($category_restrict && $cat_count > $category_limit) {
 | |
| 2949 | 2949 | continue; | 
| 2950 | 2950 | } | 
| 2951 | 2951 | $total_post = $cat->count; | 
| 2952 | 2952 | |
| 2953 | - $term_link = get_term_link( $cat, $cat->taxonomy ); | |
| 2953 | + $term_link = get_term_link($cat, $cat->taxonomy); | |
| 2954 | 2954 | /** | 
| 2955 | 2955 | * Filer the category term link. | 
| 2956 | 2956 | * | 
| @@ -2960,11 +2960,11 @@ discard block | ||
| 2960 | 2960 | * @param int $cat ->term_id The term id. | 
| 2961 | 2961 | * @param string $post_type Wordpress post type. | 
| 2962 | 2962 | */ | 
| 2963 | - $term_link = apply_filters( 'geodir_category_term_link', $term_link, $cat->term_id, $post_type ); | |
| 2963 | +		$term_link = apply_filters('geodir_category_term_link', $term_link, $cat->term_id, $post_type);
 | |
| 2964 | 2964 | |
| 2965 | - echo '<li class="' . $class_row . '"><a href="' . $term_link . '">'; | |
| 2966 | - echo '<img alt="' . esc_attr( $cat->name ) . ' icon" style="height:20px;vertical-align:middle;" src="' . $term_icon_url . '"/> <span class="cat-link">'; | |
| 2967 | -		echo $cat->name . '</span> <span class="geodir_term_class geodir_link_span geodir_category_class_' . $post_type . '_' . $cat->term_id . '">(' . $total_post . ')</span> ';
 | |
| 2965 | + echo '<li class="'.$class_row.'"><a href="'.$term_link.'">'; | |
| 2966 | + echo '<img alt="'.esc_attr($cat->name).' icon" style="height:20px;vertical-align:middle;" src="'.$term_icon_url.'"/> <span class="cat-link">'; | |
| 2967 | +		echo $cat->name.'</span> <span class="geodir_term_class geodir_link_span geodir_category_class_'.$post_type.'_'.$cat->term_id.'">('.$total_post.')</span> ';
 | |
| 2968 | 2968 | echo '</a></li>'; | 
| 2969 | 2969 | } | 
| 2970 | 2970 | } | 
| @@ -2979,14 +2979,14 @@ discard block | ||
| 2979 | 2979 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. | 
| 2980 | 2980 | * @param array|string $instance The settings for the particular instance of the widget. | 
| 2981 | 2981 | */ | 
| 2982 | -function geodir_listing_slider_widget_output( $args = '', $instance = '' ) {
 | |
| 2982 | +function geodir_listing_slider_widget_output($args = '', $instance = '') {
 | |
| 2983 | 2983 | // prints the widget | 
| 2984 | - extract( $args, EXTR_SKIP ); | |
| 2984 | + extract($args, EXTR_SKIP); | |
| 2985 | 2985 | |
| 2986 | 2986 | echo $before_widget; | 
| 2987 | 2987 | |
| 2988 | 2988 | /** This filter is documented in geodirectory_widgets.php */ | 
| 2989 | - $title = empty( $instance['title'] ) ? '' : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); | |
| 2989 | +	$title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
 | |
| 2990 | 2990 | /** | 
| 2991 | 2991 | * Filter the widget post type. | 
| 2992 | 2992 | * | 
| @@ -2994,7 +2994,7 @@ discard block | ||
| 2994 | 2994 | * | 
| 2995 | 2995 | * @param string $instance ['post_type'] Post type of listing. | 
| 2996 | 2996 | */ | 
| 2997 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); | |
| 2997 | +	$post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
 | |
| 2998 | 2998 | /** | 
| 2999 | 2999 | * Filter the widget's term. | 
| 3000 | 3000 | * | 
| @@ -3002,7 +3002,7 @@ discard block | ||
| 3002 | 3002 | * | 
| 3003 | 3003 | * @param string $instance ['category'] Filter by term. Can be any valid term. | 
| 3004 | 3004 | */ | 
| 3005 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); | |
| 3005 | +	$category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
 | |
| 3006 | 3006 | /** | 
| 3007 | 3007 | * Filter widget's "add_location_filter" value. | 
| 3008 | 3008 | * | 
| @@ -3010,7 +3010,7 @@ discard block | ||
| 3010 | 3010 | * | 
| 3011 | 3011 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. | 
| 3012 | 3012 | */ | 
| 3013 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); | |
| 3013 | +	$add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
 | |
| 3014 | 3014 | /** | 
| 3015 | 3015 | * Filter the widget listings limit. | 
| 3016 | 3016 | * | 
| @@ -3018,7 +3018,7 @@ discard block | ||
| 3018 | 3018 | * | 
| 3019 | 3019 | * @param string $instance ['post_number'] Number of listings to display. | 
| 3020 | 3020 | */ | 
| 3021 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); | |
| 3021 | +	$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
 | |
| 3022 | 3022 | /** | 
| 3023 | 3023 | * Filter the widget listings limit shown at one time. | 
| 3024 | 3024 | * | 
| @@ -3026,7 +3026,7 @@ discard block | ||
| 3026 | 3026 | * | 
| 3027 | 3027 | * @param string $instance ['max_show'] Number of listings to display on screen. | 
| 3028 | 3028 | */ | 
| 3029 | - $max_show = empty( $instance['max_show'] ) ? '1' : apply_filters( 'widget_max_show', $instance['max_show'] ); | |
| 3029 | +	$max_show = empty($instance['max_show']) ? '1' : apply_filters('widget_max_show', $instance['max_show']);
 | |
| 3030 | 3030 | /** | 
| 3031 | 3031 | * Filter the widget slide width. | 
| 3032 | 3032 | * | 
| @@ -3034,7 +3034,7 @@ discard block | ||
| 3034 | 3034 | * | 
| 3035 | 3035 | * @param string $instance ['slide_width'] Width of the slides shown. | 
| 3036 | 3036 | */ | 
| 3037 | - $slide_width = empty( $instance['slide_width'] ) ? '' : apply_filters( 'widget_slide_width', $instance['slide_width'] ); | |
| 3037 | +	$slide_width = empty($instance['slide_width']) ? '' : apply_filters('widget_slide_width', $instance['slide_width']);
 | |
| 3038 | 3038 | /** | 
| 3039 | 3039 | * Filter widget's "show title" value. | 
| 3040 | 3040 | * | 
| @@ -3042,7 +3042,7 @@ discard block | ||
| 3042 | 3042 | * | 
| 3043 | 3043 | * @param string|bool $instance ['show_title'] Do you want to display title? Can be 1 or 0. | 
| 3044 | 3044 | */ | 
| 3045 | - $show_title = empty( $instance['show_title'] ) ? '' : apply_filters( 'widget_show_title', $instance['show_title'] ); | |
| 3045 | +	$show_title = empty($instance['show_title']) ? '' : apply_filters('widget_show_title', $instance['show_title']);
 | |
| 3046 | 3046 | /** | 
| 3047 | 3047 | * Filter widget's "slideshow" value. | 
| 3048 | 3048 | * | 
| @@ -3050,7 +3050,7 @@ discard block | ||
| 3050 | 3050 | * | 
| 3051 | 3051 | * @param int $instance ['slideshow'] Setup a slideshow for the slider to animate automatically. | 
| 3052 | 3052 | */ | 
| 3053 | - $slideshow = empty( $instance['slideshow'] ) ? 0 : apply_filters( 'widget_slideshow', $instance['slideshow'] ); | |
| 3053 | +	$slideshow = empty($instance['slideshow']) ? 0 : apply_filters('widget_slideshow', $instance['slideshow']);
 | |
| 3054 | 3054 | /** | 
| 3055 | 3055 | * Filter widget's "animationLoop" value. | 
| 3056 | 3056 | * | 
| @@ -3058,7 +3058,7 @@ discard block | ||
| 3058 | 3058 | * | 
| 3059 | 3059 | * @param int $instance ['animationLoop'] Gives the slider a seamless infinite loop. | 
| 3060 | 3060 | */ | 
| 3061 | - $animationLoop = empty( $instance['animationLoop'] ) ? 0 : apply_filters( 'widget_animationLoop', $instance['animationLoop'] ); | |
| 3061 | +	$animationLoop = empty($instance['animationLoop']) ? 0 : apply_filters('widget_animationLoop', $instance['animationLoop']);
 | |
| 3062 | 3062 | /** | 
| 3063 | 3063 | * Filter widget's "directionNav" value. | 
| 3064 | 3064 | * | 
| @@ -3066,7 +3066,7 @@ discard block | ||
| 3066 | 3066 | * | 
| 3067 | 3067 | * @param int $instance ['directionNav'] Enable previous/next arrow navigation?. Can be 1 or 0. | 
| 3068 | 3068 | */ | 
| 3069 | - $directionNav = empty( $instance['directionNav'] ) ? 0 : apply_filters( 'widget_directionNav', $instance['directionNav'] ); | |
| 3069 | +	$directionNav = empty($instance['directionNav']) ? 0 : apply_filters('widget_directionNav', $instance['directionNav']);
 | |
| 3070 | 3070 | /** | 
| 3071 | 3071 | * Filter widget's "slideshowSpeed" value. | 
| 3072 | 3072 | * | 
| @@ -3074,7 +3074,7 @@ discard block | ||
| 3074 | 3074 | * | 
| 3075 | 3075 | * @param int $instance ['slideshowSpeed'] Set the speed of the slideshow cycling, in milliseconds. | 
| 3076 | 3076 | */ | 
| 3077 | - $slideshowSpeed = empty( $instance['slideshowSpeed'] ) ? 5000 : apply_filters( 'widget_slideshowSpeed', $instance['slideshowSpeed'] ); | |
| 3077 | +	$slideshowSpeed = empty($instance['slideshowSpeed']) ? 5000 : apply_filters('widget_slideshowSpeed', $instance['slideshowSpeed']);
 | |
| 3078 | 3078 | /** | 
| 3079 | 3079 | * Filter widget's "animationSpeed" value. | 
| 3080 | 3080 | * | 
| @@ -3082,7 +3082,7 @@ discard block | ||
| 3082 | 3082 | * | 
| 3083 | 3083 | * @param int $instance ['animationSpeed'] Set the speed of animations, in milliseconds. | 
| 3084 | 3084 | */ | 
| 3085 | - $animationSpeed = empty( $instance['animationSpeed'] ) ? 600 : apply_filters( 'widget_animationSpeed', $instance['animationSpeed'] ); | |
| 3085 | +	$animationSpeed = empty($instance['animationSpeed']) ? 600 : apply_filters('widget_animationSpeed', $instance['animationSpeed']);
 | |
| 3086 | 3086 | /** | 
| 3087 | 3087 | * Filter widget's "animation" value. | 
| 3088 | 3088 | * | 
| @@ -3090,7 +3090,7 @@ discard block | ||
| 3090 | 3090 | * | 
| 3091 | 3091 | * @param string $instance ['animation'] Controls the animation type, "fade" or "slide". | 
| 3092 | 3092 | */ | 
| 3093 | - $animation = empty( $instance['animation'] ) ? 'slide' : apply_filters( 'widget_animation', $instance['animation'] ); | |
| 3093 | +	$animation = empty($instance['animation']) ? 'slide' : apply_filters('widget_animation', $instance['animation']);
 | |
| 3094 | 3094 | /** | 
| 3095 | 3095 | * Filter widget's "list_sort" type. | 
| 3096 | 3096 | * | 
| @@ -3098,10 +3098,10 @@ discard block | ||
| 3098 | 3098 | * | 
| 3099 | 3099 | * @param string $instance ['list_sort'] Listing sort by type. | 
| 3100 | 3100 | */ | 
| 3101 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); | |
| 3102 | - $show_featured_only = ! empty( $instance['show_featured_only'] ) ? 1 : null; | |
| 3101 | +	$list_sort          = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
 | |
| 3102 | + $show_featured_only = !empty($instance['show_featured_only']) ? 1 : null; | |
| 3103 | 3103 | |
| 3104 | - wp_enqueue_script( 'geodirectory-jquery-flexslider-js' ); | |
| 3104 | +	wp_enqueue_script('geodirectory-jquery-flexslider-js');
 | |
| 3105 | 3105 | ?> | 
| 3106 | 3106 | <script type="text/javascript"> | 
| 3107 | 3107 |  		jQuery(window).load(function () {
 | 
| @@ -3120,7 +3120,7 @@ discard block | ||
| 3120 | 3120 | itemWidth: 75, | 
| 3121 | 3121 | itemMargin: 5, | 
| 3122 | 3122 | asNavFor: '#geodir_widget_slider', | 
| 3123 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?>, | |
| 3123 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?>, | |
| 3124 | 3124 |  				start: function (slider) {
 | 
| 3125 | 3125 | // chrome 53 introduced a bug, so we need to repaint the slider when shown. | 
| 3126 | 3126 |  					jQuery('.geodir-slides', jQuery(slider)).removeClass('flexslider-fix-rtl');
 | 
| @@ -3128,19 +3128,19 @@ discard block | ||
| 3128 | 3128 | }); | 
| 3129 | 3129 | |
| 3130 | 3130 |  			jQuery('#geodir_widget_slider').flexslider({
 | 
| 3131 | - animation: "<?php echo $animation;?>", | |
| 3131 | + animation: "<?php echo $animation; ?>", | |
| 3132 | 3132 | selector: ".geodir-slides > li", | 
| 3133 | 3133 | namespace: "geodir-", | 
| 3134 | 3134 | controlNav: true, | 
| 3135 | - animationLoop: <?php echo $animationLoop;?>, | |
| 3136 | - slideshow: <?php echo $slideshow;?>, | |
| 3137 | - slideshowSpeed: <?php echo $slideshowSpeed;?>, | |
| 3138 | - animationSpeed: <?php echo $animationSpeed;?>, | |
| 3139 | - directionNav: <?php echo $directionNav;?>, | |
| 3140 | - maxItems: <?php echo $max_show;?>, | |
| 3135 | + animationLoop: <?php echo $animationLoop; ?>, | |
| 3136 | + slideshow: <?php echo $slideshow; ?>, | |
| 3137 | + slideshowSpeed: <?php echo $slideshowSpeed; ?>, | |
| 3138 | + animationSpeed: <?php echo $animationSpeed; ?>, | |
| 3139 | + directionNav: <?php echo $directionNav; ?>, | |
| 3140 | + maxItems: <?php echo $max_show; ?>, | |
| 3141 | 3141 | move: 1, | 
| 3142 | -				<?php if ( $slide_width ) {
 | |
| 3143 | - echo "itemWidth: " . $slide_width . ","; | |
| 3142 | +				<?php if ($slide_width) {
 | |
| 3143 | + echo "itemWidth: ".$slide_width.","; | |
| 3144 | 3144 | }?> | 
| 3145 | 3145 | sync: "#geodir_widget_carousel", | 
| 3146 | 3146 |  				start: function (slider) {
 | 
| @@ -3151,7 +3151,7 @@ discard block | ||
| 3151 | 3151 |  					jQuery('#geodir_widget_slider').css({'visibility': 'visible'});
 | 
| 3152 | 3152 |  					jQuery('#geodir_widget_carousel').css({'visibility': 'visible'});
 | 
| 3153 | 3153 | }, | 
| 3154 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?> | |
| 3154 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?> | |
| 3155 | 3155 | }); | 
| 3156 | 3156 | }); | 
| 3157 | 3157 | </script> | 
| @@ -3164,62 +3164,62 @@ discard block | ||
| 3164 | 3164 | 'order_by' => $list_sort | 
| 3165 | 3165 | ); | 
| 3166 | 3166 | |
| 3167 | -	if ( $show_featured_only ) {
 | |
| 3167 | +	if ($show_featured_only) {
 | |
| 3168 | 3168 | $query_args['show_featured_only'] = 1; | 
| 3169 | 3169 | } | 
| 3170 | 3170 | |
| 3171 | -	if ( $category != 0 || $category != '' ) {
 | |
| 3172 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); | |
| 3171 | +	if ($category != 0 || $category != '') {
 | |
| 3172 | + $category_taxonomy = geodir_get_taxonomies($post_type); | |
| 3173 | 3173 | $tax_query = array( | 
| 3174 | 3174 | 'taxonomy' => $category_taxonomy[0], | 
| 3175 | 3175 | 'field' => 'id', | 
| 3176 | 3176 | 'terms' => $category | 
| 3177 | 3177 | ); | 
| 3178 | 3178 | |
| 3179 | - $query_args['tax_query'] = array( $tax_query ); | |
| 3179 | + $query_args['tax_query'] = array($tax_query); | |
| 3180 | 3180 | } | 
| 3181 | 3181 | |
| 3182 | 3182 | // we want listings with featured image only | 
| 3183 | 3183 | $query_args['featured_image_only'] = 1; | 
| 3184 | 3184 | |
| 3185 | -	if ( $post_type == 'gd_event' ) {
 | |
| 3185 | +	if ($post_type == 'gd_event') {
 | |
| 3186 | 3186 | $query_args['gedir_event_listing_filter'] = 'upcoming'; | 
| 3187 | 3187 | }// show only upcoming events | 
| 3188 | 3188 | |
| 3189 | - $widget_listings = geodir_get_widget_listings( $query_args ); | |
| 3190 | -	if ( ! empty( $widget_listings ) || ( isset( $with_no_results ) && $with_no_results ) ) {
 | |
| 3191 | -		if ( $title ) {
 | |
| 3192 | - echo $before_title . $title . $after_title; | |
| 3189 | + $widget_listings = geodir_get_widget_listings($query_args); | |
| 3190 | +	if (!empty($widget_listings) || (isset($with_no_results) && $with_no_results)) {
 | |
| 3191 | +		if ($title) {
 | |
| 3192 | + echo $before_title.$title.$after_title; | |
| 3193 | 3193 | } | 
| 3194 | 3194 | |
| 3195 | 3195 | global $post; | 
| 3196 | 3196 | |
| 3197 | - $current_post = $post;// keep current post info | |
| 3197 | + $current_post = $post; // keep current post info | |
| 3198 | 3198 | |
| 3199 | 3199 | $widget_main_slides = ''; | 
| 3200 | 3200 | $nav_slides = ''; | 
| 3201 | 3201 | $widget_slides = 0; | 
| 3202 | 3202 | |
| 3203 | -		foreach ( $widget_listings as $widget_listing ) {
 | |
| 3203 | +		foreach ($widget_listings as $widget_listing) {
 | |
| 3204 | 3204 | global $gd_widget_listing_type; | 
| 3205 | 3205 | $post = $widget_listing; | 
| 3206 | - $widget_image = geodir_get_featured_image( $post->ID, 'thumbnail', get_option( 'geodir_listing_no_img' ) ); | |
| 3206 | +			$widget_image = geodir_get_featured_image($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
 | |
| 3207 | 3207 | |
| 3208 | -			if ( ! empty( $widget_image ) ) {
 | |
| 3209 | -				if ( $widget_image->height >= 200 ) {
 | |
| 3208 | +			if (!empty($widget_image)) {
 | |
| 3209 | +				if ($widget_image->height >= 200) {
 | |
| 3210 | 3210 | $widget_spacer_height = 0; | 
| 3211 | 3211 |  				} else {
 | 
| 3212 | - $widget_spacer_height = ( ( 200 - $widget_image->height ) / 2 ); | |
| 3212 | + $widget_spacer_height = ((200 - $widget_image->height) / 2); | |
| 3213 | 3213 | } | 
| 3214 | 3214 | |
| 3215 | - $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" />'; | |
| 3215 | + $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" />'; | |
| 3216 | 3216 | |
| 3217 | 3217 | $title = ''; | 
| 3218 | -				if ( $show_title ) {
 | |
| 3219 | - $title_html = '<div class="geodir-slider-title"><a href="' . get_permalink( $post->ID ) . '">' . get_the_title( $post->ID ) . '</a></div>'; | |
| 3218 | +				if ($show_title) {
 | |
| 3219 | + $title_html = '<div class="geodir-slider-title"><a href="'.get_permalink($post->ID).'">'.get_the_title($post->ID).'</a></div>'; | |
| 3220 | 3220 | $post_id = $post->ID; | 
| 3221 | - $post_permalink = get_permalink( $post->ID ); | |
| 3222 | - $post_title = get_the_title( $post->ID ); | |
| 3221 | + $post_permalink = get_permalink($post->ID); | |
| 3222 | + $post_title = get_the_title($post->ID); | |
| 3223 | 3223 | /** | 
| 3224 | 3224 | * Filter the listing slider widget title. | 
| 3225 | 3225 | * | 
| @@ -3230,12 +3230,12 @@ discard block | ||
| 3230 | 3230 | * @param string $post_permalink The post permalink url. | 
| 3231 | 3231 | * @param string $post_title The post title text. | 
| 3232 | 3232 | */ | 
| 3233 | - $title = apply_filters( 'geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title ); | |
| 3233 | +					$title = apply_filters('geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title);
 | |
| 3234 | 3234 | } | 
| 3235 | 3235 | |
| 3236 | - $widget_main_slides .= $title . '<img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:200px;margin:0 auto;" /></li>'; | |
| 3237 | - $nav_slides .= '<li><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:48px;margin:0 auto;" /></li>'; | |
| 3238 | - $widget_slides ++; | |
| 3236 | + $widget_main_slides .= $title.'<img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:200px;margin:0 auto;" /></li>'; | |
| 3237 | + $nav_slides .= '<li><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:48px;margin:0 auto;" /></li>'; | |
| 3238 | + $widget_slides++; | |
| 3239 | 3239 | } | 
| 3240 | 3240 | } | 
| 3241 | 3241 | ?> | 
| @@ -3244,7 +3244,7 @@ discard block | ||
| 3244 | 3244 | <div id="geodir_widget_slider" class="geodir_flexslider"> | 
| 3245 | 3245 | <ul class="geodir-slides clearfix"><?php echo $widget_main_slides; ?></ul> | 
| 3246 | 3246 | </div> | 
| 3247 | -			<?php if ( $widget_slides > 1 ) { ?>
 | |
| 3247 | +			<?php if ($widget_slides > 1) { ?>
 | |
| 3248 | 3248 | <div id="geodir_widget_carousel" class="geodir_flexslider"> | 
| 3249 | 3249 | <ul class="geodir-slides clearfix"><?php echo $nav_slides; ?></ul> | 
| 3250 | 3250 | </div> | 
| @@ -3252,7 +3252,7 @@ discard block | ||
| 3252 | 3252 | </div> | 
| 3253 | 3253 | <?php | 
| 3254 | 3254 | $GLOBALS['post'] = $current_post; | 
| 3255 | - setup_postdata( $current_post ); | |
| 3255 | + setup_postdata($current_post); | |
| 3256 | 3256 | } | 
| 3257 | 3257 | echo $after_widget; | 
| 3258 | 3258 | } | 
| @@ -3268,46 +3268,46 @@ discard block | ||
| 3268 | 3268 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. | 
| 3269 | 3269 | * @param array|string $instance The settings for the particular instance of the widget. | 
| 3270 | 3270 | */ | 
| 3271 | -function geodir_loginwidget_output( $args = '', $instance = '' ) {
 | |
| 3271 | +function geodir_loginwidget_output($args = '', $instance = '') {
 | |
| 3272 | 3272 | //print_r($args); | 
| 3273 | 3273 | //print_r($instance); | 
| 3274 | 3274 | // prints the widget | 
| 3275 | - extract( $args, EXTR_SKIP ); | |
| 3275 | + extract($args, EXTR_SKIP); | |
| 3276 | 3276 | |
| 3277 | 3277 | /** This filter is documented in geodirectory_widgets.php */ | 
| 3278 | - $title = empty( $instance['title'] ) ? __( 'My Dashboard', 'geodirectory' ) : apply_filters( 'my_dashboard_widget_title', __( $instance['title'], 'geodirectory' ) ); | |
| 3278 | +	$title = empty($instance['title']) ? __('My Dashboard', 'geodirectory') : apply_filters('my_dashboard_widget_title', __($instance['title'], 'geodirectory'));
 | |
| 3279 | 3279 | |
| 3280 | 3280 | echo $before_widget; | 
| 3281 | - echo $before_title . $title . $after_title; | |
| 3281 | + echo $before_title.$title.$after_title; | |
| 3282 | 3282 | |
| 3283 | -	if ( is_user_logged_in() ) {
 | |
| 3283 | +	if (is_user_logged_in()) {
 | |
| 3284 | 3284 | global $current_user; | 
| 3285 | 3285 | |
| 3286 | - $author_link = get_author_posts_url( $current_user->data->ID ); | |
| 3287 | - $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false ); | |
| 3286 | + $author_link = get_author_posts_url($current_user->data->ID); | |
| 3287 | +		$author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
 | |
| 3288 | 3288 | |
| 3289 | 3289 | echo '<ul class="geodir-loginbox-list">'; | 
| 3290 | 3290 | ob_start(); | 
| 3291 | 3291 | ?> | 
| 3292 | 3292 | <li><a class="signin" | 
| 3293 | - href="<?php echo wp_logout_url( home_url() ); ?>"><?php _e( 'Logout', 'geodirectory' ); ?></a></li> | |
| 3293 | +		       href="<?php echo wp_logout_url(home_url()); ?>"><?php _e('Logout', 'geodirectory'); ?></a></li>
 | |
| 3294 | 3294 | <?php | 
| 3295 | - $post_types = geodir_get_posttypes( 'object' ); | |
| 3296 | - $show_add_listing_post_types_main_nav = get_option( 'geodir_add_listing_link_user_dashboard' ); | |
| 3297 | - $geodir_allow_posttype_frontend = get_option( 'geodir_allow_posttype_frontend' ); | |
| 3295 | +		$post_types                           = geodir_get_posttypes('object');
 | |
| 3296 | +		$show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_user_dashboard');
 | |
| 3297 | +		$geodir_allow_posttype_frontend       = get_option('geodir_allow_posttype_frontend');
 | |
| 3298 | 3298 | |
| 3299 | -		if ( ! empty( $show_add_listing_post_types_main_nav ) ) {
 | |
| 3299 | +		if (!empty($show_add_listing_post_types_main_nav)) {
 | |
| 3300 | 3300 | $addlisting_links = ''; | 
| 3301 | -			foreach ( $post_types as $key => $postobj ) {
 | |
| 3301 | +			foreach ($post_types as $key => $postobj) {
 | |
| 3302 | 3302 | |
| 3303 | -				if ( in_array( $key, $show_add_listing_post_types_main_nav ) ) {
 | |
| 3303 | +				if (in_array($key, $show_add_listing_post_types_main_nav)) {
 | |
| 3304 | 3304 | |
| 3305 | -					if ( $add_link = geodir_get_addlisting_link( $key ) ) {
 | |
| 3305 | +					if ($add_link = geodir_get_addlisting_link($key)) {
 | |
| 3306 | 3306 | |
| 3307 | 3307 | $name = $postobj->labels->name; | 
| 3308 | 3308 | |
| 3309 | 3309 | $selected = ''; | 
| 3310 | -						if ( geodir_get_current_posttype() == $key && geodir_is_page( 'add-listing' ) ) {
 | |
| 3310 | +						if (geodir_get_current_posttype() == $key && geodir_is_page('add-listing')) {
 | |
| 3311 | 3311 | $selected = 'selected="selected"'; | 
| 3312 | 3312 | } | 
| 3313 | 3313 | |
| @@ -3320,22 +3320,22 @@ discard block | ||
| 3320 | 3320 | * @param string $key Add listing array key. | 
| 3321 | 3321 | * @param int $current_user ->ID Current user ID. | 
| 3322 | 3322 | */ | 
| 3323 | - $add_link = apply_filters( 'geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID ); | |
| 3323 | +						$add_link = apply_filters('geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID);
 | |
| 3324 | 3324 | |
| 3325 | - $addlisting_links .= '<option ' . $selected . ' value="' . $add_link . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>'; | |
| 3325 | + $addlisting_links .= '<option '.$selected.' value="'.$add_link.'">'.__(ucfirst($name), 'geodirectory').'</option>'; | |
| 3326 | 3326 | |
| 3327 | 3327 | } | 
| 3328 | 3328 | } | 
| 3329 | 3329 | |
| 3330 | 3330 | } | 
| 3331 | 3331 | |
| 3332 | -			if ( $addlisting_links != '' ) { ?>
 | |
| 3332 | +			if ($addlisting_links != '') { ?>
 | |
| 3333 | 3333 | |
| 3334 | 3334 | <li><select id="geodir_add_listing" class="chosen_select" onchange="window.location.href=this.value" | 
| 3335 | 3335 | option-autoredirect="1" name="geodir_add_listing" option-ajaxchosen="false" | 
| 3336 | - data-placeholder="<?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?>"> | |
| 3336 | +				            data-placeholder="<?php echo esc_attr(__('Add Listing', 'geodirectory')); ?>">
 | |
| 3337 | 3337 | <option value="" disabled="disabled" selected="selected" | 
| 3338 | - style='display:none;'><?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?></option> | |
| 3338 | +						        style='display:none;'><?php echo esc_attr(__('Add Listing', 'geodirectory')); ?></option>
 | |
| 3339 | 3339 | <?php echo $addlisting_links; ?> | 
| 3340 | 3340 | </select></li> <?php | 
| 3341 | 3341 | |
| @@ -3343,23 +3343,23 @@ discard block | ||
| 3343 | 3343 | |
| 3344 | 3344 | } | 
| 3345 | 3345 | // My Favourites in Dashboard | 
| 3346 | - $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' ); | |
| 3346 | +		$show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
 | |
| 3347 | 3347 | $user_favourite = geodir_user_favourite_listing_count(); | 
| 3348 | 3348 | |
| 3349 | -		if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
 | |
| 3349 | +		if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
 | |
| 3350 | 3350 | $favourite_links = ''; | 
| 3351 | 3351 | |
| 3352 | -			foreach ( $post_types as $key => $postobj ) {
 | |
| 3353 | -				if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
 | |
| 3352 | +			foreach ($post_types as $key => $postobj) {
 | |
| 3353 | +				if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
 | |
| 3354 | 3354 | $name = $postobj->labels->name; | 
| 3355 | - $post_type_link = geodir_getlink( $author_link, array( | |
| 3355 | + $post_type_link = geodir_getlink($author_link, array( | |
| 3356 | 3356 | 'stype' => $key, | 
| 3357 | 3357 | 'list' => 'favourite' | 
| 3358 | - ), false ); | |
| 3358 | + ), false); | |
| 3359 | 3359 | |
| 3360 | 3360 | $selected = ''; | 
| 3361 | 3361 | |
| 3362 | -					if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
 | |
| 3362 | +					if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
 | |
| 3363 | 3363 | $selected = 'selected="selected"'; | 
| 3364 | 3364 | } | 
| 3365 | 3365 | /** | 
| @@ -3371,20 +3371,20 @@ discard block | ||
| 3371 | 3371 | * @param string $key Favorite listing array key. | 
| 3372 | 3372 | * @param int $current_user ->ID Current user ID. | 
| 3373 | 3373 | */ | 
| 3374 | - $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID ); | |
| 3374 | +					$post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID);
 | |
| 3375 | 3375 | |
| 3376 | - $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>'; | |
| 3376 | + $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(ucfirst($name), 'geodirectory').'</option>'; | |
| 3377 | 3377 | } | 
| 3378 | 3378 | } | 
| 3379 | 3379 | |
| 3380 | -			if ( $favourite_links != '' ) {
 | |
| 3380 | +			if ($favourite_links != '') {
 | |
| 3381 | 3381 | ?> | 
| 3382 | 3382 | <li> | 
| 3383 | 3383 | <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" | 
| 3384 | 3384 | option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" | 
| 3385 | - data-placeholder="<?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?>"> | |
| 3385 | +					        data-placeholder="<?php echo esc_attr(__('My Favorites', 'geodirectory')); ?>">
 | |
| 3386 | 3386 | <option value="" disabled="disabled" selected="selected" | 
| 3387 | - style='display:none;'><?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?></option> | |
| 3387 | +						        style='display:none;'><?php echo esc_attr(__('My Favorites', 'geodirectory')); ?></option>
 | |
| 3388 | 3388 | <?php echo $favourite_links; ?> | 
| 3389 | 3389 | </select> | 
| 3390 | 3390 | </li> | 
| @@ -3393,19 +3393,19 @@ discard block | ||
| 3393 | 3393 | } | 
| 3394 | 3394 | |
| 3395 | 3395 | |
| 3396 | - $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' ); | |
| 3396 | +		$show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
 | |
| 3397 | 3397 | $user_listing = geodir_user_post_listing_count(); | 
| 3398 | 3398 | |
| 3399 | -		if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
 | |
| 3399 | +		if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
 | |
| 3400 | 3400 | $listing_links = ''; | 
| 3401 | 3401 | |
| 3402 | -			foreach ( $post_types as $key => $postobj ) {
 | |
| 3403 | -				if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
 | |
| 3402 | +			foreach ($post_types as $key => $postobj) {
 | |
| 3403 | +				if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
 | |
| 3404 | 3404 | $name = $postobj->labels->name; | 
| 3405 | - $listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false ); | |
| 3405 | +					$listing_link = geodir_getlink($author_link, array('stype' => $key), false);
 | |
| 3406 | 3406 | |
| 3407 | 3407 | $selected = ''; | 
| 3408 | -					if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
 | |
| 3408 | +					if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
 | |
| 3409 | 3409 | $selected = 'selected="selected"'; | 
| 3410 | 3410 | } | 
| 3411 | 3411 | |
| @@ -3418,20 +3418,20 @@ discard block | ||
| 3418 | 3418 | * @param string $key My listing array key. | 
| 3419 | 3419 | * @param int $current_user ->ID Current user ID. | 
| 3420 | 3420 | */ | 
| 3421 | - $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID ); | |
| 3421 | +					$listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID);
 | |
| 3422 | 3422 | |
| 3423 | - $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>'; | |
| 3423 | + $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(ucfirst($name), 'geodirectory').'</option>'; | |
| 3424 | 3424 | } | 
| 3425 | 3425 | } | 
| 3426 | 3426 | |
| 3427 | -			if ( $listing_links != '' ) {
 | |
| 3427 | +			if ($listing_links != '') {
 | |
| 3428 | 3428 | ?> | 
| 3429 | 3429 | <li> | 
| 3430 | 3430 | <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" | 
| 3431 | 3431 | option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" | 
| 3432 | - data-placeholder="<?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?>"> | |
| 3432 | +					        data-placeholder="<?php echo esc_attr(__('My Listings', 'geodirectory')); ?>">
 | |
| 3433 | 3433 | <option value="" disabled="disabled" selected="selected" | 
| 3434 | - style='display:none;'><?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?></option> | |
| 3434 | +						        style='display:none;'><?php echo esc_attr(__('My Listings', 'geodirectory')); ?></option>
 | |
| 3435 | 3435 | <?php echo $listing_links; ?> | 
| 3436 | 3436 | </select> | 
| 3437 | 3437 | </li> | 
| @@ -3447,7 +3447,7 @@ discard block | ||
| 3447 | 3447 | * | 
| 3448 | 3448 | * @param string $dashboard_link Dashboard links HTML. | 
| 3449 | 3449 | */ | 
| 3450 | - echo apply_filters( 'geodir_dashboard_links', $dashboard_link ); | |
| 3450 | +		echo apply_filters('geodir_dashboard_links', $dashboard_link);
 | |
| 3451 | 3451 | echo '</ul>'; | 
| 3452 | 3452 | |
| 3453 | 3453 | /** | 
| @@ -3455,7 +3455,7 @@ discard block | ||
| 3455 | 3455 | * | 
| 3456 | 3456 | * @since 1.6.6 | 
| 3457 | 3457 | */ | 
| 3458 | - do_action( 'geodir_after_loginwidget_form_logged_in' ); | |
| 3458 | +		do_action('geodir_after_loginwidget_form_logged_in');
 | |
| 3459 | 3459 | |
| 3460 | 3460 | |
| 3461 | 3461 |  	} else {
 | 
| @@ -3470,18 +3470,18 @@ discard block | ||
| 3470 | 3470 | <form name="loginform" class="loginform1" | 
| 3471 | 3471 | action="<?php echo geodir_login_url(); ?>" | 
| 3472 | 3472 | method="post"> | 
| 3473 | - <div class="geodir_form_row"><input placeholder="<?php _e( 'Email', 'geodirectory' ); ?>" name="log" | |
| 3473 | +			<div class="geodir_form_row"><input placeholder="<?php _e('Email', 'geodirectory'); ?>" name="log"
 | |
| 3474 | 3474 | type="text" class="textfield user_login1"/> <span | 
| 3475 | 3475 | class="user_loginInfo"></span></div> | 
| 3476 | - <div class="geodir_form_row"><input placeholder="<?php _e( 'Password', 'geodirectory' ); ?>" | |
| 3476 | +			<div class="geodir_form_row"><input placeholder="<?php _e('Password', 'geodirectory'); ?>"
 | |
| 3477 | 3477 | name="pwd" type="password" | 
| 3478 | 3478 | class="textfield user_pass1 input-text"/><span | 
| 3479 | 3479 | class="user_passInfo"></span></div> | 
| 3480 | 3480 | |
| 3481 | - <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars( geodir_curPageURL() ); ?>"/> | |
| 3481 | + <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars(geodir_curPageURL()); ?>"/> | |
| 3482 | 3482 | <input type="hidden" name="testcookie" value="1"/> | 
| 3483 | 3483 | |
| 3484 | - <?php do_action( 'login_form' ); ?> | |
| 3484 | +				<?php do_action('login_form'); ?>
 | |
| 3485 | 3485 | |
| 3486 | 3486 | <div class="geodir_form_row clearfix"><input type="submit" name="submit" | 
| 3487 | 3487 | value="<?php echo SIGN_IN_BUTTON; ?>" class="b_signin"/> | 
| @@ -3493,11 +3493,11 @@ discard block | ||
| 3493 | 3493 | * | 
| 3494 | 3494 | * @since 1.0.0 | 
| 3495 | 3495 | */ | 
| 3496 | - $is_enable_signup = get_option( 'users_can_register' ); | |
| 3496 | +					$is_enable_signup = get_option('users_can_register');
 | |
| 3497 | 3497 | |
| 3498 | -					if ( $is_enable_signup ) {
 | |
| 3498 | +					if ($is_enable_signup) {
 | |
| 3499 | 3499 | ?> | 
| 3500 | - <a href="<?php echo geodir_login_url( array( 'signup' => true ) ); ?>" | |
| 3500 | +						<a href="<?php echo geodir_login_url(array('signup' => true)); ?>"
 | |
| 3501 | 3501 | class="goedir-newuser-link"><?php echo NEW_USER_TEXT; ?></a> | 
| 3502 | 3502 | |
| 3503 | 3503 | <?php | 
| @@ -3508,7 +3508,7 @@ discard block | ||
| 3508 | 3508 | * @since 1.0.0 | 
| 3509 | 3509 | */ | 
| 3510 | 3510 | ?> | 
| 3511 | - <a href="<?php echo geodir_login_url( array( 'forgot' => true ) ); ?>" | |
| 3511 | +					<a href="<?php echo geodir_login_url(array('forgot' => true)); ?>"
 | |
| 3512 | 3512 | class="goedir-forgot-link"><?php echo FORGOT_PW_TEXT; ?></a></p></div> | 
| 3513 | 3513 | </form> | 
| 3514 | 3514 | <?php | 
| @@ -3517,7 +3517,7 @@ discard block | ||
| 3517 | 3517 | * | 
| 3518 | 3518 | * @since 1.6.6 | 
| 3519 | 3519 | */ | 
| 3520 | - do_action( 'geodir_after_loginwidget_form_logged_out' ); | |
| 3520 | +		do_action('geodir_after_loginwidget_form_logged_out');
 | |
| 3521 | 3521 | } | 
| 3522 | 3522 | |
| 3523 | 3523 | echo $after_widget; | 
| @@ -3539,16 +3539,16 @@ discard block | ||
| 3539 | 3539 | * after_widget. | 
| 3540 | 3540 | * @param array|string $instance The settings for the particular instance of the widget. | 
| 3541 | 3541 | */ | 
| 3542 | -function geodir_popular_postview_output( $args = '', $instance = '' ) {
 | |
| 3542 | +function geodir_popular_postview_output($args = '', $instance = '') {
 | |
| 3543 | 3543 | global $gd_session; | 
| 3544 | 3544 | |
| 3545 | 3545 | // prints the widget | 
| 3546 | - extract( $args, EXTR_SKIP ); | |
| 3546 | + extract($args, EXTR_SKIP); | |
| 3547 | 3547 | |
| 3548 | 3548 | echo $before_widget; | 
| 3549 | 3549 | |
| 3550 | 3550 | /** This filter is documented in geodirectory_widgets.php */ | 
| 3551 | - $title = empty( $instance['title'] ) ? geodir_ucwords( $instance['category_title'] ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); | |
| 3551 | +	$title = empty($instance['title']) ? geodir_ucwords($instance['category_title']) : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
 | |
| 3552 | 3552 | /** | 
| 3553 | 3553 | * Filter the widget post type. | 
| 3554 | 3554 | * | 
| @@ -3556,7 +3556,7 @@ discard block | ||
| 3556 | 3556 | * | 
| 3557 | 3557 | * @param string $instance ['post_type'] Post type of listing. | 
| 3558 | 3558 | */ | 
| 3559 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); | |
| 3559 | +	$post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
 | |
| 3560 | 3560 | /** | 
| 3561 | 3561 | * Filter the widget's term. | 
| 3562 | 3562 | * | 
| @@ -3564,7 +3564,7 @@ discard block | ||
| 3564 | 3564 | * | 
| 3565 | 3565 | * @param string $instance ['category'] Filter by term. Can be any valid term. | 
| 3566 | 3566 | */ | 
| 3567 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); | |
| 3567 | +	$category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
 | |
| 3568 | 3568 | /** | 
| 3569 | 3569 | * Filter the widget listings limit. | 
| 3570 | 3570 | * | 
| @@ -3572,7 +3572,7 @@ discard block | ||
| 3572 | 3572 | * | 
| 3573 | 3573 | * @param string $instance ['post_number'] Number of listings to display. | 
| 3574 | 3574 | */ | 
| 3575 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); | |
| 3575 | +	$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
 | |
| 3576 | 3576 | /** | 
| 3577 | 3577 | * Filter widget's "layout" type. | 
| 3578 | 3578 | * | 
| @@ -3580,7 +3580,7 @@ discard block | ||
| 3580 | 3580 | * | 
| 3581 | 3581 | * @param string $instance ['layout'] Widget layout type. | 
| 3582 | 3582 | */ | 
| 3583 | - $layout = empty( $instance['layout'] ) ? 'gridview_onehalf' : apply_filters( 'widget_layout', $instance['layout'] ); | |
| 3583 | +	$layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);
 | |
| 3584 | 3584 | /** | 
| 3585 | 3585 | * Filter widget's "add_location_filter" value. | 
| 3586 | 3586 | * | 
| @@ -3588,7 +3588,7 @@ discard block | ||
| 3588 | 3588 | * | 
| 3589 | 3589 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. | 
| 3590 | 3590 | */ | 
| 3591 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); | |
| 3591 | +	$add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
 | |
| 3592 | 3592 | /** | 
| 3593 | 3593 | * Filter widget's listing width. | 
| 3594 | 3594 | * | 
| @@ -3596,7 +3596,7 @@ discard block | ||
| 3596 | 3596 | * | 
| 3597 | 3597 | * @param string $instance ['listing_width'] Listing width. | 
| 3598 | 3598 | */ | 
| 3599 | - $listing_width = empty( $instance['listing_width'] ) ? '' : apply_filters( 'widget_listing_width', $instance['listing_width'] ); | |
| 3599 | +	$listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);
 | |
| 3600 | 3600 | /** | 
| 3601 | 3601 | * Filter widget's "list_sort" type. | 
| 3602 | 3602 | * | 
| @@ -3604,25 +3604,25 @@ discard block | ||
| 3604 | 3604 | * | 
| 3605 | 3605 | * @param string $instance ['list_sort'] Listing sort by type. | 
| 3606 | 3606 | */ | 
| 3607 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); | |
| 3608 | - $use_viewing_post_type = ! empty( $instance['use_viewing_post_type'] ) ? true : false; | |
| 3607 | +	$list_sort             = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
 | |
| 3608 | + $use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false; | |
| 3609 | 3609 | |
| 3610 | 3610 | // set post type to current viewing post type | 
| 3611 | -	if ( $use_viewing_post_type ) {
 | |
| 3611 | +	if ($use_viewing_post_type) {
 | |
| 3612 | 3612 | $current_post_type = geodir_get_current_posttype(); | 
| 3613 | -		if ( $current_post_type != '' && $current_post_type != $post_type ) {
 | |
| 3613 | +		if ($current_post_type != '' && $current_post_type != $post_type) {
 | |
| 3614 | 3614 | $post_type = $current_post_type; | 
| 3615 | 3615 | $category = array(); // old post type category will not work for current changed post type | 
| 3616 | 3616 | } | 
| 3617 | 3617 | } | 
| 3618 | 3618 | // replace widget title dynamically | 
| 3619 | - $posttype_plural_label = __( get_post_type_plural_label( $post_type ), 'geodirectory' ); | |
| 3620 | - $posttype_singular_label = __( get_post_type_singular_label( $post_type ), 'geodirectory' ); | |
| 3619 | + $posttype_plural_label = __(get_post_type_plural_label($post_type), 'geodirectory'); | |
| 3620 | + $posttype_singular_label = __(get_post_type_singular_label($post_type), 'geodirectory'); | |
| 3621 | 3621 | |
| 3622 | - $title = str_replace( "%posttype_plural_label%", $posttype_plural_label, $title ); | |
| 3623 | - $title = str_replace( "%posttype_singular_label%", $posttype_singular_label, $title ); | |
| 3622 | +	$title = str_replace("%posttype_plural_label%", $posttype_plural_label, $title);
 | |
| 3623 | +	$title = str_replace("%posttype_singular_label%", $posttype_singular_label, $title);
 | |
| 3624 | 3624 | |
| 3625 | -	if ( isset( $instance['character_count'] ) ) {
 | |
| 3625 | +	if (isset($instance['character_count'])) {
 | |
| 3626 | 3626 | /** | 
| 3627 | 3627 | * Filter the widget's excerpt character count. | 
| 3628 | 3628 | * | 
| @@ -3630,37 +3630,37 @@ discard block | ||
| 3630 | 3630 | * | 
| 3631 | 3631 | * @param int $instance ['character_count'] Excerpt character count. | 
| 3632 | 3632 | */ | 
| 3633 | - $character_count = apply_filters( 'widget_list_character_count', $instance['character_count'] ); | |
| 3633 | +		$character_count = apply_filters('widget_list_character_count', $instance['character_count']);
 | |
| 3634 | 3634 |  	} else {
 | 
| 3635 | 3635 | $character_count = ''; | 
| 3636 | 3636 | } | 
| 3637 | 3637 | |
| 3638 | -	if ( empty( $title ) || $title == 'All' ) {
 | |
| 3639 | - $title .= ' ' . __( get_post_type_plural_label( $post_type ), 'geodirectory' ); | |
| 3638 | +	if (empty($title) || $title == 'All') {
 | |
| 3639 | + $title .= ' '.__(get_post_type_plural_label($post_type), 'geodirectory'); | |
| 3640 | 3640 | } | 
| 3641 | 3641 | |
| 3642 | 3642 | $location_url = array(); | 
| 3643 | - $city = get_query_var( 'gd_city' ); | |
| 3644 | -	if ( ! empty( $city ) ) {
 | |
| 3645 | - $country = get_query_var( 'gd_country' ); | |
| 3646 | - $region = get_query_var( 'gd_region' ); | |
| 3643 | +	$city         = get_query_var('gd_city');
 | |
| 3644 | +	if (!empty($city)) {
 | |
| 3645 | +		$country = get_query_var('gd_country');
 | |
| 3646 | +		$region  = get_query_var('gd_region');
 | |
| 3647 | 3647 | |
| 3648 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); | |
| 3648 | +		$geodir_show_location_url = get_option('geodir_show_location_url');
 | |
| 3649 | 3649 | |
| 3650 | -		if ( $geodir_show_location_url == 'all' ) {
 | |
| 3651 | -			if ( $country != '' ) {
 | |
| 3650 | +		if ($geodir_show_location_url == 'all') {
 | |
| 3651 | +			if ($country != '') {
 | |
| 3652 | 3652 | $location_url[] = $country; | 
| 3653 | 3653 | } | 
| 3654 | 3654 | |
| 3655 | -			if ( $region != '' ) {
 | |
| 3655 | +			if ($region != '') {
 | |
| 3656 | 3656 | $location_url[] = $region; | 
| 3657 | 3657 | } | 
| 3658 | -		} else if ( $geodir_show_location_url == 'country_city' ) {
 | |
| 3659 | -			if ( $country != '' ) {
 | |
| 3658 | +		} else if ($geodir_show_location_url == 'country_city') {
 | |
| 3659 | +			if ($country != '') {
 | |
| 3660 | 3660 | $location_url[] = $country; | 
| 3661 | 3661 | } | 
| 3662 | -		} else if ( $geodir_show_location_url == 'region_city' ) {
 | |
| 3663 | -			if ( $region != '' ) {
 | |
| 3662 | +		} else if ($geodir_show_location_url == 'region_city') {
 | |
| 3663 | +			if ($region != '') {
 | |
| 3664 | 3664 | $location_url[] = $region; | 
| 3665 | 3665 | } | 
| 3666 | 3666 | } | 
| @@ -3668,37 +3668,37 @@ discard block | ||
| 3668 | 3668 | $location_url[] = $city; | 
| 3669 | 3669 | } | 
| 3670 | 3670 | |
| 3671 | - $location_url = implode( '/', $location_url ); | |
| 3671 | +	$location_url  = implode('/', $location_url);
 | |
| 3672 | 3672 | $skip_location = false; | 
| 3673 | -	if ( ! $add_location_filter && $gd_session->get( 'gd_multi_location' ) ) {
 | |
| 3673 | +	if (!$add_location_filter && $gd_session->get('gd_multi_location')) {
 | |
| 3674 | 3674 | $skip_location = true; | 
| 3675 | - $gd_session->un_set( 'gd_multi_location' ); | |
| 3675 | +		$gd_session->un_set('gd_multi_location');
 | |
| 3676 | 3676 | } | 
| 3677 | 3677 | |
| 3678 | -	if ( get_option( 'permalink_structure' ) ) {
 | |
| 3679 | - $viewall_url = get_post_type_archive_link( $post_type ); | |
| 3678 | +	if (get_option('permalink_structure')) {
 | |
| 3679 | + $viewall_url = get_post_type_archive_link($post_type); | |
| 3680 | 3680 |  	} else {
 | 
| 3681 | - $viewall_url = get_post_type_archive_link( $post_type ); | |
| 3681 | + $viewall_url = get_post_type_archive_link($post_type); | |
| 3682 | 3682 | } | 
| 3683 | 3683 | |
| 3684 | -	if ( ! empty( $category ) && $category[0] != '0' ) {
 | |
| 3684 | +	if (!empty($category) && $category[0] != '0') {
 | |
| 3685 | 3685 | global $geodir_add_location_url; | 
| 3686 | 3686 | |
| 3687 | 3687 | $geodir_add_location_url = '0'; | 
| 3688 | 3688 | |
| 3689 | -		if ( $add_location_filter != '0' ) {
 | |
| 3689 | +		if ($add_location_filter != '0') {
 | |
| 3690 | 3690 | $geodir_add_location_url = '1'; | 
| 3691 | 3691 | } | 
| 3692 | 3692 | |
| 3693 | - $viewall_url = get_term_link( (int) $category[0], $post_type . 'category' ); | |
| 3693 | + $viewall_url = get_term_link((int) $category[0], $post_type.'category'); | |
| 3694 | 3694 | |
| 3695 | 3695 | $geodir_add_location_url = null; | 
| 3696 | 3696 | } | 
| 3697 | -	if ( $skip_location ) {
 | |
| 3698 | - $gd_session->set( 'gd_multi_location', 1 ); | |
| 3697 | +	if ($skip_location) {
 | |
| 3698 | +		$gd_session->set('gd_multi_location', 1);
 | |
| 3699 | 3699 | } | 
| 3700 | 3700 | |
| 3701 | -	if ( is_wp_error( $viewall_url ) ) {
 | |
| 3701 | +	if (is_wp_error($viewall_url)) {
 | |
| 3702 | 3702 | $viewall_url = ''; | 
| 3703 | 3703 | } | 
| 3704 | 3704 | |
| @@ -3710,34 +3710,34 @@ discard block | ||
| 3710 | 3710 | 'order_by' => $list_sort | 
| 3711 | 3711 | ); | 
| 3712 | 3712 | |
| 3713 | -	if ( $character_count ) {
 | |
| 3713 | +	if ($character_count) {
 | |
| 3714 | 3714 | $query_args['excerpt_length'] = $character_count; | 
| 3715 | 3715 | } | 
| 3716 | 3716 | |
| 3717 | -	if ( ! empty( $instance['show_featured_only'] ) ) {
 | |
| 3717 | +	if (!empty($instance['show_featured_only'])) {
 | |
| 3718 | 3718 | $query_args['show_featured_only'] = 1; | 
| 3719 | 3719 | } | 
| 3720 | 3720 | |
| 3721 | -	if ( ! empty( $instance['show_special_only'] ) ) {
 | |
| 3721 | +	if (!empty($instance['show_special_only'])) {
 | |
| 3722 | 3722 | $query_args['show_special_only'] = 1; | 
| 3723 | 3723 | } | 
| 3724 | 3724 | |
| 3725 | -	if ( ! empty( $instance['with_pics_only'] ) ) {
 | |
| 3725 | +	if (!empty($instance['with_pics_only'])) {
 | |
| 3726 | 3726 | $query_args['with_pics_only'] = 0; | 
| 3727 | 3727 | $query_args['featured_image_only'] = 1; | 
| 3728 | 3728 | } | 
| 3729 | 3729 | |
| 3730 | -	if ( ! empty( $instance['with_videos_only'] ) ) {
 | |
| 3730 | +	if (!empty($instance['with_videos_only'])) {
 | |
| 3731 | 3731 | $query_args['with_videos_only'] = 1; | 
| 3732 | 3732 | } | 
| 3733 | - $with_no_results = ! empty( $instance['without_no_results'] ) ? false : true; | |
| 3733 | + $with_no_results = !empty($instance['without_no_results']) ? false : true; | |
| 3734 | 3734 | |
| 3735 | -	if ( ! empty( $category ) && $category[0] != '0' ) {
 | |
| 3736 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); | |
| 3735 | +	if (!empty($category) && $category[0] != '0') {
 | |
| 3736 | + $category_taxonomy = geodir_get_taxonomies($post_type); | |
| 3737 | 3737 | |
| 3738 | 3738 | ######### WPML ######### | 
| 3739 | -		if ( function_exists( 'icl_object_id' ) ) {
 | |
| 3740 | - $category = gd_lang_object_ids( $category, $category_taxonomy[0] ); | |
| 3739 | +		if (function_exists('icl_object_id')) {
 | |
| 3740 | + $category = gd_lang_object_ids($category, $category_taxonomy[0]); | |
| 3741 | 3741 | } | 
| 3742 | 3742 | ######### WPML ######### | 
| 3743 | 3743 | |
| @@ -3747,14 +3747,14 @@ discard block | ||
| 3747 | 3747 | 'terms' => $category | 
| 3748 | 3748 | ); | 
| 3749 | 3749 | |
| 3750 | - $query_args['tax_query'] = array( $tax_query ); | |
| 3750 | + $query_args['tax_query'] = array($tax_query); | |
| 3751 | 3751 | } | 
| 3752 | 3752 | |
| 3753 | 3753 | global $gridview_columns_widget, $geodir_is_widget_listing; | 
| 3754 | 3754 | |
| 3755 | - $widget_listings = geodir_get_widget_listings( $query_args ); | |
| 3755 | + $widget_listings = geodir_get_widget_listings($query_args); | |
| 3756 | 3756 | |
| 3757 | -	if ( ! empty( $widget_listings ) || $with_no_results ) {
 | |
| 3757 | +	if (!empty($widget_listings) || $with_no_results) {
 | |
| 3758 | 3758 | ?> | 
| 3759 | 3759 | <div class="geodir_locations geodir_location_listing"> | 
| 3760 | 3760 | |
| @@ -3764,11 +3764,11 @@ discard block | ||
| 3764 | 3764 | * | 
| 3765 | 3765 | * @since 1.0.0 | 
| 3766 | 3766 | */ | 
| 3767 | - do_action( 'geodir_before_view_all_link_in_widget' ); ?> | |
| 3767 | +			do_action('geodir_before_view_all_link_in_widget'); ?>
 | |
| 3768 | 3768 | <div class="geodir_list_heading clearfix"> | 
| 3769 | - <?php echo $before_title . $title . $after_title; ?> | |
| 3769 | + <?php echo $before_title.$title.$after_title; ?> | |
| 3770 | 3770 | <a href="<?php echo $viewall_url; ?>" | 
| 3771 | - class="geodir-viewall"><?php _e( 'View all', 'geodirectory' ); ?></a> | |
| 3771 | +				   class="geodir-viewall"><?php _e('View all', 'geodirectory'); ?></a>
 | |
| 3772 | 3772 | </div> | 
| 3773 | 3773 | <?php | 
| 3774 | 3774 | /** | 
| @@ -3776,10 +3776,10 @@ discard block | ||
| 3776 | 3776 | * | 
| 3777 | 3777 | * @since 1.0.0 | 
| 3778 | 3778 | */ | 
| 3779 | - do_action( 'geodir_after_view_all_link_in_widget' ); ?> | |
| 3779 | +			do_action('geodir_after_view_all_link_in_widget'); ?>
 | |
| 3780 | 3780 | <?php | 
| 3781 | -			if ( strstr( $layout, 'gridview' ) ) {
 | |
| 3782 | - $listing_view_exp = explode( '_', $layout ); | |
| 3781 | +			if (strstr($layout, 'gridview')) {
 | |
| 3782 | +				$listing_view_exp        = explode('_', $layout);
 | |
| 3783 | 3783 | $gridview_columns_widget = $layout; | 
| 3784 | 3784 | $layout = $listing_view_exp[0]; | 
| 3785 | 3785 |  			} else {
 | 
| @@ -3791,8 +3791,8 @@ discard block | ||
| 3791 | 3791 | * | 
| 3792 | 3792 | * @since 1.0.0 | 
| 3793 | 3793 | */ | 
| 3794 | - $template = apply_filters( "geodir_template_part-widget-listing-listview", geodir_locate_template( 'widget-listing-listview' ) ); | |
| 3795 | -			if ( ! isset( $character_count ) ) {
 | |
| 3794 | +			$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
 | |
| 3795 | +			if (!isset($character_count)) {
 | |
| 3796 | 3796 | /** | 
| 3797 | 3797 | * Filter the widget's excerpt character count. | 
| 3798 | 3798 | * | 
| @@ -3800,7 +3800,7 @@ discard block | ||
| 3800 | 3800 | * | 
| 3801 | 3801 | * @param int $instance ['character_count'] Excerpt character count. | 
| 3802 | 3802 | */ | 
| 3803 | - $character_count = $character_count == '' ? 50 : apply_filters( 'widget_character_count', $character_count ); | |
| 3803 | +				$character_count = $character_count == '' ? 50 : apply_filters('widget_character_count', $character_count);
 | |
| 3804 | 3804 | } | 
| 3805 | 3805 | |
| 3806 | 3806 | global $post, $map_jason, $map_canvas_arr; | 
| @@ -3815,13 +3815,13 @@ discard block | ||
| 3815 | 3815 | * | 
| 3816 | 3816 | * @since 1.0.0 | 
| 3817 | 3817 | */ | 
| 3818 | - include( $template ); | |
| 3818 | + include($template); | |
| 3819 | 3819 | |
| 3820 | 3820 | $geodir_is_widget_listing = false; | 
| 3821 | 3821 | |
| 3822 | 3822 | $GLOBALS['post'] = $current_post; | 
| 3823 | -			if ( ! empty( $current_post ) ) {
 | |
| 3824 | - setup_postdata( $current_post ); | |
| 3823 | +			if (!empty($current_post)) {
 | |
| 3824 | + setup_postdata($current_post); | |
| 3825 | 3825 | } | 
| 3826 | 3826 | $map_jason = $current_map_jason; | 
| 3827 | 3827 | $map_canvas_arr = $current_map_canvas_arr; | 
| @@ -3852,12 +3852,12 @@ discard block | ||
| 3852 | 3852 | * | 
| 3853 | 3853 | * @return int Reviews count. | 
| 3854 | 3854 | */ | 
| 3855 | -function geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ) {
 | |
| 3855 | +function geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type) {
 | |
| 3856 | 3856 | global $wpdb, $plugin_prefix; | 
| 3857 | 3857 | |
| 3858 | - $detail_table = $plugin_prefix . $post_type . '_detail'; | |
| 3858 | + $detail_table = $plugin_prefix.$post_type.'_detail'; | |
| 3859 | 3859 | |
| 3860 | -	$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 . ")";
 | |
| 3860 | +	$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.")";
 | |
| 3861 | 3861 | |
| 3862 | 3862 | /** | 
| 3863 | 3863 | * Filter count review sql query. | 
| @@ -3869,9 +3869,9 @@ discard block | ||
| 3869 | 3869 | * @param int $taxonomy The taxonomy Id. | 
| 3870 | 3870 | * @param string $post_type The post type. | 
| 3871 | 3871 | */ | 
| 3872 | - $sql = apply_filters( 'geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type ); | |
| 3872 | +	$sql = apply_filters('geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type);
 | |
| 3873 | 3873 | |
| 3874 | - $count = $wpdb->get_var( $sql ); | |
| 3874 | + $count = $wpdb->get_var($sql); | |
| 3875 | 3875 | |
| 3876 | 3876 | return $count; | 
| 3877 | 3877 | } | 
| @@ -3889,7 +3889,7 @@ discard block | ||
| 3889 | 3889 | * | 
| 3890 | 3890 | * @return array Term array data. | 
| 3891 | 3891 | */ | 
| 3892 | -function geodir_count_reviews_by_terms( $force_update = false, $post_ID = 0 ) {
 | |
| 3892 | +function geodir_count_reviews_by_terms($force_update = false, $post_ID = 0) {
 | |
| 3893 | 3893 | /** | 
| 3894 | 3894 | * Filter review count option data. | 
| 3895 | 3895 | * | 
| @@ -3899,78 +3899,78 @@ discard block | ||
| 3899 | 3899 | * @param bool $force_update Force update option value?. Default.false. | 
| 3900 | 3900 | * @param int $post_ID The post id to update if any. | 
| 3901 | 3901 | */ | 
| 3902 | - $option_data = apply_filters( 'geodir_count_reviews_by_terms_before', '', $force_update, $post_ID ); | |
| 3903 | -	if ( ! empty( $option_data ) ) {
 | |
| 3902 | +	$option_data = apply_filters('geodir_count_reviews_by_terms_before', '', $force_update, $post_ID);
 | |
| 3903 | +	if (!empty($option_data)) {
 | |
| 3904 | 3904 | return $option_data; | 
| 3905 | 3905 | } | 
| 3906 | 3906 | |
| 3907 | - $option_data = get_option( 'geodir_global_review_count' ); | |
| 3907 | +	$option_data = get_option('geodir_global_review_count');
 | |
| 3908 | 3908 | |
| 3909 | -	if ( ! $option_data || $force_update ) {
 | |
| 3910 | -		if ( (int) $post_ID > 0 ) { // Update reviews count for specific post categories only.
 | |
| 3909 | +	if (!$option_data || $force_update) {
 | |
| 3910 | +		if ((int) $post_ID > 0) { // Update reviews count for specific post categories only.
 | |
| 3911 | 3911 | global $gd_session; | 
| 3912 | 3912 | $term_array = (array) $option_data; | 
| 3913 | - $post_type = get_post_type( $post_ID ); | |
| 3914 | - $taxonomy = $post_type . 'category'; | |
| 3915 | - $terms = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) ); | |
| 3916 | - | |
| 3917 | -			if ( ! empty( $terms ) && ! is_wp_error( $terms ) ) {
 | |
| 3918 | -				foreach ( $terms as $term_id ) {
 | |
| 3919 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); | |
| 3920 | - $children = get_term_children( $term_id, $taxonomy ); | |
| 3921 | - $term_array[ $term_id ] = $count; | |
| 3913 | + $post_type = get_post_type($post_ID); | |
| 3914 | + $taxonomy = $post_type.'category'; | |
| 3915 | +			$terms      = wp_get_object_terms($post_ID, $taxonomy, array('fields' => 'ids'));
 | |
| 3916 | + | |
| 3917 | +			if (!empty($terms) && !is_wp_error($terms)) {
 | |
| 3918 | +				foreach ($terms as $term_id) {
 | |
| 3919 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); | |
| 3920 | + $children = get_term_children($term_id, $taxonomy); | |
| 3921 | + $term_array[$term_id] = $count; | |
| 3922 | 3922 | } | 
| 3923 | 3923 | } | 
| 3924 | 3924 | |
| 3925 | - $session_listing = $gd_session->get( 'listing' ); | |
| 3925 | +			$session_listing = $gd_session->get('listing');
 | |
| 3926 | 3926 | |
| 3927 | 3927 | $terms = array(); | 
| 3928 | -			if ( isset( $_POST['post_category'][ $taxonomy ] ) ) {
 | |
| 3929 | - $terms = (array) $_POST['post_category'][ $taxonomy ]; | |
| 3930 | -			} else if ( ! empty( $session_listing ) && isset( $session_listing['post_category'][ $taxonomy ] ) ) {
 | |
| 3931 | - $terms = (array) $session_listing['post_category'][ $taxonomy ]; | |
| 3928 | +			if (isset($_POST['post_category'][$taxonomy])) {
 | |
| 3929 | + $terms = (array) $_POST['post_category'][$taxonomy]; | |
| 3930 | +			} else if (!empty($session_listing) && isset($session_listing['post_category'][$taxonomy])) {
 | |
| 3931 | + $terms = (array) $session_listing['post_category'][$taxonomy]; | |
| 3932 | 3932 | } | 
| 3933 | 3933 | |
| 3934 | -			if ( ! empty( $terms ) ) {
 | |
| 3935 | -				foreach ( $terms as $term_id ) {
 | |
| 3936 | -					if ( $term_id > 0 ) {
 | |
| 3937 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); | |
| 3938 | - $children = get_term_children( $term_id, $taxonomy ); | |
| 3939 | - $term_array[ $term_id ] = $count; | |
| 3934 | +			if (!empty($terms)) {
 | |
| 3935 | +				foreach ($terms as $term_id) {
 | |
| 3936 | +					if ($term_id > 0) {
 | |
| 3937 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); | |
| 3938 | + $children = get_term_children($term_id, $taxonomy); | |
| 3939 | + $term_array[$term_id] = $count; | |
| 3940 | 3940 | } | 
| 3941 | 3941 | } | 
| 3942 | 3942 | } | 
| 3943 | 3943 |  		} else { // Update reviews count for all post categories.
 | 
| 3944 | 3944 | $term_array = array(); | 
| 3945 | 3945 | $post_types = geodir_get_posttypes(); | 
| 3946 | -			foreach ( $post_types as $post_type ) {
 | |
| 3946 | +			foreach ($post_types as $post_type) {
 | |
| 3947 | 3947 | |
| 3948 | - $taxonomy = geodir_get_taxonomies( $post_type ); | |
| 3948 | + $taxonomy = geodir_get_taxonomies($post_type); | |
| 3949 | 3949 | $taxonomy = $taxonomy[0]; | 
| 3950 | 3950 | |
| 3951 | 3951 | $args = array( | 
| 3952 | 3952 | 'hide_empty' => false | 
| 3953 | 3953 | ); | 
| 3954 | 3954 | |
| 3955 | - $terms = get_terms( $taxonomy, $args ); | |
| 3955 | + $terms = get_terms($taxonomy, $args); | |
| 3956 | 3956 | |
| 3957 | -				foreach ( $terms as $term ) {
 | |
| 3958 | - $count = geodir_count_reviews_by_term_id( $term->term_id, $taxonomy, $post_type ); | |
| 3959 | - $children = get_term_children( $term->term_id, $taxonomy ); | |
| 3957 | +				foreach ($terms as $term) {
 | |
| 3958 | + $count = geodir_count_reviews_by_term_id($term->term_id, $taxonomy, $post_type); | |
| 3959 | + $children = get_term_children($term->term_id, $taxonomy); | |
| 3960 | 3960 |  					/*if ( is_array( $children ) ) {
 | 
| 3961 | 3961 |                          foreach ( $children as $child_id ) {
 | 
| 3962 | 3962 | $child_count = geodir_count_reviews_by_term_id($child_id, $taxonomy, $post_type); | 
| 3963 | 3963 | $count = $count + $child_count; | 
| 3964 | 3964 | } | 
| 3965 | 3965 | }*/ | 
| 3966 | - $term_array[ $term->term_id ] = $count; | |
| 3966 | + $term_array[$term->term_id] = $count; | |
| 3967 | 3967 | } | 
| 3968 | 3968 | } | 
| 3969 | 3969 | } | 
| 3970 | 3970 | |
| 3971 | - update_option( 'geodir_global_review_count', $term_array ); | |
| 3971 | +		update_option('geodir_global_review_count', $term_array);
 | |
| 3972 | 3972 | //clear cache | 
| 3973 | - wp_cache_delete( 'geodir_global_review_count' ); | |
| 3973 | +		wp_cache_delete('geodir_global_review_count');
 | |
| 3974 | 3974 | |
| 3975 | 3975 | return $term_array; | 
| 3976 | 3976 |  	} else {
 | 
| @@ -3986,39 +3986,39 @@ discard block | ||
| 3986 | 3986 | * @package GeoDirectory | 
| 3987 | 3987 | * @return bool | 
| 3988 | 3988 | */ | 
| 3989 | -function geodir_term_review_count_force_update( $new_status, $old_status = '', $post = '' ) {
 | |
| 3990 | -	if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'geodir_import_export' ) {
 | |
| 3989 | +function geodir_term_review_count_force_update($new_status, $old_status = '', $post = '') {
 | |
| 3990 | +	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'geodir_import_export') {
 | |
| 3991 | 3991 | return; // do not run if importing listings | 
| 3992 | 3992 | } | 
| 3993 | 3993 | |
| 3994 | -	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 | |
| 3994 | +	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 | |
| 3995 | 3995 | return; | 
| 3996 | 3996 | } | 
| 3997 | 3997 | |
| 3998 | 3998 | $post_ID = 0; | 
| 3999 | -	if ( ! empty( $post ) ) {
 | |
| 4000 | -		if ( isset( $post->post_type ) && strpos( $post->post_type, 'gd_' ) !== 0 ) {
 | |
| 3999 | +	if (!empty($post)) {
 | |
| 4000 | +		if (isset($post->post_type) && strpos($post->post_type, 'gd_') !== 0) {
 | |
| 4001 | 4001 | return; | 
| 4002 | 4002 | } | 
| 4003 | 4003 | |
| 4004 | -		if ( $new_status == 'auto-draft' && $old_status == 'new' ) {
 | |
| 4004 | +		if ($new_status == 'auto-draft' && $old_status == 'new') {
 | |
| 4005 | 4005 | return; | 
| 4006 | 4006 | } | 
| 4007 | 4007 | |
| 4008 | -		if ( ! empty( $post->ID ) ) {
 | |
| 4008 | +		if (!empty($post->ID)) {
 | |
| 4009 | 4009 | $post_ID = $post->ID; | 
| 4010 | 4010 | } | 
| 4011 | 4011 | } | 
| 4012 | 4012 | |
| 4013 | -	if ( $new_status != $old_status ) {
 | |
| 4014 | - geodir_count_reviews_by_terms( true, $post_ID ); | |
| 4013 | +	if ($new_status != $old_status) {
 | |
| 4014 | + geodir_count_reviews_by_terms(true, $post_ID); | |
| 4015 | 4015 | } | 
| 4016 | 4016 | |
| 4017 | 4017 | return true; | 
| 4018 | 4018 | } | 
| 4019 | 4019 | |
| 4020 | -function geodir_term_review_count_force_update_single_post( $post_id ) {
 | |
| 4021 | - geodir_count_reviews_by_terms( true, $post_id ); | |
| 4020 | +function geodir_term_review_count_force_update_single_post($post_id) {
 | |
| 4021 | + geodir_count_reviews_by_terms(true, $post_id); | |
| 4022 | 4022 | } | 
| 4023 | 4023 | |
| 4024 | 4024 | /*-----------------------------------------------------------------------------------*/ | 
| @@ -4035,11 +4035,11 @@ discard block | ||
| 4035 | 4035 | * | 
| 4036 | 4036 | * @return int Post count. | 
| 4037 | 4037 | */ | 
| 4038 | -function geodir_count_posts_by_term( $data, $term ) {
 | |
| 4038 | +function geodir_count_posts_by_term($data, $term) {
 | |
| 4039 | 4039 | |
| 4040 | -	if ( $data ) {
 | |
| 4041 | -		if ( isset( $data[ $term->term_id ] ) ) {
 | |
| 4042 | - return $data[ $term->term_id ]; | |
| 4040 | +	if ($data) {
 | |
| 4041 | +		if (isset($data[$term->term_id])) {
 | |
| 4042 | + return $data[$term->term_id]; | |
| 4043 | 4043 |  		} else {
 | 
| 4044 | 4044 | return 0; | 
| 4045 | 4045 | } | 
| @@ -4056,8 +4056,8 @@ discard block | ||
| 4056 | 4056 | * param array $terms An array of term objects. | 
| 4057 | 4057 | * @return array Sorted terms array. | 
| 4058 | 4058 | */ | 
| 4059 | -function geodir_sort_terms_by_count( $terms ) {
 | |
| 4060 | - usort( $terms, "geodir_sort_by_count_obj" ); | |
| 4059 | +function geodir_sort_terms_by_count($terms) {
 | |
| 4060 | + usort($terms, "geodir_sort_by_count_obj"); | |
| 4061 | 4061 | |
| 4062 | 4062 | return $terms; | 
| 4063 | 4063 | } | 
| @@ -4072,8 +4072,8 @@ discard block | ||
| 4072 | 4072 | * | 
| 4073 | 4073 | * @return array Sorted terms array. | 
| 4074 | 4074 | */ | 
| 4075 | -function geodir_sort_terms_by_review_count( $terms ) {
 | |
| 4076 | - usort( $terms, "geodir_sort_by_review_count_obj" ); | |
| 4075 | +function geodir_sort_terms_by_review_count($terms) {
 | |
| 4076 | + usort($terms, "geodir_sort_by_review_count_obj"); | |
| 4077 | 4077 | |
| 4078 | 4078 | return $terms; | 
| 4079 | 4079 | } | 
| @@ -4089,12 +4089,12 @@ discard block | ||
| 4089 | 4089 | * | 
| 4090 | 4090 | * @return array Sorted terms array. | 
| 4091 | 4091 | */ | 
| 4092 | -function geodir_sort_terms( $terms, $sort = 'count' ) {
 | |
| 4093 | -	if ( $sort == 'count' ) {
 | |
| 4094 | - return geodir_sort_terms_by_count( $terms ); | |
| 4092 | +function geodir_sort_terms($terms, $sort = 'count') {
 | |
| 4093 | +	if ($sort == 'count') {
 | |
| 4094 | + return geodir_sort_terms_by_count($terms); | |
| 4095 | 4095 | } | 
| 4096 | -	if ( $sort == 'review_count' ) {
 | |
| 4097 | - return geodir_sort_terms_by_review_count( $terms ); | |
| 4096 | +	if ($sort == 'review_count') {
 | |
| 4097 | + return geodir_sort_terms_by_review_count($terms); | |
| 4098 | 4098 | } | 
| 4099 | 4099 | } | 
| 4100 | 4100 | |
| @@ -4112,7 +4112,7 @@ discard block | ||
| 4112 | 4112 | * | 
| 4113 | 4113 | * @return bool | 
| 4114 | 4114 | */ | 
| 4115 | -function geodir_sort_by_count( $a, $b ) {
 | |
| 4115 | +function geodir_sort_by_count($a, $b) {
 | |
| 4116 | 4116 | return $a['count'] < $b['count']; | 
| 4117 | 4117 | } | 
| 4118 | 4118 | |
| @@ -4127,7 +4127,7 @@ discard block | ||
| 4127 | 4127 | * | 
| 4128 | 4128 | * @return bool | 
| 4129 | 4129 | */ | 
| 4130 | -function geodir_sort_by_count_obj( $a, $b ) {
 | |
| 4130 | +function geodir_sort_by_count_obj($a, $b) {
 | |
| 4131 | 4131 | return $a->count < $b->count; | 
| 4132 | 4132 | } | 
| 4133 | 4133 | |
| @@ -4142,7 +4142,7 @@ discard block | ||
| 4142 | 4142 | * | 
| 4143 | 4143 | * @return bool | 
| 4144 | 4144 | */ | 
| 4145 | -function geodir_sort_by_review_count_obj( $a, $b ) {
 | |
| 4145 | +function geodir_sort_by_review_count_obj($a, $b) {
 | |
| 4146 | 4146 | return $a->review_count < $b->review_count; | 
| 4147 | 4147 | } | 
| 4148 | 4148 | |
| @@ -4159,35 +4159,35 @@ discard block | ||
| 4159 | 4159 | * @since 1.4.2 | 
| 4160 | 4160 | * @package GeoDirectory | 
| 4161 | 4161 | */ | 
| 4162 | - $locale = apply_filters( 'plugin_locale', get_locale(), 'geodirectory' ); | |
| 4162 | +	$locale = apply_filters('plugin_locale', get_locale(), 'geodirectory');
 | |
| 4163 | 4163 | |
| 4164 | - load_textdomain( 'geodirectory', WP_LANG_DIR . '/' . 'geodirectory' . '/' . 'geodirectory' . '-' . $locale . '.mo' ); | |
| 4165 | - load_plugin_textdomain( 'geodirectory', false, plugin_basename( dirname( dirname( __FILE__ ) ) ) . '/geodirectory-languages' ); | |
| 4164 | +	load_textdomain('geodirectory', WP_LANG_DIR.'/'.'geodirectory'.'/'.'geodirectory'.'-'.$locale.'.mo');
 | |
| 4165 | +	load_plugin_textdomain('geodirectory', false, plugin_basename(dirname(dirname(__FILE__))).'/geodirectory-languages');
 | |
| 4166 | 4166 | |
| 4167 | 4167 | /** | 
| 4168 | 4168 | * Define language constants. | 
| 4169 | 4169 | * | 
| 4170 | 4170 | * @since 1.0.0 | 
| 4171 | 4171 | */ | 
| 4172 | - require_once( geodir_plugin_path() . '/language.php' ); | |
| 4172 | + require_once(geodir_plugin_path().'/language.php'); | |
| 4173 | 4173 | |
| 4174 | - $language_file = geodir_plugin_path() . '/db-language.php'; | |
| 4174 | + $language_file = geodir_plugin_path().'/db-language.php'; | |
| 4175 | 4175 | |
| 4176 | 4176 | // Load language string file if not created yet | 
| 4177 | -	if ( ! file_exists( $language_file ) ) {
 | |
| 4177 | +	if (!file_exists($language_file)) {
 | |
| 4178 | 4178 | geodirectory_load_db_language(); | 
| 4179 | 4179 | } | 
| 4180 | 4180 | |
| 4181 | -	if ( file_exists( $language_file ) ) {
 | |
| 4181 | +	if (file_exists($language_file)) {
 | |
| 4182 | 4182 | /** | 
| 4183 | 4183 | * Language strings from database. | 
| 4184 | 4184 | * | 
| 4185 | 4185 | * @since 1.4.2 | 
| 4186 | 4186 | */ | 
| 4187 | 4187 |  		try {
 | 
| 4188 | - require_once( $language_file ); | |
| 4189 | -		} catch ( Exception $e ) {
 | |
| 4190 | - error_log( 'Language Error: ' . $e->getMessage() ); | |
| 4188 | + require_once($language_file); | |
| 4189 | +		} catch (Exception $e) {
 | |
| 4190 | +			error_log('Language Error: '.$e->getMessage());
 | |
| 4191 | 4191 | } | 
| 4192 | 4192 | } | 
| 4193 | 4193 | } | 
| @@ -4204,19 +4204,19 @@ discard block | ||
| 4204 | 4204 | */ | 
| 4205 | 4205 |  function geodirectory_load_db_language() {
 | 
| 4206 | 4206 | global $wp_filesystem; | 
| 4207 | -	if ( empty( $wp_filesystem ) ) {
 | |
| 4208 | - require_once( ABSPATH . '/wp-admin/includes/file.php' ); | |
| 4207 | +	if (empty($wp_filesystem)) {
 | |
| 4208 | + require_once(ABSPATH.'/wp-admin/includes/file.php'); | |
| 4209 | 4209 | WP_Filesystem(); | 
| 4210 | 4210 | global $wp_filesystem; | 
| 4211 | 4211 | } | 
| 4212 | 4212 | |
| 4213 | - $language_file = geodir_plugin_path() . '/db-language.php'; | |
| 4213 | + $language_file = geodir_plugin_path().'/db-language.php'; | |
| 4214 | 4214 | |
| 4215 | -	if ( is_file( $language_file ) && ! is_writable( $language_file ) ) {
 | |
| 4215 | +	if (is_file($language_file) && !is_writable($language_file)) {
 | |
| 4216 | 4216 | return false; | 
| 4217 | 4217 | } // Not possible to create. | 
| 4218 | 4218 | |
| 4219 | -	if ( ! is_file( $language_file ) && ! is_writable( dirname( $language_file ) ) ) {
 | |
| 4219 | +	if (!is_file($language_file) && !is_writable(dirname($language_file))) {
 | |
| 4220 | 4220 | return false; | 
| 4221 | 4221 | } // Not possible to create. | 
| 4222 | 4222 | |
| @@ -4230,9 +4230,9 @@ discard block | ||
| 4230 | 4230 | * | 
| 4231 | 4231 | * @param array $contents_strings Array of strings. | 
| 4232 | 4232 | */ | 
| 4233 | - $contents_strings = apply_filters( 'geodir_load_db_language', $contents_strings ); | |
| 4233 | +	$contents_strings = apply_filters('geodir_load_db_language', $contents_strings);
 | |
| 4234 | 4234 | |
| 4235 | - $contents_strings = array_unique( $contents_strings ); | |
| 4235 | + $contents_strings = array_unique($contents_strings); | |
| 4236 | 4236 | |
| 4237 | 4237 | $contents_head = array(); | 
| 4238 | 4238 | $contents_head[] = "<?php"; | 
| @@ -4249,21 +4249,21 @@ discard block | ||
| 4249 | 4249 | $contents_foot[] = ""; | 
| 4250 | 4250 | $contents_foot[] = ""; | 
| 4251 | 4251 | |
| 4252 | - $contents = implode( PHP_EOL, $contents_head ); | |
| 4252 | + $contents = implode(PHP_EOL, $contents_head); | |
| 4253 | 4253 | |
| 4254 | -	if ( ! empty( $contents_strings ) ) {
 | |
| 4255 | -		foreach ( $contents_strings as $string ) {
 | |
| 4256 | -			if ( is_scalar( $string ) && $string != '' ) {
 | |
| 4257 | - $string = str_replace( "'", "\'", $string ); | |
| 4258 | - geodir_wpml_register_string( $string ); | |
| 4259 | -				$contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";
 | |
| 4254 | +	if (!empty($contents_strings)) {
 | |
| 4255 | +		foreach ($contents_strings as $string) {
 | |
| 4256 | +			if (is_scalar($string) && $string != '') {
 | |
| 4257 | +				$string = str_replace("'", "\'", $string);
 | |
| 4258 | + geodir_wpml_register_string($string); | |
| 4259 | +				$contents .= PHP_EOL."__('".$string."', 'geodirectory');";
 | |
| 4260 | 4260 | } | 
| 4261 | 4261 | } | 
| 4262 | 4262 | } | 
| 4263 | 4263 | |
| 4264 | - $contents .= implode( PHP_EOL, $contents_foot ); | |
| 4264 | + $contents .= implode(PHP_EOL, $contents_foot); | |
| 4265 | 4265 | |
| 4266 | -	if ( $wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE ) ) {
 | |
| 4266 | +	if ($wp_filesystem->put_contents($language_file, $contents, FS_CHMOD_FILE)) {
 | |
| 4267 | 4267 | return false; | 
| 4268 | 4268 | } // Failure; could not write file. | 
| 4269 | 4269 | |
| @@ -4284,49 +4284,49 @@ discard block | ||
| 4284 | 4284 | * | 
| 4285 | 4285 | * @return array Translation texts. | 
| 4286 | 4286 | */ | 
| 4287 | -function geodir_load_custom_field_translation( $translation_texts = array() ) {
 | |
| 4287 | +function geodir_load_custom_field_translation($translation_texts = array()) {
 | |
| 4288 | 4288 | global $wpdb; | 
| 4289 | 4289 | |
| 4290 | 4290 | // Custom fields table | 
| 4291 | - $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM " . GEODIR_CUSTOM_FIELDS_TABLE; | |
| 4292 | - $rows = $wpdb->get_results( $sql ); | |
| 4291 | + $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM ".GEODIR_CUSTOM_FIELDS_TABLE; | |
| 4292 | + $rows = $wpdb->get_results($sql); | |
| 4293 | 4293 | |
| 4294 | -	if ( ! empty( $rows ) ) {
 | |
| 4295 | -		foreach ( $rows as $row ) {
 | |
| 4296 | -			if ( ! empty( $row->admin_title ) ) {
 | |
| 4297 | - $translation_texts[] = stripslashes_deep( $row->admin_title ); | |
| 4294 | +	if (!empty($rows)) {
 | |
| 4295 | +		foreach ($rows as $row) {
 | |
| 4296 | +			if (!empty($row->admin_title)) {
 | |
| 4297 | + $translation_texts[] = stripslashes_deep($row->admin_title); | |
| 4298 | 4298 | } | 
| 4299 | 4299 | |
| 4300 | -			if ( ! empty( $row->admin_desc ) ) {
 | |
| 4301 | - $translation_texts[] = stripslashes_deep( $row->admin_desc ); | |
| 4300 | +			if (!empty($row->admin_desc)) {
 | |
| 4301 | + $translation_texts[] = stripslashes_deep($row->admin_desc); | |
| 4302 | 4302 | } | 
| 4303 | 4303 | |
| 4304 | -			if ( ! empty( $row->site_title ) ) {
 | |
| 4305 | - $translation_texts[] = stripslashes_deep( $row->site_title ); | |
| 4304 | +			if (!empty($row->site_title)) {
 | |
| 4305 | + $translation_texts[] = stripslashes_deep($row->site_title); | |
| 4306 | 4306 | } | 
| 4307 | 4307 | |
| 4308 | -			if ( ! empty( $row->clabels ) ) {
 | |
| 4309 | - $translation_texts[] = stripslashes_deep( $row->clabels ); | |
| 4308 | +			if (!empty($row->clabels)) {
 | |
| 4309 | + $translation_texts[] = stripslashes_deep($row->clabels); | |
| 4310 | 4310 | } | 
| 4311 | 4311 | |
| 4312 | -			if ( ! empty( $row->required_msg ) ) {
 | |
| 4313 | - $translation_texts[] = stripslashes_deep( $row->required_msg ); | |
| 4312 | +			if (!empty($row->required_msg)) {
 | |
| 4313 | + $translation_texts[] = stripslashes_deep($row->required_msg); | |
| 4314 | 4314 | } | 
| 4315 | 4315 | |
| 4316 | -			if ( ! empty( $row->validation_msg ) ) {
 | |
| 4317 | - $translation_texts[] = stripslashes_deep( $row->validation_msg ); | |
| 4316 | +			if (!empty($row->validation_msg)) {
 | |
| 4317 | + $translation_texts[] = stripslashes_deep($row->validation_msg); | |
| 4318 | 4318 | } | 
| 4319 | 4319 | |
| 4320 | -			if ( ! empty( $row->default_value ) ) {
 | |
| 4321 | - $translation_texts[] = stripslashes_deep( $row->default_value ); | |
| 4320 | +			if (!empty($row->default_value)) {
 | |
| 4321 | + $translation_texts[] = stripslashes_deep($row->default_value); | |
| 4322 | 4322 | } | 
| 4323 | 4323 | |
| 4324 | -			if ( ! empty( $row->option_values ) ) {
 | |
| 4325 | - $option_values = geodir_string_values_to_options( stripslashes_deep( $row->option_values ) ); | |
| 4324 | +			if (!empty($row->option_values)) {
 | |
| 4325 | + $option_values = geodir_string_values_to_options(stripslashes_deep($row->option_values)); | |
| 4326 | 4326 | |
| 4327 | -				if ( ! empty( $option_values ) ) {
 | |
| 4328 | -					foreach ( $option_values as $option_value ) {
 | |
| 4329 | -						if ( ! empty( $option_value['label'] ) ) {
 | |
| 4327 | +				if (!empty($option_values)) {
 | |
| 4328 | +					foreach ($option_values as $option_value) {
 | |
| 4329 | +						if (!empty($option_value['label'])) {
 | |
| 4330 | 4330 | $translation_texts[] = $option_value['label']; | 
| 4331 | 4331 | } | 
| 4332 | 4332 | } | 
| @@ -4336,56 +4336,56 @@ discard block | ||
| 4336 | 4336 | } | 
| 4337 | 4337 | |
| 4338 | 4338 | // Custom sorting fields table | 
| 4339 | - $sql = "SELECT site_title, asc_title, desc_title FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE; | |
| 4340 | - $rows = $wpdb->get_results( $sql ); | |
| 4339 | + $sql = "SELECT site_title, asc_title, desc_title FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE; | |
| 4340 | + $rows = $wpdb->get_results($sql); | |
| 4341 | 4341 | |
| 4342 | -	if ( ! empty( $rows ) ) {
 | |
| 4343 | -		foreach ( $rows as $row ) {
 | |
| 4344 | -			if ( ! empty( $row->site_title ) ) {
 | |
| 4345 | - $translation_texts[] = stripslashes_deep( $row->site_title ); | |
| 4342 | +	if (!empty($rows)) {
 | |
| 4343 | +		foreach ($rows as $row) {
 | |
| 4344 | +			if (!empty($row->site_title)) {
 | |
| 4345 | + $translation_texts[] = stripslashes_deep($row->site_title); | |
| 4346 | 4346 | } | 
| 4347 | 4347 | |
| 4348 | -			if ( ! empty( $row->asc_title ) ) {
 | |
| 4349 | - $translation_texts[] = stripslashes_deep( $row->asc_title ); | |
| 4348 | +			if (!empty($row->asc_title)) {
 | |
| 4349 | + $translation_texts[] = stripslashes_deep($row->asc_title); | |
| 4350 | 4350 | } | 
| 4351 | 4351 | |
| 4352 | -			if ( ! empty( $row->desc_title ) ) {
 | |
| 4353 | - $translation_texts[] = stripslashes_deep( $row->desc_title ); | |
| 4352 | +			if (!empty($row->desc_title)) {
 | |
| 4353 | + $translation_texts[] = stripslashes_deep($row->desc_title); | |
| 4354 | 4354 | } | 
| 4355 | 4355 | } | 
| 4356 | 4356 | } | 
| 4357 | 4357 | |
| 4358 | 4358 | // Advance search filter fields table | 
| 4359 | -	if ( defined( 'GEODIR_ADVANCE_SEARCH_TABLE' ) ) {
 | |
| 4360 | - $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM " . GEODIR_ADVANCE_SEARCH_TABLE; | |
| 4361 | - $rows = $wpdb->get_results( $sql ); | |
| 4362 | - | |
| 4363 | -		if ( ! empty( $rows ) ) {
 | |
| 4364 | -			foreach ( $rows as $row ) {
 | |
| 4365 | -				if ( ! empty( $row->field_site_name ) ) {
 | |
| 4366 | - $translation_texts[] = stripslashes_deep( $row->field_site_name ); | |
| 4359 | +	if (defined('GEODIR_ADVANCE_SEARCH_TABLE')) {
 | |
| 4360 | + $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM ".GEODIR_ADVANCE_SEARCH_TABLE; | |
| 4361 | + $rows = $wpdb->get_results($sql); | |
| 4362 | + | |
| 4363 | +		if (!empty($rows)) {
 | |
| 4364 | +			foreach ($rows as $row) {
 | |
| 4365 | +				if (!empty($row->field_site_name)) {
 | |
| 4366 | + $translation_texts[] = stripslashes_deep($row->field_site_name); | |
| 4367 | 4367 | } | 
| 4368 | 4368 | |
| 4369 | -				if ( ! empty( $row->front_search_title ) ) {
 | |
| 4370 | - $translation_texts[] = stripslashes_deep( $row->front_search_title ); | |
| 4369 | +				if (!empty($row->front_search_title)) {
 | |
| 4370 | + $translation_texts[] = stripslashes_deep($row->front_search_title); | |
| 4371 | 4371 | } | 
| 4372 | 4372 | |
| 4373 | -				if ( ! empty( $row->first_search_text ) ) {
 | |
| 4374 | - $translation_texts[] = stripslashes_deep( $row->first_search_text ); | |
| 4373 | +				if (!empty($row->first_search_text)) {
 | |
| 4374 | + $translation_texts[] = stripslashes_deep($row->first_search_text); | |
| 4375 | 4375 | } | 
| 4376 | 4376 | |
| 4377 | -				if ( ! empty( $row->last_search_text ) ) {
 | |
| 4378 | - $translation_texts[] = stripslashes_deep( $row->last_search_text ); | |
| 4377 | +				if (!empty($row->last_search_text)) {
 | |
| 4378 | + $translation_texts[] = stripslashes_deep($row->last_search_text); | |
| 4379 | 4379 | } | 
| 4380 | 4380 | |
| 4381 | -				if ( ! empty( $row->field_desc ) ) {
 | |
| 4382 | - $translation_texts[] = stripslashes_deep( $row->field_desc ); | |
| 4381 | +				if (!empty($row->field_desc)) {
 | |
| 4382 | + $translation_texts[] = stripslashes_deep($row->field_desc); | |
| 4383 | 4383 | } | 
| 4384 | 4384 | } | 
| 4385 | 4385 | } | 
| 4386 | 4386 | } | 
| 4387 | 4387 | |
| 4388 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; | |
| 4388 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; | |
| 4389 | 4389 | |
| 4390 | 4390 | return $translation_texts; | 
| 4391 | 4391 | } | 
| @@ -4407,7 +4407,7 @@ discard block | ||
| 4407 | 4407 | * | 
| 4408 | 4408 | * @param array $geodir_allowed_mime_types and file extensions. | 
| 4409 | 4409 | */ | 
| 4410 | - return apply_filters( 'geodir_allowed_mime_types', array( | |
| 4410 | +	return apply_filters('geodir_allowed_mime_types', array(
 | |
| 4411 | 4411 | 'Image' => array( // Image formats. | 
| 4412 | 4412 | 'jpg' => 'image/jpeg', | 
| 4413 | 4413 | 'jpe' => 'image/jpeg', | 
| @@ -4475,18 +4475,18 @@ discard block | ||
| 4475 | 4475 | * | 
| 4476 | 4476 | * @return string User display name. | 
| 4477 | 4477 | */ | 
| 4478 | -function geodir_get_client_name( $user_id ) {
 | |
| 4478 | +function geodir_get_client_name($user_id) {
 | |
| 4479 | 4479 | $client_name = ''; | 
| 4480 | 4480 | |
| 4481 | - $user_data = get_userdata( $user_id ); | |
| 4481 | + $user_data = get_userdata($user_id); | |
| 4482 | 4482 | |
| 4483 | -	if ( ! empty( $user_data ) ) {
 | |
| 4484 | -		if ( isset( $user_data->display_name ) && trim( $user_data->display_name ) != '' ) {
 | |
| 4485 | - $client_name = trim( $user_data->display_name ); | |
| 4486 | -		} else if ( isset( $user_data->user_nicename ) && trim( $user_data->user_nicename ) != '' ) {
 | |
| 4487 | - $client_name = trim( $user_data->user_nicename ); | |
| 4483 | +	if (!empty($user_data)) {
 | |
| 4484 | +		if (isset($user_data->display_name) && trim($user_data->display_name) != '') {
 | |
| 4485 | + $client_name = trim($user_data->display_name); | |
| 4486 | +		} else if (isset($user_data->user_nicename) && trim($user_data->user_nicename) != '') {
 | |
| 4487 | + $client_name = trim($user_data->user_nicename); | |
| 4488 | 4488 |  		} else {
 | 
| 4489 | - $client_name = trim( $user_data->user_login ); | |
| 4489 | + $client_name = trim($user_data->user_login); | |
| 4490 | 4490 | } | 
| 4491 | 4491 | } | 
| 4492 | 4492 | |
| @@ -4494,17 +4494,17 @@ discard block | ||
| 4494 | 4494 | } | 
| 4495 | 4495 | |
| 4496 | 4496 | |
| 4497 | -add_filter( 'wpseo_replacements', 'geodir_wpseo_replacements', 10, 1 ); | |
| 4497 | +add_filter('wpseo_replacements', 'geodir_wpseo_replacements', 10, 1);
 | |
| 4498 | 4498 | /* | 
| 4499 | 4499 | * Add location variables to wpseo replacements. | 
| 4500 | 4500 | * | 
| 4501 | 4501 | * @since 1.5.4 | 
| 4502 | 4502 | */ | 
| 4503 | -function geodir_wpseo_replacements( $vars ) {
 | |
| 4503 | +function geodir_wpseo_replacements($vars) {
 | |
| 4504 | 4504 | |
| 4505 | 4505 | // location variables | 
| 4506 | 4506 | $gd_post_type = geodir_get_current_posttype(); | 
| 4507 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); | |
| 4507 | +	$location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
 | |
| 4508 | 4508 | /** | 
| 4509 | 4509 | * Filter the title variables location variables array | 
| 4510 | 4510 | * | 
| @@ -4514,7 +4514,7 @@ discard block | ||
| 4514 | 4514 | * @param array $location_array The array of location variables. | 
| 4515 | 4515 | * @param array $vars The page title variables. | 
| 4516 | 4516 | */ | 
| 4517 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr_seo', $location_array, $vars ); | |
| 4517 | +	$location_array = apply_filters('geodir_filter_title_variables_location_arr_seo', $location_array, $vars);
 | |
| 4518 | 4518 | |
| 4519 | 4519 | |
| 4520 | 4520 | $location_replace_vars = geodir_location_replace_vars($location_array, NULL, ''); | 
| @@ -4529,13 +4529,13 @@ discard block | ||
| 4529 | 4529 | * @param string $vars The title with variables. | 
| 4530 | 4530 | * @param array $location_array The array of location variables. | 
| 4531 | 4531 | */ | 
| 4532 | - return apply_filters( 'geodir_wpseo_replacements_vars', $vars, $location_array ); | |
| 4532 | +	return apply_filters('geodir_wpseo_replacements_vars', $vars, $location_array);
 | |
| 4533 | 4533 | } | 
| 4534 | 4534 | |
| 4535 | 4535 | |
| 4536 | -add_filter( 'geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3 ); | |
| 4537 | -add_filter( 'geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2 ); | |
| 4538 | -add_filter( 'geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3 ); | |
| 4536 | +add_filter('geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3);
 | |
| 4537 | +add_filter('geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2);
 | |
| 4538 | +add_filter('geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3);
 | |
| 4539 | 4539 | |
| 4540 | 4540 | /** | 
| 4541 | 4541 | * Filter the title variables. | 
| @@ -4577,14 +4577,14 @@ discard block | ||
| 4577 | 4577 | * | 
| 4578 | 4578 | * @return string Title after filtered variables. | 
| 4579 | 4579 | */ | 
| 4580 | -function geodir_filter_title_variables( $title, $gd_page, $sep = '' ) {
 | |
| 4580 | +function geodir_filter_title_variables($title, $gd_page, $sep = '') {
 | |
| 4581 | 4581 | global $wp, $post; | 
| 4582 | 4582 | |
| 4583 | -	if ( ! $gd_page || ! $title ) {
 | |
| 4583 | +	if (!$gd_page || !$title) {
 | |
| 4584 | 4584 | return $title; // if no a GD page then bail. | 
| 4585 | 4585 | } | 
| 4586 | 4586 | |
| 4587 | -	if ( $sep == '' ) {
 | |
| 4587 | +	if ($sep == '') {
 | |
| 4588 | 4588 | /** | 
| 4589 | 4589 | * Filter the page title separator. | 
| 4590 | 4590 | * | 
| @@ -4593,100 +4593,100 @@ discard block | ||
| 4593 | 4593 | * | 
| 4594 | 4594 | * @param string $sep The separator, default: `|`. | 
| 4595 | 4595 | */ | 
| 4596 | - $sep = apply_filters( 'geodir_page_title_separator', '|' ); | |
| 4596 | +		$sep = apply_filters('geodir_page_title_separator', '|');
 | |
| 4597 | 4597 | } | 
| 4598 | 4598 | |
| 4599 | -	if ( strpos( $title, '%%title%%' ) !== false ) {
 | |
| 4600 | - $title = str_replace( "%%title%%", $post->post_title, $title ); | |
| 4599 | +	if (strpos($title, '%%title%%') !== false) {
 | |
| 4600 | +		$title = str_replace("%%title%%", $post->post_title, $title);
 | |
| 4601 | 4601 | } | 
| 4602 | 4602 | |
| 4603 | -	if ( strpos( $title, '%%sitename%%' ) !== false ) {
 | |
| 4604 | - $title = str_replace( "%%sitename%%", get_bloginfo( 'name' ), $title ); | |
| 4603 | +	if (strpos($title, '%%sitename%%') !== false) {
 | |
| 4604 | +		$title = str_replace("%%sitename%%", get_bloginfo('name'), $title);
 | |
| 4605 | 4605 | } | 
| 4606 | 4606 | |
| 4607 | -	if ( strpos( $title, '%%sitedesc%%' ) !== false ) {
 | |
| 4608 | - $title = str_replace( "%%sitedesc%%", get_bloginfo( 'description' ), $title ); | |
| 4607 | +	if (strpos($title, '%%sitedesc%%') !== false) {
 | |
| 4608 | +		$title = str_replace("%%sitedesc%%", get_bloginfo('description'), $title);
 | |
| 4609 | 4609 | } | 
| 4610 | 4610 | |
| 4611 | -	if ( strpos( $title, '%%excerpt%%' ) !== false ) {
 | |
| 4612 | - $title = str_replace( "%%excerpt%%", strip_tags( get_the_excerpt() ), $title ); | |
| 4611 | +	if (strpos($title, '%%excerpt%%') !== false) {
 | |
| 4612 | +		$title = str_replace("%%excerpt%%", strip_tags(get_the_excerpt()), $title);
 | |
| 4613 | 4613 | } | 
| 4614 | 4614 | |
| 4615 | -	if ( $gd_page == 'search' || $gd_page == 'author' ) {
 | |
| 4616 | - $post_type = isset( $_REQUEST['stype'] ) ? sanitize_text_field( $_REQUEST['stype'] ) : ''; | |
| 4617 | -	} else if ( $gd_page == 'add-listing' ) {
 | |
| 4618 | - $post_type = ( isset( $_REQUEST['listing_type'] ) ) ? sanitize_text_field( $_REQUEST['listing_type'] ) : ''; | |
| 4619 | - $post_type = ! $post_type && ! empty( $_REQUEST['pid'] ) ? get_post_type( (int) $_REQUEST['pid'] ) : $post_type; | |
| 4620 | -	} else if ( isset( $post->post_type ) && $post->post_type && in_array( $post->post_type, geodir_get_posttypes() ) ) {
 | |
| 4615 | +	if ($gd_page == 'search' || $gd_page == 'author') {
 | |
| 4616 | + $post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : ''; | |
| 4617 | +	} else if ($gd_page == 'add-listing') {
 | |
| 4618 | + $post_type = (isset($_REQUEST['listing_type'])) ? sanitize_text_field($_REQUEST['listing_type']) : ''; | |
| 4619 | + $post_type = !$post_type && !empty($_REQUEST['pid']) ? get_post_type((int) $_REQUEST['pid']) : $post_type; | |
| 4620 | +	} else if (isset($post->post_type) && $post->post_type && in_array($post->post_type, geodir_get_posttypes())) {
 | |
| 4621 | 4621 | $post_type = $post->post_type; | 
| 4622 | 4622 |  	} else {
 | 
| 4623 | - $post_type = get_query_var( 'post_type' ); | |
| 4623 | +		$post_type = get_query_var('post_type');
 | |
| 4624 | 4624 | } | 
| 4625 | 4625 | |
| 4626 | -	if ( strpos( $title, '%%pt_single%%' ) !== false ) {
 | |
| 4626 | +	if (strpos($title, '%%pt_single%%') !== false) {
 | |
| 4627 | 4627 | $singular_name = ''; | 
| 4628 | -		if ( $post_type && $singular_name = get_post_type_singular_label( $post_type ) ) {
 | |
| 4629 | - $singular_name = __( $singular_name, 'geodirectory' ); | |
| 4628 | +		if ($post_type && $singular_name = get_post_type_singular_label($post_type)) {
 | |
| 4629 | + $singular_name = __($singular_name, 'geodirectory'); | |
| 4630 | 4630 | } | 
| 4631 | 4631 | |
| 4632 | - $title = str_replace( "%%pt_single%%", $singular_name, $title ); | |
| 4632 | +		$title = str_replace("%%pt_single%%", $singular_name, $title);
 | |
| 4633 | 4633 | } | 
| 4634 | 4634 | |
| 4635 | -	if ( strpos( $title, '%%pt_plural%%' ) !== false ) {
 | |
| 4635 | +	if (strpos($title, '%%pt_plural%%') !== false) {
 | |
| 4636 | 4636 | $plural_name = ''; | 
| 4637 | -		if ( $post_type && $plural_name = get_post_type_plural_label( $post_type ) ) {
 | |
| 4638 | - $plural_name = __( $plural_name, 'geodirectory' ); | |
| 4637 | +		if ($post_type && $plural_name = get_post_type_plural_label($post_type)) {
 | |
| 4638 | + $plural_name = __($plural_name, 'geodirectory'); | |
| 4639 | 4639 | } | 
| 4640 | 4640 | |
| 4641 | - $title = str_replace( "%%pt_plural%%", $plural_name, $title ); | |
| 4641 | +		$title = str_replace("%%pt_plural%%", $plural_name, $title);
 | |
| 4642 | 4642 | } | 
| 4643 | 4643 | |
| 4644 | -	if ( strpos( $title, '%%category%%' ) !== false ) {
 | |
| 4644 | +	if (strpos($title, '%%category%%') !== false) {
 | |
| 4645 | 4645 | $cat_name = ''; | 
| 4646 | 4646 | |
| 4647 | -		if ( $gd_page == 'detail' ) {
 | |
| 4648 | -			if ( $post->default_category ) {
 | |
| 4649 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); | |
| 4650 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; | |
| 4647 | +		if ($gd_page == 'detail') {
 | |
| 4648 | +			if ($post->default_category) {
 | |
| 4649 | + $cat = get_term($post->default_category, $post->post_type.'category'); | |
| 4650 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; | |
| 4651 | 4651 | } | 
| 4652 | -		} else if ( $gd_page == 'listing' ) {
 | |
| 4652 | +		} else if ($gd_page == 'listing') {
 | |
| 4653 | 4653 | $queried_object = get_queried_object(); | 
| 4654 | -			if ( isset( $queried_object->name ) ) {
 | |
| 4654 | +			if (isset($queried_object->name)) {
 | |
| 4655 | 4655 | $cat_name = $queried_object->name; | 
| 4656 | 4656 | } | 
| 4657 | 4657 | } | 
| 4658 | - $title = str_replace( "%%category%%", $cat_name, $title ); | |
| 4658 | +		$title = str_replace("%%category%%", $cat_name, $title);
 | |
| 4659 | 4659 | } | 
| 4660 | 4660 | |
| 4661 | -	if ( strpos( $title, '%%tag%%' ) !== false ) {
 | |
| 4661 | +	if (strpos($title, '%%tag%%') !== false) {
 | |
| 4662 | 4662 | $cat_name = ''; | 
| 4663 | 4663 | |
| 4664 | -		if ( $gd_page == 'detail' ) {
 | |
| 4665 | -			if ( $post->default_category ) {
 | |
| 4666 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); | |
| 4667 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; | |
| 4664 | +		if ($gd_page == 'detail') {
 | |
| 4665 | +			if ($post->default_category) {
 | |
| 4666 | + $cat = get_term($post->default_category, $post->post_type.'category'); | |
| 4667 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; | |
| 4668 | 4668 | } | 
| 4669 | -		} else if ( $gd_page == 'listing' ) {
 | |
| 4669 | +		} else if ($gd_page == 'listing') {
 | |
| 4670 | 4670 | $queried_object = get_queried_object(); | 
| 4671 | -			if ( isset( $queried_object->name ) ) {
 | |
| 4671 | +			if (isset($queried_object->name)) {
 | |
| 4672 | 4672 | $cat_name = $queried_object->name; | 
| 4673 | 4673 | } | 
| 4674 | 4674 | } | 
| 4675 | - $title = str_replace( "%%tag%%", $cat_name, $title ); | |
| 4675 | +		$title = str_replace("%%tag%%", $cat_name, $title);
 | |
| 4676 | 4676 | } | 
| 4677 | 4677 | |
| 4678 | -	if ( strpos( $title, '%%id%%' ) !== false ) {
 | |
| 4679 | - $ID = ( isset( $post->ID ) ) ? $post->ID : ''; | |
| 4680 | - $title = str_replace( "%%id%%", $ID, $title ); | |
| 4678 | +	if (strpos($title, '%%id%%') !== false) {
 | |
| 4679 | + $ID = (isset($post->ID)) ? $post->ID : ''; | |
| 4680 | +		$title = str_replace("%%id%%", $ID, $title);
 | |
| 4681 | 4681 | } | 
| 4682 | 4682 | |
| 4683 | -	if ( strpos( $title, '%%sep%%' ) !== false ) {
 | |
| 4684 | - $title = str_replace( "%%sep%%", $sep, $title ); | |
| 4683 | +	if (strpos($title, '%%sep%%') !== false) {
 | |
| 4684 | +		$title = str_replace("%%sep%%", $sep, $title);
 | |
| 4685 | 4685 | } | 
| 4686 | 4686 | |
| 4687 | 4687 | // location variables | 
| 4688 | 4688 | $gd_post_type = geodir_get_current_posttype(); | 
| 4689 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); | |
| 4689 | +	$location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
 | |
| 4690 | 4690 | |
| 4691 | 4691 | /** | 
| 4692 | 4692 | * Filter the title variables location variables array | 
| @@ -4699,20 +4699,20 @@ discard block | ||
| 4699 | 4699 | * @param string $gd_page The page being filtered. | 
| 4700 | 4700 | * @param string $sep The separator, default: `|`. | 
| 4701 | 4701 | */ | 
| 4702 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep ); | |
| 4702 | +	$location_array = apply_filters('geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep);
 | |
| 4703 | 4703 | |
| 4704 | -	if ( $gd_page == 'location' && get_query_var( 'gd_country_full' ) ) {
 | |
| 4705 | -		if ( get_query_var( 'gd_country_full' ) ) {
 | |
| 4706 | - $location_array['gd_country'] = get_query_var( 'gd_country_full' ); | |
| 4704 | +	if ($gd_page == 'location' && get_query_var('gd_country_full')) {
 | |
| 4705 | +		if (get_query_var('gd_country_full')) {
 | |
| 4706 | +			$location_array['gd_country'] = get_query_var('gd_country_full');
 | |
| 4707 | 4707 | } | 
| 4708 | -		if ( get_query_var( 'gd_region_full' ) ) {
 | |
| 4709 | - $location_array['gd_region'] = get_query_var( 'gd_region_full' ); | |
| 4708 | +		if (get_query_var('gd_region_full')) {
 | |
| 4709 | +			$location_array['gd_region'] = get_query_var('gd_region_full');
 | |
| 4710 | 4710 | } | 
| 4711 | -		if ( get_query_var( 'gd_city_full' ) ) {
 | |
| 4712 | - $location_array['gd_city'] = get_query_var( 'gd_city_full' ); | |
| 4711 | +		if (get_query_var('gd_city_full')) {
 | |
| 4712 | +			$location_array['gd_city'] = get_query_var('gd_city_full');
 | |
| 4713 | 4713 | } | 
| 4714 | -		if ( get_query_var( 'gd_neighbourhood_full' ) ) {
 | |
| 4715 | - $location_array['gd_neighbourhood'] = get_query_var( 'gd_neighbourhood_full' ); | |
| 4714 | +		if (get_query_var('gd_neighbourhood_full')) {
 | |
| 4715 | +			$location_array['gd_neighbourhood'] = get_query_var('gd_neighbourhood_full');
 | |
| 4716 | 4716 | } | 
| 4717 | 4717 | } | 
| 4718 | 4718 | |
| @@ -4727,57 +4727,57 @@ discard block | ||
| 4727 | 4727 | * @param string $gd_page The page being filtered. | 
| 4728 | 4728 | * @param string $sep The separator, default: `|`. | 
| 4729 | 4729 | */ | 
| 4730 | - $title = apply_filters( 'geodir_replace_location_variables', $title, $location_array, $gd_page, $sep ); | |
| 4730 | +	$title = apply_filters('geodir_replace_location_variables', $title, $location_array, $gd_page, $sep);
 | |
| 4731 | 4731 | |
| 4732 | -	if ( strpos( $title, '%%search_term%%' ) !== false ) {
 | |
| 4732 | +	if (strpos($title, '%%search_term%%') !== false) {
 | |
| 4733 | 4733 | $search_term = ''; | 
| 4734 | -		if ( isset( $_REQUEST['s'] ) ) {
 | |
| 4735 | - $search_term = esc_attr( $_REQUEST['s'] ); | |
| 4734 | +		if (isset($_REQUEST['s'])) {
 | |
| 4735 | + $search_term = esc_attr($_REQUEST['s']); | |
| 4736 | 4736 | } | 
| 4737 | - $title = str_replace( "%%search_term%%", $search_term, $title ); | |
| 4737 | +		$title = str_replace("%%search_term%%", $search_term, $title);
 | |
| 4738 | 4738 | } | 
| 4739 | 4739 | |
| 4740 | -	if ( strpos( $title, '%%search_near%%' ) !== false ) {
 | |
| 4740 | +	if (strpos($title, '%%search_near%%') !== false) {
 | |
| 4741 | 4741 | $search_term = ''; | 
| 4742 | -		if ( isset( $_REQUEST['snear'] ) ) {
 | |
| 4743 | - $search_term = esc_attr( $_REQUEST['snear'] ); | |
| 4742 | +		if (isset($_REQUEST['snear'])) {
 | |
| 4743 | + $search_term = esc_attr($_REQUEST['snear']); | |
| 4744 | 4744 | } | 
| 4745 | - $title = str_replace( "%%search_near%%", $search_term, $title ); | |
| 4745 | +		$title = str_replace("%%search_near%%", $search_term, $title);
 | |
| 4746 | 4746 | } | 
| 4747 | 4747 | |
| 4748 | -	if ( strpos( $title, '%%name%%' ) !== false ) {
 | |
| 4749 | -		if ( is_author() ) {
 | |
| 4750 | - $curauth = ( get_query_var( 'author_name' ) ) ? get_user_by( 'slug', get_query_var( 'author_name' ) ) : get_userdata( get_query_var( 'author' ) ); | |
| 4748 | +	if (strpos($title, '%%name%%') !== false) {
 | |
| 4749 | +		if (is_author()) {
 | |
| 4750 | +			$curauth     = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
 | |
| 4751 | 4751 | $author_name = $curauth->display_name; | 
| 4752 | 4752 |  		} else {
 | 
| 4753 | 4753 | $author_name = get_the_author(); | 
| 4754 | 4754 | } | 
| 4755 | -		if ( ! $author_name || $author_name === '' ) {
 | |
| 4755 | +		if (!$author_name || $author_name === '') {
 | |
| 4756 | 4756 | $queried_object = get_queried_object(); | 
| 4757 | 4757 | |
| 4758 | -			if ( isset( $queried_object->data->user_nicename ) ) {
 | |
| 4758 | +			if (isset($queried_object->data->user_nicename)) {
 | |
| 4759 | 4759 | $author_name = $queried_object->data->display_name; | 
| 4760 | 4760 | } | 
| 4761 | 4761 | } | 
| 4762 | - $title = str_replace( "%%name%%", $author_name, $title ); | |
| 4762 | +		$title = str_replace("%%name%%", $author_name, $title);
 | |
| 4763 | 4763 | } | 
| 4764 | 4764 | |
| 4765 | -	if ( strpos( $title, '%%page%%' ) !== false ) {
 | |
| 4766 | - $page = geodir_title_meta_page( $sep ); | |
| 4767 | - $title = str_replace( "%%page%%", $page, $title ); | |
| 4765 | +	if (strpos($title, '%%page%%') !== false) {
 | |
| 4766 | + $page = geodir_title_meta_page($sep); | |
| 4767 | +		$title = str_replace("%%page%%", $page, $title);
 | |
| 4768 | 4768 | } | 
| 4769 | -	if ( strpos( $title, '%%pagenumber%%' ) !== false ) {
 | |
| 4769 | +	if (strpos($title, '%%pagenumber%%') !== false) {
 | |
| 4770 | 4770 | $pagenumber = geodir_title_meta_pagenumber(); | 
| 4771 | - $title = str_replace( "%%pagenumber%%", $pagenumber, $title ); | |
| 4771 | +		$title      = str_replace("%%pagenumber%%", $pagenumber, $title);
 | |
| 4772 | 4772 | } | 
| 4773 | -	if ( strpos( $title, '%%pagetotal%%' ) !== false ) {
 | |
| 4773 | +	if (strpos($title, '%%pagetotal%%') !== false) {
 | |
| 4774 | 4774 | $pagetotal = geodir_title_meta_pagetotal(); | 
| 4775 | - $title = str_replace( "%%pagetotal%%", $pagetotal, $title ); | |
| 4775 | +		$title     = str_replace("%%pagetotal%%", $pagetotal, $title);
 | |
| 4776 | 4776 | } | 
| 4777 | 4777 | |
| 4778 | - $title = wptexturize( $title ); | |
| 4779 | - $title = convert_chars( $title ); | |
| 4780 | - $title = esc_html( $title ); | |
| 4778 | + $title = wptexturize($title); | |
| 4779 | + $title = convert_chars($title); | |
| 4780 | + $title = esc_html($title); | |
| 4781 | 4781 | |
| 4782 | 4782 | /** | 
| 4783 | 4783 | * Filter the title variables after standard ones have been filtered. | 
| @@ -4791,7 +4791,7 @@ discard block | ||
| 4791 | 4791 | * @param string $sep The separator, default: `|`. | 
| 4792 | 4792 | */ | 
| 4793 | 4793 | |
| 4794 | - return apply_filters( 'geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep ); | |
| 4794 | +	return apply_filters('geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep);
 | |
| 4795 | 4795 | } | 
| 4796 | 4796 | |
| 4797 | 4797 | /** | 
| @@ -4804,82 +4804,82 @@ discard block | ||
| 4804 | 4804 | * | 
| 4805 | 4805 | * @return array Translation texts. | 
| 4806 | 4806 | */ | 
| 4807 | -function geodir_load_cpt_text_translation( $translation_texts = array() ) {
 | |
| 4808 | - $gd_post_types = geodir_get_posttypes( 'array' ); | |
| 4807 | +function geodir_load_cpt_text_translation($translation_texts = array()) {
 | |
| 4808 | +	$gd_post_types = geodir_get_posttypes('array');
 | |
| 4809 | 4809 | |
| 4810 | -	if ( ! empty( $gd_post_types ) ) {
 | |
| 4811 | -		foreach ( $gd_post_types as $post_type => $cpt_info ) {
 | |
| 4812 | - $labels = isset( $cpt_info['labels'] ) ? $cpt_info['labels'] : ''; | |
| 4813 | - $description = isset( $cpt_info['description'] ) ? $cpt_info['description'] : ''; | |
| 4814 | - $seo = isset( $cpt_info['seo'] ) ? $cpt_info['seo'] : ''; | |
| 4810 | +	if (!empty($gd_post_types)) {
 | |
| 4811 | +		foreach ($gd_post_types as $post_type => $cpt_info) {
 | |
| 4812 | + $labels = isset($cpt_info['labels']) ? $cpt_info['labels'] : ''; | |
| 4813 | + $description = isset($cpt_info['description']) ? $cpt_info['description'] : ''; | |
| 4814 | + $seo = isset($cpt_info['seo']) ? $cpt_info['seo'] : ''; | |
| 4815 | 4815 | |
| 4816 | -			if ( ! empty( $labels ) ) {
 | |
| 4817 | -				if ( $labels['name'] != '' && ! in_array( $labels['name'], $translation_texts ) ) {
 | |
| 4816 | +			if (!empty($labels)) {
 | |
| 4817 | +				if ($labels['name'] != '' && !in_array($labels['name'], $translation_texts)) {
 | |
| 4818 | 4818 | $translation_texts[] = $labels['name']; | 
| 4819 | 4819 | } | 
| 4820 | -				if ( $labels['singular_name'] != '' && ! in_array( $labels['singular_name'], $translation_texts ) ) {
 | |
| 4820 | +				if ($labels['singular_name'] != '' && !in_array($labels['singular_name'], $translation_texts)) {
 | |
| 4821 | 4821 | $translation_texts[] = $labels['singular_name']; | 
| 4822 | 4822 | } | 
| 4823 | -				if ( $labels['add_new'] != '' && ! in_array( $labels['add_new'], $translation_texts ) ) {
 | |
| 4823 | +				if ($labels['add_new'] != '' && !in_array($labels['add_new'], $translation_texts)) {
 | |
| 4824 | 4824 | $translation_texts[] = $labels['add_new']; | 
| 4825 | 4825 | } | 
| 4826 | -				if ( $labels['add_new_item'] != '' && ! in_array( $labels['add_new_item'], $translation_texts ) ) {
 | |
| 4826 | +				if ($labels['add_new_item'] != '' && !in_array($labels['add_new_item'], $translation_texts)) {
 | |
| 4827 | 4827 | $translation_texts[] = $labels['add_new_item']; | 
| 4828 | 4828 | } | 
| 4829 | -				if ( $labels['edit_item'] != '' && ! in_array( $labels['edit_item'], $translation_texts ) ) {
 | |
| 4829 | +				if ($labels['edit_item'] != '' && !in_array($labels['edit_item'], $translation_texts)) {
 | |
| 4830 | 4830 | $translation_texts[] = $labels['edit_item']; | 
| 4831 | 4831 | } | 
| 4832 | -				if ( $labels['new_item'] != '' && ! in_array( $labels['new_item'], $translation_texts ) ) {
 | |
| 4832 | +				if ($labels['new_item'] != '' && !in_array($labels['new_item'], $translation_texts)) {
 | |
| 4833 | 4833 | $translation_texts[] = $labels['new_item']; | 
| 4834 | 4834 | } | 
| 4835 | -				if ( $labels['view_item'] != '' && ! in_array( $labels['view_item'], $translation_texts ) ) {
 | |
| 4835 | +				if ($labels['view_item'] != '' && !in_array($labels['view_item'], $translation_texts)) {
 | |
| 4836 | 4836 | $translation_texts[] = $labels['view_item']; | 
| 4837 | 4837 | } | 
| 4838 | -				if ( $labels['search_items'] != '' && ! in_array( $labels['search_items'], $translation_texts ) ) {
 | |
| 4838 | +				if ($labels['search_items'] != '' && !in_array($labels['search_items'], $translation_texts)) {
 | |
| 4839 | 4839 | $translation_texts[] = $labels['search_items']; | 
| 4840 | 4840 | } | 
| 4841 | -				if ( $labels['not_found'] != '' && ! in_array( $labels['not_found'], $translation_texts ) ) {
 | |
| 4841 | +				if ($labels['not_found'] != '' && !in_array($labels['not_found'], $translation_texts)) {
 | |
| 4842 | 4842 | $translation_texts[] = $labels['not_found']; | 
| 4843 | 4843 | } | 
| 4844 | -				if ( $labels['not_found_in_trash'] != '' && ! in_array( $labels['not_found_in_trash'], $translation_texts ) ) {
 | |
| 4844 | +				if ($labels['not_found_in_trash'] != '' && !in_array($labels['not_found_in_trash'], $translation_texts)) {
 | |
| 4845 | 4845 | $translation_texts[] = $labels['not_found_in_trash']; | 
| 4846 | 4846 | } | 
| 4847 | -				if ( isset( $labels['label_post_profile'] ) && $labels['label_post_profile'] != '' && ! in_array( $labels['label_post_profile'], $translation_texts ) ) {
 | |
| 4847 | +				if (isset($labels['label_post_profile']) && $labels['label_post_profile'] != '' && !in_array($labels['label_post_profile'], $translation_texts)) {
 | |
| 4848 | 4848 | $translation_texts[] = $labels['label_post_profile']; | 
| 4849 | 4849 | } | 
| 4850 | -				if ( isset( $labels['label_post_info'] ) && $labels['label_post_info'] != '' && ! in_array( $labels['label_post_info'], $translation_texts ) ) {
 | |
| 4850 | +				if (isset($labels['label_post_info']) && $labels['label_post_info'] != '' && !in_array($labels['label_post_info'], $translation_texts)) {
 | |
| 4851 | 4851 | $translation_texts[] = $labels['label_post_info']; | 
| 4852 | 4852 | } | 
| 4853 | -				if ( isset( $labels['label_post_images'] ) && $labels['label_post_images'] != '' && ! in_array( $labels['label_post_images'], $translation_texts ) ) {
 | |
| 4853 | +				if (isset($labels['label_post_images']) && $labels['label_post_images'] != '' && !in_array($labels['label_post_images'], $translation_texts)) {
 | |
| 4854 | 4854 | $translation_texts[] = $labels['label_post_images']; | 
| 4855 | 4855 | } | 
| 4856 | -				if ( isset( $labels['label_post_map'] ) && $labels['label_post_map'] != '' && ! in_array( $labels['label_post_map'], $translation_texts ) ) {
 | |
| 4856 | +				if (isset($labels['label_post_map']) && $labels['label_post_map'] != '' && !in_array($labels['label_post_map'], $translation_texts)) {
 | |
| 4857 | 4857 | $translation_texts[] = $labels['label_post_map']; | 
| 4858 | 4858 | } | 
| 4859 | -				if ( isset( $labels['label_reviews'] ) && $labels['label_reviews'] != '' && ! in_array( $labels['label_reviews'], $translation_texts ) ) {
 | |
| 4859 | +				if (isset($labels['label_reviews']) && $labels['label_reviews'] != '' && !in_array($labels['label_reviews'], $translation_texts)) {
 | |
| 4860 | 4860 | $translation_texts[] = $labels['label_reviews']; | 
| 4861 | 4861 | } | 
| 4862 | -				if ( isset( $labels['label_related_listing'] ) && $labels['label_related_listing'] != '' && ! in_array( $labels['label_related_listing'], $translation_texts ) ) {
 | |
| 4862 | +				if (isset($labels['label_related_listing']) && $labels['label_related_listing'] != '' && !in_array($labels['label_related_listing'], $translation_texts)) {
 | |
| 4863 | 4863 | $translation_texts[] = $labels['label_related_listing']; | 
| 4864 | 4864 | } | 
| 4865 | 4865 | } | 
| 4866 | 4866 | |
| 4867 | -			if ( $description != '' && ! in_array( $description, $translation_texts ) ) {
 | |
| 4868 | - $translation_texts[] = normalize_whitespace( $description ); | |
| 4867 | +			if ($description != '' && !in_array($description, $translation_texts)) {
 | |
| 4868 | + $translation_texts[] = normalize_whitespace($description); | |
| 4869 | 4869 | } | 
| 4870 | 4870 | |
| 4871 | -			if ( ! empty( $seo ) ) {
 | |
| 4872 | -				if ( isset( $seo['meta_keyword'] ) && $seo['meta_keyword'] != '' && ! in_array( $seo['meta_keyword'], $translation_texts ) ) {
 | |
| 4873 | - $translation_texts[] = normalize_whitespace( $seo['meta_keyword'] ); | |
| 4871 | +			if (!empty($seo)) {
 | |
| 4872 | +				if (isset($seo['meta_keyword']) && $seo['meta_keyword'] != '' && !in_array($seo['meta_keyword'], $translation_texts)) {
 | |
| 4873 | + $translation_texts[] = normalize_whitespace($seo['meta_keyword']); | |
| 4874 | 4874 | } | 
| 4875 | 4875 | |
| 4876 | -				if ( isset( $seo['meta_description'] ) && $seo['meta_description'] != '' && ! in_array( $seo['meta_description'], $translation_texts ) ) {
 | |
| 4877 | - $translation_texts[] = normalize_whitespace( $seo['meta_description'] ); | |
| 4876 | +				if (isset($seo['meta_description']) && $seo['meta_description'] != '' && !in_array($seo['meta_description'], $translation_texts)) {
 | |
| 4877 | + $translation_texts[] = normalize_whitespace($seo['meta_description']); | |
| 4878 | 4878 | } | 
| 4879 | 4879 | } | 
| 4880 | 4880 | } | 
| 4881 | 4881 | } | 
| 4882 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; | |
| 4882 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; | |
| 4883 | 4883 | |
| 4884 | 4884 | return $translation_texts; | 
| 4885 | 4885 | } | 
| @@ -4894,27 +4894,27 @@ discard block | ||
| 4894 | 4894 | * | 
| 4895 | 4895 | * @return array Location terms. | 
| 4896 | 4896 | */ | 
| 4897 | -function geodir_remove_location_terms( $location_terms = array() ) {
 | |
| 4898 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; | |
| 4897 | +function geodir_remove_location_terms($location_terms = array()) {
 | |
| 4898 | +	$location_manager = defined('POST_LOCATION_TABLE') ? true : false;
 | |
| 4899 | 4899 | |
| 4900 | -	if ( ! empty( $location_terms ) && $location_manager ) {
 | |
| 4901 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); | |
| 4902 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); | |
| 4900 | +	if (!empty($location_terms) && $location_manager) {
 | |
| 4901 | +		$hide_country_part = get_option('geodir_location_hide_country_part');
 | |
| 4902 | +		$hide_region_part  = get_option('geodir_location_hide_region_part');
 | |
| 4903 | 4903 | |
| 4904 | -		if ( $hide_region_part && $hide_country_part ) {
 | |
| 4905 | -			if ( isset( $location_terms['gd_country'] ) ) {
 | |
| 4906 | - unset( $location_terms['gd_country'] ); | |
| 4904 | +		if ($hide_region_part && $hide_country_part) {
 | |
| 4905 | +			if (isset($location_terms['gd_country'])) {
 | |
| 4906 | + unset($location_terms['gd_country']); | |
| 4907 | 4907 | } | 
| 4908 | -			if ( isset( $location_terms['gd_region'] ) ) {
 | |
| 4909 | - unset( $location_terms['gd_region'] ); | |
| 4908 | +			if (isset($location_terms['gd_region'])) {
 | |
| 4909 | + unset($location_terms['gd_region']); | |
| 4910 | 4910 | } | 
| 4911 | -		} else if ( $hide_region_part && ! $hide_country_part ) {
 | |
| 4912 | -			if ( isset( $location_terms['gd_region'] ) ) {
 | |
| 4913 | - unset( $location_terms['gd_region'] ); | |
| 4911 | +		} else if ($hide_region_part && !$hide_country_part) {
 | |
| 4912 | +			if (isset($location_terms['gd_region'])) {
 | |
| 4913 | + unset($location_terms['gd_region']); | |
| 4914 | 4914 | } | 
| 4915 | -		} else if ( ! $hide_region_part && $hide_country_part ) {
 | |
| 4916 | -			if ( isset( $location_terms['gd_country'] ) ) {
 | |
| 4917 | - unset( $location_terms['gd_country'] ); | |
| 4915 | +		} else if (!$hide_region_part && $hide_country_part) {
 | |
| 4916 | +			if (isset($location_terms['gd_country'])) {
 | |
| 4917 | + unset($location_terms['gd_country']); | |
| 4918 | 4918 | } | 
| 4919 | 4919 | } | 
| 4920 | 4920 | } | 
| @@ -4932,33 +4932,33 @@ discard block | ||
| 4932 | 4932 | * @param WP_Post $post Post object. | 
| 4933 | 4933 | * @param bool $update Whether this is an existing listing being updated or not. | 
| 4934 | 4934 | */ | 
| 4935 | -function geodir_on_wp_insert_post( $post_ID, $post, $update ) {
 | |
| 4936 | -	if ( ! $update ) {
 | |
| 4935 | +function geodir_on_wp_insert_post($post_ID, $post, $update) {
 | |
| 4936 | +	if (!$update) {
 | |
| 4937 | 4937 | return; | 
| 4938 | 4938 | } | 
| 4939 | 4939 | |
| 4940 | - $action = isset( $_REQUEST['action'] ) ? sanitize_text_field( $_REQUEST['action'] ) : ''; | |
| 4941 | - $is_admin = is_admin() && ( ! defined( 'DOING_AJAX' ) || ( defined( 'DOING_AJAX' ) && ! DOING_AJAX ) ) ? true : false; | |
| 4940 | + $action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : ''; | |
| 4941 | +	$is_admin    = is_admin() && (!defined('DOING_AJAX') || (defined('DOING_AJAX') && !DOING_AJAX)) ? true : false;
 | |
| 4942 | 4942 | $inline_save = $action == 'inline-save' ? true : false; | 
| 4943 | 4943 | |
| 4944 | -	if ( empty( $post->post_type ) || $is_admin || $inline_save || ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) ) {
 | |
| 4944 | +	if (empty($post->post_type) || $is_admin || $inline_save || (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)) {
 | |
| 4945 | 4945 | return; | 
| 4946 | 4946 | } | 
| 4947 | 4947 | |
| 4948 | -	if ( $action != '' && in_array( $action, array( 'geodir_import_export' ) ) ) {
 | |
| 4948 | +	if ($action != '' && in_array($action, array('geodir_import_export'))) {
 | |
| 4949 | 4949 | return; | 
| 4950 | 4950 | } | 
| 4951 | 4951 | |
| 4952 | 4952 | $user_id = (int) get_current_user_id(); | 
| 4953 | 4953 | |
| 4954 | -	if ( $user_id > 0 && get_option( 'geodir_notify_post_edited' ) && ! wp_is_post_revision( $post_ID ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
 | |
| 4955 | - $author_id = ! empty( $post->post_author ) ? $post->post_author : 0; | |
| 4954 | +	if ($user_id > 0 && get_option('geodir_notify_post_edited') && !wp_is_post_revision($post_ID) && in_array($post->post_type, geodir_get_posttypes())) {
 | |
| 4955 | + $author_id = !empty($post->post_author) ? $post->post_author : 0; | |
| 4956 | 4956 | |
| 4957 | -		if ( $user_id == $author_id && ! is_super_admin() ) {
 | |
| 4958 | - $from_email = get_option( 'site_email' ); | |
| 4957 | +		if ($user_id == $author_id && !is_super_admin()) {
 | |
| 4958 | +			$from_email   = get_option('site_email');
 | |
| 4959 | 4959 | $from_name = get_site_emailName(); | 
| 4960 | - $to_email = get_option( 'admin_email' ); | |
| 4961 | - $to_name = get_option( 'name' ); | |
| 4960 | +			$to_email     = get_option('admin_email');
 | |
| 4961 | +			$to_name      = get_option('name');
 | |
| 4962 | 4962 | $message_type = 'listing_edited'; | 
| 4963 | 4963 | |
| 4964 | 4964 | $notify_edited = true; | 
| @@ -4970,9 +4970,9 @@ discard block | ||
| 4970 | 4970 | * @param bool $notify_edited Notify on listing edited by author? | 
| 4971 | 4971 | * @param object $post The current post object. | 
| 4972 | 4972 | */ | 
| 4973 | - $notify_edited = apply_filters( 'geodir_notify_on_listing_edited', $notify_edited, $post ); | |
| 4973 | +			$notify_edited = apply_filters('geodir_notify_on_listing_edited', $notify_edited, $post);
 | |
| 4974 | 4974 | |
| 4975 | - geodir_sendEmail( $from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID ); | |
| 4975 | + geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID); | |
| 4976 | 4976 | } | 
| 4977 | 4977 | } | 
| 4978 | 4978 | } | 
| @@ -4987,14 +4987,14 @@ discard block | ||
| 4987 | 4987 | * | 
| 4988 | 4988 | * @return string|null The current page start & end numbering. | 
| 4989 | 4989 | */ | 
| 4990 | -function geodir_title_meta_page( $sep ) {
 | |
| 4990 | +function geodir_title_meta_page($sep) {
 | |
| 4991 | 4991 | $replacement = null; | 
| 4992 | 4992 | |
| 4993 | - $max = geodir_title_meta_pagenumbering( 'max' ); | |
| 4994 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); | |
| 4993 | +	$max = geodir_title_meta_pagenumbering('max');
 | |
| 4994 | +	$nr  = geodir_title_meta_pagenumbering('nr');
 | |
| 4995 | 4995 | |
| 4996 | -	if ( $max > 1 && $nr > 1 ) {
 | |
| 4997 | - $replacement = sprintf( $sep . ' ' . __( 'Page %1$d of %2$d', 'geodirectory' ), $nr, $max ); | |
| 4996 | +	if ($max > 1 && $nr > 1) {
 | |
| 4997 | +		$replacement = sprintf($sep.' '.__('Page %1$d of %2$d', 'geodirectory'), $nr, $max);
 | |
| 4998 | 4998 | } | 
| 4999 | 4999 | |
| 5000 | 5000 | return $replacement; | 
| @@ -5011,8 +5011,8 @@ discard block | ||
| 5011 | 5011 |  function geodir_title_meta_pagenumber() {
 | 
| 5012 | 5012 | $replacement = null; | 
| 5013 | 5013 | |
| 5014 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); | |
| 5015 | -	if ( isset( $nr ) && $nr > 0 ) {
 | |
| 5014 | +	$nr = geodir_title_meta_pagenumbering('nr');
 | |
| 5015 | +	if (isset($nr) && $nr > 0) {
 | |
| 5016 | 5016 | $replacement = (string) $nr; | 
| 5017 | 5017 | } | 
| 5018 | 5018 | |
| @@ -5030,8 +5030,8 @@ discard block | ||
| 5030 | 5030 |  function geodir_title_meta_pagetotal() {
 | 
| 5031 | 5031 | $replacement = null; | 
| 5032 | 5032 | |
| 5033 | - $max = geodir_title_meta_pagenumbering( 'max' ); | |
| 5034 | -	if ( isset( $max ) && $max > 0 ) {
 | |
| 5033 | +	$max = geodir_title_meta_pagenumbering('max');
 | |
| 5034 | +	if (isset($max) && $max > 0) {
 | |
| 5035 | 5035 | $replacement = (string) $max; | 
| 5036 | 5036 | } | 
| 5037 | 5037 | |
| @@ -5051,36 +5051,36 @@ discard block | ||
| 5051 | 5051 | * | 
| 5052 | 5052 | * @return int|null The current page numbering. | 
| 5053 | 5053 | */ | 
| 5054 | -function geodir_title_meta_pagenumbering( $request = 'nr' ) {
 | |
| 5054 | +function geodir_title_meta_pagenumbering($request = 'nr') {
 | |
| 5055 | 5055 | global $wp_query, $post; | 
| 5056 | 5056 | $max_num_pages = null; | 
| 5057 | 5057 | $page_number = null; | 
| 5058 | 5058 | |
| 5059 | 5059 | $max_num_pages = 1; | 
| 5060 | 5060 | |
| 5061 | -	if ( ! is_singular() ) {
 | |
| 5062 | - $page_number = get_query_var( 'paged' ); | |
| 5063 | -		if ( $page_number === 0 || $page_number === '' ) {
 | |
| 5061 | +	if (!is_singular()) {
 | |
| 5062 | +		$page_number = get_query_var('paged');
 | |
| 5063 | +		if ($page_number === 0 || $page_number === '') {
 | |
| 5064 | 5064 | $page_number = 1; | 
| 5065 | 5065 | } | 
| 5066 | 5066 | |
| 5067 | -		if ( isset( $wp_query->max_num_pages ) && ( $wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0 ) ) {
 | |
| 5067 | +		if (isset($wp_query->max_num_pages) && ($wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0)) {
 | |
| 5068 | 5068 | $max_num_pages = $wp_query->max_num_pages; | 
| 5069 | 5069 | } | 
| 5070 | 5070 |  	} else {
 | 
| 5071 | - $page_number = get_query_var( 'page' ); | |
| 5072 | -		if ( $page_number === 0 || $page_number === '' ) {
 | |
| 5071 | +		$page_number = get_query_var('page');
 | |
| 5072 | +		if ($page_number === 0 || $page_number === '') {
 | |
| 5073 | 5073 | $page_number = 1; | 
| 5074 | 5074 | } | 
| 5075 | 5075 | |
| 5076 | -		if ( isset( $post->post_content ) ) {
 | |
| 5077 | - $max_num_pages = ( substr_count( $post->post_content, '<!--nextpage-->' ) + 1 ); | |
| 5076 | +		if (isset($post->post_content)) {
 | |
| 5077 | + $max_num_pages = (substr_count($post->post_content, '<!--nextpage-->') + 1); | |
| 5078 | 5078 | } | 
| 5079 | 5079 | } | 
| 5080 | 5080 | |
| 5081 | 5081 | $return = null; | 
| 5082 | 5082 | |
| 5083 | -	switch ( $request ) {
 | |
| 5083 | +	switch ($request) {
 | |
| 5084 | 5084 | case 'nr': | 
| 5085 | 5085 | $return = $page_number; | 
| 5086 | 5086 | break; | 
| @@ -5101,14 +5101,14 @@ discard block | ||
| 5101 | 5101 | * | 
| 5102 | 5102 | * @return array Terms. | 
| 5103 | 5103 | */ | 
| 5104 | -function geodir_filter_empty_terms( $terms ) {
 | |
| 5105 | -	if ( empty( $terms ) ) {
 | |
| 5104 | +function geodir_filter_empty_terms($terms) {
 | |
| 5105 | +	if (empty($terms)) {
 | |
| 5106 | 5106 | return $terms; | 
| 5107 | 5107 | } | 
| 5108 | 5108 | |
| 5109 | 5109 | $return = array(); | 
| 5110 | -	foreach ( $terms as $term ) {
 | |
| 5111 | -		if ( isset( $term->count ) && $term->count > 0 ) {
 | |
| 5110 | +	foreach ($terms as $term) {
 | |
| 5111 | +		if (isset($term->count) && $term->count > 0) {
 | |
| 5112 | 5112 | $return[] = $term; | 
| 5113 | 5113 |  		} else {
 | 
| 5114 | 5114 | /** | 
| @@ -5119,7 +5119,7 @@ discard block | ||
| 5119 | 5119 | * @param array $return The array of terms to return. | 
| 5120 | 5120 | * @param object $term The term object. | 
| 5121 | 5121 | */ | 
| 5122 | - $return = apply_filters( 'geodir_filter_empty_terms_filter', $return, $term ); | |
| 5122 | +			$return = apply_filters('geodir_filter_empty_terms_filter', $return, $term);
 | |
| 5123 | 5123 | } | 
| 5124 | 5124 | } | 
| 5125 | 5125 | |
| @@ -5136,15 +5136,15 @@ discard block | ||
| 5136 | 5136 | * | 
| 5137 | 5137 | * @return array | 
| 5138 | 5138 | */ | 
| 5139 | -function geodir_remove_hentry( $class ) {
 | |
| 5140 | -	if ( geodir_is_page( 'detail' ) ) {
 | |
| 5141 | - $class = array_diff( $class, array( 'hentry' ) ); | |
| 5139 | +function geodir_remove_hentry($class) {
 | |
| 5140 | +	if (geodir_is_page('detail')) {
 | |
| 5141 | +		$class = array_diff($class, array('hentry'));
 | |
| 5142 | 5142 | } | 
| 5143 | 5143 | |
| 5144 | 5144 | return $class; | 
| 5145 | 5145 | } | 
| 5146 | 5146 | |
| 5147 | -add_filter( 'post_class', 'geodir_remove_hentry' ); | |
| 5147 | +add_filter('post_class', 'geodir_remove_hentry');
 | |
| 5148 | 5148 | |
| 5149 | 5149 | /** | 
| 5150 | 5150 | * Registers a individual text string for WPML translation. | 
| @@ -5156,8 +5156,8 @@ discard block | ||
| 5156 | 5156 | * @param string $domain The plugin domain. Default geodirectory. | 
| 5157 | 5157 | * @param string $name The name of the string which helps to know what's being translated. | 
| 5158 | 5158 | */ | 
| 5159 | -function geodir_wpml_register_string( $string, $domain = 'geodirectory', $name = '' ) {
 | |
| 5160 | - do_action( 'wpml_register_single_string', $domain, $name, $string ); | |
| 5159 | +function geodir_wpml_register_string($string, $domain = 'geodirectory', $name = '') {
 | |
| 5160 | +    do_action('wpml_register_single_string', $domain, $name, $string);
 | |
| 5161 | 5161 | } | 
| 5162 | 5162 | |
| 5163 | 5163 | /** | 
| @@ -5172,6 +5172,6 @@ discard block | ||
| 5172 | 5172 | * @param string $language_code Return the translation in this language. Default is NULL which returns the current language. | 
| 5173 | 5173 | * @return string The translated string. | 
| 5174 | 5174 | */ | 
| 5175 | -function geodir_wpml_translate_string( $string, $domain = 'geodirectory', $name = '', $language_code = NULL ) {
 | |
| 5176 | - return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code ); | |
| 5175 | +function geodir_wpml_translate_string($string, $domain = 'geodirectory', $name = '', $language_code = NULL) {
 | |
| 5176 | +    return apply_filters('wpml_translate_single_string', $string, $domain, $name, $language_code);
 | |
| 5177 | 5177 | } | 
| 5178 | 5178 | \ No newline at end of file | 
| @@ -10,52 +10,52 @@ discard block | ||
| 10 | 10 | global $wpdb, $table_prefix; | 
| 11 | 11 | |
| 12 | 12 |  if (!function_exists('geodir_column_exist')) {
 | 
| 13 | - /** | |
| 14 | - * Check table column exist or not. | |
| 15 | - * | |
| 16 | - * @since 1.0.0 | |
| 17 | - * @package GeoDirectory | |
| 18 | - * @global object $wpdb WordPress Database object. | |
| 19 | - * @param string $db The table name. | |
| 20 | - * @param string $column The column name. | |
| 21 | - * @return bool If column exists returns true. Otherwise false. | |
| 22 | - */ | |
| 23 | - function geodir_column_exist($db, $column) | |
| 24 | -    {
 | |
| 25 | - global $wpdb; | |
| 26 | - $exists = false; | |
| 27 | -        $columns = $wpdb->get_col("show columns from $db");
 | |
| 28 | -        foreach ($columns as $c) {
 | |
| 29 | -            if ($c == $column) {
 | |
| 30 | - $exists = true; | |
| 31 | - break; | |
| 32 | - } | |
| 33 | - } | |
| 34 | - return $exists; | |
| 35 | - } | |
| 13 | + /** | |
| 14 | + * Check table column exist or not. | |
| 15 | + * | |
| 16 | + * @since 1.0.0 | |
| 17 | + * @package GeoDirectory | |
| 18 | + * @global object $wpdb WordPress Database object. | |
| 19 | + * @param string $db The table name. | |
| 20 | + * @param string $column The column name. | |
| 21 | + * @return bool If column exists returns true. Otherwise false. | |
| 22 | + */ | |
| 23 | + function geodir_column_exist($db, $column) | |
| 24 | +	{
 | |
| 25 | + global $wpdb; | |
| 26 | + $exists = false; | |
| 27 | +		$columns = $wpdb->get_col("show columns from $db");
 | |
| 28 | +		foreach ($columns as $c) {
 | |
| 29 | +			if ($c == $column) {
 | |
| 30 | + $exists = true; | |
| 31 | + break; | |
| 32 | + } | |
| 33 | + } | |
| 34 | + return $exists; | |
| 35 | + } | |
| 36 | 36 | } | 
| 37 | 37 | |
| 38 | 38 |  if (!function_exists('geodir_add_column_if_not_exist')) {
 | 
| 39 | - /** | |
| 40 | - * Add column if table column not exist. | |
| 41 | - * | |
| 42 | - * @since 1.0.0 | |
| 43 | - * @package GeoDirectory | |
| 44 | - * @global object $wpdb WordPress Database object. | |
| 45 | - * @param string $db The table name. | |
| 46 | - * @param string $column The column name. | |
| 47 | - * @param string $column_attr The column attributes. | |
| 48 | - */ | |
| 49 | - function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL") | |
| 50 | -    {
 | |
| 51 | - global $wpdb; | |
| 52 | - $result = 0;// no rows affected | |
| 53 | -        if (!geodir_column_exist($db, $column)) {
 | |
| 54 | - if (!empty($db) && !empty($column)) | |
| 55 | -                $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
 | |
| 56 | - } | |
| 57 | - return $result; | |
| 58 | - } | |
| 39 | + /** | |
| 40 | + * Add column if table column not exist. | |
| 41 | + * | |
| 42 | + * @since 1.0.0 | |
| 43 | + * @package GeoDirectory | |
| 44 | + * @global object $wpdb WordPress Database object. | |
| 45 | + * @param string $db The table name. | |
| 46 | + * @param string $column The column name. | |
| 47 | + * @param string $column_attr The column attributes. | |
| 48 | + */ | |
| 49 | + function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL") | |
| 50 | +	{
 | |
| 51 | + global $wpdb; | |
| 52 | + $result = 0;// no rows affected | |
| 53 | +		if (!geodir_column_exist($db, $column)) {
 | |
| 54 | + if (!empty($db) && !empty($column)) | |
| 55 | +				$result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
 | |
| 56 | + } | |
| 57 | + return $result; | |
| 58 | + } | |
| 59 | 59 | } | 
| 60 | 60 | |
| 61 | 61 | /** | 
| @@ -72,706 +72,706 @@ discard block | ||
| 72 | 72 | */ | 
| 73 | 73 | function geodir_post_custom_fields($package_id = '', $default = 'all', $post_type = 'gd_place', $fields_location = 'none') | 
| 74 | 74 |  {
 | 
| 75 | - global $wpdb, $geodir_post_custom_fields_cache; | |
| 76 | - | |
| 77 | - $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location; | |
| 78 | - | |
| 79 | -    if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {
 | |
| 80 | - return $geodir_post_custom_fields_cache[$cache_stored]; | |
| 81 | - } | |
| 82 | - | |
| 83 | - $default_query = ''; | |
| 84 | - | |
| 85 | - if ($default == 'default') | |
| 86 | -        $default_query .= " and is_admin IN ('1') ";
 | |
| 87 | - elseif ($default == 'custom') | |
| 88 | - $default_query .= " and is_admin = '0' "; | |
| 89 | - | |
| 90 | -    if ($fields_location == 'none') {
 | |
| 91 | -    } else{
 | |
| 92 | - $fields_location = esc_sql( $fields_location ); | |
| 93 | - $default_query .= " and show_in LIKE '%%[$fields_location]%%' "; | |
| 94 | - } | |
| 95 | - | |
| 96 | - $post_meta_info = $wpdb->get_results( | |
| 97 | - $wpdb->prepare( | |
| 98 | -            "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
 | |
| 99 | - array($post_type) | |
| 100 | - ) | |
| 101 | - ); | |
| 102 | - | |
| 103 | - | |
| 104 | - $return_arr = array(); | |
| 105 | -    if ($post_meta_info) {
 | |
| 106 | - | |
| 107 | -        foreach ($post_meta_info as $post_meta_info_obj) {
 | |
| 108 | - | |
| 109 | - $custom_fields = array( | |
| 110 | - "name" => $post_meta_info_obj->htmlvar_name, | |
| 111 | - "label" => $post_meta_info_obj->clabels, | |
| 112 | - "default" => $post_meta_info_obj->default_value, | |
| 113 | - "type" => $post_meta_info_obj->field_type, | |
| 114 | - "desc" => $post_meta_info_obj->admin_desc); | |
| 115 | - | |
| 116 | -            if ($post_meta_info_obj->field_type) {
 | |
| 117 | -                $options = explode(',', $post_meta_info_obj->option_values);
 | |
| 118 | - $custom_fields["options"] = $options; | |
| 119 | - } | |
| 120 | - | |
| 121 | -            foreach ($post_meta_info_obj as $key => $val) {
 | |
| 122 | - $custom_fields[$key] = $val; | |
| 123 | - } | |
| 124 | - | |
| 125 | - $pricearr = array(); | |
| 126 | -            $pricearr = explode(',', $post_meta_info_obj->packages);
 | |
| 127 | - | |
| 128 | -            if ($package_id != '' && in_array($package_id, $pricearr)) {
 | |
| 129 | - $return_arr[$post_meta_info_obj->sort_order] = $custom_fields; | |
| 130 | -            } elseif ($package_id == '') {
 | |
| 131 | - $return_arr[$post_meta_info_obj->sort_order] = $custom_fields; | |
| 132 | - } | |
| 133 | - } | |
| 134 | - } | |
| 135 | - $geodir_post_custom_fields_cache[$cache_stored] = $return_arr; | |
| 136 | - | |
| 137 | -    if (has_filter('geodir_filter_geodir_post_custom_fields')) {
 | |
| 138 | - /** | |
| 139 | - * Filter the post custom fields array. | |
| 140 | - * | |
| 141 | - * @since 1.0.0 | |
| 142 | - * | |
| 143 | - * @param array $return_arr Post custom fields array. | |
| 144 | - * @param int|string $package_id The package ID. | |
| 145 | - * @param string $post_type Optional. The wordpress post type. | |
| 146 | - * @param string $fields_location Optional. Where exactly are you going to place this custom fields?. | |
| 147 | - */ | |
| 148 | -        $return_arr = apply_filters('geodir_filter_geodir_post_custom_fields', $return_arr, $package_id, $post_type, $fields_location);
 | |
| 149 | - } | |
| 150 | - | |
| 151 | - return $return_arr; | |
| 75 | + global $wpdb, $geodir_post_custom_fields_cache; | |
| 76 | + | |
| 77 | + $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location; | |
| 78 | + | |
| 79 | +	if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {
 | |
| 80 | + return $geodir_post_custom_fields_cache[$cache_stored]; | |
| 81 | + } | |
| 82 | + | |
| 83 | + $default_query = ''; | |
| 84 | + | |
| 85 | + if ($default == 'default') | |
| 86 | +		$default_query .= " and is_admin IN ('1') ";
 | |
| 87 | + elseif ($default == 'custom') | |
| 88 | + $default_query .= " and is_admin = '0' "; | |
| 89 | + | |
| 90 | +	if ($fields_location == 'none') {
 | |
| 91 | +	} else{
 | |
| 92 | + $fields_location = esc_sql( $fields_location ); | |
| 93 | + $default_query .= " and show_in LIKE '%%[$fields_location]%%' "; | |
| 94 | + } | |
| 95 | + | |
| 96 | + $post_meta_info = $wpdb->get_results( | |
| 97 | + $wpdb->prepare( | |
| 98 | +			"select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
 | |
| 99 | + array($post_type) | |
| 100 | + ) | |
| 101 | + ); | |
| 102 | + | |
| 103 | + | |
| 104 | + $return_arr = array(); | |
| 105 | +	if ($post_meta_info) {
 | |
| 106 | + | |
| 107 | +		foreach ($post_meta_info as $post_meta_info_obj) {
 | |
| 108 | + | |
| 109 | + $custom_fields = array( | |
| 110 | + "name" => $post_meta_info_obj->htmlvar_name, | |
| 111 | + "label" => $post_meta_info_obj->clabels, | |
| 112 | + "default" => $post_meta_info_obj->default_value, | |
| 113 | + "type" => $post_meta_info_obj->field_type, | |
| 114 | + "desc" => $post_meta_info_obj->admin_desc); | |
| 115 | + | |
| 116 | +			if ($post_meta_info_obj->field_type) {
 | |
| 117 | +				$options = explode(',', $post_meta_info_obj->option_values);
 | |
| 118 | + $custom_fields["options"] = $options; | |
| 119 | + } | |
| 120 | + | |
| 121 | +			foreach ($post_meta_info_obj as $key => $val) {
 | |
| 122 | + $custom_fields[$key] = $val; | |
| 123 | + } | |
| 124 | + | |
| 125 | + $pricearr = array(); | |
| 126 | +			$pricearr = explode(',', $post_meta_info_obj->packages);
 | |
| 127 | + | |
| 128 | +			if ($package_id != '' && in_array($package_id, $pricearr)) {
 | |
| 129 | + $return_arr[$post_meta_info_obj->sort_order] = $custom_fields; | |
| 130 | +			} elseif ($package_id == '') {
 | |
| 131 | + $return_arr[$post_meta_info_obj->sort_order] = $custom_fields; | |
| 132 | + } | |
| 133 | + } | |
| 134 | + } | |
| 135 | + $geodir_post_custom_fields_cache[$cache_stored] = $return_arr; | |
| 136 | + | |
| 137 | +	if (has_filter('geodir_filter_geodir_post_custom_fields')) {
 | |
| 138 | + /** | |
| 139 | + * Filter the post custom fields array. | |
| 140 | + * | |
| 141 | + * @since 1.0.0 | |
| 142 | + * | |
| 143 | + * @param array $return_arr Post custom fields array. | |
| 144 | + * @param int|string $package_id The package ID. | |
| 145 | + * @param string $post_type Optional. The wordpress post type. | |
| 146 | + * @param string $fields_location Optional. Where exactly are you going to place this custom fields?. | |
| 147 | + */ | |
| 148 | +		$return_arr = apply_filters('geodir_filter_geodir_post_custom_fields', $return_arr, $package_id, $post_type, $fields_location);
 | |
| 149 | + } | |
| 150 | + | |
| 151 | + return $return_arr; | |
| 152 | 152 | } | 
| 153 | 153 | |
| 154 | - /** | |
| 155 | - * Adds admin html for custom fields. | |
| 156 | - * | |
| 157 | - * @since 1.0.0 | |
| 158 | - * @package GeoDirectory | |
| 159 | - * @global object $wpdb WordPress Database object. | |
| 160 | - * @param string $field_type The form field type. | |
| 161 | - * @param object|int $result_str The custom field results object or row id. | |
| 162 | - * @param string $field_ins_upd When set to "submit" displays form. | |
| 163 | - * @param string $field_type_key The key of the custom field. | |
| 164 | - */ | |
| 165 | - function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='') | |
| 166 | -    {
 | |
| 167 | - global $wpdb; | |
| 168 | - $cf = $result_str; | |
| 169 | -        if (!is_object($cf)) {
 | |
| 170 | - | |
| 171 | -            $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));
 | |
| 172 | - | |
| 173 | -        } else {
 | |
| 174 | - $field_info = $cf; | |
| 175 | - $result_str = $cf->id; | |
| 176 | - } | |
| 177 | - /** | |
| 178 | - * Contains custom field html. | |
| 179 | - * | |
| 180 | - * @since 1.0.0 | |
| 181 | - */ | |
| 182 | -        include('custom_field_html.php');
 | |
| 183 | - | |
| 184 | - } | |
| 154 | + /** | |
| 155 | + * Adds admin html for custom fields. | |
| 156 | + * | |
| 157 | + * @since 1.0.0 | |
| 158 | + * @package GeoDirectory | |
| 159 | + * @global object $wpdb WordPress Database object. | |
| 160 | + * @param string $field_type The form field type. | |
| 161 | + * @param object|int $result_str The custom field results object or row id. | |
| 162 | + * @param string $field_ins_upd When set to "submit" displays form. | |
| 163 | + * @param string $field_type_key The key of the custom field. | |
| 164 | + */ | |
| 165 | + function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='') | |
| 166 | +	{
 | |
| 167 | + global $wpdb; | |
| 168 | + $cf = $result_str; | |
| 169 | +		if (!is_object($cf)) {
 | |
| 170 | + | |
| 171 | +			$field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));
 | |
| 172 | + | |
| 173 | +		} else {
 | |
| 174 | + $field_info = $cf; | |
| 175 | + $result_str = $cf->id; | |
| 176 | + } | |
| 177 | + /** | |
| 178 | + * Contains custom field html. | |
| 179 | + * | |
| 180 | + * @since 1.0.0 | |
| 181 | + */ | |
| 182 | +		include('custom_field_html.php');
 | |
| 183 | + | |
| 184 | + } | |
| 185 | 185 | |
| 186 | 186 | |
| 187 | 187 |  if (!function_exists('geodir_custom_field_delete')) {
 | 
| 188 | - /** | |
| 189 | - * Delete custom field using field id. | |
| 190 | - * | |
| 191 | - * @since 1.0.0 | |
| 192 | - * @since 1.5.7 Delete field from sorting fields table when custom field deleted. | |
| 193 | - * @package GeoDirectory | |
| 194 | - * @global object $wpdb WordPress Database object. | |
| 195 | - * @global string $plugin_prefix Geodirectory plugin table prefix. | |
| 196 | - * @param string $field_id The custom field ID. | |
| 197 | - * @return int|string If field deleted successfully, returns field id. Otherwise returns 0. | |
| 198 | - */ | |
| 199 | -    function geodir_custom_field_delete($field_id = '') {
 | |
| 200 | - global $wpdb, $plugin_prefix; | |
| 201 | - | |
| 202 | -        if ($field_id != '') {
 | |
| 203 | - $cf = trim($field_id, '_'); | |
| 204 | - | |
| 205 | -            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {
 | |
| 206 | -                $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));
 | |
| 207 | - | |
| 208 | - $post_type = $field->post_type; | |
| 209 | - $htmlvar_name = $field->htmlvar_name; | |
| 210 | - | |
| 211 | -                if ($post_type != '' && $htmlvar_name != '') {
 | |
| 212 | -                    $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
 | |
| 213 | - } | |
| 214 | - | |
| 215 | - /** | |
| 216 | - * Called after a custom field is deleted. | |
| 217 | - * | |
| 218 | - * @since 1.0.0 | |
| 219 | - * @param string $cf The fields ID. | |
| 220 | - * @param string $field->htmlvar_name The html variable name for the field. | |
| 221 | - * @param string $post_type The post type the field belongs to. | |
| 222 | - */ | |
| 223 | -                do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);
 | |
| 224 | - | |
| 225 | -                if ($field->field_type == 'address') {
 | |
| 226 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");
 | |
| 227 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");
 | |
| 228 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");
 | |
| 229 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");
 | |
| 230 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");
 | |
| 231 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");
 | |
| 232 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");
 | |
| 233 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");
 | |
| 234 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");
 | |
| 235 | -                } else {
 | |
| 236 | -                    if ($field->field_type != 'fieldset') {
 | |
| 237 | -                        $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");
 | |
| 238 | - } | |
| 239 | - } | |
| 240 | - | |
| 241 | - return $field_id; | |
| 242 | - } else | |
| 243 | - return 0; | |
| 244 | - } else | |
| 245 | - return 0; | |
| 246 | - } | |
| 188 | + /** | |
| 189 | + * Delete custom field using field id. | |
| 190 | + * | |
| 191 | + * @since 1.0.0 | |
| 192 | + * @since 1.5.7 Delete field from sorting fields table when custom field deleted. | |
| 193 | + * @package GeoDirectory | |
| 194 | + * @global object $wpdb WordPress Database object. | |
| 195 | + * @global string $plugin_prefix Geodirectory plugin table prefix. | |
| 196 | + * @param string $field_id The custom field ID. | |
| 197 | + * @return int|string If field deleted successfully, returns field id. Otherwise returns 0. | |
| 198 | + */ | |
| 199 | +	function geodir_custom_field_delete($field_id = '') {
 | |
| 200 | + global $wpdb, $plugin_prefix; | |
| 201 | + | |
| 202 | +		if ($field_id != '') {
 | |
| 203 | + $cf = trim($field_id, '_'); | |
| 204 | + | |
| 205 | +			if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {
 | |
| 206 | +				$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));
 | |
| 207 | + | |
| 208 | + $post_type = $field->post_type; | |
| 209 | + $htmlvar_name = $field->htmlvar_name; | |
| 210 | + | |
| 211 | +				if ($post_type != '' && $htmlvar_name != '') {
 | |
| 212 | +					$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
 | |
| 213 | + } | |
| 214 | + | |
| 215 | + /** | |
| 216 | + * Called after a custom field is deleted. | |
| 217 | + * | |
| 218 | + * @since 1.0.0 | |
| 219 | + * @param string $cf The fields ID. | |
| 220 | + * @param string $field->htmlvar_name The html variable name for the field. | |
| 221 | + * @param string $post_type The post type the field belongs to. | |
| 222 | + */ | |
| 223 | +				do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);
 | |
| 224 | + | |
| 225 | +				if ($field->field_type == 'address') {
 | |
| 226 | +					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");
 | |
| 227 | +					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");
 | |
| 228 | +					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");
 | |
| 229 | +					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");
 | |
| 230 | +					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");
 | |
| 231 | +					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");
 | |
| 232 | +					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");
 | |
| 233 | +					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");
 | |
| 234 | +					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");
 | |
| 235 | +				} else {
 | |
| 236 | +					if ($field->field_type != 'fieldset') {
 | |
| 237 | +						$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");
 | |
| 238 | + } | |
| 239 | + } | |
| 240 | + | |
| 241 | + return $field_id; | |
| 242 | + } else | |
| 243 | + return 0; | |
| 244 | + } else | |
| 245 | + return 0; | |
| 246 | + } | |
| 247 | 247 | } | 
| 248 | 248 | |
| 249 | 249 |  if (!function_exists('geodir_custom_field_save')) {
 | 
| 250 | - /** | |
| 251 | - * Save or Update custom fields into the database. | |
| 252 | - * | |
| 253 | - * @since 1.0.0 | |
| 254 | - * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt. | |
| 255 | - * @package GeoDirectory | |
| 256 | - * @global object $wpdb WordPress Database object. | |
| 257 | - * @global string $plugin_prefix Geodirectory plugin table prefix. | |
| 258 | -     * @param array $request_field {
 | |
| 259 | - * Attributes of the request field array. | |
| 260 | - * | |
| 261 | - * @type string $action Ajax Action name. Default "geodir_ajax_action". | |
| 262 | - * @type string $manage_field_type Field type Default "custom_fields". | |
| 263 | - * @type string $create_field Create field Default "true". | |
| 264 | - * @type string $field_ins_upd Field ins upd Default "submit". | |
| 265 | - * @type string $_wpnonce WP nonce value. | |
| 266 | - * @type string $listing_type Listing type Example "gd_place". | |
| 267 | - * @type string $field_type Field type Example "radio". | |
| 268 | - * @type string $field_id Field id Example "12". | |
| 269 | - * @type string $data_type Data type Example "VARCHAR". | |
| 270 | - * @type string $is_active Either "1" or "0". If "0" is used then the field will not be displayed anywhere. | |
| 271 | - * @type array $show_on_pkg Package list to display this field. | |
| 272 | - * @type string $admin_title Personal comment, it would not be displayed anywhere except in custom field settings. | |
| 273 | - * @type string $site_title Section title which you wish to display in frontend. | |
| 274 | - * @type string $admin_desc Section description which will appear in frontend. | |
| 275 | - * @type string $htmlvar_name Html variable name. This should be a unique name. | |
| 276 | - * @type string $clabels Section Title which will appear in backend. | |
| 277 | - * @type string $default_value The default value (for "link" this will be used as the link text). | |
| 278 | - * @type string $sort_order The display order of this field in backend. e.g. 5. | |
| 279 | - * @type string $is_default Either "1" or "0". If "0" is used then the field will be displayed as main form field or additional field. | |
| 280 | - * @type string $for_admin_use Either "1" or "0". If "0" is used then only site admin can edit this field. | |
| 281 | - * @type string $is_required Use "1" to set field as required. | |
| 282 | - * @type string $required_msg Enter text for error message if field required and have not full fill requirement. | |
| 283 | - * @type string $show_on_listing Want to show this on listing page?. | |
| 284 | - * @type string $show_in What locations to show the custom field in. | |
| 285 | - * @type string $show_on_detail Want to show this in More Info tab on detail page?. | |
| 286 | - * @type string $show_as_tab Want to display this as a tab on detail page? If "1" then "Show on detail page?" must be Yes. | |
| 287 | - * @type string $option_values Option Values should be separated by comma. | |
| 288 | - * @type string $field_icon Upload icon using media and enter its url path, or enter font awesome class. | |
| 289 | - * @type string $css_class Enter custom css class for field custom style. | |
| 290 | - * @type array $extra_fields An array of extra fields to store. | |
| 291 | - * | |
| 292 | - * } | |
| 293 | - * @param bool $default Not yet implemented. | |
| 294 | - * @return int|string If field is unique returns inserted row id. Otherwise returns error string. | |
| 295 | - */ | |
| 296 | - function geodir_custom_field_save($request_field = array(), $default = false) | |
| 297 | -    {
 | |
| 298 | - | |
| 299 | - global $wpdb, $plugin_prefix; | |
| 300 | - | |
| 301 | - $old_html_variable = ''; | |
| 302 | - | |
| 303 | - $data_type = trim($request_field['data_type']); | |
| 304 | - | |
| 305 | - $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : ''; | |
| 306 | - | |
| 307 | - // some servers fail if a POST value is VARCHAR so we change it. | |
| 308 | -        if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){
 | |
| 309 | - $request_field['data_type'] = 'VARCHAR'; | |
| 310 | - } | |
| 311 | - | |
| 312 | - $cf = trim($result_str, '_'); | |
| 313 | - | |
| 314 | - | |
| 315 | - /*-------- check duplicate validation --------*/ | |
| 316 | - | |
| 317 | - $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; | |
| 318 | - $post_type = $request_field['listing_type']; | |
| 319 | - | |
| 320 | -        if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {
 | |
| 321 | - $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name; | |
| 322 | - } | |
| 323 | - | |
| 324 | - $check_html_variable = $wpdb->get_var( | |
| 325 | - $wpdb->prepare( | |
| 326 | - "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ", | |
| 327 | - array($cf, $cehhtmlvar_name, $post_type) | |
| 328 | - ) | |
| 329 | - ); | |
| 330 | - | |
| 331 | - | |
| 332 | -        if (!$check_html_variable || $request_field['field_type'] == 'fieldset') {
 | |
| 333 | - | |
| 334 | -            if ($cf != '') {
 | |
| 335 | - | |
| 336 | - $post_meta_info = $wpdb->get_row( | |
| 337 | - $wpdb->prepare( | |
| 338 | - "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d", | |
| 339 | - array($cf) | |
| 340 | - ) | |
| 341 | - ); | |
| 342 | - | |
| 343 | - } | |
| 344 | - | |
| 345 | -            if (!empty($post_meta_info)) {
 | |
| 346 | - $post_val = $post_meta_info; | |
| 347 | - $old_html_variable = $post_val->htmlvar_name; | |
| 348 | - | |
| 349 | - } | |
| 350 | - | |
| 351 | - | |
| 352 | - | |
| 353 | - if ($post_type == '') $post_type = 'gd_place'; | |
| 354 | - | |
| 355 | - | |
| 356 | - $detail_table = $plugin_prefix . $post_type . '_detail'; | |
| 357 | - | |
| 358 | - $admin_title = $request_field['admin_title']; | |
| 359 | - $site_title = $request_field['site_title']; | |
| 360 | - $data_type = $request_field['data_type']; | |
| 361 | - $field_type = $request_field['field_type']; | |
| 362 | - $field_type_key = isset($request_field['field_type_key']) ? $request_field['field_type_key'] : $field_type; | |
| 363 | - $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; | |
| 364 | - $admin_desc = $request_field['admin_desc']; | |
| 365 | - $clabels = isset($request_field['clabels']) ? $request_field['clabels'] : ''; | |
| 366 | - $default_value = isset($request_field['default_value']) ? $request_field['default_value'] : ''; | |
| 367 | - $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : ''; | |
| 368 | - $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : ''; | |
| 369 | - $is_required = isset($request_field['is_required']) ? $request_field['is_required'] : ''; | |
| 370 | - $required_msg = isset($request_field['required_msg']) ? $request_field['required_msg'] : ''; | |
| 371 | - $css_class = isset($request_field['css_class']) ? $request_field['css_class'] : ''; | |
| 372 | - $field_icon = isset($request_field['field_icon']) ? $request_field['field_icon'] : ''; | |
| 373 | - $show_on_listing = isset($request_field['show_on_listing']) ? $request_field['show_on_listing'] : ''; | |
| 374 | - $show_in = isset($request_field['show_in']) ? $request_field['show_in'] : ''; | |
| 375 | - $show_on_detail = isset($request_field['show_on_detail']) ? $request_field['show_on_detail'] : ''; | |
| 376 | - $show_as_tab = isset($request_field['show_as_tab']) ? $request_field['show_as_tab'] : ''; | |
| 377 | - $decimal_point = isset($request_field['decimal_point']) ? trim($request_field['decimal_point']) : ''; // decimal point for DECIMAL data type | |
| 378 | - $decimal_point = $decimal_point > 0 ? ($decimal_point > 10 ? 10 : $decimal_point) : ''; | |
| 379 | - $validation_pattern = isset($request_field['validation_pattern']) ? $request_field['validation_pattern'] : ''; | |
| 380 | - $validation_msg = isset($request_field['validation_msg']) ? $request_field['validation_msg'] : ''; | |
| 381 | - $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : ''; | |
| 250 | + /** | |
| 251 | + * Save or Update custom fields into the database. | |
| 252 | + * | |
| 253 | + * @since 1.0.0 | |
| 254 | + * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt. | |
| 255 | + * @package GeoDirectory | |
| 256 | + * @global object $wpdb WordPress Database object. | |
| 257 | + * @global string $plugin_prefix Geodirectory plugin table prefix. | |
| 258 | +	 * @param array $request_field {
 | |
| 259 | + * Attributes of the request field array. | |
| 260 | + * | |
| 261 | + * @type string $action Ajax Action name. Default "geodir_ajax_action". | |
| 262 | + * @type string $manage_field_type Field type Default "custom_fields". | |
| 263 | + * @type string $create_field Create field Default "true". | |
| 264 | + * @type string $field_ins_upd Field ins upd Default "submit". | |
| 265 | + * @type string $_wpnonce WP nonce value. | |
| 266 | + * @type string $listing_type Listing type Example "gd_place". | |
| 267 | + * @type string $field_type Field type Example "radio". | |
| 268 | + * @type string $field_id Field id Example "12". | |
| 269 | + * @type string $data_type Data type Example "VARCHAR". | |
| 270 | + * @type string $is_active Either "1" or "0". If "0" is used then the field will not be displayed anywhere. | |
| 271 | + * @type array $show_on_pkg Package list to display this field. | |
| 272 | + * @type string $admin_title Personal comment, it would not be displayed anywhere except in custom field settings. | |
| 273 | + * @type string $site_title Section title which you wish to display in frontend. | |
| 274 | + * @type string $admin_desc Section description which will appear in frontend. | |
| 275 | + * @type string $htmlvar_name Html variable name. This should be a unique name. | |
| 276 | + * @type string $clabels Section Title which will appear in backend. | |
| 277 | + * @type string $default_value The default value (for "link" this will be used as the link text). | |
| 278 | + * @type string $sort_order The display order of this field in backend. e.g. 5. | |
| 279 | + * @type string $is_default Either "1" or "0". If "0" is used then the field will be displayed as main form field or additional field. | |
| 280 | + * @type string $for_admin_use Either "1" or "0". If "0" is used then only site admin can edit this field. | |
| 281 | + * @type string $is_required Use "1" to set field as required. | |
| 282 | + * @type string $required_msg Enter text for error message if field required and have not full fill requirement. | |
| 283 | + * @type string $show_on_listing Want to show this on listing page?. | |
| 284 | + * @type string $show_in What locations to show the custom field in. | |
| 285 | + * @type string $show_on_detail Want to show this in More Info tab on detail page?. | |
| 286 | + * @type string $show_as_tab Want to display this as a tab on detail page? If "1" then "Show on detail page?" must be Yes. | |
| 287 | + * @type string $option_values Option Values should be separated by comma. | |
| 288 | + * @type string $field_icon Upload icon using media and enter its url path, or enter font awesome class. | |
| 289 | + * @type string $css_class Enter custom css class for field custom style. | |
| 290 | + * @type array $extra_fields An array of extra fields to store. | |
| 291 | + * | |
| 292 | + * } | |
| 293 | + * @param bool $default Not yet implemented. | |
| 294 | + * @return int|string If field is unique returns inserted row id. Otherwise returns error string. | |
| 295 | + */ | |
| 296 | + function geodir_custom_field_save($request_field = array(), $default = false) | |
| 297 | +	{
 | |
| 298 | + | |
| 299 | + global $wpdb, $plugin_prefix; | |
| 300 | + | |
| 301 | + $old_html_variable = ''; | |
| 302 | + | |
| 303 | + $data_type = trim($request_field['data_type']); | |
| 304 | + | |
| 305 | + $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : ''; | |
| 306 | + | |
| 307 | + // some servers fail if a POST value is VARCHAR so we change it. | |
| 308 | +		if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){
 | |
| 309 | + $request_field['data_type'] = 'VARCHAR'; | |
| 310 | + } | |
| 311 | + | |
| 312 | + $cf = trim($result_str, '_'); | |
| 313 | + | |
| 314 | + | |
| 315 | + /*-------- check duplicate validation --------*/ | |
| 316 | + | |
| 317 | + $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; | |
| 318 | + $post_type = $request_field['listing_type']; | |
| 319 | + | |
| 320 | +		if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {
 | |
| 321 | + $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name; | |
| 322 | + } | |
| 323 | + | |
| 324 | + $check_html_variable = $wpdb->get_var( | |
| 325 | + $wpdb->prepare( | |
| 326 | + "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ", | |
| 327 | + array($cf, $cehhtmlvar_name, $post_type) | |
| 328 | + ) | |
| 329 | + ); | |
| 330 | + | |
| 331 | + | |
| 332 | +		if (!$check_html_variable || $request_field['field_type'] == 'fieldset') {
 | |
| 333 | + | |
| 334 | +			if ($cf != '') {
 | |
| 335 | + | |
| 336 | + $post_meta_info = $wpdb->get_row( | |
| 337 | + $wpdb->prepare( | |
| 338 | + "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d", | |
| 339 | + array($cf) | |
| 340 | + ) | |
| 341 | + ); | |
| 342 | + | |
| 343 | + } | |
| 344 | + | |
| 345 | +			if (!empty($post_meta_info)) {
 | |
| 346 | + $post_val = $post_meta_info; | |
| 347 | + $old_html_variable = $post_val->htmlvar_name; | |
| 348 | + | |
| 349 | + } | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + if ($post_type == '') $post_type = 'gd_place'; | |
| 354 | + | |
| 355 | + | |
| 356 | + $detail_table = $plugin_prefix . $post_type . '_detail'; | |
| 357 | + | |
| 358 | + $admin_title = $request_field['admin_title']; | |
| 359 | + $site_title = $request_field['site_title']; | |
| 360 | + $data_type = $request_field['data_type']; | |
| 361 | + $field_type = $request_field['field_type']; | |
| 362 | + $field_type_key = isset($request_field['field_type_key']) ? $request_field['field_type_key'] : $field_type; | |
| 363 | + $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; | |
| 364 | + $admin_desc = $request_field['admin_desc']; | |
| 365 | + $clabels = isset($request_field['clabels']) ? $request_field['clabels'] : ''; | |
| 366 | + $default_value = isset($request_field['default_value']) ? $request_field['default_value'] : ''; | |
| 367 | + $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : ''; | |
| 368 | + $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : ''; | |
| 369 | + $is_required = isset($request_field['is_required']) ? $request_field['is_required'] : ''; | |
| 370 | + $required_msg = isset($request_field['required_msg']) ? $request_field['required_msg'] : ''; | |
| 371 | + $css_class = isset($request_field['css_class']) ? $request_field['css_class'] : ''; | |
| 372 | + $field_icon = isset($request_field['field_icon']) ? $request_field['field_icon'] : ''; | |
| 373 | + $show_on_listing = isset($request_field['show_on_listing']) ? $request_field['show_on_listing'] : ''; | |
| 374 | + $show_in = isset($request_field['show_in']) ? $request_field['show_in'] : ''; | |
| 375 | + $show_on_detail = isset($request_field['show_on_detail']) ? $request_field['show_on_detail'] : ''; | |
| 376 | + $show_as_tab = isset($request_field['show_as_tab']) ? $request_field['show_as_tab'] : ''; | |
| 377 | + $decimal_point = isset($request_field['decimal_point']) ? trim($request_field['decimal_point']) : ''; // decimal point for DECIMAL data type | |
| 378 | + $decimal_point = $decimal_point > 0 ? ($decimal_point > 10 ? 10 : $decimal_point) : ''; | |
| 379 | + $validation_pattern = isset($request_field['validation_pattern']) ? $request_field['validation_pattern'] : ''; | |
| 380 | + $validation_msg = isset($request_field['validation_msg']) ? $request_field['validation_msg'] : ''; | |
| 381 | + $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : ''; | |
| 382 | 382 | |
| 383 | 383 | |
| 384 | -            if(is_array($show_in)){
 | |
| 385 | -                $show_in = implode(",", $request_field['show_in']);
 | |
| 386 | - } | |
| 384 | +			if(is_array($show_in)){
 | |
| 385 | +				$show_in = implode(",", $request_field['show_in']);
 | |
| 386 | + } | |
| 387 | 387 | |
| 388 | -            if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {
 | |
| 389 | - $htmlvar_name = 'geodir_' . $htmlvar_name; | |
| 390 | - } | |
| 388 | +			if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {
 | |
| 389 | + $htmlvar_name = 'geodir_' . $htmlvar_name; | |
| 390 | + } | |
| 391 | 391 | |
| 392 | - $option_values = ''; | |
| 393 | - if (isset($request_field['option_values'])) | |
| 394 | - $option_values = $request_field['option_values']; | |
| 392 | + $option_values = ''; | |
| 393 | + if (isset($request_field['option_values'])) | |
| 394 | + $option_values = $request_field['option_values']; | |
| 395 | 395 | |
| 396 | - $cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0'; | |
| 396 | + $cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0'; | |
| 397 | 397 | |
| 398 | - $cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0'; | |
| 398 | + $cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0'; | |
| 399 | 399 | |
| 400 | - if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg'])) | |
| 401 | -                $price_pkg = implode(",", $request_field['show_on_pkg']);
 | |
| 402 | -            else {
 | |
| 403 | - $package_info = array(); | |
| 400 | + if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg'])) | |
| 401 | +				$price_pkg = implode(",", $request_field['show_on_pkg']);
 | |
| 402 | +			else {
 | |
| 403 | + $package_info = array(); | |
| 404 | 404 | |
| 405 | - $package_info = geodir_post_package_info($package_info, '', $post_type); | |
| 406 | - $price_pkg = !empty($package_info->pid) ? $package_info->pid : ''; | |
| 407 | - } | |
| 405 | + $package_info = geodir_post_package_info($package_info, '', $post_type); | |
| 406 | + $price_pkg = !empty($package_info->pid) ? $package_info->pid : ''; | |
| 407 | + } | |
| 408 | 408 | |
| 409 | 409 | |
| 410 | - if (isset($request_field['extra']) && !empty($request_field['extra'])) | |
| 411 | - $extra_fields = $request_field['extra']; | |
| 410 | + if (isset($request_field['extra']) && !empty($request_field['extra'])) | |
| 411 | + $extra_fields = $request_field['extra']; | |
| 412 | 412 | |
| 413 | - if (isset($request_field['is_default']) && $request_field['is_default'] != '') | |
| 414 | - $is_default = $request_field['is_default']; | |
| 415 | - else | |
| 416 | - $is_default = '0'; | |
| 413 | + if (isset($request_field['is_default']) && $request_field['is_default'] != '') | |
| 414 | + $is_default = $request_field['is_default']; | |
| 415 | + else | |
| 416 | + $is_default = '0'; | |
| 417 | 417 | |
| 418 | - if (isset($request_field['is_admin']) && $request_field['is_admin'] != '') | |
| 419 | - $is_admin = $request_field['is_admin']; | |
| 420 | - else | |
| 421 | - $is_admin = '0'; | |
| 418 | + if (isset($request_field['is_admin']) && $request_field['is_admin'] != '') | |
| 419 | + $is_admin = $request_field['is_admin']; | |
| 420 | + else | |
| 421 | + $is_admin = '0'; | |
| 422 | 422 | |
| 423 | 423 | |
| 424 | - if ($is_active == '') $is_active = 1; | |
| 425 | - if ($is_required == '') $is_required = 0; | |
| 424 | + if ($is_active == '') $is_active = 1; | |
| 425 | + if ($is_required == '') $is_required = 0; | |
| 426 | 426 | |
| 427 | 427 | |
| 428 | -            if ($sort_order == '') {
 | |
| 428 | +			if ($sort_order == '') {
 | |
| 429 | 429 | |
| 430 | -                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);
 | |
| 430 | +				$last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);
 | |
| 431 | 431 | |
| 432 | - $sort_order = (int)$last_order + 1; | |
| 433 | - } | |
| 432 | + $sort_order = (int)$last_order + 1; | |
| 433 | + } | |
| 434 | 434 | |
| 435 | - $default_value_add = ''; | |
| 435 | + $default_value_add = ''; | |
| 436 | 436 | |
| 437 | 437 | |
| 438 | -            if (!empty($post_meta_info)) {
 | |
| 439 | - switch ($field_type): | |
| 438 | +			if (!empty($post_meta_info)) {
 | |
| 439 | + switch ($field_type): | |
| 440 | 440 | |
| 441 | - case 'address': | |
| 441 | + case 'address': | |
| 442 | 442 | |
| 443 | -                        if ($htmlvar_name != '') {
 | |
| 444 | - $prefix = $htmlvar_name . '_'; | |
| 445 | - } | |
| 446 | - $old_prefix = $old_html_variable . '_'; | |
| 443 | +						if ($htmlvar_name != '') {
 | |
| 444 | + $prefix = $htmlvar_name . '_'; | |
| 445 | + } | |
| 446 | + $old_prefix = $old_html_variable . '_'; | |
| 447 | 447 | |
| 448 | 448 | |
| 449 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL"; | |
| 449 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL"; | |
| 450 | 450 | |
| 451 | -                        if ($default_value != '') {
 | |
| 452 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 453 | - } | |
| 451 | +						if ($default_value != '') {
 | |
| 452 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 453 | + } | |
| 454 | 454 | |
| 455 | - $wpdb->query($meta_field_add); | |
| 455 | + $wpdb->query($meta_field_add); | |
| 456 | 456 | |
| 457 | -                        if ($extra_fields != '') {
 | |
| 457 | +						if ($extra_fields != '') {
 | |
| 458 | 458 | |
| 459 | -                            if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
 | |
| 459 | +							if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
 | |
| 460 | 460 | |
| 461 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");
 | |
| 462 | -                                if ($is_column) {
 | |
| 463 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL"; | |
| 461 | +								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");
 | |
| 462 | +								if ($is_column) {
 | |
| 463 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL"; | |
| 464 | 464 | |
| 465 | -                                    if ($default_value != '') {
 | |
| 466 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 467 | - } | |
| 465 | +									if ($default_value != '') {
 | |
| 466 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 467 | + } | |
| 468 | 468 | |
| 469 | - $wpdb->query($meta_field_add); | |
| 470 | -                                } else {
 | |
| 469 | + $wpdb->query($meta_field_add); | |
| 470 | +								} else {
 | |
| 471 | 471 | |
| 472 | - $meta_field_add = "VARCHAR( 50 ) NULL"; | |
| 473 | -                                    if ($default_value != '') {
 | |
| 474 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 475 | - } | |
| 476 | - geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add); | |
| 472 | + $meta_field_add = "VARCHAR( 50 ) NULL"; | |
| 473 | +									if ($default_value != '') {
 | |
| 474 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 475 | + } | |
| 476 | + geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add); | |
| 477 | 477 | |
| 478 | - } | |
| 478 | + } | |
| 479 | 479 | |
| 480 | 480 | |
| 481 | - } | |
| 481 | + } | |
| 482 | 482 | |
| 483 | 483 | |
| 484 | -                            if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
 | |
| 484 | +							if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
 | |
| 485 | 485 | |
| 486 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");
 | |
| 486 | +								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");
 | |
| 487 | 487 | |
| 488 | -                                if ($is_column) {
 | |
| 489 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL"; | |
| 488 | +								if ($is_column) {
 | |
| 489 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL"; | |
| 490 | 490 | |
| 491 | -                                    if ($default_value != '') {
 | |
| 492 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 493 | - } | |
| 491 | +									if ($default_value != '') {
 | |
| 492 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 493 | + } | |
| 494 | 494 | |
| 495 | - $wpdb->query($meta_field_add); | |
| 496 | -                                } else {
 | |
| 497 | - $meta_field_add = "VARCHAR( 50 ) NULL"; | |
| 498 | -                                    if ($default_value != '') {
 | |
| 499 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 500 | - } | |
| 495 | + $wpdb->query($meta_field_add); | |
| 496 | +								} else {
 | |
| 497 | + $meta_field_add = "VARCHAR( 50 ) NULL"; | |
| 498 | +									if ($default_value != '') {
 | |
| 499 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 500 | + } | |
| 501 | 501 | |
| 502 | - geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add); | |
| 503 | - } | |
| 502 | + geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add); | |
| 503 | + } | |
| 504 | 504 | |
| 505 | - } | |
| 506 | -                            if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
 | |
| 505 | + } | |
| 506 | +							if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
 | |
| 507 | 507 | |
| 508 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");
 | |
| 508 | +								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");
 | |
| 509 | 509 | |
| 510 | -                                if ($is_column) {
 | |
| 510 | +								if ($is_column) {
 | |
| 511 | 511 | |
| 512 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL"; | |
| 512 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL"; | |
| 513 | 513 | |
| 514 | -                                    if ($default_value != '') {
 | |
| 515 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 516 | - } | |
| 514 | +									if ($default_value != '') {
 | |
| 515 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 516 | + } | |
| 517 | 517 | |
| 518 | - $wpdb->query($meta_field_add); | |
| 519 | -                                } else {
 | |
| 518 | + $wpdb->query($meta_field_add); | |
| 519 | +								} else {
 | |
| 520 | 520 | |
| 521 | - $meta_field_add = "VARCHAR( 50 ) NULL"; | |
| 522 | -                                    if ($default_value != '') {
 | |
| 523 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 524 | - } | |
| 521 | + $meta_field_add = "VARCHAR( 50 ) NULL"; | |
| 522 | +									if ($default_value != '') {
 | |
| 523 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 524 | + } | |
| 525 | 525 | |
| 526 | - geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add); | |
| 526 | + geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add); | |
| 527 | 527 | |
| 528 | - } | |
| 528 | + } | |
| 529 | 529 | |
| 530 | - } | |
| 531 | -                            if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
 | |
| 530 | + } | |
| 531 | +							if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
 | |
| 532 | 532 | |
| 533 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");
 | |
| 533 | +								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");
 | |
| 534 | 534 | |
| 535 | -                                if ($is_column) {
 | |
| 535 | +								if ($is_column) {
 | |
| 536 | 536 | |
| 537 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL"; | |
| 537 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL"; | |
| 538 | 538 | |
| 539 | -                                    if ($default_value != '') {
 | |
| 540 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 541 | - } | |
| 539 | +									if ($default_value != '') {
 | |
| 540 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 541 | + } | |
| 542 | 542 | |
| 543 | - $wpdb->query($meta_field_add); | |
| 544 | -                                } else {
 | |
| 543 | + $wpdb->query($meta_field_add); | |
| 544 | +								} else {
 | |
| 545 | 545 | |
| 546 | - $meta_field_add = "VARCHAR( 50 ) NULL"; | |
| 547 | -                                    if ($default_value != '') {
 | |
| 548 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 549 | - } | |
| 546 | + $meta_field_add = "VARCHAR( 50 ) NULL"; | |
| 547 | +									if ($default_value != '') {
 | |
| 548 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 549 | + } | |
| 550 | 550 | |
| 551 | - geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add); | |
| 551 | + geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add); | |
| 552 | 552 | |
| 553 | - } | |
| 553 | + } | |
| 554 | 554 | |
| 555 | - } | |
| 556 | -                            if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
 | |
| 555 | + } | |
| 556 | +							if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
 | |
| 557 | 557 | |
| 558 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");
 | |
| 559 | -                                if ($is_column) {
 | |
| 558 | +								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");
 | |
| 559 | +								if ($is_column) {
 | |
| 560 | 560 | |
| 561 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; | |
| 561 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; | |
| 562 | 562 | |
| 563 | -                                    if ($default_value != '') {
 | |
| 564 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 565 | - } | |
| 563 | +									if ($default_value != '') {
 | |
| 564 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 565 | + } | |
| 566 | 566 | |
| 567 | - $wpdb->query($meta_field_add); | |
| 568 | -                                } else {
 | |
| 567 | + $wpdb->query($meta_field_add); | |
| 568 | +								} else {
 | |
| 569 | 569 | |
| 570 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; | |
| 571 | - $meta_field_add = "VARCHAR( 20 ) NULL"; | |
| 572 | -                                    if ($default_value != '') {
 | |
| 573 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 574 | - } | |
| 570 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; | |
| 571 | + $meta_field_add = "VARCHAR( 20 ) NULL"; | |
| 572 | +									if ($default_value != '') {
 | |
| 573 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 574 | + } | |
| 575 | 575 | |
| 576 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add); | |
| 576 | + geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add); | |
| 577 | 577 | |
| 578 | - } | |
| 578 | + } | |
| 579 | 579 | |
| 580 | 580 | |
| 581 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");
 | |
| 581 | +								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");
 | |
| 582 | 582 | |
| 583 | -                                if ($is_column) {
 | |
| 584 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; | |
| 583 | +								if ($is_column) {
 | |
| 584 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; | |
| 585 | 585 | |
| 586 | -                                    if ($default_value != '') {
 | |
| 587 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 588 | - } | |
| 586 | +									if ($default_value != '') {
 | |
| 587 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 588 | + } | |
| 589 | 589 | |
| 590 | - $wpdb->query($meta_field_add); | |
| 591 | -                                } else {
 | |
| 590 | + $wpdb->query($meta_field_add); | |
| 591 | +								} else {
 | |
| 592 | 592 | |
| 593 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; | |
| 594 | - $meta_field_add = "VARCHAR( 20 ) NULL"; | |
| 595 | -                                    if ($default_value != '') {
 | |
| 596 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 597 | - } | |
| 593 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; | |
| 594 | + $meta_field_add = "VARCHAR( 20 ) NULL"; | |
| 595 | +									if ($default_value != '') {
 | |
| 596 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 597 | + } | |
| 598 | 598 | |
| 599 | - geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add); | |
| 600 | - } | |
| 599 | + geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add); | |
| 600 | + } | |
| 601 | 601 | |
| 602 | - } | |
| 603 | -                            if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
 | |
| 602 | + } | |
| 603 | +							if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
 | |
| 604 | 604 | |
| 605 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");
 | |
| 605 | +								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");
 | |
| 606 | 606 | |
| 607 | -                                if ($is_column) {
 | |
| 608 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; | |
| 607 | +								if ($is_column) {
 | |
| 608 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; | |
| 609 | 609 | |
| 610 | -                                    if ($default_value != '') {
 | |
| 611 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 612 | - } | |
| 610 | +									if ($default_value != '') {
 | |
| 611 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 612 | + } | |
| 613 | 613 | |
| 614 | - $wpdb->query($meta_field_add); | |
| 615 | -                                } else {
 | |
| 614 | + $wpdb->query($meta_field_add); | |
| 615 | +								} else {
 | |
| 616 | 616 | |
| 617 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; | |
| 617 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; | |
| 618 | 618 | |
| 619 | - $meta_field_add = "VARCHAR( 15 ) NULL"; | |
| 620 | -                                    if ($default_value != '') {
 | |
| 621 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 622 | - } | |
| 619 | + $meta_field_add = "VARCHAR( 15 ) NULL"; | |
| 620 | +									if ($default_value != '') {
 | |
| 621 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 622 | + } | |
| 623 | 623 | |
| 624 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add); | |
| 625 | - } | |
| 624 | + geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add); | |
| 625 | + } | |
| 626 | 626 | |
| 627 | 627 | |
| 628 | - } | |
| 629 | -                            if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
 | |
| 628 | + } | |
| 629 | +							if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
 | |
| 630 | 630 | |
| 631 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");
 | |
| 632 | -                                if ($is_column) {
 | |
| 633 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; | |
| 631 | +								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");
 | |
| 632 | +								if ($is_column) {
 | |
| 633 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; | |
| 634 | 634 | |
| 635 | -                                    if ($default_value != '') {
 | |
| 636 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 637 | - } | |
| 635 | +									if ($default_value != '') {
 | |
| 636 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 637 | + } | |
| 638 | 638 | |
| 639 | - $wpdb->query($meta_field_add); | |
| 639 | + $wpdb->query($meta_field_add); | |
| 640 | 640 | |
| 641 | -                                } else {
 | |
| 641 | +								} else {
 | |
| 642 | 642 | |
| 643 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; | |
| 643 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; | |
| 644 | 644 | |
| 645 | - $meta_field_add = "VARCHAR( 3 ) NULL"; | |
| 646 | -                                    if ($default_value != '') {
 | |
| 647 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 648 | - } | |
| 645 | + $meta_field_add = "VARCHAR( 3 ) NULL"; | |
| 646 | +									if ($default_value != '') {
 | |
| 647 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 648 | + } | |
| 649 | 649 | |
| 650 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add); | |
| 651 | - } | |
| 650 | + geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add); | |
| 651 | + } | |
| 652 | 652 | |
| 653 | - } | |
| 654 | - // show lat lng | |
| 655 | -                            if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
 | |
| 656 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");
 | |
| 653 | + } | |
| 654 | + // show lat lng | |
| 655 | +							if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
 | |
| 656 | +								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");
 | |
| 657 | 657 | |
| 658 | -                                if ($is_column) {
 | |
| 659 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; | |
| 660 | - $meta_field_add .= " DEFAULT '1'"; | |
| 658 | +								if ($is_column) {
 | |
| 659 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; | |
| 660 | + $meta_field_add .= " DEFAULT '1'"; | |
| 661 | 661 | |
| 662 | - $wpdb->query($meta_field_add); | |
| 663 | -                                } else {
 | |
| 664 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; | |
| 662 | + $wpdb->query($meta_field_add); | |
| 663 | +								} else {
 | |
| 664 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; | |
| 665 | 665 | |
| 666 | - $meta_field_add = "VARCHAR( 3 ) NULL"; | |
| 667 | - $meta_field_add .= " DEFAULT '1'"; | |
| 666 | + $meta_field_add = "VARCHAR( 3 ) NULL"; | |
| 667 | + $meta_field_add .= " DEFAULT '1'"; | |
| 668 | 668 | |
| 669 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add); | |
| 670 | - } | |
| 669 | + geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add); | |
| 670 | + } | |
| 671 | 671 | |
| 672 | - } | |
| 673 | - }// end extra | |
| 672 | + } | |
| 673 | + }// end extra | |
| 674 | 674 | |
| 675 | - break; | |
| 675 | + break; | |
| 676 | 676 | |
| 677 | - case 'checkbox': | |
| 678 | - case 'multiselect': | |
| 679 | - case 'select': | |
| 680 | - case 'taxonomy': | |
| 677 | + case 'checkbox': | |
| 678 | + case 'multiselect': | |
| 679 | + case 'select': | |
| 680 | + case 'taxonomy': | |
| 681 | 681 | |
| 682 | - $op_size = '500'; | |
| 682 | + $op_size = '500'; | |
| 683 | 683 | |
| 684 | - // only make the field as big as it needs to be. | |
| 685 | -                        if(isset($option_values) && $option_values && $field_type=='select'){
 | |
| 686 | -                            $option_values_arr = explode(',',$option_values);
 | |
| 687 | -                            if(is_array($option_values_arr)){
 | |
| 688 | - $op_max = 0; | |
| 689 | -                                foreach($option_values_arr as $op_val){
 | |
| 690 | -                                    if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}
 | |
| 691 | - } | |
| 692 | -                                if($op_max){$op_size =$op_max; }
 | |
| 693 | - } | |
| 694 | -                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
 | |
| 695 | -                            if(strlen($option_values)){
 | |
| 696 | - $op_size = strlen($option_values); | |
| 697 | - } | |
| 698 | - } | |
| 684 | + // only make the field as big as it needs to be. | |
| 685 | +						if(isset($option_values) && $option_values && $field_type=='select'){
 | |
| 686 | +							$option_values_arr = explode(',',$option_values);
 | |
| 687 | +							if(is_array($option_values_arr)){
 | |
| 688 | + $op_max = 0; | |
| 689 | +								foreach($option_values_arr as $op_val){
 | |
| 690 | +									if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}
 | |
| 691 | + } | |
| 692 | +								if($op_max){$op_size =$op_max; }
 | |
| 693 | + } | |
| 694 | +						}elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
 | |
| 695 | +							if(strlen($option_values)){
 | |
| 696 | + $op_size = strlen($option_values); | |
| 697 | + } | |
| 698 | + } | |
| 699 | 699 | |
| 700 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL"; | |
| 700 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL"; | |
| 701 | 701 | |
| 702 | -                        if ($default_value != '') {
 | |
| 703 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 704 | - } | |
| 702 | +						if ($default_value != '') {
 | |
| 703 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 704 | + } | |
| 705 | 705 | |
| 706 | - $alter_result = $wpdb->query($meta_field_add); | |
| 707 | -                        if($alter_result===false){
 | |
| 708 | -                            return __('Column change failed, you may have too many columns.','geodirectory');
 | |
| 709 | - } | |
| 706 | + $alter_result = $wpdb->query($meta_field_add); | |
| 707 | +						if($alter_result===false){
 | |
| 708 | +							return __('Column change failed, you may have too many columns.','geodirectory');
 | |
| 709 | + } | |
| 710 | 710 | |
| 711 | - if (isset($request_field['cat_display_type'])) | |
| 712 | - $extra_fields = $request_field['cat_display_type']; | |
| 711 | + if (isset($request_field['cat_display_type'])) | |
| 712 | + $extra_fields = $request_field['cat_display_type']; | |
| 713 | 713 | |
| 714 | - if (isset($request_field['multi_display_type'])) | |
| 715 | - $extra_fields = $request_field['multi_display_type']; | |
| 714 | + if (isset($request_field['multi_display_type'])) | |
| 715 | + $extra_fields = $request_field['multi_display_type']; | |
| 716 | 716 | |
| 717 | 717 | |
| 718 | - break; | |
| 718 | + break; | |
| 719 | 719 | |
| 720 | - case 'textarea': | |
| 721 | - case 'html': | |
| 722 | - case 'url': | |
| 723 | - case 'file': | |
| 720 | + case 'textarea': | |
| 721 | + case 'html': | |
| 722 | + case 'url': | |
| 723 | + case 'file': | |
| 724 | 724 | |
| 725 | -                        $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");
 | |
| 726 | -                        if($alter_result===false){
 | |
| 727 | -                            return __('Column change failed, you may have too many columns.','geodirectory');
 | |
| 728 | - } | |
| 729 | - if (isset($request_field['advanced_editor'])) | |
| 730 | - $extra_fields = $request_field['advanced_editor']; | |
| 731 | - | |
| 732 | - break; | |
| 725 | +						$alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");
 | |
| 726 | +						if($alter_result===false){
 | |
| 727 | +							return __('Column change failed, you may have too many columns.','geodirectory');
 | |
| 728 | + } | |
| 729 | + if (isset($request_field['advanced_editor'])) | |
| 730 | + $extra_fields = $request_field['advanced_editor']; | |
| 731 | + | |
| 732 | + break; | |
| 733 | 733 | |
| 734 | - case 'fieldset': | |
| 735 | - // Nothing happened for fieldset | |
| 736 | - break; | |
| 734 | + case 'fieldset': | |
| 735 | + // Nothing happened for fieldset | |
| 736 | + break; | |
| 737 | 737 | |
| 738 | - default: | |
| 739 | -                        if ($data_type != 'VARCHAR' && $data_type != '') {
 | |
| 740 | -                            if ($data_type == 'FLOAT' && $decimal_point > 0) {
 | |
| 741 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL"; | |
| 742 | -                            } else {
 | |
| 743 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL"; | |
| 744 | - } | |
| 745 | - | |
| 746 | -                            if (is_numeric($default_value) && $default_value != '') {
 | |
| 747 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; | |
| 748 | - } | |
| 749 | -                        } else {
 | |
| 750 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL"; | |
| 751 | -                            if ($default_value != '') {
 | |
| 752 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; | |
| 753 | - } | |
| 754 | - } | |
| 755 | - | |
| 756 | - $alter_result = $wpdb->query($default_value_add); | |
| 757 | -                        if($alter_result===false){
 | |
| 758 | -                            return __('Column change failed, you may have too many columns.','geodirectory');
 | |
| 759 | - } | |
| 760 | - break; | |
| 761 | - endswitch; | |
| 762 | - | |
| 763 | - $extra_field_query = ''; | |
| 764 | -                if (!empty($extra_fields)) {
 | |
| 765 | - $extra_field_query = serialize($extra_fields); | |
| 766 | - } | |
| 767 | - | |
| 768 | - $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : ''; | |
| 769 | - | |
| 770 | - $wpdb->query( | |
| 771 | - | |
| 772 | - $wpdb->prepare( | |
| 773 | - | |
| 774 | - "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set | |
| 738 | + default: | |
| 739 | +						if ($data_type != 'VARCHAR' && $data_type != '') {
 | |
| 740 | +							if ($data_type == 'FLOAT' && $decimal_point > 0) {
 | |
| 741 | + $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL"; | |
| 742 | +							} else {
 | |
| 743 | + $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL"; | |
| 744 | + } | |
| 745 | + | |
| 746 | +							if (is_numeric($default_value) && $default_value != '') {
 | |
| 747 | + $default_value_add .= " DEFAULT '" . $default_value . "'"; | |
| 748 | + } | |
| 749 | +						} else {
 | |
| 750 | + $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL"; | |
| 751 | +							if ($default_value != '') {
 | |
| 752 | + $default_value_add .= " DEFAULT '" . $default_value . "'"; | |
| 753 | + } | |
| 754 | + } | |
| 755 | + | |
| 756 | + $alter_result = $wpdb->query($default_value_add); | |
| 757 | +						if($alter_result===false){
 | |
| 758 | +							return __('Column change failed, you may have too many columns.','geodirectory');
 | |
| 759 | + } | |
| 760 | + break; | |
| 761 | + endswitch; | |
| 762 | + | |
| 763 | + $extra_field_query = ''; | |
| 764 | +				if (!empty($extra_fields)) {
 | |
| 765 | + $extra_field_query = serialize($extra_fields); | |
| 766 | + } | |
| 767 | + | |
| 768 | + $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : ''; | |
| 769 | + | |
| 770 | + $wpdb->query( | |
| 771 | + | |
| 772 | + $wpdb->prepare( | |
| 773 | + | |
| 774 | + "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set | |
| 775 | 775 | post_type = %s, | 
| 776 | 776 | admin_title = %s, | 
| 777 | 777 | site_title = %s, | 
| @@ -805,308 +805,308 @@ discard block | ||
| 805 | 805 | for_admin_use = %s | 
| 806 | 806 | where id = %d", | 
| 807 | 807 | |
| 808 | - array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf) | |
| 809 | - ) | |
| 808 | + array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf) | |
| 809 | + ) | |
| 810 | 810 | |
| 811 | - ); | |
| 811 | + ); | |
| 812 | 812 | |
| 813 | - $lastid = trim($cf); | |
| 813 | + $lastid = trim($cf); | |
| 814 | 814 | |
| 815 | 815 | |
| 816 | - $wpdb->query( | |
| 817 | - $wpdb->prepare( | |
| 818 | - "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set | |
| 816 | + $wpdb->query( | |
| 817 | + $wpdb->prepare( | |
| 818 | + "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set | |
| 819 | 819 | site_title=%s | 
| 820 | 820 | where post_type = %s and htmlvar_name = %s", | 
| 821 | - array($site_title, $post_type, $htmlvar_name) | |
| 822 | - ) | |
| 823 | - ); | |
| 824 | - | |
| 825 | - | |
| 826 | - if ($cat_sort == '') | |
| 827 | -                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
 | |
| 828 | - | |
| 829 | - | |
| 830 | - /** | |
| 831 | - * Called after all custom fields are saved for a post. | |
| 832 | - * | |
| 833 | - * @since 1.0.0 | |
| 834 | - * @param int $lastid The post ID. | |
| 835 | - */ | |
| 836 | -                do_action('geodir_after_custom_fields_updated', $lastid);
 | |
| 837 | - | |
| 838 | -            } else {
 | |
| 839 | - | |
| 840 | - switch ($field_type): | |
| 841 | - | |
| 842 | - case 'address': | |
| 843 | - | |
| 844 | - $data_type = ''; | |
| 845 | - | |
| 846 | -                        if ($htmlvar_name != '') {
 | |
| 847 | - $prefix = $htmlvar_name . '_'; | |
| 848 | - } | |
| 849 | - $old_prefix = $old_html_variable; | |
| 850 | - | |
| 851 | - //$meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."address` VARCHAR( 254 ) NULL"; | |
| 852 | - | |
| 853 | - $meta_field_add = "VARCHAR( 254 ) NULL"; | |
| 854 | -                        if ($default_value != '') {
 | |
| 855 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 856 | - } | |
| 857 | - | |
| 858 | - geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add); | |
| 859 | - //$wpdb->query($meta_field_add); | |
| 860 | - | |
| 861 | - | |
| 862 | -                        if (!empty($extra_fields)) {
 | |
| 821 | + array($site_title, $post_type, $htmlvar_name) | |
| 822 | + ) | |
| 823 | + ); | |
| 824 | + | |
| 825 | + | |
| 826 | + if ($cat_sort == '') | |
| 827 | +					$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
 | |
| 828 | + | |
| 829 | + | |
| 830 | + /** | |
| 831 | + * Called after all custom fields are saved for a post. | |
| 832 | + * | |
| 833 | + * @since 1.0.0 | |
| 834 | + * @param int $lastid The post ID. | |
| 835 | + */ | |
| 836 | +				do_action('geodir_after_custom_fields_updated', $lastid);
 | |
| 837 | + | |
| 838 | +			} else {
 | |
| 839 | + | |
| 840 | + switch ($field_type): | |
| 841 | + | |
| 842 | + case 'address': | |
| 843 | + | |
| 844 | + $data_type = ''; | |
| 845 | + | |
| 846 | +						if ($htmlvar_name != '') {
 | |
| 847 | + $prefix = $htmlvar_name . '_'; | |
| 848 | + } | |
| 849 | + $old_prefix = $old_html_variable; | |
| 850 | + | |
| 851 | + //$meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."address` VARCHAR( 254 ) NULL"; | |
| 852 | + | |
| 853 | + $meta_field_add = "VARCHAR( 254 ) NULL"; | |
| 854 | +						if ($default_value != '') {
 | |
| 855 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 856 | + } | |
| 857 | + | |
| 858 | + geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add); | |
| 859 | + //$wpdb->query($meta_field_add); | |
| 860 | + | |
| 861 | + | |
| 862 | +						if (!empty($extra_fields)) {
 | |
| 863 | 863 | |
| 864 | -                            if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
 | |
| 865 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL"; | |
| 866 | - $meta_field_add = "VARCHAR( 30 ) NULL"; | |
| 867 | -                                if ($default_value != '') {
 | |
| 868 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 869 | - } | |
| 870 | - | |
| 871 | - geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add); | |
| 872 | - //$wpdb->query($meta_field_add); | |
| 873 | - } | |
| 874 | -                            if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
 | |
| 875 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL"; | |
| 876 | - $meta_field_add = "VARCHAR( 30 ) NULL"; | |
| 877 | -                                if ($default_value != '') {
 | |
| 878 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 879 | - } | |
| 880 | - | |
| 881 | - geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add); | |
| 882 | - //$wpdb->query($meta_field_add); | |
| 883 | - } | |
| 884 | -                            if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
 | |
| 885 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL"; | |
| 886 | - | |
| 887 | - $meta_field_add = "VARCHAR( 30 ) NULL"; | |
| 888 | -                                if ($default_value != '') {
 | |
| 889 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 890 | - } | |
| 891 | - | |
| 892 | - geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add); | |
| 893 | - //$wpdb->query($meta_field_add); | |
| 894 | - } | |
| 895 | -                            if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
 | |
| 896 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL"; | |
| 897 | - $meta_field_add = "VARCHAR( 15 ) NULL"; | |
| 898 | -                                if ($default_value != '') {
 | |
| 899 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 900 | - } | |
| 901 | - | |
| 902 | - geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add); | |
| 903 | - //$wpdb->query($meta_field_add); | |
| 904 | - } | |
| 905 | -                            if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
 | |
| 906 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; | |
| 907 | - $meta_field_add = "VARCHAR( 20 ) NULL"; | |
| 908 | -                                if ($default_value != '') {
 | |
| 909 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 910 | - } | |
| 911 | - | |
| 912 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add); | |
| 913 | - //$wpdb->query($meta_field_add); | |
| 914 | - | |
| 915 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; | |
| 916 | - | |
| 917 | - $meta_field_add = "VARCHAR( 20 ) NULL"; | |
| 918 | -                                if ($default_value != '') {
 | |
| 919 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 920 | - } | |
| 921 | - | |
| 922 | - geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add); | |
| 923 | - | |
| 924 | - //$wpdb->query($meta_field_add); | |
| 925 | - } | |
| 926 | -                            if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
 | |
| 927 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; | |
| 928 | - | |
| 929 | - $meta_field_add = "VARCHAR( 15 ) NULL"; | |
| 930 | -                                if ($default_value != '') {
 | |
| 931 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 932 | - } | |
| 933 | - | |
| 934 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add); | |
| 935 | - | |
| 936 | - //$wpdb->query($meta_field_add); | |
| 937 | - } | |
| 938 | -                            if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
 | |
| 939 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; | |
| 940 | - | |
| 941 | - $meta_field_add = "VARCHAR( 3 ) NULL"; | |
| 942 | -                                if ($default_value != '') {
 | |
| 943 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 944 | - } | |
| 945 | - | |
| 946 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add); | |
| 947 | - | |
| 948 | - //$wpdb->query($meta_field_add); | |
| 949 | - } | |
| 950 | - // show lat lng | |
| 951 | -                            if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
 | |
| 952 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; | |
| 953 | - | |
| 954 | - $meta_field_add = "VARCHAR( 3 ) NULL"; | |
| 955 | - $meta_field_add .= " DEFAULT '1'"; | |
| 956 | - | |
| 957 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add); | |
| 958 | - //$wpdb->query($meta_field_add); | |
| 959 | - } | |
| 960 | - } | |
| 961 | - | |
| 962 | - break; | |
| 963 | - | |
| 964 | - case 'checkbox': | |
| 965 | - $data_type = 'TINYINT'; | |
| 966 | - | |
| 967 | - $meta_field_add = $data_type . "( 1 ) NOT NULL "; | |
| 968 | -                        if ((int)$default_value === 1) {
 | |
| 969 | - $meta_field_add .= " DEFAULT '1'"; | |
| 970 | - } | |
| 971 | - | |
| 972 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); | |
| 973 | -                        if ($add_result === false) {
 | |
| 974 | -                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
 | |
| 975 | - } | |
| 976 | - break; | |
| 977 | - case 'multiselect': | |
| 978 | - case 'select': | |
| 979 | - $data_type = 'VARCHAR'; | |
| 980 | - $op_size = '500'; | |
| 981 | - | |
| 982 | - // only make the field as big as it needs to be. | |
| 983 | -                        if (isset($option_values) && $option_values && $field_type == 'select') {
 | |
| 984 | -                            $option_values_arr = explode(',', $option_values);
 | |
| 985 | - | |
| 986 | -                            if (is_array($option_values_arr)) {
 | |
| 987 | - $op_max = 0; | |
| 988 | - | |
| 989 | -                                foreach ($option_values_arr as $op_val) {
 | |
| 990 | -                                    if (strlen($op_val) && strlen($op_val) > $op_max) {
 | |
| 991 | - $op_max = strlen($op_val); | |
| 992 | - } | |
| 993 | - } | |
| 994 | - | |
| 995 | -                                if ($op_max) {
 | |
| 996 | - $op_size = $op_max; | |
| 997 | - } | |
| 998 | - } | |
| 999 | -                        } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
 | |
| 1000 | -                            if (strlen($option_values)) {
 | |
| 1001 | - $op_size = strlen($option_values); | |
| 1002 | - } | |
| 1003 | - | |
| 1004 | -                            if (isset($request_field['multi_display_type'])) {
 | |
| 1005 | - $extra_fields = $request_field['multi_display_type']; | |
| 1006 | - } | |
| 1007 | - } | |
| 1008 | - | |
| 1009 | - $meta_field_add = $data_type . "( $op_size ) NULL "; | |
| 1010 | -                        if ($default_value != '') {
 | |
| 1011 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 1012 | - } | |
| 1013 | - | |
| 1014 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); | |
| 1015 | -                        if ($add_result === false) {
 | |
| 1016 | -                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
 | |
| 1017 | - } | |
| 1018 | - break; | |
| 1019 | - case 'textarea': | |
| 1020 | - case 'html': | |
| 1021 | - case 'url': | |
| 1022 | - case 'file': | |
| 1023 | - | |
| 1024 | - $data_type = 'TEXT'; | |
| 1025 | - | |
| 1026 | - $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; | |
| 1027 | - | |
| 1028 | - $meta_field_add = $data_type . " NULL "; | |
| 1029 | - /*if($default_value != '') | |
| 864 | +							if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
 | |
| 865 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL"; | |
| 866 | + $meta_field_add = "VARCHAR( 30 ) NULL"; | |
| 867 | +								if ($default_value != '') {
 | |
| 868 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 869 | + } | |
| 870 | + | |
| 871 | + geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add); | |
| 872 | + //$wpdb->query($meta_field_add); | |
| 873 | + } | |
| 874 | +							if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
 | |
| 875 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL"; | |
| 876 | + $meta_field_add = "VARCHAR( 30 ) NULL"; | |
| 877 | +								if ($default_value != '') {
 | |
| 878 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 879 | + } | |
| 880 | + | |
| 881 | + geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add); | |
| 882 | + //$wpdb->query($meta_field_add); | |
| 883 | + } | |
| 884 | +							if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
 | |
| 885 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL"; | |
| 886 | + | |
| 887 | + $meta_field_add = "VARCHAR( 30 ) NULL"; | |
| 888 | +								if ($default_value != '') {
 | |
| 889 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 890 | + } | |
| 891 | + | |
| 892 | + geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add); | |
| 893 | + //$wpdb->query($meta_field_add); | |
| 894 | + } | |
| 895 | +							if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
 | |
| 896 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL"; | |
| 897 | + $meta_field_add = "VARCHAR( 15 ) NULL"; | |
| 898 | +								if ($default_value != '') {
 | |
| 899 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 900 | + } | |
| 901 | + | |
| 902 | + geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add); | |
| 903 | + //$wpdb->query($meta_field_add); | |
| 904 | + } | |
| 905 | +							if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
 | |
| 906 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; | |
| 907 | + $meta_field_add = "VARCHAR( 20 ) NULL"; | |
| 908 | +								if ($default_value != '') {
 | |
| 909 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 910 | + } | |
| 911 | + | |
| 912 | + geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add); | |
| 913 | + //$wpdb->query($meta_field_add); | |
| 914 | + | |
| 915 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; | |
| 916 | + | |
| 917 | + $meta_field_add = "VARCHAR( 20 ) NULL"; | |
| 918 | +								if ($default_value != '') {
 | |
| 919 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 920 | + } | |
| 921 | + | |
| 922 | + geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add); | |
| 923 | + | |
| 924 | + //$wpdb->query($meta_field_add); | |
| 925 | + } | |
| 926 | +							if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
 | |
| 927 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; | |
| 928 | + | |
| 929 | + $meta_field_add = "VARCHAR( 15 ) NULL"; | |
| 930 | +								if ($default_value != '') {
 | |
| 931 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 932 | + } | |
| 933 | + | |
| 934 | + geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add); | |
| 935 | + | |
| 936 | + //$wpdb->query($meta_field_add); | |
| 937 | + } | |
| 938 | +							if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
 | |
| 939 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; | |
| 940 | + | |
| 941 | + $meta_field_add = "VARCHAR( 3 ) NULL"; | |
| 942 | +								if ($default_value != '') {
 | |
| 943 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 944 | + } | |
| 945 | + | |
| 946 | + geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add); | |
| 947 | + | |
| 948 | + //$wpdb->query($meta_field_add); | |
| 949 | + } | |
| 950 | + // show lat lng | |
| 951 | +							if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
 | |
| 952 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; | |
| 953 | + | |
| 954 | + $meta_field_add = "VARCHAR( 3 ) NULL"; | |
| 955 | + $meta_field_add .= " DEFAULT '1'"; | |
| 956 | + | |
| 957 | + geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add); | |
| 958 | + //$wpdb->query($meta_field_add); | |
| 959 | + } | |
| 960 | + } | |
| 961 | + | |
| 962 | + break; | |
| 963 | + | |
| 964 | + case 'checkbox': | |
| 965 | + $data_type = 'TINYINT'; | |
| 966 | + | |
| 967 | + $meta_field_add = $data_type . "( 1 ) NOT NULL "; | |
| 968 | +						if ((int)$default_value === 1) {
 | |
| 969 | + $meta_field_add .= " DEFAULT '1'"; | |
| 970 | + } | |
| 971 | + | |
| 972 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); | |
| 973 | +						if ($add_result === false) {
 | |
| 974 | +							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
 | |
| 975 | + } | |
| 976 | + break; | |
| 977 | + case 'multiselect': | |
| 978 | + case 'select': | |
| 979 | + $data_type = 'VARCHAR'; | |
| 980 | + $op_size = '500'; | |
| 981 | + | |
| 982 | + // only make the field as big as it needs to be. | |
| 983 | +						if (isset($option_values) && $option_values && $field_type == 'select') {
 | |
| 984 | +							$option_values_arr = explode(',', $option_values);
 | |
| 985 | + | |
| 986 | +							if (is_array($option_values_arr)) {
 | |
| 987 | + $op_max = 0; | |
| 988 | + | |
| 989 | +								foreach ($option_values_arr as $op_val) {
 | |
| 990 | +									if (strlen($op_val) && strlen($op_val) > $op_max) {
 | |
| 991 | + $op_max = strlen($op_val); | |
| 992 | + } | |
| 993 | + } | |
| 994 | + | |
| 995 | +								if ($op_max) {
 | |
| 996 | + $op_size = $op_max; | |
| 997 | + } | |
| 998 | + } | |
| 999 | +						} elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
 | |
| 1000 | +							if (strlen($option_values)) {
 | |
| 1001 | + $op_size = strlen($option_values); | |
| 1002 | + } | |
| 1003 | + | |
| 1004 | +							if (isset($request_field['multi_display_type'])) {
 | |
| 1005 | + $extra_fields = $request_field['multi_display_type']; | |
| 1006 | + } | |
| 1007 | + } | |
| 1008 | + | |
| 1009 | + $meta_field_add = $data_type . "( $op_size ) NULL "; | |
| 1010 | +						if ($default_value != '') {
 | |
| 1011 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 1012 | + } | |
| 1013 | + | |
| 1014 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); | |
| 1015 | +						if ($add_result === false) {
 | |
| 1016 | +							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
 | |
| 1017 | + } | |
| 1018 | + break; | |
| 1019 | + case 'textarea': | |
| 1020 | + case 'html': | |
| 1021 | + case 'url': | |
| 1022 | + case 'file': | |
| 1023 | + | |
| 1024 | + $data_type = 'TEXT'; | |
| 1025 | + | |
| 1026 | + $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; | |
| 1027 | + | |
| 1028 | + $meta_field_add = $data_type . " NULL "; | |
| 1029 | + /*if($default_value != '') | |
| 1030 | 1030 |  					{ $meta_field_add .= " DEFAULT '".$default_value."'"; }*/
 | 
| 1031 | 1031 | |
| 1032 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); | |
| 1033 | -                        if ($add_result === false) {
 | |
| 1034 | -                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
 | |
| 1035 | - } | |
| 1032 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); | |
| 1033 | +						if ($add_result === false) {
 | |
| 1034 | +							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
 | |
| 1035 | + } | |
| 1036 | 1036 | |
| 1037 | - break; | |
| 1037 | + break; | |
| 1038 | 1038 | |
| 1039 | - case 'datepicker': | |
| 1039 | + case 'datepicker': | |
| 1040 | 1040 | |
| 1041 | - $data_type = 'DATE'; | |
| 1041 | + $data_type = 'DATE'; | |
| 1042 | 1042 | |
| 1043 | - $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; | |
| 1043 | + $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; | |
| 1044 | 1044 | |
| 1045 | - $meta_field_add = $data_type . " NULL "; | |
| 1045 | + $meta_field_add = $data_type . " NULL "; | |
| 1046 | 1046 | |
| 1047 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); | |
| 1048 | -                        if ($add_result === false) {
 | |
| 1049 | -                            return __('Column creation failed, you may have too many columns or the default value must have in valid date format.', 'geodirectory');
 | |
| 1050 | - } | |
| 1047 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); | |
| 1048 | +						if ($add_result === false) {
 | |
| 1049 | +							return __('Column creation failed, you may have too many columns or the default value must have in valid date format.', 'geodirectory');
 | |
| 1050 | + } | |
| 1051 | 1051 | |
| 1052 | - break; | |
| 1052 | + break; | |
| 1053 | 1053 | |
| 1054 | - case 'time': | |
| 1054 | + case 'time': | |
| 1055 | 1055 | |
| 1056 | - $data_type = 'TIME'; | |
| 1056 | + $data_type = 'TIME'; | |
| 1057 | 1057 | |
| 1058 | - $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; | |
| 1058 | + $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; | |
| 1059 | 1059 | |
| 1060 | - $meta_field_add = $data_type . " NULL "; | |
| 1060 | + $meta_field_add = $data_type . " NULL "; | |
| 1061 | 1061 | |
| 1062 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); | |
| 1063 | -                        if ($add_result === false) {
 | |
| 1064 | -                            return __('Column creation failed, you may have too many columns or the default value must have in valid time format.', 'geodirectory');
 | |
| 1065 | - } | |
| 1062 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); | |
| 1063 | +						if ($add_result === false) {
 | |
| 1064 | +							return __('Column creation failed, you may have too many columns or the default value must have in valid time format.', 'geodirectory');
 | |
| 1065 | + } | |
| 1066 | 1066 | |
| 1067 | - break; | |
| 1067 | + break; | |
| 1068 | 1068 | |
| 1069 | - default: | |
| 1069 | + default: | |
| 1070 | 1070 | |
| 1071 | -                        if ($data_type != 'VARCHAR' && $data_type != '') {
 | |
| 1072 | - $meta_field_add = $data_type . " NULL "; | |
| 1071 | +						if ($data_type != 'VARCHAR' && $data_type != '') {
 | |
| 1072 | + $meta_field_add = $data_type . " NULL "; | |
| 1073 | 1073 | |
| 1074 | -                            if ($data_type == 'FLOAT' && $decimal_point > 0) {
 | |
| 1075 | - $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL "; | |
| 1076 | - } | |
| 1074 | +							if ($data_type == 'FLOAT' && $decimal_point > 0) {
 | |
| 1075 | + $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL "; | |
| 1076 | + } | |
| 1077 | 1077 | |
| 1078 | -                            if (is_numeric($default_value) && $default_value != '') {
 | |
| 1079 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; | |
| 1080 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 1081 | - } | |
| 1082 | -                        } else {
 | |
| 1083 | - $meta_field_add = " VARCHAR( 254 ) NULL "; | |
| 1078 | +							if (is_numeric($default_value) && $default_value != '') {
 | |
| 1079 | + $default_value_add .= " DEFAULT '" . $default_value . "'"; | |
| 1080 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 1081 | + } | |
| 1082 | +						} else {
 | |
| 1083 | + $meta_field_add = " VARCHAR( 254 ) NULL "; | |
| 1084 | 1084 | |
| 1085 | -                            if ($default_value != '') {
 | |
| 1086 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; | |
| 1087 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 1088 | - } | |
| 1089 | - } | |
| 1085 | +							if ($default_value != '') {
 | |
| 1086 | + $default_value_add .= " DEFAULT '" . $default_value . "'"; | |
| 1087 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 1088 | + } | |
| 1089 | + } | |
| 1090 | 1090 | |
| 1091 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); | |
| 1092 | -                        if ($add_result === false) {
 | |
| 1093 | -                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
 | |
| 1094 | - } | |
| 1095 | - break; | |
| 1096 | - endswitch; | |
| 1091 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); | |
| 1092 | +						if ($add_result === false) {
 | |
| 1093 | +							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
 | |
| 1094 | + } | |
| 1095 | + break; | |
| 1096 | + endswitch; | |
| 1097 | 1097 | |
| 1098 | - $extra_field_query = ''; | |
| 1099 | -                if (!empty($extra_fields)) {
 | |
| 1100 | - $extra_field_query = serialize($extra_fields); | |
| 1101 | - } | |
| 1098 | + $extra_field_query = ''; | |
| 1099 | +				if (!empty($extra_fields)) {
 | |
| 1100 | + $extra_field_query = serialize($extra_fields); | |
| 1101 | + } | |
| 1102 | 1102 | |
| 1103 | - $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : ''; | |
| 1103 | + $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : ''; | |
| 1104 | 1104 | |
| 1105 | - $wpdb->query( | |
| 1105 | + $wpdb->query( | |
| 1106 | 1106 | |
| 1107 | - $wpdb->prepare( | |
| 1107 | + $wpdb->prepare( | |
| 1108 | 1108 | |
| 1109 | - "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set | |
| 1109 | + "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set | |
| 1110 | 1110 | post_type = %s, | 
| 1111 | 1111 | admin_title = %s, | 
| 1112 | 1112 | site_title = %s, | 
| @@ -1139,26 +1139,26 @@ discard block | ||
| 1139 | 1139 | validation_msg = %s, | 
| 1140 | 1140 | for_admin_use = %s ", | 
| 1141 | 1141 | |
| 1142 | - array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use) | |
| 1142 | + array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use) | |
| 1143 | 1143 | |
| 1144 | - ) | |
| 1144 | + ) | |
| 1145 | 1145 | |
| 1146 | - ); | |
| 1146 | + ); | |
| 1147 | 1147 | |
| 1148 | - $lastid = $wpdb->insert_id; | |
| 1148 | + $lastid = $wpdb->insert_id; | |
| 1149 | 1149 | |
| 1150 | - $lastid = trim($lastid); | |
| 1150 | + $lastid = trim($lastid); | |
| 1151 | 1151 | |
| 1152 | - } | |
| 1152 | + } | |
| 1153 | 1153 | |
| 1154 | - return (int)$lastid; | |
| 1154 | + return (int)$lastid; | |
| 1155 | 1155 | |
| 1156 | 1156 | |
| 1157 | -        } else {
 | |
| 1158 | - return 'HTML Variable Name should be a unique name'; | |
| 1159 | - } | |
| 1157 | +		} else {
 | |
| 1158 | + return 'HTML Variable Name should be a unique name'; | |
| 1159 | + } | |
| 1160 | 1160 | |
| 1161 | - } | |
| 1161 | + } | |
| 1162 | 1162 | } | 
| 1163 | 1163 | |
| 1164 | 1164 | /** | 
| @@ -1173,54 +1173,54 @@ discard block | ||
| 1173 | 1173 | function godir_set_field_order($field_ids = array()) | 
| 1174 | 1174 |  {
 | 
| 1175 | 1175 | |
| 1176 | - global $wpdb; | |
| 1176 | + global $wpdb; | |
| 1177 | 1177 | |
| 1178 | - $count = 0; | |
| 1179 | - if (!empty($field_ids)): | |
| 1180 | - $post_meta_info = false; | |
| 1181 | -        foreach ($field_ids as $id) {
 | |
| 1178 | + $count = 0; | |
| 1179 | + if (!empty($field_ids)): | |
| 1180 | + $post_meta_info = false; | |
| 1181 | +		foreach ($field_ids as $id) {
 | |
| 1182 | 1182 | |
| 1183 | - $cf = trim($id, '_'); | |
| 1183 | + $cf = trim($id, '_'); | |
| 1184 | 1184 | |
| 1185 | - $post_meta_info = $wpdb->query( | |
| 1186 | - $wpdb->prepare( | |
| 1187 | - "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set | |
| 1185 | + $post_meta_info = $wpdb->query( | |
| 1186 | + $wpdb->prepare( | |
| 1187 | + "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set | |
| 1188 | 1188 | sort_order=%d | 
| 1189 | 1189 | where id= %d", | 
| 1190 | - array($count, $cf) | |
| 1191 | - ) | |
| 1192 | - ); | |
| 1193 | - $count++; | |
| 1194 | - } | |
| 1195 | - | |
| 1196 | - return $post_meta_info; | |
| 1197 | - else: | |
| 1198 | - return false; | |
| 1199 | - endif; | |
| 1190 | + array($count, $cf) | |
| 1191 | + ) | |
| 1192 | + ); | |
| 1193 | + $count++; | |
| 1194 | + } | |
| 1195 | + | |
| 1196 | + return $post_meta_info; | |
| 1197 | + else: | |
| 1198 | + return false; | |
| 1199 | + endif; | |
| 1200 | 1200 | } | 
| 1201 | 1201 | |
| 1202 | 1202 | |
| 1203 | 1203 |  function geodir_get_cf_value($cf){
 | 
| 1204 | - global $gd_session; | |
| 1205 | - $value = ''; | |
| 1206 | -    if (is_admin()) {
 | |
| 1207 | - global $post,$gd_session; | |
| 1208 | - | |
| 1209 | - if (isset($_REQUEST['post'])) | |
| 1210 | - $_REQUEST['pid'] = $_REQUEST['post']; | |
| 1211 | - } | |
| 1212 | - | |
| 1213 | -    if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
 | |
| 1214 | - $post = $gd_ses_listing; | |
| 1215 | - $value = isset($post[$cf['name']]) ? $post[$cf['name']] : ''; | |
| 1216 | -    } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
 | |
| 1217 | - $value = geodir_get_post_meta($_REQUEST['pid'], $cf['name'], true); | |
| 1218 | -    } else {
 | |
| 1219 | -        if ($value == '') {
 | |
| 1220 | - $value = $cf['default']; | |
| 1221 | - } | |
| 1222 | - } | |
| 1223 | - return $value; | |
| 1204 | + global $gd_session; | |
| 1205 | + $value = ''; | |
| 1206 | +	if (is_admin()) {
 | |
| 1207 | + global $post,$gd_session; | |
| 1208 | + | |
| 1209 | + if (isset($_REQUEST['post'])) | |
| 1210 | + $_REQUEST['pid'] = $_REQUEST['post']; | |
| 1211 | + } | |
| 1212 | + | |
| 1213 | +	if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
 | |
| 1214 | + $post = $gd_ses_listing; | |
| 1215 | + $value = isset($post[$cf['name']]) ? $post[$cf['name']] : ''; | |
| 1216 | +	} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
 | |
| 1217 | + $value = geodir_get_post_meta($_REQUEST['pid'], $cf['name'], true); | |
| 1218 | +	} else {
 | |
| 1219 | +		if ($value == '') {
 | |
| 1220 | + $value = $cf['default']; | |
| 1221 | + } | |
| 1222 | + } | |
| 1223 | + return $value; | |
| 1224 | 1224 | } | 
| 1225 | 1225 | |
| 1226 | 1226 | /** | 
| @@ -1239,422 +1239,422 @@ discard block | ||
| 1239 | 1239 | * @param string $post_type Optional. The wordpress post type. | 
| 1240 | 1240 | */ | 
| 1241 | 1241 |  function geodir_get_custom_fields_html($package_id = '', $default = 'custom', $post_type = 'gd_place') {
 | 
| 1242 | - global $is_default, $mapzoom, $gd_session; | |
| 1242 | + global $is_default, $mapzoom, $gd_session; | |
| 1243 | 1243 | |
| 1244 | - $listing_type = $post_type; | |
| 1244 | + $listing_type = $post_type; | |
| 1245 | 1245 | |
| 1246 | - $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type); | |
| 1246 | + $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type); | |
| 1247 | 1247 | |
| 1248 | -    foreach ($custom_fields as $key => $val) {
 | |
| 1249 | -        if(isset($val['extra_fields'])){$extra_fields = $val['extra_fields'];}
 | |
| 1250 | - $val = stripslashes_deep($val); // strip slashes from labels | |
| 1251 | -        if(isset($val['extra_fields'])){$val['extra_fields'] = $extra_fields;}
 | |
| 1248 | +	foreach ($custom_fields as $key => $val) {
 | |
| 1249 | +		if(isset($val['extra_fields'])){$extra_fields = $val['extra_fields'];}
 | |
| 1250 | + $val = stripslashes_deep($val); // strip slashes from labels | |
| 1251 | +		if(isset($val['extra_fields'])){$val['extra_fields'] = $extra_fields;}
 | |
| 1252 | 1252 | |
| 1253 | - $name = $val['name']; | |
| 1254 | - $type = $val['type']; | |
| 1255 | - $is_default = $val['is_default']; | |
| 1253 | + $name = $val['name']; | |
| 1254 | + $type = $val['type']; | |
| 1255 | + $is_default = $val['is_default']; | |
| 1256 | 1256 | |
| 1257 | - /* field available to site admin only for edit */ | |
| 1258 | - $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false; | |
| 1259 | -        if ($for_admin_use && !is_super_admin()) {
 | |
| 1260 | - continue; | |
| 1261 | - } | |
| 1257 | + /* field available to site admin only for edit */ | |
| 1258 | + $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false; | |
| 1259 | +		if ($for_admin_use && !is_super_admin()) {
 | |
| 1260 | + continue; | |
| 1261 | + } | |
| 1262 | 1262 | |
| 1263 | -        if (is_admin()) {
 | |
| 1264 | - global $post; | |
| 1263 | +		if (is_admin()) {
 | |
| 1264 | + global $post; | |
| 1265 | 1265 | |
| 1266 | - if (isset($_REQUEST['post'])) | |
| 1267 | - $_REQUEST['pid'] = $_REQUEST['post']; | |
| 1268 | - } | |
| 1266 | + if (isset($_REQUEST['post'])) | |
| 1267 | + $_REQUEST['pid'] = $_REQUEST['post']; | |
| 1268 | + } | |
| 1269 | 1269 | |
| 1270 | 1270 | |
| 1271 | 1271 | |
| 1272 | - /** | |
| 1273 | - * Called before the custom fields info is output for submitting a post. | |
| 1274 | - * | |
| 1275 | - * Used dynamic hook type geodir_before_custom_form_field_$name. | |
| 1276 | - * | |
| 1277 | - * @since 1.0.0 | |
| 1278 | - * @param string $listing_type The post post type. | |
| 1279 | - * @param int $package_id The price package ID for the post. | |
| 1280 | -         * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
 | |
| 1281 | - * @see 'geodir_after_custom_form_field_$name' | |
| 1282 | - */ | |
| 1283 | -        do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);
 | |
| 1284 | - | |
| 1285 | - | |
| 1286 | - $custom_field = $val; | |
| 1287 | - $html =''; | |
| 1288 | - /** | |
| 1289 | - * Filter the output for custom fields. | |
| 1290 | - * | |
| 1291 | - * Here we can remove or add new functions depending on the field type. | |
| 1292 | - * | |
| 1293 | - * @param string $html The html to be filtered (blank). | |
| 1294 | - * @param array $custom_field The custom field array values. | |
| 1295 | - */ | |
| 1296 | -        echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);
 | |
| 1297 | - | |
| 1298 | - | |
| 1299 | - | |
| 1300 | - /** | |
| 1301 | - * Called after the custom fields info is output for submitting a post. | |
| 1302 | - * | |
| 1303 | - * Used dynamic hook type geodir_after_custom_form_field_$name. | |
| 1304 | - * | |
| 1305 | - * @since 1.0.0 | |
| 1306 | - * @param string $listing_type The post post type. | |
| 1307 | - * @param int $package_id The price package ID for the post. | |
| 1308 | -         * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
 | |
| 1309 | - * @see 'geodir_before_custom_form_field_$name' | |
| 1310 | - */ | |
| 1311 | -        do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);
 | |
| 1312 | - | |
| 1313 | - } | |
| 1272 | + /** | |
| 1273 | + * Called before the custom fields info is output for submitting a post. | |
| 1274 | + * | |
| 1275 | + * Used dynamic hook type geodir_before_custom_form_field_$name. | |
| 1276 | + * | |
| 1277 | + * @since 1.0.0 | |
| 1278 | + * @param string $listing_type The post post type. | |
| 1279 | + * @param int $package_id The price package ID for the post. | |
| 1280 | +		 * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
 | |
| 1281 | + * @see 'geodir_after_custom_form_field_$name' | |
| 1282 | + */ | |
| 1283 | +		do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);
 | |
| 1284 | + | |
| 1285 | + | |
| 1286 | + $custom_field = $val; | |
| 1287 | + $html =''; | |
| 1288 | + /** | |
| 1289 | + * Filter the output for custom fields. | |
| 1290 | + * | |
| 1291 | + * Here we can remove or add new functions depending on the field type. | |
| 1292 | + * | |
| 1293 | + * @param string $html The html to be filtered (blank). | |
| 1294 | + * @param array $custom_field The custom field array values. | |
| 1295 | + */ | |
| 1296 | +		echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);
 | |
| 1297 | + | |
| 1298 | + | |
| 1299 | + | |
| 1300 | + /** | |
| 1301 | + * Called after the custom fields info is output for submitting a post. | |
| 1302 | + * | |
| 1303 | + * Used dynamic hook type geodir_after_custom_form_field_$name. | |
| 1304 | + * | |
| 1305 | + * @since 1.0.0 | |
| 1306 | + * @param string $listing_type The post post type. | |
| 1307 | + * @param int $package_id The price package ID for the post. | |
| 1308 | +		 * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
 | |
| 1309 | + * @see 'geodir_before_custom_form_field_$name' | |
| 1310 | + */ | |
| 1311 | +		do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);
 | |
| 1312 | + | |
| 1313 | + } | |
| 1314 | 1314 | |
| 1315 | 1315 | } | 
| 1316 | 1316 | |
| 1317 | 1317 | |
| 1318 | 1318 |  if (!function_exists('geodir_get_field_infoby')) {
 | 
| 1319 | - /** | |
| 1320 | - * Get custom field using key and value. | |
| 1321 | - * | |
| 1322 | - * @since 1.0.0 | |
| 1323 | - * @package GeoDirectory | |
| 1324 | - * @global object $wpdb WordPress Database object. | |
| 1325 | - * @param string $key The key you want to look for. | |
| 1326 | - * @param string $value The value of the key you want to look for. | |
| 1327 | - * @param string $geodir_post_type The post type. | |
| 1328 | - * @return bool|mixed Returns field info when available. otherwise returns false. | |
| 1329 | - */ | |
| 1330 | - function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '') | |
| 1331 | -    {
 | |
| 1332 | - | |
| 1333 | - global $wpdb; | |
| 1334 | - | |
| 1335 | - $filter = $wpdb->get_row( | |
| 1336 | - $wpdb->prepare( | |
| 1337 | - "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'", | |
| 1338 | - array($geodir_post_type) | |
| 1339 | - ) | |
| 1340 | - ); | |
| 1341 | - | |
| 1342 | -        if ($filter) {
 | |
| 1343 | - return $filter; | |
| 1344 | -        } else {
 | |
| 1345 | - return false; | |
| 1346 | - } | |
| 1347 | - | |
| 1348 | - } | |
| 1319 | + /** | |
| 1320 | + * Get custom field using key and value. | |
| 1321 | + * | |
| 1322 | + * @since 1.0.0 | |
| 1323 | + * @package GeoDirectory | |
| 1324 | + * @global object $wpdb WordPress Database object. | |
| 1325 | + * @param string $key The key you want to look for. | |
| 1326 | + * @param string $value The value of the key you want to look for. | |
| 1327 | + * @param string $geodir_post_type The post type. | |
| 1328 | + * @return bool|mixed Returns field info when available. otherwise returns false. | |
| 1329 | + */ | |
| 1330 | + function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '') | |
| 1331 | +	{
 | |
| 1332 | + | |
| 1333 | + global $wpdb; | |
| 1334 | + | |
| 1335 | + $filter = $wpdb->get_row( | |
| 1336 | + $wpdb->prepare( | |
| 1337 | + "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'", | |
| 1338 | + array($geodir_post_type) | |
| 1339 | + ) | |
| 1340 | + ); | |
| 1341 | + | |
| 1342 | +		if ($filter) {
 | |
| 1343 | + return $filter; | |
| 1344 | +		} else {
 | |
| 1345 | + return false; | |
| 1346 | + } | |
| 1347 | + | |
| 1348 | + } | |
| 1349 | 1349 | } | 
| 1350 | 1350 | |
| 1351 | 1351 | |
| 1352 | 1352 |  function geodir_field_icon_proccess($cf){
 | 
| 1353 | 1353 | |
| 1354 | 1354 | |
| 1355 | -    if (strpos($cf['field_icon'], 'http') !== false) {
 | |
| 1356 | -        $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
 | |
| 1357 | -    } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
 | |
| 1358 | - $field_icon = '<i class="' . $cf['field_icon'] . '"></i>'; | |
| 1359 | -    }else{
 | |
| 1360 | - $field_icon = $cf['field_icon']; | |
| 1361 | - } | |
| 1355 | +	if (strpos($cf['field_icon'], 'http') !== false) {
 | |
| 1356 | +		$field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
 | |
| 1357 | +	} elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
 | |
| 1358 | + $field_icon = '<i class="' . $cf['field_icon'] . '"></i>'; | |
| 1359 | +	}else{
 | |
| 1360 | + $field_icon = $cf['field_icon']; | |
| 1361 | + } | |
| 1362 | 1362 | |
| 1363 | - return $field_icon; | |
| 1363 | + return $field_icon; | |
| 1364 | 1364 | } | 
| 1365 | 1365 | |
| 1366 | 1366 |  if (!function_exists('geodir_show_listing_info')) {
 | 
| 1367 | - /** | |
| 1368 | - * Show listing info depending on field location. | |
| 1369 | - * | |
| 1370 | - * @since 1.0.0 | |
| 1371 | - * @since 1.5.7 Custom fields option values added to db translation. | |
| 1372 | - * Changes to display url fields title. | |
| 1373 | - * @package GeoDirectory | |
| 1374 | - * @global object $wpdb WordPress Database object. | |
| 1375 | - * @global object $post The current post object. | |
| 1376 | - * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false. | |
| 1377 | - * | |
| 1378 | - * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc. | |
| 1379 | - * @return string Returns listing info html. | |
| 1380 | - */ | |
| 1381 | -    function geodir_show_listing_info($fields_location = '') {
 | |
| 1382 | - global $post, $preview, $wpdb, $send_to_friend; | |
| 1383 | - | |
| 1384 | - $package_info = array(); | |
| 1385 | - | |
| 1386 | - $package_info = geodir_post_package_info($package_info, $post); | |
| 1387 | - $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; | |
| 1388 | - $p_type = !empty($post->post_type) ? $post->post_type : geodir_get_current_posttype(); | |
| 1389 | - $send_to_friend = false; | |
| 1390 | - | |
| 1391 | - ob_start(); | |
| 1392 | - $fields_info = geodir_post_custom_fields($post_package_id, 'all', $p_type, $fields_location); | |
| 1393 | - | |
| 1394 | -        if (!empty($fields_info)) {
 | |
| 1395 | - $post = stripslashes_deep($post); // strip slashes | |
| 1367 | + /** | |
| 1368 | + * Show listing info depending on field location. | |
| 1369 | + * | |
| 1370 | + * @since 1.0.0 | |
| 1371 | + * @since 1.5.7 Custom fields option values added to db translation. | |
| 1372 | + * Changes to display url fields title. | |
| 1373 | + * @package GeoDirectory | |
| 1374 | + * @global object $wpdb WordPress Database object. | |
| 1375 | + * @global object $post The current post object. | |
| 1376 | + * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false. | |
| 1377 | + * | |
| 1378 | + * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc. | |
| 1379 | + * @return string Returns listing info html. | |
| 1380 | + */ | |
| 1381 | +	function geodir_show_listing_info($fields_location = '') {
 | |
| 1382 | + global $post, $preview, $wpdb, $send_to_friend; | |
| 1383 | + | |
| 1384 | + $package_info = array(); | |
| 1385 | + | |
| 1386 | + $package_info = geodir_post_package_info($package_info, $post); | |
| 1387 | + $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; | |
| 1388 | + $p_type = !empty($post->post_type) ? $post->post_type : geodir_get_current_posttype(); | |
| 1389 | + $send_to_friend = false; | |
| 1390 | + | |
| 1391 | + ob_start(); | |
| 1392 | + $fields_info = geodir_post_custom_fields($post_package_id, 'all', $p_type, $fields_location); | |
| 1393 | + | |
| 1394 | +		if (!empty($fields_info)) {
 | |
| 1395 | + $post = stripslashes_deep($post); // strip slashes | |
| 1396 | 1396 | |
| 1397 | - //echo '<div class="geodir-company_info field-group">'; | |
| 1398 | - global $field_set_start; | |
| 1399 | - $field_set_start = 0; | |
| 1400 | - | |
| 1401 | - | |
| 1402 | - | |
| 1403 | -            foreach ($fields_info as $type) {
 | |
| 1404 | -                if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
 | |
| 1405 | - $type = stripslashes_deep($type); // strip slashes | |
| 1406 | -                if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
 | |
| 1407 | - $html = ''; | |
| 1408 | - $field_icon = geodir_field_icon_proccess($type); | |
| 1409 | - $filed_type = $type['type']; | |
| 1410 | - $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; | |
| 1411 | -                if($html_var=='post'){$html_var='post_address';}
 | |
| 1412 | - | |
| 1413 | - /** | |
| 1414 | - * Filter the output for custom fields. | |
| 1415 | - * | |
| 1416 | - * Here we can remove or add new functions depending on the field type. | |
| 1417 | - * | |
| 1418 | - * @param string $html The html to be filtered (blank). | |
| 1419 | - * @param string $fields_location The location the field is to be show. | |
| 1420 | - * @param array $type The array of field values. | |
| 1421 | - */ | |
| 1422 | -                $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
 | |
| 1423 | - | |
| 1424 | - $variables_array = array(); | |
| 1425 | - | |
| 1426 | - | |
| 1427 | - if ($type['type'] != 'fieldset'): | |
| 1428 | - $variables_array['post_id'] = $post->ID; | |
| 1429 | - $variables_array['label'] = __($type['site_title'], 'geodirectory'); | |
| 1430 | - $variables_array['value'] = ''; | |
| 1431 | -                    if (isset($post->{$type['htmlvar_name']}))
 | |
| 1432 | -                        $variables_array['value'] = $post->{$type['htmlvar_name']};
 | |
| 1433 | - endif; | |
| 1434 | - | |
| 1435 | - | |
| 1436 | - if ($html): | |
| 1437 | - | |
| 1438 | - /** | |
| 1439 | - * Called before a custom fields is output on the frontend. | |
| 1440 | - * | |
| 1441 | - * @since 1.0.0 | |
| 1442 | - * @param string $html_var The HTML variable name for the field. | |
| 1443 | - */ | |
| 1444 | -                    do_action("geodir_before_show_{$html_var}");
 | |
| 1445 | - /** | |
| 1446 | - * Filter custom field output. | |
| 1447 | - * | |
| 1448 | - * @since 1.0.0 | |
| 1449 | - * | |
| 1450 | - * @param string $html_var The HTML variable name for the field. | |
| 1451 | - * @param string $html Custom field unfiltered HTML. | |
| 1452 | - * @param array $variables_array Custom field variables array. | |
| 1453 | - */ | |
| 1454 | -                    if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
 | |
| 1455 | - | |
| 1456 | - /** | |
| 1457 | - * Called after a custom fields is output on the frontend. | |
| 1458 | - * | |
| 1459 | - * @since 1.0.0 | |
| 1460 | - * @param string $html_var The HTML variable name for the field. | |
| 1461 | - */ | |
| 1462 | -                    do_action("geodir_after_show_{$html_var}");
 | |
| 1463 | - | |
| 1464 | - endif; | |
| 1465 | - | |
| 1466 | - } | |
| 1467 | - | |
| 1468 | - //echo '</div>'; | |
| 1469 | - | |
| 1470 | - } | |
| 1471 | - | |
| 1472 | - | |
| 1473 | - $html = ob_get_clean(); | |
| 1474 | - | |
| 1475 | - /** | |
| 1476 | - * Filter the custom fields over all output. | |
| 1477 | - * | |
| 1478 | - * @param string $html The html of the custom fields. | |
| 1479 | - * @param string $fields_location The location the fields are being output. | |
| 1480 | - * @since 1.6.9 | |
| 1481 | - */ | |
| 1482 | -        return apply_filters('geodir_show_listing_info',$html,$fields_location);
 | |
| 1483 | - | |
| 1484 | - } | |
| 1397 | + //echo '<div class="geodir-company_info field-group">'; | |
| 1398 | + global $field_set_start; | |
| 1399 | + $field_set_start = 0; | |
| 1400 | + | |
| 1401 | + | |
| 1402 | + | |
| 1403 | +			foreach ($fields_info as $type) {
 | |
| 1404 | +				if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
 | |
| 1405 | + $type = stripslashes_deep($type); // strip slashes | |
| 1406 | +				if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
 | |
| 1407 | + $html = ''; | |
| 1408 | + $field_icon = geodir_field_icon_proccess($type); | |
| 1409 | + $filed_type = $type['type']; | |
| 1410 | + $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; | |
| 1411 | +				if($html_var=='post'){$html_var='post_address';}
 | |
| 1412 | + | |
| 1413 | + /** | |
| 1414 | + * Filter the output for custom fields. | |
| 1415 | + * | |
| 1416 | + * Here we can remove or add new functions depending on the field type. | |
| 1417 | + * | |
| 1418 | + * @param string $html The html to be filtered (blank). | |
| 1419 | + * @param string $fields_location The location the field is to be show. | |
| 1420 | + * @param array $type The array of field values. | |
| 1421 | + */ | |
| 1422 | +				$html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
 | |
| 1423 | + | |
| 1424 | + $variables_array = array(); | |
| 1425 | + | |
| 1426 | + | |
| 1427 | + if ($type['type'] != 'fieldset'): | |
| 1428 | + $variables_array['post_id'] = $post->ID; | |
| 1429 | + $variables_array['label'] = __($type['site_title'], 'geodirectory'); | |
| 1430 | + $variables_array['value'] = ''; | |
| 1431 | +					if (isset($post->{$type['htmlvar_name']}))
 | |
| 1432 | +						$variables_array['value'] = $post->{$type['htmlvar_name']};
 | |
| 1433 | + endif; | |
| 1434 | + | |
| 1435 | + | |
| 1436 | + if ($html): | |
| 1437 | + | |
| 1438 | + /** | |
| 1439 | + * Called before a custom fields is output on the frontend. | |
| 1440 | + * | |
| 1441 | + * @since 1.0.0 | |
| 1442 | + * @param string $html_var The HTML variable name for the field. | |
| 1443 | + */ | |
| 1444 | +					do_action("geodir_before_show_{$html_var}");
 | |
| 1445 | + /** | |
| 1446 | + * Filter custom field output. | |
| 1447 | + * | |
| 1448 | + * @since 1.0.0 | |
| 1449 | + * | |
| 1450 | + * @param string $html_var The HTML variable name for the field. | |
| 1451 | + * @param string $html Custom field unfiltered HTML. | |
| 1452 | + * @param array $variables_array Custom field variables array. | |
| 1453 | + */ | |
| 1454 | +					if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
 | |
| 1455 | + | |
| 1456 | + /** | |
| 1457 | + * Called after a custom fields is output on the frontend. | |
| 1458 | + * | |
| 1459 | + * @since 1.0.0 | |
| 1460 | + * @param string $html_var The HTML variable name for the field. | |
| 1461 | + */ | |
| 1462 | +					do_action("geodir_after_show_{$html_var}");
 | |
| 1463 | + | |
| 1464 | + endif; | |
| 1465 | + | |
| 1466 | + } | |
| 1467 | + | |
| 1468 | + //echo '</div>'; | |
| 1469 | + | |
| 1470 | + } | |
| 1471 | + | |
| 1472 | + | |
| 1473 | + $html = ob_get_clean(); | |
| 1474 | + | |
| 1475 | + /** | |
| 1476 | + * Filter the custom fields over all output. | |
| 1477 | + * | |
| 1478 | + * @param string $html The html of the custom fields. | |
| 1479 | + * @param string $fields_location The location the fields are being output. | |
| 1480 | + * @since 1.6.9 | |
| 1481 | + */ | |
| 1482 | +		return apply_filters('geodir_show_listing_info',$html,$fields_location);
 | |
| 1483 | + | |
| 1484 | + } | |
| 1485 | 1485 | } | 
| 1486 | 1486 | |
| 1487 | 1487 |  if (!function_exists('geodir_default_date_format')) {
 | 
| 1488 | - /** | |
| 1489 | - * Returns default date format. | |
| 1490 | - * | |
| 1491 | - * @since 1.0.0 | |
| 1492 | - * @package GeoDirectory | |
| 1493 | - * @return mixed|string|void Returns default date format. | |
| 1494 | - */ | |
| 1495 | - function geodir_default_date_format() | |
| 1496 | -    {
 | |
| 1497 | -        if ($format = get_option('date_format'))
 | |
| 1498 | - return $format; | |
| 1499 | - else | |
| 1500 | - return 'dd-mm-yy'; | |
| 1501 | - } | |
| 1488 | + /** | |
| 1489 | + * Returns default date format. | |
| 1490 | + * | |
| 1491 | + * @since 1.0.0 | |
| 1492 | + * @package GeoDirectory | |
| 1493 | + * @return mixed|string|void Returns default date format. | |
| 1494 | + */ | |
| 1495 | + function geodir_default_date_format() | |
| 1496 | +	{
 | |
| 1497 | +		if ($format = get_option('date_format'))
 | |
| 1498 | + return $format; | |
| 1499 | + else | |
| 1500 | + return 'dd-mm-yy'; | |
| 1501 | + } | |
| 1502 | 1502 | } | 
| 1503 | 1503 | |
| 1504 | 1504 |  if (!function_exists('geodir_get_formated_date')) {
 | 
| 1505 | - /** | |
| 1506 | - * Returns formatted date. | |
| 1507 | - * | |
| 1508 | - * @since 1.0.0 | |
| 1509 | - * @package GeoDirectory | |
| 1510 | - * @param string $date Date string to convert. | |
| 1511 | - * @return bool|int|string Returns formatted date. | |
| 1512 | - */ | |
| 1513 | - function geodir_get_formated_date($date) | |
| 1514 | -    {
 | |
| 1515 | -        return mysql2date(get_option('date_format'), $date);
 | |
| 1516 | - } | |
| 1505 | + /** | |
| 1506 | + * Returns formatted date. | |
| 1507 | + * | |
| 1508 | + * @since 1.0.0 | |
| 1509 | + * @package GeoDirectory | |
| 1510 | + * @param string $date Date string to convert. | |
| 1511 | + * @return bool|int|string Returns formatted date. | |
| 1512 | + */ | |
| 1513 | + function geodir_get_formated_date($date) | |
| 1514 | +	{
 | |
| 1515 | +		return mysql2date(get_option('date_format'), $date);
 | |
| 1516 | + } | |
| 1517 | 1517 | } | 
| 1518 | 1518 | |
| 1519 | 1519 |  if (!function_exists('geodir_get_formated_time')) {
 | 
| 1520 | - /** | |
| 1521 | - * Returns formatted time. | |
| 1522 | - * | |
| 1523 | - * @since 1.0.0 | |
| 1524 | - * @package GeoDirectory | |
| 1525 | - * @param string $time Time string to convert. | |
| 1526 | - * @return bool|int|string Returns formatted time. | |
| 1527 | - */ | |
| 1528 | - function geodir_get_formated_time($time) | |
| 1529 | -    {
 | |
| 1530 | -        return mysql2date(get_option('time_format'), $time, $translate = true);
 | |
| 1531 | - } | |
| 1520 | + /** | |
| 1521 | + * Returns formatted time. | |
| 1522 | + * | |
| 1523 | + * @since 1.0.0 | |
| 1524 | + * @package GeoDirectory | |
| 1525 | + * @param string $time Time string to convert. | |
| 1526 | + * @return bool|int|string Returns formatted time. | |
| 1527 | + */ | |
| 1528 | + function geodir_get_formated_time($time) | |
| 1529 | +	{
 | |
| 1530 | +		return mysql2date(get_option('time_format'), $time, $translate = true);
 | |
| 1531 | + } | |
| 1532 | 1532 | } | 
| 1533 | 1533 | |
| 1534 | 1534 | |
| 1535 | 1535 |  if (!function_exists('geodir_save_post_file_fields')) {
 | 
| 1536 | - /** | |
| 1537 | - * Save post file fields | |
| 1538 | - * | |
| 1539 | - * @since 1.0.0 | |
| 1540 | - * @since 1.4.7 Added `$extra_fields` parameter. | |
| 1541 | - * @package GeoDirectory | |
| 1542 | - * @global object $wpdb WordPress Database object. | |
| 1543 | - * @global string $plugin_prefix Geodirectory plugin table prefix. | |
| 1544 | - * @global object $current_user Current user object. | |
| 1545 | - * @param int $post_id | |
| 1546 | - * @param string $field_id | |
| 1547 | - * @param array $post_image | |
| 1548 | - * @param array $extra_fields Array of extra fields. | |
| 1549 | - */ | |
| 1550 | - function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array()) | |
| 1551 | -    {
 | |
| 1536 | + /** | |
| 1537 | + * Save post file fields | |
| 1538 | + * | |
| 1539 | + * @since 1.0.0 | |
| 1540 | + * @since 1.4.7 Added `$extra_fields` parameter. | |
| 1541 | + * @package GeoDirectory | |
| 1542 | + * @global object $wpdb WordPress Database object. | |
| 1543 | + * @global string $plugin_prefix Geodirectory plugin table prefix. | |
| 1544 | + * @global object $current_user Current user object. | |
| 1545 | + * @param int $post_id | |
| 1546 | + * @param string $field_id | |
| 1547 | + * @param array $post_image | |
| 1548 | + * @param array $extra_fields Array of extra fields. | |
| 1549 | + */ | |
| 1550 | + function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array()) | |
| 1551 | +	{
 | |
| 1552 | 1552 | |
| 1553 | - global $wpdb, $plugin_prefix, $current_user; | |
| 1553 | + global $wpdb, $plugin_prefix, $current_user; | |
| 1554 | 1554 | |
| 1555 | - $post_type = get_post_type($post_id); | |
| 1556 | - //echo $field_id; exit; | |
| 1557 | - $table = $plugin_prefix . $post_type . '_detail'; | |
| 1555 | + $post_type = get_post_type($post_id); | |
| 1556 | + //echo $field_id; exit; | |
| 1557 | + $table = $plugin_prefix . $post_type . '_detail'; | |
| 1558 | 1558 | |
| 1559 | - $postcurr_images = array(); | |
| 1560 | - $postcurr_images = geodir_get_post_meta($post_id, $field_id, true); | |
| 1561 | - $file_urls = ''; | |
| 1559 | + $postcurr_images = array(); | |
| 1560 | + $postcurr_images = geodir_get_post_meta($post_id, $field_id, true); | |
| 1561 | + $file_urls = ''; | |
| 1562 | 1562 | |
| 1563 | -        if (!empty($post_image)) {
 | |
| 1563 | +		if (!empty($post_image)) {
 | |
| 1564 | 1564 | |
| 1565 | - $invalid_files = array(); | |
| 1565 | + $invalid_files = array(); | |
| 1566 | 1566 | |
| 1567 | - //Get and remove all old images of post from database to set by new order | |
| 1568 | - $geodir_uploaddir = ''; | |
| 1569 | - $uploads = wp_upload_dir(); | |
| 1570 | - $uploads_dir = $uploads['path']; | |
| 1567 | + //Get and remove all old images of post from database to set by new order | |
| 1568 | + $geodir_uploaddir = ''; | |
| 1569 | + $uploads = wp_upload_dir(); | |
| 1570 | + $uploads_dir = $uploads['path']; | |
| 1571 | 1571 | |
| 1572 | - $geodir_uploadpath = $uploads['path']; | |
| 1573 | - $geodir_uploadurl = $uploads['url']; | |
| 1574 | - $sub_dir = $uploads['subdir']; | |
| 1572 | + $geodir_uploadpath = $uploads['path']; | |
| 1573 | + $geodir_uploadurl = $uploads['url']; | |
| 1574 | + $sub_dir = $uploads['subdir']; | |
| 1575 | 1575 | |
| 1576 | -            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
 | |
| 1576 | +			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
 | |
| 1577 | 1577 | |
| 1578 | -            for ($m = 0; $m < count($post_image); $m++) {
 | |
| 1578 | +			for ($m = 0; $m < count($post_image); $m++) {
 | |
| 1579 | 1579 | |
| 1580 | - /* --------- start ------- */ | |
| 1580 | + /* --------- start ------- */ | |
| 1581 | 1581 | |
| 1582 | -                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
 | |
| 1582 | +				if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
 | |
| 1583 | 1583 | |
| 1584 | 1584 | |
| 1585 | - $curr_img_url = $post_image[$m]; | |
| 1586 | -                    $image_name_arr = explode('/', $curr_img_url);
 | |
| 1587 | - $curr_img_dir = $image_name_arr[count($image_name_arr) - 2]; | |
| 1588 | - $filename = end($image_name_arr); | |
| 1589 | -                    $img_name_arr = explode('.', $filename);
 | |
| 1585 | + $curr_img_url = $post_image[$m]; | |
| 1586 | +					$image_name_arr = explode('/', $curr_img_url);
 | |
| 1587 | + $curr_img_dir = $image_name_arr[count($image_name_arr) - 2]; | |
| 1588 | + $filename = end($image_name_arr); | |
| 1589 | +					$img_name_arr = explode('.', $filename);
 | |
| 1590 | 1590 | |
| 1591 | - $arr_file_type = wp_check_filetype($filename); | |
| 1591 | + $arr_file_type = wp_check_filetype($filename); | |
| 1592 | 1592 | |
| 1593 | -                    if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
 | |
| 1594 | - continue; | |
| 1595 | - } | |
| 1593 | +					if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
 | |
| 1594 | + continue; | |
| 1595 | + } | |
| 1596 | 1596 | |
| 1597 | - $uploaded_file_type = $arr_file_type['type']; | |
| 1598 | - $uploaded_file_ext = $arr_file_type['ext']; | |
| 1597 | + $uploaded_file_type = $arr_file_type['type']; | |
| 1598 | + $uploaded_file_ext = $arr_file_type['ext']; | |
| 1599 | 1599 | |
| 1600 | -                    if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
 | |
| 1601 | - continue; // Invalid file type. | |
| 1602 | - } | |
| 1600 | +					if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
 | |
| 1601 | + continue; // Invalid file type. | |
| 1602 | + } | |
| 1603 | 1603 | |
| 1604 | - // Set an array containing a list of acceptable formats | |
| 1605 | -                    //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
 | |
| 1604 | + // Set an array containing a list of acceptable formats | |
| 1605 | +					//$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
 | |
| 1606 | 1606 | |
| 1607 | -                    if (!function_exists('wp_handle_upload'))
 | |
| 1608 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); | |
| 1607 | +					if (!function_exists('wp_handle_upload'))
 | |
| 1608 | + require_once(ABSPATH . 'wp-admin/includes/file.php'); | |
| 1609 | 1609 | |
| 1610 | - if (!is_dir($geodir_uploadpath)) | |
| 1611 | - mkdir($geodir_uploadpath); | |
| 1610 | + if (!is_dir($geodir_uploadpath)) | |
| 1611 | + mkdir($geodir_uploadpath); | |
| 1612 | 1612 | |
| 1613 | - $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1]; | |
| 1614 | -                    $explode_sub_dir = explode("/", $sub_dir);
 | |
| 1615 | -                    if ($curr_img_dir == end($explode_sub_dir)) {
 | |
| 1616 | - $img_path = $geodir_uploadpath . '/' . $filename; | |
| 1617 | - $img_url = $geodir_uploadurl . '/' . $filename; | |
| 1618 | -                    } else {
 | |
| 1619 | - $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; | |
| 1620 | - $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; | |
| 1621 | - } | |
| 1613 | + $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1]; | |
| 1614 | +					$explode_sub_dir = explode("/", $sub_dir);
 | |
| 1615 | +					if ($curr_img_dir == end($explode_sub_dir)) {
 | |
| 1616 | + $img_path = $geodir_uploadpath . '/' . $filename; | |
| 1617 | + $img_url = $geodir_uploadurl . '/' . $filename; | |
| 1618 | +					} else {
 | |
| 1619 | + $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; | |
| 1620 | + $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; | |
| 1621 | + } | |
| 1622 | 1622 | |
| 1623 | - $uploaded_file = ''; | |
| 1624 | - if (file_exists($img_path)) | |
| 1625 | - $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); | |
| 1623 | + $uploaded_file = ''; | |
| 1624 | + if (file_exists($img_path)) | |
| 1625 | + $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); | |
| 1626 | 1626 | |
| 1627 | -                    if ($curr_img_dir != $geodir_uploaddir) {
 | |
| 1628 | - if (file_exists($img_path)) | |
| 1629 | - unlink($img_path); | |
| 1630 | - } | |
| 1627 | +					if ($curr_img_dir != $geodir_uploaddir) {
 | |
| 1628 | + if (file_exists($img_path)) | |
| 1629 | + unlink($img_path); | |
| 1630 | + } | |
| 1631 | 1631 | |
| 1632 | - if (!empty($uploaded_file)) | |
| 1633 | - $file_urls = $geodir_uploadurl . '/' . $new_name; | |
| 1632 | + if (!empty($uploaded_file)) | |
| 1633 | + $file_urls = $geodir_uploadurl . '/' . $new_name; | |
| 1634 | 1634 | |
| 1635 | -                } else {
 | |
| 1636 | - $file_urls = $post_image[$m]; | |
| 1637 | - } | |
| 1638 | - } | |
| 1635 | +				} else {
 | |
| 1636 | + $file_urls = $post_image[$m]; | |
| 1637 | + } | |
| 1638 | + } | |
| 1639 | 1639 | |
| 1640 | 1640 | |
| 1641 | - } | |
| 1641 | + } | |
| 1642 | 1642 | |
| 1643 | - //Remove all old attachments and temp images | |
| 1644 | -        if (!empty($postcurr_images)) {
 | |
| 1643 | + //Remove all old attachments and temp images | |
| 1644 | +		if (!empty($postcurr_images)) {
 | |
| 1645 | 1645 | |
| 1646 | -            if ($file_urls != $postcurr_images) {
 | |
| 1647 | -                $invalid_files[] = (object)array('src' => $postcurr_images);
 | |
| 1648 | - $invalid_files = (object)$invalid_files; | |
| 1649 | - } | |
| 1650 | - } | |
| 1646 | +			if ($file_urls != $postcurr_images) {
 | |
| 1647 | +				$invalid_files[] = (object)array('src' => $postcurr_images);
 | |
| 1648 | + $invalid_files = (object)$invalid_files; | |
| 1649 | + } | |
| 1650 | + } | |
| 1651 | 1651 | |
| 1652 | - geodir_save_post_meta($post_id, $field_id, $file_urls); | |
| 1652 | + geodir_save_post_meta($post_id, $field_id, $file_urls); | |
| 1653 | 1653 | |
| 1654 | - if (!empty($invalid_files)) | |
| 1655 | - geodir_remove_attachments($invalid_files); | |
| 1654 | + if (!empty($invalid_files)) | |
| 1655 | + geodir_remove_attachments($invalid_files); | |
| 1656 | 1656 | |
| 1657 | - } | |
| 1657 | + } | |
| 1658 | 1658 | } | 
| 1659 | 1659 | |
| 1660 | 1660 | |
| @@ -1669,76 +1669,76 @@ discard block | ||
| 1669 | 1669 | */ | 
| 1670 | 1670 | function geodir_custom_upload_mimes($existing_mimes = array()) | 
| 1671 | 1671 |  {
 | 
| 1672 | - $existing_mimes['wif'] = 'text/plain'; | |
| 1673 | - $existing_mimes['jpg|jpeg'] = 'image/jpeg'; | |
| 1674 | - $existing_mimes['gif'] = 'image/gif'; | |
| 1675 | - $existing_mimes['png'] = 'image/png'; | |
| 1676 | - $existing_mimes['pdf'] = 'application/pdf'; | |
| 1677 | - $existing_mimes['txt'] = 'text/text'; | |
| 1678 | - $existing_mimes['csv'] = 'application/octet-stream'; | |
| 1679 | - $existing_mimes['doc'] = 'application/msword'; | |
| 1680 | - $existing_mimes['xla|xls|xlt|xlw'] = 'application/vnd.ms-excel'; | |
| 1681 | - $existing_mimes['docx'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; | |
| 1682 | - $existing_mimes['xlsx'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; | |
| 1683 | - return $existing_mimes; | |
| 1672 | + $existing_mimes['wif'] = 'text/plain'; | |
| 1673 | + $existing_mimes['jpg|jpeg'] = 'image/jpeg'; | |
| 1674 | + $existing_mimes['gif'] = 'image/gif'; | |
| 1675 | + $existing_mimes['png'] = 'image/png'; | |
| 1676 | + $existing_mimes['pdf'] = 'application/pdf'; | |
| 1677 | + $existing_mimes['txt'] = 'text/text'; | |
| 1678 | + $existing_mimes['csv'] = 'application/octet-stream'; | |
| 1679 | + $existing_mimes['doc'] = 'application/msword'; | |
| 1680 | + $existing_mimes['xla|xls|xlt|xlw'] = 'application/vnd.ms-excel'; | |
| 1681 | + $existing_mimes['docx'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; | |
| 1682 | + $existing_mimes['xlsx'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; | |
| 1683 | + return $existing_mimes; | |
| 1684 | 1684 | } | 
| 1685 | 1685 | |
| 1686 | 1686 |  if (!function_exists('geodir_plupload_action')) {
 | 
| 1687 | 1687 | |
| 1688 | - /** | |
| 1689 | - * Get upload directory path details | |
| 1690 | - * | |
| 1691 | - * @since 1.0.0 | |
| 1692 | - * @package GeoDirectory | |
| 1693 | - * @global object $current_user Current user object. | |
| 1694 | - * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'. | |
| 1695 | - * @return mixed Returns upload directory details as an array. | |
| 1696 | - */ | |
| 1697 | - function geodir_upload_dir($upload) | |
| 1698 | -    {
 | |
| 1699 | - global $current_user; | |
| 1700 | - $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID; | |
| 1701 | - $upload['path'] = $upload['basedir'] . $upload['subdir']; | |
| 1702 | - $upload['url'] = $upload['baseurl'] . $upload['subdir']; | |
| 1703 | - return $upload; | |
| 1704 | - } | |
| 1705 | - | |
| 1706 | - /** | |
| 1707 | - * Handles place file and image upload. | |
| 1708 | - * | |
| 1709 | - * @since 1.0.0 | |
| 1710 | - * @package GeoDirectory | |
| 1711 | - */ | |
| 1712 | - function geodir_plupload_action() | |
| 1713 | -    {
 | |
| 1714 | - // check ajax nonce | |
| 1715 | - $imgid = $_POST["imgid"]; | |
| 1716 | - | |
| 1717 | - check_ajax_referer($imgid . 'pluploadan'); | |
| 1718 | - | |
| 1719 | - // handle custom file uploaddir | |
| 1720 | -        add_filter('upload_dir', 'geodir_upload_dir');
 | |
| 1721 | - | |
| 1722 | - // change file orientation if needed | |
| 1723 | - $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']); | |
| 1724 | - | |
| 1725 | - // handle file upload | |
| 1726 | -        $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));
 | |
| 1727 | - // remove handle custom file uploaddir | |
| 1728 | -        remove_filter('upload_dir', 'geodir_upload_dir');
 | |
| 1729 | - | |
| 1730 | -        if(!isset($status['url']) && isset($status['error'])){
 | |
| 1731 | - print_r($status); | |
| 1732 | - } | |
| 1733 | - | |
| 1734 | - // send the uploaded file url in response | |
| 1735 | -        if (isset($status['url'])) {
 | |
| 1736 | - echo $status['url']; | |
| 1737 | -        } else {
 | |
| 1738 | - echo 'x'; | |
| 1739 | - } | |
| 1740 | - exit; | |
| 1741 | - } | |
| 1688 | + /** | |
| 1689 | + * Get upload directory path details | |
| 1690 | + * | |
| 1691 | + * @since 1.0.0 | |
| 1692 | + * @package GeoDirectory | |
| 1693 | + * @global object $current_user Current user object. | |
| 1694 | + * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'. | |
| 1695 | + * @return mixed Returns upload directory details as an array. | |
| 1696 | + */ | |
| 1697 | + function geodir_upload_dir($upload) | |
| 1698 | +	{
 | |
| 1699 | + global $current_user; | |
| 1700 | + $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID; | |
| 1701 | + $upload['path'] = $upload['basedir'] . $upload['subdir']; | |
| 1702 | + $upload['url'] = $upload['baseurl'] . $upload['subdir']; | |
| 1703 | + return $upload; | |
| 1704 | + } | |
| 1705 | + | |
| 1706 | + /** | |
| 1707 | + * Handles place file and image upload. | |
| 1708 | + * | |
| 1709 | + * @since 1.0.0 | |
| 1710 | + * @package GeoDirectory | |
| 1711 | + */ | |
| 1712 | + function geodir_plupload_action() | |
| 1713 | +	{
 | |
| 1714 | + // check ajax nonce | |
| 1715 | + $imgid = $_POST["imgid"]; | |
| 1716 | + | |
| 1717 | + check_ajax_referer($imgid . 'pluploadan'); | |
| 1718 | + | |
| 1719 | + // handle custom file uploaddir | |
| 1720 | +		add_filter('upload_dir', 'geodir_upload_dir');
 | |
| 1721 | + | |
| 1722 | + // change file orientation if needed | |
| 1723 | + $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']); | |
| 1724 | + | |
| 1725 | + // handle file upload | |
| 1726 | +		$status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));
 | |
| 1727 | + // remove handle custom file uploaddir | |
| 1728 | +		remove_filter('upload_dir', 'geodir_upload_dir');
 | |
| 1729 | + | |
| 1730 | +		if(!isset($status['url']) && isset($status['error'])){
 | |
| 1731 | + print_r($status); | |
| 1732 | + } | |
| 1733 | + | |
| 1734 | + // send the uploaded file url in response | |
| 1735 | +		if (isset($status['url'])) {
 | |
| 1736 | + echo $status['url']; | |
| 1737 | +		} else {
 | |
| 1738 | + echo 'x'; | |
| 1739 | + } | |
| 1740 | + exit; | |
| 1741 | + } | |
| 1742 | 1742 | } | 
| 1743 | 1743 | |
| 1744 | 1744 | /** | 
| @@ -1753,17 +1753,17 @@ discard block | ||
| 1753 | 1753 | */ | 
| 1754 | 1754 | function geodir_get_video($post_id) | 
| 1755 | 1755 |  {
 | 
| 1756 | - global $wpdb, $plugin_prefix; | |
| 1756 | + global $wpdb, $plugin_prefix; | |
| 1757 | 1757 | |
| 1758 | - $post_type = get_post_type($post_id); | |
| 1758 | + $post_type = get_post_type($post_id); | |
| 1759 | 1759 | |
| 1760 | - $table = $plugin_prefix . $post_type . '_detail'; | |
| 1760 | + $table = $plugin_prefix . $post_type . '_detail'; | |
| 1761 | 1761 | |
| 1762 | -    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));
 | |
| 1762 | +	$results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));
 | |
| 1763 | 1763 | |
| 1764 | -    if ($results) {
 | |
| 1765 | - return $results[0]->geodir_video; | |
| 1766 | - } | |
| 1764 | +	if ($results) {
 | |
| 1765 | + return $results[0]->geodir_video; | |
| 1766 | + } | |
| 1767 | 1767 | |
| 1768 | 1768 | } | 
| 1769 | 1769 | |
| @@ -1779,40 +1779,40 @@ discard block | ||
| 1779 | 1779 | */ | 
| 1780 | 1780 | function geodir_get_special_offers($post_id) | 
| 1781 | 1781 |  {
 | 
| 1782 | - global $wpdb, $plugin_prefix; | |
| 1782 | + global $wpdb, $plugin_prefix; | |
| 1783 | 1783 | |
| 1784 | - $post_type = get_post_type($post_id); | |
| 1784 | + $post_type = get_post_type($post_id); | |
| 1785 | 1785 | |
| 1786 | - $table = $plugin_prefix . $post_type . '_detail'; | |
| 1786 | + $table = $plugin_prefix . $post_type . '_detail'; | |
| 1787 | 1787 | |
| 1788 | -    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));
 | |
| 1788 | +	$results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));
 | |
| 1789 | 1789 | |
| 1790 | -    if ($results) {
 | |
| 1791 | - return $results[0]->geodir_special_offers; | |
| 1792 | - } | |
| 1790 | +	if ($results) {
 | |
| 1791 | + return $results[0]->geodir_special_offers; | |
| 1792 | + } | |
| 1793 | 1793 | |
| 1794 | 1794 | } | 
| 1795 | 1795 | |
| 1796 | 1796 |  if (!function_exists('geodir_max_upload_size')) {
 | 
| 1797 | - /** | |
| 1798 | - * Get max upload file size | |
| 1799 | - * | |
| 1800 | - * @since 1.0.0 | |
| 1801 | - * @package GeoDirectory | |
| 1802 | - * @return mixed|void Returns max upload file size. | |
| 1803 | - */ | |
| 1804 | - function geodir_max_upload_size() | |
| 1805 | -    {
 | |
| 1806 | -        $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);
 | |
| 1807 | - | |
| 1808 | -        if ($max_filesize > 0 && $max_filesize < 1) {
 | |
| 1809 | - $max_filesize = (int)($max_filesize * 1024) . 'kb'; | |
| 1810 | -        } else {
 | |
| 1811 | - $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb'; | |
| 1812 | - } | |
| 1813 | - /** Filter documented in geodirectory-functions/general_functions.php **/ | |
| 1814 | -        return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
 | |
| 1815 | - } | |
| 1797 | + /** | |
| 1798 | + * Get max upload file size | |
| 1799 | + * | |
| 1800 | + * @since 1.0.0 | |
| 1801 | + * @package GeoDirectory | |
| 1802 | + * @return mixed|void Returns max upload file size. | |
| 1803 | + */ | |
| 1804 | + function geodir_max_upload_size() | |
| 1805 | +	{
 | |
| 1806 | +		$max_filesize = (float)get_option('geodir_upload_max_filesize', 2);
 | |
| 1807 | + | |
| 1808 | +		if ($max_filesize > 0 && $max_filesize < 1) {
 | |
| 1809 | + $max_filesize = (int)($max_filesize * 1024) . 'kb'; | |
| 1810 | +		} else {
 | |
| 1811 | + $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb'; | |
| 1812 | + } | |
| 1813 | + /** Filter documented in geodirectory-functions/general_functions.php **/ | |
| 1814 | +		return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
 | |
| 1815 | + } | |
| 1816 | 1816 | } | 
| 1817 | 1817 | |
| 1818 | 1818 | |
| @@ -1830,33 +1830,33 @@ discard block | ||
| 1830 | 1830 | */ | 
| 1831 | 1831 | function geodir_add_custom_sort_options($fields, $post_type) | 
| 1832 | 1832 |  {
 | 
| 1833 | - global $wpdb; | |
| 1833 | + global $wpdb; | |
| 1834 | 1834 | |
| 1835 | -    if ($post_type != '') {
 | |
| 1835 | +	if ($post_type != '') {
 | |
| 1836 | 1836 | |
| 1837 | - $all_postypes = geodir_get_posttypes(); | |
| 1837 | + $all_postypes = geodir_get_posttypes(); | |
| 1838 | 1838 | |
| 1839 | -        if (in_array($post_type, $all_postypes)) {
 | |
| 1839 | +		if (in_array($post_type, $all_postypes)) {
 | |
| 1840 | 1840 | |
| 1841 | - $custom_fields = $wpdb->get_results( | |
| 1842 | - $wpdb->prepare( | |
| 1843 | - "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc", | |
| 1844 | - array($post_type) | |
| 1845 | - ), 'ARRAY_A' | |
| 1846 | - ); | |
| 1841 | + $custom_fields = $wpdb->get_results( | |
| 1842 | + $wpdb->prepare( | |
| 1843 | + "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc", | |
| 1844 | + array($post_type) | |
| 1845 | + ), 'ARRAY_A' | |
| 1846 | + ); | |
| 1847 | 1847 | |
| 1848 | -            if (!empty($custom_fields)) {
 | |
| 1848 | +			if (!empty($custom_fields)) {
 | |
| 1849 | 1849 | |
| 1850 | -                foreach ($custom_fields as $val) {
 | |
| 1851 | - $fields[] = $val; | |
| 1852 | - } | |
| 1853 | - } | |
| 1850 | +				foreach ($custom_fields as $val) {
 | |
| 1851 | + $fields[] = $val; | |
| 1852 | + } | |
| 1853 | + } | |
| 1854 | 1854 | |
| 1855 | - } | |
| 1855 | + } | |
| 1856 | 1856 | |
| 1857 | - } | |
| 1857 | + } | |
| 1858 | 1858 | |
| 1859 | - return $fields; | |
| 1859 | + return $fields; | |
| 1860 | 1860 | } | 
| 1861 | 1861 | |
| 1862 | 1862 | |
| @@ -1872,76 +1872,76 @@ discard block | ||
| 1872 | 1872 | function geodir_get_custom_sort_options($post_type = '') | 
| 1873 | 1873 |  {
 | 
| 1874 | 1874 | |
| 1875 | - global $wpdb; | |
| 1876 | - | |
| 1877 | -    if ($post_type != '') {
 | |
| 1878 | - | |
| 1879 | - $all_postypes = geodir_get_posttypes(); | |
| 1880 | - | |
| 1881 | - if (!in_array($post_type, $all_postypes)) | |
| 1882 | - return false; | |
| 1883 | - | |
| 1884 | - $fields = array(); | |
| 1885 | - | |
| 1886 | - $fields[] = array( | |
| 1887 | - 'post_type' => $post_type, | |
| 1888 | - 'data_type' => '', | |
| 1889 | - 'field_type' => 'random', | |
| 1890 | - 'site_title' => 'Random', | |
| 1891 | - 'htmlvar_name' => 'post_title', | |
| 1892 | - 'field_icon' => 'fa fa-random', | |
| 1893 | -            'description' =>  __('Random sort (not recommended for large sites)', 'geodirectory')
 | |
| 1894 | - ); | |
| 1895 | - | |
| 1896 | - $fields[] = array( | |
| 1897 | - 'post_type' => $post_type, | |
| 1898 | - 'data_type' => '', | |
| 1899 | - 'field_type' => 'datetime', | |
| 1900 | -            'site_title' => __('Add date', 'geodirectory'),
 | |
| 1901 | - 'htmlvar_name' => 'post_date', | |
| 1902 | - 'field_icon' => 'fa fa-calendar', | |
| 1903 | -            'description' =>  __('Sort by date added', 'geodirectory')
 | |
| 1904 | - ); | |
| 1905 | - $fields[] = array( | |
| 1906 | - 'post_type' => $post_type, | |
| 1907 | - 'data_type' => '', | |
| 1908 | - 'field_type' => 'bigint', | |
| 1909 | -            'site_title' => __('Review', 'geodirectory'),
 | |
| 1910 | - 'htmlvar_name' => 'comment_count', | |
| 1911 | - 'field_icon' => 'fa fa-commenting-o', | |
| 1912 | -            'description' =>  __('Sort by the number of reviews', 'geodirectory')
 | |
| 1913 | - ); | |
| 1914 | - $fields[] = array( | |
| 1915 | - 'post_type' => $post_type, | |
| 1916 | - 'data_type' => '', | |
| 1917 | - 'field_type' => 'float', | |
| 1918 | -            'site_title' => __('Rating', 'geodirectory'),
 | |
| 1919 | - 'htmlvar_name' => 'overall_rating', | |
| 1920 | - 'field_icon' => 'fa fa-star-o', | |
| 1921 | -            'description' =>  __('Sort by the overall rating value', 'geodirectory')
 | |
| 1922 | - ); | |
| 1923 | - $fields[] = array( | |
| 1924 | - 'post_type' => $post_type, | |
| 1925 | - 'data_type' => '', | |
| 1926 | - 'field_type' => 'text', | |
| 1927 | -            'site_title' => __('Title', 'geodirectory'),
 | |
| 1928 | - 'htmlvar_name' => 'post_title', | |
| 1929 | - 'field_icon' => 'fa fa-sort-alpha-desc', | |
| 1930 | -            'description' =>  __('Sort alphabetically by title', 'geodirectory')
 | |
| 1931 | - ); | |
| 1932 | - | |
| 1933 | - /** | |
| 1934 | - * Hook to add custom sort options. | |
| 1935 | - * | |
| 1936 | - * @since 1.0.0 | |
| 1937 | - * @param array $fields Unmodified sort options array. | |
| 1938 | - * @param string $post_type Post type. | |
| 1939 | - */ | |
| 1940 | -        return $fields = apply_filters('geodir_add_custom_sort_options', $fields, $post_type);
 | |
| 1941 | - | |
| 1942 | - } | |
| 1943 | - | |
| 1944 | - return false; | |
| 1875 | + global $wpdb; | |
| 1876 | + | |
| 1877 | +	if ($post_type != '') {
 | |
| 1878 | + | |
| 1879 | + $all_postypes = geodir_get_posttypes(); | |
| 1880 | + | |
| 1881 | + if (!in_array($post_type, $all_postypes)) | |
| 1882 | + return false; | |
| 1883 | + | |
| 1884 | + $fields = array(); | |
| 1885 | + | |
| 1886 | + $fields[] = array( | |
| 1887 | + 'post_type' => $post_type, | |
| 1888 | + 'data_type' => '', | |
| 1889 | + 'field_type' => 'random', | |
| 1890 | + 'site_title' => 'Random', | |
| 1891 | + 'htmlvar_name' => 'post_title', | |
| 1892 | + 'field_icon' => 'fa fa-random', | |
| 1893 | +			'description' =>  __('Random sort (not recommended for large sites)', 'geodirectory')
 | |
| 1894 | + ); | |
| 1895 | + | |
| 1896 | + $fields[] = array( | |
| 1897 | + 'post_type' => $post_type, | |
| 1898 | + 'data_type' => '', | |
| 1899 | + 'field_type' => 'datetime', | |
| 1900 | +			'site_title' => __('Add date', 'geodirectory'),
 | |
| 1901 | + 'htmlvar_name' => 'post_date', | |
| 1902 | + 'field_icon' => 'fa fa-calendar', | |
| 1903 | +			'description' =>  __('Sort by date added', 'geodirectory')
 | |
| 1904 | + ); | |
| 1905 | + $fields[] = array( | |
| 1906 | + 'post_type' => $post_type, | |
| 1907 | + 'data_type' => '', | |
| 1908 | + 'field_type' => 'bigint', | |
| 1909 | +			'site_title' => __('Review', 'geodirectory'),
 | |
| 1910 | + 'htmlvar_name' => 'comment_count', | |
| 1911 | + 'field_icon' => 'fa fa-commenting-o', | |
| 1912 | +			'description' =>  __('Sort by the number of reviews', 'geodirectory')
 | |
| 1913 | + ); | |
| 1914 | + $fields[] = array( | |
| 1915 | + 'post_type' => $post_type, | |
| 1916 | + 'data_type' => '', | |
| 1917 | + 'field_type' => 'float', | |
| 1918 | +			'site_title' => __('Rating', 'geodirectory'),
 | |
| 1919 | + 'htmlvar_name' => 'overall_rating', | |
| 1920 | + 'field_icon' => 'fa fa-star-o', | |
| 1921 | +			'description' =>  __('Sort by the overall rating value', 'geodirectory')
 | |
| 1922 | + ); | |
| 1923 | + $fields[] = array( | |
| 1924 | + 'post_type' => $post_type, | |
| 1925 | + 'data_type' => '', | |
| 1926 | + 'field_type' => 'text', | |
| 1927 | +			'site_title' => __('Title', 'geodirectory'),
 | |
| 1928 | + 'htmlvar_name' => 'post_title', | |
| 1929 | + 'field_icon' => 'fa fa-sort-alpha-desc', | |
| 1930 | +			'description' =>  __('Sort alphabetically by title', 'geodirectory')
 | |
| 1931 | + ); | |
| 1932 | + | |
| 1933 | + /** | |
| 1934 | + * Hook to add custom sort options. | |
| 1935 | + * | |
| 1936 | + * @since 1.0.0 | |
| 1937 | + * @param array $fields Unmodified sort options array. | |
| 1938 | + * @param string $post_type Post type. | |
| 1939 | + */ | |
| 1940 | +		return $fields = apply_filters('geodir_add_custom_sort_options', $fields, $post_type);
 | |
| 1941 | + | |
| 1942 | + } | |
| 1943 | + | |
| 1944 | + return false; | |
| 1945 | 1945 | } | 
| 1946 | 1946 | |
| 1947 | 1947 | |
| @@ -1957,117 +1957,117 @@ discard block | ||
| 1957 | 1957 | function godir_set_sort_field_order($field_ids = array()) | 
| 1958 | 1958 |  {
 | 
| 1959 | 1959 | |
| 1960 | - global $wpdb; | |
| 1960 | + global $wpdb; | |
| 1961 | 1961 | |
| 1962 | - $count = 0; | |
| 1963 | - if (!empty($field_ids)): | |
| 1964 | -        foreach ($field_ids as $id) {
 | |
| 1962 | + $count = 0; | |
| 1963 | + if (!empty($field_ids)): | |
| 1964 | +		foreach ($field_ids as $id) {
 | |
| 1965 | 1965 | |
| 1966 | - $cf = trim($id, '_'); | |
| 1966 | + $cf = trim($id, '_'); | |
| 1967 | 1967 | |
| 1968 | - $post_meta_info = $wpdb->query( | |
| 1969 | - $wpdb->prepare( | |
| 1970 | - "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set | |
| 1968 | + $post_meta_info = $wpdb->query( | |
| 1969 | + $wpdb->prepare( | |
| 1970 | + "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set | |
| 1971 | 1971 | sort_order=%d | 
| 1972 | 1972 | where id= %d", | 
| 1973 | - array($count, $cf) | |
| 1974 | - ) | |
| 1975 | - ); | |
| 1976 | - $count++; | |
| 1977 | - } | |
| 1978 | - | |
| 1979 | - return $field_ids; | |
| 1980 | - else: | |
| 1981 | - return false; | |
| 1982 | - endif; | |
| 1973 | + array($count, $cf) | |
| 1974 | + ) | |
| 1975 | + ); | |
| 1976 | + $count++; | |
| 1977 | + } | |
| 1978 | + | |
| 1979 | + return $field_ids; | |
| 1980 | + else: | |
| 1981 | + return false; | |
| 1982 | + endif; | |
| 1983 | 1983 | } | 
| 1984 | 1984 | |
| 1985 | 1985 | |
| 1986 | 1986 |  if (!function_exists('geodir_custom_sort_field_save')) {
 | 
| 1987 | - /** | |
| 1988 | - * Save or Update custom sort fields into the database. | |
| 1989 | - * | |
| 1990 | - * @since 1.0.0 | |
| 1991 | - * @package GeoDirectory | |
| 1992 | - * @global object $wpdb WordPress Database object. | |
| 1993 | - * @global string $plugin_prefix Geodirectory plugin table prefix. | |
| 1994 | -     * @param array $request_field {
 | |
| 1995 | - * Attributes of the Request field. | |
| 1996 | - * | |
| 1997 | - * @type string $action Ajax action name. | |
| 1998 | - * @type string $manage_field_type Manage field type Default "sorting_options". | |
| 1999 | - * @type string $create_field Do you want to create this field?. | |
| 2000 | - * @type string $field_ins_upd Field created or updated?. | |
| 2001 | - * @type string $_wpnonce Nonce value. | |
| 2002 | - * @type string $listing_type The Post type. | |
| 2003 | - * @type string $field_type Field Type. | |
| 2004 | - * @type string $field_id Field ID. | |
| 2005 | - * @type string $data_type Data Type. | |
| 2006 | - * @type string $htmlvar_name HTML variable name. | |
| 2007 | - * @type string $site_title Section title which you wish to display in frontend. | |
| 2008 | - * @type string $is_default Is this default sorting?. | |
| 2009 | - * @type string $is_active If not active then the field will not be displayed anywhere. | |
| 2010 | - * @type string $sort_order Sort Order. | |
| 2011 | - * | |
| 2012 | - * } | |
| 2013 | - * @param bool $default Not yet implemented. | |
| 2014 | - * @return int Returns the last affected db table row id. | |
| 2015 | - */ | |
| 2016 | - function geodir_custom_sort_field_save($request_field = array(), $default = false) | |
| 2017 | -    {
 | |
| 2018 | - | |
| 2019 | - global $wpdb, $plugin_prefix; | |
| 2020 | - | |
| 2021 | - $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : ''; | |
| 2022 | - | |
| 2023 | - $cf = trim($result_str, '_'); | |
| 2024 | - | |
| 2025 | - /*-------- check duplicate validation --------*/ | |
| 2026 | - | |
| 2027 | - $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : ''; | |
| 2028 | - $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; | |
| 2029 | - | |
| 2030 | - $post_type = $request_field['listing_type']; | |
| 2031 | - $data_type = isset($request_field['data_type']) ? $request_field['data_type'] : ''; | |
| 2032 | - $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : ''; | |
| 2033 | - $site_title = isset($request_field['site_title']) ? $request_field['site_title'] : ''; | |
| 2034 | - $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; | |
| 2035 | - $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : 0; | |
| 2036 | - $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : 0; | |
| 2037 | - $is_default = isset($request_field['is_default']) ? $request_field['is_default'] : ''; | |
| 2038 | - $asc = isset($request_field['asc']) ? $request_field['asc'] : 0; | |
| 2039 | - $desc = isset($request_field['desc']) ? $request_field['desc'] : 0; | |
| 2040 | - $asc_title = isset($request_field['asc_title']) ? $request_field['asc_title'] : ''; | |
| 2041 | - $desc_title = isset($request_field['desc_title']) ? $request_field['desc_title'] : ''; | |
| 2042 | - | |
| 2043 | - $default_order = ''; | |
| 2044 | -        if ($is_default != '') {
 | |
| 2045 | - $default_order = $is_default; | |
| 2046 | - $is_default = '1'; | |
| 2047 | - } | |
| 2048 | - | |
| 2049 | - | |
| 2050 | - $check_html_variable = $wpdb->get_var( | |
| 2051 | - $wpdb->prepare( | |
| 2052 | - "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ", | |
| 2053 | - array($cehhtmlvar_name, $post_type, $field_type) | |
| 2054 | - ) | |
| 2055 | - ); | |
| 2056 | - | |
| 2057 | -        if ($is_default == 1) {
 | |
| 2058 | - | |
| 2059 | -            $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));
 | |
| 2060 | - | |
| 2061 | - } | |
| 2062 | - | |
| 2063 | - | |
| 2064 | -        if (!$check_html_variable) {
 | |
| 2065 | - | |
| 2066 | - $wpdb->query( | |
| 2067 | - | |
| 2068 | - $wpdb->prepare( | |
| 2069 | - | |
| 2070 | - "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set | |
| 1987 | + /** | |
| 1988 | + * Save or Update custom sort fields into the database. | |
| 1989 | + * | |
| 1990 | + * @since 1.0.0 | |
| 1991 | + * @package GeoDirectory | |
| 1992 | + * @global object $wpdb WordPress Database object. | |
| 1993 | + * @global string $plugin_prefix Geodirectory plugin table prefix. | |
| 1994 | +	 * @param array $request_field {
 | |
| 1995 | + * Attributes of the Request field. | |
| 1996 | + * | |
| 1997 | + * @type string $action Ajax action name. | |
| 1998 | + * @type string $manage_field_type Manage field type Default "sorting_options". | |
| 1999 | + * @type string $create_field Do you want to create this field?. | |
| 2000 | + * @type string $field_ins_upd Field created or updated?. | |
| 2001 | + * @type string $_wpnonce Nonce value. | |
| 2002 | + * @type string $listing_type The Post type. | |
| 2003 | + * @type string $field_type Field Type. | |
| 2004 | + * @type string $field_id Field ID. | |
| 2005 | + * @type string $data_type Data Type. | |
| 2006 | + * @type string $htmlvar_name HTML variable name. | |
| 2007 | + * @type string $site_title Section title which you wish to display in frontend. | |
| 2008 | + * @type string $is_default Is this default sorting?. | |
| 2009 | + * @type string $is_active If not active then the field will not be displayed anywhere. | |
| 2010 | + * @type string $sort_order Sort Order. | |
| 2011 | + * | |
| 2012 | + * } | |
| 2013 | + * @param bool $default Not yet implemented. | |
| 2014 | + * @return int Returns the last affected db table row id. | |
| 2015 | + */ | |
| 2016 | + function geodir_custom_sort_field_save($request_field = array(), $default = false) | |
| 2017 | +	{
 | |
| 2018 | + | |
| 2019 | + global $wpdb, $plugin_prefix; | |
| 2020 | + | |
| 2021 | + $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : ''; | |
| 2022 | + | |
| 2023 | + $cf = trim($result_str, '_'); | |
| 2024 | + | |
| 2025 | + /*-------- check duplicate validation --------*/ | |
| 2026 | + | |
| 2027 | + $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : ''; | |
| 2028 | + $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; | |
| 2029 | + | |
| 2030 | + $post_type = $request_field['listing_type']; | |
| 2031 | + $data_type = isset($request_field['data_type']) ? $request_field['data_type'] : ''; | |
| 2032 | + $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : ''; | |
| 2033 | + $site_title = isset($request_field['site_title']) ? $request_field['site_title'] : ''; | |
| 2034 | + $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; | |
| 2035 | + $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : 0; | |
| 2036 | + $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : 0; | |
| 2037 | + $is_default = isset($request_field['is_default']) ? $request_field['is_default'] : ''; | |
| 2038 | + $asc = isset($request_field['asc']) ? $request_field['asc'] : 0; | |
| 2039 | + $desc = isset($request_field['desc']) ? $request_field['desc'] : 0; | |
| 2040 | + $asc_title = isset($request_field['asc_title']) ? $request_field['asc_title'] : ''; | |
| 2041 | + $desc_title = isset($request_field['desc_title']) ? $request_field['desc_title'] : ''; | |
| 2042 | + | |
| 2043 | + $default_order = ''; | |
| 2044 | +		if ($is_default != '') {
 | |
| 2045 | + $default_order = $is_default; | |
| 2046 | + $is_default = '1'; | |
| 2047 | + } | |
| 2048 | + | |
| 2049 | + | |
| 2050 | + $check_html_variable = $wpdb->get_var( | |
| 2051 | + $wpdb->prepare( | |
| 2052 | + "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ", | |
| 2053 | + array($cehhtmlvar_name, $post_type, $field_type) | |
| 2054 | + ) | |
| 2055 | + ); | |
| 2056 | + | |
| 2057 | +		if ($is_default == 1) {
 | |
| 2058 | + | |
| 2059 | +			$wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));
 | |
| 2060 | + | |
| 2061 | + } | |
| 2062 | + | |
| 2063 | + | |
| 2064 | +		if (!$check_html_variable) {
 | |
| 2065 | + | |
| 2066 | + $wpdb->query( | |
| 2067 | + | |
| 2068 | + $wpdb->prepare( | |
| 2069 | + | |
| 2070 | + "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set | |
| 2071 | 2071 | post_type = %s, | 
| 2072 | 2072 | data_type = %s, | 
| 2073 | 2073 | field_type = %s, | 
| @@ -2082,23 +2082,23 @@ discard block | ||
| 2082 | 2082 | asc_title = %s, | 
| 2083 | 2083 | desc_title = %s", | 
| 2084 | 2084 | |
| 2085 | - array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title) | |
| 2086 | - ) | |
| 2085 | + array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title) | |
| 2086 | + ) | |
| 2087 | 2087 | |
| 2088 | - ); | |
| 2088 | + ); | |
| 2089 | 2089 | |
| 2090 | 2090 | |
| 2091 | - $lastid = $wpdb->insert_id; | |
| 2091 | + $lastid = $wpdb->insert_id; | |
| 2092 | 2092 | |
| 2093 | - $lastid = trim($lastid); | |
| 2093 | + $lastid = trim($lastid); | |
| 2094 | 2094 | |
| 2095 | -        } else {
 | |
| 2095 | +		} else {
 | |
| 2096 | 2096 | |
| 2097 | - $wpdb->query( | |
| 2097 | + $wpdb->query( | |
| 2098 | 2098 | |
| 2099 | - $wpdb->prepare( | |
| 2099 | + $wpdb->prepare( | |
| 2100 | 2100 | |
| 2101 | - "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set | |
| 2101 | + "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set | |
| 2102 | 2102 | post_type = %s, | 
| 2103 | 2103 | data_type = %s, | 
| 2104 | 2104 | field_type = %s, | 
| @@ -2114,123 +2114,123 @@ discard block | ||
| 2114 | 2114 | desc_title = %s | 
| 2115 | 2115 | where id = %d", | 
| 2116 | 2116 | |
| 2117 | - array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title, $cf) | |
| 2118 | - ) | |
| 2117 | + array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title, $cf) | |
| 2118 | + ) | |
| 2119 | 2119 | |
| 2120 | - ); | |
| 2120 | + ); | |
| 2121 | 2121 | |
| 2122 | - $lastid = trim($cf); | |
| 2122 | + $lastid = trim($cf); | |
| 2123 | 2123 | |
| 2124 | - } | |
| 2124 | + } | |
| 2125 | 2125 | |
| 2126 | 2126 | |
| 2127 | - return (int)$lastid; | |
| 2127 | + return (int)$lastid; | |
| 2128 | 2128 | |
| 2129 | - } | |
| 2129 | + } | |
| 2130 | 2130 | } | 
| 2131 | 2131 | |
| 2132 | 2132 | |
| 2133 | 2133 |  if (!function_exists('geodir_custom_sort_field_delete')) {
 | 
| 2134 | - /** | |
| 2135 | - * Delete a custom sort field using field id. | |
| 2136 | - * @since 1.0.0 | |
| 2137 | - * @package GeoDirectory | |
| 2138 | - * @global object $wpdb WordPress Database object. | |
| 2139 | - * @global string $plugin_prefix Geodirectory plugin table prefix. | |
| 2140 | - * @param string $field_id The field ID. | |
| 2141 | - * @return int|string Returns field id when successful deletion, else returns 0. | |
| 2142 | - */ | |
| 2143 | - function geodir_custom_sort_field_delete($field_id = '') | |
| 2144 | -    {
 | |
| 2145 | - | |
| 2146 | - global $wpdb, $plugin_prefix; | |
| 2147 | -        if ($field_id != '') {
 | |
| 2148 | - $cf = trim($field_id, '_'); | |
| 2149 | - | |
| 2150 | -            $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));
 | |
| 2151 | - | |
| 2152 | - return $field_id; | |
| 2153 | - | |
| 2154 | - } else | |
| 2155 | - return 0; | |
| 2156 | - | |
| 2157 | - } | |
| 2134 | + /** | |
| 2135 | + * Delete a custom sort field using field id. | |
| 2136 | + * @since 1.0.0 | |
| 2137 | + * @package GeoDirectory | |
| 2138 | + * @global object $wpdb WordPress Database object. | |
| 2139 | + * @global string $plugin_prefix Geodirectory plugin table prefix. | |
| 2140 | + * @param string $field_id The field ID. | |
| 2141 | + * @return int|string Returns field id when successful deletion, else returns 0. | |
| 2142 | + */ | |
| 2143 | + function geodir_custom_sort_field_delete($field_id = '') | |
| 2144 | +	{
 | |
| 2145 | + | |
| 2146 | + global $wpdb, $plugin_prefix; | |
| 2147 | +		if ($field_id != '') {
 | |
| 2148 | + $cf = trim($field_id, '_'); | |
| 2149 | + | |
| 2150 | +			$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));
 | |
| 2151 | + | |
| 2152 | + return $field_id; | |
| 2153 | + | |
| 2154 | + } else | |
| 2155 | + return 0; | |
| 2156 | + | |
| 2157 | + } | |
| 2158 | 2158 | } | 
| 2159 | 2159 | |
| 2160 | 2160 | |
| 2161 | 2161 |  if (!function_exists('geodir_custom_sort_field_adminhtml')) {
 | 
| 2162 | - /** | |
| 2163 | - * Custom sort field admin html. | |
| 2164 | - * | |
| 2165 | - * @since 1.0.0 | |
| 2166 | - * @package GeoDirectory | |
| 2167 | - * @global object $wpdb WordPress Database object. | |
| 2168 | - * @param string $field_type The form field type. | |
| 2169 | - * @param object|int $result_str The custom field results object or row id. | |
| 2170 | - * @param string $field_ins_upd When set to "submit" displays form. | |
| 2171 | - * @param bool $default when set to true field will be for admin use only. | |
| 2172 | - */ | |
| 2173 | - function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='') | |
| 2174 | -    {
 | |
| 2175 | - global $wpdb; | |
| 2176 | - $cf = $result_str; | |
| 2177 | -        if (!is_object($cf)) {
 | |
| 2178 | -            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));
 | |
| 2179 | -        } else {
 | |
| 2180 | - $field_info = $cf; | |
| 2181 | - $result_str = $cf->id; | |
| 2182 | - } | |
| 2183 | - | |
| 2184 | - $field_info = stripslashes_deep($field_info); // strip slashes | |
| 2185 | - | |
| 2186 | -        if (!isset($field_info->post_type)) {
 | |
| 2187 | - $post_type = sanitize_text_field($_REQUEST['listing_type']); | |
| 2188 | -        } else {
 | |
| 2189 | - $post_type = $field_info->post_type; | |
| 2190 | - } | |
| 2191 | - | |
| 2192 | - | |
| 2193 | - $htmlvar_name = isset($field_type_key) ? $field_type_key : ''; | |
| 2194 | - | |
| 2195 | - $site_title = ''; | |
| 2196 | - if ($site_title == '') | |
| 2197 | - $site_title = isset($field_info->site_title) ? $field_info->site_title : ''; | |
| 2198 | - | |
| 2199 | -        if ($site_title == '') {
 | |
| 2200 | - $fields = geodir_get_custom_sort_options($post_type); | |
| 2201 | - | |
| 2202 | -            foreach ($fields as $val) {
 | |
| 2203 | - $val = stripslashes_deep($val); // strip slashes | |
| 2204 | - | |
| 2205 | -                if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {
 | |
| 2206 | - $site_title = isset($val['site_title']) ? $val['site_title'] : ''; | |
| 2207 | - } | |
| 2208 | - } | |
| 2209 | - } | |
| 2210 | - | |
| 2211 | - if ($htmlvar_name == '') | |
| 2212 | - $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : ''; | |
| 2213 | - | |
| 2214 | -        $nonce = wp_create_nonce('custom_fields_' . $result_str);
 | |
| 2215 | - | |
| 2216 | - $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>'; | |
| 2217 | - $cso_arr = geodir_get_custom_sort_options($post_type); | |
| 2218 | - | |
| 2219 | - $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']); | |
| 2220 | -        foreach($cso_arr as $cso){
 | |
| 2221 | -            if($cur_field_type==$cso['field_type']){
 | |
| 2222 | - | |
| 2223 | -                if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
 | |
| 2224 | - $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>'; | |
| 2225 | -                }elseif(isset($cso['field_icon']) && $cso['field_icon']){
 | |
| 2226 | -                    $field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';
 | |
| 2227 | - } | |
| 2228 | - | |
| 2229 | - } | |
| 2230 | - } | |
| 2231 | - | |
| 2232 | - $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500); | |
| 2233 | - ?> | |
| 2162 | + /** | |
| 2163 | + * Custom sort field admin html. | |
| 2164 | + * | |
| 2165 | + * @since 1.0.0 | |
| 2166 | + * @package GeoDirectory | |
| 2167 | + * @global object $wpdb WordPress Database object. | |
| 2168 | + * @param string $field_type The form field type. | |
| 2169 | + * @param object|int $result_str The custom field results object or row id. | |
| 2170 | + * @param string $field_ins_upd When set to "submit" displays form. | |
| 2171 | + * @param bool $default when set to true field will be for admin use only. | |
| 2172 | + */ | |
| 2173 | + function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='') | |
| 2174 | +	{
 | |
| 2175 | + global $wpdb; | |
| 2176 | + $cf = $result_str; | |
| 2177 | +		if (!is_object($cf)) {
 | |
| 2178 | +			$field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));
 | |
| 2179 | +		} else {
 | |
| 2180 | + $field_info = $cf; | |
| 2181 | + $result_str = $cf->id; | |
| 2182 | + } | |
| 2183 | + | |
| 2184 | + $field_info = stripslashes_deep($field_info); // strip slashes | |
| 2185 | + | |
| 2186 | +		if (!isset($field_info->post_type)) {
 | |
| 2187 | + $post_type = sanitize_text_field($_REQUEST['listing_type']); | |
| 2188 | +		} else {
 | |
| 2189 | + $post_type = $field_info->post_type; | |
| 2190 | + } | |
| 2191 | + | |
| 2192 | + | |
| 2193 | + $htmlvar_name = isset($field_type_key) ? $field_type_key : ''; | |
| 2194 | + | |
| 2195 | + $site_title = ''; | |
| 2196 | + if ($site_title == '') | |
| 2197 | + $site_title = isset($field_info->site_title) ? $field_info->site_title : ''; | |
| 2198 | + | |
| 2199 | +		if ($site_title == '') {
 | |
| 2200 | + $fields = geodir_get_custom_sort_options($post_type); | |
| 2201 | + | |
| 2202 | +			foreach ($fields as $val) {
 | |
| 2203 | + $val = stripslashes_deep($val); // strip slashes | |
| 2204 | + | |
| 2205 | +				if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {
 | |
| 2206 | + $site_title = isset($val['site_title']) ? $val['site_title'] : ''; | |
| 2207 | + } | |
| 2208 | + } | |
| 2209 | + } | |
| 2210 | + | |
| 2211 | + if ($htmlvar_name == '') | |
| 2212 | + $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : ''; | |
| 2213 | + | |
| 2214 | +		$nonce = wp_create_nonce('custom_fields_' . $result_str);
 | |
| 2215 | + | |
| 2216 | + $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>'; | |
| 2217 | + $cso_arr = geodir_get_custom_sort_options($post_type); | |
| 2218 | + | |
| 2219 | + $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']); | |
| 2220 | +		foreach($cso_arr as $cso){
 | |
| 2221 | +			if($cur_field_type==$cso['field_type']){
 | |
| 2222 | + | |
| 2223 | +				if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
 | |
| 2224 | + $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>'; | |
| 2225 | +				}elseif(isset($cso['field_icon']) && $cso['field_icon']){
 | |
| 2226 | +					$field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';
 | |
| 2227 | + } | |
| 2228 | + | |
| 2229 | + } | |
| 2230 | + } | |
| 2231 | + | |
| 2232 | + $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500); | |
| 2233 | + ?> | |
| 2234 | 2234 | |
| 2235 | 2235 | <li class="text" id="licontainer_<?php echo $result_str;?>"> | 
| 2236 | 2236 | <form><!-- we need to wrap in a form so we can use radio buttons with same name --> | 
| @@ -2239,7 +2239,7 @@ discard block | ||
| 2239 | 2239 |                   ondblclick="show_hide('field_frm<?php echo $result_str;?>')">
 | 
| 2240 | 2240 | <?php | 
| 2241 | 2241 | |
| 2242 | - ?> | |
| 2242 | + ?> | |
| 2243 | 2243 | |
| 2244 | 2244 |                  <div title="<?php _e('Click to remove field', 'geodirectory');?>"
 | 
| 2245 | 2245 |                       onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"
 | 
| @@ -2254,17 +2254,17 @@ discard block | ||
| 2254 | 2254 | |
| 2255 | 2255 | <div id="field_frm<?php echo $result_str;?>" class="field_frm" | 
| 2256 | 2256 |                   style="display:<?php if ($field_ins_upd == 'submit') {
 | 
| 2257 | - echo 'block;'; | |
| 2258 | -                 } else {
 | |
| 2259 | - echo 'none;'; | |
| 2260 | - } ?>"> | |
| 2257 | + echo 'block;'; | |
| 2258 | +				 } else {
 | |
| 2259 | + echo 'none;'; | |
| 2260 | + } ?>"> | |
| 2261 | 2261 | <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/> | 
| 2262 | 2262 | <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/> | 
| 2263 | 2263 | <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/> | 
| 2264 | 2264 | <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str;?>"/> | 
| 2265 | 2265 |                  <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {
 | 
| 2266 | - echo $field_info->data_type; | |
| 2267 | - }?>"/> | |
| 2266 | + echo $field_info->data_type; | |
| 2267 | + }?>"/> | |
| 2268 | 2268 | <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name;?>"/> | 
| 2269 | 2269 | |
| 2270 | 2270 | |
| @@ -2287,14 +2287,14 @@ discard block | ||
| 2287 | 2287 | |
| 2288 | 2288 | <input type="radio" id="asc_yes<?php echo $radio_id;?>" name="asc" class="gdri-enabled" value="1" | 
| 2289 | 2289 |                                      <?php if ($value == '1') {
 | 
| 2290 | - echo 'checked'; | |
| 2291 | - } ?>/> | |
| 2290 | + echo 'checked'; | |
| 2291 | + } ?>/> | |
| 2292 | 2292 |                                  <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | 
| 2293 | 2293 | |
| 2294 | 2294 | <input type="radio" id="asc_no<?php echo $radio_id;?>" name="asc" class="gdri-disabled" value="0" | 
| 2295 | 2295 |                                      <?php if ($value == '0' || !$value) {
 | 
| 2296 | - echo 'checked'; | |
| 2297 | - } ?>/> | |
| 2296 | + echo 'checked'; | |
| 2297 | + } ?>/> | |
| 2298 | 2298 |                                  <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | 
| 2299 | 2299 | |
| 2300 | 2300 | </div> | 
| @@ -2331,8 +2331,8 @@ discard block | ||
| 2331 | 2331 | |
| 2332 | 2332 | <input type="radio" name="is_default" | 
| 2333 | 2333 |                                         value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {
 | 
| 2334 | - echo 'checked="checked"'; | |
| 2335 | - } ?>/> | |
| 2334 | + echo 'checked="checked"'; | |
| 2335 | + } ?>/> | |
| 2336 | 2336 | </div> | 
| 2337 | 2337 | |
| 2338 | 2338 | </li> | 
| @@ -2352,14 +2352,14 @@ discard block | ||
| 2352 | 2352 | |
| 2353 | 2353 | <input type="radio" id="desc_yes<?php echo $radio_id;?>" name="desc" class="gdri-enabled" value="1" | 
| 2354 | 2354 |                                      <?php if ($value == '1') {
 | 
| 2355 | - echo 'checked'; | |
| 2356 | - } ?>/> | |
| 2355 | + echo 'checked'; | |
| 2356 | + } ?>/> | |
| 2357 | 2357 |                                  <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | 
| 2358 | 2358 | |
| 2359 | 2359 | <input type="radio" id="desc_no<?php echo $radio_id;?>" name="desc" class="gdri-disabled" value="0" | 
| 2360 | 2360 |                                      <?php if ($value == '0' || !$value) {
 | 
| 2361 | - echo 'checked'; | |
| 2362 | - } ?>/> | |
| 2361 | + echo 'checked'; | |
| 2362 | + } ?>/> | |
| 2363 | 2363 |                                  <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | 
| 2364 | 2364 | |
| 2365 | 2365 | </div> | 
| @@ -2395,8 +2395,8 @@ discard block | ||
| 2395 | 2395 | |
| 2396 | 2396 | <input type="radio" name="is_default" | 
| 2397 | 2397 |                                         value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {
 | 
| 2398 | - echo 'checked="checked"'; | |
| 2399 | - } ?>/> | |
| 2398 | + echo 'checked="checked"'; | |
| 2399 | + } ?>/> | |
| 2400 | 2400 | </div> | 
| 2401 | 2401 | |
| 2402 | 2402 | </li> | 
| @@ -2438,8 +2438,8 @@ discard block | ||
| 2438 | 2438 | |
| 2439 | 2439 | <input type="checkbox" name="is_default" | 
| 2440 | 2440 |                                         value="<?php echo $field_type; ?>"  <?php if (isset($value) && $value == '1') {
 | 
| 2441 | - echo 'checked="checked"'; | |
| 2442 | - } ?>/> | |
| 2441 | + echo 'checked="checked"'; | |
| 2442 | + } ?>/> | |
| 2443 | 2443 | </div> | 
| 2444 | 2444 | |
| 2445 | 2445 | |
| @@ -2462,14 +2462,14 @@ discard block | ||
| 2462 | 2462 | |
| 2463 | 2463 | <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled" value="1" | 
| 2464 | 2464 |                                  <?php if ($value == '1') {
 | 
| 2465 | - echo 'checked'; | |
| 2466 | - } ?>/> | |
| 2465 | + echo 'checked'; | |
| 2466 | + } ?>/> | |
| 2467 | 2467 |                              <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | 
| 2468 | 2468 | |
| 2469 | 2469 | <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0" | 
| 2470 | 2470 |                                  <?php if ($value == '0' || !$value) {
 | 
| 2471 | - echo 'checked'; | |
| 2472 | - } ?>/> | |
| 2471 | + echo 'checked'; | |
| 2472 | + } ?>/> | |
| 2473 | 2473 |                              <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | 
| 2474 | 2474 | |
| 2475 | 2475 | </div> | 
| @@ -2479,8 +2479,8 @@ discard block | ||
| 2479 | 2479 | |
| 2480 | 2480 | <input type="hidden" readonly="readonly" name="sort_order" id="sort_order" | 
| 2481 | 2481 |                                                  value="<?php if (isset($field_info->sort_order)) {
 | 
| 2482 | - echo esc_attr($field_info->sort_order); | |
| 2483 | - }?>" size="50"/> | |
| 2482 | + echo esc_attr($field_info->sort_order); | |
| 2483 | + }?>" size="50"/> | |
| 2484 | 2484 | |
| 2485 | 2485 | |
| 2486 | 2486 | |
| @@ -2504,38 +2504,38 @@ discard block | ||
| 2504 | 2504 | </form> | 
| 2505 | 2505 | </li> <?php | 
| 2506 | 2506 | |
| 2507 | - } | |
| 2507 | + } | |
| 2508 | 2508 | } | 
| 2509 | 2509 | |
| 2510 | 2510 |  if (!function_exists('check_field_visibility')) {
 | 
| 2511 | - /** | |
| 2512 | - * Check field visibility as per price package. | |
| 2513 | - * | |
| 2514 | - * @since 1.0.0 | |
| 2515 | - * @package GeoDirectory | |
| 2516 | - * @global object $wpdb WordPress Database object. | |
| 2517 | - * @global array $geodir_addon_list List of active GeoDirectory extensions. | |
| 2518 | - * @param int|string $package_id The package ID. | |
| 2519 | - * @param string $field_name The field name. | |
| 2520 | - * @param string $post_type Optional. The wordpress post type. | |
| 2521 | - * @return bool Returns true when field visible, otherwise false. | |
| 2522 | - */ | |
| 2523 | - function check_field_visibility($package_id, $field_name, $post_type) | |
| 2524 | -    {
 | |
| 2525 | - global $wpdb, $geodir_addon_list; | |
| 2526 | -        if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {
 | |
| 2527 | - return true; | |
| 2528 | - } | |
| 2529 | -        if (!$package_id || !$field_name || !$post_type) {
 | |
| 2530 | - return true; | |
| 2531 | - } | |
| 2532 | -        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));
 | |
| 2533 | - | |
| 2534 | -        if ($wpdb->get_var($sql)) {
 | |
| 2535 | - return true; | |
| 2536 | - } | |
| 2537 | - return false; | |
| 2538 | - } | |
| 2511 | + /** | |
| 2512 | + * Check field visibility as per price package. | |
| 2513 | + * | |
| 2514 | + * @since 1.0.0 | |
| 2515 | + * @package GeoDirectory | |
| 2516 | + * @global object $wpdb WordPress Database object. | |
| 2517 | + * @global array $geodir_addon_list List of active GeoDirectory extensions. | |
| 2518 | + * @param int|string $package_id The package ID. | |
| 2519 | + * @param string $field_name The field name. | |
| 2520 | + * @param string $post_type Optional. The wordpress post type. | |
| 2521 | + * @return bool Returns true when field visible, otherwise false. | |
| 2522 | + */ | |
| 2523 | + function check_field_visibility($package_id, $field_name, $post_type) | |
| 2524 | +	{
 | |
| 2525 | + global $wpdb, $geodir_addon_list; | |
| 2526 | +		if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {
 | |
| 2527 | + return true; | |
| 2528 | + } | |
| 2529 | +		if (!$package_id || !$field_name || !$post_type) {
 | |
| 2530 | + return true; | |
| 2531 | + } | |
| 2532 | +		$sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));
 | |
| 2533 | + | |
| 2534 | +		if ($wpdb->get_var($sql)) {
 | |
| 2535 | + return true; | |
| 2536 | + } | |
| 2537 | + return false; | |
| 2538 | + } | |
| 2539 | 2539 | } | 
| 2540 | 2540 | |
| 2541 | 2541 | /** | 
| @@ -2551,43 +2551,43 @@ discard block | ||
| 2551 | 2551 | */ | 
| 2552 | 2552 | function geodir_string_to_options($input = '', $translated = false) | 
| 2553 | 2553 |  {
 | 
| 2554 | - $return = array(); | |
| 2555 | -    if ($input != '') {
 | |
| 2556 | - $input = trim($input); | |
| 2557 | - $input = rtrim($input, ","); | |
| 2558 | - $input = ltrim($input, ","); | |
| 2559 | - $input = trim($input); | |
| 2560 | - } | |
| 2561 | - | |
| 2562 | -    $input_arr = explode(',', $input);
 | |
| 2563 | - | |
| 2564 | -    if (!empty($input_arr)) {
 | |
| 2565 | -        foreach ($input_arr as $input_str) {
 | |
| 2566 | - $input_str = trim($input_str); | |
| 2567 | - | |
| 2568 | -            if (strpos($input_str, "/") !== false) {
 | |
| 2569 | -                $input_str = explode("/", $input_str, 2);
 | |
| 2570 | - $label = trim($input_str[0]); | |
| 2571 | -                if ($translated && $label != '') {
 | |
| 2572 | - $label = __($label, 'geodirectory'); | |
| 2573 | - } | |
| 2574 | - $label = ucfirst($label); | |
| 2575 | - $value = trim($input_str[1]); | |
| 2576 | -            } else {
 | |
| 2577 | - $value = $input_str; | |
| 2578 | -                if ($translated && $input_str != '') {
 | |
| 2579 | - $input_str = __($input_str, 'geodirectory'); | |
| 2580 | - } | |
| 2581 | - $label = ucfirst($input_str); | |
| 2582 | - } | |
| 2583 | - | |
| 2584 | -            if ($label != '') {
 | |
| 2585 | -                $return[] = array('label' => $label, 'value' => $value, 'optgroup' => NULL);
 | |
| 2586 | - } | |
| 2587 | - } | |
| 2588 | - } | |
| 2589 | - | |
| 2590 | - return $return; | |
| 2554 | + $return = array(); | |
| 2555 | +	if ($input != '') {
 | |
| 2556 | + $input = trim($input); | |
| 2557 | + $input = rtrim($input, ","); | |
| 2558 | + $input = ltrim($input, ","); | |
| 2559 | + $input = trim($input); | |
| 2560 | + } | |
| 2561 | + | |
| 2562 | +	$input_arr = explode(',', $input);
 | |
| 2563 | + | |
| 2564 | +	if (!empty($input_arr)) {
 | |
| 2565 | +		foreach ($input_arr as $input_str) {
 | |
| 2566 | + $input_str = trim($input_str); | |
| 2567 | + | |
| 2568 | +			if (strpos($input_str, "/") !== false) {
 | |
| 2569 | +				$input_str = explode("/", $input_str, 2);
 | |
| 2570 | + $label = trim($input_str[0]); | |
| 2571 | +				if ($translated && $label != '') {
 | |
| 2572 | + $label = __($label, 'geodirectory'); | |
| 2573 | + } | |
| 2574 | + $label = ucfirst($label); | |
| 2575 | + $value = trim($input_str[1]); | |
| 2576 | +			} else {
 | |
| 2577 | + $value = $input_str; | |
| 2578 | +				if ($translated && $input_str != '') {
 | |
| 2579 | + $input_str = __($input_str, 'geodirectory'); | |
| 2580 | + } | |
| 2581 | + $label = ucfirst($input_str); | |
| 2582 | + } | |
| 2583 | + | |
| 2584 | +			if ($label != '') {
 | |
| 2585 | +				$return[] = array('label' => $label, 'value' => $value, 'optgroup' => NULL);
 | |
| 2586 | + } | |
| 2587 | + } | |
| 2588 | + } | |
| 2589 | + | |
| 2590 | + return $return; | |
| 2591 | 2591 | } | 
| 2592 | 2592 | |
| 2593 | 2593 | /** | 
| @@ -2602,66 +2602,66 @@ discard block | ||
| 2602 | 2602 | */ | 
| 2603 | 2603 | function geodir_string_values_to_options($option_values = '', $translated = false) | 
| 2604 | 2604 |  {
 | 
| 2605 | - $options = array(); | |
| 2606 | -    if ($option_values == '') {
 | |
| 2607 | - return NULL; | |
| 2608 | - } | |
| 2609 | - | |
| 2610 | -    if (strpos($option_values, "{/optgroup}") !== false) {
 | |
| 2611 | -        $option_values_arr = explode("{/optgroup}", $option_values);
 | |
| 2612 | - | |
| 2613 | -        foreach ($option_values_arr as $optgroup) {
 | |
| 2614 | -            if (strpos($optgroup, "{optgroup}") !== false) {
 | |
| 2615 | -                $optgroup_arr = explode("{optgroup}", $optgroup);
 | |
| 2616 | - | |
| 2617 | - $count = 0; | |
| 2618 | -                foreach ($optgroup_arr as $optgroup_str) {
 | |
| 2619 | - $count++; | |
| 2620 | - $optgroup_str = trim($optgroup_str); | |
| 2621 | - | |
| 2622 | - $optgroup_label = ''; | |
| 2623 | -                    if (strpos($optgroup_str, "|") !== false) {
 | |
| 2624 | -                        $optgroup_str_arr = explode("|", $optgroup_str, 2);
 | |
| 2625 | - $optgroup_label = trim($optgroup_str_arr[0]); | |
| 2626 | -                        if ($translated && $optgroup_label != '') {
 | |
| 2627 | - $optgroup_label = __($optgroup_label, 'geodirectory'); | |
| 2628 | - } | |
| 2629 | - $optgroup_label = ucfirst($optgroup_label); | |
| 2630 | - $optgroup_str = $optgroup_str_arr[1]; | |
| 2631 | - } | |
| 2632 | - | |
| 2633 | - $optgroup3 = geodir_string_to_options($optgroup_str, $translated); | |
| 2634 | - | |
| 2635 | -                    if ($count > 1 && $optgroup_label != '' && !empty($optgroup3)) {
 | |
| 2636 | -                        $optgroup_start = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'start'));
 | |
| 2637 | -                        $optgroup_end = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'end'));
 | |
| 2638 | - $optgroup3 = array_merge($optgroup_start, $optgroup3, $optgroup_end); | |
| 2639 | - } | |
| 2640 | - $options = array_merge($options, $optgroup3); | |
| 2641 | - } | |
| 2642 | -            } else {
 | |
| 2643 | - $optgroup1 = geodir_string_to_options($optgroup, $translated); | |
| 2644 | - $options = array_merge($options, $optgroup1); | |
| 2645 | - } | |
| 2646 | - } | |
| 2647 | -    } else {
 | |
| 2648 | - $options = geodir_string_to_options($option_values, $translated); | |
| 2649 | - } | |
| 2650 | - | |
| 2651 | - return $options; | |
| 2605 | + $options = array(); | |
| 2606 | +	if ($option_values == '') {
 | |
| 2607 | + return NULL; | |
| 2608 | + } | |
| 2609 | + | |
| 2610 | +	if (strpos($option_values, "{/optgroup}") !== false) {
 | |
| 2611 | +		$option_values_arr = explode("{/optgroup}", $option_values);
 | |
| 2612 | + | |
| 2613 | +		foreach ($option_values_arr as $optgroup) {
 | |
| 2614 | +			if (strpos($optgroup, "{optgroup}") !== false) {
 | |
| 2615 | +				$optgroup_arr = explode("{optgroup}", $optgroup);
 | |
| 2616 | + | |
| 2617 | + $count = 0; | |
| 2618 | +				foreach ($optgroup_arr as $optgroup_str) {
 | |
| 2619 | + $count++; | |
| 2620 | + $optgroup_str = trim($optgroup_str); | |
| 2621 | + | |
| 2622 | + $optgroup_label = ''; | |
| 2623 | +					if (strpos($optgroup_str, "|") !== false) {
 | |
| 2624 | +						$optgroup_str_arr = explode("|", $optgroup_str, 2);
 | |
| 2625 | + $optgroup_label = trim($optgroup_str_arr[0]); | |
| 2626 | +						if ($translated && $optgroup_label != '') {
 | |
| 2627 | + $optgroup_label = __($optgroup_label, 'geodirectory'); | |
| 2628 | + } | |
| 2629 | + $optgroup_label = ucfirst($optgroup_label); | |
| 2630 | + $optgroup_str = $optgroup_str_arr[1]; | |
| 2631 | + } | |
| 2632 | + | |
| 2633 | + $optgroup3 = geodir_string_to_options($optgroup_str, $translated); | |
| 2634 | + | |
| 2635 | +					if ($count > 1 && $optgroup_label != '' && !empty($optgroup3)) {
 | |
| 2636 | +						$optgroup_start = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'start'));
 | |
| 2637 | +						$optgroup_end = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'end'));
 | |
| 2638 | + $optgroup3 = array_merge($optgroup_start, $optgroup3, $optgroup_end); | |
| 2639 | + } | |
| 2640 | + $options = array_merge($options, $optgroup3); | |
| 2641 | + } | |
| 2642 | +			} else {
 | |
| 2643 | + $optgroup1 = geodir_string_to_options($optgroup, $translated); | |
| 2644 | + $options = array_merge($options, $optgroup1); | |
| 2645 | + } | |
| 2646 | + } | |
| 2647 | +	} else {
 | |
| 2648 | + $options = geodir_string_to_options($option_values, $translated); | |
| 2649 | + } | |
| 2650 | + | |
| 2651 | + return $options; | |
| 2652 | 2652 | } | 
| 2653 | 2653 | |
| 2654 | 2654 | |
| 2655 | 2655 |  function geodir_cfa_data_type_text($output,$result_str,$cf,$field_info){
 | 
| 2656 | - ob_start(); | |
| 2657 | - | |
| 2658 | - $dt_value = ''; | |
| 2659 | -    if (isset($field_info->data_type)) {
 | |
| 2660 | - $dt_value = esc_attr($field_info->data_type); | |
| 2661 | -    }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
 | |
| 2662 | - $dt_value = $cf['defaults']['data_type']; | |
| 2663 | - } | |
| 2664 | - ?> | |
| 2656 | + ob_start(); | |
| 2657 | + | |
| 2658 | + $dt_value = ''; | |
| 2659 | +	if (isset($field_info->data_type)) {
 | |
| 2660 | + $dt_value = esc_attr($field_info->data_type); | |
| 2661 | +	}elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
 | |
| 2662 | + $dt_value = $cf['defaults']['data_type']; | |
| 2663 | + } | |
| 2664 | + ?> | |
| 2665 | 2665 | <li> | 
| 2666 | 2666 |          <label for="data_type"><?php _e('Field Data Type ? :', 'geodirectory'); ?></label>
 | 
| 2667 | 2667 | <div class="gd-cf-input-wrap"> | 
| @@ -2670,16 +2670,16 @@ discard block | ||
| 2670 | 2670 | onchange="javascript:gd_data_type_changed(this, '<?php echo $result_str; ?>');"> | 
| 2671 | 2671 | <option | 
| 2672 | 2672 |                      value="XVARCHAR" <?php if ($dt_value  == 'VARCHAR') {
 | 
| 2673 | - echo 'selected="selected"'; | |
| 2674 | -                } ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>
 | |
| 2673 | + echo 'selected="selected"'; | |
| 2674 | +				} ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>
 | |
| 2675 | 2675 | <option | 
| 2676 | 2676 |                      value="INT" <?php if ($dt_value   == 'INT') {
 | 
| 2677 | - echo 'selected="selected"'; | |
| 2678 | -                } ?>><?php _e('NUMBER', 'geodirectory'); ?></option>
 | |
| 2677 | + echo 'selected="selected"'; | |
| 2678 | +				} ?>><?php _e('NUMBER', 'geodirectory'); ?></option>
 | |
| 2679 | 2679 | <option | 
| 2680 | 2680 |                      value="FLOAT" <?php if ($dt_value   == 'FLOAT') {
 | 
| 2681 | - echo 'selected="selected"'; | |
| 2682 | -                } ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>
 | |
| 2681 | + echo 'selected="selected"'; | |
| 2682 | +				} ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>
 | |
| 2683 | 2683 | </select> | 
| 2684 | 2684 |              <br/> <span><?php _e('Select Custom Field type', 'geodirectory'); ?></span>
 | 
| 2685 | 2685 | |
| @@ -2687,13 +2687,13 @@ discard block | ||
| 2687 | 2687 | </li> | 
| 2688 | 2688 | |
| 2689 | 2689 | <?php | 
| 2690 | - $value = ''; | |
| 2691 | -    if (isset($field_info->decimal_point)) {
 | |
| 2692 | - $value = esc_attr($field_info->decimal_point); | |
| 2693 | -    }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
 | |
| 2694 | - $value = $cf['defaults']['decimal_point']; | |
| 2695 | - } | |
| 2696 | - ?> | |
| 2690 | + $value = ''; | |
| 2691 | +	if (isset($field_info->decimal_point)) {
 | |
| 2692 | + $value = esc_attr($field_info->decimal_point); | |
| 2693 | +	}elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
 | |
| 2694 | + $value = $cf['defaults']['decimal_point']; | |
| 2695 | + } | |
| 2696 | + ?> | |
| 2697 | 2697 | |
| 2698 | 2698 | <li class="decimal-point-wrapper" | 
| 2699 | 2699 | style="<?php echo ($dt_value == 'FLOAT') ? '' : 'display:none' ?>"> | 
| @@ -2702,7 +2702,7 @@ discard block | ||
| 2702 | 2702 | <select name="decimal_point" id="decimal_point"> | 
| 2703 | 2703 |                  <option value=""><?php echo _e('Select', 'geodirectory'); ?></option>
 | 
| 2704 | 2704 |                  <?php for ($i = 1; $i <= 10; $i++) {
 | 
| 2705 | - $selected = $i == $value ? 'selected="selected"' : ''; ?> | |
| 2705 | + $selected = $i == $value ? 'selected="selected"' : ''; ?> | |
| 2706 | 2706 | <option value="<?php echo $i; ?>" <?php echo $selected; ?>><?php echo $i; ?></option> | 
| 2707 | 2707 | <?php } ?> | 
| 2708 | 2708 | </select> | 
| @@ -2711,8 +2711,8 @@ discard block | ||
| 2711 | 2711 | </li> | 
| 2712 | 2712 | <?php | 
| 2713 | 2713 | |
| 2714 | - $output = ob_get_clean(); | |
| 2715 | - return $output; | |
| 2714 | + $output = ob_get_clean(); | |
| 2715 | + return $output; | |
| 2716 | 2716 | } | 
| 2717 | 2717 |  add_filter('geodir_cfa_data_type_text','geodir_cfa_data_type_text',10,4);
 | 
| 2718 | 2718 | |
| @@ -2748,9 +2748,9 @@ discard block | ||
| 2748 | 2748 | |
| 2749 | 2749 | |
| 2750 | 2750 |  function geodir_cfa_advanced_editor_geodir_special_offers($output,$result_str,$cf,$field_info){
 | 
| 2751 | -    if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}
 | |
| 2752 | - ob_start(); | |
| 2753 | - ?> | |
| 2751 | +	if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}
 | |
| 2752 | + ob_start(); | |
| 2753 | + ?> | |
| 2754 | 2754 | <li> | 
| 2755 | 2755 |          <label for="advanced_editor" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show advanced editor :', 'geodirectory'); ?>
 | 
| 2756 | 2756 | <div class="gdcf-tooltip"> | 
| @@ -2761,13 +2761,13 @@ discard block | ||
| 2761 | 2761 | <div class="gd-cf-input-wrap"> | 
| 2762 | 2762 | |
| 2763 | 2763 | <?php | 
| 2764 | - $selected = ''; | |
| 2765 | - if (isset($field_info->extra_fields)) | |
| 2766 | - $advanced_editor = unserialize($field_info->extra_fields); | |
| 2764 | + $selected = ''; | |
| 2765 | + if (isset($field_info->extra_fields)) | |
| 2766 | + $advanced_editor = unserialize($field_info->extra_fields); | |
| 2767 | 2767 | |
| 2768 | -            if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))
 | |
| 2769 | - $selected = 'checked="checked"'; | |
| 2770 | - ?> | |
| 2768 | +			if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))
 | |
| 2769 | + $selected = 'checked="checked"'; | |
| 2770 | + ?> | |
| 2771 | 2771 | |
| 2772 | 2772 | <input type="checkbox" name="advanced_editor[]" id="advanced_editor" | 
| 2773 | 2773 | value="1" <?php echo $selected; ?>/> | 
| @@ -2776,22 +2776,22 @@ discard block | ||
| 2776 | 2776 | </li> | 
| 2777 | 2777 | <?php | 
| 2778 | 2778 | |
| 2779 | - $output = ob_get_clean(); | |
| 2780 | - return $output; | |
| 2779 | + $output = ob_get_clean(); | |
| 2780 | + return $output; | |
| 2781 | 2781 | } | 
| 2782 | 2782 |  add_filter('geodir_cfa_advanced_editor_textarea','geodir_cfa_advanced_editor_geodir_special_offers',10,4);
 | 
| 2783 | 2783 | |
| 2784 | 2784 | |
| 2785 | 2785 |  function geodir_cfa_validation_pattern_text($output,$result_str,$cf,$field_info){
 | 
| 2786 | - ob_start(); | |
| 2787 | - | |
| 2788 | - $value = ''; | |
| 2789 | -    if (isset($field_info->validation_pattern)) {
 | |
| 2790 | - $value = esc_attr($field_info->validation_pattern); | |
| 2791 | -    }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
 | |
| 2792 | - $value = esc_attr($cf['defaults']['validation_pattern']); | |
| 2793 | - } | |
| 2794 | - ?> | |
| 2786 | + ob_start(); | |
| 2787 | + | |
| 2788 | + $value = ''; | |
| 2789 | +	if (isset($field_info->validation_pattern)) {
 | |
| 2790 | + $value = esc_attr($field_info->validation_pattern); | |
| 2791 | +	}elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
 | |
| 2792 | + $value = esc_attr($cf['defaults']['validation_pattern']); | |
| 2793 | + } | |
| 2794 | + ?> | |
| 2795 | 2795 | <li> | 
| 2796 | 2796 | <label for="validation_pattern" class="gd-cf-tooltip-wrap"> | 
| 2797 | 2797 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Validation Pattern:', 'geodirectory'); ?>
 | 
| @@ -2805,13 +2805,13 @@ discard block | ||
| 2805 | 2805 | </div> | 
| 2806 | 2806 | </li> | 
| 2807 | 2807 | <?php | 
| 2808 | - $value = ''; | |
| 2809 | -    if (isset($field_info->validation_msg)) {
 | |
| 2810 | - $value = esc_attr($field_info->validation_msg); | |
| 2811 | -    }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
 | |
| 2812 | - $value = esc_attr($cf['defaults']['validation_msg']); | |
| 2813 | - } | |
| 2814 | - ?> | |
| 2808 | + $value = ''; | |
| 2809 | +	if (isset($field_info->validation_msg)) {
 | |
| 2810 | + $value = esc_attr($field_info->validation_msg); | |
| 2811 | +	}elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
 | |
| 2812 | + $value = esc_attr($cf['defaults']['validation_msg']); | |
| 2813 | + } | |
| 2814 | + ?> | |
| 2815 | 2815 | <li> | 
| 2816 | 2816 | <label for="validation_msg" class="gd-cf-tooltip-wrap"> | 
| 2817 | 2817 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Validation Message:', 'geodirectory'); ?>
 | 
| @@ -2826,21 +2826,21 @@ discard block | ||
| 2826 | 2826 | </li> | 
| 2827 | 2827 | <?php | 
| 2828 | 2828 | |
| 2829 | - $output = ob_get_clean(); | |
| 2830 | - return $output; | |
| 2829 | + $output = ob_get_clean(); | |
| 2830 | + return $output; | |
| 2831 | 2831 | } | 
| 2832 | 2832 |  add_filter('geodir_cfa_validation_pattern_text','geodir_cfa_validation_pattern_text',10,4);
 | 
| 2833 | 2833 | |
| 2834 | 2834 | |
| 2835 | 2835 |  function geodir_cfa_htmlvar_name_taxonomy($output,$result_str,$cf,$field_info){
 | 
| 2836 | - ob_start(); | |
| 2837 | - global $post_type; | |
| 2838 | - | |
| 2839 | -    if (!isset($field_info->post_type)) {
 | |
| 2840 | - $post_type = sanitize_text_field($_REQUEST['listing_type']); | |
| 2841 | - } else | |
| 2842 | - $post_type = $field_info->post_type; | |
| 2843 | - ?> | |
| 2836 | + ob_start(); | |
| 2837 | + global $post_type; | |
| 2838 | + | |
| 2839 | +	if (!isset($field_info->post_type)) {
 | |
| 2840 | + $post_type = sanitize_text_field($_REQUEST['listing_type']); | |
| 2841 | + } else | |
| 2842 | + $post_type = $field_info->post_type; | |
| 2843 | + ?> | |
| 2844 | 2844 | <li style="display: none;"> | 
| 2845 | 2845 | <label for="htmlvar_name" class="gd-cf-tooltip-wrap"> | 
| 2846 | 2846 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Select taxonomy:', 'geodirectory'); ?>
 | 
| @@ -2851,15 +2851,15 @@ discard block | ||
| 2851 | 2851 | <div class="gd-cf-input-wrap"> | 
| 2852 | 2852 | <select name="htmlvar_name" id="htmlvar_name"> | 
| 2853 | 2853 | <?php | 
| 2854 | - $gd_taxonomy = geodir_get_taxonomies($post_type); | |
| 2854 | + $gd_taxonomy = geodir_get_taxonomies($post_type); | |
| 2855 | 2855 | |
| 2856 | -                foreach ($gd_taxonomy as $gd_tax) {
 | |
| 2857 | - ?> | |
| 2856 | +				foreach ($gd_taxonomy as $gd_tax) {
 | |
| 2857 | + ?> | |
| 2858 | 2858 |                      <option <?php if (isset($field_info->htmlvar_name) && $field_info->htmlvar_name == $gd_tax) {
 | 
| 2859 | - echo 'selected="selected"'; | |
| 2860 | - }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php | |
| 2861 | - } | |
| 2862 | - ?> | |
| 2859 | + echo 'selected="selected"'; | |
| 2860 | + }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php | |
| 2861 | + } | |
| 2862 | + ?> | |
| 2863 | 2863 | </select> | 
| 2864 | 2864 | </div> | 
| 2865 | 2865 | </li> | 
| @@ -2875,49 +2875,49 @@ discard block | ||
| 2875 | 2875 | |
| 2876 | 2876 | <select name="cat_display_type" id="cat_display_type"> | 
| 2877 | 2877 |                  <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'ajax_chained') {
 | 
| 2878 | - echo 'selected="selected"'; | |
| 2879 | -                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>
 | |
| 2878 | + echo 'selected="selected"'; | |
| 2879 | +				}?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>
 | |
| 2880 | 2880 |                  <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
 | 
| 2881 | - echo 'selected="selected"'; | |
| 2882 | -                }?> value="select"><?php _e('Select', 'geodirectory');?></option>
 | |
| 2881 | + echo 'selected="selected"'; | |
| 2882 | +				}?> value="select"><?php _e('Select', 'geodirectory');?></option>
 | |
| 2883 | 2883 |                  <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'multiselect') {
 | 
| 2884 | - echo 'selected="selected"'; | |
| 2885 | -                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>
 | |
| 2884 | + echo 'selected="selected"'; | |
| 2885 | +				}?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>
 | |
| 2886 | 2886 |                  <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
 | 
| 2887 | - echo 'selected="selected"'; | |
| 2888 | -                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
 | |
| 2887 | + echo 'selected="selected"'; | |
| 2888 | +				}?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
 | |
| 2889 | 2889 |                  <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
 | 
| 2890 | - echo 'selected="selected"'; | |
| 2891 | -                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
 | |
| 2890 | + echo 'selected="selected"'; | |
| 2891 | +				}?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
 | |
| 2892 | 2892 | </select> | 
| 2893 | 2893 | </div> | 
| 2894 | 2894 | </li> | 
| 2895 | 2895 | <?php | 
| 2896 | 2896 | |
| 2897 | - $output = ob_get_clean(); | |
| 2898 | - return $output; | |
| 2897 | + $output = ob_get_clean(); | |
| 2898 | + return $output; | |
| 2899 | 2899 | } | 
| 2900 | 2900 |  add_filter('geodir_cfa_htmlvar_name_taxonomy','geodir_cfa_htmlvar_name_taxonomy',10,4);
 | 
| 2901 | 2901 | |
| 2902 | 2902 | |
| 2903 | 2903 |  function geodir_cfa_extra_fields_address($output,$result_str,$cf,$field_info){
 | 
| 2904 | 2904 | |
| 2905 | - ob_start(); | |
| 2906 | -    if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
 | |
| 2907 | - $address = stripslashes_deep(unserialize($field_info->extra_fields)); | |
| 2908 | - } | |
| 2905 | + ob_start(); | |
| 2906 | +	if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
 | |
| 2907 | + $address = stripslashes_deep(unserialize($field_info->extra_fields)); | |
| 2908 | + } | |
| 2909 | 2909 | |
| 2910 | - $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500); | |
| 2911 | - ?> | |
| 2910 | + $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500); | |
| 2911 | + ?> | |
| 2912 | 2912 | <?php | 
| 2913 | - /** | |
| 2914 | - * Called on the add custom fields settings page before the address field is output. | |
| 2915 | - * | |
| 2916 | - * @since 1.0.0 | |
| 2917 | - * @param array $address The address settings array. | |
| 2918 | - * @param object $field_info Extra fields info. | |
| 2919 | - */ | |
| 2920 | -    do_action('geodir_address_extra_admin_fields', $address, $field_info); ?>
 | |
| 2913 | + /** | |
| 2914 | + * Called on the add custom fields settings page before the address field is output. | |
| 2915 | + * | |
| 2916 | + * @since 1.0.0 | |
| 2917 | + * @param array $address The address settings array. | |
| 2918 | + * @param object $field_info Extra fields info. | |
| 2919 | + */ | |
| 2920 | +	do_action('geodir_address_extra_admin_fields', $address, $field_info); ?>
 | |
| 2921 | 2921 | |
| 2922 | 2922 | <li> | 
| 2923 | 2923 | <label for="show_zip" class="gd-cf-tooltip-wrap"> | 
| @@ -2930,14 +2930,14 @@ discard block | ||
| 2930 | 2930 | |
| 2931 | 2931 | <input type="radio" id="show_zip_yes<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-enabled" value="1" | 
| 2932 | 2932 |                  <?php if (isset($address['show_zip']) && $address['show_zip'] == '1') {
 | 
| 2933 | - echo 'checked'; | |
| 2934 | - } ?>/> | |
| 2933 | + echo 'checked'; | |
| 2934 | + } ?>/> | |
| 2935 | 2935 |              <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | 
| 2936 | 2936 | |
| 2937 | 2937 | <input type="radio" id="show_zip_no<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-disabled" value="0" | 
| 2938 | 2938 |                  <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {
 | 
| 2939 | - echo 'checked'; | |
| 2940 | - } ?>/> | |
| 2939 | + echo 'checked'; | |
| 2940 | + } ?>/> | |
| 2941 | 2941 |              <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | 
| 2942 | 2942 | |
| 2943 | 2943 | |
| @@ -2954,8 +2954,8 @@ discard block | ||
| 2954 | 2954 | <div class="gd-cf-input-wrap"> | 
| 2955 | 2955 | <input type="text" name="extra[zip_lable]" id="zip_lable" | 
| 2956 | 2956 |                     value="<?php if (isset($address['zip_lable'])) {
 | 
| 2957 | - echo esc_attr($address['zip_lable']); | |
| 2958 | - }?>"/> | |
| 2957 | + echo esc_attr($address['zip_lable']); | |
| 2958 | + }?>"/> | |
| 2959 | 2959 | </div> | 
| 2960 | 2960 | </li> | 
| 2961 | 2961 | |
| @@ -2972,8 +2972,8 @@ discard block | ||
| 2972 | 2972 | <div class="gd-cf-input-wrap"> | 
| 2973 | 2973 | <input type="text" name="extra[map_lable]" id="map_lable" | 
| 2974 | 2974 |                     value="<?php if (isset($address['map_lable'])) {
 | 
| 2975 | - echo esc_attr($address['map_lable']); | |
| 2976 | - }?>"/> | |
| 2975 | + echo esc_attr($address['map_lable']); | |
| 2976 | + }?>"/> | |
| 2977 | 2977 | </div> | 
| 2978 | 2978 | </li> | 
| 2979 | 2979 | |
| @@ -2988,14 +2988,14 @@ discard block | ||
| 2988 | 2988 | |
| 2989 | 2989 | <input type="radio" id="show_mapzoom_yes<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-enabled" value="1" | 
| 2990 | 2990 |                  <?php if (isset($address['show_mapzoom']) && $address['show_mapzoom'] == '1') {
 | 
| 2991 | - echo 'checked'; | |
| 2992 | - } ?>/> | |
| 2991 | + echo 'checked'; | |
| 2992 | + } ?>/> | |
| 2993 | 2993 |              <label for="show_mapzoom_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | 
| 2994 | 2994 | |
| 2995 | 2995 | <input type="radio" id="show_mapzoom_no<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0" | 
| 2996 | 2996 |                  <?php if ((isset($address['show_mapzoom']) && !$address['show_mapzoom']) || !isset($address['show_mapzoom'])) {
 | 
| 2997 | - echo 'checked'; | |
| 2998 | - } ?>/> | |
| 2997 | + echo 'checked'; | |
| 2998 | + } ?>/> | |
| 2999 | 2999 |              <label for="show_mapzoom_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | 
| 3000 | 3000 | |
| 3001 | 3001 | </div> | 
| @@ -3012,14 +3012,14 @@ discard block | ||
| 3012 | 3012 | |
| 3013 | 3013 | <input type="radio" id="show_mapview_yes<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-enabled" value="1" | 
| 3014 | 3014 |                  <?php if (isset($address['show_mapview']) && $address['show_mapview'] == '1') {
 | 
| 3015 | - echo 'checked'; | |
| 3016 | - } ?>/> | |
| 3015 | + echo 'checked'; | |
| 3016 | + } ?>/> | |
| 3017 | 3017 |              <label for="show_mapview_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | 
| 3018 | 3018 | |
| 3019 | 3019 | <input type="radio" id="show_mapview_no<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-disabled" value="0" | 
| 3020 | 3020 |                  <?php if ((isset($address['show_mapview']) && !$address['show_mapview']) || !isset($address['show_mapview'])) {
 | 
| 3021 | - echo 'checked'; | |
| 3022 | - } ?>/> | |
| 3021 | + echo 'checked'; | |
| 3022 | + } ?>/> | |
| 3023 | 3023 |              <label for="show_mapview_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | 
| 3024 | 3024 | |
| 3025 | 3025 | </div> | 
| @@ -3036,8 +3036,8 @@ discard block | ||
| 3036 | 3036 | <div class="gd-cf-input-wrap"> | 
| 3037 | 3037 | <input type="text" name="extra[mapview_lable]" id="mapview_lable" | 
| 3038 | 3038 |                     value="<?php if (isset($address['mapview_lable'])) {
 | 
| 3039 | - echo esc_attr($address['mapview_lable']); | |
| 3040 | - }?>"/> | |
| 3039 | + echo esc_attr($address['mapview_lable']); | |
| 3040 | + }?>"/> | |
| 3041 | 3041 | </div> | 
| 3042 | 3042 | </li> | 
| 3043 | 3043 | <li> | 
| @@ -3051,29 +3051,29 @@ discard block | ||
| 3051 | 3051 | |
| 3052 | 3052 | <input type="radio" id="show_latlng_yes<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-enabled" value="1" | 
| 3053 | 3053 |                  <?php if (isset($address['show_latlng']) && $address['show_latlng'] == '1') {
 | 
| 3054 | - echo 'checked'; | |
| 3055 | - } ?>/> | |
| 3054 | + echo 'checked'; | |
| 3055 | + } ?>/> | |
| 3056 | 3056 |              <label for="show_latlng_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | 
| 3057 | 3057 | |
| 3058 | 3058 | <input type="radio" id="show_latlng_no<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-disabled" value="0" | 
| 3059 | 3059 |                  <?php if ((isset($address['show_latlng']) && !$address['show_latlng']) || !isset($address['show_latlng'])) {
 | 
| 3060 | - echo 'checked'; | |
| 3061 | - } ?>/> | |
| 3060 | + echo 'checked'; | |
| 3061 | + } ?>/> | |
| 3062 | 3062 |              <label for="show_latlng_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | 
| 3063 | 3063 | |
| 3064 | 3064 | </div> | 
| 3065 | 3065 | </li> | 
| 3066 | 3066 | <?php | 
| 3067 | 3067 | |
| 3068 | - $html = ob_get_clean(); | |
| 3069 | - return $output.$html; | |
| 3068 | + $html = ob_get_clean(); | |
| 3069 | + return $output.$html; | |
| 3070 | 3070 | } | 
| 3071 | 3071 |  add_filter('geodir_cfa_extra_fields_address','geodir_cfa_extra_fields_address',10,4);
 | 
| 3072 | 3072 | |
| 3073 | 3073 | |
| 3074 | 3074 |  function geodir_cfa_extra_fields_multiselect($output,$result_str,$cf,$field_info){
 | 
| 3075 | - ob_start(); | |
| 3076 | - ?> | |
| 3075 | + ob_start(); | |
| 3076 | + ?> | |
| 3077 | 3077 | <li> | 
| 3078 | 3078 | <label for="multi_display_type" class="gd-cf-tooltip-wrap"> | 
| 3079 | 3079 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Multiselect display type :', 'geodirectory'); ?>
 | 
| @@ -3085,14 +3085,14 @@ discard block | ||
| 3085 | 3085 | |
| 3086 | 3086 | <select name="multi_display_type" id="multi_display_type"> | 
| 3087 | 3087 |                  <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
 | 
| 3088 | - echo 'selected="selected"'; | |
| 3089 | -                }?> value="select"><?php _e('Select', 'geodirectory');?></option>
 | |
| 3088 | + echo 'selected="selected"'; | |
| 3089 | +				}?> value="select"><?php _e('Select', 'geodirectory');?></option>
 | |
| 3090 | 3090 |                  <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
 | 
| 3091 | - echo 'selected="selected"'; | |
| 3092 | -                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
 | |
| 3091 | + echo 'selected="selected"'; | |
| 3092 | +				}?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
 | |
| 3093 | 3093 |                  <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
 | 
| 3094 | - echo 'selected="selected"'; | |
| 3095 | -                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
 | |
| 3094 | + echo 'selected="selected"'; | |
| 3095 | +				}?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
 | |
| 3096 | 3096 | </select> | 
| 3097 | 3097 | |
| 3098 | 3098 | <br/> | 
| @@ -3100,25 +3100,25 @@ discard block | ||
| 3100 | 3100 | </li> | 
| 3101 | 3101 | <?php | 
| 3102 | 3102 | |
| 3103 | - $html = ob_get_clean(); | |
| 3104 | - return $output.$html; | |
| 3103 | + $html = ob_get_clean(); | |
| 3104 | + return $output.$html; | |
| 3105 | 3105 | } | 
| 3106 | 3106 |  add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_multiselect',10,4);
 | 
| 3107 | 3107 | |
| 3108 | 3108 | |
| 3109 | 3109 |  function geodir_cfa_extra_fields_smr($output,$result_str,$cf,$field_info){
 | 
| 3110 | 3110 | |
| 3111 | - ob_start(); | |
| 3111 | + ob_start(); | |
| 3112 | 3112 | |
| 3113 | - $value = ''; | |
| 3114 | -    if (isset($field_info->option_values)) {
 | |
| 3115 | - $value = esc_attr($field_info->option_values); | |
| 3116 | -    }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
 | |
| 3117 | - $value = esc_attr($cf['defaults']['option_values']); | |
| 3118 | - } | |
| 3113 | + $value = ''; | |
| 3114 | +	if (isset($field_info->option_values)) {
 | |
| 3115 | + $value = esc_attr($field_info->option_values); | |
| 3116 | +	}elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
 | |
| 3117 | + $value = esc_attr($cf['defaults']['option_values']); | |
| 3118 | + } | |
| 3119 | 3119 | |
| 3120 | - $field_type = isset($field_info->field_type) ? $field_info->field_type : ''; | |
| 3121 | - ?> | |
| 3120 | + $field_type = isset($field_info->field_type) ? $field_info->field_type : ''; | |
| 3121 | + ?> | |
| 3122 | 3122 | <li> | 
| 3123 | 3123 | <label for="option_values" class="gd-cf-tooltip-wrap"> | 
| 3124 | 3124 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Option Values :', 'geodirectory'); ?>
 | 
| @@ -3145,8 +3145,8 @@ discard block | ||
| 3145 | 3145 | </li> | 
| 3146 | 3146 | <?php | 
| 3147 | 3147 | |
| 3148 | - $html = ob_get_clean(); | |
| 3149 | - return $output.$html; | |
| 3148 | + $html = ob_get_clean(); | |
| 3149 | + return $output.$html; | |
| 3150 | 3150 | } | 
| 3151 | 3151 |  add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_smr',10,4);
 | 
| 3152 | 3152 |  add_filter('geodir_cfa_extra_fields_select','geodir_cfa_extra_fields_smr',10,4);
 | 
| @@ -3154,12 +3154,12 @@ discard block | ||
| 3154 | 3154 | |
| 3155 | 3155 | |
| 3156 | 3156 |  function geodir_cfa_extra_fields_datepicker($output,$result_str,$cf,$field_info){
 | 
| 3157 | - ob_start(); | |
| 3158 | - $extra = array(); | |
| 3159 | -    if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
 | |
| 3160 | - $extra = unserialize($field_info->extra_fields); | |
| 3161 | - } | |
| 3162 | - ?> | |
| 3157 | + ob_start(); | |
| 3158 | + $extra = array(); | |
| 3159 | +	if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
 | |
| 3160 | + $extra = unserialize($field_info->extra_fields); | |
| 3161 | + } | |
| 3162 | + ?> | |
| 3163 | 3163 | <li> | 
| 3164 | 3164 | <label for="date_format" class="gd-cf-tooltip-wrap"> | 
| 3165 | 3165 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Date Format :', 'geodirectory'); ?>
 | 
| @@ -3169,52 +3169,52 @@ discard block | ||
| 3169 | 3169 | </label> | 
| 3170 | 3170 | <div class="gd-cf-input-wrap" style="overflow:inherit;"> | 
| 3171 | 3171 | <?php | 
| 3172 | - $date_formats = array( | |
| 3173 | - 'm/d/Y', | |
| 3174 | - 'd/m/Y', | |
| 3175 | - 'Y/m/d', | |
| 3176 | - 'm-d-Y', | |
| 3177 | - 'd-m-Y', | |
| 3178 | - 'Y-m-d', | |
| 3179 | - 'F j, Y', | |
| 3180 | - ); | |
| 3181 | - /** | |
| 3182 | - * Filter the custom field date format options. | |
| 3183 | - * | |
| 3184 | - * @since 1.6.5 | |
| 3185 | - * @param array $date_formats The PHP date format array. | |
| 3186 | - */ | |
| 3187 | -            $date_formats = apply_filters('geodir_date_formats',$date_formats);
 | |
| 3188 | - ?> | |
| 3172 | + $date_formats = array( | |
| 3173 | + 'm/d/Y', | |
| 3174 | + 'd/m/Y', | |
| 3175 | + 'Y/m/d', | |
| 3176 | + 'm-d-Y', | |
| 3177 | + 'd-m-Y', | |
| 3178 | + 'Y-m-d', | |
| 3179 | + 'F j, Y', | |
| 3180 | + ); | |
| 3181 | + /** | |
| 3182 | + * Filter the custom field date format options. | |
| 3183 | + * | |
| 3184 | + * @since 1.6.5 | |
| 3185 | + * @param array $date_formats The PHP date format array. | |
| 3186 | + */ | |
| 3187 | +			$date_formats = apply_filters('geodir_date_formats',$date_formats);
 | |
| 3188 | + ?> | |
| 3189 | 3189 | <select name="extra[date_format]" id="date_format"> | 
| 3190 | 3190 | <?php | 
| 3191 | -                foreach($date_formats as $format){
 | |
| 3192 | - $selected = ''; | |
| 3193 | -                    if(!empty($extra) && esc_attr($extra['date_format'])==$format){
 | |
| 3194 | - $selected = "selected='selected'"; | |
| 3195 | - } | |
| 3196 | -                    echo "<option $selected value='$format'>$format       (".date_i18n( $format, time()).")</option>";
 | |
| 3197 | - } | |
| 3198 | - ?> | |
| 3191 | +				foreach($date_formats as $format){
 | |
| 3192 | + $selected = ''; | |
| 3193 | +					if(!empty($extra) && esc_attr($extra['date_format'])==$format){
 | |
| 3194 | + $selected = "selected='selected'"; | |
| 3195 | + } | |
| 3196 | +					echo "<option $selected value='$format'>$format       (".date_i18n( $format, time()).")</option>";
 | |
| 3197 | + } | |
| 3198 | + ?> | |
| 3199 | 3199 | </select> | 
| 3200 | 3200 | |
| 3201 | 3201 | </div> | 
| 3202 | 3202 | </li> | 
| 3203 | 3203 | <?php | 
| 3204 | 3204 | |
| 3205 | - $html = ob_get_clean(); | |
| 3206 | - return $output.$html; | |
| 3205 | + $html = ob_get_clean(); | |
| 3206 | + return $output.$html; | |
| 3207 | 3207 | } | 
| 3208 | 3208 |  add_filter('geodir_cfa_extra_fields_datepicker','geodir_cfa_extra_fields_datepicker',10,4);
 | 
| 3209 | 3209 | |
| 3210 | 3210 | |
| 3211 | 3211 |  function geodir_cfa_extra_fields_file($output,$result_str,$cf,$field_info){
 | 
| 3212 | - ob_start(); | |
| 3213 | - $allowed_file_types = geodir_allowed_mime_types(); | |
| 3212 | + ob_start(); | |
| 3213 | + $allowed_file_types = geodir_allowed_mime_types(); | |
| 3214 | 3214 | |
| 3215 | - $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : ''; | |
| 3216 | -    $gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');
 | |
| 3217 | - ?> | |
| 3215 | + $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : ''; | |
| 3216 | +	$gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');
 | |
| 3217 | + ?> | |
| 3218 | 3218 | <li> | 
| 3219 | 3219 | <label for="gd_file_types" class="gd-cf-tooltip-wrap"> | 
| 3220 | 3220 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Allowed file types :', 'geodirectory'); ?>
 | 
| @@ -3237,33 +3237,33 @@ discard block | ||
| 3237 | 3237 | </li> | 
| 3238 | 3238 | <?php | 
| 3239 | 3239 | |
| 3240 | - $html = ob_get_clean(); | |
| 3241 | - return $output.$html; | |
| 3240 | + $html = ob_get_clean(); | |
| 3241 | + return $output.$html; | |
| 3242 | 3242 | } | 
| 3243 | 3243 |  add_filter('geodir_cfa_extra_fields_file','geodir_cfa_extra_fields_file',10,4);
 | 
| 3244 | 3244 | |
| 3245 | 3245 |  function geodir_cfa_extra_fields_text($output,$result_str,$cf,$field_info){
 | 
| 3246 | - ob_start(); | |
| 3246 | + ob_start(); | |
| 3247 | 3247 | |
| 3248 | - $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : ''; | |
| 3248 | + $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : ''; | |
| 3249 | 3249 | // print_r($cf);echo '###'; | 
| 3250 | 3250 | |
| 3251 | 3251 | |
| 3252 | 3252 | |
| 3253 | - $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500); | |
| 3253 | + $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500); | |
| 3254 | 3254 | |
| 3255 | 3255 | |
| 3256 | - $value = ''; | |
| 3257 | -    if ($extra_fields && isset($extra_fields['is_price'])) {
 | |
| 3258 | - $value = esc_attr($extra_fields['is_price']); | |
| 3259 | -    }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){
 | |
| 3260 | - $value = esc_attr($cf['defaults']['extra_fields']['is_price']); | |
| 3261 | - } | |
| 3256 | + $value = ''; | |
| 3257 | +	if ($extra_fields && isset($extra_fields['is_price'])) {
 | |
| 3258 | + $value = esc_attr($extra_fields['is_price']); | |
| 3259 | +	}elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){
 | |
| 3260 | + $value = esc_attr($cf['defaults']['extra_fields']['is_price']); | |
| 3261 | + } | |
| 3262 | 3262 | |
| 3263 | - $show_price_extra = ($value==1) ? 1 : 0; | |
| 3263 | + $show_price_extra = ($value==1) ? 1 : 0; | |
| 3264 | 3264 | |
| 3265 | - $show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0; | |
| 3266 | - ?> | |
| 3265 | + $show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0; | |
| 3266 | + ?> | |
| 3267 | 3267 |      <li class="gdcf-price-extra-set" <?php if(!$show_price){ echo "style='display:none;'";}?>>
 | 
| 3268 | 3268 | <label for="is_price" class="gd-cf-tooltip-wrap"> | 
| 3269 | 3269 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display as price? :', 'geodirectory'); ?>
 | 
| @@ -3275,14 +3275,14 @@ discard block | ||
| 3275 | 3275 | |
| 3276 | 3276 | <input type="radio" id="is_price_yes<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-enabled" value="1" | 
| 3277 | 3277 |                  <?php if ($value == '1') {
 | 
| 3278 | - echo 'checked'; | |
| 3279 | - } ?>/> | |
| 3278 | + echo 'checked'; | |
| 3279 | + } ?>/> | |
| 3280 | 3280 |              <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | 
| 3281 | 3281 | |
| 3282 | 3282 | <input type="radio" id="is_price_no<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-disabled" value="0" | 
| 3283 | 3283 |                  <?php if ($value == '0' || !$value) {
 | 
| 3284 | - echo 'checked'; | |
| 3285 | - } ?>/> | |
| 3284 | + echo 'checked'; | |
| 3285 | + } ?>/> | |
| 3286 | 3286 |              <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | 
| 3287 | 3287 | |
| 3288 | 3288 | </div> | 
| @@ -3290,13 +3290,13 @@ discard block | ||
| 3290 | 3290 | |
| 3291 | 3291 | <?php | 
| 3292 | 3292 | |
| 3293 | - $value = ''; | |
| 3294 | -    if ($extra_fields && isset($extra_fields['thousand_separator'])) {
 | |
| 3295 | - $value = esc_attr($extra_fields['thousand_separator']); | |
| 3296 | -    }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){
 | |
| 3297 | - $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']); | |
| 3298 | - } | |
| 3299 | - ?> | |
| 3293 | + $value = ''; | |
| 3294 | +	if ($extra_fields && isset($extra_fields['thousand_separator'])) {
 | |
| 3295 | + $value = esc_attr($extra_fields['thousand_separator']); | |
| 3296 | +	}elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){
 | |
| 3297 | + $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']); | |
| 3298 | + } | |
| 3299 | + ?> | |
| 3300 | 3300 |      <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
 | 
| 3301 | 3301 |          <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory');?>
 | 
| 3302 | 3302 | <div class="gdcf-tooltip"> | 
| @@ -3317,13 +3317,13 @@ discard block | ||
| 3317 | 3317 | |
| 3318 | 3318 | <?php | 
| 3319 | 3319 | |
| 3320 | - $value = ''; | |
| 3321 | -    if ($extra_fields && isset($extra_fields['decimal_separator'])) {
 | |
| 3322 | - $value = esc_attr($extra_fields['decimal_separator']); | |
| 3323 | -    }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){
 | |
| 3324 | - $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']); | |
| 3325 | - } | |
| 3326 | - ?> | |
| 3320 | + $value = ''; | |
| 3321 | +	if ($extra_fields && isset($extra_fields['decimal_separator'])) {
 | |
| 3322 | + $value = esc_attr($extra_fields['decimal_separator']); | |
| 3323 | +	}elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){
 | |
| 3324 | + $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']); | |
| 3325 | + } | |
| 3326 | + ?> | |
| 3327 | 3327 |      <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
 | 
| 3328 | 3328 |          <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory');?>
 | 
| 3329 | 3329 | <div class="gdcf-tooltip"> | 
| @@ -3340,13 +3340,13 @@ discard block | ||
| 3340 | 3340 | |
| 3341 | 3341 | <?php | 
| 3342 | 3342 | |
| 3343 | - $value = ''; | |
| 3344 | -    if ($extra_fields && isset($extra_fields['decimal_display'])) {
 | |
| 3345 | - $value = esc_attr($extra_fields['decimal_display']); | |
| 3346 | -    }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){
 | |
| 3347 | - $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']); | |
| 3348 | - } | |
| 3349 | - ?> | |
| 3343 | + $value = ''; | |
| 3344 | +	if ($extra_fields && isset($extra_fields['decimal_display'])) {
 | |
| 3345 | + $value = esc_attr($extra_fields['decimal_display']); | |
| 3346 | +	}elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){
 | |
| 3347 | + $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']); | |
| 3348 | + } | |
| 3349 | + ?> | |
| 3350 | 3350 |      <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
 | 
| 3351 | 3351 |          <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory');?>
 | 
| 3352 | 3352 | <div class="gdcf-tooltip"> | 
| @@ -3363,13 +3363,13 @@ discard block | ||
| 3363 | 3363 | |
| 3364 | 3364 | <?php | 
| 3365 | 3365 | |
| 3366 | - $value = ''; | |
| 3367 | -    if ($extra_fields && isset($extra_fields['currency_symbol'])) {
 | |
| 3368 | - $value = esc_attr($extra_fields['currency_symbol']); | |
| 3369 | -    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){
 | |
| 3370 | - $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']); | |
| 3371 | - } | |
| 3372 | - ?> | |
| 3366 | + $value = ''; | |
| 3367 | +	if ($extra_fields && isset($extra_fields['currency_symbol'])) {
 | |
| 3368 | + $value = esc_attr($extra_fields['currency_symbol']); | |
| 3369 | +	}elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){
 | |
| 3370 | + $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']); | |
| 3371 | + } | |
| 3372 | + ?> | |
| 3373 | 3373 |      <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
 | 
| 3374 | 3374 |          <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory');?>
 | 
| 3375 | 3375 | <div class="gdcf-tooltip"> | 
| @@ -3384,13 +3384,13 @@ discard block | ||
| 3384 | 3384 | |
| 3385 | 3385 | <?php | 
| 3386 | 3386 | |
| 3387 | - $value = ''; | |
| 3388 | -    if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {
 | |
| 3389 | - $value = esc_attr($extra_fields['currency_symbol_placement']); | |
| 3390 | -    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){
 | |
| 3391 | - $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']); | |
| 3392 | - } | |
| 3393 | - ?> | |
| 3387 | + $value = ''; | |
| 3388 | +	if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {
 | |
| 3389 | + $value = esc_attr($extra_fields['currency_symbol_placement']); | |
| 3390 | +	}elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){
 | |
| 3391 | + $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']); | |
| 3392 | + } | |
| 3393 | + ?> | |
| 3394 | 3394 |      <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
 | 
| 3395 | 3395 |          <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory');?>
 | 
| 3396 | 3396 | <div class="gdcf-tooltip"> | 
| @@ -3408,225 +3408,225 @@ discard block | ||
| 3408 | 3408 | |
| 3409 | 3409 | <?php | 
| 3410 | 3410 | |
| 3411 | - $html = ob_get_clean(); | |
| 3412 | - return $output.$html; | |
| 3411 | + $html = ob_get_clean(); | |
| 3412 | + return $output.$html; | |
| 3413 | 3413 | } | 
| 3414 | 3414 |  add_filter('geodir_cfa_extra_fields_text','geodir_cfa_extra_fields_text',10,4);
 | 
| 3415 | 3415 | |
| 3416 | 3416 |  function geodir_default_custom_fields($post_type='gd_place',$package_id=''){
 | 
| 3417 | - $fields = array(); | |
| 3418 | - $package = ($package_id=='') ? '' : array($package_id); | |
| 3419 | - | |
| 3420 | -    $fields[] = array('listing_type' => $post_type,
 | |
| 3421 | - 'data_type' => 'VARCHAR', | |
| 3422 | - 'field_type' => 'taxonomy', | |
| 3423 | -                      'admin_title' => __('Category', 'geodirectory'),
 | |
| 3424 | -                      'admin_desc' => __('SELECT listing category FROM here. SELECT at least one CATEGORY', 'geodirectory'),
 | |
| 3425 | -                      'site_title' => __('Category', 'geodirectory'),
 | |
| 3426 | - 'htmlvar_name' => $post_type.'category', | |
| 3427 | - 'default_value' => '', | |
| 3428 | - 'is_default' => '1', | |
| 3429 | - 'is_admin' => '1', | |
| 3430 | - 'is_required' => '1', | |
| 3431 | - 'show_in' => '[detail]', | |
| 3432 | - 'show_on_pkg' => $package, | |
| 3433 | -                      'clabels' => __('Category', 'geodirectory'));
 | |
| 3434 | - | |
| 3435 | -    $fields[] = array('listing_type' => $post_type,
 | |
| 3436 | - 'data_type' => 'VARCHAR', | |
| 3437 | - 'field_type' => 'address', | |
| 3438 | -                      'admin_title' => __('Address', 'geodirectory'),
 | |
| 3439 | - 'admin_desc' => ADDRESS_MSG, | |
| 3440 | -                      'site_title' => __('Address', 'geodirectory'),
 | |
| 3441 | - 'htmlvar_name' => 'post', | |
| 3442 | - 'default_value' => '', | |
| 3443 | - 'option_values' => '', | |
| 3444 | - 'is_default' => '1', | |
| 3445 | - 'is_admin' => '1', | |
| 3446 | - 'is_required' => '1', | |
| 3447 | - 'show_in' => '[detail],[mapbubble]', | |
| 3448 | - 'show_on_pkg' => $package, | |
| 3449 | -                      'required_msg' => __('Address fields are required', 'geodirectory'),
 | |
| 3450 | -                      'clabels' => __('Address', 'geodirectory'),
 | |
| 3451 | -                      'extra' => array('show_city' => 1, 'city_lable' => __('City', 'geodirectory'),
 | |
| 3452 | -                                       'show_region' => 1, 'region_lable' => __('Region', 'geodirectory'),
 | |
| 3453 | -                                       'show_country' => 1, 'country_lable' => __('Country', 'geodirectory'),
 | |
| 3454 | -                                       'show_zip' => 1, 'zip_lable' => __('Zip/Post Code', 'geodirectory'),
 | |
| 3455 | -                                       'show_map' => 1, 'map_lable' => __('Set Address On Map', 'geodirectory'),
 | |
| 3456 | -                                       'show_mapview' => 1, 'mapview_lable' => __('Select Map View', 'geodirectory'),
 | |
| 3457 | - 'show_mapzoom' => 1, 'mapzoom_lable' => 'hidden', | |
| 3458 | - 'show_latlng' => 1)); | |
| 3459 | - | |
| 3460 | -    $fields[] = array('listing_type' => $post_type,
 | |
| 3461 | - 'data_type' => 'VARCHAR', | |
| 3462 | - 'field_type' => 'text', | |
| 3463 | -                      'admin_title' => __('Time', 'geodirectory'),
 | |
| 3464 | -                      'admin_desc' => __('Enter Business or Listing Timing Information.<br/>eg. : 10.00 am to 6 pm every day', 'geodirectory'),
 | |
| 3465 | -                      'site_title' => __('Time', 'geodirectory'),
 | |
| 3466 | - 'htmlvar_name' => 'timing', | |
| 3467 | - 'default_value' => '', | |
| 3468 | - 'option_values' => '', | |
| 3469 | - 'is_default' => '1', | |
| 3470 | - 'is_admin' => '1', | |
| 3471 | - 'show_in' => '[detail],[mapbubble]', | |
| 3472 | - 'show_on_pkg' => $package, | |
| 3473 | -                      'clabels' => __('Time', 'geodirectory'));
 | |
| 3474 | - | |
| 3475 | -    $fields[] = array('listing_type' => $post_type,
 | |
| 3476 | - 'data_type' => 'VARCHAR', | |
| 3477 | - 'field_type' => 'phone', | |
| 3478 | -                      'admin_title' => __('Phone', 'geodirectory'),
 | |
| 3479 | -                      'admin_desc' => __('You can enter phone number,cell phone number etc.', 'geodirectory'),
 | |
| 3480 | -                      'site_title' => __('Phone', 'geodirectory'),
 | |
| 3481 | - 'htmlvar_name' => 'contact', | |
| 3482 | - 'default_value' => '', | |
| 3483 | - 'option_values' => '', | |
| 3484 | - 'is_default' => '1', | |
| 3485 | - 'is_admin' => '1', | |
| 3486 | - 'show_in' => '[detail],[mapbubble]', | |
| 3487 | - 'show_on_pkg' => $package, | |
| 3488 | -                      'clabels' => __('Phone', 'geodirectory'));
 | |
| 3489 | - | |
| 3490 | -    $fields[] = array('listing_type' => $post_type,
 | |
| 3491 | - 'data_type' => 'VARCHAR', | |
| 3492 | - 'field_type' => 'email', | |
| 3493 | -                      'admin_title' => __('Email', 'geodirectory'),
 | |
| 3494 | -                      'admin_desc' => __('You can enter your business or listing email.', 'geodirectory'),
 | |
| 3495 | -                      'site_title' => __('Email', 'geodirectory'),
 | |
| 3496 | - 'htmlvar_name' => 'email', | |
| 3497 | - 'default_value' => '', | |
| 3498 | - 'option_values' => '', | |
| 3499 | - 'is_default' => '1', | |
| 3500 | - 'is_admin' => '1', | |
| 3501 | - 'show_in' => '[detail]', | |
| 3502 | - 'show_on_pkg' => $package, | |
| 3503 | -                      'clabels' => __('Email', 'geodirectory'));
 | |
| 3504 | - | |
| 3505 | -    $fields[] = array('listing_type' => $post_type,
 | |
| 3506 | - 'data_type' => 'VARCHAR', | |
| 3507 | - 'field_type' => 'url', | |
| 3508 | -                      'admin_title' => __('Website', 'geodirectory'),
 | |
| 3509 | -                      'admin_desc' => __('You can enter your business or listing website.', 'geodirectory'),
 | |
| 3510 | -                      'site_title' => __('Website', 'geodirectory'),
 | |
| 3511 | - 'htmlvar_name' => 'website', | |
| 3512 | - 'default_value' => '', | |
| 3513 | - 'option_values' => '', | |
| 3514 | - 'is_default' => '1', | |
| 3515 | - 'is_admin' => '1', | |
| 3516 | - 'show_in' => '[detail]', | |
| 3517 | - 'show_on_pkg' => $package, | |
| 3518 | -                      'clabels' => __('Website', 'geodirectory'));
 | |
| 3519 | - | |
| 3520 | -    $fields[] = array('listing_type' => $post_type,
 | |
| 3521 | - 'data_type' => 'VARCHAR', | |
| 3522 | - 'field_type' => 'url', | |
| 3523 | -                      'admin_title' => __('Twitter', 'geodirectory'),
 | |
| 3524 | -                      'admin_desc' => __('You can enter your business or listing twitter url.', 'geodirectory'),
 | |
| 3525 | -                      'site_title' => __('Twitter', 'geodirectory'),
 | |
| 3526 | - 'htmlvar_name' => 'twitter', | |
| 3527 | - 'default_value' => '', | |
| 3528 | - 'option_values' => '', | |
| 3529 | - 'is_default' => '1', | |
| 3530 | - 'is_admin' => '1', | |
| 3531 | - 'show_in' => '[detail]', | |
| 3532 | - 'show_on_pkg' => $package, | |
| 3533 | -                      'clabels' => __('Twitter', 'geodirectory'));
 | |
| 3534 | - | |
| 3535 | -    $fields[] = array('listing_type' => $post_type,
 | |
| 3536 | - 'data_type' => 'VARCHAR', | |
| 3537 | - 'field_type' => 'url', | |
| 3538 | -                      'admin_title' => __('Facebook', 'geodirectory'),
 | |
| 3539 | -                      'admin_desc' => __('You can enter your business or listing facebook url.', 'geodirectory'),
 | |
| 3540 | -                      'site_title' => __('Facebook', 'geodirectory'),
 | |
| 3541 | - 'htmlvar_name' => 'facebook', | |
| 3542 | - 'default_value' => '', | |
| 3543 | - 'option_values' => '', | |
| 3544 | - 'is_default' => '1', | |
| 3545 | - 'is_admin' => '1', | |
| 3546 | - 'show_in' => '[detail]', | |
| 3547 | - 'show_on_pkg' => $package, | |
| 3548 | -                      'clabels' => __('Facebook', 'geodirectory'));
 | |
| 3549 | - | |
| 3550 | -    $fields[] = array('listing_type' => $post_type,
 | |
| 3551 | - 'data_type' => 'TEXT', | |
| 3552 | - 'field_type' => 'textarea', | |
| 3553 | -                      'admin_title' => __('Video', 'geodirectory'),
 | |
| 3554 | -                      'admin_desc' => __('Add video code here, YouTube etc.', 'geodirectory'),
 | |
| 3555 | -                      'site_title' => __('Video', 'geodirectory'),
 | |
| 3556 | - 'htmlvar_name' => 'video', | |
| 3557 | - 'default_value' => '', | |
| 3558 | - 'option_values' => '', | |
| 3559 | - 'is_default' => '0', | |
| 3560 | - 'is_admin' => '1', | |
| 3561 | - 'show_in' => '[owntab]', | |
| 3562 | - 'show_on_pkg' => $package, | |
| 3563 | -                      'clabels' => __('Video', 'geodirectory'));
 | |
| 3564 | - | |
| 3565 | -    $fields[] = array('listing_type' => $post_type,
 | |
| 3566 | - 'data_type' => 'TEXT', | |
| 3567 | - 'field_type' => 'textarea', | |
| 3568 | -                      'admin_title' => __('Special Offers', 'geodirectory'),
 | |
| 3569 | -                      'admin_desc' => __('Note: List out any special offers (optional)', 'geodirectory'),
 | |
| 3570 | -                      'site_title' => __('Special Offers', 'geodirectory'),
 | |
| 3571 | - 'htmlvar_name' => 'special_offers', | |
| 3572 | - 'default_value' => '', | |
| 3573 | - 'option_values' => '', | |
| 3574 | - 'is_default' => '0', | |
| 3575 | - 'is_admin' => '1', | |
| 3576 | - 'show_in' => '[owntab]', | |
| 3577 | - 'show_on_pkg' => $package, | |
| 3578 | -                      'clabels' => __('Special Offers', 'geodirectory'));
 | |
| 3579 | - | |
| 3580 | - /** | |
| 3581 | - * Filter the array of default custom fields DB table data. | |
| 3582 | - * | |
| 3583 | - * @since 1.6.6 | |
| 3584 | - * @param string $fields The default custom fields as an array. | |
| 3585 | - */ | |
| 3586 | -    $fields = apply_filters('geodir_default_custom_fields', $fields);
 | |
| 3587 | - | |
| 3588 | - return $fields; | |
| 3417 | + $fields = array(); | |
| 3418 | + $package = ($package_id=='') ? '' : array($package_id); | |
| 3419 | + | |
| 3420 | +	$fields[] = array('listing_type' => $post_type,
 | |
| 3421 | + 'data_type' => 'VARCHAR', | |
| 3422 | + 'field_type' => 'taxonomy', | |
| 3423 | +					  'admin_title' => __('Category', 'geodirectory'),
 | |
| 3424 | +					  'admin_desc' => __('SELECT listing category FROM here. SELECT at least one CATEGORY', 'geodirectory'),
 | |
| 3425 | +					  'site_title' => __('Category', 'geodirectory'),
 | |
| 3426 | + 'htmlvar_name' => $post_type.'category', | |
| 3427 | + 'default_value' => '', | |
| 3428 | + 'is_default' => '1', | |
| 3429 | + 'is_admin' => '1', | |
| 3430 | + 'is_required' => '1', | |
| 3431 | + 'show_in' => '[detail]', | |
| 3432 | + 'show_on_pkg' => $package, | |
| 3433 | +					  'clabels' => __('Category', 'geodirectory'));
 | |
| 3434 | + | |
| 3435 | +	$fields[] = array('listing_type' => $post_type,
 | |
| 3436 | + 'data_type' => 'VARCHAR', | |
| 3437 | + 'field_type' => 'address', | |
| 3438 | +					  'admin_title' => __('Address', 'geodirectory'),
 | |
| 3439 | + 'admin_desc' => ADDRESS_MSG, | |
| 3440 | +					  'site_title' => __('Address', 'geodirectory'),
 | |
| 3441 | + 'htmlvar_name' => 'post', | |
| 3442 | + 'default_value' => '', | |
| 3443 | + 'option_values' => '', | |
| 3444 | + 'is_default' => '1', | |
| 3445 | + 'is_admin' => '1', | |
| 3446 | + 'is_required' => '1', | |
| 3447 | + 'show_in' => '[detail],[mapbubble]', | |
| 3448 | + 'show_on_pkg' => $package, | |
| 3449 | +					  'required_msg' => __('Address fields are required', 'geodirectory'),
 | |
| 3450 | +					  'clabels' => __('Address', 'geodirectory'),
 | |
| 3451 | +					  'extra' => array('show_city' => 1, 'city_lable' => __('City', 'geodirectory'),
 | |
| 3452 | +									   'show_region' => 1, 'region_lable' => __('Region', 'geodirectory'),
 | |
| 3453 | +									   'show_country' => 1, 'country_lable' => __('Country', 'geodirectory'),
 | |
| 3454 | +									   'show_zip' => 1, 'zip_lable' => __('Zip/Post Code', 'geodirectory'),
 | |
| 3455 | +									   'show_map' => 1, 'map_lable' => __('Set Address On Map', 'geodirectory'),
 | |
| 3456 | +									   'show_mapview' => 1, 'mapview_lable' => __('Select Map View', 'geodirectory'),
 | |
| 3457 | + 'show_mapzoom' => 1, 'mapzoom_lable' => 'hidden', | |
| 3458 | + 'show_latlng' => 1)); | |
| 3459 | + | |
| 3460 | +	$fields[] = array('listing_type' => $post_type,
 | |
| 3461 | + 'data_type' => 'VARCHAR', | |
| 3462 | + 'field_type' => 'text', | |
| 3463 | +					  'admin_title' => __('Time', 'geodirectory'),
 | |
| 3464 | +					  'admin_desc' => __('Enter Business or Listing Timing Information.<br/>eg. : 10.00 am to 6 pm every day', 'geodirectory'),
 | |
| 3465 | +					  'site_title' => __('Time', 'geodirectory'),
 | |
| 3466 | + 'htmlvar_name' => 'timing', | |
| 3467 | + 'default_value' => '', | |
| 3468 | + 'option_values' => '', | |
| 3469 | + 'is_default' => '1', | |
| 3470 | + 'is_admin' => '1', | |
| 3471 | + 'show_in' => '[detail],[mapbubble]', | |
| 3472 | + 'show_on_pkg' => $package, | |
| 3473 | +					  'clabels' => __('Time', 'geodirectory'));
 | |
| 3474 | + | |
| 3475 | +	$fields[] = array('listing_type' => $post_type,
 | |
| 3476 | + 'data_type' => 'VARCHAR', | |
| 3477 | + 'field_type' => 'phone', | |
| 3478 | +					  'admin_title' => __('Phone', 'geodirectory'),
 | |
| 3479 | +					  'admin_desc' => __('You can enter phone number,cell phone number etc.', 'geodirectory'),
 | |
| 3480 | +					  'site_title' => __('Phone', 'geodirectory'),
 | |
| 3481 | + 'htmlvar_name' => 'contact', | |
| 3482 | + 'default_value' => '', | |
| 3483 | + 'option_values' => '', | |
| 3484 | + 'is_default' => '1', | |
| 3485 | + 'is_admin' => '1', | |
| 3486 | + 'show_in' => '[detail],[mapbubble]', | |
| 3487 | + 'show_on_pkg' => $package, | |
| 3488 | +					  'clabels' => __('Phone', 'geodirectory'));
 | |
| 3489 | + | |
| 3490 | +	$fields[] = array('listing_type' => $post_type,
 | |
| 3491 | + 'data_type' => 'VARCHAR', | |
| 3492 | + 'field_type' => 'email', | |
| 3493 | +					  'admin_title' => __('Email', 'geodirectory'),
 | |
| 3494 | +					  'admin_desc' => __('You can enter your business or listing email.', 'geodirectory'),
 | |
| 3495 | +					  'site_title' => __('Email', 'geodirectory'),
 | |
| 3496 | + 'htmlvar_name' => 'email', | |
| 3497 | + 'default_value' => '', | |
| 3498 | + 'option_values' => '', | |
| 3499 | + 'is_default' => '1', | |
| 3500 | + 'is_admin' => '1', | |
| 3501 | + 'show_in' => '[detail]', | |
| 3502 | + 'show_on_pkg' => $package, | |
| 3503 | +					  'clabels' => __('Email', 'geodirectory'));
 | |
| 3504 | + | |
| 3505 | +	$fields[] = array('listing_type' => $post_type,
 | |
| 3506 | + 'data_type' => 'VARCHAR', | |
| 3507 | + 'field_type' => 'url', | |
| 3508 | +					  'admin_title' => __('Website', 'geodirectory'),
 | |
| 3509 | +					  'admin_desc' => __('You can enter your business or listing website.', 'geodirectory'),
 | |
| 3510 | +					  'site_title' => __('Website', 'geodirectory'),
 | |
| 3511 | + 'htmlvar_name' => 'website', | |
| 3512 | + 'default_value' => '', | |
| 3513 | + 'option_values' => '', | |
| 3514 | + 'is_default' => '1', | |
| 3515 | + 'is_admin' => '1', | |
| 3516 | + 'show_in' => '[detail]', | |
| 3517 | + 'show_on_pkg' => $package, | |
| 3518 | +					  'clabels' => __('Website', 'geodirectory'));
 | |
| 3519 | + | |
| 3520 | +	$fields[] = array('listing_type' => $post_type,
 | |
| 3521 | + 'data_type' => 'VARCHAR', | |
| 3522 | + 'field_type' => 'url', | |
| 3523 | +					  'admin_title' => __('Twitter', 'geodirectory'),
 | |
| 3524 | +					  'admin_desc' => __('You can enter your business or listing twitter url.', 'geodirectory'),
 | |
| 3525 | +					  'site_title' => __('Twitter', 'geodirectory'),
 | |
| 3526 | + 'htmlvar_name' => 'twitter', | |
| 3527 | + 'default_value' => '', | |
| 3528 | + 'option_values' => '', | |
| 3529 | + 'is_default' => '1', | |
| 3530 | + 'is_admin' => '1', | |
| 3531 | + 'show_in' => '[detail]', | |
| 3532 | + 'show_on_pkg' => $package, | |
| 3533 | +					  'clabels' => __('Twitter', 'geodirectory'));
 | |
| 3534 | + | |
| 3535 | +	$fields[] = array('listing_type' => $post_type,
 | |
| 3536 | + 'data_type' => 'VARCHAR', | |
| 3537 | + 'field_type' => 'url', | |
| 3538 | +					  'admin_title' => __('Facebook', 'geodirectory'),
 | |
| 3539 | +					  'admin_desc' => __('You can enter your business or listing facebook url.', 'geodirectory'),
 | |
| 3540 | +					  'site_title' => __('Facebook', 'geodirectory'),
 | |
| 3541 | + 'htmlvar_name' => 'facebook', | |
| 3542 | + 'default_value' => '', | |
| 3543 | + 'option_values' => '', | |
| 3544 | + 'is_default' => '1', | |
| 3545 | + 'is_admin' => '1', | |
| 3546 | + 'show_in' => '[detail]', | |
| 3547 | + 'show_on_pkg' => $package, | |
| 3548 | +					  'clabels' => __('Facebook', 'geodirectory'));
 | |
| 3549 | + | |
| 3550 | +	$fields[] = array('listing_type' => $post_type,
 | |
| 3551 | + 'data_type' => 'TEXT', | |
| 3552 | + 'field_type' => 'textarea', | |
| 3553 | +					  'admin_title' => __('Video', 'geodirectory'),
 | |
| 3554 | +					  'admin_desc' => __('Add video code here, YouTube etc.', 'geodirectory'),
 | |
| 3555 | +					  'site_title' => __('Video', 'geodirectory'),
 | |
| 3556 | + 'htmlvar_name' => 'video', | |
| 3557 | + 'default_value' => '', | |
| 3558 | + 'option_values' => '', | |
| 3559 | + 'is_default' => '0', | |
| 3560 | + 'is_admin' => '1', | |
| 3561 | + 'show_in' => '[owntab]', | |
| 3562 | + 'show_on_pkg' => $package, | |
| 3563 | +					  'clabels' => __('Video', 'geodirectory'));
 | |
| 3564 | + | |
| 3565 | +	$fields[] = array('listing_type' => $post_type,
 | |
| 3566 | + 'data_type' => 'TEXT', | |
| 3567 | + 'field_type' => 'textarea', | |
| 3568 | +					  'admin_title' => __('Special Offers', 'geodirectory'),
 | |
| 3569 | +					  'admin_desc' => __('Note: List out any special offers (optional)', 'geodirectory'),
 | |
| 3570 | +					  'site_title' => __('Special Offers', 'geodirectory'),
 | |
| 3571 | + 'htmlvar_name' => 'special_offers', | |
| 3572 | + 'default_value' => '', | |
| 3573 | + 'option_values' => '', | |
| 3574 | + 'is_default' => '0', | |
| 3575 | + 'is_admin' => '1', | |
| 3576 | + 'show_in' => '[owntab]', | |
| 3577 | + 'show_on_pkg' => $package, | |
| 3578 | +					  'clabels' => __('Special Offers', 'geodirectory'));
 | |
| 3579 | + | |
| 3580 | + /** | |
| 3581 | + * Filter the array of default custom fields DB table data. | |
| 3582 | + * | |
| 3583 | + * @since 1.6.6 | |
| 3584 | + * @param string $fields The default custom fields as an array. | |
| 3585 | + */ | |
| 3586 | +	$fields = apply_filters('geodir_default_custom_fields', $fields);
 | |
| 3587 | + | |
| 3588 | + return $fields; | |
| 3589 | 3589 | } | 
| 3590 | 3590 | |
| 3591 | 3591 |  function geodir_currency_format_number($number='',$cf=''){
 | 
| 3592 | 3592 | |
| 3593 | - $cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : ''; | |
| 3593 | + $cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : ''; | |
| 3594 | 3594 | |
| 3595 | - $symbol = isset($cs['currency_symbol']) ? $cs['currency_symbol'] : '$'; | |
| 3596 | - $decimals = isset($cf['decimal_point']) && $cf['decimal_point'] ? $cf['decimal_point'] : 2; | |
| 3597 | - $decimal_display = !empty($cf['decimal_display']) ? $cf['decimal_display'] : (!empty($cs['decimal_display']) ? $cs['decimal_display'] : 'if'); | |
| 3598 | - $decimalpoint = '.'; | |
| 3595 | + $symbol = isset($cs['currency_symbol']) ? $cs['currency_symbol'] : '$'; | |
| 3596 | + $decimals = isset($cf['decimal_point']) && $cf['decimal_point'] ? $cf['decimal_point'] : 2; | |
| 3597 | + $decimal_display = !empty($cf['decimal_display']) ? $cf['decimal_display'] : (!empty($cs['decimal_display']) ? $cs['decimal_display'] : 'if'); | |
| 3598 | + $decimalpoint = '.'; | |
| 3599 | 3599 | |
| 3600 | -    if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){
 | |
| 3601 | - $decimalpoint = ','; | |
| 3602 | - } | |
| 3600 | +	if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){
 | |
| 3601 | + $decimalpoint = ','; | |
| 3602 | + } | |
| 3603 | 3603 | |
| 3604 | - $separator = ','; | |
| 3604 | + $separator = ','; | |
| 3605 | 3605 | |
| 3606 | -    if(isset($cs['thousand_separator'])){
 | |
| 3607 | -        if($cs['thousand_separator']=='comma'){$separator = ',';}
 | |
| 3608 | -        if($cs['thousand_separator']=='slash'){$separator = '\\';}
 | |
| 3609 | -        if($cs['thousand_separator']=='period'){$separator = '.';}
 | |
| 3610 | -        if($cs['thousand_separator']=='space'){$separator = ' ';}
 | |
| 3611 | -        if($cs['thousand_separator']=='none'){$separator = '';}
 | |
| 3612 | - } | |
| 3606 | +	if(isset($cs['thousand_separator'])){
 | |
| 3607 | +		if($cs['thousand_separator']=='comma'){$separator = ',';}
 | |
| 3608 | +		if($cs['thousand_separator']=='slash'){$separator = '\\';}
 | |
| 3609 | +		if($cs['thousand_separator']=='period'){$separator = '.';}
 | |
| 3610 | +		if($cs['thousand_separator']=='space'){$separator = ' ';}
 | |
| 3611 | +		if($cs['thousand_separator']=='none'){$separator = '';}
 | |
| 3612 | + } | |
| 3613 | 3613 | |
| 3614 | - $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left'; | |
| 3614 | + $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left'; | |
| 3615 | 3615 | |
| 3616 | -    if($decimals>0 && $decimal_display=='if'){
 | |
| 3617 | - if(is_int($number) || floor( $number ) == $number) | |
| 3618 | - $decimals = 0; | |
| 3619 | - } | |
| 3616 | +	if($decimals>0 && $decimal_display=='if'){
 | |
| 3617 | + if(is_int($number) || floor( $number ) == $number) | |
| 3618 | + $decimals = 0; | |
| 3619 | + } | |
| 3620 | 3620 | |
| 3621 | - $number = number_format($number,$decimals,$decimalpoint,$separator); | |
| 3621 | + $number = number_format($number,$decimals,$decimalpoint,$separator); | |
| 3622 | 3622 | |
| 3623 | 3623 | |
| 3624 | 3624 | |
| 3625 | -    if($currency_symbol_placement=='left'){
 | |
| 3626 | - $number = $symbol . $number; | |
| 3627 | -    }else{
 | |
| 3628 | - $number = $number . $symbol; | |
| 3629 | - } | |
| 3625 | +	if($currency_symbol_placement=='left'){
 | |
| 3626 | + $number = $symbol . $number; | |
| 3627 | +	}else{
 | |
| 3628 | + $number = $number . $symbol; | |
| 3629 | + } | |
| 3630 | 3630 | |
| 3631 | 3631 | |
| 3632 | 3632 | return $number; | 
| @@ -49,7 +49,7 @@ discard block | ||
| 49 | 49 | function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL") | 
| 50 | 50 |      {
 | 
| 51 | 51 | global $wpdb; | 
| 52 | - $result = 0;// no rows affected | |
| 52 | + $result = 0; // no rows affected | |
| 53 | 53 |          if (!geodir_column_exist($db, $column)) {
 | 
| 54 | 54 | if (!empty($db) && !empty($column)) | 
| 55 | 55 |                  $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
 | 
| @@ -74,7 +74,7 @@ discard block | ||
| 74 | 74 |  {
 | 
| 75 | 75 | global $wpdb, $geodir_post_custom_fields_cache; | 
| 76 | 76 | |
| 77 | - $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location; | |
| 77 | + $cache_stored = $post_type.'_'.$package_id.'_'.$default.'_'.$fields_location; | |
| 78 | 78 | |
| 79 | 79 |      if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {
 | 
| 80 | 80 | return $geodir_post_custom_fields_cache[$cache_stored]; | 
| @@ -88,14 +88,14 @@ discard block | ||
| 88 | 88 | $default_query .= " and is_admin = '0' "; | 
| 89 | 89 | |
| 90 | 90 |      if ($fields_location == 'none') {
 | 
| 91 | -    } else{
 | |
| 92 | - $fields_location = esc_sql( $fields_location ); | |
| 91 | +    } else {
 | |
| 92 | + $fields_location = esc_sql($fields_location); | |
| 93 | 93 | $default_query .= " and show_in LIKE '%%[$fields_location]%%' "; | 
| 94 | 94 | } | 
| 95 | 95 | |
| 96 | 96 | $post_meta_info = $wpdb->get_results( | 
| 97 | 97 | $wpdb->prepare( | 
| 98 | -            "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
 | |
| 98 | +            "select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
 | |
| 99 | 99 | array($post_type) | 
| 100 | 100 | ) | 
| 101 | 101 | ); | 
| @@ -162,13 +162,13 @@ discard block | ||
| 162 | 162 | * @param string $field_ins_upd When set to "submit" displays form. | 
| 163 | 163 | * @param string $field_type_key The key of the custom field. | 
| 164 | 164 | */ | 
| 165 | - function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='') | |
| 165 | + function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key = '') | |
| 166 | 166 |      {
 | 
| 167 | 167 | global $wpdb; | 
| 168 | 168 | $cf = $result_str; | 
| 169 | 169 |          if (!is_object($cf)) {
 | 
| 170 | 170 | |
| 171 | -            $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));
 | |
| 171 | +            $field_info = $wpdb->get_row($wpdb->prepare("select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d", array($cf)));
 | |
| 172 | 172 | |
| 173 | 173 |          } else {
 | 
| 174 | 174 | $field_info = $cf; | 
| @@ -202,14 +202,14 @@ discard block | ||
| 202 | 202 |          if ($field_id != '') {
 | 
| 203 | 203 | $cf = trim($field_id, '_'); | 
| 204 | 204 | |
| 205 | -            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {
 | |
| 206 | -                $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));
 | |
| 205 | +            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d", array($cf)))) {
 | |
| 206 | +                $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d ", array($cf)));
 | |
| 207 | 207 | |
| 208 | 208 | $post_type = $field->post_type; | 
| 209 | 209 | $htmlvar_name = $field->htmlvar_name; | 
| 210 | 210 | |
| 211 | 211 |                  if ($post_type != '' && $htmlvar_name != '') {
 | 
| 212 | -                    $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
 | |
| 212 | +                    $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
 | |
| 213 | 213 | } | 
| 214 | 214 | |
| 215 | 215 | /** | 
| @@ -223,18 +223,18 @@ discard block | ||
| 223 | 223 |                  do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);
 | 
| 224 | 224 | |
| 225 | 225 |                  if ($field->field_type == 'address') {
 | 
| 226 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");
 | |
| 227 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");
 | |
| 228 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");
 | |
| 229 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");
 | |
| 230 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");
 | |
| 231 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");
 | |
| 232 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");
 | |
| 233 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");
 | |
| 234 | -                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");
 | |
| 226 | +                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_address`");
 | |
| 227 | +                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_city`");
 | |
| 228 | +                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_region`");
 | |
| 229 | +                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_country`");
 | |
| 230 | +                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_zip`");
 | |
| 231 | +                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_latitude`");
 | |
| 232 | +                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_longitude`");
 | |
| 233 | +                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_mapview`");
 | |
| 234 | +                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_mapzoom`");
 | |
| 235 | 235 |                  } else {
 | 
| 236 | 236 |                      if ($field->field_type != 'fieldset') {
 | 
| 237 | -                        $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");
 | |
| 237 | +                        $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."`");
 | |
| 238 | 238 | } | 
| 239 | 239 | } | 
| 240 | 240 | |
| @@ -305,7 +305,7 @@ discard block | ||
| 305 | 305 | $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : ''; | 
| 306 | 306 | |
| 307 | 307 | // some servers fail if a POST value is VARCHAR so we change it. | 
| 308 | -        if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){
 | |
| 308 | +        if (isset($request_field['data_type']) && $request_field['data_type'] == 'XVARCHAR') {
 | |
| 309 | 309 | $request_field['data_type'] = 'VARCHAR'; | 
| 310 | 310 | } | 
| 311 | 311 | |
| @@ -318,12 +318,12 @@ discard block | ||
| 318 | 318 | $post_type = $request_field['listing_type']; | 
| 319 | 319 | |
| 320 | 320 |          if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {
 | 
| 321 | - $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name; | |
| 321 | + $cehhtmlvar_name = 'geodir_'.$cehhtmlvar_name; | |
| 322 | 322 | } | 
| 323 | 323 | |
| 324 | 324 | $check_html_variable = $wpdb->get_var( | 
| 325 | 325 | $wpdb->prepare( | 
| 326 | - "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ", | |
| 326 | + "select htmlvar_name from ".GEODIR_CUSTOM_FIELDS_TABLE." where id <> %d and htmlvar_name = %s and post_type = %s ", | |
| 327 | 327 | array($cf, $cehhtmlvar_name, $post_type) | 
| 328 | 328 | ) | 
| 329 | 329 | ); | 
| @@ -335,7 +335,7 @@ discard block | ||
| 335 | 335 | |
| 336 | 336 | $post_meta_info = $wpdb->get_row( | 
| 337 | 337 | $wpdb->prepare( | 
| 338 | - "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d", | |
| 338 | + "select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where id = %d", | |
| 339 | 339 | array($cf) | 
| 340 | 340 | ) | 
| 341 | 341 | ); | 
| @@ -353,7 +353,7 @@ discard block | ||
| 353 | 353 | if ($post_type == '') $post_type = 'gd_place'; | 
| 354 | 354 | |
| 355 | 355 | |
| 356 | - $detail_table = $plugin_prefix . $post_type . '_detail'; | |
| 356 | + $detail_table = $plugin_prefix.$post_type.'_detail'; | |
| 357 | 357 | |
| 358 | 358 | $admin_title = $request_field['admin_title']; | 
| 359 | 359 | $site_title = $request_field['site_title']; | 
| @@ -381,12 +381,12 @@ discard block | ||
| 381 | 381 | $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : ''; | 
| 382 | 382 | |
| 383 | 383 | |
| 384 | -            if(is_array($show_in)){
 | |
| 384 | +            if (is_array($show_in)) {
 | |
| 385 | 385 |                  $show_in = implode(",", $request_field['show_in']);
 | 
| 386 | 386 | } | 
| 387 | 387 | |
| 388 | 388 |              if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {
 | 
| 389 | - $htmlvar_name = 'geodir_' . $htmlvar_name; | |
| 389 | + $htmlvar_name = 'geodir_'.$htmlvar_name; | |
| 390 | 390 | } | 
| 391 | 391 | |
| 392 | 392 | $option_values = ''; | 
| @@ -427,9 +427,9 @@ discard block | ||
| 427 | 427 | |
| 428 | 428 |              if ($sort_order == '') {
 | 
| 429 | 429 | |
| 430 | -                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);
 | |
| 430 | +                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM ".GEODIR_CUSTOM_FIELDS_TABLE);
 | |
| 431 | 431 | |
| 432 | - $sort_order = (int)$last_order + 1; | |
| 432 | + $sort_order = (int) $last_order + 1; | |
| 433 | 433 | } | 
| 434 | 434 | |
| 435 | 435 | $default_value_add = ''; | 
| @@ -441,15 +441,15 @@ discard block | ||
| 441 | 441 | case 'address': | 
| 442 | 442 | |
| 443 | 443 |                          if ($htmlvar_name != '') {
 | 
| 444 | - $prefix = $htmlvar_name . '_'; | |
| 444 | + $prefix = $htmlvar_name.'_'; | |
| 445 | 445 | } | 
| 446 | - $old_prefix = $old_html_variable . '_'; | |
| 446 | + $old_prefix = $old_html_variable.'_'; | |
| 447 | 447 | |
| 448 | 448 | |
| 449 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL"; | |
| 449 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."address` `".$prefix."address` VARCHAR( 254 ) NULL"; | |
| 450 | 450 | |
| 451 | 451 |                          if ($default_value != '') {
 | 
| 452 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 452 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 453 | 453 | } | 
| 454 | 454 | |
| 455 | 455 | $wpdb->query($meta_field_add); | 
| @@ -458,12 +458,12 @@ discard block | ||
| 458 | 458 | |
| 459 | 459 |                              if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
 | 
| 460 | 460 | |
| 461 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");
 | |
| 461 | +                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."city'");
 | |
| 462 | 462 |                                  if ($is_column) {
 | 
| 463 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL"; | |
| 463 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."city` `".$prefix."city` VARCHAR( 50 ) NULL"; | |
| 464 | 464 | |
| 465 | 465 |                                      if ($default_value != '') {
 | 
| 466 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 466 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 467 | 467 | } | 
| 468 | 468 | |
| 469 | 469 | $wpdb->query($meta_field_add); | 
| @@ -471,9 +471,9 @@ discard block | ||
| 471 | 471 | |
| 472 | 472 | $meta_field_add = "VARCHAR( 50 ) NULL"; | 
| 473 | 473 |                                      if ($default_value != '') {
 | 
| 474 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 474 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 475 | 475 | } | 
| 476 | - geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add); | |
| 476 | + geodir_add_column_if_not_exist($detail_table, $prefix."city", $meta_field_add); | |
| 477 | 477 | |
| 478 | 478 | } | 
| 479 | 479 | |
| @@ -483,36 +483,36 @@ discard block | ||
| 483 | 483 | |
| 484 | 484 |                              if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
 | 
| 485 | 485 | |
| 486 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");
 | |
| 486 | +                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."region'");
 | |
| 487 | 487 | |
| 488 | 488 |                                  if ($is_column) {
 | 
| 489 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL"; | |
| 489 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."region` `".$prefix."region` VARCHAR( 50 ) NULL"; | |
| 490 | 490 | |
| 491 | 491 |                                      if ($default_value != '') {
 | 
| 492 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 492 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 493 | 493 | } | 
| 494 | 494 | |
| 495 | 495 | $wpdb->query($meta_field_add); | 
| 496 | 496 |                                  } else {
 | 
| 497 | 497 | $meta_field_add = "VARCHAR( 50 ) NULL"; | 
| 498 | 498 |                                      if ($default_value != '') {
 | 
| 499 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 499 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 500 | 500 | } | 
| 501 | 501 | |
| 502 | - geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add); | |
| 502 | + geodir_add_column_if_not_exist($detail_table, $prefix."region", $meta_field_add); | |
| 503 | 503 | } | 
| 504 | 504 | |
| 505 | 505 | } | 
| 506 | 506 |                              if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
 | 
| 507 | 507 | |
| 508 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");
 | |
| 508 | +                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."country'");
 | |
| 509 | 509 | |
| 510 | 510 |                                  if ($is_column) {
 | 
| 511 | 511 | |
| 512 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL"; | |
| 512 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."country` `".$prefix."country` VARCHAR( 50 ) NULL"; | |
| 513 | 513 | |
| 514 | 514 |                                      if ($default_value != '') {
 | 
| 515 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 515 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 516 | 516 | } | 
| 517 | 517 | |
| 518 | 518 | $wpdb->query($meta_field_add); | 
| @@ -520,24 +520,24 @@ discard block | ||
| 520 | 520 | |
| 521 | 521 | $meta_field_add = "VARCHAR( 50 ) NULL"; | 
| 522 | 522 |                                      if ($default_value != '') {
 | 
| 523 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 523 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 524 | 524 | } | 
| 525 | 525 | |
| 526 | - geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add); | |
| 526 | + geodir_add_column_if_not_exist($detail_table, $prefix."country", $meta_field_add); | |
| 527 | 527 | |
| 528 | 528 | } | 
| 529 | 529 | |
| 530 | 530 | } | 
| 531 | 531 |                              if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
 | 
| 532 | 532 | |
| 533 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");
 | |
| 533 | +                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."zip'");
 | |
| 534 | 534 | |
| 535 | 535 |                                  if ($is_column) {
 | 
| 536 | 536 | |
| 537 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL"; | |
| 537 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."zip` `".$prefix."zip` VARCHAR( 50 ) NULL"; | |
| 538 | 538 | |
| 539 | 539 |                                      if ($default_value != '') {
 | 
| 540 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 540 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 541 | 541 | } | 
| 542 | 542 | |
| 543 | 543 | $wpdb->query($meta_field_add); | 
| @@ -545,128 +545,128 @@ discard block | ||
| 545 | 545 | |
| 546 | 546 | $meta_field_add = "VARCHAR( 50 ) NULL"; | 
| 547 | 547 |                                      if ($default_value != '') {
 | 
| 548 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 548 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 549 | 549 | } | 
| 550 | 550 | |
| 551 | - geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add); | |
| 551 | + geodir_add_column_if_not_exist($detail_table, $prefix."zip", $meta_field_add); | |
| 552 | 552 | |
| 553 | 553 | } | 
| 554 | 554 | |
| 555 | 555 | } | 
| 556 | 556 |                              if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
 | 
| 557 | 557 | |
| 558 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");
 | |
| 558 | +                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."latitude'");
 | |
| 559 | 559 |                                  if ($is_column) {
 | 
| 560 | 560 | |
| 561 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; | |
| 561 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."latitude` `".$prefix."latitude` VARCHAR( 20 ) NULL"; | |
| 562 | 562 | |
| 563 | 563 |                                      if ($default_value != '') {
 | 
| 564 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 564 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 565 | 565 | } | 
| 566 | 566 | |
| 567 | 567 | $wpdb->query($meta_field_add); | 
| 568 | 568 |                                  } else {
 | 
| 569 | 569 | |
| 570 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; | |
| 570 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latitude` VARCHAR( 20 ) NULL"; | |
| 571 | 571 | $meta_field_add = "VARCHAR( 20 ) NULL"; | 
| 572 | 572 |                                      if ($default_value != '') {
 | 
| 573 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 573 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 574 | 574 | } | 
| 575 | 575 | |
| 576 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add); | |
| 576 | + geodir_add_column_if_not_exist($detail_table, $prefix."latitude", $meta_field_add); | |
| 577 | 577 | |
| 578 | 578 | } | 
| 579 | 579 | |
| 580 | 580 | |
| 581 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");
 | |
| 581 | +                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."longitude'");
 | |
| 582 | 582 | |
| 583 | 583 |                                  if ($is_column) {
 | 
| 584 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; | |
| 584 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."longitude` `".$prefix."longitude` VARCHAR( 20 ) NULL"; | |
| 585 | 585 | |
| 586 | 586 |                                      if ($default_value != '') {
 | 
| 587 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 587 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 588 | 588 | } | 
| 589 | 589 | |
| 590 | 590 | $wpdb->query($meta_field_add); | 
| 591 | 591 |                                  } else {
 | 
| 592 | 592 | |
| 593 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; | |
| 593 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."longitude` VARCHAR( 20 ) NULL"; | |
| 594 | 594 | $meta_field_add = "VARCHAR( 20 ) NULL"; | 
| 595 | 595 |                                      if ($default_value != '') {
 | 
| 596 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 596 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 597 | 597 | } | 
| 598 | 598 | |
| 599 | - geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add); | |
| 599 | + geodir_add_column_if_not_exist($detail_table, $prefix."longitude", $meta_field_add); | |
| 600 | 600 | } | 
| 601 | 601 | |
| 602 | 602 | } | 
| 603 | 603 |                              if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
 | 
| 604 | 604 | |
| 605 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");
 | |
| 605 | +                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."mapview'");
 | |
| 606 | 606 | |
| 607 | 607 |                                  if ($is_column) {
 | 
| 608 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; | |
| 608 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."mapview` `".$prefix."mapview` VARCHAR( 15 ) NULL"; | |
| 609 | 609 | |
| 610 | 610 |                                      if ($default_value != '') {
 | 
| 611 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 611 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 612 | 612 | } | 
| 613 | 613 | |
| 614 | 614 | $wpdb->query($meta_field_add); | 
| 615 | 615 |                                  } else {
 | 
| 616 | 616 | |
| 617 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; | |
| 617 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapview` VARCHAR( 15 ) NULL"; | |
| 618 | 618 | |
| 619 | 619 | $meta_field_add = "VARCHAR( 15 ) NULL"; | 
| 620 | 620 |                                      if ($default_value != '') {
 | 
| 621 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 621 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 622 | 622 | } | 
| 623 | 623 | |
| 624 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add); | |
| 624 | + geodir_add_column_if_not_exist($detail_table, $prefix."mapview", $meta_field_add); | |
| 625 | 625 | } | 
| 626 | 626 | |
| 627 | 627 | |
| 628 | 628 | } | 
| 629 | 629 |                              if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
 | 
| 630 | 630 | |
| 631 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");
 | |
| 631 | +                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."mapzoom'");
 | |
| 632 | 632 |                                  if ($is_column) {
 | 
| 633 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; | |
| 633 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."mapzoom` `".$prefix."mapzoom` VARCHAR( 3 ) NULL"; | |
| 634 | 634 | |
| 635 | 635 |                                      if ($default_value != '') {
 | 
| 636 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 636 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 637 | 637 | } | 
| 638 | 638 | |
| 639 | 639 | $wpdb->query($meta_field_add); | 
| 640 | 640 | |
| 641 | 641 |                                  } else {
 | 
| 642 | 642 | |
| 643 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; | |
| 643 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapzoom` VARCHAR( 3 ) NULL"; | |
| 644 | 644 | |
| 645 | 645 | $meta_field_add = "VARCHAR( 3 ) NULL"; | 
| 646 | 646 |                                      if ($default_value != '') {
 | 
| 647 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 647 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 648 | 648 | } | 
| 649 | 649 | |
| 650 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add); | |
| 650 | + geodir_add_column_if_not_exist($detail_table, $prefix."mapzoom", $meta_field_add); | |
| 651 | 651 | } | 
| 652 | 652 | |
| 653 | 653 | } | 
| 654 | 654 | // show lat lng | 
| 655 | 655 |                              if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
 | 
| 656 | -                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");
 | |
| 656 | +                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."latlng'");
 | |
| 657 | 657 | |
| 658 | 658 |                                  if ($is_column) {
 | 
| 659 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; | |
| 659 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."latlng` `".$prefix."latlng` VARCHAR( 3 ) NULL"; | |
| 660 | 660 | $meta_field_add .= " DEFAULT '1'"; | 
| 661 | 661 | |
| 662 | 662 | $wpdb->query($meta_field_add); | 
| 663 | 663 |                                  } else {
 | 
| 664 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; | |
| 664 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latlng` VARCHAR( 3 ) NULL"; | |
| 665 | 665 | |
| 666 | 666 | $meta_field_add = "VARCHAR( 3 ) NULL"; | 
| 667 | 667 | $meta_field_add .= " DEFAULT '1'"; | 
| 668 | 668 | |
| 669 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add); | |
| 669 | + geodir_add_column_if_not_exist($detail_table, $prefix."latlng", $meta_field_add); | |
| 670 | 670 | } | 
| 671 | 671 | |
| 672 | 672 | } | 
| @@ -682,30 +682,30 @@ discard block | ||
| 682 | 682 | $op_size = '500'; | 
| 683 | 683 | |
| 684 | 684 | // only make the field as big as it needs to be. | 
| 685 | -                        if(isset($option_values) && $option_values && $field_type=='select'){
 | |
| 686 | -                            $option_values_arr = explode(',',$option_values);
 | |
| 687 | -                            if(is_array($option_values_arr)){
 | |
| 685 | +                        if (isset($option_values) && $option_values && $field_type == 'select') {
 | |
| 686 | +                            $option_values_arr = explode(',', $option_values);
 | |
| 687 | +                            if (is_array($option_values_arr)) {
 | |
| 688 | 688 | $op_max = 0; | 
| 689 | -                                foreach($option_values_arr as $op_val){
 | |
| 690 | -                                    if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}
 | |
| 689 | +                                foreach ($option_values_arr as $op_val) {
 | |
| 690 | +                                    if (strlen($op_val) && strlen($op_val) > $op_max) {$op_max = strlen($op_val); }
 | |
| 691 | 691 | } | 
| 692 | -                                if($op_max){$op_size =$op_max; }
 | |
| 692 | +                                if ($op_max) {$op_size = $op_max; }
 | |
| 693 | 693 | } | 
| 694 | -                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
 | |
| 695 | -                            if(strlen($option_values)){
 | |
| 696 | - $op_size = strlen($option_values); | |
| 694 | +                        }elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
 | |
| 695 | +                            if (strlen($option_values)) {
 | |
| 696 | + $op_size = strlen($option_values); | |
| 697 | 697 | } | 
| 698 | 698 | } | 
| 699 | 699 | |
| 700 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL"; | |
| 700 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."`VARCHAR( $op_size ) NULL"; | |
| 701 | 701 | |
| 702 | 702 |                          if ($default_value != '') {
 | 
| 703 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 703 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 704 | 704 | } | 
| 705 | 705 | |
| 706 | 706 | $alter_result = $wpdb->query($meta_field_add); | 
| 707 | -                        if($alter_result===false){
 | |
| 708 | -                            return __('Column change failed, you may have too many columns.','geodirectory');
 | |
| 707 | +                        if ($alter_result === false) {
 | |
| 708 | +                            return __('Column change failed, you may have too many columns.', 'geodirectory');
 | |
| 709 | 709 | } | 
| 710 | 710 | |
| 711 | 711 | if (isset($request_field['cat_display_type'])) | 
| @@ -722,9 +722,9 @@ discard block | ||
| 722 | 722 | case 'url': | 
| 723 | 723 | case 'file': | 
| 724 | 724 | |
| 725 | -                        $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");
 | |
| 726 | -                        if($alter_result===false){
 | |
| 727 | -                            return __('Column change failed, you may have too many columns.','geodirectory');
 | |
| 725 | +                        $alter_result = $wpdb->query("ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` TEXT NULL");
 | |
| 726 | +                        if ($alter_result === false) {
 | |
| 727 | +                            return __('Column change failed, you may have too many columns.', 'geodirectory');
 | |
| 728 | 728 | } | 
| 729 | 729 | if (isset($request_field['advanced_editor'])) | 
| 730 | 730 | $extra_fields = $request_field['advanced_editor']; | 
| @@ -738,24 +738,24 @@ discard block | ||
| 738 | 738 | default: | 
| 739 | 739 |                          if ($data_type != 'VARCHAR' && $data_type != '') {
 | 
| 740 | 740 |                              if ($data_type == 'FLOAT' && $decimal_point > 0) {
 | 
| 741 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL"; | |
| 741 | + $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` DECIMAL(11, ".(int) $decimal_point.") NULL"; | |
| 742 | 742 |                              } else {
 | 
| 743 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL"; | |
| 743 | + $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` ".$data_type." NULL"; | |
| 744 | 744 | } | 
| 745 | 745 | |
| 746 | 746 |                              if (is_numeric($default_value) && $default_value != '') {
 | 
| 747 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; | |
| 747 | + $default_value_add .= " DEFAULT '".$default_value."'"; | |
| 748 | 748 | } | 
| 749 | 749 |                          } else {
 | 
| 750 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL"; | |
| 750 | + $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` VARCHAR( 254 ) NULL"; | |
| 751 | 751 |                              if ($default_value != '') {
 | 
| 752 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; | |
| 752 | + $default_value_add .= " DEFAULT '".$default_value."'"; | |
| 753 | 753 | } | 
| 754 | 754 | } | 
| 755 | 755 | |
| 756 | 756 | $alter_result = $wpdb->query($default_value_add); | 
| 757 | -                        if($alter_result===false){
 | |
| 758 | -                            return __('Column change failed, you may have too many columns.','geodirectory');
 | |
| 757 | +                        if ($alter_result === false) {
 | |
| 758 | +                            return __('Column change failed, you may have too many columns.', 'geodirectory');
 | |
| 759 | 759 | } | 
| 760 | 760 | break; | 
| 761 | 761 | endswitch; | 
| @@ -771,7 +771,7 @@ discard block | ||
| 771 | 771 | |
| 772 | 772 | $wpdb->prepare( | 
| 773 | 773 | |
| 774 | - "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set | |
| 774 | + "update ".GEODIR_CUSTOM_FIELDS_TABLE." set | |
| 775 | 775 | post_type = %s, | 
| 776 | 776 | admin_title = %s, | 
| 777 | 777 | site_title = %s, | 
| @@ -805,7 +805,7 @@ discard block | ||
| 805 | 805 | for_admin_use = %s | 
| 806 | 806 | where id = %d", | 
| 807 | 807 | |
| 808 | - array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf) | |
| 808 | + array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use, $cf) | |
| 809 | 809 | ) | 
| 810 | 810 | |
| 811 | 811 | ); | 
| @@ -815,7 +815,7 @@ discard block | ||
| 815 | 815 | |
| 816 | 816 | $wpdb->query( | 
| 817 | 817 | $wpdb->prepare( | 
| 818 | - "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set | |
| 818 | + "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set | |
| 819 | 819 | site_title=%s | 
| 820 | 820 | where post_type = %s and htmlvar_name = %s", | 
| 821 | 821 | array($site_title, $post_type, $htmlvar_name) | 
| @@ -824,7 +824,7 @@ discard block | ||
| 824 | 824 | |
| 825 | 825 | |
| 826 | 826 | if ($cat_sort == '') | 
| 827 | -                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
 | |
| 827 | +                    $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
 | |
| 828 | 828 | |
| 829 | 829 | |
| 830 | 830 | /** | 
| @@ -844,7 +844,7 @@ discard block | ||
| 844 | 844 | $data_type = ''; | 
| 845 | 845 | |
| 846 | 846 |                          if ($htmlvar_name != '') {
 | 
| 847 | - $prefix = $htmlvar_name . '_'; | |
| 847 | + $prefix = $htmlvar_name.'_'; | |
| 848 | 848 | } | 
| 849 | 849 | $old_prefix = $old_html_variable; | 
| 850 | 850 | |
| @@ -852,109 +852,109 @@ discard block | ||
| 852 | 852 | |
| 853 | 853 | $meta_field_add = "VARCHAR( 254 ) NULL"; | 
| 854 | 854 |                          if ($default_value != '') {
 | 
| 855 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 855 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 856 | 856 | } | 
| 857 | 857 | |
| 858 | - geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add); | |
| 858 | + geodir_add_column_if_not_exist($detail_table, $prefix."address", $meta_field_add); | |
| 859 | 859 | //$wpdb->query($meta_field_add); | 
| 860 | 860 | |
| 861 | 861 | |
| 862 | 862 |                          if (!empty($extra_fields)) {
 | 
| 863 | 863 | |
| 864 | 864 |                              if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
 | 
| 865 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL"; | |
| 865 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."city` VARCHAR( 30 ) NULL"; | |
| 866 | 866 | $meta_field_add = "VARCHAR( 30 ) NULL"; | 
| 867 | 867 |                                  if ($default_value != '') {
 | 
| 868 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 868 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 869 | 869 | } | 
| 870 | 870 | |
| 871 | - geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add); | |
| 871 | + geodir_add_column_if_not_exist($detail_table, $prefix."city", $meta_field_add); | |
| 872 | 872 | //$wpdb->query($meta_field_add); | 
| 873 | 873 | } | 
| 874 | 874 |                              if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
 | 
| 875 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL"; | |
| 875 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."region` VARCHAR( 30 ) NULL"; | |
| 876 | 876 | $meta_field_add = "VARCHAR( 30 ) NULL"; | 
| 877 | 877 |                                  if ($default_value != '') {
 | 
| 878 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 878 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 879 | 879 | } | 
| 880 | 880 | |
| 881 | - geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add); | |
| 881 | + geodir_add_column_if_not_exist($detail_table, $prefix."region", $meta_field_add); | |
| 882 | 882 | //$wpdb->query($meta_field_add); | 
| 883 | 883 | } | 
| 884 | 884 |                              if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
 | 
| 885 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL"; | |
| 885 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."country` VARCHAR( 30 ) NULL"; | |
| 886 | 886 | |
| 887 | 887 | $meta_field_add = "VARCHAR( 30 ) NULL"; | 
| 888 | 888 |                                  if ($default_value != '') {
 | 
| 889 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 889 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 890 | 890 | } | 
| 891 | 891 | |
| 892 | - geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add); | |
| 892 | + geodir_add_column_if_not_exist($detail_table, $prefix."country", $meta_field_add); | |
| 893 | 893 | //$wpdb->query($meta_field_add); | 
| 894 | 894 | } | 
| 895 | 895 |                              if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
 | 
| 896 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL"; | |
| 896 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."zip` VARCHAR( 15 ) NULL"; | |
| 897 | 897 | $meta_field_add = "VARCHAR( 15 ) NULL"; | 
| 898 | 898 |                                  if ($default_value != '') {
 | 
| 899 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 899 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 900 | 900 | } | 
| 901 | 901 | |
| 902 | - geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add); | |
| 902 | + geodir_add_column_if_not_exist($detail_table, $prefix."zip", $meta_field_add); | |
| 903 | 903 | //$wpdb->query($meta_field_add); | 
| 904 | 904 | } | 
| 905 | 905 |                              if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
 | 
| 906 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; | |
| 906 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latitude` VARCHAR( 20 ) NULL"; | |
| 907 | 907 | $meta_field_add = "VARCHAR( 20 ) NULL"; | 
| 908 | 908 |                                  if ($default_value != '') {
 | 
| 909 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 909 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 910 | 910 | } | 
| 911 | 911 | |
| 912 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add); | |
| 912 | + geodir_add_column_if_not_exist($detail_table, $prefix."latitude", $meta_field_add); | |
| 913 | 913 | //$wpdb->query($meta_field_add); | 
| 914 | 914 | |
| 915 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; | |
| 915 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."longitude` VARCHAR( 20 ) NULL"; | |
| 916 | 916 | |
| 917 | 917 | $meta_field_add = "VARCHAR( 20 ) NULL"; | 
| 918 | 918 |                                  if ($default_value != '') {
 | 
| 919 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 919 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 920 | 920 | } | 
| 921 | 921 | |
| 922 | - geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add); | |
| 922 | + geodir_add_column_if_not_exist($detail_table, $prefix."longitude", $meta_field_add); | |
| 923 | 923 | |
| 924 | 924 | //$wpdb->query($meta_field_add); | 
| 925 | 925 | } | 
| 926 | 926 |                              if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
 | 
| 927 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; | |
| 927 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapview` VARCHAR( 15 ) NULL"; | |
| 928 | 928 | |
| 929 | 929 | $meta_field_add = "VARCHAR( 15 ) NULL"; | 
| 930 | 930 |                                  if ($default_value != '') {
 | 
| 931 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 931 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 932 | 932 | } | 
| 933 | 933 | |
| 934 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add); | |
| 934 | + geodir_add_column_if_not_exist($detail_table, $prefix."mapview", $meta_field_add); | |
| 935 | 935 | |
| 936 | 936 | //$wpdb->query($meta_field_add); | 
| 937 | 937 | } | 
| 938 | 938 |                              if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
 | 
| 939 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; | |
| 939 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapzoom` VARCHAR( 3 ) NULL"; | |
| 940 | 940 | |
| 941 | 941 | $meta_field_add = "VARCHAR( 3 ) NULL"; | 
| 942 | 942 |                                  if ($default_value != '') {
 | 
| 943 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 943 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 944 | 944 | } | 
| 945 | 945 | |
| 946 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add); | |
| 946 | + geodir_add_column_if_not_exist($detail_table, $prefix."mapzoom", $meta_field_add); | |
| 947 | 947 | |
| 948 | 948 | //$wpdb->query($meta_field_add); | 
| 949 | 949 | } | 
| 950 | 950 | // show lat lng | 
| 951 | 951 |                              if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
 | 
| 952 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; | |
| 952 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latlng` VARCHAR( 3 ) NULL"; | |
| 953 | 953 | |
| 954 | 954 | $meta_field_add = "VARCHAR( 3 ) NULL"; | 
| 955 | 955 | $meta_field_add .= " DEFAULT '1'"; | 
| 956 | 956 | |
| 957 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add); | |
| 957 | + geodir_add_column_if_not_exist($detail_table, $prefix."latlng", $meta_field_add); | |
| 958 | 958 | //$wpdb->query($meta_field_add); | 
| 959 | 959 | } | 
| 960 | 960 | } | 
| @@ -964,8 +964,8 @@ discard block | ||
| 964 | 964 | case 'checkbox': | 
| 965 | 965 | $data_type = 'TINYINT'; | 
| 966 | 966 | |
| 967 | - $meta_field_add = $data_type . "( 1 ) NOT NULL "; | |
| 968 | -                        if ((int)$default_value === 1) {
 | |
| 967 | + $meta_field_add = $data_type."( 1 ) NOT NULL "; | |
| 968 | +                        if ((int) $default_value === 1) {
 | |
| 969 | 969 | $meta_field_add .= " DEFAULT '1'"; | 
| 970 | 970 | } | 
| 971 | 971 | |
| @@ -998,7 +998,7 @@ discard block | ||
| 998 | 998 | } | 
| 999 | 999 |                          } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
 | 
| 1000 | 1000 |                              if (strlen($option_values)) {
 | 
| 1001 | - $op_size = strlen($option_values); | |
| 1001 | + $op_size = strlen($option_values); | |
| 1002 | 1002 | } | 
| 1003 | 1003 | |
| 1004 | 1004 |                              if (isset($request_field['multi_display_type'])) {
 | 
| @@ -1006,9 +1006,9 @@ discard block | ||
| 1006 | 1006 | } | 
| 1007 | 1007 | } | 
| 1008 | 1008 | |
| 1009 | - $meta_field_add = $data_type . "( $op_size ) NULL "; | |
| 1009 | + $meta_field_add = $data_type."( $op_size ) NULL "; | |
| 1010 | 1010 |                          if ($default_value != '') {
 | 
| 1011 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 1011 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 1012 | 1012 | } | 
| 1013 | 1013 | |
| 1014 | 1014 | $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); | 
| @@ -1023,9 +1023,9 @@ discard block | ||
| 1023 | 1023 | |
| 1024 | 1024 | $data_type = 'TEXT'; | 
| 1025 | 1025 | |
| 1026 | - $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; | |
| 1026 | + $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL "; | |
| 1027 | 1027 | |
| 1028 | - $meta_field_add = $data_type . " NULL "; | |
| 1028 | + $meta_field_add = $data_type." NULL "; | |
| 1029 | 1029 | /*if($default_value != '') | 
| 1030 | 1030 |  					{ $meta_field_add .= " DEFAULT '".$default_value."'"; }*/
 | 
| 1031 | 1031 | |
| @@ -1040,9 +1040,9 @@ discard block | ||
| 1040 | 1040 | |
| 1041 | 1041 | $data_type = 'DATE'; | 
| 1042 | 1042 | |
| 1043 | - $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; | |
| 1043 | + $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL "; | |
| 1044 | 1044 | |
| 1045 | - $meta_field_add = $data_type . " NULL "; | |
| 1045 | + $meta_field_add = $data_type." NULL "; | |
| 1046 | 1046 | |
| 1047 | 1047 | $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); | 
| 1048 | 1048 |                          if ($add_result === false) {
 | 
| @@ -1055,9 +1055,9 @@ discard block | ||
| 1055 | 1055 | |
| 1056 | 1056 | $data_type = 'TIME'; | 
| 1057 | 1057 | |
| 1058 | - $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; | |
| 1058 | + $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL "; | |
| 1059 | 1059 | |
| 1060 | - $meta_field_add = $data_type . " NULL "; | |
| 1060 | + $meta_field_add = $data_type." NULL "; | |
| 1061 | 1061 | |
| 1062 | 1062 | $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); | 
| 1063 | 1063 |                          if ($add_result === false) {
 | 
| @@ -1069,22 +1069,22 @@ discard block | ||
| 1069 | 1069 | default: | 
| 1070 | 1070 | |
| 1071 | 1071 |                          if ($data_type != 'VARCHAR' && $data_type != '') {
 | 
| 1072 | - $meta_field_add = $data_type . " NULL "; | |
| 1072 | + $meta_field_add = $data_type." NULL "; | |
| 1073 | 1073 | |
| 1074 | 1074 |                              if ($data_type == 'FLOAT' && $decimal_point > 0) {
 | 
| 1075 | - $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL "; | |
| 1075 | + $meta_field_add = "DECIMAL(11, ".(int) $decimal_point.") NULL "; | |
| 1076 | 1076 | } | 
| 1077 | 1077 | |
| 1078 | 1078 |                              if (is_numeric($default_value) && $default_value != '') {
 | 
| 1079 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; | |
| 1080 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 1079 | + $default_value_add .= " DEFAULT '".$default_value."'"; | |
| 1080 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 1081 | 1081 | } | 
| 1082 | 1082 |                          } else {
 | 
| 1083 | 1083 | $meta_field_add = " VARCHAR( 254 ) NULL "; | 
| 1084 | 1084 | |
| 1085 | 1085 |                              if ($default_value != '') {
 | 
| 1086 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; | |
| 1087 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; | |
| 1086 | + $default_value_add .= " DEFAULT '".$default_value."'"; | |
| 1087 | + $meta_field_add .= " DEFAULT '".$default_value."'"; | |
| 1088 | 1088 | } | 
| 1089 | 1089 | } | 
| 1090 | 1090 | |
| @@ -1106,7 +1106,7 @@ discard block | ||
| 1106 | 1106 | |
| 1107 | 1107 | $wpdb->prepare( | 
| 1108 | 1108 | |
| 1109 | - "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set | |
| 1109 | + "insert into ".GEODIR_CUSTOM_FIELDS_TABLE." set | |
| 1110 | 1110 | post_type = %s, | 
| 1111 | 1111 | admin_title = %s, | 
| 1112 | 1112 | site_title = %s, | 
| @@ -1139,7 +1139,7 @@ discard block | ||
| 1139 | 1139 | validation_msg = %s, | 
| 1140 | 1140 | for_admin_use = %s ", | 
| 1141 | 1141 | |
| 1142 | - array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use) | |
| 1142 | + array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use) | |
| 1143 | 1143 | |
| 1144 | 1144 | ) | 
| 1145 | 1145 | |
| @@ -1151,7 +1151,7 @@ discard block | ||
| 1151 | 1151 | |
| 1152 | 1152 | } | 
| 1153 | 1153 | |
| 1154 | - return (int)$lastid; | |
| 1154 | + return (int) $lastid; | |
| 1155 | 1155 | |
| 1156 | 1156 | |
| 1157 | 1157 |          } else {
 | 
| @@ -1184,7 +1184,7 @@ discard block | ||
| 1184 | 1184 | |
| 1185 | 1185 | $post_meta_info = $wpdb->query( | 
| 1186 | 1186 | $wpdb->prepare( | 
| 1187 | - "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set | |
| 1187 | + "update ".GEODIR_CUSTOM_FIELDS_TABLE." set | |
| 1188 | 1188 | sort_order=%d | 
| 1189 | 1189 | where id= %d", | 
| 1190 | 1190 | array($count, $cf) | 
| @@ -1200,11 +1200,11 @@ discard block | ||
| 1200 | 1200 | } | 
| 1201 | 1201 | |
| 1202 | 1202 | |
| 1203 | -function geodir_get_cf_value($cf){
 | |
| 1203 | +function geodir_get_cf_value($cf) {
 | |
| 1204 | 1204 | global $gd_session; | 
| 1205 | 1205 | $value = ''; | 
| 1206 | 1206 |      if (is_admin()) {
 | 
| 1207 | - global $post,$gd_session; | |
| 1207 | + global $post, $gd_session; | |
| 1208 | 1208 | |
| 1209 | 1209 | if (isset($_REQUEST['post'])) | 
| 1210 | 1210 | $_REQUEST['pid'] = $_REQUEST['post']; | 
| @@ -1246,16 +1246,16 @@ discard block | ||
| 1246 | 1246 | $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type); | 
| 1247 | 1247 | |
| 1248 | 1248 |      foreach ($custom_fields as $key => $val) {
 | 
| 1249 | -        if(isset($val['extra_fields'])){$extra_fields = $val['extra_fields'];}
 | |
| 1249 | +        if (isset($val['extra_fields'])) {$extra_fields = $val['extra_fields']; }
 | |
| 1250 | 1250 | $val = stripslashes_deep($val); // strip slashes from labels | 
| 1251 | -        if(isset($val['extra_fields'])){$val['extra_fields'] = $extra_fields;}
 | |
| 1251 | +        if (isset($val['extra_fields'])) {$val['extra_fields'] = $extra_fields; }
 | |
| 1252 | 1252 | |
| 1253 | 1253 | $name = $val['name']; | 
| 1254 | 1254 | $type = $val['type']; | 
| 1255 | 1255 | $is_default = $val['is_default']; | 
| 1256 | 1256 | |
| 1257 | 1257 | /* field available to site admin only for edit */ | 
| 1258 | - $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false; | |
| 1258 | + $for_admin_use = isset($val['for_admin_use']) && (int) $val['for_admin_use'] == 1 ? true : false; | |
| 1259 | 1259 |          if ($for_admin_use && !is_super_admin()) {
 | 
| 1260 | 1260 | continue; | 
| 1261 | 1261 | } | 
| @@ -1280,11 +1280,11 @@ discard block | ||
| 1280 | 1280 |           * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
 | 
| 1281 | 1281 | * @see 'geodir_after_custom_form_field_$name' | 
| 1282 | 1282 | */ | 
| 1283 | -        do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);
 | |
| 1283 | +        do_action('geodir_before_custom_form_field_'.$name, $listing_type, $package_id, $val);
 | |
| 1284 | 1284 | |
| 1285 | 1285 | |
| 1286 | 1286 | $custom_field = $val; | 
| 1287 | - $html =''; | |
| 1287 | + $html = ''; | |
| 1288 | 1288 | /** | 
| 1289 | 1289 | * Filter the output for custom fields. | 
| 1290 | 1290 | * | 
| @@ -1293,7 +1293,7 @@ discard block | ||
| 1293 | 1293 | * @param string $html The html to be filtered (blank). | 
| 1294 | 1294 | * @param array $custom_field The custom field array values. | 
| 1295 | 1295 | */ | 
| 1296 | -        echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);
 | |
| 1296 | +        echo apply_filters("geodir_custom_field_input_{$type}", $html, $custom_field);
 | |
| 1297 | 1297 | |
| 1298 | 1298 | |
| 1299 | 1299 | |
| @@ -1308,7 +1308,7 @@ discard block | ||
| 1308 | 1308 |           * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
 | 
| 1309 | 1309 | * @see 'geodir_before_custom_form_field_$name' | 
| 1310 | 1310 | */ | 
| 1311 | -        do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);
 | |
| 1311 | +        do_action('geodir_after_custom_form_field_'.$name, $listing_type, $package_id, $val);
 | |
| 1312 | 1312 | |
| 1313 | 1313 | } | 
| 1314 | 1314 | |
| @@ -1334,7 +1334,7 @@ discard block | ||
| 1334 | 1334 | |
| 1335 | 1335 | $filter = $wpdb->get_row( | 
| 1336 | 1336 | $wpdb->prepare( | 
| 1337 | - "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'", | |
| 1337 | + "SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND ".$key."='".$value."'", | |
| 1338 | 1338 | array($geodir_post_type) | 
| 1339 | 1339 | ) | 
| 1340 | 1340 | ); | 
| @@ -1349,14 +1349,14 @@ discard block | ||
| 1349 | 1349 | } | 
| 1350 | 1350 | |
| 1351 | 1351 | |
| 1352 | -function geodir_field_icon_proccess($cf){
 | |
| 1352 | +function geodir_field_icon_proccess($cf) {
 | |
| 1353 | 1353 | |
| 1354 | 1354 | |
| 1355 | 1355 |      if (strpos($cf['field_icon'], 'http') !== false) {
 | 
| 1356 | -        $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
 | |
| 1356 | +        $field_icon = ' background: url('.$cf['field_icon'].') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
 | |
| 1357 | 1357 |      } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
 | 
| 1358 | - $field_icon = '<i class="' . $cf['field_icon'] . '"></i>'; | |
| 1359 | -    }else{
 | |
| 1358 | + $field_icon = '<i class="'.$cf['field_icon'].'"></i>'; | |
| 1359 | +    } else {
 | |
| 1360 | 1360 | $field_icon = $cf['field_icon']; | 
| 1361 | 1361 | } | 
| 1362 | 1362 | |
| @@ -1401,14 +1401,14 @@ discard block | ||
| 1401 | 1401 | |
| 1402 | 1402 | |
| 1403 | 1403 |              foreach ($fields_info as $type) {
 | 
| 1404 | -                if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
 | |
| 1404 | +                if (isset($type['extra_fields'])) {$extra_fields = $type['extra_fields']; }
 | |
| 1405 | 1405 | $type = stripslashes_deep($type); // strip slashes | 
| 1406 | -                if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
 | |
| 1406 | +                if (isset($type['extra_fields'])) {$type['extra_fields'] = $extra_fields; }
 | |
| 1407 | 1407 | $html = ''; | 
| 1408 | 1408 | $field_icon = geodir_field_icon_proccess($type); | 
| 1409 | 1409 | $filed_type = $type['type']; | 
| 1410 | 1410 | $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; | 
| 1411 | -                if($html_var=='post'){$html_var='post_address';}
 | |
| 1411 | +                if ($html_var == 'post') {$html_var = 'post_address'; }
 | |
| 1412 | 1412 | |
| 1413 | 1413 | /** | 
| 1414 | 1414 | * Filter the output for custom fields. | 
| @@ -1419,7 +1419,7 @@ discard block | ||
| 1419 | 1419 | * @param string $fields_location The location the field is to be show. | 
| 1420 | 1420 | * @param array $type The array of field values. | 
| 1421 | 1421 | */ | 
| 1422 | -                $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
 | |
| 1422 | +                $html = apply_filters("geodir_custom_field_output_{$filed_type}", $html, $fields_location, $type);
 | |
| 1423 | 1423 | |
| 1424 | 1424 | $variables_array = array(); | 
| 1425 | 1425 | |
| @@ -1479,7 +1479,7 @@ discard block | ||
| 1479 | 1479 | * @param string $fields_location The location the fields are being output. | 
| 1480 | 1480 | * @since 1.6.9 | 
| 1481 | 1481 | */ | 
| 1482 | -        return apply_filters('geodir_show_listing_info',$html,$fields_location);
 | |
| 1482 | +        return apply_filters('geodir_show_listing_info', $html, $fields_location);
 | |
| 1483 | 1483 | |
| 1484 | 1484 | } | 
| 1485 | 1485 | } | 
| @@ -1554,7 +1554,7 @@ discard block | ||
| 1554 | 1554 | |
| 1555 | 1555 | $post_type = get_post_type($post_id); | 
| 1556 | 1556 | //echo $field_id; exit; | 
| 1557 | - $table = $plugin_prefix . $post_type . '_detail'; | |
| 1557 | + $table = $plugin_prefix.$post_type.'_detail'; | |
| 1558 | 1558 | |
| 1559 | 1559 | $postcurr_images = array(); | 
| 1560 | 1560 | $postcurr_images = geodir_get_post_meta($post_id, $field_id, true); | 
| @@ -1573,13 +1573,13 @@ discard block | ||
| 1573 | 1573 | $geodir_uploadurl = $uploads['url']; | 
| 1574 | 1574 | $sub_dir = $uploads['subdir']; | 
| 1575 | 1575 | |
| 1576 | -            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
 | |
| 1576 | +            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';
 | |
| 1577 | 1577 | |
| 1578 | 1578 |              for ($m = 0; $m < count($post_image); $m++) {
 | 
| 1579 | 1579 | |
| 1580 | 1580 | /* --------- start ------- */ | 
| 1581 | 1581 | |
| 1582 | -                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
 | |
| 1582 | +                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM ".$table." WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
 | |
| 1583 | 1583 | |
| 1584 | 1584 | |
| 1585 | 1585 | $curr_img_url = $post_image[$m]; | 
| @@ -1605,24 +1605,24 @@ discard block | ||
| 1605 | 1605 |                      //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
 | 
| 1606 | 1606 | |
| 1607 | 1607 |                      if (!function_exists('wp_handle_upload'))
 | 
| 1608 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); | |
| 1608 | + require_once(ABSPATH.'wp-admin/includes/file.php'); | |
| 1609 | 1609 | |
| 1610 | 1610 | if (!is_dir($geodir_uploadpath)) | 
| 1611 | 1611 | mkdir($geodir_uploadpath); | 
| 1612 | 1612 | |
| 1613 | - $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1]; | |
| 1613 | + $new_name = $post_id.'_'.$field_id.'_'.$img_name_arr[0].'.'.$img_name_arr[1]; | |
| 1614 | 1614 |                      $explode_sub_dir = explode("/", $sub_dir);
 | 
| 1615 | 1615 |                      if ($curr_img_dir == end($explode_sub_dir)) {
 | 
| 1616 | - $img_path = $geodir_uploadpath . '/' . $filename; | |
| 1617 | - $img_url = $geodir_uploadurl . '/' . $filename; | |
| 1616 | + $img_path = $geodir_uploadpath.'/'.$filename; | |
| 1617 | + $img_url = $geodir_uploadurl.'/'.$filename; | |
| 1618 | 1618 |                      } else {
 | 
| 1619 | - $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; | |
| 1620 | - $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; | |
| 1619 | + $img_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename; | |
| 1620 | + $img_url = $uploads['url'].'/temp_'.$current_user->data->ID.'/'.$filename; | |
| 1621 | 1621 | } | 
| 1622 | 1622 | |
| 1623 | 1623 | $uploaded_file = ''; | 
| 1624 | 1624 | if (file_exists($img_path)) | 
| 1625 | - $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); | |
| 1625 | + $uploaded_file = copy($img_path, $geodir_uploadpath.'/'.$new_name); | |
| 1626 | 1626 | |
| 1627 | 1627 |                      if ($curr_img_dir != $geodir_uploaddir) {
 | 
| 1628 | 1628 | if (file_exists($img_path)) | 
| @@ -1630,7 +1630,7 @@ discard block | ||
| 1630 | 1630 | } | 
| 1631 | 1631 | |
| 1632 | 1632 | if (!empty($uploaded_file)) | 
| 1633 | - $file_urls = $geodir_uploadurl . '/' . $new_name; | |
| 1633 | + $file_urls = $geodir_uploadurl.'/'.$new_name; | |
| 1634 | 1634 | |
| 1635 | 1635 |                  } else {
 | 
| 1636 | 1636 | $file_urls = $post_image[$m]; | 
| @@ -1644,8 +1644,8 @@ discard block | ||
| 1644 | 1644 |          if (!empty($postcurr_images)) {
 | 
| 1645 | 1645 | |
| 1646 | 1646 |              if ($file_urls != $postcurr_images) {
 | 
| 1647 | -                $invalid_files[] = (object)array('src' => $postcurr_images);
 | |
| 1648 | - $invalid_files = (object)$invalid_files; | |
| 1647 | +                $invalid_files[] = (object) array('src' => $postcurr_images);
 | |
| 1648 | + $invalid_files = (object) $invalid_files; | |
| 1649 | 1649 | } | 
| 1650 | 1650 | } | 
| 1651 | 1651 | |
| @@ -1697,9 +1697,9 @@ discard block | ||
| 1697 | 1697 | function geodir_upload_dir($upload) | 
| 1698 | 1698 |      {
 | 
| 1699 | 1699 | global $current_user; | 
| 1700 | - $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID; | |
| 1701 | - $upload['path'] = $upload['basedir'] . $upload['subdir']; | |
| 1702 | - $upload['url'] = $upload['baseurl'] . $upload['subdir']; | |
| 1700 | + $upload['subdir'] = $upload['subdir'].'/temp_'.$current_user->data->ID; | |
| 1701 | + $upload['path'] = $upload['basedir'].$upload['subdir']; | |
| 1702 | + $upload['url'] = $upload['baseurl'].$upload['subdir']; | |
| 1703 | 1703 | return $upload; | 
| 1704 | 1704 | } | 
| 1705 | 1705 | |
| @@ -1714,20 +1714,20 @@ discard block | ||
| 1714 | 1714 | // check ajax nonce | 
| 1715 | 1715 | $imgid = $_POST["imgid"]; | 
| 1716 | 1716 | |
| 1717 | - check_ajax_referer($imgid . 'pluploadan'); | |
| 1717 | + check_ajax_referer($imgid.'pluploadan'); | |
| 1718 | 1718 | |
| 1719 | 1719 | // handle custom file uploaddir | 
| 1720 | 1720 |          add_filter('upload_dir', 'geodir_upload_dir');
 | 
| 1721 | 1721 | |
| 1722 | 1722 | // change file orientation if needed | 
| 1723 | - $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']); | |
| 1723 | + $fixed_file = geodir_exif($_FILES[$imgid.'async-upload']); | |
| 1724 | 1724 | |
| 1725 | 1725 | // handle file upload | 
| 1726 | 1726 |          $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));
 | 
| 1727 | 1727 | // remove handle custom file uploaddir | 
| 1728 | 1728 |          remove_filter('upload_dir', 'geodir_upload_dir');
 | 
| 1729 | 1729 | |
| 1730 | -        if(!isset($status['url']) && isset($status['error'])){
 | |
| 1730 | +        if (!isset($status['url']) && isset($status['error'])) {
 | |
| 1731 | 1731 | print_r($status); | 
| 1732 | 1732 | } | 
| 1733 | 1733 | |
| @@ -1757,9 +1757,9 @@ discard block | ||
| 1757 | 1757 | |
| 1758 | 1758 | $post_type = get_post_type($post_id); | 
| 1759 | 1759 | |
| 1760 | - $table = $plugin_prefix . $post_type . '_detail'; | |
| 1760 | + $table = $plugin_prefix.$post_type.'_detail'; | |
| 1761 | 1761 | |
| 1762 | -    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));
 | |
| 1762 | +    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM ".$table." WHERE post_id=%d", array($post_id)));
 | |
| 1763 | 1763 | |
| 1764 | 1764 |      if ($results) {
 | 
| 1765 | 1765 | return $results[0]->geodir_video; | 
| @@ -1783,9 +1783,9 @@ discard block | ||
| 1783 | 1783 | |
| 1784 | 1784 | $post_type = get_post_type($post_id); | 
| 1785 | 1785 | |
| 1786 | - $table = $plugin_prefix . $post_type . '_detail'; | |
| 1786 | + $table = $plugin_prefix.$post_type.'_detail'; | |
| 1787 | 1787 | |
| 1788 | -    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));
 | |
| 1788 | +    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM ".$table." WHERE post_id=%d", array($post_id)));
 | |
| 1789 | 1789 | |
| 1790 | 1790 |      if ($results) {
 | 
| 1791 | 1791 | return $results[0]->geodir_special_offers; | 
| @@ -1803,12 +1803,12 @@ discard block | ||
| 1803 | 1803 | */ | 
| 1804 | 1804 | function geodir_max_upload_size() | 
| 1805 | 1805 |      {
 | 
| 1806 | -        $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);
 | |
| 1806 | +        $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);
 | |
| 1807 | 1807 | |
| 1808 | 1808 |          if ($max_filesize > 0 && $max_filesize < 1) {
 | 
| 1809 | - $max_filesize = (int)($max_filesize * 1024) . 'kb'; | |
| 1809 | + $max_filesize = (int) ($max_filesize * 1024).'kb'; | |
| 1810 | 1810 |          } else {
 | 
| 1811 | - $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb'; | |
| 1811 | + $max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb'; | |
| 1812 | 1812 | } | 
| 1813 | 1813 | /** Filter documented in geodirectory-functions/general_functions.php **/ | 
| 1814 | 1814 |          return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
 | 
| @@ -1840,7 +1840,7 @@ discard block | ||
| 1840 | 1840 | |
| 1841 | 1841 | $custom_fields = $wpdb->get_results( | 
| 1842 | 1842 | $wpdb->prepare( | 
| 1843 | - "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc", | |
| 1843 | + "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from ".GEODIR_CUSTOM_FIELDS_TABLE." where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc", | |
| 1844 | 1844 | array($post_type) | 
| 1845 | 1845 | ), 'ARRAY_A' | 
| 1846 | 1846 | ); | 
| @@ -1967,7 +1967,7 @@ discard block | ||
| 1967 | 1967 | |
| 1968 | 1968 | $post_meta_info = $wpdb->query( | 
| 1969 | 1969 | $wpdb->prepare( | 
| 1970 | - "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set | |
| 1970 | + "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set | |
| 1971 | 1971 | sort_order=%d | 
| 1972 | 1972 | where id= %d", | 
| 1973 | 1973 | array($count, $cf) | 
| @@ -2049,14 +2049,14 @@ discard block | ||
| 2049 | 2049 | |
| 2050 | 2050 | $check_html_variable = $wpdb->get_var( | 
| 2051 | 2051 | $wpdb->prepare( | 
| 2052 | - "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ", | |
| 2052 | + "select htmlvar_name from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s and field_type=%s ", | |
| 2053 | 2053 | array($cehhtmlvar_name, $post_type, $field_type) | 
| 2054 | 2054 | ) | 
| 2055 | 2055 | ); | 
| 2056 | 2056 | |
| 2057 | 2057 |          if ($is_default == 1) {
 | 
| 2058 | 2058 | |
| 2059 | -            $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));
 | |
| 2059 | +            $wpdb->query($wpdb->prepare("update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set is_default='0', default_order='' where post_type = %s", array($post_type)));
 | |
| 2060 | 2060 | |
| 2061 | 2061 | } | 
| 2062 | 2062 | |
| @@ -2067,7 +2067,7 @@ discard block | ||
| 2067 | 2067 | |
| 2068 | 2068 | $wpdb->prepare( | 
| 2069 | 2069 | |
| 2070 | - "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set | |
| 2070 | + "insert into ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set | |
| 2071 | 2071 | post_type = %s, | 
| 2072 | 2072 | data_type = %s, | 
| 2073 | 2073 | field_type = %s, | 
| @@ -2098,7 +2098,7 @@ discard block | ||
| 2098 | 2098 | |
| 2099 | 2099 | $wpdb->prepare( | 
| 2100 | 2100 | |
| 2101 | - "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set | |
| 2101 | + "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set | |
| 2102 | 2102 | post_type = %s, | 
| 2103 | 2103 | data_type = %s, | 
| 2104 | 2104 | field_type = %s, | 
| @@ -2124,7 +2124,7 @@ discard block | ||
| 2124 | 2124 | } | 
| 2125 | 2125 | |
| 2126 | 2126 | |
| 2127 | - return (int)$lastid; | |
| 2127 | + return (int) $lastid; | |
| 2128 | 2128 | |
| 2129 | 2129 | } | 
| 2130 | 2130 | } | 
| @@ -2147,7 +2147,7 @@ discard block | ||
| 2147 | 2147 |          if ($field_id != '') {
 | 
| 2148 | 2148 | $cf = trim($field_id, '_'); | 
| 2149 | 2149 | |
| 2150 | -            $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));
 | |
| 2150 | +            $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where id= %d ", array($cf)));
 | |
| 2151 | 2151 | |
| 2152 | 2152 | return $field_id; | 
| 2153 | 2153 | |
| @@ -2170,12 +2170,12 @@ discard block | ||
| 2170 | 2170 | * @param string $field_ins_upd When set to "submit" displays form. | 
| 2171 | 2171 | * @param bool $default when set to true field will be for admin use only. | 
| 2172 | 2172 | */ | 
| 2173 | - function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='') | |
| 2173 | + function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key = '') | |
| 2174 | 2174 |      {
 | 
| 2175 | 2175 | global $wpdb; | 
| 2176 | 2176 | $cf = $result_str; | 
| 2177 | 2177 |          if (!is_object($cf)) {
 | 
| 2178 | -            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));
 | |
| 2178 | +            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE id = %d", array($cf)));
 | |
| 2179 | 2179 |          } else {
 | 
| 2180 | 2180 | $field_info = $cf; | 
| 2181 | 2181 | $result_str = $cf->id; | 
| @@ -2211,18 +2211,18 @@ discard block | ||
| 2211 | 2211 | if ($htmlvar_name == '') | 
| 2212 | 2212 | $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : ''; | 
| 2213 | 2213 | |
| 2214 | -        $nonce = wp_create_nonce('custom_fields_' . $result_str);
 | |
| 2214 | +        $nonce = wp_create_nonce('custom_fields_'.$result_str);
 | |
| 2215 | 2215 | |
| 2216 | 2216 | $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>'; | 
| 2217 | 2217 | $cso_arr = geodir_get_custom_sort_options($post_type); | 
| 2218 | 2218 | |
| 2219 | 2219 | $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']); | 
| 2220 | -        foreach($cso_arr as $cso){
 | |
| 2221 | -            if($cur_field_type==$cso['field_type']){
 | |
| 2220 | +        foreach ($cso_arr as $cso) {
 | |
| 2221 | +            if ($cur_field_type == $cso['field_type']) {
 | |
| 2222 | 2222 | |
| 2223 | 2223 |                  if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
 | 
| 2224 | 2224 | $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>'; | 
| 2225 | -                }elseif(isset($cso['field_icon']) && $cso['field_icon']){
 | |
| 2225 | +                }elseif (isset($cso['field_icon']) && $cso['field_icon']) {
 | |
| 2226 | 2226 |                      $field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';
 | 
| 2227 | 2227 | } | 
| 2228 | 2228 | |
| @@ -2232,40 +2232,40 @@ discard block | ||
| 2232 | 2232 | $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500); | 
| 2233 | 2233 | ?> | 
| 2234 | 2234 | |
| 2235 | - <li class="text" id="licontainer_<?php echo $result_str;?>"> | |
| 2235 | + <li class="text" id="licontainer_<?php echo $result_str; ?>"> | |
| 2236 | 2236 | <form><!-- we need to wrap in a form so we can use radio buttons with same name --> | 
| 2237 | - <div class="title title<?php echo $result_str;?> gt-fieldset" | |
| 2238 | -                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory');?>"
 | |
| 2239 | -                 ondblclick="show_hide('field_frm<?php echo $result_str;?>')">
 | |
| 2237 | + <div class="title title<?php echo $result_str; ?> gt-fieldset" | |
| 2238 | +                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory'); ?>"
 | |
| 2239 | +                 ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">
 | |
| 2240 | 2240 | <?php | 
| 2241 | 2241 | |
| 2242 | 2242 | ?> | 
| 2243 | 2243 | |
| 2244 | -                <div title="<?php _e('Click to remove field', 'geodirectory');?>"
 | |
| 2245 | -                     onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"
 | |
| 2244 | +                <div title="<?php _e('Click to remove field', 'geodirectory'); ?>"
 | |
| 2245 | +                     onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"
 | |
| 2246 | 2246 | class="handlediv close"><i class="fa fa-times" aria-hidden="true"></i></div> | 
| 2247 | 2247 | |
| 2248 | 2248 | |
| 2249 | - <?php echo $field_icon;?> | |
| 2249 | + <?php echo $field_icon; ?> | |
| 2250 | 2250 | <b style="cursor:pointer;" | 
| 2251 | -                   onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory') . ' (' . $site_title . ')');?></b>
 | |
| 2251 | +                   onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory').' ('.$site_title.')'); ?></b>
 | |
| 2252 | 2252 | |
| 2253 | 2253 | </div> | 
| 2254 | 2254 | |
| 2255 | - <div id="field_frm<?php echo $result_str;?>" class="field_frm" | |
| 2255 | + <div id="field_frm<?php echo $result_str; ?>" class="field_frm" | |
| 2256 | 2256 |                   style="display:<?php if ($field_ins_upd == 'submit') {
 | 
| 2257 | 2257 | echo 'block;'; | 
| 2258 | 2258 |                   } else {
 | 
| 2259 | 2259 | echo 'none;'; | 
| 2260 | 2260 | } ?>"> | 
| 2261 | 2261 | <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/> | 
| 2262 | - <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/> | |
| 2263 | - <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/> | |
| 2264 | - <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str;?>"/> | |
| 2262 | + <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type; ?>"/> | |
| 2263 | + <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type; ?>"/> | |
| 2264 | + <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str; ?>"/> | |
| 2265 | 2265 |                  <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {
 | 
| 2266 | 2266 | echo $field_info->data_type; | 
| 2267 | 2267 | }?>"/> | 
| 2268 | - <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name;?>"/> | |
| 2268 | + <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name; ?>"/> | |
| 2269 | 2269 | |
| 2270 | 2270 | |
| 2271 | 2271 | <ul class="widefat post fixed" border="0" style="width:100%;"> | 
| @@ -2275,7 +2275,7 @@ discard block | ||
| 2275 | 2275 | <input type="hidden" name="site_title" id="site_title" value="<?php echo esc_attr($site_title); ?>"/> | 
| 2276 | 2276 | |
| 2277 | 2277 | <li> | 
| 2278 | - <?php $value = (isset($field_info->sort_asc) && $field_info->sort_asc) ? $field_info->sort_asc : 0;?> | |
| 2278 | + <?php $value = (isset($field_info->sort_asc) && $field_info->sort_asc) ? $field_info->sort_asc : 0; ?> | |
| 2279 | 2279 | |
| 2280 | 2280 | <label for="asc" class="gd-cf-tooltip-wrap"> | 
| 2281 | 2281 |                                  <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show Ascending Sort (low to high)', 'geodirectory'); ?>
 | 
| @@ -2285,24 +2285,24 @@ discard block | ||
| 2285 | 2285 | </label> | 
| 2286 | 2286 | <div class="gd-cf-input-wrap gd-switch"> | 
| 2287 | 2287 | |
| 2288 | - <input type="radio" id="asc_yes<?php echo $radio_id;?>" name="asc" class="gdri-enabled" value="1" | |
| 2288 | + <input type="radio" id="asc_yes<?php echo $radio_id; ?>" name="asc" class="gdri-enabled" value="1" | |
| 2289 | 2289 |                                      <?php if ($value == '1') {
 | 
| 2290 | 2290 | echo 'checked'; | 
| 2291 | 2291 | } ?>/> | 
| 2292 | -                                <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | |
| 2292 | +                                <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | |
| 2293 | 2293 | |
| 2294 | - <input type="radio" id="asc_no<?php echo $radio_id;?>" name="asc" class="gdri-disabled" value="0" | |
| 2294 | + <input type="radio" id="asc_no<?php echo $radio_id; ?>" name="asc" class="gdri-disabled" value="0" | |
| 2295 | 2295 |                                      <?php if ($value == '0' || !$value) {
 | 
| 2296 | 2296 | echo 'checked'; | 
| 2297 | 2297 | } ?>/> | 
| 2298 | -                                <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | |
| 2298 | +                                <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | |
| 2299 | 2299 | |
| 2300 | 2300 | </div> | 
| 2301 | 2301 | |
| 2302 | 2302 | </li> | 
| 2303 | 2303 | |
| 2304 | -                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'";}?>>
 | |
| 2305 | - <?php $value = (isset($field_info->asc_title) && $field_info->asc_title) ? esc_attr($field_info->asc_title) : '';?> | |
| 2304 | +                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'"; }?>>
 | |
| 2305 | + <?php $value = (isset($field_info->asc_title) && $field_info->asc_title) ? esc_attr($field_info->asc_title) : ''; ?> | |
| 2306 | 2306 | |
| 2307 | 2307 | <label for="asc_title" class="gd-cf-tooltip-wrap"> | 
| 2308 | 2308 |                                  <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Ascending title', 'geodirectory'); ?>
 | 
| @@ -2312,14 +2312,14 @@ discard block | ||
| 2312 | 2312 | </label> | 
| 2313 | 2313 | <div class="gd-cf-input-wrap"> | 
| 2314 | 2314 | |
| 2315 | - <input type="text" name="asc_title" id="asc_title" value="<?php echo $value;?>" /> | |
| 2315 | + <input type="text" name="asc_title" id="asc_title" value="<?php echo $value; ?>" /> | |
| 2316 | 2316 | </div> | 
| 2317 | 2317 | |
| 2318 | 2318 | |
| 2319 | 2319 | </li> | 
| 2320 | 2320 | |
| 2321 | 2321 | |
| 2322 | -                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'";}?>>
 | |
| 2322 | +                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'"; }?>>
 | |
| 2323 | 2323 | |
| 2324 | 2324 | <label for="is_default" class="gd-cf-tooltip-wrap"> | 
| 2325 | 2325 |                                  <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>
 | 
| @@ -2330,7 +2330,7 @@ discard block | ||
| 2330 | 2330 | <div class="gd-cf-input-wrap"> | 
| 2331 | 2331 | |
| 2332 | 2332 | <input type="radio" name="is_default" | 
| 2333 | -                                       value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {
 | |
| 2333 | +                                       value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name.'_asc') {
 | |
| 2334 | 2334 | echo 'checked="checked"'; | 
| 2335 | 2335 | } ?>/> | 
| 2336 | 2336 | </div> | 
| @@ -2340,7 +2340,7 @@ discard block | ||
| 2340 | 2340 | |
| 2341 | 2341 | |
| 2342 | 2342 | <li> | 
| 2343 | - <?php $value = (isset($field_info->sort_desc) && $field_info->sort_desc) ? $field_info->sort_desc : 0;?> | |
| 2343 | + <?php $value = (isset($field_info->sort_desc) && $field_info->sort_desc) ? $field_info->sort_desc : 0; ?> | |
| 2344 | 2344 | |
| 2345 | 2345 | <label for="desc" class="gd-cf-tooltip-wrap"> | 
| 2346 | 2346 |                                  <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show Descending Sort (high to low)', 'geodirectory'); ?>
 | 
| @@ -2350,24 +2350,24 @@ discard block | ||
| 2350 | 2350 | </label> | 
| 2351 | 2351 | <div class="gd-cf-input-wrap gd-switch"> | 
| 2352 | 2352 | |
| 2353 | - <input type="radio" id="desc_yes<?php echo $radio_id;?>" name="desc" class="gdri-enabled" value="1" | |
| 2353 | + <input type="radio" id="desc_yes<?php echo $radio_id; ?>" name="desc" class="gdri-enabled" value="1" | |
| 2354 | 2354 |                                      <?php if ($value == '1') {
 | 
| 2355 | 2355 | echo 'checked'; | 
| 2356 | 2356 | } ?>/> | 
| 2357 | -                                <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | |
| 2357 | +                                <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | |
| 2358 | 2358 | |
| 2359 | - <input type="radio" id="desc_no<?php echo $radio_id;?>" name="desc" class="gdri-disabled" value="0" | |
| 2359 | + <input type="radio" id="desc_no<?php echo $radio_id; ?>" name="desc" class="gdri-disabled" value="0" | |
| 2360 | 2360 |                                      <?php if ($value == '0' || !$value) {
 | 
| 2361 | 2361 | echo 'checked'; | 
| 2362 | 2362 | } ?>/> | 
| 2363 | -                                <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | |
| 2363 | +                                <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | |
| 2364 | 2364 | |
| 2365 | 2365 | </div> | 
| 2366 | 2366 | |
| 2367 | 2367 | </li> | 
| 2368 | 2368 | |
| 2369 | -                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'";}?>>
 | |
| 2370 | - <?php $value = (isset($field_info->desc_title) && $field_info->desc_title) ? esc_attr($field_info->desc_title) : '';?> | |
| 2369 | +                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'"; }?>>
 | |
| 2370 | + <?php $value = (isset($field_info->desc_title) && $field_info->desc_title) ? esc_attr($field_info->desc_title) : ''; ?> | |
| 2371 | 2371 | |
| 2372 | 2372 | <label for="desc_title" class="gd-cf-tooltip-wrap"> | 
| 2373 | 2373 |                                  <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Descending title', 'geodirectory'); ?>
 | 
| @@ -2377,13 +2377,13 @@ discard block | ||
| 2377 | 2377 | </label> | 
| 2378 | 2378 | <div class="gd-cf-input-wrap"> | 
| 2379 | 2379 | |
| 2380 | - <input type="text" name="desc_title" id="desc_title" value="<?php echo $value;?>" /> | |
| 2380 | + <input type="text" name="desc_title" id="desc_title" value="<?php echo $value; ?>" /> | |
| 2381 | 2381 | </div> | 
| 2382 | 2382 | |
| 2383 | 2383 | |
| 2384 | 2384 | </li> | 
| 2385 | 2385 | |
| 2386 | -                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'";}?>>
 | |
| 2386 | +                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'"; }?>>
 | |
| 2387 | 2387 | |
| 2388 | 2388 | <label for="is_default" class="gd-cf-tooltip-wrap"> | 
| 2389 | 2389 |                                  <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>
 | 
| @@ -2394,7 +2394,7 @@ discard block | ||
| 2394 | 2394 | <div class="gd-cf-input-wrap"> | 
| 2395 | 2395 | |
| 2396 | 2396 | <input type="radio" name="is_default" | 
| 2397 | -                                       value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {
 | |
| 2397 | +                                       value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name.'_desc') {
 | |
| 2398 | 2398 | echo 'checked="checked"'; | 
| 2399 | 2399 | } ?>/> | 
| 2400 | 2400 | </div> | 
| @@ -2419,14 +2419,14 @@ discard block | ||
| 2419 | 2419 | </label> | 
| 2420 | 2420 | <div class="gd-cf-input-wrap"> | 
| 2421 | 2421 | |
| 2422 | - <input type="text" name="site_title" id="site_title" value="<?php echo $value;?>" /> | |
| 2422 | + <input type="text" name="site_title" id="site_title" value="<?php echo $value; ?>" /> | |
| 2423 | 2423 | </div> | 
| 2424 | 2424 | |
| 2425 | 2425 | |
| 2426 | 2426 | </li> | 
| 2427 | 2427 | |
| 2428 | 2428 | <li> | 
| 2429 | - <?php $value = (isset($field_info->is_default) && $field_info->is_default) ? esc_attr($field_info->is_default) : '';?> | |
| 2429 | + <?php $value = (isset($field_info->is_default) && $field_info->is_default) ? esc_attr($field_info->is_default) : ''; ?> | |
| 2430 | 2430 | |
| 2431 | 2431 | <label for="is_default" class="gd-cf-tooltip-wrap"> | 
| 2432 | 2432 |                                  <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>
 | 
| @@ -2450,7 +2450,7 @@ discard block | ||
| 2450 | 2450 | |
| 2451 | 2451 | |
| 2452 | 2452 | <li> | 
| 2453 | - <?php $value = (isset($field_info->is_active) && $field_info->is_active) ? $field_info->is_active: 0;?> | |
| 2453 | + <?php $value = (isset($field_info->is_active) && $field_info->is_active) ? $field_info->is_active : 0; ?> | |
| 2454 | 2454 | |
| 2455 | 2455 | <label for="is_active" class="gd-cf-tooltip-wrap"> | 
| 2456 | 2456 |                              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is active', 'geodirectory'); ?>
 | 
| @@ -2460,17 +2460,17 @@ discard block | ||
| 2460 | 2460 | </label> | 
| 2461 | 2461 | <div class="gd-cf-input-wrap gd-switch"> | 
| 2462 | 2462 | |
| 2463 | - <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled" value="1" | |
| 2463 | + <input type="radio" id="is_active_yes<?php echo $radio_id; ?>" name="is_active" class="gdri-enabled" value="1" | |
| 2464 | 2464 |                                  <?php if ($value == '1') {
 | 
| 2465 | 2465 | echo 'checked'; | 
| 2466 | 2466 | } ?>/> | 
| 2467 | -                            <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | |
| 2467 | +                            <label for="is_active_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | |
| 2468 | 2468 | |
| 2469 | - <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0" | |
| 2469 | + <input type="radio" id="is_active_no<?php echo $radio_id; ?>" name="is_active" class="gdri-disabled" value="0" | |
| 2470 | 2470 |                                  <?php if ($value == '0' || !$value) {
 | 
| 2471 | 2471 | echo 'checked'; | 
| 2472 | 2472 | } ?>/> | 
| 2473 | -                            <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | |
| 2473 | +                            <label for="is_active_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | |
| 2474 | 2474 | |
| 2475 | 2475 | </div> | 
| 2476 | 2476 | |
| @@ -2491,10 +2491,10 @@ discard block | ||
| 2491 | 2491 | <h3></h3> | 
| 2492 | 2492 | </label> | 
| 2493 | 2493 | <div class="gd-cf-input-wrap"> | 
| 2494 | -                            <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save','geodirectory'));?>"
 | |
| 2494 | +                            <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save', 'geodirectory')); ?>"
 | |
| 2495 | 2495 |                                     onclick="save_sort_field('<?php echo esc_attr($result_str); ?>')"/>
 | 
| 2496 | -                                <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete','geodirectory'));?>"
 | |
| 2497 | -                                                                    onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"
 | |
| 2496 | +                                <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete', 'geodirectory')); ?>"
 | |
| 2497 | +                                                                    onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"
 | |
| 2498 | 2498 | class="button"/></a> | 
| 2499 | 2499 | </div> | 
| 2500 | 2500 | </li> | 
| @@ -2529,7 +2529,7 @@ discard block | ||
| 2529 | 2529 |          if (!$package_id || !$field_name || !$post_type) {
 | 
| 2530 | 2530 | return true; | 
| 2531 | 2531 | } | 
| 2532 | -        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));
 | |
| 2532 | +        $sql = $wpdb->prepare("SELECT id FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int) $package_id));
 | |
| 2533 | 2533 | |
| 2534 | 2534 |          if ($wpdb->get_var($sql)) {
 | 
| 2535 | 2535 | return true; | 
| @@ -2652,13 +2652,13 @@ discard block | ||
| 2652 | 2652 | } | 
| 2653 | 2653 | |
| 2654 | 2654 | |
| 2655 | -function geodir_cfa_data_type_text($output,$result_str,$cf,$field_info){
 | |
| 2655 | +function geodir_cfa_data_type_text($output, $result_str, $cf, $field_info) {
 | |
| 2656 | 2656 | ob_start(); | 
| 2657 | 2657 | |
| 2658 | 2658 | $dt_value = ''; | 
| 2659 | 2659 |      if (isset($field_info->data_type)) {
 | 
| 2660 | 2660 | $dt_value = esc_attr($field_info->data_type); | 
| 2661 | -    }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
 | |
| 2661 | +    }elseif (isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']) {
 | |
| 2662 | 2662 | $dt_value = $cf['defaults']['data_type']; | 
| 2663 | 2663 | } | 
| 2664 | 2664 | ?> | 
| @@ -2669,15 +2669,15 @@ discard block | ||
| 2669 | 2669 | <select name="data_type" id="data_type" | 
| 2670 | 2670 | onchange="javascript:gd_data_type_changed(this, '<?php echo $result_str; ?>');"> | 
| 2671 | 2671 | <option | 
| 2672 | -                    value="XVARCHAR" <?php if ($dt_value  == 'VARCHAR') {
 | |
| 2672 | +                    value="XVARCHAR" <?php if ($dt_value == 'VARCHAR') {
 | |
| 2673 | 2673 | echo 'selected="selected"'; | 
| 2674 | 2674 |                  } ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>
 | 
| 2675 | 2675 | <option | 
| 2676 | -                    value="INT" <?php if ($dt_value   == 'INT') {
 | |
| 2676 | +                    value="INT" <?php if ($dt_value == 'INT') {
 | |
| 2677 | 2677 | echo 'selected="selected"'; | 
| 2678 | 2678 |                  } ?>><?php _e('NUMBER', 'geodirectory'); ?></option>
 | 
| 2679 | 2679 | <option | 
| 2680 | -                    value="FLOAT" <?php if ($dt_value   == 'FLOAT') {
 | |
| 2680 | +                    value="FLOAT" <?php if ($dt_value == 'FLOAT') {
 | |
| 2681 | 2681 | echo 'selected="selected"'; | 
| 2682 | 2682 |                  } ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>
 | 
| 2683 | 2683 | </select> | 
| @@ -2690,13 +2690,13 @@ discard block | ||
| 2690 | 2690 | $value = ''; | 
| 2691 | 2691 |      if (isset($field_info->decimal_point)) {
 | 
| 2692 | 2692 | $value = esc_attr($field_info->decimal_point); | 
| 2693 | -    }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
 | |
| 2693 | +    }elseif (isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']) {
 | |
| 2694 | 2694 | $value = $cf['defaults']['decimal_point']; | 
| 2695 | 2695 | } | 
| 2696 | 2696 | ?> | 
| 2697 | 2697 | |
| 2698 | 2698 | <li class="decimal-point-wrapper" | 
| 2699 | - style="<?php echo ($dt_value == 'FLOAT') ? '' : 'display:none' ?>"> | |
| 2699 | + style="<?php echo ($dt_value == 'FLOAT') ? '' : 'display:none' ?>"> | |
| 2700 | 2700 |          <label for="decimal_point"><?php _e('Select decimal point :', 'geodirectory'); ?></label>
 | 
| 2701 | 2701 | <div class="gd-cf-input-wrap"> | 
| 2702 | 2702 | <select name="decimal_point" id="decimal_point"> | 
| @@ -2714,41 +2714,41 @@ discard block | ||
| 2714 | 2714 | $output = ob_get_clean(); | 
| 2715 | 2715 | return $output; | 
| 2716 | 2716 | } | 
| 2717 | -add_filter('geodir_cfa_data_type_text','geodir_cfa_data_type_text',10,4);
 | |
| 2717 | +add_filter('geodir_cfa_data_type_text', 'geodir_cfa_data_type_text', 10, 4);
 | |
| 2718 | 2718 | |
| 2719 | 2719 | // htmlvar not needed for fieldset and taxonomy | 
| 2720 | -add_filter('geodir_cfa_htmlvar_name_fieldset','__return_empty_string',10,4);
 | |
| 2721 | -add_filter('geodir_cfa_htmlvar_name_taxonomy','__return_empty_string',10,4);
 | |
| 2720 | +add_filter('geodir_cfa_htmlvar_name_fieldset', '__return_empty_string', 10, 4);
 | |
| 2721 | +add_filter('geodir_cfa_htmlvar_name_taxonomy', '__return_empty_string', 10, 4);
 | |
| 2722 | 2722 | |
| 2723 | 2723 | |
| 2724 | 2724 | // default_value not needed for textarea, html, file, fieldset, taxonomy, address | 
| 2725 | -add_filter('geodir_cfa_default_value_file','__return_empty_string',10,4);
 | |
| 2726 | -add_filter('geodir_cfa_default_value_taxonomy','__return_empty_string',10,4);
 | |
| 2727 | -add_filter('geodir_cfa_default_value_address','__return_empty_string',10,4);
 | |
| 2728 | -add_filter('geodir_cfa_default_value_fieldset','__return_empty_string',10,4);
 | |
| 2725 | +add_filter('geodir_cfa_default_value_file', '__return_empty_string', 10, 4);
 | |
| 2726 | +add_filter('geodir_cfa_default_value_taxonomy', '__return_empty_string', 10, 4);
 | |
| 2727 | +add_filter('geodir_cfa_default_value_address', '__return_empty_string', 10, 4);
 | |
| 2728 | +add_filter('geodir_cfa_default_value_fieldset', '__return_empty_string', 10, 4);
 | |
| 2729 | 2729 | |
| 2730 | 2730 | // is_required not needed for fieldset | 
| 2731 | -add_filter('geodir_cfa_is_required_fieldset','__return_empty_string',10,4);
 | |
| 2732 | -add_filter('geodir_cfa_required_msg_fieldset','__return_empty_string',10,4);
 | |
| 2731 | +add_filter('geodir_cfa_is_required_fieldset', '__return_empty_string', 10, 4);
 | |
| 2732 | +add_filter('geodir_cfa_required_msg_fieldset', '__return_empty_string', 10, 4);
 | |
| 2733 | 2733 | |
| 2734 | 2734 | // field_icon not needed for fieldset | 
| 2735 | -add_filter('geodir_cfa_field_icon_fieldset','__return_empty_string',10,4);
 | |
| 2736 | -add_filter('geodir_cfa_css_class_fieldset','__return_empty_string',10,4);
 | |
| 2735 | +add_filter('geodir_cfa_field_icon_fieldset', '__return_empty_string', 10, 4);
 | |
| 2736 | +add_filter('geodir_cfa_css_class_fieldset', '__return_empty_string', 10, 4);
 | |
| 2737 | 2737 | |
| 2738 | 2738 | // cat_sort not needed for some fields | 
| 2739 | -add_filter('geodir_cfa_cat_sort_html','__return_empty_string',10,4);
 | |
| 2740 | -add_filter('geodir_cfa_cat_sort_file','__return_empty_string',10,4);
 | |
| 2741 | -add_filter('geodir_cfa_cat_sort_url','__return_empty_string',10,4);
 | |
| 2742 | -add_filter('geodir_cfa_cat_sort_fieldset','__return_empty_string',10,4);
 | |
| 2743 | -add_filter('geodir_cfa_cat_sort_multiselect','__return_empty_string',10,4);
 | |
| 2744 | -add_filter('geodir_cfa_cat_sort_textarea','__return_empty_string',10,4);
 | |
| 2745 | -add_filter('geodir_cfa_cat_sort_taxonomy','__return_empty_string',10,4);
 | |
| 2746 | -add_filter('geodir_cfa_cat_sort_address','__return_empty_string',10,4);
 | |
| 2739 | +add_filter('geodir_cfa_cat_sort_html', '__return_empty_string', 10, 4);
 | |
| 2740 | +add_filter('geodir_cfa_cat_sort_file', '__return_empty_string', 10, 4);
 | |
| 2741 | +add_filter('geodir_cfa_cat_sort_url', '__return_empty_string', 10, 4);
 | |
| 2742 | +add_filter('geodir_cfa_cat_sort_fieldset', '__return_empty_string', 10, 4);
 | |
| 2743 | +add_filter('geodir_cfa_cat_sort_multiselect', '__return_empty_string', 10, 4);
 | |
| 2744 | +add_filter('geodir_cfa_cat_sort_textarea', '__return_empty_string', 10, 4);
 | |
| 2745 | +add_filter('geodir_cfa_cat_sort_taxonomy', '__return_empty_string', 10, 4);
 | |
| 2746 | +add_filter('geodir_cfa_cat_sort_address', '__return_empty_string', 10, 4);
 | |
| 2747 | 2747 | |
| 2748 | 2748 | |
| 2749 | 2749 | |
| 2750 | -function geodir_cfa_advanced_editor_geodir_special_offers($output,$result_str,$cf,$field_info){
 | |
| 2751 | -    if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}
 | |
| 2750 | +function geodir_cfa_advanced_editor_geodir_special_offers($output, $result_str, $cf, $field_info) {
 | |
| 2751 | +    if ($field_info->htmlvar_name != 'geodir_special_offers') {return ''; }
 | |
| 2752 | 2752 | ob_start(); | 
| 2753 | 2753 | ?> | 
| 2754 | 2754 | <li> | 
| @@ -2779,16 +2779,16 @@ discard block | ||
| 2779 | 2779 | $output = ob_get_clean(); | 
| 2780 | 2780 | return $output; | 
| 2781 | 2781 | } | 
| 2782 | -add_filter('geodir_cfa_advanced_editor_textarea','geodir_cfa_advanced_editor_geodir_special_offers',10,4);
 | |
| 2782 | +add_filter('geodir_cfa_advanced_editor_textarea', 'geodir_cfa_advanced_editor_geodir_special_offers', 10, 4);
 | |
| 2783 | 2783 | |
| 2784 | 2784 | |
| 2785 | -function geodir_cfa_validation_pattern_text($output,$result_str,$cf,$field_info){
 | |
| 2785 | +function geodir_cfa_validation_pattern_text($output, $result_str, $cf, $field_info) {
 | |
| 2786 | 2786 | ob_start(); | 
| 2787 | 2787 | |
| 2788 | 2788 | $value = ''; | 
| 2789 | 2789 |      if (isset($field_info->validation_pattern)) {
 | 
| 2790 | 2790 | $value = esc_attr($field_info->validation_pattern); | 
| 2791 | -    }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
 | |
| 2791 | +    }elseif (isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']) {
 | |
| 2792 | 2792 | $value = esc_attr($cf['defaults']['validation_pattern']); | 
| 2793 | 2793 | } | 
| 2794 | 2794 | ?> | 
| @@ -2808,7 +2808,7 @@ discard block | ||
| 2808 | 2808 | $value = ''; | 
| 2809 | 2809 |      if (isset($field_info->validation_msg)) {
 | 
| 2810 | 2810 | $value = esc_attr($field_info->validation_msg); | 
| 2811 | -    }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
 | |
| 2811 | +    }elseif (isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']) {
 | |
| 2812 | 2812 | $value = esc_attr($cf['defaults']['validation_msg']); | 
| 2813 | 2813 | } | 
| 2814 | 2814 | ?> | 
| @@ -2829,10 +2829,10 @@ discard block | ||
| 2829 | 2829 | $output = ob_get_clean(); | 
| 2830 | 2830 | return $output; | 
| 2831 | 2831 | } | 
| 2832 | -add_filter('geodir_cfa_validation_pattern_text','geodir_cfa_validation_pattern_text',10,4);
 | |
| 2832 | +add_filter('geodir_cfa_validation_pattern_text', 'geodir_cfa_validation_pattern_text', 10, 4);
 | |
| 2833 | 2833 | |
| 2834 | 2834 | |
| 2835 | -function geodir_cfa_htmlvar_name_taxonomy($output,$result_str,$cf,$field_info){
 | |
| 2835 | +function geodir_cfa_htmlvar_name_taxonomy($output, $result_str, $cf, $field_info) {
 | |
| 2836 | 2836 | ob_start(); | 
| 2837 | 2837 | global $post_type; | 
| 2838 | 2838 | |
| @@ -2857,7 +2857,7 @@ discard block | ||
| 2857 | 2857 | ?> | 
| 2858 | 2858 |                      <option <?php if (isset($field_info->htmlvar_name) && $field_info->htmlvar_name == $gd_tax) {
 | 
| 2859 | 2859 | echo 'selected="selected"'; | 
| 2860 | - }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php | |
| 2860 | + }?> id="<?php echo $gd_tax; ?>"><?php echo $gd_tax; ?></option><?php | |
| 2861 | 2861 | } | 
| 2862 | 2862 | ?> | 
| 2863 | 2863 | </select> | 
| @@ -2868,7 +2868,7 @@ discard block | ||
| 2868 | 2868 | <label for="cat_display_type" class="gd-cf-tooltip-wrap"> | 
| 2869 | 2869 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Category display type :', 'geodirectory'); ?>
 | 
| 2870 | 2870 | <div class="gdcf-tooltip"> | 
| 2871 | -                <?php _e('Show categories list as select, multiselect, checkbox or radio', 'geodirectory');?>
 | |
| 2871 | +                <?php _e('Show categories list as select, multiselect, checkbox or radio', 'geodirectory'); ?>
 | |
| 2872 | 2872 | </div> | 
| 2873 | 2873 | </label> | 
| 2874 | 2874 | <div class="gd-cf-input-wrap"> | 
| @@ -2876,19 +2876,19 @@ discard block | ||
| 2876 | 2876 | <select name="cat_display_type" id="cat_display_type"> | 
| 2877 | 2877 |                  <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'ajax_chained') {
 | 
| 2878 | 2878 | echo 'selected="selected"'; | 
| 2879 | -                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>
 | |
| 2879 | +                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory'); ?></option>
 | |
| 2880 | 2880 |                  <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
 | 
| 2881 | 2881 | echo 'selected="selected"'; | 
| 2882 | -                }?> value="select"><?php _e('Select', 'geodirectory');?></option>
 | |
| 2882 | +                }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>
 | |
| 2883 | 2883 |                  <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'multiselect') {
 | 
| 2884 | 2884 | echo 'selected="selected"'; | 
| 2885 | -                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>
 | |
| 2885 | +                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory'); ?></option>
 | |
| 2886 | 2886 |                  <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
 | 
| 2887 | 2887 | echo 'selected="selected"'; | 
| 2888 | -                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
 | |
| 2888 | +                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>
 | |
| 2889 | 2889 |                  <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
 | 
| 2890 | 2890 | echo 'selected="selected"'; | 
| 2891 | -                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
 | |
| 2891 | +                }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>
 | |
| 2892 | 2892 | </select> | 
| 2893 | 2893 | </div> | 
| 2894 | 2894 | </li> | 
| @@ -2897,10 +2897,10 @@ discard block | ||
| 2897 | 2897 | $output = ob_get_clean(); | 
| 2898 | 2898 | return $output; | 
| 2899 | 2899 | } | 
| 2900 | -add_filter('geodir_cfa_htmlvar_name_taxonomy','geodir_cfa_htmlvar_name_taxonomy',10,4);
 | |
| 2900 | +add_filter('geodir_cfa_htmlvar_name_taxonomy', 'geodir_cfa_htmlvar_name_taxonomy', 10, 4);
 | |
| 2901 | 2901 | |
| 2902 | 2902 | |
| 2903 | -function geodir_cfa_extra_fields_address($output,$result_str,$cf,$field_info){
 | |
| 2903 | +function geodir_cfa_extra_fields_address($output, $result_str, $cf, $field_info) {
 | |
| 2904 | 2904 | |
| 2905 | 2905 | ob_start(); | 
| 2906 | 2906 |      if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
 | 
| @@ -2923,32 +2923,32 @@ discard block | ||
| 2923 | 2923 | <label for="show_zip" class="gd-cf-tooltip-wrap"> | 
| 2924 | 2924 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display zip/post code :', 'geodirectory'); ?>
 | 
| 2925 | 2925 | <div class="gdcf-tooltip"> | 
| 2926 | -                <?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory');?>
 | |
| 2926 | +                <?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory'); ?>
 | |
| 2927 | 2927 | </div> | 
| 2928 | 2928 | </label> | 
| 2929 | 2929 | <div class="gd-cf-input-wrap gd-switch"> | 
| 2930 | 2930 | |
| 2931 | - <input type="radio" id="show_zip_yes<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-enabled" value="1" | |
| 2931 | + <input type="radio" id="show_zip_yes<?php echo $radio_id; ?>" name="extra[show_zip]" class="gdri-enabled" value="1" | |
| 2932 | 2932 |                  <?php if (isset($address['show_zip']) && $address['show_zip'] == '1') {
 | 
| 2933 | 2933 | echo 'checked'; | 
| 2934 | 2934 | } ?>/> | 
| 2935 | -            <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | |
| 2935 | +            <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | |
| 2936 | 2936 | |
| 2937 | - <input type="radio" id="show_zip_no<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-disabled" value="0" | |
| 2937 | + <input type="radio" id="show_zip_no<?php echo $radio_id; ?>" name="extra[show_zip]" class="gdri-disabled" value="0" | |
| 2938 | 2938 |                  <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {
 | 
| 2939 | 2939 | echo 'checked'; | 
| 2940 | 2940 | } ?>/> | 
| 2941 | -            <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | |
| 2941 | +            <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | |
| 2942 | 2942 | |
| 2943 | 2943 | |
| 2944 | 2944 | </div> | 
| 2945 | 2945 | </li> | 
| 2946 | 2946 | |
| 2947 | -    <li class="cf-zip-lable"  <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {echo "style='display:none;'";}?> >
 | |
| 2947 | +    <li class="cf-zip-lable"  <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {echo "style='display:none;'"; }?> >
 | |
| 2948 | 2948 | <label for="zip_lable" class="gd-cf-tooltip-wrap"> | 
| 2949 | 2949 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Zip/Post code label :', 'geodirectory'); ?>
 | 
| 2950 | 2950 | <div class="gdcf-tooltip"> | 
| 2951 | -                <?php _e('Enter zip/post code field label in address section.', 'geodirectory');?>
 | |
| 2951 | +                <?php _e('Enter zip/post code field label in address section.', 'geodirectory'); ?>
 | |
| 2952 | 2952 | </div> | 
| 2953 | 2953 | </label> | 
| 2954 | 2954 | <div class="gd-cf-input-wrap"> | 
| @@ -2966,7 +2966,7 @@ discard block | ||
| 2966 | 2966 | <label for="map_lable" class="gd-cf-tooltip-wrap"> | 
| 2967 | 2967 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Map button label :', 'geodirectory'); ?>
 | 
| 2968 | 2968 | <div class="gdcf-tooltip"> | 
| 2969 | -                <?php _e('Enter text for `set address on map` button in address section.', 'geodirectory');?>
 | |
| 2969 | +                <?php _e('Enter text for `set address on map` button in address section.', 'geodirectory'); ?>
 | |
| 2970 | 2970 | </div> | 
| 2971 | 2971 | </label> | 
| 2972 | 2972 | <div class="gd-cf-input-wrap"> | 
| @@ -2981,22 +2981,22 @@ discard block | ||
| 2981 | 2981 | <label for="show_mapzoom" class="gd-cf-tooltip-wrap"> | 
| 2982 | 2982 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Use user zoom level:', 'geodirectory'); ?>
 | 
| 2983 | 2983 | <div class="gdcf-tooltip"> | 
| 2984 | -                <?php _e('Do you want to use the user defined map zoom level from the add listing page?', 'geodirectory');?>
 | |
| 2984 | +                <?php _e('Do you want to use the user defined map zoom level from the add listing page?', 'geodirectory'); ?>
 | |
| 2985 | 2985 | </div> | 
| 2986 | 2986 | </label> | 
| 2987 | 2987 | <div class="gd-cf-input-wrap gd-switch"> | 
| 2988 | 2988 | |
| 2989 | - <input type="radio" id="show_mapzoom_yes<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-enabled" value="1" | |
| 2989 | + <input type="radio" id="show_mapzoom_yes<?php echo $radio_id; ?>" name="extra[show_mapzoom]" class="gdri-enabled" value="1" | |
| 2990 | 2990 |                  <?php if (isset($address['show_mapzoom']) && $address['show_mapzoom'] == '1') {
 | 
| 2991 | 2991 | echo 'checked'; | 
| 2992 | 2992 | } ?>/> | 
| 2993 | -            <label for="show_mapzoom_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | |
| 2993 | +            <label for="show_mapzoom_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | |
| 2994 | 2994 | |
| 2995 | - <input type="radio" id="show_mapzoom_no<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0" | |
| 2995 | + <input type="radio" id="show_mapzoom_no<?php echo $radio_id; ?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0" | |
| 2996 | 2996 |                  <?php if ((isset($address['show_mapzoom']) && !$address['show_mapzoom']) || !isset($address['show_mapzoom'])) {
 | 
| 2997 | 2997 | echo 'checked'; | 
| 2998 | 2998 | } ?>/> | 
| 2999 | -            <label for="show_mapzoom_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | |
| 2999 | +            <label for="show_mapzoom_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | |
| 3000 | 3000 | |
| 3001 | 3001 | </div> | 
| 3002 | 3002 | </li> | 
| @@ -3005,22 +3005,22 @@ discard block | ||
| 3005 | 3005 | <label for="show_mapview" class="gd-cf-tooltip-wrap"> | 
| 3006 | 3006 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display map view:', 'geodirectory'); ?>
 | 
| 3007 | 3007 | <div class="gdcf-tooltip"> | 
| 3008 | -                <?php _e('Select if you want to `set default map` options in address section. ( Satellite Map, Hybrid Map, Terrain Map)', 'geodirectory');?>
 | |
| 3008 | +                <?php _e('Select if you want to `set default map` options in address section. ( Satellite Map, Hybrid Map, Terrain Map)', 'geodirectory'); ?>
 | |
| 3009 | 3009 | </div> | 
| 3010 | 3010 | </label> | 
| 3011 | 3011 | <div class="gd-cf-input-wrap gd-switch"> | 
| 3012 | 3012 | |
| 3013 | - <input type="radio" id="show_mapview_yes<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-enabled" value="1" | |
| 3013 | + <input type="radio" id="show_mapview_yes<?php echo $radio_id; ?>" name="extra[show_mapview]" class="gdri-enabled" value="1" | |
| 3014 | 3014 |                  <?php if (isset($address['show_mapview']) && $address['show_mapview'] == '1') {
 | 
| 3015 | 3015 | echo 'checked'; | 
| 3016 | 3016 | } ?>/> | 
| 3017 | -            <label for="show_mapview_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | |
| 3017 | +            <label for="show_mapview_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | |
| 3018 | 3018 | |
| 3019 | - <input type="radio" id="show_mapview_no<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-disabled" value="0" | |
| 3019 | + <input type="radio" id="show_mapview_no<?php echo $radio_id; ?>" name="extra[show_mapview]" class="gdri-disabled" value="0" | |
| 3020 | 3020 |                  <?php if ((isset($address['show_mapview']) && !$address['show_mapview']) || !isset($address['show_mapview'])) {
 | 
| 3021 | 3021 | echo 'checked'; | 
| 3022 | 3022 | } ?>/> | 
| 3023 | -            <label for="show_mapview_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | |
| 3023 | +            <label for="show_mapview_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | |
| 3024 | 3024 | |
| 3025 | 3025 | </div> | 
| 3026 | 3026 | </li> | 
| @@ -3030,7 +3030,7 @@ discard block | ||
| 3030 | 3030 | <label for="mapview_lable" class="gd-cf-tooltip-wrap"> | 
| 3031 | 3031 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Map view label:', 'geodirectory'); ?>
 | 
| 3032 | 3032 | <div class="gdcf-tooltip"> | 
| 3033 | -                <?php _e('Enter mapview field label in address section.', 'geodirectory');?>
 | |
| 3033 | +                <?php _e('Enter mapview field label in address section.', 'geodirectory'); ?>
 | |
| 3034 | 3034 | </div> | 
| 3035 | 3035 | </label> | 
| 3036 | 3036 | <div class="gd-cf-input-wrap"> | 
| @@ -3044,22 +3044,22 @@ discard block | ||
| 3044 | 3044 | <label for="show_latlng" class="gd-cf-tooltip-wrap"> | 
| 3045 | 3045 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show latitude and longitude', 'geodirectory'); ?>
 | 
| 3046 | 3046 | <div class="gdcf-tooltip"> | 
| 3047 | -                <?php _e('This will show/hide the longitude fields in the address section add listing form.', 'geodirectory');?>
 | |
| 3047 | +                <?php _e('This will show/hide the longitude fields in the address section add listing form.', 'geodirectory'); ?>
 | |
| 3048 | 3048 | </div> | 
| 3049 | 3049 | </label> | 
| 3050 | 3050 | <div class="gd-cf-input-wrap gd-switch"> | 
| 3051 | 3051 | |
| 3052 | - <input type="radio" id="show_latlng_yes<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-enabled" value="1" | |
| 3052 | + <input type="radio" id="show_latlng_yes<?php echo $radio_id; ?>" name="extra[show_latlng]" class="gdri-enabled" value="1" | |
| 3053 | 3053 |                  <?php if (isset($address['show_latlng']) && $address['show_latlng'] == '1') {
 | 
| 3054 | 3054 | echo 'checked'; | 
| 3055 | 3055 | } ?>/> | 
| 3056 | -            <label for="show_latlng_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | |
| 3056 | +            <label for="show_latlng_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | |
| 3057 | 3057 | |
| 3058 | - <input type="radio" id="show_latlng_no<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-disabled" value="0" | |
| 3058 | + <input type="radio" id="show_latlng_no<?php echo $radio_id; ?>" name="extra[show_latlng]" class="gdri-disabled" value="0" | |
| 3059 | 3059 |                  <?php if ((isset($address['show_latlng']) && !$address['show_latlng']) || !isset($address['show_latlng'])) {
 | 
| 3060 | 3060 | echo 'checked'; | 
| 3061 | 3061 | } ?>/> | 
| 3062 | -            <label for="show_latlng_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | |
| 3062 | +            <label for="show_latlng_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | |
| 3063 | 3063 | |
| 3064 | 3064 | </div> | 
| 3065 | 3065 | </li> | 
| @@ -3068,17 +3068,17 @@ discard block | ||
| 3068 | 3068 | $html = ob_get_clean(); | 
| 3069 | 3069 | return $output.$html; | 
| 3070 | 3070 | } | 
| 3071 | -add_filter('geodir_cfa_extra_fields_address','geodir_cfa_extra_fields_address',10,4);
 | |
| 3071 | +add_filter('geodir_cfa_extra_fields_address', 'geodir_cfa_extra_fields_address', 10, 4);
 | |
| 3072 | 3072 | |
| 3073 | 3073 | |
| 3074 | -function geodir_cfa_extra_fields_multiselect($output,$result_str,$cf,$field_info){
 | |
| 3074 | +function geodir_cfa_extra_fields_multiselect($output, $result_str, $cf, $field_info) {
 | |
| 3075 | 3075 | ob_start(); | 
| 3076 | 3076 | ?> | 
| 3077 | 3077 | <li> | 
| 3078 | 3078 | <label for="multi_display_type" class="gd-cf-tooltip-wrap"> | 
| 3079 | 3079 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Multiselect display type :', 'geodirectory'); ?>
 | 
| 3080 | 3080 | <div class="gdcf-tooltip"> | 
| 3081 | -                <?php _e('Show multiselect list as multiselect,checkbox or radio.', 'geodirectory');?>
 | |
| 3081 | +                <?php _e('Show multiselect list as multiselect,checkbox or radio.', 'geodirectory'); ?>
 | |
| 3082 | 3082 | </div> | 
| 3083 | 3083 | </label> | 
| 3084 | 3084 | <div class="gd-cf-input-wrap"> | 
| @@ -3086,13 +3086,13 @@ discard block | ||
| 3086 | 3086 | <select name="multi_display_type" id="multi_display_type"> | 
| 3087 | 3087 |                  <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
 | 
| 3088 | 3088 | echo 'selected="selected"'; | 
| 3089 | -                }?> value="select"><?php _e('Select', 'geodirectory');?></option>
 | |
| 3089 | +                }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>
 | |
| 3090 | 3090 |                  <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
 | 
| 3091 | 3091 | echo 'selected="selected"'; | 
| 3092 | -                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
 | |
| 3092 | +                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>
 | |
| 3093 | 3093 |                  <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
 | 
| 3094 | 3094 | echo 'selected="selected"'; | 
| 3095 | -                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
 | |
| 3095 | +                }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>
 | |
| 3096 | 3096 | </select> | 
| 3097 | 3097 | |
| 3098 | 3098 | <br/> | 
| @@ -3103,17 +3103,17 @@ discard block | ||
| 3103 | 3103 | $html = ob_get_clean(); | 
| 3104 | 3104 | return $output.$html; | 
| 3105 | 3105 | } | 
| 3106 | -add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_multiselect',10,4);
 | |
| 3106 | +add_filter('geodir_cfa_extra_fields_multiselect', 'geodir_cfa_extra_fields_multiselect', 10, 4);
 | |
| 3107 | 3107 | |
| 3108 | 3108 | |
| 3109 | -function geodir_cfa_extra_fields_smr($output,$result_str,$cf,$field_info){
 | |
| 3109 | +function geodir_cfa_extra_fields_smr($output, $result_str, $cf, $field_info) {
 | |
| 3110 | 3110 | |
| 3111 | 3111 | ob_start(); | 
| 3112 | 3112 | |
| 3113 | 3113 | $value = ''; | 
| 3114 | 3114 |      if (isset($field_info->option_values)) {
 | 
| 3115 | 3115 | $value = esc_attr($field_info->option_values); | 
| 3116 | -    }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
 | |
| 3116 | +    }elseif (isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']) {
 | |
| 3117 | 3117 | $value = esc_attr($cf['defaults']['option_values']); | 
| 3118 | 3118 | } | 
| 3119 | 3119 | |
| @@ -3123,11 +3123,11 @@ discard block | ||
| 3123 | 3123 | <label for="option_values" class="gd-cf-tooltip-wrap"> | 
| 3124 | 3124 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Option Values :', 'geodirectory'); ?>
 | 
| 3125 | 3125 | <div class="gdcf-tooltip"> | 
| 3126 | -                <span><?php _e('Option Values should be separated by comma.', 'geodirectory');?></span>
 | |
| 3126 | +                <span><?php _e('Option Values should be separated by comma.', 'geodirectory'); ?></span>
 | |
| 3127 | 3127 | <br/> | 
| 3128 | -                <small><span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory');?></span>
 | |
| 3128 | +                <small><span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory'); ?></span>
 | |
| 3129 | 3129 | <br/> | 
| 3130 | -                    <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory');?></span>
 | |
| 3130 | +                    <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory'); ?></span>
 | |
| 3131 | 3131 |                      <?php if ($field_type == 'multiselect' || $field_type == 'select') { ?>
 | 
| 3132 | 3132 | <br/> | 
| 3133 | 3133 |                          <span><?php _e('- If using OPTGROUP tag to grouping options, use "{optgroup}OPTGROUP-LABEL|OPTION-1,OPTION-2{/optgroup}"', 'geodirectory'); ?></span>
 | 
| @@ -3138,7 +3138,7 @@ discard block | ||
| 3138 | 3138 | </label> | 
| 3139 | 3139 | <div class="gd-cf-input-wrap"> | 
| 3140 | 3140 | <input type="text" name="option_values" id="option_values" | 
| 3141 | - value="<?php echo $value;?>"/> | |
| 3141 | + value="<?php echo $value; ?>"/> | |
| 3142 | 3142 | <br/> | 
| 3143 | 3143 | |
| 3144 | 3144 | </div> | 
| @@ -3148,12 +3148,12 @@ discard block | ||
| 3148 | 3148 | $html = ob_get_clean(); | 
| 3149 | 3149 | return $output.$html; | 
| 3150 | 3150 | } | 
| 3151 | -add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_smr',10,4);
 | |
| 3152 | -add_filter('geodir_cfa_extra_fields_select','geodir_cfa_extra_fields_smr',10,4);
 | |
| 3153 | -add_filter('geodir_cfa_extra_fields_radio','geodir_cfa_extra_fields_smr',10,4);
 | |
| 3151 | +add_filter('geodir_cfa_extra_fields_multiselect', 'geodir_cfa_extra_fields_smr', 10, 4);
 | |
| 3152 | +add_filter('geodir_cfa_extra_fields_select', 'geodir_cfa_extra_fields_smr', 10, 4);
 | |
| 3153 | +add_filter('geodir_cfa_extra_fields_radio', 'geodir_cfa_extra_fields_smr', 10, 4);
 | |
| 3154 | 3154 | |
| 3155 | 3155 | |
| 3156 | -function geodir_cfa_extra_fields_datepicker($output,$result_str,$cf,$field_info){
 | |
| 3156 | +function geodir_cfa_extra_fields_datepicker($output, $result_str, $cf, $field_info) {
 | |
| 3157 | 3157 | ob_start(); | 
| 3158 | 3158 | $extra = array(); | 
| 3159 | 3159 |      if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
 | 
| @@ -3164,7 +3164,7 @@ discard block | ||
| 3164 | 3164 | <label for="date_format" class="gd-cf-tooltip-wrap"> | 
| 3165 | 3165 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Date Format :', 'geodirectory'); ?>
 | 
| 3166 | 3166 | <div class="gdcf-tooltip"> | 
| 3167 | -                <?php _e('Select the date format.', 'geodirectory');?>
 | |
| 3167 | +                <?php _e('Select the date format.', 'geodirectory'); ?>
 | |
| 3168 | 3168 | </div> | 
| 3169 | 3169 | </label> | 
| 3170 | 3170 | <div class="gd-cf-input-wrap" style="overflow:inherit;"> | 
| @@ -3184,16 +3184,16 @@ discard block | ||
| 3184 | 3184 | * @since 1.6.5 | 
| 3185 | 3185 | * @param array $date_formats The PHP date format array. | 
| 3186 | 3186 | */ | 
| 3187 | -            $date_formats = apply_filters('geodir_date_formats',$date_formats);
 | |
| 3187 | +            $date_formats = apply_filters('geodir_date_formats', $date_formats);
 | |
| 3188 | 3188 | ?> | 
| 3189 | 3189 | <select name="extra[date_format]" id="date_format"> | 
| 3190 | 3190 | <?php | 
| 3191 | -                foreach($date_formats as $format){
 | |
| 3191 | +                foreach ($date_formats as $format) {
 | |
| 3192 | 3192 | $selected = ''; | 
| 3193 | -                    if(!empty($extra) && esc_attr($extra['date_format'])==$format){
 | |
| 3193 | +                    if (!empty($extra) && esc_attr($extra['date_format']) == $format) {
 | |
| 3194 | 3194 | $selected = "selected='selected'"; | 
| 3195 | 3195 | } | 
| 3196 | -                    echo "<option $selected value='$format'>$format       (".date_i18n( $format, time()).")</option>";
 | |
| 3196 | +                    echo "<option $selected value='$format'>$format       (".date_i18n($format, time()).")</option>";
 | |
| 3197 | 3197 | } | 
| 3198 | 3198 | ?> | 
| 3199 | 3199 | </select> | 
| @@ -3205,10 +3205,10 @@ discard block | ||
| 3205 | 3205 | $html = ob_get_clean(); | 
| 3206 | 3206 | return $output.$html; | 
| 3207 | 3207 | } | 
| 3208 | -add_filter('geodir_cfa_extra_fields_datepicker','geodir_cfa_extra_fields_datepicker',10,4);
 | |
| 3208 | +add_filter('geodir_cfa_extra_fields_datepicker', 'geodir_cfa_extra_fields_datepicker', 10, 4);
 | |
| 3209 | 3209 | |
| 3210 | 3210 | |
| 3211 | -function geodir_cfa_extra_fields_file($output,$result_str,$cf,$field_info){
 | |
| 3211 | +function geodir_cfa_extra_fields_file($output, $result_str, $cf, $field_info) {
 | |
| 3212 | 3212 | ob_start(); | 
| 3213 | 3213 | $allowed_file_types = geodir_allowed_mime_types(); | 
| 3214 | 3214 | |
| @@ -3219,16 +3219,16 @@ discard block | ||
| 3219 | 3219 | <label for="gd_file_types" class="gd-cf-tooltip-wrap"> | 
| 3220 | 3220 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Allowed file types :', 'geodirectory'); ?>
 | 
| 3221 | 3221 | <div class="gdcf-tooltip"> | 
| 3222 | -                <?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', 'geodirectory');?>
 | |
| 3222 | +                <?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', 'geodirectory'); ?>
 | |
| 3223 | 3223 | </div> | 
| 3224 | 3224 | </label> | 
| 3225 | 3225 | <div class="gd-cf-input-wrap"> | 
| 3226 | 3226 | <select name="extra[gd_file_types][]" id="gd_file_types" multiple="multiple" style="height:100px;width:90%;"> | 
| 3227 | -                <option value="*" <?php selected(true, in_array('*', $gd_file_types));?>><?php _e('All types', 'geodirectory') ;?></option>
 | |
| 3228 | -                <?php foreach ( $allowed_file_types as $format => $types ) { ?>
 | |
| 3229 | -                    <optgroup label="<?php echo esc_attr( wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory') ) ) ;?>">
 | |
| 3230 | -                        <?php foreach ( $types as $ext => $type ) { ?>
 | |
| 3231 | - <option value="<?php echo esc_attr($ext) ;?>" <?php selected(true, in_array($ext, $gd_file_types));?>><?php echo '.' . $ext ;?></option> | |
| 3227 | +                <option value="*" <?php selected(true, in_array('*', $gd_file_types)); ?>><?php _e('All types', 'geodirectory'); ?></option>
 | |
| 3228 | +                <?php foreach ($allowed_file_types as $format => $types) { ?>
 | |
| 3229 | +                    <optgroup label="<?php echo esc_attr(wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory'))); ?>">
 | |
| 3230 | +                        <?php foreach ($types as $ext => $type) { ?>
 | |
| 3231 | + <option value="<?php echo esc_attr($ext); ?>" <?php selected(true, in_array($ext, $gd_file_types)); ?>><?php echo '.'.$ext; ?></option> | |
| 3232 | 3232 | <?php } ?> | 
| 3233 | 3233 | </optgroup> | 
| 3234 | 3234 | <?php } ?> | 
| @@ -3240,9 +3240,9 @@ discard block | ||
| 3240 | 3240 | $html = ob_get_clean(); | 
| 3241 | 3241 | return $output.$html; | 
| 3242 | 3242 | } | 
| 3243 | -add_filter('geodir_cfa_extra_fields_file','geodir_cfa_extra_fields_file',10,4);
 | |
| 3243 | +add_filter('geodir_cfa_extra_fields_file', 'geodir_cfa_extra_fields_file', 10, 4);
 | |
| 3244 | 3244 | |
| 3245 | -function geodir_cfa_extra_fields_text($output,$result_str,$cf,$field_info){
 | |
| 3245 | +function geodir_cfa_extra_fields_text($output, $result_str, $cf, $field_info) {
 | |
| 3246 | 3246 | ob_start(); | 
| 3247 | 3247 | |
| 3248 | 3248 | $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : ''; | 
| @@ -3256,15 +3256,15 @@ discard block | ||
| 3256 | 3256 | $value = ''; | 
| 3257 | 3257 |      if ($extra_fields && isset($extra_fields['is_price'])) {
 | 
| 3258 | 3258 | $value = esc_attr($extra_fields['is_price']); | 
| 3259 | -    }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){
 | |
| 3259 | +    }elseif (isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']) {
 | |
| 3260 | 3260 | $value = esc_attr($cf['defaults']['extra_fields']['is_price']); | 
| 3261 | 3261 | } | 
| 3262 | 3262 | |
| 3263 | - $show_price_extra = ($value==1) ? 1 : 0; | |
| 3263 | + $show_price_extra = ($value == 1) ? 1 : 0; | |
| 3264 | 3264 | |
| 3265 | - $show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0; | |
| 3265 | + $show_price = (isset($field_info->data_type) && ($field_info->data_type == 'INT' && $field_info->data_type == 'FLOAT')) ? 1 : 0; | |
| 3266 | 3266 | ?> | 
| 3267 | -    <li class="gdcf-price-extra-set" <?php if(!$show_price){ echo "style='display:none;'";}?>>
 | |
| 3267 | +    <li class="gdcf-price-extra-set" <?php if (!$show_price) { echo "style='display:none;'"; }?>>
 | |
| 3268 | 3268 | <label for="is_price" class="gd-cf-tooltip-wrap"> | 
| 3269 | 3269 |              <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display as price? :', 'geodirectory'); ?>
 | 
| 3270 | 3270 | <div class="gdcf-tooltip"> | 
| @@ -3273,17 +3273,17 @@ discard block | ||
| 3273 | 3273 | </label> | 
| 3274 | 3274 | <div class="gd-cf-input-wrap gd-switch"> | 
| 3275 | 3275 | |
| 3276 | - <input type="radio" id="is_price_yes<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-enabled" value="1" | |
| 3276 | + <input type="radio" id="is_price_yes<?php echo $radio_id; ?>" name="extra[is_price]" class="gdri-enabled" value="1" | |
| 3277 | 3277 |                  <?php if ($value == '1') {
 | 
| 3278 | 3278 | echo 'checked'; | 
| 3279 | 3279 | } ?>/> | 
| 3280 | -            <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | |
| 3280 | +            <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
 | |
| 3281 | 3281 | |
| 3282 | - <input type="radio" id="is_price_no<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-disabled" value="0" | |
| 3282 | + <input type="radio" id="is_price_no<?php echo $radio_id; ?>" name="extra[is_price]" class="gdri-disabled" value="0" | |
| 3283 | 3283 |                  <?php if ($value == '0' || !$value) {
 | 
| 3284 | 3284 | echo 'checked'; | 
| 3285 | 3285 | } ?>/> | 
| 3286 | -            <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | |
| 3286 | +            <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
 | |
| 3287 | 3287 | |
| 3288 | 3288 | </div> | 
| 3289 | 3289 | </li> | 
| @@ -3293,23 +3293,23 @@ discard block | ||
| 3293 | 3293 | $value = ''; | 
| 3294 | 3294 |      if ($extra_fields && isset($extra_fields['thousand_separator'])) {
 | 
| 3295 | 3295 | $value = esc_attr($extra_fields['thousand_separator']); | 
| 3296 | -    }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){
 | |
| 3296 | +    }elseif (isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']) {
 | |
| 3297 | 3297 | $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']); | 
| 3298 | 3298 | } | 
| 3299 | 3299 | ?> | 
| 3300 | -    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
 | |
| 3301 | -        <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory');?>
 | |
| 3300 | +    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>
 | |
| 3301 | +        <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory'); ?>
 | |
| 3302 | 3302 | <div class="gdcf-tooltip"> | 
| 3303 | 3303 |                  <?php _e('Select the thousand separator.', 'geodirectory'); ?>
 | 
| 3304 | 3304 | </div> | 
| 3305 | 3305 | </label> | 
| 3306 | 3306 | <div class="gd-cf-input-wrap"> | 
| 3307 | 3307 | <select name="extra[thousand_separator]" id="thousand_separator"> | 
| 3308 | -                    <option value="comma" <?php selected(true, $value == 'comma');?>><?php _e(', (comma)', 'geodirectory'); ?></option>
 | |
| 3309 | -                    <option value="slash" <?php selected(true, $value == "slash");?>><?php _e('\ (slash)', 'geodirectory'); ?></option>
 | |
| 3310 | -                    <option value="period" <?php selected(true, $value == 'period');?>><?php _e('. (period)', 'geodirectory'); ?></option>
 | |
| 3311 | -                    <option value="space" <?php selected(true, $value == 'space');?>><?php _e(' (space)', 'geodirectory'); ?></option>
 | |
| 3312 | -                    <option value="none" <?php selected(true, $value == 'none');?>><?php _e('(none)', 'geodirectory'); ?></option>
 | |
| 3308 | +                    <option value="comma" <?php selected(true, $value == 'comma'); ?>><?php _e(', (comma)', 'geodirectory'); ?></option>
 | |
| 3309 | +                    <option value="slash" <?php selected(true, $value == "slash"); ?>><?php _e('\ (slash)', 'geodirectory'); ?></option>
 | |
| 3310 | +                    <option value="period" <?php selected(true, $value == 'period'); ?>><?php _e('. (period)', 'geodirectory'); ?></option>
 | |
| 3311 | +                    <option value="space" <?php selected(true, $value == 'space'); ?>><?php _e(' (space)', 'geodirectory'); ?></option>
 | |
| 3312 | +                    <option value="none" <?php selected(true, $value == 'none'); ?>><?php _e('(none)', 'geodirectory'); ?></option>
 | |
| 3313 | 3313 | </select> | 
| 3314 | 3314 | </div> | 
| 3315 | 3315 | </li> | 
| @@ -3320,20 +3320,20 @@ discard block | ||
| 3320 | 3320 | $value = ''; | 
| 3321 | 3321 |      if ($extra_fields && isset($extra_fields['decimal_separator'])) {
 | 
| 3322 | 3322 | $value = esc_attr($extra_fields['decimal_separator']); | 
| 3323 | -    }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){
 | |
| 3323 | +    }elseif (isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']) {
 | |
| 3324 | 3324 | $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']); | 
| 3325 | 3325 | } | 
| 3326 | 3326 | ?> | 
| 3327 | -    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
 | |
| 3328 | -        <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory');?>
 | |
| 3327 | +    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>
 | |
| 3328 | +        <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory'); ?>
 | |
| 3329 | 3329 | <div class="gdcf-tooltip"> | 
| 3330 | 3330 |                  <?php _e('Select the decimal separator.', 'geodirectory'); ?>
 | 
| 3331 | 3331 | </div> | 
| 3332 | 3332 | </label> | 
| 3333 | 3333 | <div class="gd-cf-input-wrap"> | 
| 3334 | 3334 | <select name="extra[decimal_separator]" id="decimal_separator"> | 
| 3335 | -                <option value="period" <?php selected(true, $value == 'period');?>><?php _e('. (period)', 'geodirectory'); ?></option>
 | |
| 3336 | -                <option value="comma" <?php selected(true, $value == "comma");?>><?php _e(', (comma)', 'geodirectory'); ?></option>
 | |
| 3335 | +                <option value="period" <?php selected(true, $value == 'period'); ?>><?php _e('. (period)', 'geodirectory'); ?></option>
 | |
| 3336 | +                <option value="comma" <?php selected(true, $value == "comma"); ?>><?php _e(', (comma)', 'geodirectory'); ?></option>
 | |
| 3337 | 3337 | </select> | 
| 3338 | 3338 | </div> | 
| 3339 | 3339 | </li> | 
| @@ -3343,20 +3343,20 @@ discard block | ||
| 3343 | 3343 | $value = ''; | 
| 3344 | 3344 |      if ($extra_fields && isset($extra_fields['decimal_display'])) {
 | 
| 3345 | 3345 | $value = esc_attr($extra_fields['decimal_display']); | 
| 3346 | -    }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){
 | |
| 3346 | +    }elseif (isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']) {
 | |
| 3347 | 3347 | $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']); | 
| 3348 | 3348 | } | 
| 3349 | 3349 | ?> | 
| 3350 | -    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
 | |
| 3351 | -        <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory');?>
 | |
| 3350 | +    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>
 | |
| 3351 | +        <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory'); ?>
 | |
| 3352 | 3352 | <div class="gdcf-tooltip"> | 
| 3353 | 3353 |                  <?php _e('Select how the decimal is displayed', 'geodirectory'); ?>
 | 
| 3354 | 3354 | </div> | 
| 3355 | 3355 | </label> | 
| 3356 | 3356 | <div class="gd-cf-input-wrap"> | 
| 3357 | 3357 | <select name="extra[decimal_display]" id="decimal_display"> | 
| 3358 | -                <option value="if" <?php selected(true, $value == 'if');?>><?php _e('If used (not .00)', 'geodirectory'); ?></option>
 | |
| 3359 | -                <option value="allways" <?php selected(true, $value == "allways");?>><?php _e('Always (.00)', 'geodirectory'); ?></option>
 | |
| 3358 | +                <option value="if" <?php selected(true, $value == 'if'); ?>><?php _e('If used (not .00)', 'geodirectory'); ?></option>
 | |
| 3359 | +                <option value="allways" <?php selected(true, $value == "allways"); ?>><?php _e('Always (.00)', 'geodirectory'); ?></option>
 | |
| 3360 | 3360 | </select> | 
| 3361 | 3361 | </div> | 
| 3362 | 3362 | </li> | 
| @@ -3366,12 +3366,12 @@ discard block | ||
| 3366 | 3366 | $value = ''; | 
| 3367 | 3367 |      if ($extra_fields && isset($extra_fields['currency_symbol'])) {
 | 
| 3368 | 3368 | $value = esc_attr($extra_fields['currency_symbol']); | 
| 3369 | -    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){
 | |
| 3369 | +    }elseif (isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']) {
 | |
| 3370 | 3370 | $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']); | 
| 3371 | 3371 | } | 
| 3372 | 3372 | ?> | 
| 3373 | -    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
 | |
| 3374 | -        <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory');?>
 | |
| 3373 | +    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>
 | |
| 3374 | +        <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory'); ?>
 | |
| 3375 | 3375 | <div class="gdcf-tooltip"> | 
| 3376 | 3376 |                  <?php _e('Select the currency symbol.', 'geodirectory'); ?>
 | 
| 3377 | 3377 | </div> | 
| @@ -3387,20 +3387,20 @@ discard block | ||
| 3387 | 3387 | $value = ''; | 
| 3388 | 3388 |      if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {
 | 
| 3389 | 3389 | $value = esc_attr($extra_fields['currency_symbol_placement']); | 
| 3390 | -    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){
 | |
| 3390 | +    }elseif (isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']) {
 | |
| 3391 | 3391 | $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']); | 
| 3392 | 3392 | } | 
| 3393 | 3393 | ?> | 
| 3394 | -    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
 | |
| 3395 | -        <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory');?>
 | |
| 3394 | +    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>
 | |
| 3395 | +        <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory'); ?>
 | |
| 3396 | 3396 | <div class="gdcf-tooltip"> | 
| 3397 | 3397 |                  <?php _e('Select the currency symbol placement.', 'geodirectory'); ?>
 | 
| 3398 | 3398 | </div> | 
| 3399 | 3399 | </label> | 
| 3400 | 3400 | <div class="gd-cf-input-wrap"> | 
| 3401 | 3401 | <select name="extra[currency_symbol_placement]" id="currency_symbol_placement"> | 
| 3402 | -                <option value="left" <?php selected(true, $value == 'left');?>><?php _e('Left', 'geodirectory'); ?></option>
 | |
| 3403 | -                <option value="right" <?php selected(true, $value == "right");?>><?php _e('Right', 'geodirectory'); ?></option>
 | |
| 3402 | +                <option value="left" <?php selected(true, $value == 'left'); ?>><?php _e('Left', 'geodirectory'); ?></option>
 | |
| 3403 | +                <option value="right" <?php selected(true, $value == "right"); ?>><?php _e('Right', 'geodirectory'); ?></option>
 | |
| 3404 | 3404 | </select> | 
| 3405 | 3405 | </div> | 
| 3406 | 3406 | </li> | 
| @@ -3411,11 +3411,11 @@ discard block | ||
| 3411 | 3411 | $html = ob_get_clean(); | 
| 3412 | 3412 | return $output.$html; | 
| 3413 | 3413 | } | 
| 3414 | -add_filter('geodir_cfa_extra_fields_text','geodir_cfa_extra_fields_text',10,4);
 | |
| 3414 | +add_filter('geodir_cfa_extra_fields_text', 'geodir_cfa_extra_fields_text', 10, 4);
 | |
| 3415 | 3415 | |
| 3416 | -function geodir_default_custom_fields($post_type='gd_place',$package_id=''){
 | |
| 3416 | +function geodir_default_custom_fields($post_type = 'gd_place', $package_id = '') {
 | |
| 3417 | 3417 | $fields = array(); | 
| 3418 | - $package = ($package_id=='') ? '' : array($package_id); | |
| 3418 | + $package = ($package_id == '') ? '' : array($package_id); | |
| 3419 | 3419 | |
| 3420 | 3420 |      $fields[] = array('listing_type' => $post_type,
 | 
| 3421 | 3421 | 'data_type' => 'VARCHAR', | 
| @@ -3588,7 +3588,7 @@ discard block | ||
| 3588 | 3588 | return $fields; | 
| 3589 | 3589 | } | 
| 3590 | 3590 | |
| 3591 | -function geodir_currency_format_number($number='',$cf=''){
 | |
| 3591 | +function geodir_currency_format_number($number = '', $cf = '') {
 | |
| 3592 | 3592 | |
| 3593 | 3593 | $cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : ''; | 
| 3594 | 3594 | |
| @@ -3597,35 +3597,35 @@ discard block | ||
| 3597 | 3597 | $decimal_display = !empty($cf['decimal_display']) ? $cf['decimal_display'] : (!empty($cs['decimal_display']) ? $cs['decimal_display'] : 'if'); | 
| 3598 | 3598 | $decimalpoint = '.'; | 
| 3599 | 3599 | |
| 3600 | -    if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){
 | |
| 3600 | +    if (isset($cs['decimal_separator']) && $cs['decimal_separator'] == 'comma') {
 | |
| 3601 | 3601 | $decimalpoint = ','; | 
| 3602 | 3602 | } | 
| 3603 | 3603 | |
| 3604 | 3604 | $separator = ','; | 
| 3605 | 3605 | |
| 3606 | -    if(isset($cs['thousand_separator'])){
 | |
| 3607 | -        if($cs['thousand_separator']=='comma'){$separator = ',';}
 | |
| 3608 | -        if($cs['thousand_separator']=='slash'){$separator = '\\';}
 | |
| 3609 | -        if($cs['thousand_separator']=='period'){$separator = '.';}
 | |
| 3610 | -        if($cs['thousand_separator']=='space'){$separator = ' ';}
 | |
| 3611 | -        if($cs['thousand_separator']=='none'){$separator = '';}
 | |
| 3606 | +    if (isset($cs['thousand_separator'])) {
 | |
| 3607 | +        if ($cs['thousand_separator'] == 'comma') {$separator = ','; }
 | |
| 3608 | +        if ($cs['thousand_separator'] == 'slash') {$separator = '\\'; }
 | |
| 3609 | +        if ($cs['thousand_separator'] == 'period') {$separator = '.'; }
 | |
| 3610 | +        if ($cs['thousand_separator'] == 'space') {$separator = ' '; }
 | |
| 3611 | +        if ($cs['thousand_separator'] == 'none') {$separator = ''; }
 | |
| 3612 | 3612 | } | 
| 3613 | 3613 | |
| 3614 | 3614 | $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left'; | 
| 3615 | 3615 | |
| 3616 | -    if($decimals>0 && $decimal_display=='if'){
 | |
| 3617 | - if(is_int($number) || floor( $number ) == $number) | |
| 3616 | +    if ($decimals > 0 && $decimal_display == 'if') {
 | |
| 3617 | + if (is_int($number) || floor($number) == $number) | |
| 3618 | 3618 | $decimals = 0; | 
| 3619 | 3619 | } | 
| 3620 | 3620 | |
| 3621 | - $number = number_format($number,$decimals,$decimalpoint,$separator); | |
| 3621 | + $number = number_format($number, $decimals, $decimalpoint, $separator); | |
| 3622 | 3622 | |
| 3623 | 3623 | |
| 3624 | 3624 | |
| 3625 | -    if($currency_symbol_placement=='left'){
 | |
| 3626 | - $number = $symbol . $number; | |
| 3627 | -    }else{
 | |
| 3628 | - $number = $number . $symbol; | |
| 3625 | +    if ($currency_symbol_placement == 'left') {
 | |
| 3626 | + $number = $symbol.$number; | |
| 3627 | +    } else {
 | |
| 3628 | + $number = $number.$symbol; | |
| 3629 | 3629 | } | 
| 3630 | 3630 | |
| 3631 | 3631 | |