| @@ -15,8 +15,8 @@ discard block | ||
| 15 | 15 | */ | 
| 16 | 16 | function geodir_init_map_jason() | 
| 17 | 17 |  {
 | 
| 18 | - global $map_jason; | |
| 19 | - $map_jason = array(); | |
| 18 | + global $map_jason; | |
| 19 | + $map_jason = array(); | |
| 20 | 20 | } | 
| 21 | 21 | |
| 22 | 22 | /** | 
| @@ -28,8 +28,8 @@ discard block | ||
| 28 | 28 | */ | 
| 29 | 29 | function geodir_init_map_canvas_array() | 
| 30 | 30 |  {
 | 
| 31 | - global $map_canvas_arr; | |
| 32 | - $map_canvas_arr = array(); | |
| 31 | + global $map_canvas_arr; | |
| 32 | + $map_canvas_arr = array(); | |
| 33 | 33 | } | 
| 34 | 34 | |
| 35 | 35 | |
| @@ -50,56 +50,56 @@ discard block | ||
| 50 | 50 | */ | 
| 51 | 51 | function create_marker_jason_of_posts($post) | 
| 52 | 52 |  {
 | 
| 53 | - global $wpdb, $map_jason, $add_post_in_marker_array, $geodir_cat_icons, $gd_marker_sizes; | |
| 53 | + global $wpdb, $map_jason, $add_post_in_marker_array, $geodir_cat_icons, $gd_marker_sizes; | |
| 54 | 54 | |
| 55 | -    if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {
 | |
| 55 | +	if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {
 | |
| 56 | 56 | |
| 57 | -        if(isset($map_jason[$post->ID])){return null;}
 | |
| 57 | +		if(isset($map_jason[$post->ID])){return null;}
 | |
| 58 | 58 | |
| 59 | -        $srcharr = array("'", "/", "-", '"', '\\');
 | |
| 60 | -        $replarr = array("′", "⁄", "–", "“", '');
 | |
| 59 | +		$srcharr = array("'", "/", "-", '"', '\\');
 | |
| 60 | +		$replarr = array("′", "⁄", "–", "“", '');
 | |
| 61 | 61 | |
| 62 | 62 | |
| 63 | - $geodir_cat_icons = geodir_get_term_icon(); | |
| 64 | - $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$post->default_category]) ? $geodir_cat_icons[$post->default_category] : ''; | |
| 63 | + $geodir_cat_icons = geodir_get_term_icon(); | |
| 64 | + $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$post->default_category]) ? $geodir_cat_icons[$post->default_category] : ''; | |
| 65 | 65 | |
| 66 | - $post_title = $post->post_title; | |
| 67 | - $title = str_replace($srcharr, $replarr, $post_title); | |
| 66 | + $post_title = $post->post_title; | |
| 67 | + $title = str_replace($srcharr, $replarr, $post_title); | |
| 68 | 68 | |
| 69 | -        if (is_ssl()) {
 | |
| 70 | -            $icon = str_replace("http:","https:",$icon );
 | |
| 71 | - } | |
| 69 | +		if (is_ssl()) {
 | |
| 70 | +			$icon = str_replace("http:","https:",$icon );
 | |
| 71 | + } | |
| 72 | 72 | |
| 73 | -        if ($icon != '') {
 | |
| 74 | - $gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes; | |
| 73 | +		if ($icon != '') {
 | |
| 74 | + $gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes; | |
| 75 | 75 | |
| 76 | -            if (isset($gd_marker_sizes[$icon])) {
 | |
| 77 | - $icon_size = $gd_marker_sizes[$icon]; | |
| 78 | -            } else {
 | |
| 79 | - $icon_size = geodir_get_marker_size($icon); | |
| 80 | - $gd_marker_sizes[$icon] = $icon_size; | |
| 81 | - } | |
| 82 | -        } else {
 | |
| 83 | -            $icon_size = array('w' => 36, 'h' => 45);
 | |
| 84 | - } | |
| 85 | - | |
| 86 | -        $post_json = '{"id":"' . $post->ID . '","t": "' . $title . '","lt": "' . $post->post_latitude . '","ln": "' . $post->post_longitude . '","mk_id":"' . $post->ID . '_' . $post->default_category . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"}';
 | |
| 87 | - | |
| 88 | - /** | |
| 89 | - * Filter the json data when creating output for post json marker.. | |
| 90 | - * | |
| 91 | - * @since 1.5.7 | |
| 92 | - * @param string $post_json JSON representation of the post marker info. | |
| 93 | - * @param object $post The post object. | |
| 94 | - */ | |
| 95 | -        $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
 | |
| 96 | - | |
| 97 | - // only assign it if it has a value | |
| 98 | -        if($post_map_json){
 | |
| 99 | - $map_jason[$post->ID] = $post_map_json; | |
| 100 | - } | |
| 101 | - | |
| 102 | - } | |
| 76 | +			if (isset($gd_marker_sizes[$icon])) {
 | |
| 77 | + $icon_size = $gd_marker_sizes[$icon]; | |
| 78 | +			} else {
 | |
| 79 | + $icon_size = geodir_get_marker_size($icon); | |
| 80 | + $gd_marker_sizes[$icon] = $icon_size; | |
| 81 | + } | |
| 82 | +		} else {
 | |
| 83 | +			$icon_size = array('w' => 36, 'h' => 45);
 | |
| 84 | + } | |
| 85 | + | |
| 86 | +		$post_json = '{"id":"' . $post->ID . '","t": "' . $title . '","lt": "' . $post->post_latitude . '","ln": "' . $post->post_longitude . '","mk_id":"' . $post->ID . '_' . $post->default_category . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"}';
 | |
| 87 | + | |
| 88 | + /** | |
| 89 | + * Filter the json data when creating output for post json marker.. | |
| 90 | + * | |
| 91 | + * @since 1.5.7 | |
| 92 | + * @param string $post_json JSON representation of the post marker info. | |
| 93 | + * @param object $post The post object. | |
| 94 | + */ | |
| 95 | +		$post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
 | |
| 96 | + | |
| 97 | + // only assign it if it has a value | |
| 98 | +		if($post_map_json){
 | |
| 99 | + $map_jason[$post->ID] = $post_map_json; | |
| 100 | + } | |
| 101 | + | |
| 102 | + } | |
| 103 | 103 | } | 
| 104 | 104 | |
| 105 | 105 | /** | 
| @@ -112,67 +112,67 @@ discard block | ||
| 112 | 112 | */ | 
| 113 | 113 | function send_marker_jason_to_js() | 
| 114 | 114 |  {
 | 
| 115 | - global $map_jason, $map_canvas_arr; | |
| 116 | - | |
| 117 | -    if (is_array($map_canvas_arr) && !empty($map_canvas_arr)) {
 | |
| 118 | -        foreach ($map_canvas_arr as $canvas => $jason) {
 | |
| 119 | -            if (is_array($map_jason) && !empty($map_jason)) {
 | |
| 120 | - | |
| 121 | - // on details page only show the main marker on the map | |
| 122 | -                if(geodir_is_page('detail')){
 | |
| 123 | - global $post; | |
| 124 | -                    if(isset($map_jason[$post->ID])){
 | |
| 125 | - $map_jason = array($map_jason[$post->ID]); | |
| 126 | - } | |
| 127 | - } | |
| 128 | - $canvas_jason = $canvas . "_jason"; | |
| 129 | - $map_canvas_arr[$canvas] = array_unique($map_jason); | |
| 130 | - unset($cat_content_info); | |
| 131 | -                $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
 | |
| 132 | - $totalcount = count(array_unique($map_jason)); | |
| 133 | -                if (!empty($cat_content_info)) {
 | |
| 134 | -                    $json_content = substr(implode(',', $cat_content_info), 1);
 | |
| 135 | -                    $json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016
 | |
| 136 | - $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08 | |
| 137 | -                    $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
 | |
| 138 | -                } else {
 | |
| 139 | -                    $canvas_jason = '[{"totalcount":"0"}]';
 | |
| 140 | - } | |
| 141 | - $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); | |
| 142 | - | |
| 143 | - /** | |
| 144 | - * Filter the send_marker_jason_to_js() function map canvas json args. | |
| 145 | - * | |
| 146 | - * You can use this filter to modify map canvas json args. | |
| 147 | - * | |
| 148 | - * @since 1.0.0 | |
| 149 | - * @package GeoDirectory | |
| 150 | - * @param string $canvas Map canvas array key. | |
| 151 | - * @param array $map_canvas_jason_args Map canvas args. | |
| 152 | - */ | |
| 153 | -                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
 | |
| 154 | - | |
| 155 | -                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
 | |
| 156 | -            } else {
 | |
| 157 | -                $canvas_jason = '[{"totalcount":"0"}]';
 | |
| 158 | - $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); | |
| 159 | - | |
| 160 | - /** | |
| 161 | - * Filter the send_marker_jason_to_js() function map canvas json args. | |
| 162 | - * | |
| 163 | - * You can use this filter to modify map canvas json args. | |
| 164 | - * | |
| 165 | - * @since 1.0.0 | |
| 166 | - * @package GeoDirectory | |
| 167 | - * @param string $canvas Map canvas array key. | |
| 168 | - * @param array $map_canvas_jason_args Map canvas args. | |
| 169 | - */ | |
| 170 | -                $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
 | |
| 171 | -                wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
 | |
| 172 | - } | |
| 173 | - } | |
| 174 | - | |
| 175 | - } | |
| 115 | + global $map_jason, $map_canvas_arr; | |
| 116 | + | |
| 117 | +	if (is_array($map_canvas_arr) && !empty($map_canvas_arr)) {
 | |
| 118 | +		foreach ($map_canvas_arr as $canvas => $jason) {
 | |
| 119 | +			if (is_array($map_jason) && !empty($map_jason)) {
 | |
| 120 | + | |
| 121 | + // on details page only show the main marker on the map | |
| 122 | +				if(geodir_is_page('detail')){
 | |
| 123 | + global $post; | |
| 124 | +					if(isset($map_jason[$post->ID])){
 | |
| 125 | + $map_jason = array($map_jason[$post->ID]); | |
| 126 | + } | |
| 127 | + } | |
| 128 | + $canvas_jason = $canvas . "_jason"; | |
| 129 | + $map_canvas_arr[$canvas] = array_unique($map_jason); | |
| 130 | + unset($cat_content_info); | |
| 131 | +				$cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
 | |
| 132 | + $totalcount = count(array_unique($map_jason)); | |
| 133 | +				if (!empty($cat_content_info)) {
 | |
| 134 | +					$json_content = substr(implode(',', $cat_content_info), 1);
 | |
| 135 | +					$json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016
 | |
| 136 | + $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08 | |
| 137 | +					$canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
 | |
| 138 | +				} else {
 | |
| 139 | +					$canvas_jason = '[{"totalcount":"0"}]';
 | |
| 140 | + } | |
| 141 | + $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); | |
| 142 | + | |
| 143 | + /** | |
| 144 | + * Filter the send_marker_jason_to_js() function map canvas json args. | |
| 145 | + * | |
| 146 | + * You can use this filter to modify map canvas json args. | |
| 147 | + * | |
| 148 | + * @since 1.0.0 | |
| 149 | + * @package GeoDirectory | |
| 150 | + * @param string $canvas Map canvas array key. | |
| 151 | + * @param array $map_canvas_jason_args Map canvas args. | |
| 152 | + */ | |
| 153 | +				$map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
 | |
| 154 | + | |
| 155 | +				wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
 | |
| 156 | +			} else {
 | |
| 157 | +				$canvas_jason = '[{"totalcount":"0"}]';
 | |
| 158 | + $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); | |
| 159 | + | |
| 160 | + /** | |
| 161 | + * Filter the send_marker_jason_to_js() function map canvas json args. | |
| 162 | + * | |
| 163 | + * You can use this filter to modify map canvas json args. | |
| 164 | + * | |
| 165 | + * @since 1.0.0 | |
| 166 | + * @package GeoDirectory | |
| 167 | + * @param string $canvas Map canvas array key. | |
| 168 | + * @param array $map_canvas_jason_args Map canvas args. | |
| 169 | + */ | |
| 170 | +				$map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
 | |
| 171 | +				wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
 | |
| 172 | + } | |
| 173 | + } | |
| 174 | + | |
| 175 | + } | |
| 176 | 176 | } | 
| 177 | 177 | |
| 178 | 178 | /** | 
| @@ -195,99 +195,99 @@ discard block | ||
| 195 | 195 | */ | 
| 196 | 196 | function home_map_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = true, $pading = 0, $map_canvas_name = '', $child_collapse, $is_home_map = false) | 
| 197 | 197 |  {
 | 
| 198 | - global $cat_count, $geodir_cat_icons, $gd_session; | |
| 198 | + global $cat_count, $geodir_cat_icons, $gd_session; | |
| 199 | 199 | |
| 200 | -    $exclude_categories = get_option('geodir_exclude_cat_on_map');
 | |
| 201 | -    $exclude_categories_new = get_option('geodir_exclude_cat_on_map_upgrade');
 | |
| 200 | +	$exclude_categories = get_option('geodir_exclude_cat_on_map');
 | |
| 201 | +	$exclude_categories_new = get_option('geodir_exclude_cat_on_map_upgrade');
 | |
| 202 | 202 | |
| 203 | - // check if exclude categories saved before fix of categories identical names | |
| 204 | -    if ($exclude_categories_new) {
 | |
| 205 | - $gd_cat_taxonomy = isset($cat_taxonomy[0]) ? $cat_taxonomy[0] : ''; | |
| 206 | - $exclude_categories = !empty($exclude_categories[$gd_cat_taxonomy]) && is_array($exclude_categories[$gd_cat_taxonomy]) ? array_unique($exclude_categories[$gd_cat_taxonomy]) : array(); | |
| 207 | - } | |
| 203 | + // check if exclude categories saved before fix of categories identical names | |
| 204 | +	if ($exclude_categories_new) {
 | |
| 205 | + $gd_cat_taxonomy = isset($cat_taxonomy[0]) ? $cat_taxonomy[0] : ''; | |
| 206 | + $exclude_categories = !empty($exclude_categories[$gd_cat_taxonomy]) && is_array($exclude_categories[$gd_cat_taxonomy]) ? array_unique($exclude_categories[$gd_cat_taxonomy]) : array(); | |
| 207 | + } | |
| 208 | 208 | |
| 209 | -    $exclude_cat_str = implode(',', $exclude_categories);
 | |
| 209 | +	$exclude_cat_str = implode(',', $exclude_categories);
 | |
| 210 | 210 | |
| 211 | -    if ($exclude_cat_str == '') {
 | |
| 212 | - $exclude_cat_str = '0'; | |
| 213 | - } | |
| 211 | +	if ($exclude_cat_str == '') {
 | |
| 212 | + $exclude_cat_str = '0'; | |
| 213 | + } | |
| 214 | 214 | |
| 215 | -    $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'exclude' => $exclude_cat_str, 'hide_empty ' => $hide_empty));
 | |
| 215 | +	$cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'exclude' => $exclude_cat_str, 'hide_empty ' => $hide_empty));
 | |
| 216 | 216 | |
| 217 | -    if ($hide_empty) {
 | |
| 218 | - $cat_terms = geodir_filter_empty_terms($cat_terms); | |
| 219 | - } | |
| 217 | +	if ($hide_empty) {
 | |
| 218 | + $cat_terms = geodir_filter_empty_terms($cat_terms); | |
| 219 | + } | |
| 220 | 220 | |
| 221 | - $main_list_class = ''; | |
| 222 | - //If there are terms, start displaying | |
| 223 | -    if (count($cat_terms) > 0) {
 | |
| 224 | - //Displaying as a list | |
| 225 | - $p = $pading * 15; | |
| 226 | - $pading++; | |
| 221 | + $main_list_class = ''; | |
| 222 | + //If there are terms, start displaying | |
| 223 | +	if (count($cat_terms) > 0) {
 | |
| 224 | + //Displaying as a list | |
| 225 | + $p = $pading * 15; | |
| 226 | + $pading++; | |
| 227 | 227 | |
| 228 | -        if ($cat_parent == 0) {
 | |
| 229 | - $list_class = 'main_list'; | |
| 230 | - $display = ''; | |
| 231 | -        } else {
 | |
| 232 | - $list_class = 'sub_list'; | |
| 233 | - $display = !$child_collapse ? '' : 'display:none'; | |
| 234 | - } | |
| 228 | +		if ($cat_parent == 0) {
 | |
| 229 | + $list_class = 'main_list'; | |
| 230 | + $display = ''; | |
| 231 | +		} else {
 | |
| 232 | + $list_class = 'sub_list'; | |
| 233 | + $display = !$child_collapse ? '' : 'display:none'; | |
| 234 | + } | |
| 235 | 235 | |
| 236 | - $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">'; | |
| 236 | + $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">'; | |
| 237 | 237 | |
| 238 | - $geodir_cat_icons = geodir_get_term_icon(); | |
| 238 | + $geodir_cat_icons = geodir_get_term_icon(); | |
| 239 | 239 | |
| 240 | -        $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') :  'gd_place';
 | |
| 241 | -        if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
 | |
| 242 | - $geodir_default_map_search_pt = $homemap_catlist_ptype; | |
| 243 | - } | |
| 244 | - $post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : $geodir_default_map_search_pt); | |
| 240 | +		$geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') :  'gd_place';
 | |
| 241 | +		if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
 | |
| 242 | + $geodir_default_map_search_pt = $homemap_catlist_ptype; | |
| 243 | + } | |
| 244 | + $post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : $geodir_default_map_search_pt); | |
| 245 | 245 | |
| 246 | - foreach ($cat_terms as $cat_term): | |
| 247 | - $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$cat_term->term_id]) ? $geodir_cat_icons[$cat_term->term_id] : ''; | |
| 248 | - | |
| 249 | - if (!in_array($cat_term->term_id, $exclude_categories)): | |
| 250 | - //Secret sauce. Function calls itself to display child elements, if any | |
| 251 | - $checked = 'checked="checked"'; | |
| 252 | - | |
| 253 | - // Untick the category by default on home map | |
| 254 | -                if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {
 | |
| 255 | -                    if (function_exists('icl_object_id')) { // if WPML
 | |
| 256 | - global $sitepress; | |
| 257 | - $default_lang = $sitepress->get_default_language(); | |
| 258 | - $term_id = icl_object_id($cat_term->term_id, $post_type.'category', true, $default_lang); | |
| 259 | -                    }else{
 | |
| 260 | - $term_id = $cat_term->term_id; | |
| 261 | - } | |
| 262 | -                    if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
 | |
| 263 | - $checked = ''; | |
| 264 | - } | |
| 265 | - } | |
| 266 | - | |
| 267 | - $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"'; | |
| 268 | - $term_check .= ' name="' . $map_canvas_name . '_cat[]" '; | |
| 269 | - $term_check .= ' title="' . esc_attr(ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">'; | |
| 270 | - $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . ucfirst($cat_term->name) . '"/>'; | |
| 271 | - $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>'; | |
| 272 | - | |
| 273 | - endif; | |
| 274 | - | |
| 275 | - | |
| 276 | - // get sub category by recursion | |
| 277 | - $out .= home_map_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading, $map_canvas_name, $child_collapse, $is_home_map); | |
| 278 | - | |
| 279 | - $out .= '</li>'; | |
| 280 | - | |
| 281 | - endforeach; | |
| 282 | - | |
| 283 | - $out .= '</ul>'; | |
| 284 | - | |
| 285 | - return $out; | |
| 286 | -    } else {
 | |
| 287 | - if ($cat_parent == 0) | |
| 288 | -            return _e('No category', 'geodirectory');
 | |
| 289 | - } | |
| 290 | - return; | |
| 246 | + foreach ($cat_terms as $cat_term): | |
| 247 | + $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$cat_term->term_id]) ? $geodir_cat_icons[$cat_term->term_id] : ''; | |
| 248 | + | |
| 249 | + if (!in_array($cat_term->term_id, $exclude_categories)): | |
| 250 | + //Secret sauce. Function calls itself to display child elements, if any | |
| 251 | + $checked = 'checked="checked"'; | |
| 252 | + | |
| 253 | + // Untick the category by default on home map | |
| 254 | +				if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {
 | |
| 255 | +					if (function_exists('icl_object_id')) { // if WPML
 | |
| 256 | + global $sitepress; | |
| 257 | + $default_lang = $sitepress->get_default_language(); | |
| 258 | + $term_id = icl_object_id($cat_term->term_id, $post_type.'category', true, $default_lang); | |
| 259 | +					}else{
 | |
| 260 | + $term_id = $cat_term->term_id; | |
| 261 | + } | |
| 262 | +					if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
 | |
| 263 | + $checked = ''; | |
| 264 | + } | |
| 265 | + } | |
| 266 | + | |
| 267 | + $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"'; | |
| 268 | + $term_check .= ' name="' . $map_canvas_name . '_cat[]" '; | |
| 269 | + $term_check .= ' title="' . esc_attr(ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">'; | |
| 270 | + $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . ucfirst($cat_term->name) . '"/>'; | |
| 271 | + $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>'; | |
| 272 | + | |
| 273 | + endif; | |
| 274 | + | |
| 275 | + | |
| 276 | + // get sub category by recursion | |
| 277 | + $out .= home_map_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading, $map_canvas_name, $child_collapse, $is_home_map); | |
| 278 | + | |
| 279 | + $out .= '</li>'; | |
| 280 | + | |
| 281 | + endforeach; | |
| 282 | + | |
| 283 | + $out .= '</ul>'; | |
| 284 | + | |
| 285 | + return $out; | |
| 286 | +	} else {
 | |
| 287 | + if ($cat_parent == 0) | |
| 288 | +			return _e('No category', 'geodirectory');
 | |
| 289 | + } | |
| 290 | + return; | |
| 291 | 291 | } | 
| 292 | 292 | |
| 293 | 293 | /** | 
| @@ -299,19 +299,19 @@ discard block | ||
| 299 | 299 | * @return string The map API provider name. | 
| 300 | 300 | */ | 
| 301 | 301 |  function geodir_map_name() {
 | 
| 302 | -    $geodir_map_name = get_option('geodir_load_map', 'google');
 | |
| 302 | +	$geodir_map_name = get_option('geodir_load_map', 'google');
 | |
| 303 | 303 | |
| 304 | -    if (!in_array($geodir_map_name, array('none', 'auto', 'google', 'osm'))) {
 | |
| 305 | - $geodir_map_name = 'auto'; | |
| 306 | - } | |
| 307 | - | |
| 308 | - /** | |
| 309 | - * Filter the map JS API provider name. | |
| 310 | - * | |
| 311 | - * @since 1.6.1 | |
| 312 | - * @param string $geodir_map_name The map API provider name. | |
| 313 | - */ | |
| 314 | -    return apply_filters('geodir_map_name', $geodir_map_name);
 | |
| 304 | +	if (!in_array($geodir_map_name, array('none', 'auto', 'google', 'osm'))) {
 | |
| 305 | + $geodir_map_name = 'auto'; | |
| 306 | + } | |
| 307 | + | |
| 308 | + /** | |
| 309 | + * Filter the map JS API provider name. | |
| 310 | + * | |
| 311 | + * @since 1.6.1 | |
| 312 | + * @param string $geodir_map_name The map API provider name. | |
| 313 | + */ | |
| 314 | +	return apply_filters('geodir_map_name', $geodir_map_name);
 | |
| 315 | 315 | } | 
| 316 | 316 | |
| 317 | 317 | /** | 
| @@ -327,48 +327,48 @@ discard block | ||
| 327 | 327 | * @return array The icon size. | 
| 328 | 328 | */ | 
| 329 | 329 |  function geodir_get_marker_size($icon, $default_size = array('w' => 36, 'h' => 45)) {
 | 
| 330 | - global $gd_marker_sizes; | |
| 330 | + global $gd_marker_sizes; | |
| 331 | 331 | |
| 332 | -    if (empty($gd_marker_sizes)) {
 | |
| 333 | - $gd_marker_sizes = array(); | |
| 334 | - } | |
| 332 | +	if (empty($gd_marker_sizes)) {
 | |
| 333 | + $gd_marker_sizes = array(); | |
| 334 | + } | |
| 335 | 335 | |
| 336 | -    if (!empty($gd_marker_sizes[$icon])) {
 | |
| 337 | - return $gd_marker_sizes[$icon]; | |
| 338 | - } | |
| 336 | +	if (!empty($gd_marker_sizes[$icon])) {
 | |
| 337 | + return $gd_marker_sizes[$icon]; | |
| 338 | + } | |
| 339 | 339 | |
| 340 | -    if (empty($icon)) {
 | |
| 341 | - $gd_marker_sizes[$icon] = $default_size; | |
| 340 | +	if (empty($icon)) {
 | |
| 341 | + $gd_marker_sizes[$icon] = $default_size; | |
| 342 | 342 | |
| 343 | - return $default_size; | |
| 344 | - } | |
| 343 | + return $default_size; | |
| 344 | + } | |
| 345 | 345 | |
| 346 | - $icon_url = $icon; | |
| 346 | + $icon_url = $icon; | |
| 347 | 347 | |
| 348 | - $uploads = wp_upload_dir(); // Array of key => value pairs | |
| 348 | + $uploads = wp_upload_dir(); // Array of key => value pairs | |
| 349 | 349 | |
| 350 | -    if (!path_is_absolute($icon)) {
 | |
| 351 | - $icon = str_replace($uploads['baseurl'], $uploads['basedir'], $icon); | |
| 352 | - } | |
| 350 | +	if (!path_is_absolute($icon)) {
 | |
| 351 | + $icon = str_replace($uploads['baseurl'], $uploads['basedir'], $icon); | |
| 352 | + } | |
| 353 | 353 | |
| 354 | -    if (!path_is_absolute($icon) && strpos($icon, WP_CONTENT_URL) !== false) {
 | |
| 355 | - $icon = str_replace(WP_CONTENT_URL, WP_CONTENT_DIR, $icon); | |
| 356 | - } | |
| 354 | +	if (!path_is_absolute($icon) && strpos($icon, WP_CONTENT_URL) !== false) {
 | |
| 355 | + $icon = str_replace(WP_CONTENT_URL, WP_CONTENT_DIR, $icon); | |
| 356 | + } | |
| 357 | 357 | |
| 358 | - $sizes = array(); | |
| 359 | -    if (is_file($icon) && file_exists($icon)) {
 | |
| 360 | - $size = getimagesize(trim($icon)); | |
| 358 | + $sizes = array(); | |
| 359 | +	if (is_file($icon) && file_exists($icon)) {
 | |
| 360 | + $size = getimagesize(trim($icon)); | |
| 361 | 361 | |
| 362 | -        if (!empty($size[0]) && !empty($size[1])) {
 | |
| 363 | -            $sizes = array('w' => $size[0], 'h' => $size[1]);
 | |
| 364 | - } | |
| 365 | - } | |
| 362 | +		if (!empty($size[0]) && !empty($size[1])) {
 | |
| 363 | +			$sizes = array('w' => $size[0], 'h' => $size[1]);
 | |
| 364 | + } | |
| 365 | + } | |
| 366 | 366 | |
| 367 | - $sizes = !empty($sizes) ? $sizes : $default_size; | |
| 367 | + $sizes = !empty($sizes) ? $sizes : $default_size; | |
| 368 | 368 | |
| 369 | - $gd_marker_sizes[$icon_url] = $sizes; | |
| 369 | + $gd_marker_sizes[$icon_url] = $sizes; | |
| 370 | 370 | |
| 371 | - return $sizes; | |
| 371 | + return $sizes; | |
| 372 | 372 | } | 
| 373 | 373 | |
| 374 | 374 |  add_action('wp_footer', 'geodir_map_load_script', 10);
 | 
| @@ -380,8 +380,8 @@ discard block | ||
| 380 | 380 | * @package GeoDirectory | 
| 381 | 381 | */ | 
| 382 | 382 |  function geodir_map_load_script() {
 | 
| 383 | -    if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {
 | |
| 384 | - $plugin_url = geodir_plugin_url(); | |
| 383 | +	if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {
 | |
| 384 | + $plugin_url = geodir_plugin_url(); | |
| 385 | 385 | ?> | 
| 386 | 386 | <script type="text/javascript"> | 
| 387 | 387 |  if (!(window.google && typeof google.maps !== 'undefined')) {
 | 
| @@ -395,5 +395,5 @@ discard block | ||
| 395 | 395 | } | 
| 396 | 396 | </script> | 
| 397 | 397 | <?php | 
| 398 | - } | |
| 398 | + } | |
| 399 | 399 | } | 
| 400 | 400 | \ No newline at end of file | 
| @@ -10,7 +10,7 @@ discard block | ||
| 10 | 10 | /** | 
| 11 | 11 | * Get All Plugin functions from WordPress | 
| 12 | 12 | */ | 
| 13 | -include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); | |
| 13 | +include_once(ABSPATH.'wp-admin/includes/plugin.php'); | |
| 14 | 14 | |
| 15 | 15 | /*-----------------------------------------------------------------------------------*/ | 
| 16 | 16 | /* Helper functions */ | 
| @@ -27,10 +27,10 @@ discard block | ||
| 27 | 27 | */ | 
| 28 | 28 |  function geodir_plugin_url() {
 | 
| 29 | 29 | |
| 30 | - if ( is_ssl() ) : | |
| 31 | - return str_replace( 'http://', 'https://', WP_PLUGIN_URL ) . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) ); | |
| 30 | + if (is_ssl()) : | |
| 31 | +		return str_replace('http://', 'https://', WP_PLUGIN_URL)."/".plugin_basename(dirname(dirname(__FILE__)));
 | |
| 32 | 32 | else : | 
| 33 | - return WP_PLUGIN_URL . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) ); | |
| 33 | + return WP_PLUGIN_URL."/".plugin_basename(dirname(dirname(__FILE__))); | |
| 34 | 34 | endif; | 
| 35 | 35 | } | 
| 36 | 36 | |
| @@ -45,10 +45,10 @@ discard block | ||
| 45 | 45 | * @return string example url eg: /home/geo/public_html/wp-content/plugins/geodirectory | 
| 46 | 46 | */ | 
| 47 | 47 |  function geodir_plugin_path() {
 | 
| 48 | -	if ( defined( 'GD_TESTING_MODE' ) && GD_TESTING_MODE ) {
 | |
| 49 | - return dirname( dirname( __FILE__ ) ); | |
| 48 | +	if (defined('GD_TESTING_MODE') && GD_TESTING_MODE) {
 | |
| 49 | + return dirname(dirname(__FILE__)); | |
| 50 | 50 |  	} else {
 | 
| 51 | - return WP_PLUGIN_DIR . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) ); | |
| 51 | + return WP_PLUGIN_DIR."/".plugin_basename(dirname(dirname(__FILE__))); | |
| 52 | 52 | } | 
| 53 | 53 | } | 
| 54 | 54 | |
| @@ -63,10 +63,10 @@ discard block | ||
| 63 | 63 | * @return bool true or false. | 
| 64 | 64 | * @todo check if this is faster than normal WP check and remove if not. | 
| 65 | 65 | */ | 
| 66 | -function geodir_is_plugin_active( $plugin ) {
 | |
| 67 | - $active_plugins = get_option( 'active_plugins' ); | |
| 68 | -	foreach ( $active_plugins as $key => $active_plugin ) {
 | |
| 69 | -		if ( strstr( $active_plugin, $plugin ) ) {
 | |
| 66 | +function geodir_is_plugin_active($plugin) {
 | |
| 67 | +	$active_plugins = get_option('active_plugins');
 | |
| 68 | +	foreach ($active_plugins as $key => $active_plugin) {
 | |
| 69 | +		if (strstr($active_plugin, $plugin)) {
 | |
| 70 | 70 | return true; | 
| 71 | 71 | } | 
| 72 | 72 | } | 
| @@ -88,8 +88,8 @@ discard block | ||
| 88 | 88 | * | 
| 89 | 89 | * @return bool|int|string the formatted date. | 
| 90 | 90 | */ | 
| 91 | -function geodir_get_formated_date( $date ) {
 | |
| 92 | - return mysql2date( get_option( 'date_format' ), $date ); | |
| 91 | +function geodir_get_formated_date($date) {
 | |
| 92 | +	return mysql2date(get_option('date_format'), $date);
 | |
| 93 | 93 | } | 
| 94 | 94 | |
| 95 | 95 | /** | 
| @@ -105,8 +105,8 @@ discard block | ||
| 105 | 105 | * | 
| 106 | 106 | * @return bool|int|string the formatted time. | 
| 107 | 107 | */ | 
| 108 | -function geodir_get_formated_time( $time ) {
 | |
| 109 | - return mysql2date( get_option( 'time_format' ), $time, $translate = true ); | |
| 108 | +function geodir_get_formated_time($time) {
 | |
| 109 | +	return mysql2date(get_option('time_format'), $time, $translate = true);
 | |
| 110 | 110 | } | 
| 111 | 111 | |
| 112 | 112 | |
| @@ -124,35 +124,35 @@ discard block | ||
| 124 | 124 | * | 
| 125 | 125 | * @return string Formatted link. | 
| 126 | 126 | */ | 
| 127 | -function geodir_getlink( $url, $params = array(), $use_existing_arguments = false ) {
 | |
| 128 | -	if ( $use_existing_arguments ) {
 | |
| 127 | +function geodir_getlink($url, $params = array(), $use_existing_arguments = false) {
 | |
| 128 | +	if ($use_existing_arguments) {
 | |
| 129 | 129 | $params = $params + $_GET; | 
| 130 | 130 | } | 
| 131 | -	if ( ! $params ) {
 | |
| 131 | +	if (!$params) {
 | |
| 132 | 132 | return $url; | 
| 133 | 133 | } | 
| 134 | 134 | $link = $url; | 
| 135 | -	if ( strpos( $link, '?' ) === false ) {
 | |
| 135 | +	if (strpos($link, '?') === false) {
 | |
| 136 | 136 | $link .= '?'; | 
| 137 | 137 | } //If there is no '?' add one at the end | 
| 138 | -	elseif ( strpos( $link, '//maps.google.com/maps/api/js?language=' ) ) {
 | |
| 138 | +	elseif (strpos($link, '//maps.google.com/maps/api/js?language=')) {
 | |
| 139 | 139 | $link .= '&'; | 
| 140 | 140 | } //If there is no '&' at the END, add one. | 
| 141 | -	elseif ( ! preg_match( '/(\?|\&(amp;)?)$/', $link ) ) {
 | |
| 141 | +	elseif (!preg_match('/(\?|\&(amp;)?)$/', $link)) {
 | |
| 142 | 142 | $link .= '&'; | 
| 143 | 143 | } //If there is no '&' at the END, add one. | 
| 144 | 144 | |
| 145 | 145 | $params_arr = array(); | 
| 146 | -	foreach ( $params as $key => $value ) {
 | |
| 147 | -		if ( gettype( $value ) == 'array' ) { //Handle array data properly
 | |
| 148 | -			foreach ( $value as $val ) {
 | |
| 149 | - $params_arr[] = $key . '[]=' . urlencode( $val ); | |
| 146 | +	foreach ($params as $key => $value) {
 | |
| 147 | +		if (gettype($value) == 'array') { //Handle array data properly
 | |
| 148 | +			foreach ($value as $val) {
 | |
| 149 | + $params_arr[] = $key.'[]='.urlencode($val); | |
| 150 | 150 | } | 
| 151 | 151 |  		} else {
 | 
| 152 | - $params_arr[] = $key . '=' . urlencode( $value ); | |
| 152 | + $params_arr[] = $key.'='.urlencode($value); | |
| 153 | 153 | } | 
| 154 | 154 | } | 
| 155 | - $link .= implode( '&', $params_arr ); | |
| 155 | +	$link .= implode('&', $params_arr);
 | |
| 156 | 156 | |
| 157 | 157 | return $link; | 
| 158 | 158 | } | 
| @@ -169,18 +169,18 @@ discard block | ||
| 169 | 169 | * | 
| 170 | 170 | * @return string Listing page url if valid. Otherwise home url will be returned. | 
| 171 | 171 | */ | 
| 172 | -function geodir_get_addlisting_link( $post_type = '' ) {
 | |
| 172 | +function geodir_get_addlisting_link($post_type = '') {
 | |
| 173 | 173 | global $wpdb; | 
| 174 | 174 | |
| 175 | 175 |  	//$check_pkg  = $wpdb->get_var("SELECT pid FROM ".GEODIR_PRICE_TABLE." WHERE post_type='".$post_type."' and status != '0'");
 | 
| 176 | 176 | $check_pkg = 1; | 
| 177 | -	if ( post_type_exists( $post_type ) && $check_pkg ) {
 | |
| 177 | +	if (post_type_exists($post_type) && $check_pkg) {
 | |
| 178 | 178 | |
| 179 | - $add_listing_link = get_page_link( geodir_add_listing_page_id() ); | |
| 179 | + $add_listing_link = get_page_link(geodir_add_listing_page_id()); | |
| 180 | 180 | |
| 181 | - return esc_url( add_query_arg( array( 'listing_type' => $post_type ), $add_listing_link ) ); | |
| 181 | +		return esc_url(add_query_arg(array('listing_type' => $post_type), $add_listing_link));
 | |
| 182 | 182 |  	} else {
 | 
| 183 | - return get_bloginfo( 'url' ); | |
| 183 | +		return get_bloginfo('url');
 | |
| 184 | 184 | } | 
| 185 | 185 | } | 
| 186 | 186 | |
| @@ -208,7 +208,7 @@ discard block | ||
| 208 | 208 |  	if (!empty($_SERVER['PHP_SELF']) && !empty($_SERVER['REQUEST_URI'])) {
 | 
| 209 | 209 | // To build the entire URI we need to prepend the protocol, and the http host | 
| 210 | 210 | // to the URI string. | 
| 211 | - $pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; | |
| 211 | + $pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; | |
| 212 | 212 |  	} else {
 | 
| 213 | 213 | /* | 
| 214 | 214 | * Since we do not have REQUEST_URI to work with, we will assume we are | 
| @@ -217,11 +217,11 @@ discard block | ||
| 217 | 217 | * | 
| 218 | 218 | * IIS uses the SCRIPT_NAME variable instead of a REQUEST_URI variable... thanks, MS | 
| 219 | 219 | */ | 
| 220 | - $pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']; | |
| 220 | + $pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME']; | |
| 221 | 221 | |
| 222 | 222 | // If the query string exists append it to the URI string | 
| 223 | 223 |  		if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
 | 
| 224 | - $pageURL .= '?' . $_SERVER['QUERY_STRING']; | |
| 224 | + $pageURL .= '?'.$_SERVER['QUERY_STRING']; | |
| 225 | 225 | } | 
| 226 | 226 | } | 
| 227 | 227 | |
| @@ -232,7 +232,7 @@ discard block | ||
| 232 | 232 | * | 
| 233 | 233 | * @param string $pageURL The URL of the current page. | 
| 234 | 234 | */ | 
| 235 | - return apply_filters( 'geodir_curPageURL', $pageURL ); | |
| 235 | +	return apply_filters('geodir_curPageURL', $pageURL);
 | |
| 236 | 236 | } | 
| 237 | 237 | |
| 238 | 238 | /** | 
| @@ -247,12 +247,12 @@ discard block | ||
| 247 | 247 | * | 
| 248 | 248 | * @return string Cleaned variable. | 
| 249 | 249 | */ | 
| 250 | -function geodir_clean( $string ) {
 | |
| 250 | +function geodir_clean($string) {
 | |
| 251 | 251 | |
| 252 | - $string = trim( strip_tags( stripslashes( $string ) ) ); | |
| 253 | - $string = str_replace( " ", "-", $string ); // Replaces all spaces with hyphens. | |
| 254 | - $string = preg_replace( '/[^A-Za-z0-9\-\_]/', '', $string ); // Removes special chars. | |
| 255 | - $string = preg_replace( '/-+/', '-', $string ); // Replaces multiple hyphens with single one. | |
| 252 | + $string = trim(strip_tags(stripslashes($string))); | |
| 253 | +	$string = str_replace(" ", "-", $string); // Replaces all spaces with hyphens.
 | |
| 254 | +	$string = preg_replace('/[^A-Za-z0-9\-\_]/', '', $string); // Removes special chars.
 | |
| 255 | +	$string = preg_replace('/-+/', '-', $string); // Replaces multiple hyphens with single one.
 | |
| 256 | 256 | |
| 257 | 257 | return $string; | 
| 258 | 258 | } | 
| @@ -266,13 +266,13 @@ discard block | ||
| 266 | 266 | */ | 
| 267 | 267 |  function geodir_get_weekday() {
 | 
| 268 | 268 | return array( | 
| 269 | - __( 'Sunday', 'geodirectory' ), | |
| 270 | - __( 'Monday', 'geodirectory' ), | |
| 271 | - __( 'Tuesday', 'geodirectory' ), | |
| 272 | - __( 'Wednesday', 'geodirectory' ), | |
| 273 | - __( 'Thursday', 'geodirectory' ), | |
| 274 | - __( 'Friday', 'geodirectory' ), | |
| 275 | - __( 'Saturday', 'geodirectory' ) | |
| 269 | +		__('Sunday', 'geodirectory'),
 | |
| 270 | +		__('Monday', 'geodirectory'),
 | |
| 271 | +		__('Tuesday', 'geodirectory'),
 | |
| 272 | +		__('Wednesday', 'geodirectory'),
 | |
| 273 | +		__('Thursday', 'geodirectory'),
 | |
| 274 | +		__('Friday', 'geodirectory'),
 | |
| 275 | +		__('Saturday', 'geodirectory')
 | |
| 276 | 276 | ); | 
| 277 | 277 | } | 
| 278 | 278 | |
| @@ -285,11 +285,11 @@ discard block | ||
| 285 | 285 | */ | 
| 286 | 286 |  function geodir_get_weeks() {
 | 
| 287 | 287 | return array( | 
| 288 | - __( 'First', 'geodirectory' ), | |
| 289 | - __( 'Second', 'geodirectory' ), | |
| 290 | - __( 'Third', 'geodirectory' ), | |
| 291 | - __( 'Fourth', 'geodirectory' ), | |
| 292 | - __( 'Last', 'geodirectory' ) | |
| 288 | +		__('First', 'geodirectory'),
 | |
| 289 | +		__('Second', 'geodirectory'),
 | |
| 290 | +		__('Third', 'geodirectory'),
 | |
| 291 | +		__('Fourth', 'geodirectory'),
 | |
| 292 | +		__('Last', 'geodirectory')
 | |
| 293 | 293 | ); | 
| 294 | 294 | } | 
| 295 | 295 | |
| @@ -308,112 +308,112 @@ discard block | ||
| 308 | 308 | * | 
| 309 | 309 | * @return bool If valid returns true. Otherwise false. | 
| 310 | 310 | */ | 
| 311 | -function geodir_is_page( $gdpage = '' ) {
 | |
| 311 | +function geodir_is_page($gdpage = '') {
 | |
| 312 | 312 | |
| 313 | 313 | global $wp_query, $post, $wp; | 
| 314 | 314 | //if(!is_admin()): | 
| 315 | 315 | |
| 316 | - switch ( $gdpage ): | |
| 316 | + switch ($gdpage): | |
| 317 | 317 | case 'add-listing': | 
| 318 | 318 | |
| 319 | -			if ( is_page() && get_query_var( 'page_id' ) == geodir_add_listing_page_id() ) {
 | |
| 319 | +			if (is_page() && get_query_var('page_id') == geodir_add_listing_page_id()) {
 | |
| 320 | 320 | return true; | 
| 321 | -			} elseif ( is_page() && isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {
 | |
| 321 | +			} elseif (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
 | |
| 322 | 322 | return true; | 
| 323 | 323 | } | 
| 324 | 324 | |
| 325 | 325 | break; | 
| 326 | 326 | case 'preview': | 
| 327 | - if ( ( is_page() && get_query_var( 'page_id' ) == geodir_preview_page_id() ) && isset( $_REQUEST['listing_type'] ) | |
| 328 | - && in_array( $_REQUEST['listing_type'], geodir_get_posttypes() ) | |
| 327 | +			if ((is_page() && get_query_var('page_id') == geodir_preview_page_id()) && isset($_REQUEST['listing_type'])
 | |
| 328 | + && in_array($_REQUEST['listing_type'], geodir_get_posttypes()) | |
| 329 | 329 |  			) {
 | 
| 330 | 330 | return true; | 
| 331 | 331 | } | 
| 332 | 332 | break; | 
| 333 | 333 | case 'listing-success': | 
| 334 | -			if ( is_page() && get_query_var( 'page_id' ) == geodir_success_page_id() ) {
 | |
| 334 | +			if (is_page() && get_query_var('page_id') == geodir_success_page_id()) {
 | |
| 335 | 335 | return true; | 
| 336 | 336 | } | 
| 337 | 337 | break; | 
| 338 | 338 | case 'detail': | 
| 339 | - $post_type = get_query_var( 'post_type' ); | |
| 340 | -			if ( is_array( $post_type ) ) {
 | |
| 341 | - $post_type = reset( $post_type ); | |
| 339 | +			$post_type = get_query_var('post_type');
 | |
| 340 | +			if (is_array($post_type)) {
 | |
| 341 | + $post_type = reset($post_type); | |
| 342 | 342 | } | 
| 343 | -			if ( is_single() && in_array( $post_type, geodir_get_posttypes() ) ) {
 | |
| 343 | +			if (is_single() && in_array($post_type, geodir_get_posttypes())) {
 | |
| 344 | 344 | return true; | 
| 345 | 345 | } | 
| 346 | 346 | break; | 
| 347 | 347 | case 'pt': | 
| 348 | - $post_type = get_query_var( 'post_type' ); | |
| 349 | -			if ( is_array( $post_type ) ) {
 | |
| 350 | - $post_type = reset( $post_type ); | |
| 348 | +			$post_type = get_query_var('post_type');
 | |
| 349 | +			if (is_array($post_type)) {
 | |
| 350 | + $post_type = reset($post_type); | |
| 351 | 351 | } | 
| 352 | -			if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) && ! is_tax() ) {
 | |
| 352 | +			if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes()) && !is_tax()) {
 | |
| 353 | 353 | return true; | 
| 354 | 354 | } | 
| 355 | 355 | |
| 356 | 356 | break; | 
| 357 | 357 | case 'listing': | 
| 358 | -			if ( is_tax() && geodir_get_taxonomy_posttype() ) {
 | |
| 358 | +			if (is_tax() && geodir_get_taxonomy_posttype()) {
 | |
| 359 | 359 | global $current_term, $taxonomy, $term; | 
| 360 | 360 | |
| 361 | 361 | return true; | 
| 362 | 362 | } | 
| 363 | - $post_type = get_query_var( 'post_type' ); | |
| 364 | -			if ( is_array( $post_type ) ) {
 | |
| 365 | - $post_type = reset( $post_type ); | |
| 363 | +			$post_type = get_query_var('post_type');
 | |
| 364 | +			if (is_array($post_type)) {
 | |
| 365 | + $post_type = reset($post_type); | |
| 366 | 366 | } | 
| 367 | -			if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) ) {
 | |
| 367 | +			if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes())) {
 | |
| 368 | 368 | return true; | 
| 369 | 369 | } | 
| 370 | 370 | |
| 371 | 371 | break; | 
| 372 | 372 | case 'home': | 
| 373 | 373 | |
| 374 | -			if ( ( is_page() && get_query_var( 'page_id' ) == geodir_home_page_id() ) || is_page_geodir_home() ) {
 | |
| 374 | +			if ((is_page() && get_query_var('page_id') == geodir_home_page_id()) || is_page_geodir_home()) {
 | |
| 375 | 375 | return true; | 
| 376 | 376 | } | 
| 377 | 377 | |
| 378 | 378 | break; | 
| 379 | 379 | case 'location': | 
| 380 | -			if ( is_page() && get_query_var( 'page_id' ) == geodir_location_page_id() ) {
 | |
| 380 | +			if (is_page() && get_query_var('page_id') == geodir_location_page_id()) {
 | |
| 381 | 381 | return true; | 
| 382 | 382 | } | 
| 383 | 383 | break; | 
| 384 | 384 | case 'author': | 
| 385 | -			if ( is_author() && isset( $_REQUEST['geodir_dashbord'] ) ) {
 | |
| 385 | +			if (is_author() && isset($_REQUEST['geodir_dashbord'])) {
 | |
| 386 | 386 | return true; | 
| 387 | 387 | } | 
| 388 | 388 | |
| 389 | -			if ( function_exists( 'bp_loggedin_user_id' ) && function_exists( 'bp_displayed_user_id' ) && $my_id = (int) bp_loggedin_user_id() ) {
 | |
| 390 | -				if ( ( (bool) bp_is_current_component( 'listings' ) || (bool) bp_is_current_component( 'favorites' ) ) && $my_id > 0 && $my_id == (int) bp_displayed_user_id() ) {
 | |
| 389 | +			if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int) bp_loggedin_user_id()) {
 | |
| 390 | +				if (((bool) bp_is_current_component('listings') || (bool) bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int) bp_displayed_user_id()) {
 | |
| 391 | 391 | return true; | 
| 392 | 392 | } | 
| 393 | 393 | } | 
| 394 | 394 | break; | 
| 395 | 395 | case 'search': | 
| 396 | -			if ( is_search() && isset( $_REQUEST['geodir_search'] ) ) {
 | |
| 396 | +			if (is_search() && isset($_REQUEST['geodir_search'])) {
 | |
| 397 | 397 | return true; | 
| 398 | 398 | } | 
| 399 | 399 | break; | 
| 400 | 400 | case 'info': | 
| 401 | -			if ( is_page() && get_query_var( 'page_id' ) == geodir_info_page_id() ) {
 | |
| 401 | +			if (is_page() && get_query_var('page_id') == geodir_info_page_id()) {
 | |
| 402 | 402 | return true; | 
| 403 | 403 | } | 
| 404 | 404 | break; | 
| 405 | 405 | case 'login': | 
| 406 | -			if ( is_page() && get_query_var( 'page_id' ) == geodir_login_page_id() ) {
 | |
| 406 | +			if (is_page() && get_query_var('page_id') == geodir_login_page_id()) {
 | |
| 407 | 407 | return true; | 
| 408 | 408 | } | 
| 409 | 409 | break; | 
| 410 | 410 | case 'checkout': | 
| 411 | -			if ( is_page() && function_exists( 'geodir_payment_checkout_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_checkout_page_id() ) {
 | |
| 411 | +			if (is_page() && function_exists('geodir_payment_checkout_page_id') && get_query_var('page_id') == geodir_payment_checkout_page_id()) {
 | |
| 412 | 412 | return true; | 
| 413 | 413 | } | 
| 414 | 414 | break; | 
| 415 | 415 | case 'invoices': | 
| 416 | -			if ( is_page() && function_exists( 'geodir_payment_invoices_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_invoices_page_id() ) {
 | |
| 416 | +			if (is_page() && function_exists('geodir_payment_invoices_page_id') && get_query_var('page_id') == geodir_payment_invoices_page_id()) {
 | |
| 417 | 417 | return true; | 
| 418 | 418 | } | 
| 419 | 419 | break; | 
| @@ -438,25 +438,25 @@ discard block | ||
| 438 | 438 | * | 
| 439 | 439 | * @param object $wp WordPress object. | 
| 440 | 440 | */ | 
| 441 | -function geodir_set_is_geodir_page( $wp ) {
 | |
| 442 | -	if ( ! is_admin() ) {
 | |
| 441 | +function geodir_set_is_geodir_page($wp) {
 | |
| 442 | +	if (!is_admin()) {
 | |
| 443 | 443 | //$wp->query_vars['gd_is_geodir_page'] = false; | 
| 444 | 444 | //print_r() | 
| 445 | - if ( empty( $wp->query_vars ) || ! array_diff( array_keys( $wp->query_vars ), array( | |
| 445 | + if (empty($wp->query_vars) || !array_diff(array_keys($wp->query_vars), array( | |
| 446 | 446 | 'preview', | 
| 447 | 447 | 'page', | 
| 448 | 448 | 'paged', | 
| 449 | 449 | 'cpage' | 
| 450 | - ) ) | |
| 450 | + )) | |
| 451 | 451 |  		) {
 | 
| 452 | -			if ( geodir_is_page( 'home' ) ) {
 | |
| 452 | +			if (geodir_is_page('home')) {
 | |
| 453 | 453 | $wp->query_vars['gd_is_geodir_page'] = true; | 
| 454 | 454 | } | 
| 455 | 455 | |
| 456 | 456 | |
| 457 | 457 | } | 
| 458 | 458 | |
| 459 | -		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['page_id'] ) ) {
 | |
| 459 | +		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['page_id'])) {
 | |
| 460 | 460 | if ( | 
| 461 | 461 | $wp->query_vars['page_id'] == geodir_add_listing_page_id() | 
| 462 | 462 | || $wp->query_vars['page_id'] == geodir_preview_page_id() | 
| @@ -465,26 +465,26 @@ discard block | ||
| 465 | 465 | || $wp->query_vars['page_id'] == geodir_home_page_id() | 
| 466 | 466 | || $wp->query_vars['page_id'] == geodir_info_page_id() | 
| 467 | 467 | || $wp->query_vars['page_id'] == geodir_login_page_id() | 
| 468 | - || ( function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() ) | |
| 469 | - || ( function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() ) | |
| 468 | +				|| (function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())
 | |
| 469 | +				|| (function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())
 | |
| 470 | 470 |  			) {
 | 
| 471 | 471 | $wp->query_vars['gd_is_geodir_page'] = true; | 
| 472 | 472 | } | 
| 473 | 473 | } | 
| 474 | 474 | |
| 475 | -		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['pagename'] ) ) {
 | |
| 476 | - $page = get_page_by_path( $wp->query_vars['pagename'] ); | |
| 475 | +		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['pagename'])) {
 | |
| 476 | + $page = get_page_by_path($wp->query_vars['pagename']); | |
| 477 | 477 | |
| 478 | - if ( ! empty( $page ) && ( | |
| 478 | + if (!empty($page) && ( | |
| 479 | 479 | $page->ID == geodir_add_listing_page_id() | 
| 480 | 480 | || $page->ID == geodir_preview_page_id() | 
| 481 | 481 | || $page->ID == geodir_success_page_id() | 
| 482 | 482 | || $page->ID == geodir_location_page_id() | 
| 483 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_home_page_id() ) | |
| 484 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_info_page_id() ) | |
| 485 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_login_page_id() ) | |
| 486 | - || ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() ) | |
| 487 | - || ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() ) | |
| 483 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_home_page_id()) | |
| 484 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_info_page_id()) | |
| 485 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_login_page_id()) | |
| 486 | +					|| (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())
 | |
| 487 | +					|| (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())
 | |
| 488 | 488 | ) | 
| 489 | 489 |  			) {
 | 
| 490 | 490 | $wp->query_vars['gd_is_geodir_page'] = true; | 
| @@ -492,20 +492,20 @@ discard block | ||
| 492 | 492 | } | 
| 493 | 493 | |
| 494 | 494 | |
| 495 | -		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['post_type'] ) && $wp->query_vars['post_type'] != '' ) {
 | |
| 495 | +		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {
 | |
| 496 | 496 | $requested_post_type = $wp->query_vars['post_type']; | 
| 497 | 497 | // check if this post type is geodirectory post types | 
| 498 | 498 | $post_type_array = geodir_get_posttypes(); | 
| 499 | -			if ( in_array( $requested_post_type, $post_type_array ) ) {
 | |
| 499 | +			if (in_array($requested_post_type, $post_type_array)) {
 | |
| 500 | 500 | $wp->query_vars['gd_is_geodir_page'] = true; | 
| 501 | 501 | } | 
| 502 | 502 | } | 
| 503 | 503 | |
| 504 | -		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) ) {
 | |
| 505 | - $geodir_taxonomis = geodir_get_taxonomies( '', true ); | |
| 506 | -			if ( ! empty( $geodir_taxonomis ) ) {
 | |
| 507 | -				foreach ( $geodir_taxonomis as $taxonomy ) {
 | |
| 508 | -					if ( array_key_exists( $taxonomy, $wp->query_vars ) ) {
 | |
| 504 | +		if (!isset($wp->query_vars['gd_is_geodir_page'])) {
 | |
| 505 | +			$geodir_taxonomis = geodir_get_taxonomies('', true);
 | |
| 506 | +			if (!empty($geodir_taxonomis)) {
 | |
| 507 | +				foreach ($geodir_taxonomis as $taxonomy) {
 | |
| 508 | +					if (array_key_exists($taxonomy, $wp->query_vars)) {
 | |
| 509 | 509 | $wp->query_vars['gd_is_geodir_page'] = true; | 
| 510 | 510 | break; | 
| 511 | 511 | } | 
| @@ -514,20 +514,20 @@ discard block | ||
| 514 | 514 | |
| 515 | 515 | } | 
| 516 | 516 | |
| 517 | -		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['author_name'] ) && isset( $_REQUEST['geodir_dashbord'] ) ) {
 | |
| 517 | +		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['author_name']) && isset($_REQUEST['geodir_dashbord'])) {
 | |
| 518 | 518 | $wp->query_vars['gd_is_geodir_page'] = true; | 
| 519 | 519 | } | 
| 520 | 520 | |
| 521 | 521 | |
| 522 | -		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $_REQUEST['geodir_search'] ) ) {
 | |
| 522 | +		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($_REQUEST['geodir_search'])) {
 | |
| 523 | 523 | $wp->query_vars['gd_is_geodir_page'] = true; | 
| 524 | 524 | } | 
| 525 | 525 | |
| 526 | 526 | |
| 527 | 527 | //check if homepage | 
| 528 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) | |
| 529 | - && ! isset( $wp->query_vars['page_id'] ) | |
| 530 | - && ! isset( $wp->query_vars['pagename'] ) | |
| 528 | + if (!isset($wp->query_vars['gd_is_geodir_page']) | |
| 529 | + && !isset($wp->query_vars['page_id']) | |
| 530 | + && !isset($wp->query_vars['pagename']) | |
| 531 | 531 | && is_page_geodir_home() | 
| 532 | 532 |  		) {
 | 
| 533 | 533 | $wp->query_vars['gd_is_geodir_page'] = true; | 
| @@ -551,14 +551,14 @@ discard block | ||
| 551 | 551 | */ | 
| 552 | 552 |  function geodir_is_geodir_page() {
 | 
| 553 | 553 | global $wp; | 
| 554 | -	if ( isset( $wp->query_vars['gd_is_geodir_page'] ) && $wp->query_vars['gd_is_geodir_page'] ) {
 | |
| 554 | +	if (isset($wp->query_vars['gd_is_geodir_page']) && $wp->query_vars['gd_is_geodir_page']) {
 | |
| 555 | 555 | return true; | 
| 556 | 556 |  	} else {
 | 
| 557 | 557 | return false; | 
| 558 | 558 | } | 
| 559 | 559 | } | 
| 560 | 560 | |
| 561 | -if ( ! function_exists( 'geodir_get_imagesize' ) ) {
 | |
| 561 | +if (!function_exists('geodir_get_imagesize')) {
 | |
| 562 | 562 | /** | 
| 563 | 563 | * Get image size using the size key . | 
| 564 | 564 | * | 
| @@ -569,13 +569,13 @@ discard block | ||
| 569 | 569 | * | 
| 570 | 570 | * @return array|mixed|void|WP_Error If valid returns image size. Else returns error. | 
| 571 | 571 | */ | 
| 572 | -	function geodir_get_imagesize( $size = '' ) {
 | |
| 572 | +	function geodir_get_imagesize($size = '') {
 | |
| 573 | 573 | |
| 574 | 574 | $imagesizes = array( | 
| 575 | - 'list-thumb' => array( 'w' => 283, 'h' => 188 ), | |
| 576 | - 'thumbnail' => array( 'w' => 125, 'h' => 125 ), | |
| 577 | - 'widget-thumb' => array( 'w' => 50, 'h' => 50 ), | |
| 578 | - 'slider-thumb' => array( 'w' => 100, 'h' => 100 ) | |
| 575 | +			'list-thumb'   => array('w' => 283, 'h' => 188),
 | |
| 576 | +			'thumbnail'    => array('w' => 125, 'h' => 125),
 | |
| 577 | +			'widget-thumb' => array('w' => 50, 'h' => 50),
 | |
| 578 | +			'slider-thumb' => array('w' => 100, 'h' => 100)
 | |
| 579 | 579 | ); | 
| 580 | 580 | |
| 581 | 581 | /** | 
| @@ -585,9 +585,9 @@ discard block | ||
| 585 | 585 | * | 
| 586 | 586 | * @param array $imagesizes Image size array. | 
| 587 | 587 | */ | 
| 588 | - $imagesizes = apply_filters( 'geodir_imagesizes', $imagesizes ); | |
| 588 | +		$imagesizes = apply_filters('geodir_imagesizes', $imagesizes);
 | |
| 589 | 589 | |
| 590 | -		if ( ! empty( $size ) && array_key_exists( $size, $imagesizes ) ) {
 | |
| 590 | +		if (!empty($size) && array_key_exists($size, $imagesizes)) {
 | |
| 591 | 591 | /** | 
| 592 | 592 | * Filters image size of the passed key. | 
| 593 | 593 | * | 
| @@ -595,11 +595,11 @@ discard block | ||
| 595 | 595 | * | 
| 596 | 596 | * @param array $imagesizes [$size] Image size array of the passed key. | 
| 597 | 597 | */ | 
| 598 | - return apply_filters( 'geodir_get_imagesize_' . $size, $imagesizes[ $size ] ); | |
| 598 | +			return apply_filters('geodir_get_imagesize_'.$size, $imagesizes[$size]);
 | |
| 599 | 599 | |
| 600 | -		} elseif ( ! empty( $size ) ) {
 | |
| 600 | +		} elseif (!empty($size)) {
 | |
| 601 | 601 | |
| 602 | - return new WP_Error( 'geodir_no_imagesize', __( "Given image size is not valid", 'geodirectory' ) ); | |
| 602 | +			return new WP_Error('geodir_no_imagesize', __("Given image size is not valid", 'geodirectory'));
 | |
| 603 | 603 | |
| 604 | 604 | } | 
| 605 | 605 | |
| @@ -623,7 +623,7 @@ discard block | ||
| 623 | 623 | */ | 
| 624 | 624 | |
| 625 | 625 | |
| 626 | -if ( ! function_exists( 'createRandomString' ) ) {
 | |
| 626 | +if (!function_exists('createRandomString')) {
 | |
| 627 | 627 | /** | 
| 628 | 628 | * Creates random string. | 
| 629 | 629 | * | 
| @@ -633,21 +633,21 @@ discard block | ||
| 633 | 633 | */ | 
| 634 | 634 |  	function createRandomString() {
 | 
| 635 | 635 | $chars = "abcdefghijkmlnopqrstuvwxyz1023456789"; | 
| 636 | - srand( (double) microtime() * 1000000 ); | |
| 636 | + srand((double) microtime() * 1000000); | |
| 637 | 637 | $i = 0; | 
| 638 | 638 | $rstring = ''; | 
| 639 | -		while ( $i <= 25 ) {
 | |
| 639 | +		while ($i <= 25) {
 | |
| 640 | 640 | $num = rand() % 33; | 
| 641 | - $tmp = substr( $chars, $num, 1 ); | |
| 642 | - $rstring = $rstring . $tmp; | |
| 643 | - $i ++; | |
| 641 | + $tmp = substr($chars, $num, 1); | |
| 642 | + $rstring = $rstring.$tmp; | |
| 643 | + $i++; | |
| 644 | 644 | } | 
| 645 | 645 | |
| 646 | 646 | return $rstring; | 
| 647 | 647 | } | 
| 648 | 648 | } | 
| 649 | 649 | |
| 650 | -if ( ! function_exists( 'geodir_getDistanceRadius' ) ) {
 | |
| 650 | +if (!function_exists('geodir_getDistanceRadius')) {
 | |
| 651 | 651 | /** | 
| 652 | 652 | * Calculates the distance radius. | 
| 653 | 653 | * | 
| @@ -658,9 +658,9 @@ discard block | ||
| 658 | 658 | * | 
| 659 | 659 | * @return float The mean radius. | 
| 660 | 660 | */ | 
| 661 | -	function geodir_getDistanceRadius( $uom = 'km' ) {
 | |
| 661 | +	function geodir_getDistanceRadius($uom = 'km') {
 | |
| 662 | 662 | // Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude | 
| 663 | - switch ( geodir_strtolower( $uom ) ): | |
| 663 | + switch (geodir_strtolower($uom)): | |
| 664 | 664 | case 'km' : | 
| 665 | 665 | $earthMeanRadius = 6371.009; // km | 
| 666 | 666 | break; | 
| @@ -692,7 +692,7 @@ discard block | ||
| 692 | 692 | } | 
| 693 | 693 | |
| 694 | 694 | |
| 695 | -if ( ! function_exists( 'geodir_calculateDistanceFromLatLong' ) ) {
 | |
| 695 | +if (!function_exists('geodir_calculateDistanceFromLatLong')) {
 | |
| 696 | 696 | /** | 
| 697 | 697 | * Calculate the great circle distance between two points identified by longitude and latitude. | 
| 698 | 698 | * | 
| @@ -705,17 +705,17 @@ discard block | ||
| 705 | 705 | * | 
| 706 | 706 | * @return float The distance. | 
| 707 | 707 | */ | 
| 708 | -	function geodir_calculateDistanceFromLatLong( $point1, $point2, $uom = 'km' ) {
 | |
| 708 | +	function geodir_calculateDistanceFromLatLong($point1, $point2, $uom = 'km') {
 | |
| 709 | 709 | // Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude | 
| 710 | 710 | |
| 711 | - $earthMeanRadius = geodir_getDistanceRadius( $uom ); | |
| 711 | + $earthMeanRadius = geodir_getDistanceRadius($uom); | |
| 712 | 712 | |
| 713 | - $deltaLatitude = deg2rad( (float) $point2['latitude'] - (float) $point1['latitude'] ); | |
| 714 | - $deltaLongitude = deg2rad( (float) $point2['longitude'] - (float) $point1['longitude'] ); | |
| 715 | - $a = sin( $deltaLatitude / 2 ) * sin( $deltaLatitude / 2 ) + | |
| 716 | - cos( deg2rad( (float) $point1['latitude'] ) ) * cos( deg2rad( (float) $point2['latitude'] ) ) * | |
| 717 | - sin( $deltaLongitude / 2 ) * sin( $deltaLongitude / 2 ); | |
| 718 | - $c = 2 * atan2( sqrt( $a ), sqrt( 1 - $a ) ); | |
| 713 | + $deltaLatitude = deg2rad((float) $point2['latitude'] - (float) $point1['latitude']); | |
| 714 | + $deltaLongitude = deg2rad((float) $point2['longitude'] - (float) $point1['longitude']); | |
| 715 | + $a = sin($deltaLatitude / 2) * sin($deltaLatitude / 2) + | |
| 716 | + cos(deg2rad((float) $point1['latitude'])) * cos(deg2rad((float) $point2['latitude'])) * | |
| 717 | + sin($deltaLongitude / 2) * sin($deltaLongitude / 2); | |
| 718 | + $c = 2 * atan2(sqrt($a), sqrt(1 - $a)); | |
| 719 | 719 | $distance = $earthMeanRadius * $c; | 
| 720 | 720 | |
| 721 | 721 | return $distance; | 
| @@ -724,7 +724,7 @@ discard block | ||
| 724 | 724 | } | 
| 725 | 725 | |
| 726 | 726 | |
| 727 | -if ( ! function_exists( 'geodir_sendEmail' ) ) {
 | |
| 727 | +if (!function_exists('geodir_sendEmail')) {
 | |
| 728 | 728 | /** | 
| 729 | 729 | * The main function that send transactional emails using the args provided. | 
| 730 | 730 | * | 
| @@ -743,93 +743,93 @@ discard block | ||
| 743 | 743 | * @param string $post_id The post ID. | 
| 744 | 744 | * @param string $user_id The user ID. | 
| 745 | 745 | */ | 
| 746 | -	function geodir_sendEmail( $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '' ) {
 | |
| 746 | +	function geodir_sendEmail($fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '') {
 | |
| 747 | 747 | $login_details = ''; | 
| 748 | 748 | |
| 749 | 749 | // strip slashes from subject & message text | 
| 750 | - $to_subject = stripslashes_deep( $to_subject ); | |
| 751 | - $to_message = stripslashes_deep( $to_message ); | |
| 750 | + $to_subject = stripslashes_deep($to_subject); | |
| 751 | + $to_message = stripslashes_deep($to_message); | |
| 752 | 752 | |
| 753 | -		if ( $message_type == 'send_friend' ) {
 | |
| 754 | - $subject = get_option( 'geodir_email_friend_subject' ); | |
| 755 | - $message = get_option( 'geodir_email_friend_content' ); | |
| 756 | -		} elseif ( $message_type == 'send_enquiry' ) {
 | |
| 757 | - $subject = get_option( 'geodir_email_enquiry_subject' ); | |
| 758 | - $message = get_option( 'geodir_email_enquiry_content' ); | |
| 753 | +		if ($message_type == 'send_friend') {
 | |
| 754 | +			$subject = get_option('geodir_email_friend_subject');
 | |
| 755 | +			$message = get_option('geodir_email_friend_content');
 | |
| 756 | +		} elseif ($message_type == 'send_enquiry') {
 | |
| 757 | +			$subject = get_option('geodir_email_enquiry_subject');
 | |
| 758 | +			$message = get_option('geodir_email_enquiry_content');
 | |
| 759 | 759 | |
| 760 | 760 | // change to name in some cases | 
| 761 | - $post_author = get_post_field( 'post_author', $post_id ); | |
| 762 | -			if(is_super_admin( $post_author  )){// if admin probably not the post author so change name
 | |
| 763 | -				$toEmailName = __('Business Owner','geodirectory');
 | |
| 764 | -			}elseif(defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id,'claimed')!='1'){// if claim manager installed but listing not claimed
 | |
| 765 | -				$toEmailName = __('Business Owner','geodirectory');
 | |
| 761 | +			$post_author = get_post_field('post_author', $post_id);
 | |
| 762 | +			if (is_super_admin($post_author)) {// if admin probably not the post author so change name
 | |
| 763 | +				$toEmailName = __('Business Owner', 'geodirectory');
 | |
| 764 | +			}elseif (defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id, 'claimed') != '1') {// if claim manager installed but listing not claimed
 | |
| 765 | +				$toEmailName = __('Business Owner', 'geodirectory');
 | |
| 766 | 766 | } | 
| 767 | 767 | |
| 768 | 768 | |
| 769 | -		} elseif ( $message_type == 'forgot_password' ) {
 | |
| 770 | - $subject = get_option( 'geodir_forgot_password_subject' ); | |
| 771 | - $message = get_option( 'geodir_forgot_password_content' ); | |
| 769 | +		} elseif ($message_type == 'forgot_password') {
 | |
| 770 | +			$subject       = get_option('geodir_forgot_password_subject');
 | |
| 771 | +			$message       = get_option('geodir_forgot_password_content');
 | |
| 772 | 772 | $login_details = $to_message; | 
| 773 | -		} elseif ( $message_type == 'registration' ) {
 | |
| 774 | - $subject = get_option( 'geodir_registration_success_email_subject' ); | |
| 775 | - $message = get_option( 'geodir_registration_success_email_content' ); | |
| 773 | +		} elseif ($message_type == 'registration') {
 | |
| 774 | +			$subject       = get_option('geodir_registration_success_email_subject');
 | |
| 775 | +			$message       = get_option('geodir_registration_success_email_content');
 | |
| 776 | 776 | $login_details = $to_message; | 
| 777 | -		} elseif ( $message_type == 'post_submit' ) {
 | |
| 778 | - $subject = get_option( 'geodir_post_submited_success_email_subject' ); | |
| 779 | - $message = get_option( 'geodir_post_submited_success_email_content' ); | |
| 780 | -		} elseif ( $message_type == 'listing_published' ) {
 | |
| 781 | - $subject = get_option( 'geodir_post_published_email_subject' ); | |
| 782 | - $message = get_option( 'geodir_post_published_email_content' ); | |
| 783 | -		} elseif ( $message_type == 'listing_edited' ) {
 | |
| 784 | - $subject = get_option( 'geodir_post_edited_email_subject_admin' ); | |
| 785 | - $message = get_option( 'geodir_post_edited_email_content_admin' ); | |
| 777 | +		} elseif ($message_type == 'post_submit') {
 | |
| 778 | +			$subject = get_option('geodir_post_submited_success_email_subject');
 | |
| 779 | +			$message = get_option('geodir_post_submited_success_email_content');
 | |
| 780 | +		} elseif ($message_type == 'listing_published') {
 | |
| 781 | +			$subject = get_option('geodir_post_published_email_subject');
 | |
| 782 | +			$message = get_option('geodir_post_published_email_content');
 | |
| 783 | +		} elseif ($message_type == 'listing_edited') {
 | |
| 784 | +			$subject = get_option('geodir_post_edited_email_subject_admin');
 | |
| 785 | +			$message = get_option('geodir_post_edited_email_content_admin');
 | |
| 786 | 786 | } | 
| 787 | 787 | |
| 788 | -		if ( ! empty( $subject ) ) {
 | |
| 789 | - $subject = __( stripslashes_deep( $subject ), 'geodirectory' ); | |
| 788 | +		if (!empty($subject)) {
 | |
| 789 | + $subject = __(stripslashes_deep($subject), 'geodirectory'); | |
| 790 | 790 | } | 
| 791 | 791 | |
| 792 | -		if ( ! empty( $message ) ) {
 | |
| 793 | - $message = __( stripslashes_deep( $message ), 'geodirectory' ); | |
| 792 | +		if (!empty($message)) {
 | |
| 793 | + $message = __(stripslashes_deep($message), 'geodirectory'); | |
| 794 | 794 | } | 
| 795 | 795 | |
| 796 | - $to_message = nl2br( $to_message ); | |
| 797 | - $sitefromEmail = get_option( 'site_email' ); | |
| 796 | + $to_message = nl2br($to_message); | |
| 797 | +		$sitefromEmail     = get_option('site_email');
 | |
| 798 | 798 | $sitefromEmailName = get_site_emailName(); | 
| 799 | - $productlink = get_permalink( $post_id ); | |
| 799 | + $productlink = get_permalink($post_id); | |
| 800 | 800 | |
| 801 | 801 | $user_login = ''; | 
| 802 | -		if ( $user_id > 0 && $user_info = get_userdata( $user_id ) ) {
 | |
| 802 | +		if ($user_id > 0 && $user_info = get_userdata($user_id)) {
 | |
| 803 | 803 | $user_login = $user_info->user_login; | 
| 804 | 804 | } | 
| 805 | 805 | |
| 806 | 806 | $posted_date = ''; | 
| 807 | 807 | $listingLink = ''; | 
| 808 | 808 | |
| 809 | - $post_info = get_post( $post_id ); | |
| 809 | + $post_info = get_post($post_id); | |
| 810 | 810 | |
| 811 | -		if ( $post_info ) {
 | |
| 811 | +		if ($post_info) {
 | |
| 812 | 812 | $posted_date = $post_info->post_date; | 
| 813 | - $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>'; | |
| 813 | + $listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>'; | |
| 814 | 814 | } | 
| 815 | 815 | $siteurl = home_url(); | 
| 816 | - $siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>'; | |
| 816 | + $siteurl_link = '<a href="'.$siteurl.'">'.$siteurl.'</a>'; | |
| 817 | 817 | $loginurl = geodir_login_url(); | 
| 818 | - $loginurl_link = '<a href="' . $loginurl . '">login</a>'; | |
| 818 | + $loginurl_link = '<a href="'.$loginurl.'">login</a>'; | |
| 819 | 819 | |
| 820 | - $post_author_id = ! empty( $post_info ) ? $post_info->post_author : 0; | |
| 821 | - $post_author_name = geodir_get_client_name( $post_author_id ); | |
| 822 | - $current_date = date_i18n( 'Y-m-d H:i:s', current_time( 'timestamp' ) ); | |
| 820 | + $post_author_id = !empty($post_info) ? $post_info->post_author : 0; | |
| 821 | + $post_author_name = geodir_get_client_name($post_author_id); | |
| 822 | +		$current_date     = date_i18n('Y-m-d H:i:s', current_time('timestamp'));
 | |
| 823 | 823 | |
| 824 | -		if ( $fromEmail == '' ) {
 | |
| 825 | - $fromEmail = get_option( 'site_email' ); | |
| 824 | +		if ($fromEmail == '') {
 | |
| 825 | +			$fromEmail = get_option('site_email');
 | |
| 826 | 826 | } | 
| 827 | 827 | |
| 828 | -		if ( $fromEmailName == '' ) {
 | |
| 829 | - $fromEmailName = get_option( 'site_email_name' ); | |
| 828 | +		if ($fromEmailName == '') {
 | |
| 829 | +			$fromEmailName = get_option('site_email_name');
 | |
| 830 | 830 | } | 
| 831 | 831 | |
| 832 | - $search_array = array( | |
| 832 | + $search_array = array( | |
| 833 | 833 | '[#listing_link#]', | 
| 834 | 834 | '[#site_name_url#]', | 
| 835 | 835 | '[#post_id#]', | 
| @@ -869,7 +869,7 @@ discard block | ||
| 869 | 869 | $post_author_name, | 
| 870 | 870 | $current_date | 
| 871 | 871 | ); | 
| 872 | - $message = str_replace( $search_array, $replace_array, $message ); | |
| 872 | + $message = str_replace($search_array, $replace_array, $message); | |
| 873 | 873 | |
| 874 | 874 | $search_array = array( | 
| 875 | 875 | '[#listing_link#]', | 
| @@ -905,12 +905,12 @@ discard block | ||
| 905 | 905 | $post_author_name, | 
| 906 | 906 | $current_date | 
| 907 | 907 | ); | 
| 908 | - $subject = str_replace( $search_array, $replace_array, $subject ); | |
| 908 | + $subject = str_replace($search_array, $replace_array, $subject); | |
| 909 | 909 | |
| 910 | - $headers = array(); | |
| 910 | + $headers = array(); | |
| 911 | 911 | $headers[] = 'Content-type: text/html; charset=UTF-8'; | 
| 912 | - $headers[] = "Reply-To: " . $fromEmail; | |
| 913 | - $headers[] = 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>'; | |
| 912 | + $headers[] = "Reply-To: ".$fromEmail; | |
| 913 | + $headers[] = 'From: '.$sitefromEmailName.' <'.$sitefromEmail.'>'; | |
| 914 | 914 | |
| 915 | 915 | $to = $toEmail; | 
| 916 | 916 | |
| @@ -932,7 +932,7 @@ discard block | ||
| 932 | 932 | * @param string $post_id The post ID. | 
| 933 | 933 | * @param string $user_id The user ID. | 
| 934 | 934 | */ | 
| 935 | - $to = apply_filters( 'geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); | |
| 935 | +		$to = apply_filters('geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
 | |
| 936 | 936 | /** | 
| 937 | 937 | * Filter the client email subject. | 
| 938 | 938 | * | 
| @@ -951,7 +951,7 @@ discard block | ||
| 951 | 951 | * @param string $post_id The post ID. | 
| 952 | 952 | * @param string $user_id The user ID. | 
| 953 | 953 | */ | 
| 954 | - $subject = apply_filters( 'geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); | |
| 954 | +		$subject = apply_filters('geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
 | |
| 955 | 955 | /** | 
| 956 | 956 | * Filter the client email message. | 
| 957 | 957 | * | 
| @@ -970,7 +970,7 @@ discard block | ||
| 970 | 970 | * @param string $post_id The post ID. | 
| 971 | 971 | * @param string $user_id The user ID. | 
| 972 | 972 | */ | 
| 973 | - $message = apply_filters( 'geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); | |
| 973 | +		$message = apply_filters('geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
 | |
| 974 | 974 | /** | 
| 975 | 975 | * Filter the client email headers. | 
| 976 | 976 | * | 
| @@ -989,39 +989,39 @@ discard block | ||
| 989 | 989 | * @param string $post_id The post ID. | 
| 990 | 990 | * @param string $user_id The user ID. | 
| 991 | 991 | */ | 
| 992 | - $headers = apply_filters( 'geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); | |
| 992 | +		$headers = apply_filters('geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
 | |
| 993 | 993 | |
| 994 | - $sent = wp_mail( $to, $subject, $message, $headers ); | |
| 994 | + $sent = wp_mail($to, $subject, $message, $headers); | |
| 995 | 995 | |
| 996 | -		if ( ! $sent ) {
 | |
| 997 | -			if ( is_array( $to ) ) {
 | |
| 998 | - $to = implode( ',', $to ); | |
| 996 | +		if (!$sent) {
 | |
| 997 | +			if (is_array($to)) {
 | |
| 998 | +				$to = implode(',', $to);
 | |
| 999 | 999 | } | 
| 1000 | 1000 | $log_message = sprintf( | 
| 1001 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), | |
| 1001 | +				__("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
 | |
| 1002 | 1002 | $message_type, | 
| 1003 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), | |
| 1003 | +				date_i18n('F j Y H:i:s', current_time('timestamp')),
 | |
| 1004 | 1004 | $to, | 
| 1005 | 1005 | $subject | 
| 1006 | 1006 | ); | 
| 1007 | - geodir_error_log( $log_message ); | |
| 1007 | + geodir_error_log($log_message); | |
| 1008 | 1008 | } | 
| 1009 | 1009 | |
| 1010 | 1010 | ///////// ADMIN BCC EMIALS | 
| 1011 | - $adminEmail = get_bloginfo( 'admin_email' ); | |
| 1011 | +		$adminEmail = get_bloginfo('admin_email');
 | |
| 1012 | 1012 | $to = $adminEmail; | 
| 1013 | 1013 | |
| 1014 | 1014 | $admin_bcc = false; | 
| 1015 | -		if ( $message_type == 'registration' ) {
 | |
| 1016 | - $message_raw = explode( __( "Password:", 'geodirectory' ), $message ); | |
| 1017 | - $message_raw2 = explode( "</p>", $message_raw[1], 2 ); | |
| 1018 | - $message = $message_raw[0] . __( 'Password:', 'geodirectory' ) . ' **********</p>' . $message_raw2[1]; | |
| 1015 | +		if ($message_type == 'registration') {
 | |
| 1016 | +			$message_raw  = explode(__("Password:", 'geodirectory'), $message);
 | |
| 1017 | +			$message_raw2 = explode("</p>", $message_raw[1], 2);
 | |
| 1018 | +			$message      = $message_raw[0].__('Password:', 'geodirectory').' **********</p>'.$message_raw2[1];
 | |
| 1019 | 1019 | } | 
| 1020 | -		if ( $message_type == 'post_submit' ) {
 | |
| 1021 | - $subject = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_subject_admin' ) ), 'geodirectory' ); | |
| 1022 | - $message = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_content_admin' ) ), 'geodirectory' ); | |
| 1020 | +		if ($message_type == 'post_submit') {
 | |
| 1021 | +			$subject = __(stripslashes_deep(get_option('geodir_post_submited_success_email_subject_admin')), 'geodirectory');
 | |
| 1022 | +			$message = __(stripslashes_deep(get_option('geodir_post_submited_success_email_content_admin')), 'geodirectory');
 | |
| 1023 | 1023 | |
| 1024 | - $search_array = array( | |
| 1024 | + $search_array = array( | |
| 1025 | 1025 | '[#listing_link#]', | 
| 1026 | 1026 | '[#site_name_url#]', | 
| 1027 | 1027 | '[#post_id#]', | 
| @@ -1053,7 +1053,7 @@ discard block | ||
| 1053 | 1053 | $user_login, | 
| 1054 | 1054 | $user_login | 
| 1055 | 1055 | ); | 
| 1056 | - $message = str_replace( $search_array, $replace_array, $message ); | |
| 1056 | + $message = str_replace($search_array, $replace_array, $message); | |
| 1057 | 1057 | |
| 1058 | 1058 | $search_array = array( | 
| 1059 | 1059 | '[#listing_link#]', | 
| @@ -1081,26 +1081,26 @@ discard block | ||
| 1081 | 1081 | $user_login, | 
| 1082 | 1082 | $user_login | 
| 1083 | 1083 | ); | 
| 1084 | - $subject = str_replace( $search_array, $replace_array, $subject ); | |
| 1084 | + $subject = str_replace($search_array, $replace_array, $subject); | |
| 1085 | 1085 | |
| 1086 | 1086 | $subject .= ' - ADMIN BCC COPY'; | 
| 1087 | 1087 | $admin_bcc = true; | 
| 1088 | 1088 | |
| 1089 | -		} elseif ( $message_type == 'registration' && get_option( 'geodir_bcc_new_user' ) ) {
 | |
| 1089 | +		} elseif ($message_type == 'registration' && get_option('geodir_bcc_new_user')) {
 | |
| 1090 | 1090 | $subject .= ' - ADMIN BCC COPY'; | 
| 1091 | 1091 | $admin_bcc = true; | 
| 1092 | -		} elseif ( $message_type == 'send_friend' && get_option( 'geodir_bcc_friend' ) ) {
 | |
| 1092 | +		} elseif ($message_type == 'send_friend' && get_option('geodir_bcc_friend')) {
 | |
| 1093 | 1093 | $subject .= ' - ADMIN BCC COPY'; | 
| 1094 | 1094 | $admin_bcc = true; | 
| 1095 | -		} elseif ( $message_type == 'send_enquiry' && get_option( 'geodir_bcc_enquiry' ) ) {
 | |
| 1095 | +		} elseif ($message_type == 'send_enquiry' && get_option('geodir_bcc_enquiry')) {
 | |
| 1096 | 1096 | $subject .= ' - ADMIN BCC COPY'; | 
| 1097 | 1097 | $admin_bcc = true; | 
| 1098 | -		} elseif ( $message_type == 'listing_published' && get_option( 'geodir_bcc_listing_published' ) ) {
 | |
| 1098 | +		} elseif ($message_type == 'listing_published' && get_option('geodir_bcc_listing_published')) {
 | |
| 1099 | 1099 | $subject .= ' - ADMIN BCC COPY'; | 
| 1100 | 1100 | $admin_bcc = true; | 
| 1101 | 1101 | } | 
| 1102 | 1102 | |
| 1103 | -		if ( $admin_bcc === true ) {
 | |
| 1103 | +		if ($admin_bcc === true) {
 | |
| 1104 | 1104 | |
| 1105 | 1105 | /** | 
| 1106 | 1106 | * Filter the client email subject. | 
| @@ -1120,7 +1120,7 @@ discard block | ||
| 1120 | 1120 | * @param string $post_id The post ID. | 
| 1121 | 1121 | * @param string $user_id The user ID. | 
| 1122 | 1122 | */ | 
| 1123 | - $subject = apply_filters( 'geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); | |
| 1123 | +			$subject = apply_filters('geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
 | |
| 1124 | 1124 | /** | 
| 1125 | 1125 | * Filter the client email message. | 
| 1126 | 1126 | * | 
| @@ -1139,23 +1139,23 @@ discard block | ||
| 1139 | 1139 | * @param string $post_id The post ID. | 
| 1140 | 1140 | * @param string $user_id The user ID. | 
| 1141 | 1141 | */ | 
| 1142 | - $message = apply_filters( 'geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); | |
| 1142 | +			$message = apply_filters('geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
 | |
| 1143 | 1143 | |
| 1144 | 1144 | |
| 1145 | - $sent = wp_mail( $to, $subject, $message, $headers ); | |
| 1145 | + $sent = wp_mail($to, $subject, $message, $headers); | |
| 1146 | 1146 | |
| 1147 | -			if ( ! $sent ) {
 | |
| 1148 | -				if ( is_array( $to ) ) {
 | |
| 1149 | - $to = implode( ',', $to ); | |
| 1147 | +			if (!$sent) {
 | |
| 1148 | +				if (is_array($to)) {
 | |
| 1149 | +					$to = implode(',', $to);
 | |
| 1150 | 1150 | } | 
| 1151 | 1151 | $log_message = sprintf( | 
| 1152 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), | |
| 1152 | +					__("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
 | |
| 1153 | 1153 | $message_type, | 
| 1154 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), | |
| 1154 | +					date_i18n('F j Y H:i:s', current_time('timestamp')),
 | |
| 1155 | 1155 | $to, | 
| 1156 | 1156 | $subject | 
| 1157 | 1157 | ); | 
| 1158 | - geodir_error_log( $log_message ); | |
| 1158 | + geodir_error_log($log_message); | |
| 1159 | 1159 | } | 
| 1160 | 1160 | } | 
| 1161 | 1161 | |
| @@ -1171,52 +1171,52 @@ discard block | ||
| 1171 | 1171 | */ | 
| 1172 | 1172 |  function geodir_taxonomy_breadcrumb() {
 | 
| 1173 | 1173 | |
| 1174 | - $term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) ); | |
| 1174 | +	$term   = get_term_by('slug', get_query_var('term'), get_query_var('taxonomy'));
 | |
| 1175 | 1175 | $parent = $term->parent; | 
| 1176 | 1176 | |
| 1177 | - while ( $parent ): | |
| 1177 | + while ($parent): | |
| 1178 | 1178 | $parents[] = $parent; | 
| 1179 | - $new_parent = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); | |
| 1179 | +		$new_parent = get_term_by('id', $parent, get_query_var('taxonomy'));
 | |
| 1180 | 1180 | $parent = $new_parent->parent; | 
| 1181 | 1181 | endwhile; | 
| 1182 | 1182 | |
| 1183 | - if ( ! empty( $parents ) ): | |
| 1184 | - $parents = array_reverse( $parents ); | |
| 1183 | + if (!empty($parents)): | |
| 1184 | + $parents = array_reverse($parents); | |
| 1185 | 1185 | |
| 1186 | - foreach ( $parents as $parent ): | |
| 1187 | - $item = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); | |
| 1188 | - $url = get_term_link( $item, get_query_var( 'taxonomy' ) ); | |
| 1189 | - echo '<li> > <a href="' . $url . '">' . $item->name . '</a></li>'; | |
| 1186 | + foreach ($parents as $parent): | |
| 1187 | +			$item = get_term_by('id', $parent, get_query_var('taxonomy'));
 | |
| 1188 | +			$url  = get_term_link($item, get_query_var('taxonomy'));
 | |
| 1189 | + echo '<li> > <a href="'.$url.'">'.$item->name.'</a></li>'; | |
| 1190 | 1190 | endforeach; | 
| 1191 | 1191 | |
| 1192 | 1192 | endif; | 
| 1193 | 1193 | |
| 1194 | - echo '<li> > ' . $term->name . '</li>'; | |
| 1194 | + echo '<li> > '.$term->name.'</li>'; | |
| 1195 | 1195 | } | 
| 1196 | 1196 | |
| 1197 | -function geodir_wpml_post_type_archive_link($link, $post_type){
 | |
| 1197 | +function geodir_wpml_post_type_archive_link($link, $post_type) {
 | |
| 1198 | 1198 | |
| 1199 | -	if(function_exists('icl_object_id')) {
 | |
| 1200 | - $post_types = get_option( 'geodir_post_types' ); | |
| 1201 | - $slug = $post_types[ $post_type ]['rewrite']['slug']; | |
| 1199 | +	if (function_exists('icl_object_id')) {
 | |
| 1200 | +		$post_types   = get_option('geodir_post_types');
 | |
| 1201 | + $slug = $post_types[$post_type]['rewrite']['slug']; | |
| 1202 | 1202 | |
| 1203 | 1203 | //echo $link.'###'.gd_wpml_get_lang_from_url( $link) ; | 
| 1204 | 1204 | |
| 1205 | 1205 | // Alter the CPT slug if WPML is set to do so | 
| 1206 | -		if ( function_exists( 'icl_object_id' ) ) {
 | |
| 1207 | -			if ( gd_wpml_slug_translation_turned_on( $post_type ) && $language_code = gd_wpml_get_lang_from_url( $link) ) {
 | |
| 1206 | +		if (function_exists('icl_object_id')) {
 | |
| 1207 | +			if (gd_wpml_slug_translation_turned_on($post_type) && $language_code = gd_wpml_get_lang_from_url($link)) {
 | |
| 1208 | 1208 | |
| 1209 | 1209 | $org_slug = $slug; | 
| 1210 | - $slug = apply_filters( 'wpml_translate_single_string', | |
| 1210 | +				$slug     = apply_filters('wpml_translate_single_string',
 | |
| 1211 | 1211 | $slug, | 
| 1212 | 1212 | 'WordPress', | 
| 1213 | - 'URL slug: ' . $slug, | |
| 1214 | - $language_code ); | |
| 1213 | + 'URL slug: '.$slug, | |
| 1214 | + $language_code); | |
| 1215 | 1215 | |
| 1216 | -				if ( ! $slug ) {
 | |
| 1216 | +				if (!$slug) {
 | |
| 1217 | 1217 | $slug = $org_slug; | 
| 1218 | 1218 |  				} else {
 | 
| 1219 | - $link = str_replace( $org_slug, $slug, $link ); | |
| 1219 | + $link = str_replace($org_slug, $slug, $link); | |
| 1220 | 1220 | } | 
| 1221 | 1221 | |
| 1222 | 1222 | } | 
| @@ -1248,9 +1248,9 @@ discard block | ||
| 1248 | 1248 | * | 
| 1249 | 1249 | * @since 1.0.0 | 
| 1250 | 1250 | */ | 
| 1251 | - $separator = apply_filters( 'geodir_breadcrumb_separator', ' > ' ); | |
| 1251 | +	$separator = apply_filters('geodir_breadcrumb_separator', ' > ');
 | |
| 1252 | 1252 | |
| 1253 | -	if ( ! geodir_is_page( 'home' ) ) {
 | |
| 1253 | +	if (!geodir_is_page('home')) {
 | |
| 1254 | 1254 | $breadcrumb = ''; | 
| 1255 | 1255 | $url_categoris = ''; | 
| 1256 | 1256 | $breadcrumb .= '<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">'; | 
| @@ -1259,167 +1259,167 @@ discard block | ||
| 1259 | 1259 | * | 
| 1260 | 1260 | * @since 1.0.0 | 
| 1261 | 1261 | */ | 
| 1262 | - $breadcrumb .= '<li>' . apply_filters( 'geodir_breadcrumb_first_link', '<a href="' . home_url() . '">' . __( 'Home', 'geodirectory' ) . '</a>' ) . '</li>'; | |
| 1262 | +		$breadcrumb .= '<li>'.apply_filters('geodir_breadcrumb_first_link', '<a href="'.home_url().'">'.__('Home', 'geodirectory').'</a>').'</li>';
 | |
| 1263 | 1263 | |
| 1264 | 1264 | $gd_post_type = geodir_get_current_posttype(); | 
| 1265 | - $post_type_info = get_post_type_object( $gd_post_type ); | |
| 1265 | + $post_type_info = get_post_type_object($gd_post_type); | |
| 1266 | 1266 | |
| 1267 | - remove_filter( 'post_type_archive_link', 'geodir_get_posttype_link' ); | |
| 1267 | +		remove_filter('post_type_archive_link', 'geodir_get_posttype_link');
 | |
| 1268 | 1268 | |
| 1269 | - $listing_link = get_post_type_archive_link( $gd_post_type ); | |
| 1269 | + $listing_link = get_post_type_archive_link($gd_post_type); | |
| 1270 | 1270 | |
| 1271 | - add_filter( 'post_type_archive_link', 'geodir_get_posttype_link', 10, 2 ); | |
| 1272 | - $listing_link = rtrim( $listing_link, '/' ); | |
| 1271 | +		add_filter('post_type_archive_link', 'geodir_get_posttype_link', 10, 2);
 | |
| 1272 | + $listing_link = rtrim($listing_link, '/'); | |
| 1273 | 1273 | $listing_link .= '/'; | 
| 1274 | 1274 | |
| 1275 | 1275 | $post_type_for_location_link = $listing_link; | 
| 1276 | - $location_terms = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); | |
| 1276 | +		$location_terms              = geodir_get_current_location_terms('query_vars', $gd_post_type);
 | |
| 1277 | 1277 | |
| 1278 | 1278 | global $wp, $gd_session; | 
| 1279 | 1279 | $location_link = $post_type_for_location_link; | 
| 1280 | 1280 | |
| 1281 | -		if ( geodir_is_page( 'detail' ) || geodir_is_page( 'listing' ) ) {
 | |
| 1281 | +		if (geodir_is_page('detail') || geodir_is_page('listing')) {
 | |
| 1282 | 1282 | global $post; | 
| 1283 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; | |
| 1284 | - $neighbourhood_active = $location_manager && get_option( 'location_neighbourhoods' ) ? true : false; | |
| 1283 | +			$location_manager     = defined('POST_LOCATION_TABLE') ? true : false;
 | |
| 1284 | +			$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
 | |
| 1285 | 1285 | |
| 1286 | -			if ( geodir_is_page( 'detail' ) && isset( $post->country_slug ) ) {
 | |
| 1286 | +			if (geodir_is_page('detail') && isset($post->country_slug)) {
 | |
| 1287 | 1287 | $location_terms = array( | 
| 1288 | 1288 | 'gd_country' => $post->country_slug, | 
| 1289 | 1289 | 'gd_region' => $post->region_slug, | 
| 1290 | 1290 | 'gd_city' => $post->city_slug | 
| 1291 | 1291 | ); | 
| 1292 | 1292 | |
| 1293 | -				if ( $neighbourhood_active && ! empty( $location_terms['gd_city'] ) && $gd_ses_neighbourhood = $gd_session->get( 'gd_neighbourhood' ) ) {
 | |
| 1293 | +				if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
 | |
| 1294 | 1294 | $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; | 
| 1295 | 1295 | } | 
| 1296 | 1296 | } | 
| 1297 | 1297 | |
| 1298 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); | |
| 1298 | +			$geodir_show_location_url = get_option('geodir_show_location_url');
 | |
| 1299 | 1299 | |
| 1300 | 1300 | $hide_url_part = array(); | 
| 1301 | -			if ( $location_manager ) {
 | |
| 1302 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); | |
| 1303 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); | |
| 1304 | - | |
| 1305 | -				if ( $hide_region_part && $hide_country_part ) {
 | |
| 1306 | - $hide_url_part = array( 'gd_country', 'gd_region' ); | |
| 1307 | -				} else if ( $hide_region_part && ! $hide_country_part ) {
 | |
| 1308 | - $hide_url_part = array( 'gd_region' ); | |
| 1309 | -				} else if ( ! $hide_region_part && $hide_country_part ) {
 | |
| 1310 | - $hide_url_part = array( 'gd_country' ); | |
| 1301 | +			if ($location_manager) {
 | |
| 1302 | +				$hide_country_part = get_option('geodir_location_hide_country_part');
 | |
| 1303 | +				$hide_region_part  = get_option('geodir_location_hide_region_part');
 | |
| 1304 | + | |
| 1305 | +				if ($hide_region_part && $hide_country_part) {
 | |
| 1306 | +					$hide_url_part = array('gd_country', 'gd_region');
 | |
| 1307 | +				} else if ($hide_region_part && !$hide_country_part) {
 | |
| 1308 | +					$hide_url_part = array('gd_region');
 | |
| 1309 | +				} else if (!$hide_region_part && $hide_country_part) {
 | |
| 1310 | +					$hide_url_part = array('gd_country');
 | |
| 1311 | 1311 | } | 
| 1312 | 1312 | } | 
| 1313 | 1313 | |
| 1314 | 1314 | $hide_text_part = array(); | 
| 1315 | -			if ( $geodir_show_location_url == 'country_city' ) {
 | |
| 1316 | - $hide_text_part = array( 'gd_region' ); | |
| 1315 | +			if ($geodir_show_location_url == 'country_city') {
 | |
| 1316 | +				$hide_text_part = array('gd_region');
 | |
| 1317 | 1317 | |
| 1318 | -				if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
 | |
| 1319 | - unset( $location_terms['gd_region'] ); | |
| 1318 | +				if (isset($location_terms['gd_region']) && !$location_manager) {
 | |
| 1319 | + unset($location_terms['gd_region']); | |
| 1320 | 1320 | } | 
| 1321 | -			} else if ( $geodir_show_location_url == 'region_city' ) {
 | |
| 1322 | - $hide_text_part = array( 'gd_country' ); | |
| 1321 | +			} else if ($geodir_show_location_url == 'region_city') {
 | |
| 1322 | +				$hide_text_part = array('gd_country');
 | |
| 1323 | 1323 | |
| 1324 | -				if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
 | |
| 1325 | - unset( $location_terms['gd_country'] ); | |
| 1324 | +				if (isset($location_terms['gd_country']) && !$location_manager) {
 | |
| 1325 | + unset($location_terms['gd_country']); | |
| 1326 | 1326 | } | 
| 1327 | -			} else if ( $geodir_show_location_url == 'city' ) {
 | |
| 1328 | - $hide_text_part = array( 'gd_country', 'gd_region' ); | |
| 1327 | +			} else if ($geodir_show_location_url == 'city') {
 | |
| 1328 | +				$hide_text_part = array('gd_country', 'gd_region');
 | |
| 1329 | 1329 | |
| 1330 | -				if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
 | |
| 1331 | - unset( $location_terms['gd_country'] ); | |
| 1330 | +				if (isset($location_terms['gd_country']) && !$location_manager) {
 | |
| 1331 | + unset($location_terms['gd_country']); | |
| 1332 | 1332 | } | 
| 1333 | -				if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
 | |
| 1334 | - unset( $location_terms['gd_region'] ); | |
| 1333 | +				if (isset($location_terms['gd_region']) && !$location_manager) {
 | |
| 1334 | + unset($location_terms['gd_region']); | |
| 1335 | 1335 | } | 
| 1336 | 1336 | } | 
| 1337 | 1337 | |
| 1338 | 1338 | $is_location_last = ''; | 
| 1339 | 1339 | $is_taxonomy_last = ''; | 
| 1340 | 1340 | $breadcrumb .= '<li>'; | 
| 1341 | -			if ( get_query_var( $gd_post_type . 'category' ) ) {
 | |
| 1342 | - $gd_taxonomy = $gd_post_type . 'category'; | |
| 1343 | -			} elseif ( get_query_var( $gd_post_type . '_tags' ) ) {
 | |
| 1344 | - $gd_taxonomy = $gd_post_type . '_tags'; | |
| 1341 | +			if (get_query_var($gd_post_type.'category')) {
 | |
| 1342 | + $gd_taxonomy = $gd_post_type.'category'; | |
| 1343 | +			} elseif (get_query_var($gd_post_type.'_tags')) {
 | |
| 1344 | + $gd_taxonomy = $gd_post_type.'_tags'; | |
| 1345 | 1345 | } | 
| 1346 | 1346 | |
| 1347 | - $breadcrumb .= $separator . '<a href="' . $listing_link . '">' . __( ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; | |
| 1348 | -			if ( ! empty( $gd_taxonomy ) || geodir_is_page( 'detail' ) ) {
 | |
| 1347 | + $breadcrumb .= $separator.'<a href="'.$listing_link.'">'.__(ucfirst($post_type_info->label), 'geodirectory').'</a>'; | |
| 1348 | +			if (!empty($gd_taxonomy) || geodir_is_page('detail')) {
 | |
| 1349 | 1349 | $is_location_last = false; | 
| 1350 | 1350 |  			} else {
 | 
| 1351 | 1351 | $is_location_last = true; | 
| 1352 | 1352 | } | 
| 1353 | 1353 | |
| 1354 | -			if ( ! empty( $gd_taxonomy ) && geodir_is_page( 'listing' ) ) {
 | |
| 1354 | +			if (!empty($gd_taxonomy) && geodir_is_page('listing')) {
 | |
| 1355 | 1355 | $is_taxonomy_last = true; | 
| 1356 | 1356 |  			} else {
 | 
| 1357 | 1357 | $is_taxonomy_last = false; | 
| 1358 | 1358 | } | 
| 1359 | 1359 | |
| 1360 | -			if ( ! empty( $location_terms ) ) {
 | |
| 1361 | - $geodir_get_locations = function_exists( 'get_actual_location_name' ) ? true : false; | |
| 1360 | +			if (!empty($location_terms)) {
 | |
| 1361 | +				$geodir_get_locations = function_exists('get_actual_location_name') ? true : false;
 | |
| 1362 | 1362 | |
| 1363 | -				foreach ( $location_terms as $key => $location_term ) {
 | |
| 1364 | -					if ( $location_term != '' ) {
 | |
| 1365 | -						if ( ! empty( $hide_url_part ) && in_array( $key, $hide_url_part ) ) { // Hide location part from url & breadcrumb.
 | |
| 1363 | +				foreach ($location_terms as $key => $location_term) {
 | |
| 1364 | +					if ($location_term != '') {
 | |
| 1365 | +						if (!empty($hide_url_part) && in_array($key, $hide_url_part)) { // Hide location part from url & breadcrumb.
 | |
| 1366 | 1366 | continue; | 
| 1367 | 1367 | } | 
| 1368 | 1368 | |
| 1369 | - $gd_location_link_text = preg_replace( '/-(\d+)$/', '', $location_term ); | |
| 1370 | - $gd_location_link_text = preg_replace( '/[_-]/', ' ', $gd_location_link_text ); | |
| 1371 | - $gd_location_link_text = ucfirst( $gd_location_link_text ); | |
| 1369 | +						$gd_location_link_text = preg_replace('/-(\d+)$/', '', $location_term);
 | |
| 1370 | +						$gd_location_link_text = preg_replace('/[_-]/', ' ', $gd_location_link_text);
 | |
| 1371 | + $gd_location_link_text = ucfirst($gd_location_link_text); | |
| 1372 | 1372 | |
| 1373 | 1373 | $location_term_actual_country = ''; | 
| 1374 | 1374 | $location_term_actual_region = ''; | 
| 1375 | 1375 | $location_term_actual_city = ''; | 
| 1376 | 1376 | $location_term_actual_neighbourhood = ''; | 
| 1377 | -						if ( $geodir_get_locations ) {
 | |
| 1378 | -							if ( $key == 'gd_country' ) {
 | |
| 1379 | - $location_term_actual_country = get_actual_location_name( 'country', $location_term, true ); | |
| 1380 | -							} else if ( $key == 'gd_region' ) {
 | |
| 1381 | - $location_term_actual_region = get_actual_location_name( 'region', $location_term, true ); | |
| 1382 | -							} else if ( $key == 'gd_city' ) {
 | |
| 1383 | - $location_term_actual_city = get_actual_location_name( 'city', $location_term, true ); | |
| 1384 | -							} else if ( $key == 'gd_neighbourhood' ) {
 | |
| 1385 | - $location_term_actual_neighbourhood = get_actual_location_name( 'neighbourhood', $location_term, true ); | |
| 1377 | +						if ($geodir_get_locations) {
 | |
| 1378 | +							if ($key == 'gd_country') {
 | |
| 1379 | +								$location_term_actual_country = get_actual_location_name('country', $location_term, true);
 | |
| 1380 | +							} else if ($key == 'gd_region') {
 | |
| 1381 | +								$location_term_actual_region = get_actual_location_name('region', $location_term, true);
 | |
| 1382 | +							} else if ($key == 'gd_city') {
 | |
| 1383 | +								$location_term_actual_city = get_actual_location_name('city', $location_term, true);
 | |
| 1384 | +							} else if ($key == 'gd_neighbourhood') {
 | |
| 1385 | +								$location_term_actual_neighbourhood = get_actual_location_name('neighbourhood', $location_term, true);
 | |
| 1386 | 1386 | } | 
| 1387 | 1387 |  						} else {
 | 
| 1388 | 1388 | $location_info = geodir_get_location(); | 
| 1389 | 1389 | |
| 1390 | -							if ( ! empty( $location_info ) && isset( $location_info->location_id ) ) {
 | |
| 1391 | -								if ( $key == 'gd_country' ) {
 | |
| 1392 | - $location_term_actual_country = __( $location_info->country, 'geodirectory' ); | |
| 1393 | -								} else if ( $key == 'gd_region' ) {
 | |
| 1394 | - $location_term_actual_region = __( $location_info->region, 'geodirectory' ); | |
| 1395 | -								} else if ( $key == 'gd_city' ) {
 | |
| 1396 | - $location_term_actual_city = __( $location_info->city, 'geodirectory' ); | |
| 1390 | +							if (!empty($location_info) && isset($location_info->location_id)) {
 | |
| 1391 | +								if ($key == 'gd_country') {
 | |
| 1392 | + $location_term_actual_country = __($location_info->country, 'geodirectory'); | |
| 1393 | +								} else if ($key == 'gd_region') {
 | |
| 1394 | + $location_term_actual_region = __($location_info->region, 'geodirectory'); | |
| 1395 | +								} else if ($key == 'gd_city') {
 | |
| 1396 | + $location_term_actual_city = __($location_info->city, 'geodirectory'); | |
| 1397 | 1397 | } | 
| 1398 | 1398 | } | 
| 1399 | 1399 | } | 
| 1400 | 1400 | |
| 1401 | -						if ( $is_location_last && $key == 'gd_country' && ! ( isset( $location_terms['gd_region'] ) && $location_terms['gd_region'] != '' ) && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {
 | |
| 1402 | - $breadcrumb .= $location_term_actual_country != '' ? $separator . $location_term_actual_country : $separator . $gd_location_link_text; | |
| 1403 | -						} else if ( $is_location_last && $key == 'gd_region' && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {
 | |
| 1404 | - $breadcrumb .= $location_term_actual_region != '' ? $separator . $location_term_actual_region : $separator . $gd_location_link_text; | |
| 1405 | -						} else if ( $is_location_last && $key == 'gd_city' && empty( $location_terms['gd_neighbourhood'] ) ) {
 | |
| 1406 | - $breadcrumb .= $location_term_actual_city != '' ? $separator . $location_term_actual_city : $separator . $gd_location_link_text; | |
| 1407 | -						} else if ( $is_location_last && $key == 'gd_neighbourhood' ) {
 | |
| 1408 | - $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator . $location_term_actual_neighbourhood : $separator . $gd_location_link_text; | |
| 1401 | +						if ($is_location_last && $key == 'gd_country' && !(isset($location_terms['gd_region']) && $location_terms['gd_region'] != '') && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {
 | |
| 1402 | + $breadcrumb .= $location_term_actual_country != '' ? $separator.$location_term_actual_country : $separator.$gd_location_link_text; | |
| 1403 | +						} else if ($is_location_last && $key == 'gd_region' && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {
 | |
| 1404 | + $breadcrumb .= $location_term_actual_region != '' ? $separator.$location_term_actual_region : $separator.$gd_location_link_text; | |
| 1405 | +						} else if ($is_location_last && $key == 'gd_city' && empty($location_terms['gd_neighbourhood'])) {
 | |
| 1406 | + $breadcrumb .= $location_term_actual_city != '' ? $separator.$location_term_actual_city : $separator.$gd_location_link_text; | |
| 1407 | +						} else if ($is_location_last && $key == 'gd_neighbourhood') {
 | |
| 1408 | + $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator.$location_term_actual_neighbourhood : $separator.$gd_location_link_text; | |
| 1409 | 1409 |  						} else {
 | 
| 1410 | -							if ( get_option( 'permalink_structure' ) != '' ) {
 | |
| 1411 | - $location_link .= $location_term . '/'; | |
| 1410 | +							if (get_option('permalink_structure') != '') {
 | |
| 1411 | + $location_link .= $location_term.'/'; | |
| 1412 | 1412 |  							} else {
 | 
| 1413 | - $location_link .= "&$key=" . $location_term; | |
| 1413 | + $location_link .= "&$key=".$location_term; | |
| 1414 | 1414 | } | 
| 1415 | 1415 | |
| 1416 | -							if ( $key == 'gd_country' && $location_term_actual_country != '' ) {
 | |
| 1416 | +							if ($key == 'gd_country' && $location_term_actual_country != '') {
 | |
| 1417 | 1417 | $gd_location_link_text = $location_term_actual_country; | 
| 1418 | -							} else if ( $key == 'gd_region' && $location_term_actual_region != '' ) {
 | |
| 1418 | +							} else if ($key == 'gd_region' && $location_term_actual_region != '') {
 | |
| 1419 | 1419 | $gd_location_link_text = $location_term_actual_region; | 
| 1420 | -							} else if ( $key == 'gd_city' && $location_term_actual_city != '' ) {
 | |
| 1420 | +							} else if ($key == 'gd_city' && $location_term_actual_city != '') {
 | |
| 1421 | 1421 | $gd_location_link_text = $location_term_actual_city; | 
| 1422 | -							} else if ( $key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '' ) {
 | |
| 1422 | +							} else if ($key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '') {
 | |
| 1423 | 1423 | $gd_location_link_text = $location_term_actual_neighbourhood; | 
| 1424 | 1424 | } | 
| 1425 | 1425 | |
| @@ -1429,76 +1429,76 @@ discard block | ||
| 1429 | 1429 | } | 
| 1430 | 1430 | */ | 
| 1431 | 1431 | |
| 1432 | - $breadcrumb .= $separator . '<a href="' . $location_link . '">' . $gd_location_link_text . '</a>'; | |
| 1432 | + $breadcrumb .= $separator.'<a href="'.$location_link.'">'.$gd_location_link_text.'</a>'; | |
| 1433 | 1433 | } | 
| 1434 | 1434 | } | 
| 1435 | 1435 | } | 
| 1436 | 1436 | } | 
| 1437 | 1437 | |
| 1438 | -			if ( ! empty( $gd_taxonomy ) ) {
 | |
| 1438 | +			if (!empty($gd_taxonomy)) {
 | |
| 1439 | 1439 | $term_index = 1; | 
| 1440 | 1440 | |
| 1441 | 1441 |  				//if(get_option('geodir_add_categories_url'))
 | 
| 1442 | 1442 |  				{
 | 
| 1443 | -					if ( get_query_var( $gd_post_type . '_tags' ) ) {
 | |
| 1444 | - $cat_link = $listing_link . 'tags/'; | |
| 1443 | +					if (get_query_var($gd_post_type.'_tags')) {
 | |
| 1444 | + $cat_link = $listing_link.'tags/'; | |
| 1445 | 1445 |  					} else {
 | 
| 1446 | 1446 | $cat_link = $listing_link; | 
| 1447 | 1447 | } | 
| 1448 | 1448 | |
| 1449 | -					foreach ( $location_terms as $key => $location_term ) {
 | |
| 1450 | -						if ( $location_manager && in_array( $key, $hide_url_part ) ) {
 | |
| 1449 | +					foreach ($location_terms as $key => $location_term) {
 | |
| 1450 | +						if ($location_manager && in_array($key, $hide_url_part)) {
 | |
| 1451 | 1451 | continue; | 
| 1452 | 1452 | } | 
| 1453 | 1453 | |
| 1454 | -						if ( $location_term != '' ) {
 | |
| 1455 | -							if ( get_option( 'permalink_structure' ) != '' ) {
 | |
| 1456 | - $cat_link .= $location_term . '/'; | |
| 1454 | +						if ($location_term != '') {
 | |
| 1455 | +							if (get_option('permalink_structure') != '') {
 | |
| 1456 | + $cat_link .= $location_term.'/'; | |
| 1457 | 1457 | } | 
| 1458 | 1458 | } | 
| 1459 | 1459 | } | 
| 1460 | 1460 | |
| 1461 | - $term_array = explode( "/", trim( $wp_query->query[ $gd_taxonomy ], "/" ) ); | |
| 1462 | -					foreach ( $term_array as $term ) {
 | |
| 1463 | - $term_link_text = preg_replace( '/-(\d+)$/', '', $term ); | |
| 1464 | - $term_link_text = preg_replace( '/[_-]/', ' ', $term_link_text ); | |
| 1461 | +					$term_array = explode("/", trim($wp_query->query[$gd_taxonomy], "/"));
 | |
| 1462 | +					foreach ($term_array as $term) {
 | |
| 1463 | +						$term_link_text = preg_replace('/-(\d+)$/', '', $term);
 | |
| 1464 | +						$term_link_text = preg_replace('/[_-]/', ' ', $term_link_text);
 | |
| 1465 | 1465 | |
| 1466 | 1466 | // get term actual name | 
| 1467 | - $term_info = get_term_by( 'slug', $term, $gd_taxonomy, 'ARRAY_A' ); | |
| 1468 | -						if ( ! empty( $term_info ) && isset( $term_info['name'] ) && $term_info['name'] != '' ) {
 | |
| 1469 | - $term_link_text = urldecode( $term_info['name'] ); | |
| 1467 | +						$term_info = get_term_by('slug', $term, $gd_taxonomy, 'ARRAY_A');
 | |
| 1468 | +						if (!empty($term_info) && isset($term_info['name']) && $term_info['name'] != '') {
 | |
| 1469 | + $term_link_text = urldecode($term_info['name']); | |
| 1470 | 1470 |  						} else {
 | 
| 1471 | 1471 | continue; | 
| 1472 | 1472 | //$term_link_text = wp_strip_all_tags(geodir_ucwords(urldecode($term_link_text))); | 
| 1473 | 1473 | } | 
| 1474 | 1474 | |
| 1475 | -						if ( $term_index == count( $term_array ) && $is_taxonomy_last ) {
 | |
| 1476 | - $breadcrumb .= $separator . $term_link_text; | |
| 1475 | +						if ($term_index == count($term_array) && $is_taxonomy_last) {
 | |
| 1476 | + $breadcrumb .= $separator.$term_link_text; | |
| 1477 | 1477 |  						} else {
 | 
| 1478 | - $cat_link .= $term . '/'; | |
| 1479 | - $breadcrumb .= $separator . '<a href="' . $cat_link . '">' . $term_link_text . '</a>'; | |
| 1478 | + $cat_link .= $term.'/'; | |
| 1479 | + $breadcrumb .= $separator.'<a href="'.$cat_link.'">'.$term_link_text.'</a>'; | |
| 1480 | 1480 | } | 
| 1481 | - $term_index ++; | |
| 1481 | + $term_index++; | |
| 1482 | 1482 | } | 
| 1483 | 1483 | } | 
| 1484 | 1484 | |
| 1485 | 1485 | |
| 1486 | 1486 | } | 
| 1487 | 1487 | |
| 1488 | -			if ( geodir_is_page( 'detail' ) ) {
 | |
| 1489 | - $breadcrumb .= $separator . get_the_title(); | |
| 1488 | +			if (geodir_is_page('detail')) {
 | |
| 1489 | + $breadcrumb .= $separator.get_the_title(); | |
| 1490 | 1490 | } | 
| 1491 | 1491 | |
| 1492 | 1492 | $breadcrumb .= '</li>'; | 
| 1493 | 1493 | |
| 1494 | 1494 | |
| 1495 | -		} elseif ( geodir_is_page( 'author' ) ) {
 | |
| 1495 | +		} elseif (geodir_is_page('author')) {
 | |
| 1496 | 1496 | $user_id = get_current_user_id(); | 
| 1497 | - $author_link = get_author_posts_url( $user_id ); | |
| 1498 | - $default_author_link = geodir_getlink( $author_link, array( | |
| 1497 | + $author_link = get_author_posts_url($user_id); | |
| 1498 | + $default_author_link = geodir_getlink($author_link, array( | |
| 1499 | 1499 | 'geodir_dashbord' => 'true', | 
| 1500 | 1500 | 'stype' => 'gd_place' | 
| 1501 | - ), false ); | |
| 1501 | + ), false); | |
| 1502 | 1502 | |
| 1503 | 1503 | /** | 
| 1504 | 1504 | * Filter author page link. | 
| @@ -1508,16 +1508,16 @@ discard block | ||
| 1508 | 1508 | * @param string $default_author_link Default author link. | 
| 1509 | 1509 | * @param int $user_id Author ID. | 
| 1510 | 1510 | */ | 
| 1511 | - $default_author_link = apply_filters( 'geodir_dashboard_author_link', $default_author_link, $user_id ); | |
| 1511 | +			$default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_id);
 | |
| 1512 | 1512 | |
| 1513 | 1513 | $breadcrumb .= '<li>'; | 
| 1514 | - $breadcrumb .= $separator . '<a href="' . $default_author_link . '">' . __( 'My Dashboard', 'geodirectory' ) . '</a>'; | |
| 1514 | +			$breadcrumb .= $separator.'<a href="'.$default_author_link.'">'.__('My Dashboard', 'geodirectory').'</a>';
 | |
| 1515 | 1515 | |
| 1516 | -			if ( isset( $_REQUEST['list'] ) ) {
 | |
| 1517 | - $author_link = geodir_getlink( $author_link, array( | |
| 1516 | +			if (isset($_REQUEST['list'])) {
 | |
| 1517 | + $author_link = geodir_getlink($author_link, array( | |
| 1518 | 1518 | 'geodir_dashbord' => 'true', | 
| 1519 | 1519 | 'stype' => $_REQUEST['stype'] | 
| 1520 | - ), false ); | |
| 1520 | + ), false); | |
| 1521 | 1521 | |
| 1522 | 1522 | /** | 
| 1523 | 1523 | * Filter author page link. | 
| @@ -1528,61 +1528,61 @@ discard block | ||
| 1528 | 1528 | * @param int $user_id Author ID. | 
| 1529 | 1529 | * @param string $_REQUEST ['stype'] Post type. | 
| 1530 | 1530 | */ | 
| 1531 | - $author_link = apply_filters( 'geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype'] ); | |
| 1531 | +				$author_link = apply_filters('geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype']);
 | |
| 1532 | 1532 | |
| 1533 | - $breadcrumb .= $separator . '<a href="' . $author_link . '">' . __( ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; | |
| 1534 | - $breadcrumb .= $separator . ucfirst( __( 'My', 'geodirectory' ) . ' ' . $_REQUEST['list'] ); | |
| 1533 | + $breadcrumb .= $separator.'<a href="'.$author_link.'">'.__(ucfirst($post_type_info->label), 'geodirectory').'</a>'; | |
| 1534 | +				$breadcrumb .= $separator.ucfirst(__('My', 'geodirectory').' '.$_REQUEST['list']);
 | |
| 1535 | 1535 |  			} else {
 | 
| 1536 | - $breadcrumb .= $separator . __( ucfirst( $post_type_info->label ), 'geodirectory' ); | |
| 1536 | + $breadcrumb .= $separator.__(ucfirst($post_type_info->label), 'geodirectory'); | |
| 1537 | 1537 | } | 
| 1538 | 1538 | |
| 1539 | 1539 | $breadcrumb .= '</li>'; | 
| 1540 | -		} elseif ( is_category() || is_single() ) {
 | |
| 1540 | +		} elseif (is_category() || is_single()) {
 | |
| 1541 | 1541 | $category = get_the_category(); | 
| 1542 | -			if ( is_category() ) {
 | |
| 1543 | - $breadcrumb .= '<li>' . $separator . $category[0]->cat_name . '</li>'; | |
| 1542 | +			if (is_category()) {
 | |
| 1543 | + $breadcrumb .= '<li>'.$separator.$category[0]->cat_name.'</li>'; | |
| 1544 | 1544 | } | 
| 1545 | -			if ( is_single() ) {
 | |
| 1546 | - $breadcrumb .= '<li>' . $separator . '<a href="' . get_category_link( $category[0]->term_id ) . '">' . $category[0]->cat_name . '</a></li>'; | |
| 1547 | - $breadcrumb .= '<li>' . $separator . get_the_title() . '</li>'; | |
| 1545 | +			if (is_single()) {
 | |
| 1546 | + $breadcrumb .= '<li>'.$separator.'<a href="'.get_category_link($category[0]->term_id).'">'.$category[0]->cat_name.'</a></li>'; | |
| 1547 | + $breadcrumb .= '<li>'.$separator.get_the_title().'</li>'; | |
| 1548 | 1548 | } | 
| 1549 | 1549 | /* End of my version ##################################################### */ | 
| 1550 | -		} else if ( is_page() ) {
 | |
| 1550 | +		} else if (is_page()) {
 | |
| 1551 | 1551 | $page_title = get_the_title(); | 
| 1552 | 1552 | |
| 1553 | -			if ( geodir_is_page( 'location' ) ) {
 | |
| 1553 | +			if (geodir_is_page('location')) {
 | |
| 1554 | 1554 | $location_page_id = geodir_location_page_id(); | 
| 1555 | - $loc_post = get_post( $location_page_id ); | |
| 1555 | + $loc_post = get_post($location_page_id); | |
| 1556 | 1556 | $post_name = $loc_post->post_name; | 
| 1557 | - $slug = ucwords( str_replace( '-', ' ', $post_name ) ); | |
| 1558 | - $page_title = ! empty( $slug ) ? $slug : __( 'Location', 'geodirectory' ); | |
| 1557 | +				$slug             = ucwords(str_replace('-', ' ', $post_name));
 | |
| 1558 | +				$page_title       = !empty($slug) ? $slug : __('Location', 'geodirectory');
 | |
| 1559 | 1559 | } | 
| 1560 | 1560 | |
| 1561 | - $breadcrumb .= '<li>' . $separator; | |
| 1562 | - $breadcrumb .= stripslashes_deep( $page_title ); | |
| 1561 | + $breadcrumb .= '<li>'.$separator; | |
| 1562 | + $breadcrumb .= stripslashes_deep($page_title); | |
| 1563 | 1563 | $breadcrumb .= '</li>'; | 
| 1564 | -		} else if ( is_tag() ) {
 | |
| 1565 | - $breadcrumb .= "<li> " . $separator . single_tag_title( '', false ) . '</li>'; | |
| 1566 | -		} else if ( is_day() ) {
 | |
| 1567 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; | |
| 1568 | - the_time( 'F jS, Y' ); | |
| 1564 | +		} else if (is_tag()) {
 | |
| 1565 | +			$breadcrumb .= "<li> ".$separator.single_tag_title('', false).'</li>';
 | |
| 1566 | +		} else if (is_day()) {
 | |
| 1567 | +			$breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
 | |
| 1568 | +			the_time('F jS, Y');
 | |
| 1569 | 1569 | $breadcrumb .= '</li>'; | 
| 1570 | -		} else if ( is_month() ) {
 | |
| 1571 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; | |
| 1572 | - the_time( 'F, Y' ); | |
| 1570 | +		} else if (is_month()) {
 | |
| 1571 | +			$breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
 | |
| 1572 | +			the_time('F, Y');
 | |
| 1573 | 1573 | $breadcrumb .= '</li>'; | 
| 1574 | -		} else if ( is_year() ) {
 | |
| 1575 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; | |
| 1576 | - the_time( 'Y' ); | |
| 1574 | +		} else if (is_year()) {
 | |
| 1575 | +			$breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
 | |
| 1576 | +			the_time('Y');
 | |
| 1577 | 1577 | $breadcrumb .= '</li>'; | 
| 1578 | -		} else if ( is_author() ) {
 | |
| 1579 | - $breadcrumb .= "<li> " . $separator . __( " Author Archive", 'geodirectory' ); | |
| 1578 | +		} else if (is_author()) {
 | |
| 1579 | +			$breadcrumb .= "<li> ".$separator.__(" Author Archive", 'geodirectory');
 | |
| 1580 | 1580 | $breadcrumb .= '</li>'; | 
| 1581 | -		} else if ( isset( $_GET['paged'] ) && ! empty( $_GET['paged'] ) ) {
 | |
| 1582 | - $breadcrumb .= "<li>" . $separator . __( "Blog Archives", 'geodirectory' ); | |
| 1581 | +		} else if (isset($_GET['paged']) && !empty($_GET['paged'])) {
 | |
| 1582 | +			$breadcrumb .= "<li>".$separator.__("Blog Archives", 'geodirectory');
 | |
| 1583 | 1583 | $breadcrumb .= '</li>'; | 
| 1584 | -		} else if ( is_search() ) {
 | |
| 1585 | - $breadcrumb .= "<li> " . $separator . __( " Search Results", 'geodirectory' ); | |
| 1584 | +		} else if (is_search()) {
 | |
| 1585 | +			$breadcrumb .= "<li> ".$separator.__(" Search Results", 'geodirectory');
 | |
| 1586 | 1586 | $breadcrumb .= '</li>'; | 
| 1587 | 1587 | } | 
| 1588 | 1588 | $breadcrumb .= '</ul></div>'; | 
| @@ -1595,13 +1595,13 @@ discard block | ||
| 1595 | 1595 | * @param string $breadcrumb Breadcrumb HTML. | 
| 1596 | 1596 | * @param string $separator Breadcrumb separator. | 
| 1597 | 1597 | */ | 
| 1598 | - echo $breadcrumb = apply_filters( 'geodir_breadcrumb', $breadcrumb, $separator ); | |
| 1598 | +		echo $breadcrumb = apply_filters('geodir_breadcrumb', $breadcrumb, $separator);
 | |
| 1599 | 1599 | } | 
| 1600 | 1600 | } | 
| 1601 | 1601 | |
| 1602 | 1602 | |
| 1603 | -add_action( "admin_init", "geodir_allow_wpadmin" ); // check user is admin | |
| 1604 | -if ( ! function_exists( 'geodir_allow_wpadmin' ) ) {
 | |
| 1603 | +add_action("admin_init", "geodir_allow_wpadmin"); // check user is admin
 | |
| 1604 | +if (!function_exists('geodir_allow_wpadmin')) {
 | |
| 1605 | 1605 | /** | 
| 1606 | 1606 | * Allow only admins to access wp-admin. | 
| 1607 | 1607 | * | 
| @@ -1613,12 +1613,12 @@ discard block | ||
| 1613 | 1613 | */ | 
| 1614 | 1614 |  	function geodir_allow_wpadmin() {
 | 
| 1615 | 1615 | global $wpdb; | 
| 1616 | - if ( get_option( 'geodir_allow_wpadmin' ) == '0' && is_user_logged_in() && ( ! defined( 'DOING_AJAX' ) ) ) // checking action in request to allow ajax request go through | |
| 1616 | +		if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && (!defined('DOING_AJAX'))) // checking action in request to allow ajax request go through
 | |
| 1617 | 1617 |  		{
 | 
| 1618 | -			if ( current_user_can( 'administrator' ) ) {
 | |
| 1618 | +			if (current_user_can('administrator')) {
 | |
| 1619 | 1619 |  			} else {
 | 
| 1620 | 1620 | |
| 1621 | - wp_redirect( home_url() ); | |
| 1621 | + wp_redirect(home_url()); | |
| 1622 | 1622 | exit; | 
| 1623 | 1623 | } | 
| 1624 | 1624 | |
| @@ -1637,23 +1637,23 @@ discard block | ||
| 1637 | 1637 | * | 
| 1638 | 1638 | * @return array|WP_Error The uploaded data as array. When failure returns error. | 
| 1639 | 1639 | */ | 
| 1640 | -function fetch_remote_file( $url ) {
 | |
| 1640 | +function fetch_remote_file($url) {
 | |
| 1641 | 1641 | // extract the file name and extension from the url | 
| 1642 | - require_once( ABSPATH . 'wp-includes/pluggable.php' ); | |
| 1643 | - $file_name = basename( $url ); | |
| 1644 | -	if ( strpos( $file_name, '?' ) !== false ) {
 | |
| 1645 | - list( $file_name ) = explode( '?', $file_name ); | |
| 1642 | + require_once(ABSPATH.'wp-includes/pluggable.php'); | |
| 1643 | + $file_name = basename($url); | |
| 1644 | +	if (strpos($file_name, '?') !== false) {
 | |
| 1645 | +		list($file_name) = explode('?', $file_name);
 | |
| 1646 | 1646 | } | 
| 1647 | 1647 | $dummy = false; | 
| 1648 | 1648 | $add_to_cache = false; | 
| 1649 | 1649 | $key = null; | 
| 1650 | -	if ( strpos( $url, '/dummy/' ) !== false ) {
 | |
| 1650 | +	if (strpos($url, '/dummy/') !== false) {
 | |
| 1651 | 1651 | $dummy = true; | 
| 1652 | - $key = "dummy_" . str_replace( '.', '_', $file_name ); | |
| 1653 | - $value = get_transient( 'cached_dummy_images' ); | |
| 1654 | -		if ( $value ) {
 | |
| 1655 | -			if ( isset( $value[ $key ] ) ) {
 | |
| 1656 | - return $value[ $key ]; | |
| 1652 | +		$key   = "dummy_".str_replace('.', '_', $file_name);
 | |
| 1653 | +		$value = get_transient('cached_dummy_images');
 | |
| 1654 | +		if ($value) {
 | |
| 1655 | +			if (isset($value[$key])) {
 | |
| 1656 | + return $value[$key]; | |
| 1657 | 1657 |  			} else {
 | 
| 1658 | 1658 | $add_to_cache = true; | 
| 1659 | 1659 | } | 
| @@ -1664,58 +1664,58 @@ discard block | ||
| 1664 | 1664 | |
| 1665 | 1665 | // get placeholder file in the upload dir with a unique, sanitized filename | 
| 1666 | 1666 | |
| 1667 | - $post_upload_date = isset( $post['upload_date'] ) ? $post['upload_date'] : ''; | |
| 1667 | + $post_upload_date = isset($post['upload_date']) ? $post['upload_date'] : ''; | |
| 1668 | 1668 | |
| 1669 | - $upload = wp_upload_bits( $file_name, 0, '', $post_upload_date ); | |
| 1670 | -	if ( $upload['error'] ) {
 | |
| 1671 | - return new WP_Error( 'upload_dir_error', $upload['error'] ); | |
| 1669 | + $upload = wp_upload_bits($file_name, 0, '', $post_upload_date); | |
| 1670 | +	if ($upload['error']) {
 | |
| 1671 | +		return new WP_Error('upload_dir_error', $upload['error']);
 | |
| 1672 | 1672 | } | 
| 1673 | 1673 | |
| 1674 | 1674 | |
| 1675 | - sleep( 0.3 );// if multiple remote file this can cause the remote server to timeout so we add a slight delay | |
| 1675 | + sleep(0.3); // if multiple remote file this can cause the remote server to timeout so we add a slight delay | |
| 1676 | 1676 | |
| 1677 | 1677 | // fetch the remote url and write it to the placeholder file | 
| 1678 | - $headers = wp_remote_get( $url, array( 'stream' => true, 'filename' => $upload['file'] ) ); | |
| 1678 | +	$headers = wp_remote_get($url, array('stream' => true, 'filename' => $upload['file']));
 | |
| 1679 | 1679 | |
| 1680 | 1680 | $log_message = ''; | 
| 1681 | -	if ( is_wp_error( $headers ) ) {
 | |
| 1682 | - echo 'file: ' . $url; | |
| 1681 | +	if (is_wp_error($headers)) {
 | |
| 1682 | + echo 'file: '.$url; | |
| 1683 | 1683 | |
| 1684 | - return new WP_Error( 'import_file_error', $headers->get_error_message() ); | |
| 1684 | +		return new WP_Error('import_file_error', $headers->get_error_message());
 | |
| 1685 | 1685 | } | 
| 1686 | 1686 | |
| 1687 | - $filesize = filesize( $upload['file'] ); | |
| 1687 | + $filesize = filesize($upload['file']); | |
| 1688 | 1688 | // request failed | 
| 1689 | -	if ( ! $headers ) {
 | |
| 1690 | - $log_message = __( 'Remote server did not respond', 'geodirectory' ); | |
| 1689 | +	if (!$headers) {
 | |
| 1690 | +		$log_message = __('Remote server did not respond', 'geodirectory');
 | |
| 1691 | 1691 | } // make sure the fetch was successful | 
| 1692 | -	elseif ( $headers['response']['code'] != '200' ) {
 | |
| 1693 | - $log_message = sprintf( __( 'Remote server returned error response %1$d %2$s', 'geodirectory' ), esc_html( $headers['response'] ), get_status_header_desc( $headers['response'] ) ); | |
| 1694 | -	} elseif ( isset( $headers['headers']['content-length'] ) && $filesize != $headers['headers']['content-length'] ) {
 | |
| 1695 | - $log_message = __( 'Remote file is incorrect size', 'geodirectory' ); | |
| 1696 | -	} elseif ( 0 == $filesize ) {
 | |
| 1697 | - $log_message = __( 'Zero size file downloaded', 'geodirectory' ); | |
| 1698 | - } | |
| 1699 | - | |
| 1700 | -	if ( $log_message ) {
 | |
| 1701 | - $del = unlink( $upload['file'] ); | |
| 1702 | -		if ( ! $del ) {
 | |
| 1703 | - geodir_error_log( __( 'GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory' ) ); | |
| 1692 | +	elseif ($headers['response']['code'] != '200') {
 | |
| 1693 | +		$log_message = sprintf(__('Remote server returned error response %1$d %2$s', 'geodirectory'), esc_html($headers['response']), get_status_header_desc($headers['response']));
 | |
| 1694 | +	} elseif (isset($headers['headers']['content-length']) && $filesize != $headers['headers']['content-length']) {
 | |
| 1695 | +		$log_message = __('Remote file is incorrect size', 'geodirectory');
 | |
| 1696 | +	} elseif (0 == $filesize) {
 | |
| 1697 | +		$log_message = __('Zero size file downloaded', 'geodirectory');
 | |
| 1698 | + } | |
| 1699 | + | |
| 1700 | +	if ($log_message) {
 | |
| 1701 | + $del = unlink($upload['file']); | |
| 1702 | +		if (!$del) {
 | |
| 1703 | +			geodir_error_log(__('GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory'));
 | |
| 1704 | 1704 | } | 
| 1705 | 1705 | |
| 1706 | - return new WP_Error( 'import_file_error', $log_message ); | |
| 1706 | +		return new WP_Error('import_file_error', $log_message);
 | |
| 1707 | 1707 | } | 
| 1708 | 1708 | |
| 1709 | -	if ( $dummy && $add_to_cache && is_array( $upload ) ) {
 | |
| 1710 | - $images = get_transient( 'cached_dummy_images' ); | |
| 1711 | -		if ( is_array( $images ) ) {
 | |
| 1712 | - $images[ $key ] = $upload; | |
| 1709 | +	if ($dummy && $add_to_cache && is_array($upload)) {
 | |
| 1710 | +		$images = get_transient('cached_dummy_images');
 | |
| 1711 | +		if (is_array($images)) {
 | |
| 1712 | + $images[$key] = $upload; | |
| 1713 | 1713 |  		} else {
 | 
| 1714 | - $images = array( $key => $upload ); | |
| 1714 | + $images = array($key => $upload); | |
| 1715 | 1715 | } | 
| 1716 | 1716 | |
| 1717 | 1717 | //setting the cache using the WP Transient API | 
| 1718 | - set_transient( 'cached_dummy_images', $images, 60 * 10 ); //10 minutes cache | |
| 1718 | +		set_transient('cached_dummy_images', $images, 60 * 10); //10 minutes cache
 | |
| 1719 | 1719 | } | 
| 1720 | 1720 | |
| 1721 | 1721 | return $upload; | 
| @@ -1729,12 +1729,12 @@ discard block | ||
| 1729 | 1729 | * @return string|void Max upload size. | 
| 1730 | 1730 | */ | 
| 1731 | 1731 |  function geodir_max_upload_size() {
 | 
| 1732 | - $max_filesize = (float) get_option( 'geodir_upload_max_filesize', 2 ); | |
| 1732 | +	$max_filesize = (float) get_option('geodir_upload_max_filesize', 2);
 | |
| 1733 | 1733 | |
| 1734 | -	if ( $max_filesize > 0 && $max_filesize < 1 ) {
 | |
| 1735 | - $max_filesize = (int) ( $max_filesize * 1024 ) . 'kb'; | |
| 1734 | +	if ($max_filesize > 0 && $max_filesize < 1) {
 | |
| 1735 | + $max_filesize = (int) ($max_filesize * 1024).'kb'; | |
| 1736 | 1736 |  	} else {
 | 
| 1737 | - $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb'; | |
| 1737 | + $max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb'; | |
| 1738 | 1738 | } | 
| 1739 | 1739 | |
| 1740 | 1740 | /** | 
| @@ -1744,7 +1744,7 @@ discard block | ||
| 1744 | 1744 | * | 
| 1745 | 1745 | * @param string $max_filesize Max file upload size. Ex. 10mb, 512kb. | 
| 1746 | 1746 | */ | 
| 1747 | - return apply_filters( 'geodir_default_image_upload_size_limit', $max_filesize ); | |
| 1747 | +	return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
 | |
| 1748 | 1748 | } | 
| 1749 | 1749 | |
| 1750 | 1750 | /** | 
| @@ -1757,8 +1757,8 @@ discard block | ||
| 1757 | 1757 | * @return bool If dummy folder exists returns true, else false. | 
| 1758 | 1758 | */ | 
| 1759 | 1759 |  function geodir_dummy_folder_exists() {
 | 
| 1760 | - $path = geodir_plugin_path() . '/geodirectory-admin/dummy/'; | |
| 1761 | -	if ( ! is_dir( $path ) ) {
 | |
| 1760 | + $path = geodir_plugin_path().'/geodirectory-admin/dummy/'; | |
| 1761 | +	if (!is_dir($path)) {
 | |
| 1762 | 1762 | return false; | 
| 1763 | 1763 |  	} else {
 | 
| 1764 | 1764 | return true; | 
| @@ -1777,17 +1777,17 @@ discard block | ||
| 1777 | 1777 | * | 
| 1778 | 1778 | * @return object Author info. | 
| 1779 | 1779 | */ | 
| 1780 | -function geodir_get_author_info( $aid ) {
 | |
| 1780 | +function geodir_get_author_info($aid) {
 | |
| 1781 | 1781 | global $wpdb; | 
| 1782 | 1782 | /*$infosql = "select * from $wpdb->users where ID=$aid";*/ | 
| 1783 | - $infosql = $wpdb->prepare( "select * from $wpdb->users where ID=%d", array( $aid ) ); | |
| 1784 | - $info = $wpdb->get_results( $infosql ); | |
| 1785 | -	if ( $info ) {
 | |
| 1783 | +	$infosql = $wpdb->prepare("select * from $wpdb->users where ID=%d", array($aid));
 | |
| 1784 | + $info = $wpdb->get_results($infosql); | |
| 1785 | +	if ($info) {
 | |
| 1786 | 1786 | return $info[0]; | 
| 1787 | 1787 | } | 
| 1788 | 1788 | } | 
| 1789 | 1789 | |
| 1790 | -if ( ! function_exists( 'adminEmail' ) ) {
 | |
| 1790 | +if (!function_exists('adminEmail')) {
 | |
| 1791 | 1791 | /** | 
| 1792 | 1792 | * Send emails to client on post submission, renew etc. | 
| 1793 | 1793 | * | 
| @@ -1800,67 +1800,67 @@ discard block | ||
| 1800 | 1800 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. | 
| 1801 | 1801 | * @param string $custom_1 Custom data to be sent. | 
| 1802 | 1802 | */ | 
| 1803 | -	function adminEmail( $page_id, $user_id, $message_type, $custom_1 = '' ) {
 | |
| 1803 | +	function adminEmail($page_id, $user_id, $message_type, $custom_1 = '') {
 | |
| 1804 | 1804 | global $wpdb; | 
| 1805 | -		if ( $message_type == 'expiration' ) {
 | |
| 1806 | - $subject = stripslashes( __( get_option( 'renew_email_subject' ), 'geodirectory' ) ); | |
| 1807 | - $client_message = stripslashes( __( get_option( 'renew_email_content' ), 'geodirectory' ) ); | |
| 1808 | -		} elseif ( $message_type == 'post_submited' ) {
 | |
| 1809 | - $subject = __( get_option( 'post_submited_success_email_subject_admin' ), 'geodirectory' ); | |
| 1810 | - $client_message = __( get_option( 'post_submited_success_email_content_admin' ), 'geodirectory' ); | |
| 1811 | -		} elseif ( $message_type == 'renew' ) {
 | |
| 1812 | - $subject = __( get_option( 'post_renew_success_email_subject_admin' ), 'geodirectory' ); | |
| 1813 | - $client_message = __( get_option( 'post_renew_success_email_content_admin' ), 'geodirectory' ); | |
| 1814 | -		} elseif ( $message_type == 'upgrade' ) {
 | |
| 1815 | - $subject = __( get_option( 'post_upgrade_success_email_subject_admin' ), 'geodirectory' ); | |
| 1816 | - $client_message = __( get_option( 'post_upgrade_success_email_content_admin' ), 'geodirectory' ); | |
| 1817 | -		} elseif ( $message_type == 'claim_approved' ) {
 | |
| 1818 | - $subject = __( get_option( 'claim_approved_email_subject' ), 'geodirectory' ); | |
| 1819 | - $client_message = __( get_option( 'claim_approved_email_content' ), 'geodirectory' ); | |
| 1820 | -		} elseif ( $message_type == 'claim_rejected' ) {
 | |
| 1821 | - $subject = __( get_option( 'claim_rejected_email_subject' ), 'geodirectory' ); | |
| 1822 | - $client_message = __( get_option( 'claim_rejected_email_content' ), 'geodirectory' ); | |
| 1823 | -		} elseif ( $message_type == 'claim_requested' ) {
 | |
| 1824 | - $subject = __( get_option( 'claim_email_subject_admin' ), 'geodirectory' ); | |
| 1825 | - $client_message = __( get_option( 'claim_email_content_admin' ), 'geodirectory' ); | |
| 1826 | -		} elseif ( $message_type == 'auto_claim' ) {
 | |
| 1827 | - $subject = __( get_option( 'auto_claim_email_subject' ), 'geodirectory' ); | |
| 1828 | - $client_message = __( get_option( 'auto_claim_email_content' ), 'geodirectory' ); | |
| 1829 | -		} elseif ( $message_type == 'payment_success' ) {
 | |
| 1830 | - $subject = __( get_option( 'post_payment_success_admin_email_subject' ), 'geodirectory' ); | |
| 1831 | - $client_message = __( get_option( 'post_payment_success_admin_email_content' ), 'geodirectory' ); | |
| 1832 | -		} elseif ( $message_type == 'payment_fail' ) {
 | |
| 1833 | - $subject = __( get_option( 'post_payment_fail_admin_email_subject' ), 'geodirectory' ); | |
| 1834 | - $client_message = __( get_option( 'post_payment_fail_admin_email_content' ), 'geodirectory' ); | |
| 1805 | +		if ($message_type == 'expiration') {
 | |
| 1806 | +			$subject        = stripslashes(__(get_option('renew_email_subject'), 'geodirectory'));
 | |
| 1807 | +			$client_message = stripslashes(__(get_option('renew_email_content'), 'geodirectory'));
 | |
| 1808 | +		} elseif ($message_type == 'post_submited') {
 | |
| 1809 | +			$subject        = __(get_option('post_submited_success_email_subject_admin'), 'geodirectory');
 | |
| 1810 | +			$client_message = __(get_option('post_submited_success_email_content_admin'), 'geodirectory');
 | |
| 1811 | +		} elseif ($message_type == 'renew') {
 | |
| 1812 | +			$subject        = __(get_option('post_renew_success_email_subject_admin'), 'geodirectory');
 | |
| 1813 | +			$client_message = __(get_option('post_renew_success_email_content_admin'), 'geodirectory');
 | |
| 1814 | +		} elseif ($message_type == 'upgrade') {
 | |
| 1815 | +			$subject        = __(get_option('post_upgrade_success_email_subject_admin'), 'geodirectory');
 | |
| 1816 | +			$client_message = __(get_option('post_upgrade_success_email_content_admin'), 'geodirectory');
 | |
| 1817 | +		} elseif ($message_type == 'claim_approved') {
 | |
| 1818 | +			$subject        = __(get_option('claim_approved_email_subject'), 'geodirectory');
 | |
| 1819 | +			$client_message = __(get_option('claim_approved_email_content'), 'geodirectory');
 | |
| 1820 | +		} elseif ($message_type == 'claim_rejected') {
 | |
| 1821 | +			$subject        = __(get_option('claim_rejected_email_subject'), 'geodirectory');
 | |
| 1822 | +			$client_message = __(get_option('claim_rejected_email_content'), 'geodirectory');
 | |
| 1823 | +		} elseif ($message_type == 'claim_requested') {
 | |
| 1824 | +			$subject        = __(get_option('claim_email_subject_admin'), 'geodirectory');
 | |
| 1825 | +			$client_message = __(get_option('claim_email_content_admin'), 'geodirectory');
 | |
| 1826 | +		} elseif ($message_type == 'auto_claim') {
 | |
| 1827 | +			$subject        = __(get_option('auto_claim_email_subject'), 'geodirectory');
 | |
| 1828 | +			$client_message = __(get_option('auto_claim_email_content'), 'geodirectory');
 | |
| 1829 | +		} elseif ($message_type == 'payment_success') {
 | |
| 1830 | +			$subject        = __(get_option('post_payment_success_admin_email_subject'), 'geodirectory');
 | |
| 1831 | +			$client_message = __(get_option('post_payment_success_admin_email_content'), 'geodirectory');
 | |
| 1832 | +		} elseif ($message_type == 'payment_fail') {
 | |
| 1833 | +			$subject        = __(get_option('post_payment_fail_admin_email_subject'), 'geodirectory');
 | |
| 1834 | +			$client_message = __(get_option('post_payment_fail_admin_email_content'), 'geodirectory');
 | |
| 1835 | 1835 | } | 
| 1836 | 1836 | $transaction_details = $custom_1; | 
| 1837 | - $fromEmail = get_option( 'site_email' ); | |
| 1837 | +		$fromEmail           = get_option('site_email');
 | |
| 1838 | 1838 | $fromEmailName = get_site_emailName(); | 
| 1839 | 1839 | //$alivedays = get_post_meta($page_id,'alive_days',true); | 
| 1840 | - $pkg_limit = get_property_price_info_listing( $page_id ); | |
| 1840 | + $pkg_limit = get_property_price_info_listing($page_id); | |
| 1841 | 1841 | $alivedays = $pkg_limit['days']; | 
| 1842 | - $productlink = get_permalink( $page_id ); | |
| 1843 | - $post_info = get_post( $page_id ); | |
| 1844 | - $post_date = date( 'dS F,Y', strtotime( $post_info->post_date ) ); | |
| 1845 | - $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>'; | |
| 1842 | + $productlink = get_permalink($page_id); | |
| 1843 | + $post_info = get_post($page_id); | |
| 1844 | +		$post_date            = date('dS F,Y', strtotime($post_info->post_date));
 | |
| 1845 | + $listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>'; | |
| 1846 | 1846 | $loginurl = geodir_login_url(); | 
| 1847 | - $loginurl_link = '<a href="' . $loginurl . '">login</a>'; | |
| 1847 | + $loginurl_link = '<a href="'.$loginurl.'">login</a>'; | |
| 1848 | 1848 | $siteurl = home_url(); | 
| 1849 | - $siteurl_link = '<a href="' . $siteurl . '">' . $fromEmailName . '</a>'; | |
| 1850 | - $user_info = get_userdata( $user_id ); | |
| 1849 | + $siteurl_link = '<a href="'.$siteurl.'">'.$fromEmailName.'</a>'; | |
| 1850 | + $user_info = get_userdata($user_id); | |
| 1851 | 1851 | $user_email = $user_info->user_email; | 
| 1852 | - $display_name = geodir_get_client_name( $user_id ); | |
| 1852 | + $display_name = geodir_get_client_name($user_id); | |
| 1853 | 1853 | $user_login = $user_info->user_login; | 
| 1854 | - $number_of_grace_days = get_option( 'ptthemes_listing_preexpiry_notice_days' ); | |
| 1855 | -		if ( $number_of_grace_days == '' ) {
 | |
| 1854 | +		$number_of_grace_days = get_option('ptthemes_listing_preexpiry_notice_days');
 | |
| 1855 | +		if ($number_of_grace_days == '') {
 | |
| 1856 | 1856 | $number_of_grace_days = 1; | 
| 1857 | 1857 | } | 
| 1858 | -		if ( $post_info->post_type == 'event' ) {
 | |
| 1858 | +		if ($post_info->post_type == 'event') {
 | |
| 1859 | 1859 | $post_type = 'event'; | 
| 1860 | 1860 |  		} else {
 | 
| 1861 | 1861 | $post_type = 'listing'; | 
| 1862 | 1862 | } | 
| 1863 | - $renew_link = '<a href="' . $siteurl . '?ptype=post_' . $post_type . '&renew=1&pid=' . $page_id . '">' . RENEW_LINK . '</a>'; | |
| 1863 | + $renew_link = '<a href="'.$siteurl.'?ptype=post_'.$post_type.'&renew=1&pid='.$page_id.'">'.RENEW_LINK.'</a>'; | |
| 1864 | 1864 | $search_array = array( | 
| 1865 | 1865 | '[#client_name#]', | 
| 1866 | 1866 | '[#listing_link#]', | 
| @@ -1876,7 +1876,7 @@ discard block | ||
| 1876 | 1876 | '[#site_name#]', | 
| 1877 | 1877 | '[#transaction_details#]' | 
| 1878 | 1878 | ); | 
| 1879 | - $replace_array = array( | |
| 1879 | + $replace_array = array( | |
| 1880 | 1880 | $display_name, | 
| 1881 | 1881 | $listingLink, | 
| 1882 | 1882 | $post_date, | 
| @@ -1891,13 +1891,13 @@ discard block | ||
| 1891 | 1891 | $fromEmailName, | 
| 1892 | 1892 | $transaction_details | 
| 1893 | 1893 | ); | 
| 1894 | - $client_message = str_replace( $search_array, $replace_array, $client_message ); | |
| 1895 | - $subject = str_replace( $search_array, $replace_array, $subject ); | |
| 1894 | + $client_message = str_replace($search_array, $replace_array, $client_message); | |
| 1895 | + $subject = str_replace($search_array, $replace_array, $subject); | |
| 1896 | 1896 | |
| 1897 | 1897 | |
| 1898 | - $headers = array(); | |
| 1898 | + $headers = array(); | |
| 1899 | 1899 | $headers[] = 'Content-type: text/html; charset=UTF-8'; | 
| 1900 | - $headers[] = 'From: ' . $fromEmailName . ' <' . $fromEmail . '>'; | |
| 1900 | + $headers[] = 'From: '.$fromEmailName.' <'.$fromEmail.'>'; | |
| 1901 | 1901 | |
| 1902 | 1902 | $to = $fromEmail; | 
| 1903 | 1903 | $message = $client_message; | 
| @@ -1915,7 +1915,7 @@ discard block | ||
| 1915 | 1915 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. | 
| 1916 | 1916 | * @param string $custom_1 Custom data to be sent. | 
| 1917 | 1917 | */ | 
| 1918 | - $to = apply_filters( 'geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1 ); | |
| 1918 | +		$to = apply_filters('geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1);
 | |
| 1919 | 1919 | /** | 
| 1920 | 1920 | * Filter the admin email subject. | 
| 1921 | 1921 | * | 
| @@ -1928,7 +1928,7 @@ discard block | ||
| 1928 | 1928 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. | 
| 1929 | 1929 | * @param string $custom_1 Custom data to be sent. | 
| 1930 | 1930 | */ | 
| 1931 | - $subject = apply_filters( 'geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1 ); | |
| 1931 | +		$subject = apply_filters('geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1);
 | |
| 1932 | 1932 | /** | 
| 1933 | 1933 | * Filter the admin email message. | 
| 1934 | 1934 | * | 
| @@ -1941,7 +1941,7 @@ discard block | ||
| 1941 | 1941 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. | 
| 1942 | 1942 | * @param string $custom_1 Custom data to be sent. | 
| 1943 | 1943 | */ | 
| 1944 | - $message = apply_filters( 'geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1 ); | |
| 1944 | +		$message = apply_filters('geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1);
 | |
| 1945 | 1945 | /** | 
| 1946 | 1946 | * Filter the admin email headers. | 
| 1947 | 1947 | * | 
| @@ -1954,22 +1954,22 @@ discard block | ||
| 1954 | 1954 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. | 
| 1955 | 1955 | * @param string $custom_1 Custom data to be sent. | 
| 1956 | 1956 | */ | 
| 1957 | - $headers = apply_filters( 'geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1 ); | |
| 1957 | +		$headers = apply_filters('geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1);
 | |
| 1958 | 1958 | |
| 1959 | 1959 | |
| 1960 | - $sent = wp_mail( $to, $subject, $message, $headers ); | |
| 1961 | -		if ( ! $sent ) {
 | |
| 1962 | -			if ( is_array( $to ) ) {
 | |
| 1963 | - $to = implode( ',', $to ); | |
| 1960 | + $sent = wp_mail($to, $subject, $message, $headers); | |
| 1961 | +		if (!$sent) {
 | |
| 1962 | +			if (is_array($to)) {
 | |
| 1963 | +				$to = implode(',', $to);
 | |
| 1964 | 1964 | } | 
| 1965 | 1965 | $log_message = sprintf( | 
| 1966 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), | |
| 1966 | +				__("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
 | |
| 1967 | 1967 | $message_type, | 
| 1968 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), | |
| 1968 | +				date_i18n('F j Y H:i:s', current_time('timestamp')),
 | |
| 1969 | 1969 | $to, | 
| 1970 | 1970 | $subject | 
| 1971 | 1971 | ); | 
| 1972 | - geodir_error_log( $log_message ); | |
| 1972 | + geodir_error_log($log_message); | |
| 1973 | 1973 | } | 
| 1974 | 1974 | } | 
| 1975 | 1975 | } | 
| @@ -1989,12 +1989,12 @@ discard block | ||
| 1989 | 1989 | * | 
| 1990 | 1990 | * @return array Category IDs. | 
| 1991 | 1991 | */ | 
| 1992 | -function gd_lang_object_ids( $ids_array, $type ) {
 | |
| 1993 | -	if ( function_exists( 'icl_object_id' ) ) {
 | |
| 1992 | +function gd_lang_object_ids($ids_array, $type) {
 | |
| 1993 | +	if (function_exists('icl_object_id')) {
 | |
| 1994 | 1994 | $res = array(); | 
| 1995 | -		foreach ( $ids_array as $id ) {
 | |
| 1996 | - $xlat = icl_object_id( $id, $type, false ); | |
| 1997 | -			if ( ! is_null( $xlat ) ) {
 | |
| 1995 | +		foreach ($ids_array as $id) {
 | |
| 1996 | + $xlat = icl_object_id($id, $type, false); | |
| 1997 | +			if (!is_null($xlat)) {
 | |
| 1998 | 1998 | $res[] = $xlat; | 
| 1999 | 1999 | } | 
| 2000 | 2000 | } | 
| @@ -2018,20 +2018,20 @@ discard block | ||
| 2018 | 2018 | * | 
| 2019 | 2019 | * @return array Modified Body CSS classes. | 
| 2020 | 2020 | */ | 
| 2021 | -function geodir_custom_posts_body_class( $classes ) {
 | |
| 2021 | +function geodir_custom_posts_body_class($classes) {
 | |
| 2022 | 2022 | global $wpdb, $wp; | 
| 2023 | - $post_types = geodir_get_posttypes( 'object' ); | |
| 2024 | -	if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {
 | |
| 2023 | +	$post_types = geodir_get_posttypes('object');
 | |
| 2024 | +	if (!empty($post_types) && count((array) $post_types) > 1) {
 | |
| 2025 | 2025 | $classes[] = 'geodir_custom_posts'; | 
| 2026 | 2026 | } | 
| 2027 | 2027 | |
| 2028 | 2028 | // fix body class for signup page | 
| 2029 | -	if ( geodir_is_page( 'login' ) ) {
 | |
| 2029 | +	if (geodir_is_page('login')) {
 | |
| 2030 | 2030 | $new_classes = array(); | 
| 2031 | 2031 | $new_classes[] = 'signup page-geodir-signup'; | 
| 2032 | -		if ( ! empty( $classes ) ) {
 | |
| 2033 | -			foreach ( $classes as $class ) {
 | |
| 2034 | -				if ( $class && $class != 'home' && $class != 'blog' ) {
 | |
| 2032 | +		if (!empty($classes)) {
 | |
| 2033 | +			foreach ($classes as $class) {
 | |
| 2034 | +				if ($class && $class != 'home' && $class != 'blog') {
 | |
| 2035 | 2035 | $new_classes[] = $class; | 
| 2036 | 2036 | } | 
| 2037 | 2037 | } | 
| @@ -2039,14 +2039,14 @@ discard block | ||
| 2039 | 2039 | $classes = $new_classes; | 
| 2040 | 2040 | } | 
| 2041 | 2041 | |
| 2042 | -	if ( geodir_is_geodir_page() ) {
 | |
| 2042 | +	if (geodir_is_geodir_page()) {
 | |
| 2043 | 2043 | $classes[] = 'geodir-page'; | 
| 2044 | 2044 | } | 
| 2045 | 2045 | |
| 2046 | 2046 | return $classes; | 
| 2047 | 2047 | } | 
| 2048 | 2048 | |
| 2049 | -add_filter( 'body_class', 'geodir_custom_posts_body_class' ); // let's add a class to the body so we can style the new addition to the search | |
| 2049 | +add_filter('body_class', 'geodir_custom_posts_body_class'); // let's add a class to the body so we can style the new addition to the search
 | |
| 2050 | 2050 | |
| 2051 | 2051 | |
| 2052 | 2052 | /** | 
| @@ -2062,7 +2062,7 @@ discard block | ||
| 2062 | 2062 | * | 
| 2063 | 2063 | * @since 1.0.0 | 
| 2064 | 2064 | */ | 
| 2065 | - return apply_filters( 'geodir_map_zoom_level', array( | |
| 2065 | +	return apply_filters('geodir_map_zoom_level', array(
 | |
| 2066 | 2066 | 1, | 
| 2067 | 2067 | 2, | 
| 2068 | 2068 | 3, | 
| @@ -2082,7 +2082,7 @@ discard block | ||
| 2082 | 2082 | 17, | 
| 2083 | 2083 | 18, | 
| 2084 | 2084 | 19 | 
| 2085 | - ) ); | |
| 2085 | + )); | |
| 2086 | 2086 | |
| 2087 | 2087 | } | 
| 2088 | 2088 | |
| @@ -2095,12 +2095,12 @@ discard block | ||
| 2095 | 2095 | * | 
| 2096 | 2096 | * @param string $geodir_option_name Option key. | 
| 2097 | 2097 | */ | 
| 2098 | -function geodir_option_version_backup( $geodir_option_name ) {
 | |
| 2098 | +function geodir_option_version_backup($geodir_option_name) {
 | |
| 2099 | 2099 | $version_date = time(); | 
| 2100 | - $geodir_option = get_option( $geodir_option_name ); | |
| 2100 | + $geodir_option = get_option($geodir_option_name); | |
| 2101 | 2101 | |
| 2102 | -	if ( ! empty( $geodir_option ) ) {
 | |
| 2103 | - add_option( $geodir_option_name . '_' . $version_date, $geodir_option ); | |
| 2102 | +	if (!empty($geodir_option)) {
 | |
| 2103 | + add_option($geodir_option_name.'_'.$version_date, $geodir_option); | |
| 2104 | 2104 | } | 
| 2105 | 2105 | } | 
| 2106 | 2106 | |
| @@ -2114,10 +2114,10 @@ discard block | ||
| 2114 | 2114 | * | 
| 2115 | 2115 | * @return int Page ID. | 
| 2116 | 2116 | */ | 
| 2117 | -function get_page_id_geodir_add_listing_page( $page_id ) {
 | |
| 2118 | -	if ( geodir_wpml_multilingual_status() ) {
 | |
| 2117 | +function get_page_id_geodir_add_listing_page($page_id) {
 | |
| 2118 | +	if (geodir_wpml_multilingual_status()) {
 | |
| 2119 | 2119 | $post_type = 'post_page'; | 
| 2120 | - $page_id = geodir_get_wpml_element_id( $page_id, $post_type ); | |
| 2120 | + $page_id = geodir_get_wpml_element_id($page_id, $post_type); | |
| 2121 | 2121 | } | 
| 2122 | 2122 | |
| 2123 | 2123 | return $page_id; | 
| @@ -2131,7 +2131,7 @@ discard block | ||
| 2131 | 2131 | * @return bool Returns true when sitepress multilingual CMS active. else returns false. | 
| 2132 | 2132 | */ | 
| 2133 | 2133 |  function geodir_wpml_multilingual_status() {
 | 
| 2134 | -	if ( function_exists( 'icl_object_id' ) ) {
 | |
| 2134 | +	if (function_exists('icl_object_id')) {
 | |
| 2135 | 2135 | return true; | 
| 2136 | 2136 | } | 
| 2137 | 2137 | |
| @@ -2149,19 +2149,19 @@ discard block | ||
| 2149 | 2149 | * | 
| 2150 | 2150 | * @return int Element ID when exists. Else the page id. | 
| 2151 | 2151 | */ | 
| 2152 | -function geodir_get_wpml_element_id( $page_id, $post_type ) {
 | |
| 2152 | +function geodir_get_wpml_element_id($page_id, $post_type) {
 | |
| 2153 | 2153 | global $sitepress; | 
| 2154 | -	if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {
 | |
| 2155 | - $trid = $sitepress->get_element_trid( $page_id, $post_type ); | |
| 2154 | +	if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {
 | |
| 2155 | + $trid = $sitepress->get_element_trid($page_id, $post_type); | |
| 2156 | 2156 | |
| 2157 | -		if ( $trid > 0 ) {
 | |
| 2158 | - $translations = $sitepress->get_element_translations( $trid, $post_type ); | |
| 2157 | +		if ($trid > 0) {
 | |
| 2158 | + $translations = $sitepress->get_element_translations($trid, $post_type); | |
| 2159 | 2159 | |
| 2160 | 2160 | $lang = $sitepress->get_current_language(); | 
| 2161 | 2161 | $lang = $lang ? $lang : $sitepress->get_default_language(); | 
| 2162 | 2162 | |
| 2163 | -			if ( ! empty( $translations ) && ! empty( $lang ) && isset( $translations[ $lang ] ) && isset( $translations[ $lang ]->element_id ) && ! empty( $translations[ $lang ]->element_id ) ) {
 | |
| 2164 | - $page_id = $translations[ $lang ]->element_id; | |
| 2163 | +			if (!empty($translations) && !empty($lang) && isset($translations[$lang]) && isset($translations[$lang]->element_id) && !empty($translations[$lang]->element_id)) {
 | |
| 2164 | + $page_id = $translations[$lang]->element_id; | |
| 2165 | 2165 | } | 
| 2166 | 2166 | } | 
| 2167 | 2167 | } | 
| @@ -2178,15 +2178,15 @@ discard block | ||
| 2178 | 2178 | */ | 
| 2179 | 2179 |  function geodir_wpml_check_element_id() {
 | 
| 2180 | 2180 | global $sitepress; | 
| 2181 | -	if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {
 | |
| 2181 | +	if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {
 | |
| 2182 | 2182 | $el_type = 'post_page'; | 
| 2183 | - $el_id = get_option( 'geodir_add_listing_page' ); | |
| 2183 | +		$el_id        = get_option('geodir_add_listing_page');
 | |
| 2184 | 2184 | $default_lang = $sitepress->get_default_language(); | 
| 2185 | - $el_details = $sitepress->get_element_language_details( $el_id, $el_type ); | |
| 2185 | + $el_details = $sitepress->get_element_language_details($el_id, $el_type); | |
| 2186 | 2186 | |
| 2187 | -		if ( ! ( $el_id > 0 && $default_lang && ! empty( $el_details ) && isset( $el_details->language_code ) && $el_details->language_code == $default_lang ) ) {
 | |
| 2188 | -			if ( ! $el_details->source_language_code ) {
 | |
| 2189 | - $sitepress->set_element_language_details( $el_id, $el_type, '', $default_lang ); | |
| 2187 | +		if (!($el_id > 0 && $default_lang && !empty($el_details) && isset($el_details->language_code) && $el_details->language_code == $default_lang)) {
 | |
| 2188 | +			if (!$el_details->source_language_code) {
 | |
| 2189 | + $sitepress->set_element_language_details($el_id, $el_type, '', $default_lang); | |
| 2190 | 2190 | $sitepress->icl_translations_cache->clear(); | 
| 2191 | 2191 | } | 
| 2192 | 2192 | } | 
| @@ -2205,41 +2205,41 @@ discard block | ||
| 2205 | 2205 | * | 
| 2206 | 2206 | * @return string Orderby SQL. | 
| 2207 | 2207 | */ | 
| 2208 | -function geodir_widget_listings_get_order( $query_args ) {
 | |
| 2208 | +function geodir_widget_listings_get_order($query_args) {
 | |
| 2209 | 2209 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; | 
| 2210 | 2210 | |
| 2211 | 2211 | $query_args = $gd_query_args_widgets; | 
| 2212 | -	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
 | |
| 2213 | - return $wpdb->posts . ".post_date DESC, "; | |
| 2212 | +	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
 | |
| 2213 | + return $wpdb->posts.".post_date DESC, "; | |
| 2214 | 2214 | } | 
| 2215 | 2215 | |
| 2216 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; | |
| 2217 | - $table = $plugin_prefix . $post_type . '_detail'; | |
| 2216 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; | |
| 2217 | + $table = $plugin_prefix.$post_type.'_detail'; | |
| 2218 | 2218 | |
| 2219 | - $sort_by = ! empty( $query_args['order_by'] ) ? $query_args['order_by'] : ''; | |
| 2219 | + $sort_by = !empty($query_args['order_by']) ? $query_args['order_by'] : ''; | |
| 2220 | 2220 | |
| 2221 | -	switch ( $sort_by ) {
 | |
| 2221 | +	switch ($sort_by) {
 | |
| 2222 | 2222 | case 'latest': | 
| 2223 | 2223 | case 'newest': | 
| 2224 | - $orderby = $wpdb->posts . ".post_date DESC, "; | |
| 2224 | + $orderby = $wpdb->posts.".post_date DESC, "; | |
| 2225 | 2225 | break; | 
| 2226 | 2226 | case 'featured': | 
| 2227 | - $orderby = $table . ".is_featured ASC, ". $wpdb->posts . ".post_date DESC, "; | |
| 2227 | + $orderby = $table.".is_featured ASC, ".$wpdb->posts.".post_date DESC, "; | |
| 2228 | 2228 | break; | 
| 2229 | 2229 | case 'az': | 
| 2230 | - $orderby = $wpdb->posts . ".post_title ASC, "; | |
| 2230 | + $orderby = $wpdb->posts.".post_title ASC, "; | |
| 2231 | 2231 | break; | 
| 2232 | 2232 | case 'high_review': | 
| 2233 | - $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; | |
| 2233 | + $orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, "; | |
| 2234 | 2234 | break; | 
| 2235 | 2235 | case 'high_rating': | 
| 2236 | - $orderby = "( " . $table . ".overall_rating ) DESC, "; | |
| 2236 | + $orderby = "( ".$table.".overall_rating ) DESC, "; | |
| 2237 | 2237 | break; | 
| 2238 | 2238 | case 'random': | 
| 2239 | 2239 | $orderby = "RAND(), "; | 
| 2240 | 2240 | break; | 
| 2241 | 2241 | default: | 
| 2242 | - $orderby = $wpdb->posts . ".post_title ASC, "; | |
| 2242 | + $orderby = $wpdb->posts.".post_title ASC, "; | |
| 2243 | 2243 | break; | 
| 2244 | 2244 | } | 
| 2245 | 2245 | |
| @@ -2262,15 +2262,15 @@ discard block | ||
| 2262 | 2262 | * | 
| 2263 | 2263 | * @return mixed Result object. | 
| 2264 | 2264 | */ | 
| 2265 | -function geodir_get_widget_listings( $query_args = array(), $count_only = false ) {
 | |
| 2265 | +function geodir_get_widget_listings($query_args = array(), $count_only = false) {
 | |
| 2266 | 2266 | global $wpdb, $plugin_prefix, $table_prefix; | 
| 2267 | 2267 | $GLOBALS['gd_query_args_widgets'] = $query_args; | 
| 2268 | 2268 | $gd_query_args_widgets = $query_args; | 
| 2269 | 2269 | |
| 2270 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; | |
| 2271 | - $table = $plugin_prefix . $post_type . '_detail'; | |
| 2270 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; | |
| 2271 | + $table = $plugin_prefix.$post_type.'_detail'; | |
| 2272 | 2272 | |
| 2273 | - $fields = $wpdb->posts . ".*, " . $table . ".*"; | |
| 2273 | + $fields = $wpdb->posts.".*, ".$table.".*"; | |
| 2274 | 2274 | /** | 
| 2275 | 2275 | * Filter widget listing fields string part that is being used for query. | 
| 2276 | 2276 | * | 
| @@ -2280,17 +2280,17 @@ discard block | ||
| 2280 | 2280 | * @param string $table Table name. | 
| 2281 | 2281 | * @param string $post_type Post type. | 
| 2282 | 2282 | */ | 
| 2283 | - $fields = apply_filters( 'geodir_filter_widget_listings_fields', $fields, $table, $post_type ); | |
| 2283 | +	$fields = apply_filters('geodir_filter_widget_listings_fields', $fields, $table, $post_type);
 | |
| 2284 | 2284 | |
| 2285 | -	$join = "INNER JOIN " . $table . " ON (" . $table . ".post_id = " . $wpdb->posts . ".ID)";
 | |
| 2285 | +	$join = "INNER JOIN ".$table." ON (".$table.".post_id = ".$wpdb->posts.".ID)";
 | |
| 2286 | 2286 | |
| 2287 | 2287 | ########### WPML ########### | 
| 2288 | 2288 | |
| 2289 | -	if ( function_exists( 'icl_object_id' ) ) {
 | |
| 2289 | +	if (function_exists('icl_object_id')) {
 | |
| 2290 | 2290 | global $sitepress; | 
| 2291 | 2291 | $lang_code = ICL_LANGUAGE_CODE; | 
| 2292 | -		if ( $lang_code ) {
 | |
| 2293 | - $join .= " JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; | |
| 2292 | +		if ($lang_code) {
 | |
| 2293 | + $join .= " JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID"; | |
| 2294 | 2294 | } | 
| 2295 | 2295 | } | 
| 2296 | 2296 | |
| @@ -2304,15 +2304,15 @@ discard block | ||
| 2304 | 2304 | * @param string $join Join clause string. | 
| 2305 | 2305 | * @param string $post_type Post type. | 
| 2306 | 2306 | */ | 
| 2307 | - $join = apply_filters( 'geodir_filter_widget_listings_join', $join, $post_type ); | |
| 2307 | +	$join = apply_filters('geodir_filter_widget_listings_join', $join, $post_type);
 | |
| 2308 | 2308 | |
| 2309 | - $post_status = is_super_admin() ? " OR " . $wpdb->posts . ".post_status = 'private'" : ''; | |
| 2309 | + $post_status = is_super_admin() ? " OR ".$wpdb->posts.".post_status = 'private'" : ''; | |
| 2310 | 2310 | |
| 2311 | - $where = " AND ( " . $wpdb->posts . ".post_status = 'publish' " . $post_status . " ) AND " . $wpdb->posts . ".post_type = '" . $post_type . "'"; | |
| 2311 | + $where = " AND ( ".$wpdb->posts.".post_status = 'publish' ".$post_status." ) AND ".$wpdb->posts.".post_type = '".$post_type."'"; | |
| 2312 | 2312 | |
| 2313 | 2313 | ########### WPML ########### | 
| 2314 | -	if ( function_exists( 'icl_object_id' ) ) {
 | |
| 2315 | -		if ( $lang_code ) {
 | |
| 2314 | +	if (function_exists('icl_object_id')) {
 | |
| 2315 | +		if ($lang_code) {
 | |
| 2316 | 2316 | $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type = 'post_$post_type' "; | 
| 2317 | 2317 | } | 
| 2318 | 2318 | } | 
| @@ -2325,8 +2325,8 @@ discard block | ||
| 2325 | 2325 | * @param string $where Where clause string. | 
| 2326 | 2326 | * @param string $post_type Post type. | 
| 2327 | 2327 | */ | 
| 2328 | - $where = apply_filters( 'geodir_filter_widget_listings_where', $where, $post_type ); | |
| 2329 | - $where = $where != '' ? " WHERE 1=1 " . $where : ''; | |
| 2328 | +	$where = apply_filters('geodir_filter_widget_listings_where', $where, $post_type);
 | |
| 2329 | + $where = $where != '' ? " WHERE 1=1 ".$where : ''; | |
| 2330 | 2330 | |
| 2331 | 2331 | $groupby = " GROUP BY $wpdb->posts.ID "; //@todo is this needed? faster withotu | 
| 2332 | 2332 | /** | 
| @@ -2337,15 +2337,15 @@ discard block | ||
| 2337 | 2337 | * @param string $groupby Group by clause string. | 
| 2338 | 2338 | * @param string $post_type Post type. | 
| 2339 | 2339 | */ | 
| 2340 | - $groupby = apply_filters( 'geodir_filter_widget_listings_groupby', $groupby, $post_type ); | |
| 2340 | +	$groupby = apply_filters('geodir_filter_widget_listings_groupby', $groupby, $post_type);
 | |
| 2341 | 2341 | |
| 2342 | -	if ( $count_only ) {
 | |
| 2343 | - $sql = "SELECT COUNT(DISTINCT " . $wpdb->posts . ".ID) AS total FROM " . $wpdb->posts . " | |
| 2344 | - " . $join . " | |
| 2342 | +	if ($count_only) {
 | |
| 2343 | + $sql = "SELECT COUNT(DISTINCT ".$wpdb->posts.".ID) AS total FROM ".$wpdb->posts." | |
| 2344 | + " . $join." | |
| 2345 | 2345 | " . $where; | 
| 2346 | - $rows = (int) $wpdb->get_var( $sql ); | |
| 2346 | + $rows = (int) $wpdb->get_var($sql); | |
| 2347 | 2347 |  	} else {
 | 
| 2348 | - $orderby = geodir_widget_listings_get_order( $query_args ); | |
| 2348 | + $orderby = geodir_widget_listings_get_order($query_args); | |
| 2349 | 2349 | /** | 
| 2350 | 2350 | * Filter widget listing orderby clause string part that is being used for query. | 
| 2351 | 2351 | * | 
| @@ -2355,11 +2355,11 @@ discard block | ||
| 2355 | 2355 | * @param string $table Table name. | 
| 2356 | 2356 | * @param string $post_type Post type. | 
| 2357 | 2357 | */ | 
| 2358 | - $orderby = apply_filters( 'geodir_filter_widget_listings_orderby', $orderby, $table, $post_type ); | |
| 2359 | - $orderby .= $wpdb->posts . ".post_title ASC"; | |
| 2360 | - $orderby = $orderby != '' ? " ORDER BY " . $orderby : ''; | |
| 2358 | +		$orderby = apply_filters('geodir_filter_widget_listings_orderby', $orderby, $table, $post_type);
 | |
| 2359 | + $orderby .= $wpdb->posts.".post_title ASC"; | |
| 2360 | + $orderby = $orderby != '' ? " ORDER BY ".$orderby : ''; | |
| 2361 | 2361 | |
| 2362 | - $limit = ! empty( $query_args['posts_per_page'] ) ? $query_args['posts_per_page'] : 5; | |
| 2362 | + $limit = !empty($query_args['posts_per_page']) ? $query_args['posts_per_page'] : 5; | |
| 2363 | 2363 | /** | 
| 2364 | 2364 | * Filter widget listing limit that is being used for query. | 
| 2365 | 2365 | * | 
| @@ -2368,27 +2368,27 @@ discard block | ||
| 2368 | 2368 | * @param int $limit Query results limit. | 
| 2369 | 2369 | * @param string $post_type Post type. | 
| 2370 | 2370 | */ | 
| 2371 | - $limit = apply_filters( 'geodir_filter_widget_listings_limit', $limit, $post_type ); | |
| 2371 | +		$limit = apply_filters('geodir_filter_widget_listings_limit', $limit, $post_type);
 | |
| 2372 | 2372 | |
| 2373 | - $page = ! empty( $query_args['pageno'] ) ? absint( $query_args['pageno'] ) : 1; | |
| 2374 | -		if ( ! $page ) {
 | |
| 2373 | + $page = !empty($query_args['pageno']) ? absint($query_args['pageno']) : 1; | |
| 2374 | +		if (!$page) {
 | |
| 2375 | 2375 | $page = 1; | 
| 2376 | 2376 | } | 
| 2377 | 2377 | |
| 2378 | - $limit = (int) $limit > 0 ? " LIMIT " . absint( ( $page - 1 ) * (int) $limit ) . ", " . (int) $limit : ""; | |
| 2378 | + $limit = (int) $limit > 0 ? " LIMIT ".absint(($page - 1) * (int) $limit).", ".(int) $limit : ""; | |
| 2379 | 2379 | |
| 2380 | 2380 | //@todo removed SQL_CALC_FOUND_ROWS from below as don't think it is needed and query is faster without | 
| 2381 | - $sql = "SELECT " . $fields . " FROM " . $wpdb->posts . " | |
| 2382 | - " . $join . " | |
| 2383 | - " . $where . " | |
| 2384 | - " . $groupby . " | |
| 2385 | - " . $orderby . " | |
| 2381 | + $sql = "SELECT ".$fields." FROM ".$wpdb->posts." | |
| 2382 | + " . $join." | |
| 2383 | + " . $where." | |
| 2384 | + " . $groupby." | |
| 2385 | + " . $orderby." | |
| 2386 | 2386 | " . $limit; | 
| 2387 | - $rows = $wpdb->get_results( $sql ); | |
| 2387 | + $rows = $wpdb->get_results($sql); | |
| 2388 | 2388 | } | 
| 2389 | 2389 | |
| 2390 | - unset( $GLOBALS['gd_query_args_widgets'] ); | |
| 2391 | - unset( $gd_query_args_widgets ); | |
| 2390 | + unset($GLOBALS['gd_query_args_widgets']); | |
| 2391 | + unset($gd_query_args_widgets); | |
| 2392 | 2392 | |
| 2393 | 2393 | return $rows; | 
| 2394 | 2394 | } | 
| @@ -2405,11 +2405,11 @@ discard block | ||
| 2405 | 2405 | * | 
| 2406 | 2406 | * @return string Modified fields SQL. | 
| 2407 | 2407 | */ | 
| 2408 | -function geodir_function_widget_listings_fields( $fields ) {
 | |
| 2408 | +function geodir_function_widget_listings_fields($fields) {
 | |
| 2409 | 2409 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; | 
| 2410 | 2410 | |
| 2411 | 2411 | $query_args = $gd_query_args_widgets; | 
| 2412 | -	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
 | |
| 2412 | +	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
 | |
| 2413 | 2413 | return $fields; | 
| 2414 | 2414 | } | 
| 2415 | 2415 | |
| @@ -2428,24 +2428,24 @@ discard block | ||
| 2428 | 2428 | * | 
| 2429 | 2429 | * @return string Modified join clause SQL. | 
| 2430 | 2430 | */ | 
| 2431 | -function geodir_function_widget_listings_join( $join ) {
 | |
| 2431 | +function geodir_function_widget_listings_join($join) {
 | |
| 2432 | 2432 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; | 
| 2433 | 2433 | |
| 2434 | 2434 | $query_args = $gd_query_args_widgets; | 
| 2435 | -	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
 | |
| 2435 | +	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
 | |
| 2436 | 2436 | return $join; | 
| 2437 | 2437 | } | 
| 2438 | 2438 | |
| 2439 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; | |
| 2440 | - $table = $plugin_prefix . $post_type . '_detail'; | |
| 2439 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; | |
| 2440 | + $table = $plugin_prefix.$post_type.'_detail'; | |
| 2441 | 2441 | |
| 2442 | -	if ( ! empty( $query_args['with_pics_only'] ) ) {
 | |
| 2443 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; | |
| 2442 | +	if (!empty($query_args['with_pics_only'])) {
 | |
| 2443 | + $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )"; | |
| 2444 | 2444 | } | 
| 2445 | 2445 | |
| 2446 | -	if ( ! empty( $query_args['tax_query'] ) ) {
 | |
| 2447 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); | |
| 2448 | -		if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
 | |
| 2446 | +	if (!empty($query_args['tax_query'])) {
 | |
| 2447 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); | |
| 2448 | +		if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
 | |
| 2449 | 2449 | $join .= $tax_queries['join']; | 
| 2450 | 2450 | } | 
| 2451 | 2451 | } | 
| @@ -2465,49 +2465,49 @@ discard block | ||
| 2465 | 2465 | * | 
| 2466 | 2466 | * @return string Modified where clause SQL. | 
| 2467 | 2467 | */ | 
| 2468 | -function geodir_function_widget_listings_where( $where ) {
 | |
| 2468 | +function geodir_function_widget_listings_where($where) {
 | |
| 2469 | 2469 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; | 
| 2470 | 2470 | |
| 2471 | 2471 | $query_args = $gd_query_args_widgets; | 
| 2472 | -	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
 | |
| 2472 | +	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
 | |
| 2473 | 2473 | return $where; | 
| 2474 | 2474 | } | 
| 2475 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; | |
| 2476 | - $table = $plugin_prefix . $post_type . '_detail'; | |
| 2475 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; | |
| 2476 | + $table = $plugin_prefix.$post_type.'_detail'; | |
| 2477 | 2477 | |
| 2478 | -	if ( ! empty( $query_args ) ) {
 | |
| 2479 | -		if ( ! empty( $query_args['gd_location'] ) && function_exists( 'geodir_default_location_where' ) ) {
 | |
| 2480 | - $where = geodir_default_location_where( $where, $table ); | |
| 2478 | +	if (!empty($query_args)) {
 | |
| 2479 | +		if (!empty($query_args['gd_location']) && function_exists('geodir_default_location_where')) {
 | |
| 2480 | + $where = geodir_default_location_where($where, $table); | |
| 2481 | 2481 | } | 
| 2482 | 2482 | |
| 2483 | -		if ( ! empty( $query_args['post_author'] ) ) {
 | |
| 2484 | - $where .= " AND " . $wpdb->posts . ".post_author = " . (int) $query_args['post_author']; | |
| 2483 | +		if (!empty($query_args['post_author'])) {
 | |
| 2484 | + $where .= " AND ".$wpdb->posts.".post_author = ".(int) $query_args['post_author']; | |
| 2485 | 2485 | } | 
| 2486 | 2486 | |
| 2487 | -		if ( ! empty( $query_args['show_featured_only'] ) ) {
 | |
| 2488 | - $where .= " AND " . $table . ".is_featured = '1'"; | |
| 2487 | +		if (!empty($query_args['show_featured_only'])) {
 | |
| 2488 | + $where .= " AND ".$table.".is_featured = '1'"; | |
| 2489 | 2489 | } | 
| 2490 | 2490 | |
| 2491 | -		if ( ! empty( $query_args['show_special_only'] ) ) {
 | |
| 2492 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; | |
| 2491 | +		if (!empty($query_args['show_special_only'])) {
 | |
| 2492 | + $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )"; | |
| 2493 | 2493 | } | 
| 2494 | 2494 | |
| 2495 | -		if ( ! empty( $query_args['with_pics_only'] ) ) {
 | |
| 2496 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL "; | |
| 2495 | +		if (!empty($query_args['with_pics_only'])) {
 | |
| 2496 | + $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL "; | |
| 2497 | 2497 | } | 
| 2498 | 2498 | |
| 2499 | -		if ( ! empty( $query_args['featured_image_only'] ) ) {
 | |
| 2500 | - $where .= " AND " . $table . ".featured_image IS NOT NULL AND " . $table . ".featured_image!='' "; | |
| 2499 | +		if (!empty($query_args['featured_image_only'])) {
 | |
| 2500 | + $where .= " AND ".$table.".featured_image IS NOT NULL AND ".$table.".featured_image!='' "; | |
| 2501 | 2501 | } | 
| 2502 | 2502 | |
| 2503 | -		if ( ! empty( $query_args['with_videos_only'] ) ) {
 | |
| 2504 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; | |
| 2503 | +		if (!empty($query_args['with_videos_only'])) {
 | |
| 2504 | + $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )"; | |
| 2505 | 2505 | } | 
| 2506 | 2506 | |
| 2507 | -		if ( ! empty( $query_args['tax_query'] ) ) {
 | |
| 2508 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); | |
| 2507 | +		if (!empty($query_args['tax_query'])) {
 | |
| 2508 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); | |
| 2509 | 2509 | |
| 2510 | -			if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
 | |
| 2510 | +			if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
 | |
| 2511 | 2511 | $where .= $tax_queries['where']; | 
| 2512 | 2512 | } | 
| 2513 | 2513 | } | 
| @@ -2528,11 +2528,11 @@ discard block | ||
| 2528 | 2528 | * | 
| 2529 | 2529 | * @return string Modified orderby clause SQL. | 
| 2530 | 2530 | */ | 
| 2531 | -function geodir_function_widget_listings_orderby( $orderby ) {
 | |
| 2531 | +function geodir_function_widget_listings_orderby($orderby) {
 | |
| 2532 | 2532 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; | 
| 2533 | 2533 | |
| 2534 | 2534 | $query_args = $gd_query_args_widgets; | 
| 2535 | -	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
 | |
| 2535 | +	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
 | |
| 2536 | 2536 | return $orderby; | 
| 2537 | 2537 | } | 
| 2538 | 2538 | |
| @@ -2551,15 +2551,15 @@ discard block | ||
| 2551 | 2551 | * | 
| 2552 | 2552 | * @return int Query limit. | 
| 2553 | 2553 | */ | 
| 2554 | -function geodir_function_widget_listings_limit( $limit ) {
 | |
| 2554 | +function geodir_function_widget_listings_limit($limit) {
 | |
| 2555 | 2555 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; | 
| 2556 | 2556 | |
| 2557 | 2557 | $query_args = $gd_query_args_widgets; | 
| 2558 | -	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
 | |
| 2558 | +	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
 | |
| 2559 | 2559 | return $limit; | 
| 2560 | 2560 | } | 
| 2561 | 2561 | |
| 2562 | -	if ( ! empty( $query_args ) && ! empty( $query_args['posts_per_page'] ) ) {
 | |
| 2562 | +	if (!empty($query_args) && !empty($query_args['posts_per_page'])) {
 | |
| 2563 | 2563 | $limit = (int) $query_args['posts_per_page']; | 
| 2564 | 2564 | } | 
| 2565 | 2565 | |
| @@ -2577,12 +2577,12 @@ discard block | ||
| 2577 | 2577 | * | 
| 2578 | 2578 | * @return int Large size width. | 
| 2579 | 2579 | */ | 
| 2580 | -function geodir_media_image_large_width( $default = 800, $params = '' ) {
 | |
| 2581 | - $large_size_w = get_option( 'large_size_w' ); | |
| 2580 | +function geodir_media_image_large_width($default = 800, $params = '') {
 | |
| 2581 | +	$large_size_w = get_option('large_size_w');
 | |
| 2582 | 2582 | $large_size_w = $large_size_w > 0 ? $large_size_w : $default; | 
| 2583 | - $large_size_w = absint( $large_size_w ); | |
| 2583 | + $large_size_w = absint($large_size_w); | |
| 2584 | 2584 | |
| 2585 | -	if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
 | |
| 2585 | +	if (!get_option('geodir_use_wp_media_large_size')) {
 | |
| 2586 | 2586 | $large_size_w = 800; | 
| 2587 | 2587 | } | 
| 2588 | 2588 | |
| @@ -2595,7 +2595,7 @@ discard block | ||
| 2595 | 2595 | * @param int $default Default width. | 
| 2596 | 2596 | * @param string|array $params Image parameters. | 
| 2597 | 2597 | */ | 
| 2598 | - $large_size_w = apply_filters( 'geodir_filter_media_image_large_width', $large_size_w, $default, $params ); | |
| 2598 | +	$large_size_w = apply_filters('geodir_filter_media_image_large_width', $large_size_w, $default, $params);
 | |
| 2599 | 2599 | |
| 2600 | 2600 | return $large_size_w; | 
| 2601 | 2601 | } | 
| @@ -2611,12 +2611,12 @@ discard block | ||
| 2611 | 2611 | * | 
| 2612 | 2612 | * @return int Large size height. | 
| 2613 | 2613 | */ | 
| 2614 | -function geodir_media_image_large_height( $default = 800, $params = '' ) {
 | |
| 2615 | - $large_size_h = get_option( 'large_size_h' ); | |
| 2614 | +function geodir_media_image_large_height($default = 800, $params = '') {
 | |
| 2615 | +	$large_size_h = get_option('large_size_h');
 | |
| 2616 | 2616 | $large_size_h = $large_size_h > 0 ? $large_size_h : $default; | 
| 2617 | - $large_size_h = absint( $large_size_h ); | |
| 2617 | + $large_size_h = absint($large_size_h); | |
| 2618 | 2618 | |
| 2619 | -	if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
 | |
| 2619 | +	if (!get_option('geodir_use_wp_media_large_size')) {
 | |
| 2620 | 2620 | $large_size_h = 800; | 
| 2621 | 2621 | } | 
| 2622 | 2622 | |
| @@ -2629,7 +2629,7 @@ discard block | ||
| 2629 | 2629 | * @param int $default Default height. | 
| 2630 | 2630 | * @param string|array $params Image parameters. | 
| 2631 | 2631 | */ | 
| 2632 | - $large_size_h = apply_filters( 'geodir_filter_media_image_large_height', $large_size_h, $default, $params ); | |
| 2632 | +	$large_size_h = apply_filters('geodir_filter_media_image_large_height', $large_size_h, $default, $params);
 | |
| 2633 | 2633 | |
| 2634 | 2634 | return $large_size_h; | 
| 2635 | 2635 | } | 
| @@ -2646,8 +2646,8 @@ discard block | ||
| 2646 | 2646 | * | 
| 2647 | 2647 | * @return string Sanitized name. | 
| 2648 | 2648 | */ | 
| 2649 | -function geodir_sanitize_location_name( $type, $name, $translate = true ) {
 | |
| 2650 | -	if ( $name == '' ) {
 | |
| 2649 | +function geodir_sanitize_location_name($type, $name, $translate = true) {
 | |
| 2650 | +	if ($name == '') {
 | |
| 2651 | 2651 | return null; | 
| 2652 | 2652 | } | 
| 2653 | 2653 | |
| @@ -2656,13 +2656,13 @@ discard block | ||
| 2656 | 2656 | $type = $type == 'gd_city' ? 'city' : $type; | 
| 2657 | 2657 | |
| 2658 | 2658 | $return = $name; | 
| 2659 | -	if ( function_exists( 'get_actual_location_name' ) ) {
 | |
| 2660 | - $return = get_actual_location_name( $type, $name, $translate ); | |
| 2659 | +	if (function_exists('get_actual_location_name')) {
 | |
| 2660 | + $return = get_actual_location_name($type, $name, $translate); | |
| 2661 | 2661 |  	} else {
 | 
| 2662 | - $return = preg_replace( '/-(\d+)$/', '', $return ); | |
| 2663 | - $return = preg_replace( '/[_-]/', ' ', $return ); | |
| 2664 | - $return = geodir_ucwords( $return ); | |
| 2665 | - $return = $translate ? __( $return, 'geodirectory' ) : $return; | |
| 2662 | +		$return = preg_replace('/-(\d+)$/', '', $return);
 | |
| 2663 | +		$return = preg_replace('/[_-]/', ' ', $return);
 | |
| 2664 | + $return = geodir_ucwords($return); | |
| 2665 | + $return = $translate ? __($return, 'geodirectory') : $return; | |
| 2666 | 2666 | } | 
| 2667 | 2667 | |
| 2668 | 2668 | return $return; | 
| @@ -2677,14 +2677,14 @@ discard block | ||
| 2677 | 2677 | * | 
| 2678 | 2678 | * @param int $number Comments number. | 
| 2679 | 2679 | */ | 
| 2680 | -function geodir_comments_number( $number ) {
 | |
| 2680 | +function geodir_comments_number($number) {
 | |
| 2681 | 2681 | |
| 2682 | -	if ( $number > 1 ) {
 | |
| 2683 | - $output = str_replace( '%', number_format_i18n( $number ), __( '% Reviews', 'geodirectory' ) ); | |
| 2684 | -	} elseif ( $number == 0 || $number == '' ) {
 | |
| 2685 | - $output = __( 'No Reviews', 'geodirectory' ); | |
| 2682 | +	if ($number > 1) {
 | |
| 2683 | +		$output = str_replace('%', number_format_i18n($number), __('% Reviews', 'geodirectory'));
 | |
| 2684 | +	} elseif ($number == 0 || $number == '') {
 | |
| 2685 | +		$output = __('No Reviews', 'geodirectory');
 | |
| 2686 | 2686 |  	} else { // must be one
 | 
| 2687 | - $output = __( '1 Review', 'geodirectory' ); | |
| 2687 | +		$output = __('1 Review', 'geodirectory');
 | |
| 2688 | 2688 | } | 
| 2689 | 2689 | echo $output; | 
| 2690 | 2690 | } | 
| @@ -2699,18 +2699,18 @@ discard block | ||
| 2699 | 2699 | */ | 
| 2700 | 2700 |  function is_page_geodir_home() {
 | 
| 2701 | 2701 | global $wpdb; | 
| 2702 | - $cur_url = str_replace( array( "https://", "http://", "www." ), array( '', '', '' ), geodir_curPageURL() ); | |
| 2703 | -	if ( function_exists( 'geodir_location_geo_home_link' ) ) {
 | |
| 2704 | - remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); | |
| 2702 | +	$cur_url = str_replace(array("https://", "http://", "www."), array('', '', ''), geodir_curPageURL());
 | |
| 2703 | +	if (function_exists('geodir_location_geo_home_link')) {
 | |
| 2704 | +		remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
 | |
| 2705 | 2705 | } | 
| 2706 | - $home_url = home_url( '', 'http' ); | |
| 2707 | -	if ( function_exists( 'geodir_location_geo_home_link' ) ) {
 | |
| 2708 | - add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); | |
| 2706 | +	$home_url = home_url('', 'http');
 | |
| 2707 | +	if (function_exists('geodir_location_geo_home_link')) {
 | |
| 2708 | +		add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
 | |
| 2709 | 2709 | } | 
| 2710 | - $home_url = str_replace( "www.", "", $home_url ); | |
| 2711 | -	if ( ( strpos( $home_url, $cur_url ) !== false || strpos( $home_url . '/', $cur_url ) !== false ) && ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && get_option( 'page_on_front' ) == get_option( 'geodir_home_page' ) ) ) {
 | |
| 2710 | +	$home_url = str_replace("www.", "", $home_url);
 | |
| 2711 | +	if ((strpos($home_url, $cur_url) !== false || strpos($home_url.'/', $cur_url) !== false) && ('page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page'))) {
 | |
| 2712 | 2712 | return true; | 
| 2713 | -	} elseif ( get_query_var( 'page_id' ) == get_option( 'page_on_front' ) && 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && get_option( 'page_on_front' ) == get_option( 'geodir_home_page' ) ) {
 | |
| 2713 | +	} elseif (get_query_var('page_id') == get_option('page_on_front') && 'page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page')) {
 | |
| 2714 | 2714 | return true; | 
| 2715 | 2715 |  	} else {
 | 
| 2716 | 2716 | return false; | 
| @@ -2730,18 +2730,18 @@ discard block | ||
| 2730 | 2730 | * | 
| 2731 | 2731 | * @return string The canonical URL. | 
| 2732 | 2732 | */ | 
| 2733 | -function geodir_wpseo_homepage_canonical( $url ) {
 | |
| 2733 | +function geodir_wpseo_homepage_canonical($url) {
 | |
| 2734 | 2734 | global $post; | 
| 2735 | 2735 | |
| 2736 | -	if ( is_page_geodir_home() ) {
 | |
| 2736 | +	if (is_page_geodir_home()) {
 | |
| 2737 | 2737 | return home_url(); | 
| 2738 | 2738 | } | 
| 2739 | 2739 | |
| 2740 | 2740 | return $url; | 
| 2741 | 2741 | } | 
| 2742 | 2742 | |
| 2743 | -add_filter( 'wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10 ); | |
| 2744 | -add_filter( 'aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10 ); | |
| 2743 | +add_filter('wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10);
 | |
| 2744 | +add_filter('aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10);
 | |
| 2745 | 2745 | |
| 2746 | 2746 | /** | 
| 2747 | 2747 | * Add extra fields to google maps script call. | 
| @@ -2754,20 +2754,20 @@ discard block | ||
| 2754 | 2754 | * | 
| 2755 | 2755 | * @return string Modified extra string. | 
| 2756 | 2756 | */ | 
| 2757 | -function geodir_googlemap_script_extra_details_page( $extra ) {
 | |
| 2757 | +function geodir_googlemap_script_extra_details_page($extra) {
 | |
| 2758 | 2758 | global $post; | 
| 2759 | 2759 | $add_google_places_api = false; | 
| 2760 | -	if ( isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {
 | |
| 2760 | +	if (isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
 | |
| 2761 | 2761 | $add_google_places_api = true; | 
| 2762 | 2762 | } | 
| 2763 | -	if ( ! str_replace( 'libraries=places', '', $extra ) && ( geodir_is_page( 'detail' ) || $add_google_places_api ) ) {
 | |
| 2763 | +	if (!str_replace('libraries=places', '', $extra) && (geodir_is_page('detail') || $add_google_places_api)) {
 | |
| 2764 | 2764 | $extra .= "&libraries=places"; | 
| 2765 | 2765 | } | 
| 2766 | 2766 | |
| 2767 | 2767 | return $extra; | 
| 2768 | 2768 | } | 
| 2769 | 2769 | |
| 2770 | -add_filter( 'geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1 ); | |
| 2770 | +add_filter('geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1);
 | |
| 2771 | 2771 | |
| 2772 | 2772 | |
| 2773 | 2773 | /** | 
| @@ -2785,102 +2785,102 @@ discard block | ||
| 2785 | 2785 | * after_widget. | 
| 2786 | 2786 | * @param array|string $instance The settings for the particular instance of the widget. | 
| 2787 | 2787 | */ | 
| 2788 | -function geodir_popular_post_category_output( $args = '', $instance = '' ) {
 | |
| 2788 | +function geodir_popular_post_category_output($args = '', $instance = '') {
 | |
| 2789 | 2789 | // prints the widget | 
| 2790 | 2790 | global $wpdb, $plugin_prefix, $geodir_post_category_str; | 
| 2791 | - extract( $args, EXTR_SKIP ); | |
| 2791 | + extract($args, EXTR_SKIP); | |
| 2792 | 2792 | |
| 2793 | 2793 | echo $before_widget; | 
| 2794 | 2794 | |
| 2795 | 2795 | /** This filter is documented in geodirectory_widgets.php */ | 
| 2796 | - $title = empty( $instance['title'] ) ? __( 'Popular Categories', 'geodirectory' ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); | |
| 2796 | +	$title = empty($instance['title']) ? __('Popular Categories', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
 | |
| 2797 | 2797 | |
| 2798 | 2798 | $gd_post_type = geodir_get_current_posttype(); | 
| 2799 | 2799 | |
| 2800 | - $category_limit = isset( $instance['category_limit'] ) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; | |
| 2800 | + $category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; | |
| 2801 | 2801 |  	if (!isset($category_restrict)) {
 | 
| 2802 | 2802 | $category_restrict = false; | 
| 2803 | 2803 | } | 
| 2804 | -	if ( ! empty( $gd_post_type ) ) {
 | |
| 2804 | +	if (!empty($gd_post_type)) {
 | |
| 2805 | 2805 | $default_post_type = $gd_post_type; | 
| 2806 | -	} elseif ( isset( $instance['default_post_type'] ) && gdsc_is_post_type_valid( $instance['default_post_type'] ) ) {
 | |
| 2806 | +	} elseif (isset($instance['default_post_type']) && gdsc_is_post_type_valid($instance['default_post_type'])) {
 | |
| 2807 | 2807 | $default_post_type = $instance['default_post_type']; | 
| 2808 | 2808 |  	} else {
 | 
| 2809 | 2809 | $all_gd_post_type = geodir_get_posttypes(); | 
| 2810 | - $default_post_type = ( isset( $all_gd_post_type[0] ) ) ? $all_gd_post_type[0] : ''; | |
| 2810 | + $default_post_type = (isset($all_gd_post_type[0])) ? $all_gd_post_type[0] : ''; | |
| 2811 | 2811 | } | 
| 2812 | - $parent_only = !empty( $instance['parent_only'] ) ? true : false; | |
| 2812 | + $parent_only = !empty($instance['parent_only']) ? true : false; | |
| 2813 | 2813 | |
| 2814 | 2814 | $taxonomy = array(); | 
| 2815 | -	if ( ! empty( $gd_post_type ) ) {
 | |
| 2816 | - $taxonomy[] = $gd_post_type . "category"; | |
| 2815 | +	if (!empty($gd_post_type)) {
 | |
| 2816 | + $taxonomy[] = $gd_post_type."category"; | |
| 2817 | 2817 |  	} else {
 | 
| 2818 | - $taxonomy = geodir_get_taxonomies( $gd_post_type ); | |
| 2818 | + $taxonomy = geodir_get_taxonomies($gd_post_type); | |
| 2819 | 2819 | } | 
| 2820 | 2820 | |
| 2821 | - $term_args = array( 'taxonomy' => $taxonomy ); | |
| 2822 | -	if ( $parent_only ) {
 | |
| 2821 | +	$term_args = array('taxonomy' => $taxonomy);
 | |
| 2822 | +	if ($parent_only) {
 | |
| 2823 | 2823 | $term_args['parent'] = 0; | 
| 2824 | 2824 | } | 
| 2825 | 2825 | |
| 2826 | - $terms = get_terms( $term_args ); | |
| 2826 | + $terms = get_terms($term_args); | |
| 2827 | 2827 | $a_terms = array(); | 
| 2828 | 2828 | $b_terms = array(); | 
| 2829 | 2829 | |
| 2830 | -	foreach ( $terms as $term ) {
 | |
| 2831 | -		if ( $term->count > 0 ) {
 | |
| 2832 | - $a_terms[ $term->taxonomy ][] = $term; | |
| 2830 | +	foreach ($terms as $term) {
 | |
| 2831 | +		if ($term->count > 0) {
 | |
| 2832 | + $a_terms[$term->taxonomy][] = $term; | |
| 2833 | 2833 | } | 
| 2834 | 2834 | } | 
| 2835 | 2835 | |
| 2836 | -	if ( ! empty( $a_terms ) ) {
 | |
| 2837 | -		foreach ( $a_terms as $b_key => $b_val ) {
 | |
| 2838 | - $b_terms[ $b_key ] = geodir_sort_terms( $b_val, 'count' ); | |
| 2836 | +	if (!empty($a_terms)) {
 | |
| 2837 | +		foreach ($a_terms as $b_key => $b_val) {
 | |
| 2838 | + $b_terms[$b_key] = geodir_sort_terms($b_val, 'count'); | |
| 2839 | 2839 | } | 
| 2840 | 2840 | |
| 2841 | - $default_taxonomy = $default_post_type != '' && isset( $b_terms[ $default_post_type . 'category' ] ) ? $default_post_type . 'category' : ''; | |
| 2841 | + $default_taxonomy = $default_post_type != '' && isset($b_terms[$default_post_type.'category']) ? $default_post_type.'category' : ''; | |
| 2842 | 2842 | |
| 2843 | 2843 | $tax_change_output = ''; | 
| 2844 | -		if ( count( $b_terms ) > 1 ) {
 | |
| 2845 | - $tax_change_output .= "<select data-limit='$category_limit' data-parent='" . (int)$parent_only . "' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; | |
| 2846 | -			foreach ( $b_terms as $key => $val ) {
 | |
| 2847 | - $ptype = get_post_type_object( str_replace( "category", "", $key ) ); | |
| 2848 | - $cpt_name = __( $ptype->labels->singular_name, 'geodirectory' ); | |
| 2849 | - $tax_change_output .= "<option value='$key' " . selected( $key, $default_taxonomy, false ) . ">" . sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name ) . "</option>"; | |
| 2844 | +		if (count($b_terms) > 1) {
 | |
| 2845 | + $tax_change_output .= "<select data-limit='$category_limit' data-parent='".(int) $parent_only."' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; | |
| 2846 | +			foreach ($b_terms as $key => $val) {
 | |
| 2847 | +				$ptype    = get_post_type_object(str_replace("category", "", $key));
 | |
| 2848 | + $cpt_name = __($ptype->labels->singular_name, 'geodirectory'); | |
| 2849 | +				$tax_change_output .= "<option value='$key' ".selected($key, $default_taxonomy, false).">".sprintf(__('%s Categories', 'geodirectory'), $cpt_name)."</option>";
 | |
| 2850 | 2850 | } | 
| 2851 | 2851 | $tax_change_output .= "</select>"; | 
| 2852 | 2852 | } | 
| 2853 | 2853 | |
| 2854 | -		if ( ! empty( $b_terms ) ) {
 | |
| 2855 | - $terms = $default_taxonomy != '' && isset( $b_terms[ $default_taxonomy ] ) ? $b_terms[ $default_taxonomy ] : reset( $b_terms );// get the first array | |
| 2856 | - global $cat_count;//make global so we can change via function | |
| 2854 | +		if (!empty($b_terms)) {
 | |
| 2855 | + $terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms); // get the first array | |
| 2856 | + global $cat_count; //make global so we can change via function | |
| 2857 | 2857 | $cat_count = 0; | 
| 2858 | 2858 | ?> | 
| 2859 | 2859 | <div class="geodir-category-list-in clearfix"> | 
| 2860 | 2860 | <div class="geodir-cat-list clearfix"> | 
| 2861 | 2861 | <?php | 
| 2862 | - echo $before_title . __( $title ) . $after_title; | |
| 2862 | + echo $before_title.__($title).$after_title; | |
| 2863 | 2863 | |
| 2864 | 2864 | echo $tax_change_output; | 
| 2865 | 2865 | |
| 2866 | 2866 | echo '<ul class="geodir-popular-cat-list">'; | 
| 2867 | 2867 | |
| 2868 | - geodir_helper_cat_list_output( $terms, $category_limit, $category_restrict); | |
| 2868 | + geodir_helper_cat_list_output($terms, $category_limit, $category_restrict); | |
| 2869 | 2869 | |
| 2870 | 2870 | echo '</ul>'; | 
| 2871 | 2871 | ?> | 
| 2872 | 2872 | </div> | 
| 2873 | 2873 | <?php | 
| 2874 | 2874 | $hide = ''; | 
| 2875 | -				if ( $cat_count < $category_limit ) {
 | |
| 2875 | +				if ($cat_count < $category_limit) {
 | |
| 2876 | 2876 | $hide = 'style="display:none;"'; | 
| 2877 | 2877 | } | 
| 2878 | 2878 | echo "<div class='geodir-cat-list-more' $hide >"; | 
| 2879 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">' . __( 'More Categories', 'geodirectory' ) . '</a>'; | |
| 2880 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">' . __( 'Less Categories', 'geodirectory' ) . '</a>'; | |
| 2879 | +				echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">'.__('More Categories', 'geodirectory').'</a>';
 | |
| 2880 | +				echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">'.__('Less Categories', 'geodirectory').'</a>';
 | |
| 2881 | 2881 | echo "</div>"; | 
| 2882 | 2882 | /* add scripts */ | 
| 2883 | - add_action( 'wp_footer', 'geodir_popular_category_add_scripts', 100 ); | |
| 2883 | +				add_action('wp_footer', 'geodir_popular_category_add_scripts', 100);
 | |
| 2884 | 2884 | ?> | 
| 2885 | 2885 | </div> | 
| 2886 | 2886 | <?php | 
| @@ -2900,28 +2900,28 @@ discard block | ||
| 2900 | 2900 | * @param int $category_limit Number of categories to display by default. | 
| 2901 | 2901 | * @param bool $category_restrict If the cat limit shoudl be hidden or not shown. | 
| 2902 | 2902 | */ | 
| 2903 | -function geodir_helper_cat_list_output( $terms, $category_limit , $category_restrict=false) {
 | |
| 2903 | +function geodir_helper_cat_list_output($terms, $category_limit, $category_restrict = false) {
 | |
| 2904 | 2904 | global $geodir_post_category_str, $cat_count; | 
| 2905 | 2905 | $term_icons = geodir_get_term_icon(); | 
| 2906 | 2906 | |
| 2907 | 2907 | $geodir_post_category_str = array(); | 
| 2908 | 2908 | |
| 2909 | 2909 | |
| 2910 | -	foreach ( $terms as $cat ) {
 | |
| 2911 | - $post_type = str_replace( "category", "", $cat->taxonomy ); | |
| 2912 | - $term_icon_url = ! empty( $term_icons ) && isset( $term_icons[ $cat->term_id ] ) ? $term_icons[ $cat->term_id ] : ''; | |
| 2910 | +	foreach ($terms as $cat) {
 | |
| 2911 | +		$post_type     = str_replace("category", "", $cat->taxonomy);
 | |
| 2912 | + $term_icon_url = !empty($term_icons) && isset($term_icons[$cat->term_id]) ? $term_icons[$cat->term_id] : ''; | |
| 2913 | 2913 | |
| 2914 | - $cat_count ++; | |
| 2914 | + $cat_count++; | |
| 2915 | 2915 | |
| 2916 | - $geodir_post_category_str[] = array( 'posttype' => $post_type, 'termid' => $cat->term_id ); | |
| 2916 | +		$geodir_post_category_str[] = array('posttype' => $post_type, 'termid' => $cat->term_id);
 | |
| 2917 | 2917 | |
| 2918 | - $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; | |
| 2919 | -		if($category_restrict && $cat_count > $category_limit ){
 | |
| 2918 | + $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; | |
| 2919 | +		if ($category_restrict && $cat_count > $category_limit) {
 | |
| 2920 | 2920 | continue; | 
| 2921 | 2921 | } | 
| 2922 | 2922 | $total_post = $cat->count; | 
| 2923 | 2923 | |
| 2924 | - $term_link = get_term_link( $cat, $cat->taxonomy ); | |
| 2924 | + $term_link = get_term_link($cat, $cat->taxonomy); | |
| 2925 | 2925 | /** | 
| 2926 | 2926 | * Filer the category term link. | 
| 2927 | 2927 | * | 
| @@ -2931,11 +2931,11 @@ discard block | ||
| 2931 | 2931 | * @param int $cat ->term_id The term id. | 
| 2932 | 2932 | * @param string $post_type Wordpress post type. | 
| 2933 | 2933 | */ | 
| 2934 | - $term_link = apply_filters( 'geodir_category_term_link', $term_link, $cat->term_id, $post_type ); | |
| 2934 | +		$term_link = apply_filters('geodir_category_term_link', $term_link, $cat->term_id, $post_type);
 | |
| 2935 | 2935 | |
| 2936 | - echo '<li class="' . $class_row . '"><a href="' . $term_link . '">'; | |
| 2937 | - echo '<img alt="' . esc_attr( $cat->name ) . ' icon" style="height:20px;vertical-align:middle;" src="' . $term_icon_url . '"/> <span class="cat-link">'; | |
| 2938 | -		echo $cat->name . '</span> <span class="geodir_term_class geodir_link_span geodir_category_class_' . $post_type . '_' . $cat->term_id . '">(' . $total_post . ')</span> ';
 | |
| 2936 | + echo '<li class="'.$class_row.'"><a href="'.$term_link.'">'; | |
| 2937 | + echo '<img alt="'.esc_attr($cat->name).' icon" style="height:20px;vertical-align:middle;" src="'.$term_icon_url.'"/> <span class="cat-link">'; | |
| 2938 | +		echo $cat->name.'</span> <span class="geodir_term_class geodir_link_span geodir_category_class_'.$post_type.'_'.$cat->term_id.'">('.$total_post.')</span> ';
 | |
| 2939 | 2939 | echo '</a></li>'; | 
| 2940 | 2940 | } | 
| 2941 | 2941 | } | 
| @@ -2950,14 +2950,14 @@ discard block | ||
| 2950 | 2950 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. | 
| 2951 | 2951 | * @param array|string $instance The settings for the particular instance of the widget. | 
| 2952 | 2952 | */ | 
| 2953 | -function geodir_listing_slider_widget_output( $args = '', $instance = '' ) {
 | |
| 2953 | +function geodir_listing_slider_widget_output($args = '', $instance = '') {
 | |
| 2954 | 2954 | // prints the widget | 
| 2955 | - extract( $args, EXTR_SKIP ); | |
| 2955 | + extract($args, EXTR_SKIP); | |
| 2956 | 2956 | |
| 2957 | 2957 | echo $before_widget; | 
| 2958 | 2958 | |
| 2959 | 2959 | /** This filter is documented in geodirectory_widgets.php */ | 
| 2960 | - $title = empty( $instance['title'] ) ? '' : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); | |
| 2960 | +	$title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
 | |
| 2961 | 2961 | /** | 
| 2962 | 2962 | * Filter the widget post type. | 
| 2963 | 2963 | * | 
| @@ -2965,7 +2965,7 @@ discard block | ||
| 2965 | 2965 | * | 
| 2966 | 2966 | * @param string $instance ['post_type'] Post type of listing. | 
| 2967 | 2967 | */ | 
| 2968 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); | |
| 2968 | +	$post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
 | |
| 2969 | 2969 | /** | 
| 2970 | 2970 | * Filter the widget's term. | 
| 2971 | 2971 | * | 
| @@ -2973,7 +2973,7 @@ discard block | ||
| 2973 | 2973 | * | 
| 2974 | 2974 | * @param string $instance ['category'] Filter by term. Can be any valid term. | 
| 2975 | 2975 | */ | 
| 2976 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); | |
| 2976 | +	$category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
 | |
| 2977 | 2977 | /** | 
| 2978 | 2978 | * Filter widget's "add_location_filter" value. | 
| 2979 | 2979 | * | 
| @@ -2981,7 +2981,7 @@ discard block | ||
| 2981 | 2981 | * | 
| 2982 | 2982 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. | 
| 2983 | 2983 | */ | 
| 2984 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); | |
| 2984 | +	$add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
 | |
| 2985 | 2985 | /** | 
| 2986 | 2986 | * Filter the widget listings limit. | 
| 2987 | 2987 | * | 
| @@ -2989,7 +2989,7 @@ discard block | ||
| 2989 | 2989 | * | 
| 2990 | 2990 | * @param string $instance ['post_number'] Number of listings to display. | 
| 2991 | 2991 | */ | 
| 2992 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); | |
| 2992 | +	$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
 | |
| 2993 | 2993 | /** | 
| 2994 | 2994 | * Filter the widget listings limit shown at one time. | 
| 2995 | 2995 | * | 
| @@ -2997,7 +2997,7 @@ discard block | ||
| 2997 | 2997 | * | 
| 2998 | 2998 | * @param string $instance ['max_show'] Number of listings to display on screen. | 
| 2999 | 2999 | */ | 
| 3000 | - $max_show = empty( $instance['max_show'] ) ? '1' : apply_filters( 'widget_max_show', $instance['max_show'] ); | |
| 3000 | +	$max_show = empty($instance['max_show']) ? '1' : apply_filters('widget_max_show', $instance['max_show']);
 | |
| 3001 | 3001 | /** | 
| 3002 | 3002 | * Filter the widget slide width. | 
| 3003 | 3003 | * | 
| @@ -3005,7 +3005,7 @@ discard block | ||
| 3005 | 3005 | * | 
| 3006 | 3006 | * @param string $instance ['slide_width'] Width of the slides shown. | 
| 3007 | 3007 | */ | 
| 3008 | - $slide_width = empty( $instance['slide_width'] ) ? '' : apply_filters( 'widget_slide_width', $instance['slide_width'] ); | |
| 3008 | +	$slide_width = empty($instance['slide_width']) ? '' : apply_filters('widget_slide_width', $instance['slide_width']);
 | |
| 3009 | 3009 | /** | 
| 3010 | 3010 | * Filter widget's "show title" value. | 
| 3011 | 3011 | * | 
| @@ -3013,7 +3013,7 @@ discard block | ||
| 3013 | 3013 | * | 
| 3014 | 3014 | * @param string|bool $instance ['show_title'] Do you want to display title? Can be 1 or 0. | 
| 3015 | 3015 | */ | 
| 3016 | - $show_title = empty( $instance['show_title'] ) ? '' : apply_filters( 'widget_show_title', $instance['show_title'] ); | |
| 3016 | +	$show_title = empty($instance['show_title']) ? '' : apply_filters('widget_show_title', $instance['show_title']);
 | |
| 3017 | 3017 | /** | 
| 3018 | 3018 | * Filter widget's "slideshow" value. | 
| 3019 | 3019 | * | 
| @@ -3021,7 +3021,7 @@ discard block | ||
| 3021 | 3021 | * | 
| 3022 | 3022 | * @param int $instance ['slideshow'] Setup a slideshow for the slider to animate automatically. | 
| 3023 | 3023 | */ | 
| 3024 | - $slideshow = empty( $instance['slideshow'] ) ? 0 : apply_filters( 'widget_slideshow', $instance['slideshow'] ); | |
| 3024 | +	$slideshow = empty($instance['slideshow']) ? 0 : apply_filters('widget_slideshow', $instance['slideshow']);
 | |
| 3025 | 3025 | /** | 
| 3026 | 3026 | * Filter widget's "animationLoop" value. | 
| 3027 | 3027 | * | 
| @@ -3029,7 +3029,7 @@ discard block | ||
| 3029 | 3029 | * | 
| 3030 | 3030 | * @param int $instance ['animationLoop'] Gives the slider a seamless infinite loop. | 
| 3031 | 3031 | */ | 
| 3032 | - $animationLoop = empty( $instance['animationLoop'] ) ? 0 : apply_filters( 'widget_animationLoop', $instance['animationLoop'] ); | |
| 3032 | +	$animationLoop = empty($instance['animationLoop']) ? 0 : apply_filters('widget_animationLoop', $instance['animationLoop']);
 | |
| 3033 | 3033 | /** | 
| 3034 | 3034 | * Filter widget's "directionNav" value. | 
| 3035 | 3035 | * | 
| @@ -3037,7 +3037,7 @@ discard block | ||
| 3037 | 3037 | * | 
| 3038 | 3038 | * @param int $instance ['directionNav'] Enable previous/next arrow navigation?. Can be 1 or 0. | 
| 3039 | 3039 | */ | 
| 3040 | - $directionNav = empty( $instance['directionNav'] ) ? 0 : apply_filters( 'widget_directionNav', $instance['directionNav'] ); | |
| 3040 | +	$directionNav = empty($instance['directionNav']) ? 0 : apply_filters('widget_directionNav', $instance['directionNav']);
 | |
| 3041 | 3041 | /** | 
| 3042 | 3042 | * Filter widget's "slideshowSpeed" value. | 
| 3043 | 3043 | * | 
| @@ -3045,7 +3045,7 @@ discard block | ||
| 3045 | 3045 | * | 
| 3046 | 3046 | * @param int $instance ['slideshowSpeed'] Set the speed of the slideshow cycling, in milliseconds. | 
| 3047 | 3047 | */ | 
| 3048 | - $slideshowSpeed = empty( $instance['slideshowSpeed'] ) ? 5000 : apply_filters( 'widget_slideshowSpeed', $instance['slideshowSpeed'] ); | |
| 3048 | +	$slideshowSpeed = empty($instance['slideshowSpeed']) ? 5000 : apply_filters('widget_slideshowSpeed', $instance['slideshowSpeed']);
 | |
| 3049 | 3049 | /** | 
| 3050 | 3050 | * Filter widget's "animationSpeed" value. | 
| 3051 | 3051 | * | 
| @@ -3053,7 +3053,7 @@ discard block | ||
| 3053 | 3053 | * | 
| 3054 | 3054 | * @param int $instance ['animationSpeed'] Set the speed of animations, in milliseconds. | 
| 3055 | 3055 | */ | 
| 3056 | - $animationSpeed = empty( $instance['animationSpeed'] ) ? 600 : apply_filters( 'widget_animationSpeed', $instance['animationSpeed'] ); | |
| 3056 | +	$animationSpeed = empty($instance['animationSpeed']) ? 600 : apply_filters('widget_animationSpeed', $instance['animationSpeed']);
 | |
| 3057 | 3057 | /** | 
| 3058 | 3058 | * Filter widget's "animation" value. | 
| 3059 | 3059 | * | 
| @@ -3061,7 +3061,7 @@ discard block | ||
| 3061 | 3061 | * | 
| 3062 | 3062 | * @param string $instance ['animation'] Controls the animation type, "fade" or "slide". | 
| 3063 | 3063 | */ | 
| 3064 | - $animation = empty( $instance['animation'] ) ? 'slide' : apply_filters( 'widget_animation', $instance['animation'] ); | |
| 3064 | +	$animation = empty($instance['animation']) ? 'slide' : apply_filters('widget_animation', $instance['animation']);
 | |
| 3065 | 3065 | /** | 
| 3066 | 3066 | * Filter widget's "list_sort" type. | 
| 3067 | 3067 | * | 
| @@ -3069,10 +3069,10 @@ discard block | ||
| 3069 | 3069 | * | 
| 3070 | 3070 | * @param string $instance ['list_sort'] Listing sort by type. | 
| 3071 | 3071 | */ | 
| 3072 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); | |
| 3073 | - $show_featured_only = ! empty( $instance['show_featured_only'] ) ? 1 : null; | |
| 3072 | +	$list_sort          = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
 | |
| 3073 | + $show_featured_only = !empty($instance['show_featured_only']) ? 1 : null; | |
| 3074 | 3074 | |
| 3075 | - wp_enqueue_script( 'geodirectory-jquery-flexslider-js' ); | |
| 3075 | +	wp_enqueue_script('geodirectory-jquery-flexslider-js');
 | |
| 3076 | 3076 | ?> | 
| 3077 | 3077 | <script type="text/javascript"> | 
| 3078 | 3078 |  		jQuery(window).load(function () {
 | 
| @@ -3090,23 +3090,23 @@ discard block | ||
| 3090 | 3090 | itemWidth: 75, | 
| 3091 | 3091 | itemMargin: 5, | 
| 3092 | 3092 | asNavFor: '#geodir_widget_slider', | 
| 3093 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?> | |
| 3093 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?> | |
| 3094 | 3094 | }); | 
| 3095 | 3095 | |
| 3096 | 3096 |  			jQuery('#geodir_widget_slider').flexslider({
 | 
| 3097 | - animation: "<?php echo $animation;?>", | |
| 3097 | + animation: "<?php echo $animation; ?>", | |
| 3098 | 3098 | selector: ".geodir-slides > li", | 
| 3099 | 3099 | namespace: "geodir-", | 
| 3100 | 3100 | controlNav: true, | 
| 3101 | - animationLoop: <?php echo $animationLoop;?>, | |
| 3102 | - slideshow: <?php echo $slideshow;?>, | |
| 3103 | - slideshowSpeed: <?php echo $slideshowSpeed;?>, | |
| 3104 | - animationSpeed: <?php echo $animationSpeed;?>, | |
| 3105 | - directionNav: <?php echo $directionNav;?>, | |
| 3106 | - maxItems: <?php echo $max_show;?>, | |
| 3101 | + animationLoop: <?php echo $animationLoop; ?>, | |
| 3102 | + slideshow: <?php echo $slideshow; ?>, | |
| 3103 | + slideshowSpeed: <?php echo $slideshowSpeed; ?>, | |
| 3104 | + animationSpeed: <?php echo $animationSpeed; ?>, | |
| 3105 | + directionNav: <?php echo $directionNav; ?>, | |
| 3106 | + maxItems: <?php echo $max_show; ?>, | |
| 3107 | 3107 | move: 1, | 
| 3108 | -				<?php if ( $slide_width ) {
 | |
| 3109 | - echo "itemWidth: " . $slide_width . ","; | |
| 3108 | +				<?php if ($slide_width) {
 | |
| 3109 | + echo "itemWidth: ".$slide_width.","; | |
| 3110 | 3110 | }?> | 
| 3111 | 3111 | sync: "#geodir_widget_carousel", | 
| 3112 | 3112 |  				start: function (slider) {
 | 
| @@ -3118,7 +3118,7 @@ discard block | ||
| 3118 | 3118 |  					jQuery('#geodir_widget_slider').css({'visibility': 'visible'});
 | 
| 3119 | 3119 |  					jQuery('#geodir_widget_carousel').css({'visibility': 'visible'});
 | 
| 3120 | 3120 | }, | 
| 3121 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?> | |
| 3121 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?> | |
| 3122 | 3122 | }); | 
| 3123 | 3123 | }); | 
| 3124 | 3124 | </script> | 
| @@ -3131,62 +3131,62 @@ discard block | ||
| 3131 | 3131 | 'order_by' => $list_sort | 
| 3132 | 3132 | ); | 
| 3133 | 3133 | |
| 3134 | -	if ( $show_featured_only ) {
 | |
| 3134 | +	if ($show_featured_only) {
 | |
| 3135 | 3135 | $query_args['show_featured_only'] = 1; | 
| 3136 | 3136 | } | 
| 3137 | 3137 | |
| 3138 | -	if ( $category != 0 || $category != '' ) {
 | |
| 3139 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); | |
| 3138 | +	if ($category != 0 || $category != '') {
 | |
| 3139 | + $category_taxonomy = geodir_get_taxonomies($post_type); | |
| 3140 | 3140 | $tax_query = array( | 
| 3141 | 3141 | 'taxonomy' => $category_taxonomy[0], | 
| 3142 | 3142 | 'field' => 'id', | 
| 3143 | 3143 | 'terms' => $category | 
| 3144 | 3144 | ); | 
| 3145 | 3145 | |
| 3146 | - $query_args['tax_query'] = array( $tax_query ); | |
| 3146 | + $query_args['tax_query'] = array($tax_query); | |
| 3147 | 3147 | } | 
| 3148 | 3148 | |
| 3149 | 3149 | // we want listings with featured image only | 
| 3150 | 3150 | $query_args['featured_image_only'] = 1; | 
| 3151 | 3151 | |
| 3152 | -	if ( $post_type == 'gd_event' ) {
 | |
| 3152 | +	if ($post_type == 'gd_event') {
 | |
| 3153 | 3153 | $query_args['gedir_event_listing_filter'] = 'upcoming'; | 
| 3154 | 3154 | }// show only upcoming events | 
| 3155 | 3155 | |
| 3156 | - $widget_listings = geodir_get_widget_listings( $query_args ); | |
| 3157 | -	if ( ! empty( $widget_listings ) || ( isset( $with_no_results ) && $with_no_results ) ) {
 | |
| 3158 | -		if ( $title ) {
 | |
| 3159 | - echo $before_title . $title . $after_title; | |
| 3156 | + $widget_listings = geodir_get_widget_listings($query_args); | |
| 3157 | +	if (!empty($widget_listings) || (isset($with_no_results) && $with_no_results)) {
 | |
| 3158 | +		if ($title) {
 | |
| 3159 | + echo $before_title.$title.$after_title; | |
| 3160 | 3160 | } | 
| 3161 | 3161 | |
| 3162 | 3162 | global $post; | 
| 3163 | 3163 | |
| 3164 | - $current_post = $post;// keep current post info | |
| 3164 | + $current_post = $post; // keep current post info | |
| 3165 | 3165 | |
| 3166 | 3166 | $widget_main_slides = ''; | 
| 3167 | 3167 | $nav_slides = ''; | 
| 3168 | 3168 | $widget_slides = 0; | 
| 3169 | 3169 | |
| 3170 | -		foreach ( $widget_listings as $widget_listing ) {
 | |
| 3170 | +		foreach ($widget_listings as $widget_listing) {
 | |
| 3171 | 3171 | global $gd_widget_listing_type; | 
| 3172 | 3172 | $post = $widget_listing; | 
| 3173 | - $widget_image = geodir_get_featured_image( $post->ID, 'thumbnail', get_option( 'geodir_listing_no_img' ) ); | |
| 3173 | +			$widget_image = geodir_get_featured_image($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
 | |
| 3174 | 3174 | |
| 3175 | -			if ( ! empty( $widget_image ) ) {
 | |
| 3176 | -				if ( $widget_image->height >= 200 ) {
 | |
| 3175 | +			if (!empty($widget_image)) {
 | |
| 3176 | +				if ($widget_image->height >= 200) {
 | |
| 3177 | 3177 | $widget_spacer_height = 0; | 
| 3178 | 3178 |  				} else {
 | 
| 3179 | - $widget_spacer_height = ( ( 200 - $widget_image->height ) / 2 ); | |
| 3179 | + $widget_spacer_height = ((200 - $widget_image->height) / 2); | |
| 3180 | 3180 | } | 
| 3181 | 3181 | |
| 3182 | - $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" />'; | |
| 3182 | + $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" />'; | |
| 3183 | 3183 | |
| 3184 | 3184 | $title = ''; | 
| 3185 | -				if ( $show_title ) {
 | |
| 3186 | - $title_html = '<div class="geodir-slider-title"><a href="' . get_permalink( $post->ID ) . '">' . get_the_title( $post->ID ) . '</a></div>'; | |
| 3185 | +				if ($show_title) {
 | |
| 3186 | + $title_html = '<div class="geodir-slider-title"><a href="'.get_permalink($post->ID).'">'.get_the_title($post->ID).'</a></div>'; | |
| 3187 | 3187 | $post_id = $post->ID; | 
| 3188 | - $post_permalink = get_permalink( $post->ID ); | |
| 3189 | - $post_title = get_the_title( $post->ID ); | |
| 3188 | + $post_permalink = get_permalink($post->ID); | |
| 3189 | + $post_title = get_the_title($post->ID); | |
| 3190 | 3190 | /** | 
| 3191 | 3191 | * Filter the listing slider widget title. | 
| 3192 | 3192 | * | 
| @@ -3197,12 +3197,12 @@ discard block | ||
| 3197 | 3197 | * @param string $post_permalink The post permalink url. | 
| 3198 | 3198 | * @param string $post_title The post title text. | 
| 3199 | 3199 | */ | 
| 3200 | - $title = apply_filters( 'geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title ); | |
| 3200 | +					$title = apply_filters('geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title);
 | |
| 3201 | 3201 | } | 
| 3202 | 3202 | |
| 3203 | - $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>'; | |
| 3204 | - $nav_slides .= '<li><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:48px;margin:0 auto;" /></li>'; | |
| 3205 | - $widget_slides ++; | |
| 3203 | + $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>'; | |
| 3204 | + $nav_slides .= '<li><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:48px;margin:0 auto;" /></li>'; | |
| 3205 | + $widget_slides++; | |
| 3206 | 3206 | } | 
| 3207 | 3207 | } | 
| 3208 | 3208 | ?> | 
| @@ -3211,7 +3211,7 @@ discard block | ||
| 3211 | 3211 | <div id="geodir_widget_slider" class="geodir_flexslider"> | 
| 3212 | 3212 | <ul class="geodir-slides clearfix"><?php echo $widget_main_slides; ?></ul> | 
| 3213 | 3213 | </div> | 
| 3214 | -			<?php if ( $widget_slides > 1 ) { ?>
 | |
| 3214 | +			<?php if ($widget_slides > 1) { ?>
 | |
| 3215 | 3215 | <div id="geodir_widget_carousel" class="geodir_flexslider"> | 
| 3216 | 3216 | <ul class="geodir-slides clearfix"><?php echo $nav_slides; ?></ul> | 
| 3217 | 3217 | </div> | 
| @@ -3219,7 +3219,7 @@ discard block | ||
| 3219 | 3219 | </div> | 
| 3220 | 3220 | <?php | 
| 3221 | 3221 | $GLOBALS['post'] = $current_post; | 
| 3222 | - setup_postdata( $current_post ); | |
| 3222 | + setup_postdata($current_post); | |
| 3223 | 3223 | } | 
| 3224 | 3224 | echo $after_widget; | 
| 3225 | 3225 | } | 
| @@ -3235,46 +3235,46 @@ discard block | ||
| 3235 | 3235 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. | 
| 3236 | 3236 | * @param array|string $instance The settings for the particular instance of the widget. | 
| 3237 | 3237 | */ | 
| 3238 | -function geodir_loginwidget_output( $args = '', $instance = '' ) {
 | |
| 3238 | +function geodir_loginwidget_output($args = '', $instance = '') {
 | |
| 3239 | 3239 | //print_r($args); | 
| 3240 | 3240 | //print_r($instance); | 
| 3241 | 3241 | // prints the widget | 
| 3242 | - extract( $args, EXTR_SKIP ); | |
| 3242 | + extract($args, EXTR_SKIP); | |
| 3243 | 3243 | |
| 3244 | 3244 | /** This filter is documented in geodirectory_widgets.php */ | 
| 3245 | - $title = empty( $instance['title'] ) ? __( 'My Dashboard', 'geodirectory' ) : apply_filters( 'my_dashboard_widget_title', __( $instance['title'], 'geodirectory' ) ); | |
| 3245 | +	$title = empty($instance['title']) ? __('My Dashboard', 'geodirectory') : apply_filters('my_dashboard_widget_title', __($instance['title'], 'geodirectory'));
 | |
| 3246 | 3246 | |
| 3247 | 3247 | echo $before_widget; | 
| 3248 | - echo $before_title . $title . $after_title; | |
| 3248 | + echo $before_title.$title.$after_title; | |
| 3249 | 3249 | |
| 3250 | -	if ( is_user_logged_in() ) {
 | |
| 3250 | +	if (is_user_logged_in()) {
 | |
| 3251 | 3251 | global $current_user; | 
| 3252 | 3252 | |
| 3253 | - $author_link = get_author_posts_url( $current_user->data->ID ); | |
| 3254 | - $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false ); | |
| 3253 | + $author_link = get_author_posts_url($current_user->data->ID); | |
| 3254 | +		$author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
 | |
| 3255 | 3255 | |
| 3256 | 3256 | echo '<ul class="geodir-loginbox-list">'; | 
| 3257 | 3257 | ob_start(); | 
| 3258 | 3258 | ?> | 
| 3259 | 3259 | <li><a class="signin" | 
| 3260 | - href="<?php echo wp_logout_url( home_url() ); ?>"><?php _e( 'Logout', 'geodirectory' ); ?></a></li> | |
| 3260 | +		       href="<?php echo wp_logout_url(home_url()); ?>"><?php _e('Logout', 'geodirectory'); ?></a></li>
 | |
| 3261 | 3261 | <?php | 
| 3262 | - $post_types = geodir_get_posttypes( 'object' ); | |
| 3263 | - $show_add_listing_post_types_main_nav = get_option( 'geodir_add_listing_link_user_dashboard' ); | |
| 3264 | - $geodir_allow_posttype_frontend = get_option( 'geodir_allow_posttype_frontend' ); | |
| 3262 | +		$post_types                           = geodir_get_posttypes('object');
 | |
| 3263 | +		$show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_user_dashboard');
 | |
| 3264 | +		$geodir_allow_posttype_frontend       = get_option('geodir_allow_posttype_frontend');
 | |
| 3265 | 3265 | |
| 3266 | -		if ( ! empty( $show_add_listing_post_types_main_nav ) ) {
 | |
| 3266 | +		if (!empty($show_add_listing_post_types_main_nav)) {
 | |
| 3267 | 3267 | $addlisting_links = ''; | 
| 3268 | -			foreach ( $post_types as $key => $postobj ) {
 | |
| 3268 | +			foreach ($post_types as $key => $postobj) {
 | |
| 3269 | 3269 | |
| 3270 | -				if ( in_array( $key, $show_add_listing_post_types_main_nav ) ) {
 | |
| 3270 | +				if (in_array($key, $show_add_listing_post_types_main_nav)) {
 | |
| 3271 | 3271 | |
| 3272 | -					if ( $add_link = geodir_get_addlisting_link( $key ) ) {
 | |
| 3272 | +					if ($add_link = geodir_get_addlisting_link($key)) {
 | |
| 3273 | 3273 | |
| 3274 | 3274 | $name = $postobj->labels->name; | 
| 3275 | 3275 | |
| 3276 | 3276 | $selected = ''; | 
| 3277 | -						if ( geodir_get_current_posttype() == $key && geodir_is_page( 'add-listing' ) ) {
 | |
| 3277 | +						if (geodir_get_current_posttype() == $key && geodir_is_page('add-listing')) {
 | |
| 3278 | 3278 | $selected = 'selected="selected"'; | 
| 3279 | 3279 | } | 
| 3280 | 3280 | |
| @@ -3287,22 +3287,22 @@ discard block | ||
| 3287 | 3287 | * @param string $key Add listing array key. | 
| 3288 | 3288 | * @param int $current_user ->ID Current user ID. | 
| 3289 | 3289 | */ | 
| 3290 | - $add_link = apply_filters( 'geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID ); | |
| 3290 | +						$add_link = apply_filters('geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID);
 | |
| 3291 | 3291 | |
| 3292 | - $addlisting_links .= '<option ' . $selected . ' value="' . $add_link . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>'; | |
| 3292 | + $addlisting_links .= '<option '.$selected.' value="'.$add_link.'">'.__(ucfirst($name), 'geodirectory').'</option>'; | |
| 3293 | 3293 | |
| 3294 | 3294 | } | 
| 3295 | 3295 | } | 
| 3296 | 3296 | |
| 3297 | 3297 | } | 
| 3298 | 3298 | |
| 3299 | -			if ( $addlisting_links != '' ) { ?>
 | |
| 3299 | +			if ($addlisting_links != '') { ?>
 | |
| 3300 | 3300 | |
| 3301 | 3301 | <li><select id="geodir_add_listing" class="chosen_select" onchange="window.location.href=this.value" | 
| 3302 | 3302 | option-autoredirect="1" name="geodir_add_listing" option-ajaxchosen="false" | 
| 3303 | - data-placeholder="<?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?>"> | |
| 3303 | +				            data-placeholder="<?php echo esc_attr(__('Add Listing', 'geodirectory')); ?>">
 | |
| 3304 | 3304 | <option value="" disabled="disabled" selected="selected" | 
| 3305 | - style='display:none;'><?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?></option> | |
| 3305 | +						        style='display:none;'><?php echo esc_attr(__('Add Listing', 'geodirectory')); ?></option>
 | |
| 3306 | 3306 | <?php echo $addlisting_links; ?> | 
| 3307 | 3307 | </select></li> <?php | 
| 3308 | 3308 | |
| @@ -3310,23 +3310,23 @@ discard block | ||
| 3310 | 3310 | |
| 3311 | 3311 | } | 
| 3312 | 3312 | // My Favourites in Dashboard | 
| 3313 | - $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' ); | |
| 3313 | +		$show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
 | |
| 3314 | 3314 | $user_favourite = geodir_user_favourite_listing_count(); | 
| 3315 | 3315 | |
| 3316 | -		if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
 | |
| 3316 | +		if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
 | |
| 3317 | 3317 | $favourite_links = ''; | 
| 3318 | 3318 | |
| 3319 | -			foreach ( $post_types as $key => $postobj ) {
 | |
| 3320 | -				if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
 | |
| 3319 | +			foreach ($post_types as $key => $postobj) {
 | |
| 3320 | +				if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
 | |
| 3321 | 3321 | $name = $postobj->labels->name; | 
| 3322 | - $post_type_link = geodir_getlink( $author_link, array( | |
| 3322 | + $post_type_link = geodir_getlink($author_link, array( | |
| 3323 | 3323 | 'stype' => $key, | 
| 3324 | 3324 | 'list' => 'favourite' | 
| 3325 | - ), false ); | |
| 3325 | + ), false); | |
| 3326 | 3326 | |
| 3327 | 3327 | $selected = ''; | 
| 3328 | 3328 | |
| 3329 | -					if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
 | |
| 3329 | +					if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
 | |
| 3330 | 3330 | $selected = 'selected="selected"'; | 
| 3331 | 3331 | } | 
| 3332 | 3332 | /** | 
| @@ -3338,20 +3338,20 @@ discard block | ||
| 3338 | 3338 | * @param string $key Favorite listing array key. | 
| 3339 | 3339 | * @param int $current_user ->ID Current user ID. | 
| 3340 | 3340 | */ | 
| 3341 | - $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID ); | |
| 3341 | +					$post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID);
 | |
| 3342 | 3342 | |
| 3343 | - $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>'; | |
| 3343 | + $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(ucfirst($name), 'geodirectory').'</option>'; | |
| 3344 | 3344 | } | 
| 3345 | 3345 | } | 
| 3346 | 3346 | |
| 3347 | -			if ( $favourite_links != '' ) {
 | |
| 3347 | +			if ($favourite_links != '') {
 | |
| 3348 | 3348 | ?> | 
| 3349 | 3349 | <li> | 
| 3350 | 3350 | <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" | 
| 3351 | 3351 | option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" | 
| 3352 | - data-placeholder="<?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?>"> | |
| 3352 | +					        data-placeholder="<?php echo esc_attr(__('My Favorites', 'geodirectory')); ?>">
 | |
| 3353 | 3353 | <option value="" disabled="disabled" selected="selected" | 
| 3354 | - style='display:none;'><?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?></option> | |
| 3354 | +						        style='display:none;'><?php echo esc_attr(__('My Favorites', 'geodirectory')); ?></option>
 | |
| 3355 | 3355 | <?php echo $favourite_links; ?> | 
| 3356 | 3356 | </select> | 
| 3357 | 3357 | </li> | 
| @@ -3360,19 +3360,19 @@ discard block | ||
| 3360 | 3360 | } | 
| 3361 | 3361 | |
| 3362 | 3362 | |
| 3363 | - $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' ); | |
| 3363 | +		$show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
 | |
| 3364 | 3364 | $user_listing = geodir_user_post_listing_count(); | 
| 3365 | 3365 | |
| 3366 | -		if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
 | |
| 3366 | +		if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
 | |
| 3367 | 3367 | $listing_links = ''; | 
| 3368 | 3368 | |
| 3369 | -			foreach ( $post_types as $key => $postobj ) {
 | |
| 3370 | -				if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
 | |
| 3369 | +			foreach ($post_types as $key => $postobj) {
 | |
| 3370 | +				if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
 | |
| 3371 | 3371 | $name = $postobj->labels->name; | 
| 3372 | - $listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false ); | |
| 3372 | +					$listing_link = geodir_getlink($author_link, array('stype' => $key), false);
 | |
| 3373 | 3373 | |
| 3374 | 3374 | $selected = ''; | 
| 3375 | -					if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
 | |
| 3375 | +					if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
 | |
| 3376 | 3376 | $selected = 'selected="selected"'; | 
| 3377 | 3377 | } | 
| 3378 | 3378 | |
| @@ -3385,20 +3385,20 @@ discard block | ||
| 3385 | 3385 | * @param string $key My listing array key. | 
| 3386 | 3386 | * @param int $current_user ->ID Current user ID. | 
| 3387 | 3387 | */ | 
| 3388 | - $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID ); | |
| 3388 | +					$listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID);
 | |
| 3389 | 3389 | |
| 3390 | - $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>'; | |
| 3390 | + $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(ucfirst($name), 'geodirectory').'</option>'; | |
| 3391 | 3391 | } | 
| 3392 | 3392 | } | 
| 3393 | 3393 | |
| 3394 | -			if ( $listing_links != '' ) {
 | |
| 3394 | +			if ($listing_links != '') {
 | |
| 3395 | 3395 | ?> | 
| 3396 | 3396 | <li> | 
| 3397 | 3397 | <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" | 
| 3398 | 3398 | option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" | 
| 3399 | - data-placeholder="<?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?>"> | |
| 3399 | +					        data-placeholder="<?php echo esc_attr(__('My Listings', 'geodirectory')); ?>">
 | |
| 3400 | 3400 | <option value="" disabled="disabled" selected="selected" | 
| 3401 | - style='display:none;'><?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?></option> | |
| 3401 | +						        style='display:none;'><?php echo esc_attr(__('My Listings', 'geodirectory')); ?></option>
 | |
| 3402 | 3402 | <?php echo $listing_links; ?> | 
| 3403 | 3403 | </select> | 
| 3404 | 3404 | </li> | 
| @@ -3414,7 +3414,7 @@ discard block | ||
| 3414 | 3414 | * | 
| 3415 | 3415 | * @param string $dashboard_link Dashboard links HTML. | 
| 3416 | 3416 | */ | 
| 3417 | - echo apply_filters( 'geodir_dashboard_links', $dashboard_link ); | |
| 3417 | +		echo apply_filters('geodir_dashboard_links', $dashboard_link);
 | |
| 3418 | 3418 | echo '</ul>'; | 
| 3419 | 3419 | |
| 3420 | 3420 | /** | 
| @@ -3422,7 +3422,7 @@ discard block | ||
| 3422 | 3422 | * | 
| 3423 | 3423 | * @since 1.6.6 | 
| 3424 | 3424 | */ | 
| 3425 | - do_action( 'geodir_after_loginwidget_form_logged_in' ); | |
| 3425 | +		do_action('geodir_after_loginwidget_form_logged_in');
 | |
| 3426 | 3426 | |
| 3427 | 3427 | |
| 3428 | 3428 |  	} else {
 | 
| @@ -3437,18 +3437,18 @@ discard block | ||
| 3437 | 3437 | <form name="loginform" class="loginform1" | 
| 3438 | 3438 | action="<?php echo geodir_login_url(); ?>" | 
| 3439 | 3439 | method="post"> | 
| 3440 | - <div class="geodir_form_row"><input placeholder="<?php _e( 'Email', 'geodirectory' ); ?>" name="log" | |
| 3440 | +			<div class="geodir_form_row"><input placeholder="<?php _e('Email', 'geodirectory'); ?>" name="log"
 | |
| 3441 | 3441 | type="text" class="textfield user_login1"/> <span | 
| 3442 | 3442 | class="user_loginInfo"></span></div> | 
| 3443 | - <div class="geodir_form_row"><input placeholder="<?php _e( 'Password', 'geodirectory' ); ?>" | |
| 3443 | +			<div class="geodir_form_row"><input placeholder="<?php _e('Password', 'geodirectory'); ?>"
 | |
| 3444 | 3444 | name="pwd" type="password" | 
| 3445 | 3445 | class="textfield user_pass1 input-text"/><span | 
| 3446 | 3446 | class="user_passInfo"></span></div> | 
| 3447 | 3447 | |
| 3448 | - <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars( geodir_curPageURL() ); ?>"/> | |
| 3448 | + <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars(geodir_curPageURL()); ?>"/> | |
| 3449 | 3449 | <input type="hidden" name="testcookie" value="1"/> | 
| 3450 | 3450 | |
| 3451 | - <?php do_action( 'login_form' ); ?> | |
| 3451 | +				<?php do_action('login_form'); ?>
 | |
| 3452 | 3452 | |
| 3453 | 3453 | <div class="geodir_form_row clearfix"><input type="submit" name="submit" | 
| 3454 | 3454 | value="<?php echo SIGN_IN_BUTTON; ?>" class="b_signin"/> | 
| @@ -3461,7 +3461,7 @@ discard block | ||
| 3461 | 3461 | * @since 1.0.0 | 
| 3462 | 3462 | */ | 
| 3463 | 3463 | ?> | 
| 3464 | - <a href="<?php echo geodir_login_url( array( 'signup' => true ) ); ?>" | |
| 3464 | +					<a href="<?php echo geodir_login_url(array('signup' => true)); ?>"
 | |
| 3465 | 3465 | class="goedir-newuser-link"><?php echo NEW_USER_TEXT; ?></a> | 
| 3466 | 3466 | |
| 3467 | 3467 | <?php | 
| @@ -3471,7 +3471,7 @@ discard block | ||
| 3471 | 3471 | * @since 1.0.0 | 
| 3472 | 3472 | */ | 
| 3473 | 3473 | ?> | 
| 3474 | - <a href="<?php echo geodir_login_url( array( 'forgot' => true ) ); ?>" | |
| 3474 | +					<a href="<?php echo geodir_login_url(array('forgot' => true)); ?>"
 | |
| 3475 | 3475 | class="goedir-forgot-link"><?php echo FORGOT_PW_TEXT; ?></a></p></div> | 
| 3476 | 3476 | </form> | 
| 3477 | 3477 | <?php | 
| @@ -3480,7 +3480,7 @@ discard block | ||
| 3480 | 3480 | * | 
| 3481 | 3481 | * @since 1.6.6 | 
| 3482 | 3482 | */ | 
| 3483 | - do_action( 'geodir_after_loginwidget_form_logged_out' ); | |
| 3483 | +		do_action('geodir_after_loginwidget_form_logged_out');
 | |
| 3484 | 3484 | } | 
| 3485 | 3485 | |
| 3486 | 3486 | echo $after_widget; | 
| @@ -3502,16 +3502,16 @@ discard block | ||
| 3502 | 3502 | * after_widget. | 
| 3503 | 3503 | * @param array|string $instance The settings for the particular instance of the widget. | 
| 3504 | 3504 | */ | 
| 3505 | -function geodir_popular_postview_output( $args = '', $instance = '' ) {
 | |
| 3505 | +function geodir_popular_postview_output($args = '', $instance = '') {
 | |
| 3506 | 3506 | global $gd_session; | 
| 3507 | 3507 | |
| 3508 | 3508 | // prints the widget | 
| 3509 | - extract( $args, EXTR_SKIP ); | |
| 3509 | + extract($args, EXTR_SKIP); | |
| 3510 | 3510 | |
| 3511 | 3511 | echo $before_widget; | 
| 3512 | 3512 | |
| 3513 | 3513 | /** This filter is documented in geodirectory_widgets.php */ | 
| 3514 | - $title = empty( $instance['title'] ) ? geodir_ucwords( $instance['category_title'] ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); | |
| 3514 | +	$title = empty($instance['title']) ? geodir_ucwords($instance['category_title']) : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
 | |
| 3515 | 3515 | /** | 
| 3516 | 3516 | * Filter the widget post type. | 
| 3517 | 3517 | * | 
| @@ -3519,7 +3519,7 @@ discard block | ||
| 3519 | 3519 | * | 
| 3520 | 3520 | * @param string $instance ['post_type'] Post type of listing. | 
| 3521 | 3521 | */ | 
| 3522 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); | |
| 3522 | +	$post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
 | |
| 3523 | 3523 | /** | 
| 3524 | 3524 | * Filter the widget's term. | 
| 3525 | 3525 | * | 
| @@ -3527,7 +3527,7 @@ discard block | ||
| 3527 | 3527 | * | 
| 3528 | 3528 | * @param string $instance ['category'] Filter by term. Can be any valid term. | 
| 3529 | 3529 | */ | 
| 3530 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); | |
| 3530 | +	$category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
 | |
| 3531 | 3531 | /** | 
| 3532 | 3532 | * Filter the widget listings limit. | 
| 3533 | 3533 | * | 
| @@ -3535,7 +3535,7 @@ discard block | ||
| 3535 | 3535 | * | 
| 3536 | 3536 | * @param string $instance ['post_number'] Number of listings to display. | 
| 3537 | 3537 | */ | 
| 3538 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); | |
| 3538 | +	$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
 | |
| 3539 | 3539 | /** | 
| 3540 | 3540 | * Filter widget's "layout" type. | 
| 3541 | 3541 | * | 
| @@ -3543,7 +3543,7 @@ discard block | ||
| 3543 | 3543 | * | 
| 3544 | 3544 | * @param string $instance ['layout'] Widget layout type. | 
| 3545 | 3545 | */ | 
| 3546 | - $layout = empty( $instance['layout'] ) ? 'gridview_onehalf' : apply_filters( 'widget_layout', $instance['layout'] ); | |
| 3546 | +	$layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);
 | |
| 3547 | 3547 | /** | 
| 3548 | 3548 | * Filter widget's "add_location_filter" value. | 
| 3549 | 3549 | * | 
| @@ -3551,7 +3551,7 @@ discard block | ||
| 3551 | 3551 | * | 
| 3552 | 3552 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. | 
| 3553 | 3553 | */ | 
| 3554 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); | |
| 3554 | +	$add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
 | |
| 3555 | 3555 | /** | 
| 3556 | 3556 | * Filter widget's listing width. | 
| 3557 | 3557 | * | 
| @@ -3559,7 +3559,7 @@ discard block | ||
| 3559 | 3559 | * | 
| 3560 | 3560 | * @param string $instance ['listing_width'] Listing width. | 
| 3561 | 3561 | */ | 
| 3562 | - $listing_width = empty( $instance['listing_width'] ) ? '' : apply_filters( 'widget_listing_width', $instance['listing_width'] ); | |
| 3562 | +	$listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);
 | |
| 3563 | 3563 | /** | 
| 3564 | 3564 | * Filter widget's "list_sort" type. | 
| 3565 | 3565 | * | 
| @@ -3567,25 +3567,25 @@ discard block | ||
| 3567 | 3567 | * | 
| 3568 | 3568 | * @param string $instance ['list_sort'] Listing sort by type. | 
| 3569 | 3569 | */ | 
| 3570 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); | |
| 3571 | - $use_viewing_post_type = ! empty( $instance['use_viewing_post_type'] ) ? true : false; | |
| 3570 | +	$list_sort             = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
 | |
| 3571 | + $use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false; | |
| 3572 | 3572 | |
| 3573 | 3573 | // set post type to current viewing post type | 
| 3574 | -	if ( $use_viewing_post_type ) {
 | |
| 3574 | +	if ($use_viewing_post_type) {
 | |
| 3575 | 3575 | $current_post_type = geodir_get_current_posttype(); | 
| 3576 | -		if ( $current_post_type != '' && $current_post_type != $post_type ) {
 | |
| 3576 | +		if ($current_post_type != '' && $current_post_type != $post_type) {
 | |
| 3577 | 3577 | $post_type = $current_post_type; | 
| 3578 | 3578 | $category = array(); // old post type category will not work for current changed post type | 
| 3579 | 3579 | } | 
| 3580 | 3580 | } | 
| 3581 | 3581 | // replace widget title dynamically | 
| 3582 | - $posttype_plural_label = __( get_post_type_plural_label( $post_type ), 'geodirectory' ); | |
| 3583 | - $posttype_singular_label = __( get_post_type_singular_label( $post_type ), 'geodirectory' ); | |
| 3582 | + $posttype_plural_label = __(get_post_type_plural_label($post_type), 'geodirectory'); | |
| 3583 | + $posttype_singular_label = __(get_post_type_singular_label($post_type), 'geodirectory'); | |
| 3584 | 3584 | |
| 3585 | - $title = str_replace( "%posttype_plural_label%", $posttype_plural_label, $title ); | |
| 3586 | - $title = str_replace( "%posttype_singular_label%", $posttype_singular_label, $title ); | |
| 3585 | +	$title = str_replace("%posttype_plural_label%", $posttype_plural_label, $title);
 | |
| 3586 | +	$title = str_replace("%posttype_singular_label%", $posttype_singular_label, $title);
 | |
| 3587 | 3587 | |
| 3588 | -	if ( isset( $instance['character_count'] ) ) {
 | |
| 3588 | +	if (isset($instance['character_count'])) {
 | |
| 3589 | 3589 | /** | 
| 3590 | 3590 | * Filter the widget's excerpt character count. | 
| 3591 | 3591 | * | 
| @@ -3593,37 +3593,37 @@ discard block | ||
| 3593 | 3593 | * | 
| 3594 | 3594 | * @param int $instance ['character_count'] Excerpt character count. | 
| 3595 | 3595 | */ | 
| 3596 | - $character_count = apply_filters( 'widget_list_character_count', $instance['character_count'] ); | |
| 3596 | +		$character_count = apply_filters('widget_list_character_count', $instance['character_count']);
 | |
| 3597 | 3597 |  	} else {
 | 
| 3598 | 3598 | $character_count = ''; | 
| 3599 | 3599 | } | 
| 3600 | 3600 | |
| 3601 | -	if ( empty( $title ) || $title == 'All' ) {
 | |
| 3602 | - $title .= ' ' . __( get_post_type_plural_label( $post_type ), 'geodirectory' ); | |
| 3601 | +	if (empty($title) || $title == 'All') {
 | |
| 3602 | + $title .= ' '.__(get_post_type_plural_label($post_type), 'geodirectory'); | |
| 3603 | 3603 | } | 
| 3604 | 3604 | |
| 3605 | 3605 | $location_url = array(); | 
| 3606 | - $city = get_query_var( 'gd_city' ); | |
| 3607 | -	if ( ! empty( $city ) ) {
 | |
| 3608 | - $country = get_query_var( 'gd_country' ); | |
| 3609 | - $region = get_query_var( 'gd_region' ); | |
| 3606 | +	$city         = get_query_var('gd_city');
 | |
| 3607 | +	if (!empty($city)) {
 | |
| 3608 | +		$country = get_query_var('gd_country');
 | |
| 3609 | +		$region  = get_query_var('gd_region');
 | |
| 3610 | 3610 | |
| 3611 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); | |
| 3611 | +		$geodir_show_location_url = get_option('geodir_show_location_url');
 | |
| 3612 | 3612 | |
| 3613 | -		if ( $geodir_show_location_url == 'all' ) {
 | |
| 3614 | -			if ( $country != '' ) {
 | |
| 3613 | +		if ($geodir_show_location_url == 'all') {
 | |
| 3614 | +			if ($country != '') {
 | |
| 3615 | 3615 | $location_url[] = $country; | 
| 3616 | 3616 | } | 
| 3617 | 3617 | |
| 3618 | -			if ( $region != '' ) {
 | |
| 3618 | +			if ($region != '') {
 | |
| 3619 | 3619 | $location_url[] = $region; | 
| 3620 | 3620 | } | 
| 3621 | -		} else if ( $geodir_show_location_url == 'country_city' ) {
 | |
| 3622 | -			if ( $country != '' ) {
 | |
| 3621 | +		} else if ($geodir_show_location_url == 'country_city') {
 | |
| 3622 | +			if ($country != '') {
 | |
| 3623 | 3623 | $location_url[] = $country; | 
| 3624 | 3624 | } | 
| 3625 | -		} else if ( $geodir_show_location_url == 'region_city' ) {
 | |
| 3626 | -			if ( $region != '' ) {
 | |
| 3625 | +		} else if ($geodir_show_location_url == 'region_city') {
 | |
| 3626 | +			if ($region != '') {
 | |
| 3627 | 3627 | $location_url[] = $region; | 
| 3628 | 3628 | } | 
| 3629 | 3629 | } | 
| @@ -3631,37 +3631,37 @@ discard block | ||
| 3631 | 3631 | $location_url[] = $city; | 
| 3632 | 3632 | } | 
| 3633 | 3633 | |
| 3634 | - $location_url = implode( '/', $location_url ); | |
| 3634 | +	$location_url  = implode('/', $location_url);
 | |
| 3635 | 3635 | $skip_location = false; | 
| 3636 | -	if ( ! $add_location_filter && $gd_session->get( 'gd_multi_location' ) ) {
 | |
| 3636 | +	if (!$add_location_filter && $gd_session->get('gd_multi_location')) {
 | |
| 3637 | 3637 | $skip_location = true; | 
| 3638 | - $gd_session->un_set( 'gd_multi_location' ); | |
| 3638 | +		$gd_session->un_set('gd_multi_location');
 | |
| 3639 | 3639 | } | 
| 3640 | 3640 | |
| 3641 | -	if ( get_option( 'permalink_structure' ) ) {
 | |
| 3642 | - $viewall_url = get_post_type_archive_link( $post_type ); | |
| 3641 | +	if (get_option('permalink_structure')) {
 | |
| 3642 | + $viewall_url = get_post_type_archive_link($post_type); | |
| 3643 | 3643 |  	} else {
 | 
| 3644 | - $viewall_url = get_post_type_archive_link( $post_type ); | |
| 3644 | + $viewall_url = get_post_type_archive_link($post_type); | |
| 3645 | 3645 | } | 
| 3646 | 3646 | |
| 3647 | -	if ( ! empty( $category ) && $category[0] != '0' ) {
 | |
| 3647 | +	if (!empty($category) && $category[0] != '0') {
 | |
| 3648 | 3648 | global $geodir_add_location_url; | 
| 3649 | 3649 | |
| 3650 | 3650 | $geodir_add_location_url = '0'; | 
| 3651 | 3651 | |
| 3652 | -		if ( $add_location_filter != '0' ) {
 | |
| 3652 | +		if ($add_location_filter != '0') {
 | |
| 3653 | 3653 | $geodir_add_location_url = '1'; | 
| 3654 | 3654 | } | 
| 3655 | 3655 | |
| 3656 | - $viewall_url = get_term_link( (int) $category[0], $post_type . 'category' ); | |
| 3656 | + $viewall_url = get_term_link((int) $category[0], $post_type.'category'); | |
| 3657 | 3657 | |
| 3658 | 3658 | $geodir_add_location_url = null; | 
| 3659 | 3659 | } | 
| 3660 | -	if ( $skip_location ) {
 | |
| 3661 | - $gd_session->set( 'gd_multi_location', 1 ); | |
| 3660 | +	if ($skip_location) {
 | |
| 3661 | +		$gd_session->set('gd_multi_location', 1);
 | |
| 3662 | 3662 | } | 
| 3663 | 3663 | |
| 3664 | -	if ( is_wp_error( $viewall_url ) ) {
 | |
| 3664 | +	if (is_wp_error($viewall_url)) {
 | |
| 3665 | 3665 | $viewall_url = ''; | 
| 3666 | 3666 | } | 
| 3667 | 3667 | |
| @@ -3673,34 +3673,34 @@ discard block | ||
| 3673 | 3673 | 'order_by' => $list_sort | 
| 3674 | 3674 | ); | 
| 3675 | 3675 | |
| 3676 | -	if ( $character_count ) {
 | |
| 3676 | +	if ($character_count) {
 | |
| 3677 | 3677 | $query_args['excerpt_length'] = $character_count; | 
| 3678 | 3678 | } | 
| 3679 | 3679 | |
| 3680 | -	if ( ! empty( $instance['show_featured_only'] ) ) {
 | |
| 3680 | +	if (!empty($instance['show_featured_only'])) {
 | |
| 3681 | 3681 | $query_args['show_featured_only'] = 1; | 
| 3682 | 3682 | } | 
| 3683 | 3683 | |
| 3684 | -	if ( ! empty( $instance['show_special_only'] ) ) {
 | |
| 3684 | +	if (!empty($instance['show_special_only'])) {
 | |
| 3685 | 3685 | $query_args['show_special_only'] = 1; | 
| 3686 | 3686 | } | 
| 3687 | 3687 | |
| 3688 | -	if ( ! empty( $instance['with_pics_only'] ) ) {
 | |
| 3688 | +	if (!empty($instance['with_pics_only'])) {
 | |
| 3689 | 3689 | $query_args['with_pics_only'] = 0; | 
| 3690 | 3690 | $query_args['featured_image_only'] = 1; | 
| 3691 | 3691 | } | 
| 3692 | 3692 | |
| 3693 | -	if ( ! empty( $instance['with_videos_only'] ) ) {
 | |
| 3693 | +	if (!empty($instance['with_videos_only'])) {
 | |
| 3694 | 3694 | $query_args['with_videos_only'] = 1; | 
| 3695 | 3695 | } | 
| 3696 | - $with_no_results = ! empty( $instance['without_no_results'] ) ? false : true; | |
| 3696 | + $with_no_results = !empty($instance['without_no_results']) ? false : true; | |
| 3697 | 3697 | |
| 3698 | -	if ( ! empty( $category ) && $category[0] != '0' ) {
 | |
| 3699 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); | |
| 3698 | +	if (!empty($category) && $category[0] != '0') {
 | |
| 3699 | + $category_taxonomy = geodir_get_taxonomies($post_type); | |
| 3700 | 3700 | |
| 3701 | 3701 | ######### WPML ######### | 
| 3702 | -		if ( function_exists( 'icl_object_id' ) ) {
 | |
| 3703 | - $category = gd_lang_object_ids( $category, $category_taxonomy[0] ); | |
| 3702 | +		if (function_exists('icl_object_id')) {
 | |
| 3703 | + $category = gd_lang_object_ids($category, $category_taxonomy[0]); | |
| 3704 | 3704 | } | 
| 3705 | 3705 | ######### WPML ######### | 
| 3706 | 3706 | |
| @@ -3710,14 +3710,14 @@ discard block | ||
| 3710 | 3710 | 'terms' => $category | 
| 3711 | 3711 | ); | 
| 3712 | 3712 | |
| 3713 | - $query_args['tax_query'] = array( $tax_query ); | |
| 3713 | + $query_args['tax_query'] = array($tax_query); | |
| 3714 | 3714 | } | 
| 3715 | 3715 | |
| 3716 | 3716 | global $gridview_columns_widget, $geodir_is_widget_listing; | 
| 3717 | 3717 | |
| 3718 | - $widget_listings = geodir_get_widget_listings( $query_args ); | |
| 3718 | + $widget_listings = geodir_get_widget_listings($query_args); | |
| 3719 | 3719 | |
| 3720 | -	if ( ! empty( $widget_listings ) || $with_no_results ) {
 | |
| 3720 | +	if (!empty($widget_listings) || $with_no_results) {
 | |
| 3721 | 3721 | ?> | 
| 3722 | 3722 | <div class="geodir_locations geodir_location_listing"> | 
| 3723 | 3723 | |
| @@ -3727,11 +3727,11 @@ discard block | ||
| 3727 | 3727 | * | 
| 3728 | 3728 | * @since 1.0.0 | 
| 3729 | 3729 | */ | 
| 3730 | - do_action( 'geodir_before_view_all_link_in_widget' ); ?> | |
| 3730 | +			do_action('geodir_before_view_all_link_in_widget'); ?>
 | |
| 3731 | 3731 | <div class="geodir_list_heading clearfix"> | 
| 3732 | - <?php echo $before_title . $title . $after_title; ?> | |
| 3732 | + <?php echo $before_title.$title.$after_title; ?> | |
| 3733 | 3733 | <a href="<?php echo $viewall_url; ?>" | 
| 3734 | - class="geodir-viewall"><?php _e( 'View all', 'geodirectory' ); ?></a> | |
| 3734 | +				   class="geodir-viewall"><?php _e('View all', 'geodirectory'); ?></a>
 | |
| 3735 | 3735 | </div> | 
| 3736 | 3736 | <?php | 
| 3737 | 3737 | /** | 
| @@ -3739,10 +3739,10 @@ discard block | ||
| 3739 | 3739 | * | 
| 3740 | 3740 | * @since 1.0.0 | 
| 3741 | 3741 | */ | 
| 3742 | - do_action( 'geodir_after_view_all_link_in_widget' ); ?> | |
| 3742 | +			do_action('geodir_after_view_all_link_in_widget'); ?>
 | |
| 3743 | 3743 | <?php | 
| 3744 | -			if ( strstr( $layout, 'gridview' ) ) {
 | |
| 3745 | - $listing_view_exp = explode( '_', $layout ); | |
| 3744 | +			if (strstr($layout, 'gridview')) {
 | |
| 3745 | +				$listing_view_exp        = explode('_', $layout);
 | |
| 3746 | 3746 | $gridview_columns_widget = $layout; | 
| 3747 | 3747 | $layout = $listing_view_exp[0]; | 
| 3748 | 3748 |  			} else {
 | 
| @@ -3754,8 +3754,8 @@ discard block | ||
| 3754 | 3754 | * | 
| 3755 | 3755 | * @since 1.0.0 | 
| 3756 | 3756 | */ | 
| 3757 | - $template = apply_filters( "geodir_template_part-widget-listing-listview", geodir_locate_template( 'widget-listing-listview' ) ); | |
| 3758 | -			if ( ! isset( $character_count ) ) {
 | |
| 3757 | +			$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
 | |
| 3758 | +			if (!isset($character_count)) {
 | |
| 3759 | 3759 | /** | 
| 3760 | 3760 | * Filter the widget's excerpt character count. | 
| 3761 | 3761 | * | 
| @@ -3763,7 +3763,7 @@ discard block | ||
| 3763 | 3763 | * | 
| 3764 | 3764 | * @param int $instance ['character_count'] Excerpt character count. | 
| 3765 | 3765 | */ | 
| 3766 | - $character_count = $character_count == '' ? 50 : apply_filters( 'widget_character_count', $character_count ); | |
| 3766 | +				$character_count = $character_count == '' ? 50 : apply_filters('widget_character_count', $character_count);
 | |
| 3767 | 3767 | } | 
| 3768 | 3768 | |
| 3769 | 3769 | global $post, $map_jason, $map_canvas_arr; | 
| @@ -3778,13 +3778,13 @@ discard block | ||
| 3778 | 3778 | * | 
| 3779 | 3779 | * @since 1.0.0 | 
| 3780 | 3780 | */ | 
| 3781 | - include( $template ); | |
| 3781 | + include($template); | |
| 3782 | 3782 | |
| 3783 | 3783 | $geodir_is_widget_listing = false; | 
| 3784 | 3784 | |
| 3785 | 3785 | $GLOBALS['post'] = $current_post; | 
| 3786 | -			if ( ! empty( $current_post ) ) {
 | |
| 3787 | - setup_postdata( $current_post ); | |
| 3786 | +			if (!empty($current_post)) {
 | |
| 3787 | + setup_postdata($current_post); | |
| 3788 | 3788 | } | 
| 3789 | 3789 | $map_jason = $current_map_jason; | 
| 3790 | 3790 | $map_canvas_arr = $current_map_canvas_arr; | 
| @@ -3815,12 +3815,12 @@ discard block | ||
| 3815 | 3815 | * | 
| 3816 | 3816 | * @return int Reviews count. | 
| 3817 | 3817 | */ | 
| 3818 | -function geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ) {
 | |
| 3818 | +function geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type) {
 | |
| 3819 | 3819 | global $wpdb, $plugin_prefix; | 
| 3820 | 3820 | |
| 3821 | - $detail_table = $plugin_prefix . $post_type . '_detail'; | |
| 3821 | + $detail_table = $plugin_prefix.$post_type.'_detail'; | |
| 3822 | 3822 | |
| 3823 | -	$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 . ")";
 | |
| 3823 | +	$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.")";
 | |
| 3824 | 3824 | |
| 3825 | 3825 | /** | 
| 3826 | 3826 | * Filter count review sql query. | 
| @@ -3832,9 +3832,9 @@ discard block | ||
| 3832 | 3832 | * @param int $taxonomy The taxonomy Id. | 
| 3833 | 3833 | * @param string $post_type The post type. | 
| 3834 | 3834 | */ | 
| 3835 | - $sql = apply_filters( 'geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type ); | |
| 3835 | +	$sql = apply_filters('geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type);
 | |
| 3836 | 3836 | |
| 3837 | - $count = $wpdb->get_var( $sql ); | |
| 3837 | + $count = $wpdb->get_var($sql); | |
| 3838 | 3838 | |
| 3839 | 3839 | return $count; | 
| 3840 | 3840 | } | 
| @@ -3852,7 +3852,7 @@ discard block | ||
| 3852 | 3852 | * | 
| 3853 | 3853 | * @return array Term array data. | 
| 3854 | 3854 | */ | 
| 3855 | -function geodir_count_reviews_by_terms( $force_update = false, $post_ID = 0 ) {
 | |
| 3855 | +function geodir_count_reviews_by_terms($force_update = false, $post_ID = 0) {
 | |
| 3856 | 3856 | /** | 
| 3857 | 3857 | * Filter review count option data. | 
| 3858 | 3858 | * | 
| @@ -3862,78 +3862,78 @@ discard block | ||
| 3862 | 3862 | * @param bool $force_update Force update option value?. Default.false. | 
| 3863 | 3863 | * @param int $post_ID The post id to update if any. | 
| 3864 | 3864 | */ | 
| 3865 | - $option_data = apply_filters( 'geodir_count_reviews_by_terms_before', '', $force_update, $post_ID ); | |
| 3866 | -	if ( ! empty( $option_data ) ) {
 | |
| 3865 | +	$option_data = apply_filters('geodir_count_reviews_by_terms_before', '', $force_update, $post_ID);
 | |
| 3866 | +	if (!empty($option_data)) {
 | |
| 3867 | 3867 | return $option_data; | 
| 3868 | 3868 | } | 
| 3869 | 3869 | |
| 3870 | - $option_data = get_option( 'geodir_global_review_count' ); | |
| 3870 | +	$option_data = get_option('geodir_global_review_count');
 | |
| 3871 | 3871 | |
| 3872 | -	if ( ! $option_data || $force_update ) {
 | |
| 3873 | -		if ( (int) $post_ID > 0 ) { // Update reviews count for specific post categories only.
 | |
| 3872 | +	if (!$option_data || $force_update) {
 | |
| 3873 | +		if ((int) $post_ID > 0) { // Update reviews count for specific post categories only.
 | |
| 3874 | 3874 | global $gd_session; | 
| 3875 | 3875 | $term_array = (array) $option_data; | 
| 3876 | - $post_type = get_post_type( $post_ID ); | |
| 3877 | - $taxonomy = $post_type . 'category'; | |
| 3878 | - $terms = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) ); | |
| 3879 | - | |
| 3880 | -			if ( ! empty( $terms ) && ! is_wp_error( $terms ) ) {
 | |
| 3881 | -				foreach ( $terms as $term_id ) {
 | |
| 3882 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); | |
| 3883 | - $children = get_term_children( $term_id, $taxonomy ); | |
| 3884 | - $term_array[ $term_id ] = $count; | |
| 3876 | + $post_type = get_post_type($post_ID); | |
| 3877 | + $taxonomy = $post_type.'category'; | |
| 3878 | +			$terms      = wp_get_object_terms($post_ID, $taxonomy, array('fields' => 'ids'));
 | |
| 3879 | + | |
| 3880 | +			if (!empty($terms) && !is_wp_error($terms)) {
 | |
| 3881 | +				foreach ($terms as $term_id) {
 | |
| 3882 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); | |
| 3883 | + $children = get_term_children($term_id, $taxonomy); | |
| 3884 | + $term_array[$term_id] = $count; | |
| 3885 | 3885 | } | 
| 3886 | 3886 | } | 
| 3887 | 3887 | |
| 3888 | - $session_listing = $gd_session->get( 'listing' ); | |
| 3888 | +			$session_listing = $gd_session->get('listing');
 | |
| 3889 | 3889 | |
| 3890 | 3890 | $terms = array(); | 
| 3891 | -			if ( isset( $_POST['post_category'][ $taxonomy ] ) ) {
 | |
| 3892 | - $terms = (array) $_POST['post_category'][ $taxonomy ]; | |
| 3893 | -			} else if ( ! empty( $session_listing ) && isset( $session_listing['post_category'][ $taxonomy ] ) ) {
 | |
| 3894 | - $terms = (array) $session_listing['post_category'][ $taxonomy ]; | |
| 3891 | +			if (isset($_POST['post_category'][$taxonomy])) {
 | |
| 3892 | + $terms = (array) $_POST['post_category'][$taxonomy]; | |
| 3893 | +			} else if (!empty($session_listing) && isset($session_listing['post_category'][$taxonomy])) {
 | |
| 3894 | + $terms = (array) $session_listing['post_category'][$taxonomy]; | |
| 3895 | 3895 | } | 
| 3896 | 3896 | |
| 3897 | -			if ( ! empty( $terms ) ) {
 | |
| 3898 | -				foreach ( $terms as $term_id ) {
 | |
| 3899 | -					if ( $term_id > 0 ) {
 | |
| 3900 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); | |
| 3901 | - $children = get_term_children( $term_id, $taxonomy ); | |
| 3902 | - $term_array[ $term_id ] = $count; | |
| 3897 | +			if (!empty($terms)) {
 | |
| 3898 | +				foreach ($terms as $term_id) {
 | |
| 3899 | +					if ($term_id > 0) {
 | |
| 3900 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); | |
| 3901 | + $children = get_term_children($term_id, $taxonomy); | |
| 3902 | + $term_array[$term_id] = $count; | |
| 3903 | 3903 | } | 
| 3904 | 3904 | } | 
| 3905 | 3905 | } | 
| 3906 | 3906 |  		} else { // Update reviews count for all post categories.
 | 
| 3907 | 3907 | $term_array = array(); | 
| 3908 | 3908 | $post_types = geodir_get_posttypes(); | 
| 3909 | -			foreach ( $post_types as $post_type ) {
 | |
| 3909 | +			foreach ($post_types as $post_type) {
 | |
| 3910 | 3910 | |
| 3911 | - $taxonomy = geodir_get_taxonomies( $post_type ); | |
| 3911 | + $taxonomy = geodir_get_taxonomies($post_type); | |
| 3912 | 3912 | $taxonomy = $taxonomy[0]; | 
| 3913 | 3913 | |
| 3914 | 3914 | $args = array( | 
| 3915 | 3915 | 'hide_empty' => false | 
| 3916 | 3916 | ); | 
| 3917 | 3917 | |
| 3918 | - $terms = get_terms( $taxonomy, $args ); | |
| 3918 | + $terms = get_terms($taxonomy, $args); | |
| 3919 | 3919 | |
| 3920 | -				foreach ( $terms as $term ) {
 | |
| 3921 | - $count = geodir_count_reviews_by_term_id( $term->term_id, $taxonomy, $post_type ); | |
| 3922 | - $children = get_term_children( $term->term_id, $taxonomy ); | |
| 3920 | +				foreach ($terms as $term) {
 | |
| 3921 | + $count = geodir_count_reviews_by_term_id($term->term_id, $taxonomy, $post_type); | |
| 3922 | + $children = get_term_children($term->term_id, $taxonomy); | |
| 3923 | 3923 |  					/*if ( is_array( $children ) ) {
 | 
| 3924 | 3924 |                          foreach ( $children as $child_id ) {
 | 
| 3925 | 3925 | $child_count = geodir_count_reviews_by_term_id($child_id, $taxonomy, $post_type); | 
| 3926 | 3926 | $count = $count + $child_count; | 
| 3927 | 3927 | } | 
| 3928 | 3928 | }*/ | 
| 3929 | - $term_array[ $term->term_id ] = $count; | |
| 3929 | + $term_array[$term->term_id] = $count; | |
| 3930 | 3930 | } | 
| 3931 | 3931 | } | 
| 3932 | 3932 | } | 
| 3933 | 3933 | |
| 3934 | - update_option( 'geodir_global_review_count', $term_array ); | |
| 3934 | +		update_option('geodir_global_review_count', $term_array);
 | |
| 3935 | 3935 | //clear cache | 
| 3936 | - wp_cache_delete( 'geodir_global_review_count' ); | |
| 3936 | +		wp_cache_delete('geodir_global_review_count');
 | |
| 3937 | 3937 | |
| 3938 | 3938 | return $term_array; | 
| 3939 | 3939 |  	} else {
 | 
| @@ -3949,39 +3949,39 @@ discard block | ||
| 3949 | 3949 | * @package GeoDirectory | 
| 3950 | 3950 | * @return bool | 
| 3951 | 3951 | */ | 
| 3952 | -function geodir_term_review_count_force_update( $new_status, $old_status = '', $post = '' ) {
 | |
| 3953 | -	if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'geodir_import_export' ) {
 | |
| 3952 | +function geodir_term_review_count_force_update($new_status, $old_status = '', $post = '') {
 | |
| 3953 | +	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'geodir_import_export') {
 | |
| 3954 | 3954 | return; // do not run if importing listings | 
| 3955 | 3955 | } | 
| 3956 | 3956 | |
| 3957 | -	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 | |
| 3957 | +	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 | |
| 3958 | 3958 | return; | 
| 3959 | 3959 | } | 
| 3960 | 3960 | |
| 3961 | 3961 | $post_ID = 0; | 
| 3962 | -	if ( ! empty( $post ) ) {
 | |
| 3963 | -		if ( isset( $post->post_type ) && strpos( $post->post_type, 'gd_' ) !== 0 ) {
 | |
| 3962 | +	if (!empty($post)) {
 | |
| 3963 | +		if (isset($post->post_type) && strpos($post->post_type, 'gd_') !== 0) {
 | |
| 3964 | 3964 | return; | 
| 3965 | 3965 | } | 
| 3966 | 3966 | |
| 3967 | -		if ( $new_status == 'auto-draft' && $old_status == 'new' ) {
 | |
| 3967 | +		if ($new_status == 'auto-draft' && $old_status == 'new') {
 | |
| 3968 | 3968 | return; | 
| 3969 | 3969 | } | 
| 3970 | 3970 | |
| 3971 | -		if ( ! empty( $post->ID ) ) {
 | |
| 3971 | +		if (!empty($post->ID)) {
 | |
| 3972 | 3972 | $post_ID = $post->ID; | 
| 3973 | 3973 | } | 
| 3974 | 3974 | } | 
| 3975 | 3975 | |
| 3976 | -	if ( $new_status != $old_status ) {
 | |
| 3977 | - geodir_count_reviews_by_terms( true, $post_ID ); | |
| 3976 | +	if ($new_status != $old_status) {
 | |
| 3977 | + geodir_count_reviews_by_terms(true, $post_ID); | |
| 3978 | 3978 | } | 
| 3979 | 3979 | |
| 3980 | 3980 | return true; | 
| 3981 | 3981 | } | 
| 3982 | 3982 | |
| 3983 | -function geodir_term_review_count_force_update_single_post( $post_id ) {
 | |
| 3984 | - geodir_count_reviews_by_terms( true, $post_id ); | |
| 3983 | +function geodir_term_review_count_force_update_single_post($post_id) {
 | |
| 3984 | + geodir_count_reviews_by_terms(true, $post_id); | |
| 3985 | 3985 | } | 
| 3986 | 3986 | |
| 3987 | 3987 | /*-----------------------------------------------------------------------------------*/ | 
| @@ -3998,11 +3998,11 @@ discard block | ||
| 3998 | 3998 | * | 
| 3999 | 3999 | * @return int Post count. | 
| 4000 | 4000 | */ | 
| 4001 | -function geodir_count_posts_by_term( $data, $term ) {
 | |
| 4001 | +function geodir_count_posts_by_term($data, $term) {
 | |
| 4002 | 4002 | |
| 4003 | -	if ( $data ) {
 | |
| 4004 | -		if ( isset( $data[ $term->term_id ] ) ) {
 | |
| 4005 | - return $data[ $term->term_id ]; | |
| 4003 | +	if ($data) {
 | |
| 4004 | +		if (isset($data[$term->term_id])) {
 | |
| 4005 | + return $data[$term->term_id]; | |
| 4006 | 4006 |  		} else {
 | 
| 4007 | 4007 | return 0; | 
| 4008 | 4008 | } | 
| @@ -4019,8 +4019,8 @@ discard block | ||
| 4019 | 4019 | * param array $terms An array of term objects. | 
| 4020 | 4020 | * @return array Sorted terms array. | 
| 4021 | 4021 | */ | 
| 4022 | -function geodir_sort_terms_by_count( $terms ) {
 | |
| 4023 | - usort( $terms, "geodir_sort_by_count_obj" ); | |
| 4022 | +function geodir_sort_terms_by_count($terms) {
 | |
| 4023 | + usort($terms, "geodir_sort_by_count_obj"); | |
| 4024 | 4024 | |
| 4025 | 4025 | return $terms; | 
| 4026 | 4026 | } | 
| @@ -4035,8 +4035,8 @@ discard block | ||
| 4035 | 4035 | * | 
| 4036 | 4036 | * @return array Sorted terms array. | 
| 4037 | 4037 | */ | 
| 4038 | -function geodir_sort_terms_by_review_count( $terms ) {
 | |
| 4039 | - usort( $terms, "geodir_sort_by_review_count_obj" ); | |
| 4038 | +function geodir_sort_terms_by_review_count($terms) {
 | |
| 4039 | + usort($terms, "geodir_sort_by_review_count_obj"); | |
| 4040 | 4040 | |
| 4041 | 4041 | return $terms; | 
| 4042 | 4042 | } | 
| @@ -4052,12 +4052,12 @@ discard block | ||
| 4052 | 4052 | * | 
| 4053 | 4053 | * @return array Sorted terms array. | 
| 4054 | 4054 | */ | 
| 4055 | -function geodir_sort_terms( $terms, $sort = 'count' ) {
 | |
| 4056 | -	if ( $sort == 'count' ) {
 | |
| 4057 | - return geodir_sort_terms_by_count( $terms ); | |
| 4055 | +function geodir_sort_terms($terms, $sort = 'count') {
 | |
| 4056 | +	if ($sort == 'count') {
 | |
| 4057 | + return geodir_sort_terms_by_count($terms); | |
| 4058 | 4058 | } | 
| 4059 | -	if ( $sort == 'review_count' ) {
 | |
| 4060 | - return geodir_sort_terms_by_review_count( $terms ); | |
| 4059 | +	if ($sort == 'review_count') {
 | |
| 4060 | + return geodir_sort_terms_by_review_count($terms); | |
| 4061 | 4061 | } | 
| 4062 | 4062 | } | 
| 4063 | 4063 | |
| @@ -4075,7 +4075,7 @@ discard block | ||
| 4075 | 4075 | * | 
| 4076 | 4076 | * @return bool | 
| 4077 | 4077 | */ | 
| 4078 | -function geodir_sort_by_count( $a, $b ) {
 | |
| 4078 | +function geodir_sort_by_count($a, $b) {
 | |
| 4079 | 4079 | return $a['count'] < $b['count']; | 
| 4080 | 4080 | } | 
| 4081 | 4081 | |
| @@ -4090,7 +4090,7 @@ discard block | ||
| 4090 | 4090 | * | 
| 4091 | 4091 | * @return bool | 
| 4092 | 4092 | */ | 
| 4093 | -function geodir_sort_by_count_obj( $a, $b ) {
 | |
| 4093 | +function geodir_sort_by_count_obj($a, $b) {
 | |
| 4094 | 4094 | return $a->count < $b->count; | 
| 4095 | 4095 | } | 
| 4096 | 4096 | |
| @@ -4105,7 +4105,7 @@ discard block | ||
| 4105 | 4105 | * | 
| 4106 | 4106 | * @return bool | 
| 4107 | 4107 | */ | 
| 4108 | -function geodir_sort_by_review_count_obj( $a, $b ) {
 | |
| 4108 | +function geodir_sort_by_review_count_obj($a, $b) {
 | |
| 4109 | 4109 | return $a->review_count < $b->review_count; | 
| 4110 | 4110 | } | 
| 4111 | 4111 | |
| @@ -4122,35 +4122,35 @@ discard block | ||
| 4122 | 4122 | * @since 1.4.2 | 
| 4123 | 4123 | * @package GeoDirectory | 
| 4124 | 4124 | */ | 
| 4125 | - $locale = apply_filters( 'plugin_locale', get_locale(), 'geodirectory' ); | |
| 4125 | +	$locale = apply_filters('plugin_locale', get_locale(), 'geodirectory');
 | |
| 4126 | 4126 | |
| 4127 | - load_textdomain( 'geodirectory', WP_LANG_DIR . '/' . 'geodirectory' . '/' . 'geodirectory' . '-' . $locale . '.mo' ); | |
| 4128 | - load_plugin_textdomain( 'geodirectory', false, plugin_basename( dirname( dirname( __FILE__ ) ) ) . '/geodirectory-languages' ); | |
| 4127 | +	load_textdomain('geodirectory', WP_LANG_DIR.'/'.'geodirectory'.'/'.'geodirectory'.'-'.$locale.'.mo');
 | |
| 4128 | +	load_plugin_textdomain('geodirectory', false, plugin_basename(dirname(dirname(__FILE__))).'/geodirectory-languages');
 | |
| 4129 | 4129 | |
| 4130 | 4130 | /** | 
| 4131 | 4131 | * Define language constants. | 
| 4132 | 4132 | * | 
| 4133 | 4133 | * @since 1.0.0 | 
| 4134 | 4134 | */ | 
| 4135 | - require_once( geodir_plugin_path() . '/language.php' ); | |
| 4135 | + require_once(geodir_plugin_path().'/language.php'); | |
| 4136 | 4136 | |
| 4137 | - $language_file = geodir_plugin_path() . '/db-language.php'; | |
| 4137 | + $language_file = geodir_plugin_path().'/db-language.php'; | |
| 4138 | 4138 | |
| 4139 | 4139 | // Load language string file if not created yet | 
| 4140 | -	if ( ! file_exists( $language_file ) ) {
 | |
| 4140 | +	if (!file_exists($language_file)) {
 | |
| 4141 | 4141 | geodirectory_load_db_language(); | 
| 4142 | 4142 | } | 
| 4143 | 4143 | |
| 4144 | -	if ( file_exists( $language_file ) ) {
 | |
| 4144 | +	if (file_exists($language_file)) {
 | |
| 4145 | 4145 | /** | 
| 4146 | 4146 | * Language strings from database. | 
| 4147 | 4147 | * | 
| 4148 | 4148 | * @since 1.4.2 | 
| 4149 | 4149 | */ | 
| 4150 | 4150 |  		try {
 | 
| 4151 | - require_once( $language_file ); | |
| 4152 | -		} catch ( Exception $e ) {
 | |
| 4153 | - error_log( 'Language Error: ' . $e->getMessage() ); | |
| 4151 | + require_once($language_file); | |
| 4152 | +		} catch (Exception $e) {
 | |
| 4153 | +			error_log('Language Error: '.$e->getMessage());
 | |
| 4154 | 4154 | } | 
| 4155 | 4155 | } | 
| 4156 | 4156 | } | 
| @@ -4167,19 +4167,19 @@ discard block | ||
| 4167 | 4167 | */ | 
| 4168 | 4168 |  function geodirectory_load_db_language() {
 | 
| 4169 | 4169 | global $wp_filesystem; | 
| 4170 | -	if ( empty( $wp_filesystem ) ) {
 | |
| 4171 | - require_once( ABSPATH . '/wp-admin/includes/file.php' ); | |
| 4170 | +	if (empty($wp_filesystem)) {
 | |
| 4171 | + require_once(ABSPATH.'/wp-admin/includes/file.php'); | |
| 4172 | 4172 | WP_Filesystem(); | 
| 4173 | 4173 | global $wp_filesystem; | 
| 4174 | 4174 | } | 
| 4175 | 4175 | |
| 4176 | - $language_file = geodir_plugin_path() . '/db-language.php'; | |
| 4176 | + $language_file = geodir_plugin_path().'/db-language.php'; | |
| 4177 | 4177 | |
| 4178 | -	if ( is_file( $language_file ) && ! is_writable( $language_file ) ) {
 | |
| 4178 | +	if (is_file($language_file) && !is_writable($language_file)) {
 | |
| 4179 | 4179 | return false; | 
| 4180 | 4180 | } // Not possible to create. | 
| 4181 | 4181 | |
| 4182 | -	if ( ! is_file( $language_file ) && ! is_writable( dirname( $language_file ) ) ) {
 | |
| 4182 | +	if (!is_file($language_file) && !is_writable(dirname($language_file))) {
 | |
| 4183 | 4183 | return false; | 
| 4184 | 4184 | } // Not possible to create. | 
| 4185 | 4185 | |
| @@ -4193,9 +4193,9 @@ discard block | ||
| 4193 | 4193 | * | 
| 4194 | 4194 | * @param array $contents_strings Array of strings. | 
| 4195 | 4195 | */ | 
| 4196 | - $contents_strings = apply_filters( 'geodir_load_db_language', $contents_strings ); | |
| 4196 | +	$contents_strings = apply_filters('geodir_load_db_language', $contents_strings);
 | |
| 4197 | 4197 | |
| 4198 | - $contents_strings = array_unique( $contents_strings ); | |
| 4198 | + $contents_strings = array_unique($contents_strings); | |
| 4199 | 4199 | |
| 4200 | 4200 | $contents_head = array(); | 
| 4201 | 4201 | $contents_head[] = "<?php"; | 
| @@ -4212,21 +4212,21 @@ discard block | ||
| 4212 | 4212 | $contents_foot[] = ""; | 
| 4213 | 4213 | $contents_foot[] = ""; | 
| 4214 | 4214 | |
| 4215 | - $contents = implode( PHP_EOL, $contents_head ); | |
| 4215 | + $contents = implode(PHP_EOL, $contents_head); | |
| 4216 | 4216 | |
| 4217 | -	if ( ! empty( $contents_strings ) ) {
 | |
| 4218 | -		foreach ( $contents_strings as $string ) {
 | |
| 4219 | -			if ( is_scalar( $string ) && $string != '' ) {
 | |
| 4220 | - $string = str_replace( "'", "\'", $string ); | |
| 4221 | - geodir_wpml_register_string( $string ); | |
| 4222 | -				$contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";
 | |
| 4217 | +	if (!empty($contents_strings)) {
 | |
| 4218 | +		foreach ($contents_strings as $string) {
 | |
| 4219 | +			if (is_scalar($string) && $string != '') {
 | |
| 4220 | +				$string = str_replace("'", "\'", $string);
 | |
| 4221 | + geodir_wpml_register_string($string); | |
| 4222 | +				$contents .= PHP_EOL."__('".$string."', 'geodirectory');";
 | |
| 4223 | 4223 | } | 
| 4224 | 4224 | } | 
| 4225 | 4225 | } | 
| 4226 | 4226 | |
| 4227 | - $contents .= implode( PHP_EOL, $contents_foot ); | |
| 4227 | + $contents .= implode(PHP_EOL, $contents_foot); | |
| 4228 | 4228 | |
| 4229 | -	if ( $wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE ) ) {
 | |
| 4229 | +	if ($wp_filesystem->put_contents($language_file, $contents, FS_CHMOD_FILE)) {
 | |
| 4230 | 4230 | return false; | 
| 4231 | 4231 | } // Failure; could not write file. | 
| 4232 | 4232 | |
| @@ -4247,49 +4247,49 @@ discard block | ||
| 4247 | 4247 | * | 
| 4248 | 4248 | * @return array Translation texts. | 
| 4249 | 4249 | */ | 
| 4250 | -function geodir_load_custom_field_translation( $translation_texts = array() ) {
 | |
| 4250 | +function geodir_load_custom_field_translation($translation_texts = array()) {
 | |
| 4251 | 4251 | global $wpdb; | 
| 4252 | 4252 | |
| 4253 | 4253 | // Custom fields table | 
| 4254 | - $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM " . GEODIR_CUSTOM_FIELDS_TABLE; | |
| 4255 | - $rows = $wpdb->get_results( $sql ); | |
| 4254 | + $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM ".GEODIR_CUSTOM_FIELDS_TABLE; | |
| 4255 | + $rows = $wpdb->get_results($sql); | |
| 4256 | 4256 | |
| 4257 | -	if ( ! empty( $rows ) ) {
 | |
| 4258 | -		foreach ( $rows as $row ) {
 | |
| 4259 | -			if ( ! empty( $row->admin_title ) ) {
 | |
| 4260 | - $translation_texts[] = stripslashes_deep( $row->admin_title ); | |
| 4257 | +	if (!empty($rows)) {
 | |
| 4258 | +		foreach ($rows as $row) {
 | |
| 4259 | +			if (!empty($row->admin_title)) {
 | |
| 4260 | + $translation_texts[] = stripslashes_deep($row->admin_title); | |
| 4261 | 4261 | } | 
| 4262 | 4262 | |
| 4263 | -			if ( ! empty( $row->admin_desc ) ) {
 | |
| 4264 | - $translation_texts[] = stripslashes_deep( $row->admin_desc ); | |
| 4263 | +			if (!empty($row->admin_desc)) {
 | |
| 4264 | + $translation_texts[] = stripslashes_deep($row->admin_desc); | |
| 4265 | 4265 | } | 
| 4266 | 4266 | |
| 4267 | -			if ( ! empty( $row->site_title ) ) {
 | |
| 4268 | - $translation_texts[] = stripslashes_deep( $row->site_title ); | |
| 4267 | +			if (!empty($row->site_title)) {
 | |
| 4268 | + $translation_texts[] = stripslashes_deep($row->site_title); | |
| 4269 | 4269 | } | 
| 4270 | 4270 | |
| 4271 | -			if ( ! empty( $row->clabels ) ) {
 | |
| 4272 | - $translation_texts[] = stripslashes_deep( $row->clabels ); | |
| 4271 | +			if (!empty($row->clabels)) {
 | |
| 4272 | + $translation_texts[] = stripslashes_deep($row->clabels); | |
| 4273 | 4273 | } | 
| 4274 | 4274 | |
| 4275 | -			if ( ! empty( $row->required_msg ) ) {
 | |
| 4276 | - $translation_texts[] = stripslashes_deep( $row->required_msg ); | |
| 4275 | +			if (!empty($row->required_msg)) {
 | |
| 4276 | + $translation_texts[] = stripslashes_deep($row->required_msg); | |
| 4277 | 4277 | } | 
| 4278 | 4278 | |
| 4279 | -			if ( ! empty( $row->validation_msg ) ) {
 | |
| 4280 | - $translation_texts[] = stripslashes_deep( $row->validation_msg ); | |
| 4279 | +			if (!empty($row->validation_msg)) {
 | |
| 4280 | + $translation_texts[] = stripslashes_deep($row->validation_msg); | |
| 4281 | 4281 | } | 
| 4282 | 4282 | |
| 4283 | -			if ( ! empty( $row->default_value ) ) {
 | |
| 4284 | - $translation_texts[] = stripslashes_deep( $row->default_value ); | |
| 4283 | +			if (!empty($row->default_value)) {
 | |
| 4284 | + $translation_texts[] = stripslashes_deep($row->default_value); | |
| 4285 | 4285 | } | 
| 4286 | 4286 | |
| 4287 | -			if ( ! empty( $row->option_values ) ) {
 | |
| 4288 | - $option_values = geodir_string_values_to_options( stripslashes_deep( $row->option_values ) ); | |
| 4287 | +			if (!empty($row->option_values)) {
 | |
| 4288 | + $option_values = geodir_string_values_to_options(stripslashes_deep($row->option_values)); | |
| 4289 | 4289 | |
| 4290 | -				if ( ! empty( $option_values ) ) {
 | |
| 4291 | -					foreach ( $option_values as $option_value ) {
 | |
| 4292 | -						if ( ! empty( $option_value['label'] ) ) {
 | |
| 4290 | +				if (!empty($option_values)) {
 | |
| 4291 | +					foreach ($option_values as $option_value) {
 | |
| 4292 | +						if (!empty($option_value['label'])) {
 | |
| 4293 | 4293 | $translation_texts[] = $option_value['label']; | 
| 4294 | 4294 | } | 
| 4295 | 4295 | } | 
| @@ -4299,56 +4299,56 @@ discard block | ||
| 4299 | 4299 | } | 
| 4300 | 4300 | |
| 4301 | 4301 | // Custom sorting fields table | 
| 4302 | - $sql = "SELECT site_title, asc_title, desc_title FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE; | |
| 4303 | - $rows = $wpdb->get_results( $sql ); | |
| 4302 | + $sql = "SELECT site_title, asc_title, desc_title FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE; | |
| 4303 | + $rows = $wpdb->get_results($sql); | |
| 4304 | 4304 | |
| 4305 | -	if ( ! empty( $rows ) ) {
 | |
| 4306 | -		foreach ( $rows as $row ) {
 | |
| 4307 | -			if ( ! empty( $row->site_title ) ) {
 | |
| 4308 | - $translation_texts[] = stripslashes_deep( $row->site_title ); | |
| 4305 | +	if (!empty($rows)) {
 | |
| 4306 | +		foreach ($rows as $row) {
 | |
| 4307 | +			if (!empty($row->site_title)) {
 | |
| 4308 | + $translation_texts[] = stripslashes_deep($row->site_title); | |
| 4309 | 4309 | } | 
| 4310 | 4310 | |
| 4311 | -			if ( ! empty( $row->asc_title ) ) {
 | |
| 4312 | - $translation_texts[] = stripslashes_deep( $row->asc_title ); | |
| 4311 | +			if (!empty($row->asc_title)) {
 | |
| 4312 | + $translation_texts[] = stripslashes_deep($row->asc_title); | |
| 4313 | 4313 | } | 
| 4314 | 4314 | |
| 4315 | -			if ( ! empty( $row->desc_title ) ) {
 | |
| 4316 | - $translation_texts[] = stripslashes_deep( $row->desc_title ); | |
| 4315 | +			if (!empty($row->desc_title)) {
 | |
| 4316 | + $translation_texts[] = stripslashes_deep($row->desc_title); | |
| 4317 | 4317 | } | 
| 4318 | 4318 | } | 
| 4319 | 4319 | } | 
| 4320 | 4320 | |
| 4321 | 4321 | // Advance search filter fields table | 
| 4322 | -	if ( defined( 'GEODIR_ADVANCE_SEARCH_TABLE' ) ) {
 | |
| 4323 | - $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM " . GEODIR_ADVANCE_SEARCH_TABLE; | |
| 4324 | - $rows = $wpdb->get_results( $sql ); | |
| 4325 | - | |
| 4326 | -		if ( ! empty( $rows ) ) {
 | |
| 4327 | -			foreach ( $rows as $row ) {
 | |
| 4328 | -				if ( ! empty( $row->field_site_name ) ) {
 | |
| 4329 | - $translation_texts[] = stripslashes_deep( $row->field_site_name ); | |
| 4322 | +	if (defined('GEODIR_ADVANCE_SEARCH_TABLE')) {
 | |
| 4323 | + $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM ".GEODIR_ADVANCE_SEARCH_TABLE; | |
| 4324 | + $rows = $wpdb->get_results($sql); | |
| 4325 | + | |
| 4326 | +		if (!empty($rows)) {
 | |
| 4327 | +			foreach ($rows as $row) {
 | |
| 4328 | +				if (!empty($row->field_site_name)) {
 | |
| 4329 | + $translation_texts[] = stripslashes_deep($row->field_site_name); | |
| 4330 | 4330 | } | 
| 4331 | 4331 | |
| 4332 | -				if ( ! empty( $row->front_search_title ) ) {
 | |
| 4333 | - $translation_texts[] = stripslashes_deep( $row->front_search_title ); | |
| 4332 | +				if (!empty($row->front_search_title)) {
 | |
| 4333 | + $translation_texts[] = stripslashes_deep($row->front_search_title); | |
| 4334 | 4334 | } | 
| 4335 | 4335 | |
| 4336 | -				if ( ! empty( $row->first_search_text ) ) {
 | |
| 4337 | - $translation_texts[] = stripslashes_deep( $row->first_search_text ); | |
| 4336 | +				if (!empty($row->first_search_text)) {
 | |
| 4337 | + $translation_texts[] = stripslashes_deep($row->first_search_text); | |
| 4338 | 4338 | } | 
| 4339 | 4339 | |
| 4340 | -				if ( ! empty( $row->last_search_text ) ) {
 | |
| 4341 | - $translation_texts[] = stripslashes_deep( $row->last_search_text ); | |
| 4340 | +				if (!empty($row->last_search_text)) {
 | |
| 4341 | + $translation_texts[] = stripslashes_deep($row->last_search_text); | |
| 4342 | 4342 | } | 
| 4343 | 4343 | |
| 4344 | -				if ( ! empty( $row->field_desc ) ) {
 | |
| 4345 | - $translation_texts[] = stripslashes_deep( $row->field_desc ); | |
| 4344 | +				if (!empty($row->field_desc)) {
 | |
| 4345 | + $translation_texts[] = stripslashes_deep($row->field_desc); | |
| 4346 | 4346 | } | 
| 4347 | 4347 | } | 
| 4348 | 4348 | } | 
| 4349 | 4349 | } | 
| 4350 | 4350 | |
| 4351 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; | |
| 4351 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; | |
| 4352 | 4352 | |
| 4353 | 4353 | return $translation_texts; | 
| 4354 | 4354 | } | 
| @@ -4370,7 +4370,7 @@ discard block | ||
| 4370 | 4370 | * | 
| 4371 | 4371 | * @param array $geodir_allowed_mime_types and file extensions. | 
| 4372 | 4372 | */ | 
| 4373 | - return apply_filters( 'geodir_allowed_mime_types', array( | |
| 4373 | +	return apply_filters('geodir_allowed_mime_types', array(
 | |
| 4374 | 4374 | 'Image' => array( // Image formats. | 
| 4375 | 4375 | 'jpg' => 'image/jpeg', | 
| 4376 | 4376 | 'jpe' => 'image/jpeg', | 
| @@ -4438,18 +4438,18 @@ discard block | ||
| 4438 | 4438 | * | 
| 4439 | 4439 | * @return string User display name. | 
| 4440 | 4440 | */ | 
| 4441 | -function geodir_get_client_name( $user_id ) {
 | |
| 4441 | +function geodir_get_client_name($user_id) {
 | |
| 4442 | 4442 | $client_name = ''; | 
| 4443 | 4443 | |
| 4444 | - $user_data = get_userdata( $user_id ); | |
| 4444 | + $user_data = get_userdata($user_id); | |
| 4445 | 4445 | |
| 4446 | -	if ( ! empty( $user_data ) ) {
 | |
| 4447 | -		if ( isset( $user_data->display_name ) && trim( $user_data->display_name ) != '' ) {
 | |
| 4448 | - $client_name = trim( $user_data->display_name ); | |
| 4449 | -		} else if ( isset( $user_data->user_nicename ) && trim( $user_data->user_nicename ) != '' ) {
 | |
| 4450 | - $client_name = trim( $user_data->user_nicename ); | |
| 4446 | +	if (!empty($user_data)) {
 | |
| 4447 | +		if (isset($user_data->display_name) && trim($user_data->display_name) != '') {
 | |
| 4448 | + $client_name = trim($user_data->display_name); | |
| 4449 | +		} else if (isset($user_data->user_nicename) && trim($user_data->user_nicename) != '') {
 | |
| 4450 | + $client_name = trim($user_data->user_nicename); | |
| 4451 | 4451 |  		} else {
 | 
| 4452 | - $client_name = trim( $user_data->user_login ); | |
| 4452 | + $client_name = trim($user_data->user_login); | |
| 4453 | 4453 | } | 
| 4454 | 4454 | } | 
| 4455 | 4455 | |
| @@ -4457,19 +4457,19 @@ discard block | ||
| 4457 | 4457 | } | 
| 4458 | 4458 | |
| 4459 | 4459 | |
| 4460 | -add_filter( 'wpseo_replacements', 'geodir_wpseo_replacements', 10, 1 ); | |
| 4460 | +add_filter('wpseo_replacements', 'geodir_wpseo_replacements', 10, 1);
 | |
| 4461 | 4461 | /* | 
| 4462 | 4462 | * Add location variables to wpseo replacements. | 
| 4463 | 4463 | * | 
| 4464 | 4464 | * @since 1.5.4 | 
| 4465 | 4465 | */ | 
| 4466 | -function geodir_wpseo_replacements( $vars ) {
 | |
| 4466 | +function geodir_wpseo_replacements($vars) {
 | |
| 4467 | 4467 | |
| 4468 | 4468 | global $wp; | 
| 4469 | 4469 | $title = ''; | 
| 4470 | 4470 | // location variables | 
| 4471 | 4471 | $gd_post_type = geodir_get_current_posttype(); | 
| 4472 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); | |
| 4472 | +	$location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
 | |
| 4473 | 4473 | /** | 
| 4474 | 4474 | * Filter the title variables location variables array | 
| 4475 | 4475 | * | 
| @@ -4479,105 +4479,105 @@ discard block | ||
| 4479 | 4479 | * @param array $location_array The array of location variables. | 
| 4480 | 4480 | * @param array $vars The page title variables. | 
| 4481 | 4481 | */ | 
| 4482 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr_seo', $location_array, $vars ); | |
| 4482 | +	$location_array  = apply_filters('geodir_filter_title_variables_location_arr_seo', $location_array, $vars);
 | |
| 4483 | 4483 | $location_titles = array(); | 
| 4484 | -	if ( get_query_var( 'gd_country_full' ) ) {
 | |
| 4485 | -		if ( get_query_var( 'gd_country_full' ) ) {
 | |
| 4486 | - $location_array['gd_country'] = get_query_var( 'gd_country_full' ); | |
| 4484 | +	if (get_query_var('gd_country_full')) {
 | |
| 4485 | +		if (get_query_var('gd_country_full')) {
 | |
| 4486 | +			$location_array['gd_country'] = get_query_var('gd_country_full');
 | |
| 4487 | 4487 | } | 
| 4488 | -		if ( get_query_var( 'gd_region_full' ) ) {
 | |
| 4489 | - $location_array['gd_region'] = get_query_var( 'gd_region_full' ); | |
| 4488 | +		if (get_query_var('gd_region_full')) {
 | |
| 4489 | +			$location_array['gd_region'] = get_query_var('gd_region_full');
 | |
| 4490 | 4490 | } | 
| 4491 | -		if ( get_query_var( 'gd_city_full' ) ) {
 | |
| 4492 | - $location_array['gd_city'] = get_query_var( 'gd_city_full' ); | |
| 4491 | +		if (get_query_var('gd_city_full')) {
 | |
| 4492 | +			$location_array['gd_city'] = get_query_var('gd_city_full');
 | |
| 4493 | 4493 | } | 
| 4494 | 4494 | } | 
| 4495 | 4495 | $location_single = ''; | 
| 4496 | - $gd_country = ( isset( $wp->query_vars['gd_country'] ) && $wp->query_vars['gd_country'] != '' ) ? $wp->query_vars['gd_country'] : ''; | |
| 4497 | - $gd_region = ( isset( $wp->query_vars['gd_region'] ) && $wp->query_vars['gd_region'] != '' ) ? $wp->query_vars['gd_region'] : ''; | |
| 4498 | - $gd_city = ( isset( $wp->query_vars['gd_city'] ) && $wp->query_vars['gd_city'] != '' ) ? $wp->query_vars['gd_city'] : ''; | |
| 4496 | + $gd_country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : ''; | |
| 4497 | + $gd_region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : ''; | |
| 4498 | + $gd_city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : ''; | |
| 4499 | 4499 | |
| 4500 | 4500 | $gd_country_actual = $gd_region_actual = $gd_city_actual = ''; | 
| 4501 | 4501 | |
| 4502 | -	if ( function_exists( 'get_actual_location_name' ) ) {
 | |
| 4503 | - $gd_country_actual = $gd_country != '' ? get_actual_location_name( 'country', $gd_country, true ) : $gd_country; | |
| 4504 | - $gd_region_actual = $gd_region != '' ? get_actual_location_name( 'region', $gd_region ) : $gd_region; | |
| 4505 | - $gd_city_actual = $gd_city != '' ? get_actual_location_name( 'city', $gd_city ) : $gd_city; | |
| 4502 | +	if (function_exists('get_actual_location_name')) {
 | |
| 4503 | +		$gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;
 | |
| 4504 | +		$gd_region_actual  = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;
 | |
| 4505 | +		$gd_city_actual    = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;
 | |
| 4506 | 4506 | } | 
| 4507 | 4507 | |
| 4508 | -	if ( $gd_city != '' ) {
 | |
| 4509 | -		if ( $gd_city_actual != '' ) {
 | |
| 4508 | +	if ($gd_city != '') {
 | |
| 4509 | +		if ($gd_city_actual != '') {
 | |
| 4510 | 4510 | $gd_city = $gd_city_actual; | 
| 4511 | 4511 |  		} else {
 | 
| 4512 | - $gd_city = preg_replace( '/-(\d+)$/', '', $gd_city ); | |
| 4513 | - $gd_city = preg_replace( '/[_-]/', ' ', $gd_city ); | |
| 4514 | - $gd_city = __( geodir_ucwords( $gd_city ), 'geodirectory' ); | |
| 4512 | +			$gd_city = preg_replace('/-(\d+)$/', '', $gd_city);
 | |
| 4513 | +			$gd_city = preg_replace('/[_-]/', ' ', $gd_city);
 | |
| 4514 | + $gd_city = __(geodir_ucwords($gd_city), 'geodirectory'); | |
| 4515 | 4515 | } | 
| 4516 | 4516 | $location_single = $gd_city; | 
| 4517 | 4517 | |
| 4518 | -	} else if ( $gd_region != '' ) {
 | |
| 4519 | -		if ( $gd_region_actual != '' ) {
 | |
| 4518 | +	} else if ($gd_region != '') {
 | |
| 4519 | +		if ($gd_region_actual != '') {
 | |
| 4520 | 4520 | $gd_region = $gd_region_actual; | 
| 4521 | 4521 |  		} else {
 | 
| 4522 | - $gd_region = preg_replace( '/-(\d+)$/', '', $gd_region ); | |
| 4523 | - $gd_region = preg_replace( '/[_-]/', ' ', $gd_region ); | |
| 4524 | - $gd_region = __( geodir_ucwords( $gd_region ), 'geodirectory' ); | |
| 4522 | +			$gd_region = preg_replace('/-(\d+)$/', '', $gd_region);
 | |
| 4523 | +			$gd_region = preg_replace('/[_-]/', ' ', $gd_region);
 | |
| 4524 | + $gd_region = __(geodir_ucwords($gd_region), 'geodirectory'); | |
| 4525 | 4525 | } | 
| 4526 | 4526 | |
| 4527 | 4527 | $location_single = $gd_region; | 
| 4528 | -	} else if ( $gd_country != '' ) {
 | |
| 4529 | -		if ( $gd_country_actual != '' ) {
 | |
| 4528 | +	} else if ($gd_country != '') {
 | |
| 4529 | +		if ($gd_country_actual != '') {
 | |
| 4530 | 4530 | $gd_country = $gd_country_actual; | 
| 4531 | 4531 |  		} else {
 | 
| 4532 | - $gd_country = preg_replace( '/-(\d+)$/', '', $gd_country ); | |
| 4533 | - $gd_country = preg_replace( '/[_-]/', ' ', $gd_country ); | |
| 4534 | - $gd_country = __( geodir_ucwords( $gd_country ), 'geodirectory' ); | |
| 4532 | +			$gd_country = preg_replace('/-(\d+)$/', '', $gd_country);
 | |
| 4533 | +			$gd_country = preg_replace('/[_-]/', ' ', $gd_country);
 | |
| 4534 | + $gd_country = __(geodir_ucwords($gd_country), 'geodirectory'); | |
| 4535 | 4535 | } | 
| 4536 | 4536 | |
| 4537 | 4537 | $location_single = $gd_country; | 
| 4538 | 4538 | } | 
| 4539 | 4539 | |
| 4540 | -	if ( ! empty( $location_array ) ) {
 | |
| 4540 | +	if (!empty($location_array)) {
 | |
| 4541 | 4541 | |
| 4542 | - $actual_location_name = function_exists( 'get_actual_location_name' ) ? true : false; | |
| 4543 | - $location_array = array_reverse( $location_array ); | |
| 4542 | +		$actual_location_name = function_exists('get_actual_location_name') ? true : false;
 | |
| 4543 | + $location_array = array_reverse($location_array); | |
| 4544 | 4544 | |
| 4545 | -		foreach ( $location_array as $location_type => $location ) {
 | |
| 4546 | - $gd_location_link_text = preg_replace( '/-(\d+)$/', '', $location ); | |
| 4547 | - $gd_location_link_text = preg_replace( '/[_-]/', ' ', $gd_location_link_text ); | |
| 4545 | +		foreach ($location_array as $location_type => $location) {
 | |
| 4546 | +			$gd_location_link_text = preg_replace('/-(\d+)$/', '', $location);
 | |
| 4547 | +			$gd_location_link_text = preg_replace('/[_-]/', ' ', $gd_location_link_text);
 | |
| 4548 | 4548 | |
| 4549 | - $location_name = geodir_ucwords( $gd_location_link_text ); | |
| 4550 | - $location_name = __( $location_name, 'geodirectory' ); | |
| 4549 | + $location_name = geodir_ucwords($gd_location_link_text); | |
| 4550 | + $location_name = __($location_name, 'geodirectory'); | |
| 4551 | 4551 | |
| 4552 | -			if ( $actual_location_name ) {
 | |
| 4553 | - $location_type = strpos( $location_type, 'gd_' ) === 0 ? substr( $location_type, 3 ) : $location_type; | |
| 4554 | - $location_name = get_actual_location_name( $location_type, $location, true ); | |
| 4552 | +			if ($actual_location_name) {
 | |
| 4553 | + $location_type = strpos($location_type, 'gd_') === 0 ? substr($location_type, 3) : $location_type; | |
| 4554 | + $location_name = get_actual_location_name($location_type, $location, true); | |
| 4555 | 4555 | } | 
| 4556 | 4556 | |
| 4557 | 4557 | $location_titles[] = $location_name; | 
| 4558 | 4558 | } | 
| 4559 | -		if ( ! empty( $location_titles ) ) {
 | |
| 4560 | - $location_titles = array_unique( $location_titles ); | |
| 4559 | +		if (!empty($location_titles)) {
 | |
| 4560 | + $location_titles = array_unique($location_titles); | |
| 4561 | 4561 | } | 
| 4562 | 4562 | } | 
| 4563 | 4563 | |
| 4564 | 4564 | |
| 4565 | -	if ( ! empty( $location_titles ) ) {
 | |
| 4566 | - $vars['%%location%%'] = implode( ", ", $location_titles ); | |
| 4565 | +	if (!empty($location_titles)) {
 | |
| 4566 | +		$vars['%%location%%'] = implode(", ", $location_titles);
 | |
| 4567 | 4567 | } | 
| 4568 | 4568 | |
| 4569 | 4569 | |
| 4570 | -	if ( ! empty( $location_titles ) ) {
 | |
| 4571 | - $vars['%%in_location%%'] = __( 'in ', 'geodirectory' ) . implode( ", ", $location_titles ); | |
| 4570 | +	if (!empty($location_titles)) {
 | |
| 4571 | +		$vars['%%in_location%%'] = __('in ', 'geodirectory').implode(", ", $location_titles);
 | |
| 4572 | 4572 | } | 
| 4573 | 4573 | |
| 4574 | 4574 | |
| 4575 | -	if ( $location_single ) {
 | |
| 4576 | - $vars['%%in_location_single%%'] = __( 'in', 'geodirectory' ) . ' ' . $location_single; | |
| 4575 | +	if ($location_single) {
 | |
| 4576 | +		$vars['%%in_location_single%%'] = __('in', 'geodirectory').' '.$location_single;
 | |
| 4577 | 4577 | } | 
| 4578 | 4578 | |
| 4579 | 4579 | |
| 4580 | -	if ( $location_single ) {
 | |
| 4580 | +	if ($location_single) {
 | |
| 4581 | 4581 | $vars['%%location_single%%'] = $location_single; | 
| 4582 | 4582 | } | 
| 4583 | 4583 | |
| @@ -4590,13 +4590,13 @@ discard block | ||
| 4590 | 4590 | * @param string $vars The title with variables. | 
| 4591 | 4591 | * @param array $location_array The array of location variables. | 
| 4592 | 4592 | */ | 
| 4593 | - return apply_filters( 'geodir_wpseo_replacements_vars', $vars, $location_array ); | |
| 4593 | +	return apply_filters('geodir_wpseo_replacements_vars', $vars, $location_array);
 | |
| 4594 | 4594 | } | 
| 4595 | 4595 | |
| 4596 | 4596 | |
| 4597 | -add_filter( 'geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3 ); | |
| 4598 | -add_filter( 'geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2 ); | |
| 4599 | -add_filter( 'geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3 ); | |
| 4597 | +add_filter('geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3);
 | |
| 4598 | +add_filter('geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2);
 | |
| 4599 | +add_filter('geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3);
 | |
| 4600 | 4600 | |
| 4601 | 4601 | /** | 
| 4602 | 4602 | * Filter the title variables. | 
| @@ -4638,14 +4638,14 @@ discard block | ||
| 4638 | 4638 | * | 
| 4639 | 4639 | * @return string Title after filtered variables. | 
| 4640 | 4640 | */ | 
| 4641 | -function geodir_filter_title_variables( $title, $gd_page, $sep = '' ) {
 | |
| 4641 | +function geodir_filter_title_variables($title, $gd_page, $sep = '') {
 | |
| 4642 | 4642 | global $wp, $post; | 
| 4643 | 4643 | |
| 4644 | -	if ( ! $gd_page || ! $title ) {
 | |
| 4644 | +	if (!$gd_page || !$title) {
 | |
| 4645 | 4645 | return $title; // if no a GD page then bail. | 
| 4646 | 4646 | } | 
| 4647 | 4647 | |
| 4648 | -	if ( $sep == '' ) {
 | |
| 4648 | +	if ($sep == '') {
 | |
| 4649 | 4649 | /** | 
| 4650 | 4650 | * Filter the page title separator. | 
| 4651 | 4651 | * | 
| @@ -4654,100 +4654,100 @@ discard block | ||
| 4654 | 4654 | * | 
| 4655 | 4655 | * @param string $sep The separator, default: `|`. | 
| 4656 | 4656 | */ | 
| 4657 | - $sep = apply_filters( 'geodir_page_title_separator', '|' ); | |
| 4657 | +		$sep = apply_filters('geodir_page_title_separator', '|');
 | |
| 4658 | 4658 | } | 
| 4659 | 4659 | |
| 4660 | -	if ( strpos( $title, '%%title%%' ) !== false ) {
 | |
| 4661 | - $title = str_replace( "%%title%%", $post->post_title, $title ); | |
| 4660 | +	if (strpos($title, '%%title%%') !== false) {
 | |
| 4661 | +		$title = str_replace("%%title%%", $post->post_title, $title);
 | |
| 4662 | 4662 | } | 
| 4663 | 4663 | |
| 4664 | -	if ( strpos( $title, '%%sitename%%' ) !== false ) {
 | |
| 4665 | - $title = str_replace( "%%sitename%%", get_bloginfo( 'name' ), $title ); | |
| 4664 | +	if (strpos($title, '%%sitename%%') !== false) {
 | |
| 4665 | +		$title = str_replace("%%sitename%%", get_bloginfo('name'), $title);
 | |
| 4666 | 4666 | } | 
| 4667 | 4667 | |
| 4668 | -	if ( strpos( $title, '%%sitedesc%%' ) !== false ) {
 | |
| 4669 | - $title = str_replace( "%%sitedesc%%", get_bloginfo( 'description' ), $title ); | |
| 4668 | +	if (strpos($title, '%%sitedesc%%') !== false) {
 | |
| 4669 | +		$title = str_replace("%%sitedesc%%", get_bloginfo('description'), $title);
 | |
| 4670 | 4670 | } | 
| 4671 | 4671 | |
| 4672 | -	if ( strpos( $title, '%%excerpt%%' ) !== false ) {
 | |
| 4673 | - $title = str_replace( "%%excerpt%%", strip_tags( get_the_excerpt() ), $title ); | |
| 4672 | +	if (strpos($title, '%%excerpt%%') !== false) {
 | |
| 4673 | +		$title = str_replace("%%excerpt%%", strip_tags(get_the_excerpt()), $title);
 | |
| 4674 | 4674 | } | 
| 4675 | 4675 | |
| 4676 | -	if ( $gd_page == 'search' || $gd_page == 'author' ) {
 | |
| 4677 | - $post_type = isset( $_REQUEST['stype'] ) ? sanitize_text_field( $_REQUEST['stype'] ) : ''; | |
| 4678 | -	} else if ( $gd_page == 'add-listing' ) {
 | |
| 4679 | - $post_type = ( isset( $_REQUEST['listing_type'] ) ) ? sanitize_text_field( $_REQUEST['listing_type'] ) : ''; | |
| 4680 | - $post_type = ! $post_type && ! empty( $_REQUEST['pid'] ) ? get_post_type( (int) $_REQUEST['pid'] ) : $post_type; | |
| 4681 | -	} else if ( isset( $post->post_type ) && $post->post_type && in_array( $post->post_type, geodir_get_posttypes() ) ) {
 | |
| 4676 | +	if ($gd_page == 'search' || $gd_page == 'author') {
 | |
| 4677 | + $post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : ''; | |
| 4678 | +	} else if ($gd_page == 'add-listing') {
 | |
| 4679 | + $post_type = (isset($_REQUEST['listing_type'])) ? sanitize_text_field($_REQUEST['listing_type']) : ''; | |
| 4680 | + $post_type = !$post_type && !empty($_REQUEST['pid']) ? get_post_type((int) $_REQUEST['pid']) : $post_type; | |
| 4681 | +	} else if (isset($post->post_type) && $post->post_type && in_array($post->post_type, geodir_get_posttypes())) {
 | |
| 4682 | 4682 | $post_type = $post->post_type; | 
| 4683 | 4683 |  	} else {
 | 
| 4684 | - $post_type = get_query_var( 'post_type' ); | |
| 4684 | +		$post_type = get_query_var('post_type');
 | |
| 4685 | 4685 | } | 
| 4686 | 4686 | |
| 4687 | -	if ( strpos( $title, '%%pt_single%%' ) !== false ) {
 | |
| 4687 | +	if (strpos($title, '%%pt_single%%') !== false) {
 | |
| 4688 | 4688 | $singular_name = ''; | 
| 4689 | -		if ( $post_type && $singular_name = get_post_type_singular_label( $post_type ) ) {
 | |
| 4690 | - $singular_name = __( $singular_name, 'geodirectory' ); | |
| 4689 | +		if ($post_type && $singular_name = get_post_type_singular_label($post_type)) {
 | |
| 4690 | + $singular_name = __($singular_name, 'geodirectory'); | |
| 4691 | 4691 | } | 
| 4692 | 4692 | |
| 4693 | - $title = str_replace( "%%pt_single%%", $singular_name, $title ); | |
| 4693 | +		$title = str_replace("%%pt_single%%", $singular_name, $title);
 | |
| 4694 | 4694 | } | 
| 4695 | 4695 | |
| 4696 | -	if ( strpos( $title, '%%pt_plural%%' ) !== false ) {
 | |
| 4696 | +	if (strpos($title, '%%pt_plural%%') !== false) {
 | |
| 4697 | 4697 | $plural_name = ''; | 
| 4698 | -		if ( $post_type && $plural_name = get_post_type_plural_label( $post_type ) ) {
 | |
| 4699 | - $plural_name = __( $plural_name, 'geodirectory' ); | |
| 4698 | +		if ($post_type && $plural_name = get_post_type_plural_label($post_type)) {
 | |
| 4699 | + $plural_name = __($plural_name, 'geodirectory'); | |
| 4700 | 4700 | } | 
| 4701 | 4701 | |
| 4702 | - $title = str_replace( "%%pt_plural%%", $plural_name, $title ); | |
| 4702 | +		$title = str_replace("%%pt_plural%%", $plural_name, $title);
 | |
| 4703 | 4703 | } | 
| 4704 | 4704 | |
| 4705 | -	if ( strpos( $title, '%%category%%' ) !== false ) {
 | |
| 4705 | +	if (strpos($title, '%%category%%') !== false) {
 | |
| 4706 | 4706 | $cat_name = ''; | 
| 4707 | 4707 | |
| 4708 | -		if ( $gd_page == 'detail' ) {
 | |
| 4709 | -			if ( $post->default_category ) {
 | |
| 4710 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); | |
| 4711 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; | |
| 4708 | +		if ($gd_page == 'detail') {
 | |
| 4709 | +			if ($post->default_category) {
 | |
| 4710 | + $cat = get_term($post->default_category, $post->post_type.'category'); | |
| 4711 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; | |
| 4712 | 4712 | } | 
| 4713 | -		} else if ( $gd_page == 'listing' ) {
 | |
| 4713 | +		} else if ($gd_page == 'listing') {
 | |
| 4714 | 4714 | $queried_object = get_queried_object(); | 
| 4715 | -			if ( isset( $queried_object->name ) ) {
 | |
| 4715 | +			if (isset($queried_object->name)) {
 | |
| 4716 | 4716 | $cat_name = $queried_object->name; | 
| 4717 | 4717 | } | 
| 4718 | 4718 | } | 
| 4719 | - $title = str_replace( "%%category%%", $cat_name, $title ); | |
| 4719 | +		$title = str_replace("%%category%%", $cat_name, $title);
 | |
| 4720 | 4720 | } | 
| 4721 | 4721 | |
| 4722 | -	if ( strpos( $title, '%%tag%%' ) !== false ) {
 | |
| 4722 | +	if (strpos($title, '%%tag%%') !== false) {
 | |
| 4723 | 4723 | $cat_name = ''; | 
| 4724 | 4724 | |
| 4725 | -		if ( $gd_page == 'detail' ) {
 | |
| 4726 | -			if ( $post->default_category ) {
 | |
| 4727 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); | |
| 4728 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; | |
| 4725 | +		if ($gd_page == 'detail') {
 | |
| 4726 | +			if ($post->default_category) {
 | |
| 4727 | + $cat = get_term($post->default_category, $post->post_type.'category'); | |
| 4728 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; | |
| 4729 | 4729 | } | 
| 4730 | -		} else if ( $gd_page == 'listing' ) {
 | |
| 4730 | +		} else if ($gd_page == 'listing') {
 | |
| 4731 | 4731 | $queried_object = get_queried_object(); | 
| 4732 | -			if ( isset( $queried_object->name ) ) {
 | |
| 4732 | +			if (isset($queried_object->name)) {
 | |
| 4733 | 4733 | $cat_name = $queried_object->name; | 
| 4734 | 4734 | } | 
| 4735 | 4735 | } | 
| 4736 | - $title = str_replace( "%%tag%%", $cat_name, $title ); | |
| 4736 | +		$title = str_replace("%%tag%%", $cat_name, $title);
 | |
| 4737 | 4737 | } | 
| 4738 | 4738 | |
| 4739 | -	if ( strpos( $title, '%%id%%' ) !== false ) {
 | |
| 4740 | - $ID = ( isset( $post->ID ) ) ? $post->ID : ''; | |
| 4741 | - $title = str_replace( "%%id%%", $ID, $title ); | |
| 4739 | +	if (strpos($title, '%%id%%') !== false) {
 | |
| 4740 | + $ID = (isset($post->ID)) ? $post->ID : ''; | |
| 4741 | +		$title = str_replace("%%id%%", $ID, $title);
 | |
| 4742 | 4742 | } | 
| 4743 | 4743 | |
| 4744 | -	if ( strpos( $title, '%%sep%%' ) !== false ) {
 | |
| 4745 | - $title = str_replace( "%%sep%%", $sep, $title ); | |
| 4744 | +	if (strpos($title, '%%sep%%') !== false) {
 | |
| 4745 | +		$title = str_replace("%%sep%%", $sep, $title);
 | |
| 4746 | 4746 | } | 
| 4747 | 4747 | |
| 4748 | 4748 | // location variables | 
| 4749 | 4749 | $gd_post_type = geodir_get_current_posttype(); | 
| 4750 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); | |
| 4750 | +	$location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
 | |
| 4751 | 4751 | /** | 
| 4752 | 4752 | * Filter the title variables location variables array | 
| 4753 | 4753 | * | 
| @@ -4759,166 +4759,166 @@ discard block | ||
| 4759 | 4759 | * @param string $gd_page The page being filtered. | 
| 4760 | 4760 | * @param string $sep The separator, default: `|`. | 
| 4761 | 4761 | */ | 
| 4762 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep ); | |
| 4762 | +	$location_array  = apply_filters('geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep);
 | |
| 4763 | 4763 | $location_titles = array(); | 
| 4764 | -	if ( $gd_page == 'location' && get_query_var( 'gd_country_full' ) ) {
 | |
| 4765 | -		if ( get_query_var( 'gd_country_full' ) ) {
 | |
| 4766 | - $location_array['gd_country'] = get_query_var( 'gd_country_full' ); | |
| 4764 | +	if ($gd_page == 'location' && get_query_var('gd_country_full')) {
 | |
| 4765 | +		if (get_query_var('gd_country_full')) {
 | |
| 4766 | +			$location_array['gd_country'] = get_query_var('gd_country_full');
 | |
| 4767 | 4767 | } | 
| 4768 | -		if ( get_query_var( 'gd_region_full' ) ) {
 | |
| 4769 | - $location_array['gd_region'] = get_query_var( 'gd_region_full' ); | |
| 4768 | +		if (get_query_var('gd_region_full')) {
 | |
| 4769 | +			$location_array['gd_region'] = get_query_var('gd_region_full');
 | |
| 4770 | 4770 | } | 
| 4771 | -		if ( get_query_var( 'gd_city_full' ) ) {
 | |
| 4772 | - $location_array['gd_city'] = get_query_var( 'gd_city_full' ); | |
| 4771 | +		if (get_query_var('gd_city_full')) {
 | |
| 4772 | +			$location_array['gd_city'] = get_query_var('gd_city_full');
 | |
| 4773 | 4773 | } | 
| 4774 | 4774 | } | 
| 4775 | 4775 | $location_single = ''; | 
| 4776 | - $gd_country = ( isset( $wp->query_vars['gd_country'] ) && $wp->query_vars['gd_country'] != '' ) ? $wp->query_vars['gd_country'] : ''; | |
| 4777 | - $gd_region = ( isset( $wp->query_vars['gd_region'] ) && $wp->query_vars['gd_region'] != '' ) ? $wp->query_vars['gd_region'] : ''; | |
| 4778 | - $gd_city = ( isset( $wp->query_vars['gd_city'] ) && $wp->query_vars['gd_city'] != '' ) ? $wp->query_vars['gd_city'] : ''; | |
| 4776 | + $gd_country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : ''; | |
| 4777 | + $gd_region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : ''; | |
| 4778 | + $gd_city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : ''; | |
| 4779 | 4779 | |
| 4780 | 4780 | $gd_country_actual = $gd_region_actual = $gd_city_actual = ''; | 
| 4781 | 4781 | |
| 4782 | -	if ( function_exists( 'get_actual_location_name' ) ) {
 | |
| 4783 | - $gd_country_actual = $gd_country != '' ? get_actual_location_name( 'country', $gd_country, true ) : $gd_country; | |
| 4784 | - $gd_region_actual = $gd_region != '' ? get_actual_location_name( 'region', $gd_region ) : $gd_region; | |
| 4785 | - $gd_city_actual = $gd_city != '' ? get_actual_location_name( 'city', $gd_city ) : $gd_city; | |
| 4782 | +	if (function_exists('get_actual_location_name')) {
 | |
| 4783 | +		$gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;
 | |
| 4784 | +		$gd_region_actual  = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;
 | |
| 4785 | +		$gd_city_actual    = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;
 | |
| 4786 | 4786 | } | 
| 4787 | 4787 | |
| 4788 | -	if ( $gd_city != '' ) {
 | |
| 4789 | -		if ( $gd_city_actual != '' ) {
 | |
| 4788 | +	if ($gd_city != '') {
 | |
| 4789 | +		if ($gd_city_actual != '') {
 | |
| 4790 | 4790 | $gd_city = $gd_city_actual; | 
| 4791 | 4791 |  		} else {
 | 
| 4792 | - $gd_city = preg_replace( '/-(\d+)$/', '', $gd_city ); | |
| 4793 | - $gd_city = preg_replace( '/[_-]/', ' ', $gd_city ); | |
| 4794 | - $gd_city = __( geodir_ucwords( $gd_city ), 'geodirectory' ); | |
| 4792 | +			$gd_city = preg_replace('/-(\d+)$/', '', $gd_city);
 | |
| 4793 | +			$gd_city = preg_replace('/[_-]/', ' ', $gd_city);
 | |
| 4794 | + $gd_city = __(geodir_ucwords($gd_city), 'geodirectory'); | |
| 4795 | 4795 | } | 
| 4796 | 4796 | $location_single = $gd_city; | 
| 4797 | 4797 | |
| 4798 | -	} else if ( $gd_region != '' ) {
 | |
| 4799 | -		if ( $gd_region_actual != '' ) {
 | |
| 4798 | +	} else if ($gd_region != '') {
 | |
| 4799 | +		if ($gd_region_actual != '') {
 | |
| 4800 | 4800 | $gd_region = $gd_region_actual; | 
| 4801 | 4801 |  		} else {
 | 
| 4802 | - $gd_region = preg_replace( '/-(\d+)$/', '', $gd_region ); | |
| 4803 | - $gd_region = preg_replace( '/[_-]/', ' ', $gd_region ); | |
| 4804 | - $gd_region = __( geodir_ucwords( $gd_region ), 'geodirectory' ); | |
| 4802 | +			$gd_region = preg_replace('/-(\d+)$/', '', $gd_region);
 | |
| 4803 | +			$gd_region = preg_replace('/[_-]/', ' ', $gd_region);
 | |
| 4804 | + $gd_region = __(geodir_ucwords($gd_region), 'geodirectory'); | |
| 4805 | 4805 | } | 
| 4806 | 4806 | |
| 4807 | 4807 | $location_single = $gd_region; | 
| 4808 | -	} else if ( $gd_country != '' ) {
 | |
| 4809 | -		if ( $gd_country_actual != '' ) {
 | |
| 4808 | +	} else if ($gd_country != '') {
 | |
| 4809 | +		if ($gd_country_actual != '') {
 | |
| 4810 | 4810 | $gd_country = $gd_country_actual; | 
| 4811 | 4811 |  		} else {
 | 
| 4812 | - $gd_country = preg_replace( '/-(\d+)$/', '', $gd_country ); | |
| 4813 | - $gd_country = preg_replace( '/[_-]/', ' ', $gd_country ); | |
| 4814 | - $gd_country = __( geodir_ucwords( $gd_country ), 'geodirectory' ); | |
| 4812 | +			$gd_country = preg_replace('/-(\d+)$/', '', $gd_country);
 | |
| 4813 | +			$gd_country = preg_replace('/[_-]/', ' ', $gd_country);
 | |
| 4814 | + $gd_country = __(geodir_ucwords($gd_country), 'geodirectory'); | |
| 4815 | 4815 | } | 
| 4816 | 4816 | |
| 4817 | 4817 | $location_single = $gd_country; | 
| 4818 | 4818 | } | 
| 4819 | 4819 | |
| 4820 | -	if ( ! empty( $location_array ) ) {
 | |
| 4820 | +	if (!empty($location_array)) {
 | |
| 4821 | 4821 | |
| 4822 | - $actual_location_name = function_exists( 'get_actual_location_name' ) ? true : false; | |
| 4823 | - $location_array = array_reverse( $location_array ); | |
| 4822 | +		$actual_location_name = function_exists('get_actual_location_name') ? true : false;
 | |
| 4823 | + $location_array = array_reverse($location_array); | |
| 4824 | 4824 | |
| 4825 | -		foreach ( $location_array as $location_type => $location ) {
 | |
| 4826 | - $gd_location_link_text = preg_replace( '/-(\d+)$/', '', $location ); | |
| 4827 | - $gd_location_link_text = preg_replace( '/[_-]/', ' ', $gd_location_link_text ); | |
| 4825 | +		foreach ($location_array as $location_type => $location) {
 | |
| 4826 | +			$gd_location_link_text = preg_replace('/-(\d+)$/', '', $location);
 | |
| 4827 | +			$gd_location_link_text = preg_replace('/[_-]/', ' ', $gd_location_link_text);
 | |
| 4828 | 4828 | |
| 4829 | - $location_name = geodir_ucwords( $gd_location_link_text ); | |
| 4830 | - $location_name = __( $location_name, 'geodirectory' ); | |
| 4829 | + $location_name = geodir_ucwords($gd_location_link_text); | |
| 4830 | + $location_name = __($location_name, 'geodirectory'); | |
| 4831 | 4831 | |
| 4832 | -			if ( $actual_location_name ) {
 | |
| 4833 | - $location_type = strpos( $location_type, 'gd_' ) === 0 ? substr( $location_type, 3 ) : $location_type; | |
| 4834 | - $location_name = get_actual_location_name( $location_type, $location, true ); | |
| 4832 | +			if ($actual_location_name) {
 | |
| 4833 | + $location_type = strpos($location_type, 'gd_') === 0 ? substr($location_type, 3) : $location_type; | |
| 4834 | + $location_name = get_actual_location_name($location_type, $location, true); | |
| 4835 | 4835 | } | 
| 4836 | 4836 | |
| 4837 | 4837 | $location_titles[] = $location_name; | 
| 4838 | 4838 | } | 
| 4839 | -		if ( ! empty( $location_titles ) ) {
 | |
| 4840 | - $location_titles = array_unique( $location_titles ); | |
| 4839 | +		if (!empty($location_titles)) {
 | |
| 4840 | + $location_titles = array_unique($location_titles); | |
| 4841 | 4841 | } | 
| 4842 | 4842 | } | 
| 4843 | 4843 | |
| 4844 | 4844 | |
| 4845 | -	if ( strpos( $title, '%%location%%' ) !== false ) {
 | |
| 4845 | +	if (strpos($title, '%%location%%') !== false) {
 | |
| 4846 | 4846 | $location = ''; | 
| 4847 | -		if ( $location_titles ) {
 | |
| 4848 | - $location = implode( ", ", $location_titles ); | |
| 4847 | +		if ($location_titles) {
 | |
| 4848 | +			$location = implode(", ", $location_titles);
 | |
| 4849 | 4849 | } | 
| 4850 | - $title = str_replace( "%%location%%", $location, $title ); | |
| 4850 | +		$title = str_replace("%%location%%", $location, $title);
 | |
| 4851 | 4851 | } | 
| 4852 | 4852 | |
| 4853 | -	if ( strpos( $title, '%%in_location%%' ) !== false ) {
 | |
| 4853 | +	if (strpos($title, '%%in_location%%') !== false) {
 | |
| 4854 | 4854 | $location = ''; | 
| 4855 | -		if ( $location_titles ) {
 | |
| 4856 | - $location = __( 'in ', 'geodirectory' ) . implode( ", ", $location_titles ); | |
| 4855 | +		if ($location_titles) {
 | |
| 4856 | +			$location = __('in ', 'geodirectory').implode(", ", $location_titles);
 | |
| 4857 | 4857 | } | 
| 4858 | - $title = str_replace( "%%in_location%%", $location, $title ); | |
| 4858 | +		$title = str_replace("%%in_location%%", $location, $title);
 | |
| 4859 | 4859 | } | 
| 4860 | 4860 | |
| 4861 | -	if ( strpos( $title, '%%in_location_single%%' ) !== false ) {
 | |
| 4862 | -		if ( $location_single ) {
 | |
| 4863 | - $location_single = __( 'in', 'geodirectory' ) . ' ' . $location_single; | |
| 4861 | +	if (strpos($title, '%%in_location_single%%') !== false) {
 | |
| 4862 | +		if ($location_single) {
 | |
| 4863 | +			$location_single = __('in', 'geodirectory').' '.$location_single;
 | |
| 4864 | 4864 | } | 
| 4865 | - $title = str_replace( "%%in_location_single%%", $location_single, $title ); | |
| 4865 | +		$title = str_replace("%%in_location_single%%", $location_single, $title);
 | |
| 4866 | 4866 | } | 
| 4867 | 4867 | |
| 4868 | -	if ( strpos( $title, '%%location_single%%' ) !== false ) {
 | |
| 4869 | - $title = str_replace( "%%location_single%%", $location_single, $title ); | |
| 4868 | +	if (strpos($title, '%%location_single%%') !== false) {
 | |
| 4869 | +		$title = str_replace("%%location_single%%", $location_single, $title);
 | |
| 4870 | 4870 | } | 
| 4871 | 4871 | |
| 4872 | 4872 | |
| 4873 | -	if ( strpos( $title, '%%search_term%%' ) !== false ) {
 | |
| 4873 | +	if (strpos($title, '%%search_term%%') !== false) {
 | |
| 4874 | 4874 | $search_term = ''; | 
| 4875 | -		if ( isset( $_REQUEST['s'] ) ) {
 | |
| 4876 | - $search_term = esc_attr( $_REQUEST['s'] ); | |
| 4875 | +		if (isset($_REQUEST['s'])) {
 | |
| 4876 | + $search_term = esc_attr($_REQUEST['s']); | |
| 4877 | 4877 | } | 
| 4878 | - $title = str_replace( "%%search_term%%", $search_term, $title ); | |
| 4878 | +		$title = str_replace("%%search_term%%", $search_term, $title);
 | |
| 4879 | 4879 | } | 
| 4880 | 4880 | |
| 4881 | -	if ( strpos( $title, '%%search_near%%' ) !== false ) {
 | |
| 4881 | +	if (strpos($title, '%%search_near%%') !== false) {
 | |
| 4882 | 4882 | $search_term = ''; | 
| 4883 | -		if ( isset( $_REQUEST['snear'] ) ) {
 | |
| 4884 | - $search_term = esc_attr( $_REQUEST['snear'] ); | |
| 4883 | +		if (isset($_REQUEST['snear'])) {
 | |
| 4884 | + $search_term = esc_attr($_REQUEST['snear']); | |
| 4885 | 4885 | } | 
| 4886 | - $title = str_replace( "%%search_near%%", $search_term, $title ); | |
| 4886 | +		$title = str_replace("%%search_near%%", $search_term, $title);
 | |
| 4887 | 4887 | } | 
| 4888 | 4888 | |
| 4889 | -	if ( strpos( $title, '%%name%%' ) !== false ) {
 | |
| 4890 | -		if ( is_author() ) {
 | |
| 4891 | - $curauth = ( get_query_var( 'author_name' ) ) ? get_user_by( 'slug', get_query_var( 'author_name' ) ) : get_userdata( get_query_var( 'author' ) ); | |
| 4889 | +	if (strpos($title, '%%name%%') !== false) {
 | |
| 4890 | +		if (is_author()) {
 | |
| 4891 | +			$curauth     = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
 | |
| 4892 | 4892 | $author_name = $curauth->display_name; | 
| 4893 | 4893 |  		} else {
 | 
| 4894 | 4894 | $author_name = get_the_author(); | 
| 4895 | 4895 | } | 
| 4896 | -		if ( ! $author_name || $author_name === '' ) {
 | |
| 4896 | +		if (!$author_name || $author_name === '') {
 | |
| 4897 | 4897 | $queried_object = get_queried_object(); | 
| 4898 | 4898 | |
| 4899 | -			if ( isset( $queried_object->data->user_nicename ) ) {
 | |
| 4899 | +			if (isset($queried_object->data->user_nicename)) {
 | |
| 4900 | 4900 | $author_name = $queried_object->data->display_name; | 
| 4901 | 4901 | } | 
| 4902 | 4902 | } | 
| 4903 | - $title = str_replace( "%%name%%", $author_name, $title ); | |
| 4903 | +		$title = str_replace("%%name%%", $author_name, $title);
 | |
| 4904 | 4904 | } | 
| 4905 | 4905 | |
| 4906 | -	if ( strpos( $title, '%%page%%' ) !== false ) {
 | |
| 4907 | - $page = geodir_title_meta_page( $sep ); | |
| 4908 | - $title = str_replace( "%%page%%", $page, $title ); | |
| 4906 | +	if (strpos($title, '%%page%%') !== false) {
 | |
| 4907 | + $page = geodir_title_meta_page($sep); | |
| 4908 | +		$title = str_replace("%%page%%", $page, $title);
 | |
| 4909 | 4909 | } | 
| 4910 | -	if ( strpos( $title, '%%pagenumber%%' ) !== false ) {
 | |
| 4910 | +	if (strpos($title, '%%pagenumber%%') !== false) {
 | |
| 4911 | 4911 | $pagenumber = geodir_title_meta_pagenumber(); | 
| 4912 | - $title = str_replace( "%%pagenumber%%", $pagenumber, $title ); | |
| 4912 | +		$title      = str_replace("%%pagenumber%%", $pagenumber, $title);
 | |
| 4913 | 4913 | } | 
| 4914 | -	if ( strpos( $title, '%%pagetotal%%' ) !== false ) {
 | |
| 4914 | +	if (strpos($title, '%%pagetotal%%') !== false) {
 | |
| 4915 | 4915 | $pagetotal = geodir_title_meta_pagetotal(); | 
| 4916 | - $title = str_replace( "%%pagetotal%%", $pagetotal, $title ); | |
| 4916 | +		$title     = str_replace("%%pagetotal%%", $pagetotal, $title);
 | |
| 4917 | 4917 | } | 
| 4918 | 4918 | |
| 4919 | - $title = wptexturize( $title ); | |
| 4920 | - $title = convert_chars( $title ); | |
| 4921 | - $title = esc_html( $title ); | |
| 4919 | + $title = wptexturize($title); | |
| 4920 | + $title = convert_chars($title); | |
| 4921 | + $title = esc_html($title); | |
| 4922 | 4922 | |
| 4923 | 4923 | /** | 
| 4924 | 4924 | * Filter the title variables after standard ones have been filtered. | 
| @@ -4932,7 +4932,7 @@ discard block | ||
| 4932 | 4932 | * @param string $sep The separator, default: `|`. | 
| 4933 | 4933 | */ | 
| 4934 | 4934 | |
| 4935 | - return apply_filters( 'geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep ); | |
| 4935 | +	return apply_filters('geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep);
 | |
| 4936 | 4936 | } | 
| 4937 | 4937 | |
| 4938 | 4938 | /** | 
| @@ -4945,82 +4945,82 @@ discard block | ||
| 4945 | 4945 | * | 
| 4946 | 4946 | * @return array Translation texts. | 
| 4947 | 4947 | */ | 
| 4948 | -function geodir_load_cpt_text_translation( $translation_texts = array() ) {
 | |
| 4949 | - $gd_post_types = geodir_get_posttypes( 'array' ); | |
| 4948 | +function geodir_load_cpt_text_translation($translation_texts = array()) {
 | |
| 4949 | +	$gd_post_types = geodir_get_posttypes('array');
 | |
| 4950 | 4950 | |
| 4951 | -	if ( ! empty( $gd_post_types ) ) {
 | |
| 4952 | -		foreach ( $gd_post_types as $post_type => $cpt_info ) {
 | |
| 4953 | - $labels = isset( $cpt_info['labels'] ) ? $cpt_info['labels'] : ''; | |
| 4954 | - $description = isset( $cpt_info['description'] ) ? $cpt_info['description'] : ''; | |
| 4955 | - $seo = isset( $cpt_info['seo'] ) ? $cpt_info['seo'] : ''; | |
| 4951 | +	if (!empty($gd_post_types)) {
 | |
| 4952 | +		foreach ($gd_post_types as $post_type => $cpt_info) {
 | |
| 4953 | + $labels = isset($cpt_info['labels']) ? $cpt_info['labels'] : ''; | |
| 4954 | + $description = isset($cpt_info['description']) ? $cpt_info['description'] : ''; | |
| 4955 | + $seo = isset($cpt_info['seo']) ? $cpt_info['seo'] : ''; | |
| 4956 | 4956 | |
| 4957 | -			if ( ! empty( $labels ) ) {
 | |
| 4958 | -				if ( $labels['name'] != '' && ! in_array( $labels['name'], $translation_texts ) ) {
 | |
| 4957 | +			if (!empty($labels)) {
 | |
| 4958 | +				if ($labels['name'] != '' && !in_array($labels['name'], $translation_texts)) {
 | |
| 4959 | 4959 | $translation_texts[] = $labels['name']; | 
| 4960 | 4960 | } | 
| 4961 | -				if ( $labels['singular_name'] != '' && ! in_array( $labels['singular_name'], $translation_texts ) ) {
 | |
| 4961 | +				if ($labels['singular_name'] != '' && !in_array($labels['singular_name'], $translation_texts)) {
 | |
| 4962 | 4962 | $translation_texts[] = $labels['singular_name']; | 
| 4963 | 4963 | } | 
| 4964 | -				if ( $labels['add_new'] != '' && ! in_array( $labels['add_new'], $translation_texts ) ) {
 | |
| 4964 | +				if ($labels['add_new'] != '' && !in_array($labels['add_new'], $translation_texts)) {
 | |
| 4965 | 4965 | $translation_texts[] = $labels['add_new']; | 
| 4966 | 4966 | } | 
| 4967 | -				if ( $labels['add_new_item'] != '' && ! in_array( $labels['add_new_item'], $translation_texts ) ) {
 | |
| 4967 | +				if ($labels['add_new_item'] != '' && !in_array($labels['add_new_item'], $translation_texts)) {
 | |
| 4968 | 4968 | $translation_texts[] = $labels['add_new_item']; | 
| 4969 | 4969 | } | 
| 4970 | -				if ( $labels['edit_item'] != '' && ! in_array( $labels['edit_item'], $translation_texts ) ) {
 | |
| 4970 | +				if ($labels['edit_item'] != '' && !in_array($labels['edit_item'], $translation_texts)) {
 | |
| 4971 | 4971 | $translation_texts[] = $labels['edit_item']; | 
| 4972 | 4972 | } | 
| 4973 | -				if ( $labels['new_item'] != '' && ! in_array( $labels['new_item'], $translation_texts ) ) {
 | |
| 4973 | +				if ($labels['new_item'] != '' && !in_array($labels['new_item'], $translation_texts)) {
 | |
| 4974 | 4974 | $translation_texts[] = $labels['new_item']; | 
| 4975 | 4975 | } | 
| 4976 | -				if ( $labels['view_item'] != '' && ! in_array( $labels['view_item'], $translation_texts ) ) {
 | |
| 4976 | +				if ($labels['view_item'] != '' && !in_array($labels['view_item'], $translation_texts)) {
 | |
| 4977 | 4977 | $translation_texts[] = $labels['view_item']; | 
| 4978 | 4978 | } | 
| 4979 | -				if ( $labels['search_items'] != '' && ! in_array( $labels['search_items'], $translation_texts ) ) {
 | |
| 4979 | +				if ($labels['search_items'] != '' && !in_array($labels['search_items'], $translation_texts)) {
 | |
| 4980 | 4980 | $translation_texts[] = $labels['search_items']; | 
| 4981 | 4981 | } | 
| 4982 | -				if ( $labels['not_found'] != '' && ! in_array( $labels['not_found'], $translation_texts ) ) {
 | |
| 4982 | +				if ($labels['not_found'] != '' && !in_array($labels['not_found'], $translation_texts)) {
 | |
| 4983 | 4983 | $translation_texts[] = $labels['not_found']; | 
| 4984 | 4984 | } | 
| 4985 | -				if ( $labels['not_found_in_trash'] != '' && ! in_array( $labels['not_found_in_trash'], $translation_texts ) ) {
 | |
| 4985 | +				if ($labels['not_found_in_trash'] != '' && !in_array($labels['not_found_in_trash'], $translation_texts)) {
 | |
| 4986 | 4986 | $translation_texts[] = $labels['not_found_in_trash']; | 
| 4987 | 4987 | } | 
| 4988 | -				if ( isset( $labels['label_post_profile'] ) && $labels['label_post_profile'] != '' && ! in_array( $labels['label_post_profile'], $translation_texts ) ) {
 | |
| 4988 | +				if (isset($labels['label_post_profile']) && $labels['label_post_profile'] != '' && !in_array($labels['label_post_profile'], $translation_texts)) {
 | |
| 4989 | 4989 | $translation_texts[] = $labels['label_post_profile']; | 
| 4990 | 4990 | } | 
| 4991 | -				if ( isset( $labels['label_post_info'] ) && $labels['label_post_info'] != '' && ! in_array( $labels['label_post_info'], $translation_texts ) ) {
 | |
| 4991 | +				if (isset($labels['label_post_info']) && $labels['label_post_info'] != '' && !in_array($labels['label_post_info'], $translation_texts)) {
 | |
| 4992 | 4992 | $translation_texts[] = $labels['label_post_info']; | 
| 4993 | 4993 | } | 
| 4994 | -				if ( isset( $labels['label_post_images'] ) && $labels['label_post_images'] != '' && ! in_array( $labels['label_post_images'], $translation_texts ) ) {
 | |
| 4994 | +				if (isset($labels['label_post_images']) && $labels['label_post_images'] != '' && !in_array($labels['label_post_images'], $translation_texts)) {
 | |
| 4995 | 4995 | $translation_texts[] = $labels['label_post_images']; | 
| 4996 | 4996 | } | 
| 4997 | -				if ( isset( $labels['label_post_map'] ) && $labels['label_post_map'] != '' && ! in_array( $labels['label_post_map'], $translation_texts ) ) {
 | |
| 4997 | +				if (isset($labels['label_post_map']) && $labels['label_post_map'] != '' && !in_array($labels['label_post_map'], $translation_texts)) {
 | |
| 4998 | 4998 | $translation_texts[] = $labels['label_post_map']; | 
| 4999 | 4999 | } | 
| 5000 | -				if ( isset( $labels['label_reviews'] ) && $labels['label_reviews'] != '' && ! in_array( $labels['label_reviews'], $translation_texts ) ) {
 | |
| 5000 | +				if (isset($labels['label_reviews']) && $labels['label_reviews'] != '' && !in_array($labels['label_reviews'], $translation_texts)) {
 | |
| 5001 | 5001 | $translation_texts[] = $labels['label_reviews']; | 
| 5002 | 5002 | } | 
| 5003 | -				if ( isset( $labels['label_related_listing'] ) && $labels['label_related_listing'] != '' && ! in_array( $labels['label_related_listing'], $translation_texts ) ) {
 | |
| 5003 | +				if (isset($labels['label_related_listing']) && $labels['label_related_listing'] != '' && !in_array($labels['label_related_listing'], $translation_texts)) {
 | |
| 5004 | 5004 | $translation_texts[] = $labels['label_related_listing']; | 
| 5005 | 5005 | } | 
| 5006 | 5006 | } | 
| 5007 | 5007 | |
| 5008 | -			if ( $description != '' && ! in_array( $description, $translation_texts ) ) {
 | |
| 5009 | - $translation_texts[] = normalize_whitespace( $description ); | |
| 5008 | +			if ($description != '' && !in_array($description, $translation_texts)) {
 | |
| 5009 | + $translation_texts[] = normalize_whitespace($description); | |
| 5010 | 5010 | } | 
| 5011 | 5011 | |
| 5012 | -			if ( ! empty( $seo ) ) {
 | |
| 5013 | -				if ( isset( $seo['meta_keyword'] ) && $seo['meta_keyword'] != '' && ! in_array( $seo['meta_keyword'], $translation_texts ) ) {
 | |
| 5014 | - $translation_texts[] = normalize_whitespace( $seo['meta_keyword'] ); | |
| 5012 | +			if (!empty($seo)) {
 | |
| 5013 | +				if (isset($seo['meta_keyword']) && $seo['meta_keyword'] != '' && !in_array($seo['meta_keyword'], $translation_texts)) {
 | |
| 5014 | + $translation_texts[] = normalize_whitespace($seo['meta_keyword']); | |
| 5015 | 5015 | } | 
| 5016 | 5016 | |
| 5017 | -				if ( isset( $seo['meta_description'] ) && $seo['meta_description'] != '' && ! in_array( $seo['meta_description'], $translation_texts ) ) {
 | |
| 5018 | - $translation_texts[] = normalize_whitespace( $seo['meta_description'] ); | |
| 5017 | +				if (isset($seo['meta_description']) && $seo['meta_description'] != '' && !in_array($seo['meta_description'], $translation_texts)) {
 | |
| 5018 | + $translation_texts[] = normalize_whitespace($seo['meta_description']); | |
| 5019 | 5019 | } | 
| 5020 | 5020 | } | 
| 5021 | 5021 | } | 
| 5022 | 5022 | } | 
| 5023 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; | |
| 5023 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; | |
| 5024 | 5024 | |
| 5025 | 5025 | return $translation_texts; | 
| 5026 | 5026 | } | 
| @@ -5035,27 +5035,27 @@ discard block | ||
| 5035 | 5035 | * | 
| 5036 | 5036 | * @return array Location terms. | 
| 5037 | 5037 | */ | 
| 5038 | -function geodir_remove_location_terms( $location_terms = array() ) {
 | |
| 5039 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; | |
| 5038 | +function geodir_remove_location_terms($location_terms = array()) {
 | |
| 5039 | +	$location_manager = defined('POST_LOCATION_TABLE') ? true : false;
 | |
| 5040 | 5040 | |
| 5041 | -	if ( ! empty( $location_terms ) && $location_manager ) {
 | |
| 5042 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); | |
| 5043 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); | |
| 5041 | +	if (!empty($location_terms) && $location_manager) {
 | |
| 5042 | +		$hide_country_part = get_option('geodir_location_hide_country_part');
 | |
| 5043 | +		$hide_region_part  = get_option('geodir_location_hide_region_part');
 | |
| 5044 | 5044 | |
| 5045 | -		if ( $hide_region_part && $hide_country_part ) {
 | |
| 5046 | -			if ( isset( $location_terms['gd_country'] ) ) {
 | |
| 5047 | - unset( $location_terms['gd_country'] ); | |
| 5045 | +		if ($hide_region_part && $hide_country_part) {
 | |
| 5046 | +			if (isset($location_terms['gd_country'])) {
 | |
| 5047 | + unset($location_terms['gd_country']); | |
| 5048 | 5048 | } | 
| 5049 | -			if ( isset( $location_terms['gd_region'] ) ) {
 | |
| 5050 | - unset( $location_terms['gd_region'] ); | |
| 5049 | +			if (isset($location_terms['gd_region'])) {
 | |
| 5050 | + unset($location_terms['gd_region']); | |
| 5051 | 5051 | } | 
| 5052 | -		} else if ( $hide_region_part && ! $hide_country_part ) {
 | |
| 5053 | -			if ( isset( $location_terms['gd_region'] ) ) {
 | |
| 5054 | - unset( $location_terms['gd_region'] ); | |
| 5052 | +		} else if ($hide_region_part && !$hide_country_part) {
 | |
| 5053 | +			if (isset($location_terms['gd_region'])) {
 | |
| 5054 | + unset($location_terms['gd_region']); | |
| 5055 | 5055 | } | 
| 5056 | -		} else if ( ! $hide_region_part && $hide_country_part ) {
 | |
| 5057 | -			if ( isset( $location_terms['gd_country'] ) ) {
 | |
| 5058 | - unset( $location_terms['gd_country'] ); | |
| 5056 | +		} else if (!$hide_region_part && $hide_country_part) {
 | |
| 5057 | +			if (isset($location_terms['gd_country'])) {
 | |
| 5058 | + unset($location_terms['gd_country']); | |
| 5059 | 5059 | } | 
| 5060 | 5060 | } | 
| 5061 | 5061 | } | 
| @@ -5073,33 +5073,33 @@ discard block | ||
| 5073 | 5073 | * @param WP_Post $post Post object. | 
| 5074 | 5074 | * @param bool $update Whether this is an existing listing being updated or not. | 
| 5075 | 5075 | */ | 
| 5076 | -function geodir_on_wp_insert_post( $post_ID, $post, $update ) {
 | |
| 5077 | -	if ( ! $update ) {
 | |
| 5076 | +function geodir_on_wp_insert_post($post_ID, $post, $update) {
 | |
| 5077 | +	if (!$update) {
 | |
| 5078 | 5078 | return; | 
| 5079 | 5079 | } | 
| 5080 | 5080 | |
| 5081 | - $action = isset( $_REQUEST['action'] ) ? sanitize_text_field( $_REQUEST['action'] ) : ''; | |
| 5082 | - $is_admin = is_admin() && ( ! defined( 'DOING_AJAX' ) || ( defined( 'DOING_AJAX' ) && ! DOING_AJAX ) ) ? true : false; | |
| 5081 | + $action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : ''; | |
| 5082 | +	$is_admin    = is_admin() && (!defined('DOING_AJAX') || (defined('DOING_AJAX') && !DOING_AJAX)) ? true : false;
 | |
| 5083 | 5083 | $inline_save = $action == 'inline-save' ? true : false; | 
| 5084 | 5084 | |
| 5085 | -	if ( empty( $post->post_type ) || $is_admin || $inline_save || ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) ) {
 | |
| 5085 | +	if (empty($post->post_type) || $is_admin || $inline_save || (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)) {
 | |
| 5086 | 5086 | return; | 
| 5087 | 5087 | } | 
| 5088 | 5088 | |
| 5089 | -	if ( $action != '' && in_array( $action, array( 'geodir_import_export' ) ) ) {
 | |
| 5089 | +	if ($action != '' && in_array($action, array('geodir_import_export'))) {
 | |
| 5090 | 5090 | return; | 
| 5091 | 5091 | } | 
| 5092 | 5092 | |
| 5093 | 5093 | $user_id = (int) get_current_user_id(); | 
| 5094 | 5094 | |
| 5095 | -	if ( $user_id > 0 && get_option( 'geodir_notify_post_edited' ) && ! wp_is_post_revision( $post_ID ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
 | |
| 5096 | - $author_id = ! empty( $post->post_author ) ? $post->post_author : 0; | |
| 5095 | +	if ($user_id > 0 && get_option('geodir_notify_post_edited') && !wp_is_post_revision($post_ID) && in_array($post->post_type, geodir_get_posttypes())) {
 | |
| 5096 | + $author_id = !empty($post->post_author) ? $post->post_author : 0; | |
| 5097 | 5097 | |
| 5098 | -		if ( $user_id == $author_id && ! is_super_admin() ) {
 | |
| 5099 | - $from_email = get_option( 'site_email' ); | |
| 5098 | +		if ($user_id == $author_id && !is_super_admin()) {
 | |
| 5099 | +			$from_email   = get_option('site_email');
 | |
| 5100 | 5100 | $from_name = get_site_emailName(); | 
| 5101 | - $to_email = get_option( 'admin_email' ); | |
| 5102 | - $to_name = get_option( 'name' ); | |
| 5101 | +			$to_email     = get_option('admin_email');
 | |
| 5102 | +			$to_name      = get_option('name');
 | |
| 5103 | 5103 | $message_type = 'listing_edited'; | 
| 5104 | 5104 | |
| 5105 | 5105 | $notify_edited = true; | 
| @@ -5111,9 +5111,9 @@ discard block | ||
| 5111 | 5111 | * @param bool $notify_edited Notify on listing edited by author? | 
| 5112 | 5112 | * @param object $post The current post object. | 
| 5113 | 5113 | */ | 
| 5114 | - $notify_edited = apply_filters( 'geodir_notify_on_listing_edited', $notify_edited, $post ); | |
| 5114 | +			$notify_edited = apply_filters('geodir_notify_on_listing_edited', $notify_edited, $post);
 | |
| 5115 | 5115 | |
| 5116 | - geodir_sendEmail( $from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID ); | |
| 5116 | + geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID); | |
| 5117 | 5117 | } | 
| 5118 | 5118 | } | 
| 5119 | 5119 | } | 
| @@ -5128,14 +5128,14 @@ discard block | ||
| 5128 | 5128 | * | 
| 5129 | 5129 | * @return string|null The current page start & end numbering. | 
| 5130 | 5130 | */ | 
| 5131 | -function geodir_title_meta_page( $sep ) {
 | |
| 5131 | +function geodir_title_meta_page($sep) {
 | |
| 5132 | 5132 | $replacement = null; | 
| 5133 | 5133 | |
| 5134 | - $max = geodir_title_meta_pagenumbering( 'max' ); | |
| 5135 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); | |
| 5134 | +	$max = geodir_title_meta_pagenumbering('max');
 | |
| 5135 | +	$nr  = geodir_title_meta_pagenumbering('nr');
 | |
| 5136 | 5136 | |
| 5137 | -	if ( $max > 1 && $nr > 1 ) {
 | |
| 5138 | - $replacement = sprintf( $sep . ' ' . __( 'Page %1$d of %2$d', 'geodirectory' ), $nr, $max ); | |
| 5137 | +	if ($max > 1 && $nr > 1) {
 | |
| 5138 | +		$replacement = sprintf($sep.' '.__('Page %1$d of %2$d', 'geodirectory'), $nr, $max);
 | |
| 5139 | 5139 | } | 
| 5140 | 5140 | |
| 5141 | 5141 | return $replacement; | 
| @@ -5152,8 +5152,8 @@ discard block | ||
| 5152 | 5152 |  function geodir_title_meta_pagenumber() {
 | 
| 5153 | 5153 | $replacement = null; | 
| 5154 | 5154 | |
| 5155 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); | |
| 5156 | -	if ( isset( $nr ) && $nr > 0 ) {
 | |
| 5155 | +	$nr = geodir_title_meta_pagenumbering('nr');
 | |
| 5156 | +	if (isset($nr) && $nr > 0) {
 | |
| 5157 | 5157 | $replacement = (string) $nr; | 
| 5158 | 5158 | } | 
| 5159 | 5159 | |
| @@ -5171,8 +5171,8 @@ discard block | ||
| 5171 | 5171 |  function geodir_title_meta_pagetotal() {
 | 
| 5172 | 5172 | $replacement = null; | 
| 5173 | 5173 | |
| 5174 | - $max = geodir_title_meta_pagenumbering( 'max' ); | |
| 5175 | -	if ( isset( $max ) && $max > 0 ) {
 | |
| 5174 | +	$max = geodir_title_meta_pagenumbering('max');
 | |
| 5175 | +	if (isset($max) && $max > 0) {
 | |
| 5176 | 5176 | $replacement = (string) $max; | 
| 5177 | 5177 | } | 
| 5178 | 5178 | |
| @@ -5192,36 +5192,36 @@ discard block | ||
| 5192 | 5192 | * | 
| 5193 | 5193 | * @return int|null The current page numbering. | 
| 5194 | 5194 | */ | 
| 5195 | -function geodir_title_meta_pagenumbering( $request = 'nr' ) {
 | |
| 5195 | +function geodir_title_meta_pagenumbering($request = 'nr') {
 | |
| 5196 | 5196 | global $wp_query, $post; | 
| 5197 | 5197 | $max_num_pages = null; | 
| 5198 | 5198 | $page_number = null; | 
| 5199 | 5199 | |
| 5200 | 5200 | $max_num_pages = 1; | 
| 5201 | 5201 | |
| 5202 | -	if ( ! is_singular() ) {
 | |
| 5203 | - $page_number = get_query_var( 'paged' ); | |
| 5204 | -		if ( $page_number === 0 || $page_number === '' ) {
 | |
| 5202 | +	if (!is_singular()) {
 | |
| 5203 | +		$page_number = get_query_var('paged');
 | |
| 5204 | +		if ($page_number === 0 || $page_number === '') {
 | |
| 5205 | 5205 | $page_number = 1; | 
| 5206 | 5206 | } | 
| 5207 | 5207 | |
| 5208 | -		if ( isset( $wp_query->max_num_pages ) && ( $wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0 ) ) {
 | |
| 5208 | +		if (isset($wp_query->max_num_pages) && ($wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0)) {
 | |
| 5209 | 5209 | $max_num_pages = $wp_query->max_num_pages; | 
| 5210 | 5210 | } | 
| 5211 | 5211 |  	} else {
 | 
| 5212 | - $page_number = get_query_var( 'page' ); | |
| 5213 | -		if ( $page_number === 0 || $page_number === '' ) {
 | |
| 5212 | +		$page_number = get_query_var('page');
 | |
| 5213 | +		if ($page_number === 0 || $page_number === '') {
 | |
| 5214 | 5214 | $page_number = 1; | 
| 5215 | 5215 | } | 
| 5216 | 5216 | |
| 5217 | -		if ( isset( $post->post_content ) ) {
 | |
| 5218 | - $max_num_pages = ( substr_count( $post->post_content, '<!--nextpage-->' ) + 1 ); | |
| 5217 | +		if (isset($post->post_content)) {
 | |
| 5218 | + $max_num_pages = (substr_count($post->post_content, '<!--nextpage-->') + 1); | |
| 5219 | 5219 | } | 
| 5220 | 5220 | } | 
| 5221 | 5221 | |
| 5222 | 5222 | $return = null; | 
| 5223 | 5223 | |
| 5224 | -	switch ( $request ) {
 | |
| 5224 | +	switch ($request) {
 | |
| 5225 | 5225 | case 'nr': | 
| 5226 | 5226 | $return = $page_number; | 
| 5227 | 5227 | break; | 
| @@ -5242,14 +5242,14 @@ discard block | ||
| 5242 | 5242 | * | 
| 5243 | 5243 | * @return array Terms. | 
| 5244 | 5244 | */ | 
| 5245 | -function geodir_filter_empty_terms( $terms ) {
 | |
| 5246 | -	if ( empty( $terms ) ) {
 | |
| 5245 | +function geodir_filter_empty_terms($terms) {
 | |
| 5246 | +	if (empty($terms)) {
 | |
| 5247 | 5247 | return $terms; | 
| 5248 | 5248 | } | 
| 5249 | 5249 | |
| 5250 | 5250 | $return = array(); | 
| 5251 | -	foreach ( $terms as $term ) {
 | |
| 5252 | -		if ( isset( $term->count ) && $term->count > 0 ) {
 | |
| 5251 | +	foreach ($terms as $term) {
 | |
| 5252 | +		if (isset($term->count) && $term->count > 0) {
 | |
| 5253 | 5253 | $return[] = $term; | 
| 5254 | 5254 |  		} else {
 | 
| 5255 | 5255 | /** | 
| @@ -5260,7 +5260,7 @@ discard block | ||
| 5260 | 5260 | * @param array $return The array of terms to return. | 
| 5261 | 5261 | * @param object $term The term object. | 
| 5262 | 5262 | */ | 
| 5263 | - $return = apply_filters( 'geodir_filter_empty_terms_filter', $return, $term ); | |
| 5263 | +			$return = apply_filters('geodir_filter_empty_terms_filter', $return, $term);
 | |
| 5264 | 5264 | } | 
| 5265 | 5265 | } | 
| 5266 | 5266 | |
| @@ -5277,15 +5277,15 @@ discard block | ||
| 5277 | 5277 | * | 
| 5278 | 5278 | * @return array | 
| 5279 | 5279 | */ | 
| 5280 | -function geodir_remove_hentry( $class ) {
 | |
| 5281 | -	if ( geodir_is_page( 'detail' ) ) {
 | |
| 5282 | - $class = array_diff( $class, array( 'hentry' ) ); | |
| 5280 | +function geodir_remove_hentry($class) {
 | |
| 5281 | +	if (geodir_is_page('detail')) {
 | |
| 5282 | +		$class = array_diff($class, array('hentry'));
 | |
| 5283 | 5283 | } | 
| 5284 | 5284 | |
| 5285 | 5285 | return $class; | 
| 5286 | 5286 | } | 
| 5287 | 5287 | |
| 5288 | -add_filter( 'post_class', 'geodir_remove_hentry' ); | |
| 5288 | +add_filter('post_class', 'geodir_remove_hentry');
 | |
| 5289 | 5289 | |
| 5290 | 5290 | /** | 
| 5291 | 5291 | * Registers a individual text string for WPML translation. | 
| @@ -5297,8 +5297,8 @@ discard block | ||
| 5297 | 5297 | * @param string $domain The plugin domain. Default geodirectory. | 
| 5298 | 5298 | * @param string $name The name of the string which helps to know what's being translated. | 
| 5299 | 5299 | */ | 
| 5300 | -function geodir_wpml_register_string( $string, $domain = 'geodirectory', $name = '' ) {
 | |
| 5301 | - do_action( 'wpml_register_single_string', $domain, $name, $string ); | |
| 5300 | +function geodir_wpml_register_string($string, $domain = 'geodirectory', $name = '') {
 | |
| 5301 | +    do_action('wpml_register_single_string', $domain, $name, $string);
 | |
| 5302 | 5302 | } | 
| 5303 | 5303 | |
| 5304 | 5304 | /** | 
| @@ -5313,6 +5313,6 @@ discard block | ||
| 5313 | 5313 | * @param string $language_code Return the translation in this language. Default is NULL which returns the current language. | 
| 5314 | 5314 | * @return string The translated string. | 
| 5315 | 5315 | */ | 
| 5316 | -function geodir_wpml_translate_string( $string, $domain = 'geodirectory', $name = '', $language_code = NULL ) {
 | |
| 5317 | - return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code ); | |
| 5316 | +function geodir_wpml_translate_string($string, $domain = 'geodirectory', $name = '', $language_code = NULL) {
 | |
| 5317 | +    return apply_filters('wpml_translate_single_string', $string, $domain, $name, $language_code);
 | |
| 5318 | 5318 | } | 
| 5319 | 5319 | \ No newline at end of file |