GeoDirectory /
geodirectory
@@ -113,7 +113,7 @@ |
||
| 113 | 113 | * @since 1.0.0 |
| 114 | 114 | * @package GeoDirectory |
| 115 | 115 | * @param array $classes Class array. |
| 116 | - * @return array Modified class array. |
|
| 116 | + * @return string[] Modified class array. |
|
| 117 | 117 | */ |
| 118 | 118 | function geodir_x_body_class($classes) |
| 119 | 119 | { |
@@ -17,84 +17,84 @@ discard block |
||
| 17 | 17 | function enfold_action_calls() |
| 18 | 18 | { |
| 19 | 19 | |
| 20 | - /* ACTIONS |
|
| 20 | + /* ACTIONS |
|
| 21 | 21 | ****************************************************************************************/ |
| 22 | 22 | |
| 23 | - // Add body class for styling purposes |
|
| 24 | - add_filter('body_class', 'wpgeo_enfold_body_class'); |
|
| 23 | + // Add body class for styling purposes |
|
| 24 | + add_filter('body_class', 'wpgeo_enfold_body_class'); |
|
| 25 | 25 | |
| 26 | - // Pages using the page-builder shouldn't redirect on successful payment |
|
| 27 | - if (isset($_REQUEST['pay_action'])) { |
|
| 28 | - add_action('init', 'geodir_allow_payment_urls_enfold', 15); |
|
| 29 | - } |
|
| 26 | + // Pages using the page-builder shouldn't redirect on successful payment |
|
| 27 | + if (isset($_REQUEST['pay_action'])) { |
|
| 28 | + add_action('init', 'geodir_allow_payment_urls_enfold', 15); |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - // LOCATION MANAGER MENU ACTIONS - set the location menu item before the Enfold search |
|
| 32 | - if (function_exists('geodir_location_menu_items')) { |
|
| 33 | - remove_filter('wp_nav_menu_items', 'geodir_location_menu_items', 110); |
|
| 34 | - add_filter('wp_nav_menu_items', 'geodir_location_menu_items', 8, 2); |
|
| 35 | - } |
|
| 36 | - // GEODIR MENU ACTIONS - set the GeoDir menu items before the Enfold search |
|
| 37 | - remove_filter('wp_nav_menu_items', 'geodir_menu_items', 100); |
|
| 38 | - add_filter('wp_nav_menu_items', 'geodir_menu_items', 7, 2); |
|
| 31 | + // LOCATION MANAGER MENU ACTIONS - set the location menu item before the Enfold search |
|
| 32 | + if (function_exists('geodir_location_menu_items')) { |
|
| 33 | + remove_filter('wp_nav_menu_items', 'geodir_location_menu_items', 110); |
|
| 34 | + add_filter('wp_nav_menu_items', 'geodir_location_menu_items', 8, 2); |
|
| 35 | + } |
|
| 36 | + // GEODIR MENU ACTIONS - set the GeoDir menu items before the Enfold search |
|
| 37 | + remove_filter('wp_nav_menu_items', 'geodir_menu_items', 100); |
|
| 38 | + add_filter('wp_nav_menu_items', 'geodir_menu_items', 7, 2); |
|
| 39 | 39 | |
| 40 | - // HOME TOP SIDEBAR |
|
| 41 | - remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 42 | - remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 43 | - //add_action( 'ava_after_main_container', 'enfold_home_sidebar' ); |
|
| 40 | + // HOME TOP SIDEBAR |
|
| 41 | + remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 42 | + remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 43 | + //add_action( 'ava_after_main_container', 'enfold_home_sidebar' ); |
|
| 44 | 44 | |
| 45 | 45 | |
| 46 | - // WRAPPER OPEN ACTIONS |
|
| 47 | - remove_action('geodir_wrapper_open', 'geodir_action_wrapper_open', 10); |
|
| 48 | - add_action('geodir_wrapper_open', 'enfold_action_wrapper_open', 9); |
|
| 49 | - add_action('geodir_wrapper_open', 'enfold_detail_title', 8, 2); // ADD GEODIR TITLE |
|
| 46 | + // WRAPPER OPEN ACTIONS |
|
| 47 | + remove_action('geodir_wrapper_open', 'geodir_action_wrapper_open', 10); |
|
| 48 | + add_action('geodir_wrapper_open', 'enfold_action_wrapper_open', 9); |
|
| 49 | + add_action('geodir_wrapper_open', 'enfold_detail_title', 8, 2); // ADD GEODIR TITLE |
|
| 50 | 50 | |
| 51 | 51 | |
| 52 | - // WRAPPER CONTENT OPEN ACTIONS |
|
| 53 | - remove_action('geodir_wrapper_content_open', 'geodir_action_wrapper_content_open', 10); |
|
| 54 | - add_action('geodir_wrapper_content_open', 'enfold_action_wrapper_content_open', 9, 3); |
|
| 52 | + // WRAPPER CONTENT OPEN ACTIONS |
|
| 53 | + remove_action('geodir_wrapper_content_open', 'geodir_action_wrapper_content_open', 10); |
|
| 54 | + add_action('geodir_wrapper_content_open', 'enfold_action_wrapper_content_open', 9, 3); |
|
| 55 | 55 | |
| 56 | 56 | |
| 57 | - // SIDEBAR RIGHT OPEN ACTIONS |
|
| 58 | - remove_action('geodir_sidebar_right_open', 'geodir_action_sidebar_right_open', 10); |
|
| 59 | - add_action('geodir_sidebar_right_open', 'enfold_action_sidebar_right_open', 10, 4); |
|
| 57 | + // SIDEBAR RIGHT OPEN ACTIONS |
|
| 58 | + remove_action('geodir_sidebar_right_open', 'geodir_action_sidebar_right_open', 10); |
|
| 59 | + add_action('geodir_sidebar_right_open', 'enfold_action_sidebar_right_open', 10, 4); |
|
| 60 | 60 | |
| 61 | - // SIDEBAR LEFT OPEN ACTIONS |
|
| 62 | - remove_action('geodir_sidebar_left_open', 'geodir_action_sidebar_left_open', 10); |
|
| 63 | - add_action('geodir_sidebar_left_open', 'enfold_action_sidebar_left_open', 10, 4); |
|
| 61 | + // SIDEBAR LEFT OPEN ACTIONS |
|
| 62 | + remove_action('geodir_sidebar_left_open', 'geodir_action_sidebar_left_open', 10); |
|
| 63 | + add_action('geodir_sidebar_left_open', 'enfold_action_sidebar_left_open', 10, 4); |
|
| 64 | 64 | |
| 65 | 65 | |
| 66 | - // HOME PAGE BREADCRUMBS |
|
| 67 | - remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20); |
|
| 68 | - remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20); |
|
| 66 | + // HOME PAGE BREADCRUMBS |
|
| 67 | + remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20); |
|
| 68 | + remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20); |
|
| 69 | 69 | |
| 70 | - // LISTINGS PAGE BREADCRUMBS & TITLES |
|
| 71 | - remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20); |
|
| 72 | - remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10); |
|
| 70 | + // LISTINGS PAGE BREADCRUMBS & TITLES |
|
| 71 | + remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20); |
|
| 72 | + remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10); |
|
| 73 | 73 | |
| 74 | - // DETAILS PAGE BREADCRUMBS & TITLES |
|
| 75 | - remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20); |
|
| 76 | - remove_action('geodir_details_main_content', 'geodir_action_page_title', 20); |
|
| 74 | + // DETAILS PAGE BREADCRUMBS & TITLES |
|
| 75 | + remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20); |
|
| 76 | + remove_action('geodir_details_main_content', 'geodir_action_page_title', 20); |
|
| 77 | 77 | |
| 78 | - // SEARCH PAGE BREADCRUMBS & TITLES |
|
| 79 | - remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20); |
|
| 80 | - remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10); |
|
| 78 | + // SEARCH PAGE BREADCRUMBS & TITLES |
|
| 79 | + remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20); |
|
| 80 | + remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10); |
|
| 81 | 81 | |
| 82 | - // AUTHOR PAGE BREADCRUMBS & TITLES |
|
| 83 | - remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20); |
|
| 84 | - remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10); |
|
| 82 | + // AUTHOR PAGE BREADCRUMBS & TITLES |
|
| 83 | + remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20); |
|
| 84 | + remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10); |
|
| 85 | 85 | |
| 86 | - // DISABLE ENFOLD MAPS CALL |
|
| 87 | - add_filter('avf_load_google_map_api', 'gd_enfold_remove_maps_api', 10, 1); |
|
| 86 | + // DISABLE ENFOLD MAPS CALL |
|
| 87 | + add_filter('avf_load_google_map_api', 'gd_enfold_remove_maps_api', 10, 1); |
|
| 88 | 88 | |
| 89 | - // make top section wide |
|
| 90 | - remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 91 | - remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 92 | - remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10); |
|
| 93 | - remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10); |
|
| 94 | - remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10); |
|
| 95 | - remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10); |
|
| 89 | + // make top section wide |
|
| 90 | + remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 91 | + remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 92 | + remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10); |
|
| 93 | + remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10); |
|
| 94 | + remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10); |
|
| 95 | + remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10); |
|
| 96 | 96 | |
| 97 | - add_action('geodir_wrapper_open', 'gd_enfold_compat_add_top_section_back', 5); |
|
| 97 | + add_action('geodir_wrapper_open', 'gd_enfold_compat_add_top_section_back', 5); |
|
| 98 | 98 | |
| 99 | 99 | } // Close enfold_action_calls |
| 100 | 100 | |
@@ -108,17 +108,17 @@ discard block |
||
| 108 | 108 | function gd_enfold_compat_add_top_section_back() |
| 109 | 109 | { |
| 110 | 110 | |
| 111 | - if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 112 | - add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_home_top', 8); |
|
| 113 | - } elseif (geodir_is_page('listing')) { |
|
| 114 | - add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_listings_top', 8); |
|
| 115 | - } elseif (geodir_is_page('detail')) { |
|
| 116 | - add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_detail_top', 8); |
|
| 117 | - } elseif (geodir_is_page('search')) { |
|
| 118 | - add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_search_top', 8); |
|
| 119 | - } elseif (geodir_is_page('author')) { |
|
| 120 | - add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_author_top', 8); |
|
| 121 | - } |
|
| 111 | + if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 112 | + add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_home_top', 8); |
|
| 113 | + } elseif (geodir_is_page('listing')) { |
|
| 114 | + add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_listings_top', 8); |
|
| 115 | + } elseif (geodir_is_page('detail')) { |
|
| 116 | + add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_detail_top', 8); |
|
| 117 | + } elseif (geodir_is_page('search')) { |
|
| 118 | + add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_search_top', 8); |
|
| 119 | + } elseif (geodir_is_page('author')) { |
|
| 120 | + add_action('geodir_wrapper_open', 'geodir_action_geodir_sidebar_author_top', 8); |
|
| 121 | + } |
|
| 122 | 122 | |
| 123 | 123 | |
| 124 | 124 | } |
@@ -137,8 +137,8 @@ discard block |
||
| 137 | 137 | */ |
| 138 | 138 | function wpgeo_enfold_body_class($classes) |
| 139 | 139 | { |
| 140 | - $classes[] = 'wpgeo-enfold'; |
|
| 141 | - return $classes; |
|
| 140 | + $classes[] = 'wpgeo-enfold'; |
|
| 141 | + return $classes; |
|
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | /** |
@@ -149,8 +149,8 @@ discard block |
||
| 149 | 149 | */ |
| 150 | 150 | function geodir_allow_payment_urls_enfold() |
| 151 | 151 | { |
| 152 | - global $builder; |
|
| 153 | - remove_action('template_redirect', array($builder, 'template_redirect'), 1000); |
|
| 152 | + global $builder; |
|
| 153 | + remove_action('template_redirect', array($builder, 'template_redirect'), 1000); |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | |
@@ -162,8 +162,8 @@ discard block |
||
| 162 | 162 | */ |
| 163 | 163 | function enfold_action_wrapper_open() |
| 164 | 164 | { |
| 165 | - echo "<div class='container_wrap container_wrap_first main_color " . avia_layout_class('main', false) . "'>"; |
|
| 166 | - echo "<div class='container template-blog '>"; |
|
| 165 | + echo "<div class='container_wrap container_wrap_first main_color " . avia_layout_class('main', false) . "'>"; |
|
| 166 | + echo "<div class='container template-blog '>"; |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | /** |
@@ -177,38 +177,38 @@ discard block |
||
| 177 | 177 | */ |
| 178 | 178 | function enfold_detail_title($page, $class) |
| 179 | 179 | { |
| 180 | - //echo '###'.$page; |
|
| 181 | - global $wp; |
|
| 182 | - if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id() && !geodir_is_page('login')) { |
|
| 183 | - add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2); |
|
| 184 | - echo avia_title(); |
|
| 185 | - } elseif ($page == 'details-page') { |
|
| 186 | - add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2); |
|
| 187 | - echo avia_title(); |
|
| 188 | - } elseif ($page == 'listings-page' || $page == 'search-page') { |
|
| 189 | - add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2); |
|
| 190 | - ob_start(); // Start buffering; |
|
| 191 | - geodir_action_listings_title(); |
|
| 192 | - $gd_title = ob_get_clean(); |
|
| 193 | - $title_p = explode('">', $gd_title); |
|
| 194 | - $title = str_replace('</h1></header>', "", $title_p[2]); |
|
| 195 | - //print_r($title_p); |
|
| 196 | - echo avia_title(array('title' => $title)); |
|
| 197 | - } elseif ($page == 'author-page') { |
|
| 198 | - add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2); |
|
| 199 | - ob_start(); // Start buffering; |
|
| 200 | - geodir_action_author_page_title(); |
|
| 201 | - $gd_title = ob_get_clean(); |
|
| 202 | - $gd_title = str_replace('<h1>', "", $gd_title); |
|
| 203 | - $gd_title = str_replace('</h1>', "", $gd_title); |
|
| 204 | - echo avia_title(array('title' => $gd_title)); |
|
| 205 | - } elseif ($page == 'add-listing-page') { |
|
| 206 | - add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2); |
|
| 207 | - echo avia_title(); |
|
| 208 | - } elseif ($page == 'add-listing-page') { |
|
| 209 | - add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2); |
|
| 210 | - echo avia_title(); |
|
| 211 | - } |
|
| 180 | + //echo '###'.$page; |
|
| 181 | + global $wp; |
|
| 182 | + if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id() && !geodir_is_page('login')) { |
|
| 183 | + add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2); |
|
| 184 | + echo avia_title(); |
|
| 185 | + } elseif ($page == 'details-page') { |
|
| 186 | + add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2); |
|
| 187 | + echo avia_title(); |
|
| 188 | + } elseif ($page == 'listings-page' || $page == 'search-page') { |
|
| 189 | + add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2); |
|
| 190 | + ob_start(); // Start buffering; |
|
| 191 | + geodir_action_listings_title(); |
|
| 192 | + $gd_title = ob_get_clean(); |
|
| 193 | + $title_p = explode('">', $gd_title); |
|
| 194 | + $title = str_replace('</h1></header>', "", $title_p[2]); |
|
| 195 | + //print_r($title_p); |
|
| 196 | + echo avia_title(array('title' => $title)); |
|
| 197 | + } elseif ($page == 'author-page') { |
|
| 198 | + add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2); |
|
| 199 | + ob_start(); // Start buffering; |
|
| 200 | + geodir_action_author_page_title(); |
|
| 201 | + $gd_title = ob_get_clean(); |
|
| 202 | + $gd_title = str_replace('<h1>', "", $gd_title); |
|
| 203 | + $gd_title = str_replace('</h1>', "", $gd_title); |
|
| 204 | + echo avia_title(array('title' => $gd_title)); |
|
| 205 | + } elseif ($page == 'add-listing-page') { |
|
| 206 | + add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2); |
|
| 207 | + echo avia_title(); |
|
| 208 | + } elseif ($page == 'add-listing-page') { |
|
| 209 | + add_action('avia_breadcrumbs_trail', 'enfold_detail_breadcrum', 8, 2); |
|
| 210 | + echo avia_title(); |
|
| 211 | + } |
|
| 212 | 212 | |
| 213 | 213 | } |
| 214 | 214 | |
@@ -223,22 +223,22 @@ discard block |
||
| 223 | 223 | */ |
| 224 | 224 | function enfold_detail_breadcrum($trail, $args) |
| 225 | 225 | { |
| 226 | - ob_start(); // Start buffering; |
|
| 227 | - geodir_breadcrumb(); |
|
| 228 | - $gd_crums = ob_get_clean(); |
|
| 229 | - if ($gd_crums) { |
|
| 230 | - $gd_crums = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs"><li>', "", $gd_crums); |
|
| 231 | - $gd_crums = str_replace('</li></ul></div>', "", $gd_crums); |
|
| 232 | - $gd_crums = str_replace(' > ', " > ", $gd_crums); |
|
| 233 | - $gd_crums = str_replace('</li><li>', "", $gd_crums); |
|
| 234 | - $gd_crums = explode(" > ", $gd_crums); |
|
| 235 | - $trail_end = array_pop($gd_crums); |
|
| 236 | - $gd_crums['trail_end'] = $trail_end; |
|
| 237 | - //print_r($gd_crums); |
|
| 238 | - //print_r($trail); |
|
| 239 | - $trail = $gd_crums; |
|
| 240 | - } |
|
| 241 | - return $trail; |
|
| 226 | + ob_start(); // Start buffering; |
|
| 227 | + geodir_breadcrumb(); |
|
| 228 | + $gd_crums = ob_get_clean(); |
|
| 229 | + if ($gd_crums) { |
|
| 230 | + $gd_crums = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs"><li>', "", $gd_crums); |
|
| 231 | + $gd_crums = str_replace('</li></ul></div>', "", $gd_crums); |
|
| 232 | + $gd_crums = str_replace(' > ', " > ", $gd_crums); |
|
| 233 | + $gd_crums = str_replace('</li><li>', "", $gd_crums); |
|
| 234 | + $gd_crums = explode(" > ", $gd_crums); |
|
| 235 | + $trail_end = array_pop($gd_crums); |
|
| 236 | + $gd_crums['trail_end'] = $trail_end; |
|
| 237 | + //print_r($gd_crums); |
|
| 238 | + //print_r($trail); |
|
| 239 | + $trail = $gd_crums; |
|
| 240 | + } |
|
| 241 | + return $trail; |
|
| 242 | 242 | } |
| 243 | 243 | |
| 244 | 244 | |
@@ -253,12 +253,12 @@ discard block |
||
| 253 | 253 | */ |
| 254 | 254 | function enfold_action_wrapper_content_open($type = '', $id = '', $class = '') |
| 255 | 255 | { |
| 256 | - if (geodir_is_page('login')) { |
|
| 257 | - echo "<main class='template-page content twelve alpha units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">"; |
|
| 258 | - } else { |
|
| 259 | - echo "<main class='template-page content " . avia_layout_class('content', false) . " units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">"; |
|
| 260 | - } |
|
| 261 | - echo '<div class="entry-content-wrapper">'; |
|
| 256 | + if (geodir_is_page('login')) { |
|
| 257 | + echo "<main class='template-page content twelve alpha units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">"; |
|
| 258 | + } else { |
|
| 259 | + echo "<main class='template-page content " . avia_layout_class('content', false) . " units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">"; |
|
| 260 | + } |
|
| 261 | + echo '<div class="entry-content-wrapper">'; |
|
| 262 | 262 | } |
| 263 | 263 | |
| 264 | 264 | |
@@ -274,9 +274,9 @@ discard block |
||
| 274 | 274 | */ |
| 275 | 275 | function enfold_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '') |
| 276 | 276 | { |
| 277 | - $sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : ""; |
|
| 278 | - echo "<aside class='sidebar sidebar_right " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">"; |
|
| 279 | - echo "<div class='inner_sidebar extralight-border'>"; |
|
| 277 | + $sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : ""; |
|
| 278 | + echo "<aside class='sidebar sidebar_right " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">"; |
|
| 279 | + echo "<div class='inner_sidebar extralight-border'>"; |
|
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | /** |
@@ -291,9 +291,9 @@ discard block |
||
| 291 | 291 | */ |
| 292 | 292 | function enfold_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '') |
| 293 | 293 | { |
| 294 | - $sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : ""; |
|
| 295 | - echo "<aside class='sidebar sidebar_left " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">"; |
|
| 296 | - echo "<div class='inner_sidebar extralight-border'>"; |
|
| 294 | + $sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : ""; |
|
| 295 | + echo "<aside class='sidebar sidebar_left " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">"; |
|
| 296 | + echo "<div class='inner_sidebar extralight-border'>"; |
|
| 297 | 297 | } |
| 298 | 298 | |
| 299 | 299 | |
@@ -307,7 +307,7 @@ discard block |
||
| 307 | 307 | */ |
| 308 | 308 | function gd_enfold_remove_maps_api($call) |
| 309 | 309 | { |
| 310 | - return false; |
|
| 310 | + return false; |
|
| 311 | 311 | } |
| 312 | 312 | |
| 313 | 313 | |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | */ |
| 163 | 163 | function enfold_action_wrapper_open() |
| 164 | 164 | { |
| 165 | - echo "<div class='container_wrap container_wrap_first main_color " . avia_layout_class('main', false) . "'>"; |
|
| 165 | + echo "<div class='container_wrap container_wrap_first main_color ".avia_layout_class('main', false)."'>"; |
|
| 166 | 166 | echo "<div class='container template-blog '>"; |
| 167 | 167 | } |
| 168 | 168 | |
@@ -254,9 +254,9 @@ discard block |
||
| 254 | 254 | function enfold_action_wrapper_content_open($type = '', $id = '', $class = '') |
| 255 | 255 | { |
| 256 | 256 | if (geodir_is_page('login')) { |
| 257 | - echo "<main class='template-page content twelve alpha units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">"; |
|
| 257 | + echo "<main class='template-page content twelve alpha units ".$class."' ".avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)).">"; |
|
| 258 | 258 | } else { |
| 259 | - echo "<main class='template-page content " . avia_layout_class('content', false) . " units " . $class . "' " . avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)) . ">"; |
|
| 259 | + echo "<main class='template-page content ".avia_layout_class('content', false)." units ".$class."' ".avia_markup_helper(array('context' => 'content', 'post_type' => 'page', 'echo' => false)).">"; |
|
| 260 | 260 | } |
| 261 | 261 | echo '<div class="entry-content-wrapper">'; |
| 262 | 262 | } |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | function enfold_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '') |
| 276 | 276 | { |
| 277 | 277 | $sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : ""; |
| 278 | - echo "<aside class='sidebar sidebar_right " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">"; |
|
| 278 | + echo "<aside class='sidebar sidebar_right ".$sidebar_smartphone." ".avia_layout_class('sidebar', false)." units' ".avia_markup_helper(array('context' => 'sidebar', 'echo' => false)).">"; |
|
| 279 | 279 | echo "<div class='inner_sidebar extralight-border'>"; |
| 280 | 280 | } |
| 281 | 281 | |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | function enfold_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '') |
| 293 | 293 | { |
| 294 | 294 | $sidebar_smartphone = avia_get_option('smartphones_sidebar') == 'smartphones_sidebar' ? 'smartphones_sidebar_active' : ""; |
| 295 | - echo "<aside class='sidebar sidebar_left " . $sidebar_smartphone . " " . avia_layout_class('sidebar', false) . " units' " . avia_markup_helper(array('context' => 'sidebar', 'echo' => false)) . ">"; |
|
| 295 | + echo "<aside class='sidebar sidebar_left ".$sidebar_smartphone." ".avia_layout_class('sidebar', false)." units' ".avia_markup_helper(array('context' => 'sidebar', 'echo' => false)).">"; |
|
| 296 | 296 | echo "<div class='inner_sidebar extralight-border'>"; |
| 297 | 297 | } |
| 298 | 298 | |
@@ -721,7 +721,7 @@ discard block |
||
| 721 | 721 | * @param int $post_id The post ID. |
| 722 | 722 | * @param string $postmeta Detail table column name. |
| 723 | 723 | * @param string $meta_value Detail table column value. |
| 724 | - * @return void|bool |
|
| 724 | + * @return null|false |
|
| 725 | 725 | */ |
| 726 | 726 | function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '') |
| 727 | 727 | {
|
@@ -775,7 +775,7 @@ discard block |
||
| 775 | 775 | * @param string $postmeta Detail table column name. |
| 776 | 776 | * @todo check if this is depreciated |
| 777 | 777 | * @todo Fix unknown variable mval |
| 778 | - * @return bool |
|
| 778 | + * @return boolean|null |
|
| 779 | 779 | */ |
| 780 | 780 | function geodir_delete_post_meta($post_id, $postmeta) |
| 781 | 781 | {
|
@@ -2124,7 +2124,7 @@ discard block |
||
| 2124 | 2124 | * @global string $plugin_prefix Geodirectory plugin table prefix. |
| 2125 | 2125 | * @param int $deleted_postid The post ID. |
| 2126 | 2126 | * @param bool $force Optional. Do you want to force delete it? Default: false. |
| 2127 | - * @return bool|void |
|
| 2127 | + * @return null|false |
|
| 2128 | 2128 | */ |
| 2129 | 2129 | function geodir_delete_listing_info($deleted_postid, $force = false) |
| 2130 | 2130 | {
|
@@ -2693,7 +2693,7 @@ discard block |
||
| 2693 | 2693 | * @since 1.0.0 |
| 2694 | 2694 | * @package GeoDirectory |
| 2695 | 2695 | * @global object $current_user Current user object. |
| 2696 | - * @param int|string $listing_id The post ID. |
|
| 2696 | + * @param integer $listing_id The post ID. |
|
| 2697 | 2697 | * @param bool $exclude_admin Optional. Do you want to exclude admin from the check?. Default true. |
| 2698 | 2698 | * @return bool |
| 2699 | 2699 | */ |
@@ -21,12 +21,13 @@ discard block |
||
| 21 | 21 | {
|
| 22 | 22 | |
| 23 | 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, ","));
|
|
| 24 | + if (!empty($post_cat_ids)) { |
|
| 25 | + $post_cat_array = explode(",", trim($post_cat_ids, ",")); |
|
| 26 | + } |
|
| 26 | 27 | |
| 27 | 28 | if (!isset($default_cat) || empty($default_cat)) {
|
| 28 | 29 | $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : ''; |
| 29 | - }else{
|
|
| 30 | + } else{
|
|
| 30 | 31 | if(!is_int($default_cat)){
|
| 31 | 32 | $category = get_term_by('name', $default_cat, $taxonomy);
|
| 32 | 33 | if(isset($category->term_id)){
|
@@ -372,8 +373,9 @@ discard block |
||
| 372 | 373 | } elseif (trim($type) == 'file') {
|
| 373 | 374 | if (isset($request_info[$name])) {
|
| 374 | 375 | $request_files = array(); |
| 375 | - if ($request_info[$name] != '') |
|
| 376 | - $request_files = explode(",", $request_info[$name]);
|
|
| 376 | + if ($request_info[$name] != '') { |
|
| 377 | + $request_files = explode(",", $request_info[$name]); |
|
| 378 | + } |
|
| 377 | 379 | |
| 378 | 380 | $extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL; |
| 379 | 381 | geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields); |
@@ -399,7 +401,7 @@ discard block |
||
| 399 | 401 | |
| 400 | 402 | $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
|
| 401 | 403 | |
| 402 | - }else{
|
|
| 404 | + } else{
|
|
| 403 | 405 | $post_htmlvar_value = $request_info[$name]; |
| 404 | 406 | } |
| 405 | 407 | |
@@ -439,15 +441,17 @@ discard block |
||
| 439 | 441 | |
| 440 | 442 | foreach ($request_info['post_category'] as $taxonomy => $cat) {
|
| 441 | 443 | |
| 442 | - if ($dummy) |
|
| 443 | - $post_category = $cat; |
|
| 444 | - else {
|
|
| 444 | + if ($dummy) { |
|
| 445 | + $post_category = $cat; |
|
| 446 | + } else {
|
|
| 445 | 447 | |
| 446 | - if (!is_array($cat) && strstr($cat, ',')) |
|
| 447 | - $cat = explode(',', $cat);
|
|
| 448 | + if (!is_array($cat) && strstr($cat, ',')) { |
|
| 449 | + $cat = explode(',', $cat); |
|
| 450 | + } |
|
| 448 | 451 | |
| 449 | - if (!empty($cat) && is_array($cat)) |
|
| 450 | - $post_category = array_map('intval', $cat);
|
|
| 452 | + if (!empty($cat) && is_array($cat)) { |
|
| 453 | + $post_category = array_map('intval', $cat); |
|
| 454 | + } |
|
| 451 | 455 | } |
| 452 | 456 | |
| 453 | 457 | wp_set_object_terms($last_post_id, $post_category, $taxonomy); |
@@ -465,11 +469,13 @@ discard block |
||
| 465 | 469 | if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {
|
| 466 | 470 | $post_tags = explode(",", $request_info['post_tags']);
|
| 467 | 471 | } elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {
|
| 468 | - if ($dummy) |
|
| 469 | - $post_tags = $request_info['post_tags']; |
|
| 472 | + if ($dummy) { |
|
| 473 | + $post_tags = $request_info['post_tags']; |
|
| 474 | + } |
|
| 470 | 475 | } else {
|
| 471 | - if ($dummy) |
|
| 472 | - $post_tags = array($request_info['post_title']); |
|
| 476 | + if ($dummy) { |
|
| 477 | + $post_tags = array($request_info['post_title']); |
|
| 478 | + } |
|
| 473 | 479 | } |
| 474 | 480 | |
| 475 | 481 | if (is_array($post_tags)) {
|
@@ -556,15 +562,17 @@ discard block |
||
| 556 | 562 | |
| 557 | 563 | global $wpdb, $plugin_prefix, $post, $post_info; |
| 558 | 564 | |
| 559 | - if ($post_id == '' && !empty($post)) |
|
| 560 | - $post_id = $post->ID; |
|
| 565 | + if ($post_id == '' && !empty($post)) { |
|
| 566 | + $post_id = $post->ID; |
|
| 567 | + } |
|
| 561 | 568 | |
| 562 | 569 | $post_type = get_post_type($post_id); |
| 563 | 570 | |
| 564 | 571 | $all_postypes = geodir_get_posttypes(); |
| 565 | 572 | |
| 566 | - if (!in_array($post_type, $all_postypes)) |
|
| 567 | - return false; |
|
| 573 | + if (!in_array($post_type, $all_postypes)) { |
|
| 574 | + return false; |
|
| 575 | + } |
|
| 568 | 576 | |
| 569 | 577 | $table = $plugin_prefix . $post_type . '_detail'; |
| 570 | 578 | |
@@ -714,8 +722,9 @@ discard block |
||
| 714 | 722 | do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);
|
| 715 | 723 | |
| 716 | 724 | return true; |
| 717 | - } else |
|
| 718 | - return false; |
|
| 725 | + } else { |
|
| 726 | + return false; |
|
| 727 | + } |
|
| 719 | 728 | |
| 720 | 729 | } |
| 721 | 730 | } |
@@ -769,8 +778,9 @@ discard block |
||
| 769 | 778 | } |
| 770 | 779 | |
| 771 | 780 | |
| 772 | - } else |
|
| 773 | - return false; |
|
| 781 | + } else { |
|
| 782 | + return false; |
|
| 783 | + } |
|
| 774 | 784 | } |
| 775 | 785 | } |
| 776 | 786 | |
@@ -801,8 +811,9 @@ discard block |
||
| 801 | 811 | $post_meta_set_query = ''; |
| 802 | 812 | |
| 803 | 813 | foreach ($postmeta as $mkey) {
|
| 804 | - if ($mval != '') |
|
| 805 | - $post_meta_set_query .= $mkey . " = '', "; |
|
| 814 | + if ($mval != '') { |
|
| 815 | + $post_meta_set_query .= $mkey . " = '', "; |
|
| 816 | + } |
|
| 806 | 817 | } |
| 807 | 818 | |
| 808 | 819 | $post_meta_set_query = trim($post_meta_set_query, ", "); |
@@ -832,8 +843,9 @@ discard block |
||
| 832 | 843 | return true; |
| 833 | 844 | } |
| 834 | 845 | |
| 835 | - } else |
|
| 836 | - return false; |
|
| 846 | + } else { |
|
| 847 | + return false; |
|
| 848 | + } |
|
| 837 | 849 | } |
| 838 | 850 | } |
| 839 | 851 | |
@@ -863,8 +875,9 @@ discard block |
||
| 863 | 875 | |
| 864 | 876 | $post_type = get_post_type($post_id); |
| 865 | 877 | |
| 866 | - if (!in_array($post_type, $all_postypes)) |
|
| 867 | - return false; |
|
| 878 | + if (!in_array($post_type, $all_postypes)) { |
|
| 879 | + return false; |
|
| 880 | + } |
|
| 868 | 881 | |
| 869 | 882 | $table = $plugin_prefix . $post_type . '_detail'; |
| 870 | 883 | |
@@ -873,8 +886,9 @@ discard block |
||
| 873 | 886 | |
| 874 | 887 | if ($meta_value && $meta_value !== '') {
|
| 875 | 888 | return maybe_serialize($meta_value); |
| 876 | - } else |
|
| 877 | - return $meta_value; |
|
| 889 | + } else { |
|
| 890 | + return $meta_value; |
|
| 891 | + } |
|
| 878 | 892 | } else {
|
| 879 | 893 | return false; |
| 880 | 894 | } |
@@ -1008,7 +1022,7 @@ discard block |
||
| 1008 | 1022 | if (isset($uploaded['error']) && empty($uploaded['error'])) {
|
| 1009 | 1023 | $new_name = basename($uploaded['file']); |
| 1010 | 1024 | $uploaded_file = $uploaded; |
| 1011 | - }else{
|
|
| 1025 | + } else{
|
|
| 1012 | 1026 | print_r($uploaded);exit; |
| 1013 | 1027 | } |
| 1014 | 1028 | $external_img = false; |
@@ -1033,8 +1047,9 @@ discard block |
||
| 1033 | 1047 | $file_path = $curr_img_dir . '/' . $filename; |
| 1034 | 1048 | } |
| 1035 | 1049 | |
| 1036 | - if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path)) |
|
| 1037 | - unlink($img_path); |
|
| 1050 | + if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path)) { |
|
| 1051 | + unlink($img_path); |
|
| 1052 | + } |
|
| 1038 | 1053 | } |
| 1039 | 1054 | |
| 1040 | 1055 | if (!empty($uploaded_file)) {
|
@@ -1063,8 +1078,9 @@ discard block |
||
| 1063 | 1078 | $attachment_set = ''; |
| 1064 | 1079 | |
| 1065 | 1080 | foreach ($attachment as $key => $val) {
|
| 1066 | - if ($val != '') |
|
| 1067 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 1081 | + if ($val != '') { |
|
| 1082 | + $attachment_set .= $key . " = '" . $val . "', "; |
|
| 1083 | + } |
|
| 1068 | 1084 | } |
| 1069 | 1085 | |
| 1070 | 1086 | $attachment_set = trim($attachment_set, ", "); |
@@ -1089,8 +1105,9 @@ discard block |
||
| 1089 | 1105 | ) |
| 1090 | 1106 | ); |
| 1091 | 1107 | |
| 1092 | - if ($menu_order == 1) |
|
| 1093 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
|
|
| 1108 | + if ($menu_order == 1) { |
|
| 1109 | + $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id))); |
|
| 1110 | + } |
|
| 1094 | 1111 | |
| 1095 | 1112 | } |
| 1096 | 1113 | |
@@ -1131,8 +1148,9 @@ discard block |
||
| 1131 | 1148 | |
| 1132 | 1149 | $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
|
| 1133 | 1150 | |
| 1134 | - if (!empty($invalid_files)) |
|
| 1135 | - geodir_remove_attachments($invalid_files); |
|
| 1151 | + if (!empty($invalid_files)) { |
|
| 1152 | + geodir_remove_attachments($invalid_files); |
|
| 1153 | + } |
|
| 1136 | 1154 | } |
| 1137 | 1155 | |
| 1138 | 1156 | } |
@@ -1185,16 +1203,19 @@ discard block |
||
| 1185 | 1203 | function geodir_delete_directory($dirname) |
| 1186 | 1204 | {
|
| 1187 | 1205 | $dir_handle = ''; |
| 1188 | - if (is_dir($dirname)) |
|
| 1189 | - $dir_handle = opendir($dirname); |
|
| 1190 | - if (!$dir_handle) |
|
| 1191 | - return false; |
|
| 1206 | + if (is_dir($dirname)) { |
|
| 1207 | + $dir_handle = opendir($dirname); |
|
| 1208 | + } |
|
| 1209 | + if (!$dir_handle) { |
|
| 1210 | + return false; |
|
| 1211 | + } |
|
| 1192 | 1212 | while ($file = readdir($dir_handle)) {
|
| 1193 | 1213 | if ($file != "." && $file != "..") {
|
| 1194 | - if (!is_dir($dirname . "/" . $file)) |
|
| 1195 | - unlink($dirname . "/" . $file); |
|
| 1196 | - else |
|
| 1197 | - geodir_delete_directory($dirname . '/' . $file); |
|
| 1214 | + if (!is_dir($dirname . "/" . $file)) { |
|
| 1215 | + unlink($dirname . "/" . $file); |
|
| 1216 | + } else { |
|
| 1217 | + geodir_delete_directory($dirname . '/' . $file); |
|
| 1218 | + } |
|
| 1198 | 1219 | } |
| 1199 | 1220 | } |
| 1200 | 1221 | closedir($dir_handle); |
@@ -1223,8 +1244,9 @@ discard block |
||
| 1223 | 1244 | foreach ($postcurr_images as $postimg) {
|
| 1224 | 1245 | $image_name_arr = explode('/', $postimg->src);
|
| 1225 | 1246 | $filename = end($image_name_arr); |
| 1226 | - if (file_exists($uploads_dir . '/' . $filename)) |
|
| 1227 | - unlink($uploads_dir . '/' . $filename); |
|
| 1247 | + if (file_exists($uploads_dir . '/' . $filename)) { |
|
| 1248 | + unlink($uploads_dir . '/' . $filename); |
|
| 1249 | + } |
|
| 1228 | 1250 | } |
| 1229 | 1251 | |
| 1230 | 1252 | } // endif |
@@ -1283,8 +1305,9 @@ discard block |
||
| 1283 | 1305 | |
| 1284 | 1306 | $file_info = pathinfo($file); |
| 1285 | 1307 | $sub_dir = ''; |
| 1286 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 1287 | - $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 1308 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') { |
|
| 1309 | + $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 1310 | + } |
|
| 1288 | 1311 | |
| 1289 | 1312 | $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
| 1290 | 1313 | $uploads_baseurl = $uploads['baseurl']; |
@@ -1328,9 +1351,9 @@ discard block |
||
| 1328 | 1351 | $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
| 1329 | 1352 | } |
| 1330 | 1353 | |
| 1331 | - if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) |
|
| 1332 | - $default_img = $default_catimg['src']; |
|
| 1333 | - elseif ($no_image) {
|
|
| 1354 | + if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) { |
|
| 1355 | + $default_img = $default_catimg['src']; |
|
| 1356 | + } elseif ($no_image) {
|
|
| 1334 | 1357 | $default_img = get_option('geodir_listing_no_img');
|
| 1335 | 1358 | } |
| 1336 | 1359 | |
@@ -1362,10 +1385,13 @@ discard block |
||
| 1362 | 1385 | } |
| 1363 | 1386 | } |
| 1364 | 1387 | |
| 1365 | - if (!empty($img_arr)) |
|
| 1366 | - return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path ); |
|
| 1367 | - else |
|
| 1368 | - return false; |
|
| 1388 | + if (!empty($img_arr)) { |
|
| 1389 | + return (object)$img_arr; |
|
| 1390 | + } |
|
| 1391 | + //return (object)array( 'src' => $file_url, 'path' => $file_path ); |
|
| 1392 | + else { |
|
| 1393 | + return false; |
|
| 1394 | + } |
|
| 1369 | 1395 | } |
| 1370 | 1396 | } |
| 1371 | 1397 | |
@@ -1392,8 +1418,9 @@ discard block |
||
| 1392 | 1418 | echo $html; |
| 1393 | 1419 | } elseif (!empty($html)) {
|
| 1394 | 1420 | return $html; |
| 1395 | - } else |
|
| 1396 | - return false; |
|
| 1421 | + } else { |
|
| 1422 | + return false; |
|
| 1423 | + } |
|
| 1397 | 1424 | } |
| 1398 | 1425 | } |
| 1399 | 1426 | |
@@ -1421,8 +1448,9 @@ discard block |
||
| 1421 | 1448 | } |
| 1422 | 1449 | $not_featured = ''; |
| 1423 | 1450 | $sub_dir = ''; |
| 1424 | - if (!$add_featured) |
|
| 1425 | - $not_featured = " AND is_featured = 0 "; |
|
| 1451 | + if (!$add_featured) { |
|
| 1452 | + $not_featured = " AND is_featured = 0 "; |
|
| 1453 | + } |
|
| 1426 | 1454 | |
| 1427 | 1455 | $arrImages = $wpdb->get_results( |
| 1428 | 1456 | $wpdb->prepare( |
@@ -1443,8 +1471,9 @@ discard block |
||
| 1443 | 1471 | |
| 1444 | 1472 | $file_info = pathinfo($attechment->file); |
| 1445 | 1473 | |
| 1446 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 1447 | - $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 1474 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') { |
|
| 1475 | + $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 1476 | + } |
|
| 1448 | 1477 | |
| 1449 | 1478 | $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
| 1450 | 1479 | $uploads_baseurl = $uploads['baseurl']; |
@@ -1489,9 +1518,9 @@ discard block |
||
| 1489 | 1518 | $default_img = ''; |
| 1490 | 1519 | $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
| 1491 | 1520 | $post_type = get_post_type($post_id); |
| 1492 | - if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) |
|
| 1493 | - $default_img = $default_catimg['src']; |
|
| 1494 | - elseif ($no_images) {
|
|
| 1521 | + if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) { |
|
| 1522 | + $default_img = $default_catimg['src']; |
|
| 1523 | + } elseif ($no_images) {
|
|
| 1495 | 1524 | $default_img = get_option('geodir_listing_no_img');
|
| 1496 | 1525 | } |
| 1497 | 1526 | |
@@ -1526,8 +1555,9 @@ discard block |
||
| 1526 | 1555 | $return_arr[] = (object)$img_arr; |
| 1527 | 1556 | |
| 1528 | 1557 | return $return_arr; |
| 1529 | - } else |
|
| 1530 | - return false; |
|
| 1558 | + } else { |
|
| 1559 | + return false; |
|
| 1560 | + } |
|
| 1531 | 1561 | } |
| 1532 | 1562 | } |
| 1533 | 1563 | } |
@@ -1588,8 +1618,9 @@ discard block |
||
| 1588 | 1618 | $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2); |
| 1589 | 1619 | } else if ($image->width < ($max_size->h)) {
|
| 1590 | 1620 | $width_per = round((($image->width / $max_size->w) * 100), 2); |
| 1591 | - } else |
|
| 1592 | - $width_per = 100; |
|
| 1621 | + } else { |
|
| 1622 | + $width_per = 100; |
|
| 1623 | + } |
|
| 1593 | 1624 | } |
| 1594 | 1625 | |
| 1595 | 1626 | if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
|
@@ -1597,7 +1628,7 @@ discard block |
||
| 1597 | 1628 | } else {
|
| 1598 | 1629 | if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
|
| 1599 | 1630 | $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>'; |
| 1600 | - }else{
|
|
| 1631 | + } else{
|
|
| 1601 | 1632 | //$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>'; |
| 1602 | 1633 | //$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>'; |
| 1603 | 1634 | $html = '<div data-src="'.$image->src.'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>'; |
@@ -1612,8 +1643,9 @@ discard block |
||
| 1612 | 1643 | echo $html; |
| 1613 | 1644 | } elseif (!empty($html)) {
|
| 1614 | 1645 | return $html; |
| 1615 | - } else |
|
| 1616 | - return false; |
|
| 1646 | + } else { |
|
| 1647 | + return false; |
|
| 1648 | + } |
|
| 1617 | 1649 | } |
| 1618 | 1650 | } |
| 1619 | 1651 | |
@@ -1651,8 +1683,9 @@ discard block |
||
| 1651 | 1683 | $post_obj = get_post($post_id); |
| 1652 | 1684 | |
| 1653 | 1685 | $cat_ids = array('0');
|
| 1654 | - if (is_array($tt_ids)) |
|
| 1655 | - $cat_ids = $tt_ids; |
|
| 1686 | + if (is_array($tt_ids)) { |
|
| 1687 | + $cat_ids = $tt_ids; |
|
| 1688 | + } |
|
| 1656 | 1689 | |
| 1657 | 1690 | |
| 1658 | 1691 | if (!empty($cat_ids)) {
|
@@ -1709,8 +1742,9 @@ discard block |
||
| 1709 | 1742 | $json .= '}'; |
| 1710 | 1743 | |
| 1711 | 1744 | |
| 1712 | - if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true)) |
|
| 1713 | - $post_marker_json = $json; |
|
| 1745 | + if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true)) { |
|
| 1746 | + $post_marker_json = $json; |
|
| 1747 | + } |
|
| 1714 | 1748 | |
| 1715 | 1749 | |
| 1716 | 1750 | 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)))) {
|
@@ -1741,10 +1775,13 @@ discard block |
||
| 1741 | 1775 | if (!empty($post_term) && is_array($post_term)) {
|
| 1742 | 1776 | $categories = implode(',', $post_term);
|
| 1743 | 1777 | |
| 1744 | - if ($categories != '' && $categories != 0) $categories = ',' . $categories . ','; |
|
| 1778 | + if ($categories != '' && $categories != 0) { |
|
| 1779 | + $categories = ',' . $categories . ','; |
|
| 1780 | + } |
|
| 1745 | 1781 | |
| 1746 | - if (empty($post_marker_json)) |
|
| 1747 | - $post_marker_json = isset($json) ? $json : ''; |
|
| 1782 | + if (empty($post_marker_json)) { |
|
| 1783 | + $post_marker_json = isset($json) ? $json : ''; |
|
| 1784 | + } |
|
| 1748 | 1785 | |
| 1749 | 1786 | if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
| 1750 | 1787 | |
@@ -1783,8 +1820,9 @@ discard block |
||
| 1783 | 1820 | |
| 1784 | 1821 | } |
| 1785 | 1822 | |
| 1786 | - if ($default_category == '') |
|
| 1787 | - $default_category = $categories[0]; |
|
| 1823 | + if ($default_category == '') { |
|
| 1824 | + $default_category = $categories[0]; |
|
| 1825 | + } |
|
| 1788 | 1826 | |
| 1789 | 1827 | geodir_set_postcat_structure($post_id, $taxonomy, $default_category, ''); |
| 1790 | 1828 | |
@@ -1928,7 +1966,7 @@ discard block |
||
| 1928 | 1966 | } ?>"><img alt="bubble image" style="max-height:50px;" |
| 1929 | 1967 | src="<?php echo $post_images[0]; ?>"/></a></div> |
| 1930 | 1968 | <?php |
| 1931 | - }else{
|
|
| 1969 | + } else{
|
|
| 1932 | 1970 | echo '<div class="geodir-bubble_image"></div>'; |
| 1933 | 1971 | } |
| 1934 | 1972 | } else {
|
@@ -1936,7 +1974,7 @@ discard block |
||
| 1936 | 1974 | ?> |
| 1937 | 1975 | <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div> |
| 1938 | 1976 | <?php |
| 1939 | - }else{
|
|
| 1977 | + } else{
|
|
| 1940 | 1978 | echo '<div class="geodir-bubble_image"></div>'; |
| 1941 | 1979 | } |
| 1942 | 1980 | } |
@@ -2038,10 +2076,11 @@ discard block |
||
| 2038 | 2076 | */ |
| 2039 | 2077 | function geodir_new_post_default_status() |
| 2040 | 2078 | {
|
| 2041 | - if (get_option('geodir_new_post_default_status'))
|
|
| 2042 | - return get_option('geodir_new_post_default_status');
|
|
| 2043 | - else |
|
| 2044 | - return 'publish'; |
|
| 2079 | + if (get_option('geodir_new_post_default_status')) { |
|
| 2080 | + return get_option('geodir_new_post_default_status'); |
|
| 2081 | + } else { |
|
| 2082 | + return 'publish'; |
|
| 2083 | + } |
|
| 2045 | 2084 | |
| 2046 | 2085 | } |
| 2047 | 2086 | } |
@@ -2192,8 +2231,9 @@ discard block |
||
| 2192 | 2231 | |
| 2193 | 2232 | $all_postypes = geodir_get_posttypes(); |
| 2194 | 2233 | |
| 2195 | - if (!in_array($post_type, $all_postypes)) |
|
| 2196 | - return false; |
|
| 2234 | + if (!in_array($post_type, $all_postypes)) { |
|
| 2235 | + return false; |
|
| 2236 | + } |
|
| 2197 | 2237 | |
| 2198 | 2238 | $table = $plugin_prefix . $post_type . '_detail'; |
| 2199 | 2239 | |
@@ -2461,8 +2501,9 @@ discard block |
||
| 2461 | 2501 | $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');
|
| 2462 | 2502 | |
| 2463 | 2503 | $user_meta_data = ''; |
| 2464 | - if (isset($current_user->data->ID)) |
|
| 2465 | - $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2504 | + if (isset($current_user->data->ID)) { |
|
| 2505 | + $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2506 | + } |
|
| 2466 | 2507 | |
| 2467 | 2508 | if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
|
| 2468 | 2509 | ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>" ><a |
@@ -2475,8 +2516,9 @@ discard block |
||
| 2475 | 2516 | |
| 2476 | 2517 | if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
|
| 2477 | 2518 | $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\''; |
| 2478 | - } else |
|
| 2479 | - $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
|
|
| 2519 | + } else { |
|
| 2520 | + $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')'; |
|
| 2521 | + } |
|
| 2480 | 2522 | |
| 2481 | 2523 | ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon" |
| 2482 | 2524 | href="javascript:void(0);" |
@@ -2539,14 +2581,16 @@ discard block |
||
| 2539 | 2581 | WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;
|
| 2540 | 2582 | |
| 2541 | 2583 | $cat_post_count = $wpdb->get_var($count_query); |
| 2542 | - if (empty($cat_post_count) || is_wp_error($cat_post_count)) |
|
| 2543 | - $cat_post_count = 0; |
|
| 2584 | + if (empty($cat_post_count) || is_wp_error($cat_post_count)) { |
|
| 2585 | + $cat_post_count = 0; |
|
| 2586 | + } |
|
| 2544 | 2587 | |
| 2545 | 2588 | return $cat_post_count; |
| 2546 | 2589 | |
| 2547 | - } else |
|
| 2548 | - |
|
| 2549 | - return $term->count; |
|
| 2590 | + } else { |
|
| 2591 | + |
|
| 2592 | + return $term->count; |
|
| 2593 | + } |
|
| 2550 | 2594 | } |
| 2551 | 2595 | return false; |
| 2552 | 2596 | |
@@ -2593,13 +2637,15 @@ discard block |
||
| 2593 | 2637 | return $length; |
| 2594 | 2638 | } |
| 2595 | 2639 | |
| 2596 | - if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))
|
|
| 2597 | - $length = get_option('geodir_desc_word_limit');
|
|
| 2598 | - elseif (get_query_var('excerpt_length'))
|
|
| 2599 | - $length = get_query_var('excerpt_length');
|
|
| 2640 | + if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit')) { |
|
| 2641 | + $length = get_option('geodir_desc_word_limit'); |
|
| 2642 | + } elseif (get_query_var('excerpt_length')) { |
|
| 2643 | + $length = get_query_var('excerpt_length'); |
|
| 2644 | + } |
|
| 2600 | 2645 | |
| 2601 | - if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))
|
|
| 2602 | - $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 | + } |
|
| 2603 | 2649 | |
| 2604 | 2650 | return $length; |
| 2605 | 2651 | } |
@@ -2732,10 +2778,11 @@ discard block |
||
| 2732 | 2778 | function geodir_lisiting_belong_to_user($listing_id, $user_id) |
| 2733 | 2779 | {
|
| 2734 | 2780 | $listing_author_id = geodir_get_listing_author($listing_id); |
| 2735 | - if ($listing_author_id == $user_id) |
|
| 2736 | - return true; |
|
| 2737 | - else |
|
| 2738 | - return false; |
|
| 2781 | + if ($listing_author_id == $user_id) { |
|
| 2782 | + return true; |
|
| 2783 | + } else { |
|
| 2784 | + return false; |
|
| 2785 | + } |
|
| 2739 | 2786 | |
| 2740 | 2787 | } |
| 2741 | 2788 | |
@@ -2784,10 +2831,11 @@ discard block |
||
| 2784 | 2831 | $pattern = '/-\d+x\d+\./'; |
| 2785 | 2832 | preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE); |
| 2786 | 2833 | |
| 2787 | - if (empty($matches)) |
|
| 2788 | - return ''; |
|
| 2789 | - else |
|
| 2790 | - return $file; |
|
| 2834 | + if (empty($matches)) { |
|
| 2835 | + return ''; |
|
| 2836 | + } else { |
|
| 2837 | + return $file; |
|
| 2838 | + } |
|
| 2791 | 2839 | |
| 2792 | 2840 | } |
| 2793 | 2841 | |
@@ -2872,8 +2920,9 @@ discard block |
||
| 2872 | 2920 | } else {
|
| 2873 | 2921 | //set_post_thumbnail($post_id,-1); |
| 2874 | 2922 | |
| 2875 | - if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) |
|
| 2876 | - wp_delete_attachment($post_thumbnail_id); |
|
| 2923 | + if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) { |
|
| 2924 | + wp_delete_attachment($post_thumbnail_id); |
|
| 2925 | + } |
|
| 2877 | 2926 | |
| 2878 | 2927 | } |
| 2879 | 2928 | } |
@@ -2958,8 +3007,9 @@ discard block |
||
| 2958 | 3007 | |
| 2959 | 3008 | global $wpdb; |
| 2960 | 3009 | |
| 2961 | - if ($listing_type == '') |
|
| 2962 | - $listing_type = 'gd_place'; |
|
| 3010 | + if ($listing_type == '') { |
|
| 3011 | + $listing_type = 'gd_place'; |
|
| 3012 | + } |
|
| 2963 | 3013 | |
| 2964 | 3014 | $fields_info = array(); |
| 2965 | 3015 | |
@@ -2982,8 +3032,9 @@ discard block |
||
| 2982 | 3032 | |
| 2983 | 3033 | $fields_info[$prefix . 'address'] = $data->field_type; |
| 2984 | 3034 | |
| 2985 | - if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) |
|
| 2986 | - $fields_info[$prefix . 'zip'] = $data->field_type; |
|
| 3035 | + if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) { |
|
| 3036 | + $fields_info[$prefix . 'zip'] = $data->field_type; |
|
| 3037 | + } |
|
| 2987 | 3038 | |
| 2988 | 3039 | } else {
|
| 2989 | 3040 | |
@@ -20,480 +20,480 @@ 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 | - * @package GeoDirectory |
|
| 79 | - * @global object $wpdb WordPress Database object. |
|
| 80 | - * @global object $post The current post object. |
|
| 81 | - * @global object $current_user Current user object. |
|
| 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 | + * @package GeoDirectory |
|
| 79 | + * @global object $wpdb WordPress Database object. |
|
| 80 | + * @global object $post The current post object. |
|
| 81 | + * @global object $current_user Current user object. |
|
| 82 | 82 | * @global object $gd_session GeoDirectory Session object. |
| 83 | - * @param array $request_info {
|
|
| 84 | - * Array of request info arguments. |
|
| 85 | - * |
|
| 86 | - * @type string $action Ajax action name. |
|
| 87 | - * @type string $geodir_ajax Ajax type. |
|
| 88 | - * @type string $ajax_action Ajax action. |
|
| 89 | - * @type string $listing_type Listing type. |
|
| 90 | - * @type string $pid Default Post ID. |
|
| 91 | - * @type string $preview Todo Desc needed. |
|
| 92 | - * @type string $add_listing_page_id Add listing page ID. |
|
| 93 | - * @type string $post_title Listing title. |
|
| 94 | - * @type string $post_desc Listing Description. |
|
| 95 | - * @type string $post_tags Listing tags. |
|
| 96 | - * @type array $cat_limit Category limit. |
|
| 97 | - * @type array $post_category Category IDs. |
|
| 98 | - * @type array $post_category_str Category string. |
|
| 99 | - * @type string $post_default_category Default category ID. |
|
| 100 | - * @type string $post_address Listing address. |
|
| 101 | - * @type string $geodir_location_add_listing_country_val Add listing country value. |
|
| 102 | - * @type string $post_country Listing country. |
|
| 103 | - * @type string $geodir_location_add_listing_region_val Add listing region value. |
|
| 104 | - * @type string $post_region Listing region. |
|
| 105 | - * @type string $geodir_location_add_listing_city_val Add listing city value. |
|
| 106 | - * @type string $post_city Listing city. |
|
| 107 | - * @type string $post_zip Listing zip. |
|
| 108 | - * @type string $post_latitude Listing latitude. |
|
| 109 | - * @type string $post_longitude Listing longitude. |
|
| 110 | - * @type string $post_mapview Listing mapview. Default "ROADMAP". |
|
| 111 | - * @type string $post_mapzoom Listing mapzoom Default "9". |
|
| 112 | - * @type string $geodir_timing Business timing info. |
|
| 113 | - * @type string $geodir_contact Contact number. |
|
| 114 | - * @type string $geodir_email Business contact email. |
|
| 115 | - * @type string $geodir_website Business website. |
|
| 116 | - * @type string $geodir_twitter Twitter link. |
|
| 117 | - * @type string $geodir_facebook Facebook link. |
|
| 118 | - * @type string $geodir_video Video link. |
|
| 119 | - * @type string $geodir_special_offers Speacial offers. |
|
| 120 | - * @type string $post_images Post image urls. |
|
| 121 | - * @type string $post_imagesimage_limit Post images limit. |
|
| 122 | - * @type string $post_imagestotImg Todo Desc needed. |
|
| 123 | - * @type string $geodir_accept_term_condition Has accepted terms and conditions?. |
|
| 124 | - * @type string $geodir_spamblocker Todo Desc needed. |
|
| 125 | - * @type string $geodir_filled_by_spam_bot Todo Desc needed. |
|
| 126 | - * |
|
| 127 | - * } |
|
| 128 | - * @param bool $dummy Optional. Is this a dummy listing? Default false. |
|
| 129 | - * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false. |
|
| 130 | - * @return int|string|WP_Error Created post id or WP_Error on failure. |
|
| 131 | - */ |
|
| 132 | - function geodir_save_listing($request_info = array(), $dummy = false, $wp_error = false) |
|
| 133 | - {
|
|
| 134 | - global $wpdb, $current_user, $gd_session; |
|
| 135 | - |
|
| 136 | - $last_post_id = ''; |
|
| 137 | - |
|
| 138 | - if ($gd_session->get('listing') && !$dummy) {
|
|
| 139 | - $request_info = array(); |
|
| 140 | - $request_session = $gd_session->get('listing');
|
|
| 141 | - $request_info = array_merge($_REQUEST, $request_session); |
|
| 142 | - } else if (!$gd_session->get('listing') && !$dummy) {
|
|
| 143 | - global $post; |
|
| 144 | - $request_info['pid'] = !empty($post->ID) ? $post->ID : (!empty($request_info['post_id']) ? $request_info['post_id'] : NULL); |
|
| 145 | - $request_info['post_title'] = $request_info['post_title']; |
|
| 146 | - $request_info['listing_type'] = $post->post_type; |
|
| 147 | - $request_info['post_desc'] = $request_info['content']; |
|
| 148 | - } else if (!$dummy) {
|
|
| 149 | - return false; |
|
| 150 | - } |
|
| 151 | - |
|
| 152 | - /** |
|
| 153 | - * Filter the request_info array. |
|
| 154 | - * |
|
| 155 | - * You can use this filter to modify request_info array. |
|
| 156 | - * |
|
| 157 | - * @since 1.0.0 |
|
| 158 | - * @package GeoDirectory |
|
| 159 | - * @param array $request_info See {@see geodir_save_listing()} for accepted args.
|
|
| 160 | - */ |
|
| 161 | - $request_info = apply_filters('geodir_action_get_request_info', $request_info);
|
|
| 162 | - |
|
| 163 | - // Check if we need to save post location as new location |
|
| 164 | - $location_result = geodir_get_default_location(); |
|
| 165 | - |
|
| 166 | - if ($location_result->location_id > 0) {
|
|
| 167 | - if (isset($request_info['post_city']) && isset($request_info['post_region'])) {
|
|
| 168 | - $request_info['post_location'] = array( |
|
| 169 | - 'city' => $request_info['post_city'], |
|
| 170 | - 'region' => isset($request_info['post_region']) ? $request_info['post_region'] : '', |
|
| 171 | - 'country' => isset($request_info['post_country']) ? $request_info['post_country'] : '', |
|
| 172 | - 'geo_lat' => isset($request_info['post_latitude']) ? $request_info['post_latitude'] : '', |
|
| 173 | - 'geo_lng' => isset($request_info['post_longitude']) ? $request_info['post_longitude'] : '' |
|
| 174 | - ); |
|
| 175 | - |
|
| 176 | - $post_location_info = $request_info['post_location']; |
|
| 177 | - |
|
| 178 | - if ($location_id = geodir_add_new_location($post_location_info)) {
|
|
| 179 | - $post_location_id = $location_id; |
|
| 180 | - } |
|
| 181 | - } else {
|
|
| 182 | - $post_location_id = $location_result->location_id; |
|
| 183 | - } |
|
| 184 | - } else {
|
|
| 185 | - $post_location_id = $location_result->location_id; |
|
| 186 | - } |
|
| 187 | - |
|
| 188 | - if ($dummy) {
|
|
| 189 | - $post_status = 'publish'; |
|
| 190 | - } else {
|
|
| 191 | - $post_status = geodir_new_post_default_status(); |
|
| 192 | - } |
|
| 193 | - |
|
| 194 | - if (isset($request_info['pid']) && $request_info['pid'] != '') {
|
|
| 195 | - $post_status = get_post_status($request_info['pid']); |
|
| 196 | - } |
|
| 197 | - |
|
| 198 | - /* fix change of slug on every title edit */ |
|
| 199 | - if (!isset($request_info['post_name'])) {
|
|
| 200 | - $request_info['post_name'] = $request_info['post_title']; |
|
| 201 | - |
|
| 202 | - if (!empty($request_info['pid'])) {
|
|
| 203 | - $post_info = get_post($request_info['pid']); |
|
| 204 | - |
|
| 205 | - if (!empty($post_info) && isset($post_info->post_name)) {
|
|
| 206 | - $request_info['post_name'] = $post_info->post_name; |
|
| 207 | - } |
|
| 208 | - } |
|
| 209 | - } |
|
| 210 | - |
|
| 211 | - $post = array( |
|
| 212 | - 'post_content' => $request_info['post_desc'], |
|
| 213 | - 'post_status' => $post_status, |
|
| 214 | - 'post_title' => $request_info['post_title'], |
|
| 215 | - 'post_name' => $request_info['post_name'], |
|
| 216 | - 'post_type' => $request_info['listing_type'] |
|
| 217 | - ); |
|
| 218 | - |
|
| 219 | - /** |
|
| 220 | - * Called before a listing is saved to the database. |
|
| 221 | - * |
|
| 222 | - * @since 1.0.0 |
|
| 223 | - * @param object $post The post object. |
|
| 224 | - */ |
|
| 225 | - do_action_ref_array('geodir_before_save_listing', $post);
|
|
| 83 | + * @param array $request_info {
|
|
| 84 | + * Array of request info arguments. |
|
| 85 | + * |
|
| 86 | + * @type string $action Ajax action name. |
|
| 87 | + * @type string $geodir_ajax Ajax type. |
|
| 88 | + * @type string $ajax_action Ajax action. |
|
| 89 | + * @type string $listing_type Listing type. |
|
| 90 | + * @type string $pid Default Post ID. |
|
| 91 | + * @type string $preview Todo Desc needed. |
|
| 92 | + * @type string $add_listing_page_id Add listing page ID. |
|
| 93 | + * @type string $post_title Listing title. |
|
| 94 | + * @type string $post_desc Listing Description. |
|
| 95 | + * @type string $post_tags Listing tags. |
|
| 96 | + * @type array $cat_limit Category limit. |
|
| 97 | + * @type array $post_category Category IDs. |
|
| 98 | + * @type array $post_category_str Category string. |
|
| 99 | + * @type string $post_default_category Default category ID. |
|
| 100 | + * @type string $post_address Listing address. |
|
| 101 | + * @type string $geodir_location_add_listing_country_val Add listing country value. |
|
| 102 | + * @type string $post_country Listing country. |
|
| 103 | + * @type string $geodir_location_add_listing_region_val Add listing region value. |
|
| 104 | + * @type string $post_region Listing region. |
|
| 105 | + * @type string $geodir_location_add_listing_city_val Add listing city value. |
|
| 106 | + * @type string $post_city Listing city. |
|
| 107 | + * @type string $post_zip Listing zip. |
|
| 108 | + * @type string $post_latitude Listing latitude. |
|
| 109 | + * @type string $post_longitude Listing longitude. |
|
| 110 | + * @type string $post_mapview Listing mapview. Default "ROADMAP". |
|
| 111 | + * @type string $post_mapzoom Listing mapzoom Default "9". |
|
| 112 | + * @type string $geodir_timing Business timing info. |
|
| 113 | + * @type string $geodir_contact Contact number. |
|
| 114 | + * @type string $geodir_email Business contact email. |
|
| 115 | + * @type string $geodir_website Business website. |
|
| 116 | + * @type string $geodir_twitter Twitter link. |
|
| 117 | + * @type string $geodir_facebook Facebook link. |
|
| 118 | + * @type string $geodir_video Video link. |
|
| 119 | + * @type string $geodir_special_offers Speacial offers. |
|
| 120 | + * @type string $post_images Post image urls. |
|
| 121 | + * @type string $post_imagesimage_limit Post images limit. |
|
| 122 | + * @type string $post_imagestotImg Todo Desc needed. |
|
| 123 | + * @type string $geodir_accept_term_condition Has accepted terms and conditions?. |
|
| 124 | + * @type string $geodir_spamblocker Todo Desc needed. |
|
| 125 | + * @type string $geodir_filled_by_spam_bot Todo Desc needed. |
|
| 126 | + * |
|
| 127 | + * } |
|
| 128 | + * @param bool $dummy Optional. Is this a dummy listing? Default false. |
|
| 129 | + * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false. |
|
| 130 | + * @return int|string|WP_Error Created post id or WP_Error on failure. |
|
| 131 | + */ |
|
| 132 | + function geodir_save_listing($request_info = array(), $dummy = false, $wp_error = false) |
|
| 133 | + {
|
|
| 134 | + global $wpdb, $current_user, $gd_session; |
|
| 135 | + |
|
| 136 | + $last_post_id = ''; |
|
| 137 | + |
|
| 138 | + if ($gd_session->get('listing') && !$dummy) {
|
|
| 139 | + $request_info = array(); |
|
| 140 | + $request_session = $gd_session->get('listing');
|
|
| 141 | + $request_info = array_merge($_REQUEST, $request_session); |
|
| 142 | + } else if (!$gd_session->get('listing') && !$dummy) {
|
|
| 143 | + global $post; |
|
| 144 | + $request_info['pid'] = !empty($post->ID) ? $post->ID : (!empty($request_info['post_id']) ? $request_info['post_id'] : NULL); |
|
| 145 | + $request_info['post_title'] = $request_info['post_title']; |
|
| 146 | + $request_info['listing_type'] = $post->post_type; |
|
| 147 | + $request_info['post_desc'] = $request_info['content']; |
|
| 148 | + } else if (!$dummy) {
|
|
| 149 | + return false; |
|
| 150 | + } |
|
| 151 | + |
|
| 152 | + /** |
|
| 153 | + * Filter the request_info array. |
|
| 154 | + * |
|
| 155 | + * You can use this filter to modify request_info array. |
|
| 156 | + * |
|
| 157 | + * @since 1.0.0 |
|
| 158 | + * @package GeoDirectory |
|
| 159 | + * @param array $request_info See {@see geodir_save_listing()} for accepted args.
|
|
| 160 | + */ |
|
| 161 | + $request_info = apply_filters('geodir_action_get_request_info', $request_info);
|
|
| 162 | + |
|
| 163 | + // Check if we need to save post location as new location |
|
| 164 | + $location_result = geodir_get_default_location(); |
|
| 165 | + |
|
| 166 | + if ($location_result->location_id > 0) {
|
|
| 167 | + if (isset($request_info['post_city']) && isset($request_info['post_region'])) {
|
|
| 168 | + $request_info['post_location'] = array( |
|
| 169 | + 'city' => $request_info['post_city'], |
|
| 170 | + 'region' => isset($request_info['post_region']) ? $request_info['post_region'] : '', |
|
| 171 | + 'country' => isset($request_info['post_country']) ? $request_info['post_country'] : '', |
|
| 172 | + 'geo_lat' => isset($request_info['post_latitude']) ? $request_info['post_latitude'] : '', |
|
| 173 | + 'geo_lng' => isset($request_info['post_longitude']) ? $request_info['post_longitude'] : '' |
|
| 174 | + ); |
|
| 175 | + |
|
| 176 | + $post_location_info = $request_info['post_location']; |
|
| 177 | + |
|
| 178 | + if ($location_id = geodir_add_new_location($post_location_info)) {
|
|
| 179 | + $post_location_id = $location_id; |
|
| 180 | + } |
|
| 181 | + } else {
|
|
| 182 | + $post_location_id = $location_result->location_id; |
|
| 183 | + } |
|
| 184 | + } else {
|
|
| 185 | + $post_location_id = $location_result->location_id; |
|
| 186 | + } |
|
| 226 | 187 | |
| 227 | - $send_post_submit_mail = false; |
|
| 188 | + if ($dummy) {
|
|
| 189 | + $post_status = 'publish'; |
|
| 190 | + } else {
|
|
| 191 | + $post_status = geodir_new_post_default_status(); |
|
| 192 | + } |
|
| 228 | 193 | |
| 229 | - // unhook this function so it doesn't loop infinitely |
|
| 230 | - remove_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 194 | + if (isset($request_info['pid']) && $request_info['pid'] != '') {
|
|
| 195 | + $post_status = get_post_status($request_info['pid']); |
|
| 196 | + } |
|
| 231 | 197 | |
| 232 | - if (isset($request_info['pid']) && $request_info['pid'] != '') {
|
|
| 233 | - $post['ID'] = $request_info['pid']; |
|
| 198 | + /* fix change of slug on every title edit */ |
|
| 199 | + if (!isset($request_info['post_name'])) {
|
|
| 200 | + $request_info['post_name'] = $request_info['post_title']; |
|
| 234 | 201 | |
| 235 | - $last_post_id = wp_update_post($post, $wp_error); |
|
| 236 | - } else {
|
|
| 237 | - $last_post_id = wp_insert_post($post, $wp_error); |
|
| 202 | + if (!empty($request_info['pid'])) {
|
|
| 203 | + $post_info = get_post($request_info['pid']); |
|
| 238 | 204 | |
| 239 | - if (!$dummy && $last_post_id) {
|
|
| 240 | - $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) |
|
| 241 | - //geodir_sendEmail('','',$current_user->user_email,$current_user->display_name,'','',$request_info,'post_submit',$last_post_id,$current_user->ID);
|
|
| 242 | - } |
|
| 243 | - } |
|
| 205 | + if (!empty($post_info) && isset($post_info->post_name)) {
|
|
| 206 | + $request_info['post_name'] = $post_info->post_name; |
|
| 207 | + } |
|
| 208 | + } |
|
| 209 | + } |
|
| 210 | + |
|
| 211 | + $post = array( |
|
| 212 | + 'post_content' => $request_info['post_desc'], |
|
| 213 | + 'post_status' => $post_status, |
|
| 214 | + 'post_title' => $request_info['post_title'], |
|
| 215 | + 'post_name' => $request_info['post_name'], |
|
| 216 | + 'post_type' => $request_info['listing_type'] |
|
| 217 | + ); |
|
| 218 | + |
|
| 219 | + /** |
|
| 220 | + * Called before a listing is saved to the database. |
|
| 221 | + * |
|
| 222 | + * @since 1.0.0 |
|
| 223 | + * @param object $post The post object. |
|
| 224 | + */ |
|
| 225 | + do_action_ref_array('geodir_before_save_listing', $post);
|
|
| 226 | + |
|
| 227 | + $send_post_submit_mail = false; |
|
| 228 | + |
|
| 229 | + // unhook this function so it doesn't loop infinitely |
|
| 230 | + remove_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 231 | + |
|
| 232 | + if (isset($request_info['pid']) && $request_info['pid'] != '') {
|
|
| 233 | + $post['ID'] = $request_info['pid']; |
|
| 234 | + |
|
| 235 | + $last_post_id = wp_update_post($post, $wp_error); |
|
| 236 | + } else {
|
|
| 237 | + $last_post_id = wp_insert_post($post, $wp_error); |
|
| 238 | + |
|
| 239 | + if (!$dummy && $last_post_id) {
|
|
| 240 | + $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) |
|
| 241 | + //geodir_sendEmail('','',$current_user->user_email,$current_user->display_name,'','',$request_info,'post_submit',$last_post_id,$current_user->ID);
|
|
| 242 | + } |
|
| 243 | + } |
|
| 244 | 244 | |
| 245 | - if ($wp_error && is_wp_error($last_post_id)) {
|
|
| 246 | - return $last_post_id; // Return WP_Error on save failure. |
|
| 247 | - } |
|
| 245 | + if ($wp_error && is_wp_error($last_post_id)) {
|
|
| 246 | + return $last_post_id; // Return WP_Error on save failure. |
|
| 247 | + } |
|
| 248 | 248 | |
| 249 | - if (!$last_post_id) {
|
|
| 250 | - return false; // Save failure. |
|
| 251 | - } |
|
| 249 | + if (!$last_post_id) {
|
|
| 250 | + return false; // Save failure. |
|
| 251 | + } |
|
| 252 | 252 | |
| 253 | - // re-hook this function |
|
| 254 | - add_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 253 | + // re-hook this function |
|
| 254 | + add_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 255 | 255 | |
| 256 | - $post_tags = ''; |
|
| 257 | - if (!isset($request_info['post_tags'])) {
|
|
| 256 | + $post_tags = ''; |
|
| 257 | + if (!isset($request_info['post_tags'])) {
|
|
| 258 | 258 | |
| 259 | - $post_type = $request_info['listing_type']; |
|
| 260 | - $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));
|
|
| 259 | + $post_type = $request_info['listing_type']; |
|
| 260 | + $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));
|
|
| 261 | 261 | |
| 262 | - } |
|
| 262 | + } |
|
| 263 | 263 | |
| 264 | - $gd_post_info = array( |
|
| 265 | - "post_title" => $request_info['post_title'], |
|
| 266 | - "post_tags" => isset($request_info['post_tags']) ? $request_info['post_tags'] : $post_tags, |
|
| 267 | - "post_status" => $post_status, |
|
| 268 | - "post_location_id" => $post_location_id, |
|
| 269 | - "claimed" => isset($request_info['claimed']) ? $request_info['claimed'] : '', |
|
| 270 | - "businesses" => isset($request_info['a_businesses']) ? $request_info['a_businesses'] : '', |
|
| 271 | - "submit_time" => time(), |
|
| 272 | - "submit_ip" => $_SERVER['REMOTE_ADDR'], |
|
| 273 | - ); |
|
| 264 | + $gd_post_info = array( |
|
| 265 | + "post_title" => $request_info['post_title'], |
|
| 266 | + "post_tags" => isset($request_info['post_tags']) ? $request_info['post_tags'] : $post_tags, |
|
| 267 | + "post_status" => $post_status, |
|
| 268 | + "post_location_id" => $post_location_id, |
|
| 269 | + "claimed" => isset($request_info['claimed']) ? $request_info['claimed'] : '', |
|
| 270 | + "businesses" => isset($request_info['a_businesses']) ? $request_info['a_businesses'] : '', |
|
| 271 | + "submit_time" => time(), |
|
| 272 | + "submit_ip" => $_SERVER['REMOTE_ADDR'], |
|
| 273 | + ); |
|
| 274 | 274 | |
| 275 | - $payment_info = array(); |
|
| 276 | - $package_info = array(); |
|
| 275 | + $payment_info = array(); |
|
| 276 | + $package_info = array(); |
|
| 277 | 277 | |
| 278 | - $package_info = (array)geodir_post_package_info($package_info, $post); |
|
| 278 | + $package_info = (array)geodir_post_package_info($package_info, $post); |
|
| 279 | 279 | |
| 280 | - $post_package_id = geodir_get_post_meta($last_post_id, 'package_id'); |
|
| 280 | + $post_package_id = geodir_get_post_meta($last_post_id, 'package_id'); |
|
| 281 | 281 | |
| 282 | - if (!empty($package_info) && !$post_package_id) {
|
|
| 283 | - if (isset($package_info['days']) && $package_info['days'] != 0) {
|
|
| 284 | - $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));
|
|
| 285 | - } else {
|
|
| 286 | - $payment_info['expire_date'] = 'Never'; |
|
| 287 | - } |
|
| 282 | + if (!empty($package_info) && !$post_package_id) {
|
|
| 283 | + if (isset($package_info['days']) && $package_info['days'] != 0) {
|
|
| 284 | + $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));
|
|
| 285 | + } else {
|
|
| 286 | + $payment_info['expire_date'] = 'Never'; |
|
| 287 | + } |
|
| 288 | 288 | |
| 289 | - $payment_info['package_id'] = $package_info['pid']; |
|
| 290 | - $payment_info['alive_days'] = $package_info['days']; |
|
| 291 | - $payment_info['is_featured'] = $package_info['is_featured']; |
|
| 289 | + $payment_info['package_id'] = $package_info['pid']; |
|
| 290 | + $payment_info['alive_days'] = $package_info['days']; |
|
| 291 | + $payment_info['is_featured'] = $package_info['is_featured']; |
|
| 292 | 292 | |
| 293 | - $gd_post_info = array_merge($gd_post_info, $payment_info); |
|
| 294 | - } |
|
| 293 | + $gd_post_info = array_merge($gd_post_info, $payment_info); |
|
| 294 | + } |
|
| 295 | 295 | |
| 296 | - $custom_metaboxes = geodir_post_custom_fields('', 'all', $request_info['listing_type']);
|
|
| 296 | + $custom_metaboxes = geodir_post_custom_fields('', 'all', $request_info['listing_type']);
|
|
| 297 | 297 | |
| 298 | - foreach ($custom_metaboxes as $key => $val): |
|
| 298 | + foreach ($custom_metaboxes as $key => $val): |
|
| 299 | 299 | |
| 300 | - $name = $val['name']; |
|
| 301 | - $type = $val['type']; |
|
| 302 | - $extrafields = $val['extra_fields']; |
|
| 300 | + $name = $val['name']; |
|
| 301 | + $type = $val['type']; |
|
| 302 | + $extrafields = $val['extra_fields']; |
|
| 303 | 303 | |
| 304 | - if (trim($type) == 'address') {
|
|
| 305 | - $prefix = $name . '_'; |
|
| 306 | - $address = $prefix . 'address'; |
|
| 304 | + if (trim($type) == 'address') {
|
|
| 305 | + $prefix = $name . '_'; |
|
| 306 | + $address = $prefix . 'address'; |
|
| 307 | 307 | |
| 308 | - if (isset($request_info[$address]) && $request_info[$address] != '') {
|
|
| 309 | - $gd_post_info[$address] = wp_slash($request_info[$address]); |
|
| 310 | - } |
|
| 308 | + if (isset($request_info[$address]) && $request_info[$address] != '') {
|
|
| 309 | + $gd_post_info[$address] = wp_slash($request_info[$address]); |
|
| 310 | + } |
|
| 311 | 311 | |
| 312 | - if ($extrafields != '') {
|
|
| 313 | - $extrafields = unserialize($extrafields); |
|
| 312 | + if ($extrafields != '') {
|
|
| 313 | + $extrafields = unserialize($extrafields); |
|
| 314 | 314 | |
| 315 | 315 | |
| 316 | - if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {
|
|
| 316 | + if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {
|
|
| 317 | 317 | |
| 318 | - $location_result = geodir_get_default_location(); |
|
| 318 | + $location_result = geodir_get_default_location(); |
|
| 319 | 319 | |
| 320 | - $gd_post_info[$prefix . 'city'] = $location_result->city; |
|
| 321 | - $gd_post_info[$prefix . 'region'] = $location_result->region; |
|
| 322 | - $gd_post_info[$prefix . 'country'] = $location_result->country; |
|
| 320 | + $gd_post_info[$prefix . 'city'] = $location_result->city; |
|
| 321 | + $gd_post_info[$prefix . 'region'] = $location_result->region; |
|
| 322 | + $gd_post_info[$prefix . 'country'] = $location_result->country; |
|
| 323 | 323 | |
| 324 | - $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 324 | + $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 325 | 325 | |
| 326 | - } else {
|
|
| 326 | + } else {
|
|
| 327 | 327 | |
| 328 | - $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city']; |
|
| 329 | - $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region']; |
|
| 330 | - $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country']; |
|
| 328 | + $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city']; |
|
| 329 | + $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region']; |
|
| 330 | + $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country']; |
|
| 331 | 331 | |
| 332 | - //----------set post locations when import dummy data------- |
|
| 333 | - $location_result = geodir_get_default_location(); |
|
| 332 | + //----------set post locations when import dummy data------- |
|
| 333 | + $location_result = geodir_get_default_location(); |
|
| 334 | 334 | |
| 335 | - $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 336 | - //----------------------------------------------------------------- |
|
| 335 | + $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 336 | + //----------------------------------------------------------------- |
|
| 337 | 337 | |
| 338 | - } |
|
| 338 | + } |
|
| 339 | 339 | |
| 340 | 340 | |
| 341 | - if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {
|
|
| 342 | - $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip']; |
|
| 343 | - } |
|
| 341 | + if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {
|
|
| 342 | + $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip']; |
|
| 343 | + } |
|
| 344 | 344 | |
| 345 | 345 | |
| 346 | - if (isset($extrafields['show_map']) && $extrafields['show_map']) {
|
|
| 346 | + if (isset($extrafields['show_map']) && $extrafields['show_map']) {
|
|
| 347 | 347 | |
| 348 | - if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {
|
|
| 349 | - $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude']; |
|
| 350 | - } |
|
| 348 | + if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {
|
|
| 349 | + $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude']; |
|
| 350 | + } |
|
| 351 | 351 | |
| 352 | - if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {
|
|
| 353 | - $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude']; |
|
| 354 | - } |
|
| 352 | + if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {
|
|
| 353 | + $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude']; |
|
| 354 | + } |
|
| 355 | 355 | |
| 356 | - if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {
|
|
| 357 | - $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview']; |
|
| 358 | - } |
|
| 356 | + if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {
|
|
| 357 | + $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview']; |
|
| 358 | + } |
|
| 359 | 359 | |
| 360 | - if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {
|
|
| 361 | - $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom']; |
|
| 362 | - } |
|
| 360 | + if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {
|
|
| 361 | + $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom']; |
|
| 362 | + } |
|
| 363 | 363 | |
| 364 | - } |
|
| 364 | + } |
|
| 365 | 365 | |
| 366 | - // show lat lng |
|
| 367 | - if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {
|
|
| 368 | - $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng']; |
|
| 369 | - } |
|
| 370 | - } |
|
| 366 | + // show lat lng |
|
| 367 | + if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {
|
|
| 368 | + $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng']; |
|
| 369 | + } |
|
| 370 | + } |
|
| 371 | 371 | |
| 372 | - } elseif (trim($type) == 'file') {
|
|
| 373 | - if (isset($request_info[$name])) {
|
|
| 374 | - $request_files = array(); |
|
| 375 | - if ($request_info[$name] != '') |
|
| 376 | - $request_files = explode(",", $request_info[$name]);
|
|
| 372 | + } elseif (trim($type) == 'file') {
|
|
| 373 | + if (isset($request_info[$name])) {
|
|
| 374 | + $request_files = array(); |
|
| 375 | + if ($request_info[$name] != '') |
|
| 376 | + $request_files = explode(",", $request_info[$name]);
|
|
| 377 | 377 | |
| 378 | - $extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL; |
|
| 379 | - geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields); |
|
| 378 | + $extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL; |
|
| 379 | + geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields); |
|
| 380 | 380 | |
| 381 | - } |
|
| 382 | - } elseif (trim($type) == 'datepicker') {
|
|
| 383 | - $datetime = ''; |
|
| 384 | - if (isset($request_info[$name]) && $request_info[$name] != '') {
|
|
| 385 | - $date_format = geodir_default_date_format(); |
|
| 386 | - if (isset($val['extra_fields']) && $val['extra_fields'] != '') {
|
|
| 387 | - $extra_fields = unserialize($val['extra_fields']); |
|
| 388 | - $date_format = isset($extra_fields['date_format']) && $extra_fields['date_format'] != '' ? $extra_fields['date_format'] : $date_format; |
|
| 389 | - } |
|
| 381 | + } |
|
| 382 | + } elseif (trim($type) == 'datepicker') {
|
|
| 383 | + $datetime = ''; |
|
| 384 | + if (isset($request_info[$name]) && $request_info[$name] != '') {
|
|
| 385 | + $date_format = geodir_default_date_format(); |
|
| 386 | + if (isset($val['extra_fields']) && $val['extra_fields'] != '') {
|
|
| 387 | + $extra_fields = unserialize($val['extra_fields']); |
|
| 388 | + $date_format = isset($extra_fields['date_format']) && $extra_fields['date_format'] != '' ? $extra_fields['date_format'] : $date_format; |
|
| 389 | + } |
|
| 390 | 390 | |
| 391 | - // check if we need to change the format or not |
|
| 392 | - $date_format_len = strlen(str_replace(' ', '', $date_format));
|
|
| 393 | - if($date_format_len>5){// if greater then 5 then it's the old style format.
|
|
| 391 | + // check if we need to change the format or not |
|
| 392 | + $date_format_len = strlen(str_replace(' ', '', $date_format));
|
|
| 393 | + if($date_format_len>5){// if greater then 5 then it's the old style format.
|
|
| 394 | 394 | |
| 395 | - $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
|
|
| 396 | - $replace = array('d','j','l','m','n','F','Y');//PHP date format
|
|
| 395 | + $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
|
|
| 396 | + $replace = array('d','j','l','m','n','F','Y');//PHP date format
|
|
| 397 | 397 | |
| 398 | - $date_format = str_replace($search, $replace, $date_format); |
|
| 398 | + $date_format = str_replace($search, $replace, $date_format); |
|
| 399 | 399 | |
| 400 | - $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
|
|
| 400 | + $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
|
|
| 401 | 401 | |
| 402 | - }else{
|
|
| 403 | - $post_htmlvar_value = $request_info[$name]; |
|
| 404 | - } |
|
| 402 | + }else{
|
|
| 403 | + $post_htmlvar_value = $request_info[$name]; |
|
| 404 | + } |
|
| 405 | 405 | |
| 406 | - $post_htmlvar_value = geodir_date($post_htmlvar_value, 'Y-m-d', $date_format); // save as sql format Y-m-d |
|
| 407 | - $datetime = geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated |
|
| 406 | + $post_htmlvar_value = geodir_date($post_htmlvar_value, 'Y-m-d', $date_format); // save as sql format Y-m-d |
|
| 407 | + $datetime = geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated |
|
| 408 | 408 | |
| 409 | - //$datetime = date_i18n("Y-m-d", strtotime($post_htmlvar_value)); // save as sql format Y-m-d
|
|
| 409 | + //$datetime = date_i18n("Y-m-d", strtotime($post_htmlvar_value)); // save as sql format Y-m-d
|
|
| 410 | 410 | |
| 411 | - } |
|
| 412 | - $gd_post_info[$name] = $datetime; |
|
| 413 | - } else if ($type == 'multiselect') {
|
|
| 414 | - if (isset($request_info[$name])) {
|
|
| 415 | - $gd_post_info[$name] = $request_info[$name]; |
|
| 416 | - } else {
|
|
| 417 | - if (isset($request_info['gd_field_' . $name])) {
|
|
| 418 | - $gd_post_info[$name] = ''; /* fix de-select for multiselect */ |
|
| 419 | - } |
|
| 420 | - } |
|
| 421 | - } else if (isset($request_info[$name])) {
|
|
| 422 | - $gd_post_info[$name] = $request_info[$name]; |
|
| 423 | - } |
|
| 411 | + } |
|
| 412 | + $gd_post_info[$name] = $datetime; |
|
| 413 | + } else if ($type == 'multiselect') {
|
|
| 414 | + if (isset($request_info[$name])) {
|
|
| 415 | + $gd_post_info[$name] = $request_info[$name]; |
|
| 416 | + } else {
|
|
| 417 | + if (isset($request_info['gd_field_' . $name])) {
|
|
| 418 | + $gd_post_info[$name] = ''; /* fix de-select for multiselect */ |
|
| 419 | + } |
|
| 420 | + } |
|
| 421 | + } else if (isset($request_info[$name])) {
|
|
| 422 | + $gd_post_info[$name] = $request_info[$name]; |
|
| 423 | + } |
|
| 424 | 424 | |
| 425 | - endforeach; |
|
| 425 | + endforeach; |
|
| 426 | 426 | |
| 427 | - if (isset($request_info['post_dummy']) && $request_info['post_dummy'] != '') {
|
|
| 428 | - $gd_post_info['post_dummy'] = $request_info['post_dummy']; |
|
| 429 | - } |
|
| 427 | + if (isset($request_info['post_dummy']) && $request_info['post_dummy'] != '') {
|
|
| 428 | + $gd_post_info['post_dummy'] = $request_info['post_dummy']; |
|
| 429 | + } |
|
| 430 | 430 | |
| 431 | - // Save post detail info in detail table |
|
| 432 | - if (!empty($gd_post_info)) {
|
|
| 433 | - geodir_save_post_info($last_post_id, $gd_post_info); |
|
| 434 | - } |
|
| 431 | + // Save post detail info in detail table |
|
| 432 | + if (!empty($gd_post_info)) {
|
|
| 433 | + geodir_save_post_info($last_post_id, $gd_post_info); |
|
| 434 | + } |
|
| 435 | 435 | |
| 436 | 436 | |
| 437 | - // Set categories to the listing |
|
| 438 | - if (isset($request_info['post_category']) && !empty($request_info['post_category'])) {
|
|
| 439 | - $post_category = array(); |
|
| 437 | + // Set categories to the listing |
|
| 438 | + if (isset($request_info['post_category']) && !empty($request_info['post_category'])) {
|
|
| 439 | + $post_category = array(); |
|
| 440 | 440 | |
| 441 | - foreach ($request_info['post_category'] as $taxonomy => $cat) {
|
|
| 441 | + foreach ($request_info['post_category'] as $taxonomy => $cat) {
|
|
| 442 | 442 | |
| 443 | - if ($dummy) |
|
| 444 | - $post_category = $cat; |
|
| 445 | - else {
|
|
| 443 | + if ($dummy) |
|
| 444 | + $post_category = $cat; |
|
| 445 | + else {
|
|
| 446 | 446 | |
| 447 | - if (!is_array($cat) && strstr($cat, ',')) |
|
| 448 | - $cat = explode(',', $cat);
|
|
| 447 | + if (!is_array($cat) && strstr($cat, ',')) |
|
| 448 | + $cat = explode(',', $cat);
|
|
| 449 | 449 | |
| 450 | - if (!empty($cat) && is_array($cat)) |
|
| 451 | - $post_category = array_map('intval', $cat);
|
|
| 452 | - } |
|
| 450 | + if (!empty($cat) && is_array($cat)) |
|
| 451 | + $post_category = array_map('intval', $cat);
|
|
| 452 | + } |
|
| 453 | 453 | |
| 454 | - wp_set_object_terms($last_post_id, $post_category, $taxonomy); |
|
| 455 | - } |
|
| 454 | + wp_set_object_terms($last_post_id, $post_category, $taxonomy); |
|
| 455 | + } |
|
| 456 | 456 | |
| 457 | - $post_default_category = isset($request_info['post_default_category']) ? $request_info['post_default_category'] : ''; |
|
| 457 | + $post_default_category = isset($request_info['post_default_category']) ? $request_info['post_default_category'] : ''; |
|
| 458 | 458 | |
| 459 | - $post_category_str = isset($request_info['post_category_str']) ? $request_info['post_category_str'] : ''; |
|
| 460 | - geodir_set_postcat_structure($last_post_id, $taxonomy, $post_default_category, $post_category_str); |
|
| 459 | + $post_category_str = isset($request_info['post_category_str']) ? $request_info['post_category_str'] : ''; |
|
| 460 | + geodir_set_postcat_structure($last_post_id, $taxonomy, $post_default_category, $post_category_str); |
|
| 461 | 461 | |
| 462 | - } |
|
| 462 | + } |
|
| 463 | 463 | |
| 464 | - $post_tags = ''; |
|
| 465 | - // Set tags to the listing |
|
| 466 | - if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {
|
|
| 467 | - $post_tags = explode(",", $request_info['post_tags']);
|
|
| 468 | - } elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {
|
|
| 469 | - if ($dummy) |
|
| 470 | - $post_tags = $request_info['post_tags']; |
|
| 471 | - } else {
|
|
| 472 | - if ($dummy) |
|
| 473 | - $post_tags = array($request_info['post_title']); |
|
| 474 | - } |
|
| 464 | + $post_tags = ''; |
|
| 465 | + // Set tags to the listing |
|
| 466 | + if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {
|
|
| 467 | + $post_tags = explode(",", $request_info['post_tags']);
|
|
| 468 | + } elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {
|
|
| 469 | + if ($dummy) |
|
| 470 | + $post_tags = $request_info['post_tags']; |
|
| 471 | + } else {
|
|
| 472 | + if ($dummy) |
|
| 473 | + $post_tags = array($request_info['post_title']); |
|
| 474 | + } |
|
| 475 | 475 | |
| 476 | - if (is_array($post_tags)) {
|
|
| 477 | - $taxonomy = $request_info['listing_type'] . '_tags'; |
|
| 478 | - wp_set_object_terms($last_post_id, $post_tags, $taxonomy); |
|
| 479 | - } |
|
| 476 | + if (is_array($post_tags)) {
|
|
| 477 | + $taxonomy = $request_info['listing_type'] . '_tags'; |
|
| 478 | + wp_set_object_terms($last_post_id, $post_tags, $taxonomy); |
|
| 479 | + } |
|
| 480 | 480 | |
| 481 | 481 | |
| 482 | - // Insert attechment |
|
| 482 | + // Insert attechment |
|
| 483 | 483 | |
| 484 | - if (isset($request_info['post_images']) && !is_wp_error($last_post_id)) {
|
|
| 485 | - if (!$dummy) {
|
|
| 486 | - $tmpimgArr = trim($request_info['post_images'], ","); |
|
| 487 | - $tmpimgArr = explode(",", $tmpimgArr);
|
|
| 488 | - geodir_save_post_images($last_post_id, $tmpimgArr, $dummy); |
|
| 489 | - } else{
|
|
| 490 | - geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy); |
|
| 491 | - } |
|
| 484 | + if (isset($request_info['post_images']) && !is_wp_error($last_post_id)) {
|
|
| 485 | + if (!$dummy) {
|
|
| 486 | + $tmpimgArr = trim($request_info['post_images'], ","); |
|
| 487 | + $tmpimgArr = explode(",", $tmpimgArr);
|
|
| 488 | + geodir_save_post_images($last_post_id, $tmpimgArr, $dummy); |
|
| 489 | + } else{
|
|
| 490 | + geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy); |
|
| 491 | + } |
|
| 492 | 492 | |
| 493 | 493 | |
| 494 | - } elseif (!isset($request_info['post_images']) || $request_info['post_images'] == '') {
|
|
| 494 | + } elseif (!isset($request_info['post_images']) || $request_info['post_images'] == '') {
|
|
| 495 | 495 | |
| 496 | - /* Delete Attachments |
|
| 496 | + /* Delete Attachments |
|
| 497 | 497 | $postcurr_images = geodir_get_images($last_post_id); |
| 498 | 498 | |
| 499 | 499 | $wpdb->query( |
@@ -509,34 +509,34 @@ discard block |
||
| 509 | 509 | geodir_save_post_info($last_post_id, $gd_post_featured_img); |
| 510 | 510 | */ |
| 511 | 511 | |
| 512 | - } |
|
| 512 | + } |
|
| 513 | 513 | |
| 514 | - geodir_remove_temp_images(); |
|
| 515 | - geodir_set_wp_featured_image($last_post_id); |
|
| 514 | + geodir_remove_temp_images(); |
|
| 515 | + geodir_set_wp_featured_image($last_post_id); |
|
| 516 | 516 | |
| 517 | - /** |
|
| 518 | - * Called after a listing is saved to the database and before any email have been sent. |
|
| 519 | - * |
|
| 520 | - * @since 1.0.0 |
|
| 521 | - * @param int $last_post_id The saved post ID. |
|
| 522 | - * @param array $request_info The post details in an array. |
|
| 523 | - * @see 'geodir_after_save_listinginfo' |
|
| 524 | - */ |
|
| 525 | - do_action('geodir_after_save_listing', $last_post_id, $request_info);
|
|
| 517 | + /** |
|
| 518 | + * Called after a listing is saved to the database and before any email have been sent. |
|
| 519 | + * |
|
| 520 | + * @since 1.0.0 |
|
| 521 | + * @param int $last_post_id The saved post ID. |
|
| 522 | + * @param array $request_info The post details in an array. |
|
| 523 | + * @see 'geodir_after_save_listinginfo' |
|
| 524 | + */ |
|
| 525 | + do_action('geodir_after_save_listing', $last_post_id, $request_info);
|
|
| 526 | 526 | |
| 527 | - //die; |
|
| 527 | + //die; |
|
| 528 | 528 | |
| 529 | - if ($send_post_submit_mail) { // if new post send out email
|
|
| 530 | - $to_name = geodir_get_client_name($current_user->ID); |
|
| 531 | - geodir_sendEmail('', '', $current_user->user_email, $to_name, '', '', $request_info, 'post_submit', $last_post_id, $current_user->ID);
|
|
| 532 | - } |
|
| 533 | - /* |
|
| 529 | + if ($send_post_submit_mail) { // if new post send out email
|
|
| 530 | + $to_name = geodir_get_client_name($current_user->ID); |
|
| 531 | + geodir_sendEmail('', '', $current_user->user_email, $to_name, '', '', $request_info, 'post_submit', $last_post_id, $current_user->ID);
|
|
| 532 | + } |
|
| 533 | + /* |
|
| 534 | 534 | * Unset the session so we don't loop. |
| 535 | 535 | */ |
| 536 | - $gd_session->un_set('listing');
|
|
| 537 | - return $last_post_id; |
|
| 536 | + $gd_session->un_set('listing');
|
|
| 537 | + return $last_post_id; |
|
| 538 | 538 | |
| 539 | - } |
|
| 539 | + } |
|
| 540 | 540 | |
| 541 | 541 | } |
| 542 | 542 | |
@@ -555,585 +555,585 @@ discard block |
||
| 555 | 555 | function geodir_get_post_info($post_id = '') |
| 556 | 556 | {
|
| 557 | 557 | |
| 558 | - global $wpdb, $plugin_prefix, $post, $post_info; |
|
| 558 | + global $wpdb, $plugin_prefix, $post, $post_info; |
|
| 559 | 559 | |
| 560 | - if ($post_id == '' && !empty($post)) |
|
| 561 | - $post_id = $post->ID; |
|
| 560 | + if ($post_id == '' && !empty($post)) |
|
| 561 | + $post_id = $post->ID; |
|
| 562 | 562 | |
| 563 | - $post_type = get_post_type($post_id); |
|
| 563 | + $post_type = get_post_type($post_id); |
|
| 564 | 564 | |
| 565 | - $all_postypes = geodir_get_posttypes(); |
|
| 565 | + $all_postypes = geodir_get_posttypes(); |
|
| 566 | 566 | |
| 567 | - if (!in_array($post_type, $all_postypes)) |
|
| 568 | - return false; |
|
| 567 | + if (!in_array($post_type, $all_postypes)) |
|
| 568 | + return false; |
|
| 569 | 569 | |
| 570 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 570 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 571 | 571 | |
| 572 | - /** |
|
| 573 | - * Apply Filter to change Post info |
|
| 574 | - * |
|
| 575 | - * You can use this filter to change Post info. |
|
| 576 | - * |
|
| 577 | - * @since 1.0.0 |
|
| 578 | - * @package GeoDirectory |
|
| 579 | - */ |
|
| 580 | - $query = apply_filters('geodir_post_info_query', "SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd
|
|
| 572 | + /** |
|
| 573 | + * Apply Filter to change Post info |
|
| 574 | + * |
|
| 575 | + * You can use this filter to change Post info. |
|
| 576 | + * |
|
| 577 | + * @since 1.0.0 |
|
| 578 | + * @package GeoDirectory |
|
| 579 | + */ |
|
| 580 | + $query = apply_filters('geodir_post_info_query', "SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd
|
|
| 581 | 581 | WHERE p.ID = pd.post_id |
| 582 | 582 | AND post_id = " . $post_id); |
| 583 | 583 | |
| 584 | - $post_detail = $wpdb->get_row($query); |
|
| 584 | + $post_detail = $wpdb->get_row($query); |
|
| 585 | 585 | |
| 586 | - return (!empty($post_detail)) ? $post_info = $post_detail : $post_info = false; |
|
| 586 | + return (!empty($post_detail)) ? $post_info = $post_detail : $post_info = false; |
|
| 587 | 587 | |
| 588 | 588 | } |
| 589 | 589 | |
| 590 | 590 | |
| 591 | 591 | if (!function_exists('geodir_save_post_info')) {
|
| 592 | - /** |
|
| 593 | - * Saves post detail info in detail table. |
|
| 594 | - * |
|
| 595 | - * @since 1.0.0 |
|
| 596 | - * @package GeoDirectory |
|
| 597 | - * @global object $wpdb WordPress Database object. |
|
| 598 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 599 | - * @param int $post_id The post ID. |
|
| 600 | - * @param array $postinfo_array {
|
|
| 601 | - * Post info that needs to be saved in detail table. |
|
| 602 | - * |
|
| 603 | - * @type string $post_title Listing title. |
|
| 604 | - * @type string $post_tags Listing tags. |
|
| 605 | - * @type string $post_status Listing post status. |
|
| 606 | - * @type string $post_location_id Listing location ID. |
|
| 607 | - * @type string $claimed Todo Desc needed. |
|
| 608 | - * @type string $businesses Todo Desc needed. |
|
| 609 | - * @type int $submit_time Submitted time in unix timestamp. |
|
| 610 | - * @type string $submit_ip Submitted IP. |
|
| 611 | - * @type string $expire_date Listing expiration date. |
|
| 612 | - * @type int $package_id Listing package ID. |
|
| 613 | - * @type int $alive_days Todo Desc needed. |
|
| 614 | - * @type int $is_featured Is this a featured listing?. |
|
| 615 | - * @type string $post_address Listing address. |
|
| 616 | - * @type string $post_city Listing city. |
|
| 617 | - * @type string $post_region Listing region. |
|
| 618 | - * @type string $post_country Listing country. |
|
| 619 | - * @type string $post_locations Listing locations. |
|
| 620 | - * @type string $post_zip Listing zip. |
|
| 621 | - * @type string $post_latitude Listing latitude. |
|
| 622 | - * @type string $post_longitude Listing longitude. |
|
| 623 | - * @type string $post_mapview Listing mapview. Default "ROADMAP". |
|
| 624 | - * @type string $post_mapzoom Listing mapzoom Default "9". |
|
| 625 | - * @type string $geodir_timing Business timing info. |
|
| 626 | - * @type string $geodir_contact Contact number. |
|
| 627 | - * @type string $geodir_email Business contact email. |
|
| 628 | - * @type string $geodir_website Business website. |
|
| 629 | - * @type string $geodir_twitter Twitter link. |
|
| 630 | - * @type string $geodir_facebook Facebook link. |
|
| 631 | - * @type string $geodir_video Video link. |
|
| 632 | - * @type string $geodir_special_offers Speacial offers. |
|
| 633 | - * |
|
| 634 | - * } |
|
| 635 | - * @return bool |
|
| 636 | - */ |
|
| 637 | - function geodir_save_post_info($post_id, $postinfo_array = array()) |
|
| 638 | - {
|
|
| 639 | - global $wpdb, $plugin_prefix; |
|
| 640 | - |
|
| 641 | - $post_type = get_post_type($post_id); |
|
| 642 | - |
|
| 643 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 644 | - |
|
| 645 | - /** |
|
| 646 | - * Filter to change Post info |
|
| 647 | - * |
|
| 648 | - * You can use this filter to change Post info. |
|
| 649 | - * |
|
| 650 | - * @since 1.0.0 |
|
| 651 | - * @package GeoDirectory |
|
| 652 | - * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
|
|
| 653 | - * @param int $post_id The post ID. |
|
| 654 | - */ |
|
| 655 | - $postmeta = apply_filters('geodir_listinginfo_request', $postinfo_array, $post_id);
|
|
| 592 | + /** |
|
| 593 | + * Saves post detail info in detail table. |
|
| 594 | + * |
|
| 595 | + * @since 1.0.0 |
|
| 596 | + * @package GeoDirectory |
|
| 597 | + * @global object $wpdb WordPress Database object. |
|
| 598 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 599 | + * @param int $post_id The post ID. |
|
| 600 | + * @param array $postinfo_array {
|
|
| 601 | + * Post info that needs to be saved in detail table. |
|
| 602 | + * |
|
| 603 | + * @type string $post_title Listing title. |
|
| 604 | + * @type string $post_tags Listing tags. |
|
| 605 | + * @type string $post_status Listing post status. |
|
| 606 | + * @type string $post_location_id Listing location ID. |
|
| 607 | + * @type string $claimed Todo Desc needed. |
|
| 608 | + * @type string $businesses Todo Desc needed. |
|
| 609 | + * @type int $submit_time Submitted time in unix timestamp. |
|
| 610 | + * @type string $submit_ip Submitted IP. |
|
| 611 | + * @type string $expire_date Listing expiration date. |
|
| 612 | + * @type int $package_id Listing package ID. |
|
| 613 | + * @type int $alive_days Todo Desc needed. |
|
| 614 | + * @type int $is_featured Is this a featured listing?. |
|
| 615 | + * @type string $post_address Listing address. |
|
| 616 | + * @type string $post_city Listing city. |
|
| 617 | + * @type string $post_region Listing region. |
|
| 618 | + * @type string $post_country Listing country. |
|
| 619 | + * @type string $post_locations Listing locations. |
|
| 620 | + * @type string $post_zip Listing zip. |
|
| 621 | + * @type string $post_latitude Listing latitude. |
|
| 622 | + * @type string $post_longitude Listing longitude. |
|
| 623 | + * @type string $post_mapview Listing mapview. Default "ROADMAP". |
|
| 624 | + * @type string $post_mapzoom Listing mapzoom Default "9". |
|
| 625 | + * @type string $geodir_timing Business timing info. |
|
| 626 | + * @type string $geodir_contact Contact number. |
|
| 627 | + * @type string $geodir_email Business contact email. |
|
| 628 | + * @type string $geodir_website Business website. |
|
| 629 | + * @type string $geodir_twitter Twitter link. |
|
| 630 | + * @type string $geodir_facebook Facebook link. |
|
| 631 | + * @type string $geodir_video Video link. |
|
| 632 | + * @type string $geodir_special_offers Speacial offers. |
|
| 633 | + * |
|
| 634 | + * } |
|
| 635 | + * @return bool |
|
| 636 | + */ |
|
| 637 | + function geodir_save_post_info($post_id, $postinfo_array = array()) |
|
| 638 | + {
|
|
| 639 | + global $wpdb, $plugin_prefix; |
|
| 640 | + |
|
| 641 | + $post_type = get_post_type($post_id); |
|
| 642 | + |
|
| 643 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 644 | + |
|
| 645 | + /** |
|
| 646 | + * Filter to change Post info |
|
| 647 | + * |
|
| 648 | + * You can use this filter to change Post info. |
|
| 649 | + * |
|
| 650 | + * @since 1.0.0 |
|
| 651 | + * @package GeoDirectory |
|
| 652 | + * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
|
|
| 653 | + * @param int $post_id The post ID. |
|
| 654 | + */ |
|
| 655 | + $postmeta = apply_filters('geodir_listinginfo_request', $postinfo_array, $post_id);
|
|
| 656 | + |
|
| 657 | + if (!empty($postmeta) && $post_id) {
|
|
| 658 | + $post_meta_set_query = ''; |
|
| 659 | + |
|
| 660 | + foreach ($postmeta as $mkey => $mval) {
|
|
| 661 | + if (geodir_column_exist($table, $mkey)) {
|
|
| 662 | + if (is_array($mval)) {
|
|
| 663 | + $mval = implode(",", $mval);
|
|
| 664 | + } |
|
| 665 | + |
|
| 666 | + $post_meta_set_query .= $mkey . " = '" . $mval . "', "; |
|
| 667 | + } |
|
| 668 | + } |
|
| 656 | 669 | |
| 657 | - if (!empty($postmeta) && $post_id) {
|
|
| 658 | - $post_meta_set_query = ''; |
|
| 670 | + $post_meta_set_query = trim($post_meta_set_query, ", "); |
|
| 659 | 671 | |
| 660 | - foreach ($postmeta as $mkey => $mval) {
|
|
| 661 | - if (geodir_column_exist($table, $mkey)) {
|
|
| 662 | - if (is_array($mval)) {
|
|
| 663 | - $mval = implode(",", $mval);
|
|
| 664 | - } |
|
| 672 | + $post_meta_set_query = str_replace('%', '%%', $post_meta_set_query);// escape %
|
|
| 665 | 673 | |
| 666 | - $post_meta_set_query .= $mkey . " = '" . $mval . "', "; |
|
| 667 | - } |
|
| 668 | - } |
|
| 674 | + /** |
|
| 675 | + * Called before saving the listing info. |
|
| 676 | + * |
|
| 677 | + * @since 1.0.0 |
|
| 678 | + * @package GeoDirectory |
|
| 679 | + * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
|
|
| 680 | + * @param int $post_id The post ID. |
|
| 681 | + */ |
|
| 682 | + do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);
|
|
| 669 | 683 | |
| 670 | - $post_meta_set_query = trim($post_meta_set_query, ", "); |
|
| 684 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 671 | 685 | |
| 672 | - $post_meta_set_query = str_replace('%', '%%', $post_meta_set_query);// escape %
|
|
| 686 | + $wpdb->query( |
|
| 687 | + $wpdb->prepare( |
|
| 688 | + "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id =%d", |
|
| 689 | + array($post_id) |
|
| 690 | + ) |
|
| 691 | + ); |
|
| 673 | 692 | |
| 674 | - /** |
|
| 675 | - * Called before saving the listing info. |
|
| 676 | - * |
|
| 677 | - * @since 1.0.0 |
|
| 678 | - * @package GeoDirectory |
|
| 679 | - * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
|
|
| 680 | - * @param int $post_id The post ID. |
|
| 681 | - */ |
|
| 682 | - do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);
|
|
| 683 | 693 | |
| 684 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 694 | + } else {
|
|
| 685 | 695 | |
| 686 | - $wpdb->query( |
|
| 687 | - $wpdb->prepare( |
|
| 688 | - "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id =%d", |
|
| 689 | - array($post_id) |
|
| 690 | - ) |
|
| 691 | - ); |
|
| 696 | + $wpdb->query( |
|
| 697 | + $wpdb->prepare( |
|
| 698 | + "INSERT INTO " . $table . " SET post_id = %d," . $post_meta_set_query, |
|
| 699 | + array($post_id) |
|
| 700 | + ) |
|
| 701 | + ); |
|
| 692 | 702 | |
| 703 | + } |
|
| 693 | 704 | |
| 694 | - } else {
|
|
| 705 | + /** |
|
| 706 | + * Called after saving the listing info. |
|
| 707 | + * |
|
| 708 | + * @since 1.0.0 |
|
| 709 | + * @package GeoDirectory |
|
| 710 | + * @param array $postinfo_array Post info that needs to be saved in detail table. |
|
| 711 | + * @param int $post_id The post ID. |
|
| 712 | + * @see 'geodir_after_save_listing' |
|
| 713 | + */ |
|
| 714 | + do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);
|
|
| 715 | + |
|
| 716 | + return true; |
|
| 717 | + } else |
|
| 718 | + return false; |
|
| 695 | 719 | |
| 696 | - $wpdb->query( |
|
| 697 | - $wpdb->prepare( |
|
| 698 | - "INSERT INTO " . $table . " SET post_id = %d," . $post_meta_set_query, |
|
| 699 | - array($post_id) |
|
| 700 | - ) |
|
| 701 | - ); |
|
| 720 | + } |
|
| 721 | +} |
|
| 702 | 722 | |
| 703 | - } |
|
| 704 | 723 | |
| 705 | - /** |
|
| 706 | - * Called after saving the listing info. |
|
| 707 | - * |
|
| 708 | - * @since 1.0.0 |
|
| 709 | - * @package GeoDirectory |
|
| 710 | - * @param array $postinfo_array Post info that needs to be saved in detail table. |
|
| 711 | - * @param int $post_id The post ID. |
|
| 712 | - * @see 'geodir_after_save_listing' |
|
| 713 | - */ |
|
| 714 | - do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);
|
|
| 724 | +if (!function_exists('geodir_save_post_meta')) {
|
|
| 725 | + /** |
|
| 726 | + * Save or update post custom fields. |
|
| 727 | + * |
|
| 728 | + * @since 1.0.0 |
|
| 729 | + * @package GeoDirectory |
|
| 730 | + * @global object $wpdb WordPress Database object. |
|
| 731 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 732 | + * @param int $post_id The post ID. |
|
| 733 | + * @param string $postmeta Detail table column name. |
|
| 734 | + * @param string $meta_value Detail table column value. |
|
| 735 | + * @return void|bool |
|
| 736 | + */ |
|
| 737 | + function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '') |
|
| 738 | + {
|
|
| 739 | + |
|
| 740 | + global $wpdb, $plugin_prefix; |
|
| 741 | + |
|
| 742 | + $post_type = get_post_type($post_id); |
|
| 743 | + |
|
| 744 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 745 | + |
|
| 746 | + if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {
|
|
| 747 | + |
|
| 748 | + if (is_array($meta_value)) {
|
|
| 749 | + $meta_value = implode(",", $meta_value);
|
|
| 750 | + } |
|
| 715 | 751 | |
| 716 | - return true; |
|
| 717 | - } else |
|
| 718 | - return false; |
|
| 752 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 719 | 753 | |
| 720 | - } |
|
| 721 | -} |
|
| 754 | + $wpdb->query( |
|
| 755 | + $wpdb->prepare( |
|
| 756 | + "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d", |
|
| 757 | + array($post_id) |
|
| 758 | + ) |
|
| 759 | + ); |
|
| 722 | 760 | |
| 761 | + } else {
|
|
| 723 | 762 | |
| 724 | -if (!function_exists('geodir_save_post_meta')) {
|
|
| 725 | - /** |
|
| 726 | - * Save or update post custom fields. |
|
| 727 | - * |
|
| 728 | - * @since 1.0.0 |
|
| 729 | - * @package GeoDirectory |
|
| 730 | - * @global object $wpdb WordPress Database object. |
|
| 731 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 732 | - * @param int $post_id The post ID. |
|
| 733 | - * @param string $postmeta Detail table column name. |
|
| 734 | - * @param string $meta_value Detail table column value. |
|
| 735 | - * @return void|bool |
|
| 736 | - */ |
|
| 737 | - function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '') |
|
| 738 | - {
|
|
| 739 | - |
|
| 740 | - global $wpdb, $plugin_prefix; |
|
| 741 | - |
|
| 742 | - $post_type = get_post_type($post_id); |
|
| 743 | - |
|
| 744 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 745 | - |
|
| 746 | - if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {
|
|
| 747 | - |
|
| 748 | - if (is_array($meta_value)) {
|
|
| 749 | - $meta_value = implode(",", $meta_value);
|
|
| 750 | - } |
|
| 751 | - |
|
| 752 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 753 | - |
|
| 754 | - $wpdb->query( |
|
| 755 | - $wpdb->prepare( |
|
| 756 | - "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d", |
|
| 757 | - array($post_id) |
|
| 758 | - ) |
|
| 759 | - ); |
|
| 760 | - |
|
| 761 | - } else {
|
|
| 762 | - |
|
| 763 | - $wpdb->query( |
|
| 764 | - $wpdb->prepare( |
|
| 765 | - "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'", |
|
| 766 | - array($post_id) |
|
| 767 | - ) |
|
| 768 | - ); |
|
| 769 | - } |
|
| 770 | - |
|
| 771 | - |
|
| 772 | - } else |
|
| 773 | - return false; |
|
| 774 | - } |
|
| 763 | + $wpdb->query( |
|
| 764 | + $wpdb->prepare( |
|
| 765 | + "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'", |
|
| 766 | + array($post_id) |
|
| 767 | + ) |
|
| 768 | + ); |
|
| 769 | + } |
|
| 770 | + |
|
| 771 | + |
|
| 772 | + } else |
|
| 773 | + return false; |
|
| 774 | + } |
|
| 775 | 775 | } |
| 776 | 776 | |
| 777 | 777 | if (!function_exists('geodir_delete_post_meta')) {
|
| 778 | - /** |
|
| 779 | - * Delete post custom fields. |
|
| 780 | - * |
|
| 781 | - * @since 1.0.0 |
|
| 782 | - * @package GeoDirectory |
|
| 783 | - * @global object $wpdb WordPress Database object. |
|
| 784 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 785 | - * @param int $post_id The post ID. |
|
| 786 | - * @param string $postmeta Detail table column name. |
|
| 787 | - * @todo check if this is depreciated |
|
| 788 | - * @todo Fix unknown variable mval |
|
| 789 | - * @return bool |
|
| 790 | - */ |
|
| 791 | - function geodir_delete_post_meta($post_id, $postmeta) |
|
| 792 | - {
|
|
| 793 | - |
|
| 794 | - global $wpdb, $plugin_prefix; |
|
| 795 | - |
|
| 796 | - $post_type = get_post_type($post_id); |
|
| 797 | - |
|
| 798 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 799 | - |
|
| 800 | - if (is_array($postmeta) && !empty($postmeta) && $post_id) {
|
|
| 801 | - $post_meta_set_query = ''; |
|
| 802 | - |
|
| 803 | - foreach ($postmeta as $mkey) {
|
|
| 804 | - if ($mval != '') |
|
| 805 | - $post_meta_set_query .= $mkey . " = '', "; |
|
| 806 | - } |
|
| 807 | - |
|
| 808 | - $post_meta_set_query = trim($post_meta_set_query, ", "); |
|
| 809 | - |
|
| 810 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 811 | - |
|
| 812 | - $wpdb->query( |
|
| 813 | - $wpdb->prepare( |
|
| 814 | - "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d", |
|
| 815 | - array($post_id) |
|
| 816 | - ) |
|
| 817 | - ); |
|
| 818 | - |
|
| 819 | - return true; |
|
| 820 | - } |
|
| 821 | - |
|
| 822 | - } elseif ($postmeta != '' && $post_id) {
|
|
| 823 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 824 | - |
|
| 825 | - $wpdb->query( |
|
| 826 | - $wpdb->prepare( |
|
| 827 | - "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d", |
|
| 828 | - array($post_id) |
|
| 829 | - ) |
|
| 830 | - ); |
|
| 831 | - |
|
| 832 | - return true; |
|
| 833 | - } |
|
| 834 | - |
|
| 835 | - } else |
|
| 836 | - return false; |
|
| 837 | - } |
|
| 778 | + /** |
|
| 779 | + * Delete post custom fields. |
|
| 780 | + * |
|
| 781 | + * @since 1.0.0 |
|
| 782 | + * @package GeoDirectory |
|
| 783 | + * @global object $wpdb WordPress Database object. |
|
| 784 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 785 | + * @param int $post_id The post ID. |
|
| 786 | + * @param string $postmeta Detail table column name. |
|
| 787 | + * @todo check if this is depreciated |
|
| 788 | + * @todo Fix unknown variable mval |
|
| 789 | + * @return bool |
|
| 790 | + */ |
|
| 791 | + function geodir_delete_post_meta($post_id, $postmeta) |
|
| 792 | + {
|
|
| 793 | + |
|
| 794 | + global $wpdb, $plugin_prefix; |
|
| 795 | + |
|
| 796 | + $post_type = get_post_type($post_id); |
|
| 797 | + |
|
| 798 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 799 | + |
|
| 800 | + if (is_array($postmeta) && !empty($postmeta) && $post_id) {
|
|
| 801 | + $post_meta_set_query = ''; |
|
| 802 | + |
|
| 803 | + foreach ($postmeta as $mkey) {
|
|
| 804 | + if ($mval != '') |
|
| 805 | + $post_meta_set_query .= $mkey . " = '', "; |
|
| 806 | + } |
|
| 807 | + |
|
| 808 | + $post_meta_set_query = trim($post_meta_set_query, ", "); |
|
| 809 | + |
|
| 810 | + if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 811 | + |
|
| 812 | + $wpdb->query( |
|
| 813 | + $wpdb->prepare( |
|
| 814 | + "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d", |
|
| 815 | + array($post_id) |
|
| 816 | + ) |
|
| 817 | + ); |
|
| 818 | + |
|
| 819 | + return true; |
|
| 820 | + } |
|
| 821 | + |
|
| 822 | + } elseif ($postmeta != '' && $post_id) {
|
|
| 823 | + if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 824 | + |
|
| 825 | + $wpdb->query( |
|
| 826 | + $wpdb->prepare( |
|
| 827 | + "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d", |
|
| 828 | + array($post_id) |
|
| 829 | + ) |
|
| 830 | + ); |
|
| 831 | + |
|
| 832 | + return true; |
|
| 833 | + } |
|
| 834 | + |
|
| 835 | + } else |
|
| 836 | + return false; |
|
| 837 | + } |
|
| 838 | 838 | } |
| 839 | 839 | |
| 840 | 840 | |
| 841 | 841 | if (!function_exists('geodir_get_post_meta')) {
|
| 842 | - /** |
|
| 843 | - * Get post custom meta. |
|
| 844 | - * |
|
| 845 | - * @since 1.0.0 |
|
| 846 | - * @package GeoDirectory |
|
| 847 | - * @global object $wpdb WordPress Database object. |
|
| 848 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 849 | - * @param int $post_id The post ID. |
|
| 850 | - * @param string $meta_key The meta key to retrieve. |
|
| 851 | - * @param bool $single Optional. Whether to return a single value. Default false. |
|
| 852 | - * @todo single variable not yet implemented. |
|
| 853 | - * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true. |
|
| 854 | - */ |
|
| 855 | - function geodir_get_post_meta($post_id, $meta_key, $single = false) |
|
| 856 | - {
|
|
| 857 | - if (!$post_id) {
|
|
| 858 | - return false; |
|
| 859 | - } |
|
| 860 | - global $wpdb, $plugin_prefix; |
|
| 861 | - |
|
| 862 | - $all_postypes = geodir_get_posttypes(); |
|
| 863 | - |
|
| 864 | - $post_type = get_post_type($post_id); |
|
| 865 | - |
|
| 866 | - if (!in_array($post_type, $all_postypes)) |
|
| 867 | - return false; |
|
| 868 | - |
|
| 869 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 870 | - |
|
| 871 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {
|
|
| 872 | - $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));
|
|
| 842 | + /** |
|
| 843 | + * Get post custom meta. |
|
| 844 | + * |
|
| 845 | + * @since 1.0.0 |
|
| 846 | + * @package GeoDirectory |
|
| 847 | + * @global object $wpdb WordPress Database object. |
|
| 848 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 849 | + * @param int $post_id The post ID. |
|
| 850 | + * @param string $meta_key The meta key to retrieve. |
|
| 851 | + * @param bool $single Optional. Whether to return a single value. Default false. |
|
| 852 | + * @todo single variable not yet implemented. |
|
| 853 | + * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true. |
|
| 854 | + */ |
|
| 855 | + function geodir_get_post_meta($post_id, $meta_key, $single = false) |
|
| 856 | + {
|
|
| 857 | + if (!$post_id) {
|
|
| 858 | + return false; |
|
| 859 | + } |
|
| 860 | + global $wpdb, $plugin_prefix; |
|
| 861 | + |
|
| 862 | + $all_postypes = geodir_get_posttypes(); |
|
| 863 | + |
|
| 864 | + $post_type = get_post_type($post_id); |
|
| 865 | + |
|
| 866 | + if (!in_array($post_type, $all_postypes)) |
|
| 867 | + return false; |
|
| 868 | + |
|
| 869 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 870 | + |
|
| 871 | + if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {
|
|
| 872 | + $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));
|
|
| 873 | 873 | |
| 874 | - if ($meta_value && $meta_value !== '') {
|
|
| 875 | - return maybe_serialize($meta_value); |
|
| 876 | - } else |
|
| 877 | - return $meta_value; |
|
| 878 | - } else {
|
|
| 879 | - return false; |
|
| 880 | - } |
|
| 881 | - } |
|
| 874 | + if ($meta_value && $meta_value !== '') {
|
|
| 875 | + return maybe_serialize($meta_value); |
|
| 876 | + } else |
|
| 877 | + return $meta_value; |
|
| 878 | + } else {
|
|
| 879 | + return false; |
|
| 880 | + } |
|
| 881 | + } |
|
| 882 | 882 | } |
| 883 | 883 | |
| 884 | 884 | |
| 885 | 885 | if (!function_exists('geodir_save_post_images')) {
|
| 886 | - /** |
|
| 887 | - * Save post attachments. |
|
| 888 | - * |
|
| 889 | - * @since 1.0.0 |
|
| 890 | - * @package GeoDirectory |
|
| 891 | - * @global object $wpdb WordPress Database object. |
|
| 892 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 893 | - * @global object $current_user Current user object. |
|
| 894 | - * @param int $post_id The post ID. |
|
| 895 | - * @param array $post_image Post image urls as an array. |
|
| 896 | - * @param bool $dummy Optional. Is this a dummy listing? Default false. |
|
| 897 | - */ |
|
| 898 | - function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false) |
|
| 899 | - {
|
|
| 900 | - |
|
| 886 | + /** |
|
| 887 | + * Save post attachments. |
|
| 888 | + * |
|
| 889 | + * @since 1.0.0 |
|
| 890 | + * @package GeoDirectory |
|
| 891 | + * @global object $wpdb WordPress Database object. |
|
| 892 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 893 | + * @global object $current_user Current user object. |
|
| 894 | + * @param int $post_id The post ID. |
|
| 895 | + * @param array $post_image Post image urls as an array. |
|
| 896 | + * @param bool $dummy Optional. Is this a dummy listing? Default false. |
|
| 897 | + */ |
|
| 898 | + function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false) |
|
| 899 | + {
|
|
| 901 | 900 | |
| 902 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 903 | 901 | |
| 904 | - $post_type = get_post_type($post_id); |
|
| 902 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 905 | 903 | |
| 906 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 904 | + $post_type = get_post_type($post_id); |
|
| 907 | 905 | |
| 908 | - $post_images = geodir_get_images($post_id); |
|
| 906 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 909 | 907 | |
| 910 | - $wpdb->query( |
|
| 911 | - $wpdb->prepare( |
|
| 912 | - "UPDATE " . $table . " SET featured_image = '' where post_id =%d", |
|
| 913 | - array($post_id) |
|
| 914 | - ) |
|
| 915 | - ); |
|
| 908 | + $post_images = geodir_get_images($post_id); |
|
| 916 | 909 | |
| 917 | - $invalid_files = $post_images; |
|
| 918 | - $valid_file_ids = array(); |
|
| 919 | - $valid_files_condition = ''; |
|
| 920 | - $geodir_uploaddir = ''; |
|
| 910 | + $wpdb->query( |
|
| 911 | + $wpdb->prepare( |
|
| 912 | + "UPDATE " . $table . " SET featured_image = '' where post_id =%d", |
|
| 913 | + array($post_id) |
|
| 914 | + ) |
|
| 915 | + ); |
|
| 921 | 916 | |
| 922 | - $remove_files = array(); |
|
| 917 | + $invalid_files = $post_images; |
|
| 918 | + $valid_file_ids = array(); |
|
| 919 | + $valid_files_condition = ''; |
|
| 920 | + $geodir_uploaddir = ''; |
|
| 923 | 921 | |
| 924 | - if (!empty($post_image)) {
|
|
| 922 | + $remove_files = array(); |
|
| 925 | 923 | |
| 926 | - $uploads = wp_upload_dir(); |
|
| 927 | - $uploads_dir = $uploads['path']; |
|
| 924 | + if (!empty($post_image)) {
|
|
| 928 | 925 | |
| 929 | - $geodir_uploadpath = $uploads['path']; |
|
| 930 | - $geodir_uploadurl = $uploads['url']; |
|
| 931 | - $sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : ''; |
|
| 926 | + $uploads = wp_upload_dir(); |
|
| 927 | + $uploads_dir = $uploads['path']; |
|
| 932 | 928 | |
| 933 | - $invalid_files = array(); |
|
| 934 | - $postcurr_images = array(); |
|
| 929 | + $geodir_uploadpath = $uploads['path']; |
|
| 930 | + $geodir_uploadurl = $uploads['url']; |
|
| 931 | + $sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : ''; |
|
| 935 | 932 | |
| 936 | - for ($m = 0; $m < count($post_image); $m++) {
|
|
| 937 | - $menu_order = $m + 1; |
|
| 933 | + $invalid_files = array(); |
|
| 934 | + $postcurr_images = array(); |
|
| 938 | 935 | |
| 939 | - $file_path = ''; |
|
| 940 | - /* --------- start ------- */ |
|
| 936 | + for ($m = 0; $m < count($post_image); $m++) {
|
|
| 937 | + $menu_order = $m + 1; |
|
| 941 | 938 | |
| 942 | - $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
|
|
| 939 | + $file_path = ''; |
|
| 940 | + /* --------- start ------- */ |
|
| 943 | 941 | |
| 944 | - $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 942 | + $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
|
|
| 945 | 943 | |
| 944 | + $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 946 | 945 | |
| 947 | - 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)))) {
|
|
| 948 | 946 | |
| 949 | - /* --------- end ------- */ |
|
| 950 | - $curr_img_url = $post_image[$m]; |
|
| 947 | + 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)))) {
|
|
| 951 | 948 | |
| 952 | - $image_name_arr = explode('/', $curr_img_url);
|
|
| 949 | + /* --------- end ------- */ |
|
| 950 | + $curr_img_url = $post_image[$m]; |
|
| 953 | 951 | |
| 954 | - $count_image_name_arr = count($image_name_arr) - 2; |
|
| 952 | + $image_name_arr = explode('/', $curr_img_url);
|
|
| 955 | 953 | |
| 956 | - $count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0; |
|
| 954 | + $count_image_name_arr = count($image_name_arr) - 2; |
|
| 957 | 955 | |
| 958 | - $curr_img_dir = $image_name_arr[$count_image_name_arr]; |
|
| 956 | + $count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0; |
|
| 959 | 957 | |
| 960 | - $filename = end($image_name_arr); |
|
| 961 | - if (strpos($filename, '?') !== false) {
|
|
| 962 | - list($filename) = explode('?', $filename);
|
|
| 963 | - } |
|
| 958 | + $curr_img_dir = $image_name_arr[$count_image_name_arr]; |
|
| 964 | 959 | |
| 965 | - $curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url); |
|
| 966 | - $curr_img_dir = str_replace($filename, "", $curr_img_dir); |
|
| 960 | + $filename = end($image_name_arr); |
|
| 961 | + if (strpos($filename, '?') !== false) {
|
|
| 962 | + list($filename) = explode('?', $filename);
|
|
| 963 | + } |
|
| 967 | 964 | |
| 968 | - $img_name_arr = explode('.', $filename);
|
|
| 965 | + $curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url); |
|
| 966 | + $curr_img_dir = str_replace($filename, "", $curr_img_dir); |
|
| 969 | 967 | |
| 970 | - $file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename; |
|
| 971 | - if (!empty($img_name_arr) && count($img_name_arr) > 2) {
|
|
| 972 | - $new_img_name_arr = $img_name_arr; |
|
| 973 | - if (isset($new_img_name_arr[count($img_name_arr) - 1])) {
|
|
| 974 | - unset($new_img_name_arr[count($img_name_arr) - 1]); |
|
| 975 | - $file_title = implode('.', $new_img_name_arr);
|
|
| 976 | - } |
|
| 977 | - } |
|
| 978 | - $file_title = sanitize_file_name($file_title); |
|
| 979 | - $file_name = sanitize_file_name($filename); |
|
| 968 | + $img_name_arr = explode('.', $filename);
|
|
| 980 | 969 | |
| 981 | - $arr_file_type = wp_check_filetype($filename); |
|
| 970 | + $file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename; |
|
| 971 | + if (!empty($img_name_arr) && count($img_name_arr) > 2) {
|
|
| 972 | + $new_img_name_arr = $img_name_arr; |
|
| 973 | + if (isset($new_img_name_arr[count($img_name_arr) - 1])) {
|
|
| 974 | + unset($new_img_name_arr[count($img_name_arr) - 1]); |
|
| 975 | + $file_title = implode('.', $new_img_name_arr);
|
|
| 976 | + } |
|
| 977 | + } |
|
| 978 | + $file_title = sanitize_file_name($file_title); |
|
| 979 | + $file_name = sanitize_file_name($filename); |
|
| 982 | 980 | |
| 983 | - $uploaded_file_type = $arr_file_type['type']; |
|
| 981 | + $arr_file_type = wp_check_filetype($filename); |
|
| 984 | 982 | |
| 985 | - // Set an array containing a list of acceptable formats |
|
| 986 | - $allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');
|
|
| 983 | + $uploaded_file_type = $arr_file_type['type']; |
|
| 987 | 984 | |
| 988 | - // If the uploaded file is the right format |
|
| 989 | - if (in_array($uploaded_file_type, $allowed_file_types)) {
|
|
| 990 | - if (!function_exists('wp_handle_upload')) {
|
|
| 991 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 992 | - } |
|
| 985 | + // Set an array containing a list of acceptable formats |
|
| 986 | + $allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');
|
|
| 993 | 987 | |
| 994 | - if (!is_dir($geodir_uploadpath)) {
|
|
| 995 | - mkdir($geodir_uploadpath); |
|
| 996 | - } |
|
| 988 | + // If the uploaded file is the right format |
|
| 989 | + if (in_array($uploaded_file_type, $allowed_file_types)) {
|
|
| 990 | + if (!function_exists('wp_handle_upload')) {
|
|
| 991 | + require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 992 | + } |
|
| 997 | 993 | |
| 998 | - $external_img = false; |
|
| 999 | - if (strpos(str_replace(array('http://','https://'),'',$curr_img_url), str_replace(array('http://','https://'),'',$uploads['baseurl'])) !== false) {
|
|
| 1000 | - } else {
|
|
| 1001 | - $external_img = true; |
|
| 1002 | - } |
|
| 994 | + if (!is_dir($geodir_uploadpath)) {
|
|
| 995 | + mkdir($geodir_uploadpath); |
|
| 996 | + } |
|
| 1003 | 997 | |
| 1004 | - if ($dummy || $external_img) {
|
|
| 1005 | - $uploaded_file = array(); |
|
| 1006 | - $uploaded = (array)fetch_remote_file($curr_img_url); |
|
| 998 | + $external_img = false; |
|
| 999 | + if (strpos(str_replace(array('http://','https://'),'',$curr_img_url), str_replace(array('http://','https://'),'',$uploads['baseurl'])) !== false) {
|
|
| 1000 | + } else {
|
|
| 1001 | + $external_img = true; |
|
| 1002 | + } |
|
| 1007 | 1003 | |
| 1008 | - if (isset($uploaded['error']) && empty($uploaded['error'])) {
|
|
| 1009 | - $new_name = basename($uploaded['file']); |
|
| 1010 | - $uploaded_file = $uploaded; |
|
| 1011 | - }else{
|
|
| 1012 | - print_r($uploaded);exit; |
|
| 1013 | - } |
|
| 1014 | - $external_img = false; |
|
| 1015 | - } else {
|
|
| 1016 | - $new_name = $post_id . '_' . $file_name; |
|
| 1004 | + if ($dummy || $external_img) {
|
|
| 1005 | + $uploaded_file = array(); |
|
| 1006 | + $uploaded = (array)fetch_remote_file($curr_img_url); |
|
| 1017 | 1007 | |
| 1018 | - if ($curr_img_dir == $sub_dir) {
|
|
| 1019 | - $img_path = $geodir_uploadpath . '/' . $filename; |
|
| 1020 | - $img_url = $geodir_uploadurl . '/' . $filename; |
|
| 1021 | - } else {
|
|
| 1022 | - $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1023 | - $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1024 | - } |
|
| 1008 | + if (isset($uploaded['error']) && empty($uploaded['error'])) {
|
|
| 1009 | + $new_name = basename($uploaded['file']); |
|
| 1010 | + $uploaded_file = $uploaded; |
|
| 1011 | + }else{
|
|
| 1012 | + print_r($uploaded);exit; |
|
| 1013 | + } |
|
| 1014 | + $external_img = false; |
|
| 1015 | + } else {
|
|
| 1016 | + $new_name = $post_id . '_' . $file_name; |
|
| 1025 | 1017 | |
| 1026 | - $uploaded_file = ''; |
|
| 1018 | + if ($curr_img_dir == $sub_dir) {
|
|
| 1019 | + $img_path = $geodir_uploadpath . '/' . $filename; |
|
| 1020 | + $img_url = $geodir_uploadurl . '/' . $filename; |
|
| 1021 | + } else {
|
|
| 1022 | + $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1023 | + $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1024 | + } |
|
| 1027 | 1025 | |
| 1028 | - if (file_exists($img_path)) {
|
|
| 1029 | - $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); |
|
| 1030 | - $file_path = ''; |
|
| 1031 | - } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
|
|
| 1032 | - $uploaded_file = true; |
|
| 1033 | - $file_path = $curr_img_dir . '/' . $filename; |
|
| 1034 | - } |
|
| 1026 | + $uploaded_file = ''; |
|
| 1035 | 1027 | |
| 1036 | - if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path)) |
|
| 1037 | - unlink($img_path); |
|
| 1038 | - } |
|
| 1028 | + if (file_exists($img_path)) {
|
|
| 1029 | + $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); |
|
| 1030 | + $file_path = ''; |
|
| 1031 | + } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
|
|
| 1032 | + $uploaded_file = true; |
|
| 1033 | + $file_path = $curr_img_dir . '/' . $filename; |
|
| 1034 | + } |
|
| 1039 | 1035 | |
| 1040 | - if (!empty($uploaded_file)) {
|
|
| 1041 | - if (!isset($file_path) || !$file_path) {
|
|
| 1042 | - $file_path = $sub_dir . '/' . $new_name; |
|
| 1043 | - } |
|
| 1036 | + if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path)) |
|
| 1037 | + unlink($img_path); |
|
| 1038 | + } |
|
| 1044 | 1039 | |
| 1045 | - $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
|
|
| 1040 | + if (!empty($uploaded_file)) {
|
|
| 1041 | + if (!isset($file_path) || !$file_path) {
|
|
| 1042 | + $file_path = $sub_dir . '/' . $new_name; |
|
| 1043 | + } |
|
| 1046 | 1044 | |
| 1047 | - if ($menu_order == 1) {
|
|
| 1045 | + $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
|
|
| 1048 | 1046 | |
| 1049 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
|
|
| 1047 | + if ($menu_order == 1) {
|
|
| 1050 | 1048 | |
| 1051 | - } |
|
| 1049 | + $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
|
|
| 1052 | 1050 | |
| 1053 | - // Set up options array to add this file as an attachment |
|
| 1054 | - $attachment = array(); |
|
| 1055 | - $attachment['post_id'] = $post_id; |
|
| 1056 | - $attachment['title'] = $file_title; |
|
| 1057 | - $attachment['content'] = ''; |
|
| 1058 | - $attachment['file'] = $file_path; |
|
| 1059 | - $attachment['mime_type'] = $uploaded_file_type; |
|
| 1060 | - $attachment['menu_order'] = $menu_order; |
|
| 1061 | - $attachment['is_featured'] = 0; |
|
| 1051 | + } |
|
| 1062 | 1052 | |
| 1063 | - $attachment_set = ''; |
|
| 1053 | + // Set up options array to add this file as an attachment |
|
| 1054 | + $attachment = array(); |
|
| 1055 | + $attachment['post_id'] = $post_id; |
|
| 1056 | + $attachment['title'] = $file_title; |
|
| 1057 | + $attachment['content'] = ''; |
|
| 1058 | + $attachment['file'] = $file_path; |
|
| 1059 | + $attachment['mime_type'] = $uploaded_file_type; |
|
| 1060 | + $attachment['menu_order'] = $menu_order; |
|
| 1061 | + $attachment['is_featured'] = 0; |
|
| 1064 | 1062 | |
| 1065 | - foreach ($attachment as $key => $val) {
|
|
| 1066 | - if ($val != '') |
|
| 1067 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 1068 | - } |
|
| 1063 | + $attachment_set = ''; |
|
| 1069 | 1064 | |
| 1070 | - $attachment_set = trim($attachment_set, ", "); |
|
| 1065 | + foreach ($attachment as $key => $val) {
|
|
| 1066 | + if ($val != '') |
|
| 1067 | + $attachment_set .= $key . " = '" . $val . "', "; |
|
| 1068 | + } |
|
| 1071 | 1069 | |
| 1072 | - $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 1070 | + $attachment_set = trim($attachment_set, ", "); |
|
| 1071 | + |
|
| 1072 | + $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 1073 | 1073 | |
| 1074 | - $valid_file_ids[] = $wpdb->insert_id; |
|
| 1075 | - } |
|
| 1074 | + $valid_file_ids[] = $wpdb->insert_id; |
|
| 1075 | + } |
|
| 1076 | 1076 | |
| 1077 | - } |
|
| 1077 | + } |
|
| 1078 | 1078 | |
| 1079 | 1079 | |
| 1080 | - } else {
|
|
| 1081 | - $valid_file_ids[] = $find_image; |
|
| 1080 | + } else {
|
|
| 1081 | + $valid_file_ids[] = $find_image; |
|
| 1082 | 1082 | |
| 1083 | - $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
|
|
| 1083 | + $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
|
|
| 1084 | 1084 | |
| 1085 | - $wpdb->query( |
|
| 1086 | - $wpdb->prepare( |
|
| 1087 | - "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d", |
|
| 1088 | - array($menu_order, $split_img_path[1], $post_id) |
|
| 1089 | - ) |
|
| 1090 | - ); |
|
| 1085 | + $wpdb->query( |
|
| 1086 | + $wpdb->prepare( |
|
| 1087 | + "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d", |
|
| 1088 | + array($menu_order, $split_img_path[1], $post_id) |
|
| 1089 | + ) |
|
| 1090 | + ); |
|
| 1091 | 1091 | |
| 1092 | - if ($menu_order == 1) |
|
| 1093 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
|
|
| 1092 | + if ($menu_order == 1) |
|
| 1093 | + $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
|
|
| 1094 | 1094 | |
| 1095 | - } |
|
| 1095 | + } |
|
| 1096 | 1096 | |
| 1097 | 1097 | |
| 1098 | - } |
|
| 1098 | + } |
|
| 1099 | 1099 | |
| 1100 | - if (!empty($valid_file_ids)) {
|
|
| 1100 | + if (!empty($valid_file_ids)) {
|
|
| 1101 | 1101 | |
| 1102 | - $remove_files = $valid_file_ids; |
|
| 1102 | + $remove_files = $valid_file_ids; |
|
| 1103 | 1103 | |
| 1104 | - $remove_files_length = count($remove_files); |
|
| 1105 | - $remove_files_format = array_fill(0, $remove_files_length, '%d'); |
|
| 1106 | - $format = implode(',', $remove_files_format);
|
|
| 1107 | - $valid_files_condition = " ID NOT IN ($format) AND "; |
|
| 1104 | + $remove_files_length = count($remove_files); |
|
| 1105 | + $remove_files_format = array_fill(0, $remove_files_length, '%d'); |
|
| 1106 | + $format = implode(',', $remove_files_format);
|
|
| 1107 | + $valid_files_condition = " ID NOT IN ($format) AND "; |
|
| 1108 | 1108 | |
| 1109 | - } |
|
| 1109 | + } |
|
| 1110 | 1110 | |
| 1111 | - //Get and remove all old images of post from database to set by new order |
|
| 1111 | + //Get and remove all old images of post from database to set by new order |
|
| 1112 | 1112 | |
| 1113 | - if (!empty($post_images)) {
|
|
| 1113 | + if (!empty($post_images)) {
|
|
| 1114 | 1114 | |
| 1115 | - foreach ($post_images as $img) {
|
|
| 1115 | + foreach ($post_images as $img) {
|
|
| 1116 | 1116 | |
| 1117 | - if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
|
|
| 1117 | + if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
|
|
| 1118 | 1118 | |
| 1119 | - $invalid_files[] = (object)array('src' => $img->src);
|
|
| 1119 | + $invalid_files[] = (object)array('src' => $img->src);
|
|
| 1120 | 1120 | |
| 1121 | - } |
|
| 1121 | + } |
|
| 1122 | 1122 | |
| 1123 | - } |
|
| 1123 | + } |
|
| 1124 | 1124 | |
| 1125 | - } |
|
| 1125 | + } |
|
| 1126 | 1126 | |
| 1127 | - $invalid_files = (object)$invalid_files; |
|
| 1128 | - } |
|
| 1127 | + $invalid_files = (object)$invalid_files; |
|
| 1128 | + } |
|
| 1129 | 1129 | |
| 1130 | - $remove_files[] = $post_id; |
|
| 1130 | + $remove_files[] = $post_id; |
|
| 1131 | 1131 | |
| 1132 | - $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
|
|
| 1132 | + $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
|
|
| 1133 | 1133 | |
| 1134 | - if (!empty($invalid_files)) |
|
| 1135 | - geodir_remove_attachments($invalid_files); |
|
| 1136 | - } |
|
| 1134 | + if (!empty($invalid_files)) |
|
| 1135 | + geodir_remove_attachments($invalid_files); |
|
| 1136 | + } |
|
| 1137 | 1137 | |
| 1138 | 1138 | } |
| 1139 | 1139 | |
@@ -1147,12 +1147,12 @@ discard block |
||
| 1147 | 1147 | function geodir_remove_temp_images() |
| 1148 | 1148 | {
|
| 1149 | 1149 | |
| 1150 | - global $current_user; |
|
| 1150 | + global $current_user; |
|
| 1151 | 1151 | |
| 1152 | - $uploads = wp_upload_dir(); |
|
| 1153 | - $uploads_dir = $uploads['path']; |
|
| 1152 | + $uploads = wp_upload_dir(); |
|
| 1153 | + $uploads_dir = $uploads['path']; |
|
| 1154 | 1154 | |
| 1155 | - /* if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){
|
|
| 1155 | + /* if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){
|
|
| 1156 | 1156 | |
| 1157 | 1157 | $dirPath = $uploads_dir.'/temp_'.$current_user->data->ID; |
| 1158 | 1158 | if (substr($dirPath, strlen($dirPath) - 1, 1) != '/') {
|
@@ -1169,8 +1169,8 @@ discard block |
||
| 1169 | 1169 | rmdir($dirPath); |
| 1170 | 1170 | } */ |
| 1171 | 1171 | |
| 1172 | - $dirname = $uploads_dir . '/temp_' . $current_user->ID; |
|
| 1173 | - geodir_delete_directory($dirname); |
|
| 1172 | + $dirname = $uploads_dir . '/temp_' . $current_user->ID; |
|
| 1173 | + geodir_delete_directory($dirname); |
|
| 1174 | 1174 | } |
| 1175 | 1175 | |
| 1176 | 1176 | |
@@ -1184,116 +1184,116 @@ discard block |
||
| 1184 | 1184 | */ |
| 1185 | 1185 | function geodir_delete_directory($dirname) |
| 1186 | 1186 | {
|
| 1187 | - $dir_handle = ''; |
|
| 1188 | - if (is_dir($dirname)) |
|
| 1189 | - $dir_handle = opendir($dirname); |
|
| 1190 | - if (!$dir_handle) |
|
| 1191 | - return false; |
|
| 1192 | - while ($file = readdir($dir_handle)) {
|
|
| 1193 | - if ($file != "." && $file != "..") {
|
|
| 1194 | - if (!is_dir($dirname . "/" . $file)) |
|
| 1195 | - unlink($dirname . "/" . $file); |
|
| 1196 | - else |
|
| 1197 | - geodir_delete_directory($dirname . '/' . $file); |
|
| 1198 | - } |
|
| 1199 | - } |
|
| 1200 | - closedir($dir_handle); |
|
| 1201 | - rmdir($dirname); |
|
| 1202 | - return true; |
|
| 1187 | + $dir_handle = ''; |
|
| 1188 | + if (is_dir($dirname)) |
|
| 1189 | + $dir_handle = opendir($dirname); |
|
| 1190 | + if (!$dir_handle) |
|
| 1191 | + return false; |
|
| 1192 | + while ($file = readdir($dir_handle)) {
|
|
| 1193 | + if ($file != "." && $file != "..") {
|
|
| 1194 | + if (!is_dir($dirname . "/" . $file)) |
|
| 1195 | + unlink($dirname . "/" . $file); |
|
| 1196 | + else |
|
| 1197 | + geodir_delete_directory($dirname . '/' . $file); |
|
| 1198 | + } |
|
| 1199 | + } |
|
| 1200 | + closedir($dir_handle); |
|
| 1201 | + rmdir($dirname); |
|
| 1202 | + return true; |
|
| 1203 | 1203 | |
| 1204 | 1204 | } |
| 1205 | 1205 | |
| 1206 | 1206 | |
| 1207 | 1207 | if (!function_exists('geodir_remove_attachments')) {
|
| 1208 | - /** |
|
| 1209 | - * Remove post attachments. |
|
| 1210 | - * |
|
| 1211 | - * @since 1.0.0 |
|
| 1212 | - * @package GeoDirectory |
|
| 1213 | - * @param array $postcurr_images Array of image objects. |
|
| 1214 | - */ |
|
| 1215 | - function geodir_remove_attachments($postcurr_images = array()) |
|
| 1216 | - {
|
|
| 1217 | - // Unlink all past images of post |
|
| 1218 | - if (!empty($postcurr_images)) {
|
|
| 1219 | - |
|
| 1220 | - $uploads = wp_upload_dir(); |
|
| 1221 | - $uploads_dir = $uploads['path']; |
|
| 1222 | - |
|
| 1223 | - foreach ($postcurr_images as $postimg) {
|
|
| 1224 | - $image_name_arr = explode('/', $postimg->src);
|
|
| 1225 | - $filename = end($image_name_arr); |
|
| 1226 | - if (file_exists($uploads_dir . '/' . $filename)) |
|
| 1227 | - unlink($uploads_dir . '/' . $filename); |
|
| 1228 | - } |
|
| 1229 | - |
|
| 1230 | - } // endif |
|
| 1231 | - // Unlink all past images of post end |
|
| 1232 | - } |
|
| 1208 | + /** |
|
| 1209 | + * Remove post attachments. |
|
| 1210 | + * |
|
| 1211 | + * @since 1.0.0 |
|
| 1212 | + * @package GeoDirectory |
|
| 1213 | + * @param array $postcurr_images Array of image objects. |
|
| 1214 | + */ |
|
| 1215 | + function geodir_remove_attachments($postcurr_images = array()) |
|
| 1216 | + {
|
|
| 1217 | + // Unlink all past images of post |
|
| 1218 | + if (!empty($postcurr_images)) {
|
|
| 1219 | + |
|
| 1220 | + $uploads = wp_upload_dir(); |
|
| 1221 | + $uploads_dir = $uploads['path']; |
|
| 1222 | + |
|
| 1223 | + foreach ($postcurr_images as $postimg) {
|
|
| 1224 | + $image_name_arr = explode('/', $postimg->src);
|
|
| 1225 | + $filename = end($image_name_arr); |
|
| 1226 | + if (file_exists($uploads_dir . '/' . $filename)) |
|
| 1227 | + unlink($uploads_dir . '/' . $filename); |
|
| 1228 | + } |
|
| 1229 | + |
|
| 1230 | + } // endif |
|
| 1231 | + // Unlink all past images of post end |
|
| 1232 | + } |
|
| 1233 | 1233 | } |
| 1234 | 1234 | |
| 1235 | 1235 | if (!function_exists('geodir_get_featured_image')) {
|
| 1236 | - /** |
|
| 1237 | - * Gets the post featured image. |
|
| 1238 | - * |
|
| 1239 | - * @since 1.0.0 |
|
| 1240 | - * @package GeoDirectory |
|
| 1241 | - * @global object $wpdb WordPress Database object. |
|
| 1242 | - * @global object $post The current post object. |
|
| 1243 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 1244 | - * @param int|string $post_id The post ID. |
|
| 1245 | - * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1246 | - * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1247 | - * @param bool|string $file Optional. The file path from which you want to get the image details. Default: false. |
|
| 1248 | - * @return bool|object Image details as an object. |
|
| 1249 | - */ |
|
| 1250 | - function geodir_get_featured_image($post_id = '', $size = '', $no_image = false, $file = false) |
|
| 1251 | - {
|
|
| 1252 | - |
|
| 1253 | - /*$img_arr['src'] = get_the_post_thumbnail_url( $post_id, 'medium');//medium/thumbnail |
|
| 1236 | + /** |
|
| 1237 | + * Gets the post featured image. |
|
| 1238 | + * |
|
| 1239 | + * @since 1.0.0 |
|
| 1240 | + * @package GeoDirectory |
|
| 1241 | + * @global object $wpdb WordPress Database object. |
|
| 1242 | + * @global object $post The current post object. |
|
| 1243 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 1244 | + * @param int|string $post_id The post ID. |
|
| 1245 | + * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1246 | + * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1247 | + * @param bool|string $file Optional. The file path from which you want to get the image details. Default: false. |
|
| 1248 | + * @return bool|object Image details as an object. |
|
| 1249 | + */ |
|
| 1250 | + function geodir_get_featured_image($post_id = '', $size = '', $no_image = false, $file = false) |
|
| 1251 | + {
|
|
| 1252 | + |
|
| 1253 | + /*$img_arr['src'] = get_the_post_thumbnail_url( $post_id, 'medium');//medium/thumbnail |
|
| 1254 | 1254 | $img_arr['path'] = ''; |
| 1255 | 1255 | $img_arr['width'] = ''; |
| 1256 | 1256 | $img_arr['height'] = ''; |
| 1257 | 1257 | $img_arr['title'] = ''; |
| 1258 | 1258 | return (object)$img_arr;*/ |
| 1259 | - global $wpdb, $plugin_prefix, $post; |
|
| 1259 | + global $wpdb, $plugin_prefix, $post; |
|
| 1260 | 1260 | |
| 1261 | - if (isset($post->ID) && isset($post->post_type) && $post->ID == $post_id) {
|
|
| 1262 | - $post_type = $post->post_type; |
|
| 1263 | - } else {
|
|
| 1264 | - $post_type = get_post_type($post_id); |
|
| 1265 | - } |
|
| 1261 | + if (isset($post->ID) && isset($post->post_type) && $post->ID == $post_id) {
|
|
| 1262 | + $post_type = $post->post_type; |
|
| 1263 | + } else {
|
|
| 1264 | + $post_type = get_post_type($post_id); |
|
| 1265 | + } |
|
| 1266 | 1266 | |
| 1267 | - if (!in_array($post_type, geodir_get_posttypes())) {
|
|
| 1268 | - return false;// if not a GD CPT return; |
|
| 1269 | - } |
|
| 1267 | + if (!in_array($post_type, geodir_get_posttypes())) {
|
|
| 1268 | + return false;// if not a GD CPT return; |
|
| 1269 | + } |
|
| 1270 | 1270 | |
| 1271 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1271 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1272 | 1272 | |
| 1273 | - if (!$file) {
|
|
| 1274 | - if (isset($post->featured_image)) {
|
|
| 1275 | - $file = $post->featured_image; |
|
| 1276 | - } else {
|
|
| 1277 | - $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));
|
|
| 1278 | - } |
|
| 1279 | - } |
|
| 1273 | + if (!$file) {
|
|
| 1274 | + if (isset($post->featured_image)) {
|
|
| 1275 | + $file = $post->featured_image; |
|
| 1276 | + } else {
|
|
| 1277 | + $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));
|
|
| 1278 | + } |
|
| 1279 | + } |
|
| 1280 | 1280 | |
| 1281 | - if ($file != NULL && $file != '' && (($uploads = wp_upload_dir()) && false === $uploads['error'])) {
|
|
| 1282 | - $img_arr = array(); |
|
| 1281 | + if ($file != NULL && $file != '' && (($uploads = wp_upload_dir()) && false === $uploads['error'])) {
|
|
| 1282 | + $img_arr = array(); |
|
| 1283 | 1283 | |
| 1284 | - $file_info = pathinfo($file); |
|
| 1285 | - $sub_dir = ''; |
|
| 1286 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 1287 | - $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 1284 | + $file_info = pathinfo($file); |
|
| 1285 | + $sub_dir = ''; |
|
| 1286 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 1287 | + $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 1288 | 1288 | |
| 1289 | - $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 1290 | - $uploads_baseurl = $uploads['baseurl']; |
|
| 1291 | - $uploads_path = $uploads['path']; |
|
| 1289 | + $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 1290 | + $uploads_baseurl = $uploads['baseurl']; |
|
| 1291 | + $uploads_path = $uploads['path']; |
|
| 1292 | 1292 | |
| 1293 | - $file_name = $file_info['basename']; |
|
| 1293 | + $file_name = $file_info['basename']; |
|
| 1294 | 1294 | |
| 1295 | - $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1296 | - /* |
|
| 1295 | + $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1296 | + /* |
|
| 1297 | 1297 | * Allows the filter of image src for such things as CDN change. |
| 1298 | 1298 | * |
| 1299 | 1299 | * @since 1.5.7 |
@@ -1302,158 +1302,158 @@ discard block |
||
| 1302 | 1302 | * @param string $uploads_url The server upload directory url. |
| 1303 | 1303 | * @param string $uploads_baseurl The uploads dir base url. |
| 1304 | 1304 | */ |
| 1305 | - $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1306 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1307 | - $width = 0; |
|
| 1308 | - $height = 0; |
|
| 1309 | - if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1310 | - $imagesize = getimagesize($img_arr['path']); |
|
| 1311 | - $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1312 | - $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1313 | - } |
|
| 1314 | - $img_arr['width'] = $width; |
|
| 1315 | - $img_arr['height'] = $height; |
|
| 1316 | - $img_arr['title'] = ''; |
|
| 1317 | - } elseif ($post_images = geodir_get_images($post_id, $size, $no_image, 1)) {
|
|
| 1318 | - foreach ($post_images as $image) {
|
|
| 1319 | - return $image; |
|
| 1320 | - } |
|
| 1321 | - } else if ($no_image) {
|
|
| 1322 | - $img_arr = array(); |
|
| 1323 | - |
|
| 1324 | - $default_img = ''; |
|
| 1325 | - if (isset($post->default_category) && $post->default_category) {
|
|
| 1326 | - $default_cat = $post->default_category; |
|
| 1327 | - } else {
|
|
| 1328 | - $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1329 | - } |
|
| 1330 | - |
|
| 1331 | - if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) |
|
| 1332 | - $default_img = $default_catimg['src']; |
|
| 1333 | - elseif ($no_image) {
|
|
| 1334 | - $default_img = get_option('geodir_listing_no_img');
|
|
| 1335 | - } |
|
| 1336 | - |
|
| 1337 | - if (!empty($default_img)) {
|
|
| 1338 | - $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 1339 | - $uploads_baseurl = $uploads['baseurl']; |
|
| 1340 | - $uploads_path = $uploads['path']; |
|
| 1341 | - |
|
| 1342 | - $img_arr = array(); |
|
| 1343 | - |
|
| 1344 | - $file_info = pathinfo($default_img); |
|
| 1345 | - |
|
| 1346 | - $file_name = $file_info['basename']; |
|
| 1347 | - |
|
| 1348 | - $img_arr['src'] = $default_img; |
|
| 1349 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1350 | - |
|
| 1351 | - $width = 0; |
|
| 1352 | - $height = 0; |
|
| 1353 | - if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1354 | - $imagesize = getimagesize($img_arr['path']); |
|
| 1355 | - $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1356 | - $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1357 | - } |
|
| 1358 | - $img_arr['width'] = $width; |
|
| 1359 | - $img_arr['height'] = $height; |
|
| 1360 | - |
|
| 1361 | - $img_arr['title'] = ''; // add the title to the array |
|
| 1362 | - } |
|
| 1363 | - } |
|
| 1364 | - |
|
| 1365 | - if (!empty($img_arr)) |
|
| 1366 | - return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path ); |
|
| 1367 | - else |
|
| 1368 | - return false; |
|
| 1369 | - } |
|
| 1305 | + $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1306 | + $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1307 | + $width = 0; |
|
| 1308 | + $height = 0; |
|
| 1309 | + if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1310 | + $imagesize = getimagesize($img_arr['path']); |
|
| 1311 | + $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1312 | + $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1313 | + } |
|
| 1314 | + $img_arr['width'] = $width; |
|
| 1315 | + $img_arr['height'] = $height; |
|
| 1316 | + $img_arr['title'] = ''; |
|
| 1317 | + } elseif ($post_images = geodir_get_images($post_id, $size, $no_image, 1)) {
|
|
| 1318 | + foreach ($post_images as $image) {
|
|
| 1319 | + return $image; |
|
| 1320 | + } |
|
| 1321 | + } else if ($no_image) {
|
|
| 1322 | + $img_arr = array(); |
|
| 1323 | + |
|
| 1324 | + $default_img = ''; |
|
| 1325 | + if (isset($post->default_category) && $post->default_category) {
|
|
| 1326 | + $default_cat = $post->default_category; |
|
| 1327 | + } else {
|
|
| 1328 | + $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1329 | + } |
|
| 1330 | + |
|
| 1331 | + if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) |
|
| 1332 | + $default_img = $default_catimg['src']; |
|
| 1333 | + elseif ($no_image) {
|
|
| 1334 | + $default_img = get_option('geodir_listing_no_img');
|
|
| 1335 | + } |
|
| 1336 | + |
|
| 1337 | + if (!empty($default_img)) {
|
|
| 1338 | + $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 1339 | + $uploads_baseurl = $uploads['baseurl']; |
|
| 1340 | + $uploads_path = $uploads['path']; |
|
| 1341 | + |
|
| 1342 | + $img_arr = array(); |
|
| 1343 | + |
|
| 1344 | + $file_info = pathinfo($default_img); |
|
| 1345 | + |
|
| 1346 | + $file_name = $file_info['basename']; |
|
| 1347 | + |
|
| 1348 | + $img_arr['src'] = $default_img; |
|
| 1349 | + $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1350 | + |
|
| 1351 | + $width = 0; |
|
| 1352 | + $height = 0; |
|
| 1353 | + if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1354 | + $imagesize = getimagesize($img_arr['path']); |
|
| 1355 | + $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1356 | + $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1357 | + } |
|
| 1358 | + $img_arr['width'] = $width; |
|
| 1359 | + $img_arr['height'] = $height; |
|
| 1360 | + |
|
| 1361 | + $img_arr['title'] = ''; // add the title to the array |
|
| 1362 | + } |
|
| 1363 | + } |
|
| 1364 | + |
|
| 1365 | + if (!empty($img_arr)) |
|
| 1366 | + return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path ); |
|
| 1367 | + else |
|
| 1368 | + return false; |
|
| 1369 | + } |
|
| 1370 | 1370 | } |
| 1371 | 1371 | |
| 1372 | 1372 | if (!function_exists('geodir_show_featured_image')) {
|
| 1373 | - /** |
|
| 1374 | - * Gets the post featured image. |
|
| 1375 | - * |
|
| 1376 | - * @since 1.0.0 |
|
| 1377 | - * @package GeoDirectory |
|
| 1378 | - * @param int|string $post_id The post ID. |
|
| 1379 | - * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1380 | - * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1381 | - * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true. |
|
| 1382 | - * @param bool|string $fimage Optional. The file path from which you want to get the image details. Default: false. |
|
| 1383 | - * @return bool|string Returns image html. |
|
| 1384 | - */ |
|
| 1385 | - function geodir_show_featured_image($post_id = '', $size = 'thumbnail', $no_image = false, $echo = true, $fimage = false) |
|
| 1386 | - {
|
|
| 1387 | - $image = geodir_get_featured_image($post_id, $size, $no_image, $fimage); |
|
| 1388 | - |
|
| 1389 | - $html = geodir_show_image($image, $size, $no_image, false); |
|
| 1390 | - |
|
| 1391 | - if (!empty($html) && $echo) {
|
|
| 1392 | - echo $html; |
|
| 1393 | - } elseif (!empty($html)) {
|
|
| 1394 | - return $html; |
|
| 1395 | - } else |
|
| 1396 | - return false; |
|
| 1397 | - } |
|
| 1373 | + /** |
|
| 1374 | + * Gets the post featured image. |
|
| 1375 | + * |
|
| 1376 | + * @since 1.0.0 |
|
| 1377 | + * @package GeoDirectory |
|
| 1378 | + * @param int|string $post_id The post ID. |
|
| 1379 | + * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1380 | + * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1381 | + * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true. |
|
| 1382 | + * @param bool|string $fimage Optional. The file path from which you want to get the image details. Default: false. |
|
| 1383 | + * @return bool|string Returns image html. |
|
| 1384 | + */ |
|
| 1385 | + function geodir_show_featured_image($post_id = '', $size = 'thumbnail', $no_image = false, $echo = true, $fimage = false) |
|
| 1386 | + {
|
|
| 1387 | + $image = geodir_get_featured_image($post_id, $size, $no_image, $fimage); |
|
| 1388 | + |
|
| 1389 | + $html = geodir_show_image($image, $size, $no_image, false); |
|
| 1390 | + |
|
| 1391 | + if (!empty($html) && $echo) {
|
|
| 1392 | + echo $html; |
|
| 1393 | + } elseif (!empty($html)) {
|
|
| 1394 | + return $html; |
|
| 1395 | + } else |
|
| 1396 | + return false; |
|
| 1397 | + } |
|
| 1398 | 1398 | } |
| 1399 | 1399 | |
| 1400 | 1400 | if (!function_exists('geodir_get_images')) {
|
| 1401 | - /** |
|
| 1402 | - * Gets the post images. |
|
| 1403 | - * |
|
| 1404 | - * @since 1.0.0 |
|
| 1405 | - * @package GeoDirectory |
|
| 1406 | - * @global object $wpdb WordPress Database object. |
|
| 1407 | - * @param int $post_id The post ID. |
|
| 1408 | - * @param string $img_size Optional. Thumbnail size. |
|
| 1409 | - * @param bool $no_images Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1410 | - * @param bool $add_featured Optional. Do you want to include featured images too? Default: true. |
|
| 1411 | - * @param int|string $limit Optional. Number of images. |
|
| 1412 | - * @return array|bool Returns images as an array. Each item is an object. |
|
| 1413 | - */ |
|
| 1414 | - function geodir_get_images($post_id = 0, $img_size = '', $no_images = false, $add_featured = true, $limit = '') |
|
| 1415 | - {
|
|
| 1416 | - global $wpdb; |
|
| 1417 | - if ($limit) {
|
|
| 1418 | - $limit_q = " LIMIT $limit "; |
|
| 1419 | - } else {
|
|
| 1420 | - $limit_q = ''; |
|
| 1421 | - } |
|
| 1422 | - $not_featured = ''; |
|
| 1423 | - $sub_dir = ''; |
|
| 1424 | - if (!$add_featured) |
|
| 1425 | - $not_featured = " AND is_featured = 0 "; |
|
| 1426 | - |
|
| 1427 | - $arrImages = $wpdb->get_results( |
|
| 1428 | - $wpdb->prepare( |
|
| 1429 | - "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 ", |
|
| 1430 | - array('%image%', $post_id)
|
|
| 1431 | - ) |
|
| 1432 | - ); |
|
| 1433 | - |
|
| 1434 | - $counter = 0; |
|
| 1435 | - $return_arr = array(); |
|
| 1436 | - |
|
| 1437 | - if (!empty($arrImages)) {
|
|
| 1438 | - foreach ($arrImages as $attechment) {
|
|
| 1439 | - |
|
| 1440 | - $img_arr = array(); |
|
| 1441 | - $img_arr['id'] = $attechment->ID; |
|
| 1442 | - $img_arr['user_id'] = isset($attechment->user_id) ? $attechment->user_id : 0; |
|
| 1443 | - |
|
| 1444 | - $file_info = pathinfo($attechment->file); |
|
| 1445 | - |
|
| 1446 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 1447 | - $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 1448 | - |
|
| 1449 | - $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 1450 | - $uploads_baseurl = $uploads['baseurl']; |
|
| 1451 | - $uploads_path = $uploads['path']; |
|
| 1452 | - |
|
| 1453 | - $file_name = $file_info['basename']; |
|
| 1454 | - |
|
| 1455 | - $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1456 | - /* |
|
| 1401 | + /** |
|
| 1402 | + * Gets the post images. |
|
| 1403 | + * |
|
| 1404 | + * @since 1.0.0 |
|
| 1405 | + * @package GeoDirectory |
|
| 1406 | + * @global object $wpdb WordPress Database object. |
|
| 1407 | + * @param int $post_id The post ID. |
|
| 1408 | + * @param string $img_size Optional. Thumbnail size. |
|
| 1409 | + * @param bool $no_images Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1410 | + * @param bool $add_featured Optional. Do you want to include featured images too? Default: true. |
|
| 1411 | + * @param int|string $limit Optional. Number of images. |
|
| 1412 | + * @return array|bool Returns images as an array. Each item is an object. |
|
| 1413 | + */ |
|
| 1414 | + function geodir_get_images($post_id = 0, $img_size = '', $no_images = false, $add_featured = true, $limit = '') |
|
| 1415 | + {
|
|
| 1416 | + global $wpdb; |
|
| 1417 | + if ($limit) {
|
|
| 1418 | + $limit_q = " LIMIT $limit "; |
|
| 1419 | + } else {
|
|
| 1420 | + $limit_q = ''; |
|
| 1421 | + } |
|
| 1422 | + $not_featured = ''; |
|
| 1423 | + $sub_dir = ''; |
|
| 1424 | + if (!$add_featured) |
|
| 1425 | + $not_featured = " AND is_featured = 0 "; |
|
| 1426 | + |
|
| 1427 | + $arrImages = $wpdb->get_results( |
|
| 1428 | + $wpdb->prepare( |
|
| 1429 | + "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 ", |
|
| 1430 | + array('%image%', $post_id)
|
|
| 1431 | + ) |
|
| 1432 | + ); |
|
| 1433 | + |
|
| 1434 | + $counter = 0; |
|
| 1435 | + $return_arr = array(); |
|
| 1436 | + |
|
| 1437 | + if (!empty($arrImages)) {
|
|
| 1438 | + foreach ($arrImages as $attechment) {
|
|
| 1439 | + |
|
| 1440 | + $img_arr = array(); |
|
| 1441 | + $img_arr['id'] = $attechment->ID; |
|
| 1442 | + $img_arr['user_id'] = isset($attechment->user_id) ? $attechment->user_id : 0; |
|
| 1443 | + |
|
| 1444 | + $file_info = pathinfo($attechment->file); |
|
| 1445 | + |
|
| 1446 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 1447 | + $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 1448 | + |
|
| 1449 | + $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 1450 | + $uploads_baseurl = $uploads['baseurl']; |
|
| 1451 | + $uploads_path = $uploads['path']; |
|
| 1452 | + |
|
| 1453 | + $file_name = $file_info['basename']; |
|
| 1454 | + |
|
| 1455 | + $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1456 | + /* |
|
| 1457 | 1457 | * Allows the filter of image src for such things as CDN change. |
| 1458 | 1458 | * |
| 1459 | 1459 | * @since 1.5.7 |
@@ -1462,516 +1462,516 @@ discard block |
||
| 1462 | 1462 | * @param string $uploads_url The server upload directory url. |
| 1463 | 1463 | * @param string $uploads_baseurl The uploads dir base url. |
| 1464 | 1464 | */ |
| 1465 | - $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1466 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1467 | - $width = 0; |
|
| 1468 | - $height = 0; |
|
| 1469 | - if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1470 | - $imagesize = getimagesize($img_arr['path']); |
|
| 1471 | - $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1472 | - $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1473 | - } |
|
| 1474 | - $img_arr['width'] = $width; |
|
| 1475 | - $img_arr['height'] = $height; |
|
| 1476 | - |
|
| 1477 | - $img_arr['file'] = $file_name; // add the title to the array |
|
| 1478 | - $img_arr['title'] = $attechment->title; // add the title to the array |
|
| 1479 | - $img_arr['caption'] = isset($attechment->caption) ? $attechment->caption : ''; // add the caption to the array |
|
| 1480 | - $img_arr['content'] = $attechment->content; // add the description to the array |
|
| 1481 | - $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1. |
|
| 1482 | - |
|
| 1483 | - $return_arr[] = (object)$img_arr; |
|
| 1484 | - |
|
| 1485 | - $counter++; |
|
| 1486 | - } |
|
| 1487 | - return (object)$return_arr; |
|
| 1488 | - } else if ($no_images) {
|
|
| 1489 | - $default_img = ''; |
|
| 1490 | - $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1491 | - $post_type = get_post_type($post_id); |
|
| 1492 | - if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) |
|
| 1493 | - $default_img = $default_catimg['src']; |
|
| 1494 | - elseif ($no_images) {
|
|
| 1495 | - $default_img = get_option('geodir_listing_no_img');
|
|
| 1496 | - } |
|
| 1497 | - |
|
| 1498 | - if (!empty($default_img)) {
|
|
| 1499 | - $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 1465 | + $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1466 | + $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1467 | + $width = 0; |
|
| 1468 | + $height = 0; |
|
| 1469 | + if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1470 | + $imagesize = getimagesize($img_arr['path']); |
|
| 1471 | + $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1472 | + $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1473 | + } |
|
| 1474 | + $img_arr['width'] = $width; |
|
| 1475 | + $img_arr['height'] = $height; |
|
| 1476 | + |
|
| 1477 | + $img_arr['file'] = $file_name; // add the title to the array |
|
| 1478 | + $img_arr['title'] = $attechment->title; // add the title to the array |
|
| 1479 | + $img_arr['caption'] = isset($attechment->caption) ? $attechment->caption : ''; // add the caption to the array |
|
| 1480 | + $img_arr['content'] = $attechment->content; // add the description to the array |
|
| 1481 | + $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1. |
|
| 1482 | + |
|
| 1483 | + $return_arr[] = (object)$img_arr; |
|
| 1484 | + |
|
| 1485 | + $counter++; |
|
| 1486 | + } |
|
| 1487 | + return (object)$return_arr; |
|
| 1488 | + } else if ($no_images) {
|
|
| 1489 | + $default_img = ''; |
|
| 1490 | + $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1491 | + $post_type = get_post_type($post_id); |
|
| 1492 | + if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) |
|
| 1493 | + $default_img = $default_catimg['src']; |
|
| 1494 | + elseif ($no_images) {
|
|
| 1495 | + $default_img = get_option('geodir_listing_no_img');
|
|
| 1496 | + } |
|
| 1497 | + |
|
| 1498 | + if (!empty($default_img)) {
|
|
| 1499 | + $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 1500 | 1500 | |
| 1501 | - $image_path = $default_img; |
|
| 1502 | - if (!path_is_absolute($image_path)) {
|
|
| 1503 | - $image_path = str_replace($uploads['baseurl'], $uploads['basedir'], $image_path); |
|
| 1504 | - } |
|
| 1505 | - |
|
| 1506 | - $file_info = pathinfo($default_img); |
|
| 1507 | - $file_name = $file_info['basename']; |
|
| 1508 | - |
|
| 1509 | - $width = ''; |
|
| 1510 | - $height = ''; |
|
| 1511 | - if (is_file($image_path) && file_exists($image_path)) {
|
|
| 1512 | - $imagesize = getimagesize($image_path); |
|
| 1513 | - $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1514 | - $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1515 | - } |
|
| 1501 | + $image_path = $default_img; |
|
| 1502 | + if (!path_is_absolute($image_path)) {
|
|
| 1503 | + $image_path = str_replace($uploads['baseurl'], $uploads['basedir'], $image_path); |
|
| 1504 | + } |
|
| 1505 | + |
|
| 1506 | + $file_info = pathinfo($default_img); |
|
| 1507 | + $file_name = $file_info['basename']; |
|
| 1508 | + |
|
| 1509 | + $width = ''; |
|
| 1510 | + $height = ''; |
|
| 1511 | + if (is_file($image_path) && file_exists($image_path)) {
|
|
| 1512 | + $imagesize = getimagesize($image_path); |
|
| 1513 | + $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1514 | + $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1515 | + } |
|
| 1516 | 1516 | |
| 1517 | - $img_arr = array(); |
|
| 1518 | - $img_arr['src'] = $default_img; |
|
| 1519 | - $img_arr['path'] = $image_path; |
|
| 1520 | - $img_arr['width'] = $width; |
|
| 1521 | - $img_arr['height'] = $height; |
|
| 1522 | - $img_arr['file'] = $file_name; // add the title to the array |
|
| 1523 | - $img_arr['title'] = $file_info['filename']; // add the title to the array |
|
| 1524 | - $img_arr['content'] = $file_info['filename']; // add the description to the array |
|
| 1525 | - |
|
| 1526 | - $return_arr[] = (object)$img_arr; |
|
| 1527 | - |
|
| 1528 | - return $return_arr; |
|
| 1529 | - } else |
|
| 1530 | - return false; |
|
| 1531 | - } |
|
| 1532 | - } |
|
| 1517 | + $img_arr = array(); |
|
| 1518 | + $img_arr['src'] = $default_img; |
|
| 1519 | + $img_arr['path'] = $image_path; |
|
| 1520 | + $img_arr['width'] = $width; |
|
| 1521 | + $img_arr['height'] = $height; |
|
| 1522 | + $img_arr['file'] = $file_name; // add the title to the array |
|
| 1523 | + $img_arr['title'] = $file_info['filename']; // add the title to the array |
|
| 1524 | + $img_arr['content'] = $file_info['filename']; // add the description to the array |
|
| 1525 | + |
|
| 1526 | + $return_arr[] = (object)$img_arr; |
|
| 1527 | + |
|
| 1528 | + return $return_arr; |
|
| 1529 | + } else |
|
| 1530 | + return false; |
|
| 1531 | + } |
|
| 1532 | + } |
|
| 1533 | 1533 | } |
| 1534 | 1534 | |
| 1535 | 1535 | if (!function_exists('geodir_show_image')) {
|
| 1536 | - /** |
|
| 1537 | - * Show image using image details. |
|
| 1538 | - * |
|
| 1539 | - * @since 1.0.0 |
|
| 1540 | - * @package GeoDirectory |
|
| 1541 | - * @param array|object $request Image info either as an array or object. |
|
| 1542 | - * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1543 | - * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1544 | - * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true. |
|
| 1545 | - * @return bool|string Returns image html. |
|
| 1546 | - */ |
|
| 1547 | - function geodir_show_image($request = array(), $size = 'thumbnail', $no_image = false, $echo = true) |
|
| 1548 | - {
|
|
| 1549 | - $image = new stdClass(); |
|
| 1550 | - |
|
| 1551 | - $html = ''; |
|
| 1552 | - if (!empty($request)) {
|
|
| 1553 | - if (!is_object($request)){
|
|
| 1554 | - $request = (object)$request; |
|
| 1555 | - } |
|
| 1556 | - |
|
| 1557 | - if (isset($request->src) && !isset($request->path)) {
|
|
| 1558 | - $request->path = $request->src; |
|
| 1559 | - } |
|
| 1560 | - |
|
| 1561 | - /* |
|
| 1536 | + /** |
|
| 1537 | + * Show image using image details. |
|
| 1538 | + * |
|
| 1539 | + * @since 1.0.0 |
|
| 1540 | + * @package GeoDirectory |
|
| 1541 | + * @param array|object $request Image info either as an array or object. |
|
| 1542 | + * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1543 | + * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1544 | + * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true. |
|
| 1545 | + * @return bool|string Returns image html. |
|
| 1546 | + */ |
|
| 1547 | + function geodir_show_image($request = array(), $size = 'thumbnail', $no_image = false, $echo = true) |
|
| 1548 | + {
|
|
| 1549 | + $image = new stdClass(); |
|
| 1550 | + |
|
| 1551 | + $html = ''; |
|
| 1552 | + if (!empty($request)) {
|
|
| 1553 | + if (!is_object($request)){
|
|
| 1554 | + $request = (object)$request; |
|
| 1555 | + } |
|
| 1556 | + |
|
| 1557 | + if (isset($request->src) && !isset($request->path)) {
|
|
| 1558 | + $request->path = $request->src; |
|
| 1559 | + } |
|
| 1560 | + |
|
| 1561 | + /* |
|
| 1562 | 1562 | * getimagesize() works faster from path than url so we try and get path if we can. |
| 1563 | 1563 | */ |
| 1564 | - $upload_dir = wp_upload_dir(); |
|
| 1565 | - $img_no_http = str_replace(array("http://", "https://"), "", $request->path);
|
|
| 1566 | - $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);
|
|
| 1567 | - if (strpos($img_no_http, $upload_no_http) !== false) {
|
|
| 1568 | - $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path); |
|
| 1569 | - } |
|
| 1564 | + $upload_dir = wp_upload_dir(); |
|
| 1565 | + $img_no_http = str_replace(array("http://", "https://"), "", $request->path);
|
|
| 1566 | + $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);
|
|
| 1567 | + if (strpos($img_no_http, $upload_no_http) !== false) {
|
|
| 1568 | + $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path); |
|
| 1569 | + } |
|
| 1570 | 1570 | |
| 1571 | - $width = 0; |
|
| 1572 | - $height = 0; |
|
| 1573 | - if (is_file($request->path) && file_exists($request->path)) {
|
|
| 1574 | - $imagesize = getimagesize($request->path); |
|
| 1575 | - $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1576 | - $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1577 | - } |
|
| 1578 | - |
|
| 1579 | - $image->src = $request->src; |
|
| 1580 | - $image->width = $width; |
|
| 1581 | - $image->height = $height; |
|
| 1582 | - |
|
| 1583 | - $max_size = (object)geodir_get_imagesize($size); |
|
| 1584 | - |
|
| 1585 | - if (!is_wp_error($max_size)) {
|
|
| 1586 | - if ($image->width) {
|
|
| 1587 | - if ($image->height >= $image->width) {
|
|
| 1588 | - $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2); |
|
| 1589 | - } else if ($image->width < ($max_size->h)) {
|
|
| 1590 | - $width_per = round((($image->width / $max_size->w) * 100), 2); |
|
| 1591 | - } else |
|
| 1592 | - $width_per = 100; |
|
| 1593 | - } |
|
| 1594 | - |
|
| 1595 | - if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
|
|
| 1596 | - $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '" /></div>'; |
|
| 1597 | - } else {
|
|
| 1598 | - if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
|
|
| 1599 | - $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>'; |
|
| 1600 | - }else{
|
|
| 1601 | - //$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>'; |
|
| 1602 | - //$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>'; |
|
| 1603 | - $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';
|
|
| 1604 | - |
|
| 1605 | - } |
|
| 1606 | - |
|
| 1607 | - } |
|
| 1608 | - } |
|
| 1609 | - } |
|
| 1610 | - |
|
| 1611 | - if (!empty($html) && $echo) {
|
|
| 1612 | - echo $html; |
|
| 1613 | - } elseif (!empty($html)) {
|
|
| 1614 | - return $html; |
|
| 1615 | - } else |
|
| 1616 | - return false; |
|
| 1617 | - } |
|
| 1618 | -} |
|
| 1571 | + $width = 0; |
|
| 1572 | + $height = 0; |
|
| 1573 | + if (is_file($request->path) && file_exists($request->path)) {
|
|
| 1574 | + $imagesize = getimagesize($request->path); |
|
| 1575 | + $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1576 | + $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1577 | + } |
|
| 1619 | 1578 | |
| 1620 | -if (!function_exists('geodir_set_post_terms')) {
|
|
| 1621 | - /** |
|
| 1622 | - * Set post Categories. |
|
| 1623 | - * |
|
| 1624 | - * @since 1.0.0 |
|
| 1625 | - * @package GeoDirectory |
|
| 1626 | - * @global object $wpdb WordPress Database object. |
|
| 1627 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 1628 | - * @param int $post_id The post ID. |
|
| 1629 | - * @param array $terms An array of term objects. |
|
| 1630 | - * @param array $tt_ids An array of term taxonomy IDs. |
|
| 1631 | - * @param string $taxonomy Taxonomy slug. |
|
| 1632 | - */ |
|
| 1633 | - function geodir_set_post_terms($post_id, $terms, $tt_ids, $taxonomy) |
|
| 1634 | - {
|
|
| 1635 | - global $wpdb, $plugin_prefix; |
|
| 1579 | + $image->src = $request->src; |
|
| 1580 | + $image->width = $width; |
|
| 1581 | + $image->height = $height; |
|
| 1636 | 1582 | |
| 1637 | - $post_type = get_post_type($post_id); |
|
| 1583 | + $max_size = (object)geodir_get_imagesize($size); |
|
| 1638 | 1584 | |
| 1639 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1585 | + if (!is_wp_error($max_size)) {
|
|
| 1586 | + if ($image->width) {
|
|
| 1587 | + if ($image->height >= $image->width) {
|
|
| 1588 | + $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2); |
|
| 1589 | + } else if ($image->width < ($max_size->h)) {
|
|
| 1590 | + $width_per = round((($image->width / $max_size->w) * 100), 2); |
|
| 1591 | + } else |
|
| 1592 | + $width_per = 100; |
|
| 1593 | + } |
|
| 1594 | + |
|
| 1595 | + if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
|
|
| 1596 | + $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '" /></div>'; |
|
| 1597 | + } else {
|
|
| 1598 | + if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
|
|
| 1599 | + $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>'; |
|
| 1600 | + }else{
|
|
| 1601 | + //$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>'; |
|
| 1602 | + //$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>'; |
|
| 1603 | + $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';
|
|
| 1604 | + |
|
| 1605 | + } |
|
| 1640 | 1606 | |
| 1641 | - if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {
|
|
| 1607 | + } |
|
| 1608 | + } |
|
| 1609 | + } |
|
| 1610 | + |
|
| 1611 | + if (!empty($html) && $echo) {
|
|
| 1612 | + echo $html; |
|
| 1613 | + } elseif (!empty($html)) {
|
|
| 1614 | + return $html; |
|
| 1615 | + } else |
|
| 1616 | + return false; |
|
| 1617 | + } |
|
| 1618 | +} |
|
| 1642 | 1619 | |
| 1643 | - if ($taxonomy == $post_type . '_tags') {
|
|
| 1644 | - if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
|
| 1645 | - geodir_save_post_meta($post_id, 'post_tags', $terms); |
|
| 1646 | - } |
|
| 1647 | - } elseif ($taxonomy == $post_type . 'category') {
|
|
| 1648 | - $srcharr = array('"', '\\');
|
|
| 1649 | - $replarr = array(""", '');
|
|
| 1620 | +if (!function_exists('geodir_set_post_terms')) {
|
|
| 1621 | + /** |
|
| 1622 | + * Set post Categories. |
|
| 1623 | + * |
|
| 1624 | + * @since 1.0.0 |
|
| 1625 | + * @package GeoDirectory |
|
| 1626 | + * @global object $wpdb WordPress Database object. |
|
| 1627 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 1628 | + * @param int $post_id The post ID. |
|
| 1629 | + * @param array $terms An array of term objects. |
|
| 1630 | + * @param array $tt_ids An array of term taxonomy IDs. |
|
| 1631 | + * @param string $taxonomy Taxonomy slug. |
|
| 1632 | + */ |
|
| 1633 | + function geodir_set_post_terms($post_id, $terms, $tt_ids, $taxonomy) |
|
| 1634 | + {
|
|
| 1635 | + global $wpdb, $plugin_prefix; |
|
| 1636 | + |
|
| 1637 | + $post_type = get_post_type($post_id); |
|
| 1638 | + |
|
| 1639 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1640 | + |
|
| 1641 | + if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {
|
|
| 1642 | + |
|
| 1643 | + if ($taxonomy == $post_type . '_tags') {
|
|
| 1644 | + if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
|
| 1645 | + geodir_save_post_meta($post_id, 'post_tags', $terms); |
|
| 1646 | + } |
|
| 1647 | + } elseif ($taxonomy == $post_type . 'category') {
|
|
| 1648 | + $srcharr = array('"', '\\');
|
|
| 1649 | + $replarr = array(""", '');
|
|
| 1650 | 1650 | |
| 1651 | - $post_obj = get_post($post_id); |
|
| 1651 | + $post_obj = get_post($post_id); |
|
| 1652 | 1652 | |
| 1653 | - $cat_ids = array('0');
|
|
| 1654 | - if (is_array($tt_ids)) |
|
| 1655 | - $cat_ids = $tt_ids; |
|
| 1653 | + $cat_ids = array('0');
|
|
| 1654 | + if (is_array($tt_ids)) |
|
| 1655 | + $cat_ids = $tt_ids; |
|
| 1656 | 1656 | |
| 1657 | 1657 | |
| 1658 | - if (!empty($cat_ids)) {
|
|
| 1659 | - $cat_ids_array = $cat_ids; |
|
| 1660 | - $cat_ids_length = count($cat_ids_array); |
|
| 1661 | - $cat_ids_format = array_fill(0, $cat_ids_length, '%d'); |
|
| 1662 | - $format = implode(',', $cat_ids_format);
|
|
| 1658 | + if (!empty($cat_ids)) {
|
|
| 1659 | + $cat_ids_array = $cat_ids; |
|
| 1660 | + $cat_ids_length = count($cat_ids_array); |
|
| 1661 | + $cat_ids_format = array_fill(0, $cat_ids_length, '%d'); |
|
| 1662 | + $format = implode(',', $cat_ids_format);
|
|
| 1663 | 1663 | |
| 1664 | - $cat_ids_array_del = $cat_ids_array; |
|
| 1665 | - $cat_ids_array_del[] = $post_id; |
|
| 1664 | + $cat_ids_array_del = $cat_ids_array; |
|
| 1665 | + $cat_ids_array_del[] = $post_id; |
|
| 1666 | 1666 | |
| 1667 | - $wpdb->get_var( |
|
| 1668 | - $wpdb->prepare( |
|
| 1669 | - "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ", |
|
| 1670 | - $cat_ids_array_del |
|
| 1671 | - ) |
|
| 1672 | - ); |
|
| 1667 | + $wpdb->get_var( |
|
| 1668 | + $wpdb->prepare( |
|
| 1669 | + "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ", |
|
| 1670 | + $cat_ids_array_del |
|
| 1671 | + ) |
|
| 1672 | + ); |
|
| 1673 | 1673 | |
| 1674 | 1674 | |
| 1675 | - $post_term = $wpdb->get_col( |
|
| 1676 | - $wpdb->prepare( |
|
| 1677 | - "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id", |
|
| 1678 | - $cat_ids_array |
|
| 1679 | - ) |
|
| 1680 | - ); |
|
| 1675 | + $post_term = $wpdb->get_col( |
|
| 1676 | + $wpdb->prepare( |
|
| 1677 | + "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id", |
|
| 1678 | + $cat_ids_array |
|
| 1679 | + ) |
|
| 1680 | + ); |
|
| 1681 | 1681 | |
| 1682 | - } |
|
| 1682 | + } |
|
| 1683 | 1683 | |
| 1684 | - $post_marker_json = ''; |
|
| 1684 | + $post_marker_json = ''; |
|
| 1685 | 1685 | |
| 1686 | - if (!empty($post_term)): |
|
| 1686 | + if (!empty($post_term)): |
|
| 1687 | 1687 | |
| 1688 | - foreach ($post_term as $cat_id): |
|
| 1688 | + foreach ($post_term as $cat_id): |
|
| 1689 | 1689 | |
| 1690 | - $term_icon_url = get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type); |
|
| 1691 | - $term_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : ''; |
|
| 1690 | + $term_icon_url = get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type); |
|
| 1691 | + $term_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : ''; |
|
| 1692 | 1692 | |
| 1693 | - $post_title = $post_obj->title; |
|
| 1694 | - $title = str_replace($srcharr, $replarr, $post_title); |
|
| 1693 | + $post_title = $post_obj->title; |
|
| 1694 | + $title = str_replace($srcharr, $replarr, $post_title); |
|
| 1695 | 1695 | |
| 1696 | - $lat = geodir_get_post_meta($post_id, 'post_latitude', true); |
|
| 1697 | - $lng = geodir_get_post_meta($post_id, 'post_longitude', true); |
|
| 1696 | + $lat = geodir_get_post_meta($post_id, 'post_latitude', true); |
|
| 1697 | + $lng = geodir_get_post_meta($post_id, 'post_longitude', true); |
|
| 1698 | 1698 | |
| 1699 | - $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
|
|
| 1700 | - $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true); |
|
| 1699 | + $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
|
|
| 1700 | + $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true); |
|
| 1701 | 1701 | |
| 1702 | - $json = '{';
|
|
| 1703 | - $json .= '"id":"' . $post_id . '",'; |
|
| 1704 | - $json .= '"lat_pos": "' . $lat . '",'; |
|
| 1705 | - $json .= '"long_pos": "' . $lng . '",'; |
|
| 1706 | - $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",'; |
|
| 1707 | - $json .= '"icon":"' . $term_icon . '",'; |
|
| 1708 | - $json .= '"group":"catgroup' . $cat_id . '"'; |
|
| 1709 | - $json .= '}'; |
|
| 1702 | + $json = '{';
|
|
| 1703 | + $json .= '"id":"' . $post_id . '",'; |
|
| 1704 | + $json .= '"lat_pos": "' . $lat . '",'; |
|
| 1705 | + $json .= '"long_pos": "' . $lng . '",'; |
|
| 1706 | + $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",'; |
|
| 1707 | + $json .= '"icon":"' . $term_icon . '",'; |
|
| 1708 | + $json .= '"group":"catgroup' . $cat_id . '"'; |
|
| 1709 | + $json .= '}'; |
|
| 1710 | 1710 | |
| 1711 | 1711 | |
| 1712 | - if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true)) |
|
| 1713 | - $post_marker_json = $json; |
|
| 1712 | + if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true)) |
|
| 1713 | + $post_marker_json = $json; |
|
| 1714 | 1714 | |
| 1715 | 1715 | |
| 1716 | - 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)))) {
|
|
| 1716 | + 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)))) {
|
|
| 1717 | 1717 | |
| 1718 | - $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET
|
|
| 1718 | + $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET
|
|
| 1719 | 1719 | post_title = %s, |
| 1720 | 1720 | json = %s |
| 1721 | 1721 | WHERE post_id = %d AND cat_id = %d ", |
| 1722 | - array($post_title, $json, $post_id, $cat_id)); |
|
| 1722 | + array($post_title, $json, $post_id, $cat_id)); |
|
| 1723 | 1723 | |
| 1724 | - } else {
|
|
| 1724 | + } else {
|
|
| 1725 | 1725 | |
| 1726 | - $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET
|
|
| 1726 | + $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET
|
|
| 1727 | 1727 | post_id = %d, |
| 1728 | 1728 | post_title = %s, |
| 1729 | 1729 | cat_id = %d, |
| 1730 | 1730 | json = %s", |
| 1731 | - array($post_id, $post_title, $cat_id, $json)); |
|
| 1731 | + array($post_id, $post_title, $cat_id, $json)); |
|
| 1732 | 1732 | |
| 1733 | - } |
|
| 1733 | + } |
|
| 1734 | 1734 | |
| 1735 | - $wpdb->query($json_query); |
|
| 1735 | + $wpdb->query($json_query); |
|
| 1736 | 1736 | |
| 1737 | - endforeach; |
|
| 1737 | + endforeach; |
|
| 1738 | 1738 | |
| 1739 | - endif; |
|
| 1739 | + endif; |
|
| 1740 | 1740 | |
| 1741 | - if (!empty($post_term) && is_array($post_term)) {
|
|
| 1742 | - $categories = implode(',', $post_term);
|
|
| 1741 | + if (!empty($post_term) && is_array($post_term)) {
|
|
| 1742 | + $categories = implode(',', $post_term);
|
|
| 1743 | 1743 | |
| 1744 | - if ($categories != '' && $categories != 0) $categories = ',' . $categories . ','; |
|
| 1744 | + if ($categories != '' && $categories != 0) $categories = ',' . $categories . ','; |
|
| 1745 | 1745 | |
| 1746 | - if (empty($post_marker_json)) |
|
| 1747 | - $post_marker_json = isset($json) ? $json : ''; |
|
| 1746 | + if (empty($post_marker_json)) |
|
| 1747 | + $post_marker_json = isset($json) ? $json : ''; |
|
| 1748 | 1748 | |
| 1749 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 1749 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 1750 | 1750 | |
| 1751 | - $wpdb->query( |
|
| 1752 | - $wpdb->prepare( |
|
| 1753 | - "UPDATE " . $table . " SET |
|
| 1751 | + $wpdb->query( |
|
| 1752 | + $wpdb->prepare( |
|
| 1753 | + "UPDATE " . $table . " SET |
|
| 1754 | 1754 | " . $taxonomy . " = %s, |
| 1755 | 1755 | marker_json = %s |
| 1756 | 1756 | where post_id = %d", |
| 1757 | - array($categories, $post_marker_json, $post_id) |
|
| 1758 | - ) |
|
| 1759 | - ); |
|
| 1757 | + array($categories, $post_marker_json, $post_id) |
|
| 1758 | + ) |
|
| 1759 | + ); |
|
| 1760 | 1760 | |
| 1761 | - if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'inline-save') {
|
|
| 1761 | + if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'inline-save') {
|
|
| 1762 | 1762 | |
| 1763 | - $categories = trim($categories, ','); |
|
| 1763 | + $categories = trim($categories, ','); |
|
| 1764 | 1764 | |
| 1765 | - if ($categories) {
|
|
| 1765 | + if ($categories) {
|
|
| 1766 | 1766 | |
| 1767 | - $categories = explode(',', $categories);
|
|
| 1767 | + $categories = explode(',', $categories);
|
|
| 1768 | 1768 | |
| 1769 | - $default_category = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1769 | + $default_category = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1770 | 1770 | |
| 1771 | - if (!in_array($default_category, $categories)) {
|
|
| 1771 | + if (!in_array($default_category, $categories)) {
|
|
| 1772 | 1772 | |
| 1773 | - $wpdb->query( |
|
| 1774 | - $wpdb->prepare( |
|
| 1775 | - "UPDATE " . $table . " SET |
|
| 1773 | + $wpdb->query( |
|
| 1774 | + $wpdb->prepare( |
|
| 1775 | + "UPDATE " . $table . " SET |
|
| 1776 | 1776 | default_category = %s |
| 1777 | 1777 | where post_id = %d", |
| 1778 | - array($categories[0], $post_id) |
|
| 1779 | - ) |
|
| 1780 | - ); |
|
| 1778 | + array($categories[0], $post_id) |
|
| 1779 | + ) |
|
| 1780 | + ); |
|
| 1781 | 1781 | |
| 1782 | - $default_category = $categories[0]; |
|
| 1782 | + $default_category = $categories[0]; |
|
| 1783 | 1783 | |
| 1784 | - } |
|
| 1784 | + } |
|
| 1785 | 1785 | |
| 1786 | - if ($default_category == '') |
|
| 1787 | - $default_category = $categories[0]; |
|
| 1786 | + if ($default_category == '') |
|
| 1787 | + $default_category = $categories[0]; |
|
| 1788 | 1788 | |
| 1789 | - geodir_set_postcat_structure($post_id, $taxonomy, $default_category, ''); |
|
| 1789 | + geodir_set_postcat_structure($post_id, $taxonomy, $default_category, ''); |
|
| 1790 | 1790 | |
| 1791 | - } |
|
| 1791 | + } |
|
| 1792 | 1792 | |
| 1793 | - } |
|
| 1793 | + } |
|
| 1794 | 1794 | |
| 1795 | 1795 | |
| 1796 | - } else {
|
|
| 1796 | + } else {
|
|
| 1797 | 1797 | |
| 1798 | - $wpdb->query( |
|
| 1799 | - $wpdb->prepare( |
|
| 1800 | - "INSERT INTO " . $table . " SET |
|
| 1798 | + $wpdb->query( |
|
| 1799 | + $wpdb->prepare( |
|
| 1800 | + "INSERT INTO " . $table . " SET |
|
| 1801 | 1801 | post_id = %d, |
| 1802 | 1802 | " . $taxonomy . " = %s, |
| 1803 | 1803 | marker_json = %s ", |
| 1804 | 1804 | |
| 1805 | - array($post_id, $categories, $post_marker_json) |
|
| 1806 | - ) |
|
| 1807 | - ); |
|
| 1808 | - } |
|
| 1809 | - } |
|
| 1810 | - } |
|
| 1811 | - } |
|
| 1812 | - } |
|
| 1805 | + array($post_id, $categories, $post_marker_json) |
|
| 1806 | + ) |
|
| 1807 | + ); |
|
| 1808 | + } |
|
| 1809 | + } |
|
| 1810 | + } |
|
| 1811 | + } |
|
| 1812 | + } |
|
| 1813 | 1813 | } |
| 1814 | 1814 | |
| 1815 | 1815 | if (!function_exists('geodir_get_infowindow_html')) {
|
| 1816 | - /** |
|
| 1817 | - * Set post Map Marker info html. |
|
| 1818 | - * |
|
| 1819 | - * @since 1.0.0 |
|
| 1820 | - * @since 1.5.4 Modified to add new action "geodir_infowindow_meta_before". |
|
| 1821 | - * @package GeoDirectory |
|
| 1822 | - * @global array $geodir_addon_list List of active GeoDirectory extensions. |
|
| 1823 | - * @global object $gd_session GeoDirectory Session object. |
|
| 1824 | - * @param object $postinfo_obj The post details object. |
|
| 1825 | - * @param string $post_preview Is this a post preview?. |
|
| 1826 | - * @return mixed|string|void |
|
| 1827 | - */ |
|
| 1828 | - function geodir_get_infowindow_html($postinfo_obj, $post_preview = '') |
|
| 1829 | - {
|
|
| 1830 | - global $preview, $gd_session; |
|
| 1831 | - $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 1832 | - $replarr = array("′", "⁄", "–", "“", '');
|
|
| 1833 | - |
|
| 1834 | - if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
|
|
| 1835 | - $ID = ''; |
|
| 1836 | - $plink = ''; |
|
| 1837 | - |
|
| 1838 | - if (isset($postinfo_obj->pid)) {
|
|
| 1839 | - $ID = $postinfo_obj->pid; |
|
| 1840 | - $plink = get_permalink($ID); |
|
| 1841 | - } |
|
| 1842 | - |
|
| 1843 | - $title = str_replace($srcharr, $replarr, ($postinfo_obj->post_title)); |
|
| 1844 | - $lat = $postinfo_obj->post_latitude; |
|
| 1845 | - $lng = $postinfo_obj->post_longitude; |
|
| 1846 | - } else {
|
|
| 1847 | - $ID = $postinfo_obj->post_id; |
|
| 1848 | - $title = str_replace($srcharr, $replarr, htmlentities($postinfo_obj->post_title, ENT_COMPAT, 'UTF-8')); // fix by Stiofan |
|
| 1849 | - $plink = get_permalink($ID); |
|
| 1850 | - $lat = htmlentities(geodir_get_post_meta($ID, 'post_latitude', true)); |
|
| 1851 | - $lng = htmlentities(geodir_get_post_meta($ID, 'post_longitude', true)); |
|
| 1852 | - } |
|
| 1853 | - |
|
| 1854 | - // filter field as per price package |
|
| 1855 | - global $geodir_addon_list; |
|
| 1856 | - if (isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes') {
|
|
| 1857 | - $post_type = get_post_type($ID); |
|
| 1858 | - $package_id = isset($postinfo_obj->package_id) && $postinfo_obj->package_id ? $postinfo_obj->package_id : NULL; |
|
| 1859 | - $field_name = 'geodir_contact'; |
|
| 1860 | - if (!check_field_visibility($package_id, $field_name, $post_type)) {
|
|
| 1861 | - $contact = ''; |
|
| 1862 | - } |
|
| 1863 | - |
|
| 1864 | - $field_name = 'geodir_timing'; |
|
| 1865 | - if (!check_field_visibility($package_id, $field_name, $post_type)) {
|
|
| 1866 | - $timing = ''; |
|
| 1867 | - } |
|
| 1868 | - } |
|
| 1869 | - |
|
| 1870 | - if ($lat && $lng) {
|
|
| 1871 | - ob_start(); ?> |
|
| 1816 | + /** |
|
| 1817 | + * Set post Map Marker info html. |
|
| 1818 | + * |
|
| 1819 | + * @since 1.0.0 |
|
| 1820 | + * @since 1.5.4 Modified to add new action "geodir_infowindow_meta_before". |
|
| 1821 | + * @package GeoDirectory |
|
| 1822 | + * @global array $geodir_addon_list List of active GeoDirectory extensions. |
|
| 1823 | + * @global object $gd_session GeoDirectory Session object. |
|
| 1824 | + * @param object $postinfo_obj The post details object. |
|
| 1825 | + * @param string $post_preview Is this a post preview?. |
|
| 1826 | + * @return mixed|string|void |
|
| 1827 | + */ |
|
| 1828 | + function geodir_get_infowindow_html($postinfo_obj, $post_preview = '') |
|
| 1829 | + {
|
|
| 1830 | + global $preview, $gd_session; |
|
| 1831 | + $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 1832 | + $replarr = array("′", "⁄", "–", "“", '');
|
|
| 1833 | + |
|
| 1834 | + if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
|
|
| 1835 | + $ID = ''; |
|
| 1836 | + $plink = ''; |
|
| 1837 | + |
|
| 1838 | + if (isset($postinfo_obj->pid)) {
|
|
| 1839 | + $ID = $postinfo_obj->pid; |
|
| 1840 | + $plink = get_permalink($ID); |
|
| 1841 | + } |
|
| 1842 | + |
|
| 1843 | + $title = str_replace($srcharr, $replarr, ($postinfo_obj->post_title)); |
|
| 1844 | + $lat = $postinfo_obj->post_latitude; |
|
| 1845 | + $lng = $postinfo_obj->post_longitude; |
|
| 1846 | + } else {
|
|
| 1847 | + $ID = $postinfo_obj->post_id; |
|
| 1848 | + $title = str_replace($srcharr, $replarr, htmlentities($postinfo_obj->post_title, ENT_COMPAT, 'UTF-8')); // fix by Stiofan |
|
| 1849 | + $plink = get_permalink($ID); |
|
| 1850 | + $lat = htmlentities(geodir_get_post_meta($ID, 'post_latitude', true)); |
|
| 1851 | + $lng = htmlentities(geodir_get_post_meta($ID, 'post_longitude', true)); |
|
| 1852 | + } |
|
| 1853 | + |
|
| 1854 | + // filter field as per price package |
|
| 1855 | + global $geodir_addon_list; |
|
| 1856 | + if (isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes') {
|
|
| 1857 | + $post_type = get_post_type($ID); |
|
| 1858 | + $package_id = isset($postinfo_obj->package_id) && $postinfo_obj->package_id ? $postinfo_obj->package_id : NULL; |
|
| 1859 | + $field_name = 'geodir_contact'; |
|
| 1860 | + if (!check_field_visibility($package_id, $field_name, $post_type)) {
|
|
| 1861 | + $contact = ''; |
|
| 1862 | + } |
|
| 1863 | + |
|
| 1864 | + $field_name = 'geodir_timing'; |
|
| 1865 | + if (!check_field_visibility($package_id, $field_name, $post_type)) {
|
|
| 1866 | + $timing = ''; |
|
| 1867 | + } |
|
| 1868 | + } |
|
| 1869 | + |
|
| 1870 | + if ($lat && $lng) {
|
|
| 1871 | + ob_start(); ?> |
|
| 1872 | 1872 | <div class="gd-bubble" style=""> |
| 1873 | 1873 | <div class="gd-bubble-inside"> |
| 1874 | 1874 | <?php |
| 1875 | - $comment_count = ''; |
|
| 1876 | - $rating_star = ''; |
|
| 1877 | - if ($ID != '') {
|
|
| 1878 | - $rating_star = ''; |
|
| 1879 | - $comment_count = geodir_get_review_count_total($ID); |
|
| 1880 | - |
|
| 1881 | - if (!$preview) {
|
|
| 1882 | - $post_avgratings = geodir_get_post_rating($ID); |
|
| 1883 | - |
|
| 1884 | - $rating_star = geodir_get_rating_stars($post_avgratings, $ID, false); |
|
| 1885 | - |
|
| 1886 | - /** |
|
| 1887 | - * Filter to change rating stars |
|
| 1888 | - * |
|
| 1889 | - * You can use this filter to change Rating stars. |
|
| 1890 | - * |
|
| 1891 | - * @since 1.0.0 |
|
| 1892 | - * @package GeoDirectory |
|
| 1893 | - * @param string $rating_star Rating stars. |
|
| 1894 | - * @param float $post_avgratings Average ratings of the post. |
|
| 1895 | - * @param int $ID The post ID. |
|
| 1896 | - */ |
|
| 1897 | - $rating_star = apply_filters('geodir_review_rating_stars_on_infowindow', $rating_star, $post_avgratings, $ID);
|
|
| 1898 | - } |
|
| 1899 | - } |
|
| 1900 | - ?> |
|
| 1875 | + $comment_count = ''; |
|
| 1876 | + $rating_star = ''; |
|
| 1877 | + if ($ID != '') {
|
|
| 1878 | + $rating_star = ''; |
|
| 1879 | + $comment_count = geodir_get_review_count_total($ID); |
|
| 1880 | + |
|
| 1881 | + if (!$preview) {
|
|
| 1882 | + $post_avgratings = geodir_get_post_rating($ID); |
|
| 1883 | + |
|
| 1884 | + $rating_star = geodir_get_rating_stars($post_avgratings, $ID, false); |
|
| 1885 | + |
|
| 1886 | + /** |
|
| 1887 | + * Filter to change rating stars |
|
| 1888 | + * |
|
| 1889 | + * You can use this filter to change Rating stars. |
|
| 1890 | + * |
|
| 1891 | + * @since 1.0.0 |
|
| 1892 | + * @package GeoDirectory |
|
| 1893 | + * @param string $rating_star Rating stars. |
|
| 1894 | + * @param float $post_avgratings Average ratings of the post. |
|
| 1895 | + * @param int $ID The post ID. |
|
| 1896 | + */ |
|
| 1897 | + $rating_star = apply_filters('geodir_review_rating_stars_on_infowindow', $rating_star, $post_avgratings, $ID);
|
|
| 1898 | + } |
|
| 1899 | + } |
|
| 1900 | + ?> |
|
| 1901 | 1901 | <div class="geodir-bubble_desc"> |
| 1902 | 1902 | <h4> |
| 1903 | 1903 | <a href="<?php if ($plink != '') {
|
| 1904 | - echo $plink; |
|
| 1905 | - } else {
|
|
| 1906 | - echo 'javascript:void(0);'; |
|
| 1907 | - } ?>"><?php echo $title; ?></a> |
|
| 1904 | + echo $plink; |
|
| 1905 | + } else {
|
|
| 1906 | + echo 'javascript:void(0);'; |
|
| 1907 | + } ?>"><?php echo $title; ?></a> |
|
| 1908 | 1908 | </h4> |
| 1909 | 1909 | <?php |
| 1910 | - if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
|
|
| 1911 | - $post_images = array(); |
|
| 1912 | - if (!empty($postinfo_obj->post_images)) {
|
|
| 1913 | - $post_images = explode(",", $postinfo_obj->post_images);
|
|
| 1914 | - } |
|
| 1915 | - |
|
| 1916 | - if (!empty($post_images)) {
|
|
| 1917 | - ?> |
|
| 1910 | + if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
|
|
| 1911 | + $post_images = array(); |
|
| 1912 | + if (!empty($postinfo_obj->post_images)) {
|
|
| 1913 | + $post_images = explode(",", $postinfo_obj->post_images);
|
|
| 1914 | + } |
|
| 1915 | + |
|
| 1916 | + if (!empty($post_images)) {
|
|
| 1917 | + ?> |
|
| 1918 | 1918 | <div class="geodir-bubble_image"><a href="<?php if ($plink != '') {
|
| 1919 | - echo $plink; |
|
| 1920 | - } else {
|
|
| 1921 | - echo 'javascript:void(0);'; |
|
| 1922 | - } ?>"><img alt="bubble image" style="max-height:50px;" |
|
| 1919 | + echo $plink; |
|
| 1920 | + } else {
|
|
| 1921 | + echo 'javascript:void(0);'; |
|
| 1922 | + } ?>"><img alt="bubble image" style="max-height:50px;" |
|
| 1923 | 1923 | src="<?php echo $post_images[0]; ?>"/></a></div> |
| 1924 | 1924 | <?php |
| 1925 | - }else{
|
|
| 1926 | - echo '<div class="geodir-bubble_image"></div>'; |
|
| 1927 | - } |
|
| 1928 | - } else {
|
|
| 1929 | - if ($image = geodir_show_featured_image($ID, 'widget-thumb', true, false, $postinfo_obj->featured_image)) {
|
|
| 1930 | - ?> |
|
| 1925 | + }else{
|
|
| 1926 | + echo '<div class="geodir-bubble_image"></div>'; |
|
| 1927 | + } |
|
| 1928 | + } else {
|
|
| 1929 | + if ($image = geodir_show_featured_image($ID, 'widget-thumb', true, false, $postinfo_obj->featured_image)) {
|
|
| 1930 | + ?> |
|
| 1931 | 1931 | <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div> |
| 1932 | 1932 | <?php |
| 1933 | - }else{
|
|
| 1934 | - echo '<div class="geodir-bubble_image"></div>'; |
|
| 1935 | - } |
|
| 1936 | - } |
|
| 1937 | - ?> |
|
| 1933 | + }else{
|
|
| 1934 | + echo '<div class="geodir-bubble_image"></div>'; |
|
| 1935 | + } |
|
| 1936 | + } |
|
| 1937 | + ?> |
|
| 1938 | 1938 | <div class="geodir-bubble-meta-side"> |
| 1939 | 1939 | <?php |
| 1940 | - /** |
|
| 1941 | - * Fires before the meta info in the map info window. |
|
| 1942 | - * |
|
| 1943 | - * This can be used to add more info to the map info window before the normal meta info. |
|
| 1944 | - * |
|
| 1945 | - * @since 1.5.4 |
|
| 1946 | - * @param int $ID The post id. |
|
| 1947 | - * @param object $postinfo_obj The posts info as an object. |
|
| 1948 | - * @param bool|string $post_preview True if currently in post preview page. Empty string if not. * |
|
| 1949 | - */ |
|
| 1950 | - do_action('geodir_infowindow_meta_before', $ID, $postinfo_obj, $post_preview);
|
|
| 1951 | - |
|
| 1952 | - |
|
| 1953 | - echo geodir_show_listing_info('mapbubble');
|
|
| 1940 | + /** |
|
| 1941 | + * Fires before the meta info in the map info window. |
|
| 1942 | + * |
|
| 1943 | + * This can be used to add more info to the map info window before the normal meta info. |
|
| 1944 | + * |
|
| 1945 | + * @since 1.5.4 |
|
| 1946 | + * @param int $ID The post id. |
|
| 1947 | + * @param object $postinfo_obj The posts info as an object. |
|
| 1948 | + * @param bool|string $post_preview True if currently in post preview page. Empty string if not. * |
|
| 1949 | + */ |
|
| 1950 | + do_action('geodir_infowindow_meta_before', $ID, $postinfo_obj, $post_preview);
|
|
| 1951 | + |
|
| 1952 | + |
|
| 1953 | + echo geodir_show_listing_info('mapbubble');
|
|
| 1954 | 1954 | |
| 1955 | 1955 | |
| 1956 | 1956 | |
| 1957 | - /** |
|
| 1958 | - * Fires after the meta info in the map info window. |
|
| 1959 | - * |
|
| 1960 | - * This can be used to add more info to the map info window after the normal meta info. |
|
| 1961 | - * |
|
| 1962 | - * @since 1.4.2 |
|
| 1963 | - * @param object $postinfo_obj The posts info as an object. |
|
| 1964 | - * @param bool|string $post_preview True if currently in post preview page. Empty string if not. * |
|
| 1965 | - */ |
|
| 1966 | - do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );
|
|
| 1967 | - ?> |
|
| 1957 | + /** |
|
| 1958 | + * Fires after the meta info in the map info window. |
|
| 1959 | + * |
|
| 1960 | + * This can be used to add more info to the map info window after the normal meta info. |
|
| 1961 | + * |
|
| 1962 | + * @since 1.4.2 |
|
| 1963 | + * @param object $postinfo_obj The posts info as an object. |
|
| 1964 | + * @param bool|string $post_preview True if currently in post preview page. Empty string if not. * |
|
| 1965 | + */ |
|
| 1966 | + do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );
|
|
| 1967 | + ?> |
|
| 1968 | 1968 | </div> |
| 1969 | 1969 | <?php |
| 1970 | 1970 | |
| 1971 | - if ($ID) {
|
|
| 1971 | + if ($ID) {
|
|
| 1972 | 1972 | |
| 1973 | - $post_author = isset($postinfo_obj->post_author) ? $postinfo_obj->post_author : get_post_field('post_author', $ID);
|
|
| 1974 | - ?> |
|
| 1973 | + $post_author = isset($postinfo_obj->post_author) ? $postinfo_obj->post_author : get_post_field('post_author', $ID);
|
|
| 1974 | + ?> |
|
| 1975 | 1975 | <div class="geodir-bubble-meta-fade"></div> |
| 1976 | 1976 | |
| 1977 | 1977 | <div class="geodir-bubble-meta-bottom"> |
@@ -1991,69 +1991,69 @@ discard block |
||
| 1991 | 1991 | </div> |
| 1992 | 1992 | </div> |
| 1993 | 1993 | <?php |
| 1994 | - $html = ob_get_clean(); |
|
| 1995 | - /** |
|
| 1996 | - * Filter to change infowindow html |
|
| 1997 | - * |
|
| 1998 | - * You can use this filter to change infowindow html. |
|
| 1999 | - * |
|
| 2000 | - * @since 1.0.0 |
|
| 2001 | - * @package GeoDirectory |
|
| 2002 | - * @param string $html Infowindow html. |
|
| 2003 | - * @param object $postinfo_obj The Post object. |
|
| 2004 | - * @param bool|string $post_preview Is this a post preview? |
|
| 2005 | - */ |
|
| 2006 | - $html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);
|
|
| 2007 | - return $html; |
|
| 2008 | - } |
|
| 2009 | - } |
|
| 1994 | + $html = ob_get_clean(); |
|
| 1995 | + /** |
|
| 1996 | + * Filter to change infowindow html |
|
| 1997 | + * |
|
| 1998 | + * You can use this filter to change infowindow html. |
|
| 1999 | + * |
|
| 2000 | + * @since 1.0.0 |
|
| 2001 | + * @package GeoDirectory |
|
| 2002 | + * @param string $html Infowindow html. |
|
| 2003 | + * @param object $postinfo_obj The Post object. |
|
| 2004 | + * @param bool|string $post_preview Is this a post preview? |
|
| 2005 | + */ |
|
| 2006 | + $html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);
|
|
| 2007 | + return $html; |
|
| 2008 | + } |
|
| 2009 | + } |
|
| 2010 | 2010 | } |
| 2011 | 2011 | |
| 2012 | 2012 | |
| 2013 | 2013 | if (!function_exists('geodir_new_post_default_status')) {
|
| 2014 | - /** |
|
| 2015 | - * Default post status for new posts. |
|
| 2016 | - * |
|
| 2017 | - * @since 1.0.0 |
|
| 2018 | - * @package GeoDirectory |
|
| 2019 | - * @return string Returns the default post status for new posts. Ex: draft, publish etc. |
|
| 2020 | - */ |
|
| 2021 | - function geodir_new_post_default_status() |
|
| 2022 | - {
|
|
| 2023 | - if (get_option('geodir_new_post_default_status'))
|
|
| 2024 | - return get_option('geodir_new_post_default_status');
|
|
| 2025 | - else |
|
| 2026 | - return 'publish'; |
|
| 2027 | - |
|
| 2028 | - } |
|
| 2014 | + /** |
|
| 2015 | + * Default post status for new posts. |
|
| 2016 | + * |
|
| 2017 | + * @since 1.0.0 |
|
| 2018 | + * @package GeoDirectory |
|
| 2019 | + * @return string Returns the default post status for new posts. Ex: draft, publish etc. |
|
| 2020 | + */ |
|
| 2021 | + function geodir_new_post_default_status() |
|
| 2022 | + {
|
|
| 2023 | + if (get_option('geodir_new_post_default_status'))
|
|
| 2024 | + return get_option('geodir_new_post_default_status');
|
|
| 2025 | + else |
|
| 2026 | + return 'publish'; |
|
| 2027 | + |
|
| 2028 | + } |
|
| 2029 | 2029 | } |
| 2030 | 2030 | |
| 2031 | 2031 | if (!function_exists('geodir_change_post_status')) {
|
| 2032 | - /** |
|
| 2033 | - * Change post status of a post. |
|
| 2034 | - * |
|
| 2035 | - * @global object $wpdb WordPress Database object. |
|
| 2036 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2037 | - * @param int|string $post_id The post ID. |
|
| 2038 | - * @param string $status New post status. Ex: draft, publish etc. |
|
| 2039 | - */ |
|
| 2040 | - function geodir_change_post_status($post_id = '', $status = '') |
|
| 2041 | - {
|
|
| 2042 | - global $wpdb, $plugin_prefix; |
|
| 2043 | - |
|
| 2044 | - $post_type = get_post_type($post_id); |
|
| 2045 | - |
|
| 2046 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2047 | - |
|
| 2048 | - $wpdb->query( |
|
| 2049 | - $wpdb->prepare( |
|
| 2050 | - "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d", |
|
| 2051 | - array($status, $post_id) |
|
| 2052 | - ) |
|
| 2053 | - ); |
|
| 2054 | - |
|
| 2055 | - |
|
| 2056 | - } |
|
| 2032 | + /** |
|
| 2033 | + * Change post status of a post. |
|
| 2034 | + * |
|
| 2035 | + * @global object $wpdb WordPress Database object. |
|
| 2036 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2037 | + * @param int|string $post_id The post ID. |
|
| 2038 | + * @param string $status New post status. Ex: draft, publish etc. |
|
| 2039 | + */ |
|
| 2040 | + function geodir_change_post_status($post_id = '', $status = '') |
|
| 2041 | + {
|
|
| 2042 | + global $wpdb, $plugin_prefix; |
|
| 2043 | + |
|
| 2044 | + $post_type = get_post_type($post_id); |
|
| 2045 | + |
|
| 2046 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2047 | + |
|
| 2048 | + $wpdb->query( |
|
| 2049 | + $wpdb->prepare( |
|
| 2050 | + "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d", |
|
| 2051 | + array($status, $post_id) |
|
| 2052 | + ) |
|
| 2053 | + ); |
|
| 2054 | + |
|
| 2055 | + |
|
| 2056 | + } |
|
| 2057 | 2057 | } |
| 2058 | 2058 | |
| 2059 | 2059 | /** |
@@ -2067,13 +2067,13 @@ discard block |
||
| 2067 | 2067 | */ |
| 2068 | 2068 | function geodir_set_post_status($pid, $status) |
| 2069 | 2069 | {
|
| 2070 | - if ($pid) {
|
|
| 2071 | - global $wpdb; |
|
| 2072 | - $my_post = array(); |
|
| 2073 | - $my_post['post_status'] = $status; |
|
| 2074 | - $my_post['ID'] = $pid; |
|
| 2075 | - $last_postid = wp_update_post($my_post); |
|
| 2076 | - } |
|
| 2070 | + if ($pid) {
|
|
| 2071 | + global $wpdb; |
|
| 2072 | + $my_post = array(); |
|
| 2073 | + $my_post['post_status'] = $status; |
|
| 2074 | + $my_post['ID'] = $pid; |
|
| 2075 | + $last_postid = wp_update_post($my_post); |
|
| 2076 | + } |
|
| 2077 | 2077 | } |
| 2078 | 2078 | |
| 2079 | 2079 | |
@@ -2089,384 +2089,384 @@ discard block |
||
| 2089 | 2089 | */ |
| 2090 | 2090 | function geodir_update_poststatus($new_status, $old_status, $post) |
| 2091 | 2091 | {
|
| 2092 | - global $wpdb; |
|
| 2092 | + global $wpdb; |
|
| 2093 | 2093 | |
| 2094 | - $geodir_posttypes = geodir_get_posttypes(); |
|
| 2094 | + $geodir_posttypes = geodir_get_posttypes(); |
|
| 2095 | 2095 | |
| 2096 | - if (!wp_is_post_revision($post->ID) && in_array($post->post_type, $geodir_posttypes)) {
|
|
| 2096 | + if (!wp_is_post_revision($post->ID) && in_array($post->post_type, $geodir_posttypes)) {
|
|
| 2097 | 2097 | |
| 2098 | - geodir_change_post_status($post->ID, $new_status); |
|
| 2099 | - } |
|
| 2098 | + geodir_change_post_status($post->ID, $new_status); |
|
| 2099 | + } |
|
| 2100 | 2100 | } |
| 2101 | 2101 | |
| 2102 | 2102 | |
| 2103 | 2103 | if (!function_exists('geodir_update_listing_info')) {
|
| 2104 | - /** |
|
| 2105 | - * Update post info. |
|
| 2106 | - * |
|
| 2107 | - * @since 1.0.0 |
|
| 2108 | - * @package GeoDirectory |
|
| 2109 | - * @global object $wpdb WordPress Database object. |
|
| 2110 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2111 | - * @param int $updatingpost The updating post ID. |
|
| 2112 | - * @param int $temppost The temporary post ID. |
|
| 2113 | - * @todo fix post_id variable |
|
| 2114 | - */ |
|
| 2115 | - function geodir_update_listing_info($updatingpost, $temppost) |
|
| 2116 | - {
|
|
| 2117 | - |
|
| 2118 | - global $wpdb, $plugin_prefix; |
|
| 2119 | - |
|
| 2120 | - $post_type = get_post_type($post_id); |
|
| 2121 | - |
|
| 2122 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2123 | - |
|
| 2124 | - $wpdb->query( |
|
| 2125 | - $wpdb->prepare( |
|
| 2126 | - "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2127 | - array($updatingpost, $temppost) |
|
| 2128 | - ) |
|
| 2129 | - ); |
|
| 2130 | - |
|
| 2131 | - $wpdb->query( |
|
| 2132 | - $wpdb->prepare( |
|
| 2133 | - "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2134 | - array($updatingpost, $temppost) |
|
| 2135 | - ) |
|
| 2136 | - ); |
|
| 2137 | - |
|
| 2138 | - /* Update Attachments*/ |
|
| 2139 | - |
|
| 2140 | - $wpdb->query( |
|
| 2141 | - $wpdb->prepare( |
|
| 2142 | - "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2143 | - array($updatingpost, $temppost) |
|
| 2144 | - ) |
|
| 2145 | - ); |
|
| 2146 | - |
|
| 2147 | - } |
|
| 2104 | + /** |
|
| 2105 | + * Update post info. |
|
| 2106 | + * |
|
| 2107 | + * @since 1.0.0 |
|
| 2108 | + * @package GeoDirectory |
|
| 2109 | + * @global object $wpdb WordPress Database object. |
|
| 2110 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2111 | + * @param int $updatingpost The updating post ID. |
|
| 2112 | + * @param int $temppost The temporary post ID. |
|
| 2113 | + * @todo fix post_id variable |
|
| 2114 | + */ |
|
| 2115 | + function geodir_update_listing_info($updatingpost, $temppost) |
|
| 2116 | + {
|
|
| 2117 | + |
|
| 2118 | + global $wpdb, $plugin_prefix; |
|
| 2119 | + |
|
| 2120 | + $post_type = get_post_type($post_id); |
|
| 2121 | + |
|
| 2122 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2123 | + |
|
| 2124 | + $wpdb->query( |
|
| 2125 | + $wpdb->prepare( |
|
| 2126 | + "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2127 | + array($updatingpost, $temppost) |
|
| 2128 | + ) |
|
| 2129 | + ); |
|
| 2130 | + |
|
| 2131 | + $wpdb->query( |
|
| 2132 | + $wpdb->prepare( |
|
| 2133 | + "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2134 | + array($updatingpost, $temppost) |
|
| 2135 | + ) |
|
| 2136 | + ); |
|
| 2137 | + |
|
| 2138 | + /* Update Attachments*/ |
|
| 2139 | + |
|
| 2140 | + $wpdb->query( |
|
| 2141 | + $wpdb->prepare( |
|
| 2142 | + "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2143 | + array($updatingpost, $temppost) |
|
| 2144 | + ) |
|
| 2145 | + ); |
|
| 2146 | + |
|
| 2147 | + } |
|
| 2148 | 2148 | } |
| 2149 | 2149 | |
| 2150 | 2150 | |
| 2151 | 2151 | if (!function_exists('geodir_delete_listing_info')) {
|
| 2152 | - /** |
|
| 2153 | - * Delete Listing info from details table for the given post id. |
|
| 2154 | - * |
|
| 2155 | - * @since 1.0.0 |
|
| 2156 | - * @package GeoDirectory |
|
| 2157 | - * @global object $wpdb WordPress Database object. |
|
| 2158 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2159 | - * @param int $deleted_postid The post ID. |
|
| 2160 | - * @param bool $force Optional. Do you want to force delete it? Default: false. |
|
| 2161 | - * @return bool|void |
|
| 2162 | - */ |
|
| 2163 | - function geodir_delete_listing_info($deleted_postid, $force = false) |
|
| 2164 | - {
|
|
| 2165 | - global $wpdb, $plugin_prefix; |
|
| 2166 | - |
|
| 2167 | - // check for multisite deletions |
|
| 2168 | - if (strpos($plugin_prefix, $wpdb->prefix) !== false) {
|
|
| 2169 | - } else {
|
|
| 2170 | - return; |
|
| 2171 | - } |
|
| 2172 | - |
|
| 2173 | - $post_type = get_post_type($deleted_postid); |
|
| 2174 | - |
|
| 2175 | - $all_postypes = geodir_get_posttypes(); |
|
| 2176 | - |
|
| 2177 | - if (!in_array($post_type, $all_postypes)) |
|
| 2178 | - return false; |
|
| 2179 | - |
|
| 2180 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2181 | - |
|
| 2182 | - /* Delete custom post meta*/ |
|
| 2183 | - $wpdb->query( |
|
| 2184 | - $wpdb->prepare( |
|
| 2185 | - "DELETE FROM " . $table . " WHERE `post_id` = %d", |
|
| 2186 | - array($deleted_postid) |
|
| 2187 | - ) |
|
| 2188 | - ); |
|
| 2189 | - |
|
| 2190 | - /* Delete post map icons*/ |
|
| 2191 | - |
|
| 2192 | - $wpdb->query( |
|
| 2193 | - $wpdb->prepare( |
|
| 2194 | - "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d", |
|
| 2195 | - array($deleted_postid) |
|
| 2196 | - ) |
|
| 2197 | - ); |
|
| 2198 | - |
|
| 2199 | - /* Delete Attachments*/ |
|
| 2200 | - $postcurr_images = geodir_get_images($deleted_postid); |
|
| 2201 | - |
|
| 2202 | - $wpdb->query( |
|
| 2203 | - $wpdb->prepare( |
|
| 2204 | - "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d", |
|
| 2205 | - array($deleted_postid) |
|
| 2206 | - ) |
|
| 2207 | - ); |
|
| 2208 | - geodir_remove_attachments($postcurr_images); |
|
| 2209 | - |
|
| 2210 | - } |
|
| 2152 | + /** |
|
| 2153 | + * Delete Listing info from details table for the given post id. |
|
| 2154 | + * |
|
| 2155 | + * @since 1.0.0 |
|
| 2156 | + * @package GeoDirectory |
|
| 2157 | + * @global object $wpdb WordPress Database object. |
|
| 2158 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2159 | + * @param int $deleted_postid The post ID. |
|
| 2160 | + * @param bool $force Optional. Do you want to force delete it? Default: false. |
|
| 2161 | + * @return bool|void |
|
| 2162 | + */ |
|
| 2163 | + function geodir_delete_listing_info($deleted_postid, $force = false) |
|
| 2164 | + {
|
|
| 2165 | + global $wpdb, $plugin_prefix; |
|
| 2166 | + |
|
| 2167 | + // check for multisite deletions |
|
| 2168 | + if (strpos($plugin_prefix, $wpdb->prefix) !== false) {
|
|
| 2169 | + } else {
|
|
| 2170 | + return; |
|
| 2171 | + } |
|
| 2172 | + |
|
| 2173 | + $post_type = get_post_type($deleted_postid); |
|
| 2174 | + |
|
| 2175 | + $all_postypes = geodir_get_posttypes(); |
|
| 2176 | + |
|
| 2177 | + if (!in_array($post_type, $all_postypes)) |
|
| 2178 | + return false; |
|
| 2179 | + |
|
| 2180 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2181 | + |
|
| 2182 | + /* Delete custom post meta*/ |
|
| 2183 | + $wpdb->query( |
|
| 2184 | + $wpdb->prepare( |
|
| 2185 | + "DELETE FROM " . $table . " WHERE `post_id` = %d", |
|
| 2186 | + array($deleted_postid) |
|
| 2187 | + ) |
|
| 2188 | + ); |
|
| 2189 | + |
|
| 2190 | + /* Delete post map icons*/ |
|
| 2191 | + |
|
| 2192 | + $wpdb->query( |
|
| 2193 | + $wpdb->prepare( |
|
| 2194 | + "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d", |
|
| 2195 | + array($deleted_postid) |
|
| 2196 | + ) |
|
| 2197 | + ); |
|
| 2198 | + |
|
| 2199 | + /* Delete Attachments*/ |
|
| 2200 | + $postcurr_images = geodir_get_images($deleted_postid); |
|
| 2201 | + |
|
| 2202 | + $wpdb->query( |
|
| 2203 | + $wpdb->prepare( |
|
| 2204 | + "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d", |
|
| 2205 | + array($deleted_postid) |
|
| 2206 | + ) |
|
| 2207 | + ); |
|
| 2208 | + geodir_remove_attachments($postcurr_images); |
|
| 2209 | + |
|
| 2210 | + } |
|
| 2211 | 2211 | } |
| 2212 | 2212 | |
| 2213 | 2213 | |
| 2214 | 2214 | if (!function_exists('geodir_add_to_favorite')) {
|
| 2215 | - /** |
|
| 2216 | - * This function would add listing to favorite listing. |
|
| 2217 | - * |
|
| 2218 | - * @since 1.0.0 |
|
| 2219 | - * @package GeoDirectory |
|
| 2220 | - * @global object $current_user Current user object. |
|
| 2221 | - * @param int $post_id The post ID. |
|
| 2222 | - */ |
|
| 2223 | - function geodir_add_to_favorite($post_id) |
|
| 2224 | - {
|
|
| 2225 | - |
|
| 2226 | - global $current_user; |
|
| 2227 | - |
|
| 2228 | - /** |
|
| 2229 | - * Filter to modify "Unfavorite" text |
|
| 2230 | - * |
|
| 2231 | - * You can use this filter to rename "Unfavorite" text to something else. |
|
| 2232 | - * |
|
| 2233 | - * @since 1.0.0 |
|
| 2234 | - * @package GeoDirectory |
|
| 2235 | - */ |
|
| 2236 | - $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
|
|
| 2237 | - |
|
| 2238 | - /** |
|
| 2239 | - * Filter to modify "Remove from Favorites" text |
|
| 2240 | - * |
|
| 2241 | - * You can use this filter to rename "Remove from Favorites" text to something else. |
|
| 2242 | - * |
|
| 2243 | - * @since 1.0.0 |
|
| 2244 | - * @package GeoDirectory |
|
| 2245 | - */ |
|
| 2246 | - $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
|
|
| 2247 | - |
|
| 2248 | - /** |
|
| 2249 | - * Filter to modify "fa fa-heart" icon |
|
| 2250 | - * |
|
| 2251 | - * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2252 | - * |
|
| 2253 | - * @since 1.0.0 |
|
| 2254 | - * @package GeoDirectory |
|
| 2255 | - */ |
|
| 2256 | - $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2257 | - |
|
| 2258 | - $user_meta_data = array(); |
|
| 2259 | - $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2215 | + /** |
|
| 2216 | + * This function would add listing to favorite listing. |
|
| 2217 | + * |
|
| 2218 | + * @since 1.0.0 |
|
| 2219 | + * @package GeoDirectory |
|
| 2220 | + * @global object $current_user Current user object. |
|
| 2221 | + * @param int $post_id The post ID. |
|
| 2222 | + */ |
|
| 2223 | + function geodir_add_to_favorite($post_id) |
|
| 2224 | + {
|
|
| 2225 | + |
|
| 2226 | + global $current_user; |
|
| 2227 | + |
|
| 2228 | + /** |
|
| 2229 | + * Filter to modify "Unfavorite" text |
|
| 2230 | + * |
|
| 2231 | + * You can use this filter to rename "Unfavorite" text to something else. |
|
| 2232 | + * |
|
| 2233 | + * @since 1.0.0 |
|
| 2234 | + * @package GeoDirectory |
|
| 2235 | + */ |
|
| 2236 | + $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
|
|
| 2237 | + |
|
| 2238 | + /** |
|
| 2239 | + * Filter to modify "Remove from Favorites" text |
|
| 2240 | + * |
|
| 2241 | + * You can use this filter to rename "Remove from Favorites" text to something else. |
|
| 2242 | + * |
|
| 2243 | + * @since 1.0.0 |
|
| 2244 | + * @package GeoDirectory |
|
| 2245 | + */ |
|
| 2246 | + $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
|
|
| 2247 | + |
|
| 2248 | + /** |
|
| 2249 | + * Filter to modify "fa fa-heart" icon |
|
| 2250 | + * |
|
| 2251 | + * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2252 | + * |
|
| 2253 | + * @since 1.0.0 |
|
| 2254 | + * @package GeoDirectory |
|
| 2255 | + */ |
|
| 2256 | + $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2257 | + |
|
| 2258 | + $user_meta_data = array(); |
|
| 2259 | + $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2260 | + |
|
| 2261 | + if (empty($user_meta_data) || (!empty($user_meta_data) && !in_array($post_id, $user_meta_data))) {
|
|
| 2262 | + $user_meta_data[] = $post_id; |
|
| 2263 | + } |
|
| 2264 | + |
|
| 2265 | + update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data); |
|
| 2266 | + |
|
| 2267 | + /** |
|
| 2268 | + * Called before adding the post from favourites. |
|
| 2269 | + * |
|
| 2270 | + * @since 1.0.0 |
|
| 2271 | + * @package GeoDirectory |
|
| 2272 | + * @param int $post_id The post ID. |
|
| 2273 | + */ |
|
| 2274 | + do_action('geodir_before_add_from_favorite', $post_id);
|
|
| 2275 | + |
|
| 2276 | + 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>'; |
|
| 2277 | + |
|
| 2278 | + /** |
|
| 2279 | + * Called after adding the post from favourites. |
|
| 2280 | + * |
|
| 2281 | + * @since 1.0.0 |
|
| 2282 | + * @package GeoDirectory |
|
| 2283 | + * @param int $post_id The post ID. |
|
| 2284 | + */ |
|
| 2285 | + do_action('geodir_after_add_from_favorite', $post_id);
|
|
| 2260 | 2286 | |
| 2261 | - if (empty($user_meta_data) || (!empty($user_meta_data) && !in_array($post_id, $user_meta_data))) {
|
|
| 2262 | - $user_meta_data[] = $post_id; |
|
| 2263 | - } |
|
| 2264 | - |
|
| 2265 | - update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data); |
|
| 2266 | - |
|
| 2267 | - /** |
|
| 2268 | - * Called before adding the post from favourites. |
|
| 2269 | - * |
|
| 2270 | - * @since 1.0.0 |
|
| 2271 | - * @package GeoDirectory |
|
| 2272 | - * @param int $post_id The post ID. |
|
| 2273 | - */ |
|
| 2274 | - do_action('geodir_before_add_from_favorite', $post_id);
|
|
| 2275 | - |
|
| 2276 | - 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>'; |
|
| 2277 | - |
|
| 2278 | - /** |
|
| 2279 | - * Called after adding the post from favourites. |
|
| 2280 | - * |
|
| 2281 | - * @since 1.0.0 |
|
| 2282 | - * @package GeoDirectory |
|
| 2283 | - * @param int $post_id The post ID. |
|
| 2284 | - */ |
|
| 2285 | - do_action('geodir_after_add_from_favorite', $post_id);
|
|
| 2286 | - |
|
| 2287 | - } |
|
| 2287 | + } |
|
| 2288 | 2288 | } |
| 2289 | 2289 | |
| 2290 | 2290 | if (!function_exists('geodir_remove_from_favorite')) {
|
| 2291 | - /** |
|
| 2292 | - * This function would remove the favourited property earlier. |
|
| 2293 | - * |
|
| 2294 | - * @since 1.0.0 |
|
| 2295 | - * @package GeoDirectory |
|
| 2296 | - * @global object $current_user Current user object. |
|
| 2297 | - * @param int $post_id The post ID. |
|
| 2298 | - */ |
|
| 2299 | - function geodir_remove_from_favorite($post_id) |
|
| 2300 | - {
|
|
| 2301 | - global $current_user; |
|
| 2302 | - |
|
| 2303 | - /** |
|
| 2304 | - * Filter to modify "Add to Favorites" text |
|
| 2305 | - * |
|
| 2306 | - * You can use this filter to rename "Add to Favorites" text to something else. |
|
| 2307 | - * |
|
| 2308 | - * @since 1.0.0 |
|
| 2309 | - * @package GeoDirectory |
|
| 2310 | - */ |
|
| 2311 | - $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
|
|
| 2312 | - |
|
| 2313 | - /** |
|
| 2314 | - * Filter to modify "Favourite" text |
|
| 2315 | - * |
|
| 2316 | - * You can use this filter to rename "Favourite" text to something else. |
|
| 2317 | - * |
|
| 2318 | - * @since 1.0.0 |
|
| 2319 | - * @package GeoDirectory |
|
| 2320 | - */ |
|
| 2321 | - $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
|
|
| 2322 | - |
|
| 2323 | - /** |
|
| 2324 | - * Filter to modify "fa fa-heart" icon |
|
| 2325 | - * |
|
| 2326 | - * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2327 | - * |
|
| 2328 | - * @since 1.0.0 |
|
| 2329 | - * @package GeoDirectory |
|
| 2330 | - */ |
|
| 2331 | - $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2332 | - |
|
| 2333 | - $user_meta_data = array(); |
|
| 2334 | - $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2335 | - |
|
| 2336 | - if (!empty($user_meta_data)) {
|
|
| 2337 | - |
|
| 2338 | - if (($key = array_search($post_id, $user_meta_data)) !== false) {
|
|
| 2339 | - unset($user_meta_data[$key]); |
|
| 2340 | - } |
|
| 2291 | + /** |
|
| 2292 | + * This function would remove the favourited property earlier. |
|
| 2293 | + * |
|
| 2294 | + * @since 1.0.0 |
|
| 2295 | + * @package GeoDirectory |
|
| 2296 | + * @global object $current_user Current user object. |
|
| 2297 | + * @param int $post_id The post ID. |
|
| 2298 | + */ |
|
| 2299 | + function geodir_remove_from_favorite($post_id) |
|
| 2300 | + {
|
|
| 2301 | + global $current_user; |
|
| 2302 | + |
|
| 2303 | + /** |
|
| 2304 | + * Filter to modify "Add to Favorites" text |
|
| 2305 | + * |
|
| 2306 | + * You can use this filter to rename "Add to Favorites" text to something else. |
|
| 2307 | + * |
|
| 2308 | + * @since 1.0.0 |
|
| 2309 | + * @package GeoDirectory |
|
| 2310 | + */ |
|
| 2311 | + $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
|
|
| 2312 | + |
|
| 2313 | + /** |
|
| 2314 | + * Filter to modify "Favourite" text |
|
| 2315 | + * |
|
| 2316 | + * You can use this filter to rename "Favourite" text to something else. |
|
| 2317 | + * |
|
| 2318 | + * @since 1.0.0 |
|
| 2319 | + * @package GeoDirectory |
|
| 2320 | + */ |
|
| 2321 | + $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
|
|
| 2322 | + |
|
| 2323 | + /** |
|
| 2324 | + * Filter to modify "fa fa-heart" icon |
|
| 2325 | + * |
|
| 2326 | + * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2327 | + * |
|
| 2328 | + * @since 1.0.0 |
|
| 2329 | + * @package GeoDirectory |
|
| 2330 | + */ |
|
| 2331 | + $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2332 | + |
|
| 2333 | + $user_meta_data = array(); |
|
| 2334 | + $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2335 | + |
|
| 2336 | + if (!empty($user_meta_data)) {
|
|
| 2337 | + |
|
| 2338 | + if (($key = array_search($post_id, $user_meta_data)) !== false) {
|
|
| 2339 | + unset($user_meta_data[$key]); |
|
| 2340 | + } |
|
| 2341 | 2341 | |
| 2342 | - } |
|
| 2342 | + } |
|
| 2343 | 2343 | |
| 2344 | - update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data); |
|
| 2344 | + update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data); |
|
| 2345 | 2345 | |
| 2346 | - /** |
|
| 2347 | - * Called before removing the post from favourites. |
|
| 2348 | - * |
|
| 2349 | - * @since 1.0.0 |
|
| 2350 | - * @package GeoDirectory |
|
| 2351 | - * @param int $post_id The post ID. |
|
| 2352 | - */ |
|
| 2353 | - do_action('geodir_before_remove_from_favorite', $post_id);
|
|
| 2346 | + /** |
|
| 2347 | + * Called before removing the post from favourites. |
|
| 2348 | + * |
|
| 2349 | + * @since 1.0.0 |
|
| 2350 | + * @package GeoDirectory |
|
| 2351 | + * @param int $post_id The post ID. |
|
| 2352 | + */ |
|
| 2353 | + do_action('geodir_before_remove_from_favorite', $post_id);
|
|
| 2354 | 2354 | |
| 2355 | - 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>'; |
|
| 2355 | + 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>'; |
|
| 2356 | 2356 | |
| 2357 | - /** |
|
| 2358 | - * Called after removing the post from favourites. |
|
| 2359 | - * |
|
| 2360 | - * @since 1.0.0 |
|
| 2361 | - * @package GeoDirectory |
|
| 2362 | - * @param int $post_id The post ID. |
|
| 2363 | - */ |
|
| 2364 | - do_action('geodir_after_remove_from_favorite', $post_id);
|
|
| 2357 | + /** |
|
| 2358 | + * Called after removing the post from favourites. |
|
| 2359 | + * |
|
| 2360 | + * @since 1.0.0 |
|
| 2361 | + * @package GeoDirectory |
|
| 2362 | + * @param int $post_id The post ID. |
|
| 2363 | + */ |
|
| 2364 | + do_action('geodir_after_remove_from_favorite', $post_id);
|
|
| 2365 | 2365 | |
| 2366 | - } |
|
| 2366 | + } |
|
| 2367 | 2367 | } |
| 2368 | 2368 | |
| 2369 | 2369 | if (!function_exists('geodir_favourite_html')) {
|
| 2370 | - /** |
|
| 2371 | - * This function would display the html content for add to favorite or remove from favorite. |
|
| 2372 | - * |
|
| 2373 | - * @since 1.0.0 |
|
| 2374 | - * @package GeoDirectory |
|
| 2375 | - * @global object $current_user Current user object. |
|
| 2376 | - * @global object $post The current post object. |
|
| 2377 | - * @param int $user_id The user ID. |
|
| 2378 | - * @param int $post_id The post ID. |
|
| 2379 | - */ |
|
| 2380 | - function geodir_favourite_html($user_id, $post_id) |
|
| 2381 | - {
|
|
| 2382 | - |
|
| 2383 | - global $current_user, $post; |
|
| 2384 | - |
|
| 2385 | - /** |
|
| 2386 | - * Filter to modify "Add to Favorites" text |
|
| 2387 | - * |
|
| 2388 | - * You can use this filter to rename "Add to Favorites" text to something else. |
|
| 2389 | - * |
|
| 2390 | - * @since 1.0.0 |
|
| 2391 | - * @package GeoDirectory |
|
| 2392 | - */ |
|
| 2393 | - $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
|
|
| 2394 | - |
|
| 2395 | - /** |
|
| 2396 | - * Filter to modify "Favourite" text |
|
| 2397 | - * |
|
| 2398 | - * You can use this filter to rename "Favourite" text to something else. |
|
| 2399 | - * |
|
| 2400 | - * @since 1.0.0 |
|
| 2401 | - * @package GeoDirectory |
|
| 2402 | - */ |
|
| 2403 | - $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
|
|
| 2404 | - |
|
| 2405 | - /** |
|
| 2406 | - * Filter to modify "Unfavorite" text |
|
| 2407 | - * |
|
| 2408 | - * You can use this filter to rename "Unfavorite" text to something else. |
|
| 2409 | - * |
|
| 2410 | - * @since 1.0.0 |
|
| 2411 | - * @package GeoDirectory |
|
| 2412 | - */ |
|
| 2413 | - $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
|
|
| 2414 | - |
|
| 2415 | - /** |
|
| 2416 | - * Filter to modify "Remove from Favorites" text |
|
| 2417 | - * |
|
| 2418 | - * You can use this filter to rename "Remove from Favorites" text to something else. |
|
| 2419 | - * |
|
| 2420 | - * @since 1.0.0 |
|
| 2421 | - * @package GeoDirectory |
|
| 2422 | - */ |
|
| 2423 | - $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
|
|
| 2424 | - |
|
| 2425 | - /** |
|
| 2426 | - * Filter to modify "fa fa-heart" icon |
|
| 2427 | - * |
|
| 2428 | - * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2429 | - * |
|
| 2430 | - * @since 1.0.0 |
|
| 2431 | - * @package GeoDirectory |
|
| 2432 | - */ |
|
| 2433 | - $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2434 | - |
|
| 2435 | - /** |
|
| 2436 | - * Filter to modify "fa fa-heart" icon for "remove from favorites" link |
|
| 2437 | - * |
|
| 2438 | - * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2439 | - * |
|
| 2440 | - * @since 1.0.0 |
|
| 2441 | - * @package GeoDirectory |
|
| 2442 | - */ |
|
| 2443 | - $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');
|
|
| 2444 | - |
|
| 2445 | - $user_meta_data = ''; |
|
| 2446 | - if (isset($current_user->data->ID)) |
|
| 2447 | - $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2448 | - |
|
| 2449 | - if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
|
|
| 2450 | - ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>" ><a |
|
| 2370 | + /** |
|
| 2371 | + * This function would display the html content for add to favorite or remove from favorite. |
|
| 2372 | + * |
|
| 2373 | + * @since 1.0.0 |
|
| 2374 | + * @package GeoDirectory |
|
| 2375 | + * @global object $current_user Current user object. |
|
| 2376 | + * @global object $post The current post object. |
|
| 2377 | + * @param int $user_id The user ID. |
|
| 2378 | + * @param int $post_id The post ID. |
|
| 2379 | + */ |
|
| 2380 | + function geodir_favourite_html($user_id, $post_id) |
|
| 2381 | + {
|
|
| 2382 | + |
|
| 2383 | + global $current_user, $post; |
|
| 2384 | + |
|
| 2385 | + /** |
|
| 2386 | + * Filter to modify "Add to Favorites" text |
|
| 2387 | + * |
|
| 2388 | + * You can use this filter to rename "Add to Favorites" text to something else. |
|
| 2389 | + * |
|
| 2390 | + * @since 1.0.0 |
|
| 2391 | + * @package GeoDirectory |
|
| 2392 | + */ |
|
| 2393 | + $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
|
|
| 2394 | + |
|
| 2395 | + /** |
|
| 2396 | + * Filter to modify "Favourite" text |
|
| 2397 | + * |
|
| 2398 | + * You can use this filter to rename "Favourite" text to something else. |
|
| 2399 | + * |
|
| 2400 | + * @since 1.0.0 |
|
| 2401 | + * @package GeoDirectory |
|
| 2402 | + */ |
|
| 2403 | + $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
|
|
| 2404 | + |
|
| 2405 | + /** |
|
| 2406 | + * Filter to modify "Unfavorite" text |
|
| 2407 | + * |
|
| 2408 | + * You can use this filter to rename "Unfavorite" text to something else. |
|
| 2409 | + * |
|
| 2410 | + * @since 1.0.0 |
|
| 2411 | + * @package GeoDirectory |
|
| 2412 | + */ |
|
| 2413 | + $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
|
|
| 2414 | + |
|
| 2415 | + /** |
|
| 2416 | + * Filter to modify "Remove from Favorites" text |
|
| 2417 | + * |
|
| 2418 | + * You can use this filter to rename "Remove from Favorites" text to something else. |
|
| 2419 | + * |
|
| 2420 | + * @since 1.0.0 |
|
| 2421 | + * @package GeoDirectory |
|
| 2422 | + */ |
|
| 2423 | + $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
|
|
| 2424 | + |
|
| 2425 | + /** |
|
| 2426 | + * Filter to modify "fa fa-heart" icon |
|
| 2427 | + * |
|
| 2428 | + * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2429 | + * |
|
| 2430 | + * @since 1.0.0 |
|
| 2431 | + * @package GeoDirectory |
|
| 2432 | + */ |
|
| 2433 | + $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2434 | + |
|
| 2435 | + /** |
|
| 2436 | + * Filter to modify "fa fa-heart" icon for "remove from favorites" link |
|
| 2437 | + * |
|
| 2438 | + * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2439 | + * |
|
| 2440 | + * @since 1.0.0 |
|
| 2441 | + * @package GeoDirectory |
|
| 2442 | + */ |
|
| 2443 | + $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');
|
|
| 2444 | + |
|
| 2445 | + $user_meta_data = ''; |
|
| 2446 | + if (isset($current_user->data->ID)) |
|
| 2447 | + $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2448 | + |
|
| 2449 | + if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
|
|
| 2450 | + ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>" ><a |
|
| 2451 | 2451 | class="geodir-removetofav-icon" href="javascript:void(0);" |
| 2452 | 2452 | onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');" |
| 2453 | 2453 | title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?> |
| 2454 | 2454 | </a> </span><?php |
| 2455 | 2455 | |
| 2456 | - } else {
|
|
| 2456 | + } else {
|
|
| 2457 | 2457 | |
| 2458 | - if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
|
|
| 2459 | - $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\''; |
|
| 2460 | - } else |
|
| 2461 | - $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
|
|
| 2458 | + if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
|
|
| 2459 | + $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\''; |
|
| 2460 | + } else |
|
| 2461 | + $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
|
|
| 2462 | 2462 | |
| 2463 | - ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon" |
|
| 2463 | + ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon" |
|
| 2464 | 2464 | href="javascript:void(0);" |
| 2465 | 2465 | onclick="<?php echo $script_text;?>" |
| 2466 | 2466 | title="<?php echo $add_favourite_text;?>"><i |
| 2467 | 2467 | class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span> |
| 2468 | 2468 | <?php } |
| 2469 | - } |
|
| 2469 | + } |
|
| 2470 | 2470 | } |
| 2471 | 2471 | |
| 2472 | 2472 | |
@@ -2483,54 +2483,54 @@ discard block |
||
| 2483 | 2483 | function geodir_get_cat_postcount($term = array()) |
| 2484 | 2484 | {
|
| 2485 | 2485 | |
| 2486 | - if (!empty($term)) {
|
|
| 2486 | + if (!empty($term)) {
|
|
| 2487 | 2487 | |
| 2488 | - global $wpdb, $plugin_prefix; |
|
| 2488 | + global $wpdb, $plugin_prefix; |
|
| 2489 | 2489 | |
| 2490 | - $where = ''; |
|
| 2491 | - $join = ''; |
|
| 2492 | - if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {
|
|
| 2493 | - $taxonomy_obj = get_taxonomy($term->taxonomy); |
|
| 2490 | + $where = ''; |
|
| 2491 | + $join = ''; |
|
| 2492 | + if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {
|
|
| 2493 | + $taxonomy_obj = get_taxonomy($term->taxonomy); |
|
| 2494 | 2494 | |
| 2495 | - $post_type = $taxonomy_obj->object_type[0]; |
|
| 2495 | + $post_type = $taxonomy_obj->object_type[0]; |
|
| 2496 | 2496 | |
| 2497 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2497 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2498 | 2498 | |
| 2499 | - /** |
|
| 2500 | - * Filter to modify the 'join' query |
|
| 2501 | - * |
|
| 2502 | - * @since 1.0.0 |
|
| 2503 | - * @package GeoDirectory |
|
| 2504 | - * @param object|array $term category / term object that need to be processed. |
|
| 2505 | - * @param string $join The join query. |
|
| 2506 | - */ |
|
| 2507 | - $join = apply_filters('geodir_cat_post_count_join', $join, $term);
|
|
| 2499 | + /** |
|
| 2500 | + * Filter to modify the 'join' query |
|
| 2501 | + * |
|
| 2502 | + * @since 1.0.0 |
|
| 2503 | + * @package GeoDirectory |
|
| 2504 | + * @param object|array $term category / term object that need to be processed. |
|
| 2505 | + * @param string $join The join query. |
|
| 2506 | + */ |
|
| 2507 | + $join = apply_filters('geodir_cat_post_count_join', $join, $term);
|
|
| 2508 | 2508 | |
| 2509 | - /** |
|
| 2510 | - * Filter to modify the 'where' query |
|
| 2511 | - * |
|
| 2512 | - * @since 1.0.0 |
|
| 2513 | - * @package GeoDirectory |
|
| 2514 | - * @param object|array $term category / term object that need to be processed. |
|
| 2515 | - * @param string $where The where query. |
|
| 2516 | - */ |
|
| 2517 | - $where = apply_filters('geodir_cat_post_count_where', $where, $term);
|
|
| 2509 | + /** |
|
| 2510 | + * Filter to modify the 'where' query |
|
| 2511 | + * |
|
| 2512 | + * @since 1.0.0 |
|
| 2513 | + * @package GeoDirectory |
|
| 2514 | + * @param object|array $term category / term object that need to be processed. |
|
| 2515 | + * @param string $where The where query. |
|
| 2516 | + */ |
|
| 2517 | + $where = apply_filters('geodir_cat_post_count_where', $where, $term);
|
|
| 2518 | 2518 | |
| 2519 | - $count_query = "SELECT count(post_id) FROM |
|
| 2519 | + $count_query = "SELECT count(post_id) FROM |
|
| 2520 | 2520 | " . $table . " as pd " . $join . " |
| 2521 | 2521 | WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;
|
| 2522 | 2522 | |
| 2523 | - $cat_post_count = $wpdb->get_var($count_query); |
|
| 2524 | - if (empty($cat_post_count) || is_wp_error($cat_post_count)) |
|
| 2525 | - $cat_post_count = 0; |
|
| 2523 | + $cat_post_count = $wpdb->get_var($count_query); |
|
| 2524 | + if (empty($cat_post_count) || is_wp_error($cat_post_count)) |
|
| 2525 | + $cat_post_count = 0; |
|
| 2526 | 2526 | |
| 2527 | - return $cat_post_count; |
|
| 2527 | + return $cat_post_count; |
|
| 2528 | 2528 | |
| 2529 | - } else |
|
| 2529 | + } else |
|
| 2530 | 2530 | |
| 2531 | - return $term->count; |
|
| 2532 | - } |
|
| 2533 | - return false; |
|
| 2531 | + return $term->count; |
|
| 2532 | + } |
|
| 2533 | + return false; |
|
| 2534 | 2534 | |
| 2535 | 2535 | } |
| 2536 | 2536 | |
@@ -2543,17 +2543,17 @@ discard block |
||
| 2543 | 2543 | */ |
| 2544 | 2544 | function geodir_allow_post_type_frontend() |
| 2545 | 2545 | {
|
| 2546 | - $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 2546 | + $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 2547 | 2547 | |
| 2548 | - if (!is_admin() && isset($_REQUEST['listing_type']) |
|
| 2549 | - && !empty($geodir_allow_posttype_frontend) |
|
| 2550 | - && !in_array($_REQUEST['listing_type'], $geodir_allow_posttype_frontend) |
|
| 2551 | - ) {
|
|
| 2548 | + if (!is_admin() && isset($_REQUEST['listing_type']) |
|
| 2549 | + && !empty($geodir_allow_posttype_frontend) |
|
| 2550 | + && !in_array($_REQUEST['listing_type'], $geodir_allow_posttype_frontend) |
|
| 2551 | + ) {
|
|
| 2552 | 2552 | |
| 2553 | - wp_redirect(home_url()); |
|
| 2554 | - exit; |
|
| 2553 | + wp_redirect(home_url()); |
|
| 2554 | + exit; |
|
| 2555 | 2555 | |
| 2556 | - } |
|
| 2556 | + } |
|
| 2557 | 2557 | |
| 2558 | 2558 | } |
| 2559 | 2559 | |
@@ -2570,20 +2570,20 @@ discard block |
||
| 2570 | 2570 | */ |
| 2571 | 2571 | function geodir_excerpt_length($length) |
| 2572 | 2572 | {
|
| 2573 | - global $wp_query, $geodir_is_widget_listing; |
|
| 2573 | + global $wp_query, $geodir_is_widget_listing; |
|
| 2574 | 2574 | if ($geodir_is_widget_listing) {
|
| 2575 | 2575 | return $length; |
| 2576 | 2576 | } |
| 2577 | 2577 | |
| 2578 | - if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))
|
|
| 2579 | - $length = get_option('geodir_desc_word_limit');
|
|
| 2580 | - elseif (get_query_var('excerpt_length'))
|
|
| 2581 | - $length = get_query_var('excerpt_length');
|
|
| 2578 | + if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))
|
|
| 2579 | + $length = get_option('geodir_desc_word_limit');
|
|
| 2580 | + elseif (get_query_var('excerpt_length'))
|
|
| 2581 | + $length = get_query_var('excerpt_length');
|
|
| 2582 | 2582 | |
| 2583 | - if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))
|
|
| 2584 | - $length = get_option('geodir_author_desc_word_limit');
|
|
| 2583 | + if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))
|
|
| 2584 | + $length = get_option('geodir_author_desc_word_limit');
|
|
| 2585 | 2585 | |
| 2586 | - return $length; |
|
| 2586 | + return $length; |
|
| 2587 | 2587 | } |
| 2588 | 2588 | |
| 2589 | 2589 | /** |
@@ -2598,13 +2598,13 @@ discard block |
||
| 2598 | 2598 | */ |
| 2599 | 2599 | function geodir_excerpt_more($more) |
| 2600 | 2600 | {
|
| 2601 | - global $post; |
|
| 2602 | - $all_postypes = geodir_get_posttypes(); |
|
| 2603 | - if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
|
|
| 2604 | - return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>'; |
|
| 2605 | - } |
|
| 2601 | + global $post; |
|
| 2602 | + $all_postypes = geodir_get_posttypes(); |
|
| 2603 | + if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
|
|
| 2604 | + return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>'; |
|
| 2605 | + } |
|
| 2606 | 2606 | |
| 2607 | - return $more; |
|
| 2607 | + return $more; |
|
| 2608 | 2608 | } |
| 2609 | 2609 | |
| 2610 | 2610 | |
@@ -2621,63 +2621,63 @@ discard block |
||
| 2621 | 2621 | */ |
| 2622 | 2622 | function geodir_update_markers_oncatedit($term_id, $tt_id, $taxonomy) |
| 2623 | 2623 | {
|
| 2624 | - global $plugin_prefix, $wpdb; |
|
| 2624 | + global $plugin_prefix, $wpdb; |
|
| 2625 | 2625 | |
| 2626 | - $gd_taxonomies = geodir_get_taxonomies(); |
|
| 2626 | + $gd_taxonomies = geodir_get_taxonomies(); |
|
| 2627 | 2627 | |
| 2628 | - if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
|
|
| 2628 | + if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
|
|
| 2629 | 2629 | |
| 2630 | - $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy); |
|
| 2631 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 2630 | + $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy); |
|
| 2631 | + $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 2632 | 2632 | |
| 2633 | - $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']); |
|
| 2634 | - $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png'; |
|
| 2633 | + $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']); |
|
| 2634 | + $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png'; |
|
| 2635 | 2635 | |
| 2636 | - $posts = $wpdb->get_results( |
|
| 2637 | - $wpdb->prepare( |
|
| 2638 | - "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ", |
|
| 2639 | - array($term_id, $taxonomy) |
|
| 2640 | - ) |
|
| 2641 | - ); |
|
| 2636 | + $posts = $wpdb->get_results( |
|
| 2637 | + $wpdb->prepare( |
|
| 2638 | + "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ", |
|
| 2639 | + array($term_id, $taxonomy) |
|
| 2640 | + ) |
|
| 2641 | + ); |
|
| 2642 | 2642 | |
| 2643 | - if (!empty($posts)): |
|
| 2644 | - foreach ($posts as $post_obj) {
|
|
| 2643 | + if (!empty($posts)): |
|
| 2644 | + foreach ($posts as $post_obj) {
|
|
| 2645 | 2645 | |
| 2646 | - $lat = $post_obj->post_latitude; |
|
| 2647 | - $lng = $post_obj->post_longitude; |
|
| 2646 | + $lat = $post_obj->post_latitude; |
|
| 2647 | + $lng = $post_obj->post_longitude; |
|
| 2648 | 2648 | |
| 2649 | - $json = '{';
|
|
| 2650 | - $json .= '"id":"' . $post_obj->post_id . '",'; |
|
| 2651 | - $json .= '"lat_pos": "' . $lat . '",'; |
|
| 2652 | - $json .= '"long_pos": "' . $lng . '",'; |
|
| 2653 | - $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",'; |
|
| 2654 | - $json .= '"icon":"' . $term_icon . '",'; |
|
| 2655 | - $json .= '"group":"catgroup' . $term_id . '"'; |
|
| 2656 | - $json .= '}'; |
|
| 2649 | + $json = '{';
|
|
| 2650 | + $json .= '"id":"' . $post_obj->post_id . '",'; |
|
| 2651 | + $json .= '"lat_pos": "' . $lat . '",'; |
|
| 2652 | + $json .= '"long_pos": "' . $lng . '",'; |
|
| 2653 | + $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",'; |
|
| 2654 | + $json .= '"icon":"' . $term_icon . '",'; |
|
| 2655 | + $json .= '"group":"catgroup' . $term_id . '"'; |
|
| 2656 | + $json .= '}'; |
|
| 2657 | 2657 | |
| 2658 | - if ($post_obj->default_category == $term_id) {
|
|
| 2658 | + if ($post_obj->default_category == $term_id) {
|
|
| 2659 | 2659 | |
| 2660 | - $wpdb->query( |
|
| 2661 | - $wpdb->prepare( |
|
| 2662 | - "UPDATE " . $table . " SET marker_json = %s where post_id = %d", |
|
| 2663 | - array($json, $post_obj->post_id) |
|
| 2664 | - ) |
|
| 2665 | - ); |
|
| 2666 | - } |
|
| 2660 | + $wpdb->query( |
|
| 2661 | + $wpdb->prepare( |
|
| 2662 | + "UPDATE " . $table . " SET marker_json = %s where post_id = %d", |
|
| 2663 | + array($json, $post_obj->post_id) |
|
| 2664 | + ) |
|
| 2665 | + ); |
|
| 2666 | + } |
|
| 2667 | 2667 | |
| 2668 | - $wpdb->query( |
|
| 2669 | - $wpdb->prepare( |
|
| 2670 | - "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d", |
|
| 2671 | - array($json, $post_obj->post_id, $term_id) |
|
| 2672 | - ) |
|
| 2673 | - ); |
|
| 2668 | + $wpdb->query( |
|
| 2669 | + $wpdb->prepare( |
|
| 2670 | + "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d", |
|
| 2671 | + array($json, $post_obj->post_id, $term_id) |
|
| 2672 | + ) |
|
| 2673 | + ); |
|
| 2674 | 2674 | |
| 2675 | - } |
|
| 2675 | + } |
|
| 2676 | 2676 | |
| 2677 | 2677 | |
| 2678 | - endif; |
|
| 2678 | + endif; |
|
| 2679 | 2679 | |
| 2680 | - } |
|
| 2680 | + } |
|
| 2681 | 2681 | |
| 2682 | 2682 | } |
| 2683 | 2683 | |
@@ -2691,14 +2691,14 @@ discard block |
||
| 2691 | 2691 | */ |
| 2692 | 2692 | function geodir_get_listing_author($listing_id = '') |
| 2693 | 2693 | {
|
| 2694 | - if ($listing_id == '') {
|
|
| 2695 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 2696 | - $listing_id = $_REQUEST['pid']; |
|
| 2697 | - } |
|
| 2698 | - } |
|
| 2699 | - $listing = get_post(strip_tags($listing_id)); |
|
| 2700 | - $listing_author_id = $listing->post_author; |
|
| 2701 | - return $listing_author_id; |
|
| 2694 | + if ($listing_id == '') {
|
|
| 2695 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 2696 | + $listing_id = $_REQUEST['pid']; |
|
| 2697 | + } |
|
| 2698 | + } |
|
| 2699 | + $listing = get_post(strip_tags($listing_id)); |
|
| 2700 | + $listing_author_id = $listing->post_author; |
|
| 2701 | + return $listing_author_id; |
|
| 2702 | 2702 | } |
| 2703 | 2703 | |
| 2704 | 2704 | |
@@ -2713,11 +2713,11 @@ discard block |
||
| 2713 | 2713 | */ |
| 2714 | 2714 | function geodir_lisiting_belong_to_user($listing_id, $user_id) |
| 2715 | 2715 | {
|
| 2716 | - $listing_author_id = geodir_get_listing_author($listing_id); |
|
| 2717 | - if ($listing_author_id == $user_id) |
|
| 2718 | - return true; |
|
| 2719 | - else |
|
| 2720 | - return false; |
|
| 2716 | + $listing_author_id = geodir_get_listing_author($listing_id); |
|
| 2717 | + if ($listing_author_id == $user_id) |
|
| 2718 | + return true; |
|
| 2719 | + else |
|
| 2720 | + return false; |
|
| 2721 | 2721 | |
| 2722 | 2722 | } |
| 2723 | 2723 | |
@@ -2733,17 +2733,17 @@ discard block |
||
| 2733 | 2733 | */ |
| 2734 | 2734 | function geodir_listing_belong_to_current_user($listing_id = '', $exclude_admin = true) |
| 2735 | 2735 | {
|
| 2736 | - global $current_user; |
|
| 2737 | - if ($exclude_admin) {
|
|
| 2738 | - foreach ($current_user->caps as $key => $caps) {
|
|
| 2739 | - if (geodir_strtolower($key) == 'administrator') {
|
|
| 2740 | - return true; |
|
| 2741 | - break; |
|
| 2742 | - } |
|
| 2743 | - } |
|
| 2744 | - } |
|
| 2745 | - |
|
| 2746 | - return geodir_lisiting_belong_to_user($listing_id, $current_user->ID); |
|
| 2736 | + global $current_user; |
|
| 2737 | + if ($exclude_admin) {
|
|
| 2738 | + foreach ($current_user->caps as $key => $caps) {
|
|
| 2739 | + if (geodir_strtolower($key) == 'administrator') {
|
|
| 2740 | + return true; |
|
| 2741 | + break; |
|
| 2742 | + } |
|
| 2743 | + } |
|
| 2744 | + } |
|
| 2745 | + |
|
| 2746 | + return geodir_lisiting_belong_to_user($listing_id, $current_user->ID); |
|
| 2747 | 2747 | } |
| 2748 | 2748 | |
| 2749 | 2749 | |
@@ -2759,17 +2759,17 @@ discard block |
||
| 2759 | 2759 | function geodir_only_supportable_attachments_remove($file) |
| 2760 | 2760 | {
|
| 2761 | 2761 | |
| 2762 | - global $wpdb; |
|
| 2762 | + global $wpdb; |
|
| 2763 | 2763 | |
| 2764 | - $matches = array(); |
|
| 2764 | + $matches = array(); |
|
| 2765 | 2765 | |
| 2766 | - $pattern = '/-\d+x\d+\./'; |
|
| 2767 | - preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE); |
|
| 2766 | + $pattern = '/-\d+x\d+\./'; |
|
| 2767 | + preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE); |
|
| 2768 | 2768 | |
| 2769 | - if (empty($matches)) |
|
| 2770 | - return ''; |
|
| 2771 | - else |
|
| 2772 | - return $file; |
|
| 2769 | + if (empty($matches)) |
|
| 2770 | + return ''; |
|
| 2771 | + else |
|
| 2772 | + return $file; |
|
| 2773 | 2773 | |
| 2774 | 2774 | } |
| 2775 | 2775 | |
@@ -2786,78 +2786,78 @@ discard block |
||
| 2786 | 2786 | function geodir_set_wp_featured_image($post_id) |
| 2787 | 2787 | {
|
| 2788 | 2788 | |
| 2789 | - global $wpdb, $plugin_prefix; |
|
| 2790 | - $uploads = wp_upload_dir(); |
|
| 2789 | + global $wpdb, $plugin_prefix; |
|
| 2790 | + $uploads = wp_upload_dir(); |
|
| 2791 | 2791 | // print_r($uploads ) ; |
| 2792 | - $post_first_image = $wpdb->get_results( |
|
| 2793 | - $wpdb->prepare( |
|
| 2794 | - "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1 ", array($post_id) |
|
| 2795 | - ) |
|
| 2796 | - ); |
|
| 2792 | + $post_first_image = $wpdb->get_results( |
|
| 2793 | + $wpdb->prepare( |
|
| 2794 | + "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1 ", array($post_id) |
|
| 2795 | + ) |
|
| 2796 | + ); |
|
| 2797 | 2797 | |
| 2798 | - $old_attachment_name = ''; |
|
| 2799 | - $post_thumbnail_id = ''; |
|
| 2800 | - if (has_post_thumbnail($post_id)) {
|
|
| 2798 | + $old_attachment_name = ''; |
|
| 2799 | + $post_thumbnail_id = ''; |
|
| 2800 | + if (has_post_thumbnail($post_id)) {
|
|
| 2801 | 2801 | |
| 2802 | - if (has_post_thumbnail($post_id)) {
|
|
| 2802 | + if (has_post_thumbnail($post_id)) {
|
|
| 2803 | 2803 | |
| 2804 | - $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2804 | + $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2805 | 2805 | |
| 2806 | - $old_attachment_name = basename(get_attached_file($post_thumbnail_id)); |
|
| 2806 | + $old_attachment_name = basename(get_attached_file($post_thumbnail_id)); |
|
| 2807 | 2807 | |
| 2808 | - } |
|
| 2809 | - } |
|
| 2810 | - |
|
| 2811 | - if (!empty($post_first_image)) {
|
|
| 2808 | + } |
|
| 2809 | + } |
|
| 2812 | 2810 | |
| 2813 | - $post_type = get_post_type($post_id); |
|
| 2811 | + if (!empty($post_first_image)) {
|
|
| 2814 | 2812 | |
| 2815 | - $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2813 | + $post_type = get_post_type($post_id); |
|
| 2816 | 2814 | |
| 2817 | - $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
|
|
| 2815 | + $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2818 | 2816 | |
| 2819 | - $new_attachment_name = basename($post_first_image[0]->file); |
|
| 2817 | + $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
|
|
| 2820 | 2818 | |
| 2821 | - if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {
|
|
| 2819 | + $new_attachment_name = basename($post_first_image[0]->file); |
|
| 2822 | 2820 | |
| 2823 | - if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
|
|
| 2821 | + if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {
|
|
| 2824 | 2822 | |
| 2825 | - add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');
|
|
| 2823 | + if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
|
|
| 2826 | 2824 | |
| 2827 | - wp_delete_attachment($post_thumbnail_id); |
|
| 2825 | + add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');
|
|
| 2828 | 2826 | |
| 2829 | - } |
|
| 2830 | - $filename = $uploads['basedir'] . $post_first_image[0]->file; |
|
| 2827 | + wp_delete_attachment($post_thumbnail_id); |
|
| 2831 | 2828 | |
| 2832 | - $attachment = array( |
|
| 2833 | - 'post_mime_type' => $post_first_image[0]->mime_type, |
|
| 2834 | - 'guid' => $uploads['baseurl'] . $post_first_image[0]->file, |
|
| 2835 | - 'post_parent' => $post_id, |
|
| 2836 | - 'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
|
|
| 2837 | - 'post_content' => '' |
|
| 2838 | - ); |
|
| 2829 | + } |
|
| 2830 | + $filename = $uploads['basedir'] . $post_first_image[0]->file; |
|
| 2831 | + |
|
| 2832 | + $attachment = array( |
|
| 2833 | + 'post_mime_type' => $post_first_image[0]->mime_type, |
|
| 2834 | + 'guid' => $uploads['baseurl'] . $post_first_image[0]->file, |
|
| 2835 | + 'post_parent' => $post_id, |
|
| 2836 | + 'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
|
|
| 2837 | + 'post_content' => '' |
|
| 2838 | + ); |
|
| 2839 | 2839 | |
| 2840 | 2840 | |
| 2841 | - $id = wp_insert_attachment($attachment, $filename, $post_id); |
|
| 2841 | + $id = wp_insert_attachment($attachment, $filename, $post_id); |
|
| 2842 | 2842 | |
| 2843 | - if (!is_wp_error($id)) {
|
|
| 2843 | + if (!is_wp_error($id)) {
|
|
| 2844 | 2844 | |
| 2845 | - set_post_thumbnail($post_id, $id); |
|
| 2845 | + set_post_thumbnail($post_id, $id); |
|
| 2846 | 2846 | |
| 2847 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 2848 | - wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename)); |
|
| 2847 | + require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 2848 | + wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename)); |
|
| 2849 | 2849 | |
| 2850 | - } |
|
| 2850 | + } |
|
| 2851 | 2851 | |
| 2852 | - } |
|
| 2852 | + } |
|
| 2853 | 2853 | |
| 2854 | - } else {
|
|
| 2855 | - //set_post_thumbnail($post_id,-1); |
|
| 2854 | + } else {
|
|
| 2855 | + //set_post_thumbnail($post_id,-1); |
|
| 2856 | 2856 | |
| 2857 | - if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) |
|
| 2858 | - wp_delete_attachment($post_thumbnail_id); |
|
| 2857 | + if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) |
|
| 2858 | + wp_delete_attachment($post_thumbnail_id); |
|
| 2859 | 2859 | |
| 2860 | - } |
|
| 2860 | + } |
|
| 2861 | 2861 | } |
| 2862 | 2862 | |
| 2863 | 2863 | |
@@ -2872,53 +2872,53 @@ discard block |
||
| 2872 | 2872 | */ |
| 2873 | 2873 | function gd_copy_original_translation() |
| 2874 | 2874 | {
|
| 2875 | - if (function_exists('icl_object_id')) {
|
|
| 2876 | - global $wpdb, $table_prefix, $plugin_prefix; |
|
| 2877 | - $post_id = absint($_POST['post_id']); |
|
| 2878 | - $upload_dir = wp_upload_dir(); |
|
| 2879 | - $post_type = get_post_type($_POST['post_id']); |
|
| 2880 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2881 | - |
|
| 2882 | - $post_arr = $wpdb->get_results($wpdb->prepare( |
|
| 2883 | - "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1", |
|
| 2884 | - array($post_id) |
|
| 2885 | - ) |
|
| 2886 | - , ARRAY_A); |
|
| 2887 | - |
|
| 2888 | - $arrImages = $wpdb->get_results( |
|
| 2889 | - $wpdb->prepare( |
|
| 2890 | - "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ", |
|
| 2891 | - array('%image%', $post_id)
|
|
| 2892 | - ) |
|
| 2893 | - ); |
|
| 2894 | - if ($arrImages) {
|
|
| 2895 | - $image_arr = array(); |
|
| 2896 | - foreach ($arrImages as $img) {
|
|
| 2897 | - $image_arr[] = $upload_dir['baseurl'] . $img->file; |
|
| 2898 | - } |
|
| 2899 | - $comma_separated = implode(",", $image_arr);
|
|
| 2900 | - $post_arr[0]['post_images'] = $comma_separated; |
|
| 2901 | - } |
|
| 2902 | - |
|
| 2903 | - |
|
| 2904 | - $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category']; |
|
| 2905 | - $cat_arr = array_filter(explode(",", $cats));
|
|
| 2906 | - $trans_cat = array(); |
|
| 2907 | - foreach ($cat_arr as $cat) {
|
|
| 2908 | - $trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'] . 'category', false); |
|
| 2909 | - } |
|
| 2910 | - |
|
| 2911 | - |
|
| 2912 | - $post_arr[0]['categories'] = array_filter($trans_cat); |
|
| 2875 | + if (function_exists('icl_object_id')) {
|
|
| 2876 | + global $wpdb, $table_prefix, $plugin_prefix; |
|
| 2877 | + $post_id = absint($_POST['post_id']); |
|
| 2878 | + $upload_dir = wp_upload_dir(); |
|
| 2879 | + $post_type = get_post_type($_POST['post_id']); |
|
| 2880 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2881 | + |
|
| 2882 | + $post_arr = $wpdb->get_results($wpdb->prepare( |
|
| 2883 | + "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1", |
|
| 2884 | + array($post_id) |
|
| 2885 | + ) |
|
| 2886 | + , ARRAY_A); |
|
| 2887 | + |
|
| 2888 | + $arrImages = $wpdb->get_results( |
|
| 2889 | + $wpdb->prepare( |
|
| 2890 | + "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ", |
|
| 2891 | + array('%image%', $post_id)
|
|
| 2892 | + ) |
|
| 2893 | + ); |
|
| 2894 | + if ($arrImages) {
|
|
| 2895 | + $image_arr = array(); |
|
| 2896 | + foreach ($arrImages as $img) {
|
|
| 2897 | + $image_arr[] = $upload_dir['baseurl'] . $img->file; |
|
| 2898 | + } |
|
| 2899 | + $comma_separated = implode(",", $image_arr);
|
|
| 2900 | + $post_arr[0]['post_images'] = $comma_separated; |
|
| 2901 | + } |
|
| 2902 | + |
|
| 2903 | + |
|
| 2904 | + $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category']; |
|
| 2905 | + $cat_arr = array_filter(explode(",", $cats));
|
|
| 2906 | + $trans_cat = array(); |
|
| 2907 | + foreach ($cat_arr as $cat) {
|
|
| 2908 | + $trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'] . 'category', false); |
|
| 2909 | + } |
|
| 2910 | + |
|
| 2911 | + |
|
| 2912 | + $post_arr[0]['categories'] = array_filter($trans_cat); |
|
| 2913 | 2913 | //print_r($image_arr); |
| 2914 | - //print_r($arrImages); |
|
| 2915 | - //echo $_REQUEST['lang']; |
|
| 2914 | + //print_r($arrImages); |
|
| 2915 | + //echo $_REQUEST['lang']; |
|
| 2916 | 2916 | //print_r($post_arr); |
| 2917 | 2917 | //print_r($trans_cat); |
| 2918 | - echo json_encode($post_arr[0]); |
|
| 2918 | + echo json_encode($post_arr[0]); |
|
| 2919 | 2919 | |
| 2920 | - } |
|
| 2921 | - die(); |
|
| 2920 | + } |
|
| 2921 | + die(); |
|
| 2922 | 2922 | } |
| 2923 | 2923 | |
| 2924 | 2924 | |
@@ -2938,54 +2938,54 @@ discard block |
||
| 2938 | 2938 | function geodir_get_custom_fields_type($listing_type = '') |
| 2939 | 2939 | {
|
| 2940 | 2940 | |
| 2941 | - global $wpdb; |
|
| 2941 | + global $wpdb; |
|
| 2942 | 2942 | |
| 2943 | - if ($listing_type == '') |
|
| 2944 | - $listing_type = 'gd_place'; |
|
| 2943 | + if ($listing_type == '') |
|
| 2944 | + $listing_type = 'gd_place'; |
|
| 2945 | 2945 | |
| 2946 | - $fields_info = array(); |
|
| 2946 | + $fields_info = array(); |
|
| 2947 | 2947 | |
| 2948 | - $get_data = $wpdb->get_results( |
|
| 2949 | - $wpdb->prepare( |
|
| 2950 | - "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'", |
|
| 2951 | - array($listing_type) |
|
| 2952 | - ) |
|
| 2953 | - ); |
|
| 2948 | + $get_data = $wpdb->get_results( |
|
| 2949 | + $wpdb->prepare( |
|
| 2950 | + "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'", |
|
| 2951 | + array($listing_type) |
|
| 2952 | + ) |
|
| 2953 | + ); |
|
| 2954 | 2954 | |
| 2955 | - if (!empty($get_data)) {
|
|
| 2955 | + if (!empty($get_data)) {
|
|
| 2956 | 2956 | |
| 2957 | - foreach ($get_data as $data) {
|
|
| 2957 | + foreach ($get_data as $data) {
|
|
| 2958 | 2958 | |
| 2959 | - if ($data->field_type == 'address') {
|
|
| 2959 | + if ($data->field_type == 'address') {
|
|
| 2960 | 2960 | |
| 2961 | - $extra_fields = unserialize($data->extra_fields); |
|
| 2961 | + $extra_fields = unserialize($data->extra_fields); |
|
| 2962 | 2962 | |
| 2963 | - $prefix = $data->htmlvar_name . '_'; |
|
| 2963 | + $prefix = $data->htmlvar_name . '_'; |
|
| 2964 | 2964 | |
| 2965 | - $fields_info[$prefix . 'address'] = $data->field_type; |
|
| 2965 | + $fields_info[$prefix . 'address'] = $data->field_type; |
|
| 2966 | 2966 | |
| 2967 | - if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) |
|
| 2968 | - $fields_info[$prefix . 'zip'] = $data->field_type; |
|
| 2967 | + if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) |
|
| 2968 | + $fields_info[$prefix . 'zip'] = $data->field_type; |
|
| 2969 | 2969 | |
| 2970 | - } else {
|
|
| 2970 | + } else {
|
|
| 2971 | 2971 | |
| 2972 | - $fields_info[$data->htmlvar_name] = $data->field_type; |
|
| 2972 | + $fields_info[$data->htmlvar_name] = $data->field_type; |
|
| 2973 | 2973 | |
| 2974 | - } |
|
| 2974 | + } |
|
| 2975 | 2975 | |
| 2976 | - } |
|
| 2976 | + } |
|
| 2977 | 2977 | |
| 2978 | - } |
|
| 2978 | + } |
|
| 2979 | 2979 | |
| 2980 | - /** |
|
| 2981 | - * Filter to modify custom fields info using listing post type. |
|
| 2982 | - * |
|
| 2983 | - * @since 1.0.0 |
|
| 2984 | - * @package GeoDirectory |
|
| 2985 | - * @return array $fields_info Custom fields info. |
|
| 2986 | - * @param string $listing_type The listing post type. |
|
| 2987 | - */ |
|
| 2988 | - return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);
|
|
| 2980 | + /** |
|
| 2981 | + * Filter to modify custom fields info using listing post type. |
|
| 2982 | + * |
|
| 2983 | + * @since 1.0.0 |
|
| 2984 | + * @package GeoDirectory |
|
| 2985 | + * @return array $fields_info Custom fields info. |
|
| 2986 | + * @param string $listing_type The listing post type. |
|
| 2987 | + */ |
|
| 2988 | + return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);
|
|
| 2989 | 2989 | } |
| 2990 | 2990 | |
| 2991 | 2991 | |
@@ -3000,58 +3000,58 @@ discard block |
||
| 3000 | 3000 | */ |
| 3001 | 3001 | function geodir_function_post_updated($post_ID, $post_after, $post_before) |
| 3002 | 3002 | {
|
| 3003 | - $post_type = get_post_type($post_ID); |
|
| 3003 | + $post_type = get_post_type($post_ID); |
|
| 3004 | 3004 | |
| 3005 | - if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {
|
|
| 3006 | - // send notification to client when post moves from draft to publish |
|
| 3007 | - 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')) {
|
|
| 3008 | - $post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL; |
|
| 3009 | - $post_author_data = get_userdata($post_author_id); |
|
| 3005 | + if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {
|
|
| 3006 | + // send notification to client when post moves from draft to publish |
|
| 3007 | + 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')) {
|
|
| 3008 | + $post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL; |
|
| 3009 | + $post_author_data = get_userdata($post_author_id); |
|
| 3010 | 3010 | |
| 3011 | - $to_name = geodir_get_client_name($post_author_id); |
|
| 3011 | + $to_name = geodir_get_client_name($post_author_id); |
|
| 3012 | 3012 | |
| 3013 | - $from_email = geodir_get_site_email_id(); |
|
| 3014 | - $from_name = get_site_emailName(); |
|
| 3015 | - $to_email = $post_author_data->user_email; |
|
| 3013 | + $from_email = geodir_get_site_email_id(); |
|
| 3014 | + $from_name = get_site_emailName(); |
|
| 3015 | + $to_email = $post_author_data->user_email; |
|
| 3016 | 3016 | |
| 3017 | - if (!is_email($to_email) && !empty($post_author_data->user_email)) {
|
|
| 3018 | - $to_email = $post_author_data->user_email; |
|
| 3019 | - } |
|
| 3017 | + if (!is_email($to_email) && !empty($post_author_data->user_email)) {
|
|
| 3018 | + $to_email = $post_author_data->user_email; |
|
| 3019 | + } |
|
| 3020 | 3020 | |
| 3021 | - $message_type = 'listing_published'; |
|
| 3021 | + $message_type = 'listing_published'; |
|
| 3022 | 3022 | |
| 3023 | - if (get_option('geodir_post_published_email_subject') == '') {
|
|
| 3024 | - update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));
|
|
| 3025 | - } |
|
| 3023 | + if (get_option('geodir_post_published_email_subject') == '') {
|
|
| 3024 | + update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));
|
|
| 3025 | + } |
|
| 3026 | 3026 | |
| 3027 | - if (get_option('geodir_post_published_email_content') == '') {
|
|
| 3028 | - 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'));
|
|
| 3029 | - } |
|
| 3027 | + if (get_option('geodir_post_published_email_content') == '') {
|
|
| 3028 | + 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'));
|
|
| 3029 | + } |
|
| 3030 | 3030 | |
| 3031 | - /** |
|
| 3032 | - * Called before sending the email when listing gets published. |
|
| 3033 | - * |
|
| 3034 | - * @since 1.0.0 |
|
| 3035 | - * @package GeoDirectory |
|
| 3036 | - * @param object $post_after The post object after update. |
|
| 3037 | - * @param object $post_before The post object before update. |
|
| 3038 | - */ |
|
| 3039 | - do_action('geodir_before_listing_published_email', $post_after, $post_before);
|
|
| 3040 | - if (is_email($to_email)) {
|
|
| 3041 | - geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID); |
|
| 3042 | - } |
|
| 3031 | + /** |
|
| 3032 | + * Called before sending the email when listing gets published. |
|
| 3033 | + * |
|
| 3034 | + * @since 1.0.0 |
|
| 3035 | + * @package GeoDirectory |
|
| 3036 | + * @param object $post_after The post object after update. |
|
| 3037 | + * @param object $post_before The post object before update. |
|
| 3038 | + */ |
|
| 3039 | + do_action('geodir_before_listing_published_email', $post_after, $post_before);
|
|
| 3040 | + if (is_email($to_email)) {
|
|
| 3041 | + geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID); |
|
| 3042 | + } |
|
| 3043 | 3043 | |
| 3044 | - /** |
|
| 3045 | - * Called after sending the email when listing gets published. |
|
| 3046 | - * |
|
| 3047 | - * @since 1.0.0 |
|
| 3048 | - * @package GeoDirectory |
|
| 3049 | - * @param object $post_after The post object after update. |
|
| 3050 | - * @param object $post_before The post object before update. |
|
| 3051 | - */ |
|
| 3052 | - do_action('geodir_after_listing_published_email', $post_after, $post_before);
|
|
| 3053 | - } |
|
| 3054 | - } |
|
| 3044 | + /** |
|
| 3045 | + * Called after sending the email when listing gets published. |
|
| 3046 | + * |
|
| 3047 | + * @since 1.0.0 |
|
| 3048 | + * @package GeoDirectory |
|
| 3049 | + * @param object $post_after The post object after update. |
|
| 3050 | + * @param object $post_before The post object before update. |
|
| 3051 | + */ |
|
| 3052 | + do_action('geodir_after_listing_published_email', $post_after, $post_before);
|
|
| 3053 | + } |
|
| 3054 | + } |
|
| 3055 | 3055 | } |
| 3056 | 3056 | |
| 3057 | 3057 | add_action('wp_head', 'geodir_fb_like_thumbnail');
|
@@ -3065,14 +3065,14 @@ discard block |
||
| 3065 | 3065 | */ |
| 3066 | 3066 | function geodir_fb_like_thumbnail(){
|
| 3067 | 3067 | |
| 3068 | - // return if not a single post |
|
| 3069 | - if(!is_single()){return;}
|
|
| 3068 | + // return if not a single post |
|
| 3069 | + if(!is_single()){return;}
|
|
| 3070 | 3070 | |
| 3071 | - global $post; |
|
| 3072 | - if(isset($post->featured_image) && $post->featured_image){
|
|
| 3073 | - $upload_dir = wp_upload_dir(); |
|
| 3074 | - $thumb = $upload_dir['baseurl'].$post->featured_image; |
|
| 3075 | - echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n"; |
|
| 3071 | + global $post; |
|
| 3072 | + if(isset($post->featured_image) && $post->featured_image){
|
|
| 3073 | + $upload_dir = wp_upload_dir(); |
|
| 3074 | + $thumb = $upload_dir['baseurl'].$post->featured_image; |
|
| 3075 | + echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n"; |
|
| 3076 | 3076 | |
| 3077 | - } |
|
| 3077 | + } |
|
| 3078 | 3078 | } |
| 3079 | 3079 | \ No newline at end of file |
@@ -26,11 +26,11 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | if (!isset($default_cat) || empty($default_cat)) {
|
| 28 | 28 | $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : ''; |
| 29 | - }else{
|
|
| 30 | - if(!is_int($default_cat)){
|
|
| 29 | + } else {
|
|
| 30 | + if (!is_int($default_cat)) {
|
|
| 31 | 31 | $category = get_term_by('name', $default_cat, $taxonomy);
|
| 32 | - if(isset($category->term_id)){
|
|
| 33 | - $default_cat = $category->term_id; |
|
| 32 | + if (isset($category->term_id)) {
|
|
| 33 | + $default_cat = $category->term_id; |
|
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | |
| 59 | 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 | |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | $send_post_submit_mail = false; |
| 228 | 228 | |
| 229 | 229 | // unhook this function so it doesn't loop infinitely |
| 230 | - remove_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 230 | + remove_action('save_post', 'geodir_post_information_save', 10, 2);
|
|
| 231 | 231 | |
| 232 | 232 | if (isset($request_info['pid']) && $request_info['pid'] != '') {
|
| 233 | 233 | $post['ID'] = $request_info['pid']; |
@@ -251,13 +251,13 @@ discard block |
||
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | // re-hook this function |
| 254 | - add_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 254 | + add_action('save_post', 'geodir_post_information_save', 10, 2);
|
|
| 255 | 255 | |
| 256 | 256 | $post_tags = ''; |
| 257 | 257 | if (!isset($request_info['post_tags'])) {
|
| 258 | 258 | |
| 259 | 259 | $post_type = $request_info['listing_type']; |
| 260 | - $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));
|
|
| 260 | + $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type.'_tags', array('fields' => 'names')));
|
|
| 261 | 261 | |
| 262 | 262 | } |
| 263 | 263 | |
@@ -275,13 +275,13 @@ discard block |
||
| 275 | 275 | $payment_info = array(); |
| 276 | 276 | $package_info = array(); |
| 277 | 277 | |
| 278 | - $package_info = (array)geodir_post_package_info($package_info, $post); |
|
| 278 | + $package_info = (array) geodir_post_package_info($package_info, $post); |
|
| 279 | 279 | |
| 280 | 280 | $post_package_id = geodir_get_post_meta($last_post_id, 'package_id'); |
| 281 | 281 | |
| 282 | 282 | if (!empty($package_info) && !$post_package_id) {
|
| 283 | 283 | if (isset($package_info['days']) && $package_info['days'] != 0) {
|
| 284 | - $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));
|
|
| 284 | + $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['days']." days"));
|
|
| 285 | 285 | } else {
|
| 286 | 286 | $payment_info['expire_date'] = 'Never'; |
| 287 | 287 | } |
@@ -302,8 +302,8 @@ discard block |
||
| 302 | 302 | $extrafields = $val['extra_fields']; |
| 303 | 303 | |
| 304 | 304 | if (trim($type) == 'address') {
|
| 305 | - $prefix = $name . '_'; |
|
| 306 | - $address = $prefix . 'address'; |
|
| 305 | + $prefix = $name.'_'; |
|
| 306 | + $address = $prefix.'address'; |
|
| 307 | 307 | |
| 308 | 308 | if (isset($request_info[$address]) && $request_info[$address] != '') {
|
| 309 | 309 | $gd_post_info[$address] = wp_slash($request_info[$address]); |
@@ -313,59 +313,59 @@ discard block |
||
| 313 | 313 | $extrafields = unserialize($extrafields); |
| 314 | 314 | |
| 315 | 315 | |
| 316 | - if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {
|
|
| 316 | + if (!isset($request_info[$prefix.'city']) || $request_info[$prefix.'city'] == '') {
|
|
| 317 | 317 | |
| 318 | 318 | $location_result = geodir_get_default_location(); |
| 319 | 319 | |
| 320 | - $gd_post_info[$prefix . 'city'] = $location_result->city; |
|
| 321 | - $gd_post_info[$prefix . 'region'] = $location_result->region; |
|
| 322 | - $gd_post_info[$prefix . 'country'] = $location_result->country; |
|
| 320 | + $gd_post_info[$prefix.'city'] = $location_result->city; |
|
| 321 | + $gd_post_info[$prefix.'region'] = $location_result->region; |
|
| 322 | + $gd_post_info[$prefix.'country'] = $location_result->country; |
|
| 323 | 323 | |
| 324 | - $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 324 | + $gd_post_info['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // set all overall post location |
|
| 325 | 325 | |
| 326 | 326 | } else {
|
| 327 | 327 | |
| 328 | - $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city']; |
|
| 329 | - $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region']; |
|
| 330 | - $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country']; |
|
| 328 | + $gd_post_info[$prefix.'city'] = $request_info[$prefix.'city']; |
|
| 329 | + $gd_post_info[$prefix.'region'] = $request_info[$prefix.'region']; |
|
| 330 | + $gd_post_info[$prefix.'country'] = $request_info[$prefix.'country']; |
|
| 331 | 331 | |
| 332 | 332 | //----------set post locations when import dummy data------- |
| 333 | 333 | $location_result = geodir_get_default_location(); |
| 334 | 334 | |
| 335 | - $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 335 | + $gd_post_info['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // set all overall post location |
|
| 336 | 336 | //----------------------------------------------------------------- |
| 337 | 337 | |
| 338 | 338 | } |
| 339 | 339 | |
| 340 | 340 | |
| 341 | - if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {
|
|
| 342 | - $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip']; |
|
| 341 | + if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix.'zip'])) {
|
|
| 342 | + $gd_post_info[$prefix.'zip'] = $request_info[$prefix.'zip']; |
|
| 343 | 343 | } |
| 344 | 344 | |
| 345 | 345 | |
| 346 | 346 | if (isset($extrafields['show_map']) && $extrafields['show_map']) {
|
| 347 | 347 | |
| 348 | - if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {
|
|
| 349 | - $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude']; |
|
| 348 | + if (isset($request_info[$prefix.'latitude']) && $request_info[$prefix.'latitude'] != '') {
|
|
| 349 | + $gd_post_info[$prefix.'latitude'] = $request_info[$prefix.'latitude']; |
|
| 350 | 350 | } |
| 351 | 351 | |
| 352 | - if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {
|
|
| 353 | - $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude']; |
|
| 352 | + if (isset($request_info[$prefix.'longitude']) && $request_info[$prefix.'longitude'] != '') {
|
|
| 353 | + $gd_post_info[$prefix.'longitude'] = $request_info[$prefix.'longitude']; |
|
| 354 | 354 | } |
| 355 | 355 | |
| 356 | - if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {
|
|
| 357 | - $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview']; |
|
| 356 | + if (isset($request_info[$prefix.'mapview']) && $request_info[$prefix.'mapview'] != '') {
|
|
| 357 | + $gd_post_info[$prefix.'mapview'] = $request_info[$prefix.'mapview']; |
|
| 358 | 358 | } |
| 359 | 359 | |
| 360 | - if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {
|
|
| 361 | - $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom']; |
|
| 360 | + if (isset($request_info[$prefix.'mapzoom']) && $request_info[$prefix.'mapzoom'] != '') {
|
|
| 361 | + $gd_post_info[$prefix.'mapzoom'] = $request_info[$prefix.'mapzoom']; |
|
| 362 | 362 | } |
| 363 | 363 | |
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | // show lat lng |
| 367 | - if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {
|
|
| 368 | - $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng']; |
|
| 367 | + if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix.'latlng'])) {
|
|
| 368 | + $gd_post_info[$prefix.'latlng'] = $request_info[$prefix.'latlng']; |
|
| 369 | 369 | } |
| 370 | 370 | } |
| 371 | 371 | |
@@ -390,16 +390,16 @@ discard block |
||
| 390 | 390 | |
| 391 | 391 | // check if we need to change the format or not |
| 392 | 392 | $date_format_len = strlen(str_replace(' ', '', $date_format));
|
| 393 | - if($date_format_len>5){// if greater then 5 then it's the old style format.
|
|
| 393 | + if ($date_format_len > 5) {// if greater then 5 then it's the old style format.
|
|
| 394 | 394 | |
| 395 | - $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
|
|
| 396 | - $replace = array('d','j','l','m','n','F','Y');//PHP date format
|
|
| 395 | + $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format
|
|
| 396 | + $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format
|
|
| 397 | 397 | |
| 398 | 398 | $date_format = str_replace($search, $replace, $date_format); |
| 399 | 399 | |
| 400 | 400 | $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
|
| 401 | 401 | |
| 402 | - }else{
|
|
| 402 | + } else {
|
|
| 403 | 403 | $post_htmlvar_value = $request_info[$name]; |
| 404 | 404 | } |
| 405 | 405 | |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | if (isset($request_info[$name])) {
|
| 415 | 415 | $gd_post_info[$name] = $request_info[$name]; |
| 416 | 416 | } else {
|
| 417 | - if (isset($request_info['gd_field_' . $name])) {
|
|
| 417 | + if (isset($request_info['gd_field_'.$name])) {
|
|
| 418 | 418 | $gd_post_info[$name] = ''; /* fix de-select for multiselect */ |
| 419 | 419 | } |
| 420 | 420 | } |
@@ -474,7 +474,7 @@ discard block |
||
| 474 | 474 | } |
| 475 | 475 | |
| 476 | 476 | if (is_array($post_tags)) {
|
| 477 | - $taxonomy = $request_info['listing_type'] . '_tags'; |
|
| 477 | + $taxonomy = $request_info['listing_type'].'_tags'; |
|
| 478 | 478 | wp_set_object_terms($last_post_id, $post_tags, $taxonomy); |
| 479 | 479 | } |
| 480 | 480 | |
@@ -486,7 +486,7 @@ discard block |
||
| 486 | 486 | $tmpimgArr = trim($request_info['post_images'], ","); |
| 487 | 487 | $tmpimgArr = explode(",", $tmpimgArr);
|
| 488 | 488 | geodir_save_post_images($last_post_id, $tmpimgArr, $dummy); |
| 489 | - } else{
|
|
| 489 | + } else {
|
|
| 490 | 490 | geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy); |
| 491 | 491 | } |
| 492 | 492 | |
@@ -567,7 +567,7 @@ discard block |
||
| 567 | 567 | if (!in_array($post_type, $all_postypes)) |
| 568 | 568 | return false; |
| 569 | 569 | |
| 570 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 570 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 571 | 571 | |
| 572 | 572 | /** |
| 573 | 573 | * Apply Filter to change Post info |
@@ -577,7 +577,7 @@ discard block |
||
| 577 | 577 | * @since 1.0.0 |
| 578 | 578 | * @package GeoDirectory |
| 579 | 579 | */ |
| 580 | - $query = apply_filters('geodir_post_info_query', "SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd
|
|
| 580 | + $query = apply_filters('geodir_post_info_query', "SELECT p.*,pd.* FROM ".$wpdb->posts." p,".$table." pd
|
|
| 581 | 581 | WHERE p.ID = pd.post_id |
| 582 | 582 | AND post_id = " . $post_id); |
| 583 | 583 | |
@@ -640,7 +640,7 @@ discard block |
||
| 640 | 640 | |
| 641 | 641 | $post_type = get_post_type($post_id); |
| 642 | 642 | |
| 643 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 643 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 644 | 644 | |
| 645 | 645 | /** |
| 646 | 646 | * Filter to change Post info |
@@ -663,13 +663,13 @@ discard block |
||
| 663 | 663 | $mval = implode(",", $mval);
|
| 664 | 664 | } |
| 665 | 665 | |
| 666 | - $post_meta_set_query .= $mkey . " = '" . $mval . "', "; |
|
| 666 | + $post_meta_set_query .= $mkey." = '".$mval."', "; |
|
| 667 | 667 | } |
| 668 | 668 | } |
| 669 | 669 | |
| 670 | 670 | $post_meta_set_query = trim($post_meta_set_query, ", "); |
| 671 | 671 | |
| 672 | - $post_meta_set_query = str_replace('%', '%%', $post_meta_set_query);// escape %
|
|
| 672 | + $post_meta_set_query = str_replace('%', '%%', $post_meta_set_query); // escape %
|
|
| 673 | 673 | |
| 674 | 674 | /** |
| 675 | 675 | * Called before saving the listing info. |
@@ -681,11 +681,11 @@ discard block |
||
| 681 | 681 | */ |
| 682 | 682 | do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);
|
| 683 | 683 | |
| 684 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 684 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {
|
|
| 685 | 685 | |
| 686 | 686 | $wpdb->query( |
| 687 | 687 | $wpdb->prepare( |
| 688 | - "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id =%d", |
|
| 688 | + "UPDATE ".$table." SET ".$post_meta_set_query." where post_id =%d", |
|
| 689 | 689 | array($post_id) |
| 690 | 690 | ) |
| 691 | 691 | ); |
@@ -695,7 +695,7 @@ discard block |
||
| 695 | 695 | |
| 696 | 696 | $wpdb->query( |
| 697 | 697 | $wpdb->prepare( |
| 698 | - "INSERT INTO " . $table . " SET post_id = %d," . $post_meta_set_query, |
|
| 698 | + "INSERT INTO ".$table." SET post_id = %d,".$post_meta_set_query, |
|
| 699 | 699 | array($post_id) |
| 700 | 700 | ) |
| 701 | 701 | ); |
@@ -741,7 +741,7 @@ discard block |
||
| 741 | 741 | |
| 742 | 742 | $post_type = get_post_type($post_id); |
| 743 | 743 | |
| 744 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 744 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 745 | 745 | |
| 746 | 746 | if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {
|
| 747 | 747 | |
@@ -749,11 +749,11 @@ discard block |
||
| 749 | 749 | $meta_value = implode(",", $meta_value);
|
| 750 | 750 | } |
| 751 | 751 | |
| 752 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 752 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {
|
|
| 753 | 753 | |
| 754 | 754 | $wpdb->query( |
| 755 | 755 | $wpdb->prepare( |
| 756 | - "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d", |
|
| 756 | + "UPDATE ".$table." SET ".$postmeta." = '".$meta_value."' where post_id =%d", |
|
| 757 | 757 | array($post_id) |
| 758 | 758 | ) |
| 759 | 759 | ); |
@@ -762,7 +762,7 @@ discard block |
||
| 762 | 762 | |
| 763 | 763 | $wpdb->query( |
| 764 | 764 | $wpdb->prepare( |
| 765 | - "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'", |
|
| 765 | + "INSERT INTO ".$table." SET post_id = %d, ".$postmeta." = '".$meta_value."'", |
|
| 766 | 766 | array($post_id) |
| 767 | 767 | ) |
| 768 | 768 | ); |
@@ -795,23 +795,23 @@ discard block |
||
| 795 | 795 | |
| 796 | 796 | $post_type = get_post_type($post_id); |
| 797 | 797 | |
| 798 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 798 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 799 | 799 | |
| 800 | 800 | if (is_array($postmeta) && !empty($postmeta) && $post_id) {
|
| 801 | 801 | $post_meta_set_query = ''; |
| 802 | 802 | |
| 803 | 803 | foreach ($postmeta as $mkey) {
|
| 804 | 804 | if ($mval != '') |
| 805 | - $post_meta_set_query .= $mkey . " = '', "; |
|
| 805 | + $post_meta_set_query .= $mkey." = '', "; |
|
| 806 | 806 | } |
| 807 | 807 | |
| 808 | 808 | $post_meta_set_query = trim($post_meta_set_query, ", "); |
| 809 | 809 | |
| 810 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 810 | + if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$postmeta."'") != '') {
|
|
| 811 | 811 | |
| 812 | 812 | $wpdb->query( |
| 813 | 813 | $wpdb->prepare( |
| 814 | - "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d", |
|
| 814 | + "UPDATE ".$table." SET ".$post_meta_set_query." where post_id = %d", |
|
| 815 | 815 | array($post_id) |
| 816 | 816 | ) |
| 817 | 817 | ); |
@@ -820,11 +820,11 @@ discard block |
||
| 820 | 820 | } |
| 821 | 821 | |
| 822 | 822 | } elseif ($postmeta != '' && $post_id) {
|
| 823 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 823 | + if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$postmeta."'") != '') {
|
|
| 824 | 824 | |
| 825 | 825 | $wpdb->query( |
| 826 | 826 | $wpdb->prepare( |
| 827 | - "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d", |
|
| 827 | + "UPDATE ".$table." SET ".$postmeta."= '' where post_id = %d", |
|
| 828 | 828 | array($post_id) |
| 829 | 829 | ) |
| 830 | 830 | ); |
@@ -866,10 +866,10 @@ discard block |
||
| 866 | 866 | if (!in_array($post_type, $all_postypes)) |
| 867 | 867 | return false; |
| 868 | 868 | |
| 869 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 869 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 870 | 870 | |
| 871 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {
|
|
| 872 | - $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));
|
|
| 871 | + if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$meta_key."'") != '') {
|
|
| 872 | + $meta_value = $wpdb->get_var($wpdb->prepare("SELECT ".$meta_key." from ".$table." where post_id = %d", array($post_id)));
|
|
| 873 | 873 | |
| 874 | 874 | if ($meta_value && $meta_value !== '') {
|
| 875 | 875 | return maybe_serialize($meta_value); |
@@ -903,13 +903,13 @@ discard block |
||
| 903 | 903 | |
| 904 | 904 | $post_type = get_post_type($post_id); |
| 905 | 905 | |
| 906 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 906 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 907 | 907 | |
| 908 | 908 | $post_images = geodir_get_images($post_id); |
| 909 | 909 | |
| 910 | 910 | $wpdb->query( |
| 911 | 911 | $wpdb->prepare( |
| 912 | - "UPDATE " . $table . " SET featured_image = '' where post_id =%d", |
|
| 912 | + "UPDATE ".$table." SET featured_image = '' where post_id =%d", |
|
| 913 | 913 | array($post_id) |
| 914 | 914 | ) |
| 915 | 915 | ); |
@@ -939,12 +939,12 @@ discard block |
||
| 939 | 939 | $file_path = ''; |
| 940 | 940 | /* --------- start ------- */ |
| 941 | 941 | |
| 942 | - $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
|
|
| 942 | + $split_img_path = explode(str_replace(array('http://', 'https://'), '', $uploads['baseurl']), str_replace(array('http://', 'https://'), '', $post_image[$m]));
|
|
| 943 | 943 | |
| 944 | 944 | $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
| 945 | 945 | |
| 946 | 946 | |
| 947 | - 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)))) {
|
|
| 947 | + 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)))) {
|
|
| 948 | 948 | |
| 949 | 949 | /* --------- end ------- */ |
| 950 | 950 | $curr_img_url = $post_image[$m]; |
@@ -988,7 +988,7 @@ discard block |
||
| 988 | 988 | // If the uploaded file is the right format |
| 989 | 989 | if (in_array($uploaded_file_type, $allowed_file_types)) {
|
| 990 | 990 | if (!function_exists('wp_handle_upload')) {
|
| 991 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 991 | + require_once(ABSPATH.'wp-admin/includes/file.php'); |
|
| 992 | 992 | } |
| 993 | 993 | |
| 994 | 994 | if (!is_dir($geodir_uploadpath)) {
|
@@ -996,41 +996,41 @@ discard block |
||
| 996 | 996 | } |
| 997 | 997 | |
| 998 | 998 | $external_img = false; |
| 999 | - if (strpos(str_replace(array('http://','https://'),'',$curr_img_url), str_replace(array('http://','https://'),'',$uploads['baseurl'])) !== false) {
|
|
| 999 | + if (strpos(str_replace(array('http://', 'https://'), '', $curr_img_url), str_replace(array('http://', 'https://'), '', $uploads['baseurl'])) !== false) {
|
|
| 1000 | 1000 | } else {
|
| 1001 | 1001 | $external_img = true; |
| 1002 | 1002 | } |
| 1003 | 1003 | |
| 1004 | 1004 | if ($dummy || $external_img) {
|
| 1005 | 1005 | $uploaded_file = array(); |
| 1006 | - $uploaded = (array)fetch_remote_file($curr_img_url); |
|
| 1006 | + $uploaded = (array) fetch_remote_file($curr_img_url); |
|
| 1007 | 1007 | |
| 1008 | 1008 | if (isset($uploaded['error']) && empty($uploaded['error'])) {
|
| 1009 | 1009 | $new_name = basename($uploaded['file']); |
| 1010 | 1010 | $uploaded_file = $uploaded; |
| 1011 | - }else{
|
|
| 1012 | - print_r($uploaded);exit; |
|
| 1011 | + } else {
|
|
| 1012 | + print_r($uploaded); exit; |
|
| 1013 | 1013 | } |
| 1014 | 1014 | $external_img = false; |
| 1015 | 1015 | } else {
|
| 1016 | - $new_name = $post_id . '_' . $file_name; |
|
| 1016 | + $new_name = $post_id.'_'.$file_name; |
|
| 1017 | 1017 | |
| 1018 | 1018 | if ($curr_img_dir == $sub_dir) {
|
| 1019 | - $img_path = $geodir_uploadpath . '/' . $filename; |
|
| 1020 | - $img_url = $geodir_uploadurl . '/' . $filename; |
|
| 1019 | + $img_path = $geodir_uploadpath.'/'.$filename; |
|
| 1020 | + $img_url = $geodir_uploadurl.'/'.$filename; |
|
| 1021 | 1021 | } else {
|
| 1022 | - $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1023 | - $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1022 | + $img_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename; |
|
| 1023 | + $img_url = $uploads['url'].'/temp_'.$current_user->data->ID.'/'.$filename; |
|
| 1024 | 1024 | } |
| 1025 | 1025 | |
| 1026 | 1026 | $uploaded_file = ''; |
| 1027 | 1027 | |
| 1028 | 1028 | if (file_exists($img_path)) {
|
| 1029 | - $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); |
|
| 1029 | + $uploaded_file = copy($img_path, $geodir_uploadpath.'/'.$new_name); |
|
| 1030 | 1030 | $file_path = ''; |
| 1031 | - } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
|
|
| 1031 | + } else if (file_exists($uploads['basedir'].$curr_img_dir.$filename)) {
|
|
| 1032 | 1032 | $uploaded_file = true; |
| 1033 | - $file_path = $curr_img_dir . '/' . $filename; |
|
| 1033 | + $file_path = $curr_img_dir.'/'.$filename; |
|
| 1034 | 1034 | } |
| 1035 | 1035 | |
| 1036 | 1036 | if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path)) |
@@ -1039,14 +1039,14 @@ discard block |
||
| 1039 | 1039 | |
| 1040 | 1040 | if (!empty($uploaded_file)) {
|
| 1041 | 1041 | if (!isset($file_path) || !$file_path) {
|
| 1042 | - $file_path = $sub_dir . '/' . $new_name; |
|
| 1042 | + $file_path = $sub_dir.'/'.$new_name; |
|
| 1043 | 1043 | } |
| 1044 | 1044 | |
| 1045 | - $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
|
|
| 1045 | + $postcurr_images[] = str_replace(array('http://', 'https://'), '', $uploads['baseurl'].$file_path);
|
|
| 1046 | 1046 | |
| 1047 | 1047 | if ($menu_order == 1) {
|
| 1048 | 1048 | |
| 1049 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
|
|
| 1049 | + $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
|
|
| 1050 | 1050 | |
| 1051 | 1051 | } |
| 1052 | 1052 | |
@@ -1064,12 +1064,12 @@ discard block |
||
| 1064 | 1064 | |
| 1065 | 1065 | foreach ($attachment as $key => $val) {
|
| 1066 | 1066 | if ($val != '') |
| 1067 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 1067 | + $attachment_set .= $key." = '".$val."', "; |
|
| 1068 | 1068 | } |
| 1069 | 1069 | |
| 1070 | 1070 | $attachment_set = trim($attachment_set, ", "); |
| 1071 | 1071 | |
| 1072 | - $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 1072 | + $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
|
|
| 1073 | 1073 | |
| 1074 | 1074 | $valid_file_ids[] = $wpdb->insert_id; |
| 1075 | 1075 | } |
@@ -1080,17 +1080,17 @@ discard block |
||
| 1080 | 1080 | } else {
|
| 1081 | 1081 | $valid_file_ids[] = $find_image; |
| 1082 | 1082 | |
| 1083 | - $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
|
|
| 1083 | + $postcurr_images[] = str_replace(array('http://', 'https://'), '', $post_image[$m]);
|
|
| 1084 | 1084 | |
| 1085 | 1085 | $wpdb->query( |
| 1086 | 1086 | $wpdb->prepare( |
| 1087 | - "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d", |
|
| 1087 | + "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order = %d where file =%s AND post_id =%d", |
|
| 1088 | 1088 | array($menu_order, $split_img_path[1], $post_id) |
| 1089 | 1089 | ) |
| 1090 | 1090 | ); |
| 1091 | 1091 | |
| 1092 | 1092 | if ($menu_order == 1) |
| 1093 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
|
|
| 1093 | + $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
|
|
| 1094 | 1094 | |
| 1095 | 1095 | } |
| 1096 | 1096 | |
@@ -1114,9 +1114,9 @@ discard block |
||
| 1114 | 1114 | |
| 1115 | 1115 | foreach ($post_images as $img) {
|
| 1116 | 1116 | |
| 1117 | - if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
|
|
| 1117 | + if (!in_array(str_replace(array('http://', 'https://'), '', $img->src), $postcurr_images)) {
|
|
| 1118 | 1118 | |
| 1119 | - $invalid_files[] = (object)array('src' => $img->src);
|
|
| 1119 | + $invalid_files[] = (object) array('src' => $img->src);
|
|
| 1120 | 1120 | |
| 1121 | 1121 | } |
| 1122 | 1122 | |
@@ -1124,12 +1124,12 @@ discard block |
||
| 1124 | 1124 | |
| 1125 | 1125 | } |
| 1126 | 1126 | |
| 1127 | - $invalid_files = (object)$invalid_files; |
|
| 1127 | + $invalid_files = (object) $invalid_files; |
|
| 1128 | 1128 | } |
| 1129 | 1129 | |
| 1130 | 1130 | $remove_files[] = $post_id; |
| 1131 | 1131 | |
| 1132 | - $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
|
|
| 1132 | + $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE ".$valid_files_condition." post_id = %d", $remove_files));
|
|
| 1133 | 1133 | |
| 1134 | 1134 | if (!empty($invalid_files)) |
| 1135 | 1135 | geodir_remove_attachments($invalid_files); |
@@ -1169,7 +1169,7 @@ discard block |
||
| 1169 | 1169 | rmdir($dirPath); |
| 1170 | 1170 | } */ |
| 1171 | 1171 | |
| 1172 | - $dirname = $uploads_dir . '/temp_' . $current_user->ID; |
|
| 1172 | + $dirname = $uploads_dir.'/temp_'.$current_user->ID; |
|
| 1173 | 1173 | geodir_delete_directory($dirname); |
| 1174 | 1174 | } |
| 1175 | 1175 | |
@@ -1191,10 +1191,10 @@ discard block |
||
| 1191 | 1191 | return false; |
| 1192 | 1192 | while ($file = readdir($dir_handle)) {
|
| 1193 | 1193 | if ($file != "." && $file != "..") {
|
| 1194 | - if (!is_dir($dirname . "/" . $file)) |
|
| 1195 | - unlink($dirname . "/" . $file); |
|
| 1194 | + if (!is_dir($dirname."/".$file)) |
|
| 1195 | + unlink($dirname."/".$file); |
|
| 1196 | 1196 | else |
| 1197 | - geodir_delete_directory($dirname . '/' . $file); |
|
| 1197 | + geodir_delete_directory($dirname.'/'.$file); |
|
| 1198 | 1198 | } |
| 1199 | 1199 | } |
| 1200 | 1200 | closedir($dir_handle); |
@@ -1223,8 +1223,8 @@ discard block |
||
| 1223 | 1223 | foreach ($postcurr_images as $postimg) {
|
| 1224 | 1224 | $image_name_arr = explode('/', $postimg->src);
|
| 1225 | 1225 | $filename = end($image_name_arr); |
| 1226 | - if (file_exists($uploads_dir . '/' . $filename)) |
|
| 1227 | - unlink($uploads_dir . '/' . $filename); |
|
| 1226 | + if (file_exists($uploads_dir.'/'.$filename)) |
|
| 1227 | + unlink($uploads_dir.'/'.$filename); |
|
| 1228 | 1228 | } |
| 1229 | 1229 | |
| 1230 | 1230 | } // endif |
@@ -1265,16 +1265,16 @@ discard block |
||
| 1265 | 1265 | } |
| 1266 | 1266 | |
| 1267 | 1267 | if (!in_array($post_type, geodir_get_posttypes())) {
|
| 1268 | - return false;// if not a GD CPT return; |
|
| 1268 | + return false; // if not a GD CPT return; |
|
| 1269 | 1269 | } |
| 1270 | 1270 | |
| 1271 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1271 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 1272 | 1272 | |
| 1273 | 1273 | if (!$file) {
|
| 1274 | 1274 | if (isset($post->featured_image)) {
|
| 1275 | 1275 | $file = $post->featured_image; |
| 1276 | 1276 | } else {
|
| 1277 | - $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));
|
|
| 1277 | + $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM ".$table." WHERE post_id = %d", array($post_id)));
|
|
| 1278 | 1278 | } |
| 1279 | 1279 | } |
| 1280 | 1280 | |
@@ -1292,7 +1292,7 @@ discard block |
||
| 1292 | 1292 | |
| 1293 | 1293 | $file_name = $file_info['basename']; |
| 1294 | 1294 | |
| 1295 | - $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1295 | + $uploads_url = $uploads_baseurl.$sub_dir; |
|
| 1296 | 1296 | /* |
| 1297 | 1297 | * Allows the filter of image src for such things as CDN change. |
| 1298 | 1298 | * |
@@ -1302,8 +1302,8 @@ discard block |
||
| 1302 | 1302 | * @param string $uploads_url The server upload directory url. |
| 1303 | 1303 | * @param string $uploads_baseurl The uploads dir base url. |
| 1304 | 1304 | */ |
| 1305 | - $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1306 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1305 | + $img_arr['src'] = apply_filters('geodir_get_featured_image_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);
|
|
| 1306 | + $img_arr['path'] = $uploads_path.'/'.$file_name; |
|
| 1307 | 1307 | $width = 0; |
| 1308 | 1308 | $height = 0; |
| 1309 | 1309 | if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
@@ -1346,7 +1346,7 @@ discard block |
||
| 1346 | 1346 | $file_name = $file_info['basename']; |
| 1347 | 1347 | |
| 1348 | 1348 | $img_arr['src'] = $default_img; |
| 1349 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1349 | + $img_arr['path'] = $uploads_path.'/'.$file_name; |
|
| 1350 | 1350 | |
| 1351 | 1351 | $width = 0; |
| 1352 | 1352 | $height = 0; |
@@ -1363,7 +1363,7 @@ discard block |
||
| 1363 | 1363 | } |
| 1364 | 1364 | |
| 1365 | 1365 | if (!empty($img_arr)) |
| 1366 | - return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path ); |
|
| 1366 | + return (object) $img_arr; //return (object)array( 'src' => $file_url, 'path' => $file_path ); |
|
| 1367 | 1367 | else |
| 1368 | 1368 | return false; |
| 1369 | 1369 | } |
@@ -1426,7 +1426,7 @@ discard block |
||
| 1426 | 1426 | |
| 1427 | 1427 | $arrImages = $wpdb->get_results( |
| 1428 | 1428 | $wpdb->prepare( |
| 1429 | - "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 ", |
|
| 1429 | + "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 ", |
|
| 1430 | 1430 | array('%image%', $post_id)
|
| 1431 | 1431 | ) |
| 1432 | 1432 | ); |
@@ -1452,7 +1452,7 @@ discard block |
||
| 1452 | 1452 | |
| 1453 | 1453 | $file_name = $file_info['basename']; |
| 1454 | 1454 | |
| 1455 | - $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1455 | + $uploads_url = $uploads_baseurl.$sub_dir; |
|
| 1456 | 1456 | /* |
| 1457 | 1457 | * Allows the filter of image src for such things as CDN change. |
| 1458 | 1458 | * |
@@ -1462,8 +1462,8 @@ discard block |
||
| 1462 | 1462 | * @param string $uploads_url The server upload directory url. |
| 1463 | 1463 | * @param string $uploads_baseurl The uploads dir base url. |
| 1464 | 1464 | */ |
| 1465 | - $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1466 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1465 | + $img_arr['src'] = apply_filters('geodir_get_images_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);
|
|
| 1466 | + $img_arr['path'] = $uploads_path.'/'.$file_name; |
|
| 1467 | 1467 | $width = 0; |
| 1468 | 1468 | $height = 0; |
| 1469 | 1469 | if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
@@ -1480,11 +1480,11 @@ discard block |
||
| 1480 | 1480 | $img_arr['content'] = $attechment->content; // add the description to the array |
| 1481 | 1481 | $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1. |
| 1482 | 1482 | |
| 1483 | - $return_arr[] = (object)$img_arr; |
|
| 1483 | + $return_arr[] = (object) $img_arr; |
|
| 1484 | 1484 | |
| 1485 | 1485 | $counter++; |
| 1486 | 1486 | } |
| 1487 | - return (object)$return_arr; |
|
| 1487 | + return (object) $return_arr; |
|
| 1488 | 1488 | } else if ($no_images) {
|
| 1489 | 1489 | $default_img = ''; |
| 1490 | 1490 | $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
@@ -1523,7 +1523,7 @@ discard block |
||
| 1523 | 1523 | $img_arr['title'] = $file_info['filename']; // add the title to the array |
| 1524 | 1524 | $img_arr['content'] = $file_info['filename']; // add the description to the array |
| 1525 | 1525 | |
| 1526 | - $return_arr[] = (object)$img_arr; |
|
| 1526 | + $return_arr[] = (object) $img_arr; |
|
| 1527 | 1527 | |
| 1528 | 1528 | return $return_arr; |
| 1529 | 1529 | } else |
@@ -1550,8 +1550,8 @@ discard block |
||
| 1550 | 1550 | |
| 1551 | 1551 | $html = ''; |
| 1552 | 1552 | if (!empty($request)) {
|
| 1553 | - if (!is_object($request)){
|
|
| 1554 | - $request = (object)$request; |
|
| 1553 | + if (!is_object($request)) {
|
|
| 1554 | + $request = (object) $request; |
|
| 1555 | 1555 | } |
| 1556 | 1556 | |
| 1557 | 1557 | if (isset($request->src) && !isset($request->path)) {
|
@@ -1565,7 +1565,7 @@ discard block |
||
| 1565 | 1565 | $img_no_http = str_replace(array("http://", "https://"), "", $request->path);
|
| 1566 | 1566 | $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);
|
| 1567 | 1567 | if (strpos($img_no_http, $upload_no_http) !== false) {
|
| 1568 | - $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path); |
|
| 1568 | + $request->path = str_replace($img_no_http, $upload_dir['basedir'], $request->path); |
|
| 1569 | 1569 | } |
| 1570 | 1570 | |
| 1571 | 1571 | $width = 0; |
@@ -1580,7 +1580,7 @@ discard block |
||
| 1580 | 1580 | $image->width = $width; |
| 1581 | 1581 | $image->height = $height; |
| 1582 | 1582 | |
| 1583 | - $max_size = (object)geodir_get_imagesize($size); |
|
| 1583 | + $max_size = (object) geodir_get_imagesize($size); |
|
| 1584 | 1584 | |
| 1585 | 1585 | if (!is_wp_error($max_size)) {
|
| 1586 | 1586 | if ($image->width) {
|
@@ -1592,15 +1592,15 @@ discard block |
||
| 1592 | 1592 | $width_per = 100; |
| 1593 | 1593 | } |
| 1594 | 1594 | |
| 1595 | - if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
|
|
| 1596 | - $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '" /></div>'; |
|
| 1595 | + if (is_admin() && !isset($_REQUEST['geodir_ajax'])) {
|
|
| 1596 | + $html = '<div class="geodir_thumbnail"><img style="max-height:'.$max_size->h.'px;" alt="place image" src="'.$image->src.'" /></div>'; |
|
| 1597 | 1597 | } else {
|
| 1598 | - if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
|
|
| 1599 | - $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>'; |
|
| 1600 | - }else{
|
|
| 1598 | + if ($size == 'widget-thumb' || !get_option('geodir_lazy_load', 1)) {
|
|
| 1599 | + $html = '<div class="geodir_thumbnail" style="background-image:url(\''.$image->src.'\');"></div>'; |
|
| 1600 | + } else {
|
|
| 1601 | 1601 | //$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>'; |
| 1602 | 1602 | //$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>'; |
| 1603 | - $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';
|
|
| 1603 | + $html = '<div data-src="'.str_replace(' ', '%20', $image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';
|
|
| 1604 | 1604 | |
| 1605 | 1605 | } |
| 1606 | 1606 | |
@@ -1636,15 +1636,15 @@ discard block |
||
| 1636 | 1636 | |
| 1637 | 1637 | $post_type = get_post_type($post_id); |
| 1638 | 1638 | |
| 1639 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1639 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 1640 | 1640 | |
| 1641 | 1641 | if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {
|
| 1642 | 1642 | |
| 1643 | - if ($taxonomy == $post_type . '_tags') {
|
|
| 1643 | + if ($taxonomy == $post_type.'_tags') {
|
|
| 1644 | 1644 | if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
| 1645 | 1645 | geodir_save_post_meta($post_id, 'post_tags', $terms); |
| 1646 | 1646 | } |
| 1647 | - } elseif ($taxonomy == $post_type . 'category') {
|
|
| 1647 | + } elseif ($taxonomy == $post_type.'category') {
|
|
| 1648 | 1648 | $srcharr = array('"', '\\');
|
| 1649 | 1649 | $replarr = array(""", '');
|
| 1650 | 1650 | |
@@ -1666,7 +1666,7 @@ discard block |
||
| 1666 | 1666 | |
| 1667 | 1667 | $wpdb->get_var( |
| 1668 | 1668 | $wpdb->prepare( |
| 1669 | - "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ", |
|
| 1669 | + "DELETE from ".GEODIR_ICON_TABLE." WHERE cat_id NOT IN ($format) AND post_id = %d ", |
|
| 1670 | 1670 | $cat_ids_array_del |
| 1671 | 1671 | ) |
| 1672 | 1672 | ); |
@@ -1674,7 +1674,7 @@ discard block |
||
| 1674 | 1674 | |
| 1675 | 1675 | $post_term = $wpdb->get_col( |
| 1676 | 1676 | $wpdb->prepare( |
| 1677 | - "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id", |
|
| 1677 | + "SELECT term_id FROM ".$wpdb->term_taxonomy." WHERE term_taxonomy_id IN($format) GROUP BY term_id", |
|
| 1678 | 1678 | $cat_ids_array |
| 1679 | 1679 | ) |
| 1680 | 1680 | ); |
@@ -1696,16 +1696,16 @@ discard block |
||
| 1696 | 1696 | $lat = geodir_get_post_meta($post_id, 'post_latitude', true); |
| 1697 | 1697 | $lng = geodir_get_post_meta($post_id, 'post_longitude', true); |
| 1698 | 1698 | |
| 1699 | - $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
|
|
| 1700 | - $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true); |
|
| 1699 | + $timing = ' - '.date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
|
|
| 1700 | + $timing .= ' - '.geodir_get_post_meta($post_id, 'st_time', true); |
|
| 1701 | 1701 | |
| 1702 | 1702 | $json = '{';
|
| 1703 | - $json .= '"id":"' . $post_id . '",'; |
|
| 1704 | - $json .= '"lat_pos": "' . $lat . '",'; |
|
| 1705 | - $json .= '"long_pos": "' . $lng . '",'; |
|
| 1706 | - $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",'; |
|
| 1707 | - $json .= '"icon":"' . $term_icon . '",'; |
|
| 1708 | - $json .= '"group":"catgroup' . $cat_id . '"'; |
|
| 1703 | + $json .= '"id":"'.$post_id.'",'; |
|
| 1704 | + $json .= '"lat_pos": "'.$lat.'",'; |
|
| 1705 | + $json .= '"long_pos": "'.$lng.'",'; |
|
| 1706 | + $json .= '"marker_id":"'.$post_id.'_'.$cat_id.'",'; |
|
| 1707 | + $json .= '"icon":"'.$term_icon.'",'; |
|
| 1708 | + $json .= '"group":"catgroup'.$cat_id.'"'; |
|
| 1709 | 1709 | $json .= '}'; |
| 1710 | 1710 | |
| 1711 | 1711 | |
@@ -1713,9 +1713,9 @@ discard block |
||
| 1713 | 1713 | $post_marker_json = $json; |
| 1714 | 1714 | |
| 1715 | 1715 | |
| 1716 | - 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)))) {
|
|
| 1716 | + 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)))) {
|
|
| 1717 | 1717 | |
| 1718 | - $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET
|
|
| 1718 | + $json_query = $wpdb->prepare("UPDATE ".GEODIR_ICON_TABLE." SET
|
|
| 1719 | 1719 | post_title = %s, |
| 1720 | 1720 | json = %s |
| 1721 | 1721 | WHERE post_id = %d AND cat_id = %d ", |
@@ -1723,7 +1723,7 @@ discard block |
||
| 1723 | 1723 | |
| 1724 | 1724 | } else {
|
| 1725 | 1725 | |
| 1726 | - $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET
|
|
| 1726 | + $json_query = $wpdb->prepare("INSERT INTO ".GEODIR_ICON_TABLE." SET
|
|
| 1727 | 1727 | post_id = %d, |
| 1728 | 1728 | post_title = %s, |
| 1729 | 1729 | cat_id = %d, |
@@ -1741,17 +1741,17 @@ discard block |
||
| 1741 | 1741 | if (!empty($post_term) && is_array($post_term)) {
|
| 1742 | 1742 | $categories = implode(',', $post_term);
|
| 1743 | 1743 | |
| 1744 | - if ($categories != '' && $categories != 0) $categories = ',' . $categories . ','; |
|
| 1744 | + if ($categories != '' && $categories != 0) $categories = ','.$categories.','; |
|
| 1745 | 1745 | |
| 1746 | 1746 | if (empty($post_marker_json)) |
| 1747 | 1747 | $post_marker_json = isset($json) ? $json : ''; |
| 1748 | 1748 | |
| 1749 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 1749 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {
|
|
| 1750 | 1750 | |
| 1751 | 1751 | $wpdb->query( |
| 1752 | 1752 | $wpdb->prepare( |
| 1753 | - "UPDATE " . $table . " SET |
|
| 1754 | - " . $taxonomy . " = %s, |
|
| 1753 | + "UPDATE ".$table." SET |
|
| 1754 | + " . $taxonomy." = %s, |
|
| 1755 | 1755 | marker_json = %s |
| 1756 | 1756 | where post_id = %d", |
| 1757 | 1757 | array($categories, $post_marker_json, $post_id) |
@@ -1772,7 +1772,7 @@ discard block |
||
| 1772 | 1772 | |
| 1773 | 1773 | $wpdb->query( |
| 1774 | 1774 | $wpdb->prepare( |
| 1775 | - "UPDATE " . $table . " SET |
|
| 1775 | + "UPDATE ".$table." SET |
|
| 1776 | 1776 | default_category = %s |
| 1777 | 1777 | where post_id = %d", |
| 1778 | 1778 | array($categories[0], $post_id) |
@@ -1797,9 +1797,9 @@ discard block |
||
| 1797 | 1797 | |
| 1798 | 1798 | $wpdb->query( |
| 1799 | 1799 | $wpdb->prepare( |
| 1800 | - "INSERT INTO " . $table . " SET |
|
| 1800 | + "INSERT INTO ".$table." SET |
|
| 1801 | 1801 | post_id = %d, |
| 1802 | - " . $taxonomy . " = %s, |
|
| 1802 | + " . $taxonomy." = %s, |
|
| 1803 | 1803 | marker_json = %s ", |
| 1804 | 1804 | |
| 1805 | 1805 | array($post_id, $categories, $post_marker_json) |
@@ -1922,7 +1922,7 @@ discard block |
||
| 1922 | 1922 | } ?>"><img alt="bubble image" style="max-height:50px;" |
| 1923 | 1923 | src="<?php echo $post_images[0]; ?>"/></a></div> |
| 1924 | 1924 | <?php |
| 1925 | - }else{
|
|
| 1925 | + } else {
|
|
| 1926 | 1926 | echo '<div class="geodir-bubble_image"></div>'; |
| 1927 | 1927 | } |
| 1928 | 1928 | } else {
|
@@ -1930,7 +1930,7 @@ discard block |
||
| 1930 | 1930 | ?> |
| 1931 | 1931 | <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div> |
| 1932 | 1932 | <?php |
| 1933 | - }else{
|
|
| 1933 | + } else {
|
|
| 1934 | 1934 | echo '<div class="geodir-bubble_image"></div>'; |
| 1935 | 1935 | } |
| 1936 | 1936 | } |
@@ -1963,7 +1963,7 @@ discard block |
||
| 1963 | 1963 | * @param object $postinfo_obj The posts info as an object. |
| 1964 | 1964 | * @param bool|string $post_preview True if currently in post preview page. Empty string if not. * |
| 1965 | 1965 | */ |
| 1966 | - do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );
|
|
| 1966 | + do_action('geodir_infowindow_meta_after', $postinfo_obj, $post_preview);
|
|
| 1967 | 1967 | ?> |
| 1968 | 1968 | </div> |
| 1969 | 1969 | <?php |
@@ -1975,10 +1975,10 @@ discard block |
||
| 1975 | 1975 | <div class="geodir-bubble-meta-fade"></div> |
| 1976 | 1976 | |
| 1977 | 1977 | <div class="geodir-bubble-meta-bottom"> |
| 1978 | - <span class="geodir-bubble-rating"><?php echo $rating_star;?></span> |
|
| 1978 | + <span class="geodir-bubble-rating"><?php echo $rating_star; ?></span> |
|
| 1979 | 1979 | |
| 1980 | 1980 | <span |
| 1981 | - class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID);?></span> |
|
| 1981 | + class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID); ?></span> |
|
| 1982 | 1982 | <span class="geodir-bubble-reviews"><a href="<?php echo get_comments_link($ID); ?>" |
| 1983 | 1983 | class="geodir-pcomments"><i class="fa fa-comments"></i> |
| 1984 | 1984 | <?php echo get_comments_number($ID); ?> |
@@ -2043,11 +2043,11 @@ discard block |
||
| 2043 | 2043 | |
| 2044 | 2044 | $post_type = get_post_type($post_id); |
| 2045 | 2045 | |
| 2046 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2046 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2047 | 2047 | |
| 2048 | 2048 | $wpdb->query( |
| 2049 | 2049 | $wpdb->prepare( |
| 2050 | - "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d", |
|
| 2050 | + "UPDATE ".$table." SET post_status=%s WHERE post_id=%d", |
|
| 2051 | 2051 | array($status, $post_id) |
| 2052 | 2052 | ) |
| 2053 | 2053 | ); |
@@ -2119,18 +2119,18 @@ discard block |
||
| 2119 | 2119 | |
| 2120 | 2120 | $post_type = get_post_type($post_id); |
| 2121 | 2121 | |
| 2122 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2122 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2123 | 2123 | |
| 2124 | 2124 | $wpdb->query( |
| 2125 | 2125 | $wpdb->prepare( |
| 2126 | - "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2126 | + "UPDATE ".$table." SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2127 | 2127 | array($updatingpost, $temppost) |
| 2128 | 2128 | ) |
| 2129 | 2129 | ); |
| 2130 | 2130 | |
| 2131 | 2131 | $wpdb->query( |
| 2132 | 2132 | $wpdb->prepare( |
| 2133 | - "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2133 | + "UPDATE ".GEODIR_ICON_TABLE." SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2134 | 2134 | array($updatingpost, $temppost) |
| 2135 | 2135 | ) |
| 2136 | 2136 | ); |
@@ -2139,7 +2139,7 @@ discard block |
||
| 2139 | 2139 | |
| 2140 | 2140 | $wpdb->query( |
| 2141 | 2141 | $wpdb->prepare( |
| 2142 | - "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2142 | + "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2143 | 2143 | array($updatingpost, $temppost) |
| 2144 | 2144 | ) |
| 2145 | 2145 | ); |
@@ -2177,12 +2177,12 @@ discard block |
||
| 2177 | 2177 | if (!in_array($post_type, $all_postypes)) |
| 2178 | 2178 | return false; |
| 2179 | 2179 | |
| 2180 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2180 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2181 | 2181 | |
| 2182 | 2182 | /* Delete custom post meta*/ |
| 2183 | 2183 | $wpdb->query( |
| 2184 | 2184 | $wpdb->prepare( |
| 2185 | - "DELETE FROM " . $table . " WHERE `post_id` = %d", |
|
| 2185 | + "DELETE FROM ".$table." WHERE `post_id` = %d", |
|
| 2186 | 2186 | array($deleted_postid) |
| 2187 | 2187 | ) |
| 2188 | 2188 | ); |
@@ -2191,7 +2191,7 @@ discard block |
||
| 2191 | 2191 | |
| 2192 | 2192 | $wpdb->query( |
| 2193 | 2193 | $wpdb->prepare( |
| 2194 | - "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d", |
|
| 2194 | + "DELETE FROM ".GEODIR_ICON_TABLE." WHERE `post_id` = %d", |
|
| 2195 | 2195 | array($deleted_postid) |
| 2196 | 2196 | ) |
| 2197 | 2197 | ); |
@@ -2201,7 +2201,7 @@ discard block |
||
| 2201 | 2201 | |
| 2202 | 2202 | $wpdb->query( |
| 2203 | 2203 | $wpdb->prepare( |
| 2204 | - "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d", |
|
| 2204 | + "DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE `post_id` = %d", |
|
| 2205 | 2205 | array($deleted_postid) |
| 2206 | 2206 | ) |
| 2207 | 2207 | ); |
@@ -2273,7 +2273,7 @@ discard block |
||
| 2273 | 2273 | */ |
| 2274 | 2274 | do_action('geodir_before_add_from_favorite', $post_id);
|
| 2275 | 2275 | |
| 2276 | - 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>'; |
|
| 2276 | + 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>'; |
|
| 2277 | 2277 | |
| 2278 | 2278 | /** |
| 2279 | 2279 | * Called after adding the post from favourites. |
@@ -2352,7 +2352,7 @@ discard block |
||
| 2352 | 2352 | */ |
| 2353 | 2353 | do_action('geodir_before_remove_from_favorite', $post_id);
|
| 2354 | 2354 | |
| 2355 | - 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>'; |
|
| 2355 | + 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>'; |
|
| 2356 | 2356 | |
| 2357 | 2357 | /** |
| 2358 | 2358 | * Called after removing the post from favourites. |
@@ -2447,24 +2447,24 @@ discard block |
||
| 2447 | 2447 | $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
| 2448 | 2448 | |
| 2449 | 2449 | if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
|
| 2450 | - ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>" ><a |
|
| 2450 | + ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>" ><a |
|
| 2451 | 2451 | class="geodir-removetofav-icon" href="javascript:void(0);" |
| 2452 | - onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');" |
|
| 2453 | - title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?> |
|
| 2452 | + onclick="javascript:addToFavourite(<?php echo $post_id; ?>,'remove');" |
|
| 2453 | + title="<?php echo $remove_favourite_text; ?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text; ?> |
|
| 2454 | 2454 | </a> </span><?php |
| 2455 | 2455 | |
| 2456 | 2456 | } else {
|
| 2457 | 2457 | |
| 2458 | 2458 | if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
|
| 2459 | - $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\''; |
|
| 2459 | + $script_text = 'javascript:window.location.href=\''.geodir_login_url().'\''; |
|
| 2460 | 2460 | } else |
| 2461 | - $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
|
|
| 2461 | + $script_text = 'javascript:addToFavourite('.$post_id.',\'add\')';
|
|
| 2462 | 2462 | |
| 2463 | - ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon" |
|
| 2463 | + ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"><a class="geodir-addtofav-icon" |
|
| 2464 | 2464 | href="javascript:void(0);" |
| 2465 | - onclick="<?php echo $script_text;?>" |
|
| 2466 | - title="<?php echo $add_favourite_text;?>"><i |
|
| 2467 | - class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span> |
|
| 2465 | + onclick="<?php echo $script_text; ?>" |
|
| 2466 | + title="<?php echo $add_favourite_text; ?>"><i |
|
| 2467 | + class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text; ?></a></span> |
|
| 2468 | 2468 | <?php } |
| 2469 | 2469 | } |
| 2470 | 2470 | } |
@@ -2494,7 +2494,7 @@ discard block |
||
| 2494 | 2494 | |
| 2495 | 2495 | $post_type = $taxonomy_obj->object_type[0]; |
| 2496 | 2496 | |
| 2497 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2497 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2498 | 2498 | |
| 2499 | 2499 | /** |
| 2500 | 2500 | * Filter to modify the 'join' query |
@@ -2517,8 +2517,8 @@ discard block |
||
| 2517 | 2517 | $where = apply_filters('geodir_cat_post_count_where', $where, $term);
|
| 2518 | 2518 | |
| 2519 | 2519 | $count_query = "SELECT count(post_id) FROM |
| 2520 | - " . $table . " as pd " . $join . " |
|
| 2521 | - WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;
|
|
| 2520 | + " . $table." as pd ".$join." |
|
| 2521 | + WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id."',".$term->taxonomy.") ".$where;
|
|
| 2522 | 2522 | |
| 2523 | 2523 | $cat_post_count = $wpdb->get_var($count_query); |
| 2524 | 2524 | if (empty($cat_post_count) || is_wp_error($cat_post_count)) |
@@ -2601,7 +2601,7 @@ discard block |
||
| 2601 | 2601 | global $post; |
| 2602 | 2602 | $all_postypes = geodir_get_posttypes(); |
| 2603 | 2603 | if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
|
| 2604 | - return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>'; |
|
| 2604 | + return ' <a href="'.get_permalink($post->ID).'">'.READ_MORE_TXT.'</a>'; |
|
| 2605 | 2605 | } |
| 2606 | 2606 | |
| 2607 | 2607 | return $more; |
@@ -2628,14 +2628,14 @@ discard block |
||
| 2628 | 2628 | if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
|
| 2629 | 2629 | |
| 2630 | 2630 | $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy); |
| 2631 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 2631 | + $table = $plugin_prefix.$geodir_post_type.'_detail'; |
|
| 2632 | 2632 | |
| 2633 | 2633 | $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']); |
| 2634 | - $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png'; |
|
| 2634 | + $term_icon = $path_parts['dirname'].'/cat_icon_'.$term_id.'.png'; |
|
| 2635 | 2635 | |
| 2636 | 2636 | $posts = $wpdb->get_results( |
| 2637 | 2637 | $wpdb->prepare( |
| 2638 | - "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ", |
|
| 2638 | + "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM ".$table." WHERE FIND_IN_SET(%s,%1\$s ) ", |
|
| 2639 | 2639 | array($term_id, $taxonomy) |
| 2640 | 2640 | ) |
| 2641 | 2641 | ); |
@@ -2647,19 +2647,19 @@ discard block |
||
| 2647 | 2647 | $lng = $post_obj->post_longitude; |
| 2648 | 2648 | |
| 2649 | 2649 | $json = '{';
|
| 2650 | - $json .= '"id":"' . $post_obj->post_id . '",'; |
|
| 2651 | - $json .= '"lat_pos": "' . $lat . '",'; |
|
| 2652 | - $json .= '"long_pos": "' . $lng . '",'; |
|
| 2653 | - $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",'; |
|
| 2654 | - $json .= '"icon":"' . $term_icon . '",'; |
|
| 2655 | - $json .= '"group":"catgroup' . $term_id . '"'; |
|
| 2650 | + $json .= '"id":"'.$post_obj->post_id.'",'; |
|
| 2651 | + $json .= '"lat_pos": "'.$lat.'",'; |
|
| 2652 | + $json .= '"long_pos": "'.$lng.'",'; |
|
| 2653 | + $json .= '"marker_id":"'.$post_obj->post_id.'_'.$term_id.'",'; |
|
| 2654 | + $json .= '"icon":"'.$term_icon.'",'; |
|
| 2655 | + $json .= '"group":"catgroup'.$term_id.'"'; |
|
| 2656 | 2656 | $json .= '}'; |
| 2657 | 2657 | |
| 2658 | 2658 | if ($post_obj->default_category == $term_id) {
|
| 2659 | 2659 | |
| 2660 | 2660 | $wpdb->query( |
| 2661 | 2661 | $wpdb->prepare( |
| 2662 | - "UPDATE " . $table . " SET marker_json = %s where post_id = %d", |
|
| 2662 | + "UPDATE ".$table." SET marker_json = %s where post_id = %d", |
|
| 2663 | 2663 | array($json, $post_obj->post_id) |
| 2664 | 2664 | ) |
| 2665 | 2665 | ); |
@@ -2667,7 +2667,7 @@ discard block |
||
| 2667 | 2667 | |
| 2668 | 2668 | $wpdb->query( |
| 2669 | 2669 | $wpdb->prepare( |
| 2670 | - "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d", |
|
| 2670 | + "UPDATE ".GEODIR_ICON_TABLE." SET json = %s WHERE post_id = %d AND cat_id = %d", |
|
| 2671 | 2671 | array($json, $post_obj->post_id, $term_id) |
| 2672 | 2672 | ) |
| 2673 | 2673 | ); |
@@ -2791,7 +2791,7 @@ discard block |
||
| 2791 | 2791 | // print_r($uploads ) ; |
| 2792 | 2792 | $post_first_image = $wpdb->get_results( |
| 2793 | 2793 | $wpdb->prepare( |
| 2794 | - "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1 ", array($post_id) |
|
| 2794 | + "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = %d and menu_order = 1 ", array($post_id) |
|
| 2795 | 2795 | ) |
| 2796 | 2796 | ); |
| 2797 | 2797 | |
@@ -2812,9 +2812,9 @@ discard block |
||
| 2812 | 2812 | |
| 2813 | 2813 | $post_type = get_post_type($post_id); |
| 2814 | 2814 | |
| 2815 | - $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2815 | + $table_name = $plugin_prefix.$post_type.'_detail'; |
|
| 2816 | 2816 | |
| 2817 | - $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
|
|
| 2817 | + $wpdb->query("UPDATE ".$table_name." SET featured_image='".$post_first_image[0]->file."' WHERE post_id =".$post_id);
|
|
| 2818 | 2818 | |
| 2819 | 2819 | $new_attachment_name = basename($post_first_image[0]->file); |
| 2820 | 2820 | |
@@ -2827,11 +2827,11 @@ discard block |
||
| 2827 | 2827 | wp_delete_attachment($post_thumbnail_id); |
| 2828 | 2828 | |
| 2829 | 2829 | } |
| 2830 | - $filename = $uploads['basedir'] . $post_first_image[0]->file; |
|
| 2830 | + $filename = $uploads['basedir'].$post_first_image[0]->file; |
|
| 2831 | 2831 | |
| 2832 | 2832 | $attachment = array( |
| 2833 | 2833 | 'post_mime_type' => $post_first_image[0]->mime_type, |
| 2834 | - 'guid' => $uploads['baseurl'] . $post_first_image[0]->file, |
|
| 2834 | + 'guid' => $uploads['baseurl'].$post_first_image[0]->file, |
|
| 2835 | 2835 | 'post_parent' => $post_id, |
| 2836 | 2836 | 'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
|
| 2837 | 2837 | 'post_content' => '' |
@@ -2844,7 +2844,7 @@ discard block |
||
| 2844 | 2844 | |
| 2845 | 2845 | set_post_thumbnail($post_id, $id); |
| 2846 | 2846 | |
| 2847 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 2847 | + require_once(ABSPATH.'wp-admin/includes/image.php'); |
|
| 2848 | 2848 | wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename)); |
| 2849 | 2849 | |
| 2850 | 2850 | } |
@@ -2877,35 +2877,35 @@ discard block |
||
| 2877 | 2877 | $post_id = absint($_POST['post_id']); |
| 2878 | 2878 | $upload_dir = wp_upload_dir(); |
| 2879 | 2879 | $post_type = get_post_type($_POST['post_id']); |
| 2880 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2880 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2881 | 2881 | |
| 2882 | 2882 | $post_arr = $wpdb->get_results($wpdb->prepare( |
| 2883 | - "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1", |
|
| 2883 | + "SELECT * FROM $wpdb->posts p JOIN ".$table." gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1", |
|
| 2884 | 2884 | array($post_id) |
| 2885 | 2885 | ) |
| 2886 | 2886 | , ARRAY_A); |
| 2887 | 2887 | |
| 2888 | 2888 | $arrImages = $wpdb->get_results( |
| 2889 | 2889 | $wpdb->prepare( |
| 2890 | - "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ", |
|
| 2890 | + "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ", |
|
| 2891 | 2891 | array('%image%', $post_id)
|
| 2892 | 2892 | ) |
| 2893 | 2893 | ); |
| 2894 | 2894 | if ($arrImages) {
|
| 2895 | 2895 | $image_arr = array(); |
| 2896 | 2896 | foreach ($arrImages as $img) {
|
| 2897 | - $image_arr[] = $upload_dir['baseurl'] . $img->file; |
|
| 2897 | + $image_arr[] = $upload_dir['baseurl'].$img->file; |
|
| 2898 | 2898 | } |
| 2899 | 2899 | $comma_separated = implode(",", $image_arr);
|
| 2900 | 2900 | $post_arr[0]['post_images'] = $comma_separated; |
| 2901 | 2901 | } |
| 2902 | 2902 | |
| 2903 | 2903 | |
| 2904 | - $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category']; |
|
| 2904 | + $cats = $post_arr[0][$post_arr[0]['post_type'].'category']; |
|
| 2905 | 2905 | $cat_arr = array_filter(explode(",", $cats));
|
| 2906 | 2906 | $trans_cat = array(); |
| 2907 | 2907 | foreach ($cat_arr as $cat) {
|
| 2908 | - $trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'] . 'category', false); |
|
| 2908 | + $trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'].'category', false); |
|
| 2909 | 2909 | } |
| 2910 | 2910 | |
| 2911 | 2911 | |
@@ -2947,7 +2947,7 @@ discard block |
||
| 2947 | 2947 | |
| 2948 | 2948 | $get_data = $wpdb->get_results( |
| 2949 | 2949 | $wpdb->prepare( |
| 2950 | - "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'", |
|
| 2950 | + "SELECT htmlvar_name, field_type, extra_fields FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1'", |
|
| 2951 | 2951 | array($listing_type) |
| 2952 | 2952 | ) |
| 2953 | 2953 | ); |
@@ -2960,12 +2960,12 @@ discard block |
||
| 2960 | 2960 | |
| 2961 | 2961 | $extra_fields = unserialize($data->extra_fields); |
| 2962 | 2962 | |
| 2963 | - $prefix = $data->htmlvar_name . '_'; |
|
| 2963 | + $prefix = $data->htmlvar_name.'_'; |
|
| 2964 | 2964 | |
| 2965 | - $fields_info[$prefix . 'address'] = $data->field_type; |
|
| 2965 | + $fields_info[$prefix.'address'] = $data->field_type; |
|
| 2966 | 2966 | |
| 2967 | 2967 | if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) |
| 2968 | - $fields_info[$prefix . 'zip'] = $data->field_type; |
|
| 2968 | + $fields_info[$prefix.'zip'] = $data->field_type; |
|
| 2969 | 2969 | |
| 2970 | 2970 | } else {
|
| 2971 | 2971 | |
@@ -3063,13 +3063,13 @@ discard block |
||
| 3063 | 3063 | * @since 1.4.9 |
| 3064 | 3064 | * @package GeoDirectory |
| 3065 | 3065 | */ |
| 3066 | -function geodir_fb_like_thumbnail(){
|
|
| 3066 | +function geodir_fb_like_thumbnail() {
|
|
| 3067 | 3067 | |
| 3068 | 3068 | // return if not a single post |
| 3069 | - if(!is_single()){return;}
|
|
| 3069 | + if (!is_single()) {return; }
|
|
| 3070 | 3070 | |
| 3071 | 3071 | global $post; |
| 3072 | - if(isset($post->featured_image) && $post->featured_image){
|
|
| 3072 | + if (isset($post->featured_image) && $post->featured_image) {
|
|
| 3073 | 3073 | $upload_dir = wp_upload_dir(); |
| 3074 | 3074 | $thumb = $upload_dir['baseurl'].$post->featured_image; |
| 3075 | 3075 | echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n"; |
@@ -35,23 +35,26 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | /* ---- Delete field ---- */ |
| 37 | 37 | if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') { |
| 38 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) |
|
| 39 | - return; |
|
| 38 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) { |
|
| 39 | + return; |
|
| 40 | + } |
|
| 40 | 41 | |
| 41 | 42 | echo geodir_custom_field_delete($field_id); |
| 42 | 43 | } |
| 43 | 44 | |
| 44 | 45 | if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') { |
| 45 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) |
|
| 46 | - return; |
|
| 46 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) { |
|
| 47 | + return; |
|
| 48 | + } |
|
| 47 | 49 | |
| 48 | 50 | echo geodir_custom_sort_field_delete($field_id); |
| 49 | 51 | } |
| 50 | 52 | |
| 51 | 53 | /* ---- Save field ---- */ |
| 52 | 54 | if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') { |
| 53 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) |
|
| 54 | - return; |
|
| 55 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) { |
|
| 56 | + return; |
|
| 57 | + } |
|
| 55 | 58 | |
| 56 | 59 | foreach ($_REQUEST as $pkey => $pval) { |
| 57 | 60 | if (is_array($_REQUEST[$pkey])) { |
@@ -77,8 +80,9 @@ discard block |
||
| 77 | 80 | |
| 78 | 81 | /* ---- Save sort field ---- */ |
| 79 | 82 | if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') { |
| 80 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) |
|
| 81 | - return; |
|
| 83 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) { |
|
| 84 | + return; |
|
| 85 | + } |
|
| 82 | 86 | |
| 83 | 87 | foreach ($_REQUEST as $pkey => $pval) { |
| 84 | 88 | if (is_array($_REQUEST[$pkey])) { |
@@ -16,100 +16,100 @@ |
||
| 16 | 16 | |
| 17 | 17 | $field_ids = array(); |
| 18 | 18 | if (!empty($_REQUEST['licontainer']) && is_array($_REQUEST['licontainer'])) { |
| 19 | - foreach ($_REQUEST['licontainer'] as $lic_id) { |
|
| 20 | - $field_ids[] = sanitize_text_field($lic_id); |
|
| 21 | - } |
|
| 19 | + foreach ($_REQUEST['licontainer'] as $lic_id) { |
|
| 20 | + $field_ids[] = sanitize_text_field($lic_id); |
|
| 21 | + } |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | /* ------- check nonce field ------- */ |
| 25 | 25 | if (isset($_REQUEST['update']) && $_REQUEST['update'] == "update" && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') { |
| 26 | - echo godir_set_field_order($field_ids); |
|
| 26 | + echo godir_set_field_order($field_ids); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | if (isset($_REQUEST['update']) && $_REQUEST['update'] == "update" && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') { |
| 30 | - $response = godir_set_sort_field_order($field_ids); |
|
| 31 | - if (is_array($response)) { |
|
| 32 | - wp_send_json($response); |
|
| 33 | - } else { |
|
| 34 | - echo $response; |
|
| 35 | - } |
|
| 30 | + $response = godir_set_sort_field_order($field_ids); |
|
| 31 | + if (is_array($response)) { |
|
| 32 | + wp_send_json($response); |
|
| 33 | + } else { |
|
| 34 | + echo $response; |
|
| 35 | + } |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /* ---- Show field form in admin ---- */ |
| 39 | 39 | if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') { |
| 40 | - geodir_custom_field_adminhtml($field_type, $field_id, $field_action,$field_type_key); |
|
| 40 | + geodir_custom_field_adminhtml($field_type, $field_id, $field_action,$field_type_key); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') { |
| 44 | - geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action,$field_type_key); |
|
| 44 | + geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action,$field_type_key); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | /* ---- Delete field ---- */ |
| 48 | 48 | if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') { |
| 49 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) |
|
| 50 | - return; |
|
| 49 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) |
|
| 50 | + return; |
|
| 51 | 51 | |
| 52 | - echo geodir_custom_field_delete($field_id); |
|
| 52 | + echo geodir_custom_field_delete($field_id); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') { |
| 56 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) |
|
| 57 | - return; |
|
| 56 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) |
|
| 57 | + return; |
|
| 58 | 58 | |
| 59 | - echo geodir_custom_sort_field_delete($field_id); |
|
| 59 | + echo geodir_custom_sort_field_delete($field_id); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | /* ---- Save field ---- */ |
| 63 | 63 | if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') { |
| 64 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) |
|
| 65 | - return; |
|
| 66 | - |
|
| 67 | - foreach ($_REQUEST as $pkey => $pval) { |
|
| 68 | - if (is_array($_REQUEST[$pkey])) { |
|
| 69 | - $tags = 'skip_field'; |
|
| 70 | - } else { |
|
| 71 | - $tags = ''; |
|
| 72 | - } |
|
| 73 | - |
|
| 74 | - if ($tags != 'skip_field') { |
|
| 75 | - $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags); |
|
| 76 | - } |
|
| 77 | - } |
|
| 78 | - |
|
| 79 | - $return = geodir_custom_field_save($_REQUEST); |
|
| 80 | - |
|
| 81 | - if (is_int($return)) { |
|
| 82 | - $lastid = $return; |
|
| 83 | - geodir_custom_field_adminhtml($field_type, $lastid, 'submit',$field_type_key); |
|
| 84 | - } else { |
|
| 85 | - echo $return; |
|
| 86 | - } |
|
| 64 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) |
|
| 65 | + return; |
|
| 66 | + |
|
| 67 | + foreach ($_REQUEST as $pkey => $pval) { |
|
| 68 | + if (is_array($_REQUEST[$pkey])) { |
|
| 69 | + $tags = 'skip_field'; |
|
| 70 | + } else { |
|
| 71 | + $tags = ''; |
|
| 72 | + } |
|
| 73 | + |
|
| 74 | + if ($tags != 'skip_field') { |
|
| 75 | + $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags); |
|
| 76 | + } |
|
| 77 | + } |
|
| 78 | + |
|
| 79 | + $return = geodir_custom_field_save($_REQUEST); |
|
| 80 | + |
|
| 81 | + if (is_int($return)) { |
|
| 82 | + $lastid = $return; |
|
| 83 | + geodir_custom_field_adminhtml($field_type, $lastid, 'submit',$field_type_key); |
|
| 84 | + } else { |
|
| 85 | + echo $return; |
|
| 86 | + } |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | /* ---- Save sort field ---- */ |
| 90 | 90 | if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') { |
| 91 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) |
|
| 92 | - return; |
|
| 93 | - |
|
| 94 | - foreach ($_REQUEST as $pkey => $pval) { |
|
| 95 | - if (is_array($_REQUEST[$pkey])) { |
|
| 96 | - $tags = 'skip_field'; |
|
| 97 | - } else { |
|
| 98 | - $tags = ''; |
|
| 99 | - } |
|
| 100 | - |
|
| 101 | - if ($tags != 'skip_field') { |
|
| 102 | - $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags); |
|
| 103 | - } |
|
| 104 | - } |
|
| 105 | - |
|
| 106 | - $return = geodir_custom_sort_field_save($_REQUEST); |
|
| 107 | - |
|
| 108 | - if (is_int($return)) { |
|
| 109 | - $lastid = $return; |
|
| 110 | - $default = false; |
|
| 111 | - geodir_custom_sort_field_adminhtml($field_type, $lastid, 'submit', $default); |
|
| 112 | - } else { |
|
| 113 | - echo $return; |
|
| 114 | - } |
|
| 91 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) |
|
| 92 | + return; |
|
| 93 | + |
|
| 94 | + foreach ($_REQUEST as $pkey => $pval) { |
|
| 95 | + if (is_array($_REQUEST[$pkey])) { |
|
| 96 | + $tags = 'skip_field'; |
|
| 97 | + } else { |
|
| 98 | + $tags = ''; |
|
| 99 | + } |
|
| 100 | + |
|
| 101 | + if ($tags != 'skip_field') { |
|
| 102 | + $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags); |
|
| 103 | + } |
|
| 104 | + } |
|
| 105 | + |
|
| 106 | + $return = geodir_custom_sort_field_save($_REQUEST); |
|
| 107 | + |
|
| 108 | + if (is_int($return)) { |
|
| 109 | + $lastid = $return; |
|
| 110 | + $default = false; |
|
| 111 | + geodir_custom_sort_field_adminhtml($field_type, $lastid, 'submit', $default); |
|
| 112 | + } else { |
|
| 113 | + echo $return; |
|
| 114 | + } |
|
| 115 | 115 | } |
| 116 | 116 | \ No newline at end of file |
@@ -37,23 +37,23 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | /* ---- Show field form in admin ---- */ |
| 39 | 39 | if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') { |
| 40 | - geodir_custom_field_adminhtml($field_type, $field_id, $field_action,$field_type_key); |
|
| 40 | + geodir_custom_field_adminhtml($field_type, $field_id, $field_action, $field_type_key); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') { |
| 44 | - geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action,$field_type_key); |
|
| 44 | + geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action, $field_type_key); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | /* ---- Delete field ---- */ |
| 48 | 48 | if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') { |
| 49 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) |
|
| 49 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id)) |
|
| 50 | 50 | return; |
| 51 | 51 | |
| 52 | 52 | echo geodir_custom_field_delete($field_id); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') { |
| 56 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) |
|
| 56 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id)) |
|
| 57 | 57 | return; |
| 58 | 58 | |
| 59 | 59 | echo geodir_custom_sort_field_delete($field_id); |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | |
| 62 | 62 | /* ---- Save field ---- */ |
| 63 | 63 | if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') { |
| 64 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) |
|
| 64 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id)) |
|
| 65 | 65 | return; |
| 66 | 66 | |
| 67 | 67 | foreach ($_REQUEST as $pkey => $pval) { |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | |
| 81 | 81 | if (is_int($return)) { |
| 82 | 82 | $lastid = $return; |
| 83 | - geodir_custom_field_adminhtml($field_type, $lastid, 'submit',$field_type_key); |
|
| 83 | + geodir_custom_field_adminhtml($field_type, $lastid, 'submit', $field_type_key); |
|
| 84 | 84 | } else { |
| 85 | 85 | echo $return; |
| 86 | 86 | } |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | |
| 89 | 89 | /* ---- Save sort field ---- */ |
| 90 | 90 | if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') { |
| 91 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) |
|
| 91 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id)) |
|
| 92 | 92 | return; |
| 93 | 93 | |
| 94 | 94 | foreach ($_REQUEST as $pkey => $pval) { |
@@ -23,8 +23,12 @@ |
||
| 23 | 23 | |
| 24 | 24 | $collate = ''; |
| 25 | 25 | if ($wpdb->has_cap('collation')) {
|
| 26 | - if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset"; |
|
| 27 | - if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate"; |
|
| 26 | + if (!empty($wpdb->charset)) { |
|
| 27 | + $collate = "DEFAULT CHARACTER SET $wpdb->charset"; |
|
| 28 | + } |
|
| 29 | + if (!empty($wpdb->collate)) { |
|
| 30 | + $collate .= " COLLATE $wpdb->collate"; |
|
| 31 | + } |
|
| 28 | 32 | } |
| 29 | 33 | |
| 30 | 34 | /** |
@@ -32,35 +32,35 @@ discard block |
||
| 32 | 32 | * |
| 33 | 33 | * @since 1.0.0 |
| 34 | 34 | */ |
| 35 | - require_once(ABSPATH . 'wp-admin/includes/upgrade.php'); |
|
| 35 | + require_once(ABSPATH.'wp-admin/includes/upgrade.php'); |
|
| 36 | 36 | |
| 37 | 37 | |
| 38 | 38 | // rename tables if we need to |
| 39 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {
|
|
| 40 | - $wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");
|
|
| 39 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_countries'") == 0) {
|
|
| 40 | + $wpdb->query("RENAME TABLE geodir_countries TO ".$wpdb->prefix."geodir_countries");
|
|
| 41 | 41 | } |
| 42 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {
|
|
| 43 | - $wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");
|
|
| 42 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_custom_fields'") == 0) {
|
|
| 43 | + $wpdb->query("RENAME TABLE geodir_custom_fields TO ".$wpdb->prefix."geodir_custom_fields");
|
|
| 44 | 44 | } |
| 45 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {
|
|
| 46 | - $wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");
|
|
| 45 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_post_icon'") == 0) {
|
|
| 46 | + $wpdb->query("RENAME TABLE geodir_post_icon TO ".$wpdb->prefix."geodir_post_icon");
|
|
| 47 | 47 | } |
| 48 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {
|
|
| 49 | - $wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");
|
|
| 48 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_attachments'") == 0) {
|
|
| 49 | + $wpdb->query("RENAME TABLE geodir_attachments TO ".$wpdb->prefix."geodir_attachments");
|
|
| 50 | 50 | } |
| 51 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {
|
|
| 52 | - $wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");
|
|
| 51 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_post_review'") == 0) {
|
|
| 52 | + $wpdb->query("RENAME TABLE geodir_post_review TO ".$wpdb->prefix."geodir_post_review");
|
|
| 53 | 53 | } |
| 54 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {
|
|
| 55 | - $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");
|
|
| 54 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_custom_sort_fields'") == 0) {
|
|
| 55 | + $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO ".$wpdb->prefix."geodir_custom_sort_fields");
|
|
| 56 | 56 | } |
| 57 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {
|
|
| 58 | - $wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");
|
|
| 57 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_gd_place_detail'") == 0) {
|
|
| 58 | + $wpdb->query("RENAME TABLE geodir_gd_place_detail TO ".$wpdb->prefix."geodir_gd_place_detail");
|
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | |
| 62 | 62 | // Table for storing Countries |
| 63 | - $GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " ( |
|
| 63 | + $GEODIR_COUNTRIES_TABLE = "CREATE TABLE ".GEODIR_COUNTRIES_TABLE." ( |
|
| 64 | 64 | CountryId smallint AUTO_INCREMENT NOT NULL , |
| 65 | 65 | Country varchar (50) NOT NULL , |
| 66 | 66 | FIPS104 varchar (2) NOT NULL , |
@@ -89,11 +89,11 @@ discard block |
||
| 89 | 89 | dbDelta($GEODIR_COUNTRIES_TABLE); |
| 90 | 90 | |
| 91 | 91 | |
| 92 | - $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");
|
|
| 92 | + $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM ".GEODIR_COUNTRIES_TABLE."");
|
|
| 93 | 93 | |
| 94 | 94 | if ($country_table_empty == 0) {
|
| 95 | 95 | |
| 96 | - $countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES |
|
| 96 | + $countries_insert = "INSERT INTO ".GEODIR_COUNTRIES_TABLE." (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES |
|
| 97 | 97 | (1, 'Afghanistan', 'AF', 'AF', 'AFG', '4', 'AF', 'Kabul ', 'Asia ', 'Afghan', 'Afghans', 'Afghani ', 'AFA', 26813057, 'Afghanistan', ''), |
| 98 | 98 | (2, 'Albania', 'AL', 'AL', 'ALB', '8', 'AL', 'Tirana ', 'Europe ', 'Albanian', 'Albanians', 'Lek ', 'ALL', 3510484, 'Albania', ''), |
| 99 | 99 | (3, 'Algeria', 'AG', 'DZ', 'DZA', '12', 'DZ', 'Algiers ', 'Africa ', 'Algerian', 'Algerians', 'Algerian Dinar ', 'DZD', 31736053, 'Algeria', ''), |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | |
| 383 | 383 | // Table for storing location attribute - these are user defined |
| 384 | 384 | |
| 385 | - $icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " ( |
|
| 385 | + $icon_table = "CREATE TABLE ".GEODIR_ICON_TABLE." ( |
|
| 386 | 386 | id int NOT NULL AUTO_INCREMENT, |
| 387 | 387 | post_id int( 10 ) NOT NULL, |
| 388 | 388 | post_title varchar(254) NOT NULL, |
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | |
| 404 | 404 | // Table for storing post custom fields - these are user defined |
| 405 | 405 | |
| 406 | - $post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " ( |
|
| 406 | + $post_custom_fields = "CREATE TABLE ".GEODIR_CUSTOM_FIELDS_TABLE." ( |
|
| 407 | 407 | id int(11) NOT NULL AUTO_INCREMENT, |
| 408 | 408 | post_type varchar(100) NULL, |
| 409 | 409 | data_type varchar(100) NULL DEFAULT NULL, |
@@ -448,7 +448,7 @@ discard block |
||
| 448 | 448 | dbDelta($post_custom_fields); |
| 449 | 449 | |
| 450 | 450 | // Table for storing place attribute - these are user defined |
| 451 | - $post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail ( |
|
| 451 | + $post_detail = "CREATE TABLE ".$plugin_prefix."gd_place_detail ( |
|
| 452 | 452 | post_id int(11) NOT NULL, |
| 453 | 453 | post_title text NULL DEFAULT NULL, |
| 454 | 454 | post_status varchar(20) NULL DEFAULT NULL, |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | |
| 490 | 490 | // Table for storing place images - these are user defined |
| 491 | 491 | |
| 492 | - $attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " ( |
|
| 492 | + $attechment_table = "CREATE TABLE ".GEODIR_ATTACHMENT_TABLE." ( |
|
| 493 | 493 | ID int(11) NOT NULL AUTO_INCREMENT, |
| 494 | 494 | post_id int(11) NOT NULL, |
| 495 | 495 | user_id int(11) DEFAULT NULL, |
@@ -516,7 +516,7 @@ discard block |
||
| 516 | 516 | dbDelta($attechment_table); |
| 517 | 517 | |
| 518 | 518 | |
| 519 | - $custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " ( |
|
| 519 | + $custom_sort_fields_table = "CREATE TABLE ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." ( |
|
| 520 | 520 | id int(11) NOT NULL AUTO_INCREMENT, |
| 521 | 521 | post_type varchar(255) NOT NULL, |
| 522 | 522 | data_type varchar(255) NOT NULL, |
@@ -545,7 +545,7 @@ discard block |
||
| 545 | 545 | dbDelta($custom_sort_fields_table); |
| 546 | 546 | |
| 547 | 547 | |
| 548 | - $review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " ( |
|
| 548 | + $review_table = "CREATE TABLE ".GEODIR_REVIEW_TABLE." ( |
|
| 549 | 549 | id int(11) NOT NULL AUTO_INCREMENT, |
| 550 | 550 | post_id int(11) DEFAULT NULL, |
| 551 | 551 | post_title varchar( 255 ) NULL DEFAULT NULL, |
@@ -6,26 +6,26 @@ discard block |
||
| 6 | 6 | * @package GeoDirectory |
| 7 | 7 | */ |
| 8 | 8 | if (!function_exists('geodir_create_tables')) {
|
| 9 | - /** |
|
| 10 | - * Creates custom db tables for storing GeoDirectory plugin data. |
|
| 11 | - * |
|
| 12 | - * @since 1.0.0 |
|
| 13 | - * @package GeoDirectory |
|
| 14 | - * @global object $wpdb WordPress Database object. |
|
| 15 | - * @global string $plugin_prefix GeoDirectory plugin table prefix. |
|
| 16 | - */ |
|
| 17 | - function geodir_create_tables() |
|
| 18 | - {
|
|
| 19 | - |
|
| 20 | - global $wpdb, $plugin_prefix; |
|
| 21 | - |
|
| 22 | - $wpdb->hide_errors(); |
|
| 23 | - |
|
| 24 | - $collate = ''; |
|
| 25 | - if ($wpdb->has_cap('collation')) {
|
|
| 26 | - if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset"; |
|
| 27 | - if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate"; |
|
| 28 | - } |
|
| 9 | + /** |
|
| 10 | + * Creates custom db tables for storing GeoDirectory plugin data. |
|
| 11 | + * |
|
| 12 | + * @since 1.0.0 |
|
| 13 | + * @package GeoDirectory |
|
| 14 | + * @global object $wpdb WordPress Database object. |
|
| 15 | + * @global string $plugin_prefix GeoDirectory plugin table prefix. |
|
| 16 | + */ |
|
| 17 | + function geodir_create_tables() |
|
| 18 | + {
|
|
| 19 | + |
|
| 20 | + global $wpdb, $plugin_prefix; |
|
| 21 | + |
|
| 22 | + $wpdb->hide_errors(); |
|
| 23 | + |
|
| 24 | + $collate = ''; |
|
| 25 | + if ($wpdb->has_cap('collation')) {
|
|
| 26 | + if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset"; |
|
| 27 | + if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate"; |
|
| 28 | + } |
|
| 29 | 29 | |
| 30 | 30 | /** |
| 31 | 31 | * Include any functions needed for upgrades. |
@@ -36,31 +36,31 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | |
| 38 | 38 | // rename tables if we need to |
| 39 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {
|
|
| 40 | - $wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");
|
|
| 41 | - } |
|
| 42 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {
|
|
| 43 | - $wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");
|
|
| 44 | - } |
|
| 45 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {
|
|
| 46 | - $wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");
|
|
| 47 | - } |
|
| 48 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {
|
|
| 49 | - $wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");
|
|
| 50 | - } |
|
| 51 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {
|
|
| 52 | - $wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");
|
|
| 53 | - } |
|
| 54 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {
|
|
| 55 | - $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");
|
|
| 56 | - } |
|
| 57 | - if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {
|
|
| 58 | - $wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");
|
|
| 59 | - } |
|
| 60 | - |
|
| 61 | - |
|
| 62 | - // Table for storing Countries |
|
| 63 | - $GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " ( |
|
| 39 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {
|
|
| 40 | + $wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");
|
|
| 41 | + } |
|
| 42 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {
|
|
| 43 | + $wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");
|
|
| 44 | + } |
|
| 45 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {
|
|
| 46 | + $wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");
|
|
| 47 | + } |
|
| 48 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {
|
|
| 49 | + $wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");
|
|
| 50 | + } |
|
| 51 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {
|
|
| 52 | + $wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");
|
|
| 53 | + } |
|
| 54 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {
|
|
| 55 | + $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");
|
|
| 56 | + } |
|
| 57 | + if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {
|
|
| 58 | + $wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");
|
|
| 59 | + } |
|
| 60 | + |
|
| 61 | + |
|
| 62 | + // Table for storing Countries |
|
| 63 | + $GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " ( |
|
| 64 | 64 | CountryId smallint AUTO_INCREMENT NOT NULL , |
| 65 | 65 | Country varchar (50) NOT NULL , |
| 66 | 66 | FIPS104 varchar (2) NOT NULL , |
@@ -79,21 +79,21 @@ discard block |
||
| 79 | 79 | Comment varchar (255) NULL , |
| 80 | 80 | PRIMARY KEY (CountryId)) $collate "; |
| 81 | 81 | |
| 82 | - /** |
|
| 83 | - * Filter the SQL query that creates/updates the country DB table structure. |
|
| 84 | - * |
|
| 85 | - * @since 1.0.0 |
|
| 86 | - * @param string $sql The SQL insert query string. |
|
| 87 | - */ |
|
| 88 | - $GEODIR_COUNTRIES_TABLE = apply_filters('geodir_before_country_table_create', $GEODIR_COUNTRIES_TABLE);
|
|
| 89 | - dbDelta($GEODIR_COUNTRIES_TABLE); |
|
| 82 | + /** |
|
| 83 | + * Filter the SQL query that creates/updates the country DB table structure. |
|
| 84 | + * |
|
| 85 | + * @since 1.0.0 |
|
| 86 | + * @param string $sql The SQL insert query string. |
|
| 87 | + */ |
|
| 88 | + $GEODIR_COUNTRIES_TABLE = apply_filters('geodir_before_country_table_create', $GEODIR_COUNTRIES_TABLE);
|
|
| 89 | + dbDelta($GEODIR_COUNTRIES_TABLE); |
|
| 90 | 90 | |
| 91 | 91 | |
| 92 | - $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");
|
|
| 92 | + $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");
|
|
| 93 | 93 | |
| 94 | - if ($country_table_empty == 0) {
|
|
| 94 | + if ($country_table_empty == 0) {
|
|
| 95 | 95 | |
| 96 | - $countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES |
|
| 96 | + $countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES |
|
| 97 | 97 | (1, 'Afghanistan', 'AF', 'AF', 'AFG', '4', 'AF', 'Kabul ', 'Asia ', 'Afghan', 'Afghans', 'Afghani ', 'AFA', 26813057, 'Afghanistan', ''), |
| 98 | 98 | (2, 'Albania', 'AL', 'AL', 'ALB', '8', 'AL', 'Tirana ', 'Europe ', 'Albanian', 'Albanians', 'Lek ', 'ALL', 3510484, 'Albania', ''), |
| 99 | 99 | (3, 'Algeria', 'AG', 'DZ', 'DZA', '12', 'DZ', 'Algiers ', 'Africa ', 'Algerian', 'Algerians', 'Algerian Dinar ', 'DZD', 31736053, 'Algeria', ''), |
@@ -368,21 +368,21 @@ discard block |
||
| 368 | 368 | (277, 'Caribbean Netherlands', '--', 'BQ', 'BES', '535', 'BQ', '--', 'Central America and the Caribbean', '--', '--', 'United States dollar', 'USD', 21133, 'Caribbean Netherlands', ''), |
| 369 | 369 | (278, 'Kosovo', 'XK', 'XK', '--', '--', 'XK', 'Pristina', 'Europe', '--', '--', 'Euro', 'EUR', 1859203, 'Caribbean Netherlands', 'Kosovo')"; |
| 370 | 370 | |
| 371 | - /** |
|
| 372 | - * Filter the SQL query that inserts the country DB table data. |
|
| 373 | - * |
|
| 374 | - * @since 1.0.0 |
|
| 375 | - * @param string $sql The SQL insert query string. |
|
| 376 | - */ |
|
| 377 | - $countries_insert = apply_filters('geodir_before_country_data_insert', $countries_insert);
|
|
| 378 | - $wpdb->query($countries_insert); |
|
| 371 | + /** |
|
| 372 | + * Filter the SQL query that inserts the country DB table data. |
|
| 373 | + * |
|
| 374 | + * @since 1.0.0 |
|
| 375 | + * @param string $sql The SQL insert query string. |
|
| 376 | + */ |
|
| 377 | + $countries_insert = apply_filters('geodir_before_country_data_insert', $countries_insert);
|
|
| 378 | + $wpdb->query($countries_insert); |
|
| 379 | 379 | |
| 380 | - } |
|
| 380 | + } |
|
| 381 | 381 | |
| 382 | 382 | |
| 383 | - // Table for storing location attribute - these are user defined |
|
| 383 | + // Table for storing location attribute - these are user defined |
|
| 384 | 384 | |
| 385 | - $icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " ( |
|
| 385 | + $icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " ( |
|
| 386 | 386 | id int NOT NULL AUTO_INCREMENT, |
| 387 | 387 | post_id int( 10 ) NOT NULL, |
| 388 | 388 | post_title varchar(254) NOT NULL, |
@@ -391,19 +391,19 @@ discard block |
||
| 391 | 391 | PRIMARY KEY (id) |
| 392 | 392 | ) $collate "; |
| 393 | 393 | |
| 394 | - /** |
|
| 395 | - * Filter the SQL query that creates/updates the post_icon DB table structure. |
|
| 396 | - * |
|
| 397 | - * @since 1.0.0 |
|
| 398 | - * @param string $sql The SQL insert query string. |
|
| 399 | - */ |
|
| 400 | - $icon_table = apply_filters('geodir_before_icon_table_create', $icon_table);
|
|
| 394 | + /** |
|
| 395 | + * Filter the SQL query that creates/updates the post_icon DB table structure. |
|
| 396 | + * |
|
| 397 | + * @since 1.0.0 |
|
| 398 | + * @param string $sql The SQL insert query string. |
|
| 399 | + */ |
|
| 400 | + $icon_table = apply_filters('geodir_before_icon_table_create', $icon_table);
|
|
| 401 | 401 | |
| 402 | - dbDelta($icon_table); |
|
| 402 | + dbDelta($icon_table); |
|
| 403 | 403 | |
| 404 | - // Table for storing post custom fields - these are user defined |
|
| 404 | + // Table for storing post custom fields - these are user defined |
|
| 405 | 405 | |
| 406 | - $post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " ( |
|
| 406 | + $post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " ( |
|
| 407 | 407 | id int(11) NOT NULL AUTO_INCREMENT, |
| 408 | 408 | post_type varchar(100) NULL, |
| 409 | 409 | data_type varchar(100) NULL DEFAULT NULL, |
@@ -439,18 +439,18 @@ discard block |
||
| 439 | 439 | PRIMARY KEY (id) |
| 440 | 440 | ) $collate"; |
| 441 | 441 | |
| 442 | - /** |
|
| 443 | - * Filter the SQL query that creates/updates the custom_fields DB table structure. |
|
| 444 | - * |
|
| 445 | - * @since 1.0.0 |
|
| 446 | - * @param string $sql The SQL insert query string. |
|
| 447 | - */ |
|
| 448 | - $post_custom_fields = apply_filters('geodir_before_custom_field_table_create', $post_custom_fields);
|
|
| 442 | + /** |
|
| 443 | + * Filter the SQL query that creates/updates the custom_fields DB table structure. |
|
| 444 | + * |
|
| 445 | + * @since 1.0.0 |
|
| 446 | + * @param string $sql The SQL insert query string. |
|
| 447 | + */ |
|
| 448 | + $post_custom_fields = apply_filters('geodir_before_custom_field_table_create', $post_custom_fields);
|
|
| 449 | 449 | |
| 450 | - dbDelta($post_custom_fields); |
|
| 450 | + dbDelta($post_custom_fields); |
|
| 451 | 451 | |
| 452 | - // Table for storing place attribute - these are user defined |
|
| 453 | - $post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail ( |
|
| 452 | + // Table for storing place attribute - these are user defined |
|
| 453 | + $post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail ( |
|
| 454 | 454 | post_id int(11) NOT NULL, |
| 455 | 455 | post_title text NULL DEFAULT NULL, |
| 456 | 456 | post_status varchar(20) NULL DEFAULT NULL, |
@@ -477,22 +477,22 @@ discard block |
||
| 477 | 477 | PRIMARY KEY (post_id) |
| 478 | 478 | ) $collate "; |
| 479 | 479 | |
| 480 | - /** |
|
| 481 | - * Filter the SQL query that creates/updates the post_detail DB table structure. |
|
| 482 | - * |
|
| 483 | - * @since 1.0.0 |
|
| 484 | - * @param string $sql The SQL insert query string. |
|
| 485 | - */ |
|
| 486 | - $post_detail = apply_filters('geodir_before_post_detail_table_create', $post_detail);
|
|
| 480 | + /** |
|
| 481 | + * Filter the SQL query that creates/updates the post_detail DB table structure. |
|
| 482 | + * |
|
| 483 | + * @since 1.0.0 |
|
| 484 | + * @param string $sql The SQL insert query string. |
|
| 485 | + */ |
|
| 486 | + $post_detail = apply_filters('geodir_before_post_detail_table_create', $post_detail);
|
|
| 487 | 487 | |
| 488 | - dbDelta($post_detail); |
|
| 488 | + dbDelta($post_detail); |
|
| 489 | 489 | |
| 490 | - // alter post_title |
|
| 491 | - //$wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_gd_place_detail MODIFY `post_title` text NULL");
|
|
| 490 | + // alter post_title |
|
| 491 | + //$wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_gd_place_detail MODIFY `post_title` text NULL");
|
|
| 492 | 492 | |
| 493 | - // Table for storing place images - these are user defined |
|
| 493 | + // Table for storing place images - these are user defined |
|
| 494 | 494 | |
| 495 | - $attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " ( |
|
| 495 | + $attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " ( |
|
| 496 | 496 | ID int(11) NOT NULL AUTO_INCREMENT, |
| 497 | 497 | post_id int(11) NOT NULL, |
| 498 | 498 | user_id int(11) DEFAULT NULL, |
@@ -508,18 +508,18 @@ discard block |
||
| 508 | 508 | PRIMARY KEY (ID) |
| 509 | 509 | ) $collate "; |
| 510 | 510 | |
| 511 | - /** |
|
| 512 | - * Filter the SQL query that creates/updates the attachments DB table structure. |
|
| 513 | - * |
|
| 514 | - * @since 1.0.0 |
|
| 515 | - * @param string $sql The SQL insert query string. |
|
| 516 | - */ |
|
| 517 | - $attechment_table = apply_filters('geodir_before_attachment_table_create', $attechment_table);
|
|
| 511 | + /** |
|
| 512 | + * Filter the SQL query that creates/updates the attachments DB table structure. |
|
| 513 | + * |
|
| 514 | + * @since 1.0.0 |
|
| 515 | + * @param string $sql The SQL insert query string. |
|
| 516 | + */ |
|
| 517 | + $attechment_table = apply_filters('geodir_before_attachment_table_create', $attechment_table);
|
|
| 518 | 518 | |
| 519 | - dbDelta($attechment_table); |
|
| 519 | + dbDelta($attechment_table); |
|
| 520 | 520 | |
| 521 | 521 | |
| 522 | - $custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " ( |
|
| 522 | + $custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " ( |
|
| 523 | 523 | id int(11) NOT NULL AUTO_INCREMENT, |
| 524 | 524 | post_type varchar(255) NOT NULL, |
| 525 | 525 | data_type varchar(255) NOT NULL, |
@@ -537,18 +537,18 @@ discard block |
||
| 537 | 537 | PRIMARY KEY (id) |
| 538 | 538 | ) $collate "; |
| 539 | 539 | |
| 540 | - /** |
|
| 541 | - * Filter the SQL query that creates/updates the custom_sort_fields DB table structure. |
|
| 542 | - * |
|
| 543 | - * @since 1.0.0 |
|
| 544 | - * @param string $sql The SQL insert query string. |
|
| 545 | - */ |
|
| 546 | - $custom_sort_fields_table = apply_filters('geodir_before_sort_fields_table_create', $custom_sort_fields_table);
|
|
| 540 | + /** |
|
| 541 | + * Filter the SQL query that creates/updates the custom_sort_fields DB table structure. |
|
| 542 | + * |
|
| 543 | + * @since 1.0.0 |
|
| 544 | + * @param string $sql The SQL insert query string. |
|
| 545 | + */ |
|
| 546 | + $custom_sort_fields_table = apply_filters('geodir_before_sort_fields_table_create', $custom_sort_fields_table);
|
|
| 547 | 547 | |
| 548 | - dbDelta($custom_sort_fields_table); |
|
| 548 | + dbDelta($custom_sort_fields_table); |
|
| 549 | 549 | |
| 550 | 550 | |
| 551 | - $review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " ( |
|
| 551 | + $review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " ( |
|
| 552 | 552 | id int(11) NOT NULL AUTO_INCREMENT, |
| 553 | 553 | post_id int(11) DEFAULT NULL, |
| 554 | 554 | post_title varchar( 255 ) NULL DEFAULT NULL, |
@@ -572,51 +572,51 @@ discard block |
||
| 572 | 572 | PRIMARY KEY (id) |
| 573 | 573 | ) $collate "; |
| 574 | 574 | |
| 575 | - /** |
|
| 576 | - * Filter the SQL query that creates the review DB table structure. |
|
| 577 | - * |
|
| 578 | - * @since 1.0.0 |
|
| 579 | - * @param string $sql The SQL insert query string. |
|
| 580 | - */ |
|
| 581 | - $review_table = apply_filters('geodir_before_review_table_create', $review_table);
|
|
| 582 | - dbDelta($review_table); |
|
| 575 | + /** |
|
| 576 | + * Filter the SQL query that creates the review DB table structure. |
|
| 577 | + * |
|
| 578 | + * @since 1.0.0 |
|
| 579 | + * @param string $sql The SQL insert query string. |
|
| 580 | + */ |
|
| 581 | + $review_table = apply_filters('geodir_before_review_table_create', $review_table);
|
|
| 582 | + dbDelta($review_table); |
|
| 583 | 583 | |
| 584 | 584 | |
| 585 | 585 | |
| 586 | - // Alter terms table |
|
| 587 | - $term_icon_column = $wpdb->get_var("SHOW COLUMNS FROM $wpdb->terms where field='term_icon'");
|
|
| 588 | - if (!$term_icon_column) {
|
|
| 589 | - $wpdb->query("ALTER TABLE $wpdb->terms ADD `term_icon` TEXT NULL DEFAULT NULL");
|
|
| 590 | - } |
|
| 586 | + // Alter terms table |
|
| 587 | + $term_icon_column = $wpdb->get_var("SHOW COLUMNS FROM $wpdb->terms where field='term_icon'");
|
|
| 588 | + if (!$term_icon_column) {
|
|
| 589 | + $wpdb->query("ALTER TABLE $wpdb->terms ADD `term_icon` TEXT NULL DEFAULT NULL");
|
|
| 590 | + } |
|
| 591 | 591 | |
| 592 | - //require_once(geodir_plugin_path() . '/upgrade.php'); |
|
| 592 | + //require_once(geodir_plugin_path() . '/upgrade.php'); |
|
| 593 | 593 | |
| 594 | 594 | |
| 595 | - } |
|
| 595 | + } |
|
| 596 | 596 | } // END MAIN FUNCTION geodir_tables_install |
| 597 | 597 | |
| 598 | 598 | if (!function_exists('geodir_create_default_fields')) {
|
| 599 | - /** |
|
| 600 | - * Inserts default custom fields table data into database. |
|
| 601 | - * |
|
| 602 | - * @since 1.0.0 |
|
| 603 | - * @package GeoDirectory |
|
| 604 | - */ |
|
| 605 | - function geodir_create_default_fields() |
|
| 606 | - {
|
|
| 607 | - |
|
| 608 | - $fields = geodir_default_custom_fields('gd_place');
|
|
| 609 | - |
|
| 610 | - /** |
|
| 611 | - * Filter the array of default custom fields DB table data. |
|
| 612 | - * |
|
| 613 | - * @since 1.0.0 |
|
| 614 | - * @param string $fields The default custom fields as an array. |
|
| 615 | - */ |
|
| 616 | - $fields = apply_filters('geodir_before_default_custom_fields_saved', $fields);
|
|
| 617 | - foreach ($fields as $field_index => $field) {
|
|
| 618 | - geodir_custom_field_save($field); |
|
| 619 | - |
|
| 620 | - } |
|
| 621 | - } |
|
| 599 | + /** |
|
| 600 | + * Inserts default custom fields table data into database. |
|
| 601 | + * |
|
| 602 | + * @since 1.0.0 |
|
| 603 | + * @package GeoDirectory |
|
| 604 | + */ |
|
| 605 | + function geodir_create_default_fields() |
|
| 606 | + {
|
|
| 607 | + |
|
| 608 | + $fields = geodir_default_custom_fields('gd_place');
|
|
| 609 | + |
|
| 610 | + /** |
|
| 611 | + * Filter the array of default custom fields DB table data. |
|
| 612 | + * |
|
| 613 | + * @since 1.0.0 |
|
| 614 | + * @param string $fields The default custom fields as an array. |
|
| 615 | + */ |
|
| 616 | + $fields = apply_filters('geodir_before_default_custom_fields_saved', $fields);
|
|
| 617 | + foreach ($fields as $field_index => $field) {
|
|
| 618 | + geodir_custom_field_save($field); |
|
| 619 | + |
|
| 620 | + } |
|
| 621 | + } |
|
| 622 | 622 | } |
| 623 | 623 | \ No newline at end of file |
@@ -16,184 +16,184 @@ |
||
| 16 | 16 | */ |
| 17 | 17 | $geodir_settings['permalink_settings'] = apply_filters('geodir_permalink_settings', array( |
| 18 | 18 | |
| 19 | - /* Listing Permalink Settings start */ |
|
| 20 | - array('name' => __('Permalink', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set permalink', 'id' => 'geodir_permalink_settings '), |
|
| 21 | - |
|
| 22 | - |
|
| 23 | - array('name' => __('Listing Detail Permalink Settings', 'geodirectory'), |
|
| 24 | - 'type' => 'sectionstart', |
|
| 25 | - 'desc' => '', |
|
| 26 | - 'id' => 'geodir_permalink'), |
|
| 27 | - |
|
| 28 | - array( |
|
| 29 | - 'name' => __('Add location in urls', 'geodirectory'), |
|
| 30 | - 'desc' => __('Add location slug in listing urls', 'geodirectory'), |
|
| 31 | - 'id' => 'geodir_add_location_url', |
|
| 32 | - 'type' => 'checkbox', |
|
| 33 | - 'std' => '1', |
|
| 34 | - 'checkboxgroup' => 'start' |
|
| 35 | - ), |
|
| 36 | - |
|
| 37 | - array( |
|
| 38 | - 'name' => __('Add full location in listing urls', 'geodirectory'), |
|
| 39 | - 'desc' => __('Add full location info with country, region and city slug in listing urls', 'geodirectory'), |
|
| 40 | - 'id' => 'geodir_show_location_url', |
|
| 41 | - 'type' => 'radio', |
|
| 42 | - 'value' => 'all', |
|
| 43 | - 'std' => 'all', |
|
| 44 | - 'radiogroup' => '' |
|
| 45 | - ), |
|
| 46 | - |
|
| 47 | - array( |
|
| 48 | - 'name' => __('Add country and city slug in listing urls', 'geodirectory'), |
|
| 49 | - 'desc' => __('Add country and city slug in listing urls (/country/city/)', 'geodirectory'), |
|
| 50 | - 'id' => 'geodir_show_location_url', |
|
| 51 | - 'type' => 'radio', |
|
| 52 | - 'std' => 'all', |
|
| 53 | - 'value' => 'country_city', |
|
| 54 | - 'radiogroup' => '' |
|
| 55 | - ), |
|
| 56 | - array( |
|
| 57 | - 'name' => __('Add region and city slug in listing urls', 'geodirectory'), |
|
| 58 | - 'desc' => __('Add region and city slug in listing urls (/region/city/)', 'geodirectory'), |
|
| 59 | - 'id' => 'geodir_show_location_url', |
|
| 60 | - 'type' => 'radio', |
|
| 61 | - 'std' => 'all', |
|
| 62 | - 'value' => 'region_city', |
|
| 63 | - 'radiogroup' => '' |
|
| 64 | - ), |
|
| 65 | - array( |
|
| 66 | - 'name' => __('Add only city in listing urls', 'geodirectory'), |
|
| 67 | - 'desc' => __('Add city slug in listing urls', 'geodirectory'), |
|
| 68 | - 'id' => 'geodir_show_location_url', |
|
| 69 | - 'type' => 'radio', |
|
| 70 | - 'std' => 'all', |
|
| 71 | - 'value' => 'city', |
|
| 72 | - 'radiogroup' => 'end' |
|
| 73 | - ), |
|
| 74 | - |
|
| 75 | - |
|
| 76 | - |
|
| 77 | - array( |
|
| 78 | - 'name' => __('Add category in listing urls', 'geodirectory'), |
|
| 79 | - 'desc' => __('Add requested category slugs in listing urls', 'geodirectory'), |
|
| 80 | - 'id' => 'geodir_add_categories_url', |
|
| 81 | - 'type' => 'checkbox', |
|
| 82 | - 'std' => '1', |
|
| 83 | - ), |
|
| 84 | - |
|
| 85 | - array( |
|
| 86 | - 'name' => __('Listing url prefix', 'geodirectory'), |
|
| 87 | - 'desc' => __('Listing prefix to show in url', 'geodirectory'), |
|
| 88 | - 'id' => 'geodir_listing_prefix', |
|
| 89 | - 'type' => 'text', |
|
| 90 | - 'css' => 'min-width:300px;', |
|
| 91 | - 'std' => 'places' |
|
| 92 | - ), |
|
| 93 | - |
|
| 94 | - array( |
|
| 95 | - 'name' => __('Location url prefix', 'geodirectory'), |
|
| 96 | - 'desc' => __('Depreciated, now uses the location page slug', 'geodirectory'), |
|
| 97 | - 'id' => 'geodir_location_prefix', |
|
| 98 | - 'type' => 'text', |
|
| 99 | - 'css' => 'min-width:300px;', |
|
| 100 | - 'std' => 'location' // Default value to show home top section |
|
| 101 | - ), |
|
| 102 | - |
|
| 103 | - array( |
|
| 104 | - 'name' => __('Location and category url separator', 'geodirectory'), |
|
| 105 | - 'desc' => __('Separator to show between location and category url slugs in listing urls', 'geodirectory'), |
|
| 106 | - 'id' => 'geodir_listingurl_separator', |
|
| 107 | - 'type' => 'text', |
|
| 108 | - 'css' => 'min-width:300px;', |
|
| 109 | - 'std' => 'C' // Default value to show home top section |
|
| 110 | - ), |
|
| 111 | - |
|
| 112 | - array( |
|
| 113 | - 'name' => __('Listing detail url separator', 'geodirectory'), |
|
| 114 | - 'desc' => __('Separator to show before listing slug in listing detail urls', 'geodirectory'), |
|
| 115 | - 'id' => 'geodir_detailurl_separator', |
|
| 116 | - 'type' => 'text', |
|
| 117 | - 'css' => 'min-width:300px;', |
|
| 118 | - 'std' => 'info' // Default value to show home top section |
|
| 119 | - ), |
|
| 120 | - |
|
| 121 | - |
|
| 122 | - array('type' => 'sectionend', 'id' => 'geodir_permalink'), |
|
| 123 | - |
|
| 124 | - array('name' => __('GeoDirectory Pages', 'geodirectory'), |
|
| 125 | - 'type' => 'sectionstart', |
|
| 126 | - 'desc' => '', |
|
| 127 | - 'id' => 'geodir_pages'), |
|
| 128 | - |
|
| 129 | - array( |
|
| 130 | - 'name' => __('GD Home page', 'geodirectory'), |
|
| 131 | - 'desc' => __('Select the page to use for the GD homepage (you must also set this page in Settings>Reading>Front page for it to work)', 'geodirectory'), |
|
| 132 | - 'id' => 'geodir_home_page', |
|
| 133 | - 'type' => 'single_select_page', |
|
| 134 | - 'class' => 'chosen_select' |
|
| 135 | - ), |
|
| 136 | - |
|
| 137 | - array( |
|
| 138 | - 'name' => __('Add listing page', 'geodirectory'), |
|
| 139 | - 'desc' => __('Select the page to use for adding listings', 'geodirectory'), |
|
| 140 | - 'id' => 'geodir_add_listing_page', |
|
| 141 | - 'type' => 'single_select_page', |
|
| 142 | - 'class' => 'chosen_select' |
|
| 143 | - ), |
|
| 144 | - |
|
| 145 | - array( |
|
| 146 | - 'name' => __('Listing preview page', 'geodirectory'), |
|
| 147 | - 'desc' => __('Select the page to use for listing preview', 'geodirectory'), |
|
| 148 | - 'id' => 'geodir_preview_page', |
|
| 149 | - 'type' => 'single_select_page', |
|
| 150 | - 'class' => 'chosen_select' |
|
| 151 | - ), |
|
| 152 | - |
|
| 153 | - array( |
|
| 154 | - 'name' => __('Listing success page', 'geodirectory'), |
|
| 155 | - 'desc' => __('Select the page to use for listing success', 'geodirectory'), |
|
| 156 | - 'id' => 'geodir_success_page', |
|
| 157 | - 'type' => 'single_select_page', |
|
| 158 | - 'class' => 'chosen_select' |
|
| 159 | - ), |
|
| 160 | - |
|
| 161 | - array( |
|
| 162 | - 'name' => __('Location page', 'geodirectory'), |
|
| 163 | - 'desc' => __('Select the page to use for locations', 'geodirectory'), |
|
| 164 | - 'id' => 'geodir_location_page', |
|
| 165 | - 'type' => 'single_select_page', |
|
| 166 | - 'class' => 'chosen_select' |
|
| 167 | - ), |
|
| 168 | - |
|
| 169 | - array( |
|
| 170 | - 'name' => __('Terms and Conditions page', 'geodirectory'), |
|
| 171 | - 'desc' => __('Select the page to use for Terms and Conditions (if enabled)', 'geodirectory'), |
|
| 172 | - 'id' => 'geodir_term_condition_page', |
|
| 173 | - 'type' => 'single_select_page', |
|
| 174 | - 'class' => 'chosen_select' |
|
| 175 | - ), |
|
| 176 | - |
|
| 177 | - array( |
|
| 178 | - 'name' => __('Info page', 'geodirectory'), |
|
| 179 | - 'desc' => __('Select the page to use for Gd general Info', 'geodirectory'), |
|
| 180 | - 'id' => 'geodir_info_page', |
|
| 181 | - 'type' => 'single_select_page', |
|
| 182 | - 'class' => 'chosen_select' |
|
| 183 | - ), |
|
| 184 | - |
|
| 185 | - array( |
|
| 186 | - 'name' => __('Login page', 'geodirectory'), |
|
| 187 | - 'desc' => __('Select the page to use for Login / Register', 'geodirectory'), |
|
| 188 | - 'id' => 'geodir_login_page', |
|
| 189 | - 'type' => 'single_select_page', |
|
| 190 | - 'class' => 'chosen_select' |
|
| 191 | - ), |
|
| 192 | - |
|
| 193 | - |
|
| 194 | - array('type' => 'sectionend', 'id' => 'geodir_pages'), |
|
| 195 | - |
|
| 196 | - /* Listing Detail Permalink Settings End */ |
|
| 19 | + /* Listing Permalink Settings start */ |
|
| 20 | + array('name' => __('Permalink', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set permalink', 'id' => 'geodir_permalink_settings '), |
|
| 21 | + |
|
| 22 | + |
|
| 23 | + array('name' => __('Listing Detail Permalink Settings', 'geodirectory'), |
|
| 24 | + 'type' => 'sectionstart', |
|
| 25 | + 'desc' => '', |
|
| 26 | + 'id' => 'geodir_permalink'), |
|
| 27 | + |
|
| 28 | + array( |
|
| 29 | + 'name' => __('Add location in urls', 'geodirectory'), |
|
| 30 | + 'desc' => __('Add location slug in listing urls', 'geodirectory'), |
|
| 31 | + 'id' => 'geodir_add_location_url', |
|
| 32 | + 'type' => 'checkbox', |
|
| 33 | + 'std' => '1', |
|
| 34 | + 'checkboxgroup' => 'start' |
|
| 35 | + ), |
|
| 36 | + |
|
| 37 | + array( |
|
| 38 | + 'name' => __('Add full location in listing urls', 'geodirectory'), |
|
| 39 | + 'desc' => __('Add full location info with country, region and city slug in listing urls', 'geodirectory'), |
|
| 40 | + 'id' => 'geodir_show_location_url', |
|
| 41 | + 'type' => 'radio', |
|
| 42 | + 'value' => 'all', |
|
| 43 | + 'std' => 'all', |
|
| 44 | + 'radiogroup' => '' |
|
| 45 | + ), |
|
| 46 | + |
|
| 47 | + array( |
|
| 48 | + 'name' => __('Add country and city slug in listing urls', 'geodirectory'), |
|
| 49 | + 'desc' => __('Add country and city slug in listing urls (/country/city/)', 'geodirectory'), |
|
| 50 | + 'id' => 'geodir_show_location_url', |
|
| 51 | + 'type' => 'radio', |
|
| 52 | + 'std' => 'all', |
|
| 53 | + 'value' => 'country_city', |
|
| 54 | + 'radiogroup' => '' |
|
| 55 | + ), |
|
| 56 | + array( |
|
| 57 | + 'name' => __('Add region and city slug in listing urls', 'geodirectory'), |
|
| 58 | + 'desc' => __('Add region and city slug in listing urls (/region/city/)', 'geodirectory'), |
|
| 59 | + 'id' => 'geodir_show_location_url', |
|
| 60 | + 'type' => 'radio', |
|
| 61 | + 'std' => 'all', |
|
| 62 | + 'value' => 'region_city', |
|
| 63 | + 'radiogroup' => '' |
|
| 64 | + ), |
|
| 65 | + array( |
|
| 66 | + 'name' => __('Add only city in listing urls', 'geodirectory'), |
|
| 67 | + 'desc' => __('Add city slug in listing urls', 'geodirectory'), |
|
| 68 | + 'id' => 'geodir_show_location_url', |
|
| 69 | + 'type' => 'radio', |
|
| 70 | + 'std' => 'all', |
|
| 71 | + 'value' => 'city', |
|
| 72 | + 'radiogroup' => 'end' |
|
| 73 | + ), |
|
| 74 | + |
|
| 75 | + |
|
| 76 | + |
|
| 77 | + array( |
|
| 78 | + 'name' => __('Add category in listing urls', 'geodirectory'), |
|
| 79 | + 'desc' => __('Add requested category slugs in listing urls', 'geodirectory'), |
|
| 80 | + 'id' => 'geodir_add_categories_url', |
|
| 81 | + 'type' => 'checkbox', |
|
| 82 | + 'std' => '1', |
|
| 83 | + ), |
|
| 84 | + |
|
| 85 | + array( |
|
| 86 | + 'name' => __('Listing url prefix', 'geodirectory'), |
|
| 87 | + 'desc' => __('Listing prefix to show in url', 'geodirectory'), |
|
| 88 | + 'id' => 'geodir_listing_prefix', |
|
| 89 | + 'type' => 'text', |
|
| 90 | + 'css' => 'min-width:300px;', |
|
| 91 | + 'std' => 'places' |
|
| 92 | + ), |
|
| 93 | + |
|
| 94 | + array( |
|
| 95 | + 'name' => __('Location url prefix', 'geodirectory'), |
|
| 96 | + 'desc' => __('Depreciated, now uses the location page slug', 'geodirectory'), |
|
| 97 | + 'id' => 'geodir_location_prefix', |
|
| 98 | + 'type' => 'text', |
|
| 99 | + 'css' => 'min-width:300px;', |
|
| 100 | + 'std' => 'location' // Default value to show home top section |
|
| 101 | + ), |
|
| 102 | + |
|
| 103 | + array( |
|
| 104 | + 'name' => __('Location and category url separator', 'geodirectory'), |
|
| 105 | + 'desc' => __('Separator to show between location and category url slugs in listing urls', 'geodirectory'), |
|
| 106 | + 'id' => 'geodir_listingurl_separator', |
|
| 107 | + 'type' => 'text', |
|
| 108 | + 'css' => 'min-width:300px;', |
|
| 109 | + 'std' => 'C' // Default value to show home top section |
|
| 110 | + ), |
|
| 111 | + |
|
| 112 | + array( |
|
| 113 | + 'name' => __('Listing detail url separator', 'geodirectory'), |
|
| 114 | + 'desc' => __('Separator to show before listing slug in listing detail urls', 'geodirectory'), |
|
| 115 | + 'id' => 'geodir_detailurl_separator', |
|
| 116 | + 'type' => 'text', |
|
| 117 | + 'css' => 'min-width:300px;', |
|
| 118 | + 'std' => 'info' // Default value to show home top section |
|
| 119 | + ), |
|
| 120 | + |
|
| 121 | + |
|
| 122 | + array('type' => 'sectionend', 'id' => 'geodir_permalink'), |
|
| 123 | + |
|
| 124 | + array('name' => __('GeoDirectory Pages', 'geodirectory'), |
|
| 125 | + 'type' => 'sectionstart', |
|
| 126 | + 'desc' => '', |
|
| 127 | + 'id' => 'geodir_pages'), |
|
| 128 | + |
|
| 129 | + array( |
|
| 130 | + 'name' => __('GD Home page', 'geodirectory'), |
|
| 131 | + 'desc' => __('Select the page to use for the GD homepage (you must also set this page in Settings>Reading>Front page for it to work)', 'geodirectory'), |
|
| 132 | + 'id' => 'geodir_home_page', |
|
| 133 | + 'type' => 'single_select_page', |
|
| 134 | + 'class' => 'chosen_select' |
|
| 135 | + ), |
|
| 136 | + |
|
| 137 | + array( |
|
| 138 | + 'name' => __('Add listing page', 'geodirectory'), |
|
| 139 | + 'desc' => __('Select the page to use for adding listings', 'geodirectory'), |
|
| 140 | + 'id' => 'geodir_add_listing_page', |
|
| 141 | + 'type' => 'single_select_page', |
|
| 142 | + 'class' => 'chosen_select' |
|
| 143 | + ), |
|
| 144 | + |
|
| 145 | + array( |
|
| 146 | + 'name' => __('Listing preview page', 'geodirectory'), |
|
| 147 | + 'desc' => __('Select the page to use for listing preview', 'geodirectory'), |
|
| 148 | + 'id' => 'geodir_preview_page', |
|
| 149 | + 'type' => 'single_select_page', |
|
| 150 | + 'class' => 'chosen_select' |
|
| 151 | + ), |
|
| 152 | + |
|
| 153 | + array( |
|
| 154 | + 'name' => __('Listing success page', 'geodirectory'), |
|
| 155 | + 'desc' => __('Select the page to use for listing success', 'geodirectory'), |
|
| 156 | + 'id' => 'geodir_success_page', |
|
| 157 | + 'type' => 'single_select_page', |
|
| 158 | + 'class' => 'chosen_select' |
|
| 159 | + ), |
|
| 160 | + |
|
| 161 | + array( |
|
| 162 | + 'name' => __('Location page', 'geodirectory'), |
|
| 163 | + 'desc' => __('Select the page to use for locations', 'geodirectory'), |
|
| 164 | + 'id' => 'geodir_location_page', |
|
| 165 | + 'type' => 'single_select_page', |
|
| 166 | + 'class' => 'chosen_select' |
|
| 167 | + ), |
|
| 168 | + |
|
| 169 | + array( |
|
| 170 | + 'name' => __('Terms and Conditions page', 'geodirectory'), |
|
| 171 | + 'desc' => __('Select the page to use for Terms and Conditions (if enabled)', 'geodirectory'), |
|
| 172 | + 'id' => 'geodir_term_condition_page', |
|
| 173 | + 'type' => 'single_select_page', |
|
| 174 | + 'class' => 'chosen_select' |
|
| 175 | + ), |
|
| 176 | + |
|
| 177 | + array( |
|
| 178 | + 'name' => __('Info page', 'geodirectory'), |
|
| 179 | + 'desc' => __('Select the page to use for Gd general Info', 'geodirectory'), |
|
| 180 | + 'id' => 'geodir_info_page', |
|
| 181 | + 'type' => 'single_select_page', |
|
| 182 | + 'class' => 'chosen_select' |
|
| 183 | + ), |
|
| 184 | + |
|
| 185 | + array( |
|
| 186 | + 'name' => __('Login page', 'geodirectory'), |
|
| 187 | + 'desc' => __('Select the page to use for Login / Register', 'geodirectory'), |
|
| 188 | + 'id' => 'geodir_login_page', |
|
| 189 | + 'type' => 'single_select_page', |
|
| 190 | + 'class' => 'chosen_select' |
|
| 191 | + ), |
|
| 192 | + |
|
| 193 | + |
|
| 194 | + array('type' => 'sectionend', 'id' => 'geodir_pages'), |
|
| 195 | + |
|
| 196 | + /* Listing Detail Permalink Settings End */ |
|
| 197 | 197 | |
| 198 | 198 | |
| 199 | 199 | )); // End Design settings |
@@ -18,11 +18,11 @@ discard block |
||
| 18 | 18 | */ |
| 19 | 19 | function geodir_divi_signup_body_class($classes) |
| 20 | 20 | { |
| 21 | - if (geodir_is_page('login')) { |
|
| 22 | - $classes = str_replace('et_right_sidebar', 'et_full_width_page', $classes); |
|
| 23 | - $classes[] = 'divi-gd-signup'; |
|
| 24 | - } |
|
| 25 | - return $classes; |
|
| 21 | + if (geodir_is_page('login')) { |
|
| 22 | + $classes = str_replace('et_right_sidebar', 'et_full_width_page', $classes); |
|
| 23 | + $classes[] = 'divi-gd-signup'; |
|
| 24 | + } |
|
| 25 | + return $classes; |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | add_action('geodir_wrapper_close', 'geodir_divi_action_wrapper_close', 11); |
@@ -34,8 +34,8 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | function geodir_divi_action_wrapper_close() |
| 36 | 36 | { |
| 37 | - if (geodir_is_page('login')) { |
|
| 38 | - // We need to close extra divs generated by WRAPPER BEFORE MAIN CONTENT (below) because there is no sidebar on this page |
|
| 39 | - echo '</div></div>'; |
|
| 40 | - } |
|
| 37 | + if (geodir_is_page('login')) { |
|
| 38 | + // We need to close extra divs generated by WRAPPER BEFORE MAIN CONTENT (below) because there is no sidebar on this page |
|
| 39 | + echo '</div></div>'; |
|
| 40 | + } |
|
| 41 | 41 | } |
| 42 | 42 | \ No newline at end of file |
@@ -17,26 +17,26 @@ discard block |
||
| 17 | 17 | function gd_compat_php_genesis() |
| 18 | 18 | { |
| 19 | 19 | // REPLACE GENESIS BREADCRUMBS WITH GD BREADCRUMBS |
| 20 | - remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20); |
|
| 21 | - remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20); |
|
| 22 | - remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20); |
|
| 23 | - remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20); |
|
| 24 | - remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20); |
|
| 25 | - remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20); |
|
| 20 | + remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20); |
|
| 21 | + remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20); |
|
| 22 | + remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20); |
|
| 23 | + remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20); |
|
| 24 | + remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20); |
|
| 25 | + remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20); |
|
| 26 | 26 | |
| 27 | 27 | |
| 28 | - // make top section wide |
|
| 29 | - remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 30 | - remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 31 | - remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10); |
|
| 32 | - remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10); |
|
| 33 | - remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10); |
|
| 34 | - remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10); |
|
| 28 | + // make top section wide |
|
| 29 | + remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 30 | + remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 31 | + remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10); |
|
| 32 | + remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10); |
|
| 33 | + remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10); |
|
| 34 | + remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10); |
|
| 35 | 35 | |
| 36 | - // REMOVE PAGE TITLES |
|
| 37 | - remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10); |
|
| 38 | - remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10); |
|
| 39 | - remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10); |
|
| 36 | + // REMOVE PAGE TITLES |
|
| 37 | + remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10); |
|
| 38 | + remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10); |
|
| 39 | + remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10); |
|
| 40 | 40 | |
| 41 | 41 | |
| 42 | 42 | } |
@@ -53,25 +53,25 @@ discard block |
||
| 53 | 53 | function gd_genesis_compat_left_sidebars() |
| 54 | 54 | { |
| 55 | 55 | |
| 56 | - if (is_page_geodir_home()) { |
|
| 57 | - remove_action('geodir_home_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 58 | - add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 59 | - } elseif (geodir_is_page('location')) { |
|
| 60 | - remove_action('geodir_location_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 61 | - add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 62 | - } elseif (geodir_is_page('listing')) { |
|
| 63 | - remove_action('geodir_listings_sidebar_left', 'geodir_action_listings_sidebar_left', 10); |
|
| 64 | - add_action('geodir_wrapper_close', 'geodir_action_listings_sidebar_left', 11); |
|
| 65 | - } elseif (geodir_is_page('detail') && get_option('geodir_detail_sidebar_left_section')) { |
|
| 66 | - //remove_action( 'geodir_detail_sidebar', 'geodir_action_details_sidebar', 10 ); |
|
| 67 | - //add_action( 'geodir_wrapper_close', 'geodir_action_details_sidebar', 11 ); |
|
| 68 | - } elseif (geodir_is_page('search')) { |
|
| 69 | - remove_action('geodir_search_sidebar_left', 'geodir_action_search_sidebar_left', 10); |
|
| 70 | - add_action('geodir_wrapper_close', 'geodir_action_search_sidebar_left', 11); |
|
| 71 | - } elseif (geodir_is_page('author')) { |
|
| 72 | - remove_action('geodir_author_sidebar_left', 'geodir_action_author_sidebar_left', 10); |
|
| 73 | - add_action('geodir_wrapper_close', 'geodir_action_author_sidebar_left', 11); |
|
| 74 | - } |
|
| 56 | + if (is_page_geodir_home()) { |
|
| 57 | + remove_action('geodir_home_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 58 | + add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 59 | + } elseif (geodir_is_page('location')) { |
|
| 60 | + remove_action('geodir_location_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 61 | + add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 62 | + } elseif (geodir_is_page('listing')) { |
|
| 63 | + remove_action('geodir_listings_sidebar_left', 'geodir_action_listings_sidebar_left', 10); |
|
| 64 | + add_action('geodir_wrapper_close', 'geodir_action_listings_sidebar_left', 11); |
|
| 65 | + } elseif (geodir_is_page('detail') && get_option('geodir_detail_sidebar_left_section')) { |
|
| 66 | + //remove_action( 'geodir_detail_sidebar', 'geodir_action_details_sidebar', 10 ); |
|
| 67 | + //add_action( 'geodir_wrapper_close', 'geodir_action_details_sidebar', 11 ); |
|
| 68 | + } elseif (geodir_is_page('search')) { |
|
| 69 | + remove_action('geodir_search_sidebar_left', 'geodir_action_search_sidebar_left', 10); |
|
| 70 | + add_action('geodir_wrapper_close', 'geodir_action_search_sidebar_left', 11); |
|
| 71 | + } elseif (geodir_is_page('author')) { |
|
| 72 | + remove_action('geodir_author_sidebar_left', 'geodir_action_author_sidebar_left', 10); |
|
| 73 | + add_action('geodir_wrapper_close', 'geodir_action_author_sidebar_left', 11); |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | 76 | |
| 77 | 77 | } |
@@ -88,65 +88,65 @@ discard block |
||
| 88 | 88 | */ |
| 89 | 89 | function geodir_set_body_scs($classes) |
| 90 | 90 | { |
| 91 | - $remove_class = false; |
|
| 92 | - $new_class = ''; |
|
| 93 | - if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 94 | - $remove_class = true; |
|
| 95 | - if (get_option('geodir_show_home_left_section')) { |
|
| 96 | - $new_class .= 'sidebar-'; |
|
| 97 | - } |
|
| 98 | - if (get_option('geodir_show_home_contant_section')) { |
|
| 99 | - $new_class .= 'content'; |
|
| 100 | - } |
|
| 101 | - if (get_option('geodir_show_home_right_section')) { |
|
| 102 | - $new_class .= '-sidebar'; |
|
| 103 | - } |
|
| 104 | - } elseif (geodir_is_page('listing')) { |
|
| 105 | - $remove_class = true; |
|
| 106 | - if (get_option('geodir_show_listing_left_section')) { |
|
| 107 | - $new_class .= 'sidebar-'; |
|
| 108 | - } |
|
| 109 | - $new_class .= 'content'; |
|
| 110 | - if (get_option('geodir_show_listing_right_section')) { |
|
| 111 | - $new_class .= '-sidebar'; |
|
| 112 | - } |
|
| 113 | - } elseif (geodir_is_page('detail')) { |
|
| 114 | - $remove_class = true; |
|
| 115 | - if (get_option('geodir_detail_sidebar_left_section')) { |
|
| 116 | - $new_class .= 'sidebar-content gd-details-sidebar-left'; |
|
| 117 | - } else { |
|
| 118 | - $new_class .= 'content-sidebar'; |
|
| 119 | - } |
|
| 120 | - } elseif (geodir_is_page('search')) { |
|
| 121 | - $remove_class = true; |
|
| 122 | - if (get_option('geodir_show_search_left_section')) { |
|
| 123 | - $new_class .= 'sidebar-'; |
|
| 124 | - } |
|
| 125 | - $new_class .= 'content'; |
|
| 126 | - if (get_option('geodir_show_search_right_section')) { |
|
| 127 | - $new_class .= '-sidebar'; |
|
| 128 | - } |
|
| 129 | - } elseif (geodir_is_page('author')) { |
|
| 130 | - $remove_class = true; |
|
| 131 | - if (get_option('geodir_show_author_left_section')) { |
|
| 132 | - $new_class .= 'sidebar-'; |
|
| 133 | - } |
|
| 134 | - $new_class .= 'content'; |
|
| 135 | - if (get_option('geodir_show_author_right_section')) { |
|
| 136 | - $new_class .= '-sidebar'; |
|
| 137 | - } |
|
| 138 | - } elseif (geodir_is_page('add-listing')) { |
|
| 139 | - $remove_class = true; |
|
| 140 | - $new_class .= 'content-sidebar'; |
|
| 141 | - } |
|
| 142 | - |
|
| 143 | - if ($remove_class) { |
|
| 144 | - $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content')); |
|
| 145 | - //str_replace(array('content-sidebar','sidebar-content','content-sidebar-sidebar','sidebar-sidebar-content','sidebar-content-sidebar','full-width-content'),array('','','','','',''),$classes); |
|
| 146 | - $classes[] = $new_class; |
|
| 147 | - } |
|
| 148 | - |
|
| 149 | - return $classes; |
|
| 91 | + $remove_class = false; |
|
| 92 | + $new_class = ''; |
|
| 93 | + if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 94 | + $remove_class = true; |
|
| 95 | + if (get_option('geodir_show_home_left_section')) { |
|
| 96 | + $new_class .= 'sidebar-'; |
|
| 97 | + } |
|
| 98 | + if (get_option('geodir_show_home_contant_section')) { |
|
| 99 | + $new_class .= 'content'; |
|
| 100 | + } |
|
| 101 | + if (get_option('geodir_show_home_right_section')) { |
|
| 102 | + $new_class .= '-sidebar'; |
|
| 103 | + } |
|
| 104 | + } elseif (geodir_is_page('listing')) { |
|
| 105 | + $remove_class = true; |
|
| 106 | + if (get_option('geodir_show_listing_left_section')) { |
|
| 107 | + $new_class .= 'sidebar-'; |
|
| 108 | + } |
|
| 109 | + $new_class .= 'content'; |
|
| 110 | + if (get_option('geodir_show_listing_right_section')) { |
|
| 111 | + $new_class .= '-sidebar'; |
|
| 112 | + } |
|
| 113 | + } elseif (geodir_is_page('detail')) { |
|
| 114 | + $remove_class = true; |
|
| 115 | + if (get_option('geodir_detail_sidebar_left_section')) { |
|
| 116 | + $new_class .= 'sidebar-content gd-details-sidebar-left'; |
|
| 117 | + } else { |
|
| 118 | + $new_class .= 'content-sidebar'; |
|
| 119 | + } |
|
| 120 | + } elseif (geodir_is_page('search')) { |
|
| 121 | + $remove_class = true; |
|
| 122 | + if (get_option('geodir_show_search_left_section')) { |
|
| 123 | + $new_class .= 'sidebar-'; |
|
| 124 | + } |
|
| 125 | + $new_class .= 'content'; |
|
| 126 | + if (get_option('geodir_show_search_right_section')) { |
|
| 127 | + $new_class .= '-sidebar'; |
|
| 128 | + } |
|
| 129 | + } elseif (geodir_is_page('author')) { |
|
| 130 | + $remove_class = true; |
|
| 131 | + if (get_option('geodir_show_author_left_section')) { |
|
| 132 | + $new_class .= 'sidebar-'; |
|
| 133 | + } |
|
| 134 | + $new_class .= 'content'; |
|
| 135 | + if (get_option('geodir_show_author_right_section')) { |
|
| 136 | + $new_class .= '-sidebar'; |
|
| 137 | + } |
|
| 138 | + } elseif (geodir_is_page('add-listing')) { |
|
| 139 | + $remove_class = true; |
|
| 140 | + $new_class .= 'content-sidebar'; |
|
| 141 | + } |
|
| 142 | + |
|
| 143 | + if ($remove_class) { |
|
| 144 | + $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content')); |
|
| 145 | + //str_replace(array('content-sidebar','sidebar-content','content-sidebar-sidebar','sidebar-sidebar-content','sidebar-content-sidebar','full-width-content'),array('','','','','',''),$classes); |
|
| 146 | + $classes[] = $new_class; |
|
| 147 | + } |
|
| 148 | + |
|
| 149 | + return $classes; |
|
| 150 | 150 | |
| 151 | 151 | } |
| 152 | 152 | |
@@ -160,17 +160,17 @@ discard block |
||
| 160 | 160 | function gd_genesis_compat_add_top_section_back() |
| 161 | 161 | { |
| 162 | 162 | |
| 163 | - if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 164 | - geodir_action_geodir_sidebar_home_top(); |
|
| 165 | - } elseif (geodir_is_page('listing')) { |
|
| 166 | - geodir_action_geodir_sidebar_listings_top(); |
|
| 167 | - } elseif (geodir_is_page('detail')) { |
|
| 168 | - geodir_action_geodir_sidebar_detail_top(); |
|
| 169 | - } elseif (geodir_is_page('search')) { |
|
| 170 | - geodir_action_geodir_sidebar_search_top(); |
|
| 171 | - } elseif (geodir_is_page('author')) { |
|
| 172 | - geodir_action_geodir_sidebar_author_top(); |
|
| 173 | - } |
|
| 163 | + if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 164 | + geodir_action_geodir_sidebar_home_top(); |
|
| 165 | + } elseif (geodir_is_page('listing')) { |
|
| 166 | + geodir_action_geodir_sidebar_listings_top(); |
|
| 167 | + } elseif (geodir_is_page('detail')) { |
|
| 168 | + geodir_action_geodir_sidebar_detail_top(); |
|
| 169 | + } elseif (geodir_is_page('search')) { |
|
| 170 | + geodir_action_geodir_sidebar_search_top(); |
|
| 171 | + } elseif (geodir_is_page('author')) { |
|
| 172 | + geodir_action_geodir_sidebar_author_top(); |
|
| 173 | + } |
|
| 174 | 174 | |
| 175 | 175 | |
| 176 | 176 | } |
@@ -183,12 +183,12 @@ discard block |
||
| 183 | 183 | */ |
| 184 | 184 | function geodir_replace_breadcrumb() |
| 185 | 185 | { |
| 186 | - if (is_front_page() && get_option('geodir_set_as_home') && !geodir_is_page('login')) { |
|
| 187 | - } else { |
|
| 188 | - echo '<div class="geodir-breadcrumb-bar"><div class="wrap">'; |
|
| 189 | - geodir_breadcrumb(); |
|
| 190 | - echo '</div></div>'; |
|
| 191 | - } |
|
| 186 | + if (is_front_page() && get_option('geodir_set_as_home') && !geodir_is_page('login')) { |
|
| 187 | + } else { |
|
| 188 | + echo '<div class="geodir-breadcrumb-bar"><div class="wrap">'; |
|
| 189 | + geodir_breadcrumb(); |
|
| 190 | + echo '</div></div>'; |
|
| 191 | + } |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | // Force Full Width on signup page |
@@ -201,9 +201,9 @@ discard block |
||
| 201 | 201 | */ |
| 202 | 202 | function geodir_genesis_meta() |
| 203 | 203 | { |
| 204 | - if (geodir_is_page('login')) { |
|
| 205 | - add_filter('genesis_pre_get_option_site_layout', '__genesis_return_full_width_content'); |
|
| 206 | - } |
|
| 204 | + if (geodir_is_page('login')) { |
|
| 205 | + add_filter('genesis_pre_get_option_site_layout', '__genesis_return_full_width_content'); |
|
| 206 | + } |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | add_action('geodir_add_listing_page_title', 'geodir_add_listing_page_title_genesis_before', 8); |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | function geodir_add_listing_page_title_genesis_before() |
| 217 | 217 | { |
| 218 | 218 | |
| 219 | - echo "<div class='entry' >"; |
|
| 219 | + echo "<div class='entry' >"; |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | function geodir_add_listing_form_genesis_after() |
| 231 | 231 | { |
| 232 | 232 | |
| 233 | - echo "</div>"; |
|
| 233 | + echo "</div>"; |
|
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | |
@@ -249,38 +249,38 @@ discard block |
||
| 249 | 249 | { |
| 250 | 250 | |
| 251 | 251 | |
| 252 | - $title = ''; |
|
| 253 | - $subtitle = ''; |
|
| 254 | - |
|
| 255 | - if (geodir_is_page('listing')) { |
|
| 256 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 257 | - geodir_action_listings_title(); |
|
| 258 | - echo '</div>'; |
|
| 259 | - } |
|
| 260 | - |
|
| 261 | - if (geodir_is_page('add-listing')) { |
|
| 262 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 263 | - geodir_action_add_listing_page_title(); |
|
| 264 | - echo '</div>'; |
|
| 265 | - } |
|
| 266 | - |
|
| 267 | - if (geodir_is_page('author')) { |
|
| 268 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 269 | - geodir_action_author_page_title(); |
|
| 270 | - echo '</div>'; |
|
| 271 | - } |
|
| 272 | - |
|
| 273 | - if (geodir_is_page('detail') || geodir_is_page('preview')) { |
|
| 274 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 275 | - echo get_the_title(); |
|
| 276 | - echo '</div>'; |
|
| 277 | - } |
|
| 278 | - |
|
| 279 | - if (geodir_is_page('search')) { |
|
| 280 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 281 | - geodir_action_search_page_title(); |
|
| 282 | - echo '</div>'; |
|
| 283 | - } |
|
| 252 | + $title = ''; |
|
| 253 | + $subtitle = ''; |
|
| 254 | + |
|
| 255 | + if (geodir_is_page('listing')) { |
|
| 256 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 257 | + geodir_action_listings_title(); |
|
| 258 | + echo '</div>'; |
|
| 259 | + } |
|
| 260 | + |
|
| 261 | + if (geodir_is_page('add-listing')) { |
|
| 262 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 263 | + geodir_action_add_listing_page_title(); |
|
| 264 | + echo '</div>'; |
|
| 265 | + } |
|
| 266 | + |
|
| 267 | + if (geodir_is_page('author')) { |
|
| 268 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 269 | + geodir_action_author_page_title(); |
|
| 270 | + echo '</div>'; |
|
| 271 | + } |
|
| 272 | + |
|
| 273 | + if (geodir_is_page('detail') || geodir_is_page('preview')) { |
|
| 274 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 275 | + echo get_the_title(); |
|
| 276 | + echo '</div>'; |
|
| 277 | + } |
|
| 278 | + |
|
| 279 | + if (geodir_is_page('search')) { |
|
| 280 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 281 | + geodir_action_search_page_title(); |
|
| 282 | + echo '</div>'; |
|
| 283 | + } |
|
| 284 | 284 | } |
| 285 | 285 | |
| 286 | 286 | |
@@ -293,8 +293,8 @@ discard block |
||
| 293 | 293 | */ |
| 294 | 294 | function gd_genesis_listing_page_title_bar() |
| 295 | 295 | { |
| 296 | - geodir_action_listings_title(); |
|
| 297 | - //geodir_action_listings_description(); |
|
| 296 | + geodir_action_listings_title(); |
|
| 297 | + //geodir_action_listings_description(); |
|
| 298 | 298 | } |
| 299 | 299 | |
| 300 | 300 | |
@@ -307,19 +307,19 @@ discard block |
||
| 307 | 307 | */ |
| 308 | 308 | function gd_compat_php_genesis_geo_1280_fix() |
| 309 | 309 | { |
| 310 | - if (function_exists('geo1280_search_bar')) { |
|
| 311 | - remove_action('genesis_after_header', 'geo1280_search_bar', 20); |
|
| 312 | - add_action('genesis_after_header', 'geo1280_search_bar_fix', 4); |
|
| 310 | + if (function_exists('geo1280_search_bar')) { |
|
| 311 | + remove_action('genesis_after_header', 'geo1280_search_bar', 20); |
|
| 312 | + add_action('genesis_after_header', 'geo1280_search_bar_fix', 4); |
|
| 313 | 313 | |
| 314 | - // |
|
| 314 | + // |
|
| 315 | 315 | |
| 316 | - remove_action('genesis_after_header', 'geodir_replace_breadcrumb', 20); |
|
| 317 | - remove_action('genesis_before_content_sidebar_wrap', 'geodir_replace_breadcrumb', 20); |
|
| 318 | - add_action('geodir_wrapper_open', 'geodir_replace_breadcrumb', 105); |
|
| 316 | + remove_action('genesis_after_header', 'geodir_replace_breadcrumb', 20); |
|
| 317 | + remove_action('genesis_before_content_sidebar_wrap', 'geodir_replace_breadcrumb', 20); |
|
| 318 | + add_action('geodir_wrapper_open', 'geodir_replace_breadcrumb', 105); |
|
| 319 | 319 | |
| 320 | - remove_action('genesis_before_content_sidebar_wrap', 'geo1280_page_title', 10); |
|
| 321 | - add_action('geodir_wrapper_open', 'geo1280_page_title', 101); |
|
| 322 | - } |
|
| 320 | + remove_action('genesis_before_content_sidebar_wrap', 'geo1280_page_title', 10); |
|
| 321 | + add_action('geodir_wrapper_open', 'geo1280_page_title', 101); |
|
| 322 | + } |
|
| 323 | 323 | } |
| 324 | 324 | |
| 325 | 325 | /** |
@@ -331,11 +331,11 @@ discard block |
||
| 331 | 331 | function geo1280_search_bar_fix() |
| 332 | 332 | { |
| 333 | 333 | |
| 334 | - echo '<div class="geo1280-placeholder"></div>'; |
|
| 335 | - if (is_active_sidebar('search-bar')) { |
|
| 336 | - genesis_widget_area('search-bar', array( |
|
| 337 | - 'before' => '<div class="search-bar widget-area"><div class="wrap">', |
|
| 338 | - 'after' => '</div></div>', |
|
| 339 | - )); |
|
| 340 | - } |
|
| 334 | + echo '<div class="geo1280-placeholder"></div>'; |
|
| 335 | + if (is_active_sidebar('search-bar')) { |
|
| 336 | + genesis_widget_area('search-bar', array( |
|
| 337 | + 'before' => '<div class="search-bar widget-area"><div class="wrap">', |
|
| 338 | + 'after' => '</div></div>', |
|
| 339 | + )); |
|
| 340 | + } |
|
| 341 | 341 | } |
@@ -126,8 +126,10 @@ |
||
| 126 | 126 | $regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>"; |
| 127 | 127 | if (preg_match_all("/$regexp/siU", $crums, $matches)) { |
| 128 | 128 | return $matches[0]; |
| 129 | - } else return ''; |
|
| 130 | -} |
|
| 129 | + } else { |
|
| 130 | + return ''; |
|
| 131 | + } |
|
| 132 | + } |
|
| 131 | 133 | |
| 132 | 134 | |
| 133 | 135 | /** |
@@ -16,36 +16,36 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | function multi_news_action_calls() |
| 18 | 18 | { |
| 19 | - // REMOVE BREADCRUMB |
|
| 20 | - remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20); |
|
| 21 | - remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20); |
|
| 22 | - remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20); |
|
| 23 | - remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20); |
|
| 24 | - remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20); |
|
| 25 | - remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20); |
|
| 26 | - |
|
| 27 | - //ADD BREADCRUMS |
|
| 28 | - add_action('geodir_detail_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
| 29 | - add_action('geodir_listings_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
| 30 | - add_action('geodir_author_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
| 31 | - add_action('geodir_search_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
| 32 | - //add_action('geodir_home_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
| 33 | - add_action('geodir_location_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
| 34 | - |
|
| 35 | - |
|
| 36 | - // fix breadcrums |
|
| 37 | - add_filter('breadcrumbs_plus_items', 'gd_breadcrumbs_plus_items', 1); |
|
| 38 | - |
|
| 39 | - // REMOVE PAGE TITLES |
|
| 40 | - remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10); |
|
| 41 | - // remove_action( 'geodir_add_listing_page_title', 'geodir_action_add_listing_page_title',10); |
|
| 42 | - remove_action('geodir_details_main_content', 'geodir_action_page_title', 20); |
|
| 43 | - remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10); |
|
| 44 | - remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10); |
|
| 45 | - |
|
| 46 | - |
|
| 47 | - add_action('geodir_wrapper_content_open', 'gd_mn_extra_wrap', 30, 1); |
|
| 48 | - add_action('geodir_wrapper_content_close', 'gd_mn_extra_wrap_end', 3, 1); |
|
| 19 | + // REMOVE BREADCRUMB |
|
| 20 | + remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20); |
|
| 21 | + remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20); |
|
| 22 | + remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20); |
|
| 23 | + remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20); |
|
| 24 | + remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20); |
|
| 25 | + remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20); |
|
| 26 | + |
|
| 27 | + //ADD BREADCRUMS |
|
| 28 | + add_action('geodir_detail_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
| 29 | + add_action('geodir_listings_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
| 30 | + add_action('geodir_author_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
| 31 | + add_action('geodir_search_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
| 32 | + //add_action('geodir_home_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
| 33 | + add_action('geodir_location_before_main_content', 'gd_mn_replace_breadcrums', 20); |
|
| 34 | + |
|
| 35 | + |
|
| 36 | + // fix breadcrums |
|
| 37 | + add_filter('breadcrumbs_plus_items', 'gd_breadcrumbs_plus_items', 1); |
|
| 38 | + |
|
| 39 | + // REMOVE PAGE TITLES |
|
| 40 | + remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10); |
|
| 41 | + // remove_action( 'geodir_add_listing_page_title', 'geodir_action_add_listing_page_title',10); |
|
| 42 | + remove_action('geodir_details_main_content', 'geodir_action_page_title', 20); |
|
| 43 | + remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10); |
|
| 44 | + remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10); |
|
| 45 | + |
|
| 46 | + |
|
| 47 | + add_action('geodir_wrapper_content_open', 'gd_mn_extra_wrap', 30, 1); |
|
| 48 | + add_action('geodir_wrapper_content_close', 'gd_mn_extra_wrap_end', 3, 1); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | /** |
@@ -57,11 +57,11 @@ discard block |
||
| 57 | 57 | */ |
| 58 | 58 | function gd_mn_extra_wrap($page) |
| 59 | 59 | { |
| 60 | - if ($page == 'add-listing-page') { |
|
| 61 | - echo '<div class="site-content page-wrap">'; |
|
| 62 | - } elseif ($page == 'signup-page') { |
|
| 63 | - echo '</div><div class="section full-width-section" style="float: left;width:100%;">'; |
|
| 64 | - } |
|
| 60 | + if ($page == 'add-listing-page') { |
|
| 61 | + echo '<div class="site-content page-wrap">'; |
|
| 62 | + } elseif ($page == 'signup-page') { |
|
| 63 | + echo '</div><div class="section full-width-section" style="float: left;width:100%;">'; |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | 66 | } |
| 67 | 67 | |
@@ -75,9 +75,9 @@ discard block |
||
| 75 | 75 | */ |
| 76 | 76 | function gd_mn_extra_wrap_end($page) |
| 77 | 77 | { |
| 78 | - if ($page == 'add-listing-page') { |
|
| 79 | - echo '</div>'; |
|
| 80 | - } |
|
| 78 | + if ($page == 'add-listing-page') { |
|
| 79 | + echo '</div>'; |
|
| 80 | + } |
|
| 81 | 81 | |
| 82 | 82 | } |
| 83 | 83 | |
@@ -91,13 +91,13 @@ discard block |
||
| 91 | 91 | function gd_mn_replace_breadcrums() |
| 92 | 92 | { |
| 93 | 93 | |
| 94 | - if (mom_option('breadcrumb') != 0) { ?> |
|
| 94 | + if (mom_option('breadcrumb') != 0) { ?> |
|
| 95 | 95 | <?php if (mom_option('cats_bread')) { |
| 96 | - $cclass = ''; |
|
| 97 | - if (mom_option('cat_slider') == false) { |
|
| 98 | - $cclass = 'post-crumbs '; |
|
| 99 | - } |
|
| 100 | - ?> |
|
| 96 | + $cclass = ''; |
|
| 97 | + if (mom_option('cat_slider') == false) { |
|
| 98 | + $cclass = 'post-crumbs '; |
|
| 99 | + } |
|
| 100 | + ?> |
|
| 101 | 101 | <div class="<?php echo $cclass; ?>entry-crumbs" xmlns:v="http://rdf.data-vocabulary.org/#"> |
| 102 | 102 | |
| 103 | 103 | <?php mom_breadcrumb(); ?> |
@@ -119,14 +119,14 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | function gd_get_breadcrum_links() |
| 121 | 121 | { |
| 122 | - ob_start(); |
|
| 123 | - geodir_breadcrumb(); |
|
| 124 | - $crums = ob_get_contents(); |
|
| 125 | - ob_get_clean(); |
|
| 126 | - $regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>"; |
|
| 127 | - if (preg_match_all("/$regexp/siU", $crums, $matches)) { |
|
| 128 | - return $matches[0]; |
|
| 129 | - } else return ''; |
|
| 122 | + ob_start(); |
|
| 123 | + geodir_breadcrumb(); |
|
| 124 | + $crums = ob_get_contents(); |
|
| 125 | + ob_get_clean(); |
|
| 126 | + $regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>"; |
|
| 127 | + if (preg_match_all("/$regexp/siU", $crums, $matches)) { |
|
| 128 | + return $matches[0]; |
|
| 129 | + } else return ''; |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | |
@@ -140,30 +140,30 @@ discard block |
||
| 140 | 140 | */ |
| 141 | 141 | function gd_breadcrumbs_plus_items($items) |
| 142 | 142 | { //print_r($items);exit; |
| 143 | - $bits = array(); |
|
| 144 | - $pieces = gd_get_breadcrum_links(); |
|
| 145 | - //unset($pieces[0]); |
|
| 146 | - $bits = $pieces; |
|
| 143 | + $bits = array(); |
|
| 144 | + $pieces = gd_get_breadcrum_links(); |
|
| 145 | + //unset($pieces[0]); |
|
| 146 | + $bits = $pieces; |
|
| 147 | 147 | |
| 148 | - $title = $items['last']; |
|
| 149 | - if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 148 | + $title = $items['last']; |
|
| 149 | + if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 150 | 150 | |
| 151 | - } elseif (geodir_is_page('listing')) { |
|
| 151 | + } elseif (geodir_is_page('listing')) { |
|
| 152 | 152 | |
| 153 | - } elseif (geodir_is_page('detail')) { |
|
| 154 | - ob_start(); |
|
| 155 | - geodir_action_page_title(); |
|
| 156 | - $title = ob_get_contents(); |
|
| 157 | - ob_end_clean(); |
|
| 158 | - } elseif (geodir_is_page('search')) { |
|
| 159 | - } elseif (geodir_is_page('author')) { |
|
| 160 | - } |
|
| 153 | + } elseif (geodir_is_page('detail')) { |
|
| 154 | + ob_start(); |
|
| 155 | + geodir_action_page_title(); |
|
| 156 | + $title = ob_get_contents(); |
|
| 157 | + ob_end_clean(); |
|
| 158 | + } elseif (geodir_is_page('search')) { |
|
| 159 | + } elseif (geodir_is_page('author')) { |
|
| 160 | + } |
|
| 161 | 161 | |
| 162 | - $title = strip_tags($title); |
|
| 163 | - $items = gd_breadcrumbs_plus_items_add($items, $bits, $title); |
|
| 162 | + $title = strip_tags($title); |
|
| 163 | + $items = gd_breadcrumbs_plus_items_add($items, $bits, $title); |
|
| 164 | 164 | |
| 165 | 165 | |
| 166 | - return $items; |
|
| 166 | + return $items; |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | |
@@ -179,28 +179,28 @@ discard block |
||
| 179 | 179 | */ |
| 180 | 180 | function gd_breadcrumbs_plus_items_add($items, $bits, $last) |
| 181 | 181 | { |
| 182 | - //$pieces = explode("</div>", $items[0]); |
|
| 183 | - if (is_array($bits)) { |
|
| 184 | - $items = array(); |
|
| 185 | - $pieces = ''; |
|
| 186 | - foreach ($bits as $bit) { |
|
| 187 | - $pieces .= $bit; |
|
| 188 | - } |
|
| 189 | - $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>"; |
|
| 190 | - if (isset($last) && $last) { |
|
| 191 | - $items['last'] = $last; |
|
| 192 | - } |
|
| 193 | - } |
|
| 194 | - |
|
| 195 | - //print_r($items); |
|
| 196 | - return $items; |
|
| 182 | + //$pieces = explode("</div>", $items[0]); |
|
| 183 | + if (is_array($bits)) { |
|
| 184 | + $items = array(); |
|
| 185 | + $pieces = ''; |
|
| 186 | + foreach ($bits as $bit) { |
|
| 187 | + $pieces .= $bit; |
|
| 188 | + } |
|
| 189 | + $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>"; |
|
| 190 | + if (isset($last) && $last) { |
|
| 191 | + $items['last'] = $last; |
|
| 192 | + } |
|
| 193 | + } |
|
| 194 | + |
|
| 195 | + //print_r($items); |
|
| 196 | + return $items; |
|
| 197 | 197 | |
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | add_filter('geodir_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1); |
| 201 | 201 | add_filter('geodir_location_switcher_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1); |
| 202 | 202 | function gd_multinews_mobile_menu_caret($html){ |
| 203 | - $html .= '<i class="responsive-caret"></i>'; |
|
| 204 | - return $html; |
|
| 203 | + $html .= '<i class="responsive-caret"></i>'; |
|
| 204 | + return $html; |
|
| 205 | 205 | |
| 206 | 206 | } |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | foreach ($bits as $bit) { |
| 187 | 187 | $pieces .= $bit; |
| 188 | 188 | } |
| 189 | - $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>"; |
|
| 189 | + $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">'.$pieces."</div>"; |
|
| 190 | 190 | if (isset($last) && $last) { |
| 191 | 191 | $items['last'] = $last; |
| 192 | 192 | } |
@@ -197,9 +197,9 @@ discard block |
||
| 197 | 197 | |
| 198 | 198 | } |
| 199 | 199 | |
| 200 | -add_filter('geodir_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1); |
|
| 201 | -add_filter('geodir_location_switcher_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1); |
|
| 202 | -function gd_multinews_mobile_menu_caret($html){ |
|
| 200 | +add_filter('geodir_menu_after_sub_ul', 'gd_multinews_mobile_menu_caret', 10, 1); |
|
| 201 | +add_filter('geodir_location_switcher_menu_after_sub_ul', 'gd_multinews_mobile_menu_caret', 10, 1); |
|
| 202 | +function gd_multinews_mobile_menu_caret($html) { |
|
| 203 | 203 | $html .= '<i class="responsive-caret"></i>'; |
| 204 | 204 | return $html; |
| 205 | 205 | |
@@ -39,8 +39,9 @@ discard block |
||
| 39 | 39 | if (get_option('geodir_show_listing_nav')) {
|
| 40 | 40 | |
| 41 | 41 | $menu_class = ''; |
| 42 | - if (geodir_is_page('listing'))
|
|
| 43 | - $menu_class = 'current-menu-item'; |
|
| 42 | + if (geodir_is_page('listing')) { |
|
| 43 | + $menu_class = 'current-menu-item'; |
|
| 44 | + } |
|
| 44 | 45 | |
| 45 | 46 | |
| 46 | 47 | //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION |
@@ -52,8 +53,9 @@ discard block |
||
| 52 | 53 | if (in_array($post_type, $show_post_type_main_nav)) {
|
| 53 | 54 | if (get_post_type_archive_link($post_type)) {
|
| 54 | 55 | $menu_class = ''; |
| 55 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
|
| 56 | - $menu_class = 'current-menu-item'; |
|
| 56 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing')) { |
|
| 57 | + $menu_class = 'current-menu-item'; |
|
| 58 | + } |
|
| 57 | 59 | /** |
| 58 | 60 | * Filter the menu li class. |
| 59 | 61 | * |
@@ -130,8 +132,9 @@ discard block |
||
| 130 | 132 | if (get_post_type_archive_link($post_type)) {
|
| 131 | 133 | |
| 132 | 134 | $menu_class = ''; |
| 133 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
|
| 134 | - $menu_class = 'current-menu-item'; |
|
| 135 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing')) { |
|
| 136 | + $menu_class = 'current-menu-item'; |
|
| 137 | + } |
|
| 135 | 138 | |
| 136 | 139 | $items .= '<li class="' . $sub_li_class . '"> |
| 137 | 140 | <a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '"> |
@@ -153,8 +156,9 @@ discard block |
||
| 153 | 156 | if (get_option('geodir_show_addlisting_nav')) {
|
| 154 | 157 | |
| 155 | 158 | $menu_class = ''; |
| 156 | - if (geodir_is_page('add-listing'))
|
|
| 157 | - $menu_class = 'current-menu-item'; |
|
| 159 | + if (geodir_is_page('add-listing')) { |
|
| 160 | + $menu_class = 'current-menu-item'; |
|
| 161 | + } |
|
| 158 | 162 | |
| 159 | 163 | //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION |
| 160 | 164 | $post_types = geodir_get_posttypes('object');
|
@@ -170,8 +174,9 @@ discard block |
||
| 170 | 174 | if (geodir_get_addlisting_link($post_type)) {
|
| 171 | 175 | |
| 172 | 176 | $menu_class = ''; |
| 173 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
|
|
| 174 | - $menu_class = 'current-menu-item'; |
|
| 177 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing')) { |
|
| 178 | + $menu_class = 'current-menu-item'; |
|
| 179 | + } |
|
| 175 | 180 | /** |
| 176 | 181 | * Filter the menu li class. |
| 177 | 182 | * |
@@ -255,8 +260,9 @@ discard block |
||
| 255 | 260 | if (geodir_get_addlisting_link($post_type)) {
|
| 256 | 261 | |
| 257 | 262 | $menu_class = ''; |
| 258 | - if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
|
|
| 259 | - $menu_class = 'current-menu-item'; |
|
| 263 | + if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing')) { |
|
| 264 | + $menu_class = 'current-menu-item'; |
|
| 265 | + } |
|
| 260 | 266 | /** |
| 261 | 267 | * Filter the menu li class. |
| 262 | 268 | * |
@@ -311,8 +317,9 @@ discard block |
||
| 311 | 317 | } |
| 312 | 318 | //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet. |
| 313 | 319 | // $menu = str_replace("</ul></div>",geodir_add_nav_menu_items()."</ul></div>",$menu);
|
| 314 | - else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location)) |
|
| 315 | - $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 320 | + else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location)) { |
|
| 321 | + $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu); |
|
| 322 | + } |
|
| 316 | 323 | |
| 317 | 324 | return $menu; |
| 318 | 325 | |
@@ -398,24 +405,28 @@ discard block |
||
| 398 | 405 | $geodir_post_type = get_query_var('post_type');
|
| 399 | 406 | |
| 400 | 407 | if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
|
| 401 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 402 | - $geodir_post_type = get_post_type((int)$_REQUEST['pid']); |
|
| 403 | - elseif (isset($_REQUEST['listing_type'])) |
|
| 404 | - $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 408 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') { |
|
| 409 | + $geodir_post_type = get_post_type((int)$_REQUEST['pid']); |
|
| 410 | + } elseif (isset($_REQUEST['listing_type'])) { |
|
| 411 | + $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 412 | + } |
|
| 405 | 413 | } |
| 406 | 414 | |
| 407 | - if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))
|
|
| 408 | - $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 415 | + if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype'])) { |
|
| 416 | + $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 417 | + } |
|
| 409 | 418 | |
| 410 | - if (is_tax()) |
|
| 411 | - $geodir_post_type = geodir_get_taxonomy_posttype(); |
|
| 419 | + if (is_tax()) { |
|
| 420 | + $geodir_post_type = geodir_get_taxonomy_posttype(); |
|
| 421 | + } |
|
| 412 | 422 | |
| 413 | 423 | |
| 414 | 424 | $all_postypes = geodir_get_posttypes(); |
| 415 | 425 | $all_postypes = stripslashes_deep($all_postypes); |
| 416 | 426 | |
| 417 | - if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) |
|
| 418 | - $geodir_post_type = ''; |
|
| 427 | + if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) { |
|
| 428 | + $geodir_post_type = ''; |
|
| 429 | + } |
|
| 419 | 430 | |
| 420 | 431 | |
| 421 | 432 | return $geodir_post_type; |
@@ -462,11 +473,12 @@ discard block |
||
| 462 | 473 | endswitch; |
| 463 | 474 | } |
| 464 | 475 | |
| 465 | - if (!empty($post_types)) |
|
| 466 | - return $post_types; |
|
| 467 | - else |
|
| 468 | - return array(); |
|
| 469 | -} |
|
| 476 | + if (!empty($post_types)) { |
|
| 477 | + return $post_types; |
|
| 478 | + } else { |
|
| 479 | + return array(); |
|
| 480 | + } |
|
| 481 | + } |
|
| 470 | 482 | |
| 471 | 483 | /** |
| 472 | 484 | * Get Custom Post Type info. |
@@ -483,9 +495,10 @@ discard block |
||
| 483 | 495 | $post_types = stripslashes_deep($post_types); |
| 484 | 496 | if (!empty($post_types) && $post_type != '') {
|
| 485 | 497 | return $post_types[$post_type]; |
| 486 | - } else |
|
| 487 | - return false; |
|
| 488 | -} |
|
| 498 | + } else { |
|
| 499 | + return false; |
|
| 500 | + } |
|
| 501 | + } |
|
| 489 | 502 | |
| 490 | 503 | if (!function_exists('geodir_get_taxonomies')) {
|
| 491 | 504 | /** |
@@ -509,18 +522,21 @@ discard block |
||
| 509 | 522 | $gd_taxonomies = array_keys($taxonomies); |
| 510 | 523 | |
| 511 | 524 | |
| 512 | - if ($post_type != '') |
|
| 513 | - $gd_taxonomies = array(); |
|
| 525 | + if ($post_type != '') { |
|
| 526 | + $gd_taxonomies = array(); |
|
| 527 | + } |
|
| 514 | 528 | |
| 515 | 529 | $i = 0; |
| 516 | 530 | foreach ($taxonomies as $taxonomy => $args) {
|
| 517 | 531 | |
| 518 | - if ($post_type != '' && $args['object_type'] == $post_type) |
|
| 519 | - $gd_taxonomies[] = $taxonomy; |
|
| 532 | + if ($post_type != '' && $args['object_type'] == $post_type) { |
|
| 533 | + $gd_taxonomies[] = $taxonomy; |
|
| 534 | + } |
|
| 520 | 535 | |
| 521 | 536 | if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {
|
| 522 | - if (array_search($taxonomy, $gd_taxonomies) !== false) |
|
| 523 | - unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]); |
|
| 537 | + if (array_search($taxonomy, $gd_taxonomies) !== false) { |
|
| 538 | + unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]); |
|
| 539 | + } |
|
| 524 | 540 | } |
| 525 | 541 | |
| 526 | 542 | } |
@@ -575,10 +591,11 @@ discard block |
||
| 575 | 591 | . ucfirst($category_obj->name) . '</option>'; |
| 576 | 592 | } |
| 577 | 593 | |
| 578 | - if ($echo) |
|
| 579 | - echo $html; |
|
| 580 | - else |
|
| 581 | - return $html; |
|
| 594 | + if ($echo) { |
|
| 595 | + echo $html; |
|
| 596 | + } else { |
|
| 597 | + return $html; |
|
| 598 | + } |
|
| 582 | 599 | } |
| 583 | 600 | } |
| 584 | 601 | |
@@ -612,11 +629,12 @@ discard block |
||
| 612 | 629 | |
| 613 | 630 | } |
| 614 | 631 | |
| 615 | - if (!empty($listing_slug)) |
|
| 616 | - return $listing_slug; |
|
| 617 | - else |
|
| 618 | - return false; |
|
| 619 | -} |
|
| 632 | + if (!empty($listing_slug)) { |
|
| 633 | + return $listing_slug; |
|
| 634 | + } else { |
|
| 635 | + return false; |
|
| 636 | + } |
|
| 637 | + } |
|
| 620 | 638 | |
| 621 | 639 | |
| 622 | 640 | /** |
@@ -647,16 +665,18 @@ discard block |
||
| 647 | 665 | if (!empty($taxonomies)) {
|
| 648 | 666 | foreach (geodir_get_posttypes() as $pt) {
|
| 649 | 667 | $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt); |
| 650 | - if (array_intersect($taxonomies, $object_taxonomies)) |
|
| 651 | - $post_type[] = $pt; |
|
| 668 | + if (array_intersect($taxonomies, $object_taxonomies)) { |
|
| 669 | + $post_type[] = $pt; |
|
| 670 | + } |
|
| 652 | 671 | } |
| 653 | 672 | } |
| 654 | 673 | |
| 655 | - if (!empty($post_type)) |
|
| 656 | - return $post_type[0]; |
|
| 657 | - else |
|
| 658 | - return false; |
|
| 659 | -} |
|
| 674 | + if (!empty($post_type)) { |
|
| 675 | + return $post_type[0]; |
|
| 676 | + } else { |
|
| 677 | + return false; |
|
| 678 | + } |
|
| 679 | + } |
|
| 660 | 680 | |
| 661 | 681 | if (!function_exists('geodir_custom_taxonomy_walker')) {
|
| 662 | 682 | /** |
@@ -712,18 +732,18 @@ discard block |
||
| 712 | 732 | $checked = ''; |
| 713 | 733 | |
| 714 | 734 | if (in_array($cat_term->term_id, $search_terms)) {
|
| 715 | - if ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 716 | - $checked = 'selected="selected"'; |
|
| 717 | - else |
|
| 718 | - $checked = 'checked="checked"'; |
|
| 735 | + if ($cat_display == 'select' || $cat_display == 'multiselect') { |
|
| 736 | + $checked = 'selected="selected"'; |
|
| 737 | + } else { |
|
| 738 | + $checked = 'checked="checked"'; |
|
| 739 | + } |
|
| 719 | 740 | } |
| 720 | 741 | |
| 721 | - if ($cat_display == 'radio') |
|
| 722 | - $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="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
|
| 723 | - elseif ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 724 | - $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>'; |
|
| 725 | - |
|
| 726 | - else {
|
|
| 742 | + if ($cat_display == 'radio') { |
|
| 743 | + $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="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
|
| 744 | + } elseif ($cat_display == 'select' || $cat_display == 'multiselect') { |
|
| 745 | + $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>'; |
|
| 746 | + } else {
|
|
| 727 | 747 | $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="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
| 728 | 748 | } |
| 729 | 749 | |
@@ -732,8 +752,9 @@ discard block |
||
| 732 | 752 | |
| 733 | 753 | } |
| 734 | 754 | |
| 735 | - if ($cat_display == 'checkbox' || $cat_display == 'radio') |
|
| 736 | - $out .= '</div>'; |
|
| 755 | + if ($cat_display == 'checkbox' || $cat_display == 'radio') { |
|
| 756 | + $out .= '</div>'; |
|
| 757 | + } |
|
| 737 | 758 | |
| 738 | 759 | return $out; |
| 739 | 760 | } |
@@ -759,18 +780,21 @@ discard block |
||
| 759 | 780 | global $exclude_cats, $gd_session; |
| 760 | 781 | |
| 761 | 782 | $cat_exclude = ''; |
| 762 | - if (is_array($exclude_cats) && !empty($exclude_cats)) |
|
| 763 | - $cat_exclude = serialize($exclude_cats); |
|
| 783 | + if (is_array($exclude_cats) && !empty($exclude_cats)) { |
|
| 784 | + $cat_exclude = serialize($exclude_cats); |
|
| 785 | + } |
|
| 764 | 786 | |
| 765 | 787 | if (isset($_REQUEST['backandedit'])) {
|
| 766 | 788 | $post = (object)$gd_session->get('listing');
|
| 767 | 789 | |
| 768 | - if (!is_array($post->post_category[$cat_taxonomy])) |
|
| 769 | - $post_category = $post->post_category[$cat_taxonomy]; |
|
| 790 | + if (!is_array($post->post_category[$cat_taxonomy])) { |
|
| 791 | + $post_category = $post->post_category[$cat_taxonomy]; |
|
| 792 | + } |
|
| 770 | 793 | |
| 771 | 794 | $post_categories = $post->post_category_str; |
| 772 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) |
|
| 773 | - $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 795 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) { |
|
| 796 | + $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 797 | + } |
|
| 774 | 798 | |
| 775 | 799 | } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {
|
| 776 | 800 | global $post; |
@@ -961,8 +985,9 @@ discard block |
||
| 961 | 985 | if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
| 962 | 986 | $post_cat_str = $post_categories[$cat_taxonomy]; |
| 963 | 987 | $post_cat_array = explode("#", $post_cat_str);
|
| 964 | - if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) |
|
| 965 | - $style = "display:none;"; |
|
| 988 | + if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) { |
|
| 989 | + $style = "display:none;"; |
|
| 990 | + } |
|
| 966 | 991 | } |
| 967 | 992 | ?> |
| 968 | 993 | <div class="main_cat_list" style=" <?php if (isset($style)) {
|
@@ -997,7 +1022,7 @@ discard block |
||
| 997 | 1022 | print_r($exclude_cats); |
| 998 | 1023 | if(is_array( $exclude_cats)){
|
| 999 | 1024 | $exclude_cats = array_map( 'intval', $exclude_cats ); |
| 1000 | - }else{
|
|
| 1025 | + } else{
|
|
| 1001 | 1026 | $exclude_cats = intval($exclude_cats); |
| 1002 | 1027 | } |
| 1003 | 1028 | |
@@ -1027,7 +1052,10 @@ discard block |
||
| 1027 | 1052 | |
| 1028 | 1053 | <div class="post_default_category"> |
| 1029 | 1054 | <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id;?>" |
| 1030 | - onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" ';?> /> |
|
| 1055 | + onchange="update_listing_cat()" <?php if ($default) { |
|
| 1056 | + echo ' checked="checked" '; |
|
| 1057 | +} |
|
| 1058 | +?> /> |
|
| 1031 | 1059 | <span> |
| 1032 | 1060 | <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name));?>
|
| 1033 | 1061 | </span> |
@@ -1127,8 +1155,9 @@ discard block |
||
| 1127 | 1155 | $onchange = ' onchange="show_subcatlist(this.value, this)" '; |
| 1128 | 1156 | |
| 1129 | 1157 | $option_selected = ''; |
| 1130 | - if (!$selected) |
|
| 1131 | - $option_slected = ' selected="selected" '; |
|
| 1158 | + if (!$selected) { |
|
| 1159 | + $option_slected = ' selected="selected" '; |
|
| 1160 | + } |
|
| 1132 | 1161 | |
| 1133 | 1162 | echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >'; |
| 1134 | 1163 | |
@@ -1136,8 +1165,9 @@ discard block |
||
| 1136 | 1165 | |
| 1137 | 1166 | foreach ($cat_terms as $cat_term) {
|
| 1138 | 1167 | $option_selected = ''; |
| 1139 | - if ($selected == $cat_term->term_id) |
|
| 1140 | - $option_selected = ' selected="selected" '; |
|
| 1168 | + if ($selected == $cat_term->term_id) { |
|
| 1169 | + $option_selected = ' selected="selected" '; |
|
| 1170 | + } |
|
| 1141 | 1171 | |
| 1142 | 1172 | // Count child terms |
| 1143 | 1173 | $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) ); |
@@ -1202,8 +1232,9 @@ discard block |
||
| 1202 | 1232 | |
| 1203 | 1233 | $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico'; |
| 1204 | 1234 | |
| 1205 | - if (!$listing_slug = get_option('geodir_listing_prefix'))
|
|
| 1206 | - $listing_slug = 'places'; |
|
| 1235 | + if (!$listing_slug = get_option('geodir_listing_prefix')) { |
|
| 1236 | + $listing_slug = 'places'; |
|
| 1237 | + } |
|
| 1207 | 1238 | |
| 1208 | 1239 | /** |
| 1209 | 1240 | * Taxonomies |
@@ -1351,7 +1382,7 @@ discard block |
||
| 1351 | 1382 | //print_r( $segments); |
| 1352 | 1383 | if($gd_wpml_get_languages){
|
| 1353 | 1384 | $langs = $gd_wpml_get_languages; |
| 1354 | - }else{
|
|
| 1385 | + } else{
|
|
| 1355 | 1386 | global $sitepress; |
| 1356 | 1387 | $gd_wpml_get_languages = $sitepress->get_active_languages(); |
| 1357 | 1388 | } |
@@ -1494,8 +1525,9 @@ discard block |
||
| 1494 | 1525 | 'city_slug' => $post->city_slug |
| 1495 | 1526 | ); |
| 1496 | 1527 | |
| 1497 | - } else |
|
| 1498 | - $post_location = geodir_get_location(); |
|
| 1528 | + } else { |
|
| 1529 | + $post_location = geodir_get_location(); |
|
| 1530 | + } |
|
| 1499 | 1531 | |
| 1500 | 1532 | |
| 1501 | 1533 | } else {
|
@@ -1524,8 +1556,9 @@ discard block |
||
| 1524 | 1556 | ); |
| 1525 | 1557 | |
| 1526 | 1558 | } |
| 1527 | - } else |
|
| 1528 | - $post_location = geodir_get_location(); |
|
| 1559 | + } else { |
|
| 1560 | + $post_location = geodir_get_location(); |
|
| 1561 | + } |
|
| 1529 | 1562 | } |
| 1530 | 1563 | |
| 1531 | 1564 | |
@@ -1568,8 +1601,9 @@ discard block |
||
| 1568 | 1601 | $post_terms = $post_terms[0]; |
| 1569 | 1602 | } |
| 1570 | 1603 | |
| 1571 | - if (!$post_terms) |
|
| 1572 | - $post_terms = geodir_get_post_meta($post->ID, 'default_category', true); |
|
| 1604 | + if (!$post_terms) { |
|
| 1605 | + $post_terms = geodir_get_post_meta($post->ID, 'default_category', true); |
|
| 1606 | + } |
|
| 1573 | 1607 | |
| 1574 | 1608 | if (!$post_terms) {
|
| 1575 | 1609 | $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true); |
@@ -1583,8 +1617,9 @@ discard block |
||
| 1583 | 1617 | |
| 1584 | 1618 | $term = get_term_by('id', $post_terms, $taxonomies);
|
| 1585 | 1619 | |
| 1586 | - if (!empty($term)) |
|
| 1587 | - $term_request = $term->slug; |
|
| 1620 | + if (!empty($term)) { |
|
| 1621 | + $term_request = $term->slug; |
|
| 1622 | + } |
|
| 1588 | 1623 | //$term_request = $term->slug.'/'; |
| 1589 | 1624 | } |
| 1590 | 1625 | |
@@ -1599,15 +1634,20 @@ discard block |
||
| 1599 | 1634 | $request_term .= $term_request; |
| 1600 | 1635 | |
| 1601 | 1636 | } else {
|
| 1602 | - if (isset($location_request) && $location_request != '') $request_term = $location_request; |
|
| 1637 | + if (isset($location_request) && $location_request != '') { |
|
| 1638 | + $request_term = $location_request; |
|
| 1639 | + } |
|
| 1603 | 1640 | |
| 1604 | - if (isset($term_request) && $term_request != '') $request_term .= $term_request; |
|
| 1641 | + if (isset($term_request) && $term_request != '') { |
|
| 1642 | + $request_term .= $term_request; |
|
| 1643 | + } |
|
| 1605 | 1644 | } |
| 1606 | 1645 | $request_term = trim($request_term, '/'); |
| 1607 | - if (!empty($request_term)) |
|
| 1608 | - $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1609 | - else |
|
| 1610 | - $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1646 | + if (!empty($request_term)) { |
|
| 1647 | + $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link); |
|
| 1648 | + } else { |
|
| 1649 | + $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link); |
|
| 1650 | + } |
|
| 1611 | 1651 | //echo $post_link ; |
| 1612 | 1652 | } |
| 1613 | 1653 | // temp cache the permalink |
@@ -1649,8 +1689,9 @@ discard block |
||
| 1649 | 1689 | if ($geodir_add_location_url && get_option('geodir_add_location_url')) {
|
| 1650 | 1690 | $include_location = true; |
| 1651 | 1691 | } |
| 1652 | - } elseif (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1)
|
|
| 1653 | - $include_location = true; |
|
| 1692 | + } elseif (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) { |
|
| 1693 | + $include_location = true; |
|
| 1694 | + } |
|
| 1654 | 1695 | |
| 1655 | 1696 | if ($include_location) {
|
| 1656 | 1697 | global $post; |
@@ -1800,10 +1841,11 @@ discard block |
||
| 1800 | 1841 | if (!is_object($obj_post_type)) {
|
| 1801 | 1842 | return; |
| 1802 | 1843 | } |
| 1803 | - if ($echo) |
|
| 1804 | - echo $obj_post_type->labels->singular_name; |
|
| 1805 | - else |
|
| 1806 | - return $obj_post_type->labels->singular_name; |
|
| 1844 | + if ($echo) { |
|
| 1845 | + echo $obj_post_type->labels->singular_name; |
|
| 1846 | + } else { |
|
| 1847 | + return $obj_post_type->labels->singular_name; |
|
| 1848 | + } |
|
| 1807 | 1849 | |
| 1808 | 1850 | } |
| 1809 | 1851 | |
@@ -1820,14 +1862,16 @@ discard block |
||
| 1820 | 1862 | {
|
| 1821 | 1863 | $all_postypes = geodir_get_posttypes(); |
| 1822 | 1864 | |
| 1823 | - if (!in_array($post_type, $all_postypes)) |
|
| 1824 | - return false; |
|
| 1865 | + if (!in_array($post_type, $all_postypes)) { |
|
| 1866 | + return false; |
|
| 1867 | + } |
|
| 1825 | 1868 | |
| 1826 | 1869 | $obj_post_type = get_post_type_object($post_type); |
| 1827 | - if ($echo) |
|
| 1828 | - echo $obj_post_type->labels->name; |
|
| 1829 | - else |
|
| 1830 | - return $obj_post_type->labels->name; |
|
| 1870 | + if ($echo) { |
|
| 1871 | + echo $obj_post_type->labels->name; |
|
| 1872 | + } else { |
|
| 1873 | + return $obj_post_type->labels->name; |
|
| 1874 | + } |
|
| 1831 | 1875 | |
| 1832 | 1876 | } |
| 1833 | 1877 | |
@@ -1852,19 +1896,22 @@ discard block |
||
| 1852 | 1896 | $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 "; |
| 1853 | 1897 | |
| 1854 | 1898 | if (is_int($term)) {
|
| 1855 | - if (0 == $term) |
|
| 1856 | - return 0; |
|
| 1899 | + if (0 == $term) { |
|
| 1900 | + return 0; |
|
| 1901 | + } |
|
| 1857 | 1902 | $where = 't.term_id = %d'; |
| 1858 | - if (!empty($taxonomy)) |
|
| 1859 | - return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1860 | - else |
|
| 1861 | - return $wpdb->get_var($wpdb->prepare($select . $where, $term)); |
|
| 1903 | + if (!empty($taxonomy)) { |
|
| 1904 | + return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1905 | + } else { |
|
| 1906 | + return $wpdb->get_var($wpdb->prepare($select . $where, $term)); |
|
| 1907 | + } |
|
| 1862 | 1908 | } |
| 1863 | 1909 | |
| 1864 | 1910 | $term = trim(wp_unslash($term)); |
| 1865 | 1911 | |
| 1866 | - if ('' === $slug = sanitize_title($term))
|
|
| 1867 | - return 0; |
|
| 1912 | + if ('' === $slug = sanitize_title($term)) { |
|
| 1913 | + return 0; |
|
| 1914 | + } |
|
| 1868 | 1915 | |
| 1869 | 1916 | $where = 't.slug = %s'; |
| 1870 | 1917 | |
@@ -1881,14 +1928,16 @@ discard block |
||
| 1881 | 1928 | $where_fields[] = $taxonomy; |
| 1882 | 1929 | |
| 1883 | 1930 | |
| 1884 | - 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))
|
|
| 1885 | - return $result; |
|
| 1931 | + 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)) { |
|
| 1932 | + return $result; |
|
| 1933 | + } |
|
| 1886 | 1934 | |
| 1887 | 1935 | return false; |
| 1888 | 1936 | } |
| 1889 | 1937 | |
| 1890 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))
|
|
| 1891 | - return $result; |
|
| 1938 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields))) { |
|
| 1939 | + return $result; |
|
| 1940 | + } |
|
| 1892 | 1941 | |
| 1893 | 1942 | return false; |
| 1894 | 1943 | } |
@@ -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 | ' . __(ucfirst($args->labels->name)) . ' |
| 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 | ' . __(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="' . $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="' . $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 | |
@@ -401,32 +401,32 @@ discard block |
||
| 401 | 401 | */ |
| 402 | 402 | function geodir_get_current_posttype() |
| 403 | 403 | {
|
| 404 | - global $wp_query, $geodir_post_type; |
|
| 404 | + global $wp_query, $geodir_post_type; |
|
| 405 | 405 | |
| 406 | - $geodir_post_type = get_query_var('post_type');
|
|
| 406 | + $geodir_post_type = get_query_var('post_type');
|
|
| 407 | 407 | |
| 408 | - if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
|
|
| 409 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 410 | - $geodir_post_type = get_post_type((int)$_REQUEST['pid']); |
|
| 411 | - elseif (isset($_REQUEST['listing_type'])) |
|
| 412 | - $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 413 | - } |
|
| 408 | + if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
|
|
| 409 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 410 | + $geodir_post_type = get_post_type((int)$_REQUEST['pid']); |
|
| 411 | + elseif (isset($_REQUEST['listing_type'])) |
|
| 412 | + $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 413 | + } |
|
| 414 | 414 | |
| 415 | - if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))
|
|
| 416 | - $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 415 | + if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))
|
|
| 416 | + $geodir_post_type = sanitize_text_field($_REQUEST['stype']); |
|
| 417 | 417 | |
| 418 | - if (is_tax()) |
|
| 419 | - $geodir_post_type = geodir_get_taxonomy_posttype(); |
|
| 418 | + if (is_tax()) |
|
| 419 | + $geodir_post_type = geodir_get_taxonomy_posttype(); |
|
| 420 | 420 | |
| 421 | 421 | |
| 422 | - $all_postypes = geodir_get_posttypes(); |
|
| 423 | - $all_postypes = stripslashes_deep($all_postypes); |
|
| 422 | + $all_postypes = geodir_get_posttypes(); |
|
| 423 | + $all_postypes = stripslashes_deep($all_postypes); |
|
| 424 | 424 | |
| 425 | - if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) |
|
| 426 | - $geodir_post_type = ''; |
|
| 425 | + if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) |
|
| 426 | + $geodir_post_type = ''; |
|
| 427 | 427 | |
| 428 | 428 | |
| 429 | - return $geodir_post_type; |
|
| 429 | + return $geodir_post_type; |
|
| 430 | 430 | } |
| 431 | 431 | |
| 432 | 432 | /** |
@@ -440,21 +440,21 @@ discard block |
||
| 440 | 440 | */ |
| 441 | 441 | function geodir_get_default_posttype() |
| 442 | 442 | {
|
| 443 | - $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) ); |
|
| 443 | + $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) ); |
|
| 444 | 444 | |
| 445 | - foreach ( $post_types as $post_type => $info ) {
|
|
| 446 | - global $wpdb; |
|
| 447 | - $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) ); |
|
| 448 | - if ( $has_posts ) {
|
|
| 449 | - $stype = $post_type; break; |
|
| 450 | - } |
|
| 451 | - } |
|
| 445 | + foreach ( $post_types as $post_type => $info ) {
|
|
| 446 | + global $wpdb; |
|
| 447 | + $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) ); |
|
| 448 | + if ( $has_posts ) {
|
|
| 449 | + $stype = $post_type; break; |
|
| 450 | + } |
|
| 451 | + } |
|
| 452 | 452 | |
| 453 | - if(!$stype){
|
|
| 454 | - $stype = 'gd_place'; |
|
| 455 | - } |
|
| 453 | + if(!$stype){
|
|
| 454 | + $stype = 'gd_place'; |
|
| 455 | + } |
|
| 456 | 456 | |
| 457 | - return $stype; |
|
| 457 | + return $stype; |
|
| 458 | 458 | } |
| 459 | 459 | |
| 460 | 460 | /** |
@@ -468,21 +468,21 @@ discard block |
||
| 468 | 468 | */ |
| 469 | 469 | function geodir_get_posttypes($output = 'names') |
| 470 | 470 | {
|
| 471 | - $post_types = array(); |
|
| 472 | - $post_types = get_option('geodir_post_types');
|
|
| 473 | - $post_types = stripslashes_deep($post_types); |
|
| 474 | - if (!empty($post_types)) {
|
|
| 475 | - switch ($output): |
|
| 476 | - case 'object': |
|
| 477 | - case 'Object': |
|
| 478 | - $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types; |
|
| 479 | - break; |
|
| 480 | - case 'array': |
|
| 481 | - case 'Array': |
|
| 482 | - $post_types = (array)$post_types; |
|
| 483 | - break; |
|
| 471 | + $post_types = array(); |
|
| 472 | + $post_types = get_option('geodir_post_types');
|
|
| 473 | + $post_types = stripslashes_deep($post_types); |
|
| 474 | + if (!empty($post_types)) {
|
|
| 475 | + switch ($output): |
|
| 476 | + case 'object': |
|
| 477 | + case 'Object': |
|
| 478 | + $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types; |
|
| 479 | + break; |
|
| 480 | + case 'array': |
|
| 481 | + case 'Array': |
|
| 482 | + $post_types = (array)$post_types; |
|
| 483 | + break; |
|
| 484 | 484 | case 'options': |
| 485 | - $post_types = (array)$post_types; |
|
| 485 | + $post_types = (array)$post_types; |
|
| 486 | 486 | |
| 487 | 487 | $options = array(); |
| 488 | 488 | if (!empty($post_types)) {
|
@@ -491,17 +491,17 @@ discard block |
||
| 491 | 491 | } |
| 492 | 492 | } |
| 493 | 493 | $post_types = $options; |
| 494 | - break; |
|
| 495 | - default: |
|
| 496 | - $post_types = array_keys($post_types); |
|
| 497 | - break; |
|
| 498 | - endswitch; |
|
| 499 | - } |
|
| 500 | - |
|
| 501 | - if (!empty($post_types)) |
|
| 502 | - return $post_types; |
|
| 503 | - else |
|
| 504 | - return array(); |
|
| 494 | + break; |
|
| 495 | + default: |
|
| 496 | + $post_types = array_keys($post_types); |
|
| 497 | + break; |
|
| 498 | + endswitch; |
|
| 499 | + } |
|
| 500 | + |
|
| 501 | + if (!empty($post_types)) |
|
| 502 | + return $post_types; |
|
| 503 | + else |
|
| 504 | + return array(); |
|
| 505 | 505 | } |
| 506 | 506 | |
| 507 | 507 | /** |
@@ -514,108 +514,108 @@ discard block |
||
| 514 | 514 | */ |
| 515 | 515 | function geodir_get_posttype_info($post_type = '') |
| 516 | 516 | {
|
| 517 | - $post_types = array(); |
|
| 518 | - $post_types = get_option('geodir_post_types');
|
|
| 519 | - $post_types = stripslashes_deep($post_types); |
|
| 520 | - if (!empty($post_types) && $post_type != '') {
|
|
| 521 | - return $post_types[$post_type]; |
|
| 522 | - } else |
|
| 523 | - return false; |
|
| 517 | + $post_types = array(); |
|
| 518 | + $post_types = get_option('geodir_post_types');
|
|
| 519 | + $post_types = stripslashes_deep($post_types); |
|
| 520 | + if (!empty($post_types) && $post_type != '') {
|
|
| 521 | + return $post_types[$post_type]; |
|
| 522 | + } else |
|
| 523 | + return false; |
|
| 524 | 524 | } |
| 525 | 525 | |
| 526 | 526 | if (!function_exists('geodir_get_taxonomies')) {
|
| 527 | - /** |
|
| 528 | - * Get all custom taxonomies. |
|
| 529 | - * |
|
| 530 | - * @since 1.0.0 |
|
| 531 | - * @package GeoDirectory |
|
| 532 | - * @param string $post_type The post type. |
|
| 533 | - * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 534 | - * @return array|bool Taxonomies on success. false on failure. |
|
| 535 | - */ |
|
| 536 | - function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false) |
|
| 537 | - {
|
|
| 527 | + /** |
|
| 528 | + * Get all custom taxonomies. |
|
| 529 | + * |
|
| 530 | + * @since 1.0.0 |
|
| 531 | + * @package GeoDirectory |
|
| 532 | + * @param string $post_type The post type. |
|
| 533 | + * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 534 | + * @return array|bool Taxonomies on success. false on failure. |
|
| 535 | + */ |
|
| 536 | + function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false) |
|
| 537 | + {
|
|
| 538 | 538 | |
| 539 | - $taxonomies = array(); |
|
| 540 | - $gd_taxonomies = array(); |
|
| 539 | + $taxonomies = array(); |
|
| 540 | + $gd_taxonomies = array(); |
|
| 541 | 541 | |
| 542 | - if ($taxonomies = get_option('geodir_taxonomies')) {
|
|
| 542 | + if ($taxonomies = get_option('geodir_taxonomies')) {
|
|
| 543 | 543 | |
| 544 | 544 | |
| 545 | - $gd_taxonomies = array_keys($taxonomies); |
|
| 545 | + $gd_taxonomies = array_keys($taxonomies); |
|
| 546 | 546 | |
| 547 | 547 | |
| 548 | - if ($post_type != '') |
|
| 549 | - $gd_taxonomies = array(); |
|
| 548 | + if ($post_type != '') |
|
| 549 | + $gd_taxonomies = array(); |
|
| 550 | 550 | |
| 551 | - $i = 0; |
|
| 552 | - foreach ($taxonomies as $taxonomy => $args) {
|
|
| 551 | + $i = 0; |
|
| 552 | + foreach ($taxonomies as $taxonomy => $args) {
|
|
| 553 | 553 | |
| 554 | - if ($post_type != '' && $args['object_type'] == $post_type) |
|
| 555 | - $gd_taxonomies[] = $taxonomy; |
|
| 554 | + if ($post_type != '' && $args['object_type'] == $post_type) |
|
| 555 | + $gd_taxonomies[] = $taxonomy; |
|
| 556 | 556 | |
| 557 | - if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {
|
|
| 558 | - if (array_search($taxonomy, $gd_taxonomies) !== false) |
|
| 559 | - unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]); |
|
| 560 | - } |
|
| 557 | + if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {
|
|
| 558 | + if (array_search($taxonomy, $gd_taxonomies) !== false) |
|
| 559 | + unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]); |
|
| 560 | + } |
|
| 561 | 561 | |
| 562 | - } |
|
| 562 | + } |
|
| 563 | 563 | |
| 564 | - $gd_taxonomies = array_values($gd_taxonomies); |
|
| 565 | - } |
|
| 566 | - |
|
| 567 | - /** |
|
| 568 | - * Filter the taxonomies. |
|
| 569 | - * |
|
| 570 | - * @since 1.0.0 |
|
| 571 | - * @param array $gd_taxonomies The taxonomy array. |
|
| 572 | - */ |
|
| 573 | - $taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);
|
|
| 574 | - |
|
| 575 | - if (!empty($taxonomies)) {
|
|
| 576 | - return $taxonomies; |
|
| 577 | - } else {
|
|
| 578 | - return false; |
|
| 579 | - } |
|
| 580 | - } |
|
| 564 | + $gd_taxonomies = array_values($gd_taxonomies); |
|
| 565 | + } |
|
| 566 | + |
|
| 567 | + /** |
|
| 568 | + * Filter the taxonomies. |
|
| 569 | + * |
|
| 570 | + * @since 1.0.0 |
|
| 571 | + * @param array $gd_taxonomies The taxonomy array. |
|
| 572 | + */ |
|
| 573 | + $taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);
|
|
| 574 | + |
|
| 575 | + if (!empty($taxonomies)) {
|
|
| 576 | + return $taxonomies; |
|
| 577 | + } else {
|
|
| 578 | + return false; |
|
| 579 | + } |
|
| 580 | + } |
|
| 581 | 581 | } |
| 582 | 582 | |
| 583 | 583 | if (!function_exists(' geodir_get_categories_dl')) {
|
| 584 | - /** |
|
| 585 | - * Get categories dropdown HTML. |
|
| 586 | - * |
|
| 587 | - * @since 1.0.0 |
|
| 588 | - * @package GeoDirectory |
|
| 589 | - * @param string $post_type The post type. |
|
| 590 | - * @param string $selected The selected value. |
|
| 591 | - * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 592 | - * @param bool $echo Prints the HTML when set to true. Default: true. |
|
| 593 | - * @return void|string Dropdown HTML. |
|
| 594 | - */ |
|
| 595 | - function geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true) |
|
| 596 | - {
|
|
| 597 | - |
|
| 598 | - $html = ''; |
|
| 599 | - $taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies); |
|
| 600 | - |
|
| 601 | - $categories = get_terms($taxonomies); |
|
| 602 | - |
|
| 603 | - $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';
|
|
| 604 | - |
|
| 605 | - foreach ($categories as $category_obj) {
|
|
| 606 | - $select_opt = ''; |
|
| 607 | - if ($selected == $category_obj->term_id) {
|
|
| 608 | - $select_opt = 'selected="selected"'; |
|
| 609 | - } |
|
| 610 | - $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">' |
|
| 611 | - . ucfirst($category_obj->name) . '</option>'; |
|
| 612 | - } |
|
| 613 | - |
|
| 614 | - if ($echo) |
|
| 615 | - echo $html; |
|
| 616 | - else |
|
| 617 | - return $html; |
|
| 618 | - } |
|
| 584 | + /** |
|
| 585 | + * Get categories dropdown HTML. |
|
| 586 | + * |
|
| 587 | + * @since 1.0.0 |
|
| 588 | + * @package GeoDirectory |
|
| 589 | + * @param string $post_type The post type. |
|
| 590 | + * @param string $selected The selected value. |
|
| 591 | + * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false. |
|
| 592 | + * @param bool $echo Prints the HTML when set to true. Default: true. |
|
| 593 | + * @return void|string Dropdown HTML. |
|
| 594 | + */ |
|
| 595 | + function geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true) |
|
| 596 | + {
|
|
| 597 | + |
|
| 598 | + $html = ''; |
|
| 599 | + $taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies); |
|
| 600 | + |
|
| 601 | + $categories = get_terms($taxonomies); |
|
| 602 | + |
|
| 603 | + $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';
|
|
| 604 | + |
|
| 605 | + foreach ($categories as $category_obj) {
|
|
| 606 | + $select_opt = ''; |
|
| 607 | + if ($selected == $category_obj->term_id) {
|
|
| 608 | + $select_opt = 'selected="selected"'; |
|
| 609 | + } |
|
| 610 | + $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">' |
|
| 611 | + . ucfirst($category_obj->name) . '</option>'; |
|
| 612 | + } |
|
| 613 | + |
|
| 614 | + if ($echo) |
|
| 615 | + echo $html; |
|
| 616 | + else |
|
| 617 | + return $html; |
|
| 618 | + } |
|
| 619 | 619 | } |
| 620 | 620 | |
| 621 | 621 | |
@@ -630,28 +630,28 @@ discard block |
||
| 630 | 630 | function geodir_get_listing_slug($object_type = '') |
| 631 | 631 | {
|
| 632 | 632 | |
| 633 | - $listing_slug = ''; |
|
| 633 | + $listing_slug = ''; |
|
| 634 | 634 | |
| 635 | - $post_types = get_option('geodir_post_types');
|
|
| 636 | - $taxonomies = get_option('geodir_taxonomies');
|
|
| 635 | + $post_types = get_option('geodir_post_types');
|
|
| 636 | + $taxonomies = get_option('geodir_taxonomies');
|
|
| 637 | 637 | |
| 638 | 638 | |
| 639 | - if ($object_type != '') {
|
|
| 640 | - if (!empty($post_types) && array_key_exists($object_type, $post_types)) {
|
|
| 639 | + if ($object_type != '') {
|
|
| 640 | + if (!empty($post_types) && array_key_exists($object_type, $post_types)) {
|
|
| 641 | 641 | |
| 642 | - $object_info = $post_types[$object_type]; |
|
| 643 | - $listing_slug = $object_info['listing_slug']; |
|
| 644 | - } elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {
|
|
| 645 | - $object_info = $taxonomies[$object_type]; |
|
| 646 | - $listing_slug = $object_info['listing_slug']; |
|
| 647 | - } |
|
| 642 | + $object_info = $post_types[$object_type]; |
|
| 643 | + $listing_slug = $object_info['listing_slug']; |
|
| 644 | + } elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {
|
|
| 645 | + $object_info = $taxonomies[$object_type]; |
|
| 646 | + $listing_slug = $object_info['listing_slug']; |
|
| 647 | + } |
|
| 648 | 648 | |
| 649 | - } |
|
| 649 | + } |
|
| 650 | 650 | |
| 651 | - if (!empty($listing_slug)) |
|
| 652 | - return $listing_slug; |
|
| 653 | - else |
|
| 654 | - return false; |
|
| 651 | + if (!empty($listing_slug)) |
|
| 652 | + return $listing_slug; |
|
| 653 | + else |
|
| 654 | + return false; |
|
| 655 | 655 | } |
| 656 | 656 | |
| 657 | 657 | |
@@ -666,212 +666,212 @@ discard block |
||
| 666 | 666 | */ |
| 667 | 667 | function geodir_get_taxonomy_posttype($taxonomy = '') |
| 668 | 668 | {
|
| 669 | - global $wp_query; |
|
| 670 | - |
|
| 671 | - $post_type = array(); |
|
| 672 | - $taxonomies = array(); |
|
| 673 | - |
|
| 674 | - if (!empty($taxonomy)) {
|
|
| 675 | - $taxonomies[] = $taxonomy; |
|
| 676 | - } elseif (isset($wp_query->tax_query->queries)) {
|
|
| 677 | - $tax_arr = $wp_query->tax_query->queries; |
|
| 678 | - //if tax query has 'relation' set then it will break wp_list_pluck so we remove it |
|
| 679 | - if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}
|
|
| 680 | - $taxonomies = wp_list_pluck($tax_arr, 'taxonomy'); |
|
| 681 | - } |
|
| 682 | - |
|
| 683 | - if (!empty($taxonomies)) {
|
|
| 684 | - foreach (geodir_get_posttypes() as $pt) {
|
|
| 685 | - $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt); |
|
| 686 | - if (array_intersect($taxonomies, $object_taxonomies)) |
|
| 687 | - $post_type[] = $pt; |
|
| 688 | - } |
|
| 689 | - } |
|
| 690 | - |
|
| 691 | - if (!empty($post_type)) |
|
| 692 | - return $post_type[0]; |
|
| 693 | - else |
|
| 694 | - return false; |
|
| 669 | + global $wp_query; |
|
| 670 | + |
|
| 671 | + $post_type = array(); |
|
| 672 | + $taxonomies = array(); |
|
| 673 | + |
|
| 674 | + if (!empty($taxonomy)) {
|
|
| 675 | + $taxonomies[] = $taxonomy; |
|
| 676 | + } elseif (isset($wp_query->tax_query->queries)) {
|
|
| 677 | + $tax_arr = $wp_query->tax_query->queries; |
|
| 678 | + //if tax query has 'relation' set then it will break wp_list_pluck so we remove it |
|
| 679 | + if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}
|
|
| 680 | + $taxonomies = wp_list_pluck($tax_arr, 'taxonomy'); |
|
| 681 | + } |
|
| 682 | + |
|
| 683 | + if (!empty($taxonomies)) {
|
|
| 684 | + foreach (geodir_get_posttypes() as $pt) {
|
|
| 685 | + $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt); |
|
| 686 | + if (array_intersect($taxonomies, $object_taxonomies)) |
|
| 687 | + $post_type[] = $pt; |
|
| 688 | + } |
|
| 689 | + } |
|
| 690 | + |
|
| 691 | + if (!empty($post_type)) |
|
| 692 | + return $post_type[0]; |
|
| 693 | + else |
|
| 694 | + return false; |
|
| 695 | 695 | } |
| 696 | 696 | |
| 697 | 697 | if (!function_exists('geodir_custom_taxonomy_walker')) {
|
| 698 | - /** |
|
| 699 | - * Custom taxonomy walker function. |
|
| 700 | - * |
|
| 701 | - * @since 1.0.0 |
|
| 702 | - * @package GeoDirectory |
|
| 703 | - * @param string $cat_taxonomy The taxonomy name. |
|
| 704 | - * @param int $cat_parent The parent term ID. |
|
| 705 | - * @param bool $hide_empty Hide empty taxonomies? Default: false. |
|
| 706 | - * @param int $pading CSS padding in pixels. |
|
| 707 | - * @return string|void taxonomy HTML. |
|
| 708 | - */ |
|
| 709 | - function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0) |
|
| 710 | - {
|
|
| 711 | - global $cat_display, $post_cat, $exclude_cats; |
|
| 712 | - |
|
| 713 | - $search_terms = trim($post_cat, ","); |
|
| 714 | - |
|
| 715 | - $search_terms = explode(",", $search_terms);
|
|
| 716 | - |
|
| 717 | - $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));
|
|
| 718 | - |
|
| 719 | - $display = ''; |
|
| 720 | - $onchange = ''; |
|
| 721 | - $term_check = ''; |
|
| 722 | - $main_list_class = ''; |
|
| 723 | - $out = ''; |
|
| 724 | - //If there are terms, start displaying |
|
| 725 | - if (count($cat_terms) > 0) {
|
|
| 726 | - //Displaying as a list |
|
| 727 | - $p = $pading * 20; |
|
| 728 | - $pading++; |
|
| 729 | - |
|
| 730 | - |
|
| 731 | - if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {
|
|
| 732 | - if ($cat_parent == 0) {
|
|
| 733 | - $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display; |
|
| 734 | - $main_list_class = 'class="main_list_selecter"'; |
|
| 735 | - } else {
|
|
| 736 | - //$display = 'display:none'; |
|
| 737 | - $list_class = 'sub_list gd-sub-cats-list'; |
|
| 738 | - } |
|
| 739 | - } |
|
| 698 | + /** |
|
| 699 | + * Custom taxonomy walker function. |
|
| 700 | + * |
|
| 701 | + * @since 1.0.0 |
|
| 702 | + * @package GeoDirectory |
|
| 703 | + * @param string $cat_taxonomy The taxonomy name. |
|
| 704 | + * @param int $cat_parent The parent term ID. |
|
| 705 | + * @param bool $hide_empty Hide empty taxonomies? Default: false. |
|
| 706 | + * @param int $pading CSS padding in pixels. |
|
| 707 | + * @return string|void taxonomy HTML. |
|
| 708 | + */ |
|
| 709 | + function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0) |
|
| 710 | + {
|
|
| 711 | + global $cat_display, $post_cat, $exclude_cats; |
|
| 712 | + |
|
| 713 | + $search_terms = trim($post_cat, ","); |
|
| 714 | + |
|
| 715 | + $search_terms = explode(",", $search_terms);
|
|
| 716 | + |
|
| 717 | + $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));
|
|
| 718 | + |
|
| 719 | + $display = ''; |
|
| 720 | + $onchange = ''; |
|
| 721 | + $term_check = ''; |
|
| 722 | + $main_list_class = ''; |
|
| 723 | + $out = ''; |
|
| 724 | + //If there are terms, start displaying |
|
| 725 | + if (count($cat_terms) > 0) {
|
|
| 726 | + //Displaying as a list |
|
| 727 | + $p = $pading * 20; |
|
| 728 | + $pading++; |
|
| 729 | + |
|
| 730 | + |
|
| 731 | + if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {
|
|
| 732 | + if ($cat_parent == 0) {
|
|
| 733 | + $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display; |
|
| 734 | + $main_list_class = 'class="main_list_selecter"'; |
|
| 735 | + } else {
|
|
| 736 | + //$display = 'display:none'; |
|
| 737 | + $list_class = 'sub_list gd-sub-cats-list'; |
|
| 738 | + } |
|
| 739 | + } |
|
| 740 | 740 | |
| 741 | - if ($cat_display == 'checkbox' || $cat_display == 'radio') {
|
|
| 742 | - $p = 0; |
|
| 743 | - $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 744 | - } |
|
| 741 | + if ($cat_display == 'checkbox' || $cat_display == 'radio') {
|
|
| 742 | + $p = 0; |
|
| 743 | + $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 744 | + } |
|
| 745 | 745 | |
| 746 | - foreach ($cat_terms as $cat_term) {
|
|
| 746 | + foreach ($cat_terms as $cat_term) {
|
|
| 747 | 747 | |
| 748 | - $checked = ''; |
|
| 748 | + $checked = ''; |
|
| 749 | 749 | |
| 750 | - if (in_array($cat_term->term_id, $search_terms)) {
|
|
| 751 | - if ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 752 | - $checked = 'selected="selected"'; |
|
| 753 | - else |
|
| 754 | - $checked = 'checked="checked"'; |
|
| 755 | - } |
|
| 750 | + if (in_array($cat_term->term_id, $search_terms)) {
|
|
| 751 | + if ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 752 | + $checked = 'selected="selected"'; |
|
| 753 | + else |
|
| 754 | + $checked = 'checked="checked"'; |
|
| 755 | + } |
|
| 756 | 756 | |
| 757 | - if ($cat_display == 'radio') |
|
| 758 | - $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="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
|
| 759 | - elseif ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 760 | - $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>'; |
|
| 757 | + if ($cat_display == 'radio') |
|
| 758 | + $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="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
|
| 759 | + elseif ($cat_display == 'select' || $cat_display == 'multiselect') |
|
| 760 | + $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>'; |
|
| 761 | 761 | |
| 762 | - else {
|
|
| 763 | - $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="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
|
| 764 | - } |
|
| 762 | + else {
|
|
| 763 | + $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="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
|
| 764 | + } |
|
| 765 | 765 | |
| 766 | - // Call recurson to print sub cats |
|
| 767 | - $out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading); |
|
| 766 | + // Call recurson to print sub cats |
|
| 767 | + $out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading); |
|
| 768 | 768 | |
| 769 | - } |
|
| 769 | + } |
|
| 770 | 770 | |
| 771 | - if ($cat_display == 'checkbox' || $cat_display == 'radio') |
|
| 772 | - $out .= '</div>'; |
|
| 771 | + if ($cat_display == 'checkbox' || $cat_display == 'radio') |
|
| 772 | + $out .= '</div>'; |
|
| 773 | 773 | |
| 774 | - return $out; |
|
| 775 | - } |
|
| 776 | - return; |
|
| 777 | - } |
|
| 774 | + return $out; |
|
| 775 | + } |
|
| 776 | + return; |
|
| 777 | + } |
|
| 778 | 778 | } |
| 779 | 779 | |
| 780 | 780 | if (!function_exists('geodir_custom_taxonomy_walker2')) {
|
| 781 | - /** |
|
| 782 | - * Custom taxonomy walker function. |
|
| 783 | - * |
|
| 784 | - * @since 1.0.0 |
|
| 785 | - * @package GeoDirectory |
|
| 786 | - * @global object $post WordPress Post object. |
|
| 787 | - * @global object $gd_session GeoDirectory Session object. |
|
| 788 | - * @param string $cat_taxonomy The taxonomy name. |
|
| 789 | - * @param string $cat_limit Number of categories to display. |
|
| 790 | - */ |
|
| 791 | - function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '') |
|
| 792 | - {
|
|
| 793 | - $post_category = ''; |
|
| 794 | - $post_category_str = ''; |
|
| 795 | - global $exclude_cats, $gd_session; |
|
| 796 | - |
|
| 797 | - $cat_exclude = ''; |
|
| 798 | - if (is_array($exclude_cats) && !empty($exclude_cats)) |
|
| 799 | - $cat_exclude = serialize($exclude_cats); |
|
| 800 | - |
|
| 801 | - if (isset($_REQUEST['backandedit'])) {
|
|
| 802 | - $post = (object)$gd_session->get('listing');
|
|
| 803 | - |
|
| 804 | - if (!is_array($post->post_category[$cat_taxonomy])) |
|
| 805 | - $post_category = $post->post_category[$cat_taxonomy]; |
|
| 806 | - |
|
| 807 | - $post_categories = $post->post_category_str; |
|
| 808 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) |
|
| 809 | - $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 810 | - |
|
| 811 | - } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {
|
|
| 812 | - global $post; |
|
| 813 | - |
|
| 814 | - $post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true); |
|
| 815 | - if (empty($post_category) && isset($post->{$cat_taxonomy})) {
|
|
| 816 | - $post_category = $post->{$cat_taxonomy};
|
|
| 817 | - } |
|
| 781 | + /** |
|
| 782 | + * Custom taxonomy walker function. |
|
| 783 | + * |
|
| 784 | + * @since 1.0.0 |
|
| 785 | + * @package GeoDirectory |
|
| 786 | + * @global object $post WordPress Post object. |
|
| 787 | + * @global object $gd_session GeoDirectory Session object. |
|
| 788 | + * @param string $cat_taxonomy The taxonomy name. |
|
| 789 | + * @param string $cat_limit Number of categories to display. |
|
| 790 | + */ |
|
| 791 | + function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '') |
|
| 792 | + {
|
|
| 793 | + $post_category = ''; |
|
| 794 | + $post_category_str = ''; |
|
| 795 | + global $exclude_cats, $gd_session; |
|
| 796 | + |
|
| 797 | + $cat_exclude = ''; |
|
| 798 | + if (is_array($exclude_cats) && !empty($exclude_cats)) |
|
| 799 | + $cat_exclude = serialize($exclude_cats); |
|
| 800 | + |
|
| 801 | + if (isset($_REQUEST['backandedit'])) {
|
|
| 802 | + $post = (object)$gd_session->get('listing');
|
|
| 803 | + |
|
| 804 | + if (!is_array($post->post_category[$cat_taxonomy])) |
|
| 805 | + $post_category = $post->post_category[$cat_taxonomy]; |
|
| 806 | + |
|
| 807 | + $post_categories = $post->post_category_str; |
|
| 808 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) |
|
| 809 | + $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 810 | + |
|
| 811 | + } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {
|
|
| 812 | + global $post; |
|
| 813 | + |
|
| 814 | + $post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true); |
|
| 815 | + if (empty($post_category) && isset($post->{$cat_taxonomy})) {
|
|
| 816 | + $post_category = $post->{$cat_taxonomy};
|
|
| 817 | + } |
|
| 818 | 818 | |
| 819 | - $post_categories = get_post_meta($post->ID, 'post_categories', true); |
|
| 819 | + $post_categories = get_post_meta($post->ID, 'post_categories', true); |
|
| 820 | 820 | |
| 821 | - if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 822 | - foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {
|
|
| 823 | - if (is_numeric($cat_part)) {
|
|
| 824 | - $cat_part_arr[] = $cat_part; |
|
| 825 | - } |
|
| 826 | - } |
|
| 827 | - if (is_array($cat_part_arr)) {
|
|
| 828 | - $post_category = implode(',', $cat_part_arr);
|
|
| 829 | - } |
|
| 830 | - } |
|
| 821 | + if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 822 | + foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {
|
|
| 823 | + if (is_numeric($cat_part)) {
|
|
| 824 | + $cat_part_arr[] = $cat_part; |
|
| 825 | + } |
|
| 826 | + } |
|
| 827 | + if (is_array($cat_part_arr)) {
|
|
| 828 | + $post_category = implode(',', $cat_part_arr);
|
|
| 829 | + } |
|
| 830 | + } |
|
| 831 | 831 | |
| 832 | - if (!empty($post_category)) {
|
|
| 833 | - $cat1 = array_filter(explode(',', $post_category));
|
|
| 834 | - $post_category = ',' . implode(',', $cat1) . ',';
|
|
| 832 | + if (!empty($post_category)) {
|
|
| 833 | + $cat1 = array_filter(explode(',', $post_category));
|
|
| 834 | + $post_category = ',' . implode(',', $cat1) . ',';
|
|
| 835 | 835 | |
| 836 | - } |
|
| 836 | + } |
|
| 837 | 837 | |
| 838 | - if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {
|
|
| 838 | + if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {
|
|
| 839 | 839 | |
| 840 | - $post_category_upd = explode(',', $post_category);
|
|
| 841 | - $post_category_change = ''; |
|
| 842 | - foreach ($post_category_upd as $cat) {
|
|
| 840 | + $post_category_upd = explode(',', $post_category);
|
|
| 841 | + $post_category_change = ''; |
|
| 842 | + foreach ($post_category_upd as $cat) {
|
|
| 843 | 843 | |
| 844 | - if (!in_array($cat, $exclude_cats) && $cat != '') {
|
|
| 845 | - $post_category_change .= ',' . $cat; |
|
| 846 | - } |
|
| 847 | - } |
|
| 848 | - $post_category = $post_category_change; |
|
| 849 | - } |
|
| 844 | + if (!in_array($cat, $exclude_cats) && $cat != '') {
|
|
| 845 | + $post_category_change .= ',' . $cat; |
|
| 846 | + } |
|
| 847 | + } |
|
| 848 | + $post_category = $post_category_change; |
|
| 849 | + } |
|
| 850 | 850 | |
| 851 | 851 | |
| 852 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 853 | - $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 854 | - } |
|
| 855 | - } |
|
| 852 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 853 | + $post_category_str = $post_categories[$cat_taxonomy]; |
|
| 854 | + } |
|
| 855 | + } |
|
| 856 | 856 | |
| 857 | - echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']" />'; |
|
| 857 | + echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']" />'; |
|
| 858 | 858 | |
| 859 | - echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']" />'; |
|
| 859 | + echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']" />'; |
|
| 860 | 860 | |
| 861 | - echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']" />'; |
|
| 861 | + echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']" />'; |
|
| 862 | 862 | |
| 863 | 863 | |
| 864 | - ?> |
|
| 864 | + ?> |
|
| 865 | 865 | <div class="cat_sublist"> |
| 866 | 866 | <?php |
| 867 | 867 | |
| 868 | - $post_id = isset($post->ID) ? $post->ID : ''; |
|
| 868 | + $post_id = isset($post->ID) ? $post->ID : ''; |
|
| 869 | 869 | |
| 870 | - if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 870 | + if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {
|
|
| 871 | 871 | |
| 872 | - geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories); |
|
| 873 | - } |
|
| 874 | - ?> |
|
| 872 | + geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories); |
|
| 873 | + } |
|
| 874 | + ?> |
|
| 875 | 875 | </div> |
| 876 | 876 | <script type="text/javascript"> |
| 877 | 877 | |
@@ -994,22 +994,22 @@ discard block |
||
| 994 | 994 | |
| 995 | 995 | </script> |
| 996 | 996 | <?php |
| 997 | - if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 998 | - $post_cat_str = $post_categories[$cat_taxonomy]; |
|
| 999 | - $post_cat_array = explode("#", $post_cat_str);
|
|
| 1000 | - if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) |
|
| 1001 | - $style = "display:none;"; |
|
| 1002 | - } |
|
| 1003 | - ?> |
|
| 997 | + if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
|
|
| 998 | + $post_cat_str = $post_categories[$cat_taxonomy]; |
|
| 999 | + $post_cat_array = explode("#", $post_cat_str);
|
|
| 1000 | + if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) |
|
| 1001 | + $style = "display:none;"; |
|
| 1002 | + } |
|
| 1003 | + ?> |
|
| 1004 | 1004 | <div class="main_cat_list" style=" <?php if (isset($style)) {
|
| 1005 | - echo $style; |
|
| 1006 | - }?> "> |
|
| 1005 | + echo $style; |
|
| 1006 | + }?> "> |
|
| 1007 | 1007 | <?php geodir_get_catlist($cat_taxonomy, 0); // print main categories list |
| 1008 | - ?> |
|
| 1008 | + ?> |
|
| 1009 | 1009 | </div> |
| 1010 | 1010 | <?php |
| 1011 | 1011 | |
| 1012 | - } |
|
| 1012 | + } |
|
| 1013 | 1013 | } |
| 1014 | 1014 | |
| 1015 | 1015 | /** |
@@ -1026,23 +1026,23 @@ discard block |
||
| 1026 | 1026 | */ |
| 1027 | 1027 | function geodir_addpost_categories_html($request_taxonomy, $parrent, $selected = false, $main_selected = true, $default = false, $exclude = '') |
| 1028 | 1028 | {
|
| 1029 | - global $exclude_cats; |
|
| 1029 | + global $exclude_cats; |
|
| 1030 | 1030 | |
| 1031 | - if ($exclude != '') {
|
|
| 1032 | - $exclude_cats = maybe_unserialize(base64_decode($exclude)); |
|
| 1031 | + if ($exclude != '') {
|
|
| 1032 | + $exclude_cats = maybe_unserialize(base64_decode($exclude)); |
|
| 1033 | 1033 | |
| 1034 | - if(is_array( $exclude_cats)){
|
|
| 1035 | - $exclude_cats = array_map( 'intval', $exclude_cats ); |
|
| 1036 | - }else{
|
|
| 1037 | - $exclude_cats = intval($exclude_cats); |
|
| 1038 | - } |
|
| 1034 | + if(is_array( $exclude_cats)){
|
|
| 1035 | + $exclude_cats = array_map( 'intval', $exclude_cats ); |
|
| 1036 | + }else{
|
|
| 1037 | + $exclude_cats = intval($exclude_cats); |
|
| 1038 | + } |
|
| 1039 | 1039 | |
| 1040 | - } |
|
| 1040 | + } |
|
| 1041 | 1041 | |
| 1042 | - if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) || |
|
| 1043 | - (!is_array($exclude_cats) || empty($exclude_cats)) |
|
| 1044 | - ) {
|
|
| 1045 | - ?> |
|
| 1042 | + if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) || |
|
| 1043 | + (!is_array($exclude_cats) || empty($exclude_cats)) |
|
| 1044 | + ) {
|
|
| 1045 | + ?> |
|
| 1046 | 1046 | |
| 1047 | 1047 | <?php $main_cat = get_term($parrent, $request_taxonomy); ?> |
| 1048 | 1048 | |
@@ -1071,8 +1071,8 @@ discard block |
||
| 1071 | 1071 | |
| 1072 | 1072 | <br/> |
| 1073 | 1073 | <?php |
| 1074 | - $cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1075 | - if (!empty($cat_terms)) { ?>
|
|
| 1074 | + $cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1075 | + if (!empty($cat_terms)) { ?>
|
|
| 1076 | 1076 | <span> <?php printf(__('Add listing in category', 'geodirectory')); ?></span>
|
| 1077 | 1077 | <?php geodir_get_catlist($request_taxonomy, $parrent, $selected) ?> |
| 1078 | 1078 | <?php } ?> |
@@ -1094,53 +1094,53 @@ discard block |
||
| 1094 | 1094 | function geodir_editpost_categories_html($request_taxonomy, $request_postid, $post_categories) |
| 1095 | 1095 | {
|
| 1096 | 1096 | |
| 1097 | - if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {
|
|
| 1098 | - $post_cat_str = $post_categories[$request_taxonomy]; |
|
| 1099 | - $post_cat_array = explode("#", $post_cat_str);
|
|
| 1100 | - if (is_array($post_cat_array)) {
|
|
| 1101 | - $post_cat_array = array_unique( $post_cat_array ); |
|
| 1097 | + if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {
|
|
| 1098 | + $post_cat_str = $post_categories[$request_taxonomy]; |
|
| 1099 | + $post_cat_array = explode("#", $post_cat_str);
|
|
| 1100 | + if (is_array($post_cat_array)) {
|
|
| 1101 | + $post_cat_array = array_unique( $post_cat_array ); |
|
| 1102 | 1102 | |
| 1103 | 1103 | foreach ($post_cat_array as $post_cat_html) {
|
| 1104 | 1104 | |
| 1105 | - $post_cat_info = explode(":", $post_cat_html);
|
|
| 1106 | - $post_maincat_str = $post_cat_info[0]; |
|
| 1105 | + $post_cat_info = explode(":", $post_cat_html);
|
|
| 1106 | + $post_maincat_str = $post_cat_info[0]; |
|
| 1107 | 1107 | |
| 1108 | - if (!empty($post_maincat_str)) {
|
|
| 1109 | - $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1110 | - $post_maincat_id = $post_maincat_info[0]; |
|
| 1111 | - ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1112 | - (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1113 | - } |
|
| 1114 | - $post_sub_catid = ''; |
|
| 1115 | - if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1116 | - $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1117 | - } |
|
| 1108 | + if (!empty($post_maincat_str)) {
|
|
| 1109 | + $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1110 | + $post_maincat_id = $post_maincat_info[0]; |
|
| 1111 | + ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1112 | + (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1113 | + } |
|
| 1114 | + $post_sub_catid = ''; |
|
| 1115 | + if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1116 | + $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1117 | + } |
|
| 1118 | 1118 | |
| 1119 | - geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1119 | + geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1120 | 1120 | |
| 1121 | - } |
|
| 1122 | - } else {
|
|
| 1121 | + } |
|
| 1122 | + } else {
|
|
| 1123 | 1123 | |
| 1124 | - $post_cat_info = explode(":", $post_cat_str);
|
|
| 1125 | - $post_maincat_str = $post_cat_info[0]; |
|
| 1124 | + $post_cat_info = explode(":", $post_cat_str);
|
|
| 1125 | + $post_maincat_str = $post_cat_info[0]; |
|
| 1126 | 1126 | |
| 1127 | - $post_sub_catid = ''; |
|
| 1127 | + $post_sub_catid = ''; |
|
| 1128 | 1128 | |
| 1129 | - if (!empty($post_maincat_str)) {
|
|
| 1130 | - $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1131 | - $post_maincat_id = $post_maincat_info[0]; |
|
| 1132 | - ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1133 | - (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1134 | - } |
|
| 1129 | + if (!empty($post_maincat_str)) {
|
|
| 1130 | + $post_maincat_info = explode(",", $post_maincat_str);
|
|
| 1131 | + $post_maincat_id = $post_maincat_info[0]; |
|
| 1132 | + ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false; |
|
| 1133 | + (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false; |
|
| 1134 | + } |
|
| 1135 | 1135 | |
| 1136 | - if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1137 | - $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1138 | - } |
|
| 1136 | + if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
|
| 1137 | + $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1138 | + } |
|
| 1139 | 1139 | |
| 1140 | - geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1140 | + geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
|
| 1141 | 1141 | |
| 1142 | - } |
|
| 1143 | - } |
|
| 1142 | + } |
|
| 1143 | + } |
|
| 1144 | 1144 | } |
| 1145 | 1145 | |
| 1146 | 1146 | /** |
@@ -1154,35 +1154,35 @@ discard block |
||
| 1154 | 1154 | */ |
| 1155 | 1155 | function geodir_get_catlist($cat_taxonomy, $parrent = 0, $selected = false) |
| 1156 | 1156 | {
|
| 1157 | - global $exclude_cats; |
|
| 1157 | + global $exclude_cats; |
|
| 1158 | 1158 | |
| 1159 | - $cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1159 | + $cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));
|
|
| 1160 | 1160 | |
| 1161 | - if (!empty($cat_terms)) {
|
|
| 1162 | - $onchange = ''; |
|
| 1163 | - $onchange = ' onchange="show_subcatlist(this.value, this)" '; |
|
| 1161 | + if (!empty($cat_terms)) {
|
|
| 1162 | + $onchange = ''; |
|
| 1163 | + $onchange = ' onchange="show_subcatlist(this.value, this)" '; |
|
| 1164 | 1164 | |
| 1165 | - $option_selected = ''; |
|
| 1166 | - if (!$selected) |
|
| 1167 | - $option_slected = ' selected="selected" '; |
|
| 1165 | + $option_selected = ''; |
|
| 1166 | + if (!$selected) |
|
| 1167 | + $option_slected = ' selected="selected" '; |
|
| 1168 | 1168 | |
| 1169 | - echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >'; |
|
| 1169 | + echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >'; |
|
| 1170 | 1170 | |
| 1171 | - echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';
|
|
| 1171 | + echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';
|
|
| 1172 | 1172 | |
| 1173 | - foreach ($cat_terms as $cat_term) {
|
|
| 1174 | - $option_selected = ''; |
|
| 1175 | - if ($selected == $cat_term->term_id) |
|
| 1176 | - $option_selected = ' selected="selected" '; |
|
| 1173 | + foreach ($cat_terms as $cat_term) {
|
|
| 1174 | + $option_selected = ''; |
|
| 1175 | + if ($selected == $cat_term->term_id) |
|
| 1176 | + $option_selected = ' selected="selected" '; |
|
| 1177 | 1177 | |
| 1178 | - // Count child terms |
|
| 1179 | - $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) ); |
|
| 1180 | - $has_child = !empty( $child_terms ) ? 't' : 'f'; |
|
| 1178 | + // Count child terms |
|
| 1179 | + $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) ); |
|
| 1180 | + $has_child = !empty( $child_terms ) ? 't' : 'f'; |
|
| 1181 | 1181 | |
| 1182 | - echo '<option ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . ucfirst($cat_term->name) . '</option>'; |
|
| 1183 | - } |
|
| 1184 | - echo '</select>'; |
|
| 1185 | - } |
|
| 1182 | + echo '<option ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . ucfirst($cat_term->name) . '</option>'; |
|
| 1183 | + } |
|
| 1184 | + echo '</select>'; |
|
| 1185 | + } |
|
| 1186 | 1186 | } |
| 1187 | 1187 | |
| 1188 | 1188 | /** |
@@ -1198,28 +1198,28 @@ discard block |
||
| 1198 | 1198 | */ |
| 1199 | 1199 | function geodir_custom_update_messages($messages) |
| 1200 | 1200 | {
|
| 1201 | - global $post, $post_ID; |
|
| 1202 | - |
|
| 1203 | - $post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');
|
|
| 1204 | - |
|
| 1205 | - foreach ($post_types as $post_type => $post_object) {
|
|
| 1206 | - |
|
| 1207 | - $messages[$post_type] = array( |
|
| 1208 | - 0 => '', // Unused. Messages start at index 1. |
|
| 1209 | - 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),
|
|
| 1210 | - 2 => __('Custom field updated.', 'geodirectory'),
|
|
| 1211 | - 3 => __('Custom field deleted.', 'geodirectory'),
|
|
| 1212 | - 4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1213 | - 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,
|
|
| 1214 | - 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),
|
|
| 1215 | - 7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1216 | - 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),
|
|
| 1217 | - 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),
|
|
| 1218 | - 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),
|
|
| 1219 | - ); |
|
| 1220 | - } |
|
| 1221 | - |
|
| 1222 | - return $messages; |
|
| 1201 | + global $post, $post_ID; |
|
| 1202 | + |
|
| 1203 | + $post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');
|
|
| 1204 | + |
|
| 1205 | + foreach ($post_types as $post_type => $post_object) {
|
|
| 1206 | + |
|
| 1207 | + $messages[$post_type] = array( |
|
| 1208 | + 0 => '', // Unused. Messages start at index 1. |
|
| 1209 | + 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),
|
|
| 1210 | + 2 => __('Custom field updated.', 'geodirectory'),
|
|
| 1211 | + 3 => __('Custom field deleted.', 'geodirectory'),
|
|
| 1212 | + 4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1213 | + 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,
|
|
| 1214 | + 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),
|
|
| 1215 | + 7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),
|
|
| 1216 | + 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),
|
|
| 1217 | + 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),
|
|
| 1218 | + 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),
|
|
| 1219 | + ); |
|
| 1220 | + } |
|
| 1221 | + |
|
| 1222 | + return $messages; |
|
| 1223 | 1223 | } |
| 1224 | 1224 | |
| 1225 | 1225 | |
@@ -1234,183 +1234,183 @@ discard block |
||
| 1234 | 1234 | function geodir_register_defaults() |
| 1235 | 1235 | {
|
| 1236 | 1236 | |
| 1237 | - global $wpdb; |
|
| 1238 | - |
|
| 1239 | - $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico'; |
|
| 1240 | - |
|
| 1241 | - if (!$listing_slug = get_option('geodir_listing_prefix'))
|
|
| 1242 | - $listing_slug = 'places'; |
|
| 1243 | - |
|
| 1244 | - /** |
|
| 1245 | - * Taxonomies |
|
| 1246 | - **/ |
|
| 1247 | - //if ( ! taxonomy_exists('gd_place_tags') )
|
|
| 1248 | - {
|
|
| 1249 | - |
|
| 1250 | - $gd_placetags = array(); |
|
| 1251 | - $gd_placetags['object_type'] = 'gd_place'; |
|
| 1252 | - $gd_placetags['listing_slug'] = $listing_slug . '/tags'; |
|
| 1253 | - $gd_placetags['args'] = array( |
|
| 1254 | - 'public' => true, |
|
| 1255 | - 'hierarchical' => false, |
|
| 1256 | - 'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),
|
|
| 1257 | - 'query_var' => true, |
|
| 1258 | - |
|
| 1259 | - 'labels' => array( |
|
| 1260 | - 'name' => __('Place Tags', 'geodirectory'),
|
|
| 1261 | - 'singular_name' => __('Place Tag', 'geodirectory'),
|
|
| 1262 | - 'search_items' => __('Search Place Tags', 'geodirectory'),
|
|
| 1263 | - 'popular_items' => __('Popular Place Tags', 'geodirectory'),
|
|
| 1264 | - 'all_items' => __('All Place Tags', 'geodirectory'),
|
|
| 1265 | - 'edit_item' => __('Edit Place Tag', 'geodirectory'),
|
|
| 1266 | - 'update_item' => __('Update Place Tag', 'geodirectory'),
|
|
| 1267 | - 'add_new_item' => __('Add New Place Tag', 'geodirectory'),
|
|
| 1268 | - 'new_item_name' => __('New Place Tag Name', 'geodirectory'),
|
|
| 1269 | - 'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),
|
|
| 1270 | - 'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),
|
|
| 1271 | - 'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),
|
|
| 1272 | - ), |
|
| 1273 | - ); |
|
| 1274 | - |
|
| 1275 | - |
|
| 1276 | - $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1277 | - $geodir_taxonomies['gd_place_tags'] = $gd_placetags; |
|
| 1278 | - update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1279 | - |
|
| 1280 | - |
|
| 1281 | - // Update post types and delete tmp options |
|
| 1282 | - flush_rewrite_rules(); |
|
| 1283 | - |
|
| 1284 | - } |
|
| 1285 | - |
|
| 1286 | - //if ( ! taxonomy_exists('gd_placecategory') )
|
|
| 1287 | - {
|
|
| 1288 | - |
|
| 1289 | - $gd_placecategory = array(); |
|
| 1290 | - $gd_placecategory['object_type'] = 'gd_place'; |
|
| 1291 | - $gd_placecategory['listing_slug'] = $listing_slug; |
|
| 1292 | - $gd_placecategory['args'] = array( |
|
| 1293 | - 'public' => true, |
|
| 1294 | - 'hierarchical' => true, |
|
| 1295 | - 'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),
|
|
| 1296 | - 'query_var' => true, |
|
| 1297 | - 'labels' => array( |
|
| 1298 | - 'name' => __('Place Categories', 'geodirectory'),
|
|
| 1299 | - 'singular_name' => __('Place Category', 'geodirectory'),
|
|
| 1300 | - 'search_items' => __('Search Place Categories', 'geodirectory'),
|
|
| 1301 | - 'popular_items' => __('Popular Place Categories', 'geodirectory'),
|
|
| 1302 | - 'all_items' => __('All Place Categories', 'geodirectory'),
|
|
| 1303 | - 'edit_item' => __('Edit Place Category', 'geodirectory'),
|
|
| 1304 | - 'update_item' => __('Update Place Category', 'geodirectory'),
|
|
| 1305 | - 'add_new_item' => __('Add New Place Category', 'geodirectory'),
|
|
| 1306 | - 'new_item_name' => __('New Place Category', 'geodirectory'),
|
|
| 1307 | - 'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),
|
|
| 1308 | - ), |
|
| 1309 | - ); |
|
| 1310 | - |
|
| 1311 | - |
|
| 1312 | - $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1313 | - $geodir_taxonomies['gd_placecategory'] = $gd_placecategory; |
|
| 1314 | - update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1315 | - |
|
| 1316 | - |
|
| 1317 | - flush_rewrite_rules(); |
|
| 1318 | - } |
|
| 1319 | - |
|
| 1320 | - /** |
|
| 1321 | - * Post Types |
|
| 1322 | - **/ |
|
| 1323 | - |
|
| 1324 | - //if ( ! post_type_exists('gd_place') )
|
|
| 1325 | - {
|
|
| 1326 | - |
|
| 1327 | - $labels = array( |
|
| 1328 | - 'name' => __('Places', 'geodirectory'),
|
|
| 1329 | - 'singular_name' => __('Place', 'geodirectory'),
|
|
| 1330 | - 'add_new' => __('Add New', 'geodirectory'),
|
|
| 1331 | - 'add_new_item' => __('Add New Place', 'geodirectory'),
|
|
| 1332 | - 'edit_item' => __('Edit Place', 'geodirectory'),
|
|
| 1333 | - 'new_item' => __('New Place', 'geodirectory'),
|
|
| 1334 | - 'view_item' => __('View Place', 'geodirectory'),
|
|
| 1335 | - 'search_items' => __('Search Places', 'geodirectory'),
|
|
| 1336 | - 'not_found' => __('No Place Found', 'geodirectory'),
|
|
| 1337 | - 'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));
|
|
| 1338 | - |
|
| 1339 | - $place_default = array( |
|
| 1340 | - 'labels' => $labels, |
|
| 1341 | - 'can_export' => true, |
|
| 1342 | - 'capability_type' => 'post', |
|
| 1343 | - 'description' => 'Place post type.', |
|
| 1344 | - 'has_archive' => $listing_slug, |
|
| 1345 | - 'hierarchical' => false, |
|
| 1346 | - 'map_meta_cap' => true, |
|
| 1347 | - 'menu_icon' => $menu_icon, |
|
| 1348 | - 'public' => true, |
|
| 1349 | - 'query_var' => true, |
|
| 1350 | - 'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
|
|
| 1351 | - 'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),
|
|
| 1352 | - 'taxonomies' => array('gd_placecategory', 'gd_place_tags'));
|
|
| 1353 | - |
|
| 1354 | - //Update custom post types |
|
| 1355 | - $geodir_post_types = get_option('geodir_post_types');
|
|
| 1356 | - $geodir_post_types['gd_place'] = $place_default; |
|
| 1357 | - update_option('geodir_post_types', $geodir_post_types);
|
|
| 1358 | - |
|
| 1359 | - // Update post types and delete tmp options |
|
| 1360 | - flush_rewrite_rules(); |
|
| 1361 | - } |
|
| 1362 | - |
|
| 1363 | - |
|
| 1364 | - geodir_register_taxonomies(); |
|
| 1365 | - geodir_register_post_types(); |
|
| 1366 | - |
|
| 1367 | - //die; |
|
| 1237 | + global $wpdb; |
|
| 1238 | + |
|
| 1239 | + $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico'; |
|
| 1240 | + |
|
| 1241 | + if (!$listing_slug = get_option('geodir_listing_prefix'))
|
|
| 1242 | + $listing_slug = 'places'; |
|
| 1243 | + |
|
| 1244 | + /** |
|
| 1245 | + * Taxonomies |
|
| 1246 | + **/ |
|
| 1247 | + //if ( ! taxonomy_exists('gd_place_tags') )
|
|
| 1248 | + {
|
|
| 1249 | + |
|
| 1250 | + $gd_placetags = array(); |
|
| 1251 | + $gd_placetags['object_type'] = 'gd_place'; |
|
| 1252 | + $gd_placetags['listing_slug'] = $listing_slug . '/tags'; |
|
| 1253 | + $gd_placetags['args'] = array( |
|
| 1254 | + 'public' => true, |
|
| 1255 | + 'hierarchical' => false, |
|
| 1256 | + 'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),
|
|
| 1257 | + 'query_var' => true, |
|
| 1258 | + |
|
| 1259 | + 'labels' => array( |
|
| 1260 | + 'name' => __('Place Tags', 'geodirectory'),
|
|
| 1261 | + 'singular_name' => __('Place Tag', 'geodirectory'),
|
|
| 1262 | + 'search_items' => __('Search Place Tags', 'geodirectory'),
|
|
| 1263 | + 'popular_items' => __('Popular Place Tags', 'geodirectory'),
|
|
| 1264 | + 'all_items' => __('All Place Tags', 'geodirectory'),
|
|
| 1265 | + 'edit_item' => __('Edit Place Tag', 'geodirectory'),
|
|
| 1266 | + 'update_item' => __('Update Place Tag', 'geodirectory'),
|
|
| 1267 | + 'add_new_item' => __('Add New Place Tag', 'geodirectory'),
|
|
| 1268 | + 'new_item_name' => __('New Place Tag Name', 'geodirectory'),
|
|
| 1269 | + 'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),
|
|
| 1270 | + 'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),
|
|
| 1271 | + 'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),
|
|
| 1272 | + ), |
|
| 1273 | + ); |
|
| 1274 | + |
|
| 1275 | + |
|
| 1276 | + $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1277 | + $geodir_taxonomies['gd_place_tags'] = $gd_placetags; |
|
| 1278 | + update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1279 | + |
|
| 1280 | + |
|
| 1281 | + // Update post types and delete tmp options |
|
| 1282 | + flush_rewrite_rules(); |
|
| 1283 | + |
|
| 1284 | + } |
|
| 1285 | + |
|
| 1286 | + //if ( ! taxonomy_exists('gd_placecategory') )
|
|
| 1287 | + {
|
|
| 1288 | + |
|
| 1289 | + $gd_placecategory = array(); |
|
| 1290 | + $gd_placecategory['object_type'] = 'gd_place'; |
|
| 1291 | + $gd_placecategory['listing_slug'] = $listing_slug; |
|
| 1292 | + $gd_placecategory['args'] = array( |
|
| 1293 | + 'public' => true, |
|
| 1294 | + 'hierarchical' => true, |
|
| 1295 | + 'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),
|
|
| 1296 | + 'query_var' => true, |
|
| 1297 | + 'labels' => array( |
|
| 1298 | + 'name' => __('Place Categories', 'geodirectory'),
|
|
| 1299 | + 'singular_name' => __('Place Category', 'geodirectory'),
|
|
| 1300 | + 'search_items' => __('Search Place Categories', 'geodirectory'),
|
|
| 1301 | + 'popular_items' => __('Popular Place Categories', 'geodirectory'),
|
|
| 1302 | + 'all_items' => __('All Place Categories', 'geodirectory'),
|
|
| 1303 | + 'edit_item' => __('Edit Place Category', 'geodirectory'),
|
|
| 1304 | + 'update_item' => __('Update Place Category', 'geodirectory'),
|
|
| 1305 | + 'add_new_item' => __('Add New Place Category', 'geodirectory'),
|
|
| 1306 | + 'new_item_name' => __('New Place Category', 'geodirectory'),
|
|
| 1307 | + 'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),
|
|
| 1308 | + ), |
|
| 1309 | + ); |
|
| 1310 | + |
|
| 1311 | + |
|
| 1312 | + $geodir_taxonomies = get_option('geodir_taxonomies');
|
|
| 1313 | + $geodir_taxonomies['gd_placecategory'] = $gd_placecategory; |
|
| 1314 | + update_option('geodir_taxonomies', $geodir_taxonomies);
|
|
| 1315 | + |
|
| 1316 | + |
|
| 1317 | + flush_rewrite_rules(); |
|
| 1318 | + } |
|
| 1319 | + |
|
| 1320 | + /** |
|
| 1321 | + * Post Types |
|
| 1322 | + **/ |
|
| 1323 | + |
|
| 1324 | + //if ( ! post_type_exists('gd_place') )
|
|
| 1325 | + {
|
|
| 1326 | + |
|
| 1327 | + $labels = array( |
|
| 1328 | + 'name' => __('Places', 'geodirectory'),
|
|
| 1329 | + 'singular_name' => __('Place', 'geodirectory'),
|
|
| 1330 | + 'add_new' => __('Add New', 'geodirectory'),
|
|
| 1331 | + 'add_new_item' => __('Add New Place', 'geodirectory'),
|
|
| 1332 | + 'edit_item' => __('Edit Place', 'geodirectory'),
|
|
| 1333 | + 'new_item' => __('New Place', 'geodirectory'),
|
|
| 1334 | + 'view_item' => __('View Place', 'geodirectory'),
|
|
| 1335 | + 'search_items' => __('Search Places', 'geodirectory'),
|
|
| 1336 | + 'not_found' => __('No Place Found', 'geodirectory'),
|
|
| 1337 | + 'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));
|
|
| 1338 | + |
|
| 1339 | + $place_default = array( |
|
| 1340 | + 'labels' => $labels, |
|
| 1341 | + 'can_export' => true, |
|
| 1342 | + 'capability_type' => 'post', |
|
| 1343 | + 'description' => 'Place post type.', |
|
| 1344 | + 'has_archive' => $listing_slug, |
|
| 1345 | + 'hierarchical' => false, |
|
| 1346 | + 'map_meta_cap' => true, |
|
| 1347 | + 'menu_icon' => $menu_icon, |
|
| 1348 | + 'public' => true, |
|
| 1349 | + 'query_var' => true, |
|
| 1350 | + 'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
|
|
| 1351 | + 'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),
|
|
| 1352 | + 'taxonomies' => array('gd_placecategory', 'gd_place_tags'));
|
|
| 1353 | + |
|
| 1354 | + //Update custom post types |
|
| 1355 | + $geodir_post_types = get_option('geodir_post_types');
|
|
| 1356 | + $geodir_post_types['gd_place'] = $place_default; |
|
| 1357 | + update_option('geodir_post_types', $geodir_post_types);
|
|
| 1358 | + |
|
| 1359 | + // Update post types and delete tmp options |
|
| 1360 | + flush_rewrite_rules(); |
|
| 1361 | + } |
|
| 1362 | + |
|
| 1363 | + |
|
| 1364 | + geodir_register_taxonomies(); |
|
| 1365 | + geodir_register_post_types(); |
|
| 1366 | + |
|
| 1367 | + //die; |
|
| 1368 | 1368 | |
| 1369 | 1369 | } |
| 1370 | 1370 | |
| 1371 | 1371 | $gd_wpml_get_languages = ""; |
| 1372 | 1372 | function gd_wpml_get_lang_from_url($url){
|
| 1373 | 1373 | |
| 1374 | - global $gd_wpml_get_languages; |
|
| 1375 | - if(isset($_REQUEST['lang']) && $_REQUEST['lang']){return $_REQUEST['lang'];}
|
|
| 1374 | + global $gd_wpml_get_languages; |
|
| 1375 | + if(isset($_REQUEST['lang']) && $_REQUEST['lang']){return $_REQUEST['lang'];}
|
|
| 1376 | 1376 | |
| 1377 | 1377 | |
| 1378 | - // |
|
| 1379 | - $url = str_replace(array("http://","https://"),"",$url);
|
|
| 1378 | + // |
|
| 1379 | + $url = str_replace(array("http://","https://"),"",$url);
|
|
| 1380 | 1380 | |
| 1381 | - // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.
|
|
| 1382 | - $site_url = str_replace(array("http://","https://"),"",site_url());
|
|
| 1381 | + // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.
|
|
| 1382 | + $site_url = str_replace(array("http://","https://"),"",site_url());
|
|
| 1383 | 1383 | |
| 1384 | - $url = str_replace($site_url,"",$url); |
|
| 1384 | + $url = str_replace($site_url,"",$url); |
|
| 1385 | 1385 | |
| 1386 | 1386 | |
| 1387 | - $segments = explode('/', trim($url, '/'));
|
|
| 1387 | + $segments = explode('/', trim($url, '/'));
|
|
| 1388 | 1388 | |
| 1389 | - //print_r( $segments); |
|
| 1390 | - if($gd_wpml_get_languages){
|
|
| 1391 | - $langs = $gd_wpml_get_languages; |
|
| 1392 | - }else{
|
|
| 1393 | - global $sitepress; |
|
| 1394 | - $gd_wpml_get_languages = $sitepress->get_active_languages(); |
|
| 1395 | - } |
|
| 1389 | + //print_r( $segments); |
|
| 1390 | + if($gd_wpml_get_languages){
|
|
| 1391 | + $langs = $gd_wpml_get_languages; |
|
| 1392 | + }else{
|
|
| 1393 | + global $sitepress; |
|
| 1394 | + $gd_wpml_get_languages = $sitepress->get_active_languages(); |
|
| 1395 | + } |
|
| 1396 | 1396 | |
| 1397 | - if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {
|
|
| 1398 | - return $segments[0]; |
|
| 1399 | - } |
|
| 1397 | + if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {
|
|
| 1398 | + return $segments[0]; |
|
| 1399 | + } |
|
| 1400 | 1400 | |
| 1401 | - return false; |
|
| 1401 | + return false; |
|
| 1402 | 1402 | |
| 1403 | 1403 | |
| 1404 | 1404 | } |
| 1405 | 1405 | |
| 1406 | 1406 | function gd_wpml_slug_translation_turned_on($post_type) {
|
| 1407 | 1407 | |
| 1408 | - global $sitepress; |
|
| 1409 | - $settings = $sitepress->get_settings(); |
|
| 1410 | - return isset($settings['posts_slug_translation']['types'][$post_type]) |
|
| 1411 | - && $settings['posts_slug_translation']['types'][$post_type] |
|
| 1412 | - && isset($settings['posts_slug_translation']['on']) |
|
| 1413 | - && $settings['posts_slug_translation']['on']; |
|
| 1408 | + global $sitepress; |
|
| 1409 | + $settings = $sitepress->get_settings(); |
|
| 1410 | + return isset($settings['posts_slug_translation']['types'][$post_type]) |
|
| 1411 | + && $settings['posts_slug_translation']['types'][$post_type] |
|
| 1412 | + && isset($settings['posts_slug_translation']['on']) |
|
| 1413 | + && $settings['posts_slug_translation']['on']; |
|
| 1414 | 1414 | } |
| 1415 | 1415 | |
| 1416 | 1416 | |
@@ -1435,150 +1435,150 @@ discard block |
||
| 1435 | 1435 | */ |
| 1436 | 1436 | function geodir_listing_permalink_structure($post_link, $post_obj, $leavename, $sample) |
| 1437 | 1437 | {
|
| 1438 | - //echo $post_link."<br />".$sample ; |
|
| 1438 | + //echo $post_link."<br />".$sample ; |
|
| 1439 | 1439 | |
| 1440 | 1440 | |
| 1441 | - global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache; |
|
| 1442 | - if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {
|
|
| 1443 | - } elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {
|
|
| 1444 | - return $post_link; |
|
| 1445 | - } else {
|
|
| 1446 | - $orig_post = $post; |
|
| 1447 | - $post = $post_obj; |
|
| 1448 | - } |
|
| 1441 | + global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache; |
|
| 1442 | + if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {
|
|
| 1443 | + } elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {
|
|
| 1444 | + return $post_link; |
|
| 1445 | + } else {
|
|
| 1446 | + $orig_post = $post; |
|
| 1447 | + $post = $post_obj; |
|
| 1448 | + } |
|
| 1449 | 1449 | |
| 1450 | - if (in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 1450 | + if (in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 1451 | 1451 | |
| 1452 | 1452 | |
| 1453 | - $post_types = get_option('geodir_post_types');
|
|
| 1454 | - $slug = $post_types[$post->post_type]['rewrite']['slug']; |
|
| 1453 | + $post_types = get_option('geodir_post_types');
|
|
| 1454 | + $slug = $post_types[$post->post_type]['rewrite']['slug']; |
|
| 1455 | 1455 | |
| 1456 | - // Alter the CPT slug if WPML is set to do so |
|
| 1457 | - if(function_exists('icl_object_id')){
|
|
| 1458 | - if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
|
|
| 1456 | + // Alter the CPT slug if WPML is set to do so |
|
| 1457 | + if(function_exists('icl_object_id')){
|
|
| 1458 | + if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
|
|
| 1459 | 1459 | |
| 1460 | - $org_slug = $slug; |
|
| 1461 | - $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1462 | - $slug, |
|
| 1463 | - 'WordPress', |
|
| 1464 | - 'URL slug: ' . $slug, |
|
| 1465 | - $language_code); |
|
| 1460 | + $org_slug = $slug; |
|
| 1461 | + $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1462 | + $slug, |
|
| 1463 | + 'WordPress', |
|
| 1464 | + 'URL slug: ' . $slug, |
|
| 1465 | + $language_code); |
|
| 1466 | 1466 | |
| 1467 | - if(!$slug){$slug = $org_slug;}
|
|
| 1467 | + if(!$slug){$slug = $org_slug;}
|
|
| 1468 | 1468 | |
| 1469 | - } |
|
| 1470 | - } |
|
| 1469 | + } |
|
| 1470 | + } |
|
| 1471 | 1471 | |
| 1472 | - if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1473 | - remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 1474 | - } |
|
| 1472 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1473 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 1474 | + } |
|
| 1475 | 1475 | |
| 1476 | - // Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz. |
|
| 1477 | - $site_url = trailingslashit(get_bloginfo('url'));
|
|
| 1476 | + // Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz. |
|
| 1477 | + $site_url = trailingslashit(get_bloginfo('url'));
|
|
| 1478 | 1478 | |
| 1479 | - if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1480 | - add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 1481 | - } |
|
| 1482 | - |
|
| 1483 | - $fix_url = strpos($post_link, $site_url) === 0 ? true : false; |
|
| 1484 | - if ($fix_url) {
|
|
| 1485 | - $post_link = str_replace($site_url, '', $post_link); |
|
| 1486 | - } |
|
| 1487 | - |
|
| 1488 | - $post_link = trailingslashit( |
|
| 1489 | - preg_replace( "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 ) |
|
| 1490 | - ); |
|
| 1491 | - |
|
| 1492 | - if ($fix_url) {
|
|
| 1493 | - $post_link = $site_url . $post_link; |
|
| 1494 | - } |
|
| 1495 | - |
|
| 1496 | - if (isset($comment_post_cache[$post->ID])) {
|
|
| 1497 | - $post = $comment_post_cache[$post->ID]; |
|
| 1498 | - } |
|
| 1499 | - if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {
|
|
| 1500 | - $post_id = $post->ID; |
|
| 1501 | - if (isset($orig_post)) {
|
|
| 1502 | - $post = $orig_post; |
|
| 1503 | - } |
|
| 1504 | - return $gd_permalink_cache[$post_id]; |
|
| 1505 | - } |
|
| 1479 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 1480 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 1481 | + } |
|
| 1506 | 1482 | |
| 1507 | - if (!isset($post->post_locations)) {
|
|
| 1508 | - $post_type = $post->post_type; |
|
| 1509 | - $ID = $post->ID; |
|
| 1510 | - $post2 = $wpdb->get_row( |
|
| 1511 | - $wpdb->prepare( |
|
| 1512 | - "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1513 | - array($post->ID) |
|
| 1514 | - ) |
|
| 1515 | - ); |
|
| 1483 | + $fix_url = strpos($post_link, $site_url) === 0 ? true : false; |
|
| 1484 | + if ($fix_url) {
|
|
| 1485 | + $post_link = str_replace($site_url, '', $post_link); |
|
| 1486 | + } |
|
| 1487 | + |
|
| 1488 | + $post_link = trailingslashit( |
|
| 1489 | + preg_replace( "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 ) |
|
| 1490 | + ); |
|
| 1491 | + |
|
| 1492 | + if ($fix_url) {
|
|
| 1493 | + $post_link = $site_url . $post_link; |
|
| 1494 | + } |
|
| 1516 | 1495 | |
| 1517 | - $post = (object)array_merge((array)$post, (array)$post2); |
|
| 1496 | + if (isset($comment_post_cache[$post->ID])) {
|
|
| 1497 | + $post = $comment_post_cache[$post->ID]; |
|
| 1498 | + } |
|
| 1499 | + if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {
|
|
| 1500 | + $post_id = $post->ID; |
|
| 1501 | + if (isset($orig_post)) {
|
|
| 1502 | + $post = $orig_post; |
|
| 1503 | + } |
|
| 1504 | + return $gd_permalink_cache[$post_id]; |
|
| 1505 | + } |
|
| 1518 | 1506 | |
| 1519 | - $comment_post_cache[$post->ID] = $post; |
|
| 1520 | - } |
|
| 1507 | + if (!isset($post->post_locations)) {
|
|
| 1508 | + $post_type = $post->post_type; |
|
| 1509 | + $ID = $post->ID; |
|
| 1510 | + $post2 = $wpdb->get_row( |
|
| 1511 | + $wpdb->prepare( |
|
| 1512 | + "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1513 | + array($post->ID) |
|
| 1514 | + ) |
|
| 1515 | + ); |
|
| 1521 | 1516 | |
| 1517 | + $post = (object)array_merge((array)$post, (array)$post2); |
|
| 1522 | 1518 | |
| 1519 | + $comment_post_cache[$post->ID] = $post; |
|
| 1520 | + } |
|
| 1523 | 1521 | |
| 1524 | - if (false !== strpos($post_link, '%gd_taxonomy%')) {
|
|
| 1525 | 1522 | |
| 1526 | - if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {
|
|
| 1527 | - $location_request = ''; |
|
| 1528 | 1523 | |
| 1524 | + if (false !== strpos($post_link, '%gd_taxonomy%')) {
|
|
| 1529 | 1525 | |
| 1530 | - if (!empty($post->post_locations)) {
|
|
| 1531 | - $geodir_arr_locations = explode(',', $post->post_locations);
|
|
| 1532 | - if (count($geodir_arr_locations) == 3) {
|
|
| 1533 | - $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1534 | - $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1535 | - $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1536 | - $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1537 | - $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1538 | - $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1526 | + if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {
|
|
| 1527 | + $location_request = ''; |
|
| 1539 | 1528 | |
| 1540 | - $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1541 | - 'region_slug' => $post->region_slug, |
|
| 1542 | - 'city_slug' => $post->city_slug |
|
| 1543 | - ); |
|
| 1544 | 1529 | |
| 1545 | - } else |
|
| 1546 | - $post_location = geodir_get_location(); |
|
| 1530 | + if (!empty($post->post_locations)) {
|
|
| 1531 | + $geodir_arr_locations = explode(',', $post->post_locations);
|
|
| 1532 | + if (count($geodir_arr_locations) == 3) {
|
|
| 1533 | + $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1534 | + $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1535 | + $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1536 | + $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1537 | + $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1538 | + $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1547 | 1539 | |
| 1540 | + $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1541 | + 'region_slug' => $post->region_slug, |
|
| 1542 | + 'city_slug' => $post->city_slug |
|
| 1543 | + ); |
|
| 1548 | 1544 | |
| 1549 | - } else {
|
|
| 1545 | + } else |
|
| 1546 | + $post_location = geodir_get_location(); |
|
| 1550 | 1547 | |
| 1551 | - $post_location_sql = $wpdb->get_results( |
|
| 1552 | - $wpdb->prepare( |
|
| 1553 | - "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1554 | - array($post->ID) |
|
| 1555 | - ) |
|
| 1556 | - ); |
|
| 1557 | - |
|
| 1558 | - if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {
|
|
| 1559 | - |
|
| 1560 | - $geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);
|
|
| 1561 | - if (count($geodir_arr_locations) == 3) {
|
|
| 1562 | - $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1563 | - $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1564 | - $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1565 | - $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1566 | - $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1567 | - $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1568 | - |
|
| 1569 | - $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1570 | - 'region_slug' => $post->region_slug, |
|
| 1571 | - 'city_slug' => $post->city_slug |
|
| 1572 | - ); |
|
| 1573 | 1548 | |
| 1574 | - } |
|
| 1575 | - } else |
|
| 1576 | - $post_location = geodir_get_location(); |
|
| 1577 | - } |
|
| 1549 | + } else {
|
|
| 1550 | + |
|
| 1551 | + $post_location_sql = $wpdb->get_results( |
|
| 1552 | + $wpdb->prepare( |
|
| 1553 | + "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1554 | + array($post->ID) |
|
| 1555 | + ) |
|
| 1556 | + ); |
|
| 1557 | + |
|
| 1558 | + if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {
|
|
| 1559 | + |
|
| 1560 | + $geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);
|
|
| 1561 | + if (count($geodir_arr_locations) == 3) {
|
|
| 1562 | + $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
|
|
| 1563 | + $post->city_slug = str_replace(']', '', $post->city_slug);
|
|
| 1564 | + $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
|
|
| 1565 | + $post->region_slug = str_replace(']', '', $post->region_slug);
|
|
| 1566 | + $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
|
| 1567 | + $post->country_slug = str_replace(']', '', $post->country_slug);
|
|
| 1568 | + |
|
| 1569 | + $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1570 | + 'region_slug' => $post->region_slug, |
|
| 1571 | + 'city_slug' => $post->city_slug |
|
| 1572 | + ); |
|
| 1573 | + |
|
| 1574 | + } |
|
| 1575 | + } else |
|
| 1576 | + $post_location = geodir_get_location(); |
|
| 1577 | + } |
|
| 1578 | 1578 | |
| 1579 | 1579 | |
| 1580 | - if (!empty($post_location)) {
|
|
| 1581 | - $country_slug = isset($post_location->country_slug) ? $post_location->country_slug : ''; |
|
| 1580 | + if (!empty($post_location)) {
|
|
| 1581 | + $country_slug = isset($post_location->country_slug) ? $post_location->country_slug : ''; |
|
| 1582 | 1582 | $region_slug = isset($post_location->region_slug) ? $post_location->region_slug : ''; |
| 1583 | 1583 | $city_slug = isset($post_location->city_slug) ? $post_location->city_slug : ''; |
| 1584 | 1584 | |
@@ -1596,78 +1596,78 @@ discard block |
||
| 1596 | 1596 | $location_slug[] = $city_slug; |
| 1597 | 1597 | |
| 1598 | 1598 | $location_request .= implode('/', $location_slug) . '/';
|
| 1599 | - } |
|
| 1600 | - } |
|
| 1599 | + } |
|
| 1600 | + } |
|
| 1601 | 1601 | |
| 1602 | - if (get_option('geodir_add_categories_url')) {
|
|
| 1602 | + if (get_option('geodir_add_categories_url')) {
|
|
| 1603 | 1603 | |
| 1604 | - $term_request = ''; |
|
| 1605 | - $taxonomies = geodir_get_taxonomies($post->post_type); |
|
| 1604 | + $term_request = ''; |
|
| 1605 | + $taxonomies = geodir_get_taxonomies($post->post_type); |
|
| 1606 | 1606 | |
| 1607 | - $taxonomies = end($taxonomies); |
|
| 1607 | + $taxonomies = end($taxonomies); |
|
| 1608 | 1608 | |
| 1609 | - if (!empty($post->default_category)) {
|
|
| 1610 | - $post_terms = $post->default_category; |
|
| 1611 | - } else {
|
|
| 1612 | - $post_terms = ''; |
|
| 1609 | + if (!empty($post->default_category)) {
|
|
| 1610 | + $post_terms = $post->default_category; |
|
| 1611 | + } else {
|
|
| 1612 | + $post_terms = ''; |
|
| 1613 | 1613 | |
| 1614 | - if (isset($post->{$taxonomies})) {
|
|
| 1615 | - $post_terms = explode(",", trim($post->{$taxonomies}, ","));
|
|
| 1616 | - $post_terms = $post_terms[0]; |
|
| 1617 | - } |
|
| 1614 | + if (isset($post->{$taxonomies})) {
|
|
| 1615 | + $post_terms = explode(",", trim($post->{$taxonomies}, ","));
|
|
| 1616 | + $post_terms = $post_terms[0]; |
|
| 1617 | + } |
|
| 1618 | 1618 | |
| 1619 | - if (!$post_terms) |
|
| 1620 | - $post_terms = geodir_get_post_meta($post->ID, 'default_category', true); |
|
| 1619 | + if (!$post_terms) |
|
| 1620 | + $post_terms = geodir_get_post_meta($post->ID, 'default_category', true); |
|
| 1621 | 1621 | |
| 1622 | - if (!$post_terms) {
|
|
| 1623 | - $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true); |
|
| 1622 | + if (!$post_terms) {
|
|
| 1623 | + $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true); |
|
| 1624 | 1624 | |
| 1625 | - if ($post_terms) {
|
|
| 1626 | - $post_terms = explode(",", trim($post_terms, ","));
|
|
| 1627 | - $post_terms = $post_terms[0]; |
|
| 1628 | - } |
|
| 1629 | - } |
|
| 1630 | - } |
|
| 1625 | + if ($post_terms) {
|
|
| 1626 | + $post_terms = explode(",", trim($post_terms, ","));
|
|
| 1627 | + $post_terms = $post_terms[0]; |
|
| 1628 | + } |
|
| 1629 | + } |
|
| 1630 | + } |
|
| 1631 | 1631 | |
| 1632 | - $term = get_term_by('id', $post_terms, $taxonomies);
|
|
| 1632 | + $term = get_term_by('id', $post_terms, $taxonomies);
|
|
| 1633 | 1633 | |
| 1634 | - if (!empty($term)) |
|
| 1635 | - $term_request = $term->slug; |
|
| 1636 | - //$term_request = $term->slug.'/'; |
|
| 1637 | - } |
|
| 1634 | + if (!empty($term)) |
|
| 1635 | + $term_request = $term->slug; |
|
| 1636 | + //$term_request = $term->slug.'/'; |
|
| 1637 | + } |
|
| 1638 | 1638 | |
| 1639 | - $request_term = ''; |
|
| 1640 | - $listingurl_separator = ''; |
|
| 1641 | - //$detailurl_separator = get_option('geodir_detailurl_separator');
|
|
| 1642 | - $detailurl_separator = ''; |
|
| 1643 | - if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {
|
|
| 1644 | - $request_term = $location_request; |
|
| 1645 | - //$listingurl_separator = get_option('geodir_listingurl_separator');
|
|
| 1646 | - //$request_term .= $listingurl_separator.'/'.$term_request; |
|
| 1647 | - $request_term .= $term_request; |
|
| 1639 | + $request_term = ''; |
|
| 1640 | + $listingurl_separator = ''; |
|
| 1641 | + //$detailurl_separator = get_option('geodir_detailurl_separator');
|
|
| 1642 | + $detailurl_separator = ''; |
|
| 1643 | + if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {
|
|
| 1644 | + $request_term = $location_request; |
|
| 1645 | + //$listingurl_separator = get_option('geodir_listingurl_separator');
|
|
| 1646 | + //$request_term .= $listingurl_separator.'/'.$term_request; |
|
| 1647 | + $request_term .= $term_request; |
|
| 1648 | 1648 | |
| 1649 | - } else {
|
|
| 1650 | - if (isset($location_request) && $location_request != '') $request_term = $location_request; |
|
| 1649 | + } else {
|
|
| 1650 | + if (isset($location_request) && $location_request != '') $request_term = $location_request; |
|
| 1651 | 1651 | |
| 1652 | - if (isset($term_request) && $term_request != '') $request_term .= $term_request; |
|
| 1653 | - } |
|
| 1654 | - $request_term = trim($request_term, '/'); |
|
| 1655 | - if (!empty($request_term)) |
|
| 1656 | - $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1657 | - else |
|
| 1658 | - $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1659 | - //echo $post_link ; |
|
| 1660 | - } |
|
| 1661 | - // temp cache the permalink |
|
| 1662 | - if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {
|
|
| 1663 | - $gd_permalink_cache[$post->ID] = $post_link; |
|
| 1664 | - } |
|
| 1665 | - } |
|
| 1666 | - if (isset($orig_post)) {
|
|
| 1667 | - $post = $orig_post; |
|
| 1668 | - } |
|
| 1669 | - //echo $post_link ; |
|
| 1670 | - return $post_link; |
|
| 1652 | + if (isset($term_request) && $term_request != '') $request_term .= $term_request; |
|
| 1653 | + } |
|
| 1654 | + $request_term = trim($request_term, '/'); |
|
| 1655 | + if (!empty($request_term)) |
|
| 1656 | + $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1657 | + else |
|
| 1658 | + $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1659 | + //echo $post_link ; |
|
| 1660 | + } |
|
| 1661 | + // temp cache the permalink |
|
| 1662 | + if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {
|
|
| 1663 | + $gd_permalink_cache[$post->ID] = $post_link; |
|
| 1664 | + } |
|
| 1665 | + } |
|
| 1666 | + if (isset($orig_post)) {
|
|
| 1667 | + $post = $orig_post; |
|
| 1668 | + } |
|
| 1669 | + //echo $post_link ; |
|
| 1670 | + return $post_link; |
|
| 1671 | 1671 | |
| 1672 | 1672 | } |
| 1673 | 1673 | |
@@ -1684,103 +1684,103 @@ discard block |
||
| 1684 | 1684 | * @return string The term link. |
| 1685 | 1685 | */ |
| 1686 | 1686 | function geodir_term_link($termlink, $term, $taxonomy) {
|
| 1687 | - $geodir_taxonomies = geodir_get_taxonomies('', true);
|
|
| 1687 | + $geodir_taxonomies = geodir_get_taxonomies('', true);
|
|
| 1688 | 1688 | |
| 1689 | - if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {
|
|
| 1690 | - global $geodir_add_location_url, $gd_session; |
|
| 1691 | - $include_location = false; |
|
| 1692 | - $request_term = array(); |
|
| 1689 | + if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {
|
|
| 1690 | + global $geodir_add_location_url, $gd_session; |
|
| 1691 | + $include_location = false; |
|
| 1692 | + $request_term = array(); |
|
| 1693 | 1693 | |
| 1694 | - $listing_slug = geodir_get_listing_slug($taxonomy); |
|
| 1694 | + $listing_slug = geodir_get_listing_slug($taxonomy); |
|
| 1695 | 1695 | |
| 1696 | - if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {
|
|
| 1697 | - if ($geodir_add_location_url && get_option('geodir_add_location_url')) {
|
|
| 1698 | - $include_location = true; |
|
| 1699 | - } |
|
| 1700 | - } elseif (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1)
|
|
| 1701 | - $include_location = true; |
|
| 1696 | + if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {
|
|
| 1697 | + if ($geodir_add_location_url && get_option('geodir_add_location_url')) {
|
|
| 1698 | + $include_location = true; |
|
| 1699 | + } |
|
| 1700 | + } elseif (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1)
|
|
| 1701 | + $include_location = true; |
|
| 1702 | 1702 | |
| 1703 | - if ($include_location) {
|
|
| 1704 | - global $post; |
|
| 1703 | + if ($include_location) {
|
|
| 1704 | + global $post; |
|
| 1705 | 1705 | |
| 1706 | 1706 | $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
| 1707 | 1707 | $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
| 1708 | 1708 | |
| 1709 | 1709 | if(geodir_is_page('detail') && isset($post->country_slug)){
|
| 1710 | - $location_terms = array( |
|
| 1711 | - 'gd_country' => $post->country_slug, |
|
| 1712 | - 'gd_region' => $post->region_slug, |
|
| 1713 | - 'gd_city' => $post->city_slug |
|
| 1714 | - ); |
|
| 1710 | + $location_terms = array( |
|
| 1711 | + 'gd_country' => $post->country_slug, |
|
| 1712 | + 'gd_region' => $post->region_slug, |
|
| 1713 | + 'gd_city' => $post->city_slug |
|
| 1714 | + ); |
|
| 1715 | 1715 | |
| 1716 | 1716 | if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
|
| 1717 | 1717 | $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; |
| 1718 | 1718 | } |
| 1719 | - } else {
|
|
| 1720 | - $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1721 | - } |
|
| 1719 | + } else {
|
|
| 1720 | + $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1721 | + } |
|
| 1722 | 1722 | |
| 1723 | - $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1724 | - $location_terms = geodir_remove_location_terms($location_terms); |
|
| 1723 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1724 | + $location_terms = geodir_remove_location_terms($location_terms); |
|
| 1725 | 1725 | |
| 1726 | - if (!empty($location_terms)) {
|
|
| 1726 | + if (!empty($location_terms)) {
|
|
| 1727 | 1727 | |
| 1728 | - $url_separator = '';//get_option('geodir_listingurl_separator');
|
|
| 1728 | + $url_separator = '';//get_option('geodir_listingurl_separator');
|
|
| 1729 | 1729 | |
| 1730 | - if (get_option('permalink_structure') != '') {
|
|
| 1731 | - $old_listing_slug = '/' . $listing_slug . '/'; |
|
| 1732 | - $request_term = implode("/", $location_terms);
|
|
| 1733 | - $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/'; |
|
| 1730 | + if (get_option('permalink_structure') != '') {
|
|
| 1731 | + $old_listing_slug = '/' . $listing_slug . '/'; |
|
| 1732 | + $request_term = implode("/", $location_terms);
|
|
| 1733 | + $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/'; |
|
| 1734 | 1734 | |
| 1735 | - $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug)); |
|
| 1736 | - } else {
|
|
| 1737 | - $termlink = geodir_getlink($termlink, $request_term); |
|
| 1738 | - } |
|
| 1739 | - } |
|
| 1740 | - } |
|
| 1735 | + $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug)); |
|
| 1736 | + } else {
|
|
| 1737 | + $termlink = geodir_getlink($termlink, $request_term); |
|
| 1738 | + } |
|
| 1739 | + } |
|
| 1740 | + } |
|
| 1741 | 1741 | |
| 1742 | - // Alter the CPT slug is WPML is set to do so |
|
| 1743 | - /* we can replace this with the below function |
|
| 1742 | + // Alter the CPT slug is WPML is set to do so |
|
| 1743 | + /* we can replace this with the below function |
|
| 1744 | 1744 | if(function_exists('icl_object_id')){
|
| 1745 | 1745 | global $sitepress; |
| 1746 | 1746 | $post_type = str_replace("category","",$taxonomy);
|
| 1747 | 1747 | $termlink = $sitepress->post_type_archive_link_filter( $termlink, $post_type); |
| 1748 | 1748 | }*/ |
| 1749 | 1749 | |
| 1750 | - // Alter the CPT slug if WPML is set to do so |
|
| 1751 | - if(function_exists('icl_object_id')){
|
|
| 1752 | - $post_types = get_option('geodir_post_types');
|
|
| 1753 | - $post_type = str_replace("category","",$taxonomy);
|
|
| 1750 | + // Alter the CPT slug if WPML is set to do so |
|
| 1751 | + if(function_exists('icl_object_id')){
|
|
| 1752 | + $post_types = get_option('geodir_post_types');
|
|
| 1753 | + $post_type = str_replace("category","",$taxonomy);
|
|
| 1754 | 1754 | $post_type = str_replace("_tags","",$post_type);
|
| 1755 | - $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1756 | - if ( gd_wpml_slug_translation_turned_on( $post_type )) {
|
|
| 1755 | + $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1756 | + if ( gd_wpml_slug_translation_turned_on( $post_type )) {
|
|
| 1757 | 1757 | |
| 1758 | - global $sitepress; |
|
| 1759 | - $default_lang = $sitepress->get_default_language(); |
|
| 1760 | - $language_code = gd_wpml_get_lang_from_url($termlink); |
|
| 1761 | - if(!$language_code ){$language_code = $default_lang;}
|
|
| 1758 | + global $sitepress; |
|
| 1759 | + $default_lang = $sitepress->get_default_language(); |
|
| 1760 | + $language_code = gd_wpml_get_lang_from_url($termlink); |
|
| 1761 | + if(!$language_code ){$language_code = $default_lang;}
|
|
| 1762 | 1762 | |
| 1763 | - $org_slug = $slug; |
|
| 1764 | - $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1765 | - $slug, |
|
| 1766 | - 'WordPress', |
|
| 1767 | - 'URL slug: ' . $slug, |
|
| 1768 | - $language_code); |
|
| 1763 | + $org_slug = $slug; |
|
| 1764 | + $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1765 | + $slug, |
|
| 1766 | + 'WordPress', |
|
| 1767 | + 'URL slug: ' . $slug, |
|
| 1768 | + $language_code); |
|
| 1769 | 1769 | |
| 1770 | 1770 | |
| 1771 | - if(!$slug){$slug = $org_slug;}
|
|
| 1771 | + if(!$slug){$slug = $org_slug;}
|
|
| 1772 | 1772 | |
| 1773 | - $termlink = trailingslashit( |
|
| 1773 | + $termlink = trailingslashit( |
|
| 1774 | 1774 | |
| 1775 | - preg_replace( "/" . preg_quote( $org_slug, "/" ) . "/", $slug ,$termlink, 1 ) |
|
| 1776 | - ); |
|
| 1775 | + preg_replace( "/" . preg_quote( $org_slug, "/" ) . "/", $slug ,$termlink, 1 ) |
|
| 1776 | + ); |
|
| 1777 | 1777 | |
| 1778 | - } |
|
| 1779 | - } |
|
| 1778 | + } |
|
| 1779 | + } |
|
| 1780 | 1780 | |
| 1781 | - } |
|
| 1781 | + } |
|
| 1782 | 1782 | |
| 1783 | - return $termlink; |
|
| 1783 | + return $termlink; |
|
| 1784 | 1784 | } |
| 1785 | 1785 | |
| 1786 | 1786 | /** |
@@ -1806,14 +1806,14 @@ discard block |
||
| 1806 | 1806 | if (in_array($post_type, geodir_get_posttypes())) {
|
| 1807 | 1807 | if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {
|
| 1808 | 1808 | if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {
|
| 1809 | - $location_terms = array( |
|
| 1810 | - 'gd_country' => $post->country_slug, |
|
| 1811 | - 'gd_region' => $post->region_slug, |
|
| 1812 | - 'gd_city' => $post->city_slug |
|
| 1813 | - ); |
|
| 1814 | - } else {
|
|
| 1815 | - $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1816 | - } |
|
| 1809 | + $location_terms = array( |
|
| 1810 | + 'gd_country' => $post->country_slug, |
|
| 1811 | + 'gd_region' => $post->region_slug, |
|
| 1812 | + 'gd_city' => $post->city_slug |
|
| 1813 | + ); |
|
| 1814 | + } else {
|
|
| 1815 | + $location_terms = geodir_get_current_location_terms('query_vars');
|
|
| 1816 | + } |
|
| 1817 | 1817 | |
| 1818 | 1818 | $location_terms = geodir_remove_location_terms($location_terms); |
| 1819 | 1819 | |
@@ -1844,14 +1844,14 @@ discard block |
||
| 1844 | 1844 | */ |
| 1845 | 1845 | function get_post_type_singular_label($post_type, $echo = false) |
| 1846 | 1846 | {
|
| 1847 | - $obj_post_type = get_post_type_object($post_type); |
|
| 1848 | - if (!is_object($obj_post_type)) {
|
|
| 1849 | - return; |
|
| 1850 | - } |
|
| 1851 | - if ($echo) |
|
| 1852 | - echo $obj_post_type->labels->singular_name; |
|
| 1853 | - else |
|
| 1854 | - return $obj_post_type->labels->singular_name; |
|
| 1847 | + $obj_post_type = get_post_type_object($post_type); |
|
| 1848 | + if (!is_object($obj_post_type)) {
|
|
| 1849 | + return; |
|
| 1850 | + } |
|
| 1851 | + if ($echo) |
|
| 1852 | + echo $obj_post_type->labels->singular_name; |
|
| 1853 | + else |
|
| 1854 | + return $obj_post_type->labels->singular_name; |
|
| 1855 | 1855 | |
| 1856 | 1856 | } |
| 1857 | 1857 | |
@@ -1866,16 +1866,16 @@ discard block |
||
| 1866 | 1866 | */ |
| 1867 | 1867 | function get_post_type_plural_label($post_type, $echo = false) |
| 1868 | 1868 | {
|
| 1869 | - $all_postypes = geodir_get_posttypes(); |
|
| 1869 | + $all_postypes = geodir_get_posttypes(); |
|
| 1870 | 1870 | |
| 1871 | - if (!in_array($post_type, $all_postypes)) |
|
| 1872 | - return false; |
|
| 1871 | + if (!in_array($post_type, $all_postypes)) |
|
| 1872 | + return false; |
|
| 1873 | 1873 | |
| 1874 | - $obj_post_type = get_post_type_object($post_type); |
|
| 1875 | - if ($echo) |
|
| 1876 | - echo $obj_post_type->labels->name; |
|
| 1877 | - else |
|
| 1878 | - return $obj_post_type->labels->name; |
|
| 1874 | + $obj_post_type = get_post_type_object($post_type); |
|
| 1875 | + if ($echo) |
|
| 1876 | + echo $obj_post_type->labels->name; |
|
| 1877 | + else |
|
| 1878 | + return $obj_post_type->labels->name; |
|
| 1879 | 1879 | |
| 1880 | 1880 | } |
| 1881 | 1881 | |
@@ -1894,51 +1894,51 @@ discard block |
||
| 1894 | 1894 | */ |
| 1895 | 1895 | function geodir_term_exists($term, $taxonomy = '', $parent = 0) |
| 1896 | 1896 | {
|
| 1897 | - global $wpdb; |
|
| 1898 | - |
|
| 1899 | - $select = "SELECT term_id FROM $wpdb->terms as t WHERE "; |
|
| 1900 | - $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 "; |
|
| 1901 | - |
|
| 1902 | - if (is_int($term)) {
|
|
| 1903 | - if (0 == $term) |
|
| 1904 | - return 0; |
|
| 1905 | - $where = 't.term_id = %d'; |
|
| 1906 | - if (!empty($taxonomy)) |
|
| 1907 | - return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1908 | - else |
|
| 1909 | - return $wpdb->get_var($wpdb->prepare($select . $where, $term)); |
|
| 1910 | - } |
|
| 1897 | + global $wpdb; |
|
| 1898 | + |
|
| 1899 | + $select = "SELECT term_id FROM $wpdb->terms as t WHERE "; |
|
| 1900 | + $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 "; |
|
| 1901 | + |
|
| 1902 | + if (is_int($term)) {
|
|
| 1903 | + if (0 == $term) |
|
| 1904 | + return 0; |
|
| 1905 | + $where = 't.term_id = %d'; |
|
| 1906 | + if (!empty($taxonomy)) |
|
| 1907 | + return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1908 | + else |
|
| 1909 | + return $wpdb->get_var($wpdb->prepare($select . $where, $term)); |
|
| 1910 | + } |
|
| 1911 | 1911 | |
| 1912 | - $term = trim(wp_unslash($term)); |
|
| 1912 | + $term = trim(wp_unslash($term)); |
|
| 1913 | 1913 | |
| 1914 | - if ('' === $slug = sanitize_title($term))
|
|
| 1915 | - return 0; |
|
| 1914 | + if ('' === $slug = sanitize_title($term))
|
|
| 1915 | + return 0; |
|
| 1916 | 1916 | |
| 1917 | - $where = 't.slug = %s'; |
|
| 1917 | + $where = 't.slug = %s'; |
|
| 1918 | 1918 | |
| 1919 | - $where_fields = array($slug); |
|
| 1920 | - if (!empty($taxonomy)) {
|
|
| 1921 | - $parent = (int)$parent; |
|
| 1922 | - if ($parent > 0) {
|
|
| 1923 | - $where_fields[] = $parent; |
|
| 1924 | - $else_where_fields[] = $parent; |
|
| 1925 | - $where .= ' AND tt.parent = %d'; |
|
| 1919 | + $where_fields = array($slug); |
|
| 1920 | + if (!empty($taxonomy)) {
|
|
| 1921 | + $parent = (int)$parent; |
|
| 1922 | + if ($parent > 0) {
|
|
| 1923 | + $where_fields[] = $parent; |
|
| 1924 | + $else_where_fields[] = $parent; |
|
| 1925 | + $where .= ' AND tt.parent = %d'; |
|
| 1926 | 1926 | |
| 1927 | - } |
|
| 1927 | + } |
|
| 1928 | 1928 | |
| 1929 | - $where_fields[] = $taxonomy; |
|
| 1929 | + $where_fields[] = $taxonomy; |
|
| 1930 | 1930 | |
| 1931 | 1931 | |
| 1932 | - 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))
|
|
| 1933 | - return $result; |
|
| 1932 | + 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))
|
|
| 1933 | + return $result; |
|
| 1934 | 1934 | |
| 1935 | - return false; |
|
| 1936 | - } |
|
| 1935 | + return false; |
|
| 1936 | + } |
|
| 1937 | 1937 | |
| 1938 | - if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))
|
|
| 1939 | - return $result; |
|
| 1938 | + if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))
|
|
| 1939 | + return $result; |
|
| 1940 | 1940 | |
| 1941 | - return false; |
|
| 1941 | + return false; |
|
| 1942 | 1942 | } |
| 1943 | 1943 | |
| 1944 | 1944 | /** |
@@ -1950,7 +1950,7 @@ discard block |
||
| 1950 | 1950 | function geodir_get_term_icon_rebuild() |
| 1951 | 1951 | {
|
| 1952 | 1952 | |
| 1953 | - update_option('gd_term_icons', '');
|
|
| 1953 | + update_option('gd_term_icons', '');
|
|
| 1954 | 1954 | |
| 1955 | 1955 | } |
| 1956 | 1956 | |
@@ -1968,60 +1968,60 @@ discard block |
||
| 1968 | 1968 | */ |
| 1969 | 1969 | function geodir_get_term_icon($term_id = false, $rebuild = false) |
| 1970 | 1970 | {
|
| 1971 | - global $wpdb; |
|
| 1972 | - if (!$rebuild) {
|
|
| 1973 | - $terms_icons = get_option('gd_term_icons');
|
|
| 1974 | - } else {
|
|
| 1975 | - $terms_icons = ''; |
|
| 1976 | - } |
|
| 1977 | - |
|
| 1978 | - if (empty($terms_icons)) {
|
|
| 1979 | - $default_icon_url = get_option('geodir_default_marker_icon');
|
|
| 1980 | - $taxonomy = geodir_get_taxonomies(); |
|
| 1981 | - $post_types = geodir_get_posttypes(); |
|
| 1982 | - $tax_arr = array(); |
|
| 1983 | - foreach ($post_types as $post_type) {
|
|
| 1984 | - $tax_arr[] = "'" . $post_type . "category'"; |
|
| 1985 | - } |
|
| 1986 | - $tax_c = implode(',', $tax_arr);
|
|
| 1987 | - $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");
|
|
| 1988 | - //$terms = get_terms( $taxonomy ); |
|
| 1989 | - |
|
| 1990 | - if($terms) {
|
|
| 1991 | - foreach ($terms as $term) {
|
|
| 1992 | - $post_type = str_replace("category", "", $term->taxonomy);
|
|
| 1993 | - $a_terms[$post_type][] = $term; |
|
| 1971 | + global $wpdb; |
|
| 1972 | + if (!$rebuild) {
|
|
| 1973 | + $terms_icons = get_option('gd_term_icons');
|
|
| 1974 | + } else {
|
|
| 1975 | + $terms_icons = ''; |
|
| 1976 | + } |
|
| 1994 | 1977 | |
| 1995 | - } |
|
| 1996 | - } |
|
| 1978 | + if (empty($terms_icons)) {
|
|
| 1979 | + $default_icon_url = get_option('geodir_default_marker_icon');
|
|
| 1980 | + $taxonomy = geodir_get_taxonomies(); |
|
| 1981 | + $post_types = geodir_get_posttypes(); |
|
| 1982 | + $tax_arr = array(); |
|
| 1983 | + foreach ($post_types as $post_type) {
|
|
| 1984 | + $tax_arr[] = "'" . $post_type . "category'"; |
|
| 1985 | + } |
|
| 1986 | + $tax_c = implode(',', $tax_arr);
|
|
| 1987 | + $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");
|
|
| 1988 | + //$terms = get_terms( $taxonomy ); |
|
| 1997 | 1989 | |
| 1998 | - if($a_terms) {
|
|
| 1999 | - foreach ($a_terms as $pt => $t2) {
|
|
| 1990 | + if($terms) {
|
|
| 1991 | + foreach ($terms as $term) {
|
|
| 1992 | + $post_type = str_replace("category", "", $term->taxonomy);
|
|
| 1993 | + $a_terms[$post_type][] = $term; |
|
| 2000 | 1994 | |
| 2001 | - foreach ($t2 as $term) {
|
|
| 2002 | - $term_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt); |
|
| 2003 | - if ($term_icon) {
|
|
| 2004 | - $term_icon_url = $term_icon["src"]; |
|
| 2005 | - } else {
|
|
| 2006 | - $term_icon_url = $default_icon_url; |
|
| 2007 | - } |
|
| 2008 | - $terms_icons[$term->term_id] = $term_icon_url; |
|
| 2009 | - } |
|
| 2010 | - } |
|
| 2011 | - } |
|
| 1995 | + } |
|
| 1996 | + } |
|
| 1997 | + |
|
| 1998 | + if($a_terms) {
|
|
| 1999 | + foreach ($a_terms as $pt => $t2) {
|
|
| 2000 | + |
|
| 2001 | + foreach ($t2 as $term) {
|
|
| 2002 | + $term_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt); |
|
| 2003 | + if ($term_icon) {
|
|
| 2004 | + $term_icon_url = $term_icon["src"]; |
|
| 2005 | + } else {
|
|
| 2006 | + $term_icon_url = $default_icon_url; |
|
| 2007 | + } |
|
| 2008 | + $terms_icons[$term->term_id] = $term_icon_url; |
|
| 2009 | + } |
|
| 2010 | + } |
|
| 2011 | + } |
|
| 2012 | 2012 | |
| 2013 | - update_option('gd_term_icons', $terms_icons);
|
|
| 2014 | - } |
|
| 2013 | + update_option('gd_term_icons', $terms_icons);
|
|
| 2014 | + } |
|
| 2015 | 2015 | |
| 2016 | - if ($term_id && isset($terms_icons[$term_id])) {
|
|
| 2017 | - return $terms_icons[$term_id]; |
|
| 2018 | - } elseif ($term_id && !isset($terms_icons[$term_id])) {
|
|
| 2019 | - return get_option('geodir_default_marker_icon');
|
|
| 2020 | - } |
|
| 2016 | + if ($term_id && isset($terms_icons[$term_id])) {
|
|
| 2017 | + return $terms_icons[$term_id]; |
|
| 2018 | + } elseif ($term_id && !isset($terms_icons[$term_id])) {
|
|
| 2019 | + return get_option('geodir_default_marker_icon');
|
|
| 2020 | + } |
|
| 2021 | 2021 | |
| 2022 | - if (is_ssl()) {
|
|
| 2023 | - $terms_icons = str_replace("http:","https:",$terms_icons );
|
|
| 2024 | - } |
|
| 2022 | + if (is_ssl()) {
|
|
| 2023 | + $terms_icons = str_replace("http:","https:",$terms_icons );
|
|
| 2024 | + } |
|
| 2025 | 2025 | |
| 2026 | - return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);
|
|
| 2026 | + return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);
|
|
| 2027 | 2027 | } |
| 2028 | 2028 | \ No newline at end of file |
@@ -60,16 +60,16 @@ discard block |
||
| 60 | 60 | * @since 1.0.0 |
| 61 | 61 | * @param string $menu_class The menu HTML class. |
| 62 | 62 | */ |
| 63 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 63 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);
|
|
| 64 | 64 | /** |
| 65 | 65 | * Filter the menu a class. |
| 66 | 66 | * |
| 67 | 67 | * @since 1.0.0 |
| 68 | 68 | */ |
| 69 | 69 | $a_class = apply_filters('geodir_menu_a_class', '');
|
| 70 | - $items .= '<li class="' . $li_class . '"> |
|
| 71 | - <a href="' . get_post_type_archive_link($post_type) . '" class="' . $a_class . '"> |
|
| 72 | - ' . __(ucfirst($args->labels->name)) . ' |
|
| 70 | + $items .= '<li class="'.$li_class.'"> |
|
| 71 | + <a href="' . get_post_type_archive_link($post_type).'" class="'.$a_class.'"> |
|
| 72 | + ' . __(ucfirst($args->labels->name)).' |
|
| 73 | 73 | </a> |
| 74 | 74 | </li>'; |
| 75 | 75 | } |
@@ -88,14 +88,14 @@ discard block |
||
| 88 | 88 | * @since 1.0.0 |
| 89 | 89 | * @param string $menu_class The menu HTML class. |
| 90 | 90 | */ |
| 91 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);
|
|
| 91 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings '.$menu_class);
|
|
| 92 | 92 | /** |
| 93 | 93 | * Filter the sub menu li class. |
| 94 | 94 | * |
| 95 | 95 | * @since 1.0.0 |
| 96 | 96 | * @param string $menu_class The menu HTML class. |
| 97 | 97 | */ |
| 98 | - $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 98 | + $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item '.$menu_class);
|
|
| 99 | 99 | /** |
| 100 | 100 | * Filter the sub menu ul class. |
| 101 | 101 | * |
@@ -114,9 +114,9 @@ discard block |
||
| 114 | 114 | * @since 1.0.0 |
| 115 | 115 | */ |
| 116 | 116 | $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
|
| 117 | - $items .= '<li class="' . $li_class . '"> |
|
| 118 | - <a href="#" class="' . $a_class . '">' . __('Listing', 'geodirectory') . '</a>
|
|
| 119 | - <ul class="' . $sub_ul_class . '">'; |
|
| 117 | + $items .= '<li class="'.$li_class.'"> |
|
| 118 | + <a href="#" class="' . $a_class.'">'.__('Listing', 'geodirectory').'</a>
|
|
| 119 | + <ul class="' . $sub_ul_class.'">'; |
|
| 120 | 120 | $post_types = geodir_get_posttypes('object');
|
| 121 | 121 | |
| 122 | 122 | $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');
|
@@ -133,9 +133,9 @@ discard block |
||
| 133 | 133 | if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
|
| 134 | 134 | $menu_class = 'current-menu-item'; |
| 135 | 135 | |
| 136 | - $items .= '<li class="' . $sub_li_class . '"> |
|
| 137 | - <a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '"> |
|
| 138 | - ' . __(ucfirst($args->labels->name),'geodirectory') . ' |
|
| 136 | + $items .= '<li class="'.$sub_li_class.'"> |
|
| 137 | + <a href="' . get_post_type_archive_link($post_type).'" class="'.$sub_a_class.'"> |
|
| 138 | + ' . __(ucfirst($args->labels->name), 'geodirectory').' |
|
| 139 | 139 | </a> |
| 140 | 140 | </li>'; |
| 141 | 141 | } |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | * |
| 152 | 152 | * @since 1.5.9 |
| 153 | 153 | */ |
| 154 | - $items .= apply_filters('geodir_menu_after_sub_ul','');
|
|
| 154 | + $items .= apply_filters('geodir_menu_after_sub_ul', '');
|
|
| 155 | 155 | $items .= '</li>'; |
| 156 | 156 | } |
| 157 | 157 | } |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | * @since 1.0.0 |
| 185 | 185 | * @param string $menu_class The menu HTML class. |
| 186 | 186 | */ |
| 187 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 187 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);
|
|
| 188 | 188 | /** |
| 189 | 189 | * Filter the menu a class. |
| 190 | 190 | * |
@@ -192,9 +192,9 @@ discard block |
||
| 192 | 192 | */ |
| 193 | 193 | $a_class = apply_filters('geodir_menu_a_class', '');
|
| 194 | 194 | $cpt_name = __($args->labels->singular_name, 'geodirectory'); |
| 195 | - $items .= '<li class="' . $li_class . '"> |
|
| 196 | - <a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $a_class . '"> |
|
| 197 | - ' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '
|
|
| 195 | + $items .= '<li class="'.$li_class.'"> |
|
| 196 | + <a href="' . geodir_get_addlisting_link($post_type).'" class="'.$a_class.'"> |
|
| 197 | + ' . sprintf(__('Add %s', 'geodirectory'), $cpt_name).'
|
|
| 198 | 198 | </a> |
| 199 | 199 | </li>'; |
| 200 | 200 | } |
@@ -218,14 +218,14 @@ discard block |
||
| 218 | 218 | * @since 1.0.0 |
| 219 | 219 | * @param string $menu_class The menu HTML class. |
| 220 | 220 | */ |
| 221 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);
|
|
| 221 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing '.$menu_class);
|
|
| 222 | 222 | /** |
| 223 | 223 | * Filter the sub menu li class. |
| 224 | 224 | * |
| 225 | 225 | * @since 1.0.0 |
| 226 | 226 | * @param string $menu_class The menu HTML class. |
| 227 | 227 | */ |
| 228 | - $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 228 | + $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item '.$menu_class);
|
|
| 229 | 229 | /** |
| 230 | 230 | * Filter the sub menu ul class. |
| 231 | 231 | * |
@@ -244,9 +244,9 @@ discard block |
||
| 244 | 244 | * @since 1.0.0 |
| 245 | 245 | */ |
| 246 | 246 | $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
|
| 247 | - $items .= '<li class="' . $li_class . '"> |
|
| 248 | - <a href="#" class="' . $a_class . '">' . __('Add Listing', 'geodirectory') . '</a>
|
|
| 249 | - <ul class="' . $sub_ul_class . '">'; |
|
| 247 | + $items .= '<li class="'.$li_class.'"> |
|
| 248 | + <a href="#" class="' . $a_class.'">'.__('Add Listing', 'geodirectory').'</a>
|
|
| 249 | + <ul class="' . $sub_ul_class.'">'; |
|
| 250 | 250 | |
| 251 | 251 | $post_types = geodir_get_posttypes('object');
|
| 252 | 252 | |
@@ -269,11 +269,11 @@ discard block |
||
| 269 | 269 | * @since 1.0.0 |
| 270 | 270 | * @param string $menu_class The menu HTML class. |
| 271 | 271 | */ |
| 272 | - $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
|
|
| 272 | + $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);
|
|
| 273 | 273 | $cpt_name = __($args->labels->singular_name, 'geodirectory'); |
| 274 | - $items .= '<li class="' . $li_class . '"> |
|
| 275 | - <a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $sub_a_class . '"> |
|
| 276 | - ' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '
|
|
| 274 | + $items .= '<li class="'.$li_class.'"> |
|
| 275 | + <a href="' . geodir_get_addlisting_link($post_type).'" class="'.$sub_a_class.'"> |
|
| 276 | + ' . sprintf(__('Add %s', 'geodirectory'), $cpt_name).'
|
|
| 277 | 277 | </a> |
| 278 | 278 | </li>'; |
| 279 | 279 | } |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | $items .= ' </ul> '; |
| 288 | - $items .= apply_filters('geodir_menu_after_sub_ul','');
|
|
| 288 | + $items .= apply_filters('geodir_menu_after_sub_ul', '');
|
|
| 289 | 289 | $items .= '</li>'; |
| 290 | 290 | |
| 291 | 291 | } |
@@ -313,14 +313,14 @@ discard block |
||
| 313 | 313 | $geodir_theme_location = get_option('geodir_theme_location_nav');
|
| 314 | 314 | $geodir_theme_location_nav = array(); |
| 315 | 315 | if (empty($locations) && empty($geodir_theme_location)) {
|
| 316 | - $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
|
|
| 316 | + $menu = str_replace("</ul></div>", geodir_add_nav_menu_items()."</ul></div>", $menu);
|
|
| 317 | 317 | $geodir_theme_location_nav[] = $args['theme_location']; |
| 318 | 318 | update_option('geodir_theme_location_nav', $geodir_theme_location_nav);
|
| 319 | 319 | } |
| 320 | 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 | 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);
|
|
| 323 | + $menu = str_replace("</ul></div>", geodir_add_nav_menu_items()."</ul></div>", $menu);
|
|
| 324 | 324 | |
| 325 | 325 | return $menu; |
| 326 | 326 | |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | |
| 349 | 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(); |
|
| 351 | + $items = $items.geodir_add_nav_menu_items(); |
|
| 352 | 352 | return $items; |
| 353 | 353 | |
| 354 | 354 | } else {
|
@@ -373,12 +373,12 @@ discard block |
||
| 373 | 373 | |
| 374 | 374 | $taxonomies = geodir_get_taxonomies(); |
| 375 | 375 | $taxonomies = implode("','", $taxonomies);
|
| 376 | - $taxonomies = "'" . $taxonomies . "'"; |
|
| 376 | + $taxonomies = "'".$taxonomies."'"; |
|
| 377 | 377 | |
| 378 | 378 | $pn_categories = $wpdb->get_results( |
| 379 | 379 | $wpdb->prepare( |
| 380 | 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) |
|
| 381 | + array($wpdb->terms.term_id) |
|
| 382 | 382 | ) |
| 383 | 383 | ); |
| 384 | 384 | |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | |
| 408 | 408 | if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
|
| 409 | 409 | if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
| 410 | - $geodir_post_type = get_post_type((int)$_REQUEST['pid']); |
|
| 410 | + $geodir_post_type = get_post_type((int) $_REQUEST['pid']); |
|
| 411 | 411 | elseif (isset($_REQUEST['listing_type'])) |
| 412 | 412 | $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']); |
| 413 | 413 | } |
@@ -440,17 +440,17 @@ discard block |
||
| 440 | 440 | */ |
| 441 | 441 | function geodir_get_default_posttype() |
| 442 | 442 | {
|
| 443 | - $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) ); |
|
| 443 | + $post_types = apply_filters('geodir_get_default_posttype', geodir_get_posttypes('object'));
|
|
| 444 | 444 | |
| 445 | - foreach ( $post_types as $post_type => $info ) {
|
|
| 445 | + foreach ($post_types as $post_type => $info) {
|
|
| 446 | 446 | global $wpdb; |
| 447 | - $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) ); |
|
| 448 | - if ( $has_posts ) {
|
|
| 447 | + $has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));
|
|
| 448 | + if ($has_posts) {
|
|
| 449 | 449 | $stype = $post_type; break; |
| 450 | 450 | } |
| 451 | 451 | } |
| 452 | 452 | |
| 453 | - if(!$stype){
|
|
| 453 | + if (!$stype) {
|
|
| 454 | 454 | $stype = 'gd_place'; |
| 455 | 455 | } |
| 456 | 456 | |
@@ -475,14 +475,14 @@ discard block |
||
| 475 | 475 | switch ($output): |
| 476 | 476 | case 'object': |
| 477 | 477 | case 'Object': |
| 478 | - $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types; |
|
| 478 | + $post_types = json_decode(json_encode($post_types), FALSE); //(object)$post_types; |
|
| 479 | 479 | break; |
| 480 | 480 | case 'array': |
| 481 | 481 | case 'Array': |
| 482 | - $post_types = (array)$post_types; |
|
| 482 | + $post_types = (array) $post_types; |
|
| 483 | 483 | break; |
| 484 | 484 | case 'options': |
| 485 | - $post_types = (array)$post_types; |
|
| 485 | + $post_types = (array) $post_types; |
|
| 486 | 486 | |
| 487 | 487 | $options = array(); |
| 488 | 488 | if (!empty($post_types)) {
|
@@ -600,15 +600,15 @@ discard block |
||
| 600 | 600 | |
| 601 | 601 | $categories = get_terms($taxonomies); |
| 602 | 602 | |
| 603 | - $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';
|
|
| 603 | + $html .= '<option value="0">'.__('All', 'geodirectory').'</option>';
|
|
| 604 | 604 | |
| 605 | 605 | foreach ($categories as $category_obj) {
|
| 606 | 606 | $select_opt = ''; |
| 607 | 607 | if ($selected == $category_obj->term_id) {
|
| 608 | 608 | $select_opt = 'selected="selected"'; |
| 609 | 609 | } |
| 610 | - $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">' |
|
| 611 | - . ucfirst($category_obj->name) . '</option>'; |
|
| 610 | + $html .= '<option '.$select_opt.' value="'.$category_obj->term_id.'">' |
|
| 611 | + . ucfirst($category_obj->name).'</option>'; |
|
| 612 | 612 | } |
| 613 | 613 | |
| 614 | 614 | if ($echo) |
@@ -676,7 +676,7 @@ discard block |
||
| 676 | 676 | } elseif (isset($wp_query->tax_query->queries)) {
|
| 677 | 677 | $tax_arr = $wp_query->tax_query->queries; |
| 678 | 678 | //if tax query has 'relation' set then it will break wp_list_pluck so we remove it |
| 679 | - if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}
|
|
| 679 | + if (isset($tax_arr['relation'])) {unset($tax_arr['relation']); }
|
|
| 680 | 680 | $taxonomies = wp_list_pluck($tax_arr, 'taxonomy'); |
| 681 | 681 | } |
| 682 | 682 | |
@@ -730,7 +730,7 @@ discard block |
||
| 730 | 730 | |
| 731 | 731 | if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {
|
| 732 | 732 | if ($cat_parent == 0) {
|
| 733 | - $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display; |
|
| 733 | + $list_class = 'main_list gd-parent-cats-list gd-cats-display-'.$cat_display; |
|
| 734 | 734 | $main_list_class = 'class="main_list_selecter"'; |
| 735 | 735 | } else {
|
| 736 | 736 | //$display = 'display:none'; |
@@ -740,7 +740,7 @@ discard block |
||
| 740 | 740 | |
| 741 | 741 | if ($cat_display == 'checkbox' || $cat_display == 'radio') {
|
| 742 | 742 | $p = 0; |
| 743 | - $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 743 | + $out = '<div class="'.$list_class.' gd-cat-row-'.$cat_parent.'" style="margin-left:'.$p.'px;'.$display.';">'; |
|
| 744 | 744 | } |
| 745 | 745 | |
| 746 | 746 | foreach ($cat_terms as $cat_term) {
|
@@ -755,12 +755,12 @@ discard block |
||
| 755 | 755 | } |
| 756 | 756 | |
| 757 | 757 | if ($cat_display == 'radio') |
| 758 | - $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="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
|
| 758 | + $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="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' id="gd-cat-'.$cat_term->term_id.'" >'.$term_check.ucfirst($cat_term->name).'</span>'; |
|
| 759 | 759 | elseif ($cat_display == 'select' || $cat_display == 'multiselect') |
| 760 | - $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>'; |
|
| 760 | + $out .= '<option '.$main_list_class.' style="margin-left:'.$p.'px;" alt="'.$cat_term->taxonomy.'" title="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' >'.$term_check.ucfirst($cat_term->name).'</option>'; |
|
| 761 | 761 | |
| 762 | 762 | else {
|
| 763 | - $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="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>'; |
|
| 763 | + $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="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' id="gd-cat-'.$cat_term->term_id.'" >'.$term_check.ucfirst($cat_term->name).'</span>'; |
|
| 764 | 764 | } |
| 765 | 765 | |
| 766 | 766 | // Call recurson to print sub cats |
@@ -799,7 +799,7 @@ discard block |
||
| 799 | 799 | $cat_exclude = serialize($exclude_cats); |
| 800 | 800 | |
| 801 | 801 | if (isset($_REQUEST['backandedit'])) {
|
| 802 | - $post = (object)$gd_session->get('listing');
|
|
| 802 | + $post = (object) $gd_session->get('listing');
|
|
| 803 | 803 | |
| 804 | 804 | if (!is_array($post->post_category[$cat_taxonomy])) |
| 805 | 805 | $post_category = $post->post_category[$cat_taxonomy]; |
@@ -831,7 +831,7 @@ discard block |
||
| 831 | 831 | |
| 832 | 832 | if (!empty($post_category)) {
|
| 833 | 833 | $cat1 = array_filter(explode(',', $post_category));
|
| 834 | - $post_category = ',' . implode(',', $cat1) . ',';
|
|
| 834 | + $post_category = ','.implode(',', $cat1).',';
|
|
| 835 | 835 | |
| 836 | 836 | } |
| 837 | 837 | |
@@ -842,7 +842,7 @@ discard block |
||
| 842 | 842 | foreach ($post_category_upd as $cat) {
|
| 843 | 843 | |
| 844 | 844 | if (!in_array($cat, $exclude_cats) && $cat != '') {
|
| 845 | - $post_category_change .= ',' . $cat; |
|
| 845 | + $post_category_change .= ','.$cat; |
|
| 846 | 846 | } |
| 847 | 847 | } |
| 848 | 848 | $post_category = $post_category_change; |
@@ -854,11 +854,11 @@ discard block |
||
| 854 | 854 | } |
| 855 | 855 | } |
| 856 | 856 | |
| 857 | - echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']" />'; |
|
| 857 | + echo '<input type="hidden" id="cat_limit" value="'.$cat_limit.'" name="cat_limit['.$cat_taxonomy.']" />'; |
|
| 858 | 858 | |
| 859 | - echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']" />'; |
|
| 859 | + echo '<input type="hidden" id="post_category" value="'.$post_category.'" name="post_category['.$cat_taxonomy.']" />'; |
|
| 860 | 860 | |
| 861 | - echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']" />'; |
|
| 861 | + echo '<input type="hidden" id="post_category_str" value="'.$post_category_str.'" name="post_category_str['.$cat_taxonomy.']" />'; |
|
| 862 | 862 | |
| 863 | 863 | |
| 864 | 864 | ?> |
@@ -877,14 +877,14 @@ discard block |
||
| 877 | 877 | |
| 878 | 878 | function show_subcatlist(main_cat, catObj) {
|
| 879 | 879 | if (main_cat != '') {
|
| 880 | - var url = '<?php echo geodir_get_ajax_url();?>'; |
|
| 881 | - var cat_taxonomy = '<?php echo $cat_taxonomy;?>'; |
|
| 882 | - var cat_exclude = '<?php echo base64_encode($cat_exclude);?>'; |
|
| 880 | + var url = '<?php echo geodir_get_ajax_url(); ?>'; |
|
| 881 | + var cat_taxonomy = '<?php echo $cat_taxonomy; ?>'; |
|
| 882 | + var cat_exclude = '<?php echo base64_encode($cat_exclude); ?>'; |
|
| 883 | 883 | var cat_limit = jQuery('#' + cat_taxonomy).find('#cat_limit').val();
|
| 884 | - <?php if ((int)$cat_limit > 0) { ?>
|
|
| 884 | + <?php if ((int) $cat_limit > 0) { ?>
|
|
| 885 | 885 | var selected = parseInt(jQuery('#' + cat_taxonomy).find('.cat_sublist > div.post_catlist_item').length);
|
| 886 | 886 | if (cat_limit != '' && selected > 0 && selected >= cat_limit && cat_limit != 0) {
|
| 887 | - alert("<?php echo esc_attr(wp_sprintf(__('You have reached category limit of %d categories.', 'geodirectory'), (int)$cat_limit));?>");
|
|
| 887 | + alert("<?php echo esc_attr(wp_sprintf(__('You have reached category limit of %d categories.', 'geodirectory'), (int) $cat_limit)); ?>");
|
|
| 888 | 888 | return false; |
| 889 | 889 | } |
| 890 | 890 | <?php } ?> |
@@ -923,7 +923,7 @@ discard block |
||
| 923 | 923 | } |
| 924 | 924 | |
| 925 | 925 | function update_listing_cat(el) {
|
| 926 | - var cat_taxonomy = '<?php echo $cat_taxonomy;?>'; |
|
| 926 | + var cat_taxonomy = '<?php echo $cat_taxonomy; ?>'; |
|
| 927 | 927 | var cat_ids = ''; |
| 928 | 928 | var main_cat = ''; |
| 929 | 929 | var sub_cat = ''; |
@@ -1004,7 +1004,7 @@ discard block |
||
| 1004 | 1004 | <div class="main_cat_list" style=" <?php if (isset($style)) {
|
| 1005 | 1005 | echo $style; |
| 1006 | 1006 | }?> "> |
| 1007 | - <?php geodir_get_catlist($cat_taxonomy, 0); // print main categories list |
|
| 1007 | + <?php geodir_get_catlist($cat_taxonomy, 0); // print main categories list |
|
| 1008 | 1008 | ?> |
| 1009 | 1009 | </div> |
| 1010 | 1010 | <?php |
@@ -1031,9 +1031,9 @@ discard block |
||
| 1031 | 1031 | if ($exclude != '') {
|
| 1032 | 1032 | $exclude_cats = maybe_unserialize(base64_decode($exclude)); |
| 1033 | 1033 | |
| 1034 | - if(is_array( $exclude_cats)){
|
|
| 1035 | - $exclude_cats = array_map( 'intval', $exclude_cats ); |
|
| 1036 | - }else{
|
|
| 1034 | + if (is_array($exclude_cats)) {
|
|
| 1035 | + $exclude_cats = array_map('intval', $exclude_cats);
|
|
| 1036 | + } else {
|
|
| 1037 | 1037 | $exclude_cats = intval($exclude_cats); |
| 1038 | 1038 | } |
| 1039 | 1039 | |
@@ -1047,25 +1047,25 @@ discard block |
||
| 1047 | 1047 | <?php $main_cat = get_term($parrent, $request_taxonomy); ?> |
| 1048 | 1048 | |
| 1049 | 1049 | <div class="post_catlist_item" style="border:1px solid #CCCCCC; margin:5px auto; padding:5px;"> |
| 1050 | - <img alt="move icon" src="<?php echo geodir_plugin_url() . '/geodirectory-assets/images/move.png';?>" |
|
| 1050 | + <img alt="move icon" src="<?php echo geodir_plugin_url().'/geodirectory-assets/images/move.png'; ?>" |
|
| 1051 | 1051 | onclick="jQuery(this).closest('div').remove();update_listing_cat(this);" align="right"/>
|
| 1052 | 1052 | <?php /* ?> |
| 1053 | 1053 | <img src="<?php echo geodir_plugin_url().'/geodirectory-assets/images/move.png';?>" onclick="jQuery(this).closest('div').remove();show_subcatlist();" align="right" />
|
| 1054 | 1054 | <?php */ ?> |
| 1055 | 1055 | |
| 1056 | - <input type="checkbox" value="<?php echo $main_cat->term_id;?>" class="listing_main_cat" |
|
| 1056 | + <input type="checkbox" value="<?php echo $main_cat->term_id; ?>" class="listing_main_cat" |
|
| 1057 | 1057 | onchange="if(jQuery(this).is(':checked')){jQuery(this).closest('div').find('.post_default_category').prop('checked',false).show();}else{jQuery(this).closest('div').find('.post_default_category').prop('checked',false).hide();};update_listing_cat()"
|
| 1058 | 1058 | checked="checked" disabled="disabled"/> |
| 1059 | 1059 | <span> |
| 1060 | - <?php printf(__('Add listing in %s category', 'geodirectory'), geodir_ucwords($main_cat->name));?>
|
|
| 1060 | + <?php printf(__('Add listing in %s category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>
|
|
| 1061 | 1061 | </span> |
| 1062 | 1062 | <br/> |
| 1063 | 1063 | |
| 1064 | 1064 | <div class="post_default_category"> |
| 1065 | - <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id;?>" |
|
| 1066 | - onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" ';?> /> |
|
| 1065 | + <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id; ?>" |
|
| 1066 | + onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" '; ?> /> |
|
| 1067 | 1067 | <span> |
| 1068 | - <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name));?>
|
|
| 1068 | + <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>
|
|
| 1069 | 1069 | </span> |
| 1070 | 1070 | </div> |
| 1071 | 1071 | |
@@ -1098,7 +1098,7 @@ discard block |
||
| 1098 | 1098 | $post_cat_str = $post_categories[$request_taxonomy]; |
| 1099 | 1099 | $post_cat_array = explode("#", $post_cat_str);
|
| 1100 | 1100 | if (is_array($post_cat_array)) {
|
| 1101 | - $post_cat_array = array_unique( $post_cat_array ); |
|
| 1101 | + $post_cat_array = array_unique($post_cat_array); |
|
| 1102 | 1102 | |
| 1103 | 1103 | foreach ($post_cat_array as $post_cat_html) {
|
| 1104 | 1104 | |
@@ -1113,7 +1113,7 @@ discard block |
||
| 1113 | 1113 | } |
| 1114 | 1114 | $post_sub_catid = ''; |
| 1115 | 1115 | if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
| 1116 | - $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1116 | + $post_sub_catid = (int) $post_cat_info[1]; |
|
| 1117 | 1117 | } |
| 1118 | 1118 | |
| 1119 | 1119 | geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
@@ -1134,7 +1134,7 @@ discard block |
||
| 1134 | 1134 | } |
| 1135 | 1135 | |
| 1136 | 1136 | if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
|
| 1137 | - $post_sub_catid = (int)$post_cat_info[1]; |
|
| 1137 | + $post_sub_catid = (int) $post_cat_info[1]; |
|
| 1138 | 1138 | } |
| 1139 | 1139 | |
| 1140 | 1140 | geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default); |
@@ -1166,9 +1166,9 @@ discard block |
||
| 1166 | 1166 | if (!$selected) |
| 1167 | 1167 | $option_slected = ' selected="selected" '; |
| 1168 | 1168 | |
| 1169 | - echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >'; |
|
| 1169 | + echo '<select field_type="select" id="'.sanitize_text_field($cat_taxonomy).'" class="chosen_select" '.$onchange.' option-ajaxChosen="false" >'; |
|
| 1170 | 1170 | |
| 1171 | - echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';
|
|
| 1171 | + echo '<option value="" '.$option_selected.' >'.__('Select Category', 'geodirectory').'</option>';
|
|
| 1172 | 1172 | |
| 1173 | 1173 | foreach ($cat_terms as $cat_term) {
|
| 1174 | 1174 | $option_selected = ''; |
@@ -1176,10 +1176,10 @@ discard block |
||
| 1176 | 1176 | $option_selected = ' selected="selected" '; |
| 1177 | 1177 | |
| 1178 | 1178 | // Count child terms |
| 1179 | - $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) ); |
|
| 1180 | - $has_child = !empty( $child_terms ) ? 't' : 'f'; |
|
| 1179 | + $child_terms = get_terms($cat_taxonomy, array('parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1));
|
|
| 1180 | + $has_child = !empty($child_terms) ? 't' : 'f'; |
|
| 1181 | 1181 | |
| 1182 | - echo '<option ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . ucfirst($cat_term->name) . '</option>'; |
|
| 1182 | + echo '<option '.$option_selected.' alt="'.$cat_term->taxonomy.'" title="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" _hc="'.$has_child.'" >'.ucfirst($cat_term->name).'</option>'; |
|
| 1183 | 1183 | } |
| 1184 | 1184 | echo '</select>'; |
| 1185 | 1185 | } |
@@ -1210,7 +1210,7 @@ discard block |
||
| 1210 | 1210 | 2 => __('Custom field updated.', 'geodirectory'),
|
| 1211 | 1211 | 3 => __('Custom field deleted.', 'geodirectory'),
|
| 1212 | 1212 | 4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),
|
| 1213 | - 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,
|
|
| 1213 | + 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,
|
|
| 1214 | 1214 | 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),
|
| 1215 | 1215 | 7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),
|
| 1216 | 1216 | 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,7 +1236,7 @@ discard block |
||
| 1236 | 1236 | |
| 1237 | 1237 | global $wpdb; |
| 1238 | 1238 | |
| 1239 | - $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico'; |
|
| 1239 | + $menu_icon = geodir_plugin_url().'/geodirectory-assets/images/favicon.ico'; |
|
| 1240 | 1240 | |
| 1241 | 1241 | if (!$listing_slug = get_option('geodir_listing_prefix'))
|
| 1242 | 1242 | $listing_slug = 'places'; |
@@ -1249,11 +1249,11 @@ discard block |
||
| 1249 | 1249 | |
| 1250 | 1250 | $gd_placetags = array(); |
| 1251 | 1251 | $gd_placetags['object_type'] = 'gd_place'; |
| 1252 | - $gd_placetags['listing_slug'] = $listing_slug . '/tags'; |
|
| 1252 | + $gd_placetags['listing_slug'] = $listing_slug.'/tags'; |
|
| 1253 | 1253 | $gd_placetags['args'] = array( |
| 1254 | 1254 | 'public' => true, |
| 1255 | 1255 | 'hierarchical' => false, |
| 1256 | - 'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),
|
|
| 1256 | + 'rewrite' => array('slug' => $listing_slug.'/tags', 'with_front' => false, 'hierarchical' => true),
|
|
| 1257 | 1257 | 'query_var' => true, |
| 1258 | 1258 | |
| 1259 | 1259 | 'labels' => array( |
@@ -1347,7 +1347,7 @@ discard block |
||
| 1347 | 1347 | 'menu_icon' => $menu_icon, |
| 1348 | 1348 | 'public' => true, |
| 1349 | 1349 | 'query_var' => true, |
| 1350 | - 'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
|
|
| 1350 | + 'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
|
|
| 1351 | 1351 | 'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),
|
| 1352 | 1352 | 'taxonomies' => array('gd_placecategory', 'gd_place_tags'));
|
| 1353 | 1353 | |
@@ -1369,27 +1369,27 @@ discard block |
||
| 1369 | 1369 | } |
| 1370 | 1370 | |
| 1371 | 1371 | $gd_wpml_get_languages = ""; |
| 1372 | -function gd_wpml_get_lang_from_url($url){
|
|
| 1372 | +function gd_wpml_get_lang_from_url($url) {
|
|
| 1373 | 1373 | |
| 1374 | 1374 | global $gd_wpml_get_languages; |
| 1375 | - if(isset($_REQUEST['lang']) && $_REQUEST['lang']){return $_REQUEST['lang'];}
|
|
| 1375 | + if (isset($_REQUEST['lang']) && $_REQUEST['lang']) {return $_REQUEST['lang']; }
|
|
| 1376 | 1376 | |
| 1377 | 1377 | |
| 1378 | 1378 | // |
| 1379 | - $url = str_replace(array("http://","https://"),"",$url);
|
|
| 1379 | + $url = str_replace(array("http://", "https://"), "", $url);
|
|
| 1380 | 1380 | |
| 1381 | 1381 | // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.
|
| 1382 | - $site_url = str_replace(array("http://","https://"),"",site_url());
|
|
| 1382 | + $site_url = str_replace(array("http://", "https://"), "", site_url());
|
|
| 1383 | 1383 | |
| 1384 | - $url = str_replace($site_url,"",$url); |
|
| 1384 | + $url = str_replace($site_url, "", $url); |
|
| 1385 | 1385 | |
| 1386 | 1386 | |
| 1387 | 1387 | $segments = explode('/', trim($url, '/'));
|
| 1388 | 1388 | |
| 1389 | 1389 | //print_r( $segments); |
| 1390 | - if($gd_wpml_get_languages){
|
|
| 1390 | + if ($gd_wpml_get_languages) {
|
|
| 1391 | 1391 | $langs = $gd_wpml_get_languages; |
| 1392 | - }else{
|
|
| 1392 | + } else {
|
|
| 1393 | 1393 | global $sitepress; |
| 1394 | 1394 | $gd_wpml_get_languages = $sitepress->get_active_languages(); |
| 1395 | 1395 | } |
@@ -1454,17 +1454,17 @@ discard block |
||
| 1454 | 1454 | $slug = $post_types[$post->post_type]['rewrite']['slug']; |
| 1455 | 1455 | |
| 1456 | 1456 | // Alter the CPT slug if WPML is set to do so |
| 1457 | - if(function_exists('icl_object_id')){
|
|
| 1458 | - if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
|
|
| 1457 | + if (function_exists('icl_object_id')) {
|
|
| 1458 | + if (gd_wpml_slug_translation_turned_on($post->post_type) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
|
|
| 1459 | 1459 | |
| 1460 | 1460 | $org_slug = $slug; |
| 1461 | - $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1461 | + $slug = apply_filters('wpml_translate_single_string',
|
|
| 1462 | 1462 | $slug, |
| 1463 | 1463 | 'WordPress', |
| 1464 | - 'URL slug: ' . $slug, |
|
| 1464 | + 'URL slug: '.$slug, |
|
| 1465 | 1465 | $language_code); |
| 1466 | 1466 | |
| 1467 | - if(!$slug){$slug = $org_slug;}
|
|
| 1467 | + if (!$slug) {$slug = $org_slug; }
|
|
| 1468 | 1468 | |
| 1469 | 1469 | } |
| 1470 | 1470 | } |
@@ -1486,11 +1486,11 @@ discard block |
||
| 1486 | 1486 | } |
| 1487 | 1487 | |
| 1488 | 1488 | $post_link = trailingslashit( |
| 1489 | - preg_replace( "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 ) |
|
| 1489 | + preg_replace("/".preg_quote($slug, "/")."/", $slug."/%gd_taxonomy%", $post_link, 1)
|
|
| 1490 | 1490 | ); |
| 1491 | 1491 | |
| 1492 | 1492 | if ($fix_url) {
|
| 1493 | - $post_link = $site_url . $post_link; |
|
| 1493 | + $post_link = $site_url.$post_link; |
|
| 1494 | 1494 | } |
| 1495 | 1495 | |
| 1496 | 1496 | if (isset($comment_post_cache[$post->ID])) {
|
@@ -1509,12 +1509,12 @@ discard block |
||
| 1509 | 1509 | $ID = $post->ID; |
| 1510 | 1510 | $post2 = $wpdb->get_row( |
| 1511 | 1511 | $wpdb->prepare( |
| 1512 | - "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1512 | + "SELECT * from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ", |
|
| 1513 | 1513 | array($post->ID) |
| 1514 | 1514 | ) |
| 1515 | 1515 | ); |
| 1516 | 1516 | |
| 1517 | - $post = (object)array_merge((array)$post, (array)$post2); |
|
| 1517 | + $post = (object) array_merge((array) $post, (array) $post2); |
|
| 1518 | 1518 | |
| 1519 | 1519 | $comment_post_cache[$post->ID] = $post; |
| 1520 | 1520 | } |
@@ -1523,7 +1523,7 @@ discard block |
||
| 1523 | 1523 | |
| 1524 | 1524 | if (false !== strpos($post_link, '%gd_taxonomy%')) {
|
| 1525 | 1525 | |
| 1526 | - if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {
|
|
| 1526 | + if (apply_filters("geodir_add_location_url_to_url", get_option('geodir_add_location_url'), $post->post_type, $post)) {
|
|
| 1527 | 1527 | $location_request = ''; |
| 1528 | 1528 | |
| 1529 | 1529 | |
@@ -1537,7 +1537,7 @@ discard block |
||
| 1537 | 1537 | $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
| 1538 | 1538 | $post->country_slug = str_replace(']', '', $post->country_slug);
|
| 1539 | 1539 | |
| 1540 | - $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1540 | + $post_location = (object) array('country_slug' => $post->country_slug,
|
|
| 1541 | 1541 | 'region_slug' => $post->region_slug, |
| 1542 | 1542 | 'city_slug' => $post->city_slug |
| 1543 | 1543 | ); |
@@ -1550,7 +1550,7 @@ discard block |
||
| 1550 | 1550 | |
| 1551 | 1551 | $post_location_sql = $wpdb->get_results( |
| 1552 | 1552 | $wpdb->prepare( |
| 1553 | - "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ", |
|
| 1553 | + "SELECT post_locations from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ", |
|
| 1554 | 1554 | array($post->ID) |
| 1555 | 1555 | ) |
| 1556 | 1556 | ); |
@@ -1566,7 +1566,7 @@ discard block |
||
| 1566 | 1566 | $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
|
| 1567 | 1567 | $post->country_slug = str_replace(']', '', $post->country_slug);
|
| 1568 | 1568 | |
| 1569 | - $post_location = (object)array('country_slug' => $post->country_slug,
|
|
| 1569 | + $post_location = (object) array('country_slug' => $post->country_slug,
|
|
| 1570 | 1570 | 'region_slug' => $post->region_slug, |
| 1571 | 1571 | 'city_slug' => $post->city_slug |
| 1572 | 1572 | ); |
@@ -1595,7 +1595,7 @@ discard block |
||
| 1595 | 1595 | } |
| 1596 | 1596 | $location_slug[] = $city_slug; |
| 1597 | 1597 | |
| 1598 | - $location_request .= implode('/', $location_slug) . '/';
|
|
| 1598 | + $location_request .= implode('/', $location_slug).'/';
|
|
| 1599 | 1599 | } |
| 1600 | 1600 | } |
| 1601 | 1601 | |
@@ -1653,9 +1653,9 @@ discard block |
||
| 1653 | 1653 | } |
| 1654 | 1654 | $request_term = trim($request_term, '/'); |
| 1655 | 1655 | if (!empty($request_term)) |
| 1656 | - $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1656 | + $post_link = str_replace('%gd_taxonomy%', $request_term.$detailurl_separator, $post_link);
|
|
| 1657 | 1657 | else |
| 1658 | - $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
|
|
| 1658 | + $post_link = str_replace('/%gd_taxonomy%', $request_term.$detailurl_separator, $post_link);
|
|
| 1659 | 1659 | //echo $post_link ; |
| 1660 | 1660 | } |
| 1661 | 1661 | // temp cache the permalink |
@@ -1706,7 +1706,7 @@ discard block |
||
| 1706 | 1706 | $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
| 1707 | 1707 | $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
| 1708 | 1708 | |
| 1709 | - if(geodir_is_page('detail') && isset($post->country_slug)){
|
|
| 1709 | + if (geodir_is_page('detail') && isset($post->country_slug)) {
|
|
| 1710 | 1710 | $location_terms = array( |
| 1711 | 1711 | 'gd_country' => $post->country_slug, |
| 1712 | 1712 | 'gd_region' => $post->region_slug, |
@@ -1725,12 +1725,12 @@ discard block |
||
| 1725 | 1725 | |
| 1726 | 1726 | if (!empty($location_terms)) {
|
| 1727 | 1727 | |
| 1728 | - $url_separator = '';//get_option('geodir_listingurl_separator');
|
|
| 1728 | + $url_separator = ''; //get_option('geodir_listingurl_separator');
|
|
| 1729 | 1729 | |
| 1730 | 1730 | if (get_option('permalink_structure') != '') {
|
| 1731 | - $old_listing_slug = '/' . $listing_slug . '/'; |
|
| 1731 | + $old_listing_slug = '/'.$listing_slug.'/'; |
|
| 1732 | 1732 | $request_term = implode("/", $location_terms);
|
| 1733 | - $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/'; |
|
| 1733 | + $new_listing_slug = '/'.$listing_slug.'/'.$request_term.'/'; |
|
| 1734 | 1734 | |
| 1735 | 1735 | $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug)); |
| 1736 | 1736 | } else {
|
@@ -1748,31 +1748,31 @@ discard block |
||
| 1748 | 1748 | }*/ |
| 1749 | 1749 | |
| 1750 | 1750 | // Alter the CPT slug if WPML is set to do so |
| 1751 | - if(function_exists('icl_object_id')){
|
|
| 1751 | + if (function_exists('icl_object_id')) {
|
|
| 1752 | 1752 | $post_types = get_option('geodir_post_types');
|
| 1753 | - $post_type = str_replace("category","",$taxonomy);
|
|
| 1754 | - $post_type = str_replace("_tags","",$post_type);
|
|
| 1753 | + $post_type = str_replace("category", "", $taxonomy);
|
|
| 1754 | + $post_type = str_replace("_tags", "", $post_type);
|
|
| 1755 | 1755 | $slug = $post_types[$post_type]['rewrite']['slug']; |
| 1756 | - if ( gd_wpml_slug_translation_turned_on( $post_type )) {
|
|
| 1756 | + if (gd_wpml_slug_translation_turned_on($post_type)) {
|
|
| 1757 | 1757 | |
| 1758 | 1758 | global $sitepress; |
| 1759 | 1759 | $default_lang = $sitepress->get_default_language(); |
| 1760 | 1760 | $language_code = gd_wpml_get_lang_from_url($termlink); |
| 1761 | - if(!$language_code ){$language_code = $default_lang;}
|
|
| 1761 | + if (!$language_code) {$language_code = $default_lang; }
|
|
| 1762 | 1762 | |
| 1763 | 1763 | $org_slug = $slug; |
| 1764 | - $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1764 | + $slug = apply_filters('wpml_translate_single_string',
|
|
| 1765 | 1765 | $slug, |
| 1766 | 1766 | 'WordPress', |
| 1767 | - 'URL slug: ' . $slug, |
|
| 1767 | + 'URL slug: '.$slug, |
|
| 1768 | 1768 | $language_code); |
| 1769 | 1769 | |
| 1770 | 1770 | |
| 1771 | - if(!$slug){$slug = $org_slug;}
|
|
| 1771 | + if (!$slug) {$slug = $org_slug; }
|
|
| 1772 | 1772 | |
| 1773 | 1773 | $termlink = trailingslashit( |
| 1774 | 1774 | |
| 1775 | - preg_replace( "/" . preg_quote( $org_slug, "/" ) . "/", $slug ,$termlink, 1 ) |
|
| 1775 | + preg_replace("/".preg_quote($org_slug, "/")."/", $slug, $termlink, 1)
|
|
| 1776 | 1776 | ); |
| 1777 | 1777 | |
| 1778 | 1778 | } |
@@ -1805,7 +1805,7 @@ discard block |
||
| 1805 | 1805 | |
| 1806 | 1806 | if (in_array($post_type, geodir_get_posttypes())) {
|
| 1807 | 1807 | if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {
|
| 1808 | - if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {
|
|
| 1808 | + if (geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {
|
|
| 1809 | 1809 | $location_terms = array( |
| 1810 | 1810 | 'gd_country' => $post->country_slug, |
| 1811 | 1811 | 'gd_region' => $post->region_slug, |
@@ -1822,7 +1822,7 @@ discard block |
||
| 1822 | 1822 | $location_terms = implode("/", $location_terms);
|
| 1823 | 1823 | $location_terms = rtrim($location_terms, '/'); |
| 1824 | 1824 | |
| 1825 | - $link .= urldecode($location_terms) . '/'; |
|
| 1825 | + $link .= urldecode($location_terms).'/'; |
|
| 1826 | 1826 | } else {
|
| 1827 | 1827 | $link = geodir_getlink($link, $location_terms); |
| 1828 | 1828 | } |
@@ -1904,9 +1904,9 @@ discard block |
||
| 1904 | 1904 | return 0; |
| 1905 | 1905 | $where = 't.term_id = %d'; |
| 1906 | 1906 | if (!empty($taxonomy)) |
| 1907 | - return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1907 | + return $wpdb->get_row($wpdb->prepare($tax_select.$where." AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); |
|
| 1908 | 1908 | else |
| 1909 | - return $wpdb->get_var($wpdb->prepare($select . $where, $term)); |
|
| 1909 | + return $wpdb->get_var($wpdb->prepare($select.$where, $term)); |
|
| 1910 | 1910 | } |
| 1911 | 1911 | |
| 1912 | 1912 | $term = trim(wp_unslash($term)); |
@@ -1918,7 +1918,7 @@ discard block |
||
| 1918 | 1918 | |
| 1919 | 1919 | $where_fields = array($slug); |
| 1920 | 1920 | if (!empty($taxonomy)) {
|
| 1921 | - $parent = (int)$parent; |
|
| 1921 | + $parent = (int) $parent; |
|
| 1922 | 1922 | if ($parent > 0) {
|
| 1923 | 1923 | $where_fields[] = $parent; |
| 1924 | 1924 | $else_where_fields[] = $parent; |
@@ -1981,13 +1981,13 @@ discard block |
||
| 1981 | 1981 | $post_types = geodir_get_posttypes(); |
| 1982 | 1982 | $tax_arr = array(); |
| 1983 | 1983 | foreach ($post_types as $post_type) {
|
| 1984 | - $tax_arr[] = "'" . $post_type . "category'"; |
|
| 1984 | + $tax_arr[] = "'".$post_type."category'"; |
|
| 1985 | 1985 | } |
| 1986 | 1986 | $tax_c = implode(',', $tax_arr);
|
| 1987 | 1987 | $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");
|
| 1988 | 1988 | //$terms = get_terms( $taxonomy ); |
| 1989 | 1989 | |
| 1990 | - if($terms) {
|
|
| 1990 | + if ($terms) {
|
|
| 1991 | 1991 | foreach ($terms as $term) {
|
| 1992 | 1992 | $post_type = str_replace("category", "", $term->taxonomy);
|
| 1993 | 1993 | $a_terms[$post_type][] = $term; |
@@ -1995,7 +1995,7 @@ discard block |
||
| 1995 | 1995 | } |
| 1996 | 1996 | } |
| 1997 | 1997 | |
| 1998 | - if($a_terms) {
|
|
| 1998 | + if ($a_terms) {
|
|
| 1999 | 1999 | foreach ($a_terms as $pt => $t2) {
|
| 2000 | 2000 | |
| 2001 | 2001 | foreach ($t2 as $term) {
|
@@ -2020,7 +2020,7 @@ discard block |
||
| 2020 | 2020 | } |
| 2021 | 2021 | |
| 2022 | 2022 | if (is_ssl()) {
|
| 2023 | - $terms_icons = str_replace("http:","https:",$terms_icons );
|
|
| 2023 | + $terms_icons = str_replace("http:", "https:", $terms_icons);
|
|
| 2024 | 2024 | } |
| 2025 | 2025 | |
| 2026 | 2026 | return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);
|
