GeoDirectory /
geodirectory
@@ -17,26 +17,26 @@ discard block |
||
| 17 | 17 | function gd_compat_php_genesis() |
| 18 | 18 | { |
| 19 | 19 | // REPLACE GENESIS BREADCRUMBS WITH GD BREADCRUMBS |
| 20 | - remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20); |
|
| 21 | - remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20); |
|
| 22 | - remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20); |
|
| 23 | - remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20); |
|
| 24 | - remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20); |
|
| 25 | - remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20); |
|
| 20 | + remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20); |
|
| 21 | + remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20); |
|
| 22 | + remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20); |
|
| 23 | + remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20); |
|
| 24 | + remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20); |
|
| 25 | + remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20); |
|
| 26 | 26 | |
| 27 | 27 | |
| 28 | - // make top section wide |
|
| 29 | - remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 30 | - remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 31 | - remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10); |
|
| 32 | - remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10); |
|
| 33 | - remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10); |
|
| 34 | - remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10); |
|
| 28 | + // make top section wide |
|
| 29 | + remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 30 | + remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 31 | + remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10); |
|
| 32 | + remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10); |
|
| 33 | + remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10); |
|
| 34 | + remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10); |
|
| 35 | 35 | |
| 36 | - // REMOVE PAGE TITLES |
|
| 37 | - remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10); |
|
| 38 | - remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10); |
|
| 39 | - remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10); |
|
| 36 | + // REMOVE PAGE TITLES |
|
| 37 | + remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10); |
|
| 38 | + remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10); |
|
| 39 | + remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10); |
|
| 40 | 40 | |
| 41 | 41 | |
| 42 | 42 | } |
@@ -53,25 +53,25 @@ discard block |
||
| 53 | 53 | function gd_genesis_compat_left_sidebars() |
| 54 | 54 | { |
| 55 | 55 | |
| 56 | - if (is_page_geodir_home()) { |
|
| 57 | - remove_action('geodir_home_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 58 | - add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 59 | - } elseif (geodir_is_page('location')) { |
|
| 60 | - remove_action('geodir_location_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 61 | - add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 62 | - } elseif (geodir_is_page('listing')) { |
|
| 63 | - remove_action('geodir_listings_sidebar_left', 'geodir_action_listings_sidebar_left', 10); |
|
| 64 | - add_action('geodir_wrapper_close', 'geodir_action_listings_sidebar_left', 11); |
|
| 65 | - } elseif (geodir_is_page('detail') && get_option('geodir_detail_sidebar_left_section')) { |
|
| 66 | - //remove_action( 'geodir_detail_sidebar', 'geodir_action_details_sidebar', 10 ); |
|
| 67 | - //add_action( 'geodir_wrapper_close', 'geodir_action_details_sidebar', 11 ); |
|
| 68 | - } elseif (geodir_is_page('search')) { |
|
| 69 | - remove_action('geodir_search_sidebar_left', 'geodir_action_search_sidebar_left', 10); |
|
| 70 | - add_action('geodir_wrapper_close', 'geodir_action_search_sidebar_left', 11); |
|
| 71 | - } elseif (geodir_is_page('author')) { |
|
| 72 | - remove_action('geodir_author_sidebar_left', 'geodir_action_author_sidebar_left', 10); |
|
| 73 | - add_action('geodir_wrapper_close', 'geodir_action_author_sidebar_left', 11); |
|
| 74 | - } |
|
| 56 | + if (is_page_geodir_home()) { |
|
| 57 | + remove_action('geodir_home_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 58 | + add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 59 | + } elseif (geodir_is_page('location')) { |
|
| 60 | + remove_action('geodir_location_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 61 | + add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 62 | + } elseif (geodir_is_page('listing')) { |
|
| 63 | + remove_action('geodir_listings_sidebar_left', 'geodir_action_listings_sidebar_left', 10); |
|
| 64 | + add_action('geodir_wrapper_close', 'geodir_action_listings_sidebar_left', 11); |
|
| 65 | + } elseif (geodir_is_page('detail') && get_option('geodir_detail_sidebar_left_section')) { |
|
| 66 | + //remove_action( 'geodir_detail_sidebar', 'geodir_action_details_sidebar', 10 ); |
|
| 67 | + //add_action( 'geodir_wrapper_close', 'geodir_action_details_sidebar', 11 ); |
|
| 68 | + } elseif (geodir_is_page('search')) { |
|
| 69 | + remove_action('geodir_search_sidebar_left', 'geodir_action_search_sidebar_left', 10); |
|
| 70 | + add_action('geodir_wrapper_close', 'geodir_action_search_sidebar_left', 11); |
|
| 71 | + } elseif (geodir_is_page('author')) { |
|
| 72 | + remove_action('geodir_author_sidebar_left', 'geodir_action_author_sidebar_left', 10); |
|
| 73 | + add_action('geodir_wrapper_close', 'geodir_action_author_sidebar_left', 11); |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | 76 | |
| 77 | 77 | } |
@@ -88,65 +88,65 @@ discard block |
||
| 88 | 88 | */ |
| 89 | 89 | function geodir_set_body_scs($classes) |
| 90 | 90 | { |
| 91 | - $remove_class = false; |
|
| 92 | - $new_class = ''; |
|
| 93 | - if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 94 | - $remove_class = true; |
|
| 95 | - if (get_option('geodir_show_home_left_section')) { |
|
| 96 | - $new_class .= 'sidebar-'; |
|
| 97 | - } |
|
| 98 | - if (get_option('geodir_show_home_contant_section')) { |
|
| 99 | - $new_class .= 'content'; |
|
| 100 | - } |
|
| 101 | - if (get_option('geodir_show_home_right_section')) { |
|
| 102 | - $new_class .= '-sidebar'; |
|
| 103 | - } |
|
| 104 | - } elseif (geodir_is_page('listing')) { |
|
| 105 | - $remove_class = true; |
|
| 106 | - if (get_option('geodir_show_listing_left_section')) { |
|
| 107 | - $new_class .= 'sidebar-'; |
|
| 108 | - } |
|
| 109 | - $new_class .= 'content'; |
|
| 110 | - if (get_option('geodir_show_listing_right_section')) { |
|
| 111 | - $new_class .= '-sidebar'; |
|
| 112 | - } |
|
| 113 | - } elseif (geodir_is_page('detail')) { |
|
| 114 | - $remove_class = true; |
|
| 115 | - if (get_option('geodir_detail_sidebar_left_section')) { |
|
| 116 | - $new_class .= 'sidebar-content gd-details-sidebar-left'; |
|
| 117 | - } else { |
|
| 118 | - $new_class .= 'content-sidebar'; |
|
| 119 | - } |
|
| 120 | - } elseif (geodir_is_page('search')) { |
|
| 121 | - $remove_class = true; |
|
| 122 | - if (get_option('geodir_show_search_left_section')) { |
|
| 123 | - $new_class .= 'sidebar-'; |
|
| 124 | - } |
|
| 125 | - $new_class .= 'content'; |
|
| 126 | - if (get_option('geodir_show_search_right_section')) { |
|
| 127 | - $new_class .= '-sidebar'; |
|
| 128 | - } |
|
| 129 | - } elseif (geodir_is_page('author')) { |
|
| 130 | - $remove_class = true; |
|
| 131 | - if (get_option('geodir_show_author_left_section')) { |
|
| 132 | - $new_class .= 'sidebar-'; |
|
| 133 | - } |
|
| 134 | - $new_class .= 'content'; |
|
| 135 | - if (get_option('geodir_show_author_right_section')) { |
|
| 136 | - $new_class .= '-sidebar'; |
|
| 137 | - } |
|
| 138 | - } elseif (geodir_is_page('add-listing')) { |
|
| 139 | - $remove_class = true; |
|
| 140 | - $new_class .= 'content-sidebar'; |
|
| 141 | - } |
|
| 142 | - |
|
| 143 | - if ($remove_class) { |
|
| 144 | - $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content')); |
|
| 145 | - //str_replace(array('content-sidebar','sidebar-content','content-sidebar-sidebar','sidebar-sidebar-content','sidebar-content-sidebar','full-width-content'),array('','','','','',''),$classes); |
|
| 146 | - $classes[] = $new_class; |
|
| 147 | - } |
|
| 148 | - |
|
| 149 | - return $classes; |
|
| 91 | + $remove_class = false; |
|
| 92 | + $new_class = ''; |
|
| 93 | + if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 94 | + $remove_class = true; |
|
| 95 | + if (get_option('geodir_show_home_left_section')) { |
|
| 96 | + $new_class .= 'sidebar-'; |
|
| 97 | + } |
|
| 98 | + if (get_option('geodir_show_home_contant_section')) { |
|
| 99 | + $new_class .= 'content'; |
|
| 100 | + } |
|
| 101 | + if (get_option('geodir_show_home_right_section')) { |
|
| 102 | + $new_class .= '-sidebar'; |
|
| 103 | + } |
|
| 104 | + } elseif (geodir_is_page('listing')) { |
|
| 105 | + $remove_class = true; |
|
| 106 | + if (get_option('geodir_show_listing_left_section')) { |
|
| 107 | + $new_class .= 'sidebar-'; |
|
| 108 | + } |
|
| 109 | + $new_class .= 'content'; |
|
| 110 | + if (get_option('geodir_show_listing_right_section')) { |
|
| 111 | + $new_class .= '-sidebar'; |
|
| 112 | + } |
|
| 113 | + } elseif (geodir_is_page('detail')) { |
|
| 114 | + $remove_class = true; |
|
| 115 | + if (get_option('geodir_detail_sidebar_left_section')) { |
|
| 116 | + $new_class .= 'sidebar-content gd-details-sidebar-left'; |
|
| 117 | + } else { |
|
| 118 | + $new_class .= 'content-sidebar'; |
|
| 119 | + } |
|
| 120 | + } elseif (geodir_is_page('search')) { |
|
| 121 | + $remove_class = true; |
|
| 122 | + if (get_option('geodir_show_search_left_section')) { |
|
| 123 | + $new_class .= 'sidebar-'; |
|
| 124 | + } |
|
| 125 | + $new_class .= 'content'; |
|
| 126 | + if (get_option('geodir_show_search_right_section')) { |
|
| 127 | + $new_class .= '-sidebar'; |
|
| 128 | + } |
|
| 129 | + } elseif (geodir_is_page('author')) { |
|
| 130 | + $remove_class = true; |
|
| 131 | + if (get_option('geodir_show_author_left_section')) { |
|
| 132 | + $new_class .= 'sidebar-'; |
|
| 133 | + } |
|
| 134 | + $new_class .= 'content'; |
|
| 135 | + if (get_option('geodir_show_author_right_section')) { |
|
| 136 | + $new_class .= '-sidebar'; |
|
| 137 | + } |
|
| 138 | + } elseif (geodir_is_page('add-listing')) { |
|
| 139 | + $remove_class = true; |
|
| 140 | + $new_class .= 'content-sidebar'; |
|
| 141 | + } |
|
| 142 | + |
|
| 143 | + if ($remove_class) { |
|
| 144 | + $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content')); |
|
| 145 | + //str_replace(array('content-sidebar','sidebar-content','content-sidebar-sidebar','sidebar-sidebar-content','sidebar-content-sidebar','full-width-content'),array('','','','','',''),$classes); |
|
| 146 | + $classes[] = $new_class; |
|
| 147 | + } |
|
| 148 | + |
|
| 149 | + return $classes; |
|
| 150 | 150 | |
| 151 | 151 | } |
| 152 | 152 | |
@@ -160,17 +160,17 @@ discard block |
||
| 160 | 160 | function gd_genesis_compat_add_top_section_back() |
| 161 | 161 | { |
| 162 | 162 | |
| 163 | - if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 164 | - geodir_action_geodir_sidebar_home_top(); |
|
| 165 | - } elseif (geodir_is_page('listing')) { |
|
| 166 | - geodir_action_geodir_sidebar_listings_top(); |
|
| 167 | - } elseif (geodir_is_page('detail')) { |
|
| 168 | - geodir_action_geodir_sidebar_detail_top(); |
|
| 169 | - } elseif (geodir_is_page('search')) { |
|
| 170 | - geodir_action_geodir_sidebar_search_top(); |
|
| 171 | - } elseif (geodir_is_page('author')) { |
|
| 172 | - geodir_action_geodir_sidebar_author_top(); |
|
| 173 | - } |
|
| 163 | + if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 164 | + geodir_action_geodir_sidebar_home_top(); |
|
| 165 | + } elseif (geodir_is_page('listing')) { |
|
| 166 | + geodir_action_geodir_sidebar_listings_top(); |
|
| 167 | + } elseif (geodir_is_page('detail')) { |
|
| 168 | + geodir_action_geodir_sidebar_detail_top(); |
|
| 169 | + } elseif (geodir_is_page('search')) { |
|
| 170 | + geodir_action_geodir_sidebar_search_top(); |
|
| 171 | + } elseif (geodir_is_page('author')) { |
|
| 172 | + geodir_action_geodir_sidebar_author_top(); |
|
| 173 | + } |
|
| 174 | 174 | |
| 175 | 175 | |
| 176 | 176 | } |
@@ -183,12 +183,12 @@ discard block |
||
| 183 | 183 | */ |
| 184 | 184 | function geodir_replace_breadcrumb() |
| 185 | 185 | { |
| 186 | - if (is_front_page() && geodir_is_page('home') && !geodir_is_page('login')) { |
|
| 187 | - } else { |
|
| 188 | - echo '<div class="geodir-breadcrumb-bar"><div class="wrap">'; |
|
| 189 | - geodir_breadcrumb(); |
|
| 190 | - echo '</div></div>'; |
|
| 191 | - } |
|
| 186 | + if (is_front_page() && geodir_is_page('home') && !geodir_is_page('login')) { |
|
| 187 | + } else { |
|
| 188 | + echo '<div class="geodir-breadcrumb-bar"><div class="wrap">'; |
|
| 189 | + geodir_breadcrumb(); |
|
| 190 | + echo '</div></div>'; |
|
| 191 | + } |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | // Force Full Width on signup page |
@@ -201,9 +201,9 @@ discard block |
||
| 201 | 201 | */ |
| 202 | 202 | function geodir_genesis_meta() |
| 203 | 203 | { |
| 204 | - if (geodir_is_page('login')) { |
|
| 205 | - add_filter('genesis_pre_get_option_site_layout', '__genesis_return_full_width_content'); |
|
| 206 | - } |
|
| 204 | + if (geodir_is_page('login')) { |
|
| 205 | + add_filter('genesis_pre_get_option_site_layout', '__genesis_return_full_width_content'); |
|
| 206 | + } |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | add_action('geodir_add_listing_page_title', 'geodir_add_listing_page_title_genesis_before', 8); |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | function geodir_add_listing_page_title_genesis_before() |
| 217 | 217 | { |
| 218 | 218 | |
| 219 | - echo "<div class='entry' >"; |
|
| 219 | + echo "<div class='entry' >"; |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | function geodir_add_listing_form_genesis_after() |
| 231 | 231 | { |
| 232 | 232 | |
| 233 | - echo "</div>"; |
|
| 233 | + echo "</div>"; |
|
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | |
@@ -249,38 +249,38 @@ discard block |
||
| 249 | 249 | { |
| 250 | 250 | |
| 251 | 251 | |
| 252 | - $title = ''; |
|
| 253 | - $subtitle = ''; |
|
| 254 | - |
|
| 255 | - if (geodir_is_page('listing')) { |
|
| 256 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 257 | - geodir_action_listings_title(); |
|
| 258 | - echo '</div>'; |
|
| 259 | - } |
|
| 260 | - |
|
| 261 | - if (geodir_is_page('add-listing')) { |
|
| 262 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 263 | - geodir_action_add_listing_page_title(); |
|
| 264 | - echo '</div>'; |
|
| 265 | - } |
|
| 266 | - |
|
| 267 | - if (geodir_is_page('author')) { |
|
| 268 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 269 | - geodir_action_author_page_title(); |
|
| 270 | - echo '</div>'; |
|
| 271 | - } |
|
| 272 | - |
|
| 273 | - if (geodir_is_page('detail') || geodir_is_page('preview')) { |
|
| 274 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 275 | - echo get_the_title(); |
|
| 276 | - echo '</div>'; |
|
| 277 | - } |
|
| 278 | - |
|
| 279 | - if (geodir_is_page('search')) { |
|
| 280 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 281 | - geodir_action_search_page_title(); |
|
| 282 | - echo '</div>'; |
|
| 283 | - } |
|
| 252 | + $title = ''; |
|
| 253 | + $subtitle = ''; |
|
| 254 | + |
|
| 255 | + if (geodir_is_page('listing')) { |
|
| 256 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 257 | + geodir_action_listings_title(); |
|
| 258 | + echo '</div>'; |
|
| 259 | + } |
|
| 260 | + |
|
| 261 | + if (geodir_is_page('add-listing')) { |
|
| 262 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 263 | + geodir_action_add_listing_page_title(); |
|
| 264 | + echo '</div>'; |
|
| 265 | + } |
|
| 266 | + |
|
| 267 | + if (geodir_is_page('author')) { |
|
| 268 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 269 | + geodir_action_author_page_title(); |
|
| 270 | + echo '</div>'; |
|
| 271 | + } |
|
| 272 | + |
|
| 273 | + if (geodir_is_page('detail') || geodir_is_page('preview')) { |
|
| 274 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 275 | + echo get_the_title(); |
|
| 276 | + echo '</div>'; |
|
| 277 | + } |
|
| 278 | + |
|
| 279 | + if (geodir_is_page('search')) { |
|
| 280 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 281 | + geodir_action_search_page_title(); |
|
| 282 | + echo '</div>'; |
|
| 283 | + } |
|
| 284 | 284 | } |
| 285 | 285 | |
| 286 | 286 | |
@@ -293,8 +293,8 @@ discard block |
||
| 293 | 293 | */ |
| 294 | 294 | function gd_genesis_listing_page_title_bar() |
| 295 | 295 | { |
| 296 | - geodir_action_listings_title(); |
|
| 297 | - //geodir_action_listings_description(); |
|
| 296 | + geodir_action_listings_title(); |
|
| 297 | + //geodir_action_listings_description(); |
|
| 298 | 298 | } |
| 299 | 299 | |
| 300 | 300 | |
@@ -307,19 +307,19 @@ discard block |
||
| 307 | 307 | */ |
| 308 | 308 | function gd_compat_php_genesis_geo_1280_fix() |
| 309 | 309 | { |
| 310 | - if (function_exists('geo1280_search_bar')) { |
|
| 311 | - remove_action('genesis_after_header', 'geo1280_search_bar', 20); |
|
| 312 | - add_action('genesis_after_header', 'geo1280_search_bar_fix', 4); |
|
| 310 | + if (function_exists('geo1280_search_bar')) { |
|
| 311 | + remove_action('genesis_after_header', 'geo1280_search_bar', 20); |
|
| 312 | + add_action('genesis_after_header', 'geo1280_search_bar_fix', 4); |
|
| 313 | 313 | |
| 314 | - // |
|
| 314 | + // |
|
| 315 | 315 | |
| 316 | - remove_action('genesis_after_header', 'geodir_replace_breadcrumb', 20); |
|
| 317 | - remove_action('genesis_before_content_sidebar_wrap', 'geodir_replace_breadcrumb', 20); |
|
| 318 | - add_action('geodir_wrapper_open', 'geodir_replace_breadcrumb', 105); |
|
| 316 | + remove_action('genesis_after_header', 'geodir_replace_breadcrumb', 20); |
|
| 317 | + remove_action('genesis_before_content_sidebar_wrap', 'geodir_replace_breadcrumb', 20); |
|
| 318 | + add_action('geodir_wrapper_open', 'geodir_replace_breadcrumb', 105); |
|
| 319 | 319 | |
| 320 | - remove_action('genesis_before_content_sidebar_wrap', 'geo1280_page_title', 10); |
|
| 321 | - add_action('geodir_wrapper_open', 'geo1280_page_title', 101); |
|
| 322 | - } |
|
| 320 | + remove_action('genesis_before_content_sidebar_wrap', 'geo1280_page_title', 10); |
|
| 321 | + add_action('geodir_wrapper_open', 'geo1280_page_title', 101); |
|
| 322 | + } |
|
| 323 | 323 | } |
| 324 | 324 | |
| 325 | 325 | /** |
@@ -331,11 +331,11 @@ discard block |
||
| 331 | 331 | function geo1280_search_bar_fix() |
| 332 | 332 | { |
| 333 | 333 | |
| 334 | - echo '<div class="geo1280-placeholder"></div>'; |
|
| 335 | - if (is_active_sidebar('search-bar')) { |
|
| 336 | - genesis_widget_area('search-bar', array( |
|
| 337 | - 'before' => '<div class="search-bar widget-area"><div class="wrap">', |
|
| 338 | - 'after' => '</div></div>', |
|
| 339 | - )); |
|
| 340 | - } |
|
| 334 | + echo '<div class="geo1280-placeholder"></div>'; |
|
| 335 | + if (is_active_sidebar('search-bar')) { |
|
| 336 | + genesis_widget_area('search-bar', array( |
|
| 337 | + 'before' => '<div class="search-bar widget-area"><div class="wrap">', |
|
| 338 | + 'after' => '</div></div>', |
|
| 339 | + )); |
|
| 340 | + } |
|
| 341 | 341 | } |
@@ -12,27 +12,27 @@ |
||
| 12 | 12 | <div class="clearfix"> |
| 13 | 13 | <div id="geodir_content"> |
| 14 | 14 | <?php |
| 15 | - /** This action is documented in geodirectory-templates/geodir-home.php */ |
|
| 16 | - do_action('geodir_add_page_content', 'before', 'info-page'); |
|
| 17 | - global $information; |
|
| 18 | - echo '<h5 class="geodir_information">'; |
|
| 19 | - echo $information; |
|
| 20 | - echo '</h5>'; |
|
| 21 | - /** This action is documented in geodirectory-templates/geodir-home.php */ |
|
| 22 | - do_action('geodir_add_page_content', 'after', 'info-page'); |
|
| 23 | - ?> |
|
| 15 | + /** This action is documented in geodirectory-templates/geodir-home.php */ |
|
| 16 | + do_action('geodir_add_page_content', 'before', 'info-page'); |
|
| 17 | + global $information; |
|
| 18 | + echo '<h5 class="geodir_information">'; |
|
| 19 | + echo $information; |
|
| 20 | + echo '</h5>'; |
|
| 21 | + /** This action is documented in geodirectory-templates/geodir-home.php */ |
|
| 22 | + do_action('geodir_add_page_content', 'after', 'info-page'); |
|
| 23 | + ?> |
|
| 24 | 24 | </div> |
| 25 | 25 | <!-- geodir_content ends here--> |
| 26 | 26 | <div id="gd-sidebar-wrapper"> |
| 27 | 27 | <div class="geodir-sidebar-main"> |
| 28 | 28 | <div class="geodir-gd-sidebar"> |
| 29 | 29 | <?php |
| 30 | - /** |
|
| 31 | - * Calls the author sidebar. |
|
| 32 | - * |
|
| 33 | - * @since 1.6.11 |
|
| 34 | - */ |
|
| 35 | - dynamic_sidebar('geodir_author_right_sidebar'); ?> |
|
| 30 | + /** |
|
| 31 | + * Calls the author sidebar. |
|
| 32 | + * |
|
| 33 | + * @since 1.6.11 |
|
| 34 | + */ |
|
| 35 | + dynamic_sidebar('geodir_author_right_sidebar'); ?> |
|
| 36 | 36 | </div> |
| 37 | 37 | </div> |
| 38 | 38 | </div> |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | global $sitepress; |
| 246 | 246 | $default_lang = $sitepress->get_default_language(); |
| 247 | 247 | $term_id = icl_object_id($cat_term->term_id, $post_type.'category', true, $default_lang); |
| 248 | - }else{
|
|
| 248 | + } else{
|
|
| 249 | 249 | $term_id = $cat_term->term_id; |
| 250 | 250 | } |
| 251 | 251 | if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
|
@@ -273,8 +273,9 @@ discard block |
||
| 273 | 273 | |
| 274 | 274 | return $out; |
| 275 | 275 | } else {
|
| 276 | - if ($cat_parent == 0) |
|
| 277 | - return _e('No category', 'geodirectory');
|
|
| 276 | + if ($cat_parent == 0) { |
|
| 277 | + return _e('No category', 'geodirectory'); |
|
| 278 | + } |
|
| 278 | 279 | } |
| 279 | 280 | return; |
| 280 | 281 | } |
@@ -15,8 +15,8 @@ discard block |
||
| 15 | 15 | */ |
| 16 | 16 | function geodir_init_map_jason() |
| 17 | 17 | {
|
| 18 | - global $map_jason; |
|
| 19 | - $map_jason = array(); |
|
| 18 | + global $map_jason; |
|
| 19 | + $map_jason = array(); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -28,8 +28,8 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | function geodir_init_map_canvas_array() |
| 30 | 30 | {
|
| 31 | - global $map_canvas_arr; |
|
| 32 | - $map_canvas_arr = array(); |
|
| 31 | + global $map_canvas_arr; |
|
| 32 | + $map_canvas_arr = array(); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | |
@@ -50,56 +50,56 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | function create_marker_jason_of_posts($post) |
| 52 | 52 | {
|
| 53 | - global $wpdb, $map_jason, $add_post_in_marker_array, $geodir_cat_icons, $gd_marker_sizes; |
|
| 53 | + global $wpdb, $map_jason, $add_post_in_marker_array, $geodir_cat_icons, $gd_marker_sizes; |
|
| 54 | 54 | |
| 55 | - if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {
|
|
| 55 | + if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {
|
|
| 56 | 56 | |
| 57 | - if(isset($map_jason[$post->ID])){return null;}
|
|
| 57 | + if(isset($map_jason[$post->ID])){return null;}
|
|
| 58 | 58 | |
| 59 | - $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 60 | - $replarr = array("′", "⁄", "–", "“", '');
|
|
| 59 | + $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 60 | + $replarr = array("′", "⁄", "–", "“", '');
|
|
| 61 | 61 | |
| 62 | 62 | |
| 63 | - $geodir_cat_icons = geodir_get_term_icon(); |
|
| 64 | - $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$post->default_category]) ? $geodir_cat_icons[$post->default_category] : ''; |
|
| 63 | + $geodir_cat_icons = geodir_get_term_icon(); |
|
| 64 | + $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$post->default_category]) ? $geodir_cat_icons[$post->default_category] : ''; |
|
| 65 | 65 | |
| 66 | - $post_title = $post->post_title; |
|
| 67 | - $title = str_replace($srcharr, $replarr, $post_title); |
|
| 66 | + $post_title = $post->post_title; |
|
| 67 | + $title = str_replace($srcharr, $replarr, $post_title); |
|
| 68 | 68 | |
| 69 | - if (is_ssl()) {
|
|
| 70 | - $icon = str_replace("http:","https:",$icon );
|
|
| 71 | - } |
|
| 69 | + if (is_ssl()) {
|
|
| 70 | + $icon = str_replace("http:","https:",$icon );
|
|
| 71 | + } |
|
| 72 | 72 | |
| 73 | - if ($icon != '') {
|
|
| 74 | - $gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes; |
|
| 73 | + if ($icon != '') {
|
|
| 74 | + $gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes; |
|
| 75 | 75 | |
| 76 | - if (isset($gd_marker_sizes[$icon])) {
|
|
| 77 | - $icon_size = $gd_marker_sizes[$icon]; |
|
| 78 | - } else {
|
|
| 79 | - $icon_size = geodir_get_marker_size($icon); |
|
| 80 | - $gd_marker_sizes[$icon] = $icon_size; |
|
| 81 | - } |
|
| 82 | - } else {
|
|
| 83 | - $icon_size = array('w' => 36, 'h' => 45);
|
|
| 84 | - } |
|
| 85 | - |
|
| 86 | - $post_json = '{"id":"' . $post->ID . '","t": "' . $title . '","lt": "' . $post->post_latitude . '","ln": "' . $post->post_longitude . '","mk_id":"' . $post->ID . '_' . $post->default_category . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"}';
|
|
| 87 | - |
|
| 88 | - /** |
|
| 89 | - * Filter the json data when creating output for post json marker.. |
|
| 90 | - * |
|
| 91 | - * @since 1.5.7 |
|
| 92 | - * @param string $post_json JSON representation of the post marker info. |
|
| 93 | - * @param object $post The post object. |
|
| 94 | - */ |
|
| 95 | - $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
|
|
| 96 | - |
|
| 97 | - // only assign it if it has a value |
|
| 98 | - if($post_map_json){
|
|
| 99 | - $map_jason[$post->ID] = $post_map_json; |
|
| 100 | - } |
|
| 101 | - |
|
| 102 | - } |
|
| 76 | + if (isset($gd_marker_sizes[$icon])) {
|
|
| 77 | + $icon_size = $gd_marker_sizes[$icon]; |
|
| 78 | + } else {
|
|
| 79 | + $icon_size = geodir_get_marker_size($icon); |
|
| 80 | + $gd_marker_sizes[$icon] = $icon_size; |
|
| 81 | + } |
|
| 82 | + } else {
|
|
| 83 | + $icon_size = array('w' => 36, 'h' => 45);
|
|
| 84 | + } |
|
| 85 | + |
|
| 86 | + $post_json = '{"id":"' . $post->ID . '","t": "' . $title . '","lt": "' . $post->post_latitude . '","ln": "' . $post->post_longitude . '","mk_id":"' . $post->ID . '_' . $post->default_category . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"}';
|
|
| 87 | + |
|
| 88 | + /** |
|
| 89 | + * Filter the json data when creating output for post json marker.. |
|
| 90 | + * |
|
| 91 | + * @since 1.5.7 |
|
| 92 | + * @param string $post_json JSON representation of the post marker info. |
|
| 93 | + * @param object $post The post object. |
|
| 94 | + */ |
|
| 95 | + $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
|
|
| 96 | + |
|
| 97 | + // only assign it if it has a value |
|
| 98 | + if($post_map_json){
|
|
| 99 | + $map_jason[$post->ID] = $post_map_json; |
|
| 100 | + } |
|
| 101 | + |
|
| 102 | + } |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | /** |
@@ -112,67 +112,67 @@ discard block |
||
| 112 | 112 | */ |
| 113 | 113 | function send_marker_jason_to_js() |
| 114 | 114 | {
|
| 115 | - global $map_jason, $map_canvas_arr; |
|
| 116 | - |
|
| 117 | - if (is_array($map_canvas_arr) && !empty($map_canvas_arr)) {
|
|
| 118 | - foreach ($map_canvas_arr as $canvas => $jason) {
|
|
| 119 | - if (is_array($map_jason) && !empty($map_jason)) {
|
|
| 120 | - |
|
| 121 | - // on details page only show the main marker on the map |
|
| 122 | - if(geodir_is_page('detail')){
|
|
| 123 | - global $post; |
|
| 124 | - if(isset($map_jason[$post->ID])){
|
|
| 125 | - $map_jason = array($map_jason[$post->ID]); |
|
| 126 | - } |
|
| 127 | - } |
|
| 128 | - $canvas_jason = $canvas . "_jason"; |
|
| 129 | - $map_canvas_arr[$canvas] = array_unique($map_jason); |
|
| 130 | - unset($cat_content_info); |
|
| 131 | - $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
|
|
| 132 | - $totalcount = count(array_unique($map_jason)); |
|
| 133 | - if (!empty($cat_content_info)) {
|
|
| 134 | - $json_content = substr(implode(',', $cat_content_info), 1);
|
|
| 135 | - $json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016
|
|
| 136 | - $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08 |
|
| 137 | - $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
|
|
| 138 | - } else {
|
|
| 139 | - $canvas_jason = '[{"totalcount":"0"}]';
|
|
| 140 | - } |
|
| 141 | - $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 142 | - |
|
| 143 | - /** |
|
| 144 | - * Filter the send_marker_jason_to_js() function map canvas json args. |
|
| 145 | - * |
|
| 146 | - * You can use this filter to modify map canvas json args. |
|
| 147 | - * |
|
| 148 | - * @since 1.0.0 |
|
| 149 | - * @package GeoDirectory |
|
| 150 | - * @param string $canvas Map canvas array key. |
|
| 151 | - * @param array $map_canvas_jason_args Map canvas args. |
|
| 152 | - */ |
|
| 153 | - $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 154 | - |
|
| 155 | - wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 156 | - } else {
|
|
| 157 | - $canvas_jason = '[{"totalcount":"0"}]';
|
|
| 158 | - $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 159 | - |
|
| 160 | - /** |
|
| 161 | - * Filter the send_marker_jason_to_js() function map canvas json args. |
|
| 162 | - * |
|
| 163 | - * You can use this filter to modify map canvas json args. |
|
| 164 | - * |
|
| 165 | - * @since 1.0.0 |
|
| 166 | - * @package GeoDirectory |
|
| 167 | - * @param string $canvas Map canvas array key. |
|
| 168 | - * @param array $map_canvas_jason_args Map canvas args. |
|
| 169 | - */ |
|
| 170 | - $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 171 | - wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 172 | - } |
|
| 173 | - } |
|
| 174 | - |
|
| 175 | - } |
|
| 115 | + global $map_jason, $map_canvas_arr; |
|
| 116 | + |
|
| 117 | + if (is_array($map_canvas_arr) && !empty($map_canvas_arr)) {
|
|
| 118 | + foreach ($map_canvas_arr as $canvas => $jason) {
|
|
| 119 | + if (is_array($map_jason) && !empty($map_jason)) {
|
|
| 120 | + |
|
| 121 | + // on details page only show the main marker on the map |
|
| 122 | + if(geodir_is_page('detail')){
|
|
| 123 | + global $post; |
|
| 124 | + if(isset($map_jason[$post->ID])){
|
|
| 125 | + $map_jason = array($map_jason[$post->ID]); |
|
| 126 | + } |
|
| 127 | + } |
|
| 128 | + $canvas_jason = $canvas . "_jason"; |
|
| 129 | + $map_canvas_arr[$canvas] = array_unique($map_jason); |
|
| 130 | + unset($cat_content_info); |
|
| 131 | + $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
|
|
| 132 | + $totalcount = count(array_unique($map_jason)); |
|
| 133 | + if (!empty($cat_content_info)) {
|
|
| 134 | + $json_content = substr(implode(',', $cat_content_info), 1);
|
|
| 135 | + $json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016
|
|
| 136 | + $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08 |
|
| 137 | + $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
|
|
| 138 | + } else {
|
|
| 139 | + $canvas_jason = '[{"totalcount":"0"}]';
|
|
| 140 | + } |
|
| 141 | + $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 142 | + |
|
| 143 | + /** |
|
| 144 | + * Filter the send_marker_jason_to_js() function map canvas json args. |
|
| 145 | + * |
|
| 146 | + * You can use this filter to modify map canvas json args. |
|
| 147 | + * |
|
| 148 | + * @since 1.0.0 |
|
| 149 | + * @package GeoDirectory |
|
| 150 | + * @param string $canvas Map canvas array key. |
|
| 151 | + * @param array $map_canvas_jason_args Map canvas args. |
|
| 152 | + */ |
|
| 153 | + $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 154 | + |
|
| 155 | + wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 156 | + } else {
|
|
| 157 | + $canvas_jason = '[{"totalcount":"0"}]';
|
|
| 158 | + $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 159 | + |
|
| 160 | + /** |
|
| 161 | + * Filter the send_marker_jason_to_js() function map canvas json args. |
|
| 162 | + * |
|
| 163 | + * You can use this filter to modify map canvas json args. |
|
| 164 | + * |
|
| 165 | + * @since 1.0.0 |
|
| 166 | + * @package GeoDirectory |
|
| 167 | + * @param string $canvas Map canvas array key. |
|
| 168 | + * @param array $map_canvas_jason_args Map canvas args. |
|
| 169 | + */ |
|
| 170 | + $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 171 | + wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 172 | + } |
|
| 173 | + } |
|
| 174 | + |
|
| 175 | + } |
|
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | /** |
@@ -195,99 +195,99 @@ discard block |
||
| 195 | 195 | */ |
| 196 | 196 | function home_map_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = true, $pading = 0, $map_canvas_name = '', $child_collapse, $is_home_map = false) |
| 197 | 197 | {
|
| 198 | - global $cat_count, $geodir_cat_icons, $gd_session; |
|
| 198 | + global $cat_count, $geodir_cat_icons, $gd_session; |
|
| 199 | 199 | |
| 200 | - $exclude_categories = get_option('geodir_exclude_cat_on_map');
|
|
| 201 | - $exclude_categories_new = get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 200 | + $exclude_categories = get_option('geodir_exclude_cat_on_map');
|
|
| 201 | + $exclude_categories_new = get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 202 | 202 | |
| 203 | - // check if exclude categories saved before fix of categories identical names |
|
| 204 | - if ($exclude_categories_new) {
|
|
| 205 | - $gd_cat_taxonomy = isset($cat_taxonomy[0]) ? $cat_taxonomy[0] : ''; |
|
| 206 | - $exclude_categories = !empty($exclude_categories[$gd_cat_taxonomy]) && is_array($exclude_categories[$gd_cat_taxonomy]) ? array_unique($exclude_categories[$gd_cat_taxonomy]) : array(); |
|
| 207 | - } |
|
| 203 | + // check if exclude categories saved before fix of categories identical names |
|
| 204 | + if ($exclude_categories_new) {
|
|
| 205 | + $gd_cat_taxonomy = isset($cat_taxonomy[0]) ? $cat_taxonomy[0] : ''; |
|
| 206 | + $exclude_categories = !empty($exclude_categories[$gd_cat_taxonomy]) && is_array($exclude_categories[$gd_cat_taxonomy]) ? array_unique($exclude_categories[$gd_cat_taxonomy]) : array(); |
|
| 207 | + } |
|
| 208 | 208 | |
| 209 | - $exclude_cat_str = implode(',', $exclude_categories);
|
|
| 209 | + $exclude_cat_str = implode(',', $exclude_categories);
|
|
| 210 | 210 | |
| 211 | - if ($exclude_cat_str == '') {
|
|
| 212 | - $exclude_cat_str = '0'; |
|
| 213 | - } |
|
| 211 | + if ($exclude_cat_str == '') {
|
|
| 212 | + $exclude_cat_str = '0'; |
|
| 213 | + } |
|
| 214 | 214 | |
| 215 | - $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'exclude' => $exclude_cat_str, 'hide_empty ' => $hide_empty));
|
|
| 215 | + $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'exclude' => $exclude_cat_str, 'hide_empty ' => $hide_empty));
|
|
| 216 | 216 | |
| 217 | - if ($hide_empty) {
|
|
| 218 | - $cat_terms = geodir_filter_empty_terms($cat_terms); |
|
| 219 | - } |
|
| 217 | + if ($hide_empty) {
|
|
| 218 | + $cat_terms = geodir_filter_empty_terms($cat_terms); |
|
| 219 | + } |
|
| 220 | 220 | |
| 221 | - $main_list_class = ''; |
|
| 222 | - //If there are terms, start displaying |
|
| 223 | - if (count($cat_terms) > 0) {
|
|
| 224 | - //Displaying as a list |
|
| 225 | - $p = $pading * 15; |
|
| 226 | - $pading++; |
|
| 221 | + $main_list_class = ''; |
|
| 222 | + //If there are terms, start displaying |
|
| 223 | + if (count($cat_terms) > 0) {
|
|
| 224 | + //Displaying as a list |
|
| 225 | + $p = $pading * 15; |
|
| 226 | + $pading++; |
|
| 227 | 227 | |
| 228 | - if ($cat_parent == 0) {
|
|
| 229 | - $list_class = 'main_list'; |
|
| 230 | - $display = ''; |
|
| 231 | - } else {
|
|
| 232 | - $list_class = 'sub_list'; |
|
| 233 | - $display = !$child_collapse ? '' : 'display:none'; |
|
| 234 | - } |
|
| 228 | + if ($cat_parent == 0) {
|
|
| 229 | + $list_class = 'main_list'; |
|
| 230 | + $display = ''; |
|
| 231 | + } else {
|
|
| 232 | + $list_class = 'sub_list'; |
|
| 233 | + $display = !$child_collapse ? '' : 'display:none'; |
|
| 234 | + } |
|
| 235 | 235 | |
| 236 | - $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 236 | + $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 237 | 237 | |
| 238 | - $geodir_cat_icons = geodir_get_term_icon(); |
|
| 238 | + $geodir_cat_icons = geodir_get_term_icon(); |
|
| 239 | 239 | |
| 240 | - $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';
|
|
| 241 | - if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
|
|
| 242 | - $geodir_default_map_search_pt = $homemap_catlist_ptype; |
|
| 243 | - } |
|
| 244 | - $post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : $geodir_default_map_search_pt); |
|
| 240 | + $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';
|
|
| 241 | + if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
|
|
| 242 | + $geodir_default_map_search_pt = $homemap_catlist_ptype; |
|
| 243 | + } |
|
| 244 | + $post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : $geodir_default_map_search_pt); |
|
| 245 | 245 | |
| 246 | - foreach ($cat_terms as $cat_term): |
|
| 247 | - $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$cat_term->term_id]) ? $geodir_cat_icons[$cat_term->term_id] : ''; |
|
| 248 | - |
|
| 249 | - if (!in_array($cat_term->term_id, $exclude_categories)): |
|
| 250 | - //Secret sauce. Function calls itself to display child elements, if any |
|
| 251 | - $checked = 'checked="checked"'; |
|
| 252 | - |
|
| 253 | - // Untick the category by default on home map |
|
| 254 | - if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {
|
|
| 255 | - if (function_exists('icl_object_id')) { // if WPML
|
|
| 256 | - global $sitepress; |
|
| 257 | - $default_lang = $sitepress->get_default_language(); |
|
| 258 | - $term_id = icl_object_id($cat_term->term_id, $post_type.'category', true, $default_lang); |
|
| 259 | - }else{
|
|
| 260 | - $term_id = $cat_term->term_id; |
|
| 261 | - } |
|
| 262 | - if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
|
|
| 263 | - $checked = ''; |
|
| 264 | - } |
|
| 265 | - } |
|
| 266 | - |
|
| 267 | - $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"'; |
|
| 268 | - $term_check .= ' name="' . $map_canvas_name . '_cat[]" '; |
|
| 269 | - $term_check .= ' title="' . esc_attr(ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">'; |
|
| 270 | - $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . ucfirst($cat_term->name) . '"/>'; |
|
| 271 | - $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>'; |
|
| 272 | - |
|
| 273 | - endif; |
|
| 274 | - |
|
| 275 | - |
|
| 276 | - // get sub category by recursion |
|
| 277 | - $out .= home_map_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading, $map_canvas_name, $child_collapse, $is_home_map); |
|
| 278 | - |
|
| 279 | - $out .= '</li>'; |
|
| 280 | - |
|
| 281 | - endforeach; |
|
| 282 | - |
|
| 283 | - $out .= '</ul>'; |
|
| 284 | - |
|
| 285 | - return $out; |
|
| 286 | - } else {
|
|
| 287 | - if ($cat_parent == 0) |
|
| 288 | - return _e('No category', 'geodirectory');
|
|
| 289 | - } |
|
| 290 | - return; |
|
| 246 | + foreach ($cat_terms as $cat_term): |
|
| 247 | + $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$cat_term->term_id]) ? $geodir_cat_icons[$cat_term->term_id] : ''; |
|
| 248 | + |
|
| 249 | + if (!in_array($cat_term->term_id, $exclude_categories)): |
|
| 250 | + //Secret sauce. Function calls itself to display child elements, if any |
|
| 251 | + $checked = 'checked="checked"'; |
|
| 252 | + |
|
| 253 | + // Untick the category by default on home map |
|
| 254 | + if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {
|
|
| 255 | + if (function_exists('icl_object_id')) { // if WPML
|
|
| 256 | + global $sitepress; |
|
| 257 | + $default_lang = $sitepress->get_default_language(); |
|
| 258 | + $term_id = icl_object_id($cat_term->term_id, $post_type.'category', true, $default_lang); |
|
| 259 | + }else{
|
|
| 260 | + $term_id = $cat_term->term_id; |
|
| 261 | + } |
|
| 262 | + if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
|
|
| 263 | + $checked = ''; |
|
| 264 | + } |
|
| 265 | + } |
|
| 266 | + |
|
| 267 | + $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"'; |
|
| 268 | + $term_check .= ' name="' . $map_canvas_name . '_cat[]" '; |
|
| 269 | + $term_check .= ' title="' . esc_attr(ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">'; |
|
| 270 | + $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . ucfirst($cat_term->name) . '"/>'; |
|
| 271 | + $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>'; |
|
| 272 | + |
|
| 273 | + endif; |
|
| 274 | + |
|
| 275 | + |
|
| 276 | + // get sub category by recursion |
|
| 277 | + $out .= home_map_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading, $map_canvas_name, $child_collapse, $is_home_map); |
|
| 278 | + |
|
| 279 | + $out .= '</li>'; |
|
| 280 | + |
|
| 281 | + endforeach; |
|
| 282 | + |
|
| 283 | + $out .= '</ul>'; |
|
| 284 | + |
|
| 285 | + return $out; |
|
| 286 | + } else {
|
|
| 287 | + if ($cat_parent == 0) |
|
| 288 | + return _e('No category', 'geodirectory');
|
|
| 289 | + } |
|
| 290 | + return; |
|
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | /** |
@@ -299,19 +299,19 @@ discard block |
||
| 299 | 299 | * @return string The map API provider name. |
| 300 | 300 | */ |
| 301 | 301 | function geodir_map_name() {
|
| 302 | - $geodir_map_name = get_option('geodir_load_map', 'google');
|
|
| 302 | + $geodir_map_name = get_option('geodir_load_map', 'google');
|
|
| 303 | 303 | |
| 304 | - if (!in_array($geodir_map_name, array('none', 'auto', 'google', 'osm'))) {
|
|
| 305 | - $geodir_map_name = 'auto'; |
|
| 306 | - } |
|
| 307 | - |
|
| 308 | - /** |
|
| 309 | - * Filter the map JS API provider name. |
|
| 310 | - * |
|
| 311 | - * @since 1.6.1 |
|
| 312 | - * @param string $geodir_map_name The map API provider name. |
|
| 313 | - */ |
|
| 314 | - return apply_filters('geodir_map_name', $geodir_map_name);
|
|
| 304 | + if (!in_array($geodir_map_name, array('none', 'auto', 'google', 'osm'))) {
|
|
| 305 | + $geodir_map_name = 'auto'; |
|
| 306 | + } |
|
| 307 | + |
|
| 308 | + /** |
|
| 309 | + * Filter the map JS API provider name. |
|
| 310 | + * |
|
| 311 | + * @since 1.6.1 |
|
| 312 | + * @param string $geodir_map_name The map API provider name. |
|
| 313 | + */ |
|
| 314 | + return apply_filters('geodir_map_name', $geodir_map_name);
|
|
| 315 | 315 | } |
| 316 | 316 | |
| 317 | 317 | /** |
@@ -327,48 +327,48 @@ discard block |
||
| 327 | 327 | * @return array The icon size. |
| 328 | 328 | */ |
| 329 | 329 | function geodir_get_marker_size($icon, $default_size = array('w' => 36, 'h' => 45)) {
|
| 330 | - global $gd_marker_sizes; |
|
| 330 | + global $gd_marker_sizes; |
|
| 331 | 331 | |
| 332 | - if (empty($gd_marker_sizes)) {
|
|
| 333 | - $gd_marker_sizes = array(); |
|
| 334 | - } |
|
| 332 | + if (empty($gd_marker_sizes)) {
|
|
| 333 | + $gd_marker_sizes = array(); |
|
| 334 | + } |
|
| 335 | 335 | |
| 336 | - if (!empty($gd_marker_sizes[$icon])) {
|
|
| 337 | - return $gd_marker_sizes[$icon]; |
|
| 338 | - } |
|
| 336 | + if (!empty($gd_marker_sizes[$icon])) {
|
|
| 337 | + return $gd_marker_sizes[$icon]; |
|
| 338 | + } |
|
| 339 | 339 | |
| 340 | - if (empty($icon)) {
|
|
| 341 | - $gd_marker_sizes[$icon] = $default_size; |
|
| 340 | + if (empty($icon)) {
|
|
| 341 | + $gd_marker_sizes[$icon] = $default_size; |
|
| 342 | 342 | |
| 343 | - return $default_size; |
|
| 344 | - } |
|
| 343 | + return $default_size; |
|
| 344 | + } |
|
| 345 | 345 | |
| 346 | - $icon_url = $icon; |
|
| 346 | + $icon_url = $icon; |
|
| 347 | 347 | |
| 348 | - $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 348 | + $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 349 | 349 | |
| 350 | - if (!path_is_absolute($icon)) {
|
|
| 351 | - $icon = str_replace($uploads['baseurl'], $uploads['basedir'], $icon); |
|
| 352 | - } |
|
| 350 | + if (!path_is_absolute($icon)) {
|
|
| 351 | + $icon = str_replace($uploads['baseurl'], $uploads['basedir'], $icon); |
|
| 352 | + } |
|
| 353 | 353 | |
| 354 | - if (!path_is_absolute($icon) && strpos($icon, WP_CONTENT_URL) !== false) {
|
|
| 355 | - $icon = str_replace(WP_CONTENT_URL, WP_CONTENT_DIR, $icon); |
|
| 356 | - } |
|
| 354 | + if (!path_is_absolute($icon) && strpos($icon, WP_CONTENT_URL) !== false) {
|
|
| 355 | + $icon = str_replace(WP_CONTENT_URL, WP_CONTENT_DIR, $icon); |
|
| 356 | + } |
|
| 357 | 357 | |
| 358 | - $sizes = array(); |
|
| 359 | - if (is_file($icon) && file_exists($icon)) {
|
|
| 360 | - $size = getimagesize(trim($icon)); |
|
| 358 | + $sizes = array(); |
|
| 359 | + if (is_file($icon) && file_exists($icon)) {
|
|
| 360 | + $size = getimagesize(trim($icon)); |
|
| 361 | 361 | |
| 362 | - if (!empty($size[0]) && !empty($size[1])) {
|
|
| 363 | - $sizes = array('w' => $size[0], 'h' => $size[1]);
|
|
| 364 | - } |
|
| 365 | - } |
|
| 362 | + if (!empty($size[0]) && !empty($size[1])) {
|
|
| 363 | + $sizes = array('w' => $size[0], 'h' => $size[1]);
|
|
| 364 | + } |
|
| 365 | + } |
|
| 366 | 366 | |
| 367 | - $sizes = !empty($sizes) ? $sizes : $default_size; |
|
| 367 | + $sizes = !empty($sizes) ? $sizes : $default_size; |
|
| 368 | 368 | |
| 369 | - $gd_marker_sizes[$icon_url] = $sizes; |
|
| 369 | + $gd_marker_sizes[$icon_url] = $sizes; |
|
| 370 | 370 | |
| 371 | - return $sizes; |
|
| 371 | + return $sizes; |
|
| 372 | 372 | } |
| 373 | 373 | |
| 374 | 374 | add_action('wp_footer', 'geodir_map_load_script', 10);
|
@@ -380,8 +380,8 @@ discard block |
||
| 380 | 380 | * @package GeoDirectory |
| 381 | 381 | */ |
| 382 | 382 | function geodir_map_load_script() {
|
| 383 | - if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {
|
|
| 384 | - $plugin_url = geodir_plugin_url(); |
|
| 383 | + if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {
|
|
| 384 | + $plugin_url = geodir_plugin_url(); |
|
| 385 | 385 | ?> |
| 386 | 386 | <script type="text/javascript"> |
| 387 | 387 | if (!(window.google && typeof google.maps !== 'undefined')) {
|
@@ -395,5 +395,5 @@ discard block |
||
| 395 | 395 | } |
| 396 | 396 | </script> |
| 397 | 397 | <?php |
| 398 | - } |
|
| 398 | + } |
|
| 399 | 399 | } |
| 400 | 400 | \ No newline at end of file |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | |
| 55 | 55 | if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {
|
| 56 | 56 | |
| 57 | - if(isset($map_jason[$post->ID])){return null;}
|
|
| 57 | + if (isset($map_jason[$post->ID])) {return null; }
|
|
| 58 | 58 | |
| 59 | 59 | $srcharr = array("'", "/", "-", '"', '\\');
|
| 60 | 60 | $replarr = array("′", "⁄", "–", "“", '');
|
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | $title = str_replace($srcharr, $replarr, $post_title); |
| 68 | 68 | |
| 69 | 69 | if (is_ssl()) {
|
| 70 | - $icon = str_replace("http:","https:",$icon );
|
|
| 70 | + $icon = str_replace("http:", "https:", $icon);
|
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | if ($icon != '') {
|
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | $icon_size = array('w' => 36, 'h' => 45);
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - $post_json = '{"id":"' . $post->ID . '","t": "' . $title . '","lt": "' . $post->post_latitude . '","ln": "' . $post->post_longitude . '","mk_id":"' . $post->ID . '_' . $post->default_category . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"}';
|
|
| 86 | + $post_json = '{"id":"'.$post->ID.'","t": "'.$title.'","lt": "'.$post->post_latitude.'","ln": "'.$post->post_longitude.'","mk_id":"'.$post->ID.'_'.$post->default_category.'","i":"'.$icon.'","w":"'.$icon_size['w'].'","h":"'.$icon_size['h'].'"}';
|
|
| 87 | 87 | |
| 88 | 88 | /** |
| 89 | 89 | * Filter the json data when creating output for post json marker.. |
@@ -92,10 +92,10 @@ discard block |
||
| 92 | 92 | * @param string $post_json JSON representation of the post marker info. |
| 93 | 93 | * @param object $post The post object. |
| 94 | 94 | */ |
| 95 | - $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
|
|
| 95 | + $post_map_json = apply_filters('geodir_create_marker_jason_of_posts', $post_json, $post);
|
|
| 96 | 96 | |
| 97 | 97 | // only assign it if it has a value |
| 98 | - if($post_map_json){
|
|
| 98 | + if ($post_map_json) {
|
|
| 99 | 99 | $map_jason[$post->ID] = $post_map_json; |
| 100 | 100 | } |
| 101 | 101 | |
@@ -119,13 +119,13 @@ discard block |
||
| 119 | 119 | if (is_array($map_jason) && !empty($map_jason)) {
|
| 120 | 120 | |
| 121 | 121 | // on details page only show the main marker on the map |
| 122 | - if(geodir_is_page('detail')){
|
|
| 122 | + if (geodir_is_page('detail')) {
|
|
| 123 | 123 | global $post; |
| 124 | - if(isset($map_jason[$post->ID])){
|
|
| 124 | + if (isset($map_jason[$post->ID])) {
|
|
| 125 | 125 | $map_jason = array($map_jason[$post->ID]); |
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | - $canvas_jason = $canvas . "_jason"; |
|
| 128 | + $canvas_jason = $canvas."_jason"; |
|
| 129 | 129 | $map_canvas_arr[$canvas] = array_unique($map_jason); |
| 130 | 130 | unset($cat_content_info); |
| 131 | 131 | $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
|
@@ -134,11 +134,11 @@ discard block |
||
| 134 | 134 | $json_content = substr(implode(',', $cat_content_info), 1);
|
| 135 | 135 | $json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016
|
| 136 | 136 | $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08 |
| 137 | - $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
|
|
| 137 | + $canvas_jason = '[{"totalcount":"'.$totalcount.'",'.$json_content.']';
|
|
| 138 | 138 | } else {
|
| 139 | 139 | $canvas_jason = '[{"totalcount":"0"}]';
|
| 140 | 140 | } |
| 141 | - $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 141 | + $map_canvas_jason_args = array($canvas.'_jason' => $canvas_jason); |
|
| 142 | 142 | |
| 143 | 143 | /** |
| 144 | 144 | * Filter the send_marker_jason_to_js() function map canvas json args. |
@@ -150,12 +150,12 @@ discard block |
||
| 150 | 150 | * @param string $canvas Map canvas array key. |
| 151 | 151 | * @param array $map_canvas_jason_args Map canvas args. |
| 152 | 152 | */ |
| 153 | - $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 153 | + $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_'.$canvas, $map_canvas_jason_args);
|
|
| 154 | 154 | |
| 155 | - wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 155 | + wp_localize_script('geodir-map-widget', $canvas.'_jason_args', $map_canvas_jason_args);
|
|
| 156 | 156 | } else {
|
| 157 | 157 | $canvas_jason = '[{"totalcount":"0"}]';
|
| 158 | - $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 158 | + $map_canvas_jason_args = array($canvas.'_jason' => $canvas_jason); |
|
| 159 | 159 | |
| 160 | 160 | /** |
| 161 | 161 | * Filter the send_marker_jason_to_js() function map canvas json args. |
@@ -167,8 +167,8 @@ discard block |
||
| 167 | 167 | * @param string $canvas Map canvas array key. |
| 168 | 168 | * @param array $map_canvas_jason_args Map canvas args. |
| 169 | 169 | */ |
| 170 | - $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 171 | - wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 170 | + $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_'.$canvas, $map_canvas_jason_args);
|
|
| 171 | + wp_localize_script('geodir-map-widget', $canvas.'_jason_args', $map_canvas_jason_args);
|
|
| 172 | 172 | } |
| 173 | 173 | } |
| 174 | 174 | |
@@ -233,11 +233,11 @@ discard block |
||
| 233 | 233 | $display = !$child_collapse ? '' : 'display:none'; |
| 234 | 234 | } |
| 235 | 235 | |
| 236 | - $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 236 | + $out = '<ul class="treeview '.$list_class.'" style="margin-left:'.$p.'px;'.$display.';">'; |
|
| 237 | 237 | |
| 238 | 238 | $geodir_cat_icons = geodir_get_term_icon(); |
| 239 | 239 | |
| 240 | - $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';
|
|
| 240 | + $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';
|
|
| 241 | 241 | if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
|
| 242 | 242 | $geodir_default_map_search_pt = $homemap_catlist_ptype; |
| 243 | 243 | } |
@@ -256,19 +256,19 @@ discard block |
||
| 256 | 256 | global $sitepress; |
| 257 | 257 | $default_lang = $sitepress->get_default_language(); |
| 258 | 258 | $term_id = icl_object_id($cat_term->term_id, $post_type.'category', true, $default_lang); |
| 259 | - }else{
|
|
| 259 | + } else {
|
|
| 260 | 260 | $term_id = $cat_term->term_id; |
| 261 | 261 | } |
| 262 | - if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
|
|
| 262 | + if (!empty($geodir_home_map_untick) && in_array($post_type.'_'.$term_id, $geodir_home_map_untick)) {
|
|
| 263 | 263 | $checked = ''; |
| 264 | 264 | } |
| 265 | 265 | } |
| 266 | 266 | |
| 267 | - $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"'; |
|
| 268 | - $term_check .= ' name="' . $map_canvas_name . '_cat[]" '; |
|
| 269 | - $term_check .= ' title="' . esc_attr(ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">'; |
|
| 270 | - $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . ucfirst($cat_term->name) . '"/>'; |
|
| 271 | - $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>'; |
|
| 267 | + $term_check = '<input type="checkbox" '.$checked.' id="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'" class="group_selector '.$main_list_class.'"'; |
|
| 268 | + $term_check .= ' name="'.$map_canvas_name.'_cat[]" '; |
|
| 269 | + $term_check .= ' title="'.esc_attr(ucfirst($cat_term->name)).'" value="'.$cat_term->term_id.'" onclick="javascript:build_map_ajax_search_param(\''.$map_canvas_name.'\',false, this)">'; |
|
| 270 | + $term_img = '<img height="15" width="15" alt="'.$cat_term->taxonomy.'" src="'.$icon.'" title="'.ucfirst($cat_term->name).'"/>'; |
|
| 271 | + $out .= '<li>'.$term_check.'<label for="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'">'.$term_img.ucfirst($cat_term->name).'</label><i class="fa fa-long-arrow-down"></i>'; |
|
| 272 | 272 | |
| 273 | 273 | endif; |
| 274 | 274 | |
@@ -380,18 +380,18 @@ discard block |
||
| 380 | 380 | * @package GeoDirectory |
| 381 | 381 | */ |
| 382 | 382 | function geodir_map_load_script() {
|
| 383 | - if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {
|
|
| 383 | + if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is('geodirectory-googlemap-script', 'done')) {
|
|
| 384 | 384 | $plugin_url = geodir_plugin_url(); |
| 385 | 385 | ?> |
| 386 | 386 | <script type="text/javascript"> |
| 387 | 387 | if (!(window.google && typeof google.maps !== 'undefined')) {
|
| 388 | - var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-style-css");css.setAttribute("href","<?php echo $plugin_url;?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION;?>");
|
|
| 388 | + var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-style-css");css.setAttribute("href","<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION; ?>");
|
|
| 389 | 389 | document.getElementsByTagName("head")[0].appendChild(css);
|
| 390 | - var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-routing-style");css.setAttribute("href","<?php echo $plugin_url;?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css?ver=<?php echo GEODIRECTORY_VERSION;?>");
|
|
| 390 | + var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-routing-style");css.setAttribute("href","<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css?ver=<?php echo GEODIRECTORY_VERSION; ?>");
|
|
| 391 | 391 | document.getElementsByTagName("head")[0].appendChild(css);
|
| 392 | - document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
|
|
| 393 | - document.write('<' + 'script id="geodirectory-leaflet-geo-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/osm.geocode.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
|
|
| 394 | - document.write('<' + 'script id="geodirectory-leaflet-routing-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
|
|
| 392 | + document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
|
|
| 393 | + document.write('<' + 'script id="geodirectory-leaflet-geo-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/osm.geocode.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
|
|
| 394 | + document.write('<' + 'script id="geodirectory-leaflet-routing-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
|
|
| 395 | 395 | } |
| 396 | 396 | </script> |
| 397 | 397 | <?php |
@@ -16,10 +16,10 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | function geodir_session_start() |
| 18 | 18 | {
|
| 19 | - if (!session_id()) session_start(); |
|
| 20 | - global $geodir_add_location_url; |
|
| 19 | + if (!session_id()) session_start(); |
|
| 20 | + global $geodir_add_location_url; |
|
| 21 | 21 | |
| 22 | - $geodir_add_location_url = NULL; |
|
| 22 | + $geodir_add_location_url = NULL; |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | /** |
@@ -33,18 +33,18 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | function geodir_modified_query($query) |
| 35 | 35 | {
|
| 36 | - if ($query->is_main_query() && ( |
|
| 37 | - (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
|
|
| 38 | - || geodir_is_page('listing')
|
|
| 39 | - || geodir_is_page('author')
|
|
| 40 | - || geodir_is_page('search')
|
|
| 41 | - || geodir_is_page('detail'))
|
|
| 42 | - ) {
|
|
| 43 | - |
|
| 44 | - $query->set('is_geodir_loop', true);
|
|
| 45 | - } |
|
| 36 | + if ($query->is_main_query() && ( |
|
| 37 | + (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
|
|
| 38 | + || geodir_is_page('listing')
|
|
| 39 | + || geodir_is_page('author')
|
|
| 40 | + || geodir_is_page('search')
|
|
| 41 | + || geodir_is_page('detail'))
|
|
| 42 | + ) {
|
|
| 43 | + |
|
| 44 | + $query->set('is_geodir_loop', true);
|
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - return $query; |
|
| 47 | + return $query; |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -67,81 +67,81 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | function set_listing_request($query ) |
| 69 | 69 | {
|
| 70 | - global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA; |
|
| 70 | + global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA; |
|
| 71 | 71 | |
| 72 | 72 | |
| 73 | - // fix woocommerce shop products filtered by language for GD + WPML + Woocommerce |
|
| 74 | - if (!geodir_is_geodir_page()) {
|
|
| 75 | - return; |
|
| 76 | - } |
|
| 73 | + // fix woocommerce shop products filtered by language for GD + WPML + Woocommerce |
|
| 74 | + if (!geodir_is_geodir_page()) {
|
|
| 75 | + return; |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | - /* remove all pre filters */ |
|
| 79 | - remove_all_filters('query');
|
|
| 80 | - remove_all_filters('posts_search');
|
|
| 81 | - remove_all_filters('posts_fields');
|
|
| 82 | - remove_all_filters('posts_join');
|
|
| 83 | - remove_all_filters('posts_orderby');
|
|
| 84 | - remove_all_filters('posts_where');
|
|
| 78 | + /* remove all pre filters */ |
|
| 79 | + remove_all_filters('query');
|
|
| 80 | + remove_all_filters('posts_search');
|
|
| 81 | + remove_all_filters('posts_fields');
|
|
| 82 | + remove_all_filters('posts_join');
|
|
| 83 | + remove_all_filters('posts_orderby');
|
|
| 84 | + remove_all_filters('posts_where');
|
|
| 85 | 85 | |
| 86 | 86 | |
| 87 | - if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')): |
|
| 87 | + if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')): |
|
| 88 | 88 | |
| 89 | - if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = ''; |
|
| 90 | - //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = ''; |
|
| 89 | + if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = ''; |
|
| 90 | + //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = ''; |
|
| 91 | 91 | |
| 92 | - if (isset($_REQUEST['sdist'])) {
|
|
| 93 | - ($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000; |
|
| 94 | - } elseif (get_option('geodir_search_dist') != '') {
|
|
| 95 | - $dist = get_option('geodir_search_dist');
|
|
| 92 | + if (isset($_REQUEST['sdist'])) {
|
|
| 93 | + ($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000; |
|
| 94 | + } elseif (get_option('geodir_search_dist') != '') {
|
|
| 95 | + $dist = get_option('geodir_search_dist');
|
|
| 96 | 96 | |
| 97 | - } else {
|
|
| 98 | - $dist = 25000; |
|
| 99 | - } // Distance |
|
| 97 | + } else {
|
|
| 98 | + $dist = 25000; |
|
| 99 | + } // Distance |
|
| 100 | 100 | |
| 101 | - if (isset($_REQUEST['sgeo_lat'])) {
|
|
| 102 | - $mylat = (float)esc_attr($_REQUEST['sgeo_lat']); |
|
| 103 | - } else {
|
|
| 104 | - $mylat = (float)geodir_get_current_city_lat(); |
|
| 105 | - } // Latatude |
|
| 101 | + if (isset($_REQUEST['sgeo_lat'])) {
|
|
| 102 | + $mylat = (float)esc_attr($_REQUEST['sgeo_lat']); |
|
| 103 | + } else {
|
|
| 104 | + $mylat = (float)geodir_get_current_city_lat(); |
|
| 105 | + } // Latatude |
|
| 106 | 106 | |
| 107 | - if (isset($_REQUEST['sgeo_lon'])) {
|
|
| 108 | - $mylon = (float)esc_attr($_REQUEST['sgeo_lon']); |
|
| 109 | - } else {
|
|
| 110 | - $mylon = (float)geodir_get_current_city_lng(); |
|
| 111 | - } // Distance |
|
| 107 | + if (isset($_REQUEST['sgeo_lon'])) {
|
|
| 108 | + $mylon = (float)esc_attr($_REQUEST['sgeo_lon']); |
|
| 109 | + } else {
|
|
| 110 | + $mylon = (float)geodir_get_current_city_lng(); |
|
| 111 | + } // Distance |
|
| 112 | 112 | |
| 113 | - if (isset($_REQUEST['snear'])) {
|
|
| 114 | - $snear = trim(esc_attr($_REQUEST['snear'])); |
|
| 115 | - } |
|
| 113 | + if (isset($_REQUEST['snear'])) {
|
|
| 114 | + $snear = trim(esc_attr($_REQUEST['snear'])); |
|
| 115 | + } |
|
| 116 | 116 | |
| 117 | - if (isset($_REQUEST['s'])) {
|
|
| 118 | - $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s']))); |
|
| 119 | - } |
|
| 117 | + if (isset($_REQUEST['s'])) {
|
|
| 118 | + $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s']))); |
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | - if ($snear == 'NEAR ME') {
|
|
| 122 | - $ip = $_SERVER['REMOTE_ADDR']; |
|
| 123 | - $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));
|
|
| 124 | - $mylat = stripslashes(ucfirst($addr_details[geoplugin_latitude])); |
|
| 125 | - $mylon = stripslashes(ucfirst($addr_details[geoplugin_longitude])); |
|
| 126 | - } |
|
| 121 | + if ($snear == 'NEAR ME') {
|
|
| 122 | + $ip = $_SERVER['REMOTE_ADDR']; |
|
| 123 | + $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));
|
|
| 124 | + $mylat = stripslashes(ucfirst($addr_details[geoplugin_latitude])); |
|
| 125 | + $mylon = stripslashes(ucfirst($addr_details[geoplugin_longitude])); |
|
| 126 | + } |
|
| 127 | 127 | |
| 128 | 128 | |
| 129 | - if (strstr($s, ',')) {
|
|
| 130 | - $s_AA = str_replace(" ", "", $s);
|
|
| 131 | - $s_A = explode(",", $s_AA);
|
|
| 132 | - $s_A = implode('","', $s_A);
|
|
| 133 | - $s_A = '"' . $s_A . '"'; |
|
| 134 | - } else {
|
|
| 135 | - $s_A = '"' . $s . '"'; |
|
| 136 | - } |
|
| 129 | + if (strstr($s, ',')) {
|
|
| 130 | + $s_AA = str_replace(" ", "", $s);
|
|
| 131 | + $s_A = explode(",", $s_AA);
|
|
| 132 | + $s_A = implode('","', $s_A);
|
|
| 133 | + $s_A = '"' . $s_A . '"'; |
|
| 134 | + } else {
|
|
| 135 | + $s_A = '"' . $s . '"'; |
|
| 136 | + } |
|
| 137 | 137 | |
| 138 | - if (strstr($s, ' ')) {
|
|
| 139 | - $s_SA = explode(" ", $s);
|
|
| 140 | - } else {
|
|
| 141 | - $s_SA = ''; |
|
| 142 | - } |
|
| 138 | + if (strstr($s, ' ')) {
|
|
| 139 | + $s_SA = explode(" ", $s);
|
|
| 140 | + } else {
|
|
| 141 | + $s_SA = ''; |
|
| 142 | + } |
|
| 143 | 143 | |
| 144 | - endif; |
|
| 144 | + endif; |
|
| 145 | 145 | |
| 146 | 146 | |
| 147 | 147 | |
@@ -162,56 +162,56 @@ discard block |
||
| 162 | 162 | */ |
| 163 | 163 | function geodir_listing_loop_filter($query) |
| 164 | 164 | {
|
| 165 | - global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term; |
|
| 165 | + global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term; |
|
| 166 | 166 | |
| 167 | - // fix wp_reset_query for popular post view widget |
|
| 168 | - if (!geodir_is_geodir_page()) {
|
|
| 169 | - return; |
|
| 170 | - } |
|
| 167 | + // fix wp_reset_query for popular post view widget |
|
| 168 | + if (!geodir_is_geodir_page()) {
|
|
| 169 | + return; |
|
| 170 | + } |
|
| 171 | 171 | |
| 172 | - $geodir_post_type = geodir_get_current_posttype(); |
|
| 173 | - |
|
| 174 | - if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
|
|
| 175 | - $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy'); |
|
| 176 | - |
|
| 177 | - if (isset($wp_query->query[$taxonomies[0]])) {
|
|
| 178 | - $request_term = explode("/", $wp_query->query[$taxonomies[0]]);
|
|
| 179 | - $request_term = end($request_term); |
|
| 180 | - if (!term_exists($request_term)) {
|
|
| 181 | - $args = array('number' => '1',);
|
|
| 182 | - $terms_arr = get_terms($taxonomies[0], $args); |
|
| 183 | - foreach ($terms_arr as $location_term) {
|
|
| 184 | - $term_arr = $location_term; |
|
| 185 | - $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
|
|
| 186 | - } |
|
| 187 | - $wp_query->queried_object_id = 1; |
|
| 188 | - $wp_query->queried_object = $term_arr; |
|
| 189 | - //print_r($wp_query) ; |
|
| 190 | - } |
|
| 191 | - } |
|
| 172 | + $geodir_post_type = geodir_get_current_posttype(); |
|
| 173 | + |
|
| 174 | + if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
|
|
| 175 | + $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy'); |
|
| 176 | + |
|
| 177 | + if (isset($wp_query->query[$taxonomies[0]])) {
|
|
| 178 | + $request_term = explode("/", $wp_query->query[$taxonomies[0]]);
|
|
| 179 | + $request_term = end($request_term); |
|
| 180 | + if (!term_exists($request_term)) {
|
|
| 181 | + $args = array('number' => '1',);
|
|
| 182 | + $terms_arr = get_terms($taxonomies[0], $args); |
|
| 183 | + foreach ($terms_arr as $location_term) {
|
|
| 184 | + $term_arr = $location_term; |
|
| 185 | + $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
|
|
| 186 | + } |
|
| 187 | + $wp_query->queried_object_id = 1; |
|
| 188 | + $wp_query->queried_object = $term_arr; |
|
| 189 | + //print_r($wp_query) ; |
|
| 190 | + } |
|
| 191 | + } |
|
| 192 | 192 | |
| 193 | - } |
|
| 194 | - if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
|
|
| 195 | - |
|
| 196 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 197 | - |
|
| 198 | - add_filter('posts_fields', 'geodir_posts_fields', 1);
|
|
| 199 | - add_filter('posts_join', 'geodir_posts_join', 1);
|
|
| 200 | - geodir_post_where(); |
|
| 201 | - if (!is_admin()) |
|
| 202 | - add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 203 | - |
|
| 204 | - // advanced filter for popular post view widget |
|
| 205 | - global $wp_query; |
|
| 206 | - if (!is_admin()) {
|
|
| 207 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 208 | - add_filter('posts_join', 'geodir_filter_widget_join', 1000);
|
|
| 209 | - } |
|
| 210 | - add_filter('posts_where', 'geodir_filter_widget_where', 1000);
|
|
| 211 | - } |
|
| 193 | + } |
|
| 194 | + if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
|
|
| 212 | 195 | |
| 213 | - } |
|
| 214 | - return $query; |
|
| 196 | + $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 197 | + |
|
| 198 | + add_filter('posts_fields', 'geodir_posts_fields', 1);
|
|
| 199 | + add_filter('posts_join', 'geodir_posts_join', 1);
|
|
| 200 | + geodir_post_where(); |
|
| 201 | + if (!is_admin()) |
|
| 202 | + add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 203 | + |
|
| 204 | + // advanced filter for popular post view widget |
|
| 205 | + global $wp_query; |
|
| 206 | + if (!is_admin()) {
|
|
| 207 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 208 | + add_filter('posts_join', 'geodir_filter_widget_join', 1000);
|
|
| 209 | + } |
|
| 210 | + add_filter('posts_where', 'geodir_filter_widget_where', 1000);
|
|
| 211 | + } |
|
| 212 | + |
|
| 213 | + } |
|
| 214 | + return $query; |
|
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | |
@@ -230,67 +230,67 @@ discard block |
||
| 230 | 230 | * @return string Modified fields query string. |
| 231 | 231 | */ |
| 232 | 232 | function geodir_posts_fields($fields) {
|
| 233 | - global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session; |
|
| 233 | + global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session; |
|
| 234 | 234 | |
| 235 | - // Filter-Location-Manager to add location table. |
|
| 236 | - $fields .= ", " . $table . ".* "; |
|
| 235 | + // Filter-Location-Manager to add location table. |
|
| 236 | + $fields .= ", " . $table . ".* "; |
|
| 237 | 237 | |
| 238 | 238 | if ($snear != '' || $gd_session->get('all_near_me')) {
|
| 239 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 239 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 240 | 240 | |
| 241 | 241 | if ($gd_session->get('all_near_me')) {
|
| 242 | - $mylat = $gd_session->get('user_lat');
|
|
| 243 | - $mylon = $gd_session->get('user_lon');
|
|
| 244 | - } |
|
| 245 | - |
|
| 246 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 247 | - } |
|
| 248 | - |
|
| 249 | - global $s; |
|
| 250 | - if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 251 | - $keywords = explode(" ", $s);
|
|
| 252 | - |
|
| 253 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 254 | - foreach($keywords as $kkey=>$kword){
|
|
| 255 | - if(mb_strlen($kword, 'UTF-8')<=$klimit){
|
|
| 256 | - unset($keywords[$kkey]); |
|
| 257 | - } |
|
| 258 | - } |
|
| 259 | - } |
|
| 242 | + $mylat = $gd_session->get('user_lat');
|
|
| 243 | + $mylon = $gd_session->get('user_lon');
|
|
| 244 | + } |
|
| 260 | 245 | |
| 246 | + $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 247 | + } |
|
| 261 | 248 | |
| 262 | - if (count($keywords) > 1) {
|
|
| 263 | - $parts = array( |
|
| 264 | - 'AND' => 'gd_alltitlematch_part', |
|
| 265 | - 'OR' => 'gd_titlematch_part' |
|
| 266 | - ); |
|
| 267 | - $gd_titlematch_part = ""; |
|
| 268 | - foreach ($parts as $key => $part) {
|
|
| 269 | - $gd_titlematch_part .= " CASE WHEN "; |
|
| 270 | - $count = 0; |
|
| 271 | - foreach ($keywords as $keyword) {
|
|
| 272 | - $keyword = trim($keyword); |
|
| 273 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 249 | + global $s; |
|
| 250 | + if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 251 | + $keywords = explode(" ", $s);
|
|
| 252 | + |
|
| 253 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 254 | + foreach($keywords as $kkey=>$kword){
|
|
| 255 | + if(mb_strlen($kword, 'UTF-8')<=$klimit){
|
|
| 256 | + unset($keywords[$kkey]); |
|
| 257 | + } |
|
| 258 | + } |
|
| 259 | + } |
|
| 260 | + |
|
| 261 | + |
|
| 262 | + if (count($keywords) > 1) {
|
|
| 263 | + $parts = array( |
|
| 264 | + 'AND' => 'gd_alltitlematch_part', |
|
| 265 | + 'OR' => 'gd_titlematch_part' |
|
| 266 | + ); |
|
| 267 | + $gd_titlematch_part = ""; |
|
| 268 | + foreach ($parts as $key => $part) {
|
|
| 269 | + $gd_titlematch_part .= " CASE WHEN "; |
|
| 270 | + $count = 0; |
|
| 271 | + foreach ($keywords as $keyword) {
|
|
| 272 | + $keyword = trim($keyword); |
|
| 273 | + $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 274 | 274 | $count++; |
| 275 | - if ($count < count($keywords)) {
|
|
| 276 | - // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " "; |
|
| 275 | + if ($count < count($keywords)) {
|
|
| 276 | + // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " "; |
|
| 277 | 277 | $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " "; |
| 278 | - } else {
|
|
| 279 | - //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' "; |
|
| 278 | + } else {
|
|
| 279 | + //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' "; |
|
| 280 | 280 | $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) "; |
| 281 | - } |
|
| 282 | - } |
|
| 283 | - $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ","; |
|
| 284 | - } |
|
| 285 | - } else {
|
|
| 286 | - $gd_titlematch_part = ""; |
|
| 287 | - } |
|
| 288 | - $s = stripslashes_deep( $s ); |
|
| 289 | - $s = wp_specialchars_decode($s,ENT_QUOTES); |
|
| 281 | + } |
|
| 282 | + } |
|
| 283 | + $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ","; |
|
| 284 | + } |
|
| 285 | + } else {
|
|
| 286 | + $gd_titlematch_part = ""; |
|
| 287 | + } |
|
| 288 | + $s = stripslashes_deep( $s ); |
|
| 289 | + $s = wp_specialchars_decode($s,ENT_QUOTES); |
|
| 290 | 290 | $fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));
|
| 291 | - } |
|
| 291 | + } |
|
| 292 | 292 | |
| 293 | - return $fields; |
|
| 293 | + return $fields; |
|
| 294 | 294 | } |
| 295 | 295 | |
| 296 | 296 | |
@@ -307,26 +307,26 @@ discard block |
||
| 307 | 307 | */ |
| 308 | 308 | function geodir_posts_join($join) |
| 309 | 309 | {
|
| 310 | - global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix; |
|
| 310 | + global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix; |
|
| 311 | 311 | |
| 312 | - ########### WPML ########### |
|
| 312 | + ########### WPML ########### |
|
| 313 | 313 | |
| 314 | - if (function_exists('icl_object_id')) {
|
|
| 315 | - global $sitepress; |
|
| 316 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 317 | - $default_lang_code = $sitepress->get_default_language(); |
|
| 318 | - if ($lang_code) {
|
|
| 319 | - $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 320 | - } |
|
| 314 | + if (function_exists('icl_object_id')) {
|
|
| 315 | + global $sitepress; |
|
| 316 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 317 | + $default_lang_code = $sitepress->get_default_language(); |
|
| 318 | + if ($lang_code) {
|
|
| 319 | + $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 320 | + } |
|
| 321 | 321 | |
| 322 | - } |
|
| 323 | - ########### WPML ########### |
|
| 322 | + } |
|
| 323 | + ########### WPML ########### |
|
| 324 | 324 | |
| 325 | - $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID) ";
|
|
| 326 | - //===old code start |
|
| 327 | - //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id) " ;//===old code end
|
|
| 325 | + $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID) ";
|
|
| 326 | + //===old code start |
|
| 327 | + //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id) " ;//===old code end
|
|
| 328 | 328 | |
| 329 | - return $join; |
|
| 329 | + return $join; |
|
| 330 | 330 | } |
| 331 | 331 | |
| 332 | 332 | |
@@ -344,15 +344,15 @@ discard block |
||
| 344 | 344 | */ |
| 345 | 345 | function geodir_posts_orderby($orderby) |
| 346 | 346 | {
|
| 347 | - global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort; |
|
| 347 | + global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort; |
|
| 348 | 348 | |
| 349 | - $sort_by = ''; |
|
| 350 | - $orderby = ' '; |
|
| 349 | + $sort_by = ''; |
|
| 350 | + $orderby = ' '; |
|
| 351 | 351 | |
| 352 | - if (get_query_var('order_by'))
|
|
| 353 | - $sort_by = get_query_var('order_by');
|
|
| 352 | + if (get_query_var('order_by'))
|
|
| 353 | + $sort_by = get_query_var('order_by');
|
|
| 354 | 354 | |
| 355 | - /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){
|
|
| 355 | + /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){
|
|
| 356 | 356 | $current_term = $wp_query->get_queried_object(); |
| 357 | 357 | } |
| 358 | 358 | |
@@ -366,123 +366,123 @@ discard block |
||
| 366 | 366 | }*/ |
| 367 | 367 | |
| 368 | 368 | |
| 369 | - if ($snear != '') {
|
|
| 370 | - $orderby .= " distance,"; |
|
| 371 | - } |
|
| 369 | + if ($snear != '') {
|
|
| 370 | + $orderby .= " distance,"; |
|
| 371 | + } |
|
| 372 | 372 | |
| 373 | - if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) |
|
| 374 | - $sort_by = esc_attr($_REQUEST['sort_by']); |
|
| 373 | + if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) |
|
| 374 | + $sort_by = esc_attr($_REQUEST['sort_by']); |
|
| 375 | 375 | |
| 376 | 376 | |
| 377 | - if ($sort_by == '') {
|
|
| 378 | - $default_sort = geodir_get_posts_default_sort($geodir_post_type); |
|
| 379 | - if (!empty($default_sort)) |
|
| 380 | - $sort_by = $default_sort; |
|
| 381 | - } |
|
| 377 | + if ($sort_by == '') {
|
|
| 378 | + $default_sort = geodir_get_posts_default_sort($geodir_post_type); |
|
| 379 | + if (!empty($default_sort)) |
|
| 380 | + $sort_by = $default_sort; |
|
| 381 | + } |
|
| 382 | 382 | |
| 383 | - /* |
|
| 383 | + /* |
|
| 384 | 384 | if search by term & no location then order always "relevance" |
| 385 | 385 | if search by location then order always "nearest" |
| 386 | 386 | */ |
| 387 | - if (is_main_query() && geodir_is_page('search')) {
|
|
| 388 | - $search_term = get_query_var('s');
|
|
| 387 | + if (is_main_query() && geodir_is_page('search')) {
|
|
| 388 | + $search_term = get_query_var('s');
|
|
| 389 | 389 | |
| 390 | - if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {
|
|
| 391 | - $sort_by = 'az'; |
|
| 392 | - } |
|
| 390 | + if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) {
|
|
| 391 | + $sort_by = 'az'; |
|
| 392 | + } |
|
| 393 | 393 | |
| 394 | - if ($snear != '' && $sort_by!='farthest') {
|
|
| 395 | - $sort_by = 'nearest'; |
|
| 396 | - } |
|
| 397 | - } |
|
| 394 | + if ($snear != '' && $sort_by!='farthest') {
|
|
| 395 | + $sort_by = 'nearest'; |
|
| 396 | + } |
|
| 397 | + } |
|
| 398 | 398 | |
| 399 | - switch ($sort_by): |
|
| 400 | - case 'newest': |
|
| 401 | - $orderby = "$wpdb->posts.post_date desc, "; |
|
| 402 | - break; |
|
| 403 | - case 'oldest': |
|
| 404 | - $orderby = "$wpdb->posts.post_date asc, "; |
|
| 405 | - break; |
|
| 406 | - case 'low_review': |
|
| 407 | - case 'rating_count_asc': |
|
| 408 | - $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, "; |
|
| 409 | - break; |
|
| 410 | - case 'high_review': |
|
| 411 | - case 'rating_count_desc': |
|
| 399 | + switch ($sort_by): |
|
| 400 | + case 'newest': |
|
| 401 | + $orderby = "$wpdb->posts.post_date desc, "; |
|
| 402 | + break; |
|
| 403 | + case 'oldest': |
|
| 404 | + $orderby = "$wpdb->posts.post_date asc, "; |
|
| 405 | + break; |
|
| 406 | + case 'low_review': |
|
| 407 | + case 'rating_count_asc': |
|
| 408 | + $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, "; |
|
| 409 | + break; |
|
| 410 | + case 'high_review': |
|
| 411 | + case 'rating_count_desc': |
|
| 412 | 412 | $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
| 413 | - break; |
|
| 414 | - case 'low_rating': |
|
| 415 | - $orderby = "( " . $table . ".overall_rating ) ASC, " . $table . ".rating_count ASC, "; |
|
| 416 | - break; |
|
| 417 | - case 'high_rating': |
|
| 418 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 419 | - break; |
|
| 420 | - case 'featured': |
|
| 421 | - $orderby = $table . ".is_featured asc, "; |
|
| 422 | - break; |
|
| 423 | - case 'nearest': |
|
| 424 | - $orderby = " distance asc, "; |
|
| 425 | - break; |
|
| 426 | - case 'farthest': |
|
| 427 | - $orderby = " distance desc, "; |
|
| 428 | - break; |
|
| 429 | - case 'random': |
|
| 430 | - $orderby = " rand(), "; |
|
| 431 | - break; |
|
| 432 | - case 'az': |
|
| 433 | - $orderby = "$wpdb->posts.post_title asc, "; |
|
| 434 | - break; |
|
| 435 | - // sort by rating |
|
| 436 | - case 'overall_rating_desc': |
|
| 437 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 438 | - break; |
|
| 439 | - case 'overall_rating_asc': |
|
| 440 | - $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, "; |
|
| 441 | - break; |
|
| 442 | - default: |
|
| 443 | - |
|
| 444 | - break; |
|
| 445 | - endswitch; |
|
| 446 | - |
|
| 447 | - global $s; |
|
| 448 | - |
|
| 449 | - if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 450 | - $keywords = explode(" ", $s);
|
|
| 451 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 452 | - foreach($keywords as $kkey=>$kword){
|
|
| 453 | - if(mb_strlen($kword, 'UTF-8')<=$klimit){
|
|
| 454 | - unset($keywords[$kkey]); |
|
| 455 | - } |
|
| 456 | - } |
|
| 457 | - } |
|
| 458 | - if ($sort_by == 'nearest' || $sort_by == 'farthest') {
|
|
| 459 | - if (count($keywords) > 1) {
|
|
| 460 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
| 461 | - } else {
|
|
| 462 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
| 463 | - } |
|
| 464 | - } else {
|
|
| 465 | - if (count($keywords) > 1) {
|
|
| 466 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby; |
|
| 467 | - } else {
|
|
| 468 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby; |
|
| 469 | - } |
|
| 470 | - } |
|
| 471 | - } |
|
| 413 | + break; |
|
| 414 | + case 'low_rating': |
|
| 415 | + $orderby = "( " . $table . ".overall_rating ) ASC, " . $table . ".rating_count ASC, "; |
|
| 416 | + break; |
|
| 417 | + case 'high_rating': |
|
| 418 | + $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 419 | + break; |
|
| 420 | + case 'featured': |
|
| 421 | + $orderby = $table . ".is_featured asc, "; |
|
| 422 | + break; |
|
| 423 | + case 'nearest': |
|
| 424 | + $orderby = " distance asc, "; |
|
| 425 | + break; |
|
| 426 | + case 'farthest': |
|
| 427 | + $orderby = " distance desc, "; |
|
| 428 | + break; |
|
| 429 | + case 'random': |
|
| 430 | + $orderby = " rand(), "; |
|
| 431 | + break; |
|
| 432 | + case 'az': |
|
| 433 | + $orderby = "$wpdb->posts.post_title asc, "; |
|
| 434 | + break; |
|
| 435 | + // sort by rating |
|
| 436 | + case 'overall_rating_desc': |
|
| 437 | + $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 438 | + break; |
|
| 439 | + case 'overall_rating_asc': |
|
| 440 | + $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, "; |
|
| 441 | + break; |
|
| 442 | + default: |
|
| 443 | + |
|
| 444 | + break; |
|
| 445 | + endswitch; |
|
| 446 | + |
|
| 447 | + global $s; |
|
| 448 | + |
|
| 449 | + if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 450 | + $keywords = explode(" ", $s);
|
|
| 451 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 452 | + foreach($keywords as $kkey=>$kword){
|
|
| 453 | + if(mb_strlen($kword, 'UTF-8')<=$klimit){
|
|
| 454 | + unset($keywords[$kkey]); |
|
| 455 | + } |
|
| 456 | + } |
|
| 457 | + } |
|
| 458 | + if ($sort_by == 'nearest' || $sort_by == 'farthest') {
|
|
| 459 | + if (count($keywords) > 1) {
|
|
| 460 | + $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
| 461 | + } else {
|
|
| 462 | + $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
| 463 | + } |
|
| 464 | + } else {
|
|
| 465 | + if (count($keywords) > 1) {
|
|
| 466 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby; |
|
| 467 | + } else {
|
|
| 468 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby; |
|
| 469 | + } |
|
| 470 | + } |
|
| 471 | + } |
|
| 472 | 472 | |
| 473 | - /** |
|
| 474 | - * Filter order by SQL. |
|
| 475 | - * |
|
| 476 | - * @since 1.0.0 |
|
| 477 | - * @param string $orderby The orderby query string. |
|
| 478 | - * @param string $sort_by Sortby query string. |
|
| 479 | - * @param string $table Listing table name. |
|
| 480 | - */ |
|
| 481 | - $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);
|
|
| 473 | + /** |
|
| 474 | + * Filter order by SQL. |
|
| 475 | + * |
|
| 476 | + * @since 1.0.0 |
|
| 477 | + * @param string $orderby The orderby query string. |
|
| 478 | + * @param string $sort_by Sortby query string. |
|
| 479 | + * @param string $table Listing table name. |
|
| 480 | + */ |
|
| 481 | + $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);
|
|
| 482 | 482 | |
| 483 | - $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
| 483 | + $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
| 484 | 484 | |
| 485 | - return $orderby; |
|
| 485 | + return $orderby; |
|
| 486 | 486 | } |
| 487 | 487 | |
| 488 | 488 | |
@@ -500,53 +500,53 @@ discard block |
||
| 500 | 500 | function geodir_posts_order_by_custom_sort($orderby, $sort_by, $table) |
| 501 | 501 | {
|
| 502 | 502 | |
| 503 | - global $wpdb; |
|
| 503 | + global $wpdb; |
|
| 504 | 504 | |
| 505 | - if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' || $_REQUEST['s']==' ') ) )) {
|
|
| 505 | + if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' || $_REQUEST['s']==' ') ) )) {
|
|
| 506 | 506 | |
| 507 | - $sort_array = explode('_', $sort_by);
|
|
| 507 | + $sort_array = explode('_', $sort_by);
|
|
| 508 | 508 | |
| 509 | - $sort_by_count = count($sort_array); |
|
| 509 | + $sort_by_count = count($sort_array); |
|
| 510 | 510 | |
| 511 | - $order = $sort_array[$sort_by_count - 1]; |
|
| 511 | + $order = $sort_array[$sort_by_count - 1]; |
|
| 512 | 512 | |
| 513 | - if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {
|
|
| 513 | + if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {
|
|
| 514 | 514 | |
| 515 | - $sort_by = str_replace('_' . $order, '', $sort_by);
|
|
| 515 | + $sort_by = str_replace('_' . $order, '', $sort_by);
|
|
| 516 | 516 | |
| 517 | - switch ($sort_by): |
|
| 517 | + switch ($sort_by): |
|
| 518 | 518 | |
| 519 | - case 'post_date': |
|
| 520 | - case 'comment_count': |
|
| 519 | + case 'post_date': |
|
| 520 | + case 'comment_count': |
|
| 521 | 521 | |
| 522 | - $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", "; |
|
| 523 | - break; |
|
| 522 | + $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", "; |
|
| 523 | + break; |
|
| 524 | 524 | |
| 525 | - case 'distance': |
|
| 526 | - $orderby = $sort_by . " " . $order . ", "; |
|
| 527 | - break; |
|
| 525 | + case 'distance': |
|
| 526 | + $orderby = $sort_by . " " . $order . ", "; |
|
| 527 | + break; |
|
| 528 | 528 | |
| 529 | 529 | |
| 530 | - // sort by rating |
|
| 531 | - case 'overall_rating': |
|
| 532 | - $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
| 530 | + // sort by rating |
|
| 531 | + case 'overall_rating': |
|
| 532 | + $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
| 533 | 533 | |
| 534 | - break; |
|
| 534 | + break; |
|
| 535 | 535 | |
| 536 | 536 | |
| 537 | - default: |
|
| 538 | - if (geodir_column_exist($table, $sort_by)) {
|
|
| 537 | + default: |
|
| 538 | + if (geodir_column_exist($table, $sort_by)) {
|
|
| 539 | 539 | $orderby = $table . "." . $sort_by . " " . $order . ", "; |
| 540 | 540 | } |
| 541 | - break; |
|
| 541 | + break; |
|
| 542 | 542 | |
| 543 | - endswitch; |
|
| 543 | + endswitch; |
|
| 544 | 544 | |
| 545 | - } |
|
| 545 | + } |
|
| 546 | 546 | |
| 547 | - } |
|
| 547 | + } |
|
| 548 | 548 | |
| 549 | - return $orderby; |
|
| 549 | + return $orderby; |
|
| 550 | 550 | } |
| 551 | 551 | |
| 552 | 552 | /** |
@@ -561,34 +561,34 @@ discard block |
||
| 561 | 561 | {
|
| 562 | 562 | |
| 563 | 563 | |
| 564 | - global $wpdb, $geodir_post_type, $table, $s, $snear; |
|
| 564 | + global $wpdb, $geodir_post_type, $table, $s, $snear; |
|
| 565 | 565 | |
| 566 | - if (!is_admin()) {
|
|
| 566 | + if (!is_admin()) {
|
|
| 567 | 567 | |
| 568 | - if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 569 | - add_filter('posts_where', 'geodir_edit_listing_where', 1);
|
|
| 568 | + if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 569 | + add_filter('posts_where', 'geodir_edit_listing_where', 1);
|
|
| 570 | 570 | |
| 571 | - } elseif ((is_search() && $_REQUEST['geodir_search'])) {
|
|
| 571 | + } elseif ((is_search() && $_REQUEST['geodir_search'])) {
|
|
| 572 | 572 | |
| 573 | - add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 573 | + add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 574 | 574 | |
| 575 | - if ($snear != '') |
|
| 576 | - add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 575 | + if ($snear != '') |
|
| 576 | + add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 577 | 577 | |
| 578 | - add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 578 | + add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 579 | 579 | |
| 580 | - } elseif (geodir_is_page('author')) {
|
|
| 580 | + } elseif (geodir_is_page('author')) {
|
|
| 581 | 581 | |
| 582 | - add_filter('posts_where', 'author_filter_where', 1);
|
|
| 582 | + add_filter('posts_where', 'author_filter_where', 1);
|
|
| 583 | 583 | |
| 584 | - } |
|
| 584 | + } |
|
| 585 | 585 | |
| 586 | - //if (!geodir_is_page('detail'))
|
|
| 587 | - add_filter('posts_where', 'geodir_default_where', 1);/**/
|
|
| 586 | + //if (!geodir_is_page('detail'))
|
|
| 587 | + add_filter('posts_where', 'geodir_default_where', 1);/**/
|
|
| 588 | 588 | |
| 589 | - //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
|
| 589 | + //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
|
| 590 | 590 | |
| 591 | - } |
|
| 591 | + } |
|
| 592 | 592 | } |
| 593 | 593 | |
| 594 | 594 | /** |
@@ -603,13 +603,13 @@ discard block |
||
| 603 | 603 | */ |
| 604 | 604 | function geodir_preview_post_cap($allcaps, $caps, $args) |
| 605 | 605 | {
|
| 606 | - $user_id = get_current_user_id(); |
|
| 607 | - if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {
|
|
| 606 | + $user_id = get_current_user_id(); |
|
| 607 | + if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {
|
|
| 608 | 608 | |
| 609 | - $allcaps['edit_posts'] = true; |
|
| 610 | - } |
|
| 611 | - //print_r($allcaps); |
|
| 612 | - return $allcaps; |
|
| 609 | + $allcaps['edit_posts'] = true; |
|
| 610 | + } |
|
| 611 | + //print_r($allcaps); |
|
| 612 | + return $allcaps; |
|
| 613 | 613 | } |
| 614 | 614 | |
| 615 | 615 | |
@@ -624,9 +624,9 @@ discard block |
||
| 624 | 624 | */ |
| 625 | 625 | function geodir_edit_listing_where($where) |
| 626 | 626 | {
|
| 627 | - global $wpdb; |
|
| 628 | - $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);
|
|
| 629 | - return $where; |
|
| 627 | + global $wpdb; |
|
| 628 | + $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);
|
|
| 629 | + return $where; |
|
| 630 | 630 | } |
| 631 | 631 | |
| 632 | 632 | |
@@ -643,29 +643,29 @@ discard block |
||
| 643 | 643 | */ |
| 644 | 644 | function geodir_default_where($where) |
| 645 | 645 | {
|
| 646 | - global $wp_query, $wpdb; |
|
| 647 | - |
|
| 648 | - //print_r($wp_query); |
|
| 649 | - ########### WPML ########### |
|
| 650 | - |
|
| 651 | - if (function_exists('icl_object_id')) {
|
|
| 652 | - global $sitepress, $table_prefix; |
|
| 653 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 654 | - $default_lang_code = $sitepress->get_default_language(); |
|
| 655 | - $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
|
| 656 | - //echo '##########'.$q_post_type; |
|
| 657 | - if ($lang_code && $q_post_type) {
|
|
| 658 | - $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";
|
|
| 659 | - //$where .= " AND icl_t.language_code = '$lang_code' "; |
|
| 660 | - } |
|
| 646 | + global $wp_query, $wpdb; |
|
| 661 | 647 | |
| 662 | - } |
|
| 663 | - ########### WPML ########### |
|
| 648 | + //print_r($wp_query); |
|
| 649 | + ########### WPML ########### |
|
| 664 | 650 | |
| 651 | + if (function_exists('icl_object_id')) {
|
|
| 652 | + global $sitepress, $table_prefix; |
|
| 653 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 654 | + $default_lang_code = $sitepress->get_default_language(); |
|
| 655 | + $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
|
| 656 | + //echo '##########'.$q_post_type; |
|
| 657 | + if ($lang_code && $q_post_type) {
|
|
| 658 | + $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";
|
|
| 659 | + //$where .= " AND icl_t.language_code = '$lang_code' "; |
|
| 660 | + } |
|
| 665 | 661 | |
| 666 | - return $where = str_replace("0 = 1", "1=1", $where);
|
|
| 662 | + } |
|
| 663 | + ########### WPML ########### |
|
| 667 | 664 | |
| 668 | - /* ====== old code start === |
|
| 665 | + |
|
| 666 | + return $where = str_replace("0 = 1", "1=1", $where);
|
|
| 667 | + |
|
| 668 | + /* ====== old code start === |
|
| 669 | 669 | $where = str_replace("0 = 1", "1=1", $where);
|
| 670 | 670 | $country = get_query_var('gd_country');
|
| 671 | 671 | $region = get_query_var('gd_region');
|
@@ -706,108 +706,108 @@ discard block |
||
| 706 | 706 | * @return string Modified where query string. |
| 707 | 707 | */ |
| 708 | 708 | function searching_filter_where($where) {
|
| 709 | - global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session; |
|
| 709 | + global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session; |
|
| 710 | 710 | |
| 711 | - $search_term = 'OR'; |
|
| 712 | - $search_term = 'AND'; |
|
| 713 | - $geodir_custom_search = ''; |
|
| 714 | - $category_search_range = ''; |
|
| 711 | + $search_term = 'OR'; |
|
| 712 | + $search_term = 'AND'; |
|
| 713 | + $geodir_custom_search = ''; |
|
| 714 | + $category_search_range = ''; |
|
| 715 | 715 | |
| 716 | - if (is_single() && get_query_var('post_type')) {
|
|
| 716 | + if (is_single() && get_query_var('post_type')) {
|
|
| 717 | 717 | return $where; |
| 718 | 718 | } |
| 719 | 719 | |
| 720 | - if (is_tax()) {
|
|
| 720 | + if (is_tax()) {
|
|
| 721 | 721 | return $where; |
| 722 | 722 | } |
| 723 | 723 | |
| 724 | 724 | $s = trim($s); |
| 725 | - $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
| 726 | - $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
| 727 | - |
|
| 728 | - $where = ''; |
|
| 729 | - $better_search_terms = ''; |
|
| 730 | - if (isset($_REQUEST['stype'])) |
|
| 731 | - $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
| 732 | - else |
|
| 733 | - $post_types = 'gd_place'; |
|
| 734 | - |
|
| 735 | - if ($s != '') {
|
|
| 736 | - $keywords = explode(" ", $s);
|
|
| 737 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 738 | - foreach($keywords as $kkey=>$kword){
|
|
| 739 | - if(mb_strlen($kword, 'UTF-8')<=$klimit){
|
|
| 740 | - unset($keywords[$kkey]); |
|
| 741 | - } |
|
| 742 | - } |
|
| 743 | - } |
|
| 725 | + $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
| 726 | + $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
| 744 | 727 | |
| 745 | - if (!empty($keywords)) {
|
|
| 746 | - foreach ($keywords as $keyword) {
|
|
| 747 | - $keyword = trim($keyword); |
|
| 748 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 749 | - if ($keyword != '') {
|
|
| 750 | - /** |
|
| 751 | - * Filter the search query keywords SQL. |
|
| 752 | - * |
|
| 753 | - * @since 1.5.9 |
|
| 754 | - * @package GeoDirectory |
|
| 755 | - * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`. |
|
| 756 | - * @param array $keywords The array of keywords for the query. |
|
| 757 | - * @param string $keyword The single keyword being searched. |
|
| 758 | - */ |
|
| 728 | + $where = ''; |
|
| 729 | + $better_search_terms = ''; |
|
| 730 | + if (isset($_REQUEST['stype'])) |
|
| 731 | + $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
| 732 | + else |
|
| 733 | + $post_types = 'gd_place'; |
|
| 734 | + |
|
| 735 | + if ($s != '') {
|
|
| 736 | + $keywords = explode(" ", $s);
|
|
| 737 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 738 | + foreach($keywords as $kkey=>$kword){
|
|
| 739 | + if(mb_strlen($kword, 'UTF-8')<=$klimit){
|
|
| 740 | + unset($keywords[$kkey]); |
|
| 741 | + } |
|
| 742 | + } |
|
| 743 | + } |
|
| 744 | + |
|
| 745 | + if (!empty($keywords)) {
|
|
| 746 | + foreach ($keywords as $keyword) {
|
|
| 747 | + $keyword = trim($keyword); |
|
| 748 | + $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 749 | + if ($keyword != '') {
|
|
| 750 | + /** |
|
| 751 | + * Filter the search query keywords SQL. |
|
| 752 | + * |
|
| 753 | + * @since 1.5.9 |
|
| 754 | + * @package GeoDirectory |
|
| 755 | + * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`. |
|
| 756 | + * @param array $keywords The array of keywords for the query. |
|
| 757 | + * @param string $keyword The single keyword being searched. |
|
| 758 | + */ |
|
| 759 | 759 | $better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword);
|
| 760 | - } |
|
| 761 | - } |
|
| 762 | - } |
|
| 763 | - } |
|
| 760 | + } |
|
| 761 | + } |
|
| 762 | + } |
|
| 763 | + } |
|
| 764 | 764 | |
| 765 | - /* get taxonomy */ |
|
| 766 | - $taxonomies = geodir_get_taxonomies($post_types, true); |
|
| 767 | - if($taxonomies) {
|
|
| 768 | - $taxonomies = implode("','", $taxonomies);
|
|
| 769 | - $taxonomies = "'" . $taxonomies . "'"; |
|
| 770 | - }else{$taxonomies='';}
|
|
| 765 | + /* get taxonomy */ |
|
| 766 | + $taxonomies = geodir_get_taxonomies($post_types, true); |
|
| 767 | + if($taxonomies) {
|
|
| 768 | + $taxonomies = implode("','", $taxonomies);
|
|
| 769 | + $taxonomies = "'" . $taxonomies . "'"; |
|
| 770 | + }else{$taxonomies='';}
|
|
| 771 | 771 | |
| 772 | - $content_where = $terms_where = ''; |
|
| 772 | + $content_where = $terms_where = ''; |
|
| 773 | 773 | if ($s != '') {
|
| 774 | - /** |
|
| 775 | - * Filter the search query content where values. |
|
| 776 | - * |
|
| 777 | - * @since 1.5.0 |
|
| 778 | - * @package GeoDirectory |
|
| 779 | - * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`. |
|
| 780 | - */ |
|
| 774 | + /** |
|
| 775 | + * Filter the search query content where values. |
|
| 776 | + * |
|
| 777 | + * @since 1.5.0 |
|
| 778 | + * @package GeoDirectory |
|
| 779 | + * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`. |
|
| 780 | + */ |
|
| 781 | 781 | $content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");
|
| 782 | - /** |
|
| 783 | - * Filter the search query term values. |
|
| 784 | - * |
|
| 785 | - * @since 1.5.0 |
|
| 786 | - * @package GeoDirectory |
|
| 787 | - * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`. |
|
| 788 | - */ |
|
| 789 | - $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");
|
|
| 782 | + /** |
|
| 783 | + * Filter the search query term values. |
|
| 784 | + * |
|
| 785 | + * @since 1.5.0 |
|
| 786 | + * @package GeoDirectory |
|
| 787 | + * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`. |
|
| 788 | + */ |
|
| 789 | + $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");
|
|
| 790 | 790 | } |
| 791 | 791 | |
| 792 | - if ($snear != '') {
|
|
| 792 | + if ($snear != '') {
|
|
| 793 | 793 | |
| 794 | 794 | |
| 795 | - if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {
|
|
| 796 | - $dist = $gd_session->get('near_me_range');
|
|
| 797 | - } |
|
| 798 | - $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 799 | - $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 800 | - $lat1 = $mylat - ($dist / 69); |
|
| 801 | - $lat2 = $mylat + ($dist / 69); |
|
| 795 | + if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {
|
|
| 796 | + $dist = $gd_session->get('near_me_range');
|
|
| 797 | + } |
|
| 798 | + $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 799 | + $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 800 | + $lat1 = $mylat - ($dist / 69); |
|
| 801 | + $lat2 = $mylat + ($dist / 69); |
|
| 802 | 802 | |
| 803 | - $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : ''; |
|
| 804 | - $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : ''; |
|
| 805 | - $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : ''; |
|
| 806 | - $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : ''; |
|
| 803 | + $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : ''; |
|
| 804 | + $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : ''; |
|
| 805 | + $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : ''; |
|
| 806 | + $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : ''; |
|
| 807 | 807 | |
| 808 | 808 | |
| 809 | 809 | |
| 810 | - $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 810 | + $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 811 | 811 | $content_where |
| 812 | 812 | OR ($wpdb->posts.ID IN( |
| 813 | 813 | SELECT $wpdb->term_relationships.object_id as post_id |
@@ -824,13 +824,13 @@ discard block |
||
| 824 | 824 | AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 ) |
| 825 | 825 | AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) "; |
| 826 | 826 | |
| 827 | - if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
|
| 828 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 829 | - $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;
|
|
| 830 | - } |
|
| 827 | + if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
|
| 828 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 829 | + $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;
|
|
| 830 | + } |
|
| 831 | 831 | |
| 832 | - } else {
|
|
| 833 | - $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 832 | + } else {
|
|
| 833 | + $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 834 | 834 | $content_where |
| 835 | 835 | OR ( $wpdb->posts.ID IN( |
| 836 | 836 | SELECT $wpdb->term_relationships.object_id as post_id |
@@ -844,19 +844,19 @@ discard block |
||
| 844 | 844 | ) |
| 845 | 845 | AND $wpdb->posts.post_type in ('$post_types')
|
| 846 | 846 | AND ($wpdb->posts.post_status = 'publish') "; |
| 847 | - } |
|
| 847 | + } |
|
| 848 | 848 | |
| 849 | 849 | ########### WPML ########### |
| 850 | - if ( function_exists( 'icl_object_id' ) ) {
|
|
| 850 | + if ( function_exists( 'icl_object_id' ) ) {
|
|
| 851 | 851 | $lang_code = ICL_LANGUAGE_CODE; |
| 852 | 852 | |
| 853 | 853 | if ($lang_code && $post_types) {
|
| 854 | - $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 855 | - } |
|
| 856 | - } |
|
| 857 | - ########### WPML ########### |
|
| 854 | + $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 855 | + } |
|
| 856 | + } |
|
| 857 | + ########### WPML ########### |
|
| 858 | 858 | |
| 859 | - return $where; |
|
| 859 | + return $where; |
|
| 860 | 860 | } |
| 861 | 861 | |
| 862 | 862 | |
@@ -871,45 +871,45 @@ discard block |
||
| 871 | 871 | * @return string Modified where query string. |
| 872 | 872 | */ |
| 873 | 873 | function author_filter_where($where) {
|
| 874 | - global $wpdb, $geodir_post_type, $table, $curr; |
|
| 874 | + global $wpdb, $geodir_post_type, $table, $curr; |
|
| 875 | 875 | |
| 876 | - $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 877 | - $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 876 | + $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 877 | + $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 878 | 878 | |
| 879 | - if (isset($_REQUEST['stype'])) {
|
|
| 880 | - $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 881 | - } else {
|
|
| 882 | - $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
|
| 883 | - } |
|
| 879 | + if (isset($_REQUEST['stype'])) {
|
|
| 880 | + $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 881 | + } else {
|
|
| 882 | + $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
|
| 883 | + } |
|
| 884 | 884 | |
| 885 | - if ($user_id > 0) {
|
|
| 886 | - if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 887 | - $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true); |
|
| 888 | - $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';
|
|
| 889 | - $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";
|
|
| 890 | - } else |
|
| 891 | - $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
| 892 | - |
|
| 893 | - if ($user_id == (int)get_current_user_id()) {
|
|
| 894 | - $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
|
| 895 | - } else {
|
|
| 896 | - $where .= " AND $wpdb->posts.post_status = 'publish' "; |
|
| 897 | - } |
|
| 898 | - } else {
|
|
| 899 | - $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' "; |
|
| 900 | - } |
|
| 885 | + if ($user_id > 0) {
|
|
| 886 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 887 | + $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true); |
|
| 888 | + $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';
|
|
| 889 | + $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";
|
|
| 890 | + } else |
|
| 891 | + $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
| 892 | + |
|
| 893 | + if ($user_id == (int)get_current_user_id()) {
|
|
| 894 | + $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
|
| 895 | + } else {
|
|
| 896 | + $where .= " AND $wpdb->posts.post_status = 'publish' "; |
|
| 897 | + } |
|
| 898 | + } else {
|
|
| 899 | + $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' "; |
|
| 900 | + } |
|
| 901 | 901 | |
| 902 | - ########### WPML ########### |
|
| 903 | - if (function_exists('icl_object_id')) {
|
|
| 904 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 905 | - if ($lang_code) {
|
|
| 906 | - $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 907 | - } |
|
| 902 | + ########### WPML ########### |
|
| 903 | + if (function_exists('icl_object_id')) {
|
|
| 904 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 905 | + if ($lang_code) {
|
|
| 906 | + $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 907 | + } |
|
| 908 | 908 | |
| 909 | - } |
|
| 910 | - ########### WPML ########### |
|
| 909 | + } |
|
| 910 | + ########### WPML ########### |
|
| 911 | 911 | |
| 912 | - return $where; |
|
| 912 | + return $where; |
|
| 913 | 913 | } |
| 914 | 914 | |
| 915 | 915 | /** |
@@ -924,11 +924,11 @@ discard block |
||
| 924 | 924 | */ |
| 925 | 925 | function geodir_filter_widget_join($join) |
| 926 | 926 | {
|
| 927 | - global $wp_query, $table; |
|
| 928 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 929 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 930 | - } |
|
| 931 | - return $join; |
|
| 927 | + global $wp_query, $table; |
|
| 928 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 929 | + $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 930 | + } |
|
| 931 | + return $join; |
|
| 932 | 932 | } |
| 933 | 933 | |
| 934 | 934 | /** |
@@ -943,42 +943,42 @@ discard block |
||
| 943 | 943 | */ |
| 944 | 944 | function geodir_filter_widget_where($where) |
| 945 | 945 | {
|
| 946 | - global $wp_query, $table; |
|
| 947 | - if (!empty($wp_query->query['show_featured_only'])) {
|
|
| 948 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 949 | - } |
|
| 950 | - if (!empty($wp_query->query['show_special_only'])) {
|
|
| 951 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 952 | - } |
|
| 953 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 954 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 955 | - } |
|
| 956 | - if (!empty($wp_query->query['with_videos_only'])) {
|
|
| 957 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 958 | - } |
|
| 959 | - return $where; |
|
| 946 | + global $wp_query, $table; |
|
| 947 | + if (!empty($wp_query->query['show_featured_only'])) {
|
|
| 948 | + $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 949 | + } |
|
| 950 | + if (!empty($wp_query->query['show_special_only'])) {
|
|
| 951 | + $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 952 | + } |
|
| 953 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 954 | + $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 955 | + } |
|
| 956 | + if (!empty($wp_query->query['with_videos_only'])) {
|
|
| 957 | + $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 958 | + } |
|
| 959 | + return $where; |
|
| 960 | 960 | } |
| 961 | 961 | |
| 962 | 962 | |
| 963 | 963 | function geodir_related_posts_fields($fields) {
|
| 964 | - global $wp_query, $wpdb, $table, $post; |
|
| 964 | + global $wp_query, $wpdb, $table, $post; |
|
| 965 | 965 | |
| 966 | - $fields .= ", " . $table . ".* "; |
|
| 966 | + $fields .= ", " . $table . ".* "; |
|
| 967 | 967 | |
| 968 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 968 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 969 | 969 | |
| 970 | - $mylat = $post->post_latitude; |
|
| 971 | - $mylon = $post->post_longitude; |
|
| 970 | + $mylat = $post->post_latitude; |
|
| 971 | + $mylon = $post->post_longitude; |
|
| 972 | 972 | |
| 973 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 974 | - return $fields; |
|
| 973 | + $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 974 | + return $fields; |
|
| 975 | 975 | } |
| 976 | 976 | function geodir_related_posts_fields_filter($query) {
|
| 977 | - if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 978 | - && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
|
| 979 | - && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
|
| 980 | - ) {
|
|
| 981 | - add_filter('posts_fields', 'geodir_related_posts_fields', 1);
|
|
| 982 | - } |
|
| 977 | + if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 978 | + && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
|
| 979 | + && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
|
| 980 | + ) {
|
|
| 981 | + add_filter('posts_fields', 'geodir_related_posts_fields', 1);
|
|
| 982 | + } |
|
| 983 | 983 | } |
| 984 | 984 | add_action('pre_get_posts', 'geodir_related_posts_fields_filter', 1); |
| 985 | 985 | \ No newline at end of file |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | * @global string $s_A Extra parameters. |
| 66 | 66 | * @global string $s_SA Extra parameters. |
| 67 | 67 | */ |
| 68 | -function set_listing_request($query ) |
|
| 68 | +function set_listing_request($query) |
|
| 69 | 69 | {
|
| 70 | 70 | global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA; |
| 71 | 71 | |
@@ -99,15 +99,15 @@ discard block |
||
| 99 | 99 | } // Distance |
| 100 | 100 | |
| 101 | 101 | if (isset($_REQUEST['sgeo_lat'])) {
|
| 102 | - $mylat = (float)esc_attr($_REQUEST['sgeo_lat']); |
|
| 102 | + $mylat = (float) esc_attr($_REQUEST['sgeo_lat']); |
|
| 103 | 103 | } else {
|
| 104 | - $mylat = (float)geodir_get_current_city_lat(); |
|
| 104 | + $mylat = (float) geodir_get_current_city_lat(); |
|
| 105 | 105 | } // Latatude |
| 106 | 106 | |
| 107 | 107 | if (isset($_REQUEST['sgeo_lon'])) {
|
| 108 | - $mylon = (float)esc_attr($_REQUEST['sgeo_lon']); |
|
| 108 | + $mylon = (float) esc_attr($_REQUEST['sgeo_lon']); |
|
| 109 | 109 | } else {
|
| 110 | - $mylon = (float)geodir_get_current_city_lng(); |
|
| 110 | + $mylon = (float) geodir_get_current_city_lng(); |
|
| 111 | 111 | } // Distance |
| 112 | 112 | |
| 113 | 113 | if (isset($_REQUEST['snear'])) {
|
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | |
| 121 | 121 | if ($snear == 'NEAR ME') {
|
| 122 | 122 | $ip = $_SERVER['REMOTE_ADDR']; |
| 123 | - $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));
|
|
| 123 | + $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip='.$ip));
|
|
| 124 | 124 | $mylat = stripslashes(ucfirst($addr_details[geoplugin_latitude])); |
| 125 | 125 | $mylon = stripslashes(ucfirst($addr_details[geoplugin_longitude])); |
| 126 | 126 | } |
@@ -130,9 +130,9 @@ discard block |
||
| 130 | 130 | $s_AA = str_replace(" ", "", $s);
|
| 131 | 131 | $s_A = explode(",", $s_AA);
|
| 132 | 132 | $s_A = implode('","', $s_A);
|
| 133 | - $s_A = '"' . $s_A . '"'; |
|
| 133 | + $s_A = '"'.$s_A.'"'; |
|
| 134 | 134 | } else {
|
| 135 | - $s_A = '"' . $s . '"'; |
|
| 135 | + $s_A = '"'.$s.'"'; |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | if (strstr($s, ' ')) {
|
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | } |
| 194 | 194 | if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
|
| 195 | 195 | |
| 196 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 196 | + $table = $plugin_prefix.$geodir_post_type.'_detail'; |
|
| 197 | 197 | |
| 198 | 198 | add_filter('posts_fields', 'geodir_posts_fields', 1);
|
| 199 | 199 | add_filter('posts_join', 'geodir_posts_join', 1);
|
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session; |
| 234 | 234 | |
| 235 | 235 | // Filter-Location-Manager to add location table. |
| 236 | - $fields .= ", " . $table . ".* "; |
|
| 236 | + $fields .= ", ".$table.".* "; |
|
| 237 | 237 | |
| 238 | 238 | if ($snear != '' || $gd_session->get('all_near_me')) {
|
| 239 | 239 | $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
@@ -243,16 +243,16 @@ discard block |
||
| 243 | 243 | $mylon = $gd_session->get('user_lon');
|
| 244 | 244 | } |
| 245 | 245 | |
| 246 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 246 | + $fields .= " , (".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | global $s; |
| 250 | 250 | if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
| 251 | 251 | $keywords = explode(" ", $s);
|
| 252 | 252 | |
| 253 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 254 | - foreach($keywords as $kkey=>$kword){
|
|
| 255 | - if(mb_strlen($kword, 'UTF-8')<=$klimit){
|
|
| 253 | + if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {
|
|
| 254 | + foreach ($keywords as $kkey=>$kword) {
|
|
| 255 | + if (mb_strlen($kword, 'UTF-8') <= $klimit) {
|
|
| 256 | 256 | unset($keywords[$kkey]); |
| 257 | 257 | } |
| 258 | 258 | } |
@@ -270,24 +270,24 @@ discard block |
||
| 270 | 270 | $count = 0; |
| 271 | 271 | foreach ($keywords as $keyword) {
|
| 272 | 272 | $keyword = trim($keyword); |
| 273 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 273 | + $keyword = wp_specialchars_decode($keyword, ENT_QUOTES); |
|
| 274 | 274 | $count++; |
| 275 | 275 | if ($count < count($keywords)) {
|
| 276 | 276 | // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " "; |
| 277 | - $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " "; |
|
| 277 | + $gd_titlematch_part .= "( ".$wpdb->posts.".post_title LIKE '".$keyword."' OR ".$wpdb->posts.".post_title LIKE '".$keyword."%%' OR ".$wpdb->posts.".post_title LIKE '%% ".$keyword."%%' ) ".$key." "; |
|
| 278 | 278 | } else {
|
| 279 | 279 | //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' "; |
| 280 | - $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) "; |
|
| 280 | + $gd_titlematch_part .= "( ".$wpdb->posts.".post_title LIKE '".$keyword."' OR ".$wpdb->posts.".post_title LIKE '".$keyword."%%' OR ".$wpdb->posts.".post_title LIKE '%% ".$keyword."%%' ) "; |
|
| 281 | 281 | } |
| 282 | 282 | } |
| 283 | - $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ","; |
|
| 283 | + $gd_titlematch_part .= "THEN 1 ELSE 0 END AS ".$part.","; |
|
| 284 | 284 | } |
| 285 | 285 | } else {
|
| 286 | 286 | $gd_titlematch_part = ""; |
| 287 | 287 | } |
| 288 | - $s = stripslashes_deep( $s ); |
|
| 289 | - $s = wp_specialchars_decode($s,ENT_QUOTES); |
|
| 290 | - $fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));
|
|
| 288 | + $s = stripslashes_deep($s); |
|
| 289 | + $s = wp_specialchars_decode($s, ENT_QUOTES); |
|
| 290 | + $fields .= $wpdb->prepare(", CASE WHEN ".$table.".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN ".$wpdb->posts.".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle,".$gd_titlematch_part." CASE WHEN ( ".$wpdb->posts.".post_title LIKE %s OR ".$wpdb->posts.".post_title LIKE %s OR ".$wpdb->posts.".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s.'%', '% '.$s.'%', $s, $s.' %', '% '.$s.' %', '% '.$s));
|
|
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | return $fields; |
@@ -316,13 +316,13 @@ discard block |
||
| 316 | 316 | $lang_code = ICL_LANGUAGE_CODE; |
| 317 | 317 | $default_lang_code = $sitepress->get_default_language(); |
| 318 | 318 | if ($lang_code) {
|
| 319 | - $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 319 | + $join .= "JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID"; |
|
| 320 | 320 | } |
| 321 | 321 | |
| 322 | 322 | } |
| 323 | 323 | ########### WPML ########### |
| 324 | 324 | |
| 325 | - $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID) ";
|
|
| 325 | + $join .= " INNER JOIN ".$table." ON (".$table.".post_id = $wpdb->posts.ID) ";
|
|
| 326 | 326 | //===old code start |
| 327 | 327 | //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id) " ;//===old code end
|
| 328 | 328 | |
@@ -391,7 +391,7 @@ discard block |
||
| 391 | 391 | $sort_by = 'az'; |
| 392 | 392 | } |
| 393 | 393 | |
| 394 | - if ($snear != '' && $sort_by!='farthest') {
|
|
| 394 | + if ($snear != '' && $sort_by != 'farthest') {
|
|
| 395 | 395 | $sort_by = 'nearest'; |
| 396 | 396 | } |
| 397 | 397 | } |
@@ -405,20 +405,20 @@ discard block |
||
| 405 | 405 | break; |
| 406 | 406 | case 'low_review': |
| 407 | 407 | case 'rating_count_asc': |
| 408 | - $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, "; |
|
| 408 | + $orderby = $table.".rating_count ASC, ".$table.".overall_rating ASC, "; |
|
| 409 | 409 | break; |
| 410 | 410 | case 'high_review': |
| 411 | 411 | case 'rating_count_desc': |
| 412 | - $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
| 412 | + $orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, "; |
|
| 413 | 413 | break; |
| 414 | 414 | case 'low_rating': |
| 415 | - $orderby = "( " . $table . ".overall_rating ) ASC, " . $table . ".rating_count ASC, "; |
|
| 415 | + $orderby = "( ".$table.".overall_rating ) ASC, ".$table.".rating_count ASC, "; |
|
| 416 | 416 | break; |
| 417 | 417 | case 'high_rating': |
| 418 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 418 | + $orderby = " ".$table.".overall_rating DESC, ".$table.".rating_count DESC, "; |
|
| 419 | 419 | break; |
| 420 | 420 | case 'featured': |
| 421 | - $orderby = $table . ".is_featured asc, "; |
|
| 421 | + $orderby = $table.".is_featured asc, "; |
|
| 422 | 422 | break; |
| 423 | 423 | case 'nearest': |
| 424 | 424 | $orderby = " distance asc, "; |
@@ -434,10 +434,10 @@ discard block |
||
| 434 | 434 | break; |
| 435 | 435 | // sort by rating |
| 436 | 436 | case 'overall_rating_desc': |
| 437 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
| 437 | + $orderby = " ".$table.".overall_rating DESC, ".$table.".rating_count DESC, "; |
|
| 438 | 438 | break; |
| 439 | 439 | case 'overall_rating_asc': |
| 440 | - $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, "; |
|
| 440 | + $orderby = " ".$table.".overall_rating ASC, ".$table.".rating_count ASC, "; |
|
| 441 | 441 | break; |
| 442 | 442 | default: |
| 443 | 443 | |
@@ -448,24 +448,24 @@ discard block |
||
| 448 | 448 | |
| 449 | 449 | if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
| 450 | 450 | $keywords = explode(" ", $s);
|
| 451 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 452 | - foreach($keywords as $kkey=>$kword){
|
|
| 453 | - if(mb_strlen($kword, 'UTF-8')<=$klimit){
|
|
| 451 | + if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {
|
|
| 452 | + foreach ($keywords as $kkey=>$kword) {
|
|
| 453 | + if (mb_strlen($kword, 'UTF-8') <= $klimit) {
|
|
| 454 | 454 | unset($keywords[$kkey]); |
| 455 | 455 | } |
| 456 | 456 | } |
| 457 | 457 | } |
| 458 | 458 | if ($sort_by == 'nearest' || $sort_by == 'farthest') {
|
| 459 | 459 | if (count($keywords) > 1) {
|
| 460 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
| 460 | + $orderby = $orderby." ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
| 461 | 461 | } else {
|
| 462 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
| 462 | + $orderby = $orderby." ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
| 463 | 463 | } |
| 464 | 464 | } else {
|
| 465 | 465 | if (count($keywords) > 1) {
|
| 466 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby; |
|
| 466 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ".$orderby; |
|
| 467 | 467 | } else {
|
| 468 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby; |
|
| 468 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ".$orderby; |
|
| 469 | 469 | } |
| 470 | 470 | } |
| 471 | 471 | } |
@@ -480,7 +480,7 @@ discard block |
||
| 480 | 480 | */ |
| 481 | 481 | $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);
|
| 482 | 482 | |
| 483 | - $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
| 483 | + $orderby .= $table.".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
| 484 | 484 | |
| 485 | 485 | return $orderby; |
| 486 | 486 | } |
@@ -502,7 +502,7 @@ discard block |
||
| 502 | 502 | |
| 503 | 503 | global $wpdb; |
| 504 | 504 | |
| 505 | - if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' || $_REQUEST['s']==' ') ) )) {
|
|
| 505 | + if ($sort_by != '' && (!is_search() || (isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear'] == '' && ($_REQUEST['s'] == '' || $_REQUEST['s'] == ' ')))) {
|
|
| 506 | 506 | |
| 507 | 507 | $sort_array = explode('_', $sort_by);
|
| 508 | 508 | |
@@ -512,31 +512,31 @@ discard block |
||
| 512 | 512 | |
| 513 | 513 | if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {
|
| 514 | 514 | |
| 515 | - $sort_by = str_replace('_' . $order, '', $sort_by);
|
|
| 515 | + $sort_by = str_replace('_'.$order, '', $sort_by);
|
|
| 516 | 516 | |
| 517 | 517 | switch ($sort_by): |
| 518 | 518 | |
| 519 | 519 | case 'post_date': |
| 520 | 520 | case 'comment_count': |
| 521 | 521 | |
| 522 | - $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", "; |
|
| 522 | + $orderby = "$wpdb->posts.".$sort_by." ".$order.", ".$table.".overall_rating ".$order.", "; |
|
| 523 | 523 | break; |
| 524 | 524 | |
| 525 | 525 | case 'distance': |
| 526 | - $orderby = $sort_by . " " . $order . ", "; |
|
| 526 | + $orderby = $sort_by." ".$order.", "; |
|
| 527 | 527 | break; |
| 528 | 528 | |
| 529 | 529 | |
| 530 | 530 | // sort by rating |
| 531 | 531 | case 'overall_rating': |
| 532 | - $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
| 532 | + $orderby = " ".$table.".".$sort_by." ".$order.", ".$table.".rating_count ".$order.", "; |
|
| 533 | 533 | |
| 534 | 534 | break; |
| 535 | 535 | |
| 536 | 536 | |
| 537 | 537 | default: |
| 538 | 538 | if (geodir_column_exist($table, $sort_by)) {
|
| 539 | - $orderby = $table . "." . $sort_by . " " . $order . ", "; |
|
| 539 | + $orderby = $table.".".$sort_by." ".$order.", "; |
|
| 540 | 540 | } |
| 541 | 541 | break; |
| 542 | 542 | |
@@ -584,7 +584,7 @@ discard block |
||
| 584 | 584 | } |
| 585 | 585 | |
| 586 | 586 | //if (!geodir_is_page('detail'))
|
| 587 | - add_filter('posts_where', 'geodir_default_where', 1);/**/
|
|
| 587 | + add_filter('posts_where', 'geodir_default_where', 1); /**/
|
|
| 588 | 588 | |
| 589 | 589 | //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
| 590 | 590 | |
@@ -655,7 +655,7 @@ discard block |
||
| 655 | 655 | $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
| 656 | 656 | //echo '##########'.$q_post_type; |
| 657 | 657 | if ($lang_code && $q_post_type) {
|
| 658 | - $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";
|
|
| 658 | + $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_".$q_post_type."') ";
|
|
| 659 | 659 | //$where .= " AND icl_t.language_code = '$lang_code' "; |
| 660 | 660 | } |
| 661 | 661 | |
@@ -722,8 +722,8 @@ discard block |
||
| 722 | 722 | } |
| 723 | 723 | |
| 724 | 724 | $s = trim($s); |
| 725 | - $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
| 726 | - $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
| 725 | + $s = wp_specialchars_decode($s, ENT_QUOTES); |
|
| 726 | + $s_A = wp_specialchars_decode($s_A, ENT_QUOTES); |
|
| 727 | 727 | |
| 728 | 728 | $where = ''; |
| 729 | 729 | $better_search_terms = ''; |
@@ -734,9 +734,9 @@ discard block |
||
| 734 | 734 | |
| 735 | 735 | if ($s != '') {
|
| 736 | 736 | $keywords = explode(" ", $s);
|
| 737 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 738 | - foreach($keywords as $kkey=>$kword){
|
|
| 739 | - if(mb_strlen($kword, 'UTF-8')<=$klimit){
|
|
| 737 | + if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {
|
|
| 738 | + foreach ($keywords as $kkey=>$kword) {
|
|
| 739 | + if (mb_strlen($kword, 'UTF-8') <= $klimit) {
|
|
| 740 | 740 | unset($keywords[$kkey]); |
| 741 | 741 | } |
| 742 | 742 | } |
@@ -745,7 +745,7 @@ discard block |
||
| 745 | 745 | if (!empty($keywords)) {
|
| 746 | 746 | foreach ($keywords as $keyword) {
|
| 747 | 747 | $keyword = trim($keyword); |
| 748 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 748 | + $keyword = wp_specialchars_decode($keyword, ENT_QUOTES); |
|
| 749 | 749 | if ($keyword != '') {
|
| 750 | 750 | /** |
| 751 | 751 | * Filter the search query keywords SQL. |
@@ -756,7 +756,7 @@ discard block |
||
| 756 | 756 | * @param array $keywords The array of keywords for the query. |
| 757 | 757 | * @param string $keyword The single keyword being searched. |
| 758 | 758 | */ |
| 759 | - $better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword);
|
|
| 759 | + $better_search_terms .= apply_filters("geodir_search_better_search_terms", ' OR ( '.$wpdb->posts.'.post_title LIKE "'.$keyword.'" OR '.$wpdb->posts.'.post_title LIKE "'.$keyword.'%" OR '.$wpdb->posts.'.post_title LIKE "% '.$keyword.'%" )', $keywords, $keyword);
|
|
| 760 | 760 | } |
| 761 | 761 | } |
| 762 | 762 | } |
@@ -764,10 +764,10 @@ discard block |
||
| 764 | 764 | |
| 765 | 765 | /* get taxonomy */ |
| 766 | 766 | $taxonomies = geodir_get_taxonomies($post_types, true); |
| 767 | - if($taxonomies) {
|
|
| 767 | + if ($taxonomies) {
|
|
| 768 | 768 | $taxonomies = implode("','", $taxonomies);
|
| 769 | - $taxonomies = "'" . $taxonomies . "'"; |
|
| 770 | - }else{$taxonomies='';}
|
|
| 769 | + $taxonomies = "'".$taxonomies."'"; |
|
| 770 | + } else {$taxonomies = ''; }
|
|
| 771 | 771 | |
| 772 | 772 | $content_where = $terms_where = ''; |
| 773 | 773 | if ($s != '') {
|
@@ -778,7 +778,7 @@ discard block |
||
| 778 | 778 | * @package GeoDirectory |
| 779 | 779 | * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`. |
| 780 | 780 | */ |
| 781 | - $content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");
|
|
| 781 | + $content_where = apply_filters("geodir_search_content_where", " OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");
|
|
| 782 | 782 | /** |
| 783 | 783 | * Filter the search query term values. |
| 784 | 784 | * |
@@ -786,7 +786,7 @@ discard block |
||
| 786 | 786 | * @package GeoDirectory |
| 787 | 787 | * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`. |
| 788 | 788 | */ |
| 789 | - $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");
|
|
| 789 | + $terms_where = apply_filters("geodir_search_terms_where", " AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");
|
|
| 790 | 790 | } |
| 791 | 791 | |
| 792 | 792 | if ($snear != '') {
|
@@ -821,12 +821,12 @@ discard block |
||
| 821 | 821 | ) |
| 822 | 822 | AND $wpdb->posts.post_type in ('{$post_types}')
|
| 823 | 823 | AND ($wpdb->posts.post_status = 'publish') |
| 824 | - AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 ) |
|
| 825 | - AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) "; |
|
| 824 | + AND ( ".$table.".post_latitude between $rlat1 and $rlat2 ) |
|
| 825 | + AND ( ".$table.".post_longitude between $rlon1 and $rlon2 ) "; |
|
| 826 | 826 | |
| 827 | 827 | if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
| 828 | 828 | $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
| 829 | - $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist;
|
|
| 829 | + $where .= " AND CONVERT((".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= ".$dist;
|
|
| 830 | 830 | } |
| 831 | 831 | |
| 832 | 832 | } else {
|
@@ -847,11 +847,11 @@ discard block |
||
| 847 | 847 | } |
| 848 | 848 | |
| 849 | 849 | ########### WPML ########### |
| 850 | - if ( function_exists( 'icl_object_id' ) ) {
|
|
| 850 | + if (function_exists('icl_object_id')) {
|
|
| 851 | 851 | $lang_code = ICL_LANGUAGE_CODE; |
| 852 | 852 | |
| 853 | 853 | if ($lang_code && $post_types) {
|
| 854 | - $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 854 | + $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_".$post_types."') ";
|
|
| 855 | 855 | } |
| 856 | 856 | } |
| 857 | 857 | ########### WPML ########### |
@@ -874,10 +874,10 @@ discard block |
||
| 874 | 874 | global $wpdb, $geodir_post_type, $table, $curr; |
| 875 | 875 | |
| 876 | 876 | $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
| 877 | - $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 877 | + $user_id = !empty($curauth->ID) ? (int) $curauth->ID : 0; |
|
| 878 | 878 | |
| 879 | 879 | if (isset($_REQUEST['stype'])) {
|
| 880 | - $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 880 | + $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ", $_REQUEST['stype']);
|
|
| 881 | 881 | } else {
|
| 882 | 882 | $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
| 883 | 883 | } |
@@ -890,7 +890,7 @@ discard block |
||
| 890 | 890 | } else |
| 891 | 891 | $where .= " AND $wpdb->posts.post_author = $user_id"; |
| 892 | 892 | |
| 893 | - if ($user_id == (int)get_current_user_id()) {
|
|
| 893 | + if ($user_id == (int) get_current_user_id()) {
|
|
| 894 | 894 | $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
| 895 | 895 | } else {
|
| 896 | 896 | $where .= " AND $wpdb->posts.post_status = 'publish' "; |
@@ -903,7 +903,7 @@ discard block |
||
| 903 | 903 | if (function_exists('icl_object_id')) {
|
| 904 | 904 | $lang_code = ICL_LANGUAGE_CODE; |
| 905 | 905 | if ($lang_code) {
|
| 906 | - $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 906 | + $where .= " AND icl_t.language_code='".$lang_code."' "; |
|
| 907 | 907 | } |
| 908 | 908 | |
| 909 | 909 | } |
@@ -926,7 +926,7 @@ discard block |
||
| 926 | 926 | {
|
| 927 | 927 | global $wp_query, $table; |
| 928 | 928 | if (!empty($wp_query->query['with_pics_only'])) {
|
| 929 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 929 | + $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )"; |
|
| 930 | 930 | } |
| 931 | 931 | return $join; |
| 932 | 932 | } |
@@ -945,16 +945,16 @@ discard block |
||
| 945 | 945 | {
|
| 946 | 946 | global $wp_query, $table; |
| 947 | 947 | if (!empty($wp_query->query['show_featured_only'])) {
|
| 948 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 948 | + $where .= " AND ".$table.".is_featured = '1'"; |
|
| 949 | 949 | } |
| 950 | 950 | if (!empty($wp_query->query['show_special_only'])) {
|
| 951 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 951 | + $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )"; |
|
| 952 | 952 | } |
| 953 | 953 | if (!empty($wp_query->query['with_pics_only'])) {
|
| 954 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 954 | + $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL GROUP BY ".$table.".post_id"; |
|
| 955 | 955 | } |
| 956 | 956 | if (!empty($wp_query->query['with_videos_only'])) {
|
| 957 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 957 | + $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )"; |
|
| 958 | 958 | } |
| 959 | 959 | return $where; |
| 960 | 960 | } |
@@ -963,18 +963,18 @@ discard block |
||
| 963 | 963 | function geodir_related_posts_fields($fields) {
|
| 964 | 964 | global $wp_query, $wpdb, $table, $post; |
| 965 | 965 | |
| 966 | - $fields .= ", " . $table . ".* "; |
|
| 966 | + $fields .= ", ".$table.".* "; |
|
| 967 | 967 | |
| 968 | 968 | $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
| 969 | 969 | |
| 970 | 970 | $mylat = $post->post_latitude; |
| 971 | 971 | $mylon = $post->post_longitude; |
| 972 | 972 | |
| 973 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 973 | + $fields .= " , (".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) )))as distance ";
|
|
| 974 | 974 | return $fields; |
| 975 | 975 | } |
| 976 | 976 | function geodir_related_posts_fields_filter($query) {
|
| 977 | - if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 977 | + if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 978 | 978 | && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
| 979 | 979 | && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
| 980 | 980 | ) {
|
@@ -16,7 +16,9 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | function geodir_session_start() |
| 18 | 18 | {
|
| 19 | - if (!session_id()) session_start(); |
|
| 19 | + if (!session_id()) { |
|
| 20 | + session_start(); |
|
| 21 | + } |
|
| 20 | 22 | global $geodir_add_location_url; |
| 21 | 23 | |
| 22 | 24 | $geodir_add_location_url = NULL; |
@@ -86,7 +88,9 @@ discard block |
||
| 86 | 88 | |
| 87 | 89 | if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')): |
| 88 | 90 | |
| 89 | - if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = ''; |
|
| 91 | + if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') { |
|
| 92 | + $_REQUEST['scat'] = ''; |
|
| 93 | + } |
|
| 90 | 94 | //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = ''; |
| 91 | 95 | |
| 92 | 96 | if (isset($_REQUEST['sdist'])) {
|
@@ -198,8 +202,9 @@ discard block |
||
| 198 | 202 | add_filter('posts_fields', 'geodir_posts_fields', 1);
|
| 199 | 203 | add_filter('posts_join', 'geodir_posts_join', 1);
|
| 200 | 204 | geodir_post_where(); |
| 201 | - if (!is_admin()) |
|
| 202 | - add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 205 | + if (!is_admin()) { |
|
| 206 | + add_filter('posts_orderby', 'geodir_posts_orderby', 1); |
|
| 207 | + } |
|
| 203 | 208 | |
| 204 | 209 | // advanced filter for popular post view widget |
| 205 | 210 | global $wp_query; |
@@ -349,8 +354,9 @@ discard block |
||
| 349 | 354 | $sort_by = ''; |
| 350 | 355 | $orderby = ' '; |
| 351 | 356 | |
| 352 | - if (get_query_var('order_by'))
|
|
| 353 | - $sort_by = get_query_var('order_by');
|
|
| 357 | + if (get_query_var('order_by')) { |
|
| 358 | + $sort_by = get_query_var('order_by'); |
|
| 359 | + } |
|
| 354 | 360 | |
| 355 | 361 | /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){
|
| 356 | 362 | $current_term = $wp_query->get_queried_object(); |
@@ -370,14 +376,16 @@ discard block |
||
| 370 | 376 | $orderby .= " distance,"; |
| 371 | 377 | } |
| 372 | 378 | |
| 373 | - if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) |
|
| 374 | - $sort_by = esc_attr($_REQUEST['sort_by']); |
|
| 379 | + if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) { |
|
| 380 | + $sort_by = esc_attr($_REQUEST['sort_by']); |
|
| 381 | + } |
|
| 375 | 382 | |
| 376 | 383 | |
| 377 | 384 | if ($sort_by == '') {
|
| 378 | 385 | $default_sort = geodir_get_posts_default_sort($geodir_post_type); |
| 379 | - if (!empty($default_sort)) |
|
| 380 | - $sort_by = $default_sort; |
|
| 386 | + if (!empty($default_sort)) { |
|
| 387 | + $sort_by = $default_sort; |
|
| 388 | + } |
|
| 381 | 389 | } |
| 382 | 390 | |
| 383 | 391 | /* |
@@ -572,8 +580,9 @@ discard block |
||
| 572 | 580 | |
| 573 | 581 | add_filter('posts_where', 'searching_filter_where', 1);
|
| 574 | 582 | |
| 575 | - if ($snear != '') |
|
| 576 | - add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 583 | + if ($snear != '') { |
|
| 584 | + add_filter('posts_where', 'searching_filter_where', 1); |
|
| 585 | + } |
|
| 577 | 586 | |
| 578 | 587 | add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
| 579 | 588 | |
@@ -727,10 +736,11 @@ discard block |
||
| 727 | 736 | |
| 728 | 737 | $where = ''; |
| 729 | 738 | $better_search_terms = ''; |
| 730 | - if (isset($_REQUEST['stype'])) |
|
| 731 | - $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
| 732 | - else |
|
| 733 | - $post_types = 'gd_place'; |
|
| 739 | + if (isset($_REQUEST['stype'])) { |
|
| 740 | + $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
| 741 | + } else { |
|
| 742 | + $post_types = 'gd_place'; |
|
| 743 | + } |
|
| 734 | 744 | |
| 735 | 745 | if ($s != '') {
|
| 736 | 746 | $keywords = explode(" ", $s);
|
@@ -767,7 +777,7 @@ discard block |
||
| 767 | 777 | if($taxonomies) {
|
| 768 | 778 | $taxonomies = implode("','", $taxonomies);
|
| 769 | 779 | $taxonomies = "'" . $taxonomies . "'"; |
| 770 | - }else{$taxonomies='';}
|
|
| 780 | + } else{$taxonomies='';}
|
|
| 771 | 781 | |
| 772 | 782 | $content_where = $terms_where = ''; |
| 773 | 783 | if ($s != '') {
|
@@ -887,8 +897,9 @@ discard block |
||
| 887 | 897 | $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true); |
| 888 | 898 | $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';
|
| 889 | 899 | $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";
|
| 890 | - } else |
|
| 891 | - $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
| 900 | + } else { |
|
| 901 | + $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
| 902 | + } |
|
| 892 | 903 | |
| 893 | 904 | if ($user_id == (int)get_current_user_id()) {
|
| 894 | 905 | $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
@@ -42,10 +42,11 @@ discard block |
||
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | |
| 45 | - if (geodir_dummy_folder_exists()) |
|
| 46 | - $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon"; |
|
| 47 | - else |
|
| 48 | - $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon'; |
|
| 45 | + if (geodir_dummy_folder_exists()) { |
|
| 46 | + $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon"; |
|
| 47 | + } else { |
|
| 48 | + $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon'; |
|
| 49 | + } |
|
| 49 | 50 | |
| 50 | 51 | $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url); |
| 51 | 52 | |
@@ -86,10 +87,11 @@ discard block |
||
| 86 | 87 | if (!term_exists($catname, $post_type.'category')) { |
| 87 | 88 | $last_catid = wp_insert_term($catname, $post_type.'category'); |
| 88 | 89 | |
| 89 | - if (geodir_dummy_folder_exists()) |
|
| 90 | - $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon"; |
|
| 91 | - else |
|
| 92 | - $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon'; |
|
| 90 | + if (geodir_dummy_folder_exists()) { |
|
| 91 | + $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon"; |
|
| 92 | + } else { |
|
| 93 | + $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon'; |
|
| 94 | + } |
|
| 93 | 95 | |
| 94 | 96 | $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url); |
| 95 | 97 | |
@@ -218,7 +220,7 @@ discard block |
||
| 218 | 220 | * @package GeoDirectory |
| 219 | 221 | */ |
| 220 | 222 | include_once( 'dummy-data/standard_places.php' ); |
| 221 | - }elseif($key=='property_sale'){ |
|
| 223 | + } elseif($key=='property_sale'){ |
|
| 222 | 224 | /** |
| 223 | 225 | * Contains dummy property for sale post content. |
| 224 | 226 | * |
@@ -226,7 +228,7 @@ discard block |
||
| 226 | 228 | * @package GeoDirectory |
| 227 | 229 | */ |
| 228 | 230 | include_once( 'dummy-data/property_sale.php' ); |
| 229 | - }elseif($key=='property_rent'){ |
|
| 231 | + } elseif($key=='property_rent'){ |
|
| 230 | 232 | /** |
| 231 | 233 | * Contains dummy property for sale post content. |
| 232 | 234 | * |
@@ -330,7 +332,7 @@ discard block |
||
| 330 | 332 | |
| 331 | 333 | if($post_counts > 0){ |
| 332 | 334 | echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>'; |
| 333 | - }else{ |
|
| 335 | + } else{ |
|
| 334 | 336 | echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>'; |
| 335 | 337 | } |
| 336 | 338 | |
@@ -19,151 +19,151 @@ discard block |
||
| 19 | 19 | * @global string $dummy_image_path The dummy image path. |
| 20 | 20 | */ |
| 21 | 21 | function geodir_dummy_data_taxonomies($post_type,$category_array) { |
| 22 | - global $wpdb, $dummy_image_path; |
|
| 22 | + global $wpdb, $dummy_image_path; |
|
| 23 | 23 | |
| 24 | 24 | |
| 25 | 25 | |
| 26 | - $last_catid = ''; |
|
| 26 | + $last_catid = ''; |
|
| 27 | 27 | |
| 28 | - $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 28 | + $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 29 | 29 | |
| 30 | - for ($i = 0; $i < count($category_array); $i++) { |
|
| 31 | - $parent_catid = 0; |
|
| 32 | - if (is_array($category_array[$i])) { |
|
| 33 | - $cat_name_arr = $category_array[$i]; |
|
| 34 | - for ($j = 0; $j < count($cat_name_arr); $j++) { |
|
| 35 | - $catname = $cat_name_arr[$j]; |
|
| 30 | + for ($i = 0; $i < count($category_array); $i++) { |
|
| 31 | + $parent_catid = 0; |
|
| 32 | + if (is_array($category_array[$i])) { |
|
| 33 | + $cat_name_arr = $category_array[$i]; |
|
| 34 | + for ($j = 0; $j < count($cat_name_arr); $j++) { |
|
| 35 | + $catname = $cat_name_arr[$j]; |
|
| 36 | 36 | |
| 37 | - if (!term_exists($catname, $post_type.'category')) { |
|
| 38 | - $last_catid = wp_insert_term($catname, $post_type.'category', $args = array('parent' => $parent_catid)); |
|
| 37 | + if (!term_exists($catname, $post_type.'category')) { |
|
| 38 | + $last_catid = wp_insert_term($catname, $post_type.'category', $args = array('parent' => $parent_catid)); |
|
| 39 | 39 | |
| 40 | - if ($j == 0) { |
|
| 41 | - $parent_catid = $last_catid; |
|
| 42 | - } |
|
| 40 | + if ($j == 0) { |
|
| 41 | + $parent_catid = $last_catid; |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | 44 | |
| 45 | - if (geodir_dummy_folder_exists()) |
|
| 46 | - $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon"; |
|
| 47 | - else |
|
| 48 | - $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon'; |
|
| 45 | + if (geodir_dummy_folder_exists()) |
|
| 46 | + $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon"; |
|
| 47 | + else |
|
| 48 | + $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon'; |
|
| 49 | 49 | |
| 50 | - $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url); |
|
| 50 | + $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url); |
|
| 51 | 51 | |
| 52 | - $catname = str_replace(' ', '_', $catname); |
|
| 53 | - $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png"); |
|
| 52 | + $catname = str_replace(' ', '_', $catname); |
|
| 53 | + $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png"); |
|
| 54 | 54 | |
| 55 | - if (empty($uploaded['error'])) { |
|
| 56 | - $new_path = $uploaded['file']; |
|
| 57 | - $new_url = $uploaded['url']; |
|
| 58 | - } |
|
| 55 | + if (empty($uploaded['error'])) { |
|
| 56 | + $new_path = $uploaded['file']; |
|
| 57 | + $new_url = $uploaded['url']; |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - $wp_filetype = wp_check_filetype(basename($new_path), null); |
|
| 61 | - |
|
| 62 | - $attachment = array( |
|
| 63 | - 'guid' => $uploads['baseurl'] . '/' . basename($new_path), |
|
| 64 | - 'post_mime_type' => $wp_filetype['type'], |
|
| 65 | - 'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)), |
|
| 66 | - 'post_content' => '', |
|
| 67 | - 'post_status' => 'inherit' |
|
| 68 | - ); |
|
| 69 | - $attach_id = wp_insert_attachment($attachment, $new_path); |
|
| 70 | - |
|
| 71 | - // you must first include the image.php file |
|
| 72 | - // for the function wp_generate_attachment_metadata() to work |
|
| 73 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 74 | - $attach_data = wp_generate_attachment_metadata($attach_id, $new_path); |
|
| 75 | - wp_update_attachment_metadata($attach_id, $attach_data); |
|
| 76 | - |
|
| 77 | - if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) { |
|
| 78 | - update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => 'icon', 'src' => $new_url), $post_type); |
|
| 79 | - } |
|
| 80 | - } |
|
| 81 | - } |
|
| 60 | + $wp_filetype = wp_check_filetype(basename($new_path), null); |
|
| 82 | 61 | |
| 83 | - } else { |
|
| 84 | - $catname = $category_array[$i]; |
|
| 62 | + $attachment = array( |
|
| 63 | + 'guid' => $uploads['baseurl'] . '/' . basename($new_path), |
|
| 64 | + 'post_mime_type' => $wp_filetype['type'], |
|
| 65 | + 'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)), |
|
| 66 | + 'post_content' => '', |
|
| 67 | + 'post_status' => 'inherit' |
|
| 68 | + ); |
|
| 69 | + $attach_id = wp_insert_attachment($attachment, $new_path); |
|
| 85 | 70 | |
| 86 | - if (!term_exists($catname, $post_type.'category')) { |
|
| 87 | - $last_catid = wp_insert_term($catname, $post_type.'category'); |
|
| 71 | + // you must first include the image.php file |
|
| 72 | + // for the function wp_generate_attachment_metadata() to work |
|
| 73 | + require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 74 | + $attach_data = wp_generate_attachment_metadata($attach_id, $new_path); |
|
| 75 | + wp_update_attachment_metadata($attach_id, $attach_data); |
|
| 88 | 76 | |
| 89 | - if (geodir_dummy_folder_exists()) |
|
| 90 | - $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon"; |
|
| 91 | - else |
|
| 92 | - $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon'; |
|
| 77 | + if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) { |
|
| 78 | + update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => 'icon', 'src' => $new_url), $post_type); |
|
| 79 | + } |
|
| 80 | + } |
|
| 81 | + } |
|
| 93 | 82 | |
| 94 | - $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url); |
|
| 83 | + } else { |
|
| 84 | + $catname = $category_array[$i]; |
|
| 95 | 85 | |
| 96 | - $catname = str_replace(' ', '_', $catname); |
|
| 97 | - $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png"); |
|
| 86 | + if (!term_exists($catname, $post_type.'category')) { |
|
| 87 | + $last_catid = wp_insert_term($catname, $post_type.'category'); |
|
| 98 | 88 | |
| 99 | - if (empty($uploaded['error'])) { |
|
| 100 | - $new_path = $uploaded['file']; |
|
| 101 | - $new_url = $uploaded['url']; |
|
| 102 | - } |
|
| 89 | + if (geodir_dummy_folder_exists()) |
|
| 90 | + $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon"; |
|
| 91 | + else |
|
| 92 | + $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon'; |
|
| 103 | 93 | |
| 104 | - $wp_filetype = wp_check_filetype(basename($new_path), null); |
|
| 94 | + $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url); |
|
| 105 | 95 | |
| 106 | - $attachment = array( |
|
| 107 | - 'guid' => $uploads['baseurl'] . '/' . basename($new_path), |
|
| 108 | - 'post_mime_type' => $wp_filetype['type'], |
|
| 109 | - 'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)), |
|
| 110 | - 'post_content' => '', |
|
| 111 | - 'post_status' => 'inherit' |
|
| 112 | - ); |
|
| 96 | + $catname = str_replace(' ', '_', $catname); |
|
| 97 | + $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png"); |
|
| 113 | 98 | |
| 114 | - $attach_id = wp_insert_attachment($attachment, $new_path); |
|
| 99 | + if (empty($uploaded['error'])) { |
|
| 100 | + $new_path = $uploaded['file']; |
|
| 101 | + $new_url = $uploaded['url']; |
|
| 102 | + } |
|
| 115 | 103 | |
| 104 | + $wp_filetype = wp_check_filetype(basename($new_path), null); |
|
| 116 | 105 | |
| 117 | - // you must first include the image.php file |
|
| 118 | - // for the function wp_generate_attachment_metadata() to work |
|
| 119 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 120 | - $attach_data = wp_generate_attachment_metadata($attach_id, $new_path); |
|
| 121 | - wp_update_attachment_metadata($attach_id, $attach_data); |
|
| 106 | + $attachment = array( |
|
| 107 | + 'guid' => $uploads['baseurl'] . '/' . basename($new_path), |
|
| 108 | + 'post_mime_type' => $wp_filetype['type'], |
|
| 109 | + 'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)), |
|
| 110 | + 'post_content' => '', |
|
| 111 | + 'post_status' => 'inherit' |
|
| 112 | + ); |
|
| 113 | + |
|
| 114 | + $attach_id = wp_insert_attachment($attachment, $new_path); |
|
| 122 | 115 | |
| 123 | - if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) { |
|
| 124 | - update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => $attach_id, 'src' => $new_url), $post_type); |
|
| 125 | - } |
|
| 126 | - } |
|
| 127 | - } |
|
| 128 | 116 | |
| 129 | - } |
|
| 117 | + // you must first include the image.php file |
|
| 118 | + // for the function wp_generate_attachment_metadata() to work |
|
| 119 | + require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 120 | + $attach_data = wp_generate_attachment_metadata($attach_id, $new_path); |
|
| 121 | + wp_update_attachment_metadata($attach_id, $attach_data); |
|
| 122 | + |
|
| 123 | + if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) { |
|
| 124 | + update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => $attach_id, 'src' => $new_url), $post_type); |
|
| 125 | + } |
|
| 126 | + } |
|
| 127 | + } |
|
| 128 | + |
|
| 129 | + } |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | |
| 133 | 133 | function geodir_dummy_data_types(){ |
| 134 | - $data = array( |
|
| 135 | - 'standard_places' => array( |
|
| 136 | - 'name'=>__('Default','geodirectory'), |
|
| 137 | - 'count'=> 30 |
|
| 138 | - ), |
|
| 139 | - 'property_sale' => array( |
|
| 140 | - 'name'=>__('Property for sale','geodirectory'), |
|
| 141 | - 'count'=> 10 |
|
| 142 | - ), |
|
| 143 | - 'property_rent' => array( |
|
| 144 | - 'name'=>__('Property for rent','geodirectory'), |
|
| 145 | - 'count'=> 10 |
|
| 146 | - ) |
|
| 147 | - ); |
|
| 148 | - |
|
| 149 | - return apply_filters('geodir_dummy_data_types',$data ); |
|
| 134 | + $data = array( |
|
| 135 | + 'standard_places' => array( |
|
| 136 | + 'name'=>__('Default','geodirectory'), |
|
| 137 | + 'count'=> 30 |
|
| 138 | + ), |
|
| 139 | + 'property_sale' => array( |
|
| 140 | + 'name'=>__('Property for sale','geodirectory'), |
|
| 141 | + 'count'=> 10 |
|
| 142 | + ), |
|
| 143 | + 'property_rent' => array( |
|
| 144 | + 'name'=>__('Property for rent','geodirectory'), |
|
| 145 | + 'count'=> 10 |
|
| 146 | + ) |
|
| 147 | + ); |
|
| 148 | + |
|
| 149 | + return apply_filters('geodir_dummy_data_types',$data ); |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | |
| 153 | 153 | function geodir_create_dummy_fields($fields) |
| 154 | 154 | { |
| 155 | 155 | |
| 156 | - /** |
|
| 157 | - * Filter the array of default custom fields DB table data. |
|
| 158 | - * |
|
| 159 | - * @since 1.0.0 |
|
| 160 | - * @param string $fields The default custom fields as an array. |
|
| 161 | - */ |
|
| 162 | - $fields = apply_filters('geodir_before_dummy_custom_fields_saved', $fields); |
|
| 163 | - foreach ($fields as $field_index => $field) { |
|
| 164 | - geodir_custom_field_save($field); |
|
| 165 | - |
|
| 166 | - } |
|
| 156 | + /** |
|
| 157 | + * Filter the array of default custom fields DB table data. |
|
| 158 | + * |
|
| 159 | + * @since 1.0.0 |
|
| 160 | + * @param string $fields The default custom fields as an array. |
|
| 161 | + */ |
|
| 162 | + $fields = apply_filters('geodir_before_dummy_custom_fields_saved', $fields); |
|
| 163 | + foreach ($fields as $field_index => $field) { |
|
| 164 | + geodir_custom_field_save($field); |
|
| 165 | + |
|
| 166 | + } |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | /** |
@@ -176,20 +176,20 @@ discard block |
||
| 176 | 176 | */ |
| 177 | 177 | function geodir_delete_dummy_posts($post_type,$data_type) |
| 178 | 178 | { |
| 179 | - global $wpdb, $plugin_prefix; |
|
| 179 | + global $wpdb, $plugin_prefix; |
|
| 180 | 180 | |
| 181 | 181 | |
| 182 | - $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . $post_type."_detail WHERE post_dummy='1'"); |
|
| 182 | + $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . $post_type."_detail WHERE post_dummy='1'"); |
|
| 183 | 183 | |
| 184 | 184 | |
| 185 | - foreach ($post_ids as $post_ids_obj) { |
|
| 186 | - wp_delete_post($post_ids_obj->post_id); |
|
| 187 | - } |
|
| 185 | + foreach ($post_ids as $post_ids_obj) { |
|
| 186 | + wp_delete_post($post_ids_obj->post_id); |
|
| 187 | + } |
|
| 188 | 188 | |
| 189 | - //double check posts are deleted |
|
| 190 | - $wpdb->get_results("DELETE FROM " . $plugin_prefix . $post_type. "_detail WHERE post_dummy='1'"); |
|
| 189 | + //double check posts are deleted |
|
| 190 | + $wpdb->get_results("DELETE FROM " . $plugin_prefix . $post_type. "_detail WHERE post_dummy='1'"); |
|
| 191 | 191 | |
| 192 | - update_option($post_type.'_dummy_data_type',''); |
|
| 192 | + update_option($post_type.'_dummy_data_type',''); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | /** |
@@ -203,78 +203,78 @@ discard block |
||
| 203 | 203 | function geodir_insert_dummy_posts($post_type,$data_type,$item_index) |
| 204 | 204 | { |
| 205 | 205 | |
| 206 | - ini_set('max_execution_time', 999999); //300 seconds = 5 minutes |
|
| 207 | - $data_types = geodir_dummy_data_types(); |
|
| 208 | - |
|
| 209 | - $total_count = 0; |
|
| 210 | - global $dummy_post_index; |
|
| 211 | - $dummy_post_index = $item_index; |
|
| 212 | - foreach( $data_types as $key=>$val){ |
|
| 213 | - if($key==$data_type){ |
|
| 214 | - $total_count = $val['count']; |
|
| 215 | - if($key=='standard_places'){ |
|
| 216 | - /** |
|
| 217 | - * Contains dummy post content. |
|
| 218 | - * |
|
| 219 | - * @since 1.0.0 |
|
| 220 | - * @package GeoDirectory |
|
| 221 | - */ |
|
| 222 | - include_once( 'dummy-data/standard_places.php' ); |
|
| 223 | - }elseif($key=='property_sale'){ |
|
| 224 | - /** |
|
| 225 | - * Contains dummy property for sale post content. |
|
| 226 | - * |
|
| 227 | - * @since 1.6.11 |
|
| 228 | - * @package GeoDirectory |
|
| 229 | - */ |
|
| 230 | - include_once( 'dummy-data/property_sale.php' ); |
|
| 231 | - }elseif($key=='property_rent'){ |
|
| 232 | - /** |
|
| 233 | - * Contains dummy property for sale post content. |
|
| 234 | - * |
|
| 235 | - * @since 1.6.11 |
|
| 236 | - * @package GeoDirectory |
|
| 237 | - */ |
|
| 238 | - include_once( 'dummy-data/property_rent.php' ); |
|
| 239 | - } |
|
| 240 | - |
|
| 241 | - } |
|
| 242 | - |
|
| 243 | - do_action('geodir_insert_dummy_data_loop',$post_type,$data_type,$item_index); |
|
| 244 | - } |
|
| 245 | - |
|
| 246 | - |
|
| 247 | - |
|
| 248 | - // delete image cache on last entry |
|
| 249 | - if($total_count == $item_index){ |
|
| 250 | - delete_transient( 'cached_dummy_images' ); |
|
| 251 | - flush_rewrite_rules(); |
|
| 252 | - } |
|
| 206 | + ini_set('max_execution_time', 999999); //300 seconds = 5 minutes |
|
| 207 | + $data_types = geodir_dummy_data_types(); |
|
| 208 | + |
|
| 209 | + $total_count = 0; |
|
| 210 | + global $dummy_post_index; |
|
| 211 | + $dummy_post_index = $item_index; |
|
| 212 | + foreach( $data_types as $key=>$val){ |
|
| 213 | + if($key==$data_type){ |
|
| 214 | + $total_count = $val['count']; |
|
| 215 | + if($key=='standard_places'){ |
|
| 216 | + /** |
|
| 217 | + * Contains dummy post content. |
|
| 218 | + * |
|
| 219 | + * @since 1.0.0 |
|
| 220 | + * @package GeoDirectory |
|
| 221 | + */ |
|
| 222 | + include_once( 'dummy-data/standard_places.php' ); |
|
| 223 | + }elseif($key=='property_sale'){ |
|
| 224 | + /** |
|
| 225 | + * Contains dummy property for sale post content. |
|
| 226 | + * |
|
| 227 | + * @since 1.6.11 |
|
| 228 | + * @package GeoDirectory |
|
| 229 | + */ |
|
| 230 | + include_once( 'dummy-data/property_sale.php' ); |
|
| 231 | + }elseif($key=='property_rent'){ |
|
| 232 | + /** |
|
| 233 | + * Contains dummy property for sale post content. |
|
| 234 | + * |
|
| 235 | + * @since 1.6.11 |
|
| 236 | + * @package GeoDirectory |
|
| 237 | + */ |
|
| 238 | + include_once( 'dummy-data/property_rent.php' ); |
|
| 239 | + } |
|
| 240 | + |
|
| 241 | + } |
|
| 242 | + |
|
| 243 | + do_action('geodir_insert_dummy_data_loop',$post_type,$data_type,$item_index); |
|
| 244 | + } |
|
| 245 | + |
|
| 246 | + |
|
| 247 | + |
|
| 248 | + // delete image cache on last entry |
|
| 249 | + if($total_count == $item_index){ |
|
| 250 | + delete_transient( 'cached_dummy_images' ); |
|
| 251 | + flush_rewrite_rules(); |
|
| 252 | + } |
|
| 253 | 253 | |
| 254 | 254 | |
| 255 | 255 | } |
| 256 | 256 | |
| 257 | 257 | |
| 258 | 258 | if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined( 'GD_TESTING_MODE' ))) { |
| 259 | - /** |
|
| 260 | - * GeoDirectory dummy data installation. |
|
| 261 | - * |
|
| 262 | - * @since 1.0.0 |
|
| 263 | - * @package GeoDirectory |
|
| 264 | - * @global object $wpdb WordPress Database object. |
|
| 265 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 266 | - * @param string $post_type The post type. |
|
| 267 | - */ |
|
| 268 | - function geodir_autoinstall_admin_header($post_type = 'gd_place') |
|
| 269 | - { |
|
| 270 | - |
|
| 271 | - global $wpdb, $plugin_prefix; |
|
| 272 | - |
|
| 273 | - if (!geodir_is_default_location_set()) { |
|
| 274 | - echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>'; |
|
| 275 | - } else { |
|
| 276 | - |
|
| 277 | - ?> |
|
| 259 | + /** |
|
| 260 | + * GeoDirectory dummy data installation. |
|
| 261 | + * |
|
| 262 | + * @since 1.0.0 |
|
| 263 | + * @package GeoDirectory |
|
| 264 | + * @global object $wpdb WordPress Database object. |
|
| 265 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 266 | + * @param string $post_type The post type. |
|
| 267 | + */ |
|
| 268 | + function geodir_autoinstall_admin_header($post_type = 'gd_place') |
|
| 269 | + { |
|
| 270 | + |
|
| 271 | + global $wpdb, $plugin_prefix; |
|
| 272 | + |
|
| 273 | + if (!geodir_is_default_location_set()) { |
|
| 274 | + echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>'; |
|
| 275 | + } else { |
|
| 276 | + |
|
| 277 | + ?> |
|
| 278 | 278 | <span class="gd-dummy-hint"><small><?php _e('*Hint*: Installing our Advanced Search addon FIRST will add extra search fields to non-default data types.','geodirectory');?></small></span> |
| 279 | 279 | <table class="form-table gd-dummy-table"> |
| 280 | 280 | <tbody> |
@@ -286,78 +286,78 @@ discard block |
||
| 286 | 286 | |
| 287 | 287 | <?php |
| 288 | 288 | |
| 289 | - $cpts = geodir_get_posttypes('array'); |
|
| 289 | + $cpts = geodir_get_posttypes('array'); |
|
| 290 | 290 | |
| 291 | - $data_types = geodir_dummy_data_types(); |
|
| 291 | + $data_types = geodir_dummy_data_types(); |
|
| 292 | 292 | |
| 293 | - $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename'); |
|
| 293 | + $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename'); |
|
| 294 | 294 | |
| 295 | - foreach($cpts as $post_type=>$cpt){ |
|
| 295 | + foreach($cpts as $post_type=>$cpt){ |
|
| 296 | 296 | |
| 297 | - $data_types_for = apply_filters('geodir_dummy_date_types_for',$data_types,$post_type); |
|
| 297 | + $data_types_for = apply_filters('geodir_dummy_date_types_for',$data_types,$post_type); |
|
| 298 | 298 | |
| 299 | 299 | |
| 300 | - $set_dt = get_option($post_type.'_dummy_data_type'); |
|
| 300 | + $set_dt = get_option($post_type.'_dummy_data_type'); |
|
| 301 | 301 | |
| 302 | - $count = 30; |
|
| 302 | + $count = 30; |
|
| 303 | 303 | |
| 304 | - geodir_add_column_if_not_exist($plugin_prefix . $post_type. "_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'"); |
|
| 304 | + geodir_add_column_if_not_exist($plugin_prefix . $post_type. "_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'"); |
|
| 305 | 305 | |
| 306 | - $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'"); |
|
| 306 | + $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'"); |
|
| 307 | 307 | |
| 308 | - echo "<tr>"; |
|
| 309 | - echo "<td><strong>".$cpt['labels']['name']."</strong></td>"; |
|
| 308 | + echo "<tr>"; |
|
| 309 | + echo "<td><strong>".$cpt['labels']['name']."</strong></td>"; |
|
| 310 | 310 | |
| 311 | 311 | |
| 312 | - $select_disabled = $post_counts > 0 ? 'disabled' : ''; |
|
| 313 | - echo "<td>"; |
|
| 314 | - echo "<select id='".$post_type."_data_type' onchange='geodir_dummy_set_count(this,\"$post_type\");' $select_disabled>"; |
|
| 312 | + $select_disabled = $post_counts > 0 ? 'disabled' : ''; |
|
| 313 | + echo "<td>"; |
|
| 314 | + echo "<select id='".$post_type."_data_type' onchange='geodir_dummy_set_count(this,\"$post_type\");' $select_disabled>"; |
|
| 315 | 315 | |
| 316 | - foreach($data_types_for as $key=>$val){ |
|
| 317 | - $selected = ($key==$set_dt) ? "selected='selected'" : ''; |
|
| 318 | - if($selected || count($data_types_for)==1){$count = $val['count'];} |
|
| 319 | - echo "<option $selected value='$key' data-count='".$val['count']."'>".$val['name']."</option>"; |
|
| 320 | - } |
|
| 321 | - echo "</select>"; |
|
| 322 | - |
|
| 323 | - $select_display = $post_counts > 0 ? 'display:none;' : ''; |
|
| 324 | - echo "<select id='".$post_type."_data_type_count' style='$select_display' >"; |
|
| 325 | - $x = 1; |
|
| 326 | - while($x <= $count){ |
|
| 327 | - $selected = ($x==$count) ? "selected='selected'" : ''; |
|
| 328 | - echo "<option $selected value='$x'>".$x."</option>"; |
|
| 329 | - $x++; |
|
| 330 | - } |
|
| 331 | - echo "</select>"; |
|
| 332 | - echo "</td>"; |
|
| 316 | + foreach($data_types_for as $key=>$val){ |
|
| 317 | + $selected = ($key==$set_dt) ? "selected='selected'" : ''; |
|
| 318 | + if($selected || count($data_types_for)==1){$count = $val['count'];} |
|
| 319 | + echo "<option $selected value='$key' data-count='".$val['count']."'>".$val['name']."</option>"; |
|
| 320 | + } |
|
| 321 | + echo "</select>"; |
|
| 333 | 322 | |
| 323 | + $select_display = $post_counts > 0 ? 'display:none;' : ''; |
|
| 324 | + echo "<select id='".$post_type."_data_type_count' style='$select_display' >"; |
|
| 325 | + $x = 1; |
|
| 326 | + while($x <= $count){ |
|
| 327 | + $selected = ($x==$count) ? "selected='selected'" : ''; |
|
| 328 | + echo "<option $selected value='$x'>".$x."</option>"; |
|
| 329 | + $x++; |
|
| 330 | + } |
|
| 331 | + echo "</select>"; |
|
| 332 | + echo "</td>"; |
|
| 334 | 333 | |
| 335 | 334 | |
| 336 | 335 | |
| 337 | 336 | |
| 338 | - if($post_counts > 0){ |
|
| 339 | - echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>'; |
|
| 340 | - }else{ |
|
| 341 | - echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>'; |
|
| 342 | - } |
|
| 343 | 337 | |
| 344 | - echo "</tr>"; |
|
| 345 | - //print_r($cpt); |
|
| 346 | - } |
|
| 338 | + if($post_counts > 0){ |
|
| 339 | + echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>'; |
|
| 340 | + }else{ |
|
| 341 | + echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>'; |
|
| 342 | + } |
|
| 343 | + |
|
| 344 | + echo "</tr>"; |
|
| 345 | + //print_r($cpt); |
|
| 346 | + } |
|
| 347 | 347 | |
| 348 | - ?> |
|
| 348 | + ?> |
|
| 349 | 349 | </tbody> |
| 350 | 350 | </table> |
| 351 | 351 | <?php |
| 352 | 352 | |
| 353 | 353 | |
| 354 | - $default_location = geodir_get_default_location(); |
|
| 355 | - $city = isset($default_location->city) ? $default_location->city : ''; |
|
| 356 | - $region = isset($default_location->region) ? $default_location->region : ''; |
|
| 357 | - $country = isset($default_location->country) ? $default_location->country : ''; |
|
| 358 | - $city_latitude = isset($default_location->city_latitude) ? $default_location->city_latitude : ''; |
|
| 359 | - $city_longitude = isset($default_location->city_longitude) ? $default_location->city_longitude : ''; |
|
| 360 | - ?> |
|
| 354 | + $default_location = geodir_get_default_location(); |
|
| 355 | + $city = isset($default_location->city) ? $default_location->city : ''; |
|
| 356 | + $region = isset($default_location->region) ? $default_location->region : ''; |
|
| 357 | + $country = isset($default_location->country) ? $default_location->country : ''; |
|
| 358 | + $city_latitude = isset($default_location->city_latitude) ? $default_location->city_latitude : ''; |
|
| 359 | + $city_longitude = isset($default_location->city_longitude) ? $default_location->city_longitude : ''; |
|
| 360 | + ?> |
|
| 361 | 361 | <script type="text/javascript"> |
| 362 | 362 | |
| 363 | 363 | function geodir_dummy_set_count(data,cpt){ |
@@ -533,7 +533,7 @@ discard block |
||
| 533 | 533 | } |
| 534 | 534 | </script> |
| 535 | 535 | <?php |
| 536 | - } |
|
| 537 | - } |
|
| 536 | + } |
|
| 537 | + } |
|
| 538 | 538 | } |
| 539 | 539 | |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | * @global object $wpdb WordPress Database object. |
| 19 | 19 | * @global string $dummy_image_path The dummy image path. |
| 20 | 20 | */ |
| 21 | -function geodir_dummy_data_taxonomies($post_type,$category_array) { |
|
| 21 | +function geodir_dummy_data_taxonomies($post_type, $category_array) { |
|
| 22 | 22 | global $wpdb, $dummy_image_path; |
| 23 | 23 | |
| 24 | 24 | |
@@ -43,14 +43,14 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | |
| 45 | 45 | if (geodir_dummy_folder_exists()) |
| 46 | - $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon"; |
|
| 46 | + $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy/cat_icon"; |
|
| 47 | 47 | else |
| 48 | 48 | $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon'; |
| 49 | 49 | |
| 50 | 50 | $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url); |
| 51 | 51 | |
| 52 | 52 | $catname = str_replace(' ', '_', $catname); |
| 53 | - $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png"); |
|
| 53 | + $uploaded = (array) fetch_remote_file("$dummy_image_url/".$catname.".png"); |
|
| 54 | 54 | |
| 55 | 55 | if (empty($uploaded['error'])) { |
| 56 | 56 | $new_path = $uploaded['file']; |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | $wp_filetype = wp_check_filetype(basename($new_path), null); |
| 61 | 61 | |
| 62 | 62 | $attachment = array( |
| 63 | - 'guid' => $uploads['baseurl'] . '/' . basename($new_path), |
|
| 63 | + 'guid' => $uploads['baseurl'].'/'.basename($new_path), |
|
| 64 | 64 | 'post_mime_type' => $wp_filetype['type'], |
| 65 | 65 | 'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)), |
| 66 | 66 | 'post_content' => '', |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | // you must first include the image.php file |
| 72 | 72 | // for the function wp_generate_attachment_metadata() to work |
| 73 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 73 | + require_once(ABSPATH.'wp-admin/includes/image.php'); |
|
| 74 | 74 | $attach_data = wp_generate_attachment_metadata($attach_id, $new_path); |
| 75 | 75 | wp_update_attachment_metadata($attach_id, $attach_data); |
| 76 | 76 | |
@@ -87,14 +87,14 @@ discard block |
||
| 87 | 87 | $last_catid = wp_insert_term($catname, $post_type.'category'); |
| 88 | 88 | |
| 89 | 89 | if (geodir_dummy_folder_exists()) |
| 90 | - $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon"; |
|
| 90 | + $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy/cat_icon"; |
|
| 91 | 91 | else |
| 92 | 92 | $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon'; |
| 93 | 93 | |
| 94 | 94 | $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url); |
| 95 | 95 | |
| 96 | 96 | $catname = str_replace(' ', '_', $catname); |
| 97 | - $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png"); |
|
| 97 | + $uploaded = (array) fetch_remote_file("$dummy_image_url/".$catname.".png"); |
|
| 98 | 98 | |
| 99 | 99 | if (empty($uploaded['error'])) { |
| 100 | 100 | $new_path = $uploaded['file']; |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | $wp_filetype = wp_check_filetype(basename($new_path), null); |
| 105 | 105 | |
| 106 | 106 | $attachment = array( |
| 107 | - 'guid' => $uploads['baseurl'] . '/' . basename($new_path), |
|
| 107 | + 'guid' => $uploads['baseurl'].'/'.basename($new_path), |
|
| 108 | 108 | 'post_mime_type' => $wp_filetype['type'], |
| 109 | 109 | 'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)), |
| 110 | 110 | 'post_content' => '', |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | |
| 117 | 117 | // you must first include the image.php file |
| 118 | 118 | // for the function wp_generate_attachment_metadata() to work |
| 119 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 119 | + require_once(ABSPATH.'wp-admin/includes/image.php'); |
|
| 120 | 120 | $attach_data = wp_generate_attachment_metadata($attach_id, $new_path); |
| 121 | 121 | wp_update_attachment_metadata($attach_id, $attach_data); |
| 122 | 122 | |
@@ -130,23 +130,23 @@ discard block |
||
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | |
| 133 | -function geodir_dummy_data_types(){ |
|
| 134 | - $data = array( |
|
| 133 | +function geodir_dummy_data_types() { |
|
| 134 | + $data = array( |
|
| 135 | 135 | 'standard_places' => array( |
| 136 | - 'name'=>__('Default','geodirectory'), |
|
| 136 | + 'name'=>__('Default', 'geodirectory'), |
|
| 137 | 137 | 'count'=> 30 |
| 138 | 138 | ), |
| 139 | 139 | 'property_sale' => array( |
| 140 | - 'name'=>__('Property for sale','geodirectory'), |
|
| 140 | + 'name'=>__('Property for sale', 'geodirectory'), |
|
| 141 | 141 | 'count'=> 10 |
| 142 | 142 | ), |
| 143 | 143 | 'property_rent' => array( |
| 144 | - 'name'=>__('Property for rent','geodirectory'), |
|
| 144 | + 'name'=>__('Property for rent', 'geodirectory'), |
|
| 145 | 145 | 'count'=> 10 |
| 146 | 146 | ) |
| 147 | 147 | ); |
| 148 | 148 | |
| 149 | - return apply_filters('geodir_dummy_data_types',$data ); |
|
| 149 | + return apply_filters('geodir_dummy_data_types', $data); |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | |
@@ -174,12 +174,12 @@ discard block |
||
| 174 | 174 | * @global object $wpdb WordPress Database object. |
| 175 | 175 | * @global string $plugin_prefix Geodirectory plugin table prefix. |
| 176 | 176 | */ |
| 177 | -function geodir_delete_dummy_posts($post_type,$data_type) |
|
| 177 | +function geodir_delete_dummy_posts($post_type, $data_type) |
|
| 178 | 178 | { |
| 179 | 179 | global $wpdb, $plugin_prefix; |
| 180 | 180 | |
| 181 | 181 | |
| 182 | - $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . $post_type."_detail WHERE post_dummy='1'"); |
|
| 182 | + $post_ids = $wpdb->get_results("SELECT post_id FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'"); |
|
| 183 | 183 | |
| 184 | 184 | |
| 185 | 185 | foreach ($post_ids as $post_ids_obj) { |
@@ -187,9 +187,9 @@ discard block |
||
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | //double check posts are deleted |
| 190 | - $wpdb->get_results("DELETE FROM " . $plugin_prefix . $post_type. "_detail WHERE post_dummy='1'"); |
|
| 190 | + $wpdb->get_results("DELETE FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'"); |
|
| 191 | 191 | |
| 192 | - update_option($post_type.'_dummy_data_type',''); |
|
| 192 | + update_option($post_type.'_dummy_data_type', ''); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | /** |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | * @global object $wpdb WordPress Database object. |
| 201 | 201 | * @global object $current_user Current user object. |
| 202 | 202 | */ |
| 203 | -function geodir_insert_dummy_posts($post_type,$data_type,$item_index) |
|
| 203 | +function geodir_insert_dummy_posts($post_type, $data_type, $item_index) |
|
| 204 | 204 | { |
| 205 | 205 | |
| 206 | 206 | ini_set('max_execution_time', 999999); //300 seconds = 5 minutes |
@@ -209,45 +209,45 @@ discard block |
||
| 209 | 209 | $total_count = 0; |
| 210 | 210 | global $dummy_post_index; |
| 211 | 211 | $dummy_post_index = $item_index; |
| 212 | - foreach( $data_types as $key=>$val){ |
|
| 213 | - if($key==$data_type){ |
|
| 212 | + foreach ($data_types as $key=>$val) { |
|
| 213 | + if ($key == $data_type) { |
|
| 214 | 214 | $total_count = $val['count']; |
| 215 | - if($key=='standard_places'){ |
|
| 215 | + if ($key == 'standard_places') { |
|
| 216 | 216 | /** |
| 217 | 217 | * Contains dummy post content. |
| 218 | 218 | * |
| 219 | 219 | * @since 1.0.0 |
| 220 | 220 | * @package GeoDirectory |
| 221 | 221 | */ |
| 222 | - include_once( 'dummy-data/standard_places.php' ); |
|
| 223 | - }elseif($key=='property_sale'){ |
|
| 222 | + include_once('dummy-data/standard_places.php'); |
|
| 223 | + }elseif ($key == 'property_sale') { |
|
| 224 | 224 | /** |
| 225 | 225 | * Contains dummy property for sale post content. |
| 226 | 226 | * |
| 227 | 227 | * @since 1.6.11 |
| 228 | 228 | * @package GeoDirectory |
| 229 | 229 | */ |
| 230 | - include_once( 'dummy-data/property_sale.php' ); |
|
| 231 | - }elseif($key=='property_rent'){ |
|
| 230 | + include_once('dummy-data/property_sale.php'); |
|
| 231 | + }elseif ($key == 'property_rent') { |
|
| 232 | 232 | /** |
| 233 | 233 | * Contains dummy property for sale post content. |
| 234 | 234 | * |
| 235 | 235 | * @since 1.6.11 |
| 236 | 236 | * @package GeoDirectory |
| 237 | 237 | */ |
| 238 | - include_once( 'dummy-data/property_rent.php' ); |
|
| 238 | + include_once('dummy-data/property_rent.php'); |
|
| 239 | 239 | } |
| 240 | 240 | |
| 241 | 241 | } |
| 242 | 242 | |
| 243 | - do_action('geodir_insert_dummy_data_loop',$post_type,$data_type,$item_index); |
|
| 243 | + do_action('geodir_insert_dummy_data_loop', $post_type, $data_type, $item_index); |
|
| 244 | 244 | } |
| 245 | 245 | |
| 246 | 246 | |
| 247 | 247 | |
| 248 | 248 | // delete image cache on last entry |
| 249 | - if($total_count == $item_index){ |
|
| 250 | - delete_transient( 'cached_dummy_images' ); |
|
| 249 | + if ($total_count == $item_index) { |
|
| 250 | + delete_transient('cached_dummy_images'); |
|
| 251 | 251 | flush_rewrite_rules(); |
| 252 | 252 | } |
| 253 | 253 | |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | } |
| 256 | 256 | |
| 257 | 257 | |
| 258 | -if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined( 'GD_TESTING_MODE' ))) { |
|
| 258 | +if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined('GD_TESTING_MODE'))) { |
|
| 259 | 259 | /** |
| 260 | 260 | * GeoDirectory dummy data installation. |
| 261 | 261 | * |
@@ -271,17 +271,17 @@ discard block |
||
| 271 | 271 | global $wpdb, $plugin_prefix; |
| 272 | 272 | |
| 273 | 273 | if (!geodir_is_default_location_set()) { |
| 274 | - echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>'; |
|
| 274 | + echo '<div class="updated fade"><p><strong>'.sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>').'</strong></p></div>'; |
|
| 275 | 275 | } else { |
| 276 | 276 | |
| 277 | 277 | ?> |
| 278 | - <span class="gd-dummy-hint"><small><?php _e('*Hint*: Installing our Advanced Search addon FIRST will add extra search fields to non-default data types.','geodirectory');?></small></span> |
|
| 278 | + <span class="gd-dummy-hint"><small><?php _e('*Hint*: Installing our Advanced Search addon FIRST will add extra search fields to non-default data types.', 'geodirectory'); ?></small></span> |
|
| 279 | 279 | <table class="form-table gd-dummy-table"> |
| 280 | 280 | <tbody> |
| 281 | 281 | <tr> |
| 282 | - <td><strong><?php _e('CPT','geodirectory');?></strong></td> |
|
| 283 | - <td><strong><?php _e('Data Type','geodirectory');?></strong></td> |
|
| 284 | - <td><strong><?php _e('Action','geodirectory');?></strong></td> |
|
| 282 | + <td><strong><?php _e('CPT', 'geodirectory'); ?></strong></td> |
|
| 283 | + <td><strong><?php _e('Data Type', 'geodirectory'); ?></strong></td> |
|
| 284 | + <td><strong><?php _e('Action', 'geodirectory'); ?></strong></td> |
|
| 285 | 285 | </tr> |
| 286 | 286 | |
| 287 | 287 | <?php |
@@ -292,18 +292,18 @@ discard block |
||
| 292 | 292 | |
| 293 | 293 | $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename'); |
| 294 | 294 | |
| 295 | - foreach($cpts as $post_type=>$cpt){ |
|
| 295 | + foreach ($cpts as $post_type=>$cpt) { |
|
| 296 | 296 | |
| 297 | - $data_types_for = apply_filters('geodir_dummy_date_types_for',$data_types,$post_type); |
|
| 297 | + $data_types_for = apply_filters('geodir_dummy_date_types_for', $data_types, $post_type); |
|
| 298 | 298 | |
| 299 | 299 | |
| 300 | 300 | $set_dt = get_option($post_type.'_dummy_data_type'); |
| 301 | 301 | |
| 302 | 302 | $count = 30; |
| 303 | 303 | |
| 304 | - geodir_add_column_if_not_exist($plugin_prefix . $post_type. "_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'"); |
|
| 304 | + geodir_add_column_if_not_exist($plugin_prefix.$post_type."_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'"); |
|
| 305 | 305 | |
| 306 | - $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'"); |
|
| 306 | + $post_counts = $wpdb->get_var("SELECT count(post_id) FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'"); |
|
| 307 | 307 | |
| 308 | 308 | echo "<tr>"; |
| 309 | 309 | echo "<td><strong>".$cpt['labels']['name']."</strong></td>"; |
@@ -313,9 +313,9 @@ discard block |
||
| 313 | 313 | echo "<td>"; |
| 314 | 314 | echo "<select id='".$post_type."_data_type' onchange='geodir_dummy_set_count(this,\"$post_type\");' $select_disabled>"; |
| 315 | 315 | |
| 316 | - foreach($data_types_for as $key=>$val){ |
|
| 317 | - $selected = ($key==$set_dt) ? "selected='selected'" : ''; |
|
| 318 | - if($selected || count($data_types_for)==1){$count = $val['count'];} |
|
| 316 | + foreach ($data_types_for as $key=>$val) { |
|
| 317 | + $selected = ($key == $set_dt) ? "selected='selected'" : ''; |
|
| 318 | + if ($selected || count($data_types_for) == 1) {$count = $val['count']; } |
|
| 319 | 319 | echo "<option $selected value='$key' data-count='".$val['count']."'>".$val['name']."</option>"; |
| 320 | 320 | } |
| 321 | 321 | echo "</select>"; |
@@ -323,8 +323,8 @@ discard block |
||
| 323 | 323 | $select_display = $post_counts > 0 ? 'display:none;' : ''; |
| 324 | 324 | echo "<select id='".$post_type."_data_type_count' style='$select_display' >"; |
| 325 | 325 | $x = 1; |
| 326 | - while($x <= $count){ |
|
| 327 | - $selected = ($x==$count) ? "selected='selected'" : ''; |
|
| 326 | + while ($x <= $count) { |
|
| 327 | + $selected = ($x == $count) ? "selected='selected'" : ''; |
|
| 328 | 328 | echo "<option $selected value='$x'>".$x."</option>"; |
| 329 | 329 | $x++; |
| 330 | 330 | } |
@@ -335,10 +335,10 @@ discard block |
||
| 335 | 335 | |
| 336 | 336 | |
| 337 | 337 | |
| 338 | - if($post_counts > 0){ |
|
| 339 | - echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>'; |
|
| 340 | - }else{ |
|
| 341 | - echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>'; |
|
| 338 | + if ($post_counts > 0) { |
|
| 339 | + echo '<td><input type="button" value="'.__('Remove data', 'geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\''.$nonce.'\',\''.$post_type.'\'); return false;" ></td>'; |
|
| 340 | + } else { |
|
| 341 | + echo '<td><input type="button" value="'.__('Insert data', 'geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\''.$nonce.'\',\''.$post_type.'\'); return false;" ></td>'; |
|
| 342 | 342 | } |
| 343 | 343 | |
| 344 | 344 | echo "</tr>"; |
@@ -374,7 +374,7 @@ discard block |
||
| 374 | 374 | |
| 375 | 375 | } |
| 376 | 376 | |
| 377 | - var CITY_ADDRESS = '<?php echo addslashes( $city . ',' . $region . ',' . $country );?>'; |
|
| 377 | + var CITY_ADDRESS = '<?php echo addslashes($city.','.$region.','.$country); ?>'; |
|
| 378 | 378 | var bound_lat_lng; |
| 379 | 379 | var latlng = ['<?php echo $city_latitude; ?>', <?php echo $city_longitude; ?>]; |
| 380 | 380 | var lat = <?php echo $city_latitude; ?>; |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | return x.replace(" ", ''); |
| 408 | 408 | }); // remove spaces from lat/lon |
| 409 | 409 | } else { |
| 410 | - alert("<?php _e( 'Geocode was not successful for the following reason:', 'geodirectory' );?> " + status); |
|
| 410 | + alert("<?php _e('Geocode was not successful for the following reason:', 'geodirectory'); ?> " + status); |
|
| 411 | 411 | } |
| 412 | 412 | }); |
| 413 | 413 | } else if (window.gdMaps == 'osm') { |
@@ -431,7 +431,7 @@ discard block |
||
| 431 | 431 | var dummy_post_index = 1; |
| 432 | 432 | |
| 433 | 433 | function gdRemoveDummyData(obj, nonce, posttype){ |
| 434 | - if (confirm('<?php _e('Are you sure you want to delete dummy data?' , 'geodirectory'); ?>')) { |
|
| 434 | + if (confirm('<?php _e('Are you sure you want to delete dummy data?', 'geodirectory'); ?>')) { |
|
| 435 | 435 | jQuery(obj).prop('disabled', true); |
| 436 | 436 | jQuery('.gd-dummy-data-results-' + posttype).remove(); |
| 437 | 437 | jQuery('<tr class="gd-dummy-data-results gd-dummy-data-results-' + posttype + '" >'+ |
@@ -446,14 +446,14 @@ discard block |
||
| 446 | 446 | |
| 447 | 447 | jQuery('.gd_progressbar_'+posttype).progressbar({value: 0}); |
| 448 | 448 | |
| 449 | - gd_progressbar('.gd_progressbar_container_'+posttype, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Removing data...', 'geodirlocation'));?>'); |
|
| 449 | + gd_progressbar('.gd_progressbar_container_'+posttype, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Removing data...', 'geodirlocation')); ?>'); |
|
| 450 | 450 | |
| 451 | 451 | |
| 452 | 452 | jQuery.post('<?php echo geodir_get_ajax_url(); ?>&geodir_autofill=geodir_dummy_delete&posttype=' + posttype + '&_wpnonce=' + nonce, |
| 453 | 453 | function (data) { |
| 454 | - gd_progressbar('.gd_progressbar_container_'+posttype, 100, '<i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation'));?>'); |
|
| 454 | + gd_progressbar('.gd_progressbar_container_'+posttype, 100, '<i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation')); ?>'); |
|
| 455 | 455 | jQuery(obj).removeClass('gd-remove-data'); |
| 456 | - jQuery(obj).val('<?php _e('Insert data','geodirectory');?>'); |
|
| 456 | + jQuery(obj).val('<?php _e('Insert data', 'geodirectory'); ?>'); |
|
| 457 | 457 | jQuery(obj).prop('disabled', false); |
| 458 | 458 | jQuery('#'+posttype+'_data_type_count').show(); |
| 459 | 459 | jQuery('#'+posttype+'_data_type').prop('disabled', false); |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | |
| 497 | 497 | jQuery('.gd_progressbar_'+posttype).progressbar({value: 0}); |
| 498 | 498 | |
| 499 | - gd_progressbar('.gd_progressbar_container_'+posttype, 0, '0% (0 / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Creating categories and custom fields...', 'geodirlocation'));?>'); |
|
| 499 | + gd_progressbar('.gd_progressbar_container_'+posttype, 0, '0% (0 / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Creating categories and custom fields...', 'geodirlocation')); ?>'); |
|
| 500 | 500 | } |
| 501 | 501 | |
| 502 | 502 | if (!(typeof bound_lat_lng == 'object' && bound_lat_lng.length == 4)) { |
@@ -516,15 +516,15 @@ discard block |
||
| 516 | 516 | percentage = percentage > 100 ? 100 : percentage; |
| 517 | 517 | |
| 518 | 518 | |
| 519 | - gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Inserting data...', 'geodirlocation'));?>'); |
|
| 519 | + gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Inserting data...', 'geodirlocation')); ?>'); |
|
| 520 | 520 | |
| 521 | 521 | gdInstallDummyData(obj, nonce, posttype,insertedCount); |
| 522 | 522 | } |
| 523 | 523 | else { |
| 524 | 524 | percentage = 100; |
| 525 | - gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation'));?>'); |
|
| 525 | + gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation')); ?>'); |
|
| 526 | 526 | jQuery(obj).addClass('gd-remove-data'); |
| 527 | - jQuery(obj).val('<?php _e('Remove data','geodirectory');?>'); |
|
| 527 | + jQuery(obj).val('<?php _e('Remove data', 'geodirectory'); ?>'); |
|
| 528 | 528 | jQuery(obj).prop('disabled', false); |
| 529 | 529 | |
| 530 | 530 | } |
@@ -223,6 +223,9 @@ |
||
| 223 | 223 | * @param filter - the property to filter on |
| 224 | 224 | * @param limit - the number of items to get |
| 225 | 225 | * @param realtime - if the realtime api should be used |
| 226 | + * @param string $metric |
|
| 227 | + * @param string $startDate |
|
| 228 | + * @param string $endDate |
|
| 226 | 229 | * @return the specific metrics in array form |
| 227 | 230 | **/ |
| 228 | 231 | function getMetrics($metric, $startDate, $endDate, $dimensions = false, $sort = false, $filter = false, $limit = false, $realtime = false) |
@@ -30,135 +30,135 @@ discard block |
||
| 30 | 30 | // Include the Google Service API |
| 31 | 31 | include_once('google-api-php-client/src/Google/autoload.php'); |
| 32 | 32 | |
| 33 | - $this->client = new Google_Client(); |
|
| 34 | - $this->client->setApprovalPrompt("force"); |
|
| 35 | - $this->client->setAccessType('offline'); |
|
| 36 | - $this->client->setClientId(GEODIR_GA_CLIENTID); |
|
| 37 | - $this->client->setClientSecret(GEODIR_GA_CLIENTSECRET); |
|
| 38 | - $this->client->setRedirectUri(GEODIR_GA_REDIRECT); |
|
| 33 | + $this->client = new Google_Client(); |
|
| 34 | + $this->client->setApprovalPrompt("force"); |
|
| 35 | + $this->client->setAccessType('offline'); |
|
| 36 | + $this->client->setClientId(GEODIR_GA_CLIENTID); |
|
| 37 | + $this->client->setClientSecret(GEODIR_GA_CLIENTSECRET); |
|
| 38 | + $this->client->setRedirectUri(GEODIR_GA_REDIRECT); |
|
| 39 | 39 | |
| 40 | - $this->client->setScopes(array("https://www.googleapis.com/auth/analytics")); |
|
| 41 | - |
|
| 42 | - try { |
|
| 43 | - $this->analytics = new Google_Service_Analytics($this->client); |
|
| 44 | - } |
|
| 45 | - catch (Google_ServiceException $e) |
|
| 46 | - { |
|
| 47 | - print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage(); |
|
| 40 | + $this->client->setScopes(array("https://www.googleapis.com/auth/analytics")); |
|
| 41 | + |
|
| 42 | + try { |
|
| 43 | + $this->analytics = new Google_Service_Analytics($this->client); |
|
| 44 | + } |
|
| 45 | + catch (Google_ServiceException $e) |
|
| 46 | + { |
|
| 47 | + print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage(); |
|
| 48 | 48 | return false; |
| 49 | - } |
|
| 49 | + } |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | function checkLogin() |
| 53 | 53 | { |
| 54 | - $ga_google_authtoken = get_option('geodir_ga_auth_token'); |
|
| 54 | + $ga_google_authtoken = get_option('geodir_ga_auth_token'); |
|
| 55 | 55 | |
| 56 | - if (!empty($ga_google_authtoken)) |
|
| 57 | - { |
|
| 56 | + if (!empty($ga_google_authtoken)) |
|
| 57 | + { |
|
| 58 | 58 | try |
| 59 | - { |
|
| 60 | - $this->client->setAccessToken($ga_google_authtoken); |
|
| 59 | + { |
|
| 60 | + $this->client->setAccessToken($ga_google_authtoken); |
|
| 61 | 61 | } |
| 62 | 62 | catch( Google_AuthException $e ) |
| 63 | - { |
|
| 64 | - print '(cas:72) GeoDirectory was unable to authenticate you with |
|
| 63 | + { |
|
| 64 | + print '(cas:72) GeoDirectory was unable to authenticate you with |
|
| 65 | 65 | Google using the Auth Token you pasted into the input box on the previous step. <br><br> |
| 66 | 66 | This could mean either you pasted the token wrong, or the time/date on your server is wrong, |
| 67 | 67 | or an SSL issue preventing Google from Authenticating. <br><br> |
| 68 | 68 | <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage(); |
| 69 | 69 | |
| 70 | - return false; |
|
| 71 | - } |
|
| 72 | - } |
|
| 73 | - else |
|
| 74 | - { |
|
| 75 | - $authCode = get_option('geodir_ga_auth_code'); |
|
| 76 | - |
|
| 77 | - if (empty($authCode)) return false; |
|
| 78 | - |
|
| 79 | - try |
|
| 80 | - { |
|
| 81 | - $accessToken = $this->client->authenticate($authCode); |
|
| 82 | - } |
|
| 83 | - catch( Exception $e ) |
|
| 84 | - { |
|
| 85 | - print '(cas:72) GeoDirectory was unable to authenticate you with |
|
| 70 | + return false; |
|
| 71 | + } |
|
| 72 | + } |
|
| 73 | + else |
|
| 74 | + { |
|
| 75 | + $authCode = get_option('geodir_ga_auth_code'); |
|
| 76 | + |
|
| 77 | + if (empty($authCode)) return false; |
|
| 78 | + |
|
| 79 | + try |
|
| 80 | + { |
|
| 81 | + $accessToken = $this->client->authenticate($authCode); |
|
| 82 | + } |
|
| 83 | + catch( Exception $e ) |
|
| 84 | + { |
|
| 85 | + print '(cas:72) GeoDirectory was unable to authenticate you with |
|
| 86 | 86 | Google using the Auth Token you pasted into the input box on the previous step. <br><br> |
| 87 | 87 | This could mean either you pasted the token wrong, or the time/date on your server is wrong, |
| 88 | 88 | or an SSL issue preventing Google from Authenticating. <br><br> |
| 89 | 89 | <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage(); |
| 90 | 90 | |
| 91 | - return false; |
|
| 92 | - } |
|
| 93 | - |
|
| 94 | - if($accessToken) |
|
| 95 | - { |
|
| 96 | - $this->client->setAccessToken($accessToken); |
|
| 97 | - update_option('geodir_ga_auth_token', $accessToken); |
|
| 98 | - } |
|
| 99 | - else |
|
| 100 | - { |
|
| 101 | - return false; |
|
| 102 | - } |
|
| 103 | - } |
|
| 104 | - |
|
| 105 | - $this->token = $this->client->getAccessToken(); |
|
| 106 | - return true; |
|
| 91 | + return false; |
|
| 92 | + } |
|
| 93 | + |
|
| 94 | + if($accessToken) |
|
| 95 | + { |
|
| 96 | + $this->client->setAccessToken($accessToken); |
|
| 97 | + update_option('geodir_ga_auth_token', $accessToken); |
|
| 98 | + } |
|
| 99 | + else |
|
| 100 | + { |
|
| 101 | + return false; |
|
| 102 | + } |
|
| 103 | + } |
|
| 104 | + |
|
| 105 | + $this->token = $this->client->getAccessToken(); |
|
| 106 | + return true; |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | function deauthorize() |
| 110 | 110 | { |
| 111 | - update_option('geodir_ga_auth_code', ''); |
|
| 112 | - update_option('geodir_ga_auth_token', ''); |
|
| 111 | + update_option('geodir_ga_auth_code', ''); |
|
| 112 | + update_option('geodir_ga_auth_token', ''); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | function getSingleProfile() |
| 116 | 116 | { |
| 117 | - $webproperty_id = get_option('geodir_ga_account_id'); |
|
| 118 | - list($pre, $account_id, $post) = explode('-',$webproperty_id); |
|
| 119 | - |
|
| 120 | - if (empty($webproperty_id)) return false; |
|
| 121 | - |
|
| 122 | - try { |
|
| 123 | - $profiles = $this->analytics->management_profiles->listManagementProfiles($account_id, $webproperty_id); |
|
| 124 | - } |
|
| 125 | - catch (Google_ServiceException $e) |
|
| 126 | - { |
|
| 127 | - print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage(); |
|
| 128 | - return false; |
|
| 129 | - } |
|
| 130 | - |
|
| 131 | - $profile_id = $profiles->items[0]->id; |
|
| 132 | - if (empty($profile_id)) return false; |
|
| 133 | - |
|
| 134 | - $account_array = array(); |
|
| 135 | - array_push($account_array, array('id'=>$profile_id, 'ga:webPropertyId'=>$webproperty_id)); |
|
| 136 | - return $account_array; |
|
| 117 | + $webproperty_id = get_option('geodir_ga_account_id'); |
|
| 118 | + list($pre, $account_id, $post) = explode('-',$webproperty_id); |
|
| 119 | + |
|
| 120 | + if (empty($webproperty_id)) return false; |
|
| 121 | + |
|
| 122 | + try { |
|
| 123 | + $profiles = $this->analytics->management_profiles->listManagementProfiles($account_id, $webproperty_id); |
|
| 124 | + } |
|
| 125 | + catch (Google_ServiceException $e) |
|
| 126 | + { |
|
| 127 | + print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage(); |
|
| 128 | + return false; |
|
| 129 | + } |
|
| 130 | + |
|
| 131 | + $profile_id = $profiles->items[0]->id; |
|
| 132 | + if (empty($profile_id)) return false; |
|
| 133 | + |
|
| 134 | + $account_array = array(); |
|
| 135 | + array_push($account_array, array('id'=>$profile_id, 'ga:webPropertyId'=>$webproperty_id)); |
|
| 136 | + return $account_array; |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | - function getAllProfiles() |
|
| 140 | - { |
|
| 141 | - $profile_array = array(); |
|
| 139 | + function getAllProfiles() |
|
| 140 | + { |
|
| 141 | + $profile_array = array(); |
|
| 142 | 142 | |
| 143 | - try { |
|
| 144 | - $profiles = $this->analytics->management_webproperties->listManagementWebproperties('~all'); |
|
| 145 | - } |
|
| 146 | - catch (Google_ServiceException $e) |
|
| 147 | - { |
|
| 148 | - print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage(); |
|
| 149 | - } |
|
| 150 | - |
|
| 151 | - |
|
| 152 | - if( !empty( $profiles->items ) ) |
|
| 153 | - { |
|
| 154 | - foreach( $profiles->items as $profile ) |
|
| 155 | - { |
|
| 156 | - $profile_array[ $profile->id ] = str_replace('http://','',$profile->name ); |
|
| 157 | - } |
|
| 158 | - } |
|
| 159 | - |
|
| 160 | - return $profile_array; |
|
| 161 | - } |
|
| 143 | + try { |
|
| 144 | + $profiles = $this->analytics->management_webproperties->listManagementWebproperties('~all'); |
|
| 145 | + } |
|
| 146 | + catch (Google_ServiceException $e) |
|
| 147 | + { |
|
| 148 | + print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage(); |
|
| 149 | + } |
|
| 150 | + |
|
| 151 | + |
|
| 152 | + if( !empty( $profiles->items ) ) |
|
| 153 | + { |
|
| 154 | + foreach( $profiles->items as $profile ) |
|
| 155 | + { |
|
| 156 | + $profile_array[ $profile->id ] = str_replace('http://','',$profile->name ); |
|
| 157 | + } |
|
| 158 | + } |
|
| 159 | + |
|
| 160 | + return $profile_array; |
|
| 161 | + } |
|
| 162 | 162 | |
| 163 | 163 | function getAnalyticsAccounts() |
| 164 | 164 | { |
@@ -241,13 +241,13 @@ discard block |
||
| 241 | 241 | $params['max-results'] = $limit; |
| 242 | 242 | } |
| 243 | 243 | |
| 244 | - // Just incase, the ga: is still used in the account id, strip it out to prevent it breaking |
|
| 245 | - $filtered_id = str_replace( 'ga:', '', $this->accountId ); |
|
| 244 | + // Just incase, the ga: is still used in the account id, strip it out to prevent it breaking |
|
| 245 | + $filtered_id = str_replace( 'ga:', '', $this->accountId ); |
|
| 246 | 246 | |
| 247 | - if(!$filtered_id){ |
|
| 248 | - echo 'Error - Account ID is blank'; |
|
| 249 | - return false; |
|
| 250 | - } |
|
| 247 | + if(!$filtered_id){ |
|
| 248 | + echo 'Error - Account ID is blank'; |
|
| 249 | + return false; |
|
| 250 | + } |
|
| 251 | 251 | |
| 252 | 252 | if($realtime){ |
| 253 | 253 | return $analytics->data_realtime->get( |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | } |
| 45 | 45 | catch (Google_ServiceException $e) |
| 46 | 46 | { |
| 47 | - print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage(); |
|
| 47 | + print '(cas:48) There was an Analytics API service error '.$e->getCode().':'.$e->getMessage(); |
|
| 48 | 48 | return false; |
| 49 | 49 | } |
| 50 | 50 | } |
@@ -59,13 +59,13 @@ discard block |
||
| 59 | 59 | { |
| 60 | 60 | $this->client->setAccessToken($ga_google_authtoken); |
| 61 | 61 | } |
| 62 | - catch( Google_AuthException $e ) |
|
| 62 | + catch (Google_AuthException $e) |
|
| 63 | 63 | { |
| 64 | 64 | print '(cas:72) GeoDirectory was unable to authenticate you with |
| 65 | 65 | Google using the Auth Token you pasted into the input box on the previous step. <br><br> |
| 66 | 66 | This could mean either you pasted the token wrong, or the time/date on your server is wrong, |
| 67 | 67 | or an SSL issue preventing Google from Authenticating. <br><br> |
| 68 | - <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage(); |
|
| 68 | + <br><br><strong>Tech Info </strong> ' . $e->getCode().':'.$e->getMessage(); |
|
| 69 | 69 | |
| 70 | 70 | return false; |
| 71 | 71 | } |
@@ -80,18 +80,18 @@ discard block |
||
| 80 | 80 | { |
| 81 | 81 | $accessToken = $this->client->authenticate($authCode); |
| 82 | 82 | } |
| 83 | - catch( Exception $e ) |
|
| 83 | + catch (Exception $e) |
|
| 84 | 84 | { |
| 85 | 85 | print '(cas:72) GeoDirectory was unable to authenticate you with |
| 86 | 86 | Google using the Auth Token you pasted into the input box on the previous step. <br><br> |
| 87 | 87 | This could mean either you pasted the token wrong, or the time/date on your server is wrong, |
| 88 | 88 | or an SSL issue preventing Google from Authenticating. <br><br> |
| 89 | - <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage(); |
|
| 89 | + <br><br><strong>Tech Info </strong> ' . $e->getCode().':'.$e->getMessage(); |
|
| 90 | 90 | |
| 91 | 91 | return false; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - if($accessToken) |
|
| 94 | + if ($accessToken) |
|
| 95 | 95 | { |
| 96 | 96 | $this->client->setAccessToken($accessToken); |
| 97 | 97 | update_option('geodir_ga_auth_token', $accessToken); |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - $this->token = $this->client->getAccessToken(); |
|
| 105 | + $this->token = $this->client->getAccessToken(); |
|
| 106 | 106 | return true; |
| 107 | 107 | } |
| 108 | 108 | |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | function getSingleProfile() |
| 116 | 116 | { |
| 117 | 117 | $webproperty_id = get_option('geodir_ga_account_id'); |
| 118 | - list($pre, $account_id, $post) = explode('-',$webproperty_id); |
|
| 118 | + list($pre, $account_id, $post) = explode('-', $webproperty_id); |
|
| 119 | 119 | |
| 120 | 120 | if (empty($webproperty_id)) return false; |
| 121 | 121 | |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | } |
| 125 | 125 | catch (Google_ServiceException $e) |
| 126 | 126 | { |
| 127 | - print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage(); |
|
| 127 | + print 'There was an Analytics API service error '.$e->getCode().': '.$e->getMessage(); |
|
| 128 | 128 | return false; |
| 129 | 129 | } |
| 130 | 130 | |
@@ -145,15 +145,15 @@ discard block |
||
| 145 | 145 | } |
| 146 | 146 | catch (Google_ServiceException $e) |
| 147 | 147 | { |
| 148 | - print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage(); |
|
| 148 | + print 'There was an Analytics API service error '.$e->getCode().': '.$e->getMessage(); |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | |
| 152 | - if( !empty( $profiles->items ) ) |
|
| 152 | + if (!empty($profiles->items)) |
|
| 153 | 153 | { |
| 154 | - foreach( $profiles->items as $profile ) |
|
| 154 | + foreach ($profiles->items as $profile) |
|
| 155 | 155 | { |
| 156 | - $profile_array[ $profile->id ] = str_replace('http://','',$profile->name ); |
|
| 156 | + $profile_array[$profile->id] = str_replace('http://', '', $profile->name); |
|
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | |
@@ -242,20 +242,20 @@ discard block |
||
| 242 | 242 | } |
| 243 | 243 | |
| 244 | 244 | // Just incase, the ga: is still used in the account id, strip it out to prevent it breaking |
| 245 | - $filtered_id = str_replace( 'ga:', '', $this->accountId ); |
|
| 245 | + $filtered_id = str_replace('ga:', '', $this->accountId); |
|
| 246 | 246 | |
| 247 | - if(!$filtered_id){ |
|
| 247 | + if (!$filtered_id) { |
|
| 248 | 248 | echo 'Error - Account ID is blank'; |
| 249 | 249 | return false; |
| 250 | 250 | } |
| 251 | 251 | |
| 252 | - if($realtime){ |
|
| 252 | + if ($realtime) { |
|
| 253 | 253 | return $analytics->data_realtime->get( |
| 254 | 254 | 'ga:'.$filtered_id, |
| 255 | 255 | $metric, |
| 256 | 256 | $params |
| 257 | 257 | ); |
| 258 | - }else{ |
|
| 258 | + } else { |
|
| 259 | 259 | return $analytics->data_ga->get( |
| 260 | 260 | 'ga:'.$filtered_id, |
| 261 | 261 | $startDate, |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | **/ |
| 280 | 280 | function verifyStartDate($date) |
| 281 | 281 | { |
| 282 | - if ( strtotime($date) > strtotime('2005-01-01') ) |
|
| 282 | + if (strtotime($date) > strtotime('2005-01-01')) |
|
| 283 | 283 | return $date; |
| 284 | 284 | else |
| 285 | 285 | return '2005-01-01'; |
@@ -41,8 +41,7 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | try { |
| 43 | 43 | $this->analytics = new Google_Service_Analytics($this->client); |
| 44 | - } |
|
| 45 | - catch (Google_ServiceException $e) |
|
| 44 | + } catch (Google_ServiceException $e) |
|
| 46 | 45 | { |
| 47 | 46 | print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage(); |
| 48 | 47 | return false; |
@@ -58,8 +57,7 @@ discard block |
||
| 58 | 57 | try |
| 59 | 58 | { |
| 60 | 59 | $this->client->setAccessToken($ga_google_authtoken); |
| 61 | - } |
|
| 62 | - catch( Google_AuthException $e ) |
|
| 60 | + } catch( Google_AuthException $e ) |
|
| 63 | 61 | { |
| 64 | 62 | print '(cas:72) GeoDirectory was unable to authenticate you with |
| 65 | 63 | Google using the Auth Token you pasted into the input box on the previous step. <br><br> |
@@ -69,18 +67,18 @@ discard block |
||
| 69 | 67 | |
| 70 | 68 | return false; |
| 71 | 69 | } |
| 72 | - } |
|
| 73 | - else |
|
| 70 | + } else |
|
| 74 | 71 | { |
| 75 | 72 | $authCode = get_option('geodir_ga_auth_code'); |
| 76 | 73 | |
| 77 | - if (empty($authCode)) return false; |
|
| 74 | + if (empty($authCode)) { |
|
| 75 | + return false; |
|
| 76 | + } |
|
| 78 | 77 | |
| 79 | 78 | try |
| 80 | 79 | { |
| 81 | 80 | $accessToken = $this->client->authenticate($authCode); |
| 82 | - } |
|
| 83 | - catch( Exception $e ) |
|
| 81 | + } catch( Exception $e ) |
|
| 84 | 82 | { |
| 85 | 83 | print '(cas:72) GeoDirectory was unable to authenticate you with |
| 86 | 84 | Google using the Auth Token you pasted into the input box on the previous step. <br><br> |
@@ -95,8 +93,7 @@ discard block |
||
| 95 | 93 | { |
| 96 | 94 | $this->client->setAccessToken($accessToken); |
| 97 | 95 | update_option('geodir_ga_auth_token', $accessToken); |
| 98 | - } |
|
| 99 | - else |
|
| 96 | + } else |
|
| 100 | 97 | { |
| 101 | 98 | return false; |
| 102 | 99 | } |
@@ -117,19 +114,22 @@ discard block |
||
| 117 | 114 | $webproperty_id = get_option('geodir_ga_account_id'); |
| 118 | 115 | list($pre, $account_id, $post) = explode('-',$webproperty_id); |
| 119 | 116 | |
| 120 | - if (empty($webproperty_id)) return false; |
|
| 117 | + if (empty($webproperty_id)) { |
|
| 118 | + return false; |
|
| 119 | + } |
|
| 121 | 120 | |
| 122 | 121 | try { |
| 123 | 122 | $profiles = $this->analytics->management_profiles->listManagementProfiles($account_id, $webproperty_id); |
| 124 | - } |
|
| 125 | - catch (Google_ServiceException $e) |
|
| 123 | + } catch (Google_ServiceException $e) |
|
| 126 | 124 | { |
| 127 | 125 | print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage(); |
| 128 | 126 | return false; |
| 129 | 127 | } |
| 130 | 128 | |
| 131 | 129 | $profile_id = $profiles->items[0]->id; |
| 132 | - if (empty($profile_id)) return false; |
|
| 130 | + if (empty($profile_id)) { |
|
| 131 | + return false; |
|
| 132 | + } |
|
| 133 | 133 | |
| 134 | 134 | $account_array = array(); |
| 135 | 135 | array_push($account_array, array('id'=>$profile_id, 'ga:webPropertyId'=>$webproperty_id)); |
@@ -142,8 +142,7 @@ discard block |
||
| 142 | 142 | |
| 143 | 143 | try { |
| 144 | 144 | $profiles = $this->analytics->management_webproperties->listManagementWebproperties('~all'); |
| 145 | - } |
|
| 146 | - catch (Google_ServiceException $e) |
|
| 145 | + } catch (Google_ServiceException $e) |
|
| 147 | 146 | { |
| 148 | 147 | print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage(); |
| 149 | 148 | } |
@@ -255,7 +254,7 @@ discard block |
||
| 255 | 254 | $metric, |
| 256 | 255 | $params |
| 257 | 256 | ); |
| 258 | - }else{ |
|
| 257 | + } else{ |
|
| 259 | 258 | return $analytics->data_ga->get( |
| 260 | 259 | 'ga:'.$filtered_id, |
| 261 | 260 | $startDate, |
@@ -279,10 +278,11 @@ discard block |
||
| 279 | 278 | **/ |
| 280 | 279 | function verifyStartDate($date) |
| 281 | 280 | { |
| 282 | - if ( strtotime($date) > strtotime('2005-01-01') ) |
|
| 283 | - return $date; |
|
| 284 | - else |
|
| 285 | - return '2005-01-01'; |
|
| 281 | + if ( strtotime($date) > strtotime('2005-01-01') ) { |
|
| 282 | + return $date; |
|
| 283 | + } else { |
|
| 284 | + return '2005-01-01'; |
|
| 285 | + } |
|
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | } // END class |
| 289 | 289 | \ No newline at end of file |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | * @param string $page Page url to use in analytics filters. |
| 56 | 56 | * @param bool $ga_start The start date of the data to include in YYYY-MM-DD format. |
| 57 | 57 | * @param bool $ga_end The end date of the data to include in YYYY-MM-DD format. |
| 58 | - * @return string Html text content. |
|
| 58 | + * @return false|null Html text content. |
|
| 59 | 59 | */ |
| 60 | 60 | function geodir_getGoogleAnalytics($page, $ga_start, $ga_end) |
| 61 | 61 | {
|
@@ -17,34 +17,34 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | function geodir_sec2hms($sec, $padHours = false) |
| 19 | 19 | {
|
| 20 | - // holds formatted string |
|
| 21 | - $hms = ""; |
|
| 22 | - // there are 3600 seconds in an hour, so if we |
|
| 23 | - // divide total seconds by 3600 and throw away |
|
| 24 | - // the remainder, we've got the number of hours |
|
| 25 | - $hours = intval(intval($sec) / 3600); |
|
| 26 | - |
|
| 27 | - // add to $hms, with a leading 0 if asked for |
|
| 28 | - $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':'; |
|
| 29 | - |
|
| 30 | - // dividing the total seconds by 60 will give us |
|
| 31 | - // the number of minutes, but we're interested in |
|
| 32 | - // minutes past the hour: to get that, we need to |
|
| 33 | - // divide by 60 again and keep the remainder |
|
| 34 | - $minutes = intval(($sec / 60) % 60); |
|
| 35 | - |
|
| 36 | - // then add to $hms (with a leading 0 if needed) |
|
| 37 | - $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':'; |
|
| 38 | - |
|
| 39 | - // seconds are simple - just divide the total |
|
| 40 | - // seconds by 60 and keep the remainder |
|
| 41 | - $seconds = intval($sec % 60); |
|
| 42 | - |
|
| 43 | - // add to $hms, again with a leading 0 if needed |
|
| 44 | - $hms .= str_pad($seconds, 2, "0", STR_PAD_LEFT); |
|
| 45 | - |
|
| 46 | - // done! |
|
| 47 | - return $hms; |
|
| 20 | + // holds formatted string |
|
| 21 | + $hms = ""; |
|
| 22 | + // there are 3600 seconds in an hour, so if we |
|
| 23 | + // divide total seconds by 3600 and throw away |
|
| 24 | + // the remainder, we've got the number of hours |
|
| 25 | + $hours = intval(intval($sec) / 3600); |
|
| 26 | + |
|
| 27 | + // add to $hms, with a leading 0 if asked for |
|
| 28 | + $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':'; |
|
| 29 | + |
|
| 30 | + // dividing the total seconds by 60 will give us |
|
| 31 | + // the number of minutes, but we're interested in |
|
| 32 | + // minutes past the hour: to get that, we need to |
|
| 33 | + // divide by 60 again and keep the remainder |
|
| 34 | + $minutes = intval(($sec / 60) % 60); |
|
| 35 | + |
|
| 36 | + // then add to $hms (with a leading 0 if needed) |
|
| 37 | + $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':'; |
|
| 38 | + |
|
| 39 | + // seconds are simple - just divide the total |
|
| 40 | + // seconds by 60 and keep the remainder |
|
| 41 | + $seconds = intval($sec % 60); |
|
| 42 | + |
|
| 43 | + // add to $hms, again with a leading 0 if needed |
|
| 44 | + $hms .= str_pad($seconds, 2, "0", STR_PAD_LEFT); |
|
| 45 | + |
|
| 46 | + // done! |
|
| 47 | + return $hms; |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -60,122 +60,122 @@ discard block |
||
| 60 | 60 | function geodir_getGoogleAnalytics($page, $ga_start, $ga_end) |
| 61 | 61 | {
|
| 62 | 62 | |
| 63 | - // NEW ANALYTICS |
|
| 64 | - |
|
| 65 | - $start_date = ''; |
|
| 66 | - $end_date = ''; |
|
| 67 | - $dimensions = ''; |
|
| 68 | - $sort = ''; |
|
| 69 | - $filters = "ga:pagePath==".$page; |
|
| 70 | - $metrics = "ga:pageviews"; |
|
| 71 | - $realtime = false; |
|
| 72 | - $limit = false; |
|
| 73 | - if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){
|
|
| 74 | - $start_date = date('Y-m-d', strtotime("-6 day"));
|
|
| 75 | - $end_date = date('Y-m-d');
|
|
| 76 | - $dimensions = "ga:date,ga:nthDay"; |
|
| 77 | - }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
|
|
| 78 | - $start_date = date('Y-m-d', strtotime("-13 day"));
|
|
| 79 | - $end_date = date('Y-m-d', strtotime("-7 day"));
|
|
| 80 | - $dimensions = "ga:date,ga:nthDay"; |
|
| 81 | - } |
|
| 82 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
|
|
| 83 | - $start_date = date('Y')."-01-01";
|
|
| 84 | - $end_date = date('Y-m-d');
|
|
| 85 | - $dimensions = "ga:month,ga:nthMonth"; |
|
| 86 | - } |
|
| 87 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
|
|
| 88 | - $start_date = date('Y', strtotime("-1 year"))."-01-01";
|
|
| 89 | - $end_date = date('Y', strtotime("-1 year"))."-12-31";
|
|
| 90 | - $dimensions = "ga:month,ga:nthMonth"; |
|
| 91 | - } |
|
| 92 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
|
|
| 93 | - $start_date = "14daysAgo"; |
|
| 94 | - $end_date = "yesterday"; |
|
| 95 | - $dimensions = "ga:country"; |
|
| 96 | - $sort = "ga:pageviews"; |
|
| 97 | - $limit = 5; |
|
| 98 | - }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
|
|
| 99 | - $metrics = "rt:activeUsers"; |
|
| 100 | - $realtime = true; |
|
| 101 | - } |
|
| 102 | - |
|
| 103 | - # Create a new Gdata call |
|
| 104 | - $gaApi = new GDGoogleAnalyticsStats(); |
|
| 105 | - |
|
| 106 | - # Check if Google sucessfully logged in |
|
| 107 | - if (!$gaApi->checkLogin()){
|
|
| 108 | - echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
|
|
| 109 | - return false; |
|
| 110 | - } |
|
| 111 | - |
|
| 112 | - $account = $gaApi->getSingleProfile(); |
|
| 113 | - |
|
| 114 | - if(!isset($account[0]['id'])){
|
|
| 115 | - echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
|
|
| 116 | - return false; |
|
| 117 | - } |
|
| 118 | - |
|
| 119 | - $account = $account[0]['id']; |
|
| 120 | - |
|
| 121 | - # Set the account to the one requested |
|
| 122 | - $gaApi->setAccount($account); |
|
| 123 | - |
|
| 124 | - |
|
| 125 | - |
|
| 126 | - # Get the metrics needed to build the visits graph; |
|
| 127 | - try {
|
|
| 128 | - $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime); |
|
| 129 | - } |
|
| 130 | - catch (Exception $e) {
|
|
| 131 | - print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage(); |
|
| 132 | - } |
|
| 133 | - |
|
| 134 | - |
|
| 135 | - //print_r($stats); |
|
| 136 | - echo json_encode($stats); |
|
| 137 | - exit; |
|
| 63 | + // NEW ANALYTICS |
|
| 64 | + |
|
| 65 | + $start_date = ''; |
|
| 66 | + $end_date = ''; |
|
| 67 | + $dimensions = ''; |
|
| 68 | + $sort = ''; |
|
| 69 | + $filters = "ga:pagePath==".$page; |
|
| 70 | + $metrics = "ga:pageviews"; |
|
| 71 | + $realtime = false; |
|
| 72 | + $limit = false; |
|
| 73 | + if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){
|
|
| 74 | + $start_date = date('Y-m-d', strtotime("-6 day"));
|
|
| 75 | + $end_date = date('Y-m-d');
|
|
| 76 | + $dimensions = "ga:date,ga:nthDay"; |
|
| 77 | + }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
|
|
| 78 | + $start_date = date('Y-m-d', strtotime("-13 day"));
|
|
| 79 | + $end_date = date('Y-m-d', strtotime("-7 day"));
|
|
| 80 | + $dimensions = "ga:date,ga:nthDay"; |
|
| 81 | + } |
|
| 82 | + elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
|
|
| 83 | + $start_date = date('Y')."-01-01";
|
|
| 84 | + $end_date = date('Y-m-d');
|
|
| 85 | + $dimensions = "ga:month,ga:nthMonth"; |
|
| 86 | + } |
|
| 87 | + elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
|
|
| 88 | + $start_date = date('Y', strtotime("-1 year"))."-01-01";
|
|
| 89 | + $end_date = date('Y', strtotime("-1 year"))."-12-31";
|
|
| 90 | + $dimensions = "ga:month,ga:nthMonth"; |
|
| 91 | + } |
|
| 92 | + elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
|
|
| 93 | + $start_date = "14daysAgo"; |
|
| 94 | + $end_date = "yesterday"; |
|
| 95 | + $dimensions = "ga:country"; |
|
| 96 | + $sort = "ga:pageviews"; |
|
| 97 | + $limit = 5; |
|
| 98 | + }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
|
|
| 99 | + $metrics = "rt:activeUsers"; |
|
| 100 | + $realtime = true; |
|
| 101 | + } |
|
| 102 | + |
|
| 103 | + # Create a new Gdata call |
|
| 104 | + $gaApi = new GDGoogleAnalyticsStats(); |
|
| 105 | + |
|
| 106 | + # Check if Google sucessfully logged in |
|
| 107 | + if (!$gaApi->checkLogin()){
|
|
| 108 | + echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
|
|
| 109 | + return false; |
|
| 110 | + } |
|
| 111 | + |
|
| 112 | + $account = $gaApi->getSingleProfile(); |
|
| 113 | + |
|
| 114 | + if(!isset($account[0]['id'])){
|
|
| 115 | + echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
|
|
| 116 | + return false; |
|
| 117 | + } |
|
| 118 | + |
|
| 119 | + $account = $account[0]['id']; |
|
| 120 | + |
|
| 121 | + # Set the account to the one requested |
|
| 122 | + $gaApi->setAccount($account); |
|
| 123 | + |
|
| 124 | + |
|
| 125 | + |
|
| 126 | + # Get the metrics needed to build the visits graph; |
|
| 127 | + try {
|
|
| 128 | + $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime); |
|
| 129 | + } |
|
| 130 | + catch (Exception $e) {
|
|
| 131 | + print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage(); |
|
| 132 | + } |
|
| 133 | + |
|
| 134 | + |
|
| 135 | + //print_r($stats); |
|
| 136 | + echo json_encode($stats); |
|
| 137 | + exit; |
|
| 138 | 138 | |
| 139 | 139 | |
| 140 | 140 | }// end GA function |
| 141 | 141 | |
| 142 | 142 | |
| 143 | 143 | function geodir_ga_get_token(){
|
| 144 | - $at = get_option('gd_ga_access_token');
|
|
| 145 | - $use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at; |
|
| 146 | - $response = wp_remote_get($use_url,array('timeout' => 15));
|
|
| 144 | + $at = get_option('gd_ga_access_token');
|
|
| 145 | + $use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at; |
|
| 146 | + $response = wp_remote_get($use_url,array('timeout' => 15));
|
|
| 147 | 147 | |
| 148 | - if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid
|
|
| 148 | + if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid
|
|
| 149 | 149 | |
| 150 | - return $at; |
|
| 151 | - }else{//else get new access token
|
|
| 150 | + return $at; |
|
| 151 | + }else{//else get new access token
|
|
| 152 | 152 | |
| 153 | - $refresh_at = get_option('gd_ga_refresh_token');
|
|
| 154 | - if(!$refresh_at){
|
|
| 155 | - echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;
|
|
| 156 | - } |
|
| 153 | + $refresh_at = get_option('gd_ga_refresh_token');
|
|
| 154 | + if(!$refresh_at){
|
|
| 155 | + echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;
|
|
| 156 | + } |
|
| 157 | 157 | |
| 158 | - $rat_url = "https://www.googleapis.com/oauth2/v3/token?"; |
|
| 159 | - $client_id = "client_id=".get_option('geodir_ga_client_id');
|
|
| 160 | - $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
|
|
| 161 | - $refresh_token = "&refresh_token=".$refresh_at; |
|
| 162 | - $grant_type = "&grant_type=refresh_token"; |
|
| 158 | + $rat_url = "https://www.googleapis.com/oauth2/v3/token?"; |
|
| 159 | + $client_id = "client_id=".get_option('geodir_ga_client_id');
|
|
| 160 | + $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
|
|
| 161 | + $refresh_token = "&refresh_token=".$refresh_at; |
|
| 162 | + $grant_type = "&grant_type=refresh_token"; |
|
| 163 | 163 | |
| 164 | - $rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type; |
|
| 164 | + $rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type; |
|
| 165 | 165 | |
| 166 | - $rat_response = wp_remote_post($rat_url_use,array('timeout' => 15));
|
|
| 167 | - if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {
|
|
| 168 | - $parts = json_decode($rat_response['body']); |
|
| 166 | + $rat_response = wp_remote_post($rat_url_use,array('timeout' => 15));
|
|
| 167 | + if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {
|
|
| 168 | + $parts = json_decode($rat_response['body']); |
|
| 169 | 169 | |
| 170 | 170 | |
| 171 | - update_option('gd_ga_access_token', $parts->access_token);
|
|
| 172 | - return $parts->access_token; |
|
| 171 | + update_option('gd_ga_access_token', $parts->access_token);
|
|
| 172 | + return $parts->access_token; |
|
| 173 | 173 | |
| 174 | - }else{
|
|
| 175 | - echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;
|
|
| 176 | - } |
|
| 174 | + }else{
|
|
| 175 | + echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;
|
|
| 176 | + } |
|
| 177 | 177 | |
| 178 | 178 | |
| 179 | - } |
|
| 179 | + } |
|
| 180 | 180 | |
| 181 | 181 | } |
| 182 | 182 | \ No newline at end of file |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $hours = intval(intval($sec) / 3600); |
| 26 | 26 | |
| 27 | 27 | // add to $hms, with a leading 0 if asked for |
| 28 | - $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':'; |
|
| 28 | + $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT).':' : $hours.':'; |
|
| 29 | 29 | |
| 30 | 30 | // dividing the total seconds by 60 will give us |
| 31 | 31 | // the number of minutes, but we're interested in |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | $minutes = intval(($sec / 60) % 60); |
| 35 | 35 | |
| 36 | 36 | // then add to $hms (with a leading 0 if needed) |
| 37 | - $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':'; |
|
| 37 | + $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT).':'; |
|
| 38 | 38 | |
| 39 | 39 | // seconds are simple - just divide the total |
| 40 | 40 | // seconds by 60 and keep the remainder |
@@ -70,32 +70,32 @@ discard block |
||
| 70 | 70 | $metrics = "ga:pageviews"; |
| 71 | 71 | $realtime = false; |
| 72 | 72 | $limit = false; |
| 73 | - if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){
|
|
| 73 | + if (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'thisweek') {
|
|
| 74 | 74 | $start_date = date('Y-m-d', strtotime("-6 day"));
|
| 75 | 75 | $end_date = date('Y-m-d');
|
| 76 | 76 | $dimensions = "ga:date,ga:nthDay"; |
| 77 | - }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
|
|
| 77 | + }elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'lastweek') {
|
|
| 78 | 78 | $start_date = date('Y-m-d', strtotime("-13 day"));
|
| 79 | 79 | $end_date = date('Y-m-d', strtotime("-7 day"));
|
| 80 | 80 | $dimensions = "ga:date,ga:nthDay"; |
| 81 | 81 | } |
| 82 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
|
|
| 82 | + elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'thisyear') {
|
|
| 83 | 83 | $start_date = date('Y')."-01-01";
|
| 84 | 84 | $end_date = date('Y-m-d');
|
| 85 | 85 | $dimensions = "ga:month,ga:nthMonth"; |
| 86 | 86 | } |
| 87 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
|
|
| 87 | + elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'lastyear') {
|
|
| 88 | 88 | $start_date = date('Y', strtotime("-1 year"))."-01-01";
|
| 89 | 89 | $end_date = date('Y', strtotime("-1 year"))."-12-31";
|
| 90 | 90 | $dimensions = "ga:month,ga:nthMonth"; |
| 91 | 91 | } |
| 92 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
|
|
| 92 | + elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'country') {
|
|
| 93 | 93 | $start_date = "14daysAgo"; |
| 94 | 94 | $end_date = "yesterday"; |
| 95 | 95 | $dimensions = "ga:country"; |
| 96 | 96 | $sort = "ga:pageviews"; |
| 97 | - $limit = 5; |
|
| 98 | - }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
|
|
| 97 | + $limit = 5; |
|
| 98 | + }elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'realtime') {
|
|
| 99 | 99 | $metrics = "rt:activeUsers"; |
| 100 | 100 | $realtime = true; |
| 101 | 101 | } |
@@ -104,15 +104,15 @@ discard block |
||
| 104 | 104 | $gaApi = new GDGoogleAnalyticsStats(); |
| 105 | 105 | |
| 106 | 106 | # Check if Google sucessfully logged in |
| 107 | - if (!$gaApi->checkLogin()){
|
|
| 108 | - echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
|
|
| 107 | + if (!$gaApi->checkLogin()) {
|
|
| 108 | + echo json_encode(array('error'=>__('Please check Google Analytics Settings', 'geodirectory')));
|
|
| 109 | 109 | return false; |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | $account = $gaApi->getSingleProfile(); |
| 113 | 113 | |
| 114 | - if(!isset($account[0]['id'])){
|
|
| 115 | - echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
|
|
| 114 | + if (!isset($account[0]['id'])) {
|
|
| 115 | + echo json_encode(array('error'=>__('Please check Google Analytics Settings', 'geodirectory')));
|
|
| 116 | 116 | return false; |
| 117 | 117 | } |
| 118 | 118 | |
@@ -125,10 +125,10 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | # Get the metrics needed to build the visits graph; |
| 127 | 127 | try {
|
| 128 | - $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime); |
|
| 128 | + $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit, $realtime); |
|
| 129 | 129 | } |
| 130 | 130 | catch (Exception $e) {
|
| 131 | - print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage(); |
|
| 131 | + print 'GA Summary Widget - there was a service error '.$e->getCode().':'.$e->getMessage(); |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | |
@@ -140,19 +140,19 @@ discard block |
||
| 140 | 140 | }// end GA function |
| 141 | 141 | |
| 142 | 142 | |
| 143 | -function geodir_ga_get_token(){
|
|
| 143 | +function geodir_ga_get_token() {
|
|
| 144 | 144 | $at = get_option('gd_ga_access_token');
|
| 145 | 145 | $use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at; |
| 146 | - $response = wp_remote_get($use_url,array('timeout' => 15));
|
|
| 146 | + $response = wp_remote_get($use_url, array('timeout' => 15));
|
|
| 147 | 147 | |
| 148 | - if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid
|
|
| 148 | + if (!empty($response['response']['code']) && $response['response']['code'] == 200) {//access token is valid
|
|
| 149 | 149 | |
| 150 | 150 | return $at; |
| 151 | - }else{//else get new access token
|
|
| 151 | + } else {//else get new access token
|
|
| 152 | 152 | |
| 153 | 153 | $refresh_at = get_option('gd_ga_refresh_token');
|
| 154 | - if(!$refresh_at){
|
|
| 155 | - echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;
|
|
| 154 | + if (!$refresh_at) {
|
|
| 155 | + echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory'))); exit;
|
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | $rat_url = "https://www.googleapis.com/oauth2/v3/token?"; |
@@ -163,16 +163,16 @@ discard block |
||
| 163 | 163 | |
| 164 | 164 | $rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type; |
| 165 | 165 | |
| 166 | - $rat_response = wp_remote_post($rat_url_use,array('timeout' => 15));
|
|
| 167 | - if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {
|
|
| 166 | + $rat_response = wp_remote_post($rat_url_use, array('timeout' => 15));
|
|
| 167 | + if (!empty($rat_response['response']['code']) && $rat_response['response']['code'] == 200) {
|
|
| 168 | 168 | $parts = json_decode($rat_response['body']); |
| 169 | 169 | |
| 170 | 170 | |
| 171 | 171 | update_option('gd_ga_access_token', $parts->access_token);
|
| 172 | 172 | return $parts->access_token; |
| 173 | 173 | |
| 174 | - }else{
|
|
| 175 | - echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;
|
|
| 174 | + } else {
|
|
| 175 | + echo json_encode(array('error'=>__('Login failed', 'geodirectory'))); exit;
|
|
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | |
@@ -74,28 +74,25 @@ discard block |
||
| 74 | 74 | $start_date = date('Y-m-d', strtotime("-6 day"));
|
| 75 | 75 | $end_date = date('Y-m-d');
|
| 76 | 76 | $dimensions = "ga:date,ga:nthDay"; |
| 77 | - }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
|
|
| 77 | + } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
|
|
| 78 | 78 | $start_date = date('Y-m-d', strtotime("-13 day"));
|
| 79 | 79 | $end_date = date('Y-m-d', strtotime("-7 day"));
|
| 80 | 80 | $dimensions = "ga:date,ga:nthDay"; |
| 81 | - } |
|
| 82 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
|
|
| 81 | + } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
|
|
| 83 | 82 | $start_date = date('Y')."-01-01";
|
| 84 | 83 | $end_date = date('Y-m-d');
|
| 85 | 84 | $dimensions = "ga:month,ga:nthMonth"; |
| 86 | - } |
|
| 87 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
|
|
| 85 | + } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
|
|
| 88 | 86 | $start_date = date('Y', strtotime("-1 year"))."-01-01";
|
| 89 | 87 | $end_date = date('Y', strtotime("-1 year"))."-12-31";
|
| 90 | 88 | $dimensions = "ga:month,ga:nthMonth"; |
| 91 | - } |
|
| 92 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
|
|
| 89 | + } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
|
|
| 93 | 90 | $start_date = "14daysAgo"; |
| 94 | 91 | $end_date = "yesterday"; |
| 95 | 92 | $dimensions = "ga:country"; |
| 96 | 93 | $sort = "ga:pageviews"; |
| 97 | 94 | $limit = 5; |
| 98 | - }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
|
|
| 95 | + } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
|
|
| 99 | 96 | $metrics = "rt:activeUsers"; |
| 100 | 97 | $realtime = true; |
| 101 | 98 | } |
@@ -126,8 +123,7 @@ discard block |
||
| 126 | 123 | # Get the metrics needed to build the visits graph; |
| 127 | 124 | try {
|
| 128 | 125 | $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime); |
| 129 | - } |
|
| 130 | - catch (Exception $e) {
|
|
| 126 | + } catch (Exception $e) {
|
|
| 131 | 127 | print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage(); |
| 132 | 128 | } |
| 133 | 129 | |
@@ -148,7 +144,7 @@ discard block |
||
| 148 | 144 | if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid
|
| 149 | 145 | |
| 150 | 146 | return $at; |
| 151 | - }else{//else get new access token
|
|
| 147 | + } else{//else get new access token
|
|
| 152 | 148 | |
| 153 | 149 | $refresh_at = get_option('gd_ga_refresh_token');
|
| 154 | 150 | if(!$refresh_at){
|
@@ -171,7 +167,7 @@ discard block |
||
| 171 | 167 | update_option('gd_ga_access_token', $parts->access_token);
|
| 172 | 168 | return $parts->access_token; |
| 173 | 169 | |
| 174 | - }else{
|
|
| 170 | + } else{
|
|
| 175 | 171 | echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;
|
| 176 | 172 | } |
| 177 | 173 | |
@@ -31,30 +31,30 @@ discard block |
||
| 31 | 31 | * CHECK FOR OLD COMPATIBILITY PACKS AND DISABLE IF THEY ARE ACTIVE |
| 32 | 32 | */ |
| 33 | 33 | if (is_admin()) {
|
| 34 | - /** |
|
| 35 | - * Include WordPress core file so we can use core functions to check for active plugins. |
|
| 36 | - */ |
|
| 37 | - include_once(ABSPATH . 'wp-admin/includes/plugin.php'); |
|
| 34 | + /** |
|
| 35 | + * Include WordPress core file so we can use core functions to check for active plugins. |
|
| 36 | + */ |
|
| 37 | + include_once(ABSPATH . 'wp-admin/includes/plugin.php'); |
|
| 38 | 38 | |
| 39 | - if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {
|
|
| 40 | - deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');
|
|
| 41 | - } |
|
| 39 | + if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {
|
|
| 40 | + deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');
|
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {
|
|
| 44 | - deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');
|
|
| 45 | - } |
|
| 43 | + if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {
|
|
| 44 | + deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');
|
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {
|
|
| 48 | - deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');
|
|
| 49 | - } |
|
| 47 | + if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {
|
|
| 48 | + deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');
|
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {
|
|
| 52 | - deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');
|
|
| 53 | - } |
|
| 51 | + if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {
|
|
| 52 | + deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');
|
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {
|
|
| 56 | - deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');
|
|
| 57 | - } |
|
| 55 | + if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {
|
|
| 56 | + deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');
|
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | 59 | } |
| 60 | 60 | |
@@ -130,19 +130,19 @@ discard block |
||
| 130 | 130 | * @package GeoDirectory |
| 131 | 131 | */ |
| 132 | 132 | function geodir_error_log($log){
|
| 133 | - /* |
|
| 133 | + /* |
|
| 134 | 134 | * A filter to override the WP_DEBUG setting for function geodir_error_log(). |
| 135 | 135 | * |
| 136 | 136 | * @since 1.5.7 |
| 137 | 137 | */ |
| 138 | - $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG); |
|
| 139 | - if ( true === $should_log ) {
|
|
| 140 | - if ( is_array( $log ) || is_object( $log ) ) {
|
|
| 141 | - error_log( print_r( $log, true ) ); |
|
| 142 | - } else {
|
|
| 143 | - error_log( $log ); |
|
| 144 | - } |
|
| 145 | - } |
|
| 138 | + $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG); |
|
| 139 | + if ( true === $should_log ) {
|
|
| 140 | + if ( is_array( $log ) || is_object( $log ) ) {
|
|
| 141 | + error_log( print_r( $log, true ) ); |
|
| 142 | + } else {
|
|
| 143 | + error_log( $log ); |
|
| 144 | + } |
|
| 145 | + } |
|
| 146 | 146 | } |
| 147 | 147 | /** |
| 148 | 148 | * Include all plugin functions. |
@@ -181,72 +181,72 @@ discard block |
||
| 181 | 181 | */ |
| 182 | 182 | if (is_admin() || defined( 'GD_TESTING_MODE' )) {
|
| 183 | 183 | |
| 184 | - /** |
|
| 185 | - * Include functions used in admin area only. |
|
| 186 | - * |
|
| 187 | - * @since 1.0.0 |
|
| 188 | - */ |
|
| 189 | - require_once('geodirectory-admin/admin_functions.php');
|
|
| 190 | - /** |
|
| 191 | - * Most actions/hooks used in admin area only are called from here. |
|
| 192 | - * |
|
| 193 | - * @since 1.6.11 |
|
| 194 | - */ |
|
| 195 | - require_once('geodirectory-admin/admin_dummy_data_functions.php');
|
|
| 196 | - /** |
|
| 197 | - * Most actions/hooks used in admin area only are called from here. |
|
| 198 | - * |
|
| 199 | - * @since 1.0.0 |
|
| 200 | - */ |
|
| 201 | - require_once('geodirectory-admin/admin_hooks_actions.php');
|
|
| 202 | - /** |
|
| 203 | - * Most admin JS and CSS is called from here. |
|
| 204 | - * |
|
| 205 | - * @since 1.0.0 |
|
| 206 | - */ |
|
| 207 | - require_once('geodirectory-admin/admin_template_tags.php');
|
|
| 208 | - /** |
|
| 209 | - * Include Google Analytics Class. |
|
| 210 | - * |
|
| 211 | - * @since 1.6.11 |
|
| 212 | - */ |
|
| 213 | - require_once('geodirectory-admin/class.analytics.stats.php');
|
|
| 214 | - /** |
|
| 215 | - * Include any functions needed for upgrades. |
|
| 216 | - * |
|
| 217 | - * @since 1.0.0 |
|
| 218 | - */ |
|
| 219 | - require_once(geodir_plugin_path() . '/upgrade.php'); |
|
| 220 | - if (get_option('geodir_installed') != 1) {
|
|
| 221 | - /** |
|
| 222 | - * Define language constants, here as they are not loaded yet. |
|
| 223 | - * |
|
| 224 | - * @since 1.0.0 |
|
| 225 | - */ |
|
| 226 | - require_once(geodir_plugin_path() . '/language.php'); |
|
| 227 | - /** |
|
| 228 | - * Include the plugin install file that sets up the databases and any options on first run. |
|
| 229 | - * |
|
| 230 | - * @since 1.0.0 |
|
| 231 | - */ |
|
| 232 | - require_once('geodirectory-admin/admin_install.php');
|
|
| 233 | - register_activation_hook(__FILE__, 'geodir_activation'); |
|
| 234 | - } |
|
| 235 | - register_deactivation_hook(__FILE__, 'geodir_deactivation'); |
|
| 236 | - |
|
| 237 | - /* |
|
| 184 | + /** |
|
| 185 | + * Include functions used in admin area only. |
|
| 186 | + * |
|
| 187 | + * @since 1.0.0 |
|
| 188 | + */ |
|
| 189 | + require_once('geodirectory-admin/admin_functions.php');
|
|
| 190 | + /** |
|
| 191 | + * Most actions/hooks used in admin area only are called from here. |
|
| 192 | + * |
|
| 193 | + * @since 1.6.11 |
|
| 194 | + */ |
|
| 195 | + require_once('geodirectory-admin/admin_dummy_data_functions.php');
|
|
| 196 | + /** |
|
| 197 | + * Most actions/hooks used in admin area only are called from here. |
|
| 198 | + * |
|
| 199 | + * @since 1.0.0 |
|
| 200 | + */ |
|
| 201 | + require_once('geodirectory-admin/admin_hooks_actions.php');
|
|
| 202 | + /** |
|
| 203 | + * Most admin JS and CSS is called from here. |
|
| 204 | + * |
|
| 205 | + * @since 1.0.0 |
|
| 206 | + */ |
|
| 207 | + require_once('geodirectory-admin/admin_template_tags.php');
|
|
| 208 | + /** |
|
| 209 | + * Include Google Analytics Class. |
|
| 210 | + * |
|
| 211 | + * @since 1.6.11 |
|
| 212 | + */ |
|
| 213 | + require_once('geodirectory-admin/class.analytics.stats.php');
|
|
| 214 | + /** |
|
| 215 | + * Include any functions needed for upgrades. |
|
| 216 | + * |
|
| 217 | + * @since 1.0.0 |
|
| 218 | + */ |
|
| 219 | + require_once(geodir_plugin_path() . '/upgrade.php'); |
|
| 220 | + if (get_option('geodir_installed') != 1) {
|
|
| 221 | + /** |
|
| 222 | + * Define language constants, here as they are not loaded yet. |
|
| 223 | + * |
|
| 224 | + * @since 1.0.0 |
|
| 225 | + */ |
|
| 226 | + require_once(geodir_plugin_path() . '/language.php'); |
|
| 227 | + /** |
|
| 228 | + * Include the plugin install file that sets up the databases and any options on first run. |
|
| 229 | + * |
|
| 230 | + * @since 1.0.0 |
|
| 231 | + */ |
|
| 232 | + require_once('geodirectory-admin/admin_install.php');
|
|
| 233 | + register_activation_hook(__FILE__, 'geodir_activation'); |
|
| 234 | + } |
|
| 235 | + register_deactivation_hook(__FILE__, 'geodir_deactivation'); |
|
| 236 | + |
|
| 237 | + /* |
|
| 238 | 238 | * Show a upgrade warning message if applicable. |
| 239 | 239 | * |
| 240 | 240 | * @since 1.5.6 |
| 241 | 241 | */ |
| 242 | - global $pagenow; |
|
| 242 | + global $pagenow; |
|
| 243 | 243 | if ( 'plugins.php' === $pagenow ) |
| 244 | - {
|
|
| 245 | - // Better update message |
|
| 246 | - $file = basename( __FILE__ ); |
|
| 247 | - $folder = basename( dirname( __FILE__ ) ); |
|
| 248 | - $hook = "in_plugin_update_message-{$folder}/{$file}";
|
|
| 249 | - add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 ); |
|
| 250 | - } |
|
| 244 | + {
|
|
| 245 | + // Better update message |
|
| 246 | + $file = basename( __FILE__ ); |
|
| 247 | + $folder = basename( dirname( __FILE__ ) ); |
|
| 248 | + $hook = "in_plugin_update_message-{$folder}/{$file}";
|
|
| 249 | + add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 ); |
|
| 250 | + } |
|
| 251 | 251 | |
| 252 | 252 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | /** |
| 35 | 35 | * Include WordPress core file so we can use core functions to check for active plugins. |
| 36 | 36 | */ |
| 37 | - include_once(ABSPATH . 'wp-admin/includes/plugin.php'); |
|
| 37 | + include_once(ABSPATH.'wp-admin/includes/plugin.php'); |
|
| 38 | 38 | |
| 39 | 39 | if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {
|
| 40 | 40 | deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');
|
@@ -68,8 +68,8 @@ discard block |
||
| 68 | 68 | * @global string $plugin_file_name Base file name. 'geodirectory/geodirectory.php'. |
| 69 | 69 | */ |
| 70 | 70 | global $wpdb, $plugin_prefix, $geodir_addon_list, $plugin_file_name; |
| 71 | -$plugin_prefix = $wpdb->prefix . 'geodir_'; |
|
| 72 | -$plugin_file_name = basename(plugin_dir_path(__FILE__)) . '/' . basename(__FILE__); |
|
| 71 | +$plugin_prefix = $wpdb->prefix.'geodir_'; |
|
| 72 | +$plugin_file_name = basename(plugin_dir_path(__FILE__)).'/'.basename(__FILE__); |
|
| 73 | 73 | |
| 74 | 74 | /* |
| 75 | 75 | * This will store the cached post custom fields per package for each page load so not to run for each listing. |
@@ -84,24 +84,24 @@ discard block |
||
| 84 | 84 | /** |
| 85 | 85 | * Define constants |
| 86 | 86 | */ |
| 87 | -if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));
|
|
| 87 | +if (!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path(__FILE__));
|
|
| 88 | 88 | |
| 89 | 89 | /* |
| 90 | 90 | * Declare database table names. All since version 1.0.0 |
| 91 | 91 | */ |
| 92 | 92 | |
| 93 | 93 | /** Define the database name for the countries table. */ |
| 94 | -if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');
|
|
| 94 | +if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix.'countries');
|
|
| 95 | 95 | /** Define the database name for the custom fields table. */ |
| 96 | -if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');
|
|
| 96 | +if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix.'custom_fields');
|
|
| 97 | 97 | /** Define the database name for the icons table. */ |
| 98 | -if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');
|
|
| 98 | +if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix.'post_icon');
|
|
| 99 | 99 | /** Define the database name for the attachments table. */ |
| 100 | -if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');
|
|
| 100 | +if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix.'attachments');
|
|
| 101 | 101 | /** Define the database name for the review table. */ |
| 102 | -if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');
|
|
| 102 | +if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix.'post_review');
|
|
| 103 | 103 | /** Define the database name for the custom sort fields table. */ |
| 104 | -if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');
|
|
| 104 | +if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix.'custom_sort_fields');
|
|
| 105 | 105 | |
| 106 | 106 | /* |
| 107 | 107 | * Define our Google Analytic app settings |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | if (!defined('GEODIR_GA_CLIENTID')) define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com');
|
| 110 | 110 | if (!defined('GEODIR_GA_CLIENTSECRET')) define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C'); //don't worry - this don't need to be secret in our case
|
| 111 | 111 | if (!defined('GEODIR_GA_REDIRECT')) define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob');
|
| 112 | -if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics');//.readonly
|
|
| 112 | +if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics'); //.readonly
|
|
| 113 | 113 | |
| 114 | 114 | |
| 115 | 115 | /* |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');
|
| 119 | 119 | |
| 120 | 120 | // Load geodirectory plugin textdomain. |
| 121 | -add_action( 'init', 'geodir_load_textdomain' ); |
|
| 121 | +add_action('init', 'geodir_load_textdomain');
|
|
| 122 | 122 | |
| 123 | 123 | /* |
| 124 | 124 | * A function to log GD errors no matter the type given. |
@@ -129,18 +129,18 @@ discard block |
||
| 129 | 129 | * @param mixed $log The thing that should be logged. |
| 130 | 130 | * @package GeoDirectory |
| 131 | 131 | */ |
| 132 | -function geodir_error_log($log){
|
|
| 132 | +function geodir_error_log($log) {
|
|
| 133 | 133 | /* |
| 134 | 134 | * A filter to override the WP_DEBUG setting for function geodir_error_log(). |
| 135 | 135 | * |
| 136 | 136 | * @since 1.5.7 |
| 137 | 137 | */ |
| 138 | - $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG); |
|
| 139 | - if ( true === $should_log ) {
|
|
| 140 | - if ( is_array( $log ) || is_object( $log ) ) {
|
|
| 141 | - error_log( print_r( $log, true ) ); |
|
| 138 | + $should_log = apply_filters('geodir_log_errors', WP_DEBUG);
|
|
| 139 | + if (true === $should_log) {
|
|
| 140 | + if (is_array($log) || is_object($log)) {
|
|
| 141 | + error_log(print_r($log, true)); |
|
| 142 | 142 | } else {
|
| 143 | - error_log( $log ); |
|
| 143 | + error_log($log); |
|
| 144 | 144 | } |
| 145 | 145 | } |
| 146 | 146 | } |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | /* |
| 180 | 180 | * Admin init + activation hooks |
| 181 | 181 | */ |
| 182 | -if (is_admin() || defined( 'GD_TESTING_MODE' )) {
|
|
| 182 | +if (is_admin() || defined('GD_TESTING_MODE')) {
|
|
| 183 | 183 | |
| 184 | 184 | /** |
| 185 | 185 | * Include functions used in admin area only. |
@@ -216,14 +216,14 @@ discard block |
||
| 216 | 216 | * |
| 217 | 217 | * @since 1.0.0 |
| 218 | 218 | */ |
| 219 | - require_once(geodir_plugin_path() . '/upgrade.php'); |
|
| 219 | + require_once(geodir_plugin_path().'/upgrade.php'); |
|
| 220 | 220 | if (get_option('geodir_installed') != 1) {
|
| 221 | 221 | /** |
| 222 | 222 | * Define language constants, here as they are not loaded yet. |
| 223 | 223 | * |
| 224 | 224 | * @since 1.0.0 |
| 225 | 225 | */ |
| 226 | - require_once(geodir_plugin_path() . '/language.php'); |
|
| 226 | + require_once(geodir_plugin_path().'/language.php'); |
|
| 227 | 227 | /** |
| 228 | 228 | * Include the plugin install file that sets up the databases and any options on first run. |
| 229 | 229 | * |
@@ -240,13 +240,13 @@ discard block |
||
| 240 | 240 | * @since 1.5.6 |
| 241 | 241 | */ |
| 242 | 242 | global $pagenow; |
| 243 | - if ( 'plugins.php' === $pagenow ) |
|
| 243 | + if ('plugins.php' === $pagenow)
|
|
| 244 | 244 | {
|
| 245 | 245 | // Better update message |
| 246 | - $file = basename( __FILE__ ); |
|
| 247 | - $folder = basename( dirname( __FILE__ ) ); |
|
| 246 | + $file = basename(__FILE__); |
|
| 247 | + $folder = basename(dirname(__FILE__)); |
|
| 248 | 248 | $hook = "in_plugin_update_message-{$folder}/{$file}";
|
| 249 | - add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 ); |
|
| 249 | + add_action($hook, 'geodire_admin_upgrade_notice', 20, 2); |
|
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | } |
@@ -79,43 +79,71 @@ |
||
| 79 | 79 | /** |
| 80 | 80 | * Do not store any revisions (except the one autosave per post). |
| 81 | 81 | */ |
| 82 | -if (!defined('WP_POST_REVISIONS')) define('WP_POST_REVISIONS', 0);
|
|
| 82 | +if (!defined('WP_POST_REVISIONS')) { |
|
| 83 | + define('WP_POST_REVISIONS', 0); |
|
| 84 | +} |
|
| 83 | 85 | |
| 84 | 86 | /** |
| 85 | 87 | * Define constants |
| 86 | 88 | */ |
| 87 | -if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));
|
|
| 89 | +if(!defined('GEODIRECTORY_PLUGIN_DIR')) { |
|
| 90 | + define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ )); |
|
| 91 | +} |
|
| 88 | 92 | |
| 89 | 93 | /* |
| 90 | 94 | * Declare database table names. All since version 1.0.0 |
| 91 | 95 | */ |
| 92 | 96 | |
| 93 | 97 | /** Define the database name for the countries table. */ |
| 94 | -if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');
|
|
| 98 | +if (!defined('GEODIR_COUNTRIES_TABLE')) { |
|
| 99 | + define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries'); |
|
| 100 | +} |
|
| 95 | 101 | /** Define the database name for the custom fields table. */ |
| 96 | -if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');
|
|
| 102 | +if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) { |
|
| 103 | + define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields'); |
|
| 104 | +} |
|
| 97 | 105 | /** Define the database name for the icons table. */ |
| 98 | -if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');
|
|
| 106 | +if (!defined('GEODIR_ICON_TABLE')) { |
|
| 107 | + define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon'); |
|
| 108 | +} |
|
| 99 | 109 | /** Define the database name for the attachments table. */ |
| 100 | -if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');
|
|
| 110 | +if (!defined('GEODIR_ATTACHMENT_TABLE')) { |
|
| 111 | + define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments'); |
|
| 112 | +} |
|
| 101 | 113 | /** Define the database name for the review table. */ |
| 102 | -if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');
|
|
| 114 | +if (!defined('GEODIR_REVIEW_TABLE')) { |
|
| 115 | + define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review'); |
|
| 116 | +} |
|
| 103 | 117 | /** Define the database name for the custom sort fields table. */ |
| 104 | -if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');
|
|
| 118 | +if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) { |
|
| 119 | + define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields'); |
|
| 120 | +} |
|
| 105 | 121 | |
| 106 | 122 | /* |
| 107 | 123 | * Define our Google Analytic app settings |
| 108 | 124 | */ |
| 109 | -if (!defined('GEODIR_GA_CLIENTID')) define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com');
|
|
| 110 | -if (!defined('GEODIR_GA_CLIENTSECRET')) define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C'); //don't worry - this don't need to be secret in our case
|
|
| 111 | -if (!defined('GEODIR_GA_REDIRECT')) define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob');
|
|
| 112 | -if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics');//.readonly
|
|
| 125 | +if (!defined('GEODIR_GA_CLIENTID')) { |
|
| 126 | + define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com'); |
|
| 127 | +} |
|
| 128 | +if (!defined('GEODIR_GA_CLIENTSECRET')) { |
|
| 129 | + define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C'); |
|
| 130 | +} |
|
| 131 | +//don't worry - this don't need to be secret in our case |
|
| 132 | +if (!defined('GEODIR_GA_REDIRECT')) { |
|
| 133 | + define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob'); |
|
| 134 | +} |
|
| 135 | +if (!defined('GEODIR_GA_SCOPE')) { |
|
| 136 | + define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics'); |
|
| 137 | +} |
|
| 138 | +//.readonly |
|
| 113 | 139 | |
| 114 | 140 | |
| 115 | 141 | /* |
| 116 | 142 | * Localisation items. |
| 117 | 143 | */ |
| 118 | -if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');
|
|
| 144 | +if (!defined('GEODIRECTORY_TEXTDOMAIN')) { |
|
| 145 | + define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory'); |
|
| 146 | +} |
|
| 119 | 147 | |
| 120 | 148 | // Load geodirectory plugin textdomain. |
| 121 | 149 | add_action( 'init', 'geodir_load_textdomain' ); |
@@ -7,232 +7,232 @@ discard block |
||
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | function geodir_property_sale_custom_fields($post_type='gd_place',$package_id=''){ |
| 10 | - $fields = array(); |
|
| 11 | - $package = ($package_id=='') ? '' : array($package_id); |
|
| 12 | - |
|
| 13 | - // Salary |
|
| 14 | - $fields[] = array('listing_type' => $post_type, |
|
| 15 | - 'field_type' => 'text', |
|
| 16 | - 'data_type' => 'FLOAT', |
|
| 17 | - 'decimal_point' => '2', |
|
| 18 | - 'admin_title' => __('Salary', 'geodirectory'), |
|
| 19 | - 'site_title' => __('Salary', 'geodirectory'), |
|
| 20 | - 'admin_desc' => __('Enter the Salary in $ (no currency symbol) ie: 25000', 'geodirectory'), |
|
| 21 | - 'htmlvar_name' => 'salary', |
|
| 22 | - 'is_active' => true, |
|
| 23 | - 'for_admin_use' => false, |
|
| 24 | - 'default_value' => '', |
|
| 25 | - 'show_in' => '[detail],[listing]', |
|
| 26 | - 'is_required' => false, |
|
| 27 | - 'validation_pattern' => '\d+(\.\d{2})?', |
|
| 28 | - 'validation_msg' => 'Please enter number and decimal only ie: 100.50', |
|
| 29 | - 'required_msg' => '', |
|
| 30 | - 'field_icon' => 'fa fa-usd', |
|
| 31 | - 'css_class' => '', |
|
| 32 | - 'cat_sort' => true, |
|
| 33 | - 'cat_filter' => true, |
|
| 34 | - 'extra' => array( |
|
| 35 | - 'is_price' => 1, |
|
| 36 | - 'thousand_separator' => 'comma', |
|
| 37 | - 'decimal_separator' => 'period', |
|
| 38 | - 'decimal_display' => 'if', |
|
| 39 | - 'currency_symbol' => '$', |
|
| 40 | - 'currency_symbol_placement' => 'left' |
|
| 41 | - ) |
|
| 42 | - ); |
|
| 43 | - |
|
| 44 | - |
|
| 45 | - |
|
| 46 | - // Job Type |
|
| 47 | - $fields[] = array('listing_type' => $post_type, |
|
| 48 | - 'field_type' => 'select', |
|
| 49 | - 'data_type' => 'VARCHAR', |
|
| 50 | - 'admin_title' => __('Job Type', 'geodirectory'), |
|
| 51 | - 'site_title' => __('Job Type','geodirectory'), |
|
| 52 | - 'admin_desc' => __('Select the type of job.','geodirectory'), |
|
| 53 | - 'htmlvar_name' => 'job_type', |
|
| 54 | - 'is_active' => true, |
|
| 55 | - 'for_admin_use' => false, |
|
| 56 | - 'default_value' => '', |
|
| 57 | - 'show_in' => '[detail],[listing]', |
|
| 58 | - 'is_required' => true, |
|
| 59 | - 'option_values' => __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'), |
|
| 60 | - 'validation_pattern' => '', |
|
| 61 | - 'validation_msg' => '', |
|
| 62 | - 'required_msg' => '', |
|
| 63 | - 'field_icon' => 'fa fa-briefcase', |
|
| 64 | - 'css_class' => '', |
|
| 65 | - 'cat_sort' => true, |
|
| 66 | - 'cat_filter' => true |
|
| 67 | - ); |
|
| 68 | - |
|
| 69 | - // Job Sector |
|
| 70 | - $fields[] = array('listing_type' => $post_type, |
|
| 71 | - 'field_type' => 'select', |
|
| 72 | - 'data_type' => 'VARCHAR', |
|
| 73 | - 'admin_title' => __('Job Sector','geodirectory'), |
|
| 74 | - 'site_title' => __('Job Sector','geodirectory'), |
|
| 75 | - 'admin_desc' => __('Select the job sector.','geodirectory'), |
|
| 76 | - 'htmlvar_name' => 'job_sector', |
|
| 77 | - 'is_active' => true, |
|
| 78 | - 'for_admin_use' => false, |
|
| 79 | - 'default_value' => '', |
|
| 80 | - 'show_in' => '[detail]', |
|
| 81 | - 'is_required' => true, |
|
| 82 | - 'option_values' => __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'), |
|
| 83 | - 'validation_pattern' => '', |
|
| 84 | - 'validation_msg' => '', |
|
| 85 | - 'required_msg' => '', |
|
| 86 | - 'field_icon' => 'fa fa-briefcase', |
|
| 87 | - 'css_class' => '', |
|
| 88 | - 'cat_sort' => true, |
|
| 89 | - 'cat_filter' => true |
|
| 90 | - ); |
|
| 91 | - |
|
| 92 | - // Required Experience |
|
| 93 | - $fields[] = array('listing_type' => $post_type, |
|
| 94 | - 'field_type' => 'select', |
|
| 95 | - 'data_type' => 'VARCHAR', |
|
| 96 | - 'admin_title' => __('Required Experience', 'geodirectory'), |
|
| 97 | - 'site_title' => __('Required Experience', 'geodirectory'), |
|
| 98 | - 'admin_desc' => __('Select the number of years required experience', 'geodirectory'), |
|
| 99 | - 'htmlvar_name' => 'job_experience', |
|
| 100 | - 'is_active' => true, |
|
| 101 | - 'for_admin_use' => false, |
|
| 102 | - 'default_value' => '', |
|
| 103 | - 'show_in' => '[detail],[listing]', |
|
| 104 | - 'is_required' => true, |
|
| 105 | - 'option_values' => __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years','geodirectory'), |
|
| 106 | - 'validation_pattern' => '', |
|
| 107 | - 'validation_msg' => '', |
|
| 108 | - 'required_msg' => '', |
|
| 109 | - 'field_icon' => 'fa fa-life-ring', |
|
| 110 | - 'css_class' => '', |
|
| 111 | - 'cat_sort' => true, |
|
| 112 | - 'cat_filter' => true |
|
| 113 | - ); |
|
| 114 | - |
|
| 115 | - // Required Skills |
|
| 116 | - $fields[] = array('listing_type' => $post_type, |
|
| 117 | - 'field_type' => 'textarea', |
|
| 118 | - 'data_type' => 'TEXT', |
|
| 119 | - 'admin_title' => __('Required Skills', 'geodirectory'), |
|
| 120 | - 'site_title' => __('Required Skills', 'geodirectory'), |
|
| 121 | - 'admin_desc' => __('Enter the required skills for the job', 'geodirectory'), |
|
| 122 | - 'htmlvar_name' => 'property_area', |
|
| 123 | - 'is_active' => true, |
|
| 124 | - 'for_admin_use' => false, |
|
| 125 | - 'default_value' => '', |
|
| 126 | - 'show_in' => '[detail],[listing]', |
|
| 127 | - 'is_required' => false, |
|
| 128 | - 'validation_pattern' => '', |
|
| 129 | - 'validation_msg' => '', |
|
| 130 | - 'required_msg' => '', |
|
| 131 | - 'field_icon' => 'fa fa-area-chart', |
|
| 132 | - 'css_class' => '', |
|
| 133 | - 'cat_sort' => true, |
|
| 134 | - 'cat_filter' => true |
|
| 135 | - ); |
|
| 136 | - |
|
| 137 | - |
|
| 138 | - |
|
| 139 | - // Company details fieldset |
|
| 140 | - $fields[] = array('listing_type' => $post_type, |
|
| 141 | - 'field_type' => 'fieldset', |
|
| 142 | - 'data_type' => '', |
|
| 143 | - 'admin_title' => __('Company Details', 'geodirectory'), |
|
| 144 | - 'site_title' => __('Company Details', 'geodirectory'), |
|
| 145 | - 'admin_desc' => __('Enter your company details here', 'geodirectory'), |
|
| 146 | - 'htmlvar_name' => 'job_company_details', |
|
| 147 | - 'is_active' => true, |
|
| 148 | - 'for_admin_use' => false, |
|
| 149 | - 'show_in' => '[owntab]' |
|
| 150 | - |
|
| 151 | - ); |
|
| 152 | - |
|
| 153 | - // Company Name |
|
| 154 | - $fields[] = array('listing_type' => $post_type, |
|
| 155 | - 'field_type' => 'text', |
|
| 156 | - 'data_type' => 'VARCHAR', |
|
| 157 | - 'admin_title' => __('Company Name', 'geodirectory'), |
|
| 158 | - 'site_title' => __('Company Name', 'geodirectory'), |
|
| 159 | - 'admin_desc' => __('Enter your company name', 'geodirectory'), |
|
| 160 | - 'htmlvar_name' => 'job_company_name', |
|
| 161 | - 'is_active' => true, |
|
| 162 | - 'for_admin_use' => false, |
|
| 163 | - 'default_value' => '', |
|
| 164 | - 'show_in' => '[owntab]', |
|
| 165 | - 'is_required' => false, |
|
| 166 | - 'validation_pattern' => '', |
|
| 167 | - 'validation_msg' => '', |
|
| 168 | - 'required_msg' => '', |
|
| 169 | - 'field_icon' => 'fa fa-arrow-circle-right', |
|
| 170 | - 'css_class' => '', |
|
| 171 | - 'cat_sort' => false, |
|
| 172 | - 'cat_filter' => false |
|
| 173 | - ); |
|
| 174 | - |
|
| 175 | - // Company Logo |
|
| 176 | - $fields[] = array('listing_type' => $post_type, |
|
| 177 | - 'field_type' => 'file', |
|
| 178 | - 'data_type' => '', |
|
| 179 | - 'admin_title' => __('Company Logo', 'geodirectory'), |
|
| 180 | - 'site_title' => __('Company Logo', 'geodirectory'), |
|
| 181 | - 'admin_desc' => __('Enter your company Logo', 'geodirectory'), |
|
| 182 | - 'htmlvar_name' => 'job_company_logo', |
|
| 183 | - 'is_active' => true, |
|
| 184 | - 'for_admin_use' => false, |
|
| 185 | - 'default_value' => '', |
|
| 186 | - 'show_in' => '[owntab]', |
|
| 187 | - 'is_required' => false, |
|
| 188 | - 'validation_pattern' => '', |
|
| 189 | - 'validation_msg' => '', |
|
| 190 | - 'required_msg' => '', |
|
| 191 | - 'field_icon' => 'fa fa-arrow-circle-right', |
|
| 192 | - 'css_class' => '', |
|
| 193 | - 'cat_sort' => false, |
|
| 194 | - 'cat_filter' => false, |
|
| 195 | - 'extra' => array( |
|
| 196 | - 'gd_file_types' => 'jpg', |
|
| 197 | - 'gd_file_types' => 'jpeg', |
|
| 198 | - 'gd_file_types' => 'gif', |
|
| 199 | - 'gd_file_types' => 'png', |
|
| 200 | - ) |
|
| 201 | - ); |
|
| 202 | - |
|
| 203 | - // Company Url |
|
| 204 | - $fields[] = array('listing_type' => $post_type, |
|
| 205 | - 'field_type' => 'url', |
|
| 206 | - 'data_type' => 'VARCHAR', |
|
| 207 | - 'admin_title' => __('Company Url', 'geodirectory'), |
|
| 208 | - 'site_title' => __('Company Url', 'geodirectory'), |
|
| 209 | - 'admin_desc' => __('Enter your company Url', 'geodirectory'), |
|
| 210 | - 'htmlvar_name' => 'job_company_url', |
|
| 211 | - 'is_active' => true, |
|
| 212 | - 'for_admin_use' => false, |
|
| 213 | - 'default_value' => '', |
|
| 214 | - 'show_in' => '[owntab]', |
|
| 215 | - 'is_required' => false, |
|
| 216 | - 'validation_pattern' => '', |
|
| 217 | - 'validation_msg' => '', |
|
| 218 | - 'required_msg' => '', |
|
| 219 | - 'field_icon' => 'fa fa-arrow-circle-right', |
|
| 220 | - 'css_class' => '', |
|
| 221 | - 'cat_sort' => false, |
|
| 222 | - 'cat_filter' => false |
|
| 223 | - ); |
|
| 224 | - |
|
| 225 | - |
|
| 226 | - |
|
| 227 | - /** |
|
| 228 | - * Filter the array of default custom fields DB table data. |
|
| 229 | - * |
|
| 230 | - * @since 1.6.6 |
|
| 231 | - * @param string $fields The default custom fields as an array. |
|
| 232 | - */ |
|
| 233 | - $fields = apply_filters('geodir_property_sale_custom_fields', $fields); |
|
| 234 | - |
|
| 235 | - return $fields; |
|
| 10 | + $fields = array(); |
|
| 11 | + $package = ($package_id=='') ? '' : array($package_id); |
|
| 12 | + |
|
| 13 | + // Salary |
|
| 14 | + $fields[] = array('listing_type' => $post_type, |
|
| 15 | + 'field_type' => 'text', |
|
| 16 | + 'data_type' => 'FLOAT', |
|
| 17 | + 'decimal_point' => '2', |
|
| 18 | + 'admin_title' => __('Salary', 'geodirectory'), |
|
| 19 | + 'site_title' => __('Salary', 'geodirectory'), |
|
| 20 | + 'admin_desc' => __('Enter the Salary in $ (no currency symbol) ie: 25000', 'geodirectory'), |
|
| 21 | + 'htmlvar_name' => 'salary', |
|
| 22 | + 'is_active' => true, |
|
| 23 | + 'for_admin_use' => false, |
|
| 24 | + 'default_value' => '', |
|
| 25 | + 'show_in' => '[detail],[listing]', |
|
| 26 | + 'is_required' => false, |
|
| 27 | + 'validation_pattern' => '\d+(\.\d{2})?', |
|
| 28 | + 'validation_msg' => 'Please enter number and decimal only ie: 100.50', |
|
| 29 | + 'required_msg' => '', |
|
| 30 | + 'field_icon' => 'fa fa-usd', |
|
| 31 | + 'css_class' => '', |
|
| 32 | + 'cat_sort' => true, |
|
| 33 | + 'cat_filter' => true, |
|
| 34 | + 'extra' => array( |
|
| 35 | + 'is_price' => 1, |
|
| 36 | + 'thousand_separator' => 'comma', |
|
| 37 | + 'decimal_separator' => 'period', |
|
| 38 | + 'decimal_display' => 'if', |
|
| 39 | + 'currency_symbol' => '$', |
|
| 40 | + 'currency_symbol_placement' => 'left' |
|
| 41 | + ) |
|
| 42 | + ); |
|
| 43 | + |
|
| 44 | + |
|
| 45 | + |
|
| 46 | + // Job Type |
|
| 47 | + $fields[] = array('listing_type' => $post_type, |
|
| 48 | + 'field_type' => 'select', |
|
| 49 | + 'data_type' => 'VARCHAR', |
|
| 50 | + 'admin_title' => __('Job Type', 'geodirectory'), |
|
| 51 | + 'site_title' => __('Job Type','geodirectory'), |
|
| 52 | + 'admin_desc' => __('Select the type of job.','geodirectory'), |
|
| 53 | + 'htmlvar_name' => 'job_type', |
|
| 54 | + 'is_active' => true, |
|
| 55 | + 'for_admin_use' => false, |
|
| 56 | + 'default_value' => '', |
|
| 57 | + 'show_in' => '[detail],[listing]', |
|
| 58 | + 'is_required' => true, |
|
| 59 | + 'option_values' => __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'), |
|
| 60 | + 'validation_pattern' => '', |
|
| 61 | + 'validation_msg' => '', |
|
| 62 | + 'required_msg' => '', |
|
| 63 | + 'field_icon' => 'fa fa-briefcase', |
|
| 64 | + 'css_class' => '', |
|
| 65 | + 'cat_sort' => true, |
|
| 66 | + 'cat_filter' => true |
|
| 67 | + ); |
|
| 68 | + |
|
| 69 | + // Job Sector |
|
| 70 | + $fields[] = array('listing_type' => $post_type, |
|
| 71 | + 'field_type' => 'select', |
|
| 72 | + 'data_type' => 'VARCHAR', |
|
| 73 | + 'admin_title' => __('Job Sector','geodirectory'), |
|
| 74 | + 'site_title' => __('Job Sector','geodirectory'), |
|
| 75 | + 'admin_desc' => __('Select the job sector.','geodirectory'), |
|
| 76 | + 'htmlvar_name' => 'job_sector', |
|
| 77 | + 'is_active' => true, |
|
| 78 | + 'for_admin_use' => false, |
|
| 79 | + 'default_value' => '', |
|
| 80 | + 'show_in' => '[detail]', |
|
| 81 | + 'is_required' => true, |
|
| 82 | + 'option_values' => __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'), |
|
| 83 | + 'validation_pattern' => '', |
|
| 84 | + 'validation_msg' => '', |
|
| 85 | + 'required_msg' => '', |
|
| 86 | + 'field_icon' => 'fa fa-briefcase', |
|
| 87 | + 'css_class' => '', |
|
| 88 | + 'cat_sort' => true, |
|
| 89 | + 'cat_filter' => true |
|
| 90 | + ); |
|
| 91 | + |
|
| 92 | + // Required Experience |
|
| 93 | + $fields[] = array('listing_type' => $post_type, |
|
| 94 | + 'field_type' => 'select', |
|
| 95 | + 'data_type' => 'VARCHAR', |
|
| 96 | + 'admin_title' => __('Required Experience', 'geodirectory'), |
|
| 97 | + 'site_title' => __('Required Experience', 'geodirectory'), |
|
| 98 | + 'admin_desc' => __('Select the number of years required experience', 'geodirectory'), |
|
| 99 | + 'htmlvar_name' => 'job_experience', |
|
| 100 | + 'is_active' => true, |
|
| 101 | + 'for_admin_use' => false, |
|
| 102 | + 'default_value' => '', |
|
| 103 | + 'show_in' => '[detail],[listing]', |
|
| 104 | + 'is_required' => true, |
|
| 105 | + 'option_values' => __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years','geodirectory'), |
|
| 106 | + 'validation_pattern' => '', |
|
| 107 | + 'validation_msg' => '', |
|
| 108 | + 'required_msg' => '', |
|
| 109 | + 'field_icon' => 'fa fa-life-ring', |
|
| 110 | + 'css_class' => '', |
|
| 111 | + 'cat_sort' => true, |
|
| 112 | + 'cat_filter' => true |
|
| 113 | + ); |
|
| 114 | + |
|
| 115 | + // Required Skills |
|
| 116 | + $fields[] = array('listing_type' => $post_type, |
|
| 117 | + 'field_type' => 'textarea', |
|
| 118 | + 'data_type' => 'TEXT', |
|
| 119 | + 'admin_title' => __('Required Skills', 'geodirectory'), |
|
| 120 | + 'site_title' => __('Required Skills', 'geodirectory'), |
|
| 121 | + 'admin_desc' => __('Enter the required skills for the job', 'geodirectory'), |
|
| 122 | + 'htmlvar_name' => 'property_area', |
|
| 123 | + 'is_active' => true, |
|
| 124 | + 'for_admin_use' => false, |
|
| 125 | + 'default_value' => '', |
|
| 126 | + 'show_in' => '[detail],[listing]', |
|
| 127 | + 'is_required' => false, |
|
| 128 | + 'validation_pattern' => '', |
|
| 129 | + 'validation_msg' => '', |
|
| 130 | + 'required_msg' => '', |
|
| 131 | + 'field_icon' => 'fa fa-area-chart', |
|
| 132 | + 'css_class' => '', |
|
| 133 | + 'cat_sort' => true, |
|
| 134 | + 'cat_filter' => true |
|
| 135 | + ); |
|
| 136 | + |
|
| 137 | + |
|
| 138 | + |
|
| 139 | + // Company details fieldset |
|
| 140 | + $fields[] = array('listing_type' => $post_type, |
|
| 141 | + 'field_type' => 'fieldset', |
|
| 142 | + 'data_type' => '', |
|
| 143 | + 'admin_title' => __('Company Details', 'geodirectory'), |
|
| 144 | + 'site_title' => __('Company Details', 'geodirectory'), |
|
| 145 | + 'admin_desc' => __('Enter your company details here', 'geodirectory'), |
|
| 146 | + 'htmlvar_name' => 'job_company_details', |
|
| 147 | + 'is_active' => true, |
|
| 148 | + 'for_admin_use' => false, |
|
| 149 | + 'show_in' => '[owntab]' |
|
| 150 | + |
|
| 151 | + ); |
|
| 152 | + |
|
| 153 | + // Company Name |
|
| 154 | + $fields[] = array('listing_type' => $post_type, |
|
| 155 | + 'field_type' => 'text', |
|
| 156 | + 'data_type' => 'VARCHAR', |
|
| 157 | + 'admin_title' => __('Company Name', 'geodirectory'), |
|
| 158 | + 'site_title' => __('Company Name', 'geodirectory'), |
|
| 159 | + 'admin_desc' => __('Enter your company name', 'geodirectory'), |
|
| 160 | + 'htmlvar_name' => 'job_company_name', |
|
| 161 | + 'is_active' => true, |
|
| 162 | + 'for_admin_use' => false, |
|
| 163 | + 'default_value' => '', |
|
| 164 | + 'show_in' => '[owntab]', |
|
| 165 | + 'is_required' => false, |
|
| 166 | + 'validation_pattern' => '', |
|
| 167 | + 'validation_msg' => '', |
|
| 168 | + 'required_msg' => '', |
|
| 169 | + 'field_icon' => 'fa fa-arrow-circle-right', |
|
| 170 | + 'css_class' => '', |
|
| 171 | + 'cat_sort' => false, |
|
| 172 | + 'cat_filter' => false |
|
| 173 | + ); |
|
| 174 | + |
|
| 175 | + // Company Logo |
|
| 176 | + $fields[] = array('listing_type' => $post_type, |
|
| 177 | + 'field_type' => 'file', |
|
| 178 | + 'data_type' => '', |
|
| 179 | + 'admin_title' => __('Company Logo', 'geodirectory'), |
|
| 180 | + 'site_title' => __('Company Logo', 'geodirectory'), |
|
| 181 | + 'admin_desc' => __('Enter your company Logo', 'geodirectory'), |
|
| 182 | + 'htmlvar_name' => 'job_company_logo', |
|
| 183 | + 'is_active' => true, |
|
| 184 | + 'for_admin_use' => false, |
|
| 185 | + 'default_value' => '', |
|
| 186 | + 'show_in' => '[owntab]', |
|
| 187 | + 'is_required' => false, |
|
| 188 | + 'validation_pattern' => '', |
|
| 189 | + 'validation_msg' => '', |
|
| 190 | + 'required_msg' => '', |
|
| 191 | + 'field_icon' => 'fa fa-arrow-circle-right', |
|
| 192 | + 'css_class' => '', |
|
| 193 | + 'cat_sort' => false, |
|
| 194 | + 'cat_filter' => false, |
|
| 195 | + 'extra' => array( |
|
| 196 | + 'gd_file_types' => 'jpg', |
|
| 197 | + 'gd_file_types' => 'jpeg', |
|
| 198 | + 'gd_file_types' => 'gif', |
|
| 199 | + 'gd_file_types' => 'png', |
|
| 200 | + ) |
|
| 201 | + ); |
|
| 202 | + |
|
| 203 | + // Company Url |
|
| 204 | + $fields[] = array('listing_type' => $post_type, |
|
| 205 | + 'field_type' => 'url', |
|
| 206 | + 'data_type' => 'VARCHAR', |
|
| 207 | + 'admin_title' => __('Company Url', 'geodirectory'), |
|
| 208 | + 'site_title' => __('Company Url', 'geodirectory'), |
|
| 209 | + 'admin_desc' => __('Enter your company Url', 'geodirectory'), |
|
| 210 | + 'htmlvar_name' => 'job_company_url', |
|
| 211 | + 'is_active' => true, |
|
| 212 | + 'for_admin_use' => false, |
|
| 213 | + 'default_value' => '', |
|
| 214 | + 'show_in' => '[owntab]', |
|
| 215 | + 'is_required' => false, |
|
| 216 | + 'validation_pattern' => '', |
|
| 217 | + 'validation_msg' => '', |
|
| 218 | + 'required_msg' => '', |
|
| 219 | + 'field_icon' => 'fa fa-arrow-circle-right', |
|
| 220 | + 'css_class' => '', |
|
| 221 | + 'cat_sort' => false, |
|
| 222 | + 'cat_filter' => false |
|
| 223 | + ); |
|
| 224 | + |
|
| 225 | + |
|
| 226 | + |
|
| 227 | + /** |
|
| 228 | + * Filter the array of default custom fields DB table data. |
|
| 229 | + * |
|
| 230 | + * @since 1.6.6 |
|
| 231 | + * @param string $fields The default custom fields as an array. |
|
| 232 | + */ |
|
| 233 | + $fields = apply_filters('geodir_property_sale_custom_fields', $fields); |
|
| 234 | + |
|
| 235 | + return $fields; |
|
| 236 | 236 | } |
| 237 | 237 | |
| 238 | 238 | global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index; |
@@ -242,36 +242,36 @@ discard block |
||
| 242 | 242 | $category_array = array('Apartments', 'Houses', 'Commercial', 'Land'); |
| 243 | 243 | |
| 244 | 244 | if($dummy_post_index==1){ |
| 245 | - // add the dummy categories |
|
| 246 | - geodir_dummy_data_taxonomies($post_type,$category_array ); |
|
| 245 | + // add the dummy categories |
|
| 246 | + geodir_dummy_data_taxonomies($post_type,$category_array ); |
|
| 247 | 247 | |
| 248 | - // add the dummy custom fields |
|
| 249 | - $fields = geodir_property_sale_custom_fields($post_type); |
|
| 250 | - geodir_create_dummy_fields($fields); |
|
| 251 | - update_option($post_type.'_dummy_data_type','property_sale'); |
|
| 248 | + // add the dummy custom fields |
|
| 249 | + $fields = geodir_property_sale_custom_fields($post_type); |
|
| 250 | + geodir_create_dummy_fields($fields); |
|
| 251 | + update_option($post_type.'_dummy_data_type','property_sale'); |
|
| 252 | 252 | } |
| 253 | 253 | |
| 254 | 254 | if (geodir_dummy_folder_exists()) |
| 255 | - $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy"; |
|
| 255 | + $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy"; |
|
| 256 | 256 | else |
| 257 | - $dummy_image_url = 'http://www.wpgeodirectory.com/dummy'; |
|
| 257 | + $dummy_image_url = 'http://www.wpgeodirectory.com/dummy'; |
|
| 258 | 258 | |
| 259 | 259 | $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url); |
| 260 | 260 | |
| 261 | 261 | switch ($dummy_post_index) { |
| 262 | 262 | |
| 263 | - case(1): |
|
| 264 | - $image_array[] = "$dummy_image_url/ps/psf1.jpg"; |
|
| 265 | - $image_array[] = "$dummy_image_url/ps/psl1.jpg"; |
|
| 266 | - $image_array[] = "$dummy_image_url/ps/psb1.jpg"; |
|
| 267 | - $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 268 | - $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 263 | + case(1): |
|
| 264 | + $image_array[] = "$dummy_image_url/ps/psf1.jpg"; |
|
| 265 | + $image_array[] = "$dummy_image_url/ps/psl1.jpg"; |
|
| 266 | + $image_array[] = "$dummy_image_url/ps/psb1.jpg"; |
|
| 267 | + $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 268 | + $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 269 | 269 | |
| 270 | 270 | |
| 271 | - $post_info[] = array( |
|
| 272 | - "listing_type" => $post_type, |
|
| 273 | - "post_title" => 'Eastern Lodge', |
|
| 274 | - "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa. |
|
| 271 | + $post_info[] = array( |
|
| 272 | + "listing_type" => $post_type, |
|
| 273 | + "post_title" => 'Eastern Lodge', |
|
| 274 | + "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec non augue ultrices, vulputate nulla at, consectetur ante. Quisque neque mi, vulputate quis nulla a, sollicitudin fringilla leo. Nam dictum id neque eu imperdiet. Curabitur ligula turpis, malesuada at lobortis commodo, vulputate volutpat arcu. Duis bibendum blandit aliquam. In ipsum diam, tristique ut bibendum vel, lobortis non tellus. Nulla ultricies, ante vitae placerat auctor, nisi quam blandit enim, sit amet aliquam est diam id urna. Suspendisse eget nibh volutpat, malesuada enim sed, egestas massa. |
|
| 275 | 275 | |
| 276 | 276 | Aliquam ut odio ullamcorper, posuere enim sed, venenatis tortor. Donec justo elit, aliquam sed cursus sed, semper eget libero. Mauris consequat lorem sed fringilla tincidunt. Phasellus suscipit velit et elit tristique, ac commodo metus scelerisque. Vivamus finibus ipsum placerat pulvinar aliquet. Maecenas augue orci, blandit at nibh pharetra, condimentum congue ligula. Duis non ante sagittis odio convallis lacinia in quis sapien. |
| 277 | 277 | |
@@ -280,42 +280,42 @@ discard block |
||
| 280 | 280 | Vestibulum tristique quam eget bibendum pulvinar. Mauris sit amet magna ut arcu rutrum pellentesque feugiat et ipsum. Proin porta quam sed risus accumsan pharetra. Nulla quis semper nisl. Nulla facilisi. Nulla facilisi. Pellentesque euismod sollicitudin lacus vel ultricies. Vestibulum ut sem ut nulla ultricies convallis in at mi. Nunc vitae nibh arcu. Maecenas nunc enim, tempus a rhoncus eget, pellentesque ut erat. |
| 281 | 281 | |
| 282 | 282 | Suspendisse interdum accumsan magna et tempor. Suspendisse scelerisque at lorem sit amet faucibus. Aenean quis consectetur enim. Duis aliquet tristique tempus. Suspendisse id ullamcorper mauris. Aliquam in libero eu justo porttitor pulvinar. Nulla semper placerat lectus. Nulla mollis suscipit lacus, a blandit purus cursus non. Maecenas id tellus mi. Pellentesque sollicitudin nibh eget magna scelerisque consequat. Aliquam convallis orci arcu, et euismod dui cursus et. Donec nec pellentesque nulla, ac pretium massa. In gravida bibendum ornare.', |
| 283 | - "post_images" => $image_array, |
|
| 284 | - "post_category" => array($post_type.'category' => array($category_array[1])), |
|
| 285 | - "post_tags" => array('Tags', 'Sample Tags'), |
|
| 286 | - "geodir_video" => '', |
|
| 287 | - "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 288 | - "geodir_contact" => '(111) 677-4444', |
|
| 289 | - "geodir_email" => '[email protected]', |
|
| 290 | - "geodir_website" => 'http://example.com/', |
|
| 291 | - "geodir_twitter" => 'http://example.com/', |
|
| 292 | - "geodir_facebook" => 'http://example.com/', |
|
| 293 | - "geodir_price" => '350000', |
|
| 294 | - "geodir_property_status" => 'For Sale', |
|
| 295 | - 'geodir_property_furnishing' => 'Furnished', |
|
| 296 | - 'geodir_property_type' => 'Detached house', |
|
| 297 | - 'geodir_property_bedrooms' => '3', |
|
| 298 | - 'geodir_property_bathrooms' => '2', |
|
| 299 | - 'geodir_property_area' => '1850', |
|
| 300 | - 'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace', |
|
| 301 | - "post_dummy" => '1' |
|
| 302 | - ); |
|
| 303 | - |
|
| 304 | - |
|
| 305 | - break; |
|
| 306 | - case 2: |
|
| 307 | - $image_array = array(); |
|
| 308 | - $post_meta = array(); |
|
| 309 | - $image_array[] = "$dummy_image_url/ps/psf2.jpg"; |
|
| 310 | - $image_array[] = "$dummy_image_url/ps/psl2.jpg"; |
|
| 311 | - $image_array[] = "$dummy_image_url/ps/psb2.jpg"; |
|
| 312 | - $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 313 | - $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 314 | - |
|
| 315 | - $post_info[] = array( |
|
| 316 | - "listing_type" => $post_type, |
|
| 317 | - "post_title" => 'Daisy Street', |
|
| 318 | - "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 283 | + "post_images" => $image_array, |
|
| 284 | + "post_category" => array($post_type.'category' => array($category_array[1])), |
|
| 285 | + "post_tags" => array('Tags', 'Sample Tags'), |
|
| 286 | + "geodir_video" => '', |
|
| 287 | + "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 288 | + "geodir_contact" => '(111) 677-4444', |
|
| 289 | + "geodir_email" => '[email protected]', |
|
| 290 | + "geodir_website" => 'http://example.com/', |
|
| 291 | + "geodir_twitter" => 'http://example.com/', |
|
| 292 | + "geodir_facebook" => 'http://example.com/', |
|
| 293 | + "geodir_price" => '350000', |
|
| 294 | + "geodir_property_status" => 'For Sale', |
|
| 295 | + 'geodir_property_furnishing' => 'Furnished', |
|
| 296 | + 'geodir_property_type' => 'Detached house', |
|
| 297 | + 'geodir_property_bedrooms' => '3', |
|
| 298 | + 'geodir_property_bathrooms' => '2', |
|
| 299 | + 'geodir_property_area' => '1850', |
|
| 300 | + 'geodir_property_features' => 'Gas Central Heating,Triple Glazing,Front Garden,Private driveway,Fireplace', |
|
| 301 | + "post_dummy" => '1' |
|
| 302 | + ); |
|
| 303 | + |
|
| 304 | + |
|
| 305 | + break; |
|
| 306 | + case 2: |
|
| 307 | + $image_array = array(); |
|
| 308 | + $post_meta = array(); |
|
| 309 | + $image_array[] = "$dummy_image_url/ps/psf2.jpg"; |
|
| 310 | + $image_array[] = "$dummy_image_url/ps/psl2.jpg"; |
|
| 311 | + $image_array[] = "$dummy_image_url/ps/psb2.jpg"; |
|
| 312 | + $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 313 | + $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 314 | + |
|
| 315 | + $post_info[] = array( |
|
| 316 | + "listing_type" => $post_type, |
|
| 317 | + "post_title" => 'Daisy Street', |
|
| 318 | + "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 319 | 319 | |
| 320 | 320 | Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel. |
| 321 | 321 | |
@@ -325,42 +325,42 @@ discard block |
||
| 325 | 325 | |
| 326 | 326 | Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.', |
| 327 | 327 | |
| 328 | - "post_images" => $image_array, |
|
| 329 | - "post_category" => array($post_type.'category' => array($category_array[1])), |
|
| 330 | - "post_tags" => array('Garage'), |
|
| 331 | - "geodir_video" => '', |
|
| 332 | - "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 333 | - "geodir_contact" => '(222) 777-1111', |
|
| 334 | - "geodir_email" => '[email protected]', |
|
| 335 | - "geodir_website" => 'http://example.com/', |
|
| 336 | - "geodir_twitter" => 'http://example.com/', |
|
| 337 | - "geodir_facebook" => 'http://example.com/', |
|
| 338 | - "geodir_price" => '230000', |
|
| 339 | - "geodir_property_status" => 'Sold', |
|
| 340 | - 'geodir_property_furnishing' => 'Unfurnished', |
|
| 341 | - 'geodir_property_type' => 'Detached house', |
|
| 342 | - 'geodir_property_bedrooms' => '5', |
|
| 343 | - 'geodir_property_bathrooms' => '3', |
|
| 344 | - 'geodir_property_area' => '2650', |
|
| 345 | - 'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace', |
|
| 346 | - "post_dummy" => '1' |
|
| 347 | - ); |
|
| 348 | - |
|
| 349 | - break; |
|
| 350 | - |
|
| 351 | - case 3: |
|
| 352 | - $image_array = array(); |
|
| 353 | - $post_meta = array(); |
|
| 354 | - $image_array[] = "$dummy_image_url/ps/psf3.jpg"; |
|
| 355 | - $image_array[] = "$dummy_image_url/ps/psl3.jpg"; |
|
| 356 | - $image_array[] = "$dummy_image_url/ps/psb3.jpg"; |
|
| 357 | - $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 358 | - $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 359 | - |
|
| 360 | - $post_info[] = array( |
|
| 361 | - "listing_type" => $post_type, |
|
| 362 | - "post_title" => 'Northbay House', |
|
| 363 | - "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 328 | + "post_images" => $image_array, |
|
| 329 | + "post_category" => array($post_type.'category' => array($category_array[1])), |
|
| 330 | + "post_tags" => array('Garage'), |
|
| 331 | + "geodir_video" => '', |
|
| 332 | + "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 333 | + "geodir_contact" => '(222) 777-1111', |
|
| 334 | + "geodir_email" => '[email protected]', |
|
| 335 | + "geodir_website" => 'http://example.com/', |
|
| 336 | + "geodir_twitter" => 'http://example.com/', |
|
| 337 | + "geodir_facebook" => 'http://example.com/', |
|
| 338 | + "geodir_price" => '230000', |
|
| 339 | + "geodir_property_status" => 'Sold', |
|
| 340 | + 'geodir_property_furnishing' => 'Unfurnished', |
|
| 341 | + 'geodir_property_type' => 'Detached house', |
|
| 342 | + 'geodir_property_bedrooms' => '5', |
|
| 343 | + 'geodir_property_bathrooms' => '3', |
|
| 344 | + 'geodir_property_area' => '2650', |
|
| 345 | + 'geodir_property_features' => 'Select Features/,Oil Central Heating,Front Garden,Garage,Private driveway,Fireplace', |
|
| 346 | + "post_dummy" => '1' |
|
| 347 | + ); |
|
| 348 | + |
|
| 349 | + break; |
|
| 350 | + |
|
| 351 | + case 3: |
|
| 352 | + $image_array = array(); |
|
| 353 | + $post_meta = array(); |
|
| 354 | + $image_array[] = "$dummy_image_url/ps/psf3.jpg"; |
|
| 355 | + $image_array[] = "$dummy_image_url/ps/psl3.jpg"; |
|
| 356 | + $image_array[] = "$dummy_image_url/ps/psb3.jpg"; |
|
| 357 | + $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 358 | + $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 359 | + |
|
| 360 | + $post_info[] = array( |
|
| 361 | + "listing_type" => $post_type, |
|
| 362 | + "post_title" => 'Northbay House', |
|
| 363 | + "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 364 | 364 | |
| 365 | 365 | Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel. |
| 366 | 366 | |
@@ -370,43 +370,43 @@ discard block |
||
| 370 | 370 | |
| 371 | 371 | Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.', |
| 372 | 372 | |
| 373 | - "post_images" => $image_array, |
|
| 374 | - "post_category" => array($post_type.'category' => array($category_array[1])), |
|
| 375 | - "post_tags" => array('Tags', 'Sample Tags'), |
|
| 376 | - "geodir_video" => '', |
|
| 377 | - "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 378 | - "geodir_contact" => '(222) 777-1111', |
|
| 379 | - "geodir_email" => '[email protected]', |
|
| 380 | - "geodir_website" => 'http://example.com/', |
|
| 381 | - "geodir_twitter" => 'http://example.com/', |
|
| 382 | - "geodir_facebook" => 'http://example.com/', |
|
| 383 | - "geodir_price" => '260000', |
|
| 384 | - "geodir_property_status" => 'Under Offer', |
|
| 385 | - 'geodir_property_furnishing' => 'Unfurnished', |
|
| 386 | - 'geodir_property_type' => 'Detached house', |
|
| 387 | - 'geodir_property_bedrooms' => '6', |
|
| 388 | - 'geodir_property_bathrooms' => '6', |
|
| 389 | - 'geodir_property_area' => '1650', |
|
| 390 | - 'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace', |
|
| 391 | - "post_dummy" => '1' |
|
| 392 | - ); |
|
| 393 | - |
|
| 394 | - break; |
|
| 395 | - |
|
| 396 | - |
|
| 397 | - case 4: |
|
| 398 | - $image_array = array(); |
|
| 399 | - $post_meta = array(); |
|
| 400 | - $image_array[] = "$dummy_image_url/ps/psf4.jpg"; |
|
| 401 | - $image_array[] = "$dummy_image_url/ps/psl4.jpg"; |
|
| 402 | - $image_array[] = "$dummy_image_url/ps/psb4.jpg"; |
|
| 403 | - $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 404 | - $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 405 | - |
|
| 406 | - $post_info[] = array( |
|
| 407 | - "listing_type" => $post_type, |
|
| 408 | - "post_title" => 'Jesmond Mansion', |
|
| 409 | - "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 373 | + "post_images" => $image_array, |
|
| 374 | + "post_category" => array($post_type.'category' => array($category_array[1])), |
|
| 375 | + "post_tags" => array('Tags', 'Sample Tags'), |
|
| 376 | + "geodir_video" => '', |
|
| 377 | + "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 378 | + "geodir_contact" => '(222) 777-1111', |
|
| 379 | + "geodir_email" => '[email protected]', |
|
| 380 | + "geodir_website" => 'http://example.com/', |
|
| 381 | + "geodir_twitter" => 'http://example.com/', |
|
| 382 | + "geodir_facebook" => 'http://example.com/', |
|
| 383 | + "geodir_price" => '260000', |
|
| 384 | + "geodir_property_status" => 'Under Offer', |
|
| 385 | + 'geodir_property_furnishing' => 'Unfurnished', |
|
| 386 | + 'geodir_property_type' => 'Detached house', |
|
| 387 | + 'geodir_property_bedrooms' => '6', |
|
| 388 | + 'geodir_property_bathrooms' => '6', |
|
| 389 | + 'geodir_property_area' => '1650', |
|
| 390 | + 'geodir_property_features' => 'Select Features/,Gas Central Heating,Triple Glazing,Off Road Parking,Fireplace', |
|
| 391 | + "post_dummy" => '1' |
|
| 392 | + ); |
|
| 393 | + |
|
| 394 | + break; |
|
| 395 | + |
|
| 396 | + |
|
| 397 | + case 4: |
|
| 398 | + $image_array = array(); |
|
| 399 | + $post_meta = array(); |
|
| 400 | + $image_array[] = "$dummy_image_url/ps/psf4.jpg"; |
|
| 401 | + $image_array[] = "$dummy_image_url/ps/psl4.jpg"; |
|
| 402 | + $image_array[] = "$dummy_image_url/ps/psb4.jpg"; |
|
| 403 | + $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 404 | + $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 405 | + |
|
| 406 | + $post_info[] = array( |
|
| 407 | + "listing_type" => $post_type, |
|
| 408 | + "post_title" => 'Jesmond Mansion', |
|
| 409 | + "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 410 | 410 | |
| 411 | 411 | Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel. |
| 412 | 412 | |
@@ -416,42 +416,42 @@ discard block |
||
| 416 | 416 | |
| 417 | 417 | Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.', |
| 418 | 418 | |
| 419 | - "post_images" => $image_array, |
|
| 420 | - "post_category" => array($post_type.'category' => array($category_array[1])), |
|
| 421 | - "post_tags" => array('Tags', 'Sample Tags'), |
|
| 422 | - "geodir_video" => '', |
|
| 423 | - "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 424 | - "geodir_contact" => '(222) 777-1111', |
|
| 425 | - "geodir_email" => '[email protected]', |
|
| 426 | - "geodir_website" => 'http://example.com/', |
|
| 427 | - "geodir_twitter" => 'http://example.com/', |
|
| 428 | - "geodir_facebook" => 'http://example.com/', |
|
| 429 | - "geodir_price" => '2300000', |
|
| 430 | - "geodir_property_status" => 'Under Offer', |
|
| 431 | - 'geodir_property_furnishing' => 'Partially furnished', |
|
| 432 | - 'geodir_property_type' => 'Detached house', |
|
| 433 | - 'geodir_property_bedrooms' => '10', |
|
| 434 | - 'geodir_property_bathrooms' => '7', |
|
| 435 | - 'geodir_property_area' => '6600', |
|
| 436 | - 'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace', |
|
| 437 | - "post_dummy" => '1' |
|
| 438 | - ); |
|
| 439 | - |
|
| 440 | - break; |
|
| 441 | - |
|
| 442 | - case 5: |
|
| 443 | - $image_array = array(); |
|
| 444 | - $post_meta = array(); |
|
| 445 | - $image_array[] = "$dummy_image_url/ps/psf5.jpg"; |
|
| 446 | - $image_array[] = "$dummy_image_url/ps/psl5.jpg"; |
|
| 447 | - $image_array[] = "$dummy_image_url/ps/psb5.jpg"; |
|
| 448 | - $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 449 | - $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 450 | - |
|
| 451 | - $post_info[] = array( |
|
| 452 | - "listing_type" => $post_type, |
|
| 453 | - "post_title" => 'Springfield Lodge', |
|
| 454 | - "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 419 | + "post_images" => $image_array, |
|
| 420 | + "post_category" => array($post_type.'category' => array($category_array[1])), |
|
| 421 | + "post_tags" => array('Tags', 'Sample Tags'), |
|
| 422 | + "geodir_video" => '', |
|
| 423 | + "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 424 | + "geodir_contact" => '(222) 777-1111', |
|
| 425 | + "geodir_email" => '[email protected]', |
|
| 426 | + "geodir_website" => 'http://example.com/', |
|
| 427 | + "geodir_twitter" => 'http://example.com/', |
|
| 428 | + "geodir_facebook" => 'http://example.com/', |
|
| 429 | + "geodir_price" => '2300000', |
|
| 430 | + "geodir_property_status" => 'Under Offer', |
|
| 431 | + 'geodir_property_furnishing' => 'Partially furnished', |
|
| 432 | + 'geodir_property_type' => 'Detached house', |
|
| 433 | + 'geodir_property_bedrooms' => '10', |
|
| 434 | + 'geodir_property_bathrooms' => '7', |
|
| 435 | + 'geodir_property_area' => '6600', |
|
| 436 | + 'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden,Garage,Private driveway,Fireplace', |
|
| 437 | + "post_dummy" => '1' |
|
| 438 | + ); |
|
| 439 | + |
|
| 440 | + break; |
|
| 441 | + |
|
| 442 | + case 5: |
|
| 443 | + $image_array = array(); |
|
| 444 | + $post_meta = array(); |
|
| 445 | + $image_array[] = "$dummy_image_url/ps/psf5.jpg"; |
|
| 446 | + $image_array[] = "$dummy_image_url/ps/psl5.jpg"; |
|
| 447 | + $image_array[] = "$dummy_image_url/ps/psb5.jpg"; |
|
| 448 | + $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 449 | + $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 450 | + |
|
| 451 | + $post_info[] = array( |
|
| 452 | + "listing_type" => $post_type, |
|
| 453 | + "post_title" => 'Springfield Lodge', |
|
| 454 | + "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 455 | 455 | |
| 456 | 456 | Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel. |
| 457 | 457 | |
@@ -461,42 +461,42 @@ discard block |
||
| 461 | 461 | |
| 462 | 462 | Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.', |
| 463 | 463 | |
| 464 | - "post_images" => $image_array, |
|
| 465 | - "post_category" => array($post_type.'category' => array($category_array[1])), |
|
| 466 | - "post_tags" => array('Tags', 'Sample Tags'), |
|
| 467 | - "geodir_video" => '', |
|
| 468 | - "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 469 | - "geodir_contact" => '(222) 777-1111', |
|
| 470 | - "geodir_email" => '[email protected]', |
|
| 471 | - "geodir_website" => 'http://example.com/', |
|
| 472 | - "geodir_twitter" => 'http://example.com/', |
|
| 473 | - "geodir_facebook" => 'http://example.com/', |
|
| 474 | - "geodir_price" => '330000', |
|
| 475 | - "geodir_property_status" => 'For Sale', |
|
| 476 | - 'geodir_property_furnishing' => 'Optional', |
|
| 477 | - 'geodir_property_type' => 'Detached house', |
|
| 478 | - 'geodir_property_bedrooms' => '4', |
|
| 479 | - 'geodir_property_bathrooms' => '3', |
|
| 480 | - 'geodir_property_area' => '3700', |
|
| 481 | - 'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden', |
|
| 482 | - "post_dummy" => '1' |
|
| 483 | - ); |
|
| 484 | - |
|
| 485 | - break; |
|
| 486 | - |
|
| 487 | - case 6: |
|
| 488 | - $image_array = array(); |
|
| 489 | - $post_meta = array(); |
|
| 490 | - $image_array[] = "$dummy_image_url/ps/psf6.jpg"; |
|
| 491 | - $image_array[] = "$dummy_image_url/ps/psl6.jpg"; |
|
| 492 | - $image_array[] = "$dummy_image_url/ps/psb5.jpg"; |
|
| 493 | - $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 494 | - $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 495 | - |
|
| 496 | - $post_info[] = array( |
|
| 497 | - "listing_type" => $post_type, |
|
| 498 | - "post_title" => 'Forrest Park', |
|
| 499 | - "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 464 | + "post_images" => $image_array, |
|
| 465 | + "post_category" => array($post_type.'category' => array($category_array[1])), |
|
| 466 | + "post_tags" => array('Tags', 'Sample Tags'), |
|
| 467 | + "geodir_video" => '', |
|
| 468 | + "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 469 | + "geodir_contact" => '(222) 777-1111', |
|
| 470 | + "geodir_email" => '[email protected]', |
|
| 471 | + "geodir_website" => 'http://example.com/', |
|
| 472 | + "geodir_twitter" => 'http://example.com/', |
|
| 473 | + "geodir_facebook" => 'http://example.com/', |
|
| 474 | + "geodir_price" => '330000', |
|
| 475 | + "geodir_property_status" => 'For Sale', |
|
| 476 | + 'geodir_property_furnishing' => 'Optional', |
|
| 477 | + 'geodir_property_type' => 'Detached house', |
|
| 478 | + 'geodir_property_bedrooms' => '4', |
|
| 479 | + 'geodir_property_bathrooms' => '3', |
|
| 480 | + 'geodir_property_area' => '3700', |
|
| 481 | + 'geodir_property_features' => 'Select Features/,Oil Central Heating,Double Glazing,Front Garden', |
|
| 482 | + "post_dummy" => '1' |
|
| 483 | + ); |
|
| 484 | + |
|
| 485 | + break; |
|
| 486 | + |
|
| 487 | + case 6: |
|
| 488 | + $image_array = array(); |
|
| 489 | + $post_meta = array(); |
|
| 490 | + $image_array[] = "$dummy_image_url/ps/psf6.jpg"; |
|
| 491 | + $image_array[] = "$dummy_image_url/ps/psl6.jpg"; |
|
| 492 | + $image_array[] = "$dummy_image_url/ps/psb5.jpg"; |
|
| 493 | + $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 494 | + $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 495 | + |
|
| 496 | + $post_info[] = array( |
|
| 497 | + "listing_type" => $post_type, |
|
| 498 | + "post_title" => 'Forrest Park', |
|
| 499 | + "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 500 | 500 | |
| 501 | 501 | Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel. |
| 502 | 502 | |
@@ -506,42 +506,42 @@ discard block |
||
| 506 | 506 | |
| 507 | 507 | Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.', |
| 508 | 508 | |
| 509 | - "post_images" => $image_array, |
|
| 510 | - "post_category" => array($post_type.'category' => array($category_array[1])), |
|
| 511 | - "post_tags" => array('Tags', 'Sample Tags'), |
|
| 512 | - "geodir_video" => '', |
|
| 513 | - "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 514 | - "geodir_contact" => '(222) 777-1111', |
|
| 515 | - "geodir_email" => '[email protected]', |
|
| 516 | - "geodir_website" => 'http://example.com/', |
|
| 517 | - "geodir_twitter" => 'http://example.com/', |
|
| 518 | - "geodir_facebook" => 'http://example.com/', |
|
| 519 | - "geodir_price" => '530000', |
|
| 520 | - "geodir_property_status" => 'For Sale', |
|
| 521 | - 'geodir_property_furnishing' => 'Unfurnished', |
|
| 522 | - 'geodir_property_type' => 'Detached house', |
|
| 523 | - 'geodir_property_bedrooms' => '5', |
|
| 524 | - 'geodir_property_bathrooms' => '4', |
|
| 525 | - 'geodir_property_area' => '2250', |
|
| 526 | - 'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway', |
|
| 527 | - "post_dummy" => '1' |
|
| 528 | - ); |
|
| 529 | - |
|
| 530 | - break; |
|
| 531 | - |
|
| 532 | - case 7: |
|
| 533 | - $image_array = array(); |
|
| 534 | - $post_meta = array(); |
|
| 535 | - $image_array[] = "$dummy_image_url/ps/psf7.jpg"; |
|
| 536 | - $image_array[] = "$dummy_image_url/ps/psl4.jpg"; |
|
| 537 | - $image_array[] = "$dummy_image_url/ps/psb4.jpg"; |
|
| 538 | - $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 539 | - $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 540 | - |
|
| 541 | - $post_info[] = array( |
|
| 542 | - "listing_type" => $post_type, |
|
| 543 | - "post_title" => 'Fraser Suites', |
|
| 544 | - "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 509 | + "post_images" => $image_array, |
|
| 510 | + "post_category" => array($post_type.'category' => array($category_array[1])), |
|
| 511 | + "post_tags" => array('Tags', 'Sample Tags'), |
|
| 512 | + "geodir_video" => '', |
|
| 513 | + "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 514 | + "geodir_contact" => '(222) 777-1111', |
|
| 515 | + "geodir_email" => '[email protected]', |
|
| 516 | + "geodir_website" => 'http://example.com/', |
|
| 517 | + "geodir_twitter" => 'http://example.com/', |
|
| 518 | + "geodir_facebook" => 'http://example.com/', |
|
| 519 | + "geodir_price" => '530000', |
|
| 520 | + "geodir_property_status" => 'For Sale', |
|
| 521 | + 'geodir_property_furnishing' => 'Unfurnished', |
|
| 522 | + 'geodir_property_type' => 'Detached house', |
|
| 523 | + 'geodir_property_bedrooms' => '5', |
|
| 524 | + 'geodir_property_bathrooms' => '4', |
|
| 525 | + 'geodir_property_area' => '2250', |
|
| 526 | + 'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Front Garden,Private driveway', |
|
| 527 | + "post_dummy" => '1' |
|
| 528 | + ); |
|
| 529 | + |
|
| 530 | + break; |
|
| 531 | + |
|
| 532 | + case 7: |
|
| 533 | + $image_array = array(); |
|
| 534 | + $post_meta = array(); |
|
| 535 | + $image_array[] = "$dummy_image_url/ps/psf7.jpg"; |
|
| 536 | + $image_array[] = "$dummy_image_url/ps/psl4.jpg"; |
|
| 537 | + $image_array[] = "$dummy_image_url/ps/psb4.jpg"; |
|
| 538 | + $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 539 | + $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 540 | + |
|
| 541 | + $post_info[] = array( |
|
| 542 | + "listing_type" => $post_type, |
|
| 543 | + "post_title" => 'Fraser Suites', |
|
| 544 | + "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 545 | 545 | |
| 546 | 546 | Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel. |
| 547 | 547 | |
@@ -551,42 +551,42 @@ discard block |
||
| 551 | 551 | |
| 552 | 552 | Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.', |
| 553 | 553 | |
| 554 | - "post_images" => $image_array, |
|
| 555 | - "post_category" => array($post_type.'category' => array($category_array[0])), |
|
| 556 | - "post_tags" => array('Tags', 'Sample Tags'), |
|
| 557 | - "geodir_video" => '', |
|
| 558 | - "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 559 | - "geodir_contact" => '(222) 777-1111', |
|
| 560 | - "geodir_email" => '[email protected]', |
|
| 561 | - "geodir_website" => 'http://example.com/', |
|
| 562 | - "geodir_twitter" => 'http://example.com/', |
|
| 563 | - "geodir_facebook" => 'http://example.com/', |
|
| 564 | - "geodir_price" => '245000', |
|
| 565 | - "geodir_property_status" => 'For Sale', |
|
| 566 | - 'geodir_property_furnishing' => 'Unfurnished', |
|
| 567 | - 'geodir_property_type' => 'Apartment', |
|
| 568 | - 'geodir_property_bedrooms' => '3', |
|
| 569 | - 'geodir_property_bathrooms' => '2', |
|
| 570 | - 'geodir_property_area' => '1250', |
|
| 571 | - 'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing', |
|
| 572 | - "post_dummy" => '1' |
|
| 573 | - ); |
|
| 574 | - |
|
| 575 | - break; |
|
| 576 | - |
|
| 577 | - case 8: |
|
| 578 | - $image_array = array(); |
|
| 579 | - $post_meta = array(); |
|
| 580 | - $image_array[] = "$dummy_image_url/ps/psf8.jpg"; |
|
| 581 | - $image_array[] = "$dummy_image_url/ps/psl2.jpg"; |
|
| 582 | - $image_array[] = "$dummy_image_url/ps/psb2.jpg"; |
|
| 583 | - $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 584 | - $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 585 | - |
|
| 586 | - $post_info[] = array( |
|
| 587 | - "listing_type" => $post_type, |
|
| 588 | - "post_title" => 'Richmore Apartments', |
|
| 589 | - "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 554 | + "post_images" => $image_array, |
|
| 555 | + "post_category" => array($post_type.'category' => array($category_array[0])), |
|
| 556 | + "post_tags" => array('Tags', 'Sample Tags'), |
|
| 557 | + "geodir_video" => '', |
|
| 558 | + "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 559 | + "geodir_contact" => '(222) 777-1111', |
|
| 560 | + "geodir_email" => '[email protected]', |
|
| 561 | + "geodir_website" => 'http://example.com/', |
|
| 562 | + "geodir_twitter" => 'http://example.com/', |
|
| 563 | + "geodir_facebook" => 'http://example.com/', |
|
| 564 | + "geodir_price" => '245000', |
|
| 565 | + "geodir_property_status" => 'For Sale', |
|
| 566 | + 'geodir_property_furnishing' => 'Unfurnished', |
|
| 567 | + 'geodir_property_type' => 'Apartment', |
|
| 568 | + 'geodir_property_bedrooms' => '3', |
|
| 569 | + 'geodir_property_bathrooms' => '2', |
|
| 570 | + 'geodir_property_area' => '1250', |
|
| 571 | + 'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing', |
|
| 572 | + "post_dummy" => '1' |
|
| 573 | + ); |
|
| 574 | + |
|
| 575 | + break; |
|
| 576 | + |
|
| 577 | + case 8: |
|
| 578 | + $image_array = array(); |
|
| 579 | + $post_meta = array(); |
|
| 580 | + $image_array[] = "$dummy_image_url/ps/psf8.jpg"; |
|
| 581 | + $image_array[] = "$dummy_image_url/ps/psl2.jpg"; |
|
| 582 | + $image_array[] = "$dummy_image_url/ps/psb2.jpg"; |
|
| 583 | + $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 584 | + $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 585 | + |
|
| 586 | + $post_info[] = array( |
|
| 587 | + "listing_type" => $post_type, |
|
| 588 | + "post_title" => 'Richmore Apartments', |
|
| 589 | + "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 590 | 590 | |
| 591 | 591 | Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel. |
| 592 | 592 | |
@@ -596,43 +596,43 @@ discard block |
||
| 596 | 596 | |
| 597 | 597 | Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.', |
| 598 | 598 | |
| 599 | - "post_images" => $image_array, |
|
| 600 | - "post_category" => array($post_type.'category' => array($category_array[0])), |
|
| 601 | - "post_tags" => array('Tags', 'Sample Tags'), |
|
| 602 | - "geodir_video" => '', |
|
| 603 | - "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 604 | - "geodir_contact" => '(222) 777-1111', |
|
| 605 | - "geodir_email" => '[email protected]', |
|
| 606 | - "geodir_website" => 'http://example.com/', |
|
| 607 | - "geodir_twitter" => 'http://example.com/', |
|
| 608 | - "geodir_facebook" => 'http://example.com/', |
|
| 609 | - "geodir_price" => '395000', |
|
| 610 | - "geodir_property_status" => 'For Sale', |
|
| 611 | - 'geodir_property_furnishing' => 'Unfurnished', |
|
| 612 | - 'geodir_property_type' => 'Apartment', |
|
| 613 | - 'geodir_property_bedrooms' => '2', |
|
| 614 | - 'geodir_property_bathrooms' => '2', |
|
| 615 | - 'geodir_property_area' => '1750', |
|
| 616 | - 'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage', |
|
| 617 | - "post_dummy" => '1' |
|
| 618 | - ); |
|
| 619 | - |
|
| 620 | - break; |
|
| 621 | - |
|
| 622 | - |
|
| 623 | - case 9: |
|
| 624 | - $image_array = array(); |
|
| 625 | - $post_meta = array(); |
|
| 626 | - $image_array[] = "$dummy_image_url/ps/psf9.jpg"; |
|
| 627 | - $image_array[] = "$dummy_image_url/ps/psc9.jpg"; |
|
| 628 | - $image_array[] = "$dummy_image_url/ps/psb2.jpg"; |
|
| 629 | - $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 630 | - $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 631 | - |
|
| 632 | - $post_info[] = array( |
|
| 633 | - "listing_type" => $post_type, |
|
| 634 | - "post_title" => 'Hotel Alpina', |
|
| 635 | - "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 599 | + "post_images" => $image_array, |
|
| 600 | + "post_category" => array($post_type.'category' => array($category_array[0])), |
|
| 601 | + "post_tags" => array('Tags', 'Sample Tags'), |
|
| 602 | + "geodir_video" => '', |
|
| 603 | + "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 604 | + "geodir_contact" => '(222) 777-1111', |
|
| 605 | + "geodir_email" => '[email protected]', |
|
| 606 | + "geodir_website" => 'http://example.com/', |
|
| 607 | + "geodir_twitter" => 'http://example.com/', |
|
| 608 | + "geodir_facebook" => 'http://example.com/', |
|
| 609 | + "geodir_price" => '395000', |
|
| 610 | + "geodir_property_status" => 'For Sale', |
|
| 611 | + 'geodir_property_furnishing' => 'Unfurnished', |
|
| 612 | + 'geodir_property_type' => 'Apartment', |
|
| 613 | + 'geodir_property_bedrooms' => '2', |
|
| 614 | + 'geodir_property_bathrooms' => '2', |
|
| 615 | + 'geodir_property_area' => '1750', |
|
| 616 | + 'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage', |
|
| 617 | + "post_dummy" => '1' |
|
| 618 | + ); |
|
| 619 | + |
|
| 620 | + break; |
|
| 621 | + |
|
| 622 | + |
|
| 623 | + case 9: |
|
| 624 | + $image_array = array(); |
|
| 625 | + $post_meta = array(); |
|
| 626 | + $image_array[] = "$dummy_image_url/ps/psf9.jpg"; |
|
| 627 | + $image_array[] = "$dummy_image_url/ps/psc9.jpg"; |
|
| 628 | + $image_array[] = "$dummy_image_url/ps/psb2.jpg"; |
|
| 629 | + $image_array[] = "$dummy_image_url/ps/psk.jpg"; |
|
| 630 | + $image_array[] = "$dummy_image_url/ps/psbr.jpg"; |
|
| 631 | + |
|
| 632 | + $post_info[] = array( |
|
| 633 | + "listing_type" => $post_type, |
|
| 634 | + "post_title" => 'Hotel Alpina', |
|
| 635 | + "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 636 | 636 | |
| 637 | 637 | Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel. |
| 638 | 638 | |
@@ -642,39 +642,39 @@ discard block |
||
| 642 | 642 | |
| 643 | 643 | Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.', |
| 644 | 644 | |
| 645 | - "post_images" => $image_array, |
|
| 646 | - "post_category" => array($post_type.'category' => array($category_array[2])), |
|
| 647 | - "post_tags" => array('Tags', 'Sample Tags'), |
|
| 648 | - "geodir_video" => '', |
|
| 649 | - "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 650 | - "geodir_contact" => '(222) 777-1111', |
|
| 651 | - "geodir_email" => '[email protected]', |
|
| 652 | - "geodir_website" => 'http://example.com/', |
|
| 653 | - "geodir_twitter" => 'http://example.com/', |
|
| 654 | - "geodir_facebook" => 'http://example.com/', |
|
| 655 | - "geodir_price" => '12500000', |
|
| 656 | - "geodir_property_status" => 'For Sale', |
|
| 657 | - 'geodir_property_furnishing' => 'Furnished', |
|
| 658 | - 'geodir_property_type' => 'Hotel', |
|
| 659 | - 'geodir_property_bedrooms' => '120', |
|
| 660 | - 'geodir_property_bathrooms' => '133', |
|
| 661 | - 'geodir_property_area' => '35000', |
|
| 662 | - 'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage', |
|
| 663 | - "post_dummy" => '1' |
|
| 664 | - ); |
|
| 665 | - |
|
| 666 | - break; |
|
| 667 | - |
|
| 668 | - case 10: |
|
| 669 | - $image_array = array(); |
|
| 670 | - $post_meta = array(); |
|
| 671 | - $image_array[] = "$dummy_image_url/ps/psf10.jpg"; |
|
| 672 | - $image_array[] = "$dummy_image_url/ps/psf102.jpg"; |
|
| 673 | - |
|
| 674 | - $post_info[] = array( |
|
| 675 | - "listing_type" => $post_type, |
|
| 676 | - "post_title" => 'Development Land', |
|
| 677 | - "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 645 | + "post_images" => $image_array, |
|
| 646 | + "post_category" => array($post_type.'category' => array($category_array[2])), |
|
| 647 | + "post_tags" => array('Tags', 'Sample Tags'), |
|
| 648 | + "geodir_video" => '', |
|
| 649 | + "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 650 | + "geodir_contact" => '(222) 777-1111', |
|
| 651 | + "geodir_email" => '[email protected]', |
|
| 652 | + "geodir_website" => 'http://example.com/', |
|
| 653 | + "geodir_twitter" => 'http://example.com/', |
|
| 654 | + "geodir_facebook" => 'http://example.com/', |
|
| 655 | + "geodir_price" => '12500000', |
|
| 656 | + "geodir_property_status" => 'For Sale', |
|
| 657 | + 'geodir_property_furnishing' => 'Furnished', |
|
| 658 | + 'geodir_property_type' => 'Hotel', |
|
| 659 | + 'geodir_property_bedrooms' => '120', |
|
| 660 | + 'geodir_property_bathrooms' => '133', |
|
| 661 | + 'geodir_property_area' => '35000', |
|
| 662 | + 'geodir_property_features' => 'Select Features/,Gas Central Heating,Double Glazing,Garage', |
|
| 663 | + "post_dummy" => '1' |
|
| 664 | + ); |
|
| 665 | + |
|
| 666 | + break; |
|
| 667 | + |
|
| 668 | + case 10: |
|
| 669 | + $image_array = array(); |
|
| 670 | + $post_meta = array(); |
|
| 671 | + $image_array[] = "$dummy_image_url/ps/psf10.jpg"; |
|
| 672 | + $image_array[] = "$dummy_image_url/ps/psf102.jpg"; |
|
| 673 | + |
|
| 674 | + $post_info[] = array( |
|
| 675 | + "listing_type" => $post_type, |
|
| 676 | + "post_title" => 'Development Land', |
|
| 677 | + "post_desc" => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut fringilla ipsum congue enim elementum ornare. Vestibulum id ipsum ac massa malesuada rutrum. Curabitur id erat nec mauris hendrerit pretium. Aliquam pretium sollicitudin enim ac hendrerit. Phasellus et enim elit. Mauris ac maximus enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut ut cursus leo. Aenean lacinia risus ut ex sodales, a dictum eros vulputate. Sed ornare ex eget velit fringilla luctus. Etiam a purus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam non felis ultrices, dignissim metus mattis, interdum urna. |
|
| 678 | 678 | |
| 679 | 679 | Vivamus at ipsum consectetur, pellentesque lectus vitae, vulputate leo. Cras tincidunt suscipit vulputate. Aenean pretium diam dui, efficitur porttitor lorem cursus in. Aenean convallis, mauris quis fermentum vehicula, purus libero fringilla lorem, placerat ultricies magna velit sit amet neque. Aenean tempor ut eros et volutpat. Proin ac lacus et odio volutpat aliquet. Proin at erat enim. Vivamus venenatis dictum magna, id dignissim lacus molestie non. Nullam ornare placerat metus, quis aliquam orci tincidunt at. Sed semper imperdiet arcu, eu convallis eros fringilla vel. |
| 680 | 680 | |
@@ -684,93 +684,93 @@ discard block |
||
| 684 | 684 | |
| 685 | 685 | Mauris ac elit vitae massa dignissim posuere. Sed blandit nibh ut elementum ullamcorper. Nunc facilisis elit eget lorem bibendum, eu fermentum neque ultrices. Etiam vestibulum gravida sollicitudin. Nullam velit quam, luctus vel suscipit id, ullamcorper sit amet ipsum. Donec a elit ac lorem porttitor gravida. Sed non dui sed lacus vulputate varius. Nullam in tincidunt odio, ac pharetra mauris. Integer ac volutpat quam. Mauris fermentum facilisis porttitor. Nunc ornare vel erat volutpat consectetur. Phasellus ut lacinia ante. Vestibulum massa orci, tincidunt sit amet urna in, maximus mollis ligula.', |
| 686 | 686 | |
| 687 | - "post_images" => $image_array, |
|
| 688 | - "post_category" => array($post_type.'category' => array($category_array[3])), |
|
| 689 | - "post_tags" => array('Tags', 'Sample Tags'), |
|
| 690 | - "geodir_video" => '', |
|
| 691 | - "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 692 | - "geodir_contact" => '(222) 777-1111', |
|
| 693 | - "geodir_email" => '[email protected]', |
|
| 694 | - "geodir_website" => 'http://example.com/', |
|
| 695 | - "geodir_twitter" => 'http://example.com/', |
|
| 696 | - "geodir_facebook" => 'http://example.com/', |
|
| 697 | - "geodir_price" => '80000', |
|
| 698 | - "geodir_property_status" => 'For Sale', |
|
| 699 | - 'geodir_property_furnishing' => '', |
|
| 700 | - 'geodir_property_type' => 'Land', |
|
| 701 | - 'geodir_property_bedrooms' => '', |
|
| 702 | - 'geodir_property_bathrooms' => '', |
|
| 703 | - 'geodir_property_area' => '250000', |
|
| 704 | - 'geodir_property_features' => '', |
|
| 705 | - "post_dummy" => '1' |
|
| 706 | - ); |
|
| 707 | - |
|
| 708 | - break; |
|
| 687 | + "post_images" => $image_array, |
|
| 688 | + "post_category" => array($post_type.'category' => array($category_array[3])), |
|
| 689 | + "post_tags" => array('Tags', 'Sample Tags'), |
|
| 690 | + "geodir_video" => '', |
|
| 691 | + "geodir_timing" => 'Viewing Sunday 10 am to 9 pm', |
|
| 692 | + "geodir_contact" => '(222) 777-1111', |
|
| 693 | + "geodir_email" => '[email protected]', |
|
| 694 | + "geodir_website" => 'http://example.com/', |
|
| 695 | + "geodir_twitter" => 'http://example.com/', |
|
| 696 | + "geodir_facebook" => 'http://example.com/', |
|
| 697 | + "geodir_price" => '80000', |
|
| 698 | + "geodir_property_status" => 'For Sale', |
|
| 699 | + 'geodir_property_furnishing' => '', |
|
| 700 | + 'geodir_property_type' => 'Land', |
|
| 701 | + 'geodir_property_bedrooms' => '', |
|
| 702 | + 'geodir_property_bathrooms' => '', |
|
| 703 | + 'geodir_property_area' => '250000', |
|
| 704 | + 'geodir_property_features' => '', |
|
| 705 | + "post_dummy" => '1' |
|
| 706 | + ); |
|
| 707 | + |
|
| 708 | + break; |
|
| 709 | 709 | |
| 710 | 710 | } // end of switch |
| 711 | 711 | |
| 712 | 712 | foreach ($post_info as $post_info) { |
| 713 | - $default_location = geodir_get_default_location(); |
|
| 714 | - if ($city_bound_lat1 > $city_bound_lat2) |
|
| 715 | - $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1)); |
|
| 716 | - else |
|
| 717 | - $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2)); |
|
| 713 | + $default_location = geodir_get_default_location(); |
|
| 714 | + if ($city_bound_lat1 > $city_bound_lat2) |
|
| 715 | + $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1)); |
|
| 716 | + else |
|
| 717 | + $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2)); |
|
| 718 | 718 | |
| 719 | 719 | |
| 720 | - if ($city_bound_lng1 > $city_bound_lng2) |
|
| 721 | - $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1)); |
|
| 722 | - else |
|
| 723 | - $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2)); |
|
| 720 | + if ($city_bound_lng1 > $city_bound_lng2) |
|
| 721 | + $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1)); |
|
| 722 | + else |
|
| 723 | + $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2)); |
|
| 724 | 724 | |
| 725 | - $load_map = get_option('geodir_load_map'); |
|
| 725 | + $load_map = get_option('geodir_load_map'); |
|
| 726 | 726 | |
| 727 | - if ($load_map == 'osm') { |
|
| 728 | - $post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude); |
|
| 729 | - } else { |
|
| 730 | - $post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude); |
|
| 731 | - } |
|
| 732 | - |
|
| 733 | - $postal_code = ''; |
|
| 734 | - if (!empty($post_address)) { |
|
| 735 | - if ($load_map == 'osm') { |
|
| 736 | - $address = !empty($post_address->formatted_address) ? $post_address->formatted_address : ''; |
|
| 737 | - $postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : ''; |
|
| 738 | - } else { |
|
| 739 | - $addresses = array(); |
|
| 740 | - $addresses_default = array(); |
|
| 727 | + if ($load_map == 'osm') { |
|
| 728 | + $post_address = geodir_get_osm_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude); |
|
| 729 | + } else { |
|
| 730 | + $post_address = geodir_get_address_by_lat_lan($dummy_post_latitude, $dummy_post_longitude); |
|
| 731 | + } |
|
| 732 | + |
|
| 733 | + $postal_code = ''; |
|
| 734 | + if (!empty($post_address)) { |
|
| 735 | + if ($load_map == 'osm') { |
|
| 736 | + $address = !empty($post_address->formatted_address) ? $post_address->formatted_address : ''; |
|
| 737 | + $postal_code = !empty($post_address->address->postcode) ? $post_address->address->postcode : ''; |
|
| 738 | + } else { |
|
| 739 | + $addresses = array(); |
|
| 740 | + $addresses_default = array(); |
|
| 741 | 741 | |
| 742 | - foreach ($post_address as $add_key => $add_value) { |
|
| 743 | - if ($add_key < 2 && !empty($add_value->long_name)) { |
|
| 744 | - $addresses_default[] = $add_value->long_name; |
|
| 745 | - } |
|
| 746 | - if ($add_value->types[0] == 'postal_code') { |
|
| 747 | - $postal_code = $add_value->long_name; |
|
| 748 | - } |
|
| 749 | - if ($add_value->types[0] == 'street_number') { |
|
| 750 | - $addresses[] = $add_value->long_name; |
|
| 751 | - } |
|
| 752 | - if ($add_value->types[0] == 'route') { |
|
| 753 | - $addresses[] = $add_value->long_name; |
|
| 754 | - } |
|
| 755 | - if ($add_value->types[0] == 'neighborhood') { |
|
| 756 | - $addresses[] = $add_value->long_name; |
|
| 757 | - } |
|
| 758 | - if ($add_value->types[0] == 'sublocality') { |
|
| 759 | - $addresses[] = $add_value->long_name; |
|
| 760 | - } |
|
| 761 | - } |
|
| 762 | - $address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : ''); |
|
| 763 | - } |
|
| 764 | - |
|
| 765 | - $post_info['post_address'] = !empty($address) ? $address : $default_location->city; |
|
| 766 | - $post_info['post_city'] = $default_location->city; |
|
| 767 | - $post_info['post_region'] = $default_location->region; |
|
| 768 | - $post_info['post_country'] = $default_location->country; |
|
| 769 | - $post_info['post_zip'] = $postal_code; |
|
| 770 | - $post_info['post_latitude'] = $dummy_post_latitude; |
|
| 771 | - $post_info['post_longitude'] = $dummy_post_longitude; |
|
| 772 | - } |
|
| 742 | + foreach ($post_address as $add_key => $add_value) { |
|
| 743 | + if ($add_key < 2 && !empty($add_value->long_name)) { |
|
| 744 | + $addresses_default[] = $add_value->long_name; |
|
| 745 | + } |
|
| 746 | + if ($add_value->types[0] == 'postal_code') { |
|
| 747 | + $postal_code = $add_value->long_name; |
|
| 748 | + } |
|
| 749 | + if ($add_value->types[0] == 'street_number') { |
|
| 750 | + $addresses[] = $add_value->long_name; |
|
| 751 | + } |
|
| 752 | + if ($add_value->types[0] == 'route') { |
|
| 753 | + $addresses[] = $add_value->long_name; |
|
| 754 | + } |
|
| 755 | + if ($add_value->types[0] == 'neighborhood') { |
|
| 756 | + $addresses[] = $add_value->long_name; |
|
| 757 | + } |
|
| 758 | + if ($add_value->types[0] == 'sublocality') { |
|
| 759 | + $addresses[] = $add_value->long_name; |
|
| 760 | + } |
|
| 761 | + } |
|
| 762 | + $address = !empty($addresses) ? implode(', ', $addresses) : (!empty($addresses_default) ? implode(', ', $addresses_default) : ''); |
|
| 763 | + } |
|
| 764 | + |
|
| 765 | + $post_info['post_address'] = !empty($address) ? $address : $default_location->city; |
|
| 766 | + $post_info['post_city'] = $default_location->city; |
|
| 767 | + $post_info['post_region'] = $default_location->region; |
|
| 768 | + $post_info['post_country'] = $default_location->country; |
|
| 769 | + $post_info['post_zip'] = $postal_code; |
|
| 770 | + $post_info['post_latitude'] = $dummy_post_latitude; |
|
| 771 | + $post_info['post_longitude'] = $dummy_post_longitude; |
|
| 772 | + } |
|
| 773 | 773 | |
| 774 | - geodir_save_listing($post_info, true); |
|
| 775 | - echo 1; |
|
| 774 | + geodir_save_listing($post_info, true); |
|
| 775 | + echo 1; |
|
| 776 | 776 | } |
@@ -6,9 +6,9 @@ discard block |
||
| 6 | 6 | * @package GeoDirectory |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | -function geodir_property_sale_custom_fields($post_type='gd_place',$package_id=''){ |
|
| 9 | +function geodir_property_sale_custom_fields($post_type = 'gd_place', $package_id = '') { |
|
| 10 | 10 | $fields = array(); |
| 11 | - $package = ($package_id=='') ? '' : array($package_id); |
|
| 11 | + $package = ($package_id == '') ? '' : array($package_id); |
|
| 12 | 12 | |
| 13 | 13 | // Salary |
| 14 | 14 | $fields[] = array('listing_type' => $post_type, |
@@ -48,15 +48,15 @@ discard block |
||
| 48 | 48 | 'field_type' => 'select', |
| 49 | 49 | 'data_type' => 'VARCHAR', |
| 50 | 50 | 'admin_title' => __('Job Type', 'geodirectory'), |
| 51 | - 'site_title' => __('Job Type','geodirectory'), |
|
| 52 | - 'admin_desc' => __('Select the type of job.','geodirectory'), |
|
| 51 | + 'site_title' => __('Job Type', 'geodirectory'), |
|
| 52 | + 'admin_desc' => __('Select the type of job.', 'geodirectory'), |
|
| 53 | 53 | 'htmlvar_name' => 'job_type', |
| 54 | 54 | 'is_active' => true, |
| 55 | 55 | 'for_admin_use' => false, |
| 56 | 56 | 'default_value' => '', |
| 57 | 57 | 'show_in' => '[detail],[listing]', |
| 58 | 58 | 'is_required' => true, |
| 59 | - 'option_values' => __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'), |
|
| 59 | + 'option_values' => __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other', 'geodirectory'), |
|
| 60 | 60 | 'validation_pattern' => '', |
| 61 | 61 | 'validation_msg' => '', |
| 62 | 62 | 'required_msg' => '', |
@@ -70,16 +70,16 @@ discard block |
||
| 70 | 70 | $fields[] = array('listing_type' => $post_type, |
| 71 | 71 | 'field_type' => 'select', |
| 72 | 72 | 'data_type' => 'VARCHAR', |
| 73 | - 'admin_title' => __('Job Sector','geodirectory'), |
|
| 74 | - 'site_title' => __('Job Sector','geodirectory'), |
|
| 75 | - 'admin_desc' => __('Select the job sector.','geodirectory'), |
|
| 73 | + 'admin_title' => __('Job Sector', 'geodirectory'), |
|
| 74 | + 'site_title' => __('Job Sector', 'geodirectory'), |
|
| 75 | + 'admin_desc' => __('Select the job sector.', 'geodirectory'), |
|
| 76 | 76 | 'htmlvar_name' => 'job_sector', |
| 77 | 77 | 'is_active' => true, |
| 78 | 78 | 'for_admin_use' => false, |
| 79 | 79 | 'default_value' => '', |
| 80 | 80 | 'show_in' => '[detail]', |
| 81 | 81 | 'is_required' => true, |
| 82 | - 'option_values' => __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'), |
|
| 82 | + 'option_values' => __('Select Sector/,Private Sector,Public Sector,Agencies', 'geodirectory'), |
|
| 83 | 83 | 'validation_pattern' => '', |
| 84 | 84 | 'validation_msg' => '', |
| 85 | 85 | 'required_msg' => '', |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | 'default_value' => '', |
| 103 | 103 | 'show_in' => '[detail],[listing]', |
| 104 | 104 | 'is_required' => true, |
| 105 | - 'option_values' => __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years','geodirectory'), |
|
| 105 | + 'option_values' => __('Select Experience/,No Experience Required,1 Year,2 Years,3 Years,4 Years,5 Years,6 Years,7 Years,8 Years,9 Years,10+ Years', 'geodirectory'), |
|
| 106 | 106 | 'validation_pattern' => '', |
| 107 | 107 | 'validation_msg' => '', |
| 108 | 108 | 'required_msg' => '', |
@@ -235,24 +235,24 @@ discard block |
||
| 235 | 235 | return $fields; |
| 236 | 236 | } |
| 237 | 237 | |
| 238 | -global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2,$wpdb, $current_user,$dummy_post_index; |
|
| 238 | +global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2, $wpdb, $current_user, $dummy_post_index; |
|
| 239 | 239 | $post_info = array(); |
| 240 | 240 | $image_array = array(); |
| 241 | 241 | $post_meta = array(); |
| 242 | 242 | $category_array = array('Apartments', 'Houses', 'Commercial', 'Land'); |
| 243 | 243 | |
| 244 | -if($dummy_post_index==1){ |
|
| 244 | +if ($dummy_post_index == 1) { |
|
| 245 | 245 | // add the dummy categories |
| 246 | - geodir_dummy_data_taxonomies($post_type,$category_array ); |
|
| 246 | + geodir_dummy_data_taxonomies($post_type, $category_array); |
|
| 247 | 247 | |
| 248 | 248 | // add the dummy custom fields |
| 249 | 249 | $fields = geodir_property_sale_custom_fields($post_type); |
| 250 | 250 | geodir_create_dummy_fields($fields); |
| 251 | - update_option($post_type.'_dummy_data_type','property_sale'); |
|
| 251 | + update_option($post_type.'_dummy_data_type', 'property_sale'); |
|
| 252 | 252 | } |
| 253 | 253 | |
| 254 | 254 | if (geodir_dummy_folder_exists()) |
| 255 | - $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy"; |
|
| 255 | + $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy"; |
|
| 256 | 256 | else |
| 257 | 257 | $dummy_image_url = 'http://www.wpgeodirectory.com/dummy'; |
| 258 | 258 | |
@@ -231,10 +231,11 @@ discard block |
||
| 231 | 231 | update_option($post_type.'_dummy_data_type','property_sale'); |
| 232 | 232 | } |
| 233 | 233 | |
| 234 | -if (geodir_dummy_folder_exists()) |
|
| 234 | +if (geodir_dummy_folder_exists()) { |
|
| 235 | 235 | $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy"; |
| 236 | -else |
|
| 236 | +} else { |
|
| 237 | 237 | $dummy_image_url = 'http://www.wpgeodirectory.com/dummy'; |
| 238 | +} |
|
| 238 | 239 | |
| 239 | 240 | $dummy_image_url = apply_filters('place_dummy_image_url', $dummy_image_url); |
| 240 | 241 | |
@@ -691,16 +692,18 @@ discard block |
||
| 691 | 692 | |
| 692 | 693 | foreach ($post_info as $post_info) { |
| 693 | 694 | $default_location = geodir_get_default_location(); |
| 694 | - if ($city_bound_lat1 > $city_bound_lat2) |
|
| 695 | - $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1)); |
|
| 696 | - else |
|
| 697 | - $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2)); |
|
| 695 | + if ($city_bound_lat1 > $city_bound_lat2) { |
|
| 696 | + $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat1, $city_bound_lat2), geodir_random_float($city_bound_lat2, $city_bound_lat1)); |
|
| 697 | + } else { |
|
| 698 | + $dummy_post_latitude = geodir_random_float(geodir_random_float($city_bound_lat2, $city_bound_lat1), geodir_random_float($city_bound_lat1, $city_bound_lat2)); |
|
| 699 | + } |
|
| 698 | 700 | |
| 699 | 701 | |
| 700 | - if ($city_bound_lng1 > $city_bound_lng2) |
|
| 701 | - $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1)); |
|
| 702 | - else |
|
| 703 | - $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2)); |
|
| 702 | + if ($city_bound_lng1 > $city_bound_lng2) { |
|
| 703 | + $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng1, $city_bound_lng2), geodir_random_float($city_bound_lng2, $city_bound_lng1)); |
|
| 704 | + } else { |
|
| 705 | + $dummy_post_longitude = geodir_random_float(geodir_random_float($city_bound_lng2, $city_bound_lng1), geodir_random_float($city_bound_lng1, $city_bound_lng2)); |
|
| 706 | + } |
|
| 704 | 707 | |
| 705 | 708 | $load_map = get_option('geodir_load_map'); |
| 706 | 709 | |
