GeoDirectory /
geodirectory
@@ -17,10 +17,10 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | function gd_compat_styles() |
| 19 | 19 | {
|
| 20 | - $tc = get_option('theme_compatibility_setting');
|
|
| 21 | - echo "<style id='gd-compat-styles' type='text/css'>"; |
|
| 22 | - echo $tc['geodir_theme_compat_css']; |
|
| 23 | - echo "</style>"; |
|
| 20 | + $tc = get_option('theme_compatibility_setting');
|
|
| 21 | + echo "<style id='gd-compat-styles' type='text/css'>"; |
|
| 22 | + echo $tc['geodir_theme_compat_css']; |
|
| 23 | + echo "</style>"; |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | function gd_compat_script() |
| 33 | 33 | {
|
| 34 | - $tc = get_option('theme_compatibility_setting');
|
|
| 35 | - echo "<script>"; |
|
| 36 | - echo $tc['geodir_theme_compat_js']; |
|
| 37 | - echo " </script>"; |
|
| 34 | + $tc = get_option('theme_compatibility_setting');
|
|
| 35 | + echo "<script>"; |
|
| 36 | + echo $tc['geodir_theme_compat_js']; |
|
| 37 | + echo " </script>"; |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | /** |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | function geodir_top_content_add_dynamic() |
| 49 | 49 | {
|
| 50 | - $tc = get_option('theme_compatibility_setting');
|
|
| 51 | - echo $tc['geodir_top_content_add']; |
|
| 50 | + $tc = get_option('theme_compatibility_setting');
|
|
| 51 | + echo $tc['geodir_top_content_add']; |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -61,8 +61,8 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | function geodir_before_main_content_add_dynamic() |
| 63 | 63 | {
|
| 64 | - $tc = get_option('theme_compatibility_setting');
|
|
| 65 | - echo $tc['geodir_before_main_content_add']; |
|
| 64 | + $tc = get_option('theme_compatibility_setting');
|
|
| 65 | + echo $tc['geodir_before_main_content_add']; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | /** |
@@ -75,8 +75,8 @@ discard block |
||
| 75 | 75 | */ |
| 76 | 76 | function geodir_full_page_class_dynamic() |
| 77 | 77 | {
|
| 78 | - $tc = get_option('theme_compatibility_setting');
|
|
| 79 | - return $tc['geodir_full_page_class_filter']; |
|
| 78 | + $tc = get_option('theme_compatibility_setting');
|
|
| 79 | + return $tc['geodir_full_page_class_filter']; |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | /** |
@@ -89,8 +89,8 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | function geodir_before_widget_dynamic() |
| 91 | 91 | {
|
| 92 | - $tc = get_option('theme_compatibility_setting');
|
|
| 93 | - return $tc['geodir_before_widget_filter']; |
|
| 92 | + $tc = get_option('theme_compatibility_setting');
|
|
| 93 | + return $tc['geodir_before_widget_filter']; |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | /** |
@@ -103,8 +103,8 @@ discard block |
||
| 103 | 103 | */ |
| 104 | 104 | function geodir_after_widget_dynamic() |
| 105 | 105 | {
|
| 106 | - $tc = get_option('theme_compatibility_setting');
|
|
| 107 | - return $tc['geodir_after_widget_filter']; |
|
| 106 | + $tc = get_option('theme_compatibility_setting');
|
|
| 107 | + return $tc['geodir_after_widget_filter']; |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | /** |
@@ -117,8 +117,8 @@ discard block |
||
| 117 | 117 | */ |
| 118 | 118 | function geodir_before_title_dynamic() |
| 119 | 119 | {
|
| 120 | - $tc = get_option('theme_compatibility_setting');
|
|
| 121 | - return $tc['geodir_before_title_filter']; |
|
| 120 | + $tc = get_option('theme_compatibility_setting');
|
|
| 121 | + return $tc['geodir_before_title_filter']; |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | /** |
@@ -131,8 +131,8 @@ discard block |
||
| 131 | 131 | */ |
| 132 | 132 | function geodir_after_title_dynamic() |
| 133 | 133 | {
|
| 134 | - $tc = get_option('theme_compatibility_setting');
|
|
| 135 | - return $tc['geodir_after_title_filter']; |
|
| 134 | + $tc = get_option('theme_compatibility_setting');
|
|
| 135 | + return $tc['geodir_after_title_filter']; |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | /** |
@@ -145,8 +145,8 @@ discard block |
||
| 145 | 145 | */ |
| 146 | 146 | function geodir_menu_li_class_dynamic() |
| 147 | 147 | {
|
| 148 | - $tc = get_option('theme_compatibility_setting');
|
|
| 149 | - return $tc['geodir_menu_li_class_filter']; |
|
| 148 | + $tc = get_option('theme_compatibility_setting');
|
|
| 149 | + return $tc['geodir_menu_li_class_filter']; |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | /** |
@@ -159,8 +159,8 @@ discard block |
||
| 159 | 159 | */ |
| 160 | 160 | function geodir_sub_menu_ul_class_dynamic() |
| 161 | 161 | {
|
| 162 | - $tc = get_option('theme_compatibility_setting');
|
|
| 163 | - return $tc['geodir_sub_menu_ul_class_filter']; |
|
| 162 | + $tc = get_option('theme_compatibility_setting');
|
|
| 163 | + return $tc['geodir_sub_menu_ul_class_filter']; |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | /** |
@@ -173,8 +173,8 @@ discard block |
||
| 173 | 173 | */ |
| 174 | 174 | function geodir_sub_menu_li_class_dynamic() |
| 175 | 175 | {
|
| 176 | - $tc = get_option('theme_compatibility_setting');
|
|
| 177 | - return $tc['geodir_sub_menu_li_class_filter']; |
|
| 176 | + $tc = get_option('theme_compatibility_setting');
|
|
| 177 | + return $tc['geodir_sub_menu_li_class_filter']; |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | /** |
@@ -187,8 +187,8 @@ discard block |
||
| 187 | 187 | */ |
| 188 | 188 | function geodir_menu_a_class_dynamic() |
| 189 | 189 | {
|
| 190 | - $tc = get_option('theme_compatibility_setting');
|
|
| 191 | - return $tc['geodir_menu_a_class_filter']; |
|
| 190 | + $tc = get_option('theme_compatibility_setting');
|
|
| 191 | + return $tc['geodir_menu_a_class_filter']; |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | /** |
@@ -201,8 +201,8 @@ discard block |
||
| 201 | 201 | */ |
| 202 | 202 | function geodir_sub_menu_a_class_dynamic() |
| 203 | 203 | {
|
| 204 | - $tc = get_option('theme_compatibility_setting');
|
|
| 205 | - return $tc['geodir_sub_menu_a_class_filter']; |
|
| 204 | + $tc = get_option('theme_compatibility_setting');
|
|
| 205 | + return $tc['geodir_sub_menu_a_class_filter']; |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | /** |
@@ -215,8 +215,8 @@ discard block |
||
| 215 | 215 | */ |
| 216 | 216 | function geodir_location_switcher_menu_li_class_dynamic() |
| 217 | 217 | {
|
| 218 | - $tc = get_option('theme_compatibility_setting');
|
|
| 219 | - return $tc['geodir_location_switcher_menu_li_class_filter']; |
|
| 218 | + $tc = get_option('theme_compatibility_setting');
|
|
| 219 | + return $tc['geodir_location_switcher_menu_li_class_filter']; |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | /** |
@@ -229,8 +229,8 @@ discard block |
||
| 229 | 229 | */ |
| 230 | 230 | function geodir_location_switcher_menu_a_class_dynamic() |
| 231 | 231 | {
|
| 232 | - $tc = get_option('theme_compatibility_setting');
|
|
| 233 | - return $tc['geodir_location_switcher_menu_a_class_filter']; |
|
| 232 | + $tc = get_option('theme_compatibility_setting');
|
|
| 233 | + return $tc['geodir_location_switcher_menu_a_class_filter']; |
|
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | /** |
@@ -243,8 +243,8 @@ discard block |
||
| 243 | 243 | */ |
| 244 | 244 | function geodir_location_switcher_menu_sub_ul_class_dynamic() |
| 245 | 245 | {
|
| 246 | - $tc = get_option('theme_compatibility_setting');
|
|
| 247 | - return $tc['geodir_location_switcher_menu_sub_ul_class_filter']; |
|
| 246 | + $tc = get_option('theme_compatibility_setting');
|
|
| 247 | + return $tc['geodir_location_switcher_menu_sub_ul_class_filter']; |
|
| 248 | 248 | } |
| 249 | 249 | |
| 250 | 250 | /** |
@@ -257,8 +257,8 @@ discard block |
||
| 257 | 257 | */ |
| 258 | 258 | function geodir_location_switcher_menu_sub_li_class_dynamic() |
| 259 | 259 | {
|
| 260 | - $tc = get_option('theme_compatibility_setting');
|
|
| 261 | - return $tc['geodir_location_switcher_menu_sub_li_class_filter']; |
|
| 260 | + $tc = get_option('theme_compatibility_setting');
|
|
| 261 | + return $tc['geodir_location_switcher_menu_sub_li_class_filter']; |
|
| 262 | 262 | } |
| 263 | 263 | |
| 264 | 264 | |
@@ -275,107 +275,107 @@ discard block |
||
| 275 | 275 | function geodir_content_actions_dynamic() |
| 276 | 276 | {
|
| 277 | 277 | |
| 278 | - $tc = get_option('theme_compatibility_setting');
|
|
| 278 | + $tc = get_option('theme_compatibility_setting');
|
|
| 279 | 279 | //print_r($tc); |
| 280 | - if (empty($tc)) {
|
|
| 281 | - return; |
|
| 282 | - } |
|
| 283 | - |
|
| 284 | - //php |
|
| 285 | - if (!empty($tc['geodir_theme_compat_code'])) {
|
|
| 286 | - include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');
|
|
| 287 | - } |
|
| 288 | - |
|
| 289 | - //geodir_full_page_class |
|
| 290 | - if (!empty($tc['geodir_full_page_class_filter'])) {
|
|
| 291 | - add_filter('geodir_full_page_class', 'geodir_full_page_class_dynamic', 10);
|
|
| 292 | - } |
|
| 293 | - |
|
| 294 | - //widget before filter |
|
| 295 | - if (!empty($tc['geodir_before_widget_filter'])) {
|
|
| 296 | - add_filter('geodir_before_widget', 'geodir_before_widget_dynamic', 10);
|
|
| 297 | - } |
|
| 298 | - |
|
| 299 | - //widget after filter |
|
| 300 | - if (!empty($tc['geodir_after_widget_filter'])) {
|
|
| 301 | - add_filter('geodir_after_widget', 'geodir_after_widget_dynamic', 10);
|
|
| 302 | - } |
|
| 303 | - |
|
| 304 | - //widget before title filter |
|
| 305 | - if (!empty($tc['geodir_before_title_filter'])) {
|
|
| 306 | - add_filter('geodir_before_title', 'geodir_before_title_dynamic', 10);
|
|
| 307 | - } |
|
| 308 | - |
|
| 309 | - //widget before title filter |
|
| 310 | - if (!empty($tc['geodir_after_title_filter'])) {
|
|
| 311 | - add_filter('geodir_after_title', 'geodir_after_title_dynamic', 10);
|
|
| 312 | - } |
|
| 313 | - |
|
| 314 | - //menu li class |
|
| 315 | - if (!empty($tc['geodir_menu_li_class_filter'])) {
|
|
| 316 | - add_filter('geodir_menu_li_class', 'geodir_menu_li_class_dynamic', 10);
|
|
| 317 | - } |
|
| 318 | - |
|
| 319 | - //menu ul class |
|
| 320 | - if (!empty($tc['geodir_sub_menu_ul_class_filter'])) {
|
|
| 321 | - add_filter('geodir_sub_menu_ul_class', 'geodir_sub_menu_ul_class_dynamic', 10);
|
|
| 322 | - } |
|
| 323 | - |
|
| 324 | - //menu sub li class |
|
| 325 | - if (!empty($tc['geodir_sub_menu_li_class_filter'])) {
|
|
| 326 | - add_filter('geodir_sub_menu_li_class', 'geodir_sub_menu_li_class_dynamic', 10);
|
|
| 327 | - } |
|
| 328 | - |
|
| 329 | - //menu a class |
|
| 330 | - if (!empty($tc['geodir_menu_a_class_filter'])) {
|
|
| 331 | - add_filter('geodir_menu_a_class', 'geodir_menu_a_class_dynamic', 10);
|
|
| 332 | - } |
|
| 333 | - |
|
| 334 | - //menu sub a class |
|
| 335 | - if (!empty($tc['geodir_sub_menu_a_class_filter'])) {
|
|
| 336 | - add_filter('geodir_sub_menu_a_class', 'geodir_sub_menu_a_class_dynamic', 10);
|
|
| 337 | - } |
|
| 338 | - |
|
| 339 | - //location menu li class |
|
| 340 | - if (!empty($tc['geodir_location_switcher_menu_li_class_filter'])) {
|
|
| 341 | - add_filter('geodir_location_switcher_menu_li_class', 'geodir_location_switcher_menu_li_class_dynamic', 10);
|
|
| 342 | - } |
|
| 343 | - |
|
| 344 | - //location menu sub ul class |
|
| 345 | - if (!empty($tc['geodir_location_switcher_menu_sub_ul_class_filter'])) {
|
|
| 346 | - add_filter('geodir_location_switcher_menu_sub_ul_class', 'geodir_location_switcher_menu_sub_ul_class_dynamic', 10);
|
|
| 347 | - } |
|
| 348 | - |
|
| 349 | - //location menu sub li class |
|
| 350 | - if (!empty($tc['geodir_location_switcher_menu_sub_li_class_filter'])) {
|
|
| 351 | - add_filter('geodir_location_switcher_menu_sub_li_class', 'geodir_location_switcher_menu_sub_li_class_dynamic', 10);
|
|
| 352 | - } |
|
| 353 | - |
|
| 354 | - //location menu a class |
|
| 355 | - if (!empty($tc['geodir_location_switcher_menu_a_class_filter'])) {
|
|
| 356 | - add_filter('geodir_location_switcher_menu_a_class', 'geodir_location_switcher_menu_a_class_dynamic', 10);
|
|
| 357 | - } |
|
| 358 | - |
|
| 359 | - // compat styles |
|
| 360 | - if (!empty($tc['geodir_theme_compat_css'])) {
|
|
| 361 | - add_action('wp_head', 'gd_compat_styles');
|
|
| 362 | - } |
|
| 363 | - |
|
| 364 | - // compat js |
|
| 365 | - if (!empty($tc['geodir_theme_compat_js'])) {
|
|
| 366 | - add_action('wp_footer', 'gd_compat_script');
|
|
| 367 | - } |
|
| 368 | - |
|
| 369 | - |
|
| 370 | - // geodir_top_content_add |
|
| 371 | - if (!empty($tc['geodir_top_content_add'])) {
|
|
| 372 | - add_action('geodir_top_content', 'geodir_top_content_add_dynamic', 10, 1);
|
|
| 373 | - } |
|
| 374 | - |
|
| 375 | - // geodir_before_main_content_add |
|
| 376 | - if (!empty($tc['geodir_before_main_content_add'])) {
|
|
| 377 | - add_action('geodir_before_main_content', 'geodir_before_main_content_add_dynamic', 10, 1);
|
|
| 378 | - } |
|
| 280 | + if (empty($tc)) {
|
|
| 281 | + return; |
|
| 282 | + } |
|
| 283 | + |
|
| 284 | + //php |
|
| 285 | + if (!empty($tc['geodir_theme_compat_code'])) {
|
|
| 286 | + include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');
|
|
| 287 | + } |
|
| 288 | + |
|
| 289 | + //geodir_full_page_class |
|
| 290 | + if (!empty($tc['geodir_full_page_class_filter'])) {
|
|
| 291 | + add_filter('geodir_full_page_class', 'geodir_full_page_class_dynamic', 10);
|
|
| 292 | + } |
|
| 293 | + |
|
| 294 | + //widget before filter |
|
| 295 | + if (!empty($tc['geodir_before_widget_filter'])) {
|
|
| 296 | + add_filter('geodir_before_widget', 'geodir_before_widget_dynamic', 10);
|
|
| 297 | + } |
|
| 298 | + |
|
| 299 | + //widget after filter |
|
| 300 | + if (!empty($tc['geodir_after_widget_filter'])) {
|
|
| 301 | + add_filter('geodir_after_widget', 'geodir_after_widget_dynamic', 10);
|
|
| 302 | + } |
|
| 303 | + |
|
| 304 | + //widget before title filter |
|
| 305 | + if (!empty($tc['geodir_before_title_filter'])) {
|
|
| 306 | + add_filter('geodir_before_title', 'geodir_before_title_dynamic', 10);
|
|
| 307 | + } |
|
| 308 | + |
|
| 309 | + //widget before title filter |
|
| 310 | + if (!empty($tc['geodir_after_title_filter'])) {
|
|
| 311 | + add_filter('geodir_after_title', 'geodir_after_title_dynamic', 10);
|
|
| 312 | + } |
|
| 313 | + |
|
| 314 | + //menu li class |
|
| 315 | + if (!empty($tc['geodir_menu_li_class_filter'])) {
|
|
| 316 | + add_filter('geodir_menu_li_class', 'geodir_menu_li_class_dynamic', 10);
|
|
| 317 | + } |
|
| 318 | + |
|
| 319 | + //menu ul class |
|
| 320 | + if (!empty($tc['geodir_sub_menu_ul_class_filter'])) {
|
|
| 321 | + add_filter('geodir_sub_menu_ul_class', 'geodir_sub_menu_ul_class_dynamic', 10);
|
|
| 322 | + } |
|
| 323 | + |
|
| 324 | + //menu sub li class |
|
| 325 | + if (!empty($tc['geodir_sub_menu_li_class_filter'])) {
|
|
| 326 | + add_filter('geodir_sub_menu_li_class', 'geodir_sub_menu_li_class_dynamic', 10);
|
|
| 327 | + } |
|
| 328 | + |
|
| 329 | + //menu a class |
|
| 330 | + if (!empty($tc['geodir_menu_a_class_filter'])) {
|
|
| 331 | + add_filter('geodir_menu_a_class', 'geodir_menu_a_class_dynamic', 10);
|
|
| 332 | + } |
|
| 333 | + |
|
| 334 | + //menu sub a class |
|
| 335 | + if (!empty($tc['geodir_sub_menu_a_class_filter'])) {
|
|
| 336 | + add_filter('geodir_sub_menu_a_class', 'geodir_sub_menu_a_class_dynamic', 10);
|
|
| 337 | + } |
|
| 338 | + |
|
| 339 | + //location menu li class |
|
| 340 | + if (!empty($tc['geodir_location_switcher_menu_li_class_filter'])) {
|
|
| 341 | + add_filter('geodir_location_switcher_menu_li_class', 'geodir_location_switcher_menu_li_class_dynamic', 10);
|
|
| 342 | + } |
|
| 343 | + |
|
| 344 | + //location menu sub ul class |
|
| 345 | + if (!empty($tc['geodir_location_switcher_menu_sub_ul_class_filter'])) {
|
|
| 346 | + add_filter('geodir_location_switcher_menu_sub_ul_class', 'geodir_location_switcher_menu_sub_ul_class_dynamic', 10);
|
|
| 347 | + } |
|
| 348 | + |
|
| 349 | + //location menu sub li class |
|
| 350 | + if (!empty($tc['geodir_location_switcher_menu_sub_li_class_filter'])) {
|
|
| 351 | + add_filter('geodir_location_switcher_menu_sub_li_class', 'geodir_location_switcher_menu_sub_li_class_dynamic', 10);
|
|
| 352 | + } |
|
| 353 | + |
|
| 354 | + //location menu a class |
|
| 355 | + if (!empty($tc['geodir_location_switcher_menu_a_class_filter'])) {
|
|
| 356 | + add_filter('geodir_location_switcher_menu_a_class', 'geodir_location_switcher_menu_a_class_dynamic', 10);
|
|
| 357 | + } |
|
| 358 | + |
|
| 359 | + // compat styles |
|
| 360 | + if (!empty($tc['geodir_theme_compat_css'])) {
|
|
| 361 | + add_action('wp_head', 'gd_compat_styles');
|
|
| 362 | + } |
|
| 363 | + |
|
| 364 | + // compat js |
|
| 365 | + if (!empty($tc['geodir_theme_compat_js'])) {
|
|
| 366 | + add_action('wp_footer', 'gd_compat_script');
|
|
| 367 | + } |
|
| 368 | + |
|
| 369 | + |
|
| 370 | + // geodir_top_content_add |
|
| 371 | + if (!empty($tc['geodir_top_content_add'])) {
|
|
| 372 | + add_action('geodir_top_content', 'geodir_top_content_add_dynamic', 10, 1);
|
|
| 373 | + } |
|
| 374 | + |
|
| 375 | + // geodir_before_main_content_add |
|
| 376 | + if (!empty($tc['geodir_before_main_content_add'])) {
|
|
| 377 | + add_action('geodir_before_main_content', 'geodir_before_main_content_add_dynamic', 10, 1);
|
|
| 378 | + } |
|
| 379 | 379 | |
| 380 | 380 | |
| 381 | 381 | } |
@@ -398,23 +398,23 @@ discard block |
||
| 398 | 398 | */ |
| 399 | 399 | function geodir_action_wrapper_open($type = '', $id = '', $class = '') |
| 400 | 400 | {
|
| 401 | - $tc = get_option('theme_compatibility_setting');
|
|
| 402 | - if (!empty($tc['geodir_wrapper_open_replace'])) {
|
|
| 403 | - $text = $tc['geodir_wrapper_open_replace']; |
|
| 404 | - } else {
|
|
| 405 | - $text = '<div id="[id]" class="[class]">'; |
|
| 406 | - } |
|
| 401 | + $tc = get_option('theme_compatibility_setting');
|
|
| 402 | + if (!empty($tc['geodir_wrapper_open_replace'])) {
|
|
| 403 | + $text = $tc['geodir_wrapper_open_replace']; |
|
| 404 | + } else {
|
|
| 405 | + $text = '<div id="[id]" class="[class]">'; |
|
| 406 | + } |
|
| 407 | 407 | |
| 408 | - if (!empty($tc['geodir_wrapper_open_id'])) {
|
|
| 409 | - $id = $tc['geodir_wrapper_open_id']; |
|
| 410 | - } |
|
| 411 | - if (!empty($tc['geodir_wrapper_open_class'])) {
|
|
| 412 | - $class = $tc['geodir_wrapper_open_class']; |
|
| 413 | - } |
|
| 408 | + if (!empty($tc['geodir_wrapper_open_id'])) {
|
|
| 409 | + $id = $tc['geodir_wrapper_open_id']; |
|
| 410 | + } |
|
| 411 | + if (!empty($tc['geodir_wrapper_open_class'])) {
|
|
| 412 | + $class = $tc['geodir_wrapper_open_class']; |
|
| 413 | + } |
|
| 414 | 414 | |
| 415 | - $text = str_replace(array("[id]", "[class]"), array($id, $class), $text);
|
|
| 415 | + $text = str_replace(array("[id]", "[class]"), array($id, $class), $text);
|
|
| 416 | 416 | |
| 417 | - echo $text; |
|
| 417 | + echo $text; |
|
| 418 | 418 | } |
| 419 | 419 | |
| 420 | 420 | // action for adding the wrapperdiv closing tag |
@@ -429,14 +429,14 @@ discard block |
||
| 429 | 429 | */ |
| 430 | 430 | function geodir_action_wrapper_close($type = '') |
| 431 | 431 | {
|
| 432 | - $tc = get_option('theme_compatibility_setting');
|
|
| 433 | - if (!empty($tc['geodir_wrapper_close_replace'])) {
|
|
| 434 | - $text = $tc['geodir_wrapper_close_replace']; |
|
| 435 | - } else {
|
|
| 436 | - $text = '</div><!-- wrapper ends here-->'; |
|
| 437 | - } |
|
| 432 | + $tc = get_option('theme_compatibility_setting');
|
|
| 433 | + if (!empty($tc['geodir_wrapper_close_replace'])) {
|
|
| 434 | + $text = $tc['geodir_wrapper_close_replace']; |
|
| 435 | + } else {
|
|
| 436 | + $text = '</div><!-- wrapper ends here-->'; |
|
| 437 | + } |
|
| 438 | 438 | |
| 439 | - echo $text; |
|
| 439 | + echo $text; |
|
| 440 | 440 | } |
| 441 | 441 | |
| 442 | 442 | // action for adding the content div opening tag |
@@ -452,35 +452,35 @@ discard block |
||
| 452 | 452 | */ |
| 453 | 453 | function geodir_action_wrapper_content_open($type = '', $id = '', $class = '') |
| 454 | 454 | {
|
| 455 | - if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {
|
|
| 456 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 457 | - } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {
|
|
| 458 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 459 | - } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {
|
|
| 460 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 461 | - } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {
|
|
| 462 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 463 | - } else {
|
|
| 464 | - $width_css = ''; |
|
| 465 | - } |
|
| 466 | - |
|
| 467 | - $tc = get_option('theme_compatibility_setting');
|
|
| 468 | - if (!empty($tc['geodir_wrapper_content_open_replace'])) {
|
|
| 469 | - $text = $tc['geodir_wrapper_content_open_replace']; |
|
| 470 | - } else {
|
|
| 471 | - $text = '<div id="[id]" class="[class]" role="main" [width_css]>'; |
|
| 472 | - } |
|
| 473 | - |
|
| 474 | - if (!empty($tc['geodir_wrapper_content_open_id'])) {
|
|
| 475 | - $id = $tc['geodir_wrapper_content_open_id']; |
|
| 476 | - } |
|
| 477 | - if (!empty($tc['geodir_wrapper_content_open_class'])) {
|
|
| 478 | - $class = $tc['geodir_wrapper_content_open_class']; |
|
| 479 | - } |
|
| 480 | - |
|
| 481 | - $text = str_replace(array("[id]", "[class]", "[width_css]"), array($id, $class, $width_css), $text);
|
|
| 482 | - |
|
| 483 | - echo $text; |
|
| 455 | + if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {
|
|
| 456 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 457 | + } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {
|
|
| 458 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 459 | + } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {
|
|
| 460 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 461 | + } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {
|
|
| 462 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 463 | + } else {
|
|
| 464 | + $width_css = ''; |
|
| 465 | + } |
|
| 466 | + |
|
| 467 | + $tc = get_option('theme_compatibility_setting');
|
|
| 468 | + if (!empty($tc['geodir_wrapper_content_open_replace'])) {
|
|
| 469 | + $text = $tc['geodir_wrapper_content_open_replace']; |
|
| 470 | + } else {
|
|
| 471 | + $text = '<div id="[id]" class="[class]" role="main" [width_css]>'; |
|
| 472 | + } |
|
| 473 | + |
|
| 474 | + if (!empty($tc['geodir_wrapper_content_open_id'])) {
|
|
| 475 | + $id = $tc['geodir_wrapper_content_open_id']; |
|
| 476 | + } |
|
| 477 | + if (!empty($tc['geodir_wrapper_content_open_class'])) {
|
|
| 478 | + $class = $tc['geodir_wrapper_content_open_class']; |
|
| 479 | + } |
|
| 480 | + |
|
| 481 | + $text = str_replace(array("[id]", "[class]", "[width_css]"), array($id, $class, $width_css), $text);
|
|
| 482 | + |
|
| 483 | + echo $text; |
|
| 484 | 484 | } |
| 485 | 485 | |
| 486 | 486 | // action for adding the primary div closing tag |
@@ -494,13 +494,13 @@ discard block |
||
| 494 | 494 | */ |
| 495 | 495 | function geodir_action_wrapper_content_close($type = '') |
| 496 | 496 | {
|
| 497 | - $tc = get_option('theme_compatibility_setting');
|
|
| 498 | - if (!empty($tc['geodir_wrapper_content_close_replace'])) {
|
|
| 499 | - $text = $tc['geodir_wrapper_content_close_replace']; |
|
| 500 | - } else {
|
|
| 501 | - $text = '</div><!-- content ends here-->'; |
|
| 502 | - } |
|
| 503 | - echo $text; |
|
| 497 | + $tc = get_option('theme_compatibility_setting');
|
|
| 498 | + if (!empty($tc['geodir_wrapper_content_close_replace'])) {
|
|
| 499 | + $text = $tc['geodir_wrapper_content_close_replace']; |
|
| 500 | + } else {
|
|
| 501 | + $text = '</div><!-- content ends here-->'; |
|
| 502 | + } |
|
| 503 | + echo $text; |
|
| 504 | 504 | } |
| 505 | 505 | |
| 506 | 506 | // action for adding the <article> opening tag |
@@ -518,24 +518,24 @@ discard block |
||
| 518 | 518 | */ |
| 519 | 519 | function geodir_action_article_open($type = '', $id = '', $class = '', $itemtype = '') |
| 520 | 520 | {
|
| 521 | - $class = implode(" ", $class);
|
|
| 522 | - $tc = get_option('theme_compatibility_setting');
|
|
| 523 | - if (!empty($tc['geodir_article_open_replace'])) {
|
|
| 524 | - $text = $tc['geodir_article_open_replace']; |
|
| 525 | - } else {
|
|
| 526 | - $text = '<article id="[id]" class="[class]" >'; |
|
| 527 | - } |
|
| 521 | + $class = implode(" ", $class);
|
|
| 522 | + $tc = get_option('theme_compatibility_setting');
|
|
| 523 | + if (!empty($tc['geodir_article_open_replace'])) {
|
|
| 524 | + $text = $tc['geodir_article_open_replace']; |
|
| 525 | + } else {
|
|
| 526 | + $text = '<article id="[id]" class="[class]" >'; |
|
| 527 | + } |
|
| 528 | 528 | |
| 529 | - if (!empty($tc['geodir_article_open_id'])) {
|
|
| 530 | - $id = $tc['geodir_article_open_id']; |
|
| 531 | - } |
|
| 532 | - if (!empty($tc['geodir_article_open_class'])) {
|
|
| 533 | - $class = $tc['geodir_article_open_class']; |
|
| 534 | - } |
|
| 529 | + if (!empty($tc['geodir_article_open_id'])) {
|
|
| 530 | + $id = $tc['geodir_article_open_id']; |
|
| 531 | + } |
|
| 532 | + if (!empty($tc['geodir_article_open_class'])) {
|
|
| 533 | + $class = $tc['geodir_article_open_class']; |
|
| 534 | + } |
|
| 535 | 535 | |
| 536 | - $text = str_replace(array("[id]", "[class]", "[itemtype]"), array($id, $class, $itemtype), $text);
|
|
| 536 | + $text = str_replace(array("[id]", "[class]", "[itemtype]"), array($id, $class, $itemtype), $text);
|
|
| 537 | 537 | |
| 538 | - echo $text; |
|
| 538 | + echo $text; |
|
| 539 | 539 | } |
| 540 | 540 | |
| 541 | 541 | // action for adding the primary div closing tag |
@@ -549,13 +549,13 @@ discard block |
||
| 549 | 549 | */ |
| 550 | 550 | function geodir_action_article_close($type = '') |
| 551 | 551 | {
|
| 552 | - $tc = get_option('theme_compatibility_setting');
|
|
| 553 | - if (!empty($tc['geodir_article_close_replace'])) {
|
|
| 554 | - $text = $tc['geodir_article_close_replace']; |
|
| 555 | - } else {
|
|
| 556 | - $text = '</article><!-- article ends here-->'; |
|
| 557 | - } |
|
| 558 | - echo $text; |
|
| 552 | + $tc = get_option('theme_compatibility_setting');
|
|
| 553 | + if (!empty($tc['geodir_article_close_replace'])) {
|
|
| 554 | + $text = $tc['geodir_article_close_replace']; |
|
| 555 | + } else {
|
|
| 556 | + $text = '</article><!-- article ends here-->'; |
|
| 557 | + } |
|
| 558 | + echo $text; |
|
| 559 | 559 | } |
| 560 | 560 | |
| 561 | 561 | // action for adding the sidebar opening tag |
@@ -572,35 +572,35 @@ discard block |
||
| 572 | 572 | */ |
| 573 | 573 | function geodir_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '') |
| 574 | 574 | {
|
| 575 | - if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {
|
|
| 576 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 577 | - } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {
|
|
| 578 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 579 | - } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {
|
|
| 580 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 581 | - } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {
|
|
| 582 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 583 | - } else {
|
|
| 584 | - $width_css = ''; |
|
| 585 | - } |
|
| 586 | - |
|
| 587 | - $tc = get_option('theme_compatibility_setting');
|
|
| 588 | - if (!empty($tc['geodir_sidebar_right_open_replace'])) {
|
|
| 589 | - $text = $tc['geodir_sidebar_right_open_replace']; |
|
| 590 | - } else {
|
|
| 591 | - $text = '<aside id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>'; |
|
| 592 | - } |
|
| 593 | - |
|
| 594 | - if (!empty($tc['geodir_sidebar_right_open_id'])) {
|
|
| 595 | - $id = $tc['geodir_sidebar_right_open_id']; |
|
| 596 | - } |
|
| 597 | - if (!empty($tc['geodir_sidebar_right_open_class'])) {
|
|
| 598 | - $class = $tc['geodir_sidebar_right_open_class']; |
|
| 599 | - } |
|
| 600 | - |
|
| 601 | - $text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);
|
|
| 602 | - |
|
| 603 | - echo $text; |
|
| 575 | + if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {
|
|
| 576 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 577 | + } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {
|
|
| 578 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 579 | + } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {
|
|
| 580 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 581 | + } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {
|
|
| 582 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 583 | + } else {
|
|
| 584 | + $width_css = ''; |
|
| 585 | + } |
|
| 586 | + |
|
| 587 | + $tc = get_option('theme_compatibility_setting');
|
|
| 588 | + if (!empty($tc['geodir_sidebar_right_open_replace'])) {
|
|
| 589 | + $text = $tc['geodir_sidebar_right_open_replace']; |
|
| 590 | + } else {
|
|
| 591 | + $text = '<aside id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>'; |
|
| 592 | + } |
|
| 593 | + |
|
| 594 | + if (!empty($tc['geodir_sidebar_right_open_id'])) {
|
|
| 595 | + $id = $tc['geodir_sidebar_right_open_id']; |
|
| 596 | + } |
|
| 597 | + if (!empty($tc['geodir_sidebar_right_open_class'])) {
|
|
| 598 | + $class = $tc['geodir_sidebar_right_open_class']; |
|
| 599 | + } |
|
| 600 | + |
|
| 601 | + $text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);
|
|
| 602 | + |
|
| 603 | + echo $text; |
|
| 604 | 604 | } |
| 605 | 605 | |
| 606 | 606 | // action for adding the primary div closing tag |
@@ -614,13 +614,13 @@ discard block |
||
| 614 | 614 | */ |
| 615 | 615 | function geodir_action_sidebar_right_close($type = '') |
| 616 | 616 | {
|
| 617 | - $tc = get_option('theme_compatibility_setting');
|
|
| 618 | - if (!empty($tc['geodir_sidebar_right_close_replace'])) {
|
|
| 619 | - $text = $tc['geodir_sidebar_right_close_replace']; |
|
| 620 | - } else {
|
|
| 621 | - $text = '</aside><!-- sidebar ends here-->'; |
|
| 622 | - } |
|
| 623 | - echo $text; |
|
| 617 | + $tc = get_option('theme_compatibility_setting');
|
|
| 618 | + if (!empty($tc['geodir_sidebar_right_close_replace'])) {
|
|
| 619 | + $text = $tc['geodir_sidebar_right_close_replace']; |
|
| 620 | + } else {
|
|
| 621 | + $text = '</aside><!-- sidebar ends here-->'; |
|
| 622 | + } |
|
| 623 | + echo $text; |
|
| 624 | 624 | } |
| 625 | 625 | |
| 626 | 626 | |
@@ -641,121 +641,121 @@ discard block |
||
| 641 | 641 | */ |
| 642 | 642 | function geodir_action_geodir_set_preview_post() |
| 643 | 643 | {
|
| 644 | - global $post, $preview, $gd_session; |
|
| 645 | - $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend |
|
| 646 | - if (!$preview || $is_backend_preview) {
|
|
| 647 | - return; |
|
| 648 | - }// bail if not previewing |
|
| 649 | - |
|
| 650 | - $listing_type = isset($_REQUEST['listing_type']) ? sanitize_text_field($_REQUEST['listing_type']) : ''; |
|
| 651 | - |
|
| 652 | - $fields_info = geodir_get_custom_fields_type($listing_type); |
|
| 653 | - |
|
| 654 | - foreach ($_REQUEST as $pkey => $pval) {
|
|
| 655 | - if ($pkey == 'geodir_video') {
|
|
| 656 | - $tags = '<iframe>'; |
|
| 657 | - } else if ($pkey == 'post_desc') {
|
|
| 658 | - $tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'; |
|
| 659 | - } else if (is_array($fields_info) && isset($fields_info[$pkey]) && ($fields_info[$pkey] == 'textarea' || $fields_info[$pkey] == 'html')) {
|
|
| 660 | - $tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'; |
|
| 661 | - } else if (is_array($_REQUEST[$pkey])) {
|
|
| 662 | - $tags = 'skip_field'; |
|
| 663 | - } else {
|
|
| 664 | - $tags = ''; |
|
| 665 | - } |
|
| 666 | - /** |
|
| 667 | - * Allows the filtering of the allowed HTML tags per field when submitting from frontend add listing page. |
|
| 668 | - * |
|
| 669 | - * @since 1.0.0 |
|
| 670 | - * @param string $tags The allowed HTML tags for the field. Can be many things, for example the description allows these tags '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'. |
|
| 671 | - * @param string|array $pkey The field id/name. If array then value is set as "skip_field". |
|
| 672 | - */ |
|
| 673 | - $tags = apply_filters('geodir_save_post_key', $tags, $pkey);
|
|
| 674 | - |
|
| 675 | - if ($tags != 'skip_field') {
|
|
| 676 | - $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags); |
|
| 677 | - } |
|
| 678 | - } |
|
| 679 | - |
|
| 680 | - $post = (object)$_REQUEST; |
|
| 681 | - |
|
| 682 | - |
|
| 683 | - if (isset($post->video)) {
|
|
| 684 | - $post->video = stripslashes($post->video); |
|
| 685 | - } |
|
| 686 | - |
|
| 687 | - if (isset($post->Video2)) {
|
|
| 688 | - $post->Video2 = stripslashes($post->Video2); |
|
| 689 | - } |
|
| 690 | - |
|
| 691 | - $post_type = $post->listing_type; |
|
| 692 | - $post_type_info = get_post_type_object($post_type); |
|
| 693 | - |
|
| 694 | - $listing_label = $post_type_info->labels->singular_name; |
|
| 695 | - |
|
| 696 | - $term_icon = ''; |
|
| 697 | - |
|
| 698 | - if (!empty($post->post_category)) {
|
|
| 699 | - foreach ($post->post_category as $post_taxonomy => $post_term) {
|
|
| 700 | - |
|
| 701 | - if ($post_term != '' && !is_array($post_term)) {
|
|
| 702 | - $post_term = explode(',', trim($post_term, ','));
|
|
| 703 | - } |
|
| 644 | + global $post, $preview, $gd_session; |
|
| 645 | + $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend |
|
| 646 | + if (!$preview || $is_backend_preview) {
|
|
| 647 | + return; |
|
| 648 | + }// bail if not previewing |
|
| 649 | + |
|
| 650 | + $listing_type = isset($_REQUEST['listing_type']) ? sanitize_text_field($_REQUEST['listing_type']) : ''; |
|
| 651 | + |
|
| 652 | + $fields_info = geodir_get_custom_fields_type($listing_type); |
|
| 653 | + |
|
| 654 | + foreach ($_REQUEST as $pkey => $pval) {
|
|
| 655 | + if ($pkey == 'geodir_video') {
|
|
| 656 | + $tags = '<iframe>'; |
|
| 657 | + } else if ($pkey == 'post_desc') {
|
|
| 658 | + $tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'; |
|
| 659 | + } else if (is_array($fields_info) && isset($fields_info[$pkey]) && ($fields_info[$pkey] == 'textarea' || $fields_info[$pkey] == 'html')) {
|
|
| 660 | + $tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'; |
|
| 661 | + } else if (is_array($_REQUEST[$pkey])) {
|
|
| 662 | + $tags = 'skip_field'; |
|
| 663 | + } else {
|
|
| 664 | + $tags = ''; |
|
| 665 | + } |
|
| 666 | + /** |
|
| 667 | + * Allows the filtering of the allowed HTML tags per field when submitting from frontend add listing page. |
|
| 668 | + * |
|
| 669 | + * @since 1.0.0 |
|
| 670 | + * @param string $tags The allowed HTML tags for the field. Can be many things, for example the description allows these tags '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'. |
|
| 671 | + * @param string|array $pkey The field id/name. If array then value is set as "skip_field". |
|
| 672 | + */ |
|
| 673 | + $tags = apply_filters('geodir_save_post_key', $tags, $pkey);
|
|
| 674 | + |
|
| 675 | + if ($tags != 'skip_field') {
|
|
| 676 | + $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags); |
|
| 677 | + } |
|
| 678 | + } |
|
| 679 | + |
|
| 680 | + $post = (object)$_REQUEST; |
|
| 681 | + |
|
| 682 | + |
|
| 683 | + if (isset($post->video)) {
|
|
| 684 | + $post->video = stripslashes($post->video); |
|
| 685 | + } |
|
| 686 | + |
|
| 687 | + if (isset($post->Video2)) {
|
|
| 688 | + $post->Video2 = stripslashes($post->Video2); |
|
| 689 | + } |
|
| 690 | + |
|
| 691 | + $post_type = $post->listing_type; |
|
| 692 | + $post_type_info = get_post_type_object($post_type); |
|
| 693 | + |
|
| 694 | + $listing_label = $post_type_info->labels->singular_name; |
|
| 695 | + |
|
| 696 | + $term_icon = ''; |
|
| 697 | + |
|
| 698 | + if (!empty($post->post_category)) {
|
|
| 699 | + foreach ($post->post_category as $post_taxonomy => $post_term) {
|
|
| 700 | + |
|
| 701 | + if ($post_term != '' && !is_array($post_term)) {
|
|
| 702 | + $post_term = explode(',', trim($post_term, ','));
|
|
| 703 | + } |
|
| 704 | 704 | |
| 705 | - if (is_array($post_term)) {
|
|
| 706 | - $post_term = array_unique($post_term); |
|
| 707 | - } |
|
| 705 | + if (is_array($post_term)) {
|
|
| 706 | + $post_term = array_unique($post_term); |
|
| 707 | + } |
|
| 708 | 708 | |
| 709 | - if (!empty($post_term)) {
|
|
| 710 | - foreach ($post_term as $cat_id) {
|
|
| 711 | - $cat_id = trim($cat_id); |
|
| 712 | - |
|
| 713 | - if ($cat_id != '') {
|
|
| 714 | - $term_icon = get_option('geodir_default_marker_icon');
|
|
| 715 | - |
|
| 716 | - if (isset($post->post_default_category) && $post->post_default_category == $cat_id) {
|
|
| 717 | - if ($term_icon_url = geodir_get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type)) {
|
|
| 718 | - if (isset($term_icon_url['src']) && $term_icon_url['src'] != '') |
|
| 719 | - $term_icon = $term_icon_url['src']; |
|
| 720 | - break; |
|
| 721 | - } |
|
| 722 | - } |
|
| 723 | - } |
|
| 724 | - } |
|
| 725 | - } |
|
| 726 | - } |
|
| 727 | - } |
|
| 709 | + if (!empty($post_term)) {
|
|
| 710 | + foreach ($post_term as $cat_id) {
|
|
| 711 | + $cat_id = trim($cat_id); |
|
| 712 | + |
|
| 713 | + if ($cat_id != '') {
|
|
| 714 | + $term_icon = get_option('geodir_default_marker_icon');
|
|
| 715 | + |
|
| 716 | + if (isset($post->post_default_category) && $post->post_default_category == $cat_id) {
|
|
| 717 | + if ($term_icon_url = geodir_get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type)) {
|
|
| 718 | + if (isset($term_icon_url['src']) && $term_icon_url['src'] != '') |
|
| 719 | + $term_icon = $term_icon_url['src']; |
|
| 720 | + break; |
|
| 721 | + } |
|
| 722 | + } |
|
| 723 | + } |
|
| 724 | + } |
|
| 725 | + } |
|
| 726 | + } |
|
| 727 | + } |
|
| 728 | 728 | |
| 729 | - $post_latitude = isset($post->post_latitude) ? $post->post_latitude : ''; |
|
| 730 | - $post_longitude = isset($post->post_longitude) ? $post->post_longitude : ''; |
|
| 729 | + $post_latitude = isset($post->post_latitude) ? $post->post_latitude : ''; |
|
| 730 | + $post_longitude = isset($post->post_longitude) ? $post->post_longitude : ''; |
|
| 731 | 731 | |
| 732 | - $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 733 | - $replarr = array("′", "⁄", "–", "“", '');
|
|
| 732 | + $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 733 | + $replarr = array("′", "⁄", "–", "“", '');
|
|
| 734 | 734 | |
| 735 | - $json_title = str_replace($srcharr, $replarr, $post->post_title); |
|
| 735 | + $json_title = str_replace($srcharr, $replarr, $post->post_title); |
|
| 736 | 736 | |
| 737 | - $json = '{';
|
|
| 738 | - $json .= '"post_preview": "1",'; |
|
| 739 | - $json .= '"t": "' . $json_title . '",'; |
|
| 740 | - $json .= '"lt": "' . $post_latitude . '",'; |
|
| 741 | - $json .= '"ln": "' . $post_longitude . '",'; |
|
| 742 | - $json .= '"i":"' . $term_icon . '"'; |
|
| 743 | - $json .= '}'; |
|
| 737 | + $json = '{';
|
|
| 738 | + $json .= '"post_preview": "1",'; |
|
| 739 | + $json .= '"t": "' . $json_title . '",'; |
|
| 740 | + $json .= '"lt": "' . $post_latitude . '",'; |
|
| 741 | + $json .= '"ln": "' . $post_longitude . '",'; |
|
| 742 | + $json .= '"i":"' . $term_icon . '"'; |
|
| 743 | + $json .= '}'; |
|
| 744 | 744 | |
| 745 | - $post->marker_json = $json; |
|
| 745 | + $post->marker_json = $json; |
|
| 746 | 746 | |
| 747 | - $gd_session->set('listing', $_REQUEST);
|
|
| 747 | + $gd_session->set('listing', $_REQUEST);
|
|
| 748 | 748 | |
| 749 | - // we need to define a few things to trick the setup_postdata |
|
| 750 | - if (!isset($post->ID)) {
|
|
| 751 | - $post->ID = ''; |
|
| 752 | - $post->post_author = ''; |
|
| 753 | - $post->post_date = ''; |
|
| 754 | - $post->post_content = ''; |
|
| 755 | - $post->default_category = ''; |
|
| 756 | - $post->post_type = ''; |
|
| 757 | - } |
|
| 758 | - setup_postdata($post); |
|
| 749 | + // we need to define a few things to trick the setup_postdata |
|
| 750 | + if (!isset($post->ID)) {
|
|
| 751 | + $post->ID = ''; |
|
| 752 | + $post->post_author = ''; |
|
| 753 | + $post->post_date = ''; |
|
| 754 | + $post->post_content = ''; |
|
| 755 | + $post->default_category = ''; |
|
| 756 | + $post->post_type = ''; |
|
| 757 | + } |
|
| 758 | + setup_postdata($post); |
|
| 759 | 759 | } |
| 760 | 760 | |
| 761 | 761 | /** |
@@ -767,15 +767,15 @@ discard block |
||
| 767 | 767 | */ |
| 768 | 768 | function geodir_action_geodir_preview_code() |
| 769 | 769 | {
|
| 770 | - global $preview; |
|
| 770 | + global $preview; |
|
| 771 | 771 | |
| 772 | - $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend |
|
| 772 | + $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend |
|
| 773 | 773 | |
| 774 | - if (!$preview || $is_backend_preview) {
|
|
| 775 | - return; |
|
| 776 | - }// bail if not previewing |
|
| 774 | + if (!$preview || $is_backend_preview) {
|
|
| 775 | + return; |
|
| 776 | + }// bail if not previewing |
|
| 777 | 777 | |
| 778 | - geodir_get_template_part('preview', 'buttons');
|
|
| 778 | + geodir_get_template_part('preview', 'buttons');
|
|
| 779 | 779 | } |
| 780 | 780 | |
| 781 | 781 | // action for adding the details page top widget area |
@@ -791,20 +791,20 @@ discard block |
||
| 791 | 791 | */ |
| 792 | 792 | function geodir_action_geodir_sidebar_detail_top($class = '') |
| 793 | 793 | {
|
| 794 | - if (get_option('geodir_show_detail_top_section')) { ?>
|
|
| 794 | + if (get_option('geodir_show_detail_top_section')) { ?>
|
|
| 795 | 795 | <div |
| 796 | 796 | class="<?php |
| 797 | - /** |
|
| 798 | - * Filter the div class for the wrapper of the full width widget areas. |
|
| 799 | - * |
|
| 800 | - * Allows you to filter the class of the div for the HTML Container wrapper for the full width widget areas referred to as "Top Section" or "Bottom Section" in the widget areas. |
|
| 801 | - * |
|
| 802 | - * @since 1.0.0 |
|
| 803 | - * @param string $class The class of the div. |
|
| 804 | - * @param string $type The page type the widget area is being used on. Values can be 'geodir_detail_top', 'geodir_detail_bottom', 'geodir_listing_top', 'geodir_listing_bottom', 'Reg/Login Top Section', |
|
| 805 | - * 'geodir_author_top','geodir_author_bottom', 'geodir_search_top', 'geodir_search_bottom', 'geodir_home_top' or 'geodir_home_bottom'. |
|
| 806 | - */ |
|
| 807 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_top'); ?> <?php echo $class; ?>">
|
|
| 797 | + /** |
|
| 798 | + * Filter the div class for the wrapper of the full width widget areas. |
|
| 799 | + * |
|
| 800 | + * Allows you to filter the class of the div for the HTML Container wrapper for the full width widget areas referred to as "Top Section" or "Bottom Section" in the widget areas. |
|
| 801 | + * |
|
| 802 | + * @since 1.0.0 |
|
| 803 | + * @param string $class The class of the div. |
|
| 804 | + * @param string $type The page type the widget area is being used on. Values can be 'geodir_detail_top', 'geodir_detail_bottom', 'geodir_listing_top', 'geodir_listing_bottom', 'Reg/Login Top Section', |
|
| 805 | + * 'geodir_author_top','geodir_author_bottom', 'geodir_search_top', 'geodir_search_bottom', 'geodir_home_top' or 'geodir_home_bottom'. |
|
| 806 | + */ |
|
| 807 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_top'); ?> <?php echo $class; ?>">
|
|
| 808 | 808 | <?php dynamic_sidebar('geodir_detail_top'); ?>
|
| 809 | 809 | </div> |
| 810 | 810 | <?php } |
@@ -828,11 +828,11 @@ discard block |
||
| 828 | 828 | */ |
| 829 | 829 | function geodir_action_geodir_sidebar_detail_bottom_section($class = '') |
| 830 | 830 | {
|
| 831 | - if (get_option('geodir_show_detail_bottom_section')) { ?>
|
|
| 831 | + if (get_option('geodir_show_detail_bottom_section')) { ?>
|
|
| 832 | 832 | <div |
| 833 | 833 | class="<?php |
| 834 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 835 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_bottom'); ?> <?php echo $class; ?>">
|
|
| 834 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 835 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_bottom'); ?> <?php echo $class; ?>">
|
|
| 836 | 836 | <?php dynamic_sidebar('geodir_detail_bottom'); ?>
|
| 837 | 837 | </div><!-- clearfix ends here--> |
| 838 | 838 | <?php } |
@@ -846,7 +846,7 @@ discard block |
||
| 846 | 846 | */ |
| 847 | 847 | function geodir_details_sidebar_widget_area() |
| 848 | 848 | {
|
| 849 | - dynamic_sidebar('geodir_detail_sidebar');
|
|
| 849 | + dynamic_sidebar('geodir_detail_sidebar');
|
|
| 850 | 850 | } |
| 851 | 851 | |
| 852 | 852 | /** |
@@ -857,12 +857,12 @@ discard block |
||
| 857 | 857 | */ |
| 858 | 858 | function geodir_details_sidebar_place_details() |
| 859 | 859 | {
|
| 860 | - /** |
|
| 861 | - * Used to add items to the details page sidebar. |
|
| 862 | - * |
|
| 863 | - * @since 1.0.0 |
|
| 864 | - */ |
|
| 865 | - do_action('geodir_detail_page_sidebar');
|
|
| 860 | + /** |
|
| 861 | + * Used to add items to the details page sidebar. |
|
| 862 | + * |
|
| 863 | + * @since 1.0.0 |
|
| 864 | + */ |
|
| 865 | + do_action('geodir_detail_page_sidebar');
|
|
| 866 | 866 | } |
| 867 | 867 | |
| 868 | 868 | add_action('geodir_detail_sidebar_inside', 'geodir_details_sidebar_place_details', 10);
|
@@ -877,68 +877,68 @@ discard block |
||
| 877 | 877 | */ |
| 878 | 878 | function geodir_action_details_sidebar() |
| 879 | 879 | {
|
| 880 | - // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='') |
|
| 881 | - if (get_option('geodir_detail_sidebar_left_section')) {
|
|
| 882 | - /** |
|
| 883 | - * Called before the details page left sidebar is opened. |
|
| 884 | - * |
|
| 885 | - * This is used to add opening wrapper HTML to the details page left sidebar. |
|
| 886 | - * |
|
| 887 | - * @since 1.0.0 |
|
| 888 | - * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 889 | - * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-left'. |
|
| 890 | - * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-left geodir-details-sidebar-left'. |
|
| 891 | - * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'. |
|
| 892 | - */ |
|
| 893 | - do_action('geodir_sidebar_left_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-left geodir-details-sidebar-left', 'https://schema.org/WPSideBar');
|
|
| 894 | - ?> |
|
| 880 | + // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='') |
|
| 881 | + if (get_option('geodir_detail_sidebar_left_section')) {
|
|
| 882 | + /** |
|
| 883 | + * Called before the details page left sidebar is opened. |
|
| 884 | + * |
|
| 885 | + * This is used to add opening wrapper HTML to the details page left sidebar. |
|
| 886 | + * |
|
| 887 | + * @since 1.0.0 |
|
| 888 | + * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 889 | + * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-left'. |
|
| 890 | + * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-left geodir-details-sidebar-left'. |
|
| 891 | + * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'. |
|
| 892 | + */ |
|
| 893 | + do_action('geodir_sidebar_left_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-left geodir-details-sidebar-left', 'https://schema.org/WPSideBar');
|
|
| 894 | + ?> |
|
| 895 | 895 | <div class="geodir-content-left geodir-sidebar-wrap"><?php |
| 896 | - /** |
|
| 897 | - * Called inside the HTML wrapper of the details sidebar for either the left and right sidebar. |
|
| 898 | - * |
|
| 899 | - * This is used to add all info to the details page sidebars. |
|
| 900 | - * |
|
| 901 | - * @since 1.0.0 |
|
| 902 | - */ |
|
| 903 | - do_action('geodir_detail_sidebar_inside');
|
|
| 904 | - ?></div><!-- end geodir-content-left --><?php |
|
| 905 | - /** |
|
| 906 | - * Called after the details page left sidebar. |
|
| 907 | - * |
|
| 908 | - * This is used to add closing wrapper HTML to the details page left sidebar. |
|
| 909 | - * |
|
| 910 | - * @since 1.0.0 |
|
| 911 | - * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 912 | - */ |
|
| 913 | - do_action('geodir_sidebar_left_close', 'details-page');
|
|
| 914 | - } else {
|
|
| 915 | - /** |
|
| 916 | - * Called before the details page right sidebar is opened. |
|
| 917 | - * |
|
| 918 | - * This is used to add opening wrapper HTML to the details page right sidebar. |
|
| 919 | - * |
|
| 920 | - * @since 1.0.0 |
|
| 921 | - * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'add-listing-page', 'author-page', 'search-page' or 'home-page'. |
|
| 922 | - * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-right'. |
|
| 923 | - * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-right geodir-details-sidebar-right'. |
|
| 924 | - * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'. |
|
| 925 | - */ |
|
| 926 | - do_action('geodir_sidebar_right_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-right geodir-details-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 927 | - ?> |
|
| 896 | + /** |
|
| 897 | + * Called inside the HTML wrapper of the details sidebar for either the left and right sidebar. |
|
| 898 | + * |
|
| 899 | + * This is used to add all info to the details page sidebars. |
|
| 900 | + * |
|
| 901 | + * @since 1.0.0 |
|
| 902 | + */ |
|
| 903 | + do_action('geodir_detail_sidebar_inside');
|
|
| 904 | + ?></div><!-- end geodir-content-left --><?php |
|
| 905 | + /** |
|
| 906 | + * Called after the details page left sidebar. |
|
| 907 | + * |
|
| 908 | + * This is used to add closing wrapper HTML to the details page left sidebar. |
|
| 909 | + * |
|
| 910 | + * @since 1.0.0 |
|
| 911 | + * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 912 | + */ |
|
| 913 | + do_action('geodir_sidebar_left_close', 'details-page');
|
|
| 914 | + } else {
|
|
| 915 | + /** |
|
| 916 | + * Called before the details page right sidebar is opened. |
|
| 917 | + * |
|
| 918 | + * This is used to add opening wrapper HTML to the details page right sidebar. |
|
| 919 | + * |
|
| 920 | + * @since 1.0.0 |
|
| 921 | + * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'add-listing-page', 'author-page', 'search-page' or 'home-page'. |
|
| 922 | + * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-right'. |
|
| 923 | + * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-right geodir-details-sidebar-right'. |
|
| 924 | + * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'. |
|
| 925 | + */ |
|
| 926 | + do_action('geodir_sidebar_right_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-right geodir-details-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 927 | + ?> |
|
| 928 | 928 | <div class="geodir-content-right geodir-sidebar-wrap"><?php |
| 929 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 930 | - do_action('geodir_detail_sidebar_inside');
|
|
| 931 | - ?></div><!-- end geodir-content-right --><?php |
|
| 932 | - /** |
|
| 933 | - * Called after the details page right sidebar. |
|
| 934 | - * |
|
| 935 | - * This is used to add closing wrapper HTML to the details page right sidebar. |
|
| 936 | - * |
|
| 937 | - * @since 1.0.0 |
|
| 938 | - * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 939 | - */ |
|
| 940 | - do_action('geodir_sidebar_right_close', 'details-page');
|
|
| 941 | - } |
|
| 929 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 930 | + do_action('geodir_detail_sidebar_inside');
|
|
| 931 | + ?></div><!-- end geodir-content-right --><?php |
|
| 932 | + /** |
|
| 933 | + * Called after the details page right sidebar. |
|
| 934 | + * |
|
| 935 | + * This is used to add closing wrapper HTML to the details page right sidebar. |
|
| 936 | + * |
|
| 937 | + * @since 1.0.0 |
|
| 938 | + * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 939 | + */ |
|
| 940 | + do_action('geodir_sidebar_right_close', 'details-page');
|
|
| 941 | + } |
|
| 942 | 942 | } |
| 943 | 943 | |
| 944 | 944 | add_action('geodir_page_title', 'geodir_action_page_title', 10);
|
@@ -952,21 +952,21 @@ discard block |
||
| 952 | 952 | */ |
| 953 | 953 | function geodir_action_page_title() |
| 954 | 954 | {
|
| 955 | - /** |
|
| 956 | - * Filter the page title HTML h1 class. |
|
| 957 | - * |
|
| 958 | - * @since 1.0.0 |
|
| 959 | - * @param string $class The class to use. Default is 'entry-title fn'. |
|
| 960 | - */ |
|
| 961 | - $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 962 | - /** |
|
| 963 | - * Filter the page title HTML header wrapper class. |
|
| 964 | - * |
|
| 965 | - * @since 1.0.0 |
|
| 966 | - * @param string $class The class to use. Default is 'entry-header'. |
|
| 967 | - */ |
|
| 968 | - $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 969 | - echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>'; |
|
| 955 | + /** |
|
| 956 | + * Filter the page title HTML h1 class. |
|
| 957 | + * |
|
| 958 | + * @since 1.0.0 |
|
| 959 | + * @param string $class The class to use. Default is 'entry-title fn'. |
|
| 960 | + */ |
|
| 961 | + $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 962 | + /** |
|
| 963 | + * Filter the page title HTML header wrapper class. |
|
| 964 | + * |
|
| 965 | + * @since 1.0.0 |
|
| 966 | + * @param string $class The class to use. Default is 'entry-header'. |
|
| 967 | + */ |
|
| 968 | + $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 969 | + echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>'; |
|
| 970 | 970 | } |
| 971 | 971 | |
| 972 | 972 | |
@@ -983,106 +983,106 @@ discard block |
||
| 983 | 983 | */ |
| 984 | 984 | function geodir_action_details_slider() |
| 985 | 985 | {
|
| 986 | - global $preview, $post; |
|
| 986 | + global $preview, $post; |
|
| 987 | 987 | |
| 988 | - $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // preview from backend |
|
| 988 | + $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // preview from backend |
|
| 989 | 989 | |
| 990 | - if ($is_backend_preview && !empty($post) && !empty($post->ID) && !isset($post->post_images)) {
|
|
| 991 | - $preview_get_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
|
|
| 990 | + if ($is_backend_preview && !empty($post) && !empty($post->ID) && !isset($post->post_images)) {
|
|
| 991 | + $preview_get_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
|
|
| 992 | 992 | |
| 993 | - $preview_post_images = array(); |
|
| 994 | - if ($preview_get_images) {
|
|
| 995 | - foreach ($preview_get_images as $row) {
|
|
| 996 | - $preview_post_images[] = $row->src; |
|
| 997 | - } |
|
| 998 | - } |
|
| 999 | - if (!empty($preview_post_images)) {
|
|
| 1000 | - $post->post_images = implode(',', $preview_post_images);
|
|
| 1001 | - } |
|
| 1002 | - } |
|
| 993 | + $preview_post_images = array(); |
|
| 994 | + if ($preview_get_images) {
|
|
| 995 | + foreach ($preview_get_images as $row) {
|
|
| 996 | + $preview_post_images[] = $row->src; |
|
| 997 | + } |
|
| 998 | + } |
|
| 999 | + if (!empty($preview_post_images)) {
|
|
| 1000 | + $post->post_images = implode(',', $preview_post_images);
|
|
| 1001 | + } |
|
| 1002 | + } |
|
| 1003 | 1003 | |
| 1004 | - $package_info = geodir_post_package_info(array(), $post, (!empty($post->post_type) ? $post->post_type : '')); |
|
| 1005 | - $image_limit = ''; |
|
| 1006 | - if (defined('GEODIRPAYMENT_VERSION') && !empty($package_info) && isset($package_info->image_limit) && $package_info->image_limit !== '') {
|
|
| 1007 | - $image_limit = (int)$package_info->image_limit; |
|
| 1008 | - } |
|
| 1009 | - |
|
| 1010 | - if ($preview) {
|
|
| 1011 | - $post_images = array(); |
|
| 1012 | - if (isset($post->post_images) && !empty($post->post_images)) {
|
|
| 1013 | - $post->post_images = trim($post->post_images, ","); |
|
| 1014 | - $post_images = explode(",", $post->post_images);
|
|
| 1015 | - } |
|
| 1016 | - |
|
| 1017 | - $main_slides = ''; |
|
| 1018 | - $nav_slides = ''; |
|
| 1019 | - $slides = 0; |
|
| 1020 | - |
|
| 1021 | - if (!empty($post_images)) {
|
|
| 1022 | - foreach ($post_images as $image) {
|
|
| 1023 | - if ($image_limit !== '' && ($slides+1) > $image_limit) {
|
|
| 1024 | - break; |
|
| 1025 | - } |
|
| 1026 | - if (!empty($image)) {
|
|
| 1027 | - $sizes = getimagesize(trim($image)); |
|
| 1028 | - $width = !empty($sizes) && isset($sizes[0]) ? $sizes[0] : 0; |
|
| 1029 | - $height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0; |
|
| 1030 | - |
|
| 1031 | - if ($image && $width && $height) {
|
|
| 1032 | - $image = (object)array('src' => $image, 'width' => $width, 'height' => $height);
|
|
| 1033 | - } |
|
| 1034 | - |
|
| 1035 | - if (isset($image->src)) {
|
|
| 1036 | - if ($image->height >= 400) {
|
|
| 1037 | - $spacer_height = 0; |
|
| 1038 | - } else {
|
|
| 1039 | - $spacer_height = ((400 - $image->height) / 2); |
|
| 1040 | - } |
|
| 1041 | - |
|
| 1042 | - $image_title = isset($image->title) ? $image->title : ''; |
|
| 1043 | - |
|
| 1044 | - $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />'; |
|
| 1045 | - $main_slides .= '<img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:400px;margin:0 auto;" /></li>'; |
|
| 1046 | - $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 1047 | - $slides++; |
|
| 1048 | - } |
|
| 1049 | - } |
|
| 1050 | - }// endfore |
|
| 1051 | - } //end if |
|
| 1052 | - } else {
|
|
| 1053 | - $main_slides = ''; |
|
| 1054 | - $nav_slides = ''; |
|
| 1055 | - /** |
|
| 1056 | - * Filter if default images should show on the details page. |
|
| 1057 | - * |
|
| 1058 | - * @param bool $use_default_image Default false. |
|
| 1059 | - * @since 1.6.16 |
|
| 1060 | - */ |
|
| 1061 | - $use_default_image = apply_filters('geodir_details_default_image_show', false);
|
|
| 1062 | - $post_images = geodir_get_images($post->ID, 'thumbnail', $use_default_image); // Hide default image on listing preview/detail page. |
|
| 1063 | - $slides = 0; |
|
| 1064 | - |
|
| 1065 | - if (!empty($post_images)) {
|
|
| 1066 | - foreach ($post_images as $image) {
|
|
| 1067 | - if ($image_limit !== '' && ($slides+1) > $image_limit) {
|
|
| 1068 | - break; |
|
| 1069 | - } |
|
| 1070 | - if ($image->height >= 400) {
|
|
| 1071 | - $spacer_height = 0; |
|
| 1072 | - } else {
|
|
| 1073 | - $spacer_height = ((400 - $image->height) / 2); |
|
| 1074 | - } |
|
| 1075 | - $caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : ''; |
|
| 1076 | - $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />'; |
|
| 1077 | - $main_slides .= '<img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>'; |
|
| 1078 | - $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 1079 | - $slides++; |
|
| 1080 | - } |
|
| 1081 | - }// endfore |
|
| 1082 | - } |
|
| 1004 | + $package_info = geodir_post_package_info(array(), $post, (!empty($post->post_type) ? $post->post_type : '')); |
|
| 1005 | + $image_limit = ''; |
|
| 1006 | + if (defined('GEODIRPAYMENT_VERSION') && !empty($package_info) && isset($package_info->image_limit) && $package_info->image_limit !== '') {
|
|
| 1007 | + $image_limit = (int)$package_info->image_limit; |
|
| 1008 | + } |
|
| 1009 | + |
|
| 1010 | + if ($preview) {
|
|
| 1011 | + $post_images = array(); |
|
| 1012 | + if (isset($post->post_images) && !empty($post->post_images)) {
|
|
| 1013 | + $post->post_images = trim($post->post_images, ","); |
|
| 1014 | + $post_images = explode(",", $post->post_images);
|
|
| 1015 | + } |
|
| 1016 | + |
|
| 1017 | + $main_slides = ''; |
|
| 1018 | + $nav_slides = ''; |
|
| 1019 | + $slides = 0; |
|
| 1020 | + |
|
| 1021 | + if (!empty($post_images)) {
|
|
| 1022 | + foreach ($post_images as $image) {
|
|
| 1023 | + if ($image_limit !== '' && ($slides+1) > $image_limit) {
|
|
| 1024 | + break; |
|
| 1025 | + } |
|
| 1026 | + if (!empty($image)) {
|
|
| 1027 | + $sizes = getimagesize(trim($image)); |
|
| 1028 | + $width = !empty($sizes) && isset($sizes[0]) ? $sizes[0] : 0; |
|
| 1029 | + $height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0; |
|
| 1030 | + |
|
| 1031 | + if ($image && $width && $height) {
|
|
| 1032 | + $image = (object)array('src' => $image, 'width' => $width, 'height' => $height);
|
|
| 1033 | + } |
|
| 1034 | + |
|
| 1035 | + if (isset($image->src)) {
|
|
| 1036 | + if ($image->height >= 400) {
|
|
| 1037 | + $spacer_height = 0; |
|
| 1038 | + } else {
|
|
| 1039 | + $spacer_height = ((400 - $image->height) / 2); |
|
| 1040 | + } |
|
| 1041 | + |
|
| 1042 | + $image_title = isset($image->title) ? $image->title : ''; |
|
| 1043 | + |
|
| 1044 | + $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />'; |
|
| 1045 | + $main_slides .= '<img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:400px;margin:0 auto;" /></li>'; |
|
| 1046 | + $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 1047 | + $slides++; |
|
| 1048 | + } |
|
| 1049 | + } |
|
| 1050 | + }// endfore |
|
| 1051 | + } //end if |
|
| 1052 | + } else {
|
|
| 1053 | + $main_slides = ''; |
|
| 1054 | + $nav_slides = ''; |
|
| 1055 | + /** |
|
| 1056 | + * Filter if default images should show on the details page. |
|
| 1057 | + * |
|
| 1058 | + * @param bool $use_default_image Default false. |
|
| 1059 | + * @since 1.6.16 |
|
| 1060 | + */ |
|
| 1061 | + $use_default_image = apply_filters('geodir_details_default_image_show', false);
|
|
| 1062 | + $post_images = geodir_get_images($post->ID, 'thumbnail', $use_default_image); // Hide default image on listing preview/detail page. |
|
| 1063 | + $slides = 0; |
|
| 1064 | + |
|
| 1065 | + if (!empty($post_images)) {
|
|
| 1066 | + foreach ($post_images as $image) {
|
|
| 1067 | + if ($image_limit !== '' && ($slides+1) > $image_limit) {
|
|
| 1068 | + break; |
|
| 1069 | + } |
|
| 1070 | + if ($image->height >= 400) {
|
|
| 1071 | + $spacer_height = 0; |
|
| 1072 | + } else {
|
|
| 1073 | + $spacer_height = ((400 - $image->height) / 2); |
|
| 1074 | + } |
|
| 1075 | + $caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : ''; |
|
| 1076 | + $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />'; |
|
| 1077 | + $main_slides .= '<img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>'; |
|
| 1078 | + $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 1079 | + $slides++; |
|
| 1080 | + } |
|
| 1081 | + }// endfore |
|
| 1082 | + } |
|
| 1083 | 1083 | |
| 1084 | - if (!empty($post_images)) {
|
|
| 1085 | - ?> |
|
| 1084 | + if (!empty($post_images)) {
|
|
| 1085 | + ?> |
|
| 1086 | 1086 | <div class="geodir_flex-container"> |
| 1087 | 1087 | <div class="geodir_flex-loader"><i class="fa fa-refresh fa-spin"></i></div> |
| 1088 | 1088 | <div id="geodir_slider" class="geodir_flexslider "> |
@@ -1095,7 +1095,7 @@ discard block |
||
| 1095 | 1095 | <?php } ?> |
| 1096 | 1096 | </div> |
| 1097 | 1097 | <?php |
| 1098 | - } |
|
| 1098 | + } |
|
| 1099 | 1099 | } |
| 1100 | 1100 | |
| 1101 | 1101 | add_action('geodir_details_taxonomies', 'geodir_action_details_taxonomies', 10);
|
@@ -1110,177 +1110,177 @@ discard block |
||
| 1110 | 1110 | */ |
| 1111 | 1111 | function geodir_action_details_taxonomies() |
| 1112 | 1112 | {
|
| 1113 | - global $preview, $post;?> |
|
| 1113 | + global $preview, $post;?> |
|
| 1114 | 1114 | <p class="geodir_post_taxomomies clearfix"> |
| 1115 | 1115 | <?php |
| 1116 | - $taxonomies = array(); |
|
| 1117 | - |
|
| 1118 | - $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend |
|
| 1119 | - |
|
| 1120 | - if ($preview && !$is_backend_preview) {
|
|
| 1121 | - $post_type = $post->listing_type; |
|
| 1122 | - $post_taxonomy = $post_type . 'category'; |
|
| 1123 | - $post->{$post_taxonomy} = $post->post_category[$post_taxonomy];
|
|
| 1124 | - } else {
|
|
| 1125 | - $post_type = $post->post_type; |
|
| 1126 | - $post_taxonomy = $post_type . 'category'; |
|
| 1127 | - } |
|
| 1116 | + $taxonomies = array(); |
|
| 1117 | + |
|
| 1118 | + $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend |
|
| 1119 | + |
|
| 1120 | + if ($preview && !$is_backend_preview) {
|
|
| 1121 | + $post_type = $post->listing_type; |
|
| 1122 | + $post_taxonomy = $post_type . 'category'; |
|
| 1123 | + $post->{$post_taxonomy} = $post->post_category[$post_taxonomy];
|
|
| 1124 | + } else {
|
|
| 1125 | + $post_type = $post->post_type; |
|
| 1126 | + $post_taxonomy = $post_type . 'category'; |
|
| 1127 | + } |
|
| 1128 | 1128 | //{
|
| 1129 | - $post_type_info = get_post_type_object($post_type); |
|
| 1130 | - $listing_label = __($post_type_info->labels->singular_name, 'geodirectory'); |
|
| 1131 | - |
|
| 1132 | - if (!empty($post->post_tags)) {
|
|
| 1133 | - |
|
| 1134 | - if (taxonomy_exists($post_type . '_tags')): |
|
| 1135 | - $links = array(); |
|
| 1136 | - $terms = array(); |
|
| 1137 | - // to limit post tags |
|
| 1138 | - $post_tags = trim($post->post_tags, ","); |
|
| 1139 | - $post_id = isset($post->ID) ? $post->ID : ''; |
|
| 1140 | - /** |
|
| 1141 | - * Filter the post tags. |
|
| 1142 | - * |
|
| 1143 | - * Allows you to filter the post tags output on the details page of a post. |
|
| 1144 | - * |
|
| 1145 | - * @since 1.0.0 |
|
| 1146 | - * @param string $post_tags A comma seperated list of tags. |
|
| 1147 | - * @param int $post_id The current post id. |
|
| 1148 | - */ |
|
| 1149 | - $post_tags = apply_filters('geodir_action_details_post_tags', $post_tags, $post_id);
|
|
| 1150 | - |
|
| 1151 | - $post->post_tags = $post_tags; |
|
| 1152 | - $post_tags = explode(",", trim($post->post_tags, ","));
|
|
| 1153 | - |
|
| 1154 | - |
|
| 1155 | - foreach ($post_tags as $post_term) {
|
|
| 1156 | - |
|
| 1157 | - // fix slug creation order for tags & location |
|
| 1158 | - $post_term = trim($post_term); |
|
| 1159 | - |
|
| 1160 | - $priority_location = false; |
|
| 1161 | - if ($insert_term = term_exists($post_term, $post_type . '_tags')) {
|
|
| 1162 | - $term = get_term_by('id', $insert_term['term_id'], $post_type . '_tags');
|
|
| 1163 | - } else {
|
|
| 1164 | - $post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL; |
|
| 1165 | - $post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL; |
|
| 1166 | - $post_city = isset($_REQUEST['post_city']) && $_REQUEST['post_city'] != '' ? sanitize_text_field($_REQUEST['post_city']) : NULL; |
|
| 1167 | - $match_country = $post_country && sanitize_title($post_term) == sanitize_title($post_country) ? true : false; |
|
| 1168 | - $match_region = $post_region && sanitize_title($post_term) == sanitize_title($post_region) ? true : false; |
|
| 1169 | - $match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false; |
|
| 1170 | - if ($match_country || $match_region || $match_city) {
|
|
| 1171 | - $priority_location = true; |
|
| 1172 | - $term = get_term_by('name', $post_term, $post_type . '_tags');
|
|
| 1173 | - } else {
|
|
| 1174 | - $insert_term = wp_insert_term($post_term, $post_type . '_tags'); |
|
| 1175 | - $term = get_term_by('name', $post_term, $post_type . '_tags');
|
|
| 1176 | - } |
|
| 1177 | - } |
|
| 1178 | - |
|
| 1179 | - if (!is_wp_error($term) && is_object($term)) {
|
|
| 1180 | - |
|
| 1181 | - // fix tag link on detail page |
|
| 1182 | - if ($priority_location) {
|
|
| 1183 | - |
|
| 1184 | - $tag_link = "<a href=''>$post_term</a>"; |
|
| 1185 | - /** |
|
| 1186 | - * Filter the tag name on the details page. |
|
| 1187 | - * |
|
| 1188 | - * @since 1.5.6 |
|
| 1189 | - * @param string $tag_link The tag link html. |
|
| 1190 | - * @param object $term The tag term object. |
|
| 1191 | - */ |
|
| 1192 | - $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);
|
|
| 1193 | - $links[] = $tag_link; |
|
| 1194 | - } else {
|
|
| 1195 | - $tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>"; |
|
| 1196 | - /** This action is documented in geodirectory-template_actions.php */ |
|
| 1197 | - $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);
|
|
| 1198 | - $links[] = $tag_link; |
|
| 1199 | - } |
|
| 1200 | - $terms[] = $term; |
|
| 1201 | - } |
|
| 1202 | - // |
|
| 1203 | - } |
|
| 1204 | - if (!isset($listing_label)) {
|
|
| 1205 | - $listing_label = ''; |
|
| 1206 | - } |
|
| 1207 | - $taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);
|
|
| 1208 | - endif; |
|
| 1209 | - |
|
| 1210 | - } |
|
| 1211 | - |
|
| 1212 | - if (!empty($post->{$post_taxonomy})) {
|
|
| 1213 | - $links = array(); |
|
| 1214 | - $terms = array(); |
|
| 1215 | - $termsOrdered = array(); |
|
| 1216 | - if (!is_array($post->{$post_taxonomy})) {
|
|
| 1217 | - $post_term = explode(",", trim($post->{$post_taxonomy}, ","));
|
|
| 1218 | - } else {
|
|
| 1219 | - $post_term = $post->{$post_taxonomy};
|
|
| 1129 | + $post_type_info = get_post_type_object($post_type); |
|
| 1130 | + $listing_label = __($post_type_info->labels->singular_name, 'geodirectory'); |
|
| 1131 | + |
|
| 1132 | + if (!empty($post->post_tags)) {
|
|
| 1133 | + |
|
| 1134 | + if (taxonomy_exists($post_type . '_tags')): |
|
| 1135 | + $links = array(); |
|
| 1136 | + $terms = array(); |
|
| 1137 | + // to limit post tags |
|
| 1138 | + $post_tags = trim($post->post_tags, ","); |
|
| 1139 | + $post_id = isset($post->ID) ? $post->ID : ''; |
|
| 1140 | + /** |
|
| 1141 | + * Filter the post tags. |
|
| 1142 | + * |
|
| 1143 | + * Allows you to filter the post tags output on the details page of a post. |
|
| 1144 | + * |
|
| 1145 | + * @since 1.0.0 |
|
| 1146 | + * @param string $post_tags A comma seperated list of tags. |
|
| 1147 | + * @param int $post_id The current post id. |
|
| 1148 | + */ |
|
| 1149 | + $post_tags = apply_filters('geodir_action_details_post_tags', $post_tags, $post_id);
|
|
| 1150 | + |
|
| 1151 | + $post->post_tags = $post_tags; |
|
| 1152 | + $post_tags = explode(",", trim($post->post_tags, ","));
|
|
| 1153 | + |
|
| 1154 | + |
|
| 1155 | + foreach ($post_tags as $post_term) {
|
|
| 1156 | + |
|
| 1157 | + // fix slug creation order for tags & location |
|
| 1158 | + $post_term = trim($post_term); |
|
| 1159 | + |
|
| 1160 | + $priority_location = false; |
|
| 1161 | + if ($insert_term = term_exists($post_term, $post_type . '_tags')) {
|
|
| 1162 | + $term = get_term_by('id', $insert_term['term_id'], $post_type . '_tags');
|
|
| 1163 | + } else {
|
|
| 1164 | + $post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL; |
|
| 1165 | + $post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL; |
|
| 1166 | + $post_city = isset($_REQUEST['post_city']) && $_REQUEST['post_city'] != '' ? sanitize_text_field($_REQUEST['post_city']) : NULL; |
|
| 1167 | + $match_country = $post_country && sanitize_title($post_term) == sanitize_title($post_country) ? true : false; |
|
| 1168 | + $match_region = $post_region && sanitize_title($post_term) == sanitize_title($post_region) ? true : false; |
|
| 1169 | + $match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false; |
|
| 1170 | + if ($match_country || $match_region || $match_city) {
|
|
| 1171 | + $priority_location = true; |
|
| 1172 | + $term = get_term_by('name', $post_term, $post_type . '_tags');
|
|
| 1173 | + } else {
|
|
| 1174 | + $insert_term = wp_insert_term($post_term, $post_type . '_tags'); |
|
| 1175 | + $term = get_term_by('name', $post_term, $post_type . '_tags');
|
|
| 1176 | + } |
|
| 1177 | + } |
|
| 1178 | + |
|
| 1179 | + if (!is_wp_error($term) && is_object($term)) {
|
|
| 1180 | + |
|
| 1181 | + // fix tag link on detail page |
|
| 1182 | + if ($priority_location) {
|
|
| 1183 | + |
|
| 1184 | + $tag_link = "<a href=''>$post_term</a>"; |
|
| 1185 | + /** |
|
| 1186 | + * Filter the tag name on the details page. |
|
| 1187 | + * |
|
| 1188 | + * @since 1.5.6 |
|
| 1189 | + * @param string $tag_link The tag link html. |
|
| 1190 | + * @param object $term The tag term object. |
|
| 1191 | + */ |
|
| 1192 | + $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);
|
|
| 1193 | + $links[] = $tag_link; |
|
| 1194 | + } else {
|
|
| 1195 | + $tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>"; |
|
| 1196 | + /** This action is documented in geodirectory-template_actions.php */ |
|
| 1197 | + $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);
|
|
| 1198 | + $links[] = $tag_link; |
|
| 1199 | + } |
|
| 1200 | + $terms[] = $term; |
|
| 1201 | + } |
|
| 1202 | + // |
|
| 1203 | + } |
|
| 1204 | + if (!isset($listing_label)) {
|
|
| 1205 | + $listing_label = ''; |
|
| 1206 | + } |
|
| 1207 | + $taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);
|
|
| 1208 | + endif; |
|
| 1209 | + |
|
| 1210 | + } |
|
| 1211 | + |
|
| 1212 | + if (!empty($post->{$post_taxonomy})) {
|
|
| 1213 | + $links = array(); |
|
| 1214 | + $terms = array(); |
|
| 1215 | + $termsOrdered = array(); |
|
| 1216 | + if (!is_array($post->{$post_taxonomy})) {
|
|
| 1217 | + $post_term = explode(",", trim($post->{$post_taxonomy}, ","));
|
|
| 1218 | + } else {
|
|
| 1219 | + $post_term = $post->{$post_taxonomy};
|
|
| 1220 | 1220 | |
| 1221 | 1221 | if ($preview && !$is_backend_preview) {
|
| 1222 | 1222 | $post_term = geodir_add_parent_terms($post_term, $post_taxonomy); |
| 1223 | 1223 | } |
| 1224 | - } |
|
| 1225 | - |
|
| 1226 | - $post_term = array_unique($post_term); |
|
| 1227 | - if (!empty($post_term)) {
|
|
| 1228 | - foreach ($post_term as $post_term) {
|
|
| 1229 | - $post_term = trim($post_term); |
|
| 1230 | - |
|
| 1231 | - if ($post_term != ''): |
|
| 1232 | - $term = get_term_by('id', $post_term, $post_taxonomy);
|
|
| 1233 | - |
|
| 1234 | - if (is_object($term)) {
|
|
| 1235 | - $term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>"; |
|
| 1236 | - /** |
|
| 1237 | - * Filter the category name on the details page. |
|
| 1238 | - * |
|
| 1239 | - * @since 1.5.6 |
|
| 1240 | - * @param string $term_link The link html to the category. |
|
| 1241 | - * @param object $term The category term object. |
|
| 1242 | - */ |
|
| 1243 | - $term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);
|
|
| 1244 | - $links[] = $term_link; |
|
| 1245 | - $terms[] = $term; |
|
| 1246 | - } |
|
| 1247 | - endif; |
|
| 1248 | - } |
|
| 1249 | - // order alphabetically |
|
| 1250 | - asort($links); |
|
| 1251 | - foreach (array_keys($links) as $key) {
|
|
| 1252 | - $termsOrdered[$key] = $terms[$key]; |
|
| 1253 | - } |
|
| 1254 | - $terms = $termsOrdered; |
|
| 1224 | + } |
|
| 1225 | + |
|
| 1226 | + $post_term = array_unique($post_term); |
|
| 1227 | + if (!empty($post_term)) {
|
|
| 1228 | + foreach ($post_term as $post_term) {
|
|
| 1229 | + $post_term = trim($post_term); |
|
| 1230 | + |
|
| 1231 | + if ($post_term != ''): |
|
| 1232 | + $term = get_term_by('id', $post_term, $post_taxonomy);
|
|
| 1233 | + |
|
| 1234 | + if (is_object($term)) {
|
|
| 1235 | + $term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>"; |
|
| 1236 | + /** |
|
| 1237 | + * Filter the category name on the details page. |
|
| 1238 | + * |
|
| 1239 | + * @since 1.5.6 |
|
| 1240 | + * @param string $term_link The link html to the category. |
|
| 1241 | + * @param object $term The category term object. |
|
| 1242 | + */ |
|
| 1243 | + $term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);
|
|
| 1244 | + $links[] = $term_link; |
|
| 1245 | + $terms[] = $term; |
|
| 1246 | + } |
|
| 1247 | + endif; |
|
| 1248 | + } |
|
| 1249 | + // order alphabetically |
|
| 1250 | + asort($links); |
|
| 1251 | + foreach (array_keys($links) as $key) {
|
|
| 1252 | + $termsOrdered[$key] = $terms[$key]; |
|
| 1253 | + } |
|
| 1254 | + $terms = $termsOrdered; |
|
| 1255 | 1255 | |
| 1256 | - } |
|
| 1256 | + } |
|
| 1257 | 1257 | |
| 1258 | - if (!isset($listing_label)) {
|
|
| 1259 | - $listing_label = ''; |
|
| 1260 | - } |
|
| 1261 | - $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);
|
|
| 1258 | + if (!isset($listing_label)) {
|
|
| 1259 | + $listing_label = ''; |
|
| 1260 | + } |
|
| 1261 | + $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);
|
|
| 1262 | 1262 | |
| 1263 | - } |
|
| 1263 | + } |
|
| 1264 | 1264 | |
| 1265 | - /** |
|
| 1266 | - * Filter the taxonomies array before output. |
|
| 1267 | - * |
|
| 1268 | - * @since 1.5.9 |
|
| 1269 | - * @param array $taxonomies The array of cats and tags. |
|
| 1270 | - * @param string $post_type The post type being output. |
|
| 1271 | - * @param string $listing_label The post type label. |
|
| 1272 | - * @param string $listing_label The post type label with ucwords function. |
|
| 1273 | - */ |
|
| 1274 | - $taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));
|
|
| 1265 | + /** |
|
| 1266 | + * Filter the taxonomies array before output. |
|
| 1267 | + * |
|
| 1268 | + * @since 1.5.9 |
|
| 1269 | + * @param array $taxonomies The array of cats and tags. |
|
| 1270 | + * @param string $post_type The post type being output. |
|
| 1271 | + * @param string $listing_label The post type label. |
|
| 1272 | + * @param string $listing_label The post type label with ucwords function. |
|
| 1273 | + */ |
|
| 1274 | + $taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));
|
|
| 1275 | 1275 | |
| 1276 | - if (isset($taxonomies[$post_taxonomy])) {
|
|
| 1277 | - echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>'; |
|
| 1278 | - } |
|
| 1276 | + if (isset($taxonomies[$post_taxonomy])) {
|
|
| 1277 | + echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>'; |
|
| 1278 | + } |
|
| 1279 | 1279 | |
| 1280 | - if (isset($taxonomies[$post_type . '_tags'])) |
|
| 1281 | - echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>'; |
|
| 1280 | + if (isset($taxonomies[$post_type . '_tags'])) |
|
| 1281 | + echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>'; |
|
| 1282 | 1282 | |
| 1283 | - ?> |
|
| 1283 | + ?> |
|
| 1284 | 1284 | </p><?php |
| 1285 | 1285 | } |
| 1286 | 1286 | |
@@ -1302,144 +1302,144 @@ discard block |
||
| 1302 | 1302 | function geodir_action_details_micordata($post='') |
| 1303 | 1303 | {
|
| 1304 | 1304 | |
| 1305 | - global $preview; |
|
| 1306 | - if(empty($post)){global $post;}
|
|
| 1307 | - if ($preview || !geodir_is_page('detail')) {
|
|
| 1308 | - return; |
|
| 1309 | - } |
|
| 1310 | - |
|
| 1311 | - // url |
|
| 1312 | - $c_url = geodir_curPageURL(); |
|
| 1313 | - |
|
| 1314 | - // post reviews |
|
| 1315 | - $post_reviews = get_comments(array('post_id' => $post->ID, 'status' => 'approve'));
|
|
| 1316 | - if (empty($post_reviews)) {
|
|
| 1317 | - $reviews = ''; |
|
| 1318 | - } else {
|
|
| 1319 | - foreach ($post_reviews as $review) {
|
|
| 1320 | - |
|
| 1321 | - if($rating_value = geodir_get_commentoverall($review->comment_ID)){
|
|
| 1322 | - $reviews[] = array( |
|
| 1323 | - "@type" => "Review", |
|
| 1324 | - "author" => $review->comment_author, |
|
| 1325 | - "datePublished" => $review->comment_date, |
|
| 1326 | - "description" => $review->comment_content, |
|
| 1327 | - "reviewRating" => array( |
|
| 1328 | - "@type" => "Rating", |
|
| 1329 | - "bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score. |
|
| 1330 | - "ratingValue" => $rating_value, |
|
| 1331 | - "worstRating" => "1" |
|
| 1332 | - ) |
|
| 1333 | - ); |
|
| 1334 | - } |
|
| 1335 | - |
|
| 1336 | - } |
|
| 1337 | - |
|
| 1338 | - } |
|
| 1339 | - |
|
| 1340 | - // post images |
|
| 1341 | - $post_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
|
|
| 1342 | - if (empty($post_images)) {
|
|
| 1343 | - $images = ''; |
|
| 1344 | - } else {
|
|
| 1345 | - $i_arr = array(); |
|
| 1346 | - foreach ($post_images as $img) {
|
|
| 1347 | - $i_arr[] = $img->src; |
|
| 1348 | - } |
|
| 1349 | - |
|
| 1350 | - if (count($i_arr) == 1) {
|
|
| 1351 | - $images = $i_arr[0]; |
|
| 1352 | - } else {
|
|
| 1353 | - $images = $i_arr; |
|
| 1354 | - } |
|
| 1305 | + global $preview; |
|
| 1306 | + if(empty($post)){global $post;}
|
|
| 1307 | + if ($preview || !geodir_is_page('detail')) {
|
|
| 1308 | + return; |
|
| 1309 | + } |
|
| 1310 | + |
|
| 1311 | + // url |
|
| 1312 | + $c_url = geodir_curPageURL(); |
|
| 1313 | + |
|
| 1314 | + // post reviews |
|
| 1315 | + $post_reviews = get_comments(array('post_id' => $post->ID, 'status' => 'approve'));
|
|
| 1316 | + if (empty($post_reviews)) {
|
|
| 1317 | + $reviews = ''; |
|
| 1318 | + } else {
|
|
| 1319 | + foreach ($post_reviews as $review) {
|
|
| 1320 | + |
|
| 1321 | + if($rating_value = geodir_get_commentoverall($review->comment_ID)){
|
|
| 1322 | + $reviews[] = array( |
|
| 1323 | + "@type" => "Review", |
|
| 1324 | + "author" => $review->comment_author, |
|
| 1325 | + "datePublished" => $review->comment_date, |
|
| 1326 | + "description" => $review->comment_content, |
|
| 1327 | + "reviewRating" => array( |
|
| 1328 | + "@type" => "Rating", |
|
| 1329 | + "bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score. |
|
| 1330 | + "ratingValue" => $rating_value, |
|
| 1331 | + "worstRating" => "1" |
|
| 1332 | + ) |
|
| 1333 | + ); |
|
| 1334 | + } |
|
| 1355 | 1335 | |
| 1356 | - } |
|
| 1357 | - //print_r($post); |
|
| 1358 | - // external links |
|
| 1359 | - $external_links = array(); |
|
| 1360 | - $external_links[] = $post->geodir_website; |
|
| 1361 | - $external_links[] = $post->geodir_twitter; |
|
| 1362 | - $external_links[] = $post->geodir_facebook; |
|
| 1363 | - $external_links = array_filter($external_links); |
|
| 1364 | - |
|
| 1365 | - if(!empty($external_links)){
|
|
| 1366 | - $external_links = array_values($external_links); |
|
| 1367 | - } |
|
| 1368 | - |
|
| 1369 | - // reviews |
|
| 1370 | - $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1371 | - $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1372 | - |
|
| 1373 | - // schema type |
|
| 1374 | - $schema_type = 'LocalBusiness'; |
|
| 1375 | - if(isset($post->default_category) && $post->default_category){
|
|
| 1376 | - $cat_schema = geodir_get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type); |
|
| 1377 | - if($cat_schema){$schema_type = $cat_schema;}
|
|
| 1378 | - if(!$cat_schema && $schema_type=='LocalBusiness' && $post->post_type=='gd_event'){$schema_type = 'Event';}
|
|
| 1379 | - } |
|
| 1380 | - |
|
| 1381 | - $schema = array(); |
|
| 1382 | - $schema['@context'] = "https://schema.org"; |
|
| 1383 | - $schema['@type'] = $schema_type; |
|
| 1384 | - $schema['name'] = $post->post_title; |
|
| 1385 | - $schema['description'] = wp_strip_all_tags( $post->post_content, true ); |
|
| 1386 | - $schema['telephone'] = $post->geodir_contact; |
|
| 1387 | - $schema['url'] = $c_url; |
|
| 1388 | - $schema['sameAs'] = $external_links; |
|
| 1389 | - $schema['image'] = $images; |
|
| 1390 | - $schema['address'] = array( |
|
| 1391 | - "@type" => "PostalAddress", |
|
| 1392 | - "streetAddress" => $post->post_address, |
|
| 1393 | - "addressLocality" => $post->post_city, |
|
| 1394 | - "addressRegion" => $post->post_region, |
|
| 1395 | - "addressCountry" => $post->post_country, |
|
| 1396 | - "postalCode" => $post->post_zip |
|
| 1397 | - ); |
|
| 1398 | - |
|
| 1399 | - if($post->post_latitude && $post->post_longitude) {
|
|
| 1400 | - $schema['geo'] = array( |
|
| 1401 | - "@type" => "GeoCoordinates", |
|
| 1402 | - "latitude" => $post->post_latitude, |
|
| 1403 | - "longitude" => $post->post_longitude |
|
| 1404 | - ); |
|
| 1405 | - } |
|
| 1406 | - |
|
| 1407 | - if($post_avgratings) {
|
|
| 1408 | - $schema['aggregateRating'] = array( |
|
| 1409 | - "@type" => "AggregateRating", |
|
| 1410 | - "ratingValue" => $post_avgratings, |
|
| 1411 | - "bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score. |
|
| 1412 | - "worstRating" => "1", |
|
| 1413 | - "ratingCount" => $comment_count |
|
| 1414 | - ); |
|
| 1415 | - } |
|
| 1416 | - $schema['review'] = $reviews; |
|
| 1417 | - |
|
| 1418 | - /** |
|
| 1419 | - * Allow the schema JSON-LD info to be filtered. |
|
| 1420 | - * |
|
| 1421 | - * @since 1.5.4 |
|
| 1422 | - * @since 1.5.7 Added $post variable. |
|
| 1423 | - * @param array $schema The array of schema data to be filtered. |
|
| 1424 | - * @param object $post The post object. |
|
| 1425 | - */ |
|
| 1426 | - $schema = apply_filters('geodir_details_schema', $schema,$post);
|
|
| 1427 | - |
|
| 1428 | - |
|
| 1429 | - echo '<script type="application/ld+json">' . json_encode($schema) . '</script>'; |
|
| 1430 | - |
|
| 1431 | - |
|
| 1432 | - $uploads = wp_upload_dir(); |
|
| 1433 | - $facebook_og = (isset($post->featured_image) && $post->featured_image) ? '<meta property="og:image" content="'.$uploads['baseurl'].$post->featured_image.'"/>' : ''; |
|
| 1434 | - |
|
| 1435 | - /** |
|
| 1436 | - * Show facebook open graph meta info |
|
| 1437 | - * |
|
| 1438 | - * @since 1.6.6 |
|
| 1439 | - * @param string $facebook_og The open graph html to be filtered. |
|
| 1440 | - * @param object $post The post object. |
|
| 1441 | - */ |
|
| 1442 | - echo apply_filters('geodir_details_facebook_og', $facebook_og,$post);
|
|
| 1336 | + } |
|
| 1337 | + |
|
| 1338 | + } |
|
| 1339 | + |
|
| 1340 | + // post images |
|
| 1341 | + $post_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
|
|
| 1342 | + if (empty($post_images)) {
|
|
| 1343 | + $images = ''; |
|
| 1344 | + } else {
|
|
| 1345 | + $i_arr = array(); |
|
| 1346 | + foreach ($post_images as $img) {
|
|
| 1347 | + $i_arr[] = $img->src; |
|
| 1348 | + } |
|
| 1349 | + |
|
| 1350 | + if (count($i_arr) == 1) {
|
|
| 1351 | + $images = $i_arr[0]; |
|
| 1352 | + } else {
|
|
| 1353 | + $images = $i_arr; |
|
| 1354 | + } |
|
| 1355 | + |
|
| 1356 | + } |
|
| 1357 | + //print_r($post); |
|
| 1358 | + // external links |
|
| 1359 | + $external_links = array(); |
|
| 1360 | + $external_links[] = $post->geodir_website; |
|
| 1361 | + $external_links[] = $post->geodir_twitter; |
|
| 1362 | + $external_links[] = $post->geodir_facebook; |
|
| 1363 | + $external_links = array_filter($external_links); |
|
| 1364 | + |
|
| 1365 | + if(!empty($external_links)){
|
|
| 1366 | + $external_links = array_values($external_links); |
|
| 1367 | + } |
|
| 1368 | + |
|
| 1369 | + // reviews |
|
| 1370 | + $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1371 | + $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1372 | + |
|
| 1373 | + // schema type |
|
| 1374 | + $schema_type = 'LocalBusiness'; |
|
| 1375 | + if(isset($post->default_category) && $post->default_category){
|
|
| 1376 | + $cat_schema = geodir_get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type); |
|
| 1377 | + if($cat_schema){$schema_type = $cat_schema;}
|
|
| 1378 | + if(!$cat_schema && $schema_type=='LocalBusiness' && $post->post_type=='gd_event'){$schema_type = 'Event';}
|
|
| 1379 | + } |
|
| 1380 | + |
|
| 1381 | + $schema = array(); |
|
| 1382 | + $schema['@context'] = "https://schema.org"; |
|
| 1383 | + $schema['@type'] = $schema_type; |
|
| 1384 | + $schema['name'] = $post->post_title; |
|
| 1385 | + $schema['description'] = wp_strip_all_tags( $post->post_content, true ); |
|
| 1386 | + $schema['telephone'] = $post->geodir_contact; |
|
| 1387 | + $schema['url'] = $c_url; |
|
| 1388 | + $schema['sameAs'] = $external_links; |
|
| 1389 | + $schema['image'] = $images; |
|
| 1390 | + $schema['address'] = array( |
|
| 1391 | + "@type" => "PostalAddress", |
|
| 1392 | + "streetAddress" => $post->post_address, |
|
| 1393 | + "addressLocality" => $post->post_city, |
|
| 1394 | + "addressRegion" => $post->post_region, |
|
| 1395 | + "addressCountry" => $post->post_country, |
|
| 1396 | + "postalCode" => $post->post_zip |
|
| 1397 | + ); |
|
| 1398 | + |
|
| 1399 | + if($post->post_latitude && $post->post_longitude) {
|
|
| 1400 | + $schema['geo'] = array( |
|
| 1401 | + "@type" => "GeoCoordinates", |
|
| 1402 | + "latitude" => $post->post_latitude, |
|
| 1403 | + "longitude" => $post->post_longitude |
|
| 1404 | + ); |
|
| 1405 | + } |
|
| 1406 | + |
|
| 1407 | + if($post_avgratings) {
|
|
| 1408 | + $schema['aggregateRating'] = array( |
|
| 1409 | + "@type" => "AggregateRating", |
|
| 1410 | + "ratingValue" => $post_avgratings, |
|
| 1411 | + "bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score. |
|
| 1412 | + "worstRating" => "1", |
|
| 1413 | + "ratingCount" => $comment_count |
|
| 1414 | + ); |
|
| 1415 | + } |
|
| 1416 | + $schema['review'] = $reviews; |
|
| 1417 | + |
|
| 1418 | + /** |
|
| 1419 | + * Allow the schema JSON-LD info to be filtered. |
|
| 1420 | + * |
|
| 1421 | + * @since 1.5.4 |
|
| 1422 | + * @since 1.5.7 Added $post variable. |
|
| 1423 | + * @param array $schema The array of schema data to be filtered. |
|
| 1424 | + * @param object $post The post object. |
|
| 1425 | + */ |
|
| 1426 | + $schema = apply_filters('geodir_details_schema', $schema,$post);
|
|
| 1427 | + |
|
| 1428 | + |
|
| 1429 | + echo '<script type="application/ld+json">' . json_encode($schema) . '</script>'; |
|
| 1430 | + |
|
| 1431 | + |
|
| 1432 | + $uploads = wp_upload_dir(); |
|
| 1433 | + $facebook_og = (isset($post->featured_image) && $post->featured_image) ? '<meta property="og:image" content="'.$uploads['baseurl'].$post->featured_image.'"/>' : ''; |
|
| 1434 | + |
|
| 1435 | + /** |
|
| 1436 | + * Show facebook open graph meta info |
|
| 1437 | + * |
|
| 1438 | + * @since 1.6.6 |
|
| 1439 | + * @param string $facebook_og The open graph html to be filtered. |
|
| 1440 | + * @param object $post The post object. |
|
| 1441 | + */ |
|
| 1442 | + echo apply_filters('geodir_details_facebook_og', $facebook_og,$post);
|
|
| 1443 | 1443 | |
| 1444 | 1444 | |
| 1445 | 1445 | |
@@ -1459,7 +1459,7 @@ discard block |
||
| 1459 | 1459 | */ |
| 1460 | 1460 | function geodir_action_details_next_prev() |
| 1461 | 1461 | {
|
| 1462 | - ?> |
|
| 1462 | + ?> |
|
| 1463 | 1463 | <div class="geodir-pos_navigation clearfix"> |
| 1464 | 1464 | <div |
| 1465 | 1465 | class="geodir-post_left"><?php previous_post_link('%link', '' . __('Previous', 'geodirectory'), false) ?></div>
|
@@ -1477,15 +1477,15 @@ discard block |
||
| 1477 | 1477 | */ |
| 1478 | 1478 | function geodir_action_before_single_post() |
| 1479 | 1479 | {
|
| 1480 | - global $post; |
|
| 1481 | - /** |
|
| 1482 | - * Called at the very start of the details page output, before the title section. |
|
| 1483 | - * |
|
| 1484 | - * @since 1.0.0 |
|
| 1485 | - * @param object $post The current post object. |
|
| 1486 | - * @global WP_Post|null $post The current post, if available. |
|
| 1487 | - */ |
|
| 1488 | - do_action('geodir_before_single_post', $post); // extra action
|
|
| 1480 | + global $post; |
|
| 1481 | + /** |
|
| 1482 | + * Called at the very start of the details page output, before the title section. |
|
| 1483 | + * |
|
| 1484 | + * @since 1.0.0 |
|
| 1485 | + * @param object $post The current post object. |
|
| 1486 | + * @global WP_Post|null $post The current post, if available. |
|
| 1487 | + */ |
|
| 1488 | + do_action('geodir_before_single_post', $post); // extra action
|
|
| 1489 | 1489 | } |
| 1490 | 1490 | |
| 1491 | 1491 | /** |
@@ -1496,13 +1496,13 @@ discard block |
||
| 1496 | 1496 | */ |
| 1497 | 1497 | function geodir_action_after_single_post($post) |
| 1498 | 1498 | {
|
| 1499 | - /** |
|
| 1500 | - * Called on the details page after the details page tabs section and before the next/prev buttons. |
|
| 1501 | - * |
|
| 1502 | - * @since 1.0.0 |
|
| 1503 | - * @param object $post The current post object. |
|
| 1504 | - */ |
|
| 1505 | - do_action('geodir_after_single_post', $post); // extra action
|
|
| 1499 | + /** |
|
| 1500 | + * Called on the details page after the details page tabs section and before the next/prev buttons. |
|
| 1501 | + * |
|
| 1502 | + * @since 1.0.0 |
|
| 1503 | + * @param object $post The current post object. |
|
| 1504 | + */ |
|
| 1505 | + do_action('geodir_after_single_post', $post); // extra action
|
|
| 1506 | 1506 | } |
| 1507 | 1507 | |
| 1508 | 1508 | add_action('geodir_details_main_content', 'geodir_action_before_single_post', 10);
|
@@ -1528,168 +1528,168 @@ discard block |
||
| 1528 | 1528 | */ |
| 1529 | 1529 | function geodir_action_listings_title() |
| 1530 | 1530 | {
|
| 1531 | - global $wp, $term; |
|
| 1532 | - |
|
| 1533 | - $gd_post_type = geodir_get_current_posttype(); |
|
| 1534 | - $post_type_info = get_post_type_object($gd_post_type); |
|
| 1531 | + global $wp, $term; |
|
| 1535 | 1532 | |
| 1536 | - $add_string_in_title = __('All', 'geodirectory') . ' ';
|
|
| 1537 | - if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 1538 | - $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';
|
|
| 1539 | - } |
|
| 1533 | + $gd_post_type = geodir_get_current_posttype(); |
|
| 1534 | + $post_type_info = get_post_type_object($gd_post_type); |
|
| 1540 | 1535 | |
| 1541 | - $list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory'); |
|
| 1542 | - $single_name = $post_type_info->labels->singular_name; |
|
| 1536 | + $add_string_in_title = __('All', 'geodirectory') . ' ';
|
|
| 1537 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 1538 | + $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';
|
|
| 1539 | + } |
|
| 1543 | 1540 | |
| 1544 | - $taxonomy = geodir_get_taxonomies($gd_post_type, true); |
|
| 1541 | + $list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory'); |
|
| 1542 | + $single_name = $post_type_info->labels->singular_name; |
|
| 1545 | 1543 | |
| 1546 | - $gd_country = get_query_var('gd_country');
|
|
| 1547 | - $gd_region = get_query_var('gd_region');
|
|
| 1548 | - $gd_city = get_query_var('gd_city');
|
|
| 1544 | + $taxonomy = geodir_get_taxonomies($gd_post_type, true); |
|
| 1549 | 1545 | |
| 1550 | - if (!empty($term)) {
|
|
| 1551 | - $location_name = ''; |
|
| 1552 | - if ($gd_country != '' || $gd_region != '' || $gd_city != '') {
|
|
| 1553 | - if ($gd_country != '') {
|
|
| 1554 | - $location_name = geodir_sanitize_location_name('gd_country', $gd_country);
|
|
| 1555 | - } |
|
| 1546 | + $gd_country = get_query_var('gd_country');
|
|
| 1547 | + $gd_region = get_query_var('gd_region');
|
|
| 1548 | + $gd_city = get_query_var('gd_city');
|
|
| 1556 | 1549 | |
| 1557 | - if ($gd_region != '') {
|
|
| 1558 | - $location_name = geodir_sanitize_location_name('gd_region', $gd_region);
|
|
| 1559 | - } |
|
| 1560 | - |
|
| 1561 | - if ($gd_city != '') {
|
|
| 1562 | - $location_name = geodir_sanitize_location_name('gd_city', $gd_city);
|
|
| 1563 | - } |
|
| 1564 | - } |
|
| 1565 | - |
|
| 1566 | - $current_term = get_term_by('slug', $term, $taxonomy[0]);
|
|
| 1567 | - if (!empty($current_term)) {
|
|
| 1568 | - $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory'); |
|
| 1569 | - if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {
|
|
| 1570 | - $location_last_char = substr($location_name, -1); |
|
| 1571 | - $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');
|
|
| 1572 | - $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;
|
|
| 1573 | - } else {
|
|
| 1574 | - $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";
|
|
| 1575 | - } |
|
| 1576 | - } else {
|
|
| 1577 | - if (count($taxonomy) > 1) {
|
|
| 1578 | - $current_term = get_term_by('slug', $term, $taxonomy[1]);
|
|
| 1579 | - |
|
| 1580 | - if (!empty($current_term)) {
|
|
| 1581 | - $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory'); |
|
| 1582 | - if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {
|
|
| 1583 | - $location_last_char = substr($location_name, -1); |
|
| 1584 | - $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');
|
|
| 1585 | - $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;
|
|
| 1586 | - } else {
|
|
| 1587 | - $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";
|
|
| 1588 | - } |
|
| 1589 | - } |
|
| 1590 | - } |
|
| 1591 | - } |
|
| 1592 | - |
|
| 1593 | - } else {
|
|
| 1594 | - $gd_country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : ''; |
|
| 1595 | - $gd_region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : ''; |
|
| 1596 | - $gd_city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : ''; |
|
| 1597 | - |
|
| 1598 | - $gd_country_actual = $gd_region_actual = $gd_city_actual = ''; |
|
| 1599 | - |
|
| 1600 | - if (function_exists('get_actual_location_name')) {
|
|
| 1601 | - $gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;
|
|
| 1602 | - $gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;
|
|
| 1603 | - $gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;
|
|
| 1604 | - } |
|
| 1605 | - |
|
| 1606 | - if ($gd_city != '') {
|
|
| 1607 | - if ($gd_city_actual != '') {
|
|
| 1608 | - $gd_city = $gd_city_actual; |
|
| 1609 | - } else {
|
|
| 1610 | - $gd_city = preg_replace('/-(\d+)$/', '', $gd_city);
|
|
| 1611 | - $gd_city = preg_replace('/[_-]/', ' ', $gd_city);
|
|
| 1612 | - $gd_city = __(geodir_ucwords($gd_city), 'geodirectory'); |
|
| 1613 | - } |
|
| 1614 | - |
|
| 1615 | - $list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";
|
|
| 1616 | - } else if ($gd_region != '') {
|
|
| 1617 | - if ($gd_region_actual != '') {
|
|
| 1618 | - $gd_region = $gd_region_actual; |
|
| 1619 | - } else {
|
|
| 1620 | - $gd_region = preg_replace('/-(\d+)$/', '', $gd_region);
|
|
| 1621 | - $gd_region = preg_replace('/[_-]/', ' ', $gd_region);
|
|
| 1622 | - $gd_region = __(geodir_ucwords($gd_region), 'geodirectory'); |
|
| 1623 | - } |
|
| 1624 | - |
|
| 1625 | - $list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";
|
|
| 1626 | - } else if ($gd_country != '') {
|
|
| 1627 | - if ($gd_country_actual != '') {
|
|
| 1628 | - $gd_country = $gd_country_actual; |
|
| 1629 | - } else {
|
|
| 1630 | - $gd_country = preg_replace('/-(\d+)$/', '', $gd_country);
|
|
| 1631 | - $gd_country = preg_replace('/[_-]/', ' ', $gd_country);
|
|
| 1632 | - $gd_country = __(geodir_ucwords($gd_country), 'geodirectory'); |
|
| 1633 | - } |
|
| 1634 | - |
|
| 1635 | - $list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";
|
|
| 1636 | - } |
|
| 1637 | - } |
|
| 1638 | - |
|
| 1639 | - if (is_search()) {
|
|
| 1640 | - $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";
|
|
| 1641 | - } |
|
| 1642 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1643 | - $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 1644 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1645 | - $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 1646 | - |
|
| 1647 | - |
|
| 1648 | - $title = $list_title; |
|
| 1649 | - $gd_page = ''; |
|
| 1650 | - if(geodir_is_page('pt')){
|
|
| 1651 | - $gd_page = 'pt'; |
|
| 1652 | - $title = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;
|
|
| 1653 | - } |
|
| 1654 | - elseif(geodir_is_page('listing')){
|
|
| 1655 | - $gd_page = 'listing'; |
|
| 1656 | - global $wp_query; |
|
| 1657 | - $current_term = $wp_query->get_queried_object(); |
|
| 1658 | - if (strpos($current_term->taxonomy,'_tags') !== false) {
|
|
| 1659 | - $title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;
|
|
| 1660 | - }else{
|
|
| 1661 | - $title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;
|
|
| 1662 | - } |
|
| 1550 | + if (!empty($term)) {
|
|
| 1551 | + $location_name = ''; |
|
| 1552 | + if ($gd_country != '' || $gd_region != '' || $gd_city != '') {
|
|
| 1553 | + if ($gd_country != '') {
|
|
| 1554 | + $location_name = geodir_sanitize_location_name('gd_country', $gd_country);
|
|
| 1555 | + } |
|
| 1663 | 1556 | |
| 1664 | - } |
|
| 1665 | - elseif(geodir_is_page('author')){
|
|
| 1666 | - $gd_page = 'author'; |
|
| 1667 | - if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){
|
|
| 1668 | - $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;
|
|
| 1669 | - }else{
|
|
| 1670 | - $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;
|
|
| 1671 | - } |
|
| 1557 | + if ($gd_region != '') {
|
|
| 1558 | + $location_name = geodir_sanitize_location_name('gd_region', $gd_region);
|
|
| 1559 | + } |
|
| 1672 | 1560 | |
| 1673 | - } |
|
| 1561 | + if ($gd_city != '') {
|
|
| 1562 | + $location_name = geodir_sanitize_location_name('gd_city', $gd_city);
|
|
| 1563 | + } |
|
| 1564 | + } |
|
| 1565 | + |
|
| 1566 | + $current_term = get_term_by('slug', $term, $taxonomy[0]);
|
|
| 1567 | + if (!empty($current_term)) {
|
|
| 1568 | + $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory'); |
|
| 1569 | + if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {
|
|
| 1570 | + $location_last_char = substr($location_name, -1); |
|
| 1571 | + $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');
|
|
| 1572 | + $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;
|
|
| 1573 | + } else {
|
|
| 1574 | + $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";
|
|
| 1575 | + } |
|
| 1576 | + } else {
|
|
| 1577 | + if (count($taxonomy) > 1) {
|
|
| 1578 | + $current_term = get_term_by('slug', $term, $taxonomy[1]);
|
|
| 1579 | + |
|
| 1580 | + if (!empty($current_term)) {
|
|
| 1581 | + $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory'); |
|
| 1582 | + if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {
|
|
| 1583 | + $location_last_char = substr($location_name, -1); |
|
| 1584 | + $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');
|
|
| 1585 | + $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;
|
|
| 1586 | + } else {
|
|
| 1587 | + $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";
|
|
| 1588 | + } |
|
| 1589 | + } |
|
| 1590 | + } |
|
| 1591 | + } |
|
| 1592 | + |
|
| 1593 | + } else {
|
|
| 1594 | + $gd_country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : ''; |
|
| 1595 | + $gd_region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : ''; |
|
| 1596 | + $gd_city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : ''; |
|
| 1597 | + |
|
| 1598 | + $gd_country_actual = $gd_region_actual = $gd_city_actual = ''; |
|
| 1599 | + |
|
| 1600 | + if (function_exists('get_actual_location_name')) {
|
|
| 1601 | + $gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;
|
|
| 1602 | + $gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;
|
|
| 1603 | + $gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;
|
|
| 1604 | + } |
|
| 1605 | + |
|
| 1606 | + if ($gd_city != '') {
|
|
| 1607 | + if ($gd_city_actual != '') {
|
|
| 1608 | + $gd_city = $gd_city_actual; |
|
| 1609 | + } else {
|
|
| 1610 | + $gd_city = preg_replace('/-(\d+)$/', '', $gd_city);
|
|
| 1611 | + $gd_city = preg_replace('/[_-]/', ' ', $gd_city);
|
|
| 1612 | + $gd_city = __(geodir_ucwords($gd_city), 'geodirectory'); |
|
| 1613 | + } |
|
| 1674 | 1614 | |
| 1615 | + $list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";
|
|
| 1616 | + } else if ($gd_region != '') {
|
|
| 1617 | + if ($gd_region_actual != '') {
|
|
| 1618 | + $gd_region = $gd_region_actual; |
|
| 1619 | + } else {
|
|
| 1620 | + $gd_region = preg_replace('/-(\d+)$/', '', $gd_region);
|
|
| 1621 | + $gd_region = preg_replace('/[_-]/', ' ', $gd_region);
|
|
| 1622 | + $gd_region = __(geodir_ucwords($gd_region), 'geodirectory'); |
|
| 1623 | + } |
|
| 1675 | 1624 | |
| 1676 | - /** |
|
| 1677 | - * Filter page title to replace variables. |
|
| 1678 | - * |
|
| 1679 | - * @since 1.5.4 |
|
| 1680 | - * @param string $title The page title including variables. |
|
| 1681 | - * @param string $gd_page The GeoDirectory page type if any. |
|
| 1682 | - */ |
|
| 1683 | - $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 1625 | + $list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";
|
|
| 1626 | + } else if ($gd_country != '') {
|
|
| 1627 | + if ($gd_country_actual != '') {
|
|
| 1628 | + $gd_country = $gd_country_actual; |
|
| 1629 | + } else {
|
|
| 1630 | + $gd_country = preg_replace('/-(\d+)$/', '', $gd_country);
|
|
| 1631 | + $gd_country = preg_replace('/[_-]/', ' ', $gd_country);
|
|
| 1632 | + $gd_country = __(geodir_ucwords($gd_country), 'geodirectory'); |
|
| 1633 | + } |
|
| 1684 | 1634 | |
| 1685 | - echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . |
|
| 1686 | - /** |
|
| 1687 | - * Filter the listing page title. |
|
| 1688 | - * |
|
| 1689 | - * @since 1.0.0 |
|
| 1690 | - * @param string $list_title The title for the category page. |
|
| 1691 | - */ |
|
| 1692 | - apply_filters('geodir_listing_page_title', $title) . '</h1></header>';
|
|
| 1635 | + $list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";
|
|
| 1636 | + } |
|
| 1637 | + } |
|
| 1638 | + |
|
| 1639 | + if (is_search()) {
|
|
| 1640 | + $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";
|
|
| 1641 | + } |
|
| 1642 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1643 | + $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 1644 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1645 | + $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 1646 | + |
|
| 1647 | + |
|
| 1648 | + $title = $list_title; |
|
| 1649 | + $gd_page = ''; |
|
| 1650 | + if(geodir_is_page('pt')){
|
|
| 1651 | + $gd_page = 'pt'; |
|
| 1652 | + $title = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;
|
|
| 1653 | + } |
|
| 1654 | + elseif(geodir_is_page('listing')){
|
|
| 1655 | + $gd_page = 'listing'; |
|
| 1656 | + global $wp_query; |
|
| 1657 | + $current_term = $wp_query->get_queried_object(); |
|
| 1658 | + if (strpos($current_term->taxonomy,'_tags') !== false) {
|
|
| 1659 | + $title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;
|
|
| 1660 | + }else{
|
|
| 1661 | + $title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;
|
|
| 1662 | + } |
|
| 1663 | + |
|
| 1664 | + } |
|
| 1665 | + elseif(geodir_is_page('author')){
|
|
| 1666 | + $gd_page = 'author'; |
|
| 1667 | + if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){
|
|
| 1668 | + $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;
|
|
| 1669 | + }else{
|
|
| 1670 | + $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;
|
|
| 1671 | + } |
|
| 1672 | + |
|
| 1673 | + } |
|
| 1674 | + |
|
| 1675 | + |
|
| 1676 | + /** |
|
| 1677 | + * Filter page title to replace variables. |
|
| 1678 | + * |
|
| 1679 | + * @since 1.5.4 |
|
| 1680 | + * @param string $title The page title including variables. |
|
| 1681 | + * @param string $gd_page The GeoDirectory page type if any. |
|
| 1682 | + */ |
|
| 1683 | + $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 1684 | + |
|
| 1685 | + echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . |
|
| 1686 | + /** |
|
| 1687 | + * Filter the listing page title. |
|
| 1688 | + * |
|
| 1689 | + * @since 1.0.0 |
|
| 1690 | + * @param string $list_title The title for the category page. |
|
| 1691 | + */ |
|
| 1692 | + apply_filters('geodir_listing_page_title', $title) . '</h1></header>';
|
|
| 1693 | 1693 | } |
| 1694 | 1694 | |
| 1695 | 1695 | add_action('geodir_listings_page_description', 'geodir_action_listings_description', 10);
|
@@ -1702,46 +1702,46 @@ discard block |
||
| 1702 | 1702 | */ |
| 1703 | 1703 | function geodir_action_listings_description() |
| 1704 | 1704 | {
|
| 1705 | - global $wp_query; |
|
| 1706 | - $current_term = $wp_query->get_queried_object(); |
|
| 1705 | + global $wp_query; |
|
| 1706 | + $current_term = $wp_query->get_queried_object(); |
|
| 1707 | 1707 | |
| 1708 | - $gd_post_type = geodir_get_current_posttype(); |
|
| 1709 | - if (isset($current_term->term_id) && $current_term->term_id != '') {
|
|
| 1708 | + $gd_post_type = geodir_get_current_posttype(); |
|
| 1709 | + if (isset($current_term->term_id) && $current_term->term_id != '') {
|
|
| 1710 | 1710 | |
| 1711 | - $term_desc = term_description($current_term->term_id, $gd_post_type . '_tags'); |
|
| 1712 | - $saved_data = stripslashes(geodir_get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type)); |
|
| 1713 | - if ($term_desc && !$saved_data) {
|
|
| 1714 | - $saved_data = $term_desc; |
|
| 1715 | - } |
|
| 1711 | + $term_desc = term_description($current_term->term_id, $gd_post_type . '_tags'); |
|
| 1712 | + $saved_data = stripslashes(geodir_get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type)); |
|
| 1713 | + if ($term_desc && !$saved_data) {
|
|
| 1714 | + $saved_data = $term_desc; |
|
| 1715 | + } |
|
| 1716 | 1716 | |
| 1717 | - // stop payment manager filtering content length |
|
| 1718 | - $filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' ); |
|
| 1719 | - if ( false !== $filter_priority ) {
|
|
| 1720 | - remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority ); |
|
| 1721 | - } |
|
| 1717 | + // stop payment manager filtering content length |
|
| 1718 | + $filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' ); |
|
| 1719 | + if ( false !== $filter_priority ) {
|
|
| 1720 | + remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority ); |
|
| 1721 | + } |
|
| 1722 | 1722 | |
| 1723 | - /** |
|
| 1724 | - * Apply the core filter `the_content` filter to the variable string. |
|
| 1725 | - * |
|
| 1726 | - * This is a WordPress core filter that does many things. |
|
| 1727 | - * |
|
| 1728 | - * @since 1.0.0 |
|
| 1729 | - * @param string $var The string to apply the filter to. |
|
| 1730 | - */ |
|
| 1731 | - $cat_description = apply_filters('the_content', $saved_data);
|
|
| 1723 | + /** |
|
| 1724 | + * Apply the core filter `the_content` filter to the variable string. |
|
| 1725 | + * |
|
| 1726 | + * This is a WordPress core filter that does many things. |
|
| 1727 | + * |
|
| 1728 | + * @since 1.0.0 |
|
| 1729 | + * @param string $var The string to apply the filter to. |
|
| 1730 | + */ |
|
| 1731 | + $cat_description = apply_filters('the_content', $saved_data);
|
|
| 1732 | 1732 | |
| 1733 | 1733 | |
| 1734 | - if ( false !== $filter_priority ) {
|
|
| 1735 | - add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority ); |
|
| 1736 | - } |
|
| 1734 | + if ( false !== $filter_priority ) {
|
|
| 1735 | + add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority ); |
|
| 1736 | + } |
|
| 1737 | 1737 | |
| 1738 | - if ($cat_description) {
|
|
| 1739 | - ?> |
|
| 1738 | + if ($cat_description) {
|
|
| 1739 | + ?> |
|
| 1740 | 1740 | |
| 1741 | 1741 | <div class="term_description"><?php echo $cat_description;?></div> <?php |
| 1742 | - } |
|
| 1742 | + } |
|
| 1743 | 1743 | |
| 1744 | - } |
|
| 1744 | + } |
|
| 1745 | 1745 | } |
| 1746 | 1746 | |
| 1747 | 1747 | // action for adding the listings page top widget area |
@@ -1760,11 +1760,11 @@ discard block |
||
| 1760 | 1760 | */ |
| 1761 | 1761 | function geodir_action_geodir_sidebar_listings_top() |
| 1762 | 1762 | {
|
| 1763 | - if (get_option('geodir_show_listing_top_section')) { ?>
|
|
| 1763 | + if (get_option('geodir_show_listing_top_section')) { ?>
|
|
| 1764 | 1764 | <div |
| 1765 | 1765 | class="<?php |
| 1766 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1767 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_top'); ?>">
|
|
| 1766 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1767 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_top'); ?>">
|
|
| 1768 | 1768 | <?php dynamic_sidebar('geodir_listing_top'); ?>
|
| 1769 | 1769 | </div><!-- clearfix ends here--> |
| 1770 | 1770 | <?php } |
@@ -1787,35 +1787,35 @@ discard block |
||
| 1787 | 1787 | */ |
| 1788 | 1788 | function geodir_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '') |
| 1789 | 1789 | {
|
| 1790 | - if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {
|
|
| 1791 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 1792 | - } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {
|
|
| 1793 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 1794 | - } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {
|
|
| 1795 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 1796 | - } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {
|
|
| 1797 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 1798 | - } else {
|
|
| 1799 | - $width_css = ''; |
|
| 1800 | - } |
|
| 1801 | - |
|
| 1802 | - $tc = get_option('theme_compatibility_setting');
|
|
| 1803 | - if (!empty($tc['geodir_sidebar_left_open_replace'])) {
|
|
| 1804 | - $text = $tc['geodir_sidebar_left_open_replace']; |
|
| 1805 | - } else {
|
|
| 1806 | - $text = '<aside id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>'; |
|
| 1807 | - } |
|
| 1808 | - |
|
| 1809 | - if (!empty($tc['geodir_sidebar_left_open_id'])) {
|
|
| 1810 | - $id = $tc['geodir_sidebar_left_open_id']; |
|
| 1811 | - } |
|
| 1812 | - if (!empty($tc['geodir_sidebar_left_open_class'])) {
|
|
| 1813 | - $class = $tc['geodir_sidebar_left_open_class']; |
|
| 1814 | - } |
|
| 1815 | - |
|
| 1816 | - $text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);
|
|
| 1817 | - |
|
| 1818 | - echo $text; |
|
| 1790 | + if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {
|
|
| 1791 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 1792 | + } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {
|
|
| 1793 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 1794 | + } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {
|
|
| 1795 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 1796 | + } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {
|
|
| 1797 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 1798 | + } else {
|
|
| 1799 | + $width_css = ''; |
|
| 1800 | + } |
|
| 1801 | + |
|
| 1802 | + $tc = get_option('theme_compatibility_setting');
|
|
| 1803 | + if (!empty($tc['geodir_sidebar_left_open_replace'])) {
|
|
| 1804 | + $text = $tc['geodir_sidebar_left_open_replace']; |
|
| 1805 | + } else {
|
|
| 1806 | + $text = '<aside id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>'; |
|
| 1807 | + } |
|
| 1808 | + |
|
| 1809 | + if (!empty($tc['geodir_sidebar_left_open_id'])) {
|
|
| 1810 | + $id = $tc['geodir_sidebar_left_open_id']; |
|
| 1811 | + } |
|
| 1812 | + if (!empty($tc['geodir_sidebar_left_open_class'])) {
|
|
| 1813 | + $class = $tc['geodir_sidebar_left_open_class']; |
|
| 1814 | + } |
|
| 1815 | + |
|
| 1816 | + $text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);
|
|
| 1817 | + |
|
| 1818 | + echo $text; |
|
| 1819 | 1819 | } |
| 1820 | 1820 | |
| 1821 | 1821 | // action for adding the primary div closing tag |
@@ -1831,13 +1831,13 @@ discard block |
||
| 1831 | 1831 | */ |
| 1832 | 1832 | function geodir_action_sidebar_left_close($type = '') |
| 1833 | 1833 | {
|
| 1834 | - $tc = get_option('theme_compatibility_setting');
|
|
| 1835 | - if (!empty($tc['geodir_sidebar_left_close_replace'])) {
|
|
| 1836 | - $text = $tc['geodir_sidebar_left_close_replace']; |
|
| 1837 | - } else {
|
|
| 1838 | - $text = '</aside><!-- sidebar ends here-->'; |
|
| 1839 | - } |
|
| 1840 | - echo $text; |
|
| 1834 | + $tc = get_option('theme_compatibility_setting');
|
|
| 1835 | + if (!empty($tc['geodir_sidebar_left_close_replace'])) {
|
|
| 1836 | + $text = $tc['geodir_sidebar_left_close_replace']; |
|
| 1837 | + } else {
|
|
| 1838 | + $text = '</aside><!-- sidebar ends here-->'; |
|
| 1839 | + } |
|
| 1840 | + echo $text; |
|
| 1841 | 1841 | } |
| 1842 | 1842 | |
| 1843 | 1843 | /** |
@@ -1850,7 +1850,7 @@ discard block |
||
| 1850 | 1850 | */ |
| 1851 | 1851 | function geodir_listing_left_section() |
| 1852 | 1852 | {
|
| 1853 | - if (get_option('geodir_show_listing_left_section')) { ?>
|
|
| 1853 | + if (get_option('geodir_show_listing_left_section')) { ?>
|
|
| 1854 | 1854 | <div class="geodir-content-left geodir-sidebar-wrap"> |
| 1855 | 1855 | <?php dynamic_sidebar('geodir_listing_left_sidebar'); ?>
|
| 1856 | 1856 | </div><!-- end geodir-content-left --> |
@@ -1868,20 +1868,20 @@ discard block |
||
| 1868 | 1868 | */ |
| 1869 | 1869 | function geodir_action_listings_sidebar_left() |
| 1870 | 1870 | {
|
| 1871 | - if (get_option('geodir_show_listing_left_section')) {
|
|
| 1872 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1873 | - do_action('geodir_sidebar_left_open', 'listings-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'https://schema.org/WPSideBar');
|
|
| 1874 | - /** |
|
| 1875 | - * Calls the listings page (category) left sidebar content. |
|
| 1876 | - * |
|
| 1877 | - * All the content for the listings page left sidebar is added via this hook. |
|
| 1878 | - * |
|
| 1879 | - * @since 1.0.0 |
|
| 1880 | - */ |
|
| 1881 | - do_action('geodir_listings_sidebar_left_inside');
|
|
| 1882 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1883 | - do_action('geodir_sidebar_left_close', 'listings-page');
|
|
| 1884 | - } |
|
| 1871 | + if (get_option('geodir_show_listing_left_section')) {
|
|
| 1872 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1873 | + do_action('geodir_sidebar_left_open', 'listings-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'https://schema.org/WPSideBar');
|
|
| 1874 | + /** |
|
| 1875 | + * Calls the listings page (category) left sidebar content. |
|
| 1876 | + * |
|
| 1877 | + * All the content for the listings page left sidebar is added via this hook. |
|
| 1878 | + * |
|
| 1879 | + * @since 1.0.0 |
|
| 1880 | + */ |
|
| 1881 | + do_action('geodir_listings_sidebar_left_inside');
|
|
| 1882 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1883 | + do_action('geodir_sidebar_left_close', 'listings-page');
|
|
| 1884 | + } |
|
| 1885 | 1885 | } |
| 1886 | 1886 | |
| 1887 | 1887 | /** |
@@ -1894,7 +1894,7 @@ discard block |
||
| 1894 | 1894 | */ |
| 1895 | 1895 | function geodir_listing_right_section() |
| 1896 | 1896 | {
|
| 1897 | - if (get_option('geodir_show_listing_right_section')) { ?>
|
|
| 1897 | + if (get_option('geodir_show_listing_right_section')) { ?>
|
|
| 1898 | 1898 | <div class="geodir-content-right geodir-sidebar-wrap"> |
| 1899 | 1899 | <?php dynamic_sidebar('geodir_listing_right_sidebar'); ?>
|
| 1900 | 1900 | </div><!-- end geodir-content-right --> |
@@ -1912,20 +1912,20 @@ discard block |
||
| 1912 | 1912 | */ |
| 1913 | 1913 | function geodir_action_listings_sidebar_right() |
| 1914 | 1914 | {
|
| 1915 | - if (get_option('geodir_show_listing_right_section')) {
|
|
| 1916 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1917 | - do_action('geodir_sidebar_right_open', 'listings-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 1918 | - /** |
|
| 1919 | - * Calls the listings page (category) right sidebar content. |
|
| 1920 | - * |
|
| 1921 | - * All the content for the listings page right sidebar is added via this hook. |
|
| 1922 | - * |
|
| 1923 | - * @since 1.0.0 |
|
| 1924 | - */ |
|
| 1925 | - do_action('geodir_listings_sidebar_right_inside');
|
|
| 1926 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1927 | - do_action('geodir_sidebar_right_close', 'listings-page');
|
|
| 1928 | - } |
|
| 1915 | + if (get_option('geodir_show_listing_right_section')) {
|
|
| 1916 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1917 | + do_action('geodir_sidebar_right_open', 'listings-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 1918 | + /** |
|
| 1919 | + * Calls the listings page (category) right sidebar content. |
|
| 1920 | + * |
|
| 1921 | + * All the content for the listings page right sidebar is added via this hook. |
|
| 1922 | + * |
|
| 1923 | + * @since 1.0.0 |
|
| 1924 | + */ |
|
| 1925 | + do_action('geodir_listings_sidebar_right_inside');
|
|
| 1926 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1927 | + do_action('geodir_sidebar_right_close', 'listings-page');
|
|
| 1928 | + } |
|
| 1929 | 1929 | } |
| 1930 | 1930 | |
| 1931 | 1931 | |
@@ -1942,23 +1942,23 @@ discard block |
||
| 1942 | 1942 | */ |
| 1943 | 1943 | function geodir_action_main_content_open($type = '', $id = '', $class = '') |
| 1944 | 1944 | {
|
| 1945 | - $tc = get_option('theme_compatibility_setting');
|
|
| 1946 | - if (!empty($tc['geodir_main_content_open_replace'])) {
|
|
| 1947 | - $text = $tc['geodir_main_content_open_replace']; |
|
| 1948 | - } else {
|
|
| 1949 | - $text = '<main id="[id]" class="[class]" role="main">'; |
|
| 1950 | - } |
|
| 1945 | + $tc = get_option('theme_compatibility_setting');
|
|
| 1946 | + if (!empty($tc['geodir_main_content_open_replace'])) {
|
|
| 1947 | + $text = $tc['geodir_main_content_open_replace']; |
|
| 1948 | + } else {
|
|
| 1949 | + $text = '<main id="[id]" class="[class]" role="main">'; |
|
| 1950 | + } |
|
| 1951 | 1951 | |
| 1952 | - if (!empty($tc['geodir_main_content_open_id'])) {
|
|
| 1953 | - $id = $tc['geodir_main_content_open_id']; |
|
| 1954 | - } |
|
| 1955 | - if (!empty($tc['geodir_main_content_open_class'])) {
|
|
| 1956 | - $class = $tc['geodir_main_content_open_class']; |
|
| 1957 | - } |
|
| 1952 | + if (!empty($tc['geodir_main_content_open_id'])) {
|
|
| 1953 | + $id = $tc['geodir_main_content_open_id']; |
|
| 1954 | + } |
|
| 1955 | + if (!empty($tc['geodir_main_content_open_class'])) {
|
|
| 1956 | + $class = $tc['geodir_main_content_open_class']; |
|
| 1957 | + } |
|
| 1958 | 1958 | |
| 1959 | - $text = str_replace(array("[id]", "[class]"), array($id, $class), $text);
|
|
| 1959 | + $text = str_replace(array("[id]", "[class]"), array($id, $class), $text);
|
|
| 1960 | 1960 | |
| 1961 | - echo $text; |
|
| 1961 | + echo $text; |
|
| 1962 | 1962 | } |
| 1963 | 1963 | |
| 1964 | 1964 | // action for adding the primary div closing tag |
@@ -1971,13 +1971,13 @@ discard block |
||
| 1971 | 1971 | */ |
| 1972 | 1972 | function geodir_action_main_content_close() |
| 1973 | 1973 | {
|
| 1974 | - $tc = get_option('theme_compatibility_setting');
|
|
| 1975 | - if (!empty($tc['geodir_main_content_close_replace'])) {
|
|
| 1976 | - $text = $tc['geodir_main_content_close_replace']; |
|
| 1977 | - } else {
|
|
| 1978 | - $text = '</main><!-- main ends here-->'; |
|
| 1979 | - } |
|
| 1980 | - echo $text; |
|
| 1974 | + $tc = get_option('theme_compatibility_setting');
|
|
| 1975 | + if (!empty($tc['geodir_main_content_close_replace'])) {
|
|
| 1976 | + $text = $tc['geodir_main_content_close_replace']; |
|
| 1977 | + } else {
|
|
| 1978 | + $text = '</main><!-- main ends here-->'; |
|
| 1979 | + } |
|
| 1980 | + echo $text; |
|
| 1981 | 1981 | } |
| 1982 | 1982 | |
| 1983 | 1983 | /** |
@@ -1989,14 +1989,14 @@ discard block |
||
| 1989 | 1989 | */ |
| 1990 | 1990 | function geodir_action_listings_content_inside() |
| 1991 | 1991 | {
|
| 1992 | - global $gridview_columns; |
|
| 1993 | - $listing_view = get_option('geodir_listing_view');
|
|
| 1994 | - if (strstr($listing_view, 'gridview')) {
|
|
| 1995 | - $gridview_columns = $listing_view; |
|
| 1996 | - $listing_view_exp = explode('_', $listing_view);
|
|
| 1997 | - $listing_view = $listing_view_exp[0]; |
|
| 1998 | - } |
|
| 1999 | - geodir_get_template_part('listing', 'listview');
|
|
| 1992 | + global $gridview_columns; |
|
| 1993 | + $listing_view = get_option('geodir_listing_view');
|
|
| 1994 | + if (strstr($listing_view, 'gridview')) {
|
|
| 1995 | + $gridview_columns = $listing_view; |
|
| 1996 | + $listing_view_exp = explode('_', $listing_view);
|
|
| 1997 | + $listing_view = $listing_view_exp[0]; |
|
| 1998 | + } |
|
| 1999 | + geodir_get_template_part('listing', 'listview');
|
|
| 2000 | 2000 | } |
| 2001 | 2001 | |
| 2002 | 2002 | add_action('geodir_listings_content_inside', 'geodir_action_listings_content_inside', 10);
|
@@ -2012,47 +2012,47 @@ discard block |
||
| 2012 | 2012 | */ |
| 2013 | 2013 | function geodir_action_listings_content() |
| 2014 | 2014 | {
|
| 2015 | - /** |
|
| 2016 | - * This is used to add HTML opening wrappers to the main content of most pages including listings, author, search, home etc. |
|
| 2017 | - * |
|
| 2018 | - * @since 1.0.0 |
|
| 2019 | - * @param string $type The page type. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 2020 | - * @param string $id The id for the div. Usually 'geodir-main-content'. |
|
| 2021 | - * @param string $class The class for the div. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 2022 | - * @see 'geodir_main_content_close' Where the oposing closing tag is added. |
|
| 2023 | - */ |
|
| 2024 | - do_action('geodir_main_content_open', 'listings-page', 'geodir-main-content', 'listings-page');
|
|
| 2025 | - $extra_class = apply_filters('geodir_before_listing_wrapper_extra_class', '', 'listings-page');
|
|
| 2026 | - echo '<div class="clearfix '.$extra_class.'">'; |
|
| 2027 | - /** |
|
| 2028 | - * Called before the listings page content, inside the outer wrapper. Used on listings pages and search and author pages. |
|
| 2029 | - * |
|
| 2030 | - * @since 1.0.0 |
|
| 2031 | - */ |
|
| 2032 | - do_action('geodir_before_listing');
|
|
| 2033 | - echo '</div>'; |
|
| 2034 | - |
|
| 2035 | - /** |
|
| 2036 | - * This actions calls the listings list content. Used on listings pages and search and author pages. |
|
| 2037 | - * |
|
| 2038 | - * @since 1.0.0 |
|
| 2039 | - */ |
|
| 2040 | - do_action('geodir_listings_content_inside');
|
|
| 2041 | - |
|
| 2042 | - /** |
|
| 2043 | - * Called after the listings content, inside the outer wrapper HTML. Used on listings pages and search and author pages. |
|
| 2044 | - * |
|
| 2045 | - * @since 1.0.0 |
|
| 2046 | - */ |
|
| 2047 | - do_action('geodir_after_listing');
|
|
| 2048 | - |
|
| 2049 | - /** |
|
| 2050 | - * This is used to add HTML closing wrappers to the main content of most pages including listings, author, search, home etc. |
|
| 2051 | - * |
|
| 2052 | - * @since 1.0.0 |
|
| 2053 | - * @see 'geodir_main_content_open' Where the oposing opening tag is added. |
|
| 2054 | - */ |
|
| 2055 | - do_action('geodir_main_content_close', 'listings-page');
|
|
| 2015 | + /** |
|
| 2016 | + * This is used to add HTML opening wrappers to the main content of most pages including listings, author, search, home etc. |
|
| 2017 | + * |
|
| 2018 | + * @since 1.0.0 |
|
| 2019 | + * @param string $type The page type. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 2020 | + * @param string $id The id for the div. Usually 'geodir-main-content'. |
|
| 2021 | + * @param string $class The class for the div. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 2022 | + * @see 'geodir_main_content_close' Where the oposing closing tag is added. |
|
| 2023 | + */ |
|
| 2024 | + do_action('geodir_main_content_open', 'listings-page', 'geodir-main-content', 'listings-page');
|
|
| 2025 | + $extra_class = apply_filters('geodir_before_listing_wrapper_extra_class', '', 'listings-page');
|
|
| 2026 | + echo '<div class="clearfix '.$extra_class.'">'; |
|
| 2027 | + /** |
|
| 2028 | + * Called before the listings page content, inside the outer wrapper. Used on listings pages and search and author pages. |
|
| 2029 | + * |
|
| 2030 | + * @since 1.0.0 |
|
| 2031 | + */ |
|
| 2032 | + do_action('geodir_before_listing');
|
|
| 2033 | + echo '</div>'; |
|
| 2034 | + |
|
| 2035 | + /** |
|
| 2036 | + * This actions calls the listings list content. Used on listings pages and search and author pages. |
|
| 2037 | + * |
|
| 2038 | + * @since 1.0.0 |
|
| 2039 | + */ |
|
| 2040 | + do_action('geodir_listings_content_inside');
|
|
| 2041 | + |
|
| 2042 | + /** |
|
| 2043 | + * Called after the listings content, inside the outer wrapper HTML. Used on listings pages and search and author pages. |
|
| 2044 | + * |
|
| 2045 | + * @since 1.0.0 |
|
| 2046 | + */ |
|
| 2047 | + do_action('geodir_after_listing');
|
|
| 2048 | + |
|
| 2049 | + /** |
|
| 2050 | + * This is used to add HTML closing wrappers to the main content of most pages including listings, author, search, home etc. |
|
| 2051 | + * |
|
| 2052 | + * @since 1.0.0 |
|
| 2053 | + * @see 'geodir_main_content_open' Where the oposing opening tag is added. |
|
| 2054 | + */ |
|
| 2055 | + do_action('geodir_main_content_close', 'listings-page');
|
|
| 2056 | 2056 | } |
| 2057 | 2057 | |
| 2058 | 2058 | |
@@ -2067,10 +2067,10 @@ discard block |
||
| 2067 | 2067 | */ |
| 2068 | 2068 | function geodir_action_sidebar_listings_bottom_section() |
| 2069 | 2069 | {
|
| 2070 | - if (get_option('geodir_show_listing_bottom_section')) { ?>
|
|
| 2070 | + if (get_option('geodir_show_listing_bottom_section')) { ?>
|
|
| 2071 | 2071 | <div class="<?php |
| 2072 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2073 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_bottom'); ?>">
|
|
| 2072 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2073 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_bottom'); ?>">
|
|
| 2074 | 2074 | <?php dynamic_sidebar('geodir_listing_bottom'); ?>
|
| 2075 | 2075 | </div><!-- clearfix ends here--> |
| 2076 | 2076 | <?php } |
@@ -2090,38 +2090,38 @@ discard block |
||
| 2090 | 2090 | */ |
| 2091 | 2091 | function geodir_action_add_listing_page_title() |
| 2092 | 2092 | {
|
| 2093 | - if (isset($_REQUEST['listing_type']) && $_REQUEST['listing_type'] != '') |
|
| 2094 | - $listing_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2095 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2096 | - $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 2097 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2098 | - $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 2099 | - |
|
| 2100 | - $title = apply_filters('geodir_add_listing_page_title_text', get_the_title());
|
|
| 2101 | - |
|
| 2102 | - if(geodir_is_page('add-listing')){
|
|
| 2103 | - $gd_page = 'add-listing'; |
|
| 2104 | - if(isset($_REQUEST['pid']) && $_REQUEST['pid'] != ''){
|
|
| 2105 | - $title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;
|
|
| 2106 | - }elseif(isset($listing_type)){
|
|
| 2107 | - $title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;
|
|
| 2108 | - } |
|
| 2093 | + if (isset($_REQUEST['listing_type']) && $_REQUEST['listing_type'] != '') |
|
| 2094 | + $listing_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2095 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2096 | + $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 2097 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2098 | + $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 2099 | + |
|
| 2100 | + $title = apply_filters('geodir_add_listing_page_title_text', get_the_title());
|
|
| 2101 | + |
|
| 2102 | + if(geodir_is_page('add-listing')){
|
|
| 2103 | + $gd_page = 'add-listing'; |
|
| 2104 | + if(isset($_REQUEST['pid']) && $_REQUEST['pid'] != ''){
|
|
| 2105 | + $title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;
|
|
| 2106 | + }elseif(isset($listing_type)){
|
|
| 2107 | + $title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;
|
|
| 2108 | + } |
|
| 2109 | 2109 | |
| 2110 | - } |
|
| 2110 | + } |
|
| 2111 | 2111 | |
| 2112 | 2112 | |
| 2113 | - /** |
|
| 2114 | - * Filter page title to replace variables. |
|
| 2115 | - * |
|
| 2116 | - * @since 1.5.4 |
|
| 2117 | - * @param string $title The page title including variables. |
|
| 2118 | - * @param string $gd_page The GeoDirectory page type if any. |
|
| 2119 | - */ |
|
| 2120 | - $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 2113 | + /** |
|
| 2114 | + * Filter page title to replace variables. |
|
| 2115 | + * |
|
| 2116 | + * @since 1.5.4 |
|
| 2117 | + * @param string $title The page title including variables. |
|
| 2118 | + * @param string $gd_page The GeoDirectory page type if any. |
|
| 2119 | + */ |
|
| 2120 | + $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 2121 | 2121 | |
| 2122 | - echo '<header class="' . $class_header . '"><h1 class="' . $class . '">'; |
|
| 2123 | - echo $title; |
|
| 2124 | - echo '</h1></header>'; |
|
| 2122 | + echo '<header class="' . $class_header . '"><h1 class="' . $class . '">'; |
|
| 2123 | + echo $title; |
|
| 2124 | + echo '</h1></header>'; |
|
| 2125 | 2125 | } |
| 2126 | 2126 | |
| 2127 | 2127 | add_action('geodir_add_listing_page_mandatory', 'geodir_action_add_listing_page_mandatory', 10);
|
@@ -2152,61 +2152,61 @@ discard block |
||
| 2152 | 2152 | */ |
| 2153 | 2153 | function geodir_action_add_listing_form() |
| 2154 | 2154 | {
|
| 2155 | - global $cat_display, $post_cat, $current_user, $gd_session; |
|
| 2156 | - $page_id = get_the_ID(); |
|
| 2157 | - $post = ''; |
|
| 2158 | - $title = ''; |
|
| 2159 | - $desc = ''; |
|
| 2160 | - $kw_tags = ''; |
|
| 2161 | - $required_msg = ''; |
|
| 2162 | - $submit_button = ''; |
|
| 2163 | - |
|
| 2164 | - $ajax_action = isset($_REQUEST['ajax_action']) ? $_REQUEST['ajax_action'] : 'add'; |
|
| 2165 | - |
|
| 2166 | - $thumb_img_arr = array(); |
|
| 2167 | - $curImages = ''; |
|
| 2168 | - |
|
| 2169 | - if (isset($_REQUEST['backandedit'])) {
|
|
| 2170 | - global $post; |
|
| 2171 | - $post = (object)$gd_session->get('listing');
|
|
| 2172 | - $listing_type = $post->listing_type; |
|
| 2173 | - $title = $post->post_title; |
|
| 2174 | - $desc = $post->post_desc; |
|
| 2175 | - $post_cat = isset($post->post_category) ? $post->post_category : ''; |
|
| 2176 | - |
|
| 2177 | - $kw_tags = $post->post_tags; |
|
| 2178 | - $curImages = isset($post->post_images) ? $post->post_images : ''; |
|
| 2179 | - } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 2180 | - global $post, $post_images; |
|
| 2181 | - |
|
| 2182 | - $post = geodir_get_post_info($_REQUEST['pid']); |
|
| 2183 | - $thumb_img_arr = geodir_get_images($post->ID); |
|
| 2184 | - if ($thumb_img_arr) {
|
|
| 2185 | - foreach ($thumb_img_arr as $post_img) {
|
|
| 2186 | - $curImages .= $post_img->src . ','; |
|
| 2187 | - } |
|
| 2188 | - } |
|
| 2155 | + global $cat_display, $post_cat, $current_user, $gd_session; |
|
| 2156 | + $page_id = get_the_ID(); |
|
| 2157 | + $post = ''; |
|
| 2158 | + $title = ''; |
|
| 2159 | + $desc = ''; |
|
| 2160 | + $kw_tags = ''; |
|
| 2161 | + $required_msg = ''; |
|
| 2162 | + $submit_button = ''; |
|
| 2163 | + |
|
| 2164 | + $ajax_action = isset($_REQUEST['ajax_action']) ? $_REQUEST['ajax_action'] : 'add'; |
|
| 2165 | + |
|
| 2166 | + $thumb_img_arr = array(); |
|
| 2167 | + $curImages = ''; |
|
| 2168 | + |
|
| 2169 | + if (isset($_REQUEST['backandedit'])) {
|
|
| 2170 | + global $post; |
|
| 2171 | + $post = (object)$gd_session->get('listing');
|
|
| 2172 | + $listing_type = $post->listing_type; |
|
| 2173 | + $title = $post->post_title; |
|
| 2174 | + $desc = $post->post_desc; |
|
| 2175 | + $post_cat = isset($post->post_category) ? $post->post_category : ''; |
|
| 2176 | + |
|
| 2177 | + $kw_tags = $post->post_tags; |
|
| 2178 | + $curImages = isset($post->post_images) ? $post->post_images : ''; |
|
| 2179 | + } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 2180 | + global $post, $post_images; |
|
| 2181 | + |
|
| 2182 | + $post = geodir_get_post_info($_REQUEST['pid']); |
|
| 2183 | + $thumb_img_arr = geodir_get_images($post->ID); |
|
| 2184 | + if ($thumb_img_arr) {
|
|
| 2185 | + foreach ($thumb_img_arr as $post_img) {
|
|
| 2186 | + $curImages .= $post_img->src . ','; |
|
| 2187 | + } |
|
| 2188 | + } |
|
| 2189 | 2189 | |
| 2190 | - $listing_type = $post->post_type; |
|
| 2191 | - $title = $post->post_title; |
|
| 2192 | - $desc = $post->post_content; |
|
| 2193 | - $kw_tags = $post->post_tags; |
|
| 2194 | - $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));
|
|
| 2195 | - } else {
|
|
| 2196 | - $listing_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2197 | - } |
|
| 2190 | + $listing_type = $post->post_type; |
|
| 2191 | + $title = $post->post_title; |
|
| 2192 | + $desc = $post->post_content; |
|
| 2193 | + $kw_tags = $post->post_tags; |
|
| 2194 | + $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));
|
|
| 2195 | + } else {
|
|
| 2196 | + $listing_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2197 | + } |
|
| 2198 | 2198 | |
| 2199 | - if ($current_user->ID != '0') {
|
|
| 2200 | - $user_login = true; |
|
| 2201 | - } |
|
| 2199 | + if ($current_user->ID != '0') {
|
|
| 2200 | + $user_login = true; |
|
| 2201 | + } |
|
| 2202 | 2202 | |
| 2203 | - $post_type_info = geodir_get_posttype_info($listing_type); |
|
| 2203 | + $post_type_info = geodir_get_posttype_info($listing_type); |
|
| 2204 | 2204 | |
| 2205 | - $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing','geodirectory');
|
|
| 2205 | + $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing','geodirectory');
|
|
| 2206 | 2206 | |
| 2207 | - $package_info = array(); |
|
| 2208 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 2209 | - ?> |
|
| 2207 | + $package_info = array(); |
|
| 2208 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 2209 | + ?> |
|
| 2210 | 2210 | <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id());?>" method="post" enctype="multipart/form-data"> |
| 2211 | 2211 | <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type);?>"/> |
| 2212 | 2212 | <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type);?>"/> |
@@ -2217,114 +2217,114 @@ discard block |
||
| 2217 | 2217 | <?php } if (isset($_REQUEST['backandedit'])) { ?>
|
| 2218 | 2218 | <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']);?>"/> |
| 2219 | 2219 | <?php |
| 2220 | - } |
|
| 2221 | - /** |
|
| 2222 | - * Called at the very top of the add listing page form for frontend. |
|
| 2223 | - * |
|
| 2224 | - * This is called just before the "Enter Listing Details" text. |
|
| 2225 | - * |
|
| 2226 | - * @since 1.0.0 |
|
| 2227 | - */ |
|
| 2228 | - do_action('geodir_before_detail_fields');
|
|
| 2229 | - ?> |
|
| 2220 | + } |
|
| 2221 | + /** |
|
| 2222 | + * Called at the very top of the add listing page form for frontend. |
|
| 2223 | + * |
|
| 2224 | + * This is called just before the "Enter Listing Details" text. |
|
| 2225 | + * |
|
| 2226 | + * @since 1.0.0 |
|
| 2227 | + */ |
|
| 2228 | + do_action('geodir_before_detail_fields');
|
|
| 2229 | + ?> |
|
| 2230 | 2230 | <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT;?></h5> |
| 2231 | 2231 | <?php |
| 2232 | - /** |
|
| 2233 | - * Called at the top of the add listing page form for frontend. |
|
| 2234 | - * |
|
| 2235 | - * This is called after the "Enter Listing Details" text. |
|
| 2236 | - * |
|
| 2237 | - * @since 1.0.0 |
|
| 2238 | - */ |
|
| 2239 | - do_action('geodir_before_main_form_fields');
|
|
| 2240 | - ?> |
|
| 2232 | + /** |
|
| 2233 | + * Called at the top of the add listing page form for frontend. |
|
| 2234 | + * |
|
| 2235 | + * This is called after the "Enter Listing Details" text. |
|
| 2236 | + * |
|
| 2237 | + * @since 1.0.0 |
|
| 2238 | + */ |
|
| 2239 | + do_action('geodir_before_main_form_fields');
|
|
| 2240 | + ?> |
|
| 2241 | 2241 | <div id="geodir_post_title_row" class="required_field geodir_form_row clearfix gd-fieldset-details"> |
| 2242 | 2242 | <label><?php |
| 2243 | - /** |
|
| 2244 | - * Filter the add listing page title input label. |
|
| 2245 | - * |
|
| 2246 | - * @since 1.6.11 |
|
| 2247 | - * @param string $title The title to be output. |
|
| 2248 | - * @param string $cpt_singular_name The singular title of the curent CPT. |
|
| 2249 | - * @param string $listing_type The CPT being requested. ie: gd_place. |
|
| 2250 | - */ |
|
| 2251 | - echo apply_filters('geodir_add_listing_title_label', sprintf( __('%s Title', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span>*</span> </label>
|
|
| 2243 | + /** |
|
| 2244 | + * Filter the add listing page title input label. |
|
| 2245 | + * |
|
| 2246 | + * @since 1.6.11 |
|
| 2247 | + * @param string $title The title to be output. |
|
| 2248 | + * @param string $cpt_singular_name The singular title of the curent CPT. |
|
| 2249 | + * @param string $listing_type The CPT being requested. ie: gd_place. |
|
| 2250 | + */ |
|
| 2251 | + echo apply_filters('geodir_add_listing_title_label', sprintf( __('%s Title', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span>*</span> </label>
|
|
| 2252 | 2252 | <input type="text" field_type="text" name="post_title" id="post_title" class="geodir_textfield" |
| 2253 | 2253 | value="<?php echo esc_attr(stripslashes($title)); ?>"/> |
| 2254 | 2254 | <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory');?></span> |
| 2255 | 2255 | </div> |
| 2256 | 2256 | <?php |
| 2257 | - $show_editor = get_option('geodir_tiny_editor_on_add_listing');
|
|
| 2258 | - $show_editor = !empty($show_editor) && in_array($listing_type, $show_editor) ? true : false; |
|
| 2259 | - /** |
|
| 2260 | - * Filter whether to show or don't show the editor. |
|
| 2261 | - * |
|
| 2262 | - * @since 1.6.16 |
|
| 2263 | - * @param bool $show_editor If true the editor will be available for description field. |
|
| 2264 | - * @param object $package_info The listing package. |
|
| 2265 | - * @param string $listing_type The current post type. |
|
| 2266 | - * @param object $post The current post object. |
|
| 2267 | - */ |
|
| 2268 | - $show_editor = apply_filters('geodir_description_field_show_editor', $show_editor, $package_info, $listing_type, $post);
|
|
| 2269 | - |
|
| 2270 | - $desc = $show_editor ? stripslashes($desc) : esc_attr(stripslashes($desc)); |
|
| 2271 | - $desc_limit = ''; |
|
| 2272 | - /** |
|
| 2273 | - * Filter the add listing description field character limit number. |
|
| 2274 | - * |
|
| 2275 | - * @since 1.0.0 |
|
| 2276 | - * @param int $desc_limit The amount of characters to limit the description to. |
|
| 2277 | - */ |
|
| 2278 | - $desc_limit = apply_filters('geodir_description_field_desc_limit', $desc_limit);
|
|
| 2279 | - /** |
|
| 2280 | - * Filter the add listing description field text. |
|
| 2281 | - * |
|
| 2282 | - * @since 1.0.0 |
|
| 2283 | - * @param string $desc The text for the description field. |
|
| 2284 | - * @param int $desc_limit The character limit number if any. |
|
| 2285 | - */ |
|
| 2286 | - $desc = apply_filters('geodir_description_field_desc', $desc, $desc_limit);
|
|
| 2287 | - $desc_limit_msg = ''; |
|
| 2288 | - /** |
|
| 2289 | - * Filter the add listing description limit message. |
|
| 2290 | - * |
|
| 2291 | - * This is the message shown if there is a limit applied to the amount of characters the description can use. |
|
| 2292 | - * |
|
| 2293 | - * @since 1.0.0 |
|
| 2294 | - * @param string $desc_limit_msg The limit message string if any. |
|
| 2295 | - * @param int $desc_limit The character limit numer if any. |
|
| 2296 | - */ |
|
| 2297 | - $desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);
|
|
| 2257 | + $show_editor = get_option('geodir_tiny_editor_on_add_listing');
|
|
| 2258 | + $show_editor = !empty($show_editor) && in_array($listing_type, $show_editor) ? true : false; |
|
| 2259 | + /** |
|
| 2260 | + * Filter whether to show or don't show the editor. |
|
| 2261 | + * |
|
| 2262 | + * @since 1.6.16 |
|
| 2263 | + * @param bool $show_editor If true the editor will be available for description field. |
|
| 2264 | + * @param object $package_info The listing package. |
|
| 2265 | + * @param string $listing_type The current post type. |
|
| 2266 | + * @param object $post The current post object. |
|
| 2267 | + */ |
|
| 2268 | + $show_editor = apply_filters('geodir_description_field_show_editor', $show_editor, $package_info, $listing_type, $post);
|
|
| 2269 | + |
|
| 2270 | + $desc = $show_editor ? stripslashes($desc) : esc_attr(stripslashes($desc)); |
|
| 2271 | + $desc_limit = ''; |
|
| 2272 | + /** |
|
| 2273 | + * Filter the add listing description field character limit number. |
|
| 2274 | + * |
|
| 2275 | + * @since 1.0.0 |
|
| 2276 | + * @param int $desc_limit The amount of characters to limit the description to. |
|
| 2277 | + */ |
|
| 2278 | + $desc_limit = apply_filters('geodir_description_field_desc_limit', $desc_limit);
|
|
| 2279 | + /** |
|
| 2280 | + * Filter the add listing description field text. |
|
| 2281 | + * |
|
| 2282 | + * @since 1.0.0 |
|
| 2283 | + * @param string $desc The text for the description field. |
|
| 2284 | + * @param int $desc_limit The character limit number if any. |
|
| 2285 | + */ |
|
| 2286 | + $desc = apply_filters('geodir_description_field_desc', $desc, $desc_limit);
|
|
| 2287 | + $desc_limit_msg = ''; |
|
| 2288 | + /** |
|
| 2289 | + * Filter the add listing description limit message. |
|
| 2290 | + * |
|
| 2291 | + * This is the message shown if there is a limit applied to the amount of characters the description can use. |
|
| 2292 | + * |
|
| 2293 | + * @since 1.0.0 |
|
| 2294 | + * @param string $desc_limit_msg The limit message string if any. |
|
| 2295 | + * @param int $desc_limit The character limit numer if any. |
|
| 2296 | + */ |
|
| 2297 | + $desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);
|
|
| 2298 | 2298 | |
| 2299 | - $desc_class = ''; |
|
| 2300 | - if ($desc_limit === '' || (int)$desc_limit > 0) {
|
|
| 2301 | - /** |
|
| 2302 | - * Called on the add listing page form for frontend just before the description field. |
|
| 2303 | - * |
|
| 2304 | - * @since 1.0.0 |
|
| 2305 | - */ |
|
| 2306 | - do_action('geodir_before_description_field');
|
|
| 2299 | + $desc_class = ''; |
|
| 2300 | + if ($desc_limit === '' || (int)$desc_limit > 0) {
|
|
| 2301 | + /** |
|
| 2302 | + * Called on the add listing page form for frontend just before the description field. |
|
| 2303 | + * |
|
| 2304 | + * @since 1.0.0 |
|
| 2305 | + */ |
|
| 2306 | + do_action('geodir_before_description_field');
|
|
| 2307 | 2307 | |
| 2308 | - $desc_class = ' required_field'; |
|
| 2309 | - } else {
|
|
| 2310 | - $desc_class = ' hidden'; |
|
| 2311 | - } |
|
| 2312 | - ?> |
|
| 2308 | + $desc_class = ' required_field'; |
|
| 2309 | + } else {
|
|
| 2310 | + $desc_class = ' hidden'; |
|
| 2311 | + } |
|
| 2312 | + ?> |
|
| 2313 | 2313 | <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class;?>"> |
| 2314 | 2314 | <label><?php |
| 2315 | - /** |
|
| 2316 | - * Filter the add listing page description input label. |
|
| 2317 | - * |
|
| 2318 | - * @since 1.6.11 |
|
| 2319 | - * @param string $title The title to be output. |
|
| 2320 | - * @param string $cpt_singular_name The singular title of the curent CPT. |
|
| 2321 | - * @param string $listing_type The CPT being requested. ie: gd_place. |
|
| 2322 | - */ |
|
| 2323 | - echo apply_filters('geodir_add_listing_description_label',sprintf( __('%s Description', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>
|
|
| 2315 | + /** |
|
| 2316 | + * Filter the add listing page description input label. |
|
| 2317 | + * |
|
| 2318 | + * @since 1.6.11 |
|
| 2319 | + * @param string $title The title to be output. |
|
| 2320 | + * @param string $cpt_singular_name The singular title of the curent CPT. |
|
| 2321 | + * @param string $listing_type The CPT being requested. ie: gd_place. |
|
| 2322 | + */ |
|
| 2323 | + echo apply_filters('geodir_add_listing_description_label',sprintf( __('%s Description', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>
|
|
| 2324 | 2324 | <?php |
| 2325 | - if ($show_editor) {
|
|
| 2326 | - $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
|
|
| 2327 | - ?> |
|
| 2325 | + if ($show_editor) {
|
|
| 2326 | + $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
|
|
| 2327 | + ?> |
|
| 2328 | 2328 | <div class="editor" field_id="post_desc" field_type="editor"> |
| 2329 | 2329 | <?php wp_editor($desc, "post_desc", $editor_settings); ?> |
| 2330 | 2330 | </div> |
@@ -2338,56 +2338,56 @@ discard block |
||
| 2338 | 2338 | <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory');?></span> |
| 2339 | 2339 | </div> |
| 2340 | 2340 | <?php |
| 2341 | - if ($desc_limit === '' || (int)$desc_limit > 0) {
|
|
| 2342 | - /** |
|
| 2343 | - * Called on the add listing page form for frontend just after the description field. |
|
| 2344 | - * |
|
| 2345 | - * @since 1.0.0 |
|
| 2346 | - */ |
|
| 2347 | - do_action('geodir_after_description_field');
|
|
| 2348 | - } |
|
| 2341 | + if ($desc_limit === '' || (int)$desc_limit > 0) {
|
|
| 2342 | + /** |
|
| 2343 | + * Called on the add listing page form for frontend just after the description field. |
|
| 2344 | + * |
|
| 2345 | + * @since 1.0.0 |
|
| 2346 | + */ |
|
| 2347 | + do_action('geodir_after_description_field');
|
|
| 2348 | + } |
|
| 2349 | 2349 | |
| 2350 | - $kw_tags = esc_attr(stripslashes($kw_tags)); |
|
| 2351 | - $kw_tags_count = TAGKW_TEXT_COUNT; |
|
| 2352 | - $kw_tags_msg = TAGKW_MSG; |
|
| 2353 | - /** |
|
| 2354 | - * Filter the add listing tags character limit. |
|
| 2355 | - * |
|
| 2356 | - * @since 1.0.0 |
|
| 2357 | - * @param int $kw_tags_count The character count limit if any. |
|
| 2358 | - */ |
|
| 2359 | - $kw_tags_count = apply_filters('geodir_listing_tags_field_tags_count', $kw_tags_count);
|
|
| 2360 | - /** |
|
| 2361 | - * Filter the add listing tags field value. |
|
| 2362 | - * |
|
| 2363 | - * You can use the $_REQUEST values to check if this is a go back and edit value etc. |
|
| 2364 | - * |
|
| 2365 | - * @since 1.0.0 |
|
| 2366 | - * @param string $kw_tags The tag field value, usually a comma separated list of tags. |
|
| 2367 | - * @param int $kw_tags_count The character count limit if any. |
|
| 2368 | - */ |
|
| 2369 | - $kw_tags = apply_filters('geodir_listing_tags_field_tags', $kw_tags, $kw_tags_count);
|
|
| 2370 | - /** |
|
| 2371 | - * Filter the add listing tags field message text. |
|
| 2372 | - * |
|
| 2373 | - * @since 1.0.0 |
|
| 2374 | - * @param string $kw_tags_msg The message shown under the field. |
|
| 2375 | - * @param int $kw_tags_count The character count limit if any. |
|
| 2376 | - */ |
|
| 2377 | - $kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);
|
|
| 2350 | + $kw_tags = esc_attr(stripslashes($kw_tags)); |
|
| 2351 | + $kw_tags_count = TAGKW_TEXT_COUNT; |
|
| 2352 | + $kw_tags_msg = TAGKW_MSG; |
|
| 2353 | + /** |
|
| 2354 | + * Filter the add listing tags character limit. |
|
| 2355 | + * |
|
| 2356 | + * @since 1.0.0 |
|
| 2357 | + * @param int $kw_tags_count The character count limit if any. |
|
| 2358 | + */ |
|
| 2359 | + $kw_tags_count = apply_filters('geodir_listing_tags_field_tags_count', $kw_tags_count);
|
|
| 2360 | + /** |
|
| 2361 | + * Filter the add listing tags field value. |
|
| 2362 | + * |
|
| 2363 | + * You can use the $_REQUEST values to check if this is a go back and edit value etc. |
|
| 2364 | + * |
|
| 2365 | + * @since 1.0.0 |
|
| 2366 | + * @param string $kw_tags The tag field value, usually a comma separated list of tags. |
|
| 2367 | + * @param int $kw_tags_count The character count limit if any. |
|
| 2368 | + */ |
|
| 2369 | + $kw_tags = apply_filters('geodir_listing_tags_field_tags', $kw_tags, $kw_tags_count);
|
|
| 2370 | + /** |
|
| 2371 | + * Filter the add listing tags field message text. |
|
| 2372 | + * |
|
| 2373 | + * @since 1.0.0 |
|
| 2374 | + * @param string $kw_tags_msg The message shown under the field. |
|
| 2375 | + * @param int $kw_tags_count The character count limit if any. |
|
| 2376 | + */ |
|
| 2377 | + $kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);
|
|
| 2378 | 2378 | |
| 2379 | - $tags_class = ''; |
|
| 2380 | - if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {
|
|
| 2381 | - /** |
|
| 2382 | - * Called on the add listing page form for frontend just before the tags field. |
|
| 2383 | - * |
|
| 2384 | - * @since 1.0.0 |
|
| 2385 | - */ |
|
| 2386 | - do_action('geodir_before_listing_tags_field');
|
|
| 2387 | - } else {
|
|
| 2388 | - $tags_class = ' hidden'; |
|
| 2389 | - } |
|
| 2390 | - ?> |
|
| 2379 | + $tags_class = ''; |
|
| 2380 | + if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {
|
|
| 2381 | + /** |
|
| 2382 | + * Called on the add listing page form for frontend just before the tags field. |
|
| 2383 | + * |
|
| 2384 | + * @since 1.0.0 |
|
| 2385 | + */ |
|
| 2386 | + do_action('geodir_before_listing_tags_field');
|
|
| 2387 | + } else {
|
|
| 2388 | + $tags_class = ' hidden'; |
|
| 2389 | + } |
|
| 2390 | + ?> |
|
| 2391 | 2391 | <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class;?>"> |
| 2392 | 2392 | <label><?php echo TAGKW_TEXT; ?></label> |
| 2393 | 2393 | <input name="post_tags" id="post_tags" value="<?php echo $kw_tags; ?>" type="text" class="geodir_textfield" |
@@ -2395,90 +2395,90 @@ discard block |
||
| 2395 | 2395 | <span class="geodir_message_note"><?php echo $kw_tags_msg;?></span> |
| 2396 | 2396 | </div> |
| 2397 | 2397 | <?php |
| 2398 | - if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {
|
|
| 2399 | - /** |
|
| 2400 | - * Called on the add listing page form for frontend just after the tags field. |
|
| 2401 | - * |
|
| 2402 | - * @since 1.0.0 |
|
| 2403 | - */ |
|
| 2404 | - do_action('geodir_after_listing_tags_field');
|
|
| 2405 | - } |
|
| 2398 | + if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {
|
|
| 2399 | + /** |
|
| 2400 | + * Called on the add listing page form for frontend just after the tags field. |
|
| 2401 | + * |
|
| 2402 | + * @since 1.0.0 |
|
| 2403 | + */ |
|
| 2404 | + do_action('geodir_after_listing_tags_field');
|
|
| 2405 | + } |
|
| 2406 | 2406 | |
| 2407 | - $package_info = array(); |
|
| 2408 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 2407 | + $package_info = array(); |
|
| 2408 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 2409 | 2409 | |
| 2410 | - geodir_get_custom_fields_html($package_info->pid, 'all', $listing_type); |
|
| 2410 | + geodir_get_custom_fields_html($package_info->pid, 'all', $listing_type); |
|
| 2411 | 2411 | |
| 2412 | - // adjust values here |
|
| 2413 | - $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls |
|
| 2412 | + // adjust values here |
|
| 2413 | + $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls |
|
| 2414 | 2414 | |
| 2415 | - $multiple = true; // allow multiple files upload |
|
| 2415 | + $multiple = true; // allow multiple files upload |
|
| 2416 | 2416 | |
| 2417 | - $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels) |
|
| 2417 | + $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels) |
|
| 2418 | 2418 | |
| 2419 | - $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels) |
|
| 2419 | + $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels) |
|
| 2420 | 2420 | |
| 2421 | - $thumb_img_arr = array(); |
|
| 2422 | - $totImg = 0; |
|
| 2423 | - if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {
|
|
| 2424 | - $post = (object)$gd_session->get('listing');
|
|
| 2425 | - if (isset($post->post_images)) |
|
| 2426 | - $curImages = trim($post->post_images, ","); |
|
| 2421 | + $thumb_img_arr = array(); |
|
| 2422 | + $totImg = 0; |
|
| 2423 | + if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {
|
|
| 2424 | + $post = (object)$gd_session->get('listing');
|
|
| 2425 | + if (isset($post->post_images)) |
|
| 2426 | + $curImages = trim($post->post_images, ","); |
|
| 2427 | 2427 | |
| 2428 | 2428 | |
| 2429 | - if ($curImages != '') {
|
|
| 2430 | - $curImages_array = explode(',', $curImages);
|
|
| 2431 | - $totImg = count($curImages_array); |
|
| 2432 | - } |
|
| 2429 | + if ($curImages != '') {
|
|
| 2430 | + $curImages_array = explode(',', $curImages);
|
|
| 2431 | + $totImg = count($curImages_array); |
|
| 2432 | + } |
|
| 2433 | 2433 | |
| 2434 | - $listing_type = $post->listing_type; |
|
| 2434 | + $listing_type = $post->listing_type; |
|
| 2435 | 2435 | |
| 2436 | - } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 2437 | - $post = geodir_get_post_info((int)$_REQUEST['pid']); |
|
| 2438 | - $listing_type = $post->post_type; |
|
| 2439 | - $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
| 2436 | + } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 2437 | + $post = geodir_get_post_info((int)$_REQUEST['pid']); |
|
| 2438 | + $listing_type = $post->post_type; |
|
| 2439 | + $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
| 2440 | 2440 | |
| 2441 | - } else {
|
|
| 2442 | - $listing_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2443 | - } |
|
| 2441 | + } else {
|
|
| 2442 | + $listing_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2443 | + } |
|
| 2444 | 2444 | |
| 2445 | 2445 | |
| 2446 | - if (!empty($thumb_img_arr)) {
|
|
| 2447 | - foreach ($thumb_img_arr as $img) {
|
|
| 2448 | - //$curImages = $img->src.","; |
|
| 2449 | - } |
|
| 2450 | - |
|
| 2451 | - $totImg = count((array)$thumb_img_arr); |
|
| 2452 | - } |
|
| 2446 | + if (!empty($thumb_img_arr)) {
|
|
| 2447 | + foreach ($thumb_img_arr as $img) {
|
|
| 2448 | + //$curImages = $img->src.","; |
|
| 2449 | + } |
|
| 2453 | 2450 | |
| 2454 | - if ($curImages != '') |
|
| 2455 | - $svalue = $curImages; // this will be initial value of the above form field. Image urls. |
|
| 2456 | - else |
|
| 2457 | - $svalue = ''; |
|
| 2458 | - |
|
| 2459 | - $image_limit = isset($package_info->image_limit) ? $package_info->image_limit : '0'; |
|
| 2460 | - $show_image_input_box = ($image_limit != '0'); |
|
| 2461 | - /** |
|
| 2462 | - * Filter to be able to show/hide the image upload section of the add listing form. |
|
| 2463 | - * |
|
| 2464 | - * @since 1.0.0 |
|
| 2465 | - * @param bool $show_image_input_box Set true to show. Set false to not show. |
|
| 2466 | - * @param string $listing_type The custom post type slug. |
|
| 2467 | - */ |
|
| 2468 | - $show_image_input_box = apply_filters('geodir_image_uploader_on_add_listing', $show_image_input_box, $listing_type);
|
|
| 2469 | - if ($show_image_input_box) {
|
|
| 2470 | - ?> |
|
| 2451 | + $totImg = count((array)$thumb_img_arr); |
|
| 2452 | + } |
|
| 2453 | + |
|
| 2454 | + if ($curImages != '') |
|
| 2455 | + $svalue = $curImages; // this will be initial value of the above form field. Image urls. |
|
| 2456 | + else |
|
| 2457 | + $svalue = ''; |
|
| 2458 | + |
|
| 2459 | + $image_limit = isset($package_info->image_limit) ? $package_info->image_limit : '0'; |
|
| 2460 | + $show_image_input_box = ($image_limit != '0'); |
|
| 2461 | + /** |
|
| 2462 | + * Filter to be able to show/hide the image upload section of the add listing form. |
|
| 2463 | + * |
|
| 2464 | + * @since 1.0.0 |
|
| 2465 | + * @param bool $show_image_input_box Set true to show. Set false to not show. |
|
| 2466 | + * @param string $listing_type The custom post type slug. |
|
| 2467 | + */ |
|
| 2468 | + $show_image_input_box = apply_filters('geodir_image_uploader_on_add_listing', $show_image_input_box, $listing_type);
|
|
| 2469 | + if ($show_image_input_box) {
|
|
| 2470 | + ?> |
|
| 2471 | 2471 | |
| 2472 | 2472 | <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT;?> |
| 2473 | 2473 | <?php if ($image_limit == 1) {
|
| 2474 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 2475 | - } ?> |
|
| 2474 | + echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 2475 | + } ?> |
|
| 2476 | 2476 | <?php if ($image_limit > 1) {
|
| 2477 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 2478 | - } ?> |
|
| 2477 | + echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 2478 | + } ?> |
|
| 2479 | 2479 | <?php if ($image_limit == '') {
|
| 2480 | - echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 2481 | - } ?> |
|
| 2480 | + echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 2481 | + } ?> |
|
| 2482 | 2482 | </h5> |
| 2483 | 2483 | |
| 2484 | 2484 | <div class="geodir_form_row clearfix" id="<?php echo $id; ?>dropbox" |
@@ -2516,12 +2516,12 @@ discard block |
||
| 2516 | 2516 | <?php } ?> |
| 2517 | 2517 | |
| 2518 | 2518 | <?php |
| 2519 | - /** |
|
| 2520 | - * Called on the add listing page form for frontend just after the image upload field. |
|
| 2521 | - * |
|
| 2522 | - * @since 1.0.0 |
|
| 2523 | - */ |
|
| 2524 | - do_action('geodir_after_main_form_fields');?>
|
|
| 2519 | + /** |
|
| 2520 | + * Called on the add listing page form for frontend just after the image upload field. |
|
| 2521 | + * |
|
| 2522 | + * @since 1.0.0 |
|
| 2523 | + */ |
|
| 2524 | + do_action('geodir_after_main_form_fields');?>
|
|
| 2525 | 2525 | |
| 2526 | 2526 | |
| 2527 | 2527 | <!-- add captcha code --> |
@@ -2550,7 +2550,7 @@ discard block |
||
| 2550 | 2550 | |
| 2551 | 2551 | </form> |
| 2552 | 2552 | <?php |
| 2553 | - wp_reset_query(); |
|
| 2553 | + wp_reset_query(); |
|
| 2554 | 2554 | } |
| 2555 | 2555 | |
| 2556 | 2556 | /** |
@@ -2561,7 +2561,7 @@ discard block |
||
| 2561 | 2561 | */ |
| 2562 | 2562 | function geodir_add_listing_sidebar_widget_area() |
| 2563 | 2563 | {
|
| 2564 | - dynamic_sidebar('geodir_add_listing_sidebar');
|
|
| 2564 | + dynamic_sidebar('geodir_add_listing_sidebar');
|
|
| 2565 | 2565 | } |
| 2566 | 2566 | |
| 2567 | 2567 | add_action('geodir_add_listing_sidebar_inside', 'geodir_add_listing_sidebar_widget_area', 10);
|
@@ -2576,16 +2576,16 @@ discard block |
||
| 2576 | 2576 | */ |
| 2577 | 2577 | function geodir_action_add_listing_sidebar() |
| 2578 | 2578 | {
|
| 2579 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2580 | - do_action('geodir_sidebar_right_open', 'add-listing-page', 'geodir-sidebar', 'geodir-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 2581 | - /** |
|
| 2582 | - * This is used to add the content to the add listing page sidebar. |
|
| 2583 | - * |
|
| 2584 | - * @since 1.0.0 |
|
| 2585 | - */ |
|
| 2586 | - do_action('geodir_add_listing_sidebar_inside');
|
|
| 2587 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2588 | - do_action('geodir_sidebar_right_close', 'details-page');
|
|
| 2579 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2580 | + do_action('geodir_sidebar_right_open', 'add-listing-page', 'geodir-sidebar', 'geodir-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 2581 | + /** |
|
| 2582 | + * This is used to add the content to the add listing page sidebar. |
|
| 2583 | + * |
|
| 2584 | + * @since 1.0.0 |
|
| 2585 | + */ |
|
| 2586 | + do_action('geodir_add_listing_sidebar_inside');
|
|
| 2587 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2588 | + do_action('geodir_sidebar_right_close', 'details-page');
|
|
| 2589 | 2589 | } |
| 2590 | 2590 | |
| 2591 | 2591 | ############################################### |
@@ -2602,11 +2602,11 @@ discard block |
||
| 2602 | 2602 | */ |
| 2603 | 2603 | function geodir_action_geodir_sidebar_signup_top() |
| 2604 | 2604 | {
|
| 2605 | - ?> |
|
| 2605 | + ?> |
|
| 2606 | 2606 | <div |
| 2607 | 2607 | class="<?php |
| 2608 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2609 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">
|
|
| 2608 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2609 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">
|
|
| 2610 | 2610 | <?php dynamic_sidebar('Reg/Login Top Section');?>
|
| 2611 | 2611 | </div><!-- clearfix ends here--> |
| 2612 | 2612 | <?php |
@@ -2625,11 +2625,11 @@ discard block |
||
| 2625 | 2625 | function geodir_action_signup_forms() |
| 2626 | 2626 | {
|
| 2627 | 2627 | |
| 2628 | - global $user_login; |
|
| 2628 | + global $user_login; |
|
| 2629 | 2629 | |
| 2630 | - $is_enable_signup = get_option( 'users_can_register' ); |
|
| 2630 | + $is_enable_signup = get_option( 'users_can_register' ); |
|
| 2631 | 2631 | |
| 2632 | - ?> |
|
| 2632 | + ?> |
|
| 2633 | 2633 | <script type="text/javascript"> |
| 2634 | 2634 | <?php if ( $user_login ) { ?>
|
| 2635 | 2635 | setTimeout(function () {
|
@@ -2665,67 +2665,67 @@ discard block |
||
| 2665 | 2665 | <?php } ?> |
| 2666 | 2666 | </script><?php |
| 2667 | 2667 | |
| 2668 | - global $errors; |
|
| 2669 | - if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim') |
|
| 2670 | - $errors->add('claim_login', LOGIN_CLAIM);
|
|
| 2671 | - |
|
| 2672 | - if (!empty($errors)) {
|
|
| 2673 | - foreach ($errors as $errorsObj) {
|
|
| 2674 | - foreach ($errorsObj as $key => $val) {
|
|
| 2675 | - for ($i = 0; $i < count($val); $i++) {
|
|
| 2676 | - echo "<div class=error_msg_fix>" . $val[$i] . '</div>'; |
|
| 2677 | - $registration_error_msg = 1; |
|
| 2678 | - } |
|
| 2679 | - } |
|
| 2680 | - } |
|
| 2681 | - } |
|
| 2668 | + global $errors; |
|
| 2669 | + if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim') |
|
| 2670 | + $errors->add('claim_login', LOGIN_CLAIM);
|
|
| 2671 | + |
|
| 2672 | + if (!empty($errors)) {
|
|
| 2673 | + foreach ($errors as $errorsObj) {
|
|
| 2674 | + foreach ($errorsObj as $key => $val) {
|
|
| 2675 | + for ($i = 0; $i < count($val); $i++) {
|
|
| 2676 | + echo "<div class=error_msg_fix>" . $val[$i] . '</div>'; |
|
| 2677 | + $registration_error_msg = 1; |
|
| 2678 | + } |
|
| 2679 | + } |
|
| 2680 | + } |
|
| 2681 | + } |
|
| 2682 | 2682 | |
| 2683 | - if (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_in') {
|
|
| 2684 | - ?> |
|
| 2683 | + if (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_in') {
|
|
| 2684 | + ?> |
|
| 2685 | 2685 | |
| 2686 | 2686 | <div class="login_form"> |
| 2687 | 2687 | <?php |
| 2688 | - /** |
|
| 2689 | - * Contains login form template. |
|
| 2690 | - * |
|
| 2691 | - * @since 1.0.0 |
|
| 2692 | - */ |
|
| 2693 | - include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?> |
|
| 2688 | + /** |
|
| 2689 | + * Contains login form template. |
|
| 2690 | + * |
|
| 2691 | + * @since 1.0.0 |
|
| 2692 | + */ |
|
| 2693 | + include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?> |
|
| 2694 | 2694 | </div> |
| 2695 | 2695 | |
| 2696 | 2696 | <?php } elseif (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_up' && $is_enable_signup ) { ?>
|
| 2697 | 2697 | |
| 2698 | 2698 | <div class="registration_form"> |
| 2699 | 2699 | <?php |
| 2700 | - /** |
|
| 2701 | - * Contains registration form template. |
|
| 2702 | - * |
|
| 2703 | - * @since 1.0.0 |
|
| 2704 | - */ |
|
| 2705 | - include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?> |
|
| 2700 | + /** |
|
| 2701 | + * Contains registration form template. |
|
| 2702 | + * |
|
| 2703 | + * @since 1.0.0 |
|
| 2704 | + */ |
|
| 2705 | + include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?> |
|
| 2706 | 2706 | </div> |
| 2707 | 2707 | |
| 2708 | 2708 | <?php } else { ?>
|
| 2709 | 2709 | |
| 2710 | 2710 | <div class="login_form_l"> |
| 2711 | 2711 | <?php |
| 2712 | - /** |
|
| 2713 | - * Contains login form template. |
|
| 2714 | - * |
|
| 2715 | - * @since 1.0.0 |
|
| 2716 | - */ |
|
| 2717 | - include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?> |
|
| 2712 | + /** |
|
| 2713 | + * Contains login form template. |
|
| 2714 | + * |
|
| 2715 | + * @since 1.0.0 |
|
| 2716 | + */ |
|
| 2717 | + include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?> |
|
| 2718 | 2718 | </div> |
| 2719 | 2719 | |
| 2720 | 2720 | <?php if ( $is_enable_signup ) { ?>
|
| 2721 | 2721 | <div class="registration_form_r"> |
| 2722 | 2722 | <?php |
| 2723 | - /** |
|
| 2724 | - * Contains registration form template. |
|
| 2725 | - * |
|
| 2726 | - * @since 1.0.0 |
|
| 2727 | - */ |
|
| 2728 | - include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?> |
|
| 2723 | + /** |
|
| 2724 | + * Contains registration form template. |
|
| 2725 | + * |
|
| 2726 | + * @since 1.0.0 |
|
| 2727 | + */ |
|
| 2728 | + include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?> |
|
| 2729 | 2729 | </div> |
| 2730 | 2730 | <?php } ?> |
| 2731 | 2731 | |
@@ -2757,66 +2757,66 @@ discard block |
||
| 2757 | 2757 | */ |
| 2758 | 2758 | function geodir_action_author_page_title() |
| 2759 | 2759 | {
|
| 2760 | - global $term; |
|
| 2760 | + global $term; |
|
| 2761 | 2761 | |
| 2762 | - $gd_post_type = geodir_get_current_posttype(); |
|
| 2763 | - $post_type_info = get_post_type_object($gd_post_type); |
|
| 2762 | + $gd_post_type = geodir_get_current_posttype(); |
|
| 2763 | + $post_type_info = get_post_type_object($gd_post_type); |
|
| 2764 | 2764 | |
| 2765 | - $add_string_in_title = __('All', 'geodirectory') . ' ';
|
|
| 2766 | - if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 2767 | - $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';
|
|
| 2768 | - } |
|
| 2765 | + $add_string_in_title = __('All', 'geodirectory') . ' ';
|
|
| 2766 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 2767 | + $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';
|
|
| 2768 | + } |
|
| 2769 | 2769 | |
| 2770 | - $list_title = $add_string_in_title . $post_type_info->labels->name; |
|
| 2771 | - $single_name = $post_type_info->labels->singular_name; |
|
| 2770 | + $list_title = $add_string_in_title . $post_type_info->labels->name; |
|
| 2771 | + $single_name = $post_type_info->labels->singular_name; |
|
| 2772 | 2772 | |
| 2773 | - $taxonomy = geodir_get_taxonomies($gd_post_type); |
|
| 2773 | + $taxonomy = geodir_get_taxonomies($gd_post_type); |
|
| 2774 | 2774 | |
| 2775 | - if (!empty($term)) {
|
|
| 2776 | - $current_term = get_term_by('slug', $term, $taxonomy[0]);
|
|
| 2777 | - if (!empty($current_term)) |
|
| 2778 | - $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";
|
|
| 2779 | - } |
|
| 2775 | + if (!empty($term)) {
|
|
| 2776 | + $current_term = get_term_by('slug', $term, $taxonomy[0]);
|
|
| 2777 | + if (!empty($current_term)) |
|
| 2778 | + $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";
|
|
| 2779 | + } |
|
| 2780 | 2780 | |
| 2781 | 2781 | |
| 2782 | - if (is_search()) {
|
|
| 2783 | - $list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";
|
|
| 2782 | + if (is_search()) {
|
|
| 2783 | + $list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";
|
|
| 2784 | 2784 | |
| 2785 | - } |
|
| 2786 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2787 | - $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 2788 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2789 | - $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 2785 | + } |
|
| 2786 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2787 | + $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 2788 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2789 | + $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 2790 | 2790 | |
| 2791 | - $title = $list_title; |
|
| 2792 | - if(geodir_is_page('author')){
|
|
| 2793 | - $gd_page = 'author'; |
|
| 2794 | - if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){
|
|
| 2795 | - $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;
|
|
| 2796 | - }else{
|
|
| 2797 | - $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;
|
|
| 2798 | - } |
|
| 2791 | + $title = $list_title; |
|
| 2792 | + if(geodir_is_page('author')){
|
|
| 2793 | + $gd_page = 'author'; |
|
| 2794 | + if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){
|
|
| 2795 | + $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;
|
|
| 2796 | + }else{
|
|
| 2797 | + $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;
|
|
| 2798 | + } |
|
| 2799 | 2799 | |
| 2800 | - } |
|
| 2800 | + } |
|
| 2801 | 2801 | |
| 2802 | 2802 | |
| 2803 | - /** |
|
| 2804 | - * Filter page title to replace variables. |
|
| 2805 | - * |
|
| 2806 | - * @since 1.5.4 |
|
| 2807 | - * @param string $title The page title including variables. |
|
| 2808 | - * @param string $gd_page The GeoDirectory page type if any. |
|
| 2809 | - */ |
|
| 2810 | - $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 2803 | + /** |
|
| 2804 | + * Filter page title to replace variables. |
|
| 2805 | + * |
|
| 2806 | + * @since 1.5.4 |
|
| 2807 | + * @param string $title The page title including variables. |
|
| 2808 | + * @param string $gd_page The GeoDirectory page type if any. |
|
| 2809 | + */ |
|
| 2810 | + $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 2811 | 2811 | |
| 2812 | - echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . |
|
| 2813 | - /** |
|
| 2814 | - * Filter the author page title text. |
|
| 2815 | - * |
|
| 2816 | - * @since 1.0.0 |
|
| 2817 | - * @param string $list_title The title for the page. |
|
| 2818 | - */ |
|
| 2819 | - apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';
|
|
| 2812 | + echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . |
|
| 2813 | + /** |
|
| 2814 | + * Filter the author page title text. |
|
| 2815 | + * |
|
| 2816 | + * @since 1.0.0 |
|
| 2817 | + * @param string $list_title The title for the page. |
|
| 2818 | + */ |
|
| 2819 | + apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';
|
|
| 2820 | 2820 | } |
| 2821 | 2821 | |
| 2822 | 2822 | |
@@ -2834,11 +2834,11 @@ discard block |
||
| 2834 | 2834 | */ |
| 2835 | 2835 | function geodir_action_geodir_sidebar_author_top() |
| 2836 | 2836 | {
|
| 2837 | - if (get_option('geodir_show_author_top_section')) { ?>
|
|
| 2837 | + if (get_option('geodir_show_author_top_section')) { ?>
|
|
| 2838 | 2838 | <div |
| 2839 | 2839 | class="<?php |
| 2840 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2841 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_top'); ?>">
|
|
| 2840 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2841 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_top'); ?>">
|
|
| 2842 | 2842 | <?php dynamic_sidebar('geodir_author_top'); ?>
|
| 2843 | 2843 | </div><!-- clearfix ends here--> |
| 2844 | 2844 | <?php } |
@@ -2854,7 +2854,7 @@ discard block |
||
| 2854 | 2854 | */ |
| 2855 | 2855 | function geodir_author_left_section() |
| 2856 | 2856 | {
|
| 2857 | - if (get_option('geodir_show_author_left_section')) { ?>
|
|
| 2857 | + if (get_option('geodir_show_author_left_section')) { ?>
|
|
| 2858 | 2858 | <div class="geodir-content-left geodir-sidebar-wrap"> |
| 2859 | 2859 | <?php dynamic_sidebar('geodir_author_left_sidebar'); ?>
|
| 2860 | 2860 | </div><!-- end geodir-content-left --> |
@@ -2875,19 +2875,19 @@ discard block |
||
| 2875 | 2875 | */ |
| 2876 | 2876 | function geodir_action_author_sidebar_left() |
| 2877 | 2877 | {
|
| 2878 | - if (get_option('geodir_show_author_left_section')) {
|
|
| 2878 | + if (get_option('geodir_show_author_left_section')) {
|
|
| 2879 | 2879 | // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='') |
| 2880 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2881 | - do_action('geodir_sidebar_left_open', 'author-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');
|
|
| 2882 | - /** |
|
| 2883 | - * This is used to add the content to the author page left sidebar (if active). |
|
| 2884 | - * |
|
| 2885 | - * @since 1.0.0 |
|
| 2886 | - */ |
|
| 2887 | - do_action('geodir_author_sidebar_left_inside');
|
|
| 2888 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2889 | - do_action('geodir_sidebar_left_close', 'author-page');
|
|
| 2890 | - } |
|
| 2880 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2881 | + do_action('geodir_sidebar_left_open', 'author-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');
|
|
| 2882 | + /** |
|
| 2883 | + * This is used to add the content to the author page left sidebar (if active). |
|
| 2884 | + * |
|
| 2885 | + * @since 1.0.0 |
|
| 2886 | + */ |
|
| 2887 | + do_action('geodir_author_sidebar_left_inside');
|
|
| 2888 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2889 | + do_action('geodir_sidebar_left_close', 'author-page');
|
|
| 2890 | + } |
|
| 2891 | 2891 | } |
| 2892 | 2892 | |
| 2893 | 2893 | /** |
@@ -2900,7 +2900,7 @@ discard block |
||
| 2900 | 2900 | */ |
| 2901 | 2901 | function geodir_author_right_section() |
| 2902 | 2902 | {
|
| 2903 | - if (get_option('geodir_show_author_right_section')) { ?>
|
|
| 2903 | + if (get_option('geodir_show_author_right_section')) { ?>
|
|
| 2904 | 2904 | <div class="geodir-content-right geodir-sidebar-wrap"> |
| 2905 | 2905 | <?php dynamic_sidebar('geodir_author_right_sidebar'); ?>
|
| 2906 | 2906 | </div><!-- end geodir-content-right --> |
@@ -2920,18 +2920,18 @@ discard block |
||
| 2920 | 2920 | */ |
| 2921 | 2921 | function geodir_action_author_sidebar_right() |
| 2922 | 2922 | {
|
| 2923 | - if (get_option('geodir_show_author_right_section')) {
|
|
| 2924 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2925 | - do_action('geodir_sidebar_right_open', 'author-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 2926 | - /** |
|
| 2927 | - * This is used to add the content to the author page right sidebar (if active). |
|
| 2928 | - * |
|
| 2929 | - * @since 1.0.0 |
|
| 2930 | - */ |
|
| 2931 | - do_action('geodir_author_sidebar_right_inside');
|
|
| 2932 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2933 | - do_action('geodir_sidebar_right_close', 'author-page');
|
|
| 2934 | - } |
|
| 2923 | + if (get_option('geodir_show_author_right_section')) {
|
|
| 2924 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2925 | + do_action('geodir_sidebar_right_open', 'author-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 2926 | + /** |
|
| 2927 | + * This is used to add the content to the author page right sidebar (if active). |
|
| 2928 | + * |
|
| 2929 | + * @since 1.0.0 |
|
| 2930 | + */ |
|
| 2931 | + do_action('geodir_author_sidebar_right_inside');
|
|
| 2932 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2933 | + do_action('geodir_sidebar_right_close', 'author-page');
|
|
| 2934 | + } |
|
| 2935 | 2935 | } |
| 2936 | 2936 | |
| 2937 | 2937 | /** |
@@ -2943,14 +2943,14 @@ discard block |
||
| 2943 | 2943 | */ |
| 2944 | 2944 | function geodir_action_author_content_inside() |
| 2945 | 2945 | {
|
| 2946 | - global $gridview_columns; |
|
| 2947 | - $listing_view = get_option('geodir_author_view');
|
|
| 2948 | - if (strstr($listing_view, 'gridview')) {
|
|
| 2949 | - $gridview_columns = $listing_view; |
|
| 2950 | - $listing_view_exp = explode('_', $listing_view);
|
|
| 2951 | - $listing_view = $listing_view_exp[0]; |
|
| 2952 | - } |
|
| 2953 | - geodir_get_template_part('listing', 'listview');
|
|
| 2946 | + global $gridview_columns; |
|
| 2947 | + $listing_view = get_option('geodir_author_view');
|
|
| 2948 | + if (strstr($listing_view, 'gridview')) {
|
|
| 2949 | + $gridview_columns = $listing_view; |
|
| 2950 | + $listing_view_exp = explode('_', $listing_view);
|
|
| 2951 | + $listing_view = $listing_view_exp[0]; |
|
| 2952 | + } |
|
| 2953 | + geodir_get_template_part('listing', 'listview');
|
|
| 2954 | 2954 | } |
| 2955 | 2955 | |
| 2956 | 2956 | add_action('geodir_author_content_inside', 'geodir_action_author_content_inside', 10);
|
@@ -2965,22 +2965,22 @@ discard block |
||
| 2965 | 2965 | */ |
| 2966 | 2966 | function geodir_action_author_content() |
| 2967 | 2967 | {
|
| 2968 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2969 | - do_action('geodir_main_content_open', 'author-page', 'geodir-main-content', 'author-page');
|
|
| 2970 | - echo '<div class="clearfix">'; |
|
| 2971 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2972 | - do_action('geodir_before_listing');
|
|
| 2973 | - echo '</div>'; |
|
| 2974 | - /** |
|
| 2975 | - * This is used to add the content to the author page main content. |
|
| 2976 | - * |
|
| 2977 | - * @since 1.0.0 |
|
| 2978 | - */ |
|
| 2979 | - do_action('geodir_author_content_inside');
|
|
| 2980 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2981 | - do_action('geodir_after_listing');
|
|
| 2982 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2983 | - do_action('geodir_main_content_close', 'author-page');
|
|
| 2968 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2969 | + do_action('geodir_main_content_open', 'author-page', 'geodir-main-content', 'author-page');
|
|
| 2970 | + echo '<div class="clearfix">'; |
|
| 2971 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2972 | + do_action('geodir_before_listing');
|
|
| 2973 | + echo '</div>'; |
|
| 2974 | + /** |
|
| 2975 | + * This is used to add the content to the author page main content. |
|
| 2976 | + * |
|
| 2977 | + * @since 1.0.0 |
|
| 2978 | + */ |
|
| 2979 | + do_action('geodir_author_content_inside');
|
|
| 2980 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2981 | + do_action('geodir_after_listing');
|
|
| 2982 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2983 | + do_action('geodir_main_content_close', 'author-page');
|
|
| 2984 | 2984 | } |
| 2985 | 2985 | |
| 2986 | 2986 | add_action('geodir_sidebar_author_bottom_section', 'geodir_action_sidebar_author_bottom_section', 10);
|
@@ -2994,11 +2994,11 @@ discard block |
||
| 2994 | 2994 | */ |
| 2995 | 2995 | function geodir_action_sidebar_author_bottom_section() |
| 2996 | 2996 | {
|
| 2997 | - if (get_option('geodir_show_author_bottom_section')) { ?>
|
|
| 2997 | + if (get_option('geodir_show_author_bottom_section')) { ?>
|
|
| 2998 | 2998 | <div |
| 2999 | 2999 | class="<?php |
| 3000 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3001 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_bottom'); ?>">
|
|
| 3000 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3001 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_bottom'); ?>">
|
|
| 3002 | 3002 | <?php dynamic_sidebar('geodir_author_bottom'); ?>
|
| 3003 | 3003 | </div><!-- clearfix ends here--> |
| 3004 | 3004 | <?php } |
@@ -3017,23 +3017,23 @@ discard block |
||
| 3017 | 3017 | */ |
| 3018 | 3018 | function geodir_action_search_page_title() |
| 3019 | 3019 | {
|
| 3020 | - $gd_post_type = geodir_get_current_posttype(); |
|
| 3021 | - $post_type_info = get_post_type_object($gd_post_type); |
|
| 3020 | + $gd_post_type = geodir_get_current_posttype(); |
|
| 3021 | + $post_type_info = get_post_type_object($gd_post_type); |
|
| 3022 | 3022 | |
| 3023 | - $pt_name = ''; |
|
| 3024 | - if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}
|
|
| 3023 | + $pt_name = ''; |
|
| 3024 | + if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}
|
|
| 3025 | 3025 | |
| 3026 | - if (is_search()) {
|
|
| 3027 | - $list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";
|
|
| 3026 | + if (is_search()) {
|
|
| 3027 | + $list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";
|
|
| 3028 | 3028 | |
| 3029 | - } |
|
| 3030 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3031 | - $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 3032 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3033 | - $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 3034 | - echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . |
|
| 3035 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3036 | - apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';
|
|
| 3029 | + } |
|
| 3030 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3031 | + $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 3032 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3033 | + $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 3034 | + echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . |
|
| 3035 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3036 | + apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';
|
|
| 3037 | 3037 | } |
| 3038 | 3038 | |
| 3039 | 3039 | // action for adding the listings page top widget area |
@@ -3049,11 +3049,11 @@ discard block |
||
| 3049 | 3049 | */ |
| 3050 | 3050 | function geodir_action_geodir_sidebar_search_top() |
| 3051 | 3051 | {
|
| 3052 | - if (get_option('geodir_show_search_top_section')) { ?>
|
|
| 3052 | + if (get_option('geodir_show_search_top_section')) { ?>
|
|
| 3053 | 3053 | <div |
| 3054 | 3054 | class="<?php |
| 3055 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3056 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_top'); ?>">
|
|
| 3055 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3056 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_top'); ?>">
|
|
| 3057 | 3057 | <?php dynamic_sidebar('geodir_search_top'); ?>
|
| 3058 | 3058 | </div><!-- clearfix ends here--> |
| 3059 | 3059 | <?php } |
@@ -3069,7 +3069,7 @@ discard block |
||
| 3069 | 3069 | */ |
| 3070 | 3070 | function geodir_search_left_section() |
| 3071 | 3071 | {
|
| 3072 | - if (get_option('geodir_show_search_left_section')) { ?>
|
|
| 3072 | + if (get_option('geodir_show_search_left_section')) { ?>
|
|
| 3073 | 3073 | <div class="geodir-content-left geodir-sidebar-wrap"> |
| 3074 | 3074 | <?php dynamic_sidebar('geodir_search_left_sidebar'); ?>
|
| 3075 | 3075 | </div><!-- end geodir-content-left --> |
@@ -3089,19 +3089,19 @@ discard block |
||
| 3089 | 3089 | */ |
| 3090 | 3090 | function geodir_action_search_sidebar_left() |
| 3091 | 3091 | {
|
| 3092 | - if (get_option('geodir_show_search_left_section')) {
|
|
| 3092 | + if (get_option('geodir_show_search_left_section')) {
|
|
| 3093 | 3093 | // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='') |
| 3094 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3095 | - do_action('geodir_sidebar_left_open', 'search-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');
|
|
| 3096 | - /** |
|
| 3097 | - * This is used to add the content to the search page left sidebar (if active). |
|
| 3098 | - * |
|
| 3099 | - * @since 1.0.0 |
|
| 3100 | - */ |
|
| 3101 | - do_action('geodir_search_sidebar_left_inside');
|
|
| 3102 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3103 | - do_action('geodir_sidebar_left_close', 'search-page');
|
|
| 3104 | - } |
|
| 3094 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3095 | + do_action('geodir_sidebar_left_open', 'search-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');
|
|
| 3096 | + /** |
|
| 3097 | + * This is used to add the content to the search page left sidebar (if active). |
|
| 3098 | + * |
|
| 3099 | + * @since 1.0.0 |
|
| 3100 | + */ |
|
| 3101 | + do_action('geodir_search_sidebar_left_inside');
|
|
| 3102 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3103 | + do_action('geodir_sidebar_left_close', 'search-page');
|
|
| 3104 | + } |
|
| 3105 | 3105 | } |
| 3106 | 3106 | |
| 3107 | 3107 | /** |
@@ -3114,7 +3114,7 @@ discard block |
||
| 3114 | 3114 | */ |
| 3115 | 3115 | function geodir_search_right_section() |
| 3116 | 3116 | {
|
| 3117 | - if (get_option('geodir_show_search_right_section')) { ?>
|
|
| 3117 | + if (get_option('geodir_show_search_right_section')) { ?>
|
|
| 3118 | 3118 | <div class="geodir-content-right geodir-sidebar-wrap"> |
| 3119 | 3119 | <?php dynamic_sidebar('geodir_search_right_sidebar'); ?>
|
| 3120 | 3120 | </div><!-- end geodir-content-right --> |
@@ -3134,18 +3134,18 @@ discard block |
||
| 3134 | 3134 | */ |
| 3135 | 3135 | function geodir_action_search_sidebar_right() |
| 3136 | 3136 | {
|
| 3137 | - if (get_option('geodir_show_search_right_section')) {
|
|
| 3138 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3139 | - do_action('geodir_sidebar_right_open', 'search-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 3140 | - /** |
|
| 3141 | - * This is used to add the content to the search page right sidebar (if active). |
|
| 3142 | - * |
|
| 3143 | - * @since 1.0.0 |
|
| 3144 | - */ |
|
| 3145 | - do_action('geodir_search_sidebar_right_inside');
|
|
| 3146 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3147 | - do_action('geodir_sidebar_right_close', 'search-page');
|
|
| 3148 | - } |
|
| 3137 | + if (get_option('geodir_show_search_right_section')) {
|
|
| 3138 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3139 | + do_action('geodir_sidebar_right_open', 'search-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 3140 | + /** |
|
| 3141 | + * This is used to add the content to the search page right sidebar (if active). |
|
| 3142 | + * |
|
| 3143 | + * @since 1.0.0 |
|
| 3144 | + */ |
|
| 3145 | + do_action('geodir_search_sidebar_right_inside');
|
|
| 3146 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3147 | + do_action('geodir_sidebar_right_close', 'search-page');
|
|
| 3148 | + } |
|
| 3149 | 3149 | } |
| 3150 | 3150 | |
| 3151 | 3151 | |
@@ -3160,11 +3160,11 @@ discard block |
||
| 3160 | 3160 | */ |
| 3161 | 3161 | function geodir_action_sidebar_search_bottom_section() |
| 3162 | 3162 | {
|
| 3163 | - if (get_option('geodir_show_search_bottom_section')) { ?>
|
|
| 3163 | + if (get_option('geodir_show_search_bottom_section')) { ?>
|
|
| 3164 | 3164 | <div |
| 3165 | 3165 | class="<?php |
| 3166 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3167 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_bottom'); ?>">
|
|
| 3166 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3167 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_bottom'); ?>">
|
|
| 3168 | 3168 | <?php dynamic_sidebar('geodir_search_bottom'); ?>
|
| 3169 | 3169 | </div><!-- clearfix ends here--> |
| 3170 | 3170 | <?php } |
@@ -3179,14 +3179,14 @@ discard block |
||
| 3179 | 3179 | */ |
| 3180 | 3180 | function geodir_action_search_content_inside() |
| 3181 | 3181 | {
|
| 3182 | - global $gridview_columns; |
|
| 3183 | - $listing_view = get_option('geodir_search_view');
|
|
| 3184 | - if (strstr($listing_view, 'gridview')) {
|
|
| 3185 | - $gridview_columns = $listing_view; |
|
| 3186 | - $listing_view_exp = explode('_', $listing_view);
|
|
| 3187 | - $listing_view = $listing_view_exp[0]; |
|
| 3188 | - } |
|
| 3189 | - geodir_get_template_part('listing', 'listview');
|
|
| 3182 | + global $gridview_columns; |
|
| 3183 | + $listing_view = get_option('geodir_search_view');
|
|
| 3184 | + if (strstr($listing_view, 'gridview')) {
|
|
| 3185 | + $gridview_columns = $listing_view; |
|
| 3186 | + $listing_view_exp = explode('_', $listing_view);
|
|
| 3187 | + $listing_view = $listing_view_exp[0]; |
|
| 3188 | + } |
|
| 3189 | + geodir_get_template_part('listing', 'listview');
|
|
| 3190 | 3190 | } |
| 3191 | 3191 | |
| 3192 | 3192 | add_action('geodir_search_content_inside', 'geodir_action_search_content_inside', 10);
|
@@ -3202,22 +3202,22 @@ discard block |
||
| 3202 | 3202 | */ |
| 3203 | 3203 | function geodir_action_search_content() |
| 3204 | 3204 | {
|
| 3205 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3206 | - do_action('geodir_main_content_open', 'search-page', 'geodir-main-content', 'search-page');
|
|
| 3207 | - echo '<div class="clearfix">'; |
|
| 3208 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3209 | - do_action('geodir_before_listing');
|
|
| 3210 | - echo '</div>'; |
|
| 3211 | - /** |
|
| 3212 | - * This is used to add the content to the search page main content. |
|
| 3213 | - * |
|
| 3214 | - * @since 1.0.0 |
|
| 3215 | - */ |
|
| 3216 | - do_action('geodir_search_content_inside');
|
|
| 3217 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3218 | - do_action('geodir_after_listing');
|
|
| 3219 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3220 | - do_action('geodir_main_content_close', 'search-page');
|
|
| 3205 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3206 | + do_action('geodir_main_content_open', 'search-page', 'geodir-main-content', 'search-page');
|
|
| 3207 | + echo '<div class="clearfix">'; |
|
| 3208 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3209 | + do_action('geodir_before_listing');
|
|
| 3210 | + echo '</div>'; |
|
| 3211 | + /** |
|
| 3212 | + * This is used to add the content to the search page main content. |
|
| 3213 | + * |
|
| 3214 | + * @since 1.0.0 |
|
| 3215 | + */ |
|
| 3216 | + do_action('geodir_search_content_inside');
|
|
| 3217 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3218 | + do_action('geodir_after_listing');
|
|
| 3219 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3220 | + do_action('geodir_main_content_close', 'search-page');
|
|
| 3221 | 3221 | } |
| 3222 | 3222 | |
| 3223 | 3223 | ############################################### |
@@ -3240,11 +3240,11 @@ discard block |
||
| 3240 | 3240 | */ |
| 3241 | 3241 | function geodir_action_geodir_sidebar_home_top() |
| 3242 | 3242 | {
|
| 3243 | - if (get_option('geodir_show_home_top_section')) { ?>
|
|
| 3243 | + if (get_option('geodir_show_home_top_section')) { ?>
|
|
| 3244 | 3244 | <div |
| 3245 | 3245 | class="<?php |
| 3246 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3247 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_top'); ?>">
|
|
| 3246 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3247 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_top'); ?>">
|
|
| 3248 | 3248 | <?php dynamic_sidebar('geodir_home_top'); ?>
|
| 3249 | 3249 | </div><!-- clearfix ends here--> |
| 3250 | 3250 | <?php } |
@@ -3260,7 +3260,7 @@ discard block |
||
| 3260 | 3260 | */ |
| 3261 | 3261 | function geodir_home_left_section() |
| 3262 | 3262 | {
|
| 3263 | - if (get_option('geodir_show_home_left_section')) { ?>
|
|
| 3263 | + if (get_option('geodir_show_home_left_section')) { ?>
|
|
| 3264 | 3264 | <div class="geodir-content-left geodir-sidebar-wrap"> |
| 3265 | 3265 | <?php dynamic_sidebar('geodir_home_left'); ?>
|
| 3266 | 3266 | </div><!-- end geodir-content-left --> |
@@ -3282,19 +3282,19 @@ discard block |
||
| 3282 | 3282 | */ |
| 3283 | 3283 | function geodir_action_home_sidebar_left() |
| 3284 | 3284 | {
|
| 3285 | - if (get_option('geodir_show_home_left_section')) {
|
|
| 3285 | + if (get_option('geodir_show_home_left_section')) {
|
|
| 3286 | 3286 | // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='') |
| 3287 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3288 | - do_action('geodir_sidebar_left_open', 'home-page', 'geodir-sidebar-left', 'geodir-sidebar geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');
|
|
| 3289 | - /** |
|
| 3290 | - * This is used to add the content to the home page left sidebar (if active). |
|
| 3291 | - * |
|
| 3292 | - * @since 1.0.0 |
|
| 3293 | - */ |
|
| 3294 | - do_action('geodir_home_sidebar_left_inside');
|
|
| 3295 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3296 | - do_action('geodir_sidebar_left_close', 'home-page');
|
|
| 3297 | - } |
|
| 3287 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3288 | + do_action('geodir_sidebar_left_open', 'home-page', 'geodir-sidebar-left', 'geodir-sidebar geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');
|
|
| 3289 | + /** |
|
| 3290 | + * This is used to add the content to the home page left sidebar (if active). |
|
| 3291 | + * |
|
| 3292 | + * @since 1.0.0 |
|
| 3293 | + */ |
|
| 3294 | + do_action('geodir_home_sidebar_left_inside');
|
|
| 3295 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3296 | + do_action('geodir_sidebar_left_close', 'home-page');
|
|
| 3297 | + } |
|
| 3298 | 3298 | } |
| 3299 | 3299 | |
| 3300 | 3300 | /** |
@@ -3307,7 +3307,7 @@ discard block |
||
| 3307 | 3307 | */ |
| 3308 | 3308 | function geodir_home_right_section() |
| 3309 | 3309 | {
|
| 3310 | - if (get_option('geodir_show_home_right_section')) { ?>
|
|
| 3310 | + if (get_option('geodir_show_home_right_section')) { ?>
|
|
| 3311 | 3311 | <div class="geodir-content-right geodir-sidebar-wrap"> |
| 3312 | 3312 | <?php dynamic_sidebar('geodir_home_right'); ?>
|
| 3313 | 3313 | </div><!-- end geodir-content-right --> |
@@ -3328,18 +3328,18 @@ discard block |
||
| 3328 | 3328 | */ |
| 3329 | 3329 | function geodir_action_home_sidebar_right() |
| 3330 | 3330 | {
|
| 3331 | - if (get_option('geodir_show_home_right_section')) {
|
|
| 3332 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3333 | - do_action('geodir_sidebar_right_open', 'home-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 3334 | - /** |
|
| 3335 | - * This is used to add the content to the home page right sidebar (if active). |
|
| 3336 | - * |
|
| 3337 | - * @since 1.0.0 |
|
| 3338 | - */ |
|
| 3339 | - do_action('geodir_home_sidebar_right_inside');
|
|
| 3340 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3341 | - do_action('geodir_sidebar_right_close', 'home-page');
|
|
| 3342 | - } |
|
| 3331 | + if (get_option('geodir_show_home_right_section')) {
|
|
| 3332 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3333 | + do_action('geodir_sidebar_right_open', 'home-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 3334 | + /** |
|
| 3335 | + * This is used to add the content to the home page right sidebar (if active). |
|
| 3336 | + * |
|
| 3337 | + * @since 1.0.0 |
|
| 3338 | + */ |
|
| 3339 | + do_action('geodir_home_sidebar_right_inside');
|
|
| 3340 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3341 | + do_action('geodir_sidebar_right_close', 'home-page');
|
|
| 3342 | + } |
|
| 3343 | 3343 | } |
| 3344 | 3344 | |
| 3345 | 3345 | /** |
@@ -3350,7 +3350,7 @@ discard block |
||
| 3350 | 3350 | */ |
| 3351 | 3351 | function geodir_action_home_content_inside() |
| 3352 | 3352 | {
|
| 3353 | - dynamic_sidebar('geodir_home_content');
|
|
| 3353 | + dynamic_sidebar('geodir_home_content');
|
|
| 3354 | 3354 | } |
| 3355 | 3355 | |
| 3356 | 3356 | add_action('geodir_home_content_inside', 'geodir_action_home_content_inside', 10);
|
@@ -3365,28 +3365,28 @@ discard block |
||
| 3365 | 3365 | */ |
| 3366 | 3366 | function geodir_action_home_content() |
| 3367 | 3367 | {
|
| 3368 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3369 | - do_action('geodir_main_content_open', 'home-page', 'geodir-main-content', 'home-page');
|
|
| 3370 | - /** |
|
| 3371 | - * This called before the home page main content. |
|
| 3372 | - * |
|
| 3373 | - * @since 1.0.0 |
|
| 3374 | - */ |
|
| 3375 | - do_action('geodir_before_home_content');
|
|
| 3376 | - /** |
|
| 3377 | - * This is used to add the content to the home page main content. |
|
| 3378 | - * |
|
| 3379 | - * @since 1.0.0 |
|
| 3380 | - */ |
|
| 3381 | - do_action('geodir_home_content_inside');
|
|
| 3382 | - /** |
|
| 3383 | - * This is called after the homepage main content. |
|
| 3384 | - * |
|
| 3385 | - * @since 1.0.0 |
|
| 3386 | - */ |
|
| 3387 | - do_action('geodir_after_home_content');
|
|
| 3388 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3389 | - do_action('geodir_main_content_close', 'home-page');
|
|
| 3368 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3369 | + do_action('geodir_main_content_open', 'home-page', 'geodir-main-content', 'home-page');
|
|
| 3370 | + /** |
|
| 3371 | + * This called before the home page main content. |
|
| 3372 | + * |
|
| 3373 | + * @since 1.0.0 |
|
| 3374 | + */ |
|
| 3375 | + do_action('geodir_before_home_content');
|
|
| 3376 | + /** |
|
| 3377 | + * This is used to add the content to the home page main content. |
|
| 3378 | + * |
|
| 3379 | + * @since 1.0.0 |
|
| 3380 | + */ |
|
| 3381 | + do_action('geodir_home_content_inside');
|
|
| 3382 | + /** |
|
| 3383 | + * This is called after the homepage main content. |
|
| 3384 | + * |
|
| 3385 | + * @since 1.0.0 |
|
| 3386 | + */ |
|
| 3387 | + do_action('geodir_after_home_content');
|
|
| 3388 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3389 | + do_action('geodir_main_content_close', 'home-page');
|
|
| 3390 | 3390 | } |
| 3391 | 3391 | |
| 3392 | 3392 | add_action('geodir_sidebar_location_bottom_section', 'geodir_action_sidebar_home_bottom_section', 10);
|
@@ -3401,11 +3401,11 @@ discard block |
||
| 3401 | 3401 | */ |
| 3402 | 3402 | function geodir_action_sidebar_home_bottom_section() |
| 3403 | 3403 | {
|
| 3404 | - if (get_option('geodir_show_home_bottom_section')) { ?>
|
|
| 3404 | + if (get_option('geodir_show_home_bottom_section')) { ?>
|
|
| 3405 | 3405 | <div |
| 3406 | 3406 | class="<?php |
| 3407 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3408 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_bottom'); ?>">
|
|
| 3407 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3408 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_bottom'); ?>">
|
|
| 3409 | 3409 | <?php dynamic_sidebar('geodir_home_bottom'); ?>
|
| 3410 | 3410 | </div><!-- clearfix ends here--> |
| 3411 | 3411 | <?php } |
@@ -3433,13 +3433,13 @@ discard block |
||
| 3433 | 3433 | */ |
| 3434 | 3434 | function geodir_filter_listing_page_title($list_title) |
| 3435 | 3435 | {
|
| 3436 | - if (is_search() && trim(get_search_query()) == '') {
|
|
| 3437 | - $gd_post_type = geodir_get_current_posttype(); |
|
| 3438 | - $post_type_info = get_post_type_object($gd_post_type); |
|
| 3436 | + if (is_search() && trim(get_search_query()) == '') {
|
|
| 3437 | + $gd_post_type = geodir_get_current_posttype(); |
|
| 3438 | + $post_type_info = get_post_type_object($gd_post_type); |
|
| 3439 | 3439 | |
| 3440 | - $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');
|
|
| 3441 | - } |
|
| 3442 | - return $list_title; |
|
| 3440 | + $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');
|
|
| 3441 | + } |
|
| 3442 | + return $list_title; |
|
| 3443 | 3443 | } |
| 3444 | 3444 | |
| 3445 | 3445 | add_action('geodir_message_not_found_on_listing', 'geodir_display_message_not_found_on_listing');
|
@@ -3454,62 +3454,62 @@ discard block |
||
| 3454 | 3454 | * @param string $gd_page The geodirectory page type. Default null. |
| 3455 | 3455 | */ |
| 3456 | 3456 | function geodir_add_page_content( $position = 'before', $gd_page = '' ) {
|
| 3457 | - global $post; |
|
| 3458 | - |
|
| 3459 | - $gd_page_id = NULL; |
|
| 3460 | - if ($gd_page == 'home-page' && geodir_is_page('home')) {
|
|
| 3461 | - $gd_page_id = geodir_home_page_id(); |
|
| 3462 | - } else if ($gd_page == 'details-page' && geodir_is_page('preview')) {
|
|
| 3463 | - $gd_page_id = geodir_preview_page_id(); |
|
| 3464 | - } else if ($gd_page == 'add-listing-page' && geodir_is_page('add-listing')) {
|
|
| 3465 | - $gd_page_id = geodir_add_listing_page_id(); |
|
| 3466 | - } else if ($gd_page == 'success-page' && geodir_is_page('listing-success')) {
|
|
| 3467 | - $gd_page_id = geodir_success_page_id(); |
|
| 3468 | - } else if ($gd_page == 'location-page' && geodir_is_page('location')) {
|
|
| 3469 | - $gd_page_id = geodir_location_page_id(); |
|
| 3470 | - } else if ($gd_page == 'info-page' && geodir_is_page('info')) {
|
|
| 3471 | - $gd_page_id = geodir_info_page_id(); |
|
| 3472 | - } else if ($gd_page == 'signup-page' && geodir_is_page('login')) {
|
|
| 3473 | - $gd_page_id = geodir_login_page_id(); |
|
| 3474 | - } else if ($gd_page == 'checkout-page' && geodir_is_page('checkout')) {
|
|
| 3475 | - $gd_page_id = geodir_payment_checkout_page_id(); |
|
| 3476 | - } else if ($gd_page == 'invoices-page' && geodir_is_page('invoices')) {
|
|
| 3477 | - $gd_page_id = geodir_payment_invoices_page_id(); |
|
| 3478 | - } |
|
| 3479 | - |
|
| 3480 | - if (!$gd_page_id > 0) {
|
|
| 3481 | - return; |
|
| 3482 | - } |
|
| 3457 | + global $post; |
|
| 3458 | + |
|
| 3459 | + $gd_page_id = NULL; |
|
| 3460 | + if ($gd_page == 'home-page' && geodir_is_page('home')) {
|
|
| 3461 | + $gd_page_id = geodir_home_page_id(); |
|
| 3462 | + } else if ($gd_page == 'details-page' && geodir_is_page('preview')) {
|
|
| 3463 | + $gd_page_id = geodir_preview_page_id(); |
|
| 3464 | + } else if ($gd_page == 'add-listing-page' && geodir_is_page('add-listing')) {
|
|
| 3465 | + $gd_page_id = geodir_add_listing_page_id(); |
|
| 3466 | + } else if ($gd_page == 'success-page' && geodir_is_page('listing-success')) {
|
|
| 3467 | + $gd_page_id = geodir_success_page_id(); |
|
| 3468 | + } else if ($gd_page == 'location-page' && geodir_is_page('location')) {
|
|
| 3469 | + $gd_page_id = geodir_location_page_id(); |
|
| 3470 | + } else if ($gd_page == 'info-page' && geodir_is_page('info')) {
|
|
| 3471 | + $gd_page_id = geodir_info_page_id(); |
|
| 3472 | + } else if ($gd_page == 'signup-page' && geodir_is_page('login')) {
|
|
| 3473 | + $gd_page_id = geodir_login_page_id(); |
|
| 3474 | + } else if ($gd_page == 'checkout-page' && geodir_is_page('checkout')) {
|
|
| 3475 | + $gd_page_id = geodir_payment_checkout_page_id(); |
|
| 3476 | + } else if ($gd_page == 'invoices-page' && geodir_is_page('invoices')) {
|
|
| 3477 | + $gd_page_id = geodir_payment_invoices_page_id(); |
|
| 3478 | + } |
|
| 3479 | + |
|
| 3480 | + if (!$gd_page_id > 0) {
|
|
| 3481 | + return; |
|
| 3482 | + } |
|
| 3483 | 3483 | |
| 3484 | - $display = 'before'; |
|
| 3485 | - /** |
|
| 3486 | - * Filter the position to display the page content. |
|
| 3487 | - * |
|
| 3488 | - * @since 1.6.3 |
|
| 3489 | - * |
|
| 3490 | - * @param string $display Position to add the post content. |
|
| 3491 | - * @param string $gd_page The geodirectory page type. |
|
| 3492 | - */ |
|
| 3493 | - $display = apply_filters('geodir_add_page_content_position', $display, $gd_page);
|
|
| 3494 | - |
|
| 3495 | - if ($position !== $display) {
|
|
| 3496 | - return; |
|
| 3497 | - } |
|
| 3498 | - |
|
| 3499 | - $gd_post = $post; |
|
| 3484 | + $display = 'before'; |
|
| 3485 | + /** |
|
| 3486 | + * Filter the position to display the page content. |
|
| 3487 | + * |
|
| 3488 | + * @since 1.6.3 |
|
| 3489 | + * |
|
| 3490 | + * @param string $display Position to add the post content. |
|
| 3491 | + * @param string $gd_page The geodirectory page type. |
|
| 3492 | + */ |
|
| 3493 | + $display = apply_filters('geodir_add_page_content_position', $display, $gd_page);
|
|
| 3494 | + |
|
| 3495 | + if ($position !== $display) {
|
|
| 3496 | + return; |
|
| 3497 | + } |
|
| 3498 | + |
|
| 3499 | + $gd_post = $post; |
|
| 3500 | 3500 | |
| 3501 | - setup_postdata(get_post($gd_page_id)); |
|
| 3501 | + setup_postdata(get_post($gd_page_id)); |
|
| 3502 | 3502 | |
| 3503 | - if (get_the_content()) {
|
|
| 3504 | - ?> |
|
| 3503 | + if (get_the_content()) {
|
|
| 3504 | + ?> |
|
| 3505 | 3505 | <section class="entry-content clearfix" itemprop="articleBody"><?php the_content(); ?></section> |
| 3506 | 3506 | <?php |
| 3507 | - } |
|
| 3507 | + } |
|
| 3508 | 3508 | |
| 3509 | - $post = $gd_post; |
|
| 3510 | - if (!empty($gd_post) && is_object($gd_post)) {
|
|
| 3511 | - setup_postdata($gd_post); |
|
| 3512 | - } |
|
| 3509 | + $post = $gd_post; |
|
| 3510 | + if (!empty($gd_post) && is_object($gd_post)) {
|
|
| 3511 | + setup_postdata($gd_post); |
|
| 3512 | + } |
|
| 3513 | 3513 | |
| 3514 | 3514 | } |
| 3515 | 3515 | add_action('geodir_add_page_content', 'geodir_add_page_content', 10, 2);
|
@@ -3530,13 +3530,13 @@ discard block |
||
| 3530 | 3530 | * @return string Filtered SQL JOIN clause. |
| 3531 | 3531 | */ |
| 3532 | 3532 | function geodir_previous_next_post_join( $join, $in_same_term, $excluded_terms, $taxonomy, $post ) {
|
| 3533 | - global $plugin_prefix; |
|
| 3533 | + global $plugin_prefix; |
|
| 3534 | 3534 | |
| 3535 | - if ( !empty($post->post_type) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 3536 | - $join .= " INNER JOIN " . $plugin_prefix . $post->post_type . "_detail AS gd ON gd.post_id = p.ID"; |
|
| 3537 | - } |
|
| 3535 | + if ( !empty($post->post_type) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 3536 | + $join .= " INNER JOIN " . $plugin_prefix . $post->post_type . "_detail AS gd ON gd.post_id = p.ID"; |
|
| 3537 | + } |
|
| 3538 | 3538 | |
| 3539 | - return $join; |
|
| 3539 | + return $join; |
|
| 3540 | 3540 | } |
| 3541 | 3541 | add_filter( 'get_previous_post_join', 'geodir_previous_next_post_join', 10, 5 ); |
| 3542 | 3542 | add_filter( 'get_next_post_join', 'geodir_previous_next_post_join', 10, 5 ); |
@@ -3558,31 +3558,31 @@ discard block |
||
| 3558 | 3558 | * @return string Filtered SQL WHERE clause. |
| 3559 | 3559 | */ |
| 3560 | 3560 | function geodir_previous_next_post_where( $where, $in_same_term, $excluded_terms, $taxonomy, $post ) {
|
| 3561 | - global $wpdb, $plugin_prefix; |
|
| 3561 | + global $wpdb, $plugin_prefix; |
|
| 3562 | 3562 | |
| 3563 | - if ( !empty($post->post_type) && ( !empty( $post->country_slug ) || !empty( $post->region_slug ) || !empty( $post->city_slug ) ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 3564 | - $post_locations = ''; |
|
| 3565 | - $post_locations_var = array(); |
|
| 3563 | + if ( !empty($post->post_type) && ( !empty( $post->country_slug ) || !empty( $post->region_slug ) || !empty( $post->city_slug ) ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 3564 | + $post_locations = ''; |
|
| 3565 | + $post_locations_var = array(); |
|
| 3566 | 3566 | |
| 3567 | - if ( !empty( $post->country_slug ) ) {
|
|
| 3568 | - $post_locations .= " AND post_locations LIKE %s"; |
|
| 3569 | - $post_locations_var[] = "%,[" . $post->country_slug . "]"; |
|
| 3570 | - } |
|
| 3571 | - |
|
| 3572 | - if ( !empty( $post->region_slug ) ) {
|
|
| 3573 | - $post_locations .= " AND post_locations LIKE %s"; |
|
| 3574 | - $post_locations_var[] = "%,[" . $post->region_slug . "],%"; |
|
| 3575 | - } |
|
| 3576 | - |
|
| 3577 | - if ( !empty( $post->city_slug ) ) {
|
|
| 3578 | - $post_locations .= " AND post_locations LIKE %s"; |
|
| 3579 | - $post_locations_var[] = "[" . $post->city_slug . "],%"; |
|
| 3580 | - } |
|
| 3567 | + if ( !empty( $post->country_slug ) ) {
|
|
| 3568 | + $post_locations .= " AND post_locations LIKE %s"; |
|
| 3569 | + $post_locations_var[] = "%,[" . $post->country_slug . "]"; |
|
| 3570 | + } |
|
| 3571 | + |
|
| 3572 | + if ( !empty( $post->region_slug ) ) {
|
|
| 3573 | + $post_locations .= " AND post_locations LIKE %s"; |
|
| 3574 | + $post_locations_var[] = "%,[" . $post->region_slug . "],%"; |
|
| 3575 | + } |
|
| 3576 | + |
|
| 3577 | + if ( !empty( $post->city_slug ) ) {
|
|
| 3578 | + $post_locations .= " AND post_locations LIKE %s"; |
|
| 3579 | + $post_locations_var[] = "[" . $post->city_slug . "],%"; |
|
| 3580 | + } |
|
| 3581 | 3581 | |
| 3582 | - $where .= $wpdb->prepare( $post_locations, $post_locations_var ); |
|
| 3583 | - } |
|
| 3582 | + $where .= $wpdb->prepare( $post_locations, $post_locations_var ); |
|
| 3583 | + } |
|
| 3584 | 3584 | |
| 3585 | - return $where; |
|
| 3585 | + return $where; |
|
| 3586 | 3586 | } |
| 3587 | 3587 | add_filter( 'get_previous_post_where', 'geodir_previous_next_post_where', 10, 5 ); |
| 3588 | 3588 | add_filter( 'get_next_post_where', 'geodir_previous_next_post_where', 10, 5 ); |
| 3589 | 3589 | \ No newline at end of file |
@@ -18,9 +18,9 @@ discard block |
||
| 18 | 18 | global $post_type; |
| 19 | 19 | |
| 20 | 20 | if (!isset($field_info->post_type)) {
|
| 21 | - $post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 21 | + $post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 22 | 22 | } else |
| 23 | - $post_type = $field_info->post_type; |
|
| 23 | + $post_type = $field_info->post_type; |
|
| 24 | 24 | |
| 25 | 25 | //if(isset($_REQUEST['custom_type']) && $_REQUEST['custom_type']=='predefined'){
|
| 26 | 26 | // $cf_arr = geodir_custom_fields_predefined($post_type); |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | $field_admin_title = ''; |
| 50 | 50 | if (isset($field_info->admin_title)) |
| 51 | - $field_admin_title = $field_info->admin_title; |
|
| 51 | + $field_admin_title = $field_info->admin_title; |
|
| 52 | 52 | |
| 53 | 53 | $default = isset($field_info->is_admin) ? $field_info->is_admin : ''; |
| 54 | 54 | |
@@ -68,17 +68,17 @@ discard block |
||
| 68 | 68 | //print_r($field_info); |
| 69 | 69 | |
| 70 | 70 | if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {
|
| 71 | - $field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>'; |
|
| 71 | + $field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>'; |
|
| 72 | 72 | }elseif(isset($cf['icon']) && $cf['icon']){
|
| 73 | - $field_icon = '<b style="background-image: url("'.$cf['icon'].'")"></b>';
|
|
| 73 | + $field_icon = '<b style="background-image: url("'.$cf['icon'].'")"></b>';
|
|
| 74 | 74 | }else{
|
| 75 | - $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 75 | + $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | if(isset($cf['name']) && $cf['name']){
|
| 79 | - $field_type_name = $cf['name']; |
|
| 79 | + $field_type_name = $cf['name']; |
|
| 80 | 80 | }else{
|
| 81 | - $field_type_name = $field_type; |
|
| 81 | + $field_type_name = $field_type; |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | ?> |
@@ -88,45 +88,45 @@ discard block |
||
| 88 | 88 | ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">
|
| 89 | 89 | <?php |
| 90 | 90 | |
| 91 | - $nonce = wp_create_nonce('custom_fields_' . $result_str);
|
|
| 92 | - ?> |
|
| 91 | + $nonce = wp_create_nonce('custom_fields_' . $result_str);
|
|
| 92 | + ?> |
|
| 93 | 93 | |
| 94 | 94 | <?php if (!$default): ?> |
| 95 | 95 | <div title="<?php _e('Click to remove field', 'geodirectory'); ?>"
|
| 96 | 96 | onclick="delete_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>')"
|
| 97 | 97 | class="handlediv close"><i class="fa fa-times" aria-hidden="true"></i></div> |
| 98 | 98 | <?php endif; |
| 99 | - if ($field_type == 'fieldset') {
|
|
| 100 | - ?> |
|
| 99 | + if ($field_type == 'fieldset') {
|
|
| 100 | + ?> |
|
| 101 | 101 | <i class="fa fa-long-arrow-left " aria-hidden="true"></i> |
| 102 | 102 | <i class="fa fa-long-arrow-right " aria-hidden="true"></i> |
| 103 | 103 | <b style="cursor:pointer;" |
| 104 | 104 | onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory') . ' ' . $field_admin_title);?></b>
|
| 105 | 105 | <?php |
| 106 | - } else {echo $field_icon;
|
|
| 107 | - ?> |
|
| 106 | + } else {echo $field_icon;
|
|
| 107 | + ?> |
|
| 108 | 108 | <b style="cursor:pointer;" |
| 109 | 109 | onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(' ' . $field_admin_title . ' (' . $field_type_name . ')');?></b>
|
| 110 | 110 | <?php |
| 111 | - } |
|
| 112 | - ?> |
|
| 111 | + } |
|
| 112 | + ?> |
|
| 113 | 113 | </div> |
| 114 | 114 | |
| 115 | 115 | <form><!-- we need to wrap in a fom so we can use radio buttons with same name --> |
| 116 | 116 | <div id="field_frm<?php echo $result_str; ?>" class="field_frm" |
| 117 | 117 | style="display:<?php if ($field_ins_upd == 'submit') {
|
| 118 | - echo 'block;'; |
|
| 119 | - } else {
|
|
| 120 | - echo 'none;'; |
|
| 121 | - } ?>"> |
|
| 118 | + echo 'block;'; |
|
| 119 | + } else {
|
|
| 120 | + echo 'none;'; |
|
| 121 | + } ?>"> |
|
| 122 | 122 | <input type="hidden" name="_wpnonce" value="<?php echo esc_attr($nonce); ?>"/> |
| 123 | 123 | <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type; ?>"/> |
| 124 | 124 | <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type; ?>"/> |
| 125 | 125 | <input type="hidden" name="field_type_key" id="field_type_key" value="<?php echo $field_type_key; ?>"/> |
| 126 | 126 | <input type="hidden" name="field_id" id="field_id" value="<?php echo esc_attr($result_str); ?>"/> |
| 127 | 127 | <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {
|
| 128 | - echo $field_info->data_type; |
|
| 129 | - } ?>"/> |
|
| 128 | + echo $field_info->data_type; |
|
| 129 | + } ?>"/> |
|
| 130 | 130 | <input type="hidden" name="is_active" id="is_active" value="1"/> |
| 131 | 131 | |
| 132 | 132 | <input type="hidden" name="is_default" value="<?php echo isset($field_info->is_default) ? $field_info->is_default : '';?>" /><?php // show in sidebar value?> |
@@ -138,37 +138,37 @@ discard block |
||
| 138 | 138 | |
| 139 | 139 | <?php |
| 140 | 140 | |
| 141 | - // data_type |
|
| 142 | - if(has_filter("geodir_cfa_data_type_{$field_type}")){
|
|
| 141 | + // data_type |
|
| 142 | + if(has_filter("geodir_cfa_data_type_{$field_type}")){
|
|
| 143 | 143 | |
| 144 | - echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 144 | + echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 145 | 145 | |
| 146 | - }else{
|
|
| 147 | - $value = ''; |
|
| 148 | - if (isset($field_info->data_type)) {
|
|
| 149 | - $value = esc_attr($field_info->data_type); |
|
| 150 | - }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
|
|
| 151 | - $value = $cf['defaults']['data_type']; |
|
| 152 | - } |
|
| 153 | - ?> |
|
| 146 | + }else{
|
|
| 147 | + $value = ''; |
|
| 148 | + if (isset($field_info->data_type)) {
|
|
| 149 | + $value = esc_attr($field_info->data_type); |
|
| 150 | + }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
|
|
| 151 | + $value = $cf['defaults']['data_type']; |
|
| 152 | + } |
|
| 153 | + ?> |
|
| 154 | 154 | <input type="hidden" name="data_type" id="data_type" value="<?php echo $value;?>"/> |
| 155 | 155 | <?php |
| 156 | - } |
|
| 156 | + } |
|
| 157 | 157 | |
| 158 | 158 | |
| 159 | - // admin_title |
|
| 160 | - if(has_filter("geodir_cfa_admin_title_{$field_type}")){
|
|
| 159 | + // admin_title |
|
| 160 | + if(has_filter("geodir_cfa_admin_title_{$field_type}")){
|
|
| 161 | 161 | |
| 162 | - echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 162 | + echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 163 | 163 | |
| 164 | - }else{
|
|
| 165 | - $value = ''; |
|
| 166 | - if (isset($field_info->admin_title)) {
|
|
| 167 | - $value = esc_attr($field_info->admin_title); |
|
| 168 | - }elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){
|
|
| 169 | - $value = $cf['defaults']['admin_title']; |
|
| 170 | - } |
|
| 171 | - ?> |
|
| 164 | + }else{
|
|
| 165 | + $value = ''; |
|
| 166 | + if (isset($field_info->admin_title)) {
|
|
| 167 | + $value = esc_attr($field_info->admin_title); |
|
| 168 | + }elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){
|
|
| 169 | + $value = $cf['defaults']['admin_title']; |
|
| 170 | + } |
|
| 171 | + ?> |
|
| 172 | 172 | <li> |
| 173 | 173 | <label for="admin_title" class="gd-cf-tooltip-wrap"> |
| 174 | 174 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Admin title :', 'geodirectory'); ?>
|
@@ -182,22 +182,22 @@ discard block |
||
| 182 | 182 | </div> |
| 183 | 183 | </li> |
| 184 | 184 | <?php |
| 185 | - } |
|
| 185 | + } |
|
| 186 | 186 | |
| 187 | 187 | |
| 188 | - // site_title |
|
| 189 | - if(has_filter("geodir_cfa_site_title_{$field_type}")){
|
|
| 188 | + // site_title |
|
| 189 | + if(has_filter("geodir_cfa_site_title_{$field_type}")){
|
|
| 190 | 190 | |
| 191 | - echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 191 | + echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 192 | 192 | |
| 193 | - }else{
|
|
| 194 | - $value = ''; |
|
| 195 | - if (isset($field_info->site_title)) {
|
|
| 196 | - $value = esc_attr($field_info->site_title); |
|
| 197 | - }elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){
|
|
| 198 | - $value = $cf['defaults']['site_title']; |
|
| 199 | - } |
|
| 200 | - ?> |
|
| 193 | + }else{
|
|
| 194 | + $value = ''; |
|
| 195 | + if (isset($field_info->site_title)) {
|
|
| 196 | + $value = esc_attr($field_info->site_title); |
|
| 197 | + }elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){
|
|
| 198 | + $value = $cf['defaults']['site_title']; |
|
| 199 | + } |
|
| 200 | + ?> |
|
| 201 | 201 | <li> |
| 202 | 202 | <label for="site_title" class="gd-cf-tooltip-wrap"> <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Frontend title :', 'geodirectory'); ?>
|
| 203 | 203 | <div class="gdcf-tooltip"> |
@@ -210,22 +210,22 @@ discard block |
||
| 210 | 210 | </div> |
| 211 | 211 | </li> |
| 212 | 212 | <?php |
| 213 | - } |
|
| 213 | + } |
|
| 214 | 214 | |
| 215 | 215 | |
| 216 | - // admin_desc |
|
| 217 | - if(has_filter("geodir_cfa_admin_desc_{$field_type}")){
|
|
| 216 | + // admin_desc |
|
| 217 | + if(has_filter("geodir_cfa_admin_desc_{$field_type}")){
|
|
| 218 | 218 | |
| 219 | - echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 219 | + echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 220 | 220 | |
| 221 | - }else{
|
|
| 222 | - $value = ''; |
|
| 223 | - if (isset($field_info->admin_desc)) {
|
|
| 224 | - $value = esc_attr($field_info->admin_desc); |
|
| 225 | - }elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){
|
|
| 226 | - $value = $cf['defaults']['admin_desc']; |
|
| 227 | - } |
|
| 228 | - ?> |
|
| 221 | + }else{
|
|
| 222 | + $value = ''; |
|
| 223 | + if (isset($field_info->admin_desc)) {
|
|
| 224 | + $value = esc_attr($field_info->admin_desc); |
|
| 225 | + }elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){
|
|
| 226 | + $value = $cf['defaults']['admin_desc']; |
|
| 227 | + } |
|
| 228 | + ?> |
|
| 229 | 229 | <li> |
| 230 | 230 | <label for="admin_desc" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Frontend description :', 'geodirectory'); ?>
|
| 231 | 231 | <div class="gdcf-tooltip"> |
@@ -237,23 +237,23 @@ discard block |
||
| 237 | 237 | </div> |
| 238 | 238 | </li> |
| 239 | 239 | <?php |
| 240 | - } |
|
| 240 | + } |
|
| 241 | 241 | |
| 242 | 242 | |
| 243 | 243 | |
| 244 | - // htmlvar_name |
|
| 245 | - if(has_filter("geodir_cfa_htmlvar_name_{$field_type}")){
|
|
| 244 | + // htmlvar_name |
|
| 245 | + if(has_filter("geodir_cfa_htmlvar_name_{$field_type}")){
|
|
| 246 | 246 | |
| 247 | - echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 247 | + echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 248 | 248 | |
| 249 | - }else{
|
|
| 250 | - $value = ''; |
|
| 251 | - if (isset($field_info->htmlvar_name)) {
|
|
| 252 | - $value = esc_attr($field_info->htmlvar_name); |
|
| 253 | - }elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){
|
|
| 254 | - $value = $cf['defaults']['htmlvar_name']; |
|
| 255 | - } |
|
| 256 | - ?> |
|
| 249 | + }else{
|
|
| 250 | + $value = ''; |
|
| 251 | + if (isset($field_info->htmlvar_name)) {
|
|
| 252 | + $value = esc_attr($field_info->htmlvar_name); |
|
| 253 | + }elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){
|
|
| 254 | + $value = $cf['defaults']['htmlvar_name']; |
|
| 255 | + } |
|
| 256 | + ?> |
|
| 257 | 257 | <li> |
| 258 | 258 | <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory');?>
|
| 259 | 259 | <div class="gdcf-tooltip"> |
@@ -263,29 +263,29 @@ discard block |
||
| 263 | 263 | <div class="gd-cf-input-wrap"> |
| 264 | 264 | <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory');?>"
|
| 265 | 265 | value="<?php if ($value) {
|
| 266 | - echo preg_replace('/geodir_/', '', $value, 1);
|
|
| 267 | - }?>" <?php if ($default) {
|
|
| 268 | - echo 'readonly="readonly"'; |
|
| 269 | - }?> /> |
|
| 266 | + echo preg_replace('/geodir_/', '', $value, 1);
|
|
| 267 | + }?>" <?php if ($default) {
|
|
| 268 | + echo 'readonly="readonly"'; |
|
| 269 | + }?> /> |
|
| 270 | 270 | </div> |
| 271 | 271 | </li> |
| 272 | 272 | <?php |
| 273 | - } |
|
| 273 | + } |
|
| 274 | 274 | |
| 275 | 275 | |
| 276 | - // is_active |
|
| 277 | - if(has_filter("geodir_cfa_is_active_{$field_type}")){
|
|
| 276 | + // is_active |
|
| 277 | + if(has_filter("geodir_cfa_is_active_{$field_type}")){
|
|
| 278 | 278 | |
| 279 | - echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 279 | + echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 280 | 280 | |
| 281 | - }else{
|
|
| 282 | - $value = ''; |
|
| 283 | - if (isset($field_info->is_active)) {
|
|
| 284 | - $value = esc_attr($field_info->is_active); |
|
| 285 | - }elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){
|
|
| 286 | - $value = $cf['defaults']['is_active']; |
|
| 287 | - } |
|
| 288 | - ?> |
|
| 281 | + }else{
|
|
| 282 | + $value = ''; |
|
| 283 | + if (isset($field_info->is_active)) {
|
|
| 284 | + $value = esc_attr($field_info->is_active); |
|
| 285 | + }elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){
|
|
| 286 | + $value = $cf['defaults']['is_active']; |
|
| 287 | + } |
|
| 288 | + ?> |
|
| 289 | 289 | <li <?php echo $field_display; ?>> |
| 290 | 290 | <label for="is_active" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is active :', 'geodirectory'); ?>
|
| 291 | 291 | <div class="gdcf-tooltip"> |
@@ -296,35 +296,35 @@ discard block |
||
| 296 | 296 | |
| 297 | 297 | <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled" value="1" |
| 298 | 298 | <?php if ($value == '1') {
|
| 299 | - echo 'checked'; |
|
| 300 | - } ?>/> |
|
| 299 | + echo 'checked'; |
|
| 300 | + } ?>/> |
|
| 301 | 301 | <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 302 | 302 | |
| 303 | 303 | <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0" |
| 304 | 304 | <?php if ($value == '0' || !$value) {
|
| 305 | - echo 'checked'; |
|
| 306 | - } ?>/> |
|
| 305 | + echo 'checked'; |
|
| 306 | + } ?>/> |
|
| 307 | 307 | <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 308 | 308 | |
| 309 | 309 | </div> |
| 310 | 310 | </li> |
| 311 | 311 | <?php |
| 312 | - } |
|
| 312 | + } |
|
| 313 | 313 | |
| 314 | 314 | |
| 315 | - // for_admin_use |
|
| 316 | - if(has_filter("geodir_cfa_for_admin_use_{$field_type}")){
|
|
| 315 | + // for_admin_use |
|
| 316 | + if(has_filter("geodir_cfa_for_admin_use_{$field_type}")){
|
|
| 317 | 317 | |
| 318 | - echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 318 | + echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 319 | 319 | |
| 320 | - }else{
|
|
| 321 | - $value = ''; |
|
| 322 | - if (isset($field_info->for_admin_use)) {
|
|
| 323 | - $value = esc_attr($field_info->for_admin_use); |
|
| 324 | - }elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){
|
|
| 325 | - $value = $cf['defaults']['for_admin_use']; |
|
| 326 | - } |
|
| 327 | - ?> |
|
| 320 | + }else{
|
|
| 321 | + $value = ''; |
|
| 322 | + if (isset($field_info->for_admin_use)) {
|
|
| 323 | + $value = esc_attr($field_info->for_admin_use); |
|
| 324 | + }elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){
|
|
| 325 | + $value = $cf['defaults']['for_admin_use']; |
|
| 326 | + } |
|
| 327 | + ?> |
|
| 328 | 328 | <li> |
| 329 | 329 | <label for="for_admin_use" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('For admin use only? :', 'geodirectory'); ?>
|
| 330 | 330 | <div class="gdcf-tooltip"> |
@@ -335,47 +335,47 @@ discard block |
||
| 335 | 335 | |
| 336 | 336 | <input type="radio" id="for_admin_use_yes<?php echo $radio_id;?>" name="for_admin_use" class="gdri-enabled" value="1" |
| 337 | 337 | <?php if ($value == '1') {
|
| 338 | - echo 'checked'; |
|
| 339 | - } ?>/> |
|
| 338 | + echo 'checked'; |
|
| 339 | + } ?>/> |
|
| 340 | 340 | <label for="for_admin_use_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 341 | 341 | |
| 342 | 342 | <input type="radio" id="for_admin_use_no<?php echo $radio_id;?>" name="for_admin_use" class="gdri-disabled" value="0" |
| 343 | 343 | <?php if ($value == '0' || !$value) {
|
| 344 | - echo 'checked'; |
|
| 345 | - } ?>/> |
|
| 344 | + echo 'checked'; |
|
| 345 | + } ?>/> |
|
| 346 | 346 | <label for="for_admin_use_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 347 | 347 | |
| 348 | 348 | </div> |
| 349 | 349 | </li> |
| 350 | 350 | <?php |
| 351 | - } |
|
| 351 | + } |
|
| 352 | 352 | |
| 353 | 353 | |
| 354 | - // default_value |
|
| 355 | - if(has_filter("geodir_cfa_default_value_{$field_type}")){
|
|
| 354 | + // default_value |
|
| 355 | + if(has_filter("geodir_cfa_default_value_{$field_type}")){
|
|
| 356 | 356 | |
| 357 | - echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 357 | + echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 358 | 358 | |
| 359 | - }else{
|
|
| 360 | - $value = ''; |
|
| 361 | - if (isset($field_info->default_value)) {
|
|
| 362 | - $value = esc_attr($field_info->default_value); |
|
| 363 | - }elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){
|
|
| 364 | - $value = $cf['defaults']['default_value']; |
|
| 365 | - } |
|
| 366 | - ?> |
|
| 359 | + }else{
|
|
| 360 | + $value = ''; |
|
| 361 | + if (isset($field_info->default_value)) {
|
|
| 362 | + $value = esc_attr($field_info->default_value); |
|
| 363 | + }elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){
|
|
| 364 | + $value = $cf['defaults']['default_value']; |
|
| 365 | + } |
|
| 366 | + ?> |
|
| 367 | 367 | <li> |
| 368 | 368 | <label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory');?>
|
| 369 | 369 | <div class="gdcf-tooltip"> |
| 370 | 370 | <?php |
| 371 | - if ($field_type == 'checkbox') {
|
|
| 372 | - _e('Should the checkbox be checked by default?', 'geodirectory');
|
|
| 373 | - } else if ($field_type == 'email') {
|
|
| 374 | - _e('A default value for the field, usually blank. Ex: [email protected]', 'geodirectory');
|
|
| 375 | - } else {
|
|
| 376 | - _e('A default value for the field, usually blank. (for "link" this will be used as the link text)', 'geodirectory');
|
|
| 377 | - } |
|
| 378 | - ?> |
|
| 371 | + if ($field_type == 'checkbox') {
|
|
| 372 | + _e('Should the checkbox be checked by default?', 'geodirectory');
|
|
| 373 | + } else if ($field_type == 'email') {
|
|
| 374 | + _e('A default value for the field, usually blank. Ex: [email protected]', 'geodirectory');
|
|
| 375 | + } else {
|
|
| 376 | + _e('A default value for the field, usually blank. (for "link" this will be used as the link text)', 'geodirectory');
|
|
| 377 | + } |
|
| 378 | + ?> |
|
| 379 | 379 | </div> |
| 380 | 380 | </label> |
| 381 | 381 | <div class="gd-cf-input-wrap"> |
@@ -392,22 +392,22 @@ discard block |
||
| 392 | 392 | </div> |
| 393 | 393 | </li> |
| 394 | 394 | <?php |
| 395 | - } |
|
| 395 | + } |
|
| 396 | 396 | |
| 397 | 397 | |
| 398 | - // show_in |
|
| 399 | - if(has_filter("geodir_cfa_show_in_{$field_type}")){
|
|
| 398 | + // show_in |
|
| 399 | + if(has_filter("geodir_cfa_show_in_{$field_type}")){
|
|
| 400 | 400 | |
| 401 | - echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 401 | + echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 402 | 402 | |
| 403 | - }else{
|
|
| 404 | - $value = ''; |
|
| 405 | - if (isset($field_info->show_in)) {
|
|
| 406 | - $value = esc_attr($field_info->show_in); |
|
| 407 | - }elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){
|
|
| 408 | - $value = esc_attr($cf['defaults']['show_in']); |
|
| 409 | - } |
|
| 410 | - ?> |
|
| 403 | + }else{
|
|
| 404 | + $value = ''; |
|
| 405 | + if (isset($field_info->show_in)) {
|
|
| 406 | + $value = esc_attr($field_info->show_in); |
|
| 407 | + }elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){
|
|
| 408 | + $value = esc_attr($cf['defaults']['show_in']); |
|
| 409 | + } |
|
| 410 | + ?> |
|
| 411 | 411 | <li> |
| 412 | 412 | <label for="show_in" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show in what locations?:', 'geodirectory'); ?>
|
| 413 | 413 | <div class="gdcf-tooltip"> |
@@ -418,41 +418,41 @@ discard block |
||
| 418 | 418 | |
| 419 | 419 | <?php |
| 420 | 420 | |
| 421 | - /* |
|
| 421 | + /* |
|
| 422 | 422 | * We wrap the key values in [] so we can search the DB easier with a LIKE query. |
| 423 | 423 | */ |
| 424 | - $show_in_locations = array( |
|
| 425 | - "[detail]" => __("Details page sidebar", 'geodirectory'),
|
|
| 426 | - "[moreinfo]" => __("More info tab", 'geodirectory'),
|
|
| 427 | - "[listing]" => __("Listings page", 'geodirectory'),
|
|
| 428 | - "[owntab]" => __("Details page own tab", 'geodirectory'),
|
|
| 429 | - "[mapbubble]" => __("Map bubble", 'geodirectory'),
|
|
| 430 | - ); |
|
| 431 | - |
|
| 432 | - /** |
|
| 433 | - * Filter the locations array for where to display custom fields. |
|
| 434 | - * |
|
| 435 | - * @since 1.6.6 |
|
| 436 | - * @param array $show_in_locations The array of locations and descriptions. |
|
| 437 | - * @param object $field_info The field being displayed info. |
|
| 438 | - * @param string $field_info The type of field. |
|
| 439 | - */ |
|
| 440 | - $show_in_locations = apply_filters('geodir_show_in_locations',$show_in_locations,$field_info,$field_type);
|
|
| 441 | - |
|
| 442 | - |
|
| 443 | - // remove some locations for some field types |
|
| 444 | - |
|
| 445 | - // don't show new tab option for some types |
|
| 446 | - if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 447 | - }else{
|
|
| 448 | - unset($show_in_locations['[owntab]']); |
|
| 449 | - } |
|
| 450 | - |
|
| 451 | - if(!$display_on_listing){
|
|
| 452 | - unset($show_in_locations['[listings]']); |
|
| 453 | - } |
|
| 454 | - |
|
| 455 | - ?> |
|
| 424 | + $show_in_locations = array( |
|
| 425 | + "[detail]" => __("Details page sidebar", 'geodirectory'),
|
|
| 426 | + "[moreinfo]" => __("More info tab", 'geodirectory'),
|
|
| 427 | + "[listing]" => __("Listings page", 'geodirectory'),
|
|
| 428 | + "[owntab]" => __("Details page own tab", 'geodirectory'),
|
|
| 429 | + "[mapbubble]" => __("Map bubble", 'geodirectory'),
|
|
| 430 | + ); |
|
| 431 | + |
|
| 432 | + /** |
|
| 433 | + * Filter the locations array for where to display custom fields. |
|
| 434 | + * |
|
| 435 | + * @since 1.6.6 |
|
| 436 | + * @param array $show_in_locations The array of locations and descriptions. |
|
| 437 | + * @param object $field_info The field being displayed info. |
|
| 438 | + * @param string $field_info The type of field. |
|
| 439 | + */ |
|
| 440 | + $show_in_locations = apply_filters('geodir_show_in_locations',$show_in_locations,$field_info,$field_type);
|
|
| 441 | + |
|
| 442 | + |
|
| 443 | + // remove some locations for some field types |
|
| 444 | + |
|
| 445 | + // don't show new tab option for some types |
|
| 446 | + if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 447 | + }else{
|
|
| 448 | + unset($show_in_locations['[owntab]']); |
|
| 449 | + } |
|
| 450 | + |
|
| 451 | + if(!$display_on_listing){
|
|
| 452 | + unset($show_in_locations['[listings]']); |
|
| 453 | + } |
|
| 454 | + |
|
| 455 | + ?> |
|
| 456 | 456 | |
| 457 | 457 | <select multiple="multiple" name="show_in[]" |
| 458 | 458 | id="show_in" |
@@ -462,38 +462,38 @@ discard block |
||
| 462 | 462 | option-ajaxchosen="false"> |
| 463 | 463 | <?php |
| 464 | 464 | |
| 465 | - $show_in_values = explode(',',$value);
|
|
| 465 | + $show_in_values = explode(',',$value);
|
|
| 466 | 466 | |
| 467 | - foreach( $show_in_locations as $key => $val){
|
|
| 468 | - $selected = ''; |
|
| 467 | + foreach( $show_in_locations as $key => $val){
|
|
| 468 | + $selected = ''; |
|
| 469 | 469 | |
| 470 | - if(is_array($show_in_values) && in_array($key,$show_in_values ) ){
|
|
| 471 | - $selected = 'selected'; |
|
| 472 | - } |
|
| 470 | + if(is_array($show_in_values) && in_array($key,$show_in_values ) ){
|
|
| 471 | + $selected = 'selected'; |
|
| 472 | + } |
|
| 473 | 473 | |
| 474 | - ?> |
|
| 474 | + ?> |
|
| 475 | 475 | <option value="<?php echo $key;?>" <?php echo $selected;?>><?php echo $val;?></option> |
| 476 | 476 | <?php |
| 477 | - } |
|
| 478 | - ?> |
|
| 477 | + } |
|
| 478 | + ?> |
|
| 479 | 479 | </select> |
| 480 | 480 | </div> |
| 481 | 481 | </li> |
| 482 | 482 | <?php |
| 483 | - } |
|
| 483 | + } |
|
| 484 | 484 | |
| 485 | 485 | |
| 486 | - // advanced_editor |
|
| 487 | - if(has_filter("geodir_cfa_advanced_editor_{$field_type}")){
|
|
| 486 | + // advanced_editor |
|
| 487 | + if(has_filter("geodir_cfa_advanced_editor_{$field_type}")){
|
|
| 488 | 488 | |
| 489 | - echo apply_filters("geodir_cfa_advanced_editor_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 489 | + echo apply_filters("geodir_cfa_advanced_editor_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 490 | 490 | |
| 491 | - } |
|
| 491 | + } |
|
| 492 | 492 | |
| 493 | 493 | |
| 494 | 494 | |
| 495 | 495 | |
| 496 | - ?> |
|
| 496 | + ?> |
|
| 497 | 497 | |
| 498 | 498 | |
| 499 | 499 | <?php // @todo this does not seem to be used for anything, it can be removed or replaced ?> |
@@ -506,38 +506,38 @@ discard block |
||
| 506 | 506 | |
| 507 | 507 | <?php |
| 508 | 508 | |
| 509 | - $pricearr = array(); |
|
| 510 | - if (isset($field_info->packages) && $field_info->packages != '') {
|
|
| 511 | - $pricearr = explode(',', trim($field_info->packages, ','));
|
|
| 512 | - } else {
|
|
| 513 | - $package_info = array(); |
|
| 509 | + $pricearr = array(); |
|
| 510 | + if (isset($field_info->packages) && $field_info->packages != '') {
|
|
| 511 | + $pricearr = explode(',', trim($field_info->packages, ','));
|
|
| 512 | + } else {
|
|
| 513 | + $package_info = array(); |
|
| 514 | 514 | |
| 515 | - $package_info = geodir_post_package_info($package_info, '', $post_type); |
|
| 516 | - $pricearr[] = $package_info->pid; |
|
| 517 | - } |
|
| 515 | + $package_info = geodir_post_package_info($package_info, '', $post_type); |
|
| 516 | + $pricearr[] = $package_info->pid; |
|
| 517 | + } |
|
| 518 | 518 | |
| 519 | - ob_start() |
|
| 520 | - ?> |
|
| 519 | + ob_start() |
|
| 520 | + ?> |
|
| 521 | 521 | |
| 522 | 522 | <select style="display:none" name="show_on_pkg[]" id="show_on_pkg" multiple="multiple"> |
| 523 | 523 | <?php |
| 524 | - if (!empty($pricearr)) {
|
|
| 525 | - foreach ($pricearr as $val) {
|
|
| 526 | - ?> |
|
| 524 | + if (!empty($pricearr)) {
|
|
| 525 | + foreach ($pricearr as $val) {
|
|
| 526 | + ?> |
|
| 527 | 527 | <option selected="selected" value="<?php echo esc_attr($val); ?>" ><?php echo $val; ?></option><?php |
| 528 | - } |
|
| 529 | - } |
|
| 530 | - ?> |
|
| 528 | + } |
|
| 529 | + } |
|
| 530 | + ?> |
|
| 531 | 531 | </select> |
| 532 | 532 | |
| 533 | 533 | <?php |
| 534 | - $html = ob_get_clean(); |
|
| 534 | + $html = ob_get_clean(); |
|
| 535 | 535 | |
| 536 | 536 | /** |
| 537 | 537 | * Filter the price packages list. |
| 538 | 538 | * |
| 539 | 539 | * Filter the price packages list in custom field form in admin |
| 540 | - * custom fields settings. |
|
| 540 | + * custom fields settings. |
|
| 541 | 541 | * |
| 542 | 542 | * @since 1.0.0 |
| 543 | 543 | * |
@@ -546,25 +546,25 @@ discard block |
||
| 546 | 546 | */ |
| 547 | 547 | echo $html = apply_filters('geodir_packages_list_on_custom_fields', $html, $field_info);
|
| 548 | 548 | |
| 549 | - ?> |
|
| 549 | + ?> |
|
| 550 | 550 | |
| 551 | 551 | |
| 552 | 552 | |
| 553 | 553 | <?php |
| 554 | 554 | |
| 555 | - // is_required |
|
| 556 | - if(has_filter("geodir_cfa_is_required_{$field_type}")){
|
|
| 555 | + // is_required |
|
| 556 | + if(has_filter("geodir_cfa_is_required_{$field_type}")){
|
|
| 557 | 557 | |
| 558 | - echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 558 | + echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 559 | 559 | |
| 560 | - }else{
|
|
| 561 | - $value = ''; |
|
| 562 | - if (isset($field_info->is_required)) {
|
|
| 563 | - $value = esc_attr($field_info->is_required); |
|
| 564 | - }elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){
|
|
| 565 | - $value = $cf['defaults']['is_required']; |
|
| 566 | - } |
|
| 567 | - ?> |
|
| 560 | + }else{
|
|
| 561 | + $value = ''; |
|
| 562 | + if (isset($field_info->is_required)) {
|
|
| 563 | + $value = esc_attr($field_info->is_required); |
|
| 564 | + }elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){
|
|
| 565 | + $value = $cf['defaults']['is_required']; |
|
| 566 | + } |
|
| 567 | + ?> |
|
| 568 | 568 | <li> |
| 569 | 569 | <label for="is_required" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is required :', 'geodirectory'); ?>
|
| 570 | 570 | <div class="gdcf-tooltip"> |
@@ -576,14 +576,14 @@ discard block |
||
| 576 | 576 | |
| 577 | 577 | <input type="radio" id="is_required_yes<?php echo $radio_id;?>" name="is_required" class="gdri-enabled" value="1" |
| 578 | 578 | <?php if ($value == '1') {
|
| 579 | - echo 'checked'; |
|
| 580 | - } ?>/> |
|
| 579 | + echo 'checked'; |
|
| 580 | + } ?>/> |
|
| 581 | 581 | <label onclick="show_hide_radio(this,'show','cf-is-required-msg');" for="is_required_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 582 | 582 | |
| 583 | 583 | <input type="radio" id="is_required_no<?php echo $radio_id;?>" name="is_required" class="gdri-disabled" value="0" |
| 584 | 584 | <?php if ($value == '0' || !$value) {
|
| 585 | - echo 'checked'; |
|
| 586 | - } ?>/> |
|
| 585 | + echo 'checked'; |
|
| 586 | + } ?>/> |
|
| 587 | 587 | <label onclick="show_hide_radio(this,'hide','cf-is-required-msg');" for="is_required_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 588 | 588 | |
| 589 | 589 | </div> |
@@ -591,21 +591,21 @@ discard block |
||
| 591 | 591 | </li> |
| 592 | 592 | |
| 593 | 593 | <?php |
| 594 | - } |
|
| 594 | + } |
|
| 595 | 595 | |
| 596 | - // required_msg |
|
| 597 | - if(has_filter("geodir_cfa_required_msg_{$field_type}")){
|
|
| 596 | + // required_msg |
|
| 597 | + if(has_filter("geodir_cfa_required_msg_{$field_type}")){
|
|
| 598 | 598 | |
| 599 | - echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 599 | + echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 600 | 600 | |
| 601 | - }else{
|
|
| 602 | - $value = ''; |
|
| 603 | - if (isset($field_info->required_msg)) {
|
|
| 604 | - $value = esc_attr($field_info->required_msg); |
|
| 605 | - }elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){
|
|
| 606 | - $value = $cf['defaults']['required_msg']; |
|
| 607 | - } |
|
| 608 | - ?> |
|
| 601 | + }else{
|
|
| 602 | + $value = ''; |
|
| 603 | + if (isset($field_info->required_msg)) {
|
|
| 604 | + $value = esc_attr($field_info->required_msg); |
|
| 605 | + }elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){
|
|
| 606 | + $value = $cf['defaults']['required_msg']; |
|
| 607 | + } |
|
| 608 | + ?> |
|
| 609 | 609 | <li class="cf-is-required-msg" <?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'";}?>>
|
| 610 | 610 | <label for="required_msg" class="gd-cf-tooltip-wrap"> |
| 611 | 611 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Required message:', 'geodirectory'); ?>
|
@@ -619,38 +619,38 @@ discard block |
||
| 619 | 619 | </div> |
| 620 | 620 | </li> |
| 621 | 621 | <?php |
| 622 | - } |
|
| 622 | + } |
|
| 623 | 623 | |
| 624 | 624 | |
| 625 | - // required_msg |
|
| 626 | - if(has_filter("geodir_cfa_validation_pattern_{$field_type}")){
|
|
| 625 | + // required_msg |
|
| 626 | + if(has_filter("geodir_cfa_validation_pattern_{$field_type}")){
|
|
| 627 | 627 | |
| 628 | - echo apply_filters("geodir_cfa_validation_pattern_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 628 | + echo apply_filters("geodir_cfa_validation_pattern_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 629 | 629 | |
| 630 | - } |
|
| 630 | + } |
|
| 631 | 631 | |
| 632 | 632 | |
| 633 | - // extra_fields |
|
| 634 | - if(has_filter("geodir_cfa_extra_fields_{$field_type}")){
|
|
| 633 | + // extra_fields |
|
| 634 | + if(has_filter("geodir_cfa_extra_fields_{$field_type}")){
|
|
| 635 | 635 | |
| 636 | - echo apply_filters("geodir_cfa_extra_fields_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 636 | + echo apply_filters("geodir_cfa_extra_fields_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 637 | 637 | |
| 638 | - } |
|
| 638 | + } |
|
| 639 | 639 | |
| 640 | 640 | |
| 641 | - // field_icon |
|
| 642 | - if(has_filter("geodir_cfa_field_icon_{$field_type}")){
|
|
| 641 | + // field_icon |
|
| 642 | + if(has_filter("geodir_cfa_field_icon_{$field_type}")){
|
|
| 643 | 643 | |
| 644 | - echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 644 | + echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 645 | 645 | |
| 646 | - }else{
|
|
| 647 | - $value = ''; |
|
| 648 | - if (isset($field_info->field_icon)) {
|
|
| 649 | - $value = esc_attr($field_info->field_icon); |
|
| 650 | - }elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){
|
|
| 651 | - $value = $cf['defaults']['field_icon']; |
|
| 652 | - } |
|
| 653 | - ?> |
|
| 646 | + }else{
|
|
| 647 | + $value = ''; |
|
| 648 | + if (isset($field_info->field_icon)) {
|
|
| 649 | + $value = esc_attr($field_info->field_icon); |
|
| 650 | + }elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){
|
|
| 651 | + $value = $cf['defaults']['field_icon']; |
|
| 652 | + } |
|
| 653 | + ?> |
|
| 654 | 654 | <li> |
| 655 | 655 | <h3><?php echo __('Custom css', 'geodirectory'); ?></h3>
|
| 656 | 656 | |
@@ -668,22 +668,22 @@ discard block |
||
| 668 | 668 | |
| 669 | 669 | </li> |
| 670 | 670 | <?php |
| 671 | - } |
|
| 671 | + } |
|
| 672 | 672 | |
| 673 | 673 | |
| 674 | - // css_class |
|
| 675 | - if(has_filter("geodir_cfa_css_class_{$field_type}")){
|
|
| 674 | + // css_class |
|
| 675 | + if(has_filter("geodir_cfa_css_class_{$field_type}")){
|
|
| 676 | 676 | |
| 677 | - echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 677 | + echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 678 | 678 | |
| 679 | - }else{
|
|
| 680 | - $value = ''; |
|
| 681 | - if (isset($field_info->css_class)) {
|
|
| 682 | - $value = esc_attr($field_info->css_class); |
|
| 683 | - }elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){
|
|
| 684 | - $value = $cf['defaults']['css_class']; |
|
| 685 | - } |
|
| 686 | - ?> |
|
| 679 | + }else{
|
|
| 680 | + $value = ''; |
|
| 681 | + if (isset($field_info->css_class)) {
|
|
| 682 | + $value = esc_attr($field_info->css_class); |
|
| 683 | + }elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){
|
|
| 684 | + $value = $cf['defaults']['css_class']; |
|
| 685 | + } |
|
| 686 | + ?> |
|
| 687 | 687 | <li> |
| 688 | 688 | |
| 689 | 689 | <label for="css_class" class="gd-cf-tooltip-wrap"> |
@@ -696,47 +696,47 @@ discard block |
||
| 696 | 696 | <div class="gd-cf-input-wrap"> |
| 697 | 697 | <input type="text" name="css_class" id="css_class" |
| 698 | 698 | value="<?php if (isset($field_info->css_class)) {
|
| 699 | - echo esc_attr($field_info->css_class); |
|
| 700 | - }?>"/> |
|
| 699 | + echo esc_attr($field_info->css_class); |
|
| 700 | + }?>"/> |
|
| 701 | 701 | </div> |
| 702 | 702 | </li> |
| 703 | 703 | <?php |
| 704 | - } |
|
| 704 | + } |
|
| 705 | 705 | |
| 706 | 706 | |
| 707 | - // cat_sort |
|
| 708 | - if(has_filter("geodir_cfa_cat_sort_{$field_type}")){
|
|
| 707 | + // cat_sort |
|
| 708 | + if(has_filter("geodir_cfa_cat_sort_{$field_type}")){
|
|
| 709 | 709 | |
| 710 | - echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 710 | + echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 711 | 711 | |
| 712 | - }else{
|
|
| 713 | - $value = ''; |
|
| 714 | - $hide_cat_sort =''; |
|
| 715 | - if (isset($field_info->cat_sort)) {
|
|
| 716 | - $value = esc_attr($field_info->cat_sort); |
|
| 717 | - }elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){
|
|
| 718 | - $value = $cf['defaults']['cat_sort']; |
|
| 719 | - $hide_cat_sort = ($value===false) ? "style='display:none;'" : ''; |
|
| 720 | - } |
|
| 712 | + }else{
|
|
| 713 | + $value = ''; |
|
| 714 | + $hide_cat_sort =''; |
|
| 715 | + if (isset($field_info->cat_sort)) {
|
|
| 716 | + $value = esc_attr($field_info->cat_sort); |
|
| 717 | + }elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){
|
|
| 718 | + $value = $cf['defaults']['cat_sort']; |
|
| 719 | + $hide_cat_sort = ($value===false) ? "style='display:none;'" : ''; |
|
| 720 | + } |
|
| 721 | 721 | |
| 722 | - $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']===false) ? "style='display:none;'" : ''; |
|
| 723 | - ?> |
|
| 722 | + $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']===false) ? "style='display:none;'" : ''; |
|
| 723 | + ?> |
|
| 724 | 724 | <li <?php echo $hide_cat_sort ;?>> |
| 725 | 725 | <h3><?php |
| 726 | - /** |
|
| 727 | - * Filter the section title. |
|
| 728 | - * |
|
| 729 | - * Filter the section title in custom field form in admin |
|
| 730 | - * custom fields settings. |
|
| 731 | - * |
|
| 732 | - * @since 1.0.0 |
|
| 733 | - * |
|
| 734 | - * @param string $title Title of the section. |
|
| 735 | - * @param string $field_type Current field type. |
|
| 736 | - */ |
|
| 737 | - echo apply_filters('geodir_advance_custom_fields_heading', __('Posts sort options', 'geodirectory'), $field_type);
|
|
| 738 | - |
|
| 739 | - ?></h3> |
|
| 726 | + /** |
|
| 727 | + * Filter the section title. |
|
| 728 | + * |
|
| 729 | + * Filter the section title in custom field form in admin |
|
| 730 | + * custom fields settings. |
|
| 731 | + * |
|
| 732 | + * @since 1.0.0 |
|
| 733 | + * |
|
| 734 | + * @param string $title Title of the section. |
|
| 735 | + * @param string $field_type Current field type. |
|
| 736 | + */ |
|
| 737 | + echo apply_filters('geodir_advance_custom_fields_heading', __('Posts sort options', 'geodirectory'), $field_type);
|
|
| 738 | + |
|
| 739 | + ?></h3> |
|
| 740 | 740 | <label for="cat_sort" class="gd-cf-tooltip-wrap"> |
| 741 | 741 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Include this field in sorting options :', 'geodirectory'); ?>
|
| 742 | 742 | <div class="gdcf-tooltip"> |
@@ -748,42 +748,42 @@ discard block |
||
| 748 | 748 | |
| 749 | 749 | <input type="radio" id="cat_sort_yes<?php echo $radio_id;?>" name="cat_sort" class="gdri-enabled" value="1" |
| 750 | 750 | <?php if ($value == '1') {
|
| 751 | - echo 'checked'; |
|
| 752 | - } ?>/> |
|
| 751 | + echo 'checked'; |
|
| 752 | + } ?>/> |
|
| 753 | 753 | <label for="cat_sort_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 754 | 754 | |
| 755 | 755 | <input type="radio" id="cat_sort_no<?php echo $radio_id;?>" name="cat_sort" class="gdri-disabled" value="0" |
| 756 | 756 | <?php if (!$value) {
|
| 757 | - echo 'checked'; |
|
| 758 | - } ?>/> |
|
| 757 | + echo 'checked'; |
|
| 758 | + } ?>/> |
|
| 759 | 759 | <label for="cat_sort_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 760 | 760 | |
| 761 | 761 | </div> |
| 762 | 762 | </li> |
| 763 | 763 | <?php |
| 764 | - } |
|
| 765 | - |
|
| 766 | - |
|
| 767 | - |
|
| 768 | - switch ($field_type): |
|
| 769 | - case 'html': |
|
| 770 | - case 'file': |
|
| 771 | - case 'url': |
|
| 772 | - case 'fieldset': |
|
| 773 | - break; |
|
| 774 | - default: |
|
| 775 | - |
|
| 776 | - /** |
|
| 777 | - * Called at the end of the advanced custom fields settings page loop. |
|
| 778 | - * |
|
| 779 | - * Can be used to add or deal with different settings types. |
|
| 780 | - * |
|
| 781 | - * @since 1.0.0 |
|
| 782 | - * @since 1.6.6 $cf param added. |
|
| 783 | - * @param object $field_info The current fields info. |
|
| 784 | - * @param array $cf The custom field settings |
|
| 785 | - */ |
|
| 786 | - do_action('geodir_advance_custom_fields', $field_info,$cf);?>
|
|
| 764 | + } |
|
| 765 | + |
|
| 766 | + |
|
| 767 | + |
|
| 768 | + switch ($field_type): |
|
| 769 | + case 'html': |
|
| 770 | + case 'file': |
|
| 771 | + case 'url': |
|
| 772 | + case 'fieldset': |
|
| 773 | + break; |
|
| 774 | + default: |
|
| 775 | + |
|
| 776 | + /** |
|
| 777 | + * Called at the end of the advanced custom fields settings page loop. |
|
| 778 | + * |
|
| 779 | + * Can be used to add or deal with different settings types. |
|
| 780 | + * |
|
| 781 | + * @since 1.0.0 |
|
| 782 | + * @since 1.6.6 $cf param added. |
|
| 783 | + * @param object $field_info The current fields info. |
|
| 784 | + * @param array $cf The custom field settings |
|
| 785 | + */ |
|
| 786 | + do_action('geodir_advance_custom_fields', $field_info,$cf);?>
|
|
| 787 | 787 | |
| 788 | 788 | |
| 789 | 789 | <?php endswitch; ?> |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | function geodir_get_ajax_url() |
| 21 | 21 | {
|
| 22 | - return admin_url('admin-ajax.php?action=geodir_ajax_action');
|
|
| 22 | + return admin_url('admin-ajax.php?action=geodir_ajax_action');
|
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | ///////////////////// |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | add_filter('query_vars', 'geodir_add_geodir_page_var');
|
| 88 | 88 | add_action('wp', 'geodir_add_page_id_in_query_var'); // problem fix in wordpress 3.8
|
| 89 | 89 | if (get_option('permalink_structure') != '')
|
| 90 | - add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
|
|
| 90 | + add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
|
|
| 91 | 91 | |
| 92 | 92 | add_filter('parse_query', 'geodir_modified_query');
|
| 93 | 93 | |
@@ -154,14 +154,14 @@ discard block |
||
| 154 | 154 | /* POST AND LOOP ACTIONS */ |
| 155 | 155 | //////////////////////// |
| 156 | 156 | if (!is_admin()) {
|
| 157 | - add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtual page from everywhere
|
|
| 158 | - add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);
|
|
| 159 | - /** Exclude Virtual Pages From Pages List **/ |
|
| 160 | - add_action('pre_get_posts', 'set_listing_request', 0);
|
|
| 161 | - add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);
|
|
| 162 | - add_filter('excerpt_more', 'geodir_excerpt_more', 1000);
|
|
| 163 | - add_filter('excerpt_length', 'geodir_excerpt_length', 1000);
|
|
| 164 | - add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter
|
|
| 157 | + add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtual page from everywhere
|
|
| 158 | + add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);
|
|
| 159 | + /** Exclude Virtual Pages From Pages List **/ |
|
| 160 | + add_action('pre_get_posts', 'set_listing_request', 0);
|
|
| 161 | + add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);
|
|
| 162 | + add_filter('excerpt_more', 'geodir_excerpt_more', 1000);
|
|
| 163 | + add_filter('excerpt_length', 'geodir_excerpt_length', 1000);
|
|
| 164 | + add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter
|
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | |
@@ -223,12 +223,12 @@ discard block |
||
| 223 | 223 | */ |
| 224 | 224 | function geodir_unset_prev_theme_nav_location($newname) |
| 225 | 225 | {
|
| 226 | - $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);
|
|
| 227 | - if ($geodir_theme_location) {
|
|
| 228 | - update_option('geodir_theme_location_nav', $geodir_theme_location);
|
|
| 229 | - } else {
|
|
| 230 | - update_option('geodir_theme_location_nav', '');
|
|
| 231 | - } |
|
| 226 | + $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);
|
|
| 227 | + if ($geodir_theme_location) {
|
|
| 228 | + update_option('geodir_theme_location_nav', $geodir_theme_location);
|
|
| 229 | + } else {
|
|
| 230 | + update_option('geodir_theme_location_nav', '');
|
|
| 231 | + } |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | /// add action for theme switch to blank previous theme navigation location setting |
@@ -249,32 +249,32 @@ discard block |
||
| 249 | 249 | */ |
| 250 | 250 | function geodir_add_post_filters() |
| 251 | 251 | {
|
| 252 | - /** |
|
| 253 | - * Contains all function for filtering listing. |
|
| 254 | - * |
|
| 255 | - * @since 1.0.0 |
|
| 256 | - * @package GeoDirectory |
|
| 257 | - */ |
|
| 258 | - include_once('geodirectory-functions/listing_filters.php');
|
|
| 252 | + /** |
|
| 253 | + * Contains all function for filtering listing. |
|
| 254 | + * |
|
| 255 | + * @since 1.0.0 |
|
| 256 | + * @package GeoDirectory |
|
| 257 | + */ |
|
| 258 | + include_once('geodirectory-functions/listing_filters.php');
|
|
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | |
| 262 | 262 | if (!function_exists('geodir_init_defaults')) {
|
| 263 | - /** |
|
| 264 | - * Calls the function to register the GeoDirectory default CPT and taxonomies. |
|
| 265 | - * |
|
| 266 | - * @since 1.0.0 |
|
| 267 | - * @package GeoDirectory |
|
| 268 | - */ |
|
| 269 | - function geodir_init_defaults() |
|
| 270 | - {
|
|
| 271 | - if (function_exists('geodir_register_defaults')) {
|
|
| 263 | + /** |
|
| 264 | + * Calls the function to register the GeoDirectory default CPT and taxonomies. |
|
| 265 | + * |
|
| 266 | + * @since 1.0.0 |
|
| 267 | + * @package GeoDirectory |
|
| 268 | + */ |
|
| 269 | + function geodir_init_defaults() |
|
| 270 | + {
|
|
| 271 | + if (function_exists('geodir_register_defaults')) {
|
|
| 272 | 272 | |
| 273 | - geodir_register_defaults(); |
|
| 273 | + geodir_register_defaults(); |
|
| 274 | 274 | |
| 275 | - } |
|
| 275 | + } |
|
| 276 | 276 | |
| 277 | - } |
|
| 277 | + } |
|
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | |
@@ -296,26 +296,26 @@ discard block |
||
| 296 | 296 | // CALLED ON 'sidebars_widgets' FILTER |
| 297 | 297 | |
| 298 | 298 | if (!function_exists('geodir_restrict_widget')) {
|
| 299 | - /** |
|
| 300 | - * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page. |
|
| 301 | - * |
|
| 302 | - * @global bool $is_listing Sets the global value to true if on a GD category page. False if not. |
|
| 303 | - * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not. |
|
| 304 | - * @since 1.0.0 |
|
| 305 | - * @package GeoDirectory |
|
| 306 | - */ |
|
| 307 | - function geodir_restrict_widget() |
|
| 308 | - {
|
|
| 309 | - global $is_listing, $is_single_place; |
|
| 299 | + /** |
|
| 300 | + * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page. |
|
| 301 | + * |
|
| 302 | + * @global bool $is_listing Sets the global value to true if on a GD category page. False if not. |
|
| 303 | + * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not. |
|
| 304 | + * @since 1.0.0 |
|
| 305 | + * @package GeoDirectory |
|
| 306 | + */ |
|
| 307 | + function geodir_restrict_widget() |
|
| 308 | + {
|
|
| 309 | + global $is_listing, $is_single_place; |
|
| 310 | 310 | |
| 311 | - // set is listing |
|
| 312 | - (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;
|
|
| 311 | + // set is listing |
|
| 312 | + (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;
|
|
| 313 | 313 | |
| 314 | - // set is single place |
|
| 315 | - (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;
|
|
| 314 | + // set is single place |
|
| 315 | + (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;
|
|
| 316 | 316 | |
| 317 | 317 | |
| 318 | - } |
|
| 318 | + } |
|
| 319 | 319 | } |
| 320 | 320 | |
| 321 | 321 | |
@@ -336,31 +336,31 @@ discard block |
||
| 336 | 336 | */ |
| 337 | 337 | function geodir_detail_page_sidebar_content_sorting() |
| 338 | 338 | {
|
| 339 | - $arr_detail_page_sidebar_content = |
|
| 340 | - /** |
|
| 341 | - * An array of functions to be called to be displayed on the details (post) page sidebar. |
|
| 342 | - * |
|
| 343 | - * This filter can be used to remove sections of the details page sidebar, |
|
| 344 | - * add new sections or rearrange the order of the sections. |
|
| 345 | - * |
|
| 346 | - * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.
|
|
| 347 | - * @since 1.0.0 |
|
| 348 | - */ |
|
| 349 | - apply_filters('geodir_detail_page_sidebar_content',
|
|
| 350 | - array('geodir_social_sharing_buttons',
|
|
| 351 | - 'geodir_detail_page_google_analytics', |
|
| 352 | - 'geodir_edit_post_link', |
|
| 353 | - 'geodir_detail_page_review_rating', |
|
| 354 | - 'geodir_detail_page_more_info' |
|
| 355 | - ) // end of array |
|
| 356 | - ); // end of apply filter |
|
| 357 | - if (!empty($arr_detail_page_sidebar_content)) {
|
|
| 358 | - foreach ($arr_detail_page_sidebar_content as $content_function) {
|
|
| 359 | - if (function_exists($content_function)) {
|
|
| 360 | - add_action('geodir_detail_page_sidebar', $content_function);
|
|
| 361 | - } |
|
| 362 | - } |
|
| 363 | - } |
|
| 339 | + $arr_detail_page_sidebar_content = |
|
| 340 | + /** |
|
| 341 | + * An array of functions to be called to be displayed on the details (post) page sidebar. |
|
| 342 | + * |
|
| 343 | + * This filter can be used to remove sections of the details page sidebar, |
|
| 344 | + * add new sections or rearrange the order of the sections. |
|
| 345 | + * |
|
| 346 | + * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.
|
|
| 347 | + * @since 1.0.0 |
|
| 348 | + */ |
|
| 349 | + apply_filters('geodir_detail_page_sidebar_content',
|
|
| 350 | + array('geodir_social_sharing_buttons',
|
|
| 351 | + 'geodir_detail_page_google_analytics', |
|
| 352 | + 'geodir_edit_post_link', |
|
| 353 | + 'geodir_detail_page_review_rating', |
|
| 354 | + 'geodir_detail_page_more_info' |
|
| 355 | + ) // end of array |
|
| 356 | + ); // end of apply filter |
|
| 357 | + if (!empty($arr_detail_page_sidebar_content)) {
|
|
| 358 | + foreach ($arr_detail_page_sidebar_content as $content_function) {
|
|
| 359 | + if (function_exists($content_function)) {
|
|
| 360 | + add_action('geodir_detail_page_sidebar', $content_function);
|
|
| 361 | + } |
|
| 362 | + } |
|
| 363 | + } |
|
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | add_action('geodir_after_edit_post_link', 'geodir_add_to_favourite_link', 1);
|
@@ -375,14 +375,14 @@ discard block |
||
| 375 | 375 | */ |
| 376 | 376 | function geodir_add_to_favourite_link() |
| 377 | 377 | {
|
| 378 | - global $post, $preview; |
|
| 379 | - if (!$preview && geodir_is_page('detail')) {
|
|
| 380 | - ?> |
|
| 378 | + global $post, $preview; |
|
| 379 | + if (!$preview && geodir_is_page('detail')) {
|
|
| 380 | + ?> |
|
| 381 | 381 | <p class="edit_link"> |
| 382 | 382 | <?php geodir_favourite_html($post->post_author, $post->ID); ?> |
| 383 | 383 | </p> |
| 384 | 384 | <?php |
| 385 | - } |
|
| 385 | + } |
|
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | /** |
@@ -396,41 +396,41 @@ discard block |
||
| 396 | 396 | */ |
| 397 | 397 | function geodir_social_sharing_buttons() |
| 398 | 398 | {
|
| 399 | - global $preview; |
|
| 400 | - ob_start(); // Start buffering; |
|
| 401 | - /** |
|
| 402 | - * This action is called before the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 403 | - * |
|
| 404 | - * @since 1.0.0 |
|
| 405 | - */ |
|
| 406 | - do_action('geodir_before_social_sharing_buttons');
|
|
| 407 | - if (!$preview) {
|
|
| 408 | - ?> |
|
| 399 | + global $preview; |
|
| 400 | + ob_start(); // Start buffering; |
|
| 401 | + /** |
|
| 402 | + * This action is called before the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 403 | + * |
|
| 404 | + * @since 1.0.0 |
|
| 405 | + */ |
|
| 406 | + do_action('geodir_before_social_sharing_buttons');
|
|
| 407 | + if (!$preview) {
|
|
| 408 | + ?> |
|
| 409 | 409 | <div class="likethis"> |
| 410 | 410 | <?php geodir_twitter_tweet_button(); ?> |
| 411 | 411 | <?php geodir_fb_like_button(); ?> |
| 412 | 412 | <?php geodir_google_plus_button(); ?> |
| 413 | 413 | </div> |
| 414 | 414 | <?php |
| 415 | - }// end of if, if its a preview or not |
|
| 416 | - |
|
| 417 | - /** |
|
| 418 | - * This action is called after the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 419 | - * |
|
| 420 | - * @since 1.0.0 |
|
| 421 | - */ |
|
| 422 | - do_action('geodir_after_social_sharing_buttons');
|
|
| 423 | - $content_html = ob_get_clean(); |
|
| 424 | - if (trim($content_html) != '') |
|
| 425 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 426 | - if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
| 427 | - /** |
|
| 428 | - * Filter the geodir_social_sharing_buttons() function content. |
|
| 429 | - * |
|
| 430 | - * @param string $content_html The output html of the geodir_social_sharing_buttons() function. |
|
| 431 | - */ |
|
| 432 | - echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);
|
|
| 433 | - } |
|
| 415 | + }// end of if, if its a preview or not |
|
| 416 | + |
|
| 417 | + /** |
|
| 418 | + * This action is called after the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 419 | + * |
|
| 420 | + * @since 1.0.0 |
|
| 421 | + */ |
|
| 422 | + do_action('geodir_after_social_sharing_buttons');
|
|
| 423 | + $content_html = ob_get_clean(); |
|
| 424 | + if (trim($content_html) != '') |
|
| 425 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 426 | + if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
| 427 | + /** |
|
| 428 | + * Filter the geodir_social_sharing_buttons() function content. |
|
| 429 | + * |
|
| 430 | + * @param string $content_html The output html of the geodir_social_sharing_buttons() function. |
|
| 431 | + */ |
|
| 432 | + echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);
|
|
| 433 | + } |
|
| 434 | 434 | |
| 435 | 435 | |
| 436 | 436 | } |
@@ -448,46 +448,46 @@ discard block |
||
| 448 | 448 | */ |
| 449 | 449 | function geodir_edit_post_link() |
| 450 | 450 | {
|
| 451 | - global $post, $preview; |
|
| 452 | - ob_start(); // Start buffering; |
|
| 453 | - /** |
|
| 454 | - * This is called before the edit post link html in the function geodir_edit_post_link() |
|
| 455 | - * |
|
| 456 | - * @since 1.0.0 |
|
| 457 | - */ |
|
| 458 | - do_action('geodir_before_edit_post_link');
|
|
| 459 | - if (!$preview) {
|
|
| 460 | - $is_current_user_owner = geodir_listing_belong_to_current_user(); |
|
| 451 | + global $post, $preview; |
|
| 452 | + ob_start(); // Start buffering; |
|
| 453 | + /** |
|
| 454 | + * This is called before the edit post link html in the function geodir_edit_post_link() |
|
| 455 | + * |
|
| 456 | + * @since 1.0.0 |
|
| 457 | + */ |
|
| 458 | + do_action('geodir_before_edit_post_link');
|
|
| 459 | + if (!$preview) {
|
|
| 460 | + $is_current_user_owner = geodir_listing_belong_to_current_user(); |
|
| 461 | 461 | |
| 462 | - if ($is_current_user_owner) {
|
|
| 463 | - $post_id = $post->ID; |
|
| 462 | + if ($is_current_user_owner) {
|
|
| 463 | + $post_id = $post->ID; |
|
| 464 | 464 | |
| 465 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 466 | - $post_id = (int)$_REQUEST['pid']; |
|
| 467 | - } |
|
| 465 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 466 | + $post_id = (int)$_REQUEST['pid']; |
|
| 467 | + } |
|
| 468 | 468 | |
| 469 | - $postlink = get_permalink(geodir_add_listing_page_id()); |
|
| 470 | - $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);
|
|
| 471 | - echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';
|
|
| 472 | - } |
|
| 473 | - }// end of if, if its a preview or not |
|
| 474 | - /** |
|
| 475 | - * This is called after the edit post link html in the function geodir_edit_post_link() |
|
| 476 | - * |
|
| 477 | - * @since 1.0.0 |
|
| 478 | - */ |
|
| 479 | - do_action('geodir_after_edit_post_link');
|
|
| 480 | - $content_html = ob_get_clean(); |
|
| 481 | - if (trim($content_html) != '') |
|
| 482 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 483 | - if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
|
| 484 | - /** |
|
| 485 | - * Filter the geodir_edit_post_link() function content. |
|
| 486 | - * |
|
| 487 | - * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 488 | - */ |
|
| 489 | - echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);
|
|
| 490 | - } |
|
| 469 | + $postlink = get_permalink(geodir_add_listing_page_id()); |
|
| 470 | + $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);
|
|
| 471 | + echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';
|
|
| 472 | + } |
|
| 473 | + }// end of if, if its a preview or not |
|
| 474 | + /** |
|
| 475 | + * This is called after the edit post link html in the function geodir_edit_post_link() |
|
| 476 | + * |
|
| 477 | + * @since 1.0.0 |
|
| 478 | + */ |
|
| 479 | + do_action('geodir_after_edit_post_link');
|
|
| 480 | + $content_html = ob_get_clean(); |
|
| 481 | + if (trim($content_html) != '') |
|
| 482 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 483 | + if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
|
| 484 | + /** |
|
| 485 | + * Filter the geodir_edit_post_link() function content. |
|
| 486 | + * |
|
| 487 | + * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 488 | + */ |
|
| 489 | + echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);
|
|
| 490 | + } |
|
| 491 | 491 | } |
| 492 | 492 | |
| 493 | 493 | /** |
@@ -501,42 +501,42 @@ discard block |
||
| 501 | 501 | */ |
| 502 | 502 | function geodir_detail_page_google_analytics() |
| 503 | 503 | {
|
| 504 | - global $post,$preview; |
|
| 505 | - if($preview){return '';}
|
|
| 506 | - $package_info = array(); |
|
| 507 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 504 | + global $post,$preview; |
|
| 505 | + if($preview){return '';}
|
|
| 506 | + $package_info = array(); |
|
| 507 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 508 | 508 | |
| 509 | - $id = trim(get_option('geodir_ga_account_id'));
|
|
| 509 | + $id = trim(get_option('geodir_ga_account_id'));
|
|
| 510 | 510 | |
| 511 | - if (!$id) {
|
|
| 512 | - return; //if no Google Analytics ID then bail. |
|
| 513 | - } |
|
| 511 | + if (!$id) {
|
|
| 512 | + return; //if no Google Analytics ID then bail. |
|
| 513 | + } |
|
| 514 | 514 | |
| 515 | - ob_start(); // Start buffering; |
|
| 516 | - /** |
|
| 517 | - * This is called before the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 518 | - * |
|
| 519 | - * @since 1.0.0 |
|
| 520 | - */ |
|
| 521 | - do_action('geodir_before_google_analytics');
|
|
| 515 | + ob_start(); // Start buffering; |
|
| 516 | + /** |
|
| 517 | + * This is called before the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 518 | + * |
|
| 519 | + * @since 1.0.0 |
|
| 520 | + */ |
|
| 521 | + do_action('geodir_before_google_analytics');
|
|
| 522 | 522 | |
| 523 | - $refresh_time = get_option('geodir_ga_refresh_time', 5);
|
|
| 524 | - /** |
|
| 525 | - * Filter the time interval to check & refresh new users results. |
|
| 526 | - * |
|
| 527 | - * @since 1.5.9 |
|
| 528 | - * |
|
| 529 | - * @param int $refresh_time Time interval to check & refresh new users results. |
|
| 530 | - */ |
|
| 531 | - $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);
|
|
| 532 | - $refresh_time = absint($refresh_time * 1000); |
|
| 523 | + $refresh_time = get_option('geodir_ga_refresh_time', 5);
|
|
| 524 | + /** |
|
| 525 | + * Filter the time interval to check & refresh new users results. |
|
| 526 | + * |
|
| 527 | + * @since 1.5.9 |
|
| 528 | + * |
|
| 529 | + * @param int $refresh_time Time interval to check & refresh new users results. |
|
| 530 | + */ |
|
| 531 | + $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);
|
|
| 532 | + $refresh_time = absint($refresh_time * 1000); |
|
| 533 | 533 | |
| 534 | - $hide_refresh = get_option('geodir_ga_auto_refresh');
|
|
| 534 | + $hide_refresh = get_option('geodir_ga_auto_refresh');
|
|
| 535 | 535 | |
| 536 | - $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0; |
|
| 537 | - if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {
|
|
| 538 | - $page_url = urlencode($_SERVER['REQUEST_URI']); |
|
| 539 | - ?> |
|
| 536 | + $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0; |
|
| 537 | + if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {
|
|
| 538 | + $page_url = urlencode($_SERVER['REQUEST_URI']); |
|
| 539 | + ?> |
|
| 540 | 540 | <script type="text/javascript"> |
| 541 | 541 | var gd_gaTimeOut; |
| 542 | 542 | var gd_gaTime = parseInt('<?php echo $refresh_time;?>');
|
@@ -788,15 +788,15 @@ discard block |
||
| 788 | 788 | var labels = results[1].rows.map(function(row) { return +row[0]; });
|
| 789 | 789 | |
| 790 | 790 | <?php |
| 791 | - // Here we list the shorthand days of the week so it can be used in translation. |
|
| 792 | - __("Mon",'geodirectory');
|
|
| 793 | - __("Tue",'geodirectory');
|
|
| 794 | - __("Wed",'geodirectory');
|
|
| 795 | - __("Thu",'geodirectory');
|
|
| 796 | - __("Fri",'geodirectory');
|
|
| 797 | - __("Sat",'geodirectory');
|
|
| 798 | - __("Sun",'geodirectory');
|
|
| 799 | - ?> |
|
| 791 | + // Here we list the shorthand days of the week so it can be used in translation. |
|
| 792 | + __("Mon",'geodirectory');
|
|
| 793 | + __("Tue",'geodirectory');
|
|
| 794 | + __("Wed",'geodirectory');
|
|
| 795 | + __("Thu",'geodirectory');
|
|
| 796 | + __("Fri",'geodirectory');
|
|
| 797 | + __("Sat",'geodirectory');
|
|
| 798 | + __("Sun",'geodirectory');
|
|
| 799 | + ?> |
|
| 800 | 800 | |
| 801 | 801 | labels = [ |
| 802 | 802 | "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",
|
@@ -1045,24 +1045,24 @@ discard block |
||
| 1045 | 1045 | </span> |
| 1046 | 1046 | |
| 1047 | 1047 | <?php |
| 1048 | - } |
|
| 1049 | - /** |
|
| 1050 | - * This is called after the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 1051 | - * |
|
| 1052 | - * @since 1.0.0 |
|
| 1053 | - */ |
|
| 1054 | - do_action('geodir_after_google_analytics');
|
|
| 1055 | - $content_html = ob_get_clean(); |
|
| 1056 | - if (trim($content_html) != '') |
|
| 1057 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1058 | - if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
|
| 1059 | - /** |
|
| 1060 | - * Filter the geodir_edit_post_link() function content. |
|
| 1061 | - * |
|
| 1062 | - * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 1063 | - */ |
|
| 1064 | - echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);
|
|
| 1065 | - } |
|
| 1048 | + } |
|
| 1049 | + /** |
|
| 1050 | + * This is called after the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 1051 | + * |
|
| 1052 | + * @since 1.0.0 |
|
| 1053 | + */ |
|
| 1054 | + do_action('geodir_after_google_analytics');
|
|
| 1055 | + $content_html = ob_get_clean(); |
|
| 1056 | + if (trim($content_html) != '') |
|
| 1057 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1058 | + if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
|
| 1059 | + /** |
|
| 1060 | + * Filter the geodir_edit_post_link() function content. |
|
| 1061 | + * |
|
| 1062 | + * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 1063 | + */ |
|
| 1064 | + echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);
|
|
| 1065 | + } |
|
| 1066 | 1066 | } |
| 1067 | 1067 | |
| 1068 | 1068 | /** |
@@ -1079,94 +1079,94 @@ discard block |
||
| 1079 | 1079 | */ |
| 1080 | 1080 | function geodir_detail_page_review_rating() |
| 1081 | 1081 | {
|
| 1082 | - global $post, $preview, $post_images; |
|
| 1082 | + global $post, $preview, $post_images; |
|
| 1083 | 1083 | |
| 1084 | - if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int)$post->ID)) {
|
|
| 1085 | - return; |
|
| 1086 | - } |
|
| 1087 | - ob_start(); // Start buffering; |
|
| 1088 | - /** |
|
| 1089 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1090 | - * |
|
| 1091 | - * This is called outside the check for an actual rating and the check for preview page. |
|
| 1092 | - * |
|
| 1093 | - * @since 1.0.0 |
|
| 1094 | - */ |
|
| 1095 | - do_action('geodir_before_detail_page_review_rating');
|
|
| 1096 | - |
|
| 1097 | - $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1098 | - $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1099 | - |
|
| 1100 | - if ($post_avgratings != 0 && !$preview) {
|
|
| 1101 | - /** |
|
| 1102 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1103 | - * |
|
| 1104 | - * This is called inside the check for an actual rating and the check for preview page. |
|
| 1105 | - * |
|
| 1106 | - * @since 1.0.0 |
|
| 1107 | - * @param float $post_avgratings Average rating for the current post. |
|
| 1108 | - * @param int $post->ID Current post ID. |
|
| 1109 | - */ |
|
| 1110 | - do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1111 | - |
|
| 1112 | - $html = '<p style=" float:left;">'; |
|
| 1113 | - $html .= geodir_get_rating_stars($post_avgratings, $post->ID); |
|
| 1114 | - $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">'; |
|
| 1115 | - $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings; |
|
| 1084 | + if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int)$post->ID)) {
|
|
| 1085 | + return; |
|
| 1086 | + } |
|
| 1087 | + ob_start(); // Start buffering; |
|
| 1088 | + /** |
|
| 1089 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1090 | + * |
|
| 1091 | + * This is called outside the check for an actual rating and the check for preview page. |
|
| 1092 | + * |
|
| 1093 | + * @since 1.0.0 |
|
| 1094 | + */ |
|
| 1095 | + do_action('geodir_before_detail_page_review_rating');
|
|
| 1096 | + |
|
| 1097 | + $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1098 | + $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1099 | + |
|
| 1100 | + if ($post_avgratings != 0 && !$preview) {
|
|
| 1101 | + /** |
|
| 1102 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1103 | + * |
|
| 1104 | + * This is called inside the check for an actual rating and the check for preview page. |
|
| 1105 | + * |
|
| 1106 | + * @since 1.0.0 |
|
| 1107 | + * @param float $post_avgratings Average rating for the current post. |
|
| 1108 | + * @param int $post->ID Current post ID. |
|
| 1109 | + */ |
|
| 1110 | + do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1111 | + |
|
| 1112 | + $html = '<p style=" float:left;">'; |
|
| 1113 | + $html .= geodir_get_rating_stars($post_avgratings, $post->ID); |
|
| 1114 | + $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">'; |
|
| 1115 | + $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings; |
|
| 1116 | 1116 | |
| 1117 | 1117 | $reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');
|
| 1118 | 1118 | |
| 1119 | 1119 | $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';
|
| 1120 | 1120 | |
| 1121 | - $html .= '<span class="item">'; |
|
| 1122 | - $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>'; |
|
| 1121 | + $html .= '<span class="item">'; |
|
| 1122 | + $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>'; |
|
| 1123 | 1123 | |
| 1124 | - if ($post_images) {
|
|
| 1125 | - foreach ($post_images as $img) {
|
|
| 1126 | - $post_img = $img->src; |
|
| 1127 | - break; |
|
| 1128 | - } |
|
| 1129 | - } |
|
| 1130 | - |
|
| 1131 | - if (isset($post_img) && $post_img) {
|
|
| 1132 | - $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />'; |
|
| 1133 | - } |
|
| 1134 | - |
|
| 1135 | - $html .= '</span>'; |
|
| 1136 | - |
|
| 1137 | - echo $html .= '</div>'; |
|
| 1138 | - /** |
|
| 1139 | - * This is called after the rating html in the function geodir_detail_page_review_rating(). |
|
| 1140 | - * |
|
| 1141 | - * This is called inside the check for an actual rating and the check for preview page. |
|
| 1142 | - * |
|
| 1143 | - * @since 1.0.0 |
|
| 1144 | - * @param float $post_avgratings Average rating for the current post. |
|
| 1145 | - * @param int $post->ID Current post ID. |
|
| 1146 | - */ |
|
| 1147 | - do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1148 | - } |
|
| 1149 | - /** |
|
| 1150 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1151 | - * |
|
| 1152 | - * This is called outside the check for an actual rating and the check for preview page. |
|
| 1153 | - * |
|
| 1154 | - * @since 1.0.0 |
|
| 1155 | - */ |
|
| 1156 | - do_action('geodir_after_detail_page_review_rating');
|
|
| 1157 | - $content_html = ob_get_clean(); |
|
| 1158 | - if (trim($content_html) != '') {
|
|
| 1159 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>'; |
|
| 1160 | - } |
|
| 1161 | - if ((int)get_option('geodir_disable_rating_info_section') != 1) {
|
|
| 1162 | - /** |
|
| 1163 | - * Filter the geodir_detail_page_review_rating() function content. |
|
| 1164 | - * |
|
| 1165 | - * @since 1.0.0 |
|
| 1166 | - * @param string $content_html The output html of the geodir_detail_page_review_rating() function. |
|
| 1167 | - */ |
|
| 1168 | - echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);
|
|
| 1169 | - } |
|
| 1124 | + if ($post_images) {
|
|
| 1125 | + foreach ($post_images as $img) {
|
|
| 1126 | + $post_img = $img->src; |
|
| 1127 | + break; |
|
| 1128 | + } |
|
| 1129 | + } |
|
| 1130 | + |
|
| 1131 | + if (isset($post_img) && $post_img) {
|
|
| 1132 | + $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />'; |
|
| 1133 | + } |
|
| 1134 | + |
|
| 1135 | + $html .= '</span>'; |
|
| 1136 | + |
|
| 1137 | + echo $html .= '</div>'; |
|
| 1138 | + /** |
|
| 1139 | + * This is called after the rating html in the function geodir_detail_page_review_rating(). |
|
| 1140 | + * |
|
| 1141 | + * This is called inside the check for an actual rating and the check for preview page. |
|
| 1142 | + * |
|
| 1143 | + * @since 1.0.0 |
|
| 1144 | + * @param float $post_avgratings Average rating for the current post. |
|
| 1145 | + * @param int $post->ID Current post ID. |
|
| 1146 | + */ |
|
| 1147 | + do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1148 | + } |
|
| 1149 | + /** |
|
| 1150 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1151 | + * |
|
| 1152 | + * This is called outside the check for an actual rating and the check for preview page. |
|
| 1153 | + * |
|
| 1154 | + * @since 1.0.0 |
|
| 1155 | + */ |
|
| 1156 | + do_action('geodir_after_detail_page_review_rating');
|
|
| 1157 | + $content_html = ob_get_clean(); |
|
| 1158 | + if (trim($content_html) != '') {
|
|
| 1159 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>'; |
|
| 1160 | + } |
|
| 1161 | + if ((int)get_option('geodir_disable_rating_info_section') != 1) {
|
|
| 1162 | + /** |
|
| 1163 | + * Filter the geodir_detail_page_review_rating() function content. |
|
| 1164 | + * |
|
| 1165 | + * @since 1.0.0 |
|
| 1166 | + * @param string $content_html The output html of the geodir_detail_page_review_rating() function. |
|
| 1167 | + */ |
|
| 1168 | + echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);
|
|
| 1169 | + } |
|
| 1170 | 1170 | } |
| 1171 | 1171 | |
| 1172 | 1172 | /** |
@@ -1178,35 +1178,35 @@ discard block |
||
| 1178 | 1178 | */ |
| 1179 | 1179 | function geodir_detail_page_more_info() |
| 1180 | 1180 | {
|
| 1181 | - ob_start(); // Start buffering; |
|
| 1182 | - /** |
|
| 1183 | - * This is called before the info section html. |
|
| 1184 | - * |
|
| 1185 | - * @since 1.0.0 |
|
| 1186 | - */ |
|
| 1187 | - do_action('geodir_before_detail_page_more_info');
|
|
| 1188 | - if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {
|
|
| 1189 | - echo $geodir_post_detail_fields; |
|
| 1190 | - } |
|
| 1191 | - /** |
|
| 1192 | - * This is called after the info section html. |
|
| 1193 | - * |
|
| 1194 | - * @since 1.0.0 |
|
| 1195 | - */ |
|
| 1196 | - do_action('geodir_after_detail_page_more_info');
|
|
| 1197 | - |
|
| 1198 | - $content_html = ob_get_clean(); |
|
| 1199 | - if (trim($content_html) != '') |
|
| 1200 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1201 | - if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
|
| 1202 | - /** |
|
| 1203 | - * Filter the output html for function geodir_detail_page_more_info(). |
|
| 1204 | - * |
|
| 1205 | - * @since 1.0.0 |
|
| 1206 | - * @param string $content_html The output html of the geodir_detail_page_more_info() function. |
|
| 1207 | - */ |
|
| 1208 | - echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);
|
|
| 1209 | - } |
|
| 1181 | + ob_start(); // Start buffering; |
|
| 1182 | + /** |
|
| 1183 | + * This is called before the info section html. |
|
| 1184 | + * |
|
| 1185 | + * @since 1.0.0 |
|
| 1186 | + */ |
|
| 1187 | + do_action('geodir_before_detail_page_more_info');
|
|
| 1188 | + if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {
|
|
| 1189 | + echo $geodir_post_detail_fields; |
|
| 1190 | + } |
|
| 1191 | + /** |
|
| 1192 | + * This is called after the info section html. |
|
| 1193 | + * |
|
| 1194 | + * @since 1.0.0 |
|
| 1195 | + */ |
|
| 1196 | + do_action('geodir_after_detail_page_more_info');
|
|
| 1197 | + |
|
| 1198 | + $content_html = ob_get_clean(); |
|
| 1199 | + if (trim($content_html) != '') |
|
| 1200 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1201 | + if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
|
| 1202 | + /** |
|
| 1203 | + * Filter the output html for function geodir_detail_page_more_info(). |
|
| 1204 | + * |
|
| 1205 | + * @since 1.0.0 |
|
| 1206 | + * @param string $content_html The output html of the geodir_detail_page_more_info() function. |
|
| 1207 | + */ |
|
| 1208 | + echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);
|
|
| 1209 | + } |
|
| 1210 | 1210 | } |
| 1211 | 1211 | |
| 1212 | 1212 | |
@@ -1220,15 +1220,15 @@ discard block |
||
| 1220 | 1220 | */ |
| 1221 | 1221 | function geodir_localize_all_js_msg() |
| 1222 | 1222 | {// check_ajax_referer function is used to make sure no files are uploaded remotely but it will fail if used between https and non https so we do the check below of the urls
|
| 1223 | - if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1224 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 1225 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1226 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 1227 | - } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1228 | - $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 1229 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1230 | - $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 1231 | - } |
|
| 1223 | + if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1224 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 1225 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1226 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 1227 | + } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1228 | + $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 1229 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1230 | + $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 1231 | + } |
|
| 1232 | 1232 | |
| 1233 | 1233 | /** |
| 1234 | 1234 | * Filter the allowed image type extensions for post images. |
@@ -1238,60 +1238,60 @@ discard block |
||
| 1238 | 1238 | */ |
| 1239 | 1239 | $allowed_img_types = apply_filters('geodir_allowed_post_image_exts', array('jpg', 'jpeg', 'jpe', 'gif', 'png'));
|
| 1240 | 1240 | |
| 1241 | - $default_marker_icon = get_option('geodir_default_marker_icon');
|
|
| 1242 | - $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));
|
|
| 1243 | - $default_marker_width = $default_marker_size['w']; |
|
| 1244 | - $default_marker_height = $default_marker_size['h']; |
|
| 1241 | + $default_marker_icon = get_option('geodir_default_marker_icon');
|
|
| 1242 | + $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));
|
|
| 1243 | + $default_marker_width = $default_marker_size['w']; |
|
| 1244 | + $default_marker_height = $default_marker_size['h']; |
|
| 1245 | 1245 | |
| 1246 | - $arr_alert_msg = array( |
|
| 1247 | - 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 1248 | - 'geodir_admin_ajax_url' => $ajax_url, |
|
| 1249 | - 'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),
|
|
| 1250 | - 'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),
|
|
| 1251 | - 'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),
|
|
| 1252 | - 'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),
|
|
| 1253 | - //start not show alert msg |
|
| 1254 | - 'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),
|
|
| 1255 | - 'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),
|
|
| 1256 | - 'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),
|
|
| 1257 | - 'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),
|
|
| 1258 | - 'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),
|
|
| 1259 | - // end not show alert msg |
|
| 1260 | - 'my_place_listing_del' => __('Are you sure you wish to delete this listing?', 'geodirectory'),
|
|
| 1261 | - 'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),
|
|
| 1262 | - //start not show alert msg |
|
| 1263 | - 'rating_error_msg' => __('Error : please retry', 'geodirectory'),
|
|
| 1264 | - 'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),
|
|
| 1265 | - 'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),
|
|
| 1266 | - 'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),
|
|
| 1267 | - 'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),
|
|
| 1268 | - 'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),
|
|
| 1269 | - 'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),
|
|
| 1270 | - 'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),
|
|
| 1271 | - 'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),
|
|
| 1272 | - 'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),
|
|
| 1273 | - 'geodir_field_id_required' => __('This field is required.', 'geodirectory'),
|
|
| 1274 | - 'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),
|
|
| 1275 | - 'geodir_default_marker_icon' => $default_marker_icon, |
|
| 1276 | - 'geodir_default_marker_w' => $default_marker_width, |
|
| 1277 | - 'geodir_default_marker_h' => $default_marker_height, |
|
| 1278 | - 'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG, |
|
| 1279 | - 'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG, |
|
| 1280 | - 'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),
|
|
| 1281 | - 'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),
|
|
| 1282 | - 'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),
|
|
| 1283 | - 'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),
|
|
| 1284 | - 'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),
|
|
| 1285 | - 'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),
|
|
| 1286 | - /* on/off dragging for phone devices */ |
|
| 1287 | - 'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,
|
|
| 1288 | - 'geodir_is_mobile' => wp_is_mobile() ? true : false, |
|
| 1289 | - 'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),
|
|
| 1290 | - 'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),
|
|
| 1291 | - 'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),
|
|
| 1292 | - 'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),
|
|
| 1293 | - 'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),
|
|
| 1294 | - 'geodir_action_remove' => __('Remove', 'geodirectory'),
|
|
| 1246 | + $arr_alert_msg = array( |
|
| 1247 | + 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 1248 | + 'geodir_admin_ajax_url' => $ajax_url, |
|
| 1249 | + 'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),
|
|
| 1250 | + 'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),
|
|
| 1251 | + 'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),
|
|
| 1252 | + 'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),
|
|
| 1253 | + //start not show alert msg |
|
| 1254 | + 'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),
|
|
| 1255 | + 'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),
|
|
| 1256 | + 'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),
|
|
| 1257 | + 'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),
|
|
| 1258 | + 'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),
|
|
| 1259 | + // end not show alert msg |
|
| 1260 | + 'my_place_listing_del' => __('Are you sure you wish to delete this listing?', 'geodirectory'),
|
|
| 1261 | + 'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),
|
|
| 1262 | + //start not show alert msg |
|
| 1263 | + 'rating_error_msg' => __('Error : please retry', 'geodirectory'),
|
|
| 1264 | + 'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),
|
|
| 1265 | + 'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),
|
|
| 1266 | + 'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),
|
|
| 1267 | + 'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),
|
|
| 1268 | + 'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),
|
|
| 1269 | + 'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),
|
|
| 1270 | + 'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),
|
|
| 1271 | + 'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),
|
|
| 1272 | + 'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),
|
|
| 1273 | + 'geodir_field_id_required' => __('This field is required.', 'geodirectory'),
|
|
| 1274 | + 'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),
|
|
| 1275 | + 'geodir_default_marker_icon' => $default_marker_icon, |
|
| 1276 | + 'geodir_default_marker_w' => $default_marker_width, |
|
| 1277 | + 'geodir_default_marker_h' => $default_marker_height, |
|
| 1278 | + 'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG, |
|
| 1279 | + 'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG, |
|
| 1280 | + 'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),
|
|
| 1281 | + 'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),
|
|
| 1282 | + 'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),
|
|
| 1283 | + 'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),
|
|
| 1284 | + 'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),
|
|
| 1285 | + 'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),
|
|
| 1286 | + /* on/off dragging for phone devices */ |
|
| 1287 | + 'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,
|
|
| 1288 | + 'geodir_is_mobile' => wp_is_mobile() ? true : false, |
|
| 1289 | + 'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),
|
|
| 1290 | + 'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),
|
|
| 1291 | + 'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),
|
|
| 1292 | + 'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),
|
|
| 1293 | + 'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),
|
|
| 1294 | + 'geodir_action_remove' => __('Remove', 'geodirectory'),
|
|
| 1295 | 1295 | 'geodir_txt_all_files' => __('Allowed files', 'geodirectory'),
|
| 1296 | 1296 | 'geodir_err_file_type' => __('File type error. Allowed file types: %s', 'geodirectory'),
|
| 1297 | 1297 | 'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',
|
@@ -1299,40 +1299,40 @@ discard block |
||
| 1299 | 1299 | 'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),
|
| 1300 | 1300 | 'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',
|
| 1301 | 1301 | 'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',
|
| 1302 | - 'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,
|
|
| 1303 | - 'geodir_map_name' => geodir_map_name(), |
|
| 1304 | - 'osmStart' => __('Start', 'geodirectory'),
|
|
| 1305 | - 'osmVia' => __('Via {viaNumber}', 'geodirectory'),
|
|
| 1306 | - 'osmEnd' => __('Enter Your Location', 'geodirectory'),
|
|
| 1307 | - 'ga_delete_check' => __('Are you wish to Deauthorize and break Analytics?', 'geodirectory'),
|
|
| 1308 | - 'geoMyLocation' => __('My Location', 'geodirectory'),
|
|
| 1309 | - 'geoErrUNKNOWN_ERROR' => addslashes(__('Unable to find your location', 'geodirectory')),
|
|
| 1310 | - 'geoErrPERMISSION_DENINED' => addslashes(__('Permission denied in finding your location', 'geodirectory')),
|
|
| 1311 | - 'geoErrPOSITION_UNAVAILABLE' => addslashes(__('Your location is currently unknown', 'geodirectory')),
|
|
| 1312 | - 'geoErrBREAK' => addslashes(__('Attempt to find location took too long', 'geodirectory')),
|
|
| 1313 | - 'geoErrDEFAULT' => addslashes(__('Location detection not supported in browser', 'geodirectory')),
|
|
| 1314 | - ); |
|
| 1315 | - |
|
| 1316 | - /** |
|
| 1317 | - * Filters the translated JS strings from function geodir_localize_all_js_msg(). |
|
| 1318 | - * |
|
| 1319 | - * With this filter you can add, remove or change translated JS strings. |
|
| 1320 | - * You should add your own translations to this if you are building an addon rather than adding another script block. |
|
| 1321 | - * |
|
| 1322 | - * @since 1.0.0 |
|
| 1323 | - */ |
|
| 1324 | - $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);
|
|
| 1325 | - |
|
| 1326 | - foreach ($arr_alert_msg as $key => $value) {
|
|
| 1327 | - if (!is_scalar($value)) |
|
| 1328 | - continue; |
|
| 1329 | - $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8'); |
|
| 1330 | - } |
|
| 1302 | + 'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,
|
|
| 1303 | + 'geodir_map_name' => geodir_map_name(), |
|
| 1304 | + 'osmStart' => __('Start', 'geodirectory'),
|
|
| 1305 | + 'osmVia' => __('Via {viaNumber}', 'geodirectory'),
|
|
| 1306 | + 'osmEnd' => __('Enter Your Location', 'geodirectory'),
|
|
| 1307 | + 'ga_delete_check' => __('Are you wish to Deauthorize and break Analytics?', 'geodirectory'),
|
|
| 1308 | + 'geoMyLocation' => __('My Location', 'geodirectory'),
|
|
| 1309 | + 'geoErrUNKNOWN_ERROR' => addslashes(__('Unable to find your location', 'geodirectory')),
|
|
| 1310 | + 'geoErrPERMISSION_DENINED' => addslashes(__('Permission denied in finding your location', 'geodirectory')),
|
|
| 1311 | + 'geoErrPOSITION_UNAVAILABLE' => addslashes(__('Your location is currently unknown', 'geodirectory')),
|
|
| 1312 | + 'geoErrBREAK' => addslashes(__('Attempt to find location took too long', 'geodirectory')),
|
|
| 1313 | + 'geoErrDEFAULT' => addslashes(__('Location detection not supported in browser', 'geodirectory')),
|
|
| 1314 | + ); |
|
| 1315 | + |
|
| 1316 | + /** |
|
| 1317 | + * Filters the translated JS strings from function geodir_localize_all_js_msg(). |
|
| 1318 | + * |
|
| 1319 | + * With this filter you can add, remove or change translated JS strings. |
|
| 1320 | + * You should add your own translations to this if you are building an addon rather than adding another script block. |
|
| 1321 | + * |
|
| 1322 | + * @since 1.0.0 |
|
| 1323 | + */ |
|
| 1324 | + $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);
|
|
| 1331 | 1325 | |
| 1332 | - $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';'; |
|
| 1333 | - echo '<script>'; |
|
| 1334 | - echo $script; |
|
| 1335 | - echo '</script>'; |
|
| 1326 | + foreach ($arr_alert_msg as $key => $value) {
|
|
| 1327 | + if (!is_scalar($value)) |
|
| 1328 | + continue; |
|
| 1329 | + $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8'); |
|
| 1330 | + } |
|
| 1331 | + |
|
| 1332 | + $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';'; |
|
| 1333 | + echo '<script>'; |
|
| 1334 | + echo $script; |
|
| 1335 | + echo '</script>'; |
|
| 1336 | 1336 | } |
| 1337 | 1337 | |
| 1338 | 1338 | add_action('admin_bar_menu', 'geodir_admin_bar_site_menu', 31);
|
@@ -1348,11 +1348,11 @@ discard block |
||
| 1348 | 1348 | */ |
| 1349 | 1349 | function geodir_admin_bar_site_menu($wp_admin_bar) |
| 1350 | 1350 | {
|
| 1351 | - if (get_option("geodir_installed")) {
|
|
| 1352 | - if (current_user_can('manage_options')) {
|
|
| 1353 | - $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));
|
|
| 1354 | - } |
|
| 1355 | - } |
|
| 1351 | + if (get_option("geodir_installed")) {
|
|
| 1352 | + if (current_user_can('manage_options')) {
|
|
| 1353 | + $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));
|
|
| 1354 | + } |
|
| 1355 | + } |
|
| 1356 | 1356 | } |
| 1357 | 1357 | |
| 1358 | 1358 | add_action('geodir_before_listing', 'geodir_display_sort_options'); /*function in custom_functions.php*/
|
@@ -1378,25 +1378,25 @@ discard block |
||
| 1378 | 1378 | */ |
| 1379 | 1379 | function geodir_store_sidebars() |
| 1380 | 1380 | {
|
| 1381 | - global $geodir_sidebars; |
|
| 1382 | - global $sidebars_widgets; |
|
| 1383 | - |
|
| 1384 | - if (!is_array($sidebars_widgets)) |
|
| 1385 | - $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1386 | - $geodir_old_sidebars = array(); |
|
| 1387 | - |
|
| 1388 | - if (is_array($geodir_sidebars)) {
|
|
| 1389 | - foreach ($geodir_sidebars as $val) {
|
|
| 1390 | - if (is_array($sidebars_widgets)) {
|
|
| 1391 | - if (array_key_exists($val, $sidebars_widgets)) |
|
| 1392 | - $geodir_old_sidebars[$val] = $sidebars_widgets[$val]; |
|
| 1393 | - else |
|
| 1394 | - $geodir_old_sidebars[$val] = array(); |
|
| 1395 | - } |
|
| 1396 | - } |
|
| 1397 | - } |
|
| 1398 | - update_option('geodir_sidebars', $geodir_old_sidebars);
|
|
| 1399 | - geodir_option_version_backup('geodir_sidebars');
|
|
| 1381 | + global $geodir_sidebars; |
|
| 1382 | + global $sidebars_widgets; |
|
| 1383 | + |
|
| 1384 | + if (!is_array($sidebars_widgets)) |
|
| 1385 | + $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1386 | + $geodir_old_sidebars = array(); |
|
| 1387 | + |
|
| 1388 | + if (is_array($geodir_sidebars)) {
|
|
| 1389 | + foreach ($geodir_sidebars as $val) {
|
|
| 1390 | + if (is_array($sidebars_widgets)) {
|
|
| 1391 | + if (array_key_exists($val, $sidebars_widgets)) |
|
| 1392 | + $geodir_old_sidebars[$val] = $sidebars_widgets[$val]; |
|
| 1393 | + else |
|
| 1394 | + $geodir_old_sidebars[$val] = array(); |
|
| 1395 | + } |
|
| 1396 | + } |
|
| 1397 | + } |
|
| 1398 | + update_option('geodir_sidebars', $geodir_old_sidebars);
|
|
| 1399 | + geodir_option_version_backup('geodir_sidebars');
|
|
| 1400 | 1400 | |
| 1401 | 1401 | } |
| 1402 | 1402 | |
@@ -1410,28 +1410,28 @@ discard block |
||
| 1410 | 1410 | */ |
| 1411 | 1411 | function geodir_restore_sidebars() |
| 1412 | 1412 | {
|
| 1413 | - global $sidebars_widgets; |
|
| 1414 | - |
|
| 1415 | - if (!is_array($sidebars_widgets)) |
|
| 1416 | - $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1417 | - |
|
| 1418 | - if (is_array($sidebars_widgets)) {
|
|
| 1419 | - $geodir_old_sidebars = get_option('geodir_sidebars');
|
|
| 1420 | - if (is_array($geodir_old_sidebars)) {
|
|
| 1421 | - foreach ($geodir_old_sidebars as $key => $val) {
|
|
| 1422 | - if(0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1423 | - {
|
|
| 1424 | - $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
|
| 1425 | - } |
|
| 1413 | + global $sidebars_widgets; |
|
| 1426 | 1414 | |
| 1415 | + if (!is_array($sidebars_widgets)) |
|
| 1416 | + $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1427 | 1417 | |
| 1428 | - } |
|
| 1429 | - } |
|
| 1418 | + if (is_array($sidebars_widgets)) {
|
|
| 1419 | + $geodir_old_sidebars = get_option('geodir_sidebars');
|
|
| 1420 | + if (is_array($geodir_old_sidebars)) {
|
|
| 1421 | + foreach ($geodir_old_sidebars as $key => $val) {
|
|
| 1422 | + if(0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1423 | + {
|
|
| 1424 | + $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
|
| 1425 | + } |
|
| 1430 | 1426 | |
| 1431 | - } |
|
| 1432 | 1427 | |
| 1433 | - update_option('sidebars_widgets', $sidebars_widgets);
|
|
| 1434 | - update_option('geodir_sidebars', '');
|
|
| 1428 | + } |
|
| 1429 | + } |
|
| 1430 | + |
|
| 1431 | + } |
|
| 1432 | + |
|
| 1433 | + update_option('sidebars_widgets', $sidebars_widgets);
|
|
| 1434 | + update_option('geodir_sidebars', '');
|
|
| 1435 | 1435 | } |
| 1436 | 1436 | |
| 1437 | 1437 | add_action('geodir_after_listing_post_gridview', 'geodir_after_listing_post_gridview');
|
@@ -1444,9 +1444,9 @@ discard block |
||
| 1444 | 1444 | */ |
| 1445 | 1445 | function geodir_after_listing_post_gridview() |
| 1446 | 1446 | {
|
| 1447 | - global $gridview_columns; |
|
| 1447 | + global $gridview_columns; |
|
| 1448 | 1448 | |
| 1449 | - $gridview_columns = ''; |
|
| 1449 | + $gridview_columns = ''; |
|
| 1450 | 1450 | |
| 1451 | 1451 | } |
| 1452 | 1452 | |
@@ -1474,11 +1474,11 @@ discard block |
||
| 1474 | 1474 | */ |
| 1475 | 1475 | function so_handle_038($url, $original_url, $_context) |
| 1476 | 1476 | {
|
| 1477 | - if (strstr($url, "maps.google.com/maps/api/js") !== false) {
|
|
| 1478 | - $url = str_replace("&", "&", $url); // or $url = $original_url
|
|
| 1479 | - } |
|
| 1477 | + if (strstr($url, "maps.google.com/maps/api/js") !== false) {
|
|
| 1478 | + $url = str_replace("&", "&", $url); // or $url = $original_url
|
|
| 1479 | + } |
|
| 1480 | 1480 | |
| 1481 | - return $url; |
|
| 1481 | + return $url; |
|
| 1482 | 1482 | } |
| 1483 | 1483 | |
| 1484 | 1484 | |
@@ -1494,34 +1494,34 @@ discard block |
||
| 1494 | 1494 | function geodir_after_main_form_fields() {
|
| 1495 | 1495 | global $gd_session; |
| 1496 | 1496 | |
| 1497 | - if (get_option('geodir_accept_term_condition')) {
|
|
| 1498 | - global $post; |
|
| 1499 | - $term_condition = ''; |
|
| 1500 | - if (isset($_REQUEST['backandedit'])) {
|
|
| 1501 | - $post = (object)$gd_session->get('listing');
|
|
| 1502 | - $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : ''; |
|
| 1503 | - } |
|
| 1504 | - |
|
| 1505 | - ?> |
|
| 1497 | + if (get_option('geodir_accept_term_condition')) {
|
|
| 1498 | + global $post; |
|
| 1499 | + $term_condition = ''; |
|
| 1500 | + if (isset($_REQUEST['backandedit'])) {
|
|
| 1501 | + $post = (object)$gd_session->get('listing');
|
|
| 1502 | + $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : ''; |
|
| 1503 | + } |
|
| 1504 | + |
|
| 1505 | + ?> |
|
| 1506 | 1506 | <div id="geodir_accept_term_condition_row" class="required_field geodir_form_row clearfix"> |
| 1507 | 1507 | <label> </label> |
| 1508 | 1508 | |
| 1509 | 1509 | <div class="geodir_taxonomy_field" style="float:left; width:70%;"> |
| 1510 | 1510 | <span style="display:block"> |
| 1511 | 1511 | <input class="main_list_selecter" type="checkbox" <?php if ($term_condition == '1') {
|
| 1512 | - echo 'checked="checked"'; |
|
| 1513 | - } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition" |
|
| 1512 | + echo 'checked="checked"'; |
|
| 1513 | + } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition" |
|
| 1514 | 1514 | class="geodir_textfield" value="1" |
| 1515 | 1515 | style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>
|
| 1516 | 1516 | </span> |
| 1517 | 1517 | </div> |
| 1518 | 1518 | <span class="geodir_message_error"><?php if (isset($required_msg)) {
|
| 1519 | - _e($required_msg, 'geodirectory'); |
|
| 1520 | - } ?></span> |
|
| 1519 | + _e($required_msg, 'geodirectory'); |
|
| 1520 | + } ?></span> |
|
| 1521 | 1521 | </div> |
| 1522 | 1522 | <?php |
| 1523 | 1523 | |
| 1524 | - } |
|
| 1524 | + } |
|
| 1525 | 1525 | } |
| 1526 | 1526 | |
| 1527 | 1527 | |
@@ -1546,42 +1546,42 @@ discard block |
||
| 1546 | 1546 | */ |
| 1547 | 1547 | function geodir_detail_page_tab_is_display($is_display, $tab) |
| 1548 | 1548 | {
|
| 1549 | - global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields; |
|
| 1549 | + global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields; |
|
| 1550 | 1550 | |
| 1551 | - if ($tab == 'post_profile') {
|
|
| 1552 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1553 | - $desc_limit = apply_filters('geodir_description_field_desc_limit', '');
|
|
| 1551 | + if ($tab == 'post_profile') {
|
|
| 1552 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1553 | + $desc_limit = apply_filters('geodir_description_field_desc_limit', '');
|
|
| 1554 | 1554 | |
| 1555 | - if (!($desc_limit === '' || (int)$desc_limit > 0)) {
|
|
| 1556 | - $is_display = false; |
|
| 1557 | - } |
|
| 1558 | - } |
|
| 1555 | + if (!($desc_limit === '' || (int)$desc_limit > 0)) {
|
|
| 1556 | + $is_display = false; |
|
| 1557 | + } |
|
| 1558 | + } |
|
| 1559 | 1559 | |
| 1560 | - if ($tab == 'post_info') |
|
| 1561 | - $is_display = (!empty($geodir_post_detail_fields)) ? true : false; |
|
| 1560 | + if ($tab == 'post_info') |
|
| 1561 | + $is_display = (!empty($geodir_post_detail_fields)) ? true : false; |
|
| 1562 | 1562 | |
| 1563 | - if ($tab == 'post_images') |
|
| 1564 | - $is_display = (!empty($post_images)) ? true : false; |
|
| 1563 | + if ($tab == 'post_images') |
|
| 1564 | + $is_display = (!empty($post_images)) ? true : false; |
|
| 1565 | 1565 | |
| 1566 | - if ($tab == 'post_video') |
|
| 1567 | - $is_display = (!empty($video)) ? true : false; |
|
| 1566 | + if ($tab == 'post_video') |
|
| 1567 | + $is_display = (!empty($video)) ? true : false; |
|
| 1568 | 1568 | |
| 1569 | - if ($tab == 'special_offers') |
|
| 1570 | - $is_display = (!empty($special_offers)) ? true : false; |
|
| 1569 | + if ($tab == 'special_offers') |
|
| 1570 | + $is_display = (!empty($special_offers)) ? true : false; |
|
| 1571 | 1571 | |
| 1572 | - if ($tab == 'reviews') |
|
| 1573 | - $is_display = (geodir_is_page('detail')) ? true : false;
|
|
| 1572 | + if ($tab == 'reviews') |
|
| 1573 | + $is_display = (geodir_is_page('detail')) ? true : false;
|
|
| 1574 | 1574 | |
| 1575 | - if ($tab == 'related_listing') {
|
|
| 1576 | - $message = __('No listings found which match your selection.', 'geodirectory');
|
|
| 1575 | + if ($tab == 'related_listing') {
|
|
| 1576 | + $message = __('No listings found which match your selection.', 'geodirectory');
|
|
| 1577 | 1577 | |
| 1578 | - /** This action is documented in geodirectory-functions/template_functions.php */ |
|
| 1579 | - $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);
|
|
| 1578 | + /** This action is documented in geodirectory-functions/template_functions.php */ |
|
| 1579 | + $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);
|
|
| 1580 | 1580 | |
| 1581 | - $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;
|
|
| 1582 | - } |
|
| 1581 | + $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;
|
|
| 1582 | + } |
|
| 1583 | 1583 | |
| 1584 | - return $is_display; |
|
| 1584 | + return $is_display; |
|
| 1585 | 1585 | } |
| 1586 | 1586 | |
| 1587 | 1587 | |
@@ -1597,69 +1597,69 @@ discard block |
||
| 1597 | 1597 | * @global string $plugin_prefix Geodirectory plugin table prefix. |
| 1598 | 1598 | */ |
| 1599 | 1599 | function geodir_changes_in_custom_fields_table() {
|
| 1600 | - global $wpdb, $plugin_prefix; |
|
| 1600 | + global $wpdb, $plugin_prefix; |
|
| 1601 | 1601 | |
| 1602 | 1602 | // Remove unused virtual page |
| 1603 | 1603 | $listings_page_id = (int)get_option('geodir_listing_page');
|
| 1604 | 1604 | if ($listings_page_id) {
|
| 1605 | 1605 | $wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));
|
| 1606 | - delete_option('geodir_listing_page');
|
|
| 1606 | + delete_option('geodir_listing_page');
|
|
| 1607 | 1607 | } |
| 1608 | 1608 | |
| 1609 | - if (!get_option('geodir_changes_in_custom_fields_table')) {
|
|
| 1610 | - $wpdb->query( |
|
| 1611 | - $wpdb->prepare( |
|
| 1612 | - "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s", |
|
| 1613 | - array('1', '1', 'admin')
|
|
| 1614 | - ) |
|
| 1615 | - ); |
|
| 1609 | + if (!get_option('geodir_changes_in_custom_fields_table')) {
|
|
| 1610 | + $wpdb->query( |
|
| 1611 | + $wpdb->prepare( |
|
| 1612 | + "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s", |
|
| 1613 | + array('1', '1', 'admin')
|
|
| 1614 | + ) |
|
| 1615 | + ); |
|
| 1616 | 1616 | |
| 1617 | 1617 | |
| 1618 | - /* --- terms meta value set --- */ |
|
| 1618 | + /* --- terms meta value set --- */ |
|
| 1619 | 1619 | |
| 1620 | - update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');
|
|
| 1620 | + update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');
|
|
| 1621 | 1621 | |
| 1622 | - $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
| 1622 | + $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
| 1623 | 1623 | |
| 1624 | - if (!empty($options_data)) {
|
|
| 1624 | + if (!empty($options_data)) {
|
|
| 1625 | 1625 | |
| 1626 | - foreach ($options_data as $optobj) {
|
|
| 1626 | + foreach ($options_data as $optobj) {
|
|
| 1627 | 1627 | |
| 1628 | - $option_val = str_replace('tax_meta_', '', $optobj->option_name);
|
|
| 1628 | + $option_val = str_replace('tax_meta_', '', $optobj->option_name);
|
|
| 1629 | 1629 | |
| 1630 | - $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
| 1630 | + $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
| 1631 | 1631 | |
| 1632 | - if (!empty($taxonomies_data)) {
|
|
| 1632 | + if (!empty($taxonomies_data)) {
|
|
| 1633 | 1633 | |
| 1634 | - foreach ($taxonomies_data as $taxobj) {
|
|
| 1634 | + foreach ($taxonomies_data as $taxobj) {
|
|
| 1635 | 1635 | |
| 1636 | - $taxObject = get_taxonomy($taxobj->taxonomy); |
|
| 1637 | - $post_type = $taxObject->object_type[0]; |
|
| 1636 | + $taxObject = get_taxonomy($taxobj->taxonomy); |
|
| 1637 | + $post_type = $taxObject->object_type[0]; |
|
| 1638 | 1638 | |
| 1639 | - $opt_value = 'tax_meta_' . $post_type . '_' . $option_val; |
|
| 1639 | + $opt_value = 'tax_meta_' . $post_type . '_' . $option_val; |
|
| 1640 | 1640 | |
| 1641 | - $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));
|
|
| 1641 | + $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));
|
|
| 1642 | 1642 | |
| 1643 | - if ($duplicate_data) {
|
|
| 1643 | + if ($duplicate_data) {
|
|
| 1644 | 1644 | |
| 1645 | - $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
| 1645 | + $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
| 1646 | 1646 | |
| 1647 | - } else {
|
|
| 1647 | + } else {
|
|
| 1648 | 1648 | |
| 1649 | - $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
| 1649 | + $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
| 1650 | 1650 | |
| 1651 | - } |
|
| 1651 | + } |
|
| 1652 | 1652 | |
| 1653 | - } |
|
| 1653 | + } |
|
| 1654 | 1654 | |
| 1655 | - } |
|
| 1655 | + } |
|
| 1656 | 1656 | |
| 1657 | - } |
|
| 1658 | - } |
|
| 1657 | + } |
|
| 1658 | + } |
|
| 1659 | 1659 | |
| 1660 | - update_option('geodir_changes_in_custom_fields_table', '1');
|
|
| 1660 | + update_option('geodir_changes_in_custom_fields_table', '1');
|
|
| 1661 | 1661 | |
| 1662 | - } |
|
| 1662 | + } |
|
| 1663 | 1663 | |
| 1664 | 1664 | } |
| 1665 | 1665 | |
@@ -1678,24 +1678,24 @@ discard block |
||
| 1678 | 1678 | function geodir_location_slug_check($slug) |
| 1679 | 1679 | {
|
| 1680 | 1680 | |
| 1681 | - global $wpdb, $table_prefix; |
|
| 1681 | + global $wpdb, $table_prefix; |
|
| 1682 | 1682 | |
| 1683 | - $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));
|
|
| 1683 | + $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));
|
|
| 1684 | 1684 | |
| 1685 | - if ($slug_exists) {
|
|
| 1685 | + if ($slug_exists) {
|
|
| 1686 | 1686 | |
| 1687 | - $suffix = 1; |
|
| 1688 | - do {
|
|
| 1689 | - $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1690 | - $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));
|
|
| 1691 | - $suffix++; |
|
| 1692 | - } while ($location_slug_check && $suffix < 100); |
|
| 1687 | + $suffix = 1; |
|
| 1688 | + do {
|
|
| 1689 | + $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1690 | + $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));
|
|
| 1691 | + $suffix++; |
|
| 1692 | + } while ($location_slug_check && $suffix < 100); |
|
| 1693 | 1693 | |
| 1694 | - $slug = $alt_location_name; |
|
| 1694 | + $slug = $alt_location_name; |
|
| 1695 | 1695 | |
| 1696 | - } |
|
| 1696 | + } |
|
| 1697 | 1697 | |
| 1698 | - return $slug; |
|
| 1698 | + return $slug; |
|
| 1699 | 1699 | |
| 1700 | 1700 | } |
| 1701 | 1701 | |
@@ -1720,42 +1720,42 @@ discard block |
||
| 1720 | 1720 | function geodir_update_term_slug($term_id, $tt_id, $taxonomy) |
| 1721 | 1721 | {
|
| 1722 | 1722 | |
| 1723 | - global $wpdb, $plugin_prefix, $table_prefix; |
|
| 1723 | + global $wpdb, $plugin_prefix, $table_prefix; |
|
| 1724 | 1724 | |
| 1725 | - $tern_data = get_term_by('id', $term_id, $taxonomy);
|
|
| 1725 | + $tern_data = get_term_by('id', $term_id, $taxonomy);
|
|
| 1726 | 1726 | |
| 1727 | - $slug = $tern_data->slug; |
|
| 1727 | + $slug = $tern_data->slug; |
|
| 1728 | 1728 | |
| 1729 | - /** |
|
| 1730 | - * Filter if a term slug exists. |
|
| 1731 | - * |
|
| 1732 | - * @since 1.0.0 |
|
| 1733 | - * @package GeoDirectory |
|
| 1734 | - * @param bool $bool Default: false. |
|
| 1735 | - * @param string $slug The term slug. |
|
| 1736 | - * @param int $term_id The term ID. |
|
| 1737 | - */ |
|
| 1738 | - $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);
|
|
| 1729 | + /** |
|
| 1730 | + * Filter if a term slug exists. |
|
| 1731 | + * |
|
| 1732 | + * @since 1.0.0 |
|
| 1733 | + * @package GeoDirectory |
|
| 1734 | + * @param bool $bool Default: false. |
|
| 1735 | + * @param string $slug The term slug. |
|
| 1736 | + * @param int $term_id The term ID. |
|
| 1737 | + */ |
|
| 1738 | + $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);
|
|
| 1739 | 1739 | |
| 1740 | - if ($slug_exists) {
|
|
| 1740 | + if ($slug_exists) {
|
|
| 1741 | 1741 | |
| 1742 | - $suffix = 1; |
|
| 1743 | - do {
|
|
| 1744 | - $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1742 | + $suffix = 1; |
|
| 1743 | + do {
|
|
| 1744 | + $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1745 | 1745 | |
| 1746 | - /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 1747 | - $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);
|
|
| 1746 | + /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 1747 | + $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);
|
|
| 1748 | 1748 | |
| 1749 | - $suffix++; |
|
| 1750 | - } while ($term_slug_check && $suffix < 100); |
|
| 1749 | + $suffix++; |
|
| 1750 | + } while ($term_slug_check && $suffix < 100); |
|
| 1751 | 1751 | |
| 1752 | - $slug = $new_slug; |
|
| 1752 | + $slug = $new_slug; |
|
| 1753 | 1753 | |
| 1754 | - //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );
|
|
| 1754 | + //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );
|
|
| 1755 | 1755 | |
| 1756 | - $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
| 1756 | + $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
| 1757 | 1757 | |
| 1758 | - } |
|
| 1758 | + } |
|
| 1759 | 1759 | |
| 1760 | 1760 | // Update tag in detail table. |
| 1761 | 1761 | $taxonomy_obj = get_taxonomy($taxonomy); |
@@ -1796,21 +1796,21 @@ discard block |
||
| 1796 | 1796 | function geodir_term_slug_is_exists($slug_exists, $slug, $term_id) |
| 1797 | 1797 | {
|
| 1798 | 1798 | |
| 1799 | - global $wpdb, $table_prefix; |
|
| 1799 | + global $wpdb, $table_prefix; |
|
| 1800 | 1800 | |
| 1801 | - $default_location = geodir_get_default_location(); |
|
| 1801 | + $default_location = geodir_get_default_location(); |
|
| 1802 | 1802 | |
| 1803 | - $country_slug = $default_location->country_slug; |
|
| 1804 | - $region_slug = $default_location->region_slug; |
|
| 1805 | - $city_slug = $default_location->city_slug; |
|
| 1803 | + $country_slug = $default_location->country_slug; |
|
| 1804 | + $region_slug = $default_location->region_slug; |
|
| 1805 | + $city_slug = $default_location->city_slug; |
|
| 1806 | 1806 | |
| 1807 | - if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) |
|
| 1808 | - return $slug_exists = true; |
|
| 1807 | + if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) |
|
| 1808 | + return $slug_exists = true; |
|
| 1809 | 1809 | |
| 1810 | - if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1811 | - return $slug_exists = true; |
|
| 1810 | + if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1811 | + return $slug_exists = true; |
|
| 1812 | 1812 | |
| 1813 | - return $slug_exists; |
|
| 1813 | + return $slug_exists; |
|
| 1814 | 1814 | } |
| 1815 | 1815 | |
| 1816 | 1816 | |
@@ -1830,75 +1830,75 @@ discard block |
||
| 1830 | 1830 | */ |
| 1831 | 1831 | function geodir_custom_page_title($title = '', $sep = '') |
| 1832 | 1832 | {
|
| 1833 | - global $wp; |
|
| 1834 | - if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
|
|
| 1835 | - return $title; |
|
| 1836 | - } |
|
| 1833 | + global $wp; |
|
| 1834 | + if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
|
|
| 1835 | + return $title; |
|
| 1836 | + } |
|
| 1837 | 1837 | |
| 1838 | - if ($sep == '') {
|
|
| 1839 | - /** |
|
| 1840 | - * Filter the page title separator. |
|
| 1841 | - * |
|
| 1842 | - * @since 1.0.0 |
|
| 1843 | - * @package GeoDirectory |
|
| 1844 | - * @param string $sep The separator, default: `|`. |
|
| 1845 | - */ |
|
| 1846 | - $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 1847 | - } |
|
| 1838 | + if ($sep == '') {
|
|
| 1839 | + /** |
|
| 1840 | + * Filter the page title separator. |
|
| 1841 | + * |
|
| 1842 | + * @since 1.0.0 |
|
| 1843 | + * @package GeoDirectory |
|
| 1844 | + * @param string $sep The separator, default: `|`. |
|
| 1845 | + */ |
|
| 1846 | + $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 1847 | + } |
|
| 1848 | 1848 | |
| 1849 | 1849 | |
| 1850 | - $gd_page = ''; |
|
| 1851 | - if(geodir_is_page('home')){
|
|
| 1852 | - $gd_page = 'home'; |
|
| 1853 | - $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
|
| 1854 | - } |
|
| 1855 | - elseif(geodir_is_page('detail')){
|
|
| 1856 | - $gd_page = 'detail'; |
|
| 1857 | - $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
|
| 1858 | - } |
|
| 1859 | - elseif(geodir_is_page('pt')){
|
|
| 1860 | - $gd_page = 'pt'; |
|
| 1861 | - $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
|
| 1862 | - } |
|
| 1863 | - elseif(geodir_is_page('listing')){
|
|
| 1864 | - $gd_page = 'listing'; |
|
| 1865 | - $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
|
| 1866 | - } |
|
| 1867 | - elseif(geodir_is_page('location')){
|
|
| 1868 | - $gd_page = 'location'; |
|
| 1869 | - $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
|
| 1870 | - } |
|
| 1871 | - elseif(geodir_is_page('search')){
|
|
| 1872 | - $gd_page = 'search'; |
|
| 1873 | - $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
|
| 1874 | - } |
|
| 1875 | - elseif(geodir_is_page('add-listing')){
|
|
| 1876 | - $gd_page = 'add-listing'; |
|
| 1877 | - $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
|
| 1878 | - } |
|
| 1879 | - elseif(geodir_is_page('author')){
|
|
| 1880 | - $gd_page = 'author'; |
|
| 1881 | - $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
|
| 1882 | - } |
|
| 1883 | - elseif(geodir_is_page('login')){
|
|
| 1884 | - $gd_page = 'login'; |
|
| 1885 | - $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
|
| 1886 | - } |
|
| 1887 | - elseif(geodir_is_page('listing-success')){
|
|
| 1888 | - $gd_page = 'listing-success'; |
|
| 1889 | - $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
|
| 1890 | - } |
|
| 1850 | + $gd_page = ''; |
|
| 1851 | + if(geodir_is_page('home')){
|
|
| 1852 | + $gd_page = 'home'; |
|
| 1853 | + $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
|
| 1854 | + } |
|
| 1855 | + elseif(geodir_is_page('detail')){
|
|
| 1856 | + $gd_page = 'detail'; |
|
| 1857 | + $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
|
| 1858 | + } |
|
| 1859 | + elseif(geodir_is_page('pt')){
|
|
| 1860 | + $gd_page = 'pt'; |
|
| 1861 | + $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
|
| 1862 | + } |
|
| 1863 | + elseif(geodir_is_page('listing')){
|
|
| 1864 | + $gd_page = 'listing'; |
|
| 1865 | + $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
|
| 1866 | + } |
|
| 1867 | + elseif(geodir_is_page('location')){
|
|
| 1868 | + $gd_page = 'location'; |
|
| 1869 | + $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
|
| 1870 | + } |
|
| 1871 | + elseif(geodir_is_page('search')){
|
|
| 1872 | + $gd_page = 'search'; |
|
| 1873 | + $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
|
| 1874 | + } |
|
| 1875 | + elseif(geodir_is_page('add-listing')){
|
|
| 1876 | + $gd_page = 'add-listing'; |
|
| 1877 | + $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
|
| 1878 | + } |
|
| 1879 | + elseif(geodir_is_page('author')){
|
|
| 1880 | + $gd_page = 'author'; |
|
| 1881 | + $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
|
| 1882 | + } |
|
| 1883 | + elseif(geodir_is_page('login')){
|
|
| 1884 | + $gd_page = 'login'; |
|
| 1885 | + $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
|
| 1886 | + } |
|
| 1887 | + elseif(geodir_is_page('listing-success')){
|
|
| 1888 | + $gd_page = 'listing-success'; |
|
| 1889 | + $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
|
| 1890 | + } |
|
| 1891 | 1891 | |
| 1892 | 1892 | |
| 1893 | - /** |
|
| 1894 | - * Filter page meta title to replace variables. |
|
| 1895 | - * |
|
| 1896 | - * @since 1.5.4 |
|
| 1897 | - * @param string $title The page title including variables. |
|
| 1898 | - * @param string $gd_page The GeoDirectory page type if any. |
|
| 1899 | - * @param string $sep The title separator symbol. |
|
| 1900 | - */ |
|
| 1901 | - return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);
|
|
| 1893 | + /** |
|
| 1894 | + * Filter page meta title to replace variables. |
|
| 1895 | + * |
|
| 1896 | + * @since 1.5.4 |
|
| 1897 | + * @param string $title The page title including variables. |
|
| 1898 | + * @param string $gd_page The GeoDirectory page type if any. |
|
| 1899 | + * @param string $sep The title separator symbol. |
|
| 1900 | + */ |
|
| 1901 | + return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);
|
|
| 1902 | 1902 | |
| 1903 | 1903 | } |
| 1904 | 1904 | |
@@ -1914,36 +1914,36 @@ discard block |
||
| 1914 | 1914 | function geodir_set_post_attachment() |
| 1915 | 1915 | {
|
| 1916 | 1916 | |
| 1917 | - if (!get_option('geodir_set_post_attachments')) {
|
|
| 1917 | + if (!get_option('geodir_set_post_attachments')) {
|
|
| 1918 | 1918 | |
| 1919 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 1920 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1919 | + require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 1920 | + require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1921 | 1921 | |
| 1922 | - $all_postypes = geodir_get_posttypes(); |
|
| 1922 | + $all_postypes = geodir_get_posttypes(); |
|
| 1923 | 1923 | |
| 1924 | - foreach($all_postypes as $post_type){
|
|
| 1925 | - $args = array( |
|
| 1926 | - 'posts_per_page' => -1, |
|
| 1927 | - 'post_type' => $post_type, |
|
| 1928 | - 'post_status' => 'publish'); |
|
| 1924 | + foreach($all_postypes as $post_type){
|
|
| 1925 | + $args = array( |
|
| 1926 | + 'posts_per_page' => -1, |
|
| 1927 | + 'post_type' => $post_type, |
|
| 1928 | + 'post_status' => 'publish'); |
|
| 1929 | 1929 | |
| 1930 | - $posts_array = get_posts($args); |
|
| 1930 | + $posts_array = get_posts($args); |
|
| 1931 | 1931 | |
| 1932 | - if (!empty($posts_array)) {
|
|
| 1932 | + if (!empty($posts_array)) {
|
|
| 1933 | 1933 | |
| 1934 | - foreach ($posts_array as $post) {
|
|
| 1934 | + foreach ($posts_array as $post) {
|
|
| 1935 | 1935 | |
| 1936 | - geodir_set_wp_featured_image($post->ID); |
|
| 1936 | + geodir_set_wp_featured_image($post->ID); |
|
| 1937 | 1937 | |
| 1938 | - } |
|
| 1938 | + } |
|
| 1939 | 1939 | |
| 1940 | - } |
|
| 1941 | - } |
|
| 1940 | + } |
|
| 1941 | + } |
|
| 1942 | 1942 | |
| 1943 | 1943 | |
| 1944 | - update_option('geodir_set_post_attachments', '1');
|
|
| 1944 | + update_option('geodir_set_post_attachments', '1');
|
|
| 1945 | 1945 | |
| 1946 | - } |
|
| 1946 | + } |
|
| 1947 | 1947 | |
| 1948 | 1948 | } |
| 1949 | 1949 | |
@@ -1960,19 +1960,19 @@ discard block |
||
| 1960 | 1960 | function geodir_remove_url_seperator() |
| 1961 | 1961 | {
|
| 1962 | 1962 | |
| 1963 | - if (!get_option('geodir_remove_url_seperator')) {
|
|
| 1963 | + if (!get_option('geodir_remove_url_seperator')) {
|
|
| 1964 | 1964 | |
| 1965 | - if (get_option('geodir_listingurl_separator'))
|
|
| 1966 | - delete_option('geodir_listingurl_separator');
|
|
| 1965 | + if (get_option('geodir_listingurl_separator'))
|
|
| 1966 | + delete_option('geodir_listingurl_separator');
|
|
| 1967 | 1967 | |
| 1968 | - if (get_option('geodir_detailurl_separator'))
|
|
| 1969 | - delete_option('geodir_detailurl_separator');
|
|
| 1968 | + if (get_option('geodir_detailurl_separator'))
|
|
| 1969 | + delete_option('geodir_detailurl_separator');
|
|
| 1970 | 1970 | |
| 1971 | - flush_rewrite_rules(false); |
|
| 1971 | + flush_rewrite_rules(false); |
|
| 1972 | 1972 | |
| 1973 | - update_option('geodir_remove_url_seperator', '1');
|
|
| 1973 | + update_option('geodir_remove_url_seperator', '1');
|
|
| 1974 | 1974 | |
| 1975 | - } |
|
| 1975 | + } |
|
| 1976 | 1976 | |
| 1977 | 1977 | } |
| 1978 | 1978 | |
@@ -1988,19 +1988,19 @@ discard block |
||
| 1988 | 1988 | */ |
| 1989 | 1989 | function geodir_remove_url_seperator_form_permalink_settings($permalink_arr) |
| 1990 | 1990 | {
|
| 1991 | - foreach ($permalink_arr as $key => $value) {
|
|
| 1991 | + foreach ($permalink_arr as $key => $value) {
|
|
| 1992 | 1992 | |
| 1993 | - if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') |
|
| 1994 | - unset($permalink_arr[$key]); |
|
| 1993 | + if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') |
|
| 1994 | + unset($permalink_arr[$key]); |
|
| 1995 | 1995 | |
| 1996 | - } |
|
| 1996 | + } |
|
| 1997 | 1997 | |
| 1998 | - return $permalink_arr; |
|
| 1998 | + return $permalink_arr; |
|
| 1999 | 1999 | |
| 2000 | 2000 | } |
| 2001 | 2001 | |
| 2002 | 2002 | if (!is_admin()) {
|
| 2003 | - add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');
|
|
| 2003 | + add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');
|
|
| 2004 | 2004 | } |
| 2005 | 2005 | /** |
| 2006 | 2006 | * Set status from draft to publish. |
@@ -2013,16 +2013,16 @@ discard block |
||
| 2013 | 2013 | */ |
| 2014 | 2014 | function geodir_set_status_draft_to_publish_for_own_post($post) |
| 2015 | 2015 | {
|
| 2016 | - $user_id = get_current_user_id(); |
|
| 2016 | + $user_id = get_current_user_id(); |
|
| 2017 | 2017 | |
| 2018 | - if(!$user_id){return $post;}
|
|
| 2018 | + if(!$user_id){return $post;}
|
|
| 2019 | 2019 | |
| 2020 | - $gd_post_types = geodir_get_posttypes(); |
|
| 2020 | + $gd_post_types = geodir_get_posttypes(); |
|
| 2021 | 2021 | |
| 2022 | - if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {
|
|
| 2023 | - $post[0]->post_status = 'publish'; |
|
| 2024 | - } |
|
| 2025 | - return $post; |
|
| 2022 | + if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {
|
|
| 2023 | + $post[0]->post_status = 'publish'; |
|
| 2024 | + } |
|
| 2025 | + return $post; |
|
| 2026 | 2026 | } |
| 2027 | 2027 | |
| 2028 | 2028 | |
@@ -2114,33 +2114,33 @@ discard block |
||
| 2114 | 2114 | */ |
| 2115 | 2115 | function geodir_detail_page_tab_headings_change($tabs_arr) |
| 2116 | 2116 | {
|
| 2117 | - global $wpdb; |
|
| 2117 | + global $wpdb; |
|
| 2118 | 2118 | |
| 2119 | - $post_type = geodir_get_current_posttype(); |
|
| 2119 | + $post_type = geodir_get_current_posttype(); |
|
| 2120 | 2120 | |
| 2121 | - $all_postypes = geodir_get_posttypes(); |
|
| 2121 | + $all_postypes = geodir_get_posttypes(); |
|
| 2122 | 2122 | |
| 2123 | - if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {
|
|
| 2123 | + if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {
|
|
| 2124 | 2124 | |
| 2125 | - if (array_key_exists('post_video', $tabs_arr)) {
|
|
| 2125 | + if (array_key_exists('post_video', $tabs_arr)) {
|
|
| 2126 | 2126 | |
| 2127 | - $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
| 2127 | + $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
| 2128 | 2128 | |
| 2129 | - if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') |
|
| 2130 | - $tabs_arr['post_video']['heading_text'] = $field_title; |
|
| 2131 | - } |
|
| 2129 | + if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') |
|
| 2130 | + $tabs_arr['post_video']['heading_text'] = $field_title; |
|
| 2131 | + } |
|
| 2132 | 2132 | |
| 2133 | - if (array_key_exists('special_offers', $tabs_arr)) {
|
|
| 2133 | + if (array_key_exists('special_offers', $tabs_arr)) {
|
|
| 2134 | 2134 | |
| 2135 | - $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
| 2135 | + $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
| 2136 | 2136 | |
| 2137 | - if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') |
|
| 2138 | - $tabs_arr['special_offers']['heading_text'] = $field_title; |
|
| 2139 | - } |
|
| 2137 | + if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') |
|
| 2138 | + $tabs_arr['special_offers']['heading_text'] = $field_title; |
|
| 2139 | + } |
|
| 2140 | 2140 | |
| 2141 | - } |
|
| 2141 | + } |
|
| 2142 | 2142 | |
| 2143 | - return $tabs_arr; |
|
| 2143 | + return $tabs_arr; |
|
| 2144 | 2144 | |
| 2145 | 2145 | } |
| 2146 | 2146 | |
@@ -2153,10 +2153,10 @@ discard block |
||
| 2153 | 2153 | */ |
| 2154 | 2154 | function geodir_remove_template_redirect_actions() |
| 2155 | 2155 | {
|
| 2156 | - if (geodir_is_page('login')){
|
|
| 2157 | - remove_all_actions('template_redirect');
|
|
| 2158 | - remove_action('init', 'avia_modify_front', 10);
|
|
| 2159 | - } |
|
| 2156 | + if (geodir_is_page('login')){
|
|
| 2157 | + remove_all_actions('template_redirect');
|
|
| 2158 | + remove_action('init', 'avia_modify_front', 10);
|
|
| 2159 | + } |
|
| 2160 | 2160 | } |
| 2161 | 2161 | |
| 2162 | 2162 | |
@@ -2178,51 +2178,51 @@ discard block |
||
| 2178 | 2178 | function geodirectory_before_featured_image_delete($attachment_id) |
| 2179 | 2179 | {
|
| 2180 | 2180 | |
| 2181 | - global $wpdb, $plugin_prefix; |
|
| 2181 | + global $wpdb, $plugin_prefix; |
|
| 2182 | 2182 | |
| 2183 | - $post_id = get_post_field('post_parent', $attachment_id);
|
|
| 2183 | + $post_id = get_post_field('post_parent', $attachment_id);
|
|
| 2184 | 2184 | |
| 2185 | - $attachment_url = wp_get_attachment_url($attachment_id); |
|
| 2185 | + $attachment_url = wp_get_attachment_url($attachment_id); |
|
| 2186 | 2186 | |
| 2187 | - if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {
|
|
| 2187 | + if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {
|
|
| 2188 | 2188 | |
| 2189 | - $post_type = get_post_type($post_id); |
|
| 2189 | + $post_type = get_post_type($post_id); |
|
| 2190 | 2190 | |
| 2191 | - $all_postypes = geodir_get_posttypes(); |
|
| 2191 | + $all_postypes = geodir_get_posttypes(); |
|
| 2192 | 2192 | |
| 2193 | - if (!in_array($post_type, $all_postypes) || !is_admin()) |
|
| 2194 | - return false; |
|
| 2193 | + if (!in_array($post_type, $all_postypes) || !is_admin()) |
|
| 2194 | + return false; |
|
| 2195 | 2195 | |
| 2196 | - $uploads = wp_upload_dir(); |
|
| 2196 | + $uploads = wp_upload_dir(); |
|
| 2197 | 2197 | |
| 2198 | - $split_img_path = explode($uploads['baseurl'], $attachment_url); |
|
| 2198 | + $split_img_path = explode($uploads['baseurl'], $attachment_url); |
|
| 2199 | 2199 | |
| 2200 | - $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 2200 | + $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 2201 | 2201 | |
| 2202 | - $wpdb->query( |
|
| 2203 | - $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",
|
|
| 2204 | - array($post_id, $split_img_file_path) |
|
| 2205 | - ) |
|
| 2206 | - ); |
|
| 2202 | + $wpdb->query( |
|
| 2203 | + $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",
|
|
| 2204 | + array($post_id, $split_img_file_path) |
|
| 2205 | + ) |
|
| 2206 | + ); |
|
| 2207 | 2207 | |
| 2208 | - $attachment_data = $wpdb->get_row( |
|
| 2209 | - $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",
|
|
| 2210 | - array($post_id) |
|
| 2211 | - ) |
|
| 2212 | - ); |
|
| 2208 | + $attachment_data = $wpdb->get_row( |
|
| 2209 | + $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",
|
|
| 2210 | + array($post_id) |
|
| 2211 | + ) |
|
| 2212 | + ); |
|
| 2213 | 2213 | |
| 2214 | - if (!empty($attachment_data)) {
|
|
| 2215 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2216 | - } |
|
| 2214 | + if (!empty($attachment_data)) {
|
|
| 2215 | + $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2216 | + } |
|
| 2217 | 2217 | |
| 2218 | 2218 | |
| 2219 | - $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2219 | + $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2220 | 2220 | |
| 2221 | - $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2221 | + $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2222 | 2222 | |
| 2223 | - geodir_set_wp_featured_image($post_id); |
|
| 2223 | + geodir_set_wp_featured_image($post_id); |
|
| 2224 | 2224 | |
| 2225 | - } |
|
| 2225 | + } |
|
| 2226 | 2226 | |
| 2227 | 2227 | } |
| 2228 | 2228 | |
@@ -2240,79 +2240,79 @@ discard block |
||
| 2240 | 2240 | function geodir_temp_set_post_attachment() |
| 2241 | 2241 | {
|
| 2242 | 2242 | |
| 2243 | - global $wpdb, $plugin_prefix; |
|
| 2243 | + global $wpdb, $plugin_prefix; |
|
| 2244 | 2244 | |
| 2245 | - $all_postypes = geodir_get_posttypes(); |
|
| 2245 | + $all_postypes = geodir_get_posttypes(); |
|
| 2246 | 2246 | |
| 2247 | - foreach ($all_postypes as $posttype) {
|
|
| 2247 | + foreach ($all_postypes as $posttype) {
|
|
| 2248 | 2248 | |
| 2249 | - $tablename = $plugin_prefix . $posttype . '_detail'; |
|
| 2249 | + $tablename = $plugin_prefix . $posttype . '_detail'; |
|
| 2250 | 2250 | |
| 2251 | - $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);
|
|
| 2251 | + $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);
|
|
| 2252 | 2252 | |
| 2253 | - if (!empty($get_post_data)) {
|
|
| 2253 | + if (!empty($get_post_data)) {
|
|
| 2254 | 2254 | |
| 2255 | - foreach ($get_post_data as $data) {
|
|
| 2255 | + foreach ($get_post_data as $data) {
|
|
| 2256 | 2256 | |
| 2257 | - $post_id = $data->post_id; |
|
| 2257 | + $post_id = $data->post_id; |
|
| 2258 | 2258 | |
| 2259 | - $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");
|
|
| 2259 | + $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");
|
|
| 2260 | 2260 | |
| 2261 | - if (!empty($attachment_data)) {
|
|
| 2261 | + if (!empty($attachment_data)) {
|
|
| 2262 | 2262 | |
| 2263 | - foreach ($attachment_data as $attach) {
|
|
| 2263 | + foreach ($attachment_data as $attach) {
|
|
| 2264 | 2264 | |
| 2265 | - $file_info = pathinfo($attach->file); |
|
| 2265 | + $file_info = pathinfo($attach->file); |
|
| 2266 | 2266 | |
| 2267 | - $sub_dir = ''; |
|
| 2268 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 2269 | - $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 2267 | + $sub_dir = ''; |
|
| 2268 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 2269 | + $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 2270 | 2270 | |
| 2271 | - $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 2272 | - $uploads_path = $uploads['basedir']; |
|
| 2271 | + $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 2272 | + $uploads_path = $uploads['basedir']; |
|
| 2273 | 2273 | |
| 2274 | - $file_name = $file_info['basename']; |
|
| 2274 | + $file_name = $file_info['basename']; |
|
| 2275 | 2275 | |
| 2276 | - $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name; |
|
| 2276 | + $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name; |
|
| 2277 | 2277 | |
| 2278 | - if (!file_exists($img_arr['path'])) {
|
|
| 2278 | + if (!file_exists($img_arr['path'])) {
|
|
| 2279 | 2279 | |
| 2280 | - $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);
|
|
| 2280 | + $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);
|
|
| 2281 | 2281 | |
| 2282 | - } |
|
| 2282 | + } |
|
| 2283 | 2283 | |
| 2284 | - } |
|
| 2284 | + } |
|
| 2285 | 2285 | |
| 2286 | - $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");
|
|
| 2286 | + $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");
|
|
| 2287 | 2287 | |
| 2288 | - if (!empty($attachment_data)) {
|
|
| 2288 | + if (!empty($attachment_data)) {
|
|
| 2289 | 2289 | |
| 2290 | - if ($attachment_data->ID) |
|
| 2291 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2290 | + if ($attachment_data->ID) |
|
| 2291 | + $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2292 | 2292 | |
| 2293 | - } else {
|
|
| 2293 | + } else {
|
|
| 2294 | 2294 | |
| 2295 | - if (has_post_thumbnail($post_id)) {
|
|
| 2295 | + if (has_post_thumbnail($post_id)) {
|
|
| 2296 | 2296 | |
| 2297 | - $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2297 | + $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2298 | 2298 | |
| 2299 | - wp_delete_attachment($post_thumbnail_id); |
|
| 2299 | + wp_delete_attachment($post_thumbnail_id); |
|
| 2300 | 2300 | |
| 2301 | - } |
|
| 2301 | + } |
|
| 2302 | 2302 | |
| 2303 | - } |
|
| 2303 | + } |
|
| 2304 | 2304 | |
| 2305 | - $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2305 | + $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2306 | 2306 | |
| 2307 | - geodir_set_wp_featured_image($post_id); |
|
| 2307 | + geodir_set_wp_featured_image($post_id); |
|
| 2308 | 2308 | |
| 2309 | - } |
|
| 2309 | + } |
|
| 2310 | 2310 | |
| 2311 | - } |
|
| 2311 | + } |
|
| 2312 | 2312 | |
| 2313 | - } |
|
| 2313 | + } |
|
| 2314 | 2314 | |
| 2315 | - } |
|
| 2315 | + } |
|
| 2316 | 2316 | |
| 2317 | 2317 | } |
| 2318 | 2318 | |
@@ -2330,9 +2330,9 @@ discard block |
||
| 2330 | 2330 | function geodir_default_rating_star_icon() |
| 2331 | 2331 | {
|
| 2332 | 2332 | |
| 2333 | - if (!get_option('geodir_default_rating_star_icon')) {
|
|
| 2334 | - update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');
|
|
| 2335 | - } |
|
| 2333 | + if (!get_option('geodir_default_rating_star_icon')) {
|
|
| 2334 | + update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');
|
|
| 2335 | + } |
|
| 2336 | 2336 | |
| 2337 | 2337 | } |
| 2338 | 2338 | |
@@ -2350,27 +2350,27 @@ discard block |
||
| 2350 | 2350 | */ |
| 2351 | 2351 | function geodir_user_post_listing_count($user_id=null) |
| 2352 | 2352 | {
|
| 2353 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 2354 | - if(!$user_id){
|
|
| 2355 | - $user_id = $current_user->ID; |
|
| 2356 | - } |
|
| 2353 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 2354 | + if(!$user_id){
|
|
| 2355 | + $user_id = $current_user->ID; |
|
| 2356 | + } |
|
| 2357 | 2357 | |
| 2358 | - $user_id = $current_user->ID; |
|
| 2359 | - $all_postypes = geodir_get_posttypes(); |
|
| 2360 | - $all_posts = get_option('geodir_listing_link_user_dashboard');
|
|
| 2358 | + $user_id = $current_user->ID; |
|
| 2359 | + $all_postypes = geodir_get_posttypes(); |
|
| 2360 | + $all_posts = get_option('geodir_listing_link_user_dashboard');
|
|
| 2361 | 2361 | |
| 2362 | - $user_listing = array(); |
|
| 2363 | - if (is_array($all_posts) && !empty($all_posts)) {
|
|
| 2364 | - foreach ($all_posts as $ptype) {
|
|
| 2365 | - $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");
|
|
| 2362 | + $user_listing = array(); |
|
| 2363 | + if (is_array($all_posts) && !empty($all_posts)) {
|
|
| 2364 | + foreach ($all_posts as $ptype) {
|
|
| 2365 | + $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");
|
|
| 2366 | 2366 | |
| 2367 | - if ($total_posts > 0) {
|
|
| 2368 | - $user_listing[$ptype] = $total_posts; |
|
| 2369 | - } |
|
| 2370 | - } |
|
| 2371 | - } |
|
| 2367 | + if ($total_posts > 0) {
|
|
| 2368 | + $user_listing[$ptype] = $total_posts; |
|
| 2369 | + } |
|
| 2370 | + } |
|
| 2371 | + } |
|
| 2372 | 2372 | |
| 2373 | - return $user_listing; |
|
| 2373 | + return $user_listing; |
|
| 2374 | 2374 | } |
| 2375 | 2375 | |
| 2376 | 2376 | |
@@ -2390,189 +2390,189 @@ discard block |
||
| 2390 | 2390 | */ |
| 2391 | 2391 | function geodir_detail_page_custom_field_tab($tabs_arr) |
| 2392 | 2392 | {
|
| 2393 | - global $post; |
|
| 2394 | - |
|
| 2395 | - $post_type = geodir_get_current_posttype(); |
|
| 2396 | - $all_postypes = geodir_get_posttypes(); |
|
| 2397 | - |
|
| 2398 | - if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {
|
|
| 2399 | - $package_info = array(); |
|
| 2400 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 2401 | - $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 2402 | - $fields_location = 'owntab'; |
|
| 2403 | - |
|
| 2404 | - $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location); |
|
| 2405 | - //remove video and special offers if it is already set to show |
|
| 2406 | - if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){
|
|
| 2407 | - $unset_video = true; |
|
| 2408 | - } |
|
| 2409 | - |
|
| 2410 | - if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){
|
|
| 2411 | - $unset_special_offers = true; |
|
| 2412 | - } |
|
| 2413 | - if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){
|
|
| 2414 | - foreach($custom_fields as $key => $custom_field){
|
|
| 2415 | - if($custom_field['name']=='geodir_video' && isset($unset_video)){
|
|
| 2416 | - unset($custom_fields[$key]); |
|
| 2417 | - } |
|
| 2418 | - if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){
|
|
| 2419 | - unset($custom_fields[$key]); |
|
| 2420 | - } |
|
| 2421 | - } |
|
| 2422 | - } |
|
| 2423 | - |
|
| 2393 | + global $post; |
|
| 2424 | 2394 | |
| 2425 | - if (!empty($custom_fields)) {
|
|
| 2426 | - $parse_custom_fields = array(); |
|
| 2427 | - foreach ($custom_fields as $field) {
|
|
| 2428 | - $field = stripslashes_deep($field); // strip slashes |
|
| 2429 | - $type = $field; |
|
| 2430 | - $field_name = $field['htmlvar_name']; |
|
| 2431 | - if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2432 | - $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2433 | - } |
|
| 2434 | - |
|
| 2435 | - if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2436 | - if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2437 | - continue; |
|
| 2438 | - } |
|
| 2395 | + $post_type = geodir_get_current_posttype(); |
|
| 2396 | + $all_postypes = geodir_get_posttypes(); |
|
| 2439 | 2397 | |
| 2440 | - $parse_custom_fields[] = $field; |
|
| 2441 | - } |
|
| 2442 | - } |
|
| 2443 | - $custom_fields = $parse_custom_fields; |
|
| 2444 | - } |
|
| 2445 | - //print_r($custom_fields); |
|
| 2446 | - if (!empty($custom_fields)) {
|
|
| 2398 | + if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {
|
|
| 2399 | + $package_info = array(); |
|
| 2400 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 2401 | + $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 2402 | + $fields_location = 'owntab'; |
|
| 2447 | 2403 | |
| 2448 | - global $field_set_start; |
|
| 2404 | + $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location); |
|
| 2405 | + //remove video and special offers if it is already set to show |
|
| 2406 | + if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){
|
|
| 2407 | + $unset_video = true; |
|
| 2408 | + } |
|
| 2449 | 2409 | |
| 2450 | - $post = stripslashes_deep($post); // strip slashes |
|
| 2451 | - |
|
| 2452 | - $field_set_start = 0; |
|
| 2453 | - $fieldset_count = 0; |
|
| 2454 | - $fieldset = ''; |
|
| 2455 | - $total_fields = count($custom_fields); |
|
| 2456 | - $count_field = 0; |
|
| 2457 | - $fieldset_arr = array(); |
|
| 2458 | - $i = 0; |
|
| 2459 | - $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL; |
|
| 2460 | - |
|
| 2461 | - foreach ($custom_fields as $field) {
|
|
| 2462 | - $count_field++; |
|
| 2463 | - $field_name = $field['htmlvar_name']; |
|
| 2464 | - if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2465 | - $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2466 | - } |
|
| 2410 | + if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){
|
|
| 2411 | + $unset_special_offers = true; |
|
| 2412 | + } |
|
| 2413 | + if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){
|
|
| 2414 | + foreach($custom_fields as $key => $custom_field){
|
|
| 2415 | + if($custom_field['name']=='geodir_video' && isset($unset_video)){
|
|
| 2416 | + unset($custom_fields[$key]); |
|
| 2417 | + } |
|
| 2418 | + if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){
|
|
| 2419 | + unset($custom_fields[$key]); |
|
| 2420 | + } |
|
| 2421 | + } |
|
| 2422 | + } |
|
| 2467 | 2423 | |
| 2468 | - if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2469 | - $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title']; |
|
| 2470 | - $site_title = trim($field['site_title']); |
|
| 2471 | - $type = $field; |
|
| 2472 | - $variables_array = array(); |
|
| 2473 | 2424 | |
| 2474 | - if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2475 | - continue; |
|
| 2476 | - } |
|
| 2425 | + if (!empty($custom_fields)) {
|
|
| 2426 | + $parse_custom_fields = array(); |
|
| 2427 | + foreach ($custom_fields as $field) {
|
|
| 2428 | + $field = stripslashes_deep($field); // strip slashes |
|
| 2429 | + $type = $field; |
|
| 2430 | + $field_name = $field['htmlvar_name']; |
|
| 2431 | + if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2432 | + $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2433 | + } |
|
| 2477 | 2434 | |
| 2478 | - if ($type['type'] != 'fieldset') {
|
|
| 2479 | - $i++; |
|
| 2480 | - $variables_array['post_id'] = $post->ID; |
|
| 2481 | - $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 2482 | - $variables_array['value'] = isset($post->{$type['htmlvar_name']}) ? $post->{$type['htmlvar_name']} : '';
|
|
| 2483 | - |
|
| 2484 | - }else{
|
|
| 2485 | - $i = 0; |
|
| 2486 | - $fieldset_count++; |
|
| 2487 | - $field_set_start = 1; |
|
| 2488 | - $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count; |
|
| 2489 | - $fieldset_arr[$fieldset_count]['label'] = $label; |
|
| 2490 | - } |
|
| 2435 | + if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2436 | + if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2437 | + continue; |
|
| 2438 | + } |
|
| 2491 | 2439 | |
| 2440 | + $parse_custom_fields[] = $field; |
|
| 2441 | + } |
|
| 2442 | + } |
|
| 2443 | + $custom_fields = $parse_custom_fields; |
|
| 2444 | + } |
|
| 2445 | + //print_r($custom_fields); |
|
| 2446 | + if (!empty($custom_fields)) {
|
|
| 2492 | 2447 | |
| 2493 | - if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 2494 | - $type = stripslashes_deep($type); // strip slashes |
|
| 2495 | - if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 2496 | - $html = ''; |
|
| 2497 | - $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 2498 | - if($html_var=='post'){$html_var='post_address';}
|
|
| 2499 | - $field_icon = geodir_field_icon_proccess($type); |
|
| 2500 | - $filed_type = $type['type']; |
|
| 2501 | - |
|
| 2502 | - /** |
|
| 2503 | - * Filter the output for custom fields. |
|
| 2504 | - * |
|
| 2505 | - * Here we can remove or add new functions depending on the field type. |
|
| 2506 | - * |
|
| 2507 | - * @param string $html The html to be filtered (blank). |
|
| 2508 | - * @param string $fields_location The location the field is to be show. |
|
| 2509 | - * @param array $type The array of field values. |
|
| 2510 | - */ |
|
| 2511 | - $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 2512 | - |
|
| 2513 | - |
|
| 2514 | - /** |
|
| 2515 | - * Filter custom field output in tab. |
|
| 2516 | - * |
|
| 2517 | - * @since 1.5.6 |
|
| 2518 | - * |
|
| 2519 | - * @param string $html_var The HTML variable name for the field. |
|
| 2520 | - * @param string $html Custom field unfiltered HTML. |
|
| 2521 | - * @param array $variables_array Custom field variables array. |
|
| 2522 | - */ |
|
| 2523 | - $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);
|
|
| 2524 | - |
|
| 2525 | - $fieldset_html = ''; |
|
| 2526 | - if ($field_set_start == 1) {
|
|
| 2527 | - $add_html = false; |
|
| 2528 | - if ($type['type'] == 'fieldset' && $fieldset_count > 1) {
|
|
| 2529 | - if ($fieldset != '') {
|
|
| 2530 | - $add_html = true; |
|
| 2531 | - $label = $fieldset_arr[$fieldset_count - 1]['label']; |
|
| 2532 | - $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name']; |
|
| 2533 | - } |
|
| 2534 | - $fieldset_html = $fieldset; |
|
| 2535 | - $fieldset = ''; |
|
| 2536 | - } else {
|
|
| 2537 | - $fieldset .= $html; |
|
| 2538 | - if ($total_fields == $count_field && $fieldset != '') {
|
|
| 2539 | - $add_html = true; |
|
| 2540 | - $label = $fieldset_arr[$fieldset_count]['label']; |
|
| 2541 | - $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name']; |
|
| 2542 | - $fieldset_html = $fieldset; |
|
| 2543 | - } |
|
| 2544 | - } |
|
| 2448 | + global $field_set_start; |
|
| 2545 | 2449 | |
| 2546 | - if ($add_html) {
|
|
| 2547 | - $tabs_arr[$htmlvar_name] = array( |
|
| 2548 | - 'heading_text' => __($label, 'geodirectory'), |
|
| 2549 | - 'is_active_tab' => false, |
|
| 2550 | - /** |
|
| 2551 | - * Filter if a custom field should be displayed on the details page tab. |
|
| 2552 | - * |
|
| 2553 | - * @since 1.0.0 |
|
| 2554 | - * @param string $htmlvar_name The field HTML var name. |
|
| 2555 | - */ |
|
| 2556 | - 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),
|
|
| 2557 | - 'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>' |
|
| 2558 | - ); |
|
| 2559 | - } |
|
| 2560 | - } else {
|
|
| 2561 | - if ($html != '') {
|
|
| 2562 | - $tabs_arr[$html_var] = array( |
|
| 2563 | - 'heading_text' => __($label, 'geodirectory'), |
|
| 2564 | - 'is_active_tab' => false, |
|
| 2565 | - /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 2566 | - 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),
|
|
| 2567 | - 'tab_content' => $html |
|
| 2568 | - ); |
|
| 2569 | - } |
|
| 2570 | - } |
|
| 2571 | - } |
|
| 2572 | - } |
|
| 2573 | - } |
|
| 2574 | - } |
|
| 2575 | - return $tabs_arr; |
|
| 2450 | + $post = stripslashes_deep($post); // strip slashes |
|
| 2451 | + |
|
| 2452 | + $field_set_start = 0; |
|
| 2453 | + $fieldset_count = 0; |
|
| 2454 | + $fieldset = ''; |
|
| 2455 | + $total_fields = count($custom_fields); |
|
| 2456 | + $count_field = 0; |
|
| 2457 | + $fieldset_arr = array(); |
|
| 2458 | + $i = 0; |
|
| 2459 | + $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL; |
|
| 2460 | + |
|
| 2461 | + foreach ($custom_fields as $field) {
|
|
| 2462 | + $count_field++; |
|
| 2463 | + $field_name = $field['htmlvar_name']; |
|
| 2464 | + if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2465 | + $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2466 | + } |
|
| 2467 | + |
|
| 2468 | + if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2469 | + $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title']; |
|
| 2470 | + $site_title = trim($field['site_title']); |
|
| 2471 | + $type = $field; |
|
| 2472 | + $variables_array = array(); |
|
| 2473 | + |
|
| 2474 | + if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2475 | + continue; |
|
| 2476 | + } |
|
| 2477 | + |
|
| 2478 | + if ($type['type'] != 'fieldset') {
|
|
| 2479 | + $i++; |
|
| 2480 | + $variables_array['post_id'] = $post->ID; |
|
| 2481 | + $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 2482 | + $variables_array['value'] = isset($post->{$type['htmlvar_name']}) ? $post->{$type['htmlvar_name']} : '';
|
|
| 2483 | + |
|
| 2484 | + }else{
|
|
| 2485 | + $i = 0; |
|
| 2486 | + $fieldset_count++; |
|
| 2487 | + $field_set_start = 1; |
|
| 2488 | + $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count; |
|
| 2489 | + $fieldset_arr[$fieldset_count]['label'] = $label; |
|
| 2490 | + } |
|
| 2491 | + |
|
| 2492 | + |
|
| 2493 | + if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 2494 | + $type = stripslashes_deep($type); // strip slashes |
|
| 2495 | + if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 2496 | + $html = ''; |
|
| 2497 | + $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 2498 | + if($html_var=='post'){$html_var='post_address';}
|
|
| 2499 | + $field_icon = geodir_field_icon_proccess($type); |
|
| 2500 | + $filed_type = $type['type']; |
|
| 2501 | + |
|
| 2502 | + /** |
|
| 2503 | + * Filter the output for custom fields. |
|
| 2504 | + * |
|
| 2505 | + * Here we can remove or add new functions depending on the field type. |
|
| 2506 | + * |
|
| 2507 | + * @param string $html The html to be filtered (blank). |
|
| 2508 | + * @param string $fields_location The location the field is to be show. |
|
| 2509 | + * @param array $type The array of field values. |
|
| 2510 | + */ |
|
| 2511 | + $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 2512 | + |
|
| 2513 | + |
|
| 2514 | + /** |
|
| 2515 | + * Filter custom field output in tab. |
|
| 2516 | + * |
|
| 2517 | + * @since 1.5.6 |
|
| 2518 | + * |
|
| 2519 | + * @param string $html_var The HTML variable name for the field. |
|
| 2520 | + * @param string $html Custom field unfiltered HTML. |
|
| 2521 | + * @param array $variables_array Custom field variables array. |
|
| 2522 | + */ |
|
| 2523 | + $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);
|
|
| 2524 | + |
|
| 2525 | + $fieldset_html = ''; |
|
| 2526 | + if ($field_set_start == 1) {
|
|
| 2527 | + $add_html = false; |
|
| 2528 | + if ($type['type'] == 'fieldset' && $fieldset_count > 1) {
|
|
| 2529 | + if ($fieldset != '') {
|
|
| 2530 | + $add_html = true; |
|
| 2531 | + $label = $fieldset_arr[$fieldset_count - 1]['label']; |
|
| 2532 | + $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name']; |
|
| 2533 | + } |
|
| 2534 | + $fieldset_html = $fieldset; |
|
| 2535 | + $fieldset = ''; |
|
| 2536 | + } else {
|
|
| 2537 | + $fieldset .= $html; |
|
| 2538 | + if ($total_fields == $count_field && $fieldset != '') {
|
|
| 2539 | + $add_html = true; |
|
| 2540 | + $label = $fieldset_arr[$fieldset_count]['label']; |
|
| 2541 | + $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name']; |
|
| 2542 | + $fieldset_html = $fieldset; |
|
| 2543 | + } |
|
| 2544 | + } |
|
| 2545 | + |
|
| 2546 | + if ($add_html) {
|
|
| 2547 | + $tabs_arr[$htmlvar_name] = array( |
|
| 2548 | + 'heading_text' => __($label, 'geodirectory'), |
|
| 2549 | + 'is_active_tab' => false, |
|
| 2550 | + /** |
|
| 2551 | + * Filter if a custom field should be displayed on the details page tab. |
|
| 2552 | + * |
|
| 2553 | + * @since 1.0.0 |
|
| 2554 | + * @param string $htmlvar_name The field HTML var name. |
|
| 2555 | + */ |
|
| 2556 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),
|
|
| 2557 | + 'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>' |
|
| 2558 | + ); |
|
| 2559 | + } |
|
| 2560 | + } else {
|
|
| 2561 | + if ($html != '') {
|
|
| 2562 | + $tabs_arr[$html_var] = array( |
|
| 2563 | + 'heading_text' => __($label, 'geodirectory'), |
|
| 2564 | + 'is_active_tab' => false, |
|
| 2565 | + /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 2566 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),
|
|
| 2567 | + 'tab_content' => $html |
|
| 2568 | + ); |
|
| 2569 | + } |
|
| 2570 | + } |
|
| 2571 | + } |
|
| 2572 | + } |
|
| 2573 | + } |
|
| 2574 | + } |
|
| 2575 | + return $tabs_arr; |
|
| 2576 | 2576 | } |
| 2577 | 2577 | |
| 2578 | 2578 | /* display add listing page for wpml */ |
@@ -2596,39 +2596,39 @@ discard block |
||
| 2596 | 2596 | */ |
| 2597 | 2597 | function geodir_add_post_status_author_page() |
| 2598 | 2598 | {
|
| 2599 | - global $wpdb, $post; |
|
| 2600 | - |
|
| 2601 | - $html = ''; |
|
| 2602 | - if (get_current_user_id()) {
|
|
| 2603 | - |
|
| 2604 | - $is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));
|
|
| 2605 | - if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {
|
|
| 2606 | - |
|
| 2607 | - // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them. |
|
| 2608 | - $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");
|
|
| 2609 | - $status = "<strong>(";
|
|
| 2610 | - $status_icon = '<i class="fa fa-play"></i>'; |
|
| 2611 | - if ($real_status == 'publish') {
|
|
| 2612 | - $status .= __('Published', 'geodirectory');
|
|
| 2613 | - } else {
|
|
| 2614 | - $status .= __('Not published', 'geodirectory');
|
|
| 2615 | - $status_icon = '<i class="fa fa-pause"></i>'; |
|
| 2616 | - } |
|
| 2617 | - $status .= ")</strong>"; |
|
| 2599 | + global $wpdb, $post; |
|
| 2600 | + |
|
| 2601 | + $html = ''; |
|
| 2602 | + if (get_current_user_id()) {
|
|
| 2603 | + |
|
| 2604 | + $is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));
|
|
| 2605 | + if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {
|
|
| 2606 | + |
|
| 2607 | + // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them. |
|
| 2608 | + $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");
|
|
| 2609 | + $status = "<strong>(";
|
|
| 2610 | + $status_icon = '<i class="fa fa-play"></i>'; |
|
| 2611 | + if ($real_status == 'publish') {
|
|
| 2612 | + $status .= __('Published', 'geodirectory');
|
|
| 2613 | + } else {
|
|
| 2614 | + $status .= __('Not published', 'geodirectory');
|
|
| 2615 | + $status_icon = '<i class="fa fa-pause"></i>'; |
|
| 2616 | + } |
|
| 2617 | + $status .= ")</strong>"; |
|
| 2618 | 2618 | |
| 2619 | - $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';
|
|
| 2620 | - } |
|
| 2621 | - } |
|
| 2619 | + $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';
|
|
| 2620 | + } |
|
| 2621 | + } |
|
| 2622 | 2622 | |
| 2623 | - if ($html != '') {
|
|
| 2624 | - /** |
|
| 2625 | - * Filter the post status text on the author page. |
|
| 2626 | - * |
|
| 2627 | - * @since 1.0.0 |
|
| 2628 | - * @param string $html The HTML of the status. |
|
| 2629 | - */ |
|
| 2630 | - echo apply_filters('geodir_filter_status_text_on_author_page', $html);
|
|
| 2631 | - } |
|
| 2623 | + if ($html != '') {
|
|
| 2624 | + /** |
|
| 2625 | + * Filter the post status text on the author page. |
|
| 2626 | + * |
|
| 2627 | + * @since 1.0.0 |
|
| 2628 | + * @param string $html The HTML of the status. |
|
| 2629 | + */ |
|
| 2630 | + echo apply_filters('geodir_filter_status_text_on_author_page', $html);
|
|
| 2631 | + } |
|
| 2632 | 2632 | |
| 2633 | 2633 | |
| 2634 | 2634 | } |
@@ -2642,9 +2642,9 @@ discard block |
||
| 2642 | 2642 | * @package GeoDirectory |
| 2643 | 2643 | */ |
| 2644 | 2644 | function geodir_init_no_rating() {
|
| 2645 | - if (geodir_rating_disabled_post_types()) {
|
|
| 2646 | - add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);
|
|
| 2647 | - } |
|
| 2645 | + if (geodir_rating_disabled_post_types()) {
|
|
| 2646 | + add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);
|
|
| 2647 | + } |
|
| 2648 | 2648 | } |
| 2649 | 2649 | |
| 2650 | 2650 | /** |
@@ -2658,22 +2658,22 @@ discard block |
||
| 2658 | 2658 | * @return array Modified sort options array. |
| 2659 | 2659 | */ |
| 2660 | 2660 | function geodir_no_rating_get_sort_options($options, $post_type = '') {
|
| 2661 | - if (!empty($post_type) && geodir_cpt_has_rating_disabled($post_type)) {
|
|
| 2662 | - $new_options = array(); |
|
| 2661 | + if (!empty($post_type) && geodir_cpt_has_rating_disabled($post_type)) {
|
|
| 2662 | + $new_options = array(); |
|
| 2663 | 2663 | |
| 2664 | - if (!empty($options)) {
|
|
| 2665 | - foreach ($options as $option) {
|
|
| 2666 | - if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {
|
|
| 2667 | - continue; |
|
| 2668 | - } |
|
| 2669 | - $new_options[] = $option; |
|
| 2670 | - } |
|
| 2664 | + if (!empty($options)) {
|
|
| 2665 | + foreach ($options as $option) {
|
|
| 2666 | + if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {
|
|
| 2667 | + continue; |
|
| 2668 | + } |
|
| 2669 | + $new_options[] = $option; |
|
| 2670 | + } |
|
| 2671 | 2671 | |
| 2672 | - $options = $new_options; |
|
| 2673 | - } |
|
| 2674 | - } |
|
| 2672 | + $options = $new_options; |
|
| 2673 | + } |
|
| 2674 | + } |
|
| 2675 | 2675 | |
| 2676 | - return $options; |
|
| 2676 | + return $options; |
|
| 2677 | 2677 | } |
| 2678 | 2678 | |
| 2679 | 2679 | /** |
@@ -2685,9 +2685,9 @@ discard block |
||
| 2685 | 2685 | * @return array Modified class array. |
| 2686 | 2686 | */ |
| 2687 | 2687 | function geodir_body_class_active_map($classes = array()) {
|
| 2688 | - $classes[] = 'gd-map-' . geodir_map_name(); |
|
| 2688 | + $classes[] = 'gd-map-' . geodir_map_name(); |
|
| 2689 | 2689 | |
| 2690 | - return $classes; |
|
| 2690 | + return $classes; |
|
| 2691 | 2691 | } |
| 2692 | 2692 | add_filter('body_class', 'geodir_body_class_active_map', 100);
|
| 2693 | 2693 | |
@@ -2700,9 +2700,9 @@ discard block |
||
| 2700 | 2700 | * @return string Modified class string. |
| 2701 | 2701 | */ |
| 2702 | 2702 | function geodir_admin_body_class_active_map($class = '') {
|
| 2703 | - $class .= ' gd-map-' . geodir_map_name(); |
|
| 2703 | + $class .= ' gd-map-' . geodir_map_name(); |
|
| 2704 | 2704 | |
| 2705 | - return $class; |
|
| 2705 | + return $class; |
|
| 2706 | 2706 | } |
| 2707 | 2707 | add_filter('admin_body_class', 'geodir_admin_body_class_active_map', 100);
|
| 2708 | 2708 | |
@@ -2720,36 +2720,36 @@ discard block |
||
| 2720 | 2720 | * @return array Translation texts. |
| 2721 | 2721 | */ |
| 2722 | 2722 | function geodir_load_gd_options_text_translation($translation_texts = array()) {
|
| 2723 | - $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array(); |
|
| 2724 | - |
|
| 2725 | - $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');
|
|
| 2726 | - |
|
| 2727 | - /** |
|
| 2728 | - * Filters the geodirectory option names that requires to add for translation. |
|
| 2729 | - * |
|
| 2730 | - * @since 1.5.7 |
|
| 2731 | - * @package GeoDirectory |
|
| 2732 | - * |
|
| 2733 | - * @param array $gd_options Array of option names. |
|
| 2734 | - */ |
|
| 2735 | - $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);
|
|
| 2736 | - $gd_options = array_unique($gd_options); |
|
| 2737 | - |
|
| 2738 | - if (!empty($gd_options)) {
|
|
| 2739 | - foreach ($gd_options as $gd_option) {
|
|
| 2740 | - if ($gd_option != '' && $option_value = get_option($gd_option)) {
|
|
| 2741 | - $option_value = is_string($option_value) ? stripslashes_deep($option_value) : ''; |
|
| 2723 | + $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array(); |
|
| 2724 | + |
|
| 2725 | + $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');
|
|
| 2726 | + |
|
| 2727 | + /** |
|
| 2728 | + * Filters the geodirectory option names that requires to add for translation. |
|
| 2729 | + * |
|
| 2730 | + * @since 1.5.7 |
|
| 2731 | + * @package GeoDirectory |
|
| 2732 | + * |
|
| 2733 | + * @param array $gd_options Array of option names. |
|
| 2734 | + */ |
|
| 2735 | + $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);
|
|
| 2736 | + $gd_options = array_unique($gd_options); |
|
| 2737 | + |
|
| 2738 | + if (!empty($gd_options)) {
|
|
| 2739 | + foreach ($gd_options as $gd_option) {
|
|
| 2740 | + if ($gd_option != '' && $option_value = get_option($gd_option)) {
|
|
| 2741 | + $option_value = is_string($option_value) ? stripslashes_deep($option_value) : ''; |
|
| 2742 | 2742 | |
| 2743 | - if ($option_value != '' && !in_array($option_value, $translation_texts)) {
|
|
| 2744 | - $translation_texts[] = stripslashes_deep($option_value); |
|
| 2745 | - } |
|
| 2746 | - } |
|
| 2747 | - } |
|
| 2748 | - } |
|
| 2743 | + if ($option_value != '' && !in_array($option_value, $translation_texts)) {
|
|
| 2744 | + $translation_texts[] = stripslashes_deep($option_value); |
|
| 2745 | + } |
|
| 2746 | + } |
|
| 2747 | + } |
|
| 2748 | + } |
|
| 2749 | 2749 | |
| 2750 | - $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 2750 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 2751 | 2751 | |
| 2752 | - return $translation_texts; |
|
| 2752 | + return $translation_texts; |
|
| 2753 | 2753 | } |
| 2754 | 2754 | |
| 2755 | 2755 | add_filter('geodir_load_db_language', 'geodir_load_gd_options_text_translation');
|
@@ -2763,15 +2763,15 @@ discard block |
||
| 2763 | 2763 | |
| 2764 | 2764 | add_filter('get_comments_link', 'gd_get_comments_link', 10, 2);
|
| 2765 | 2765 | function gd_get_comments_link($comments_link, $post_id) {
|
| 2766 | - $post_type = get_post_type($post_id); |
|
| 2766 | + $post_type = get_post_type($post_id); |
|
| 2767 | 2767 | |
| 2768 | - $all_postypes = geodir_get_posttypes(); |
|
| 2769 | - if (in_array($post_type, $all_postypes)) {
|
|
| 2770 | - $comments_link = str_replace('#comments', '#reviews', $comments_link);
|
|
| 2771 | - $comments_link = str_replace('#respond', '#reviews', $comments_link);
|
|
| 2772 | - } |
|
| 2768 | + $all_postypes = geodir_get_posttypes(); |
|
| 2769 | + if (in_array($post_type, $all_postypes)) {
|
|
| 2770 | + $comments_link = str_replace('#comments', '#reviews', $comments_link);
|
|
| 2771 | + $comments_link = str_replace('#respond', '#reviews', $comments_link);
|
|
| 2772 | + } |
|
| 2773 | 2773 | |
| 2774 | - return $comments_link; |
|
| 2774 | + return $comments_link; |
|
| 2775 | 2775 | } |
| 2776 | 2776 | |
| 2777 | 2777 | |
@@ -2789,11 +2789,11 @@ discard block |
||
| 2789 | 2789 | function geodir_add_nav_menu_class( $args ) |
| 2790 | 2790 | {
|
| 2791 | 2791 | |
| 2792 | - if(isset($args['menu_class'])){
|
|
| 2793 | - $args['menu_class'] = $args['menu_class']." gd-menu-z"; |
|
| 2794 | - } |
|
| 2792 | + if(isset($args['menu_class'])){
|
|
| 2793 | + $args['menu_class'] = $args['menu_class']." gd-menu-z"; |
|
| 2794 | + } |
|
| 2795 | 2795 | |
| 2796 | - return $args; |
|
| 2796 | + return $args; |
|
| 2797 | 2797 | } |
| 2798 | 2798 | |
| 2799 | 2799 | add_filter( 'wp_nav_menu_args', 'geodir_add_nav_menu_class' ); |
@@ -2810,15 +2810,15 @@ discard block |
||
| 2810 | 2810 | * @return string Filtered locale ID. |
| 2811 | 2811 | */ |
| 2812 | 2812 | function geodir_wpml_filter_locale($locale) {
|
| 2813 | - global $sitepress; |
|
| 2813 | + global $sitepress; |
|
| 2814 | 2814 | |
| 2815 | - $post_type = !empty($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (!empty($_REQUEST['post']) ? get_post_type($_REQUEST['post']) : ''); |
|
| 2815 | + $post_type = !empty($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (!empty($_REQUEST['post']) ? get_post_type($_REQUEST['post']) : ''); |
|
| 2816 | 2816 | |
| 2817 | - if (!empty($sitepress) && $sitepress->is_post_edit_screen() && $post_type && in_array($post_type, geodir_get_posttypes()) && $current_lang = $sitepress->get_current_language()) {
|
|
| 2818 | - $locale = $sitepress->get_locale($current_lang); |
|
| 2819 | - } |
|
| 2817 | + if (!empty($sitepress) && $sitepress->is_post_edit_screen() && $post_type && in_array($post_type, geodir_get_posttypes()) && $current_lang = $sitepress->get_current_language()) {
|
|
| 2818 | + $locale = $sitepress->get_locale($current_lang); |
|
| 2819 | + } |
|
| 2820 | 2820 | |
| 2821 | - return $locale; |
|
| 2821 | + return $locale; |
|
| 2822 | 2822 | } |
| 2823 | 2823 | |
| 2824 | 2824 | /** |
@@ -2828,19 +2828,19 @@ discard block |
||
| 2828 | 2828 | * @package GeoDirectory |
| 2829 | 2829 | */ |
| 2830 | 2830 | function geodir_wpml_set_filter() {
|
| 2831 | - if (geodir_is_wpml()) {
|
|
| 2832 | - global $sitepress; |
|
| 2831 | + if (geodir_is_wpml()) {
|
|
| 2832 | + global $sitepress; |
|
| 2833 | 2833 | |
| 2834 | - if ($sitepress->get_setting('sync_comments_on_duplicates')) {
|
|
| 2835 | - add_action('comment_post', 'gepdir_wpml_sync_comment', 100, 1);
|
|
| 2836 | - } |
|
| 2834 | + if ($sitepress->get_setting('sync_comments_on_duplicates')) {
|
|
| 2835 | + add_action('comment_post', 'gepdir_wpml_sync_comment', 100, 1);
|
|
| 2836 | + } |
|
| 2837 | 2837 | |
| 2838 | - add_action('geodir_after_save_listing', 'geodir_wpml_duplicate_listing', 100, 2);
|
|
| 2839 | - add_action( 'geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1 ); |
|
| 2840 | - if (is_admin()) {
|
|
| 2841 | - add_filter( 'geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1 ); |
|
| 2842 | - } |
|
| 2843 | - } |
|
| 2838 | + add_action('geodir_after_save_listing', 'geodir_wpml_duplicate_listing', 100, 2);
|
|
| 2839 | + add_action( 'geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1 ); |
|
| 2840 | + if (is_admin()) {
|
|
| 2841 | + add_filter( 'geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1 ); |
|
| 2842 | + } |
|
| 2843 | + } |
|
| 2844 | 2844 | } |
| 2845 | 2845 | add_filter('plugins_loaded', 'geodir_wpml_set_filter');
|
| 2846 | 2846 | |
@@ -2853,38 +2853,38 @@ discard block |
||
| 2853 | 2853 | * @return array Filtered languages. |
| 2854 | 2854 | */ |
| 2855 | 2855 | function geodir_wpml_filter_ls_languages($languages) {
|
| 2856 | - if (geodir_is_geodir_page()) {
|
|
| 2857 | - $keep_vars = array(); |
|
| 2856 | + if (geodir_is_geodir_page()) {
|
|
| 2857 | + $keep_vars = array(); |
|
| 2858 | 2858 | |
| 2859 | - if (geodir_is_page('add-listing')) {
|
|
| 2860 | - $keep_vars = array('listing_type', 'package_id');
|
|
| 2861 | - } else if (geodir_is_page('search')) {
|
|
| 2862 | - $keep_vars = array('geodir_search', 'stype', 'snear', 'set_location_type', 'set_location_val', 'sgeo_lat', 'sgeo_lon');
|
|
| 2863 | - } else if (geodir_is_page('author')) {
|
|
| 2864 | - $keep_vars = array('geodir_dashbord', 'stype', 'list');
|
|
| 2865 | - } else if (geodir_is_page('login')) {
|
|
| 2866 | - $keep_vars = array('forgot', 'signup');
|
|
| 2867 | - } |
|
| 2859 | + if (geodir_is_page('add-listing')) {
|
|
| 2860 | + $keep_vars = array('listing_type', 'package_id');
|
|
| 2861 | + } else if (geodir_is_page('search')) {
|
|
| 2862 | + $keep_vars = array('geodir_search', 'stype', 'snear', 'set_location_type', 'set_location_val', 'sgeo_lat', 'sgeo_lon');
|
|
| 2863 | + } else if (geodir_is_page('author')) {
|
|
| 2864 | + $keep_vars = array('geodir_dashbord', 'stype', 'list');
|
|
| 2865 | + } else if (geodir_is_page('login')) {
|
|
| 2866 | + $keep_vars = array('forgot', 'signup');
|
|
| 2867 | + } |
|
| 2868 | 2868 | |
| 2869 | - if (!empty($keep_vars)) {
|
|
| 2870 | - foreach ( $languages as $code => $url) {
|
|
| 2871 | - $filter_url = $url['url']; |
|
| 2869 | + if (!empty($keep_vars)) {
|
|
| 2870 | + foreach ( $languages as $code => $url) {
|
|
| 2871 | + $filter_url = $url['url']; |
|
| 2872 | 2872 | |
| 2873 | - foreach ($keep_vars as $var) {
|
|
| 2874 | - if (isset($_GET[$var]) && !is_array($_GET[$var])) {
|
|
| 2875 | - $filter_url = remove_query_arg(array($var), $filter_url); |
|
| 2876 | - $filter_url = add_query_arg(array($var => $_GET[$var]), $filter_url); |
|
| 2877 | - } |
|
| 2878 | - } |
|
| 2873 | + foreach ($keep_vars as $var) {
|
|
| 2874 | + if (isset($_GET[$var]) && !is_array($_GET[$var])) {
|
|
| 2875 | + $filter_url = remove_query_arg(array($var), $filter_url); |
|
| 2876 | + $filter_url = add_query_arg(array($var => $_GET[$var]), $filter_url); |
|
| 2877 | + } |
|
| 2878 | + } |
|
| 2879 | 2879 | |
| 2880 | - if ($filter_url != $url['url']) {
|
|
| 2881 | - $languages[$code]['url'] = $filter_url; |
|
| 2882 | - } |
|
| 2883 | - } |
|
| 2884 | - } |
|
| 2885 | - } |
|
| 2880 | + if ($filter_url != $url['url']) {
|
|
| 2881 | + $languages[$code]['url'] = $filter_url; |
|
| 2882 | + } |
|
| 2883 | + } |
|
| 2884 | + } |
|
| 2885 | + } |
|
| 2886 | 2886 | |
| 2887 | - return $languages; |
|
| 2887 | + return $languages; |
|
| 2888 | 2888 | } |
| 2889 | 2889 | add_filter( 'icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1 ); |
| 2890 | 2890 | |
@@ -2895,18 +2895,18 @@ discard block |
||
| 2895 | 2895 | * |
| 2896 | 2896 | */ |
| 2897 | 2897 | function geodir_remove_yoast_seo_metas(){
|
| 2898 | - if ( class_exists( 'WPSEO_Frontend' ) && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas() ) {
|
|
| 2899 | - $wpseo = WPSEO_Frontend::get_instance(); |
|
| 2898 | + if ( class_exists( 'WPSEO_Frontend' ) && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas() ) {
|
|
| 2899 | + $wpseo = WPSEO_Frontend::get_instance(); |
|
| 2900 | 2900 | |
| 2901 | - remove_action( 'wp_head', array( $wpseo, 'metadesc' ), 6 ); |
|
| 2902 | - remove_action( 'wp_head', array( $wpseo, 'metakeywords' ), 11 ); |
|
| 2903 | - remove_filter( 'pre_get_document_title', array( $wpseo, 'title' ), 15 ); |
|
| 2904 | - remove_filter( 'wp_title', array( $wpseo, 'title' ), 15, 3 ); |
|
| 2905 | - remove_filter( 'thematic_doctitle', array( $wpseo, 'title' ), 15 ); |
|
| 2906 | - remove_filter( 'woo_title', array( $wpseo, 'fix_woo_title' ), 99 ); |
|
| 2901 | + remove_action( 'wp_head', array( $wpseo, 'metadesc' ), 6 ); |
|
| 2902 | + remove_action( 'wp_head', array( $wpseo, 'metakeywords' ), 11 ); |
|
| 2903 | + remove_filter( 'pre_get_document_title', array( $wpseo, 'title' ), 15 ); |
|
| 2904 | + remove_filter( 'wp_title', array( $wpseo, 'title' ), 15, 3 ); |
|
| 2905 | + remove_filter( 'thematic_doctitle', array( $wpseo, 'title' ), 15 ); |
|
| 2906 | + remove_filter( 'woo_title', array( $wpseo, 'fix_woo_title' ), 99 ); |
|
| 2907 | 2907 | |
| 2908 | - remove_action( 'template_redirect', 'wpseo_frontend_head_init', 999 ); |
|
| 2909 | - } |
|
| 2908 | + remove_action( 'template_redirect', 'wpseo_frontend_head_init', 999 ); |
|
| 2909 | + } |
|
| 2910 | 2910 | } |
| 2911 | 2911 | |
| 2912 | 2912 | /** |
@@ -2920,20 +2920,20 @@ discard block |
||
| 2920 | 2920 | * |
| 2921 | 2921 | */ |
| 2922 | 2922 | function geodir_wpml_ajax_set_guest_lang() {
|
| 2923 | - if ( geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in() ) {
|
|
| 2924 | - if ( empty( $_GET['lang'] ) && !( !empty( $_SERVER['REQUEST_URI'] ) && preg_match( '@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename( preg_replace( '@\?.*$@', '', $_SERVER['REQUEST_URI'] ) ) ) ) ) {
|
|
| 2925 | - global $sitepress; |
|
| 2923 | + if ( geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in() ) {
|
|
| 2924 | + if ( empty( $_GET['lang'] ) && !( !empty( $_SERVER['REQUEST_URI'] ) && preg_match( '@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename( preg_replace( '@\?.*$@', '', $_SERVER['REQUEST_URI'] ) ) ) ) ) {
|
|
| 2925 | + global $sitepress; |
|
| 2926 | 2926 | |
| 2927 | - $referer = wp_get_referer(); |
|
| 2927 | + $referer = wp_get_referer(); |
|
| 2928 | 2928 | |
| 2929 | - $current_lang = $sitepress->get_current_language(); |
|
| 2930 | - $referrer_lang = $sitepress->get_language_from_url( $referer ); |
|
| 2929 | + $current_lang = $sitepress->get_current_language(); |
|
| 2930 | + $referrer_lang = $sitepress->get_language_from_url( $referer ); |
|
| 2931 | 2931 | |
| 2932 | - if ( $referrer_lang && $current_lang != $referrer_lang ) {
|
|
| 2933 | - $_GET['lang'] = $referrer_lang; |
|
| 2934 | - } |
|
| 2935 | - } |
|
| 2936 | - } |
|
| 2932 | + if ( $referrer_lang && $current_lang != $referrer_lang ) {
|
|
| 2933 | + $_GET['lang'] = $referrer_lang; |
|
| 2934 | + } |
|
| 2935 | + } |
|
| 2936 | + } |
|
| 2937 | 2937 | } |
| 2938 | 2938 | add_action( 'plugins_loaded', 'geodir_wpml_ajax_set_guest_lang', -1 ); |
| 2939 | 2939 | |
@@ -2945,36 +2945,36 @@ discard block |
||
| 2945 | 2945 | * @param object $wp The WordPress object. |
| 2946 | 2946 | */ |
| 2947 | 2947 | function geodir_check_redirect($wp) {
|
| 2948 | - if (is_404() || (!empty($wp->query_vars['error']) && $wp->query_vars['error'] == '404')) {
|
|
| 2949 | - $current_url = geodir_curPageURL(); |
|
| 2950 | - $search = 'czech-republic'; |
|
| 2951 | - $replace = 'czechia'; |
|
| 2948 | + if (is_404() || (!empty($wp->query_vars['error']) && $wp->query_vars['error'] == '404')) {
|
|
| 2949 | + $current_url = geodir_curPageURL(); |
|
| 2950 | + $search = 'czech-republic'; |
|
| 2951 | + $replace = 'czechia'; |
|
| 2952 | 2952 | |
| 2953 | - $has_slash = substr($current_url, -1); |
|
| 2954 | - if ($has_slash != "/") {
|
|
| 2955 | - $current_url .= '/'; |
|
| 2956 | - } |
|
| 2953 | + $has_slash = substr($current_url, -1); |
|
| 2954 | + if ($has_slash != "/") {
|
|
| 2955 | + $current_url .= '/'; |
|
| 2956 | + } |
|
| 2957 | 2957 | |
| 2958 | - $redirect = false; |
|
| 2959 | - if (strpos($current_url, '/' . $search . '/') !== false) {
|
|
| 2960 | - $redirect = true; |
|
| 2961 | - $current_url = preg_replace('/\/' . $search . '\//', '/' . $replace . '/', $current_url, 1);
|
|
| 2962 | - } |
|
| 2958 | + $redirect = false; |
|
| 2959 | + if (strpos($current_url, '/' . $search . '/') !== false) {
|
|
| 2960 | + $redirect = true; |
|
| 2961 | + $current_url = preg_replace('/\/' . $search . '\//', '/' . $replace . '/', $current_url, 1);
|
|
| 2962 | + } |
|
| 2963 | 2963 | |
| 2964 | - if ($has_slash != "/") {
|
|
| 2965 | - $current_url = trim($current_url, '/'); |
|
| 2966 | - } |
|
| 2964 | + if ($has_slash != "/") {
|
|
| 2965 | + $current_url = trim($current_url, '/'); |
|
| 2966 | + } |
|
| 2967 | 2967 | |
| 2968 | - if (strpos($current_url, 'gd_country=' . $search) !== false) {
|
|
| 2969 | - $redirect = true; |
|
| 2970 | - $current_url = str_replace('gd_country=' . $search, 'gd_country=' . $replace, $current_url);
|
|
| 2971 | - } |
|
| 2972 | - |
|
| 2973 | - if ($redirect) {
|
|
| 2974 | - wp_redirect($current_url); |
|
| 2975 | - exit; |
|
| 2976 | - } |
|
| 2977 | - } |
|
| 2968 | + if (strpos($current_url, 'gd_country=' . $search) !== false) {
|
|
| 2969 | + $redirect = true; |
|
| 2970 | + $current_url = str_replace('gd_country=' . $search, 'gd_country=' . $replace, $current_url);
|
|
| 2971 | + } |
|
| 2972 | + |
|
| 2973 | + if ($redirect) {
|
|
| 2974 | + wp_redirect($current_url); |
|
| 2975 | + exit; |
|
| 2976 | + } |
|
| 2977 | + } |
|
| 2978 | 2978 | } |
| 2979 | 2979 | add_action('parse_request', 'geodir_check_redirect', 101, 1);
|
| 2980 | 2980 | |
@@ -2994,50 +2994,50 @@ discard block |
||
| 2994 | 2994 | * @param string $original_slug The original post slug. |
| 2995 | 2995 | */ |
| 2996 | 2996 | function geodir_check_post_to_term_slug( $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug ) {
|
| 2997 | - global $wpdb, $sitepress; |
|
| 2997 | + global $wpdb, $sitepress; |
|
| 2998 | 2998 | |
| 2999 | - if ( $post_type && strpos( $post_type, 'gd_' ) === 0 ) {
|
|
| 3000 | - $wpml_post_join = ""; |
|
| 3001 | - $wpml_post_where = ""; |
|
| 3002 | - $wpml_term_join = ""; |
|
| 3003 | - $wpml_term_where = ""; |
|
| 2999 | + if ( $post_type && strpos( $post_type, 'gd_' ) === 0 ) {
|
|
| 3000 | + $wpml_post_join = ""; |
|
| 3001 | + $wpml_post_where = ""; |
|
| 3002 | + $wpml_term_join = ""; |
|
| 3003 | + $wpml_term_where = ""; |
|
| 3004 | 3004 | |
| 3005 | - if (geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 3006 | - $post_language = $post_ID ? $sitepress->post_translations()->get_element_lang_code($post_ID) : $sitepress->get_current_language(); |
|
| 3007 | - $post_language = $post_language ? $post_language : $sitepress->post_translations()->get_save_post_lang($post_ID, $sitepress); |
|
| 3008 | - if (!$post_language) {
|
|
| 3009 | - $post_language = $sitepress->get_current_language(); |
|
| 3010 | - } |
|
| 3005 | + if (geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 3006 | + $post_language = $post_ID ? $sitepress->post_translations()->get_element_lang_code($post_ID) : $sitepress->get_current_language(); |
|
| 3007 | + $post_language = $post_language ? $post_language : $sitepress->post_translations()->get_save_post_lang($post_ID, $sitepress); |
|
| 3008 | + if (!$post_language) {
|
|
| 3009 | + $post_language = $sitepress->get_current_language(); |
|
| 3010 | + } |
|
| 3011 | 3011 | |
| 3012 | - $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";
|
|
| 3013 | - $wpml_post_where = " AND icl_t.language_code = '" . $post_language ."'"; |
|
| 3012 | + $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";
|
|
| 3013 | + $wpml_post_where = " AND icl_t.language_code = '" . $post_language ."'"; |
|
| 3014 | 3014 | |
| 3015 | - $wpml_term_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON icl_t.element_id = tt.term_taxonomy_id AND icl_t.element_type = CONCAT('tax_', tt.taxonomy)";
|
|
| 3016 | - $wpml_term_where = " AND icl_t.language_code = '" . $post_language ."'"; |
|
| 3017 | - } |
|
| 3015 | + $wpml_term_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON icl_t.element_id = tt.term_taxonomy_id AND icl_t.element_type = CONCAT('tax_', tt.taxonomy)";
|
|
| 3016 | + $wpml_term_where = " AND icl_t.language_code = '" . $post_language ."'"; |
|
| 3017 | + } |
|
| 3018 | 3018 | |
| 3019 | - $term_slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $slug ) );
|
|
| 3019 | + $term_slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $slug ) );
|
|
| 3020 | 3020 | |
| 3021 | - if ( $term_slug_check ) {
|
|
| 3022 | - $suffix = 1; |
|
| 3021 | + if ( $term_slug_check ) {
|
|
| 3022 | + $suffix = 1; |
|
| 3023 | 3023 | |
| 3024 | - do {
|
|
| 3025 | - $alt_slug = _truncate_post_slug( $original_slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; |
|
| 3024 | + do {
|
|
| 3025 | + $alt_slug = _truncate_post_slug( $original_slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; |
|
| 3026 | 3026 | |
| 3027 | - $term_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $alt_slug ) );
|
|
| 3027 | + $term_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $alt_slug ) );
|
|
| 3028 | 3028 | |
| 3029 | - $post_check = !$term_check && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s AND p.ID != %d {$wpml_term_where} LIMIT 1", $alt_slug, $post_type, $post_ID ) );
|
|
| 3029 | + $post_check = !$term_check && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s AND p.ID != %d {$wpml_term_where} LIMIT 1", $alt_slug, $post_type, $post_ID ) );
|
|
| 3030 | 3030 | |
| 3031 | - $term_slug_check = $term_check || $post_check; |
|
| 3031 | + $term_slug_check = $term_check || $post_check; |
|
| 3032 | 3032 | |
| 3033 | - $suffix++; |
|
| 3034 | - } while ( $term_slug_check ); |
|
| 3033 | + $suffix++; |
|
| 3034 | + } while ( $term_slug_check ); |
|
| 3035 | 3035 | |
| 3036 | - $slug = $alt_slug; |
|
| 3037 | - } |
|
| 3038 | - } |
|
| 3036 | + $slug = $alt_slug; |
|
| 3037 | + } |
|
| 3038 | + } |
|
| 3039 | 3039 | |
| 3040 | - return $slug; |
|
| 3040 | + return $slug; |
|
| 3041 | 3041 | } |
| 3042 | 3042 | add_filter( 'wp_unique_post_slug', 'geodir_check_post_to_term_slug', 101, 6 ); |
| 3043 | 3043 | |
@@ -3057,47 +3057,47 @@ discard block |
||
| 3057 | 3057 | * @return bool true when exists. false when not exists. |
| 3058 | 3058 | */ |
| 3059 | 3059 | function geodir_check_term_to_post_slug( $slug_exists, $slug, $term_id ) {
|
| 3060 | - global $wpdb, $gd_term_post_type, $gd_term_taxonomy, $sitepress; |
|
| 3060 | + global $wpdb, $gd_term_post_type, $gd_term_taxonomy, $sitepress; |
|
| 3061 | 3061 | |
| 3062 | - if ( $slug_exists ) {
|
|
| 3063 | - return $slug_exists; |
|
| 3064 | - } |
|
| 3062 | + if ( $slug_exists ) {
|
|
| 3063 | + return $slug_exists; |
|
| 3064 | + } |
|
| 3065 | 3065 | |
| 3066 | - if ( !empty( $gd_term_taxonomy ) && isset($gd_term_taxonomy[$term_id]) ) {
|
|
| 3067 | - $taxonomy = $gd_term_taxonomy[$term_id]; |
|
| 3068 | - } else {
|
|
| 3069 | - $taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id ) ); |
|
| 3070 | - $gd_term_taxonomy[$term_id] = $taxonomy; |
|
| 3071 | - } |
|
| 3066 | + if ( !empty( $gd_term_taxonomy ) && isset($gd_term_taxonomy[$term_id]) ) {
|
|
| 3067 | + $taxonomy = $gd_term_taxonomy[$term_id]; |
|
| 3068 | + } else {
|
|
| 3069 | + $taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id ) ); |
|
| 3070 | + $gd_term_taxonomy[$term_id] = $taxonomy; |
|
| 3071 | + } |
|
| 3072 | 3072 | |
| 3073 | - if ( empty($taxonomy) ) {
|
|
| 3074 | - return $slug_exists; |
|
| 3075 | - } |
|
| 3073 | + if ( empty($taxonomy) ) {
|
|
| 3074 | + return $slug_exists; |
|
| 3075 | + } |
|
| 3076 | 3076 | |
| 3077 | - if ( !empty( $gd_term_post_type ) && $gd_term_post_type[$term_id] ) {
|
|
| 3078 | - $post_type = $gd_term_post_type[$term_id]; |
|
| 3079 | - } else {
|
|
| 3080 | - $taxonomy_obj = get_taxonomy( $taxonomy ); |
|
| 3081 | - $post_type = !empty( $taxonomy_obj->object_type ) ? $taxonomy_obj->object_type[0] : NULL; |
|
| 3082 | - } |
|
| 3077 | + if ( !empty( $gd_term_post_type ) && $gd_term_post_type[$term_id] ) {
|
|
| 3078 | + $post_type = $gd_term_post_type[$term_id]; |
|
| 3079 | + } else {
|
|
| 3080 | + $taxonomy_obj = get_taxonomy( $taxonomy ); |
|
| 3081 | + $post_type = !empty( $taxonomy_obj->object_type ) ? $taxonomy_obj->object_type[0] : NULL; |
|
| 3082 | + } |
|
| 3083 | 3083 | |
| 3084 | - $wpml_post_join = ""; |
|
| 3085 | - $wpml_post_where = ""; |
|
| 3084 | + $wpml_post_join = ""; |
|
| 3085 | + $wpml_post_where = ""; |
|
| 3086 | 3086 | |
| 3087 | - if (geodir_wpml_is_taxonomy_translated($taxonomy) || geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 3088 | - $term_language = $term_id ? geodir_get_language_for_element($term_id, 'tax_' . $taxonomy) : $sitepress->get_current_language(); |
|
| 3089 | - if (!$term_language) {
|
|
| 3090 | - $term_language = $sitepress->get_current_language(); |
|
| 3091 | - } |
|
| 3087 | + if (geodir_wpml_is_taxonomy_translated($taxonomy) || geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 3088 | + $term_language = $term_id ? geodir_get_language_for_element($term_id, 'tax_' . $taxonomy) : $sitepress->get_current_language(); |
|
| 3089 | + if (!$term_language) {
|
|
| 3090 | + $term_language = $sitepress->get_current_language(); |
|
| 3091 | + } |
|
| 3092 | 3092 | |
| 3093 | - $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";
|
|
| 3094 | - $wpml_post_where = " AND icl_t.language_code = '" . $term_language ."'"; |
|
| 3095 | - } |
|
| 3093 | + $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";
|
|
| 3094 | + $wpml_post_where = " AND icl_t.language_code = '" . $term_language ."'"; |
|
| 3095 | + } |
|
| 3096 | 3096 | |
| 3097 | - if ( $post_type && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s {$wpml_post_where} LIMIT 1", $slug, $post_type ) ) ) {
|
|
| 3098 | - $slug_exists = true; |
|
| 3099 | - } |
|
| 3097 | + if ( $post_type && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s {$wpml_post_where} LIMIT 1", $slug, $post_type ) ) ) {
|
|
| 3098 | + $slug_exists = true; |
|
| 3099 | + } |
|
| 3100 | 3100 | |
| 3101 | - return $slug_exists; |
|
| 3101 | + return $slug_exists; |
|
| 3102 | 3102 | } |
| 3103 | 3103 | add_filter( 'geodir_term_slug_is_exists', 'geodir_check_term_to_post_slug', 10, 3 ); |
| 3104 | 3104 | \ No newline at end of file |
@@ -19,132 +19,132 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | function geodir_locate_template($template = '') |
| 21 | 21 | {
|
| 22 | - global $post_type, $wp, $post; |
|
| 23 | - $fields = array(); |
|
| 24 | - |
|
| 25 | - switch ($template): |
|
| 26 | - case 'signup': |
|
| 27 | - return $template = locate_template(array("geodirectory/geodir-signup.php"));
|
|
| 28 | - break; |
|
| 29 | - case 'add-listing': |
|
| 30 | - $gd_post_types = geodir_get_posttypes(); |
|
| 22 | + global $post_type, $wp, $post; |
|
| 23 | + $fields = array(); |
|
| 24 | + |
|
| 25 | + switch ($template): |
|
| 26 | + case 'signup': |
|
| 27 | + return $template = locate_template(array("geodirectory/geodir-signup.php"));
|
|
| 28 | + break; |
|
| 29 | + case 'add-listing': |
|
| 30 | + $gd_post_types = geodir_get_posttypes(); |
|
| 31 | 31 | |
| 32 | - if (!(!empty($post_type) && in_array($post_type, $gd_post_types))) {
|
|
| 33 | - $post_type = ''; |
|
| 34 | - } |
|
| 32 | + if (!(!empty($post_type) && in_array($post_type, $gd_post_types))) {
|
|
| 33 | + $post_type = ''; |
|
| 34 | + } |
|
| 35 | 35 | |
| 36 | - $sc_post_type = ''; |
|
| 37 | - if (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
|
|
| 38 | - $listing_page_id = $post->ID; |
|
| 36 | + $sc_post_type = ''; |
|
| 37 | + if (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
|
|
| 38 | + $listing_page_id = $post->ID; |
|
| 39 | 39 | |
| 40 | - $regex_pattern = get_shortcode_regex(); |
|
| 41 | - preg_match('/'.$regex_pattern.'/s', $post->post_content, $regex_matches);
|
|
| 40 | + $regex_pattern = get_shortcode_regex(); |
|
| 41 | + preg_match('/'.$regex_pattern.'/s', $post->post_content, $regex_matches);
|
|
| 42 | 42 | |
| 43 | - if (!empty($regex_matches) && isset($regex_matches[2]) == 'gd_add_listing' && isset($regex_matches[3])) {
|
|
| 44 | - $shortcode_atts = shortcode_parse_atts($regex_matches[3]); |
|
| 45 | - $sc_post_type = !empty($shortcode_atts) && isset($shortcode_atts['listing_type']) && !empty($shortcode_atts['listing_type']) ? $shortcode_atts['listing_type'] : ''; |
|
| 46 | - } |
|
| 47 | - } else {
|
|
| 48 | - $listing_page_id = geodir_add_listing_page_id(); |
|
| 49 | - } |
|
| 43 | + if (!empty($regex_matches) && isset($regex_matches[2]) == 'gd_add_listing' && isset($regex_matches[3])) {
|
|
| 44 | + $shortcode_atts = shortcode_parse_atts($regex_matches[3]); |
|
| 45 | + $sc_post_type = !empty($shortcode_atts) && isset($shortcode_atts['listing_type']) && !empty($shortcode_atts['listing_type']) ? $shortcode_atts['listing_type'] : ''; |
|
| 46 | + } |
|
| 47 | + } else {
|
|
| 48 | + $listing_page_id = geodir_add_listing_page_id(); |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - $is_wpml = geodir_is_wpml() ? true : false; |
|
| 51 | + $is_wpml = geodir_is_wpml() ? true : false; |
|
| 52 | 52 | |
| 53 | - if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type']) |
|
| 54 | - && in_array($_REQUEST['listing_type'], $gd_post_types)) {
|
|
| 55 | - $post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 56 | - } |
|
| 53 | + if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type']) |
|
| 54 | + && in_array($_REQUEST['listing_type'], $gd_post_types)) {
|
|
| 55 | + $post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 56 | + } |
|
| 57 | 57 | |
| 58 | - if (empty($post_type) && !isset($_REQUEST['pid'])) {
|
|
| 59 | - $pagename = $wp->query_vars['pagename']; |
|
| 58 | + if (empty($post_type) && !isset($_REQUEST['pid'])) {
|
|
| 59 | + $pagename = $wp->query_vars['pagename']; |
|
| 60 | 60 | |
| 61 | - if (!empty($gd_post_types)) {
|
|
| 62 | - $post_type = $gd_post_types[0]; |
|
| 63 | - } |
|
| 61 | + if (!empty($gd_post_types)) {
|
|
| 62 | + $post_type = $gd_post_types[0]; |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - if ($sc_post_type != '') {
|
|
| 66 | - $post_type = $sc_post_type; |
|
| 67 | - } |
|
| 65 | + if ($sc_post_type != '') {
|
|
| 66 | + $post_type = $sc_post_type; |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - if (empty($post_type) && !empty($gd_post_types)) {
|
|
| 70 | - $post_type = $gd_post_types[0]; |
|
| 71 | - } |
|
| 69 | + if (empty($post_type) && !empty($gd_post_types)) {
|
|
| 70 | + $post_type = $gd_post_types[0]; |
|
| 71 | + } |
|
| 72 | 72 | |
| 73 | - if ($is_wpml && !empty($wp->query_vars['page_id'])) {
|
|
| 74 | - wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));
|
|
| 75 | - } else {
|
|
| 76 | - wp_redirect(trailingslashit(get_site_url()) . $pagename . '/?listing_type=' . $post_type); |
|
| 77 | - } |
|
| 78 | - gd_die(); |
|
| 79 | - } |
|
| 80 | - return $template = locate_template(array("geodirectory/add-{$post_type}.php", "geodirectory/add-listing.php"));
|
|
| 81 | - break; |
|
| 82 | - case 'success': |
|
| 83 | - $success_page_id = geodir_success_page_id(); |
|
| 84 | - if ($success_page_id != '' && is_page($success_page_id) && isset($_REQUEST['listing_type']) |
|
| 85 | - && in_array($_REQUEST['listing_type'], geodir_get_posttypes()) |
|
| 86 | - ) |
|
| 87 | - $post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 88 | - return $template = locate_template(array("geodirectory/{$post_type}-success.php", "geodirectory/listing-success.php"));
|
|
| 89 | - break; |
|
| 90 | - case 'detail': |
|
| 91 | - case 'preview': |
|
| 92 | - if (in_array(get_post_type(), geodir_get_posttypes())) |
|
| 93 | - $post_type = get_post_type(); |
|
| 94 | - return $template = locate_template(array("geodirectory/single-{$post_type}.php", "geodirectory/listing-detail.php"));
|
|
| 95 | - break; |
|
| 96 | - case 'listing': |
|
| 97 | - $templates = array(); |
|
| 98 | - if (is_post_type_archive() && in_array(get_post_type(), geodir_get_posttypes())) {
|
|
| 99 | - $post_type = get_post_type(); |
|
| 100 | - $templates[] = "geodirectory/archive-$post_type.php"; |
|
| 101 | - } |
|
| 102 | - |
|
| 103 | - |
|
| 104 | - if (is_tax() && geodir_get_taxonomy_posttype()) {
|
|
| 105 | - $query_obj = get_queried_object(); |
|
| 106 | - $curr_taxonomy = isset($query_obj->taxonomy) ? $query_obj->taxonomy : ''; |
|
| 107 | - $curr_term = isset($query_obj->slug) ? $query_obj->slug : ''; |
|
| 108 | - $templates[] = "geodirectory/taxonomy-$curr_taxonomy-$curr_term.php"; |
|
| 109 | - $templates[] = "geodirectory/taxonomy-$curr_taxonomy.php"; |
|
| 110 | - } |
|
| 111 | - |
|
| 112 | - $templates[] = "geodirectory/geodir-listing.php"; |
|
| 113 | - |
|
| 114 | - return $template = locate_template($templates); |
|
| 115 | - break; |
|
| 116 | - case 'information': |
|
| 117 | - return $template = locate_template(array("geodirectory/geodir-information.php"));
|
|
| 118 | - break; |
|
| 119 | - case 'author': |
|
| 120 | - return $template = locate_template(array("geodirectory/geodir-author.php"));
|
|
| 121 | - break; |
|
| 122 | - case 'search': |
|
| 123 | - return $template = locate_template(array("geodirectory/geodir-search.php"));
|
|
| 124 | - break; |
|
| 125 | - case 'location': |
|
| 126 | - return $template = locate_template(array("geodirectory/geodir-location.php"));
|
|
| 127 | - break; |
|
| 128 | - case 'geodir-home': |
|
| 129 | - return $template = locate_template(array("geodirectory/geodir-home.php"));
|
|
| 130 | - break; |
|
| 131 | - case 'listing-listview': |
|
| 132 | - $template = locate_template(array("geodirectory/listing-listview.php"));
|
|
| 133 | - if (!$template) {
|
|
| 134 | - $template = geodir_plugin_path() . '/geodirectory-templates/listing-listview.php'; |
|
| 135 | - } |
|
| 136 | - return $template; |
|
| 137 | - break; |
|
| 138 | - case 'widget-listing-listview': |
|
| 139 | - $template = locate_template(array("geodirectory/widget-listing-listview.php"));
|
|
| 140 | - if (!$template) {
|
|
| 141 | - $template = geodir_plugin_path() . '/geodirectory-templates/widget-listing-listview.php'; |
|
| 142 | - } |
|
| 143 | - return $template; |
|
| 144 | - break; |
|
| 145 | - endswitch; |
|
| 146 | - |
|
| 147 | - return false; |
|
| 73 | + if ($is_wpml && !empty($wp->query_vars['page_id'])) {
|
|
| 74 | + wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));
|
|
| 75 | + } else {
|
|
| 76 | + wp_redirect(trailingslashit(get_site_url()) . $pagename . '/?listing_type=' . $post_type); |
|
| 77 | + } |
|
| 78 | + gd_die(); |
|
| 79 | + } |
|
| 80 | + return $template = locate_template(array("geodirectory/add-{$post_type}.php", "geodirectory/add-listing.php"));
|
|
| 81 | + break; |
|
| 82 | + case 'success': |
|
| 83 | + $success_page_id = geodir_success_page_id(); |
|
| 84 | + if ($success_page_id != '' && is_page($success_page_id) && isset($_REQUEST['listing_type']) |
|
| 85 | + && in_array($_REQUEST['listing_type'], geodir_get_posttypes()) |
|
| 86 | + ) |
|
| 87 | + $post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 88 | + return $template = locate_template(array("geodirectory/{$post_type}-success.php", "geodirectory/listing-success.php"));
|
|
| 89 | + break; |
|
| 90 | + case 'detail': |
|
| 91 | + case 'preview': |
|
| 92 | + if (in_array(get_post_type(), geodir_get_posttypes())) |
|
| 93 | + $post_type = get_post_type(); |
|
| 94 | + return $template = locate_template(array("geodirectory/single-{$post_type}.php", "geodirectory/listing-detail.php"));
|
|
| 95 | + break; |
|
| 96 | + case 'listing': |
|
| 97 | + $templates = array(); |
|
| 98 | + if (is_post_type_archive() && in_array(get_post_type(), geodir_get_posttypes())) {
|
|
| 99 | + $post_type = get_post_type(); |
|
| 100 | + $templates[] = "geodirectory/archive-$post_type.php"; |
|
| 101 | + } |
|
| 102 | + |
|
| 103 | + |
|
| 104 | + if (is_tax() && geodir_get_taxonomy_posttype()) {
|
|
| 105 | + $query_obj = get_queried_object(); |
|
| 106 | + $curr_taxonomy = isset($query_obj->taxonomy) ? $query_obj->taxonomy : ''; |
|
| 107 | + $curr_term = isset($query_obj->slug) ? $query_obj->slug : ''; |
|
| 108 | + $templates[] = "geodirectory/taxonomy-$curr_taxonomy-$curr_term.php"; |
|
| 109 | + $templates[] = "geodirectory/taxonomy-$curr_taxonomy.php"; |
|
| 110 | + } |
|
| 111 | + |
|
| 112 | + $templates[] = "geodirectory/geodir-listing.php"; |
|
| 113 | + |
|
| 114 | + return $template = locate_template($templates); |
|
| 115 | + break; |
|
| 116 | + case 'information': |
|
| 117 | + return $template = locate_template(array("geodirectory/geodir-information.php"));
|
|
| 118 | + break; |
|
| 119 | + case 'author': |
|
| 120 | + return $template = locate_template(array("geodirectory/geodir-author.php"));
|
|
| 121 | + break; |
|
| 122 | + case 'search': |
|
| 123 | + return $template = locate_template(array("geodirectory/geodir-search.php"));
|
|
| 124 | + break; |
|
| 125 | + case 'location': |
|
| 126 | + return $template = locate_template(array("geodirectory/geodir-location.php"));
|
|
| 127 | + break; |
|
| 128 | + case 'geodir-home': |
|
| 129 | + return $template = locate_template(array("geodirectory/geodir-home.php"));
|
|
| 130 | + break; |
|
| 131 | + case 'listing-listview': |
|
| 132 | + $template = locate_template(array("geodirectory/listing-listview.php"));
|
|
| 133 | + if (!$template) {
|
|
| 134 | + $template = geodir_plugin_path() . '/geodirectory-templates/listing-listview.php'; |
|
| 135 | + } |
|
| 136 | + return $template; |
|
| 137 | + break; |
|
| 138 | + case 'widget-listing-listview': |
|
| 139 | + $template = locate_template(array("geodirectory/widget-listing-listview.php"));
|
|
| 140 | + if (!$template) {
|
|
| 141 | + $template = geodir_plugin_path() . '/geodirectory-templates/widget-listing-listview.php'; |
|
| 142 | + } |
|
| 143 | + return $template; |
|
| 144 | + break; |
|
| 145 | + endswitch; |
|
| 146 | + |
|
| 147 | + return false; |
|
| 148 | 148 | |
| 149 | 149 | } |
| 150 | 150 | |
@@ -163,255 +163,255 @@ discard block |
||
| 163 | 163 | function geodir_template_loader($template) |
| 164 | 164 | {
|
| 165 | 165 | |
| 166 | - global $wp_query; |
|
| 167 | - |
|
| 168 | - /** |
|
| 169 | - * Filter the custom page list. |
|
| 170 | - * |
|
| 171 | - * @since 1.0.0 |
|
| 172 | - */ |
|
| 173 | - $geodir_custom_page_list = apply_filters('geodir_set_custom_pages', array(
|
|
| 174 | - 'geodir_signup_page' => |
|
| 175 | - apply_filters('geodir_set_custom_signup_page', false),
|
|
| 176 | - 'geodir_add_listing_page' => |
|
| 177 | - apply_filters('geodir_set_custom_add_listing_page', false),
|
|
| 178 | - 'geodir_preview_page' => |
|
| 179 | - apply_filters('geodir_set_custom_preview_page', false),
|
|
| 180 | - 'geodir_listing_success_page' => |
|
| 181 | - apply_filters('geodir_set_custom_listing_success_page', false),
|
|
| 182 | - 'geodir_listing_detail_page' => |
|
| 183 | - apply_filters('geodir_set_custom_listing_detail_page', false),
|
|
| 184 | - 'geodir_listing_page' => |
|
| 185 | - apply_filters('geodir_set_custom_listing_page', false),
|
|
| 186 | - 'geodir_search_page' => |
|
| 187 | - apply_filters('geodir_set_custom_search_page', false),
|
|
| 188 | - 'geodir_author_page' => |
|
| 189 | - apply_filters('geodir_set_custom_author_page', false),
|
|
| 190 | - 'geodir_home_map_page' => |
|
| 191 | - apply_filters('geodir_set_custom_home_map_page', false)
|
|
| 192 | - )); |
|
| 193 | - |
|
| 194 | - |
|
| 195 | - if (geodir_is_page('login') || $geodir_custom_page_list['geodir_signup_page']) {
|
|
| 196 | - |
|
| 197 | - $template = geodir_locate_template('signup');
|
|
| 198 | - |
|
| 199 | - if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php'; |
|
| 200 | - |
|
| 201 | - /** |
|
| 202 | - * Filter the signup template path. |
|
| 203 | - * |
|
| 204 | - * @since 1.0.0 |
|
| 205 | - * @param string $template The template path. |
|
| 206 | - */ |
|
| 207 | - return $template = apply_filters('geodir_template_signup', $template);
|
|
| 208 | - } |
|
| 209 | - |
|
| 210 | - if (geodir_is_page('add-listing') || $geodir_custom_page_list['geodir_add_listing_page']) {
|
|
| 211 | - if (!geodir_is_default_location_set()) {
|
|
| 212 | - global $information; |
|
| 213 | - $information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>');
|
|
| 214 | - |
|
| 215 | - $template = geodir_locate_template('information');
|
|
| 216 | - |
|
| 217 | - if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php'; |
|
| 218 | - /** |
|
| 219 | - * Filter the information template path. |
|
| 220 | - * |
|
| 221 | - * @since 1.0.0 |
|
| 222 | - * @param string $template The template path. |
|
| 223 | - */ |
|
| 224 | - return $template = apply_filters('geodir_template_information', $template);
|
|
| 225 | - } |
|
| 226 | - // check if pid exists in the record if yes then check if this post belongs to the user who is logged in. |
|
| 227 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 228 | - /// WPML |
|
| 229 | - if (geodir_wpml_is_post_type_translated(get_post_type((int)$_GET['pid'])) && $duplicate_of = wpml_get_master_post_from_duplicate((int)$_GET['pid'])) {
|
|
| 230 | - global $sitepress; |
|
| 166 | + global $wp_query; |
|
| 167 | + |
|
| 168 | + /** |
|
| 169 | + * Filter the custom page list. |
|
| 170 | + * |
|
| 171 | + * @since 1.0.0 |
|
| 172 | + */ |
|
| 173 | + $geodir_custom_page_list = apply_filters('geodir_set_custom_pages', array(
|
|
| 174 | + 'geodir_signup_page' => |
|
| 175 | + apply_filters('geodir_set_custom_signup_page', false),
|
|
| 176 | + 'geodir_add_listing_page' => |
|
| 177 | + apply_filters('geodir_set_custom_add_listing_page', false),
|
|
| 178 | + 'geodir_preview_page' => |
|
| 179 | + apply_filters('geodir_set_custom_preview_page', false),
|
|
| 180 | + 'geodir_listing_success_page' => |
|
| 181 | + apply_filters('geodir_set_custom_listing_success_page', false),
|
|
| 182 | + 'geodir_listing_detail_page' => |
|
| 183 | + apply_filters('geodir_set_custom_listing_detail_page', false),
|
|
| 184 | + 'geodir_listing_page' => |
|
| 185 | + apply_filters('geodir_set_custom_listing_page', false),
|
|
| 186 | + 'geodir_search_page' => |
|
| 187 | + apply_filters('geodir_set_custom_search_page', false),
|
|
| 188 | + 'geodir_author_page' => |
|
| 189 | + apply_filters('geodir_set_custom_author_page', false),
|
|
| 190 | + 'geodir_home_map_page' => |
|
| 191 | + apply_filters('geodir_set_custom_home_map_page', false)
|
|
| 192 | + )); |
|
| 193 | + |
|
| 194 | + |
|
| 195 | + if (geodir_is_page('login') || $geodir_custom_page_list['geodir_signup_page']) {
|
|
| 196 | + |
|
| 197 | + $template = geodir_locate_template('signup');
|
|
| 198 | + |
|
| 199 | + if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php'; |
|
| 200 | + |
|
| 201 | + /** |
|
| 202 | + * Filter the signup template path. |
|
| 203 | + * |
|
| 204 | + * @since 1.0.0 |
|
| 205 | + * @param string $template The template path. |
|
| 206 | + */ |
|
| 207 | + return $template = apply_filters('geodir_template_signup', $template);
|
|
| 208 | + } |
|
| 209 | + |
|
| 210 | + if (geodir_is_page('add-listing') || $geodir_custom_page_list['geodir_add_listing_page']) {
|
|
| 211 | + if (!geodir_is_default_location_set()) {
|
|
| 212 | + global $information; |
|
| 213 | + $information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>');
|
|
| 214 | + |
|
| 215 | + $template = geodir_locate_template('information');
|
|
| 216 | + |
|
| 217 | + if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php'; |
|
| 218 | + /** |
|
| 219 | + * Filter the information template path. |
|
| 220 | + * |
|
| 221 | + * @since 1.0.0 |
|
| 222 | + * @param string $template The template path. |
|
| 223 | + */ |
|
| 224 | + return $template = apply_filters('geodir_template_information', $template);
|
|
| 225 | + } |
|
| 226 | + // check if pid exists in the record if yes then check if this post belongs to the user who is logged in. |
|
| 227 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 228 | + /// WPML |
|
| 229 | + if (geodir_wpml_is_post_type_translated(get_post_type((int)$_GET['pid'])) && $duplicate_of = wpml_get_master_post_from_duplicate((int)$_GET['pid'])) {
|
|
| 230 | + global $sitepress; |
|
| 231 | 231 | |
| 232 | - $lang_of_duplicate = geodir_get_language_for_element($duplicate_of, 'post_' . get_post_type($duplicate_of)); |
|
| 233 | - $sitepress->switch_lang($lang_of_duplicate, true); |
|
| 232 | + $lang_of_duplicate = geodir_get_language_for_element($duplicate_of, 'post_' . get_post_type($duplicate_of)); |
|
| 233 | + $sitepress->switch_lang($lang_of_duplicate, true); |
|
| 234 | 234 | |
| 235 | - $redirect_to = get_permalink(geodir_add_listing_page_id()); |
|
| 236 | - $_GET['pid'] = $duplicate_of; |
|
| 237 | - if (!empty($_GET)) {
|
|
| 238 | - $redirect_to = add_query_arg($_GET, $redirect_to); |
|
| 239 | - } |
|
| 240 | - wp_redirect($redirect_to); |
|
| 241 | - exit; |
|
| 242 | - } |
|
| 243 | - /// WPML |
|
| 235 | + $redirect_to = get_permalink(geodir_add_listing_page_id()); |
|
| 236 | + $_GET['pid'] = $duplicate_of; |
|
| 237 | + if (!empty($_GET)) {
|
|
| 238 | + $redirect_to = add_query_arg($_GET, $redirect_to); |
|
| 239 | + } |
|
| 240 | + wp_redirect($redirect_to); |
|
| 241 | + exit; |
|
| 242 | + } |
|
| 243 | + /// WPML |
|
| 244 | 244 | |
| 245 | - global $information; |
|
| 246 | - $information = __('This listing does not belong to your account, please check the listing id carefully.', 'geodirectory');
|
|
| 247 | - $is_current_user_owner = geodir_listing_belong_to_current_user(); |
|
| 248 | - if (!$is_current_user_owner) {
|
|
| 249 | - $template = geodir_locate_template('information');
|
|
| 250 | - |
|
| 251 | - if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php'; |
|
| 252 | - /** |
|
| 253 | - * Filter the information template path. |
|
| 254 | - * |
|
| 255 | - * @since 1.0.0 |
|
| 256 | - * @param string $template The template path. |
|
| 257 | - */ |
|
| 258 | - return $template = apply_filters('geodir_template_information', $template);
|
|
| 259 | - } |
|
| 245 | + global $information; |
|
| 246 | + $information = __('This listing does not belong to your account, please check the listing id carefully.', 'geodirectory');
|
|
| 247 | + $is_current_user_owner = geodir_listing_belong_to_current_user(); |
|
| 248 | + if (!$is_current_user_owner) {
|
|
| 249 | + $template = geodir_locate_template('information');
|
|
| 250 | + |
|
| 251 | + if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php'; |
|
| 252 | + /** |
|
| 253 | + * Filter the information template path. |
|
| 254 | + * |
|
| 255 | + * @since 1.0.0 |
|
| 256 | + * @param string $template The template path. |
|
| 257 | + */ |
|
| 258 | + return $template = apply_filters('geodir_template_information', $template);
|
|
| 259 | + } |
|
| 260 | 260 | |
| 261 | 261 | |
| 262 | - } |
|
| 262 | + } |
|
| 263 | 263 | |
| 264 | - //geodir_is_login(true); |
|
| 265 | - global $current_user; |
|
| 266 | - if (!$current_user->ID) {
|
|
| 267 | - wp_redirect(geodir_login_url(array('redirect_add_listing'=>urlencode(geodir_curPageURL()))), 302);
|
|
| 268 | - exit; |
|
| 269 | - } |
|
| 264 | + //geodir_is_login(true); |
|
| 265 | + global $current_user; |
|
| 266 | + if (!$current_user->ID) {
|
|
| 267 | + wp_redirect(geodir_login_url(array('redirect_add_listing'=>urlencode(geodir_curPageURL()))), 302);
|
|
| 268 | + exit; |
|
| 269 | + } |
|
| 270 | 270 | |
| 271 | - $template = geodir_locate_template('add-listing');
|
|
| 272 | - |
|
| 273 | - if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php'; |
|
| 274 | - /** |
|
| 275 | - * Filter the add listing template path. |
|
| 276 | - * |
|
| 277 | - * @since 1.0.0 |
|
| 278 | - * @param string $template The template path. |
|
| 279 | - */ |
|
| 280 | - return $template = apply_filters('geodir_template_add_listing', $template);
|
|
| 281 | - } |
|
| 271 | + $template = geodir_locate_template('add-listing');
|
|
| 282 | 272 | |
| 273 | + if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php'; |
|
| 274 | + /** |
|
| 275 | + * Filter the add listing template path. |
|
| 276 | + * |
|
| 277 | + * @since 1.0.0 |
|
| 278 | + * @param string $template The template path. |
|
| 279 | + */ |
|
| 280 | + return $template = apply_filters('geodir_template_add_listing', $template);
|
|
| 281 | + } |
|
| 283 | 282 | |
| 284 | - if (geodir_is_page('preview') || $geodir_custom_page_list['geodir_preview_page']) {
|
|
| 285 | - global $preview; |
|
| 286 | - $preview = true; |
|
| 287 | 283 | |
| 288 | - $template = geodir_locate_template('preview');
|
|
| 284 | + if (geodir_is_page('preview') || $geodir_custom_page_list['geodir_preview_page']) {
|
|
| 285 | + global $preview; |
|
| 286 | + $preview = true; |
|
| 289 | 287 | |
| 290 | - if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php'; |
|
| 291 | - /** |
|
| 292 | - * Filter the preview template path. |
|
| 293 | - * |
|
| 294 | - * @since 1.0.0 |
|
| 295 | - * @param string $template The template path. |
|
| 296 | - */ |
|
| 297 | - return $template = apply_filters('geodir_template_preview', $template);
|
|
| 288 | + $template = geodir_locate_template('preview');
|
|
| 298 | 289 | |
| 299 | - } |
|
| 290 | + if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php'; |
|
| 291 | + /** |
|
| 292 | + * Filter the preview template path. |
|
| 293 | + * |
|
| 294 | + * @since 1.0.0 |
|
| 295 | + * @param string $template The template path. |
|
| 296 | + */ |
|
| 297 | + return $template = apply_filters('geodir_template_preview', $template);
|
|
| 300 | 298 | |
| 299 | + } |
|
| 301 | 300 | |
| 302 | - if (geodir_is_page('listing-success') || $geodir_custom_page_list['geodir_listing_success_page']) {
|
|
| 303 | 301 | |
| 304 | - $template = geodir_locate_template('success');
|
|
| 302 | + if (geodir_is_page('listing-success') || $geodir_custom_page_list['geodir_listing_success_page']) {
|
|
| 305 | 303 | |
| 306 | - if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php'; |
|
| 307 | - /** |
|
| 308 | - * Filter the success template path. |
|
| 309 | - * |
|
| 310 | - * @since 1.0.0 |
|
| 311 | - * @param string $template The template path. |
|
| 312 | - */ |
|
| 313 | - return $template = apply_filters('geodir_template_success', $template);
|
|
| 304 | + $template = geodir_locate_template('success');
|
|
| 314 | 305 | |
| 315 | - } |
|
| 306 | + if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php'; |
|
| 307 | + /** |
|
| 308 | + * Filter the success template path. |
|
| 309 | + * |
|
| 310 | + * @since 1.0.0 |
|
| 311 | + * @param string $template The template path. |
|
| 312 | + */ |
|
| 313 | + return $template = apply_filters('geodir_template_success', $template);
|
|
| 316 | 314 | |
| 317 | - if (geodir_is_page('detail') || $geodir_custom_page_list['geodir_listing_detail_page']) {
|
|
| 315 | + } |
|
| 318 | 316 | |
| 319 | - $template = geodir_locate_template('detail');
|
|
| 317 | + if (geodir_is_page('detail') || $geodir_custom_page_list['geodir_listing_detail_page']) {
|
|
| 320 | 318 | |
| 321 | - if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php'; |
|
| 322 | - /** |
|
| 323 | - * Filter the detail template path. |
|
| 324 | - * |
|
| 325 | - * @since 1.0.0 |
|
| 326 | - * @param string $template The template path. |
|
| 327 | - */ |
|
| 328 | - return $template = apply_filters('geodir_template_detail', $template);
|
|
| 319 | + $template = geodir_locate_template('detail');
|
|
| 329 | 320 | |
| 330 | - } |
|
| 321 | + if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php'; |
|
| 322 | + /** |
|
| 323 | + * Filter the detail template path. |
|
| 324 | + * |
|
| 325 | + * @since 1.0.0 |
|
| 326 | + * @param string $template The template path. |
|
| 327 | + */ |
|
| 328 | + return $template = apply_filters('geodir_template_detail', $template);
|
|
| 331 | 329 | |
| 332 | - if (geodir_is_page('listing') || $geodir_custom_page_list['geodir_listing_page']) {
|
|
| 330 | + } |
|
| 333 | 331 | |
| 334 | - $template = geodir_locate_template('listing');
|
|
| 332 | + if (geodir_is_page('listing') || $geodir_custom_page_list['geodir_listing_page']) {
|
|
| 335 | 333 | |
| 336 | - if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php'; |
|
| 337 | - /** |
|
| 338 | - * Filter the listing template path. |
|
| 339 | - * |
|
| 340 | - * @since 1.0.0 |
|
| 341 | - * @param string $template The template path. |
|
| 342 | - */ |
|
| 343 | - return $template = apply_filters('geodir_template_listing', $template);
|
|
| 334 | + $template = geodir_locate_template('listing');
|
|
| 344 | 335 | |
| 345 | - } |
|
| 336 | + if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php'; |
|
| 337 | + /** |
|
| 338 | + * Filter the listing template path. |
|
| 339 | + * |
|
| 340 | + * @since 1.0.0 |
|
| 341 | + * @param string $template The template path. |
|
| 342 | + */ |
|
| 343 | + return $template = apply_filters('geodir_template_listing', $template);
|
|
| 346 | 344 | |
| 347 | - if (geodir_is_page('search') || $geodir_custom_page_list['geodir_search_page']) {
|
|
| 345 | + } |
|
| 348 | 346 | |
| 349 | - $template = geodir_locate_template('search');
|
|
| 347 | + if (geodir_is_page('search') || $geodir_custom_page_list['geodir_search_page']) {
|
|
| 350 | 348 | |
| 351 | - if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php'; |
|
| 352 | - /** |
|
| 353 | - * Filter the search template path. |
|
| 354 | - * |
|
| 355 | - * @since 1.0.0 |
|
| 356 | - * @param string $template The template path. |
|
| 357 | - */ |
|
| 358 | - return $template = apply_filters('geodir_template_search', $template);
|
|
| 349 | + $template = geodir_locate_template('search');
|
|
| 359 | 350 | |
| 360 | - } |
|
| 351 | + if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php'; |
|
| 352 | + /** |
|
| 353 | + * Filter the search template path. |
|
| 354 | + * |
|
| 355 | + * @since 1.0.0 |
|
| 356 | + * @param string $template The template path. |
|
| 357 | + */ |
|
| 358 | + return $template = apply_filters('geodir_template_search', $template);
|
|
| 361 | 359 | |
| 362 | - if (geodir_is_page('author') || $geodir_custom_page_list['geodir_author_page']) {
|
|
| 360 | + } |
|
| 363 | 361 | |
| 364 | - $template = geodir_locate_template('author');
|
|
| 362 | + if (geodir_is_page('author') || $geodir_custom_page_list['geodir_author_page']) {
|
|
| 365 | 363 | |
| 366 | - if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php'; |
|
| 367 | - /** |
|
| 368 | - * Filter the author template path. |
|
| 369 | - * |
|
| 370 | - * @since 1.0.0 |
|
| 371 | - * @param string $template The template path. |
|
| 372 | - */ |
|
| 373 | - return $template = apply_filters('geodir_template_author', $template);
|
|
| 364 | + $template = geodir_locate_template('author');
|
|
| 374 | 365 | |
| 375 | - } |
|
| 366 | + if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php'; |
|
| 367 | + /** |
|
| 368 | + * Filter the author template path. |
|
| 369 | + * |
|
| 370 | + * @since 1.0.0 |
|
| 371 | + * @param string $template The template path. |
|
| 372 | + */ |
|
| 373 | + return $template = apply_filters('geodir_template_author', $template);
|
|
| 376 | 374 | |
| 377 | - if ( geodir_is_page('home') || geodir_is_page('location')) {
|
|
| 375 | + } |
|
| 378 | 376 | |
| 379 | - global $post, $wp_query; |
|
| 377 | + if ( geodir_is_page('home') || geodir_is_page('location')) {
|
|
| 380 | 378 | |
| 381 | - if (geodir_is_page('home') || ('page' == get_option('show_on_front') && isset($post->ID) && $post->ID == get_option('page_on_front'))
|
|
| 382 | - || (is_home() && !$wp_query->is_posts_page) |
|
| 383 | - ) {
|
|
| 379 | + global $post, $wp_query; |
|
| 384 | 380 | |
| 385 | - $template = geodir_locate_template('geodir-home');
|
|
| 381 | + if (geodir_is_page('home') || ('page' == get_option('show_on_front') && isset($post->ID) && $post->ID == get_option('page_on_front'))
|
|
| 382 | + || (is_home() && !$wp_query->is_posts_page) |
|
| 383 | + ) {
|
|
| 386 | 384 | |
| 387 | - if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php'; |
|
| 388 | - /** |
|
| 389 | - * Filter the home page template path. |
|
| 390 | - * |
|
| 391 | - * @since 1.0.0 |
|
| 392 | - * @param string $template The template path. |
|
| 393 | - */ |
|
| 394 | - return $template = apply_filters('geodir_template_homepage', $template);
|
|
| 385 | + $template = geodir_locate_template('geodir-home');
|
|
| 395 | 386 | |
| 396 | - } elseif (geodir_is_page('location')) {
|
|
| 387 | + if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php'; |
|
| 388 | + /** |
|
| 389 | + * Filter the home page template path. |
|
| 390 | + * |
|
| 391 | + * @since 1.0.0 |
|
| 392 | + * @param string $template The template path. |
|
| 393 | + */ |
|
| 394 | + return $template = apply_filters('geodir_template_homepage', $template);
|
|
| 397 | 395 | |
| 398 | - $template = geodir_locate_template('location');
|
|
| 396 | + } elseif (geodir_is_page('location')) {
|
|
| 399 | 397 | |
| 400 | - if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php'; |
|
| 401 | - /** |
|
| 402 | - * Filter the location template path. |
|
| 403 | - * |
|
| 404 | - * @since 1.0.0 |
|
| 405 | - * @param string $template The template path. |
|
| 406 | - */ |
|
| 407 | - return $template = apply_filters('geodir_template_location', $template);
|
|
| 398 | + $template = geodir_locate_template('location');
|
|
| 408 | 399 | |
| 409 | - } else |
|
| 410 | - return $template; |
|
| 400 | + if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php'; |
|
| 401 | + /** |
|
| 402 | + * Filter the location template path. |
|
| 403 | + * |
|
| 404 | + * @since 1.0.0 |
|
| 405 | + * @param string $template The template path. |
|
| 406 | + */ |
|
| 407 | + return $template = apply_filters('geodir_template_location', $template);
|
|
| 411 | 408 | |
| 412 | - } |
|
| 409 | + } else |
|
| 410 | + return $template; |
|
| 413 | 411 | |
| 414 | - return $template; |
|
| 412 | + } |
|
| 413 | + |
|
| 414 | + return $template; |
|
| 415 | 415 | } |
| 416 | 416 | |
| 417 | 417 | /** |
@@ -426,44 +426,44 @@ discard block |
||
| 426 | 426 | */ |
| 427 | 427 | function geodir_get_template_part($slug = '', $name = NULL) |
| 428 | 428 | {
|
| 429 | - global $geodirectory, $post; |
|
| 430 | - /** |
|
| 431 | - * Called at the start for the geodir_get_template_part() function. |
|
| 432 | - * |
|
| 433 | - * Used dynamic hook name: geodir_get_template_part_{$slug}
|
|
| 434 | - * |
|
| 435 | - * @since 1.0.0 |
|
| 436 | - * @package GeoDirectory |
|
| 437 | - * @param string $slug The template slug. |
|
| 438 | - * @param string $name The template name. |
|
| 439 | - */ |
|
| 440 | - do_action("geodir_get_template_part_{$slug}", $slug, $name);
|
|
| 441 | - $templates = array(); |
|
| 442 | - $name = (string)$name; |
|
| 443 | - if ('' !== $name) {
|
|
| 444 | - $template_name = "{$slug}-{$name}.php";
|
|
| 445 | - |
|
| 446 | - } else {
|
|
| 447 | - $template_name = "{$slug}.php";
|
|
| 448 | - } |
|
| 449 | - |
|
| 450 | - if (!locate_template(array("geodirectory/" . $template_name))) :
|
|
| 451 | - /** |
|
| 452 | - * Filter the template part with slug and name. |
|
| 453 | - * |
|
| 454 | - * @since 1.0.0 |
|
| 455 | - * @param string $template_name The template name. |
|
| 456 | - */ |
|
| 457 | - $template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path() . '/geodirectory-templates/' . $template_name);
|
|
| 458 | - /** |
|
| 459 | - * Includes the template part with slug and name. |
|
| 460 | - * |
|
| 461 | - * @since 1.0.0 |
|
| 462 | - */ |
|
| 463 | - include($template); |
|
| 464 | - else: |
|
| 465 | - locate_template(array("geodirectory/" . $template_name), true, false);
|
|
| 466 | - endif; |
|
| 429 | + global $geodirectory, $post; |
|
| 430 | + /** |
|
| 431 | + * Called at the start for the geodir_get_template_part() function. |
|
| 432 | + * |
|
| 433 | + * Used dynamic hook name: geodir_get_template_part_{$slug}
|
|
| 434 | + * |
|
| 435 | + * @since 1.0.0 |
|
| 436 | + * @package GeoDirectory |
|
| 437 | + * @param string $slug The template slug. |
|
| 438 | + * @param string $name The template name. |
|
| 439 | + */ |
|
| 440 | + do_action("geodir_get_template_part_{$slug}", $slug, $name);
|
|
| 441 | + $templates = array(); |
|
| 442 | + $name = (string)$name; |
|
| 443 | + if ('' !== $name) {
|
|
| 444 | + $template_name = "{$slug}-{$name}.php";
|
|
| 445 | + |
|
| 446 | + } else {
|
|
| 447 | + $template_name = "{$slug}.php";
|
|
| 448 | + } |
|
| 449 | + |
|
| 450 | + if (!locate_template(array("geodirectory/" . $template_name))) :
|
|
| 451 | + /** |
|
| 452 | + * Filter the template part with slug and name. |
|
| 453 | + * |
|
| 454 | + * @since 1.0.0 |
|
| 455 | + * @param string $template_name The template name. |
|
| 456 | + */ |
|
| 457 | + $template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path() . '/geodirectory-templates/' . $template_name);
|
|
| 458 | + /** |
|
| 459 | + * Includes the template part with slug and name. |
|
| 460 | + * |
|
| 461 | + * @since 1.0.0 |
|
| 462 | + */ |
|
| 463 | + include($template); |
|
| 464 | + else: |
|
| 465 | + locate_template(array("geodirectory/" . $template_name), true, false);
|
|
| 466 | + endif; |
|
| 467 | 467 | |
| 468 | 468 | } |
| 469 | 469 | |
@@ -479,23 +479,23 @@ discard block |
||
| 479 | 479 | */ |
| 480 | 480 | function geodir_core_post_view_extra_class($class, $all_postypes = '') |
| 481 | 481 | {
|
| 482 | - global $post; |
|
| 482 | + global $post; |
|
| 483 | 483 | |
| 484 | - if (!$all_postypes) {
|
|
| 485 | - $all_postypes = geodir_get_posttypes(); |
|
| 486 | - } |
|
| 484 | + if (!$all_postypes) {
|
|
| 485 | + $all_postypes = geodir_get_posttypes(); |
|
| 486 | + } |
|
| 487 | 487 | |
| 488 | - $gdp_post_id = !empty($post) && isset($post->ID) ? $post->ID : NULL; |
|
| 489 | - $gdp_post_type = $gdp_post_id > 0 && isset($post->post_type) ? $post->post_type : NULL; |
|
| 490 | - $gdp_post_type = $gdp_post_type != '' && !empty($all_postypes) && in_array($gdp_post_type, $all_postypes) ? $gdp_post_type : NULL; |
|
| 488 | + $gdp_post_id = !empty($post) && isset($post->ID) ? $post->ID : NULL; |
|
| 489 | + $gdp_post_type = $gdp_post_id > 0 && isset($post->post_type) ? $post->post_type : NULL; |
|
| 490 | + $gdp_post_type = $gdp_post_type != '' && !empty($all_postypes) && in_array($gdp_post_type, $all_postypes) ? $gdp_post_type : NULL; |
|
| 491 | 491 | |
| 492 | - if ($gdp_post_id && $gdp_post_type) {
|
|
| 493 | - $append_class = 'gd-post-' . $gdp_post_type; |
|
| 494 | - $append_class .= isset($post->is_featured) && $post->is_featured > 0 ? ' gd-post-featured' : ''; |
|
| 495 | - $class = $class != '' ? $class . ' ' . $append_class : $append_class; |
|
| 496 | - } |
|
| 492 | + if ($gdp_post_id && $gdp_post_type) {
|
|
| 493 | + $append_class = 'gd-post-' . $gdp_post_type; |
|
| 494 | + $append_class .= isset($post->is_featured) && $post->is_featured > 0 ? ' gd-post-featured' : ''; |
|
| 495 | + $class = $class != '' ? $class . ' ' . $append_class : $append_class; |
|
| 496 | + } |
|
| 497 | 497 | |
| 498 | - return $class; |
|
| 498 | + return $class; |
|
| 499 | 499 | } |
| 500 | 500 | |
| 501 | 501 | /** |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | * @param bool $favorite Listing Optional. Are favorite listings results? Default: false. |
| 510 | 510 | */ |
| 511 | 511 | function geodir_display_message_not_found_on_listing($template_listview = 'listing-listview', $favorite = false) {
|
| 512 | - if ($favorite) {
|
|
| 512 | + if ($favorite) {
|
|
| 513 | 513 | $message = __('No favorite listings found which match your selection.', 'geodirectory');
|
| 514 | 514 | } else {
|
| 515 | 515 | $message = __('No listings found which match your selection.', 'geodirectory');
|
@@ -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 | - } // Latitude |
|
| 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 | + } // Latitude |
|
| 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(geodir_utf8_ucfirst($addr_details[geoplugin_latitude])); |
|
| 125 | - $mylon = stripslashes(geodir_utf8_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(geodir_utf8_ucfirst($addr_details[geoplugin_latitude])); |
|
| 125 | + $mylon = stripslashes(geodir_utf8_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(geodir_utf8_strlen($kword)<=$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(geodir_utf8_strlen($kword)<=$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 ( geodir_wpml_is_post_type_translated( $geodir_post_type ) ) {
|
|
| 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 ( geodir_wpml_is_post_type_translated( $geodir_post_type ) ) {
|
|
| 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,133 +366,133 @@ 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 | - } |
|
| 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': |
|
| 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 | - if ($sort_by != '' && geodir_cpt_has_rating_disabled($geodir_post_type)) {
|
|
| 448 | - if (in_array($sort_by, array('high_review', 'rating_count_desc', 'high_rating', 'overall_rating_desc'))) {
|
|
| 449 | - $orderby = "$wpdb->posts.comment_count DESC, "; |
|
| 450 | - $sort_by = 'comment_count_desc'; |
|
| 451 | - } else if (in_array($sort_by, array('low_review', 'rating_count_asc', 'low_rating', 'overall_rating_asc'))) {
|
|
| 452 | - $orderby = "$wpdb->posts.comment_count ASC, "; |
|
| 453 | - $sort_by = 'comment_count_asc'; |
|
| 454 | - } |
|
| 455 | - } |
|
| 394 | + if ($snear != '' && $sort_by!='farthest') {
|
|
| 395 | + $sort_by = 'nearest'; |
|
| 396 | + } |
|
| 397 | + } |
|
| 456 | 398 | |
| 457 | - global $s; |
|
| 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 | + $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 | + if ($sort_by != '' && geodir_cpt_has_rating_disabled($geodir_post_type)) {
|
|
| 448 | + if (in_array($sort_by, array('high_review', 'rating_count_desc', 'high_rating', 'overall_rating_desc'))) {
|
|
| 449 | + $orderby = "$wpdb->posts.comment_count DESC, "; |
|
| 450 | + $sort_by = 'comment_count_desc'; |
|
| 451 | + } else if (in_array($sort_by, array('low_review', 'rating_count_asc', 'low_rating', 'overall_rating_asc'))) {
|
|
| 452 | + $orderby = "$wpdb->posts.comment_count ASC, "; |
|
| 453 | + $sort_by = 'comment_count_asc'; |
|
| 454 | + } |
|
| 455 | + } |
|
| 458 | 456 | |
| 459 | - if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 460 | - $keywords = explode(" ", $s);
|
|
| 461 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 462 | - foreach($keywords as $kkey=>$kword){
|
|
| 463 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 464 | - unset($keywords[$kkey]); |
|
| 465 | - } |
|
| 466 | - } |
|
| 467 | - } |
|
| 468 | - if ($sort_by == 'nearest' || $sort_by == 'farthest') {
|
|
| 469 | - if (count($keywords) > 1) {
|
|
| 470 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
| 471 | - } else {
|
|
| 472 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
| 473 | - } |
|
| 474 | - } else {
|
|
| 475 | - if (count($keywords) > 1) {
|
|
| 476 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby; |
|
| 477 | - } else {
|
|
| 478 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby; |
|
| 479 | - } |
|
| 480 | - } |
|
| 481 | - } |
|
| 457 | + global $s; |
|
| 458 | + |
|
| 459 | + if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {
|
|
| 460 | + $keywords = explode(" ", $s);
|
|
| 461 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 462 | + foreach($keywords as $kkey=>$kword){
|
|
| 463 | + if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 464 | + unset($keywords[$kkey]); |
|
| 465 | + } |
|
| 466 | + } |
|
| 467 | + } |
|
| 468 | + if ($sort_by == 'nearest' || $sort_by == 'farthest') {
|
|
| 469 | + if (count($keywords) > 1) {
|
|
| 470 | + $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
| 471 | + } else {
|
|
| 472 | + $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
| 473 | + } |
|
| 474 | + } else {
|
|
| 475 | + if (count($keywords) > 1) {
|
|
| 476 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby; |
|
| 477 | + } else {
|
|
| 478 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby; |
|
| 479 | + } |
|
| 480 | + } |
|
| 481 | + } |
|
| 482 | 482 | |
| 483 | - /** |
|
| 484 | - * Filter order by SQL. |
|
| 485 | - * |
|
| 486 | - * @since 1.0.0 |
|
| 487 | - * @param string $orderby The orderby query string. |
|
| 488 | - * @param string $sort_by Sortby query string. |
|
| 489 | - * @param string $table Listing table name. |
|
| 490 | - */ |
|
| 491 | - $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);
|
|
| 483 | + /** |
|
| 484 | + * Filter order by SQL. |
|
| 485 | + * |
|
| 486 | + * @since 1.0.0 |
|
| 487 | + * @param string $orderby The orderby query string. |
|
| 488 | + * @param string $sort_by Sortby query string. |
|
| 489 | + * @param string $table Listing table name. |
|
| 490 | + */ |
|
| 491 | + $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);
|
|
| 492 | 492 | |
| 493 | - $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
| 493 | + $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
| 494 | 494 | |
| 495 | - return $orderby; |
|
| 495 | + return $orderby; |
|
| 496 | 496 | } |
| 497 | 497 | |
| 498 | 498 | |
@@ -510,53 +510,53 @@ discard block |
||
| 510 | 510 | function geodir_posts_order_by_custom_sort($orderby, $sort_by, $table) |
| 511 | 511 | {
|
| 512 | 512 | |
| 513 | - global $wpdb; |
|
| 513 | + global $wpdb; |
|
| 514 | 514 | |
| 515 | - if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' || $_REQUEST['s']==' ') ) )) {
|
|
| 515 | + if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' || $_REQUEST['s']==' ') ) )) {
|
|
| 516 | 516 | |
| 517 | - $sort_array = explode('_', $sort_by);
|
|
| 517 | + $sort_array = explode('_', $sort_by);
|
|
| 518 | 518 | |
| 519 | - $sort_by_count = count($sort_array); |
|
| 519 | + $sort_by_count = count($sort_array); |
|
| 520 | 520 | |
| 521 | - $order = $sort_array[$sort_by_count - 1]; |
|
| 521 | + $order = $sort_array[$sort_by_count - 1]; |
|
| 522 | 522 | |
| 523 | - if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {
|
|
| 523 | + if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {
|
|
| 524 | 524 | |
| 525 | - $sort_by = str_replace('_' . $order, '', $sort_by);
|
|
| 525 | + $sort_by = str_replace('_' . $order, '', $sort_by);
|
|
| 526 | 526 | |
| 527 | - switch ($sort_by): |
|
| 527 | + switch ($sort_by): |
|
| 528 | 528 | |
| 529 | - case 'post_date': |
|
| 530 | - case 'comment_count': |
|
| 529 | + case 'post_date': |
|
| 530 | + case 'comment_count': |
|
| 531 | 531 | |
| 532 | - $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", "; |
|
| 533 | - break; |
|
| 532 | + $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", "; |
|
| 533 | + break; |
|
| 534 | 534 | |
| 535 | - case 'distance': |
|
| 536 | - $orderby = $sort_by . " " . $order . ", "; |
|
| 537 | - break; |
|
| 535 | + case 'distance': |
|
| 536 | + $orderby = $sort_by . " " . $order . ", "; |
|
| 537 | + break; |
|
| 538 | 538 | |
| 539 | 539 | |
| 540 | - // sort by rating |
|
| 541 | - case 'overall_rating': |
|
| 542 | - $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
| 540 | + // sort by rating |
|
| 541 | + case 'overall_rating': |
|
| 542 | + $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
| 543 | 543 | |
| 544 | - break; |
|
| 544 | + break; |
|
| 545 | 545 | |
| 546 | 546 | |
| 547 | - default: |
|
| 548 | - if (geodir_column_exist($table, $sort_by)) {
|
|
| 547 | + default: |
|
| 548 | + if (geodir_column_exist($table, $sort_by)) {
|
|
| 549 | 549 | $orderby = $table . "." . $sort_by . " " . $order . ", "; |
| 550 | 550 | } |
| 551 | - break; |
|
| 551 | + break; |
|
| 552 | 552 | |
| 553 | - endswitch; |
|
| 553 | + endswitch; |
|
| 554 | 554 | |
| 555 | - } |
|
| 555 | + } |
|
| 556 | 556 | |
| 557 | - } |
|
| 557 | + } |
|
| 558 | 558 | |
| 559 | - return $orderby; |
|
| 559 | + return $orderby; |
|
| 560 | 560 | } |
| 561 | 561 | |
| 562 | 562 | /** |
@@ -571,34 +571,34 @@ discard block |
||
| 571 | 571 | {
|
| 572 | 572 | |
| 573 | 573 | |
| 574 | - global $wpdb, $geodir_post_type, $table, $s, $snear; |
|
| 574 | + global $wpdb, $geodir_post_type, $table, $s, $snear; |
|
| 575 | 575 | |
| 576 | - if (!is_admin()) {
|
|
| 576 | + if (!is_admin()) {
|
|
| 577 | 577 | |
| 578 | - if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 579 | - add_filter('posts_where', 'geodir_edit_listing_where', 1);
|
|
| 578 | + if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 579 | + add_filter('posts_where', 'geodir_edit_listing_where', 1);
|
|
| 580 | 580 | |
| 581 | - } elseif ((is_search() && $_REQUEST['geodir_search'])) {
|
|
| 581 | + } elseif ((is_search() && $_REQUEST['geodir_search'])) {
|
|
| 582 | 582 | |
| 583 | - add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 583 | + add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 584 | 584 | |
| 585 | - if ($snear != '') |
|
| 586 | - add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 585 | + if ($snear != '') |
|
| 586 | + add_filter('posts_where', 'searching_filter_where', 1);
|
|
| 587 | 587 | |
| 588 | - add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 588 | + add_filter('posts_orderby', 'geodir_posts_orderby', 1);
|
|
| 589 | 589 | |
| 590 | - } elseif (geodir_is_page('author')) {
|
|
| 590 | + } elseif (geodir_is_page('author')) {
|
|
| 591 | 591 | |
| 592 | - add_filter('posts_where', 'author_filter_where', 1);
|
|
| 592 | + add_filter('posts_where', 'author_filter_where', 1);
|
|
| 593 | 593 | |
| 594 | - } |
|
| 594 | + } |
|
| 595 | 595 | |
| 596 | - //if (!geodir_is_page('detail'))
|
|
| 597 | - add_filter('posts_where', 'geodir_default_where', 1);/**/
|
|
| 596 | + //if (!geodir_is_page('detail'))
|
|
| 597 | + add_filter('posts_where', 'geodir_default_where', 1);/**/
|
|
| 598 | 598 | |
| 599 | - //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
|
| 599 | + //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
|
| 600 | 600 | |
| 601 | - } |
|
| 601 | + } |
|
| 602 | 602 | } |
| 603 | 603 | |
| 604 | 604 | /** |
@@ -613,13 +613,13 @@ discard block |
||
| 613 | 613 | */ |
| 614 | 614 | function geodir_preview_post_cap($allcaps, $caps, $args) |
| 615 | 615 | {
|
| 616 | - $user_id = get_current_user_id(); |
|
| 617 | - if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {
|
|
| 616 | + $user_id = get_current_user_id(); |
|
| 617 | + if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) {
|
|
| 618 | 618 | |
| 619 | - $allcaps['edit_posts'] = true; |
|
| 620 | - } |
|
| 621 | - //print_r($allcaps); |
|
| 622 | - return $allcaps; |
|
| 619 | + $allcaps['edit_posts'] = true; |
|
| 620 | + } |
|
| 621 | + //print_r($allcaps); |
|
| 622 | + return $allcaps; |
|
| 623 | 623 | } |
| 624 | 624 | |
| 625 | 625 | |
@@ -634,9 +634,9 @@ discard block |
||
| 634 | 634 | */ |
| 635 | 635 | function geodir_edit_listing_where($where) |
| 636 | 636 | {
|
| 637 | - global $wpdb; |
|
| 638 | - $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);
|
|
| 639 | - return $where; |
|
| 637 | + global $wpdb; |
|
| 638 | + $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']);
|
|
| 639 | + return $where; |
|
| 640 | 640 | } |
| 641 | 641 | |
| 642 | 642 | |
@@ -653,29 +653,29 @@ discard block |
||
| 653 | 653 | */ |
| 654 | 654 | function geodir_default_where($where) |
| 655 | 655 | {
|
| 656 | - global $wp_query, $wpdb; |
|
| 657 | - |
|
| 658 | - //print_r($wp_query); |
|
| 659 | - ########### WPML ########### |
|
| 660 | - |
|
| 661 | - if (geodir_is_wpml()) {
|
|
| 662 | - global $sitepress, $table_prefix; |
|
| 663 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 664 | - $default_lang_code = $sitepress->get_default_language(); |
|
| 665 | - $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
|
| 666 | - //echo '##########'.$q_post_type; |
|
| 667 | - if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) {
|
|
| 668 | - $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";
|
|
| 669 | - //$where .= " AND icl_t.language_code = '$lang_code' "; |
|
| 670 | - } |
|
| 656 | + global $wp_query, $wpdb; |
|
| 671 | 657 | |
| 672 | - } |
|
| 673 | - ########### WPML ########### |
|
| 658 | + //print_r($wp_query); |
|
| 659 | + ########### WPML ########### |
|
| 674 | 660 | |
| 661 | + if (geodir_is_wpml()) {
|
|
| 662 | + global $sitepress, $table_prefix; |
|
| 663 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 664 | + $default_lang_code = $sitepress->get_default_language(); |
|
| 665 | + $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
|
| 666 | + //echo '##########'.$q_post_type; |
|
| 667 | + if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) {
|
|
| 668 | + $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";
|
|
| 669 | + //$where .= " AND icl_t.language_code = '$lang_code' "; |
|
| 670 | + } |
|
| 675 | 671 | |
| 676 | - return $where = str_replace("0 = 1", "1=1", $where);
|
|
| 672 | + } |
|
| 673 | + ########### WPML ########### |
|
| 674 | + |
|
| 675 | + |
|
| 676 | + return $where = str_replace("0 = 1", "1=1", $where);
|
|
| 677 | 677 | |
| 678 | - /* ====== old code start === |
|
| 678 | + /* ====== old code start === |
|
| 679 | 679 | $where = str_replace("0 = 1", "1=1", $where);
|
| 680 | 680 | $country = get_query_var('gd_country');
|
| 681 | 681 | $region = get_query_var('gd_region');
|
@@ -716,108 +716,108 @@ discard block |
||
| 716 | 716 | * @return string Modified where query string. |
| 717 | 717 | */ |
| 718 | 718 | function searching_filter_where($where) {
|
| 719 | - global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session; |
|
| 719 | + global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session; |
|
| 720 | 720 | |
| 721 | - $search_term = 'OR'; |
|
| 722 | - $search_term = 'AND'; |
|
| 723 | - $geodir_custom_search = ''; |
|
| 724 | - $category_search_range = ''; |
|
| 721 | + $search_term = 'OR'; |
|
| 722 | + $search_term = 'AND'; |
|
| 723 | + $geodir_custom_search = ''; |
|
| 724 | + $category_search_range = ''; |
|
| 725 | 725 | |
| 726 | - if (is_single() && get_query_var('post_type')) {
|
|
| 726 | + if (is_single() && get_query_var('post_type')) {
|
|
| 727 | 727 | return $where; |
| 728 | 728 | } |
| 729 | 729 | |
| 730 | - if (is_tax()) {
|
|
| 730 | + if (is_tax()) {
|
|
| 731 | 731 | return $where; |
| 732 | 732 | } |
| 733 | 733 | |
| 734 | 734 | $s = trim($s); |
| 735 | - $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
| 736 | - $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
| 737 | - |
|
| 738 | - $where = ''; |
|
| 739 | - $better_search_terms = ''; |
|
| 740 | - if (isset($_REQUEST['stype'])) |
|
| 741 | - $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
| 742 | - else |
|
| 743 | - $post_types = 'gd_place'; |
|
| 744 | - |
|
| 745 | - if ($s != '') {
|
|
| 746 | - $keywords = explode(" ", $s);
|
|
| 747 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 748 | - foreach($keywords as $kkey=>$kword){
|
|
| 749 | - if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 750 | - unset($keywords[$kkey]); |
|
| 751 | - } |
|
| 752 | - } |
|
| 753 | - } |
|
| 735 | + $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
| 736 | + $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
| 737 | + |
|
| 738 | + $where = ''; |
|
| 739 | + $better_search_terms = ''; |
|
| 740 | + if (isset($_REQUEST['stype'])) |
|
| 741 | + $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
| 742 | + else |
|
| 743 | + $post_types = 'gd_place'; |
|
| 754 | 744 | |
| 755 | - if (!empty($keywords)) {
|
|
| 756 | - foreach ($keywords as $keyword) {
|
|
| 757 | - $keyword = trim($keyword); |
|
| 758 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 759 | - if ($keyword != '') {
|
|
| 760 | - /** |
|
| 761 | - * Filter the search query keywords SQL. |
|
| 762 | - * |
|
| 763 | - * @since 1.5.9 |
|
| 764 | - * @package GeoDirectory |
|
| 765 | - * @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 . '%" )'`. |
|
| 766 | - * @param array $keywords The array of keywords for the query. |
|
| 767 | - * @param string $keyword The single keyword being searched. |
|
| 768 | - */ |
|
| 745 | + if ($s != '') {
|
|
| 746 | + $keywords = explode(" ", $s);
|
|
| 747 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){
|
|
| 748 | + foreach($keywords as $kkey=>$kword){
|
|
| 749 | + if(geodir_utf8_strlen($kword)<=$klimit){
|
|
| 750 | + unset($keywords[$kkey]); |
|
| 751 | + } |
|
| 752 | + } |
|
| 753 | + } |
|
| 754 | + |
|
| 755 | + if (!empty($keywords)) {
|
|
| 756 | + foreach ($keywords as $keyword) {
|
|
| 757 | + $keyword = trim($keyword); |
|
| 758 | + $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
| 759 | + if ($keyword != '') {
|
|
| 760 | + /** |
|
| 761 | + * Filter the search query keywords SQL. |
|
| 762 | + * |
|
| 763 | + * @since 1.5.9 |
|
| 764 | + * @package GeoDirectory |
|
| 765 | + * @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 . '%" )'`. |
|
| 766 | + * @param array $keywords The array of keywords for the query. |
|
| 767 | + * @param string $keyword The single keyword being searched. |
|
| 768 | + */ |
|
| 769 | 769 | $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);
|
| 770 | - } |
|
| 771 | - } |
|
| 772 | - } |
|
| 773 | - } |
|
| 770 | + } |
|
| 771 | + } |
|
| 772 | + } |
|
| 773 | + } |
|
| 774 | 774 | |
| 775 | - /* get taxonomy */ |
|
| 776 | - $taxonomies = geodir_get_taxonomies($post_types, true); |
|
| 777 | - if($taxonomies) {
|
|
| 778 | - $taxonomies = implode("','", $taxonomies);
|
|
| 779 | - $taxonomies = "'" . $taxonomies . "'"; |
|
| 780 | - }else{$taxonomies='';}
|
|
| 775 | + /* get taxonomy */ |
|
| 776 | + $taxonomies = geodir_get_taxonomies($post_types, true); |
|
| 777 | + if($taxonomies) {
|
|
| 778 | + $taxonomies = implode("','", $taxonomies);
|
|
| 779 | + $taxonomies = "'" . $taxonomies . "'"; |
|
| 780 | + }else{$taxonomies='';}
|
|
| 781 | 781 | |
| 782 | - $content_where = $terms_where = ''; |
|
| 782 | + $content_where = $terms_where = ''; |
|
| 783 | 783 | if ($s != '') {
|
| 784 | - /** |
|
| 785 | - * Filter the search query content where values. |
|
| 786 | - * |
|
| 787 | - * @since 1.5.0 |
|
| 788 | - * @package GeoDirectory |
|
| 789 | - * @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%\") ") "`. |
|
| 790 | - */ |
|
| 784 | + /** |
|
| 785 | + * Filter the search query content where values. |
|
| 786 | + * |
|
| 787 | + * @since 1.5.0 |
|
| 788 | + * @package GeoDirectory |
|
| 789 | + * @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%\") ") "`. |
|
| 790 | + */ |
|
| 791 | 791 | $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%\") ");
|
| 792 | - /** |
|
| 793 | - * Filter the search query term values. |
|
| 794 | - * |
|
| 795 | - * @since 1.5.0 |
|
| 796 | - * @package GeoDirectory |
|
| 797 | - * @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)) "`. |
|
| 798 | - */ |
|
| 799 | - $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)) ");
|
|
| 792 | + /** |
|
| 793 | + * Filter the search query term values. |
|
| 794 | + * |
|
| 795 | + * @since 1.5.0 |
|
| 796 | + * @package GeoDirectory |
|
| 797 | + * @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)) "`. |
|
| 798 | + */ |
|
| 799 | + $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)) ");
|
|
| 800 | 800 | } |
| 801 | 801 | |
| 802 | - if ($snear != '') {
|
|
| 802 | + if ($snear != '') {
|
|
| 803 | 803 | |
| 804 | 804 | |
| 805 | - if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {
|
|
| 806 | - $dist = $gd_session->get('near_me_range');
|
|
| 807 | - } |
|
| 808 | - $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 809 | - $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 810 | - $lat1 = $mylat - ($dist / 69); |
|
| 811 | - $lat2 = $mylat + ($dist / 69); |
|
| 805 | + if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {
|
|
| 806 | + $dist = $gd_session->get('near_me_range');
|
|
| 807 | + } |
|
| 808 | + $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 809 | + $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 810 | + $lat1 = $mylat - ($dist / 69); |
|
| 811 | + $lat2 = $mylat + ($dist / 69); |
|
| 812 | 812 | |
| 813 | - $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : ''; |
|
| 814 | - $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : ''; |
|
| 815 | - $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : ''; |
|
| 816 | - $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : ''; |
|
| 813 | + $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : ''; |
|
| 814 | + $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : ''; |
|
| 815 | + $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : ''; |
|
| 816 | + $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : ''; |
|
| 817 | 817 | |
| 818 | 818 | |
| 819 | 819 | |
| 820 | - $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 820 | + $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 821 | 821 | $content_where |
| 822 | 822 | OR ($wpdb->posts.ID IN( |
| 823 | 823 | SELECT $wpdb->term_relationships.object_id as post_id |
@@ -834,13 +834,13 @@ discard block |
||
| 834 | 834 | AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 ) |
| 835 | 835 | AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) "; |
| 836 | 836 | |
| 837 | - if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
|
| 838 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 839 | - $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;
|
|
| 840 | - } |
|
| 837 | + if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
|
| 838 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 839 | + $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;
|
|
| 840 | + } |
|
| 841 | 841 | |
| 842 | - } else {
|
|
| 843 | - $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 842 | + } else {
|
|
| 843 | + $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 844 | 844 | $content_where |
| 845 | 845 | OR ( $wpdb->posts.ID IN( |
| 846 | 846 | SELECT $wpdb->term_relationships.object_id as post_id |
@@ -854,19 +854,19 @@ discard block |
||
| 854 | 854 | ) |
| 855 | 855 | AND $wpdb->posts.post_type in ('$post_types')
|
| 856 | 856 | AND ($wpdb->posts.post_status = 'publish') "; |
| 857 | - } |
|
| 857 | + } |
|
| 858 | 858 | |
| 859 | 859 | ########### WPML ########### |
| 860 | - if ( geodir_wpml_is_post_type_translated( $post_types ) ) {
|
|
| 860 | + if ( geodir_wpml_is_post_type_translated( $post_types ) ) {
|
|
| 861 | 861 | $lang_code = ICL_LANGUAGE_CODE; |
| 862 | 862 | |
| 863 | 863 | if ($lang_code && $post_types) {
|
| 864 | - $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 865 | - } |
|
| 866 | - } |
|
| 867 | - ########### WPML ########### |
|
| 864 | + $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 865 | + } |
|
| 866 | + } |
|
| 867 | + ########### WPML ########### |
|
| 868 | 868 | |
| 869 | - return $where; |
|
| 869 | + return $where; |
|
| 870 | 870 | } |
| 871 | 871 | |
| 872 | 872 | |
@@ -881,45 +881,45 @@ discard block |
||
| 881 | 881 | * @return string Modified where query string. |
| 882 | 882 | */ |
| 883 | 883 | function author_filter_where($where) {
|
| 884 | - global $wpdb, $geodir_post_type, $table, $curr; |
|
| 884 | + global $wpdb, $geodir_post_type, $table, $curr; |
|
| 885 | 885 | |
| 886 | - $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 887 | - $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 886 | + $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 887 | + $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 888 | 888 | |
| 889 | - if (isset($_REQUEST['stype'])) {
|
|
| 890 | - $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 891 | - } else {
|
|
| 892 | - $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
|
| 893 | - } |
|
| 889 | + if (isset($_REQUEST['stype'])) {
|
|
| 890 | + $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 891 | + } else {
|
|
| 892 | + $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
|
| 893 | + } |
|
| 894 | 894 | |
| 895 | - if ($user_id > 0) {
|
|
| 896 | - if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 897 | - $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true); |
|
| 898 | - $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';
|
|
| 899 | - $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";
|
|
| 900 | - } else |
|
| 901 | - $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
| 902 | - |
|
| 903 | - if ($user_id == (int)get_current_user_id()) {
|
|
| 904 | - $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
|
| 905 | - } else {
|
|
| 906 | - $where .= " AND $wpdb->posts.post_status = 'publish' "; |
|
| 907 | - } |
|
| 908 | - } else {
|
|
| 909 | - $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' "; |
|
| 910 | - } |
|
| 895 | + if ($user_id > 0) {
|
|
| 896 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 897 | + $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true); |
|
| 898 | + $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';
|
|
| 899 | + $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";
|
|
| 900 | + } else |
|
| 901 | + $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
| 902 | + |
|
| 903 | + if ($user_id == (int)get_current_user_id()) {
|
|
| 904 | + $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
|
| 905 | + } else {
|
|
| 906 | + $where .= " AND $wpdb->posts.post_status = 'publish' "; |
|
| 907 | + } |
|
| 908 | + } else {
|
|
| 909 | + $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' "; |
|
| 910 | + } |
|
| 911 | 911 | |
| 912 | - ########### WPML ########### |
|
| 913 | - if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) {
|
|
| 914 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 915 | - if ($lang_code) {
|
|
| 916 | - $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 917 | - } |
|
| 912 | + ########### WPML ########### |
|
| 913 | + if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) {
|
|
| 914 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 915 | + if ($lang_code) {
|
|
| 916 | + $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 917 | + } |
|
| 918 | 918 | |
| 919 | - } |
|
| 920 | - ########### WPML ########### |
|
| 919 | + } |
|
| 920 | + ########### WPML ########### |
|
| 921 | 921 | |
| 922 | - return $where; |
|
| 922 | + return $where; |
|
| 923 | 923 | } |
| 924 | 924 | |
| 925 | 925 | /** |
@@ -934,11 +934,11 @@ discard block |
||
| 934 | 934 | */ |
| 935 | 935 | function geodir_filter_widget_join($join) |
| 936 | 936 | {
|
| 937 | - global $wp_query, $table; |
|
| 938 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 939 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 940 | - } |
|
| 941 | - return $join; |
|
| 937 | + global $wp_query, $table; |
|
| 938 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 939 | + $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 940 | + } |
|
| 941 | + return $join; |
|
| 942 | 942 | } |
| 943 | 943 | |
| 944 | 944 | /** |
@@ -953,43 +953,43 @@ discard block |
||
| 953 | 953 | */ |
| 954 | 954 | function geodir_filter_widget_where($where) |
| 955 | 955 | {
|
| 956 | - global $wp_query, $table; |
|
| 957 | - if (!empty($wp_query->query['show_featured_only'])) {
|
|
| 958 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 959 | - } |
|
| 960 | - if (!empty($wp_query->query['show_special_only'])) {
|
|
| 961 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 962 | - } |
|
| 963 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 964 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 965 | - } |
|
| 966 | - if (!empty($wp_query->query['with_videos_only'])) {
|
|
| 967 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 968 | - } |
|
| 969 | - return $where; |
|
| 956 | + global $wp_query, $table; |
|
| 957 | + if (!empty($wp_query->query['show_featured_only'])) {
|
|
| 958 | + $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 959 | + } |
|
| 960 | + if (!empty($wp_query->query['show_special_only'])) {
|
|
| 961 | + $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 962 | + } |
|
| 963 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 964 | + $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 965 | + } |
|
| 966 | + if (!empty($wp_query->query['with_videos_only'])) {
|
|
| 967 | + $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 968 | + } |
|
| 969 | + return $where; |
|
| 970 | 970 | } |
| 971 | 971 | |
| 972 | 972 | |
| 973 | 973 | function geodir_related_posts_fields($fields) {
|
| 974 | - global $wp_query, $wpdb, $table, $post; |
|
| 974 | + global $wp_query, $wpdb, $table, $post; |
|
| 975 | 975 | |
| 976 | - $fields .= ", " . $table . ".* "; |
|
| 976 | + $fields .= ", " . $table . ".* "; |
|
| 977 | 977 | |
| 978 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 978 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 979 | 979 | |
| 980 | - $mylat = $post->post_latitude; |
|
| 981 | - $mylon = $post->post_longitude; |
|
| 980 | + $mylat = $post->post_latitude; |
|
| 981 | + $mylon = $post->post_longitude; |
|
| 982 | 982 | |
| 983 | - $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 ";
|
|
| 984 | - return $fields; |
|
| 983 | + $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 ";
|
|
| 984 | + return $fields; |
|
| 985 | 985 | } |
| 986 | 986 | function geodir_related_posts_fields_filter($query) {
|
| 987 | - if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 988 | - && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
|
| 989 | - && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
|
| 990 | - ) {
|
|
| 991 | - add_filter('posts_fields', 'geodir_related_posts_fields', 1);
|
|
| 992 | - } |
|
| 987 | + if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 988 | + && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
|
| 989 | + && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
|
| 990 | + ) {
|
|
| 991 | + add_filter('posts_fields', 'geodir_related_posts_fields', 1);
|
|
| 992 | + } |
|
| 993 | 993 | } |
| 994 | 994 | add_action('pre_get_posts', 'geodir_related_posts_fields_filter', 1);
|
| 995 | 995 | |
@@ -1004,28 +1004,28 @@ discard block |
||
| 1004 | 1004 | * @return string|null If field exists in table returns order by clause else returns empty. |
| 1005 | 1005 | */ |
| 1006 | 1006 | function geodir_prepare_custom_sorting( $sorting, $table ) {
|
| 1007 | - $orderby = ''; |
|
| 1007 | + $orderby = ''; |
|
| 1008 | 1008 | |
| 1009 | - if ( empty( $sorting ) || empty( $table ) ) {
|
|
| 1010 | - return $orderby; |
|
| 1011 | - } |
|
| 1009 | + if ( empty( $sorting ) || empty( $table ) ) {
|
|
| 1010 | + return $orderby; |
|
| 1011 | + } |
|
| 1012 | 1012 | |
| 1013 | - if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {
|
|
| 1014 | - $sorting_array = explode( '_', $sorting ); |
|
| 1013 | + if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {
|
|
| 1014 | + $sorting_array = explode( '_', $sorting ); |
|
| 1015 | 1015 | |
| 1016 | - if ( ( $count = count( $sorting_array ) ) > 1 ) {
|
|
| 1017 | - $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
| 1018 | - array_pop( $sorting_array ); |
|
| 1016 | + if ( ( $count = count( $sorting_array ) ) > 1 ) {
|
|
| 1017 | + $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
| 1018 | + array_pop( $sorting_array ); |
|
| 1019 | 1019 | |
| 1020 | - if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {
|
|
| 1021 | - $sort_by = implode( '_', $sorting_array ); |
|
| 1020 | + if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {
|
|
| 1021 | + $sort_by = implode( '_', $sorting_array ); |
|
| 1022 | 1022 | |
| 1023 | - if ( geodir_column_exist( $table, $sort_by ) ) {
|
|
| 1024 | - $orderby = $table . "." . $sort_by . " " . $order; |
|
| 1025 | - } |
|
| 1026 | - } |
|
| 1027 | - } |
|
| 1028 | - } |
|
| 1023 | + if ( geodir_column_exist( $table, $sort_by ) ) {
|
|
| 1024 | + $orderby = $table . "." . $sort_by . " " . $order; |
|
| 1025 | + } |
|
| 1026 | + } |
|
| 1027 | + } |
|
| 1028 | + } |
|
| 1029 | 1029 | |
| 1030 | - return $orderby; |
|
| 1030 | + return $orderby; |
|
| 1031 | 1031 | } |
| 1032 | 1032 | \ No newline at end of file |
@@ -14,13 +14,13 @@ discard block |
||
| 14 | 14 | * @return int|null Return the page ID if present or null if not. |
| 15 | 15 | */ |
| 16 | 16 | function geodir_add_listing_page_id(){ |
| 17 | - $gd_page_id = get_option('geodir_add_listing_page'); |
|
| 17 | + $gd_page_id = get_option('geodir_add_listing_page'); |
|
| 18 | 18 | |
| 19 | - if (geodir_is_wpml()) { |
|
| 20 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 21 | - } |
|
| 19 | + if (geodir_is_wpml()) { |
|
| 20 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - return $gd_page_id; |
|
| 23 | + return $gd_page_id; |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -31,13 +31,13 @@ discard block |
||
| 31 | 31 | * @return int|null Return the page ID if present or null if not. |
| 32 | 32 | */ |
| 33 | 33 | function geodir_preview_page_id(){ |
| 34 | - $gd_page_id = get_option('geodir_preview_page'); |
|
| 34 | + $gd_page_id = get_option('geodir_preview_page'); |
|
| 35 | 35 | |
| 36 | - if (geodir_is_wpml()) { |
|
| 37 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 38 | - } |
|
| 36 | + if (geodir_is_wpml()) { |
|
| 37 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - return $gd_page_id; |
|
| 40 | + return $gd_page_id; |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | /** |
@@ -48,13 +48,13 @@ discard block |
||
| 48 | 48 | * @return int|null Return the page ID if present or null if not. |
| 49 | 49 | */ |
| 50 | 50 | function geodir_success_page_id(){ |
| 51 | - $gd_page_id = get_option('geodir_success_page'); |
|
| 51 | + $gd_page_id = get_option('geodir_success_page'); |
|
| 52 | 52 | |
| 53 | - if (geodir_is_wpml()) { |
|
| 54 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 55 | - } |
|
| 53 | + if (geodir_is_wpml()) { |
|
| 54 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 55 | + } |
|
| 56 | 56 | |
| 57 | - return $gd_page_id; |
|
| 57 | + return $gd_page_id; |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |
@@ -65,13 +65,13 @@ discard block |
||
| 65 | 65 | * @return int|null Return the page ID if present or null if not. |
| 66 | 66 | */ |
| 67 | 67 | function geodir_location_page_id(){ |
| 68 | - $gd_page_id = get_option('geodir_location_page'); |
|
| 68 | + $gd_page_id = get_option('geodir_location_page'); |
|
| 69 | 69 | |
| 70 | - if (geodir_is_wpml()) { |
|
| 71 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 72 | - } |
|
| 70 | + if (geodir_is_wpml()) { |
|
| 71 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - return $gd_page_id; |
|
| 74 | + return $gd_page_id; |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | /** |
@@ -82,13 +82,13 @@ discard block |
||
| 82 | 82 | * @return int|null Return the page ID if present or null if not. |
| 83 | 83 | */ |
| 84 | 84 | function geodir_home_page_id(){ |
| 85 | - $gd_page_id = get_option('geodir_home_page'); |
|
| 85 | + $gd_page_id = get_option('geodir_home_page'); |
|
| 86 | 86 | |
| 87 | - if (geodir_is_wpml()) { |
|
| 88 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 89 | - } |
|
| 87 | + if (geodir_is_wpml()) { |
|
| 88 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 89 | + } |
|
| 90 | 90 | |
| 91 | - return $gd_page_id; |
|
| 91 | + return $gd_page_id; |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | /** |
@@ -99,13 +99,13 @@ discard block |
||
| 99 | 99 | * @return int|null Return the page ID if present or null if not. |
| 100 | 100 | */ |
| 101 | 101 | function geodir_info_page_id(){ |
| 102 | - $gd_page_id = get_option('geodir_info_page'); |
|
| 102 | + $gd_page_id = get_option('geodir_info_page'); |
|
| 103 | 103 | |
| 104 | - if (geodir_is_wpml()) { |
|
| 105 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 106 | - } |
|
| 104 | + if (geodir_is_wpml()) { |
|
| 105 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 106 | + } |
|
| 107 | 107 | |
| 108 | - return $gd_page_id; |
|
| 108 | + return $gd_page_id; |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | /** |
@@ -116,13 +116,13 @@ discard block |
||
| 116 | 116 | * @return int|null Return the page ID if present or null if not. |
| 117 | 117 | */ |
| 118 | 118 | function geodir_login_page_id(){ |
| 119 | - $gd_page_id = get_option('geodir_login_page'); |
|
| 119 | + $gd_page_id = get_option('geodir_login_page'); |
|
| 120 | 120 | |
| 121 | - if (geodir_is_wpml()) { |
|
| 122 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 123 | - } |
|
| 121 | + if (geodir_is_wpml()) { |
|
| 122 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 123 | + } |
|
| 124 | 124 | |
| 125 | - return $gd_page_id; |
|
| 125 | + return $gd_page_id; |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | |
@@ -134,51 +134,51 @@ discard block |
||
| 134 | 134 | * @return int|null Return the page ID if present or null if not. |
| 135 | 135 | */ |
| 136 | 136 | function geodir_login_url($args=array()){ |
| 137 | - $gd_page_id = get_option('geodir_login_page'); |
|
| 138 | - |
|
| 139 | - if (geodir_is_wpml()) { |
|
| 140 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 141 | - } |
|
| 142 | - |
|
| 143 | - if (function_exists('geodir_location_geo_home_link')) { |
|
| 144 | - remove_filter('home_url', 'geodir_location_geo_home_link', 100000); |
|
| 145 | - } |
|
| 146 | - |
|
| 147 | - if (geodir_is_wpml()){ |
|
| 148 | - $home_url = icl_get_home_url(); |
|
| 149 | - }else{ |
|
| 150 | - $home_url = home_url(); |
|
| 151 | - } |
|
| 152 | - |
|
| 153 | - if (function_exists('geodir_location_geo_home_link')) { |
|
| 154 | - add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2); |
|
| 155 | - } |
|
| 156 | - |
|
| 157 | - if($gd_page_id){ |
|
| 158 | - $post = get_post($gd_page_id); |
|
| 159 | - $slug = $post->post_name; |
|
| 160 | - //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors |
|
| 161 | - $login_url = trailingslashit($home_url)."$slug/"; |
|
| 162 | - }else{ |
|
| 163 | - $login_url = trailingslashit($home_url)."?geodir_signup=true"; |
|
| 164 | - } |
|
| 165 | - |
|
| 166 | - if($args){ |
|
| 167 | - $login_url = add_query_arg($args,$login_url ); |
|
| 168 | - } |
|
| 169 | - |
|
| 170 | - /** |
|
| 171 | - * Filter the GeoDirectory login page url. |
|
| 172 | - * |
|
| 173 | - * This filter can be used to change the GeoDirectory page url. |
|
| 174 | - * |
|
| 175 | - * @since 1.5.3 |
|
| 176 | - * @package GeoDirectory |
|
| 177 | - * @param string $login_url The url of the login page. |
|
| 178 | - * @param array $args The array of query args used. |
|
| 179 | - * @param int $gd_page_id The page id of the GD login page. |
|
| 180 | - */ |
|
| 181 | - return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id); |
|
| 137 | + $gd_page_id = get_option('geodir_login_page'); |
|
| 138 | + |
|
| 139 | + if (geodir_is_wpml()) { |
|
| 140 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 141 | + } |
|
| 142 | + |
|
| 143 | + if (function_exists('geodir_location_geo_home_link')) { |
|
| 144 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000); |
|
| 145 | + } |
|
| 146 | + |
|
| 147 | + if (geodir_is_wpml()){ |
|
| 148 | + $home_url = icl_get_home_url(); |
|
| 149 | + }else{ |
|
| 150 | + $home_url = home_url(); |
|
| 151 | + } |
|
| 152 | + |
|
| 153 | + if (function_exists('geodir_location_geo_home_link')) { |
|
| 154 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2); |
|
| 155 | + } |
|
| 156 | + |
|
| 157 | + if($gd_page_id){ |
|
| 158 | + $post = get_post($gd_page_id); |
|
| 159 | + $slug = $post->post_name; |
|
| 160 | + //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors |
|
| 161 | + $login_url = trailingslashit($home_url)."$slug/"; |
|
| 162 | + }else{ |
|
| 163 | + $login_url = trailingslashit($home_url)."?geodir_signup=true"; |
|
| 164 | + } |
|
| 165 | + |
|
| 166 | + if($args){ |
|
| 167 | + $login_url = add_query_arg($args,$login_url ); |
|
| 168 | + } |
|
| 169 | + |
|
| 170 | + /** |
|
| 171 | + * Filter the GeoDirectory login page url. |
|
| 172 | + * |
|
| 173 | + * This filter can be used to change the GeoDirectory page url. |
|
| 174 | + * |
|
| 175 | + * @since 1.5.3 |
|
| 176 | + * @package GeoDirectory |
|
| 177 | + * @param string $login_url The url of the login page. |
|
| 178 | + * @param array $args The array of query args used. |
|
| 179 | + * @param int $gd_page_id The page id of the GD login page. |
|
| 180 | + */ |
|
| 181 | + return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id); |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | /** |
@@ -190,40 +190,40 @@ discard block |
||
| 190 | 190 | * @return string Info page url. |
| 191 | 191 | */ |
| 192 | 192 | function geodir_info_url($args=array()){ |
| 193 | - $gd_page_id = get_option('geodir_info_page'); |
|
| 194 | - |
|
| 195 | - if (geodir_is_wpml()) { |
|
| 196 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 197 | - } |
|
| 198 | - |
|
| 199 | - if (function_exists('geodir_location_geo_home_link')) { |
|
| 200 | - remove_filter('home_url', 'geodir_location_geo_home_link', 100000); |
|
| 201 | - } |
|
| 202 | - |
|
| 203 | - if (geodir_is_wpml()){ |
|
| 204 | - $home_url = icl_get_home_url(); |
|
| 205 | - }else{ |
|
| 206 | - $home_url = home_url(); |
|
| 207 | - } |
|
| 208 | - |
|
| 209 | - if (function_exists('geodir_location_geo_home_link')) { |
|
| 210 | - add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2); |
|
| 211 | - } |
|
| 212 | - |
|
| 213 | - if($gd_page_id){ |
|
| 214 | - $post = get_post($gd_page_id); |
|
| 215 | - $slug = $post->post_name; |
|
| 216 | - //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors |
|
| 217 | - $info_url = trailingslashit($home_url)."$slug/"; |
|
| 218 | - }else{ |
|
| 219 | - $info_url = trailingslashit($home_url); |
|
| 220 | - } |
|
| 221 | - |
|
| 222 | - if($args){ |
|
| 223 | - $info_url = add_query_arg($args,$info_url ); |
|
| 224 | - } |
|
| 225 | - |
|
| 226 | - return $info_url; |
|
| 193 | + $gd_page_id = get_option('geodir_info_page'); |
|
| 194 | + |
|
| 195 | + if (geodir_is_wpml()) { |
|
| 196 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 197 | + } |
|
| 198 | + |
|
| 199 | + if (function_exists('geodir_location_geo_home_link')) { |
|
| 200 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000); |
|
| 201 | + } |
|
| 202 | + |
|
| 203 | + if (geodir_is_wpml()){ |
|
| 204 | + $home_url = icl_get_home_url(); |
|
| 205 | + }else{ |
|
| 206 | + $home_url = home_url(); |
|
| 207 | + } |
|
| 208 | + |
|
| 209 | + if (function_exists('geodir_location_geo_home_link')) { |
|
| 210 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2); |
|
| 211 | + } |
|
| 212 | + |
|
| 213 | + if($gd_page_id){ |
|
| 214 | + $post = get_post($gd_page_id); |
|
| 215 | + $slug = $post->post_name; |
|
| 216 | + //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors |
|
| 217 | + $info_url = trailingslashit($home_url)."$slug/"; |
|
| 218 | + }else{ |
|
| 219 | + $info_url = trailingslashit($home_url); |
|
| 220 | + } |
|
| 221 | + |
|
| 222 | + if($args){ |
|
| 223 | + $info_url = add_query_arg($args,$info_url ); |
|
| 224 | + } |
|
| 225 | + |
|
| 226 | + return $info_url; |
|
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | /** |
@@ -239,11 +239,11 @@ discard block |
||
| 239 | 239 | * @return string Returns converted string. |
| 240 | 240 | */ |
| 241 | 241 | function geodir_ucwords($string, $charset='UTF-8') { |
| 242 | - if (function_exists('mb_convert_case')) { |
|
| 243 | - return mb_convert_case($string, MB_CASE_TITLE, $charset); |
|
| 244 | - } else { |
|
| 245 | - return ucwords($string); |
|
| 246 | - } |
|
| 242 | + if (function_exists('mb_convert_case')) { |
|
| 243 | + return mb_convert_case($string, MB_CASE_TITLE, $charset); |
|
| 244 | + } else { |
|
| 245 | + return ucwords($string); |
|
| 246 | + } |
|
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | /** |
@@ -259,11 +259,11 @@ discard block |
||
| 259 | 259 | * @return string Returns converted string. |
| 260 | 260 | */ |
| 261 | 261 | function geodir_strtolower($string, $charset='UTF-8') { |
| 262 | - if (function_exists('mb_convert_case')) { |
|
| 263 | - return mb_convert_case($string, MB_CASE_LOWER, $charset); |
|
| 264 | - } else { |
|
| 265 | - return strtolower($string); |
|
| 266 | - } |
|
| 262 | + if (function_exists('mb_convert_case')) { |
|
| 263 | + return mb_convert_case($string, MB_CASE_LOWER, $charset); |
|
| 264 | + } else { |
|
| 265 | + return strtolower($string); |
|
| 266 | + } |
|
| 267 | 267 | } |
| 268 | 268 | |
| 269 | 269 | /** |
@@ -279,11 +279,11 @@ discard block |
||
| 279 | 279 | * @return string Returns converted string. |
| 280 | 280 | */ |
| 281 | 281 | function geodir_strtoupper($string, $charset='UTF-8') { |
| 282 | - if (function_exists('mb_convert_case')) { |
|
| 283 | - return mb_convert_case($string, MB_CASE_UPPER, $charset); |
|
| 284 | - } else { |
|
| 285 | - return strtoupper($string); |
|
| 286 | - } |
|
| 282 | + if (function_exists('mb_convert_case')) { |
|
| 283 | + return mb_convert_case($string, MB_CASE_UPPER, $charset); |
|
| 284 | + } else { |
|
| 285 | + return strtoupper($string); |
|
| 286 | + } |
|
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | /** |
@@ -462,11 +462,11 @@ discard block |
||
| 462 | 462 | * @package GeoDirectory |
| 463 | 463 | */ |
| 464 | 464 | function _gd_die_handler() { |
| 465 | - if ( defined( 'GD_TESTING_MODE' ) ) { |
|
| 466 | - return '_gd_die_handler'; |
|
| 467 | - } else { |
|
| 468 | - die(); |
|
| 469 | - } |
|
| 465 | + if ( defined( 'GD_TESTING_MODE' ) ) { |
|
| 466 | + return '_gd_die_handler'; |
|
| 467 | + } else { |
|
| 468 | + die(); |
|
| 469 | + } |
|
| 470 | 470 | } |
| 471 | 471 | |
| 472 | 472 | /** |
@@ -481,9 +481,9 @@ discard block |
||
| 481 | 481 | * @param int $status Optional. Status code. |
| 482 | 482 | */ |
| 483 | 483 | function gd_die( $message = '', $title = '', $status = 400 ) { |
| 484 | - add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 ); |
|
| 485 | - add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 ); |
|
| 486 | - wp_die( $message, $title, array( 'response' => $status )); |
|
| 484 | + add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 ); |
|
| 485 | + add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 ); |
|
| 486 | + wp_die( $message, $title, array( 'response' => $status )); |
|
| 487 | 487 | } |
| 488 | 488 | |
| 489 | 489 | /* |
@@ -652,37 +652,37 @@ discard block |
||
| 652 | 652 | * @return string The formatted date. |
| 653 | 653 | */ |
| 654 | 654 | function geodir_date($date_input, $date_to, $date_from = '') { |
| 655 | - if (empty($date_input) || empty($date_to)) { |
|
| 656 | - return NULL; |
|
| 657 | - } |
|
| 655 | + if (empty($date_input) || empty($date_to)) { |
|
| 656 | + return NULL; |
|
| 657 | + } |
|
| 658 | 658 | |
| 659 | - $date = ''; |
|
| 660 | - if (!empty($date_from)) { |
|
| 661 | - $datetime = date_create_from_format($date_from, $date_input); |
|
| 659 | + $date = ''; |
|
| 660 | + if (!empty($date_from)) { |
|
| 661 | + $datetime = date_create_from_format($date_from, $date_input); |
|
| 662 | 662 | |
| 663 | - if (!empty($datetime)) { |
|
| 664 | - $date = $datetime->format($date_to); |
|
| 665 | - } |
|
| 666 | - } |
|
| 663 | + if (!empty($datetime)) { |
|
| 664 | + $date = $datetime->format($date_to); |
|
| 665 | + } |
|
| 666 | + } |
|
| 667 | 667 | |
| 668 | - if (empty($date)) { |
|
| 669 | - $date = strpos($date_input, '/') !== false ? str_replace('/', '-', $date_input) : $date_input; |
|
| 670 | - $date = date_i18n($date_to, strtotime($date)); |
|
| 671 | - } |
|
| 668 | + if (empty($date)) { |
|
| 669 | + $date = strpos($date_input, '/') !== false ? str_replace('/', '-', $date_input) : $date_input; |
|
| 670 | + $date = date_i18n($date_to, strtotime($date)); |
|
| 671 | + } |
|
| 672 | 672 | |
| 673 | - $date = geodir_maybe_untranslate_date($date); |
|
| 674 | - /** |
|
| 675 | - * Filter the the date format conversion. |
|
| 676 | - * |
|
| 677 | - * @since 1.6.7 |
|
| 678 | - * @package GeoDirectory |
|
| 679 | - * |
|
| 680 | - * @param string $date The date string. |
|
| 681 | - * @param string $date_input The date input. |
|
| 682 | - * @param string $date_to The destination date format. |
|
| 683 | - * @param string $date_from The source date format. |
|
| 684 | - */ |
|
| 685 | - return apply_filters('geodir_date', $date, $date_input, $date_to, $date_from); |
|
| 673 | + $date = geodir_maybe_untranslate_date($date); |
|
| 674 | + /** |
|
| 675 | + * Filter the the date format conversion. |
|
| 676 | + * |
|
| 677 | + * @since 1.6.7 |
|
| 678 | + * @package GeoDirectory |
|
| 679 | + * |
|
| 680 | + * @param string $date The date string. |
|
| 681 | + * @param string $date_input The date input. |
|
| 682 | + * @param string $date_to The destination date format. |
|
| 683 | + * @param string $date_from The source date format. |
|
| 684 | + */ |
|
| 685 | + return apply_filters('geodir_date', $date, $date_input, $date_to, $date_from); |
|
| 686 | 686 | } |
| 687 | 687 | |
| 688 | 688 | /** |
@@ -707,91 +707,91 @@ discard block |
||
| 707 | 707 | * @return string Trimmed string. |
| 708 | 708 | */ |
| 709 | 709 | function geodir_excerpt($text, $length = 100, $options = array()) { |
| 710 | - if (!(int)$length > 0) { |
|
| 711 | - return $text; |
|
| 712 | - } |
|
| 713 | - $default = array( |
|
| 714 | - 'ellipsis' => '', 'exact' => true, 'html' => true, 'trimWidth' => false, |
|
| 710 | + if (!(int)$length > 0) { |
|
| 711 | + return $text; |
|
| 712 | + } |
|
| 713 | + $default = array( |
|
| 714 | + 'ellipsis' => '', 'exact' => true, 'html' => true, 'trimWidth' => false, |
|
| 715 | 715 | ); |
| 716 | - if (!empty($options['html']) && function_exists('mb_internal_encoding') && strtolower(mb_internal_encoding()) === 'utf-8') { |
|
| 717 | - $default['ellipsis'] = ""; |
|
| 718 | - } |
|
| 719 | - $options += $default; |
|
| 720 | - |
|
| 721 | - $prefix = ''; |
|
| 722 | - $suffix = $options['ellipsis']; |
|
| 723 | - |
|
| 724 | - if ($options['html']) { |
|
| 725 | - $ellipsisLength = geodir_strlen(strip_tags($options['ellipsis']), $options); |
|
| 726 | - |
|
| 727 | - $truncateLength = 0; |
|
| 728 | - $totalLength = 0; |
|
| 729 | - $openTags = array(); |
|
| 730 | - $truncate = ''; |
|
| 731 | - |
|
| 732 | - preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER); |
|
| 733 | - foreach ($tags as $tag) { |
|
| 734 | - $contentLength = geodir_strlen($tag[3], $options); |
|
| 735 | - |
|
| 736 | - if ($truncate === '') { |
|
| 737 | - if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/i', $tag[2])) { |
|
| 738 | - if (preg_match('/<[\w]+[^>]*>/', $tag[0])) { |
|
| 739 | - array_unshift($openTags, $tag[2]); |
|
| 740 | - } elseif (preg_match('/<\/([\w]+)[^>]*>/', $tag[0], $closeTag)) { |
|
| 741 | - $pos = array_search($closeTag[1], $openTags); |
|
| 742 | - if ($pos !== false) { |
|
| 743 | - array_splice($openTags, $pos, 1); |
|
| 744 | - } |
|
| 745 | - } |
|
| 746 | - } |
|
| 747 | - |
|
| 748 | - $prefix .= $tag[1]; |
|
| 749 | - |
|
| 750 | - if ($totalLength + $contentLength + $ellipsisLength > $length) { |
|
| 751 | - $truncate = $tag[3]; |
|
| 752 | - $truncateLength = $length - $totalLength; |
|
| 753 | - } else { |
|
| 754 | - $prefix .= $tag[3]; |
|
| 755 | - } |
|
| 756 | - } |
|
| 757 | - |
|
| 758 | - $totalLength += $contentLength; |
|
| 759 | - if ($totalLength > $length) { |
|
| 760 | - break; |
|
| 761 | - } |
|
| 762 | - } |
|
| 763 | - |
|
| 764 | - if ($totalLength <= $length) { |
|
| 765 | - return $text; |
|
| 766 | - } |
|
| 767 | - |
|
| 768 | - $text = $truncate; |
|
| 769 | - $length = $truncateLength; |
|
| 770 | - |
|
| 771 | - foreach ($openTags as $tag) { |
|
| 772 | - $suffix .= '</' . $tag . '>'; |
|
| 773 | - } |
|
| 774 | - } else { |
|
| 775 | - if (geodir_strlen($text, $options) <= $length) { |
|
| 776 | - return $text; |
|
| 777 | - } |
|
| 778 | - $ellipsisLength = geodir_strlen($options['ellipsis'], $options); |
|
| 779 | - } |
|
| 780 | - |
|
| 781 | - $result = geodir_substr($text, 0, $length - $ellipsisLength, $options); |
|
| 782 | - |
|
| 783 | - if (!$options['exact']) { |
|
| 784 | - if (geodir_substr($text, $length - $ellipsisLength, 1, $options) !== ' ') { |
|
| 785 | - $result = geodir_remove_last_word($result); |
|
| 786 | - } |
|
| 787 | - |
|
| 788 | - // Do not need to count ellipsis in the cut, if result is empty. |
|
| 789 | - if (!strlen($result)) { |
|
| 790 | - $result = geodir_substr($text, 0, $length, $options); |
|
| 791 | - } |
|
| 792 | - } |
|
| 793 | - |
|
| 794 | - return $prefix . $result . $suffix; |
|
| 716 | + if (!empty($options['html']) && function_exists('mb_internal_encoding') && strtolower(mb_internal_encoding()) === 'utf-8') { |
|
| 717 | + $default['ellipsis'] = ""; |
|
| 718 | + } |
|
| 719 | + $options += $default; |
|
| 720 | + |
|
| 721 | + $prefix = ''; |
|
| 722 | + $suffix = $options['ellipsis']; |
|
| 723 | + |
|
| 724 | + if ($options['html']) { |
|
| 725 | + $ellipsisLength = geodir_strlen(strip_tags($options['ellipsis']), $options); |
|
| 726 | + |
|
| 727 | + $truncateLength = 0; |
|
| 728 | + $totalLength = 0; |
|
| 729 | + $openTags = array(); |
|
| 730 | + $truncate = ''; |
|
| 731 | + |
|
| 732 | + preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER); |
|
| 733 | + foreach ($tags as $tag) { |
|
| 734 | + $contentLength = geodir_strlen($tag[3], $options); |
|
| 735 | + |
|
| 736 | + if ($truncate === '') { |
|
| 737 | + if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/i', $tag[2])) { |
|
| 738 | + if (preg_match('/<[\w]+[^>]*>/', $tag[0])) { |
|
| 739 | + array_unshift($openTags, $tag[2]); |
|
| 740 | + } elseif (preg_match('/<\/([\w]+)[^>]*>/', $tag[0], $closeTag)) { |
|
| 741 | + $pos = array_search($closeTag[1], $openTags); |
|
| 742 | + if ($pos !== false) { |
|
| 743 | + array_splice($openTags, $pos, 1); |
|
| 744 | + } |
|
| 745 | + } |
|
| 746 | + } |
|
| 747 | + |
|
| 748 | + $prefix .= $tag[1]; |
|
| 749 | + |
|
| 750 | + if ($totalLength + $contentLength + $ellipsisLength > $length) { |
|
| 751 | + $truncate = $tag[3]; |
|
| 752 | + $truncateLength = $length - $totalLength; |
|
| 753 | + } else { |
|
| 754 | + $prefix .= $tag[3]; |
|
| 755 | + } |
|
| 756 | + } |
|
| 757 | + |
|
| 758 | + $totalLength += $contentLength; |
|
| 759 | + if ($totalLength > $length) { |
|
| 760 | + break; |
|
| 761 | + } |
|
| 762 | + } |
|
| 763 | + |
|
| 764 | + if ($totalLength <= $length) { |
|
| 765 | + return $text; |
|
| 766 | + } |
|
| 767 | + |
|
| 768 | + $text = $truncate; |
|
| 769 | + $length = $truncateLength; |
|
| 770 | + |
|
| 771 | + foreach ($openTags as $tag) { |
|
| 772 | + $suffix .= '</' . $tag . '>'; |
|
| 773 | + } |
|
| 774 | + } else { |
|
| 775 | + if (geodir_strlen($text, $options) <= $length) { |
|
| 776 | + return $text; |
|
| 777 | + } |
|
| 778 | + $ellipsisLength = geodir_strlen($options['ellipsis'], $options); |
|
| 779 | + } |
|
| 780 | + |
|
| 781 | + $result = geodir_substr($text, 0, $length - $ellipsisLength, $options); |
|
| 782 | + |
|
| 783 | + if (!$options['exact']) { |
|
| 784 | + if (geodir_substr($text, $length - $ellipsisLength, 1, $options) !== ' ') { |
|
| 785 | + $result = geodir_remove_last_word($result); |
|
| 786 | + } |
|
| 787 | + |
|
| 788 | + // Do not need to count ellipsis in the cut, if result is empty. |
|
| 789 | + if (!strlen($result)) { |
|
| 790 | + $result = geodir_substr($text, 0, $length, $options); |
|
| 791 | + } |
|
| 792 | + } |
|
| 793 | + |
|
| 794 | + return $prefix . $result . $suffix; |
|
| 795 | 795 | } |
| 796 | 796 | |
| 797 | 797 | /** |
@@ -815,28 +815,28 @@ discard block |
||
| 815 | 815 | * @return int |
| 816 | 816 | */ |
| 817 | 817 | function geodir_strlen($text, array $options) { |
| 818 | - if (empty($options['trimWidth'])) { |
|
| 819 | - $strlen = 'geodir_utf8_strlen'; |
|
| 820 | - } else { |
|
| 821 | - $strlen = 'geodir_utf8_strwidth'; |
|
| 822 | - } |
|
| 823 | - |
|
| 824 | - if (empty($options['html'])) { |
|
| 825 | - return $strlen($text); |
|
| 826 | - } |
|
| 827 | - |
|
| 828 | - $pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i'; |
|
| 829 | - $replace = preg_replace_callback( |
|
| 830 | - $pattern, |
|
| 831 | - function ($match) use ($strlen) { |
|
| 832 | - $utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8'); |
|
| 833 | - |
|
| 834 | - return str_repeat(' ', $strlen($utf8, 'UTF-8')); |
|
| 835 | - }, |
|
| 836 | - $text |
|
| 837 | - ); |
|
| 838 | - |
|
| 839 | - return $strlen($replace); |
|
| 818 | + if (empty($options['trimWidth'])) { |
|
| 819 | + $strlen = 'geodir_utf8_strlen'; |
|
| 820 | + } else { |
|
| 821 | + $strlen = 'geodir_utf8_strwidth'; |
|
| 822 | + } |
|
| 823 | + |
|
| 824 | + if (empty($options['html'])) { |
|
| 825 | + return $strlen($text); |
|
| 826 | + } |
|
| 827 | + |
|
| 828 | + $pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i'; |
|
| 829 | + $replace = preg_replace_callback( |
|
| 830 | + $pattern, |
|
| 831 | + function ($match) use ($strlen) { |
|
| 832 | + $utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8'); |
|
| 833 | + |
|
| 834 | + return str_repeat(' ', $strlen($utf8, 'UTF-8')); |
|
| 835 | + }, |
|
| 836 | + $text |
|
| 837 | + ); |
|
| 838 | + |
|
| 839 | + return $strlen($replace); |
|
| 840 | 840 | } |
| 841 | 841 | |
| 842 | 842 | /** |
@@ -857,80 +857,80 @@ discard block |
||
| 857 | 857 | * @return string |
| 858 | 858 | */ |
| 859 | 859 | function geodir_substr($text, $start, $length, array $options) { |
| 860 | - if (empty($options['trimWidth'])) { |
|
| 861 | - $substr = 'geodir_utf8_substr'; |
|
| 862 | - } else { |
|
| 863 | - $substr = 'geodir_utf8_strimwidth'; |
|
| 864 | - } |
|
| 865 | - |
|
| 866 | - $maxPosition = geodir_strlen($text, array('trimWidth' => false) + $options); |
|
| 867 | - if ($start < 0) { |
|
| 868 | - $start += $maxPosition; |
|
| 869 | - if ($start < 0) { |
|
| 870 | - $start = 0; |
|
| 871 | - } |
|
| 872 | - } |
|
| 873 | - if ($start >= $maxPosition) { |
|
| 874 | - return ''; |
|
| 875 | - } |
|
| 876 | - |
|
| 877 | - if ($length === null) { |
|
| 878 | - $length = geodir_strlen($text, $options); |
|
| 879 | - } |
|
| 880 | - |
|
| 881 | - if ($length < 0) { |
|
| 882 | - $text = geodir_substr($text, $start, null, $options); |
|
| 883 | - $start = 0; |
|
| 884 | - $length += geodir_strlen($text, $options); |
|
| 885 | - } |
|
| 886 | - |
|
| 887 | - if ($length <= 0) { |
|
| 888 | - return ''; |
|
| 889 | - } |
|
| 890 | - |
|
| 891 | - if (empty($options['html'])) { |
|
| 892 | - return (string)$substr($text, $start, $length); |
|
| 893 | - } |
|
| 894 | - |
|
| 895 | - $totalOffset = 0; |
|
| 896 | - $totalLength = 0; |
|
| 897 | - $result = ''; |
|
| 898 | - |
|
| 899 | - $pattern = '/(&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};)/i'; |
|
| 900 | - $parts = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); |
|
| 901 | - foreach ($parts as $part) { |
|
| 902 | - $offset = 0; |
|
| 903 | - |
|
| 904 | - if ($totalOffset < $start) { |
|
| 905 | - $len = geodir_strlen($part, array('trimWidth' => false) + $options); |
|
| 906 | - if ($totalOffset + $len <= $start) { |
|
| 907 | - $totalOffset += $len; |
|
| 908 | - continue; |
|
| 909 | - } |
|
| 910 | - |
|
| 911 | - $offset = $start - $totalOffset; |
|
| 912 | - $totalOffset = $start; |
|
| 913 | - } |
|
| 914 | - |
|
| 915 | - $len = geodir_strlen($part, $options); |
|
| 916 | - if ($offset !== 0 || $totalLength + $len > $length) { |
|
| 917 | - if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) { |
|
| 918 | - // Entities cannot be passed substr. |
|
| 919 | - continue; |
|
| 920 | - } |
|
| 921 | - |
|
| 922 | - $part = $substr($part, $offset, $length - $totalLength); |
|
| 923 | - $len = geodir_strlen($part, $options); |
|
| 924 | - } |
|
| 925 | - |
|
| 926 | - $result .= $part; |
|
| 927 | - $totalLength += $len; |
|
| 928 | - if ($totalLength >= $length) { |
|
| 929 | - break; |
|
| 930 | - } |
|
| 931 | - } |
|
| 932 | - |
|
| 933 | - return $result; |
|
| 860 | + if (empty($options['trimWidth'])) { |
|
| 861 | + $substr = 'geodir_utf8_substr'; |
|
| 862 | + } else { |
|
| 863 | + $substr = 'geodir_utf8_strimwidth'; |
|
| 864 | + } |
|
| 865 | + |
|
| 866 | + $maxPosition = geodir_strlen($text, array('trimWidth' => false) + $options); |
|
| 867 | + if ($start < 0) { |
|
| 868 | + $start += $maxPosition; |
|
| 869 | + if ($start < 0) { |
|
| 870 | + $start = 0; |
|
| 871 | + } |
|
| 872 | + } |
|
| 873 | + if ($start >= $maxPosition) { |
|
| 874 | + return ''; |
|
| 875 | + } |
|
| 876 | + |
|
| 877 | + if ($length === null) { |
|
| 878 | + $length = geodir_strlen($text, $options); |
|
| 879 | + } |
|
| 880 | + |
|
| 881 | + if ($length < 0) { |
|
| 882 | + $text = geodir_substr($text, $start, null, $options); |
|
| 883 | + $start = 0; |
|
| 884 | + $length += geodir_strlen($text, $options); |
|
| 885 | + } |
|
| 886 | + |
|
| 887 | + if ($length <= 0) { |
|
| 888 | + return ''; |
|
| 889 | + } |
|
| 890 | + |
|
| 891 | + if (empty($options['html'])) { |
|
| 892 | + return (string)$substr($text, $start, $length); |
|
| 893 | + } |
|
| 894 | + |
|
| 895 | + $totalOffset = 0; |
|
| 896 | + $totalLength = 0; |
|
| 897 | + $result = ''; |
|
| 898 | + |
|
| 899 | + $pattern = '/(&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};)/i'; |
|
| 900 | + $parts = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); |
|
| 901 | + foreach ($parts as $part) { |
|
| 902 | + $offset = 0; |
|
| 903 | + |
|
| 904 | + if ($totalOffset < $start) { |
|
| 905 | + $len = geodir_strlen($part, array('trimWidth' => false) + $options); |
|
| 906 | + if ($totalOffset + $len <= $start) { |
|
| 907 | + $totalOffset += $len; |
|
| 908 | + continue; |
|
| 909 | + } |
|
| 910 | + |
|
| 911 | + $offset = $start - $totalOffset; |
|
| 912 | + $totalOffset = $start; |
|
| 913 | + } |
|
| 914 | + |
|
| 915 | + $len = geodir_strlen($part, $options); |
|
| 916 | + if ($offset !== 0 || $totalLength + $len > $length) { |
|
| 917 | + if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) { |
|
| 918 | + // Entities cannot be passed substr. |
|
| 919 | + continue; |
|
| 920 | + } |
|
| 921 | + |
|
| 922 | + $part = $substr($part, $offset, $length - $totalLength); |
|
| 923 | + $len = geodir_strlen($part, $options); |
|
| 924 | + } |
|
| 925 | + |
|
| 926 | + $result .= $part; |
|
| 927 | + $totalLength += $len; |
|
| 928 | + if ($totalLength >= $length) { |
|
| 929 | + break; |
|
| 930 | + } |
|
| 931 | + } |
|
| 932 | + |
|
| 933 | + return $result; |
|
| 934 | 934 | } |
| 935 | 935 | |
| 936 | 936 | /** |
@@ -943,21 +943,21 @@ discard block |
||
| 943 | 943 | * @return string |
| 944 | 944 | */ |
| 945 | 945 | function geodir_remove_last_word($text) { |
| 946 | - $spacepos = geodir_utf8_strrpos($text, ' '); |
|
| 946 | + $spacepos = geodir_utf8_strrpos($text, ' '); |
|
| 947 | 947 | |
| 948 | - if ($spacepos !== false) { |
|
| 949 | - $lastWord = geodir_utf8_strrpos($text, $spacepos); |
|
| 948 | + if ($spacepos !== false) { |
|
| 949 | + $lastWord = geodir_utf8_strrpos($text, $spacepos); |
|
| 950 | 950 | |
| 951 | - // Some languages are written without word separation. |
|
| 952 | - // We recognize a string as a word if it does not contain any full-width characters. |
|
| 953 | - if (geodir_utf8_strwidth($lastWord) === geodir_utf8_strlen($lastWord)) { |
|
| 954 | - $text = geodir_utf8_substr($text, 0, $spacepos); |
|
| 955 | - } |
|
| 951 | + // Some languages are written without word separation. |
|
| 952 | + // We recognize a string as a word if it does not contain any full-width characters. |
|
| 953 | + if (geodir_utf8_strwidth($lastWord) === geodir_utf8_strlen($lastWord)) { |
|
| 954 | + $text = geodir_utf8_substr($text, 0, $spacepos); |
|
| 955 | + } |
|
| 956 | 956 | |
| 957 | - return $text; |
|
| 958 | - } |
|
| 957 | + return $text; |
|
| 958 | + } |
|
| 959 | 959 | |
| 960 | - return ''; |
|
| 960 | + return ''; |
|
| 961 | 961 | } |
| 962 | 962 | |
| 963 | 963 | function geodir_tool_restore_cpt_from_taxonomies(){ |
@@ -1075,11 +1075,11 @@ discard block |
||
| 1075 | 1075 | * @return string |
| 1076 | 1076 | */ |
| 1077 | 1077 | function geodir_utf8_strimwidth( $str, $start, $width, $trimmaker = '', $encoding = 'UTF-8' ) { |
| 1078 | - if ( function_exists( 'mb_strimwidth' ) ) { |
|
| 1079 | - return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding ); |
|
| 1080 | - } |
|
| 1078 | + if ( function_exists( 'mb_strimwidth' ) ) { |
|
| 1079 | + return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding ); |
|
| 1080 | + } |
|
| 1081 | 1081 | |
| 1082 | - return geodir_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker; |
|
| 1082 | + return geodir_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker; |
|
| 1083 | 1083 | } |
| 1084 | 1084 | |
| 1085 | 1085 | /** |
@@ -1093,11 +1093,11 @@ discard block |
||
| 1093 | 1093 | * @return int Returns the number of characters in string. |
| 1094 | 1094 | */ |
| 1095 | 1095 | function geodir_utf8_strlen( $str, $encoding = 'UTF-8' ) { |
| 1096 | - if ( function_exists( 'mb_strlen' ) ) { |
|
| 1097 | - return mb_strlen( $str, $encoding ); |
|
| 1098 | - } |
|
| 1096 | + if ( function_exists( 'mb_strlen' ) ) { |
|
| 1097 | + return mb_strlen( $str, $encoding ); |
|
| 1098 | + } |
|
| 1099 | 1099 | |
| 1100 | - return strlen( $str ); |
|
| 1100 | + return strlen( $str ); |
|
| 1101 | 1101 | } |
| 1102 | 1102 | |
| 1103 | 1103 | /** |
@@ -1113,11 +1113,11 @@ discard block |
||
| 1113 | 1113 | * @return int Returns the position of the first occurrence of search in the string. |
| 1114 | 1114 | */ |
| 1115 | 1115 | function geodir_utf8_strpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) { |
| 1116 | - if ( function_exists( 'mb_strpos' ) ) { |
|
| 1117 | - return mb_strpos( $str, $find, $offset, $encoding ); |
|
| 1118 | - } |
|
| 1116 | + if ( function_exists( 'mb_strpos' ) ) { |
|
| 1117 | + return mb_strpos( $str, $find, $offset, $encoding ); |
|
| 1118 | + } |
|
| 1119 | 1119 | |
| 1120 | - return strpos( $str, $find, $offset ); |
|
| 1120 | + return strpos( $str, $find, $offset ); |
|
| 1121 | 1121 | } |
| 1122 | 1122 | |
| 1123 | 1123 | /** |
@@ -1133,11 +1133,11 @@ discard block |
||
| 1133 | 1133 | * @return int Returns the position of the last occurrence of search. |
| 1134 | 1134 | */ |
| 1135 | 1135 | function geodir_utf8_strrpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) { |
| 1136 | - if ( function_exists( 'mb_strrpos' ) ) { |
|
| 1137 | - return mb_strrpos( $str, $find, $offset, $encoding ); |
|
| 1138 | - } |
|
| 1136 | + if ( function_exists( 'mb_strrpos' ) ) { |
|
| 1137 | + return mb_strrpos( $str, $find, $offset, $encoding ); |
|
| 1138 | + } |
|
| 1139 | 1139 | |
| 1140 | - return strrpos( $str, $find, $offset ); |
|
| 1140 | + return strrpos( $str, $find, $offset ); |
|
| 1141 | 1141 | } |
| 1142 | 1142 | |
| 1143 | 1143 | /** |
@@ -1154,15 +1154,15 @@ discard block |
||
| 1154 | 1154 | * @return string |
| 1155 | 1155 | */ |
| 1156 | 1156 | function geodir_utf8_substr( $str, $start, $length = null, $encoding = 'UTF-8' ) { |
| 1157 | - if ( function_exists( 'mb_substr' ) ) { |
|
| 1158 | - if ( $length === null ) { |
|
| 1159 | - return mb_substr( $str, $start, geodir_utf8_strlen( $str, $encoding ), $encoding ); |
|
| 1160 | - } else { |
|
| 1161 | - return mb_substr( $str, $start, $length, $encoding ); |
|
| 1162 | - } |
|
| 1163 | - } |
|
| 1157 | + if ( function_exists( 'mb_substr' ) ) { |
|
| 1158 | + if ( $length === null ) { |
|
| 1159 | + return mb_substr( $str, $start, geodir_utf8_strlen( $str, $encoding ), $encoding ); |
|
| 1160 | + } else { |
|
| 1161 | + return mb_substr( $str, $start, $length, $encoding ); |
|
| 1162 | + } |
|
| 1163 | + } |
|
| 1164 | 1164 | |
| 1165 | - return substr( $str, $start, $length ); |
|
| 1165 | + return substr( $str, $start, $length ); |
|
| 1166 | 1166 | } |
| 1167 | 1167 | |
| 1168 | 1168 | /** |
@@ -1195,20 +1195,20 @@ discard block |
||
| 1195 | 1195 | * @return string The resulting string. |
| 1196 | 1196 | */ |
| 1197 | 1197 | function geodir_utf8_ucfirst( $str, $lower_str_end = false, $encoding = 'UTF-8' ) { |
| 1198 | - if ( function_exists( 'mb_strlen' ) ) { |
|
| 1199 | - $first_letter = geodir_strtoupper( geodir_utf8_substr( $str, 0, 1, $encoding ), $encoding ); |
|
| 1200 | - $str_end = ""; |
|
| 1198 | + if ( function_exists( 'mb_strlen' ) ) { |
|
| 1199 | + $first_letter = geodir_strtoupper( geodir_utf8_substr( $str, 0, 1, $encoding ), $encoding ); |
|
| 1200 | + $str_end = ""; |
|
| 1201 | 1201 | |
| 1202 | - if ( $lower_str_end ) { |
|
| 1203 | - $str_end = geodir_strtolower( geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding ), $encoding ); |
|
| 1204 | - } else { |
|
| 1205 | - $str_end = geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding ); |
|
| 1206 | - } |
|
| 1202 | + if ( $lower_str_end ) { |
|
| 1203 | + $str_end = geodir_strtolower( geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding ), $encoding ); |
|
| 1204 | + } else { |
|
| 1205 | + $str_end = geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding ); |
|
| 1206 | + } |
|
| 1207 | 1207 | |
| 1208 | - return $first_letter . $str_end; |
|
| 1209 | - } |
|
| 1208 | + return $first_letter . $str_end; |
|
| 1209 | + } |
|
| 1210 | 1210 | |
| 1211 | - return ucfirst( $str ); |
|
| 1211 | + return ucfirst( $str ); |
|
| 1212 | 1212 | } |
| 1213 | 1213 | |
| 1214 | 1214 | function geodir_total_listings_count($post_type = false) |
@@ -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,63 +50,63 @@ 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
|
|
| 87 | - . '","t": "' . $title |
|
| 88 | - . '","lt": "' . $post->post_latitude |
|
| 89 | - . '","ln": "' . $post->post_longitude |
|
| 90 | - . '","mk_id":"' . $post->ID . '_' . $post->default_category |
|
| 91 | - . '","i":"' . $icon |
|
| 92 | - . '","w":"' . $icon_size['w'] |
|
| 93 | - . '","h":"' . $icon_size['h'] . '"}'; |
|
| 94 | - |
|
| 95 | - /** |
|
| 96 | - * Filter the json data when creating output for post json marker.. |
|
| 97 | - * |
|
| 98 | - * @since 1.5.7 |
|
| 99 | - * @param string $post_json JSON representation of the post marker info. |
|
| 100 | - * @param object $post The post object. |
|
| 101 | - */ |
|
| 102 | - $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
|
|
| 103 | - |
|
| 104 | - // only assign it if it has a value |
|
| 105 | - if($post_map_json){
|
|
| 106 | - $map_jason[$post->ID] = $post_map_json; |
|
| 107 | - } |
|
| 108 | - |
|
| 109 | - } |
|
| 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
|
|
| 87 | + . '","t": "' . $title |
|
| 88 | + . '","lt": "' . $post->post_latitude |
|
| 89 | + . '","ln": "' . $post->post_longitude |
|
| 90 | + . '","mk_id":"' . $post->ID . '_' . $post->default_category |
|
| 91 | + . '","i":"' . $icon |
|
| 92 | + . '","w":"' . $icon_size['w'] |
|
| 93 | + . '","h":"' . $icon_size['h'] . '"}'; |
|
| 94 | + |
|
| 95 | + /** |
|
| 96 | + * Filter the json data when creating output for post json marker.. |
|
| 97 | + * |
|
| 98 | + * @since 1.5.7 |
|
| 99 | + * @param string $post_json JSON representation of the post marker info. |
|
| 100 | + * @param object $post The post object. |
|
| 101 | + */ |
|
| 102 | + $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
|
|
| 103 | + |
|
| 104 | + // only assign it if it has a value |
|
| 105 | + if($post_map_json){
|
|
| 106 | + $map_jason[$post->ID] = $post_map_json; |
|
| 107 | + } |
|
| 108 | + |
|
| 109 | + } |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | /** |
@@ -119,67 +119,67 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | function send_marker_jason_to_js() |
| 121 | 121 | {
|
| 122 | - global $map_jason, $map_canvas_arr; |
|
| 123 | - |
|
| 124 | - if (is_array($map_canvas_arr) && !empty($map_canvas_arr)) {
|
|
| 125 | - foreach ($map_canvas_arr as $canvas => $jason) {
|
|
| 126 | - if (is_array($map_jason) && !empty($map_jason)) {
|
|
| 127 | - |
|
| 128 | - // on details page only show the main marker on the map |
|
| 129 | - if(geodir_is_page('detail')){
|
|
| 130 | - global $post; |
|
| 131 | - if(isset($map_jason[$post->ID])){
|
|
| 132 | - $map_jason = array($map_jason[$post->ID]); |
|
| 133 | - } |
|
| 134 | - } |
|
| 135 | - $canvas_jason = $canvas . "_jason"; |
|
| 136 | - $map_canvas_arr[$canvas] = array_unique($map_jason); |
|
| 137 | - unset($cat_content_info); |
|
| 138 | - $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
|
|
| 139 | - $totalcount = count(array_unique($map_jason)); |
|
| 140 | - if (!empty($cat_content_info)) {
|
|
| 141 | - $json_content = substr(implode(',', $cat_content_info), 1);
|
|
| 142 | - $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
|
|
| 143 | - $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08 |
|
| 144 | - $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
|
|
| 145 | - } else {
|
|
| 146 | - $canvas_jason = '[{"totalcount":"0"}]';
|
|
| 147 | - } |
|
| 148 | - $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 149 | - |
|
| 150 | - /** |
|
| 151 | - * Filter the send_marker_jason_to_js() function map canvas json args. |
|
| 152 | - * |
|
| 153 | - * You can use this filter to modify map canvas json args. |
|
| 154 | - * |
|
| 155 | - * @since 1.0.0 |
|
| 156 | - * @package GeoDirectory |
|
| 157 | - * @param string $canvas Map canvas array key. |
|
| 158 | - * @param array $map_canvas_jason_args Map canvas args. |
|
| 159 | - */ |
|
| 160 | - $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 161 | - |
|
| 162 | - wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 163 | - } else {
|
|
| 164 | - $canvas_jason = '[{"totalcount":"0"}]';
|
|
| 165 | - $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 166 | - |
|
| 167 | - /** |
|
| 168 | - * Filter the send_marker_jason_to_js() function map canvas json args. |
|
| 169 | - * |
|
| 170 | - * You can use this filter to modify map canvas json args. |
|
| 171 | - * |
|
| 172 | - * @since 1.0.0 |
|
| 173 | - * @package GeoDirectory |
|
| 174 | - * @param string $canvas Map canvas array key. |
|
| 175 | - * @param array $map_canvas_jason_args Map canvas args. |
|
| 176 | - */ |
|
| 177 | - $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 178 | - wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 179 | - } |
|
| 180 | - } |
|
| 181 | - |
|
| 182 | - } |
|
| 122 | + global $map_jason, $map_canvas_arr; |
|
| 123 | + |
|
| 124 | + if (is_array($map_canvas_arr) && !empty($map_canvas_arr)) {
|
|
| 125 | + foreach ($map_canvas_arr as $canvas => $jason) {
|
|
| 126 | + if (is_array($map_jason) && !empty($map_jason)) {
|
|
| 127 | + |
|
| 128 | + // on details page only show the main marker on the map |
|
| 129 | + if(geodir_is_page('detail')){
|
|
| 130 | + global $post; |
|
| 131 | + if(isset($map_jason[$post->ID])){
|
|
| 132 | + $map_jason = array($map_jason[$post->ID]); |
|
| 133 | + } |
|
| 134 | + } |
|
| 135 | + $canvas_jason = $canvas . "_jason"; |
|
| 136 | + $map_canvas_arr[$canvas] = array_unique($map_jason); |
|
| 137 | + unset($cat_content_info); |
|
| 138 | + $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
|
|
| 139 | + $totalcount = count(array_unique($map_jason)); |
|
| 140 | + if (!empty($cat_content_info)) {
|
|
| 141 | + $json_content = substr(implode(',', $cat_content_info), 1);
|
|
| 142 | + $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
|
|
| 143 | + $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08 |
|
| 144 | + $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
|
|
| 145 | + } else {
|
|
| 146 | + $canvas_jason = '[{"totalcount":"0"}]';
|
|
| 147 | + } |
|
| 148 | + $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 149 | + |
|
| 150 | + /** |
|
| 151 | + * Filter the send_marker_jason_to_js() function map canvas json args. |
|
| 152 | + * |
|
| 153 | + * You can use this filter to modify map canvas json args. |
|
| 154 | + * |
|
| 155 | + * @since 1.0.0 |
|
| 156 | + * @package GeoDirectory |
|
| 157 | + * @param string $canvas Map canvas array key. |
|
| 158 | + * @param array $map_canvas_jason_args Map canvas args. |
|
| 159 | + */ |
|
| 160 | + $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 161 | + |
|
| 162 | + wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 163 | + } else {
|
|
| 164 | + $canvas_jason = '[{"totalcount":"0"}]';
|
|
| 165 | + $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 166 | + |
|
| 167 | + /** |
|
| 168 | + * Filter the send_marker_jason_to_js() function map canvas json args. |
|
| 169 | + * |
|
| 170 | + * You can use this filter to modify map canvas json args. |
|
| 171 | + * |
|
| 172 | + * @since 1.0.0 |
|
| 173 | + * @package GeoDirectory |
|
| 174 | + * @param string $canvas Map canvas array key. |
|
| 175 | + * @param array $map_canvas_jason_args Map canvas args. |
|
| 176 | + */ |
|
| 177 | + $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 178 | + wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 179 | + } |
|
| 180 | + } |
|
| 181 | + |
|
| 182 | + } |
|
| 183 | 183 | } |
| 184 | 184 | |
| 185 | 185 | /** |
@@ -202,99 +202,99 @@ discard block |
||
| 202 | 202 | */ |
| 203 | 203 | function home_map_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = true, $pading = 0, $map_canvas_name = '', $child_collapse, $is_home_map = false) |
| 204 | 204 | {
|
| 205 | - global $cat_count, $geodir_cat_icons, $gd_session; |
|
| 205 | + global $cat_count, $geodir_cat_icons, $gd_session; |
|
| 206 | 206 | |
| 207 | - $exclude_categories = get_option('geodir_exclude_cat_on_map');
|
|
| 208 | - $exclude_categories_new = get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 207 | + $exclude_categories = get_option('geodir_exclude_cat_on_map');
|
|
| 208 | + $exclude_categories_new = get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 209 | 209 | |
| 210 | - // check if exclude categories saved before fix of categories identical names |
|
| 211 | - if ($exclude_categories_new) {
|
|
| 212 | - $gd_cat_taxonomy = isset($cat_taxonomy[0]) ? $cat_taxonomy[0] : ''; |
|
| 213 | - $exclude_categories = !empty($exclude_categories[$gd_cat_taxonomy]) && is_array($exclude_categories[$gd_cat_taxonomy]) ? array_unique($exclude_categories[$gd_cat_taxonomy]) : array(); |
|
| 214 | - } |
|
| 210 | + // check if exclude categories saved before fix of categories identical names |
|
| 211 | + if ($exclude_categories_new) {
|
|
| 212 | + $gd_cat_taxonomy = isset($cat_taxonomy[0]) ? $cat_taxonomy[0] : ''; |
|
| 213 | + $exclude_categories = !empty($exclude_categories[$gd_cat_taxonomy]) && is_array($exclude_categories[$gd_cat_taxonomy]) ? array_unique($exclude_categories[$gd_cat_taxonomy]) : array(); |
|
| 214 | + } |
|
| 215 | 215 | |
| 216 | - $exclude_cat_str = implode(',', $exclude_categories);
|
|
| 216 | + $exclude_cat_str = implode(',', $exclude_categories);
|
|
| 217 | 217 | |
| 218 | - if ($exclude_cat_str == '') {
|
|
| 219 | - $exclude_cat_str = '0'; |
|
| 220 | - } |
|
| 218 | + if ($exclude_cat_str == '') {
|
|
| 219 | + $exclude_cat_str = '0'; |
|
| 220 | + } |
|
| 221 | 221 | |
| 222 | - $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'exclude' => $exclude_cat_str, 'hide_empty ' => $hide_empty));
|
|
| 222 | + $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'exclude' => $exclude_cat_str, 'hide_empty ' => $hide_empty));
|
|
| 223 | 223 | |
| 224 | - if ($hide_empty) {
|
|
| 225 | - $cat_terms = geodir_filter_empty_terms($cat_terms); |
|
| 226 | - } |
|
| 224 | + if ($hide_empty) {
|
|
| 225 | + $cat_terms = geodir_filter_empty_terms($cat_terms); |
|
| 226 | + } |
|
| 227 | 227 | |
| 228 | - $main_list_class = ''; |
|
| 229 | - //If there are terms, start displaying |
|
| 230 | - if (count($cat_terms) > 0) {
|
|
| 231 | - //Displaying as a list |
|
| 232 | - $p = $pading * 15; |
|
| 233 | - $pading++; |
|
| 228 | + $main_list_class = ''; |
|
| 229 | + //If there are terms, start displaying |
|
| 230 | + if (count($cat_terms) > 0) {
|
|
| 231 | + //Displaying as a list |
|
| 232 | + $p = $pading * 15; |
|
| 233 | + $pading++; |
|
| 234 | 234 | |
| 235 | - if ($cat_parent == 0) {
|
|
| 236 | - $list_class = 'main_list'; |
|
| 237 | - $display = ''; |
|
| 238 | - } else {
|
|
| 239 | - $list_class = 'sub_list'; |
|
| 240 | - $display = !$child_collapse ? '' : 'display:none'; |
|
| 241 | - } |
|
| 235 | + if ($cat_parent == 0) {
|
|
| 236 | + $list_class = 'main_list'; |
|
| 237 | + $display = ''; |
|
| 238 | + } else {
|
|
| 239 | + $list_class = 'sub_list'; |
|
| 240 | + $display = !$child_collapse ? '' : 'display:none'; |
|
| 241 | + } |
|
| 242 | 242 | |
| 243 | - $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 243 | + $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 244 | 244 | |
| 245 | - $geodir_cat_icons = geodir_get_term_icon(); |
|
| 245 | + $geodir_cat_icons = geodir_get_term_icon(); |
|
| 246 | 246 | |
| 247 | - $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';
|
|
| 248 | - if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
|
|
| 249 | - $geodir_default_map_search_pt = $homemap_catlist_ptype; |
|
| 250 | - } |
|
| 251 | - $post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : $geodir_default_map_search_pt); |
|
| 247 | + $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';
|
|
| 248 | + if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
|
|
| 249 | + $geodir_default_map_search_pt = $homemap_catlist_ptype; |
|
| 250 | + } |
|
| 251 | + $post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : $geodir_default_map_search_pt); |
|
| 252 | 252 | |
| 253 | - foreach ($cat_terms as $cat_term): |
|
| 254 | - $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$cat_term->term_id]) ? $geodir_cat_icons[$cat_term->term_id] : ''; |
|
| 255 | - |
|
| 256 | - if (!in_array($cat_term->term_id, $exclude_categories)): |
|
| 257 | - //Secret sauce. Function calls itself to display child elements, if any |
|
| 258 | - $checked = 'checked="checked"'; |
|
| 259 | - |
|
| 260 | - // Untick the category by default on home map |
|
| 261 | - if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {
|
|
| 262 | - if (geodir_wpml_is_taxonomy_translated($post_type . 'category')) { // if WPML
|
|
| 263 | - global $sitepress; |
|
| 264 | - $default_lang = $sitepress->get_default_language(); |
|
| 265 | - $term_id = geodir_wpml_object_id($cat_term->term_id, $post_type.'category', true, $default_lang); |
|
| 266 | - }else{
|
|
| 267 | - $term_id = $cat_term->term_id; |
|
| 268 | - } |
|
| 269 | - if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
|
|
| 270 | - $checked = ''; |
|
| 271 | - } |
|
| 272 | - } |
|
| 273 | - |
|
| 274 | - $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"'; |
|
| 275 | - $term_check .= ' name="' . $map_canvas_name . '_cat[]" '; |
|
| 276 | - $term_check .= ' title="' . esc_attr(geodir_utf8_ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">'; |
|
| 277 | - $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '"/>'; |
|
| 278 | - $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . geodir_utf8_ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>'; |
|
| 279 | - |
|
| 280 | - endif; |
|
| 281 | - |
|
| 282 | - |
|
| 283 | - // get sub category by recursion |
|
| 284 | - $out .= home_map_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading, $map_canvas_name, $child_collapse, $is_home_map); |
|
| 285 | - |
|
| 286 | - $out .= '</li>'; |
|
| 287 | - |
|
| 288 | - endforeach; |
|
| 289 | - |
|
| 290 | - $out .= '</ul>'; |
|
| 291 | - |
|
| 292 | - return $out; |
|
| 293 | - } else {
|
|
| 294 | - if ($cat_parent == 0) |
|
| 295 | - return _e('No category', 'geodirectory');
|
|
| 296 | - } |
|
| 297 | - return; |
|
| 253 | + foreach ($cat_terms as $cat_term): |
|
| 254 | + $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$cat_term->term_id]) ? $geodir_cat_icons[$cat_term->term_id] : ''; |
|
| 255 | + |
|
| 256 | + if (!in_array($cat_term->term_id, $exclude_categories)): |
|
| 257 | + //Secret sauce. Function calls itself to display child elements, if any |
|
| 258 | + $checked = 'checked="checked"'; |
|
| 259 | + |
|
| 260 | + // Untick the category by default on home map |
|
| 261 | + if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {
|
|
| 262 | + if (geodir_wpml_is_taxonomy_translated($post_type . 'category')) { // if WPML
|
|
| 263 | + global $sitepress; |
|
| 264 | + $default_lang = $sitepress->get_default_language(); |
|
| 265 | + $term_id = geodir_wpml_object_id($cat_term->term_id, $post_type.'category', true, $default_lang); |
|
| 266 | + }else{
|
|
| 267 | + $term_id = $cat_term->term_id; |
|
| 268 | + } |
|
| 269 | + if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
|
|
| 270 | + $checked = ''; |
|
| 271 | + } |
|
| 272 | + } |
|
| 273 | + |
|
| 274 | + $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"'; |
|
| 275 | + $term_check .= ' name="' . $map_canvas_name . '_cat[]" '; |
|
| 276 | + $term_check .= ' title="' . esc_attr(geodir_utf8_ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">'; |
|
| 277 | + $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '"/>'; |
|
| 278 | + $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . geodir_utf8_ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>'; |
|
| 279 | + |
|
| 280 | + endif; |
|
| 281 | + |
|
| 282 | + |
|
| 283 | + // get sub category by recursion |
|
| 284 | + $out .= home_map_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading, $map_canvas_name, $child_collapse, $is_home_map); |
|
| 285 | + |
|
| 286 | + $out .= '</li>'; |
|
| 287 | + |
|
| 288 | + endforeach; |
|
| 289 | + |
|
| 290 | + $out .= '</ul>'; |
|
| 291 | + |
|
| 292 | + return $out; |
|
| 293 | + } else {
|
|
| 294 | + if ($cat_parent == 0) |
|
| 295 | + return _e('No category', 'geodirectory');
|
|
| 296 | + } |
|
| 297 | + return; |
|
| 298 | 298 | } |
| 299 | 299 | |
| 300 | 300 | /** |
@@ -306,19 +306,19 @@ discard block |
||
| 306 | 306 | * @return string The map API provider name. |
| 307 | 307 | */ |
| 308 | 308 | function geodir_map_name() {
|
| 309 | - $geodir_map_name = get_option('geodir_load_map', 'google');
|
|
| 309 | + $geodir_map_name = get_option('geodir_load_map', 'google');
|
|
| 310 | 310 | |
| 311 | - if (!in_array($geodir_map_name, array('none', 'auto', 'google', 'osm'))) {
|
|
| 312 | - $geodir_map_name = 'auto'; |
|
| 313 | - } |
|
| 314 | - |
|
| 315 | - /** |
|
| 316 | - * Filter the map JS API provider name. |
|
| 317 | - * |
|
| 318 | - * @since 1.6.1 |
|
| 319 | - * @param string $geodir_map_name The map API provider name. |
|
| 320 | - */ |
|
| 321 | - return apply_filters('geodir_map_name', $geodir_map_name);
|
|
| 311 | + if (!in_array($geodir_map_name, array('none', 'auto', 'google', 'osm'))) {
|
|
| 312 | + $geodir_map_name = 'auto'; |
|
| 313 | + } |
|
| 314 | + |
|
| 315 | + /** |
|
| 316 | + * Filter the map JS API provider name. |
|
| 317 | + * |
|
| 318 | + * @since 1.6.1 |
|
| 319 | + * @param string $geodir_map_name The map API provider name. |
|
| 320 | + */ |
|
| 321 | + return apply_filters('geodir_map_name', $geodir_map_name);
|
|
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | /** |
@@ -334,48 +334,48 @@ discard block |
||
| 334 | 334 | * @return array The icon size. |
| 335 | 335 | */ |
| 336 | 336 | function geodir_get_marker_size($icon, $default_size = array('w' => 36, 'h' => 45)) {
|
| 337 | - global $gd_marker_sizes; |
|
| 337 | + global $gd_marker_sizes; |
|
| 338 | 338 | |
| 339 | - if (empty($gd_marker_sizes)) {
|
|
| 340 | - $gd_marker_sizes = array(); |
|
| 341 | - } |
|
| 339 | + if (empty($gd_marker_sizes)) {
|
|
| 340 | + $gd_marker_sizes = array(); |
|
| 341 | + } |
|
| 342 | 342 | |
| 343 | - if (!empty($gd_marker_sizes[$icon])) {
|
|
| 344 | - return $gd_marker_sizes[$icon]; |
|
| 345 | - } |
|
| 343 | + if (!empty($gd_marker_sizes[$icon])) {
|
|
| 344 | + return $gd_marker_sizes[$icon]; |
|
| 345 | + } |
|
| 346 | 346 | |
| 347 | - if (empty($icon)) {
|
|
| 348 | - $gd_marker_sizes[$icon] = $default_size; |
|
| 347 | + if (empty($icon)) {
|
|
| 348 | + $gd_marker_sizes[$icon] = $default_size; |
|
| 349 | 349 | |
| 350 | - return $default_size; |
|
| 351 | - } |
|
| 350 | + return $default_size; |
|
| 351 | + } |
|
| 352 | 352 | |
| 353 | - $icon_url = $icon; |
|
| 353 | + $icon_url = $icon; |
|
| 354 | 354 | |
| 355 | - $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 355 | + $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 356 | 356 | |
| 357 | - if (!path_is_absolute($icon)) {
|
|
| 358 | - $icon = str_replace($uploads['baseurl'], $uploads['basedir'], $icon); |
|
| 359 | - } |
|
| 357 | + if (!path_is_absolute($icon)) {
|
|
| 358 | + $icon = str_replace($uploads['baseurl'], $uploads['basedir'], $icon); |
|
| 359 | + } |
|
| 360 | 360 | |
| 361 | - if (!path_is_absolute($icon) && strpos($icon, WP_CONTENT_URL) !== false) {
|
|
| 362 | - $icon = str_replace(WP_CONTENT_URL, WP_CONTENT_DIR, $icon); |
|
| 363 | - } |
|
| 361 | + if (!path_is_absolute($icon) && strpos($icon, WP_CONTENT_URL) !== false) {
|
|
| 362 | + $icon = str_replace(WP_CONTENT_URL, WP_CONTENT_DIR, $icon); |
|
| 363 | + } |
|
| 364 | 364 | |
| 365 | - $sizes = array(); |
|
| 366 | - if (is_file($icon) && file_exists($icon)) {
|
|
| 367 | - $size = getimagesize(trim($icon)); |
|
| 365 | + $sizes = array(); |
|
| 366 | + if (is_file($icon) && file_exists($icon)) {
|
|
| 367 | + $size = getimagesize(trim($icon)); |
|
| 368 | 368 | |
| 369 | - if (!empty($size[0]) && !empty($size[1])) {
|
|
| 370 | - $sizes = array('w' => $size[0], 'h' => $size[1]);
|
|
| 371 | - } |
|
| 372 | - } |
|
| 369 | + if (!empty($size[0]) && !empty($size[1])) {
|
|
| 370 | + $sizes = array('w' => $size[0], 'h' => $size[1]);
|
|
| 371 | + } |
|
| 372 | + } |
|
| 373 | 373 | |
| 374 | - $sizes = !empty($sizes) ? $sizes : $default_size; |
|
| 374 | + $sizes = !empty($sizes) ? $sizes : $default_size; |
|
| 375 | 375 | |
| 376 | - $gd_marker_sizes[$icon_url] = $sizes; |
|
| 376 | + $gd_marker_sizes[$icon_url] = $sizes; |
|
| 377 | 377 | |
| 378 | - return $sizes; |
|
| 378 | + return $sizes; |
|
| 379 | 379 | } |
| 380 | 380 | |
| 381 | 381 | add_action('wp_footer', 'geodir_map_load_script', 10);
|
@@ -387,8 +387,8 @@ discard block |
||
| 387 | 387 | * @package GeoDirectory |
| 388 | 388 | */ |
| 389 | 389 | function geodir_map_load_script() {
|
| 390 | - if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {
|
|
| 391 | - $plugin_url = geodir_plugin_url(); |
|
| 390 | + if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'geodirectory-googlemap-script', 'done')) {
|
|
| 391 | + $plugin_url = geodir_plugin_url(); |
|
| 392 | 392 | ?> |
| 393 | 393 | <script type="text/javascript"> |
| 394 | 394 | if (!(window.google && typeof google.maps !== 'undefined')) {
|
@@ -403,5 +403,5 @@ discard block |
||
| 403 | 403 | } |
| 404 | 404 | </script> |
| 405 | 405 | <?php |
| 406 | - } |
|
| 406 | + } |
|
| 407 | 407 | } |
| 408 | 408 | \ No newline at end of file |
@@ -20,492 +20,492 @@ discard block |
||
| 20 | 20 | function geodir_set_postcat_structure($post_id, $taxonomy, $default_cat = '', $category_str = '') |
| 21 | 21 | {
|
| 22 | 22 | |
| 23 | - $post_cat_ids = geodir_get_post_meta($post_id, $taxonomy); |
|
| 24 | - if (!empty($post_cat_ids)) |
|
| 25 | - $post_cat_array = explode(",", trim($post_cat_ids, ","));
|
|
| 26 | - |
|
| 27 | - if (!isset($default_cat) || empty($default_cat)) {
|
|
| 28 | - $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : ''; |
|
| 29 | - }else{
|
|
| 30 | - if(!is_int($default_cat)){
|
|
| 31 | - $category = get_term_by('name', $default_cat, $taxonomy);
|
|
| 32 | - if(isset($category->term_id)){
|
|
| 33 | - $default_cat = $category->term_id; |
|
| 34 | - } |
|
| 35 | - } |
|
| 23 | + $post_cat_ids = geodir_get_post_meta($post_id, $taxonomy); |
|
| 24 | + if (!empty($post_cat_ids)) |
|
| 25 | + $post_cat_array = explode(",", trim($post_cat_ids, ","));
|
|
| 26 | + |
|
| 27 | + if (!isset($default_cat) || empty($default_cat)) {
|
|
| 28 | + $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : ''; |
|
| 29 | + }else{
|
|
| 30 | + if(!is_int($default_cat)){
|
|
| 31 | + $category = get_term_by('name', $default_cat, $taxonomy);
|
|
| 32 | + if(isset($category->term_id)){
|
|
| 33 | + $default_cat = $category->term_id; |
|
| 34 | + } |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - } |
|
| 37 | + } |
|
| 38 | 38 | |
| 39 | 39 | |
| 40 | - geodir_save_post_meta($post_id, 'default_category', $default_cat); |
|
| 40 | + geodir_save_post_meta($post_id, 'default_category', $default_cat); |
|
| 41 | 41 | |
| 42 | - if (isset($category_str) && empty($category_str)) {
|
|
| 42 | + if (isset($category_str) && empty($category_str)) {
|
|
| 43 | 43 | |
| 44 | - $post_cat_str = ''; |
|
| 45 | - $post_categories = array(); |
|
| 46 | - if (isset($post_cat_array) && is_array($post_cat_array) && !empty($post_cat_array)) {
|
|
| 47 | - $post_cat_str = implode(",y:#", $post_cat_array);
|
|
| 48 | - $post_cat_str .= ",y:"; |
|
| 49 | - $post_cat_str = substr_replace($post_cat_str, ',y,d:', strpos($post_cat_str, ',y:'), strlen(',y:'));
|
|
| 50 | - } |
|
| 51 | - $post_categories[$taxonomy] = $post_cat_str; |
|
| 52 | - $category_str = $post_categories; |
|
| 53 | - } |
|
| 44 | + $post_cat_str = ''; |
|
| 45 | + $post_categories = array(); |
|
| 46 | + if (isset($post_cat_array) && is_array($post_cat_array) && !empty($post_cat_array)) {
|
|
| 47 | + $post_cat_str = implode(",y:#", $post_cat_array);
|
|
| 48 | + $post_cat_str .= ",y:"; |
|
| 49 | + $post_cat_str = substr_replace($post_cat_str, ',y,d:', strpos($post_cat_str, ',y:'), strlen(',y:'));
|
|
| 50 | + } |
|
| 51 | + $post_categories[$taxonomy] = $post_cat_str; |
|
| 52 | + $category_str = $post_categories; |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - $change_cat_str = $category_str[$taxonomy]; |
|
| 55 | + $change_cat_str = $category_str[$taxonomy]; |
|
| 56 | 56 | |
| 57 | - $default_pos = strpos($change_cat_str, 'd:'); |
|
| 57 | + $default_pos = strpos($change_cat_str, 'd:'); |
|
| 58 | 58 | |
| 59 | - if ($default_pos === false) {
|
|
| 59 | + if ($default_pos === false) {
|
|
| 60 | 60 | |
| 61 | - $change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str); |
|
| 61 | + $change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str); |
|
| 62 | 62 | |
| 63 | - } |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - $category_str[$taxonomy] = $change_cat_str; |
|
| 65 | + $category_str[$taxonomy] = $change_cat_str; |
|
| 66 | 66 | |
| 67 | - update_post_meta($post_id, 'post_categories', $category_str); |
|
| 67 | + update_post_meta($post_id, 'post_categories', $category_str); |
|
| 68 | 68 | |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | |
| 72 | 72 | if (!function_exists('geodir_save_listing')) {
|
| 73 | - /** |
|
| 74 | - * Saves listing in the database using given information. |
|
| 75 | - * |
|
| 76 | - * @since 1.0.0 |
|
| 77 | - * @since 1.5.4 New parameter $wp_error added. |
|
| 78 | - * @since 1.6.18 Admin use only date field should not lost value if saved by user - FIXED |
|
| 79 | - * @package GeoDirectory |
|
| 80 | - * @global object $wpdb WordPress Database object. |
|
| 81 | - * @global object $post The current post object. |
|
| 82 | - * @global object $current_user Current user object. |
|
| 83 | - * @global object $gd_session GeoDirectory Session object. |
|
| 84 | - * @param array $request_info {
|
|
| 85 | - * Array of request info arguments. |
|
| 86 | - * |
|
| 87 | - * @type string $action Ajax action name. |
|
| 88 | - * @type string $geodir_ajax Ajax type. |
|
| 89 | - * @type string $ajax_action Ajax action. |
|
| 90 | - * @type string $listing_type Listing type. |
|
| 91 | - * @type string $pid Default Post ID. |
|
| 92 | - * @type string $preview Todo Desc needed. |
|
| 93 | - * @type string $add_listing_page_id Add listing page ID. |
|
| 94 | - * @type string $post_title Listing title. |
|
| 95 | - * @type string $post_desc Listing Description. |
|
| 96 | - * @type string $post_tags Listing tags. |
|
| 97 | - * @type array $cat_limit Category limit. |
|
| 98 | - * @type array $post_category Category IDs. |
|
| 99 | - * @type array $post_category_str Category string. |
|
| 100 | - * @type string $post_default_category Default category ID. |
|
| 101 | - * @type string $post_address Listing address. |
|
| 102 | - * @type string $geodir_location_add_listing_country_val Add listing country value. |
|
| 103 | - * @type string $post_country Listing country. |
|
| 104 | - * @type string $geodir_location_add_listing_region_val Add listing region value. |
|
| 105 | - * @type string $post_region Listing region. |
|
| 106 | - * @type string $geodir_location_add_listing_city_val Add listing city value. |
|
| 107 | - * @type string $post_city Listing city. |
|
| 108 | - * @type string $post_zip Listing zip. |
|
| 109 | - * @type string $post_latitude Listing latitude. |
|
| 110 | - * @type string $post_longitude Listing longitude. |
|
| 111 | - * @type string $post_mapview Listing mapview. Default "ROADMAP". |
|
| 112 | - * @type string $post_mapzoom Listing mapzoom Default "9". |
|
| 113 | - * @type string $geodir_timing Business timing info. |
|
| 114 | - * @type string $geodir_contact Contact number. |
|
| 115 | - * @type string $geodir_email Business contact email. |
|
| 116 | - * @type string $geodir_website Business website. |
|
| 117 | - * @type string $geodir_twitter Twitter link. |
|
| 118 | - * @type string $geodir_facebook Facebook link. |
|
| 119 | - * @type string $geodir_video Video link. |
|
| 120 | - * @type string $geodir_special_offers Special offers. |
|
| 121 | - * @type string $post_images Post image urls. |
|
| 122 | - * @type string $post_imagesimage_limit Post images limit. |
|
| 123 | - * @type string $post_imagestotImg Todo Desc needed. |
|
| 124 | - * @type string $geodir_accept_term_condition Has accepted terms and conditions?. |
|
| 125 | - * @type string $geodir_spamblocker Todo Desc needed. |
|
| 126 | - * @type string $geodir_filled_by_spam_bot Todo Desc needed. |
|
| 127 | - * |
|
| 128 | - * } |
|
| 129 | - * @param bool $dummy Optional. Is this a dummy listing? Default false. |
|
| 130 | - * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false. |
|
| 131 | - * @return int|string|WP_Error Created post id or WP_Error on failure. |
|
| 132 | - */ |
|
| 133 | - function geodir_save_listing($request_info = array(), $dummy = false, $wp_error = false) |
|
| 134 | - {
|
|
| 135 | - global $wpdb, $current_user, $gd_session; |
|
| 136 | - |
|
| 137 | - $last_post_id = ''; |
|
| 138 | - |
|
| 139 | - if ($gd_session->get('listing') && !$dummy) {
|
|
| 140 | - $request_info = array(); |
|
| 141 | - $request_session = $gd_session->get('listing');
|
|
| 142 | - $request_info = array_merge($_REQUEST, $request_session); |
|
| 143 | - } else if (!$gd_session->get('listing') && !$dummy) {
|
|
| 144 | - global $post; |
|
| 73 | + /** |
|
| 74 | + * Saves listing in the database using given information. |
|
| 75 | + * |
|
| 76 | + * @since 1.0.0 |
|
| 77 | + * @since 1.5.4 New parameter $wp_error added. |
|
| 78 | + * @since 1.6.18 Admin use only date field should not lost value if saved by user - FIXED |
|
| 79 | + * @package GeoDirectory |
|
| 80 | + * @global object $wpdb WordPress Database object. |
|
| 81 | + * @global object $post The current post object. |
|
| 82 | + * @global object $current_user Current user object. |
|
| 83 | + * @global object $gd_session GeoDirectory Session object. |
|
| 84 | + * @param array $request_info {
|
|
| 85 | + * Array of request info arguments. |
|
| 86 | + * |
|
| 87 | + * @type string $action Ajax action name. |
|
| 88 | + * @type string $geodir_ajax Ajax type. |
|
| 89 | + * @type string $ajax_action Ajax action. |
|
| 90 | + * @type string $listing_type Listing type. |
|
| 91 | + * @type string $pid Default Post ID. |
|
| 92 | + * @type string $preview Todo Desc needed. |
|
| 93 | + * @type string $add_listing_page_id Add listing page ID. |
|
| 94 | + * @type string $post_title Listing title. |
|
| 95 | + * @type string $post_desc Listing Description. |
|
| 96 | + * @type string $post_tags Listing tags. |
|
| 97 | + * @type array $cat_limit Category limit. |
|
| 98 | + * @type array $post_category Category IDs. |
|
| 99 | + * @type array $post_category_str Category string. |
|
| 100 | + * @type string $post_default_category Default category ID. |
|
| 101 | + * @type string $post_address Listing address. |
|
| 102 | + * @type string $geodir_location_add_listing_country_val Add listing country value. |
|
| 103 | + * @type string $post_country Listing country. |
|
| 104 | + * @type string $geodir_location_add_listing_region_val Add listing region value. |
|
| 105 | + * @type string $post_region Listing region. |
|
| 106 | + * @type string $geodir_location_add_listing_city_val Add listing city value. |
|
| 107 | + * @type string $post_city Listing city. |
|
| 108 | + * @type string $post_zip Listing zip. |
|
| 109 | + * @type string $post_latitude Listing latitude. |
|
| 110 | + * @type string $post_longitude Listing longitude. |
|
| 111 | + * @type string $post_mapview Listing mapview. Default "ROADMAP". |
|
| 112 | + * @type string $post_mapzoom Listing mapzoom Default "9". |
|
| 113 | + * @type string $geodir_timing Business timing info. |
|
| 114 | + * @type string $geodir_contact Contact number. |
|
| 115 | + * @type string $geodir_email Business contact email. |
|
| 116 | + * @type string $geodir_website Business website. |
|
| 117 | + * @type string $geodir_twitter Twitter link. |
|
| 118 | + * @type string $geodir_facebook Facebook link. |
|
| 119 | + * @type string $geodir_video Video link. |
|
| 120 | + * @type string $geodir_special_offers Special offers. |
|
| 121 | + * @type string $post_images Post image urls. |
|
| 122 | + * @type string $post_imagesimage_limit Post images limit. |
|
| 123 | + * @type string $post_imagestotImg Todo Desc needed. |
|
| 124 | + * @type string $geodir_accept_term_condition Has accepted terms and conditions?. |
|
| 125 | + * @type string $geodir_spamblocker Todo Desc needed. |
|
| 126 | + * @type string $geodir_filled_by_spam_bot Todo Desc needed. |
|
| 127 | + * |
|
| 128 | + * } |
|
| 129 | + * @param bool $dummy Optional. Is this a dummy listing? Default false. |
|
| 130 | + * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false. |
|
| 131 | + * @return int|string|WP_Error Created post id or WP_Error on failure. |
|
| 132 | + */ |
|
| 133 | + function geodir_save_listing($request_info = array(), $dummy = false, $wp_error = false) |
|
| 134 | + {
|
|
| 135 | + global $wpdb, $current_user, $gd_session; |
|
| 136 | + |
|
| 137 | + $last_post_id = ''; |
|
| 138 | + |
|
| 139 | + if ($gd_session->get('listing') && !$dummy) {
|
|
| 140 | + $request_info = array(); |
|
| 141 | + $request_session = $gd_session->get('listing');
|
|
| 142 | + $request_info = array_merge($_REQUEST, $request_session); |
|
| 143 | + } else if (!$gd_session->get('listing') && !$dummy) {
|
|
| 144 | + global $post; |
|
| 145 | 145 | |
| 146 | - $gd_post = $post; |
|
| 147 | - if (!empty($gd_post) && is_array($gd_post)) {
|
|
| 148 | - $gd_post = (object)$post; |
|
| 146 | + $gd_post = $post; |
|
| 147 | + if (!empty($gd_post) && is_array($gd_post)) {
|
|
| 148 | + $gd_post = (object)$post; |
|
| 149 | 149 | |
| 150 | - // Fix WPML duplicate. |
|
| 151 | - if (geodir_is_wpml() && !empty($request_info['action']) && $request_info['action'] == 'editpost' && !empty($request_info['icl_trid']) && !isset($post['post_date'])) {
|
|
| 152 | - return false; |
|
| 153 | - } |
|
| 154 | - } |
|
| 150 | + // Fix WPML duplicate. |
|
| 151 | + if (geodir_is_wpml() && !empty($request_info['action']) && $request_info['action'] == 'editpost' && !empty($request_info['icl_trid']) && !isset($post['post_date'])) {
|
|
| 152 | + return false; |
|
| 153 | + } |
|
| 154 | + } |
|
| 155 | 155 | |
| 156 | - $request_info['pid'] = !empty($gd_post->ID) ? $gd_post->ID : (!empty($request_info['post_id']) ? $request_info['post_id'] : NULL); |
|
| 157 | - $request_info['post_title'] = $request_info['post_title']; |
|
| 158 | - $request_info['listing_type'] = !empty($gd_post->post_type) ? $gd_post->post_type : (!empty($request_info['post_type']) ? $request_info['post_type'] : get_post_type($request_info['pid'])); |
|
| 159 | - $request_info['post_desc'] = $request_info['content']; |
|
| 160 | - } else if (!$dummy) {
|
|
| 161 | - return false; |
|
| 162 | - } |
|
| 163 | - |
|
| 164 | - /** |
|
| 165 | - * Filter the request_info array. |
|
| 166 | - * |
|
| 167 | - * You can use this filter to modify request_info array. |
|
| 168 | - * |
|
| 169 | - * @since 1.0.0 |
|
| 170 | - * @package GeoDirectory |
|
| 171 | - * @param array $request_info See {@see geodir_save_listing()} for accepted args.
|
|
| 172 | - */ |
|
| 173 | - $request_info = apply_filters('geodir_action_get_request_info', $request_info);
|
|
| 174 | - |
|
| 175 | - // Check if we need to save post location as new location |
|
| 176 | - $location_result = geodir_get_default_location(); |
|
| 177 | - |
|
| 178 | - if ($location_result->location_id > 0) {
|
|
| 179 | - if (isset($request_info['post_city']) && isset($request_info['post_region'])) {
|
|
| 180 | - $request_info['post_location'] = array( |
|
| 181 | - 'city' => $request_info['post_city'], |
|
| 182 | - 'region' => isset($request_info['post_region']) ? $request_info['post_region'] : '', |
|
| 183 | - 'country' => isset($request_info['post_country']) ? $request_info['post_country'] : '', |
|
| 184 | - 'geo_lat' => isset($request_info['post_latitude']) ? $request_info['post_latitude'] : '', |
|
| 185 | - 'geo_lng' => isset($request_info['post_longitude']) ? $request_info['post_longitude'] : '' |
|
| 186 | - ); |
|
| 187 | - |
|
| 188 | - $post_location_info = $request_info['post_location']; |
|
| 189 | - |
|
| 190 | - if ($location_id = geodir_add_new_location($post_location_info)) {
|
|
| 191 | - $post_location_id = $location_id; |
|
| 192 | - } |
|
| 193 | - } else {
|
|
| 194 | - $post_location_id = $location_result->location_id; |
|
| 195 | - } |
|
| 196 | - } else {
|
|
| 197 | - $post_location_id = $location_result->location_id; |
|
| 198 | - } |
|
| 199 | - |
|
| 200 | - if ($dummy) {
|
|
| 201 | - $post_status = 'publish'; |
|
| 202 | - } else {
|
|
| 203 | - $post_status = geodir_new_post_default_status(); |
|
| 204 | - } |
|
| 205 | - |
|
| 206 | - if (isset($request_info['pid']) && $request_info['pid'] != '') {
|
|
| 207 | - $post_status = get_post_status($request_info['pid']); |
|
| 208 | - } |
|
| 209 | - |
|
| 210 | - /* fix change of slug on every title edit */ |
|
| 211 | - if (!isset($request_info['post_name'])) {
|
|
| 212 | - $request_info['post_name'] = $request_info['post_title']; |
|
| 213 | - |
|
| 214 | - if (!empty($request_info['pid'])) {
|
|
| 215 | - $post_info = get_post($request_info['pid']); |
|
| 216 | - |
|
| 217 | - if (!empty($post_info) && isset($post_info->post_name)) {
|
|
| 218 | - $request_info['post_name'] = $post_info->post_name; |
|
| 219 | - } |
|
| 220 | - } |
|
| 221 | - } |
|
| 222 | - |
|
| 223 | - $post = array( |
|
| 224 | - 'post_content' => $request_info['post_desc'], |
|
| 225 | - 'post_status' => $post_status, |
|
| 226 | - 'post_title' => $request_info['post_title'], |
|
| 227 | - 'post_name' => $request_info['post_name'], |
|
| 228 | - 'post_type' => $request_info['listing_type'] |
|
| 229 | - ); |
|
| 230 | - |
|
| 231 | - /** |
|
| 232 | - * Called before a listing is saved to the database. |
|
| 233 | - * |
|
| 234 | - * @since 1.0.0 |
|
| 235 | - * @param object $post The post object. |
|
| 236 | - */ |
|
| 237 | - do_action_ref_array('geodir_before_save_listing', $post);
|
|
| 156 | + $request_info['pid'] = !empty($gd_post->ID) ? $gd_post->ID : (!empty($request_info['post_id']) ? $request_info['post_id'] : NULL); |
|
| 157 | + $request_info['post_title'] = $request_info['post_title']; |
|
| 158 | + $request_info['listing_type'] = !empty($gd_post->post_type) ? $gd_post->post_type : (!empty($request_info['post_type']) ? $request_info['post_type'] : get_post_type($request_info['pid'])); |
|
| 159 | + $request_info['post_desc'] = $request_info['content']; |
|
| 160 | + } else if (!$dummy) {
|
|
| 161 | + return false; |
|
| 162 | + } |
|
| 163 | + |
|
| 164 | + /** |
|
| 165 | + * Filter the request_info array. |
|
| 166 | + * |
|
| 167 | + * You can use this filter to modify request_info array. |
|
| 168 | + * |
|
| 169 | + * @since 1.0.0 |
|
| 170 | + * @package GeoDirectory |
|
| 171 | + * @param array $request_info See {@see geodir_save_listing()} for accepted args.
|
|
| 172 | + */ |
|
| 173 | + $request_info = apply_filters('geodir_action_get_request_info', $request_info);
|
|
| 174 | + |
|
| 175 | + // Check if we need to save post location as new location |
|
| 176 | + $location_result = geodir_get_default_location(); |
|
| 177 | + |
|
| 178 | + if ($location_result->location_id > 0) {
|
|
| 179 | + if (isset($request_info['post_city']) && isset($request_info['post_region'])) {
|
|
| 180 | + $request_info['post_location'] = array( |
|
| 181 | + 'city' => $request_info['post_city'], |
|
| 182 | + 'region' => isset($request_info['post_region']) ? $request_info['post_region'] : '', |
|
| 183 | + 'country' => isset($request_info['post_country']) ? $request_info['post_country'] : '', |
|
| 184 | + 'geo_lat' => isset($request_info['post_latitude']) ? $request_info['post_latitude'] : '', |
|
| 185 | + 'geo_lng' => isset($request_info['post_longitude']) ? $request_info['post_longitude'] : '' |
|
| 186 | + ); |
|
| 187 | + |
|
| 188 | + $post_location_info = $request_info['post_location']; |
|
| 189 | + |
|
| 190 | + if ($location_id = geodir_add_new_location($post_location_info)) {
|
|
| 191 | + $post_location_id = $location_id; |
|
| 192 | + } |
|
| 193 | + } else {
|
|
| 194 | + $post_location_id = $location_result->location_id; |
|
| 195 | + } |
|
| 196 | + } else {
|
|
| 197 | + $post_location_id = $location_result->location_id; |
|
| 198 | + } |
|
| 238 | 199 | |
| 239 | - $send_post_submit_mail = false; |
|
| 200 | + if ($dummy) {
|
|
| 201 | + $post_status = 'publish'; |
|
| 202 | + } else {
|
|
| 203 | + $post_status = geodir_new_post_default_status(); |
|
| 204 | + } |
|
| 240 | 205 | |
| 241 | - // unhook this function so it doesn't loop infinitely |
|
| 242 | - remove_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 206 | + if (isset($request_info['pid']) && $request_info['pid'] != '') {
|
|
| 207 | + $post_status = get_post_status($request_info['pid']); |
|
| 208 | + } |
|
| 243 | 209 | |
| 244 | - if (isset($request_info['pid']) && $request_info['pid'] != '') {
|
|
| 245 | - $post['ID'] = $request_info['pid']; |
|
| 210 | + /* fix change of slug on every title edit */ |
|
| 211 | + if (!isset($request_info['post_name'])) {
|
|
| 212 | + $request_info['post_name'] = $request_info['post_title']; |
|
| 246 | 213 | |
| 247 | - $last_post_id = wp_update_post($post, $wp_error); |
|
| 248 | - } else {
|
|
| 249 | - $last_post_id = wp_insert_post($post, $wp_error); |
|
| 214 | + if (!empty($request_info['pid'])) {
|
|
| 215 | + $post_info = get_post($request_info['pid']); |
|
| 250 | 216 | |
| 251 | - if (!$dummy && $last_post_id) {
|
|
| 252 | - $send_post_submit_mail = true; // we move post_submit email from here so the rest of the variables are added to the db first(was breaking permalink in email) |
|
| 253 | - //geodir_sendEmail('','',$current_user->user_email,$current_user->display_name,'','',$request_info,'post_submit',$last_post_id,$current_user->ID);
|
|
| 254 | - } |
|
| 255 | - } |
|
| 217 | + if (!empty($post_info) && isset($post_info->post_name)) {
|
|
| 218 | + $request_info['post_name'] = $post_info->post_name; |
|
| 219 | + } |
|
| 220 | + } |
|
| 221 | + } |
|
| 222 | + |
|
| 223 | + $post = array( |
|
| 224 | + 'post_content' => $request_info['post_desc'], |
|
| 225 | + 'post_status' => $post_status, |
|
| 226 | + 'post_title' => $request_info['post_title'], |
|
| 227 | + 'post_name' => $request_info['post_name'], |
|
| 228 | + 'post_type' => $request_info['listing_type'] |
|
| 229 | + ); |
|
| 230 | + |
|
| 231 | + /** |
|
| 232 | + * Called before a listing is saved to the database. |
|
| 233 | + * |
|
| 234 | + * @since 1.0.0 |
|
| 235 | + * @param object $post The post object. |
|
| 236 | + */ |
|
| 237 | + do_action_ref_array('geodir_before_save_listing', $post);
|
|
| 238 | + |
|
| 239 | + $send_post_submit_mail = false; |
|
| 240 | + |
|
| 241 | + // unhook this function so it doesn't loop infinitely |
|
| 242 | + remove_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 243 | + |
|
| 244 | + if (isset($request_info['pid']) && $request_info['pid'] != '') {
|
|
| 245 | + $post['ID'] = $request_info['pid']; |
|
| 246 | + |
|
| 247 | + $last_post_id = wp_update_post($post, $wp_error); |
|
| 248 | + } else {
|
|
| 249 | + $last_post_id = wp_insert_post($post, $wp_error); |
|
| 250 | + |
|
| 251 | + if (!$dummy && $last_post_id) {
|
|
| 252 | + $send_post_submit_mail = true; // we move post_submit email from here so the rest of the variables are added to the db first(was breaking permalink in email) |
|
| 253 | + //geodir_sendEmail('','',$current_user->user_email,$current_user->display_name,'','',$request_info,'post_submit',$last_post_id,$current_user->ID);
|
|
| 254 | + } |
|
| 255 | + } |
|
| 256 | 256 | |
| 257 | - if ($wp_error && is_wp_error($last_post_id)) {
|
|
| 258 | - return $last_post_id; // Return WP_Error on save failure. |
|
| 259 | - } |
|
| 257 | + if ($wp_error && is_wp_error($last_post_id)) {
|
|
| 258 | + return $last_post_id; // Return WP_Error on save failure. |
|
| 259 | + } |
|
| 260 | 260 | |
| 261 | - if (!$last_post_id) {
|
|
| 262 | - return false; // Save failure. |
|
| 263 | - } |
|
| 261 | + if (!$last_post_id) {
|
|
| 262 | + return false; // Save failure. |
|
| 263 | + } |
|
| 264 | 264 | |
| 265 | - // re-hook this function |
|
| 266 | - add_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 265 | + // re-hook this function |
|
| 266 | + add_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 267 | 267 | |
| 268 | - $post_tags = ''; |
|
| 269 | - if (!isset($request_info['post_tags'])) {
|
|
| 268 | + $post_tags = ''; |
|
| 269 | + if (!isset($request_info['post_tags'])) {
|
|
| 270 | 270 | |
| 271 | - $post_type = $request_info['listing_type']; |
|
| 272 | - $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));
|
|
| 271 | + $post_type = $request_info['listing_type']; |
|
| 272 | + $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));
|
|
| 273 | 273 | |
| 274 | - } |
|
| 274 | + } |
|
| 275 | 275 | |
| 276 | - $gd_post_info = array( |
|
| 277 | - "post_title" => $request_info['post_title'], |
|
| 278 | - "post_tags" => isset($request_info['post_tags']) ? $request_info['post_tags'] : $post_tags, |
|
| 279 | - "post_status" => $post_status, |
|
| 280 | - "post_location_id" => $post_location_id, |
|
| 281 | - "claimed" => isset($request_info['claimed']) ? $request_info['claimed'] : '', |
|
| 282 | - "businesses" => isset($request_info['a_businesses']) ? $request_info['a_businesses'] : '', |
|
| 283 | - "submit_time" => time(), |
|
| 284 | - "submit_ip" => $_SERVER['REMOTE_ADDR'], |
|
| 285 | - ); |
|
| 276 | + $gd_post_info = array( |
|
| 277 | + "post_title" => $request_info['post_title'], |
|
| 278 | + "post_tags" => isset($request_info['post_tags']) ? $request_info['post_tags'] : $post_tags, |
|
| 279 | + "post_status" => $post_status, |
|
| 280 | + "post_location_id" => $post_location_id, |
|
| 281 | + "claimed" => isset($request_info['claimed']) ? $request_info['claimed'] : '', |
|
| 282 | + "businesses" => isset($request_info['a_businesses']) ? $request_info['a_businesses'] : '', |
|
| 283 | + "submit_time" => time(), |
|
| 284 | + "submit_ip" => $_SERVER['REMOTE_ADDR'], |
|
| 285 | + ); |
|
| 286 | 286 | |
| 287 | - $payment_info = array(); |
|
| 288 | - $package_info = array(); |
|
| 287 | + $payment_info = array(); |
|
| 288 | + $package_info = array(); |
|
| 289 | 289 | |
| 290 | - $package_info = (array)geodir_post_package_info($package_info, $post); |
|
| 290 | + $package_info = (array)geodir_post_package_info($package_info, $post); |
|
| 291 | 291 | |
| 292 | - $post_package_id = geodir_get_post_meta($last_post_id, 'package_id'); |
|
| 292 | + $post_package_id = geodir_get_post_meta($last_post_id, 'package_id'); |
|
| 293 | 293 | |
| 294 | - if (!empty($package_info) && !$post_package_id) {
|
|
| 295 | - if (isset($package_info['days']) && $package_info['days'] != 0) {
|
|
| 296 | - $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));
|
|
| 297 | - } else {
|
|
| 298 | - $payment_info['expire_date'] = 'Never'; |
|
| 299 | - } |
|
| 294 | + if (!empty($package_info) && !$post_package_id) {
|
|
| 295 | + if (isset($package_info['days']) && $package_info['days'] != 0) {
|
|
| 296 | + $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));
|
|
| 297 | + } else {
|
|
| 298 | + $payment_info['expire_date'] = 'Never'; |
|
| 299 | + } |
|
| 300 | 300 | |
| 301 | - $payment_info['package_id'] = $package_info['pid']; |
|
| 302 | - $payment_info['alive_days'] = $package_info['days']; |
|
| 303 | - $payment_info['is_featured'] = $package_info['is_featured']; |
|
| 301 | + $payment_info['package_id'] = $package_info['pid']; |
|
| 302 | + $payment_info['alive_days'] = $package_info['days']; |
|
| 303 | + $payment_info['is_featured'] = $package_info['is_featured']; |
|
| 304 | 304 | |
| 305 | - $gd_post_info = array_merge($gd_post_info, $payment_info); |
|
| 306 | - } |
|
| 305 | + $gd_post_info = array_merge($gd_post_info, $payment_info); |
|
| 306 | + } |
|
| 307 | 307 | |
| 308 | - $custom_metaboxes = geodir_post_custom_fields('', 'all', $request_info['listing_type']);
|
|
| 308 | + $custom_metaboxes = geodir_post_custom_fields('', 'all', $request_info['listing_type']);
|
|
| 309 | 309 | |
| 310 | - foreach ($custom_metaboxes as $key => $val): |
|
| 310 | + foreach ($custom_metaboxes as $key => $val): |
|
| 311 | 311 | |
| 312 | - $name = $val['name']; |
|
| 313 | - $type = $val['type']; |
|
| 314 | - $extrafields = $val['extra_fields']; |
|
| 312 | + $name = $val['name']; |
|
| 313 | + $type = $val['type']; |
|
| 314 | + $extrafields = $val['extra_fields']; |
|
| 315 | 315 | |
| 316 | - if (trim($type) == 'address') {
|
|
| 317 | - $prefix = $name . '_'; |
|
| 318 | - $address = $prefix . 'address'; |
|
| 316 | + if (trim($type) == 'address') {
|
|
| 317 | + $prefix = $name . '_'; |
|
| 318 | + $address = $prefix . 'address'; |
|
| 319 | 319 | |
| 320 | - if (isset($request_info[$address]) && $request_info[$address] != '') {
|
|
| 321 | - $gd_post_info[$address] = wp_slash($request_info[$address]); |
|
| 322 | - } |
|
| 320 | + if (isset($request_info[$address]) && $request_info[$address] != '') {
|
|
| 321 | + $gd_post_info[$address] = wp_slash($request_info[$address]); |
|
| 322 | + } |
|
| 323 | 323 | |
| 324 | - if ($extrafields != '') {
|
|
| 325 | - $extrafields = unserialize($extrafields); |
|
| 324 | + if ($extrafields != '') {
|
|
| 325 | + $extrafields = unserialize($extrafields); |
|
| 326 | 326 | |
| 327 | 327 | |
| 328 | - if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {
|
|
| 328 | + if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {
|
|
| 329 | 329 | |
| 330 | - $location_result = geodir_get_default_location(); |
|
| 330 | + $location_result = geodir_get_default_location(); |
|
| 331 | 331 | |
| 332 | - $gd_post_info[$prefix . 'city'] = $location_result->city; |
|
| 333 | - $gd_post_info[$prefix . 'region'] = $location_result->region; |
|
| 334 | - $gd_post_info[$prefix . 'country'] = $location_result->country; |
|
| 332 | + $gd_post_info[$prefix . 'city'] = $location_result->city; |
|
| 333 | + $gd_post_info[$prefix . 'region'] = $location_result->region; |
|
| 334 | + $gd_post_info[$prefix . 'country'] = $location_result->country; |
|
| 335 | 335 | |
| 336 | - $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 336 | + $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 337 | 337 | |
| 338 | - } else {
|
|
| 338 | + } else {
|
|
| 339 | 339 | |
| 340 | - $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city']; |
|
| 341 | - $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region']; |
|
| 342 | - $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country']; |
|
| 340 | + $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city']; |
|
| 341 | + $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region']; |
|
| 342 | + $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country']; |
|
| 343 | 343 | |
| 344 | - //----------set post locations when import dummy data------- |
|
| 345 | - $location_result = geodir_get_default_location(); |
|
| 344 | + //----------set post locations when import dummy data------- |
|
| 345 | + $location_result = geodir_get_default_location(); |
|
| 346 | 346 | |
| 347 | - $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 348 | - //----------------------------------------------------------------- |
|
| 347 | + $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 348 | + //----------------------------------------------------------------- |
|
| 349 | 349 | |
| 350 | - } |
|
| 350 | + } |
|
| 351 | 351 | |
| 352 | 352 | |
| 353 | - if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {
|
|
| 354 | - $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip']; |
|
| 355 | - } |
|
| 353 | + if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {
|
|
| 354 | + $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip']; |
|
| 355 | + } |
|
| 356 | 356 | |
| 357 | 357 | |
| 358 | - if (isset($extrafields['show_map']) && $extrafields['show_map']) {
|
|
| 358 | + if (isset($extrafields['show_map']) && $extrafields['show_map']) {
|
|
| 359 | 359 | |
| 360 | - if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {
|
|
| 361 | - $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude']; |
|
| 362 | - } |
|
| 360 | + if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {
|
|
| 361 | + $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude']; |
|
| 362 | + } |
|
| 363 | 363 | |
| 364 | - if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {
|
|
| 365 | - $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude']; |
|
| 366 | - } |
|
| 364 | + if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {
|
|
| 365 | + $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude']; |
|
| 366 | + } |
|
| 367 | 367 | |
| 368 | - if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {
|
|
| 369 | - $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview']; |
|
| 370 | - } |
|
| 368 | + if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {
|
|
| 369 | + $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview']; |
|
| 370 | + } |
|
| 371 | 371 | |
| 372 | - if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {
|
|
| 373 | - $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom']; |
|
| 374 | - } |
|
| 372 | + if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {
|
|
| 373 | + $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom']; |
|
| 374 | + } |
|
| 375 | 375 | |
| 376 | - } |
|
| 376 | + } |
|
| 377 | 377 | |
| 378 | - // show lat lng |
|
| 379 | - if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {
|
|
| 380 | - $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng']; |
|
| 381 | - } |
|
| 382 | - } |
|
| 378 | + // show lat lng |
|
| 379 | + if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {
|
|
| 380 | + $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng']; |
|
| 381 | + } |
|
| 382 | + } |
|
| 383 | 383 | |
| 384 | - } elseif (trim($type) == 'file') {
|
|
| 385 | - if (isset($request_info[$name])) {
|
|
| 386 | - $request_files = array(); |
|
| 387 | - if ($request_info[$name] != '') |
|
| 388 | - $request_files = explode(",", $request_info[$name]);
|
|
| 384 | + } elseif (trim($type) == 'file') {
|
|
| 385 | + if (isset($request_info[$name])) {
|
|
| 386 | + $request_files = array(); |
|
| 387 | + if ($request_info[$name] != '') |
|
| 388 | + $request_files = explode(",", $request_info[$name]);
|
|
| 389 | 389 | |
| 390 | - $extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL; |
|
| 391 | - geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields); |
|
| 392 | - } |
|
| 393 | - } elseif (trim($type) == 'datepicker') {
|
|
| 394 | - if (isset($request_info[$name])) {
|
|
| 395 | - $datetime = ''; |
|
| 390 | + $extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL; |
|
| 391 | + geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields); |
|
| 392 | + } |
|
| 393 | + } elseif (trim($type) == 'datepicker') {
|
|
| 394 | + if (isset($request_info[$name])) {
|
|
| 395 | + $datetime = ''; |
|
| 396 | 396 | |
| 397 | - if (!empty($request_info[$name])) {
|
|
| 398 | - $date_format = geodir_default_date_format(); |
|
| 399 | - if (isset($val['extra_fields']) && $val['extra_fields'] != '') {
|
|
| 400 | - $extra_fields = unserialize($val['extra_fields']); |
|
| 401 | - $date_format = isset($extra_fields['date_format']) && $extra_fields['date_format'] != '' ? $extra_fields['date_format'] : $date_format; |
|
| 402 | - } |
|
| 403 | - |
|
| 404 | - // check if we need to change the format or not |
|
| 405 | - $date_format_len = strlen(str_replace(' ', '', $date_format));
|
|
| 406 | - if($date_format_len>5){// if greater then 5 then it's the old style format.
|
|
| 397 | + if (!empty($request_info[$name])) {
|
|
| 398 | + $date_format = geodir_default_date_format(); |
|
| 399 | + if (isset($val['extra_fields']) && $val['extra_fields'] != '') {
|
|
| 400 | + $extra_fields = unserialize($val['extra_fields']); |
|
| 401 | + $date_format = isset($extra_fields['date_format']) && $extra_fields['date_format'] != '' ? $extra_fields['date_format'] : $date_format; |
|
| 402 | + } |
|
| 407 | 403 | |
| 408 | - $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
|
|
| 409 | - $replace = array('d','j','l','m','n','F','Y');//PHP date format
|
|
| 404 | + // check if we need to change the format or not |
|
| 405 | + $date_format_len = strlen(str_replace(' ', '', $date_format));
|
|
| 406 | + if($date_format_len>5){// if greater then 5 then it's the old style format.
|
|
| 410 | 407 | |
| 411 | - $date_format = str_replace($search, $replace, $date_format); |
|
| 408 | + $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
|
|
| 409 | + $replace = array('d','j','l','m','n','F','Y');//PHP date format
|
|
| 412 | 410 | |
| 413 | - $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
|
|
| 411 | + $date_format = str_replace($search, $replace, $date_format); |
|
| 414 | 412 | |
| 415 | - }else{
|
|
| 416 | - $post_htmlvar_value = $request_info[$name]; |
|
| 417 | - } |
|
| 413 | + $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
|
|
| 418 | 414 | |
| 419 | - $post_htmlvar_value = geodir_date($post_htmlvar_value, 'Y-m-d', $date_format); // save as sql format Y-m-d |
|
| 420 | - $datetime = geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated |
|
| 421 | - } |
|
| 415 | + }else{
|
|
| 416 | + $post_htmlvar_value = $request_info[$name]; |
|
| 417 | + } |
|
| 422 | 418 | |
| 423 | - $gd_post_info[$name] = $datetime; |
|
| 424 | - } |
|
| 425 | - } else if ($type == 'multiselect') {
|
|
| 426 | - if (isset($request_info[$name])) {
|
|
| 427 | - $gd_post_info[$name] = $request_info[$name]; |
|
| 428 | - } else {
|
|
| 429 | - if (isset($request_info['gd_field_' . $name])) {
|
|
| 430 | - $gd_post_info[$name] = ''; /* fix de-select for multiselect */ |
|
| 431 | - } |
|
| 432 | - } |
|
| 433 | - } else if (isset($request_info[$name])) {
|
|
| 434 | - $gd_post_info[$name] = $request_info[$name]; |
|
| 435 | - } |
|
| 419 | + $post_htmlvar_value = geodir_date($post_htmlvar_value, 'Y-m-d', $date_format); // save as sql format Y-m-d |
|
| 420 | + $datetime = geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated |
|
| 421 | + } |
|
| 422 | + |
|
| 423 | + $gd_post_info[$name] = $datetime; |
|
| 424 | + } |
|
| 425 | + } else if ($type == 'multiselect') {
|
|
| 426 | + if (isset($request_info[$name])) {
|
|
| 427 | + $gd_post_info[$name] = $request_info[$name]; |
|
| 428 | + } else {
|
|
| 429 | + if (isset($request_info['gd_field_' . $name])) {
|
|
| 430 | + $gd_post_info[$name] = ''; /* fix de-select for multiselect */ |
|
| 431 | + } |
|
| 432 | + } |
|
| 433 | + } else if (isset($request_info[$name])) {
|
|
| 434 | + $gd_post_info[$name] = $request_info[$name]; |
|
| 435 | + } |
|
| 436 | 436 | |
| 437 | - endforeach; |
|
| 437 | + endforeach; |
|
| 438 | 438 | |
| 439 | - if (isset($request_info['post_dummy']) && $request_info['post_dummy'] != '') {
|
|
| 440 | - $gd_post_info['post_dummy'] = $request_info['post_dummy']; |
|
| 441 | - } |
|
| 439 | + if (isset($request_info['post_dummy']) && $request_info['post_dummy'] != '') {
|
|
| 440 | + $gd_post_info['post_dummy'] = $request_info['post_dummy']; |
|
| 441 | + } |
|
| 442 | 442 | |
| 443 | - // Save post detail info in detail table |
|
| 444 | - if (!empty($gd_post_info)) {
|
|
| 445 | - geodir_save_post_info($last_post_id, $gd_post_info); |
|
| 446 | - } |
|
| 443 | + // Save post detail info in detail table |
|
| 444 | + if (!empty($gd_post_info)) {
|
|
| 445 | + geodir_save_post_info($last_post_id, $gd_post_info); |
|
| 446 | + } |
|
| 447 | 447 | |
| 448 | 448 | |
| 449 | - // Set categories to the listing |
|
| 450 | - if (isset($request_info['post_category']) && !empty($request_info['post_category'])) {
|
|
| 451 | - $post_category = array(); |
|
| 449 | + // Set categories to the listing |
|
| 450 | + if (isset($request_info['post_category']) && !empty($request_info['post_category'])) {
|
|
| 451 | + $post_category = array(); |
|
| 452 | 452 | |
| 453 | - foreach ($request_info['post_category'] as $taxonomy => $cat) {
|
|
| 453 | + foreach ($request_info['post_category'] as $taxonomy => $cat) {
|
|
| 454 | 454 | |
| 455 | - if ($dummy) |
|
| 456 | - $post_category = $cat; |
|
| 457 | - else {
|
|
| 455 | + if ($dummy) |
|
| 456 | + $post_category = $cat; |
|
| 457 | + else {
|
|
| 458 | 458 | |
| 459 | - if (!is_array($cat) && strstr($cat, ',')) |
|
| 460 | - $cat = explode(',', $cat);
|
|
| 459 | + if (!is_array($cat) && strstr($cat, ',')) |
|
| 460 | + $cat = explode(',', $cat);
|
|
| 461 | 461 | |
| 462 | - if (!empty($cat) && is_array($cat)) |
|
| 463 | - $post_category = array_map('intval', $cat);
|
|
| 464 | - } |
|
| 462 | + if (!empty($cat) && is_array($cat)) |
|
| 463 | + $post_category = array_map('intval', $cat);
|
|
| 464 | + } |
|
| 465 | 465 | |
| 466 | - wp_set_object_terms($last_post_id, $post_category, $taxonomy); |
|
| 467 | - } |
|
| 466 | + wp_set_object_terms($last_post_id, $post_category, $taxonomy); |
|
| 467 | + } |
|
| 468 | 468 | |
| 469 | - $post_default_category = isset($request_info['post_default_category']) ? $request_info['post_default_category'] : ''; |
|
| 469 | + $post_default_category = isset($request_info['post_default_category']) ? $request_info['post_default_category'] : ''; |
|
| 470 | 470 | |
| 471 | - $post_category_str = isset($request_info['post_category_str']) ? $request_info['post_category_str'] : ''; |
|
| 472 | - geodir_set_postcat_structure($last_post_id, $taxonomy, $post_default_category, $post_category_str); |
|
| 471 | + $post_category_str = isset($request_info['post_category_str']) ? $request_info['post_category_str'] : ''; |
|
| 472 | + geodir_set_postcat_structure($last_post_id, $taxonomy, $post_default_category, $post_category_str); |
|
| 473 | 473 | |
| 474 | - } |
|
| 474 | + } |
|
| 475 | 475 | |
| 476 | - $post_tags = ''; |
|
| 477 | - // Set tags to the listing |
|
| 478 | - if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {
|
|
| 479 | - $post_tags = explode(",", $request_info['post_tags']);
|
|
| 480 | - } elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {
|
|
| 481 | - if ($dummy) |
|
| 482 | - $post_tags = $request_info['post_tags']; |
|
| 483 | - } else {
|
|
| 484 | - if ($dummy) |
|
| 485 | - $post_tags = array($request_info['post_title']); |
|
| 486 | - } |
|
| 476 | + $post_tags = ''; |
|
| 477 | + // Set tags to the listing |
|
| 478 | + if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {
|
|
| 479 | + $post_tags = explode(",", $request_info['post_tags']);
|
|
| 480 | + } elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {
|
|
| 481 | + if ($dummy) |
|
| 482 | + $post_tags = $request_info['post_tags']; |
|
| 483 | + } else {
|
|
| 484 | + if ($dummy) |
|
| 485 | + $post_tags = array($request_info['post_title']); |
|
| 486 | + } |
|
| 487 | 487 | |
| 488 | - if (is_array($post_tags)) {
|
|
| 489 | - $taxonomy = $request_info['listing_type'] . '_tags'; |
|
| 490 | - wp_set_object_terms($last_post_id, $post_tags, $taxonomy); |
|
| 491 | - } |
|
| 488 | + if (is_array($post_tags)) {
|
|
| 489 | + $taxonomy = $request_info['listing_type'] . '_tags'; |
|
| 490 | + wp_set_object_terms($last_post_id, $post_tags, $taxonomy); |
|
| 491 | + } |
|
| 492 | 492 | |
| 493 | 493 | |
| 494 | - // Insert attachment |
|
| 494 | + // Insert attachment |
|
| 495 | 495 | |
| 496 | - if (isset($request_info['post_images']) && !is_wp_error($last_post_id)) {
|
|
| 497 | - if (!$dummy) {
|
|
| 498 | - $tmpimgArr = trim($request_info['post_images'], ","); |
|
| 499 | - $tmpimgArr = explode(",", $tmpimgArr);
|
|
| 500 | - geodir_save_post_images($last_post_id, $tmpimgArr, $dummy); |
|
| 501 | - } else{
|
|
| 502 | - geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy); |
|
| 503 | - } |
|
| 496 | + if (isset($request_info['post_images']) && !is_wp_error($last_post_id)) {
|
|
| 497 | + if (!$dummy) {
|
|
| 498 | + $tmpimgArr = trim($request_info['post_images'], ","); |
|
| 499 | + $tmpimgArr = explode(",", $tmpimgArr);
|
|
| 500 | + geodir_save_post_images($last_post_id, $tmpimgArr, $dummy); |
|
| 501 | + } else{
|
|
| 502 | + geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy); |
|
| 503 | + } |
|
| 504 | 504 | |
| 505 | 505 | |
| 506 | - } elseif (!isset($request_info['post_images']) || $request_info['post_images'] == '') {
|
|
| 506 | + } elseif (!isset($request_info['post_images']) || $request_info['post_images'] == '') {
|
|
| 507 | 507 | |
| 508 | - /* Delete Attachments |
|
| 508 | + /* Delete Attachments |
|
| 509 | 509 | $postcurr_images = geodir_get_images($last_post_id); |
| 510 | 510 | |
| 511 | 511 | $wpdb->query( |
@@ -521,34 +521,34 @@ discard block |
||
| 521 | 521 | geodir_save_post_info($last_post_id, $gd_post_featured_img); |
| 522 | 522 | */ |
| 523 | 523 | |
| 524 | - } |
|
| 524 | + } |
|
| 525 | 525 | |
| 526 | - geodir_remove_temp_images(); |
|
| 527 | - geodir_set_wp_featured_image($last_post_id); |
|
| 526 | + geodir_remove_temp_images(); |
|
| 527 | + geodir_set_wp_featured_image($last_post_id); |
|
| 528 | 528 | |
| 529 | - /** |
|
| 530 | - * Called after a listing is saved to the database and before any email have been sent. |
|
| 531 | - * |
|
| 532 | - * @since 1.0.0 |
|
| 533 | - * @param int $last_post_id The saved post ID. |
|
| 534 | - * @param array $request_info The post details in an array. |
|
| 535 | - * @see 'geodir_after_save_listinginfo' |
|
| 536 | - */ |
|
| 537 | - do_action('geodir_after_save_listing', $last_post_id, $request_info);
|
|
| 529 | + /** |
|
| 530 | + * Called after a listing is saved to the database and before any email have been sent. |
|
| 531 | + * |
|
| 532 | + * @since 1.0.0 |
|
| 533 | + * @param int $last_post_id The saved post ID. |
|
| 534 | + * @param array $request_info The post details in an array. |
|
| 535 | + * @see 'geodir_after_save_listinginfo' |
|
| 536 | + */ |
|
| 537 | + do_action('geodir_after_save_listing', $last_post_id, $request_info);
|
|
| 538 | 538 | |
| 539 | - //die; |
|
| 539 | + //die; |
|
| 540 | 540 | |
| 541 | - if ($send_post_submit_mail) { // if new post send out email
|
|
| 542 | - $to_name = geodir_get_client_name($current_user->ID); |
|
| 543 | - geodir_sendEmail('', '', $current_user->user_email, $to_name, '', '', $request_info, 'post_submit', $last_post_id, $current_user->ID);
|
|
| 544 | - } |
|
| 545 | - /* |
|
| 541 | + if ($send_post_submit_mail) { // if new post send out email
|
|
| 542 | + $to_name = geodir_get_client_name($current_user->ID); |
|
| 543 | + geodir_sendEmail('', '', $current_user->user_email, $to_name, '', '', $request_info, 'post_submit', $last_post_id, $current_user->ID);
|
|
| 544 | + } |
|
| 545 | + /* |
|
| 546 | 546 | * Unset the session so we don't loop. |
| 547 | 547 | */ |
| 548 | - $gd_session->un_set('listing');
|
|
| 549 | - return $last_post_id; |
|
| 548 | + $gd_session->un_set('listing');
|
|
| 549 | + return $last_post_id; |
|
| 550 | 550 | |
| 551 | - } |
|
| 551 | + } |
|
| 552 | 552 | |
| 553 | 553 | } |
| 554 | 554 | |
@@ -567,611 +567,611 @@ discard block |
||
| 567 | 567 | function geodir_get_post_info($post_id = '') |
| 568 | 568 | {
|
| 569 | 569 | |
| 570 | - global $wpdb, $plugin_prefix, $post, $post_info; |
|
| 570 | + global $wpdb, $plugin_prefix, $post, $post_info; |
|
| 571 | 571 | |
| 572 | - if ($post_id == '' && !empty($post)) |
|
| 573 | - $post_id = $post->ID; |
|
| 572 | + if ($post_id == '' && !empty($post)) |
|
| 573 | + $post_id = $post->ID; |
|
| 574 | 574 | |
| 575 | - $post_type = get_post_type($post_id); |
|
| 575 | + $post_type = get_post_type($post_id); |
|
| 576 | 576 | |
| 577 | - $all_postypes = geodir_get_posttypes(); |
|
| 577 | + $all_postypes = geodir_get_posttypes(); |
|
| 578 | 578 | |
| 579 | - if (!in_array($post_type, $all_postypes)) |
|
| 580 | - return false; |
|
| 579 | + if (!in_array($post_type, $all_postypes)) |
|
| 580 | + return false; |
|
| 581 | 581 | |
| 582 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 582 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 583 | 583 | |
| 584 | - /** |
|
| 585 | - * Apply Filter to change Post info |
|
| 586 | - * |
|
| 587 | - * You can use this filter to change Post info. |
|
| 588 | - * |
|
| 589 | - * @since 1.0.0 |
|
| 590 | - * @package GeoDirectory |
|
| 591 | - */ |
|
| 592 | - $query = apply_filters('geodir_post_info_query', $wpdb->prepare("SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd
|
|
| 584 | + /** |
|
| 585 | + * Apply Filter to change Post info |
|
| 586 | + * |
|
| 587 | + * You can use this filter to change Post info. |
|
| 588 | + * |
|
| 589 | + * @since 1.0.0 |
|
| 590 | + * @package GeoDirectory |
|
| 591 | + */ |
|
| 592 | + $query = apply_filters('geodir_post_info_query', $wpdb->prepare("SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd
|
|
| 593 | 593 | WHERE p.ID = pd.post_id |
| 594 | 594 | AND pd.post_id = %d", $post_id)); |
| 595 | 595 | |
| 596 | - $post_detail = $wpdb->get_row($query); |
|
| 596 | + $post_detail = $wpdb->get_row($query); |
|
| 597 | 597 | |
| 598 | - return (!empty($post_detail)) ? $post_info = $post_detail : $post_info = false; |
|
| 598 | + return (!empty($post_detail)) ? $post_info = $post_detail : $post_info = false; |
|
| 599 | 599 | |
| 600 | 600 | } |
| 601 | 601 | |
| 602 | 602 | |
| 603 | 603 | if (!function_exists('geodir_save_post_info')) {
|
| 604 | - /** |
|
| 605 | - * Saves post detail info in detail table. |
|
| 606 | - * |
|
| 607 | - * @since 1.0.0 |
|
| 608 | - * @package GeoDirectory |
|
| 609 | - * @global object $wpdb WordPress Database object. |
|
| 610 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 611 | - * @param int $post_id The post ID. |
|
| 612 | - * @param array $postinfo_array {
|
|
| 613 | - * Post info that needs to be saved in detail table. |
|
| 614 | - * |
|
| 615 | - * @type string $post_title Listing title. |
|
| 616 | - * @type string $post_tags Listing tags. |
|
| 617 | - * @type string $post_status Listing post status. |
|
| 618 | - * @type string $post_location_id Listing location ID. |
|
| 619 | - * @type string $claimed Todo Desc needed. |
|
| 620 | - * @type string $businesses Todo Desc needed. |
|
| 621 | - * @type int $submit_time Submitted time in unix timestamp. |
|
| 622 | - * @type string $submit_ip Submitted IP. |
|
| 623 | - * @type string $expire_date Listing expiration date. |
|
| 624 | - * @type int $package_id Listing package ID. |
|
| 625 | - * @type int $alive_days Todo Desc needed. |
|
| 626 | - * @type int $is_featured Is this a featured listing?. |
|
| 627 | - * @type string $post_address Listing address. |
|
| 628 | - * @type string $post_city Listing city. |
|
| 629 | - * @type string $post_region Listing region. |
|
| 630 | - * @type string $post_country Listing country. |
|
| 631 | - * @type string $post_locations Listing locations. |
|
| 632 | - * @type string $post_zip Listing zip. |
|
| 633 | - * @type string $post_latitude Listing latitude. |
|
| 634 | - * @type string $post_longitude Listing longitude. |
|
| 635 | - * @type string $post_mapview Listing mapview. Default "ROADMAP". |
|
| 636 | - * @type string $post_mapzoom Listing mapzoom Default "9". |
|
| 637 | - * @type string $geodir_timing Business timing info. |
|
| 638 | - * @type string $geodir_contact Contact number. |
|
| 639 | - * @type string $geodir_email Business contact email. |
|
| 640 | - * @type string $geodir_website Business website. |
|
| 641 | - * @type string $geodir_twitter Twitter link. |
|
| 642 | - * @type string $geodir_facebook Facebook link. |
|
| 643 | - * @type string $geodir_video Video link. |
|
| 644 | - * @type string $geodir_special_offers Special offers. |
|
| 645 | - * |
|
| 646 | - * } |
|
| 647 | - * @return bool |
|
| 648 | - */ |
|
| 649 | - function geodir_save_post_info($post_id, $postinfo_array = array()) |
|
| 650 | - {
|
|
| 651 | - global $wpdb, $plugin_prefix; |
|
| 652 | - |
|
| 653 | - $post_type = get_post_type($post_id); |
|
| 654 | - |
|
| 655 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 656 | - |
|
| 657 | - /** |
|
| 658 | - * Filter to change Post info |
|
| 659 | - * |
|
| 660 | - * You can use this filter to change Post info. |
|
| 661 | - * |
|
| 662 | - * @since 1.0.0 |
|
| 663 | - * @package GeoDirectory |
|
| 664 | - * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
|
|
| 665 | - * @param int $post_id The post ID. |
|
| 666 | - */ |
|
| 667 | - $postmeta = apply_filters('geodir_listinginfo_request', $postinfo_array, $post_id);
|
|
| 604 | + /** |
|
| 605 | + * Saves post detail info in detail table. |
|
| 606 | + * |
|
| 607 | + * @since 1.0.0 |
|
| 608 | + * @package GeoDirectory |
|
| 609 | + * @global object $wpdb WordPress Database object. |
|
| 610 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 611 | + * @param int $post_id The post ID. |
|
| 612 | + * @param array $postinfo_array {
|
|
| 613 | + * Post info that needs to be saved in detail table. |
|
| 614 | + * |
|
| 615 | + * @type string $post_title Listing title. |
|
| 616 | + * @type string $post_tags Listing tags. |
|
| 617 | + * @type string $post_status Listing post status. |
|
| 618 | + * @type string $post_location_id Listing location ID. |
|
| 619 | + * @type string $claimed Todo Desc needed. |
|
| 620 | + * @type string $businesses Todo Desc needed. |
|
| 621 | + * @type int $submit_time Submitted time in unix timestamp. |
|
| 622 | + * @type string $submit_ip Submitted IP. |
|
| 623 | + * @type string $expire_date Listing expiration date. |
|
| 624 | + * @type int $package_id Listing package ID. |
|
| 625 | + * @type int $alive_days Todo Desc needed. |
|
| 626 | + * @type int $is_featured Is this a featured listing?. |
|
| 627 | + * @type string $post_address Listing address. |
|
| 628 | + * @type string $post_city Listing city. |
|
| 629 | + * @type string $post_region Listing region. |
|
| 630 | + * @type string $post_country Listing country. |
|
| 631 | + * @type string $post_locations Listing locations. |
|
| 632 | + * @type string $post_zip Listing zip. |
|
| 633 | + * @type string $post_latitude Listing latitude. |
|
| 634 | + * @type string $post_longitude Listing longitude. |
|
| 635 | + * @type string $post_mapview Listing mapview. Default "ROADMAP". |
|
| 636 | + * @type string $post_mapzoom Listing mapzoom Default "9". |
|
| 637 | + * @type string $geodir_timing Business timing info. |
|
| 638 | + * @type string $geodir_contact Contact number. |
|
| 639 | + * @type string $geodir_email Business contact email. |
|
| 640 | + * @type string $geodir_website Business website. |
|
| 641 | + * @type string $geodir_twitter Twitter link. |
|
| 642 | + * @type string $geodir_facebook Facebook link. |
|
| 643 | + * @type string $geodir_video Video link. |
|
| 644 | + * @type string $geodir_special_offers Special offers. |
|
| 645 | + * |
|
| 646 | + * } |
|
| 647 | + * @return bool |
|
| 648 | + */ |
|
| 649 | + function geodir_save_post_info($post_id, $postinfo_array = array()) |
|
| 650 | + {
|
|
| 651 | + global $wpdb, $plugin_prefix; |
|
| 652 | + |
|
| 653 | + $post_type = get_post_type($post_id); |
|
| 654 | + |
|
| 655 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 656 | + |
|
| 657 | + /** |
|
| 658 | + * Filter to change Post info |
|
| 659 | + * |
|
| 660 | + * You can use this filter to change Post info. |
|
| 661 | + * |
|
| 662 | + * @since 1.0.0 |
|
| 663 | + * @package GeoDirectory |
|
| 664 | + * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
|
|
| 665 | + * @param int $post_id The post ID. |
|
| 666 | + */ |
|
| 667 | + $postmeta = apply_filters('geodir_listinginfo_request', $postinfo_array, $post_id);
|
|
| 668 | + |
|
| 669 | + $query_string_escaped = ''; |
|
| 670 | + $query_string_array = array(); |
|
| 671 | + |
|
| 672 | + if (!empty($postmeta) && $post_id) {
|
|
| 673 | + |
|
| 674 | + $columns = $wpdb->get_col("show columns from $table");
|
|
| 675 | + foreach ($postmeta as $mkey => $mval) {
|
|
| 676 | + if(in_array($mkey,$columns)) {
|
|
| 677 | + if (is_array($mval)) {
|
|
| 678 | + $mval = implode(",", $mval);
|
|
| 679 | + } |
|
| 680 | + $query_string_escaped .= " $mkey = %s, "; // we can set the key here as we check if the column exists above |
|
| 681 | + $query_string_array[] = stripslashes($mval); // we strip slashes as we are using wpdb prepare |
|
| 668 | 682 | |
| 669 | - $query_string_escaped = ''; |
|
| 670 | - $query_string_array = array(); |
|
| 683 | + } |
|
| 684 | + } |
|
| 671 | 685 | |
| 672 | - if (!empty($postmeta) && $post_id) {
|
|
| 686 | + $query_string_escaped = trim($query_string_escaped, ", "); |
|
| 673 | 687 | |
| 674 | - $columns = $wpdb->get_col("show columns from $table");
|
|
| 675 | - foreach ($postmeta as $mkey => $mval) {
|
|
| 676 | - if(in_array($mkey,$columns)) {
|
|
| 677 | - if (is_array($mval)) {
|
|
| 678 | - $mval = implode(",", $mval);
|
|
| 679 | - } |
|
| 680 | - $query_string_escaped .= " $mkey = %s, "; // we can set the key here as we check if the column exists above |
|
| 681 | - $query_string_array[] = stripslashes($mval); // we strip slashes as we are using wpdb prepare |
|
| 688 | + if (empty($query_string_array) || trim($query_string_escaped) == '') {
|
|
| 689 | + return false; |
|
| 690 | + } |
|
| 682 | 691 | |
| 683 | - } |
|
| 684 | - } |
|
| 692 | + $query_string_array = str_replace(array("'%", "%'"), array("'%%", "%%'"), $query_string_array);
|
|
| 685 | 693 | |
| 686 | - $query_string_escaped = trim($query_string_escaped, ", "); |
|
| 687 | 694 | |
| 688 | - if (empty($query_string_array) || trim($query_string_escaped) == '') {
|
|
| 689 | - return false; |
|
| 690 | - } |
|
| 695 | + /** |
|
| 696 | + * Called before saving the listing info. |
|
| 697 | + * |
|
| 698 | + * @since 1.0.0 |
|
| 699 | + * @package GeoDirectory |
|
| 700 | + * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
|
|
| 701 | + * @param int $post_id The post ID. |
|
| 702 | + */ |
|
| 703 | + do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);
|
|
| 691 | 704 | |
| 692 | - $query_string_array = str_replace(array("'%", "%'"), array("'%%", "%%'"), $query_string_array);
|
|
| 705 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 693 | 706 | |
| 707 | + $query_string_array[] = $post_id; |
|
| 708 | + $wpdb->query( |
|
| 709 | + $wpdb->prepare( |
|
| 710 | + "UPDATE " . $table . " SET " . $query_string_escaped . " where post_id =%d", |
|
| 711 | + $query_string_array |
|
| 712 | + ) |
|
| 713 | + ); |
|
| 694 | 714 | |
| 695 | - /** |
|
| 696 | - * Called before saving the listing info. |
|
| 697 | - * |
|
| 698 | - * @since 1.0.0 |
|
| 699 | - * @package GeoDirectory |
|
| 700 | - * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
|
|
| 701 | - * @param int $post_id The post ID. |
|
| 702 | - */ |
|
| 703 | - do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);
|
|
| 704 | 715 | |
| 705 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 716 | + } else {
|
|
| 706 | 717 | |
| 707 | - $query_string_array[] = $post_id; |
|
| 708 | - $wpdb->query( |
|
| 709 | - $wpdb->prepare( |
|
| 710 | - "UPDATE " . $table . " SET " . $query_string_escaped . " where post_id =%d", |
|
| 711 | - $query_string_array |
|
| 712 | - ) |
|
| 713 | - ); |
|
| 718 | + array_unshift($query_string_array, $post_id); |
|
| 719 | + $wpdb->query( |
|
| 720 | + $wpdb->prepare( |
|
| 721 | + "INSERT INTO " . $table . " SET post_id = %d," . $query_string_escaped, |
|
| 722 | + $query_string_array |
|
| 723 | + ) |
|
| 724 | + ); |
|
| 725 | + |
|
| 726 | + } |
|
| 714 | 727 | |
| 728 | + /** |
|
| 729 | + * Called after saving the listing info. |
|
| 730 | + * |
|
| 731 | + * @since 1.0.0 |
|
| 732 | + * @package GeoDirectory |
|
| 733 | + * @param array $postinfo_array Post info that needs to be saved in detail table. |
|
| 734 | + * @param int $post_id The post ID. |
|
| 735 | + * @see 'geodir_after_save_listing' |
|
| 736 | + */ |
|
| 737 | + do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);
|
|
| 738 | + |
|
| 739 | + return true; |
|
| 740 | + } else |
|
| 741 | + return false; |
|
| 715 | 742 | |
| 716 | - } else {
|
|
| 743 | + } |
|
| 744 | +} |
|
| 717 | 745 | |
| 718 | - array_unshift($query_string_array, $post_id); |
|
| 719 | - $wpdb->query( |
|
| 720 | - $wpdb->prepare( |
|
| 721 | - "INSERT INTO " . $table . " SET post_id = %d," . $query_string_escaped, |
|
| 722 | - $query_string_array |
|
| 723 | - ) |
|
| 724 | - ); |
|
| 725 | - |
|
| 726 | - } |
|
| 727 | 746 | |
| 728 | - /** |
|
| 729 | - * Called after saving the listing info. |
|
| 730 | - * |
|
| 731 | - * @since 1.0.0 |
|
| 732 | - * @package GeoDirectory |
|
| 733 | - * @param array $postinfo_array Post info that needs to be saved in detail table. |
|
| 734 | - * @param int $post_id The post ID. |
|
| 735 | - * @see 'geodir_after_save_listing' |
|
| 736 | - */ |
|
| 737 | - do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);
|
|
| 747 | +if (!function_exists('geodir_save_post_meta')) {
|
|
| 748 | + /** |
|
| 749 | + * Save or update post custom fields. |
|
| 750 | + * |
|
| 751 | + * @since 1.0.0 |
|
| 752 | + * @package GeoDirectory |
|
| 753 | + * @global object $wpdb WordPress Database object. |
|
| 754 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 755 | + * @param int $post_id The post ID. |
|
| 756 | + * @param string $postmeta Detail table column name. |
|
| 757 | + * @param string $meta_value Detail table column value. |
|
| 758 | + * @return void|bool |
|
| 759 | + */ |
|
| 760 | + function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '') |
|
| 761 | + {
|
|
| 762 | + |
|
| 763 | + global $wpdb, $plugin_prefix; |
|
| 764 | + |
|
| 765 | + $post_type = get_post_type($post_id); |
|
| 766 | + |
|
| 767 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 768 | + |
|
| 769 | + if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {
|
|
| 770 | + |
|
| 771 | + if (is_array($meta_value)) {
|
|
| 772 | + $meta_value = implode(",", $meta_value);
|
|
| 773 | + } |
|
| 738 | 774 | |
| 739 | - return true; |
|
| 740 | - } else |
|
| 741 | - return false; |
|
| 775 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 742 | 776 | |
| 743 | - } |
|
| 744 | -} |
|
| 777 | + $wpdb->query( |
|
| 778 | + $wpdb->prepare( |
|
| 779 | + "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d", |
|
| 780 | + array($post_id) |
|
| 781 | + ) |
|
| 782 | + ); |
|
| 745 | 783 | |
| 784 | + } else {
|
|
| 746 | 785 | |
| 747 | -if (!function_exists('geodir_save_post_meta')) {
|
|
| 748 | - /** |
|
| 749 | - * Save or update post custom fields. |
|
| 750 | - * |
|
| 751 | - * @since 1.0.0 |
|
| 752 | - * @package GeoDirectory |
|
| 753 | - * @global object $wpdb WordPress Database object. |
|
| 754 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 755 | - * @param int $post_id The post ID. |
|
| 756 | - * @param string $postmeta Detail table column name. |
|
| 757 | - * @param string $meta_value Detail table column value. |
|
| 758 | - * @return void|bool |
|
| 759 | - */ |
|
| 760 | - function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '') |
|
| 761 | - {
|
|
| 762 | - |
|
| 763 | - global $wpdb, $plugin_prefix; |
|
| 764 | - |
|
| 765 | - $post_type = get_post_type($post_id); |
|
| 766 | - |
|
| 767 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 768 | - |
|
| 769 | - if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {
|
|
| 770 | - |
|
| 771 | - if (is_array($meta_value)) {
|
|
| 772 | - $meta_value = implode(",", $meta_value);
|
|
| 773 | - } |
|
| 774 | - |
|
| 775 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 776 | - |
|
| 777 | - $wpdb->query( |
|
| 778 | - $wpdb->prepare( |
|
| 779 | - "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d", |
|
| 780 | - array($post_id) |
|
| 781 | - ) |
|
| 782 | - ); |
|
| 783 | - |
|
| 784 | - } else {
|
|
| 785 | - |
|
| 786 | - $wpdb->query( |
|
| 787 | - $wpdb->prepare( |
|
| 788 | - "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'", |
|
| 789 | - array($post_id) |
|
| 790 | - ) |
|
| 791 | - ); |
|
| 792 | - } |
|
| 793 | - |
|
| 794 | - |
|
| 795 | - } else |
|
| 796 | - return false; |
|
| 797 | - } |
|
| 786 | + $wpdb->query( |
|
| 787 | + $wpdb->prepare( |
|
| 788 | + "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'", |
|
| 789 | + array($post_id) |
|
| 790 | + ) |
|
| 791 | + ); |
|
| 792 | + } |
|
| 793 | + |
|
| 794 | + |
|
| 795 | + } else |
|
| 796 | + return false; |
|
| 797 | + } |
|
| 798 | 798 | } |
| 799 | 799 | |
| 800 | 800 | if (!function_exists('geodir_delete_post_meta')) {
|
| 801 | - /** |
|
| 802 | - * Delete post custom fields. |
|
| 803 | - * |
|
| 804 | - * @since 1.0.0 |
|
| 805 | - * @package GeoDirectory |
|
| 806 | - * @global object $wpdb WordPress Database object. |
|
| 807 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 808 | - * @param int $post_id The post ID. |
|
| 809 | - * @param string $postmeta Detail table column name. |
|
| 810 | - * @todo check if this is depreciated |
|
| 811 | - * @todo Fix unknown variable mval |
|
| 812 | - * @return bool |
|
| 813 | - */ |
|
| 814 | - function geodir_delete_post_meta($post_id, $postmeta) |
|
| 815 | - {
|
|
| 816 | - |
|
| 817 | - global $wpdb, $plugin_prefix; |
|
| 818 | - |
|
| 819 | - $post_type = get_post_type($post_id); |
|
| 820 | - |
|
| 821 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 822 | - |
|
| 823 | - if (is_array($postmeta) && !empty($postmeta) && $post_id) {
|
|
| 824 | - $post_meta_set_query = ''; |
|
| 825 | - |
|
| 826 | - foreach ($postmeta as $mkey) {
|
|
| 827 | - if ($mval != '') |
|
| 828 | - $post_meta_set_query .= $mkey . " = '', "; |
|
| 829 | - } |
|
| 830 | - |
|
| 831 | - $post_meta_set_query = trim($post_meta_set_query, ", "); |
|
| 801 | + /** |
|
| 802 | + * Delete post custom fields. |
|
| 803 | + * |
|
| 804 | + * @since 1.0.0 |
|
| 805 | + * @package GeoDirectory |
|
| 806 | + * @global object $wpdb WordPress Database object. |
|
| 807 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 808 | + * @param int $post_id The post ID. |
|
| 809 | + * @param string $postmeta Detail table column name. |
|
| 810 | + * @todo check if this is depreciated |
|
| 811 | + * @todo Fix unknown variable mval |
|
| 812 | + * @return bool |
|
| 813 | + */ |
|
| 814 | + function geodir_delete_post_meta($post_id, $postmeta) |
|
| 815 | + {
|
|
| 816 | + |
|
| 817 | + global $wpdb, $plugin_prefix; |
|
| 818 | + |
|
| 819 | + $post_type = get_post_type($post_id); |
|
| 820 | + |
|
| 821 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 822 | + |
|
| 823 | + if (is_array($postmeta) && !empty($postmeta) && $post_id) {
|
|
| 824 | + $post_meta_set_query = ''; |
|
| 825 | + |
|
| 826 | + foreach ($postmeta as $mkey) {
|
|
| 827 | + if ($mval != '') |
|
| 828 | + $post_meta_set_query .= $mkey . " = '', "; |
|
| 829 | + } |
|
| 830 | + |
|
| 831 | + $post_meta_set_query = trim($post_meta_set_query, ", "); |
|
| 832 | 832 | |
| 833 | - if (empty($post_meta_set_query) || trim($post_meta_set_query) == '') {
|
|
| 834 | - return false; |
|
| 835 | - } |
|
| 836 | - |
|
| 837 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 838 | - |
|
| 839 | - $wpdb->query( |
|
| 840 | - $wpdb->prepare( |
|
| 841 | - "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d", |
|
| 842 | - array($post_id) |
|
| 843 | - ) |
|
| 844 | - ); |
|
| 845 | - |
|
| 846 | - return true; |
|
| 847 | - } |
|
| 848 | - |
|
| 849 | - } elseif ($postmeta != '' && $post_id) {
|
|
| 850 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 851 | - |
|
| 852 | - $wpdb->query( |
|
| 853 | - $wpdb->prepare( |
|
| 854 | - "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d", |
|
| 855 | - array($post_id) |
|
| 856 | - ) |
|
| 857 | - ); |
|
| 858 | - |
|
| 859 | - return true; |
|
| 860 | - } |
|
| 861 | - |
|
| 862 | - } else |
|
| 863 | - return false; |
|
| 864 | - } |
|
| 833 | + if (empty($post_meta_set_query) || trim($post_meta_set_query) == '') {
|
|
| 834 | + return false; |
|
| 835 | + } |
|
| 836 | + |
|
| 837 | + if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 838 | + |
|
| 839 | + $wpdb->query( |
|
| 840 | + $wpdb->prepare( |
|
| 841 | + "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d", |
|
| 842 | + array($post_id) |
|
| 843 | + ) |
|
| 844 | + ); |
|
| 845 | + |
|
| 846 | + return true; |
|
| 847 | + } |
|
| 848 | + |
|
| 849 | + } elseif ($postmeta != '' && $post_id) {
|
|
| 850 | + if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 851 | + |
|
| 852 | + $wpdb->query( |
|
| 853 | + $wpdb->prepare( |
|
| 854 | + "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d", |
|
| 855 | + array($post_id) |
|
| 856 | + ) |
|
| 857 | + ); |
|
| 858 | + |
|
| 859 | + return true; |
|
| 860 | + } |
|
| 861 | + |
|
| 862 | + } else |
|
| 863 | + return false; |
|
| 864 | + } |
|
| 865 | 865 | } |
| 866 | 866 | |
| 867 | 867 | |
| 868 | 868 | if (!function_exists('geodir_get_post_meta')) {
|
| 869 | - /** |
|
| 870 | - * Get post custom meta. |
|
| 871 | - * |
|
| 872 | - * @since 1.0.0 |
|
| 873 | - * @since 1.6.20 Hook added to filter value. |
|
| 874 | - * @package GeoDirectory |
|
| 875 | - * @global object $wpdb WordPress Database object. |
|
| 876 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 877 | - * @param int $post_id The post ID. |
|
| 878 | - * @param string $meta_key The meta key to retrieve. |
|
| 879 | - * @param bool $single Optional. Whether to return a single value. Default false. |
|
| 880 | - * @todo single variable not yet implemented. |
|
| 881 | - * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true. |
|
| 882 | - */ |
|
| 883 | - function geodir_get_post_meta($post_id, $meta_key, $single = false) {
|
|
| 884 | - if (!$post_id) {
|
|
| 885 | - return false; |
|
| 886 | - } |
|
| 887 | - global $wpdb, $plugin_prefix; |
|
| 888 | - |
|
| 889 | - $all_postypes = geodir_get_posttypes(); |
|
| 890 | - |
|
| 891 | - $post_type = get_post_type($post_id); |
|
| 892 | - |
|
| 893 | - if (!in_array($post_type, $all_postypes)) |
|
| 894 | - return false; |
|
| 895 | - |
|
| 896 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 897 | - |
|
| 898 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {
|
|
| 899 | - $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));
|
|
| 869 | + /** |
|
| 870 | + * Get post custom meta. |
|
| 871 | + * |
|
| 872 | + * @since 1.0.0 |
|
| 873 | + * @since 1.6.20 Hook added to filter value. |
|
| 874 | + * @package GeoDirectory |
|
| 875 | + * @global object $wpdb WordPress Database object. |
|
| 876 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 877 | + * @param int $post_id The post ID. |
|
| 878 | + * @param string $meta_key The meta key to retrieve. |
|
| 879 | + * @param bool $single Optional. Whether to return a single value. Default false. |
|
| 880 | + * @todo single variable not yet implemented. |
|
| 881 | + * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true. |
|
| 882 | + */ |
|
| 883 | + function geodir_get_post_meta($post_id, $meta_key, $single = false) {
|
|
| 884 | + if (!$post_id) {
|
|
| 885 | + return false; |
|
| 886 | + } |
|
| 887 | + global $wpdb, $plugin_prefix; |
|
| 888 | + |
|
| 889 | + $all_postypes = geodir_get_posttypes(); |
|
| 890 | + |
|
| 891 | + $post_type = get_post_type($post_id); |
|
| 892 | + |
|
| 893 | + if (!in_array($post_type, $all_postypes)) |
|
| 894 | + return false; |
|
| 895 | + |
|
| 896 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 897 | + |
|
| 898 | + if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {
|
|
| 899 | + $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));
|
|
| 900 | 900 | |
| 901 | - if ($meta_value && $meta_value !== '') {
|
|
| 902 | - $meta_value = maybe_serialize($meta_value); |
|
| 903 | - } |
|
| 904 | - } else {
|
|
| 905 | - $meta_value = false; |
|
| 906 | - } |
|
| 901 | + if ($meta_value && $meta_value !== '') {
|
|
| 902 | + $meta_value = maybe_serialize($meta_value); |
|
| 903 | + } |
|
| 904 | + } else {
|
|
| 905 | + $meta_value = false; |
|
| 906 | + } |
|
| 907 | 907 | |
| 908 | - /** |
|
| 909 | - * Filter the listing custom meta. |
|
| 910 | - * |
|
| 911 | - * @since 1.6.20 |
|
| 912 | - * |
|
| 913 | - * @param bool|mixed|null|string $meta_value Will be an array if $single is false. Will be value of meta data field if $single is true. |
|
| 914 | - * @param int $post_id The post ID. |
|
| 915 | - * @param string $meta_key The meta key to retrieve. |
|
| 916 | - * @param bool $single Optional. Whether to return a single value. Default false. |
|
| 917 | - */ |
|
| 918 | - return apply_filters( 'geodir_get_post_meta', $meta_value, $post_id, $meta_key, $single ); |
|
| 919 | - } |
|
| 908 | + /** |
|
| 909 | + * Filter the listing custom meta. |
|
| 910 | + * |
|
| 911 | + * @since 1.6.20 |
|
| 912 | + * |
|
| 913 | + * @param bool|mixed|null|string $meta_value Will be an array if $single is false. Will be value of meta data field if $single is true. |
|
| 914 | + * @param int $post_id The post ID. |
|
| 915 | + * @param string $meta_key The meta key to retrieve. |
|
| 916 | + * @param bool $single Optional. Whether to return a single value. Default false. |
|
| 917 | + */ |
|
| 918 | + return apply_filters( 'geodir_get_post_meta', $meta_value, $post_id, $meta_key, $single ); |
|
| 919 | + } |
|
| 920 | 920 | } |
| 921 | 921 | |
| 922 | 922 | |
| 923 | 923 | if (!function_exists('geodir_save_post_images')) {
|
| 924 | - /** |
|
| 925 | - * Save post attachments. |
|
| 926 | - * |
|
| 927 | - * @since 1.0.0 |
|
| 928 | - * @package GeoDirectory |
|
| 929 | - * @global object $wpdb WordPress Database object. |
|
| 930 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 931 | - * @global object $current_user Current user object. |
|
| 932 | - * @param int $post_id The post ID. |
|
| 933 | - * @param array $post_image Post image urls as an array. |
|
| 934 | - * @param bool $dummy Optional. Is this a dummy listing? Default false. |
|
| 935 | - */ |
|
| 936 | - function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false) |
|
| 937 | - {
|
|
| 924 | + /** |
|
| 925 | + * Save post attachments. |
|
| 926 | + * |
|
| 927 | + * @since 1.0.0 |
|
| 928 | + * @package GeoDirectory |
|
| 929 | + * @global object $wpdb WordPress Database object. |
|
| 930 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 931 | + * @global object $current_user Current user object. |
|
| 932 | + * @param int $post_id The post ID. |
|
| 933 | + * @param array $post_image Post image urls as an array. |
|
| 934 | + * @param bool $dummy Optional. Is this a dummy listing? Default false. |
|
| 935 | + */ |
|
| 936 | + function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false) |
|
| 937 | + {
|
|
| 938 | 938 | |
| 939 | 939 | |
| 940 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 940 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 941 | 941 | |
| 942 | - $post_type = get_post_type($post_id); |
|
| 942 | + $post_type = get_post_type($post_id); |
|
| 943 | 943 | |
| 944 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 944 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 945 | 945 | |
| 946 | - $post_images = geodir_get_images($post_id); |
|
| 946 | + $post_images = geodir_get_images($post_id); |
|
| 947 | 947 | |
| 948 | - $wpdb->query( |
|
| 949 | - $wpdb->prepare( |
|
| 950 | - "UPDATE " . $table . " SET featured_image = '' where post_id =%d", |
|
| 951 | - array($post_id) |
|
| 952 | - ) |
|
| 953 | - ); |
|
| 948 | + $wpdb->query( |
|
| 949 | + $wpdb->prepare( |
|
| 950 | + "UPDATE " . $table . " SET featured_image = '' where post_id =%d", |
|
| 951 | + array($post_id) |
|
| 952 | + ) |
|
| 953 | + ); |
|
| 954 | 954 | |
| 955 | - $invalid_files = $post_images; |
|
| 956 | - $valid_file_ids = array(); |
|
| 957 | - $valid_files_condition = ''; |
|
| 958 | - $geodir_uploaddir = ''; |
|
| 955 | + $invalid_files = $post_images; |
|
| 956 | + $valid_file_ids = array(); |
|
| 957 | + $valid_files_condition = ''; |
|
| 958 | + $geodir_uploaddir = ''; |
|
| 959 | 959 | |
| 960 | - $remove_files = array(); |
|
| 960 | + $remove_files = array(); |
|
| 961 | 961 | |
| 962 | - if (!empty($post_image)) {
|
|
| 962 | + if (!empty($post_image)) {
|
|
| 963 | 963 | |
| 964 | - $uploads = wp_upload_dir(); |
|
| 965 | - $uploads_dir = $uploads['path']; |
|
| 964 | + $uploads = wp_upload_dir(); |
|
| 965 | + $uploads_dir = $uploads['path']; |
|
| 966 | 966 | |
| 967 | - $geodir_uploadpath = $uploads['path']; |
|
| 968 | - $geodir_uploadurl = $uploads['url']; |
|
| 969 | - $sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : ''; |
|
| 967 | + $geodir_uploadpath = $uploads['path']; |
|
| 968 | + $geodir_uploadurl = $uploads['url']; |
|
| 969 | + $sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : ''; |
|
| 970 | 970 | |
| 971 | - $invalid_files = array(); |
|
| 972 | - $postcurr_images = array(); |
|
| 971 | + $invalid_files = array(); |
|
| 972 | + $postcurr_images = array(); |
|
| 973 | 973 | |
| 974 | - for ($m = 0; $m < count($post_image); $m++) {
|
|
| 975 | - $menu_order = $m + 1; |
|
| 974 | + for ($m = 0; $m < count($post_image); $m++) {
|
|
| 975 | + $menu_order = $m + 1; |
|
| 976 | 976 | |
| 977 | - $file_path = ''; |
|
| 978 | - /* --------- start ------- */ |
|
| 977 | + $file_path = ''; |
|
| 978 | + /* --------- start ------- */ |
|
| 979 | 979 | |
| 980 | - $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
|
|
| 980 | + $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
|
|
| 981 | 981 | |
| 982 | - $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 982 | + $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 983 | 983 | |
| 984 | 984 | |
| 985 | - if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {
|
|
| 985 | + if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {
|
|
| 986 | 986 | |
| 987 | - /* --------- end ------- */ |
|
| 988 | - $curr_img_url = $post_image[$m]; |
|
| 987 | + /* --------- end ------- */ |
|
| 988 | + $curr_img_url = $post_image[$m]; |
|
| 989 | 989 | |
| 990 | - $image_name_arr = explode('/', $curr_img_url);
|
|
| 990 | + $image_name_arr = explode('/', $curr_img_url);
|
|
| 991 | 991 | |
| 992 | - $count_image_name_arr = count($image_name_arr) - 2; |
|
| 992 | + $count_image_name_arr = count($image_name_arr) - 2; |
|
| 993 | 993 | |
| 994 | - $count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0; |
|
| 994 | + $count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0; |
|
| 995 | 995 | |
| 996 | - $curr_img_dir = $image_name_arr[$count_image_name_arr]; |
|
| 996 | + $curr_img_dir = $image_name_arr[$count_image_name_arr]; |
|
| 997 | 997 | |
| 998 | - $filename = end($image_name_arr); |
|
| 999 | - if (strpos($filename, '?') !== false) {
|
|
| 1000 | - list($filename) = explode('?', $filename);
|
|
| 1001 | - } |
|
| 998 | + $filename = end($image_name_arr); |
|
| 999 | + if (strpos($filename, '?') !== false) {
|
|
| 1000 | + list($filename) = explode('?', $filename);
|
|
| 1001 | + } |
|
| 1002 | 1002 | |
| 1003 | - $curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url); |
|
| 1004 | - $curr_img_dir = str_replace($filename, "", $curr_img_dir); |
|
| 1003 | + $curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url); |
|
| 1004 | + $curr_img_dir = str_replace($filename, "", $curr_img_dir); |
|
| 1005 | 1005 | |
| 1006 | - $img_name_arr = explode('.', $filename);
|
|
| 1006 | + $img_name_arr = explode('.', $filename);
|
|
| 1007 | 1007 | |
| 1008 | - $file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename; |
|
| 1009 | - if (!empty($img_name_arr) && count($img_name_arr) > 2) {
|
|
| 1010 | - $new_img_name_arr = $img_name_arr; |
|
| 1011 | - if (isset($new_img_name_arr[count($img_name_arr) - 1])) {
|
|
| 1012 | - unset($new_img_name_arr[count($img_name_arr) - 1]); |
|
| 1013 | - $file_title = implode('.', $new_img_name_arr);
|
|
| 1014 | - } |
|
| 1015 | - } |
|
| 1016 | - $file_title = sanitize_file_name($file_title); |
|
| 1017 | - $file_name = sanitize_file_name($filename); |
|
| 1008 | + $file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename; |
|
| 1009 | + if (!empty($img_name_arr) && count($img_name_arr) > 2) {
|
|
| 1010 | + $new_img_name_arr = $img_name_arr; |
|
| 1011 | + if (isset($new_img_name_arr[count($img_name_arr) - 1])) {
|
|
| 1012 | + unset($new_img_name_arr[count($img_name_arr) - 1]); |
|
| 1013 | + $file_title = implode('.', $new_img_name_arr);
|
|
| 1014 | + } |
|
| 1015 | + } |
|
| 1016 | + $file_title = sanitize_file_name($file_title); |
|
| 1017 | + $file_name = sanitize_file_name($filename); |
|
| 1018 | 1018 | |
| 1019 | - $arr_file_type = wp_check_filetype($filename); |
|
| 1019 | + $arr_file_type = wp_check_filetype($filename); |
|
| 1020 | 1020 | |
| 1021 | - $uploaded_file_type = $arr_file_type['type']; |
|
| 1021 | + $uploaded_file_type = $arr_file_type['type']; |
|
| 1022 | 1022 | |
| 1023 | - // Set an array containing a list of acceptable formats |
|
| 1024 | - $allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');
|
|
| 1023 | + // Set an array containing a list of acceptable formats |
|
| 1024 | + $allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');
|
|
| 1025 | 1025 | |
| 1026 | - // If the uploaded file is the right format |
|
| 1027 | - if (in_array($uploaded_file_type, $allowed_file_types)) {
|
|
| 1028 | - if (!function_exists('wp_handle_upload')) {
|
|
| 1029 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1030 | - } |
|
| 1026 | + // If the uploaded file is the right format |
|
| 1027 | + if (in_array($uploaded_file_type, $allowed_file_types)) {
|
|
| 1028 | + if (!function_exists('wp_handle_upload')) {
|
|
| 1029 | + require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1030 | + } |
|
| 1031 | 1031 | |
| 1032 | - if (!is_dir($geodir_uploadpath)) {
|
|
| 1033 | - mkdir($geodir_uploadpath); |
|
| 1034 | - } |
|
| 1032 | + if (!is_dir($geodir_uploadpath)) {
|
|
| 1033 | + mkdir($geodir_uploadpath); |
|
| 1034 | + } |
|
| 1035 | 1035 | |
| 1036 | - $external_img = false; |
|
| 1037 | - if (strpos( str_replace( array('http://','https://'),'',$curr_img_url ), str_replace(array('http://','https://'),'',$uploads['baseurl'] ) ) !== false) {
|
|
| 1038 | - } else {
|
|
| 1039 | - $external_img = true; |
|
| 1040 | - } |
|
| 1036 | + $external_img = false; |
|
| 1037 | + if (strpos( str_replace( array('http://','https://'),'',$curr_img_url ), str_replace(array('http://','https://'),'',$uploads['baseurl'] ) ) !== false) {
|
|
| 1038 | + } else {
|
|
| 1039 | + $external_img = true; |
|
| 1040 | + } |
|
| 1041 | 1041 | |
| 1042 | - if ($dummy || $external_img) {
|
|
| 1043 | - $uploaded_file = array(); |
|
| 1044 | - $uploaded = (array)fetch_remote_file($curr_img_url); |
|
| 1042 | + if ($dummy || $external_img) {
|
|
| 1043 | + $uploaded_file = array(); |
|
| 1044 | + $uploaded = (array)fetch_remote_file($curr_img_url); |
|
| 1045 | 1045 | |
| 1046 | - if (isset($uploaded['error']) && empty($uploaded['error'])) {
|
|
| 1047 | - $new_name = basename($uploaded['file']); |
|
| 1048 | - $uploaded_file = $uploaded; |
|
| 1049 | - }else{
|
|
| 1050 | - print_r($uploaded);exit; |
|
| 1051 | - } |
|
| 1052 | - $external_img = false; |
|
| 1053 | - } else {
|
|
| 1054 | - $new_name = $post_id . '_' . $file_name; |
|
| 1046 | + if (isset($uploaded['error']) && empty($uploaded['error'])) {
|
|
| 1047 | + $new_name = basename($uploaded['file']); |
|
| 1048 | + $uploaded_file = $uploaded; |
|
| 1049 | + }else{
|
|
| 1050 | + print_r($uploaded);exit; |
|
| 1051 | + } |
|
| 1052 | + $external_img = false; |
|
| 1053 | + } else {
|
|
| 1054 | + $new_name = $post_id . '_' . $file_name; |
|
| 1055 | 1055 | |
| 1056 | - if ($curr_img_dir == $sub_dir) {
|
|
| 1057 | - $img_path = $geodir_uploadpath . '/' . $filename; |
|
| 1058 | - $img_url = $geodir_uploadurl . '/' . $filename; |
|
| 1059 | - } else {
|
|
| 1060 | - $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1061 | - $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1062 | - } |
|
| 1056 | + if ($curr_img_dir == $sub_dir) {
|
|
| 1057 | + $img_path = $geodir_uploadpath . '/' . $filename; |
|
| 1058 | + $img_url = $geodir_uploadurl . '/' . $filename; |
|
| 1059 | + } else {
|
|
| 1060 | + $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1061 | + $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1062 | + } |
|
| 1063 | 1063 | |
| 1064 | - $uploaded_file = ''; |
|
| 1064 | + $uploaded_file = ''; |
|
| 1065 | 1065 | |
| 1066 | - if (file_exists($img_path)) {
|
|
| 1067 | - $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); |
|
| 1068 | - $file_path = ''; |
|
| 1069 | - } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
|
|
| 1070 | - $uploaded_file = true; |
|
| 1071 | - $file_path = $curr_img_dir . '/' . $filename; |
|
| 1072 | - } |
|
| 1066 | + if (file_exists($img_path)) {
|
|
| 1067 | + $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); |
|
| 1068 | + $file_path = ''; |
|
| 1069 | + } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
|
|
| 1070 | + $uploaded_file = true; |
|
| 1071 | + $file_path = $curr_img_dir . '/' . $filename; |
|
| 1072 | + } |
|
| 1073 | 1073 | |
| 1074 | - if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path)) |
|
| 1075 | - unlink($img_path); |
|
| 1076 | - } |
|
| 1074 | + if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path)) |
|
| 1075 | + unlink($img_path); |
|
| 1076 | + } |
|
| 1077 | 1077 | |
| 1078 | - if (!empty($uploaded_file)) {
|
|
| 1079 | - if (!isset($file_path) || !$file_path) {
|
|
| 1080 | - $file_path = $sub_dir . '/' . $new_name; |
|
| 1081 | - } |
|
| 1078 | + if (!empty($uploaded_file)) {
|
|
| 1079 | + if (!isset($file_path) || !$file_path) {
|
|
| 1080 | + $file_path = $sub_dir . '/' . $new_name; |
|
| 1081 | + } |
|
| 1082 | 1082 | |
| 1083 | - $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
|
|
| 1083 | + $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
|
|
| 1084 | 1084 | |
| 1085 | - if ($menu_order == 1) {
|
|
| 1085 | + if ($menu_order == 1) {
|
|
| 1086 | 1086 | |
| 1087 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
|
|
| 1087 | + $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
|
|
| 1088 | 1088 | |
| 1089 | - } |
|
| 1089 | + } |
|
| 1090 | 1090 | |
| 1091 | - // Set up options array to add this file as an attachment |
|
| 1092 | - $attachment = array(); |
|
| 1093 | - $attachment['post_id'] = $post_id; |
|
| 1094 | - $attachment['title'] = $file_title; |
|
| 1095 | - $attachment['content'] = ''; |
|
| 1096 | - $attachment['file'] = $file_path; |
|
| 1097 | - $attachment['mime_type'] = $uploaded_file_type; |
|
| 1098 | - $attachment['menu_order'] = $menu_order; |
|
| 1099 | - $attachment['is_featured'] = 0; |
|
| 1091 | + // Set up options array to add this file as an attachment |
|
| 1092 | + $attachment = array(); |
|
| 1093 | + $attachment['post_id'] = $post_id; |
|
| 1094 | + $attachment['title'] = $file_title; |
|
| 1095 | + $attachment['content'] = ''; |
|
| 1096 | + $attachment['file'] = $file_path; |
|
| 1097 | + $attachment['mime_type'] = $uploaded_file_type; |
|
| 1098 | + $attachment['menu_order'] = $menu_order; |
|
| 1099 | + $attachment['is_featured'] = 0; |
|
| 1100 | 1100 | |
| 1101 | - $attachment_set = ''; |
|
| 1101 | + $attachment_set = ''; |
|
| 1102 | 1102 | |
| 1103 | - foreach ($attachment as $key => $val) {
|
|
| 1104 | - if ($val != '') |
|
| 1105 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 1106 | - } |
|
| 1103 | + foreach ($attachment as $key => $val) {
|
|
| 1104 | + if ($val != '') |
|
| 1105 | + $attachment_set .= $key . " = '" . $val . "', "; |
|
| 1106 | + } |
|
| 1107 | 1107 | |
| 1108 | - $attachment_set = trim($attachment_set, ", "); |
|
| 1108 | + $attachment_set = trim($attachment_set, ", "); |
|
| 1109 | + |
|
| 1110 | + $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 1109 | 1111 | |
| 1110 | - $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 1112 | + $valid_file_ids[] = $wpdb->insert_id; |
|
| 1113 | + } |
|
| 1111 | 1114 | |
| 1112 | - $valid_file_ids[] = $wpdb->insert_id; |
|
| 1113 | - } |
|
| 1115 | + } |
|
| 1114 | 1116 | |
| 1115 | - } |
|
| 1116 | 1117 | |
| 1118 | + } else {
|
|
| 1119 | + $valid_file_ids[] = $find_image; |
|
| 1117 | 1120 | |
| 1118 | - } else {
|
|
| 1119 | - $valid_file_ids[] = $find_image; |
|
| 1120 | - |
|
| 1121 | - $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
|
|
| 1121 | + $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
|
|
| 1122 | 1122 | |
| 1123 | - $wpdb->query( |
|
| 1124 | - $wpdb->prepare( |
|
| 1125 | - "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d", |
|
| 1126 | - array($menu_order, $split_img_path[1], $post_id) |
|
| 1127 | - ) |
|
| 1128 | - ); |
|
| 1123 | + $wpdb->query( |
|
| 1124 | + $wpdb->prepare( |
|
| 1125 | + "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d", |
|
| 1126 | + array($menu_order, $split_img_path[1], $post_id) |
|
| 1127 | + ) |
|
| 1128 | + ); |
|
| 1129 | 1129 | |
| 1130 | - if ($menu_order == 1) |
|
| 1131 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
|
|
| 1130 | + if ($menu_order == 1) |
|
| 1131 | + $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
|
|
| 1132 | 1132 | |
| 1133 | - } |
|
| 1133 | + } |
|
| 1134 | 1134 | |
| 1135 | 1135 | |
| 1136 | - } |
|
| 1136 | + } |
|
| 1137 | 1137 | |
| 1138 | - if (!empty($valid_file_ids)) {
|
|
| 1138 | + if (!empty($valid_file_ids)) {
|
|
| 1139 | 1139 | |
| 1140 | - $remove_files = $valid_file_ids; |
|
| 1140 | + $remove_files = $valid_file_ids; |
|
| 1141 | 1141 | |
| 1142 | - $remove_files_length = count($remove_files); |
|
| 1143 | - $remove_files_format = array_fill(0, $remove_files_length, '%d'); |
|
| 1144 | - $format = implode(',', $remove_files_format);
|
|
| 1145 | - $valid_files_condition = " ID NOT IN ($format) AND "; |
|
| 1142 | + $remove_files_length = count($remove_files); |
|
| 1143 | + $remove_files_format = array_fill(0, $remove_files_length, '%d'); |
|
| 1144 | + $format = implode(',', $remove_files_format);
|
|
| 1145 | + $valid_files_condition = " ID NOT IN ($format) AND "; |
|
| 1146 | 1146 | |
| 1147 | - } |
|
| 1147 | + } |
|
| 1148 | 1148 | |
| 1149 | - //Get and remove all old images of post from database to set by new order |
|
| 1149 | + //Get and remove all old images of post from database to set by new order |
|
| 1150 | 1150 | |
| 1151 | - if (!empty($post_images)) {
|
|
| 1151 | + if (!empty($post_images)) {
|
|
| 1152 | 1152 | |
| 1153 | - foreach ($post_images as $img) {
|
|
| 1153 | + foreach ($post_images as $img) {
|
|
| 1154 | 1154 | |
| 1155 | - if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
|
|
| 1155 | + if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
|
|
| 1156 | 1156 | |
| 1157 | - $invalid_files[] = (object)array('src' => $img->src);
|
|
| 1157 | + $invalid_files[] = (object)array('src' => $img->src);
|
|
| 1158 | 1158 | |
| 1159 | - } |
|
| 1159 | + } |
|
| 1160 | 1160 | |
| 1161 | - } |
|
| 1161 | + } |
|
| 1162 | 1162 | |
| 1163 | - } |
|
| 1163 | + } |
|
| 1164 | 1164 | |
| 1165 | - $invalid_files = (object)$invalid_files; |
|
| 1166 | - } |
|
| 1165 | + $invalid_files = (object)$invalid_files; |
|
| 1166 | + } |
|
| 1167 | 1167 | |
| 1168 | - $remove_files[] = $post_id; |
|
| 1168 | + $remove_files[] = $post_id; |
|
| 1169 | 1169 | |
| 1170 | - $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
|
|
| 1170 | + $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
|
|
| 1171 | 1171 | |
| 1172 | - if (!empty($invalid_files)) |
|
| 1173 | - geodir_remove_attachments($invalid_files); |
|
| 1174 | - } |
|
| 1172 | + if (!empty($invalid_files)) |
|
| 1173 | + geodir_remove_attachments($invalid_files); |
|
| 1174 | + } |
|
| 1175 | 1175 | |
| 1176 | 1176 | } |
| 1177 | 1177 | |
@@ -1185,12 +1185,12 @@ discard block |
||
| 1185 | 1185 | function geodir_remove_temp_images() |
| 1186 | 1186 | {
|
| 1187 | 1187 | |
| 1188 | - global $current_user; |
|
| 1188 | + global $current_user; |
|
| 1189 | 1189 | |
| 1190 | - $uploads = wp_upload_dir(); |
|
| 1191 | - $uploads_dir = $uploads['path']; |
|
| 1190 | + $uploads = wp_upload_dir(); |
|
| 1191 | + $uploads_dir = $uploads['path']; |
|
| 1192 | 1192 | |
| 1193 | - /* if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){
|
|
| 1193 | + /* if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){
|
|
| 1194 | 1194 | |
| 1195 | 1195 | $dirPath = $uploads_dir.'/temp_'.$current_user->data->ID; |
| 1196 | 1196 | if (substr($dirPath, strlen($dirPath) - 1, 1) != '/') {
|
@@ -1207,8 +1207,8 @@ discard block |
||
| 1207 | 1207 | rmdir($dirPath); |
| 1208 | 1208 | } */ |
| 1209 | 1209 | |
| 1210 | - $dirname = $uploads_dir . '/temp_' . $current_user->ID; |
|
| 1211 | - geodir_delete_directory($dirname); |
|
| 1210 | + $dirname = $uploads_dir . '/temp_' . $current_user->ID; |
|
| 1211 | + geodir_delete_directory($dirname); |
|
| 1212 | 1212 | } |
| 1213 | 1213 | |
| 1214 | 1214 | |
@@ -1222,129 +1222,129 @@ discard block |
||
| 1222 | 1222 | */ |
| 1223 | 1223 | function geodir_delete_directory($dirname) |
| 1224 | 1224 | {
|
| 1225 | - $dir_handle = ''; |
|
| 1226 | - if (is_dir($dirname)) |
|
| 1227 | - $dir_handle = opendir($dirname); |
|
| 1228 | - if (!$dir_handle) |
|
| 1229 | - return false; |
|
| 1230 | - while ($file = readdir($dir_handle)) {
|
|
| 1231 | - if ($file != "." && $file != "..") {
|
|
| 1232 | - if (!is_dir($dirname . "/" . $file)) |
|
| 1233 | - unlink($dirname . "/" . $file); |
|
| 1234 | - else |
|
| 1235 | - geodir_delete_directory($dirname . '/' . $file); |
|
| 1236 | - } |
|
| 1237 | - } |
|
| 1238 | - closedir($dir_handle); |
|
| 1239 | - rmdir($dirname); |
|
| 1240 | - return true; |
|
| 1225 | + $dir_handle = ''; |
|
| 1226 | + if (is_dir($dirname)) |
|
| 1227 | + $dir_handle = opendir($dirname); |
|
| 1228 | + if (!$dir_handle) |
|
| 1229 | + return false; |
|
| 1230 | + while ($file = readdir($dir_handle)) {
|
|
| 1231 | + if ($file != "." && $file != "..") {
|
|
| 1232 | + if (!is_dir($dirname . "/" . $file)) |
|
| 1233 | + unlink($dirname . "/" . $file); |
|
| 1234 | + else |
|
| 1235 | + geodir_delete_directory($dirname . '/' . $file); |
|
| 1236 | + } |
|
| 1237 | + } |
|
| 1238 | + closedir($dir_handle); |
|
| 1239 | + rmdir($dirname); |
|
| 1240 | + return true; |
|
| 1241 | 1241 | |
| 1242 | 1242 | } |
| 1243 | 1243 | |
| 1244 | 1244 | |
| 1245 | 1245 | if (!function_exists('geodir_remove_attachments')) {
|
| 1246 | - /** |
|
| 1247 | - * Remove post attachments. |
|
| 1248 | - * |
|
| 1249 | - * @since 1.0.0 |
|
| 1250 | - * @package GeoDirectory |
|
| 1251 | - * @param array $postcurr_images Array of image objects. |
|
| 1252 | - */ |
|
| 1253 | - function geodir_remove_attachments($postcurr_images = array()) |
|
| 1254 | - {
|
|
| 1255 | - // Unlink all past images of post |
|
| 1256 | - if (!empty($postcurr_images)) {
|
|
| 1257 | - |
|
| 1258 | - $uploads = wp_upload_dir(); |
|
| 1259 | - $uploads_dir = $uploads['path']; |
|
| 1260 | - |
|
| 1261 | - foreach ($postcurr_images as $postimg) {
|
|
| 1262 | - $image_name_arr = explode('/', $postimg->src);
|
|
| 1263 | - $filename = end($image_name_arr); |
|
| 1264 | - if (file_exists($uploads_dir . '/' . $filename)) |
|
| 1265 | - unlink($uploads_dir . '/' . $filename); |
|
| 1266 | - } |
|
| 1267 | - |
|
| 1268 | - } // endif |
|
| 1269 | - // Unlink all past images of post end |
|
| 1270 | - } |
|
| 1246 | + /** |
|
| 1247 | + * Remove post attachments. |
|
| 1248 | + * |
|
| 1249 | + * @since 1.0.0 |
|
| 1250 | + * @package GeoDirectory |
|
| 1251 | + * @param array $postcurr_images Array of image objects. |
|
| 1252 | + */ |
|
| 1253 | + function geodir_remove_attachments($postcurr_images = array()) |
|
| 1254 | + {
|
|
| 1255 | + // Unlink all past images of post |
|
| 1256 | + if (!empty($postcurr_images)) {
|
|
| 1257 | + |
|
| 1258 | + $uploads = wp_upload_dir(); |
|
| 1259 | + $uploads_dir = $uploads['path']; |
|
| 1260 | + |
|
| 1261 | + foreach ($postcurr_images as $postimg) {
|
|
| 1262 | + $image_name_arr = explode('/', $postimg->src);
|
|
| 1263 | + $filename = end($image_name_arr); |
|
| 1264 | + if (file_exists($uploads_dir . '/' . $filename)) |
|
| 1265 | + unlink($uploads_dir . '/' . $filename); |
|
| 1266 | + } |
|
| 1267 | + |
|
| 1268 | + } // endif |
|
| 1269 | + // Unlink all past images of post end |
|
| 1270 | + } |
|
| 1271 | 1271 | } |
| 1272 | 1272 | |
| 1273 | 1273 | if (!function_exists('geodir_get_featured_image')) {
|
| 1274 | - /** |
|
| 1275 | - * Gets the post featured image. |
|
| 1276 | - * |
|
| 1277 | - * @since 1.0.0 |
|
| 1278 | - * @package GeoDirectory |
|
| 1279 | - * @global object $wpdb WordPress Database object. |
|
| 1280 | - * @global object $post The current post object. |
|
| 1281 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 1282 | - * @param int|string $post_id The post ID. |
|
| 1283 | - * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1284 | - * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1285 | - * @param bool|string $file Optional. The file path from which you want to get the image details. Default: false. |
|
| 1286 | - * @return bool|object Image details as an object. |
|
| 1287 | - */ |
|
| 1288 | - function geodir_get_featured_image($post_id = '', $size = '', $no_image = false, $file = false) |
|
| 1289 | - {
|
|
| 1290 | - |
|
| 1291 | - /*$img_arr['src'] = get_the_post_thumbnail_url( $post_id, 'medium');//medium/thumbnail |
|
| 1274 | + /** |
|
| 1275 | + * Gets the post featured image. |
|
| 1276 | + * |
|
| 1277 | + * @since 1.0.0 |
|
| 1278 | + * @package GeoDirectory |
|
| 1279 | + * @global object $wpdb WordPress Database object. |
|
| 1280 | + * @global object $post The current post object. |
|
| 1281 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 1282 | + * @param int|string $post_id The post ID. |
|
| 1283 | + * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1284 | + * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1285 | + * @param bool|string $file Optional. The file path from which you want to get the image details. Default: false. |
|
| 1286 | + * @return bool|object Image details as an object. |
|
| 1287 | + */ |
|
| 1288 | + function geodir_get_featured_image($post_id = '', $size = '', $no_image = false, $file = false) |
|
| 1289 | + {
|
|
| 1290 | + |
|
| 1291 | + /*$img_arr['src'] = get_the_post_thumbnail_url( $post_id, 'medium');//medium/thumbnail |
|
| 1292 | 1292 | $img_arr['path'] = ''; |
| 1293 | 1293 | $img_arr['width'] = ''; |
| 1294 | 1294 | $img_arr['height'] = ''; |
| 1295 | 1295 | $img_arr['title'] = ''; |
| 1296 | 1296 | return (object)$img_arr;*/ |
| 1297 | - global $wpdb, $plugin_prefix, $post; |
|
| 1297 | + global $wpdb, $plugin_prefix, $post; |
|
| 1298 | 1298 | |
| 1299 | - if (isset($post->ID) && isset($post->post_type) && $post->ID == $post_id) {
|
|
| 1300 | - $post_type = $post->post_type; |
|
| 1301 | - } else {
|
|
| 1302 | - $post_type = get_post_type($post_id); |
|
| 1303 | - } |
|
| 1299 | + if (isset($post->ID) && isset($post->post_type) && $post->ID == $post_id) {
|
|
| 1300 | + $post_type = $post->post_type; |
|
| 1301 | + } else {
|
|
| 1302 | + $post_type = get_post_type($post_id); |
|
| 1303 | + } |
|
| 1304 | 1304 | |
| 1305 | - if (!in_array($post_type, geodir_get_posttypes())) {
|
|
| 1306 | - return false;// if not a GD CPT return; |
|
| 1307 | - } |
|
| 1305 | + if (!in_array($post_type, geodir_get_posttypes())) {
|
|
| 1306 | + return false;// if not a GD CPT return; |
|
| 1307 | + } |
|
| 1308 | 1308 | |
| 1309 | 1309 | |
| 1310 | - $list_img_size = get_option('geodir_listing_img_size','default');
|
|
| 1310 | + $list_img_size = get_option('geodir_listing_img_size','default');
|
|
| 1311 | 1311 | |
| 1312 | - if( $size=='list-thumb' && $list_img_size != 'default' ){
|
|
| 1313 | - $fimg = get_the_post_thumbnail_url($post_id,$list_img_size); |
|
| 1314 | - if($fimg){
|
|
| 1315 | - $uploads = wp_upload_dir(); |
|
| 1316 | - $uploads_baseurl = $uploads['baseurl']; |
|
| 1317 | - $file = str_replace($uploads_baseurl,'',$fimg); |
|
| 1318 | - } |
|
| 1319 | - } |
|
| 1312 | + if( $size=='list-thumb' && $list_img_size != 'default' ){
|
|
| 1313 | + $fimg = get_the_post_thumbnail_url($post_id,$list_img_size); |
|
| 1314 | + if($fimg){
|
|
| 1315 | + $uploads = wp_upload_dir(); |
|
| 1316 | + $uploads_baseurl = $uploads['baseurl']; |
|
| 1317 | + $file = str_replace($uploads_baseurl,'',$fimg); |
|
| 1318 | + } |
|
| 1319 | + } |
|
| 1320 | 1320 | |
| 1321 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1321 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1322 | 1322 | |
| 1323 | - if (!$file) {
|
|
| 1324 | - if (isset($post->featured_image)) {
|
|
| 1325 | - $file = $post->featured_image; |
|
| 1326 | - } else {
|
|
| 1327 | - $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));
|
|
| 1328 | - } |
|
| 1329 | - } |
|
| 1323 | + if (!$file) {
|
|
| 1324 | + if (isset($post->featured_image)) {
|
|
| 1325 | + $file = $post->featured_image; |
|
| 1326 | + } else {
|
|
| 1327 | + $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));
|
|
| 1328 | + } |
|
| 1329 | + } |
|
| 1330 | 1330 | |
| 1331 | - if ($file != NULL && $file != '' && (($uploads = wp_upload_dir()) && false === $uploads['error'])) {
|
|
| 1332 | - $img_arr = array(); |
|
| 1331 | + if ($file != NULL && $file != '' && (($uploads = wp_upload_dir()) && false === $uploads['error'])) {
|
|
| 1332 | + $img_arr = array(); |
|
| 1333 | 1333 | |
| 1334 | - $file_info = pathinfo($file); |
|
| 1335 | - $sub_dir = ''; |
|
| 1336 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
|
|
| 1337 | - $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 1338 | - } |
|
| 1334 | + $file_info = pathinfo($file); |
|
| 1335 | + $sub_dir = ''; |
|
| 1336 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
|
|
| 1337 | + $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 1338 | + } |
|
| 1339 | 1339 | |
| 1340 | - $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 1341 | - $uploads_baseurl = $uploads['baseurl']; |
|
| 1342 | - $uploads_path = $uploads['path']; |
|
| 1340 | + $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 1341 | + $uploads_baseurl = $uploads['baseurl']; |
|
| 1342 | + $uploads_path = $uploads['path']; |
|
| 1343 | 1343 | |
| 1344 | - $file_name = $file_info['basename']; |
|
| 1344 | + $file_name = $file_info['basename']; |
|
| 1345 | 1345 | |
| 1346 | - $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1347 | - /* |
|
| 1346 | + $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1347 | + /* |
|
| 1348 | 1348 | * Allows the filter of image src for such things as CDN change. |
| 1349 | 1349 | * |
| 1350 | 1350 | * @since 1.5.7 |
@@ -1353,158 +1353,158 @@ discard block |
||
| 1353 | 1353 | * @param string $uploads_url The server upload directory url. |
| 1354 | 1354 | * @param string $uploads_baseurl The uploads dir base url. |
| 1355 | 1355 | */ |
| 1356 | - $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1357 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1358 | - $width = 0; |
|
| 1359 | - $height = 0; |
|
| 1360 | - if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1361 | - $imagesize = getimagesize($img_arr['path']); |
|
| 1362 | - $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1363 | - $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1364 | - } |
|
| 1365 | - $img_arr['width'] = $width; |
|
| 1366 | - $img_arr['height'] = $height; |
|
| 1367 | - $img_arr['title'] = $post->post_title; |
|
| 1368 | - } elseif ($post_images = geodir_get_images($post_id, $size, $no_image, 1)) {
|
|
| 1369 | - foreach ($post_images as $image) {
|
|
| 1370 | - return $image; |
|
| 1371 | - } |
|
| 1372 | - } else if ($no_image) {
|
|
| 1373 | - $img_arr = array(); |
|
| 1374 | - |
|
| 1375 | - $default_img = ''; |
|
| 1376 | - if (isset($post->default_category) && $post->default_category) {
|
|
| 1377 | - $default_cat = $post->default_category; |
|
| 1378 | - } else {
|
|
| 1379 | - $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1380 | - } |
|
| 1381 | - |
|
| 1382 | - if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) |
|
| 1383 | - $default_img = $default_catimg['src']; |
|
| 1384 | - elseif ($no_image) {
|
|
| 1385 | - $default_img = get_option('geodir_listing_no_img');
|
|
| 1386 | - } |
|
| 1387 | - |
|
| 1388 | - if (!empty($default_img)) {
|
|
| 1389 | - $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 1390 | - $uploads_baseurl = $uploads['baseurl']; |
|
| 1391 | - $uploads_path = $uploads['path']; |
|
| 1392 | - |
|
| 1393 | - $img_arr = array(); |
|
| 1394 | - |
|
| 1395 | - $file_info = pathinfo($default_img); |
|
| 1396 | - |
|
| 1397 | - $file_name = $file_info['basename']; |
|
| 1398 | - |
|
| 1399 | - $img_arr['src'] = $default_img; |
|
| 1400 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1401 | - |
|
| 1402 | - $width = 0; |
|
| 1403 | - $height = 0; |
|
| 1404 | - if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1405 | - $imagesize = getimagesize($img_arr['path']); |
|
| 1406 | - $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1407 | - $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1408 | - } |
|
| 1409 | - $img_arr['width'] = $width; |
|
| 1410 | - $img_arr['height'] = $height; |
|
| 1411 | - |
|
| 1412 | - $img_arr['title'] = $post->post_title; // add the title to the array |
|
| 1413 | - } |
|
| 1414 | - } |
|
| 1415 | - |
|
| 1416 | - if (!empty($img_arr)) |
|
| 1417 | - return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path ); |
|
| 1418 | - else |
|
| 1419 | - return false; |
|
| 1420 | - } |
|
| 1356 | + $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1357 | + $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1358 | + $width = 0; |
|
| 1359 | + $height = 0; |
|
| 1360 | + if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1361 | + $imagesize = getimagesize($img_arr['path']); |
|
| 1362 | + $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1363 | + $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1364 | + } |
|
| 1365 | + $img_arr['width'] = $width; |
|
| 1366 | + $img_arr['height'] = $height; |
|
| 1367 | + $img_arr['title'] = $post->post_title; |
|
| 1368 | + } elseif ($post_images = geodir_get_images($post_id, $size, $no_image, 1)) {
|
|
| 1369 | + foreach ($post_images as $image) {
|
|
| 1370 | + return $image; |
|
| 1371 | + } |
|
| 1372 | + } else if ($no_image) {
|
|
| 1373 | + $img_arr = array(); |
|
| 1374 | + |
|
| 1375 | + $default_img = ''; |
|
| 1376 | + if (isset($post->default_category) && $post->default_category) {
|
|
| 1377 | + $default_cat = $post->default_category; |
|
| 1378 | + } else {
|
|
| 1379 | + $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1380 | + } |
|
| 1381 | + |
|
| 1382 | + if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) |
|
| 1383 | + $default_img = $default_catimg['src']; |
|
| 1384 | + elseif ($no_image) {
|
|
| 1385 | + $default_img = get_option('geodir_listing_no_img');
|
|
| 1386 | + } |
|
| 1387 | + |
|
| 1388 | + if (!empty($default_img)) {
|
|
| 1389 | + $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 1390 | + $uploads_baseurl = $uploads['baseurl']; |
|
| 1391 | + $uploads_path = $uploads['path']; |
|
| 1392 | + |
|
| 1393 | + $img_arr = array(); |
|
| 1394 | + |
|
| 1395 | + $file_info = pathinfo($default_img); |
|
| 1396 | + |
|
| 1397 | + $file_name = $file_info['basename']; |
|
| 1398 | + |
|
| 1399 | + $img_arr['src'] = $default_img; |
|
| 1400 | + $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1401 | + |
|
| 1402 | + $width = 0; |
|
| 1403 | + $height = 0; |
|
| 1404 | + if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1405 | + $imagesize = getimagesize($img_arr['path']); |
|
| 1406 | + $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1407 | + $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1408 | + } |
|
| 1409 | + $img_arr['width'] = $width; |
|
| 1410 | + $img_arr['height'] = $height; |
|
| 1411 | + |
|
| 1412 | + $img_arr['title'] = $post->post_title; // add the title to the array |
|
| 1413 | + } |
|
| 1414 | + } |
|
| 1415 | + |
|
| 1416 | + if (!empty($img_arr)) |
|
| 1417 | + return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path ); |
|
| 1418 | + else |
|
| 1419 | + return false; |
|
| 1420 | + } |
|
| 1421 | 1421 | } |
| 1422 | 1422 | |
| 1423 | 1423 | if (!function_exists('geodir_show_featured_image')) {
|
| 1424 | - /** |
|
| 1425 | - * Gets the post featured image. |
|
| 1426 | - * |
|
| 1427 | - * @since 1.0.0 |
|
| 1428 | - * @package GeoDirectory |
|
| 1429 | - * @param int|string $post_id The post ID. |
|
| 1430 | - * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1431 | - * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1432 | - * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true. |
|
| 1433 | - * @param bool|string $fimage Optional. The file path from which you want to get the image details. Default: false. |
|
| 1434 | - * @return bool|string Returns image html. |
|
| 1435 | - */ |
|
| 1436 | - function geodir_show_featured_image($post_id = '', $size = 'thumbnail', $no_image = false, $echo = true, $fimage = false) |
|
| 1437 | - {
|
|
| 1438 | - $image = geodir_get_featured_image($post_id, $size, $no_image, $fimage); |
|
| 1439 | - |
|
| 1440 | - $html = geodir_show_image($image, $size, $no_image, false); |
|
| 1441 | - |
|
| 1442 | - if (!empty($html) && $echo) {
|
|
| 1443 | - echo $html; |
|
| 1444 | - } elseif (!empty($html)) {
|
|
| 1445 | - return $html; |
|
| 1446 | - } else |
|
| 1447 | - return false; |
|
| 1448 | - } |
|
| 1424 | + /** |
|
| 1425 | + * Gets the post featured image. |
|
| 1426 | + * |
|
| 1427 | + * @since 1.0.0 |
|
| 1428 | + * @package GeoDirectory |
|
| 1429 | + * @param int|string $post_id The post ID. |
|
| 1430 | + * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1431 | + * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1432 | + * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true. |
|
| 1433 | + * @param bool|string $fimage Optional. The file path from which you want to get the image details. Default: false. |
|
| 1434 | + * @return bool|string Returns image html. |
|
| 1435 | + */ |
|
| 1436 | + function geodir_show_featured_image($post_id = '', $size = 'thumbnail', $no_image = false, $echo = true, $fimage = false) |
|
| 1437 | + {
|
|
| 1438 | + $image = geodir_get_featured_image($post_id, $size, $no_image, $fimage); |
|
| 1439 | + |
|
| 1440 | + $html = geodir_show_image($image, $size, $no_image, false); |
|
| 1441 | + |
|
| 1442 | + if (!empty($html) && $echo) {
|
|
| 1443 | + echo $html; |
|
| 1444 | + } elseif (!empty($html)) {
|
|
| 1445 | + return $html; |
|
| 1446 | + } else |
|
| 1447 | + return false; |
|
| 1448 | + } |
|
| 1449 | 1449 | } |
| 1450 | 1450 | |
| 1451 | 1451 | if (!function_exists('geodir_get_images')) {
|
| 1452 | - /** |
|
| 1453 | - * Gets the post images. |
|
| 1454 | - * |
|
| 1455 | - * @since 1.0.0 |
|
| 1456 | - * @package GeoDirectory |
|
| 1457 | - * @global object $wpdb WordPress Database object. |
|
| 1458 | - * @param int $post_id The post ID. |
|
| 1459 | - * @param string $img_size Optional. Thumbnail size. |
|
| 1460 | - * @param bool $no_images Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1461 | - * @param bool $add_featured Optional. Do you want to include featured images too? Default: true. |
|
| 1462 | - * @param int|string $limit Optional. Number of images. |
|
| 1463 | - * @return array|bool Returns images as an array. Each item is an object. |
|
| 1464 | - */ |
|
| 1465 | - function geodir_get_images($post_id = 0, $img_size = '', $no_images = false, $add_featured = true, $limit = '') |
|
| 1466 | - {
|
|
| 1467 | - global $wpdb; |
|
| 1468 | - if ($limit) {
|
|
| 1469 | - $limit_q = " LIMIT $limit "; |
|
| 1470 | - } else {
|
|
| 1471 | - $limit_q = ''; |
|
| 1472 | - } |
|
| 1473 | - $not_featured = ''; |
|
| 1474 | - $sub_dir = ''; |
|
| 1475 | - if (!$add_featured) |
|
| 1476 | - $not_featured = " AND is_featured = 0 "; |
|
| 1477 | - |
|
| 1478 | - $arrImages = $wpdb->get_results( |
|
| 1479 | - $wpdb->prepare( |
|
| 1480 | - "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ", |
|
| 1481 | - array('%image%', $post_id)
|
|
| 1482 | - ) |
|
| 1483 | - ); |
|
| 1484 | - |
|
| 1485 | - $counter = 0; |
|
| 1486 | - $return_arr = array(); |
|
| 1487 | - |
|
| 1488 | - if (!empty($arrImages)) {
|
|
| 1489 | - foreach ($arrImages as $attechment) {
|
|
| 1490 | - |
|
| 1491 | - $img_arr = array(); |
|
| 1492 | - $img_arr['id'] = $attechment->ID; |
|
| 1493 | - $img_arr['user_id'] = isset($attechment->user_id) ? $attechment->user_id : 0; |
|
| 1494 | - |
|
| 1495 | - $file_info = pathinfo($attechment->file); |
|
| 1496 | - |
|
| 1497 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 1498 | - $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 1499 | - |
|
| 1500 | - $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 1501 | - $uploads_baseurl = $uploads['baseurl']; |
|
| 1502 | - $uploads_path = $uploads['path']; |
|
| 1503 | - |
|
| 1504 | - $file_name = $file_info['basename']; |
|
| 1505 | - |
|
| 1506 | - $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1507 | - /* |
|
| 1452 | + /** |
|
| 1453 | + * Gets the post images. |
|
| 1454 | + * |
|
| 1455 | + * @since 1.0.0 |
|
| 1456 | + * @package GeoDirectory |
|
| 1457 | + * @global object $wpdb WordPress Database object. |
|
| 1458 | + * @param int $post_id The post ID. |
|
| 1459 | + * @param string $img_size Optional. Thumbnail size. |
|
| 1460 | + * @param bool $no_images Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1461 | + * @param bool $add_featured Optional. Do you want to include featured images too? Default: true. |
|
| 1462 | + * @param int|string $limit Optional. Number of images. |
|
| 1463 | + * @return array|bool Returns images as an array. Each item is an object. |
|
| 1464 | + */ |
|
| 1465 | + function geodir_get_images($post_id = 0, $img_size = '', $no_images = false, $add_featured = true, $limit = '') |
|
| 1466 | + {
|
|
| 1467 | + global $wpdb; |
|
| 1468 | + if ($limit) {
|
|
| 1469 | + $limit_q = " LIMIT $limit "; |
|
| 1470 | + } else {
|
|
| 1471 | + $limit_q = ''; |
|
| 1472 | + } |
|
| 1473 | + $not_featured = ''; |
|
| 1474 | + $sub_dir = ''; |
|
| 1475 | + if (!$add_featured) |
|
| 1476 | + $not_featured = " AND is_featured = 0 "; |
|
| 1477 | + |
|
| 1478 | + $arrImages = $wpdb->get_results( |
|
| 1479 | + $wpdb->prepare( |
|
| 1480 | + "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ", |
|
| 1481 | + array('%image%', $post_id)
|
|
| 1482 | + ) |
|
| 1483 | + ); |
|
| 1484 | + |
|
| 1485 | + $counter = 0; |
|
| 1486 | + $return_arr = array(); |
|
| 1487 | + |
|
| 1488 | + if (!empty($arrImages)) {
|
|
| 1489 | + foreach ($arrImages as $attechment) {
|
|
| 1490 | + |
|
| 1491 | + $img_arr = array(); |
|
| 1492 | + $img_arr['id'] = $attechment->ID; |
|
| 1493 | + $img_arr['user_id'] = isset($attechment->user_id) ? $attechment->user_id : 0; |
|
| 1494 | + |
|
| 1495 | + $file_info = pathinfo($attechment->file); |
|
| 1496 | + |
|
| 1497 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 1498 | + $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 1499 | + |
|
| 1500 | + $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 1501 | + $uploads_baseurl = $uploads['baseurl']; |
|
| 1502 | + $uploads_path = $uploads['path']; |
|
| 1503 | + |
|
| 1504 | + $file_name = $file_info['basename']; |
|
| 1505 | + |
|
| 1506 | + $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1507 | + /* |
|
| 1508 | 1508 | * Allows the filter of image src for such things as CDN change. |
| 1509 | 1509 | * |
| 1510 | 1510 | * @since 1.5.7 |
@@ -1513,532 +1513,532 @@ discard block |
||
| 1513 | 1513 | * @param string $uploads_url The server upload directory url. |
| 1514 | 1514 | * @param string $uploads_baseurl The uploads dir base url. |
| 1515 | 1515 | */ |
| 1516 | - $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1517 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1518 | - $width = 0; |
|
| 1519 | - $height = 0; |
|
| 1520 | - if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1521 | - $imagesize = getimagesize($img_arr['path']); |
|
| 1522 | - $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1523 | - $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1524 | - } |
|
| 1525 | - $img_arr['width'] = $width; |
|
| 1526 | - $img_arr['height'] = $height; |
|
| 1527 | - |
|
| 1528 | - $img_arr['file'] = $file_name; // add the title to the array |
|
| 1529 | - $img_arr['title'] = $attechment->title; // add the title to the array |
|
| 1530 | - $img_arr['caption'] = isset($attechment->caption) ? $attechment->caption : ''; // add the caption to the array |
|
| 1531 | - $img_arr['content'] = $attechment->content; // add the description to the array |
|
| 1532 | - $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1. |
|
| 1533 | - |
|
| 1534 | - $return_arr[] = (object)$img_arr; |
|
| 1535 | - |
|
| 1536 | - $counter++; |
|
| 1537 | - } |
|
| 1538 | - //return (object)$return_arr; |
|
| 1539 | - /** |
|
| 1540 | - * Filter the images array so things can be changed. |
|
| 1541 | - * |
|
| 1542 | - * @since 1.6.20 |
|
| 1543 | - * @param array $return_arr The array of image objects. |
|
| 1544 | - */ |
|
| 1545 | - return apply_filters('geodir_get_images_arr',$return_arr);
|
|
| 1546 | - } else if ($no_images) {
|
|
| 1547 | - $default_img = ''; |
|
| 1548 | - $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1549 | - $post_type = get_post_type($post_id); |
|
| 1550 | - if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) |
|
| 1551 | - $default_img = $default_catimg['src']; |
|
| 1552 | - elseif ($no_images) {
|
|
| 1553 | - $default_img = get_option('geodir_listing_no_img');
|
|
| 1554 | - } |
|
| 1555 | - |
|
| 1556 | - if (!empty($default_img)) {
|
|
| 1557 | - $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 1516 | + $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1517 | + $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1518 | + $width = 0; |
|
| 1519 | + $height = 0; |
|
| 1520 | + if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1521 | + $imagesize = getimagesize($img_arr['path']); |
|
| 1522 | + $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1523 | + $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1524 | + } |
|
| 1525 | + $img_arr['width'] = $width; |
|
| 1526 | + $img_arr['height'] = $height; |
|
| 1527 | + |
|
| 1528 | + $img_arr['file'] = $file_name; // add the title to the array |
|
| 1529 | + $img_arr['title'] = $attechment->title; // add the title to the array |
|
| 1530 | + $img_arr['caption'] = isset($attechment->caption) ? $attechment->caption : ''; // add the caption to the array |
|
| 1531 | + $img_arr['content'] = $attechment->content; // add the description to the array |
|
| 1532 | + $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1. |
|
| 1533 | + |
|
| 1534 | + $return_arr[] = (object)$img_arr; |
|
| 1535 | + |
|
| 1536 | + $counter++; |
|
| 1537 | + } |
|
| 1538 | + //return (object)$return_arr; |
|
| 1539 | + /** |
|
| 1540 | + * Filter the images array so things can be changed. |
|
| 1541 | + * |
|
| 1542 | + * @since 1.6.20 |
|
| 1543 | + * @param array $return_arr The array of image objects. |
|
| 1544 | + */ |
|
| 1545 | + return apply_filters('geodir_get_images_arr',$return_arr);
|
|
| 1546 | + } else if ($no_images) {
|
|
| 1547 | + $default_img = ''; |
|
| 1548 | + $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1549 | + $post_type = get_post_type($post_id); |
|
| 1550 | + if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) |
|
| 1551 | + $default_img = $default_catimg['src']; |
|
| 1552 | + elseif ($no_images) {
|
|
| 1553 | + $default_img = get_option('geodir_listing_no_img');
|
|
| 1554 | + } |
|
| 1555 | + |
|
| 1556 | + if (!empty($default_img)) {
|
|
| 1557 | + $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 1558 | 1558 | |
| 1559 | - $image_path = $default_img; |
|
| 1560 | - if (!path_is_absolute($image_path)) {
|
|
| 1561 | - $image_path = str_replace($uploads['baseurl'], $uploads['basedir'], $image_path); |
|
| 1562 | - } |
|
| 1563 | - |
|
| 1564 | - $file_info = pathinfo($default_img); |
|
| 1565 | - $file_name = $file_info['basename']; |
|
| 1566 | - |
|
| 1567 | - $width = ''; |
|
| 1568 | - $height = ''; |
|
| 1569 | - if (is_file($image_path) && file_exists($image_path)) {
|
|
| 1570 | - $imagesize = getimagesize($image_path); |
|
| 1571 | - $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1572 | - $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1573 | - } |
|
| 1559 | + $image_path = $default_img; |
|
| 1560 | + if (!path_is_absolute($image_path)) {
|
|
| 1561 | + $image_path = str_replace($uploads['baseurl'], $uploads['basedir'], $image_path); |
|
| 1562 | + } |
|
| 1563 | + |
|
| 1564 | + $file_info = pathinfo($default_img); |
|
| 1565 | + $file_name = $file_info['basename']; |
|
| 1566 | + |
|
| 1567 | + $width = ''; |
|
| 1568 | + $height = ''; |
|
| 1569 | + if (is_file($image_path) && file_exists($image_path)) {
|
|
| 1570 | + $imagesize = getimagesize($image_path); |
|
| 1571 | + $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1572 | + $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1573 | + } |
|
| 1574 | 1574 | |
| 1575 | - $img_arr = array(); |
|
| 1576 | - $img_arr['src'] = $default_img; |
|
| 1577 | - $img_arr['path'] = $image_path; |
|
| 1578 | - $img_arr['width'] = $width; |
|
| 1579 | - $img_arr['height'] = $height; |
|
| 1580 | - $img_arr['file'] = $file_name; // add the title to the array |
|
| 1581 | - $img_arr['title'] = $file_info['filename']; // add the title to the array |
|
| 1582 | - $img_arr['content'] = $file_info['filename']; // add the description to the array |
|
| 1583 | - |
|
| 1584 | - $return_arr[] = (object)$img_arr; |
|
| 1585 | - |
|
| 1586 | - /** |
|
| 1587 | - * Filter the images array so things can be changed. |
|
| 1588 | - * |
|
| 1589 | - * @since 1.6.20 |
|
| 1590 | - * @param array $return_arr The array of image objects. |
|
| 1591 | - */ |
|
| 1592 | - return apply_filters('geodir_get_images_arr',$return_arr);
|
|
| 1593 | - } else |
|
| 1594 | - return false; |
|
| 1595 | - } |
|
| 1596 | - } |
|
| 1575 | + $img_arr = array(); |
|
| 1576 | + $img_arr['src'] = $default_img; |
|
| 1577 | + $img_arr['path'] = $image_path; |
|
| 1578 | + $img_arr['width'] = $width; |
|
| 1579 | + $img_arr['height'] = $height; |
|
| 1580 | + $img_arr['file'] = $file_name; // add the title to the array |
|
| 1581 | + $img_arr['title'] = $file_info['filename']; // add the title to the array |
|
| 1582 | + $img_arr['content'] = $file_info['filename']; // add the description to the array |
|
| 1583 | + |
|
| 1584 | + $return_arr[] = (object)$img_arr; |
|
| 1585 | + |
|
| 1586 | + /** |
|
| 1587 | + * Filter the images array so things can be changed. |
|
| 1588 | + * |
|
| 1589 | + * @since 1.6.20 |
|
| 1590 | + * @param array $return_arr The array of image objects. |
|
| 1591 | + */ |
|
| 1592 | + return apply_filters('geodir_get_images_arr',$return_arr);
|
|
| 1593 | + } else |
|
| 1594 | + return false; |
|
| 1595 | + } |
|
| 1596 | + } |
|
| 1597 | 1597 | } |
| 1598 | 1598 | |
| 1599 | 1599 | if (!function_exists('geodir_show_image')) {
|
| 1600 | - /** |
|
| 1601 | - * Show image using image details. |
|
| 1602 | - * |
|
| 1603 | - * @since 1.0.0 |
|
| 1604 | - * @package GeoDirectory |
|
| 1605 | - * @param array|object $request Image info either as an array or object. |
|
| 1606 | - * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1607 | - * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1608 | - * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true. |
|
| 1609 | - * @return bool|string Returns image html. |
|
| 1610 | - */ |
|
| 1611 | - function geodir_show_image($request = array(), $size = 'thumbnail', $no_image = false, $echo = true) |
|
| 1612 | - {
|
|
| 1613 | - $image = new stdClass(); |
|
| 1614 | - |
|
| 1615 | - $html = ''; |
|
| 1616 | - if (!empty($request)) {
|
|
| 1617 | - if (!is_object($request)){
|
|
| 1618 | - $request = (object)$request; |
|
| 1619 | - } |
|
| 1620 | - |
|
| 1621 | - if (isset($request->src) && !isset($request->path)) {
|
|
| 1622 | - $request->path = $request->src; |
|
| 1623 | - } |
|
| 1624 | - |
|
| 1625 | - /* |
|
| 1600 | + /** |
|
| 1601 | + * Show image using image details. |
|
| 1602 | + * |
|
| 1603 | + * @since 1.0.0 |
|
| 1604 | + * @package GeoDirectory |
|
| 1605 | + * @param array|object $request Image info either as an array or object. |
|
| 1606 | + * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1607 | + * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1608 | + * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true. |
|
| 1609 | + * @return bool|string Returns image html. |
|
| 1610 | + */ |
|
| 1611 | + function geodir_show_image($request = array(), $size = 'thumbnail', $no_image = false, $echo = true) |
|
| 1612 | + {
|
|
| 1613 | + $image = new stdClass(); |
|
| 1614 | + |
|
| 1615 | + $html = ''; |
|
| 1616 | + if (!empty($request)) {
|
|
| 1617 | + if (!is_object($request)){
|
|
| 1618 | + $request = (object)$request; |
|
| 1619 | + } |
|
| 1620 | + |
|
| 1621 | + if (isset($request->src) && !isset($request->path)) {
|
|
| 1622 | + $request->path = $request->src; |
|
| 1623 | + } |
|
| 1624 | + |
|
| 1625 | + /* |
|
| 1626 | 1626 | * getimagesize() works faster from path than url so we try and get path if we can. |
| 1627 | 1627 | */ |
| 1628 | - $upload_dir = wp_upload_dir(); |
|
| 1629 | - $img_no_http = str_replace(array("http://", "https://"), "", $request->path);
|
|
| 1630 | - $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);
|
|
| 1631 | - if (strpos($img_no_http, $upload_no_http) !== false) {
|
|
| 1632 | - $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path); |
|
| 1633 | - } |
|
| 1628 | + $upload_dir = wp_upload_dir(); |
|
| 1629 | + $img_no_http = str_replace(array("http://", "https://"), "", $request->path);
|
|
| 1630 | + $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);
|
|
| 1631 | + if (strpos($img_no_http, $upload_no_http) !== false) {
|
|
| 1632 | + $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path); |
|
| 1633 | + } |
|
| 1634 | 1634 | |
| 1635 | - $width = 0; |
|
| 1636 | - $height = 0; |
|
| 1637 | - if (is_file($request->path) && file_exists($request->path)) {
|
|
| 1638 | - $imagesize = getimagesize($request->path); |
|
| 1639 | - $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1640 | - $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1641 | - } |
|
| 1642 | - |
|
| 1643 | - |
|
| 1644 | - $image->src = $request->src; |
|
| 1645 | - $image->width = $width; |
|
| 1646 | - $image->height = $height; |
|
| 1647 | - $image->title = isset($request->title) ? $request->title : ''; |
|
| 1648 | - |
|
| 1649 | - $max_size = (object)geodir_get_imagesize($size); |
|
| 1650 | - |
|
| 1651 | - if (!is_wp_error($max_size)) {
|
|
| 1652 | - if ($image->width) {
|
|
| 1653 | - if ($image->height >= $image->width) {
|
|
| 1654 | - $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2); |
|
| 1655 | - } else if ($image->width < ($max_size->h)) {
|
|
| 1656 | - $width_per = round((($image->width / $max_size->w) * 100), 2); |
|
| 1657 | - } else |
|
| 1658 | - $width_per = 100; |
|
| 1659 | - } |
|
| 1660 | - |
|
| 1661 | - if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
|
|
| 1662 | - $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '" /></div>'; |
|
| 1663 | - } else {
|
|
| 1664 | - if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
|
|
| 1665 | - $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');" title="'.$image->title.'" aria-label="'.$image->title.'" ></div>'; |
|
| 1666 | - }else{
|
|
| 1667 | - $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" title="'.$image->title.'" aria-label="'.$image->title.'"></div>';
|
|
| 1668 | - } |
|
| 1669 | - |
|
| 1670 | - } |
|
| 1671 | - } |
|
| 1672 | - } |
|
| 1673 | - |
|
| 1674 | - if (!empty($html) && $echo) {
|
|
| 1675 | - echo $html; |
|
| 1676 | - } elseif (!empty($html)) {
|
|
| 1677 | - return $html; |
|
| 1678 | - } else |
|
| 1679 | - return false; |
|
| 1680 | - } |
|
| 1681 | -} |
|
| 1635 | + $width = 0; |
|
| 1636 | + $height = 0; |
|
| 1637 | + if (is_file($request->path) && file_exists($request->path)) {
|
|
| 1638 | + $imagesize = getimagesize($request->path); |
|
| 1639 | + $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1640 | + $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1641 | + } |
|
| 1682 | 1642 | |
| 1683 | -if (!function_exists('geodir_set_post_terms')) {
|
|
| 1684 | - /** |
|
| 1685 | - * Set post Categories. |
|
| 1686 | - * |
|
| 1687 | - * @since 1.0.0 |
|
| 1688 | - * @package GeoDirectory |
|
| 1689 | - * @global object $wpdb WordPress Database object. |
|
| 1690 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 1691 | - * @param int $post_id The post ID. |
|
| 1692 | - * @param array $terms An array of term objects. |
|
| 1693 | - * @param array $tt_ids An array of term taxonomy IDs. |
|
| 1694 | - * @param string $taxonomy Taxonomy slug. |
|
| 1695 | - */ |
|
| 1696 | - function geodir_set_post_terms($post_id, $terms, $tt_ids, $taxonomy) |
|
| 1697 | - {
|
|
| 1698 | - global $wpdb, $plugin_prefix; |
|
| 1699 | 1643 | |
| 1700 | - $post_type = get_post_type($post_id); |
|
| 1644 | + $image->src = $request->src; |
|
| 1645 | + $image->width = $width; |
|
| 1646 | + $image->height = $height; |
|
| 1647 | + $image->title = isset($request->title) ? $request->title : ''; |
|
| 1701 | 1648 | |
| 1702 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1649 | + $max_size = (object)geodir_get_imagesize($size); |
|
| 1703 | 1650 | |
| 1704 | - if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {
|
|
| 1651 | + if (!is_wp_error($max_size)) {
|
|
| 1652 | + if ($image->width) {
|
|
| 1653 | + if ($image->height >= $image->width) {
|
|
| 1654 | + $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2); |
|
| 1655 | + } else if ($image->width < ($max_size->h)) {
|
|
| 1656 | + $width_per = round((($image->width / $max_size->w) * 100), 2); |
|
| 1657 | + } else |
|
| 1658 | + $width_per = 100; |
|
| 1659 | + } |
|
| 1660 | + |
|
| 1661 | + if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
|
|
| 1662 | + $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '" /></div>'; |
|
| 1663 | + } else {
|
|
| 1664 | + if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
|
|
| 1665 | + $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');" title="'.$image->title.'" aria-label="'.$image->title.'" ></div>'; |
|
| 1666 | + }else{
|
|
| 1667 | + $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" title="'.$image->title.'" aria-label="'.$image->title.'"></div>';
|
|
| 1668 | + } |
|
| 1669 | + |
|
| 1670 | + } |
|
| 1671 | + } |
|
| 1672 | + } |
|
| 1673 | + |
|
| 1674 | + if (!empty($html) && $echo) {
|
|
| 1675 | + echo $html; |
|
| 1676 | + } elseif (!empty($html)) {
|
|
| 1677 | + return $html; |
|
| 1678 | + } else |
|
| 1679 | + return false; |
|
| 1680 | + } |
|
| 1681 | +} |
|
| 1705 | 1682 | |
| 1706 | - if ($taxonomy == $post_type . '_tags') {
|
|
| 1707 | - if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
|
| 1708 | - geodir_save_post_meta($post_id, 'post_tags', $terms); |
|
| 1709 | - } |
|
| 1710 | - } elseif ($taxonomy == $post_type . 'category') {
|
|
| 1711 | - $srcharr = array('"', '\\');
|
|
| 1712 | - $replarr = array(""", '');
|
|
| 1683 | +if (!function_exists('geodir_set_post_terms')) {
|
|
| 1684 | + /** |
|
| 1685 | + * Set post Categories. |
|
| 1686 | + * |
|
| 1687 | + * @since 1.0.0 |
|
| 1688 | + * @package GeoDirectory |
|
| 1689 | + * @global object $wpdb WordPress Database object. |
|
| 1690 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 1691 | + * @param int $post_id The post ID. |
|
| 1692 | + * @param array $terms An array of term objects. |
|
| 1693 | + * @param array $tt_ids An array of term taxonomy IDs. |
|
| 1694 | + * @param string $taxonomy Taxonomy slug. |
|
| 1695 | + */ |
|
| 1696 | + function geodir_set_post_terms($post_id, $terms, $tt_ids, $taxonomy) |
|
| 1697 | + {
|
|
| 1698 | + global $wpdb, $plugin_prefix; |
|
| 1699 | + |
|
| 1700 | + $post_type = get_post_type($post_id); |
|
| 1701 | + |
|
| 1702 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1703 | + |
|
| 1704 | + if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {
|
|
| 1705 | + |
|
| 1706 | + if ($taxonomy == $post_type . '_tags') {
|
|
| 1707 | + if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
|
| 1708 | + geodir_save_post_meta($post_id, 'post_tags', $terms); |
|
| 1709 | + } |
|
| 1710 | + } elseif ($taxonomy == $post_type . 'category') {
|
|
| 1711 | + $srcharr = array('"', '\\');
|
|
| 1712 | + $replarr = array(""", '');
|
|
| 1713 | 1713 | |
| 1714 | - $post_obj = get_post($post_id); |
|
| 1714 | + $post_obj = get_post($post_id); |
|
| 1715 | 1715 | |
| 1716 | - $cat_ids = array('0');
|
|
| 1717 | - if (is_array($tt_ids)) |
|
| 1718 | - $cat_ids = $tt_ids; |
|
| 1716 | + $cat_ids = array('0');
|
|
| 1717 | + if (is_array($tt_ids)) |
|
| 1718 | + $cat_ids = $tt_ids; |
|
| 1719 | 1719 | |
| 1720 | 1720 | |
| 1721 | - if (!empty($cat_ids)) {
|
|
| 1722 | - $cat_ids_array = $cat_ids; |
|
| 1723 | - $cat_ids_length = count($cat_ids_array); |
|
| 1724 | - $cat_ids_format = array_fill(0, $cat_ids_length, '%d'); |
|
| 1725 | - $format = implode(',', $cat_ids_format);
|
|
| 1721 | + if (!empty($cat_ids)) {
|
|
| 1722 | + $cat_ids_array = $cat_ids; |
|
| 1723 | + $cat_ids_length = count($cat_ids_array); |
|
| 1724 | + $cat_ids_format = array_fill(0, $cat_ids_length, '%d'); |
|
| 1725 | + $format = implode(',', $cat_ids_format);
|
|
| 1726 | 1726 | |
| 1727 | - $cat_ids_array_del = $cat_ids_array; |
|
| 1728 | - $cat_ids_array_del[] = $post_id; |
|
| 1727 | + $cat_ids_array_del = $cat_ids_array; |
|
| 1728 | + $cat_ids_array_del[] = $post_id; |
|
| 1729 | 1729 | |
| 1730 | - $wpdb->get_var( |
|
| 1731 | - $wpdb->prepare( |
|
| 1732 | - "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ", |
|
| 1733 | - $cat_ids_array_del |
|
| 1734 | - ) |
|
| 1735 | - ); |
|
| 1730 | + $wpdb->get_var( |
|
| 1731 | + $wpdb->prepare( |
|
| 1732 | + "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ", |
|
| 1733 | + $cat_ids_array_del |
|
| 1734 | + ) |
|
| 1735 | + ); |
|
| 1736 | 1736 | |
| 1737 | 1737 | |
| 1738 | - $post_term = $wpdb->get_col( |
|
| 1739 | - $wpdb->prepare( |
|
| 1740 | - "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id", |
|
| 1741 | - $cat_ids_array |
|
| 1742 | - ) |
|
| 1743 | - ); |
|
| 1738 | + $post_term = $wpdb->get_col( |
|
| 1739 | + $wpdb->prepare( |
|
| 1740 | + "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id", |
|
| 1741 | + $cat_ids_array |
|
| 1742 | + ) |
|
| 1743 | + ); |
|
| 1744 | 1744 | |
| 1745 | - } |
|
| 1745 | + } |
|
| 1746 | 1746 | |
| 1747 | - $post_marker_json = ''; |
|
| 1747 | + $post_marker_json = ''; |
|
| 1748 | 1748 | |
| 1749 | - if (!empty($post_term)): |
|
| 1749 | + if (!empty($post_term)): |
|
| 1750 | 1750 | |
| 1751 | - foreach ($post_term as $cat_id): |
|
| 1751 | + foreach ($post_term as $cat_id): |
|
| 1752 | 1752 | |
| 1753 | - $term_icon_url = geodir_get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type); |
|
| 1754 | - $term_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : ''; |
|
| 1753 | + $term_icon_url = geodir_get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type); |
|
| 1754 | + $term_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : ''; |
|
| 1755 | 1755 | |
| 1756 | - $post_title = $post_obj->title; |
|
| 1757 | - $title = str_replace($srcharr, $replarr, $post_title); |
|
| 1756 | + $post_title = $post_obj->title; |
|
| 1757 | + $title = str_replace($srcharr, $replarr, $post_title); |
|
| 1758 | 1758 | |
| 1759 | - $lat = geodir_get_post_meta($post_id, 'post_latitude', true); |
|
| 1760 | - $lng = geodir_get_post_meta($post_id, 'post_longitude', true); |
|
| 1759 | + $lat = geodir_get_post_meta($post_id, 'post_latitude', true); |
|
| 1760 | + $lng = geodir_get_post_meta($post_id, 'post_longitude', true); |
|
| 1761 | 1761 | |
| 1762 | - $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
|
|
| 1763 | - $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true); |
|
| 1762 | + $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
|
|
| 1763 | + $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true); |
|
| 1764 | 1764 | |
| 1765 | - $json = '{';
|
|
| 1766 | - $json .= '"id":"' . $post_id . '",'; |
|
| 1767 | - $json .= '"lat_pos": "' . $lat . '",'; |
|
| 1768 | - $json .= '"long_pos": "' . $lng . '",'; |
|
| 1769 | - $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",'; |
|
| 1770 | - $json .= '"icon":"' . $term_icon . '",'; |
|
| 1771 | - $json .= '"group":"catgroup' . $cat_id . '"'; |
|
| 1772 | - $json .= '}'; |
|
| 1765 | + $json = '{';
|
|
| 1766 | + $json .= '"id":"' . $post_id . '",'; |
|
| 1767 | + $json .= '"lat_pos": "' . $lat . '",'; |
|
| 1768 | + $json .= '"long_pos": "' . $lng . '",'; |
|
| 1769 | + $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",'; |
|
| 1770 | + $json .= '"icon":"' . $term_icon . '",'; |
|
| 1771 | + $json .= '"group":"catgroup' . $cat_id . '"'; |
|
| 1772 | + $json .= '}'; |
|
| 1773 | 1773 | |
| 1774 | 1774 | |
| 1775 | - if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true)) |
|
| 1776 | - $post_marker_json = $json; |
|
| 1775 | + if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true)) |
|
| 1776 | + $post_marker_json = $json; |
|
| 1777 | 1777 | |
| 1778 | 1778 | |
| 1779 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {
|
|
| 1779 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {
|
|
| 1780 | 1780 | |
| 1781 | - $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET
|
|
| 1781 | + $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET
|
|
| 1782 | 1782 | post_title = %s, |
| 1783 | 1783 | json = %s |
| 1784 | 1784 | WHERE post_id = %d AND cat_id = %d ", |
| 1785 | - array($post_title, $json, $post_id, $cat_id)); |
|
| 1785 | + array($post_title, $json, $post_id, $cat_id)); |
|
| 1786 | 1786 | |
| 1787 | - } else {
|
|
| 1787 | + } else {
|
|
| 1788 | 1788 | |
| 1789 | - $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET
|
|
| 1789 | + $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET
|
|
| 1790 | 1790 | post_id = %d, |
| 1791 | 1791 | post_title = %s, |
| 1792 | 1792 | cat_id = %d, |
| 1793 | 1793 | json = %s", |
| 1794 | - array($post_id, $post_title, $cat_id, $json)); |
|
| 1794 | + array($post_id, $post_title, $cat_id, $json)); |
|
| 1795 | 1795 | |
| 1796 | - } |
|
| 1796 | + } |
|
| 1797 | 1797 | |
| 1798 | - $wpdb->query($json_query); |
|
| 1798 | + $wpdb->query($json_query); |
|
| 1799 | 1799 | |
| 1800 | - endforeach; |
|
| 1800 | + endforeach; |
|
| 1801 | 1801 | |
| 1802 | - endif; |
|
| 1802 | + endif; |
|
| 1803 | 1803 | |
| 1804 | - if (!empty($post_term) && is_array($post_term)) {
|
|
| 1805 | - $categories = implode(',', $post_term);
|
|
| 1804 | + if (!empty($post_term) && is_array($post_term)) {
|
|
| 1805 | + $categories = implode(',', $post_term);
|
|
| 1806 | 1806 | |
| 1807 | - if ($categories != '' && $categories != 0) $categories = ',' . $categories . ','; |
|
| 1807 | + if ($categories != '' && $categories != 0) $categories = ',' . $categories . ','; |
|
| 1808 | 1808 | |
| 1809 | - if (empty($post_marker_json)) |
|
| 1810 | - $post_marker_json = isset($json) ? $json : ''; |
|
| 1809 | + if (empty($post_marker_json)) |
|
| 1810 | + $post_marker_json = isset($json) ? $json : ''; |
|
| 1811 | 1811 | |
| 1812 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 1812 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 1813 | 1813 | |
| 1814 | - $wpdb->query( |
|
| 1815 | - $wpdb->prepare( |
|
| 1816 | - "UPDATE " . $table . " SET |
|
| 1814 | + $wpdb->query( |
|
| 1815 | + $wpdb->prepare( |
|
| 1816 | + "UPDATE " . $table . " SET |
|
| 1817 | 1817 | " . $taxonomy . " = %s, |
| 1818 | 1818 | marker_json = %s |
| 1819 | 1819 | where post_id = %d", |
| 1820 | - array($categories, $post_marker_json, $post_id) |
|
| 1821 | - ) |
|
| 1822 | - ); |
|
| 1820 | + array($categories, $post_marker_json, $post_id) |
|
| 1821 | + ) |
|
| 1822 | + ); |
|
| 1823 | 1823 | |
| 1824 | - if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'inline-save') {
|
|
| 1824 | + if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'inline-save') {
|
|
| 1825 | 1825 | |
| 1826 | - $categories = trim($categories, ','); |
|
| 1826 | + $categories = trim($categories, ','); |
|
| 1827 | 1827 | |
| 1828 | - if ($categories) {
|
|
| 1828 | + if ($categories) {
|
|
| 1829 | 1829 | |
| 1830 | - $categories = explode(',', $categories);
|
|
| 1830 | + $categories = explode(',', $categories);
|
|
| 1831 | 1831 | |
| 1832 | - $default_category = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1832 | + $default_category = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1833 | 1833 | |
| 1834 | - if (!in_array($default_category, $categories)) {
|
|
| 1834 | + if (!in_array($default_category, $categories)) {
|
|
| 1835 | 1835 | |
| 1836 | - $wpdb->query( |
|
| 1837 | - $wpdb->prepare( |
|
| 1838 | - "UPDATE " . $table . " SET |
|
| 1836 | + $wpdb->query( |
|
| 1837 | + $wpdb->prepare( |
|
| 1838 | + "UPDATE " . $table . " SET |
|
| 1839 | 1839 | default_category = %s |
| 1840 | 1840 | where post_id = %d", |
| 1841 | - array($categories[0], $post_id) |
|
| 1842 | - ) |
|
| 1843 | - ); |
|
| 1841 | + array($categories[0], $post_id) |
|
| 1842 | + ) |
|
| 1843 | + ); |
|
| 1844 | 1844 | |
| 1845 | - $default_category = $categories[0]; |
|
| 1845 | + $default_category = $categories[0]; |
|
| 1846 | 1846 | |
| 1847 | - } |
|
| 1847 | + } |
|
| 1848 | 1848 | |
| 1849 | - if ($default_category == '') |
|
| 1850 | - $default_category = $categories[0]; |
|
| 1849 | + if ($default_category == '') |
|
| 1850 | + $default_category = $categories[0]; |
|
| 1851 | 1851 | |
| 1852 | - geodir_set_postcat_structure($post_id, $taxonomy, $default_category, ''); |
|
| 1852 | + geodir_set_postcat_structure($post_id, $taxonomy, $default_category, ''); |
|
| 1853 | 1853 | |
| 1854 | - } |
|
| 1854 | + } |
|
| 1855 | 1855 | |
| 1856 | - } |
|
| 1856 | + } |
|
| 1857 | 1857 | |
| 1858 | 1858 | |
| 1859 | - } else {
|
|
| 1859 | + } else {
|
|
| 1860 | 1860 | |
| 1861 | - $wpdb->query( |
|
| 1862 | - $wpdb->prepare( |
|
| 1863 | - "INSERT INTO " . $table . " SET |
|
| 1861 | + $wpdb->query( |
|
| 1862 | + $wpdb->prepare( |
|
| 1863 | + "INSERT INTO " . $table . " SET |
|
| 1864 | 1864 | post_id = %d, |
| 1865 | 1865 | " . $taxonomy . " = %s, |
| 1866 | 1866 | marker_json = %s ", |
| 1867 | 1867 | |
| 1868 | - array($post_id, $categories, $post_marker_json) |
|
| 1869 | - ) |
|
| 1870 | - ); |
|
| 1871 | - } |
|
| 1872 | - } |
|
| 1873 | - } |
|
| 1874 | - } |
|
| 1875 | - } |
|
| 1868 | + array($post_id, $categories, $post_marker_json) |
|
| 1869 | + ) |
|
| 1870 | + ); |
|
| 1871 | + } |
|
| 1872 | + } |
|
| 1873 | + } |
|
| 1874 | + } |
|
| 1875 | + } |
|
| 1876 | 1876 | } |
| 1877 | 1877 | |
| 1878 | 1878 | if (!function_exists('geodir_get_infowindow_html')) {
|
| 1879 | - /** |
|
| 1880 | - * Set post Map Marker info html. |
|
| 1881 | - * |
|
| 1882 | - * @since 1.0.0 |
|
| 1883 | - * @since 1.5.4 Modified to add new action "geodir_infowindow_meta_before". |
|
| 1884 | - * @since 1.6.16 Changes for disable review stars for certain post type. |
|
| 1885 | - * @since 1.6.18 Fix: Map marker not showing custom fields in bubble info. |
|
| 1886 | - * @package GeoDirectory |
|
| 1887 | - * @global array $geodir_addon_list List of active GeoDirectory extensions. |
|
| 1888 | - * @global object $gd_session GeoDirectory Session object. |
|
| 1889 | - * @param object $postinfo_obj The post details object. |
|
| 1890 | - * @param string $post_preview Is this a post preview?. |
|
| 1891 | - * @global object $post WordPress Post object. |
|
| 1892 | - * @return mixed|string|void |
|
| 1893 | - */ |
|
| 1894 | - function geodir_get_infowindow_html($postinfo_obj, $post_preview = '') {
|
|
| 1895 | - global $preview, $post, $gd_session; |
|
| 1896 | - $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 1897 | - $replarr = array("′", "⁄", "–", "“", '');
|
|
| 1898 | - |
|
| 1899 | - if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
|
|
| 1900 | - $ID = ''; |
|
| 1901 | - $plink = ''; |
|
| 1902 | - |
|
| 1903 | - if (isset($postinfo_obj->pid)) {
|
|
| 1904 | - $ID = $postinfo_obj->pid; |
|
| 1905 | - $plink = get_permalink($ID); |
|
| 1906 | - } |
|
| 1907 | - |
|
| 1908 | - $title = str_replace($srcharr, $replarr, ($postinfo_obj->post_title)); |
|
| 1909 | - $lat = $postinfo_obj->post_latitude; |
|
| 1910 | - $lng = $postinfo_obj->post_longitude; |
|
| 1911 | - } else {
|
|
| 1912 | - $ID = $postinfo_obj->post_id; |
|
| 1913 | - $title = str_replace($srcharr, $replarr, htmlentities($postinfo_obj->post_title, ENT_COMPAT, 'UTF-8')); // fix by Stiofan |
|
| 1914 | - $title = wp_specialchars_decode($title); // Fixed #post-320722 on 2016-12-08 |
|
| 1915 | - $plink = get_permalink($ID); |
|
| 1916 | - $lat = htmlentities(geodir_get_post_meta($ID, 'post_latitude', true)); |
|
| 1917 | - $lng = htmlentities(geodir_get_post_meta($ID, 'post_longitude', true)); |
|
| 1918 | - } |
|
| 1879 | + /** |
|
| 1880 | + * Set post Map Marker info html. |
|
| 1881 | + * |
|
| 1882 | + * @since 1.0.0 |
|
| 1883 | + * @since 1.5.4 Modified to add new action "geodir_infowindow_meta_before". |
|
| 1884 | + * @since 1.6.16 Changes for disable review stars for certain post type. |
|
| 1885 | + * @since 1.6.18 Fix: Map marker not showing custom fields in bubble info. |
|
| 1886 | + * @package GeoDirectory |
|
| 1887 | + * @global array $geodir_addon_list List of active GeoDirectory extensions. |
|
| 1888 | + * @global object $gd_session GeoDirectory Session object. |
|
| 1889 | + * @param object $postinfo_obj The post details object. |
|
| 1890 | + * @param string $post_preview Is this a post preview?. |
|
| 1891 | + * @global object $post WordPress Post object. |
|
| 1892 | + * @return mixed|string|void |
|
| 1893 | + */ |
|
| 1894 | + function geodir_get_infowindow_html($postinfo_obj, $post_preview = '') {
|
|
| 1895 | + global $preview, $post, $gd_session; |
|
| 1896 | + $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 1897 | + $replarr = array("′", "⁄", "–", "“", '');
|
|
| 1898 | + |
|
| 1899 | + if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
|
|
| 1900 | + $ID = ''; |
|
| 1901 | + $plink = ''; |
|
| 1902 | + |
|
| 1903 | + if (isset($postinfo_obj->pid)) {
|
|
| 1904 | + $ID = $postinfo_obj->pid; |
|
| 1905 | + $plink = get_permalink($ID); |
|
| 1906 | + } |
|
| 1907 | + |
|
| 1908 | + $title = str_replace($srcharr, $replarr, ($postinfo_obj->post_title)); |
|
| 1909 | + $lat = $postinfo_obj->post_latitude; |
|
| 1910 | + $lng = $postinfo_obj->post_longitude; |
|
| 1911 | + } else {
|
|
| 1912 | + $ID = $postinfo_obj->post_id; |
|
| 1913 | + $title = str_replace($srcharr, $replarr, htmlentities($postinfo_obj->post_title, ENT_COMPAT, 'UTF-8')); // fix by Stiofan |
|
| 1914 | + $title = wp_specialchars_decode($title); // Fixed #post-320722 on 2016-12-08 |
|
| 1915 | + $plink = get_permalink($ID); |
|
| 1916 | + $lat = htmlentities(geodir_get_post_meta($ID, 'post_latitude', true)); |
|
| 1917 | + $lng = htmlentities(geodir_get_post_meta($ID, 'post_longitude', true)); |
|
| 1918 | + } |
|
| 1919 | 1919 | |
| 1920 | - // Some theme overwrites global gd listing $post |
|
| 1921 | - if (!empty($ID) && (!empty($post->ID) && $post->ID != $ID) || empty($post)) {
|
|
| 1922 | - $post = geodir_get_post_info($ID); |
|
| 1923 | - } |
|
| 1920 | + // Some theme overwrites global gd listing $post |
|
| 1921 | + if (!empty($ID) && (!empty($post->ID) && $post->ID != $ID) || empty($post)) {
|
|
| 1922 | + $post = geodir_get_post_info($ID); |
|
| 1923 | + } |
|
| 1924 | 1924 | |
| 1925 | - $post_type = $ID ? get_post_type($ID) : ''; |
|
| 1926 | - |
|
| 1927 | - // filter field as per price package |
|
| 1928 | - global $geodir_addon_list; |
|
| 1929 | - if ($post_type && defined('GEODIRPAYMENT_VERSION')) {
|
|
| 1930 | - $package_id = isset($postinfo_obj->package_id) && $postinfo_obj->package_id ? $postinfo_obj->package_id : NULL; |
|
| 1931 | - $field_name = 'geodir_contact'; |
|
| 1932 | - if (!check_field_visibility($package_id, $field_name, $post_type)) {
|
|
| 1933 | - $contact = ''; |
|
| 1934 | - } |
|
| 1935 | - |
|
| 1936 | - $field_name = 'geodir_timing'; |
|
| 1937 | - if (!check_field_visibility($package_id, $field_name, $post_type)) {
|
|
| 1938 | - $timing = ''; |
|
| 1939 | - } |
|
| 1940 | - } |
|
| 1941 | - |
|
| 1942 | - if ($lat && $lng) {
|
|
| 1943 | - ob_start(); ?> |
|
| 1925 | + $post_type = $ID ? get_post_type($ID) : ''; |
|
| 1926 | + |
|
| 1927 | + // filter field as per price package |
|
| 1928 | + global $geodir_addon_list; |
|
| 1929 | + if ($post_type && defined('GEODIRPAYMENT_VERSION')) {
|
|
| 1930 | + $package_id = isset($postinfo_obj->package_id) && $postinfo_obj->package_id ? $postinfo_obj->package_id : NULL; |
|
| 1931 | + $field_name = 'geodir_contact'; |
|
| 1932 | + if (!check_field_visibility($package_id, $field_name, $post_type)) {
|
|
| 1933 | + $contact = ''; |
|
| 1934 | + } |
|
| 1935 | + |
|
| 1936 | + $field_name = 'geodir_timing'; |
|
| 1937 | + if (!check_field_visibility($package_id, $field_name, $post_type)) {
|
|
| 1938 | + $timing = ''; |
|
| 1939 | + } |
|
| 1940 | + } |
|
| 1941 | + |
|
| 1942 | + if ($lat && $lng) {
|
|
| 1943 | + ob_start(); ?> |
|
| 1944 | 1944 | <div class="gd-bubble" style=""> |
| 1945 | 1945 | <div class="gd-bubble-inside"> |
| 1946 | 1946 | <?php |
| 1947 | - $comment_count = ''; |
|
| 1948 | - $rating_star = ''; |
|
| 1949 | - if ($ID != '' && $post_type != '' && !geodir_cpt_has_rating_disabled($post_type)) {
|
|
| 1950 | - $rating_star = ''; |
|
| 1951 | - $comment_count = geodir_get_review_count_total($ID); |
|
| 1952 | - |
|
| 1953 | - if (!$preview) {
|
|
| 1954 | - $post_avgratings = geodir_get_post_rating($ID); |
|
| 1955 | - |
|
| 1956 | - $rating_star = geodir_get_rating_stars($post_avgratings, $ID, false); |
|
| 1957 | - |
|
| 1958 | - /** |
|
| 1959 | - * Filter to change rating stars |
|
| 1960 | - * |
|
| 1961 | - * You can use this filter to change Rating stars. |
|
| 1962 | - * |
|
| 1963 | - * @since 1.0.0 |
|
| 1964 | - * @package GeoDirectory |
|
| 1965 | - * @param string $rating_star Rating stars. |
|
| 1966 | - * @param float $post_avgratings Average ratings of the post. |
|
| 1967 | - * @param int $ID The post ID. |
|
| 1968 | - */ |
|
| 1969 | - $rating_star = apply_filters('geodir_review_rating_stars_on_infowindow', $rating_star, $post_avgratings, $ID);
|
|
| 1970 | - } |
|
| 1971 | - } |
|
| 1972 | - ?> |
|
| 1947 | + $comment_count = ''; |
|
| 1948 | + $rating_star = ''; |
|
| 1949 | + if ($ID != '' && $post_type != '' && !geodir_cpt_has_rating_disabled($post_type)) {
|
|
| 1950 | + $rating_star = ''; |
|
| 1951 | + $comment_count = geodir_get_review_count_total($ID); |
|
| 1952 | + |
|
| 1953 | + if (!$preview) {
|
|
| 1954 | + $post_avgratings = geodir_get_post_rating($ID); |
|
| 1955 | + |
|
| 1956 | + $rating_star = geodir_get_rating_stars($post_avgratings, $ID, false); |
|
| 1957 | + |
|
| 1958 | + /** |
|
| 1959 | + * Filter to change rating stars |
|
| 1960 | + * |
|
| 1961 | + * You can use this filter to change Rating stars. |
|
| 1962 | + * |
|
| 1963 | + * @since 1.0.0 |
|
| 1964 | + * @package GeoDirectory |
|
| 1965 | + * @param string $rating_star Rating stars. |
|
| 1966 | + * @param float $post_avgratings Average ratings of the post. |
|
| 1967 | + * @param int $ID The post ID. |
|
| 1968 | + */ |
|
| 1969 | + $rating_star = apply_filters('geodir_review_rating_stars_on_infowindow', $rating_star, $post_avgratings, $ID);
|
|
| 1970 | + } |
|
| 1971 | + } |
|
| 1972 | + ?> |
|
| 1973 | 1973 | <div class="geodir-bubble_desc"> |
| 1974 | 1974 | <h4> |
| 1975 | 1975 | <a href="<?php if ($plink != '') {
|
| 1976 | - echo $plink; |
|
| 1977 | - } else {
|
|
| 1978 | - echo 'javascript:void(0);'; |
|
| 1979 | - } ?>"><?php echo $title; ?></a> |
|
| 1976 | + echo $plink; |
|
| 1977 | + } else {
|
|
| 1978 | + echo 'javascript:void(0);'; |
|
| 1979 | + } ?>"><?php echo $title; ?></a> |
|
| 1980 | 1980 | </h4> |
| 1981 | 1981 | <?php |
| 1982 | - if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
|
|
| 1983 | - $post_images = array(); |
|
| 1984 | - if (!empty($postinfo_obj->post_images)) {
|
|
| 1985 | - $post_images = explode(",", $postinfo_obj->post_images);
|
|
| 1986 | - } |
|
| 1987 | - |
|
| 1988 | - if (!empty($post_images)) {
|
|
| 1989 | - ?> |
|
| 1982 | + if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
|
|
| 1983 | + $post_images = array(); |
|
| 1984 | + if (!empty($postinfo_obj->post_images)) {
|
|
| 1985 | + $post_images = explode(",", $postinfo_obj->post_images);
|
|
| 1986 | + } |
|
| 1987 | + |
|
| 1988 | + if (!empty($post_images)) {
|
|
| 1989 | + ?> |
|
| 1990 | 1990 | <div class="geodir-bubble_image"><a href="<?php if ($plink != '') {
|
| 1991 | - echo $plink; |
|
| 1992 | - } else {
|
|
| 1993 | - echo 'javascript:void(0);'; |
|
| 1994 | - } ?>"><img alt="bubble image" style="max-height:50px;" |
|
| 1991 | + echo $plink; |
|
| 1992 | + } else {
|
|
| 1993 | + echo 'javascript:void(0);'; |
|
| 1994 | + } ?>"><img alt="bubble image" style="max-height:50px;" |
|
| 1995 | 1995 | src="<?php echo $post_images[0]; ?>"/></a></div> |
| 1996 | 1996 | <?php |
| 1997 | - }else{
|
|
| 1998 | - echo '<div class="geodir-bubble_image"></div>'; |
|
| 1999 | - } |
|
| 2000 | - } else {
|
|
| 2001 | - if ($image = geodir_show_featured_image($ID, 'widget-thumb', true, false, $postinfo_obj->featured_image)) {
|
|
| 2002 | - ?> |
|
| 1997 | + }else{
|
|
| 1998 | + echo '<div class="geodir-bubble_image"></div>'; |
|
| 1999 | + } |
|
| 2000 | + } else {
|
|
| 2001 | + if ($image = geodir_show_featured_image($ID, 'widget-thumb', true, false, $postinfo_obj->featured_image)) {
|
|
| 2002 | + ?> |
|
| 2003 | 2003 | <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div> |
| 2004 | 2004 | <?php |
| 2005 | - }else{
|
|
| 2006 | - echo '<div class="geodir-bubble_image"></div>'; |
|
| 2007 | - } |
|
| 2008 | - } |
|
| 2009 | - ?> |
|
| 2005 | + }else{
|
|
| 2006 | + echo '<div class="geodir-bubble_image"></div>'; |
|
| 2007 | + } |
|
| 2008 | + } |
|
| 2009 | + ?> |
|
| 2010 | 2010 | <div class="geodir-bubble-meta-side"> |
| 2011 | 2011 | <?php |
| 2012 | - /** |
|
| 2013 | - * Fires before the meta info in the map info window. |
|
| 2014 | - * |
|
| 2015 | - * This can be used to add more info to the map info window before the normal meta info. |
|
| 2016 | - * |
|
| 2017 | - * @since 1.5.4 |
|
| 2018 | - * @param int $ID The post id. |
|
| 2019 | - * @param object $postinfo_obj The posts info as an object. |
|
| 2020 | - * @param bool|string $post_preview True if currently in post preview page. Empty string if not. * |
|
| 2021 | - */ |
|
| 2022 | - do_action('geodir_infowindow_meta_before', $ID, $postinfo_obj, $post_preview);
|
|
| 2023 | - |
|
| 2024 | - echo geodir_show_listing_info('mapbubble');
|
|
| 2025 | - |
|
| 2026 | - /** |
|
| 2027 | - * Fires after the meta info in the map info window. |
|
| 2028 | - * |
|
| 2029 | - * This can be used to add more info to the map info window after the normal meta info. |
|
| 2030 | - * |
|
| 2031 | - * @since 1.4.2 |
|
| 2032 | - * @param object $postinfo_obj The posts info as an object. |
|
| 2033 | - * @param bool|string $post_preview True if currently in post preview page. Empty string if not. * |
|
| 2034 | - */ |
|
| 2035 | - do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );
|
|
| 2036 | - ?> |
|
| 2012 | + /** |
|
| 2013 | + * Fires before the meta info in the map info window. |
|
| 2014 | + * |
|
| 2015 | + * This can be used to add more info to the map info window before the normal meta info. |
|
| 2016 | + * |
|
| 2017 | + * @since 1.5.4 |
|
| 2018 | + * @param int $ID The post id. |
|
| 2019 | + * @param object $postinfo_obj The posts info as an object. |
|
| 2020 | + * @param bool|string $post_preview True if currently in post preview page. Empty string if not. * |
|
| 2021 | + */ |
|
| 2022 | + do_action('geodir_infowindow_meta_before', $ID, $postinfo_obj, $post_preview);
|
|
| 2023 | + |
|
| 2024 | + echo geodir_show_listing_info('mapbubble');
|
|
| 2025 | + |
|
| 2026 | + /** |
|
| 2027 | + * Fires after the meta info in the map info window. |
|
| 2028 | + * |
|
| 2029 | + * This can be used to add more info to the map info window after the normal meta info. |
|
| 2030 | + * |
|
| 2031 | + * @since 1.4.2 |
|
| 2032 | + * @param object $postinfo_obj The posts info as an object. |
|
| 2033 | + * @param bool|string $post_preview True if currently in post preview page. Empty string if not. * |
|
| 2034 | + */ |
|
| 2035 | + do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );
|
|
| 2036 | + ?> |
|
| 2037 | 2037 | </div> |
| 2038 | 2038 | <?php |
| 2039 | - if ($ID) {
|
|
| 2040 | - $post_author = isset($postinfo_obj->post_author) ? $postinfo_obj->post_author : get_post_field('post_author', $ID);
|
|
| 2041 | - ?> |
|
| 2039 | + if ($ID) {
|
|
| 2040 | + $post_author = isset($postinfo_obj->post_author) ? $postinfo_obj->post_author : get_post_field('post_author', $ID);
|
|
| 2041 | + ?> |
|
| 2042 | 2042 | <div class="geodir-bubble-meta-fade"></div> |
| 2043 | 2043 | <div class="geodir-bubble-meta-bottom"> |
| 2044 | 2044 | <?php if ($rating_star != '') { ?>
|
@@ -2054,69 +2054,69 @@ discard block |
||
| 2054 | 2054 | </div> |
| 2055 | 2055 | </div> |
| 2056 | 2056 | <?php |
| 2057 | - $html = ob_get_clean(); |
|
| 2058 | - /** |
|
| 2059 | - * Filter to change infowindow html |
|
| 2060 | - * |
|
| 2061 | - * You can use this filter to change infowindow html. |
|
| 2062 | - * |
|
| 2063 | - * @since 1.0.0 |
|
| 2064 | - * @package GeoDirectory |
|
| 2065 | - * @param string $html Infowindow html. |
|
| 2066 | - * @param object $postinfo_obj The Post object. |
|
| 2067 | - * @param bool|string $post_preview Is this a post preview? |
|
| 2068 | - */ |
|
| 2069 | - $html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);
|
|
| 2070 | - return $html; |
|
| 2071 | - } |
|
| 2072 | - } |
|
| 2057 | + $html = ob_get_clean(); |
|
| 2058 | + /** |
|
| 2059 | + * Filter to change infowindow html |
|
| 2060 | + * |
|
| 2061 | + * You can use this filter to change infowindow html. |
|
| 2062 | + * |
|
| 2063 | + * @since 1.0.0 |
|
| 2064 | + * @package GeoDirectory |
|
| 2065 | + * @param string $html Infowindow html. |
|
| 2066 | + * @param object $postinfo_obj The Post object. |
|
| 2067 | + * @param bool|string $post_preview Is this a post preview? |
|
| 2068 | + */ |
|
| 2069 | + $html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);
|
|
| 2070 | + return $html; |
|
| 2071 | + } |
|
| 2072 | + } |
|
| 2073 | 2073 | } |
| 2074 | 2074 | |
| 2075 | 2075 | |
| 2076 | 2076 | if (!function_exists('geodir_new_post_default_status')) {
|
| 2077 | - /** |
|
| 2078 | - * Default post status for new posts. |
|
| 2079 | - * |
|
| 2080 | - * @since 1.0.0 |
|
| 2081 | - * @package GeoDirectory |
|
| 2082 | - * @return string Returns the default post status for new posts. Ex: draft, publish etc. |
|
| 2083 | - */ |
|
| 2084 | - function geodir_new_post_default_status() |
|
| 2085 | - {
|
|
| 2086 | - if (get_option('geodir_new_post_default_status'))
|
|
| 2087 | - return get_option('geodir_new_post_default_status');
|
|
| 2088 | - else |
|
| 2089 | - return 'publish'; |
|
| 2090 | - |
|
| 2091 | - } |
|
| 2077 | + /** |
|
| 2078 | + * Default post status for new posts. |
|
| 2079 | + * |
|
| 2080 | + * @since 1.0.0 |
|
| 2081 | + * @package GeoDirectory |
|
| 2082 | + * @return string Returns the default post status for new posts. Ex: draft, publish etc. |
|
| 2083 | + */ |
|
| 2084 | + function geodir_new_post_default_status() |
|
| 2085 | + {
|
|
| 2086 | + if (get_option('geodir_new_post_default_status'))
|
|
| 2087 | + return get_option('geodir_new_post_default_status');
|
|
| 2088 | + else |
|
| 2089 | + return 'publish'; |
|
| 2090 | + |
|
| 2091 | + } |
|
| 2092 | 2092 | } |
| 2093 | 2093 | |
| 2094 | 2094 | if (!function_exists('geodir_change_post_status')) {
|
| 2095 | - /** |
|
| 2096 | - * Change post status of a post. |
|
| 2097 | - * |
|
| 2098 | - * @global object $wpdb WordPress Database object. |
|
| 2099 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2100 | - * @param int|string $post_id The post ID. |
|
| 2101 | - * @param string $status New post status. Ex: draft, publish etc. |
|
| 2102 | - */ |
|
| 2103 | - function geodir_change_post_status($post_id = '', $status = '') |
|
| 2104 | - {
|
|
| 2105 | - global $wpdb, $plugin_prefix; |
|
| 2106 | - |
|
| 2107 | - $post_type = get_post_type($post_id); |
|
| 2108 | - |
|
| 2109 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2110 | - |
|
| 2111 | - $wpdb->query( |
|
| 2112 | - $wpdb->prepare( |
|
| 2113 | - "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d", |
|
| 2114 | - array($status, $post_id) |
|
| 2115 | - ) |
|
| 2116 | - ); |
|
| 2117 | - |
|
| 2118 | - |
|
| 2119 | - } |
|
| 2095 | + /** |
|
| 2096 | + * Change post status of a post. |
|
| 2097 | + * |
|
| 2098 | + * @global object $wpdb WordPress Database object. |
|
| 2099 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2100 | + * @param int|string $post_id The post ID. |
|
| 2101 | + * @param string $status New post status. Ex: draft, publish etc. |
|
| 2102 | + */ |
|
| 2103 | + function geodir_change_post_status($post_id = '', $status = '') |
|
| 2104 | + {
|
|
| 2105 | + global $wpdb, $plugin_prefix; |
|
| 2106 | + |
|
| 2107 | + $post_type = get_post_type($post_id); |
|
| 2108 | + |
|
| 2109 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2110 | + |
|
| 2111 | + $wpdb->query( |
|
| 2112 | + $wpdb->prepare( |
|
| 2113 | + "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d", |
|
| 2114 | + array($status, $post_id) |
|
| 2115 | + ) |
|
| 2116 | + ); |
|
| 2117 | + |
|
| 2118 | + |
|
| 2119 | + } |
|
| 2120 | 2120 | } |
| 2121 | 2121 | |
| 2122 | 2122 | /** |
@@ -2130,13 +2130,13 @@ discard block |
||
| 2130 | 2130 | */ |
| 2131 | 2131 | function geodir_set_post_status($pid, $status) |
| 2132 | 2132 | {
|
| 2133 | - if ($pid) {
|
|
| 2134 | - global $wpdb; |
|
| 2135 | - $my_post = array(); |
|
| 2136 | - $my_post['post_status'] = $status; |
|
| 2137 | - $my_post['ID'] = $pid; |
|
| 2138 | - $last_postid = wp_update_post($my_post); |
|
| 2139 | - } |
|
| 2133 | + if ($pid) {
|
|
| 2134 | + global $wpdb; |
|
| 2135 | + $my_post = array(); |
|
| 2136 | + $my_post['post_status'] = $status; |
|
| 2137 | + $my_post['ID'] = $pid; |
|
| 2138 | + $last_postid = wp_update_post($my_post); |
|
| 2139 | + } |
|
| 2140 | 2140 | } |
| 2141 | 2141 | |
| 2142 | 2142 | |
@@ -2152,384 +2152,384 @@ discard block |
||
| 2152 | 2152 | */ |
| 2153 | 2153 | function geodir_update_poststatus($new_status, $old_status, $post) |
| 2154 | 2154 | {
|
| 2155 | - global $wpdb; |
|
| 2155 | + global $wpdb; |
|
| 2156 | 2156 | |
| 2157 | - $geodir_posttypes = geodir_get_posttypes(); |
|
| 2157 | + $geodir_posttypes = geodir_get_posttypes(); |
|
| 2158 | 2158 | |
| 2159 | - if (!wp_is_post_revision($post->ID) && in_array($post->post_type, $geodir_posttypes)) {
|
|
| 2159 | + if (!wp_is_post_revision($post->ID) && in_array($post->post_type, $geodir_posttypes)) {
|
|
| 2160 | 2160 | |
| 2161 | - geodir_change_post_status($post->ID, $new_status); |
|
| 2162 | - } |
|
| 2161 | + geodir_change_post_status($post->ID, $new_status); |
|
| 2162 | + } |
|
| 2163 | 2163 | } |
| 2164 | 2164 | |
| 2165 | 2165 | |
| 2166 | 2166 | if (!function_exists('geodir_update_listing_info')) {
|
| 2167 | - /** |
|
| 2168 | - * Update post info. |
|
| 2169 | - * |
|
| 2170 | - * @since 1.0.0 |
|
| 2171 | - * @package GeoDirectory |
|
| 2172 | - * @global object $wpdb WordPress Database object. |
|
| 2173 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2174 | - * @param int $updatingpost The updating post ID. |
|
| 2175 | - * @param int $temppost The temporary post ID. |
|
| 2176 | - * @todo fix post_id variable |
|
| 2177 | - */ |
|
| 2178 | - function geodir_update_listing_info($updatingpost, $temppost) |
|
| 2179 | - {
|
|
| 2180 | - |
|
| 2181 | - global $wpdb, $plugin_prefix; |
|
| 2182 | - |
|
| 2183 | - $post_type = get_post_type($post_id); |
|
| 2184 | - |
|
| 2185 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2186 | - |
|
| 2187 | - $wpdb->query( |
|
| 2188 | - $wpdb->prepare( |
|
| 2189 | - "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2190 | - array($updatingpost, $temppost) |
|
| 2191 | - ) |
|
| 2192 | - ); |
|
| 2193 | - |
|
| 2194 | - $wpdb->query( |
|
| 2195 | - $wpdb->prepare( |
|
| 2196 | - "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2197 | - array($updatingpost, $temppost) |
|
| 2198 | - ) |
|
| 2199 | - ); |
|
| 2200 | - |
|
| 2201 | - /* Update Attachments*/ |
|
| 2202 | - |
|
| 2203 | - $wpdb->query( |
|
| 2204 | - $wpdb->prepare( |
|
| 2205 | - "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2206 | - array($updatingpost, $temppost) |
|
| 2207 | - ) |
|
| 2208 | - ); |
|
| 2209 | - |
|
| 2210 | - } |
|
| 2167 | + /** |
|
| 2168 | + * Update post info. |
|
| 2169 | + * |
|
| 2170 | + * @since 1.0.0 |
|
| 2171 | + * @package GeoDirectory |
|
| 2172 | + * @global object $wpdb WordPress Database object. |
|
| 2173 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2174 | + * @param int $updatingpost The updating post ID. |
|
| 2175 | + * @param int $temppost The temporary post ID. |
|
| 2176 | + * @todo fix post_id variable |
|
| 2177 | + */ |
|
| 2178 | + function geodir_update_listing_info($updatingpost, $temppost) |
|
| 2179 | + {
|
|
| 2180 | + |
|
| 2181 | + global $wpdb, $plugin_prefix; |
|
| 2182 | + |
|
| 2183 | + $post_type = get_post_type($post_id); |
|
| 2184 | + |
|
| 2185 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2186 | + |
|
| 2187 | + $wpdb->query( |
|
| 2188 | + $wpdb->prepare( |
|
| 2189 | + "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2190 | + array($updatingpost, $temppost) |
|
| 2191 | + ) |
|
| 2192 | + ); |
|
| 2193 | + |
|
| 2194 | + $wpdb->query( |
|
| 2195 | + $wpdb->prepare( |
|
| 2196 | + "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2197 | + array($updatingpost, $temppost) |
|
| 2198 | + ) |
|
| 2199 | + ); |
|
| 2200 | + |
|
| 2201 | + /* Update Attachments*/ |
|
| 2202 | + |
|
| 2203 | + $wpdb->query( |
|
| 2204 | + $wpdb->prepare( |
|
| 2205 | + "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2206 | + array($updatingpost, $temppost) |
|
| 2207 | + ) |
|
| 2208 | + ); |
|
| 2209 | + |
|
| 2210 | + } |
|
| 2211 | 2211 | } |
| 2212 | 2212 | |
| 2213 | 2213 | |
| 2214 | 2214 | if (!function_exists('geodir_delete_listing_info')) {
|
| 2215 | - /** |
|
| 2216 | - * Delete Listing info from details table for the given post id. |
|
| 2217 | - * |
|
| 2218 | - * @since 1.0.0 |
|
| 2219 | - * @package GeoDirectory |
|
| 2220 | - * @global object $wpdb WordPress Database object. |
|
| 2221 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2222 | - * @param int $deleted_postid The post ID. |
|
| 2223 | - * @param bool $force Optional. Do you want to force delete it? Default: false. |
|
| 2224 | - * @return bool|void |
|
| 2225 | - */ |
|
| 2226 | - function geodir_delete_listing_info($deleted_postid, $force = false) |
|
| 2227 | - {
|
|
| 2228 | - global $wpdb, $plugin_prefix; |
|
| 2229 | - |
|
| 2230 | - // check for multisite deletions |
|
| 2231 | - if (strpos($plugin_prefix, $wpdb->prefix) !== false) {
|
|
| 2232 | - } else {
|
|
| 2233 | - return; |
|
| 2234 | - } |
|
| 2235 | - |
|
| 2236 | - $post_type = get_post_type($deleted_postid); |
|
| 2237 | - |
|
| 2238 | - $all_postypes = geodir_get_posttypes(); |
|
| 2239 | - |
|
| 2240 | - if (!in_array($post_type, $all_postypes)) |
|
| 2241 | - return false; |
|
| 2242 | - |
|
| 2243 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2244 | - |
|
| 2245 | - /* Delete custom post meta*/ |
|
| 2246 | - $wpdb->query( |
|
| 2247 | - $wpdb->prepare( |
|
| 2248 | - "DELETE FROM " . $table . " WHERE `post_id` = %d", |
|
| 2249 | - array($deleted_postid) |
|
| 2250 | - ) |
|
| 2251 | - ); |
|
| 2252 | - |
|
| 2253 | - /* Delete post map icons*/ |
|
| 2254 | - |
|
| 2255 | - $wpdb->query( |
|
| 2256 | - $wpdb->prepare( |
|
| 2257 | - "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d", |
|
| 2258 | - array($deleted_postid) |
|
| 2259 | - ) |
|
| 2260 | - ); |
|
| 2261 | - |
|
| 2262 | - /* Delete Attachments*/ |
|
| 2263 | - $postcurr_images = geodir_get_images($deleted_postid); |
|
| 2264 | - |
|
| 2265 | - $wpdb->query( |
|
| 2266 | - $wpdb->prepare( |
|
| 2267 | - "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d", |
|
| 2268 | - array($deleted_postid) |
|
| 2269 | - ) |
|
| 2270 | - ); |
|
| 2271 | - geodir_remove_attachments($postcurr_images); |
|
| 2272 | - |
|
| 2273 | - } |
|
| 2215 | + /** |
|
| 2216 | + * Delete Listing info from details table for the given post id. |
|
| 2217 | + * |
|
| 2218 | + * @since 1.0.0 |
|
| 2219 | + * @package GeoDirectory |
|
| 2220 | + * @global object $wpdb WordPress Database object. |
|
| 2221 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2222 | + * @param int $deleted_postid The post ID. |
|
| 2223 | + * @param bool $force Optional. Do you want to force delete it? Default: false. |
|
| 2224 | + * @return bool|void |
|
| 2225 | + */ |
|
| 2226 | + function geodir_delete_listing_info($deleted_postid, $force = false) |
|
| 2227 | + {
|
|
| 2228 | + global $wpdb, $plugin_prefix; |
|
| 2229 | + |
|
| 2230 | + // check for multisite deletions |
|
| 2231 | + if (strpos($plugin_prefix, $wpdb->prefix) !== false) {
|
|
| 2232 | + } else {
|
|
| 2233 | + return; |
|
| 2234 | + } |
|
| 2235 | + |
|
| 2236 | + $post_type = get_post_type($deleted_postid); |
|
| 2237 | + |
|
| 2238 | + $all_postypes = geodir_get_posttypes(); |
|
| 2239 | + |
|
| 2240 | + if (!in_array($post_type, $all_postypes)) |
|
| 2241 | + return false; |
|
| 2242 | + |
|
| 2243 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2244 | + |
|
| 2245 | + /* Delete custom post meta*/ |
|
| 2246 | + $wpdb->query( |
|
| 2247 | + $wpdb->prepare( |
|
| 2248 | + "DELETE FROM " . $table . " WHERE `post_id` = %d", |
|
| 2249 | + array($deleted_postid) |
|
| 2250 | + ) |
|
| 2251 | + ); |
|
| 2252 | + |
|
| 2253 | + /* Delete post map icons*/ |
|
| 2254 | + |
|
| 2255 | + $wpdb->query( |
|
| 2256 | + $wpdb->prepare( |
|
| 2257 | + "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d", |
|
| 2258 | + array($deleted_postid) |
|
| 2259 | + ) |
|
| 2260 | + ); |
|
| 2261 | + |
|
| 2262 | + /* Delete Attachments*/ |
|
| 2263 | + $postcurr_images = geodir_get_images($deleted_postid); |
|
| 2264 | + |
|
| 2265 | + $wpdb->query( |
|
| 2266 | + $wpdb->prepare( |
|
| 2267 | + "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d", |
|
| 2268 | + array($deleted_postid) |
|
| 2269 | + ) |
|
| 2270 | + ); |
|
| 2271 | + geodir_remove_attachments($postcurr_images); |
|
| 2272 | + |
|
| 2273 | + } |
|
| 2274 | 2274 | } |
| 2275 | 2275 | |
| 2276 | 2276 | |
| 2277 | 2277 | if (!function_exists('geodir_add_to_favorite')) {
|
| 2278 | - /** |
|
| 2279 | - * This function would add listing to favorite listing. |
|
| 2280 | - * |
|
| 2281 | - * @since 1.0.0 |
|
| 2282 | - * @package GeoDirectory |
|
| 2283 | - * @global object $current_user Current user object. |
|
| 2284 | - * @param int $post_id The post ID. |
|
| 2285 | - */ |
|
| 2286 | - function geodir_add_to_favorite($post_id) |
|
| 2287 | - {
|
|
| 2288 | - |
|
| 2289 | - global $current_user; |
|
| 2290 | - |
|
| 2291 | - /** |
|
| 2292 | - * Filter to modify "Unfavorite" text |
|
| 2293 | - * |
|
| 2294 | - * You can use this filter to rename "Unfavorite" text to something else. |
|
| 2295 | - * |
|
| 2296 | - * @since 1.0.0 |
|
| 2297 | - * @package GeoDirectory |
|
| 2298 | - */ |
|
| 2299 | - $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
|
|
| 2300 | - |
|
| 2301 | - /** |
|
| 2302 | - * Filter to modify "Remove from Favorites" text |
|
| 2303 | - * |
|
| 2304 | - * You can use this filter to rename "Remove from Favorites" text to something else. |
|
| 2305 | - * |
|
| 2306 | - * @since 1.0.0 |
|
| 2307 | - * @package GeoDirectory |
|
| 2308 | - */ |
|
| 2309 | - $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
|
|
| 2310 | - |
|
| 2311 | - /** |
|
| 2312 | - * Filter to modify "fa fa-heart" icon |
|
| 2313 | - * |
|
| 2314 | - * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2315 | - * |
|
| 2316 | - * @since 1.0.0 |
|
| 2317 | - * @package GeoDirectory |
|
| 2318 | - */ |
|
| 2319 | - $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2320 | - |
|
| 2321 | - $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2322 | - $user_meta_data = !empty($user_meta_data) && is_array($user_meta_data) ? $user_meta_data : array(); |
|
| 2323 | - |
|
| 2324 | - if (empty($user_meta_data) || (!empty($user_meta_data) && !in_array($post_id, $user_meta_data))) {
|
|
| 2325 | - $user_meta_data[] = $post_id; |
|
| 2326 | - } |
|
| 2327 | - |
|
| 2328 | - update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data); |
|
| 2329 | - |
|
| 2330 | - /** |
|
| 2331 | - * Called before adding the post from favourites. |
|
| 2332 | - * |
|
| 2333 | - * @since 1.0.0 |
|
| 2334 | - * @package GeoDirectory |
|
| 2335 | - * @param int $post_id The post ID. |
|
| 2336 | - */ |
|
| 2337 | - do_action('geodir_before_add_from_favorite', $post_id);
|
|
| 2338 | - |
|
| 2339 | - echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>'; |
|
| 2340 | - |
|
| 2341 | - /** |
|
| 2342 | - * Called after adding the post from favourites. |
|
| 2343 | - * |
|
| 2344 | - * @since 1.0.0 |
|
| 2345 | - * @package GeoDirectory |
|
| 2346 | - * @param int $post_id The post ID. |
|
| 2347 | - */ |
|
| 2348 | - do_action('geodir_after_add_from_favorite', $post_id);
|
|
| 2278 | + /** |
|
| 2279 | + * This function would add listing to favorite listing. |
|
| 2280 | + * |
|
| 2281 | + * @since 1.0.0 |
|
| 2282 | + * @package GeoDirectory |
|
| 2283 | + * @global object $current_user Current user object. |
|
| 2284 | + * @param int $post_id The post ID. |
|
| 2285 | + */ |
|
| 2286 | + function geodir_add_to_favorite($post_id) |
|
| 2287 | + {
|
|
| 2288 | + |
|
| 2289 | + global $current_user; |
|
| 2290 | + |
|
| 2291 | + /** |
|
| 2292 | + * Filter to modify "Unfavorite" text |
|
| 2293 | + * |
|
| 2294 | + * You can use this filter to rename "Unfavorite" text to something else. |
|
| 2295 | + * |
|
| 2296 | + * @since 1.0.0 |
|
| 2297 | + * @package GeoDirectory |
|
| 2298 | + */ |
|
| 2299 | + $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
|
|
| 2300 | + |
|
| 2301 | + /** |
|
| 2302 | + * Filter to modify "Remove from Favorites" text |
|
| 2303 | + * |
|
| 2304 | + * You can use this filter to rename "Remove from Favorites" text to something else. |
|
| 2305 | + * |
|
| 2306 | + * @since 1.0.0 |
|
| 2307 | + * @package GeoDirectory |
|
| 2308 | + */ |
|
| 2309 | + $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
|
|
| 2310 | + |
|
| 2311 | + /** |
|
| 2312 | + * Filter to modify "fa fa-heart" icon |
|
| 2313 | + * |
|
| 2314 | + * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2315 | + * |
|
| 2316 | + * @since 1.0.0 |
|
| 2317 | + * @package GeoDirectory |
|
| 2318 | + */ |
|
| 2319 | + $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2320 | + |
|
| 2321 | + $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2322 | + $user_meta_data = !empty($user_meta_data) && is_array($user_meta_data) ? $user_meta_data : array(); |
|
| 2323 | + |
|
| 2324 | + if (empty($user_meta_data) || (!empty($user_meta_data) && !in_array($post_id, $user_meta_data))) {
|
|
| 2325 | + $user_meta_data[] = $post_id; |
|
| 2326 | + } |
|
| 2327 | + |
|
| 2328 | + update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data); |
|
| 2329 | + |
|
| 2330 | + /** |
|
| 2331 | + * Called before adding the post from favourites. |
|
| 2332 | + * |
|
| 2333 | + * @since 1.0.0 |
|
| 2334 | + * @package GeoDirectory |
|
| 2335 | + * @param int $post_id The post ID. |
|
| 2336 | + */ |
|
| 2337 | + do_action('geodir_before_add_from_favorite', $post_id);
|
|
| 2338 | + |
|
| 2339 | + echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>'; |
|
| 2340 | + |
|
| 2341 | + /** |
|
| 2342 | + * Called after adding the post from favourites. |
|
| 2343 | + * |
|
| 2344 | + * @since 1.0.0 |
|
| 2345 | + * @package GeoDirectory |
|
| 2346 | + * @param int $post_id The post ID. |
|
| 2347 | + */ |
|
| 2348 | + do_action('geodir_after_add_from_favorite', $post_id);
|
|
| 2349 | 2349 | |
| 2350 | - } |
|
| 2350 | + } |
|
| 2351 | 2351 | } |
| 2352 | 2352 | |
| 2353 | 2353 | if (!function_exists('geodir_remove_from_favorite')) {
|
| 2354 | - /** |
|
| 2355 | - * This function would remove the favourited property earlier. |
|
| 2356 | - * |
|
| 2357 | - * @since 1.0.0 |
|
| 2358 | - * @package GeoDirectory |
|
| 2359 | - * @global object $current_user Current user object. |
|
| 2360 | - * @param int $post_id The post ID. |
|
| 2361 | - */ |
|
| 2362 | - function geodir_remove_from_favorite($post_id) |
|
| 2363 | - {
|
|
| 2364 | - global $current_user; |
|
| 2365 | - |
|
| 2366 | - /** |
|
| 2367 | - * Filter to modify "Add to Favorites" text |
|
| 2368 | - * |
|
| 2369 | - * You can use this filter to rename "Add to Favorites" text to something else. |
|
| 2370 | - * |
|
| 2371 | - * @since 1.0.0 |
|
| 2372 | - * @package GeoDirectory |
|
| 2373 | - */ |
|
| 2374 | - $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
|
|
| 2375 | - |
|
| 2376 | - /** |
|
| 2377 | - * Filter to modify "Favourite" text |
|
| 2378 | - * |
|
| 2379 | - * You can use this filter to rename "Favourite" text to something else. |
|
| 2380 | - * |
|
| 2381 | - * @since 1.0.0 |
|
| 2382 | - * @package GeoDirectory |
|
| 2383 | - */ |
|
| 2384 | - $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
|
|
| 2385 | - |
|
| 2386 | - /** |
|
| 2387 | - * Filter to modify "fa fa-heart" icon |
|
| 2388 | - * |
|
| 2389 | - * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2390 | - * |
|
| 2391 | - * @since 1.0.0 |
|
| 2392 | - * @package GeoDirectory |
|
| 2393 | - */ |
|
| 2394 | - $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2395 | - |
|
| 2396 | - $user_meta_data = array(); |
|
| 2397 | - $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2398 | - |
|
| 2399 | - if (!empty($user_meta_data)) {
|
|
| 2400 | - |
|
| 2401 | - if (($key = array_search($post_id, $user_meta_data)) !== false) {
|
|
| 2402 | - unset($user_meta_data[$key]); |
|
| 2403 | - } |
|
| 2354 | + /** |
|
| 2355 | + * This function would remove the favourited property earlier. |
|
| 2356 | + * |
|
| 2357 | + * @since 1.0.0 |
|
| 2358 | + * @package GeoDirectory |
|
| 2359 | + * @global object $current_user Current user object. |
|
| 2360 | + * @param int $post_id The post ID. |
|
| 2361 | + */ |
|
| 2362 | + function geodir_remove_from_favorite($post_id) |
|
| 2363 | + {
|
|
| 2364 | + global $current_user; |
|
| 2365 | + |
|
| 2366 | + /** |
|
| 2367 | + * Filter to modify "Add to Favorites" text |
|
| 2368 | + * |
|
| 2369 | + * You can use this filter to rename "Add to Favorites" text to something else. |
|
| 2370 | + * |
|
| 2371 | + * @since 1.0.0 |
|
| 2372 | + * @package GeoDirectory |
|
| 2373 | + */ |
|
| 2374 | + $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
|
|
| 2375 | + |
|
| 2376 | + /** |
|
| 2377 | + * Filter to modify "Favourite" text |
|
| 2378 | + * |
|
| 2379 | + * You can use this filter to rename "Favourite" text to something else. |
|
| 2380 | + * |
|
| 2381 | + * @since 1.0.0 |
|
| 2382 | + * @package GeoDirectory |
|
| 2383 | + */ |
|
| 2384 | + $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
|
|
| 2385 | + |
|
| 2386 | + /** |
|
| 2387 | + * Filter to modify "fa fa-heart" icon |
|
| 2388 | + * |
|
| 2389 | + * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2390 | + * |
|
| 2391 | + * @since 1.0.0 |
|
| 2392 | + * @package GeoDirectory |
|
| 2393 | + */ |
|
| 2394 | + $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2395 | + |
|
| 2396 | + $user_meta_data = array(); |
|
| 2397 | + $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2398 | + |
|
| 2399 | + if (!empty($user_meta_data)) {
|
|
| 2400 | + |
|
| 2401 | + if (($key = array_search($post_id, $user_meta_data)) !== false) {
|
|
| 2402 | + unset($user_meta_data[$key]); |
|
| 2403 | + } |
|
| 2404 | 2404 | |
| 2405 | - } |
|
| 2405 | + } |
|
| 2406 | 2406 | |
| 2407 | - update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data); |
|
| 2407 | + update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data); |
|
| 2408 | 2408 | |
| 2409 | - /** |
|
| 2410 | - * Called before removing the post from favourites. |
|
| 2411 | - * |
|
| 2412 | - * @since 1.0.0 |
|
| 2413 | - * @package GeoDirectory |
|
| 2414 | - * @param int $post_id The post ID. |
|
| 2415 | - */ |
|
| 2416 | - do_action('geodir_before_remove_from_favorite', $post_id);
|
|
| 2409 | + /** |
|
| 2410 | + * Called before removing the post from favourites. |
|
| 2411 | + * |
|
| 2412 | + * @since 1.0.0 |
|
| 2413 | + * @package GeoDirectory |
|
| 2414 | + * @param int $post_id The post ID. |
|
| 2415 | + */ |
|
| 2416 | + do_action('geodir_before_remove_from_favorite', $post_id);
|
|
| 2417 | 2417 | |
| 2418 | - echo '<a href="javascript:void(0);" title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>'; |
|
| 2418 | + echo '<a href="javascript:void(0);" title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>'; |
|
| 2419 | 2419 | |
| 2420 | - /** |
|
| 2421 | - * Called after removing the post from favourites. |
|
| 2422 | - * |
|
| 2423 | - * @since 1.0.0 |
|
| 2424 | - * @package GeoDirectory |
|
| 2425 | - * @param int $post_id The post ID. |
|
| 2426 | - */ |
|
| 2427 | - do_action('geodir_after_remove_from_favorite', $post_id);
|
|
| 2420 | + /** |
|
| 2421 | + * Called after removing the post from favourites. |
|
| 2422 | + * |
|
| 2423 | + * @since 1.0.0 |
|
| 2424 | + * @package GeoDirectory |
|
| 2425 | + * @param int $post_id The post ID. |
|
| 2426 | + */ |
|
| 2427 | + do_action('geodir_after_remove_from_favorite', $post_id);
|
|
| 2428 | 2428 | |
| 2429 | - } |
|
| 2429 | + } |
|
| 2430 | 2430 | } |
| 2431 | 2431 | |
| 2432 | 2432 | if (!function_exists('geodir_favourite_html')) {
|
| 2433 | - /** |
|
| 2434 | - * This function would display the html content for add to favorite or remove from favorite. |
|
| 2435 | - * |
|
| 2436 | - * @since 1.0.0 |
|
| 2437 | - * @package GeoDirectory |
|
| 2438 | - * @global object $current_user Current user object. |
|
| 2439 | - * @global object $post The current post object. |
|
| 2440 | - * @param int $user_id The user ID. |
|
| 2441 | - * @param int $post_id The post ID. |
|
| 2442 | - */ |
|
| 2443 | - function geodir_favourite_html($user_id, $post_id) |
|
| 2444 | - {
|
|
| 2445 | - |
|
| 2446 | - global $current_user, $post; |
|
| 2447 | - |
|
| 2448 | - /** |
|
| 2449 | - * Filter to modify "Add to Favorites" text |
|
| 2450 | - * |
|
| 2451 | - * You can use this filter to rename "Add to Favorites" text to something else. |
|
| 2452 | - * |
|
| 2453 | - * @since 1.0.0 |
|
| 2454 | - * @package GeoDirectory |
|
| 2455 | - */ |
|
| 2456 | - $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
|
|
| 2457 | - |
|
| 2458 | - /** |
|
| 2459 | - * Filter to modify "Favourite" text |
|
| 2460 | - * |
|
| 2461 | - * You can use this filter to rename "Favourite" text to something else. |
|
| 2462 | - * |
|
| 2463 | - * @since 1.0.0 |
|
| 2464 | - * @package GeoDirectory |
|
| 2465 | - */ |
|
| 2466 | - $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
|
|
| 2467 | - |
|
| 2468 | - /** |
|
| 2469 | - * Filter to modify "Unfavorite" text |
|
| 2470 | - * |
|
| 2471 | - * You can use this filter to rename "Unfavorite" text to something else. |
|
| 2472 | - * |
|
| 2473 | - * @since 1.0.0 |
|
| 2474 | - * @package GeoDirectory |
|
| 2475 | - */ |
|
| 2476 | - $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
|
|
| 2477 | - |
|
| 2478 | - /** |
|
| 2479 | - * Filter to modify "Remove from Favorites" text |
|
| 2480 | - * |
|
| 2481 | - * You can use this filter to rename "Remove from Favorites" text to something else. |
|
| 2482 | - * |
|
| 2483 | - * @since 1.0.0 |
|
| 2484 | - * @package GeoDirectory |
|
| 2485 | - */ |
|
| 2486 | - $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
|
|
| 2487 | - |
|
| 2488 | - /** |
|
| 2489 | - * Filter to modify "fa fa-heart" icon |
|
| 2490 | - * |
|
| 2491 | - * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2492 | - * |
|
| 2493 | - * @since 1.0.0 |
|
| 2494 | - * @package GeoDirectory |
|
| 2495 | - */ |
|
| 2496 | - $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2497 | - |
|
| 2498 | - /** |
|
| 2499 | - * Filter to modify "fa fa-heart" icon for "remove from favorites" link |
|
| 2500 | - * |
|
| 2501 | - * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2502 | - * |
|
| 2503 | - * @since 1.0.0 |
|
| 2504 | - * @package GeoDirectory |
|
| 2505 | - */ |
|
| 2506 | - $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');
|
|
| 2507 | - |
|
| 2508 | - $user_meta_data = ''; |
|
| 2509 | - if (isset($current_user->data->ID)) |
|
| 2510 | - $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2511 | - |
|
| 2512 | - if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
|
|
| 2513 | - ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>" ><a |
|
| 2433 | + /** |
|
| 2434 | + * This function would display the html content for add to favorite or remove from favorite. |
|
| 2435 | + * |
|
| 2436 | + * @since 1.0.0 |
|
| 2437 | + * @package GeoDirectory |
|
| 2438 | + * @global object $current_user Current user object. |
|
| 2439 | + * @global object $post The current post object. |
|
| 2440 | + * @param int $user_id The user ID. |
|
| 2441 | + * @param int $post_id The post ID. |
|
| 2442 | + */ |
|
| 2443 | + function geodir_favourite_html($user_id, $post_id) |
|
| 2444 | + {
|
|
| 2445 | + |
|
| 2446 | + global $current_user, $post; |
|
| 2447 | + |
|
| 2448 | + /** |
|
| 2449 | + * Filter to modify "Add to Favorites" text |
|
| 2450 | + * |
|
| 2451 | + * You can use this filter to rename "Add to Favorites" text to something else. |
|
| 2452 | + * |
|
| 2453 | + * @since 1.0.0 |
|
| 2454 | + * @package GeoDirectory |
|
| 2455 | + */ |
|
| 2456 | + $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
|
|
| 2457 | + |
|
| 2458 | + /** |
|
| 2459 | + * Filter to modify "Favourite" text |
|
| 2460 | + * |
|
| 2461 | + * You can use this filter to rename "Favourite" text to something else. |
|
| 2462 | + * |
|
| 2463 | + * @since 1.0.0 |
|
| 2464 | + * @package GeoDirectory |
|
| 2465 | + */ |
|
| 2466 | + $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
|
|
| 2467 | + |
|
| 2468 | + /** |
|
| 2469 | + * Filter to modify "Unfavorite" text |
|
| 2470 | + * |
|
| 2471 | + * You can use this filter to rename "Unfavorite" text to something else. |
|
| 2472 | + * |
|
| 2473 | + * @since 1.0.0 |
|
| 2474 | + * @package GeoDirectory |
|
| 2475 | + */ |
|
| 2476 | + $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
|
|
| 2477 | + |
|
| 2478 | + /** |
|
| 2479 | + * Filter to modify "Remove from Favorites" text |
|
| 2480 | + * |
|
| 2481 | + * You can use this filter to rename "Remove from Favorites" text to something else. |
|
| 2482 | + * |
|
| 2483 | + * @since 1.0.0 |
|
| 2484 | + * @package GeoDirectory |
|
| 2485 | + */ |
|
| 2486 | + $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
|
|
| 2487 | + |
|
| 2488 | + /** |
|
| 2489 | + * Filter to modify "fa fa-heart" icon |
|
| 2490 | + * |
|
| 2491 | + * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2492 | + * |
|
| 2493 | + * @since 1.0.0 |
|
| 2494 | + * @package GeoDirectory |
|
| 2495 | + */ |
|
| 2496 | + $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2497 | + |
|
| 2498 | + /** |
|
| 2499 | + * Filter to modify "fa fa-heart" icon for "remove from favorites" link |
|
| 2500 | + * |
|
| 2501 | + * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2502 | + * |
|
| 2503 | + * @since 1.0.0 |
|
| 2504 | + * @package GeoDirectory |
|
| 2505 | + */ |
|
| 2506 | + $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');
|
|
| 2507 | + |
|
| 2508 | + $user_meta_data = ''; |
|
| 2509 | + if (isset($current_user->data->ID)) |
|
| 2510 | + $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2511 | + |
|
| 2512 | + if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
|
|
| 2513 | + ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>" ><a |
|
| 2514 | 2514 | class="geodir-removetofav-icon" href="javascript:void(0);" |
| 2515 | 2515 | onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');" |
| 2516 | 2516 | title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?> |
| 2517 | 2517 | </a> </span><?php |
| 2518 | 2518 | |
| 2519 | - } else {
|
|
| 2519 | + } else {
|
|
| 2520 | 2520 | |
| 2521 | - if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
|
|
| 2522 | - $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\''; |
|
| 2523 | - } else |
|
| 2524 | - $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
|
|
| 2521 | + if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
|
|
| 2522 | + $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\''; |
|
| 2523 | + } else |
|
| 2524 | + $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
|
|
| 2525 | 2525 | |
| 2526 | - ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon" |
|
| 2526 | + ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon" |
|
| 2527 | 2527 | href="javascript:void(0);" |
| 2528 | 2528 | onclick="<?php echo $script_text;?>" |
| 2529 | 2529 | title="<?php echo $add_favourite_text;?>"><i |
| 2530 | 2530 | class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span> |
| 2531 | 2531 | <?php } |
| 2532 | - } |
|
| 2532 | + } |
|
| 2533 | 2533 | } |
| 2534 | 2534 | |
| 2535 | 2535 | |
@@ -2546,54 +2546,54 @@ discard block |
||
| 2546 | 2546 | function geodir_get_cat_postcount($term = array()) |
| 2547 | 2547 | {
|
| 2548 | 2548 | |
| 2549 | - if (!empty($term)) {
|
|
| 2549 | + if (!empty($term)) {
|
|
| 2550 | 2550 | |
| 2551 | - global $wpdb, $plugin_prefix; |
|
| 2551 | + global $wpdb, $plugin_prefix; |
|
| 2552 | 2552 | |
| 2553 | - $where = ''; |
|
| 2554 | - $join = ''; |
|
| 2555 | - if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {
|
|
| 2556 | - $taxonomy_obj = get_taxonomy($term->taxonomy); |
|
| 2553 | + $where = ''; |
|
| 2554 | + $join = ''; |
|
| 2555 | + if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {
|
|
| 2556 | + $taxonomy_obj = get_taxonomy($term->taxonomy); |
|
| 2557 | 2557 | |
| 2558 | - $post_type = $taxonomy_obj->object_type[0]; |
|
| 2558 | + $post_type = $taxonomy_obj->object_type[0]; |
|
| 2559 | 2559 | |
| 2560 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2560 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2561 | 2561 | |
| 2562 | - /** |
|
| 2563 | - * Filter to modify the 'join' query |
|
| 2564 | - * |
|
| 2565 | - * @since 1.0.0 |
|
| 2566 | - * @package GeoDirectory |
|
| 2567 | - * @param object|array $term category / term object that need to be processed. |
|
| 2568 | - * @param string $join The join query. |
|
| 2569 | - */ |
|
| 2570 | - $join = apply_filters('geodir_cat_post_count_join', $join, $term);
|
|
| 2562 | + /** |
|
| 2563 | + * Filter to modify the 'join' query |
|
| 2564 | + * |
|
| 2565 | + * @since 1.0.0 |
|
| 2566 | + * @package GeoDirectory |
|
| 2567 | + * @param object|array $term category / term object that need to be processed. |
|
| 2568 | + * @param string $join The join query. |
|
| 2569 | + */ |
|
| 2570 | + $join = apply_filters('geodir_cat_post_count_join', $join, $term);
|
|
| 2571 | 2571 | |
| 2572 | - /** |
|
| 2573 | - * Filter to modify the 'where' query |
|
| 2574 | - * |
|
| 2575 | - * @since 1.0.0 |
|
| 2576 | - * @package GeoDirectory |
|
| 2577 | - * @param object|array $term category / term object that need to be processed. |
|
| 2578 | - * @param string $where The where query. |
|
| 2579 | - */ |
|
| 2580 | - $where = apply_filters('geodir_cat_post_count_where', $where, $term);
|
|
| 2572 | + /** |
|
| 2573 | + * Filter to modify the 'where' query |
|
| 2574 | + * |
|
| 2575 | + * @since 1.0.0 |
|
| 2576 | + * @package GeoDirectory |
|
| 2577 | + * @param object|array $term category / term object that need to be processed. |
|
| 2578 | + * @param string $where The where query. |
|
| 2579 | + */ |
|
| 2580 | + $where = apply_filters('geodir_cat_post_count_where', $where, $term);
|
|
| 2581 | 2581 | |
| 2582 | - $count_query = "SELECT count(post_id) FROM |
|
| 2582 | + $count_query = "SELECT count(post_id) FROM |
|
| 2583 | 2583 | " . $table . " as pd " . $join . " |
| 2584 | 2584 | WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;
|
| 2585 | 2585 | |
| 2586 | - $cat_post_count = $wpdb->get_var($count_query); |
|
| 2587 | - if (empty($cat_post_count) || is_wp_error($cat_post_count)) |
|
| 2588 | - $cat_post_count = 0; |
|
| 2586 | + $cat_post_count = $wpdb->get_var($count_query); |
|
| 2587 | + if (empty($cat_post_count) || is_wp_error($cat_post_count)) |
|
| 2588 | + $cat_post_count = 0; |
|
| 2589 | 2589 | |
| 2590 | - return $cat_post_count; |
|
| 2590 | + return $cat_post_count; |
|
| 2591 | 2591 | |
| 2592 | - } else |
|
| 2592 | + } else |
|
| 2593 | 2593 | |
| 2594 | - return $term->count; |
|
| 2595 | - } |
|
| 2596 | - return false; |
|
| 2594 | + return $term->count; |
|
| 2595 | + } |
|
| 2596 | + return false; |
|
| 2597 | 2597 | |
| 2598 | 2598 | } |
| 2599 | 2599 | |
@@ -2606,17 +2606,17 @@ discard block |
||
| 2606 | 2606 | */ |
| 2607 | 2607 | function geodir_allow_post_type_frontend() |
| 2608 | 2608 | {
|
| 2609 | - $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 2609 | + $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 2610 | 2610 | |
| 2611 | - if (!is_admin() && isset($_REQUEST['listing_type']) |
|
| 2612 | - && !empty($geodir_allow_posttype_frontend) |
|
| 2613 | - && !in_array($_REQUEST['listing_type'], $geodir_allow_posttype_frontend) |
|
| 2614 | - ) {
|
|
| 2611 | + if (!is_admin() && isset($_REQUEST['listing_type']) |
|
| 2612 | + && !empty($geodir_allow_posttype_frontend) |
|
| 2613 | + && !in_array($_REQUEST['listing_type'], $geodir_allow_posttype_frontend) |
|
| 2614 | + ) {
|
|
| 2615 | 2615 | |
| 2616 | - wp_redirect(home_url()); |
|
| 2617 | - exit; |
|
| 2616 | + wp_redirect(home_url()); |
|
| 2617 | + exit; |
|
| 2618 | 2618 | |
| 2619 | - } |
|
| 2619 | + } |
|
| 2620 | 2620 | |
| 2621 | 2621 | } |
| 2622 | 2622 | |
@@ -2633,20 +2633,20 @@ discard block |
||
| 2633 | 2633 | */ |
| 2634 | 2634 | function geodir_excerpt_length($length) |
| 2635 | 2635 | {
|
| 2636 | - global $wp_query, $geodir_is_widget_listing; |
|
| 2636 | + global $wp_query, $geodir_is_widget_listing; |
|
| 2637 | 2637 | if ($geodir_is_widget_listing) {
|
| 2638 | 2638 | return $length; |
| 2639 | 2639 | } |
| 2640 | 2640 | |
| 2641 | - if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))
|
|
| 2642 | - $length = get_option('geodir_desc_word_limit');
|
|
| 2643 | - elseif (get_query_var('excerpt_length'))
|
|
| 2644 | - $length = get_query_var('excerpt_length');
|
|
| 2641 | + if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))
|
|
| 2642 | + $length = get_option('geodir_desc_word_limit');
|
|
| 2643 | + elseif (get_query_var('excerpt_length'))
|
|
| 2644 | + $length = get_query_var('excerpt_length');
|
|
| 2645 | 2645 | |
| 2646 | - if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))
|
|
| 2647 | - $length = get_option('geodir_author_desc_word_limit');
|
|
| 2646 | + if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))
|
|
| 2647 | + $length = get_option('geodir_author_desc_word_limit');
|
|
| 2648 | 2648 | |
| 2649 | - return $length; |
|
| 2649 | + return $length; |
|
| 2650 | 2650 | } |
| 2651 | 2651 | |
| 2652 | 2652 | /** |
@@ -2661,13 +2661,13 @@ discard block |
||
| 2661 | 2661 | */ |
| 2662 | 2662 | function geodir_excerpt_more($more) |
| 2663 | 2663 | {
|
| 2664 | - global $post; |
|
| 2665 | - $all_postypes = geodir_get_posttypes(); |
|
| 2666 | - if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
|
|
| 2667 | - return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>'; |
|
| 2668 | - } |
|
| 2664 | + global $post; |
|
| 2665 | + $all_postypes = geodir_get_posttypes(); |
|
| 2666 | + if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
|
|
| 2667 | + return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>'; |
|
| 2668 | + } |
|
| 2669 | 2669 | |
| 2670 | - return $more; |
|
| 2670 | + return $more; |
|
| 2671 | 2671 | } |
| 2672 | 2672 | |
| 2673 | 2673 | |
@@ -2684,63 +2684,63 @@ discard block |
||
| 2684 | 2684 | */ |
| 2685 | 2685 | function geodir_update_markers_oncatedit($term_id, $tt_id, $taxonomy) |
| 2686 | 2686 | {
|
| 2687 | - global $plugin_prefix, $wpdb; |
|
| 2687 | + global $plugin_prefix, $wpdb; |
|
| 2688 | 2688 | |
| 2689 | - $gd_taxonomies = geodir_get_taxonomies(); |
|
| 2689 | + $gd_taxonomies = geodir_get_taxonomies(); |
|
| 2690 | 2690 | |
| 2691 | - if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
|
|
| 2691 | + if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
|
|
| 2692 | 2692 | |
| 2693 | - $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy); |
|
| 2694 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 2693 | + $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy); |
|
| 2694 | + $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 2695 | 2695 | |
| 2696 | - $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']); |
|
| 2697 | - $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png'; |
|
| 2696 | + $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']); |
|
| 2697 | + $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png'; |
|
| 2698 | 2698 | |
| 2699 | - $posts = $wpdb->get_results( |
|
| 2700 | - $wpdb->prepare( |
|
| 2701 | - "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ", |
|
| 2702 | - array($term_id, $taxonomy) |
|
| 2703 | - ) |
|
| 2704 | - ); |
|
| 2699 | + $posts = $wpdb->get_results( |
|
| 2700 | + $wpdb->prepare( |
|
| 2701 | + "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ", |
|
| 2702 | + array($term_id, $taxonomy) |
|
| 2703 | + ) |
|
| 2704 | + ); |
|
| 2705 | 2705 | |
| 2706 | - if (!empty($posts)): |
|
| 2707 | - foreach ($posts as $post_obj) {
|
|
| 2706 | + if (!empty($posts)): |
|
| 2707 | + foreach ($posts as $post_obj) {
|
|
| 2708 | 2708 | |
| 2709 | - $lat = $post_obj->post_latitude; |
|
| 2710 | - $lng = $post_obj->post_longitude; |
|
| 2709 | + $lat = $post_obj->post_latitude; |
|
| 2710 | + $lng = $post_obj->post_longitude; |
|
| 2711 | 2711 | |
| 2712 | - $json = '{';
|
|
| 2713 | - $json .= '"id":"' . $post_obj->post_id . '",'; |
|
| 2714 | - $json .= '"lat_pos": "' . $lat . '",'; |
|
| 2715 | - $json .= '"long_pos": "' . $lng . '",'; |
|
| 2716 | - $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",'; |
|
| 2717 | - $json .= '"icon":"' . $term_icon . '",'; |
|
| 2718 | - $json .= '"group":"catgroup' . $term_id . '"'; |
|
| 2719 | - $json .= '}'; |
|
| 2712 | + $json = '{';
|
|
| 2713 | + $json .= '"id":"' . $post_obj->post_id . '",'; |
|
| 2714 | + $json .= '"lat_pos": "' . $lat . '",'; |
|
| 2715 | + $json .= '"long_pos": "' . $lng . '",'; |
|
| 2716 | + $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",'; |
|
| 2717 | + $json .= '"icon":"' . $term_icon . '",'; |
|
| 2718 | + $json .= '"group":"catgroup' . $term_id . '"'; |
|
| 2719 | + $json .= '}'; |
|
| 2720 | 2720 | |
| 2721 | - if ($post_obj->default_category == $term_id) {
|
|
| 2721 | + if ($post_obj->default_category == $term_id) {
|
|
| 2722 | 2722 | |
| 2723 | - $wpdb->query( |
|
| 2724 | - $wpdb->prepare( |
|
| 2725 | - "UPDATE " . $table . " SET marker_json = %s where post_id = %d", |
|
| 2726 | - array($json, $post_obj->post_id) |
|
| 2727 | - ) |
|
| 2728 | - ); |
|
| 2729 | - } |
|
| 2723 | + $wpdb->query( |
|
| 2724 | + $wpdb->prepare( |
|
| 2725 | + "UPDATE " . $table . " SET marker_json = %s where post_id = %d", |
|
| 2726 | + array($json, $post_obj->post_id) |
|
| 2727 | + ) |
|
| 2728 | + ); |
|
| 2729 | + } |
|
| 2730 | 2730 | |
| 2731 | - $wpdb->query( |
|
| 2732 | - $wpdb->prepare( |
|
| 2733 | - "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d", |
|
| 2734 | - array($json, $post_obj->post_id, $term_id) |
|
| 2735 | - ) |
|
| 2736 | - ); |
|
| 2731 | + $wpdb->query( |
|
| 2732 | + $wpdb->prepare( |
|
| 2733 | + "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d", |
|
| 2734 | + array($json, $post_obj->post_id, $term_id) |
|
| 2735 | + ) |
|
| 2736 | + ); |
|
| 2737 | 2737 | |
| 2738 | - } |
|
| 2738 | + } |
|
| 2739 | 2739 | |
| 2740 | 2740 | |
| 2741 | - endif; |
|
| 2741 | + endif; |
|
| 2742 | 2742 | |
| 2743 | - } |
|
| 2743 | + } |
|
| 2744 | 2744 | |
| 2745 | 2745 | } |
| 2746 | 2746 | |
@@ -2754,14 +2754,14 @@ discard block |
||
| 2754 | 2754 | */ |
| 2755 | 2755 | function geodir_get_listing_author($listing_id = '') |
| 2756 | 2756 | {
|
| 2757 | - if ($listing_id == '') {
|
|
| 2758 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 2759 | - $listing_id = $_REQUEST['pid']; |
|
| 2760 | - } |
|
| 2761 | - } |
|
| 2762 | - $listing = get_post(strip_tags($listing_id)); |
|
| 2763 | - $listing_author_id = $listing->post_author; |
|
| 2764 | - return $listing_author_id; |
|
| 2757 | + if ($listing_id == '') {
|
|
| 2758 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 2759 | + $listing_id = $_REQUEST['pid']; |
|
| 2760 | + } |
|
| 2761 | + } |
|
| 2762 | + $listing = get_post(strip_tags($listing_id)); |
|
| 2763 | + $listing_author_id = $listing->post_author; |
|
| 2764 | + return $listing_author_id; |
|
| 2765 | 2765 | } |
| 2766 | 2766 | |
| 2767 | 2767 | |
@@ -2776,11 +2776,11 @@ discard block |
||
| 2776 | 2776 | */ |
| 2777 | 2777 | function geodir_lisiting_belong_to_user($listing_id, $user_id) |
| 2778 | 2778 | {
|
| 2779 | - $listing_author_id = geodir_get_listing_author($listing_id); |
|
| 2780 | - if ($listing_author_id == $user_id) |
|
| 2781 | - return true; |
|
| 2782 | - else |
|
| 2783 | - return false; |
|
| 2779 | + $listing_author_id = geodir_get_listing_author($listing_id); |
|
| 2780 | + if ($listing_author_id == $user_id) |
|
| 2781 | + return true; |
|
| 2782 | + else |
|
| 2783 | + return false; |
|
| 2784 | 2784 | |
| 2785 | 2785 | } |
| 2786 | 2786 | |
@@ -2796,17 +2796,17 @@ discard block |
||
| 2796 | 2796 | */ |
| 2797 | 2797 | function geodir_listing_belong_to_current_user($listing_id = '', $exclude_admin = true) |
| 2798 | 2798 | {
|
| 2799 | - global $current_user; |
|
| 2800 | - if ($exclude_admin) {
|
|
| 2801 | - foreach ($current_user->caps as $key => $caps) {
|
|
| 2802 | - if (geodir_strtolower($key) == 'administrator') {
|
|
| 2803 | - return true; |
|
| 2804 | - break; |
|
| 2805 | - } |
|
| 2806 | - } |
|
| 2807 | - } |
|
| 2808 | - |
|
| 2809 | - return geodir_lisiting_belong_to_user($listing_id, $current_user->ID); |
|
| 2799 | + global $current_user; |
|
| 2800 | + if ($exclude_admin) {
|
|
| 2801 | + foreach ($current_user->caps as $key => $caps) {
|
|
| 2802 | + if (geodir_strtolower($key) == 'administrator') {
|
|
| 2803 | + return true; |
|
| 2804 | + break; |
|
| 2805 | + } |
|
| 2806 | + } |
|
| 2807 | + } |
|
| 2808 | + |
|
| 2809 | + return geodir_lisiting_belong_to_user($listing_id, $current_user->ID); |
|
| 2810 | 2810 | } |
| 2811 | 2811 | |
| 2812 | 2812 | |
@@ -2822,17 +2822,17 @@ discard block |
||
| 2822 | 2822 | function geodir_only_supportable_attachments_remove($file) |
| 2823 | 2823 | {
|
| 2824 | 2824 | |
| 2825 | - global $wpdb; |
|
| 2825 | + global $wpdb; |
|
| 2826 | 2826 | |
| 2827 | - $matches = array(); |
|
| 2827 | + $matches = array(); |
|
| 2828 | 2828 | |
| 2829 | - $pattern = '/-\d+x\d+\./'; |
|
| 2830 | - preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE); |
|
| 2829 | + $pattern = '/-\d+x\d+\./'; |
|
| 2830 | + preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE); |
|
| 2831 | 2831 | |
| 2832 | - if (empty($matches)) |
|
| 2833 | - return ''; |
|
| 2834 | - else |
|
| 2835 | - return $file; |
|
| 2832 | + if (empty($matches)) |
|
| 2833 | + return ''; |
|
| 2834 | + else |
|
| 2835 | + return $file; |
|
| 2836 | 2836 | |
| 2837 | 2837 | } |
| 2838 | 2838 | |
@@ -2849,78 +2849,78 @@ discard block |
||
| 2849 | 2849 | function geodir_set_wp_featured_image($post_id) |
| 2850 | 2850 | {
|
| 2851 | 2851 | |
| 2852 | - global $wpdb, $plugin_prefix; |
|
| 2853 | - $uploads = wp_upload_dir(); |
|
| 2852 | + global $wpdb, $plugin_prefix; |
|
| 2853 | + $uploads = wp_upload_dir(); |
|
| 2854 | 2854 | // print_r($uploads ) ; |
| 2855 | - $post_first_image = $wpdb->get_results( |
|
| 2856 | - $wpdb->prepare( |
|
| 2857 | - "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1 ", array($post_id) |
|
| 2858 | - ) |
|
| 2859 | - ); |
|
| 2860 | - |
|
| 2861 | - $old_attachment_name = ''; |
|
| 2862 | - $post_thumbnail_id = ''; |
|
| 2863 | - if (has_post_thumbnail($post_id)) {
|
|
| 2855 | + $post_first_image = $wpdb->get_results( |
|
| 2856 | + $wpdb->prepare( |
|
| 2857 | + "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1 ", array($post_id) |
|
| 2858 | + ) |
|
| 2859 | + ); |
|
| 2864 | 2860 | |
| 2865 | - if (has_post_thumbnail($post_id)) {
|
|
| 2861 | + $old_attachment_name = ''; |
|
| 2862 | + $post_thumbnail_id = ''; |
|
| 2863 | + if (has_post_thumbnail($post_id)) {
|
|
| 2866 | 2864 | |
| 2867 | - $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2865 | + if (has_post_thumbnail($post_id)) {
|
|
| 2868 | 2866 | |
| 2869 | - $old_attachment_name = basename(get_attached_file($post_thumbnail_id)); |
|
| 2867 | + $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2870 | 2868 | |
| 2871 | - } |
|
| 2872 | - } |
|
| 2869 | + $old_attachment_name = basename(get_attached_file($post_thumbnail_id)); |
|
| 2873 | 2870 | |
| 2874 | - if (!empty($post_first_image)) {
|
|
| 2871 | + } |
|
| 2872 | + } |
|
| 2875 | 2873 | |
| 2876 | - $post_type = get_post_type($post_id); |
|
| 2874 | + if (!empty($post_first_image)) {
|
|
| 2877 | 2875 | |
| 2878 | - $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2876 | + $post_type = get_post_type($post_id); |
|
| 2879 | 2877 | |
| 2880 | - $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
|
|
| 2878 | + $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2881 | 2879 | |
| 2882 | - $new_attachment_name = basename($post_first_image[0]->file); |
|
| 2880 | + $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
|
|
| 2883 | 2881 | |
| 2884 | - if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {
|
|
| 2882 | + $new_attachment_name = basename($post_first_image[0]->file); |
|
| 2885 | 2883 | |
| 2886 | - if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
|
|
| 2884 | + if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {
|
|
| 2887 | 2885 | |
| 2888 | - add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');
|
|
| 2886 | + if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
|
|
| 2889 | 2887 | |
| 2890 | - wp_delete_attachment($post_thumbnail_id); |
|
| 2888 | + add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');
|
|
| 2891 | 2889 | |
| 2892 | - } |
|
| 2893 | - $filename = $uploads['basedir'] . $post_first_image[0]->file; |
|
| 2890 | + wp_delete_attachment($post_thumbnail_id); |
|
| 2894 | 2891 | |
| 2895 | - $attachment = array( |
|
| 2896 | - 'post_mime_type' => $post_first_image[0]->mime_type, |
|
| 2897 | - 'guid' => $uploads['baseurl'] . $post_first_image[0]->file, |
|
| 2898 | - 'post_parent' => $post_id, |
|
| 2899 | - 'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
|
|
| 2900 | - 'post_content' => '' |
|
| 2901 | - ); |
|
| 2892 | + } |
|
| 2893 | + $filename = $uploads['basedir'] . $post_first_image[0]->file; |
|
| 2894 | + |
|
| 2895 | + $attachment = array( |
|
| 2896 | + 'post_mime_type' => $post_first_image[0]->mime_type, |
|
| 2897 | + 'guid' => $uploads['baseurl'] . $post_first_image[0]->file, |
|
| 2898 | + 'post_parent' => $post_id, |
|
| 2899 | + 'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
|
|
| 2900 | + 'post_content' => '' |
|
| 2901 | + ); |
|
| 2902 | 2902 | |
| 2903 | 2903 | |
| 2904 | - $id = wp_insert_attachment($attachment, $filename, $post_id); |
|
| 2904 | + $id = wp_insert_attachment($attachment, $filename, $post_id); |
|
| 2905 | 2905 | |
| 2906 | - if (!is_wp_error($id)) {
|
|
| 2906 | + if (!is_wp_error($id)) {
|
|
| 2907 | 2907 | |
| 2908 | - set_post_thumbnail($post_id, $id); |
|
| 2908 | + set_post_thumbnail($post_id, $id); |
|
| 2909 | 2909 | |
| 2910 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 2911 | - wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename)); |
|
| 2910 | + require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 2911 | + wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename)); |
|
| 2912 | 2912 | |
| 2913 | - } |
|
| 2913 | + } |
|
| 2914 | 2914 | |
| 2915 | - } |
|
| 2915 | + } |
|
| 2916 | 2916 | |
| 2917 | - } else {
|
|
| 2918 | - //set_post_thumbnail($post_id,-1); |
|
| 2917 | + } else {
|
|
| 2918 | + //set_post_thumbnail($post_id,-1); |
|
| 2919 | 2919 | |
| 2920 | - if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) |
|
| 2921 | - wp_delete_attachment($post_thumbnail_id); |
|
| 2920 | + if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) |
|
| 2921 | + wp_delete_attachment($post_thumbnail_id); |
|
| 2922 | 2922 | |
| 2923 | - } |
|
| 2923 | + } |
|
| 2924 | 2924 | } |
| 2925 | 2925 | |
| 2926 | 2926 | |
@@ -2935,53 +2935,53 @@ discard block |
||
| 2935 | 2935 | */ |
| 2936 | 2936 | function gd_copy_original_translation() |
| 2937 | 2937 | {
|
| 2938 | - if (geodir_is_wpml()) {
|
|
| 2939 | - global $wpdb, $table_prefix, $plugin_prefix; |
|
| 2940 | - $post_id = absint($_POST['post_id']); |
|
| 2941 | - $upload_dir = wp_upload_dir(); |
|
| 2942 | - $post_type = get_post_type($_POST['post_id']); |
|
| 2943 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2944 | - |
|
| 2945 | - $post_arr = $wpdb->get_results($wpdb->prepare( |
|
| 2946 | - "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1", |
|
| 2947 | - array($post_id) |
|
| 2948 | - ) |
|
| 2949 | - , ARRAY_A); |
|
| 2950 | - |
|
| 2951 | - $arrImages = $wpdb->get_results( |
|
| 2952 | - $wpdb->prepare( |
|
| 2953 | - "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ", |
|
| 2954 | - array('%image%', $post_id)
|
|
| 2955 | - ) |
|
| 2956 | - ); |
|
| 2957 | - if ($arrImages) {
|
|
| 2958 | - $image_arr = array(); |
|
| 2959 | - foreach ($arrImages as $img) {
|
|
| 2960 | - $image_arr[] = $upload_dir['baseurl'] . $img->file; |
|
| 2961 | - } |
|
| 2962 | - $comma_separated = implode(",", $image_arr);
|
|
| 2963 | - $post_arr[0]['post_images'] = $comma_separated; |
|
| 2964 | - } |
|
| 2965 | - |
|
| 2966 | - |
|
| 2967 | - $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category']; |
|
| 2968 | - $cat_arr = array_filter(explode(",", $cats));
|
|
| 2969 | - $trans_cat = array(); |
|
| 2970 | - foreach ($cat_arr as $cat) {
|
|
| 2971 | - $trans_cat[] = geodir_wpml_object_id($cat, $post_arr[0]['post_type'] . 'category', false); |
|
| 2972 | - } |
|
| 2973 | - |
|
| 2974 | - |
|
| 2975 | - $post_arr[0]['categories'] = array_filter($trans_cat); |
|
| 2938 | + if (geodir_is_wpml()) {
|
|
| 2939 | + global $wpdb, $table_prefix, $plugin_prefix; |
|
| 2940 | + $post_id = absint($_POST['post_id']); |
|
| 2941 | + $upload_dir = wp_upload_dir(); |
|
| 2942 | + $post_type = get_post_type($_POST['post_id']); |
|
| 2943 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2944 | + |
|
| 2945 | + $post_arr = $wpdb->get_results($wpdb->prepare( |
|
| 2946 | + "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1", |
|
| 2947 | + array($post_id) |
|
| 2948 | + ) |
|
| 2949 | + , ARRAY_A); |
|
| 2950 | + |
|
| 2951 | + $arrImages = $wpdb->get_results( |
|
| 2952 | + $wpdb->prepare( |
|
| 2953 | + "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ", |
|
| 2954 | + array('%image%', $post_id)
|
|
| 2955 | + ) |
|
| 2956 | + ); |
|
| 2957 | + if ($arrImages) {
|
|
| 2958 | + $image_arr = array(); |
|
| 2959 | + foreach ($arrImages as $img) {
|
|
| 2960 | + $image_arr[] = $upload_dir['baseurl'] . $img->file; |
|
| 2961 | + } |
|
| 2962 | + $comma_separated = implode(",", $image_arr);
|
|
| 2963 | + $post_arr[0]['post_images'] = $comma_separated; |
|
| 2964 | + } |
|
| 2965 | + |
|
| 2966 | + |
|
| 2967 | + $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category']; |
|
| 2968 | + $cat_arr = array_filter(explode(",", $cats));
|
|
| 2969 | + $trans_cat = array(); |
|
| 2970 | + foreach ($cat_arr as $cat) {
|
|
| 2971 | + $trans_cat[] = geodir_wpml_object_id($cat, $post_arr[0]['post_type'] . 'category', false); |
|
| 2972 | + } |
|
| 2973 | + |
|
| 2974 | + |
|
| 2975 | + $post_arr[0]['categories'] = array_filter($trans_cat); |
|
| 2976 | 2976 | //print_r($image_arr); |
| 2977 | - //print_r($arrImages); |
|
| 2978 | - //echo $_REQUEST['lang']; |
|
| 2977 | + //print_r($arrImages); |
|
| 2978 | + //echo $_REQUEST['lang']; |
|
| 2979 | 2979 | //print_r($post_arr); |
| 2980 | 2980 | //print_r($trans_cat); |
| 2981 | - echo json_encode($post_arr[0]); |
|
| 2981 | + echo json_encode($post_arr[0]); |
|
| 2982 | 2982 | |
| 2983 | - } |
|
| 2984 | - die(); |
|
| 2983 | + } |
|
| 2984 | + die(); |
|
| 2985 | 2985 | } |
| 2986 | 2986 | |
| 2987 | 2987 | |
@@ -3001,54 +3001,54 @@ discard block |
||
| 3001 | 3001 | function geodir_get_custom_fields_type($listing_type = '') |
| 3002 | 3002 | {
|
| 3003 | 3003 | |
| 3004 | - global $wpdb; |
|
| 3004 | + global $wpdb; |
|
| 3005 | 3005 | |
| 3006 | - if ($listing_type == '') |
|
| 3007 | - $listing_type = 'gd_place'; |
|
| 3006 | + if ($listing_type == '') |
|
| 3007 | + $listing_type = 'gd_place'; |
|
| 3008 | 3008 | |
| 3009 | - $fields_info = array(); |
|
| 3009 | + $fields_info = array(); |
|
| 3010 | 3010 | |
| 3011 | - $get_data = $wpdb->get_results( |
|
| 3012 | - $wpdb->prepare( |
|
| 3013 | - "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'", |
|
| 3014 | - array($listing_type) |
|
| 3015 | - ) |
|
| 3016 | - ); |
|
| 3011 | + $get_data = $wpdb->get_results( |
|
| 3012 | + $wpdb->prepare( |
|
| 3013 | + "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'", |
|
| 3014 | + array($listing_type) |
|
| 3015 | + ) |
|
| 3016 | + ); |
|
| 3017 | 3017 | |
| 3018 | - if (!empty($get_data)) {
|
|
| 3018 | + if (!empty($get_data)) {
|
|
| 3019 | 3019 | |
| 3020 | - foreach ($get_data as $data) {
|
|
| 3020 | + foreach ($get_data as $data) {
|
|
| 3021 | 3021 | |
| 3022 | - if ($data->field_type == 'address') {
|
|
| 3022 | + if ($data->field_type == 'address') {
|
|
| 3023 | 3023 | |
| 3024 | - $extra_fields = unserialize($data->extra_fields); |
|
| 3024 | + $extra_fields = unserialize($data->extra_fields); |
|
| 3025 | 3025 | |
| 3026 | - $prefix = $data->htmlvar_name . '_'; |
|
| 3026 | + $prefix = $data->htmlvar_name . '_'; |
|
| 3027 | 3027 | |
| 3028 | - $fields_info[$prefix . 'address'] = $data->field_type; |
|
| 3028 | + $fields_info[$prefix . 'address'] = $data->field_type; |
|
| 3029 | 3029 | |
| 3030 | - if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) |
|
| 3031 | - $fields_info[$prefix . 'zip'] = $data->field_type; |
|
| 3030 | + if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) |
|
| 3031 | + $fields_info[$prefix . 'zip'] = $data->field_type; |
|
| 3032 | 3032 | |
| 3033 | - } else {
|
|
| 3033 | + } else {
|
|
| 3034 | 3034 | |
| 3035 | - $fields_info[$data->htmlvar_name] = $data->field_type; |
|
| 3035 | + $fields_info[$data->htmlvar_name] = $data->field_type; |
|
| 3036 | 3036 | |
| 3037 | - } |
|
| 3037 | + } |
|
| 3038 | 3038 | |
| 3039 | - } |
|
| 3039 | + } |
|
| 3040 | 3040 | |
| 3041 | - } |
|
| 3041 | + } |
|
| 3042 | 3042 | |
| 3043 | - /** |
|
| 3044 | - * Filter to modify custom fields info using listing post type. |
|
| 3045 | - * |
|
| 3046 | - * @since 1.0.0 |
|
| 3047 | - * @package GeoDirectory |
|
| 3048 | - * @return array $fields_info Custom fields info. |
|
| 3049 | - * @param string $listing_type The listing post type. |
|
| 3050 | - */ |
|
| 3051 | - return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);
|
|
| 3043 | + /** |
|
| 3044 | + * Filter to modify custom fields info using listing post type. |
|
| 3045 | + * |
|
| 3046 | + * @since 1.0.0 |
|
| 3047 | + * @package GeoDirectory |
|
| 3048 | + * @return array $fields_info Custom fields info. |
|
| 3049 | + * @param string $listing_type The listing post type. |
|
| 3050 | + */ |
|
| 3051 | + return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);
|
|
| 3052 | 3052 | } |
| 3053 | 3053 | |
| 3054 | 3054 | |
@@ -3063,58 +3063,58 @@ discard block |
||
| 3063 | 3063 | */ |
| 3064 | 3064 | function geodir_function_post_updated($post_ID, $post_after, $post_before) |
| 3065 | 3065 | {
|
| 3066 | - $post_type = get_post_type($post_ID); |
|
| 3066 | + $post_type = get_post_type($post_ID); |
|
| 3067 | 3067 | |
| 3068 | - if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {
|
|
| 3069 | - // send notification to client when post moves from draft to publish |
|
| 3070 | - if (!empty($post_after->post_status) && $post_after->post_status == 'publish' && !empty($post_before->post_status) && ($post_before->post_status == 'draft' || $post_before->post_status == 'auto-draft')) {
|
|
| 3071 | - $post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL; |
|
| 3072 | - $post_author_data = get_userdata($post_author_id); |
|
| 3068 | + if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {
|
|
| 3069 | + // send notification to client when post moves from draft to publish |
|
| 3070 | + if (!empty($post_after->post_status) && $post_after->post_status == 'publish' && !empty($post_before->post_status) && ($post_before->post_status == 'draft' || $post_before->post_status == 'auto-draft')) {
|
|
| 3071 | + $post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL; |
|
| 3072 | + $post_author_data = get_userdata($post_author_id); |
|
| 3073 | 3073 | |
| 3074 | - $to_name = geodir_get_client_name($post_author_id); |
|
| 3074 | + $to_name = geodir_get_client_name($post_author_id); |
|
| 3075 | 3075 | |
| 3076 | - $from_email = geodir_get_site_email_id(); |
|
| 3077 | - $from_name = get_site_emailName(); |
|
| 3078 | - $to_email = $post_author_data->user_email; |
|
| 3076 | + $from_email = geodir_get_site_email_id(); |
|
| 3077 | + $from_name = get_site_emailName(); |
|
| 3078 | + $to_email = $post_author_data->user_email; |
|
| 3079 | 3079 | |
| 3080 | - if (!is_email($to_email) && !empty($post_author_data->user_email)) {
|
|
| 3081 | - $to_email = $post_author_data->user_email; |
|
| 3082 | - } |
|
| 3080 | + if (!is_email($to_email) && !empty($post_author_data->user_email)) {
|
|
| 3081 | + $to_email = $post_author_data->user_email; |
|
| 3082 | + } |
|
| 3083 | 3083 | |
| 3084 | - $message_type = 'listing_published'; |
|
| 3084 | + $message_type = 'listing_published'; |
|
| 3085 | 3085 | |
| 3086 | - if (get_option('geodir_post_published_email_subject') == '') {
|
|
| 3087 | - update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));
|
|
| 3088 | - } |
|
| 3086 | + if (get_option('geodir_post_published_email_subject') == '') {
|
|
| 3087 | + update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));
|
|
| 3088 | + } |
|
| 3089 | 3089 | |
| 3090 | - if (get_option('geodir_post_published_email_content') == '') {
|
|
| 3091 | - update_option('geodir_post_published_email_content', __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory'));
|
|
| 3092 | - } |
|
| 3090 | + if (get_option('geodir_post_published_email_content') == '') {
|
|
| 3091 | + update_option('geodir_post_published_email_content', __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory'));
|
|
| 3092 | + } |
|
| 3093 | 3093 | |
| 3094 | - /** |
|
| 3095 | - * Called before sending the email when listing gets published. |
|
| 3096 | - * |
|
| 3097 | - * @since 1.0.0 |
|
| 3098 | - * @package GeoDirectory |
|
| 3099 | - * @param object $post_after The post object after update. |
|
| 3100 | - * @param object $post_before The post object before update. |
|
| 3101 | - */ |
|
| 3102 | - do_action('geodir_before_listing_published_email', $post_after, $post_before);
|
|
| 3103 | - if (is_email($to_email)) {
|
|
| 3104 | - geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID); |
|
| 3105 | - } |
|
| 3094 | + /** |
|
| 3095 | + * Called before sending the email when listing gets published. |
|
| 3096 | + * |
|
| 3097 | + * @since 1.0.0 |
|
| 3098 | + * @package GeoDirectory |
|
| 3099 | + * @param object $post_after The post object after update. |
|
| 3100 | + * @param object $post_before The post object before update. |
|
| 3101 | + */ |
|
| 3102 | + do_action('geodir_before_listing_published_email', $post_after, $post_before);
|
|
| 3103 | + if (is_email($to_email)) {
|
|
| 3104 | + geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID); |
|
| 3105 | + } |
|
| 3106 | 3106 | |
| 3107 | - /** |
|
| 3108 | - * Called after sending the email when listing gets published. |
|
| 3109 | - * |
|
| 3110 | - * @since 1.0.0 |
|
| 3111 | - * @package GeoDirectory |
|
| 3112 | - * @param object $post_after The post object after update. |
|
| 3113 | - * @param object $post_before The post object before update. |
|
| 3114 | - */ |
|
| 3115 | - do_action('geodir_after_listing_published_email', $post_after, $post_before);
|
|
| 3116 | - } |
|
| 3117 | - } |
|
| 3107 | + /** |
|
| 3108 | + * Called after sending the email when listing gets published. |
|
| 3109 | + * |
|
| 3110 | + * @since 1.0.0 |
|
| 3111 | + * @package GeoDirectory |
|
| 3112 | + * @param object $post_after The post object after update. |
|
| 3113 | + * @param object $post_before The post object before update. |
|
| 3114 | + */ |
|
| 3115 | + do_action('geodir_after_listing_published_email', $post_after, $post_before);
|
|
| 3116 | + } |
|
| 3117 | + } |
|
| 3118 | 3118 | } |
| 3119 | 3119 | |
| 3120 | 3120 | add_action('wp_head', 'geodir_fb_like_thumbnail');
|
@@ -3128,14 +3128,14 @@ discard block |
||
| 3128 | 3128 | */ |
| 3129 | 3129 | function geodir_fb_like_thumbnail(){
|
| 3130 | 3130 | |
| 3131 | - // return if not a single post |
|
| 3132 | - if(!is_single()){return;}
|
|
| 3131 | + // return if not a single post |
|
| 3132 | + if(!is_single()){return;}
|
|
| 3133 | 3133 | |
| 3134 | - global $post; |
|
| 3135 | - if(isset($post->featured_image) && $post->featured_image){
|
|
| 3136 | - $upload_dir = wp_upload_dir(); |
|
| 3137 | - $thumb = $upload_dir['baseurl'].$post->featured_image; |
|
| 3138 | - echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n"; |
|
| 3134 | + global $post; |
|
| 3135 | + if(isset($post->featured_image) && $post->featured_image){
|
|
| 3136 | + $upload_dir = wp_upload_dir(); |
|
| 3137 | + $thumb = $upload_dir['baseurl'].$post->featured_image; |
|
| 3138 | + echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n"; |
|
| 3139 | 3139 | |
| 3140 | - } |
|
| 3140 | + } |
|
| 3141 | 3141 | } |
| 3142 | 3142 | \ No newline at end of file |
@@ -33,265 +33,265 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | function geodir_add_nav_menu_items() |
| 35 | 35 | {
|
| 36 | - $items = ''; |
|
| 37 | - // apply filter to add more navigations // -Filter-Location-Manager |
|
| 38 | - |
|
| 39 | - if (get_option('geodir_show_listing_nav')) {
|
|
| 40 | - |
|
| 41 | - $menu_class = ''; |
|
| 42 | - if (geodir_is_page('listing'))
|
|
| 43 | - $menu_class = 'current-menu-item'; |
|
| 44 | - |
|
| 45 | - |
|
| 46 | - //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION |
|
| 47 | - $post_types = geodir_get_posttypes('object');
|
|
| 48 | - $show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');
|
|
| 49 | - if (!empty($post_types)) {
|
|
| 50 | - foreach ($post_types as $post_type => $args) {
|
|
| 51 | - if (!empty($show_post_type_main_nav)) {
|
|
| 52 | - if (in_array($post_type, $show_post_type_main_nav)) {
|
|
| 53 | - if (get_post_type_archive_link($post_type)) {
|
|
| 54 | - $menu_class = ''; |
|
| 55 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
|
| 56 | - $menu_class = 'current-menu-item'; |
|
| 57 | - /** |
|
| 58 | - * Filter the menu li class. |
|
| 59 | - * |
|
| 60 | - * @since 1.0.0 |
|
| 61 | - * @param string $menu_class The menu HTML class. |
|
| 62 | - */ |
|
| 63 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 64 | - /** |
|
| 65 | - * Filter the menu a class. |
|
| 66 | - * |
|
| 67 | - * @since 1.0.0 |
|
| 68 | - */ |
|
| 69 | - $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 70 | - $items .= '<li class="' . $li_class . '"> |
|
| 36 | + $items = ''; |
|
| 37 | + // apply filter to add more navigations // -Filter-Location-Manager |
|
| 38 | + |
|
| 39 | + if (get_option('geodir_show_listing_nav')) {
|
|
| 40 | + |
|
| 41 | + $menu_class = ''; |
|
| 42 | + if (geodir_is_page('listing'))
|
|
| 43 | + $menu_class = 'current-menu-item'; |
|
| 44 | + |
|
| 45 | + |
|
| 46 | + //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION |
|
| 47 | + $post_types = geodir_get_posttypes('object');
|
|
| 48 | + $show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');
|
|
| 49 | + if (!empty($post_types)) {
|
|
| 50 | + foreach ($post_types as $post_type => $args) {
|
|
| 51 | + if (!empty($show_post_type_main_nav)) {
|
|
| 52 | + if (in_array($post_type, $show_post_type_main_nav)) {
|
|
| 53 | + if (get_post_type_archive_link($post_type)) {
|
|
| 54 | + $menu_class = ''; |
|
| 55 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
|
| 56 | + $menu_class = 'current-menu-item'; |
|
| 57 | + /** |
|
| 58 | + * Filter the menu li class. |
|
| 59 | + * |
|
| 60 | + * @since 1.0.0 |
|
| 61 | + * @param string $menu_class The menu HTML class. |
|
| 62 | + */ |
|
| 63 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 64 | + /** |
|
| 65 | + * Filter the menu a class. |
|
| 66 | + * |
|
| 67 | + * @since 1.0.0 |
|
| 68 | + */ |
|
| 69 | + $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 70 | + $items .= '<li class="' . $li_class . '"> |
|
| 71 | 71 | <a href="' . get_post_type_archive_link($post_type) . '" class="' . $a_class . '"> |
| 72 | 72 | ' . __(geodir_utf8_ucfirst($args->labels->name),'geodirectory') . ' |
| 73 | 73 | </a> |
| 74 | 74 | </li>'; |
| 75 | - } |
|
| 76 | - } |
|
| 77 | - } |
|
| 78 | - } |
|
| 79 | - } |
|
| 80 | - //END LISTING OF POST TYPE IN MAIN NAVIGATION |
|
| 81 | - |
|
| 82 | - $view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');
|
|
| 83 | - $is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false; |
|
| 84 | - if ($is_listing_sub_meny_exists) {
|
|
| 85 | - /** |
|
| 86 | - * Filter the menu li class. |
|
| 87 | - * |
|
| 88 | - * @since 1.0.0 |
|
| 89 | - * @param string $menu_class The menu HTML class. |
|
| 90 | - */ |
|
| 91 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);
|
|
| 92 | - /** |
|
| 93 | - * Filter the sub menu li class. |
|
| 94 | - * |
|
| 95 | - * @since 1.0.0 |
|
| 96 | - * @param string $menu_class The menu HTML class. |
|
| 97 | - */ |
|
| 98 | - $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 99 | - /** |
|
| 100 | - * Filter the sub menu ul class. |
|
| 101 | - * |
|
| 102 | - * @since 1.0.0 |
|
| 103 | - */ |
|
| 104 | - $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');
|
|
| 105 | - /** |
|
| 106 | - * Filter the menu a class. |
|
| 107 | - * |
|
| 108 | - * @since 1.0.0 |
|
| 109 | - */ |
|
| 110 | - $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 111 | - /** |
|
| 112 | - * Filter the sub menu a class. |
|
| 113 | - * |
|
| 114 | - * @since 1.0.0 |
|
| 115 | - */ |
|
| 116 | - $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
|
|
| 117 | - $items .= '<li class="' . $li_class . '"> |
|
| 75 | + } |
|
| 76 | + } |
|
| 77 | + } |
|
| 78 | + } |
|
| 79 | + } |
|
| 80 | + //END LISTING OF POST TYPE IN MAIN NAVIGATION |
|
| 81 | + |
|
| 82 | + $view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');
|
|
| 83 | + $is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false; |
|
| 84 | + if ($is_listing_sub_meny_exists) {
|
|
| 85 | + /** |
|
| 86 | + * Filter the menu li class. |
|
| 87 | + * |
|
| 88 | + * @since 1.0.0 |
|
| 89 | + * @param string $menu_class The menu HTML class. |
|
| 90 | + */ |
|
| 91 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);
|
|
| 92 | + /** |
|
| 93 | + * Filter the sub menu li class. |
|
| 94 | + * |
|
| 95 | + * @since 1.0.0 |
|
| 96 | + * @param string $menu_class The menu HTML class. |
|
| 97 | + */ |
|
| 98 | + $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 99 | + /** |
|
| 100 | + * Filter the sub menu ul class. |
|
| 101 | + * |
|
| 102 | + * @since 1.0.0 |
|
| 103 | + */ |
|
| 104 | + $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');
|
|
| 105 | + /** |
|
| 106 | + * Filter the menu a class. |
|
| 107 | + * |
|
| 108 | + * @since 1.0.0 |
|
| 109 | + */ |
|
| 110 | + $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 111 | + /** |
|
| 112 | + * Filter the sub menu a class. |
|
| 113 | + * |
|
| 114 | + * @since 1.0.0 |
|
| 115 | + */ |
|
| 116 | + $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
|
|
| 117 | + $items .= '<li class="' . $li_class . '"> |
|
| 118 | 118 | <a href="#" class="' . $a_class . '">' . __('Listing', 'geodirectory') . '</a>
|
| 119 | 119 | <ul class="' . $sub_ul_class . '">'; |
| 120 | - $post_types = geodir_get_posttypes('object');
|
|
| 120 | + $post_types = geodir_get_posttypes('object');
|
|
| 121 | 121 | |
| 122 | - $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');
|
|
| 122 | + $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');
|
|
| 123 | 123 | |
| 124 | - if (!empty($post_types)) {
|
|
| 125 | - global $geodir_add_location_url; |
|
| 126 | - $geodir_add_location_url = true; |
|
| 127 | - foreach ($post_types as $post_type => $args) {
|
|
| 128 | - if (!empty($show_listing_post_types)) {
|
|
| 129 | - if (in_array($post_type, $show_listing_post_types)) {
|
|
| 130 | - if (get_post_type_archive_link($post_type)) {
|
|
| 124 | + if (!empty($post_types)) {
|
|
| 125 | + global $geodir_add_location_url; |
|
| 126 | + $geodir_add_location_url = true; |
|
| 127 | + foreach ($post_types as $post_type => $args) {
|
|
| 128 | + if (!empty($show_listing_post_types)) {
|
|
| 129 | + if (in_array($post_type, $show_listing_post_types)) {
|
|
| 130 | + if (get_post_type_archive_link($post_type)) {
|
|
| 131 | 131 | |
| 132 | - $menu_class = ''; |
|
| 133 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
|
| 134 | - $menu_class = 'current-menu-item'; |
|
| 132 | + $menu_class = ''; |
|
| 133 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
|
| 134 | + $menu_class = 'current-menu-item'; |
|
| 135 | 135 | |
| 136 | - $items .= '<li class="' . $sub_li_class . '"> |
|
| 136 | + $items .= '<li class="' . $sub_li_class . '"> |
|
| 137 | 137 | <a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '"> |
| 138 | 138 | ' . __(geodir_utf8_ucfirst($args->labels->name),'geodirectory') . ' |
| 139 | 139 | </a> |
| 140 | 140 | </li>'; |
| 141 | - } |
|
| 142 | - } |
|
| 143 | - } |
|
| 144 | - } |
|
| 145 | - $geodir_add_location_url = NULL; |
|
| 146 | - } |
|
| 141 | + } |
|
| 142 | + } |
|
| 143 | + } |
|
| 144 | + } |
|
| 145 | + $geodir_add_location_url = NULL; |
|
| 146 | + } |
|
| 147 | 147 | |
| 148 | - $items .= ' </ul> '; |
|
| 149 | - /** |
|
| 150 | - * Filter called after the sub menu closing ul tag for dynamic added menu items. |
|
| 151 | - * |
|
| 152 | - * @since 1.5.9 |
|
| 153 | - */ |
|
| 154 | - $items .= apply_filters('geodir_menu_after_sub_ul','');
|
|
| 155 | - $items .= '</li>'; |
|
| 156 | - } |
|
| 157 | - } |
|
| 158 | - |
|
| 159 | - if (get_option('geodir_show_addlisting_nav')) {
|
|
| 160 | - |
|
| 161 | - $menu_class = ''; |
|
| 162 | - if (geodir_is_page('add-listing'))
|
|
| 163 | - $menu_class = 'current-menu-item'; |
|
| 164 | - |
|
| 165 | - //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION |
|
| 166 | - $post_types = geodir_get_posttypes('object');
|
|
| 167 | - $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');
|
|
| 168 | - $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 169 | - |
|
| 170 | - if (!empty($post_types)) {
|
|
| 171 | - foreach ($post_types as $post_type => $args) {
|
|
| 172 | - if (!empty($geodir_allow_posttype_frontend)) {
|
|
| 173 | - if (in_array($post_type, $geodir_allow_posttype_frontend)) {
|
|
| 174 | - if (!empty($show_add_listing_post_types_main_nav)) {
|
|
| 175 | - if (in_array($post_type, $show_add_listing_post_types_main_nav)) {
|
|
| 176 | - if (geodir_get_addlisting_link($post_type)) {
|
|
| 177 | - |
|
| 178 | - $menu_class = ''; |
|
| 179 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
|
|
| 180 | - $menu_class = 'current-menu-item'; |
|
| 181 | - /** |
|
| 182 | - * Filter the menu li class. |
|
| 183 | - * |
|
| 184 | - * @since 1.0.0 |
|
| 185 | - * @param string $menu_class The menu HTML class. |
|
| 186 | - */ |
|
| 187 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 188 | - /** |
|
| 189 | - * Filter the menu a class. |
|
| 190 | - * |
|
| 191 | - * @since 1.0.0 |
|
| 192 | - */ |
|
| 193 | - $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 194 | - $cpt_name = __($args->labels->singular_name, 'geodirectory'); |
|
| 195 | - $items .= '<li class="' . $li_class . '"> |
|
| 148 | + $items .= ' </ul> '; |
|
| 149 | + /** |
|
| 150 | + * Filter called after the sub menu closing ul tag for dynamic added menu items. |
|
| 151 | + * |
|
| 152 | + * @since 1.5.9 |
|
| 153 | + */ |
|
| 154 | + $items .= apply_filters('geodir_menu_after_sub_ul','');
|
|
| 155 | + $items .= '</li>'; |
|
| 156 | + } |
|
| 157 | + } |
|
| 158 | + |
|
| 159 | + if (get_option('geodir_show_addlisting_nav')) {
|
|
| 160 | + |
|
| 161 | + $menu_class = ''; |
|
| 162 | + if (geodir_is_page('add-listing'))
|
|
| 163 | + $menu_class = 'current-menu-item'; |
|
| 164 | + |
|
| 165 | + //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION |
|
| 166 | + $post_types = geodir_get_posttypes('object');
|
|
| 167 | + $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');
|
|
| 168 | + $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 169 | + |
|
| 170 | + if (!empty($post_types)) {
|
|
| 171 | + foreach ($post_types as $post_type => $args) {
|
|
| 172 | + if (!empty($geodir_allow_posttype_frontend)) {
|
|
| 173 | + if (in_array($post_type, $geodir_allow_posttype_frontend)) {
|
|
| 174 | + if (!empty($show_add_listing_post_types_main_nav)) {
|
|
| 175 | + if (in_array($post_type, $show_add_listing_post_types_main_nav)) {
|
|
| 176 | + if (geodir_get_addlisting_link($post_type)) {
|
|
| 177 | + |
|
| 178 | + $menu_class = ''; |
|
| 179 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
|
|
| 180 | + $menu_class = 'current-menu-item'; |
|
| 181 | + /** |
|
| 182 | + * Filter the menu li class. |
|
| 183 | + * |
|
| 184 | + * @since 1.0.0 |
|
| 185 | + * @param string $menu_class The menu HTML class. |
|
| 186 | + */ |
|
| 187 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 188 | + /** |
|
| 189 | + * Filter the menu a class. |
|
| 190 | + * |
|
| 191 | + * @since 1.0.0 |
|
| 192 | + */ |
|
| 193 | + $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 194 | + $cpt_name = __($args->labels->singular_name, 'geodirectory'); |
|
| 195 | + $items .= '<li class="' . $li_class . '"> |
|
| 196 | 196 | <a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $a_class . '"> |
| 197 | 197 | ' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '
|
| 198 | 198 | </a> |
| 199 | 199 | </li>'; |
| 200 | - } |
|
| 201 | - } |
|
| 202 | - } |
|
| 203 | - } |
|
| 204 | - } |
|
| 205 | - } |
|
| 206 | - } |
|
| 207 | - //END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION |
|
| 208 | - } |
|
| 209 | - |
|
| 210 | - $view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');
|
|
| 211 | - $is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false; |
|
| 212 | - if ($is_add_listing_sub_meny_exists) {
|
|
| 213 | - |
|
| 214 | - if (get_option('geodir_show_addlisting_nav')) {
|
|
| 215 | - /** |
|
| 216 | - * Filter the menu li class. |
|
| 217 | - * |
|
| 218 | - * @since 1.0.0 |
|
| 219 | - * @param string $menu_class The menu HTML class. |
|
| 220 | - */ |
|
| 221 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);
|
|
| 222 | - /** |
|
| 223 | - * Filter the sub menu li class. |
|
| 224 | - * |
|
| 225 | - * @since 1.0.0 |
|
| 226 | - * @param string $menu_class The menu HTML class. |
|
| 227 | - */ |
|
| 228 | - $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 229 | - /** |
|
| 230 | - * Filter the sub menu ul class. |
|
| 231 | - * |
|
| 232 | - * @since 1.0.0 |
|
| 233 | - */ |
|
| 234 | - $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');
|
|
| 235 | - /** |
|
| 236 | - * Filter the menu a class. |
|
| 237 | - * |
|
| 238 | - * @since 1.0.0 |
|
| 239 | - */ |
|
| 240 | - $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 241 | - /** |
|
| 242 | - * Filter the sub menu a class. |
|
| 243 | - * |
|
| 244 | - * @since 1.0.0 |
|
| 245 | - */ |
|
| 246 | - $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
|
|
| 247 | - $items .= '<li class="' . $li_class . '"> |
|
| 200 | + } |
|
| 201 | + } |
|
| 202 | + } |
|
| 203 | + } |
|
| 204 | + } |
|
| 205 | + } |
|
| 206 | + } |
|
| 207 | + //END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION |
|
| 208 | + } |
|
| 209 | + |
|
| 210 | + $view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');
|
|
| 211 | + $is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false; |
|
| 212 | + if ($is_add_listing_sub_meny_exists) {
|
|
| 213 | + |
|
| 214 | + if (get_option('geodir_show_addlisting_nav')) {
|
|
| 215 | + /** |
|
| 216 | + * Filter the menu li class. |
|
| 217 | + * |
|
| 218 | + * @since 1.0.0 |
|
| 219 | + * @param string $menu_class The menu HTML class. |
|
| 220 | + */ |
|
| 221 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);
|
|
| 222 | + /** |
|
| 223 | + * Filter the sub menu li class. |
|
| 224 | + * |
|
| 225 | + * @since 1.0.0 |
|
| 226 | + * @param string $menu_class The menu HTML class. |
|
| 227 | + */ |
|
| 228 | + $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 229 | + /** |
|
| 230 | + * Filter the sub menu ul class. |
|
| 231 | + * |
|
| 232 | + * @since 1.0.0 |
|
| 233 | + */ |
|
| 234 | + $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');
|
|
| 235 | + /** |
|
| 236 | + * Filter the menu a class. |
|
| 237 | + * |
|
| 238 | + * @since 1.0.0 |
|
| 239 | + */ |
|
| 240 | + $a_class = apply_filters('geodir_menu_a_class', '');
|
|
| 241 | + /** |
|
| 242 | + * Filter the sub menu a class. |
|
| 243 | + * |
|
| 244 | + * @since 1.0.0 |
|
| 245 | + */ |
|
| 246 | + $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
|
|
| 247 | + $items .= '<li class="' . $li_class . '"> |
|
| 248 | 248 | <a href="#" class="' . $a_class . '">' . __('Add Listing', 'geodirectory') . '</a>
|
| 249 | 249 | <ul class="' . $sub_ul_class . '">'; |
| 250 | 250 | |
| 251 | - $post_types = geodir_get_posttypes('object');
|
|
| 252 | - |
|
| 253 | - $show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');
|
|
| 254 | - |
|
| 255 | - if (!empty($post_types)) {
|
|
| 256 | - foreach ($post_types as $post_type => $args) {
|
|
| 257 | - if (!empty($geodir_allow_posttype_frontend)) {
|
|
| 258 | - if (in_array($post_type, $geodir_allow_posttype_frontend)) {
|
|
| 259 | - if (!empty($show_add_listing_post_types)) {
|
|
| 260 | - if (in_array($post_type, $show_add_listing_post_types)) {
|
|
| 261 | - if (geodir_get_addlisting_link($post_type)) {
|
|
| 262 | - |
|
| 263 | - $menu_class = ''; |
|
| 264 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
|
|
| 265 | - $menu_class = 'current-menu-item'; |
|
| 266 | - /** |
|
| 267 | - * Filter the menu li class. |
|
| 268 | - * |
|
| 269 | - * @since 1.0.0 |
|
| 270 | - * @param string $menu_class The menu HTML class. |
|
| 271 | - */ |
|
| 272 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 273 | - $cpt_name = __($args->labels->singular_name, 'geodirectory'); |
|
| 274 | - $items .= '<li class="' . $sub_li_class . '"> |
|
| 251 | + $post_types = geodir_get_posttypes('object');
|
|
| 252 | + |
|
| 253 | + $show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');
|
|
| 254 | + |
|
| 255 | + if (!empty($post_types)) {
|
|
| 256 | + foreach ($post_types as $post_type => $args) {
|
|
| 257 | + if (!empty($geodir_allow_posttype_frontend)) {
|
|
| 258 | + if (in_array($post_type, $geodir_allow_posttype_frontend)) {
|
|
| 259 | + if (!empty($show_add_listing_post_types)) {
|
|
| 260 | + if (in_array($post_type, $show_add_listing_post_types)) {
|
|
| 261 | + if (geodir_get_addlisting_link($post_type)) {
|
|
| 262 | + |
|
| 263 | + $menu_class = ''; |
|
| 264 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
|
|
| 265 | + $menu_class = 'current-menu-item'; |
|
| 266 | + /** |
|
| 267 | + * Filter the menu li class. |
|
| 268 | + * |
|
| 269 | + * @since 1.0.0 |
|
| 270 | + * @param string $menu_class The menu HTML class. |
|
| 271 | + */ |
|
| 272 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 273 | + $cpt_name = __($args->labels->singular_name, 'geodirectory'); |
|
| 274 | + $items .= '<li class="' . $sub_li_class . '"> |
|
| 275 | 275 | <a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $sub_a_class . '"> |
| 276 | 276 | ' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '
|
| 277 | 277 | </a> |
| 278 | 278 | </li>'; |
| 279 | - } |
|
| 280 | - } |
|
| 281 | - } |
|
| 282 | - } |
|
| 283 | - } |
|
| 284 | - } |
|
| 285 | - } |
|
| 279 | + } |
|
| 280 | + } |
|
| 281 | + } |
|
| 282 | + } |
|
| 283 | + } |
|
| 284 | + } |
|
| 285 | + } |
|
| 286 | 286 | |
| 287 | - $items .= ' </ul> '; |
|
| 288 | - $items .= apply_filters('geodir_menu_after_sub_ul','');
|
|
| 289 | - $items .= '</li>'; |
|
| 287 | + $items .= ' </ul> '; |
|
| 288 | + $items .= apply_filters('geodir_menu_after_sub_ul','');
|
|
| 289 | + $items .= '</li>'; |
|
| 290 | 290 | |
| 291 | - } |
|
| 292 | - } |
|
| 293 | - // apply filter to add more navigations // -Filter-Location-Manager |
|
| 294 | - return $items; |
|
| 291 | + } |
|
| 292 | + } |
|
| 293 | + // apply filter to add more navigations // -Filter-Location-Manager |
|
| 294 | + return $items; |
|
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | |
@@ -309,20 +309,20 @@ discard block |
||
| 309 | 309 | */ |
| 310 | 310 | function geodir_pagemenu_items($menu, $args) |
| 311 | 311 | {
|
| 312 | - $locations = get_nav_menu_locations(); |
|
| 313 | - $geodir_theme_location = get_option('geodir_theme_location_nav');
|
|
| 314 | - $geodir_theme_location_nav = array(); |
|
| 315 | - if (empty($locations) && empty($geodir_theme_location)) {
|
|
| 316 | - $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 317 | - $geodir_theme_location_nav[] = $args['theme_location']; |
|
| 318 | - update_option('geodir_theme_location_nav', $geodir_theme_location_nav);
|
|
| 319 | - } |
|
| 320 | - //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet. |
|
| 312 | + $locations = get_nav_menu_locations(); |
|
| 313 | + $geodir_theme_location = get_option('geodir_theme_location_nav');
|
|
| 314 | + $geodir_theme_location_nav = array(); |
|
| 315 | + if (empty($locations) && empty($geodir_theme_location)) {
|
|
| 316 | + $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 317 | + $geodir_theme_location_nav[] = $args['theme_location']; |
|
| 318 | + update_option('geodir_theme_location_nav', $geodir_theme_location_nav);
|
|
| 319 | + } |
|
| 320 | + //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet. |
|
| 321 | 321 | // $menu = str_replace("</ul></div>",geodir_add_nav_menu_items()."</ul></div>",$menu);
|
| 322 | - else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location)) |
|
| 323 | - $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 322 | + else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location)) |
|
| 323 | + $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 324 | 324 | |
| 325 | - return $menu; |
|
| 325 | + return $menu; |
|
| 326 | 326 | |
| 327 | 327 | } |
| 328 | 328 | |
@@ -342,18 +342,18 @@ discard block |
||
| 342 | 342 | function geodir_menu_items($items, $args) |
| 343 | 343 | {
|
| 344 | 344 | |
| 345 | - $location = $args->theme_location; |
|
| 345 | + $location = $args->theme_location; |
|
| 346 | 346 | |
| 347 | - $geodir_theme_location = get_option('geodir_theme_location_nav');
|
|
| 347 | + $geodir_theme_location = get_option('geodir_theme_location_nav');
|
|
| 348 | 348 | |
| 349 | - if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {
|
|
| 349 | + if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {
|
|
| 350 | 350 | |
| 351 | - $items = $items . geodir_add_nav_menu_items(); |
|
| 352 | - return $items; |
|
| 351 | + $items = $items . geodir_add_nav_menu_items(); |
|
| 352 | + return $items; |
|
| 353 | 353 | |
| 354 | - } else {
|
|
| 355 | - return $items; |
|
| 356 | - } |
|
| 354 | + } else {
|
|
| 355 | + return $items; |
|
| 356 | + } |
|
| 357 | 357 | } |
| 358 | 358 | |
| 359 | 359 | /** |
@@ -368,25 +368,25 @@ discard block |
||
| 368 | 368 | */ |
| 369 | 369 | function geodir_get_category_all_array() |
| 370 | 370 | {
|
| 371 | - global $wpdb; |
|
| 372 | - $return_array = array(); |
|
| 373 | - |
|
| 374 | - $taxonomies = geodir_get_taxonomies(); |
|
| 375 | - $taxonomies = implode("','", $taxonomies);
|
|
| 376 | - $taxonomies = "'" . $taxonomies . "'"; |
|
| 377 | - |
|
| 378 | - $pn_categories = $wpdb->get_results( |
|
| 379 | - $wpdb->prepare( |
|
| 380 | - "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy, $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name", |
|
| 381 | - array($wpdb->terms . term_id) |
|
| 382 | - ) |
|
| 383 | - ); |
|
| 384 | - |
|
| 385 | - foreach ($pn_categories as $pn_categories_obj) {
|
|
| 386 | - $return_array[] = array("id" => $pn_categories_obj->cat_ID,
|
|
| 387 | - "title" => $pn_categories_obj->name,); |
|
| 388 | - } |
|
| 389 | - return $return_array; |
|
| 371 | + global $wpdb; |
|
| 372 | + $return_array = array(); |
|
| 373 | + |
|
| 374 | + $taxonomies = geodir_get_taxonomies(); |
|
| 375 | + $taxonomies = implode("','", $taxonomies);
|
|
| 376 | + $taxonomies = "'" . $taxonomies . "'"; |
|
| 377 | + |
|
| 378 | + $pn_categories = $wpdb->get_results( |
|
| 379 | + $wpdb->prepare( |
|
| 380 | + "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy, $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name", |
|
| 381 | + array($wpdb->terms . term_id) |
|
| 382 | + ) |
|
| 383 | + ); |
|
| 384 | + |
|
| 385 | + foreach ($pn_categories as $pn_categories_obj) {
|
|
| 386 | + $return_array[] = array("id" => $pn_categories_obj->cat_ID,
|
|
| 387 | + "title" => $pn_categories_obj->name,); |
|
| 388 | + } |
|
| 389 | + return $return_array; |
|
| 390 | 390 | } |
| 391 | 391 | |
| 392 | 392 | |
@@ -402,49 +402,49 @@ discard block |
||
| 402 | 402 | * @return string The post type. |
| 403 | 403 | */ |
| 404 | 404 | function geodir_get_current_posttype() {
|
| 405 | - global $wp_query, $post, $geodir_post_type; |
|
| 405 | + global $wp_query, $post, $geodir_post_type; |
|
| 406 | 406 | |
| 407 | - $geodir_post_type = get_query_var('post_type');
|
|
| 407 | + $geodir_post_type = get_query_var('post_type');
|
|
| 408 | 408 | |
| 409 | - if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
|
|
| 410 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 411 | - $geodir_post_type = get_post_type((int)$_REQUEST['pid']); |
|
| 412 | - elseif (isset($_REQUEST['listing_type'])) |
|
| 413 | - $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 414 | - } |
|
| 409 | + if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
|
|
| 410 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 411 | + $geodir_post_type = get_post_type((int)$_REQUEST['pid']); |
|
| 412 | + elseif (isset($_REQUEST['listing_type'])) |
|
| 413 | + $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 414 | + } |
|
| 415 | 415 | |
| 416 | - if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))
|
|
| 417 | - $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 416 | + if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))
|
|
| 417 | + $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 418 | 418 | |
| 419 | - if (is_tax()) |
|
| 420 | - $geodir_post_type = geodir_get_taxonomy_posttype(); |
|
| 419 | + if (is_tax()) |
|
| 420 | + $geodir_post_type = geodir_get_taxonomy_posttype(); |
|
| 421 | 421 | |
| 422 | - // Retrive post type for map marker html ajax request on preview page. |
|
| 423 | - if (empty($geodir_post_type) && defined('DOING_AJAX') && !empty($post)) {
|
|
| 424 | - if (!empty($post->post_type)) {
|
|
| 425 | - $geodir_post_type = $post->post_type; |
|
| 426 | - } else if (!empty($post->listing_type)) {
|
|
| 427 | - $geodir_post_type = $post->listing_type; |
|
| 428 | - } |
|
| 429 | - } |
|
| 422 | + // Retrive post type for map marker html ajax request on preview page. |
|
| 423 | + if (empty($geodir_post_type) && defined('DOING_AJAX') && !empty($post)) {
|
|
| 424 | + if (!empty($post->post_type)) {
|
|
| 425 | + $geodir_post_type = $post->post_type; |
|
| 426 | + } else if (!empty($post->listing_type)) {
|
|
| 427 | + $geodir_post_type = $post->listing_type; |
|
| 428 | + } |
|
| 429 | + } |
|
| 430 | 430 | |
| 431 | - $all_postypes = geodir_get_posttypes(); |
|
| 432 | - $all_postypes = stripslashes_deep($all_postypes); |
|
| 431 | + $all_postypes = geodir_get_posttypes(); |
|
| 432 | + $all_postypes = stripslashes_deep($all_postypes); |
|
| 433 | 433 | |
| 434 | - if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) |
|
| 435 | - $geodir_post_type = ''; |
|
| 434 | + if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) |
|
| 435 | + $geodir_post_type = ''; |
|
| 436 | 436 | |
| 437 | - if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){
|
|
| 438 | - $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 439 | - } |
|
| 437 | + if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){
|
|
| 438 | + $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 439 | + } |
|
| 440 | 440 | |
| 441 | 441 | |
| 442 | - /** |
|
| 443 | - * Filter the default CPT return. |
|
| 444 | - * |
|
| 445 | - * @since 1.6.9 |
|
| 446 | - */ |
|
| 447 | - return apply_filters('geodir_get_current_posttype',$geodir_post_type);
|
|
| 442 | + /** |
|
| 443 | + * Filter the default CPT return. |
|
| 444 | + * |
|
| 445 | + * @since 1.6.9 |
|
| 446 | + */ |
|
| 447 | + return apply_filters('geodir_get_current_posttype',$geodir_post_type);
|
|
| 448 | 448 | } |
| 449 | 449 | |
| 450 | 450 | /** |
@@ -458,22 +458,22 @@ discard block |
||
| 458 | 458 | */ |
| 459 | 459 | function geodir_get_default_posttype() |
| 460 | 460 | {
|
| 461 | - $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) ); |
|
| 462 | - |
|
| 463 | - $stype = false; |
|
| 464 | - foreach ( $post_types as $post_type => $info ) {
|
|
| 465 | - global $wpdb; |
|
| 466 | - $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) ); |
|
| 467 | - if ( $has_posts ) {
|
|
| 468 | - $stype = $post_type; break; |
|
| 469 | - } |
|
| 470 | - } |
|
| 471 | - |
|
| 472 | - if(!$stype){
|
|
| 473 | - $stype = 'gd_place'; |
|
| 474 | - } |
|
| 475 | - |
|
| 476 | - return $stype; |
|
| 461 | + $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) ); |
|
| 462 | + |
|
| 463 | + $stype = false; |
|
| 464 | + foreach ( $post_types as $post_type => $info ) {
|
|
| 465 | + global $wpdb; |
|
| 466 | + $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) ); |
|
| 467 | + if ( $has_posts ) {
|
|
| 468 | + $stype = $post_type; break; |
|
| 469 | + } |
|
| 470 | + } |
|
| 471 | + |
|
| 472 | + if(!$stype){
|
|
| 473 | + $stype = 'gd_place'; |
|
| 474 | + } |
|
| 475 | + |
|
| 476 | + return $stype; |
|
| 477 | 477 | } |
| 478 | 478 | |
| 479 | 479 | /** |
@@ -487,21 +487,21 @@ discard block |
||
| 487 | 487 | */ |
| 488 | 488 | function geodir_get_posttypes($output = 'names') |
| 489 | 489 | {
|
| 490 | - $post_types = array(); |
|
| 491 | - $post_types = get_option('geodir_post_types');
|
|
| 492 | - $post_types = stripslashes_deep($post_types); |
|
| 493 | - if (!empty($post_types)) {
|
|
| 494 | - switch ($output): |
|
| 495 | - case 'object': |
|
| 496 | - case 'Object': |
|
| 497 | - $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types; |
|
| 498 | - break; |
|
| 499 | - case 'array': |
|
| 500 | - case 'Array': |
|
| 501 | - $post_types = (array)$post_types; |
|
| 502 | - break; |
|
| 490 | + $post_types = array(); |
|
| 491 | + $post_types = get_option('geodir_post_types');
|
|
| 492 | + $post_types = stripslashes_deep($post_types); |
|
| 493 | + if (!empty($post_types)) {
|
|
| 494 | + switch ($output): |
|
| 495 | + case 'object': |
|
| 496 | + case 'Object': |
|
| 497 | + $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types; |
|
| 498 | + break; |
|
| 499 | + case 'array': |
|
| 500 | + case 'Array': |
|
| 501 | + $post_types = (array)$post_types; |
|
| 502 | + break; |
|
| 503 | 503 | case 'options': |
| 504 | - $post_types = (array)$post_types; |
|
| 504 | + $post_types = (array)$post_types; |
|
| 505 | 505 | |
| 506 | 506 | $options = array(); |
| 507 | 507 | if (!empty($post_types)) {
|
@@ -510,17 +510,17 @@ discard block |
||
| 510 | 510 | } |
| 511 | 511 | } |
| 512 | 512 | $post_types = $options; |
| 513 | - break; |
|
| 514 | - default: |
|
| 515 | - $post_types = array_keys($post_types); |
|
| 516 | - break; |
|
| 517 | - endswitch; |
|
| 518 | - } |
|
| 519 | - |
|
| 520 | - if (!empty($post_types)) |
|
| 521 | - return $post_types; |
|
| 522 | - else |
|
| 523 | - return array(); |
|
| 513 | + break; |
|
| 514 | + default: |
|
| 515 | + $post_types = array_keys($post_types); |
|
| 516 | + break; |
|
| 517 | + endswitch; |
|
| 518 | + } |
|
| 519 | + |
|
| 520 | + if (!empty($post_types)) |
|
| 521 | + return $post_types; |
|
| 522 | + else |
|
| 523 | + return array(); |
|
| 524 | 524 | } |
| 525 | 525 | |
| 526 | 526 | /** |
@@ -533,108 +533,108 @@ discard block |
||
| 533 | 533 | */ |
| 534 | 534 | function geodir_get_posttype_info($post_type = '') |
| 535 | 535 | {
|
| 536 | - $post_types = array(); |
|
| 537 | - $post_types = get_option('geodir_post_types');
|
|
| 538 | - $post_types = stripslashes_deep($post_types); |
|
| 539 | - if (!empty($post_types) && $post_type != '') {
|
|
| 540 | - return $post_types[$post_type]; |
|
| 541 | - } else |
|
| 542 | - return false; |
|
| 536 | + $post_types = array(); |
|
| 537 | + $post_types = get_option('geodir_post_types');
|
|
| 538 | + $post_types = stripslashes_deep($post_types); |
|
| 539 | + if (!empty($post_types) && $post_type != '') {
|
|
| 540 | + return $post_types[$post_type]; |
|
| 541 | + } else |
|
| 542 | + return false; |
|
| 543 | 543 | } |
| 544 | 544 | |
| 545 | 545 | if (!function_exists('geodir_get_taxonomies')) {
|
| 546 | - /** |
|
| 547 | - * Get all custom taxonomies. |
|
| 548 | - * |
|
| 549 | - * @since 1.0.0 |
|
| 550 | - * @package GeoDirectory |
|
| 551 | - * @param string $post_type The post type. |
|
| 552 | - * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 553 | - * @return array|bool Taxonomies on success. false on failure. |
|
| 554 | - */ |
|
| 555 | - function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false) |
|
| 556 | - {
|
|
| 546 | + /** |
|
| 547 | + * Get all custom taxonomies. |
|
| 548 | + * |
|
| 549 | + * @since 1.0.0 |
|
| 550 | + * @package GeoDirectory |
|
| 551 | + * @param string $post_type The post type. |
|
| 552 | + * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 553 | + * @return array|bool Taxonomies on success. false on failure. |
|
| 554 | + */ |
|
| 555 | + function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false) |
|
| 556 | + {
|
|
| 557 | 557 | |
| 558 | - $taxonomies = array(); |
|
| 559 | - $gd_taxonomies = array(); |
|
| 558 | + $taxonomies = array(); |
|
| 559 | + $gd_taxonomies = array(); |
|
| 560 | 560 | |
| 561 | - if ($taxonomies = get_option('geodir_taxonomies')) {
|
|
| 561 | + if ($taxonomies = get_option('geodir_taxonomies')) {
|
|
| 562 | 562 | |
| 563 | 563 | |
| 564 | - $gd_taxonomies = array_keys($taxonomies); |
|
| 564 | + $gd_taxonomies = array_keys($taxonomies); |
|
| 565 | 565 | |
| 566 | 566 | |
| 567 | - if ($post_type != '') |
|
| 568 | - $gd_taxonomies = array(); |
|
| 567 | + if ($post_type != '') |
|
| 568 | + $gd_taxonomies = array(); |
|
| 569 | 569 | |
| 570 | - $i = 0; |
|
| 571 | - foreach ($taxonomies as $taxonomy => $args) {
|
|
| 570 | + $i = 0; |
|
| 571 | + foreach ($taxonomies as $taxonomy => $args) {
|
|
| 572 | 572 | |
| 573 | - if ($post_type != '' && $args['object_type'] == $post_type) |
|
| 574 | - $gd_taxonomies[] = $taxonomy; |
|
| 573 | + if ($post_type != '' && $args['object_type'] == $post_type) |
|
| 574 | + $gd_taxonomies[] = $taxonomy; |
|
| 575 | 575 | |
| 576 | - if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {
|
|
| 577 | - if (array_search($taxonomy, $gd_taxonomies) !== false) |
|
| 578 | - unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]); |
|
| 579 | - } |
|
| 576 | + if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {
|
|
| 577 | + if (array_search($taxonomy, $gd_taxonomies) !== false) |
|
| 578 | + unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]); |
|
| 579 | + } |
|
| 580 | 580 | |
| 581 | - } |
|
| 581 | + } |
|
| 582 | + |
|
| 583 | + $gd_taxonomies = array_values($gd_taxonomies); |
|
| 584 | + } |
|
| 582 | 585 | |
| 583 | - $gd_taxonomies = array_values($gd_taxonomies); |
|
| 584 | - } |
|
| 585 | - |
|
| 586 | - /** |
|
| 587 | - * Filter the taxonomies. |
|
| 588 | - * |
|
| 589 | - * @since 1.0.0 |
|
| 590 | - * @param array $gd_taxonomies The taxonomy array. |
|
| 591 | - */ |
|
| 592 | - $taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);
|
|
| 593 | - |
|
| 594 | - if (!empty($taxonomies)) {
|
|
| 595 | - return $taxonomies; |
|
| 596 | - } else {
|
|
| 597 | - return false; |
|
| 598 | - } |
|
| 599 | - } |
|
| 586 | + /** |
|
| 587 | + * Filter the taxonomies. |
|
| 588 | + * |
|
| 589 | + * @since 1.0.0 |
|
| 590 | + * @param array $gd_taxonomies The taxonomy array. |
|
| 591 | + */ |
|
| 592 | + $taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);
|
|
| 593 | + |
|
| 594 | + if (!empty($taxonomies)) {
|
|
| 595 | + return $taxonomies; |
|
| 596 | + } else {
|
|
| 597 | + return false; |
|
| 598 | + } |
|
| 599 | + } |
|
| 600 | 600 | } |
| 601 | 601 | |
| 602 | 602 | if (!function_exists(' geodir_get_categories_dl')) {
|
| 603 | - /** |
|
| 604 | - * Get categories dropdown HTML. |
|
| 605 | - * |
|
| 606 | - * @since 1.0.0 |
|
| 607 | - * @package GeoDirectory |
|
| 608 | - * @param string $post_type The post type. |
|
| 609 | - * @param string $selected The selected value. |
|
| 610 | - * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 611 | - * @param bool $echo Prints the HTML when set to true. Default: true. |
|
| 612 | - * @return void|string Dropdown HTML. |
|
| 613 | - */ |
|
| 614 | - function geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true) |
|
| 615 | - {
|
|
| 616 | - |
|
| 617 | - $html = ''; |
|
| 618 | - $taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies); |
|
| 619 | - |
|
| 620 | - $categories = get_terms($taxonomies); |
|
| 621 | - |
|
| 622 | - $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';
|
|
| 623 | - |
|
| 624 | - foreach ($categories as $category_obj) {
|
|
| 625 | - $select_opt = ''; |
|
| 626 | - if ($selected == $category_obj->term_id) {
|
|
| 627 | - $select_opt = 'selected="selected"'; |
|
| 628 | - } |
|
| 629 | - $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">' |
|
| 630 | - . geodir_utf8_ucfirst($category_obj->name) . '</option>'; |
|
| 631 | - } |
|
| 632 | - |
|
| 633 | - if ($echo) |
|
| 634 | - echo $html; |
|
| 635 | - else |
|
| 636 | - return $html; |
|
| 637 | - } |
|
| 603 | + /** |
|
| 604 | + * Get categories dropdown HTML. |
|
| 605 | + * |
|
| 606 | + * @since 1.0.0 |
|
| 607 | + * @package GeoDirectory |
|
| 608 | + * @param string $post_type The post type. |
|
| 609 | + * @param string $selected The selected value. |
|
| 610 | + * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 611 | + * @param bool $echo Prints the HTML when set to true. Default: true. |
|
| 612 | + * @return void|string Dropdown HTML. |
|
| 613 | + */ |
|
| 614 | + function geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true) |
|
| 615 | + {
|
|
| 616 | + |
|
| 617 | + $html = ''; |
|
| 618 | + $taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies); |
|
| 619 | + |
|
| 620 | + $categories = get_terms($taxonomies); |
|
| 621 | + |
|
| 622 | + $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';
|
|
| 623 | + |
|
| 624 | + foreach ($categories as $category_obj) {
|
|
| 625 | + $select_opt = ''; |
|
| 626 | + if ($selected == $category_obj->term_id) {
|
|
| 627 | + $select_opt = 'selected="selected"'; |
|
| 628 | + } |
|
| 629 | + $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">' |
|
| 630 | + . geodir_utf8_ucfirst($category_obj->name) . '</option>'; |
|
| 631 | + } |
|
| 632 | + |
|
| 633 | + if ($echo) |
|
| 634 | + echo $html; |
|
| 635 | + else |
|
| 636 | + return $html; |
|
| 637 | + } |
|
| 638 | 638 | } |
| 639 | 639 | |
| 640 | 640 | |
@@ -649,28 +649,28 @@ discard block |
||
| 649 | 649 | function geodir_get_listing_slug($object_type = '') |
| 650 | 650 | {
|
| 651 | 651 | |
| 652 | - $listing_slug = ''; |
|
| 652 | + $listing_slug = ''; |
|
| 653 | 653 | |
| 654 | - $post_types = get_option('geodir_post_types');
|
|
| 655 | - $taxonomies = get_option('geodir_taxonomies');
|
|
| 654 | + $post_types = get_option('geodir_post_types');
|
|
| 655 | + $taxonomies = get_option('geodir_taxonomies');
|
|
| 656 | 656 | |
| 657 | 657 | |
| 658 | - if ($object_type != '') {
|
|
| 659 | - if (!empty($post_types) && array_key_exists($object_type, $post_types)) {
|
|
| 658 | + if ($object_type != '') {
|
|
| 659 | + if (!empty($post_types) && array_key_exists($object_type, $post_types)) {
|
|
| 660 | 660 | |
| 661 | - $object_info = $post_types[$object_type]; |
|
| 662 | - $listing_slug = $object_info['listing_slug']; |
|
| 663 | - } elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {
|
|
| 664 | - $object_info = $taxonomies[$object_type]; |
|
| 665 | - $listing_slug = $object_info['listing_slug']; |
|
| 666 | - } |
|
| 661 | + $object_info = $post_types[$object_type]; |
|
| 662 | + $listing_slug = $object_info['listing_slug']; |
|
| 663 | + } elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {
|
|
| 664 | + $object_info = $taxonomies[$object_type]; |
|
| 665 | + $listing_slug = $object_info['listing_slug']; |
|
| 666 | + } |
|
| 667 | 667 | |
| 668 | - } |
|
| 668 | + } |
|
| 669 | 669 | |
| 670 | - if (!empty($listing_slug)) |
|
| 671 | - return $listing_slug; |
|
| 672 | - else |
|
| 673 | - return false; |
|
| 670 | + if (!empty($listing_slug)) |
|
| 671 | + return $listing_slug; |
|
| 672 | + else |
|
| 673 | + return false; |
|
| 674 | 674 | } |
| 675 | 675 | |
| 676 | 676 | |
@@ -685,212 +685,212 @@ discard block |
||
| 685 | 685 | */ |
| 686 | 686 | function geodir_get_taxonomy_posttype($taxonomy = '') |
| 687 | 687 | {
|
| 688 | - global $wp_query; |
|
| 689 | - |
|
| 690 | - $post_type = array(); |
|
| 691 | - $taxonomies = array(); |
|
| 692 | - |
|
| 693 | - if (!empty($taxonomy)) {
|
|
| 694 | - $taxonomies[] = $taxonomy; |
|
| 695 | - } elseif (isset($wp_query->tax_query->queries)) {
|
|
| 696 | - $tax_arr = $wp_query->tax_query->queries; |
|
| 697 | - //if tax query has 'relation' set then it will break wp_list_pluck so we remove it |
|
| 698 | - if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}
|
|
| 699 | - $taxonomies = wp_list_pluck($tax_arr, 'taxonomy'); |
|
| 700 | - } |
|
| 701 | - |
|
| 702 | - if (!empty($taxonomies)) {
|
|
| 703 | - foreach (geodir_get_posttypes() as $pt) {
|
|
| 704 | - $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt); |
|
| 705 | - if (array_intersect($taxonomies, $object_taxonomies)) |
|
| 706 | - $post_type[] = $pt; |
|
| 707 | - } |
|
| 708 | - } |
|
| 709 | - |
|
| 710 | - if (!empty($post_type)) |
|
| 711 | - return $post_type[0]; |
|
| 712 | - else |
|
| 713 | - return false; |
|
| 688 | + global $wp_query; |
|
| 689 | + |
|
| 690 | + $post_type = array(); |
|
| 691 | + $taxonomies = array(); |
|
| 692 | + |
|
| 693 | + if (!empty($taxonomy)) {
|
|
| 694 | + $taxonomies[] = $taxonomy; |
|
| 695 | + } elseif (isset($wp_query->tax_query->queries)) {
|
|
| 696 | + $tax_arr = $wp_query->tax_query->queries; |
|
| 697 | + //if tax query has 'relation' set then it will break wp_list_pluck so we remove it |
|
| 698 | + if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}
|
|
| 699 | + $taxonomies = wp_list_pluck($tax_arr, 'taxonomy'); |
|
| 700 | + } |
|
| 701 | + |
|
| 702 | + if (!empty($taxonomies)) {
|
|
| 703 | + foreach (geodir_get_posttypes() as $pt) {
|
|
| 704 | + $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt); |
|
| 705 | + if (array_intersect($taxonomies, $object_taxonomies)) |
|
| 706 | + $post_type[] = $pt; |
|
| 707 | + } |
|
| 708 | + } |
|
| 709 | + |
|
| 710 | + if (!empty($post_type)) |
|
| 711 | + return $post_type[0]; |
|
| 712 | + else |
|
| 713 | + return false; |
|
| 714 | 714 | } |
| 715 | 715 | |
| 716 | 716 | if (!function_exists('geodir_custom_taxonomy_walker')) {
|
| 717 | - /** |
|
| 718 | - * Custom taxonomy walker function. |
|
| 719 | - * |
|
| 720 | - * @since 1.0.0 |
|
| 721 | - * @package GeoDirectory |
|
| 722 | - * @param string $cat_taxonomy The taxonomy name. |
|
| 723 | - * @param int $cat_parent The parent term ID. |
|
| 724 | - * @param bool $hide_empty Hide empty taxonomies? Default: false. |
|
| 725 | - * @param int $pading CSS padding in pixels. |
|
| 726 | - * @return string|void taxonomy HTML. |
|
| 727 | - */ |
|
| 728 | - function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0) |
|
| 729 | - {
|
|
| 730 | - global $cat_display, $post_cat, $exclude_cats; |
|
| 731 | - |
|
| 732 | - $search_terms = trim($post_cat, ","); |
|
| 733 | - |
|
| 734 | - $search_terms = explode(",", $search_terms);
|
|
| 735 | - |
|
| 736 | - $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));
|
|
| 737 | - |
|
| 738 | - $display = ''; |
|
| 739 | - $onchange = ''; |
|
| 740 | - $term_check = ''; |
|
| 741 | - $main_list_class = ''; |
|
| 742 | - $out = ''; |
|
| 743 | - //If there are terms, start displaying |
|
| 744 | - if (count($cat_terms) > 0) {
|
|
| 745 | - //Displaying as a list |
|
| 746 | - $p = $pading * 20; |
|
| 747 | - $pading++; |
|
| 748 | - |
|
| 749 | - |
|
| 750 | - if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {
|
|
| 751 | - if ($cat_parent == 0) {
|
|
| 752 | - $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display; |
|
| 753 | - $main_list_class = 'class="main_list_selecter"'; |
|
| 754 | - } else {
|
|
| 755 | - //$display = 'display:none'; |
|
| 756 | - $list_class = 'sub_list gd-sub-cats-list'; |
|
| 757 | - } |
|
| 758 | - } |
|
| 717 | + /** |
|
| 718 | + * Custom taxonomy walker function. |
|
| 719 | + * |
|
| 720 | + * @since 1.0.0 |
|
| 721 | + * @package GeoDirectory |
|
| 722 | + * @param string $cat_taxonomy The taxonomy name. |
|
| 723 | + * @param int $cat_parent The parent term ID. |
|
| 724 | + * @param bool $hide_empty Hide empty taxonomies? Default: false. |
|
| 725 | + * @param int $pading CSS padding in pixels. |
|
| 726 | + * @return string|void taxonomy HTML. |
|
| 727 | + */ |
|
| 728 | + function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0) |
|
| 729 | + {
|
|
| 730 | + global $cat_display, $post_cat, $exclude_cats; |
|
| 731 | + |
|
| 732 | + $search_terms = trim($post_cat, ","); |
|
| 733 | + |
|
| 734 | + $search_terms = explode(",", $search_terms);
|
|
| 735 | + |
|
| 736 | + $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));
|
|
| 737 | + |
|
| 738 | + $display = ''; |
|
| 739 | + $onchange = ''; |
|
| 740 | + $term_check = ''; |
|
| 741 | + $main_list_class = ''; |
|
| 742 | + $out = ''; |
|
| 743 | + //If there are terms, start displaying |
|
| 744 | + if (count($cat_terms) > 0) {
|
|
| 745 | + //Displaying as a list |
|
| 746 | + $p = $pading * 20; |
|
| 747 | + $pading++; |
|
| 748 | + |
|
| 749 | + |
|
| 750 | + if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {
|
|
| 751 | + if ($cat_parent == 0) {
|
|
| 752 | + $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display; |
|
| 753 | + $main_list_class = 'class="main_list_selecter"'; |
|
| 754 | + } else {
|
|
| 755 | + //$display = 'display:none'; |
|
| 756 | + $list_class = 'sub_list gd-sub-cats-list'; |
|
| 757 | + } |
|
| 758 | + } |
|
| 759 | 759 | |
| 760 | - if ($cat_display == 'checkbox' || $cat_display == 'radio') {
|
|
| 761 | - $p = 0; |
|
| 762 | - $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 763 | - } |
|
| 760 | + if ($cat_display == 'checkbox' || $cat_display == 'radio') {
|
|
| 761 | + $p = 0; |
|
| 762 | + $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 763 | + } |
|
| 764 | 764 | |
| 765 | - foreach ($cat_terms as $cat_term) {
|
|
| 765 | + foreach ($cat_terms as $cat_term) {
|
|
| 766 | 766 | |
| 767 | - $checked = ''; |
|
| 767 | + $checked = ''; |
|
| 768 | 768 | |
| 769 | - if (in_array($cat_term->term_id, $search_terms)) {
|
|
| 770 | - if ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 771 | - $checked = 'selected="selected"'; |
|
| 772 | - else |
|
| 773 | - $checked = 'checked="checked"'; |
|
| 774 | - } |
|
| 769 | + if (in_array($cat_term->term_id, $search_terms)) {
|
|
| 770 | + if ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 771 | + $checked = 'selected="selected"'; |
|
| 772 | + else |
|
| 773 | + $checked = 'checked="checked"'; |
|
| 774 | + } |
|
| 775 | 775 | |
| 776 | - if ($cat_display == 'radio') |
|
| 777 | - $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>'; |
|
| 778 | - elseif ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 779 | - $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</option>'; |
|
| 776 | + if ($cat_display == 'radio') |
|
| 777 | + $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>'; |
|
| 778 | + elseif ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 779 | + $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</option>'; |
|
| 780 | 780 | |
| 781 | - else {
|
|
| 782 | - $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>'; |
|
| 783 | - } |
|
| 781 | + else {
|
|
| 782 | + $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>'; |
|
| 783 | + } |
|
| 784 | 784 | |
| 785 | - // Call recurson to print sub cats |
|
| 786 | - $out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading); |
|
| 785 | + // Call recurson to print sub cats |
|
| 786 | + $out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading); |
|
| 787 | 787 | |
| 788 | - } |
|
| 788 | + } |
|
| 789 | 789 | |
| 790 | - if ($cat_display == 'checkbox' || $cat_display == 'radio') |
|
| 791 | - $out .= '</div>'; |
|
| 790 | + if ($cat_display == 'checkbox' || $cat_display == 'radio') |
|
| 791 | + $out .= '</div>'; |
|
| 792 | 792 | |
| 793 | - return $out; |
|
| 794 | - } |
|
| 795 | - return; |
|
| 796 | - } |
|
| 793 | + return $out; |
|
| 794 | + } |
|
| 795 | + return; |
|
| 796 | + } |
|
| 797 | 797 | } |
| 798 | 798 | |
| 799 | 799 | if (!function_exists('geodir_custom_taxonomy_walker2')) {
|
| 800 | - /** |
|
| 801 | - * Custom taxonomy walker function. |
|
| 802 | - * |
|
| 803 | - * @since 1.0.0 |
|
| 804 | - * @package GeoDirectory |
|
| 805 | - * @global object $post WordPress Post object. |
|
| 806 | - * @global object $gd_session GeoDirectory Session object. |
|
| 807 | - * @param string $cat_taxonomy The taxonomy name. |
|
| 808 | - * @param string $cat_limit Number of categories to display. |
|
| 809 | - */ |
|
| 810 | - function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '') |
|
| 811 | - {
|
|
| 812 | - $post_category = ''; |
|
| 813 | - $post_category_str = ''; |
|
| 814 | - global $exclude_cats, $gd_session; |
|
| 815 | - |
|
| 816 | - $cat_exclude = ''; |
|
| 817 | - if (is_array($exclude_cats) && !empty($exclude_cats)) |
|
| 818 | - $cat_exclude = serialize($exclude_cats); |
|
| 819 | - |
|
| 820 | - if (isset($_REQUEST['backandedit'])) {
|
|
| 821 | - $post = (object)$gd_session->get('listing');
|
|
| 822 | - |
|
| 823 | - if (!is_array($post->post_category[$cat_taxonomy])) |
|
| 824 | - $post_category = $post->post_category[$cat_taxonomy]; |
|
| 825 | - |
|
| 826 | - $post_categories = $post->post_category_str; |
|
| 827 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) |
|
| 828 | - $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 829 | - |
|
| 830 | - } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {
|
|
| 831 | - global $post; |
|
| 832 | - |
|
| 833 | - $post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true); |
|
| 834 | - if (empty($post_category) && isset($post->{$cat_taxonomy})) {
|
|
| 835 | - $post_category = $post->{$cat_taxonomy};
|
|
| 836 | - } |
|
| 800 | + /** |
|
| 801 | + * Custom taxonomy walker function. |
|
| 802 | + * |
|
| 803 | + * @since 1.0.0 |
|
| 804 | + * @package GeoDirectory |
|
| 805 | + * @global object $post WordPress Post object. |
|
| 806 | + * @global object $gd_session GeoDirectory Session object. |
|
| 807 | + * @param string $cat_taxonomy The taxonomy name. |
|
| 808 | + * @param string $cat_limit Number of categories to display. |
|
| 809 | + */ |
|
| 810 | + function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '') |
|
| 811 | + {
|
|
| 812 | + $post_category = ''; |
|
| 813 | + $post_category_str = ''; |
|
| 814 | + global $exclude_cats, $gd_session; |
|
| 815 | + |
|
| 816 | + $cat_exclude = ''; |
|
| 817 | + if (is_array($exclude_cats) && !empty($exclude_cats)) |
|
| 818 | + $cat_exclude = serialize($exclude_cats); |
|
| 819 | + |
|
| 820 | + if (isset($_REQUEST['backandedit'])) {
|
|
| 821 | + $post = (object)$gd_session->get('listing');
|
|
| 822 | + |
|
| 823 | + if (!is_array($post->post_category[$cat_taxonomy])) |
|
| 824 | + $post_category = $post->post_category[$cat_taxonomy]; |
|
| 825 | + |
|
| 826 | + $post_categories = $post->post_category_str; |
|
| 827 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) |
|
| 828 | + $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 829 | + |
|
| 830 | + } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {
|
|
| 831 | + global $post; |
|
| 832 | + |
|
| 833 | + $post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true); |
|
| 834 | + if (empty($post_category) && isset($post->{$cat_taxonomy})) {
|
|
| 835 | + $post_category = $post->{$cat_taxonomy};
|
|
| 836 | + } |
|
| 837 | 837 | |
| 838 | - $post_categories = get_post_meta($post->ID, 'post_categories', true); |
|
| 838 | + $post_categories = get_post_meta($post->ID, 'post_categories', true); |
|
| 839 | 839 | |
| 840 | - if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 841 | - foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {
|
|
| 842 | - if (is_numeric($cat_part)) {
|
|
| 843 | - $cat_part_arr[] = $cat_part; |
|
| 844 | - } |
|
| 845 | - } |
|
| 846 | - if (is_array($cat_part_arr)) {
|
|
| 847 | - $post_category = implode(',', $cat_part_arr);
|
|
| 848 | - } |
|
| 849 | - } |
|
| 840 | + if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 841 | + foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {
|
|
| 842 | + if (is_numeric($cat_part)) {
|
|
| 843 | + $cat_part_arr[] = $cat_part; |
|
| 844 | + } |
|
| 845 | + } |
|
| 846 | + if (is_array($cat_part_arr)) {
|
|
| 847 | + $post_category = implode(',', $cat_part_arr);
|
|
| 848 | + } |
|
| 849 | + } |
|
| 850 | 850 | |
| 851 | - if (!empty($post_category)) {
|
|
| 852 | - $cat1 = array_filter(explode(',', $post_category));
|
|
| 853 | - $post_category = ',' . implode(',', $cat1) . ',';
|
|
| 851 | + if (!empty($post_category)) {
|
|
| 852 | + $cat1 = array_filter(explode(',', $post_category));
|
|
| 853 | + $post_category = ',' . implode(',', $cat1) . ',';
|
|
| 854 | 854 | |
| 855 | - } |
|
| 855 | + } |
|
| 856 | 856 | |
| 857 | - if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {
|
|
| 857 | + if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {
|
|
| 858 | 858 | |
| 859 | - $post_category_upd = explode(',', $post_category);
|
|
| 860 | - $post_category_change = ''; |
|
| 861 | - foreach ($post_category_upd as $cat) {
|
|
| 859 | + $post_category_upd = explode(',', $post_category);
|
|
| 860 | + $post_category_change = ''; |
|
| 861 | + foreach ($post_category_upd as $cat) {
|
|
| 862 | 862 | |
| 863 | - if (!in_array($cat, $exclude_cats) && $cat != '') {
|
|
| 864 | - $post_category_change .= ',' . $cat; |
|
| 865 | - } |
|
| 866 | - } |
|
| 867 | - $post_category = $post_category_change; |
|
| 868 | - } |
|
| 863 | + if (!in_array($cat, $exclude_cats) && $cat != '') {
|
|
| 864 | + $post_category_change .= ',' . $cat; |
|
| 865 | + } |
|
| 866 | + } |
|
| 867 | + $post_category = $post_category_change; |
|
| 868 | + } |
|
| 869 | 869 | |
| 870 | 870 | |
| 871 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 872 | - $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 873 | - } |
|
| 874 | - } |
|
| 871 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 872 | + $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 873 | + } |
|
| 874 | + } |
|
| 875 | 875 | |
| 876 | - echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']" />'; |
|
| 876 | + echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']" />'; |
|
| 877 | 877 | |
| 878 | - echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']" />'; |
|
| 878 | + echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']" />'; |
|
| 879 | 879 | |
| 880 | - echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']" />'; |
|
| 880 | + echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']" />'; |
|
| 881 | 881 | |
| 882 | 882 | |
| 883 | - ?> |
|
| 883 | + ?> |
|
| 884 | 884 | <div class="cat_sublist"> |
| 885 | 885 | <?php |
| 886 | 886 | |
| 887 | - $post_id = isset($post->ID) ? $post->ID : ''; |
|
| 887 | + $post_id = isset($post->ID) ? $post->ID : ''; |
|
| 888 | 888 | |
| 889 | - if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 889 | + if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 890 | 890 | |
| 891 | - geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories); |
|
| 892 | - } |
|
| 893 | - ?> |
|
| 891 | + geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories); |
|
| 892 | + } |
|
| 893 | + ?> |
|
| 894 | 894 | </div> |
| 895 | 895 | <script type="text/javascript"> |
| 896 | 896 | |
@@ -1013,22 +1013,22 @@ discard block |
||
| 1013 | 1013 | |
| 1014 | 1014 | </script> |
| 1015 | 1015 | <?php |
| 1016 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 1017 | - $post_cat_str = $post_categories[$cat_taxonomy]; |
|
| 1018 | - $post_cat_array = explode("#", $post_cat_str);
|
|
| 1019 | - if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) |
|
| 1020 | - $style = "display:none;"; |
|
| 1021 | - } |
|
| 1022 | - ?> |
|
| 1016 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 1017 | + $post_cat_str = $post_categories[$cat_taxonomy]; |
|
| 1018 | + $post_cat_array = explode("#", $post_cat_str);
|
|
| 1019 | + if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) |
|
| 1020 | + $style = "display:none;"; |
|
| 1021 | + } |
|
| 1022 | + ?> |
|
| 1023 | 1023 | <div class="main_cat_list" style=" <?php if (isset($style)) {
|
| 1024 | - echo $style; |
|
| 1025 | - }?> "> |
|
| 1024 | + echo $style; |
|
| 1025 | + }?> "> |
|
| 1026 | 1026 | <?php geodir_get_catlist($cat_taxonomy, 0); // print main categories list |
| 1027 | - ?> |
|
| 1027 | + ?> |
|
| 1028 | 1028 | </div> |
| 1029 | 1029 | <?php |
| 1030 | 1030 | |
| 1031 | - } |
|
| 1031 | + } |
|
| 1032 | 1032 | } |
| 1033 | 1033 | |
| 1034 | 1034 | /** |
@@ -1045,23 +1045,23 @@ discard block |
||
| 1045 | 1045 | */ |
| 1046 | 1046 | function geodir_addpost_categories_html($request_taxonomy, $parrent, $selected = false, $main_selected = true, $default = false, $exclude = '') |
| 1047 | 1047 | {
|
| 1048 | - global $exclude_cats; |
|
| 1048 | + global $exclude_cats; |
|
| 1049 | 1049 | |
| 1050 | - if ($exclude != '') {
|
|
| 1051 | - $exclude_cats = maybe_unserialize(base64_decode($exclude)); |
|
| 1050 | + if ($exclude != '') {
|
|
| 1051 | + $exclude_cats = maybe_unserialize(base64_decode($exclude)); |
|
| 1052 | 1052 | |
| 1053 | - if(is_array( $exclude_cats)){
|
|
| 1054 | - $exclude_cats = array_map( 'intval', $exclude_cats ); |
|
| 1055 | - }else{
|
|
| 1056 | - $exclude_cats = intval($exclude_cats); |
|
| 1057 | - } |
|
| 1053 | + if(is_array( $exclude_cats)){
|
|
| 1054 | + $exclude_cats = array_map( 'intval', $exclude_cats ); |
|
| 1055 | + }else{
|
|
| 1056 | + $exclude_cats = intval($exclude_cats); |
|
| 1057 | + } |
|
| 1058 | 1058 | |
| 1059 | - } |
|
| 1059 | + } |
|
| 1060 | 1060 | |
| 1061 | - if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) || |
|
| 1062 | - (!is_array($exclude_cats) || empty($exclude_cats)) |
|
| 1063 | - ) {
|
|
| 1064 | - ?> |
|
| 1061 | + if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) || |
|
| 1062 | + (!is_array($exclude_cats) || empty($exclude_cats)) |
|
| 1063 | + ) {
|
|
| 1064 | + ?> |
|
| 1065 | 1065 | |
| 1066 | 1066 | <?php $main_cat = get_term($parrent, $request_taxonomy); ?> |
| 1067 | 1067 | |
@@ -1090,8 +1090,8 @@ discard block |
||
| 1090 | 1090 | |
| 1091 | 1091 | <br/> |
| 1092 | 1092 | <?php |
| 1093 | - $cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1094 | - if (!empty($cat_terms)) { ?>
|
|
| 1093 | + $cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1094 | + if (!empty($cat_terms)) { ?>
|
|
| 1095 | 1095 | <span> <?php printf(__('Add listing in category', 'geodirectory')); ?></span>
|
| 1096 | 1096 | <?php geodir_get_catlist($request_taxonomy, $parrent, $selected) ?> |
| 1097 | 1097 | <?php } ?> |
@@ -1113,53 +1113,53 @@ discard block |
||
| 1113 | 1113 | function geodir_editpost_categories_html($request_taxonomy, $request_postid, $post_categories) |
| 1114 | 1114 | {
|
| 1115 | 1115 | |
| 1116 | - if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {
|
|
| 1117 | - $post_cat_str = $post_categories[$request_taxonomy]; |
|
| 1118 | - $post_cat_array = explode("#", $post_cat_str);
|
|
| 1119 | - if (is_array($post_cat_array)) {
|
|
| 1120 | - $post_cat_array = array_unique( $post_cat_array ); |
|
| 1116 | + if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {
|
|
| 1117 | + $post_cat_str = $post_categories[$request_taxonomy]; |
|
| 1118 | + $post_cat_array = explode("#", $post_cat_str);
|
|
| 1119 | + if (is_array($post_cat_array)) {
|
|
| 1120 | + $post_cat_array = array_unique( $post_cat_array ); |
|
| 1121 | 1121 | |
| 1122 | 1122 | foreach ($post_cat_array as $post_cat_html) {
|
| 1123 | 1123 | |
| 1124 | - $post_cat_info = explode(":", $post_cat_html);
|
|
| 1125 | - $post_maincat_str = $post_cat_info[0]; |
|
| 1124 | + $post_cat_info = explode(":", $post_cat_html);
|
|
| 1125 | + $post_maincat_str = $post_cat_info[0]; |
|
| 1126 | 1126 | |
| 1127 | - if (!empty($post_maincat_str)) {
|
|
| 1128 | - $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1129 | - $post_maincat_id = $post_maincat_info[0]; |
|
| 1130 | - ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1131 | - (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1132 | - } |
|
| 1133 | - $post_sub_catid = ''; |
|
| 1134 | - if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1135 | - $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1136 | - } |
|
| 1127 | + if (!empty($post_maincat_str)) {
|
|
| 1128 | + $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1129 | + $post_maincat_id = $post_maincat_info[0]; |
|
| 1130 | + ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1131 | + (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1132 | + } |
|
| 1133 | + $post_sub_catid = ''; |
|
| 1134 | + if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1135 | + $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1136 | + } |
|
| 1137 | 1137 | |
| 1138 | - geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1138 | + geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1139 | 1139 | |
| 1140 | - } |
|
| 1141 | - } else {
|
|
| 1140 | + } |
|
| 1141 | + } else {
|
|
| 1142 | 1142 | |
| 1143 | - $post_cat_info = explode(":", $post_cat_str);
|
|
| 1144 | - $post_maincat_str = $post_cat_info[0]; |
|
| 1143 | + $post_cat_info = explode(":", $post_cat_str);
|
|
| 1144 | + $post_maincat_str = $post_cat_info[0]; |
|
| 1145 | 1145 | |
| 1146 | - $post_sub_catid = ''; |
|
| 1146 | + $post_sub_catid = ''; |
|
| 1147 | 1147 | |
| 1148 | - if (!empty($post_maincat_str)) {
|
|
| 1149 | - $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1150 | - $post_maincat_id = $post_maincat_info[0]; |
|
| 1151 | - ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1152 | - (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1153 | - } |
|
| 1148 | + if (!empty($post_maincat_str)) {
|
|
| 1149 | + $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1150 | + $post_maincat_id = $post_maincat_info[0]; |
|
| 1151 | + ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1152 | + (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1153 | + } |
|
| 1154 | 1154 | |
| 1155 | - if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1156 | - $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1157 | - } |
|
| 1155 | + if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1156 | + $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1157 | + } |
|
| 1158 | 1158 | |
| 1159 | - geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1159 | + geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1160 | 1160 | |
| 1161 | - } |
|
| 1162 | - } |
|
| 1161 | + } |
|
| 1162 | + } |
|
| 1163 | 1163 | } |
| 1164 | 1164 | |
| 1165 | 1165 | /** |
@@ -1173,35 +1173,35 @@ discard block |
||
| 1173 | 1173 | */ |
| 1174 | 1174 | function geodir_get_catlist($cat_taxonomy, $parrent = 0, $selected = false) |
| 1175 | 1175 | {
|
| 1176 | - global $exclude_cats; |
|
| 1176 | + global $exclude_cats; |
|
| 1177 | 1177 | |
| 1178 | - $cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1178 | + $cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1179 | 1179 | |
| 1180 | - if (!empty($cat_terms)) {
|
|
| 1181 | - $onchange = ''; |
|
| 1182 | - $onchange = ' onchange="show_subcatlist(this.value, this)" '; |
|
| 1180 | + if (!empty($cat_terms)) {
|
|
| 1181 | + $onchange = ''; |
|
| 1182 | + $onchange = ' onchange="show_subcatlist(this.value, this)" '; |
|
| 1183 | 1183 | |
| 1184 | - $option_selected = ''; |
|
| 1185 | - if (!$selected) |
|
| 1186 | - $option_slected = ' selected="selected" '; |
|
| 1184 | + $option_selected = ''; |
|
| 1185 | + if (!$selected) |
|
| 1186 | + $option_slected = ' selected="selected" '; |
|
| 1187 | 1187 | |
| 1188 | - echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >'; |
|
| 1188 | + echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >'; |
|
| 1189 | 1189 | |
| 1190 | - echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';
|
|
| 1190 | + echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';
|
|
| 1191 | 1191 | |
| 1192 | - foreach ($cat_terms as $cat_term) {
|
|
| 1193 | - $option_selected = ''; |
|
| 1194 | - if ($selected == $cat_term->term_id) |
|
| 1195 | - $option_selected = ' selected="selected" '; |
|
| 1192 | + foreach ($cat_terms as $cat_term) {
|
|
| 1193 | + $option_selected = ''; |
|
| 1194 | + if ($selected == $cat_term->term_id) |
|
| 1195 | + $option_selected = ' selected="selected" '; |
|
| 1196 | 1196 | |
| 1197 | - // Count child terms |
|
| 1198 | - $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) ); |
|
| 1199 | - $has_child = !empty( $child_terms ) ? 't' : 'f'; |
|
| 1197 | + // Count child terms |
|
| 1198 | + $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) ); |
|
| 1199 | + $has_child = !empty( $child_terms ) ? 't' : 'f'; |
|
| 1200 | 1200 | |
| 1201 | - echo '<option ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . geodir_utf8_ucfirst($cat_term->name) . '</option>'; |
|
| 1202 | - } |
|
| 1203 | - echo '</select>'; |
|
| 1204 | - } |
|
| 1201 | + echo '<option ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . geodir_utf8_ucfirst($cat_term->name) . '</option>'; |
|
| 1202 | + } |
|
| 1203 | + echo '</select>'; |
|
| 1204 | + } |
|
| 1205 | 1205 | } |
| 1206 | 1206 | |
| 1207 | 1207 | /** |
@@ -1217,28 +1217,28 @@ discard block |
||
| 1217 | 1217 | */ |
| 1218 | 1218 | function geodir_custom_update_messages($messages) |
| 1219 | 1219 | {
|
| 1220 | - global $post, $post_ID; |
|
| 1221 | - |
|
| 1222 | - $post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');
|
|
| 1223 | - |
|
| 1224 | - foreach ($post_types as $post_type => $post_object) {
|
|
| 1225 | - |
|
| 1226 | - $messages[$post_type] = array( |
|
| 1227 | - 0 => '', // Unused. Messages start at index 1. |
|
| 1228 | - 1 => sprintf(__('%s updated. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1229 | - 2 => __('Custom field updated.', 'geodirectory'),
|
|
| 1230 | - 3 => __('Custom field deleted.', 'geodirectory'),
|
|
| 1231 | - 4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1232 | - 5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,
|
|
| 1233 | - 6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1234 | - 7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1235 | - 8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
|
|
| 1236 | - 9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1237 | - 10 => sprintf(__('%s draft updated. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
|
|
| 1238 | - ); |
|
| 1239 | - } |
|
| 1240 | - |
|
| 1241 | - return $messages; |
|
| 1220 | + global $post, $post_ID; |
|
| 1221 | + |
|
| 1222 | + $post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');
|
|
| 1223 | + |
|
| 1224 | + foreach ($post_types as $post_type => $post_object) {
|
|
| 1225 | + |
|
| 1226 | + $messages[$post_type] = array( |
|
| 1227 | + 0 => '', // Unused. Messages start at index 1. |
|
| 1228 | + 1 => sprintf(__('%s updated. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1229 | + 2 => __('Custom field updated.', 'geodirectory'),
|
|
| 1230 | + 3 => __('Custom field deleted.', 'geodirectory'),
|
|
| 1231 | + 4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1232 | + 5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,
|
|
| 1233 | + 6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1234 | + 7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1235 | + 8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
|
|
| 1236 | + 9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
|
|
| 1237 | + 10 => sprintf(__('%s draft updated. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
|
|
| 1238 | + ); |
|
| 1239 | + } |
|
| 1240 | + |
|
| 1241 | + return $messages; |
|
| 1242 | 1242 | } |
| 1243 | 1243 | |
| 1244 | 1244 | |
@@ -1253,182 +1253,182 @@ discard block |
||
| 1253 | 1253 | function geodir_register_defaults() |
| 1254 | 1254 | {
|
| 1255 | 1255 | |
| 1256 | - global $wpdb; |
|
| 1257 | - |
|
| 1258 | - $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico'; |
|
| 1259 | - |
|
| 1260 | - if (!$listing_slug = get_option('geodir_listing_prefix'))
|
|
| 1261 | - $listing_slug = 'places'; |
|
| 1262 | - |
|
| 1263 | - /** |
|
| 1264 | - * Taxonomies |
|
| 1265 | - **/ |
|
| 1266 | - //if ( ! taxonomy_exists('gd_place_tags') )
|
|
| 1267 | - {
|
|
| 1268 | - |
|
| 1269 | - $gd_placetags = array(); |
|
| 1270 | - $gd_placetags['object_type'] = 'gd_place'; |
|
| 1271 | - $gd_placetags['listing_slug'] = $listing_slug . '/tags'; |
|
| 1272 | - $gd_placetags['args'] = array( |
|
| 1273 | - 'public' => true, |
|
| 1274 | - 'hierarchical' => false, |
|
| 1275 | - 'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),
|
|
| 1276 | - 'query_var' => true, |
|
| 1277 | - |
|
| 1278 | - 'labels' => array( |
|
| 1279 | - 'name' => __('Place Tags', 'geodirectory'),
|
|
| 1280 | - 'singular_name' => __('Place Tag', 'geodirectory'),
|
|
| 1281 | - 'search_items' => __('Search Place Tags', 'geodirectory'),
|
|
| 1282 | - 'popular_items' => __('Popular Place Tags', 'geodirectory'),
|
|
| 1283 | - 'all_items' => __('All Place Tags', 'geodirectory'),
|
|
| 1284 | - 'edit_item' => __('Edit Place Tag', 'geodirectory'),
|
|
| 1285 | - 'update_item' => __('Update Place Tag', 'geodirectory'),
|
|
| 1286 | - 'add_new_item' => __('Add New Place Tag', 'geodirectory'),
|
|
| 1287 | - 'new_item_name' => __('New Place Tag Name', 'geodirectory'),
|
|
| 1288 | - 'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),
|
|
| 1289 | - 'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),
|
|
| 1290 | - 'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),
|
|
| 1291 | - ), |
|
| 1292 | - ); |
|
| 1293 | - |
|
| 1294 | - |
|
| 1295 | - $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1296 | - $geodir_taxonomies['gd_place_tags'] = $gd_placetags; |
|
| 1297 | - update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1298 | - |
|
| 1299 | - |
|
| 1300 | - // Update post types and delete tmp options |
|
| 1301 | - flush_rewrite_rules(); |
|
| 1302 | - |
|
| 1303 | - } |
|
| 1304 | - |
|
| 1305 | - //if ( ! taxonomy_exists('gd_placecategory') )
|
|
| 1306 | - {
|
|
| 1307 | - |
|
| 1308 | - $gd_placecategory = array(); |
|
| 1309 | - $gd_placecategory['object_type'] = 'gd_place'; |
|
| 1310 | - $gd_placecategory['listing_slug'] = $listing_slug; |
|
| 1311 | - $gd_placecategory['args'] = array( |
|
| 1312 | - 'public' => true, |
|
| 1313 | - 'hierarchical' => true, |
|
| 1314 | - 'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),
|
|
| 1315 | - 'query_var' => true, |
|
| 1316 | - 'labels' => array( |
|
| 1317 | - 'name' => __('Place Categories', 'geodirectory'),
|
|
| 1318 | - 'singular_name' => __('Place Category', 'geodirectory'),
|
|
| 1319 | - 'search_items' => __('Search Place Categories', 'geodirectory'),
|
|
| 1320 | - 'popular_items' => __('Popular Place Categories', 'geodirectory'),
|
|
| 1321 | - 'all_items' => __('All Place Categories', 'geodirectory'),
|
|
| 1322 | - 'edit_item' => __('Edit Place Category', 'geodirectory'),
|
|
| 1323 | - 'update_item' => __('Update Place Category', 'geodirectory'),
|
|
| 1324 | - 'add_new_item' => __('Add New Place Category', 'geodirectory'),
|
|
| 1325 | - 'new_item_name' => __('New Place Category', 'geodirectory'),
|
|
| 1326 | - 'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),
|
|
| 1327 | - ), |
|
| 1328 | - ); |
|
| 1329 | - |
|
| 1330 | - |
|
| 1331 | - $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1332 | - $geodir_taxonomies['gd_placecategory'] = $gd_placecategory; |
|
| 1333 | - update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1334 | - |
|
| 1335 | - |
|
| 1336 | - flush_rewrite_rules(); |
|
| 1337 | - } |
|
| 1338 | - |
|
| 1339 | - /** |
|
| 1340 | - * Post Types |
|
| 1341 | - **/ |
|
| 1342 | - |
|
| 1343 | - //if ( ! post_type_exists('gd_place') )
|
|
| 1344 | - {
|
|
| 1345 | - |
|
| 1346 | - $labels = array( |
|
| 1347 | - 'name' => __('Places', 'geodirectory'),
|
|
| 1348 | - 'singular_name' => __('Place', 'geodirectory'),
|
|
| 1349 | - 'add_new' => __('Add New', 'geodirectory'),
|
|
| 1350 | - 'add_new_item' => __('Add New Place', 'geodirectory'),
|
|
| 1351 | - 'edit_item' => __('Edit Place', 'geodirectory'),
|
|
| 1352 | - 'new_item' => __('New Place', 'geodirectory'),
|
|
| 1353 | - 'view_item' => __('View Place', 'geodirectory'),
|
|
| 1354 | - 'search_items' => __('Search Places', 'geodirectory'),
|
|
| 1355 | - 'not_found' => __('No Place Found', 'geodirectory'),
|
|
| 1356 | - 'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));
|
|
| 1357 | - |
|
| 1358 | - $place_default = array( |
|
| 1359 | - 'labels' => $labels, |
|
| 1360 | - 'can_export' => true, |
|
| 1361 | - 'capability_type' => 'post', |
|
| 1362 | - 'description' => 'Place post type.', |
|
| 1363 | - 'has_archive' => $listing_slug, |
|
| 1364 | - 'hierarchical' => false, |
|
| 1365 | - 'map_meta_cap' => true, |
|
| 1366 | - 'menu_icon' => $menu_icon, |
|
| 1367 | - 'public' => true, |
|
| 1368 | - 'query_var' => true, |
|
| 1369 | - 'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
|
|
| 1370 | - 'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),
|
|
| 1371 | - 'taxonomies' => array('gd_placecategory', 'gd_place_tags'));
|
|
| 1372 | - |
|
| 1373 | - //Update custom post types |
|
| 1374 | - $geodir_post_types = get_option('geodir_post_types');
|
|
| 1375 | - $geodir_post_types['gd_place'] = $place_default; |
|
| 1376 | - update_option('geodir_post_types', $geodir_post_types);
|
|
| 1377 | - |
|
| 1378 | - // Update post types and delete tmp options |
|
| 1379 | - flush_rewrite_rules(); |
|
| 1380 | - } |
|
| 1381 | - |
|
| 1382 | - |
|
| 1383 | - geodir_register_taxonomies(); |
|
| 1384 | - geodir_register_post_types(); |
|
| 1385 | - |
|
| 1386 | - //die; |
|
| 1256 | + global $wpdb; |
|
| 1257 | + |
|
| 1258 | + $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico'; |
|
| 1259 | + |
|
| 1260 | + if (!$listing_slug = get_option('geodir_listing_prefix'))
|
|
| 1261 | + $listing_slug = 'places'; |
|
| 1262 | + |
|
| 1263 | + /** |
|
| 1264 | + * Taxonomies |
|
| 1265 | + **/ |
|
| 1266 | + //if ( ! taxonomy_exists('gd_place_tags') )
|
|
| 1267 | + {
|
|
| 1268 | + |
|
| 1269 | + $gd_placetags = array(); |
|
| 1270 | + $gd_placetags['object_type'] = 'gd_place'; |
|
| 1271 | + $gd_placetags['listing_slug'] = $listing_slug . '/tags'; |
|
| 1272 | + $gd_placetags['args'] = array( |
|
| 1273 | + 'public' => true, |
|
| 1274 | + 'hierarchical' => false, |
|
| 1275 | + 'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),
|
|
| 1276 | + 'query_var' => true, |
|
| 1277 | + |
|
| 1278 | + 'labels' => array( |
|
| 1279 | + 'name' => __('Place Tags', 'geodirectory'),
|
|
| 1280 | + 'singular_name' => __('Place Tag', 'geodirectory'),
|
|
| 1281 | + 'search_items' => __('Search Place Tags', 'geodirectory'),
|
|
| 1282 | + 'popular_items' => __('Popular Place Tags', 'geodirectory'),
|
|
| 1283 | + 'all_items' => __('All Place Tags', 'geodirectory'),
|
|
| 1284 | + 'edit_item' => __('Edit Place Tag', 'geodirectory'),
|
|
| 1285 | + 'update_item' => __('Update Place Tag', 'geodirectory'),
|
|
| 1286 | + 'add_new_item' => __('Add New Place Tag', 'geodirectory'),
|
|
| 1287 | + 'new_item_name' => __('New Place Tag Name', 'geodirectory'),
|
|
| 1288 | + 'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),
|
|
| 1289 | + 'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),
|
|
| 1290 | + 'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),
|
|
| 1291 | + ), |
|
| 1292 | + ); |
|
| 1293 | + |
|
| 1294 | + |
|
| 1295 | + $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1296 | + $geodir_taxonomies['gd_place_tags'] = $gd_placetags; |
|
| 1297 | + update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1298 | + |
|
| 1299 | + |
|
| 1300 | + // Update post types and delete tmp options |
|
| 1301 | + flush_rewrite_rules(); |
|
| 1302 | + |
|
| 1303 | + } |
|
| 1304 | + |
|
| 1305 | + //if ( ! taxonomy_exists('gd_placecategory') )
|
|
| 1306 | + {
|
|
| 1307 | + |
|
| 1308 | + $gd_placecategory = array(); |
|
| 1309 | + $gd_placecategory['object_type'] = 'gd_place'; |
|
| 1310 | + $gd_placecategory['listing_slug'] = $listing_slug; |
|
| 1311 | + $gd_placecategory['args'] = array( |
|
| 1312 | + 'public' => true, |
|
| 1313 | + 'hierarchical' => true, |
|
| 1314 | + 'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),
|
|
| 1315 | + 'query_var' => true, |
|
| 1316 | + 'labels' => array( |
|
| 1317 | + 'name' => __('Place Categories', 'geodirectory'),
|
|
| 1318 | + 'singular_name' => __('Place Category', 'geodirectory'),
|
|
| 1319 | + 'search_items' => __('Search Place Categories', 'geodirectory'),
|
|
| 1320 | + 'popular_items' => __('Popular Place Categories', 'geodirectory'),
|
|
| 1321 | + 'all_items' => __('All Place Categories', 'geodirectory'),
|
|
| 1322 | + 'edit_item' => __('Edit Place Category', 'geodirectory'),
|
|
| 1323 | + 'update_item' => __('Update Place Category', 'geodirectory'),
|
|
| 1324 | + 'add_new_item' => __('Add New Place Category', 'geodirectory'),
|
|
| 1325 | + 'new_item_name' => __('New Place Category', 'geodirectory'),
|
|
| 1326 | + 'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),
|
|
| 1327 | + ), |
|
| 1328 | + ); |
|
| 1329 | + |
|
| 1330 | + |
|
| 1331 | + $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1332 | + $geodir_taxonomies['gd_placecategory'] = $gd_placecategory; |
|
| 1333 | + update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1334 | + |
|
| 1335 | + |
|
| 1336 | + flush_rewrite_rules(); |
|
| 1337 | + } |
|
| 1338 | + |
|
| 1339 | + /** |
|
| 1340 | + * Post Types |
|
| 1341 | + **/ |
|
| 1342 | + |
|
| 1343 | + //if ( ! post_type_exists('gd_place') )
|
|
| 1344 | + {
|
|
| 1345 | + |
|
| 1346 | + $labels = array( |
|
| 1347 | + 'name' => __('Places', 'geodirectory'),
|
|
| 1348 | + 'singular_name' => __('Place', 'geodirectory'),
|
|
| 1349 | + 'add_new' => __('Add New', 'geodirectory'),
|
|
| 1350 | + 'add_new_item' => __('Add New Place', 'geodirectory'),
|
|
| 1351 | + 'edit_item' => __('Edit Place', 'geodirectory'),
|
|
| 1352 | + 'new_item' => __('New Place', 'geodirectory'),
|
|
| 1353 | + 'view_item' => __('View Place', 'geodirectory'),
|
|
| 1354 | + 'search_items' => __('Search Places', 'geodirectory'),
|
|
| 1355 | + 'not_found' => __('No Place Found', 'geodirectory'),
|
|
| 1356 | + 'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));
|
|
| 1357 | + |
|
| 1358 | + $place_default = array( |
|
| 1359 | + 'labels' => $labels, |
|
| 1360 | + 'can_export' => true, |
|
| 1361 | + 'capability_type' => 'post', |
|
| 1362 | + 'description' => 'Place post type.', |
|
| 1363 | + 'has_archive' => $listing_slug, |
|
| 1364 | + 'hierarchical' => false, |
|
| 1365 | + 'map_meta_cap' => true, |
|
| 1366 | + 'menu_icon' => $menu_icon, |
|
| 1367 | + 'public' => true, |
|
| 1368 | + 'query_var' => true, |
|
| 1369 | + 'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
|
|
| 1370 | + 'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),
|
|
| 1371 | + 'taxonomies' => array('gd_placecategory', 'gd_place_tags'));
|
|
| 1372 | + |
|
| 1373 | + //Update custom post types |
|
| 1374 | + $geodir_post_types = get_option('geodir_post_types');
|
|
| 1375 | + $geodir_post_types['gd_place'] = $place_default; |
|
| 1376 | + update_option('geodir_post_types', $geodir_post_types);
|
|
| 1377 | + |
|
| 1378 | + // Update post types and delete tmp options |
|
| 1379 | + flush_rewrite_rules(); |
|
| 1380 | + } |
|
| 1381 | + |
|
| 1382 | + |
|
| 1383 | + geodir_register_taxonomies(); |
|
| 1384 | + geodir_register_post_types(); |
|
| 1385 | + |
|
| 1386 | + //die; |
|
| 1387 | 1387 | |
| 1388 | 1388 | } |
| 1389 | 1389 | |
| 1390 | 1390 | $gd_wpml_get_languages = ""; |
| 1391 | 1391 | function gd_wpml_get_lang_from_url($url) {
|
| 1392 | - global $sitepress, $gd_wpml_get_languages; |
|
| 1392 | + global $sitepress, $gd_wpml_get_languages; |
|
| 1393 | 1393 | |
| 1394 | - if (geodir_is_wpml()) {
|
|
| 1395 | - return $sitepress->get_language_from_url($url); |
|
| 1396 | - } |
|
| 1394 | + if (geodir_is_wpml()) {
|
|
| 1395 | + return $sitepress->get_language_from_url($url); |
|
| 1396 | + } |
|
| 1397 | 1397 | |
| 1398 | - if (isset($_REQUEST['lang']) && $_REQUEST['lang']) {
|
|
| 1399 | - return $_REQUEST['lang']; |
|
| 1400 | - } |
|
| 1398 | + if (isset($_REQUEST['lang']) && $_REQUEST['lang']) {
|
|
| 1399 | + return $_REQUEST['lang']; |
|
| 1400 | + } |
|
| 1401 | 1401 | |
| 1402 | - $url = str_replace(array("http://","https://"),"",$url);
|
|
| 1402 | + $url = str_replace(array("http://","https://"),"",$url);
|
|
| 1403 | 1403 | |
| 1404 | - // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.
|
|
| 1405 | - $site_url = str_replace(array("http://","https://"),"",site_url());
|
|
| 1404 | + // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.
|
|
| 1405 | + $site_url = str_replace(array("http://","https://"),"",site_url());
|
|
| 1406 | 1406 | |
| 1407 | - $url = str_replace($site_url,"",$url); |
|
| 1407 | + $url = str_replace($site_url,"",$url); |
|
| 1408 | 1408 | |
| 1409 | - $segments = explode('/', trim($url, '/'));
|
|
| 1409 | + $segments = explode('/', trim($url, '/'));
|
|
| 1410 | 1410 | |
| 1411 | - if ($gd_wpml_get_languages) {
|
|
| 1412 | - $langs = $gd_wpml_get_languages; |
|
| 1413 | - } else {
|
|
| 1414 | - $gd_wpml_get_languages = $sitepress->get_active_languages(); |
|
| 1415 | - } |
|
| 1411 | + if ($gd_wpml_get_languages) {
|
|
| 1412 | + $langs = $gd_wpml_get_languages; |
|
| 1413 | + } else {
|
|
| 1414 | + $gd_wpml_get_languages = $sitepress->get_active_languages(); |
|
| 1415 | + } |
|
| 1416 | 1416 | |
| 1417 | - if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {
|
|
| 1418 | - return $segments[0]; |
|
| 1419 | - } |
|
| 1417 | + if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {
|
|
| 1418 | + return $segments[0]; |
|
| 1419 | + } |
|
| 1420 | 1420 | |
| 1421 | - return false; |
|
| 1421 | + return false; |
|
| 1422 | 1422 | } |
| 1423 | 1423 | |
| 1424 | 1424 | function gd_wpml_slug_translation_turned_on($post_type) {
|
| 1425 | 1425 | |
| 1426 | - global $sitepress; |
|
| 1427 | - $settings = $sitepress->get_settings(); |
|
| 1428 | - return isset($settings['posts_slug_translation']['types'][$post_type]) |
|
| 1429 | - && $settings['posts_slug_translation']['types'][$post_type] |
|
| 1430 | - && isset($settings['posts_slug_translation']['on']) |
|
| 1431 | - && $settings['posts_slug_translation']['on']; |
|
| 1426 | + global $sitepress; |
|
| 1427 | + $settings = $sitepress->get_settings(); |
|
| 1428 | + return isset($settings['posts_slug_translation']['types'][$post_type]) |
|
| 1429 | + && $settings['posts_slug_translation']['types'][$post_type] |
|
| 1430 | + && isset($settings['posts_slug_translation']['on']) |
|
| 1431 | + && $settings['posts_slug_translation']['on']; |
|
| 1432 | 1432 | } |
| 1433 | 1433 | |
| 1434 | 1434 | |
@@ -1455,158 +1455,158 @@ discard block |
||
| 1455 | 1455 | */ |
| 1456 | 1456 | function geodir_listing_permalink_structure($post_link, $post_obj, $leavename, $sample) |
| 1457 | 1457 | {
|
| 1458 | - //echo $post_link."<br />".$sample ; |
|
| 1458 | + //echo $post_link."<br />".$sample ; |
|
| 1459 | 1459 | |
| 1460 | 1460 | |
| 1461 | - global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache; |
|
| 1462 | - if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {
|
|
| 1463 | - } elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {
|
|
| 1464 | - return $post_link; |
|
| 1465 | - } else {
|
|
| 1466 | - $orig_post = $post; |
|
| 1467 | - $post = $post_obj; |
|
| 1468 | - } |
|
| 1461 | + global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache; |
|
| 1462 | + if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {
|
|
| 1463 | + } elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {
|
|
| 1464 | + return $post_link; |
|
| 1465 | + } else {
|
|
| 1466 | + $orig_post = $post; |
|
| 1467 | + $post = $post_obj; |
|
| 1468 | + } |
|
| 1469 | 1469 | |
| 1470 | - if (in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 1470 | + if (in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 1471 | 1471 | |
| 1472 | - // if we dont have a GD post then try to grab it |
|
| 1473 | - if(!isset($post->default_category)){
|
|
| 1474 | - $gd_post = geodir_get_post_info($post->ID); |
|
| 1475 | - if(!empty($gd_post)){
|
|
| 1476 | - $post = $gd_post; |
|
| 1477 | - } |
|
| 1478 | - } |
|
| 1472 | + // if we dont have a GD post then try to grab it |
|
| 1473 | + if(!isset($post->default_category)){
|
|
| 1474 | + $gd_post = geodir_get_post_info($post->ID); |
|
| 1475 | + if(!empty($gd_post)){
|
|
| 1476 | + $post = $gd_post; |
|
| 1477 | + } |
|
| 1478 | + } |
|
| 1479 | 1479 | |
| 1480 | 1480 | |
| 1481 | - $post_types = get_option('geodir_post_types');
|
|
| 1482 | - $slug = $post_types[$post->post_type]['rewrite']['slug']; |
|
| 1481 | + $post_types = get_option('geodir_post_types');
|
|
| 1482 | + $slug = $post_types[$post->post_type]['rewrite']['slug']; |
|
| 1483 | 1483 | |
| 1484 | - // Alter the CPT slug if WPML is set to do so |
|
| 1485 | - if(geodir_wpml_is_post_type_translated($post->post_type)){
|
|
| 1486 | - if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
|
|
| 1484 | + // Alter the CPT slug if WPML is set to do so |
|
| 1485 | + if(geodir_wpml_is_post_type_translated($post->post_type)){
|
|
| 1486 | + if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
|
|
| 1487 | 1487 | |
| 1488 | - $org_slug = $slug; |
|
| 1489 | - $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1490 | - $slug, |
|
| 1491 | - 'WordPress', |
|
| 1492 | - 'URL slug: ' . $slug, |
|
| 1493 | - $language_code); |
|
| 1488 | + $org_slug = $slug; |
|
| 1489 | + $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1490 | + $slug, |
|
| 1491 | + 'WordPress', |
|
| 1492 | + 'URL slug: ' . $slug, |
|
| 1493 | + $language_code); |
|
| 1494 | 1494 | |
| 1495 | - if(!$slug){$slug = $org_slug;}
|
|
| 1495 | + if(!$slug){$slug = $org_slug;}
|
|
| 1496 | 1496 | |
| 1497 | - } |
|
| 1498 | - } |
|
| 1497 | + } |
|
| 1498 | + } |
|
| 1499 | 1499 | |
| 1500 | - if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1501 | - remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 1502 | - } |
|
| 1500 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1501 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 1502 | + } |
|
| 1503 | 1503 | |
| 1504 | - // Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz. |
|
| 1505 | - $site_url = trailingslashit(get_bloginfo('url'));
|
|
| 1504 | + // Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz. |
|
| 1505 | + $site_url = trailingslashit(get_bloginfo('url'));
|
|
| 1506 | 1506 | |
| 1507 | - if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1508 | - add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 1509 | - } |
|
| 1510 | - |
|
| 1511 | - $fix_url = strpos($post_link, $site_url) === 0 ? true : false; |
|
| 1512 | - if ($fix_url) {
|
|
| 1513 | - $post_link = str_replace($site_url, '', $post_link); |
|
| 1514 | - } |
|
| 1515 | - |
|
| 1516 | - $post_link = trailingslashit( |
|
| 1517 | - preg_replace( "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 ) |
|
| 1518 | - ); |
|
| 1519 | - |
|
| 1520 | - if ($fix_url) {
|
|
| 1521 | - $post_link = $site_url . $post_link; |
|
| 1522 | - } |
|
| 1523 | - |
|
| 1524 | - if (isset($comment_post_cache[$post->ID])) {
|
|
| 1525 | - $post = $comment_post_cache[$post->ID]; |
|
| 1526 | - } |
|
| 1527 | - if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {
|
|
| 1528 | - $post_id = $post->ID; |
|
| 1529 | - if (isset($orig_post)) {
|
|
| 1530 | - $post = $orig_post; |
|
| 1531 | - } |
|
| 1532 | - return $gd_permalink_cache[$post_id]; |
|
| 1533 | - } |
|
| 1507 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1508 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 1509 | + } |
|
| 1534 | 1510 | |
| 1535 | - if (!isset($post->post_locations)) {
|
|
| 1536 | - $post_type = $post->post_type; |
|
| 1537 | - $ID = $post->ID; |
|
| 1538 | - $post2 = $wpdb->get_row( |
|
| 1539 | - $wpdb->prepare( |
|
| 1540 | - "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1541 | - array($post->ID) |
|
| 1542 | - ) |
|
| 1543 | - ); |
|
| 1511 | + $fix_url = strpos($post_link, $site_url) === 0 ? true : false; |
|
| 1512 | + if ($fix_url) {
|
|
| 1513 | + $post_link = str_replace($site_url, '', $post_link); |
|
| 1514 | + } |
|
| 1544 | 1515 | |
| 1545 | - $post = (object)array_merge((array)$post, (array)$post2); |
|
| 1516 | + $post_link = trailingslashit( |
|
| 1517 | + preg_replace( "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 ) |
|
| 1518 | + ); |
|
| 1546 | 1519 | |
| 1547 | - $comment_post_cache[$post->ID] = $post; |
|
| 1548 | - } |
|
| 1520 | + if ($fix_url) {
|
|
| 1521 | + $post_link = $site_url . $post_link; |
|
| 1522 | + } |
|
| 1549 | 1523 | |
| 1524 | + if (isset($comment_post_cache[$post->ID])) {
|
|
| 1525 | + $post = $comment_post_cache[$post->ID]; |
|
| 1526 | + } |
|
| 1527 | + if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {
|
|
| 1528 | + $post_id = $post->ID; |
|
| 1529 | + if (isset($orig_post)) {
|
|
| 1530 | + $post = $orig_post; |
|
| 1531 | + } |
|
| 1532 | + return $gd_permalink_cache[$post_id]; |
|
| 1533 | + } |
|
| 1550 | 1534 | |
| 1535 | + if (!isset($post->post_locations)) {
|
|
| 1536 | + $post_type = $post->post_type; |
|
| 1537 | + $ID = $post->ID; |
|
| 1538 | + $post2 = $wpdb->get_row( |
|
| 1539 | + $wpdb->prepare( |
|
| 1540 | + "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1541 | + array($post->ID) |
|
| 1542 | + ) |
|
| 1543 | + ); |
|
| 1551 | 1544 | |
| 1552 | - if (false !== strpos($post_link, '%gd_taxonomy%')) {
|
|
| 1545 | + $post = (object)array_merge((array)$post, (array)$post2); |
|
| 1553 | 1546 | |
| 1554 | - if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {
|
|
| 1555 | - $location_request = ''; |
|
| 1547 | + $comment_post_cache[$post->ID] = $post; |
|
| 1548 | + } |
|
| 1556 | 1549 | |
| 1557 | 1550 | |
| 1558 | - if (!empty($post->post_locations)) {
|
|
| 1559 | - $geodir_arr_locations = explode(',', $post->post_locations);
|
|
| 1560 | - if (count($geodir_arr_locations) == 3) {
|
|
| 1561 | - $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1562 | - $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1563 | - $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1564 | - $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1565 | - $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1566 | - $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1567 | 1551 | |
| 1568 | - $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1569 | - 'region_slug' => $post->region_slug, |
|
| 1570 | - 'city_slug' => $post->city_slug |
|
| 1571 | - ); |
|
| 1552 | + if (false !== strpos($post_link, '%gd_taxonomy%')) {
|
|
| 1572 | 1553 | |
| 1573 | - } else |
|
| 1574 | - $post_location = geodir_get_location(); |
|
| 1554 | + if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {
|
|
| 1555 | + $location_request = ''; |
|
| 1575 | 1556 | |
| 1576 | 1557 | |
| 1577 | - } else {
|
|
| 1558 | + if (!empty($post->post_locations)) {
|
|
| 1559 | + $geodir_arr_locations = explode(',', $post->post_locations);
|
|
| 1560 | + if (count($geodir_arr_locations) == 3) {
|
|
| 1561 | + $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1562 | + $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1563 | + $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1564 | + $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1565 | + $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1566 | + $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1578 | 1567 | |
| 1579 | - $post_location_sql = $wpdb->get_results( |
|
| 1580 | - $wpdb->prepare( |
|
| 1581 | - "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1582 | - array($post->ID) |
|
| 1583 | - ) |
|
| 1584 | - ); |
|
| 1585 | - |
|
| 1586 | - if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {
|
|
| 1587 | - |
|
| 1588 | - $geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);
|
|
| 1589 | - if (count($geodir_arr_locations) == 3) {
|
|
| 1590 | - $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1591 | - $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1592 | - $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1593 | - $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1594 | - $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1595 | - $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1596 | - |
|
| 1597 | - $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1598 | - 'region_slug' => $post->region_slug, |
|
| 1599 | - 'city_slug' => $post->city_slug |
|
| 1600 | - ); |
|
| 1568 | + $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1569 | + 'region_slug' => $post->region_slug, |
|
| 1570 | + 'city_slug' => $post->city_slug |
|
| 1571 | + ); |
|
| 1572 | + |
|
| 1573 | + } else |
|
| 1574 | + $post_location = geodir_get_location(); |
|
| 1601 | 1575 | |
| 1602 | - } |
|
| 1603 | - } else |
|
| 1604 | - $post_location = geodir_get_location(); |
|
| 1605 | - } |
|
| 1606 | 1576 | |
| 1577 | + } else {
|
|
| 1607 | 1578 | |
| 1608 | - if (!empty($post_location)) {
|
|
| 1609 | - $country_slug = isset($post_location->country_slug) ? $post_location->country_slug : ''; |
|
| 1579 | + $post_location_sql = $wpdb->get_results( |
|
| 1580 | + $wpdb->prepare( |
|
| 1581 | + "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1582 | + array($post->ID) |
|
| 1583 | + ) |
|
| 1584 | + ); |
|
| 1585 | + |
|
| 1586 | + if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {
|
|
| 1587 | + |
|
| 1588 | + $geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);
|
|
| 1589 | + if (count($geodir_arr_locations) == 3) {
|
|
| 1590 | + $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1591 | + $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1592 | + $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1593 | + $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1594 | + $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1595 | + $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1596 | + |
|
| 1597 | + $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1598 | + 'region_slug' => $post->region_slug, |
|
| 1599 | + 'city_slug' => $post->city_slug |
|
| 1600 | + ); |
|
| 1601 | + |
|
| 1602 | + } |
|
| 1603 | + } else |
|
| 1604 | + $post_location = geodir_get_location(); |
|
| 1605 | + } |
|
| 1606 | + |
|
| 1607 | + |
|
| 1608 | + if (!empty($post_location)) {
|
|
| 1609 | + $country_slug = isset($post_location->country_slug) ? $post_location->country_slug : ''; |
|
| 1610 | 1610 | $region_slug = isset($post_location->region_slug) ? $post_location->region_slug : ''; |
| 1611 | 1611 | $city_slug = isset($post_location->city_slug) ? $post_location->city_slug : ''; |
| 1612 | 1612 | |
@@ -1624,89 +1624,89 @@ discard block |
||
| 1624 | 1624 | $location_slug[] = $city_slug; |
| 1625 | 1625 | |
| 1626 | 1626 | $location_request .= implode('/', $location_slug) . '/';
|
| 1627 | - } |
|
| 1628 | - } |
|
| 1627 | + } |
|
| 1628 | + } |
|
| 1629 | 1629 | |
| 1630 | - if (get_option('geodir_add_categories_url')) {
|
|
| 1630 | + if (get_option('geodir_add_categories_url')) {
|
|
| 1631 | 1631 | |
| 1632 | - $term_request = ''; |
|
| 1633 | - $taxonomies = geodir_get_taxonomies($post->post_type); |
|
| 1632 | + $term_request = ''; |
|
| 1633 | + $taxonomies = geodir_get_taxonomies($post->post_type); |
|
| 1634 | 1634 | |
| 1635 | - $taxonomies = end($taxonomies); |
|
| 1635 | + $taxonomies = end($taxonomies); |
|
| 1636 | 1636 | |
| 1637 | - if (!empty($post->default_category)) {
|
|
| 1638 | - $post_terms = $post->default_category; |
|
| 1639 | - } else {
|
|
| 1640 | - $post_terms = ''; |
|
| 1641 | - |
|
| 1642 | - if(isset($_POST['post_default_category']) && $_POST['post_default_category']){
|
|
| 1643 | - $post_terms = absint($_POST['post_default_category']); |
|
| 1644 | - }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {
|
|
| 1645 | - $post_terms = is_array($_POST['post_category'][$taxonomies]) ? $_POST['post_category'][$taxonomies] : explode(",", trim($_POST['post_category'][$taxonomies], ","));
|
|
| 1646 | - $post_terms = !empty($post_terms) ? absint($post_terms[0]) : 0; |
|
| 1647 | - }elseif (isset($post->{$taxonomies})) {
|
|
| 1648 | - $post_terms = explode(",", trim($post->{$taxonomies}, ","));
|
|
| 1649 | - $post_terms = $post_terms[0]; |
|
| 1650 | - } |
|
| 1637 | + if (!empty($post->default_category)) {
|
|
| 1638 | + $post_terms = $post->default_category; |
|
| 1639 | + } else {
|
|
| 1640 | + $post_terms = ''; |
|
| 1641 | + |
|
| 1642 | + if(isset($_POST['post_default_category']) && $_POST['post_default_category']){
|
|
| 1643 | + $post_terms = absint($_POST['post_default_category']); |
|
| 1644 | + }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {
|
|
| 1645 | + $post_terms = is_array($_POST['post_category'][$taxonomies]) ? $_POST['post_category'][$taxonomies] : explode(",", trim($_POST['post_category'][$taxonomies], ","));
|
|
| 1646 | + $post_terms = !empty($post_terms) ? absint($post_terms[0]) : 0; |
|
| 1647 | + }elseif (isset($post->{$taxonomies})) {
|
|
| 1648 | + $post_terms = explode(",", trim($post->{$taxonomies}, ","));
|
|
| 1649 | + $post_terms = $post_terms[0]; |
|
| 1650 | + } |
|
| 1651 | 1651 | |
| 1652 | - if (!$post_terms) |
|
| 1653 | - $post_terms = geodir_get_post_meta($post->ID, 'default_category', true); |
|
| 1652 | + if (!$post_terms) |
|
| 1653 | + $post_terms = geodir_get_post_meta($post->ID, 'default_category', true); |
|
| 1654 | 1654 | |
| 1655 | - if (!$post_terms) {
|
|
| 1656 | - $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true); |
|
| 1655 | + if (!$post_terms) {
|
|
| 1656 | + $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true); |
|
| 1657 | 1657 | |
| 1658 | - if ($post_terms) {
|
|
| 1659 | - $post_terms = explode(",", trim($post_terms, ","));
|
|
| 1660 | - $post_terms = $post_terms[0]; |
|
| 1661 | - } |
|
| 1662 | - } |
|
| 1663 | - } |
|
| 1658 | + if ($post_terms) {
|
|
| 1659 | + $post_terms = explode(",", trim($post_terms, ","));
|
|
| 1660 | + $post_terms = $post_terms[0]; |
|
| 1661 | + } |
|
| 1662 | + } |
|
| 1663 | + } |
|
| 1664 | 1664 | |
| 1665 | - $term = get_term_by('id', $post_terms, $taxonomies);
|
|
| 1665 | + $term = get_term_by('id', $post_terms, $taxonomies);
|
|
| 1666 | 1666 | |
| 1667 | - if (!empty($term)) |
|
| 1668 | - $term_request = $term->slug; |
|
| 1669 | - //$term_request = $term->slug.'/'; |
|
| 1670 | - } |
|
| 1667 | + if (!empty($term)) |
|
| 1668 | + $term_request = $term->slug; |
|
| 1669 | + //$term_request = $term->slug.'/'; |
|
| 1670 | + } |
|
| 1671 | 1671 | |
| 1672 | - $request_term = ''; |
|
| 1673 | - $listingurl_separator = ''; |
|
| 1674 | - //$detailurl_separator = get_option('geodir_detailurl_separator');
|
|
| 1675 | - $detailurl_separator = ''; |
|
| 1676 | - if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {
|
|
| 1677 | - $request_term = $location_request; |
|
| 1678 | - //$listingurl_separator = get_option('geodir_listingurl_separator');
|
|
| 1679 | - //$request_term .= $listingurl_separator.'/'.$term_request; |
|
| 1680 | - $request_term .= $term_request; |
|
| 1672 | + $request_term = ''; |
|
| 1673 | + $listingurl_separator = ''; |
|
| 1674 | + //$detailurl_separator = get_option('geodir_detailurl_separator');
|
|
| 1675 | + $detailurl_separator = ''; |
|
| 1676 | + if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {
|
|
| 1677 | + $request_term = $location_request; |
|
| 1678 | + //$listingurl_separator = get_option('geodir_listingurl_separator');
|
|
| 1679 | + //$request_term .= $listingurl_separator.'/'.$term_request; |
|
| 1680 | + $request_term .= $term_request; |
|
| 1681 | 1681 | |
| 1682 | - } else {
|
|
| 1683 | - if (isset($location_request) && $location_request != '') $request_term = $location_request; |
|
| 1682 | + } else {
|
|
| 1683 | + if (isset($location_request) && $location_request != '') $request_term = $location_request; |
|
| 1684 | 1684 | |
| 1685 | - if (isset($term_request) && $term_request != '') $request_term .= $term_request; |
|
| 1686 | - } |
|
| 1687 | - $request_term = trim($request_term, '/'); |
|
| 1685 | + if (isset($term_request) && $term_request != '') $request_term .= $term_request; |
|
| 1686 | + } |
|
| 1687 | + $request_term = trim($request_term, '/'); |
|
| 1688 | 1688 | |
| 1689 | - // Fix with WPML the location terms added twice when CPT slug is translated. |
|
| 1690 | - if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {
|
|
| 1691 | - $post_link = str_replace('%gd_taxonomy%/', '', $post_link);
|
|
| 1692 | - } |
|
| 1689 | + // Fix with WPML the location terms added twice when CPT slug is translated. |
|
| 1690 | + if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {
|
|
| 1691 | + $post_link = str_replace('%gd_taxonomy%/', '', $post_link);
|
|
| 1692 | + } |
|
| 1693 | 1693 | |
| 1694 | - if (!empty($request_term)) |
|
| 1695 | - $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1696 | - else |
|
| 1697 | - $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1698 | - //echo $post_link ; |
|
| 1699 | - } |
|
| 1700 | - // temp cache the permalink |
|
| 1701 | - if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {
|
|
| 1702 | - $gd_permalink_cache[$post->ID] = $post_link; |
|
| 1703 | - } |
|
| 1704 | - } |
|
| 1705 | - if (isset($orig_post)) {
|
|
| 1706 | - $post = $orig_post; |
|
| 1707 | - } |
|
| 1708 | - |
|
| 1709 | - return $post_link; |
|
| 1694 | + if (!empty($request_term)) |
|
| 1695 | + $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1696 | + else |
|
| 1697 | + $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1698 | + //echo $post_link ; |
|
| 1699 | + } |
|
| 1700 | + // temp cache the permalink |
|
| 1701 | + if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {
|
|
| 1702 | + $gd_permalink_cache[$post->ID] = $post_link; |
|
| 1703 | + } |
|
| 1704 | + } |
|
| 1705 | + if (isset($orig_post)) {
|
|
| 1706 | + $post = $orig_post; |
|
| 1707 | + } |
|
| 1708 | + |
|
| 1709 | + return $post_link; |
|
| 1710 | 1710 | } |
| 1711 | 1711 | |
| 1712 | 1712 | /** |
@@ -1722,99 +1722,99 @@ discard block |
||
| 1722 | 1722 | * @return string The term link. |
| 1723 | 1723 | */ |
| 1724 | 1724 | function geodir_term_link($termlink, $term, $taxonomy) {
|
| 1725 | - $geodir_taxonomies = geodir_get_taxonomies('', true);
|
|
| 1725 | + $geodir_taxonomies = geodir_get_taxonomies('', true);
|
|
| 1726 | 1726 | |
| 1727 | - if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {
|
|
| 1728 | - global $geodir_add_location_url, $gd_session; |
|
| 1729 | - $include_location = false; |
|
| 1730 | - $request_term = array(); |
|
| 1731 | - $add_location_url = get_option('geodir_add_location_url');
|
|
| 1732 | - $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 1727 | + if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {
|
|
| 1728 | + global $geodir_add_location_url, $gd_session; |
|
| 1729 | + $include_location = false; |
|
| 1730 | + $request_term = array(); |
|
| 1731 | + $add_location_url = get_option('geodir_add_location_url');
|
|
| 1732 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 1733 | 1733 | |
| 1734 | - $listing_slug = geodir_get_listing_slug($taxonomy); |
|
| 1734 | + $listing_slug = geodir_get_listing_slug($taxonomy); |
|
| 1735 | 1735 | |
| 1736 | - if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {
|
|
| 1737 | - if ($geodir_add_location_url && $add_location_url) {
|
|
| 1738 | - $include_location = true; |
|
| 1739 | - } |
|
| 1740 | - } elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {
|
|
| 1741 | - $include_location = true; |
|
| 1742 | - } elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {
|
|
| 1743 | - $include_location = true; |
|
| 1744 | - } |
|
| 1745 | - |
|
| 1746 | - if ($include_location) {
|
|
| 1747 | - global $post; |
|
| 1736 | + if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {
|
|
| 1737 | + if ($geodir_add_location_url && $add_location_url) {
|
|
| 1738 | + $include_location = true; |
|
| 1739 | + } |
|
| 1740 | + } elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {
|
|
| 1741 | + $include_location = true; |
|
| 1742 | + } elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {
|
|
| 1743 | + $include_location = true; |
|
| 1744 | + } |
|
| 1745 | + |
|
| 1746 | + if ($include_location) {
|
|
| 1747 | + global $post; |
|
| 1748 | 1748 | |
| 1749 | - $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 1749 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 1750 | 1750 | |
| 1751 | - if (geodir_is_page('detail') && isset($post->country_slug)) {
|
|
| 1752 | - $location_terms = array( |
|
| 1753 | - 'gd_country' => $post->country_slug, |
|
| 1754 | - 'gd_region' => $post->region_slug, |
|
| 1755 | - 'gd_city' => $post->city_slug |
|
| 1756 | - ); |
|
| 1751 | + if (geodir_is_page('detail') && isset($post->country_slug)) {
|
|
| 1752 | + $location_terms = array( |
|
| 1753 | + 'gd_country' => $post->country_slug, |
|
| 1754 | + 'gd_region' => $post->region_slug, |
|
| 1755 | + 'gd_city' => $post->city_slug |
|
| 1756 | + ); |
|
| 1757 | 1757 | |
| 1758 | - if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
|
|
| 1759 | - $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; |
|
| 1760 | - } |
|
| 1761 | - } else {
|
|
| 1762 | - $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1763 | - } |
|
| 1758 | + if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
|
|
| 1759 | + $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; |
|
| 1760 | + } |
|
| 1761 | + } else {
|
|
| 1762 | + $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1763 | + } |
|
| 1764 | 1764 | |
| 1765 | - $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1766 | - $location_terms = geodir_remove_location_terms($location_terms); |
|
| 1765 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1766 | + $location_terms = geodir_remove_location_terms($location_terms); |
|
| 1767 | 1767 | |
| 1768 | - if (!empty($location_terms)) {
|
|
| 1769 | - $url_separator = ''; |
|
| 1768 | + if (!empty($location_terms)) {
|
|
| 1769 | + $url_separator = ''; |
|
| 1770 | 1770 | |
| 1771 | - if (get_option('permalink_structure') != '') {
|
|
| 1772 | - $old_listing_slug = '/' . $listing_slug . '/'; |
|
| 1773 | - $request_term = implode("/", $location_terms);
|
|
| 1774 | - $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/'; |
|
| 1771 | + if (get_option('permalink_structure') != '') {
|
|
| 1772 | + $old_listing_slug = '/' . $listing_slug . '/'; |
|
| 1773 | + $request_term = implode("/", $location_terms);
|
|
| 1774 | + $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/'; |
|
| 1775 | 1775 | |
| 1776 | - $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug)); |
|
| 1777 | - } else {
|
|
| 1778 | - $termlink = geodir_getlink($termlink, $request_term); |
|
| 1779 | - } |
|
| 1780 | - } |
|
| 1781 | - } |
|
| 1776 | + $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug)); |
|
| 1777 | + } else {
|
|
| 1778 | + $termlink = geodir_getlink($termlink, $request_term); |
|
| 1779 | + } |
|
| 1780 | + } |
|
| 1781 | + } |
|
| 1782 | 1782 | |
| 1783 | - // Alter the CPT slug is WPML is set to do so |
|
| 1784 | - /* we can replace this with the below function |
|
| 1783 | + // Alter the CPT slug is WPML is set to do so |
|
| 1784 | + /* we can replace this with the below function |
|
| 1785 | 1785 | if(geodir_is_wpml()){
|
| 1786 | 1786 | global $sitepress; |
| 1787 | 1787 | $post_type = str_replace("category","",$taxonomy);
|
| 1788 | 1788 | $termlink = $sitepress->post_type_archive_link_filter( $termlink, $post_type); |
| 1789 | 1789 | }*/ |
| 1790 | 1790 | |
| 1791 | - // Alter the CPT slug if WPML is set to do so |
|
| 1792 | - if (geodir_is_wpml()) {
|
|
| 1793 | - $post_types = get_option('geodir_post_types');
|
|
| 1794 | - $post_type = str_replace("category","",$taxonomy);
|
|
| 1795 | - $post_type = str_replace("_tags","",$post_type);
|
|
| 1796 | - $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1797 | - if (geodir_wpml_is_post_type_translated($post_type) && gd_wpml_slug_translation_turned_on($post_type)) {
|
|
| 1798 | - global $sitepress; |
|
| 1799 | - $default_lang = $sitepress->get_default_language(); |
|
| 1800 | - $language_code = gd_wpml_get_lang_from_url($termlink); |
|
| 1801 | - if (!$language_code ) {
|
|
| 1802 | - $language_code = $default_lang; |
|
| 1803 | - } |
|
| 1791 | + // Alter the CPT slug if WPML is set to do so |
|
| 1792 | + if (geodir_is_wpml()) {
|
|
| 1793 | + $post_types = get_option('geodir_post_types');
|
|
| 1794 | + $post_type = str_replace("category","",$taxonomy);
|
|
| 1795 | + $post_type = str_replace("_tags","",$post_type);
|
|
| 1796 | + $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1797 | + if (geodir_wpml_is_post_type_translated($post_type) && gd_wpml_slug_translation_turned_on($post_type)) {
|
|
| 1798 | + global $sitepress; |
|
| 1799 | + $default_lang = $sitepress->get_default_language(); |
|
| 1800 | + $language_code = gd_wpml_get_lang_from_url($termlink); |
|
| 1801 | + if (!$language_code ) {
|
|
| 1802 | + $language_code = $default_lang; |
|
| 1803 | + } |
|
| 1804 | 1804 | |
| 1805 | - $org_slug = $slug; |
|
| 1806 | - $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);
|
|
| 1805 | + $org_slug = $slug; |
|
| 1806 | + $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);
|
|
| 1807 | 1807 | |
| 1808 | - if (!$slug) {
|
|
| 1809 | - $slug = $org_slug; |
|
| 1810 | - } |
|
| 1808 | + if (!$slug) {
|
|
| 1809 | + $slug = $org_slug; |
|
| 1810 | + } |
|
| 1811 | 1811 | |
| 1812 | - $termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug ,$termlink, 1));
|
|
| 1813 | - } |
|
| 1814 | - } |
|
| 1815 | - } |
|
| 1812 | + $termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug ,$termlink, 1));
|
|
| 1813 | + } |
|
| 1814 | + } |
|
| 1815 | + } |
|
| 1816 | 1816 | |
| 1817 | - return $termlink; |
|
| 1817 | + return $termlink; |
|
| 1818 | 1818 | } |
| 1819 | 1819 | |
| 1820 | 1820 | /** |
@@ -1840,14 +1840,14 @@ discard block |
||
| 1840 | 1840 | if (in_array($post_type, geodir_get_posttypes())) {
|
| 1841 | 1841 | if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {
|
| 1842 | 1842 | if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {
|
| 1843 | - $location_terms = array( |
|
| 1844 | - 'gd_country' => $post->country_slug, |
|
| 1845 | - 'gd_region' => $post->region_slug, |
|
| 1846 | - 'gd_city' => $post->city_slug |
|
| 1847 | - ); |
|
| 1848 | - } else {
|
|
| 1849 | - $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1850 | - } |
|
| 1843 | + $location_terms = array( |
|
| 1844 | + 'gd_country' => $post->country_slug, |
|
| 1845 | + 'gd_region' => $post->region_slug, |
|
| 1846 | + 'gd_city' => $post->city_slug |
|
| 1847 | + ); |
|
| 1848 | + } else {
|
|
| 1849 | + $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1850 | + } |
|
| 1851 | 1851 | |
| 1852 | 1852 | $location_terms = geodir_remove_location_terms($location_terms); |
| 1853 | 1853 | |
@@ -1879,17 +1879,17 @@ discard block |
||
| 1879 | 1879 | * @return void|string Label. |
| 1880 | 1880 | */ |
| 1881 | 1881 | function get_post_type_singular_label($post_type, $echo = false, $translate = false) {
|
| 1882 | - $obj_post_type = get_post_type_object($post_type); |
|
| 1883 | - if (!is_object($obj_post_type)) {
|
|
| 1884 | - return; |
|
| 1885 | - } |
|
| 1882 | + $obj_post_type = get_post_type_object($post_type); |
|
| 1883 | + if (!is_object($obj_post_type)) {
|
|
| 1884 | + return; |
|
| 1885 | + } |
|
| 1886 | 1886 | |
| 1887 | - $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name; |
|
| 1887 | + $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name; |
|
| 1888 | 1888 | |
| 1889 | - if ($echo) |
|
| 1890 | - echo $label; |
|
| 1891 | - else |
|
| 1892 | - return $label; |
|
| 1889 | + if ($echo) |
|
| 1890 | + echo $label; |
|
| 1891 | + else |
|
| 1892 | + return $label; |
|
| 1893 | 1893 | } |
| 1894 | 1894 | |
| 1895 | 1895 | /** |
@@ -1904,19 +1904,19 @@ discard block |
||
| 1904 | 1904 | * @return void|string Label. |
| 1905 | 1905 | */ |
| 1906 | 1906 | function get_post_type_plural_label($post_type, $echo = false, $translate = false) {
|
| 1907 | - $all_postypes = geodir_get_posttypes(); |
|
| 1907 | + $all_postypes = geodir_get_posttypes(); |
|
| 1908 | 1908 | |
| 1909 | - if (!in_array($post_type, $all_postypes)) |
|
| 1910 | - return false; |
|
| 1909 | + if (!in_array($post_type, $all_postypes)) |
|
| 1910 | + return false; |
|
| 1911 | 1911 | |
| 1912 | - $obj_post_type = get_post_type_object($post_type); |
|
| 1912 | + $obj_post_type = get_post_type_object($post_type); |
|
| 1913 | 1913 | |
| 1914 | - $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name; |
|
| 1914 | + $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name; |
|
| 1915 | 1915 | |
| 1916 | - if ($echo) |
|
| 1917 | - echo $label; |
|
| 1918 | - else |
|
| 1919 | - return $label; |
|
| 1916 | + if ($echo) |
|
| 1917 | + echo $label; |
|
| 1918 | + else |
|
| 1919 | + return $label; |
|
| 1920 | 1920 | } |
| 1921 | 1921 | |
| 1922 | 1922 | /** |
@@ -1934,51 +1934,51 @@ discard block |
||
| 1934 | 1934 | */ |
| 1935 | 1935 | function geodir_term_exists($term, $taxonomy = '', $parent = 0) |
| 1936 | 1936 | {
|
| 1937 | - global $wpdb; |
|
| 1938 | - |
|
| 1939 | - $select = "SELECT term_id FROM $wpdb->terms as t WHERE "; |
|
| 1940 | - $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE "; |
|
| 1941 | - |
|
| 1942 | - if (is_int($term)) {
|
|
| 1943 | - if (0 == $term) |
|
| 1944 | - return 0; |
|
| 1945 | - $where = 't.term_id = %d'; |
|
| 1946 | - if (!empty($taxonomy)) |
|
| 1947 | - return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1948 | - else |
|
| 1949 | - return $wpdb->get_var($wpdb->prepare($select . $where, $term)); |
|
| 1950 | - } |
|
| 1937 | + global $wpdb; |
|
| 1938 | + |
|
| 1939 | + $select = "SELECT term_id FROM $wpdb->terms as t WHERE "; |
|
| 1940 | + $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE "; |
|
| 1941 | + |
|
| 1942 | + if (is_int($term)) {
|
|
| 1943 | + if (0 == $term) |
|
| 1944 | + return 0; |
|
| 1945 | + $where = 't.term_id = %d'; |
|
| 1946 | + if (!empty($taxonomy)) |
|
| 1947 | + return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1948 | + else |
|
| 1949 | + return $wpdb->get_var($wpdb->prepare($select . $where, $term)); |
|
| 1950 | + } |
|
| 1951 | 1951 | |
| 1952 | - $term = trim(wp_unslash($term)); |
|
| 1952 | + $term = trim(wp_unslash($term)); |
|
| 1953 | 1953 | |
| 1954 | - if ('' === $slug = sanitize_title($term))
|
|
| 1955 | - return 0; |
|
| 1954 | + if ('' === $slug = sanitize_title($term))
|
|
| 1955 | + return 0; |
|
| 1956 | 1956 | |
| 1957 | - $where = 't.slug = %s'; |
|
| 1957 | + $where = 't.slug = %s'; |
|
| 1958 | 1958 | |
| 1959 | - $where_fields = array($slug); |
|
| 1960 | - if (!empty($taxonomy)) {
|
|
| 1961 | - $parent = (int)$parent; |
|
| 1962 | - if ($parent > 0) {
|
|
| 1963 | - $where_fields[] = $parent; |
|
| 1964 | - $else_where_fields[] = $parent; |
|
| 1965 | - $where .= ' AND tt.parent = %d'; |
|
| 1959 | + $where_fields = array($slug); |
|
| 1960 | + if (!empty($taxonomy)) {
|
|
| 1961 | + $parent = (int)$parent; |
|
| 1962 | + if ($parent > 0) {
|
|
| 1963 | + $where_fields[] = $parent; |
|
| 1964 | + $else_where_fields[] = $parent; |
|
| 1965 | + $where .= ' AND tt.parent = %d'; |
|
| 1966 | 1966 | |
| 1967 | - } |
|
| 1967 | + } |
|
| 1968 | 1968 | |
| 1969 | - $where_fields[] = $taxonomy; |
|
| 1969 | + $where_fields[] = $taxonomy; |
|
| 1970 | 1970 | |
| 1971 | 1971 | |
| 1972 | - if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))
|
|
| 1973 | - return $result; |
|
| 1972 | + if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))
|
|
| 1973 | + return $result; |
|
| 1974 | 1974 | |
| 1975 | - return false; |
|
| 1976 | - } |
|
| 1975 | + return false; |
|
| 1976 | + } |
|
| 1977 | 1977 | |
| 1978 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))
|
|
| 1979 | - return $result; |
|
| 1978 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))
|
|
| 1979 | + return $result; |
|
| 1980 | 1980 | |
| 1981 | - return false; |
|
| 1981 | + return false; |
|
| 1982 | 1982 | } |
| 1983 | 1983 | |
| 1984 | 1984 | /** |
@@ -1990,7 +1990,7 @@ discard block |
||
| 1990 | 1990 | function geodir_get_term_icon_rebuild() |
| 1991 | 1991 | {
|
| 1992 | 1992 | |
| 1993 | - update_option('gd_term_icons', '');
|
|
| 1993 | + update_option('gd_term_icons', '');
|
|
| 1994 | 1994 | |
| 1995 | 1995 | } |
| 1996 | 1996 | |
@@ -2008,61 +2008,61 @@ discard block |
||
| 2008 | 2008 | */ |
| 2009 | 2009 | function geodir_get_term_icon($term_id = false, $rebuild = false) |
| 2010 | 2010 | {
|
| 2011 | - global $wpdb; |
|
| 2012 | - if (!$rebuild) {
|
|
| 2013 | - $terms_icons = get_option('gd_term_icons');
|
|
| 2014 | - } else {
|
|
| 2015 | - $terms_icons = array(); |
|
| 2016 | - } |
|
| 2017 | - |
|
| 2018 | - if (empty($terms_icons)) {
|
|
| 2019 | - $terms_icons = array(); |
|
| 2020 | - $default_icon_url = get_option('geodir_default_marker_icon');
|
|
| 2021 | - $taxonomy = geodir_get_taxonomies(); |
|
| 2022 | - $post_types = geodir_get_posttypes(); |
|
| 2023 | - $tax_arr = array(); |
|
| 2024 | - foreach ($post_types as $post_type) {
|
|
| 2025 | - $tax_arr[] = "'" . $post_type . "category'"; |
|
| 2026 | - } |
|
| 2027 | - $tax_c = implode(',', $tax_arr);
|
|
| 2028 | - $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");
|
|
| 2029 | - //$terms = get_terms( $taxonomy ); |
|
| 2030 | - |
|
| 2031 | - if($terms) {
|
|
| 2032 | - foreach ($terms as $term) {
|
|
| 2033 | - $post_type = str_replace("category", "", $term->taxonomy);
|
|
| 2034 | - $a_terms[$post_type][] = $term; |
|
| 2011 | + global $wpdb; |
|
| 2012 | + if (!$rebuild) {
|
|
| 2013 | + $terms_icons = get_option('gd_term_icons');
|
|
| 2014 | + } else {
|
|
| 2015 | + $terms_icons = array(); |
|
| 2016 | + } |
|
| 2035 | 2017 | |
| 2036 | - } |
|
| 2037 | - } |
|
| 2018 | + if (empty($terms_icons)) {
|
|
| 2019 | + $terms_icons = array(); |
|
| 2020 | + $default_icon_url = get_option('geodir_default_marker_icon');
|
|
| 2021 | + $taxonomy = geodir_get_taxonomies(); |
|
| 2022 | + $post_types = geodir_get_posttypes(); |
|
| 2023 | + $tax_arr = array(); |
|
| 2024 | + foreach ($post_types as $post_type) {
|
|
| 2025 | + $tax_arr[] = "'" . $post_type . "category'"; |
|
| 2026 | + } |
|
| 2027 | + $tax_c = implode(',', $tax_arr);
|
|
| 2028 | + $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");
|
|
| 2029 | + //$terms = get_terms( $taxonomy ); |
|
| 2038 | 2030 | |
| 2039 | - if($a_terms) {
|
|
| 2040 | - foreach ($a_terms as $pt => $t2) {
|
|
| 2031 | + if($terms) {
|
|
| 2032 | + foreach ($terms as $term) {
|
|
| 2033 | + $post_type = str_replace("category", "", $term->taxonomy);
|
|
| 2034 | + $a_terms[$post_type][] = $term; |
|
| 2041 | 2035 | |
| 2042 | - foreach ($t2 as $term) {
|
|
| 2043 | - $term_icon = geodir_get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt); |
|
| 2044 | - if ($term_icon) {
|
|
| 2045 | - $term_icon_url = $term_icon["src"]; |
|
| 2046 | - } else {
|
|
| 2047 | - $term_icon_url = $default_icon_url; |
|
| 2048 | - } |
|
| 2049 | - $terms_icons[$term->term_id] = $term_icon_url; |
|
| 2050 | - } |
|
| 2051 | - } |
|
| 2052 | - } |
|
| 2036 | + } |
|
| 2037 | + } |
|
| 2053 | 2038 | |
| 2054 | - update_option('gd_term_icons', $terms_icons);
|
|
| 2055 | - } |
|
| 2039 | + if($a_terms) {
|
|
| 2040 | + foreach ($a_terms as $pt => $t2) {
|
|
| 2056 | 2041 | |
| 2057 | - if ($term_id && isset($terms_icons[$term_id])) {
|
|
| 2058 | - return $terms_icons[$term_id]; |
|
| 2059 | - } elseif ($term_id && !isset($terms_icons[$term_id])) {
|
|
| 2060 | - return get_option('geodir_default_marker_icon');
|
|
| 2061 | - } |
|
| 2042 | + foreach ($t2 as $term) {
|
|
| 2043 | + $term_icon = geodir_get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt); |
|
| 2044 | + if ($term_icon) {
|
|
| 2045 | + $term_icon_url = $term_icon["src"]; |
|
| 2046 | + } else {
|
|
| 2047 | + $term_icon_url = $default_icon_url; |
|
| 2048 | + } |
|
| 2049 | + $terms_icons[$term->term_id] = $term_icon_url; |
|
| 2050 | + } |
|
| 2051 | + } |
|
| 2052 | + } |
|
| 2053 | + |
|
| 2054 | + update_option('gd_term_icons', $terms_icons);
|
|
| 2055 | + } |
|
| 2062 | 2056 | |
| 2063 | - if (is_ssl()) {
|
|
| 2064 | - $terms_icons = str_replace("http:","https:",$terms_icons );
|
|
| 2065 | - } |
|
| 2057 | + if ($term_id && isset($terms_icons[$term_id])) {
|
|
| 2058 | + return $terms_icons[$term_id]; |
|
| 2059 | + } elseif ($term_id && !isset($terms_icons[$term_id])) {
|
|
| 2060 | + return get_option('geodir_default_marker_icon');
|
|
| 2061 | + } |
|
| 2062 | + |
|
| 2063 | + if (is_ssl()) {
|
|
| 2064 | + $terms_icons = str_replace("http:","https:",$terms_icons );
|
|
| 2065 | + } |
|
| 2066 | 2066 | |
| 2067 | - return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);
|
|
| 2067 | + return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);
|
|
| 2068 | 2068 | } |
| 2069 | 2069 | \ No newline at end of file |
