GeoDirectory /
geodirectory
@@ -13,29 +13,29 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | function geodir_register_taxonomies() |
| 15 | 15 | {
|
| 16 | - $taxonomies = array(); |
|
| 17 | - $taxonomies = get_option('geodir_taxonomies');
|
|
| 18 | - // If custom taxonomies are present, register them |
|
| 19 | - if (is_array($taxonomies)) {
|
|
| 20 | - // Sort taxonomies |
|
| 21 | - ksort($taxonomies); |
|
| 22 | - |
|
| 23 | - // Register taxonomies |
|
| 24 | - foreach ($taxonomies as $taxonomy => $args) {
|
|
| 25 | - // Allow taxonomy names to be translated |
|
| 26 | - if (!empty($args['args']['labels'])) {
|
|
| 27 | - foreach ($args['args']['labels'] as $key => $tax_label) {
|
|
| 28 | - $args['args']['labels'][$key] = __($tax_label, 'geodirectory'); |
|
| 29 | - } |
|
| 30 | - } |
|
| 31 | - |
|
| 32 | - $tax = register_taxonomy($taxonomy, $args['object_type'], $args['args']); |
|
| 33 | - |
|
| 34 | - if (taxonomy_exists($taxonomy)) {
|
|
| 35 | - $tax = register_taxonomy_for_object_type($taxonomy, $args['object_type']); |
|
| 36 | - } |
|
| 37 | - } |
|
| 38 | - } |
|
| 16 | + $taxonomies = array(); |
|
| 17 | + $taxonomies = get_option('geodir_taxonomies');
|
|
| 18 | + // If custom taxonomies are present, register them |
|
| 19 | + if (is_array($taxonomies)) {
|
|
| 20 | + // Sort taxonomies |
|
| 21 | + ksort($taxonomies); |
|
| 22 | + |
|
| 23 | + // Register taxonomies |
|
| 24 | + foreach ($taxonomies as $taxonomy => $args) {
|
|
| 25 | + // Allow taxonomy names to be translated |
|
| 26 | + if (!empty($args['args']['labels'])) {
|
|
| 27 | + foreach ($args['args']['labels'] as $key => $tax_label) {
|
|
| 28 | + $args['args']['labels'][$key] = __($tax_label, 'geodirectory'); |
|
| 29 | + } |
|
| 30 | + } |
|
| 31 | + |
|
| 32 | + $tax = register_taxonomy($taxonomy, $args['object_type'], $args['args']); |
|
| 33 | + |
|
| 34 | + if (taxonomy_exists($taxonomy)) {
|
|
| 35 | + $tax = register_taxonomy_for_object_type($taxonomy, $args['object_type']); |
|
| 36 | + } |
|
| 37 | + } |
|
| 38 | + } |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | /** |
@@ -46,45 +46,45 @@ discard block |
||
| 46 | 46 | * @global array $wp_post_types List of post types. |
| 47 | 47 | */ |
| 48 | 48 | function geodir_register_post_types() {
|
| 49 | - global $wp_post_types; |
|
| 49 | + global $wp_post_types; |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * Get available custom posttypes and taxonomies and register them. |
|
| 53 | - */ |
|
| 54 | - _x('places', 'URL slug', 'geodirectory');
|
|
| 55 | - |
|
| 56 | - $post_types = array(); |
|
| 57 | - $post_types = get_option('geodir_post_types');
|
|
| 58 | - |
|
| 59 | - // Register each post type if array of data is returned |
|
| 60 | - if (is_array($post_types)): |
|
| 61 | - |
|
| 62 | - foreach ($post_types as $post_type => $args): |
|
| 63 | - |
|
| 64 | - if (!empty($args['rewrite']['slug'])) {
|
|
| 65 | - $args['rewrite']['slug'] = _x($args['rewrite']['slug'], 'URL slug', 'geodirectory'); |
|
| 66 | - } |
|
| 67 | - $args = stripslashes_deep($args); |
|
| 68 | - |
|
| 69 | - if (!empty($args['labels'])) {
|
|
| 70 | - foreach ($args['labels'] as $key => $val) {
|
|
| 71 | - $args['labels'][$key] = __($val, 'geodirectory');// allow translation |
|
| 72 | - } |
|
| 73 | - } |
|
| 74 | - |
|
| 75 | - /** |
|
| 76 | - * Filter post type args. |
|
| 77 | - * |
|
| 78 | - * @since 1.0.0 |
|
| 79 | - * @param string $args Post type args. |
|
| 80 | - * @param string $post_type The post type. |
|
| 81 | - */ |
|
| 82 | - $args = apply_filters('geodir_post_type_args', $args, $post_type);
|
|
| 83 | - |
|
| 84 | - $post_type = register_post_type($post_type, $args); |
|
| 85 | - |
|
| 86 | - endforeach; |
|
| 87 | - endif; |
|
| 51 | + /** |
|
| 52 | + * Get available custom posttypes and taxonomies and register them. |
|
| 53 | + */ |
|
| 54 | + _x('places', 'URL slug', 'geodirectory');
|
|
| 55 | + |
|
| 56 | + $post_types = array(); |
|
| 57 | + $post_types = get_option('geodir_post_types');
|
|
| 58 | + |
|
| 59 | + // Register each post type if array of data is returned |
|
| 60 | + if (is_array($post_types)): |
|
| 61 | + |
|
| 62 | + foreach ($post_types as $post_type => $args): |
|
| 63 | + |
|
| 64 | + if (!empty($args['rewrite']['slug'])) {
|
|
| 65 | + $args['rewrite']['slug'] = _x($args['rewrite']['slug'], 'URL slug', 'geodirectory'); |
|
| 66 | + } |
|
| 67 | + $args = stripslashes_deep($args); |
|
| 68 | + |
|
| 69 | + if (!empty($args['labels'])) {
|
|
| 70 | + foreach ($args['labels'] as $key => $val) {
|
|
| 71 | + $args['labels'][$key] = __($val, 'geodirectory');// allow translation |
|
| 72 | + } |
|
| 73 | + } |
|
| 74 | + |
|
| 75 | + /** |
|
| 76 | + * Filter post type args. |
|
| 77 | + * |
|
| 78 | + * @since 1.0.0 |
|
| 79 | + * @param string $args Post type args. |
|
| 80 | + * @param string $post_type The post type. |
|
| 81 | + */ |
|
| 82 | + $args = apply_filters('geodir_post_type_args', $args, $post_type);
|
|
| 83 | + |
|
| 84 | + $post_type = register_post_type($post_type, $args); |
|
| 85 | + |
|
| 86 | + endforeach; |
|
| 87 | + endif; |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | /** |
@@ -98,72 +98,72 @@ discard block |
||
| 98 | 98 | */ |
| 99 | 99 | function geodir_post_type_args_modify($args, $post_type) |
| 100 | 100 | {
|
| 101 | - $geodir_location_prefix = isset($_REQUEST['geodir_location_prefix']) ? trim($_REQUEST['geodir_location_prefix']) : get_option('geodir_location_prefix');
|
|
| 101 | + $geodir_location_prefix = isset($_REQUEST['geodir_location_prefix']) ? trim($_REQUEST['geodir_location_prefix']) : get_option('geodir_location_prefix');
|
|
| 102 | 102 | if (isset($_REQUEST['geodir_listing_prefix']) && $_REQUEST['geodir_listing_prefix'] != '' && geodir_strtolower($_REQUEST['geodir_listing_prefix']) != geodir_strtolower($geodir_location_prefix)) {
|
| 103 | 103 | |
| 104 | - $listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix'])); |
|
| 104 | + $listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix'])); |
|
| 105 | 105 | |
| 106 | - if ($post_type == 'gd_place') {
|
|
| 107 | - if (array_key_exists('has_archive', $args))
|
|
| 108 | - $args['has_archive'] = $listing_slug; |
|
| 106 | + if ($post_type == 'gd_place') {
|
|
| 107 | + if (array_key_exists('has_archive', $args))
|
|
| 108 | + $args['has_archive'] = $listing_slug; |
|
| 109 | 109 | |
| 110 | - if (array_key_exists('rewrite', $args)) {
|
|
| 111 | - if (array_key_exists('slug', $args['rewrite']))
|
|
| 112 | - $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%'; |
|
| 113 | - } |
|
| 110 | + if (array_key_exists('rewrite', $args)) {
|
|
| 111 | + if (array_key_exists('slug', $args['rewrite']))
|
|
| 112 | + $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%'; |
|
| 113 | + } |
|
| 114 | 114 | |
| 115 | - $geodir_post_types = get_option('geodir_post_types');
|
|
| 115 | + $geodir_post_types = get_option('geodir_post_types');
|
|
| 116 | 116 | |
| 117 | - if (array_key_exists($post_type, $geodir_post_types)) {
|
|
| 117 | + if (array_key_exists($post_type, $geodir_post_types)) {
|
|
| 118 | 118 | |
| 119 | - if (array_key_exists('has_archive', $geodir_post_types[$post_type]))
|
|
| 120 | - $geodir_post_types[$post_type]['has_archive'] = $listing_slug; |
|
| 119 | + if (array_key_exists('has_archive', $geodir_post_types[$post_type]))
|
|
| 120 | + $geodir_post_types[$post_type]['has_archive'] = $listing_slug; |
|
| 121 | 121 | |
| 122 | - if (array_key_exists('rewrite', $geodir_post_types[$post_type]))
|
|
| 123 | - if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))
|
|
| 124 | - $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%'; |
|
| 122 | + if (array_key_exists('rewrite', $geodir_post_types[$post_type]))
|
|
| 123 | + if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))
|
|
| 124 | + $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%'; |
|
| 125 | 125 | |
| 126 | - update_option('geodir_post_types', $geodir_post_types);
|
|
| 126 | + update_option('geodir_post_types', $geodir_post_types);
|
|
| 127 | 127 | |
| 128 | - } |
|
| 128 | + } |
|
| 129 | 129 | |
| 130 | - $geodir_post_types = get_option('geodir_post_types');
|
|
| 130 | + $geodir_post_types = get_option('geodir_post_types');
|
|
| 131 | 131 | |
| 132 | - /* --- update taxonomies (category) --- */ |
|
| 132 | + /* --- update taxonomies (category) --- */ |
|
| 133 | 133 | |
| 134 | - $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 134 | + $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 135 | 135 | |
| 136 | - if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {
|
|
| 137 | - $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug; |
|
| 136 | + if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {
|
|
| 137 | + $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug; |
|
| 138 | 138 | |
| 139 | - if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))
|
|
| 140 | - if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))
|
|
| 141 | - if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))
|
|
| 142 | - $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug; |
|
| 139 | + if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))
|
|
| 140 | + if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))
|
|
| 141 | + if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))
|
|
| 142 | + $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug; |
|
| 143 | 143 | |
| 144 | - update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 144 | + update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 145 | 145 | |
| 146 | - } |
|
| 146 | + } |
|
| 147 | 147 | |
| 148 | - /* --- update taxonomies (tags) --- */ |
|
| 149 | - $geodir_taxonomies_tag = get_option('geodir_taxonomies');
|
|
| 150 | - if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {
|
|
| 151 | - $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags'; |
|
| 148 | + /* --- update taxonomies (tags) --- */ |
|
| 149 | + $geodir_taxonomies_tag = get_option('geodir_taxonomies');
|
|
| 150 | + if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {
|
|
| 151 | + $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags'; |
|
| 152 | 152 | |
| 153 | - if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))
|
|
| 154 | - if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))
|
|
| 155 | - if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))
|
|
| 156 | - $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags'; |
|
| 153 | + if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))
|
|
| 154 | + if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))
|
|
| 155 | + if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))
|
|
| 156 | + $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags'; |
|
| 157 | 157 | |
| 158 | - update_option('geodir_taxonomies', $geodir_taxonomies_tag);
|
|
| 158 | + update_option('geodir_taxonomies', $geodir_taxonomies_tag);
|
|
| 159 | 159 | |
| 160 | - } |
|
| 160 | + } |
|
| 161 | 161 | |
| 162 | - } |
|
| 162 | + } |
|
| 163 | 163 | |
| 164 | - } |
|
| 164 | + } |
|
| 165 | 165 | |
| 166 | - return $args; |
|
| 166 | + return $args; |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | /** |
@@ -176,8 +176,8 @@ discard block |
||
| 176 | 176 | */ |
| 177 | 177 | function geodir_flush_rewrite_rules() |
| 178 | 178 | {
|
| 179 | - global $wp_rewrite; |
|
| 180 | - $wp_rewrite->flush_rules(false); |
|
| 179 | + global $wp_rewrite; |
|
| 180 | + $wp_rewrite->flush_rules(false); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | /** |
@@ -192,35 +192,35 @@ discard block |
||
| 192 | 192 | * @return array Rewrite rules. |
| 193 | 193 | */ |
| 194 | 194 | function geodir_listing_rewrite_rules($rules) {
|
| 195 | - $newrules = array(); |
|
| 196 | - $taxonomies = get_option('geodir_taxonomies');
|
|
| 197 | - $detail_url_seprator = get_option('geodir_detailurl_separator');
|
|
| 195 | + $newrules = array(); |
|
| 196 | + $taxonomies = get_option('geodir_taxonomies');
|
|
| 197 | + $detail_url_seprator = get_option('geodir_detailurl_separator');
|
|
| 198 | 198 | |
| 199 | 199 | // create rules for post listing |
| 200 | - if (is_array($taxonomies)): |
|
| 201 | - foreach ($taxonomies as $taxonomy => $args): |
|
| 202 | - $post_type = $args['object_type']; |
|
| 203 | - $listing_slug = $args['listing_slug']; |
|
| 204 | - |
|
| 205 | - if (strpos($taxonomy, 'tags')) {
|
|
| 206 | - $newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]';
|
|
| 207 | - $newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]'; |
|
| 208 | - } else {
|
|
| 209 | - // use this loop to add paging for details page comments paging |
|
| 210 | - $newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';
|
|
| 211 | - } |
|
| 212 | - endforeach; |
|
| 213 | - endif; |
|
| 214 | - |
|
| 215 | - // create rules for location listing |
|
| 216 | - $location_page = get_option('geodir_location_page');
|
|
| 200 | + if (is_array($taxonomies)): |
|
| 201 | + foreach ($taxonomies as $taxonomy => $args): |
|
| 202 | + $post_type = $args['object_type']; |
|
| 203 | + $listing_slug = $args['listing_slug']; |
|
| 204 | + |
|
| 205 | + if (strpos($taxonomy, 'tags')) {
|
|
| 206 | + $newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]';
|
|
| 207 | + $newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]'; |
|
| 208 | + } else {
|
|
| 209 | + // use this loop to add paging for details page comments paging |
|
| 210 | + $newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';
|
|
| 211 | + } |
|
| 212 | + endforeach; |
|
| 213 | + endif; |
|
| 214 | + |
|
| 215 | + // create rules for location listing |
|
| 216 | + $location_page = get_option('geodir_location_page');
|
|
| 217 | 217 | |
| 218 | - if($location_page) {
|
|
| 219 | - global $wpdb; |
|
| 220 | - $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));
|
|
| 221 | - } |
|
| 222 | - if (!isset($location_prefix)) |
|
| 223 | - $location_prefix = 'location'; |
|
| 218 | + if($location_page) {
|
|
| 219 | + global $wpdb; |
|
| 220 | + $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));
|
|
| 221 | + } |
|
| 222 | + if (!isset($location_prefix)) |
|
| 223 | + $location_prefix = 'location'; |
|
| 224 | 224 | |
| 225 | 225 | $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
| 226 | 226 | if ($location_manager) {
|
@@ -264,12 +264,12 @@ discard block |
||
| 264 | 264 | $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]'; |
| 265 | 265 | } |
| 266 | 266 | |
| 267 | - if ($location_page && geodir_is_wpml()) {
|
|
| 268 | - foreach(icl_get_languages('skip_missing=N') as $lang){
|
|
| 269 | - $alt_page_id = ''; |
|
| 270 | - $alt_page_id = geodir_wpml_object_id($location_page, 'page', false,$lang['language_code']); |
|
| 271 | - if($alt_page_id){
|
|
| 272 | - $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));
|
|
| 267 | + if ($location_page && geodir_is_wpml()) {
|
|
| 268 | + foreach(icl_get_languages('skip_missing=N') as $lang){
|
|
| 269 | + $alt_page_id = ''; |
|
| 270 | + $alt_page_id = geodir_wpml_object_id($location_page, 'page', false,$lang['language_code']); |
|
| 271 | + if($alt_page_id){
|
|
| 272 | + $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));
|
|
| 273 | 273 | |
| 274 | 274 | if ($location_manager && ($hide_country_part || $hide_region_part)) {
|
| 275 | 275 | $matches2 = ''; |
@@ -305,14 +305,14 @@ discard block |
||
| 305 | 305 | $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]'; |
| 306 | 306 | $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]'; |
| 307 | 307 | } |
| 308 | - } |
|
| 309 | - } |
|
| 310 | - } |
|
| 308 | + } |
|
| 309 | + } |
|
| 310 | + } |
|
| 311 | 311 | |
| 312 | - $newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page; |
|
| 312 | + $newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page; |
|
| 313 | 313 | |
| 314 | - $rules = array_merge($newrules, $rules); |
|
| 315 | - return $rules; |
|
| 314 | + $rules = array_merge($newrules, $rules); |
|
| 315 | + return $rules; |
|
| 316 | 316 | } |
| 317 | 317 | |
| 318 | 318 | /** |
@@ -327,18 +327,18 @@ discard block |
||
| 327 | 327 | */ |
| 328 | 328 | function geodir_htaccess_contents($rules) |
| 329 | 329 | {
|
| 330 | - global $wpdb; |
|
| 331 | - $location_prefix = get_option('geodir_location_prefix');
|
|
| 332 | - // if location page slug changed then add redirect |
|
| 333 | - if ($location_prefix == 'location') {
|
|
| 334 | - return $rules; |
|
| 335 | - } |
|
| 336 | - $my_content = <<<EOD |
|
| 330 | + global $wpdb; |
|
| 331 | + $location_prefix = get_option('geodir_location_prefix');
|
|
| 332 | + // if location page slug changed then add redirect |
|
| 333 | + if ($location_prefix == 'location') {
|
|
| 334 | + return $rules; |
|
| 335 | + } |
|
| 336 | + $my_content = <<<EOD |
|
| 337 | 337 | \n# BEGIN GeoDirectory Rules |
| 338 | 338 | #Redirect 301 /location/ /$location_prefix/ |
| 339 | 339 | # END GeoDirectory Rules\n\n |
| 340 | 340 | EOD; |
| 341 | - return $my_content . $rules; |
|
| 341 | + return $my_content . $rules; |
|
| 342 | 342 | } |
| 343 | 343 | //add_filter('mod_rewrite_rules', 'geodir_htaccess_contents');
|
| 344 | 344 | |
@@ -352,10 +352,10 @@ discard block |
||
| 352 | 352 | */ |
| 353 | 353 | function geodir_add_location_var($public_query_vars) |
| 354 | 354 | {
|
| 355 | - $public_query_vars[] = 'gd_country'; |
|
| 356 | - $public_query_vars[] = 'gd_region'; |
|
| 357 | - $public_query_vars[] = 'gd_city'; |
|
| 358 | - return $public_query_vars; |
|
| 355 | + $public_query_vars[] = 'gd_country'; |
|
| 356 | + $public_query_vars[] = 'gd_region'; |
|
| 357 | + $public_query_vars[] = 'gd_city'; |
|
| 358 | + return $public_query_vars; |
|
| 359 | 359 | } |
| 360 | 360 | |
| 361 | 361 | /** |
@@ -368,8 +368,8 @@ discard block |
||
| 368 | 368 | */ |
| 369 | 369 | function geodir_add_geodir_page_var($public_query_vars) |
| 370 | 370 | {
|
| 371 | - $public_query_vars[] = 'gd_is_geodir_page'; |
|
| 372 | - return $public_query_vars; |
|
| 371 | + $public_query_vars[] = 'gd_is_geodir_page'; |
|
| 372 | + return $public_query_vars; |
|
| 373 | 373 | } |
| 374 | 374 | |
| 375 | 375 | /** |
@@ -381,20 +381,20 @@ discard block |
||
| 381 | 381 | */ |
| 382 | 382 | function geodir_add_page_id_in_query_var() |
| 383 | 383 | {
|
| 384 | - global $wp_query; |
|
| 384 | + global $wp_query; |
|
| 385 | 385 | |
| 386 | - $page_id = $wp_query->get_queried_object_id(); |
|
| 386 | + $page_id = $wp_query->get_queried_object_id(); |
|
| 387 | 387 | |
| 388 | - if (!get_query_var('page_id') && !is_archive()) {
|
|
| 389 | - // fix for WP tags conflict with enfold theme |
|
| 390 | - $theme_name = geodir_strtolower(wp_get_theme()); |
|
| 391 | - if (!geodir_is_geodir_page() && strpos($theme_name, 'enfold') !== false) {
|
|
| 392 | - return $wp_query; |
|
| 393 | - } |
|
| 394 | - $wp_query->set('page_id', $page_id);
|
|
| 395 | - } |
|
| 388 | + if (!get_query_var('page_id') && !is_archive()) {
|
|
| 389 | + // fix for WP tags conflict with enfold theme |
|
| 390 | + $theme_name = geodir_strtolower(wp_get_theme()); |
|
| 391 | + if (!geodir_is_geodir_page() && strpos($theme_name, 'enfold') !== false) {
|
|
| 392 | + return $wp_query; |
|
| 393 | + } |
|
| 394 | + $wp_query->set('page_id', $page_id);
|
|
| 395 | + } |
|
| 396 | 396 | |
| 397 | - return $wp_query; |
|
| 397 | + return $wp_query; |
|
| 398 | 398 | } |
| 399 | 399 | |
| 400 | 400 | /** |
@@ -409,23 +409,23 @@ discard block |
||
| 409 | 409 | function geodir_set_location_var_in_session_in_core($wp) {
|
| 410 | 410 | global $gd_session; |
| 411 | 411 | |
| 412 | - // Fix for WPML removing page_id query var: |
|
| 413 | - if (isset($wp->query_vars['page']) && !isset($wp->query_vars['page_id']) && isset($wp->query_vars['pagename']) && !is_home()) {
|
|
| 414 | - global $wpdb; |
|
| 412 | + // Fix for WPML removing page_id query var: |
|
| 413 | + if (isset($wp->query_vars['page']) && !isset($wp->query_vars['page_id']) && isset($wp->query_vars['pagename']) && !is_home()) {
|
|
| 414 | + global $wpdb; |
|
| 415 | 415 | |
| 416 | - $page_for_posts = get_option('page_for_posts');
|
|
| 417 | - $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s",$wp->query_vars['pagename']));
|
|
| 416 | + $page_for_posts = get_option('page_for_posts');
|
|
| 417 | + $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s",$wp->query_vars['pagename']));
|
|
| 418 | 418 | |
| 419 | - if (geodir_is_wpml()) {
|
|
| 420 | - $real_page_id = geodir_wpml_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE); |
|
| 421 | - } |
|
| 422 | - if ($real_page_id && $real_page_id!=$page_for_posts) {
|
|
| 423 | - $wp->query_vars['page_id'] = $real_page_id; |
|
| 424 | - } |
|
| 425 | - } |
|
| 419 | + if (geodir_is_wpml()) {
|
|
| 420 | + $real_page_id = geodir_wpml_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE); |
|
| 421 | + } |
|
| 422 | + if ($real_page_id && $real_page_id!=$page_for_posts) {
|
|
| 423 | + $wp->query_vars['page_id'] = $real_page_id; |
|
| 424 | + } |
|
| 425 | + } |
|
| 426 | 426 | // Query Vars will have page_id parameter |
| 427 | 427 | // check if query var has page_id and that page id is location page |
| 428 | - geodir_set_is_geodir_page($wp); |
|
| 428 | + geodir_set_is_geodir_page($wp); |
|
| 429 | 429 | // if is GD homepage set the page ID |
| 430 | 430 | if (geodir_is_page('home')) {
|
| 431 | 431 | $wp->query_vars['page_id'] = get_option('page_on_front');
|
@@ -434,118 +434,118 @@ discard block |
||
| 434 | 434 | // The location url format (all or country_city or region_city or city). |
| 435 | 435 | $geodir_show_location_url = get_option('geodir_show_location_url');
|
| 436 | 436 | |
| 437 | - if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id()) {
|
|
| 438 | - $gd_country = ''; |
|
| 439 | - $gd_region = ''; |
|
| 440 | - $gd_city = ''; |
|
| 441 | - if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') |
|
| 442 | - $gd_country = urldecode($wp->query_vars['gd_country']); |
|
| 443 | - |
|
| 444 | - if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') |
|
| 445 | - $gd_region = urldecode($wp->query_vars['gd_region']); |
|
| 446 | - |
|
| 447 | - if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') |
|
| 448 | - $gd_city = urldecode($wp->query_vars['gd_city']); |
|
| 449 | - |
|
| 450 | - if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) {
|
|
| 451 | - $default_location = geodir_get_default_location(); |
|
| 452 | - |
|
| 453 | - if (get_option('geodir_add_location_url')) {
|
|
| 454 | - if ($geodir_show_location_url != 'all') {
|
|
| 455 | - if ($gd_region == '') {
|
|
| 456 | - if ($gd_ses_region = $gd_session->get('gd_region'))
|
|
| 457 | - $gd_region = $gd_ses_region; |
|
| 458 | - else |
|
| 459 | - $gd_region = $default_location->region_slug; |
|
| 460 | - } |
|
| 461 | - |
|
| 462 | - if ($gd_city == '') {
|
|
| 463 | - if ($gd_ses_city = $gd_session->get('gd_city'))
|
|
| 464 | - $gd_city = $gd_ses_city; |
|
| 465 | - else |
|
| 466 | - $gd_city = $default_location->city_slug; |
|
| 467 | - |
|
| 468 | - $base_location_link = geodir_get_location_link('base');
|
|
| 469 | - wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city); |
|
| 470 | - exit(); |
|
| 471 | - } |
|
| 472 | - } |
|
| 473 | - } |
|
| 474 | - |
|
| 475 | - $args = array( |
|
| 476 | - 'what' => 'city', |
|
| 477 | - 'city_val' => $gd_city, |
|
| 478 | - 'region_val' => $gd_region, |
|
| 479 | - 'country_val' => $gd_country, |
|
| 480 | - 'country_column_name' => 'country_slug', |
|
| 481 | - 'region_column_name' => 'region_slug', |
|
| 482 | - 'city_column_name' => 'city_slug', |
|
| 483 | - 'location_link_part' => false, |
|
| 484 | - 'compare_operator' => '' |
|
| 485 | - ); |
|
| 486 | - |
|
| 487 | - $location_array = function_exists('geodir_get_location_array') ? geodir_get_location_array($args) : array();
|
|
| 488 | - if (!empty($location_array)) {
|
|
| 489 | - $gd_session->set('gd_multi_location', 1);
|
|
| 490 | - $gd_session->set('gd_country', $gd_country);
|
|
| 491 | - $gd_session->set('gd_region', $gd_region);
|
|
| 492 | - $gd_session->set('gd_city', $gd_city);
|
|
| 437 | + if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id()) {
|
|
| 438 | + $gd_country = ''; |
|
| 439 | + $gd_region = ''; |
|
| 440 | + $gd_city = ''; |
|
| 441 | + if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') |
|
| 442 | + $gd_country = urldecode($wp->query_vars['gd_country']); |
|
| 443 | + |
|
| 444 | + if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') |
|
| 445 | + $gd_region = urldecode($wp->query_vars['gd_region']); |
|
| 446 | + |
|
| 447 | + if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') |
|
| 448 | + $gd_city = urldecode($wp->query_vars['gd_city']); |
|
| 449 | + |
|
| 450 | + if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) {
|
|
| 451 | + $default_location = geodir_get_default_location(); |
|
| 452 | + |
|
| 453 | + if (get_option('geodir_add_location_url')) {
|
|
| 454 | + if ($geodir_show_location_url != 'all') {
|
|
| 455 | + if ($gd_region == '') {
|
|
| 456 | + if ($gd_ses_region = $gd_session->get('gd_region'))
|
|
| 457 | + $gd_region = $gd_ses_region; |
|
| 458 | + else |
|
| 459 | + $gd_region = $default_location->region_slug; |
|
| 460 | + } |
|
| 461 | + |
|
| 462 | + if ($gd_city == '') {
|
|
| 463 | + if ($gd_ses_city = $gd_session->get('gd_city'))
|
|
| 464 | + $gd_city = $gd_ses_city; |
|
| 465 | + else |
|
| 466 | + $gd_city = $default_location->city_slug; |
|
| 467 | + |
|
| 468 | + $base_location_link = geodir_get_location_link('base');
|
|
| 469 | + wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city); |
|
| 470 | + exit(); |
|
| 471 | + } |
|
| 472 | + } |
|
| 473 | + } |
|
| 474 | + |
|
| 475 | + $args = array( |
|
| 476 | + 'what' => 'city', |
|
| 477 | + 'city_val' => $gd_city, |
|
| 478 | + 'region_val' => $gd_region, |
|
| 479 | + 'country_val' => $gd_country, |
|
| 480 | + 'country_column_name' => 'country_slug', |
|
| 481 | + 'region_column_name' => 'region_slug', |
|
| 482 | + 'city_column_name' => 'city_slug', |
|
| 483 | + 'location_link_part' => false, |
|
| 484 | + 'compare_operator' => '' |
|
| 485 | + ); |
|
| 486 | + |
|
| 487 | + $location_array = function_exists('geodir_get_location_array') ? geodir_get_location_array($args) : array();
|
|
| 488 | + if (!empty($location_array)) {
|
|
| 489 | + $gd_session->set('gd_multi_location', 1);
|
|
| 490 | + $gd_session->set('gd_country', $gd_country);
|
|
| 491 | + $gd_session->set('gd_region', $gd_region);
|
|
| 492 | + $gd_session->set('gd_city', $gd_city);
|
|
| 493 | 493 | |
| 494 | 494 | $wp->query_vars['gd_country'] = $gd_country; |
| 495 | - $wp->query_vars['gd_region'] = $gd_region; |
|
| 496 | - $wp->query_vars['gd_city'] = $gd_city; |
|
| 497 | - } else {
|
|
| 498 | - $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));
|
|
| 499 | - } |
|
| 500 | - } else {
|
|
| 501 | - $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));
|
|
| 502 | - } |
|
| 503 | - |
|
| 504 | - } else if (isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {
|
|
| 505 | - if (!is_admin()) {
|
|
| 506 | - $requested_post_type = $wp->query_vars['post_type']; |
|
| 507 | - // check if this post type is geodirectory post types |
|
| 508 | - $post_type_array = geodir_get_posttypes(); |
|
| 495 | + $wp->query_vars['gd_region'] = $gd_region; |
|
| 496 | + $wp->query_vars['gd_city'] = $gd_city; |
|
| 497 | + } else {
|
|
| 498 | + $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));
|
|
| 499 | + } |
|
| 500 | + } else {
|
|
| 501 | + $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));
|
|
| 502 | + } |
|
| 503 | + |
|
| 504 | + } else if (isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {
|
|
| 505 | + if (!is_admin()) {
|
|
| 506 | + $requested_post_type = $wp->query_vars['post_type']; |
|
| 507 | + // check if this post type is geodirectory post types |
|
| 508 | + $post_type_array = geodir_get_posttypes(); |
|
| 509 | 509 | |
| 510 | 510 | if (in_array($requested_post_type, $post_type_array)) {
|
| 511 | - // now u can apply geodirectory related manipulation. |
|
| 512 | - } |
|
| 513 | - } |
|
| 514 | - } else {
|
|
| 515 | - // check if a geodirectory taxonomy is set |
|
| 516 | - $gd_country = ''; |
|
| 517 | - $gd_region = ''; |
|
| 518 | - $gd_city = ''; |
|
| 511 | + // now u can apply geodirectory related manipulation. |
|
| 512 | + } |
|
| 513 | + } |
|
| 514 | + } else {
|
|
| 515 | + // check if a geodirectory taxonomy is set |
|
| 516 | + $gd_country = ''; |
|
| 517 | + $gd_region = ''; |
|
| 518 | + $gd_city = ''; |
|
| 519 | 519 | |
| 520 | 520 | $is_geodir_taxonomy = false; |
| 521 | - $is_geodir_taxonomy_term = false; // the last term is real geodirectory taxonomy term or not |
|
| 522 | - $is_geodir_location_found = false; |
|
| 521 | + $is_geodir_taxonomy_term = false; // the last term is real geodirectory taxonomy term or not |
|
| 522 | + $is_geodir_location_found = false; |
|
| 523 | 523 | |
| 524 | 524 | $geodir_taxonomy = ''; |
| 525 | - $geodir_post_type = ''; |
|
| 526 | - $geodir_term = ''; |
|
| 527 | - $geodir_set_location_session = true; |
|
| 528 | - $geodir_taxonomis = geodir_get_taxonomies('', true);
|
|
| 529 | - |
|
| 530 | - if(!empty($geodir_taxonomis)){
|
|
| 531 | - foreach ($geodir_taxonomis as $taxonomy) {
|
|
| 532 | - if (array_key_exists($taxonomy, $wp->query_vars)) {
|
|
| 533 | - $is_geodir_taxonomy = true; |
|
| 534 | - $geodir_taxonomy = $taxonomy; |
|
| 535 | - $geodir_post_type = str_replace('category', '', $taxonomy);
|
|
| 536 | - $geodir_post_type = str_replace('_tags', '', $geodir_post_type);
|
|
| 537 | - $geodir_term = $wp->query_vars[$geodir_taxonomy]; |
|
| 538 | - break; |
|
| 539 | - } |
|
| 540 | - } |
|
| 541 | - } |
|
| 542 | - |
|
| 543 | - // now get an array of all terms seperated by '/' |
|
| 544 | - $geodir_terms = explode('/', $geodir_term);
|
|
| 545 | - $geodir_last_term = end($geodir_terms); |
|
| 546 | - |
|
| 547 | - if ($is_geodir_taxonomy) { // do all these only when it is a geodirectory taxonomy
|
|
| 548 | - $wp->query_vars['post_type'] = $geodir_post_type; |
|
| 525 | + $geodir_post_type = ''; |
|
| 526 | + $geodir_term = ''; |
|
| 527 | + $geodir_set_location_session = true; |
|
| 528 | + $geodir_taxonomis = geodir_get_taxonomies('', true);
|
|
| 529 | + |
|
| 530 | + if(!empty($geodir_taxonomis)){
|
|
| 531 | + foreach ($geodir_taxonomis as $taxonomy) {
|
|
| 532 | + if (array_key_exists($taxonomy, $wp->query_vars)) {
|
|
| 533 | + $is_geodir_taxonomy = true; |
|
| 534 | + $geodir_taxonomy = $taxonomy; |
|
| 535 | + $geodir_post_type = str_replace('category', '', $taxonomy);
|
|
| 536 | + $geodir_post_type = str_replace('_tags', '', $geodir_post_type);
|
|
| 537 | + $geodir_term = $wp->query_vars[$geodir_taxonomy]; |
|
| 538 | + break; |
|
| 539 | + } |
|
| 540 | + } |
|
| 541 | + } |
|
| 542 | + |
|
| 543 | + // now get an array of all terms seperated by '/' |
|
| 544 | + $geodir_terms = explode('/', $geodir_term);
|
|
| 545 | + $geodir_last_term = end($geodir_terms); |
|
| 546 | + |
|
| 547 | + if ($is_geodir_taxonomy) { // do all these only when it is a geodirectory taxonomy
|
|
| 548 | + $wp->query_vars['post_type'] = $geodir_post_type; |
|
| 549 | 549 | |
| 550 | 550 | // now check if last term is a post of geodirectory post types |
| 551 | 551 | $geodir_post = get_posts(array( |
@@ -594,196 +594,196 @@ discard block |
||
| 594 | 594 | //return ; |
| 595 | 595 | } |
| 596 | 596 | |
| 597 | - $geodir_location_terms = ''; |
|
| 598 | - // if last term is not a post then check if last term is a term of the specific texonomy or not |
|
| 599 | - if (geodir_term_exists($geodir_last_term, $geodir_taxonomy)) {
|
|
| 600 | - $is_geodir_taxonomy_term = true; |
|
| 597 | + $geodir_location_terms = ''; |
|
| 598 | + // if last term is not a post then check if last term is a term of the specific texonomy or not |
|
| 599 | + if (geodir_term_exists($geodir_last_term, $geodir_taxonomy)) {
|
|
| 600 | + $is_geodir_taxonomy_term = true; |
|
| 601 | 601 | |
| 602 | - $geodir_set_location_session = false; |
|
| 603 | - } |
|
| 602 | + $geodir_set_location_session = false; |
|
| 603 | + } |
|
| 604 | 604 | |
| 605 | 605 | |
| 606 | - // now check if there is location parts in the url or not |
|
| 607 | - if (get_option('geodir_add_location_url')) {
|
|
| 606 | + // now check if there is location parts in the url or not |
|
| 607 | + if (get_option('geodir_add_location_url')) {
|
|
| 608 | 608 | $default_location = geodir_get_default_location(); |
| 609 | 609 | |
| 610 | 610 | if ($geodir_show_location_url == 'all') {
|
| 611 | - if (count($geodir_terms) >= 3) {
|
|
| 612 | - $gd_country = urldecode($geodir_terms[0]); |
|
| 613 | - $gd_region = urldecode($geodir_terms[1]); |
|
| 614 | - $gd_city = urldecode($geodir_terms[2]); |
|
| 615 | - } else if (count($geodir_terms) >= 2) {
|
|
| 616 | - $gd_country = urldecode($geodir_terms[0]); |
|
| 617 | - $gd_region = urldecode($geodir_terms[1]); |
|
| 618 | - } else if (count($geodir_terms) >= 1) {
|
|
| 619 | - $gd_country = urldecode($geodir_terms[0]); |
|
| 620 | - } |
|
| 621 | - |
|
| 622 | - if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && |
|
| 623 | - geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && |
|
| 624 | - geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city) |
|
| 625 | - ) |
|
| 626 | - $is_geodir_location_found = true; |
|
| 627 | - |
|
| 628 | - // if location has not been found for country , region and city then search for country and region only |
|
| 629 | - |
|
| 630 | - if (!$is_geodir_location_found) {
|
|
| 631 | - $gd_city = ''; |
|
| 632 | - if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && |
|
| 633 | - geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) |
|
| 634 | - ) |
|
| 635 | - $is_geodir_location_found = true; |
|
| 636 | - |
|
| 637 | - } |
|
| 638 | - |
|
| 639 | - // if location has not been found for country , region then search for country only |
|
| 640 | - if (!$is_geodir_location_found) {
|
|
| 641 | - $gd_city = ''; |
|
| 642 | - $gd_region = ''; |
|
| 643 | - if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) |
|
| 644 | - $is_geodir_location_found = true; |
|
| 645 | - } |
|
| 646 | - } else if ($geodir_show_location_url == 'country_city') {
|
|
| 647 | - if (count($geodir_terms) >= 2) {
|
|
| 648 | - $gd_country = urldecode($geodir_terms[0]); |
|
| 649 | - $gd_city = urldecode($geodir_terms[1]); |
|
| 650 | - } else if (count($geodir_terms) >= 1) {
|
|
| 651 | - $gd_country = urldecode($geodir_terms[0]); |
|
| 652 | - } |
|
| 653 | - |
|
| 654 | - if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) |
|
| 655 | - $is_geodir_location_found = true; |
|
| 656 | - |
|
| 657 | - // if location has not been found for country and city then search for country only |
|
| 658 | - if (!$is_geodir_location_found) {
|
|
| 659 | - $gd_city = ''; |
|
| 611 | + if (count($geodir_terms) >= 3) {
|
|
| 612 | + $gd_country = urldecode($geodir_terms[0]); |
|
| 613 | + $gd_region = urldecode($geodir_terms[1]); |
|
| 614 | + $gd_city = urldecode($geodir_terms[2]); |
|
| 615 | + } else if (count($geodir_terms) >= 2) {
|
|
| 616 | + $gd_country = urldecode($geodir_terms[0]); |
|
| 617 | + $gd_region = urldecode($geodir_terms[1]); |
|
| 618 | + } else if (count($geodir_terms) >= 1) {
|
|
| 619 | + $gd_country = urldecode($geodir_terms[0]); |
|
| 620 | + } |
|
| 621 | + |
|
| 622 | + if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && |
|
| 623 | + geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && |
|
| 624 | + geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city) |
|
| 625 | + ) |
|
| 626 | + $is_geodir_location_found = true; |
|
| 627 | + |
|
| 628 | + // if location has not been found for country , region and city then search for country and region only |
|
| 629 | + |
|
| 630 | + if (!$is_geodir_location_found) {
|
|
| 631 | + $gd_city = ''; |
|
| 632 | + if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && |
|
| 633 | + geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) |
|
| 634 | + ) |
|
| 635 | + $is_geodir_location_found = true; |
|
| 636 | + |
|
| 637 | + } |
|
| 638 | + |
|
| 639 | + // if location has not been found for country , region then search for country only |
|
| 640 | + if (!$is_geodir_location_found) {
|
|
| 641 | + $gd_city = ''; |
|
| 642 | + $gd_region = ''; |
|
| 643 | + if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) |
|
| 644 | + $is_geodir_location_found = true; |
|
| 645 | + } |
|
| 646 | + } else if ($geodir_show_location_url == 'country_city') {
|
|
| 647 | + if (count($geodir_terms) >= 2) {
|
|
| 648 | + $gd_country = urldecode($geodir_terms[0]); |
|
| 649 | + $gd_city = urldecode($geodir_terms[1]); |
|
| 650 | + } else if (count($geodir_terms) >= 1) {
|
|
| 651 | + $gd_country = urldecode($geodir_terms[0]); |
|
| 652 | + } |
|
| 653 | + |
|
| 654 | + if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) |
|
| 655 | + $is_geodir_location_found = true; |
|
| 656 | + |
|
| 657 | + // if location has not been found for country and city then search for country only |
|
| 658 | + if (!$is_geodir_location_found) {
|
|
| 659 | + $gd_city = ''; |
|
| 660 | 660 | |
| 661 | 661 | if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) |
| 662 | - $is_geodir_location_found = true; |
|
| 663 | - } |
|
| 664 | - } else if ($geodir_show_location_url == 'region_city') {
|
|
| 665 | - if (count($geodir_terms) >= 2) {
|
|
| 666 | - $gd_region = urldecode($geodir_terms[0]); |
|
| 667 | - $gd_city = urldecode($geodir_terms[1]); |
|
| 668 | - } else if (count($geodir_terms) >= 1) {
|
|
| 669 | - $gd_region = urldecode($geodir_terms[0]); |
|
| 670 | - } |
|
| 671 | - |
|
| 672 | - if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) |
|
| 673 | - $is_geodir_location_found = true; |
|
| 674 | - |
|
| 675 | - // if location has not been found for region and city then search for region only |
|
| 676 | - if (!$is_geodir_location_found) {
|
|
| 677 | - $gd_city = ''; |
|
| 662 | + $is_geodir_location_found = true; |
|
| 663 | + } |
|
| 664 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 665 | + if (count($geodir_terms) >= 2) {
|
|
| 666 | + $gd_region = urldecode($geodir_terms[0]); |
|
| 667 | + $gd_city = urldecode($geodir_terms[1]); |
|
| 668 | + } else if (count($geodir_terms) >= 1) {
|
|
| 669 | + $gd_region = urldecode($geodir_terms[0]); |
|
| 670 | + } |
|
| 671 | + |
|
| 672 | + if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) |
|
| 673 | + $is_geodir_location_found = true; |
|
| 674 | + |
|
| 675 | + // if location has not been found for region and city then search for region only |
|
| 676 | + if (!$is_geodir_location_found) {
|
|
| 677 | + $gd_city = ''; |
|
| 678 | 678 | |
| 679 | 679 | if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)) |
| 680 | - $is_geodir_location_found = true; |
|
| 681 | - } |
|
| 682 | - } else {
|
|
| 683 | - $gd_city = $geodir_terms[0]; |
|
| 684 | - |
|
| 685 | - if (geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {
|
|
| 686 | - $is_geodir_location_found = true; |
|
| 687 | - $gd_region = $default_location->region_slug; |
|
| 688 | - $gd_country = $default_location->country_slug; |
|
| 689 | - } |
|
| 690 | - } |
|
| 691 | - // if location still not found then clear location related session variables |
|
| 692 | - if ($is_geodir_location_found && $geodir_set_location_session) {
|
|
| 693 | - $gd_session->set('gd_multi_location', 1);
|
|
| 694 | - $gd_session->set('gd_country', $gd_country);
|
|
| 695 | - $gd_session->set('gd_region', $gd_region);
|
|
| 696 | - $gd_session->set('gd_city', $gd_city);
|
|
| 697 | - } |
|
| 698 | - |
|
| 699 | - if ($geodir_show_location_url == 'all') {
|
|
| 680 | + $is_geodir_location_found = true; |
|
| 681 | + } |
|
| 682 | + } else {
|
|
| 683 | + $gd_city = $geodir_terms[0]; |
|
| 684 | + |
|
| 685 | + if (geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {
|
|
| 686 | + $is_geodir_location_found = true; |
|
| 687 | + $gd_region = $default_location->region_slug; |
|
| 688 | + $gd_country = $default_location->country_slug; |
|
| 689 | + } |
|
| 690 | + } |
|
| 691 | + // if location still not found then clear location related session variables |
|
| 692 | + if ($is_geodir_location_found && $geodir_set_location_session) {
|
|
| 693 | + $gd_session->set('gd_multi_location', 1);
|
|
| 694 | + $gd_session->set('gd_country', $gd_country);
|
|
| 695 | + $gd_session->set('gd_region', $gd_region);
|
|
| 696 | + $gd_session->set('gd_city', $gd_city);
|
|
| 697 | + } |
|
| 698 | + |
|
| 699 | + if ($geodir_show_location_url == 'all') {
|
|
| 700 | 700 | } else if ($geodir_show_location_url == 'country_city') {
|
| 701 | 701 | $gd_region = ''; |
| 702 | 702 | } else if ($geodir_show_location_url == 'region_city') {
|
| 703 | 703 | $gd_country = ''; |
| 704 | 704 | } else {
|
| 705 | 705 | $gd_country = ''; |
| 706 | - $gd_region = ''; |
|
| 706 | + $gd_region = ''; |
|
| 707 | + } |
|
| 708 | + |
|
| 709 | + if ($is_geodir_location_found) {
|
|
| 710 | + $wp->query_vars['gd_country'] = $gd_country; |
|
| 711 | + $wp->query_vars['gd_region'] = $gd_region; |
|
| 712 | + $wp->query_vars['gd_city'] = $gd_city; |
|
| 713 | + } else {
|
|
| 714 | + $gd_country = ''; |
|
| 715 | + $gd_region = ''; |
|
| 716 | + $gd_city = ''; |
|
| 707 | 717 | } |
| 718 | + } |
|
| 719 | + |
|
| 720 | + $wp->query_vars[$geodir_taxonomy] = $geodir_term; |
|
| 721 | + // eliminate location related terms from taxonomy term |
|
| 722 | + if ($gd_country != '') |
|
| 723 | + $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
| 724 | + |
|
| 725 | + if ($gd_region != '') |
|
| 726 | + $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
| 727 | + |
|
| 728 | + if ($gd_city != '') |
|
| 729 | + $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
| 708 | 730 | |
| 709 | - if ($is_geodir_location_found) {
|
|
| 710 | - $wp->query_vars['gd_country'] = $gd_country; |
|
| 711 | - $wp->query_vars['gd_region'] = $gd_region; |
|
| 712 | - $wp->query_vars['gd_city'] = $gd_city; |
|
| 713 | - } else {
|
|
| 714 | - $gd_country = ''; |
|
| 715 | - $gd_region = ''; |
|
| 716 | - $gd_city = ''; |
|
| 717 | - } |
|
| 718 | - } |
|
| 719 | - |
|
| 720 | - $wp->query_vars[$geodir_taxonomy] = $geodir_term; |
|
| 721 | - // eliminate location related terms from taxonomy term |
|
| 722 | - if ($gd_country != '') |
|
| 723 | - $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
| 724 | - |
|
| 725 | - if ($gd_region != '') |
|
| 726 | - $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
| 727 | - |
|
| 728 | - if ($gd_city != '') |
|
| 729 | - $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
| 730 | - |
|
| 731 | - |
|
| 732 | - $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);
|
|
| 733 | - $wp->query_vars[$geodir_taxonomy] = str_replace('//', '', $wp->query_vars[$geodir_taxonomy]);
|
|
| 734 | - |
|
| 735 | - $wp->query_vars[$geodir_taxonomy] = trim($wp->query_vars[$geodir_taxonomy], '/'); |
|
| 736 | - |
|
| 737 | - if ($wp->query_vars[$geodir_taxonomy] == '') {
|
|
| 738 | - unset($wp->query_vars[$geodir_taxonomy]); |
|
| 739 | - } else {
|
|
| 740 | - if (!$is_geodir_taxonomy_term) {
|
|
| 741 | - foreach ($wp->query_vars as $key => $vars) {
|
|
| 742 | - unset($wp->query_vars[$key]); |
|
| 743 | - } |
|
| 744 | - $wp->query_vars['error'] = '404'; |
|
| 745 | - } |
|
| 746 | - } |
|
| 747 | - } |
|
| 748 | - } |
|
| 731 | + |
|
| 732 | + $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);
|
|
| 733 | + $wp->query_vars[$geodir_taxonomy] = str_replace('//', '', $wp->query_vars[$geodir_taxonomy]);
|
|
| 734 | + |
|
| 735 | + $wp->query_vars[$geodir_taxonomy] = trim($wp->query_vars[$geodir_taxonomy], '/'); |
|
| 736 | + |
|
| 737 | + if ($wp->query_vars[$geodir_taxonomy] == '') {
|
|
| 738 | + unset($wp->query_vars[$geodir_taxonomy]); |
|
| 739 | + } else {
|
|
| 740 | + if (!$is_geodir_taxonomy_term) {
|
|
| 741 | + foreach ($wp->query_vars as $key => $vars) {
|
|
| 742 | + unset($wp->query_vars[$key]); |
|
| 743 | + } |
|
| 744 | + $wp->query_vars['error'] = '404'; |
|
| 745 | + } |
|
| 746 | + } |
|
| 747 | + } |
|
| 748 | + } |
|
| 749 | 749 | |
| 750 | 750 | // Unset location session if gd page and location not set. |
| 751 | 751 | if (isset($wp->query_vars['gd_is_geodir_page']) && !isset($wp->query_vars['gd_country'])) {
|
| 752 | 752 | $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));
|
| 753 | 753 | } |
| 754 | 754 | |
| 755 | - if ($gd_session->get('gd_multi_location') == 1) {
|
|
| 756 | - $wp->query_vars['gd_country'] = $gd_session->get('gd_country');
|
|
| 757 | - $wp->query_vars['gd_region'] = $gd_session->get('gd_region');
|
|
| 758 | - $wp->query_vars['gd_city'] = $gd_session->get('gd_city');
|
|
| 759 | - } |
|
| 755 | + if ($gd_session->get('gd_multi_location') == 1) {
|
|
| 756 | + $wp->query_vars['gd_country'] = $gd_session->get('gd_country');
|
|
| 757 | + $wp->query_vars['gd_region'] = $gd_session->get('gd_region');
|
|
| 758 | + $wp->query_vars['gd_city'] = $gd_session->get('gd_city');
|
|
| 759 | + } |
|
| 760 | 760 | |
| 761 | - // now check if there is location parts in the url or not |
|
| 762 | - if (get_option('geodir_add_location_url')) {
|
|
| 761 | + // now check if there is location parts in the url or not |
|
| 762 | + if (get_option('geodir_add_location_url')) {
|
|
| 763 | 763 | if ($geodir_show_location_url == 'all') {
|
| 764 | 764 | } else if ($geodir_show_location_url == 'country_city') {
|
| 765 | 765 | if (isset($wp->query_vars['gd_region'])) |
| 766 | - $wp->query_vars['gd_region'] = ''; |
|
| 766 | + $wp->query_vars['gd_region'] = ''; |
|
| 767 | 767 | } else if ($geodir_show_location_url == 'region_city') {
|
| 768 | 768 | if (isset($wp->query_vars['gd_country'])) |
| 769 | - $wp->query_vars['gd_country'] = ''; |
|
| 769 | + $wp->query_vars['gd_country'] = ''; |
|
| 770 | 770 | } else {
|
| 771 | 771 | if (isset($wp->query_vars['gd_country'])) |
| 772 | - $wp->query_vars['gd_country'] = ''; |
|
| 772 | + $wp->query_vars['gd_country'] = ''; |
|
| 773 | 773 | |
| 774 | - if (isset($wp->query_vars['gd_region'])) |
|
| 775 | - $wp->query_vars['gd_region'] = ''; |
|
| 774 | + if (isset($wp->query_vars['gd_region'])) |
|
| 775 | + $wp->query_vars['gd_region'] = ''; |
|
| 776 | 776 | } |
| 777 | - } else {
|
|
| 778 | - if (isset($wp->query_vars['gd_country'])) |
|
| 779 | - $wp->query_vars['gd_country'] = ''; |
|
| 777 | + } else {
|
|
| 778 | + if (isset($wp->query_vars['gd_country'])) |
|
| 779 | + $wp->query_vars['gd_country'] = ''; |
|
| 780 | 780 | |
| 781 | - if (isset($wp->query_vars['gd_region'])) |
|
| 782 | - $wp->query_vars['gd_region'] = ''; |
|
| 781 | + if (isset($wp->query_vars['gd_region'])) |
|
| 782 | + $wp->query_vars['gd_region'] = ''; |
|
| 783 | 783 | |
| 784 | - if (isset($wp->query_vars['gd_city'])) |
|
| 785 | - $wp->query_vars['gd_city'] = ''; |
|
| 786 | - } |
|
| 784 | + if (isset($wp->query_vars['gd_city'])) |
|
| 785 | + $wp->query_vars['gd_city'] = ''; |
|
| 786 | + } |
|
| 787 | 787 | } |
| 788 | 788 | |
| 789 | 789 | /** |
@@ -797,24 +797,24 @@ discard block |
||
| 797 | 797 | */ |
| 798 | 798 | function geodir_custom_post_status() |
| 799 | 799 | {
|
| 800 | - // Virtual Page Status |
|
| 801 | - register_post_status('virtual', array(
|
|
| 802 | - 'label' => _x('Virtual', 'page', 'geodirectory'),
|
|
| 803 | - 'public' => true, |
|
| 804 | - 'exclude_from_search' => true, |
|
| 805 | - 'show_in_admin_all_list' => true, |
|
| 806 | - 'show_in_admin_status_list' => true, |
|
| 807 | - 'label_count' => _n_noop('Virtual <span class="count">(%s)</span>', 'Virtual <span class="count">(%s)</span>', 'geodirectory'),
|
|
| 808 | - )); |
|
| 809 | - |
|
| 810 | - /** |
|
| 811 | - * Called after we register the custom post status 'Virtual'. |
|
| 812 | - * |
|
| 813 | - * Can be use to add more post statuses. |
|
| 814 | - * |
|
| 815 | - * @since 1.0.0 |
|
| 816 | - */ |
|
| 817 | - do_action('geodir_custom_post_status');
|
|
| 800 | + // Virtual Page Status |
|
| 801 | + register_post_status('virtual', array(
|
|
| 802 | + 'label' => _x('Virtual', 'page', 'geodirectory'),
|
|
| 803 | + 'public' => true, |
|
| 804 | + 'exclude_from_search' => true, |
|
| 805 | + 'show_in_admin_all_list' => true, |
|
| 806 | + 'show_in_admin_status_list' => true, |
|
| 807 | + 'label_count' => _n_noop('Virtual <span class="count">(%s)</span>', 'Virtual <span class="count">(%s)</span>', 'geodirectory'),
|
|
| 808 | + )); |
|
| 809 | + |
|
| 810 | + /** |
|
| 811 | + * Called after we register the custom post status 'Virtual'. |
|
| 812 | + * |
|
| 813 | + * Can be use to add more post statuses. |
|
| 814 | + * |
|
| 815 | + * @since 1.0.0 |
|
| 816 | + */ |
|
| 817 | + do_action('geodir_custom_post_status');
|
|
| 818 | 818 | } |
| 819 | 819 | |
| 820 | 820 | /** |
@@ -829,7 +829,7 @@ discard block |
||
| 829 | 829 | */ |
| 830 | 830 | function geodir_get_term_link($termlink, $term, $taxonomy) |
| 831 | 831 | {
|
| 832 | - return geodir_term_link($termlink, $term, $taxonomy); // taxonomy_functions.php |
|
| 832 | + return geodir_term_link($termlink, $term, $taxonomy); // taxonomy_functions.php |
|
| 833 | 833 | } |
| 834 | 834 | |
| 835 | 835 | /** |
@@ -843,7 +843,7 @@ discard block |
||
| 843 | 843 | */ |
| 844 | 844 | function geodir_get_posttype_link($link, $post_type) |
| 845 | 845 | {
|
| 846 | - return geodir_posttype_link($link, $post_type); // taxonomy_functions.php |
|
| 846 | + return geodir_posttype_link($link, $post_type); // taxonomy_functions.php |
|
| 847 | 847 | } |
| 848 | 848 | |
| 849 | 849 | /** |
@@ -858,13 +858,13 @@ discard block |
||
| 858 | 858 | */ |
| 859 | 859 | function exclude_from_wp_list_pages($exclude_array) |
| 860 | 860 | {
|
| 861 | - $pages_ids = array(); |
|
| 862 | - $pages_array = get_posts(array('post_type' => 'page', 'post_status' => 'virtual'));
|
|
| 863 | - foreach ($pages_array as $page) {
|
|
| 864 | - $pages_ids[] = $page->ID; |
|
| 865 | - } |
|
| 866 | - $exclude_array = $exclude_array + $pages_ids; |
|
| 867 | - return $exclude_array; |
|
| 861 | + $pages_ids = array(); |
|
| 862 | + $pages_array = get_posts(array('post_type' => 'page', 'post_status' => 'virtual'));
|
|
| 863 | + foreach ($pages_array as $page) {
|
|
| 864 | + $pages_ids[] = $page->ID; |
|
| 865 | + } |
|
| 866 | + $exclude_array = $exclude_array + $pages_ids; |
|
| 867 | + return $exclude_array; |
|
| 868 | 868 | } |
| 869 | 869 | |
| 870 | 870 | /** |
@@ -877,8 +877,8 @@ discard block |
||
| 877 | 877 | */ |
| 878 | 878 | function geodir_exclude_page($query) |
| 879 | 879 | {
|
| 880 | - add_filter('posts_where', 'geodir_exclude_page_where', 100);
|
|
| 881 | - return $query; |
|
| 880 | + add_filter('posts_where', 'geodir_exclude_page_where', 100);
|
|
| 881 | + return $query; |
|
| 882 | 882 | } |
| 883 | 883 | |
| 884 | 884 | /** |
@@ -893,11 +893,11 @@ discard block |
||
| 893 | 893 | */ |
| 894 | 894 | function geodir_exclude_page_where($where) |
| 895 | 895 | {
|
| 896 | - global $wpdb; |
|
| 897 | - if (is_admin()) |
|
| 898 | - $where .= " AND $wpdb->posts.post_status != 'virtual'"; |
|
| 896 | + global $wpdb; |
|
| 897 | + if (is_admin()) |
|
| 898 | + $where .= " AND $wpdb->posts.post_status != 'virtual'"; |
|
| 899 | 899 | |
| 900 | - return $where; |
|
| 900 | + return $where; |
|
| 901 | 901 | } |
| 902 | 902 | |
| 903 | 903 | /** |
@@ -912,21 +912,21 @@ discard block |
||
| 912 | 912 | * @return mixed The taxonomy option value. |
| 913 | 913 | */ |
| 914 | 914 | function geodir_wpseo_taxonomy_meta( $value, $option = '' ) {
|
| 915 | - global $wp_query; |
|
| 915 | + global $wp_query; |
|
| 916 | 916 | |
| 917 | - if ( !empty( $value ) && ( is_category() || is_tax() ) ) {
|
|
| 918 | - $term = $wp_query->get_queried_object(); |
|
| 917 | + if ( !empty( $value ) && ( is_category() || is_tax() ) ) {
|
|
| 918 | + $term = $wp_query->get_queried_object(); |
|
| 919 | 919 | |
| 920 | - if ( !empty( $term->term_id ) && !empty( $term->taxonomy ) && isset( $value[$term->taxonomy][$term->term_id] ) && in_array( str_replace( 'category', '', $term->taxonomy ), geodir_get_posttypes() ) ) {
|
|
| 921 | - $image = geodir_get_default_catimage( $term->term_id, str_replace( 'category', '', $term->taxonomy ) ); |
|
| 920 | + if ( !empty( $term->term_id ) && !empty( $term->taxonomy ) && isset( $value[$term->taxonomy][$term->term_id] ) && in_array( str_replace( 'category', '', $term->taxonomy ), geodir_get_posttypes() ) ) {
|
|
| 921 | + $image = geodir_get_default_catimage( $term->term_id, str_replace( 'category', '', $term->taxonomy ) ); |
|
| 922 | 922 | |
| 923 | - if ( !empty( $image['src'] ) ) {
|
|
| 924 | - $value[$term->taxonomy][$term->term_id]['wpseo_twitter-image'] = $image['src']; |
|
| 925 | - $value[$term->taxonomy][$term->term_id]['wpseo_opengraph-image'] = $image['src']; |
|
| 926 | - } |
|
| 927 | - } |
|
| 928 | - } |
|
| 929 | - return $value; |
|
| 923 | + if ( !empty( $image['src'] ) ) {
|
|
| 924 | + $value[$term->taxonomy][$term->term_id]['wpseo_twitter-image'] = $image['src']; |
|
| 925 | + $value[$term->taxonomy][$term->term_id]['wpseo_opengraph-image'] = $image['src']; |
|
| 926 | + } |
|
| 927 | + } |
|
| 928 | + } |
|
| 929 | + return $value; |
|
| 930 | 930 | } |
| 931 | 931 | add_filter( 'option_wpseo_taxonomy_meta', 'geodir_wpseo_taxonomy_meta', 10, 2 ); |
| 932 | 932 | |
@@ -937,24 +937,24 @@ discard block |
||
| 937 | 937 | * |
| 938 | 938 | */ |
| 939 | 939 | function geodir_affiliate_wp_rewrite_fix() {
|
| 940 | - if ( !class_exists( 'Affiliate_WP' ) ) {
|
|
| 941 | - return; |
|
| 942 | - } |
|
| 943 | - |
|
| 944 | - $gd_post_types = geodir_get_posttypes( 'array' ); |
|
| 945 | - |
|
| 946 | - if ( !empty( $gd_post_types ) ) {
|
|
| 947 | - $ref = affiliate_wp()->tracking->get_referral_var(); |
|
| 948 | - if ( empty( $ref ) ) {
|
|
| 949 | - return; |
|
| 950 | - } |
|
| 951 | - |
|
| 952 | - foreach ( $gd_post_types as $key => $post_type ) {
|
|
| 953 | - if ( !empty( $key ) && !empty( $post_type['rewrite']['slug'] ) ) {
|
|
| 954 | - add_rewrite_rule( $post_type['rewrite']['slug'] . '/' . $ref . '(/(.*))?/page/([0-9]{1,})/?$', 'index.php?post_type=' . $key . '&' . $ref . '=$matches[1]&paged=$matches[3]', 'top');
|
|
| 955 | - add_rewrite_rule( $post_type['rewrite']['slug'] . '/' . $ref . '(/(.*))?/?$', 'index.php?post_type=' . $key . '&' . $ref . '=$matches[1]', 'top'); |
|
| 956 | - } |
|
| 957 | - } |
|
| 958 | - } |
|
| 940 | + if ( !class_exists( 'Affiliate_WP' ) ) {
|
|
| 941 | + return; |
|
| 942 | + } |
|
| 943 | + |
|
| 944 | + $gd_post_types = geodir_get_posttypes( 'array' ); |
|
| 945 | + |
|
| 946 | + if ( !empty( $gd_post_types ) ) {
|
|
| 947 | + $ref = affiliate_wp()->tracking->get_referral_var(); |
|
| 948 | + if ( empty( $ref ) ) {
|
|
| 949 | + return; |
|
| 950 | + } |
|
| 951 | + |
|
| 952 | + foreach ( $gd_post_types as $key => $post_type ) {
|
|
| 953 | + if ( !empty( $key ) && !empty( $post_type['rewrite']['slug'] ) ) {
|
|
| 954 | + add_rewrite_rule( $post_type['rewrite']['slug'] . '/' . $ref . '(/(.*))?/page/([0-9]{1,})/?$', 'index.php?post_type=' . $key . '&' . $ref . '=$matches[1]&paged=$matches[3]', 'top');
|
|
| 955 | + add_rewrite_rule( $post_type['rewrite']['slug'] . '/' . $ref . '(/(.*))?/?$', 'index.php?post_type=' . $key . '&' . $ref . '=$matches[1]', 'top'); |
|
| 956 | + } |
|
| 957 | + } |
|
| 958 | + } |
|
| 959 | 959 | } |
| 960 | 960 | add_action( 'init', 'geodir_affiliate_wp_rewrite_fix', 99999 ); |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | if (!empty($args['labels'])) {
|
| 70 | 70 | foreach ($args['labels'] as $key => $val) {
|
| 71 | - $args['labels'][$key] = __($val, 'geodirectory');// allow translation |
|
| 71 | + $args['labels'][$key] = __($val, 'geodirectory'); // allow translation |
|
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | |
| 110 | 110 | if (array_key_exists('rewrite', $args)) {
|
| 111 | 111 | if (array_key_exists('slug', $args['rewrite']))
|
| 112 | - $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%'; |
|
| 112 | + $args['rewrite']['slug'] = $listing_slug; // . '/%gd_taxonomy%'; |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | $geodir_post_types = get_option('geodir_post_types');
|
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | |
| 122 | 122 | if (array_key_exists('rewrite', $geodir_post_types[$post_type]))
|
| 123 | 123 | if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))
|
| 124 | - $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%'; |
|
| 124 | + $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug; // . '/%gd_taxonomy%'; |
|
| 125 | 125 | |
| 126 | 126 | update_option('geodir_post_types', $geodir_post_types);
|
| 127 | 127 | |
@@ -133,13 +133,13 @@ discard block |
||
| 133 | 133 | |
| 134 | 134 | $geodir_taxonomies = get_option('geodir_taxonomies');
|
| 135 | 135 | |
| 136 | - if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {
|
|
| 137 | - $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug; |
|
| 136 | + if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type.'category'])) {
|
|
| 137 | + $geodir_taxonomies[$post_type.'category']['listing_slug'] = $listing_slug; |
|
| 138 | 138 | |
| 139 | - if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))
|
|
| 140 | - if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))
|
|
| 141 | - if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))
|
|
| 142 | - $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug; |
|
| 139 | + if (array_key_exists('args', $geodir_taxonomies[$post_type.'category']))
|
|
| 140 | + if (array_key_exists('rewrite', $geodir_taxonomies[$post_type.'category']['args']))
|
|
| 141 | + if (array_key_exists('slug', $geodir_taxonomies[$post_type.'category']['args']['rewrite']))
|
|
| 142 | + $geodir_taxonomies[$post_type.'category']['args']['rewrite']['slug'] = $listing_slug; |
|
| 143 | 143 | |
| 144 | 144 | update_option('geodir_taxonomies', $geodir_taxonomies);
|
| 145 | 145 | |
@@ -147,13 +147,13 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | /* --- update taxonomies (tags) --- */ |
| 149 | 149 | $geodir_taxonomies_tag = get_option('geodir_taxonomies');
|
| 150 | - if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {
|
|
| 151 | - $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags'; |
|
| 150 | + if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type.'_tags'])) {
|
|
| 151 | + $geodir_taxonomies_tag[$post_type.'_tags']['listing_slug'] = $listing_slug.'/tags'; |
|
| 152 | 152 | |
| 153 | - if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))
|
|
| 154 | - if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))
|
|
| 155 | - if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))
|
|
| 156 | - $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags'; |
|
| 153 | + if (array_key_exists('args', $geodir_taxonomies_tag[$post_type.'_tags']))
|
|
| 154 | + if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type.'_tags']['args']))
|
|
| 155 | + if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type.'_tags']['args']['rewrite']))
|
|
| 156 | + $geodir_taxonomies_tag[$post_type.'_tags']['args']['rewrite']['slug'] = $listing_slug.'/tags'; |
|
| 157 | 157 | |
| 158 | 158 | update_option('geodir_taxonomies', $geodir_taxonomies_tag);
|
| 159 | 159 | |
@@ -203,11 +203,11 @@ discard block |
||
| 203 | 203 | $listing_slug = $args['listing_slug']; |
| 204 | 204 | |
| 205 | 205 | if (strpos($taxonomy, 'tags')) {
|
| 206 | - $newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]';
|
|
| 207 | - $newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]'; |
|
| 206 | + $newrules[$listing_slug.'/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?'.$taxonomy.'=$matches[1]&paged=$matches[2]';
|
|
| 207 | + $newrules[$listing_slug.'/(.+?)/?$'] = 'index.php?'.$taxonomy.'=$matches[1]'; |
|
| 208 | 208 | } else {
|
| 209 | 209 | // use this loop to add paging for details page comments paging |
| 210 | - $newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';
|
|
| 210 | + $newrules[str_replace("/tags", "", $listing_slug).'/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?'.$taxonomy.'=$matches[1]&cpage=$matches[2]';
|
|
| 211 | 211 | } |
| 212 | 212 | endforeach; |
| 213 | 213 | endif; |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | // create rules for location listing |
| 216 | 216 | $location_page = get_option('geodir_location_page');
|
| 217 | 217 | |
| 218 | - if($location_page) {
|
|
| 218 | + if ($location_page) {
|
|
| 219 | 219 | global $wpdb; |
| 220 | 220 | $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));
|
| 221 | 221 | } |
@@ -245,30 +245,30 @@ discard block |
||
| 245 | 245 | |
| 246 | 246 | if ($matches2) {
|
| 247 | 247 | if ($neighbourhood_active) {
|
| 248 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]&gd_neighbourhood=$matches[3]'; |
|
| 248 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]&gd_neighbourhood=$matches[3]'; |
|
| 249 | 249 | } |
| 250 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]'; |
|
| 250 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]'; |
|
| 251 | 251 | } else {
|
| 252 | 252 | if ($neighbourhood_active) {
|
| 253 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&gd_neighbourhood=$matches[2]'; |
|
| 253 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&gd_neighbourhood=$matches[2]'; |
|
| 254 | 254 | } |
| 255 | 255 | } |
| 256 | 256 | |
| 257 | - $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]'; |
|
| 257 | + $newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]'; |
|
| 258 | 258 | } else { // country/region/city
|
| 259 | 259 | if ($neighbourhood_active) {
|
| 260 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]'; |
|
| 260 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]'; |
|
| 261 | 261 | } |
| 262 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]'; |
|
| 263 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]'; |
|
| 264 | - $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]'; |
|
| 262 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]'; |
|
| 263 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]'; |
|
| 264 | + $newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]'; |
|
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | if ($location_page && geodir_is_wpml()) {
|
| 268 | - foreach(icl_get_languages('skip_missing=N') as $lang){
|
|
| 268 | + foreach (icl_get_languages('skip_missing=N') as $lang) {
|
|
| 269 | 269 | $alt_page_id = ''; |
| 270 | - $alt_page_id = geodir_wpml_object_id($location_page, 'page', false,$lang['language_code']); |
|
| 271 | - if($alt_page_id){
|
|
| 270 | + $alt_page_id = geodir_wpml_object_id($location_page, 'page', false, $lang['language_code']); |
|
| 271 | + if ($alt_page_id) {
|
|
| 272 | 272 | $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));
|
| 273 | 273 | |
| 274 | 274 | if ($location_manager && ($hide_country_part || $hide_region_part)) {
|
@@ -287,29 +287,29 @@ discard block |
||
| 287 | 287 | |
| 288 | 288 | if ($matches2) {
|
| 289 | 289 | if ($neighbourhood_active) {
|
| 290 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]&gd_neighbourhood=$matches[3]'; |
|
| 290 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]&gd_neighbourhood=$matches[3]'; |
|
| 291 | 291 | } |
| 292 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]'; |
|
| 292 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]'; |
|
| 293 | 293 | } else {
|
| 294 | 294 | if ($neighbourhood_active) {
|
| 295 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&gd_neighbourhood=$matches[2]'; |
|
| 295 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&gd_neighbourhood=$matches[2]'; |
|
| 296 | 296 | } |
| 297 | 297 | } |
| 298 | 298 | |
| 299 | - $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]'; |
|
| 299 | + $newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]'; |
|
| 300 | 300 | } else { // country/region/city
|
| 301 | 301 | if ($neighbourhood_active) {
|
| 302 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]'; |
|
| 302 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]'; |
|
| 303 | 303 | } |
| 304 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]'; |
|
| 305 | - $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]'; |
|
| 306 | - $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]'; |
|
| 304 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]'; |
|
| 305 | + $newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]'; |
|
| 306 | + $newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]'; |
|
| 307 | 307 | } |
| 308 | 308 | } |
| 309 | 309 | } |
| 310 | 310 | } |
| 311 | 311 | |
| 312 | - $newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page; |
|
| 312 | + $newrules[$location_prefix.'/?$'] = 'index.php?page_id='.$location_page; |
|
| 313 | 313 | |
| 314 | 314 | $rules = array_merge($newrules, $rules); |
| 315 | 315 | return $rules; |
@@ -338,7 +338,7 @@ discard block |
||
| 338 | 338 | #Redirect 301 /location/ /$location_prefix/ |
| 339 | 339 | # END GeoDirectory Rules\n\n |
| 340 | 340 | EOD; |
| 341 | - return $my_content . $rules; |
|
| 341 | + return $my_content.$rules; |
|
| 342 | 342 | } |
| 343 | 343 | //add_filter('mod_rewrite_rules', 'geodir_htaccess_contents');
|
| 344 | 344 | |
@@ -414,12 +414,12 @@ discard block |
||
| 414 | 414 | global $wpdb; |
| 415 | 415 | |
| 416 | 416 | $page_for_posts = get_option('page_for_posts');
|
| 417 | - $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s",$wp->query_vars['pagename']));
|
|
| 417 | + $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s", $wp->query_vars['pagename']));
|
|
| 418 | 418 | |
| 419 | 419 | if (geodir_is_wpml()) {
|
| 420 | 420 | $real_page_id = geodir_wpml_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE); |
| 421 | 421 | } |
| 422 | - if ($real_page_id && $real_page_id!=$page_for_posts) {
|
|
| 422 | + if ($real_page_id && $real_page_id != $page_for_posts) {
|
|
| 423 | 423 | $wp->query_vars['page_id'] = $real_page_id; |
| 424 | 424 | } |
| 425 | 425 | } |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | $gd_city = $default_location->city_slug; |
| 467 | 467 | |
| 468 | 468 | $base_location_link = geodir_get_location_link('base');
|
| 469 | - wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city); |
|
| 469 | + wp_redirect($base_location_link.'/'.$gd_country.'/'.$gd_region.'/'.$gd_city); |
|
| 470 | 470 | exit(); |
| 471 | 471 | } |
| 472 | 472 | } |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | $geodir_set_location_session = true; |
| 528 | 528 | $geodir_taxonomis = geodir_get_taxonomies('', true);
|
| 529 | 529 | |
| 530 | - if(!empty($geodir_taxonomis)){
|
|
| 530 | + if (!empty($geodir_taxonomis)) {
|
|
| 531 | 531 | foreach ($geodir_taxonomis as $taxonomy) {
|
| 532 | 532 | if (array_key_exists($taxonomy, $wp->query_vars)) {
|
| 533 | 533 | $is_geodir_taxonomy = true; |
@@ -584,7 +584,7 @@ discard block |
||
| 584 | 584 | } |
| 585 | 585 | |
| 586 | 586 | |
| 587 | - $geodir_term = str_replace('/' . $geodir_last_term, '', $geodir_term, $post_title_replace_count);
|
|
| 587 | + $geodir_term = str_replace('/'.$geodir_last_term, '', $geodir_term, $post_title_replace_count);
|
|
| 588 | 588 | if (!$post_title_replace_count) |
| 589 | 589 | $geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count); |
| 590 | 590 | $geodir_terms = explode('/', $geodir_term);
|
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) |
| 662 | 662 | $is_geodir_location_found = true; |
| 663 | 663 | } |
| 664 | - } else if ($geodir_show_location_url == 'region_city') {
|
|
| 664 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 665 | 665 | if (count($geodir_terms) >= 2) {
|
| 666 | 666 | $gd_region = urldecode($geodir_terms[0]); |
| 667 | 667 | $gd_city = urldecode($geodir_terms[1]); |
@@ -720,13 +720,13 @@ discard block |
||
| 720 | 720 | $wp->query_vars[$geodir_taxonomy] = $geodir_term; |
| 721 | 721 | // eliminate location related terms from taxonomy term |
| 722 | 722 | if ($gd_country != '') |
| 723 | - $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
| 723 | + $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_country).'/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
| 724 | 724 | |
| 725 | 725 | if ($gd_region != '') |
| 726 | - $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
| 726 | + $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_region).'/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
| 727 | 727 | |
| 728 | 728 | if ($gd_city != '') |
| 729 | - $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
| 729 | + $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_city).'/', '', $wp->query_vars[$geodir_taxonomy], 1);
|
|
| 730 | 730 | |
| 731 | 731 | |
| 732 | 732 | $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);
|
@@ -911,16 +911,16 @@ discard block |
||
| 911 | 911 | * @param string $option Option name. |
| 912 | 912 | * @return mixed The taxonomy option value. |
| 913 | 913 | */ |
| 914 | -function geodir_wpseo_taxonomy_meta( $value, $option = '' ) {
|
|
| 914 | +function geodir_wpseo_taxonomy_meta($value, $option = '') {
|
|
| 915 | 915 | global $wp_query; |
| 916 | 916 | |
| 917 | - if ( !empty( $value ) && ( is_category() || is_tax() ) ) {
|
|
| 917 | + if (!empty($value) && (is_category() || is_tax())) {
|
|
| 918 | 918 | $term = $wp_query->get_queried_object(); |
| 919 | 919 | |
| 920 | - if ( !empty( $term->term_id ) && !empty( $term->taxonomy ) && isset( $value[$term->taxonomy][$term->term_id] ) && in_array( str_replace( 'category', '', $term->taxonomy ), geodir_get_posttypes() ) ) {
|
|
| 921 | - $image = geodir_get_default_catimage( $term->term_id, str_replace( 'category', '', $term->taxonomy ) ); |
|
| 920 | + if (!empty($term->term_id) && !empty($term->taxonomy) && isset($value[$term->taxonomy][$term->term_id]) && in_array(str_replace('category', '', $term->taxonomy), geodir_get_posttypes())) {
|
|
| 921 | + $image = geodir_get_default_catimage($term->term_id, str_replace('category', '', $term->taxonomy));
|
|
| 922 | 922 | |
| 923 | - if ( !empty( $image['src'] ) ) {
|
|
| 923 | + if (!empty($image['src'])) {
|
|
| 924 | 924 | $value[$term->taxonomy][$term->term_id]['wpseo_twitter-image'] = $image['src']; |
| 925 | 925 | $value[$term->taxonomy][$term->term_id]['wpseo_opengraph-image'] = $image['src']; |
| 926 | 926 | } |
@@ -928,7 +928,7 @@ discard block |
||
| 928 | 928 | } |
| 929 | 929 | return $value; |
| 930 | 930 | } |
| 931 | -add_filter( 'option_wpseo_taxonomy_meta', 'geodir_wpseo_taxonomy_meta', 10, 2 ); |
|
| 931 | +add_filter('option_wpseo_taxonomy_meta', 'geodir_wpseo_taxonomy_meta', 10, 2);
|
|
| 932 | 932 | |
| 933 | 933 | /** |
| 934 | 934 | * Fix affiliate links for GeoDirectory CPTs listing pages. |
@@ -937,24 +937,24 @@ discard block |
||
| 937 | 937 | * |
| 938 | 938 | */ |
| 939 | 939 | function geodir_affiliate_wp_rewrite_fix() {
|
| 940 | - if ( !class_exists( 'Affiliate_WP' ) ) {
|
|
| 940 | + if (!class_exists('Affiliate_WP')) {
|
|
| 941 | 941 | return; |
| 942 | 942 | } |
| 943 | 943 | |
| 944 | - $gd_post_types = geodir_get_posttypes( 'array' ); |
|
| 944 | + $gd_post_types = geodir_get_posttypes('array');
|
|
| 945 | 945 | |
| 946 | - if ( !empty( $gd_post_types ) ) {
|
|
| 946 | + if (!empty($gd_post_types)) {
|
|
| 947 | 947 | $ref = affiliate_wp()->tracking->get_referral_var(); |
| 948 | - if ( empty( $ref ) ) {
|
|
| 948 | + if (empty($ref)) {
|
|
| 949 | 949 | return; |
| 950 | 950 | } |
| 951 | 951 | |
| 952 | - foreach ( $gd_post_types as $key => $post_type ) {
|
|
| 953 | - if ( !empty( $key ) && !empty( $post_type['rewrite']['slug'] ) ) {
|
|
| 954 | - add_rewrite_rule( $post_type['rewrite']['slug'] . '/' . $ref . '(/(.*))?/page/([0-9]{1,})/?$', 'index.php?post_type=' . $key . '&' . $ref . '=$matches[1]&paged=$matches[3]', 'top');
|
|
| 955 | - add_rewrite_rule( $post_type['rewrite']['slug'] . '/' . $ref . '(/(.*))?/?$', 'index.php?post_type=' . $key . '&' . $ref . '=$matches[1]', 'top'); |
|
| 952 | + foreach ($gd_post_types as $key => $post_type) {
|
|
| 953 | + if (!empty($key) && !empty($post_type['rewrite']['slug'])) {
|
|
| 954 | + add_rewrite_rule($post_type['rewrite']['slug'].'/'.$ref.'(/(.*))?/page/([0-9]{1,})/?$', 'index.php?post_type='.$key.'&'.$ref.'=$matches[1]&paged=$matches[3]', 'top');
|
|
| 955 | + add_rewrite_rule($post_type['rewrite']['slug'].'/'.$ref.'(/(.*))?/?$', 'index.php?post_type='.$key.'&'.$ref.'=$matches[1]', 'top'); |
|
| 956 | 956 | } |
| 957 | 957 | } |
| 958 | 958 | } |
| 959 | 959 | } |
| 960 | -add_action( 'init', 'geodir_affiliate_wp_rewrite_fix', 99999 ); |
|
| 960 | +add_action('init', 'geodir_affiliate_wp_rewrite_fix', 99999);
|
|
@@ -33,265 +33,265 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | function geodir_add_nav_menu_items() |
| 35 | 35 | {
|
| 36 | - $items = ''; |
|
| 37 | - // apply filter to add more navigations // -Filter-Location-Manager |
|
| 38 | - |
|
| 39 | - if (get_option('geodir_show_listing_nav')) {
|
|
| 40 | - |
|
| 41 | - $menu_class = ''; |
|
| 42 | - if (geodir_is_page('listing'))
|
|
| 43 | - $menu_class = 'current-menu-item'; |
|
| 44 | - |
|
| 45 | - |
|
| 46 | - //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION |
|
| 47 | - $post_types = geodir_get_posttypes('object');
|
|
| 48 | - $show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');
|
|
| 49 | - if (!empty($post_types)) {
|
|
| 50 | - foreach ($post_types as $post_type => $args) {
|
|
| 51 | - if (!empty($show_post_type_main_nav)) {
|
|
| 52 | - if (in_array($post_type, $show_post_type_main_nav)) {
|
|
| 53 | - if (get_post_type_archive_link($post_type)) {
|
|
| 54 | - $menu_class = ''; |
|
| 55 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
|
| 56 | - $menu_class = 'current-menu-item'; |
|
| 57 | - /** |
|
| 58 | - * Filter the menu li class. |
|
| 59 | - * |
|
| 60 | - * @since 1.0.0 |
|
| 61 | - * @param string $menu_class The menu HTML class. |
|
| 62 | - */ |
|
| 63 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 64 | - /** |
|
| 65 | - * Filter the menu a class. |
|
| 66 | - * |
|
| 67 | - * @since 1.0.0 |
|
| 68 | - */ |
|
| 69 | - $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 70 | - $items .= '<li class="' . $li_class . '"> |
|
| 36 | + $items = ''; |
|
| 37 | + // apply filter to add more navigations // -Filter-Location-Manager |
|
| 38 | + |
|
| 39 | + if (get_option('geodir_show_listing_nav')) {
|
|
| 40 | + |
|
| 41 | + $menu_class = ''; |
|
| 42 | + if (geodir_is_page('listing'))
|
|
| 43 | + $menu_class = 'current-menu-item'; |
|
| 44 | + |
|
| 45 | + |
|
| 46 | + //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION |
|
| 47 | + $post_types = geodir_get_posttypes('object');
|
|
| 48 | + $show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');
|
|
| 49 | + if (!empty($post_types)) {
|
|
| 50 | + foreach ($post_types as $post_type => $args) {
|
|
| 51 | + if (!empty($show_post_type_main_nav)) {
|
|
| 52 | + if (in_array($post_type, $show_post_type_main_nav)) {
|
|
| 53 | + if (get_post_type_archive_link($post_type)) {
|
|
| 54 | + $menu_class = ''; |
|
| 55 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
|
| 56 | + $menu_class = 'current-menu-item'; |
|
| 57 | + /** |
|
| 58 | + * Filter the menu li class. |
|
| 59 | + * |
|
| 60 | + * @since 1.0.0 |
|
| 61 | + * @param string $menu_class The menu HTML class. |
|
| 62 | + */ |
|
| 63 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 64 | + /** |
|
| 65 | + * Filter the menu a class. |
|
| 66 | + * |
|
| 67 | + * @since 1.0.0 |
|
| 68 | + */ |
|
| 69 | + $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 70 | + $items .= '<li class="' . $li_class . '"> |
|
| 71 | 71 | <a href="' . get_post_type_archive_link($post_type) . '" class="' . $a_class . '"> |
| 72 | 72 | ' . __(geodir_utf8_ucfirst($args->labels->name),'geodirectory') . ' |
| 73 | 73 | </a> |
| 74 | 74 | </li>'; |
| 75 | - } |
|
| 76 | - } |
|
| 77 | - } |
|
| 78 | - } |
|
| 79 | - } |
|
| 80 | - //END LISTING OF POST TYPE IN MAIN NAVIGATION |
|
| 81 | - |
|
| 82 | - $view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');
|
|
| 83 | - $is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false; |
|
| 84 | - if ($is_listing_sub_meny_exists) {
|
|
| 85 | - /** |
|
| 86 | - * Filter the menu li class. |
|
| 87 | - * |
|
| 88 | - * @since 1.0.0 |
|
| 89 | - * @param string $menu_class The menu HTML class. |
|
| 90 | - */ |
|
| 91 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);
|
|
| 92 | - /** |
|
| 93 | - * Filter the sub menu li class. |
|
| 94 | - * |
|
| 95 | - * @since 1.0.0 |
|
| 96 | - * @param string $menu_class The menu HTML class. |
|
| 97 | - */ |
|
| 98 | - $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 99 | - /** |
|
| 100 | - * Filter the sub menu ul class. |
|
| 101 | - * |
|
| 102 | - * @since 1.0.0 |
|
| 103 | - */ |
|
| 104 | - $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');
|
|
| 105 | - /** |
|
| 106 | - * Filter the menu a class. |
|
| 107 | - * |
|
| 108 | - * @since 1.0.0 |
|
| 109 | - */ |
|
| 110 | - $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 111 | - /** |
|
| 112 | - * Filter the sub menu a class. |
|
| 113 | - * |
|
| 114 | - * @since 1.0.0 |
|
| 115 | - */ |
|
| 116 | - $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
|
|
| 117 | - $items .= '<li class="' . $li_class . '"> |
|
| 75 | + } |
|
| 76 | + } |
|
| 77 | + } |
|
| 78 | + } |
|
| 79 | + } |
|
| 80 | + //END LISTING OF POST TYPE IN MAIN NAVIGATION |
|
| 81 | + |
|
| 82 | + $view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');
|
|
| 83 | + $is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false; |
|
| 84 | + if ($is_listing_sub_meny_exists) {
|
|
| 85 | + /** |
|
| 86 | + * Filter the menu li class. |
|
| 87 | + * |
|
| 88 | + * @since 1.0.0 |
|
| 89 | + * @param string $menu_class The menu HTML class. |
|
| 90 | + */ |
|
| 91 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);
|
|
| 92 | + /** |
|
| 93 | + * Filter the sub menu li class. |
|
| 94 | + * |
|
| 95 | + * @since 1.0.0 |
|
| 96 | + * @param string $menu_class The menu HTML class. |
|
| 97 | + */ |
|
| 98 | + $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 99 | + /** |
|
| 100 | + * Filter the sub menu ul class. |
|
| 101 | + * |
|
| 102 | + * @since 1.0.0 |
|
| 103 | + */ |
|
| 104 | + $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');
|
|
| 105 | + /** |
|
| 106 | + * Filter the menu a class. |
|
| 107 | + * |
|
| 108 | + * @since 1.0.0 |
|
| 109 | + */ |
|
| 110 | + $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 111 | + /** |
|
| 112 | + * Filter the sub menu a class. |
|
| 113 | + * |
|
| 114 | + * @since 1.0.0 |
|
| 115 | + */ |
|
| 116 | + $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
|
|
| 117 | + $items .= '<li class="' . $li_class . '"> |
|
| 118 | 118 | <a href="#" class="' . $a_class . '">' . __('Listing', 'geodirectory') . '</a>
|
| 119 | 119 | <ul class="' . $sub_ul_class . '">'; |
| 120 | - $post_types = geodir_get_posttypes('object');
|
|
| 120 | + $post_types = geodir_get_posttypes('object');
|
|
| 121 | 121 | |
| 122 | - $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');
|
|
| 122 | + $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');
|
|
| 123 | 123 | |
| 124 | - if (!empty($post_types)) {
|
|
| 125 | - global $geodir_add_location_url; |
|
| 126 | - $geodir_add_location_url = true; |
|
| 127 | - foreach ($post_types as $post_type => $args) {
|
|
| 128 | - if (!empty($show_listing_post_types)) {
|
|
| 129 | - if (in_array($post_type, $show_listing_post_types)) {
|
|
| 130 | - if (get_post_type_archive_link($post_type)) {
|
|
| 124 | + if (!empty($post_types)) {
|
|
| 125 | + global $geodir_add_location_url; |
|
| 126 | + $geodir_add_location_url = true; |
|
| 127 | + foreach ($post_types as $post_type => $args) {
|
|
| 128 | + if (!empty($show_listing_post_types)) {
|
|
| 129 | + if (in_array($post_type, $show_listing_post_types)) {
|
|
| 130 | + if (get_post_type_archive_link($post_type)) {
|
|
| 131 | 131 | |
| 132 | - $menu_class = ''; |
|
| 133 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
|
| 134 | - $menu_class = 'current-menu-item'; |
|
| 132 | + $menu_class = ''; |
|
| 133 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
|
| 134 | + $menu_class = 'current-menu-item'; |
|
| 135 | 135 | |
| 136 | - $items .= '<li class="' . $sub_li_class . '"> |
|
| 136 | + $items .= '<li class="' . $sub_li_class . '"> |
|
| 137 | 137 | <a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '"> |
| 138 | 138 | ' . __(geodir_utf8_ucfirst($args->labels->name),'geodirectory') . ' |
| 139 | 139 | </a> |
| 140 | 140 | </li>'; |
| 141 | - } |
|
| 142 | - } |
|
| 143 | - } |
|
| 144 | - } |
|
| 145 | - $geodir_add_location_url = NULL; |
|
| 146 | - } |
|
| 141 | + } |
|
| 142 | + } |
|
| 143 | + } |
|
| 144 | + } |
|
| 145 | + $geodir_add_location_url = NULL; |
|
| 146 | + } |
|
| 147 | 147 | |
| 148 | - $items .= ' </ul> '; |
|
| 149 | - /** |
|
| 150 | - * Filter called after the sub menu closing ul tag for dynamic added menu items. |
|
| 151 | - * |
|
| 152 | - * @since 1.5.9 |
|
| 153 | - */ |
|
| 154 | - $items .= apply_filters('geodir_menu_after_sub_ul','');
|
|
| 155 | - $items .= '</li>'; |
|
| 156 | - } |
|
| 157 | - } |
|
| 158 | - |
|
| 159 | - if (get_option('geodir_show_addlisting_nav')) {
|
|
| 160 | - |
|
| 161 | - $menu_class = ''; |
|
| 162 | - if (geodir_is_page('add-listing'))
|
|
| 163 | - $menu_class = 'current-menu-item'; |
|
| 164 | - |
|
| 165 | - //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION |
|
| 166 | - $post_types = geodir_get_posttypes('object');
|
|
| 167 | - $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');
|
|
| 168 | - $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 169 | - |
|
| 170 | - if (!empty($post_types)) {
|
|
| 171 | - foreach ($post_types as $post_type => $args) {
|
|
| 172 | - if (!empty($geodir_allow_posttype_frontend)) {
|
|
| 173 | - if (in_array($post_type, $geodir_allow_posttype_frontend)) {
|
|
| 174 | - if (!empty($show_add_listing_post_types_main_nav)) {
|
|
| 175 | - if (in_array($post_type, $show_add_listing_post_types_main_nav)) {
|
|
| 176 | - if (geodir_get_addlisting_link($post_type)) {
|
|
| 177 | - |
|
| 178 | - $menu_class = ''; |
|
| 179 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
|
|
| 180 | - $menu_class = 'current-menu-item'; |
|
| 181 | - /** |
|
| 182 | - * Filter the menu li class. |
|
| 183 | - * |
|
| 184 | - * @since 1.0.0 |
|
| 185 | - * @param string $menu_class The menu HTML class. |
|
| 186 | - */ |
|
| 187 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 188 | - /** |
|
| 189 | - * Filter the menu a class. |
|
| 190 | - * |
|
| 191 | - * @since 1.0.0 |
|
| 192 | - */ |
|
| 193 | - $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 194 | - $cpt_name = __($args->labels->singular_name, 'geodirectory'); |
|
| 195 | - $items .= '<li class="' . $li_class . '"> |
|
| 148 | + $items .= ' </ul> '; |
|
| 149 | + /** |
|
| 150 | + * Filter called after the sub menu closing ul tag for dynamic added menu items. |
|
| 151 | + * |
|
| 152 | + * @since 1.5.9 |
|
| 153 | + */ |
|
| 154 | + $items .= apply_filters('geodir_menu_after_sub_ul','');
|
|
| 155 | + $items .= '</li>'; |
|
| 156 | + } |
|
| 157 | + } |
|
| 158 | + |
|
| 159 | + if (get_option('geodir_show_addlisting_nav')) {
|
|
| 160 | + |
|
| 161 | + $menu_class = ''; |
|
| 162 | + if (geodir_is_page('add-listing'))
|
|
| 163 | + $menu_class = 'current-menu-item'; |
|
| 164 | + |
|
| 165 | + //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION |
|
| 166 | + $post_types = geodir_get_posttypes('object');
|
|
| 167 | + $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');
|
|
| 168 | + $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 169 | + |
|
| 170 | + if (!empty($post_types)) {
|
|
| 171 | + foreach ($post_types as $post_type => $args) {
|
|
| 172 | + if (!empty($geodir_allow_posttype_frontend)) {
|
|
| 173 | + if (in_array($post_type, $geodir_allow_posttype_frontend)) {
|
|
| 174 | + if (!empty($show_add_listing_post_types_main_nav)) {
|
|
| 175 | + if (in_array($post_type, $show_add_listing_post_types_main_nav)) {
|
|
| 176 | + if (geodir_get_addlisting_link($post_type)) {
|
|
| 177 | + |
|
| 178 | + $menu_class = ''; |
|
| 179 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
|
|
| 180 | + $menu_class = 'current-menu-item'; |
|
| 181 | + /** |
|
| 182 | + * Filter the menu li class. |
|
| 183 | + * |
|
| 184 | + * @since 1.0.0 |
|
| 185 | + * @param string $menu_class The menu HTML class. |
|
| 186 | + */ |
|
| 187 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 188 | + /** |
|
| 189 | + * Filter the menu a class. |
|
| 190 | + * |
|
| 191 | + * @since 1.0.0 |
|
| 192 | + */ |
|
| 193 | + $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 194 | + $cpt_name = __($args->labels->singular_name, 'geodirectory'); |
|
| 195 | + $items .= '<li class="' . $li_class . '"> |
|
| 196 | 196 | <a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $a_class . '"> |
| 197 | 197 | ' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '
|
| 198 | 198 | </a> |
| 199 | 199 | </li>'; |
| 200 | - } |
|
| 201 | - } |
|
| 202 | - } |
|
| 203 | - } |
|
| 204 | - } |
|
| 205 | - } |
|
| 206 | - } |
|
| 207 | - //END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION |
|
| 208 | - } |
|
| 209 | - |
|
| 210 | - $view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');
|
|
| 211 | - $is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false; |
|
| 212 | - if ($is_add_listing_sub_meny_exists) {
|
|
| 213 | - |
|
| 214 | - if (get_option('geodir_show_addlisting_nav')) {
|
|
| 215 | - /** |
|
| 216 | - * Filter the menu li class. |
|
| 217 | - * |
|
| 218 | - * @since 1.0.0 |
|
| 219 | - * @param string $menu_class The menu HTML class. |
|
| 220 | - */ |
|
| 221 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);
|
|
| 222 | - /** |
|
| 223 | - * Filter the sub menu li class. |
|
| 224 | - * |
|
| 225 | - * @since 1.0.0 |
|
| 226 | - * @param string $menu_class The menu HTML class. |
|
| 227 | - */ |
|
| 228 | - $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 229 | - /** |
|
| 230 | - * Filter the sub menu ul class. |
|
| 231 | - * |
|
| 232 | - * @since 1.0.0 |
|
| 233 | - */ |
|
| 234 | - $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');
|
|
| 235 | - /** |
|
| 236 | - * Filter the menu a class. |
|
| 237 | - * |
|
| 238 | - * @since 1.0.0 |
|
| 239 | - */ |
|
| 240 | - $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 241 | - /** |
|
| 242 | - * Filter the sub menu a class. |
|
| 243 | - * |
|
| 244 | - * @since 1.0.0 |
|
| 245 | - */ |
|
| 246 | - $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
|
|
| 247 | - $items .= '<li class="' . $li_class . '"> |
|
| 200 | + } |
|
| 201 | + } |
|
| 202 | + } |
|
| 203 | + } |
|
| 204 | + } |
|
| 205 | + } |
|
| 206 | + } |
|
| 207 | + //END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION |
|
| 208 | + } |
|
| 209 | + |
|
| 210 | + $view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');
|
|
| 211 | + $is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false; |
|
| 212 | + if ($is_add_listing_sub_meny_exists) {
|
|
| 213 | + |
|
| 214 | + if (get_option('geodir_show_addlisting_nav')) {
|
|
| 215 | + /** |
|
| 216 | + * Filter the menu li class. |
|
| 217 | + * |
|
| 218 | + * @since 1.0.0 |
|
| 219 | + * @param string $menu_class The menu HTML class. |
|
| 220 | + */ |
|
| 221 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);
|
|
| 222 | + /** |
|
| 223 | + * Filter the sub menu li class. |
|
| 224 | + * |
|
| 225 | + * @since 1.0.0 |
|
| 226 | + * @param string $menu_class The menu HTML class. |
|
| 227 | + */ |
|
| 228 | + $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 229 | + /** |
|
| 230 | + * Filter the sub menu ul class. |
|
| 231 | + * |
|
| 232 | + * @since 1.0.0 |
|
| 233 | + */ |
|
| 234 | + $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');
|
|
| 235 | + /** |
|
| 236 | + * Filter the menu a class. |
|
| 237 | + * |
|
| 238 | + * @since 1.0.0 |
|
| 239 | + */ |
|
| 240 | + $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 241 | + /** |
|
| 242 | + * Filter the sub menu a class. |
|
| 243 | + * |
|
| 244 | + * @since 1.0.0 |
|
| 245 | + */ |
|
| 246 | + $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
|
|
| 247 | + $items .= '<li class="' . $li_class . '"> |
|
| 248 | 248 | <a href="#" class="' . $a_class . '">' . __('Add Listing', 'geodirectory') . '</a>
|
| 249 | 249 | <ul class="' . $sub_ul_class . '">'; |
| 250 | 250 | |
| 251 | - $post_types = geodir_get_posttypes('object');
|
|
| 252 | - |
|
| 253 | - $show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');
|
|
| 254 | - |
|
| 255 | - if (!empty($post_types)) {
|
|
| 256 | - foreach ($post_types as $post_type => $args) {
|
|
| 257 | - if (!empty($geodir_allow_posttype_frontend)) {
|
|
| 258 | - if (in_array($post_type, $geodir_allow_posttype_frontend)) {
|
|
| 259 | - if (!empty($show_add_listing_post_types)) {
|
|
| 260 | - if (in_array($post_type, $show_add_listing_post_types)) {
|
|
| 261 | - if (geodir_get_addlisting_link($post_type)) {
|
|
| 262 | - |
|
| 263 | - $menu_class = ''; |
|
| 264 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
|
|
| 265 | - $menu_class = 'current-menu-item'; |
|
| 266 | - /** |
|
| 267 | - * Filter the menu li class. |
|
| 268 | - * |
|
| 269 | - * @since 1.0.0 |
|
| 270 | - * @param string $menu_class The menu HTML class. |
|
| 271 | - */ |
|
| 272 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 273 | - $cpt_name = __($args->labels->singular_name, 'geodirectory'); |
|
| 274 | - $items .= '<li class="' . $sub_li_class . '"> |
|
| 251 | + $post_types = geodir_get_posttypes('object');
|
|
| 252 | + |
|
| 253 | + $show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');
|
|
| 254 | + |
|
| 255 | + if (!empty($post_types)) {
|
|
| 256 | + foreach ($post_types as $post_type => $args) {
|
|
| 257 | + if (!empty($geodir_allow_posttype_frontend)) {
|
|
| 258 | + if (in_array($post_type, $geodir_allow_posttype_frontend)) {
|
|
| 259 | + if (!empty($show_add_listing_post_types)) {
|
|
| 260 | + if (in_array($post_type, $show_add_listing_post_types)) {
|
|
| 261 | + if (geodir_get_addlisting_link($post_type)) {
|
|
| 262 | + |
|
| 263 | + $menu_class = ''; |
|
| 264 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
|
|
| 265 | + $menu_class = 'current-menu-item'; |
|
| 266 | + /** |
|
| 267 | + * Filter the menu li class. |
|
| 268 | + * |
|
| 269 | + * @since 1.0.0 |
|
| 270 | + * @param string $menu_class The menu HTML class. |
|
| 271 | + */ |
|
| 272 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 273 | + $cpt_name = __($args->labels->singular_name, 'geodirectory'); |
|
| 274 | + $items .= '<li class="' . $sub_li_class . '"> |
|
| 275 | 275 | <a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $sub_a_class . '"> |
| 276 | 276 | ' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '
|
| 277 | 277 | </a> |
| 278 | 278 | </li>'; |
| 279 | - } |
|
| 280 | - } |
|
| 281 | - } |
|
| 282 | - } |
|
| 283 | - } |
|
| 284 | - } |
|
| 285 | - } |
|
| 279 | + } |
|
| 280 | + } |
|
| 281 | + } |
|
| 282 | + } |
|
| 283 | + } |
|
| 284 | + } |
|
| 285 | + } |
|
| 286 | 286 | |
| 287 | - $items .= ' </ul> '; |
|
| 288 | - $items .= apply_filters('geodir_menu_after_sub_ul','');
|
|
| 289 | - $items .= '</li>'; |
|
| 287 | + $items .= ' </ul> '; |
|
| 288 | + $items .= apply_filters('geodir_menu_after_sub_ul','');
|
|
| 289 | + $items .= '</li>'; |
|
| 290 | 290 | |
| 291 | - } |
|
| 292 | - } |
|
| 293 | - // apply filter to add more navigations // -Filter-Location-Manager |
|
| 294 | - return $items; |
|
| 291 | + } |
|
| 292 | + } |
|
| 293 | + // apply filter to add more navigations // -Filter-Location-Manager |
|
| 294 | + return $items; |
|
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | |
@@ -309,20 +309,20 @@ discard block |
||
| 309 | 309 | */ |
| 310 | 310 | function geodir_pagemenu_items($menu, $args) |
| 311 | 311 | {
|
| 312 | - $locations = get_nav_menu_locations(); |
|
| 313 | - $geodir_theme_location = get_option('geodir_theme_location_nav');
|
|
| 314 | - $geodir_theme_location_nav = array(); |
|
| 315 | - if (empty($locations) && empty($geodir_theme_location)) {
|
|
| 316 | - $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 317 | - $geodir_theme_location_nav[] = $args['theme_location']; |
|
| 318 | - update_option('geodir_theme_location_nav', $geodir_theme_location_nav);
|
|
| 319 | - } |
|
| 320 | - //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet. |
|
| 312 | + $locations = get_nav_menu_locations(); |
|
| 313 | + $geodir_theme_location = get_option('geodir_theme_location_nav');
|
|
| 314 | + $geodir_theme_location_nav = array(); |
|
| 315 | + if (empty($locations) && empty($geodir_theme_location)) {
|
|
| 316 | + $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 317 | + $geodir_theme_location_nav[] = $args['theme_location']; |
|
| 318 | + update_option('geodir_theme_location_nav', $geodir_theme_location_nav);
|
|
| 319 | + } |
|
| 320 | + //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet. |
|
| 321 | 321 | // $menu = str_replace("</ul></div>",geodir_add_nav_menu_items()."</ul></div>",$menu);
|
| 322 | - else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location)) |
|
| 323 | - $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 322 | + else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location)) |
|
| 323 | + $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 324 | 324 | |
| 325 | - return $menu; |
|
| 325 | + return $menu; |
|
| 326 | 326 | |
| 327 | 327 | } |
| 328 | 328 | |
@@ -342,18 +342,18 @@ discard block |
||
| 342 | 342 | function geodir_menu_items($items, $args) |
| 343 | 343 | {
|
| 344 | 344 | |
| 345 | - $location = $args->theme_location; |
|
| 345 | + $location = $args->theme_location; |
|
| 346 | 346 | |
| 347 | - $geodir_theme_location = get_option('geodir_theme_location_nav');
|
|
| 347 | + $geodir_theme_location = get_option('geodir_theme_location_nav');
|
|
| 348 | 348 | |
| 349 | - if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {
|
|
| 349 | + if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {
|
|
| 350 | 350 | |
| 351 | - $items = $items . geodir_add_nav_menu_items(); |
|
| 352 | - return $items; |
|
| 351 | + $items = $items . geodir_add_nav_menu_items(); |
|
| 352 | + return $items; |
|
| 353 | 353 | |
| 354 | - } else {
|
|
| 355 | - return $items; |
|
| 356 | - } |
|
| 354 | + } else {
|
|
| 355 | + return $items; |
|
| 356 | + } |
|
| 357 | 357 | } |
| 358 | 358 | |
| 359 | 359 | /** |
@@ -368,25 +368,25 @@ discard block |
||
| 368 | 368 | */ |
| 369 | 369 | function geodir_get_category_all_array() |
| 370 | 370 | {
|
| 371 | - global $wpdb; |
|
| 372 | - $return_array = array(); |
|
| 373 | - |
|
| 374 | - $taxonomies = geodir_get_taxonomies(); |
|
| 375 | - $taxonomies = implode("','", $taxonomies);
|
|
| 376 | - $taxonomies = "'" . $taxonomies . "'"; |
|
| 377 | - |
|
| 378 | - $pn_categories = $wpdb->get_results( |
|
| 379 | - $wpdb->prepare( |
|
| 380 | - "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy, $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name", |
|
| 381 | - array($wpdb->terms . term_id) |
|
| 382 | - ) |
|
| 383 | - ); |
|
| 384 | - |
|
| 385 | - foreach ($pn_categories as $pn_categories_obj) {
|
|
| 386 | - $return_array[] = array("id" => $pn_categories_obj->cat_ID,
|
|
| 387 | - "title" => $pn_categories_obj->name,); |
|
| 388 | - } |
|
| 389 | - return $return_array; |
|
| 371 | + global $wpdb; |
|
| 372 | + $return_array = array(); |
|
| 373 | + |
|
| 374 | + $taxonomies = geodir_get_taxonomies(); |
|
| 375 | + $taxonomies = implode("','", $taxonomies);
|
|
| 376 | + $taxonomies = "'" . $taxonomies . "'"; |
|
| 377 | + |
|
| 378 | + $pn_categories = $wpdb->get_results( |
|
| 379 | + $wpdb->prepare( |
|
| 380 | + "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy, $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name", |
|
| 381 | + array($wpdb->terms . term_id) |
|
| 382 | + ) |
|
| 383 | + ); |
|
| 384 | + |
|
| 385 | + foreach ($pn_categories as $pn_categories_obj) {
|
|
| 386 | + $return_array[] = array("id" => $pn_categories_obj->cat_ID,
|
|
| 387 | + "title" => $pn_categories_obj->name,); |
|
| 388 | + } |
|
| 389 | + return $return_array; |
|
| 390 | 390 | } |
| 391 | 391 | |
| 392 | 392 | |
@@ -402,49 +402,49 @@ discard block |
||
| 402 | 402 | * @return string The post type. |
| 403 | 403 | */ |
| 404 | 404 | function geodir_get_current_posttype() {
|
| 405 | - global $wp_query, $post, $geodir_post_type; |
|
| 405 | + global $wp_query, $post, $geodir_post_type; |
|
| 406 | 406 | |
| 407 | - $geodir_post_type = get_query_var('post_type');
|
|
| 407 | + $geodir_post_type = get_query_var('post_type');
|
|
| 408 | 408 | |
| 409 | - if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
|
|
| 410 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 411 | - $geodir_post_type = get_post_type((int)$_REQUEST['pid']); |
|
| 412 | - elseif (isset($_REQUEST['listing_type'])) |
|
| 413 | - $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 414 | - } |
|
| 409 | + if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
|
|
| 410 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 411 | + $geodir_post_type = get_post_type((int)$_REQUEST['pid']); |
|
| 412 | + elseif (isset($_REQUEST['listing_type'])) |
|
| 413 | + $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 414 | + } |
|
| 415 | 415 | |
| 416 | - if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))
|
|
| 417 | - $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 416 | + if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))
|
|
| 417 | + $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 418 | 418 | |
| 419 | - if (is_tax()) |
|
| 420 | - $geodir_post_type = geodir_get_taxonomy_posttype(); |
|
| 419 | + if (is_tax()) |
|
| 420 | + $geodir_post_type = geodir_get_taxonomy_posttype(); |
|
| 421 | 421 | |
| 422 | - // Retrive post type for map marker html ajax request on preview page. |
|
| 423 | - if (empty($geodir_post_type) && defined('DOING_AJAX') && !empty($post)) {
|
|
| 424 | - if (!empty($post->post_type)) {
|
|
| 425 | - $geodir_post_type = $post->post_type; |
|
| 426 | - } else if (!empty($post->listing_type)) {
|
|
| 427 | - $geodir_post_type = $post->listing_type; |
|
| 428 | - } |
|
| 429 | - } |
|
| 422 | + // Retrive post type for map marker html ajax request on preview page. |
|
| 423 | + if (empty($geodir_post_type) && defined('DOING_AJAX') && !empty($post)) {
|
|
| 424 | + if (!empty($post->post_type)) {
|
|
| 425 | + $geodir_post_type = $post->post_type; |
|
| 426 | + } else if (!empty($post->listing_type)) {
|
|
| 427 | + $geodir_post_type = $post->listing_type; |
|
| 428 | + } |
|
| 429 | + } |
|
| 430 | 430 | |
| 431 | - $all_postypes = geodir_get_posttypes(); |
|
| 432 | - $all_postypes = stripslashes_deep($all_postypes); |
|
| 431 | + $all_postypes = geodir_get_posttypes(); |
|
| 432 | + $all_postypes = stripslashes_deep($all_postypes); |
|
| 433 | 433 | |
| 434 | - if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) |
|
| 435 | - $geodir_post_type = ''; |
|
| 434 | + if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) |
|
| 435 | + $geodir_post_type = ''; |
|
| 436 | 436 | |
| 437 | - if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){
|
|
| 438 | - $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 439 | - } |
|
| 437 | + if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){
|
|
| 438 | + $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 439 | + } |
|
| 440 | 440 | |
| 441 | 441 | |
| 442 | - /** |
|
| 443 | - * Filter the default CPT return. |
|
| 444 | - * |
|
| 445 | - * @since 1.6.9 |
|
| 446 | - */ |
|
| 447 | - return apply_filters('geodir_get_current_posttype',$geodir_post_type);
|
|
| 442 | + /** |
|
| 443 | + * Filter the default CPT return. |
|
| 444 | + * |
|
| 445 | + * @since 1.6.9 |
|
| 446 | + */ |
|
| 447 | + return apply_filters('geodir_get_current_posttype',$geodir_post_type);
|
|
| 448 | 448 | } |
| 449 | 449 | |
| 450 | 450 | /** |
@@ -458,22 +458,22 @@ discard block |
||
| 458 | 458 | */ |
| 459 | 459 | function geodir_get_default_posttype() |
| 460 | 460 | {
|
| 461 | - $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) ); |
|
| 462 | - |
|
| 463 | - $stype = false; |
|
| 464 | - foreach ( $post_types as $post_type => $info ) {
|
|
| 465 | - global $wpdb; |
|
| 466 | - $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) ); |
|
| 467 | - if ( $has_posts ) {
|
|
| 468 | - $stype = $post_type; break; |
|
| 469 | - } |
|
| 470 | - } |
|
| 471 | - |
|
| 472 | - if(!$stype){
|
|
| 473 | - $stype = 'gd_place'; |
|
| 474 | - } |
|
| 475 | - |
|
| 476 | - return $stype; |
|
| 461 | + $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) ); |
|
| 462 | + |
|
| 463 | + $stype = false; |
|
| 464 | + foreach ( $post_types as $post_type => $info ) {
|
|
| 465 | + global $wpdb; |
|
| 466 | + $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) ); |
|
| 467 | + if ( $has_posts ) {
|
|
| 468 | + $stype = $post_type; break; |
|
| 469 | + } |
|
| 470 | + } |
|
| 471 | + |
|
| 472 | + if(!$stype){
|
|
| 473 | + $stype = 'gd_place'; |
|
| 474 | + } |
|
| 475 | + |
|
| 476 | + return $stype; |
|
| 477 | 477 | } |
| 478 | 478 | |
| 479 | 479 | /** |
@@ -487,21 +487,21 @@ discard block |
||
| 487 | 487 | */ |
| 488 | 488 | function geodir_get_posttypes($output = 'names') |
| 489 | 489 | {
|
| 490 | - $post_types = array(); |
|
| 491 | - $post_types = get_option('geodir_post_types');
|
|
| 492 | - $post_types = stripslashes_deep($post_types); |
|
| 493 | - if (!empty($post_types)) {
|
|
| 494 | - switch ($output): |
|
| 495 | - case 'object': |
|
| 496 | - case 'Object': |
|
| 497 | - $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types; |
|
| 498 | - break; |
|
| 499 | - case 'array': |
|
| 500 | - case 'Array': |
|
| 501 | - $post_types = (array)$post_types; |
|
| 502 | - break; |
|
| 490 | + $post_types = array(); |
|
| 491 | + $post_types = get_option('geodir_post_types');
|
|
| 492 | + $post_types = stripslashes_deep($post_types); |
|
| 493 | + if (!empty($post_types)) {
|
|
| 494 | + switch ($output): |
|
| 495 | + case 'object': |
|
| 496 | + case 'Object': |
|
| 497 | + $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types; |
|
| 498 | + break; |
|
| 499 | + case 'array': |
|
| 500 | + case 'Array': |
|
| 501 | + $post_types = (array)$post_types; |
|
| 502 | + break; |
|
| 503 | 503 | case 'options': |
| 504 | - $post_types = (array)$post_types; |
|
| 504 | + $post_types = (array)$post_types; |
|
| 505 | 505 | |
| 506 | 506 | $options = array(); |
| 507 | 507 | if (!empty($post_types)) {
|
@@ -510,17 +510,17 @@ discard block |
||
| 510 | 510 | } |
| 511 | 511 | } |
| 512 | 512 | $post_types = $options; |
| 513 | - break; |
|
| 514 | - default: |
|
| 515 | - $post_types = array_keys($post_types); |
|
| 516 | - break; |
|
| 517 | - endswitch; |
|
| 518 | - } |
|
| 519 | - |
|
| 520 | - if (!empty($post_types)) |
|
| 521 | - return $post_types; |
|
| 522 | - else |
|
| 523 | - return array(); |
|
| 513 | + break; |
|
| 514 | + default: |
|
| 515 | + $post_types = array_keys($post_types); |
|
| 516 | + break; |
|
| 517 | + endswitch; |
|
| 518 | + } |
|
| 519 | + |
|
| 520 | + if (!empty($post_types)) |
|
| 521 | + return $post_types; |
|
| 522 | + else |
|
| 523 | + return array(); |
|
| 524 | 524 | } |
| 525 | 525 | |
| 526 | 526 | /** |
@@ -533,104 +533,104 @@ discard block |
||
| 533 | 533 | */ |
| 534 | 534 | function geodir_get_posttype_info($post_type = '') |
| 535 | 535 | {
|
| 536 | - $post_types = array(); |
|
| 537 | - $post_types = get_option('geodir_post_types');
|
|
| 538 | - $post_types = stripslashes_deep($post_types); |
|
| 539 | - if (!empty($post_types) && $post_type != '') {
|
|
| 540 | - return $post_types[$post_type]; |
|
| 541 | - } else |
|
| 542 | - return false; |
|
| 536 | + $post_types = array(); |
|
| 537 | + $post_types = get_option('geodir_post_types');
|
|
| 538 | + $post_types = stripslashes_deep($post_types); |
|
| 539 | + if (!empty($post_types) && $post_type != '') {
|
|
| 540 | + return $post_types[$post_type]; |
|
| 541 | + } else |
|
| 542 | + return false; |
|
| 543 | 543 | } |
| 544 | 544 | |
| 545 | 545 | if (!function_exists('geodir_get_taxonomies')) {
|
| 546 | - /** |
|
| 547 | - * Get all custom taxonomies. |
|
| 548 | - * |
|
| 549 | - * @since 1.0.0 |
|
| 550 | - * @package GeoDirectory |
|
| 551 | - * @param string $post_type The post type. |
|
| 552 | - * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 553 | - * @return array|bool Taxonomies on success. false on failure. |
|
| 554 | - */ |
|
| 555 | - function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false) {
|
|
| 556 | - $taxonomies = array(); |
|
| 557 | - $gd_taxonomies = array(); |
|
| 558 | - |
|
| 559 | - if ($taxonomies = get_option('geodir_taxonomies')) {
|
|
| 560 | - $gd_taxonomies = array_keys($taxonomies); |
|
| 561 | - |
|
| 562 | - if ($post_type != '') {
|
|
| 563 | - $gd_taxonomies = array(); |
|
| 564 | - } |
|
| 546 | + /** |
|
| 547 | + * Get all custom taxonomies. |
|
| 548 | + * |
|
| 549 | + * @since 1.0.0 |
|
| 550 | + * @package GeoDirectory |
|
| 551 | + * @param string $post_type The post type. |
|
| 552 | + * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 553 | + * @return array|bool Taxonomies on success. false on failure. |
|
| 554 | + */ |
|
| 555 | + function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false) {
|
|
| 556 | + $taxonomies = array(); |
|
| 557 | + $gd_taxonomies = array(); |
|
| 558 | + |
|
| 559 | + if ($taxonomies = get_option('geodir_taxonomies')) {
|
|
| 560 | + $gd_taxonomies = array_keys($taxonomies); |
|
| 561 | + |
|
| 562 | + if ($post_type != '') {
|
|
| 563 | + $gd_taxonomies = array(); |
|
| 564 | + } |
|
| 565 | 565 | |
| 566 | - $i = 0; |
|
| 567 | - foreach ($taxonomies as $taxonomy => $args) {
|
|
| 568 | - if ($post_type != '' && $args['object_type'] == $post_type) {
|
|
| 569 | - $gd_taxonomies[] = $taxonomy; |
|
| 570 | - } |
|
| 566 | + $i = 0; |
|
| 567 | + foreach ($taxonomies as $taxonomy => $args) {
|
|
| 568 | + if ($post_type != '' && $args['object_type'] == $post_type) {
|
|
| 569 | + $gd_taxonomies[] = $taxonomy; |
|
| 570 | + } |
|
| 571 | 571 | |
| 572 | - if ($tages_taxonomies === false && substr($taxonomy , -5) == '_tags') {
|
|
| 573 | - if (array_search($taxonomy, $gd_taxonomies) !== false) {
|
|
| 574 | - unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]); |
|
| 575 | - } |
|
| 576 | - } |
|
| 577 | - } |
|
| 572 | + if ($tages_taxonomies === false && substr($taxonomy , -5) == '_tags') {
|
|
| 573 | + if (array_search($taxonomy, $gd_taxonomies) !== false) {
|
|
| 574 | + unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]); |
|
| 575 | + } |
|
| 576 | + } |
|
| 577 | + } |
|
| 578 | 578 | |
| 579 | - $gd_taxonomies = array_values($gd_taxonomies); |
|
| 580 | - } |
|
| 581 | - |
|
| 582 | - /** |
|
| 583 | - * Filter the taxonomies. |
|
| 584 | - * |
|
| 585 | - * @since 1.0.0 |
|
| 586 | - * @param array $gd_taxonomies The taxonomy array. |
|
| 587 | - */ |
|
| 588 | - $taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);
|
|
| 589 | - |
|
| 590 | - if (!empty($taxonomies)) {
|
|
| 591 | - return $taxonomies; |
|
| 592 | - } else {
|
|
| 593 | - return false; |
|
| 594 | - } |
|
| 595 | - } |
|
| 579 | + $gd_taxonomies = array_values($gd_taxonomies); |
|
| 580 | + } |
|
| 581 | + |
|
| 582 | + /** |
|
| 583 | + * Filter the taxonomies. |
|
| 584 | + * |
|
| 585 | + * @since 1.0.0 |
|
| 586 | + * @param array $gd_taxonomies The taxonomy array. |
|
| 587 | + */ |
|
| 588 | + $taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);
|
|
| 589 | + |
|
| 590 | + if (!empty($taxonomies)) {
|
|
| 591 | + return $taxonomies; |
|
| 592 | + } else {
|
|
| 593 | + return false; |
|
| 594 | + } |
|
| 595 | + } |
|
| 596 | 596 | } |
| 597 | 597 | |
| 598 | 598 | if (!function_exists(' geodir_get_categories_dl')) {
|
| 599 | - /** |
|
| 600 | - * Get categories dropdown HTML. |
|
| 601 | - * |
|
| 602 | - * @since 1.0.0 |
|
| 603 | - * @package GeoDirectory |
|
| 604 | - * @param string $post_type The post type. |
|
| 605 | - * @param string $selected The selected value. |
|
| 606 | - * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 607 | - * @param bool $echo Prints the HTML when set to true. Default: true. |
|
| 608 | - * @return void|string Dropdown HTML. |
|
| 609 | - */ |
|
| 610 | - function geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true) |
|
| 611 | - {
|
|
| 612 | - |
|
| 613 | - $html = ''; |
|
| 614 | - $taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies); |
|
| 615 | - |
|
| 616 | - $categories = get_terms($taxonomies); |
|
| 617 | - |
|
| 618 | - $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';
|
|
| 619 | - |
|
| 620 | - foreach ($categories as $category_obj) {
|
|
| 621 | - $select_opt = ''; |
|
| 622 | - if ($selected == $category_obj->term_id) {
|
|
| 623 | - $select_opt = 'selected="selected"'; |
|
| 624 | - } |
|
| 625 | - $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">' |
|
| 626 | - . geodir_utf8_ucfirst($category_obj->name) . '</option>'; |
|
| 627 | - } |
|
| 628 | - |
|
| 629 | - if ($echo) |
|
| 630 | - echo $html; |
|
| 631 | - else |
|
| 632 | - return $html; |
|
| 633 | - } |
|
| 599 | + /** |
|
| 600 | + * Get categories dropdown HTML. |
|
| 601 | + * |
|
| 602 | + * @since 1.0.0 |
|
| 603 | + * @package GeoDirectory |
|
| 604 | + * @param string $post_type The post type. |
|
| 605 | + * @param string $selected The selected value. |
|
| 606 | + * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 607 | + * @param bool $echo Prints the HTML when set to true. Default: true. |
|
| 608 | + * @return void|string Dropdown HTML. |
|
| 609 | + */ |
|
| 610 | + function geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true) |
|
| 611 | + {
|
|
| 612 | + |
|
| 613 | + $html = ''; |
|
| 614 | + $taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies); |
|
| 615 | + |
|
| 616 | + $categories = get_terms($taxonomies); |
|
| 617 | + |
|
| 618 | + $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';
|
|
| 619 | + |
|
| 620 | + foreach ($categories as $category_obj) {
|
|
| 621 | + $select_opt = ''; |
|
| 622 | + if ($selected == $category_obj->term_id) {
|
|
| 623 | + $select_opt = 'selected="selected"'; |
|
| 624 | + } |
|
| 625 | + $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">' |
|
| 626 | + . geodir_utf8_ucfirst($category_obj->name) . '</option>'; |
|
| 627 | + } |
|
| 628 | + |
|
| 629 | + if ($echo) |
|
| 630 | + echo $html; |
|
| 631 | + else |
|
| 632 | + return $html; |
|
| 633 | + } |
|
| 634 | 634 | } |
| 635 | 635 | |
| 636 | 636 | |
@@ -645,28 +645,28 @@ discard block |
||
| 645 | 645 | function geodir_get_listing_slug($object_type = '') |
| 646 | 646 | {
|
| 647 | 647 | |
| 648 | - $listing_slug = ''; |
|
| 648 | + $listing_slug = ''; |
|
| 649 | 649 | |
| 650 | - $post_types = get_option('geodir_post_types');
|
|
| 651 | - $taxonomies = get_option('geodir_taxonomies');
|
|
| 650 | + $post_types = get_option('geodir_post_types');
|
|
| 651 | + $taxonomies = get_option('geodir_taxonomies');
|
|
| 652 | 652 | |
| 653 | 653 | |
| 654 | - if ($object_type != '') {
|
|
| 655 | - if (!empty($post_types) && array_key_exists($object_type, $post_types)) {
|
|
| 654 | + if ($object_type != '') {
|
|
| 655 | + if (!empty($post_types) && array_key_exists($object_type, $post_types)) {
|
|
| 656 | 656 | |
| 657 | - $object_info = $post_types[$object_type]; |
|
| 658 | - $listing_slug = $object_info['listing_slug']; |
|
| 659 | - } elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {
|
|
| 660 | - $object_info = $taxonomies[$object_type]; |
|
| 661 | - $listing_slug = $object_info['listing_slug']; |
|
| 662 | - } |
|
| 657 | + $object_info = $post_types[$object_type]; |
|
| 658 | + $listing_slug = $object_info['listing_slug']; |
|
| 659 | + } elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {
|
|
| 660 | + $object_info = $taxonomies[$object_type]; |
|
| 661 | + $listing_slug = $object_info['listing_slug']; |
|
| 662 | + } |
|
| 663 | 663 | |
| 664 | - } |
|
| 664 | + } |
|
| 665 | 665 | |
| 666 | - if (!empty($listing_slug)) |
|
| 667 | - return $listing_slug; |
|
| 668 | - else |
|
| 669 | - return false; |
|
| 666 | + if (!empty($listing_slug)) |
|
| 667 | + return $listing_slug; |
|
| 668 | + else |
|
| 669 | + return false; |
|
| 670 | 670 | } |
| 671 | 671 | |
| 672 | 672 | |
@@ -681,212 +681,212 @@ discard block |
||
| 681 | 681 | */ |
| 682 | 682 | function geodir_get_taxonomy_posttype($taxonomy = '') |
| 683 | 683 | {
|
| 684 | - global $wp_query; |
|
| 685 | - |
|
| 686 | - $post_type = array(); |
|
| 687 | - $taxonomies = array(); |
|
| 688 | - |
|
| 689 | - if (!empty($taxonomy)) {
|
|
| 690 | - $taxonomies[] = $taxonomy; |
|
| 691 | - } elseif (isset($wp_query->tax_query->queries)) {
|
|
| 692 | - $tax_arr = $wp_query->tax_query->queries; |
|
| 693 | - //if tax query has 'relation' set then it will break wp_list_pluck so we remove it |
|
| 694 | - if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}
|
|
| 695 | - $taxonomies = wp_list_pluck($tax_arr, 'taxonomy'); |
|
| 696 | - } |
|
| 697 | - |
|
| 698 | - if (!empty($taxonomies)) {
|
|
| 699 | - foreach (geodir_get_posttypes() as $pt) {
|
|
| 700 | - $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt); |
|
| 701 | - if (array_intersect($taxonomies, $object_taxonomies)) |
|
| 702 | - $post_type[] = $pt; |
|
| 703 | - } |
|
| 704 | - } |
|
| 705 | - |
|
| 706 | - if (!empty($post_type)) |
|
| 707 | - return $post_type[0]; |
|
| 708 | - else |
|
| 709 | - return false; |
|
| 684 | + global $wp_query; |
|
| 685 | + |
|
| 686 | + $post_type = array(); |
|
| 687 | + $taxonomies = array(); |
|
| 688 | + |
|
| 689 | + if (!empty($taxonomy)) {
|
|
| 690 | + $taxonomies[] = $taxonomy; |
|
| 691 | + } elseif (isset($wp_query->tax_query->queries)) {
|
|
| 692 | + $tax_arr = $wp_query->tax_query->queries; |
|
| 693 | + //if tax query has 'relation' set then it will break wp_list_pluck so we remove it |
|
| 694 | + if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}
|
|
| 695 | + $taxonomies = wp_list_pluck($tax_arr, 'taxonomy'); |
|
| 696 | + } |
|
| 697 | + |
|
| 698 | + if (!empty($taxonomies)) {
|
|
| 699 | + foreach (geodir_get_posttypes() as $pt) {
|
|
| 700 | + $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt); |
|
| 701 | + if (array_intersect($taxonomies, $object_taxonomies)) |
|
| 702 | + $post_type[] = $pt; |
|
| 703 | + } |
|
| 704 | + } |
|
| 705 | + |
|
| 706 | + if (!empty($post_type)) |
|
| 707 | + return $post_type[0]; |
|
| 708 | + else |
|
| 709 | + return false; |
|
| 710 | 710 | } |
| 711 | 711 | |
| 712 | 712 | if (!function_exists('geodir_custom_taxonomy_walker')) {
|
| 713 | - /** |
|
| 714 | - * Custom taxonomy walker function. |
|
| 715 | - * |
|
| 716 | - * @since 1.0.0 |
|
| 717 | - * @package GeoDirectory |
|
| 718 | - * @param string $cat_taxonomy The taxonomy name. |
|
| 719 | - * @param int $cat_parent The parent term ID. |
|
| 720 | - * @param bool $hide_empty Hide empty taxonomies? Default: false. |
|
| 721 | - * @param int $pading CSS padding in pixels. |
|
| 722 | - * @return string|void taxonomy HTML. |
|
| 723 | - */ |
|
| 724 | - function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0) |
|
| 725 | - {
|
|
| 726 | - global $cat_display, $post_cat, $exclude_cats; |
|
| 727 | - |
|
| 728 | - $search_terms = trim($post_cat, ","); |
|
| 729 | - |
|
| 730 | - $search_terms = explode(",", $search_terms);
|
|
| 731 | - |
|
| 732 | - $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));
|
|
| 733 | - |
|
| 734 | - $display = ''; |
|
| 735 | - $onchange = ''; |
|
| 736 | - $term_check = ''; |
|
| 737 | - $main_list_class = ''; |
|
| 738 | - $out = ''; |
|
| 739 | - //If there are terms, start displaying |
|
| 740 | - if (count($cat_terms) > 0) {
|
|
| 741 | - //Displaying as a list |
|
| 742 | - $p = $pading * 20; |
|
| 743 | - $pading++; |
|
| 744 | - |
|
| 745 | - |
|
| 746 | - if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {
|
|
| 747 | - if ($cat_parent == 0) {
|
|
| 748 | - $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display; |
|
| 749 | - $main_list_class = 'class="main_list_selecter"'; |
|
| 750 | - } else {
|
|
| 751 | - //$display = 'display:none'; |
|
| 752 | - $list_class = 'sub_list gd-sub-cats-list'; |
|
| 753 | - } |
|
| 754 | - } |
|
| 713 | + /** |
|
| 714 | + * Custom taxonomy walker function. |
|
| 715 | + * |
|
| 716 | + * @since 1.0.0 |
|
| 717 | + * @package GeoDirectory |
|
| 718 | + * @param string $cat_taxonomy The taxonomy name. |
|
| 719 | + * @param int $cat_parent The parent term ID. |
|
| 720 | + * @param bool $hide_empty Hide empty taxonomies? Default: false. |
|
| 721 | + * @param int $pading CSS padding in pixels. |
|
| 722 | + * @return string|void taxonomy HTML. |
|
| 723 | + */ |
|
| 724 | + function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0) |
|
| 725 | + {
|
|
| 726 | + global $cat_display, $post_cat, $exclude_cats; |
|
| 727 | + |
|
| 728 | + $search_terms = trim($post_cat, ","); |
|
| 729 | + |
|
| 730 | + $search_terms = explode(",", $search_terms);
|
|
| 731 | + |
|
| 732 | + $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));
|
|
| 733 | + |
|
| 734 | + $display = ''; |
|
| 735 | + $onchange = ''; |
|
| 736 | + $term_check = ''; |
|
| 737 | + $main_list_class = ''; |
|
| 738 | + $out = ''; |
|
| 739 | + //If there are terms, start displaying |
|
| 740 | + if (count($cat_terms) > 0) {
|
|
| 741 | + //Displaying as a list |
|
| 742 | + $p = $pading * 20; |
|
| 743 | + $pading++; |
|
| 744 | + |
|
| 745 | + |
|
| 746 | + if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {
|
|
| 747 | + if ($cat_parent == 0) {
|
|
| 748 | + $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display; |
|
| 749 | + $main_list_class = 'class="main_list_selecter"'; |
|
| 750 | + } else {
|
|
| 751 | + //$display = 'display:none'; |
|
| 752 | + $list_class = 'sub_list gd-sub-cats-list'; |
|
| 753 | + } |
|
| 754 | + } |
|
| 755 | 755 | |
| 756 | - if ($cat_display == 'checkbox' || $cat_display == 'radio') {
|
|
| 757 | - $p = 0; |
|
| 758 | - $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 759 | - } |
|
| 756 | + if ($cat_display == 'checkbox' || $cat_display == 'radio') {
|
|
| 757 | + $p = 0; |
|
| 758 | + $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 759 | + } |
|
| 760 | 760 | |
| 761 | - foreach ($cat_terms as $cat_term) {
|
|
| 761 | + foreach ($cat_terms as $cat_term) {
|
|
| 762 | 762 | |
| 763 | - $checked = ''; |
|
| 763 | + $checked = ''; |
|
| 764 | 764 | |
| 765 | - if (in_array($cat_term->term_id, $search_terms)) {
|
|
| 766 | - if ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 767 | - $checked = 'selected="selected"'; |
|
| 768 | - else |
|
| 769 | - $checked = 'checked="checked"'; |
|
| 770 | - } |
|
| 765 | + if (in_array($cat_term->term_id, $search_terms)) {
|
|
| 766 | + if ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 767 | + $checked = 'selected="selected"'; |
|
| 768 | + else |
|
| 769 | + $checked = 'checked="checked"'; |
|
| 770 | + } |
|
| 771 | 771 | |
| 772 | - if ($cat_display == 'radio') |
|
| 773 | - $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>'; |
|
| 774 | - elseif ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 775 | - $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</option>'; |
|
| 772 | + if ($cat_display == 'radio') |
|
| 773 | + $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>'; |
|
| 774 | + elseif ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 775 | + $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</option>'; |
|
| 776 | 776 | |
| 777 | - else {
|
|
| 778 | - $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>'; |
|
| 779 | - } |
|
| 777 | + else {
|
|
| 778 | + $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>'; |
|
| 779 | + } |
|
| 780 | 780 | |
| 781 | - // Call recurson to print sub cats |
|
| 782 | - $out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading); |
|
| 781 | + // Call recurson to print sub cats |
|
| 782 | + $out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading); |
|
| 783 | 783 | |
| 784 | - } |
|
| 784 | + } |
|
| 785 | 785 | |
| 786 | - if ($cat_display == 'checkbox' || $cat_display == 'radio') |
|
| 787 | - $out .= '</div>'; |
|
| 786 | + if ($cat_display == 'checkbox' || $cat_display == 'radio') |
|
| 787 | + $out .= '</div>'; |
|
| 788 | 788 | |
| 789 | - return $out; |
|
| 790 | - } |
|
| 791 | - return; |
|
| 792 | - } |
|
| 789 | + return $out; |
|
| 790 | + } |
|
| 791 | + return; |
|
| 792 | + } |
|
| 793 | 793 | } |
| 794 | 794 | |
| 795 | 795 | if (!function_exists('geodir_custom_taxonomy_walker2')) {
|
| 796 | - /** |
|
| 797 | - * Custom taxonomy walker function. |
|
| 798 | - * |
|
| 799 | - * @since 1.0.0 |
|
| 800 | - * @package GeoDirectory |
|
| 801 | - * @global object $post WordPress Post object. |
|
| 802 | - * @global object $gd_session GeoDirectory Session object. |
|
| 803 | - * @param string $cat_taxonomy The taxonomy name. |
|
| 804 | - * @param string $cat_limit Number of categories to display. |
|
| 805 | - */ |
|
| 806 | - function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '') |
|
| 807 | - {
|
|
| 808 | - $post_category = ''; |
|
| 809 | - $post_category_str = ''; |
|
| 810 | - global $exclude_cats, $gd_session; |
|
| 811 | - |
|
| 812 | - $cat_exclude = ''; |
|
| 813 | - if (is_array($exclude_cats) && !empty($exclude_cats)) |
|
| 814 | - $cat_exclude = serialize($exclude_cats); |
|
| 815 | - |
|
| 816 | - if (isset($_REQUEST['backandedit'])) {
|
|
| 817 | - $post = (object)$gd_session->get('listing');
|
|
| 818 | - |
|
| 819 | - if (!is_array($post->post_category[$cat_taxonomy])) |
|
| 820 | - $post_category = $post->post_category[$cat_taxonomy]; |
|
| 821 | - |
|
| 822 | - $post_categories = $post->post_category_str; |
|
| 823 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) |
|
| 824 | - $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 825 | - |
|
| 826 | - } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {
|
|
| 827 | - global $post; |
|
| 828 | - |
|
| 829 | - $post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true); |
|
| 830 | - if (empty($post_category) && isset($post->{$cat_taxonomy})) {
|
|
| 831 | - $post_category = $post->{$cat_taxonomy};
|
|
| 832 | - } |
|
| 796 | + /** |
|
| 797 | + * Custom taxonomy walker function. |
|
| 798 | + * |
|
| 799 | + * @since 1.0.0 |
|
| 800 | + * @package GeoDirectory |
|
| 801 | + * @global object $post WordPress Post object. |
|
| 802 | + * @global object $gd_session GeoDirectory Session object. |
|
| 803 | + * @param string $cat_taxonomy The taxonomy name. |
|
| 804 | + * @param string $cat_limit Number of categories to display. |
|
| 805 | + */ |
|
| 806 | + function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '') |
|
| 807 | + {
|
|
| 808 | + $post_category = ''; |
|
| 809 | + $post_category_str = ''; |
|
| 810 | + global $exclude_cats, $gd_session; |
|
| 811 | + |
|
| 812 | + $cat_exclude = ''; |
|
| 813 | + if (is_array($exclude_cats) && !empty($exclude_cats)) |
|
| 814 | + $cat_exclude = serialize($exclude_cats); |
|
| 815 | + |
|
| 816 | + if (isset($_REQUEST['backandedit'])) {
|
|
| 817 | + $post = (object)$gd_session->get('listing');
|
|
| 818 | + |
|
| 819 | + if (!is_array($post->post_category[$cat_taxonomy])) |
|
| 820 | + $post_category = $post->post_category[$cat_taxonomy]; |
|
| 821 | + |
|
| 822 | + $post_categories = $post->post_category_str; |
|
| 823 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) |
|
| 824 | + $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 825 | + |
|
| 826 | + } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {
|
|
| 827 | + global $post; |
|
| 828 | + |
|
| 829 | + $post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true); |
|
| 830 | + if (empty($post_category) && isset($post->{$cat_taxonomy})) {
|
|
| 831 | + $post_category = $post->{$cat_taxonomy};
|
|
| 832 | + } |
|
| 833 | 833 | |
| 834 | - $post_categories = get_post_meta($post->ID, 'post_categories', true); |
|
| 834 | + $post_categories = get_post_meta($post->ID, 'post_categories', true); |
|
| 835 | 835 | |
| 836 | - if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 837 | - foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {
|
|
| 838 | - if (is_numeric($cat_part)) {
|
|
| 839 | - $cat_part_arr[] = $cat_part; |
|
| 840 | - } |
|
| 841 | - } |
|
| 842 | - if (is_array($cat_part_arr)) {
|
|
| 843 | - $post_category = implode(',', $cat_part_arr);
|
|
| 844 | - } |
|
| 845 | - } |
|
| 836 | + if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 837 | + foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {
|
|
| 838 | + if (is_numeric($cat_part)) {
|
|
| 839 | + $cat_part_arr[] = $cat_part; |
|
| 840 | + } |
|
| 841 | + } |
|
| 842 | + if (is_array($cat_part_arr)) {
|
|
| 843 | + $post_category = implode(',', $cat_part_arr);
|
|
| 844 | + } |
|
| 845 | + } |
|
| 846 | 846 | |
| 847 | - if (!empty($post_category)) {
|
|
| 848 | - $cat1 = array_filter(explode(',', $post_category));
|
|
| 849 | - $post_category = ',' . implode(',', $cat1) . ',';
|
|
| 847 | + if (!empty($post_category)) {
|
|
| 848 | + $cat1 = array_filter(explode(',', $post_category));
|
|
| 849 | + $post_category = ',' . implode(',', $cat1) . ',';
|
|
| 850 | 850 | |
| 851 | - } |
|
| 851 | + } |
|
| 852 | 852 | |
| 853 | - if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {
|
|
| 853 | + if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {
|
|
| 854 | 854 | |
| 855 | - $post_category_upd = explode(',', $post_category);
|
|
| 856 | - $post_category_change = ''; |
|
| 857 | - foreach ($post_category_upd as $cat) {
|
|
| 855 | + $post_category_upd = explode(',', $post_category);
|
|
| 856 | + $post_category_change = ''; |
|
| 857 | + foreach ($post_category_upd as $cat) {
|
|
| 858 | 858 | |
| 859 | - if (!in_array($cat, $exclude_cats) && $cat != '') {
|
|
| 860 | - $post_category_change .= ',' . $cat; |
|
| 861 | - } |
|
| 862 | - } |
|
| 863 | - $post_category = $post_category_change; |
|
| 864 | - } |
|
| 859 | + if (!in_array($cat, $exclude_cats) && $cat != '') {
|
|
| 860 | + $post_category_change .= ',' . $cat; |
|
| 861 | + } |
|
| 862 | + } |
|
| 863 | + $post_category = $post_category_change; |
|
| 864 | + } |
|
| 865 | 865 | |
| 866 | 866 | |
| 867 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 868 | - $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 869 | - } |
|
| 870 | - } |
|
| 867 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 868 | + $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 869 | + } |
|
| 870 | + } |
|
| 871 | 871 | |
| 872 | - echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']" />'; |
|
| 872 | + echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']" />'; |
|
| 873 | 873 | |
| 874 | - echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']" />'; |
|
| 874 | + echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']" />'; |
|
| 875 | 875 | |
| 876 | - echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']" />'; |
|
| 876 | + echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']" />'; |
|
| 877 | 877 | |
| 878 | 878 | |
| 879 | - ?> |
|
| 879 | + ?> |
|
| 880 | 880 | <div class="cat_sublist"> |
| 881 | 881 | <?php |
| 882 | 882 | |
| 883 | - $post_id = isset($post->ID) ? $post->ID : ''; |
|
| 883 | + $post_id = isset($post->ID) ? $post->ID : ''; |
|
| 884 | 884 | |
| 885 | - if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 885 | + if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 886 | 886 | |
| 887 | - geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories); |
|
| 888 | - } |
|
| 889 | - ?> |
|
| 887 | + geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories); |
|
| 888 | + } |
|
| 889 | + ?> |
|
| 890 | 890 | </div> |
| 891 | 891 | <script type="text/javascript"> |
| 892 | 892 | |
@@ -1009,22 +1009,22 @@ discard block |
||
| 1009 | 1009 | |
| 1010 | 1010 | </script> |
| 1011 | 1011 | <?php |
| 1012 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 1013 | - $post_cat_str = $post_categories[$cat_taxonomy]; |
|
| 1014 | - $post_cat_array = explode("#", $post_cat_str);
|
|
| 1015 | - if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) |
|
| 1016 | - $style = "display:none;"; |
|
| 1017 | - } |
|
| 1018 | - ?> |
|
| 1012 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 1013 | + $post_cat_str = $post_categories[$cat_taxonomy]; |
|
| 1014 | + $post_cat_array = explode("#", $post_cat_str);
|
|
| 1015 | + if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) |
|
| 1016 | + $style = "display:none;"; |
|
| 1017 | + } |
|
| 1018 | + ?> |
|
| 1019 | 1019 | <div class="main_cat_list" style=" <?php if (isset($style)) {
|
| 1020 | - echo $style; |
|
| 1021 | - }?> "> |
|
| 1020 | + echo $style; |
|
| 1021 | + }?> "> |
|
| 1022 | 1022 | <?php geodir_get_catlist($cat_taxonomy, 0); // print main categories list |
| 1023 | - ?> |
|
| 1023 | + ?> |
|
| 1024 | 1024 | </div> |
| 1025 | 1025 | <?php |
| 1026 | 1026 | |
| 1027 | - } |
|
| 1027 | + } |
|
| 1028 | 1028 | } |
| 1029 | 1029 | |
| 1030 | 1030 | /** |
@@ -1041,23 +1041,23 @@ discard block |
||
| 1041 | 1041 | */ |
| 1042 | 1042 | function geodir_addpost_categories_html($request_taxonomy, $parrent, $selected = false, $main_selected = true, $default = false, $exclude = '') |
| 1043 | 1043 | {
|
| 1044 | - global $exclude_cats; |
|
| 1044 | + global $exclude_cats; |
|
| 1045 | 1045 | |
| 1046 | - if ($exclude != '') {
|
|
| 1047 | - $exclude_cats = maybe_unserialize(base64_decode($exclude)); |
|
| 1046 | + if ($exclude != '') {
|
|
| 1047 | + $exclude_cats = maybe_unserialize(base64_decode($exclude)); |
|
| 1048 | 1048 | |
| 1049 | - if(is_array( $exclude_cats)){
|
|
| 1050 | - $exclude_cats = array_map( 'intval', $exclude_cats ); |
|
| 1051 | - }else{
|
|
| 1052 | - $exclude_cats = intval($exclude_cats); |
|
| 1053 | - } |
|
| 1049 | + if(is_array( $exclude_cats)){
|
|
| 1050 | + $exclude_cats = array_map( 'intval', $exclude_cats ); |
|
| 1051 | + }else{
|
|
| 1052 | + $exclude_cats = intval($exclude_cats); |
|
| 1053 | + } |
|
| 1054 | 1054 | |
| 1055 | - } |
|
| 1055 | + } |
|
| 1056 | 1056 | |
| 1057 | - if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) || |
|
| 1058 | - (!is_array($exclude_cats) || empty($exclude_cats)) |
|
| 1059 | - ) {
|
|
| 1060 | - ?> |
|
| 1057 | + if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) || |
|
| 1058 | + (!is_array($exclude_cats) || empty($exclude_cats)) |
|
| 1059 | + ) {
|
|
| 1060 | + ?> |
|
| 1061 | 1061 | |
| 1062 | 1062 | <?php $main_cat = get_term($parrent, $request_taxonomy); ?> |
| 1063 | 1063 | |
@@ -1086,8 +1086,8 @@ discard block |
||
| 1086 | 1086 | |
| 1087 | 1087 | <br/> |
| 1088 | 1088 | <?php |
| 1089 | - $cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1090 | - if (!empty($cat_terms)) { ?>
|
|
| 1089 | + $cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1090 | + if (!empty($cat_terms)) { ?>
|
|
| 1091 | 1091 | <span> <?php printf(__('Add listing in category', 'geodirectory')); ?></span>
|
| 1092 | 1092 | <?php geodir_get_catlist($request_taxonomy, $parrent, $selected) ?> |
| 1093 | 1093 | <?php } ?> |
@@ -1109,53 +1109,53 @@ discard block |
||
| 1109 | 1109 | function geodir_editpost_categories_html($request_taxonomy, $request_postid, $post_categories) |
| 1110 | 1110 | {
|
| 1111 | 1111 | |
| 1112 | - if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {
|
|
| 1113 | - $post_cat_str = $post_categories[$request_taxonomy]; |
|
| 1114 | - $post_cat_array = explode("#", $post_cat_str);
|
|
| 1115 | - if (is_array($post_cat_array)) {
|
|
| 1116 | - $post_cat_array = array_unique( $post_cat_array ); |
|
| 1112 | + if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {
|
|
| 1113 | + $post_cat_str = $post_categories[$request_taxonomy]; |
|
| 1114 | + $post_cat_array = explode("#", $post_cat_str);
|
|
| 1115 | + if (is_array($post_cat_array)) {
|
|
| 1116 | + $post_cat_array = array_unique( $post_cat_array ); |
|
| 1117 | 1117 | |
| 1118 | 1118 | foreach ($post_cat_array as $post_cat_html) {
|
| 1119 | 1119 | |
| 1120 | - $post_cat_info = explode(":", $post_cat_html);
|
|
| 1121 | - $post_maincat_str = $post_cat_info[0]; |
|
| 1120 | + $post_cat_info = explode(":", $post_cat_html);
|
|
| 1121 | + $post_maincat_str = $post_cat_info[0]; |
|
| 1122 | 1122 | |
| 1123 | - if (!empty($post_maincat_str)) {
|
|
| 1124 | - $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1125 | - $post_maincat_id = $post_maincat_info[0]; |
|
| 1126 | - ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1127 | - (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1128 | - } |
|
| 1129 | - $post_sub_catid = ''; |
|
| 1130 | - if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1131 | - $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1132 | - } |
|
| 1123 | + if (!empty($post_maincat_str)) {
|
|
| 1124 | + $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1125 | + $post_maincat_id = $post_maincat_info[0]; |
|
| 1126 | + ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1127 | + (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1128 | + } |
|
| 1129 | + $post_sub_catid = ''; |
|
| 1130 | + if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1131 | + $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1132 | + } |
|
| 1133 | 1133 | |
| 1134 | - geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1134 | + geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1135 | 1135 | |
| 1136 | - } |
|
| 1137 | - } else {
|
|
| 1136 | + } |
|
| 1137 | + } else {
|
|
| 1138 | 1138 | |
| 1139 | - $post_cat_info = explode(":", $post_cat_str);
|
|
| 1140 | - $post_maincat_str = $post_cat_info[0]; |
|
| 1139 | + $post_cat_info = explode(":", $post_cat_str);
|
|
| 1140 | + $post_maincat_str = $post_cat_info[0]; |
|
| 1141 | 1141 | |
| 1142 | - $post_sub_catid = ''; |
|
| 1142 | + $post_sub_catid = ''; |
|
| 1143 | 1143 | |
| 1144 | - if (!empty($post_maincat_str)) {
|
|
| 1145 | - $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1146 | - $post_maincat_id = $post_maincat_info[0]; |
|
| 1147 | - ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1148 | - (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1149 | - } |
|
| 1144 | + if (!empty($post_maincat_str)) {
|
|
| 1145 | + $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1146 | + $post_maincat_id = $post_maincat_info[0]; |
|
| 1147 | + ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1148 | + (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1149 | + } |
|
| 1150 | 1150 | |
| 1151 | - if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1152 | - $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1153 | - } |
|
| 1151 | + if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1152 | + $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1153 | + } |
|
| 1154 | 1154 | |
| 1155 | - geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1155 | + geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1156 | 1156 | |
| 1157 | - } |
|
| 1158 | - } |
|
| 1157 | + } |
|
| 1158 | + } |
|
| 1159 | 1159 | } |
| 1160 | 1160 | |
| 1161 | 1161 | /** |
@@ -1169,35 +1169,35 @@ discard block |
||
| 1169 | 1169 | */ |
| 1170 | 1170 | function geodir_get_catlist($cat_taxonomy, $parrent = 0, $selected = false) |
| 1171 | 1171 | {
|
| 1172 | - global $exclude_cats; |
|
| 1172 | + global $exclude_cats; |
|
| 1173 | 1173 | |
| 1174 | - $cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1174 | + $cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1175 | 1175 | |
| 1176 | - if (!empty($cat_terms)) {
|
|
| 1177 | - $onchange = ''; |
|
| 1178 | - $onchange = ' onchange="show_subcatlist(this.value, this)" '; |
|
| 1176 | + if (!empty($cat_terms)) {
|
|
| 1177 | + $onchange = ''; |
|
| 1178 | + $onchange = ' onchange="show_subcatlist(this.value, this)" '; |
|
| 1179 | 1179 | |
| 1180 | - $option_selected = ''; |
|
| 1181 | - if (!$selected) |
|
| 1182 | - $option_slected = ' selected="selected" '; |
|
| 1180 | + $option_selected = ''; |
|
| 1181 | + if (!$selected) |
|
| 1182 | + $option_slected = ' selected="selected" '; |
|
| 1183 | 1183 | |
| 1184 | - echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >'; |
|
| 1184 | + echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >'; |
|
| 1185 | 1185 | |
| 1186 | - echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';
|
|
| 1186 | + echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';
|
|
| 1187 | 1187 | |
| 1188 | - foreach ($cat_terms as $cat_term) {
|
|
| 1189 | - $option_selected = ''; |
|
| 1190 | - if ($selected == $cat_term->term_id) |
|
| 1191 | - $option_selected = ' selected="selected" '; |
|
| 1188 | + foreach ($cat_terms as $cat_term) {
|
|
| 1189 | + $option_selected = ''; |
|
| 1190 | + if ($selected == $cat_term->term_id) |
|
| 1191 | + $option_selected = ' selected="selected" '; |
|
| 1192 | 1192 | |
| 1193 | - // Count child terms |
|
| 1194 | - $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) ); |
|
| 1195 | - $has_child = !empty( $child_terms ) ? 't' : 'f'; |
|
| 1193 | + // Count child terms |
|
| 1194 | + $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) ); |
|
| 1195 | + $has_child = !empty( $child_terms ) ? 't' : 'f'; |
|
| 1196 | 1196 | |
| 1197 | - echo '<option ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . geodir_utf8_ucfirst($cat_term->name) . '</option>'; |
|
| 1198 | - } |
|
| 1199 | - echo '</select>'; |
|
| 1200 | - } |
|
| 1197 | + echo '<option ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . geodir_utf8_ucfirst($cat_term->name) . '</option>'; |
|
| 1198 | + } |
|
| 1199 | + echo '</select>'; |
|
| 1200 | + } |
|
| 1201 | 1201 | } |
| 1202 | 1202 | |
| 1203 | 1203 | /** |
@@ -1213,28 +1213,28 @@ discard block |
||
| 1213 | 1213 | */ |
| 1214 | 1214 | function geodir_custom_update_messages($messages) |
| 1215 | 1215 | {
|
| 1216 | - global $post, $post_ID; |
|
| 1217 | - |
|
| 1218 | - $post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');
|
|
| 1219 | - |
|
| 1220 | - foreach ($post_types as $post_type => $post_object) {
|
|
| 1221 | - |
|
| 1222 | - $messages[$post_type] = array( |
|
| 1223 | - 0 => '', // Unused. Messages start at index 1. |
|
| 1224 | - 1 => sprintf(__('%s updated. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1225 | - 2 => __('Custom field updated.', 'geodirectory'),
|
|
| 1226 | - 3 => __('Custom field deleted.', 'geodirectory'),
|
|
| 1227 | - 4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1228 | - 5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,
|
|
| 1229 | - 6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1230 | - 7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1231 | - 8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
|
|
| 1232 | - 9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1233 | - 10 => sprintf(__('%s draft updated. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
|
|
| 1234 | - ); |
|
| 1235 | - } |
|
| 1236 | - |
|
| 1237 | - return $messages; |
|
| 1216 | + global $post, $post_ID; |
|
| 1217 | + |
|
| 1218 | + $post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');
|
|
| 1219 | + |
|
| 1220 | + foreach ($post_types as $post_type => $post_object) {
|
|
| 1221 | + |
|
| 1222 | + $messages[$post_type] = array( |
|
| 1223 | + 0 => '', // Unused. Messages start at index 1. |
|
| 1224 | + 1 => sprintf(__('%s updated. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1225 | + 2 => __('Custom field updated.', 'geodirectory'),
|
|
| 1226 | + 3 => __('Custom field deleted.', 'geodirectory'),
|
|
| 1227 | + 4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1228 | + 5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,
|
|
| 1229 | + 6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1230 | + 7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1231 | + 8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
|
|
| 1232 | + 9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1233 | + 10 => sprintf(__('%s draft updated. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
|
|
| 1234 | + ); |
|
| 1235 | + } |
|
| 1236 | + |
|
| 1237 | + return $messages; |
|
| 1238 | 1238 | } |
| 1239 | 1239 | |
| 1240 | 1240 | |
@@ -1249,182 +1249,182 @@ discard block |
||
| 1249 | 1249 | function geodir_register_defaults() |
| 1250 | 1250 | {
|
| 1251 | 1251 | |
| 1252 | - global $wpdb; |
|
| 1253 | - |
|
| 1254 | - $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico'; |
|
| 1255 | - |
|
| 1256 | - if (!$listing_slug = get_option('geodir_listing_prefix'))
|
|
| 1257 | - $listing_slug = 'places'; |
|
| 1258 | - |
|
| 1259 | - /** |
|
| 1260 | - * Taxonomies |
|
| 1261 | - **/ |
|
| 1262 | - //if ( ! taxonomy_exists('gd_place_tags') )
|
|
| 1263 | - {
|
|
| 1264 | - |
|
| 1265 | - $gd_placetags = array(); |
|
| 1266 | - $gd_placetags['object_type'] = 'gd_place'; |
|
| 1267 | - $gd_placetags['listing_slug'] = $listing_slug . '/tags'; |
|
| 1268 | - $gd_placetags['args'] = array( |
|
| 1269 | - 'public' => true, |
|
| 1270 | - 'hierarchical' => false, |
|
| 1271 | - 'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),
|
|
| 1272 | - 'query_var' => true, |
|
| 1273 | - |
|
| 1274 | - 'labels' => array( |
|
| 1275 | - 'name' => __('Place Tags', 'geodirectory'),
|
|
| 1276 | - 'singular_name' => __('Place Tag', 'geodirectory'),
|
|
| 1277 | - 'search_items' => __('Search Place Tags', 'geodirectory'),
|
|
| 1278 | - 'popular_items' => __('Popular Place Tags', 'geodirectory'),
|
|
| 1279 | - 'all_items' => __('All Place Tags', 'geodirectory'),
|
|
| 1280 | - 'edit_item' => __('Edit Place Tag', 'geodirectory'),
|
|
| 1281 | - 'update_item' => __('Update Place Tag', 'geodirectory'),
|
|
| 1282 | - 'add_new_item' => __('Add New Place Tag', 'geodirectory'),
|
|
| 1283 | - 'new_item_name' => __('New Place Tag Name', 'geodirectory'),
|
|
| 1284 | - 'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),
|
|
| 1285 | - 'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),
|
|
| 1286 | - 'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),
|
|
| 1287 | - ), |
|
| 1288 | - ); |
|
| 1289 | - |
|
| 1290 | - |
|
| 1291 | - $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1292 | - $geodir_taxonomies['gd_place_tags'] = $gd_placetags; |
|
| 1293 | - update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1294 | - |
|
| 1295 | - |
|
| 1296 | - // Update post types and delete tmp options |
|
| 1297 | - flush_rewrite_rules(); |
|
| 1298 | - |
|
| 1299 | - } |
|
| 1300 | - |
|
| 1301 | - //if ( ! taxonomy_exists('gd_placecategory') )
|
|
| 1302 | - {
|
|
| 1303 | - |
|
| 1304 | - $gd_placecategory = array(); |
|
| 1305 | - $gd_placecategory['object_type'] = 'gd_place'; |
|
| 1306 | - $gd_placecategory['listing_slug'] = $listing_slug; |
|
| 1307 | - $gd_placecategory['args'] = array( |
|
| 1308 | - 'public' => true, |
|
| 1309 | - 'hierarchical' => true, |
|
| 1310 | - 'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),
|
|
| 1311 | - 'query_var' => true, |
|
| 1312 | - 'labels' => array( |
|
| 1313 | - 'name' => __('Place Categories', 'geodirectory'),
|
|
| 1314 | - 'singular_name' => __('Place Category', 'geodirectory'),
|
|
| 1315 | - 'search_items' => __('Search Place Categories', 'geodirectory'),
|
|
| 1316 | - 'popular_items' => __('Popular Place Categories', 'geodirectory'),
|
|
| 1317 | - 'all_items' => __('All Place Categories', 'geodirectory'),
|
|
| 1318 | - 'edit_item' => __('Edit Place Category', 'geodirectory'),
|
|
| 1319 | - 'update_item' => __('Update Place Category', 'geodirectory'),
|
|
| 1320 | - 'add_new_item' => __('Add New Place Category', 'geodirectory'),
|
|
| 1321 | - 'new_item_name' => __('New Place Category', 'geodirectory'),
|
|
| 1322 | - 'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),
|
|
| 1323 | - ), |
|
| 1324 | - ); |
|
| 1325 | - |
|
| 1326 | - |
|
| 1327 | - $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1328 | - $geodir_taxonomies['gd_placecategory'] = $gd_placecategory; |
|
| 1329 | - update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1330 | - |
|
| 1331 | - |
|
| 1332 | - flush_rewrite_rules(); |
|
| 1333 | - } |
|
| 1334 | - |
|
| 1335 | - /** |
|
| 1336 | - * Post Types |
|
| 1337 | - **/ |
|
| 1338 | - |
|
| 1339 | - //if ( ! post_type_exists('gd_place') )
|
|
| 1340 | - {
|
|
| 1341 | - |
|
| 1342 | - $labels = array( |
|
| 1343 | - 'name' => __('Places', 'geodirectory'),
|
|
| 1344 | - 'singular_name' => __('Place', 'geodirectory'),
|
|
| 1345 | - 'add_new' => __('Add New', 'geodirectory'),
|
|
| 1346 | - 'add_new_item' => __('Add New Place', 'geodirectory'),
|
|
| 1347 | - 'edit_item' => __('Edit Place', 'geodirectory'),
|
|
| 1348 | - 'new_item' => __('New Place', 'geodirectory'),
|
|
| 1349 | - 'view_item' => __('View Place', 'geodirectory'),
|
|
| 1350 | - 'search_items' => __('Search Places', 'geodirectory'),
|
|
| 1351 | - 'not_found' => __('No Place Found', 'geodirectory'),
|
|
| 1352 | - 'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));
|
|
| 1353 | - |
|
| 1354 | - $place_default = array( |
|
| 1355 | - 'labels' => $labels, |
|
| 1356 | - 'can_export' => true, |
|
| 1357 | - 'capability_type' => 'post', |
|
| 1358 | - 'description' => 'Place post type.', |
|
| 1359 | - 'has_archive' => $listing_slug, |
|
| 1360 | - 'hierarchical' => false, |
|
| 1361 | - 'map_meta_cap' => true, |
|
| 1362 | - 'menu_icon' => $menu_icon, |
|
| 1363 | - 'public' => true, |
|
| 1364 | - 'query_var' => true, |
|
| 1365 | - 'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
|
|
| 1366 | - 'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),
|
|
| 1367 | - 'taxonomies' => array('gd_placecategory', 'gd_place_tags'));
|
|
| 1368 | - |
|
| 1369 | - //Update custom post types |
|
| 1370 | - $geodir_post_types = get_option('geodir_post_types');
|
|
| 1371 | - $geodir_post_types['gd_place'] = $place_default; |
|
| 1372 | - update_option('geodir_post_types', $geodir_post_types);
|
|
| 1373 | - |
|
| 1374 | - // Update post types and delete tmp options |
|
| 1375 | - flush_rewrite_rules(); |
|
| 1376 | - } |
|
| 1377 | - |
|
| 1378 | - |
|
| 1379 | - geodir_register_taxonomies(); |
|
| 1380 | - geodir_register_post_types(); |
|
| 1381 | - |
|
| 1382 | - //die; |
|
| 1252 | + global $wpdb; |
|
| 1253 | + |
|
| 1254 | + $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico'; |
|
| 1255 | + |
|
| 1256 | + if (!$listing_slug = get_option('geodir_listing_prefix'))
|
|
| 1257 | + $listing_slug = 'places'; |
|
| 1258 | + |
|
| 1259 | + /** |
|
| 1260 | + * Taxonomies |
|
| 1261 | + **/ |
|
| 1262 | + //if ( ! taxonomy_exists('gd_place_tags') )
|
|
| 1263 | + {
|
|
| 1264 | + |
|
| 1265 | + $gd_placetags = array(); |
|
| 1266 | + $gd_placetags['object_type'] = 'gd_place'; |
|
| 1267 | + $gd_placetags['listing_slug'] = $listing_slug . '/tags'; |
|
| 1268 | + $gd_placetags['args'] = array( |
|
| 1269 | + 'public' => true, |
|
| 1270 | + 'hierarchical' => false, |
|
| 1271 | + 'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),
|
|
| 1272 | + 'query_var' => true, |
|
| 1273 | + |
|
| 1274 | + 'labels' => array( |
|
| 1275 | + 'name' => __('Place Tags', 'geodirectory'),
|
|
| 1276 | + 'singular_name' => __('Place Tag', 'geodirectory'),
|
|
| 1277 | + 'search_items' => __('Search Place Tags', 'geodirectory'),
|
|
| 1278 | + 'popular_items' => __('Popular Place Tags', 'geodirectory'),
|
|
| 1279 | + 'all_items' => __('All Place Tags', 'geodirectory'),
|
|
| 1280 | + 'edit_item' => __('Edit Place Tag', 'geodirectory'),
|
|
| 1281 | + 'update_item' => __('Update Place Tag', 'geodirectory'),
|
|
| 1282 | + 'add_new_item' => __('Add New Place Tag', 'geodirectory'),
|
|
| 1283 | + 'new_item_name' => __('New Place Tag Name', 'geodirectory'),
|
|
| 1284 | + 'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),
|
|
| 1285 | + 'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),
|
|
| 1286 | + 'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),
|
|
| 1287 | + ), |
|
| 1288 | + ); |
|
| 1289 | + |
|
| 1290 | + |
|
| 1291 | + $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1292 | + $geodir_taxonomies['gd_place_tags'] = $gd_placetags; |
|
| 1293 | + update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1294 | + |
|
| 1295 | + |
|
| 1296 | + // Update post types and delete tmp options |
|
| 1297 | + flush_rewrite_rules(); |
|
| 1298 | + |
|
| 1299 | + } |
|
| 1300 | + |
|
| 1301 | + //if ( ! taxonomy_exists('gd_placecategory') )
|
|
| 1302 | + {
|
|
| 1303 | + |
|
| 1304 | + $gd_placecategory = array(); |
|
| 1305 | + $gd_placecategory['object_type'] = 'gd_place'; |
|
| 1306 | + $gd_placecategory['listing_slug'] = $listing_slug; |
|
| 1307 | + $gd_placecategory['args'] = array( |
|
| 1308 | + 'public' => true, |
|
| 1309 | + 'hierarchical' => true, |
|
| 1310 | + 'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),
|
|
| 1311 | + 'query_var' => true, |
|
| 1312 | + 'labels' => array( |
|
| 1313 | + 'name' => __('Place Categories', 'geodirectory'),
|
|
| 1314 | + 'singular_name' => __('Place Category', 'geodirectory'),
|
|
| 1315 | + 'search_items' => __('Search Place Categories', 'geodirectory'),
|
|
| 1316 | + 'popular_items' => __('Popular Place Categories', 'geodirectory'),
|
|
| 1317 | + 'all_items' => __('All Place Categories', 'geodirectory'),
|
|
| 1318 | + 'edit_item' => __('Edit Place Category', 'geodirectory'),
|
|
| 1319 | + 'update_item' => __('Update Place Category', 'geodirectory'),
|
|
| 1320 | + 'add_new_item' => __('Add New Place Category', 'geodirectory'),
|
|
| 1321 | + 'new_item_name' => __('New Place Category', 'geodirectory'),
|
|
| 1322 | + 'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),
|
|
| 1323 | + ), |
|
| 1324 | + ); |
|
| 1325 | + |
|
| 1326 | + |
|
| 1327 | + $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1328 | + $geodir_taxonomies['gd_placecategory'] = $gd_placecategory; |
|
| 1329 | + update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1330 | + |
|
| 1331 | + |
|
| 1332 | + flush_rewrite_rules(); |
|
| 1333 | + } |
|
| 1334 | + |
|
| 1335 | + /** |
|
| 1336 | + * Post Types |
|
| 1337 | + **/ |
|
| 1338 | + |
|
| 1339 | + //if ( ! post_type_exists('gd_place') )
|
|
| 1340 | + {
|
|
| 1341 | + |
|
| 1342 | + $labels = array( |
|
| 1343 | + 'name' => __('Places', 'geodirectory'),
|
|
| 1344 | + 'singular_name' => __('Place', 'geodirectory'),
|
|
| 1345 | + 'add_new' => __('Add New', 'geodirectory'),
|
|
| 1346 | + 'add_new_item' => __('Add New Place', 'geodirectory'),
|
|
| 1347 | + 'edit_item' => __('Edit Place', 'geodirectory'),
|
|
| 1348 | + 'new_item' => __('New Place', 'geodirectory'),
|
|
| 1349 | + 'view_item' => __('View Place', 'geodirectory'),
|
|
| 1350 | + 'search_items' => __('Search Places', 'geodirectory'),
|
|
| 1351 | + 'not_found' => __('No Place Found', 'geodirectory'),
|
|
| 1352 | + 'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));
|
|
| 1353 | + |
|
| 1354 | + $place_default = array( |
|
| 1355 | + 'labels' => $labels, |
|
| 1356 | + 'can_export' => true, |
|
| 1357 | + 'capability_type' => 'post', |
|
| 1358 | + 'description' => 'Place post type.', |
|
| 1359 | + 'has_archive' => $listing_slug, |
|
| 1360 | + 'hierarchical' => false, |
|
| 1361 | + 'map_meta_cap' => true, |
|
| 1362 | + 'menu_icon' => $menu_icon, |
|
| 1363 | + 'public' => true, |
|
| 1364 | + 'query_var' => true, |
|
| 1365 | + 'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
|
|
| 1366 | + 'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),
|
|
| 1367 | + 'taxonomies' => array('gd_placecategory', 'gd_place_tags'));
|
|
| 1368 | + |
|
| 1369 | + //Update custom post types |
|
| 1370 | + $geodir_post_types = get_option('geodir_post_types');
|
|
| 1371 | + $geodir_post_types['gd_place'] = $place_default; |
|
| 1372 | + update_option('geodir_post_types', $geodir_post_types);
|
|
| 1373 | + |
|
| 1374 | + // Update post types and delete tmp options |
|
| 1375 | + flush_rewrite_rules(); |
|
| 1376 | + } |
|
| 1377 | + |
|
| 1378 | + |
|
| 1379 | + geodir_register_taxonomies(); |
|
| 1380 | + geodir_register_post_types(); |
|
| 1381 | + |
|
| 1382 | + //die; |
|
| 1383 | 1383 | |
| 1384 | 1384 | } |
| 1385 | 1385 | |
| 1386 | 1386 | $gd_wpml_get_languages = ""; |
| 1387 | 1387 | function gd_wpml_get_lang_from_url($url) {
|
| 1388 | - global $sitepress, $gd_wpml_get_languages; |
|
| 1388 | + global $sitepress, $gd_wpml_get_languages; |
|
| 1389 | 1389 | |
| 1390 | - if (geodir_is_wpml()) {
|
|
| 1391 | - return $sitepress->get_language_from_url($url); |
|
| 1392 | - } |
|
| 1390 | + if (geodir_is_wpml()) {
|
|
| 1391 | + return $sitepress->get_language_from_url($url); |
|
| 1392 | + } |
|
| 1393 | 1393 | |
| 1394 | - if (isset($_REQUEST['lang']) && $_REQUEST['lang']) {
|
|
| 1395 | - return $_REQUEST['lang']; |
|
| 1396 | - } |
|
| 1394 | + if (isset($_REQUEST['lang']) && $_REQUEST['lang']) {
|
|
| 1395 | + return $_REQUEST['lang']; |
|
| 1396 | + } |
|
| 1397 | 1397 | |
| 1398 | - $url = str_replace(array("http://","https://"),"",$url);
|
|
| 1398 | + $url = str_replace(array("http://","https://"),"",$url);
|
|
| 1399 | 1399 | |
| 1400 | - // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.
|
|
| 1401 | - $site_url = str_replace(array("http://","https://"),"",site_url());
|
|
| 1400 | + // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.
|
|
| 1401 | + $site_url = str_replace(array("http://","https://"),"",site_url());
|
|
| 1402 | 1402 | |
| 1403 | - $url = str_replace($site_url,"",$url); |
|
| 1403 | + $url = str_replace($site_url,"",$url); |
|
| 1404 | 1404 | |
| 1405 | - $segments = explode('/', trim($url, '/'));
|
|
| 1405 | + $segments = explode('/', trim($url, '/'));
|
|
| 1406 | 1406 | |
| 1407 | - if ($gd_wpml_get_languages) {
|
|
| 1408 | - $langs = $gd_wpml_get_languages; |
|
| 1409 | - } else {
|
|
| 1410 | - $gd_wpml_get_languages = $sitepress->get_active_languages(); |
|
| 1411 | - } |
|
| 1407 | + if ($gd_wpml_get_languages) {
|
|
| 1408 | + $langs = $gd_wpml_get_languages; |
|
| 1409 | + } else {
|
|
| 1410 | + $gd_wpml_get_languages = $sitepress->get_active_languages(); |
|
| 1411 | + } |
|
| 1412 | 1412 | |
| 1413 | - if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {
|
|
| 1414 | - return $segments[0]; |
|
| 1415 | - } |
|
| 1413 | + if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {
|
|
| 1414 | + return $segments[0]; |
|
| 1415 | + } |
|
| 1416 | 1416 | |
| 1417 | - return false; |
|
| 1417 | + return false; |
|
| 1418 | 1418 | } |
| 1419 | 1419 | |
| 1420 | 1420 | function gd_wpml_slug_translation_turned_on($post_type) {
|
| 1421 | 1421 | |
| 1422 | - global $sitepress; |
|
| 1423 | - $settings = $sitepress->get_settings(); |
|
| 1424 | - return isset($settings['posts_slug_translation']['types'][$post_type]) |
|
| 1425 | - && $settings['posts_slug_translation']['types'][$post_type] |
|
| 1426 | - && isset($settings['posts_slug_translation']['on']) |
|
| 1427 | - && $settings['posts_slug_translation']['on']; |
|
| 1422 | + global $sitepress; |
|
| 1423 | + $settings = $sitepress->get_settings(); |
|
| 1424 | + return isset($settings['posts_slug_translation']['types'][$post_type]) |
|
| 1425 | + && $settings['posts_slug_translation']['types'][$post_type] |
|
| 1426 | + && isset($settings['posts_slug_translation']['on']) |
|
| 1427 | + && $settings['posts_slug_translation']['on']; |
|
| 1428 | 1428 | } |
| 1429 | 1429 | |
| 1430 | 1430 | |
@@ -1451,158 +1451,158 @@ discard block |
||
| 1451 | 1451 | */ |
| 1452 | 1452 | function geodir_listing_permalink_structure($post_link, $post_obj, $leavename, $sample) |
| 1453 | 1453 | {
|
| 1454 | - //echo $post_link."<br />".$sample ; |
|
| 1454 | + //echo $post_link."<br />".$sample ; |
|
| 1455 | 1455 | |
| 1456 | 1456 | |
| 1457 | - global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache; |
|
| 1458 | - if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {
|
|
| 1459 | - } elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {
|
|
| 1460 | - return $post_link; |
|
| 1461 | - } else {
|
|
| 1462 | - $orig_post = $post; |
|
| 1463 | - $post = $post_obj; |
|
| 1464 | - } |
|
| 1457 | + global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache; |
|
| 1458 | + if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {
|
|
| 1459 | + } elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {
|
|
| 1460 | + return $post_link; |
|
| 1461 | + } else {
|
|
| 1462 | + $orig_post = $post; |
|
| 1463 | + $post = $post_obj; |
|
| 1464 | + } |
|
| 1465 | 1465 | |
| 1466 | - if (in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 1466 | + if (in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 1467 | 1467 | |
| 1468 | - // if we dont have a GD post then try to grab it |
|
| 1469 | - if(!isset($post->default_category)){
|
|
| 1470 | - $gd_post = geodir_get_post_info($post->ID); |
|
| 1471 | - if(!empty($gd_post)){
|
|
| 1472 | - $post = $gd_post; |
|
| 1473 | - } |
|
| 1474 | - } |
|
| 1468 | + // if we dont have a GD post then try to grab it |
|
| 1469 | + if(!isset($post->default_category)){
|
|
| 1470 | + $gd_post = geodir_get_post_info($post->ID); |
|
| 1471 | + if(!empty($gd_post)){
|
|
| 1472 | + $post = $gd_post; |
|
| 1473 | + } |
|
| 1474 | + } |
|
| 1475 | 1475 | |
| 1476 | 1476 | |
| 1477 | - $post_types = get_option('geodir_post_types');
|
|
| 1478 | - $slug = $post_types[$post->post_type]['rewrite']['slug']; |
|
| 1477 | + $post_types = get_option('geodir_post_types');
|
|
| 1478 | + $slug = $post_types[$post->post_type]['rewrite']['slug']; |
|
| 1479 | 1479 | |
| 1480 | - // Alter the CPT slug if WPML is set to do so |
|
| 1481 | - if(geodir_wpml_is_post_type_translated($post->post_type)){
|
|
| 1482 | - if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
|
|
| 1480 | + // Alter the CPT slug if WPML is set to do so |
|
| 1481 | + if(geodir_wpml_is_post_type_translated($post->post_type)){
|
|
| 1482 | + if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
|
|
| 1483 | 1483 | |
| 1484 | - $org_slug = $slug; |
|
| 1485 | - $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1486 | - $slug, |
|
| 1487 | - 'WordPress', |
|
| 1488 | - 'URL slug: ' . $slug, |
|
| 1489 | - $language_code); |
|
| 1484 | + $org_slug = $slug; |
|
| 1485 | + $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1486 | + $slug, |
|
| 1487 | + 'WordPress', |
|
| 1488 | + 'URL slug: ' . $slug, |
|
| 1489 | + $language_code); |
|
| 1490 | 1490 | |
| 1491 | - if(!$slug){$slug = $org_slug;}
|
|
| 1491 | + if(!$slug){$slug = $org_slug;}
|
|
| 1492 | 1492 | |
| 1493 | - } |
|
| 1494 | - } |
|
| 1493 | + } |
|
| 1494 | + } |
|
| 1495 | 1495 | |
| 1496 | - if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1497 | - remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 1498 | - } |
|
| 1496 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1497 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 1498 | + } |
|
| 1499 | 1499 | |
| 1500 | - // Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz. |
|
| 1501 | - $site_url = trailingslashit(get_bloginfo('url'));
|
|
| 1500 | + // Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz. |
|
| 1501 | + $site_url = trailingslashit(get_bloginfo('url'));
|
|
| 1502 | 1502 | |
| 1503 | - if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1504 | - add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 1505 | - } |
|
| 1506 | - |
|
| 1507 | - $fix_url = strpos($post_link, $site_url) === 0 ? true : false; |
|
| 1508 | - if ($fix_url) {
|
|
| 1509 | - $post_link = str_replace($site_url, '', $post_link); |
|
| 1510 | - } |
|
| 1511 | - |
|
| 1512 | - $post_link = trailingslashit( |
|
| 1513 | - preg_replace( "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 ) |
|
| 1514 | - ); |
|
| 1515 | - |
|
| 1516 | - if ($fix_url) {
|
|
| 1517 | - $post_link = $site_url . $post_link; |
|
| 1518 | - } |
|
| 1519 | - |
|
| 1520 | - if (isset($comment_post_cache[$post->ID])) {
|
|
| 1521 | - $post = $comment_post_cache[$post->ID]; |
|
| 1522 | - } |
|
| 1523 | - if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {
|
|
| 1524 | - $post_id = $post->ID; |
|
| 1525 | - if (isset($orig_post)) {
|
|
| 1526 | - $post = $orig_post; |
|
| 1527 | - } |
|
| 1528 | - return $gd_permalink_cache[$post_id]; |
|
| 1529 | - } |
|
| 1503 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1504 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 1505 | + } |
|
| 1530 | 1506 | |
| 1531 | - if (!isset($post->post_locations)) {
|
|
| 1532 | - $post_type = $post->post_type; |
|
| 1533 | - $ID = $post->ID; |
|
| 1534 | - $post2 = $wpdb->get_row( |
|
| 1535 | - $wpdb->prepare( |
|
| 1536 | - "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1537 | - array($post->ID) |
|
| 1538 | - ) |
|
| 1539 | - ); |
|
| 1507 | + $fix_url = strpos($post_link, $site_url) === 0 ? true : false; |
|
| 1508 | + if ($fix_url) {
|
|
| 1509 | + $post_link = str_replace($site_url, '', $post_link); |
|
| 1510 | + } |
|
| 1540 | 1511 | |
| 1541 | - $post = (object)array_merge((array)$post, (array)$post2); |
|
| 1512 | + $post_link = trailingslashit( |
|
| 1513 | + preg_replace( "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 ) |
|
| 1514 | + ); |
|
| 1542 | 1515 | |
| 1543 | - $comment_post_cache[$post->ID] = $post; |
|
| 1544 | - } |
|
| 1516 | + if ($fix_url) {
|
|
| 1517 | + $post_link = $site_url . $post_link; |
|
| 1518 | + } |
|
| 1545 | 1519 | |
| 1520 | + if (isset($comment_post_cache[$post->ID])) {
|
|
| 1521 | + $post = $comment_post_cache[$post->ID]; |
|
| 1522 | + } |
|
| 1523 | + if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {
|
|
| 1524 | + $post_id = $post->ID; |
|
| 1525 | + if (isset($orig_post)) {
|
|
| 1526 | + $post = $orig_post; |
|
| 1527 | + } |
|
| 1528 | + return $gd_permalink_cache[$post_id]; |
|
| 1529 | + } |
|
| 1546 | 1530 | |
| 1531 | + if (!isset($post->post_locations)) {
|
|
| 1532 | + $post_type = $post->post_type; |
|
| 1533 | + $ID = $post->ID; |
|
| 1534 | + $post2 = $wpdb->get_row( |
|
| 1535 | + $wpdb->prepare( |
|
| 1536 | + "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1537 | + array($post->ID) |
|
| 1538 | + ) |
|
| 1539 | + ); |
|
| 1547 | 1540 | |
| 1548 | - if (false !== strpos($post_link, '%gd_taxonomy%')) {
|
|
| 1541 | + $post = (object)array_merge((array)$post, (array)$post2); |
|
| 1549 | 1542 | |
| 1550 | - if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {
|
|
| 1551 | - $location_request = ''; |
|
| 1543 | + $comment_post_cache[$post->ID] = $post; |
|
| 1544 | + } |
|
| 1552 | 1545 | |
| 1553 | 1546 | |
| 1554 | - if (!empty($post->post_locations)) {
|
|
| 1555 | - $geodir_arr_locations = explode(',', $post->post_locations);
|
|
| 1556 | - if (count($geodir_arr_locations) == 3) {
|
|
| 1557 | - $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1558 | - $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1559 | - $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1560 | - $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1561 | - $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1562 | - $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1563 | 1547 | |
| 1564 | - $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1565 | - 'region_slug' => $post->region_slug, |
|
| 1566 | - 'city_slug' => $post->city_slug |
|
| 1567 | - ); |
|
| 1548 | + if (false !== strpos($post_link, '%gd_taxonomy%')) {
|
|
| 1568 | 1549 | |
| 1569 | - } else |
|
| 1570 | - $post_location = geodir_get_location(); |
|
| 1550 | + if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {
|
|
| 1551 | + $location_request = ''; |
|
| 1571 | 1552 | |
| 1572 | 1553 | |
| 1573 | - } else {
|
|
| 1554 | + if (!empty($post->post_locations)) {
|
|
| 1555 | + $geodir_arr_locations = explode(',', $post->post_locations);
|
|
| 1556 | + if (count($geodir_arr_locations) == 3) {
|
|
| 1557 | + $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1558 | + $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1559 | + $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1560 | + $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1561 | + $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1562 | + $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1574 | 1563 | |
| 1575 | - $post_location_sql = $wpdb->get_results( |
|
| 1576 | - $wpdb->prepare( |
|
| 1577 | - "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1578 | - array($post->ID) |
|
| 1579 | - ) |
|
| 1580 | - ); |
|
| 1581 | - |
|
| 1582 | - if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {
|
|
| 1583 | - |
|
| 1584 | - $geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);
|
|
| 1585 | - if (count($geodir_arr_locations) == 3) {
|
|
| 1586 | - $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1587 | - $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1588 | - $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1589 | - $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1590 | - $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1591 | - $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1592 | - |
|
| 1593 | - $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1594 | - 'region_slug' => $post->region_slug, |
|
| 1595 | - 'city_slug' => $post->city_slug |
|
| 1596 | - ); |
|
| 1564 | + $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1565 | + 'region_slug' => $post->region_slug, |
|
| 1566 | + 'city_slug' => $post->city_slug |
|
| 1567 | + ); |
|
| 1597 | 1568 | |
| 1598 | - } |
|
| 1599 | - } else |
|
| 1600 | - $post_location = geodir_get_location(); |
|
| 1601 | - } |
|
| 1569 | + } else |
|
| 1570 | + $post_location = geodir_get_location(); |
|
| 1571 | + |
|
| 1572 | + |
|
| 1573 | + } else {
|
|
| 1574 | + |
|
| 1575 | + $post_location_sql = $wpdb->get_results( |
|
| 1576 | + $wpdb->prepare( |
|
| 1577 | + "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1578 | + array($post->ID) |
|
| 1579 | + ) |
|
| 1580 | + ); |
|
| 1581 | + |
|
| 1582 | + if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {
|
|
| 1583 | + |
|
| 1584 | + $geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);
|
|
| 1585 | + if (count($geodir_arr_locations) == 3) {
|
|
| 1586 | + $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1587 | + $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1588 | + $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1589 | + $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1590 | + $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1591 | + $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1592 | + |
|
| 1593 | + $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1594 | + 'region_slug' => $post->region_slug, |
|
| 1595 | + 'city_slug' => $post->city_slug |
|
| 1596 | + ); |
|
| 1597 | + |
|
| 1598 | + } |
|
| 1599 | + } else |
|
| 1600 | + $post_location = geodir_get_location(); |
|
| 1601 | + } |
|
| 1602 | 1602 | |
| 1603 | 1603 | |
| 1604 | - if (!empty($post_location)) {
|
|
| 1605 | - $country_slug = isset($post_location->country_slug) ? $post_location->country_slug : ''; |
|
| 1604 | + if (!empty($post_location)) {
|
|
| 1605 | + $country_slug = isset($post_location->country_slug) ? $post_location->country_slug : ''; |
|
| 1606 | 1606 | $region_slug = isset($post_location->region_slug) ? $post_location->region_slug : ''; |
| 1607 | 1607 | $city_slug = isset($post_location->city_slug) ? $post_location->city_slug : ''; |
| 1608 | 1608 | |
@@ -1620,88 +1620,88 @@ discard block |
||
| 1620 | 1620 | $location_slug[] = $city_slug; |
| 1621 | 1621 | |
| 1622 | 1622 | $location_request .= implode('/', $location_slug) . '/';
|
| 1623 | - } |
|
| 1624 | - } |
|
| 1623 | + } |
|
| 1624 | + } |
|
| 1625 | 1625 | |
| 1626 | - if (get_option('geodir_add_categories_url')) {
|
|
| 1626 | + if (get_option('geodir_add_categories_url')) {
|
|
| 1627 | 1627 | |
| 1628 | - $term_request = ''; |
|
| 1629 | - $taxonomies = geodir_get_taxonomies($post->post_type); |
|
| 1630 | - $taxonomies = !empty($taxonomies) && is_array($taxonomies) ? end($taxonomies) : ''; |
|
| 1628 | + $term_request = ''; |
|
| 1629 | + $taxonomies = geodir_get_taxonomies($post->post_type); |
|
| 1630 | + $taxonomies = !empty($taxonomies) && is_array($taxonomies) ? end($taxonomies) : ''; |
|
| 1631 | 1631 | |
| 1632 | - if (!empty($post->default_category)) {
|
|
| 1633 | - $post_terms = $post->default_category; |
|
| 1634 | - } else {
|
|
| 1635 | - $post_terms = ''; |
|
| 1636 | - |
|
| 1637 | - if(isset($_POST['post_default_category']) && $_POST['post_default_category']){
|
|
| 1638 | - $post_terms = absint($_POST['post_default_category']); |
|
| 1639 | - }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {
|
|
| 1640 | - $post_terms = is_array($_POST['post_category'][$taxonomies]) ? $_POST['post_category'][$taxonomies] : explode(",", trim($_POST['post_category'][$taxonomies], ","));
|
|
| 1641 | - $post_terms = !empty($post_terms) ? absint($post_terms[0]) : 0; |
|
| 1642 | - }elseif (isset($post->{$taxonomies})) {
|
|
| 1643 | - $post_terms = explode(",", trim($post->{$taxonomies}, ","));
|
|
| 1644 | - $post_terms = $post_terms[0]; |
|
| 1645 | - } |
|
| 1632 | + if (!empty($post->default_category)) {
|
|
| 1633 | + $post_terms = $post->default_category; |
|
| 1634 | + } else {
|
|
| 1635 | + $post_terms = ''; |
|
| 1636 | + |
|
| 1637 | + if(isset($_POST['post_default_category']) && $_POST['post_default_category']){
|
|
| 1638 | + $post_terms = absint($_POST['post_default_category']); |
|
| 1639 | + }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {
|
|
| 1640 | + $post_terms = is_array($_POST['post_category'][$taxonomies]) ? $_POST['post_category'][$taxonomies] : explode(",", trim($_POST['post_category'][$taxonomies], ","));
|
|
| 1641 | + $post_terms = !empty($post_terms) ? absint($post_terms[0]) : 0; |
|
| 1642 | + }elseif (isset($post->{$taxonomies})) {
|
|
| 1643 | + $post_terms = explode(",", trim($post->{$taxonomies}, ","));
|
|
| 1644 | + $post_terms = $post_terms[0]; |
|
| 1645 | + } |
|
| 1646 | 1646 | |
| 1647 | - if (!$post_terms) |
|
| 1648 | - $post_terms = geodir_get_post_meta($post->ID, 'default_category', true); |
|
| 1647 | + if (!$post_terms) |
|
| 1648 | + $post_terms = geodir_get_post_meta($post->ID, 'default_category', true); |
|
| 1649 | 1649 | |
| 1650 | - if (!$post_terms) {
|
|
| 1651 | - $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true); |
|
| 1650 | + if (!$post_terms) {
|
|
| 1651 | + $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true); |
|
| 1652 | 1652 | |
| 1653 | - if ($post_terms) {
|
|
| 1654 | - $post_terms = explode(",", trim($post_terms, ","));
|
|
| 1655 | - $post_terms = $post_terms[0]; |
|
| 1656 | - } |
|
| 1657 | - } |
|
| 1658 | - } |
|
| 1653 | + if ($post_terms) {
|
|
| 1654 | + $post_terms = explode(",", trim($post_terms, ","));
|
|
| 1655 | + $post_terms = $post_terms[0]; |
|
| 1656 | + } |
|
| 1657 | + } |
|
| 1658 | + } |
|
| 1659 | 1659 | |
| 1660 | - $term = get_term_by('id', $post_terms, $taxonomies);
|
|
| 1660 | + $term = get_term_by('id', $post_terms, $taxonomies);
|
|
| 1661 | 1661 | |
| 1662 | - if (!empty($term)) |
|
| 1663 | - $term_request = $term->slug; |
|
| 1664 | - //$term_request = $term->slug.'/'; |
|
| 1665 | - } |
|
| 1662 | + if (!empty($term)) |
|
| 1663 | + $term_request = $term->slug; |
|
| 1664 | + //$term_request = $term->slug.'/'; |
|
| 1665 | + } |
|
| 1666 | 1666 | |
| 1667 | - $request_term = ''; |
|
| 1668 | - $listingurl_separator = ''; |
|
| 1669 | - //$detailurl_separator = get_option('geodir_detailurl_separator');
|
|
| 1670 | - $detailurl_separator = ''; |
|
| 1671 | - if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {
|
|
| 1672 | - $request_term = $location_request; |
|
| 1673 | - //$listingurl_separator = get_option('geodir_listingurl_separator');
|
|
| 1674 | - //$request_term .= $listingurl_separator.'/'.$term_request; |
|
| 1675 | - $request_term .= $term_request; |
|
| 1667 | + $request_term = ''; |
|
| 1668 | + $listingurl_separator = ''; |
|
| 1669 | + //$detailurl_separator = get_option('geodir_detailurl_separator');
|
|
| 1670 | + $detailurl_separator = ''; |
|
| 1671 | + if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {
|
|
| 1672 | + $request_term = $location_request; |
|
| 1673 | + //$listingurl_separator = get_option('geodir_listingurl_separator');
|
|
| 1674 | + //$request_term .= $listingurl_separator.'/'.$term_request; |
|
| 1675 | + $request_term .= $term_request; |
|
| 1676 | 1676 | |
| 1677 | - } else {
|
|
| 1678 | - if (isset($location_request) && $location_request != '') $request_term = $location_request; |
|
| 1677 | + } else {
|
|
| 1678 | + if (isset($location_request) && $location_request != '') $request_term = $location_request; |
|
| 1679 | 1679 | |
| 1680 | - if (isset($term_request) && $term_request != '') $request_term .= $term_request; |
|
| 1681 | - } |
|
| 1682 | - $request_term = trim($request_term, '/'); |
|
| 1680 | + if (isset($term_request) && $term_request != '') $request_term .= $term_request; |
|
| 1681 | + } |
|
| 1682 | + $request_term = trim($request_term, '/'); |
|
| 1683 | 1683 | |
| 1684 | - // Fix with WPML the location terms added twice when CPT slug is translated. |
|
| 1685 | - if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {
|
|
| 1686 | - $post_link = str_replace('%gd_taxonomy%/', '', $post_link);
|
|
| 1687 | - } |
|
| 1684 | + // Fix with WPML the location terms added twice when CPT slug is translated. |
|
| 1685 | + if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {
|
|
| 1686 | + $post_link = str_replace('%gd_taxonomy%/', '', $post_link);
|
|
| 1687 | + } |
|
| 1688 | 1688 | |
| 1689 | - if (!empty($request_term)) |
|
| 1690 | - $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1691 | - else |
|
| 1692 | - $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1693 | - //echo $post_link ; |
|
| 1694 | - } |
|
| 1695 | - // temp cache the permalink |
|
| 1696 | - if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {
|
|
| 1697 | - $gd_permalink_cache[$post->ID] = $post_link; |
|
| 1698 | - } |
|
| 1699 | - } |
|
| 1700 | - if (isset($orig_post)) {
|
|
| 1701 | - $post = $orig_post; |
|
| 1702 | - } |
|
| 1703 | - |
|
| 1704 | - return $post_link; |
|
| 1689 | + if (!empty($request_term)) |
|
| 1690 | + $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1691 | + else |
|
| 1692 | + $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1693 | + //echo $post_link ; |
|
| 1694 | + } |
|
| 1695 | + // temp cache the permalink |
|
| 1696 | + if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {
|
|
| 1697 | + $gd_permalink_cache[$post->ID] = $post_link; |
|
| 1698 | + } |
|
| 1699 | + } |
|
| 1700 | + if (isset($orig_post)) {
|
|
| 1701 | + $post = $orig_post; |
|
| 1702 | + } |
|
| 1703 | + |
|
| 1704 | + return $post_link; |
|
| 1705 | 1705 | } |
| 1706 | 1706 | |
| 1707 | 1707 | /** |
@@ -1717,117 +1717,117 @@ discard block |
||
| 1717 | 1717 | * @return string The term link. |
| 1718 | 1718 | */ |
| 1719 | 1719 | function geodir_term_link($termlink, $term, $taxonomy) {
|
| 1720 | - $geodir_taxonomies = geodir_get_taxonomies('', true);
|
|
| 1720 | + $geodir_taxonomies = geodir_get_taxonomies('', true);
|
|
| 1721 | 1721 | |
| 1722 | - if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {
|
|
| 1723 | - global $geodir_add_location_url, $gd_session; |
|
| 1724 | - $include_location = false; |
|
| 1725 | - $request_term = array(); |
|
| 1726 | - $add_location_url = get_option('geodir_add_location_url');
|
|
| 1727 | - $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 1722 | + if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {
|
|
| 1723 | + global $geodir_add_location_url, $gd_session; |
|
| 1724 | + $include_location = false; |
|
| 1725 | + $request_term = array(); |
|
| 1726 | + $add_location_url = get_option('geodir_add_location_url');
|
|
| 1727 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 1728 | 1728 | |
| 1729 | - $listing_slug = geodir_get_listing_slug($taxonomy); |
|
| 1729 | + $listing_slug = geodir_get_listing_slug($taxonomy); |
|
| 1730 | 1730 | |
| 1731 | - if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {
|
|
| 1732 | - if ($geodir_add_location_url && $add_location_url) {
|
|
| 1733 | - $include_location = true; |
|
| 1734 | - } |
|
| 1735 | - } elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {
|
|
| 1736 | - $include_location = true; |
|
| 1737 | - } elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {
|
|
| 1738 | - $include_location = true; |
|
| 1739 | - } |
|
| 1740 | - |
|
| 1741 | - if ($include_location) {
|
|
| 1742 | - global $post; |
|
| 1743 | - $location_terms = array(); |
|
| 1731 | + if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {
|
|
| 1732 | + if ($geodir_add_location_url && $add_location_url) {
|
|
| 1733 | + $include_location = true; |
|
| 1734 | + } |
|
| 1735 | + } elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {
|
|
| 1736 | + $include_location = true; |
|
| 1737 | + } elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {
|
|
| 1738 | + $include_location = true; |
|
| 1739 | + } |
|
| 1740 | + |
|
| 1741 | + if ($include_location) {
|
|
| 1742 | + global $post; |
|
| 1743 | + $location_terms = array(); |
|
| 1744 | 1744 | |
| 1745 | - $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 1745 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 1746 | 1746 | |
| 1747 | - if (geodir_is_page('detail')) {
|
|
| 1748 | - if (!isset($post->country_slug) && !empty($post->post_locations)) {
|
|
| 1749 | - $post_locations = explode(',', $post->post_locations);
|
|
| 1750 | - |
|
| 1751 | - if (count($post_locations) == 3) {
|
|
| 1752 | - $post->city_slug = str_replace('[', '', $post_locations[0]);
|
|
| 1753 | - $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1754 | - $post->region_slug = str_replace('[', '', $post_locations[1]);
|
|
| 1755 | - $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1756 | - $post->country_slug = str_replace('[', '', $post_locations[2]);
|
|
| 1757 | - $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1758 | - } |
|
| 1759 | - } |
|
| 1747 | + if (geodir_is_page('detail')) {
|
|
| 1748 | + if (!isset($post->country_slug) && !empty($post->post_locations)) {
|
|
| 1749 | + $post_locations = explode(',', $post->post_locations);
|
|
| 1750 | + |
|
| 1751 | + if (count($post_locations) == 3) {
|
|
| 1752 | + $post->city_slug = str_replace('[', '', $post_locations[0]);
|
|
| 1753 | + $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1754 | + $post->region_slug = str_replace('[', '', $post_locations[1]);
|
|
| 1755 | + $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1756 | + $post->country_slug = str_replace('[', '', $post_locations[2]);
|
|
| 1757 | + $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1758 | + } |
|
| 1759 | + } |
|
| 1760 | 1760 | |
| 1761 | - if (isset($post->country_slug)) {
|
|
| 1762 | - $location_terms = array( |
|
| 1763 | - 'gd_country' => $post->country_slug, |
|
| 1764 | - 'gd_region' => $post->region_slug, |
|
| 1765 | - 'gd_city' => $post->city_slug |
|
| 1766 | - ); |
|
| 1761 | + if (isset($post->country_slug)) {
|
|
| 1762 | + $location_terms = array( |
|
| 1763 | + 'gd_country' => $post->country_slug, |
|
| 1764 | + 'gd_region' => $post->region_slug, |
|
| 1765 | + 'gd_city' => $post->city_slug |
|
| 1766 | + ); |
|
| 1767 | 1767 | |
| 1768 | - if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
|
|
| 1769 | - $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; |
|
| 1770 | - } |
|
| 1771 | - } |
|
| 1772 | - } |
|
| 1768 | + if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
|
|
| 1769 | + $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; |
|
| 1770 | + } |
|
| 1771 | + } |
|
| 1772 | + } |
|
| 1773 | 1773 | |
| 1774 | - if (empty($location_terms)) {
|
|
| 1775 | - $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1776 | - } |
|
| 1774 | + if (empty($location_terms)) {
|
|
| 1775 | + $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1776 | + } |
|
| 1777 | 1777 | |
| 1778 | - $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1779 | - $location_terms = geodir_remove_location_terms($location_terms); |
|
| 1778 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1779 | + $location_terms = geodir_remove_location_terms($location_terms); |
|
| 1780 | 1780 | |
| 1781 | - if (!empty($location_terms)) {
|
|
| 1782 | - $url_separator = ''; |
|
| 1781 | + if (!empty($location_terms)) {
|
|
| 1782 | + $url_separator = ''; |
|
| 1783 | 1783 | |
| 1784 | - if (get_option('permalink_structure') != '') {
|
|
| 1785 | - $old_listing_slug = '/' . $listing_slug . '/'; |
|
| 1786 | - $request_term = implode("/", $location_terms);
|
|
| 1787 | - $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/'; |
|
| 1784 | + if (get_option('permalink_structure') != '') {
|
|
| 1785 | + $old_listing_slug = '/' . $listing_slug . '/'; |
|
| 1786 | + $request_term = implode("/", $location_terms);
|
|
| 1787 | + $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/'; |
|
| 1788 | 1788 | |
| 1789 | - $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug)); |
|
| 1790 | - } else {
|
|
| 1791 | - $termlink = geodir_getlink($termlink, $request_term); |
|
| 1792 | - } |
|
| 1793 | - } |
|
| 1794 | - } |
|
| 1789 | + $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug)); |
|
| 1790 | + } else {
|
|
| 1791 | + $termlink = geodir_getlink($termlink, $request_term); |
|
| 1792 | + } |
|
| 1793 | + } |
|
| 1794 | + } |
|
| 1795 | 1795 | |
| 1796 | - // Alter the CPT slug is WPML is set to do so |
|
| 1797 | - /* we can replace this with the below function |
|
| 1796 | + // Alter the CPT slug is WPML is set to do so |
|
| 1797 | + /* we can replace this with the below function |
|
| 1798 | 1798 | if(geodir_is_wpml()){
|
| 1799 | 1799 | global $sitepress; |
| 1800 | 1800 | $post_type = str_replace("category","",$taxonomy);
|
| 1801 | 1801 | $termlink = $sitepress->post_type_archive_link_filter( $termlink, $post_type); |
| 1802 | 1802 | }*/ |
| 1803 | 1803 | |
| 1804 | - // Alter the CPT slug if WPML is set to do so |
|
| 1805 | - if (geodir_is_wpml()) {
|
|
| 1806 | - $post_types = get_option('geodir_post_types');
|
|
| 1807 | - $post_type = str_replace("category","",$taxonomy);
|
|
| 1808 | - $post_type = str_replace("_tags","",$post_type);
|
|
| 1809 | - $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1810 | - if (geodir_wpml_is_post_type_translated($post_type) && gd_wpml_slug_translation_turned_on($post_type)) {
|
|
| 1811 | - global $sitepress; |
|
| 1812 | - $default_lang = $sitepress->get_default_language(); |
|
| 1813 | - $language_code = gd_wpml_get_lang_from_url($termlink); |
|
| 1814 | - if (!$language_code ) {
|
|
| 1815 | - $language_code = $default_lang; |
|
| 1816 | - } |
|
| 1804 | + // Alter the CPT slug if WPML is set to do so |
|
| 1805 | + if (geodir_is_wpml()) {
|
|
| 1806 | + $post_types = get_option('geodir_post_types');
|
|
| 1807 | + $post_type = str_replace("category","",$taxonomy);
|
|
| 1808 | + $post_type = str_replace("_tags","",$post_type);
|
|
| 1809 | + $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1810 | + if (geodir_wpml_is_post_type_translated($post_type) && gd_wpml_slug_translation_turned_on($post_type)) {
|
|
| 1811 | + global $sitepress; |
|
| 1812 | + $default_lang = $sitepress->get_default_language(); |
|
| 1813 | + $language_code = gd_wpml_get_lang_from_url($termlink); |
|
| 1814 | + if (!$language_code ) {
|
|
| 1815 | + $language_code = $default_lang; |
|
| 1816 | + } |
|
| 1817 | 1817 | |
| 1818 | - $org_slug = $slug; |
|
| 1819 | - $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);
|
|
| 1818 | + $org_slug = $slug; |
|
| 1819 | + $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);
|
|
| 1820 | 1820 | |
| 1821 | - if (!$slug) {
|
|
| 1822 | - $slug = $org_slug; |
|
| 1823 | - } |
|
| 1821 | + if (!$slug) {
|
|
| 1822 | + $slug = $org_slug; |
|
| 1823 | + } |
|
| 1824 | 1824 | |
| 1825 | - $termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug ,$termlink, 1));
|
|
| 1826 | - } |
|
| 1827 | - } |
|
| 1828 | - } |
|
| 1825 | + $termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug ,$termlink, 1));
|
|
| 1826 | + } |
|
| 1827 | + } |
|
| 1828 | + } |
|
| 1829 | 1829 | |
| 1830 | - return $termlink; |
|
| 1830 | + return $termlink; |
|
| 1831 | 1831 | } |
| 1832 | 1832 | |
| 1833 | 1833 | /** |
@@ -1853,14 +1853,14 @@ discard block |
||
| 1853 | 1853 | if (in_array($post_type, geodir_get_posttypes())) {
|
| 1854 | 1854 | if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {
|
| 1855 | 1855 | if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {
|
| 1856 | - $location_terms = array( |
|
| 1857 | - 'gd_country' => $post->country_slug, |
|
| 1858 | - 'gd_region' => $post->region_slug, |
|
| 1859 | - 'gd_city' => $post->city_slug |
|
| 1860 | - ); |
|
| 1861 | - } else {
|
|
| 1862 | - $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1863 | - } |
|
| 1856 | + $location_terms = array( |
|
| 1857 | + 'gd_country' => $post->country_slug, |
|
| 1858 | + 'gd_region' => $post->region_slug, |
|
| 1859 | + 'gd_city' => $post->city_slug |
|
| 1860 | + ); |
|
| 1861 | + } else {
|
|
| 1862 | + $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1863 | + } |
|
| 1864 | 1864 | |
| 1865 | 1865 | $location_terms = geodir_remove_location_terms($location_terms); |
| 1866 | 1866 | |
@@ -1892,17 +1892,17 @@ discard block |
||
| 1892 | 1892 | * @return void|string Label. |
| 1893 | 1893 | */ |
| 1894 | 1894 | function get_post_type_singular_label($post_type, $echo = false, $translate = false) {
|
| 1895 | - $obj_post_type = get_post_type_object($post_type); |
|
| 1896 | - if (!is_object($obj_post_type)) {
|
|
| 1897 | - return; |
|
| 1898 | - } |
|
| 1895 | + $obj_post_type = get_post_type_object($post_type); |
|
| 1896 | + if (!is_object($obj_post_type)) {
|
|
| 1897 | + return; |
|
| 1898 | + } |
|
| 1899 | 1899 | |
| 1900 | - $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name; |
|
| 1900 | + $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name; |
|
| 1901 | 1901 | |
| 1902 | - if ($echo) |
|
| 1903 | - echo $label; |
|
| 1904 | - else |
|
| 1905 | - return $label; |
|
| 1902 | + if ($echo) |
|
| 1903 | + echo $label; |
|
| 1904 | + else |
|
| 1905 | + return $label; |
|
| 1906 | 1906 | } |
| 1907 | 1907 | |
| 1908 | 1908 | /** |
@@ -1917,19 +1917,19 @@ discard block |
||
| 1917 | 1917 | * @return void|string Label. |
| 1918 | 1918 | */ |
| 1919 | 1919 | function get_post_type_plural_label($post_type, $echo = false, $translate = false) {
|
| 1920 | - $all_postypes = geodir_get_posttypes(); |
|
| 1920 | + $all_postypes = geodir_get_posttypes(); |
|
| 1921 | 1921 | |
| 1922 | - if (!in_array($post_type, $all_postypes)) |
|
| 1923 | - return false; |
|
| 1922 | + if (!in_array($post_type, $all_postypes)) |
|
| 1923 | + return false; |
|
| 1924 | 1924 | |
| 1925 | - $obj_post_type = get_post_type_object($post_type); |
|
| 1925 | + $obj_post_type = get_post_type_object($post_type); |
|
| 1926 | 1926 | |
| 1927 | - $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name; |
|
| 1927 | + $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name; |
|
| 1928 | 1928 | |
| 1929 | - if ($echo) |
|
| 1930 | - echo $label; |
|
| 1931 | - else |
|
| 1932 | - return $label; |
|
| 1929 | + if ($echo) |
|
| 1930 | + echo $label; |
|
| 1931 | + else |
|
| 1932 | + return $label; |
|
| 1933 | 1933 | } |
| 1934 | 1934 | |
| 1935 | 1935 | /** |
@@ -1947,51 +1947,51 @@ discard block |
||
| 1947 | 1947 | */ |
| 1948 | 1948 | function geodir_term_exists($term, $taxonomy = '', $parent = 0) |
| 1949 | 1949 | {
|
| 1950 | - global $wpdb; |
|
| 1951 | - |
|
| 1952 | - $select = "SELECT term_id FROM $wpdb->terms as t WHERE "; |
|
| 1953 | - $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE "; |
|
| 1954 | - |
|
| 1955 | - if (is_int($term)) {
|
|
| 1956 | - if (0 == $term) |
|
| 1957 | - return 0; |
|
| 1958 | - $where = 't.term_id = %d'; |
|
| 1959 | - if (!empty($taxonomy)) |
|
| 1960 | - return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1961 | - else |
|
| 1962 | - return $wpdb->get_var($wpdb->prepare($select . $where, $term)); |
|
| 1963 | - } |
|
| 1950 | + global $wpdb; |
|
| 1951 | + |
|
| 1952 | + $select = "SELECT term_id FROM $wpdb->terms as t WHERE "; |
|
| 1953 | + $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE "; |
|
| 1954 | + |
|
| 1955 | + if (is_int($term)) {
|
|
| 1956 | + if (0 == $term) |
|
| 1957 | + return 0; |
|
| 1958 | + $where = 't.term_id = %d'; |
|
| 1959 | + if (!empty($taxonomy)) |
|
| 1960 | + return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1961 | + else |
|
| 1962 | + return $wpdb->get_var($wpdb->prepare($select . $where, $term)); |
|
| 1963 | + } |
|
| 1964 | 1964 | |
| 1965 | - $term = trim(wp_unslash($term)); |
|
| 1965 | + $term = trim(wp_unslash($term)); |
|
| 1966 | 1966 | |
| 1967 | - if ('' === $slug = sanitize_title($term))
|
|
| 1968 | - return 0; |
|
| 1967 | + if ('' === $slug = sanitize_title($term))
|
|
| 1968 | + return 0; |
|
| 1969 | 1969 | |
| 1970 | - $where = 't.slug = %s'; |
|
| 1970 | + $where = 't.slug = %s'; |
|
| 1971 | 1971 | |
| 1972 | - $where_fields = array($slug); |
|
| 1973 | - if (!empty($taxonomy)) {
|
|
| 1974 | - $parent = (int)$parent; |
|
| 1975 | - if ($parent > 0) {
|
|
| 1976 | - $where_fields[] = $parent; |
|
| 1977 | - $else_where_fields[] = $parent; |
|
| 1978 | - $where .= ' AND tt.parent = %d'; |
|
| 1972 | + $where_fields = array($slug); |
|
| 1973 | + if (!empty($taxonomy)) {
|
|
| 1974 | + $parent = (int)$parent; |
|
| 1975 | + if ($parent > 0) {
|
|
| 1976 | + $where_fields[] = $parent; |
|
| 1977 | + $else_where_fields[] = $parent; |
|
| 1978 | + $where .= ' AND tt.parent = %d'; |
|
| 1979 | 1979 | |
| 1980 | - } |
|
| 1980 | + } |
|
| 1981 | 1981 | |
| 1982 | - $where_fields[] = $taxonomy; |
|
| 1982 | + $where_fields[] = $taxonomy; |
|
| 1983 | 1983 | |
| 1984 | 1984 | |
| 1985 | - if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))
|
|
| 1986 | - return $result; |
|
| 1985 | + if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))
|
|
| 1986 | + return $result; |
|
| 1987 | 1987 | |
| 1988 | - return false; |
|
| 1989 | - } |
|
| 1988 | + return false; |
|
| 1989 | + } |
|
| 1990 | 1990 | |
| 1991 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))
|
|
| 1992 | - return $result; |
|
| 1991 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))
|
|
| 1992 | + return $result; |
|
| 1993 | 1993 | |
| 1994 | - return false; |
|
| 1994 | + return false; |
|
| 1995 | 1995 | } |
| 1996 | 1996 | |
| 1997 | 1997 | /** |
@@ -2003,7 +2003,7 @@ discard block |
||
| 2003 | 2003 | function geodir_get_term_icon_rebuild() |
| 2004 | 2004 | {
|
| 2005 | 2005 | |
| 2006 | - update_option('gd_term_icons', '');
|
|
| 2006 | + update_option('gd_term_icons', '');
|
|
| 2007 | 2007 | |
| 2008 | 2008 | } |
| 2009 | 2009 | |
@@ -2021,61 +2021,61 @@ discard block |
||
| 2021 | 2021 | */ |
| 2022 | 2022 | function geodir_get_term_icon($term_id = false, $rebuild = false) |
| 2023 | 2023 | {
|
| 2024 | - global $wpdb; |
|
| 2025 | - if (!$rebuild) {
|
|
| 2026 | - $terms_icons = get_option('gd_term_icons');
|
|
| 2027 | - } else {
|
|
| 2028 | - $terms_icons = array(); |
|
| 2029 | - } |
|
| 2030 | - |
|
| 2031 | - if (empty($terms_icons)) {
|
|
| 2032 | - $terms_icons = array(); |
|
| 2033 | - $default_icon_url = get_option('geodir_default_marker_icon');
|
|
| 2034 | - $taxonomy = geodir_get_taxonomies(); |
|
| 2035 | - $post_types = geodir_get_posttypes(); |
|
| 2036 | - $tax_arr = array(); |
|
| 2037 | - foreach ($post_types as $post_type) {
|
|
| 2038 | - $tax_arr[] = "'" . $post_type . "category'"; |
|
| 2039 | - } |
|
| 2040 | - $tax_c = implode(',', $tax_arr);
|
|
| 2041 | - $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");
|
|
| 2042 | - //$terms = get_terms( $taxonomy ); |
|
| 2043 | - |
|
| 2044 | - if($terms) {
|
|
| 2045 | - foreach ($terms as $term) {
|
|
| 2046 | - $post_type = str_replace("category", "", $term->taxonomy);
|
|
| 2047 | - $a_terms[$post_type][] = $term; |
|
| 2024 | + global $wpdb; |
|
| 2025 | + if (!$rebuild) {
|
|
| 2026 | + $terms_icons = get_option('gd_term_icons');
|
|
| 2027 | + } else {
|
|
| 2028 | + $terms_icons = array(); |
|
| 2029 | + } |
|
| 2048 | 2030 | |
| 2049 | - } |
|
| 2050 | - } |
|
| 2031 | + if (empty($terms_icons)) {
|
|
| 2032 | + $terms_icons = array(); |
|
| 2033 | + $default_icon_url = get_option('geodir_default_marker_icon');
|
|
| 2034 | + $taxonomy = geodir_get_taxonomies(); |
|
| 2035 | + $post_types = geodir_get_posttypes(); |
|
| 2036 | + $tax_arr = array(); |
|
| 2037 | + foreach ($post_types as $post_type) {
|
|
| 2038 | + $tax_arr[] = "'" . $post_type . "category'"; |
|
| 2039 | + } |
|
| 2040 | + $tax_c = implode(',', $tax_arr);
|
|
| 2041 | + $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");
|
|
| 2042 | + //$terms = get_terms( $taxonomy ); |
|
| 2051 | 2043 | |
| 2052 | - if($a_terms) {
|
|
| 2053 | - foreach ($a_terms as $pt => $t2) {
|
|
| 2044 | + if($terms) {
|
|
| 2045 | + foreach ($terms as $term) {
|
|
| 2046 | + $post_type = str_replace("category", "", $term->taxonomy);
|
|
| 2047 | + $a_terms[$post_type][] = $term; |
|
| 2054 | 2048 | |
| 2055 | - foreach ($t2 as $term) {
|
|
| 2056 | - $term_icon = geodir_get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt); |
|
| 2057 | - if ($term_icon) {
|
|
| 2058 | - $term_icon_url = $term_icon["src"]; |
|
| 2059 | - } else {
|
|
| 2060 | - $term_icon_url = $default_icon_url; |
|
| 2061 | - } |
|
| 2062 | - $terms_icons[$term->term_id] = $term_icon_url; |
|
| 2063 | - } |
|
| 2064 | - } |
|
| 2065 | - } |
|
| 2049 | + } |
|
| 2050 | + } |
|
| 2051 | + |
|
| 2052 | + if($a_terms) {
|
|
| 2053 | + foreach ($a_terms as $pt => $t2) {
|
|
| 2066 | 2054 | |
| 2067 | - update_option('gd_term_icons', $terms_icons);
|
|
| 2068 | - } |
|
| 2055 | + foreach ($t2 as $term) {
|
|
| 2056 | + $term_icon = geodir_get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt); |
|
| 2057 | + if ($term_icon) {
|
|
| 2058 | + $term_icon_url = $term_icon["src"]; |
|
| 2059 | + } else {
|
|
| 2060 | + $term_icon_url = $default_icon_url; |
|
| 2061 | + } |
|
| 2062 | + $terms_icons[$term->term_id] = $term_icon_url; |
|
| 2063 | + } |
|
| 2064 | + } |
|
| 2065 | + } |
|
| 2069 | 2066 | |
| 2070 | - if ($term_id && isset($terms_icons[$term_id])) {
|
|
| 2071 | - return $terms_icons[$term_id]; |
|
| 2072 | - } elseif ($term_id && !isset($terms_icons[$term_id])) {
|
|
| 2073 | - return get_option('geodir_default_marker_icon');
|
|
| 2074 | - } |
|
| 2067 | + update_option('gd_term_icons', $terms_icons);
|
|
| 2068 | + } |
|
| 2069 | + |
|
| 2070 | + if ($term_id && isset($terms_icons[$term_id])) {
|
|
| 2071 | + return $terms_icons[$term_id]; |
|
| 2072 | + } elseif ($term_id && !isset($terms_icons[$term_id])) {
|
|
| 2073 | + return get_option('geodir_default_marker_icon');
|
|
| 2074 | + } |
|
| 2075 | 2075 | |
| 2076 | - if (is_ssl()) {
|
|
| 2077 | - $terms_icons = str_replace("http:","https:",$terms_icons );
|
|
| 2078 | - } |
|
| 2076 | + if (is_ssl()) {
|
|
| 2077 | + $terms_icons = str_replace("http:","https:",$terms_icons );
|
|
| 2078 | + } |
|
| 2079 | 2079 | |
| 2080 | - return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);
|
|
| 2080 | + return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);
|
|
| 2081 | 2081 | } |
| 2082 | 2082 | \ No newline at end of file |
@@ -17,18 +17,18 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | function geodir_is_login($redirect = false) |
| 19 | 19 | {
|
| 20 | - global $current_user; |
|
| 21 | - if (!$current_user->ID) {
|
|
| 22 | - if ($redirect) {
|
|
| 23 | - ?> |
|
| 20 | + global $current_user; |
|
| 21 | + if (!$current_user->ID) {
|
|
| 22 | + if ($redirect) {
|
|
| 23 | + ?> |
|
| 24 | 24 | <script type="text/javascript"> |
| 25 | 25 | window.location.href = '<?php echo geodir_login_url();?>'; |
| 26 | 26 | </script> |
| 27 | 27 | <?php |
| 28 | - } else |
|
| 29 | - return false; |
|
| 30 | - } else |
|
| 31 | - return true; |
|
| 28 | + } else |
|
| 29 | + return false; |
|
| 30 | + } else |
|
| 31 | + return true; |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | /** |
@@ -42,25 +42,25 @@ discard block |
||
| 42 | 42 | {
|
| 43 | 43 | |
| 44 | 44 | // Redirect to https login if forced to use SSL |
| 45 | - if (force_ssl_admin() && !is_ssl()) {
|
|
| 46 | - if (0 === strpos($_SERVER['REQUEST_URI'], 'http')) {
|
|
| 47 | - wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));
|
|
| 48 | - exit(); |
|
| 49 | - } else {
|
|
| 50 | - wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
|
|
| 51 | - exit(); |
|
| 52 | - } |
|
| 53 | - } |
|
| 54 | - |
|
| 55 | - /** |
|
| 56 | - * Filter the login message. |
|
| 57 | - * |
|
| 58 | - * @since 1.0.0 |
|
| 59 | - * |
|
| 60 | - * @param string $message Login message. |
|
| 61 | - */ |
|
| 62 | - $message = apply_filters('login_message', $message);
|
|
| 63 | - if (!empty($message)) echo $message . "\n"; |
|
| 45 | + if (force_ssl_admin() && !is_ssl()) {
|
|
| 46 | + if (0 === strpos($_SERVER['REQUEST_URI'], 'http')) {
|
|
| 47 | + wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));
|
|
| 48 | + exit(); |
|
| 49 | + } else {
|
|
| 50 | + wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
|
|
| 51 | + exit(); |
|
| 52 | + } |
|
| 53 | + } |
|
| 54 | + |
|
| 55 | + /** |
|
| 56 | + * Filter the login message. |
|
| 57 | + * |
|
| 58 | + * @since 1.0.0 |
|
| 59 | + * |
|
| 60 | + * @param string $message Login message. |
|
| 61 | + */ |
|
| 62 | + $message = apply_filters('login_message', $message);
|
|
| 63 | + if (!empty($message)) echo $message . "\n"; |
|
| 64 | 64 | |
| 65 | 65 | } |
| 66 | 66 | |
@@ -73,59 +73,59 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | function geodir_get_site_email_id() |
| 75 | 75 | {
|
| 76 | - if (get_option('site_email')) {
|
|
| 76 | + if (get_option('site_email')) {
|
|
| 77 | 77 | |
| 78 | - return get_option('site_email');
|
|
| 78 | + return get_option('site_email');
|
|
| 79 | 79 | |
| 80 | - } else {
|
|
| 80 | + } else {
|
|
| 81 | 81 | |
| 82 | - return get_option('admin_email');
|
|
| 82 | + return get_option('admin_email');
|
|
| 83 | 83 | |
| 84 | - } |
|
| 84 | + } |
|
| 85 | 85 | |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | |
| 89 | 89 | if (!function_exists('get_site_emailName')) {
|
| 90 | - /** |
|
| 91 | - * Get site name for sending emails. |
|
| 92 | - * |
|
| 93 | - * @since 1.0.0 |
|
| 94 | - * @package GeoDirectory |
|
| 95 | - * @return string Site name. |
|
| 96 | - */ |
|
| 97 | - function get_site_emailName() |
|
| 90 | + /** |
|
| 91 | + * Get site name for sending emails. |
|
| 92 | + * |
|
| 93 | + * @since 1.0.0 |
|
| 94 | + * @package GeoDirectory |
|
| 95 | + * @return string Site name. |
|
| 96 | + */ |
|
| 97 | + function get_site_emailName() |
|
| 98 | 98 | |
| 99 | - {
|
|
| 99 | + {
|
|
| 100 | 100 | |
| 101 | - if (get_option('site_email_name')) {
|
|
| 101 | + if (get_option('site_email_name')) {
|
|
| 102 | 102 | |
| 103 | - return stripslashes(get_option('site_email_name'));
|
|
| 103 | + return stripslashes(get_option('site_email_name'));
|
|
| 104 | 104 | |
| 105 | - } else {
|
|
| 105 | + } else {
|
|
| 106 | 106 | |
| 107 | - return stripslashes(get_option('blogname'));
|
|
| 107 | + return stripslashes(get_option('blogname'));
|
|
| 108 | 108 | |
| 109 | - } |
|
| 109 | + } |
|
| 110 | 110 | |
| 111 | - } |
|
| 111 | + } |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | if (!function_exists('is_allow_user_register')) {
|
| 115 | - /** |
|
| 116 | - * Checks whether the site allowing user registration or not. |
|
| 117 | - * |
|
| 118 | - * @since 1.0.0 |
|
| 119 | - * @package GeoDirectory |
|
| 120 | - * @return bool|string |
|
| 121 | - */ |
|
| 122 | - function is_allow_user_register() |
|
| 115 | + /** |
|
| 116 | + * Checks whether the site allowing user registration or not. |
|
| 117 | + * |
|
| 118 | + * @since 1.0.0 |
|
| 119 | + * @package GeoDirectory |
|
| 120 | + * @return bool|string |
|
| 121 | + */ |
|
| 122 | + function is_allow_user_register() |
|
| 123 | 123 | |
| 124 | - {
|
|
| 124 | + {
|
|
| 125 | 125 | |
| 126 | - return get_option('users_can_register');
|
|
| 126 | + return get_option('users_can_register');
|
|
| 127 | 127 | |
| 128 | - } |
|
| 128 | + } |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /** |
@@ -138,107 +138,107 @@ discard block |
||
| 138 | 138 | */ |
| 139 | 139 | function geodir_retrieve_password() |
| 140 | 140 | {
|
| 141 | - global $wpdb; |
|
| 142 | - |
|
| 143 | - $errors = new WP_Error(); |
|
| 144 | - if (empty($_POST['user_login']) && empty($_POST['user_email'])) |
|
| 145 | - $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));
|
|
| 146 | - |
|
| 147 | - if (strpos($_POST['user_login'], '@')) {
|
|
| 148 | - //$user_data = get_user_by_email(trim($_POST['user_login'])); |
|
| 149 | - $user_data = get_user_by('email', trim($_POST['user_login']));
|
|
| 150 | - if (empty($user_data)) |
|
| 151 | - $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));
|
|
| 152 | - } else {
|
|
| 153 | - $login = trim($_POST['user_login']); |
|
| 154 | - $user_data = get_user_by('email', $login);
|
|
| 155 | - } |
|
| 156 | - |
|
| 157 | - /** |
|
| 158 | - * Called in the geodir_retrieve_password() function before any errors are set or any emails are sent. |
|
| 159 | - * |
|
| 160 | - * @since 1.0.0 |
|
| 161 | - */ |
|
| 162 | - do_action('lostpassword_post');
|
|
| 163 | - |
|
| 164 | - if ($errors->get_error_code()) |
|
| 165 | - return $errors; |
|
| 166 | - |
|
| 167 | - if (!$user_data) {
|
|
| 168 | - $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.', 'geodirectory'));
|
|
| 169 | - return $errors; |
|
| 170 | - } |
|
| 171 | - |
|
| 172 | - // redefining user_login ensures we return the right case in the email |
|
| 173 | - $user_login = $user_data->user_login; |
|
| 174 | - $user_email = $user_data->user_email; |
|
| 175 | - |
|
| 176 | - /** |
|
| 177 | - * Called in the geodir_retrieve_password() function before any emails are sent. |
|
| 178 | - * |
|
| 179 | - * @since 1.0.0 |
|
| 180 | - * @param string $user_login The users username. |
|
| 181 | - */ |
|
| 182 | - do_action('retrieve_password', $user_login);
|
|
| 183 | - |
|
| 184 | - //////////////////////////////////// |
|
| 185 | - $user_email = isset($_POST['user_email']) ? $_POST['user_email'] : ''; |
|
| 186 | - $user_login = $_POST['user_login']; |
|
| 187 | - |
|
| 188 | - $user = $wpdb->get_row( |
|
| 189 | - $wpdb->prepare( |
|
| 190 | - "SELECT * FROM $wpdb->users WHERE user_login like %s or user_email like %s", |
|
| 191 | - array($user_login, $user_login) |
|
| 192 | - ) |
|
| 193 | - ); |
|
| 194 | - |
|
| 195 | - if (empty($user)) |
|
| 196 | - return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));
|
|
| 197 | - |
|
| 198 | - $new_pass = wp_generate_password(12, false); |
|
| 199 | - |
|
| 200 | - /** |
|
| 201 | - * Called in the geodir_retrieve_password() function before any emails are sent. |
|
| 202 | - * |
|
| 203 | - * @since 1.0.0 |
|
| 204 | - * @param object $user The user object. |
|
| 205 | - * @param string $new_pass The new pass being sent to the user. |
|
| 206 | - */ |
|
| 207 | - do_action('password_reset', $user, $new_pass);
|
|
| 208 | - |
|
| 209 | - wp_set_password($new_pass, $user->ID); |
|
| 210 | - update_user_meta($user->ID, 'default_password_nag', true); //Set up the Password change nag. |
|
| 211 | - $message = '<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>';
|
|
| 212 | - $message .= '<p>' . sprintf(__('Username: %s', 'geodirectory'), $user->user_login) . "</p>";
|
|
| 213 | - $message .= '<p>' . sprintf(__('Password: %s', 'geodirectory'), $new_pass) . "</p>";
|
|
| 214 | - //$message .= '<p>You can login to : <a href="'.home_url().'/?ptype=login' . "\">Login</a> or the URL is : ".home_url()."/?ptype=login</p>"; |
|
| 215 | - //$message .= '<p>Thank You,<br> '.get_option('blogname').'</p>';
|
|
| 216 | - $user_email = $user_data->user_email; |
|
| 217 | - $user_name = geodir_get_client_name($user->ID); |
|
| 218 | - $fromEmail = geodir_get_site_email_id(); |
|
| 219 | - $fromEmailName = get_site_emailName(); |
|
| 220 | - $title = sprintf(__('[%s] Your new password', 'geodirectory'), get_option('blogname'));
|
|
| 221 | - /** |
|
| 222 | - * Filter the password reset email subject part. |
|
| 223 | - * |
|
| 224 | - * @since 1.0.0 |
|
| 225 | - * |
|
| 226 | - * @param string $title Password reset email subject. |
|
| 227 | - */ |
|
| 228 | - $title = apply_filters('password_reset_title', $title);
|
|
| 229 | - /** |
|
| 230 | - * Filter the password reset email message part. |
|
| 231 | - * |
|
| 232 | - * @since 1.0.0 |
|
| 233 | - * |
|
| 234 | - * @param string $message Password reset email message. |
|
| 235 | - * @param string $new_pass The new password string. |
|
| 236 | - */ |
|
| 237 | - $message = apply_filters('password_reset_message', $message, $new_pass);
|
|
| 238 | - //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$user_name,$title,$message,$extra='');///forgot password email |
|
| 239 | - geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID);///forgot password email |
|
| 240 | - |
|
| 241 | - return true; |
|
| 141 | + global $wpdb; |
|
| 142 | + |
|
| 143 | + $errors = new WP_Error(); |
|
| 144 | + if (empty($_POST['user_login']) && empty($_POST['user_email'])) |
|
| 145 | + $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));
|
|
| 146 | + |
|
| 147 | + if (strpos($_POST['user_login'], '@')) {
|
|
| 148 | + //$user_data = get_user_by_email(trim($_POST['user_login'])); |
|
| 149 | + $user_data = get_user_by('email', trim($_POST['user_login']));
|
|
| 150 | + if (empty($user_data)) |
|
| 151 | + $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));
|
|
| 152 | + } else {
|
|
| 153 | + $login = trim($_POST['user_login']); |
|
| 154 | + $user_data = get_user_by('email', $login);
|
|
| 155 | + } |
|
| 156 | + |
|
| 157 | + /** |
|
| 158 | + * Called in the geodir_retrieve_password() function before any errors are set or any emails are sent. |
|
| 159 | + * |
|
| 160 | + * @since 1.0.0 |
|
| 161 | + */ |
|
| 162 | + do_action('lostpassword_post');
|
|
| 163 | + |
|
| 164 | + if ($errors->get_error_code()) |
|
| 165 | + return $errors; |
|
| 166 | + |
|
| 167 | + if (!$user_data) {
|
|
| 168 | + $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.', 'geodirectory'));
|
|
| 169 | + return $errors; |
|
| 170 | + } |
|
| 171 | + |
|
| 172 | + // redefining user_login ensures we return the right case in the email |
|
| 173 | + $user_login = $user_data->user_login; |
|
| 174 | + $user_email = $user_data->user_email; |
|
| 175 | + |
|
| 176 | + /** |
|
| 177 | + * Called in the geodir_retrieve_password() function before any emails are sent. |
|
| 178 | + * |
|
| 179 | + * @since 1.0.0 |
|
| 180 | + * @param string $user_login The users username. |
|
| 181 | + */ |
|
| 182 | + do_action('retrieve_password', $user_login);
|
|
| 183 | + |
|
| 184 | + //////////////////////////////////// |
|
| 185 | + $user_email = isset($_POST['user_email']) ? $_POST['user_email'] : ''; |
|
| 186 | + $user_login = $_POST['user_login']; |
|
| 187 | + |
|
| 188 | + $user = $wpdb->get_row( |
|
| 189 | + $wpdb->prepare( |
|
| 190 | + "SELECT * FROM $wpdb->users WHERE user_login like %s or user_email like %s", |
|
| 191 | + array($user_login, $user_login) |
|
| 192 | + ) |
|
| 193 | + ); |
|
| 194 | + |
|
| 195 | + if (empty($user)) |
|
| 196 | + return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));
|
|
| 197 | + |
|
| 198 | + $new_pass = wp_generate_password(12, false); |
|
| 199 | + |
|
| 200 | + /** |
|
| 201 | + * Called in the geodir_retrieve_password() function before any emails are sent. |
|
| 202 | + * |
|
| 203 | + * @since 1.0.0 |
|
| 204 | + * @param object $user The user object. |
|
| 205 | + * @param string $new_pass The new pass being sent to the user. |
|
| 206 | + */ |
|
| 207 | + do_action('password_reset', $user, $new_pass);
|
|
| 208 | + |
|
| 209 | + wp_set_password($new_pass, $user->ID); |
|
| 210 | + update_user_meta($user->ID, 'default_password_nag', true); //Set up the Password change nag. |
|
| 211 | + $message = '<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>';
|
|
| 212 | + $message .= '<p>' . sprintf(__('Username: %s', 'geodirectory'), $user->user_login) . "</p>";
|
|
| 213 | + $message .= '<p>' . sprintf(__('Password: %s', 'geodirectory'), $new_pass) . "</p>";
|
|
| 214 | + //$message .= '<p>You can login to : <a href="'.home_url().'/?ptype=login' . "\">Login</a> or the URL is : ".home_url()."/?ptype=login</p>"; |
|
| 215 | + //$message .= '<p>Thank You,<br> '.get_option('blogname').'</p>';
|
|
| 216 | + $user_email = $user_data->user_email; |
|
| 217 | + $user_name = geodir_get_client_name($user->ID); |
|
| 218 | + $fromEmail = geodir_get_site_email_id(); |
|
| 219 | + $fromEmailName = get_site_emailName(); |
|
| 220 | + $title = sprintf(__('[%s] Your new password', 'geodirectory'), get_option('blogname'));
|
|
| 221 | + /** |
|
| 222 | + * Filter the password reset email subject part. |
|
| 223 | + * |
|
| 224 | + * @since 1.0.0 |
|
| 225 | + * |
|
| 226 | + * @param string $title Password reset email subject. |
|
| 227 | + */ |
|
| 228 | + $title = apply_filters('password_reset_title', $title);
|
|
| 229 | + /** |
|
| 230 | + * Filter the password reset email message part. |
|
| 231 | + * |
|
| 232 | + * @since 1.0.0 |
|
| 233 | + * |
|
| 234 | + * @param string $message Password reset email message. |
|
| 235 | + * @param string $new_pass The new password string. |
|
| 236 | + */ |
|
| 237 | + $message = apply_filters('password_reset_message', $message, $new_pass);
|
|
| 238 | + //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$user_name,$title,$message,$extra='');///forgot password email |
|
| 239 | + geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID);///forgot password email |
|
| 240 | + |
|
| 241 | + return true; |
|
| 242 | 242 | } |
| 243 | 243 | |
| 244 | 244 | /** |
@@ -253,80 +253,80 @@ discard block |
||
| 253 | 253 | */ |
| 254 | 254 | function geodir_register_new_user($user_login, $user_email) |
| 255 | 255 | {
|
| 256 | - global $wpdb; |
|
| 257 | - $errors = new WP_Error(); |
|
| 258 | - |
|
| 259 | - |
|
| 260 | - $user_login = sanitize_user($user_login); |
|
| 261 | - $user_login = str_replace(",", "", $user_login);
|
|
| 262 | - $user_email = str_replace(",", "", $user_email);
|
|
| 263 | - /** |
|
| 264 | - * Filter the user registration email. |
|
| 265 | - * |
|
| 266 | - * @since 1.0.0 |
|
| 267 | - * |
|
| 268 | - * @param string $user_email User registration email. |
|
| 269 | - */ |
|
| 270 | - $user_email = apply_filters('user_registration_email', $user_email);
|
|
| 271 | - |
|
| 272 | - |
|
| 273 | - if (get_option('geodir_allow_cpass')) {
|
|
| 274 | - $user_pass = $_REQUEST['user_pass']; |
|
| 275 | - $user_pass2 = $_REQUEST['user_pass2']; |
|
| 276 | - // Check the password |
|
| 277 | - if ($user_pass != $user_pass2) {
|
|
| 278 | - $errors->add('pass_match', __('ERROR: Passwords do not match.', 'geodirectory'));
|
|
| 279 | - } elseif (strlen($user_pass) < 7) {
|
|
| 280 | - $errors->add('pass_match', __('ERROR: Password must be 7 characters or more.', 'geodirectory'));
|
|
| 281 | - } |
|
| 282 | - } |
|
| 283 | - |
|
| 284 | - // Check the username |
|
| 285 | - if ($user_login == '') |
|
| 286 | - $errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));
|
|
| 287 | - elseif (!validate_username($user_login)) {
|
|
| 288 | - $errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid. Please enter a valid username.', 'geodirectory'));
|
|
| 289 | - $user_login = ''; |
|
| 290 | - } elseif (username_exists($user_login)) |
|
| 291 | - $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));
|
|
| 292 | - |
|
| 293 | - // Check the e-mail address |
|
| 294 | - if ($user_email == '') {
|
|
| 295 | - $errors->add('empty_email', __('<strong>ERROR</strong>: Please type your e-mail address.', 'geodirectory'));
|
|
| 296 | - } elseif (!is_email($user_email)) {
|
|
| 297 | - $errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn’t correct.', 'geodirectory'));
|
|
| 298 | - $user_email = ''; |
|
| 299 | - } elseif (email_exists($user_email)) |
|
| 300 | - $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));
|
|
| 301 | - |
|
| 302 | - /** |
|
| 303 | - * Called when registering a new user. |
|
| 304 | - * |
|
| 305 | - * This is a WordPress core hook. |
|
| 306 | - * |
|
| 307 | - * @link https://codex.wordpress.org/Plugin_API/Action_Reference/register_post |
|
| 308 | - * @since 1.0.0 |
|
| 309 | - */ |
|
| 310 | - do_action('register_post', $user_login, $user_email, $errors);
|
|
| 311 | - /** |
|
| 312 | - * Filter the registration error messages. |
|
| 313 | - * |
|
| 314 | - * @since 1.0.0 |
|
| 315 | - * |
|
| 316 | - * @param object $errors Registration error messages. |
|
| 317 | - */ |
|
| 318 | - $errors = apply_filters('registration_errors', $errors,$user_login,$user_email);
|
|
| 319 | - |
|
| 320 | - if ($errors->get_error_code()) |
|
| 321 | - return $errors; |
|
| 322 | - |
|
| 323 | - |
|
| 324 | - if (!isset($user_pass) || $user_pass == '') {
|
|
| 325 | - $user_pass = wp_generate_password(12, false); |
|
| 326 | - } |
|
| 327 | - $user_id = wp_create_user($user_login, $user_pass, $user_email); |
|
| 328 | - $user_web = ''; |
|
| 329 | - /*$user_add1 = $_POST['user_add1']; |
|
| 256 | + global $wpdb; |
|
| 257 | + $errors = new WP_Error(); |
|
| 258 | + |
|
| 259 | + |
|
| 260 | + $user_login = sanitize_user($user_login); |
|
| 261 | + $user_login = str_replace(",", "", $user_login);
|
|
| 262 | + $user_email = str_replace(",", "", $user_email);
|
|
| 263 | + /** |
|
| 264 | + * Filter the user registration email. |
|
| 265 | + * |
|
| 266 | + * @since 1.0.0 |
|
| 267 | + * |
|
| 268 | + * @param string $user_email User registration email. |
|
| 269 | + */ |
|
| 270 | + $user_email = apply_filters('user_registration_email', $user_email);
|
|
| 271 | + |
|
| 272 | + |
|
| 273 | + if (get_option('geodir_allow_cpass')) {
|
|
| 274 | + $user_pass = $_REQUEST['user_pass']; |
|
| 275 | + $user_pass2 = $_REQUEST['user_pass2']; |
|
| 276 | + // Check the password |
|
| 277 | + if ($user_pass != $user_pass2) {
|
|
| 278 | + $errors->add('pass_match', __('ERROR: Passwords do not match.', 'geodirectory'));
|
|
| 279 | + } elseif (strlen($user_pass) < 7) {
|
|
| 280 | + $errors->add('pass_match', __('ERROR: Password must be 7 characters or more.', 'geodirectory'));
|
|
| 281 | + } |
|
| 282 | + } |
|
| 283 | + |
|
| 284 | + // Check the username |
|
| 285 | + if ($user_login == '') |
|
| 286 | + $errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));
|
|
| 287 | + elseif (!validate_username($user_login)) {
|
|
| 288 | + $errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid. Please enter a valid username.', 'geodirectory'));
|
|
| 289 | + $user_login = ''; |
|
| 290 | + } elseif (username_exists($user_login)) |
|
| 291 | + $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));
|
|
| 292 | + |
|
| 293 | + // Check the e-mail address |
|
| 294 | + if ($user_email == '') {
|
|
| 295 | + $errors->add('empty_email', __('<strong>ERROR</strong>: Please type your e-mail address.', 'geodirectory'));
|
|
| 296 | + } elseif (!is_email($user_email)) {
|
|
| 297 | + $errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn’t correct.', 'geodirectory'));
|
|
| 298 | + $user_email = ''; |
|
| 299 | + } elseif (email_exists($user_email)) |
|
| 300 | + $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));
|
|
| 301 | + |
|
| 302 | + /** |
|
| 303 | + * Called when registering a new user. |
|
| 304 | + * |
|
| 305 | + * This is a WordPress core hook. |
|
| 306 | + * |
|
| 307 | + * @link https://codex.wordpress.org/Plugin_API/Action_Reference/register_post |
|
| 308 | + * @since 1.0.0 |
|
| 309 | + */ |
|
| 310 | + do_action('register_post', $user_login, $user_email, $errors);
|
|
| 311 | + /** |
|
| 312 | + * Filter the registration error messages. |
|
| 313 | + * |
|
| 314 | + * @since 1.0.0 |
|
| 315 | + * |
|
| 316 | + * @param object $errors Registration error messages. |
|
| 317 | + */ |
|
| 318 | + $errors = apply_filters('registration_errors', $errors,$user_login,$user_email);
|
|
| 319 | + |
|
| 320 | + if ($errors->get_error_code()) |
|
| 321 | + return $errors; |
|
| 322 | + |
|
| 323 | + |
|
| 324 | + if (!isset($user_pass) || $user_pass == '') {
|
|
| 325 | + $user_pass = wp_generate_password(12, false); |
|
| 326 | + } |
|
| 327 | + $user_id = wp_create_user($user_login, $user_pass, $user_email); |
|
| 328 | + $user_web = ''; |
|
| 329 | + /*$user_add1 = $_POST['user_add1']; |
|
| 330 | 330 | $user_add2 = $_POST['user_add2']; |
| 331 | 331 | $user_city = $_POST['user_city']; |
| 332 | 332 | $user_state = $_POST['user_state']; |
@@ -335,77 +335,77 @@ discard block |
||
| 335 | 335 | $user_web = $_POST['user_web']; |
| 336 | 336 | $user_phone = $_POST['user_phone']; |
| 337 | 337 | $user_twitter = $_POST['user_twitter']; */ |
| 338 | - $user_fname = sanitize_user($_POST['user_fname']); |
|
| 339 | - $user_fname = str_replace(",", "", $user_fname);
|
|
| 340 | - |
|
| 341 | - /** |
|
| 342 | - * Filter the submitted user meta. |
|
| 343 | - * |
|
| 344 | - * @since 1.0.0 |
|
| 345 | - * |
|
| 346 | - * @param int $user_id User ID. |
|
| 347 | - */ |
|
| 348 | - $user_address_info = apply_filters('geodir_manage_user_meta', array(
|
|
| 349 | - "user_add1" => '', |
|
| 350 | - "user_add2" => '', |
|
| 351 | - "user_city" => '', |
|
| 352 | - "user_state" => '', |
|
| 353 | - "user_country" => '', |
|
| 354 | - "user_postalcode" => '', |
|
| 355 | - "user_phone" => '', |
|
| 356 | - "user_twitter" => '', |
|
| 357 | - "first_name" => $user_fname, |
|
| 358 | - "last_name" => '', |
|
| 359 | - ), $user_id); |
|
| 360 | - foreach ($user_address_info as $key => $val) {
|
|
| 361 | - update_user_meta($user_id, $key, $val); // User Address Information Here |
|
| 362 | - } |
|
| 363 | - //update_user_meta($user_id, 'user_address_info', ($user_address_info)); // User Address Information Here |
|
| 364 | - $userName = $user_fname; |
|
| 365 | - update_user_meta($user_id, 'first_name', $userName); // User Address Information Here |
|
| 366 | - //update_user_meta($user_id, 'last_name', $_POST['user_lname']); // User Address Information Here |
|
| 367 | - |
|
| 368 | - // Changed by vikas sharma to enable all type of characters in author permalink... |
|
| 369 | - $user_nicename = sanitize_title($userName); |
|
| 370 | - |
|
| 371 | - $updateUsersql = $wpdb->prepare("update $wpdb->users set user_url=%s, user_nicename=%s, display_name=%s where ID=%d", array($user_web, $user_nicename, $userName, $user_id));
|
|
| 372 | - |
|
| 373 | - $wpdb->query($updateUsersql); |
|
| 374 | - |
|
| 375 | - if (!$user_id) {
|
|
| 376 | - $errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn’t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'geodirectory'), get_option('admin_email')));
|
|
| 377 | - return $errors; |
|
| 378 | - } |
|
| 379 | - global $upload_folder_path; |
|
| 380 | - |
|
| 381 | - if ($user_id) {
|
|
| 382 | - |
|
| 383 | - /** |
|
| 384 | - * Called after registering a user and before the registration email is sent. |
|
| 385 | - * |
|
| 386 | - * @since 1.0.0 |
|
| 387 | - * @param int $user_id The user ID of the registered user. |
|
| 388 | - */ |
|
| 389 | - do_action('geodir_user_register', $user_id);
|
|
| 390 | - ///////REGISTRATION EMAIL START////// |
|
| 391 | - $fromEmail = geodir_get_site_email_id(); |
|
| 392 | - $fromEmailName = get_site_emailName(); |
|
| 393 | - $message = __('<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>
|
|
| 338 | + $user_fname = sanitize_user($_POST['user_fname']); |
|
| 339 | + $user_fname = str_replace(",", "", $user_fname);
|
|
| 340 | + |
|
| 341 | + /** |
|
| 342 | + * Filter the submitted user meta. |
|
| 343 | + * |
|
| 344 | + * @since 1.0.0 |
|
| 345 | + * |
|
| 346 | + * @param int $user_id User ID. |
|
| 347 | + */ |
|
| 348 | + $user_address_info = apply_filters('geodir_manage_user_meta', array(
|
|
| 349 | + "user_add1" => '', |
|
| 350 | + "user_add2" => '', |
|
| 351 | + "user_city" => '', |
|
| 352 | + "user_state" => '', |
|
| 353 | + "user_country" => '', |
|
| 354 | + "user_postalcode" => '', |
|
| 355 | + "user_phone" => '', |
|
| 356 | + "user_twitter" => '', |
|
| 357 | + "first_name" => $user_fname, |
|
| 358 | + "last_name" => '', |
|
| 359 | + ), $user_id); |
|
| 360 | + foreach ($user_address_info as $key => $val) {
|
|
| 361 | + update_user_meta($user_id, $key, $val); // User Address Information Here |
|
| 362 | + } |
|
| 363 | + //update_user_meta($user_id, 'user_address_info', ($user_address_info)); // User Address Information Here |
|
| 364 | + $userName = $user_fname; |
|
| 365 | + update_user_meta($user_id, 'first_name', $userName); // User Address Information Here |
|
| 366 | + //update_user_meta($user_id, 'last_name', $_POST['user_lname']); // User Address Information Here |
|
| 367 | + |
|
| 368 | + // Changed by vikas sharma to enable all type of characters in author permalink... |
|
| 369 | + $user_nicename = sanitize_title($userName); |
|
| 370 | + |
|
| 371 | + $updateUsersql = $wpdb->prepare("update $wpdb->users set user_url=%s, user_nicename=%s, display_name=%s where ID=%d", array($user_web, $user_nicename, $userName, $user_id));
|
|
| 372 | + |
|
| 373 | + $wpdb->query($updateUsersql); |
|
| 374 | + |
|
| 375 | + if (!$user_id) {
|
|
| 376 | + $errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn’t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'geodirectory'), get_option('admin_email')));
|
|
| 377 | + return $errors; |
|
| 378 | + } |
|
| 379 | + global $upload_folder_path; |
|
| 380 | + |
|
| 381 | + if ($user_id) {
|
|
| 382 | + |
|
| 383 | + /** |
|
| 384 | + * Called after registering a user and before the registration email is sent. |
|
| 385 | + * |
|
| 386 | + * @since 1.0.0 |
|
| 387 | + * @param int $user_id The user ID of the registered user. |
|
| 388 | + */ |
|
| 389 | + do_action('geodir_user_register', $user_id);
|
|
| 390 | + ///////REGISTRATION EMAIL START////// |
|
| 391 | + $fromEmail = geodir_get_site_email_id(); |
|
| 392 | + $fromEmailName = get_site_emailName(); |
|
| 393 | + $message = __('<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>
|
|
| 394 | 394 | <p>' . __('Username:', 'geodirectory') . ' ' . $user_login . '</p>
|
| 395 | 395 | <p>' . __('Password:', 'geodirectory') . ' ' . $user_pass . '</p>');
|
| 396 | 396 | |
| 397 | - /////////////customer email////////////// |
|
| 398 | - //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$userName,$subject,$client_message,$extra='');///To client email |
|
| 399 | - geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id);/// registration email |
|
| 400 | - //////REGISTRATION EMAIL END//////// |
|
| 401 | - } |
|
| 397 | + /////////////customer email////////////// |
|
| 398 | + //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$userName,$subject,$client_message,$extra='');///To client email |
|
| 399 | + geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id);/// registration email |
|
| 400 | + //////REGISTRATION EMAIL END//////// |
|
| 401 | + } |
|
| 402 | 402 | |
| 403 | - if (get_option('ptthemes_auto_login')) {
|
|
| 404 | - $errors->add('auto_login', __('<strong>SUCCESS</strong>: Thank you for registering, please check your email for your login details.', 'geodirectory'));
|
|
| 405 | - return $errors; |
|
| 406 | - } |
|
| 403 | + if (get_option('ptthemes_auto_login')) {
|
|
| 404 | + $errors->add('auto_login', __('<strong>SUCCESS</strong>: Thank you for registering, please check your email for your login details.', 'geodirectory'));
|
|
| 405 | + return $errors; |
|
| 406 | + } |
|
| 407 | 407 | |
| 408 | - return array($user_id, $user_pass); |
|
| 408 | + return array($user_id, $user_pass); |
|
| 409 | 409 | } |
| 410 | 410 | |
| 411 | 411 | /** |
@@ -418,331 +418,331 @@ discard block |
||
| 418 | 418 | */ |
| 419 | 419 | function geodir_user_signup() |
| 420 | 420 | {
|
| 421 | - global $errors; |
|
| 422 | - $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'login'; |
|
| 423 | - |
|
| 424 | - $errors = new WP_Error(); |
|
| 425 | - |
|
| 426 | - if (isset($_GET['key'])) |
|
| 427 | - $action = 'resetpass'; |
|
| 428 | - |
|
| 429 | - // validate action so as to default to the login screen |
|
| 430 | - if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action))
|
|
| 431 | - $action = 'login'; |
|
| 432 | - |
|
| 433 | - nocache_headers(); |
|
| 434 | - |
|
| 435 | - if (defined('RELOCATE')) { // Move flag is set
|
|
| 436 | - if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF'])) |
|
| 437 | - $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']); |
|
| 438 | - |
|
| 439 | - $schema = (isset($_SERVER['HTTPS']) && geodir_strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://'; |
|
| 440 | - if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url()) |
|
| 441 | - update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));
|
|
| 442 | - } |
|
| 443 | - |
|
| 444 | - //Set a cookie now to see if they are supported by the browser. |
|
| 445 | - //setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN); |
|
| 446 | - if (SITECOOKIEPATH != COOKIEPATH) |
|
| 447 | - setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN); |
|
| 448 | - |
|
| 449 | - /** |
|
| 450 | - * Allow plugins to override the default actions, and to add extra actions if they want on the register/signin page. |
|
| 451 | - * |
|
| 452 | - * Used dynamic hook login_form_$action |
|
| 453 | - * |
|
| 454 | - * @since 1.0.0 |
|
| 455 | - */ |
|
| 456 | - do_action('login_form_' . $action);
|
|
| 457 | - |
|
| 458 | - $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
|
|
| 459 | - |
|
| 460 | - switch ($action): |
|
| 461 | - |
|
| 462 | - case 'logout' : |
|
| 463 | - //check_admin_referer('log-out');
|
|
| 464 | - wp_logout(); |
|
| 465 | - |
|
| 466 | - $redirect_to = $_SERVER['HTTP_REFERER']; |
|
| 467 | - //$redirect_to = home_url().'/?ptype=login&loggedout=true'; |
|
| 468 | - if (isset($_REQUEST['redirect_to'])) |
|
| 469 | - $redirect_to = $_REQUEST['redirect_to']; |
|
| 470 | - $redirect_to = home_url(); |
|
| 471 | - wp_safe_redirect($redirect_to); |
|
| 472 | - exit(); |
|
| 473 | - |
|
| 474 | - break; |
|
| 475 | - |
|
| 476 | - case 'lostpassword' : |
|
| 477 | - case 'retrievepassword' : |
|
| 478 | - if ($http_post) {
|
|
| 479 | - $errors = geodir_retrieve_password(); |
|
| 480 | - $error_message = isset($errors->errors['invalid_email'][0]) ? $errors->errors['invalid_email'][0] : ''; |
|
| 481 | - if (!is_wp_error($errors)) {
|
|
| 482 | - wp_redirect(geodir_login_url(array('checkemail'=>'confirm')));
|
|
| 483 | - gd_die(); |
|
| 484 | - } else {
|
|
| 485 | - wp_redirect(geodir_login_url(array('forgot' => 1, 'emsg'=>'fw')));
|
|
| 486 | - gd_die(); |
|
| 487 | - } |
|
| 488 | - } |
|
| 489 | - if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));
|
|
| 490 | - /** |
|
| 491 | - * Called in the geodir_user_signup() function during the lostpassword case. |
|
| 492 | - * |
|
| 493 | - * @since 1.0.0 |
|
| 494 | - */ |
|
| 495 | - do_action('lost_password');
|
|
| 496 | - $message = '<div class="sucess_msg">' . ENTER_USER_EMAIL_NEW_PW_MSG . '</div>'; |
|
| 497 | - $user_login = isset($_POST['user_login']) ? stripslashes($_POST['user_login']) : ''; |
|
| 498 | - |
|
| 499 | - break; |
|
| 500 | - |
|
| 501 | - case 'resetpass' : |
|
| 502 | - case 'rp' : |
|
| 503 | - $errors = reset_password($_GET['key'], $_GET['login']); |
|
| 504 | - |
|
| 505 | - if (!is_wp_error($errors)) {
|
|
| 506 | - wp_redirect(geodir_login_url(array('checkemail'=>'newpass')));
|
|
| 507 | - exit(); |
|
| 508 | - } |
|
| 509 | - |
|
| 510 | - wp_redirect(geodir_login_url(array('error'=>'invalidkey','action'=>'lostpassword')));
|
|
| 511 | - exit(); |
|
| 512 | - |
|
| 513 | - break; |
|
| 514 | - |
|
| 515 | - case 'register' : |
|
| 516 | - ############################### fix by Stiofan - HebTech.co.uk ### SECURITY FIX ############################## |
|
| 517 | - if (!get_option('users_can_register')) {
|
|
| 518 | - wp_redirect(geodir_login_url(array('emsg'=>'regnewusr')));
|
|
| 519 | - exit(); |
|
| 520 | - } |
|
| 521 | - ############################### fix by Stiofan - HebTech.co.uk ### SECURITY FIX ############################## |
|
| 522 | - global $user_email, $user_fname; |
|
| 523 | - $user_login = ''; |
|
| 524 | - $user_email = ''; |
|
| 525 | - if ($http_post) {
|
|
| 526 | - $user_login = $_POST['user_email']; |
|
| 527 | - $user_email = $_POST['user_email']; |
|
| 528 | - $user_fname = $_POST['user_fname']; |
|
| 529 | - |
|
| 530 | - $errors = geodir_register_new_user($user_login, $user_email); |
|
| 531 | - |
|
| 532 | - /* display error in registration form */ |
|
| 533 | - if (is_wp_error($errors)) {
|
|
| 534 | - $error_code = $errors->get_error_code(); |
|
| 535 | - $error_message = $errors->get_error_message($error_code); |
|
| 536 | - if (!isset($_POST['user_login']) && ($error_code == 'empty_username' || $error_code == 'invalid_username' || $error_code == 'username_exists')) {
|
|
| 537 | - if ($error_code == 'empty_username') {
|
|
| 538 | - $error_code = 'empty_email'; |
|
| 539 | - } else if ($error_code == 'invalid_username') {
|
|
| 540 | - $error_code = 'invalid_email'; |
|
| 541 | - } else if ($error_code == 'username_exists') {
|
|
| 542 | - $error_code = 'email_exists'; |
|
| 543 | - } |
|
| 544 | - |
|
| 545 | - $error_message = $errors->get_error_message($error_code); |
|
| 546 | - } |
|
| 547 | - global $geodir_signup_error; |
|
| 548 | - $geodir_signup_error = $error_message; |
|
| 549 | - } |
|
| 550 | - |
|
| 551 | - if (!is_wp_error($errors)) {
|
|
| 552 | - $_POST['log'] = $user_login; |
|
| 553 | - $_POST['pwd'] = $errors[1]; |
|
| 554 | - $_POST['testcookie'] = 1; |
|
| 555 | - |
|
| 556 | - $secure_cookie = ''; |
|
| 557 | - // If the user wants ssl but the session is not ssl, force a secure cookie. |
|
| 558 | - if (!empty($_POST['log'])) {
|
|
| 559 | - $user_name = sanitize_user($_POST['log']); |
|
| 560 | - if ($user = get_user_by('email', $user_name)) {
|
|
| 561 | - if (get_user_option('use_ssl', $user->ID)) {
|
|
| 562 | - $secure_cookie = true; |
|
| 563 | - force_ssl_admin(true); |
|
| 564 | - } |
|
| 565 | - } |
|
| 566 | - } |
|
| 567 | - |
|
| 568 | - $redirect_to = $_REQUEST['redirect_to']; |
|
| 569 | - |
|
| 570 | - if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {
|
|
| 571 | - if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], home_url())) {
|
|
| 572 | - $redirect_to = $_SERVER['HTTP_REFERER']; |
|
| 573 | - } else {
|
|
| 574 | - $redirect_to = home_url(); |
|
| 575 | - } |
|
| 576 | - |
|
| 577 | - } |
|
| 578 | - |
|
| 579 | - if (isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '') {
|
|
| 580 | - |
|
| 581 | - $redirect_to = $_REQUEST['redirect_add_listing']; |
|
| 582 | - } |
|
| 583 | - |
|
| 584 | - |
|
| 585 | - if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http'))) |
|
| 586 | - $secure_cookie = false; |
|
| 587 | - |
|
| 588 | - $user = wp_signon('', $secure_cookie);
|
|
| 589 | - |
|
| 590 | - $requested_redirect_to = isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '' ? $_REQUEST['redirect_add_listing'] : (isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : ''); |
|
| 591 | - /** |
|
| 592 | - * Filter the login redirect URL. |
|
| 593 | - * |
|
| 594 | - * @since 1.4.9 |
|
| 595 | - * @param string $redirect_to The redirect destination URL. |
|
| 596 | - * @param string $requested_redirect_to The requested redirect destination URL passed as a parameter. |
|
| 597 | - * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise. |
|
| 598 | - */ |
|
| 599 | - $redirect_to = apply_filters('login_redirect', $redirect_to, $requested_redirect_to, $user);
|
|
| 600 | - |
|
| 601 | - |
|
| 602 | - if (!is_wp_error($user)) {
|
|
| 603 | - wp_safe_redirect($redirect_to); |
|
| 604 | - exit(); |
|
| 605 | - } |
|
| 606 | - exit(); |
|
| 607 | - } |
|
| 608 | - } |
|
| 609 | - |
|
| 610 | - break; |
|
| 611 | - |
|
| 612 | - case 'login' : |
|
| 613 | - default: |
|
| 614 | - $secure_cookie = ''; |
|
| 615 | - |
|
| 616 | - if (!empty($_POST['log'])) {
|
|
| 617 | - $user_name = sanitize_user($_POST['log']); |
|
| 618 | - if ($user = get_user_by('login', $user_name)) {
|
|
| 619 | - |
|
| 620 | - if (get_user_option('use_ssl', $user->ID)) {
|
|
| 621 | - $secure_cookie = true; |
|
| 622 | - force_ssl_admin(true); |
|
| 623 | - } |
|
| 624 | - } elseif ($user = get_user_by('email', $user_name)) {
|
|
| 625 | - $_POST['log'] = $user->user_login; // If signing in by email, set the username for normal WP login |
|
| 626 | - if (get_user_option('use_ssl', $user->ID)) {
|
|
| 627 | - $secure_cookie = true; |
|
| 628 | - force_ssl_admin(true); |
|
| 629 | - } |
|
| 630 | - } |
|
| 631 | - } |
|
| 632 | - /////////////////////////// |
|
| 633 | - if (isset($_REQUEST['redirect_add_listing'])) {
|
|
| 634 | - $_REQUEST['redirect_to'] = $_REQUEST['redirect_add_listing']; |
|
| 635 | - } |
|
| 636 | - |
|
| 637 | - |
|
| 638 | - if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {
|
|
| 639 | - if (is_user_logged_in()) : |
|
| 640 | - $user_ID = !empty($user->ID) ? $user->ID : get_current_user_id(); |
|
| 641 | - $post_types = geodir_get_posttypes(); |
|
| 421 | + global $errors; |
|
| 422 | + $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'login'; |
|
| 423 | + |
|
| 424 | + $errors = new WP_Error(); |
|
| 425 | + |
|
| 426 | + if (isset($_GET['key'])) |
|
| 427 | + $action = 'resetpass'; |
|
| 428 | + |
|
| 429 | + // validate action so as to default to the login screen |
|
| 430 | + if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action))
|
|
| 431 | + $action = 'login'; |
|
| 432 | + |
|
| 433 | + nocache_headers(); |
|
| 434 | + |
|
| 435 | + if (defined('RELOCATE')) { // Move flag is set
|
|
| 436 | + if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF'])) |
|
| 437 | + $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']); |
|
| 438 | + |
|
| 439 | + $schema = (isset($_SERVER['HTTPS']) && geodir_strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://'; |
|
| 440 | + if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url()) |
|
| 441 | + update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));
|
|
| 442 | + } |
|
| 443 | + |
|
| 444 | + //Set a cookie now to see if they are supported by the browser. |
|
| 445 | + //setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN); |
|
| 446 | + if (SITECOOKIEPATH != COOKIEPATH) |
|
| 447 | + setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN); |
|
| 448 | + |
|
| 449 | + /** |
|
| 450 | + * Allow plugins to override the default actions, and to add extra actions if they want on the register/signin page. |
|
| 451 | + * |
|
| 452 | + * Used dynamic hook login_form_$action |
|
| 453 | + * |
|
| 454 | + * @since 1.0.0 |
|
| 455 | + */ |
|
| 456 | + do_action('login_form_' . $action);
|
|
| 457 | + |
|
| 458 | + $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
|
|
| 459 | + |
|
| 460 | + switch ($action): |
|
| 461 | + |
|
| 462 | + case 'logout' : |
|
| 463 | + //check_admin_referer('log-out');
|
|
| 464 | + wp_logout(); |
|
| 465 | + |
|
| 466 | + $redirect_to = $_SERVER['HTTP_REFERER']; |
|
| 467 | + //$redirect_to = home_url().'/?ptype=login&loggedout=true'; |
|
| 468 | + if (isset($_REQUEST['redirect_to'])) |
|
| 469 | + $redirect_to = $_REQUEST['redirect_to']; |
|
| 470 | + $redirect_to = home_url(); |
|
| 471 | + wp_safe_redirect($redirect_to); |
|
| 472 | + exit(); |
|
| 473 | + |
|
| 474 | + break; |
|
| 475 | + |
|
| 476 | + case 'lostpassword' : |
|
| 477 | + case 'retrievepassword' : |
|
| 478 | + if ($http_post) {
|
|
| 479 | + $errors = geodir_retrieve_password(); |
|
| 480 | + $error_message = isset($errors->errors['invalid_email'][0]) ? $errors->errors['invalid_email'][0] : ''; |
|
| 481 | + if (!is_wp_error($errors)) {
|
|
| 482 | + wp_redirect(geodir_login_url(array('checkemail'=>'confirm')));
|
|
| 483 | + gd_die(); |
|
| 484 | + } else {
|
|
| 485 | + wp_redirect(geodir_login_url(array('forgot' => 1, 'emsg'=>'fw')));
|
|
| 486 | + gd_die(); |
|
| 487 | + } |
|
| 488 | + } |
|
| 489 | + if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));
|
|
| 490 | + /** |
|
| 491 | + * Called in the geodir_user_signup() function during the lostpassword case. |
|
| 492 | + * |
|
| 493 | + * @since 1.0.0 |
|
| 494 | + */ |
|
| 495 | + do_action('lost_password');
|
|
| 496 | + $message = '<div class="sucess_msg">' . ENTER_USER_EMAIL_NEW_PW_MSG . '</div>'; |
|
| 497 | + $user_login = isset($_POST['user_login']) ? stripslashes($_POST['user_login']) : ''; |
|
| 498 | + |
|
| 499 | + break; |
|
| 500 | + |
|
| 501 | + case 'resetpass' : |
|
| 502 | + case 'rp' : |
|
| 503 | + $errors = reset_password($_GET['key'], $_GET['login']); |
|
| 504 | + |
|
| 505 | + if (!is_wp_error($errors)) {
|
|
| 506 | + wp_redirect(geodir_login_url(array('checkemail'=>'newpass')));
|
|
| 507 | + exit(); |
|
| 508 | + } |
|
| 509 | + |
|
| 510 | + wp_redirect(geodir_login_url(array('error'=>'invalidkey','action'=>'lostpassword')));
|
|
| 511 | + exit(); |
|
| 512 | + |
|
| 513 | + break; |
|
| 514 | + |
|
| 515 | + case 'register' : |
|
| 516 | + ############################### fix by Stiofan - HebTech.co.uk ### SECURITY FIX ############################## |
|
| 517 | + if (!get_option('users_can_register')) {
|
|
| 518 | + wp_redirect(geodir_login_url(array('emsg'=>'regnewusr')));
|
|
| 519 | + exit(); |
|
| 520 | + } |
|
| 521 | + ############################### fix by Stiofan - HebTech.co.uk ### SECURITY FIX ############################## |
|
| 522 | + global $user_email, $user_fname; |
|
| 523 | + $user_login = ''; |
|
| 524 | + $user_email = ''; |
|
| 525 | + if ($http_post) {
|
|
| 526 | + $user_login = $_POST['user_email']; |
|
| 527 | + $user_email = $_POST['user_email']; |
|
| 528 | + $user_fname = $_POST['user_fname']; |
|
| 529 | + |
|
| 530 | + $errors = geodir_register_new_user($user_login, $user_email); |
|
| 531 | + |
|
| 532 | + /* display error in registration form */ |
|
| 533 | + if (is_wp_error($errors)) {
|
|
| 534 | + $error_code = $errors->get_error_code(); |
|
| 535 | + $error_message = $errors->get_error_message($error_code); |
|
| 536 | + if (!isset($_POST['user_login']) && ($error_code == 'empty_username' || $error_code == 'invalid_username' || $error_code == 'username_exists')) {
|
|
| 537 | + if ($error_code == 'empty_username') {
|
|
| 538 | + $error_code = 'empty_email'; |
|
| 539 | + } else if ($error_code == 'invalid_username') {
|
|
| 540 | + $error_code = 'invalid_email'; |
|
| 541 | + } else if ($error_code == 'username_exists') {
|
|
| 542 | + $error_code = 'email_exists'; |
|
| 543 | + } |
|
| 544 | + |
|
| 545 | + $error_message = $errors->get_error_message($error_code); |
|
| 546 | + } |
|
| 547 | + global $geodir_signup_error; |
|
| 548 | + $geodir_signup_error = $error_message; |
|
| 549 | + } |
|
| 550 | + |
|
| 551 | + if (!is_wp_error($errors)) {
|
|
| 552 | + $_POST['log'] = $user_login; |
|
| 553 | + $_POST['pwd'] = $errors[1]; |
|
| 554 | + $_POST['testcookie'] = 1; |
|
| 555 | + |
|
| 556 | + $secure_cookie = ''; |
|
| 557 | + // If the user wants ssl but the session is not ssl, force a secure cookie. |
|
| 558 | + if (!empty($_POST['log'])) {
|
|
| 559 | + $user_name = sanitize_user($_POST['log']); |
|
| 560 | + if ($user = get_user_by('email', $user_name)) {
|
|
| 561 | + if (get_user_option('use_ssl', $user->ID)) {
|
|
| 562 | + $secure_cookie = true; |
|
| 563 | + force_ssl_admin(true); |
|
| 564 | + } |
|
| 565 | + } |
|
| 566 | + } |
|
| 567 | + |
|
| 568 | + $redirect_to = $_REQUEST['redirect_to']; |
|
| 569 | + |
|
| 570 | + if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {
|
|
| 571 | + if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], home_url())) {
|
|
| 572 | + $redirect_to = $_SERVER['HTTP_REFERER']; |
|
| 573 | + } else {
|
|
| 574 | + $redirect_to = home_url(); |
|
| 575 | + } |
|
| 576 | + |
|
| 577 | + } |
|
| 578 | + |
|
| 579 | + if (isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '') {
|
|
| 580 | + |
|
| 581 | + $redirect_to = $_REQUEST['redirect_add_listing']; |
|
| 582 | + } |
|
| 583 | + |
|
| 584 | + |
|
| 585 | + if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http'))) |
|
| 586 | + $secure_cookie = false; |
|
| 587 | + |
|
| 588 | + $user = wp_signon('', $secure_cookie);
|
|
| 589 | + |
|
| 590 | + $requested_redirect_to = isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '' ? $_REQUEST['redirect_add_listing'] : (isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : ''); |
|
| 591 | + /** |
|
| 592 | + * Filter the login redirect URL. |
|
| 593 | + * |
|
| 594 | + * @since 1.4.9 |
|
| 595 | + * @param string $redirect_to The redirect destination URL. |
|
| 596 | + * @param string $requested_redirect_to The requested redirect destination URL passed as a parameter. |
|
| 597 | + * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise. |
|
| 598 | + */ |
|
| 599 | + $redirect_to = apply_filters('login_redirect', $redirect_to, $requested_redirect_to, $user);
|
|
| 600 | + |
|
| 601 | + |
|
| 602 | + if (!is_wp_error($user)) {
|
|
| 603 | + wp_safe_redirect($redirect_to); |
|
| 604 | + exit(); |
|
| 605 | + } |
|
| 606 | + exit(); |
|
| 607 | + } |
|
| 608 | + } |
|
| 609 | + |
|
| 610 | + break; |
|
| 611 | + |
|
| 612 | + case 'login' : |
|
| 613 | + default: |
|
| 614 | + $secure_cookie = ''; |
|
| 615 | + |
|
| 616 | + if (!empty($_POST['log'])) {
|
|
| 617 | + $user_name = sanitize_user($_POST['log']); |
|
| 618 | + if ($user = get_user_by('login', $user_name)) {
|
|
| 619 | + |
|
| 620 | + if (get_user_option('use_ssl', $user->ID)) {
|
|
| 621 | + $secure_cookie = true; |
|
| 622 | + force_ssl_admin(true); |
|
| 623 | + } |
|
| 624 | + } elseif ($user = get_user_by('email', $user_name)) {
|
|
| 625 | + $_POST['log'] = $user->user_login; // If signing in by email, set the username for normal WP login |
|
| 626 | + if (get_user_option('use_ssl', $user->ID)) {
|
|
| 627 | + $secure_cookie = true; |
|
| 628 | + force_ssl_admin(true); |
|
| 629 | + } |
|
| 630 | + } |
|
| 631 | + } |
|
| 632 | + /////////////////////////// |
|
| 633 | + if (isset($_REQUEST['redirect_add_listing'])) {
|
|
| 634 | + $_REQUEST['redirect_to'] = $_REQUEST['redirect_add_listing']; |
|
| 635 | + } |
|
| 636 | + |
|
| 637 | + |
|
| 638 | + if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {
|
|
| 639 | + if (is_user_logged_in()) : |
|
| 640 | + $user_ID = !empty($user->ID) ? $user->ID : get_current_user_id(); |
|
| 641 | + $post_types = geodir_get_posttypes(); |
|
| 642 | 642 | |
| 643 | - if ( !empty( $_REQUEST['stype'] ) ) {
|
|
| 644 | - $dashboard_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 645 | - } else {
|
|
| 646 | - $user_listings = geodir_user_post_listing_count( $user_ID ); |
|
| 647 | - if ( !empty( $user_listings ) && $dashboard_post_types = array_keys( $user_listings ) ) {
|
|
| 648 | - $dashboard_post_type = $dashboard_post_types[0]; |
|
| 649 | - } |
|
| 650 | - } |
|
| 651 | - if ( !( !empty( $dashboard_post_type ) && in_array( $dashboard_post_type, $post_types ) ) ) {
|
|
| 652 | - $dashboard_post_type = $post_types[0]; |
|
| 653 | - } |
|
| 643 | + if ( !empty( $_REQUEST['stype'] ) ) {
|
|
| 644 | + $dashboard_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 645 | + } else {
|
|
| 646 | + $user_listings = geodir_user_post_listing_count( $user_ID ); |
|
| 647 | + if ( !empty( $user_listings ) && $dashboard_post_types = array_keys( $user_listings ) ) {
|
|
| 648 | + $dashboard_post_type = $dashboard_post_types[0]; |
|
| 649 | + } |
|
| 650 | + } |
|
| 651 | + if ( !( !empty( $dashboard_post_type ) && in_array( $dashboard_post_type, $post_types ) ) ) {
|
|
| 652 | + $dashboard_post_type = $post_types[0]; |
|
| 653 | + } |
|
| 654 | 654 | |
| 655 | - $author_link = get_author_posts_url($user_ID); |
|
| 656 | - $default_author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true', 'stype' => $dashboard_post_type), false);
|
|
| 657 | - |
|
| 658 | - /** |
|
| 659 | - * Filter the author link. |
|
| 660 | - * |
|
| 661 | - * @since 1.0.0 |
|
| 662 | - * |
|
| 663 | - * @param string $default_author_link Default author link. |
|
| 664 | - * @param int $user_ID The user ID. |
|
| 665 | - */ |
|
| 666 | - $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_ID);
|
|
| 667 | - |
|
| 668 | - $_REQUEST['redirect_to'] = $default_author_link; |
|
| 669 | - else: |
|
| 670 | - $_REQUEST['redirect_to'] = home_url(); |
|
| 671 | - endif; |
|
| 672 | - |
|
| 673 | - } |
|
| 674 | - if (isset($_REQUEST['redirect_to'])) {
|
|
| 675 | - $redirect_to = $_REQUEST['redirect_to']; |
|
| 676 | - // Redirect to https if user wants ssl |
|
| 677 | - if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin')) |
|
| 678 | - $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);
|
|
| 679 | - } else {
|
|
| 680 | - $redirect_to = admin_url(); |
|
| 681 | - } |
|
| 682 | - |
|
| 683 | - if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http'))) |
|
| 684 | - $secure_cookie = false; |
|
| 685 | - $user = wp_signon('', $secure_cookie);
|
|
| 686 | - |
|
| 687 | - |
|
| 688 | - /** |
|
| 689 | - * Filter the login redirect URL. |
|
| 690 | - * |
|
| 691 | - * @since 1.4.9 |
|
| 692 | - * @param string $redirect_to The redirect destination URL. |
|
| 693 | - * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise. |
|
| 694 | - */ |
|
| 695 | - $redirect_to = apply_filters('login_redirect', $redirect_to, isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '', $user);
|
|
| 696 | - |
|
| 697 | - if (is_wp_error($user)) {
|
|
| 698 | - if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], 'ptype=property_submit') && $_POST['log'] != '' && $_POST['pwd'] != '') {
|
|
| 699 | - wp_redirect($_SERVER['HTTP_REFERER'] . '&emsg=1'); |
|
| 700 | - } |
|
| 701 | - } |
|
| 702 | - if (!is_wp_error($user)) {
|
|
| 703 | - |
|
| 704 | - // Some servers are not logging the user in properly after wp_signon, se we set the user here. |
|
| 705 | - //wp_set_current_user($user->ID); |
|
| 706 | - //echo '###';exit; |
|
| 707 | - |
|
| 708 | - if ($redirect_to) {
|
|
| 709 | - wp_redirect($redirect_to); |
|
| 710 | - } else {
|
|
| 711 | - wp_redirect(home_url()); |
|
| 712 | - } |
|
| 713 | - gd_die(); |
|
| 714 | - } |
|
| 715 | - |
|
| 716 | - $errors = $user; |
|
| 717 | - |
|
| 718 | - // Clear errors if loggedout is set. |
|
| 719 | - if (!empty($_GET['loggedout'])) |
|
| 720 | - $errors = new WP_Error(); |
|
| 721 | - // If cookies are disabled we can't log in even with a valid user+pass |
|
| 722 | - if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE])) |
|
| 723 | - $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));
|
|
| 724 | - |
|
| 725 | - // Some parts of this script use the main login form to display a message |
|
| 726 | - if (isset($_GET['loggedout']) && TRUE == $_GET['loggedout']) {
|
|
| 727 | - $successmsg = '<div class="sucess_msg">' . YOU_ARE_LOGED_OUT_MSG . '</div>'; |
|
| 728 | - } elseif (isset($_GET['registration']) && 'disabled' == $_GET['registration']) {
|
|
| 729 | - $successmsg = USER_REG_NOT_ALLOW_MSG; |
|
| 730 | - } elseif (isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail']) {
|
|
| 731 | - $successmsg = EMAIL_CONFIRM_LINK_MSG; |
|
| 732 | - } elseif (isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail']) {
|
|
| 733 | - $successmsg = NEW_PW_EMAIL_MSG; |
|
| 734 | - } elseif (isset($_GET['checkemail']) && 'registered' == $_GET['checkemail']) {
|
|
| 735 | - $successmsg = REG_COMPLETE_MSG; |
|
| 736 | - } |
|
| 737 | - |
|
| 738 | - if ((isset($_POST['log']) && $_POST['log'] != '' && $errors) || ((!isset($_POST['log']) || $_POST['log'] == '') && isset($_REQUEST['testcookie']) && $_REQUEST['testcookie'])) {
|
|
| 739 | - if (isset($_REQUEST['pagetype']) && $_REQUEST['pagetype'] != '') {
|
|
| 740 | - wp_redirect($_REQUEST['pagetype'] . '&emsg=1'); |
|
| 741 | - } else {
|
|
| 742 | - wp_redirect(geodir_login_url(array('logemsg'=>'1','redirect_to'=>urlencode($_REQUEST['redirect_to']))));
|
|
| 743 | - } |
|
| 744 | - gd_die(); |
|
| 745 | - } |
|
| 746 | - break; |
|
| 747 | - endswitch; // end action switch |
|
| 655 | + $author_link = get_author_posts_url($user_ID); |
|
| 656 | + $default_author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true', 'stype' => $dashboard_post_type), false);
|
|
| 657 | + |
|
| 658 | + /** |
|
| 659 | + * Filter the author link. |
|
| 660 | + * |
|
| 661 | + * @since 1.0.0 |
|
| 662 | + * |
|
| 663 | + * @param string $default_author_link Default author link. |
|
| 664 | + * @param int $user_ID The user ID. |
|
| 665 | + */ |
|
| 666 | + $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_ID);
|
|
| 667 | + |
|
| 668 | + $_REQUEST['redirect_to'] = $default_author_link; |
|
| 669 | + else: |
|
| 670 | + $_REQUEST['redirect_to'] = home_url(); |
|
| 671 | + endif; |
|
| 672 | + |
|
| 673 | + } |
|
| 674 | + if (isset($_REQUEST['redirect_to'])) {
|
|
| 675 | + $redirect_to = $_REQUEST['redirect_to']; |
|
| 676 | + // Redirect to https if user wants ssl |
|
| 677 | + if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin')) |
|
| 678 | + $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);
|
|
| 679 | + } else {
|
|
| 680 | + $redirect_to = admin_url(); |
|
| 681 | + } |
|
| 682 | + |
|
| 683 | + if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http'))) |
|
| 684 | + $secure_cookie = false; |
|
| 685 | + $user = wp_signon('', $secure_cookie);
|
|
| 686 | + |
|
| 687 | + |
|
| 688 | + /** |
|
| 689 | + * Filter the login redirect URL. |
|
| 690 | + * |
|
| 691 | + * @since 1.4.9 |
|
| 692 | + * @param string $redirect_to The redirect destination URL. |
|
| 693 | + * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise. |
|
| 694 | + */ |
|
| 695 | + $redirect_to = apply_filters('login_redirect', $redirect_to, isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '', $user);
|
|
| 696 | + |
|
| 697 | + if (is_wp_error($user)) {
|
|
| 698 | + if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], 'ptype=property_submit') && $_POST['log'] != '' && $_POST['pwd'] != '') {
|
|
| 699 | + wp_redirect($_SERVER['HTTP_REFERER'] . '&emsg=1'); |
|
| 700 | + } |
|
| 701 | + } |
|
| 702 | + if (!is_wp_error($user)) {
|
|
| 703 | + |
|
| 704 | + // Some servers are not logging the user in properly after wp_signon, se we set the user here. |
|
| 705 | + //wp_set_current_user($user->ID); |
|
| 706 | + //echo '###';exit; |
|
| 707 | + |
|
| 708 | + if ($redirect_to) {
|
|
| 709 | + wp_redirect($redirect_to); |
|
| 710 | + } else {
|
|
| 711 | + wp_redirect(home_url()); |
|
| 712 | + } |
|
| 713 | + gd_die(); |
|
| 714 | + } |
|
| 715 | + |
|
| 716 | + $errors = $user; |
|
| 717 | + |
|
| 718 | + // Clear errors if loggedout is set. |
|
| 719 | + if (!empty($_GET['loggedout'])) |
|
| 720 | + $errors = new WP_Error(); |
|
| 721 | + // If cookies are disabled we can't log in even with a valid user+pass |
|
| 722 | + if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE])) |
|
| 723 | + $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));
|
|
| 724 | + |
|
| 725 | + // Some parts of this script use the main login form to display a message |
|
| 726 | + if (isset($_GET['loggedout']) && TRUE == $_GET['loggedout']) {
|
|
| 727 | + $successmsg = '<div class="sucess_msg">' . YOU_ARE_LOGED_OUT_MSG . '</div>'; |
|
| 728 | + } elseif (isset($_GET['registration']) && 'disabled' == $_GET['registration']) {
|
|
| 729 | + $successmsg = USER_REG_NOT_ALLOW_MSG; |
|
| 730 | + } elseif (isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail']) {
|
|
| 731 | + $successmsg = EMAIL_CONFIRM_LINK_MSG; |
|
| 732 | + } elseif (isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail']) {
|
|
| 733 | + $successmsg = NEW_PW_EMAIL_MSG; |
|
| 734 | + } elseif (isset($_GET['checkemail']) && 'registered' == $_GET['checkemail']) {
|
|
| 735 | + $successmsg = REG_COMPLETE_MSG; |
|
| 736 | + } |
|
| 737 | + |
|
| 738 | + if ((isset($_POST['log']) && $_POST['log'] != '' && $errors) || ((!isset($_POST['log']) || $_POST['log'] == '') && isset($_REQUEST['testcookie']) && $_REQUEST['testcookie'])) {
|
|
| 739 | + if (isset($_REQUEST['pagetype']) && $_REQUEST['pagetype'] != '') {
|
|
| 740 | + wp_redirect($_REQUEST['pagetype'] . '&emsg=1'); |
|
| 741 | + } else {
|
|
| 742 | + wp_redirect(geodir_login_url(array('logemsg'=>'1','redirect_to'=>urlencode($_REQUEST['redirect_to']))));
|
|
| 743 | + } |
|
| 744 | + gd_die(); |
|
| 745 | + } |
|
| 746 | + break; |
|
| 747 | + endswitch; // end action switch |
|
| 748 | 748 | } |
| 749 | 749 | \ No newline at end of file |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | if ($redirect) {
|
| 23 | 23 | ?> |
| 24 | 24 | <script type="text/javascript"> |
| 25 | - window.location.href = '<?php echo geodir_login_url();?>'; |
|
| 25 | + window.location.href = '<?php echo geodir_login_url(); ?>'; |
|
| 26 | 26 | </script> |
| 27 | 27 | <?php |
| 28 | 28 | } else |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));
|
| 48 | 48 | exit(); |
| 49 | 49 | } else {
|
| 50 | - wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
|
|
| 50 | + wp_redirect('https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
|
|
| 51 | 51 | exit(); |
| 52 | 52 | } |
| 53 | 53 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | * @param string $message Login message. |
| 61 | 61 | */ |
| 62 | 62 | $message = apply_filters('login_message', $message);
|
| 63 | - if (!empty($message)) echo $message . "\n"; |
|
| 63 | + if (!empty($message)) echo $message."\n"; |
|
| 64 | 64 | |
| 65 | 65 | } |
| 66 | 66 | |
@@ -208,9 +208,9 @@ discard block |
||
| 208 | 208 | |
| 209 | 209 | wp_set_password($new_pass, $user->ID); |
| 210 | 210 | update_user_meta($user->ID, 'default_password_nag', true); //Set up the Password change nag. |
| 211 | - $message = '<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>';
|
|
| 212 | - $message .= '<p>' . sprintf(__('Username: %s', 'geodirectory'), $user->user_login) . "</p>";
|
|
| 213 | - $message .= '<p>' . sprintf(__('Password: %s', 'geodirectory'), $new_pass) . "</p>";
|
|
| 211 | + $message = '<p><b>'.__('Your login Information :', 'geodirectory').'</b></p>';
|
|
| 212 | + $message .= '<p>'.sprintf(__('Username: %s', 'geodirectory'), $user->user_login)."</p>";
|
|
| 213 | + $message .= '<p>'.sprintf(__('Password: %s', 'geodirectory'), $new_pass)."</p>";
|
|
| 214 | 214 | //$message .= '<p>You can login to : <a href="'.home_url().'/?ptype=login' . "\">Login</a> or the URL is : ".home_url()."/?ptype=login</p>"; |
| 215 | 215 | //$message .= '<p>Thank You,<br> '.get_option('blogname').'</p>';
|
| 216 | 216 | $user_email = $user_data->user_email; |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | */ |
| 237 | 237 | $message = apply_filters('password_reset_message', $message, $new_pass);
|
| 238 | 238 | //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$user_name,$title,$message,$extra='');///forgot password email |
| 239 | - geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID);///forgot password email |
|
| 239 | + geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID); ///forgot password email |
|
| 240 | 240 | |
| 241 | 241 | return true; |
| 242 | 242 | } |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | * |
| 316 | 316 | * @param object $errors Registration error messages. |
| 317 | 317 | */ |
| 318 | - $errors = apply_filters('registration_errors', $errors,$user_login,$user_email);
|
|
| 318 | + $errors = apply_filters('registration_errors', $errors, $user_login, $user_email);
|
|
| 319 | 319 | |
| 320 | 320 | if ($errors->get_error_code()) |
| 321 | 321 | return $errors; |
@@ -390,13 +390,13 @@ discard block |
||
| 390 | 390 | ///////REGISTRATION EMAIL START////// |
| 391 | 391 | $fromEmail = geodir_get_site_email_id(); |
| 392 | 392 | $fromEmailName = get_site_emailName(); |
| 393 | - $message = __('<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>
|
|
| 394 | -<p>' . __('Username:', 'geodirectory') . ' ' . $user_login . '</p>
|
|
| 395 | -<p>' . __('Password:', 'geodirectory') . ' ' . $user_pass . '</p>');
|
|
| 393 | + $message = __('<p><b>'.__('Your login Information :', 'geodirectory').'</b></p>
|
|
| 394 | +<p>' . __('Username:', 'geodirectory').' '.$user_login.'</p>
|
|
| 395 | +<p>' . __('Password:', 'geodirectory').' '.$user_pass.'</p>');
|
|
| 396 | 396 | |
| 397 | 397 | /////////////customer email////////////// |
| 398 | 398 | //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$userName,$subject,$client_message,$extra='');///To client email |
| 399 | - geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id);/// registration email |
|
| 399 | + geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id); /// registration email |
|
| 400 | 400 | //////REGISTRATION EMAIL END//////// |
| 401 | 401 | } |
| 402 | 402 | |
@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | $action = 'resetpass'; |
| 428 | 428 | |
| 429 | 429 | // validate action so as to default to the login screen |
| 430 | - if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action))
|
|
| 430 | + if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_'.$action))
|
|
| 431 | 431 | $action = 'login'; |
| 432 | 432 | |
| 433 | 433 | nocache_headers(); |
@@ -437,8 +437,8 @@ discard block |
||
| 437 | 437 | $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']); |
| 438 | 438 | |
| 439 | 439 | $schema = (isset($_SERVER['HTTPS']) && geodir_strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://'; |
| 440 | - if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url()) |
|
| 441 | - update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));
|
|
| 440 | + if (dirname($schema.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF']) != home_url()) |
|
| 441 | + update_option('siteurl', dirname($schema.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF']));
|
|
| 442 | 442 | } |
| 443 | 443 | |
| 444 | 444 | //Set a cookie now to see if they are supported by the browser. |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | * |
| 454 | 454 | * @since 1.0.0 |
| 455 | 455 | */ |
| 456 | - do_action('login_form_' . $action);
|
|
| 456 | + do_action('login_form_'.$action);
|
|
| 457 | 457 | |
| 458 | 458 | $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
|
| 459 | 459 | |
@@ -493,7 +493,7 @@ discard block |
||
| 493 | 493 | * @since 1.0.0 |
| 494 | 494 | */ |
| 495 | 495 | do_action('lost_password');
|
| 496 | - $message = '<div class="sucess_msg">' . ENTER_USER_EMAIL_NEW_PW_MSG . '</div>'; |
|
| 496 | + $message = '<div class="sucess_msg">'.ENTER_USER_EMAIL_NEW_PW_MSG.'</div>'; |
|
| 497 | 497 | $user_login = isset($_POST['user_login']) ? stripslashes($_POST['user_login']) : ''; |
| 498 | 498 | |
| 499 | 499 | break; |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | exit(); |
| 508 | 508 | } |
| 509 | 509 | |
| 510 | - wp_redirect(geodir_login_url(array('error'=>'invalidkey','action'=>'lostpassword')));
|
|
| 510 | + wp_redirect(geodir_login_url(array('error'=>'invalidkey', 'action'=>'lostpassword')));
|
|
| 511 | 511 | exit(); |
| 512 | 512 | |
| 513 | 513 | break; |
@@ -640,15 +640,15 @@ discard block |
||
| 640 | 640 | $user_ID = !empty($user->ID) ? $user->ID : get_current_user_id(); |
| 641 | 641 | $post_types = geodir_get_posttypes(); |
| 642 | 642 | |
| 643 | - if ( !empty( $_REQUEST['stype'] ) ) {
|
|
| 643 | + if (!empty($_REQUEST['stype'])) {
|
|
| 644 | 644 | $dashboard_post_type = sanitize_text_field($_REQUEST['stype']); |
| 645 | 645 | } else {
|
| 646 | - $user_listings = geodir_user_post_listing_count( $user_ID ); |
|
| 647 | - if ( !empty( $user_listings ) && $dashboard_post_types = array_keys( $user_listings ) ) {
|
|
| 646 | + $user_listings = geodir_user_post_listing_count($user_ID); |
|
| 647 | + if (!empty($user_listings) && $dashboard_post_types = array_keys($user_listings)) {
|
|
| 648 | 648 | $dashboard_post_type = $dashboard_post_types[0]; |
| 649 | 649 | } |
| 650 | 650 | } |
| 651 | - if ( !( !empty( $dashboard_post_type ) && in_array( $dashboard_post_type, $post_types ) ) ) {
|
|
| 651 | + if (!(!empty($dashboard_post_type) && in_array($dashboard_post_type, $post_types))) {
|
|
| 652 | 652 | $dashboard_post_type = $post_types[0]; |
| 653 | 653 | } |
| 654 | 654 | |
@@ -696,7 +696,7 @@ discard block |
||
| 696 | 696 | |
| 697 | 697 | if (is_wp_error($user)) {
|
| 698 | 698 | if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], 'ptype=property_submit') && $_POST['log'] != '' && $_POST['pwd'] != '') {
|
| 699 | - wp_redirect($_SERVER['HTTP_REFERER'] . '&emsg=1'); |
|
| 699 | + wp_redirect($_SERVER['HTTP_REFERER'].'&emsg=1'); |
|
| 700 | 700 | } |
| 701 | 701 | } |
| 702 | 702 | if (!is_wp_error($user)) {
|
@@ -724,7 +724,7 @@ discard block |
||
| 724 | 724 | |
| 725 | 725 | // Some parts of this script use the main login form to display a message |
| 726 | 726 | if (isset($_GET['loggedout']) && TRUE == $_GET['loggedout']) {
|
| 727 | - $successmsg = '<div class="sucess_msg">' . YOU_ARE_LOGED_OUT_MSG . '</div>'; |
|
| 727 | + $successmsg = '<div class="sucess_msg">'.YOU_ARE_LOGED_OUT_MSG.'</div>'; |
|
| 728 | 728 | } elseif (isset($_GET['registration']) && 'disabled' == $_GET['registration']) {
|
| 729 | 729 | $successmsg = USER_REG_NOT_ALLOW_MSG; |
| 730 | 730 | } elseif (isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail']) {
|
@@ -737,9 +737,9 @@ discard block |
||
| 737 | 737 | |
| 738 | 738 | if ((isset($_POST['log']) && $_POST['log'] != '' && $errors) || ((!isset($_POST['log']) || $_POST['log'] == '') && isset($_REQUEST['testcookie']) && $_REQUEST['testcookie'])) {
|
| 739 | 739 | if (isset($_REQUEST['pagetype']) && $_REQUEST['pagetype'] != '') {
|
| 740 | - wp_redirect($_REQUEST['pagetype'] . '&emsg=1'); |
|
| 740 | + wp_redirect($_REQUEST['pagetype'].'&emsg=1'); |
|
| 741 | 741 | } else {
|
| 742 | - wp_redirect(geodir_login_url(array('logemsg'=>'1','redirect_to'=>urlencode($_REQUEST['redirect_to']))));
|
|
| 742 | + wp_redirect(geodir_login_url(array('logemsg'=>'1', 'redirect_to'=>urlencode($_REQUEST['redirect_to']))));
|
|
| 743 | 743 | } |
| 744 | 744 | gd_die(); |
| 745 | 745 | } |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | function geodir_get_ajax_url() |
| 21 | 21 | {
|
| 22 | - return admin_url('admin-ajax.php?action=geodir_ajax_action');
|
|
| 22 | + return admin_url('admin-ajax.php?action=geodir_ajax_action');
|
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | ///////////////////// |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | add_filter('query_vars', 'geodir_add_geodir_page_var');
|
| 88 | 88 | add_action('wp', 'geodir_add_page_id_in_query_var'); // problem fix in wordpress 3.8
|
| 89 | 89 | if (get_option('permalink_structure') != '')
|
| 90 | - add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
|
|
| 90 | + add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
|
|
| 91 | 91 | |
| 92 | 92 | add_filter('parse_query', 'geodir_modified_query');
|
| 93 | 93 | |
@@ -154,14 +154,14 @@ discard block |
||
| 154 | 154 | /* POST AND LOOP ACTIONS */ |
| 155 | 155 | //////////////////////// |
| 156 | 156 | if (!is_admin()) {
|
| 157 | - add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtual page from everywhere
|
|
| 158 | - add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);
|
|
| 159 | - /** Exclude Virtual Pages From Pages List **/ |
|
| 160 | - add_action('pre_get_posts', 'set_listing_request', 0);
|
|
| 161 | - add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);
|
|
| 162 | - add_filter('excerpt_more', 'geodir_excerpt_more', 1000);
|
|
| 163 | - add_filter('excerpt_length', 'geodir_excerpt_length', 1000);
|
|
| 164 | - add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter
|
|
| 157 | + add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtual page from everywhere
|
|
| 158 | + add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);
|
|
| 159 | + /** Exclude Virtual Pages From Pages List **/ |
|
| 160 | + add_action('pre_get_posts', 'set_listing_request', 0);
|
|
| 161 | + add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);
|
|
| 162 | + add_filter('excerpt_more', 'geodir_excerpt_more', 1000);
|
|
| 163 | + add_filter('excerpt_length', 'geodir_excerpt_length', 1000);
|
|
| 164 | + add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter
|
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | |
@@ -223,12 +223,12 @@ discard block |
||
| 223 | 223 | */ |
| 224 | 224 | function geodir_unset_prev_theme_nav_location($newname) |
| 225 | 225 | {
|
| 226 | - $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);
|
|
| 227 | - if ($geodir_theme_location) {
|
|
| 228 | - update_option('geodir_theme_location_nav', $geodir_theme_location);
|
|
| 229 | - } else {
|
|
| 230 | - update_option('geodir_theme_location_nav', '');
|
|
| 231 | - } |
|
| 226 | + $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);
|
|
| 227 | + if ($geodir_theme_location) {
|
|
| 228 | + update_option('geodir_theme_location_nav', $geodir_theme_location);
|
|
| 229 | + } else {
|
|
| 230 | + update_option('geodir_theme_location_nav', '');
|
|
| 231 | + } |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | /// add action for theme switch to blank previous theme navigation location setting |
@@ -249,42 +249,42 @@ discard block |
||
| 249 | 249 | */ |
| 250 | 250 | function geodir_add_post_filters() |
| 251 | 251 | {
|
| 252 | - /** |
|
| 253 | - * Contains all function for filtering listing. |
|
| 254 | - * |
|
| 255 | - * @since 1.0.0 |
|
| 256 | - * @package GeoDirectory |
|
| 257 | - */ |
|
| 258 | - include_once('geodirectory-functions/listing_filters.php');
|
|
| 252 | + /** |
|
| 253 | + * Contains all function for filtering listing. |
|
| 254 | + * |
|
| 255 | + * @since 1.0.0 |
|
| 256 | + * @package GeoDirectory |
|
| 257 | + */ |
|
| 258 | + include_once('geodirectory-functions/listing_filters.php');
|
|
| 259 | 259 | |
| 260 | - // Theme My Login compatibility fix |
|
| 261 | - if ( isset( $_REQUEST['geodir_search'] ) && class_exists( 'Theme_My_Login' ) ) {
|
|
| 262 | - remove_action( 'pre_get_posts', array( Theme_My_Login::get_object(), 'pre_get_posts' ) ); |
|
| 263 | - } |
|
| 260 | + // Theme My Login compatibility fix |
|
| 261 | + if ( isset( $_REQUEST['geodir_search'] ) && class_exists( 'Theme_My_Login' ) ) {
|
|
| 262 | + remove_action( 'pre_get_posts', array( Theme_My_Login::get_object(), 'pre_get_posts' ) ); |
|
| 263 | + } |
|
| 264 | 264 | |
| 265 | - if ( isset( $_REQUEST['geodir_search'] ) ) {
|
|
| 266 | - add_filter( 'geodir_filter_widget_listings_fields', 'geodir_search_widget_location_filter_fields', 100, 3 ); |
|
| 267 | - add_filter( 'geodir_filter_widget_listings_orderby', 'geodir_search_widget_location_filter_orderby', 100, 3 ); |
|
| 268 | - } |
|
| 265 | + if ( isset( $_REQUEST['geodir_search'] ) ) {
|
|
| 266 | + add_filter( 'geodir_filter_widget_listings_fields', 'geodir_search_widget_location_filter_fields', 100, 3 ); |
|
| 267 | + add_filter( 'geodir_filter_widget_listings_orderby', 'geodir_search_widget_location_filter_orderby', 100, 3 ); |
|
| 268 | + } |
|
| 269 | 269 | } |
| 270 | 270 | |
| 271 | 271 | |
| 272 | 272 | if (!function_exists('geodir_init_defaults')) {
|
| 273 | - /** |
|
| 274 | - * Calls the function to register the GeoDirectory default CPT and taxonomies. |
|
| 275 | - * |
|
| 276 | - * @since 1.0.0 |
|
| 277 | - * @package GeoDirectory |
|
| 278 | - */ |
|
| 279 | - function geodir_init_defaults() |
|
| 280 | - {
|
|
| 281 | - if (function_exists('geodir_register_defaults')) {
|
|
| 273 | + /** |
|
| 274 | + * Calls the function to register the GeoDirectory default CPT and taxonomies. |
|
| 275 | + * |
|
| 276 | + * @since 1.0.0 |
|
| 277 | + * @package GeoDirectory |
|
| 278 | + */ |
|
| 279 | + function geodir_init_defaults() |
|
| 280 | + {
|
|
| 281 | + if (function_exists('geodir_register_defaults')) {
|
|
| 282 | 282 | |
| 283 | - geodir_register_defaults(); |
|
| 283 | + geodir_register_defaults(); |
|
| 284 | 284 | |
| 285 | - } |
|
| 285 | + } |
|
| 286 | 286 | |
| 287 | - } |
|
| 287 | + } |
|
| 288 | 288 | } |
| 289 | 289 | |
| 290 | 290 | |
@@ -306,26 +306,26 @@ discard block |
||
| 306 | 306 | // CALLED ON 'sidebars_widgets' FILTER |
| 307 | 307 | |
| 308 | 308 | if (!function_exists('geodir_restrict_widget')) {
|
| 309 | - /** |
|
| 310 | - * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page. |
|
| 311 | - * |
|
| 312 | - * @global bool $is_listing Sets the global value to true if on a GD category page. False if not. |
|
| 313 | - * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not. |
|
| 314 | - * @since 1.0.0 |
|
| 315 | - * @package GeoDirectory |
|
| 316 | - */ |
|
| 317 | - function geodir_restrict_widget() |
|
| 318 | - {
|
|
| 319 | - global $is_listing, $is_single_place; |
|
| 309 | + /** |
|
| 310 | + * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page. |
|
| 311 | + * |
|
| 312 | + * @global bool $is_listing Sets the global value to true if on a GD category page. False if not. |
|
| 313 | + * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not. |
|
| 314 | + * @since 1.0.0 |
|
| 315 | + * @package GeoDirectory |
|
| 316 | + */ |
|
| 317 | + function geodir_restrict_widget() |
|
| 318 | + {
|
|
| 319 | + global $is_listing, $is_single_place; |
|
| 320 | 320 | |
| 321 | - // set is listing |
|
| 322 | - (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;
|
|
| 321 | + // set is listing |
|
| 322 | + (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;
|
|
| 323 | 323 | |
| 324 | - // set is single place |
|
| 325 | - (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;
|
|
| 324 | + // set is single place |
|
| 325 | + (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;
|
|
| 326 | 326 | |
| 327 | 327 | |
| 328 | - } |
|
| 328 | + } |
|
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | |
@@ -346,31 +346,31 @@ discard block |
||
| 346 | 346 | */ |
| 347 | 347 | function geodir_detail_page_sidebar_content_sorting() |
| 348 | 348 | {
|
| 349 | - $arr_detail_page_sidebar_content = |
|
| 350 | - /** |
|
| 351 | - * An array of functions to be called to be displayed on the details (post) page sidebar. |
|
| 352 | - * |
|
| 353 | - * This filter can be used to remove sections of the details page sidebar, |
|
| 354 | - * add new sections or rearrange the order of the sections. |
|
| 355 | - * |
|
| 356 | - * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.
|
|
| 357 | - * @since 1.0.0 |
|
| 358 | - */ |
|
| 359 | - apply_filters('geodir_detail_page_sidebar_content',
|
|
| 360 | - array('geodir_social_sharing_buttons',
|
|
| 361 | - 'geodir_detail_page_google_analytics', |
|
| 362 | - 'geodir_edit_post_link', |
|
| 363 | - 'geodir_detail_page_review_rating', |
|
| 364 | - 'geodir_detail_page_more_info' |
|
| 365 | - ) // end of array |
|
| 366 | - ); // end of apply filter |
|
| 367 | - if (!empty($arr_detail_page_sidebar_content)) {
|
|
| 368 | - foreach ($arr_detail_page_sidebar_content as $content_function) {
|
|
| 369 | - if (function_exists($content_function)) {
|
|
| 370 | - add_action('geodir_detail_page_sidebar', $content_function);
|
|
| 371 | - } |
|
| 372 | - } |
|
| 373 | - } |
|
| 349 | + $arr_detail_page_sidebar_content = |
|
| 350 | + /** |
|
| 351 | + * An array of functions to be called to be displayed on the details (post) page sidebar. |
|
| 352 | + * |
|
| 353 | + * This filter can be used to remove sections of the details page sidebar, |
|
| 354 | + * add new sections or rearrange the order of the sections. |
|
| 355 | + * |
|
| 356 | + * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.
|
|
| 357 | + * @since 1.0.0 |
|
| 358 | + */ |
|
| 359 | + apply_filters('geodir_detail_page_sidebar_content',
|
|
| 360 | + array('geodir_social_sharing_buttons',
|
|
| 361 | + 'geodir_detail_page_google_analytics', |
|
| 362 | + 'geodir_edit_post_link', |
|
| 363 | + 'geodir_detail_page_review_rating', |
|
| 364 | + 'geodir_detail_page_more_info' |
|
| 365 | + ) // end of array |
|
| 366 | + ); // end of apply filter |
|
| 367 | + if (!empty($arr_detail_page_sidebar_content)) {
|
|
| 368 | + foreach ($arr_detail_page_sidebar_content as $content_function) {
|
|
| 369 | + if (function_exists($content_function)) {
|
|
| 370 | + add_action('geodir_detail_page_sidebar', $content_function);
|
|
| 371 | + } |
|
| 372 | + } |
|
| 373 | + } |
|
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | add_action('geodir_after_edit_post_link', 'geodir_add_to_favourite_link', 1);
|
@@ -385,14 +385,14 @@ discard block |
||
| 385 | 385 | */ |
| 386 | 386 | function geodir_add_to_favourite_link() |
| 387 | 387 | {
|
| 388 | - global $post, $preview; |
|
| 389 | - if (!$preview && geodir_is_page('detail')) {
|
|
| 390 | - ?> |
|
| 388 | + global $post, $preview; |
|
| 389 | + if (!$preview && geodir_is_page('detail')) {
|
|
| 390 | + ?> |
|
| 391 | 391 | <p class="edit_link"> |
| 392 | 392 | <?php geodir_favourite_html($post->post_author, $post->ID); ?> |
| 393 | 393 | </p> |
| 394 | 394 | <?php |
| 395 | - } |
|
| 395 | + } |
|
| 396 | 396 | } |
| 397 | 397 | |
| 398 | 398 | /** |
@@ -406,41 +406,41 @@ discard block |
||
| 406 | 406 | */ |
| 407 | 407 | function geodir_social_sharing_buttons() |
| 408 | 408 | {
|
| 409 | - global $preview; |
|
| 410 | - ob_start(); // Start buffering; |
|
| 411 | - /** |
|
| 412 | - * This action is called before the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 413 | - * |
|
| 414 | - * @since 1.0.0 |
|
| 415 | - */ |
|
| 416 | - do_action('geodir_before_social_sharing_buttons');
|
|
| 417 | - if (!$preview) {
|
|
| 418 | - ?> |
|
| 409 | + global $preview; |
|
| 410 | + ob_start(); // Start buffering; |
|
| 411 | + /** |
|
| 412 | + * This action is called before the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 413 | + * |
|
| 414 | + * @since 1.0.0 |
|
| 415 | + */ |
|
| 416 | + do_action('geodir_before_social_sharing_buttons');
|
|
| 417 | + if (!$preview) {
|
|
| 418 | + ?> |
|
| 419 | 419 | <div class="likethis"> |
| 420 | 420 | <?php geodir_twitter_tweet_button(); ?> |
| 421 | 421 | <?php geodir_fb_like_button(); ?> |
| 422 | 422 | <?php geodir_google_plus_button(); ?> |
| 423 | 423 | </div> |
| 424 | 424 | <?php |
| 425 | - }// end of if, if its a preview or not |
|
| 426 | - |
|
| 427 | - /** |
|
| 428 | - * This action is called after the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 429 | - * |
|
| 430 | - * @since 1.0.0 |
|
| 431 | - */ |
|
| 432 | - do_action('geodir_after_social_sharing_buttons');
|
|
| 433 | - $content_html = ob_get_clean(); |
|
| 434 | - if (trim($content_html) != '') |
|
| 435 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 436 | - if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
| 437 | - /** |
|
| 438 | - * Filter the geodir_social_sharing_buttons() function content. |
|
| 439 | - * |
|
| 440 | - * @param string $content_html The output html of the geodir_social_sharing_buttons() function. |
|
| 441 | - */ |
|
| 442 | - echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);
|
|
| 443 | - } |
|
| 425 | + }// end of if, if its a preview or not |
|
| 426 | + |
|
| 427 | + /** |
|
| 428 | + * This action is called after the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 429 | + * |
|
| 430 | + * @since 1.0.0 |
|
| 431 | + */ |
|
| 432 | + do_action('geodir_after_social_sharing_buttons');
|
|
| 433 | + $content_html = ob_get_clean(); |
|
| 434 | + if (trim($content_html) != '') |
|
| 435 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 436 | + if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
| 437 | + /** |
|
| 438 | + * Filter the geodir_social_sharing_buttons() function content. |
|
| 439 | + * |
|
| 440 | + * @param string $content_html The output html of the geodir_social_sharing_buttons() function. |
|
| 441 | + */ |
|
| 442 | + echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);
|
|
| 443 | + } |
|
| 444 | 444 | |
| 445 | 445 | |
| 446 | 446 | } |
@@ -458,46 +458,46 @@ discard block |
||
| 458 | 458 | */ |
| 459 | 459 | function geodir_edit_post_link() |
| 460 | 460 | {
|
| 461 | - global $post, $preview; |
|
| 462 | - ob_start(); // Start buffering; |
|
| 463 | - /** |
|
| 464 | - * This is called before the edit post link html in the function geodir_edit_post_link() |
|
| 465 | - * |
|
| 466 | - * @since 1.0.0 |
|
| 467 | - */ |
|
| 468 | - do_action('geodir_before_edit_post_link');
|
|
| 469 | - if (!$preview) {
|
|
| 470 | - $is_current_user_owner = geodir_listing_belong_to_current_user(); |
|
| 461 | + global $post, $preview; |
|
| 462 | + ob_start(); // Start buffering; |
|
| 463 | + /** |
|
| 464 | + * This is called before the edit post link html in the function geodir_edit_post_link() |
|
| 465 | + * |
|
| 466 | + * @since 1.0.0 |
|
| 467 | + */ |
|
| 468 | + do_action('geodir_before_edit_post_link');
|
|
| 469 | + if (!$preview) {
|
|
| 470 | + $is_current_user_owner = geodir_listing_belong_to_current_user(); |
|
| 471 | 471 | |
| 472 | - if ($is_current_user_owner) {
|
|
| 473 | - $post_id = $post->ID; |
|
| 472 | + if ($is_current_user_owner) {
|
|
| 473 | + $post_id = $post->ID; |
|
| 474 | 474 | |
| 475 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 476 | - $post_id = (int)$_REQUEST['pid']; |
|
| 477 | - } |
|
| 475 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 476 | + $post_id = (int)$_REQUEST['pid']; |
|
| 477 | + } |
|
| 478 | 478 | |
| 479 | - $postlink = get_permalink(geodir_add_listing_page_id()); |
|
| 480 | - $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);
|
|
| 481 | - echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';
|
|
| 482 | - } |
|
| 483 | - }// end of if, if its a preview or not |
|
| 484 | - /** |
|
| 485 | - * This is called after the edit post link html in the function geodir_edit_post_link() |
|
| 486 | - * |
|
| 487 | - * @since 1.0.0 |
|
| 488 | - */ |
|
| 489 | - do_action('geodir_after_edit_post_link');
|
|
| 490 | - $content_html = ob_get_clean(); |
|
| 491 | - if (trim($content_html) != '') |
|
| 492 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 493 | - if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
|
| 494 | - /** |
|
| 495 | - * Filter the geodir_edit_post_link() function content. |
|
| 496 | - * |
|
| 497 | - * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 498 | - */ |
|
| 499 | - echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);
|
|
| 500 | - } |
|
| 479 | + $postlink = get_permalink(geodir_add_listing_page_id()); |
|
| 480 | + $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);
|
|
| 481 | + echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';
|
|
| 482 | + } |
|
| 483 | + }// end of if, if its a preview or not |
|
| 484 | + /** |
|
| 485 | + * This is called after the edit post link html in the function geodir_edit_post_link() |
|
| 486 | + * |
|
| 487 | + * @since 1.0.0 |
|
| 488 | + */ |
|
| 489 | + do_action('geodir_after_edit_post_link');
|
|
| 490 | + $content_html = ob_get_clean(); |
|
| 491 | + if (trim($content_html) != '') |
|
| 492 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 493 | + if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
|
| 494 | + /** |
|
| 495 | + * Filter the geodir_edit_post_link() function content. |
|
| 496 | + * |
|
| 497 | + * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 498 | + */ |
|
| 499 | + echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);
|
|
| 500 | + } |
|
| 501 | 501 | } |
| 502 | 502 | |
| 503 | 503 | /** |
@@ -511,42 +511,42 @@ discard block |
||
| 511 | 511 | */ |
| 512 | 512 | function geodir_detail_page_google_analytics() |
| 513 | 513 | {
|
| 514 | - global $post,$preview; |
|
| 515 | - if($preview){return '';}
|
|
| 516 | - $package_info = array(); |
|
| 517 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 514 | + global $post,$preview; |
|
| 515 | + if($preview){return '';}
|
|
| 516 | + $package_info = array(); |
|
| 517 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 518 | 518 | |
| 519 | - $id = trim(get_option('geodir_ga_account_id'));
|
|
| 519 | + $id = trim(get_option('geodir_ga_account_id'));
|
|
| 520 | 520 | |
| 521 | - if (!$id) {
|
|
| 522 | - return; //if no Google Analytics ID then bail. |
|
| 523 | - } |
|
| 521 | + if (!$id) {
|
|
| 522 | + return; //if no Google Analytics ID then bail. |
|
| 523 | + } |
|
| 524 | 524 | |
| 525 | - ob_start(); // Start buffering; |
|
| 526 | - /** |
|
| 527 | - * This is called before the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 528 | - * |
|
| 529 | - * @since 1.0.0 |
|
| 530 | - */ |
|
| 531 | - do_action('geodir_before_google_analytics');
|
|
| 525 | + ob_start(); // Start buffering; |
|
| 526 | + /** |
|
| 527 | + * This is called before the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 528 | + * |
|
| 529 | + * @since 1.0.0 |
|
| 530 | + */ |
|
| 531 | + do_action('geodir_before_google_analytics');
|
|
| 532 | 532 | |
| 533 | - $refresh_time = get_option('geodir_ga_refresh_time', 5);
|
|
| 534 | - /** |
|
| 535 | - * Filter the time interval to check & refresh new users results. |
|
| 536 | - * |
|
| 537 | - * @since 1.5.9 |
|
| 538 | - * |
|
| 539 | - * @param int $refresh_time Time interval to check & refresh new users results. |
|
| 540 | - */ |
|
| 541 | - $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);
|
|
| 542 | - $refresh_time = absint($refresh_time * 1000); |
|
| 533 | + $refresh_time = get_option('geodir_ga_refresh_time', 5);
|
|
| 534 | + /** |
|
| 535 | + * Filter the time interval to check & refresh new users results. |
|
| 536 | + * |
|
| 537 | + * @since 1.5.9 |
|
| 538 | + * |
|
| 539 | + * @param int $refresh_time Time interval to check & refresh new users results. |
|
| 540 | + */ |
|
| 541 | + $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);
|
|
| 542 | + $refresh_time = absint($refresh_time * 1000); |
|
| 543 | 543 | |
| 544 | - $hide_refresh = get_option('geodir_ga_auto_refresh');
|
|
| 544 | + $hide_refresh = get_option('geodir_ga_auto_refresh');
|
|
| 545 | 545 | |
| 546 | - $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0; |
|
| 547 | - if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {
|
|
| 548 | - $page_url = urlencode($_SERVER['REQUEST_URI']); |
|
| 549 | - ?> |
|
| 546 | + $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0; |
|
| 547 | + if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {
|
|
| 548 | + $page_url = urlencode($_SERVER['REQUEST_URI']); |
|
| 549 | + ?> |
|
| 550 | 550 | <script type="text/javascript"> |
| 551 | 551 | var gd_gaTimeOut; |
| 552 | 552 | var gd_gaTime = parseInt('<?php echo $refresh_time;?>');
|
@@ -798,15 +798,15 @@ discard block |
||
| 798 | 798 | var labels = results[1].rows.map(function(row) { return +row[0]; });
|
| 799 | 799 | |
| 800 | 800 | <?php |
| 801 | - // Here we list the shorthand days of the week so it can be used in translation. |
|
| 802 | - __("Mon",'geodirectory');
|
|
| 803 | - __("Tue",'geodirectory');
|
|
| 804 | - __("Wed",'geodirectory');
|
|
| 805 | - __("Thu",'geodirectory');
|
|
| 806 | - __("Fri",'geodirectory');
|
|
| 807 | - __("Sat",'geodirectory');
|
|
| 808 | - __("Sun",'geodirectory');
|
|
| 809 | - ?> |
|
| 801 | + // Here we list the shorthand days of the week so it can be used in translation. |
|
| 802 | + __("Mon",'geodirectory');
|
|
| 803 | + __("Tue",'geodirectory');
|
|
| 804 | + __("Wed",'geodirectory');
|
|
| 805 | + __("Thu",'geodirectory');
|
|
| 806 | + __("Fri",'geodirectory');
|
|
| 807 | + __("Sat",'geodirectory');
|
|
| 808 | + __("Sun",'geodirectory');
|
|
| 809 | + ?> |
|
| 810 | 810 | |
| 811 | 811 | labels = [ |
| 812 | 812 | "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",
|
@@ -1055,24 +1055,24 @@ discard block |
||
| 1055 | 1055 | </span> |
| 1056 | 1056 | |
| 1057 | 1057 | <?php |
| 1058 | - } |
|
| 1059 | - /** |
|
| 1060 | - * This is called after the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 1061 | - * |
|
| 1062 | - * @since 1.0.0 |
|
| 1063 | - */ |
|
| 1064 | - do_action('geodir_after_google_analytics');
|
|
| 1065 | - $content_html = ob_get_clean(); |
|
| 1066 | - if (trim($content_html) != '') |
|
| 1067 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1068 | - if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
|
| 1069 | - /** |
|
| 1070 | - * Filter the geodir_edit_post_link() function content. |
|
| 1071 | - * |
|
| 1072 | - * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 1073 | - */ |
|
| 1074 | - echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);
|
|
| 1075 | - } |
|
| 1058 | + } |
|
| 1059 | + /** |
|
| 1060 | + * This is called after the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 1061 | + * |
|
| 1062 | + * @since 1.0.0 |
|
| 1063 | + */ |
|
| 1064 | + do_action('geodir_after_google_analytics');
|
|
| 1065 | + $content_html = ob_get_clean(); |
|
| 1066 | + if (trim($content_html) != '') |
|
| 1067 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1068 | + if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
|
| 1069 | + /** |
|
| 1070 | + * Filter the geodir_edit_post_link() function content. |
|
| 1071 | + * |
|
| 1072 | + * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 1073 | + */ |
|
| 1074 | + echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);
|
|
| 1075 | + } |
|
| 1076 | 1076 | } |
| 1077 | 1077 | |
| 1078 | 1078 | /** |
@@ -1089,94 +1089,94 @@ discard block |
||
| 1089 | 1089 | */ |
| 1090 | 1090 | function geodir_detail_page_review_rating() |
| 1091 | 1091 | {
|
| 1092 | - global $post, $preview, $post_images; |
|
| 1092 | + global $post, $preview, $post_images; |
|
| 1093 | 1093 | |
| 1094 | - if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int)$post->ID)) {
|
|
| 1095 | - return; |
|
| 1096 | - } |
|
| 1097 | - ob_start(); // Start buffering; |
|
| 1098 | - /** |
|
| 1099 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1100 | - * |
|
| 1101 | - * This is called outside the check for an actual rating and the check for preview page. |
|
| 1102 | - * |
|
| 1103 | - * @since 1.0.0 |
|
| 1104 | - */ |
|
| 1105 | - do_action('geodir_before_detail_page_review_rating');
|
|
| 1106 | - |
|
| 1107 | - $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1108 | - $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1109 | - |
|
| 1110 | - if ($post_avgratings != 0 && !$preview) {
|
|
| 1111 | - /** |
|
| 1112 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1113 | - * |
|
| 1114 | - * This is called inside the check for an actual rating and the check for preview page. |
|
| 1115 | - * |
|
| 1116 | - * @since 1.0.0 |
|
| 1117 | - * @param float $post_avgratings Average rating for the current post. |
|
| 1118 | - * @param int $post->ID Current post ID. |
|
| 1119 | - */ |
|
| 1120 | - do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1121 | - |
|
| 1122 | - $html = '<p style=" float:left;">'; |
|
| 1123 | - $html .= geodir_get_rating_stars($post_avgratings, $post->ID); |
|
| 1124 | - $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">'; |
|
| 1125 | - $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings; |
|
| 1094 | + if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int)$post->ID)) {
|
|
| 1095 | + return; |
|
| 1096 | + } |
|
| 1097 | + ob_start(); // Start buffering; |
|
| 1098 | + /** |
|
| 1099 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1100 | + * |
|
| 1101 | + * This is called outside the check for an actual rating and the check for preview page. |
|
| 1102 | + * |
|
| 1103 | + * @since 1.0.0 |
|
| 1104 | + */ |
|
| 1105 | + do_action('geodir_before_detail_page_review_rating');
|
|
| 1106 | + |
|
| 1107 | + $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1108 | + $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1109 | + |
|
| 1110 | + if ($post_avgratings != 0 && !$preview) {
|
|
| 1111 | + /** |
|
| 1112 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1113 | + * |
|
| 1114 | + * This is called inside the check for an actual rating and the check for preview page. |
|
| 1115 | + * |
|
| 1116 | + * @since 1.0.0 |
|
| 1117 | + * @param float $post_avgratings Average rating for the current post. |
|
| 1118 | + * @param int $post->ID Current post ID. |
|
| 1119 | + */ |
|
| 1120 | + do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1121 | + |
|
| 1122 | + $html = '<p style=" float:left;">'; |
|
| 1123 | + $html .= geodir_get_rating_stars($post_avgratings, $post->ID); |
|
| 1124 | + $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">'; |
|
| 1125 | + $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings; |
|
| 1126 | 1126 | |
| 1127 | 1127 | $reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');
|
| 1128 | 1128 | |
| 1129 | 1129 | $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';
|
| 1130 | 1130 | |
| 1131 | - $html .= '<span class="item">'; |
|
| 1132 | - $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>'; |
|
| 1131 | + $html .= '<span class="item">'; |
|
| 1132 | + $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>'; |
|
| 1133 | 1133 | |
| 1134 | - if ($post_images) {
|
|
| 1135 | - foreach ($post_images as $img) {
|
|
| 1136 | - $post_img = $img->src; |
|
| 1137 | - break; |
|
| 1138 | - } |
|
| 1139 | - } |
|
| 1140 | - |
|
| 1141 | - if (isset($post_img) && $post_img) {
|
|
| 1142 | - $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />'; |
|
| 1143 | - } |
|
| 1144 | - |
|
| 1145 | - $html .= '</span>'; |
|
| 1146 | - |
|
| 1147 | - echo $html .= '</div>'; |
|
| 1148 | - /** |
|
| 1149 | - * This is called after the rating html in the function geodir_detail_page_review_rating(). |
|
| 1150 | - * |
|
| 1151 | - * This is called inside the check for an actual rating and the check for preview page. |
|
| 1152 | - * |
|
| 1153 | - * @since 1.0.0 |
|
| 1154 | - * @param float $post_avgratings Average rating for the current post. |
|
| 1155 | - * @param int $post->ID Current post ID. |
|
| 1156 | - */ |
|
| 1157 | - do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1158 | - } |
|
| 1159 | - /** |
|
| 1160 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1161 | - * |
|
| 1162 | - * This is called outside the check for an actual rating and the check for preview page. |
|
| 1163 | - * |
|
| 1164 | - * @since 1.0.0 |
|
| 1165 | - */ |
|
| 1166 | - do_action('geodir_after_detail_page_review_rating');
|
|
| 1167 | - $content_html = ob_get_clean(); |
|
| 1168 | - if (trim($content_html) != '') {
|
|
| 1169 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>'; |
|
| 1170 | - } |
|
| 1171 | - if ((int)get_option('geodir_disable_rating_info_section') != 1) {
|
|
| 1172 | - /** |
|
| 1173 | - * Filter the geodir_detail_page_review_rating() function content. |
|
| 1174 | - * |
|
| 1175 | - * @since 1.0.0 |
|
| 1176 | - * @param string $content_html The output html of the geodir_detail_page_review_rating() function. |
|
| 1177 | - */ |
|
| 1178 | - echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);
|
|
| 1179 | - } |
|
| 1134 | + if ($post_images) {
|
|
| 1135 | + foreach ($post_images as $img) {
|
|
| 1136 | + $post_img = $img->src; |
|
| 1137 | + break; |
|
| 1138 | + } |
|
| 1139 | + } |
|
| 1140 | + |
|
| 1141 | + if (isset($post_img) && $post_img) {
|
|
| 1142 | + $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />'; |
|
| 1143 | + } |
|
| 1144 | + |
|
| 1145 | + $html .= '</span>'; |
|
| 1146 | + |
|
| 1147 | + echo $html .= '</div>'; |
|
| 1148 | + /** |
|
| 1149 | + * This is called after the rating html in the function geodir_detail_page_review_rating(). |
|
| 1150 | + * |
|
| 1151 | + * This is called inside the check for an actual rating and the check for preview page. |
|
| 1152 | + * |
|
| 1153 | + * @since 1.0.0 |
|
| 1154 | + * @param float $post_avgratings Average rating for the current post. |
|
| 1155 | + * @param int $post->ID Current post ID. |
|
| 1156 | + */ |
|
| 1157 | + do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1158 | + } |
|
| 1159 | + /** |
|
| 1160 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1161 | + * |
|
| 1162 | + * This is called outside the check for an actual rating and the check for preview page. |
|
| 1163 | + * |
|
| 1164 | + * @since 1.0.0 |
|
| 1165 | + */ |
|
| 1166 | + do_action('geodir_after_detail_page_review_rating');
|
|
| 1167 | + $content_html = ob_get_clean(); |
|
| 1168 | + if (trim($content_html) != '') {
|
|
| 1169 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>'; |
|
| 1170 | + } |
|
| 1171 | + if ((int)get_option('geodir_disable_rating_info_section') != 1) {
|
|
| 1172 | + /** |
|
| 1173 | + * Filter the geodir_detail_page_review_rating() function content. |
|
| 1174 | + * |
|
| 1175 | + * @since 1.0.0 |
|
| 1176 | + * @param string $content_html The output html of the geodir_detail_page_review_rating() function. |
|
| 1177 | + */ |
|
| 1178 | + echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);
|
|
| 1179 | + } |
|
| 1180 | 1180 | } |
| 1181 | 1181 | |
| 1182 | 1182 | /** |
@@ -1188,35 +1188,35 @@ discard block |
||
| 1188 | 1188 | */ |
| 1189 | 1189 | function geodir_detail_page_more_info() |
| 1190 | 1190 | {
|
| 1191 | - ob_start(); // Start buffering; |
|
| 1192 | - /** |
|
| 1193 | - * This is called before the info section html. |
|
| 1194 | - * |
|
| 1195 | - * @since 1.0.0 |
|
| 1196 | - */ |
|
| 1197 | - do_action('geodir_before_detail_page_more_info');
|
|
| 1198 | - if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {
|
|
| 1199 | - echo $geodir_post_detail_fields; |
|
| 1200 | - } |
|
| 1201 | - /** |
|
| 1202 | - * This is called after the info section html. |
|
| 1203 | - * |
|
| 1204 | - * @since 1.0.0 |
|
| 1205 | - */ |
|
| 1206 | - do_action('geodir_after_detail_page_more_info');
|
|
| 1207 | - |
|
| 1208 | - $content_html = ob_get_clean(); |
|
| 1209 | - if (trim($content_html) != '') |
|
| 1210 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1211 | - if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
|
| 1212 | - /** |
|
| 1213 | - * Filter the output html for function geodir_detail_page_more_info(). |
|
| 1214 | - * |
|
| 1215 | - * @since 1.0.0 |
|
| 1216 | - * @param string $content_html The output html of the geodir_detail_page_more_info() function. |
|
| 1217 | - */ |
|
| 1218 | - echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);
|
|
| 1219 | - } |
|
| 1191 | + ob_start(); // Start buffering; |
|
| 1192 | + /** |
|
| 1193 | + * This is called before the info section html. |
|
| 1194 | + * |
|
| 1195 | + * @since 1.0.0 |
|
| 1196 | + */ |
|
| 1197 | + do_action('geodir_before_detail_page_more_info');
|
|
| 1198 | + if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {
|
|
| 1199 | + echo $geodir_post_detail_fields; |
|
| 1200 | + } |
|
| 1201 | + /** |
|
| 1202 | + * This is called after the info section html. |
|
| 1203 | + * |
|
| 1204 | + * @since 1.0.0 |
|
| 1205 | + */ |
|
| 1206 | + do_action('geodir_after_detail_page_more_info');
|
|
| 1207 | + |
|
| 1208 | + $content_html = ob_get_clean(); |
|
| 1209 | + if (trim($content_html) != '') |
|
| 1210 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1211 | + if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
|
| 1212 | + /** |
|
| 1213 | + * Filter the output html for function geodir_detail_page_more_info(). |
|
| 1214 | + * |
|
| 1215 | + * @since 1.0.0 |
|
| 1216 | + * @param string $content_html The output html of the geodir_detail_page_more_info() function. |
|
| 1217 | + */ |
|
| 1218 | + echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);
|
|
| 1219 | + } |
|
| 1220 | 1220 | } |
| 1221 | 1221 | |
| 1222 | 1222 | |
@@ -1230,15 +1230,15 @@ discard block |
||
| 1230 | 1230 | */ |
| 1231 | 1231 | function geodir_localize_all_js_msg() |
| 1232 | 1232 | {// check_ajax_referer function is used to make sure no files are uploaded remotely but it will fail if used between https and non https so we do the check below of the urls
|
| 1233 | - if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1234 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 1235 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1236 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 1237 | - } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1238 | - $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 1239 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1240 | - $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 1241 | - } |
|
| 1233 | + if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1234 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 1235 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1236 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 1237 | + } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1238 | + $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 1239 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1240 | + $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 1241 | + } |
|
| 1242 | 1242 | |
| 1243 | 1243 | /** |
| 1244 | 1244 | * Filter the allowed image type extensions for post images. |
@@ -1248,62 +1248,62 @@ discard block |
||
| 1248 | 1248 | */ |
| 1249 | 1249 | $allowed_img_types = apply_filters('geodir_allowed_post_image_exts', array('jpg', 'jpeg', 'jpe', 'gif', 'png'));
|
| 1250 | 1250 | |
| 1251 | - $default_marker_icon = get_option('geodir_default_marker_icon');
|
|
| 1252 | - $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));
|
|
| 1253 | - $default_marker_width = $default_marker_size['w']; |
|
| 1254 | - $default_marker_height = $default_marker_size['h']; |
|
| 1251 | + $default_marker_icon = get_option('geodir_default_marker_icon');
|
|
| 1252 | + $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));
|
|
| 1253 | + $default_marker_width = $default_marker_size['w']; |
|
| 1254 | + $default_marker_height = $default_marker_size['h']; |
|
| 1255 | 1255 | |
| 1256 | - $arr_alert_msg = array( |
|
| 1257 | - 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 1258 | - 'geodir_admin_ajax_url' => $ajax_url, |
|
| 1259 | - 'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),
|
|
| 1260 | - 'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),
|
|
| 1261 | - 'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),
|
|
| 1262 | - 'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),
|
|
| 1263 | - //start not show alert msg |
|
| 1264 | - 'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),
|
|
| 1265 | - 'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),
|
|
| 1266 | - 'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),
|
|
| 1267 | - 'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),
|
|
| 1268 | - 'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),
|
|
| 1269 | - // end not show alert msg |
|
| 1270 | - 'my_place_listing_del' => __('Are you sure you wish to delete this listing?', 'geodirectory'),
|
|
| 1271 | - 'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),
|
|
| 1272 | - //start not show alert msg |
|
| 1273 | - 'rating_error_msg' => __('Error : please retry', 'geodirectory'),
|
|
| 1274 | - 'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),
|
|
| 1275 | - 'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),
|
|
| 1276 | - 'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),
|
|
| 1277 | - 'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),
|
|
| 1278 | - 'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),
|
|
| 1279 | - 'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),
|
|
| 1280 | - 'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),
|
|
| 1281 | - 'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),
|
|
| 1282 | - 'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),
|
|
| 1283 | - 'geodir_field_id_required' => __('This field is required.', 'geodirectory'),
|
|
| 1284 | - 'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),
|
|
| 1285 | - 'geodir_default_marker_icon' => $default_marker_icon, |
|
| 1286 | - 'geodir_default_marker_w' => $default_marker_width, |
|
| 1287 | - 'geodir_default_marker_h' => $default_marker_height, |
|
| 1288 | - 'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG, |
|
| 1289 | - 'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG, |
|
| 1290 | - 'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),
|
|
| 1291 | - 'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),
|
|
| 1292 | - 'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),
|
|
| 1293 | - 'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),
|
|
| 1294 | - 'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),
|
|
| 1295 | - 'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),
|
|
| 1296 | - 'err_empty_review' => __('Please type a review.', 'geodirectory'),
|
|
| 1297 | - 'err_empty_reply' => __('Please type a reply.', 'geodirectory'),
|
|
| 1298 | - /* on/off dragging for phone devices */ |
|
| 1299 | - 'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,
|
|
| 1300 | - 'geodir_is_mobile' => wp_is_mobile() ? true : false, |
|
| 1301 | - 'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),
|
|
| 1302 | - 'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),
|
|
| 1303 | - 'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),
|
|
| 1304 | - 'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),
|
|
| 1305 | - 'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),
|
|
| 1306 | - 'geodir_action_remove' => __('Remove', 'geodirectory'),
|
|
| 1256 | + $arr_alert_msg = array( |
|
| 1257 | + 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 1258 | + 'geodir_admin_ajax_url' => $ajax_url, |
|
| 1259 | + 'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),
|
|
| 1260 | + 'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),
|
|
| 1261 | + 'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),
|
|
| 1262 | + 'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),
|
|
| 1263 | + //start not show alert msg |
|
| 1264 | + 'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),
|
|
| 1265 | + 'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),
|
|
| 1266 | + 'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),
|
|
| 1267 | + 'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),
|
|
| 1268 | + 'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),
|
|
| 1269 | + // end not show alert msg |
|
| 1270 | + 'my_place_listing_del' => __('Are you sure you wish to delete this listing?', 'geodirectory'),
|
|
| 1271 | + 'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),
|
|
| 1272 | + //start not show alert msg |
|
| 1273 | + 'rating_error_msg' => __('Error : please retry', 'geodirectory'),
|
|
| 1274 | + 'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),
|
|
| 1275 | + 'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),
|
|
| 1276 | + 'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),
|
|
| 1277 | + 'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),
|
|
| 1278 | + 'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),
|
|
| 1279 | + 'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),
|
|
| 1280 | + 'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),
|
|
| 1281 | + 'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),
|
|
| 1282 | + 'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),
|
|
| 1283 | + 'geodir_field_id_required' => __('This field is required.', 'geodirectory'),
|
|
| 1284 | + 'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),
|
|
| 1285 | + 'geodir_default_marker_icon' => $default_marker_icon, |
|
| 1286 | + 'geodir_default_marker_w' => $default_marker_width, |
|
| 1287 | + 'geodir_default_marker_h' => $default_marker_height, |
|
| 1288 | + 'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG, |
|
| 1289 | + 'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG, |
|
| 1290 | + 'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),
|
|
| 1291 | + 'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),
|
|
| 1292 | + 'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),
|
|
| 1293 | + 'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),
|
|
| 1294 | + 'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),
|
|
| 1295 | + 'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),
|
|
| 1296 | + 'err_empty_review' => __('Please type a review.', 'geodirectory'),
|
|
| 1297 | + 'err_empty_reply' => __('Please type a reply.', 'geodirectory'),
|
|
| 1298 | + /* on/off dragging for phone devices */ |
|
| 1299 | + 'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,
|
|
| 1300 | + 'geodir_is_mobile' => wp_is_mobile() ? true : false, |
|
| 1301 | + 'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),
|
|
| 1302 | + 'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),
|
|
| 1303 | + 'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),
|
|
| 1304 | + 'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),
|
|
| 1305 | + 'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),
|
|
| 1306 | + 'geodir_action_remove' => __('Remove', 'geodirectory'),
|
|
| 1307 | 1307 | 'geodir_txt_all_files' => __('Allowed files', 'geodirectory'),
|
| 1308 | 1308 | 'geodir_err_file_type' => __('File type error. Allowed file types: %s', 'geodirectory'),
|
| 1309 | 1309 | 'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',
|
@@ -1311,40 +1311,40 @@ discard block |
||
| 1311 | 1311 | 'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),
|
| 1312 | 1312 | 'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',
|
| 1313 | 1313 | 'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',
|
| 1314 | - 'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,
|
|
| 1315 | - 'geodir_map_name' => geodir_map_name(), |
|
| 1316 | - 'osmStart' => __('Start', 'geodirectory'),
|
|
| 1317 | - 'osmVia' => __('Via {viaNumber}', 'geodirectory'),
|
|
| 1318 | - 'osmEnd' => __('Enter Your Location', 'geodirectory'),
|
|
| 1319 | - 'ga_delete_check' => __('Do you wish to Deauthorize and break Analytics?', 'geodirectory'),
|
|
| 1320 | - 'geoMyLocation' => __('My Location', 'geodirectory'),
|
|
| 1321 | - 'geoErrUNKNOWN_ERROR' => addslashes(__('Unable to find your location', 'geodirectory')),
|
|
| 1322 | - 'geoErrPERMISSION_DENINED' => addslashes(__('Permission denied in finding your location', 'geodirectory')),
|
|
| 1323 | - 'geoErrPOSITION_UNAVAILABLE' => addslashes(__('Your location is currently unknown', 'geodirectory')),
|
|
| 1324 | - 'geoErrBREAK' => addslashes(__('Attempt to find location took too long', 'geodirectory')),
|
|
| 1325 | - 'geoErrDEFAULT' => addslashes(__('Location detection not supported in browser', 'geodirectory')),
|
|
| 1326 | - ); |
|
| 1327 | - |
|
| 1328 | - /** |
|
| 1329 | - * Filters the translated JS strings from function geodir_localize_all_js_msg(). |
|
| 1330 | - * |
|
| 1331 | - * With this filter you can add, remove or change translated JS strings. |
|
| 1332 | - * You should add your own translations to this if you are building an addon rather than adding another script block. |
|
| 1333 | - * |
|
| 1334 | - * @since 1.0.0 |
|
| 1335 | - */ |
|
| 1336 | - $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);
|
|
| 1337 | - |
|
| 1338 | - foreach ($arr_alert_msg as $key => $value) {
|
|
| 1339 | - if (!is_scalar($value)) |
|
| 1340 | - continue; |
|
| 1341 | - $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8'); |
|
| 1342 | - } |
|
| 1314 | + 'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,
|
|
| 1315 | + 'geodir_map_name' => geodir_map_name(), |
|
| 1316 | + 'osmStart' => __('Start', 'geodirectory'),
|
|
| 1317 | + 'osmVia' => __('Via {viaNumber}', 'geodirectory'),
|
|
| 1318 | + 'osmEnd' => __('Enter Your Location', 'geodirectory'),
|
|
| 1319 | + 'ga_delete_check' => __('Do you wish to Deauthorize and break Analytics?', 'geodirectory'),
|
|
| 1320 | + 'geoMyLocation' => __('My Location', 'geodirectory'),
|
|
| 1321 | + 'geoErrUNKNOWN_ERROR' => addslashes(__('Unable to find your location', 'geodirectory')),
|
|
| 1322 | + 'geoErrPERMISSION_DENINED' => addslashes(__('Permission denied in finding your location', 'geodirectory')),
|
|
| 1323 | + 'geoErrPOSITION_UNAVAILABLE' => addslashes(__('Your location is currently unknown', 'geodirectory')),
|
|
| 1324 | + 'geoErrBREAK' => addslashes(__('Attempt to find location took too long', 'geodirectory')),
|
|
| 1325 | + 'geoErrDEFAULT' => addslashes(__('Location detection not supported in browser', 'geodirectory')),
|
|
| 1326 | + ); |
|
| 1327 | + |
|
| 1328 | + /** |
|
| 1329 | + * Filters the translated JS strings from function geodir_localize_all_js_msg(). |
|
| 1330 | + * |
|
| 1331 | + * With this filter you can add, remove or change translated JS strings. |
|
| 1332 | + * You should add your own translations to this if you are building an addon rather than adding another script block. |
|
| 1333 | + * |
|
| 1334 | + * @since 1.0.0 |
|
| 1335 | + */ |
|
| 1336 | + $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);
|
|
| 1343 | 1337 | |
| 1344 | - $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';'; |
|
| 1345 | - echo '<script>'; |
|
| 1346 | - echo $script; |
|
| 1347 | - echo '</script>'; |
|
| 1338 | + foreach ($arr_alert_msg as $key => $value) {
|
|
| 1339 | + if (!is_scalar($value)) |
|
| 1340 | + continue; |
|
| 1341 | + $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8'); |
|
| 1342 | + } |
|
| 1343 | + |
|
| 1344 | + $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';'; |
|
| 1345 | + echo '<script>'; |
|
| 1346 | + echo $script; |
|
| 1347 | + echo '</script>'; |
|
| 1348 | 1348 | } |
| 1349 | 1349 | |
| 1350 | 1350 | add_action('admin_bar_menu', 'geodir_admin_bar_site_menu', 31);
|
@@ -1360,11 +1360,11 @@ discard block |
||
| 1360 | 1360 | */ |
| 1361 | 1361 | function geodir_admin_bar_site_menu($wp_admin_bar) |
| 1362 | 1362 | {
|
| 1363 | - if (get_option("geodir_installed")) {
|
|
| 1364 | - if (current_user_can('manage_options')) {
|
|
| 1365 | - $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));
|
|
| 1366 | - } |
|
| 1367 | - } |
|
| 1363 | + if (get_option("geodir_installed")) {
|
|
| 1364 | + if (current_user_can('manage_options')) {
|
|
| 1365 | + $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));
|
|
| 1366 | + } |
|
| 1367 | + } |
|
| 1368 | 1368 | } |
| 1369 | 1369 | |
| 1370 | 1370 | add_action('geodir_before_listing', 'geodir_display_sort_options'); /*function in custom_functions.php*/
|
@@ -1390,25 +1390,25 @@ discard block |
||
| 1390 | 1390 | */ |
| 1391 | 1391 | function geodir_store_sidebars() |
| 1392 | 1392 | {
|
| 1393 | - global $geodir_sidebars; |
|
| 1394 | - global $sidebars_widgets; |
|
| 1395 | - |
|
| 1396 | - if (!is_array($sidebars_widgets)) |
|
| 1397 | - $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1398 | - $geodir_old_sidebars = array(); |
|
| 1399 | - |
|
| 1400 | - if (is_array($geodir_sidebars)) {
|
|
| 1401 | - foreach ($geodir_sidebars as $val) {
|
|
| 1402 | - if (is_array($sidebars_widgets)) {
|
|
| 1403 | - if (array_key_exists($val, $sidebars_widgets)) |
|
| 1404 | - $geodir_old_sidebars[$val] = $sidebars_widgets[$val]; |
|
| 1405 | - else |
|
| 1406 | - $geodir_old_sidebars[$val] = array(); |
|
| 1407 | - } |
|
| 1408 | - } |
|
| 1409 | - } |
|
| 1410 | - update_option('geodir_sidebars', $geodir_old_sidebars);
|
|
| 1411 | - geodir_option_version_backup('geodir_sidebars');
|
|
| 1393 | + global $geodir_sidebars; |
|
| 1394 | + global $sidebars_widgets; |
|
| 1395 | + |
|
| 1396 | + if (!is_array($sidebars_widgets)) |
|
| 1397 | + $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1398 | + $geodir_old_sidebars = array(); |
|
| 1399 | + |
|
| 1400 | + if (is_array($geodir_sidebars)) {
|
|
| 1401 | + foreach ($geodir_sidebars as $val) {
|
|
| 1402 | + if (is_array($sidebars_widgets)) {
|
|
| 1403 | + if (array_key_exists($val, $sidebars_widgets)) |
|
| 1404 | + $geodir_old_sidebars[$val] = $sidebars_widgets[$val]; |
|
| 1405 | + else |
|
| 1406 | + $geodir_old_sidebars[$val] = array(); |
|
| 1407 | + } |
|
| 1408 | + } |
|
| 1409 | + } |
|
| 1410 | + update_option('geodir_sidebars', $geodir_old_sidebars);
|
|
| 1411 | + geodir_option_version_backup('geodir_sidebars');
|
|
| 1412 | 1412 | |
| 1413 | 1413 | } |
| 1414 | 1414 | |
@@ -1422,28 +1422,28 @@ discard block |
||
| 1422 | 1422 | */ |
| 1423 | 1423 | function geodir_restore_sidebars() |
| 1424 | 1424 | {
|
| 1425 | - global $sidebars_widgets; |
|
| 1426 | - |
|
| 1427 | - if (!is_array($sidebars_widgets)) |
|
| 1428 | - $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1429 | - |
|
| 1430 | - if (is_array($sidebars_widgets)) {
|
|
| 1431 | - $geodir_old_sidebars = get_option('geodir_sidebars');
|
|
| 1432 | - if (is_array($geodir_old_sidebars)) {
|
|
| 1433 | - foreach ($geodir_old_sidebars as $key => $val) {
|
|
| 1434 | - if(0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1435 | - {
|
|
| 1436 | - $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
|
| 1437 | - } |
|
| 1425 | + global $sidebars_widgets; |
|
| 1438 | 1426 | |
| 1427 | + if (!is_array($sidebars_widgets)) |
|
| 1428 | + $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1439 | 1429 | |
| 1440 | - } |
|
| 1441 | - } |
|
| 1430 | + if (is_array($sidebars_widgets)) {
|
|
| 1431 | + $geodir_old_sidebars = get_option('geodir_sidebars');
|
|
| 1432 | + if (is_array($geodir_old_sidebars)) {
|
|
| 1433 | + foreach ($geodir_old_sidebars as $key => $val) {
|
|
| 1434 | + if(0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1435 | + {
|
|
| 1436 | + $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
|
| 1437 | + } |
|
| 1442 | 1438 | |
| 1443 | - } |
|
| 1444 | 1439 | |
| 1445 | - update_option('sidebars_widgets', $sidebars_widgets);
|
|
| 1446 | - update_option('geodir_sidebars', '');
|
|
| 1440 | + } |
|
| 1441 | + } |
|
| 1442 | + |
|
| 1443 | + } |
|
| 1444 | + |
|
| 1445 | + update_option('sidebars_widgets', $sidebars_widgets);
|
|
| 1446 | + update_option('geodir_sidebars', '');
|
|
| 1447 | 1447 | } |
| 1448 | 1448 | |
| 1449 | 1449 | add_action('geodir_after_listing_post_gridview', 'geodir_after_listing_post_gridview');
|
@@ -1456,9 +1456,9 @@ discard block |
||
| 1456 | 1456 | */ |
| 1457 | 1457 | function geodir_after_listing_post_gridview() |
| 1458 | 1458 | {
|
| 1459 | - global $gridview_columns; |
|
| 1459 | + global $gridview_columns; |
|
| 1460 | 1460 | |
| 1461 | - $gridview_columns = ''; |
|
| 1461 | + $gridview_columns = ''; |
|
| 1462 | 1462 | |
| 1463 | 1463 | } |
| 1464 | 1464 | |
@@ -1486,11 +1486,11 @@ discard block |
||
| 1486 | 1486 | */ |
| 1487 | 1487 | function so_handle_038($url, $original_url, $_context) |
| 1488 | 1488 | {
|
| 1489 | - if (strstr($url, "maps.google.com/maps/api/js") !== false) {
|
|
| 1490 | - $url = str_replace("&", "&", $url); // or $url = $original_url
|
|
| 1491 | - } |
|
| 1489 | + if (strstr($url, "maps.google.com/maps/api/js") !== false) {
|
|
| 1490 | + $url = str_replace("&", "&", $url); // or $url = $original_url
|
|
| 1491 | + } |
|
| 1492 | 1492 | |
| 1493 | - return $url; |
|
| 1493 | + return $url; |
|
| 1494 | 1494 | } |
| 1495 | 1495 | |
| 1496 | 1496 | |
@@ -1506,34 +1506,34 @@ discard block |
||
| 1506 | 1506 | function geodir_after_main_form_fields() {
|
| 1507 | 1507 | global $gd_session; |
| 1508 | 1508 | |
| 1509 | - if (get_option('geodir_accept_term_condition')) {
|
|
| 1510 | - global $post; |
|
| 1511 | - $term_condition = ''; |
|
| 1512 | - if (isset($_REQUEST['backandedit'])) {
|
|
| 1513 | - $post = (object)$gd_session->get('listing');
|
|
| 1514 | - $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : ''; |
|
| 1515 | - } |
|
| 1516 | - |
|
| 1517 | - ?> |
|
| 1509 | + if (get_option('geodir_accept_term_condition')) {
|
|
| 1510 | + global $post; |
|
| 1511 | + $term_condition = ''; |
|
| 1512 | + if (isset($_REQUEST['backandedit'])) {
|
|
| 1513 | + $post = (object)$gd_session->get('listing');
|
|
| 1514 | + $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : ''; |
|
| 1515 | + } |
|
| 1516 | + |
|
| 1517 | + ?> |
|
| 1518 | 1518 | <div id="geodir_accept_term_condition_row" class="required_field geodir_form_row clearfix"> |
| 1519 | 1519 | <label> </label> |
| 1520 | 1520 | |
| 1521 | 1521 | <div class="geodir_taxonomy_field" style="float:left; width:70%;"> |
| 1522 | 1522 | <span style="display:block"> |
| 1523 | 1523 | <input class="main_list_selecter" type="checkbox" <?php if ($term_condition == '1') {
|
| 1524 | - echo 'checked="checked"'; |
|
| 1525 | - } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition" |
|
| 1524 | + echo 'checked="checked"'; |
|
| 1525 | + } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition" |
|
| 1526 | 1526 | class="geodir_textfield" value="1" |
| 1527 | 1527 | style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>
|
| 1528 | 1528 | </span> |
| 1529 | 1529 | </div> |
| 1530 | 1530 | <span class="geodir_message_error"><?php if (isset($required_msg)) {
|
| 1531 | - _e($required_msg, 'geodirectory'); |
|
| 1532 | - } ?></span> |
|
| 1531 | + _e($required_msg, 'geodirectory'); |
|
| 1532 | + } ?></span> |
|
| 1533 | 1533 | </div> |
| 1534 | 1534 | <?php |
| 1535 | 1535 | |
| 1536 | - } |
|
| 1536 | + } |
|
| 1537 | 1537 | } |
| 1538 | 1538 | |
| 1539 | 1539 | |
@@ -1558,42 +1558,42 @@ discard block |
||
| 1558 | 1558 | */ |
| 1559 | 1559 | function geodir_detail_page_tab_is_display($is_display, $tab) |
| 1560 | 1560 | {
|
| 1561 | - global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields; |
|
| 1561 | + global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields; |
|
| 1562 | 1562 | |
| 1563 | - if ($tab == 'post_profile') {
|
|
| 1564 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1565 | - $desc_limit = apply_filters('geodir_description_field_desc_limit', '');
|
|
| 1563 | + if ($tab == 'post_profile') {
|
|
| 1564 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1565 | + $desc_limit = apply_filters('geodir_description_field_desc_limit', '');
|
|
| 1566 | 1566 | |
| 1567 | - if (!($desc_limit === '' || (int)$desc_limit > 0)) {
|
|
| 1568 | - $is_display = false; |
|
| 1569 | - } |
|
| 1570 | - } |
|
| 1567 | + if (!($desc_limit === '' || (int)$desc_limit > 0)) {
|
|
| 1568 | + $is_display = false; |
|
| 1569 | + } |
|
| 1570 | + } |
|
| 1571 | 1571 | |
| 1572 | - if ($tab == 'post_info') |
|
| 1573 | - $is_display = (!empty($geodir_post_detail_fields)) ? true : false; |
|
| 1572 | + if ($tab == 'post_info') |
|
| 1573 | + $is_display = (!empty($geodir_post_detail_fields)) ? true : false; |
|
| 1574 | 1574 | |
| 1575 | - if ($tab == 'post_images') |
|
| 1576 | - $is_display = (!empty($post_images)) ? true : false; |
|
| 1575 | + if ($tab == 'post_images') |
|
| 1576 | + $is_display = (!empty($post_images)) ? true : false; |
|
| 1577 | 1577 | |
| 1578 | - if ($tab == 'post_video') |
|
| 1579 | - $is_display = (!empty($video)) ? true : false; |
|
| 1578 | + if ($tab == 'post_video') |
|
| 1579 | + $is_display = (!empty($video)) ? true : false; |
|
| 1580 | 1580 | |
| 1581 | - if ($tab == 'special_offers') |
|
| 1582 | - $is_display = (!empty($special_offers)) ? true : false; |
|
| 1581 | + if ($tab == 'special_offers') |
|
| 1582 | + $is_display = (!empty($special_offers)) ? true : false; |
|
| 1583 | 1583 | |
| 1584 | - if ($tab == 'reviews') |
|
| 1585 | - $is_display = (geodir_is_page('detail')) ? true : false;
|
|
| 1584 | + if ($tab == 'reviews') |
|
| 1585 | + $is_display = (geodir_is_page('detail')) ? true : false;
|
|
| 1586 | 1586 | |
| 1587 | - if ($tab == 'related_listing') {
|
|
| 1588 | - $message = __('No listings found which match your selection.', 'geodirectory');
|
|
| 1587 | + if ($tab == 'related_listing') {
|
|
| 1588 | + $message = __('No listings found which match your selection.', 'geodirectory');
|
|
| 1589 | 1589 | |
| 1590 | - /** This action is documented in geodirectory-functions/template_functions.php */ |
|
| 1591 | - $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);
|
|
| 1590 | + /** This action is documented in geodirectory-functions/template_functions.php */ |
|
| 1591 | + $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);
|
|
| 1592 | 1592 | |
| 1593 | - $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;
|
|
| 1594 | - } |
|
| 1593 | + $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;
|
|
| 1594 | + } |
|
| 1595 | 1595 | |
| 1596 | - return $is_display; |
|
| 1596 | + return $is_display; |
|
| 1597 | 1597 | } |
| 1598 | 1598 | |
| 1599 | 1599 | |
@@ -1609,69 +1609,69 @@ discard block |
||
| 1609 | 1609 | * @global string $plugin_prefix Geodirectory plugin table prefix. |
| 1610 | 1610 | */ |
| 1611 | 1611 | function geodir_changes_in_custom_fields_table() {
|
| 1612 | - global $wpdb, $plugin_prefix; |
|
| 1612 | + global $wpdb, $plugin_prefix; |
|
| 1613 | 1613 | |
| 1614 | 1614 | // Remove unused virtual page |
| 1615 | 1615 | $listings_page_id = (int)get_option('geodir_listing_page');
|
| 1616 | 1616 | if ($listings_page_id) {
|
| 1617 | 1617 | $wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));
|
| 1618 | - delete_option('geodir_listing_page');
|
|
| 1618 | + delete_option('geodir_listing_page');
|
|
| 1619 | 1619 | } |
| 1620 | 1620 | |
| 1621 | - if (!get_option('geodir_changes_in_custom_fields_table')) {
|
|
| 1622 | - $wpdb->query( |
|
| 1623 | - $wpdb->prepare( |
|
| 1624 | - "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s", |
|
| 1625 | - array('1', '1', 'admin')
|
|
| 1626 | - ) |
|
| 1627 | - ); |
|
| 1621 | + if (!get_option('geodir_changes_in_custom_fields_table')) {
|
|
| 1622 | + $wpdb->query( |
|
| 1623 | + $wpdb->prepare( |
|
| 1624 | + "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s", |
|
| 1625 | + array('1', '1', 'admin')
|
|
| 1626 | + ) |
|
| 1627 | + ); |
|
| 1628 | 1628 | |
| 1629 | 1629 | |
| 1630 | - /* --- terms meta value set --- */ |
|
| 1630 | + /* --- terms meta value set --- */ |
|
| 1631 | 1631 | |
| 1632 | - update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');
|
|
| 1632 | + update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');
|
|
| 1633 | 1633 | |
| 1634 | - $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
| 1634 | + $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
| 1635 | 1635 | |
| 1636 | - if (!empty($options_data)) {
|
|
| 1636 | + if (!empty($options_data)) {
|
|
| 1637 | 1637 | |
| 1638 | - foreach ($options_data as $optobj) {
|
|
| 1638 | + foreach ($options_data as $optobj) {
|
|
| 1639 | 1639 | |
| 1640 | - $option_val = str_replace('tax_meta_', '', $optobj->option_name);
|
|
| 1640 | + $option_val = str_replace('tax_meta_', '', $optobj->option_name);
|
|
| 1641 | 1641 | |
| 1642 | - $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
| 1642 | + $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
| 1643 | 1643 | |
| 1644 | - if (!empty($taxonomies_data)) {
|
|
| 1644 | + if (!empty($taxonomies_data)) {
|
|
| 1645 | 1645 | |
| 1646 | - foreach ($taxonomies_data as $taxobj) {
|
|
| 1646 | + foreach ($taxonomies_data as $taxobj) {
|
|
| 1647 | 1647 | |
| 1648 | - $taxObject = get_taxonomy($taxobj->taxonomy); |
|
| 1649 | - $post_type = $taxObject->object_type[0]; |
|
| 1648 | + $taxObject = get_taxonomy($taxobj->taxonomy); |
|
| 1649 | + $post_type = $taxObject->object_type[0]; |
|
| 1650 | 1650 | |
| 1651 | - $opt_value = 'tax_meta_' . $post_type . '_' . $option_val; |
|
| 1651 | + $opt_value = 'tax_meta_' . $post_type . '_' . $option_val; |
|
| 1652 | 1652 | |
| 1653 | - $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));
|
|
| 1653 | + $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));
|
|
| 1654 | 1654 | |
| 1655 | - if ($duplicate_data) {
|
|
| 1655 | + if ($duplicate_data) {
|
|
| 1656 | 1656 | |
| 1657 | - $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
| 1657 | + $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
| 1658 | 1658 | |
| 1659 | - } else {
|
|
| 1659 | + } else {
|
|
| 1660 | 1660 | |
| 1661 | - $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
| 1661 | + $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
| 1662 | 1662 | |
| 1663 | - } |
|
| 1663 | + } |
|
| 1664 | 1664 | |
| 1665 | - } |
|
| 1665 | + } |
|
| 1666 | 1666 | |
| 1667 | - } |
|
| 1667 | + } |
|
| 1668 | 1668 | |
| 1669 | - } |
|
| 1670 | - } |
|
| 1669 | + } |
|
| 1670 | + } |
|
| 1671 | 1671 | |
| 1672 | - update_option('geodir_changes_in_custom_fields_table', '1');
|
|
| 1672 | + update_option('geodir_changes_in_custom_fields_table', '1');
|
|
| 1673 | 1673 | |
| 1674 | - } |
|
| 1674 | + } |
|
| 1675 | 1675 | |
| 1676 | 1676 | } |
| 1677 | 1677 | |
@@ -1690,24 +1690,24 @@ discard block |
||
| 1690 | 1690 | function geodir_location_slug_check($slug) |
| 1691 | 1691 | {
|
| 1692 | 1692 | |
| 1693 | - global $wpdb, $table_prefix; |
|
| 1693 | + global $wpdb, $table_prefix; |
|
| 1694 | 1694 | |
| 1695 | - $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));
|
|
| 1695 | + $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));
|
|
| 1696 | 1696 | |
| 1697 | - if ($slug_exists) {
|
|
| 1697 | + if ($slug_exists) {
|
|
| 1698 | 1698 | |
| 1699 | - $suffix = 1; |
|
| 1700 | - do {
|
|
| 1701 | - $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1702 | - $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));
|
|
| 1703 | - $suffix++; |
|
| 1704 | - } while ($location_slug_check && $suffix < 100); |
|
| 1699 | + $suffix = 1; |
|
| 1700 | + do {
|
|
| 1701 | + $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1702 | + $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));
|
|
| 1703 | + $suffix++; |
|
| 1704 | + } while ($location_slug_check && $suffix < 100); |
|
| 1705 | 1705 | |
| 1706 | - $slug = $alt_location_name; |
|
| 1706 | + $slug = $alt_location_name; |
|
| 1707 | 1707 | |
| 1708 | - } |
|
| 1708 | + } |
|
| 1709 | 1709 | |
| 1710 | - return $slug; |
|
| 1710 | + return $slug; |
|
| 1711 | 1711 | |
| 1712 | 1712 | } |
| 1713 | 1713 | |
@@ -1732,42 +1732,42 @@ discard block |
||
| 1732 | 1732 | function geodir_update_term_slug($term_id, $tt_id, $taxonomy) |
| 1733 | 1733 | {
|
| 1734 | 1734 | |
| 1735 | - global $wpdb, $plugin_prefix, $table_prefix; |
|
| 1735 | + global $wpdb, $plugin_prefix, $table_prefix; |
|
| 1736 | 1736 | |
| 1737 | - $tern_data = get_term_by('id', $term_id, $taxonomy);
|
|
| 1737 | + $tern_data = get_term_by('id', $term_id, $taxonomy);
|
|
| 1738 | 1738 | |
| 1739 | - $slug = $tern_data->slug; |
|
| 1739 | + $slug = $tern_data->slug; |
|
| 1740 | 1740 | |
| 1741 | - /** |
|
| 1742 | - * Filter if a term slug exists. |
|
| 1743 | - * |
|
| 1744 | - * @since 1.0.0 |
|
| 1745 | - * @package GeoDirectory |
|
| 1746 | - * @param bool $bool Default: false. |
|
| 1747 | - * @param string $slug The term slug. |
|
| 1748 | - * @param int $term_id The term ID. |
|
| 1749 | - */ |
|
| 1750 | - $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);
|
|
| 1741 | + /** |
|
| 1742 | + * Filter if a term slug exists. |
|
| 1743 | + * |
|
| 1744 | + * @since 1.0.0 |
|
| 1745 | + * @package GeoDirectory |
|
| 1746 | + * @param bool $bool Default: false. |
|
| 1747 | + * @param string $slug The term slug. |
|
| 1748 | + * @param int $term_id The term ID. |
|
| 1749 | + */ |
|
| 1750 | + $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);
|
|
| 1751 | 1751 | |
| 1752 | - if ($slug_exists) {
|
|
| 1752 | + if ($slug_exists) {
|
|
| 1753 | 1753 | |
| 1754 | - $suffix = 1; |
|
| 1755 | - do {
|
|
| 1756 | - $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1754 | + $suffix = 1; |
|
| 1755 | + do {
|
|
| 1756 | + $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1757 | 1757 | |
| 1758 | - /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 1759 | - $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);
|
|
| 1758 | + /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 1759 | + $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);
|
|
| 1760 | 1760 | |
| 1761 | - $suffix++; |
|
| 1762 | - } while ($term_slug_check && $suffix < 100); |
|
| 1761 | + $suffix++; |
|
| 1762 | + } while ($term_slug_check && $suffix < 100); |
|
| 1763 | 1763 | |
| 1764 | - $slug = $new_slug; |
|
| 1764 | + $slug = $new_slug; |
|
| 1765 | 1765 | |
| 1766 | - //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );
|
|
| 1766 | + //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );
|
|
| 1767 | 1767 | |
| 1768 | - $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
| 1768 | + $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
| 1769 | 1769 | |
| 1770 | - } |
|
| 1770 | + } |
|
| 1771 | 1771 | |
| 1772 | 1772 | // Update tag in detail table. |
| 1773 | 1773 | $taxonomy_obj = get_taxonomy($taxonomy); |
@@ -1808,21 +1808,21 @@ discard block |
||
| 1808 | 1808 | function geodir_term_slug_is_exists($slug_exists, $slug, $term_id) |
| 1809 | 1809 | {
|
| 1810 | 1810 | |
| 1811 | - global $wpdb, $table_prefix; |
|
| 1811 | + global $wpdb, $table_prefix; |
|
| 1812 | 1812 | |
| 1813 | - $default_location = geodir_get_default_location(); |
|
| 1813 | + $default_location = geodir_get_default_location(); |
|
| 1814 | 1814 | |
| 1815 | - $country_slug = $default_location->country_slug; |
|
| 1816 | - $region_slug = $default_location->region_slug; |
|
| 1817 | - $city_slug = $default_location->city_slug; |
|
| 1815 | + $country_slug = $default_location->country_slug; |
|
| 1816 | + $region_slug = $default_location->region_slug; |
|
| 1817 | + $city_slug = $default_location->city_slug; |
|
| 1818 | 1818 | |
| 1819 | - if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) |
|
| 1820 | - return $slug_exists = true; |
|
| 1819 | + if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) |
|
| 1820 | + return $slug_exists = true; |
|
| 1821 | 1821 | |
| 1822 | - if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1823 | - return $slug_exists = true; |
|
| 1822 | + if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1823 | + return $slug_exists = true; |
|
| 1824 | 1824 | |
| 1825 | - return $slug_exists; |
|
| 1825 | + return $slug_exists; |
|
| 1826 | 1826 | } |
| 1827 | 1827 | |
| 1828 | 1828 | |
@@ -1842,75 +1842,75 @@ discard block |
||
| 1842 | 1842 | */ |
| 1843 | 1843 | function geodir_custom_page_title($title = '', $sep = '') |
| 1844 | 1844 | {
|
| 1845 | - global $wp; |
|
| 1846 | - if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
|
|
| 1847 | - return $title; |
|
| 1848 | - } |
|
| 1845 | + global $wp; |
|
| 1846 | + if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
|
|
| 1847 | + return $title; |
|
| 1848 | + } |
|
| 1849 | 1849 | |
| 1850 | - if ($sep == '') {
|
|
| 1851 | - /** |
|
| 1852 | - * Filter the page title separator. |
|
| 1853 | - * |
|
| 1854 | - * @since 1.0.0 |
|
| 1855 | - * @package GeoDirectory |
|
| 1856 | - * @param string $sep The separator, default: `|`. |
|
| 1857 | - */ |
|
| 1858 | - $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 1859 | - } |
|
| 1850 | + if ($sep == '') {
|
|
| 1851 | + /** |
|
| 1852 | + * Filter the page title separator. |
|
| 1853 | + * |
|
| 1854 | + * @since 1.0.0 |
|
| 1855 | + * @package GeoDirectory |
|
| 1856 | + * @param string $sep The separator, default: `|`. |
|
| 1857 | + */ |
|
| 1858 | + $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 1859 | + } |
|
| 1860 | 1860 | |
| 1861 | 1861 | |
| 1862 | - $gd_page = ''; |
|
| 1863 | - if(geodir_is_page('home')){
|
|
| 1864 | - $gd_page = 'home'; |
|
| 1865 | - $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
|
| 1866 | - } |
|
| 1867 | - elseif(geodir_is_page('detail')){
|
|
| 1868 | - $gd_page = 'detail'; |
|
| 1869 | - $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
|
| 1870 | - } |
|
| 1871 | - elseif(geodir_is_page('pt')){
|
|
| 1872 | - $gd_page = 'pt'; |
|
| 1873 | - $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
|
| 1874 | - } |
|
| 1875 | - elseif(geodir_is_page('listing')){
|
|
| 1876 | - $gd_page = 'listing'; |
|
| 1877 | - $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
|
| 1878 | - } |
|
| 1879 | - elseif(geodir_is_page('location')){
|
|
| 1880 | - $gd_page = 'location'; |
|
| 1881 | - $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
|
| 1882 | - } |
|
| 1883 | - elseif(geodir_is_page('search')){
|
|
| 1884 | - $gd_page = 'search'; |
|
| 1885 | - $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
|
| 1886 | - } |
|
| 1887 | - elseif(geodir_is_page('add-listing')){
|
|
| 1888 | - $gd_page = 'add-listing'; |
|
| 1889 | - $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
|
| 1890 | - } |
|
| 1891 | - elseif(geodir_is_page('author')){
|
|
| 1892 | - $gd_page = 'author'; |
|
| 1893 | - $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
|
| 1894 | - } |
|
| 1895 | - elseif(geodir_is_page('login')){
|
|
| 1896 | - $gd_page = 'login'; |
|
| 1897 | - $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
|
| 1898 | - } |
|
| 1899 | - elseif(geodir_is_page('listing-success')){
|
|
| 1900 | - $gd_page = 'listing-success'; |
|
| 1901 | - $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
|
| 1902 | - } |
|
| 1862 | + $gd_page = ''; |
|
| 1863 | + if(geodir_is_page('home')){
|
|
| 1864 | + $gd_page = 'home'; |
|
| 1865 | + $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
|
| 1866 | + } |
|
| 1867 | + elseif(geodir_is_page('detail')){
|
|
| 1868 | + $gd_page = 'detail'; |
|
| 1869 | + $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
|
| 1870 | + } |
|
| 1871 | + elseif(geodir_is_page('pt')){
|
|
| 1872 | + $gd_page = 'pt'; |
|
| 1873 | + $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
|
| 1874 | + } |
|
| 1875 | + elseif(geodir_is_page('listing')){
|
|
| 1876 | + $gd_page = 'listing'; |
|
| 1877 | + $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
|
| 1878 | + } |
|
| 1879 | + elseif(geodir_is_page('location')){
|
|
| 1880 | + $gd_page = 'location'; |
|
| 1881 | + $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
|
| 1882 | + } |
|
| 1883 | + elseif(geodir_is_page('search')){
|
|
| 1884 | + $gd_page = 'search'; |
|
| 1885 | + $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
|
| 1886 | + } |
|
| 1887 | + elseif(geodir_is_page('add-listing')){
|
|
| 1888 | + $gd_page = 'add-listing'; |
|
| 1889 | + $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
|
| 1890 | + } |
|
| 1891 | + elseif(geodir_is_page('author')){
|
|
| 1892 | + $gd_page = 'author'; |
|
| 1893 | + $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
|
| 1894 | + } |
|
| 1895 | + elseif(geodir_is_page('login')){
|
|
| 1896 | + $gd_page = 'login'; |
|
| 1897 | + $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
|
| 1898 | + } |
|
| 1899 | + elseif(geodir_is_page('listing-success')){
|
|
| 1900 | + $gd_page = 'listing-success'; |
|
| 1901 | + $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
|
| 1902 | + } |
|
| 1903 | 1903 | |
| 1904 | 1904 | |
| 1905 | - /** |
|
| 1906 | - * Filter page meta title to replace variables. |
|
| 1907 | - * |
|
| 1908 | - * @since 1.5.4 |
|
| 1909 | - * @param string $title The page title including variables. |
|
| 1910 | - * @param string $gd_page The GeoDirectory page type if any. |
|
| 1911 | - * @param string $sep The title separator symbol. |
|
| 1912 | - */ |
|
| 1913 | - return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);
|
|
| 1905 | + /** |
|
| 1906 | + * Filter page meta title to replace variables. |
|
| 1907 | + * |
|
| 1908 | + * @since 1.5.4 |
|
| 1909 | + * @param string $title The page title including variables. |
|
| 1910 | + * @param string $gd_page The GeoDirectory page type if any. |
|
| 1911 | + * @param string $sep The title separator symbol. |
|
| 1912 | + */ |
|
| 1913 | + return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);
|
|
| 1914 | 1914 | |
| 1915 | 1915 | } |
| 1916 | 1916 | |
@@ -1926,36 +1926,36 @@ discard block |
||
| 1926 | 1926 | function geodir_set_post_attachment() |
| 1927 | 1927 | {
|
| 1928 | 1928 | |
| 1929 | - if (!get_option('geodir_set_post_attachments')) {
|
|
| 1929 | + if (!get_option('geodir_set_post_attachments')) {
|
|
| 1930 | 1930 | |
| 1931 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 1932 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1931 | + require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 1932 | + require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1933 | 1933 | |
| 1934 | - $all_postypes = geodir_get_posttypes(); |
|
| 1934 | + $all_postypes = geodir_get_posttypes(); |
|
| 1935 | 1935 | |
| 1936 | - foreach($all_postypes as $post_type){
|
|
| 1937 | - $args = array( |
|
| 1938 | - 'posts_per_page' => -1, |
|
| 1939 | - 'post_type' => $post_type, |
|
| 1940 | - 'post_status' => 'publish'); |
|
| 1936 | + foreach($all_postypes as $post_type){
|
|
| 1937 | + $args = array( |
|
| 1938 | + 'posts_per_page' => -1, |
|
| 1939 | + 'post_type' => $post_type, |
|
| 1940 | + 'post_status' => 'publish'); |
|
| 1941 | 1941 | |
| 1942 | - $posts_array = get_posts($args); |
|
| 1942 | + $posts_array = get_posts($args); |
|
| 1943 | 1943 | |
| 1944 | - if (!empty($posts_array)) {
|
|
| 1944 | + if (!empty($posts_array)) {
|
|
| 1945 | 1945 | |
| 1946 | - foreach ($posts_array as $post) {
|
|
| 1946 | + foreach ($posts_array as $post) {
|
|
| 1947 | 1947 | |
| 1948 | - geodir_set_wp_featured_image($post->ID); |
|
| 1948 | + geodir_set_wp_featured_image($post->ID); |
|
| 1949 | 1949 | |
| 1950 | - } |
|
| 1950 | + } |
|
| 1951 | 1951 | |
| 1952 | - } |
|
| 1953 | - } |
|
| 1952 | + } |
|
| 1953 | + } |
|
| 1954 | 1954 | |
| 1955 | 1955 | |
| 1956 | - update_option('geodir_set_post_attachments', '1');
|
|
| 1956 | + update_option('geodir_set_post_attachments', '1');
|
|
| 1957 | 1957 | |
| 1958 | - } |
|
| 1958 | + } |
|
| 1959 | 1959 | |
| 1960 | 1960 | } |
| 1961 | 1961 | |
@@ -1972,19 +1972,19 @@ discard block |
||
| 1972 | 1972 | function geodir_remove_url_seperator() |
| 1973 | 1973 | {
|
| 1974 | 1974 | |
| 1975 | - if (!get_option('geodir_remove_url_seperator')) {
|
|
| 1975 | + if (!get_option('geodir_remove_url_seperator')) {
|
|
| 1976 | 1976 | |
| 1977 | - if (get_option('geodir_listingurl_separator'))
|
|
| 1978 | - delete_option('geodir_listingurl_separator');
|
|
| 1977 | + if (get_option('geodir_listingurl_separator'))
|
|
| 1978 | + delete_option('geodir_listingurl_separator');
|
|
| 1979 | 1979 | |
| 1980 | - if (get_option('geodir_detailurl_separator'))
|
|
| 1981 | - delete_option('geodir_detailurl_separator');
|
|
| 1980 | + if (get_option('geodir_detailurl_separator'))
|
|
| 1981 | + delete_option('geodir_detailurl_separator');
|
|
| 1982 | 1982 | |
| 1983 | - flush_rewrite_rules(false); |
|
| 1983 | + flush_rewrite_rules(false); |
|
| 1984 | 1984 | |
| 1985 | - update_option('geodir_remove_url_seperator', '1');
|
|
| 1985 | + update_option('geodir_remove_url_seperator', '1');
|
|
| 1986 | 1986 | |
| 1987 | - } |
|
| 1987 | + } |
|
| 1988 | 1988 | |
| 1989 | 1989 | } |
| 1990 | 1990 | |
@@ -2000,19 +2000,19 @@ discard block |
||
| 2000 | 2000 | */ |
| 2001 | 2001 | function geodir_remove_url_seperator_form_permalink_settings($permalink_arr) |
| 2002 | 2002 | {
|
| 2003 | - foreach ($permalink_arr as $key => $value) {
|
|
| 2003 | + foreach ($permalink_arr as $key => $value) {
|
|
| 2004 | 2004 | |
| 2005 | - if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') |
|
| 2006 | - unset($permalink_arr[$key]); |
|
| 2005 | + if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') |
|
| 2006 | + unset($permalink_arr[$key]); |
|
| 2007 | 2007 | |
| 2008 | - } |
|
| 2008 | + } |
|
| 2009 | 2009 | |
| 2010 | - return $permalink_arr; |
|
| 2010 | + return $permalink_arr; |
|
| 2011 | 2011 | |
| 2012 | 2012 | } |
| 2013 | 2013 | |
| 2014 | 2014 | if (!is_admin()) {
|
| 2015 | - add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');
|
|
| 2015 | + add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');
|
|
| 2016 | 2016 | } |
| 2017 | 2017 | /** |
| 2018 | 2018 | * Set status from draft to publish. |
@@ -2025,16 +2025,16 @@ discard block |
||
| 2025 | 2025 | */ |
| 2026 | 2026 | function geodir_set_status_draft_to_publish_for_own_post($post) |
| 2027 | 2027 | {
|
| 2028 | - $user_id = get_current_user_id(); |
|
| 2028 | + $user_id = get_current_user_id(); |
|
| 2029 | 2029 | |
| 2030 | - if(!$user_id){return $post;}
|
|
| 2030 | + if(!$user_id){return $post;}
|
|
| 2031 | 2031 | |
| 2032 | - $gd_post_types = geodir_get_posttypes(); |
|
| 2032 | + $gd_post_types = geodir_get_posttypes(); |
|
| 2033 | 2033 | |
| 2034 | - if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {
|
|
| 2035 | - $post[0]->post_status = 'publish'; |
|
| 2036 | - } |
|
| 2037 | - return $post; |
|
| 2034 | + if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {
|
|
| 2035 | + $post[0]->post_status = 'publish'; |
|
| 2036 | + } |
|
| 2037 | + return $post; |
|
| 2038 | 2038 | } |
| 2039 | 2039 | |
| 2040 | 2040 | |
@@ -2126,33 +2126,33 @@ discard block |
||
| 2126 | 2126 | */ |
| 2127 | 2127 | function geodir_detail_page_tab_headings_change($tabs_arr) |
| 2128 | 2128 | {
|
| 2129 | - global $wpdb; |
|
| 2129 | + global $wpdb; |
|
| 2130 | 2130 | |
| 2131 | - $post_type = geodir_get_current_posttype(); |
|
| 2131 | + $post_type = geodir_get_current_posttype(); |
|
| 2132 | 2132 | |
| 2133 | - $all_postypes = geodir_get_posttypes(); |
|
| 2133 | + $all_postypes = geodir_get_posttypes(); |
|
| 2134 | 2134 | |
| 2135 | - if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {
|
|
| 2135 | + if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {
|
|
| 2136 | 2136 | |
| 2137 | - if (array_key_exists('post_video', $tabs_arr)) {
|
|
| 2137 | + if (array_key_exists('post_video', $tabs_arr)) {
|
|
| 2138 | 2138 | |
| 2139 | - $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
| 2139 | + $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
| 2140 | 2140 | |
| 2141 | - if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') |
|
| 2142 | - $tabs_arr['post_video']['heading_text'] = $field_title; |
|
| 2143 | - } |
|
| 2141 | + if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') |
|
| 2142 | + $tabs_arr['post_video']['heading_text'] = $field_title; |
|
| 2143 | + } |
|
| 2144 | 2144 | |
| 2145 | - if (array_key_exists('special_offers', $tabs_arr)) {
|
|
| 2145 | + if (array_key_exists('special_offers', $tabs_arr)) {
|
|
| 2146 | 2146 | |
| 2147 | - $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
| 2147 | + $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
| 2148 | 2148 | |
| 2149 | - if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') |
|
| 2150 | - $tabs_arr['special_offers']['heading_text'] = $field_title; |
|
| 2151 | - } |
|
| 2149 | + if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') |
|
| 2150 | + $tabs_arr['special_offers']['heading_text'] = $field_title; |
|
| 2151 | + } |
|
| 2152 | 2152 | |
| 2153 | - } |
|
| 2153 | + } |
|
| 2154 | 2154 | |
| 2155 | - return $tabs_arr; |
|
| 2155 | + return $tabs_arr; |
|
| 2156 | 2156 | |
| 2157 | 2157 | } |
| 2158 | 2158 | |
@@ -2165,10 +2165,10 @@ discard block |
||
| 2165 | 2165 | */ |
| 2166 | 2166 | function geodir_remove_template_redirect_actions() |
| 2167 | 2167 | {
|
| 2168 | - if (geodir_is_page('login')){
|
|
| 2169 | - remove_all_actions('template_redirect');
|
|
| 2170 | - remove_action('init', 'avia_modify_front', 10);
|
|
| 2171 | - } |
|
| 2168 | + if (geodir_is_page('login')){
|
|
| 2169 | + remove_all_actions('template_redirect');
|
|
| 2170 | + remove_action('init', 'avia_modify_front', 10);
|
|
| 2171 | + } |
|
| 2172 | 2172 | } |
| 2173 | 2173 | |
| 2174 | 2174 | |
@@ -2190,51 +2190,51 @@ discard block |
||
| 2190 | 2190 | function geodirectory_before_featured_image_delete($attachment_id) |
| 2191 | 2191 | {
|
| 2192 | 2192 | |
| 2193 | - global $wpdb, $plugin_prefix; |
|
| 2193 | + global $wpdb, $plugin_prefix; |
|
| 2194 | 2194 | |
| 2195 | - $post_id = get_post_field('post_parent', $attachment_id);
|
|
| 2195 | + $post_id = get_post_field('post_parent', $attachment_id);
|
|
| 2196 | 2196 | |
| 2197 | - $attachment_url = wp_get_attachment_url($attachment_id); |
|
| 2197 | + $attachment_url = wp_get_attachment_url($attachment_id); |
|
| 2198 | 2198 | |
| 2199 | - if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {
|
|
| 2199 | + if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {
|
|
| 2200 | 2200 | |
| 2201 | - $post_type = get_post_type($post_id); |
|
| 2201 | + $post_type = get_post_type($post_id); |
|
| 2202 | 2202 | |
| 2203 | - $all_postypes = geodir_get_posttypes(); |
|
| 2203 | + $all_postypes = geodir_get_posttypes(); |
|
| 2204 | 2204 | |
| 2205 | - if (!in_array($post_type, $all_postypes) || !is_admin()) |
|
| 2206 | - return false; |
|
| 2205 | + if (!in_array($post_type, $all_postypes) || !is_admin()) |
|
| 2206 | + return false; |
|
| 2207 | 2207 | |
| 2208 | - $uploads = wp_upload_dir(); |
|
| 2208 | + $uploads = wp_upload_dir(); |
|
| 2209 | 2209 | |
| 2210 | - $split_img_path = explode($uploads['baseurl'], $attachment_url); |
|
| 2210 | + $split_img_path = explode($uploads['baseurl'], $attachment_url); |
|
| 2211 | 2211 | |
| 2212 | - $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 2212 | + $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 2213 | 2213 | |
| 2214 | - $wpdb->query( |
|
| 2215 | - $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",
|
|
| 2216 | - array($post_id, $split_img_file_path) |
|
| 2217 | - ) |
|
| 2218 | - ); |
|
| 2214 | + $wpdb->query( |
|
| 2215 | + $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",
|
|
| 2216 | + array($post_id, $split_img_file_path) |
|
| 2217 | + ) |
|
| 2218 | + ); |
|
| 2219 | 2219 | |
| 2220 | - $attachment_data = $wpdb->get_row( |
|
| 2221 | - $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",
|
|
| 2222 | - array($post_id) |
|
| 2223 | - ) |
|
| 2224 | - ); |
|
| 2220 | + $attachment_data = $wpdb->get_row( |
|
| 2221 | + $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",
|
|
| 2222 | + array($post_id) |
|
| 2223 | + ) |
|
| 2224 | + ); |
|
| 2225 | 2225 | |
| 2226 | - if (!empty($attachment_data)) {
|
|
| 2227 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2228 | - } |
|
| 2226 | + if (!empty($attachment_data)) {
|
|
| 2227 | + $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2228 | + } |
|
| 2229 | 2229 | |
| 2230 | 2230 | |
| 2231 | - $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2231 | + $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2232 | 2232 | |
| 2233 | - $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2233 | + $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2234 | 2234 | |
| 2235 | - geodir_set_wp_featured_image($post_id); |
|
| 2235 | + geodir_set_wp_featured_image($post_id); |
|
| 2236 | 2236 | |
| 2237 | - } |
|
| 2237 | + } |
|
| 2238 | 2238 | |
| 2239 | 2239 | } |
| 2240 | 2240 | |
@@ -2252,79 +2252,79 @@ discard block |
||
| 2252 | 2252 | function geodir_temp_set_post_attachment() |
| 2253 | 2253 | {
|
| 2254 | 2254 | |
| 2255 | - global $wpdb, $plugin_prefix; |
|
| 2255 | + global $wpdb, $plugin_prefix; |
|
| 2256 | 2256 | |
| 2257 | - $all_postypes = geodir_get_posttypes(); |
|
| 2257 | + $all_postypes = geodir_get_posttypes(); |
|
| 2258 | 2258 | |
| 2259 | - foreach ($all_postypes as $posttype) {
|
|
| 2259 | + foreach ($all_postypes as $posttype) {
|
|
| 2260 | 2260 | |
| 2261 | - $tablename = $plugin_prefix . $posttype . '_detail'; |
|
| 2261 | + $tablename = $plugin_prefix . $posttype . '_detail'; |
|
| 2262 | 2262 | |
| 2263 | - $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);
|
|
| 2263 | + $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);
|
|
| 2264 | 2264 | |
| 2265 | - if (!empty($get_post_data)) {
|
|
| 2265 | + if (!empty($get_post_data)) {
|
|
| 2266 | 2266 | |
| 2267 | - foreach ($get_post_data as $data) {
|
|
| 2267 | + foreach ($get_post_data as $data) {
|
|
| 2268 | 2268 | |
| 2269 | - $post_id = $data->post_id; |
|
| 2269 | + $post_id = $data->post_id; |
|
| 2270 | 2270 | |
| 2271 | - $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");
|
|
| 2271 | + $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");
|
|
| 2272 | 2272 | |
| 2273 | - if (!empty($attachment_data)) {
|
|
| 2273 | + if (!empty($attachment_data)) {
|
|
| 2274 | 2274 | |
| 2275 | - foreach ($attachment_data as $attach) {
|
|
| 2275 | + foreach ($attachment_data as $attach) {
|
|
| 2276 | 2276 | |
| 2277 | - $file_info = pathinfo($attach->file); |
|
| 2277 | + $file_info = pathinfo($attach->file); |
|
| 2278 | 2278 | |
| 2279 | - $sub_dir = ''; |
|
| 2280 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 2281 | - $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 2279 | + $sub_dir = ''; |
|
| 2280 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 2281 | + $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 2282 | 2282 | |
| 2283 | - $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 2284 | - $uploads_path = $uploads['basedir']; |
|
| 2283 | + $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 2284 | + $uploads_path = $uploads['basedir']; |
|
| 2285 | 2285 | |
| 2286 | - $file_name = $file_info['basename']; |
|
| 2286 | + $file_name = $file_info['basename']; |
|
| 2287 | 2287 | |
| 2288 | - $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name; |
|
| 2288 | + $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name; |
|
| 2289 | 2289 | |
| 2290 | - if (!file_exists($img_arr['path'])) {
|
|
| 2290 | + if (!file_exists($img_arr['path'])) {
|
|
| 2291 | 2291 | |
| 2292 | - $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);
|
|
| 2292 | + $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);
|
|
| 2293 | 2293 | |
| 2294 | - } |
|
| 2294 | + } |
|
| 2295 | 2295 | |
| 2296 | - } |
|
| 2296 | + } |
|
| 2297 | 2297 | |
| 2298 | - $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");
|
|
| 2298 | + $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");
|
|
| 2299 | 2299 | |
| 2300 | - if (!empty($attachment_data)) {
|
|
| 2300 | + if (!empty($attachment_data)) {
|
|
| 2301 | 2301 | |
| 2302 | - if ($attachment_data->ID) |
|
| 2303 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2302 | + if ($attachment_data->ID) |
|
| 2303 | + $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2304 | 2304 | |
| 2305 | - } else {
|
|
| 2305 | + } else {
|
|
| 2306 | 2306 | |
| 2307 | - if (has_post_thumbnail($post_id)) {
|
|
| 2307 | + if (has_post_thumbnail($post_id)) {
|
|
| 2308 | 2308 | |
| 2309 | - $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2309 | + $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2310 | 2310 | |
| 2311 | - wp_delete_attachment($post_thumbnail_id); |
|
| 2311 | + wp_delete_attachment($post_thumbnail_id); |
|
| 2312 | 2312 | |
| 2313 | - } |
|
| 2313 | + } |
|
| 2314 | 2314 | |
| 2315 | - } |
|
| 2315 | + } |
|
| 2316 | 2316 | |
| 2317 | - $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2317 | + $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2318 | 2318 | |
| 2319 | - geodir_set_wp_featured_image($post_id); |
|
| 2319 | + geodir_set_wp_featured_image($post_id); |
|
| 2320 | 2320 | |
| 2321 | - } |
|
| 2321 | + } |
|
| 2322 | 2322 | |
| 2323 | - } |
|
| 2323 | + } |
|
| 2324 | 2324 | |
| 2325 | - } |
|
| 2325 | + } |
|
| 2326 | 2326 | |
| 2327 | - } |
|
| 2327 | + } |
|
| 2328 | 2328 | |
| 2329 | 2329 | } |
| 2330 | 2330 | |
@@ -2342,9 +2342,9 @@ discard block |
||
| 2342 | 2342 | function geodir_default_rating_star_icon() |
| 2343 | 2343 | {
|
| 2344 | 2344 | |
| 2345 | - if (!get_option('geodir_default_rating_star_icon')) {
|
|
| 2346 | - update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');
|
|
| 2347 | - } |
|
| 2345 | + if (!get_option('geodir_default_rating_star_icon')) {
|
|
| 2346 | + update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');
|
|
| 2347 | + } |
|
| 2348 | 2348 | |
| 2349 | 2349 | } |
| 2350 | 2350 | |
@@ -2362,25 +2362,25 @@ discard block |
||
| 2362 | 2362 | */ |
| 2363 | 2363 | function geodir_user_post_listing_count($user_id = 0) |
| 2364 | 2364 | {
|
| 2365 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 2366 | - if(!$user_id){
|
|
| 2367 | - $user_id = $current_user->ID; |
|
| 2368 | - } |
|
| 2365 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 2366 | + if(!$user_id){
|
|
| 2367 | + $user_id = $current_user->ID; |
|
| 2368 | + } |
|
| 2369 | 2369 | |
| 2370 | - $all_posts = get_option('geodir_listing_link_user_dashboard');
|
|
| 2370 | + $all_posts = get_option('geodir_listing_link_user_dashboard');
|
|
| 2371 | 2371 | |
| 2372 | - $user_listing = array(); |
|
| 2373 | - if ($user_id && is_array($all_posts) && !empty($all_posts)) {
|
|
| 2374 | - foreach ($all_posts as $ptype) {
|
|
| 2375 | - $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' OR post_status = 'pending' )");
|
|
| 2372 | + $user_listing = array(); |
|
| 2373 | + if ($user_id && is_array($all_posts) && !empty($all_posts)) {
|
|
| 2374 | + foreach ($all_posts as $ptype) {
|
|
| 2375 | + $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' OR post_status = 'pending' )");
|
|
| 2376 | 2376 | |
| 2377 | - if ($total_posts > 0) {
|
|
| 2378 | - $user_listing[$ptype] = $total_posts; |
|
| 2379 | - } |
|
| 2380 | - } |
|
| 2381 | - } |
|
| 2377 | + if ($total_posts > 0) {
|
|
| 2378 | + $user_listing[$ptype] = $total_posts; |
|
| 2379 | + } |
|
| 2380 | + } |
|
| 2381 | + } |
|
| 2382 | 2382 | |
| 2383 | - return $user_listing; |
|
| 2383 | + return $user_listing; |
|
| 2384 | 2384 | } |
| 2385 | 2385 | |
| 2386 | 2386 | |
@@ -2400,189 +2400,189 @@ discard block |
||
| 2400 | 2400 | */ |
| 2401 | 2401 | function geodir_detail_page_custom_field_tab($tabs_arr) |
| 2402 | 2402 | {
|
| 2403 | - global $post; |
|
| 2404 | - |
|
| 2405 | - $post_type = geodir_get_current_posttype(); |
|
| 2406 | - $all_postypes = geodir_get_posttypes(); |
|
| 2407 | - |
|
| 2408 | - if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {
|
|
| 2409 | - $package_info = array(); |
|
| 2410 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 2411 | - $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 2412 | - $fields_location = 'owntab'; |
|
| 2413 | - |
|
| 2414 | - $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location); |
|
| 2415 | - //remove video and special offers if it is already set to show |
|
| 2416 | - if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){
|
|
| 2417 | - $unset_video = true; |
|
| 2418 | - } |
|
| 2419 | - |
|
| 2420 | - if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){
|
|
| 2421 | - $unset_special_offers = true; |
|
| 2422 | - } |
|
| 2423 | - if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){
|
|
| 2424 | - foreach($custom_fields as $key => $custom_field){
|
|
| 2425 | - if($custom_field['name']=='geodir_video' && isset($unset_video)){
|
|
| 2426 | - unset($custom_fields[$key]); |
|
| 2427 | - } |
|
| 2428 | - if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){
|
|
| 2429 | - unset($custom_fields[$key]); |
|
| 2430 | - } |
|
| 2431 | - } |
|
| 2432 | - } |
|
| 2433 | - |
|
| 2434 | - |
|
| 2435 | - if (!empty($custom_fields)) {
|
|
| 2436 | - $parse_custom_fields = array(); |
|
| 2437 | - foreach ($custom_fields as $field) {
|
|
| 2438 | - $field = stripslashes_deep($field); // strip slashes |
|
| 2439 | - $type = $field; |
|
| 2440 | - $field_name = $field['htmlvar_name']; |
|
| 2441 | - if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2442 | - $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2443 | - } |
|
| 2403 | + global $post; |
|
| 2444 | 2404 | |
| 2445 | - if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2446 | - if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2447 | - continue; |
|
| 2448 | - } |
|
| 2405 | + $post_type = geodir_get_current_posttype(); |
|
| 2406 | + $all_postypes = geodir_get_posttypes(); |
|
| 2449 | 2407 | |
| 2450 | - $parse_custom_fields[] = $field; |
|
| 2451 | - } |
|
| 2452 | - } |
|
| 2453 | - $custom_fields = $parse_custom_fields; |
|
| 2454 | - } |
|
| 2455 | - //print_r($custom_fields); |
|
| 2456 | - if (!empty($custom_fields)) {
|
|
| 2408 | + if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {
|
|
| 2409 | + $package_info = array(); |
|
| 2410 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 2411 | + $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 2412 | + $fields_location = 'owntab'; |
|
| 2457 | 2413 | |
| 2458 | - global $field_set_start; |
|
| 2414 | + $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location); |
|
| 2415 | + //remove video and special offers if it is already set to show |
|
| 2416 | + if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){
|
|
| 2417 | + $unset_video = true; |
|
| 2418 | + } |
|
| 2459 | 2419 | |
| 2460 | - $post = stripslashes_deep($post); // strip slashes |
|
| 2461 | - |
|
| 2462 | - $field_set_start = 0; |
|
| 2463 | - $fieldset_count = 0; |
|
| 2464 | - $fieldset = ''; |
|
| 2465 | - $total_fields = count($custom_fields); |
|
| 2466 | - $count_field = 0; |
|
| 2467 | - $fieldset_arr = array(); |
|
| 2468 | - $i = 0; |
|
| 2469 | - $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL; |
|
| 2470 | - |
|
| 2471 | - foreach ($custom_fields as $field) {
|
|
| 2472 | - $count_field++; |
|
| 2473 | - $field_name = $field['htmlvar_name']; |
|
| 2474 | - if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2475 | - $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2476 | - } |
|
| 2420 | + if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){
|
|
| 2421 | + $unset_special_offers = true; |
|
| 2422 | + } |
|
| 2423 | + if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){
|
|
| 2424 | + foreach($custom_fields as $key => $custom_field){
|
|
| 2425 | + if($custom_field['name']=='geodir_video' && isset($unset_video)){
|
|
| 2426 | + unset($custom_fields[$key]); |
|
| 2427 | + } |
|
| 2428 | + if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){
|
|
| 2429 | + unset($custom_fields[$key]); |
|
| 2430 | + } |
|
| 2431 | + } |
|
| 2432 | + } |
|
| 2477 | 2433 | |
| 2478 | - if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2479 | - $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title']; |
|
| 2480 | - $site_title = trim($field['site_title']); |
|
| 2481 | - $type = $field; |
|
| 2482 | - $variables_array = array(); |
|
| 2483 | 2434 | |
| 2484 | - if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2485 | - continue; |
|
| 2486 | - } |
|
| 2435 | + if (!empty($custom_fields)) {
|
|
| 2436 | + $parse_custom_fields = array(); |
|
| 2437 | + foreach ($custom_fields as $field) {
|
|
| 2438 | + $field = stripslashes_deep($field); // strip slashes |
|
| 2439 | + $type = $field; |
|
| 2440 | + $field_name = $field['htmlvar_name']; |
|
| 2441 | + if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2442 | + $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2443 | + } |
|
| 2487 | 2444 | |
| 2488 | - if ($type['type'] != 'fieldset') {
|
|
| 2489 | - $i++; |
|
| 2490 | - $variables_array['post_id'] = $post->ID; |
|
| 2491 | - $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 2492 | - $variables_array['value'] = isset($post->{$type['htmlvar_name']}) ? $post->{$type['htmlvar_name']} : '';
|
|
| 2493 | - |
|
| 2494 | - }else{
|
|
| 2495 | - $i = 0; |
|
| 2496 | - $fieldset_count++; |
|
| 2497 | - $field_set_start = 1; |
|
| 2498 | - $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count; |
|
| 2499 | - $fieldset_arr[$fieldset_count]['label'] = $label; |
|
| 2500 | - } |
|
| 2445 | + if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2446 | + if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2447 | + continue; |
|
| 2448 | + } |
|
| 2501 | 2449 | |
| 2450 | + $parse_custom_fields[] = $field; |
|
| 2451 | + } |
|
| 2452 | + } |
|
| 2453 | + $custom_fields = $parse_custom_fields; |
|
| 2454 | + } |
|
| 2455 | + //print_r($custom_fields); |
|
| 2456 | + if (!empty($custom_fields)) {
|
|
| 2502 | 2457 | |
| 2503 | - if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 2504 | - $type = stripslashes_deep($type); // strip slashes |
|
| 2505 | - if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 2506 | - $html = ''; |
|
| 2507 | - $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 2508 | - if($html_var=='post'){$html_var='post_address';}
|
|
| 2509 | - $field_icon = geodir_field_icon_proccess($type); |
|
| 2510 | - $filed_type = $type['type']; |
|
| 2511 | - |
|
| 2512 | - /** |
|
| 2513 | - * Filter the output for custom fields. |
|
| 2514 | - * |
|
| 2515 | - * Here we can remove or add new functions depending on the field type. |
|
| 2516 | - * |
|
| 2517 | - * @param string $html The html to be filtered (blank). |
|
| 2518 | - * @param string $fields_location The location the field is to be show. |
|
| 2519 | - * @param array $type The array of field values. |
|
| 2520 | - */ |
|
| 2521 | - $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 2522 | - |
|
| 2523 | - |
|
| 2524 | - /** |
|
| 2525 | - * Filter custom field output in tab. |
|
| 2526 | - * |
|
| 2527 | - * @since 1.5.6 |
|
| 2528 | - * |
|
| 2529 | - * @param string $html_var The HTML variable name for the field. |
|
| 2530 | - * @param string $html Custom field unfiltered HTML. |
|
| 2531 | - * @param array $variables_array Custom field variables array. |
|
| 2532 | - */ |
|
| 2533 | - $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);
|
|
| 2534 | - |
|
| 2535 | - $fieldset_html = ''; |
|
| 2536 | - if ($field_set_start == 1) {
|
|
| 2537 | - $add_html = false; |
|
| 2538 | - if ($type['type'] == 'fieldset' && $fieldset_count > 1) {
|
|
| 2539 | - if ($fieldset != '') {
|
|
| 2540 | - $add_html = true; |
|
| 2541 | - $label = $fieldset_arr[$fieldset_count - 1]['label']; |
|
| 2542 | - $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name']; |
|
| 2543 | - } |
|
| 2544 | - $fieldset_html = $fieldset; |
|
| 2545 | - $fieldset = ''; |
|
| 2546 | - } else {
|
|
| 2547 | - $fieldset .= $html; |
|
| 2548 | - if ($total_fields == $count_field && $fieldset != '') {
|
|
| 2549 | - $add_html = true; |
|
| 2550 | - $label = $fieldset_arr[$fieldset_count]['label']; |
|
| 2551 | - $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name']; |
|
| 2552 | - $fieldset_html = $fieldset; |
|
| 2553 | - } |
|
| 2554 | - } |
|
| 2458 | + global $field_set_start; |
|
| 2555 | 2459 | |
| 2556 | - if ($add_html) {
|
|
| 2557 | - $tabs_arr[$htmlvar_name] = array( |
|
| 2558 | - 'heading_text' => __($label, 'geodirectory'), |
|
| 2559 | - 'is_active_tab' => false, |
|
| 2560 | - /** |
|
| 2561 | - * Filter if a custom field should be displayed on the details page tab. |
|
| 2562 | - * |
|
| 2563 | - * @since 1.0.0 |
|
| 2564 | - * @param string $htmlvar_name The field HTML var name. |
|
| 2565 | - */ |
|
| 2566 | - 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),
|
|
| 2567 | - 'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>' |
|
| 2568 | - ); |
|
| 2569 | - } |
|
| 2570 | - } else {
|
|
| 2571 | - if ($html != '') {
|
|
| 2572 | - $tabs_arr[$html_var] = array( |
|
| 2573 | - 'heading_text' => __($label, 'geodirectory'), |
|
| 2574 | - 'is_active_tab' => false, |
|
| 2575 | - /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 2576 | - 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),
|
|
| 2577 | - 'tab_content' => $html |
|
| 2578 | - ); |
|
| 2579 | - } |
|
| 2580 | - } |
|
| 2581 | - } |
|
| 2582 | - } |
|
| 2583 | - } |
|
| 2584 | - } |
|
| 2585 | - return $tabs_arr; |
|
| 2460 | + $post = stripslashes_deep($post); // strip slashes |
|
| 2461 | + |
|
| 2462 | + $field_set_start = 0; |
|
| 2463 | + $fieldset_count = 0; |
|
| 2464 | + $fieldset = ''; |
|
| 2465 | + $total_fields = count($custom_fields); |
|
| 2466 | + $count_field = 0; |
|
| 2467 | + $fieldset_arr = array(); |
|
| 2468 | + $i = 0; |
|
| 2469 | + $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL; |
|
| 2470 | + |
|
| 2471 | + foreach ($custom_fields as $field) {
|
|
| 2472 | + $count_field++; |
|
| 2473 | + $field_name = $field['htmlvar_name']; |
|
| 2474 | + if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2475 | + $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2476 | + } |
|
| 2477 | + |
|
| 2478 | + if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2479 | + $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title']; |
|
| 2480 | + $site_title = trim($field['site_title']); |
|
| 2481 | + $type = $field; |
|
| 2482 | + $variables_array = array(); |
|
| 2483 | + |
|
| 2484 | + if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2485 | + continue; |
|
| 2486 | + } |
|
| 2487 | + |
|
| 2488 | + if ($type['type'] != 'fieldset') {
|
|
| 2489 | + $i++; |
|
| 2490 | + $variables_array['post_id'] = $post->ID; |
|
| 2491 | + $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 2492 | + $variables_array['value'] = isset($post->{$type['htmlvar_name']}) ? $post->{$type['htmlvar_name']} : '';
|
|
| 2493 | + |
|
| 2494 | + }else{
|
|
| 2495 | + $i = 0; |
|
| 2496 | + $fieldset_count++; |
|
| 2497 | + $field_set_start = 1; |
|
| 2498 | + $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count; |
|
| 2499 | + $fieldset_arr[$fieldset_count]['label'] = $label; |
|
| 2500 | + } |
|
| 2501 | + |
|
| 2502 | + |
|
| 2503 | + if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 2504 | + $type = stripslashes_deep($type); // strip slashes |
|
| 2505 | + if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 2506 | + $html = ''; |
|
| 2507 | + $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 2508 | + if($html_var=='post'){$html_var='post_address';}
|
|
| 2509 | + $field_icon = geodir_field_icon_proccess($type); |
|
| 2510 | + $filed_type = $type['type']; |
|
| 2511 | + |
|
| 2512 | + /** |
|
| 2513 | + * Filter the output for custom fields. |
|
| 2514 | + * |
|
| 2515 | + * Here we can remove or add new functions depending on the field type. |
|
| 2516 | + * |
|
| 2517 | + * @param string $html The html to be filtered (blank). |
|
| 2518 | + * @param string $fields_location The location the field is to be show. |
|
| 2519 | + * @param array $type The array of field values. |
|
| 2520 | + */ |
|
| 2521 | + $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 2522 | + |
|
| 2523 | + |
|
| 2524 | + /** |
|
| 2525 | + * Filter custom field output in tab. |
|
| 2526 | + * |
|
| 2527 | + * @since 1.5.6 |
|
| 2528 | + * |
|
| 2529 | + * @param string $html_var The HTML variable name for the field. |
|
| 2530 | + * @param string $html Custom field unfiltered HTML. |
|
| 2531 | + * @param array $variables_array Custom field variables array. |
|
| 2532 | + */ |
|
| 2533 | + $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);
|
|
| 2534 | + |
|
| 2535 | + $fieldset_html = ''; |
|
| 2536 | + if ($field_set_start == 1) {
|
|
| 2537 | + $add_html = false; |
|
| 2538 | + if ($type['type'] == 'fieldset' && $fieldset_count > 1) {
|
|
| 2539 | + if ($fieldset != '') {
|
|
| 2540 | + $add_html = true; |
|
| 2541 | + $label = $fieldset_arr[$fieldset_count - 1]['label']; |
|
| 2542 | + $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name']; |
|
| 2543 | + } |
|
| 2544 | + $fieldset_html = $fieldset; |
|
| 2545 | + $fieldset = ''; |
|
| 2546 | + } else {
|
|
| 2547 | + $fieldset .= $html; |
|
| 2548 | + if ($total_fields == $count_field && $fieldset != '') {
|
|
| 2549 | + $add_html = true; |
|
| 2550 | + $label = $fieldset_arr[$fieldset_count]['label']; |
|
| 2551 | + $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name']; |
|
| 2552 | + $fieldset_html = $fieldset; |
|
| 2553 | + } |
|
| 2554 | + } |
|
| 2555 | + |
|
| 2556 | + if ($add_html) {
|
|
| 2557 | + $tabs_arr[$htmlvar_name] = array( |
|
| 2558 | + 'heading_text' => __($label, 'geodirectory'), |
|
| 2559 | + 'is_active_tab' => false, |
|
| 2560 | + /** |
|
| 2561 | + * Filter if a custom field should be displayed on the details page tab. |
|
| 2562 | + * |
|
| 2563 | + * @since 1.0.0 |
|
| 2564 | + * @param string $htmlvar_name The field HTML var name. |
|
| 2565 | + */ |
|
| 2566 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),
|
|
| 2567 | + 'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>' |
|
| 2568 | + ); |
|
| 2569 | + } |
|
| 2570 | + } else {
|
|
| 2571 | + if ($html != '') {
|
|
| 2572 | + $tabs_arr[$html_var] = array( |
|
| 2573 | + 'heading_text' => __($label, 'geodirectory'), |
|
| 2574 | + 'is_active_tab' => false, |
|
| 2575 | + /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 2576 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),
|
|
| 2577 | + 'tab_content' => $html |
|
| 2578 | + ); |
|
| 2579 | + } |
|
| 2580 | + } |
|
| 2581 | + } |
|
| 2582 | + } |
|
| 2583 | + } |
|
| 2584 | + } |
|
| 2585 | + return $tabs_arr; |
|
| 2586 | 2586 | } |
| 2587 | 2587 | |
| 2588 | 2588 | /* display add listing page for wpml */ |
@@ -2606,41 +2606,41 @@ discard block |
||
| 2606 | 2606 | */ |
| 2607 | 2607 | function geodir_add_post_status_author_page() |
| 2608 | 2608 | {
|
| 2609 | - global $wpdb, $post; |
|
| 2610 | - |
|
| 2611 | - $html = ''; |
|
| 2612 | - if (get_current_user_id()) {
|
|
| 2613 | - |
|
| 2614 | - $is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));
|
|
| 2615 | - if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {
|
|
| 2616 | - |
|
| 2617 | - // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them. |
|
| 2618 | - $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");
|
|
| 2619 | - $status = "<strong>(";
|
|
| 2620 | - $status_icon = '<i class="fa fa-play"></i>'; |
|
| 2621 | - if ($real_status == 'publish') {
|
|
| 2622 | - $status .= __('Published', 'geodirectory');
|
|
| 2623 | - }elseif ($real_status == 'pending') {
|
|
| 2624 | - $status .= __('Awaiting Review', 'geodirectory');
|
|
| 2625 | - } else {
|
|
| 2626 | - $status .= __('Not published', 'geodirectory');
|
|
| 2627 | - $status_icon = '<i class="fa fa-pause"></i>'; |
|
| 2628 | - } |
|
| 2629 | - $status .= ")</strong>"; |
|
| 2609 | + global $wpdb, $post; |
|
| 2610 | + |
|
| 2611 | + $html = ''; |
|
| 2612 | + if (get_current_user_id()) {
|
|
| 2613 | + |
|
| 2614 | + $is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));
|
|
| 2615 | + if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {
|
|
| 2616 | + |
|
| 2617 | + // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them. |
|
| 2618 | + $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");
|
|
| 2619 | + $status = "<strong>(";
|
|
| 2620 | + $status_icon = '<i class="fa fa-play"></i>'; |
|
| 2621 | + if ($real_status == 'publish') {
|
|
| 2622 | + $status .= __('Published', 'geodirectory');
|
|
| 2623 | + }elseif ($real_status == 'pending') {
|
|
| 2624 | + $status .= __('Awaiting Review', 'geodirectory');
|
|
| 2625 | + } else {
|
|
| 2626 | + $status .= __('Not published', 'geodirectory');
|
|
| 2627 | + $status_icon = '<i class="fa fa-pause"></i>'; |
|
| 2628 | + } |
|
| 2629 | + $status .= ")</strong>"; |
|
| 2630 | 2630 | |
| 2631 | - $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';
|
|
| 2632 | - } |
|
| 2633 | - } |
|
| 2631 | + $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';
|
|
| 2632 | + } |
|
| 2633 | + } |
|
| 2634 | 2634 | |
| 2635 | - if ($html != '') {
|
|
| 2636 | - /** |
|
| 2637 | - * Filter the post status text on the author page. |
|
| 2638 | - * |
|
| 2639 | - * @since 1.0.0 |
|
| 2640 | - * @param string $html The HTML of the status. |
|
| 2641 | - */ |
|
| 2642 | - echo apply_filters('geodir_filter_status_text_on_author_page', $html);
|
|
| 2643 | - } |
|
| 2635 | + if ($html != '') {
|
|
| 2636 | + /** |
|
| 2637 | + * Filter the post status text on the author page. |
|
| 2638 | + * |
|
| 2639 | + * @since 1.0.0 |
|
| 2640 | + * @param string $html The HTML of the status. |
|
| 2641 | + */ |
|
| 2642 | + echo apply_filters('geodir_filter_status_text_on_author_page', $html);
|
|
| 2643 | + } |
|
| 2644 | 2644 | |
| 2645 | 2645 | |
| 2646 | 2646 | } |
@@ -2654,9 +2654,9 @@ discard block |
||
| 2654 | 2654 | * @package GeoDirectory |
| 2655 | 2655 | */ |
| 2656 | 2656 | function geodir_init_no_rating() {
|
| 2657 | - if (geodir_rating_disabled_post_types()) {
|
|
| 2658 | - add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);
|
|
| 2659 | - } |
|
| 2657 | + if (geodir_rating_disabled_post_types()) {
|
|
| 2658 | + add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);
|
|
| 2659 | + } |
|
| 2660 | 2660 | } |
| 2661 | 2661 | |
| 2662 | 2662 | /** |
@@ -2670,22 +2670,22 @@ discard block |
||
| 2670 | 2670 | * @return array Modified sort options array. |
| 2671 | 2671 | */ |
| 2672 | 2672 | function geodir_no_rating_get_sort_options($options, $post_type = '') {
|
| 2673 | - if (!empty($post_type) && geodir_cpt_has_rating_disabled($post_type)) {
|
|
| 2674 | - $new_options = array(); |
|
| 2673 | + if (!empty($post_type) && geodir_cpt_has_rating_disabled($post_type)) {
|
|
| 2674 | + $new_options = array(); |
|
| 2675 | 2675 | |
| 2676 | - if (!empty($options)) {
|
|
| 2677 | - foreach ($options as $option) {
|
|
| 2678 | - if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {
|
|
| 2679 | - continue; |
|
| 2680 | - } |
|
| 2681 | - $new_options[] = $option; |
|
| 2682 | - } |
|
| 2676 | + if (!empty($options)) {
|
|
| 2677 | + foreach ($options as $option) {
|
|
| 2678 | + if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {
|
|
| 2679 | + continue; |
|
| 2680 | + } |
|
| 2681 | + $new_options[] = $option; |
|
| 2682 | + } |
|
| 2683 | 2683 | |
| 2684 | - $options = $new_options; |
|
| 2685 | - } |
|
| 2686 | - } |
|
| 2684 | + $options = $new_options; |
|
| 2685 | + } |
|
| 2686 | + } |
|
| 2687 | 2687 | |
| 2688 | - return $options; |
|
| 2688 | + return $options; |
|
| 2689 | 2689 | } |
| 2690 | 2690 | |
| 2691 | 2691 | /** |
@@ -2697,9 +2697,9 @@ discard block |
||
| 2697 | 2697 | * @return array Modified class array. |
| 2698 | 2698 | */ |
| 2699 | 2699 | function geodir_body_class_active_map($classes = array()) {
|
| 2700 | - $classes[] = 'gd-map-' . geodir_map_name(); |
|
| 2700 | + $classes[] = 'gd-map-' . geodir_map_name(); |
|
| 2701 | 2701 | |
| 2702 | - return $classes; |
|
| 2702 | + return $classes; |
|
| 2703 | 2703 | } |
| 2704 | 2704 | add_filter('body_class', 'geodir_body_class_active_map', 100);
|
| 2705 | 2705 | |
@@ -2712,9 +2712,9 @@ discard block |
||
| 2712 | 2712 | * @return string Modified class string. |
| 2713 | 2713 | */ |
| 2714 | 2714 | function geodir_admin_body_class_active_map($class = '') {
|
| 2715 | - $class .= ' gd-map-' . geodir_map_name(); |
|
| 2715 | + $class .= ' gd-map-' . geodir_map_name(); |
|
| 2716 | 2716 | |
| 2717 | - return $class; |
|
| 2717 | + return $class; |
|
| 2718 | 2718 | } |
| 2719 | 2719 | add_filter('admin_body_class', 'geodir_admin_body_class_active_map', 100);
|
| 2720 | 2720 | |
@@ -2732,36 +2732,36 @@ discard block |
||
| 2732 | 2732 | * @return array Translation texts. |
| 2733 | 2733 | */ |
| 2734 | 2734 | function geodir_load_gd_options_text_translation($translation_texts = array()) {
|
| 2735 | - $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array(); |
|
| 2736 | - |
|
| 2737 | - $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');
|
|
| 2738 | - |
|
| 2739 | - /** |
|
| 2740 | - * Filters the geodirectory option names that requires to add for translation. |
|
| 2741 | - * |
|
| 2742 | - * @since 1.5.7 |
|
| 2743 | - * @package GeoDirectory |
|
| 2744 | - * |
|
| 2745 | - * @param array $gd_options Array of option names. |
|
| 2746 | - */ |
|
| 2747 | - $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);
|
|
| 2748 | - $gd_options = array_unique($gd_options); |
|
| 2749 | - |
|
| 2750 | - if (!empty($gd_options)) {
|
|
| 2751 | - foreach ($gd_options as $gd_option) {
|
|
| 2752 | - if ($gd_option != '' && $option_value = get_option($gd_option)) {
|
|
| 2753 | - $option_value = is_string($option_value) ? stripslashes_deep($option_value) : ''; |
|
| 2735 | + $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array(); |
|
| 2736 | + |
|
| 2737 | + $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');
|
|
| 2738 | + |
|
| 2739 | + /** |
|
| 2740 | + * Filters the geodirectory option names that requires to add for translation. |
|
| 2741 | + * |
|
| 2742 | + * @since 1.5.7 |
|
| 2743 | + * @package GeoDirectory |
|
| 2744 | + * |
|
| 2745 | + * @param array $gd_options Array of option names. |
|
| 2746 | + */ |
|
| 2747 | + $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);
|
|
| 2748 | + $gd_options = array_unique($gd_options); |
|
| 2749 | + |
|
| 2750 | + if (!empty($gd_options)) {
|
|
| 2751 | + foreach ($gd_options as $gd_option) {
|
|
| 2752 | + if ($gd_option != '' && $option_value = get_option($gd_option)) {
|
|
| 2753 | + $option_value = is_string($option_value) ? stripslashes_deep($option_value) : ''; |
|
| 2754 | 2754 | |
| 2755 | - if ($option_value != '' && !in_array($option_value, $translation_texts)) {
|
|
| 2756 | - $translation_texts[] = stripslashes_deep($option_value); |
|
| 2757 | - } |
|
| 2758 | - } |
|
| 2759 | - } |
|
| 2760 | - } |
|
| 2755 | + if ($option_value != '' && !in_array($option_value, $translation_texts)) {
|
|
| 2756 | + $translation_texts[] = stripslashes_deep($option_value); |
|
| 2757 | + } |
|
| 2758 | + } |
|
| 2759 | + } |
|
| 2760 | + } |
|
| 2761 | 2761 | |
| 2762 | - $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 2762 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 2763 | 2763 | |
| 2764 | - return $translation_texts; |
|
| 2764 | + return $translation_texts; |
|
| 2765 | 2765 | } |
| 2766 | 2766 | |
| 2767 | 2767 | add_filter('geodir_load_db_language', 'geodir_load_gd_options_text_translation');
|
@@ -2775,15 +2775,15 @@ discard block |
||
| 2775 | 2775 | |
| 2776 | 2776 | add_filter('get_comments_link', 'gd_get_comments_link', 10, 2);
|
| 2777 | 2777 | function gd_get_comments_link($comments_link, $post_id) {
|
| 2778 | - $post_type = get_post_type($post_id); |
|
| 2778 | + $post_type = get_post_type($post_id); |
|
| 2779 | 2779 | |
| 2780 | - $all_postypes = geodir_get_posttypes(); |
|
| 2781 | - if (in_array($post_type, $all_postypes)) {
|
|
| 2782 | - $comments_link = str_replace('#comments', '#reviews', $comments_link);
|
|
| 2783 | - $comments_link = str_replace('#respond', '#reviews', $comments_link);
|
|
| 2784 | - } |
|
| 2780 | + $all_postypes = geodir_get_posttypes(); |
|
| 2781 | + if (in_array($post_type, $all_postypes)) {
|
|
| 2782 | + $comments_link = str_replace('#comments', '#reviews', $comments_link);
|
|
| 2783 | + $comments_link = str_replace('#respond', '#reviews', $comments_link);
|
|
| 2784 | + } |
|
| 2785 | 2785 | |
| 2786 | - return $comments_link; |
|
| 2786 | + return $comments_link; |
|
| 2787 | 2787 | } |
| 2788 | 2788 | |
| 2789 | 2789 | |
@@ -2801,11 +2801,11 @@ discard block |
||
| 2801 | 2801 | function geodir_add_nav_menu_class( $args ) |
| 2802 | 2802 | {
|
| 2803 | 2803 | |
| 2804 | - if(isset($args['menu_class'])){
|
|
| 2805 | - $args['menu_class'] = $args['menu_class']." gd-menu-z"; |
|
| 2806 | - } |
|
| 2804 | + if(isset($args['menu_class'])){
|
|
| 2805 | + $args['menu_class'] = $args['menu_class']." gd-menu-z"; |
|
| 2806 | + } |
|
| 2807 | 2807 | |
| 2808 | - return $args; |
|
| 2808 | + return $args; |
|
| 2809 | 2809 | } |
| 2810 | 2810 | |
| 2811 | 2811 | add_filter( 'wp_nav_menu_args', 'geodir_add_nav_menu_class' ); |
@@ -2822,15 +2822,15 @@ discard block |
||
| 2822 | 2822 | * @return string Filtered locale ID. |
| 2823 | 2823 | */ |
| 2824 | 2824 | function geodir_wpml_filter_locale($locale) {
|
| 2825 | - global $sitepress; |
|
| 2825 | + global $sitepress; |
|
| 2826 | 2826 | |
| 2827 | - $post_type = !empty($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (!empty($_REQUEST['post']) ? get_post_type($_REQUEST['post']) : ''); |
|
| 2827 | + $post_type = !empty($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (!empty($_REQUEST['post']) ? get_post_type($_REQUEST['post']) : ''); |
|
| 2828 | 2828 | |
| 2829 | - if (!empty($sitepress) && $sitepress->is_post_edit_screen() && $post_type && in_array($post_type, geodir_get_posttypes()) && $current_lang = $sitepress->get_current_language()) {
|
|
| 2830 | - $locale = $sitepress->get_locale($current_lang); |
|
| 2831 | - } |
|
| 2829 | + if (!empty($sitepress) && $sitepress->is_post_edit_screen() && $post_type && in_array($post_type, geodir_get_posttypes()) && $current_lang = $sitepress->get_current_language()) {
|
|
| 2830 | + $locale = $sitepress->get_locale($current_lang); |
|
| 2831 | + } |
|
| 2832 | 2832 | |
| 2833 | - return $locale; |
|
| 2833 | + return $locale; |
|
| 2834 | 2834 | } |
| 2835 | 2835 | |
| 2836 | 2836 | /** |
@@ -2840,19 +2840,19 @@ discard block |
||
| 2840 | 2840 | * @package GeoDirectory |
| 2841 | 2841 | */ |
| 2842 | 2842 | function geodir_wpml_set_filter() {
|
| 2843 | - if (geodir_is_wpml()) {
|
|
| 2844 | - global $sitepress; |
|
| 2843 | + if (geodir_is_wpml()) {
|
|
| 2844 | + global $sitepress; |
|
| 2845 | 2845 | |
| 2846 | - if ($sitepress->get_setting('sync_comments_on_duplicates')) {
|
|
| 2847 | - add_action('comment_post', 'gepdir_wpml_sync_comment', 100, 1);
|
|
| 2848 | - } |
|
| 2846 | + if ($sitepress->get_setting('sync_comments_on_duplicates')) {
|
|
| 2847 | + add_action('comment_post', 'gepdir_wpml_sync_comment', 100, 1);
|
|
| 2848 | + } |
|
| 2849 | 2849 | |
| 2850 | - add_action('geodir_after_save_listing', 'geodir_wpml_duplicate_listing', 100, 2);
|
|
| 2851 | - add_action( 'geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1 ); |
|
| 2852 | - if (is_admin()) {
|
|
| 2853 | - add_filter( 'geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1 ); |
|
| 2854 | - } |
|
| 2855 | - } |
|
| 2850 | + add_action('geodir_after_save_listing', 'geodir_wpml_duplicate_listing', 100, 2);
|
|
| 2851 | + add_action( 'geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1 ); |
|
| 2852 | + if (is_admin()) {
|
|
| 2853 | + add_filter( 'geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1 ); |
|
| 2854 | + } |
|
| 2855 | + } |
|
| 2856 | 2856 | } |
| 2857 | 2857 | add_filter('plugins_loaded', 'geodir_wpml_set_filter');
|
| 2858 | 2858 | |
@@ -2865,38 +2865,38 @@ discard block |
||
| 2865 | 2865 | * @return array Filtered languages. |
| 2866 | 2866 | */ |
| 2867 | 2867 | function geodir_wpml_filter_ls_languages($languages) {
|
| 2868 | - if (geodir_is_geodir_page()) {
|
|
| 2869 | - $keep_vars = array(); |
|
| 2868 | + if (geodir_is_geodir_page()) {
|
|
| 2869 | + $keep_vars = array(); |
|
| 2870 | 2870 | |
| 2871 | - if (geodir_is_page('add-listing')) {
|
|
| 2872 | - $keep_vars = array('listing_type', 'package_id');
|
|
| 2873 | - } else if (geodir_is_page('search')) {
|
|
| 2874 | - $keep_vars = array('geodir_search', 'stype', 'snear', 'set_location_type', 'set_location_val', 'sgeo_lat', 'sgeo_lon');
|
|
| 2875 | - } else if (geodir_is_page('author')) {
|
|
| 2876 | - $keep_vars = array('geodir_dashbord', 'stype', 'list');
|
|
| 2877 | - } else if (geodir_is_page('login')) {
|
|
| 2878 | - $keep_vars = array('forgot', 'signup');
|
|
| 2879 | - } |
|
| 2871 | + if (geodir_is_page('add-listing')) {
|
|
| 2872 | + $keep_vars = array('listing_type', 'package_id');
|
|
| 2873 | + } else if (geodir_is_page('search')) {
|
|
| 2874 | + $keep_vars = array('geodir_search', 'stype', 'snear', 'set_location_type', 'set_location_val', 'sgeo_lat', 'sgeo_lon');
|
|
| 2875 | + } else if (geodir_is_page('author')) {
|
|
| 2876 | + $keep_vars = array('geodir_dashbord', 'stype', 'list');
|
|
| 2877 | + } else if (geodir_is_page('login')) {
|
|
| 2878 | + $keep_vars = array('forgot', 'signup');
|
|
| 2879 | + } |
|
| 2880 | 2880 | |
| 2881 | - if (!empty($keep_vars)) {
|
|
| 2882 | - foreach ( $languages as $code => $url) {
|
|
| 2883 | - $filter_url = $url['url']; |
|
| 2881 | + if (!empty($keep_vars)) {
|
|
| 2882 | + foreach ( $languages as $code => $url) {
|
|
| 2883 | + $filter_url = $url['url']; |
|
| 2884 | 2884 | |
| 2885 | - foreach ($keep_vars as $var) {
|
|
| 2886 | - if (isset($_GET[$var]) && !is_array($_GET[$var])) {
|
|
| 2887 | - $filter_url = remove_query_arg(array($var), $filter_url); |
|
| 2888 | - $filter_url = add_query_arg(array($var => $_GET[$var]), $filter_url); |
|
| 2889 | - } |
|
| 2890 | - } |
|
| 2885 | + foreach ($keep_vars as $var) {
|
|
| 2886 | + if (isset($_GET[$var]) && !is_array($_GET[$var])) {
|
|
| 2887 | + $filter_url = remove_query_arg(array($var), $filter_url); |
|
| 2888 | + $filter_url = add_query_arg(array($var => $_GET[$var]), $filter_url); |
|
| 2889 | + } |
|
| 2890 | + } |
|
| 2891 | 2891 | |
| 2892 | - if ($filter_url != $url['url']) {
|
|
| 2893 | - $languages[$code]['url'] = $filter_url; |
|
| 2894 | - } |
|
| 2895 | - } |
|
| 2896 | - } |
|
| 2897 | - } |
|
| 2892 | + if ($filter_url != $url['url']) {
|
|
| 2893 | + $languages[$code]['url'] = $filter_url; |
|
| 2894 | + } |
|
| 2895 | + } |
|
| 2896 | + } |
|
| 2897 | + } |
|
| 2898 | 2898 | |
| 2899 | - return $languages; |
|
| 2899 | + return $languages; |
|
| 2900 | 2900 | } |
| 2901 | 2901 | add_filter( 'icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1 ); |
| 2902 | 2902 | |
@@ -2907,18 +2907,18 @@ discard block |
||
| 2907 | 2907 | * |
| 2908 | 2908 | */ |
| 2909 | 2909 | function geodir_remove_yoast_seo_metas(){
|
| 2910 | - if ( class_exists( 'WPSEO_Frontend' ) && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas() ) {
|
|
| 2911 | - $wpseo = WPSEO_Frontend::get_instance(); |
|
| 2910 | + if ( class_exists( 'WPSEO_Frontend' ) && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas() ) {
|
|
| 2911 | + $wpseo = WPSEO_Frontend::get_instance(); |
|
| 2912 | 2912 | |
| 2913 | - remove_action( 'wp_head', array( $wpseo, 'metadesc' ), 6 ); |
|
| 2914 | - remove_action( 'wp_head', array( $wpseo, 'metakeywords' ), 11 ); |
|
| 2915 | - remove_filter( 'pre_get_document_title', array( $wpseo, 'title' ), 15 ); |
|
| 2916 | - remove_filter( 'wp_title', array( $wpseo, 'title' ), 15, 3 ); |
|
| 2917 | - remove_filter( 'thematic_doctitle', array( $wpseo, 'title' ), 15 ); |
|
| 2918 | - remove_filter( 'woo_title', array( $wpseo, 'fix_woo_title' ), 99 ); |
|
| 2913 | + remove_action( 'wp_head', array( $wpseo, 'metadesc' ), 6 ); |
|
| 2914 | + remove_action( 'wp_head', array( $wpseo, 'metakeywords' ), 11 ); |
|
| 2915 | + remove_filter( 'pre_get_document_title', array( $wpseo, 'title' ), 15 ); |
|
| 2916 | + remove_filter( 'wp_title', array( $wpseo, 'title' ), 15, 3 ); |
|
| 2917 | + remove_filter( 'thematic_doctitle', array( $wpseo, 'title' ), 15 ); |
|
| 2918 | + remove_filter( 'woo_title', array( $wpseo, 'fix_woo_title' ), 99 ); |
|
| 2919 | 2919 | |
| 2920 | - remove_action( 'template_redirect', 'wpseo_frontend_head_init', 999 ); |
|
| 2921 | - } |
|
| 2920 | + remove_action( 'template_redirect', 'wpseo_frontend_head_init', 999 ); |
|
| 2921 | + } |
|
| 2922 | 2922 | } |
| 2923 | 2923 | |
| 2924 | 2924 | /** |
@@ -2932,20 +2932,20 @@ discard block |
||
| 2932 | 2932 | * |
| 2933 | 2933 | */ |
| 2934 | 2934 | function geodir_wpml_ajax_set_guest_lang() {
|
| 2935 | - if ( geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in() ) {
|
|
| 2936 | - if ( empty( $_GET['lang'] ) && !( !empty( $_SERVER['REQUEST_URI'] ) && preg_match( '@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename( preg_replace( '@\?.*$@', '', $_SERVER['REQUEST_URI'] ) ) ) ) ) {
|
|
| 2937 | - global $sitepress; |
|
| 2935 | + if ( geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in() ) {
|
|
| 2936 | + if ( empty( $_GET['lang'] ) && !( !empty( $_SERVER['REQUEST_URI'] ) && preg_match( '@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename( preg_replace( '@\?.*$@', '', $_SERVER['REQUEST_URI'] ) ) ) ) ) {
|
|
| 2937 | + global $sitepress; |
|
| 2938 | 2938 | |
| 2939 | - $referer = wp_get_referer(); |
|
| 2939 | + $referer = wp_get_referer(); |
|
| 2940 | 2940 | |
| 2941 | - $current_lang = $sitepress->get_current_language(); |
|
| 2942 | - $referrer_lang = $sitepress->get_language_from_url( $referer ); |
|
| 2941 | + $current_lang = $sitepress->get_current_language(); |
|
| 2942 | + $referrer_lang = $sitepress->get_language_from_url( $referer ); |
|
| 2943 | 2943 | |
| 2944 | - if ( $referrer_lang && $current_lang != $referrer_lang ) {
|
|
| 2945 | - $_GET['lang'] = $referrer_lang; |
|
| 2946 | - } |
|
| 2947 | - } |
|
| 2948 | - } |
|
| 2944 | + if ( $referrer_lang && $current_lang != $referrer_lang ) {
|
|
| 2945 | + $_GET['lang'] = $referrer_lang; |
|
| 2946 | + } |
|
| 2947 | + } |
|
| 2948 | + } |
|
| 2949 | 2949 | } |
| 2950 | 2950 | add_action( 'plugins_loaded', 'geodir_wpml_ajax_set_guest_lang', -1 ); |
| 2951 | 2951 | |
@@ -2957,36 +2957,36 @@ discard block |
||
| 2957 | 2957 | * @param object $wp The WordPress object. |
| 2958 | 2958 | */ |
| 2959 | 2959 | function geodir_check_redirect($wp) {
|
| 2960 | - if (is_404() || (!empty($wp->query_vars['error']) && $wp->query_vars['error'] == '404')) {
|
|
| 2961 | - $current_url = geodir_curPageURL(); |
|
| 2962 | - $search = 'czech-republic'; |
|
| 2963 | - $replace = 'czechia'; |
|
| 2960 | + if (is_404() || (!empty($wp->query_vars['error']) && $wp->query_vars['error'] == '404')) {
|
|
| 2961 | + $current_url = geodir_curPageURL(); |
|
| 2962 | + $search = 'czech-republic'; |
|
| 2963 | + $replace = 'czechia'; |
|
| 2964 | 2964 | |
| 2965 | - $has_slash = substr($current_url, -1); |
|
| 2966 | - if ($has_slash != "/") {
|
|
| 2967 | - $current_url .= '/'; |
|
| 2968 | - } |
|
| 2965 | + $has_slash = substr($current_url, -1); |
|
| 2966 | + if ($has_slash != "/") {
|
|
| 2967 | + $current_url .= '/'; |
|
| 2968 | + } |
|
| 2969 | 2969 | |
| 2970 | - $redirect = false; |
|
| 2971 | - if (strpos($current_url, '/' . $search . '/') !== false) {
|
|
| 2972 | - $redirect = true; |
|
| 2973 | - $current_url = preg_replace('/\/' . $search . '\//', '/' . $replace . '/', $current_url, 1);
|
|
| 2974 | - } |
|
| 2970 | + $redirect = false; |
|
| 2971 | + if (strpos($current_url, '/' . $search . '/') !== false) {
|
|
| 2972 | + $redirect = true; |
|
| 2973 | + $current_url = preg_replace('/\/' . $search . '\//', '/' . $replace . '/', $current_url, 1);
|
|
| 2974 | + } |
|
| 2975 | 2975 | |
| 2976 | - if ($has_slash != "/") {
|
|
| 2977 | - $current_url = trim($current_url, '/'); |
|
| 2978 | - } |
|
| 2976 | + if ($has_slash != "/") {
|
|
| 2977 | + $current_url = trim($current_url, '/'); |
|
| 2978 | + } |
|
| 2979 | 2979 | |
| 2980 | - if (strpos($current_url, 'gd_country=' . $search) !== false) {
|
|
| 2981 | - $redirect = true; |
|
| 2982 | - $current_url = str_replace('gd_country=' . $search, 'gd_country=' . $replace, $current_url);
|
|
| 2983 | - } |
|
| 2984 | - |
|
| 2985 | - if ($redirect) {
|
|
| 2986 | - wp_redirect($current_url); |
|
| 2987 | - exit; |
|
| 2988 | - } |
|
| 2989 | - } |
|
| 2980 | + if (strpos($current_url, 'gd_country=' . $search) !== false) {
|
|
| 2981 | + $redirect = true; |
|
| 2982 | + $current_url = str_replace('gd_country=' . $search, 'gd_country=' . $replace, $current_url);
|
|
| 2983 | + } |
|
| 2984 | + |
|
| 2985 | + if ($redirect) {
|
|
| 2986 | + wp_redirect($current_url); |
|
| 2987 | + exit; |
|
| 2988 | + } |
|
| 2989 | + } |
|
| 2990 | 2990 | } |
| 2991 | 2991 | add_action('parse_request', 'geodir_check_redirect', 101, 1);
|
| 2992 | 2992 | |
@@ -3006,50 +3006,50 @@ discard block |
||
| 3006 | 3006 | * @param string $original_slug The original post slug. |
| 3007 | 3007 | */ |
| 3008 | 3008 | function geodir_check_post_to_term_slug( $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug ) {
|
| 3009 | - global $wpdb, $sitepress; |
|
| 3009 | + global $wpdb, $sitepress; |
|
| 3010 | 3010 | |
| 3011 | - if ( $post_type && strpos( $post_type, 'gd_' ) === 0 ) {
|
|
| 3012 | - $wpml_post_join = ""; |
|
| 3013 | - $wpml_post_where = ""; |
|
| 3014 | - $wpml_term_join = ""; |
|
| 3015 | - $wpml_term_where = ""; |
|
| 3011 | + if ( $post_type && strpos( $post_type, 'gd_' ) === 0 ) {
|
|
| 3012 | + $wpml_post_join = ""; |
|
| 3013 | + $wpml_post_where = ""; |
|
| 3014 | + $wpml_term_join = ""; |
|
| 3015 | + $wpml_term_where = ""; |
|
| 3016 | 3016 | |
| 3017 | - if (geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 3018 | - $post_language = $post_ID ? $sitepress->post_translations()->get_element_lang_code($post_ID) : $sitepress->get_current_language(); |
|
| 3019 | - $post_language = $post_language ? $post_language : $sitepress->post_translations()->get_save_post_lang($post_ID, $sitepress); |
|
| 3020 | - if (!$post_language) {
|
|
| 3021 | - $post_language = $sitepress->get_current_language(); |
|
| 3022 | - } |
|
| 3017 | + if (geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 3018 | + $post_language = $post_ID ? $sitepress->post_translations()->get_element_lang_code($post_ID) : $sitepress->get_current_language(); |
|
| 3019 | + $post_language = $post_language ? $post_language : $sitepress->post_translations()->get_save_post_lang($post_ID, $sitepress); |
|
| 3020 | + if (!$post_language) {
|
|
| 3021 | + $post_language = $sitepress->get_current_language(); |
|
| 3022 | + } |
|
| 3023 | 3023 | |
| 3024 | - $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";
|
|
| 3025 | - $wpml_post_where = " AND icl_t.language_code = '" . $post_language ."'"; |
|
| 3024 | + $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";
|
|
| 3025 | + $wpml_post_where = " AND icl_t.language_code = '" . $post_language ."'"; |
|
| 3026 | 3026 | |
| 3027 | - $wpml_term_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON icl_t.element_id = tt.term_taxonomy_id AND icl_t.element_type = CONCAT('tax_', tt.taxonomy)";
|
|
| 3028 | - $wpml_term_where = " AND icl_t.language_code = '" . $post_language ."'"; |
|
| 3029 | - } |
|
| 3027 | + $wpml_term_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON icl_t.element_id = tt.term_taxonomy_id AND icl_t.element_type = CONCAT('tax_', tt.taxonomy)";
|
|
| 3028 | + $wpml_term_where = " AND icl_t.language_code = '" . $post_language ."'"; |
|
| 3029 | + } |
|
| 3030 | 3030 | |
| 3031 | - $term_slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $slug ) );
|
|
| 3031 | + $term_slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $slug ) );
|
|
| 3032 | 3032 | |
| 3033 | - if ( $term_slug_check ) {
|
|
| 3034 | - $suffix = 1; |
|
| 3033 | + if ( $term_slug_check ) {
|
|
| 3034 | + $suffix = 1; |
|
| 3035 | 3035 | |
| 3036 | - do {
|
|
| 3037 | - $alt_slug = _truncate_post_slug( $original_slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; |
|
| 3036 | + do {
|
|
| 3037 | + $alt_slug = _truncate_post_slug( $original_slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; |
|
| 3038 | 3038 | |
| 3039 | - $term_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $alt_slug ) );
|
|
| 3039 | + $term_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $alt_slug ) );
|
|
| 3040 | 3040 | |
| 3041 | - $post_check = !$term_check && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s AND p.ID != %d {$wpml_term_where} LIMIT 1", $alt_slug, $post_type, $post_ID ) );
|
|
| 3041 | + $post_check = !$term_check && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s AND p.ID != %d {$wpml_term_where} LIMIT 1", $alt_slug, $post_type, $post_ID ) );
|
|
| 3042 | 3042 | |
| 3043 | - $term_slug_check = $term_check || $post_check; |
|
| 3043 | + $term_slug_check = $term_check || $post_check; |
|
| 3044 | 3044 | |
| 3045 | - $suffix++; |
|
| 3046 | - } while ( $term_slug_check ); |
|
| 3045 | + $suffix++; |
|
| 3046 | + } while ( $term_slug_check ); |
|
| 3047 | 3047 | |
| 3048 | - $slug = $alt_slug; |
|
| 3049 | - } |
|
| 3050 | - } |
|
| 3048 | + $slug = $alt_slug; |
|
| 3049 | + } |
|
| 3050 | + } |
|
| 3051 | 3051 | |
| 3052 | - return $slug; |
|
| 3052 | + return $slug; |
|
| 3053 | 3053 | } |
| 3054 | 3054 | add_filter( 'wp_unique_post_slug', 'geodir_check_post_to_term_slug', 101, 6 ); |
| 3055 | 3055 | |
@@ -3069,47 +3069,47 @@ discard block |
||
| 3069 | 3069 | * @return bool true when exists. false when not exists. |
| 3070 | 3070 | */ |
| 3071 | 3071 | function geodir_check_term_to_post_slug( $slug_exists, $slug, $term_id ) {
|
| 3072 | - global $wpdb, $gd_term_post_type, $gd_term_taxonomy, $sitepress; |
|
| 3072 | + global $wpdb, $gd_term_post_type, $gd_term_taxonomy, $sitepress; |
|
| 3073 | 3073 | |
| 3074 | - if ( $slug_exists ) {
|
|
| 3075 | - return $slug_exists; |
|
| 3076 | - } |
|
| 3074 | + if ( $slug_exists ) {
|
|
| 3075 | + return $slug_exists; |
|
| 3076 | + } |
|
| 3077 | 3077 | |
| 3078 | - if ( !empty( $gd_term_taxonomy ) && isset($gd_term_taxonomy[$term_id]) ) {
|
|
| 3079 | - $taxonomy = $gd_term_taxonomy[$term_id]; |
|
| 3080 | - } else {
|
|
| 3081 | - $taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id ) ); |
|
| 3082 | - $gd_term_taxonomy[$term_id] = $taxonomy; |
|
| 3083 | - } |
|
| 3078 | + if ( !empty( $gd_term_taxonomy ) && isset($gd_term_taxonomy[$term_id]) ) {
|
|
| 3079 | + $taxonomy = $gd_term_taxonomy[$term_id]; |
|
| 3080 | + } else {
|
|
| 3081 | + $taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id ) ); |
|
| 3082 | + $gd_term_taxonomy[$term_id] = $taxonomy; |
|
| 3083 | + } |
|
| 3084 | 3084 | |
| 3085 | - if ( empty($taxonomy) ) {
|
|
| 3086 | - return $slug_exists; |
|
| 3087 | - } |
|
| 3085 | + if ( empty($taxonomy) ) {
|
|
| 3086 | + return $slug_exists; |
|
| 3087 | + } |
|
| 3088 | 3088 | |
| 3089 | - if ( !empty( $gd_term_post_type ) && $gd_term_post_type[$term_id] ) {
|
|
| 3090 | - $post_type = $gd_term_post_type[$term_id]; |
|
| 3091 | - } else {
|
|
| 3092 | - $taxonomy_obj = get_taxonomy( $taxonomy ); |
|
| 3093 | - $post_type = !empty( $taxonomy_obj->object_type ) ? $taxonomy_obj->object_type[0] : NULL; |
|
| 3094 | - } |
|
| 3089 | + if ( !empty( $gd_term_post_type ) && $gd_term_post_type[$term_id] ) {
|
|
| 3090 | + $post_type = $gd_term_post_type[$term_id]; |
|
| 3091 | + } else {
|
|
| 3092 | + $taxonomy_obj = get_taxonomy( $taxonomy ); |
|
| 3093 | + $post_type = !empty( $taxonomy_obj->object_type ) ? $taxonomy_obj->object_type[0] : NULL; |
|
| 3094 | + } |
|
| 3095 | 3095 | |
| 3096 | - $wpml_post_join = ""; |
|
| 3097 | - $wpml_post_where = ""; |
|
| 3096 | + $wpml_post_join = ""; |
|
| 3097 | + $wpml_post_where = ""; |
|
| 3098 | 3098 | |
| 3099 | - if (geodir_wpml_is_taxonomy_translated($taxonomy) || geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 3100 | - $term_language = $term_id ? geodir_get_language_for_element($term_id, 'tax_' . $taxonomy) : $sitepress->get_current_language(); |
|
| 3101 | - if (!$term_language) {
|
|
| 3102 | - $term_language = $sitepress->get_current_language(); |
|
| 3103 | - } |
|
| 3099 | + if (geodir_wpml_is_taxonomy_translated($taxonomy) || geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 3100 | + $term_language = $term_id ? geodir_get_language_for_element($term_id, 'tax_' . $taxonomy) : $sitepress->get_current_language(); |
|
| 3101 | + if (!$term_language) {
|
|
| 3102 | + $term_language = $sitepress->get_current_language(); |
|
| 3103 | + } |
|
| 3104 | 3104 | |
| 3105 | - $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";
|
|
| 3106 | - $wpml_post_where = " AND icl_t.language_code = '" . $term_language ."'"; |
|
| 3107 | - } |
|
| 3105 | + $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";
|
|
| 3106 | + $wpml_post_where = " AND icl_t.language_code = '" . $term_language ."'"; |
|
| 3107 | + } |
|
| 3108 | 3108 | |
| 3109 | - if ( $post_type && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s {$wpml_post_where} LIMIT 1", $slug, $post_type ) ) ) {
|
|
| 3110 | - $slug_exists = true; |
|
| 3111 | - } |
|
| 3109 | + if ( $post_type && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s {$wpml_post_where} LIMIT 1", $slug, $post_type ) ) ) {
|
|
| 3110 | + $slug_exists = true; |
|
| 3111 | + } |
|
| 3112 | 3112 | |
| 3113 | - return $slug_exists; |
|
| 3113 | + return $slug_exists; |
|
| 3114 | 3114 | } |
| 3115 | 3115 | add_filter( 'geodir_term_slug_is_exists', 'geodir_check_term_to_post_slug', 10, 3 ); |
| 3116 | 3116 | \ No newline at end of file |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | * return early without loading the comments. |
| 18 | 18 | */ |
| 19 | 19 | if (post_password_required()) |
| 20 | - return; |
|
| 20 | + return; |
|
| 21 | 21 | ?> |
| 22 | 22 | |
| 23 | 23 | <div id="comments" class="comments-area"> |
@@ -25,35 +25,35 @@ discard block |
||
| 25 | 25 | <?php // You can start editing here -- including this comment! ?> |
| 26 | 26 | |
| 27 | 27 | <?php |
| 28 | - /** |
|
| 29 | - * Called before displaying reviews. |
|
| 30 | - * |
|
| 31 | - * If you would like to wrap reviews inside a div this is the place to print your open div. @see geodir_before_review_form to print your closing div. |
|
| 32 | - * |
|
| 33 | - * @since 1.5.7 |
|
| 34 | - */ |
|
| 35 | - do_action('geodir_before_review_list'); ?>
|
|
| 28 | + /** |
|
| 29 | + * Called before displaying reviews. |
|
| 30 | + * |
|
| 31 | + * If you would like to wrap reviews inside a div this is the place to print your open div. @see geodir_before_review_form to print your closing div. |
|
| 32 | + * |
|
| 33 | + * @since 1.5.7 |
|
| 34 | + */ |
|
| 35 | + do_action('geodir_before_review_list'); ?>
|
|
| 36 | 36 | |
| 37 | 37 | <?php if (have_comments()) : ?> |
| 38 | 38 | <h2 class="comments-title"> |
| 39 | 39 | <?php |
| 40 | - printf(_n('1 Review <span class="r-title-on">on</span> <span class="r-title">“%2$s”</span>', '%1$s Reviews <span>on</span> <span class="r-title"> “%2$s”</span>', get_comments_number(), 'geodirectory'),
|
|
| 41 | - number_format_i18n(get_comments_number()), get_the_title()); |
|
| 42 | - ?> |
|
| 40 | + printf(_n('1 Review <span class="r-title-on">on</span> <span class="r-title">“%2$s”</span>', '%1$s Reviews <span>on</span> <span class="r-title"> “%2$s”</span>', get_comments_number(), 'geodirectory'),
|
|
| 41 | + number_format_i18n(get_comments_number()), get_the_title()); |
|
| 42 | + ?> |
|
| 43 | 43 | </h2> |
| 44 | 44 | |
| 45 | 45 | <?php |
| 46 | - /** |
|
| 47 | - * Called after displaying review listing title. |
|
| 48 | - * |
|
| 49 | - * @since 1.5.7 |
|
| 50 | - */ |
|
| 51 | - do_action('geodir_after_review_list_title'); ?>
|
|
| 46 | + /** |
|
| 47 | + * Called after displaying review listing title. |
|
| 48 | + * |
|
| 49 | + * @since 1.5.7 |
|
| 50 | + */ |
|
| 51 | + do_action('geodir_after_review_list_title'); ?>
|
|
| 52 | 52 | |
| 53 | 53 | <ol class="commentlist"> |
| 54 | 54 | <?php $reverse_top_level = is_plugin_active('geodir_review_rating_manager/geodir_review_rating_manager.php') ? false : null; ?>
|
| 55 | 55 | <?php wp_list_comments(array('callback' => 'geodir_comment', 'reverse_top_level' => $reverse_top_level, 'style' => 'ol'));
|
| 56 | - ?> |
|
| 56 | + ?> |
|
| 57 | 57 | </ol><!-- .commentlist --> |
| 58 | 58 | |
| 59 | 59 | <?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // are there comments to navigate through ?>
|
@@ -68,51 +68,51 @@ discard block |
||
| 68 | 68 | <?php endif; // check for comment navigation ?> |
| 69 | 69 | |
| 70 | 70 | <?php |
| 71 | - /* If there are no comments and comments are closed, let's leave a note. |
|
| 71 | + /* If there are no comments and comments are closed, let's leave a note. |
|
| 72 | 72 | * But we only want the note on posts and pages that had comments in the first place. |
| 73 | 73 | */ |
| 74 | - if (!comments_open() && get_comments_number()) : ?> |
|
| 74 | + if (!comments_open() && get_comments_number()) : ?> |
|
| 75 | 75 | <p class="nocomments"><?php _e('Reviews are closed.', 'geodirectory'); ?></p>
|
| 76 | 76 | <?php endif; ?> |
| 77 | 77 | |
| 78 | 78 | <?php endif; // have_comments() ?> |
| 79 | 79 | |
| 80 | 80 | <?php |
| 81 | - /** |
|
| 82 | - * Called before displaying "Leave a review form". |
|
| 83 | - * |
|
| 84 | - * If you would like to wrap "review form" inside a div this is the best place to hook your open div. @see geodir_after_review_form to print your closing div. |
|
| 85 | - * Also If you would like to wrap "reviews" inside a div this is the best place to print your closing div. @see geodir_before_review_list to print your open div. |
|
| 86 | - * |
|
| 87 | - * @since 1.5.7 |
|
| 88 | - */ |
|
| 89 | - do_action('geodir_before_review_form'); ?>
|
|
| 81 | + /** |
|
| 82 | + * Called before displaying "Leave a review form". |
|
| 83 | + * |
|
| 84 | + * If you would like to wrap "review form" inside a div this is the best place to hook your open div. @see geodir_after_review_form to print your closing div. |
|
| 85 | + * Also If you would like to wrap "reviews" inside a div this is the best place to print your closing div. @see geodir_before_review_list to print your open div. |
|
| 86 | + * |
|
| 87 | + * @since 1.5.7 |
|
| 88 | + */ |
|
| 89 | + do_action('geodir_before_review_form'); ?>
|
|
| 90 | 90 | |
| 91 | 91 | <?php |
| 92 | - /** |
|
| 93 | - * Filters comment form args |
|
| 94 | - * |
|
| 95 | - * If you would like to modify your comment form args, use this filter. @see https://codex.wordpress.org/Function_Reference/comment_form for accepted args. |
|
| 96 | - * |
|
| 97 | - * @since 1.0.0 |
|
| 98 | - */ |
|
| 99 | - $args = apply_filters('geodir_review_form_args', array(
|
|
| 100 | - 'title_reply' => __('Leave a Review', 'geodirectory'),
|
|
| 101 | - 'label_submit' => __('Post Review', 'geodirectory'),
|
|
| 102 | - 'comment_field' => '<p class="comment-form-comment"><label for="comment">' . __('Review text', 'geodirectory') . ' <span class="required">*</span></label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true" required></textarea></p>',
|
|
| 103 | - 'must_log_in' => '<p class="must-log-in">' . sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()) . '</p>'
|
|
| 104 | - )); |
|
| 105 | - comment_form($args); |
|
| 106 | - ?> |
|
| 92 | + /** |
|
| 93 | + * Filters comment form args |
|
| 94 | + * |
|
| 95 | + * If you would like to modify your comment form args, use this filter. @see https://codex.wordpress.org/Function_Reference/comment_form for accepted args. |
|
| 96 | + * |
|
| 97 | + * @since 1.0.0 |
|
| 98 | + */ |
|
| 99 | + $args = apply_filters('geodir_review_form_args', array(
|
|
| 100 | + 'title_reply' => __('Leave a Review', 'geodirectory'),
|
|
| 101 | + 'label_submit' => __('Post Review', 'geodirectory'),
|
|
| 102 | + 'comment_field' => '<p class="comment-form-comment"><label for="comment">' . __('Review text', 'geodirectory') . ' <span class="required">*</span></label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true" required></textarea></p>',
|
|
| 103 | + 'must_log_in' => '<p class="must-log-in">' . sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()) . '</p>'
|
|
| 104 | + )); |
|
| 105 | + comment_form($args); |
|
| 106 | + ?> |
|
| 107 | 107 | |
| 108 | 108 | <?php |
| 109 | - /** |
|
| 110 | - * Called after displaying "Leave a review form". |
|
| 111 | - * |
|
| 112 | - * If you would like to wrap "review form" inside a div this is the best place to print your closing div. @see geodir_before_review_form to print your open div. |
|
| 113 | - * |
|
| 114 | - * @since 1.5.7 |
|
| 115 | - */ |
|
| 116 | - do_action('geodir_after_review_form'); ?>
|
|
| 109 | + /** |
|
| 110 | + * Called after displaying "Leave a review form". |
|
| 111 | + * |
|
| 112 | + * If you would like to wrap "review form" inside a div this is the best place to print your closing div. @see geodir_before_review_form to print your open div. |
|
| 113 | + * |
|
| 114 | + * @since 1.5.7 |
|
| 115 | + */ |
|
| 116 | + do_action('geodir_after_review_form'); ?>
|
|
| 117 | 117 | |
| 118 | 118 | </div><!-- #comments .comments-area --> |
| 119 | 119 | \ No newline at end of file |
@@ -99,8 +99,8 @@ |
||
| 99 | 99 | $args = apply_filters('geodir_review_form_args', array(
|
| 100 | 100 | 'title_reply' => __('Leave a Review', 'geodirectory'),
|
| 101 | 101 | 'label_submit' => __('Post Review', 'geodirectory'),
|
| 102 | - 'comment_field' => '<p class="comment-form-comment"><label for="comment">' . __('Review text', 'geodirectory') . ' <span class="required">*</span></label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true" required></textarea></p>',
|
|
| 103 | - 'must_log_in' => '<p class="must-log-in">' . sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()) . '</p>'
|
|
| 102 | + 'comment_field' => '<p class="comment-form-comment"><label for="comment">'.__('Review text', 'geodirectory').' <span class="required">*</span></label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true" required></textarea></p>',
|
|
| 103 | + 'must_log_in' => '<p class="must-log-in">'.sprintf(__('You must be <a href="%s">logged in</a> to post a comment.', 'geodirectory'), geodir_login_url()).'</p>'
|
|
| 104 | 104 | )); |
| 105 | 105 | comment_form($args); |
| 106 | 106 | ?> |
