GeoDirectory /
geodirectory
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | * |
| 37 | 37 | * @since 1.0.0 |
| 38 | 38 | * @package GeoDirectory |
| 39 | - * @return object |
|
| 39 | + * @return string |
|
| 40 | 40 | */ |
| 41 | 41 | function geodir_get_default_location() |
| 42 | 42 | {
|
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | * @package GeoDirectory |
| 277 | 277 | * @param int $min The minimum number. Default: 0. |
| 278 | 278 | * @param int $max The maximum number. Default: 1. |
| 279 | - * @return float |
|
| 279 | + * @return integer |
|
| 280 | 280 | */ |
| 281 | 281 | function geodir_random_float($min = 0, $max = 1) |
| 282 | 282 | {
|
@@ -594,6 +594,9 @@ discard block |
||
| 594 | 594 | add_filter('geodir_replace_location_variables', 'geodir_replace_location_variables');
|
| 595 | 595 | |
| 596 | 596 | |
| 597 | +/** |
|
| 598 | + * @param string $sep |
|
| 599 | + */ |
|
| 597 | 600 | function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = ''){
|
| 598 | 601 | |
| 599 | 602 | global $wp; |
@@ -9,10 +9,10 @@ discard block |
||
| 9 | 9 | */ |
| 10 | 10 | function geodir_get_current_city_lat() |
| 11 | 11 | {
|
| 12 | - $location = geodir_get_default_location(); |
|
| 13 | - $lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '39.952484'; |
|
| 12 | + $location = geodir_get_default_location(); |
|
| 13 | + $lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '39.952484'; |
|
| 14 | 14 | |
| 15 | - return $lat; |
|
| 15 | + return $lat; |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | /** |
@@ -25,9 +25,9 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | function geodir_get_current_city_lng() |
| 27 | 27 | {
|
| 28 | - $location = geodir_get_default_location(); |
|
| 29 | - $lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '-75.163786'; |
|
| 30 | - return $lng; |
|
| 28 | + $location = geodir_get_default_location(); |
|
| 29 | + $lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '-75.163786'; |
|
| 30 | + return $lng; |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | |
@@ -40,15 +40,15 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | function geodir_get_default_location() |
| 42 | 42 | {
|
| 43 | - /** |
|
| 44 | - * Filter the default location. |
|
| 45 | - * |
|
| 46 | - * @since 1.0.0 |
|
| 47 | - * @package GeoDirectory |
|
| 48 | - * |
|
| 49 | - * @param string $location_result The default location object. |
|
| 50 | - */ |
|
| 51 | - return $location_result = apply_filters('geodir_get_default_location', get_option('geodir_default_location'));
|
|
| 43 | + /** |
|
| 44 | + * Filter the default location. |
|
| 45 | + * |
|
| 46 | + * @since 1.0.0 |
|
| 47 | + * @package GeoDirectory |
|
| 48 | + * |
|
| 49 | + * @param string $location_result The default location object. |
|
| 50 | + */ |
|
| 51 | + return $location_result = apply_filters('geodir_get_default_location', get_option('geodir_default_location'));
|
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -60,11 +60,11 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | function geodir_is_default_location_set() |
| 62 | 62 | {
|
| 63 | - $default_location = geodir_get_default_location(); |
|
| 64 | - if (!empty($default_location)) |
|
| 65 | - return true; |
|
| 66 | - else |
|
| 67 | - return false; |
|
| 63 | + $default_location = geodir_get_default_location(); |
|
| 64 | + if (!empty($default_location)) |
|
| 65 | + return true; |
|
| 66 | + else |
|
| 67 | + return false; |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | /** |
@@ -78,15 +78,15 @@ discard block |
||
| 78 | 78 | function create_location_slug($location_string) |
| 79 | 79 | {
|
| 80 | 80 | |
| 81 | - /** |
|
| 82 | - * Filter the location slug. |
|
| 83 | - * |
|
| 84 | - * @since 1.0.0 |
|
| 85 | - * @package GeoDirectory |
|
| 86 | - * |
|
| 87 | - * @param string $location_string Sanitized location string. |
|
| 88 | - */ |
|
| 89 | - return urldecode(apply_filters('geodir_location_slug_check', sanitize_title($location_string)));
|
|
| 81 | + /** |
|
| 82 | + * Filter the location slug. |
|
| 83 | + * |
|
| 84 | + * @since 1.0.0 |
|
| 85 | + * @package GeoDirectory |
|
| 86 | + * |
|
| 87 | + * @param string $location_string Sanitized location string. |
|
| 88 | + */ |
|
| 89 | + return urldecode(apply_filters('geodir_location_slug_check', sanitize_title($location_string)));
|
|
| 90 | 90 | |
| 91 | 91 | } |
| 92 | 92 | |
@@ -100,15 +100,15 @@ discard block |
||
| 100 | 100 | */ |
| 101 | 101 | function geodir_get_location($id = '') |
| 102 | 102 | {
|
| 103 | - /** |
|
| 104 | - * Filter the location information. |
|
| 105 | - * |
|
| 106 | - * @since 1.0.0 |
|
| 107 | - * @package GeoDirectory |
|
| 108 | - * |
|
| 109 | - * @param string $id The location ID. |
|
| 110 | - */ |
|
| 111 | - return $location_result = apply_filters('geodir_get_location_by_id', get_option('geodir_default_location'), $id);
|
|
| 103 | + /** |
|
| 104 | + * Filter the location information. |
|
| 105 | + * |
|
| 106 | + * @since 1.0.0 |
|
| 107 | + * @package GeoDirectory |
|
| 108 | + * |
|
| 109 | + * @param string $id The location ID. |
|
| 110 | + */ |
|
| 111 | + return $location_result = apply_filters('geodir_get_location_by_id', get_option('geodir_default_location'), $id);
|
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | /** |
@@ -122,28 +122,28 @@ discard block |
||
| 122 | 122 | */ |
| 123 | 123 | function geodir_get_country_dl($post_country = '', $prefix = '') |
| 124 | 124 | {
|
| 125 | - global $wpdb; |
|
| 125 | + global $wpdb; |
|
| 126 | 126 | |
| 127 | - $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");
|
|
| 127 | + $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");
|
|
| 128 | 128 | |
| 129 | - $ISO2 = array(); |
|
| 130 | - $countries = array(); |
|
| 129 | + $ISO2 = array(); |
|
| 130 | + $countries = array(); |
|
| 131 | 131 | |
| 132 | - foreach ($rows as $row) {
|
|
| 133 | - $ISO2[$row->Country] = $row->ISO2; |
|
| 134 | - $countries[$row->Country] = __($row->Country, 'geodirectory'); |
|
| 135 | - } |
|
| 132 | + foreach ($rows as $row) {
|
|
| 133 | + $ISO2[$row->Country] = $row->ISO2; |
|
| 134 | + $countries[$row->Country] = __($row->Country, 'geodirectory'); |
|
| 135 | + } |
|
| 136 | 136 | |
| 137 | - asort($countries); |
|
| 137 | + asort($countries); |
|
| 138 | 138 | |
| 139 | - $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';
|
|
| 140 | - foreach ($countries as $country => $name) {
|
|
| 141 | - $ccode = $ISO2[$country]; |
|
| 139 | + $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';
|
|
| 140 | + foreach ($countries as $country => $name) {
|
|
| 141 | + $ccode = $ISO2[$country]; |
|
| 142 | 142 | |
| 143 | - $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>'; |
|
| 144 | - } |
|
| 143 | + $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>'; |
|
| 144 | + } |
|
| 145 | 145 | |
| 146 | - echo $out_put; |
|
| 146 | + echo $out_put; |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | |
@@ -158,40 +158,40 @@ discard block |
||
| 158 | 158 | function geodir_location_form_submit() |
| 159 | 159 | {
|
| 160 | 160 | |
| 161 | - global $wpdb, $plugin_prefix; |
|
| 162 | - if (isset($_REQUEST['add_location'])) {
|
|
| 161 | + global $wpdb, $plugin_prefix; |
|
| 162 | + if (isset($_REQUEST['add_location'])) {
|
|
| 163 | 163 | |
| 164 | - $location_info = array( |
|
| 165 | - 'city' => $_REQUEST['city'], |
|
| 166 | - 'region' => $_REQUEST['region'], |
|
| 167 | - 'country' => $_REQUEST['country'], |
|
| 168 | - 'geo_lat' => $_REQUEST['latitude'], |
|
| 169 | - 'geo_lng' => $_REQUEST['longitude'], |
|
| 170 | - 'is_default' => $_REQUEST['is_default'], |
|
| 171 | - 'update_city' => $_REQUEST['update_city'] |
|
| 172 | - ); |
|
| 164 | + $location_info = array( |
|
| 165 | + 'city' => $_REQUEST['city'], |
|
| 166 | + 'region' => $_REQUEST['region'], |
|
| 167 | + 'country' => $_REQUEST['country'], |
|
| 168 | + 'geo_lat' => $_REQUEST['latitude'], |
|
| 169 | + 'geo_lng' => $_REQUEST['longitude'], |
|
| 170 | + 'is_default' => $_REQUEST['is_default'], |
|
| 171 | + 'update_city' => $_REQUEST['update_city'] |
|
| 172 | + ); |
|
| 173 | 173 | |
| 174 | - $old_location = geodir_get_default_location(); |
|
| 174 | + $old_location = geodir_get_default_location(); |
|
| 175 | 175 | |
| 176 | - $locationid = geodir_add_new_location($location_info); |
|
| 176 | + $locationid = geodir_add_new_location($location_info); |
|
| 177 | 177 | |
| 178 | - $default_location = geodir_get_location($locationid); |
|
| 178 | + $default_location = geodir_get_location($locationid); |
|
| 179 | 179 | |
| 180 | - //UPDATE AND DELETE LISTING |
|
| 181 | - $posttype = geodir_get_posttypes(); |
|
| 182 | - if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {
|
|
| 180 | + //UPDATE AND DELETE LISTING |
|
| 181 | + $posttype = geodir_get_posttypes(); |
|
| 182 | + if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {
|
|
| 183 | 183 | |
| 184 | - foreach ($posttype as $posttypeobj) {
|
|
| 185 | - $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location |
|
| 184 | + foreach ($posttype as $posttypeobj) {
|
|
| 185 | + $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location |
|
| 186 | 186 | |
| 187 | - $sql = $wpdb->prepare( |
|
| 188 | - "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)", |
|
| 189 | - array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations) |
|
| 190 | - ); |
|
| 191 | - $wpdb->query($sql); |
|
| 192 | - } |
|
| 193 | - } |
|
| 194 | - } |
|
| 187 | + $sql = $wpdb->prepare( |
|
| 188 | + "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)", |
|
| 189 | + array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations) |
|
| 190 | + ); |
|
| 191 | + $wpdb->query($sql); |
|
| 192 | + } |
|
| 193 | + } |
|
| 194 | + } |
|
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | /** |
@@ -215,37 +215,37 @@ discard block |
||
| 215 | 215 | */ |
| 216 | 216 | function geodir_add_new_location($location_info = array()) |
| 217 | 217 | {
|
| 218 | - global $wpdb; |
|
| 219 | - |
|
| 220 | - if (!empty($location_info)) {
|
|
| 221 | - $location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all'; |
|
| 222 | - $location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all'; |
|
| 223 | - $location_country = ($location_info['country'] != '') ? geodir_get_normal_country($location_info['country']) : 'all'; |
|
| 224 | - $location_lat = ($location_info['geo_lat'] != '') ? $location_info['geo_lat'] : ''; |
|
| 225 | - $location_lng = ($location_info['geo_lng'] != '') ? $location_info['geo_lng'] : ''; |
|
| 226 | - $is_default = isset($location_info['is_default']) ? $location_info['is_default'] : ''; |
|
| 227 | - $country_slug = create_location_slug(__($location_country, 'geodirectory')); |
|
| 228 | - $region_slug = create_location_slug($location_region); |
|
| 229 | - $city_slug = create_location_slug($location_city); |
|
| 218 | + global $wpdb; |
|
| 219 | + |
|
| 220 | + if (!empty($location_info)) {
|
|
| 221 | + $location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all'; |
|
| 222 | + $location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all'; |
|
| 223 | + $location_country = ($location_info['country'] != '') ? geodir_get_normal_country($location_info['country']) : 'all'; |
|
| 224 | + $location_lat = ($location_info['geo_lat'] != '') ? $location_info['geo_lat'] : ''; |
|
| 225 | + $location_lng = ($location_info['geo_lng'] != '') ? $location_info['geo_lng'] : ''; |
|
| 226 | + $is_default = isset($location_info['is_default']) ? $location_info['is_default'] : ''; |
|
| 227 | + $country_slug = create_location_slug(__($location_country, 'geodirectory')); |
|
| 228 | + $region_slug = create_location_slug($location_region); |
|
| 229 | + $city_slug = create_location_slug($location_city); |
|
| 230 | 230 | |
| 231 | - /** |
|
| 232 | - * Filter add new location data. |
|
| 233 | - * |
|
| 234 | - * @since 1.0.0 |
|
| 235 | - */ |
|
| 236 | - $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,
|
|
| 237 | - 'country' => $location_country, |
|
| 238 | - 'region' => $location_region, |
|
| 239 | - 'city' => $location_city, |
|
| 240 | - 'country_slug' => $country_slug, |
|
| 241 | - 'region_slug' => $region_slug, |
|
| 242 | - 'city_slug' => $city_slug, |
|
| 243 | - 'city_latitude' => $location_lat, |
|
| 244 | - 'city_longitude' => $location_lng, |
|
| 245 | - 'is_default' => $is_default |
|
| 246 | - )); |
|
| 247 | - |
|
| 248 | - /* // Not allowed to create country in DB : 2016-12-09 |
|
| 231 | + /** |
|
| 232 | + * Filter add new location data. |
|
| 233 | + * |
|
| 234 | + * @since 1.0.0 |
|
| 235 | + */ |
|
| 236 | + $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,
|
|
| 237 | + 'country' => $location_country, |
|
| 238 | + 'region' => $location_region, |
|
| 239 | + 'city' => $location_city, |
|
| 240 | + 'country_slug' => $country_slug, |
|
| 241 | + 'region_slug' => $region_slug, |
|
| 242 | + 'city_slug' => $city_slug, |
|
| 243 | + 'city_latitude' => $location_lat, |
|
| 244 | + 'city_longitude' => $location_lng, |
|
| 245 | + 'is_default' => $is_default |
|
| 246 | + )); |
|
| 247 | + |
|
| 248 | + /* // Not allowed to create country in DB : 2016-12-09 |
|
| 249 | 249 | if ($geodir_location->country) {
|
| 250 | 250 | |
| 251 | 251 | $get_country = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s", array($geodir_location->country)));
|
@@ -259,14 +259,14 @@ discard block |
||
| 259 | 259 | } |
| 260 | 260 | */ |
| 261 | 261 | |
| 262 | - if ($geodir_location->is_default) |
|
| 263 | - update_option('geodir_default_location', $geodir_location);
|
|
| 262 | + if ($geodir_location->is_default) |
|
| 263 | + update_option('geodir_default_location', $geodir_location);
|
|
| 264 | 264 | |
| 265 | - return $geodir_location->location_id; |
|
| 265 | + return $geodir_location->location_id; |
|
| 266 | 266 | |
| 267 | - } else {
|
|
| 268 | - return false; |
|
| 269 | - } |
|
| 267 | + } else {
|
|
| 268 | + return false; |
|
| 269 | + } |
|
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 | /** |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | */ |
| 281 | 281 | function geodir_random_float($min = 0, $max = 1) |
| 282 | 282 | {
|
| 283 | - return $min + mt_rand() / mt_getrandmax() * ($max - $min); |
|
| 283 | + return $min + mt_rand() / mt_getrandmax() * ($max - $min); |
|
| 284 | 284 | } |
| 285 | 285 | |
| 286 | 286 | /** |
@@ -294,22 +294,22 @@ discard block |
||
| 294 | 294 | */ |
| 295 | 295 | function geodir_get_address_by_lat_lan($lat, $lng) |
| 296 | 296 | {
|
| 297 | - $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ; |
|
| 298 | - |
|
| 299 | - $ch = curl_init(); |
|
| 300 | - curl_setopt($ch, CURLOPT_URL, $url); |
|
| 301 | - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
|
| 302 | - curl_setopt($ch, CURLOPT_PROXYPORT, 3128); |
|
| 303 | - curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0); |
|
| 304 | - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); |
|
| 305 | - $response = curl_exec($ch); |
|
| 306 | - curl_close($ch); |
|
| 307 | - $data = json_decode($response); |
|
| 308 | - $status = $data->status; |
|
| 309 | - if ($status == "OK") {
|
|
| 310 | - return $data->results[0]->address_components; |
|
| 311 | - } else |
|
| 312 | - return false; |
|
| 297 | + $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ; |
|
| 298 | + |
|
| 299 | + $ch = curl_init(); |
|
| 300 | + curl_setopt($ch, CURLOPT_URL, $url); |
|
| 301 | + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
|
| 302 | + curl_setopt($ch, CURLOPT_PROXYPORT, 3128); |
|
| 303 | + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0); |
|
| 304 | + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); |
|
| 305 | + $response = curl_exec($ch); |
|
| 306 | + curl_close($ch); |
|
| 307 | + $data = json_decode($response); |
|
| 308 | + $status = $data->status; |
|
| 309 | + if ($status == "OK") {
|
|
| 310 | + return $data->results[0]->address_components; |
|
| 311 | + } else |
|
| 312 | + return false; |
|
| 313 | 313 | } |
| 314 | 314 | |
| 315 | 315 | /** |
@@ -326,70 +326,70 @@ discard block |
||
| 326 | 326 | */ |
| 327 | 327 | function geodir_get_current_location_terms($location_array_from = 'session', $gd_post_type = '') |
| 328 | 328 | {
|
| 329 | - global $wp, $gd_session; |
|
| 330 | - $location_array = array(); |
|
| 331 | - if ($location_array_from == 'session') {
|
|
| 332 | - if ($gd_session->get('gd_country') == 'me' || $gd_session->get('gd_region') == 'me' || $gd_session->get('gd_city') == 'me') {
|
|
| 333 | - return $location_array; |
|
| 334 | - } |
|
| 329 | + global $wp, $gd_session; |
|
| 330 | + $location_array = array(); |
|
| 331 | + if ($location_array_from == 'session') {
|
|
| 332 | + if ($gd_session->get('gd_country') == 'me' || $gd_session->get('gd_region') == 'me' || $gd_session->get('gd_city') == 'me') {
|
|
| 333 | + return $location_array; |
|
| 334 | + } |
|
| 335 | 335 | |
| 336 | - $country = $gd_session->get('gd_country');
|
|
| 337 | - if ($country != '' && $country) |
|
| 338 | - $location_array['gd_country'] = urldecode($country); |
|
| 336 | + $country = $gd_session->get('gd_country');
|
|
| 337 | + if ($country != '' && $country) |
|
| 338 | + $location_array['gd_country'] = urldecode($country); |
|
| 339 | 339 | |
| 340 | - $region = $gd_session->get('gd_region');
|
|
| 341 | - if ($region != '' && $region) |
|
| 342 | - $location_array['gd_region'] = urldecode($region); |
|
| 340 | + $region = $gd_session->get('gd_region');
|
|
| 341 | + if ($region != '' && $region) |
|
| 342 | + $location_array['gd_region'] = urldecode($region); |
|
| 343 | 343 | |
| 344 | - $city = $gd_session->get('gd_city');
|
|
| 345 | - if ($city != '' && $city) |
|
| 346 | - $location_array['gd_city'] = urldecode($city); |
|
| 347 | - } else {
|
|
| 348 | - if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {
|
|
| 349 | - return $location_array; |
|
| 350 | - } |
|
| 344 | + $city = $gd_session->get('gd_city');
|
|
| 345 | + if ($city != '' && $city) |
|
| 346 | + $location_array['gd_city'] = urldecode($city); |
|
| 347 | + } else {
|
|
| 348 | + if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {
|
|
| 349 | + return $location_array; |
|
| 350 | + } |
|
| 351 | 351 | |
| 352 | - $country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : ''; |
|
| 352 | + $country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : ''; |
|
| 353 | 353 | |
| 354 | - $region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : ''; |
|
| 354 | + $region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : ''; |
|
| 355 | 355 | |
| 356 | - $city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : ''; |
|
| 356 | + $city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : ''; |
|
| 357 | 357 | |
| 358 | - if ($country != '') |
|
| 359 | - $location_array['gd_country'] = urldecode($country); |
|
| 358 | + if ($country != '') |
|
| 359 | + $location_array['gd_country'] = urldecode($country); |
|
| 360 | 360 | |
| 361 | - if ($region != '') |
|
| 362 | - $location_array['gd_region'] = urldecode($region); |
|
| 361 | + if ($region != '') |
|
| 362 | + $location_array['gd_region'] = urldecode($region); |
|
| 363 | 363 | |
| 364 | - if ($city != '') |
|
| 365 | - $location_array['gd_city'] = urldecode($city); |
|
| 364 | + if ($city != '') |
|
| 365 | + $location_array['gd_city'] = urldecode($city); |
|
| 366 | 366 | |
| 367 | 367 | // Fix category link in ajax popular category widget on change post type |
| 368 | 368 | if (empty($location_array) && defined('DOING_AJAX') && DOING_AJAX) {
|
| 369 | 369 | $location_array = geodir_get_current_location_terms('session');
|
| 370 | 370 | } |
| 371 | - } |
|
| 371 | + } |
|
| 372 | 372 | |
| 373 | 373 | /** |
| 374 | 374 | * Filter the location terms. |
| 375 | 375 | * |
| 376 | 376 | * @since 1.4.6 |
| 377 | - * @package GeoDirectory |
|
| 377 | + * @package GeoDirectory |
|
| 378 | + * |
|
| 379 | + * @param array $location_array {
|
|
| 380 | + * Attributes of the location_array. |
|
| 381 | + * |
|
| 382 | + * @type string $gd_country The country slug. |
|
| 383 | + * @type string $gd_region The region slug. |
|
| 384 | + * @type string $gd_city The city slug. |
|
| 378 | 385 | * |
| 379 | - * @param array $location_array {
|
|
| 380 | - * Attributes of the location_array. |
|
| 381 | - * |
|
| 382 | - * @type string $gd_country The country slug. |
|
| 383 | - * @type string $gd_region The region slug. |
|
| 384 | - * @type string $gd_city The city slug. |
|
| 385 | - * |
|
| 386 | - * } |
|
| 386 | + * } |
|
| 387 | 387 | * @param string $location_array_from Source type of location terms. Default session. |
| 388 | 388 | * @param string $gd_post_type WP post type. |
| 389 | 389 | */ |
| 390 | 390 | $location_array = apply_filters( 'geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type ); |
| 391 | 391 | |
| 392 | - return $location_array; |
|
| 392 | + return $location_array; |
|
| 393 | 393 | |
| 394 | 394 | } |
| 395 | 395 | |
@@ -402,24 +402,24 @@ discard block |
||
| 402 | 402 | * @return bool|string |
| 403 | 403 | */ |
| 404 | 404 | function geodir_get_location_link($which_location = 'current') {
|
| 405 | - $location_link = get_permalink(geodir_location_page_id()); |
|
| 406 | - |
|
| 407 | - if ($which_location == 'base') {
|
|
| 408 | - return $location_link; |
|
| 409 | - } else {
|
|
| 410 | - $location_terms = geodir_get_current_location_terms(); |
|
| 411 | - |
|
| 412 | - if (!empty($location_terms)) {
|
|
| 413 | - if (get_option('permalink_structure') != '') {
|
|
| 414 | - $location_terms = implode("/", $location_terms);
|
|
| 415 | - $location_terms = rtrim($location_terms, '/'); |
|
| 416 | - $location_link .= $location_terms; |
|
| 417 | - } else {
|
|
| 418 | - $location_link = geodir_getlink($location_link, $location_terms); |
|
| 419 | - } |
|
| 420 | - } |
|
| 421 | - } |
|
| 422 | - return $location_link; |
|
| 405 | + $location_link = get_permalink(geodir_location_page_id()); |
|
| 406 | + |
|
| 407 | + if ($which_location == 'base') {
|
|
| 408 | + return $location_link; |
|
| 409 | + } else {
|
|
| 410 | + $location_terms = geodir_get_current_location_terms(); |
|
| 411 | + |
|
| 412 | + if (!empty($location_terms)) {
|
|
| 413 | + if (get_option('permalink_structure') != '') {
|
|
| 414 | + $location_terms = implode("/", $location_terms);
|
|
| 415 | + $location_terms = rtrim($location_terms, '/'); |
|
| 416 | + $location_link .= $location_terms; |
|
| 417 | + } else {
|
|
| 418 | + $location_link = geodir_getlink($location_link, $location_terms); |
|
| 419 | + } |
|
| 420 | + } |
|
| 421 | + } |
|
| 422 | + return $location_link; |
|
| 423 | 423 | } |
| 424 | 424 | |
| 425 | 425 | /** |
@@ -432,34 +432,34 @@ discard block |
||
| 432 | 432 | * @return array|bool Returns address on success. |
| 433 | 433 | */ |
| 434 | 434 | function geodir_get_osm_address_by_lat_lan($lat, $lng) {
|
| 435 | - $url = is_ssl() ? 'https:' : 'http:'; |
|
| 436 | - $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');
|
|
| 437 | - |
|
| 438 | - $ch = curl_init(); |
|
| 439 | - curl_setopt($ch, CURLOPT_URL, $url); |
|
| 440 | - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
|
| 441 | - curl_setopt($ch, CURLOPT_PROXYPORT, 3128); |
|
| 442 | - curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0); |
|
| 443 | - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); |
|
| 444 | - $response = curl_exec($ch); |
|
| 445 | - curl_close($ch); |
|
| 446 | - $data = json_decode($response); |
|
| 435 | + $url = is_ssl() ? 'https:' : 'http:'; |
|
| 436 | + $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');
|
|
| 437 | + |
|
| 438 | + $ch = curl_init(); |
|
| 439 | + curl_setopt($ch, CURLOPT_URL, $url); |
|
| 440 | + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
|
| 441 | + curl_setopt($ch, CURLOPT_PROXYPORT, 3128); |
|
| 442 | + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0); |
|
| 443 | + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); |
|
| 444 | + $response = curl_exec($ch); |
|
| 445 | + curl_close($ch); |
|
| 446 | + $data = json_decode($response); |
|
| 447 | 447 | |
| 448 | - if (!empty($data) && !empty($data->address)) {
|
|
| 449 | - $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');
|
|
| 450 | - $formatted_address = (array)$data->address; |
|
| 448 | + if (!empty($data) && !empty($data->address)) {
|
|
| 449 | + $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');
|
|
| 450 | + $formatted_address = (array)$data->address; |
|
| 451 | 451 | |
| 452 | - foreach ( $data->address as $key => $value ) {
|
|
| 453 | - if (!in_array($key, $address_fields)) {
|
|
| 454 | - unset($formatted_address[$key]); |
|
| 455 | - } |
|
| 456 | - } |
|
| 457 | - $data->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : '';
|
|
| 452 | + foreach ( $data->address as $key => $value ) {
|
|
| 453 | + if (!in_array($key, $address_fields)) {
|
|
| 454 | + unset($formatted_address[$key]); |
|
| 455 | + } |
|
| 456 | + } |
|
| 457 | + $data->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : '';
|
|
| 458 | 458 | |
| 459 | - return $data; |
|
| 460 | - } else {
|
|
| 461 | - return false; |
|
| 462 | - } |
|
| 459 | + return $data; |
|
| 460 | + } else {
|
|
| 461 | + return false; |
|
| 462 | + } |
|
| 463 | 463 | } |
| 464 | 464 | |
| 465 | 465 | /** |
@@ -471,47 +471,47 @@ discard block |
||
| 471 | 471 | * @return string Returns the country. |
| 472 | 472 | */ |
| 473 | 473 | function geodir_get_normal_country($country) {
|
| 474 | - global $wpdb; |
|
| 475 | - if ($result = geodir_get_country_by_name($country)) {
|
|
| 476 | - return $result; |
|
| 477 | - } |
|
| 474 | + global $wpdb; |
|
| 475 | + if ($result = geodir_get_country_by_name($country)) {
|
|
| 476 | + return $result; |
|
| 477 | + } |
|
| 478 | 478 | |
| 479 | - if (defined('POST_LOCATION_TABLE')) {
|
|
| 480 | - $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));
|
|
| 481 | - if (!empty($rows)) {
|
|
| 482 | - foreach ($rows as $row) {
|
|
| 483 | - $translated = __($row->country, 'geodirectory'); |
|
| 484 | - if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {
|
|
| 485 | - return $result; |
|
| 486 | - } |
|
| 487 | - } |
|
| 488 | - } |
|
| 479 | + if (defined('POST_LOCATION_TABLE')) {
|
|
| 480 | + $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));
|
|
| 481 | + if (!empty($rows)) {
|
|
| 482 | + foreach ($rows as $row) {
|
|
| 483 | + $translated = __($row->country, 'geodirectory'); |
|
| 484 | + if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {
|
|
| 485 | + return $result; |
|
| 486 | + } |
|
| 487 | + } |
|
| 488 | + } |
|
| 489 | 489 | |
| 490 | - $rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) ); |
|
| 491 | - if (!empty($rows)) {
|
|
| 492 | - foreach ($rows as $row) {
|
|
| 493 | - $translated = __($row->country, 'geodirectory'); |
|
| 494 | - if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {
|
|
| 495 | - return $result; |
|
| 496 | - } |
|
| 497 | - } |
|
| 498 | - } |
|
| 499 | - } |
|
| 490 | + $rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) ); |
|
| 491 | + if (!empty($rows)) {
|
|
| 492 | + foreach ($rows as $row) {
|
|
| 493 | + $translated = __($row->country, 'geodirectory'); |
|
| 494 | + if (geodir_strtolower($translated) == geodir_strtolower($country) && $result = geodir_get_country_by_name($row->country)) {
|
|
| 495 | + return $result; |
|
| 496 | + } |
|
| 497 | + } |
|
| 498 | + } |
|
| 499 | + } |
|
| 500 | 500 | |
| 501 | - $default_location = geodir_get_default_location(); |
|
| 502 | - if (!empty($default_location->country) && $result = geodir_get_country_by_name($default_location->country)) {
|
|
| 503 | - return $result; |
|
| 504 | - } |
|
| 501 | + $default_location = geodir_get_default_location(); |
|
| 502 | + if (!empty($default_location->country) && $result = geodir_get_country_by_name($default_location->country)) {
|
|
| 503 | + return $result; |
|
| 504 | + } |
|
| 505 | 505 | |
| 506 | - if (!empty($default_location->country_slug) && $result = geodir_get_country_by_name($default_location->country_slug)) {
|
|
| 507 | - return $result; |
|
| 508 | - } |
|
| 506 | + if (!empty($default_location->country_slug) && $result = geodir_get_country_by_name($default_location->country_slug)) {
|
|
| 507 | + return $result; |
|
| 508 | + } |
|
| 509 | 509 | |
| 510 | - if (!empty($default_location->country_ISO2) && $result = geodir_get_country_by_name($default_location->country_ISO2, true)) {
|
|
| 511 | - return $result; |
|
| 512 | - } |
|
| 510 | + if (!empty($default_location->country_ISO2) && $result = geodir_get_country_by_name($default_location->country_ISO2, true)) {
|
|
| 511 | + return $result; |
|
| 512 | + } |
|
| 513 | 513 | |
| 514 | - return $country; |
|
| 514 | + return $country; |
|
| 515 | 515 | } |
| 516 | 516 | |
| 517 | 517 | /** |
@@ -523,16 +523,16 @@ discard block |
||
| 523 | 523 | * @return string Country ISO2 code. |
| 524 | 524 | */ |
| 525 | 525 | function geodir_get_country_iso2($country) {
|
| 526 | - global $wpdb; |
|
| 526 | + global $wpdb; |
|
| 527 | 527 | |
| 528 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {
|
|
| 529 | - return $result; |
|
| 530 | - } |
|
| 531 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {
|
|
| 532 | - return $result; |
|
| 533 | - } |
|
| 528 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {
|
|
| 529 | + return $result; |
|
| 530 | + } |
|
| 531 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {
|
|
| 532 | + return $result; |
|
| 533 | + } |
|
| 534 | 534 | |
| 535 | - return $country; |
|
| 535 | + return $country; |
|
| 536 | 536 | } |
| 537 | 537 | |
| 538 | 538 | /** |
@@ -545,16 +545,16 @@ discard block |
||
| 545 | 545 | * @return string|null Country ISO2 code. |
| 546 | 546 | */ |
| 547 | 547 | function geodir_get_country_by_name($country, $iso2 = false) {
|
| 548 | - global $wpdb; |
|
| 548 | + global $wpdb; |
|
| 549 | 549 | |
| 550 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {
|
|
| 551 | - return $result; |
|
| 552 | - } |
|
| 553 | - if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {
|
|
| 554 | - return $result; |
|
| 555 | - } |
|
| 550 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {
|
|
| 551 | + return $result; |
|
| 552 | + } |
|
| 553 | + if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {
|
|
| 554 | + return $result; |
|
| 555 | + } |
|
| 556 | 556 | |
| 557 | - return NULL; |
|
| 557 | + return NULL; |
|
| 558 | 558 | } |
| 559 | 559 | |
| 560 | 560 | |
@@ -574,130 +574,130 @@ discard block |
||
| 574 | 574 | */ |
| 575 | 575 | function geodir_replace_location_variables($content, $location_array = array(), $sep = NULL, $gd_page = '') {
|
| 576 | 576 | |
| 577 | - if (empty($content)) {
|
|
| 578 | - return $content; |
|
| 579 | - } |
|
| 577 | + if (empty($content)) {
|
|
| 578 | + return $content; |
|
| 579 | + } |
|
| 580 | 580 | |
| 581 | 581 | |
| 582 | - $location_replace_vars = geodir_location_replace_vars($location_array, $sep, $gd_page); |
|
| 582 | + $location_replace_vars = geodir_location_replace_vars($location_array, $sep, $gd_page); |
|
| 583 | 583 | |
| 584 | - if (!empty($location_replace_vars)) {
|
|
| 585 | - foreach ($location_replace_vars as $search => $replace) {
|
|
| 586 | - if (!empty($search) && strpos($content, $search) !== false) {
|
|
| 587 | - $content = str_replace($search, $replace, $content); |
|
| 588 | - } |
|
| 589 | - } |
|
| 590 | - } |
|
| 584 | + if (!empty($location_replace_vars)) {
|
|
| 585 | + foreach ($location_replace_vars as $search => $replace) {
|
|
| 586 | + if (!empty($search) && strpos($content, $search) !== false) {
|
|
| 587 | + $content = str_replace($search, $replace, $content); |
|
| 588 | + } |
|
| 589 | + } |
|
| 590 | + } |
|
| 591 | 591 | |
| 592 | - return $content; |
|
| 592 | + return $content; |
|
| 593 | 593 | } |
| 594 | 594 | add_filter('geodir_replace_location_variables', 'geodir_replace_location_variables');
|
| 595 | 595 | |
| 596 | 596 | |
| 597 | 597 | function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = ''){
|
| 598 | 598 | |
| 599 | - global $wp; |
|
| 599 | + global $wp; |
|
| 600 | 600 | |
| 601 | - $location_manager = defined('GEODIRLOCATION_VERSION') ? true : false;
|
|
| 602 | - |
|
| 603 | - if (empty($location_array)) {
|
|
| 604 | - $location_array = geodir_get_current_location_terms('query_vars');
|
|
| 605 | - } |
|
| 606 | - |
|
| 607 | - $location_terms = array(); |
|
| 608 | - $location_terms['gd_neighbourhood'] = !empty($wp->query_vars['gd_neighbourhood']) ? $wp->query_vars['gd_neighbourhood'] : ''; |
|
| 609 | - $location_terms['gd_city'] = !empty($wp->query_vars['gd_city']) ? $wp->query_vars['gd_city'] : ''; |
|
| 610 | - $location_terms['gd_region'] = !empty($wp->query_vars['gd_region']) ? $wp->query_vars['gd_region'] : ''; |
|
| 611 | - $location_terms['gd_country'] = !empty($wp->query_vars['gd_country']) ? $wp->query_vars['gd_country'] : ''; |
|
| 612 | - |
|
| 613 | - $location_names = array(); |
|
| 614 | - foreach ($location_terms as $type => $location) {
|
|
| 615 | - $location_name = $location; |
|
| 616 | - |
|
| 617 | - if (!empty($location_name)) {
|
|
| 618 | - if ($location_manager) {
|
|
| 619 | - $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
|
| 620 | - $location_name = get_actual_location_name($location_type, $location, true); |
|
| 621 | - } else {
|
|
| 622 | - $location_name = preg_replace( '/-(\d+)$/', '', $location_name); |
|
| 623 | - $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
| 624 | - $location_name = __(geodir_ucwords($location_name), 'geodirectory'); |
|
| 625 | - } |
|
| 626 | - } |
|
| 601 | + $location_manager = defined('GEODIRLOCATION_VERSION') ? true : false;
|
|
| 602 | + |
|
| 603 | + if (empty($location_array)) {
|
|
| 604 | + $location_array = geodir_get_current_location_terms('query_vars');
|
|
| 605 | + } |
|
| 606 | + |
|
| 607 | + $location_terms = array(); |
|
| 608 | + $location_terms['gd_neighbourhood'] = !empty($wp->query_vars['gd_neighbourhood']) ? $wp->query_vars['gd_neighbourhood'] : ''; |
|
| 609 | + $location_terms['gd_city'] = !empty($wp->query_vars['gd_city']) ? $wp->query_vars['gd_city'] : ''; |
|
| 610 | + $location_terms['gd_region'] = !empty($wp->query_vars['gd_region']) ? $wp->query_vars['gd_region'] : ''; |
|
| 611 | + $location_terms['gd_country'] = !empty($wp->query_vars['gd_country']) ? $wp->query_vars['gd_country'] : ''; |
|
| 612 | + |
|
| 613 | + $location_names = array(); |
|
| 614 | + foreach ($location_terms as $type => $location) {
|
|
| 615 | + $location_name = $location; |
|
| 616 | + |
|
| 617 | + if (!empty($location_name)) {
|
|
| 618 | + if ($location_manager) {
|
|
| 619 | + $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
|
| 620 | + $location_name = get_actual_location_name($location_type, $location, true); |
|
| 621 | + } else {
|
|
| 622 | + $location_name = preg_replace( '/-(\d+)$/', '', $location_name); |
|
| 623 | + $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
| 624 | + $location_name = __(geodir_ucwords($location_name), 'geodirectory'); |
|
| 625 | + } |
|
| 626 | + } |
|
| 627 | 627 | |
| 628 | - $location_names[$type] = $location_name; |
|
| 629 | - } |
|
| 630 | - |
|
| 631 | - $location_single = ''; |
|
| 632 | - foreach ($location_terms as $type => $location) {
|
|
| 633 | - if (!empty($location)) {
|
|
| 634 | - if (!empty($location_names[$type])) {
|
|
| 635 | - $location_single = $location_names[$type]; |
|
| 636 | - } else {
|
|
| 637 | - if ($location_manager) {
|
|
| 638 | - $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
|
| 639 | - $location_single = get_actual_location_name($location_type, $location, true); |
|
| 640 | - } else {
|
|
| 641 | - $location_name = preg_replace( '/-(\d+)$/', '', $location); |
|
| 642 | - $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
| 643 | - $location_single = __(geodir_ucwords($location_name), 'geodirectory'); |
|
| 644 | - } |
|
| 645 | - } |
|
| 646 | - break; |
|
| 647 | - } |
|
| 648 | - } |
|
| 649 | - |
|
| 650 | - $full_location = array(); |
|
| 651 | - if (!empty($location_array)) {
|
|
| 652 | - $location_array = array_reverse($location_array); |
|
| 653 | - |
|
| 654 | - foreach ($location_array as $type => $location) {
|
|
| 655 | - if (!empty($location_names[$type])) {
|
|
| 656 | - $location_name = $location_names[$type]; |
|
| 657 | - } else {
|
|
| 658 | - if ($location_manager) {
|
|
| 659 | - $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
|
| 660 | - $location_name = get_actual_location_name($location_type, $location, true); |
|
| 661 | - } else {
|
|
| 662 | - $location_name = preg_replace( '/-(\d+)$/', '', $location); |
|
| 663 | - $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
| 664 | - $location_name = __(geodir_ucwords($location_name), 'geodirectory'); |
|
| 665 | - } |
|
| 666 | - } |
|
| 628 | + $location_names[$type] = $location_name; |
|
| 629 | + } |
|
| 630 | + |
|
| 631 | + $location_single = ''; |
|
| 632 | + foreach ($location_terms as $type => $location) {
|
|
| 633 | + if (!empty($location)) {
|
|
| 634 | + if (!empty($location_names[$type])) {
|
|
| 635 | + $location_single = $location_names[$type]; |
|
| 636 | + } else {
|
|
| 637 | + if ($location_manager) {
|
|
| 638 | + $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
|
| 639 | + $location_single = get_actual_location_name($location_type, $location, true); |
|
| 640 | + } else {
|
|
| 641 | + $location_name = preg_replace( '/-(\d+)$/', '', $location); |
|
| 642 | + $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
| 643 | + $location_single = __(geodir_ucwords($location_name), 'geodirectory'); |
|
| 644 | + } |
|
| 645 | + } |
|
| 646 | + break; |
|
| 647 | + } |
|
| 648 | + } |
|
| 649 | + |
|
| 650 | + $full_location = array(); |
|
| 651 | + if (!empty($location_array)) {
|
|
| 652 | + $location_array = array_reverse($location_array); |
|
| 653 | + |
|
| 654 | + foreach ($location_array as $type => $location) {
|
|
| 655 | + if (!empty($location_names[$type])) {
|
|
| 656 | + $location_name = $location_names[$type]; |
|
| 657 | + } else {
|
|
| 658 | + if ($location_manager) {
|
|
| 659 | + $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
|
| 660 | + $location_name = get_actual_location_name($location_type, $location, true); |
|
| 661 | + } else {
|
|
| 662 | + $location_name = preg_replace( '/-(\d+)$/', '', $location); |
|
| 663 | + $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
| 664 | + $location_name = __(geodir_ucwords($location_name), 'geodirectory'); |
|
| 665 | + } |
|
| 666 | + } |
|
| 667 | + |
|
| 668 | + $full_location[] = $location_name; |
|
| 669 | + } |
|
| 667 | 670 | |
| 668 | - $full_location[] = $location_name; |
|
| 669 | - } |
|
| 671 | + if (!empty($full_location)) {
|
|
| 672 | + $full_location = array_unique($full_location); |
|
| 673 | + } |
|
| 674 | + } |
|
| 675 | + $full_location = !empty($full_location) ? implode(', ', $full_location): '';
|
|
| 670 | 676 | |
| 671 | - if (!empty($full_location)) {
|
|
| 672 | - $full_location = array_unique($full_location); |
|
| 673 | - } |
|
| 674 | - } |
|
| 675 | - $full_location = !empty($full_location) ? implode(', ', $full_location): '';
|
|
| 676 | - |
|
| 677 | - $location_replace_vars = array(); |
|
| 678 | - $location_replace_vars['%%location_sep%%'] = $sep !== NULL ? $sep : '|'; |
|
| 679 | - $location_replace_vars['%%location%%'] = $full_location; |
|
| 680 | - $location_replace_vars['%%in_location%%'] = $full_location != '' ? __( 'in', 'geodirectory' ) . ' ' . $full_location : ''; |
|
| 681 | - $location_replace_vars['%%location_single%%'] = $location_single; |
|
| 682 | - $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? __( 'in', 'geodirectory' ) . ' ' . $location_single : ''; |
|
| 683 | - |
|
| 684 | - foreach ($location_names as $type => $name) {
|
|
| 685 | - $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
|
| 686 | - |
|
| 687 | - $location_replace_vars['%%location_' . $location_type . '%%'] = $name; |
|
| 688 | - $location_replace_vars['%%in_location_' . $location_type . '%%'] = !empty($name) ? __( 'in', 'geodirectory' ) . ' ' . $name : ''; |
|
| 689 | - } |
|
| 690 | - |
|
| 691 | - /** |
|
| 692 | - * Filter the location terms variables to search & replace. |
|
| 693 | - * |
|
| 694 | - * @since 1.6.16 |
|
| 695 | - * @package GeoDirectory |
|
| 696 | - * |
|
| 697 | - * @param array $location_replace_vars The array of search & replace variables. |
|
| 698 | - * @param array $location_array The array of location variables. |
|
| 699 | - * @param string $gd_page The page being filtered. |
|
| 700 | - * @param string $sep The separator. |
|
| 701 | - */ |
|
| 702 | - return apply_filters( 'geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep ); |
|
| 677 | + $location_replace_vars = array(); |
|
| 678 | + $location_replace_vars['%%location_sep%%'] = $sep !== NULL ? $sep : '|'; |
|
| 679 | + $location_replace_vars['%%location%%'] = $full_location; |
|
| 680 | + $location_replace_vars['%%in_location%%'] = $full_location != '' ? __( 'in', 'geodirectory' ) . ' ' . $full_location : ''; |
|
| 681 | + $location_replace_vars['%%location_single%%'] = $location_single; |
|
| 682 | + $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? __( 'in', 'geodirectory' ) . ' ' . $location_single : ''; |
|
| 683 | + |
|
| 684 | + foreach ($location_names as $type => $name) {
|
|
| 685 | + $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
|
| 686 | + |
|
| 687 | + $location_replace_vars['%%location_' . $location_type . '%%'] = $name; |
|
| 688 | + $location_replace_vars['%%in_location_' . $location_type . '%%'] = !empty($name) ? __( 'in', 'geodirectory' ) . ' ' . $name : ''; |
|
| 689 | + } |
|
| 690 | + |
|
| 691 | + /** |
|
| 692 | + * Filter the location terms variables to search & replace. |
|
| 693 | + * |
|
| 694 | + * @since 1.6.16 |
|
| 695 | + * @package GeoDirectory |
|
| 696 | + * |
|
| 697 | + * @param array $location_replace_vars The array of search & replace variables. |
|
| 698 | + * @param array $location_array The array of location variables. |
|
| 699 | + * @param string $gd_page The page being filtered. |
|
| 700 | + * @param string $sep The separator. |
|
| 701 | + */ |
|
| 702 | + return apply_filters( 'geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep ); |
|
| 703 | 703 | } |
| 704 | 704 | \ No newline at end of file |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | {
|
| 125 | 125 | global $wpdb; |
| 126 | 126 | |
| 127 | - $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");
|
|
| 127 | + $rows = $wpdb->get_results("SELECT Country,ISO2 FROM ".GEODIR_COUNTRIES_TABLE." ORDER BY Country ASC");
|
|
| 128 | 128 | |
| 129 | 129 | $ISO2 = array(); |
| 130 | 130 | $countries = array(); |
@@ -136,11 +136,11 @@ discard block |
||
| 136 | 136 | |
| 137 | 137 | asort($countries); |
| 138 | 138 | |
| 139 | - $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';
|
|
| 139 | + $out_put = '<option '.selected('', $post_country, false).' value="">'.__('Select Country', 'geodirectory').'</option>';
|
|
| 140 | 140 | foreach ($countries as $country => $name) {
|
| 141 | 141 | $ccode = $ISO2[$country]; |
| 142 | 142 | |
| 143 | - $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>'; |
|
| 143 | + $out_put .= '<option '.selected($post_country, $country, false).' value="'.esc_attr($country).'" data-country_code="'.$ccode.'">'.$name.'</option>'; |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | echo $out_put; |
@@ -182,10 +182,10 @@ discard block |
||
| 182 | 182 | if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {
|
| 183 | 183 | |
| 184 | 184 | foreach ($posttype as $posttypeobj) {
|
| 185 | - $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location |
|
| 185 | + $post_locations = '['.$default_location->city_slug.'],['.$default_location->region_slug.'],['.$default_location->country_slug.']'; // set all overall post location |
|
| 186 | 186 | |
| 187 | 187 | $sql = $wpdb->prepare( |
| 188 | - "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)", |
|
| 188 | + "UPDATE ".$plugin_prefix.$posttypeobj."_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)", |
|
| 189 | 189 | array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations) |
| 190 | 190 | ); |
| 191 | 191 | $wpdb->query($sql); |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | * |
| 234 | 234 | * @since 1.0.0 |
| 235 | 235 | */ |
| 236 | - $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,
|
|
| 236 | + $geodir_location = (object) apply_filters('geodir_add_new_location', array('location_id' => 0,
|
|
| 237 | 237 | 'country' => $location_country, |
| 238 | 238 | 'region' => $location_region, |
| 239 | 239 | 'city' => $location_city, |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | */ |
| 295 | 295 | function geodir_get_address_by_lat_lan($lat, $lng) |
| 296 | 296 | {
|
| 297 | - $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ; |
|
| 297 | + $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng='.trim($lat).','.trim($lng); |
|
| 298 | 298 | |
| 299 | 299 | $ch = curl_init(); |
| 300 | 300 | curl_setopt($ch, CURLOPT_URL, $url); |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | * @param string $location_array_from Source type of location terms. Default session. |
| 388 | 388 | * @param string $gd_post_type WP post type. |
| 389 | 389 | */ |
| 390 | - $location_array = apply_filters( 'geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type ); |
|
| 390 | + $location_array = apply_filters('geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type);
|
|
| 391 | 391 | |
| 392 | 392 | return $location_array; |
| 393 | 393 | |
@@ -433,7 +433,7 @@ discard block |
||
| 433 | 433 | */ |
| 434 | 434 | function geodir_get_osm_address_by_lat_lan($lat, $lng) {
|
| 435 | 435 | $url = is_ssl() ? 'https:' : 'http:'; |
| 436 | - $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');
|
|
| 436 | + $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat='.trim($lat).'&lon='.trim($lng).'&zoom=16&addressdetails=1&email='.get_option('admin_email');
|
|
| 437 | 437 | |
| 438 | 438 | $ch = curl_init(); |
| 439 | 439 | curl_setopt($ch, CURLOPT_URL, $url); |
@@ -447,9 +447,9 @@ discard block |
||
| 447 | 447 | |
| 448 | 448 | if (!empty($data) && !empty($data->address)) {
|
| 449 | 449 | $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');
|
| 450 | - $formatted_address = (array)$data->address; |
|
| 450 | + $formatted_address = (array) $data->address; |
|
| 451 | 451 | |
| 452 | - foreach ( $data->address as $key => $value ) {
|
|
| 452 | + foreach ($data->address as $key => $value) {
|
|
| 453 | 453 | if (!in_array($key, $address_fields)) {
|
| 454 | 454 | unset($formatted_address[$key]); |
| 455 | 455 | } |
@@ -477,7 +477,7 @@ discard block |
||
| 477 | 477 | } |
| 478 | 478 | |
| 479 | 479 | if (defined('POST_LOCATION_TABLE')) {
|
| 480 | - $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));
|
|
| 480 | + $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM ".POST_LOCATION_TABLE." WHERE country NOT LIKE %s ORDER BY location_id ASC", $country));
|
|
| 481 | 481 | if (!empty($rows)) {
|
| 482 | 482 | foreach ($rows as $row) {
|
| 483 | 483 | $translated = __($row->country, 'geodirectory'); |
@@ -487,7 +487,7 @@ discard block |
||
| 487 | 487 | } |
| 488 | 488 | } |
| 489 | 489 | |
| 490 | - $rows = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT country FROM " . POST_LOCATION_TABLE . " WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country ) ); |
|
| 490 | + $rows = $wpdb->get_results($wpdb->prepare("SELECT DISTINCT country FROM ".POST_LOCATION_TABLE." WHERE country_slug LIKE %s AND country NOT LIKE %s ORDER BY location_id", $country, $country));
|
|
| 491 | 491 | if (!empty($rows)) {
|
| 492 | 492 | foreach ($rows as $row) {
|
| 493 | 493 | $translated = __($row->country, 'geodirectory'); |
@@ -525,10 +525,10 @@ discard block |
||
| 525 | 525 | function geodir_get_country_iso2($country) {
|
| 526 | 526 | global $wpdb; |
| 527 | 527 | |
| 528 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {
|
|
| 528 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", $country))) {
|
|
| 529 | 529 | return $result; |
| 530 | 530 | } |
| 531 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", geodir_get_normal_country($country)))) {
|
|
| 531 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT ISO2 FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", geodir_get_normal_country($country)))) {
|
|
| 532 | 532 | return $result; |
| 533 | 533 | } |
| 534 | 534 | |
@@ -547,10 +547,10 @@ discard block |
||
| 547 | 547 | function geodir_get_country_by_name($country, $iso2 = false) {
|
| 548 | 548 | global $wpdb; |
| 549 | 549 | |
| 550 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country LIKE %s", $country))) {
|
|
| 550 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country LIKE %s", $country))) {
|
|
| 551 | 551 | return $result; |
| 552 | 552 | } |
| 553 | - if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE ISO2 LIKE %s", $country))) {
|
|
| 553 | + if ($iso2 && $result = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE ISO2 LIKE %s", $country))) {
|
|
| 554 | 554 | return $result; |
| 555 | 555 | } |
| 556 | 556 | |
@@ -594,7 +594,7 @@ discard block |
||
| 594 | 594 | add_filter('geodir_replace_location_variables', 'geodir_replace_location_variables');
|
| 595 | 595 | |
| 596 | 596 | |
| 597 | -function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = ''){
|
|
| 597 | +function geodir_location_replace_vars($location_array = array(), $sep = NULL, $gd_page = '') {
|
|
| 598 | 598 | |
| 599 | 599 | global $wp; |
| 600 | 600 | |
@@ -619,8 +619,8 @@ discard block |
||
| 619 | 619 | $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
| 620 | 620 | $location_name = get_actual_location_name($location_type, $location, true); |
| 621 | 621 | } else {
|
| 622 | - $location_name = preg_replace( '/-(\d+)$/', '', $location_name); |
|
| 623 | - $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
| 622 | + $location_name = preg_replace('/-(\d+)$/', '', $location_name);
|
|
| 623 | + $location_name = preg_replace('/[_-]/', ' ', $location_name);
|
|
| 624 | 624 | $location_name = __(geodir_ucwords($location_name), 'geodirectory'); |
| 625 | 625 | } |
| 626 | 626 | } |
@@ -638,8 +638,8 @@ discard block |
||
| 638 | 638 | $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
| 639 | 639 | $location_single = get_actual_location_name($location_type, $location, true); |
| 640 | 640 | } else {
|
| 641 | - $location_name = preg_replace( '/-(\d+)$/', '', $location); |
|
| 642 | - $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
| 641 | + $location_name = preg_replace('/-(\d+)$/', '', $location);
|
|
| 642 | + $location_name = preg_replace('/[_-]/', ' ', $location_name);
|
|
| 643 | 643 | $location_single = __(geodir_ucwords($location_name), 'geodirectory'); |
| 644 | 644 | } |
| 645 | 645 | } |
@@ -659,8 +659,8 @@ discard block |
||
| 659 | 659 | $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
| 660 | 660 | $location_name = get_actual_location_name($location_type, $location, true); |
| 661 | 661 | } else {
|
| 662 | - $location_name = preg_replace( '/-(\d+)$/', '', $location); |
|
| 663 | - $location_name = preg_replace( '/[_-]/', ' ', $location_name ); |
|
| 662 | + $location_name = preg_replace('/-(\d+)$/', '', $location);
|
|
| 663 | + $location_name = preg_replace('/[_-]/', ' ', $location_name);
|
|
| 664 | 664 | $location_name = __(geodir_ucwords($location_name), 'geodirectory'); |
| 665 | 665 | } |
| 666 | 666 | } |
@@ -672,20 +672,20 @@ discard block |
||
| 672 | 672 | $full_location = array_unique($full_location); |
| 673 | 673 | } |
| 674 | 674 | } |
| 675 | - $full_location = !empty($full_location) ? implode(', ', $full_location): '';
|
|
| 675 | + $full_location = !empty($full_location) ? implode(', ', $full_location) : '';
|
|
| 676 | 676 | |
| 677 | 677 | $location_replace_vars = array(); |
| 678 | 678 | $location_replace_vars['%%location_sep%%'] = $sep !== NULL ? $sep : '|'; |
| 679 | 679 | $location_replace_vars['%%location%%'] = $full_location; |
| 680 | - $location_replace_vars['%%in_location%%'] = $full_location != '' ? __( 'in', 'geodirectory' ) . ' ' . $full_location : ''; |
|
| 680 | + $location_replace_vars['%%in_location%%'] = $full_location != '' ? __('in', 'geodirectory').' '.$full_location : '';
|
|
| 681 | 681 | $location_replace_vars['%%location_single%%'] = $location_single; |
| 682 | - $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? __( 'in', 'geodirectory' ) . ' ' . $location_single : ''; |
|
| 682 | + $location_replace_vars['%%in_location_single%%'] = $location_single != '' ? __('in', 'geodirectory').' '.$location_single : '';
|
|
| 683 | 683 | |
| 684 | 684 | foreach ($location_names as $type => $name) {
|
| 685 | 685 | $location_type = strpos($type, 'gd_') === 0 ? substr($type, 3) : $type; |
| 686 | 686 | |
| 687 | - $location_replace_vars['%%location_' . $location_type . '%%'] = $name; |
|
| 688 | - $location_replace_vars['%%in_location_' . $location_type . '%%'] = !empty($name) ? __( 'in', 'geodirectory' ) . ' ' . $name : ''; |
|
| 687 | + $location_replace_vars['%%location_'.$location_type.'%%'] = $name; |
|
| 688 | + $location_replace_vars['%%in_location_'.$location_type.'%%'] = !empty($name) ? __('in', 'geodirectory').' '.$name : '';
|
|
| 689 | 689 | } |
| 690 | 690 | |
| 691 | 691 | /** |
@@ -699,5 +699,5 @@ discard block |
||
| 699 | 699 | * @param string $gd_page The page being filtered. |
| 700 | 700 | * @param string $sep The separator. |
| 701 | 701 | */ |
| 702 | - return apply_filters( 'geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep ); |
|
| 702 | + return apply_filters('geodir_filter_location_replace_variables', $location_replace_vars, $location_array, $gd_page, $sep);
|
|
| 703 | 703 | } |
| 704 | 704 | \ 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,95 +743,95 @@ 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_data = $post_author_id ? get_userdata( $post_author_id ) : NULL; |
|
| 822 | - $post_author_name = geodir_get_client_name( $post_author_id ); |
|
| 823 | - $post_author_email = !empty( $post_author_data->user_email ) ? $post_author_data->user_email : ''; |
|
| 824 | - $current_date = date_i18n( 'Y-m-d H:i:s', current_time( 'timestamp' ) ); |
|
| 825 | - |
|
| 826 | - if ( $fromEmail == '' ) {
|
|
| 827 | - $fromEmail = get_option( 'site_email' ); |
|
| 820 | + $post_author_id = !empty($post_info) ? $post_info->post_author : 0; |
|
| 821 | + $post_author_data = $post_author_id ? get_userdata($post_author_id) : NULL; |
|
| 822 | + $post_author_name = geodir_get_client_name($post_author_id); |
|
| 823 | + $post_author_email = !empty($post_author_data->user_email) ? $post_author_data->user_email : ''; |
|
| 824 | + $current_date = date_i18n('Y-m-d H:i:s', current_time('timestamp'));
|
|
| 825 | + |
|
| 826 | + if ($fromEmail == '') {
|
|
| 827 | + $fromEmail = get_option('site_email');
|
|
| 828 | 828 | } |
| 829 | 829 | |
| 830 | - if ( $fromEmailName == '' ) {
|
|
| 831 | - $fromEmailName = get_option( 'site_email_name' ); |
|
| 830 | + if ($fromEmailName == '') {
|
|
| 831 | + $fromEmailName = get_option('site_email_name');
|
|
| 832 | 832 | } |
| 833 | 833 | |
| 834 | - $search_array = array( |
|
| 834 | + $search_array = array( |
|
| 835 | 835 | '[#listing_link#]', |
| 836 | 836 | '[#site_name_url#]', |
| 837 | 837 | '[#post_id#]', |
@@ -873,7 +873,7 @@ discard block |
||
| 873 | 873 | $post_author_email, |
| 874 | 874 | $current_date, |
| 875 | 875 | ); |
| 876 | - $message = str_replace( $search_array, $replace_array, $message ); |
|
| 876 | + $message = str_replace($search_array, $replace_array, $message); |
|
| 877 | 877 | |
| 878 | 878 | $search_array = array( |
| 879 | 879 | '[#listing_link#]', |
@@ -911,12 +911,12 @@ discard block |
||
| 911 | 911 | $post_author_email, |
| 912 | 912 | $current_date |
| 913 | 913 | ); |
| 914 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 914 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 915 | 915 | |
| 916 | - $headers = array(); |
|
| 916 | + $headers = array(); |
|
| 917 | 917 | $headers[] = 'Content-type: text/html; charset=UTF-8'; |
| 918 | - $headers[] = "Reply-To: " . $fromEmail; |
|
| 919 | - $headers[] = 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>'; |
|
| 918 | + $headers[] = "Reply-To: ".$fromEmail; |
|
| 919 | + $headers[] = 'From: '.$sitefromEmailName.' <'.$sitefromEmail.'>'; |
|
| 920 | 920 | |
| 921 | 921 | $to = $toEmail; |
| 922 | 922 | |
@@ -938,7 +938,7 @@ discard block |
||
| 938 | 938 | * @param string $post_id The post ID. |
| 939 | 939 | * @param string $user_id The user ID. |
| 940 | 940 | */ |
| 941 | - $to = apply_filters( 'geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 941 | + $to = apply_filters('geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 942 | 942 | /** |
| 943 | 943 | * Filter the client email subject. |
| 944 | 944 | * |
@@ -957,7 +957,7 @@ discard block |
||
| 957 | 957 | * @param string $post_id The post ID. |
| 958 | 958 | * @param string $user_id The user ID. |
| 959 | 959 | */ |
| 960 | - $subject = apply_filters( 'geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 960 | + $subject = apply_filters('geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 961 | 961 | /** |
| 962 | 962 | * Filter the client email message. |
| 963 | 963 | * |
@@ -976,7 +976,7 @@ discard block |
||
| 976 | 976 | * @param string $post_id The post ID. |
| 977 | 977 | * @param string $user_id The user ID. |
| 978 | 978 | */ |
| 979 | - $message = apply_filters( 'geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 979 | + $message = apply_filters('geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 980 | 980 | /** |
| 981 | 981 | * Filter the client email headers. |
| 982 | 982 | * |
@@ -995,39 +995,39 @@ discard block |
||
| 995 | 995 | * @param string $post_id The post ID. |
| 996 | 996 | * @param string $user_id The user ID. |
| 997 | 997 | */ |
| 998 | - $headers = apply_filters( 'geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 998 | + $headers = apply_filters('geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 999 | 999 | |
| 1000 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1000 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1001 | 1001 | |
| 1002 | - if ( ! $sent ) {
|
|
| 1003 | - if ( is_array( $to ) ) {
|
|
| 1004 | - $to = implode( ',', $to ); |
|
| 1002 | + if (!$sent) {
|
|
| 1003 | + if (is_array($to)) {
|
|
| 1004 | + $to = implode(',', $to);
|
|
| 1005 | 1005 | } |
| 1006 | 1006 | $log_message = sprintf( |
| 1007 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1007 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1008 | 1008 | $message_type, |
| 1009 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1009 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1010 | 1010 | $to, |
| 1011 | 1011 | $subject |
| 1012 | 1012 | ); |
| 1013 | - geodir_error_log( $log_message ); |
|
| 1013 | + geodir_error_log($log_message); |
|
| 1014 | 1014 | } |
| 1015 | 1015 | |
| 1016 | 1016 | ///////// ADMIN BCC EMIALS |
| 1017 | - $adminEmail = get_bloginfo( 'admin_email' ); |
|
| 1017 | + $adminEmail = get_bloginfo('admin_email');
|
|
| 1018 | 1018 | $to = $adminEmail; |
| 1019 | 1019 | |
| 1020 | 1020 | $admin_bcc = false; |
| 1021 | - if ( $message_type == 'registration' ) {
|
|
| 1022 | - $message_raw = explode( __( "Password:", 'geodirectory' ), $message ); |
|
| 1023 | - $message_raw2 = explode( "</p>", $message_raw[1], 2 ); |
|
| 1024 | - $message = $message_raw[0] . __( 'Password:', 'geodirectory' ) . ' **********</p>' . $message_raw2[1]; |
|
| 1021 | + if ($message_type == 'registration') {
|
|
| 1022 | + $message_raw = explode(__("Password:", 'geodirectory'), $message);
|
|
| 1023 | + $message_raw2 = explode("</p>", $message_raw[1], 2);
|
|
| 1024 | + $message = $message_raw[0].__('Password:', 'geodirectory').' **********</p>'.$message_raw2[1];
|
|
| 1025 | 1025 | } |
| 1026 | - if ( $message_type == 'post_submit' ) {
|
|
| 1027 | - $subject = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_subject_admin' ) ), 'geodirectory' ); |
|
| 1028 | - $message = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_content_admin' ) ), 'geodirectory' ); |
|
| 1026 | + if ($message_type == 'post_submit') {
|
|
| 1027 | + $subject = __(stripslashes_deep(get_option('geodir_post_submited_success_email_subject_admin')), 'geodirectory');
|
|
| 1028 | + $message = __(stripslashes_deep(get_option('geodir_post_submited_success_email_content_admin')), 'geodirectory');
|
|
| 1029 | 1029 | |
| 1030 | - $search_array = array( |
|
| 1030 | + $search_array = array( |
|
| 1031 | 1031 | '[#listing_link#]', |
| 1032 | 1032 | '[#site_name_url#]', |
| 1033 | 1033 | '[#post_id#]', |
@@ -1063,7 +1063,7 @@ discard block |
||
| 1063 | 1063 | $user_login, |
| 1064 | 1064 | $post_author_email, |
| 1065 | 1065 | ); |
| 1066 | - $message = str_replace( $search_array, $replace_array, $message ); |
|
| 1066 | + $message = str_replace($search_array, $replace_array, $message); |
|
| 1067 | 1067 | |
| 1068 | 1068 | $search_array = array( |
| 1069 | 1069 | '[#listing_link#]', |
@@ -1095,26 +1095,26 @@ discard block |
||
| 1095 | 1095 | $user_login, |
| 1096 | 1096 | $post_author_email, |
| 1097 | 1097 | ); |
| 1098 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 1098 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 1099 | 1099 | |
| 1100 | 1100 | $subject .= ' - ADMIN BCC COPY'; |
| 1101 | 1101 | $admin_bcc = true; |
| 1102 | 1102 | |
| 1103 | - } elseif ( $message_type == 'registration' && get_option( 'geodir_bcc_new_user' ) ) {
|
|
| 1103 | + } elseif ($message_type == 'registration' && get_option('geodir_bcc_new_user')) {
|
|
| 1104 | 1104 | $subject .= ' - ADMIN BCC COPY'; |
| 1105 | 1105 | $admin_bcc = true; |
| 1106 | - } elseif ( $message_type == 'send_friend' && get_option( 'geodir_bcc_friend' ) ) {
|
|
| 1106 | + } elseif ($message_type == 'send_friend' && get_option('geodir_bcc_friend')) {
|
|
| 1107 | 1107 | $subject .= ' - ADMIN BCC COPY'; |
| 1108 | 1108 | $admin_bcc = true; |
| 1109 | - } elseif ( $message_type == 'send_enquiry' && get_option( 'geodir_bcc_enquiry' ) ) {
|
|
| 1109 | + } elseif ($message_type == 'send_enquiry' && get_option('geodir_bcc_enquiry')) {
|
|
| 1110 | 1110 | $subject .= ' - ADMIN BCC COPY'; |
| 1111 | 1111 | $admin_bcc = true; |
| 1112 | - } elseif ( $message_type == 'listing_published' && get_option( 'geodir_bcc_listing_published' ) ) {
|
|
| 1112 | + } elseif ($message_type == 'listing_published' && get_option('geodir_bcc_listing_published')) {
|
|
| 1113 | 1113 | $subject .= ' - ADMIN BCC COPY'; |
| 1114 | 1114 | $admin_bcc = true; |
| 1115 | 1115 | } |
| 1116 | 1116 | |
| 1117 | - if ( $admin_bcc === true ) {
|
|
| 1117 | + if ($admin_bcc === true) {
|
|
| 1118 | 1118 | |
| 1119 | 1119 | /** |
| 1120 | 1120 | * Filter the client email subject. |
@@ -1134,7 +1134,7 @@ discard block |
||
| 1134 | 1134 | * @param string $post_id The post ID. |
| 1135 | 1135 | * @param string $user_id The user ID. |
| 1136 | 1136 | */ |
| 1137 | - $subject = apply_filters( 'geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1137 | + $subject = apply_filters('geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1138 | 1138 | /** |
| 1139 | 1139 | * Filter the client email message. |
| 1140 | 1140 | * |
@@ -1153,23 +1153,23 @@ discard block |
||
| 1153 | 1153 | * @param string $post_id The post ID. |
| 1154 | 1154 | * @param string $user_id The user ID. |
| 1155 | 1155 | */ |
| 1156 | - $message = apply_filters( 'geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1156 | + $message = apply_filters('geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1157 | 1157 | |
| 1158 | 1158 | |
| 1159 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1159 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1160 | 1160 | |
| 1161 | - if ( ! $sent ) {
|
|
| 1162 | - if ( is_array( $to ) ) {
|
|
| 1163 | - $to = implode( ',', $to ); |
|
| 1161 | + if (!$sent) {
|
|
| 1162 | + if (is_array($to)) {
|
|
| 1163 | + $to = implode(',', $to);
|
|
| 1164 | 1164 | } |
| 1165 | 1165 | $log_message = sprintf( |
| 1166 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1166 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1167 | 1167 | $message_type, |
| 1168 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1168 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1169 | 1169 | $to, |
| 1170 | 1170 | $subject |
| 1171 | 1171 | ); |
| 1172 | - geodir_error_log( $log_message ); |
|
| 1172 | + geodir_error_log($log_message); |
|
| 1173 | 1173 | } |
| 1174 | 1174 | } |
| 1175 | 1175 | |
@@ -1185,49 +1185,49 @@ discard block |
||
| 1185 | 1185 | */ |
| 1186 | 1186 | function geodir_taxonomy_breadcrumb() {
|
| 1187 | 1187 | |
| 1188 | - $term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) ); |
|
| 1188 | + $term = get_term_by('slug', get_query_var('term'), get_query_var('taxonomy'));
|
|
| 1189 | 1189 | $parent = $term->parent; |
| 1190 | 1190 | |
| 1191 | - while ( $parent ): |
|
| 1191 | + while ($parent): |
|
| 1192 | 1192 | $parents[] = $parent; |
| 1193 | - $new_parent = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); |
|
| 1193 | + $new_parent = get_term_by('id', $parent, get_query_var('taxonomy'));
|
|
| 1194 | 1194 | $parent = $new_parent->parent; |
| 1195 | 1195 | endwhile; |
| 1196 | 1196 | |
| 1197 | - if ( ! empty( $parents ) ): |
|
| 1198 | - $parents = array_reverse( $parents ); |
|
| 1197 | + if (!empty($parents)): |
|
| 1198 | + $parents = array_reverse($parents); |
|
| 1199 | 1199 | |
| 1200 | - foreach ( $parents as $parent ): |
|
| 1201 | - $item = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); |
|
| 1202 | - $url = get_term_link( $item, get_query_var( 'taxonomy' ) ); |
|
| 1203 | - echo '<li> > <a href="' . $url . '">' . $item->name . '</a></li>'; |
|
| 1200 | + foreach ($parents as $parent): |
|
| 1201 | + $item = get_term_by('id', $parent, get_query_var('taxonomy'));
|
|
| 1202 | + $url = get_term_link($item, get_query_var('taxonomy'));
|
|
| 1203 | + echo '<li> > <a href="'.$url.'">'.$item->name.'</a></li>'; |
|
| 1204 | 1204 | endforeach; |
| 1205 | 1205 | |
| 1206 | 1206 | endif; |
| 1207 | 1207 | |
| 1208 | - echo '<li> > ' . $term->name . '</li>'; |
|
| 1208 | + echo '<li> > '.$term->name.'</li>'; |
|
| 1209 | 1209 | } |
| 1210 | 1210 | |
| 1211 | -function geodir_wpml_post_type_archive_link($link, $post_type){
|
|
| 1211 | +function geodir_wpml_post_type_archive_link($link, $post_type) {
|
|
| 1212 | 1212 | if (function_exists('icl_object_id')) {
|
| 1213 | - $post_types = get_option( 'geodir_post_types' ); |
|
| 1214 | - $slug = $post_types[ $post_type ]['rewrite']['slug']; |
|
| 1213 | + $post_types = get_option('geodir_post_types');
|
|
| 1214 | + $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1215 | 1215 | |
| 1216 | 1216 | // Alter the CPT slug if WPML is set to do so |
| 1217 | - if ( function_exists( 'icl_object_id' ) ) {
|
|
| 1218 | - if ( gd_wpml_slug_translation_turned_on( $post_type ) && $language_code = gd_wpml_get_lang_from_url( $link) ) {
|
|
| 1217 | + if (function_exists('icl_object_id')) {
|
|
| 1218 | + if (gd_wpml_slug_translation_turned_on($post_type) && $language_code = gd_wpml_get_lang_from_url($link)) {
|
|
| 1219 | 1219 | |
| 1220 | 1220 | $org_slug = $slug; |
| 1221 | - $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1221 | + $slug = apply_filters('wpml_translate_single_string',
|
|
| 1222 | 1222 | $slug, |
| 1223 | 1223 | 'WordPress', |
| 1224 | - 'URL slug: ' . $slug, |
|
| 1225 | - $language_code ); |
|
| 1224 | + 'URL slug: '.$slug, |
|
| 1225 | + $language_code); |
|
| 1226 | 1226 | |
| 1227 | - if ( ! $slug ) {
|
|
| 1227 | + if (!$slug) {
|
|
| 1228 | 1228 | $slug = $org_slug; |
| 1229 | 1229 | } else {
|
| 1230 | - $link = str_replace( $org_slug, $slug, $link ); |
|
| 1230 | + $link = str_replace($org_slug, $slug, $link); |
|
| 1231 | 1231 | } |
| 1232 | 1232 | } |
| 1233 | 1233 | } |
@@ -1235,7 +1235,7 @@ discard block |
||
| 1235 | 1235 | |
| 1236 | 1236 | return $link; |
| 1237 | 1237 | } |
| 1238 | -add_filter( 'post_type_archive_link','geodir_wpml_post_type_archive_link', 1000, 2); |
|
| 1238 | +add_filter('post_type_archive_link', 'geodir_wpml_post_type_archive_link', 1000, 2);
|
|
| 1239 | 1239 | |
| 1240 | 1240 | /** |
| 1241 | 1241 | * Main function that generates breadcrumb for all pages. |
@@ -1256,9 +1256,9 @@ discard block |
||
| 1256 | 1256 | * |
| 1257 | 1257 | * @since 1.0.0 |
| 1258 | 1258 | */ |
| 1259 | - $separator = apply_filters( 'geodir_breadcrumb_separator', ' > ' ); |
|
| 1259 | + $separator = apply_filters('geodir_breadcrumb_separator', ' > ');
|
|
| 1260 | 1260 | |
| 1261 | - if ( ! geodir_is_page( 'home' ) ) {
|
|
| 1261 | + if (!geodir_is_page('home')) {
|
|
| 1262 | 1262 | $breadcrumb = ''; |
| 1263 | 1263 | $url_categoris = ''; |
| 1264 | 1264 | $breadcrumb .= '<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">'; |
@@ -1267,167 +1267,167 @@ discard block |
||
| 1267 | 1267 | * |
| 1268 | 1268 | * @since 1.0.0 |
| 1269 | 1269 | */ |
| 1270 | - $breadcrumb .= '<li>' . apply_filters( 'geodir_breadcrumb_first_link', '<a href="' . home_url() . '">' . __( 'Home', 'geodirectory' ) . '</a>' ) . '</li>'; |
|
| 1270 | + $breadcrumb .= '<li>'.apply_filters('geodir_breadcrumb_first_link', '<a href="'.home_url().'">'.__('Home', 'geodirectory').'</a>').'</li>';
|
|
| 1271 | 1271 | |
| 1272 | 1272 | $gd_post_type = geodir_get_current_posttype(); |
| 1273 | - $post_type_info = get_post_type_object( $gd_post_type ); |
|
| 1273 | + $post_type_info = get_post_type_object($gd_post_type); |
|
| 1274 | 1274 | |
| 1275 | - remove_filter( 'post_type_archive_link', 'geodir_get_posttype_link' ); |
|
| 1275 | + remove_filter('post_type_archive_link', 'geodir_get_posttype_link');
|
|
| 1276 | 1276 | |
| 1277 | - $listing_link = get_post_type_archive_link( $gd_post_type ); |
|
| 1277 | + $listing_link = get_post_type_archive_link($gd_post_type); |
|
| 1278 | 1278 | |
| 1279 | - add_filter( 'post_type_archive_link', 'geodir_get_posttype_link', 10, 2 ); |
|
| 1280 | - $listing_link = rtrim( $listing_link, '/' ); |
|
| 1279 | + add_filter('post_type_archive_link', 'geodir_get_posttype_link', 10, 2);
|
|
| 1280 | + $listing_link = rtrim($listing_link, '/'); |
|
| 1281 | 1281 | $listing_link .= '/'; |
| 1282 | 1282 | |
| 1283 | 1283 | $post_type_for_location_link = $listing_link; |
| 1284 | - $location_terms = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 1284 | + $location_terms = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 1285 | 1285 | |
| 1286 | 1286 | global $wp, $gd_session; |
| 1287 | 1287 | $location_link = $post_type_for_location_link; |
| 1288 | 1288 | |
| 1289 | - if ( geodir_is_page( 'detail' ) || geodir_is_page( 'listing' ) ) {
|
|
| 1289 | + if (geodir_is_page('detail') || geodir_is_page('listing')) {
|
|
| 1290 | 1290 | global $post; |
| 1291 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; |
|
| 1292 | - $neighbourhood_active = $location_manager && get_option( 'location_neighbourhoods' ) ? true : false; |
|
| 1291 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 1292 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 1293 | 1293 | |
| 1294 | - if ( geodir_is_page( 'detail' ) && isset( $post->country_slug ) ) {
|
|
| 1294 | + if (geodir_is_page('detail') && isset($post->country_slug)) {
|
|
| 1295 | 1295 | $location_terms = array( |
| 1296 | 1296 | 'gd_country' => $post->country_slug, |
| 1297 | 1297 | 'gd_region' => $post->region_slug, |
| 1298 | 1298 | 'gd_city' => $post->city_slug |
| 1299 | 1299 | ); |
| 1300 | 1300 | |
| 1301 | - if ( $neighbourhood_active && ! empty( $location_terms['gd_city'] ) && $gd_ses_neighbourhood = $gd_session->get( 'gd_neighbourhood' ) ) {
|
|
| 1301 | + if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
|
|
| 1302 | 1302 | $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; |
| 1303 | 1303 | } |
| 1304 | 1304 | } |
| 1305 | 1305 | |
| 1306 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); |
|
| 1306 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1307 | 1307 | |
| 1308 | 1308 | $hide_url_part = array(); |
| 1309 | - if ( $location_manager ) {
|
|
| 1310 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); |
|
| 1311 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); |
|
| 1312 | - |
|
| 1313 | - if ( $hide_region_part && $hide_country_part ) {
|
|
| 1314 | - $hide_url_part = array( 'gd_country', 'gd_region' ); |
|
| 1315 | - } else if ( $hide_region_part && ! $hide_country_part ) {
|
|
| 1316 | - $hide_url_part = array( 'gd_region' ); |
|
| 1317 | - } else if ( ! $hide_region_part && $hide_country_part ) {
|
|
| 1318 | - $hide_url_part = array( 'gd_country' ); |
|
| 1309 | + if ($location_manager) {
|
|
| 1310 | + $hide_country_part = get_option('geodir_location_hide_country_part');
|
|
| 1311 | + $hide_region_part = get_option('geodir_location_hide_region_part');
|
|
| 1312 | + |
|
| 1313 | + if ($hide_region_part && $hide_country_part) {
|
|
| 1314 | + $hide_url_part = array('gd_country', 'gd_region');
|
|
| 1315 | + } else if ($hide_region_part && !$hide_country_part) {
|
|
| 1316 | + $hide_url_part = array('gd_region');
|
|
| 1317 | + } else if (!$hide_region_part && $hide_country_part) {
|
|
| 1318 | + $hide_url_part = array('gd_country');
|
|
| 1319 | 1319 | } |
| 1320 | 1320 | } |
| 1321 | 1321 | |
| 1322 | 1322 | $hide_text_part = array(); |
| 1323 | - if ( $geodir_show_location_url == 'country_city' ) {
|
|
| 1324 | - $hide_text_part = array( 'gd_region' ); |
|
| 1323 | + if ($geodir_show_location_url == 'country_city') {
|
|
| 1324 | + $hide_text_part = array('gd_region');
|
|
| 1325 | 1325 | |
| 1326 | - if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
|
|
| 1327 | - unset( $location_terms['gd_region'] ); |
|
| 1326 | + if (isset($location_terms['gd_region']) && !$location_manager) {
|
|
| 1327 | + unset($location_terms['gd_region']); |
|
| 1328 | 1328 | } |
| 1329 | - } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
| 1330 | - $hide_text_part = array( 'gd_country' ); |
|
| 1329 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 1330 | + $hide_text_part = array('gd_country');
|
|
| 1331 | 1331 | |
| 1332 | - if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
|
|
| 1333 | - unset( $location_terms['gd_country'] ); |
|
| 1332 | + if (isset($location_terms['gd_country']) && !$location_manager) {
|
|
| 1333 | + unset($location_terms['gd_country']); |
|
| 1334 | 1334 | } |
| 1335 | - } else if ( $geodir_show_location_url == 'city' ) {
|
|
| 1336 | - $hide_text_part = array( 'gd_country', 'gd_region' ); |
|
| 1335 | + } else if ($geodir_show_location_url == 'city') {
|
|
| 1336 | + $hide_text_part = array('gd_country', 'gd_region');
|
|
| 1337 | 1337 | |
| 1338 | - if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
|
|
| 1339 | - unset( $location_terms['gd_country'] ); |
|
| 1338 | + if (isset($location_terms['gd_country']) && !$location_manager) {
|
|
| 1339 | + unset($location_terms['gd_country']); |
|
| 1340 | 1340 | } |
| 1341 | - if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
|
|
| 1342 | - unset( $location_terms['gd_region'] ); |
|
| 1341 | + if (isset($location_terms['gd_region']) && !$location_manager) {
|
|
| 1342 | + unset($location_terms['gd_region']); |
|
| 1343 | 1343 | } |
| 1344 | 1344 | } |
| 1345 | 1345 | |
| 1346 | 1346 | $is_location_last = ''; |
| 1347 | 1347 | $is_taxonomy_last = ''; |
| 1348 | 1348 | $breadcrumb .= '<li>'; |
| 1349 | - if ( get_query_var( $gd_post_type . 'category' ) ) {
|
|
| 1350 | - $gd_taxonomy = $gd_post_type . 'category'; |
|
| 1351 | - } elseif ( get_query_var( $gd_post_type . '_tags' ) ) {
|
|
| 1352 | - $gd_taxonomy = $gd_post_type . '_tags'; |
|
| 1349 | + if (get_query_var($gd_post_type.'category')) {
|
|
| 1350 | + $gd_taxonomy = $gd_post_type.'category'; |
|
| 1351 | + } elseif (get_query_var($gd_post_type.'_tags')) {
|
|
| 1352 | + $gd_taxonomy = $gd_post_type.'_tags'; |
|
| 1353 | 1353 | } |
| 1354 | 1354 | |
| 1355 | - $breadcrumb .= $separator . '<a href="' . $listing_link . '">' . __( ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; |
|
| 1356 | - if ( ! empty( $gd_taxonomy ) || geodir_is_page( 'detail' ) ) {
|
|
| 1355 | + $breadcrumb .= $separator.'<a href="'.$listing_link.'">'.__(ucfirst($post_type_info->label), 'geodirectory').'</a>'; |
|
| 1356 | + if (!empty($gd_taxonomy) || geodir_is_page('detail')) {
|
|
| 1357 | 1357 | $is_location_last = false; |
| 1358 | 1358 | } else {
|
| 1359 | 1359 | $is_location_last = true; |
| 1360 | 1360 | } |
| 1361 | 1361 | |
| 1362 | - if ( ! empty( $gd_taxonomy ) && geodir_is_page( 'listing' ) ) {
|
|
| 1362 | + if (!empty($gd_taxonomy) && geodir_is_page('listing')) {
|
|
| 1363 | 1363 | $is_taxonomy_last = true; |
| 1364 | 1364 | } else {
|
| 1365 | 1365 | $is_taxonomy_last = false; |
| 1366 | 1366 | } |
| 1367 | 1367 | |
| 1368 | - if ( ! empty( $location_terms ) ) {
|
|
| 1369 | - $geodir_get_locations = function_exists( 'get_actual_location_name' ) ? true : false; |
|
| 1368 | + if (!empty($location_terms)) {
|
|
| 1369 | + $geodir_get_locations = function_exists('get_actual_location_name') ? true : false;
|
|
| 1370 | 1370 | |
| 1371 | - foreach ( $location_terms as $key => $location_term ) {
|
|
| 1372 | - if ( $location_term != '' ) {
|
|
| 1373 | - if ( ! empty( $hide_url_part ) && in_array( $key, $hide_url_part ) ) { // Hide location part from url & breadcrumb.
|
|
| 1371 | + foreach ($location_terms as $key => $location_term) {
|
|
| 1372 | + if ($location_term != '') {
|
|
| 1373 | + if (!empty($hide_url_part) && in_array($key, $hide_url_part)) { // Hide location part from url & breadcrumb.
|
|
| 1374 | 1374 | continue; |
| 1375 | 1375 | } |
| 1376 | 1376 | |
| 1377 | - $gd_location_link_text = preg_replace( '/-(\d+)$/', '', $location_term ); |
|
| 1378 | - $gd_location_link_text = preg_replace( '/[_-]/', ' ', $gd_location_link_text ); |
|
| 1379 | - $gd_location_link_text = ucfirst( $gd_location_link_text ); |
|
| 1377 | + $gd_location_link_text = preg_replace('/-(\d+)$/', '', $location_term);
|
|
| 1378 | + $gd_location_link_text = preg_replace('/[_-]/', ' ', $gd_location_link_text);
|
|
| 1379 | + $gd_location_link_text = ucfirst($gd_location_link_text); |
|
| 1380 | 1380 | |
| 1381 | 1381 | $location_term_actual_country = ''; |
| 1382 | 1382 | $location_term_actual_region = ''; |
| 1383 | 1383 | $location_term_actual_city = ''; |
| 1384 | 1384 | $location_term_actual_neighbourhood = ''; |
| 1385 | - if ( $geodir_get_locations ) {
|
|
| 1386 | - if ( $key == 'gd_country' ) {
|
|
| 1387 | - $location_term_actual_country = get_actual_location_name( 'country', $location_term, true ); |
|
| 1388 | - } else if ( $key == 'gd_region' ) {
|
|
| 1389 | - $location_term_actual_region = get_actual_location_name( 'region', $location_term, true ); |
|
| 1390 | - } else if ( $key == 'gd_city' ) {
|
|
| 1391 | - $location_term_actual_city = get_actual_location_name( 'city', $location_term, true ); |
|
| 1392 | - } else if ( $key == 'gd_neighbourhood' ) {
|
|
| 1393 | - $location_term_actual_neighbourhood = get_actual_location_name( 'neighbourhood', $location_term, true ); |
|
| 1385 | + if ($geodir_get_locations) {
|
|
| 1386 | + if ($key == 'gd_country') {
|
|
| 1387 | + $location_term_actual_country = get_actual_location_name('country', $location_term, true);
|
|
| 1388 | + } else if ($key == 'gd_region') {
|
|
| 1389 | + $location_term_actual_region = get_actual_location_name('region', $location_term, true);
|
|
| 1390 | + } else if ($key == 'gd_city') {
|
|
| 1391 | + $location_term_actual_city = get_actual_location_name('city', $location_term, true);
|
|
| 1392 | + } else if ($key == 'gd_neighbourhood') {
|
|
| 1393 | + $location_term_actual_neighbourhood = get_actual_location_name('neighbourhood', $location_term, true);
|
|
| 1394 | 1394 | } |
| 1395 | 1395 | } else {
|
| 1396 | 1396 | $location_info = geodir_get_location(); |
| 1397 | 1397 | |
| 1398 | - if ( ! empty( $location_info ) && isset( $location_info->location_id ) ) {
|
|
| 1399 | - if ( $key == 'gd_country' ) {
|
|
| 1400 | - $location_term_actual_country = __( $location_info->country, 'geodirectory' ); |
|
| 1401 | - } else if ( $key == 'gd_region' ) {
|
|
| 1402 | - $location_term_actual_region = __( $location_info->region, 'geodirectory' ); |
|
| 1403 | - } else if ( $key == 'gd_city' ) {
|
|
| 1404 | - $location_term_actual_city = __( $location_info->city, 'geodirectory' ); |
|
| 1398 | + if (!empty($location_info) && isset($location_info->location_id)) {
|
|
| 1399 | + if ($key == 'gd_country') {
|
|
| 1400 | + $location_term_actual_country = __($location_info->country, 'geodirectory'); |
|
| 1401 | + } else if ($key == 'gd_region') {
|
|
| 1402 | + $location_term_actual_region = __($location_info->region, 'geodirectory'); |
|
| 1403 | + } else if ($key == 'gd_city') {
|
|
| 1404 | + $location_term_actual_city = __($location_info->city, 'geodirectory'); |
|
| 1405 | 1405 | } |
| 1406 | 1406 | } |
| 1407 | 1407 | } |
| 1408 | 1408 | |
| 1409 | - 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'] != '' ) ) {
|
|
| 1410 | - $breadcrumb .= $location_term_actual_country != '' ? $separator . $location_term_actual_country : $separator . $gd_location_link_text; |
|
| 1411 | - } else if ( $is_location_last && $key == 'gd_region' && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {
|
|
| 1412 | - $breadcrumb .= $location_term_actual_region != '' ? $separator . $location_term_actual_region : $separator . $gd_location_link_text; |
|
| 1413 | - } else if ( $is_location_last && $key == 'gd_city' && empty( $location_terms['gd_neighbourhood'] ) ) {
|
|
| 1414 | - $breadcrumb .= $location_term_actual_city != '' ? $separator . $location_term_actual_city : $separator . $gd_location_link_text; |
|
| 1415 | - } else if ( $is_location_last && $key == 'gd_neighbourhood' ) {
|
|
| 1416 | - $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator . $location_term_actual_neighbourhood : $separator . $gd_location_link_text; |
|
| 1409 | + 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'] != '')) {
|
|
| 1410 | + $breadcrumb .= $location_term_actual_country != '' ? $separator.$location_term_actual_country : $separator.$gd_location_link_text; |
|
| 1411 | + } else if ($is_location_last && $key == 'gd_region' && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {
|
|
| 1412 | + $breadcrumb .= $location_term_actual_region != '' ? $separator.$location_term_actual_region : $separator.$gd_location_link_text; |
|
| 1413 | + } else if ($is_location_last && $key == 'gd_city' && empty($location_terms['gd_neighbourhood'])) {
|
|
| 1414 | + $breadcrumb .= $location_term_actual_city != '' ? $separator.$location_term_actual_city : $separator.$gd_location_link_text; |
|
| 1415 | + } else if ($is_location_last && $key == 'gd_neighbourhood') {
|
|
| 1416 | + $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator.$location_term_actual_neighbourhood : $separator.$gd_location_link_text; |
|
| 1417 | 1417 | } else {
|
| 1418 | - if ( get_option( 'permalink_structure' ) != '' ) {
|
|
| 1419 | - $location_link .= $location_term . '/'; |
|
| 1418 | + if (get_option('permalink_structure') != '') {
|
|
| 1419 | + $location_link .= $location_term.'/'; |
|
| 1420 | 1420 | } else {
|
| 1421 | - $location_link .= "&$key=" . $location_term; |
|
| 1421 | + $location_link .= "&$key=".$location_term; |
|
| 1422 | 1422 | } |
| 1423 | 1423 | |
| 1424 | - if ( $key == 'gd_country' && $location_term_actual_country != '' ) {
|
|
| 1424 | + if ($key == 'gd_country' && $location_term_actual_country != '') {
|
|
| 1425 | 1425 | $gd_location_link_text = $location_term_actual_country; |
| 1426 | - } else if ( $key == 'gd_region' && $location_term_actual_region != '' ) {
|
|
| 1426 | + } else if ($key == 'gd_region' && $location_term_actual_region != '') {
|
|
| 1427 | 1427 | $gd_location_link_text = $location_term_actual_region; |
| 1428 | - } else if ( $key == 'gd_city' && $location_term_actual_city != '' ) {
|
|
| 1428 | + } else if ($key == 'gd_city' && $location_term_actual_city != '') {
|
|
| 1429 | 1429 | $gd_location_link_text = $location_term_actual_city; |
| 1430 | - } else if ( $key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '' ) {
|
|
| 1430 | + } else if ($key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '') {
|
|
| 1431 | 1431 | $gd_location_link_text = $location_term_actual_neighbourhood; |
| 1432 | 1432 | } |
| 1433 | 1433 | |
@@ -1437,76 +1437,76 @@ discard block |
||
| 1437 | 1437 | } |
| 1438 | 1438 | */ |
| 1439 | 1439 | |
| 1440 | - $breadcrumb .= $separator . '<a href="' . $location_link . '">' . $gd_location_link_text . '</a>'; |
|
| 1440 | + $breadcrumb .= $separator.'<a href="'.$location_link.'">'.$gd_location_link_text.'</a>'; |
|
| 1441 | 1441 | } |
| 1442 | 1442 | } |
| 1443 | 1443 | } |
| 1444 | 1444 | } |
| 1445 | 1445 | |
| 1446 | - if ( ! empty( $gd_taxonomy ) ) {
|
|
| 1446 | + if (!empty($gd_taxonomy)) {
|
|
| 1447 | 1447 | $term_index = 1; |
| 1448 | 1448 | |
| 1449 | 1449 | //if(get_option('geodir_add_categories_url'))
|
| 1450 | 1450 | {
|
| 1451 | - if ( get_query_var( $gd_post_type . '_tags' ) ) {
|
|
| 1452 | - $cat_link = $listing_link . 'tags/'; |
|
| 1451 | + if (get_query_var($gd_post_type.'_tags')) {
|
|
| 1452 | + $cat_link = $listing_link.'tags/'; |
|
| 1453 | 1453 | } else {
|
| 1454 | 1454 | $cat_link = $listing_link; |
| 1455 | 1455 | } |
| 1456 | 1456 | |
| 1457 | - foreach ( $location_terms as $key => $location_term ) {
|
|
| 1458 | - if ( $location_manager && in_array( $key, $hide_url_part ) ) {
|
|
| 1457 | + foreach ($location_terms as $key => $location_term) {
|
|
| 1458 | + if ($location_manager && in_array($key, $hide_url_part)) {
|
|
| 1459 | 1459 | continue; |
| 1460 | 1460 | } |
| 1461 | 1461 | |
| 1462 | - if ( $location_term != '' ) {
|
|
| 1463 | - if ( get_option( 'permalink_structure' ) != '' ) {
|
|
| 1464 | - $cat_link .= $location_term . '/'; |
|
| 1462 | + if ($location_term != '') {
|
|
| 1463 | + if (get_option('permalink_structure') != '') {
|
|
| 1464 | + $cat_link .= $location_term.'/'; |
|
| 1465 | 1465 | } |
| 1466 | 1466 | } |
| 1467 | 1467 | } |
| 1468 | 1468 | |
| 1469 | - $term_array = explode( "/", trim( $wp_query->query[ $gd_taxonomy ], "/" ) ); |
|
| 1470 | - foreach ( $term_array as $term ) {
|
|
| 1471 | - $term_link_text = preg_replace( '/-(\d+)$/', '', $term ); |
|
| 1472 | - $term_link_text = preg_replace( '/[_-]/', ' ', $term_link_text ); |
|
| 1469 | + $term_array = explode("/", trim($wp_query->query[$gd_taxonomy], "/"));
|
|
| 1470 | + foreach ($term_array as $term) {
|
|
| 1471 | + $term_link_text = preg_replace('/-(\d+)$/', '', $term);
|
|
| 1472 | + $term_link_text = preg_replace('/[_-]/', ' ', $term_link_text);
|
|
| 1473 | 1473 | |
| 1474 | 1474 | // get term actual name |
| 1475 | - $term_info = get_term_by( 'slug', $term, $gd_taxonomy, 'ARRAY_A' ); |
|
| 1476 | - if ( ! empty( $term_info ) && isset( $term_info['name'] ) && $term_info['name'] != '' ) {
|
|
| 1477 | - $term_link_text = urldecode( $term_info['name'] ); |
|
| 1475 | + $term_info = get_term_by('slug', $term, $gd_taxonomy, 'ARRAY_A');
|
|
| 1476 | + if (!empty($term_info) && isset($term_info['name']) && $term_info['name'] != '') {
|
|
| 1477 | + $term_link_text = urldecode($term_info['name']); |
|
| 1478 | 1478 | } else {
|
| 1479 | 1479 | continue; |
| 1480 | 1480 | //$term_link_text = wp_strip_all_tags(geodir_ucwords(urldecode($term_link_text))); |
| 1481 | 1481 | } |
| 1482 | 1482 | |
| 1483 | - if ( $term_index == count( $term_array ) && $is_taxonomy_last ) {
|
|
| 1484 | - $breadcrumb .= $separator . $term_link_text; |
|
| 1483 | + if ($term_index == count($term_array) && $is_taxonomy_last) {
|
|
| 1484 | + $breadcrumb .= $separator.$term_link_text; |
|
| 1485 | 1485 | } else {
|
| 1486 | - $cat_link .= $term . '/'; |
|
| 1487 | - $breadcrumb .= $separator . '<a href="' . $cat_link . '">' . $term_link_text . '</a>'; |
|
| 1486 | + $cat_link .= $term.'/'; |
|
| 1487 | + $breadcrumb .= $separator.'<a href="'.$cat_link.'">'.$term_link_text.'</a>'; |
|
| 1488 | 1488 | } |
| 1489 | - $term_index ++; |
|
| 1489 | + $term_index++; |
|
| 1490 | 1490 | } |
| 1491 | 1491 | } |
| 1492 | 1492 | |
| 1493 | 1493 | |
| 1494 | 1494 | } |
| 1495 | 1495 | |
| 1496 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 1497 | - $breadcrumb .= $separator . get_the_title(); |
|
| 1496 | + if (geodir_is_page('detail')) {
|
|
| 1497 | + $breadcrumb .= $separator.get_the_title(); |
|
| 1498 | 1498 | } |
| 1499 | 1499 | |
| 1500 | 1500 | $breadcrumb .= '</li>'; |
| 1501 | 1501 | |
| 1502 | 1502 | |
| 1503 | - } elseif ( geodir_is_page( 'author' ) ) {
|
|
| 1503 | + } elseif (geodir_is_page('author')) {
|
|
| 1504 | 1504 | $user_id = get_current_user_id(); |
| 1505 | - $author_link = get_author_posts_url( $user_id ); |
|
| 1506 | - $default_author_link = geodir_getlink( $author_link, array( |
|
| 1505 | + $author_link = get_author_posts_url($user_id); |
|
| 1506 | + $default_author_link = geodir_getlink($author_link, array( |
|
| 1507 | 1507 | 'geodir_dashbord' => 'true', |
| 1508 | 1508 | 'stype' => 'gd_place' |
| 1509 | - ), false ); |
|
| 1509 | + ), false); |
|
| 1510 | 1510 | |
| 1511 | 1511 | /** |
| 1512 | 1512 | * Filter author page link. |
@@ -1516,16 +1516,16 @@ discard block |
||
| 1516 | 1516 | * @param string $default_author_link Default author link. |
| 1517 | 1517 | * @param int $user_id Author ID. |
| 1518 | 1518 | */ |
| 1519 | - $default_author_link = apply_filters( 'geodir_dashboard_author_link', $default_author_link, $user_id ); |
|
| 1519 | + $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_id);
|
|
| 1520 | 1520 | |
| 1521 | 1521 | $breadcrumb .= '<li>'; |
| 1522 | - $breadcrumb .= $separator . '<a href="' . $default_author_link . '">' . __( 'My Dashboard', 'geodirectory' ) . '</a>'; |
|
| 1522 | + $breadcrumb .= $separator.'<a href="'.$default_author_link.'">'.__('My Dashboard', 'geodirectory').'</a>';
|
|
| 1523 | 1523 | |
| 1524 | - if ( isset( $_REQUEST['list'] ) ) {
|
|
| 1525 | - $author_link = geodir_getlink( $author_link, array( |
|
| 1524 | + if (isset($_REQUEST['list'])) {
|
|
| 1525 | + $author_link = geodir_getlink($author_link, array( |
|
| 1526 | 1526 | 'geodir_dashbord' => 'true', |
| 1527 | 1527 | 'stype' => $_REQUEST['stype'] |
| 1528 | - ), false ); |
|
| 1528 | + ), false); |
|
| 1529 | 1529 | |
| 1530 | 1530 | /** |
| 1531 | 1531 | * Filter author page link. |
@@ -1536,61 +1536,61 @@ discard block |
||
| 1536 | 1536 | * @param int $user_id Author ID. |
| 1537 | 1537 | * @param string $_REQUEST ['stype'] Post type. |
| 1538 | 1538 | */ |
| 1539 | - $author_link = apply_filters( 'geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype'] ); |
|
| 1539 | + $author_link = apply_filters('geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype']);
|
|
| 1540 | 1540 | |
| 1541 | - $breadcrumb .= $separator . '<a href="' . $author_link . '">' . __( ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; |
|
| 1542 | - $breadcrumb .= $separator . ucfirst( __( 'My', 'geodirectory' ) . ' ' . $_REQUEST['list'] ); |
|
| 1541 | + $breadcrumb .= $separator.'<a href="'.$author_link.'">'.__(ucfirst($post_type_info->label), 'geodirectory').'</a>'; |
|
| 1542 | + $breadcrumb .= $separator.ucfirst(__('My', 'geodirectory').' '.$_REQUEST['list']);
|
|
| 1543 | 1543 | } else {
|
| 1544 | - $breadcrumb .= $separator . __( ucfirst( $post_type_info->label ), 'geodirectory' ); |
|
| 1544 | + $breadcrumb .= $separator.__(ucfirst($post_type_info->label), 'geodirectory'); |
|
| 1545 | 1545 | } |
| 1546 | 1546 | |
| 1547 | 1547 | $breadcrumb .= '</li>'; |
| 1548 | - } elseif ( is_category() || is_single() ) {
|
|
| 1548 | + } elseif (is_category() || is_single()) {
|
|
| 1549 | 1549 | $category = get_the_category(); |
| 1550 | - if ( is_category() ) {
|
|
| 1551 | - $breadcrumb .= '<li>' . $separator . $category[0]->cat_name . '</li>'; |
|
| 1550 | + if (is_category()) {
|
|
| 1551 | + $breadcrumb .= '<li>'.$separator.$category[0]->cat_name.'</li>'; |
|
| 1552 | 1552 | } |
| 1553 | - if ( is_single() ) {
|
|
| 1554 | - $breadcrumb .= '<li>' . $separator . '<a href="' . get_category_link( $category[0]->term_id ) . '">' . $category[0]->cat_name . '</a></li>'; |
|
| 1555 | - $breadcrumb .= '<li>' . $separator . get_the_title() . '</li>'; |
|
| 1553 | + if (is_single()) {
|
|
| 1554 | + $breadcrumb .= '<li>'.$separator.'<a href="'.get_category_link($category[0]->term_id).'">'.$category[0]->cat_name.'</a></li>'; |
|
| 1555 | + $breadcrumb .= '<li>'.$separator.get_the_title().'</li>'; |
|
| 1556 | 1556 | } |
| 1557 | 1557 | /* End of my version ##################################################### */ |
| 1558 | - } else if ( is_page() ) {
|
|
| 1558 | + } else if (is_page()) {
|
|
| 1559 | 1559 | $page_title = get_the_title(); |
| 1560 | 1560 | |
| 1561 | - if ( geodir_is_page( 'location' ) ) {
|
|
| 1561 | + if (geodir_is_page('location')) {
|
|
| 1562 | 1562 | $location_page_id = geodir_location_page_id(); |
| 1563 | - $loc_post = get_post( $location_page_id ); |
|
| 1563 | + $loc_post = get_post($location_page_id); |
|
| 1564 | 1564 | $post_name = $loc_post->post_name; |
| 1565 | - $slug = ucwords( str_replace( '-', ' ', $post_name ) ); |
|
| 1566 | - $page_title = ! empty( $slug ) ? $slug : __( 'Location', 'geodirectory' ); |
|
| 1565 | + $slug = ucwords(str_replace('-', ' ', $post_name));
|
|
| 1566 | + $page_title = !empty($slug) ? $slug : __('Location', 'geodirectory');
|
|
| 1567 | 1567 | } |
| 1568 | 1568 | |
| 1569 | - $breadcrumb .= '<li>' . $separator; |
|
| 1570 | - $breadcrumb .= stripslashes_deep( $page_title ); |
|
| 1569 | + $breadcrumb .= '<li>'.$separator; |
|
| 1570 | + $breadcrumb .= stripslashes_deep($page_title); |
|
| 1571 | 1571 | $breadcrumb .= '</li>'; |
| 1572 | - } else if ( is_tag() ) {
|
|
| 1573 | - $breadcrumb .= "<li> " . $separator . single_tag_title( '', false ) . '</li>'; |
|
| 1574 | - } else if ( is_day() ) {
|
|
| 1575 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1576 | - the_time( 'F jS, Y' ); |
|
| 1572 | + } else if (is_tag()) {
|
|
| 1573 | + $breadcrumb .= "<li> ".$separator.single_tag_title('', false).'</li>';
|
|
| 1574 | + } else if (is_day()) {
|
|
| 1575 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1576 | + the_time('F jS, Y');
|
|
| 1577 | 1577 | $breadcrumb .= '</li>'; |
| 1578 | - } else if ( is_month() ) {
|
|
| 1579 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1580 | - the_time( 'F, Y' ); |
|
| 1578 | + } else if (is_month()) {
|
|
| 1579 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1580 | + the_time('F, Y');
|
|
| 1581 | 1581 | $breadcrumb .= '</li>'; |
| 1582 | - } else if ( is_year() ) {
|
|
| 1583 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1584 | - the_time( 'Y' ); |
|
| 1582 | + } else if (is_year()) {
|
|
| 1583 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1584 | + the_time('Y');
|
|
| 1585 | 1585 | $breadcrumb .= '</li>'; |
| 1586 | - } else if ( is_author() ) {
|
|
| 1587 | - $breadcrumb .= "<li> " . $separator . __( " Author Archive", 'geodirectory' ); |
|
| 1586 | + } else if (is_author()) {
|
|
| 1587 | + $breadcrumb .= "<li> ".$separator.__(" Author Archive", 'geodirectory');
|
|
| 1588 | 1588 | $breadcrumb .= '</li>'; |
| 1589 | - } else if ( isset( $_GET['paged'] ) && ! empty( $_GET['paged'] ) ) {
|
|
| 1590 | - $breadcrumb .= "<li>" . $separator . __( "Blog Archives", 'geodirectory' ); |
|
| 1589 | + } else if (isset($_GET['paged']) && !empty($_GET['paged'])) {
|
|
| 1590 | + $breadcrumb .= "<li>".$separator.__("Blog Archives", 'geodirectory');
|
|
| 1591 | 1591 | $breadcrumb .= '</li>'; |
| 1592 | - } else if ( is_search() ) {
|
|
| 1593 | - $breadcrumb .= "<li> " . $separator . __( " Search Results", 'geodirectory' ); |
|
| 1592 | + } else if (is_search()) {
|
|
| 1593 | + $breadcrumb .= "<li> ".$separator.__(" Search Results", 'geodirectory');
|
|
| 1594 | 1594 | $breadcrumb .= '</li>'; |
| 1595 | 1595 | } |
| 1596 | 1596 | $breadcrumb .= '</ul></div>'; |
@@ -1603,13 +1603,13 @@ discard block |
||
| 1603 | 1603 | * @param string $breadcrumb Breadcrumb HTML. |
| 1604 | 1604 | * @param string $separator Breadcrumb separator. |
| 1605 | 1605 | */ |
| 1606 | - echo $breadcrumb = apply_filters( 'geodir_breadcrumb', $breadcrumb, $separator ); |
|
| 1606 | + echo $breadcrumb = apply_filters('geodir_breadcrumb', $breadcrumb, $separator);
|
|
| 1607 | 1607 | } |
| 1608 | 1608 | } |
| 1609 | 1609 | |
| 1610 | 1610 | |
| 1611 | -add_action( "admin_init", "geodir_allow_wpadmin" ); // check user is admin |
|
| 1612 | -if ( ! function_exists( 'geodir_allow_wpadmin' ) ) {
|
|
| 1611 | +add_action("admin_init", "geodir_allow_wpadmin"); // check user is admin
|
|
| 1612 | +if (!function_exists('geodir_allow_wpadmin')) {
|
|
| 1613 | 1613 | /** |
| 1614 | 1614 | * Allow only admins to access wp-admin. |
| 1615 | 1615 | * |
@@ -1621,12 +1621,12 @@ discard block |
||
| 1621 | 1621 | */ |
| 1622 | 1622 | function geodir_allow_wpadmin() {
|
| 1623 | 1623 | global $wpdb; |
| 1624 | - if ( get_option( 'geodir_allow_wpadmin' ) == '0' && is_user_logged_in() && ( ! defined( 'DOING_AJAX' ) ) ) // checking action in request to allow ajax request go through |
|
| 1624 | + if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && (!defined('DOING_AJAX'))) // checking action in request to allow ajax request go through
|
|
| 1625 | 1625 | {
|
| 1626 | - if ( current_user_can( 'administrator' ) ) {
|
|
| 1626 | + if (current_user_can('administrator')) {
|
|
| 1627 | 1627 | } else {
|
| 1628 | 1628 | |
| 1629 | - wp_redirect( home_url() ); |
|
| 1629 | + wp_redirect(home_url()); |
|
| 1630 | 1630 | exit; |
| 1631 | 1631 | } |
| 1632 | 1632 | |
@@ -1645,23 +1645,23 @@ discard block |
||
| 1645 | 1645 | * |
| 1646 | 1646 | * @return array|WP_Error The uploaded data as array. When failure returns error. |
| 1647 | 1647 | */ |
| 1648 | -function fetch_remote_file( $url ) {
|
|
| 1648 | +function fetch_remote_file($url) {
|
|
| 1649 | 1649 | // extract the file name and extension from the url |
| 1650 | - require_once( ABSPATH . 'wp-includes/pluggable.php' ); |
|
| 1651 | - $file_name = basename( $url ); |
|
| 1652 | - if ( strpos( $file_name, '?' ) !== false ) {
|
|
| 1653 | - list( $file_name ) = explode( '?', $file_name ); |
|
| 1650 | + require_once(ABSPATH.'wp-includes/pluggable.php'); |
|
| 1651 | + $file_name = basename($url); |
|
| 1652 | + if (strpos($file_name, '?') !== false) {
|
|
| 1653 | + list($file_name) = explode('?', $file_name);
|
|
| 1654 | 1654 | } |
| 1655 | 1655 | $dummy = false; |
| 1656 | 1656 | $add_to_cache = false; |
| 1657 | 1657 | $key = null; |
| 1658 | - if ( strpos( $url, '/dummy/' ) !== false ) {
|
|
| 1658 | + if (strpos($url, '/dummy/') !== false) {
|
|
| 1659 | 1659 | $dummy = true; |
| 1660 | - $key = "dummy_" . str_replace( '.', '_', $file_name ); |
|
| 1661 | - $value = get_transient( 'cached_dummy_images' ); |
|
| 1662 | - if ( $value ) {
|
|
| 1663 | - if ( isset( $value[ $key ] ) ) {
|
|
| 1664 | - return $value[ $key ]; |
|
| 1660 | + $key = "dummy_".str_replace('.', '_', $file_name);
|
|
| 1661 | + $value = get_transient('cached_dummy_images');
|
|
| 1662 | + if ($value) {
|
|
| 1663 | + if (isset($value[$key])) {
|
|
| 1664 | + return $value[$key]; |
|
| 1665 | 1665 | } else {
|
| 1666 | 1666 | $add_to_cache = true; |
| 1667 | 1667 | } |
@@ -1672,58 +1672,58 @@ discard block |
||
| 1672 | 1672 | |
| 1673 | 1673 | // get placeholder file in the upload dir with a unique, sanitized filename |
| 1674 | 1674 | |
| 1675 | - $post_upload_date = isset( $post['upload_date'] ) ? $post['upload_date'] : ''; |
|
| 1675 | + $post_upload_date = isset($post['upload_date']) ? $post['upload_date'] : ''; |
|
| 1676 | 1676 | |
| 1677 | - $upload = wp_upload_bits( $file_name, 0, '', $post_upload_date ); |
|
| 1678 | - if ( $upload['error'] ) {
|
|
| 1679 | - return new WP_Error( 'upload_dir_error', $upload['error'] ); |
|
| 1677 | + $upload = wp_upload_bits($file_name, 0, '', $post_upload_date); |
|
| 1678 | + if ($upload['error']) {
|
|
| 1679 | + return new WP_Error('upload_dir_error', $upload['error']);
|
|
| 1680 | 1680 | } |
| 1681 | 1681 | |
| 1682 | 1682 | |
| 1683 | - sleep( 0.3 );// if multiple remote file this can cause the remote server to timeout so we add a slight delay |
|
| 1683 | + sleep(0.3); // if multiple remote file this can cause the remote server to timeout so we add a slight delay |
|
| 1684 | 1684 | |
| 1685 | 1685 | // fetch the remote url and write it to the placeholder file |
| 1686 | - $headers = wp_remote_get( $url, array( 'stream' => true, 'filename' => $upload['file'] ) ); |
|
| 1686 | + $headers = wp_remote_get($url, array('stream' => true, 'filename' => $upload['file']));
|
|
| 1687 | 1687 | |
| 1688 | 1688 | $log_message = ''; |
| 1689 | - if ( is_wp_error( $headers ) ) {
|
|
| 1690 | - echo 'file: ' . $url; |
|
| 1689 | + if (is_wp_error($headers)) {
|
|
| 1690 | + echo 'file: '.$url; |
|
| 1691 | 1691 | |
| 1692 | - return new WP_Error( 'import_file_error', $headers->get_error_message() ); |
|
| 1692 | + return new WP_Error('import_file_error', $headers->get_error_message());
|
|
| 1693 | 1693 | } |
| 1694 | 1694 | |
| 1695 | - $filesize = filesize( $upload['file'] ); |
|
| 1695 | + $filesize = filesize($upload['file']); |
|
| 1696 | 1696 | // request failed |
| 1697 | - if ( ! $headers ) {
|
|
| 1698 | - $log_message = __( 'Remote server did not respond', 'geodirectory' ); |
|
| 1697 | + if (!$headers) {
|
|
| 1698 | + $log_message = __('Remote server did not respond', 'geodirectory');
|
|
| 1699 | 1699 | } // make sure the fetch was successful |
| 1700 | - elseif ( $headers['response']['code'] != '200' ) {
|
|
| 1701 | - $log_message = sprintf( __( 'Remote server returned error response %1$d %2$s', 'geodirectory' ), esc_html( $headers['response'] ), get_status_header_desc( $headers['response'] ) ); |
|
| 1702 | - } elseif ( isset( $headers['headers']['content-length'] ) && $filesize != $headers['headers']['content-length'] ) {
|
|
| 1703 | - $log_message = __( 'Remote file is incorrect size', 'geodirectory' ); |
|
| 1704 | - } elseif ( 0 == $filesize ) {
|
|
| 1705 | - $log_message = __( 'Zero size file downloaded', 'geodirectory' ); |
|
| 1706 | - } |
|
| 1707 | - |
|
| 1708 | - if ( $log_message ) {
|
|
| 1709 | - $del = unlink( $upload['file'] ); |
|
| 1710 | - if ( ! $del ) {
|
|
| 1711 | - geodir_error_log( __( 'GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory' ) ); |
|
| 1700 | + elseif ($headers['response']['code'] != '200') {
|
|
| 1701 | + $log_message = sprintf(__('Remote server returned error response %1$d %2$s', 'geodirectory'), esc_html($headers['response']), get_status_header_desc($headers['response']));
|
|
| 1702 | + } elseif (isset($headers['headers']['content-length']) && $filesize != $headers['headers']['content-length']) {
|
|
| 1703 | + $log_message = __('Remote file is incorrect size', 'geodirectory');
|
|
| 1704 | + } elseif (0 == $filesize) {
|
|
| 1705 | + $log_message = __('Zero size file downloaded', 'geodirectory');
|
|
| 1706 | + } |
|
| 1707 | + |
|
| 1708 | + if ($log_message) {
|
|
| 1709 | + $del = unlink($upload['file']); |
|
| 1710 | + if (!$del) {
|
|
| 1711 | + geodir_error_log(__('GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory'));
|
|
| 1712 | 1712 | } |
| 1713 | 1713 | |
| 1714 | - return new WP_Error( 'import_file_error', $log_message ); |
|
| 1714 | + return new WP_Error('import_file_error', $log_message);
|
|
| 1715 | 1715 | } |
| 1716 | 1716 | |
| 1717 | - if ( $dummy && $add_to_cache && is_array( $upload ) ) {
|
|
| 1718 | - $images = get_transient( 'cached_dummy_images' ); |
|
| 1719 | - if ( is_array( $images ) ) {
|
|
| 1720 | - $images[ $key ] = $upload; |
|
| 1717 | + if ($dummy && $add_to_cache && is_array($upload)) {
|
|
| 1718 | + $images = get_transient('cached_dummy_images');
|
|
| 1719 | + if (is_array($images)) {
|
|
| 1720 | + $images[$key] = $upload; |
|
| 1721 | 1721 | } else {
|
| 1722 | - $images = array( $key => $upload ); |
|
| 1722 | + $images = array($key => $upload); |
|
| 1723 | 1723 | } |
| 1724 | 1724 | |
| 1725 | 1725 | //setting the cache using the WP Transient API |
| 1726 | - set_transient( 'cached_dummy_images', $images, 60 * 10 ); //10 minutes cache |
|
| 1726 | + set_transient('cached_dummy_images', $images, 60 * 10); //10 minutes cache
|
|
| 1727 | 1727 | } |
| 1728 | 1728 | |
| 1729 | 1729 | return $upload; |
@@ -1737,12 +1737,12 @@ discard block |
||
| 1737 | 1737 | * @return string|void Max upload size. |
| 1738 | 1738 | */ |
| 1739 | 1739 | function geodir_max_upload_size() {
|
| 1740 | - $max_filesize = (float) get_option( 'geodir_upload_max_filesize', 2 ); |
|
| 1740 | + $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);
|
|
| 1741 | 1741 | |
| 1742 | - if ( $max_filesize > 0 && $max_filesize < 1 ) {
|
|
| 1743 | - $max_filesize = (int) ( $max_filesize * 1024 ) . 'kb'; |
|
| 1742 | + if ($max_filesize > 0 && $max_filesize < 1) {
|
|
| 1743 | + $max_filesize = (int) ($max_filesize * 1024).'kb'; |
|
| 1744 | 1744 | } else {
|
| 1745 | - $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb'; |
|
| 1745 | + $max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb'; |
|
| 1746 | 1746 | } |
| 1747 | 1747 | |
| 1748 | 1748 | /** |
@@ -1752,7 +1752,7 @@ discard block |
||
| 1752 | 1752 | * |
| 1753 | 1753 | * @param string $max_filesize Max file upload size. Ex. 10mb, 512kb. |
| 1754 | 1754 | */ |
| 1755 | - return apply_filters( 'geodir_default_image_upload_size_limit', $max_filesize ); |
|
| 1755 | + return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
|
|
| 1756 | 1756 | } |
| 1757 | 1757 | |
| 1758 | 1758 | /** |
@@ -1765,8 +1765,8 @@ discard block |
||
| 1765 | 1765 | * @return bool If dummy folder exists returns true, else false. |
| 1766 | 1766 | */ |
| 1767 | 1767 | function geodir_dummy_folder_exists() {
|
| 1768 | - $path = geodir_plugin_path() . '/geodirectory-admin/dummy/'; |
|
| 1769 | - if ( ! is_dir( $path ) ) {
|
|
| 1768 | + $path = geodir_plugin_path().'/geodirectory-admin/dummy/'; |
|
| 1769 | + if (!is_dir($path)) {
|
|
| 1770 | 1770 | return false; |
| 1771 | 1771 | } else {
|
| 1772 | 1772 | return true; |
@@ -1785,17 +1785,17 @@ discard block |
||
| 1785 | 1785 | * |
| 1786 | 1786 | * @return object Author info. |
| 1787 | 1787 | */ |
| 1788 | -function geodir_get_author_info( $aid ) {
|
|
| 1788 | +function geodir_get_author_info($aid) {
|
|
| 1789 | 1789 | global $wpdb; |
| 1790 | 1790 | /*$infosql = "select * from $wpdb->users where ID=$aid";*/ |
| 1791 | - $infosql = $wpdb->prepare( "select * from $wpdb->users where ID=%d", array( $aid ) ); |
|
| 1792 | - $info = $wpdb->get_results( $infosql ); |
|
| 1793 | - if ( $info ) {
|
|
| 1791 | + $infosql = $wpdb->prepare("select * from $wpdb->users where ID=%d", array($aid));
|
|
| 1792 | + $info = $wpdb->get_results($infosql); |
|
| 1793 | + if ($info) {
|
|
| 1794 | 1794 | return $info[0]; |
| 1795 | 1795 | } |
| 1796 | 1796 | } |
| 1797 | 1797 | |
| 1798 | -if ( ! function_exists( 'adminEmail' ) ) {
|
|
| 1798 | +if (!function_exists('adminEmail')) {
|
|
| 1799 | 1799 | /** |
| 1800 | 1800 | * Send emails to client on post submission, renew etc. |
| 1801 | 1801 | * |
@@ -1808,67 +1808,67 @@ discard block |
||
| 1808 | 1808 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1809 | 1809 | * @param string $custom_1 Custom data to be sent. |
| 1810 | 1810 | */ |
| 1811 | - function adminEmail( $page_id, $user_id, $message_type, $custom_1 = '' ) {
|
|
| 1811 | + function adminEmail($page_id, $user_id, $message_type, $custom_1 = '') {
|
|
| 1812 | 1812 | global $wpdb; |
| 1813 | - if ( $message_type == 'expiration' ) {
|
|
| 1814 | - $subject = stripslashes( __( get_option( 'renew_email_subject' ), 'geodirectory' ) ); |
|
| 1815 | - $client_message = stripslashes( __( get_option( 'renew_email_content' ), 'geodirectory' ) ); |
|
| 1816 | - } elseif ( $message_type == 'post_submited' ) {
|
|
| 1817 | - $subject = __( get_option( 'post_submited_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1818 | - $client_message = __( get_option( 'post_submited_success_email_content_admin' ), 'geodirectory' ); |
|
| 1819 | - } elseif ( $message_type == 'renew' ) {
|
|
| 1820 | - $subject = __( get_option( 'post_renew_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1821 | - $client_message = __( get_option( 'post_renew_success_email_content_admin' ), 'geodirectory' ); |
|
| 1822 | - } elseif ( $message_type == 'upgrade' ) {
|
|
| 1823 | - $subject = __( get_option( 'post_upgrade_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1824 | - $client_message = __( get_option( 'post_upgrade_success_email_content_admin' ), 'geodirectory' ); |
|
| 1825 | - } elseif ( $message_type == 'claim_approved' ) {
|
|
| 1826 | - $subject = __( get_option( 'claim_approved_email_subject' ), 'geodirectory' ); |
|
| 1827 | - $client_message = __( get_option( 'claim_approved_email_content' ), 'geodirectory' ); |
|
| 1828 | - } elseif ( $message_type == 'claim_rejected' ) {
|
|
| 1829 | - $subject = __( get_option( 'claim_rejected_email_subject' ), 'geodirectory' ); |
|
| 1830 | - $client_message = __( get_option( 'claim_rejected_email_content' ), 'geodirectory' ); |
|
| 1831 | - } elseif ( $message_type == 'claim_requested' ) {
|
|
| 1832 | - $subject = __( get_option( 'claim_email_subject_admin' ), 'geodirectory' ); |
|
| 1833 | - $client_message = __( get_option( 'claim_email_content_admin' ), 'geodirectory' ); |
|
| 1834 | - } elseif ( $message_type == 'auto_claim' ) {
|
|
| 1835 | - $subject = __( get_option( 'auto_claim_email_subject' ), 'geodirectory' ); |
|
| 1836 | - $client_message = __( get_option( 'auto_claim_email_content' ), 'geodirectory' ); |
|
| 1837 | - } elseif ( $message_type == 'payment_success' ) {
|
|
| 1838 | - $subject = __( get_option( 'post_payment_success_admin_email_subject' ), 'geodirectory' ); |
|
| 1839 | - $client_message = __( get_option( 'post_payment_success_admin_email_content' ), 'geodirectory' ); |
|
| 1840 | - } elseif ( $message_type == 'payment_fail' ) {
|
|
| 1841 | - $subject = __( get_option( 'post_payment_fail_admin_email_subject' ), 'geodirectory' ); |
|
| 1842 | - $client_message = __( get_option( 'post_payment_fail_admin_email_content' ), 'geodirectory' ); |
|
| 1813 | + if ($message_type == 'expiration') {
|
|
| 1814 | + $subject = stripslashes(__(get_option('renew_email_subject'), 'geodirectory'));
|
|
| 1815 | + $client_message = stripslashes(__(get_option('renew_email_content'), 'geodirectory'));
|
|
| 1816 | + } elseif ($message_type == 'post_submited') {
|
|
| 1817 | + $subject = __(get_option('post_submited_success_email_subject_admin'), 'geodirectory');
|
|
| 1818 | + $client_message = __(get_option('post_submited_success_email_content_admin'), 'geodirectory');
|
|
| 1819 | + } elseif ($message_type == 'renew') {
|
|
| 1820 | + $subject = __(get_option('post_renew_success_email_subject_admin'), 'geodirectory');
|
|
| 1821 | + $client_message = __(get_option('post_renew_success_email_content_admin'), 'geodirectory');
|
|
| 1822 | + } elseif ($message_type == 'upgrade') {
|
|
| 1823 | + $subject = __(get_option('post_upgrade_success_email_subject_admin'), 'geodirectory');
|
|
| 1824 | + $client_message = __(get_option('post_upgrade_success_email_content_admin'), 'geodirectory');
|
|
| 1825 | + } elseif ($message_type == 'claim_approved') {
|
|
| 1826 | + $subject = __(get_option('claim_approved_email_subject'), 'geodirectory');
|
|
| 1827 | + $client_message = __(get_option('claim_approved_email_content'), 'geodirectory');
|
|
| 1828 | + } elseif ($message_type == 'claim_rejected') {
|
|
| 1829 | + $subject = __(get_option('claim_rejected_email_subject'), 'geodirectory');
|
|
| 1830 | + $client_message = __(get_option('claim_rejected_email_content'), 'geodirectory');
|
|
| 1831 | + } elseif ($message_type == 'claim_requested') {
|
|
| 1832 | + $subject = __(get_option('claim_email_subject_admin'), 'geodirectory');
|
|
| 1833 | + $client_message = __(get_option('claim_email_content_admin'), 'geodirectory');
|
|
| 1834 | + } elseif ($message_type == 'auto_claim') {
|
|
| 1835 | + $subject = __(get_option('auto_claim_email_subject'), 'geodirectory');
|
|
| 1836 | + $client_message = __(get_option('auto_claim_email_content'), 'geodirectory');
|
|
| 1837 | + } elseif ($message_type == 'payment_success') {
|
|
| 1838 | + $subject = __(get_option('post_payment_success_admin_email_subject'), 'geodirectory');
|
|
| 1839 | + $client_message = __(get_option('post_payment_success_admin_email_content'), 'geodirectory');
|
|
| 1840 | + } elseif ($message_type == 'payment_fail') {
|
|
| 1841 | + $subject = __(get_option('post_payment_fail_admin_email_subject'), 'geodirectory');
|
|
| 1842 | + $client_message = __(get_option('post_payment_fail_admin_email_content'), 'geodirectory');
|
|
| 1843 | 1843 | } |
| 1844 | 1844 | $transaction_details = $custom_1; |
| 1845 | - $fromEmail = get_option( 'site_email' ); |
|
| 1845 | + $fromEmail = get_option('site_email');
|
|
| 1846 | 1846 | $fromEmailName = get_site_emailName(); |
| 1847 | 1847 | //$alivedays = get_post_meta($page_id,'alive_days',true); |
| 1848 | - $pkg_limit = get_property_price_info_listing( $page_id ); |
|
| 1848 | + $pkg_limit = get_property_price_info_listing($page_id); |
|
| 1849 | 1849 | $alivedays = $pkg_limit['days']; |
| 1850 | - $productlink = get_permalink( $page_id ); |
|
| 1851 | - $post_info = get_post( $page_id ); |
|
| 1852 | - $post_date = date( 'dS F,Y', strtotime( $post_info->post_date ) ); |
|
| 1853 | - $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>'; |
|
| 1850 | + $productlink = get_permalink($page_id); |
|
| 1851 | + $post_info = get_post($page_id); |
|
| 1852 | + $post_date = date('dS F,Y', strtotime($post_info->post_date));
|
|
| 1853 | + $listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>'; |
|
| 1854 | 1854 | $loginurl = geodir_login_url(); |
| 1855 | - $loginurl_link = '<a href="' . $loginurl . '">login</a>'; |
|
| 1855 | + $loginurl_link = '<a href="'.$loginurl.'">login</a>'; |
|
| 1856 | 1856 | $siteurl = home_url(); |
| 1857 | - $siteurl_link = '<a href="' . $siteurl . '">' . $fromEmailName . '</a>'; |
|
| 1858 | - $user_info = get_userdata( $user_id ); |
|
| 1857 | + $siteurl_link = '<a href="'.$siteurl.'">'.$fromEmailName.'</a>'; |
|
| 1858 | + $user_info = get_userdata($user_id); |
|
| 1859 | 1859 | $user_email = $user_info->user_email; |
| 1860 | - $display_name = geodir_get_client_name( $user_id ); |
|
| 1860 | + $display_name = geodir_get_client_name($user_id); |
|
| 1861 | 1861 | $user_login = $user_info->user_login; |
| 1862 | - $number_of_grace_days = get_option( 'ptthemes_listing_preexpiry_notice_days' ); |
|
| 1863 | - if ( $number_of_grace_days == '' ) {
|
|
| 1862 | + $number_of_grace_days = get_option('ptthemes_listing_preexpiry_notice_days');
|
|
| 1863 | + if ($number_of_grace_days == '') {
|
|
| 1864 | 1864 | $number_of_grace_days = 1; |
| 1865 | 1865 | } |
| 1866 | - if ( $post_info->post_type == 'event' ) {
|
|
| 1866 | + if ($post_info->post_type == 'event') {
|
|
| 1867 | 1867 | $post_type = 'event'; |
| 1868 | 1868 | } else {
|
| 1869 | 1869 | $post_type = 'listing'; |
| 1870 | 1870 | } |
| 1871 | - $renew_link = '<a href="' . $siteurl . '?ptype=post_' . $post_type . '&renew=1&pid=' . $page_id . '">' . RENEW_LINK . '</a>'; |
|
| 1871 | + $renew_link = '<a href="'.$siteurl.'?ptype=post_'.$post_type.'&renew=1&pid='.$page_id.'">'.RENEW_LINK.'</a>'; |
|
| 1872 | 1872 | $search_array = array( |
| 1873 | 1873 | '[#client_name#]', |
| 1874 | 1874 | '[#listing_link#]', |
@@ -1884,7 +1884,7 @@ discard block |
||
| 1884 | 1884 | '[#site_name#]', |
| 1885 | 1885 | '[#transaction_details#]' |
| 1886 | 1886 | ); |
| 1887 | - $replace_array = array( |
|
| 1887 | + $replace_array = array( |
|
| 1888 | 1888 | $display_name, |
| 1889 | 1889 | $listingLink, |
| 1890 | 1890 | $post_date, |
@@ -1899,13 +1899,13 @@ discard block |
||
| 1899 | 1899 | $fromEmailName, |
| 1900 | 1900 | $transaction_details |
| 1901 | 1901 | ); |
| 1902 | - $client_message = str_replace( $search_array, $replace_array, $client_message ); |
|
| 1903 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 1902 | + $client_message = str_replace($search_array, $replace_array, $client_message); |
|
| 1903 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 1904 | 1904 | |
| 1905 | 1905 | |
| 1906 | - $headers = array(); |
|
| 1906 | + $headers = array(); |
|
| 1907 | 1907 | $headers[] = 'Content-type: text/html; charset=UTF-8'; |
| 1908 | - $headers[] = 'From: ' . $fromEmailName . ' <' . $fromEmail . '>'; |
|
| 1908 | + $headers[] = 'From: '.$fromEmailName.' <'.$fromEmail.'>'; |
|
| 1909 | 1909 | |
| 1910 | 1910 | $to = $fromEmail; |
| 1911 | 1911 | $message = $client_message; |
@@ -1923,7 +1923,7 @@ discard block |
||
| 1923 | 1923 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1924 | 1924 | * @param string $custom_1 Custom data to be sent. |
| 1925 | 1925 | */ |
| 1926 | - $to = apply_filters( 'geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1926 | + $to = apply_filters('geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1927 | 1927 | /** |
| 1928 | 1928 | * Filter the admin email subject. |
| 1929 | 1929 | * |
@@ -1936,7 +1936,7 @@ discard block |
||
| 1936 | 1936 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1937 | 1937 | * @param string $custom_1 Custom data to be sent. |
| 1938 | 1938 | */ |
| 1939 | - $subject = apply_filters( 'geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1939 | + $subject = apply_filters('geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1940 | 1940 | /** |
| 1941 | 1941 | * Filter the admin email message. |
| 1942 | 1942 | * |
@@ -1949,7 +1949,7 @@ discard block |
||
| 1949 | 1949 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1950 | 1950 | * @param string $custom_1 Custom data to be sent. |
| 1951 | 1951 | */ |
| 1952 | - $message = apply_filters( 'geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1952 | + $message = apply_filters('geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1953 | 1953 | /** |
| 1954 | 1954 | * Filter the admin email headers. |
| 1955 | 1955 | * |
@@ -1962,22 +1962,22 @@ discard block |
||
| 1962 | 1962 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1963 | 1963 | * @param string $custom_1 Custom data to be sent. |
| 1964 | 1964 | */ |
| 1965 | - $headers = apply_filters( 'geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1965 | + $headers = apply_filters('geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1966 | 1966 | |
| 1967 | 1967 | |
| 1968 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1969 | - if ( ! $sent ) {
|
|
| 1970 | - if ( is_array( $to ) ) {
|
|
| 1971 | - $to = implode( ',', $to ); |
|
| 1968 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1969 | + if (!$sent) {
|
|
| 1970 | + if (is_array($to)) {
|
|
| 1971 | + $to = implode(',', $to);
|
|
| 1972 | 1972 | } |
| 1973 | 1973 | $log_message = sprintf( |
| 1974 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1974 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1975 | 1975 | $message_type, |
| 1976 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1976 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1977 | 1977 | $to, |
| 1978 | 1978 | $subject |
| 1979 | 1979 | ); |
| 1980 | - geodir_error_log( $log_message ); |
|
| 1980 | + geodir_error_log($log_message); |
|
| 1981 | 1981 | } |
| 1982 | 1982 | } |
| 1983 | 1983 | } |
@@ -1997,12 +1997,12 @@ discard block |
||
| 1997 | 1997 | * |
| 1998 | 1998 | * @return array Category IDs. |
| 1999 | 1999 | */ |
| 2000 | -function gd_lang_object_ids( $ids_array, $type ) {
|
|
| 2001 | - if ( function_exists( 'icl_object_id' ) ) {
|
|
| 2000 | +function gd_lang_object_ids($ids_array, $type) {
|
|
| 2001 | + if (function_exists('icl_object_id')) {
|
|
| 2002 | 2002 | $res = array(); |
| 2003 | - foreach ( $ids_array as $id ) {
|
|
| 2004 | - $xlat = icl_object_id( $id, $type, false ); |
|
| 2005 | - if ( ! is_null( $xlat ) ) {
|
|
| 2003 | + foreach ($ids_array as $id) {
|
|
| 2004 | + $xlat = icl_object_id($id, $type, false); |
|
| 2005 | + if (!is_null($xlat)) {
|
|
| 2006 | 2006 | $res[] = $xlat; |
| 2007 | 2007 | } |
| 2008 | 2008 | } |
@@ -2026,20 +2026,20 @@ discard block |
||
| 2026 | 2026 | * |
| 2027 | 2027 | * @return array Modified Body CSS classes. |
| 2028 | 2028 | */ |
| 2029 | -function geodir_custom_posts_body_class( $classes ) {
|
|
| 2029 | +function geodir_custom_posts_body_class($classes) {
|
|
| 2030 | 2030 | global $wpdb, $wp; |
| 2031 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 2032 | - if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {
|
|
| 2031 | + $post_types = geodir_get_posttypes('object');
|
|
| 2032 | + if (!empty($post_types) && count((array) $post_types) > 1) {
|
|
| 2033 | 2033 | $classes[] = 'geodir_custom_posts'; |
| 2034 | 2034 | } |
| 2035 | 2035 | |
| 2036 | 2036 | // fix body class for signup page |
| 2037 | - if ( geodir_is_page( 'login' ) ) {
|
|
| 2037 | + if (geodir_is_page('login')) {
|
|
| 2038 | 2038 | $new_classes = array(); |
| 2039 | 2039 | $new_classes[] = 'signup page-geodir-signup'; |
| 2040 | - if ( ! empty( $classes ) ) {
|
|
| 2041 | - foreach ( $classes as $class ) {
|
|
| 2042 | - if ( $class && $class != 'home' && $class != 'blog' ) {
|
|
| 2040 | + if (!empty($classes)) {
|
|
| 2041 | + foreach ($classes as $class) {
|
|
| 2042 | + if ($class && $class != 'home' && $class != 'blog') {
|
|
| 2043 | 2043 | $new_classes[] = $class; |
| 2044 | 2044 | } |
| 2045 | 2045 | } |
@@ -2047,14 +2047,14 @@ discard block |
||
| 2047 | 2047 | $classes = $new_classes; |
| 2048 | 2048 | } |
| 2049 | 2049 | |
| 2050 | - if ( geodir_is_geodir_page() ) {
|
|
| 2050 | + if (geodir_is_geodir_page()) {
|
|
| 2051 | 2051 | $classes[] = 'geodir-page'; |
| 2052 | 2052 | } |
| 2053 | 2053 | |
| 2054 | 2054 | return $classes; |
| 2055 | 2055 | } |
| 2056 | 2056 | |
| 2057 | -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 |
|
| 2057 | +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
|
|
| 2058 | 2058 | |
| 2059 | 2059 | |
| 2060 | 2060 | /** |
@@ -2070,7 +2070,7 @@ discard block |
||
| 2070 | 2070 | * |
| 2071 | 2071 | * @since 1.0.0 |
| 2072 | 2072 | */ |
| 2073 | - return apply_filters( 'geodir_map_zoom_level', array( |
|
| 2073 | + return apply_filters('geodir_map_zoom_level', array(
|
|
| 2074 | 2074 | 1, |
| 2075 | 2075 | 2, |
| 2076 | 2076 | 3, |
@@ -2090,7 +2090,7 @@ discard block |
||
| 2090 | 2090 | 17, |
| 2091 | 2091 | 18, |
| 2092 | 2092 | 19 |
| 2093 | - ) ); |
|
| 2093 | + )); |
|
| 2094 | 2094 | |
| 2095 | 2095 | } |
| 2096 | 2096 | |
@@ -2103,12 +2103,12 @@ discard block |
||
| 2103 | 2103 | * |
| 2104 | 2104 | * @param string $geodir_option_name Option key. |
| 2105 | 2105 | */ |
| 2106 | -function geodir_option_version_backup( $geodir_option_name ) {
|
|
| 2106 | +function geodir_option_version_backup($geodir_option_name) {
|
|
| 2107 | 2107 | $version_date = time(); |
| 2108 | - $geodir_option = get_option( $geodir_option_name ); |
|
| 2108 | + $geodir_option = get_option($geodir_option_name); |
|
| 2109 | 2109 | |
| 2110 | - if ( ! empty( $geodir_option ) ) {
|
|
| 2111 | - add_option( $geodir_option_name . '_' . $version_date, $geodir_option ); |
|
| 2110 | + if (!empty($geodir_option)) {
|
|
| 2111 | + add_option($geodir_option_name.'_'.$version_date, $geodir_option); |
|
| 2112 | 2112 | } |
| 2113 | 2113 | } |
| 2114 | 2114 | |
@@ -2122,10 +2122,10 @@ discard block |
||
| 2122 | 2122 | * |
| 2123 | 2123 | * @return int Page ID. |
| 2124 | 2124 | */ |
| 2125 | -function get_page_id_geodir_add_listing_page( $page_id ) {
|
|
| 2126 | - if ( geodir_wpml_multilingual_status() ) {
|
|
| 2125 | +function get_page_id_geodir_add_listing_page($page_id) {
|
|
| 2126 | + if (geodir_wpml_multilingual_status()) {
|
|
| 2127 | 2127 | $post_type = 'post_page'; |
| 2128 | - $page_id = geodir_get_wpml_element_id( $page_id, $post_type ); |
|
| 2128 | + $page_id = geodir_get_wpml_element_id($page_id, $post_type); |
|
| 2129 | 2129 | } |
| 2130 | 2130 | |
| 2131 | 2131 | return $page_id; |
@@ -2139,7 +2139,7 @@ discard block |
||
| 2139 | 2139 | * @return bool Returns true when sitepress multilingual CMS active. else returns false. |
| 2140 | 2140 | */ |
| 2141 | 2141 | function geodir_wpml_multilingual_status() {
|
| 2142 | - if ( function_exists( 'icl_object_id' ) ) {
|
|
| 2142 | + if (function_exists('icl_object_id')) {
|
|
| 2143 | 2143 | return true; |
| 2144 | 2144 | } |
| 2145 | 2145 | |
@@ -2157,19 +2157,19 @@ discard block |
||
| 2157 | 2157 | * |
| 2158 | 2158 | * @return int Element ID when exists. Else the page id. |
| 2159 | 2159 | */ |
| 2160 | -function geodir_get_wpml_element_id( $page_id, $post_type ) {
|
|
| 2160 | +function geodir_get_wpml_element_id($page_id, $post_type) {
|
|
| 2161 | 2161 | global $sitepress; |
| 2162 | - if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {
|
|
| 2163 | - $trid = $sitepress->get_element_trid( $page_id, $post_type ); |
|
| 2162 | + if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {
|
|
| 2163 | + $trid = $sitepress->get_element_trid($page_id, $post_type); |
|
| 2164 | 2164 | |
| 2165 | - if ( $trid > 0 ) {
|
|
| 2166 | - $translations = $sitepress->get_element_translations( $trid, $post_type ); |
|
| 2165 | + if ($trid > 0) {
|
|
| 2166 | + $translations = $sitepress->get_element_translations($trid, $post_type); |
|
| 2167 | 2167 | |
| 2168 | 2168 | $lang = $sitepress->get_current_language(); |
| 2169 | 2169 | $lang = $lang ? $lang : $sitepress->get_default_language(); |
| 2170 | 2170 | |
| 2171 | - if ( ! empty( $translations ) && ! empty( $lang ) && isset( $translations[ $lang ] ) && isset( $translations[ $lang ]->element_id ) && ! empty( $translations[ $lang ]->element_id ) ) {
|
|
| 2172 | - $page_id = $translations[ $lang ]->element_id; |
|
| 2171 | + if (!empty($translations) && !empty($lang) && isset($translations[$lang]) && isset($translations[$lang]->element_id) && !empty($translations[$lang]->element_id)) {
|
|
| 2172 | + $page_id = $translations[$lang]->element_id; |
|
| 2173 | 2173 | } |
| 2174 | 2174 | } |
| 2175 | 2175 | } |
@@ -2186,15 +2186,15 @@ discard block |
||
| 2186 | 2186 | */ |
| 2187 | 2187 | function geodir_wpml_check_element_id() {
|
| 2188 | 2188 | global $sitepress; |
| 2189 | - if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {
|
|
| 2189 | + if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {
|
|
| 2190 | 2190 | $el_type = 'post_page'; |
| 2191 | - $el_id = get_option( 'geodir_add_listing_page' ); |
|
| 2191 | + $el_id = get_option('geodir_add_listing_page');
|
|
| 2192 | 2192 | $default_lang = $sitepress->get_default_language(); |
| 2193 | - $el_details = $sitepress->get_element_language_details( $el_id, $el_type ); |
|
| 2193 | + $el_details = $sitepress->get_element_language_details($el_id, $el_type); |
|
| 2194 | 2194 | |
| 2195 | - if ( ! ( $el_id > 0 && $default_lang && ! empty( $el_details ) && isset( $el_details->language_code ) && $el_details->language_code == $default_lang ) ) {
|
|
| 2196 | - if ( ! $el_details->source_language_code ) {
|
|
| 2197 | - $sitepress->set_element_language_details( $el_id, $el_type, '', $default_lang ); |
|
| 2195 | + if (!($el_id > 0 && $default_lang && !empty($el_details) && isset($el_details->language_code) && $el_details->language_code == $default_lang)) {
|
|
| 2196 | + if (!$el_details->source_language_code) {
|
|
| 2197 | + $sitepress->set_element_language_details($el_id, $el_type, '', $default_lang); |
|
| 2198 | 2198 | $sitepress->icl_translations_cache->clear(); |
| 2199 | 2199 | } |
| 2200 | 2200 | } |
@@ -2213,41 +2213,41 @@ discard block |
||
| 2213 | 2213 | * |
| 2214 | 2214 | * @return string Orderby SQL. |
| 2215 | 2215 | */ |
| 2216 | -function geodir_widget_listings_get_order( $query_args ) {
|
|
| 2216 | +function geodir_widget_listings_get_order($query_args) {
|
|
| 2217 | 2217 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2218 | 2218 | |
| 2219 | 2219 | $query_args = $gd_query_args_widgets; |
| 2220 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2221 | - return $wpdb->posts . ".post_date DESC, "; |
|
| 2220 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2221 | + return $wpdb->posts.".post_date DESC, "; |
|
| 2222 | 2222 | } |
| 2223 | 2223 | |
| 2224 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2225 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2224 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2225 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2226 | 2226 | |
| 2227 | - $sort_by = ! empty( $query_args['order_by'] ) ? $query_args['order_by'] : ''; |
|
| 2227 | + $sort_by = !empty($query_args['order_by']) ? $query_args['order_by'] : ''; |
|
| 2228 | 2228 | |
| 2229 | - switch ( $sort_by ) {
|
|
| 2229 | + switch ($sort_by) {
|
|
| 2230 | 2230 | case 'latest': |
| 2231 | 2231 | case 'newest': |
| 2232 | - $orderby = $wpdb->posts . ".post_date DESC, "; |
|
| 2232 | + $orderby = $wpdb->posts.".post_date DESC, "; |
|
| 2233 | 2233 | break; |
| 2234 | 2234 | case 'featured': |
| 2235 | - $orderby = $table . ".is_featured ASC, ". $wpdb->posts . ".post_date DESC, "; |
|
| 2235 | + $orderby = $table.".is_featured ASC, ".$wpdb->posts.".post_date DESC, "; |
|
| 2236 | 2236 | break; |
| 2237 | 2237 | case 'az': |
| 2238 | - $orderby = $wpdb->posts . ".post_title ASC, "; |
|
| 2238 | + $orderby = $wpdb->posts.".post_title ASC, "; |
|
| 2239 | 2239 | break; |
| 2240 | 2240 | case 'high_review': |
| 2241 | - $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
| 2241 | + $orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, "; |
|
| 2242 | 2242 | break; |
| 2243 | 2243 | case 'high_rating': |
| 2244 | - $orderby = "( " . $table . ".overall_rating ) DESC, "; |
|
| 2244 | + $orderby = "( ".$table.".overall_rating ) DESC, "; |
|
| 2245 | 2245 | break; |
| 2246 | 2246 | case 'random': |
| 2247 | 2247 | $orderby = "RAND(), "; |
| 2248 | 2248 | break; |
| 2249 | 2249 | default: |
| 2250 | - $orderby = $wpdb->posts . ".post_title ASC, "; |
|
| 2250 | + $orderby = $wpdb->posts.".post_title ASC, "; |
|
| 2251 | 2251 | break; |
| 2252 | 2252 | } |
| 2253 | 2253 | |
@@ -2270,15 +2270,15 @@ discard block |
||
| 2270 | 2270 | * |
| 2271 | 2271 | * @return mixed Result object. |
| 2272 | 2272 | */ |
| 2273 | -function geodir_get_widget_listings( $query_args = array(), $count_only = false ) {
|
|
| 2273 | +function geodir_get_widget_listings($query_args = array(), $count_only = false) {
|
|
| 2274 | 2274 | global $wpdb, $plugin_prefix, $table_prefix; |
| 2275 | 2275 | $GLOBALS['gd_query_args_widgets'] = $query_args; |
| 2276 | 2276 | $gd_query_args_widgets = $query_args; |
| 2277 | 2277 | |
| 2278 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2279 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2278 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2279 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2280 | 2280 | |
| 2281 | - $fields = $wpdb->posts . ".*, " . $table . ".*"; |
|
| 2281 | + $fields = $wpdb->posts.".*, ".$table.".*"; |
|
| 2282 | 2282 | /** |
| 2283 | 2283 | * Filter widget listing fields string part that is being used for query. |
| 2284 | 2284 | * |
@@ -2288,17 +2288,17 @@ discard block |
||
| 2288 | 2288 | * @param string $table Table name. |
| 2289 | 2289 | * @param string $post_type Post type. |
| 2290 | 2290 | */ |
| 2291 | - $fields = apply_filters( 'geodir_filter_widget_listings_fields', $fields, $table, $post_type ); |
|
| 2291 | + $fields = apply_filters('geodir_filter_widget_listings_fields', $fields, $table, $post_type);
|
|
| 2292 | 2292 | |
| 2293 | - $join = "INNER JOIN " . $table . " ON (" . $table . ".post_id = " . $wpdb->posts . ".ID)";
|
|
| 2293 | + $join = "INNER JOIN ".$table." ON (".$table.".post_id = ".$wpdb->posts.".ID)";
|
|
| 2294 | 2294 | |
| 2295 | 2295 | ########### WPML ########### |
| 2296 | 2296 | |
| 2297 | - if ( function_exists( 'icl_object_id' ) ) {
|
|
| 2297 | + if (function_exists('icl_object_id')) {
|
|
| 2298 | 2298 | global $sitepress; |
| 2299 | 2299 | $lang_code = ICL_LANGUAGE_CODE; |
| 2300 | - if ( $lang_code ) {
|
|
| 2301 | - $join .= " JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 2300 | + if ($lang_code) {
|
|
| 2301 | + $join .= " JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID"; |
|
| 2302 | 2302 | } |
| 2303 | 2303 | } |
| 2304 | 2304 | |
@@ -2312,15 +2312,15 @@ discard block |
||
| 2312 | 2312 | * @param string $join Join clause string. |
| 2313 | 2313 | * @param string $post_type Post type. |
| 2314 | 2314 | */ |
| 2315 | - $join = apply_filters( 'geodir_filter_widget_listings_join', $join, $post_type ); |
|
| 2315 | + $join = apply_filters('geodir_filter_widget_listings_join', $join, $post_type);
|
|
| 2316 | 2316 | |
| 2317 | - $post_status = is_super_admin() ? " OR " . $wpdb->posts . ".post_status = 'private'" : ''; |
|
| 2317 | + $post_status = is_super_admin() ? " OR ".$wpdb->posts.".post_status = 'private'" : ''; |
|
| 2318 | 2318 | |
| 2319 | - $where = " AND ( " . $wpdb->posts . ".post_status = 'publish' " . $post_status . " ) AND " . $wpdb->posts . ".post_type = '" . $post_type . "'"; |
|
| 2319 | + $where = " AND ( ".$wpdb->posts.".post_status = 'publish' ".$post_status." ) AND ".$wpdb->posts.".post_type = '".$post_type."'"; |
|
| 2320 | 2320 | |
| 2321 | 2321 | ########### WPML ########### |
| 2322 | - if ( function_exists( 'icl_object_id' ) ) {
|
|
| 2323 | - if ( $lang_code ) {
|
|
| 2322 | + if (function_exists('icl_object_id')) {
|
|
| 2323 | + if ($lang_code) {
|
|
| 2324 | 2324 | $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type = 'post_$post_type' "; |
| 2325 | 2325 | } |
| 2326 | 2326 | } |
@@ -2333,8 +2333,8 @@ discard block |
||
| 2333 | 2333 | * @param string $where Where clause string. |
| 2334 | 2334 | * @param string $post_type Post type. |
| 2335 | 2335 | */ |
| 2336 | - $where = apply_filters( 'geodir_filter_widget_listings_where', $where, $post_type ); |
|
| 2337 | - $where = $where != '' ? " WHERE 1=1 " . $where : ''; |
|
| 2336 | + $where = apply_filters('geodir_filter_widget_listings_where', $where, $post_type);
|
|
| 2337 | + $where = $where != '' ? " WHERE 1=1 ".$where : ''; |
|
| 2338 | 2338 | |
| 2339 | 2339 | $groupby = " GROUP BY $wpdb->posts.ID "; //@todo is this needed? faster withotu |
| 2340 | 2340 | /** |
@@ -2345,15 +2345,15 @@ discard block |
||
| 2345 | 2345 | * @param string $groupby Group by clause string. |
| 2346 | 2346 | * @param string $post_type Post type. |
| 2347 | 2347 | */ |
| 2348 | - $groupby = apply_filters( 'geodir_filter_widget_listings_groupby', $groupby, $post_type ); |
|
| 2348 | + $groupby = apply_filters('geodir_filter_widget_listings_groupby', $groupby, $post_type);
|
|
| 2349 | 2349 | |
| 2350 | - if ( $count_only ) {
|
|
| 2351 | - $sql = "SELECT COUNT(DISTINCT " . $wpdb->posts . ".ID) AS total FROM " . $wpdb->posts . " |
|
| 2352 | - " . $join . " |
|
| 2350 | + if ($count_only) {
|
|
| 2351 | + $sql = "SELECT COUNT(DISTINCT ".$wpdb->posts.".ID) AS total FROM ".$wpdb->posts." |
|
| 2352 | + " . $join." |
|
| 2353 | 2353 | " . $where; |
| 2354 | - $rows = (int) $wpdb->get_var( $sql ); |
|
| 2354 | + $rows = (int) $wpdb->get_var($sql); |
|
| 2355 | 2355 | } else {
|
| 2356 | - $orderby = geodir_widget_listings_get_order( $query_args ); |
|
| 2356 | + $orderby = geodir_widget_listings_get_order($query_args); |
|
| 2357 | 2357 | /** |
| 2358 | 2358 | * Filter widget listing orderby clause string part that is being used for query. |
| 2359 | 2359 | * |
@@ -2363,11 +2363,11 @@ discard block |
||
| 2363 | 2363 | * @param string $table Table name. |
| 2364 | 2364 | * @param string $post_type Post type. |
| 2365 | 2365 | */ |
| 2366 | - $orderby = apply_filters( 'geodir_filter_widget_listings_orderby', $orderby, $table, $post_type ); |
|
| 2367 | - $orderby .= $wpdb->posts . ".post_title ASC"; |
|
| 2368 | - $orderby = $orderby != '' ? " ORDER BY " . $orderby : ''; |
|
| 2366 | + $orderby = apply_filters('geodir_filter_widget_listings_orderby', $orderby, $table, $post_type);
|
|
| 2367 | + $orderby .= $wpdb->posts.".post_title ASC"; |
|
| 2368 | + $orderby = $orderby != '' ? " ORDER BY ".$orderby : ''; |
|
| 2369 | 2369 | |
| 2370 | - $limit = ! empty( $query_args['posts_per_page'] ) ? $query_args['posts_per_page'] : 5; |
|
| 2370 | + $limit = !empty($query_args['posts_per_page']) ? $query_args['posts_per_page'] : 5; |
|
| 2371 | 2371 | /** |
| 2372 | 2372 | * Filter widget listing limit that is being used for query. |
| 2373 | 2373 | * |
@@ -2376,27 +2376,27 @@ discard block |
||
| 2376 | 2376 | * @param int $limit Query results limit. |
| 2377 | 2377 | * @param string $post_type Post type. |
| 2378 | 2378 | */ |
| 2379 | - $limit = apply_filters( 'geodir_filter_widget_listings_limit', $limit, $post_type ); |
|
| 2379 | + $limit = apply_filters('geodir_filter_widget_listings_limit', $limit, $post_type);
|
|
| 2380 | 2380 | |
| 2381 | - $page = ! empty( $query_args['pageno'] ) ? absint( $query_args['pageno'] ) : 1; |
|
| 2382 | - if ( ! $page ) {
|
|
| 2381 | + $page = !empty($query_args['pageno']) ? absint($query_args['pageno']) : 1; |
|
| 2382 | + if (!$page) {
|
|
| 2383 | 2383 | $page = 1; |
| 2384 | 2384 | } |
| 2385 | 2385 | |
| 2386 | - $limit = (int) $limit > 0 ? " LIMIT " . absint( ( $page - 1 ) * (int) $limit ) . ", " . (int) $limit : ""; |
|
| 2386 | + $limit = (int) $limit > 0 ? " LIMIT ".absint(($page - 1) * (int) $limit).", ".(int) $limit : ""; |
|
| 2387 | 2387 | |
| 2388 | 2388 | //@todo removed SQL_CALC_FOUND_ROWS from below as don't think it is needed and query is faster without |
| 2389 | - $sql = "SELECT " . $fields . " FROM " . $wpdb->posts . " |
|
| 2390 | - " . $join . " |
|
| 2391 | - " . $where . " |
|
| 2392 | - " . $groupby . " |
|
| 2393 | - " . $orderby . " |
|
| 2389 | + $sql = "SELECT ".$fields." FROM ".$wpdb->posts." |
|
| 2390 | + " . $join." |
|
| 2391 | + " . $where." |
|
| 2392 | + " . $groupby." |
|
| 2393 | + " . $orderby." |
|
| 2394 | 2394 | " . $limit; |
| 2395 | - $rows = $wpdb->get_results( $sql ); |
|
| 2395 | + $rows = $wpdb->get_results($sql); |
|
| 2396 | 2396 | } |
| 2397 | 2397 | |
| 2398 | - unset( $GLOBALS['gd_query_args_widgets'] ); |
|
| 2399 | - unset( $gd_query_args_widgets ); |
|
| 2398 | + unset($GLOBALS['gd_query_args_widgets']); |
|
| 2399 | + unset($gd_query_args_widgets); |
|
| 2400 | 2400 | |
| 2401 | 2401 | return $rows; |
| 2402 | 2402 | } |
@@ -2413,11 +2413,11 @@ discard block |
||
| 2413 | 2413 | * |
| 2414 | 2414 | * @return string Modified fields SQL. |
| 2415 | 2415 | */ |
| 2416 | -function geodir_function_widget_listings_fields( $fields ) {
|
|
| 2416 | +function geodir_function_widget_listings_fields($fields) {
|
|
| 2417 | 2417 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2418 | 2418 | |
| 2419 | 2419 | $query_args = $gd_query_args_widgets; |
| 2420 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2420 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2421 | 2421 | return $fields; |
| 2422 | 2422 | } |
| 2423 | 2423 | |
@@ -2436,24 +2436,24 @@ discard block |
||
| 2436 | 2436 | * |
| 2437 | 2437 | * @return string Modified join clause SQL. |
| 2438 | 2438 | */ |
| 2439 | -function geodir_function_widget_listings_join( $join ) {
|
|
| 2439 | +function geodir_function_widget_listings_join($join) {
|
|
| 2440 | 2440 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2441 | 2441 | |
| 2442 | 2442 | $query_args = $gd_query_args_widgets; |
| 2443 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2443 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2444 | 2444 | return $join; |
| 2445 | 2445 | } |
| 2446 | 2446 | |
| 2447 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2448 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2447 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2448 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2449 | 2449 | |
| 2450 | - if ( ! empty( $query_args['with_pics_only'] ) ) {
|
|
| 2451 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 2450 | + if (!empty($query_args['with_pics_only'])) {
|
|
| 2451 | + $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )"; |
|
| 2452 | 2452 | } |
| 2453 | 2453 | |
| 2454 | - if ( ! empty( $query_args['tax_query'] ) ) {
|
|
| 2455 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); |
|
| 2456 | - if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
|
|
| 2454 | + if (!empty($query_args['tax_query'])) {
|
|
| 2455 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); |
|
| 2456 | + if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
|
|
| 2457 | 2457 | $join .= $tax_queries['join']; |
| 2458 | 2458 | } |
| 2459 | 2459 | } |
@@ -2473,49 +2473,49 @@ discard block |
||
| 2473 | 2473 | * |
| 2474 | 2474 | * @return string Modified where clause SQL. |
| 2475 | 2475 | */ |
| 2476 | -function geodir_function_widget_listings_where( $where ) {
|
|
| 2476 | +function geodir_function_widget_listings_where($where) {
|
|
| 2477 | 2477 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2478 | 2478 | |
| 2479 | 2479 | $query_args = $gd_query_args_widgets; |
| 2480 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2480 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2481 | 2481 | return $where; |
| 2482 | 2482 | } |
| 2483 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2484 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2483 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2484 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2485 | 2485 | |
| 2486 | - if ( ! empty( $query_args ) ) {
|
|
| 2487 | - if ( ! empty( $query_args['gd_location'] ) && function_exists( 'geodir_default_location_where' ) ) {
|
|
| 2488 | - $where = geodir_default_location_where( $where, $table ); |
|
| 2486 | + if (!empty($query_args)) {
|
|
| 2487 | + if (!empty($query_args['gd_location']) && function_exists('geodir_default_location_where')) {
|
|
| 2488 | + $where = geodir_default_location_where($where, $table); |
|
| 2489 | 2489 | } |
| 2490 | 2490 | |
| 2491 | - if ( ! empty( $query_args['post_author'] ) ) {
|
|
| 2492 | - $where .= " AND " . $wpdb->posts . ".post_author = " . (int) $query_args['post_author']; |
|
| 2491 | + if (!empty($query_args['post_author'])) {
|
|
| 2492 | + $where .= " AND ".$wpdb->posts.".post_author = ".(int) $query_args['post_author']; |
|
| 2493 | 2493 | } |
| 2494 | 2494 | |
| 2495 | - if ( ! empty( $query_args['show_featured_only'] ) ) {
|
|
| 2496 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 2495 | + if (!empty($query_args['show_featured_only'])) {
|
|
| 2496 | + $where .= " AND ".$table.".is_featured = '1'"; |
|
| 2497 | 2497 | } |
| 2498 | 2498 | |
| 2499 | - if ( ! empty( $query_args['show_special_only'] ) ) {
|
|
| 2500 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 2499 | + if (!empty($query_args['show_special_only'])) {
|
|
| 2500 | + $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )"; |
|
| 2501 | 2501 | } |
| 2502 | 2502 | |
| 2503 | - if ( ! empty( $query_args['with_pics_only'] ) ) {
|
|
| 2504 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL "; |
|
| 2503 | + if (!empty($query_args['with_pics_only'])) {
|
|
| 2504 | + $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL "; |
|
| 2505 | 2505 | } |
| 2506 | 2506 | |
| 2507 | - if ( ! empty( $query_args['featured_image_only'] ) ) {
|
|
| 2508 | - $where .= " AND " . $table . ".featured_image IS NOT NULL AND " . $table . ".featured_image!='' "; |
|
| 2507 | + if (!empty($query_args['featured_image_only'])) {
|
|
| 2508 | + $where .= " AND ".$table.".featured_image IS NOT NULL AND ".$table.".featured_image!='' "; |
|
| 2509 | 2509 | } |
| 2510 | 2510 | |
| 2511 | - if ( ! empty( $query_args['with_videos_only'] ) ) {
|
|
| 2512 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 2511 | + if (!empty($query_args['with_videos_only'])) {
|
|
| 2512 | + $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )"; |
|
| 2513 | 2513 | } |
| 2514 | 2514 | |
| 2515 | - if ( ! empty( $query_args['tax_query'] ) ) {
|
|
| 2516 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); |
|
| 2515 | + if (!empty($query_args['tax_query'])) {
|
|
| 2516 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); |
|
| 2517 | 2517 | |
| 2518 | - if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
|
|
| 2518 | + if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
|
|
| 2519 | 2519 | $where .= $tax_queries['where']; |
| 2520 | 2520 | } |
| 2521 | 2521 | } |
@@ -2536,11 +2536,11 @@ discard block |
||
| 2536 | 2536 | * |
| 2537 | 2537 | * @return string Modified orderby clause SQL. |
| 2538 | 2538 | */ |
| 2539 | -function geodir_function_widget_listings_orderby( $orderby ) {
|
|
| 2539 | +function geodir_function_widget_listings_orderby($orderby) {
|
|
| 2540 | 2540 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2541 | 2541 | |
| 2542 | 2542 | $query_args = $gd_query_args_widgets; |
| 2543 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2543 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2544 | 2544 | return $orderby; |
| 2545 | 2545 | } |
| 2546 | 2546 | |
@@ -2559,15 +2559,15 @@ discard block |
||
| 2559 | 2559 | * |
| 2560 | 2560 | * @return int Query limit. |
| 2561 | 2561 | */ |
| 2562 | -function geodir_function_widget_listings_limit( $limit ) {
|
|
| 2562 | +function geodir_function_widget_listings_limit($limit) {
|
|
| 2563 | 2563 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2564 | 2564 | |
| 2565 | 2565 | $query_args = $gd_query_args_widgets; |
| 2566 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2566 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2567 | 2567 | return $limit; |
| 2568 | 2568 | } |
| 2569 | 2569 | |
| 2570 | - if ( ! empty( $query_args ) && ! empty( $query_args['posts_per_page'] ) ) {
|
|
| 2570 | + if (!empty($query_args) && !empty($query_args['posts_per_page'])) {
|
|
| 2571 | 2571 | $limit = (int) $query_args['posts_per_page']; |
| 2572 | 2572 | } |
| 2573 | 2573 | |
@@ -2585,12 +2585,12 @@ discard block |
||
| 2585 | 2585 | * |
| 2586 | 2586 | * @return int Large size width. |
| 2587 | 2587 | */ |
| 2588 | -function geodir_media_image_large_width( $default = 800, $params = '' ) {
|
|
| 2589 | - $large_size_w = get_option( 'large_size_w' ); |
|
| 2588 | +function geodir_media_image_large_width($default = 800, $params = '') {
|
|
| 2589 | + $large_size_w = get_option('large_size_w');
|
|
| 2590 | 2590 | $large_size_w = $large_size_w > 0 ? $large_size_w : $default; |
| 2591 | - $large_size_w = absint( $large_size_w ); |
|
| 2591 | + $large_size_w = absint($large_size_w); |
|
| 2592 | 2592 | |
| 2593 | - if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
|
|
| 2593 | + if (!get_option('geodir_use_wp_media_large_size')) {
|
|
| 2594 | 2594 | $large_size_w = 800; |
| 2595 | 2595 | } |
| 2596 | 2596 | |
@@ -2603,7 +2603,7 @@ discard block |
||
| 2603 | 2603 | * @param int $default Default width. |
| 2604 | 2604 | * @param string|array $params Image parameters. |
| 2605 | 2605 | */ |
| 2606 | - $large_size_w = apply_filters( 'geodir_filter_media_image_large_width', $large_size_w, $default, $params ); |
|
| 2606 | + $large_size_w = apply_filters('geodir_filter_media_image_large_width', $large_size_w, $default, $params);
|
|
| 2607 | 2607 | |
| 2608 | 2608 | return $large_size_w; |
| 2609 | 2609 | } |
@@ -2619,12 +2619,12 @@ discard block |
||
| 2619 | 2619 | * |
| 2620 | 2620 | * @return int Large size height. |
| 2621 | 2621 | */ |
| 2622 | -function geodir_media_image_large_height( $default = 800, $params = '' ) {
|
|
| 2623 | - $large_size_h = get_option( 'large_size_h' ); |
|
| 2622 | +function geodir_media_image_large_height($default = 800, $params = '') {
|
|
| 2623 | + $large_size_h = get_option('large_size_h');
|
|
| 2624 | 2624 | $large_size_h = $large_size_h > 0 ? $large_size_h : $default; |
| 2625 | - $large_size_h = absint( $large_size_h ); |
|
| 2625 | + $large_size_h = absint($large_size_h); |
|
| 2626 | 2626 | |
| 2627 | - if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
|
|
| 2627 | + if (!get_option('geodir_use_wp_media_large_size')) {
|
|
| 2628 | 2628 | $large_size_h = 800; |
| 2629 | 2629 | } |
| 2630 | 2630 | |
@@ -2637,7 +2637,7 @@ discard block |
||
| 2637 | 2637 | * @param int $default Default height. |
| 2638 | 2638 | * @param string|array $params Image parameters. |
| 2639 | 2639 | */ |
| 2640 | - $large_size_h = apply_filters( 'geodir_filter_media_image_large_height', $large_size_h, $default, $params ); |
|
| 2640 | + $large_size_h = apply_filters('geodir_filter_media_image_large_height', $large_size_h, $default, $params);
|
|
| 2641 | 2641 | |
| 2642 | 2642 | return $large_size_h; |
| 2643 | 2643 | } |
@@ -2654,8 +2654,8 @@ discard block |
||
| 2654 | 2654 | * |
| 2655 | 2655 | * @return string Sanitized name. |
| 2656 | 2656 | */ |
| 2657 | -function geodir_sanitize_location_name( $type, $name, $translate = true ) {
|
|
| 2658 | - if ( $name == '' ) {
|
|
| 2657 | +function geodir_sanitize_location_name($type, $name, $translate = true) {
|
|
| 2658 | + if ($name == '') {
|
|
| 2659 | 2659 | return null; |
| 2660 | 2660 | } |
| 2661 | 2661 | |
@@ -2664,13 +2664,13 @@ discard block |
||
| 2664 | 2664 | $type = $type == 'gd_city' ? 'city' : $type; |
| 2665 | 2665 | |
| 2666 | 2666 | $return = $name; |
| 2667 | - if ( function_exists( 'get_actual_location_name' ) ) {
|
|
| 2668 | - $return = get_actual_location_name( $type, $name, $translate ); |
|
| 2667 | + if (function_exists('get_actual_location_name')) {
|
|
| 2668 | + $return = get_actual_location_name($type, $name, $translate); |
|
| 2669 | 2669 | } else {
|
| 2670 | - $return = preg_replace( '/-(\d+)$/', '', $return ); |
|
| 2671 | - $return = preg_replace( '/[_-]/', ' ', $return ); |
|
| 2672 | - $return = geodir_ucwords( $return ); |
|
| 2673 | - $return = $translate ? __( $return, 'geodirectory' ) : $return; |
|
| 2670 | + $return = preg_replace('/-(\d+)$/', '', $return);
|
|
| 2671 | + $return = preg_replace('/[_-]/', ' ', $return);
|
|
| 2672 | + $return = geodir_ucwords($return); |
|
| 2673 | + $return = $translate ? __($return, 'geodirectory') : $return; |
|
| 2674 | 2674 | } |
| 2675 | 2675 | |
| 2676 | 2676 | return $return; |
@@ -2688,26 +2688,26 @@ discard block |
||
| 2688 | 2688 | * |
| 2689 | 2689 | * @param int $number Comments number. |
| 2690 | 2690 | */ |
| 2691 | -function geodir_comments_number( $number ) {
|
|
| 2691 | +function geodir_comments_number($number) {
|
|
| 2692 | 2692 | global $post; |
| 2693 | 2693 | |
| 2694 | - if ( !empty( $post->post_type ) && geodir_cpt_has_rating_disabled( $post->post_type ) ) {
|
|
| 2694 | + if (!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type)) {
|
|
| 2695 | 2695 | $number = get_comments_number(); |
| 2696 | 2696 | |
| 2697 | - if ( $number > 1 ) {
|
|
| 2698 | - $output = str_replace( '%', number_format_i18n( $number ), __( '% Comments', 'geodirectory' ) ); |
|
| 2699 | - } elseif ( $number == 0 || $number == '' ) {
|
|
| 2700 | - $output = __( 'No Comments', 'geodirectory' ); |
|
| 2697 | + if ($number > 1) {
|
|
| 2698 | + $output = str_replace('%', number_format_i18n($number), __('% Comments', 'geodirectory'));
|
|
| 2699 | + } elseif ($number == 0 || $number == '') {
|
|
| 2700 | + $output = __('No Comments', 'geodirectory');
|
|
| 2701 | 2701 | } else { // must be one
|
| 2702 | - $output = __( '1 Comment', 'geodirectory' ); |
|
| 2702 | + $output = __('1 Comment', 'geodirectory');
|
|
| 2703 | 2703 | } |
| 2704 | 2704 | } else {
|
| 2705 | - if ( $number > 1 ) {
|
|
| 2706 | - $output = str_replace( '%', number_format_i18n( $number ), __( '% Reviews', 'geodirectory' ) ); |
|
| 2707 | - } elseif ( $number == 0 || $number == '' ) {
|
|
| 2708 | - $output = __( 'No Reviews', 'geodirectory' ); |
|
| 2705 | + if ($number > 1) {
|
|
| 2706 | + $output = str_replace('%', number_format_i18n($number), __('% Reviews', 'geodirectory'));
|
|
| 2707 | + } elseif ($number == 0 || $number == '') {
|
|
| 2708 | + $output = __('No Reviews', 'geodirectory');
|
|
| 2709 | 2709 | } else { // must be one
|
| 2710 | - $output = __( '1 Review', 'geodirectory' ); |
|
| 2710 | + $output = __('1 Review', 'geodirectory');
|
|
| 2711 | 2711 | } |
| 2712 | 2712 | } |
| 2713 | 2713 | |
@@ -2724,18 +2724,18 @@ discard block |
||
| 2724 | 2724 | */ |
| 2725 | 2725 | function is_page_geodir_home() {
|
| 2726 | 2726 | global $wpdb; |
| 2727 | - $cur_url = str_replace( array( "https://", "http://", "www." ), array( '', '', '' ), geodir_curPageURL() ); |
|
| 2728 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 2729 | - remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
| 2727 | + $cur_url = str_replace(array("https://", "http://", "www."), array('', '', ''), geodir_curPageURL());
|
|
| 2728 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 2729 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 2730 | 2730 | } |
| 2731 | - $home_url = home_url( '', 'http' ); |
|
| 2732 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 2733 | - add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
| 2731 | + $home_url = home_url('', 'http');
|
|
| 2732 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 2733 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 2734 | 2734 | } |
| 2735 | - $home_url = str_replace( "www.", "", $home_url ); |
|
| 2736 | - 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' ) ) ) {
|
|
| 2735 | + $home_url = str_replace("www.", "", $home_url);
|
|
| 2736 | + if ((strpos($home_url, $cur_url) !== false || strpos($home_url.'/', $cur_url) !== false) && ('page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page'))) {
|
|
| 2737 | 2737 | return true; |
| 2738 | - } 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' ) ) {
|
|
| 2738 | + } 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')) {
|
|
| 2739 | 2739 | return true; |
| 2740 | 2740 | } else {
|
| 2741 | 2741 | return false; |
@@ -2755,18 +2755,18 @@ discard block |
||
| 2755 | 2755 | * |
| 2756 | 2756 | * @return string The canonical URL. |
| 2757 | 2757 | */ |
| 2758 | -function geodir_wpseo_homepage_canonical( $url ) {
|
|
| 2758 | +function geodir_wpseo_homepage_canonical($url) {
|
|
| 2759 | 2759 | global $post; |
| 2760 | 2760 | |
| 2761 | - if ( is_page_geodir_home() ) {
|
|
| 2761 | + if (is_page_geodir_home()) {
|
|
| 2762 | 2762 | return home_url(); |
| 2763 | 2763 | } |
| 2764 | 2764 | |
| 2765 | 2765 | return $url; |
| 2766 | 2766 | } |
| 2767 | 2767 | |
| 2768 | -add_filter( 'wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10 ); |
|
| 2769 | -add_filter( 'aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10 ); |
|
| 2768 | +add_filter('wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10);
|
|
| 2769 | +add_filter('aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10);
|
|
| 2770 | 2770 | |
| 2771 | 2771 | /** |
| 2772 | 2772 | * Add extra fields to google maps script call. |
@@ -2779,20 +2779,20 @@ discard block |
||
| 2779 | 2779 | * |
| 2780 | 2780 | * @return string Modified extra string. |
| 2781 | 2781 | */ |
| 2782 | -function geodir_googlemap_script_extra_details_page( $extra ) {
|
|
| 2782 | +function geodir_googlemap_script_extra_details_page($extra) {
|
|
| 2783 | 2783 | global $post; |
| 2784 | 2784 | $add_google_places_api = false; |
| 2785 | - if ( isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {
|
|
| 2785 | + if (isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
|
|
| 2786 | 2786 | $add_google_places_api = true; |
| 2787 | 2787 | } |
| 2788 | - if ( ! str_replace( 'libraries=places', '', $extra ) && ( geodir_is_page( 'detail' ) || $add_google_places_api ) ) {
|
|
| 2788 | + if (!str_replace('libraries=places', '', $extra) && (geodir_is_page('detail') || $add_google_places_api)) {
|
|
| 2789 | 2789 | $extra .= "&libraries=places"; |
| 2790 | 2790 | } |
| 2791 | 2791 | |
| 2792 | 2792 | return $extra; |
| 2793 | 2793 | } |
| 2794 | 2794 | |
| 2795 | -add_filter( 'geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1 ); |
|
| 2795 | +add_filter('geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1);
|
|
| 2796 | 2796 | |
| 2797 | 2797 | |
| 2798 | 2798 | /** |
@@ -2810,104 +2810,104 @@ discard block |
||
| 2810 | 2810 | * after_widget. |
| 2811 | 2811 | * @param array|string $instance The settings for the particular instance of the widget. |
| 2812 | 2812 | */ |
| 2813 | -function geodir_popular_post_category_output( $args = '', $instance = '' ) {
|
|
| 2813 | +function geodir_popular_post_category_output($args = '', $instance = '') {
|
|
| 2814 | 2814 | // prints the widget |
| 2815 | 2815 | global $wpdb, $plugin_prefix, $geodir_post_category_str; |
| 2816 | - extract( $args, EXTR_SKIP ); |
|
| 2816 | + extract($args, EXTR_SKIP); |
|
| 2817 | 2817 | |
| 2818 | 2818 | echo $before_widget; |
| 2819 | 2819 | |
| 2820 | 2820 | /** This filter is documented in geodirectory_widgets.php */ |
| 2821 | - $title = empty( $instance['title'] ) ? __( 'Popular Categories', 'geodirectory' ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 2821 | + $title = empty($instance['title']) ? __('Popular Categories', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 2822 | 2822 | |
| 2823 | 2823 | $gd_post_type = geodir_get_current_posttype(); |
| 2824 | 2824 | |
| 2825 | - $category_limit = isset( $instance['category_limit'] ) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; |
|
| 2825 | + $category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; |
|
| 2826 | 2826 | if (!isset($category_restrict)) {
|
| 2827 | 2827 | $category_restrict = false; |
| 2828 | 2828 | } |
| 2829 | - if ( ! empty( $gd_post_type ) ) {
|
|
| 2829 | + if (!empty($gd_post_type)) {
|
|
| 2830 | 2830 | $default_post_type = $gd_post_type; |
| 2831 | - } elseif ( isset( $instance['default_post_type'] ) && gdsc_is_post_type_valid( $instance['default_post_type'] ) ) {
|
|
| 2831 | + } elseif (isset($instance['default_post_type']) && gdsc_is_post_type_valid($instance['default_post_type'])) {
|
|
| 2832 | 2832 | $default_post_type = $instance['default_post_type']; |
| 2833 | 2833 | } else {
|
| 2834 | 2834 | $all_gd_post_type = geodir_get_posttypes(); |
| 2835 | - $default_post_type = ( isset( $all_gd_post_type[0] ) ) ? $all_gd_post_type[0] : ''; |
|
| 2835 | + $default_post_type = (isset($all_gd_post_type[0])) ? $all_gd_post_type[0] : ''; |
|
| 2836 | 2836 | } |
| 2837 | - $parent_only = !empty( $instance['parent_only'] ) ? true : false; |
|
| 2837 | + $parent_only = !empty($instance['parent_only']) ? true : false; |
|
| 2838 | 2838 | |
| 2839 | 2839 | $taxonomy = array(); |
| 2840 | - if ( ! empty( $gd_post_type ) ) {
|
|
| 2841 | - $taxonomy[] = $gd_post_type . "category"; |
|
| 2840 | + if (!empty($gd_post_type)) {
|
|
| 2841 | + $taxonomy[] = $gd_post_type."category"; |
|
| 2842 | 2842 | } else {
|
| 2843 | - $taxonomy = geodir_get_taxonomies( $gd_post_type ); |
|
| 2843 | + $taxonomy = geodir_get_taxonomies($gd_post_type); |
|
| 2844 | 2844 | } |
| 2845 | 2845 | |
| 2846 | 2846 | $taxonomy = apply_filters('geodir_pp_category_taxonomy', $taxonomy);
|
| 2847 | 2847 | |
| 2848 | - $term_args = array( 'taxonomy' => $taxonomy ); |
|
| 2849 | - if ( $parent_only ) {
|
|
| 2848 | + $term_args = array('taxonomy' => $taxonomy);
|
|
| 2849 | + if ($parent_only) {
|
|
| 2850 | 2850 | $term_args['parent'] = 0; |
| 2851 | 2851 | } |
| 2852 | 2852 | |
| 2853 | - $terms = get_terms( $term_args ); |
|
| 2853 | + $terms = get_terms($term_args); |
|
| 2854 | 2854 | $a_terms = array(); |
| 2855 | 2855 | $b_terms = array(); |
| 2856 | 2856 | |
| 2857 | - foreach ( $terms as $term ) {
|
|
| 2858 | - if ( $term->count > 0 ) {
|
|
| 2859 | - $a_terms[ $term->taxonomy ][] = $term; |
|
| 2857 | + foreach ($terms as $term) {
|
|
| 2858 | + if ($term->count > 0) {
|
|
| 2859 | + $a_terms[$term->taxonomy][] = $term; |
|
| 2860 | 2860 | } |
| 2861 | 2861 | } |
| 2862 | 2862 | |
| 2863 | - if ( ! empty( $a_terms ) ) {
|
|
| 2864 | - foreach ( $a_terms as $b_key => $b_val ) {
|
|
| 2865 | - $b_terms[ $b_key ] = geodir_sort_terms( $b_val, 'count' ); |
|
| 2863 | + if (!empty($a_terms)) {
|
|
| 2864 | + foreach ($a_terms as $b_key => $b_val) {
|
|
| 2865 | + $b_terms[$b_key] = geodir_sort_terms($b_val, 'count'); |
|
| 2866 | 2866 | } |
| 2867 | 2867 | |
| 2868 | - $default_taxonomy = $default_post_type != '' && isset( $b_terms[ $default_post_type . 'category' ] ) ? $default_post_type . 'category' : ''; |
|
| 2868 | + $default_taxonomy = $default_post_type != '' && isset($b_terms[$default_post_type.'category']) ? $default_post_type.'category' : ''; |
|
| 2869 | 2869 | |
| 2870 | 2870 | $tax_change_output = ''; |
| 2871 | - if ( count( $b_terms ) > 1 ) {
|
|
| 2872 | - $tax_change_output .= "<select data-limit='$category_limit' data-parent='" . (int)$parent_only . "' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; |
|
| 2873 | - foreach ( $b_terms as $key => $val ) {
|
|
| 2874 | - $ptype = get_post_type_object( str_replace( "category", "", $key ) ); |
|
| 2875 | - $cpt_name = __( $ptype->labels->singular_name, 'geodirectory' ); |
|
| 2876 | - $tax_change_output .= "<option value='$key' " . selected( $key, $default_taxonomy, false ) . ">" . sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name ) . "</option>"; |
|
| 2871 | + if (count($b_terms) > 1) {
|
|
| 2872 | + $tax_change_output .= "<select data-limit='$category_limit' data-parent='".(int) $parent_only."' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; |
|
| 2873 | + foreach ($b_terms as $key => $val) {
|
|
| 2874 | + $ptype = get_post_type_object(str_replace("category", "", $key));
|
|
| 2875 | + $cpt_name = __($ptype->labels->singular_name, 'geodirectory'); |
|
| 2876 | + $tax_change_output .= "<option value='$key' ".selected($key, $default_taxonomy, false).">".sprintf(__('%s Categories', 'geodirectory'), $cpt_name)."</option>";
|
|
| 2877 | 2877 | } |
| 2878 | 2878 | $tax_change_output .= "</select>"; |
| 2879 | 2879 | } |
| 2880 | 2880 | |
| 2881 | - if ( ! empty( $b_terms ) ) {
|
|
| 2882 | - $terms = $default_taxonomy != '' && isset( $b_terms[ $default_taxonomy ] ) ? $b_terms[ $default_taxonomy ] : reset( $b_terms );// get the first array |
|
| 2883 | - global $cat_count;//make global so we can change via function |
|
| 2881 | + if (!empty($b_terms)) {
|
|
| 2882 | + $terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms); // get the first array |
|
| 2883 | + global $cat_count; //make global so we can change via function |
|
| 2884 | 2884 | $cat_count = 0; |
| 2885 | 2885 | ?> |
| 2886 | 2886 | <div class="geodir-category-list-in clearfix"> |
| 2887 | 2887 | <div class="geodir-cat-list clearfix"> |
| 2888 | 2888 | <?php |
| 2889 | - echo $before_title . __( $title ) . $after_title; |
|
| 2889 | + echo $before_title.__($title).$after_title; |
|
| 2890 | 2890 | |
| 2891 | 2891 | echo $tax_change_output; |
| 2892 | 2892 | |
| 2893 | 2893 | echo '<ul class="geodir-popular-cat-list">'; |
| 2894 | 2894 | |
| 2895 | - geodir_helper_cat_list_output( $terms, $category_limit, $category_restrict); |
|
| 2895 | + geodir_helper_cat_list_output($terms, $category_limit, $category_restrict); |
|
| 2896 | 2896 | |
| 2897 | 2897 | echo '</ul>'; |
| 2898 | 2898 | ?> |
| 2899 | 2899 | </div> |
| 2900 | 2900 | <?php |
| 2901 | 2901 | $hide = ''; |
| 2902 | - if ( $cat_count < $category_limit ) {
|
|
| 2902 | + if ($cat_count < $category_limit) {
|
|
| 2903 | 2903 | $hide = 'style="display:none;"'; |
| 2904 | 2904 | } |
| 2905 | 2905 | echo "<div class='geodir-cat-list-more' $hide >"; |
| 2906 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">' . __( 'More Categories', 'geodirectory' ) . '</a>'; |
|
| 2907 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">' . __( 'Less Categories', 'geodirectory' ) . '</a>'; |
|
| 2906 | + echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">'.__('More Categories', 'geodirectory').'</a>';
|
|
| 2907 | + echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">'.__('Less Categories', 'geodirectory').'</a>';
|
|
| 2908 | 2908 | echo "</div>"; |
| 2909 | 2909 | /* add scripts */ |
| 2910 | - add_action( 'wp_footer', 'geodir_popular_category_add_scripts', 100 ); |
|
| 2910 | + add_action('wp_footer', 'geodir_popular_category_add_scripts', 100);
|
|
| 2911 | 2911 | ?> |
| 2912 | 2912 | </div> |
| 2913 | 2913 | <?php |
@@ -2927,28 +2927,28 @@ discard block |
||
| 2927 | 2927 | * @param int $category_limit Number of categories to display by default. |
| 2928 | 2928 | * @param bool $category_restrict If the cat limit shoudl be hidden or not shown. |
| 2929 | 2929 | */ |
| 2930 | -function geodir_helper_cat_list_output( $terms, $category_limit , $category_restrict=false) {
|
|
| 2930 | +function geodir_helper_cat_list_output($terms, $category_limit, $category_restrict = false) {
|
|
| 2931 | 2931 | global $geodir_post_category_str, $cat_count; |
| 2932 | 2932 | $term_icons = geodir_get_term_icon(); |
| 2933 | 2933 | |
| 2934 | 2934 | $geodir_post_category_str = array(); |
| 2935 | 2935 | |
| 2936 | 2936 | |
| 2937 | - foreach ( $terms as $cat ) {
|
|
| 2938 | - $post_type = str_replace( "category", "", $cat->taxonomy ); |
|
| 2939 | - $term_icon_url = ! empty( $term_icons ) && isset( $term_icons[ $cat->term_id ] ) ? $term_icons[ $cat->term_id ] : ''; |
|
| 2937 | + foreach ($terms as $cat) {
|
|
| 2938 | + $post_type = str_replace("category", "", $cat->taxonomy);
|
|
| 2939 | + $term_icon_url = !empty($term_icons) && isset($term_icons[$cat->term_id]) ? $term_icons[$cat->term_id] : ''; |
|
| 2940 | 2940 | |
| 2941 | - $cat_count ++; |
|
| 2941 | + $cat_count++; |
|
| 2942 | 2942 | |
| 2943 | - $geodir_post_category_str[] = array( 'posttype' => $post_type, 'termid' => $cat->term_id ); |
|
| 2943 | + $geodir_post_category_str[] = array('posttype' => $post_type, 'termid' => $cat->term_id);
|
|
| 2944 | 2944 | |
| 2945 | - $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; |
|
| 2946 | - if($category_restrict && $cat_count > $category_limit ){
|
|
| 2945 | + $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; |
|
| 2946 | + if ($category_restrict && $cat_count > $category_limit) {
|
|
| 2947 | 2947 | continue; |
| 2948 | 2948 | } |
| 2949 | 2949 | $total_post = $cat->count; |
| 2950 | 2950 | |
| 2951 | - $term_link = get_term_link( $cat, $cat->taxonomy ); |
|
| 2951 | + $term_link = get_term_link($cat, $cat->taxonomy); |
|
| 2952 | 2952 | /** |
| 2953 | 2953 | * Filer the category term link. |
| 2954 | 2954 | * |
@@ -2958,11 +2958,11 @@ discard block |
||
| 2958 | 2958 | * @param int $cat ->term_id The term id. |
| 2959 | 2959 | * @param string $post_type Wordpress post type. |
| 2960 | 2960 | */ |
| 2961 | - $term_link = apply_filters( 'geodir_category_term_link', $term_link, $cat->term_id, $post_type ); |
|
| 2961 | + $term_link = apply_filters('geodir_category_term_link', $term_link, $cat->term_id, $post_type);
|
|
| 2962 | 2962 | |
| 2963 | - echo '<li class="' . $class_row . '"><a href="' . $term_link . '">'; |
|
| 2964 | - echo '<img alt="' . esc_attr( $cat->name ) . ' icon" style="height:20px;vertical-align:middle;" src="' . $term_icon_url . '"/> <span class="cat-link">'; |
|
| 2965 | - echo $cat->name . '</span> <span class="geodir_term_class geodir_link_span geodir_category_class_' . $post_type . '_' . $cat->term_id . '">(' . $total_post . ')</span> ';
|
|
| 2963 | + echo '<li class="'.$class_row.'"><a href="'.$term_link.'">'; |
|
| 2964 | + echo '<img alt="'.esc_attr($cat->name).' icon" style="height:20px;vertical-align:middle;" src="'.$term_icon_url.'"/> <span class="cat-link">'; |
|
| 2965 | + echo $cat->name.'</span> <span class="geodir_term_class geodir_link_span geodir_category_class_'.$post_type.'_'.$cat->term_id.'">('.$total_post.')</span> ';
|
|
| 2966 | 2966 | echo '</a></li>'; |
| 2967 | 2967 | } |
| 2968 | 2968 | } |
@@ -2977,14 +2977,14 @@ discard block |
||
| 2977 | 2977 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. |
| 2978 | 2978 | * @param array|string $instance The settings for the particular instance of the widget. |
| 2979 | 2979 | */ |
| 2980 | -function geodir_listing_slider_widget_output( $args = '', $instance = '' ) {
|
|
| 2980 | +function geodir_listing_slider_widget_output($args = '', $instance = '') {
|
|
| 2981 | 2981 | // prints the widget |
| 2982 | - extract( $args, EXTR_SKIP ); |
|
| 2982 | + extract($args, EXTR_SKIP); |
|
| 2983 | 2983 | |
| 2984 | 2984 | echo $before_widget; |
| 2985 | 2985 | |
| 2986 | 2986 | /** This filter is documented in geodirectory_widgets.php */ |
| 2987 | - $title = empty( $instance['title'] ) ? '' : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 2987 | + $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 2988 | 2988 | /** |
| 2989 | 2989 | * Filter the widget post type. |
| 2990 | 2990 | * |
@@ -2992,7 +2992,7 @@ discard block |
||
| 2992 | 2992 | * |
| 2993 | 2993 | * @param string $instance ['post_type'] Post type of listing. |
| 2994 | 2994 | */ |
| 2995 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); |
|
| 2995 | + $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
|
|
| 2996 | 2996 | /** |
| 2997 | 2997 | * Filter the widget's term. |
| 2998 | 2998 | * |
@@ -3000,7 +3000,7 @@ discard block |
||
| 3000 | 3000 | * |
| 3001 | 3001 | * @param string $instance ['category'] Filter by term. Can be any valid term. |
| 3002 | 3002 | */ |
| 3003 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); |
|
| 3003 | + $category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
|
|
| 3004 | 3004 | /** |
| 3005 | 3005 | * Filter widget's "add_location_filter" value. |
| 3006 | 3006 | * |
@@ -3008,7 +3008,7 @@ discard block |
||
| 3008 | 3008 | * |
| 3009 | 3009 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. |
| 3010 | 3010 | */ |
| 3011 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); |
|
| 3011 | + $add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
|
|
| 3012 | 3012 | /** |
| 3013 | 3013 | * Filter the widget listings limit. |
| 3014 | 3014 | * |
@@ -3016,7 +3016,7 @@ discard block |
||
| 3016 | 3016 | * |
| 3017 | 3017 | * @param string $instance ['post_number'] Number of listings to display. |
| 3018 | 3018 | */ |
| 3019 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); |
|
| 3019 | + $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
|
|
| 3020 | 3020 | /** |
| 3021 | 3021 | * Filter the widget listings limit shown at one time. |
| 3022 | 3022 | * |
@@ -3024,7 +3024,7 @@ discard block |
||
| 3024 | 3024 | * |
| 3025 | 3025 | * @param string $instance ['max_show'] Number of listings to display on screen. |
| 3026 | 3026 | */ |
| 3027 | - $max_show = empty( $instance['max_show'] ) ? '1' : apply_filters( 'widget_max_show', $instance['max_show'] ); |
|
| 3027 | + $max_show = empty($instance['max_show']) ? '1' : apply_filters('widget_max_show', $instance['max_show']);
|
|
| 3028 | 3028 | /** |
| 3029 | 3029 | * Filter the widget slide width. |
| 3030 | 3030 | * |
@@ -3032,7 +3032,7 @@ discard block |
||
| 3032 | 3032 | * |
| 3033 | 3033 | * @param string $instance ['slide_width'] Width of the slides shown. |
| 3034 | 3034 | */ |
| 3035 | - $slide_width = empty( $instance['slide_width'] ) ? '' : apply_filters( 'widget_slide_width', $instance['slide_width'] ); |
|
| 3035 | + $slide_width = empty($instance['slide_width']) ? '' : apply_filters('widget_slide_width', $instance['slide_width']);
|
|
| 3036 | 3036 | /** |
| 3037 | 3037 | * Filter widget's "show title" value. |
| 3038 | 3038 | * |
@@ -3040,7 +3040,7 @@ discard block |
||
| 3040 | 3040 | * |
| 3041 | 3041 | * @param string|bool $instance ['show_title'] Do you want to display title? Can be 1 or 0. |
| 3042 | 3042 | */ |
| 3043 | - $show_title = empty( $instance['show_title'] ) ? '' : apply_filters( 'widget_show_title', $instance['show_title'] ); |
|
| 3043 | + $show_title = empty($instance['show_title']) ? '' : apply_filters('widget_show_title', $instance['show_title']);
|
|
| 3044 | 3044 | /** |
| 3045 | 3045 | * Filter widget's "slideshow" value. |
| 3046 | 3046 | * |
@@ -3048,7 +3048,7 @@ discard block |
||
| 3048 | 3048 | * |
| 3049 | 3049 | * @param int $instance ['slideshow'] Setup a slideshow for the slider to animate automatically. |
| 3050 | 3050 | */ |
| 3051 | - $slideshow = empty( $instance['slideshow'] ) ? 0 : apply_filters( 'widget_slideshow', $instance['slideshow'] ); |
|
| 3051 | + $slideshow = empty($instance['slideshow']) ? 0 : apply_filters('widget_slideshow', $instance['slideshow']);
|
|
| 3052 | 3052 | /** |
| 3053 | 3053 | * Filter widget's "animationLoop" value. |
| 3054 | 3054 | * |
@@ -3056,7 +3056,7 @@ discard block |
||
| 3056 | 3056 | * |
| 3057 | 3057 | * @param int $instance ['animationLoop'] Gives the slider a seamless infinite loop. |
| 3058 | 3058 | */ |
| 3059 | - $animationLoop = empty( $instance['animationLoop'] ) ? 0 : apply_filters( 'widget_animationLoop', $instance['animationLoop'] ); |
|
| 3059 | + $animationLoop = empty($instance['animationLoop']) ? 0 : apply_filters('widget_animationLoop', $instance['animationLoop']);
|
|
| 3060 | 3060 | /** |
| 3061 | 3061 | * Filter widget's "directionNav" value. |
| 3062 | 3062 | * |
@@ -3064,7 +3064,7 @@ discard block |
||
| 3064 | 3064 | * |
| 3065 | 3065 | * @param int $instance ['directionNav'] Enable previous/next arrow navigation?. Can be 1 or 0. |
| 3066 | 3066 | */ |
| 3067 | - $directionNav = empty( $instance['directionNav'] ) ? 0 : apply_filters( 'widget_directionNav', $instance['directionNav'] ); |
|
| 3067 | + $directionNav = empty($instance['directionNav']) ? 0 : apply_filters('widget_directionNav', $instance['directionNav']);
|
|
| 3068 | 3068 | /** |
| 3069 | 3069 | * Filter widget's "slideshowSpeed" value. |
| 3070 | 3070 | * |
@@ -3072,7 +3072,7 @@ discard block |
||
| 3072 | 3072 | * |
| 3073 | 3073 | * @param int $instance ['slideshowSpeed'] Set the speed of the slideshow cycling, in milliseconds. |
| 3074 | 3074 | */ |
| 3075 | - $slideshowSpeed = empty( $instance['slideshowSpeed'] ) ? 5000 : apply_filters( 'widget_slideshowSpeed', $instance['slideshowSpeed'] ); |
|
| 3075 | + $slideshowSpeed = empty($instance['slideshowSpeed']) ? 5000 : apply_filters('widget_slideshowSpeed', $instance['slideshowSpeed']);
|
|
| 3076 | 3076 | /** |
| 3077 | 3077 | * Filter widget's "animationSpeed" value. |
| 3078 | 3078 | * |
@@ -3080,7 +3080,7 @@ discard block |
||
| 3080 | 3080 | * |
| 3081 | 3081 | * @param int $instance ['animationSpeed'] Set the speed of animations, in milliseconds. |
| 3082 | 3082 | */ |
| 3083 | - $animationSpeed = empty( $instance['animationSpeed'] ) ? 600 : apply_filters( 'widget_animationSpeed', $instance['animationSpeed'] ); |
|
| 3083 | + $animationSpeed = empty($instance['animationSpeed']) ? 600 : apply_filters('widget_animationSpeed', $instance['animationSpeed']);
|
|
| 3084 | 3084 | /** |
| 3085 | 3085 | * Filter widget's "animation" value. |
| 3086 | 3086 | * |
@@ -3088,7 +3088,7 @@ discard block |
||
| 3088 | 3088 | * |
| 3089 | 3089 | * @param string $instance ['animation'] Controls the animation type, "fade" or "slide". |
| 3090 | 3090 | */ |
| 3091 | - $animation = empty( $instance['animation'] ) ? 'slide' : apply_filters( 'widget_animation', $instance['animation'] ); |
|
| 3091 | + $animation = empty($instance['animation']) ? 'slide' : apply_filters('widget_animation', $instance['animation']);
|
|
| 3092 | 3092 | /** |
| 3093 | 3093 | * Filter widget's "list_sort" type. |
| 3094 | 3094 | * |
@@ -3096,10 +3096,10 @@ discard block |
||
| 3096 | 3096 | * |
| 3097 | 3097 | * @param string $instance ['list_sort'] Listing sort by type. |
| 3098 | 3098 | */ |
| 3099 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); |
|
| 3100 | - $show_featured_only = ! empty( $instance['show_featured_only'] ) ? 1 : null; |
|
| 3099 | + $list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
|
|
| 3100 | + $show_featured_only = !empty($instance['show_featured_only']) ? 1 : null; |
|
| 3101 | 3101 | |
| 3102 | - wp_enqueue_script( 'geodirectory-jquery-flexslider-js' ); |
|
| 3102 | + wp_enqueue_script('geodirectory-jquery-flexslider-js');
|
|
| 3103 | 3103 | ?> |
| 3104 | 3104 | <script type="text/javascript"> |
| 3105 | 3105 | jQuery(window).load(function () {
|
@@ -3117,23 +3117,23 @@ discard block |
||
| 3117 | 3117 | itemWidth: 75, |
| 3118 | 3118 | itemMargin: 5, |
| 3119 | 3119 | asNavFor: '#geodir_widget_slider', |
| 3120 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?> |
|
| 3120 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?> |
|
| 3121 | 3121 | }); |
| 3122 | 3122 | |
| 3123 | 3123 | jQuery('#geodir_widget_slider').flexslider({
|
| 3124 | - animation: "<?php echo $animation;?>", |
|
| 3124 | + animation: "<?php echo $animation; ?>", |
|
| 3125 | 3125 | selector: ".geodir-slides > li", |
| 3126 | 3126 | namespace: "geodir-", |
| 3127 | 3127 | controlNav: true, |
| 3128 | - animationLoop: <?php echo $animationLoop;?>, |
|
| 3129 | - slideshow: <?php echo $slideshow;?>, |
|
| 3130 | - slideshowSpeed: <?php echo $slideshowSpeed;?>, |
|
| 3131 | - animationSpeed: <?php echo $animationSpeed;?>, |
|
| 3132 | - directionNav: <?php echo $directionNav;?>, |
|
| 3133 | - maxItems: <?php echo $max_show;?>, |
|
| 3128 | + animationLoop: <?php echo $animationLoop; ?>, |
|
| 3129 | + slideshow: <?php echo $slideshow; ?>, |
|
| 3130 | + slideshowSpeed: <?php echo $slideshowSpeed; ?>, |
|
| 3131 | + animationSpeed: <?php echo $animationSpeed; ?>, |
|
| 3132 | + directionNav: <?php echo $directionNav; ?>, |
|
| 3133 | + maxItems: <?php echo $max_show; ?>, |
|
| 3134 | 3134 | move: 1, |
| 3135 | - <?php if ( $slide_width ) {
|
|
| 3136 | - echo "itemWidth: " . $slide_width . ","; |
|
| 3135 | + <?php if ($slide_width) {
|
|
| 3136 | + echo "itemWidth: ".$slide_width.","; |
|
| 3137 | 3137 | }?> |
| 3138 | 3138 | sync: "#geodir_widget_carousel", |
| 3139 | 3139 | start: function (slider) {
|
@@ -3145,7 +3145,7 @@ discard block |
||
| 3145 | 3145 | jQuery('#geodir_widget_slider').css({'visibility': 'visible'});
|
| 3146 | 3146 | jQuery('#geodir_widget_carousel').css({'visibility': 'visible'});
|
| 3147 | 3147 | }, |
| 3148 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?> |
|
| 3148 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?> |
|
| 3149 | 3149 | }); |
| 3150 | 3150 | }); |
| 3151 | 3151 | </script> |
@@ -3158,62 +3158,62 @@ discard block |
||
| 3158 | 3158 | 'order_by' => $list_sort |
| 3159 | 3159 | ); |
| 3160 | 3160 | |
| 3161 | - if ( $show_featured_only ) {
|
|
| 3161 | + if ($show_featured_only) {
|
|
| 3162 | 3162 | $query_args['show_featured_only'] = 1; |
| 3163 | 3163 | } |
| 3164 | 3164 | |
| 3165 | - if ( $category != 0 || $category != '' ) {
|
|
| 3166 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 3165 | + if ($category != 0 || $category != '') {
|
|
| 3166 | + $category_taxonomy = geodir_get_taxonomies($post_type); |
|
| 3167 | 3167 | $tax_query = array( |
| 3168 | 3168 | 'taxonomy' => $category_taxonomy[0], |
| 3169 | 3169 | 'field' => 'id', |
| 3170 | 3170 | 'terms' => $category |
| 3171 | 3171 | ); |
| 3172 | 3172 | |
| 3173 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 3173 | + $query_args['tax_query'] = array($tax_query); |
|
| 3174 | 3174 | } |
| 3175 | 3175 | |
| 3176 | 3176 | // we want listings with featured image only |
| 3177 | 3177 | $query_args['featured_image_only'] = 1; |
| 3178 | 3178 | |
| 3179 | - if ( $post_type == 'gd_event' ) {
|
|
| 3179 | + if ($post_type == 'gd_event') {
|
|
| 3180 | 3180 | $query_args['gedir_event_listing_filter'] = 'upcoming'; |
| 3181 | 3181 | }// show only upcoming events |
| 3182 | 3182 | |
| 3183 | - $widget_listings = geodir_get_widget_listings( $query_args ); |
|
| 3184 | - if ( ! empty( $widget_listings ) || ( isset( $with_no_results ) && $with_no_results ) ) {
|
|
| 3185 | - if ( $title ) {
|
|
| 3186 | - echo $before_title . $title . $after_title; |
|
| 3183 | + $widget_listings = geodir_get_widget_listings($query_args); |
|
| 3184 | + if (!empty($widget_listings) || (isset($with_no_results) && $with_no_results)) {
|
|
| 3185 | + if ($title) {
|
|
| 3186 | + echo $before_title.$title.$after_title; |
|
| 3187 | 3187 | } |
| 3188 | 3188 | |
| 3189 | 3189 | global $post; |
| 3190 | 3190 | |
| 3191 | - $current_post = $post;// keep current post info |
|
| 3191 | + $current_post = $post; // keep current post info |
|
| 3192 | 3192 | |
| 3193 | 3193 | $widget_main_slides = ''; |
| 3194 | 3194 | $nav_slides = ''; |
| 3195 | 3195 | $widget_slides = 0; |
| 3196 | 3196 | |
| 3197 | - foreach ( $widget_listings as $widget_listing ) {
|
|
| 3197 | + foreach ($widget_listings as $widget_listing) {
|
|
| 3198 | 3198 | global $gd_widget_listing_type; |
| 3199 | 3199 | $post = $widget_listing; |
| 3200 | - $widget_image = geodir_get_featured_image( $post->ID, 'thumbnail', get_option( 'geodir_listing_no_img' ) ); |
|
| 3200 | + $widget_image = geodir_get_featured_image($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
|
|
| 3201 | 3201 | |
| 3202 | - if ( ! empty( $widget_image ) ) {
|
|
| 3203 | - if ( $widget_image->height >= 200 ) {
|
|
| 3202 | + if (!empty($widget_image)) {
|
|
| 3203 | + if ($widget_image->height >= 200) {
|
|
| 3204 | 3204 | $widget_spacer_height = 0; |
| 3205 | 3205 | } else {
|
| 3206 | - $widget_spacer_height = ( ( 200 - $widget_image->height ) / 2 ); |
|
| 3206 | + $widget_spacer_height = ((200 - $widget_image->height) / 2); |
|
| 3207 | 3207 | } |
| 3208 | 3208 | |
| 3209 | - $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" />'; |
|
| 3209 | + $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" />'; |
|
| 3210 | 3210 | |
| 3211 | 3211 | $title = ''; |
| 3212 | - if ( $show_title ) {
|
|
| 3213 | - $title_html = '<div class="geodir-slider-title"><a href="' . get_permalink( $post->ID ) . '">' . get_the_title( $post->ID ) . '</a></div>'; |
|
| 3212 | + if ($show_title) {
|
|
| 3213 | + $title_html = '<div class="geodir-slider-title"><a href="'.get_permalink($post->ID).'">'.get_the_title($post->ID).'</a></div>'; |
|
| 3214 | 3214 | $post_id = $post->ID; |
| 3215 | - $post_permalink = get_permalink( $post->ID ); |
|
| 3216 | - $post_title = get_the_title( $post->ID ); |
|
| 3215 | + $post_permalink = get_permalink($post->ID); |
|
| 3216 | + $post_title = get_the_title($post->ID); |
|
| 3217 | 3217 | /** |
| 3218 | 3218 | * Filter the listing slider widget title. |
| 3219 | 3219 | * |
@@ -3224,12 +3224,12 @@ discard block |
||
| 3224 | 3224 | * @param string $post_permalink The post permalink url. |
| 3225 | 3225 | * @param string $post_title The post title text. |
| 3226 | 3226 | */ |
| 3227 | - $title = apply_filters( 'geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title ); |
|
| 3227 | + $title = apply_filters('geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title);
|
|
| 3228 | 3228 | } |
| 3229 | 3229 | |
| 3230 | - $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>'; |
|
| 3231 | - $nav_slides .= '<li><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 3232 | - $widget_slides ++; |
|
| 3230 | + $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>'; |
|
| 3231 | + $nav_slides .= '<li><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 3232 | + $widget_slides++; |
|
| 3233 | 3233 | } |
| 3234 | 3234 | } |
| 3235 | 3235 | ?> |
@@ -3238,7 +3238,7 @@ discard block |
||
| 3238 | 3238 | <div id="geodir_widget_slider" class="geodir_flexslider"> |
| 3239 | 3239 | <ul class="geodir-slides clearfix"><?php echo $widget_main_slides; ?></ul> |
| 3240 | 3240 | </div> |
| 3241 | - <?php if ( $widget_slides > 1 ) { ?>
|
|
| 3241 | + <?php if ($widget_slides > 1) { ?>
|
|
| 3242 | 3242 | <div id="geodir_widget_carousel" class="geodir_flexslider"> |
| 3243 | 3243 | <ul class="geodir-slides clearfix"><?php echo $nav_slides; ?></ul> |
| 3244 | 3244 | </div> |
@@ -3246,7 +3246,7 @@ discard block |
||
| 3246 | 3246 | </div> |
| 3247 | 3247 | <?php |
| 3248 | 3248 | $GLOBALS['post'] = $current_post; |
| 3249 | - setup_postdata( $current_post ); |
|
| 3249 | + setup_postdata($current_post); |
|
| 3250 | 3250 | } |
| 3251 | 3251 | echo $after_widget; |
| 3252 | 3252 | } |
@@ -3262,46 +3262,46 @@ discard block |
||
| 3262 | 3262 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. |
| 3263 | 3263 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3264 | 3264 | */ |
| 3265 | -function geodir_loginwidget_output( $args = '', $instance = '' ) {
|
|
| 3265 | +function geodir_loginwidget_output($args = '', $instance = '') {
|
|
| 3266 | 3266 | //print_r($args); |
| 3267 | 3267 | //print_r($instance); |
| 3268 | 3268 | // prints the widget |
| 3269 | - extract( $args, EXTR_SKIP ); |
|
| 3269 | + extract($args, EXTR_SKIP); |
|
| 3270 | 3270 | |
| 3271 | 3271 | /** This filter is documented in geodirectory_widgets.php */ |
| 3272 | - $title = empty( $instance['title'] ) ? __( 'My Dashboard', 'geodirectory' ) : apply_filters( 'my_dashboard_widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3272 | + $title = empty($instance['title']) ? __('My Dashboard', 'geodirectory') : apply_filters('my_dashboard_widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3273 | 3273 | |
| 3274 | 3274 | echo $before_widget; |
| 3275 | - echo $before_title . $title . $after_title; |
|
| 3275 | + echo $before_title.$title.$after_title; |
|
| 3276 | 3276 | |
| 3277 | - if ( is_user_logged_in() ) {
|
|
| 3277 | + if (is_user_logged_in()) {
|
|
| 3278 | 3278 | global $current_user; |
| 3279 | 3279 | |
| 3280 | - $author_link = get_author_posts_url( $current_user->data->ID ); |
|
| 3281 | - $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false ); |
|
| 3280 | + $author_link = get_author_posts_url($current_user->data->ID); |
|
| 3281 | + $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
|
|
| 3282 | 3282 | |
| 3283 | 3283 | echo '<ul class="geodir-loginbox-list">'; |
| 3284 | 3284 | ob_start(); |
| 3285 | 3285 | ?> |
| 3286 | 3286 | <li><a class="signin" |
| 3287 | - href="<?php echo wp_logout_url( home_url() ); ?>"><?php _e( 'Logout', 'geodirectory' ); ?></a></li> |
|
| 3287 | + href="<?php echo wp_logout_url(home_url()); ?>"><?php _e('Logout', 'geodirectory'); ?></a></li>
|
|
| 3288 | 3288 | <?php |
| 3289 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 3290 | - $show_add_listing_post_types_main_nav = get_option( 'geodir_add_listing_link_user_dashboard' ); |
|
| 3291 | - $geodir_allow_posttype_frontend = get_option( 'geodir_allow_posttype_frontend' ); |
|
| 3289 | + $post_types = geodir_get_posttypes('object');
|
|
| 3290 | + $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_user_dashboard');
|
|
| 3291 | + $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 3292 | 3292 | |
| 3293 | - if ( ! empty( $show_add_listing_post_types_main_nav ) ) {
|
|
| 3293 | + if (!empty($show_add_listing_post_types_main_nav)) {
|
|
| 3294 | 3294 | $addlisting_links = ''; |
| 3295 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3295 | + foreach ($post_types as $key => $postobj) {
|
|
| 3296 | 3296 | |
| 3297 | - if ( in_array( $key, $show_add_listing_post_types_main_nav ) ) {
|
|
| 3297 | + if (in_array($key, $show_add_listing_post_types_main_nav)) {
|
|
| 3298 | 3298 | |
| 3299 | - if ( $add_link = geodir_get_addlisting_link( $key ) ) {
|
|
| 3299 | + if ($add_link = geodir_get_addlisting_link($key)) {
|
|
| 3300 | 3300 | |
| 3301 | 3301 | $name = $postobj->labels->name; |
| 3302 | 3302 | |
| 3303 | 3303 | $selected = ''; |
| 3304 | - if ( geodir_get_current_posttype() == $key && geodir_is_page( 'add-listing' ) ) {
|
|
| 3304 | + if (geodir_get_current_posttype() == $key && geodir_is_page('add-listing')) {
|
|
| 3305 | 3305 | $selected = 'selected="selected"'; |
| 3306 | 3306 | } |
| 3307 | 3307 | |
@@ -3314,22 +3314,22 @@ discard block |
||
| 3314 | 3314 | * @param string $key Add listing array key. |
| 3315 | 3315 | * @param int $current_user ->ID Current user ID. |
| 3316 | 3316 | */ |
| 3317 | - $add_link = apply_filters( 'geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID ); |
|
| 3317 | + $add_link = apply_filters('geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID);
|
|
| 3318 | 3318 | |
| 3319 | - $addlisting_links .= '<option ' . $selected . ' value="' . $add_link . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3319 | + $addlisting_links .= '<option '.$selected.' value="'.$add_link.'">'.__(ucfirst($name), 'geodirectory').'</option>'; |
|
| 3320 | 3320 | |
| 3321 | 3321 | } |
| 3322 | 3322 | } |
| 3323 | 3323 | |
| 3324 | 3324 | } |
| 3325 | 3325 | |
| 3326 | - if ( $addlisting_links != '' ) { ?>
|
|
| 3326 | + if ($addlisting_links != '') { ?>
|
|
| 3327 | 3327 | |
| 3328 | 3328 | <li><select id="geodir_add_listing" class="chosen_select" onchange="window.location.href=this.value" |
| 3329 | 3329 | option-autoredirect="1" name="geodir_add_listing" option-ajaxchosen="false" |
| 3330 | - data-placeholder="<?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?>"> |
|
| 3330 | + data-placeholder="<?php echo esc_attr(__('Add Listing', 'geodirectory')); ?>">
|
|
| 3331 | 3331 | <option value="" disabled="disabled" selected="selected" |
| 3332 | - style='display:none;'><?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?></option> |
|
| 3332 | + style='display:none;'><?php echo esc_attr(__('Add Listing', 'geodirectory')); ?></option>
|
|
| 3333 | 3333 | <?php echo $addlisting_links; ?> |
| 3334 | 3334 | </select></li> <?php |
| 3335 | 3335 | |
@@ -3337,23 +3337,23 @@ discard block |
||
| 3337 | 3337 | |
| 3338 | 3338 | } |
| 3339 | 3339 | // My Favourites in Dashboard |
| 3340 | - $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' ); |
|
| 3340 | + $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
|
|
| 3341 | 3341 | $user_favourite = geodir_user_favourite_listing_count(); |
| 3342 | 3342 | |
| 3343 | - if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
|
|
| 3343 | + if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
|
|
| 3344 | 3344 | $favourite_links = ''; |
| 3345 | 3345 | |
| 3346 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3347 | - if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
|
|
| 3346 | + foreach ($post_types as $key => $postobj) {
|
|
| 3347 | + if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
|
|
| 3348 | 3348 | $name = $postobj->labels->name; |
| 3349 | - $post_type_link = geodir_getlink( $author_link, array( |
|
| 3349 | + $post_type_link = geodir_getlink($author_link, array( |
|
| 3350 | 3350 | 'stype' => $key, |
| 3351 | 3351 | 'list' => 'favourite' |
| 3352 | - ), false ); |
|
| 3352 | + ), false); |
|
| 3353 | 3353 | |
| 3354 | 3354 | $selected = ''; |
| 3355 | 3355 | |
| 3356 | - if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 3356 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 3357 | 3357 | $selected = 'selected="selected"'; |
| 3358 | 3358 | } |
| 3359 | 3359 | /** |
@@ -3365,20 +3365,20 @@ discard block |
||
| 3365 | 3365 | * @param string $key Favorite listing array key. |
| 3366 | 3366 | * @param int $current_user ->ID Current user ID. |
| 3367 | 3367 | */ |
| 3368 | - $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID ); |
|
| 3368 | + $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID);
|
|
| 3369 | 3369 | |
| 3370 | - $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3370 | + $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(ucfirst($name), 'geodirectory').'</option>'; |
|
| 3371 | 3371 | } |
| 3372 | 3372 | } |
| 3373 | 3373 | |
| 3374 | - if ( $favourite_links != '' ) {
|
|
| 3374 | + if ($favourite_links != '') {
|
|
| 3375 | 3375 | ?> |
| 3376 | 3376 | <li> |
| 3377 | 3377 | <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" |
| 3378 | 3378 | option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" |
| 3379 | - data-placeholder="<?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?>"> |
|
| 3379 | + data-placeholder="<?php echo esc_attr(__('My Favorites', 'geodirectory')); ?>">
|
|
| 3380 | 3380 | <option value="" disabled="disabled" selected="selected" |
| 3381 | - style='display:none;'><?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?></option> |
|
| 3381 | + style='display:none;'><?php echo esc_attr(__('My Favorites', 'geodirectory')); ?></option>
|
|
| 3382 | 3382 | <?php echo $favourite_links; ?> |
| 3383 | 3383 | </select> |
| 3384 | 3384 | </li> |
@@ -3387,19 +3387,19 @@ discard block |
||
| 3387 | 3387 | } |
| 3388 | 3388 | |
| 3389 | 3389 | |
| 3390 | - $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' ); |
|
| 3390 | + $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
|
|
| 3391 | 3391 | $user_listing = geodir_user_post_listing_count(); |
| 3392 | 3392 | |
| 3393 | - if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
|
|
| 3393 | + if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
|
|
| 3394 | 3394 | $listing_links = ''; |
| 3395 | 3395 | |
| 3396 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3397 | - if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
|
|
| 3396 | + foreach ($post_types as $key => $postobj) {
|
|
| 3397 | + if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
|
|
| 3398 | 3398 | $name = $postobj->labels->name; |
| 3399 | - $listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false ); |
|
| 3399 | + $listing_link = geodir_getlink($author_link, array('stype' => $key), false);
|
|
| 3400 | 3400 | |
| 3401 | 3401 | $selected = ''; |
| 3402 | - if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
|
|
| 3402 | + if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
|
|
| 3403 | 3403 | $selected = 'selected="selected"'; |
| 3404 | 3404 | } |
| 3405 | 3405 | |
@@ -3412,20 +3412,20 @@ discard block |
||
| 3412 | 3412 | * @param string $key My listing array key. |
| 3413 | 3413 | * @param int $current_user ->ID Current user ID. |
| 3414 | 3414 | */ |
| 3415 | - $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID ); |
|
| 3415 | + $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID);
|
|
| 3416 | 3416 | |
| 3417 | - $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3417 | + $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(ucfirst($name), 'geodirectory').'</option>'; |
|
| 3418 | 3418 | } |
| 3419 | 3419 | } |
| 3420 | 3420 | |
| 3421 | - if ( $listing_links != '' ) {
|
|
| 3421 | + if ($listing_links != '') {
|
|
| 3422 | 3422 | ?> |
| 3423 | 3423 | <li> |
| 3424 | 3424 | <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" |
| 3425 | 3425 | option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" |
| 3426 | - data-placeholder="<?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?>"> |
|
| 3426 | + data-placeholder="<?php echo esc_attr(__('My Listings', 'geodirectory')); ?>">
|
|
| 3427 | 3427 | <option value="" disabled="disabled" selected="selected" |
| 3428 | - style='display:none;'><?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?></option> |
|
| 3428 | + style='display:none;'><?php echo esc_attr(__('My Listings', 'geodirectory')); ?></option>
|
|
| 3429 | 3429 | <?php echo $listing_links; ?> |
| 3430 | 3430 | </select> |
| 3431 | 3431 | </li> |
@@ -3441,7 +3441,7 @@ discard block |
||
| 3441 | 3441 | * |
| 3442 | 3442 | * @param string $dashboard_link Dashboard links HTML. |
| 3443 | 3443 | */ |
| 3444 | - echo apply_filters( 'geodir_dashboard_links', $dashboard_link ); |
|
| 3444 | + echo apply_filters('geodir_dashboard_links', $dashboard_link);
|
|
| 3445 | 3445 | echo '</ul>'; |
| 3446 | 3446 | |
| 3447 | 3447 | /** |
@@ -3449,7 +3449,7 @@ discard block |
||
| 3449 | 3449 | * |
| 3450 | 3450 | * @since 1.6.6 |
| 3451 | 3451 | */ |
| 3452 | - do_action( 'geodir_after_loginwidget_form_logged_in' ); |
|
| 3452 | + do_action('geodir_after_loginwidget_form_logged_in');
|
|
| 3453 | 3453 | |
| 3454 | 3454 | |
| 3455 | 3455 | } else {
|
@@ -3464,18 +3464,18 @@ discard block |
||
| 3464 | 3464 | <form name="loginform" class="loginform1" |
| 3465 | 3465 | action="<?php echo geodir_login_url(); ?>" |
| 3466 | 3466 | method="post"> |
| 3467 | - <div class="geodir_form_row"><input placeholder="<?php _e( 'Email', 'geodirectory' ); ?>" name="log" |
|
| 3467 | + <div class="geodir_form_row"><input placeholder="<?php _e('Email', 'geodirectory'); ?>" name="log"
|
|
| 3468 | 3468 | type="text" class="textfield user_login1"/> <span |
| 3469 | 3469 | class="user_loginInfo"></span></div> |
| 3470 | - <div class="geodir_form_row"><input placeholder="<?php _e( 'Password', 'geodirectory' ); ?>" |
|
| 3470 | + <div class="geodir_form_row"><input placeholder="<?php _e('Password', 'geodirectory'); ?>"
|
|
| 3471 | 3471 | name="pwd" type="password" |
| 3472 | 3472 | class="textfield user_pass1 input-text"/><span |
| 3473 | 3473 | class="user_passInfo"></span></div> |
| 3474 | 3474 | |
| 3475 | - <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars( geodir_curPageURL() ); ?>"/> |
|
| 3475 | + <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars(geodir_curPageURL()); ?>"/> |
|
| 3476 | 3476 | <input type="hidden" name="testcookie" value="1"/> |
| 3477 | 3477 | |
| 3478 | - <?php do_action( 'login_form' ); ?> |
|
| 3478 | + <?php do_action('login_form'); ?>
|
|
| 3479 | 3479 | |
| 3480 | 3480 | <div class="geodir_form_row clearfix"><input type="submit" name="submit" |
| 3481 | 3481 | value="<?php echo SIGN_IN_BUTTON; ?>" class="b_signin"/> |
@@ -3487,11 +3487,11 @@ discard block |
||
| 3487 | 3487 | * |
| 3488 | 3488 | * @since 1.0.0 |
| 3489 | 3489 | */ |
| 3490 | - $is_enable_signup = get_option( 'users_can_register' ); |
|
| 3490 | + $is_enable_signup = get_option('users_can_register');
|
|
| 3491 | 3491 | |
| 3492 | - if ( $is_enable_signup ) {
|
|
| 3492 | + if ($is_enable_signup) {
|
|
| 3493 | 3493 | ?> |
| 3494 | - <a href="<?php echo geodir_login_url( array( 'signup' => true ) ); ?>" |
|
| 3494 | + <a href="<?php echo geodir_login_url(array('signup' => true)); ?>"
|
|
| 3495 | 3495 | class="goedir-newuser-link"><?php echo NEW_USER_TEXT; ?></a> |
| 3496 | 3496 | |
| 3497 | 3497 | <?php |
@@ -3502,7 +3502,7 @@ discard block |
||
| 3502 | 3502 | * @since 1.0.0 |
| 3503 | 3503 | */ |
| 3504 | 3504 | ?> |
| 3505 | - <a href="<?php echo geodir_login_url( array( 'forgot' => true ) ); ?>" |
|
| 3505 | + <a href="<?php echo geodir_login_url(array('forgot' => true)); ?>"
|
|
| 3506 | 3506 | class="goedir-forgot-link"><?php echo FORGOT_PW_TEXT; ?></a></p></div> |
| 3507 | 3507 | </form> |
| 3508 | 3508 | <?php |
@@ -3511,7 +3511,7 @@ discard block |
||
| 3511 | 3511 | * |
| 3512 | 3512 | * @since 1.6.6 |
| 3513 | 3513 | */ |
| 3514 | - do_action( 'geodir_after_loginwidget_form_logged_out' ); |
|
| 3514 | + do_action('geodir_after_loginwidget_form_logged_out');
|
|
| 3515 | 3515 | } |
| 3516 | 3516 | |
| 3517 | 3517 | echo $after_widget; |
@@ -3533,16 +3533,16 @@ discard block |
||
| 3533 | 3533 | * after_widget. |
| 3534 | 3534 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3535 | 3535 | */ |
| 3536 | -function geodir_popular_postview_output( $args = '', $instance = '' ) {
|
|
| 3536 | +function geodir_popular_postview_output($args = '', $instance = '') {
|
|
| 3537 | 3537 | global $gd_session; |
| 3538 | 3538 | |
| 3539 | 3539 | // prints the widget |
| 3540 | - extract( $args, EXTR_SKIP ); |
|
| 3540 | + extract($args, EXTR_SKIP); |
|
| 3541 | 3541 | |
| 3542 | 3542 | echo $before_widget; |
| 3543 | 3543 | |
| 3544 | 3544 | /** This filter is documented in geodirectory_widgets.php */ |
| 3545 | - $title = empty( $instance['title'] ) ? geodir_ucwords( $instance['category_title'] ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3545 | + $title = empty($instance['title']) ? geodir_ucwords($instance['category_title']) : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3546 | 3546 | /** |
| 3547 | 3547 | * Filter the widget post type. |
| 3548 | 3548 | * |
@@ -3550,7 +3550,7 @@ discard block |
||
| 3550 | 3550 | * |
| 3551 | 3551 | * @param string $instance ['post_type'] Post type of listing. |
| 3552 | 3552 | */ |
| 3553 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); |
|
| 3553 | + $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
|
|
| 3554 | 3554 | /** |
| 3555 | 3555 | * Filter the widget's term. |
| 3556 | 3556 | * |
@@ -3558,7 +3558,7 @@ discard block |
||
| 3558 | 3558 | * |
| 3559 | 3559 | * @param string $instance ['category'] Filter by term. Can be any valid term. |
| 3560 | 3560 | */ |
| 3561 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); |
|
| 3561 | + $category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
|
|
| 3562 | 3562 | /** |
| 3563 | 3563 | * Filter the widget listings limit. |
| 3564 | 3564 | * |
@@ -3566,7 +3566,7 @@ discard block |
||
| 3566 | 3566 | * |
| 3567 | 3567 | * @param string $instance ['post_number'] Number of listings to display. |
| 3568 | 3568 | */ |
| 3569 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); |
|
| 3569 | + $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
|
|
| 3570 | 3570 | /** |
| 3571 | 3571 | * Filter widget's "layout" type. |
| 3572 | 3572 | * |
@@ -3574,7 +3574,7 @@ discard block |
||
| 3574 | 3574 | * |
| 3575 | 3575 | * @param string $instance ['layout'] Widget layout type. |
| 3576 | 3576 | */ |
| 3577 | - $layout = empty( $instance['layout'] ) ? 'gridview_onehalf' : apply_filters( 'widget_layout', $instance['layout'] ); |
|
| 3577 | + $layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);
|
|
| 3578 | 3578 | /** |
| 3579 | 3579 | * Filter widget's "add_location_filter" value. |
| 3580 | 3580 | * |
@@ -3582,7 +3582,7 @@ discard block |
||
| 3582 | 3582 | * |
| 3583 | 3583 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. |
| 3584 | 3584 | */ |
| 3585 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); |
|
| 3585 | + $add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
|
|
| 3586 | 3586 | /** |
| 3587 | 3587 | * Filter widget's listing width. |
| 3588 | 3588 | * |
@@ -3590,7 +3590,7 @@ discard block |
||
| 3590 | 3590 | * |
| 3591 | 3591 | * @param string $instance ['listing_width'] Listing width. |
| 3592 | 3592 | */ |
| 3593 | - $listing_width = empty( $instance['listing_width'] ) ? '' : apply_filters( 'widget_listing_width', $instance['listing_width'] ); |
|
| 3593 | + $listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);
|
|
| 3594 | 3594 | /** |
| 3595 | 3595 | * Filter widget's "list_sort" type. |
| 3596 | 3596 | * |
@@ -3598,25 +3598,25 @@ discard block |
||
| 3598 | 3598 | * |
| 3599 | 3599 | * @param string $instance ['list_sort'] Listing sort by type. |
| 3600 | 3600 | */ |
| 3601 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); |
|
| 3602 | - $use_viewing_post_type = ! empty( $instance['use_viewing_post_type'] ) ? true : false; |
|
| 3601 | + $list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
|
|
| 3602 | + $use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false; |
|
| 3603 | 3603 | |
| 3604 | 3604 | // set post type to current viewing post type |
| 3605 | - if ( $use_viewing_post_type ) {
|
|
| 3605 | + if ($use_viewing_post_type) {
|
|
| 3606 | 3606 | $current_post_type = geodir_get_current_posttype(); |
| 3607 | - if ( $current_post_type != '' && $current_post_type != $post_type ) {
|
|
| 3607 | + if ($current_post_type != '' && $current_post_type != $post_type) {
|
|
| 3608 | 3608 | $post_type = $current_post_type; |
| 3609 | 3609 | $category = array(); // old post type category will not work for current changed post type |
| 3610 | 3610 | } |
| 3611 | 3611 | } |
| 3612 | 3612 | // replace widget title dynamically |
| 3613 | - $posttype_plural_label = __( get_post_type_plural_label( $post_type ), 'geodirectory' ); |
|
| 3614 | - $posttype_singular_label = __( get_post_type_singular_label( $post_type ), 'geodirectory' ); |
|
| 3613 | + $posttype_plural_label = __(get_post_type_plural_label($post_type), 'geodirectory'); |
|
| 3614 | + $posttype_singular_label = __(get_post_type_singular_label($post_type), 'geodirectory'); |
|
| 3615 | 3615 | |
| 3616 | - $title = str_replace( "%posttype_plural_label%", $posttype_plural_label, $title ); |
|
| 3617 | - $title = str_replace( "%posttype_singular_label%", $posttype_singular_label, $title ); |
|
| 3616 | + $title = str_replace("%posttype_plural_label%", $posttype_plural_label, $title);
|
|
| 3617 | + $title = str_replace("%posttype_singular_label%", $posttype_singular_label, $title);
|
|
| 3618 | 3618 | |
| 3619 | - if ( isset( $instance['character_count'] ) ) {
|
|
| 3619 | + if (isset($instance['character_count'])) {
|
|
| 3620 | 3620 | /** |
| 3621 | 3621 | * Filter the widget's excerpt character count. |
| 3622 | 3622 | * |
@@ -3624,37 +3624,37 @@ discard block |
||
| 3624 | 3624 | * |
| 3625 | 3625 | * @param int $instance ['character_count'] Excerpt character count. |
| 3626 | 3626 | */ |
| 3627 | - $character_count = apply_filters( 'widget_list_character_count', $instance['character_count'] ); |
|
| 3627 | + $character_count = apply_filters('widget_list_character_count', $instance['character_count']);
|
|
| 3628 | 3628 | } else {
|
| 3629 | 3629 | $character_count = ''; |
| 3630 | 3630 | } |
| 3631 | 3631 | |
| 3632 | - if ( empty( $title ) || $title == 'All' ) {
|
|
| 3633 | - $title .= ' ' . __( get_post_type_plural_label( $post_type ), 'geodirectory' ); |
|
| 3632 | + if (empty($title) || $title == 'All') {
|
|
| 3633 | + $title .= ' '.__(get_post_type_plural_label($post_type), 'geodirectory'); |
|
| 3634 | 3634 | } |
| 3635 | 3635 | |
| 3636 | 3636 | $location_url = array(); |
| 3637 | - $city = get_query_var( 'gd_city' ); |
|
| 3638 | - if ( ! empty( $city ) ) {
|
|
| 3639 | - $country = get_query_var( 'gd_country' ); |
|
| 3640 | - $region = get_query_var( 'gd_region' ); |
|
| 3637 | + $city = get_query_var('gd_city');
|
|
| 3638 | + if (!empty($city)) {
|
|
| 3639 | + $country = get_query_var('gd_country');
|
|
| 3640 | + $region = get_query_var('gd_region');
|
|
| 3641 | 3641 | |
| 3642 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); |
|
| 3642 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 3643 | 3643 | |
| 3644 | - if ( $geodir_show_location_url == 'all' ) {
|
|
| 3645 | - if ( $country != '' ) {
|
|
| 3644 | + if ($geodir_show_location_url == 'all') {
|
|
| 3645 | + if ($country != '') {
|
|
| 3646 | 3646 | $location_url[] = $country; |
| 3647 | 3647 | } |
| 3648 | 3648 | |
| 3649 | - if ( $region != '' ) {
|
|
| 3649 | + if ($region != '') {
|
|
| 3650 | 3650 | $location_url[] = $region; |
| 3651 | 3651 | } |
| 3652 | - } else if ( $geodir_show_location_url == 'country_city' ) {
|
|
| 3653 | - if ( $country != '' ) {
|
|
| 3652 | + } else if ($geodir_show_location_url == 'country_city') {
|
|
| 3653 | + if ($country != '') {
|
|
| 3654 | 3654 | $location_url[] = $country; |
| 3655 | 3655 | } |
| 3656 | - } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
| 3657 | - if ( $region != '' ) {
|
|
| 3656 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 3657 | + if ($region != '') {
|
|
| 3658 | 3658 | $location_url[] = $region; |
| 3659 | 3659 | } |
| 3660 | 3660 | } |
@@ -3662,37 +3662,37 @@ discard block |
||
| 3662 | 3662 | $location_url[] = $city; |
| 3663 | 3663 | } |
| 3664 | 3664 | |
| 3665 | - $location_url = implode( '/', $location_url ); |
|
| 3665 | + $location_url = implode('/', $location_url);
|
|
| 3666 | 3666 | $skip_location = false; |
| 3667 | - if ( ! $add_location_filter && $gd_session->get( 'gd_multi_location' ) ) {
|
|
| 3667 | + if (!$add_location_filter && $gd_session->get('gd_multi_location')) {
|
|
| 3668 | 3668 | $skip_location = true; |
| 3669 | - $gd_session->un_set( 'gd_multi_location' ); |
|
| 3669 | + $gd_session->un_set('gd_multi_location');
|
|
| 3670 | 3670 | } |
| 3671 | 3671 | |
| 3672 | - if ( get_option( 'permalink_structure' ) ) {
|
|
| 3673 | - $viewall_url = get_post_type_archive_link( $post_type ); |
|
| 3672 | + if (get_option('permalink_structure')) {
|
|
| 3673 | + $viewall_url = get_post_type_archive_link($post_type); |
|
| 3674 | 3674 | } else {
|
| 3675 | - $viewall_url = get_post_type_archive_link( $post_type ); |
|
| 3675 | + $viewall_url = get_post_type_archive_link($post_type); |
|
| 3676 | 3676 | } |
| 3677 | 3677 | |
| 3678 | - if ( ! empty( $category ) && $category[0] != '0' ) {
|
|
| 3678 | + if (!empty($category) && $category[0] != '0') {
|
|
| 3679 | 3679 | global $geodir_add_location_url; |
| 3680 | 3680 | |
| 3681 | 3681 | $geodir_add_location_url = '0'; |
| 3682 | 3682 | |
| 3683 | - if ( $add_location_filter != '0' ) {
|
|
| 3683 | + if ($add_location_filter != '0') {
|
|
| 3684 | 3684 | $geodir_add_location_url = '1'; |
| 3685 | 3685 | } |
| 3686 | 3686 | |
| 3687 | - $viewall_url = get_term_link( (int) $category[0], $post_type . 'category' ); |
|
| 3687 | + $viewall_url = get_term_link((int) $category[0], $post_type.'category'); |
|
| 3688 | 3688 | |
| 3689 | 3689 | $geodir_add_location_url = null; |
| 3690 | 3690 | } |
| 3691 | - if ( $skip_location ) {
|
|
| 3692 | - $gd_session->set( 'gd_multi_location', 1 ); |
|
| 3691 | + if ($skip_location) {
|
|
| 3692 | + $gd_session->set('gd_multi_location', 1);
|
|
| 3693 | 3693 | } |
| 3694 | 3694 | |
| 3695 | - if ( is_wp_error( $viewall_url ) ) {
|
|
| 3695 | + if (is_wp_error($viewall_url)) {
|
|
| 3696 | 3696 | $viewall_url = ''; |
| 3697 | 3697 | } |
| 3698 | 3698 | |
@@ -3704,34 +3704,34 @@ discard block |
||
| 3704 | 3704 | 'order_by' => $list_sort |
| 3705 | 3705 | ); |
| 3706 | 3706 | |
| 3707 | - if ( $character_count ) {
|
|
| 3707 | + if ($character_count) {
|
|
| 3708 | 3708 | $query_args['excerpt_length'] = $character_count; |
| 3709 | 3709 | } |
| 3710 | 3710 | |
| 3711 | - if ( ! empty( $instance['show_featured_only'] ) ) {
|
|
| 3711 | + if (!empty($instance['show_featured_only'])) {
|
|
| 3712 | 3712 | $query_args['show_featured_only'] = 1; |
| 3713 | 3713 | } |
| 3714 | 3714 | |
| 3715 | - if ( ! empty( $instance['show_special_only'] ) ) {
|
|
| 3715 | + if (!empty($instance['show_special_only'])) {
|
|
| 3716 | 3716 | $query_args['show_special_only'] = 1; |
| 3717 | 3717 | } |
| 3718 | 3718 | |
| 3719 | - if ( ! empty( $instance['with_pics_only'] ) ) {
|
|
| 3719 | + if (!empty($instance['with_pics_only'])) {
|
|
| 3720 | 3720 | $query_args['with_pics_only'] = 0; |
| 3721 | 3721 | $query_args['featured_image_only'] = 1; |
| 3722 | 3722 | } |
| 3723 | 3723 | |
| 3724 | - if ( ! empty( $instance['with_videos_only'] ) ) {
|
|
| 3724 | + if (!empty($instance['with_videos_only'])) {
|
|
| 3725 | 3725 | $query_args['with_videos_only'] = 1; |
| 3726 | 3726 | } |
| 3727 | - $with_no_results = ! empty( $instance['without_no_results'] ) ? false : true; |
|
| 3727 | + $with_no_results = !empty($instance['without_no_results']) ? false : true; |
|
| 3728 | 3728 | |
| 3729 | - if ( ! empty( $category ) && $category[0] != '0' ) {
|
|
| 3730 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 3729 | + if (!empty($category) && $category[0] != '0') {
|
|
| 3730 | + $category_taxonomy = geodir_get_taxonomies($post_type); |
|
| 3731 | 3731 | |
| 3732 | 3732 | ######### WPML ######### |
| 3733 | - if ( function_exists( 'icl_object_id' ) ) {
|
|
| 3734 | - $category = gd_lang_object_ids( $category, $category_taxonomy[0] ); |
|
| 3733 | + if (function_exists('icl_object_id')) {
|
|
| 3734 | + $category = gd_lang_object_ids($category, $category_taxonomy[0]); |
|
| 3735 | 3735 | } |
| 3736 | 3736 | ######### WPML ######### |
| 3737 | 3737 | |
@@ -3741,14 +3741,14 @@ discard block |
||
| 3741 | 3741 | 'terms' => $category |
| 3742 | 3742 | ); |
| 3743 | 3743 | |
| 3744 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 3744 | + $query_args['tax_query'] = array($tax_query); |
|
| 3745 | 3745 | } |
| 3746 | 3746 | |
| 3747 | 3747 | global $gridview_columns_widget, $geodir_is_widget_listing; |
| 3748 | 3748 | |
| 3749 | - $widget_listings = geodir_get_widget_listings( $query_args ); |
|
| 3749 | + $widget_listings = geodir_get_widget_listings($query_args); |
|
| 3750 | 3750 | |
| 3751 | - if ( ! empty( $widget_listings ) || $with_no_results ) {
|
|
| 3751 | + if (!empty($widget_listings) || $with_no_results) {
|
|
| 3752 | 3752 | ?> |
| 3753 | 3753 | <div class="geodir_locations geodir_location_listing"> |
| 3754 | 3754 | |
@@ -3758,11 +3758,11 @@ discard block |
||
| 3758 | 3758 | * |
| 3759 | 3759 | * @since 1.0.0 |
| 3760 | 3760 | */ |
| 3761 | - do_action( 'geodir_before_view_all_link_in_widget' ); ?> |
|
| 3761 | + do_action('geodir_before_view_all_link_in_widget'); ?>
|
|
| 3762 | 3762 | <div class="geodir_list_heading clearfix"> |
| 3763 | - <?php echo $before_title . $title . $after_title; ?> |
|
| 3763 | + <?php echo $before_title.$title.$after_title; ?> |
|
| 3764 | 3764 | <a href="<?php echo $viewall_url; ?>" |
| 3765 | - class="geodir-viewall"><?php _e( 'View all', 'geodirectory' ); ?></a> |
|
| 3765 | + class="geodir-viewall"><?php _e('View all', 'geodirectory'); ?></a>
|
|
| 3766 | 3766 | </div> |
| 3767 | 3767 | <?php |
| 3768 | 3768 | /** |
@@ -3770,10 +3770,10 @@ discard block |
||
| 3770 | 3770 | * |
| 3771 | 3771 | * @since 1.0.0 |
| 3772 | 3772 | */ |
| 3773 | - do_action( 'geodir_after_view_all_link_in_widget' ); ?> |
|
| 3773 | + do_action('geodir_after_view_all_link_in_widget'); ?>
|
|
| 3774 | 3774 | <?php |
| 3775 | - if ( strstr( $layout, 'gridview' ) ) {
|
|
| 3776 | - $listing_view_exp = explode( '_', $layout ); |
|
| 3775 | + if (strstr($layout, 'gridview')) {
|
|
| 3776 | + $listing_view_exp = explode('_', $layout);
|
|
| 3777 | 3777 | $gridview_columns_widget = $layout; |
| 3778 | 3778 | $layout = $listing_view_exp[0]; |
| 3779 | 3779 | } else {
|
@@ -3785,8 +3785,8 @@ discard block |
||
| 3785 | 3785 | * |
| 3786 | 3786 | * @since 1.0.0 |
| 3787 | 3787 | */ |
| 3788 | - $template = apply_filters( "geodir_template_part-widget-listing-listview", geodir_locate_template( 'widget-listing-listview' ) ); |
|
| 3789 | - if ( ! isset( $character_count ) ) {
|
|
| 3788 | + $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
|
|
| 3789 | + if (!isset($character_count)) {
|
|
| 3790 | 3790 | /** |
| 3791 | 3791 | * Filter the widget's excerpt character count. |
| 3792 | 3792 | * |
@@ -3794,7 +3794,7 @@ discard block |
||
| 3794 | 3794 | * |
| 3795 | 3795 | * @param int $instance ['character_count'] Excerpt character count. |
| 3796 | 3796 | */ |
| 3797 | - $character_count = $character_count == '' ? 50 : apply_filters( 'widget_character_count', $character_count ); |
|
| 3797 | + $character_count = $character_count == '' ? 50 : apply_filters('widget_character_count', $character_count);
|
|
| 3798 | 3798 | } |
| 3799 | 3799 | |
| 3800 | 3800 | global $post, $map_jason, $map_canvas_arr; |
@@ -3809,13 +3809,13 @@ discard block |
||
| 3809 | 3809 | * |
| 3810 | 3810 | * @since 1.0.0 |
| 3811 | 3811 | */ |
| 3812 | - include( $template ); |
|
| 3812 | + include($template); |
|
| 3813 | 3813 | |
| 3814 | 3814 | $geodir_is_widget_listing = false; |
| 3815 | 3815 | |
| 3816 | 3816 | $GLOBALS['post'] = $current_post; |
| 3817 | - if ( ! empty( $current_post ) ) {
|
|
| 3818 | - setup_postdata( $current_post ); |
|
| 3817 | + if (!empty($current_post)) {
|
|
| 3818 | + setup_postdata($current_post); |
|
| 3819 | 3819 | } |
| 3820 | 3820 | $map_jason = $current_map_jason; |
| 3821 | 3821 | $map_canvas_arr = $current_map_canvas_arr; |
@@ -3846,12 +3846,12 @@ discard block |
||
| 3846 | 3846 | * |
| 3847 | 3847 | * @return int Reviews count. |
| 3848 | 3848 | */ |
| 3849 | -function geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ) {
|
|
| 3849 | +function geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type) {
|
|
| 3850 | 3850 | global $wpdb, $plugin_prefix; |
| 3851 | 3851 | |
| 3852 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 3852 | + $detail_table = $plugin_prefix.$post_type.'_detail'; |
|
| 3853 | 3853 | |
| 3854 | - $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 . ")";
|
|
| 3854 | + $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.")";
|
|
| 3855 | 3855 | |
| 3856 | 3856 | /** |
| 3857 | 3857 | * Filter count review sql query. |
@@ -3863,9 +3863,9 @@ discard block |
||
| 3863 | 3863 | * @param int $taxonomy The taxonomy Id. |
| 3864 | 3864 | * @param string $post_type The post type. |
| 3865 | 3865 | */ |
| 3866 | - $sql = apply_filters( 'geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type ); |
|
| 3866 | + $sql = apply_filters('geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type);
|
|
| 3867 | 3867 | |
| 3868 | - $count = $wpdb->get_var( $sql ); |
|
| 3868 | + $count = $wpdb->get_var($sql); |
|
| 3869 | 3869 | |
| 3870 | 3870 | return $count; |
| 3871 | 3871 | } |
@@ -3883,7 +3883,7 @@ discard block |
||
| 3883 | 3883 | * |
| 3884 | 3884 | * @return array Term array data. |
| 3885 | 3885 | */ |
| 3886 | -function geodir_count_reviews_by_terms( $force_update = false, $post_ID = 0 ) {
|
|
| 3886 | +function geodir_count_reviews_by_terms($force_update = false, $post_ID = 0) {
|
|
| 3887 | 3887 | /** |
| 3888 | 3888 | * Filter review count option data. |
| 3889 | 3889 | * |
@@ -3893,78 +3893,78 @@ discard block |
||
| 3893 | 3893 | * @param bool $force_update Force update option value?. Default.false. |
| 3894 | 3894 | * @param int $post_ID The post id to update if any. |
| 3895 | 3895 | */ |
| 3896 | - $option_data = apply_filters( 'geodir_count_reviews_by_terms_before', '', $force_update, $post_ID ); |
|
| 3897 | - if ( ! empty( $option_data ) ) {
|
|
| 3896 | + $option_data = apply_filters('geodir_count_reviews_by_terms_before', '', $force_update, $post_ID);
|
|
| 3897 | + if (!empty($option_data)) {
|
|
| 3898 | 3898 | return $option_data; |
| 3899 | 3899 | } |
| 3900 | 3900 | |
| 3901 | - $option_data = get_option( 'geodir_global_review_count' ); |
|
| 3901 | + $option_data = get_option('geodir_global_review_count');
|
|
| 3902 | 3902 | |
| 3903 | - if ( ! $option_data || $force_update ) {
|
|
| 3904 | - if ( (int) $post_ID > 0 ) { // Update reviews count for specific post categories only.
|
|
| 3903 | + if (!$option_data || $force_update) {
|
|
| 3904 | + if ((int) $post_ID > 0) { // Update reviews count for specific post categories only.
|
|
| 3905 | 3905 | global $gd_session; |
| 3906 | 3906 | $term_array = (array) $option_data; |
| 3907 | - $post_type = get_post_type( $post_ID ); |
|
| 3908 | - $taxonomy = $post_type . 'category'; |
|
| 3909 | - $terms = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) ); |
|
| 3910 | - |
|
| 3911 | - if ( ! empty( $terms ) && ! is_wp_error( $terms ) ) {
|
|
| 3912 | - foreach ( $terms as $term_id ) {
|
|
| 3913 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); |
|
| 3914 | - $children = get_term_children( $term_id, $taxonomy ); |
|
| 3915 | - $term_array[ $term_id ] = $count; |
|
| 3907 | + $post_type = get_post_type($post_ID); |
|
| 3908 | + $taxonomy = $post_type.'category'; |
|
| 3909 | + $terms = wp_get_object_terms($post_ID, $taxonomy, array('fields' => 'ids'));
|
|
| 3910 | + |
|
| 3911 | + if (!empty($terms) && !is_wp_error($terms)) {
|
|
| 3912 | + foreach ($terms as $term_id) {
|
|
| 3913 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); |
|
| 3914 | + $children = get_term_children($term_id, $taxonomy); |
|
| 3915 | + $term_array[$term_id] = $count; |
|
| 3916 | 3916 | } |
| 3917 | 3917 | } |
| 3918 | 3918 | |
| 3919 | - $session_listing = $gd_session->get( 'listing' ); |
|
| 3919 | + $session_listing = $gd_session->get('listing');
|
|
| 3920 | 3920 | |
| 3921 | 3921 | $terms = array(); |
| 3922 | - if ( isset( $_POST['post_category'][ $taxonomy ] ) ) {
|
|
| 3923 | - $terms = (array) $_POST['post_category'][ $taxonomy ]; |
|
| 3924 | - } else if ( ! empty( $session_listing ) && isset( $session_listing['post_category'][ $taxonomy ] ) ) {
|
|
| 3925 | - $terms = (array) $session_listing['post_category'][ $taxonomy ]; |
|
| 3922 | + if (isset($_POST['post_category'][$taxonomy])) {
|
|
| 3923 | + $terms = (array) $_POST['post_category'][$taxonomy]; |
|
| 3924 | + } else if (!empty($session_listing) && isset($session_listing['post_category'][$taxonomy])) {
|
|
| 3925 | + $terms = (array) $session_listing['post_category'][$taxonomy]; |
|
| 3926 | 3926 | } |
| 3927 | 3927 | |
| 3928 | - if ( ! empty( $terms ) ) {
|
|
| 3929 | - foreach ( $terms as $term_id ) {
|
|
| 3930 | - if ( $term_id > 0 ) {
|
|
| 3931 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); |
|
| 3932 | - $children = get_term_children( $term_id, $taxonomy ); |
|
| 3933 | - $term_array[ $term_id ] = $count; |
|
| 3928 | + if (!empty($terms)) {
|
|
| 3929 | + foreach ($terms as $term_id) {
|
|
| 3930 | + if ($term_id > 0) {
|
|
| 3931 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); |
|
| 3932 | + $children = get_term_children($term_id, $taxonomy); |
|
| 3933 | + $term_array[$term_id] = $count; |
|
| 3934 | 3934 | } |
| 3935 | 3935 | } |
| 3936 | 3936 | } |
| 3937 | 3937 | } else { // Update reviews count for all post categories.
|
| 3938 | 3938 | $term_array = array(); |
| 3939 | 3939 | $post_types = geodir_get_posttypes(); |
| 3940 | - foreach ( $post_types as $post_type ) {
|
|
| 3940 | + foreach ($post_types as $post_type) {
|
|
| 3941 | 3941 | |
| 3942 | - $taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 3942 | + $taxonomy = geodir_get_taxonomies($post_type); |
|
| 3943 | 3943 | $taxonomy = $taxonomy[0]; |
| 3944 | 3944 | |
| 3945 | 3945 | $args = array( |
| 3946 | 3946 | 'hide_empty' => false |
| 3947 | 3947 | ); |
| 3948 | 3948 | |
| 3949 | - $terms = get_terms( $taxonomy, $args ); |
|
| 3949 | + $terms = get_terms($taxonomy, $args); |
|
| 3950 | 3950 | |
| 3951 | - foreach ( $terms as $term ) {
|
|
| 3952 | - $count = geodir_count_reviews_by_term_id( $term->term_id, $taxonomy, $post_type ); |
|
| 3953 | - $children = get_term_children( $term->term_id, $taxonomy ); |
|
| 3951 | + foreach ($terms as $term) {
|
|
| 3952 | + $count = geodir_count_reviews_by_term_id($term->term_id, $taxonomy, $post_type); |
|
| 3953 | + $children = get_term_children($term->term_id, $taxonomy); |
|
| 3954 | 3954 | /*if ( is_array( $children ) ) {
|
| 3955 | 3955 | foreach ( $children as $child_id ) {
|
| 3956 | 3956 | $child_count = geodir_count_reviews_by_term_id($child_id, $taxonomy, $post_type); |
| 3957 | 3957 | $count = $count + $child_count; |
| 3958 | 3958 | } |
| 3959 | 3959 | }*/ |
| 3960 | - $term_array[ $term->term_id ] = $count; |
|
| 3960 | + $term_array[$term->term_id] = $count; |
|
| 3961 | 3961 | } |
| 3962 | 3962 | } |
| 3963 | 3963 | } |
| 3964 | 3964 | |
| 3965 | - update_option( 'geodir_global_review_count', $term_array ); |
|
| 3965 | + update_option('geodir_global_review_count', $term_array);
|
|
| 3966 | 3966 | //clear cache |
| 3967 | - wp_cache_delete( 'geodir_global_review_count' ); |
|
| 3967 | + wp_cache_delete('geodir_global_review_count');
|
|
| 3968 | 3968 | |
| 3969 | 3969 | return $term_array; |
| 3970 | 3970 | } else {
|
@@ -3980,39 +3980,39 @@ discard block |
||
| 3980 | 3980 | * @package GeoDirectory |
| 3981 | 3981 | * @return bool |
| 3982 | 3982 | */ |
| 3983 | -function geodir_term_review_count_force_update( $new_status, $old_status = '', $post = '' ) {
|
|
| 3984 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'geodir_import_export' ) {
|
|
| 3983 | +function geodir_term_review_count_force_update($new_status, $old_status = '', $post = '') {
|
|
| 3984 | + if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'geodir_import_export') {
|
|
| 3985 | 3985 | return; // do not run if importing listings |
| 3986 | 3986 | } |
| 3987 | 3987 | |
| 3988 | - if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
|
|
| 3988 | + if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
|
|
| 3989 | 3989 | return; |
| 3990 | 3990 | } |
| 3991 | 3991 | |
| 3992 | 3992 | $post_ID = 0; |
| 3993 | - if ( ! empty( $post ) ) {
|
|
| 3994 | - if ( isset( $post->post_type ) && strpos( $post->post_type, 'gd_' ) !== 0 ) {
|
|
| 3993 | + if (!empty($post)) {
|
|
| 3994 | + if (isset($post->post_type) && strpos($post->post_type, 'gd_') !== 0) {
|
|
| 3995 | 3995 | return; |
| 3996 | 3996 | } |
| 3997 | 3997 | |
| 3998 | - if ( $new_status == 'auto-draft' && $old_status == 'new' ) {
|
|
| 3998 | + if ($new_status == 'auto-draft' && $old_status == 'new') {
|
|
| 3999 | 3999 | return; |
| 4000 | 4000 | } |
| 4001 | 4001 | |
| 4002 | - if ( ! empty( $post->ID ) ) {
|
|
| 4002 | + if (!empty($post->ID)) {
|
|
| 4003 | 4003 | $post_ID = $post->ID; |
| 4004 | 4004 | } |
| 4005 | 4005 | } |
| 4006 | 4006 | |
| 4007 | - if ( $new_status != $old_status ) {
|
|
| 4008 | - geodir_count_reviews_by_terms( true, $post_ID ); |
|
| 4007 | + if ($new_status != $old_status) {
|
|
| 4008 | + geodir_count_reviews_by_terms(true, $post_ID); |
|
| 4009 | 4009 | } |
| 4010 | 4010 | |
| 4011 | 4011 | return true; |
| 4012 | 4012 | } |
| 4013 | 4013 | |
| 4014 | -function geodir_term_review_count_force_update_single_post( $post_id ) {
|
|
| 4015 | - geodir_count_reviews_by_terms( true, $post_id ); |
|
| 4014 | +function geodir_term_review_count_force_update_single_post($post_id) {
|
|
| 4015 | + geodir_count_reviews_by_terms(true, $post_id); |
|
| 4016 | 4016 | } |
| 4017 | 4017 | |
| 4018 | 4018 | /*-----------------------------------------------------------------------------------*/ |
@@ -4029,11 +4029,11 @@ discard block |
||
| 4029 | 4029 | * |
| 4030 | 4030 | * @return int Post count. |
| 4031 | 4031 | */ |
| 4032 | -function geodir_count_posts_by_term( $data, $term ) {
|
|
| 4032 | +function geodir_count_posts_by_term($data, $term) {
|
|
| 4033 | 4033 | |
| 4034 | - if ( $data ) {
|
|
| 4035 | - if ( isset( $data[ $term->term_id ] ) ) {
|
|
| 4036 | - return $data[ $term->term_id ]; |
|
| 4034 | + if ($data) {
|
|
| 4035 | + if (isset($data[$term->term_id])) {
|
|
| 4036 | + return $data[$term->term_id]; |
|
| 4037 | 4037 | } else {
|
| 4038 | 4038 | return 0; |
| 4039 | 4039 | } |
@@ -4050,8 +4050,8 @@ discard block |
||
| 4050 | 4050 | * param array $terms An array of term objects. |
| 4051 | 4051 | * @return array Sorted terms array. |
| 4052 | 4052 | */ |
| 4053 | -function geodir_sort_terms_by_count( $terms ) {
|
|
| 4054 | - usort( $terms, "geodir_sort_by_count_obj" ); |
|
| 4053 | +function geodir_sort_terms_by_count($terms) {
|
|
| 4054 | + usort($terms, "geodir_sort_by_count_obj"); |
|
| 4055 | 4055 | |
| 4056 | 4056 | return $terms; |
| 4057 | 4057 | } |
@@ -4066,8 +4066,8 @@ discard block |
||
| 4066 | 4066 | * |
| 4067 | 4067 | * @return array Sorted terms array. |
| 4068 | 4068 | */ |
| 4069 | -function geodir_sort_terms_by_review_count( $terms ) {
|
|
| 4070 | - usort( $terms, "geodir_sort_by_review_count_obj" ); |
|
| 4069 | +function geodir_sort_terms_by_review_count($terms) {
|
|
| 4070 | + usort($terms, "geodir_sort_by_review_count_obj"); |
|
| 4071 | 4071 | |
| 4072 | 4072 | return $terms; |
| 4073 | 4073 | } |
@@ -4083,12 +4083,12 @@ discard block |
||
| 4083 | 4083 | * |
| 4084 | 4084 | * @return array Sorted terms array. |
| 4085 | 4085 | */ |
| 4086 | -function geodir_sort_terms( $terms, $sort = 'count' ) {
|
|
| 4087 | - if ( $sort == 'count' ) {
|
|
| 4088 | - return geodir_sort_terms_by_count( $terms ); |
|
| 4086 | +function geodir_sort_terms($terms, $sort = 'count') {
|
|
| 4087 | + if ($sort == 'count') {
|
|
| 4088 | + return geodir_sort_terms_by_count($terms); |
|
| 4089 | 4089 | } |
| 4090 | - if ( $sort == 'review_count' ) {
|
|
| 4091 | - return geodir_sort_terms_by_review_count( $terms ); |
|
| 4090 | + if ($sort == 'review_count') {
|
|
| 4091 | + return geodir_sort_terms_by_review_count($terms); |
|
| 4092 | 4092 | } |
| 4093 | 4093 | } |
| 4094 | 4094 | |
@@ -4106,7 +4106,7 @@ discard block |
||
| 4106 | 4106 | * |
| 4107 | 4107 | * @return bool |
| 4108 | 4108 | */ |
| 4109 | -function geodir_sort_by_count( $a, $b ) {
|
|
| 4109 | +function geodir_sort_by_count($a, $b) {
|
|
| 4110 | 4110 | return $a['count'] < $b['count']; |
| 4111 | 4111 | } |
| 4112 | 4112 | |
@@ -4121,7 +4121,7 @@ discard block |
||
| 4121 | 4121 | * |
| 4122 | 4122 | * @return bool |
| 4123 | 4123 | */ |
| 4124 | -function geodir_sort_by_count_obj( $a, $b ) {
|
|
| 4124 | +function geodir_sort_by_count_obj($a, $b) {
|
|
| 4125 | 4125 | return $a->count < $b->count; |
| 4126 | 4126 | } |
| 4127 | 4127 | |
@@ -4136,7 +4136,7 @@ discard block |
||
| 4136 | 4136 | * |
| 4137 | 4137 | * @return bool |
| 4138 | 4138 | */ |
| 4139 | -function geodir_sort_by_review_count_obj( $a, $b ) {
|
|
| 4139 | +function geodir_sort_by_review_count_obj($a, $b) {
|
|
| 4140 | 4140 | return $a->review_count < $b->review_count; |
| 4141 | 4141 | } |
| 4142 | 4142 | |
@@ -4153,35 +4153,35 @@ discard block |
||
| 4153 | 4153 | * @since 1.4.2 |
| 4154 | 4154 | * @package GeoDirectory |
| 4155 | 4155 | */ |
| 4156 | - $locale = apply_filters( 'plugin_locale', get_locale(), 'geodirectory' ); |
|
| 4156 | + $locale = apply_filters('plugin_locale', get_locale(), 'geodirectory');
|
|
| 4157 | 4157 | |
| 4158 | - load_textdomain( 'geodirectory', WP_LANG_DIR . '/' . 'geodirectory' . '/' . 'geodirectory' . '-' . $locale . '.mo' ); |
|
| 4159 | - load_plugin_textdomain( 'geodirectory', false, plugin_basename( dirname( dirname( __FILE__ ) ) ) . '/geodirectory-languages' ); |
|
| 4158 | + load_textdomain('geodirectory', WP_LANG_DIR.'/'.'geodirectory'.'/'.'geodirectory'.'-'.$locale.'.mo');
|
|
| 4159 | + load_plugin_textdomain('geodirectory', false, plugin_basename(dirname(dirname(__FILE__))).'/geodirectory-languages');
|
|
| 4160 | 4160 | |
| 4161 | 4161 | /** |
| 4162 | 4162 | * Define language constants. |
| 4163 | 4163 | * |
| 4164 | 4164 | * @since 1.0.0 |
| 4165 | 4165 | */ |
| 4166 | - require_once( geodir_plugin_path() . '/language.php' ); |
|
| 4166 | + require_once(geodir_plugin_path().'/language.php'); |
|
| 4167 | 4167 | |
| 4168 | - $language_file = geodir_plugin_path() . '/db-language.php'; |
|
| 4168 | + $language_file = geodir_plugin_path().'/db-language.php'; |
|
| 4169 | 4169 | |
| 4170 | 4170 | // Load language string file if not created yet |
| 4171 | - if ( ! file_exists( $language_file ) ) {
|
|
| 4171 | + if (!file_exists($language_file)) {
|
|
| 4172 | 4172 | geodirectory_load_db_language(); |
| 4173 | 4173 | } |
| 4174 | 4174 | |
| 4175 | - if ( file_exists( $language_file ) ) {
|
|
| 4175 | + if (file_exists($language_file)) {
|
|
| 4176 | 4176 | /** |
| 4177 | 4177 | * Language strings from database. |
| 4178 | 4178 | * |
| 4179 | 4179 | * @since 1.4.2 |
| 4180 | 4180 | */ |
| 4181 | 4181 | try {
|
| 4182 | - require_once( $language_file ); |
|
| 4183 | - } catch ( Exception $e ) {
|
|
| 4184 | - error_log( 'Language Error: ' . $e->getMessage() ); |
|
| 4182 | + require_once($language_file); |
|
| 4183 | + } catch (Exception $e) {
|
|
| 4184 | + error_log('Language Error: '.$e->getMessage());
|
|
| 4185 | 4185 | } |
| 4186 | 4186 | } |
| 4187 | 4187 | } |
@@ -4198,19 +4198,19 @@ discard block |
||
| 4198 | 4198 | */ |
| 4199 | 4199 | function geodirectory_load_db_language() {
|
| 4200 | 4200 | global $wp_filesystem; |
| 4201 | - if ( empty( $wp_filesystem ) ) {
|
|
| 4202 | - require_once( ABSPATH . '/wp-admin/includes/file.php' ); |
|
| 4201 | + if (empty($wp_filesystem)) {
|
|
| 4202 | + require_once(ABSPATH.'/wp-admin/includes/file.php'); |
|
| 4203 | 4203 | WP_Filesystem(); |
| 4204 | 4204 | global $wp_filesystem; |
| 4205 | 4205 | } |
| 4206 | 4206 | |
| 4207 | - $language_file = geodir_plugin_path() . '/db-language.php'; |
|
| 4207 | + $language_file = geodir_plugin_path().'/db-language.php'; |
|
| 4208 | 4208 | |
| 4209 | - if ( is_file( $language_file ) && ! is_writable( $language_file ) ) {
|
|
| 4209 | + if (is_file($language_file) && !is_writable($language_file)) {
|
|
| 4210 | 4210 | return false; |
| 4211 | 4211 | } // Not possible to create. |
| 4212 | 4212 | |
| 4213 | - if ( ! is_file( $language_file ) && ! is_writable( dirname( $language_file ) ) ) {
|
|
| 4213 | + if (!is_file($language_file) && !is_writable(dirname($language_file))) {
|
|
| 4214 | 4214 | return false; |
| 4215 | 4215 | } // Not possible to create. |
| 4216 | 4216 | |
@@ -4224,9 +4224,9 @@ discard block |
||
| 4224 | 4224 | * |
| 4225 | 4225 | * @param array $contents_strings Array of strings. |
| 4226 | 4226 | */ |
| 4227 | - $contents_strings = apply_filters( 'geodir_load_db_language', $contents_strings ); |
|
| 4227 | + $contents_strings = apply_filters('geodir_load_db_language', $contents_strings);
|
|
| 4228 | 4228 | |
| 4229 | - $contents_strings = array_unique( $contents_strings ); |
|
| 4229 | + $contents_strings = array_unique($contents_strings); |
|
| 4230 | 4230 | |
| 4231 | 4231 | $contents_head = array(); |
| 4232 | 4232 | $contents_head[] = "<?php"; |
@@ -4243,21 +4243,21 @@ discard block |
||
| 4243 | 4243 | $contents_foot[] = ""; |
| 4244 | 4244 | $contents_foot[] = ""; |
| 4245 | 4245 | |
| 4246 | - $contents = implode( PHP_EOL, $contents_head ); |
|
| 4246 | + $contents = implode(PHP_EOL, $contents_head); |
|
| 4247 | 4247 | |
| 4248 | - if ( ! empty( $contents_strings ) ) {
|
|
| 4249 | - foreach ( $contents_strings as $string ) {
|
|
| 4250 | - if ( is_scalar( $string ) && $string != '' ) {
|
|
| 4251 | - $string = str_replace( "'", "\'", $string ); |
|
| 4252 | - geodir_wpml_register_string( $string ); |
|
| 4253 | - $contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";
|
|
| 4248 | + if (!empty($contents_strings)) {
|
|
| 4249 | + foreach ($contents_strings as $string) {
|
|
| 4250 | + if (is_scalar($string) && $string != '') {
|
|
| 4251 | + $string = str_replace("'", "\'", $string);
|
|
| 4252 | + geodir_wpml_register_string($string); |
|
| 4253 | + $contents .= PHP_EOL."__('".$string."', 'geodirectory');";
|
|
| 4254 | 4254 | } |
| 4255 | 4255 | } |
| 4256 | 4256 | } |
| 4257 | 4257 | |
| 4258 | - $contents .= implode( PHP_EOL, $contents_foot ); |
|
| 4258 | + $contents .= implode(PHP_EOL, $contents_foot); |
|
| 4259 | 4259 | |
| 4260 | - if ( $wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE ) ) {
|
|
| 4260 | + if ($wp_filesystem->put_contents($language_file, $contents, FS_CHMOD_FILE)) {
|
|
| 4261 | 4261 | return false; |
| 4262 | 4262 | } // Failure; could not write file. |
| 4263 | 4263 | |
@@ -4278,49 +4278,49 @@ discard block |
||
| 4278 | 4278 | * |
| 4279 | 4279 | * @return array Translation texts. |
| 4280 | 4280 | */ |
| 4281 | -function geodir_load_custom_field_translation( $translation_texts = array() ) {
|
|
| 4281 | +function geodir_load_custom_field_translation($translation_texts = array()) {
|
|
| 4282 | 4282 | global $wpdb; |
| 4283 | 4283 | |
| 4284 | 4284 | // Custom fields table |
| 4285 | - $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM " . GEODIR_CUSTOM_FIELDS_TABLE; |
|
| 4286 | - $rows = $wpdb->get_results( $sql ); |
|
| 4285 | + $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM ".GEODIR_CUSTOM_FIELDS_TABLE; |
|
| 4286 | + $rows = $wpdb->get_results($sql); |
|
| 4287 | 4287 | |
| 4288 | - if ( ! empty( $rows ) ) {
|
|
| 4289 | - foreach ( $rows as $row ) {
|
|
| 4290 | - if ( ! empty( $row->admin_title ) ) {
|
|
| 4291 | - $translation_texts[] = stripslashes_deep( $row->admin_title ); |
|
| 4288 | + if (!empty($rows)) {
|
|
| 4289 | + foreach ($rows as $row) {
|
|
| 4290 | + if (!empty($row->admin_title)) {
|
|
| 4291 | + $translation_texts[] = stripslashes_deep($row->admin_title); |
|
| 4292 | 4292 | } |
| 4293 | 4293 | |
| 4294 | - if ( ! empty( $row->admin_desc ) ) {
|
|
| 4295 | - $translation_texts[] = stripslashes_deep( $row->admin_desc ); |
|
| 4294 | + if (!empty($row->admin_desc)) {
|
|
| 4295 | + $translation_texts[] = stripslashes_deep($row->admin_desc); |
|
| 4296 | 4296 | } |
| 4297 | 4297 | |
| 4298 | - if ( ! empty( $row->site_title ) ) {
|
|
| 4299 | - $translation_texts[] = stripslashes_deep( $row->site_title ); |
|
| 4298 | + if (!empty($row->site_title)) {
|
|
| 4299 | + $translation_texts[] = stripslashes_deep($row->site_title); |
|
| 4300 | 4300 | } |
| 4301 | 4301 | |
| 4302 | - if ( ! empty( $row->clabels ) ) {
|
|
| 4303 | - $translation_texts[] = stripslashes_deep( $row->clabels ); |
|
| 4302 | + if (!empty($row->clabels)) {
|
|
| 4303 | + $translation_texts[] = stripslashes_deep($row->clabels); |
|
| 4304 | 4304 | } |
| 4305 | 4305 | |
| 4306 | - if ( ! empty( $row->required_msg ) ) {
|
|
| 4307 | - $translation_texts[] = stripslashes_deep( $row->required_msg ); |
|
| 4306 | + if (!empty($row->required_msg)) {
|
|
| 4307 | + $translation_texts[] = stripslashes_deep($row->required_msg); |
|
| 4308 | 4308 | } |
| 4309 | 4309 | |
| 4310 | - if ( ! empty( $row->validation_msg ) ) {
|
|
| 4311 | - $translation_texts[] = stripslashes_deep( $row->validation_msg ); |
|
| 4310 | + if (!empty($row->validation_msg)) {
|
|
| 4311 | + $translation_texts[] = stripslashes_deep($row->validation_msg); |
|
| 4312 | 4312 | } |
| 4313 | 4313 | |
| 4314 | - if ( ! empty( $row->default_value ) ) {
|
|
| 4315 | - $translation_texts[] = stripslashes_deep( $row->default_value ); |
|
| 4314 | + if (!empty($row->default_value)) {
|
|
| 4315 | + $translation_texts[] = stripslashes_deep($row->default_value); |
|
| 4316 | 4316 | } |
| 4317 | 4317 | |
| 4318 | - if ( ! empty( $row->option_values ) ) {
|
|
| 4319 | - $option_values = geodir_string_values_to_options( stripslashes_deep( $row->option_values ) ); |
|
| 4318 | + if (!empty($row->option_values)) {
|
|
| 4319 | + $option_values = geodir_string_values_to_options(stripslashes_deep($row->option_values)); |
|
| 4320 | 4320 | |
| 4321 | - if ( ! empty( $option_values ) ) {
|
|
| 4322 | - foreach ( $option_values as $option_value ) {
|
|
| 4323 | - if ( ! empty( $option_value['label'] ) ) {
|
|
| 4321 | + if (!empty($option_values)) {
|
|
| 4322 | + foreach ($option_values as $option_value) {
|
|
| 4323 | + if (!empty($option_value['label'])) {
|
|
| 4324 | 4324 | $translation_texts[] = $option_value['label']; |
| 4325 | 4325 | } |
| 4326 | 4326 | } |
@@ -4330,56 +4330,56 @@ discard block |
||
| 4330 | 4330 | } |
| 4331 | 4331 | |
| 4332 | 4332 | // Custom sorting fields table |
| 4333 | - $sql = "SELECT site_title, asc_title, desc_title FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE; |
|
| 4334 | - $rows = $wpdb->get_results( $sql ); |
|
| 4333 | + $sql = "SELECT site_title, asc_title, desc_title FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE; |
|
| 4334 | + $rows = $wpdb->get_results($sql); |
|
| 4335 | 4335 | |
| 4336 | - if ( ! empty( $rows ) ) {
|
|
| 4337 | - foreach ( $rows as $row ) {
|
|
| 4338 | - if ( ! empty( $row->site_title ) ) {
|
|
| 4339 | - $translation_texts[] = stripslashes_deep( $row->site_title ); |
|
| 4336 | + if (!empty($rows)) {
|
|
| 4337 | + foreach ($rows as $row) {
|
|
| 4338 | + if (!empty($row->site_title)) {
|
|
| 4339 | + $translation_texts[] = stripslashes_deep($row->site_title); |
|
| 4340 | 4340 | } |
| 4341 | 4341 | |
| 4342 | - if ( ! empty( $row->asc_title ) ) {
|
|
| 4343 | - $translation_texts[] = stripslashes_deep( $row->asc_title ); |
|
| 4342 | + if (!empty($row->asc_title)) {
|
|
| 4343 | + $translation_texts[] = stripslashes_deep($row->asc_title); |
|
| 4344 | 4344 | } |
| 4345 | 4345 | |
| 4346 | - if ( ! empty( $row->desc_title ) ) {
|
|
| 4347 | - $translation_texts[] = stripslashes_deep( $row->desc_title ); |
|
| 4346 | + if (!empty($row->desc_title)) {
|
|
| 4347 | + $translation_texts[] = stripslashes_deep($row->desc_title); |
|
| 4348 | 4348 | } |
| 4349 | 4349 | } |
| 4350 | 4350 | } |
| 4351 | 4351 | |
| 4352 | 4352 | // Advance search filter fields table |
| 4353 | - if ( defined( 'GEODIR_ADVANCE_SEARCH_TABLE' ) ) {
|
|
| 4354 | - $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM " . GEODIR_ADVANCE_SEARCH_TABLE; |
|
| 4355 | - $rows = $wpdb->get_results( $sql ); |
|
| 4356 | - |
|
| 4357 | - if ( ! empty( $rows ) ) {
|
|
| 4358 | - foreach ( $rows as $row ) {
|
|
| 4359 | - if ( ! empty( $row->field_site_name ) ) {
|
|
| 4360 | - $translation_texts[] = stripslashes_deep( $row->field_site_name ); |
|
| 4353 | + if (defined('GEODIR_ADVANCE_SEARCH_TABLE')) {
|
|
| 4354 | + $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM ".GEODIR_ADVANCE_SEARCH_TABLE; |
|
| 4355 | + $rows = $wpdb->get_results($sql); |
|
| 4356 | + |
|
| 4357 | + if (!empty($rows)) {
|
|
| 4358 | + foreach ($rows as $row) {
|
|
| 4359 | + if (!empty($row->field_site_name)) {
|
|
| 4360 | + $translation_texts[] = stripslashes_deep($row->field_site_name); |
|
| 4361 | 4361 | } |
| 4362 | 4362 | |
| 4363 | - if ( ! empty( $row->front_search_title ) ) {
|
|
| 4364 | - $translation_texts[] = stripslashes_deep( $row->front_search_title ); |
|
| 4363 | + if (!empty($row->front_search_title)) {
|
|
| 4364 | + $translation_texts[] = stripslashes_deep($row->front_search_title); |
|
| 4365 | 4365 | } |
| 4366 | 4366 | |
| 4367 | - if ( ! empty( $row->first_search_text ) ) {
|
|
| 4368 | - $translation_texts[] = stripslashes_deep( $row->first_search_text ); |
|
| 4367 | + if (!empty($row->first_search_text)) {
|
|
| 4368 | + $translation_texts[] = stripslashes_deep($row->first_search_text); |
|
| 4369 | 4369 | } |
| 4370 | 4370 | |
| 4371 | - if ( ! empty( $row->last_search_text ) ) {
|
|
| 4372 | - $translation_texts[] = stripslashes_deep( $row->last_search_text ); |
|
| 4371 | + if (!empty($row->last_search_text)) {
|
|
| 4372 | + $translation_texts[] = stripslashes_deep($row->last_search_text); |
|
| 4373 | 4373 | } |
| 4374 | 4374 | |
| 4375 | - if ( ! empty( $row->field_desc ) ) {
|
|
| 4376 | - $translation_texts[] = stripslashes_deep( $row->field_desc ); |
|
| 4375 | + if (!empty($row->field_desc)) {
|
|
| 4376 | + $translation_texts[] = stripslashes_deep($row->field_desc); |
|
| 4377 | 4377 | } |
| 4378 | 4378 | } |
| 4379 | 4379 | } |
| 4380 | 4380 | } |
| 4381 | 4381 | |
| 4382 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; |
|
| 4382 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 4383 | 4383 | |
| 4384 | 4384 | return $translation_texts; |
| 4385 | 4385 | } |
@@ -4401,7 +4401,7 @@ discard block |
||
| 4401 | 4401 | * |
| 4402 | 4402 | * @param array $geodir_allowed_mime_types and file extensions. |
| 4403 | 4403 | */ |
| 4404 | - return apply_filters( 'geodir_allowed_mime_types', array( |
|
| 4404 | + return apply_filters('geodir_allowed_mime_types', array(
|
|
| 4405 | 4405 | 'Image' => array( // Image formats. |
| 4406 | 4406 | 'jpg' => 'image/jpeg', |
| 4407 | 4407 | 'jpe' => 'image/jpeg', |
@@ -4469,18 +4469,18 @@ discard block |
||
| 4469 | 4469 | * |
| 4470 | 4470 | * @return string User display name. |
| 4471 | 4471 | */ |
| 4472 | -function geodir_get_client_name( $user_id ) {
|
|
| 4472 | +function geodir_get_client_name($user_id) {
|
|
| 4473 | 4473 | $client_name = ''; |
| 4474 | 4474 | |
| 4475 | - $user_data = get_userdata( $user_id ); |
|
| 4475 | + $user_data = get_userdata($user_id); |
|
| 4476 | 4476 | |
| 4477 | - if ( ! empty( $user_data ) ) {
|
|
| 4478 | - if ( isset( $user_data->display_name ) && trim( $user_data->display_name ) != '' ) {
|
|
| 4479 | - $client_name = trim( $user_data->display_name ); |
|
| 4480 | - } else if ( isset( $user_data->user_nicename ) && trim( $user_data->user_nicename ) != '' ) {
|
|
| 4481 | - $client_name = trim( $user_data->user_nicename ); |
|
| 4477 | + if (!empty($user_data)) {
|
|
| 4478 | + if (isset($user_data->display_name) && trim($user_data->display_name) != '') {
|
|
| 4479 | + $client_name = trim($user_data->display_name); |
|
| 4480 | + } else if (isset($user_data->user_nicename) && trim($user_data->user_nicename) != '') {
|
|
| 4481 | + $client_name = trim($user_data->user_nicename); |
|
| 4482 | 4482 | } else {
|
| 4483 | - $client_name = trim( $user_data->user_login ); |
|
| 4483 | + $client_name = trim($user_data->user_login); |
|
| 4484 | 4484 | } |
| 4485 | 4485 | } |
| 4486 | 4486 | |
@@ -4488,17 +4488,17 @@ discard block |
||
| 4488 | 4488 | } |
| 4489 | 4489 | |
| 4490 | 4490 | |
| 4491 | -add_filter( 'wpseo_replacements', 'geodir_wpseo_replacements', 10, 1 ); |
|
| 4491 | +add_filter('wpseo_replacements', 'geodir_wpseo_replacements', 10, 1);
|
|
| 4492 | 4492 | /* |
| 4493 | 4493 | * Add location variables to wpseo replacements. |
| 4494 | 4494 | * |
| 4495 | 4495 | * @since 1.5.4 |
| 4496 | 4496 | */ |
| 4497 | -function geodir_wpseo_replacements( $vars ) {
|
|
| 4497 | +function geodir_wpseo_replacements($vars) {
|
|
| 4498 | 4498 | |
| 4499 | 4499 | // location variables |
| 4500 | 4500 | $gd_post_type = geodir_get_current_posttype(); |
| 4501 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 4501 | + $location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 4502 | 4502 | /** |
| 4503 | 4503 | * Filter the title variables location variables array |
| 4504 | 4504 | * |
@@ -4508,7 +4508,7 @@ discard block |
||
| 4508 | 4508 | * @param array $location_array The array of location variables. |
| 4509 | 4509 | * @param array $vars The page title variables. |
| 4510 | 4510 | */ |
| 4511 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr_seo', $location_array, $vars ); |
|
| 4511 | + $location_array = apply_filters('geodir_filter_title_variables_location_arr_seo', $location_array, $vars);
|
|
| 4512 | 4512 | |
| 4513 | 4513 | |
| 4514 | 4514 | $location_replace_vars = geodir_location_replace_vars($location_array, NULL, ''); |
@@ -4523,13 +4523,13 @@ discard block |
||
| 4523 | 4523 | * @param string $vars The title with variables. |
| 4524 | 4524 | * @param array $location_array The array of location variables. |
| 4525 | 4525 | */ |
| 4526 | - return apply_filters( 'geodir_wpseo_replacements_vars', $vars, $location_array ); |
|
| 4526 | + return apply_filters('geodir_wpseo_replacements_vars', $vars, $location_array);
|
|
| 4527 | 4527 | } |
| 4528 | 4528 | |
| 4529 | 4529 | |
| 4530 | -add_filter( 'geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3 ); |
|
| 4531 | -add_filter( 'geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2 ); |
|
| 4532 | -add_filter( 'geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3 ); |
|
| 4530 | +add_filter('geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3);
|
|
| 4531 | +add_filter('geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2);
|
|
| 4532 | +add_filter('geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3);
|
|
| 4533 | 4533 | |
| 4534 | 4534 | /** |
| 4535 | 4535 | * Filter the title variables. |
@@ -4571,14 +4571,14 @@ discard block |
||
| 4571 | 4571 | * |
| 4572 | 4572 | * @return string Title after filtered variables. |
| 4573 | 4573 | */ |
| 4574 | -function geodir_filter_title_variables( $title, $gd_page, $sep = '' ) {
|
|
| 4574 | +function geodir_filter_title_variables($title, $gd_page, $sep = '') {
|
|
| 4575 | 4575 | global $wp, $post; |
| 4576 | 4576 | |
| 4577 | - if ( ! $gd_page || ! $title ) {
|
|
| 4577 | + if (!$gd_page || !$title) {
|
|
| 4578 | 4578 | return $title; // if no a GD page then bail. |
| 4579 | 4579 | } |
| 4580 | 4580 | |
| 4581 | - if ( $sep == '' ) {
|
|
| 4581 | + if ($sep == '') {
|
|
| 4582 | 4582 | /** |
| 4583 | 4583 | * Filter the page title separator. |
| 4584 | 4584 | * |
@@ -4587,100 +4587,100 @@ discard block |
||
| 4587 | 4587 | * |
| 4588 | 4588 | * @param string $sep The separator, default: `|`. |
| 4589 | 4589 | */ |
| 4590 | - $sep = apply_filters( 'geodir_page_title_separator', '|' ); |
|
| 4590 | + $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 4591 | 4591 | } |
| 4592 | 4592 | |
| 4593 | - if ( strpos( $title, '%%title%%' ) !== false ) {
|
|
| 4594 | - $title = str_replace( "%%title%%", $post->post_title, $title ); |
|
| 4593 | + if (strpos($title, '%%title%%') !== false) {
|
|
| 4594 | + $title = str_replace("%%title%%", $post->post_title, $title);
|
|
| 4595 | 4595 | } |
| 4596 | 4596 | |
| 4597 | - if ( strpos( $title, '%%sitename%%' ) !== false ) {
|
|
| 4598 | - $title = str_replace( "%%sitename%%", get_bloginfo( 'name' ), $title ); |
|
| 4597 | + if (strpos($title, '%%sitename%%') !== false) {
|
|
| 4598 | + $title = str_replace("%%sitename%%", get_bloginfo('name'), $title);
|
|
| 4599 | 4599 | } |
| 4600 | 4600 | |
| 4601 | - if ( strpos( $title, '%%sitedesc%%' ) !== false ) {
|
|
| 4602 | - $title = str_replace( "%%sitedesc%%", get_bloginfo( 'description' ), $title ); |
|
| 4601 | + if (strpos($title, '%%sitedesc%%') !== false) {
|
|
| 4602 | + $title = str_replace("%%sitedesc%%", get_bloginfo('description'), $title);
|
|
| 4603 | 4603 | } |
| 4604 | 4604 | |
| 4605 | - if ( strpos( $title, '%%excerpt%%' ) !== false ) {
|
|
| 4606 | - $title = str_replace( "%%excerpt%%", strip_tags( get_the_excerpt() ), $title ); |
|
| 4605 | + if (strpos($title, '%%excerpt%%') !== false) {
|
|
| 4606 | + $title = str_replace("%%excerpt%%", strip_tags(get_the_excerpt()), $title);
|
|
| 4607 | 4607 | } |
| 4608 | 4608 | |
| 4609 | - if ( $gd_page == 'search' || $gd_page == 'author' ) {
|
|
| 4610 | - $post_type = isset( $_REQUEST['stype'] ) ? sanitize_text_field( $_REQUEST['stype'] ) : ''; |
|
| 4611 | - } else if ( $gd_page == 'add-listing' ) {
|
|
| 4612 | - $post_type = ( isset( $_REQUEST['listing_type'] ) ) ? sanitize_text_field( $_REQUEST['listing_type'] ) : ''; |
|
| 4613 | - $post_type = ! $post_type && ! empty( $_REQUEST['pid'] ) ? get_post_type( (int) $_REQUEST['pid'] ) : $post_type; |
|
| 4614 | - } else if ( isset( $post->post_type ) && $post->post_type && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 4609 | + if ($gd_page == 'search' || $gd_page == 'author') {
|
|
| 4610 | + $post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : ''; |
|
| 4611 | + } else if ($gd_page == 'add-listing') {
|
|
| 4612 | + $post_type = (isset($_REQUEST['listing_type'])) ? sanitize_text_field($_REQUEST['listing_type']) : ''; |
|
| 4613 | + $post_type = !$post_type && !empty($_REQUEST['pid']) ? get_post_type((int) $_REQUEST['pid']) : $post_type; |
|
| 4614 | + } else if (isset($post->post_type) && $post->post_type && in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 4615 | 4615 | $post_type = $post->post_type; |
| 4616 | 4616 | } else {
|
| 4617 | - $post_type = get_query_var( 'post_type' ); |
|
| 4617 | + $post_type = get_query_var('post_type');
|
|
| 4618 | 4618 | } |
| 4619 | 4619 | |
| 4620 | - if ( strpos( $title, '%%pt_single%%' ) !== false ) {
|
|
| 4620 | + if (strpos($title, '%%pt_single%%') !== false) {
|
|
| 4621 | 4621 | $singular_name = ''; |
| 4622 | - if ( $post_type && $singular_name = get_post_type_singular_label( $post_type ) ) {
|
|
| 4623 | - $singular_name = __( $singular_name, 'geodirectory' ); |
|
| 4622 | + if ($post_type && $singular_name = get_post_type_singular_label($post_type)) {
|
|
| 4623 | + $singular_name = __($singular_name, 'geodirectory'); |
|
| 4624 | 4624 | } |
| 4625 | 4625 | |
| 4626 | - $title = str_replace( "%%pt_single%%", $singular_name, $title ); |
|
| 4626 | + $title = str_replace("%%pt_single%%", $singular_name, $title);
|
|
| 4627 | 4627 | } |
| 4628 | 4628 | |
| 4629 | - if ( strpos( $title, '%%pt_plural%%' ) !== false ) {
|
|
| 4629 | + if (strpos($title, '%%pt_plural%%') !== false) {
|
|
| 4630 | 4630 | $plural_name = ''; |
| 4631 | - if ( $post_type && $plural_name = get_post_type_plural_label( $post_type ) ) {
|
|
| 4632 | - $plural_name = __( $plural_name, 'geodirectory' ); |
|
| 4631 | + if ($post_type && $plural_name = get_post_type_plural_label($post_type)) {
|
|
| 4632 | + $plural_name = __($plural_name, 'geodirectory'); |
|
| 4633 | 4633 | } |
| 4634 | 4634 | |
| 4635 | - $title = str_replace( "%%pt_plural%%", $plural_name, $title ); |
|
| 4635 | + $title = str_replace("%%pt_plural%%", $plural_name, $title);
|
|
| 4636 | 4636 | } |
| 4637 | 4637 | |
| 4638 | - if ( strpos( $title, '%%category%%' ) !== false ) {
|
|
| 4638 | + if (strpos($title, '%%category%%') !== false) {
|
|
| 4639 | 4639 | $cat_name = ''; |
| 4640 | 4640 | |
| 4641 | - if ( $gd_page == 'detail' ) {
|
|
| 4642 | - if ( $post->default_category ) {
|
|
| 4643 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); |
|
| 4644 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; |
|
| 4641 | + if ($gd_page == 'detail') {
|
|
| 4642 | + if ($post->default_category) {
|
|
| 4643 | + $cat = get_term($post->default_category, $post->post_type.'category'); |
|
| 4644 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; |
|
| 4645 | 4645 | } |
| 4646 | - } else if ( $gd_page == 'listing' ) {
|
|
| 4646 | + } else if ($gd_page == 'listing') {
|
|
| 4647 | 4647 | $queried_object = get_queried_object(); |
| 4648 | - if ( isset( $queried_object->name ) ) {
|
|
| 4648 | + if (isset($queried_object->name)) {
|
|
| 4649 | 4649 | $cat_name = $queried_object->name; |
| 4650 | 4650 | } |
| 4651 | 4651 | } |
| 4652 | - $title = str_replace( "%%category%%", $cat_name, $title ); |
|
| 4652 | + $title = str_replace("%%category%%", $cat_name, $title);
|
|
| 4653 | 4653 | } |
| 4654 | 4654 | |
| 4655 | - if ( strpos( $title, '%%tag%%' ) !== false ) {
|
|
| 4655 | + if (strpos($title, '%%tag%%') !== false) {
|
|
| 4656 | 4656 | $cat_name = ''; |
| 4657 | 4657 | |
| 4658 | - if ( $gd_page == 'detail' ) {
|
|
| 4659 | - if ( $post->default_category ) {
|
|
| 4660 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); |
|
| 4661 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; |
|
| 4658 | + if ($gd_page == 'detail') {
|
|
| 4659 | + if ($post->default_category) {
|
|
| 4660 | + $cat = get_term($post->default_category, $post->post_type.'category'); |
|
| 4661 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; |
|
| 4662 | 4662 | } |
| 4663 | - } else if ( $gd_page == 'listing' ) {
|
|
| 4663 | + } else if ($gd_page == 'listing') {
|
|
| 4664 | 4664 | $queried_object = get_queried_object(); |
| 4665 | - if ( isset( $queried_object->name ) ) {
|
|
| 4665 | + if (isset($queried_object->name)) {
|
|
| 4666 | 4666 | $cat_name = $queried_object->name; |
| 4667 | 4667 | } |
| 4668 | 4668 | } |
| 4669 | - $title = str_replace( "%%tag%%", $cat_name, $title ); |
|
| 4669 | + $title = str_replace("%%tag%%", $cat_name, $title);
|
|
| 4670 | 4670 | } |
| 4671 | 4671 | |
| 4672 | - if ( strpos( $title, '%%id%%' ) !== false ) {
|
|
| 4673 | - $ID = ( isset( $post->ID ) ) ? $post->ID : ''; |
|
| 4674 | - $title = str_replace( "%%id%%", $ID, $title ); |
|
| 4672 | + if (strpos($title, '%%id%%') !== false) {
|
|
| 4673 | + $ID = (isset($post->ID)) ? $post->ID : ''; |
|
| 4674 | + $title = str_replace("%%id%%", $ID, $title);
|
|
| 4675 | 4675 | } |
| 4676 | 4676 | |
| 4677 | - if ( strpos( $title, '%%sep%%' ) !== false ) {
|
|
| 4678 | - $title = str_replace( "%%sep%%", $sep, $title ); |
|
| 4677 | + if (strpos($title, '%%sep%%') !== false) {
|
|
| 4678 | + $title = str_replace("%%sep%%", $sep, $title);
|
|
| 4679 | 4679 | } |
| 4680 | 4680 | |
| 4681 | 4681 | // location variables |
| 4682 | 4682 | $gd_post_type = geodir_get_current_posttype(); |
| 4683 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 4683 | + $location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 4684 | 4684 | |
| 4685 | 4685 | /** |
| 4686 | 4686 | * Filter the title variables location variables array |
@@ -4693,20 +4693,20 @@ discard block |
||
| 4693 | 4693 | * @param string $gd_page The page being filtered. |
| 4694 | 4694 | * @param string $sep The separator, default: `|`. |
| 4695 | 4695 | */ |
| 4696 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep ); |
|
| 4696 | + $location_array = apply_filters('geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep);
|
|
| 4697 | 4697 | |
| 4698 | - if ( $gd_page == 'location' && get_query_var( 'gd_country_full' ) ) {
|
|
| 4699 | - if ( get_query_var( 'gd_country_full' ) ) {
|
|
| 4700 | - $location_array['gd_country'] = get_query_var( 'gd_country_full' ); |
|
| 4698 | + if ($gd_page == 'location' && get_query_var('gd_country_full')) {
|
|
| 4699 | + if (get_query_var('gd_country_full')) {
|
|
| 4700 | + $location_array['gd_country'] = get_query_var('gd_country_full');
|
|
| 4701 | 4701 | } |
| 4702 | - if ( get_query_var( 'gd_region_full' ) ) {
|
|
| 4703 | - $location_array['gd_region'] = get_query_var( 'gd_region_full' ); |
|
| 4702 | + if (get_query_var('gd_region_full')) {
|
|
| 4703 | + $location_array['gd_region'] = get_query_var('gd_region_full');
|
|
| 4704 | 4704 | } |
| 4705 | - if ( get_query_var( 'gd_city_full' ) ) {
|
|
| 4706 | - $location_array['gd_city'] = get_query_var( 'gd_city_full' ); |
|
| 4705 | + if (get_query_var('gd_city_full')) {
|
|
| 4706 | + $location_array['gd_city'] = get_query_var('gd_city_full');
|
|
| 4707 | 4707 | } |
| 4708 | - if ( get_query_var( 'gd_neighbourhood_full' ) ) {
|
|
| 4709 | - $location_array['gd_neighbourhood'] = get_query_var( 'gd_neighbourhood_full' ); |
|
| 4708 | + if (get_query_var('gd_neighbourhood_full')) {
|
|
| 4709 | + $location_array['gd_neighbourhood'] = get_query_var('gd_neighbourhood_full');
|
|
| 4710 | 4710 | } |
| 4711 | 4711 | } |
| 4712 | 4712 | |
@@ -4721,57 +4721,57 @@ discard block |
||
| 4721 | 4721 | * @param string $gd_page The page being filtered. |
| 4722 | 4722 | * @param string $sep The separator, default: `|`. |
| 4723 | 4723 | */ |
| 4724 | - $title = apply_filters( 'geodir_replace_location_variables', $title, $location_array, $gd_page, $sep ); |
|
| 4724 | + $title = apply_filters('geodir_replace_location_variables', $title, $location_array, $gd_page, $sep);
|
|
| 4725 | 4725 | |
| 4726 | - if ( strpos( $title, '%%search_term%%' ) !== false ) {
|
|
| 4726 | + if (strpos($title, '%%search_term%%') !== false) {
|
|
| 4727 | 4727 | $search_term = ''; |
| 4728 | - if ( isset( $_REQUEST['s'] ) ) {
|
|
| 4729 | - $search_term = esc_attr( $_REQUEST['s'] ); |
|
| 4728 | + if (isset($_REQUEST['s'])) {
|
|
| 4729 | + $search_term = esc_attr($_REQUEST['s']); |
|
| 4730 | 4730 | } |
| 4731 | - $title = str_replace( "%%search_term%%", $search_term, $title ); |
|
| 4731 | + $title = str_replace("%%search_term%%", $search_term, $title);
|
|
| 4732 | 4732 | } |
| 4733 | 4733 | |
| 4734 | - if ( strpos( $title, '%%search_near%%' ) !== false ) {
|
|
| 4734 | + if (strpos($title, '%%search_near%%') !== false) {
|
|
| 4735 | 4735 | $search_term = ''; |
| 4736 | - if ( isset( $_REQUEST['snear'] ) ) {
|
|
| 4737 | - $search_term = esc_attr( $_REQUEST['snear'] ); |
|
| 4736 | + if (isset($_REQUEST['snear'])) {
|
|
| 4737 | + $search_term = esc_attr($_REQUEST['snear']); |
|
| 4738 | 4738 | } |
| 4739 | - $title = str_replace( "%%search_near%%", $search_term, $title ); |
|
| 4739 | + $title = str_replace("%%search_near%%", $search_term, $title);
|
|
| 4740 | 4740 | } |
| 4741 | 4741 | |
| 4742 | - if ( strpos( $title, '%%name%%' ) !== false ) {
|
|
| 4743 | - if ( is_author() ) {
|
|
| 4744 | - $curauth = ( get_query_var( 'author_name' ) ) ? get_user_by( 'slug', get_query_var( 'author_name' ) ) : get_userdata( get_query_var( 'author' ) ); |
|
| 4742 | + if (strpos($title, '%%name%%') !== false) {
|
|
| 4743 | + if (is_author()) {
|
|
| 4744 | + $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 4745 | 4745 | $author_name = $curauth->display_name; |
| 4746 | 4746 | } else {
|
| 4747 | 4747 | $author_name = get_the_author(); |
| 4748 | 4748 | } |
| 4749 | - if ( ! $author_name || $author_name === '' ) {
|
|
| 4749 | + if (!$author_name || $author_name === '') {
|
|
| 4750 | 4750 | $queried_object = get_queried_object(); |
| 4751 | 4751 | |
| 4752 | - if ( isset( $queried_object->data->user_nicename ) ) {
|
|
| 4752 | + if (isset($queried_object->data->user_nicename)) {
|
|
| 4753 | 4753 | $author_name = $queried_object->data->display_name; |
| 4754 | 4754 | } |
| 4755 | 4755 | } |
| 4756 | - $title = str_replace( "%%name%%", $author_name, $title ); |
|
| 4756 | + $title = str_replace("%%name%%", $author_name, $title);
|
|
| 4757 | 4757 | } |
| 4758 | 4758 | |
| 4759 | - if ( strpos( $title, '%%page%%' ) !== false ) {
|
|
| 4760 | - $page = geodir_title_meta_page( $sep ); |
|
| 4761 | - $title = str_replace( "%%page%%", $page, $title ); |
|
| 4759 | + if (strpos($title, '%%page%%') !== false) {
|
|
| 4760 | + $page = geodir_title_meta_page($sep); |
|
| 4761 | + $title = str_replace("%%page%%", $page, $title);
|
|
| 4762 | 4762 | } |
| 4763 | - if ( strpos( $title, '%%pagenumber%%' ) !== false ) {
|
|
| 4763 | + if (strpos($title, '%%pagenumber%%') !== false) {
|
|
| 4764 | 4764 | $pagenumber = geodir_title_meta_pagenumber(); |
| 4765 | - $title = str_replace( "%%pagenumber%%", $pagenumber, $title ); |
|
| 4765 | + $title = str_replace("%%pagenumber%%", $pagenumber, $title);
|
|
| 4766 | 4766 | } |
| 4767 | - if ( strpos( $title, '%%pagetotal%%' ) !== false ) {
|
|
| 4767 | + if (strpos($title, '%%pagetotal%%') !== false) {
|
|
| 4768 | 4768 | $pagetotal = geodir_title_meta_pagetotal(); |
| 4769 | - $title = str_replace( "%%pagetotal%%", $pagetotal, $title ); |
|
| 4769 | + $title = str_replace("%%pagetotal%%", $pagetotal, $title);
|
|
| 4770 | 4770 | } |
| 4771 | 4771 | |
| 4772 | - $title = wptexturize( $title ); |
|
| 4773 | - $title = convert_chars( $title ); |
|
| 4774 | - $title = esc_html( $title ); |
|
| 4772 | + $title = wptexturize($title); |
|
| 4773 | + $title = convert_chars($title); |
|
| 4774 | + $title = esc_html($title); |
|
| 4775 | 4775 | |
| 4776 | 4776 | /** |
| 4777 | 4777 | * Filter the title variables after standard ones have been filtered. |
@@ -4785,7 +4785,7 @@ discard block |
||
| 4785 | 4785 | * @param string $sep The separator, default: `|`. |
| 4786 | 4786 | */ |
| 4787 | 4787 | |
| 4788 | - return apply_filters( 'geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep ); |
|
| 4788 | + return apply_filters('geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep);
|
|
| 4789 | 4789 | } |
| 4790 | 4790 | |
| 4791 | 4791 | /** |
@@ -4798,82 +4798,82 @@ discard block |
||
| 4798 | 4798 | * |
| 4799 | 4799 | * @return array Translation texts. |
| 4800 | 4800 | */ |
| 4801 | -function geodir_load_cpt_text_translation( $translation_texts = array() ) {
|
|
| 4802 | - $gd_post_types = geodir_get_posttypes( 'array' ); |
|
| 4801 | +function geodir_load_cpt_text_translation($translation_texts = array()) {
|
|
| 4802 | + $gd_post_types = geodir_get_posttypes('array');
|
|
| 4803 | 4803 | |
| 4804 | - if ( ! empty( $gd_post_types ) ) {
|
|
| 4805 | - foreach ( $gd_post_types as $post_type => $cpt_info ) {
|
|
| 4806 | - $labels = isset( $cpt_info['labels'] ) ? $cpt_info['labels'] : ''; |
|
| 4807 | - $description = isset( $cpt_info['description'] ) ? $cpt_info['description'] : ''; |
|
| 4808 | - $seo = isset( $cpt_info['seo'] ) ? $cpt_info['seo'] : ''; |
|
| 4804 | + if (!empty($gd_post_types)) {
|
|
| 4805 | + foreach ($gd_post_types as $post_type => $cpt_info) {
|
|
| 4806 | + $labels = isset($cpt_info['labels']) ? $cpt_info['labels'] : ''; |
|
| 4807 | + $description = isset($cpt_info['description']) ? $cpt_info['description'] : ''; |
|
| 4808 | + $seo = isset($cpt_info['seo']) ? $cpt_info['seo'] : ''; |
|
| 4809 | 4809 | |
| 4810 | - if ( ! empty( $labels ) ) {
|
|
| 4811 | - if ( $labels['name'] != '' && ! in_array( $labels['name'], $translation_texts ) ) {
|
|
| 4810 | + if (!empty($labels)) {
|
|
| 4811 | + if ($labels['name'] != '' && !in_array($labels['name'], $translation_texts)) {
|
|
| 4812 | 4812 | $translation_texts[] = $labels['name']; |
| 4813 | 4813 | } |
| 4814 | - if ( $labels['singular_name'] != '' && ! in_array( $labels['singular_name'], $translation_texts ) ) {
|
|
| 4814 | + if ($labels['singular_name'] != '' && !in_array($labels['singular_name'], $translation_texts)) {
|
|
| 4815 | 4815 | $translation_texts[] = $labels['singular_name']; |
| 4816 | 4816 | } |
| 4817 | - if ( $labels['add_new'] != '' && ! in_array( $labels['add_new'], $translation_texts ) ) {
|
|
| 4817 | + if ($labels['add_new'] != '' && !in_array($labels['add_new'], $translation_texts)) {
|
|
| 4818 | 4818 | $translation_texts[] = $labels['add_new']; |
| 4819 | 4819 | } |
| 4820 | - if ( $labels['add_new_item'] != '' && ! in_array( $labels['add_new_item'], $translation_texts ) ) {
|
|
| 4820 | + if ($labels['add_new_item'] != '' && !in_array($labels['add_new_item'], $translation_texts)) {
|
|
| 4821 | 4821 | $translation_texts[] = $labels['add_new_item']; |
| 4822 | 4822 | } |
| 4823 | - if ( $labels['edit_item'] != '' && ! in_array( $labels['edit_item'], $translation_texts ) ) {
|
|
| 4823 | + if ($labels['edit_item'] != '' && !in_array($labels['edit_item'], $translation_texts)) {
|
|
| 4824 | 4824 | $translation_texts[] = $labels['edit_item']; |
| 4825 | 4825 | } |
| 4826 | - if ( $labels['new_item'] != '' && ! in_array( $labels['new_item'], $translation_texts ) ) {
|
|
| 4826 | + if ($labels['new_item'] != '' && !in_array($labels['new_item'], $translation_texts)) {
|
|
| 4827 | 4827 | $translation_texts[] = $labels['new_item']; |
| 4828 | 4828 | } |
| 4829 | - if ( $labels['view_item'] != '' && ! in_array( $labels['view_item'], $translation_texts ) ) {
|
|
| 4829 | + if ($labels['view_item'] != '' && !in_array($labels['view_item'], $translation_texts)) {
|
|
| 4830 | 4830 | $translation_texts[] = $labels['view_item']; |
| 4831 | 4831 | } |
| 4832 | - if ( $labels['search_items'] != '' && ! in_array( $labels['search_items'], $translation_texts ) ) {
|
|
| 4832 | + if ($labels['search_items'] != '' && !in_array($labels['search_items'], $translation_texts)) {
|
|
| 4833 | 4833 | $translation_texts[] = $labels['search_items']; |
| 4834 | 4834 | } |
| 4835 | - if ( $labels['not_found'] != '' && ! in_array( $labels['not_found'], $translation_texts ) ) {
|
|
| 4835 | + if ($labels['not_found'] != '' && !in_array($labels['not_found'], $translation_texts)) {
|
|
| 4836 | 4836 | $translation_texts[] = $labels['not_found']; |
| 4837 | 4837 | } |
| 4838 | - if ( $labels['not_found_in_trash'] != '' && ! in_array( $labels['not_found_in_trash'], $translation_texts ) ) {
|
|
| 4838 | + if ($labels['not_found_in_trash'] != '' && !in_array($labels['not_found_in_trash'], $translation_texts)) {
|
|
| 4839 | 4839 | $translation_texts[] = $labels['not_found_in_trash']; |
| 4840 | 4840 | } |
| 4841 | - if ( isset( $labels['label_post_profile'] ) && $labels['label_post_profile'] != '' && ! in_array( $labels['label_post_profile'], $translation_texts ) ) {
|
|
| 4841 | + if (isset($labels['label_post_profile']) && $labels['label_post_profile'] != '' && !in_array($labels['label_post_profile'], $translation_texts)) {
|
|
| 4842 | 4842 | $translation_texts[] = $labels['label_post_profile']; |
| 4843 | 4843 | } |
| 4844 | - if ( isset( $labels['label_post_info'] ) && $labels['label_post_info'] != '' && ! in_array( $labels['label_post_info'], $translation_texts ) ) {
|
|
| 4844 | + if (isset($labels['label_post_info']) && $labels['label_post_info'] != '' && !in_array($labels['label_post_info'], $translation_texts)) {
|
|
| 4845 | 4845 | $translation_texts[] = $labels['label_post_info']; |
| 4846 | 4846 | } |
| 4847 | - if ( isset( $labels['label_post_images'] ) && $labels['label_post_images'] != '' && ! in_array( $labels['label_post_images'], $translation_texts ) ) {
|
|
| 4847 | + if (isset($labels['label_post_images']) && $labels['label_post_images'] != '' && !in_array($labels['label_post_images'], $translation_texts)) {
|
|
| 4848 | 4848 | $translation_texts[] = $labels['label_post_images']; |
| 4849 | 4849 | } |
| 4850 | - if ( isset( $labels['label_post_map'] ) && $labels['label_post_map'] != '' && ! in_array( $labels['label_post_map'], $translation_texts ) ) {
|
|
| 4850 | + if (isset($labels['label_post_map']) && $labels['label_post_map'] != '' && !in_array($labels['label_post_map'], $translation_texts)) {
|
|
| 4851 | 4851 | $translation_texts[] = $labels['label_post_map']; |
| 4852 | 4852 | } |
| 4853 | - if ( isset( $labels['label_reviews'] ) && $labels['label_reviews'] != '' && ! in_array( $labels['label_reviews'], $translation_texts ) ) {
|
|
| 4853 | + if (isset($labels['label_reviews']) && $labels['label_reviews'] != '' && !in_array($labels['label_reviews'], $translation_texts)) {
|
|
| 4854 | 4854 | $translation_texts[] = $labels['label_reviews']; |
| 4855 | 4855 | } |
| 4856 | - if ( isset( $labels['label_related_listing'] ) && $labels['label_related_listing'] != '' && ! in_array( $labels['label_related_listing'], $translation_texts ) ) {
|
|
| 4856 | + if (isset($labels['label_related_listing']) && $labels['label_related_listing'] != '' && !in_array($labels['label_related_listing'], $translation_texts)) {
|
|
| 4857 | 4857 | $translation_texts[] = $labels['label_related_listing']; |
| 4858 | 4858 | } |
| 4859 | 4859 | } |
| 4860 | 4860 | |
| 4861 | - if ( $description != '' && ! in_array( $description, $translation_texts ) ) {
|
|
| 4862 | - $translation_texts[] = normalize_whitespace( $description ); |
|
| 4861 | + if ($description != '' && !in_array($description, $translation_texts)) {
|
|
| 4862 | + $translation_texts[] = normalize_whitespace($description); |
|
| 4863 | 4863 | } |
| 4864 | 4864 | |
| 4865 | - if ( ! empty( $seo ) ) {
|
|
| 4866 | - if ( isset( $seo['meta_keyword'] ) && $seo['meta_keyword'] != '' && ! in_array( $seo['meta_keyword'], $translation_texts ) ) {
|
|
| 4867 | - $translation_texts[] = normalize_whitespace( $seo['meta_keyword'] ); |
|
| 4865 | + if (!empty($seo)) {
|
|
| 4866 | + if (isset($seo['meta_keyword']) && $seo['meta_keyword'] != '' && !in_array($seo['meta_keyword'], $translation_texts)) {
|
|
| 4867 | + $translation_texts[] = normalize_whitespace($seo['meta_keyword']); |
|
| 4868 | 4868 | } |
| 4869 | 4869 | |
| 4870 | - if ( isset( $seo['meta_description'] ) && $seo['meta_description'] != '' && ! in_array( $seo['meta_description'], $translation_texts ) ) {
|
|
| 4871 | - $translation_texts[] = normalize_whitespace( $seo['meta_description'] ); |
|
| 4870 | + if (isset($seo['meta_description']) && $seo['meta_description'] != '' && !in_array($seo['meta_description'], $translation_texts)) {
|
|
| 4871 | + $translation_texts[] = normalize_whitespace($seo['meta_description']); |
|
| 4872 | 4872 | } |
| 4873 | 4873 | } |
| 4874 | 4874 | } |
| 4875 | 4875 | } |
| 4876 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; |
|
| 4876 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 4877 | 4877 | |
| 4878 | 4878 | return $translation_texts; |
| 4879 | 4879 | } |
@@ -4888,27 +4888,27 @@ discard block |
||
| 4888 | 4888 | * |
| 4889 | 4889 | * @return array Location terms. |
| 4890 | 4890 | */ |
| 4891 | -function geodir_remove_location_terms( $location_terms = array() ) {
|
|
| 4892 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; |
|
| 4891 | +function geodir_remove_location_terms($location_terms = array()) {
|
|
| 4892 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 4893 | 4893 | |
| 4894 | - if ( ! empty( $location_terms ) && $location_manager ) {
|
|
| 4895 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); |
|
| 4896 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); |
|
| 4894 | + if (!empty($location_terms) && $location_manager) {
|
|
| 4895 | + $hide_country_part = get_option('geodir_location_hide_country_part');
|
|
| 4896 | + $hide_region_part = get_option('geodir_location_hide_region_part');
|
|
| 4897 | 4897 | |
| 4898 | - if ( $hide_region_part && $hide_country_part ) {
|
|
| 4899 | - if ( isset( $location_terms['gd_country'] ) ) {
|
|
| 4900 | - unset( $location_terms['gd_country'] ); |
|
| 4898 | + if ($hide_region_part && $hide_country_part) {
|
|
| 4899 | + if (isset($location_terms['gd_country'])) {
|
|
| 4900 | + unset($location_terms['gd_country']); |
|
| 4901 | 4901 | } |
| 4902 | - if ( isset( $location_terms['gd_region'] ) ) {
|
|
| 4903 | - unset( $location_terms['gd_region'] ); |
|
| 4902 | + if (isset($location_terms['gd_region'])) {
|
|
| 4903 | + unset($location_terms['gd_region']); |
|
| 4904 | 4904 | } |
| 4905 | - } else if ( $hide_region_part && ! $hide_country_part ) {
|
|
| 4906 | - if ( isset( $location_terms['gd_region'] ) ) {
|
|
| 4907 | - unset( $location_terms['gd_region'] ); |
|
| 4905 | + } else if ($hide_region_part && !$hide_country_part) {
|
|
| 4906 | + if (isset($location_terms['gd_region'])) {
|
|
| 4907 | + unset($location_terms['gd_region']); |
|
| 4908 | 4908 | } |
| 4909 | - } else if ( ! $hide_region_part && $hide_country_part ) {
|
|
| 4910 | - if ( isset( $location_terms['gd_country'] ) ) {
|
|
| 4911 | - unset( $location_terms['gd_country'] ); |
|
| 4909 | + } else if (!$hide_region_part && $hide_country_part) {
|
|
| 4910 | + if (isset($location_terms['gd_country'])) {
|
|
| 4911 | + unset($location_terms['gd_country']); |
|
| 4912 | 4912 | } |
| 4913 | 4913 | } |
| 4914 | 4914 | } |
@@ -4926,33 +4926,33 @@ discard block |
||
| 4926 | 4926 | * @param WP_Post $post Post object. |
| 4927 | 4927 | * @param bool $update Whether this is an existing listing being updated or not. |
| 4928 | 4928 | */ |
| 4929 | -function geodir_on_wp_insert_post( $post_ID, $post, $update ) {
|
|
| 4930 | - if ( ! $update ) {
|
|
| 4929 | +function geodir_on_wp_insert_post($post_ID, $post, $update) {
|
|
| 4930 | + if (!$update) {
|
|
| 4931 | 4931 | return; |
| 4932 | 4932 | } |
| 4933 | 4933 | |
| 4934 | - $action = isset( $_REQUEST['action'] ) ? sanitize_text_field( $_REQUEST['action'] ) : ''; |
|
| 4935 | - $is_admin = is_admin() && ( ! defined( 'DOING_AJAX' ) || ( defined( 'DOING_AJAX' ) && ! DOING_AJAX ) ) ? true : false; |
|
| 4934 | + $action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : ''; |
|
| 4935 | + $is_admin = is_admin() && (!defined('DOING_AJAX') || (defined('DOING_AJAX') && !DOING_AJAX)) ? true : false;
|
|
| 4936 | 4936 | $inline_save = $action == 'inline-save' ? true : false; |
| 4937 | 4937 | |
| 4938 | - if ( empty( $post->post_type ) || $is_admin || $inline_save || ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) ) {
|
|
| 4938 | + if (empty($post->post_type) || $is_admin || $inline_save || (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)) {
|
|
| 4939 | 4939 | return; |
| 4940 | 4940 | } |
| 4941 | 4941 | |
| 4942 | - if ( $action != '' && in_array( $action, array( 'geodir_import_export' ) ) ) {
|
|
| 4942 | + if ($action != '' && in_array($action, array('geodir_import_export'))) {
|
|
| 4943 | 4943 | return; |
| 4944 | 4944 | } |
| 4945 | 4945 | |
| 4946 | 4946 | $user_id = (int) get_current_user_id(); |
| 4947 | 4947 | |
| 4948 | - if ( $user_id > 0 && get_option( 'geodir_notify_post_edited' ) && ! wp_is_post_revision( $post_ID ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 4949 | - $author_id = ! empty( $post->post_author ) ? $post->post_author : 0; |
|
| 4948 | + if ($user_id > 0 && get_option('geodir_notify_post_edited') && !wp_is_post_revision($post_ID) && in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 4949 | + $author_id = !empty($post->post_author) ? $post->post_author : 0; |
|
| 4950 | 4950 | |
| 4951 | - if ( $user_id == $author_id && ! is_super_admin() ) {
|
|
| 4952 | - $from_email = get_option( 'site_email' ); |
|
| 4951 | + if ($user_id == $author_id && !is_super_admin()) {
|
|
| 4952 | + $from_email = get_option('site_email');
|
|
| 4953 | 4953 | $from_name = get_site_emailName(); |
| 4954 | - $to_email = get_option( 'admin_email' ); |
|
| 4955 | - $to_name = get_option( 'name' ); |
|
| 4954 | + $to_email = get_option('admin_email');
|
|
| 4955 | + $to_name = get_option('name');
|
|
| 4956 | 4956 | $message_type = 'listing_edited'; |
| 4957 | 4957 | |
| 4958 | 4958 | $notify_edited = true; |
@@ -4964,9 +4964,9 @@ discard block |
||
| 4964 | 4964 | * @param bool $notify_edited Notify on listing edited by author? |
| 4965 | 4965 | * @param object $post The current post object. |
| 4966 | 4966 | */ |
| 4967 | - $notify_edited = apply_filters( 'geodir_notify_on_listing_edited', $notify_edited, $post ); |
|
| 4967 | + $notify_edited = apply_filters('geodir_notify_on_listing_edited', $notify_edited, $post);
|
|
| 4968 | 4968 | |
| 4969 | - geodir_sendEmail( $from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID ); |
|
| 4969 | + geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID); |
|
| 4970 | 4970 | } |
| 4971 | 4971 | } |
| 4972 | 4972 | } |
@@ -4981,14 +4981,14 @@ discard block |
||
| 4981 | 4981 | * |
| 4982 | 4982 | * @return string|null The current page start & end numbering. |
| 4983 | 4983 | */ |
| 4984 | -function geodir_title_meta_page( $sep ) {
|
|
| 4984 | +function geodir_title_meta_page($sep) {
|
|
| 4985 | 4985 | $replacement = null; |
| 4986 | 4986 | |
| 4987 | - $max = geodir_title_meta_pagenumbering( 'max' ); |
|
| 4988 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); |
|
| 4987 | + $max = geodir_title_meta_pagenumbering('max');
|
|
| 4988 | + $nr = geodir_title_meta_pagenumbering('nr');
|
|
| 4989 | 4989 | |
| 4990 | - if ( $max > 1 && $nr > 1 ) {
|
|
| 4991 | - $replacement = sprintf( $sep . ' ' . __( 'Page %1$d of %2$d', 'geodirectory' ), $nr, $max ); |
|
| 4990 | + if ($max > 1 && $nr > 1) {
|
|
| 4991 | + $replacement = sprintf($sep.' '.__('Page %1$d of %2$d', 'geodirectory'), $nr, $max);
|
|
| 4992 | 4992 | } |
| 4993 | 4993 | |
| 4994 | 4994 | return $replacement; |
@@ -5005,8 +5005,8 @@ discard block |
||
| 5005 | 5005 | function geodir_title_meta_pagenumber() {
|
| 5006 | 5006 | $replacement = null; |
| 5007 | 5007 | |
| 5008 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); |
|
| 5009 | - if ( isset( $nr ) && $nr > 0 ) {
|
|
| 5008 | + $nr = geodir_title_meta_pagenumbering('nr');
|
|
| 5009 | + if (isset($nr) && $nr > 0) {
|
|
| 5010 | 5010 | $replacement = (string) $nr; |
| 5011 | 5011 | } |
| 5012 | 5012 | |
@@ -5024,8 +5024,8 @@ discard block |
||
| 5024 | 5024 | function geodir_title_meta_pagetotal() {
|
| 5025 | 5025 | $replacement = null; |
| 5026 | 5026 | |
| 5027 | - $max = geodir_title_meta_pagenumbering( 'max' ); |
|
| 5028 | - if ( isset( $max ) && $max > 0 ) {
|
|
| 5027 | + $max = geodir_title_meta_pagenumbering('max');
|
|
| 5028 | + if (isset($max) && $max > 0) {
|
|
| 5029 | 5029 | $replacement = (string) $max; |
| 5030 | 5030 | } |
| 5031 | 5031 | |
@@ -5045,36 +5045,36 @@ discard block |
||
| 5045 | 5045 | * |
| 5046 | 5046 | * @return int|null The current page numbering. |
| 5047 | 5047 | */ |
| 5048 | -function geodir_title_meta_pagenumbering( $request = 'nr' ) {
|
|
| 5048 | +function geodir_title_meta_pagenumbering($request = 'nr') {
|
|
| 5049 | 5049 | global $wp_query, $post; |
| 5050 | 5050 | $max_num_pages = null; |
| 5051 | 5051 | $page_number = null; |
| 5052 | 5052 | |
| 5053 | 5053 | $max_num_pages = 1; |
| 5054 | 5054 | |
| 5055 | - if ( ! is_singular() ) {
|
|
| 5056 | - $page_number = get_query_var( 'paged' ); |
|
| 5057 | - if ( $page_number === 0 || $page_number === '' ) {
|
|
| 5055 | + if (!is_singular()) {
|
|
| 5056 | + $page_number = get_query_var('paged');
|
|
| 5057 | + if ($page_number === 0 || $page_number === '') {
|
|
| 5058 | 5058 | $page_number = 1; |
| 5059 | 5059 | } |
| 5060 | 5060 | |
| 5061 | - if ( isset( $wp_query->max_num_pages ) && ( $wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0 ) ) {
|
|
| 5061 | + if (isset($wp_query->max_num_pages) && ($wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0)) {
|
|
| 5062 | 5062 | $max_num_pages = $wp_query->max_num_pages; |
| 5063 | 5063 | } |
| 5064 | 5064 | } else {
|
| 5065 | - $page_number = get_query_var( 'page' ); |
|
| 5066 | - if ( $page_number === 0 || $page_number === '' ) {
|
|
| 5065 | + $page_number = get_query_var('page');
|
|
| 5066 | + if ($page_number === 0 || $page_number === '') {
|
|
| 5067 | 5067 | $page_number = 1; |
| 5068 | 5068 | } |
| 5069 | 5069 | |
| 5070 | - if ( isset( $post->post_content ) ) {
|
|
| 5071 | - $max_num_pages = ( substr_count( $post->post_content, '<!--nextpage-->' ) + 1 ); |
|
| 5070 | + if (isset($post->post_content)) {
|
|
| 5071 | + $max_num_pages = (substr_count($post->post_content, '<!--nextpage-->') + 1); |
|
| 5072 | 5072 | } |
| 5073 | 5073 | } |
| 5074 | 5074 | |
| 5075 | 5075 | $return = null; |
| 5076 | 5076 | |
| 5077 | - switch ( $request ) {
|
|
| 5077 | + switch ($request) {
|
|
| 5078 | 5078 | case 'nr': |
| 5079 | 5079 | $return = $page_number; |
| 5080 | 5080 | break; |
@@ -5095,14 +5095,14 @@ discard block |
||
| 5095 | 5095 | * |
| 5096 | 5096 | * @return array Terms. |
| 5097 | 5097 | */ |
| 5098 | -function geodir_filter_empty_terms( $terms ) {
|
|
| 5099 | - if ( empty( $terms ) ) {
|
|
| 5098 | +function geodir_filter_empty_terms($terms) {
|
|
| 5099 | + if (empty($terms)) {
|
|
| 5100 | 5100 | return $terms; |
| 5101 | 5101 | } |
| 5102 | 5102 | |
| 5103 | 5103 | $return = array(); |
| 5104 | - foreach ( $terms as $term ) {
|
|
| 5105 | - if ( isset( $term->count ) && $term->count > 0 ) {
|
|
| 5104 | + foreach ($terms as $term) {
|
|
| 5105 | + if (isset($term->count) && $term->count > 0) {
|
|
| 5106 | 5106 | $return[] = $term; |
| 5107 | 5107 | } else {
|
| 5108 | 5108 | /** |
@@ -5113,7 +5113,7 @@ discard block |
||
| 5113 | 5113 | * @param array $return The array of terms to return. |
| 5114 | 5114 | * @param object $term The term object. |
| 5115 | 5115 | */ |
| 5116 | - $return = apply_filters( 'geodir_filter_empty_terms_filter', $return, $term ); |
|
| 5116 | + $return = apply_filters('geodir_filter_empty_terms_filter', $return, $term);
|
|
| 5117 | 5117 | } |
| 5118 | 5118 | } |
| 5119 | 5119 | |
@@ -5130,15 +5130,15 @@ discard block |
||
| 5130 | 5130 | * |
| 5131 | 5131 | * @return array |
| 5132 | 5132 | */ |
| 5133 | -function geodir_remove_hentry( $class ) {
|
|
| 5134 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 5135 | - $class = array_diff( $class, array( 'hentry' ) ); |
|
| 5133 | +function geodir_remove_hentry($class) {
|
|
| 5134 | + if (geodir_is_page('detail')) {
|
|
| 5135 | + $class = array_diff($class, array('hentry'));
|
|
| 5136 | 5136 | } |
| 5137 | 5137 | |
| 5138 | 5138 | return $class; |
| 5139 | 5139 | } |
| 5140 | 5140 | |
| 5141 | -add_filter( 'post_class', 'geodir_remove_hentry' ); |
|
| 5141 | +add_filter('post_class', 'geodir_remove_hentry');
|
|
| 5142 | 5142 | |
| 5143 | 5143 | /** |
| 5144 | 5144 | * Registers a individual text string for WPML translation. |
@@ -5150,8 +5150,8 @@ discard block |
||
| 5150 | 5150 | * @param string $domain The plugin domain. Default geodirectory. |
| 5151 | 5151 | * @param string $name The name of the string which helps to know what's being translated. |
| 5152 | 5152 | */ |
| 5153 | -function geodir_wpml_register_string( $string, $domain = 'geodirectory', $name = '' ) {
|
|
| 5154 | - do_action( 'wpml_register_single_string', $domain, $name, $string ); |
|
| 5153 | +function geodir_wpml_register_string($string, $domain = 'geodirectory', $name = '') {
|
|
| 5154 | + do_action('wpml_register_single_string', $domain, $name, $string);
|
|
| 5155 | 5155 | } |
| 5156 | 5156 | |
| 5157 | 5157 | /** |
@@ -5166,6 +5166,6 @@ discard block |
||
| 5166 | 5166 | * @param string $language_code Return the translation in this language. Default is NULL which returns the current language. |
| 5167 | 5167 | * @return string The translated string. |
| 5168 | 5168 | */ |
| 5169 | -function geodir_wpml_translate_string( $string, $domain = 'geodirectory', $name = '', $language_code = NULL ) {
|
|
| 5170 | - return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code ); |
|
| 5169 | +function geodir_wpml_translate_string($string, $domain = 'geodirectory', $name = '', $language_code = NULL) {
|
|
| 5170 | + return apply_filters('wpml_translate_single_string', $string, $domain, $name, $language_code);
|
|
| 5171 | 5171 | } |
| 5172 | 5172 | \ No newline at end of file |
@@ -14,13 +14,13 @@ discard block |
||
| 14 | 14 | * @return int|null Return the page ID if present or null if not. |
| 15 | 15 | */ |
| 16 | 16 | function geodir_add_listing_page_id(){ |
| 17 | - $gd_page_id = get_option('geodir_add_listing_page'); |
|
| 17 | + $gd_page_id = get_option('geodir_add_listing_page'); |
|
| 18 | 18 | |
| 19 | - if (function_exists('icl_object_id')) { |
|
| 20 | - $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 21 | - } |
|
| 19 | + if (function_exists('icl_object_id')) { |
|
| 20 | + $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - return $gd_page_id; |
|
| 23 | + return $gd_page_id; |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -31,13 +31,13 @@ discard block |
||
| 31 | 31 | * @return int|null Return the page ID if present or null if not. |
| 32 | 32 | */ |
| 33 | 33 | function geodir_preview_page_id(){ |
| 34 | - $gd_page_id = get_option('geodir_preview_page'); |
|
| 34 | + $gd_page_id = get_option('geodir_preview_page'); |
|
| 35 | 35 | |
| 36 | - if (function_exists('icl_object_id')) { |
|
| 37 | - $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 38 | - } |
|
| 36 | + if (function_exists('icl_object_id')) { |
|
| 37 | + $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - return $gd_page_id; |
|
| 40 | + return $gd_page_id; |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | /** |
@@ -48,13 +48,13 @@ discard block |
||
| 48 | 48 | * @return int|null Return the page ID if present or null if not. |
| 49 | 49 | */ |
| 50 | 50 | function geodir_success_page_id(){ |
| 51 | - $gd_page_id = get_option('geodir_success_page'); |
|
| 51 | + $gd_page_id = get_option('geodir_success_page'); |
|
| 52 | 52 | |
| 53 | - if (function_exists('icl_object_id')) { |
|
| 54 | - $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 55 | - } |
|
| 53 | + if (function_exists('icl_object_id')) { |
|
| 54 | + $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 55 | + } |
|
| 56 | 56 | |
| 57 | - return $gd_page_id; |
|
| 57 | + return $gd_page_id; |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |
@@ -65,13 +65,13 @@ discard block |
||
| 65 | 65 | * @return int|null Return the page ID if present or null if not. |
| 66 | 66 | */ |
| 67 | 67 | function geodir_location_page_id(){ |
| 68 | - $gd_page_id = get_option('geodir_location_page'); |
|
| 68 | + $gd_page_id = get_option('geodir_location_page'); |
|
| 69 | 69 | |
| 70 | - if (function_exists('icl_object_id')) { |
|
| 71 | - $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 72 | - } |
|
| 70 | + if (function_exists('icl_object_id')) { |
|
| 71 | + $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - return $gd_page_id; |
|
| 74 | + return $gd_page_id; |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | /** |
@@ -82,13 +82,13 @@ discard block |
||
| 82 | 82 | * @return int|null Return the page ID if present or null if not. |
| 83 | 83 | */ |
| 84 | 84 | function geodir_home_page_id(){ |
| 85 | - $gd_page_id = get_option('geodir_home_page'); |
|
| 85 | + $gd_page_id = get_option('geodir_home_page'); |
|
| 86 | 86 | |
| 87 | - if (function_exists('icl_object_id')) { |
|
| 88 | - $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 89 | - } |
|
| 87 | + if (function_exists('icl_object_id')) { |
|
| 88 | + $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 89 | + } |
|
| 90 | 90 | |
| 91 | - return $gd_page_id; |
|
| 91 | + return $gd_page_id; |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | /** |
@@ -99,13 +99,13 @@ discard block |
||
| 99 | 99 | * @return int|null Return the page ID if present or null if not. |
| 100 | 100 | */ |
| 101 | 101 | function geodir_info_page_id(){ |
| 102 | - $gd_page_id = get_option('geodir_info_page'); |
|
| 102 | + $gd_page_id = get_option('geodir_info_page'); |
|
| 103 | 103 | |
| 104 | - if (function_exists('icl_object_id')) { |
|
| 105 | - $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 106 | - } |
|
| 104 | + if (function_exists('icl_object_id')) { |
|
| 105 | + $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 106 | + } |
|
| 107 | 107 | |
| 108 | - return $gd_page_id; |
|
| 108 | + return $gd_page_id; |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | /** |
@@ -116,13 +116,13 @@ discard block |
||
| 116 | 116 | * @return int|null Return the page ID if present or null if not. |
| 117 | 117 | */ |
| 118 | 118 | function geodir_login_page_id(){ |
| 119 | - $gd_page_id = get_option('geodir_login_page'); |
|
| 119 | + $gd_page_id = get_option('geodir_login_page'); |
|
| 120 | 120 | |
| 121 | - if (function_exists('icl_object_id')) { |
|
| 122 | - $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 123 | - } |
|
| 121 | + if (function_exists('icl_object_id')) { |
|
| 122 | + $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 123 | + } |
|
| 124 | 124 | |
| 125 | - return $gd_page_id; |
|
| 125 | + return $gd_page_id; |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | |
@@ -134,15 +134,15 @@ discard block |
||
| 134 | 134 | * @return int|null Return the page ID if present or null if not. |
| 135 | 135 | */ |
| 136 | 136 | function geodir_login_url($args=array()){ |
| 137 | - $gd_page_id = get_option('geodir_login_page'); |
|
| 137 | + $gd_page_id = get_option('geodir_login_page'); |
|
| 138 | 138 | |
| 139 | - if (function_exists('icl_object_id')) { |
|
| 140 | - $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 141 | - } |
|
| 139 | + if (function_exists('icl_object_id')) { |
|
| 140 | + $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 141 | + } |
|
| 142 | 142 | |
| 143 | - if (function_exists('geodir_location_geo_home_link')) { |
|
| 144 | - remove_filter('home_url', 'geodir_location_geo_home_link', 100000); |
|
| 145 | - } |
|
| 143 | + if (function_exists('geodir_location_geo_home_link')) { |
|
| 144 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000); |
|
| 145 | + } |
|
| 146 | 146 | |
| 147 | 147 | if (defined('ICL_LANGUAGE_CODE')){ |
| 148 | 148 | $home_url = icl_get_home_url(); |
@@ -150,35 +150,35 @@ discard block |
||
| 150 | 150 | $home_url = home_url(); |
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - if (function_exists('geodir_location_geo_home_link')) { |
|
| 154 | - add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2); |
|
| 155 | - } |
|
| 156 | - |
|
| 157 | - if($gd_page_id){ |
|
| 158 | - $post = get_post($gd_page_id); |
|
| 159 | - $slug = $post->post_name; |
|
| 160 | - //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors |
|
| 161 | - $login_url = trailingslashit($home_url)."$slug/"; |
|
| 162 | - }else{ |
|
| 163 | - $login_url = trailingslashit($home_url)."?geodir_signup=true"; |
|
| 164 | - } |
|
| 165 | - |
|
| 166 | - if($args){ |
|
| 167 | - $login_url = add_query_arg($args,$login_url ); |
|
| 168 | - } |
|
| 169 | - |
|
| 170 | - /** |
|
| 171 | - * Filter the GeoDirectory login page url. |
|
| 172 | - * |
|
| 173 | - * This filter can be used to change the GeoDirectory page url. |
|
| 174 | - * |
|
| 175 | - * @since 1.5.3 |
|
| 176 | - * @package GeoDirectory |
|
| 177 | - * @param string $login_url The url of the login page. |
|
| 178 | - * @param array $args The array of query args used. |
|
| 179 | - * @param int $gd_page_id The page id of the GD login page. |
|
| 180 | - */ |
|
| 181 | - return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id); |
|
| 153 | + if (function_exists('geodir_location_geo_home_link')) { |
|
| 154 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2); |
|
| 155 | + } |
|
| 156 | + |
|
| 157 | + if($gd_page_id){ |
|
| 158 | + $post = get_post($gd_page_id); |
|
| 159 | + $slug = $post->post_name; |
|
| 160 | + //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors |
|
| 161 | + $login_url = trailingslashit($home_url)."$slug/"; |
|
| 162 | + }else{ |
|
| 163 | + $login_url = trailingslashit($home_url)."?geodir_signup=true"; |
|
| 164 | + } |
|
| 165 | + |
|
| 166 | + if($args){ |
|
| 167 | + $login_url = add_query_arg($args,$login_url ); |
|
| 168 | + } |
|
| 169 | + |
|
| 170 | + /** |
|
| 171 | + * Filter the GeoDirectory login page url. |
|
| 172 | + * |
|
| 173 | + * This filter can be used to change the GeoDirectory page url. |
|
| 174 | + * |
|
| 175 | + * @since 1.5.3 |
|
| 176 | + * @package GeoDirectory |
|
| 177 | + * @param string $login_url The url of the login page. |
|
| 178 | + * @param array $args The array of query args used. |
|
| 179 | + * @param int $gd_page_id The page id of the GD login page. |
|
| 180 | + */ |
|
| 181 | + return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id); |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | /** |
@@ -190,15 +190,15 @@ discard block |
||
| 190 | 190 | * @return string Info page url. |
| 191 | 191 | */ |
| 192 | 192 | function geodir_info_url($args=array()){ |
| 193 | - $gd_page_id = get_option('geodir_info_page'); |
|
| 193 | + $gd_page_id = get_option('geodir_info_page'); |
|
| 194 | 194 | |
| 195 | - if (function_exists('icl_object_id')) { |
|
| 196 | - $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 197 | - } |
|
| 195 | + if (function_exists('icl_object_id')) { |
|
| 196 | + $gd_page_id = icl_object_id($gd_page_id, 'page', true); |
|
| 197 | + } |
|
| 198 | 198 | |
| 199 | - if (function_exists('geodir_location_geo_home_link')) { |
|
| 200 | - remove_filter('home_url', 'geodir_location_geo_home_link', 100000); |
|
| 201 | - } |
|
| 199 | + if (function_exists('geodir_location_geo_home_link')) { |
|
| 200 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000); |
|
| 201 | + } |
|
| 202 | 202 | |
| 203 | 203 | if (defined('ICL_LANGUAGE_CODE')){ |
| 204 | 204 | $home_url = icl_get_home_url(); |
@@ -206,24 +206,24 @@ discard block |
||
| 206 | 206 | $home_url = home_url(); |
| 207 | 207 | } |
| 208 | 208 | |
| 209 | - if (function_exists('geodir_location_geo_home_link')) { |
|
| 210 | - add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2); |
|
| 211 | - } |
|
| 209 | + if (function_exists('geodir_location_geo_home_link')) { |
|
| 210 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2); |
|
| 211 | + } |
|
| 212 | 212 | |
| 213 | - if($gd_page_id){ |
|
| 214 | - $post = get_post($gd_page_id); |
|
| 215 | - $slug = $post->post_name; |
|
| 216 | - //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors |
|
| 217 | - $info_url = trailingslashit($home_url)."$slug/"; |
|
| 218 | - }else{ |
|
| 219 | - $info_url = trailingslashit($home_url); |
|
| 220 | - } |
|
| 213 | + if($gd_page_id){ |
|
| 214 | + $post = get_post($gd_page_id); |
|
| 215 | + $slug = $post->post_name; |
|
| 216 | + //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors |
|
| 217 | + $info_url = trailingslashit($home_url)."$slug/"; |
|
| 218 | + }else{ |
|
| 219 | + $info_url = trailingslashit($home_url); |
|
| 220 | + } |
|
| 221 | 221 | |
| 222 | - if($args){ |
|
| 223 | - $info_url = add_query_arg($args,$info_url ); |
|
| 224 | - } |
|
| 222 | + if($args){ |
|
| 223 | + $info_url = add_query_arg($args,$info_url ); |
|
| 224 | + } |
|
| 225 | 225 | |
| 226 | - return $info_url; |
|
| 226 | + return $info_url; |
|
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | /** |
@@ -239,11 +239,11 @@ discard block |
||
| 239 | 239 | * @return string Returns converted string. |
| 240 | 240 | */ |
| 241 | 241 | function geodir_ucwords($string, $charset='UTF-8') { |
| 242 | - if (function_exists('mb_convert_case')) { |
|
| 243 | - return mb_convert_case($string, MB_CASE_TITLE, $charset); |
|
| 244 | - } else { |
|
| 245 | - return ucwords($string); |
|
| 246 | - } |
|
| 242 | + if (function_exists('mb_convert_case')) { |
|
| 243 | + return mb_convert_case($string, MB_CASE_TITLE, $charset); |
|
| 244 | + } else { |
|
| 245 | + return ucwords($string); |
|
| 246 | + } |
|
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | /** |
@@ -259,11 +259,11 @@ discard block |
||
| 259 | 259 | * @return string Returns converted string. |
| 260 | 260 | */ |
| 261 | 261 | function geodir_strtolower($string, $charset='UTF-8') { |
| 262 | - if (function_exists('mb_convert_case')) { |
|
| 263 | - return mb_convert_case($string, MB_CASE_LOWER, $charset); |
|
| 264 | - } else { |
|
| 265 | - return strtolower($string); |
|
| 266 | - } |
|
| 262 | + if (function_exists('mb_convert_case')) { |
|
| 263 | + return mb_convert_case($string, MB_CASE_LOWER, $charset); |
|
| 264 | + } else { |
|
| 265 | + return strtolower($string); |
|
| 266 | + } |
|
| 267 | 267 | } |
| 268 | 268 | |
| 269 | 269 | /** |
@@ -279,11 +279,11 @@ discard block |
||
| 279 | 279 | * @return string Returns converted string. |
| 280 | 280 | */ |
| 281 | 281 | function geodir_strtoupper($string, $charset='UTF-8') { |
| 282 | - if (function_exists('mb_convert_case')) { |
|
| 283 | - return mb_convert_case($string, MB_CASE_UPPER, $charset); |
|
| 284 | - } else { |
|
| 285 | - return strtoupper($string); |
|
| 286 | - } |
|
| 282 | + if (function_exists('mb_convert_case')) { |
|
| 283 | + return mb_convert_case($string, MB_CASE_UPPER, $charset); |
|
| 284 | + } else { |
|
| 285 | + return strtoupper($string); |
|
| 286 | + } |
|
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | /** |
@@ -462,11 +462,11 @@ discard block |
||
| 462 | 462 | * @package GeoDirectory |
| 463 | 463 | */ |
| 464 | 464 | function _gd_die_handler() { |
| 465 | - if ( defined( 'GD_TESTING_MODE' ) ) { |
|
| 466 | - return '_gd_die_handler'; |
|
| 467 | - } else { |
|
| 468 | - die(); |
|
| 469 | - } |
|
| 465 | + if ( defined( 'GD_TESTING_MODE' ) ) { |
|
| 466 | + return '_gd_die_handler'; |
|
| 467 | + } else { |
|
| 468 | + die(); |
|
| 469 | + } |
|
| 470 | 470 | } |
| 471 | 471 | |
| 472 | 472 | /** |
@@ -481,9 +481,9 @@ discard block |
||
| 481 | 481 | * @param int $status Optional. Status code. |
| 482 | 482 | */ |
| 483 | 483 | function gd_die( $message = '', $title = '', $status = 400 ) { |
| 484 | - add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 ); |
|
| 485 | - add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 ); |
|
| 486 | - wp_die( $message, $title, array( 'response' => $status )); |
|
| 484 | + add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 ); |
|
| 485 | + add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 ); |
|
| 486 | + wp_die( $message, $title, array( 'response' => $status )); |
|
| 487 | 487 | } |
| 488 | 488 | |
| 489 | 489 | /* |
@@ -652,37 +652,37 @@ discard block |
||
| 652 | 652 | * @return string The formatted date. |
| 653 | 653 | */ |
| 654 | 654 | function geodir_date($date_input, $date_to, $date_from = '') { |
| 655 | - if (empty($date_input) || empty($date_to)) { |
|
| 656 | - return NULL; |
|
| 657 | - } |
|
| 655 | + if (empty($date_input) || empty($date_to)) { |
|
| 656 | + return NULL; |
|
| 657 | + } |
|
| 658 | 658 | |
| 659 | - $date = ''; |
|
| 660 | - if (!empty($date_from)) { |
|
| 661 | - $datetime = date_create_from_format($date_from, $date_input); |
|
| 659 | + $date = ''; |
|
| 660 | + if (!empty($date_from)) { |
|
| 661 | + $datetime = date_create_from_format($date_from, $date_input); |
|
| 662 | 662 | |
| 663 | - if (!empty($datetime)) { |
|
| 664 | - $date = $datetime->format($date_to); |
|
| 665 | - } |
|
| 666 | - } |
|
| 663 | + if (!empty($datetime)) { |
|
| 664 | + $date = $datetime->format($date_to); |
|
| 665 | + } |
|
| 666 | + } |
|
| 667 | 667 | |
| 668 | - if (empty($date)) { |
|
| 669 | - $date = strpos($date_input, '/') !== false ? str_replace('/', '-', $date_input) : $date_input; |
|
| 670 | - $date = date_i18n($date_to, strtotime($date)); |
|
| 671 | - } |
|
| 668 | + if (empty($date)) { |
|
| 669 | + $date = strpos($date_input, '/') !== false ? str_replace('/', '-', $date_input) : $date_input; |
|
| 670 | + $date = date_i18n($date_to, strtotime($date)); |
|
| 671 | + } |
|
| 672 | 672 | |
| 673 | - $date = geodir_maybe_untranslate_date($date); |
|
| 674 | - /** |
|
| 675 | - * Filter the the date format conversion. |
|
| 676 | - * |
|
| 677 | - * @since 1.6.7 |
|
| 678 | - * @package GeoDirectory |
|
| 679 | - * |
|
| 680 | - * @param string $date The date string. |
|
| 681 | - * @param string $date_input The date input. |
|
| 682 | - * @param string $date_to The destination date format. |
|
| 683 | - * @param string $date_from The source date format. |
|
| 684 | - */ |
|
| 685 | - return apply_filters('geodir_date', $date, $date_input, $date_to, $date_from); |
|
| 673 | + $date = geodir_maybe_untranslate_date($date); |
|
| 674 | + /** |
|
| 675 | + * Filter the the date format conversion. |
|
| 676 | + * |
|
| 677 | + * @since 1.6.7 |
|
| 678 | + * @package GeoDirectory |
|
| 679 | + * |
|
| 680 | + * @param string $date The date string. |
|
| 681 | + * @param string $date_input The date input. |
|
| 682 | + * @param string $date_to The destination date format. |
|
| 683 | + * @param string $date_from The source date format. |
|
| 684 | + */ |
|
| 685 | + return apply_filters('geodir_date', $date, $date_input, $date_to, $date_from); |
|
| 686 | 686 | } |
| 687 | 687 | |
| 688 | 688 | /** |
@@ -707,91 +707,91 @@ discard block |
||
| 707 | 707 | * @return string Trimmed string. |
| 708 | 708 | */ |
| 709 | 709 | function geodir_excerpt($text, $length = 100, $options = array()) { |
| 710 | - if (!(int)$length > 0) { |
|
| 711 | - return $text; |
|
| 712 | - } |
|
| 713 | - $default = array( |
|
| 714 | - 'ellipsis' => '', 'exact' => true, 'html' => true, 'trimWidth' => false, |
|
| 710 | + if (!(int)$length > 0) { |
|
| 711 | + return $text; |
|
| 712 | + } |
|
| 713 | + $default = array( |
|
| 714 | + 'ellipsis' => '', 'exact' => true, 'html' => true, 'trimWidth' => false, |
|
| 715 | 715 | ); |
| 716 | - if (!empty($options['html']) && strtolower(mb_internal_encoding()) === 'utf-8') { |
|
| 717 | - $default['ellipsis'] = ""; |
|
| 718 | - } |
|
| 719 | - $options += $default; |
|
| 720 | - |
|
| 721 | - $prefix = ''; |
|
| 722 | - $suffix = $options['ellipsis']; |
|
| 723 | - |
|
| 724 | - if ($options['html']) { |
|
| 725 | - $ellipsisLength = geodir_strlen(strip_tags($options['ellipsis']), $options); |
|
| 726 | - |
|
| 727 | - $truncateLength = 0; |
|
| 728 | - $totalLength = 0; |
|
| 729 | - $openTags = array(); |
|
| 730 | - $truncate = ''; |
|
| 731 | - |
|
| 732 | - preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER); |
|
| 733 | - foreach ($tags as $tag) { |
|
| 734 | - $contentLength = geodir_strlen($tag[3], $options); |
|
| 735 | - |
|
| 736 | - if ($truncate === '') { |
|
| 737 | - if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/i', $tag[2])) { |
|
| 738 | - if (preg_match('/<[\w]+[^>]*>/', $tag[0])) { |
|
| 739 | - array_unshift($openTags, $tag[2]); |
|
| 740 | - } elseif (preg_match('/<\/([\w]+)[^>]*>/', $tag[0], $closeTag)) { |
|
| 741 | - $pos = array_search($closeTag[1], $openTags); |
|
| 742 | - if ($pos !== false) { |
|
| 743 | - array_splice($openTags, $pos, 1); |
|
| 744 | - } |
|
| 745 | - } |
|
| 746 | - } |
|
| 747 | - |
|
| 748 | - $prefix .= $tag[1]; |
|
| 749 | - |
|
| 750 | - if ($totalLength + $contentLength + $ellipsisLength > $length) { |
|
| 751 | - $truncate = $tag[3]; |
|
| 752 | - $truncateLength = $length - $totalLength; |
|
| 753 | - } else { |
|
| 754 | - $prefix .= $tag[3]; |
|
| 755 | - } |
|
| 756 | - } |
|
| 757 | - |
|
| 758 | - $totalLength += $contentLength; |
|
| 759 | - if ($totalLength > $length) { |
|
| 760 | - break; |
|
| 761 | - } |
|
| 762 | - } |
|
| 763 | - |
|
| 764 | - if ($totalLength <= $length) { |
|
| 765 | - return $text; |
|
| 766 | - } |
|
| 767 | - |
|
| 768 | - $text = $truncate; |
|
| 769 | - $length = $truncateLength; |
|
| 770 | - |
|
| 771 | - foreach ($openTags as $tag) { |
|
| 772 | - $suffix .= '</' . $tag . '>'; |
|
| 773 | - } |
|
| 774 | - } else { |
|
| 775 | - if (geodir_strlen($text, $options) <= $length) { |
|
| 776 | - return $text; |
|
| 777 | - } |
|
| 778 | - $ellipsisLength = geodir_strlen($options['ellipsis'], $options); |
|
| 779 | - } |
|
| 780 | - |
|
| 781 | - $result = geodir_substr($text, 0, $length - $ellipsisLength, $options); |
|
| 782 | - |
|
| 783 | - if (!$options['exact']) { |
|
| 784 | - if (geodir_substr($text, $length - $ellipsisLength, 1, $options) !== ' ') { |
|
| 785 | - $result = geodir_remove_last_word($result); |
|
| 786 | - } |
|
| 787 | - |
|
| 788 | - // Do not need to count ellipsis in the cut, if result is empty. |
|
| 789 | - if (!strlen($result)) { |
|
| 790 | - $result = geodir_substr($text, 0, $length, $options); |
|
| 791 | - } |
|
| 792 | - } |
|
| 793 | - |
|
| 794 | - return $prefix . $result . $suffix; |
|
| 716 | + if (!empty($options['html']) && strtolower(mb_internal_encoding()) === 'utf-8') { |
|
| 717 | + $default['ellipsis'] = ""; |
|
| 718 | + } |
|
| 719 | + $options += $default; |
|
| 720 | + |
|
| 721 | + $prefix = ''; |
|
| 722 | + $suffix = $options['ellipsis']; |
|
| 723 | + |
|
| 724 | + if ($options['html']) { |
|
| 725 | + $ellipsisLength = geodir_strlen(strip_tags($options['ellipsis']), $options); |
|
| 726 | + |
|
| 727 | + $truncateLength = 0; |
|
| 728 | + $totalLength = 0; |
|
| 729 | + $openTags = array(); |
|
| 730 | + $truncate = ''; |
|
| 731 | + |
|
| 732 | + preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER); |
|
| 733 | + foreach ($tags as $tag) { |
|
| 734 | + $contentLength = geodir_strlen($tag[3], $options); |
|
| 735 | + |
|
| 736 | + if ($truncate === '') { |
|
| 737 | + if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/i', $tag[2])) { |
|
| 738 | + if (preg_match('/<[\w]+[^>]*>/', $tag[0])) { |
|
| 739 | + array_unshift($openTags, $tag[2]); |
|
| 740 | + } elseif (preg_match('/<\/([\w]+)[^>]*>/', $tag[0], $closeTag)) { |
|
| 741 | + $pos = array_search($closeTag[1], $openTags); |
|
| 742 | + if ($pos !== false) { |
|
| 743 | + array_splice($openTags, $pos, 1); |
|
| 744 | + } |
|
| 745 | + } |
|
| 746 | + } |
|
| 747 | + |
|
| 748 | + $prefix .= $tag[1]; |
|
| 749 | + |
|
| 750 | + if ($totalLength + $contentLength + $ellipsisLength > $length) { |
|
| 751 | + $truncate = $tag[3]; |
|
| 752 | + $truncateLength = $length - $totalLength; |
|
| 753 | + } else { |
|
| 754 | + $prefix .= $tag[3]; |
|
| 755 | + } |
|
| 756 | + } |
|
| 757 | + |
|
| 758 | + $totalLength += $contentLength; |
|
| 759 | + if ($totalLength > $length) { |
|
| 760 | + break; |
|
| 761 | + } |
|
| 762 | + } |
|
| 763 | + |
|
| 764 | + if ($totalLength <= $length) { |
|
| 765 | + return $text; |
|
| 766 | + } |
|
| 767 | + |
|
| 768 | + $text = $truncate; |
|
| 769 | + $length = $truncateLength; |
|
| 770 | + |
|
| 771 | + foreach ($openTags as $tag) { |
|
| 772 | + $suffix .= '</' . $tag . '>'; |
|
| 773 | + } |
|
| 774 | + } else { |
|
| 775 | + if (geodir_strlen($text, $options) <= $length) { |
|
| 776 | + return $text; |
|
| 777 | + } |
|
| 778 | + $ellipsisLength = geodir_strlen($options['ellipsis'], $options); |
|
| 779 | + } |
|
| 780 | + |
|
| 781 | + $result = geodir_substr($text, 0, $length - $ellipsisLength, $options); |
|
| 782 | + |
|
| 783 | + if (!$options['exact']) { |
|
| 784 | + if (geodir_substr($text, $length - $ellipsisLength, 1, $options) !== ' ') { |
|
| 785 | + $result = geodir_remove_last_word($result); |
|
| 786 | + } |
|
| 787 | + |
|
| 788 | + // Do not need to count ellipsis in the cut, if result is empty. |
|
| 789 | + if (!strlen($result)) { |
|
| 790 | + $result = geodir_substr($text, 0, $length, $options); |
|
| 791 | + } |
|
| 792 | + } |
|
| 793 | + |
|
| 794 | + return $prefix . $result . $suffix; |
|
| 795 | 795 | } |
| 796 | 796 | |
| 797 | 797 | /** |
@@ -815,28 +815,28 @@ discard block |
||
| 815 | 815 | * @return int |
| 816 | 816 | */ |
| 817 | 817 | function geodir_strlen($text, array $options) { |
| 818 | - if (empty($options['trimWidth'])) { |
|
| 819 | - $strlen = 'mb_strlen'; |
|
| 820 | - } else { |
|
| 821 | - $strlen = 'mb_strwidth'; |
|
| 822 | - } |
|
| 823 | - |
|
| 824 | - if (empty($options['html'])) { |
|
| 825 | - return $strlen($text); |
|
| 826 | - } |
|
| 827 | - |
|
| 828 | - $pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i'; |
|
| 829 | - $replace = preg_replace_callback( |
|
| 830 | - $pattern, |
|
| 831 | - function ($match) use ($strlen) { |
|
| 832 | - $utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8'); |
|
| 833 | - |
|
| 834 | - return str_repeat(' ', $strlen($utf8, 'UTF-8')); |
|
| 835 | - }, |
|
| 836 | - $text |
|
| 837 | - ); |
|
| 838 | - |
|
| 839 | - return $strlen($replace); |
|
| 818 | + if (empty($options['trimWidth'])) { |
|
| 819 | + $strlen = 'mb_strlen'; |
|
| 820 | + } else { |
|
| 821 | + $strlen = 'mb_strwidth'; |
|
| 822 | + } |
|
| 823 | + |
|
| 824 | + if (empty($options['html'])) { |
|
| 825 | + return $strlen($text); |
|
| 826 | + } |
|
| 827 | + |
|
| 828 | + $pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i'; |
|
| 829 | + $replace = preg_replace_callback( |
|
| 830 | + $pattern, |
|
| 831 | + function ($match) use ($strlen) { |
|
| 832 | + $utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8'); |
|
| 833 | + |
|
| 834 | + return str_repeat(' ', $strlen($utf8, 'UTF-8')); |
|
| 835 | + }, |
|
| 836 | + $text |
|
| 837 | + ); |
|
| 838 | + |
|
| 839 | + return $strlen($replace); |
|
| 840 | 840 | } |
| 841 | 841 | |
| 842 | 842 | /** |
@@ -857,80 +857,80 @@ discard block |
||
| 857 | 857 | * @return string |
| 858 | 858 | */ |
| 859 | 859 | function geodir_substr($text, $start, $length, array $options) { |
| 860 | - if (empty($options['trimWidth'])) { |
|
| 861 | - $substr = 'mb_substr'; |
|
| 862 | - } else { |
|
| 863 | - $substr = 'mb_strimwidth'; |
|
| 864 | - } |
|
| 865 | - |
|
| 866 | - $maxPosition = geodir_strlen($text, array('trimWidth' => false) + $options); |
|
| 867 | - if ($start < 0) { |
|
| 868 | - $start += $maxPosition; |
|
| 869 | - if ($start < 0) { |
|
| 870 | - $start = 0; |
|
| 871 | - } |
|
| 872 | - } |
|
| 873 | - if ($start >= $maxPosition) { |
|
| 874 | - return ''; |
|
| 875 | - } |
|
| 876 | - |
|
| 877 | - if ($length === null) { |
|
| 878 | - $length = geodir_strlen($text, $options); |
|
| 879 | - } |
|
| 880 | - |
|
| 881 | - if ($length < 0) { |
|
| 882 | - $text = geodir_substr($text, $start, null, $options); |
|
| 883 | - $start = 0; |
|
| 884 | - $length += geodir_strlen($text, $options); |
|
| 885 | - } |
|
| 886 | - |
|
| 887 | - if ($length <= 0) { |
|
| 888 | - return ''; |
|
| 889 | - } |
|
| 890 | - |
|
| 891 | - if (empty($options['html'])) { |
|
| 892 | - return (string)$substr($text, $start, $length); |
|
| 893 | - } |
|
| 894 | - |
|
| 895 | - $totalOffset = 0; |
|
| 896 | - $totalLength = 0; |
|
| 897 | - $result = ''; |
|
| 898 | - |
|
| 899 | - $pattern = '/(&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};)/i'; |
|
| 900 | - $parts = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); |
|
| 901 | - foreach ($parts as $part) { |
|
| 902 | - $offset = 0; |
|
| 903 | - |
|
| 904 | - if ($totalOffset < $start) { |
|
| 905 | - $len = geodir_strlen($part, array('trimWidth' => false) + $options); |
|
| 906 | - if ($totalOffset + $len <= $start) { |
|
| 907 | - $totalOffset += $len; |
|
| 908 | - continue; |
|
| 909 | - } |
|
| 910 | - |
|
| 911 | - $offset = $start - $totalOffset; |
|
| 912 | - $totalOffset = $start; |
|
| 913 | - } |
|
| 914 | - |
|
| 915 | - $len = geodir_strlen($part, $options); |
|
| 916 | - if ($offset !== 0 || $totalLength + $len > $length) { |
|
| 917 | - if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) { |
|
| 918 | - // Entities cannot be passed substr. |
|
| 919 | - continue; |
|
| 920 | - } |
|
| 921 | - |
|
| 922 | - $part = $substr($part, $offset, $length - $totalLength); |
|
| 923 | - $len = geodir_strlen($part, $options); |
|
| 924 | - } |
|
| 925 | - |
|
| 926 | - $result .= $part; |
|
| 927 | - $totalLength += $len; |
|
| 928 | - if ($totalLength >= $length) { |
|
| 929 | - break; |
|
| 930 | - } |
|
| 931 | - } |
|
| 932 | - |
|
| 933 | - return $result; |
|
| 860 | + if (empty($options['trimWidth'])) { |
|
| 861 | + $substr = 'mb_substr'; |
|
| 862 | + } else { |
|
| 863 | + $substr = 'mb_strimwidth'; |
|
| 864 | + } |
|
| 865 | + |
|
| 866 | + $maxPosition = geodir_strlen($text, array('trimWidth' => false) + $options); |
|
| 867 | + if ($start < 0) { |
|
| 868 | + $start += $maxPosition; |
|
| 869 | + if ($start < 0) { |
|
| 870 | + $start = 0; |
|
| 871 | + } |
|
| 872 | + } |
|
| 873 | + if ($start >= $maxPosition) { |
|
| 874 | + return ''; |
|
| 875 | + } |
|
| 876 | + |
|
| 877 | + if ($length === null) { |
|
| 878 | + $length = geodir_strlen($text, $options); |
|
| 879 | + } |
|
| 880 | + |
|
| 881 | + if ($length < 0) { |
|
| 882 | + $text = geodir_substr($text, $start, null, $options); |
|
| 883 | + $start = 0; |
|
| 884 | + $length += geodir_strlen($text, $options); |
|
| 885 | + } |
|
| 886 | + |
|
| 887 | + if ($length <= 0) { |
|
| 888 | + return ''; |
|
| 889 | + } |
|
| 890 | + |
|
| 891 | + if (empty($options['html'])) { |
|
| 892 | + return (string)$substr($text, $start, $length); |
|
| 893 | + } |
|
| 894 | + |
|
| 895 | + $totalOffset = 0; |
|
| 896 | + $totalLength = 0; |
|
| 897 | + $result = ''; |
|
| 898 | + |
|
| 899 | + $pattern = '/(&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};)/i'; |
|
| 900 | + $parts = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); |
|
| 901 | + foreach ($parts as $part) { |
|
| 902 | + $offset = 0; |
|
| 903 | + |
|
| 904 | + if ($totalOffset < $start) { |
|
| 905 | + $len = geodir_strlen($part, array('trimWidth' => false) + $options); |
|
| 906 | + if ($totalOffset + $len <= $start) { |
|
| 907 | + $totalOffset += $len; |
|
| 908 | + continue; |
|
| 909 | + } |
|
| 910 | + |
|
| 911 | + $offset = $start - $totalOffset; |
|
| 912 | + $totalOffset = $start; |
|
| 913 | + } |
|
| 914 | + |
|
| 915 | + $len = geodir_strlen($part, $options); |
|
| 916 | + if ($offset !== 0 || $totalLength + $len > $length) { |
|
| 917 | + if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) { |
|
| 918 | + // Entities cannot be passed substr. |
|
| 919 | + continue; |
|
| 920 | + } |
|
| 921 | + |
|
| 922 | + $part = $substr($part, $offset, $length - $totalLength); |
|
| 923 | + $len = geodir_strlen($part, $options); |
|
| 924 | + } |
|
| 925 | + |
|
| 926 | + $result .= $part; |
|
| 927 | + $totalLength += $len; |
|
| 928 | + if ($totalLength >= $length) { |
|
| 929 | + break; |
|
| 930 | + } |
|
| 931 | + } |
|
| 932 | + |
|
| 933 | + return $result; |
|
| 934 | 934 | } |
| 935 | 935 | |
| 936 | 936 | /** |
@@ -943,21 +943,21 @@ discard block |
||
| 943 | 943 | * @return string |
| 944 | 944 | */ |
| 945 | 945 | function geodir_remove_last_word($text) { |
| 946 | - $spacepos = mb_strrpos($text, ' '); |
|
| 946 | + $spacepos = mb_strrpos($text, ' '); |
|
| 947 | 947 | |
| 948 | - if ($spacepos !== false) { |
|
| 949 | - $lastWord = mb_strrpos($text, $spacepos); |
|
| 948 | + if ($spacepos !== false) { |
|
| 949 | + $lastWord = mb_strrpos($text, $spacepos); |
|
| 950 | 950 | |
| 951 | - // Some languages are written without word separation. |
|
| 952 | - // We recognize a string as a word if it does not contain any full-width characters. |
|
| 953 | - if (mb_strwidth($lastWord) === mb_strlen($lastWord)) { |
|
| 954 | - $text = mb_substr($text, 0, $spacepos); |
|
| 955 | - } |
|
| 951 | + // Some languages are written without word separation. |
|
| 952 | + // We recognize a string as a word if it does not contain any full-width characters. |
|
| 953 | + if (mb_strwidth($lastWord) === mb_strlen($lastWord)) { |
|
| 954 | + $text = mb_substr($text, 0, $spacepos); |
|
| 955 | + } |
|
| 956 | 956 | |
| 957 | - return $text; |
|
| 958 | - } |
|
| 957 | + return $text; |
|
| 958 | + } |
|
| 959 | 959 | |
| 960 | - return ''; |
|
| 960 | + return ''; |
|
| 961 | 961 | } |
| 962 | 962 | |
| 963 | 963 | function geodir_tool_restore_cpt_from_taxonomies(){ |
@@ -13,28 +13,28 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | function geodir_user_favourite_listing_count($user_id=false) |
| 15 | 15 | { |
| 16 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 16 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 17 | 17 | |
| 18 | - if(!$user_id){$user_id = $current_user->ID;} |
|
| 19 | - if(!$user_id){return array();} |
|
| 18 | + if(!$user_id){$user_id = $current_user->ID;} |
|
| 19 | + if(!$user_id){return array();} |
|
| 20 | 20 | |
| 21 | - $user_favorites = get_user_meta($user_id, 'gd_user_favourite_post', true); |
|
| 22 | - $all_posts = get_option('geodir_favorite_link_user_dashboard'); |
|
| 21 | + $user_favorites = get_user_meta($user_id, 'gd_user_favourite_post', true); |
|
| 22 | + $all_posts = get_option('geodir_favorite_link_user_dashboard'); |
|
| 23 | 23 | |
| 24 | - $user_listing = array(); |
|
| 25 | - if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) { |
|
| 26 | - $user_favorites = "'" . implode("','", $user_favorites) . "'"; |
|
| 24 | + $user_listing = array(); |
|
| 25 | + if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) { |
|
| 26 | + $user_favorites = "'" . implode("','", $user_favorites) . "'"; |
|
| 27 | 27 | |
| 28 | - foreach ($all_posts as $ptype) { |
|
| 29 | - $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")"); |
|
| 28 | + foreach ($all_posts as $ptype) { |
|
| 29 | + $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")"); |
|
| 30 | 30 | |
| 31 | - if ($total_posts > 0) { |
|
| 32 | - $user_listing[$ptype] = $total_posts; |
|
| 33 | - } |
|
| 34 | - } |
|
| 35 | - } |
|
| 31 | + if ($total_posts > 0) { |
|
| 32 | + $user_listing[$ptype] = $total_posts; |
|
| 33 | + } |
|
| 34 | + } |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - return $user_listing; |
|
| 37 | + return $user_listing; |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | |
@@ -47,51 +47,51 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | |
| 49 | 49 | function geodir_user_show_favourites($user_id='',$output_type='select'){ |
| 50 | - // My Favourites in Dashboard |
|
| 51 | - $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard'); |
|
| 52 | - $user_favourite = geodir_user_favourite_listing_count($user_id); |
|
| 53 | - |
|
| 54 | - if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) { |
|
| 55 | - $favourite_links = ''; |
|
| 56 | - $post_types = geodir_get_posttypes('object'); |
|
| 57 | - |
|
| 58 | - $author_link = get_author_posts_url($user_id); |
|
| 59 | - $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false); |
|
| 60 | - |
|
| 61 | - foreach ($post_types as $key => $postobj) { |
|
| 62 | - if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) { |
|
| 63 | - $name = $postobj->labels->name; |
|
| 64 | - $post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false); |
|
| 65 | - |
|
| 66 | - $selected = ''; |
|
| 67 | - |
|
| 68 | - if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) { |
|
| 69 | - $selected = 'selected="selected"'; |
|
| 70 | - } |
|
| 71 | - /** |
|
| 72 | - * Filter favorite listing link. |
|
| 73 | - * |
|
| 74 | - * @since 1.0.0 |
|
| 75 | - * @param string $post_type_link Favorite listing link. |
|
| 76 | - * @param string $key Favorite listing array key. |
|
| 77 | - * @param int $current_user->ID Current user ID. |
|
| 78 | - */ |
|
| 79 | - $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id); |
|
| 80 | - |
|
| 81 | - if($output_type=='select'){ |
|
| 82 | - $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>'; |
|
| 83 | - }elseif($output_type=='link'){ |
|
| 84 | - $favourite_links[] = '<a href="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>'; |
|
| 85 | - } |
|
| 86 | - |
|
| 87 | - |
|
| 88 | - } |
|
| 89 | - } |
|
| 90 | - |
|
| 91 | - if ($favourite_links != '') { |
|
| 92 | - $user = get_user_by( 'ID', $user_id ); |
|
| 93 | - if($output_type=='select') { |
|
| 94 | - ?> |
|
| 50 | + // My Favourites in Dashboard |
|
| 51 | + $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard'); |
|
| 52 | + $user_favourite = geodir_user_favourite_listing_count($user_id); |
|
| 53 | + |
|
| 54 | + if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) { |
|
| 55 | + $favourite_links = ''; |
|
| 56 | + $post_types = geodir_get_posttypes('object'); |
|
| 57 | + |
|
| 58 | + $author_link = get_author_posts_url($user_id); |
|
| 59 | + $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false); |
|
| 60 | + |
|
| 61 | + foreach ($post_types as $key => $postobj) { |
|
| 62 | + if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) { |
|
| 63 | + $name = $postobj->labels->name; |
|
| 64 | + $post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false); |
|
| 65 | + |
|
| 66 | + $selected = ''; |
|
| 67 | + |
|
| 68 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) { |
|
| 69 | + $selected = 'selected="selected"'; |
|
| 70 | + } |
|
| 71 | + /** |
|
| 72 | + * Filter favorite listing link. |
|
| 73 | + * |
|
| 74 | + * @since 1.0.0 |
|
| 75 | + * @param string $post_type_link Favorite listing link. |
|
| 76 | + * @param string $key Favorite listing array key. |
|
| 77 | + * @param int $current_user->ID Current user ID. |
|
| 78 | + */ |
|
| 79 | + $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id); |
|
| 80 | + |
|
| 81 | + if($output_type=='select'){ |
|
| 82 | + $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>'; |
|
| 83 | + }elseif($output_type=='link'){ |
|
| 84 | + $favourite_links[] = '<a href="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>'; |
|
| 85 | + } |
|
| 86 | + |
|
| 87 | + |
|
| 88 | + } |
|
| 89 | + } |
|
| 90 | + |
|
| 91 | + if ($favourite_links != '') { |
|
| 92 | + $user = get_user_by( 'ID', $user_id ); |
|
| 93 | + if($output_type=='select') { |
|
| 94 | + ?> |
|
| 95 | 95 | <li> |
| 96 | 96 | <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" |
| 97 | 97 | option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" |
@@ -102,62 +102,62 @@ discard block |
||
| 102 | 102 | </select> |
| 103 | 103 | </li> |
| 104 | 104 | <?php |
| 105 | - }elseif($output_type=='link'){ |
|
| 106 | - if(!empty($favourite_links)){ |
|
| 107 | - echo implode(" | ",$favourite_links); |
|
| 108 | - } |
|
| 109 | - |
|
| 110 | - } |
|
| 111 | - } |
|
| 112 | - } |
|
| 105 | + }elseif($output_type=='link'){ |
|
| 106 | + if(!empty($favourite_links)){ |
|
| 107 | + echo implode(" | ",$favourite_links); |
|
| 108 | + } |
|
| 109 | + |
|
| 110 | + } |
|
| 111 | + } |
|
| 112 | + } |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | |
| 116 | 116 | |
| 117 | 117 | function geodir_user_show_listings($user_id='',$output_type='select'){ |
| 118 | 118 | |
| 119 | - $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard'); |
|
| 120 | - $user_listing = geodir_user_post_listing_count($user_id); |
|
| 121 | - |
|
| 122 | - if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) { |
|
| 123 | - $listing_links = ''; |
|
| 124 | - |
|
| 125 | - $post_types = geodir_get_posttypes('object'); |
|
| 126 | - |
|
| 127 | - $author_link = get_author_posts_url($user_id); |
|
| 128 | - $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false); |
|
| 129 | - |
|
| 130 | - foreach ($post_types as $key => $postobj) { |
|
| 131 | - if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) { |
|
| 132 | - $name = $postobj->labels->name; |
|
| 133 | - $listing_link = geodir_getlink($author_link, array('stype' => $key), false); |
|
| 134 | - |
|
| 135 | - $selected = ''; |
|
| 136 | - if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) { |
|
| 137 | - $selected = 'selected="selected"'; |
|
| 138 | - } |
|
| 139 | - |
|
| 140 | - /** |
|
| 141 | - * Filter my listing link. |
|
| 142 | - * |
|
| 143 | - * @since 1.0.0 |
|
| 144 | - * @param string $listing_link My listing link. |
|
| 145 | - * @param string $key My listing array key. |
|
| 146 | - * @param int $current_user->ID Current user ID. |
|
| 147 | - */ |
|
| 148 | - $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id); |
|
| 149 | - if($output_type=='select') { |
|
| 150 | - $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>'; |
|
| 151 | - }elseif($output_type=='link'){ |
|
| 152 | - $listing_links[] = '<a href="' .$listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>'; |
|
| 153 | - } |
|
| 154 | - } |
|
| 155 | - } |
|
| 156 | - |
|
| 157 | - if ($listing_links != '') { |
|
| 158 | - $user = get_user_by( 'ID', $user_id ); |
|
| 159 | - if($output_type=='select') { |
|
| 160 | - ?> |
|
| 119 | + $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard'); |
|
| 120 | + $user_listing = geodir_user_post_listing_count($user_id); |
|
| 121 | + |
|
| 122 | + if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) { |
|
| 123 | + $listing_links = ''; |
|
| 124 | + |
|
| 125 | + $post_types = geodir_get_posttypes('object'); |
|
| 126 | + |
|
| 127 | + $author_link = get_author_posts_url($user_id); |
|
| 128 | + $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false); |
|
| 129 | + |
|
| 130 | + foreach ($post_types as $key => $postobj) { |
|
| 131 | + if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) { |
|
| 132 | + $name = $postobj->labels->name; |
|
| 133 | + $listing_link = geodir_getlink($author_link, array('stype' => $key), false); |
|
| 134 | + |
|
| 135 | + $selected = ''; |
|
| 136 | + if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) { |
|
| 137 | + $selected = 'selected="selected"'; |
|
| 138 | + } |
|
| 139 | + |
|
| 140 | + /** |
|
| 141 | + * Filter my listing link. |
|
| 142 | + * |
|
| 143 | + * @since 1.0.0 |
|
| 144 | + * @param string $listing_link My listing link. |
|
| 145 | + * @param string $key My listing array key. |
|
| 146 | + * @param int $current_user->ID Current user ID. |
|
| 147 | + */ |
|
| 148 | + $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id); |
|
| 149 | + if($output_type=='select') { |
|
| 150 | + $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>'; |
|
| 151 | + }elseif($output_type=='link'){ |
|
| 152 | + $listing_links[] = '<a href="' .$listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>'; |
|
| 153 | + } |
|
| 154 | + } |
|
| 155 | + } |
|
| 156 | + |
|
| 157 | + if ($listing_links != '') { |
|
| 158 | + $user = get_user_by( 'ID', $user_id ); |
|
| 159 | + if($output_type=='select') { |
|
| 160 | + ?> |
|
| 161 | 161 | <li> |
| 162 | 162 | <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" |
| 163 | 163 | option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" |
@@ -168,13 +168,13 @@ discard block |
||
| 168 | 168 | </select> |
| 169 | 169 | </li> |
| 170 | 170 | <?php |
| 171 | - }elseif($output_type=='link'){ |
|
| 172 | - if(!empty($listing_links )){ |
|
| 173 | - echo implode(" | ",$listing_links ); |
|
| 174 | - } |
|
| 175 | - |
|
| 176 | - } |
|
| 177 | - } |
|
| 178 | - } |
|
| 171 | + }elseif($output_type=='link'){ |
|
| 172 | + if(!empty($listing_links )){ |
|
| 173 | + echo implode(" | ",$listing_links ); |
|
| 174 | + } |
|
| 175 | + |
|
| 176 | + } |
|
| 177 | + } |
|
| 178 | + } |
|
| 179 | 179 | |
| 180 | 180 | } |
@@ -11,22 +11,22 @@ discard block |
||
| 11 | 11 | * @global string $plugin_prefix Geodirectory plugin table prefix. |
| 12 | 12 | * @return array User listing count for each post type. |
| 13 | 13 | */ |
| 14 | -function geodir_user_favourite_listing_count($user_id=false) |
|
| 14 | +function geodir_user_favourite_listing_count($user_id = false) |
|
| 15 | 15 | { |
| 16 | 16 | global $wpdb, $plugin_prefix, $current_user; |
| 17 | 17 | |
| 18 | - if(!$user_id){$user_id = $current_user->ID;} |
|
| 19 | - if(!$user_id){return array();} |
|
| 18 | + if (!$user_id) {$user_id = $current_user->ID; } |
|
| 19 | + if (!$user_id) {return array(); } |
|
| 20 | 20 | |
| 21 | 21 | $user_favorites = get_user_meta($user_id, 'gd_user_favourite_post', true); |
| 22 | 22 | $all_posts = get_option('geodir_favorite_link_user_dashboard'); |
| 23 | 23 | |
| 24 | 24 | $user_listing = array(); |
| 25 | 25 | if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) { |
| 26 | - $user_favorites = "'" . implode("','", $user_favorites) . "'"; |
|
| 26 | + $user_favorites = "'".implode("','", $user_favorites)."'"; |
|
| 27 | 27 | |
| 28 | 28 | foreach ($all_posts as $ptype) { |
| 29 | - $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")"); |
|
| 29 | + $total_posts = $wpdb->get_var("SELECT count( ID ) FROM ".$wpdb->prefix."posts WHERE post_type='".$ptype."' AND post_status = 'publish' AND ID IN (".$user_favorites.")"); |
|
| 30 | 30 | |
| 31 | 31 | if ($total_posts > 0) { |
| 32 | 32 | $user_listing[$ptype] = $total_posts; |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | * @package GeoDirectory |
| 47 | 47 | */ |
| 48 | 48 | |
| 49 | -function geodir_user_show_favourites($user_id='',$output_type='select'){ |
|
| 49 | +function geodir_user_show_favourites($user_id = '', $output_type = 'select') { |
|
| 50 | 50 | // My Favourites in Dashboard |
| 51 | 51 | $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard'); |
| 52 | 52 | $user_favourite = geodir_user_favourite_listing_count($user_id); |
@@ -78,10 +78,10 @@ discard block |
||
| 78 | 78 | */ |
| 79 | 79 | $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id); |
| 80 | 80 | |
| 81 | - if($output_type=='select'){ |
|
| 82 | - $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>'; |
|
| 83 | - }elseif($output_type=='link'){ |
|
| 84 | - $favourite_links[] = '<a href="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>'; |
|
| 81 | + if ($output_type == 'select') { |
|
| 82 | + $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(ucfirst($name), 'geodirectory').'</option>'; |
|
| 83 | + }elseif ($output_type == 'link') { |
|
| 84 | + $favourite_links[] = '<a href="'.$post_type_link.'">'.__(ucfirst($name), 'geodirectory').'</a>'; |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | |
@@ -89,8 +89,8 @@ discard block |
||
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | if ($favourite_links != '') { |
| 92 | - $user = get_user_by( 'ID', $user_id ); |
|
| 93 | - if($output_type=='select') { |
|
| 92 | + $user = get_user_by('ID', $user_id); |
|
| 93 | + if ($output_type == 'select') { |
|
| 94 | 94 | ?> |
| 95 | 95 | <li> |
| 96 | 96 | <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" |
@@ -102,9 +102,9 @@ discard block |
||
| 102 | 102 | </select> |
| 103 | 103 | </li> |
| 104 | 104 | <?php |
| 105 | - }elseif($output_type=='link'){ |
|
| 106 | - if(!empty($favourite_links)){ |
|
| 107 | - echo implode(" | ",$favourite_links); |
|
| 105 | + }elseif ($output_type == 'link') { |
|
| 106 | + if (!empty($favourite_links)) { |
|
| 107 | + echo implode(" | ", $favourite_links); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | |
| 115 | 115 | |
| 116 | 116 | |
| 117 | -function geodir_user_show_listings($user_id='',$output_type='select'){ |
|
| 117 | +function geodir_user_show_listings($user_id = '', $output_type = 'select') { |
|
| 118 | 118 | |
| 119 | 119 | $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard'); |
| 120 | 120 | $user_listing = geodir_user_post_listing_count($user_id); |
@@ -146,17 +146,17 @@ discard block |
||
| 146 | 146 | * @param int $current_user->ID Current user ID. |
| 147 | 147 | */ |
| 148 | 148 | $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id); |
| 149 | - if($output_type=='select') { |
|
| 150 | - $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>'; |
|
| 151 | - }elseif($output_type=='link'){ |
|
| 152 | - $listing_links[] = '<a href="' .$listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>'; |
|
| 149 | + if ($output_type == 'select') { |
|
| 150 | + $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(ucfirst($name), 'geodirectory').'</option>'; |
|
| 151 | + }elseif ($output_type == 'link') { |
|
| 152 | + $listing_links[] = '<a href="'.$listing_link.'">'.__(ucfirst($name), 'geodirectory').'</a>'; |
|
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | if ($listing_links != '') { |
| 158 | - $user = get_user_by( 'ID', $user_id ); |
|
| 159 | - if($output_type=='select') { |
|
| 158 | + $user = get_user_by('ID', $user_id); |
|
| 159 | + if ($output_type == 'select') { |
|
| 160 | 160 | ?> |
| 161 | 161 | <li> |
| 162 | 162 | <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" |
@@ -168,9 +168,9 @@ discard block |
||
| 168 | 168 | </select> |
| 169 | 169 | </li> |
| 170 | 170 | <?php |
| 171 | - }elseif($output_type=='link'){ |
|
| 172 | - if(!empty($listing_links )){ |
|
| 173 | - echo implode(" | ",$listing_links ); |
|
| 171 | + }elseif ($output_type == 'link') { |
|
| 172 | + if (!empty($listing_links)) { |
|
| 173 | + echo implode(" | ", $listing_links); |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | } |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | |
| 81 | 81 | if($output_type=='select'){ |
| 82 | 82 | $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>'; |
| 83 | - }elseif($output_type=='link'){ |
|
| 83 | + } elseif($output_type=='link'){ |
|
| 84 | 84 | $favourite_links[] = '<a href="' . $post_type_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>'; |
| 85 | 85 | } |
| 86 | 86 | |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | </select> |
| 103 | 103 | </li> |
| 104 | 104 | <?php |
| 105 | - }elseif($output_type=='link'){ |
|
| 105 | + } elseif($output_type=='link'){ |
|
| 106 | 106 | if(!empty($favourite_links)){ |
| 107 | 107 | echo implode(" | ",$favourite_links); |
| 108 | 108 | } |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id); |
| 149 | 149 | if($output_type=='select') { |
| 150 | 150 | $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</option>'; |
| 151 | - }elseif($output_type=='link'){ |
|
| 151 | + } elseif($output_type=='link'){ |
|
| 152 | 152 | $listing_links[] = '<a href="' .$listing_link . '">' . __(ucfirst($name), 'geodirectory') . '</a>'; |
| 153 | 153 | } |
| 154 | 154 | } |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | </select> |
| 169 | 169 | </li> |
| 170 | 170 | <?php |
| 171 | - }elseif($output_type=='link'){ |
|
| 171 | + } elseif($output_type=='link'){ |
|
| 172 | 172 | if(!empty($listing_links )){ |
| 173 | 173 | echo implode(" | ",$listing_links ); |
| 174 | 174 | } |
