GeoDirectory /
geodirectory
@@ -20,492 +20,492 @@ discard block |
||
| 20 | 20 | function geodir_set_postcat_structure($post_id, $taxonomy, $default_cat = '', $category_str = '') |
| 21 | 21 | {
|
| 22 | 22 | |
| 23 | - $post_cat_ids = geodir_get_post_meta($post_id, $taxonomy); |
|
| 24 | - if (!empty($post_cat_ids)) |
|
| 25 | - $post_cat_array = explode(",", trim($post_cat_ids, ","));
|
|
| 26 | - |
|
| 27 | - if (!isset($default_cat) || empty($default_cat)) {
|
|
| 28 | - $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : ''; |
|
| 29 | - }else{
|
|
| 30 | - if(!is_int($default_cat)){
|
|
| 31 | - $category = get_term_by('name', $default_cat, $taxonomy);
|
|
| 32 | - if(isset($category->term_id)){
|
|
| 33 | - $default_cat = $category->term_id; |
|
| 34 | - } |
|
| 35 | - } |
|
| 23 | + $post_cat_ids = geodir_get_post_meta($post_id, $taxonomy); |
|
| 24 | + if (!empty($post_cat_ids)) |
|
| 25 | + $post_cat_array = explode(",", trim($post_cat_ids, ","));
|
|
| 26 | + |
|
| 27 | + if (!isset($default_cat) || empty($default_cat)) {
|
|
| 28 | + $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : ''; |
|
| 29 | + }else{
|
|
| 30 | + if(!is_int($default_cat)){
|
|
| 31 | + $category = get_term_by('name', $default_cat, $taxonomy);
|
|
| 32 | + if(isset($category->term_id)){
|
|
| 33 | + $default_cat = $category->term_id; |
|
| 34 | + } |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - } |
|
| 37 | + } |
|
| 38 | 38 | |
| 39 | 39 | |
| 40 | - geodir_save_post_meta($post_id, 'default_category', $default_cat); |
|
| 40 | + geodir_save_post_meta($post_id, 'default_category', $default_cat); |
|
| 41 | 41 | |
| 42 | - if (isset($category_str) && empty($category_str)) {
|
|
| 42 | + if (isset($category_str) && empty($category_str)) {
|
|
| 43 | 43 | |
| 44 | - $post_cat_str = ''; |
|
| 45 | - $post_categories = array(); |
|
| 46 | - if (isset($post_cat_array) && is_array($post_cat_array) && !empty($post_cat_array)) {
|
|
| 47 | - $post_cat_str = implode(",y:#", $post_cat_array);
|
|
| 48 | - $post_cat_str .= ",y:"; |
|
| 49 | - $post_cat_str = substr_replace($post_cat_str, ',y,d:', strpos($post_cat_str, ',y:'), strlen(',y:'));
|
|
| 50 | - } |
|
| 51 | - $post_categories[$taxonomy] = $post_cat_str; |
|
| 52 | - $category_str = $post_categories; |
|
| 53 | - } |
|
| 44 | + $post_cat_str = ''; |
|
| 45 | + $post_categories = array(); |
|
| 46 | + if (isset($post_cat_array) && is_array($post_cat_array) && !empty($post_cat_array)) {
|
|
| 47 | + $post_cat_str = implode(",y:#", $post_cat_array);
|
|
| 48 | + $post_cat_str .= ",y:"; |
|
| 49 | + $post_cat_str = substr_replace($post_cat_str, ',y,d:', strpos($post_cat_str, ',y:'), strlen(',y:'));
|
|
| 50 | + } |
|
| 51 | + $post_categories[$taxonomy] = $post_cat_str; |
|
| 52 | + $category_str = $post_categories; |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - $change_cat_str = $category_str[$taxonomy]; |
|
| 55 | + $change_cat_str = $category_str[$taxonomy]; |
|
| 56 | 56 | |
| 57 | - $default_pos = strpos($change_cat_str, 'd:'); |
|
| 57 | + $default_pos = strpos($change_cat_str, 'd:'); |
|
| 58 | 58 | |
| 59 | - if ($default_pos === false) {
|
|
| 59 | + if ($default_pos === false) {
|
|
| 60 | 60 | |
| 61 | - $change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str); |
|
| 61 | + $change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str); |
|
| 62 | 62 | |
| 63 | - } |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - $category_str[$taxonomy] = $change_cat_str; |
|
| 65 | + $category_str[$taxonomy] = $change_cat_str; |
|
| 66 | 66 | |
| 67 | - update_post_meta($post_id, 'post_categories', $category_str); |
|
| 67 | + update_post_meta($post_id, 'post_categories', $category_str); |
|
| 68 | 68 | |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | |
| 72 | 72 | if (!function_exists('geodir_save_listing')) {
|
| 73 | - /** |
|
| 74 | - * Saves listing in the database using given information. |
|
| 75 | - * |
|
| 76 | - * @since 1.0.0 |
|
| 77 | - * @since 1.5.4 New parameter $wp_error added. |
|
| 78 | - * @since 1.6.18 Admin use only date field should not lost value if saved by user - FIXED |
|
| 79 | - * @package GeoDirectory |
|
| 80 | - * @global object $wpdb WordPress Database object. |
|
| 81 | - * @global object $post The current post object. |
|
| 82 | - * @global object $current_user Current user object. |
|
| 83 | - * @global object $gd_session GeoDirectory Session object. |
|
| 84 | - * @param array $request_info {
|
|
| 85 | - * Array of request info arguments. |
|
| 86 | - * |
|
| 87 | - * @type string $action Ajax action name. |
|
| 88 | - * @type string $geodir_ajax Ajax type. |
|
| 89 | - * @type string $ajax_action Ajax action. |
|
| 90 | - * @type string $listing_type Listing type. |
|
| 91 | - * @type string $pid Default Post ID. |
|
| 92 | - * @type string $preview Todo Desc needed. |
|
| 93 | - * @type string $add_listing_page_id Add listing page ID. |
|
| 94 | - * @type string $post_title Listing title. |
|
| 95 | - * @type string $post_desc Listing Description. |
|
| 96 | - * @type string $post_tags Listing tags. |
|
| 97 | - * @type array $cat_limit Category limit. |
|
| 98 | - * @type array $post_category Category IDs. |
|
| 99 | - * @type array $post_category_str Category string. |
|
| 100 | - * @type string $post_default_category Default category ID. |
|
| 101 | - * @type string $post_address Listing address. |
|
| 102 | - * @type string $geodir_location_add_listing_country_val Add listing country value. |
|
| 103 | - * @type string $post_country Listing country. |
|
| 104 | - * @type string $geodir_location_add_listing_region_val Add listing region value. |
|
| 105 | - * @type string $post_region Listing region. |
|
| 106 | - * @type string $geodir_location_add_listing_city_val Add listing city value. |
|
| 107 | - * @type string $post_city Listing city. |
|
| 108 | - * @type string $post_zip Listing zip. |
|
| 109 | - * @type string $post_latitude Listing latitude. |
|
| 110 | - * @type string $post_longitude Listing longitude. |
|
| 111 | - * @type string $post_mapview Listing mapview. Default "ROADMAP". |
|
| 112 | - * @type string $post_mapzoom Listing mapzoom Default "9". |
|
| 113 | - * @type string $geodir_timing Business timing info. |
|
| 114 | - * @type string $geodir_contact Contact number. |
|
| 115 | - * @type string $geodir_email Business contact email. |
|
| 116 | - * @type string $geodir_website Business website. |
|
| 117 | - * @type string $geodir_twitter Twitter link. |
|
| 118 | - * @type string $geodir_facebook Facebook link. |
|
| 119 | - * @type string $geodir_video Video link. |
|
| 120 | - * @type string $geodir_special_offers Special offers. |
|
| 121 | - * @type string $post_images Post image urls. |
|
| 122 | - * @type string $post_imagesimage_limit Post images limit. |
|
| 123 | - * @type string $post_imagestotImg Todo Desc needed. |
|
| 124 | - * @type string $geodir_accept_term_condition Has accepted terms and conditions?. |
|
| 125 | - * @type string $geodir_spamblocker Todo Desc needed. |
|
| 126 | - * @type string $geodir_filled_by_spam_bot Todo Desc needed. |
|
| 127 | - * |
|
| 128 | - * } |
|
| 129 | - * @param bool $dummy Optional. Is this a dummy listing? Default false. |
|
| 130 | - * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false. |
|
| 131 | - * @return int|string|WP_Error Created post id or WP_Error on failure. |
|
| 132 | - */ |
|
| 133 | - function geodir_save_listing($request_info = array(), $dummy = false, $wp_error = false) |
|
| 134 | - {
|
|
| 135 | - global $wpdb, $current_user, $gd_session; |
|
| 136 | - |
|
| 137 | - $last_post_id = ''; |
|
| 138 | - |
|
| 139 | - if ($gd_session->get('listing') && !$dummy) {
|
|
| 140 | - $request_info = array(); |
|
| 141 | - $request_session = $gd_session->get('listing');
|
|
| 142 | - $request_info = array_merge($_REQUEST, $request_session); |
|
| 143 | - } else if (!$gd_session->get('listing') && !$dummy) {
|
|
| 144 | - global $post; |
|
| 73 | + /** |
|
| 74 | + * Saves listing in the database using given information. |
|
| 75 | + * |
|
| 76 | + * @since 1.0.0 |
|
| 77 | + * @since 1.5.4 New parameter $wp_error added. |
|
| 78 | + * @since 1.6.18 Admin use only date field should not lost value if saved by user - FIXED |
|
| 79 | + * @package GeoDirectory |
|
| 80 | + * @global object $wpdb WordPress Database object. |
|
| 81 | + * @global object $post The current post object. |
|
| 82 | + * @global object $current_user Current user object. |
|
| 83 | + * @global object $gd_session GeoDirectory Session object. |
|
| 84 | + * @param array $request_info {
|
|
| 85 | + * Array of request info arguments. |
|
| 86 | + * |
|
| 87 | + * @type string $action Ajax action name. |
|
| 88 | + * @type string $geodir_ajax Ajax type. |
|
| 89 | + * @type string $ajax_action Ajax action. |
|
| 90 | + * @type string $listing_type Listing type. |
|
| 91 | + * @type string $pid Default Post ID. |
|
| 92 | + * @type string $preview Todo Desc needed. |
|
| 93 | + * @type string $add_listing_page_id Add listing page ID. |
|
| 94 | + * @type string $post_title Listing title. |
|
| 95 | + * @type string $post_desc Listing Description. |
|
| 96 | + * @type string $post_tags Listing tags. |
|
| 97 | + * @type array $cat_limit Category limit. |
|
| 98 | + * @type array $post_category Category IDs. |
|
| 99 | + * @type array $post_category_str Category string. |
|
| 100 | + * @type string $post_default_category Default category ID. |
|
| 101 | + * @type string $post_address Listing address. |
|
| 102 | + * @type string $geodir_location_add_listing_country_val Add listing country value. |
|
| 103 | + * @type string $post_country Listing country. |
|
| 104 | + * @type string $geodir_location_add_listing_region_val Add listing region value. |
|
| 105 | + * @type string $post_region Listing region. |
|
| 106 | + * @type string $geodir_location_add_listing_city_val Add listing city value. |
|
| 107 | + * @type string $post_city Listing city. |
|
| 108 | + * @type string $post_zip Listing zip. |
|
| 109 | + * @type string $post_latitude Listing latitude. |
|
| 110 | + * @type string $post_longitude Listing longitude. |
|
| 111 | + * @type string $post_mapview Listing mapview. Default "ROADMAP". |
|
| 112 | + * @type string $post_mapzoom Listing mapzoom Default "9". |
|
| 113 | + * @type string $geodir_timing Business timing info. |
|
| 114 | + * @type string $geodir_contact Contact number. |
|
| 115 | + * @type string $geodir_email Business contact email. |
|
| 116 | + * @type string $geodir_website Business website. |
|
| 117 | + * @type string $geodir_twitter Twitter link. |
|
| 118 | + * @type string $geodir_facebook Facebook link. |
|
| 119 | + * @type string $geodir_video Video link. |
|
| 120 | + * @type string $geodir_special_offers Special offers. |
|
| 121 | + * @type string $post_images Post image urls. |
|
| 122 | + * @type string $post_imagesimage_limit Post images limit. |
|
| 123 | + * @type string $post_imagestotImg Todo Desc needed. |
|
| 124 | + * @type string $geodir_accept_term_condition Has accepted terms and conditions?. |
|
| 125 | + * @type string $geodir_spamblocker Todo Desc needed. |
|
| 126 | + * @type string $geodir_filled_by_spam_bot Todo Desc needed. |
|
| 127 | + * |
|
| 128 | + * } |
|
| 129 | + * @param bool $dummy Optional. Is this a dummy listing? Default false. |
|
| 130 | + * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false. |
|
| 131 | + * @return int|string|WP_Error Created post id or WP_Error on failure. |
|
| 132 | + */ |
|
| 133 | + function geodir_save_listing($request_info = array(), $dummy = false, $wp_error = false) |
|
| 134 | + {
|
|
| 135 | + global $wpdb, $current_user, $gd_session; |
|
| 136 | + |
|
| 137 | + $last_post_id = ''; |
|
| 138 | + |
|
| 139 | + if ($gd_session->get('listing') && !$dummy) {
|
|
| 140 | + $request_info = array(); |
|
| 141 | + $request_session = $gd_session->get('listing');
|
|
| 142 | + $request_info = array_merge($_REQUEST, $request_session); |
|
| 143 | + } else if (!$gd_session->get('listing') && !$dummy) {
|
|
| 144 | + global $post; |
|
| 145 | 145 | |
| 146 | - $gd_post = $post; |
|
| 147 | - if (!empty($gd_post) && is_array($gd_post)) {
|
|
| 148 | - $gd_post = (object)$post; |
|
| 146 | + $gd_post = $post; |
|
| 147 | + if (!empty($gd_post) && is_array($gd_post)) {
|
|
| 148 | + $gd_post = (object)$post; |
|
| 149 | 149 | |
| 150 | - // Fix WPML duplicate. |
|
| 151 | - if (geodir_is_wpml() && !empty($request_info['action']) && $request_info['action'] == 'editpost' && !empty($request_info['icl_trid']) && !isset($post['post_date'])) {
|
|
| 152 | - return false; |
|
| 153 | - } |
|
| 154 | - } |
|
| 150 | + // Fix WPML duplicate. |
|
| 151 | + if (geodir_is_wpml() && !empty($request_info['action']) && $request_info['action'] == 'editpost' && !empty($request_info['icl_trid']) && !isset($post['post_date'])) {
|
|
| 152 | + return false; |
|
| 153 | + } |
|
| 154 | + } |
|
| 155 | 155 | |
| 156 | - $request_info['pid'] = !empty($gd_post->ID) ? $gd_post->ID : (!empty($request_info['post_id']) ? $request_info['post_id'] : NULL); |
|
| 157 | - $request_info['post_title'] = $request_info['post_title']; |
|
| 158 | - $request_info['listing_type'] = !empty($gd_post->post_type) ? $gd_post->post_type : (!empty($request_info['post_type']) ? $request_info['post_type'] : get_post_type($request_info['pid'])); |
|
| 159 | - $request_info['post_desc'] = $request_info['content']; |
|
| 160 | - } else if (!$dummy) {
|
|
| 161 | - return false; |
|
| 162 | - } |
|
| 163 | - |
|
| 164 | - /** |
|
| 165 | - * Filter the request_info array. |
|
| 166 | - * |
|
| 167 | - * You can use this filter to modify request_info array. |
|
| 168 | - * |
|
| 169 | - * @since 1.0.0 |
|
| 170 | - * @package GeoDirectory |
|
| 171 | - * @param array $request_info See {@see geodir_save_listing()} for accepted args.
|
|
| 172 | - */ |
|
| 173 | - $request_info = apply_filters('geodir_action_get_request_info', $request_info);
|
|
| 174 | - |
|
| 175 | - // Check if we need to save post location as new location |
|
| 176 | - $location_result = geodir_get_default_location(); |
|
| 177 | - |
|
| 178 | - if ($location_result->location_id > 0) {
|
|
| 179 | - if (isset($request_info['post_city']) && isset($request_info['post_region'])) {
|
|
| 180 | - $request_info['post_location'] = array( |
|
| 181 | - 'city' => $request_info['post_city'], |
|
| 182 | - 'region' => isset($request_info['post_region']) ? $request_info['post_region'] : '', |
|
| 183 | - 'country' => isset($request_info['post_country']) ? $request_info['post_country'] : '', |
|
| 184 | - 'geo_lat' => isset($request_info['post_latitude']) ? $request_info['post_latitude'] : '', |
|
| 185 | - 'geo_lng' => isset($request_info['post_longitude']) ? $request_info['post_longitude'] : '' |
|
| 186 | - ); |
|
| 187 | - |
|
| 188 | - $post_location_info = $request_info['post_location']; |
|
| 189 | - |
|
| 190 | - if ($location_id = geodir_add_new_location($post_location_info)) {
|
|
| 191 | - $post_location_id = $location_id; |
|
| 192 | - } |
|
| 193 | - } else {
|
|
| 194 | - $post_location_id = $location_result->location_id; |
|
| 195 | - } |
|
| 196 | - } else {
|
|
| 197 | - $post_location_id = $location_result->location_id; |
|
| 198 | - } |
|
| 199 | - |
|
| 200 | - if ($dummy) {
|
|
| 201 | - $post_status = 'publish'; |
|
| 202 | - } else {
|
|
| 203 | - $post_status = geodir_new_post_default_status(); |
|
| 204 | - } |
|
| 205 | - |
|
| 206 | - if (isset($request_info['pid']) && $request_info['pid'] != '') {
|
|
| 207 | - $post_status = get_post_status($request_info['pid']); |
|
| 208 | - } |
|
| 209 | - |
|
| 210 | - /* fix change of slug on every title edit */ |
|
| 211 | - if (!isset($request_info['post_name'])) {
|
|
| 212 | - $request_info['post_name'] = $request_info['post_title']; |
|
| 213 | - |
|
| 214 | - if (!empty($request_info['pid'])) {
|
|
| 215 | - $post_info = get_post($request_info['pid']); |
|
| 216 | - |
|
| 217 | - if (!empty($post_info) && isset($post_info->post_name)) {
|
|
| 218 | - $request_info['post_name'] = $post_info->post_name; |
|
| 219 | - } |
|
| 220 | - } |
|
| 221 | - } |
|
| 222 | - |
|
| 223 | - $post = array( |
|
| 224 | - 'post_content' => $request_info['post_desc'], |
|
| 225 | - 'post_status' => $post_status, |
|
| 226 | - 'post_title' => $request_info['post_title'], |
|
| 227 | - 'post_name' => $request_info['post_name'], |
|
| 228 | - 'post_type' => $request_info['listing_type'] |
|
| 229 | - ); |
|
| 230 | - |
|
| 231 | - /** |
|
| 232 | - * Called before a listing is saved to the database. |
|
| 233 | - * |
|
| 234 | - * @since 1.0.0 |
|
| 235 | - * @param object $post The post object. |
|
| 236 | - */ |
|
| 237 | - do_action_ref_array('geodir_before_save_listing', $post);
|
|
| 156 | + $request_info['pid'] = !empty($gd_post->ID) ? $gd_post->ID : (!empty($request_info['post_id']) ? $request_info['post_id'] : NULL); |
|
| 157 | + $request_info['post_title'] = $request_info['post_title']; |
|
| 158 | + $request_info['listing_type'] = !empty($gd_post->post_type) ? $gd_post->post_type : (!empty($request_info['post_type']) ? $request_info['post_type'] : get_post_type($request_info['pid'])); |
|
| 159 | + $request_info['post_desc'] = $request_info['content']; |
|
| 160 | + } else if (!$dummy) {
|
|
| 161 | + return false; |
|
| 162 | + } |
|
| 163 | + |
|
| 164 | + /** |
|
| 165 | + * Filter the request_info array. |
|
| 166 | + * |
|
| 167 | + * You can use this filter to modify request_info array. |
|
| 168 | + * |
|
| 169 | + * @since 1.0.0 |
|
| 170 | + * @package GeoDirectory |
|
| 171 | + * @param array $request_info See {@see geodir_save_listing()} for accepted args.
|
|
| 172 | + */ |
|
| 173 | + $request_info = apply_filters('geodir_action_get_request_info', $request_info);
|
|
| 174 | + |
|
| 175 | + // Check if we need to save post location as new location |
|
| 176 | + $location_result = geodir_get_default_location(); |
|
| 177 | + |
|
| 178 | + if ($location_result->location_id > 0) {
|
|
| 179 | + if (isset($request_info['post_city']) && isset($request_info['post_region'])) {
|
|
| 180 | + $request_info['post_location'] = array( |
|
| 181 | + 'city' => $request_info['post_city'], |
|
| 182 | + 'region' => isset($request_info['post_region']) ? $request_info['post_region'] : '', |
|
| 183 | + 'country' => isset($request_info['post_country']) ? $request_info['post_country'] : '', |
|
| 184 | + 'geo_lat' => isset($request_info['post_latitude']) ? $request_info['post_latitude'] : '', |
|
| 185 | + 'geo_lng' => isset($request_info['post_longitude']) ? $request_info['post_longitude'] : '' |
|
| 186 | + ); |
|
| 187 | + |
|
| 188 | + $post_location_info = $request_info['post_location']; |
|
| 189 | + |
|
| 190 | + if ($location_id = geodir_add_new_location($post_location_info)) {
|
|
| 191 | + $post_location_id = $location_id; |
|
| 192 | + } |
|
| 193 | + } else {
|
|
| 194 | + $post_location_id = $location_result->location_id; |
|
| 195 | + } |
|
| 196 | + } else {
|
|
| 197 | + $post_location_id = $location_result->location_id; |
|
| 198 | + } |
|
| 238 | 199 | |
| 239 | - $send_post_submit_mail = false; |
|
| 200 | + if ($dummy) {
|
|
| 201 | + $post_status = 'publish'; |
|
| 202 | + } else {
|
|
| 203 | + $post_status = geodir_new_post_default_status(); |
|
| 204 | + } |
|
| 240 | 205 | |
| 241 | - // unhook this function so it doesn't loop infinitely |
|
| 242 | - remove_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 206 | + if (isset($request_info['pid']) && $request_info['pid'] != '') {
|
|
| 207 | + $post_status = get_post_status($request_info['pid']); |
|
| 208 | + } |
|
| 243 | 209 | |
| 244 | - if (isset($request_info['pid']) && $request_info['pid'] != '') {
|
|
| 245 | - $post['ID'] = $request_info['pid']; |
|
| 210 | + /* fix change of slug on every title edit */ |
|
| 211 | + if (!isset($request_info['post_name'])) {
|
|
| 212 | + $request_info['post_name'] = $request_info['post_title']; |
|
| 246 | 213 | |
| 247 | - $last_post_id = wp_update_post($post, $wp_error); |
|
| 248 | - } else {
|
|
| 249 | - $last_post_id = wp_insert_post($post, $wp_error); |
|
| 214 | + if (!empty($request_info['pid'])) {
|
|
| 215 | + $post_info = get_post($request_info['pid']); |
|
| 250 | 216 | |
| 251 | - if (!$dummy && $last_post_id) {
|
|
| 252 | - $send_post_submit_mail = true; // we move post_submit email from here so the rest of the variables are added to the db first(was breaking permalink in email) |
|
| 253 | - //geodir_sendEmail('','',$current_user->user_email,$current_user->display_name,'','',$request_info,'post_submit',$last_post_id,$current_user->ID);
|
|
| 254 | - } |
|
| 255 | - } |
|
| 217 | + if (!empty($post_info) && isset($post_info->post_name)) {
|
|
| 218 | + $request_info['post_name'] = $post_info->post_name; |
|
| 219 | + } |
|
| 220 | + } |
|
| 221 | + } |
|
| 222 | + |
|
| 223 | + $post = array( |
|
| 224 | + 'post_content' => $request_info['post_desc'], |
|
| 225 | + 'post_status' => $post_status, |
|
| 226 | + 'post_title' => $request_info['post_title'], |
|
| 227 | + 'post_name' => $request_info['post_name'], |
|
| 228 | + 'post_type' => $request_info['listing_type'] |
|
| 229 | + ); |
|
| 230 | + |
|
| 231 | + /** |
|
| 232 | + * Called before a listing is saved to the database. |
|
| 233 | + * |
|
| 234 | + * @since 1.0.0 |
|
| 235 | + * @param object $post The post object. |
|
| 236 | + */ |
|
| 237 | + do_action_ref_array('geodir_before_save_listing', $post);
|
|
| 238 | + |
|
| 239 | + $send_post_submit_mail = false; |
|
| 240 | + |
|
| 241 | + // unhook this function so it doesn't loop infinitely |
|
| 242 | + remove_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 243 | + |
|
| 244 | + if (isset($request_info['pid']) && $request_info['pid'] != '') {
|
|
| 245 | + $post['ID'] = $request_info['pid']; |
|
| 246 | + |
|
| 247 | + $last_post_id = wp_update_post($post, $wp_error); |
|
| 248 | + } else {
|
|
| 249 | + $last_post_id = wp_insert_post($post, $wp_error); |
|
| 250 | + |
|
| 251 | + if (!$dummy && $last_post_id) {
|
|
| 252 | + $send_post_submit_mail = true; // we move post_submit email from here so the rest of the variables are added to the db first(was breaking permalink in email) |
|
| 253 | + //geodir_sendEmail('','',$current_user->user_email,$current_user->display_name,'','',$request_info,'post_submit',$last_post_id,$current_user->ID);
|
|
| 254 | + } |
|
| 255 | + } |
|
| 256 | 256 | |
| 257 | - if ($wp_error && is_wp_error($last_post_id)) {
|
|
| 258 | - return $last_post_id; // Return WP_Error on save failure. |
|
| 259 | - } |
|
| 257 | + if ($wp_error && is_wp_error($last_post_id)) {
|
|
| 258 | + return $last_post_id; // Return WP_Error on save failure. |
|
| 259 | + } |
|
| 260 | 260 | |
| 261 | - if (!$last_post_id) {
|
|
| 262 | - return false; // Save failure. |
|
| 263 | - } |
|
| 261 | + if (!$last_post_id) {
|
|
| 262 | + return false; // Save failure. |
|
| 263 | + } |
|
| 264 | 264 | |
| 265 | - // re-hook this function |
|
| 266 | - add_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 265 | + // re-hook this function |
|
| 266 | + add_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 267 | 267 | |
| 268 | - $post_tags = ''; |
|
| 269 | - if (!isset($request_info['post_tags'])) {
|
|
| 268 | + $post_tags = ''; |
|
| 269 | + if (!isset($request_info['post_tags'])) {
|
|
| 270 | 270 | |
| 271 | - $post_type = $request_info['listing_type']; |
|
| 272 | - $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));
|
|
| 271 | + $post_type = $request_info['listing_type']; |
|
| 272 | + $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));
|
|
| 273 | 273 | |
| 274 | - } |
|
| 274 | + } |
|
| 275 | 275 | |
| 276 | - $gd_post_info = array( |
|
| 277 | - "post_title" => $request_info['post_title'], |
|
| 278 | - "post_tags" => isset($request_info['post_tags']) ? $request_info['post_tags'] : $post_tags, |
|
| 279 | - "post_status" => $post_status, |
|
| 280 | - "post_location_id" => $post_location_id, |
|
| 281 | - "claimed" => isset($request_info['claimed']) ? $request_info['claimed'] : '', |
|
| 282 | - "businesses" => isset($request_info['a_businesses']) ? $request_info['a_businesses'] : '', |
|
| 283 | - "submit_time" => time(), |
|
| 284 | - "submit_ip" => $_SERVER['REMOTE_ADDR'], |
|
| 285 | - ); |
|
| 276 | + $gd_post_info = array( |
|
| 277 | + "post_title" => $request_info['post_title'], |
|
| 278 | + "post_tags" => isset($request_info['post_tags']) ? $request_info['post_tags'] : $post_tags, |
|
| 279 | + "post_status" => $post_status, |
|
| 280 | + "post_location_id" => $post_location_id, |
|
| 281 | + "claimed" => isset($request_info['claimed']) ? $request_info['claimed'] : '', |
|
| 282 | + "businesses" => isset($request_info['a_businesses']) ? $request_info['a_businesses'] : '', |
|
| 283 | + "submit_time" => time(), |
|
| 284 | + "submit_ip" => $_SERVER['REMOTE_ADDR'], |
|
| 285 | + ); |
|
| 286 | 286 | |
| 287 | - $payment_info = array(); |
|
| 288 | - $package_info = array(); |
|
| 287 | + $payment_info = array(); |
|
| 288 | + $package_info = array(); |
|
| 289 | 289 | |
| 290 | - $package_info = (array)geodir_post_package_info($package_info, $post); |
|
| 290 | + $package_info = (array)geodir_post_package_info($package_info, $post); |
|
| 291 | 291 | |
| 292 | - $post_package_id = geodir_get_post_meta($last_post_id, 'package_id'); |
|
| 292 | + $post_package_id = geodir_get_post_meta($last_post_id, 'package_id'); |
|
| 293 | 293 | |
| 294 | - if (!empty($package_info) && !$post_package_id) {
|
|
| 295 | - if (isset($package_info['days']) && $package_info['days'] != 0) {
|
|
| 296 | - $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));
|
|
| 297 | - } else {
|
|
| 298 | - $payment_info['expire_date'] = 'Never'; |
|
| 299 | - } |
|
| 294 | + if (!empty($package_info) && !$post_package_id) {
|
|
| 295 | + if (isset($package_info['days']) && $package_info['days'] != 0) {
|
|
| 296 | + $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));
|
|
| 297 | + } else {
|
|
| 298 | + $payment_info['expire_date'] = 'Never'; |
|
| 299 | + } |
|
| 300 | 300 | |
| 301 | - $payment_info['package_id'] = $package_info['pid']; |
|
| 302 | - $payment_info['alive_days'] = $package_info['days']; |
|
| 303 | - $payment_info['is_featured'] = $package_info['is_featured']; |
|
| 301 | + $payment_info['package_id'] = $package_info['pid']; |
|
| 302 | + $payment_info['alive_days'] = $package_info['days']; |
|
| 303 | + $payment_info['is_featured'] = $package_info['is_featured']; |
|
| 304 | 304 | |
| 305 | - $gd_post_info = array_merge($gd_post_info, $payment_info); |
|
| 306 | - } |
|
| 305 | + $gd_post_info = array_merge($gd_post_info, $payment_info); |
|
| 306 | + } |
|
| 307 | 307 | |
| 308 | - $custom_metaboxes = geodir_post_custom_fields('', 'all', $request_info['listing_type']);
|
|
| 308 | + $custom_metaboxes = geodir_post_custom_fields('', 'all', $request_info['listing_type']);
|
|
| 309 | 309 | |
| 310 | - foreach ($custom_metaboxes as $key => $val): |
|
| 310 | + foreach ($custom_metaboxes as $key => $val): |
|
| 311 | 311 | |
| 312 | - $name = $val['name']; |
|
| 313 | - $type = $val['type']; |
|
| 314 | - $extrafields = $val['extra_fields']; |
|
| 312 | + $name = $val['name']; |
|
| 313 | + $type = $val['type']; |
|
| 314 | + $extrafields = $val['extra_fields']; |
|
| 315 | 315 | |
| 316 | - if (trim($type) == 'address') {
|
|
| 317 | - $prefix = $name . '_'; |
|
| 318 | - $address = $prefix . 'address'; |
|
| 316 | + if (trim($type) == 'address') {
|
|
| 317 | + $prefix = $name . '_'; |
|
| 318 | + $address = $prefix . 'address'; |
|
| 319 | 319 | |
| 320 | - if (isset($request_info[$address]) && $request_info[$address] != '') {
|
|
| 321 | - $gd_post_info[$address] = wp_slash($request_info[$address]); |
|
| 322 | - } |
|
| 320 | + if (isset($request_info[$address]) && $request_info[$address] != '') {
|
|
| 321 | + $gd_post_info[$address] = wp_slash($request_info[$address]); |
|
| 322 | + } |
|
| 323 | 323 | |
| 324 | - if ($extrafields != '') {
|
|
| 325 | - $extrafields = unserialize($extrafields); |
|
| 324 | + if ($extrafields != '') {
|
|
| 325 | + $extrafields = unserialize($extrafields); |
|
| 326 | 326 | |
| 327 | 327 | |
| 328 | - if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {
|
|
| 328 | + if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {
|
|
| 329 | 329 | |
| 330 | - $location_result = geodir_get_default_location(); |
|
| 330 | + $location_result = geodir_get_default_location(); |
|
| 331 | 331 | |
| 332 | - $gd_post_info[$prefix . 'city'] = $location_result->city; |
|
| 333 | - $gd_post_info[$prefix . 'region'] = $location_result->region; |
|
| 334 | - $gd_post_info[$prefix . 'country'] = $location_result->country; |
|
| 332 | + $gd_post_info[$prefix . 'city'] = $location_result->city; |
|
| 333 | + $gd_post_info[$prefix . 'region'] = $location_result->region; |
|
| 334 | + $gd_post_info[$prefix . 'country'] = $location_result->country; |
|
| 335 | 335 | |
| 336 | - $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 336 | + $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 337 | 337 | |
| 338 | - } else {
|
|
| 338 | + } else {
|
|
| 339 | 339 | |
| 340 | - $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city']; |
|
| 341 | - $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region']; |
|
| 342 | - $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country']; |
|
| 340 | + $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city']; |
|
| 341 | + $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region']; |
|
| 342 | + $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country']; |
|
| 343 | 343 | |
| 344 | - //----------set post locations when import dummy data------- |
|
| 345 | - $location_result = geodir_get_default_location(); |
|
| 344 | + //----------set post locations when import dummy data------- |
|
| 345 | + $location_result = geodir_get_default_location(); |
|
| 346 | 346 | |
| 347 | - $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 348 | - //----------------------------------------------------------------- |
|
| 347 | + $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 348 | + //----------------------------------------------------------------- |
|
| 349 | 349 | |
| 350 | - } |
|
| 350 | + } |
|
| 351 | 351 | |
| 352 | 352 | |
| 353 | - if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {
|
|
| 354 | - $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip']; |
|
| 355 | - } |
|
| 353 | + if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {
|
|
| 354 | + $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip']; |
|
| 355 | + } |
|
| 356 | 356 | |
| 357 | 357 | |
| 358 | - if (isset($extrafields['show_map']) && $extrafields['show_map']) {
|
|
| 358 | + if (isset($extrafields['show_map']) && $extrafields['show_map']) {
|
|
| 359 | 359 | |
| 360 | - if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {
|
|
| 361 | - $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude']; |
|
| 362 | - } |
|
| 360 | + if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {
|
|
| 361 | + $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude']; |
|
| 362 | + } |
|
| 363 | 363 | |
| 364 | - if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {
|
|
| 365 | - $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude']; |
|
| 366 | - } |
|
| 364 | + if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {
|
|
| 365 | + $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude']; |
|
| 366 | + } |
|
| 367 | 367 | |
| 368 | - if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {
|
|
| 369 | - $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview']; |
|
| 370 | - } |
|
| 368 | + if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {
|
|
| 369 | + $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview']; |
|
| 370 | + } |
|
| 371 | 371 | |
| 372 | - if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {
|
|
| 373 | - $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom']; |
|
| 374 | - } |
|
| 372 | + if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {
|
|
| 373 | + $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom']; |
|
| 374 | + } |
|
| 375 | 375 | |
| 376 | - } |
|
| 376 | + } |
|
| 377 | 377 | |
| 378 | - // show lat lng |
|
| 379 | - if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {
|
|
| 380 | - $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng']; |
|
| 381 | - } |
|
| 382 | - } |
|
| 378 | + // show lat lng |
|
| 379 | + if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {
|
|
| 380 | + $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng']; |
|
| 381 | + } |
|
| 382 | + } |
|
| 383 | 383 | |
| 384 | - } elseif (trim($type) == 'file') {
|
|
| 385 | - if (isset($request_info[$name])) {
|
|
| 386 | - $request_files = array(); |
|
| 387 | - if ($request_info[$name] != '') |
|
| 388 | - $request_files = explode(",", $request_info[$name]);
|
|
| 384 | + } elseif (trim($type) == 'file') {
|
|
| 385 | + if (isset($request_info[$name])) {
|
|
| 386 | + $request_files = array(); |
|
| 387 | + if ($request_info[$name] != '') |
|
| 388 | + $request_files = explode(",", $request_info[$name]);
|
|
| 389 | 389 | |
| 390 | - $extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL; |
|
| 391 | - geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields); |
|
| 392 | - } |
|
| 393 | - } elseif (trim($type) == 'datepicker') {
|
|
| 394 | - if (isset($request_info[$name])) {
|
|
| 395 | - $datetime = ''; |
|
| 390 | + $extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL; |
|
| 391 | + geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields); |
|
| 392 | + } |
|
| 393 | + } elseif (trim($type) == 'datepicker') {
|
|
| 394 | + if (isset($request_info[$name])) {
|
|
| 395 | + $datetime = ''; |
|
| 396 | 396 | |
| 397 | - if (!empty($request_info[$name])) {
|
|
| 398 | - $date_format = geodir_default_date_format(); |
|
| 399 | - if (isset($val['extra_fields']) && $val['extra_fields'] != '') {
|
|
| 400 | - $extra_fields = unserialize($val['extra_fields']); |
|
| 401 | - $date_format = isset($extra_fields['date_format']) && $extra_fields['date_format'] != '' ? $extra_fields['date_format'] : $date_format; |
|
| 402 | - } |
|
| 403 | - |
|
| 404 | - // check if we need to change the format or not |
|
| 405 | - $date_format_len = strlen(str_replace(' ', '', $date_format));
|
|
| 406 | - if($date_format_len>5){// if greater then 5 then it's the old style format.
|
|
| 397 | + if (!empty($request_info[$name])) {
|
|
| 398 | + $date_format = geodir_default_date_format(); |
|
| 399 | + if (isset($val['extra_fields']) && $val['extra_fields'] != '') {
|
|
| 400 | + $extra_fields = unserialize($val['extra_fields']); |
|
| 401 | + $date_format = isset($extra_fields['date_format']) && $extra_fields['date_format'] != '' ? $extra_fields['date_format'] : $date_format; |
|
| 402 | + } |
|
| 403 | + |
|
| 404 | + // check if we need to change the format or not |
|
| 405 | + $date_format_len = strlen(str_replace(' ', '', $date_format));
|
|
| 406 | + if($date_format_len>5){// if greater then 5 then it's the old style format.
|
|
| 407 | 407 | |
| 408 | - $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
|
|
| 409 | - $replace = array('d','j','l','m','n','F','Y');//PHP date format
|
|
| 408 | + $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
|
|
| 409 | + $replace = array('d','j','l','m','n','F','Y');//PHP date format
|
|
| 410 | 410 | |
| 411 | - $date_format = str_replace($search, $replace, $date_format); |
|
| 411 | + $date_format = str_replace($search, $replace, $date_format); |
|
| 412 | 412 | |
| 413 | - $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
|
|
| 413 | + $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
|
|
| 414 | 414 | |
| 415 | - }else{
|
|
| 416 | - $post_htmlvar_value = $request_info[$name]; |
|
| 417 | - } |
|
| 415 | + }else{
|
|
| 416 | + $post_htmlvar_value = $request_info[$name]; |
|
| 417 | + } |
|
| 418 | 418 | |
| 419 | - $post_htmlvar_value = geodir_date($post_htmlvar_value, 'Y-m-d', $date_format); // save as sql format Y-m-d |
|
| 420 | - $datetime = geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated |
|
| 421 | - } |
|
| 419 | + $post_htmlvar_value = geodir_date($post_htmlvar_value, 'Y-m-d', $date_format); // save as sql format Y-m-d |
|
| 420 | + $datetime = geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated |
|
| 421 | + } |
|
| 422 | 422 | |
| 423 | - $gd_post_info[$name] = $datetime; |
|
| 424 | - } |
|
| 425 | - } else if ($type == 'multiselect') {
|
|
| 426 | - if (isset($request_info[$name])) {
|
|
| 427 | - $gd_post_info[$name] = $request_info[$name]; |
|
| 428 | - } else {
|
|
| 429 | - if (isset($request_info['gd_field_' . $name])) {
|
|
| 430 | - $gd_post_info[$name] = ''; /* fix de-select for multiselect */ |
|
| 431 | - } |
|
| 432 | - } |
|
| 433 | - } else if (isset($request_info[$name])) {
|
|
| 434 | - $gd_post_info[$name] = $request_info[$name]; |
|
| 435 | - } |
|
| 423 | + $gd_post_info[$name] = $datetime; |
|
| 424 | + } |
|
| 425 | + } else if ($type == 'multiselect') {
|
|
| 426 | + if (isset($request_info[$name])) {
|
|
| 427 | + $gd_post_info[$name] = $request_info[$name]; |
|
| 428 | + } else {
|
|
| 429 | + if (isset($request_info['gd_field_' . $name])) {
|
|
| 430 | + $gd_post_info[$name] = ''; /* fix de-select for multiselect */ |
|
| 431 | + } |
|
| 432 | + } |
|
| 433 | + } else if (isset($request_info[$name])) {
|
|
| 434 | + $gd_post_info[$name] = $request_info[$name]; |
|
| 435 | + } |
|
| 436 | 436 | |
| 437 | - endforeach; |
|
| 437 | + endforeach; |
|
| 438 | 438 | |
| 439 | - if (isset($request_info['post_dummy']) && $request_info['post_dummy'] != '') {
|
|
| 440 | - $gd_post_info['post_dummy'] = $request_info['post_dummy']; |
|
| 441 | - } |
|
| 439 | + if (isset($request_info['post_dummy']) && $request_info['post_dummy'] != '') {
|
|
| 440 | + $gd_post_info['post_dummy'] = $request_info['post_dummy']; |
|
| 441 | + } |
|
| 442 | 442 | |
| 443 | - // Save post detail info in detail table |
|
| 444 | - if (!empty($gd_post_info)) {
|
|
| 445 | - geodir_save_post_info($last_post_id, $gd_post_info); |
|
| 446 | - } |
|
| 443 | + // Save post detail info in detail table |
|
| 444 | + if (!empty($gd_post_info)) {
|
|
| 445 | + geodir_save_post_info($last_post_id, $gd_post_info); |
|
| 446 | + } |
|
| 447 | 447 | |
| 448 | 448 | |
| 449 | - // Set categories to the listing |
|
| 450 | - if (isset($request_info['post_category']) && !empty($request_info['post_category'])) {
|
|
| 451 | - $post_category = array(); |
|
| 449 | + // Set categories to the listing |
|
| 450 | + if (isset($request_info['post_category']) && !empty($request_info['post_category'])) {
|
|
| 451 | + $post_category = array(); |
|
| 452 | 452 | |
| 453 | - foreach ($request_info['post_category'] as $taxonomy => $cat) {
|
|
| 453 | + foreach ($request_info['post_category'] as $taxonomy => $cat) {
|
|
| 454 | 454 | |
| 455 | - if ($dummy) |
|
| 456 | - $post_category = $cat; |
|
| 457 | - else {
|
|
| 455 | + if ($dummy) |
|
| 456 | + $post_category = $cat; |
|
| 457 | + else {
|
|
| 458 | 458 | |
| 459 | - if (!is_array($cat) && strstr($cat, ',')) |
|
| 460 | - $cat = explode(',', $cat);
|
|
| 459 | + if (!is_array($cat) && strstr($cat, ',')) |
|
| 460 | + $cat = explode(',', $cat);
|
|
| 461 | 461 | |
| 462 | - if (!empty($cat) && is_array($cat)) |
|
| 463 | - $post_category = array_map('intval', $cat);
|
|
| 464 | - } |
|
| 462 | + if (!empty($cat) && is_array($cat)) |
|
| 463 | + $post_category = array_map('intval', $cat);
|
|
| 464 | + } |
|
| 465 | 465 | |
| 466 | - wp_set_object_terms($last_post_id, $post_category, $taxonomy); |
|
| 467 | - } |
|
| 466 | + wp_set_object_terms($last_post_id, $post_category, $taxonomy); |
|
| 467 | + } |
|
| 468 | 468 | |
| 469 | - $post_default_category = isset($request_info['post_default_category']) ? $request_info['post_default_category'] : ''; |
|
| 469 | + $post_default_category = isset($request_info['post_default_category']) ? $request_info['post_default_category'] : ''; |
|
| 470 | 470 | |
| 471 | - $post_category_str = isset($request_info['post_category_str']) ? $request_info['post_category_str'] : ''; |
|
| 472 | - geodir_set_postcat_structure($last_post_id, $taxonomy, $post_default_category, $post_category_str); |
|
| 471 | + $post_category_str = isset($request_info['post_category_str']) ? $request_info['post_category_str'] : ''; |
|
| 472 | + geodir_set_postcat_structure($last_post_id, $taxonomy, $post_default_category, $post_category_str); |
|
| 473 | 473 | |
| 474 | - } |
|
| 474 | + } |
|
| 475 | 475 | |
| 476 | - $post_tags = ''; |
|
| 477 | - // Set tags to the listing |
|
| 478 | - if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {
|
|
| 479 | - $post_tags = explode(",", $request_info['post_tags']);
|
|
| 480 | - } elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {
|
|
| 481 | - if ($dummy) |
|
| 482 | - $post_tags = $request_info['post_tags']; |
|
| 483 | - } else {
|
|
| 484 | - if ($dummy) |
|
| 485 | - $post_tags = array($request_info['post_title']); |
|
| 486 | - } |
|
| 476 | + $post_tags = ''; |
|
| 477 | + // Set tags to the listing |
|
| 478 | + if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {
|
|
| 479 | + $post_tags = explode(",", $request_info['post_tags']);
|
|
| 480 | + } elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {
|
|
| 481 | + if ($dummy) |
|
| 482 | + $post_tags = $request_info['post_tags']; |
|
| 483 | + } else {
|
|
| 484 | + if ($dummy) |
|
| 485 | + $post_tags = array($request_info['post_title']); |
|
| 486 | + } |
|
| 487 | 487 | |
| 488 | - if (is_array($post_tags)) {
|
|
| 489 | - $taxonomy = $request_info['listing_type'] . '_tags'; |
|
| 490 | - wp_set_object_terms($last_post_id, $post_tags, $taxonomy); |
|
| 491 | - } |
|
| 488 | + if (is_array($post_tags)) {
|
|
| 489 | + $taxonomy = $request_info['listing_type'] . '_tags'; |
|
| 490 | + wp_set_object_terms($last_post_id, $post_tags, $taxonomy); |
|
| 491 | + } |
|
| 492 | 492 | |
| 493 | 493 | |
| 494 | - // Insert attachment |
|
| 494 | + // Insert attachment |
|
| 495 | 495 | |
| 496 | - if (isset($request_info['post_images']) && !is_wp_error($last_post_id)) {
|
|
| 497 | - if (!$dummy) {
|
|
| 498 | - $tmpimgArr = trim($request_info['post_images'], ","); |
|
| 499 | - $tmpimgArr = explode(",", $tmpimgArr);
|
|
| 500 | - geodir_save_post_images($last_post_id, $tmpimgArr, $dummy); |
|
| 501 | - } else{
|
|
| 502 | - geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy); |
|
| 503 | - } |
|
| 496 | + if (isset($request_info['post_images']) && !is_wp_error($last_post_id)) {
|
|
| 497 | + if (!$dummy) {
|
|
| 498 | + $tmpimgArr = trim($request_info['post_images'], ","); |
|
| 499 | + $tmpimgArr = explode(",", $tmpimgArr);
|
|
| 500 | + geodir_save_post_images($last_post_id, $tmpimgArr, $dummy); |
|
| 501 | + } else{
|
|
| 502 | + geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy); |
|
| 503 | + } |
|
| 504 | 504 | |
| 505 | 505 | |
| 506 | - } elseif (!isset($request_info['post_images']) || $request_info['post_images'] == '') {
|
|
| 506 | + } elseif (!isset($request_info['post_images']) || $request_info['post_images'] == '') {
|
|
| 507 | 507 | |
| 508 | - /* Delete Attachments |
|
| 508 | + /* Delete Attachments |
|
| 509 | 509 | $postcurr_images = geodir_get_images($last_post_id); |
| 510 | 510 | |
| 511 | 511 | $wpdb->query( |
@@ -521,34 +521,34 @@ discard block |
||
| 521 | 521 | geodir_save_post_info($last_post_id, $gd_post_featured_img); |
| 522 | 522 | */ |
| 523 | 523 | |
| 524 | - } |
|
| 524 | + } |
|
| 525 | 525 | |
| 526 | - geodir_remove_temp_images(); |
|
| 527 | - geodir_set_wp_featured_image($last_post_id); |
|
| 526 | + geodir_remove_temp_images(); |
|
| 527 | + geodir_set_wp_featured_image($last_post_id); |
|
| 528 | 528 | |
| 529 | - /** |
|
| 530 | - * Called after a listing is saved to the database and before any email have been sent. |
|
| 531 | - * |
|
| 532 | - * @since 1.0.0 |
|
| 533 | - * @param int $last_post_id The saved post ID. |
|
| 534 | - * @param array $request_info The post details in an array. |
|
| 535 | - * @see 'geodir_after_save_listinginfo' |
|
| 536 | - */ |
|
| 537 | - do_action('geodir_after_save_listing', $last_post_id, $request_info);
|
|
| 529 | + /** |
|
| 530 | + * Called after a listing is saved to the database and before any email have been sent. |
|
| 531 | + * |
|
| 532 | + * @since 1.0.0 |
|
| 533 | + * @param int $last_post_id The saved post ID. |
|
| 534 | + * @param array $request_info The post details in an array. |
|
| 535 | + * @see 'geodir_after_save_listinginfo' |
|
| 536 | + */ |
|
| 537 | + do_action('geodir_after_save_listing', $last_post_id, $request_info);
|
|
| 538 | 538 | |
| 539 | - //die; |
|
| 539 | + //die; |
|
| 540 | 540 | |
| 541 | - if ($send_post_submit_mail) { // if new post send out email
|
|
| 542 | - $to_name = geodir_get_client_name($current_user->ID); |
|
| 543 | - geodir_sendEmail('', '', $current_user->user_email, $to_name, '', '', $request_info, 'post_submit', $last_post_id, $current_user->ID);
|
|
| 544 | - } |
|
| 545 | - /* |
|
| 541 | + if ($send_post_submit_mail) { // if new post send out email
|
|
| 542 | + $to_name = geodir_get_client_name($current_user->ID); |
|
| 543 | + geodir_sendEmail('', '', $current_user->user_email, $to_name, '', '', $request_info, 'post_submit', $last_post_id, $current_user->ID);
|
|
| 544 | + } |
|
| 545 | + /* |
|
| 546 | 546 | * Unset the session so we don't loop. |
| 547 | 547 | */ |
| 548 | - $gd_session->un_set('listing');
|
|
| 549 | - return $last_post_id; |
|
| 548 | + $gd_session->un_set('listing');
|
|
| 549 | + return $last_post_id; |
|
| 550 | 550 | |
| 551 | - } |
|
| 551 | + } |
|
| 552 | 552 | |
| 553 | 553 | } |
| 554 | 554 | |
@@ -567,611 +567,611 @@ discard block |
||
| 567 | 567 | function geodir_get_post_info($post_id = '') |
| 568 | 568 | {
|
| 569 | 569 | |
| 570 | - global $wpdb, $plugin_prefix, $post, $post_info; |
|
| 570 | + global $wpdb, $plugin_prefix, $post, $post_info; |
|
| 571 | 571 | |
| 572 | - if ($post_id == '' && !empty($post)) |
|
| 573 | - $post_id = $post->ID; |
|
| 572 | + if ($post_id == '' && !empty($post)) |
|
| 573 | + $post_id = $post->ID; |
|
| 574 | 574 | |
| 575 | - $post_type = get_post_type($post_id); |
|
| 575 | + $post_type = get_post_type($post_id); |
|
| 576 | 576 | |
| 577 | - $all_postypes = geodir_get_posttypes(); |
|
| 577 | + $all_postypes = geodir_get_posttypes(); |
|
| 578 | 578 | |
| 579 | - if (!in_array($post_type, $all_postypes)) |
|
| 580 | - return false; |
|
| 579 | + if (!in_array($post_type, $all_postypes)) |
|
| 580 | + return false; |
|
| 581 | 581 | |
| 582 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 582 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 583 | 583 | |
| 584 | - /** |
|
| 585 | - * Apply Filter to change Post info |
|
| 586 | - * |
|
| 587 | - * You can use this filter to change Post info. |
|
| 588 | - * |
|
| 589 | - * @since 1.0.0 |
|
| 590 | - * @package GeoDirectory |
|
| 591 | - */ |
|
| 592 | - $query = apply_filters('geodir_post_info_query', $wpdb->prepare("SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd
|
|
| 584 | + /** |
|
| 585 | + * Apply Filter to change Post info |
|
| 586 | + * |
|
| 587 | + * You can use this filter to change Post info. |
|
| 588 | + * |
|
| 589 | + * @since 1.0.0 |
|
| 590 | + * @package GeoDirectory |
|
| 591 | + */ |
|
| 592 | + $query = apply_filters('geodir_post_info_query', $wpdb->prepare("SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd
|
|
| 593 | 593 | WHERE p.ID = pd.post_id |
| 594 | 594 | AND pd.post_id = %d", $post_id)); |
| 595 | 595 | |
| 596 | - $post_detail = $wpdb->get_row($query); |
|
| 596 | + $post_detail = $wpdb->get_row($query); |
|
| 597 | 597 | |
| 598 | - return (!empty($post_detail)) ? $post_info = $post_detail : $post_info = false; |
|
| 598 | + return (!empty($post_detail)) ? $post_info = $post_detail : $post_info = false; |
|
| 599 | 599 | |
| 600 | 600 | } |
| 601 | 601 | |
| 602 | 602 | |
| 603 | 603 | if (!function_exists('geodir_save_post_info')) {
|
| 604 | - /** |
|
| 605 | - * Saves post detail info in detail table. |
|
| 606 | - * |
|
| 607 | - * @since 1.0.0 |
|
| 608 | - * @package GeoDirectory |
|
| 609 | - * @global object $wpdb WordPress Database object. |
|
| 610 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 611 | - * @param int $post_id The post ID. |
|
| 612 | - * @param array $postinfo_array {
|
|
| 613 | - * Post info that needs to be saved in detail table. |
|
| 614 | - * |
|
| 615 | - * @type string $post_title Listing title. |
|
| 616 | - * @type string $post_tags Listing tags. |
|
| 617 | - * @type string $post_status Listing post status. |
|
| 618 | - * @type string $post_location_id Listing location ID. |
|
| 619 | - * @type string $claimed Todo Desc needed. |
|
| 620 | - * @type string $businesses Todo Desc needed. |
|
| 621 | - * @type int $submit_time Submitted time in unix timestamp. |
|
| 622 | - * @type string $submit_ip Submitted IP. |
|
| 623 | - * @type string $expire_date Listing expiration date. |
|
| 624 | - * @type int $package_id Listing package ID. |
|
| 625 | - * @type int $alive_days Todo Desc needed. |
|
| 626 | - * @type int $is_featured Is this a featured listing?. |
|
| 627 | - * @type string $post_address Listing address. |
|
| 628 | - * @type string $post_city Listing city. |
|
| 629 | - * @type string $post_region Listing region. |
|
| 630 | - * @type string $post_country Listing country. |
|
| 631 | - * @type string $post_locations Listing locations. |
|
| 632 | - * @type string $post_zip Listing zip. |
|
| 633 | - * @type string $post_latitude Listing latitude. |
|
| 634 | - * @type string $post_longitude Listing longitude. |
|
| 635 | - * @type string $post_mapview Listing mapview. Default "ROADMAP". |
|
| 636 | - * @type string $post_mapzoom Listing mapzoom Default "9". |
|
| 637 | - * @type string $geodir_timing Business timing info. |
|
| 638 | - * @type string $geodir_contact Contact number. |
|
| 639 | - * @type string $geodir_email Business contact email. |
|
| 640 | - * @type string $geodir_website Business website. |
|
| 641 | - * @type string $geodir_twitter Twitter link. |
|
| 642 | - * @type string $geodir_facebook Facebook link. |
|
| 643 | - * @type string $geodir_video Video link. |
|
| 644 | - * @type string $geodir_special_offers Special offers. |
|
| 645 | - * |
|
| 646 | - * } |
|
| 647 | - * @return bool |
|
| 648 | - */ |
|
| 649 | - function geodir_save_post_info($post_id, $postinfo_array = array()) |
|
| 650 | - {
|
|
| 651 | - global $wpdb, $plugin_prefix; |
|
| 652 | - |
|
| 653 | - $post_type = get_post_type($post_id); |
|
| 654 | - |
|
| 655 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 656 | - |
|
| 657 | - /** |
|
| 658 | - * Filter to change Post info |
|
| 659 | - * |
|
| 660 | - * You can use this filter to change Post info. |
|
| 661 | - * |
|
| 662 | - * @since 1.0.0 |
|
| 663 | - * @package GeoDirectory |
|
| 664 | - * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
|
|
| 665 | - * @param int $post_id The post ID. |
|
| 666 | - */ |
|
| 667 | - $postmeta = apply_filters('geodir_listinginfo_request', $postinfo_array, $post_id);
|
|
| 604 | + /** |
|
| 605 | + * Saves post detail info in detail table. |
|
| 606 | + * |
|
| 607 | + * @since 1.0.0 |
|
| 608 | + * @package GeoDirectory |
|
| 609 | + * @global object $wpdb WordPress Database object. |
|
| 610 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 611 | + * @param int $post_id The post ID. |
|
| 612 | + * @param array $postinfo_array {
|
|
| 613 | + * Post info that needs to be saved in detail table. |
|
| 614 | + * |
|
| 615 | + * @type string $post_title Listing title. |
|
| 616 | + * @type string $post_tags Listing tags. |
|
| 617 | + * @type string $post_status Listing post status. |
|
| 618 | + * @type string $post_location_id Listing location ID. |
|
| 619 | + * @type string $claimed Todo Desc needed. |
|
| 620 | + * @type string $businesses Todo Desc needed. |
|
| 621 | + * @type int $submit_time Submitted time in unix timestamp. |
|
| 622 | + * @type string $submit_ip Submitted IP. |
|
| 623 | + * @type string $expire_date Listing expiration date. |
|
| 624 | + * @type int $package_id Listing package ID. |
|
| 625 | + * @type int $alive_days Todo Desc needed. |
|
| 626 | + * @type int $is_featured Is this a featured listing?. |
|
| 627 | + * @type string $post_address Listing address. |
|
| 628 | + * @type string $post_city Listing city. |
|
| 629 | + * @type string $post_region Listing region. |
|
| 630 | + * @type string $post_country Listing country. |
|
| 631 | + * @type string $post_locations Listing locations. |
|
| 632 | + * @type string $post_zip Listing zip. |
|
| 633 | + * @type string $post_latitude Listing latitude. |
|
| 634 | + * @type string $post_longitude Listing longitude. |
|
| 635 | + * @type string $post_mapview Listing mapview. Default "ROADMAP". |
|
| 636 | + * @type string $post_mapzoom Listing mapzoom Default "9". |
|
| 637 | + * @type string $geodir_timing Business timing info. |
|
| 638 | + * @type string $geodir_contact Contact number. |
|
| 639 | + * @type string $geodir_email Business contact email. |
|
| 640 | + * @type string $geodir_website Business website. |
|
| 641 | + * @type string $geodir_twitter Twitter link. |
|
| 642 | + * @type string $geodir_facebook Facebook link. |
|
| 643 | + * @type string $geodir_video Video link. |
|
| 644 | + * @type string $geodir_special_offers Special offers. |
|
| 645 | + * |
|
| 646 | + * } |
|
| 647 | + * @return bool |
|
| 648 | + */ |
|
| 649 | + function geodir_save_post_info($post_id, $postinfo_array = array()) |
|
| 650 | + {
|
|
| 651 | + global $wpdb, $plugin_prefix; |
|
| 652 | + |
|
| 653 | + $post_type = get_post_type($post_id); |
|
| 654 | + |
|
| 655 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 656 | + |
|
| 657 | + /** |
|
| 658 | + * Filter to change Post info |
|
| 659 | + * |
|
| 660 | + * You can use this filter to change Post info. |
|
| 661 | + * |
|
| 662 | + * @since 1.0.0 |
|
| 663 | + * @package GeoDirectory |
|
| 664 | + * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
|
|
| 665 | + * @param int $post_id The post ID. |
|
| 666 | + */ |
|
| 667 | + $postmeta = apply_filters('geodir_listinginfo_request', $postinfo_array, $post_id);
|
|
| 668 | + |
|
| 669 | + $query_string_escaped = ''; |
|
| 670 | + $query_string_array = array(); |
|
| 671 | + |
|
| 672 | + if (!empty($postmeta) && $post_id) {
|
|
| 673 | + |
|
| 674 | + $columns = $wpdb->get_col("show columns from $table");
|
|
| 675 | + foreach ($postmeta as $mkey => $mval) {
|
|
| 676 | + if(in_array($mkey,$columns)) {
|
|
| 677 | + if (is_array($mval)) {
|
|
| 678 | + $mval = implode(",", $mval);
|
|
| 679 | + } |
|
| 680 | + $query_string_escaped .= " $mkey = %s, "; // we can set the key here as we check if the column exists above |
|
| 681 | + $query_string_array[] = stripslashes($mval); // we strip slashes as we are using wpdb prepare |
|
| 668 | 682 | |
| 669 | - $query_string_escaped = ''; |
|
| 670 | - $query_string_array = array(); |
|
| 683 | + } |
|
| 684 | + } |
|
| 671 | 685 | |
| 672 | - if (!empty($postmeta) && $post_id) {
|
|
| 686 | + $query_string_escaped = trim($query_string_escaped, ", "); |
|
| 673 | 687 | |
| 674 | - $columns = $wpdb->get_col("show columns from $table");
|
|
| 675 | - foreach ($postmeta as $mkey => $mval) {
|
|
| 676 | - if(in_array($mkey,$columns)) {
|
|
| 677 | - if (is_array($mval)) {
|
|
| 678 | - $mval = implode(",", $mval);
|
|
| 679 | - } |
|
| 680 | - $query_string_escaped .= " $mkey = %s, "; // we can set the key here as we check if the column exists above |
|
| 681 | - $query_string_array[] = stripslashes($mval); // we strip slashes as we are using wpdb prepare |
|
| 688 | + if (empty($query_string_array) || trim($query_string_escaped) == '') {
|
|
| 689 | + return false; |
|
| 690 | + } |
|
| 682 | 691 | |
| 683 | - } |
|
| 684 | - } |
|
| 692 | + $query_string_array = str_replace(array("'%", "%'"), array("'%%", "%%'"), $query_string_array);
|
|
| 685 | 693 | |
| 686 | - $query_string_escaped = trim($query_string_escaped, ", "); |
|
| 687 | 694 | |
| 688 | - if (empty($query_string_array) || trim($query_string_escaped) == '') {
|
|
| 689 | - return false; |
|
| 690 | - } |
|
| 695 | + /** |
|
| 696 | + * Called before saving the listing info. |
|
| 697 | + * |
|
| 698 | + * @since 1.0.0 |
|
| 699 | + * @package GeoDirectory |
|
| 700 | + * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
|
|
| 701 | + * @param int $post_id The post ID. |
|
| 702 | + */ |
|
| 703 | + do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);
|
|
| 691 | 704 | |
| 692 | - $query_string_array = str_replace(array("'%", "%'"), array("'%%", "%%'"), $query_string_array);
|
|
| 705 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 693 | 706 | |
| 707 | + $query_string_array[] = $post_id; |
|
| 708 | + $wpdb->query( |
|
| 709 | + $wpdb->prepare( |
|
| 710 | + "UPDATE " . $table . " SET " . $query_string_escaped . " where post_id =%d", |
|
| 711 | + $query_string_array |
|
| 712 | + ) |
|
| 713 | + ); |
|
| 694 | 714 | |
| 695 | - /** |
|
| 696 | - * Called before saving the listing info. |
|
| 697 | - * |
|
| 698 | - * @since 1.0.0 |
|
| 699 | - * @package GeoDirectory |
|
| 700 | - * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.
|
|
| 701 | - * @param int $post_id The post ID. |
|
| 702 | - */ |
|
| 703 | - do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);
|
|
| 704 | 715 | |
| 705 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 716 | + } else {
|
|
| 706 | 717 | |
| 707 | - $query_string_array[] = $post_id; |
|
| 708 | - $wpdb->query( |
|
| 709 | - $wpdb->prepare( |
|
| 710 | - "UPDATE " . $table . " SET " . $query_string_escaped . " where post_id =%d", |
|
| 711 | - $query_string_array |
|
| 712 | - ) |
|
| 713 | - ); |
|
| 718 | + array_unshift($query_string_array, $post_id); |
|
| 719 | + $wpdb->query( |
|
| 720 | + $wpdb->prepare( |
|
| 721 | + "INSERT INTO " . $table . " SET post_id = %d," . $query_string_escaped, |
|
| 722 | + $query_string_array |
|
| 723 | + ) |
|
| 724 | + ); |
|
| 725 | + |
|
| 726 | + } |
|
| 714 | 727 | |
| 728 | + /** |
|
| 729 | + * Called after saving the listing info. |
|
| 730 | + * |
|
| 731 | + * @since 1.0.0 |
|
| 732 | + * @package GeoDirectory |
|
| 733 | + * @param array $postinfo_array Post info that needs to be saved in detail table. |
|
| 734 | + * @param int $post_id The post ID. |
|
| 735 | + * @see 'geodir_after_save_listing' |
|
| 736 | + */ |
|
| 737 | + do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);
|
|
| 738 | + |
|
| 739 | + return true; |
|
| 740 | + } else |
|
| 741 | + return false; |
|
| 715 | 742 | |
| 716 | - } else {
|
|
| 743 | + } |
|
| 744 | +} |
|
| 717 | 745 | |
| 718 | - array_unshift($query_string_array, $post_id); |
|
| 719 | - $wpdb->query( |
|
| 720 | - $wpdb->prepare( |
|
| 721 | - "INSERT INTO " . $table . " SET post_id = %d," . $query_string_escaped, |
|
| 722 | - $query_string_array |
|
| 723 | - ) |
|
| 724 | - ); |
|
| 725 | - |
|
| 726 | - } |
|
| 727 | 746 | |
| 728 | - /** |
|
| 729 | - * Called after saving the listing info. |
|
| 730 | - * |
|
| 731 | - * @since 1.0.0 |
|
| 732 | - * @package GeoDirectory |
|
| 733 | - * @param array $postinfo_array Post info that needs to be saved in detail table. |
|
| 734 | - * @param int $post_id The post ID. |
|
| 735 | - * @see 'geodir_after_save_listing' |
|
| 736 | - */ |
|
| 737 | - do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);
|
|
| 747 | +if (!function_exists('geodir_save_post_meta')) {
|
|
| 748 | + /** |
|
| 749 | + * Save or update post custom fields. |
|
| 750 | + * |
|
| 751 | + * @since 1.0.0 |
|
| 752 | + * @package GeoDirectory |
|
| 753 | + * @global object $wpdb WordPress Database object. |
|
| 754 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 755 | + * @param int $post_id The post ID. |
|
| 756 | + * @param string $postmeta Detail table column name. |
|
| 757 | + * @param string $meta_value Detail table column value. |
|
| 758 | + * @return void|bool |
|
| 759 | + */ |
|
| 760 | + function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '') |
|
| 761 | + {
|
|
| 762 | + |
|
| 763 | + global $wpdb, $plugin_prefix; |
|
| 764 | + |
|
| 765 | + $post_type = get_post_type($post_id); |
|
| 766 | + |
|
| 767 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 768 | + |
|
| 769 | + if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {
|
|
| 770 | + |
|
| 771 | + if (is_array($meta_value)) {
|
|
| 772 | + $meta_value = implode(",", $meta_value);
|
|
| 773 | + } |
|
| 738 | 774 | |
| 739 | - return true; |
|
| 740 | - } else |
|
| 741 | - return false; |
|
| 775 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 742 | 776 | |
| 743 | - } |
|
| 744 | -} |
|
| 777 | + $wpdb->query( |
|
| 778 | + $wpdb->prepare( |
|
| 779 | + "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d", |
|
| 780 | + array($post_id) |
|
| 781 | + ) |
|
| 782 | + ); |
|
| 745 | 783 | |
| 784 | + } else {
|
|
| 746 | 785 | |
| 747 | -if (!function_exists('geodir_save_post_meta')) {
|
|
| 748 | - /** |
|
| 749 | - * Save or update post custom fields. |
|
| 750 | - * |
|
| 751 | - * @since 1.0.0 |
|
| 752 | - * @package GeoDirectory |
|
| 753 | - * @global object $wpdb WordPress Database object. |
|
| 754 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 755 | - * @param int $post_id The post ID. |
|
| 756 | - * @param string $postmeta Detail table column name. |
|
| 757 | - * @param string $meta_value Detail table column value. |
|
| 758 | - * @return void|bool |
|
| 759 | - */ |
|
| 760 | - function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '') |
|
| 761 | - {
|
|
| 762 | - |
|
| 763 | - global $wpdb, $plugin_prefix; |
|
| 764 | - |
|
| 765 | - $post_type = get_post_type($post_id); |
|
| 766 | - |
|
| 767 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 768 | - |
|
| 769 | - if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {
|
|
| 770 | - |
|
| 771 | - if (is_array($meta_value)) {
|
|
| 772 | - $meta_value = implode(",", $meta_value);
|
|
| 773 | - } |
|
| 774 | - |
|
| 775 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 776 | - |
|
| 777 | - $wpdb->query( |
|
| 778 | - $wpdb->prepare( |
|
| 779 | - "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d", |
|
| 780 | - array($post_id) |
|
| 781 | - ) |
|
| 782 | - ); |
|
| 783 | - |
|
| 784 | - } else {
|
|
| 785 | - |
|
| 786 | - $wpdb->query( |
|
| 787 | - $wpdb->prepare( |
|
| 788 | - "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'", |
|
| 789 | - array($post_id) |
|
| 790 | - ) |
|
| 791 | - ); |
|
| 792 | - } |
|
| 793 | - |
|
| 794 | - |
|
| 795 | - } else |
|
| 796 | - return false; |
|
| 797 | - } |
|
| 786 | + $wpdb->query( |
|
| 787 | + $wpdb->prepare( |
|
| 788 | + "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'", |
|
| 789 | + array($post_id) |
|
| 790 | + ) |
|
| 791 | + ); |
|
| 792 | + } |
|
| 793 | + |
|
| 794 | + |
|
| 795 | + } else |
|
| 796 | + return false; |
|
| 797 | + } |
|
| 798 | 798 | } |
| 799 | 799 | |
| 800 | 800 | if (!function_exists('geodir_delete_post_meta')) {
|
| 801 | - /** |
|
| 802 | - * Delete post custom fields. |
|
| 803 | - * |
|
| 804 | - * @since 1.0.0 |
|
| 805 | - * @package GeoDirectory |
|
| 806 | - * @global object $wpdb WordPress Database object. |
|
| 807 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 808 | - * @param int $post_id The post ID. |
|
| 809 | - * @param string $postmeta Detail table column name. |
|
| 810 | - * @todo check if this is depreciated |
|
| 811 | - * @todo Fix unknown variable mval |
|
| 812 | - * @return bool |
|
| 813 | - */ |
|
| 814 | - function geodir_delete_post_meta($post_id, $postmeta) |
|
| 815 | - {
|
|
| 816 | - |
|
| 817 | - global $wpdb, $plugin_prefix; |
|
| 818 | - |
|
| 819 | - $post_type = get_post_type($post_id); |
|
| 820 | - |
|
| 821 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 822 | - |
|
| 823 | - if (is_array($postmeta) && !empty($postmeta) && $post_id) {
|
|
| 824 | - $post_meta_set_query = ''; |
|
| 825 | - |
|
| 826 | - foreach ($postmeta as $mkey) {
|
|
| 827 | - if ($mval != '') |
|
| 828 | - $post_meta_set_query .= $mkey . " = '', "; |
|
| 829 | - } |
|
| 830 | - |
|
| 831 | - $post_meta_set_query = trim($post_meta_set_query, ", "); |
|
| 801 | + /** |
|
| 802 | + * Delete post custom fields. |
|
| 803 | + * |
|
| 804 | + * @since 1.0.0 |
|
| 805 | + * @package GeoDirectory |
|
| 806 | + * @global object $wpdb WordPress Database object. |
|
| 807 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 808 | + * @param int $post_id The post ID. |
|
| 809 | + * @param string $postmeta Detail table column name. |
|
| 810 | + * @todo check if this is depreciated |
|
| 811 | + * @todo Fix unknown variable mval |
|
| 812 | + * @return bool |
|
| 813 | + */ |
|
| 814 | + function geodir_delete_post_meta($post_id, $postmeta) |
|
| 815 | + {
|
|
| 816 | + |
|
| 817 | + global $wpdb, $plugin_prefix; |
|
| 818 | + |
|
| 819 | + $post_type = get_post_type($post_id); |
|
| 820 | + |
|
| 821 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 822 | + |
|
| 823 | + if (is_array($postmeta) && !empty($postmeta) && $post_id) {
|
|
| 824 | + $post_meta_set_query = ''; |
|
| 825 | + |
|
| 826 | + foreach ($postmeta as $mkey) {
|
|
| 827 | + if ($mval != '') |
|
| 828 | + $post_meta_set_query .= $mkey . " = '', "; |
|
| 829 | + } |
|
| 830 | + |
|
| 831 | + $post_meta_set_query = trim($post_meta_set_query, ", "); |
|
| 832 | 832 | |
| 833 | - if (empty($post_meta_set_query) || trim($post_meta_set_query) == '') {
|
|
| 834 | - return false; |
|
| 835 | - } |
|
| 836 | - |
|
| 837 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 838 | - |
|
| 839 | - $wpdb->query( |
|
| 840 | - $wpdb->prepare( |
|
| 841 | - "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d", |
|
| 842 | - array($post_id) |
|
| 843 | - ) |
|
| 844 | - ); |
|
| 845 | - |
|
| 846 | - return true; |
|
| 847 | - } |
|
| 848 | - |
|
| 849 | - } elseif ($postmeta != '' && $post_id) {
|
|
| 850 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 851 | - |
|
| 852 | - $wpdb->query( |
|
| 853 | - $wpdb->prepare( |
|
| 854 | - "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d", |
|
| 855 | - array($post_id) |
|
| 856 | - ) |
|
| 857 | - ); |
|
| 858 | - |
|
| 859 | - return true; |
|
| 860 | - } |
|
| 861 | - |
|
| 862 | - } else |
|
| 863 | - return false; |
|
| 864 | - } |
|
| 833 | + if (empty($post_meta_set_query) || trim($post_meta_set_query) == '') {
|
|
| 834 | + return false; |
|
| 835 | + } |
|
| 836 | + |
|
| 837 | + if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 838 | + |
|
| 839 | + $wpdb->query( |
|
| 840 | + $wpdb->prepare( |
|
| 841 | + "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d", |
|
| 842 | + array($post_id) |
|
| 843 | + ) |
|
| 844 | + ); |
|
| 845 | + |
|
| 846 | + return true; |
|
| 847 | + } |
|
| 848 | + |
|
| 849 | + } elseif ($postmeta != '' && $post_id) {
|
|
| 850 | + if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 851 | + |
|
| 852 | + $wpdb->query( |
|
| 853 | + $wpdb->prepare( |
|
| 854 | + "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d", |
|
| 855 | + array($post_id) |
|
| 856 | + ) |
|
| 857 | + ); |
|
| 858 | + |
|
| 859 | + return true; |
|
| 860 | + } |
|
| 861 | + |
|
| 862 | + } else |
|
| 863 | + return false; |
|
| 864 | + } |
|
| 865 | 865 | } |
| 866 | 866 | |
| 867 | 867 | |
| 868 | 868 | if (!function_exists('geodir_get_post_meta')) {
|
| 869 | - /** |
|
| 870 | - * Get post custom meta. |
|
| 871 | - * |
|
| 872 | - * @since 1.0.0 |
|
| 873 | - * @since 1.6.20 Hook added to filter value. |
|
| 874 | - * @package GeoDirectory |
|
| 875 | - * @global object $wpdb WordPress Database object. |
|
| 876 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 877 | - * @param int $post_id The post ID. |
|
| 878 | - * @param string $meta_key The meta key to retrieve. |
|
| 879 | - * @param bool $single Optional. Whether to return a single value. Default false. |
|
| 880 | - * @todo single variable not yet implemented. |
|
| 881 | - * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true. |
|
| 882 | - */ |
|
| 883 | - function geodir_get_post_meta($post_id, $meta_key, $single = false) {
|
|
| 884 | - if (!$post_id) {
|
|
| 885 | - return false; |
|
| 886 | - } |
|
| 887 | - global $wpdb, $plugin_prefix; |
|
| 888 | - |
|
| 889 | - $all_postypes = geodir_get_posttypes(); |
|
| 890 | - |
|
| 891 | - $post_type = get_post_type($post_id); |
|
| 892 | - |
|
| 893 | - if (!in_array($post_type, $all_postypes)) |
|
| 894 | - return false; |
|
| 895 | - |
|
| 896 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 897 | - |
|
| 898 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {
|
|
| 899 | - $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));
|
|
| 869 | + /** |
|
| 870 | + * Get post custom meta. |
|
| 871 | + * |
|
| 872 | + * @since 1.0.0 |
|
| 873 | + * @since 1.6.20 Hook added to filter value. |
|
| 874 | + * @package GeoDirectory |
|
| 875 | + * @global object $wpdb WordPress Database object. |
|
| 876 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 877 | + * @param int $post_id The post ID. |
|
| 878 | + * @param string $meta_key The meta key to retrieve. |
|
| 879 | + * @param bool $single Optional. Whether to return a single value. Default false. |
|
| 880 | + * @todo single variable not yet implemented. |
|
| 881 | + * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true. |
|
| 882 | + */ |
|
| 883 | + function geodir_get_post_meta($post_id, $meta_key, $single = false) {
|
|
| 884 | + if (!$post_id) {
|
|
| 885 | + return false; |
|
| 886 | + } |
|
| 887 | + global $wpdb, $plugin_prefix; |
|
| 888 | + |
|
| 889 | + $all_postypes = geodir_get_posttypes(); |
|
| 890 | + |
|
| 891 | + $post_type = get_post_type($post_id); |
|
| 892 | + |
|
| 893 | + if (!in_array($post_type, $all_postypes)) |
|
| 894 | + return false; |
|
| 895 | + |
|
| 896 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 897 | + |
|
| 898 | + if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {
|
|
| 899 | + $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));
|
|
| 900 | 900 | |
| 901 | - if ($meta_value && $meta_value !== '') {
|
|
| 902 | - $meta_value = maybe_serialize($meta_value); |
|
| 903 | - } |
|
| 904 | - } else {
|
|
| 905 | - $meta_value = false; |
|
| 906 | - } |
|
| 901 | + if ($meta_value && $meta_value !== '') {
|
|
| 902 | + $meta_value = maybe_serialize($meta_value); |
|
| 903 | + } |
|
| 904 | + } else {
|
|
| 905 | + $meta_value = false; |
|
| 906 | + } |
|
| 907 | 907 | |
| 908 | - /** |
|
| 909 | - * Filter the listing custom meta. |
|
| 910 | - * |
|
| 911 | - * @since 1.6.20 |
|
| 912 | - * |
|
| 913 | - * @param bool|mixed|null|string $meta_value Will be an array if $single is false. Will be value of meta data field if $single is true. |
|
| 914 | - * @param int $post_id The post ID. |
|
| 915 | - * @param string $meta_key The meta key to retrieve. |
|
| 916 | - * @param bool $single Optional. Whether to return a single value. Default false. |
|
| 917 | - */ |
|
| 918 | - return apply_filters( 'geodir_get_post_meta', $meta_value, $post_id, $meta_key, $single ); |
|
| 919 | - } |
|
| 908 | + /** |
|
| 909 | + * Filter the listing custom meta. |
|
| 910 | + * |
|
| 911 | + * @since 1.6.20 |
|
| 912 | + * |
|
| 913 | + * @param bool|mixed|null|string $meta_value Will be an array if $single is false. Will be value of meta data field if $single is true. |
|
| 914 | + * @param int $post_id The post ID. |
|
| 915 | + * @param string $meta_key The meta key to retrieve. |
|
| 916 | + * @param bool $single Optional. Whether to return a single value. Default false. |
|
| 917 | + */ |
|
| 918 | + return apply_filters( 'geodir_get_post_meta', $meta_value, $post_id, $meta_key, $single ); |
|
| 919 | + } |
|
| 920 | 920 | } |
| 921 | 921 | |
| 922 | 922 | |
| 923 | 923 | if (!function_exists('geodir_save_post_images')) {
|
| 924 | - /** |
|
| 925 | - * Save post attachments. |
|
| 926 | - * |
|
| 927 | - * @since 1.0.0 |
|
| 928 | - * @package GeoDirectory |
|
| 929 | - * @global object $wpdb WordPress Database object. |
|
| 930 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 931 | - * @global object $current_user Current user object. |
|
| 932 | - * @param int $post_id The post ID. |
|
| 933 | - * @param array $post_image Post image urls as an array. |
|
| 934 | - * @param bool $dummy Optional. Is this a dummy listing? Default false. |
|
| 935 | - */ |
|
| 936 | - function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false) |
|
| 937 | - {
|
|
| 938 | - |
|
| 924 | + /** |
|
| 925 | + * Save post attachments. |
|
| 926 | + * |
|
| 927 | + * @since 1.0.0 |
|
| 928 | + * @package GeoDirectory |
|
| 929 | + * @global object $wpdb WordPress Database object. |
|
| 930 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 931 | + * @global object $current_user Current user object. |
|
| 932 | + * @param int $post_id The post ID. |
|
| 933 | + * @param array $post_image Post image urls as an array. |
|
| 934 | + * @param bool $dummy Optional. Is this a dummy listing? Default false. |
|
| 935 | + */ |
|
| 936 | + function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false) |
|
| 937 | + {
|
|
| 939 | 938 | |
| 940 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 941 | 939 | |
| 942 | - $post_type = get_post_type($post_id); |
|
| 940 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 943 | 941 | |
| 944 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 942 | + $post_type = get_post_type($post_id); |
|
| 945 | 943 | |
| 946 | - $post_images = geodir_get_images($post_id); |
|
| 944 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 947 | 945 | |
| 948 | - $wpdb->query( |
|
| 949 | - $wpdb->prepare( |
|
| 950 | - "UPDATE " . $table . " SET featured_image = '' where post_id =%d", |
|
| 951 | - array($post_id) |
|
| 952 | - ) |
|
| 953 | - ); |
|
| 946 | + $post_images = geodir_get_images($post_id); |
|
| 954 | 947 | |
| 955 | - $invalid_files = $post_images; |
|
| 956 | - $valid_file_ids = array(); |
|
| 957 | - $valid_files_condition = ''; |
|
| 958 | - $geodir_uploaddir = ''; |
|
| 948 | + $wpdb->query( |
|
| 949 | + $wpdb->prepare( |
|
| 950 | + "UPDATE " . $table . " SET featured_image = '' where post_id =%d", |
|
| 951 | + array($post_id) |
|
| 952 | + ) |
|
| 953 | + ); |
|
| 959 | 954 | |
| 960 | - $remove_files = array(); |
|
| 955 | + $invalid_files = $post_images; |
|
| 956 | + $valid_file_ids = array(); |
|
| 957 | + $valid_files_condition = ''; |
|
| 958 | + $geodir_uploaddir = ''; |
|
| 961 | 959 | |
| 962 | - if (!empty($post_image)) {
|
|
| 960 | + $remove_files = array(); |
|
| 963 | 961 | |
| 964 | - $uploads = wp_upload_dir(); |
|
| 965 | - $uploads_dir = $uploads['path']; |
|
| 962 | + if (!empty($post_image)) {
|
|
| 966 | 963 | |
| 967 | - $geodir_uploadpath = $uploads['path']; |
|
| 968 | - $geodir_uploadurl = $uploads['url']; |
|
| 969 | - $sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : ''; |
|
| 964 | + $uploads = wp_upload_dir(); |
|
| 965 | + $uploads_dir = $uploads['path']; |
|
| 970 | 966 | |
| 971 | - $invalid_files = array(); |
|
| 972 | - $postcurr_images = array(); |
|
| 967 | + $geodir_uploadpath = $uploads['path']; |
|
| 968 | + $geodir_uploadurl = $uploads['url']; |
|
| 969 | + $sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : ''; |
|
| 973 | 970 | |
| 974 | - for ($m = 0; $m < count($post_image); $m++) {
|
|
| 975 | - $menu_order = $m + 1; |
|
| 971 | + $invalid_files = array(); |
|
| 972 | + $postcurr_images = array(); |
|
| 976 | 973 | |
| 977 | - $file_path = ''; |
|
| 978 | - /* --------- start ------- */ |
|
| 974 | + for ($m = 0; $m < count($post_image); $m++) {
|
|
| 975 | + $menu_order = $m + 1; |
|
| 979 | 976 | |
| 980 | - $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
|
|
| 977 | + $file_path = ''; |
|
| 978 | + /* --------- start ------- */ |
|
| 981 | 979 | |
| 982 | - $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 980 | + $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
|
|
| 983 | 981 | |
| 982 | + $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 984 | 983 | |
| 985 | - if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {
|
|
| 986 | 984 | |
| 987 | - /* --------- end ------- */ |
|
| 988 | - $curr_img_url = $post_image[$m]; |
|
| 985 | + if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {
|
|
| 989 | 986 | |
| 990 | - $image_name_arr = explode('/', $curr_img_url);
|
|
| 987 | + /* --------- end ------- */ |
|
| 988 | + $curr_img_url = $post_image[$m]; |
|
| 991 | 989 | |
| 992 | - $count_image_name_arr = count($image_name_arr) - 2; |
|
| 990 | + $image_name_arr = explode('/', $curr_img_url);
|
|
| 993 | 991 | |
| 994 | - $count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0; |
|
| 992 | + $count_image_name_arr = count($image_name_arr) - 2; |
|
| 995 | 993 | |
| 996 | - $curr_img_dir = $image_name_arr[$count_image_name_arr]; |
|
| 994 | + $count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0; |
|
| 997 | 995 | |
| 998 | - $filename = end($image_name_arr); |
|
| 999 | - if (strpos($filename, '?') !== false) {
|
|
| 1000 | - list($filename) = explode('?', $filename);
|
|
| 1001 | - } |
|
| 996 | + $curr_img_dir = $image_name_arr[$count_image_name_arr]; |
|
| 1002 | 997 | |
| 1003 | - $curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url); |
|
| 1004 | - $curr_img_dir = str_replace($filename, "", $curr_img_dir); |
|
| 998 | + $filename = end($image_name_arr); |
|
| 999 | + if (strpos($filename, '?') !== false) {
|
|
| 1000 | + list($filename) = explode('?', $filename);
|
|
| 1001 | + } |
|
| 1005 | 1002 | |
| 1006 | - $img_name_arr = explode('.', $filename);
|
|
| 1003 | + $curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url); |
|
| 1004 | + $curr_img_dir = str_replace($filename, "", $curr_img_dir); |
|
| 1007 | 1005 | |
| 1008 | - $file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename; |
|
| 1009 | - if (!empty($img_name_arr) && count($img_name_arr) > 2) {
|
|
| 1010 | - $new_img_name_arr = $img_name_arr; |
|
| 1011 | - if (isset($new_img_name_arr[count($img_name_arr) - 1])) {
|
|
| 1012 | - unset($new_img_name_arr[count($img_name_arr) - 1]); |
|
| 1013 | - $file_title = implode('.', $new_img_name_arr);
|
|
| 1014 | - } |
|
| 1015 | - } |
|
| 1016 | - $file_title = sanitize_file_name($file_title); |
|
| 1017 | - $file_name = sanitize_file_name($filename); |
|
| 1006 | + $img_name_arr = explode('.', $filename);
|
|
| 1018 | 1007 | |
| 1019 | - $arr_file_type = wp_check_filetype($filename); |
|
| 1008 | + $file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename; |
|
| 1009 | + if (!empty($img_name_arr) && count($img_name_arr) > 2) {
|
|
| 1010 | + $new_img_name_arr = $img_name_arr; |
|
| 1011 | + if (isset($new_img_name_arr[count($img_name_arr) - 1])) {
|
|
| 1012 | + unset($new_img_name_arr[count($img_name_arr) - 1]); |
|
| 1013 | + $file_title = implode('.', $new_img_name_arr);
|
|
| 1014 | + } |
|
| 1015 | + } |
|
| 1016 | + $file_title = sanitize_file_name($file_title); |
|
| 1017 | + $file_name = sanitize_file_name($filename); |
|
| 1020 | 1018 | |
| 1021 | - $uploaded_file_type = $arr_file_type['type']; |
|
| 1019 | + $arr_file_type = wp_check_filetype($filename); |
|
| 1022 | 1020 | |
| 1023 | - // Set an array containing a list of acceptable formats |
|
| 1024 | - $allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');
|
|
| 1021 | + $uploaded_file_type = $arr_file_type['type']; |
|
| 1025 | 1022 | |
| 1026 | - // If the uploaded file is the right format |
|
| 1027 | - if (in_array($uploaded_file_type, $allowed_file_types)) {
|
|
| 1028 | - if (!function_exists('wp_handle_upload')) {
|
|
| 1029 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1030 | - } |
|
| 1023 | + // Set an array containing a list of acceptable formats |
|
| 1024 | + $allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');
|
|
| 1031 | 1025 | |
| 1032 | - if (!is_dir($geodir_uploadpath)) {
|
|
| 1033 | - mkdir($geodir_uploadpath); |
|
| 1034 | - } |
|
| 1026 | + // If the uploaded file is the right format |
|
| 1027 | + if (in_array($uploaded_file_type, $allowed_file_types)) {
|
|
| 1028 | + if (!function_exists('wp_handle_upload')) {
|
|
| 1029 | + require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1030 | + } |
|
| 1035 | 1031 | |
| 1036 | - $external_img = false; |
|
| 1037 | - if (strpos( str_replace( array('http://','https://'),'',$curr_img_url ), str_replace(array('http://','https://'),'',$uploads['baseurl'] ) ) !== false) {
|
|
| 1038 | - } else {
|
|
| 1039 | - $external_img = true; |
|
| 1040 | - } |
|
| 1032 | + if (!is_dir($geodir_uploadpath)) {
|
|
| 1033 | + mkdir($geodir_uploadpath); |
|
| 1034 | + } |
|
| 1041 | 1035 | |
| 1042 | - if ($dummy || $external_img) {
|
|
| 1043 | - $uploaded_file = array(); |
|
| 1044 | - $uploaded = (array)fetch_remote_file($curr_img_url); |
|
| 1036 | + $external_img = false; |
|
| 1037 | + if (strpos( str_replace( array('http://','https://'),'',$curr_img_url ), str_replace(array('http://','https://'),'',$uploads['baseurl'] ) ) !== false) {
|
|
| 1038 | + } else {
|
|
| 1039 | + $external_img = true; |
|
| 1040 | + } |
|
| 1045 | 1041 | |
| 1046 | - if (isset($uploaded['error']) && empty($uploaded['error'])) {
|
|
| 1047 | - $new_name = basename($uploaded['file']); |
|
| 1048 | - $uploaded_file = $uploaded; |
|
| 1049 | - }else{
|
|
| 1050 | - print_r($uploaded);exit; |
|
| 1051 | - } |
|
| 1052 | - $external_img = false; |
|
| 1053 | - } else {
|
|
| 1054 | - $new_name = $post_id . '_' . $file_name; |
|
| 1042 | + if ($dummy || $external_img) {
|
|
| 1043 | + $uploaded_file = array(); |
|
| 1044 | + $uploaded = (array)fetch_remote_file($curr_img_url); |
|
| 1055 | 1045 | |
| 1056 | - if ($curr_img_dir == $sub_dir) {
|
|
| 1057 | - $img_path = $geodir_uploadpath . '/' . $filename; |
|
| 1058 | - $img_url = $geodir_uploadurl . '/' . $filename; |
|
| 1059 | - } else {
|
|
| 1060 | - $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1061 | - $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1062 | - } |
|
| 1046 | + if (isset($uploaded['error']) && empty($uploaded['error'])) {
|
|
| 1047 | + $new_name = basename($uploaded['file']); |
|
| 1048 | + $uploaded_file = $uploaded; |
|
| 1049 | + }else{
|
|
| 1050 | + print_r($uploaded);exit; |
|
| 1051 | + } |
|
| 1052 | + $external_img = false; |
|
| 1053 | + } else {
|
|
| 1054 | + $new_name = $post_id . '_' . $file_name; |
|
| 1063 | 1055 | |
| 1064 | - $uploaded_file = ''; |
|
| 1056 | + if ($curr_img_dir == $sub_dir) {
|
|
| 1057 | + $img_path = $geodir_uploadpath . '/' . $filename; |
|
| 1058 | + $img_url = $geodir_uploadurl . '/' . $filename; |
|
| 1059 | + } else {
|
|
| 1060 | + $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1061 | + $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1062 | + } |
|
| 1065 | 1063 | |
| 1066 | - if (file_exists($img_path)) {
|
|
| 1067 | - $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); |
|
| 1068 | - $file_path = ''; |
|
| 1069 | - } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
|
|
| 1070 | - $uploaded_file = true; |
|
| 1071 | - $file_path = $curr_img_dir . '/' . $filename; |
|
| 1072 | - } |
|
| 1064 | + $uploaded_file = ''; |
|
| 1073 | 1065 | |
| 1074 | - if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path)) |
|
| 1075 | - unlink($img_path); |
|
| 1076 | - } |
|
| 1066 | + if (file_exists($img_path)) {
|
|
| 1067 | + $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); |
|
| 1068 | + $file_path = ''; |
|
| 1069 | + } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
|
|
| 1070 | + $uploaded_file = true; |
|
| 1071 | + $file_path = $curr_img_dir . '/' . $filename; |
|
| 1072 | + } |
|
| 1077 | 1073 | |
| 1078 | - if (!empty($uploaded_file)) {
|
|
| 1079 | - if (!isset($file_path) || !$file_path) {
|
|
| 1080 | - $file_path = $sub_dir . '/' . $new_name; |
|
| 1081 | - } |
|
| 1074 | + if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path)) |
|
| 1075 | + unlink($img_path); |
|
| 1076 | + } |
|
| 1082 | 1077 | |
| 1083 | - $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
|
|
| 1078 | + if (!empty($uploaded_file)) {
|
|
| 1079 | + if (!isset($file_path) || !$file_path) {
|
|
| 1080 | + $file_path = $sub_dir . '/' . $new_name; |
|
| 1081 | + } |
|
| 1084 | 1082 | |
| 1085 | - if ($menu_order == 1) {
|
|
| 1083 | + $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
|
|
| 1086 | 1084 | |
| 1087 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
|
|
| 1085 | + if ($menu_order == 1) {
|
|
| 1088 | 1086 | |
| 1089 | - } |
|
| 1087 | + $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
|
|
| 1090 | 1088 | |
| 1091 | - // Set up options array to add this file as an attachment |
|
| 1092 | - $attachment = array(); |
|
| 1093 | - $attachment['post_id'] = $post_id; |
|
| 1094 | - $attachment['title'] = $file_title; |
|
| 1095 | - $attachment['content'] = ''; |
|
| 1096 | - $attachment['file'] = $file_path; |
|
| 1097 | - $attachment['mime_type'] = $uploaded_file_type; |
|
| 1098 | - $attachment['menu_order'] = $menu_order; |
|
| 1099 | - $attachment['is_featured'] = 0; |
|
| 1089 | + } |
|
| 1100 | 1090 | |
| 1101 | - $attachment_set = ''; |
|
| 1091 | + // Set up options array to add this file as an attachment |
|
| 1092 | + $attachment = array(); |
|
| 1093 | + $attachment['post_id'] = $post_id; |
|
| 1094 | + $attachment['title'] = $file_title; |
|
| 1095 | + $attachment['content'] = ''; |
|
| 1096 | + $attachment['file'] = $file_path; |
|
| 1097 | + $attachment['mime_type'] = $uploaded_file_type; |
|
| 1098 | + $attachment['menu_order'] = $menu_order; |
|
| 1099 | + $attachment['is_featured'] = 0; |
|
| 1102 | 1100 | |
| 1103 | - foreach ($attachment as $key => $val) {
|
|
| 1104 | - if ($val != '') |
|
| 1105 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 1106 | - } |
|
| 1101 | + $attachment_set = ''; |
|
| 1107 | 1102 | |
| 1108 | - $attachment_set = trim($attachment_set, ", "); |
|
| 1103 | + foreach ($attachment as $key => $val) {
|
|
| 1104 | + if ($val != '') |
|
| 1105 | + $attachment_set .= $key . " = '" . $val . "', "; |
|
| 1106 | + } |
|
| 1109 | 1107 | |
| 1110 | - $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 1108 | + $attachment_set = trim($attachment_set, ", "); |
|
| 1109 | + |
|
| 1110 | + $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 1111 | 1111 | |
| 1112 | - $valid_file_ids[] = $wpdb->insert_id; |
|
| 1113 | - } |
|
| 1112 | + $valid_file_ids[] = $wpdb->insert_id; |
|
| 1113 | + } |
|
| 1114 | 1114 | |
| 1115 | - } |
|
| 1115 | + } |
|
| 1116 | 1116 | |
| 1117 | 1117 | |
| 1118 | - } else {
|
|
| 1119 | - $valid_file_ids[] = $find_image; |
|
| 1118 | + } else {
|
|
| 1119 | + $valid_file_ids[] = $find_image; |
|
| 1120 | 1120 | |
| 1121 | - $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
|
|
| 1121 | + $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
|
|
| 1122 | 1122 | |
| 1123 | - $wpdb->query( |
|
| 1124 | - $wpdb->prepare( |
|
| 1125 | - "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d", |
|
| 1126 | - array($menu_order, $split_img_path[1], $post_id) |
|
| 1127 | - ) |
|
| 1128 | - ); |
|
| 1123 | + $wpdb->query( |
|
| 1124 | + $wpdb->prepare( |
|
| 1125 | + "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d", |
|
| 1126 | + array($menu_order, $split_img_path[1], $post_id) |
|
| 1127 | + ) |
|
| 1128 | + ); |
|
| 1129 | 1129 | |
| 1130 | - if ($menu_order == 1) |
|
| 1131 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
|
|
| 1130 | + if ($menu_order == 1) |
|
| 1131 | + $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
|
|
| 1132 | 1132 | |
| 1133 | - } |
|
| 1133 | + } |
|
| 1134 | 1134 | |
| 1135 | 1135 | |
| 1136 | - } |
|
| 1136 | + } |
|
| 1137 | 1137 | |
| 1138 | - if (!empty($valid_file_ids)) {
|
|
| 1138 | + if (!empty($valid_file_ids)) {
|
|
| 1139 | 1139 | |
| 1140 | - $remove_files = $valid_file_ids; |
|
| 1140 | + $remove_files = $valid_file_ids; |
|
| 1141 | 1141 | |
| 1142 | - $remove_files_length = count($remove_files); |
|
| 1143 | - $remove_files_format = array_fill(0, $remove_files_length, '%d'); |
|
| 1144 | - $format = implode(',', $remove_files_format);
|
|
| 1145 | - $valid_files_condition = " ID NOT IN ($format) AND "; |
|
| 1142 | + $remove_files_length = count($remove_files); |
|
| 1143 | + $remove_files_format = array_fill(0, $remove_files_length, '%d'); |
|
| 1144 | + $format = implode(',', $remove_files_format);
|
|
| 1145 | + $valid_files_condition = " ID NOT IN ($format) AND "; |
|
| 1146 | 1146 | |
| 1147 | - } |
|
| 1147 | + } |
|
| 1148 | 1148 | |
| 1149 | - //Get and remove all old images of post from database to set by new order |
|
| 1149 | + //Get and remove all old images of post from database to set by new order |
|
| 1150 | 1150 | |
| 1151 | - if (!empty($post_images)) {
|
|
| 1151 | + if (!empty($post_images)) {
|
|
| 1152 | 1152 | |
| 1153 | - foreach ($post_images as $img) {
|
|
| 1153 | + foreach ($post_images as $img) {
|
|
| 1154 | 1154 | |
| 1155 | - if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
|
|
| 1155 | + if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
|
|
| 1156 | 1156 | |
| 1157 | - $invalid_files[] = (object)array('src' => $img->src);
|
|
| 1157 | + $invalid_files[] = (object)array('src' => $img->src);
|
|
| 1158 | 1158 | |
| 1159 | - } |
|
| 1159 | + } |
|
| 1160 | 1160 | |
| 1161 | - } |
|
| 1161 | + } |
|
| 1162 | 1162 | |
| 1163 | - } |
|
| 1163 | + } |
|
| 1164 | 1164 | |
| 1165 | - $invalid_files = (object)$invalid_files; |
|
| 1166 | - } |
|
| 1165 | + $invalid_files = (object)$invalid_files; |
|
| 1166 | + } |
|
| 1167 | 1167 | |
| 1168 | - $remove_files[] = $post_id; |
|
| 1168 | + $remove_files[] = $post_id; |
|
| 1169 | 1169 | |
| 1170 | - $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
|
|
| 1170 | + $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
|
|
| 1171 | 1171 | |
| 1172 | - if (!empty($invalid_files)) |
|
| 1173 | - geodir_remove_attachments($invalid_files); |
|
| 1174 | - } |
|
| 1172 | + if (!empty($invalid_files)) |
|
| 1173 | + geodir_remove_attachments($invalid_files); |
|
| 1174 | + } |
|
| 1175 | 1175 | |
| 1176 | 1176 | } |
| 1177 | 1177 | |
@@ -1185,12 +1185,12 @@ discard block |
||
| 1185 | 1185 | function geodir_remove_temp_images() |
| 1186 | 1186 | {
|
| 1187 | 1187 | |
| 1188 | - global $current_user; |
|
| 1188 | + global $current_user; |
|
| 1189 | 1189 | |
| 1190 | - $uploads = wp_upload_dir(); |
|
| 1191 | - $uploads_dir = $uploads['path']; |
|
| 1190 | + $uploads = wp_upload_dir(); |
|
| 1191 | + $uploads_dir = $uploads['path']; |
|
| 1192 | 1192 | |
| 1193 | - /* if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){
|
|
| 1193 | + /* if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){
|
|
| 1194 | 1194 | |
| 1195 | 1195 | $dirPath = $uploads_dir.'/temp_'.$current_user->data->ID; |
| 1196 | 1196 | if (substr($dirPath, strlen($dirPath) - 1, 1) != '/') {
|
@@ -1207,8 +1207,8 @@ discard block |
||
| 1207 | 1207 | rmdir($dirPath); |
| 1208 | 1208 | } */ |
| 1209 | 1209 | |
| 1210 | - $dirname = $uploads_dir . '/temp_' . $current_user->ID; |
|
| 1211 | - geodir_delete_directory($dirname); |
|
| 1210 | + $dirname = $uploads_dir . '/temp_' . $current_user->ID; |
|
| 1211 | + geodir_delete_directory($dirname); |
|
| 1212 | 1212 | } |
| 1213 | 1213 | |
| 1214 | 1214 | |
@@ -1222,129 +1222,129 @@ discard block |
||
| 1222 | 1222 | */ |
| 1223 | 1223 | function geodir_delete_directory($dirname) |
| 1224 | 1224 | {
|
| 1225 | - $dir_handle = ''; |
|
| 1226 | - if (is_dir($dirname)) |
|
| 1227 | - $dir_handle = opendir($dirname); |
|
| 1228 | - if (!$dir_handle) |
|
| 1229 | - return false; |
|
| 1230 | - while ($file = readdir($dir_handle)) {
|
|
| 1231 | - if ($file != "." && $file != "..") {
|
|
| 1232 | - if (!is_dir($dirname . "/" . $file)) |
|
| 1233 | - unlink($dirname . "/" . $file); |
|
| 1234 | - else |
|
| 1235 | - geodir_delete_directory($dirname . '/' . $file); |
|
| 1236 | - } |
|
| 1237 | - } |
|
| 1238 | - closedir($dir_handle); |
|
| 1239 | - rmdir($dirname); |
|
| 1240 | - return true; |
|
| 1225 | + $dir_handle = ''; |
|
| 1226 | + if (is_dir($dirname)) |
|
| 1227 | + $dir_handle = opendir($dirname); |
|
| 1228 | + if (!$dir_handle) |
|
| 1229 | + return false; |
|
| 1230 | + while ($file = readdir($dir_handle)) {
|
|
| 1231 | + if ($file != "." && $file != "..") {
|
|
| 1232 | + if (!is_dir($dirname . "/" . $file)) |
|
| 1233 | + unlink($dirname . "/" . $file); |
|
| 1234 | + else |
|
| 1235 | + geodir_delete_directory($dirname . '/' . $file); |
|
| 1236 | + } |
|
| 1237 | + } |
|
| 1238 | + closedir($dir_handle); |
|
| 1239 | + rmdir($dirname); |
|
| 1240 | + return true; |
|
| 1241 | 1241 | |
| 1242 | 1242 | } |
| 1243 | 1243 | |
| 1244 | 1244 | |
| 1245 | 1245 | if (!function_exists('geodir_remove_attachments')) {
|
| 1246 | - /** |
|
| 1247 | - * Remove post attachments. |
|
| 1248 | - * |
|
| 1249 | - * @since 1.0.0 |
|
| 1250 | - * @package GeoDirectory |
|
| 1251 | - * @param array $postcurr_images Array of image objects. |
|
| 1252 | - */ |
|
| 1253 | - function geodir_remove_attachments($postcurr_images = array()) |
|
| 1254 | - {
|
|
| 1255 | - // Unlink all past images of post |
|
| 1256 | - if (!empty($postcurr_images)) {
|
|
| 1257 | - |
|
| 1258 | - $uploads = wp_upload_dir(); |
|
| 1259 | - $uploads_dir = $uploads['path']; |
|
| 1260 | - |
|
| 1261 | - foreach ($postcurr_images as $postimg) {
|
|
| 1262 | - $image_name_arr = explode('/', $postimg->src);
|
|
| 1263 | - $filename = end($image_name_arr); |
|
| 1264 | - if (file_exists($uploads_dir . '/' . $filename)) |
|
| 1265 | - unlink($uploads_dir . '/' . $filename); |
|
| 1266 | - } |
|
| 1267 | - |
|
| 1268 | - } // endif |
|
| 1269 | - // Unlink all past images of post end |
|
| 1270 | - } |
|
| 1246 | + /** |
|
| 1247 | + * Remove post attachments. |
|
| 1248 | + * |
|
| 1249 | + * @since 1.0.0 |
|
| 1250 | + * @package GeoDirectory |
|
| 1251 | + * @param array $postcurr_images Array of image objects. |
|
| 1252 | + */ |
|
| 1253 | + function geodir_remove_attachments($postcurr_images = array()) |
|
| 1254 | + {
|
|
| 1255 | + // Unlink all past images of post |
|
| 1256 | + if (!empty($postcurr_images)) {
|
|
| 1257 | + |
|
| 1258 | + $uploads = wp_upload_dir(); |
|
| 1259 | + $uploads_dir = $uploads['path']; |
|
| 1260 | + |
|
| 1261 | + foreach ($postcurr_images as $postimg) {
|
|
| 1262 | + $image_name_arr = explode('/', $postimg->src);
|
|
| 1263 | + $filename = end($image_name_arr); |
|
| 1264 | + if (file_exists($uploads_dir . '/' . $filename)) |
|
| 1265 | + unlink($uploads_dir . '/' . $filename); |
|
| 1266 | + } |
|
| 1267 | + |
|
| 1268 | + } // endif |
|
| 1269 | + // Unlink all past images of post end |
|
| 1270 | + } |
|
| 1271 | 1271 | } |
| 1272 | 1272 | |
| 1273 | 1273 | if (!function_exists('geodir_get_featured_image')) {
|
| 1274 | - /** |
|
| 1275 | - * Gets the post featured image. |
|
| 1276 | - * |
|
| 1277 | - * @since 1.0.0 |
|
| 1278 | - * @package GeoDirectory |
|
| 1279 | - * @global object $wpdb WordPress Database object. |
|
| 1280 | - * @global object $post The current post object. |
|
| 1281 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 1282 | - * @param int|string $post_id The post ID. |
|
| 1283 | - * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1284 | - * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1285 | - * @param bool|string $file Optional. The file path from which you want to get the image details. Default: false. |
|
| 1286 | - * @return bool|object Image details as an object. |
|
| 1287 | - */ |
|
| 1288 | - function geodir_get_featured_image($post_id = '', $size = '', $no_image = false, $file = false) |
|
| 1289 | - {
|
|
| 1290 | - |
|
| 1291 | - /*$img_arr['src'] = get_the_post_thumbnail_url( $post_id, 'medium');//medium/thumbnail |
|
| 1274 | + /** |
|
| 1275 | + * Gets the post featured image. |
|
| 1276 | + * |
|
| 1277 | + * @since 1.0.0 |
|
| 1278 | + * @package GeoDirectory |
|
| 1279 | + * @global object $wpdb WordPress Database object. |
|
| 1280 | + * @global object $post The current post object. |
|
| 1281 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 1282 | + * @param int|string $post_id The post ID. |
|
| 1283 | + * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1284 | + * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1285 | + * @param bool|string $file Optional. The file path from which you want to get the image details. Default: false. |
|
| 1286 | + * @return bool|object Image details as an object. |
|
| 1287 | + */ |
|
| 1288 | + function geodir_get_featured_image($post_id = '', $size = '', $no_image = false, $file = false) |
|
| 1289 | + {
|
|
| 1290 | + |
|
| 1291 | + /*$img_arr['src'] = get_the_post_thumbnail_url( $post_id, 'medium');//medium/thumbnail |
|
| 1292 | 1292 | $img_arr['path'] = ''; |
| 1293 | 1293 | $img_arr['width'] = ''; |
| 1294 | 1294 | $img_arr['height'] = ''; |
| 1295 | 1295 | $img_arr['title'] = ''; |
| 1296 | 1296 | return (object)$img_arr;*/ |
| 1297 | - global $wpdb, $plugin_prefix, $post; |
|
| 1297 | + global $wpdb, $plugin_prefix, $post; |
|
| 1298 | 1298 | |
| 1299 | - if (isset($post->ID) && isset($post->post_type) && $post->ID == $post_id) {
|
|
| 1300 | - $post_type = $post->post_type; |
|
| 1301 | - } else {
|
|
| 1302 | - $post_type = get_post_type($post_id); |
|
| 1303 | - } |
|
| 1299 | + if (isset($post->ID) && isset($post->post_type) && $post->ID == $post_id) {
|
|
| 1300 | + $post_type = $post->post_type; |
|
| 1301 | + } else {
|
|
| 1302 | + $post_type = get_post_type($post_id); |
|
| 1303 | + } |
|
| 1304 | 1304 | |
| 1305 | - if (!in_array($post_type, geodir_get_posttypes())) {
|
|
| 1306 | - return false;// if not a GD CPT return; |
|
| 1307 | - } |
|
| 1305 | + if (!in_array($post_type, geodir_get_posttypes())) {
|
|
| 1306 | + return false;// if not a GD CPT return; |
|
| 1307 | + } |
|
| 1308 | 1308 | |
| 1309 | 1309 | |
| 1310 | - $list_img_size = get_option('geodir_listing_img_size','default');
|
|
| 1310 | + $list_img_size = get_option('geodir_listing_img_size','default');
|
|
| 1311 | 1311 | |
| 1312 | - if( $size=='list-thumb' && $list_img_size != 'default' ){
|
|
| 1313 | - $fimg = get_the_post_thumbnail_url($post_id,$list_img_size); |
|
| 1314 | - if($fimg){
|
|
| 1315 | - $uploads = wp_upload_dir(); |
|
| 1316 | - $uploads_baseurl = $uploads['baseurl']; |
|
| 1317 | - $file = str_replace($uploads_baseurl,'',$fimg); |
|
| 1318 | - } |
|
| 1319 | - } |
|
| 1312 | + if( $size=='list-thumb' && $list_img_size != 'default' ){
|
|
| 1313 | + $fimg = get_the_post_thumbnail_url($post_id,$list_img_size); |
|
| 1314 | + if($fimg){
|
|
| 1315 | + $uploads = wp_upload_dir(); |
|
| 1316 | + $uploads_baseurl = $uploads['baseurl']; |
|
| 1317 | + $file = str_replace($uploads_baseurl,'',$fimg); |
|
| 1318 | + } |
|
| 1319 | + } |
|
| 1320 | 1320 | |
| 1321 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1321 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1322 | 1322 | |
| 1323 | - if (!$file) {
|
|
| 1324 | - if (isset($post->featured_image)) {
|
|
| 1325 | - $file = $post->featured_image; |
|
| 1326 | - } else {
|
|
| 1327 | - $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));
|
|
| 1328 | - } |
|
| 1329 | - } |
|
| 1323 | + if (!$file) {
|
|
| 1324 | + if (isset($post->featured_image)) {
|
|
| 1325 | + $file = $post->featured_image; |
|
| 1326 | + } else {
|
|
| 1327 | + $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));
|
|
| 1328 | + } |
|
| 1329 | + } |
|
| 1330 | 1330 | |
| 1331 | - if ($file != NULL && $file != '' && (($uploads = wp_upload_dir()) && false === $uploads['error'])) {
|
|
| 1332 | - $img_arr = array(); |
|
| 1331 | + if ($file != NULL && $file != '' && (($uploads = wp_upload_dir()) && false === $uploads['error'])) {
|
|
| 1332 | + $img_arr = array(); |
|
| 1333 | 1333 | |
| 1334 | - $file_info = pathinfo($file); |
|
| 1335 | - $sub_dir = ''; |
|
| 1336 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
|
|
| 1337 | - $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 1338 | - } |
|
| 1334 | + $file_info = pathinfo($file); |
|
| 1335 | + $sub_dir = ''; |
|
| 1336 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
|
|
| 1337 | + $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 1338 | + } |
|
| 1339 | 1339 | |
| 1340 | - $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 1341 | - $uploads_baseurl = $uploads['baseurl']; |
|
| 1342 | - $uploads_path = $uploads['path']; |
|
| 1340 | + $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 1341 | + $uploads_baseurl = $uploads['baseurl']; |
|
| 1342 | + $uploads_path = $uploads['path']; |
|
| 1343 | 1343 | |
| 1344 | - $file_name = $file_info['basename']; |
|
| 1344 | + $file_name = $file_info['basename']; |
|
| 1345 | 1345 | |
| 1346 | - $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1347 | - /* |
|
| 1346 | + $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1347 | + /* |
|
| 1348 | 1348 | * Allows the filter of image src for such things as CDN change. |
| 1349 | 1349 | * |
| 1350 | 1350 | * @since 1.5.7 |
@@ -1353,158 +1353,158 @@ discard block |
||
| 1353 | 1353 | * @param string $uploads_url The server upload directory url. |
| 1354 | 1354 | * @param string $uploads_baseurl The uploads dir base url. |
| 1355 | 1355 | */ |
| 1356 | - $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1357 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1358 | - $width = 0; |
|
| 1359 | - $height = 0; |
|
| 1360 | - if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1361 | - $imagesize = getimagesize($img_arr['path']); |
|
| 1362 | - $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1363 | - $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1364 | - } |
|
| 1365 | - $img_arr['width'] = $width; |
|
| 1366 | - $img_arr['height'] = $height; |
|
| 1367 | - $img_arr['title'] = $post->post_title; |
|
| 1368 | - } elseif ($post_images = geodir_get_images($post_id, $size, $no_image, 1)) {
|
|
| 1369 | - foreach ($post_images as $image) {
|
|
| 1370 | - return $image; |
|
| 1371 | - } |
|
| 1372 | - } else if ($no_image) {
|
|
| 1373 | - $img_arr = array(); |
|
| 1374 | - |
|
| 1375 | - $default_img = ''; |
|
| 1376 | - if (isset($post->default_category) && $post->default_category) {
|
|
| 1377 | - $default_cat = $post->default_category; |
|
| 1378 | - } else {
|
|
| 1379 | - $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1380 | - } |
|
| 1381 | - |
|
| 1382 | - if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) |
|
| 1383 | - $default_img = $default_catimg['src']; |
|
| 1384 | - elseif ($no_image) {
|
|
| 1385 | - $default_img = get_option('geodir_listing_no_img');
|
|
| 1386 | - } |
|
| 1387 | - |
|
| 1388 | - if (!empty($default_img)) {
|
|
| 1389 | - $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 1390 | - $uploads_baseurl = $uploads['baseurl']; |
|
| 1391 | - $uploads_path = $uploads['path']; |
|
| 1392 | - |
|
| 1393 | - $img_arr = array(); |
|
| 1394 | - |
|
| 1395 | - $file_info = pathinfo($default_img); |
|
| 1396 | - |
|
| 1397 | - $file_name = $file_info['basename']; |
|
| 1398 | - |
|
| 1399 | - $img_arr['src'] = $default_img; |
|
| 1400 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1401 | - |
|
| 1402 | - $width = 0; |
|
| 1403 | - $height = 0; |
|
| 1404 | - if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1405 | - $imagesize = getimagesize($img_arr['path']); |
|
| 1406 | - $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1407 | - $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1408 | - } |
|
| 1409 | - $img_arr['width'] = $width; |
|
| 1410 | - $img_arr['height'] = $height; |
|
| 1411 | - |
|
| 1412 | - $img_arr['title'] = $post->post_title; // add the title to the array |
|
| 1413 | - } |
|
| 1414 | - } |
|
| 1415 | - |
|
| 1416 | - if (!empty($img_arr)) |
|
| 1417 | - return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path ); |
|
| 1418 | - else |
|
| 1419 | - return false; |
|
| 1420 | - } |
|
| 1356 | + $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1357 | + $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1358 | + $width = 0; |
|
| 1359 | + $height = 0; |
|
| 1360 | + if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1361 | + $imagesize = getimagesize($img_arr['path']); |
|
| 1362 | + $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1363 | + $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1364 | + } |
|
| 1365 | + $img_arr['width'] = $width; |
|
| 1366 | + $img_arr['height'] = $height; |
|
| 1367 | + $img_arr['title'] = $post->post_title; |
|
| 1368 | + } elseif ($post_images = geodir_get_images($post_id, $size, $no_image, 1)) {
|
|
| 1369 | + foreach ($post_images as $image) {
|
|
| 1370 | + return $image; |
|
| 1371 | + } |
|
| 1372 | + } else if ($no_image) {
|
|
| 1373 | + $img_arr = array(); |
|
| 1374 | + |
|
| 1375 | + $default_img = ''; |
|
| 1376 | + if (isset($post->default_category) && $post->default_category) {
|
|
| 1377 | + $default_cat = $post->default_category; |
|
| 1378 | + } else {
|
|
| 1379 | + $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1380 | + } |
|
| 1381 | + |
|
| 1382 | + if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) |
|
| 1383 | + $default_img = $default_catimg['src']; |
|
| 1384 | + elseif ($no_image) {
|
|
| 1385 | + $default_img = get_option('geodir_listing_no_img');
|
|
| 1386 | + } |
|
| 1387 | + |
|
| 1388 | + if (!empty($default_img)) {
|
|
| 1389 | + $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 1390 | + $uploads_baseurl = $uploads['baseurl']; |
|
| 1391 | + $uploads_path = $uploads['path']; |
|
| 1392 | + |
|
| 1393 | + $img_arr = array(); |
|
| 1394 | + |
|
| 1395 | + $file_info = pathinfo($default_img); |
|
| 1396 | + |
|
| 1397 | + $file_name = $file_info['basename']; |
|
| 1398 | + |
|
| 1399 | + $img_arr['src'] = $default_img; |
|
| 1400 | + $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1401 | + |
|
| 1402 | + $width = 0; |
|
| 1403 | + $height = 0; |
|
| 1404 | + if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1405 | + $imagesize = getimagesize($img_arr['path']); |
|
| 1406 | + $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1407 | + $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1408 | + } |
|
| 1409 | + $img_arr['width'] = $width; |
|
| 1410 | + $img_arr['height'] = $height; |
|
| 1411 | + |
|
| 1412 | + $img_arr['title'] = $post->post_title; // add the title to the array |
|
| 1413 | + } |
|
| 1414 | + } |
|
| 1415 | + |
|
| 1416 | + if (!empty($img_arr)) |
|
| 1417 | + return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path ); |
|
| 1418 | + else |
|
| 1419 | + return false; |
|
| 1420 | + } |
|
| 1421 | 1421 | } |
| 1422 | 1422 | |
| 1423 | 1423 | if (!function_exists('geodir_show_featured_image')) {
|
| 1424 | - /** |
|
| 1425 | - * Gets the post featured image. |
|
| 1426 | - * |
|
| 1427 | - * @since 1.0.0 |
|
| 1428 | - * @package GeoDirectory |
|
| 1429 | - * @param int|string $post_id The post ID. |
|
| 1430 | - * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1431 | - * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1432 | - * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true. |
|
| 1433 | - * @param bool|string $fimage Optional. The file path from which you want to get the image details. Default: false. |
|
| 1434 | - * @return bool|string Returns image html. |
|
| 1435 | - */ |
|
| 1436 | - function geodir_show_featured_image($post_id = '', $size = 'thumbnail', $no_image = false, $echo = true, $fimage = false) |
|
| 1437 | - {
|
|
| 1438 | - $image = geodir_get_featured_image($post_id, $size, $no_image, $fimage); |
|
| 1439 | - |
|
| 1440 | - $html = geodir_show_image($image, $size, $no_image, false); |
|
| 1441 | - |
|
| 1442 | - if (!empty($html) && $echo) {
|
|
| 1443 | - echo $html; |
|
| 1444 | - } elseif (!empty($html)) {
|
|
| 1445 | - return $html; |
|
| 1446 | - } else |
|
| 1447 | - return false; |
|
| 1448 | - } |
|
| 1424 | + /** |
|
| 1425 | + * Gets the post featured image. |
|
| 1426 | + * |
|
| 1427 | + * @since 1.0.0 |
|
| 1428 | + * @package GeoDirectory |
|
| 1429 | + * @param int|string $post_id The post ID. |
|
| 1430 | + * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1431 | + * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1432 | + * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true. |
|
| 1433 | + * @param bool|string $fimage Optional. The file path from which you want to get the image details. Default: false. |
|
| 1434 | + * @return bool|string Returns image html. |
|
| 1435 | + */ |
|
| 1436 | + function geodir_show_featured_image($post_id = '', $size = 'thumbnail', $no_image = false, $echo = true, $fimage = false) |
|
| 1437 | + {
|
|
| 1438 | + $image = geodir_get_featured_image($post_id, $size, $no_image, $fimage); |
|
| 1439 | + |
|
| 1440 | + $html = geodir_show_image($image, $size, $no_image, false); |
|
| 1441 | + |
|
| 1442 | + if (!empty($html) && $echo) {
|
|
| 1443 | + echo $html; |
|
| 1444 | + } elseif (!empty($html)) {
|
|
| 1445 | + return $html; |
|
| 1446 | + } else |
|
| 1447 | + return false; |
|
| 1448 | + } |
|
| 1449 | 1449 | } |
| 1450 | 1450 | |
| 1451 | 1451 | if (!function_exists('geodir_get_images')) {
|
| 1452 | - /** |
|
| 1453 | - * Gets the post images. |
|
| 1454 | - * |
|
| 1455 | - * @since 1.0.0 |
|
| 1456 | - * @package GeoDirectory |
|
| 1457 | - * @global object $wpdb WordPress Database object. |
|
| 1458 | - * @param int $post_id The post ID. |
|
| 1459 | - * @param string $img_size Optional. Thumbnail size. |
|
| 1460 | - * @param bool $no_images Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1461 | - * @param bool $add_featured Optional. Do you want to include featured images too? Default: true. |
|
| 1462 | - * @param int|string $limit Optional. Number of images. |
|
| 1463 | - * @return array|bool Returns images as an array. Each item is an object. |
|
| 1464 | - */ |
|
| 1465 | - function geodir_get_images($post_id = 0, $img_size = '', $no_images = false, $add_featured = true, $limit = '') |
|
| 1466 | - {
|
|
| 1467 | - global $wpdb; |
|
| 1468 | - if ($limit) {
|
|
| 1469 | - $limit_q = " LIMIT $limit "; |
|
| 1470 | - } else {
|
|
| 1471 | - $limit_q = ''; |
|
| 1472 | - } |
|
| 1473 | - $not_featured = ''; |
|
| 1474 | - $sub_dir = ''; |
|
| 1475 | - if (!$add_featured) |
|
| 1476 | - $not_featured = " AND is_featured = 0 "; |
|
| 1477 | - |
|
| 1478 | - $arrImages = $wpdb->get_results( |
|
| 1479 | - $wpdb->prepare( |
|
| 1480 | - "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ", |
|
| 1481 | - array('%image%', $post_id)
|
|
| 1482 | - ) |
|
| 1483 | - ); |
|
| 1484 | - |
|
| 1485 | - $counter = 0; |
|
| 1486 | - $return_arr = array(); |
|
| 1487 | - |
|
| 1488 | - if (!empty($arrImages)) {
|
|
| 1489 | - foreach ($arrImages as $attechment) {
|
|
| 1490 | - |
|
| 1491 | - $img_arr = array(); |
|
| 1492 | - $img_arr['id'] = $attechment->ID; |
|
| 1493 | - $img_arr['user_id'] = isset($attechment->user_id) ? $attechment->user_id : 0; |
|
| 1494 | - |
|
| 1495 | - $file_info = pathinfo($attechment->file); |
|
| 1496 | - |
|
| 1497 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 1498 | - $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 1499 | - |
|
| 1500 | - $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 1501 | - $uploads_baseurl = $uploads['baseurl']; |
|
| 1502 | - $uploads_path = $uploads['path']; |
|
| 1503 | - |
|
| 1504 | - $file_name = $file_info['basename']; |
|
| 1505 | - |
|
| 1506 | - $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1507 | - /* |
|
| 1452 | + /** |
|
| 1453 | + * Gets the post images. |
|
| 1454 | + * |
|
| 1455 | + * @since 1.0.0 |
|
| 1456 | + * @package GeoDirectory |
|
| 1457 | + * @global object $wpdb WordPress Database object. |
|
| 1458 | + * @param int $post_id The post ID. |
|
| 1459 | + * @param string $img_size Optional. Thumbnail size. |
|
| 1460 | + * @param bool $no_images Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1461 | + * @param bool $add_featured Optional. Do you want to include featured images too? Default: true. |
|
| 1462 | + * @param int|string $limit Optional. Number of images. |
|
| 1463 | + * @return array|bool Returns images as an array. Each item is an object. |
|
| 1464 | + */ |
|
| 1465 | + function geodir_get_images($post_id = 0, $img_size = '', $no_images = false, $add_featured = true, $limit = '') |
|
| 1466 | + {
|
|
| 1467 | + global $wpdb; |
|
| 1468 | + if ($limit) {
|
|
| 1469 | + $limit_q = " LIMIT $limit "; |
|
| 1470 | + } else {
|
|
| 1471 | + $limit_q = ''; |
|
| 1472 | + } |
|
| 1473 | + $not_featured = ''; |
|
| 1474 | + $sub_dir = ''; |
|
| 1475 | + if (!$add_featured) |
|
| 1476 | + $not_featured = " AND is_featured = 0 "; |
|
| 1477 | + |
|
| 1478 | + $arrImages = $wpdb->get_results( |
|
| 1479 | + $wpdb->prepare( |
|
| 1480 | + "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ", |
|
| 1481 | + array('%image%', $post_id)
|
|
| 1482 | + ) |
|
| 1483 | + ); |
|
| 1484 | + |
|
| 1485 | + $counter = 0; |
|
| 1486 | + $return_arr = array(); |
|
| 1487 | + |
|
| 1488 | + if (!empty($arrImages)) {
|
|
| 1489 | + foreach ($arrImages as $attechment) {
|
|
| 1490 | + |
|
| 1491 | + $img_arr = array(); |
|
| 1492 | + $img_arr['id'] = $attechment->ID; |
|
| 1493 | + $img_arr['user_id'] = isset($attechment->user_id) ? $attechment->user_id : 0; |
|
| 1494 | + |
|
| 1495 | + $file_info = pathinfo($attechment->file); |
|
| 1496 | + |
|
| 1497 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 1498 | + $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 1499 | + |
|
| 1500 | + $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 1501 | + $uploads_baseurl = $uploads['baseurl']; |
|
| 1502 | + $uploads_path = $uploads['path']; |
|
| 1503 | + |
|
| 1504 | + $file_name = $file_info['basename']; |
|
| 1505 | + |
|
| 1506 | + $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1507 | + /* |
|
| 1508 | 1508 | * Allows the filter of image src for such things as CDN change. |
| 1509 | 1509 | * |
| 1510 | 1510 | * @since 1.5.7 |
@@ -1513,532 +1513,532 @@ discard block |
||
| 1513 | 1513 | * @param string $uploads_url The server upload directory url. |
| 1514 | 1514 | * @param string $uploads_baseurl The uploads dir base url. |
| 1515 | 1515 | */ |
| 1516 | - $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1517 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1518 | - $width = 0; |
|
| 1519 | - $height = 0; |
|
| 1520 | - if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1521 | - $imagesize = getimagesize($img_arr['path']); |
|
| 1522 | - $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1523 | - $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1524 | - } |
|
| 1525 | - $img_arr['width'] = $width; |
|
| 1526 | - $img_arr['height'] = $height; |
|
| 1527 | - |
|
| 1528 | - $img_arr['file'] = $file_name; // add the title to the array |
|
| 1529 | - $img_arr['title'] = $attechment->title; // add the title to the array |
|
| 1530 | - $img_arr['caption'] = isset($attechment->caption) ? $attechment->caption : ''; // add the caption to the array |
|
| 1531 | - $img_arr['content'] = $attechment->content; // add the description to the array |
|
| 1532 | - $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1. |
|
| 1533 | - |
|
| 1534 | - $return_arr[] = (object)$img_arr; |
|
| 1535 | - |
|
| 1536 | - $counter++; |
|
| 1537 | - } |
|
| 1538 | - //return (object)$return_arr; |
|
| 1539 | - /** |
|
| 1540 | - * Filter the images array so things can be changed. |
|
| 1541 | - * |
|
| 1542 | - * @since 1.6.20 |
|
| 1543 | - * @param array $return_arr The array of image objects. |
|
| 1544 | - */ |
|
| 1545 | - return apply_filters('geodir_get_images_arr',$return_arr);
|
|
| 1546 | - } else if ($no_images) {
|
|
| 1547 | - $default_img = ''; |
|
| 1548 | - $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1549 | - $post_type = get_post_type($post_id); |
|
| 1550 | - if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) |
|
| 1551 | - $default_img = $default_catimg['src']; |
|
| 1552 | - elseif ($no_images) {
|
|
| 1553 | - $default_img = get_option('geodir_listing_no_img');
|
|
| 1554 | - } |
|
| 1555 | - |
|
| 1556 | - if (!empty($default_img)) {
|
|
| 1557 | - $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 1516 | + $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1517 | + $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1518 | + $width = 0; |
|
| 1519 | + $height = 0; |
|
| 1520 | + if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
|
| 1521 | + $imagesize = getimagesize($img_arr['path']); |
|
| 1522 | + $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1523 | + $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1524 | + } |
|
| 1525 | + $img_arr['width'] = $width; |
|
| 1526 | + $img_arr['height'] = $height; |
|
| 1527 | + |
|
| 1528 | + $img_arr['file'] = $file_name; // add the title to the array |
|
| 1529 | + $img_arr['title'] = $attechment->title; // add the title to the array |
|
| 1530 | + $img_arr['caption'] = isset($attechment->caption) ? $attechment->caption : ''; // add the caption to the array |
|
| 1531 | + $img_arr['content'] = $attechment->content; // add the description to the array |
|
| 1532 | + $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1. |
|
| 1533 | + |
|
| 1534 | + $return_arr[] = (object)$img_arr; |
|
| 1535 | + |
|
| 1536 | + $counter++; |
|
| 1537 | + } |
|
| 1538 | + //return (object)$return_arr; |
|
| 1539 | + /** |
|
| 1540 | + * Filter the images array so things can be changed. |
|
| 1541 | + * |
|
| 1542 | + * @since 1.6.20 |
|
| 1543 | + * @param array $return_arr The array of image objects. |
|
| 1544 | + */ |
|
| 1545 | + return apply_filters('geodir_get_images_arr',$return_arr);
|
|
| 1546 | + } else if ($no_images) {
|
|
| 1547 | + $default_img = ''; |
|
| 1548 | + $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1549 | + $post_type = get_post_type($post_id); |
|
| 1550 | + if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) |
|
| 1551 | + $default_img = $default_catimg['src']; |
|
| 1552 | + elseif ($no_images) {
|
|
| 1553 | + $default_img = get_option('geodir_listing_no_img');
|
|
| 1554 | + } |
|
| 1555 | + |
|
| 1556 | + if (!empty($default_img)) {
|
|
| 1557 | + $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 1558 | 1558 | |
| 1559 | - $image_path = $default_img; |
|
| 1560 | - if (!path_is_absolute($image_path)) {
|
|
| 1561 | - $image_path = str_replace($uploads['baseurl'], $uploads['basedir'], $image_path); |
|
| 1562 | - } |
|
| 1563 | - |
|
| 1564 | - $file_info = pathinfo($default_img); |
|
| 1565 | - $file_name = $file_info['basename']; |
|
| 1566 | - |
|
| 1567 | - $width = ''; |
|
| 1568 | - $height = ''; |
|
| 1569 | - if (is_file($image_path) && file_exists($image_path)) {
|
|
| 1570 | - $imagesize = getimagesize($image_path); |
|
| 1571 | - $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1572 | - $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1573 | - } |
|
| 1559 | + $image_path = $default_img; |
|
| 1560 | + if (!path_is_absolute($image_path)) {
|
|
| 1561 | + $image_path = str_replace($uploads['baseurl'], $uploads['basedir'], $image_path); |
|
| 1562 | + } |
|
| 1563 | + |
|
| 1564 | + $file_info = pathinfo($default_img); |
|
| 1565 | + $file_name = $file_info['basename']; |
|
| 1566 | + |
|
| 1567 | + $width = ''; |
|
| 1568 | + $height = ''; |
|
| 1569 | + if (is_file($image_path) && file_exists($image_path)) {
|
|
| 1570 | + $imagesize = getimagesize($image_path); |
|
| 1571 | + $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1572 | + $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1573 | + } |
|
| 1574 | 1574 | |
| 1575 | - $img_arr = array(); |
|
| 1576 | - $img_arr['src'] = $default_img; |
|
| 1577 | - $img_arr['path'] = $image_path; |
|
| 1578 | - $img_arr['width'] = $width; |
|
| 1579 | - $img_arr['height'] = $height; |
|
| 1580 | - $img_arr['file'] = $file_name; // add the title to the array |
|
| 1581 | - $img_arr['title'] = $file_info['filename']; // add the title to the array |
|
| 1582 | - $img_arr['content'] = $file_info['filename']; // add the description to the array |
|
| 1583 | - |
|
| 1584 | - $return_arr[] = (object)$img_arr; |
|
| 1585 | - |
|
| 1586 | - /** |
|
| 1587 | - * Filter the images array so things can be changed. |
|
| 1588 | - * |
|
| 1589 | - * @since 1.6.20 |
|
| 1590 | - * @param array $return_arr The array of image objects. |
|
| 1591 | - */ |
|
| 1592 | - return apply_filters('geodir_get_images_arr',$return_arr);
|
|
| 1593 | - } else |
|
| 1594 | - return false; |
|
| 1595 | - } |
|
| 1596 | - } |
|
| 1575 | + $img_arr = array(); |
|
| 1576 | + $img_arr['src'] = $default_img; |
|
| 1577 | + $img_arr['path'] = $image_path; |
|
| 1578 | + $img_arr['width'] = $width; |
|
| 1579 | + $img_arr['height'] = $height; |
|
| 1580 | + $img_arr['file'] = $file_name; // add the title to the array |
|
| 1581 | + $img_arr['title'] = $file_info['filename']; // add the title to the array |
|
| 1582 | + $img_arr['content'] = $file_info['filename']; // add the description to the array |
|
| 1583 | + |
|
| 1584 | + $return_arr[] = (object)$img_arr; |
|
| 1585 | + |
|
| 1586 | + /** |
|
| 1587 | + * Filter the images array so things can be changed. |
|
| 1588 | + * |
|
| 1589 | + * @since 1.6.20 |
|
| 1590 | + * @param array $return_arr The array of image objects. |
|
| 1591 | + */ |
|
| 1592 | + return apply_filters('geodir_get_images_arr',$return_arr);
|
|
| 1593 | + } else |
|
| 1594 | + return false; |
|
| 1595 | + } |
|
| 1596 | + } |
|
| 1597 | 1597 | } |
| 1598 | 1598 | |
| 1599 | 1599 | if (!function_exists('geodir_show_image')) {
|
| 1600 | - /** |
|
| 1601 | - * Show image using image details. |
|
| 1602 | - * |
|
| 1603 | - * @since 1.0.0 |
|
| 1604 | - * @package GeoDirectory |
|
| 1605 | - * @param array|object $request Image info either as an array or object. |
|
| 1606 | - * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1607 | - * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1608 | - * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true. |
|
| 1609 | - * @return bool|string Returns image html. |
|
| 1610 | - */ |
|
| 1611 | - function geodir_show_image($request = array(), $size = 'thumbnail', $no_image = false, $echo = true) |
|
| 1612 | - {
|
|
| 1613 | - $image = new stdClass(); |
|
| 1614 | - |
|
| 1615 | - $html = ''; |
|
| 1616 | - if (!empty($request)) {
|
|
| 1617 | - if (!is_object($request)){
|
|
| 1618 | - $request = (object)$request; |
|
| 1619 | - } |
|
| 1620 | - |
|
| 1621 | - if (isset($request->src) && !isset($request->path)) {
|
|
| 1622 | - $request->path = $request->src; |
|
| 1623 | - } |
|
| 1624 | - |
|
| 1625 | - /* |
|
| 1600 | + /** |
|
| 1601 | + * Show image using image details. |
|
| 1602 | + * |
|
| 1603 | + * @since 1.0.0 |
|
| 1604 | + * @package GeoDirectory |
|
| 1605 | + * @param array|object $request Image info either as an array or object. |
|
| 1606 | + * @param string $size Optional. Thumbnail size. Default: thumbnail. |
|
| 1607 | + * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false. |
|
| 1608 | + * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true. |
|
| 1609 | + * @return bool|string Returns image html. |
|
| 1610 | + */ |
|
| 1611 | + function geodir_show_image($request = array(), $size = 'thumbnail', $no_image = false, $echo = true) |
|
| 1612 | + {
|
|
| 1613 | + $image = new stdClass(); |
|
| 1614 | + |
|
| 1615 | + $html = ''; |
|
| 1616 | + if (!empty($request)) {
|
|
| 1617 | + if (!is_object($request)){
|
|
| 1618 | + $request = (object)$request; |
|
| 1619 | + } |
|
| 1620 | + |
|
| 1621 | + if (isset($request->src) && !isset($request->path)) {
|
|
| 1622 | + $request->path = $request->src; |
|
| 1623 | + } |
|
| 1624 | + |
|
| 1625 | + /* |
|
| 1626 | 1626 | * getimagesize() works faster from path than url so we try and get path if we can. |
| 1627 | 1627 | */ |
| 1628 | - $upload_dir = wp_upload_dir(); |
|
| 1629 | - $img_no_http = str_replace(array("http://", "https://"), "", $request->path);
|
|
| 1630 | - $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);
|
|
| 1631 | - if (strpos($img_no_http, $upload_no_http) !== false) {
|
|
| 1632 | - $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path); |
|
| 1633 | - } |
|
| 1628 | + $upload_dir = wp_upload_dir(); |
|
| 1629 | + $img_no_http = str_replace(array("http://", "https://"), "", $request->path);
|
|
| 1630 | + $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);
|
|
| 1631 | + if (strpos($img_no_http, $upload_no_http) !== false) {
|
|
| 1632 | + $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path); |
|
| 1633 | + } |
|
| 1634 | 1634 | |
| 1635 | - $width = 0; |
|
| 1636 | - $height = 0; |
|
| 1637 | - if (is_file($request->path) && file_exists($request->path)) {
|
|
| 1638 | - $imagesize = getimagesize($request->path); |
|
| 1639 | - $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1640 | - $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1641 | - } |
|
| 1642 | - |
|
| 1643 | - |
|
| 1644 | - $image->src = $request->src; |
|
| 1645 | - $image->width = $width; |
|
| 1646 | - $image->height = $height; |
|
| 1647 | - $image->title = isset($request->title) ? $request->title : ''; |
|
| 1648 | - |
|
| 1649 | - $max_size = (object)geodir_get_imagesize($size); |
|
| 1650 | - |
|
| 1651 | - if (!is_wp_error($max_size)) {
|
|
| 1652 | - if ($image->width) {
|
|
| 1653 | - if ($image->height >= $image->width) {
|
|
| 1654 | - $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2); |
|
| 1655 | - } else if ($image->width < ($max_size->h)) {
|
|
| 1656 | - $width_per = round((($image->width / $max_size->w) * 100), 2); |
|
| 1657 | - } else |
|
| 1658 | - $width_per = 100; |
|
| 1659 | - } |
|
| 1660 | - |
|
| 1661 | - if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
|
|
| 1662 | - $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '" /></div>'; |
|
| 1663 | - } else {
|
|
| 1664 | - if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
|
|
| 1665 | - $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');" title="'.$image->title.'" aria-label="'.$image->title.'" ></div>'; |
|
| 1666 | - }else{
|
|
| 1667 | - $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" title="'.$image->title.'" aria-label="'.$image->title.'"></div>';
|
|
| 1668 | - } |
|
| 1669 | - |
|
| 1670 | - } |
|
| 1671 | - } |
|
| 1672 | - } |
|
| 1673 | - |
|
| 1674 | - if (!empty($html) && $echo) {
|
|
| 1675 | - echo $html; |
|
| 1676 | - } elseif (!empty($html)) {
|
|
| 1677 | - return $html; |
|
| 1678 | - } else |
|
| 1679 | - return false; |
|
| 1680 | - } |
|
| 1681 | -} |
|
| 1635 | + $width = 0; |
|
| 1636 | + $height = 0; |
|
| 1637 | + if (is_file($request->path) && file_exists($request->path)) {
|
|
| 1638 | + $imagesize = getimagesize($request->path); |
|
| 1639 | + $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : ''; |
|
| 1640 | + $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : ''; |
|
| 1641 | + } |
|
| 1682 | 1642 | |
| 1683 | -if (!function_exists('geodir_set_post_terms')) {
|
|
| 1684 | - /** |
|
| 1685 | - * Set post Categories. |
|
| 1686 | - * |
|
| 1687 | - * @since 1.0.0 |
|
| 1688 | - * @package GeoDirectory |
|
| 1689 | - * @global object $wpdb WordPress Database object. |
|
| 1690 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 1691 | - * @param int $post_id The post ID. |
|
| 1692 | - * @param array $terms An array of term objects. |
|
| 1693 | - * @param array $tt_ids An array of term taxonomy IDs. |
|
| 1694 | - * @param string $taxonomy Taxonomy slug. |
|
| 1695 | - */ |
|
| 1696 | - function geodir_set_post_terms($post_id, $terms, $tt_ids, $taxonomy) |
|
| 1697 | - {
|
|
| 1698 | - global $wpdb, $plugin_prefix; |
|
| 1699 | 1643 | |
| 1700 | - $post_type = get_post_type($post_id); |
|
| 1644 | + $image->src = $request->src; |
|
| 1645 | + $image->width = $width; |
|
| 1646 | + $image->height = $height; |
|
| 1647 | + $image->title = isset($request->title) ? $request->title : ''; |
|
| 1701 | 1648 | |
| 1702 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1649 | + $max_size = (object)geodir_get_imagesize($size); |
|
| 1703 | 1650 | |
| 1704 | - if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {
|
|
| 1651 | + if (!is_wp_error($max_size)) {
|
|
| 1652 | + if ($image->width) {
|
|
| 1653 | + if ($image->height >= $image->width) {
|
|
| 1654 | + $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2); |
|
| 1655 | + } else if ($image->width < ($max_size->h)) {
|
|
| 1656 | + $width_per = round((($image->width / $max_size->w) * 100), 2); |
|
| 1657 | + } else |
|
| 1658 | + $width_per = 100; |
|
| 1659 | + } |
|
| 1705 | 1660 | |
| 1706 | - if ($taxonomy == $post_type . '_tags') {
|
|
| 1707 | - if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
|
| 1708 | - geodir_save_post_meta($post_id, 'post_tags', $terms); |
|
| 1709 | - } |
|
| 1710 | - } elseif ($taxonomy == $post_type . 'category') {
|
|
| 1711 | - $srcharr = array('"', '\\');
|
|
| 1712 | - $replarr = array(""", '');
|
|
| 1661 | + if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
|
|
| 1662 | + $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '" /></div>'; |
|
| 1663 | + } else {
|
|
| 1664 | + if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
|
|
| 1665 | + $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');" title="'.$image->title.'" aria-label="'.$image->title.'" ></div>'; |
|
| 1666 | + }else{
|
|
| 1667 | + $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" title="'.$image->title.'" aria-label="'.$image->title.'"></div>';
|
|
| 1668 | + } |
|
| 1713 | 1669 | |
| 1714 | - $post_obj = get_post($post_id); |
|
| 1670 | + } |
|
| 1671 | + } |
|
| 1672 | + } |
|
| 1673 | + |
|
| 1674 | + if (!empty($html) && $echo) {
|
|
| 1675 | + echo $html; |
|
| 1676 | + } elseif (!empty($html)) {
|
|
| 1677 | + return $html; |
|
| 1678 | + } else |
|
| 1679 | + return false; |
|
| 1680 | + } |
|
| 1681 | +} |
|
| 1715 | 1682 | |
| 1716 | - $cat_ids = array('0');
|
|
| 1717 | - if (is_array($tt_ids)) |
|
| 1718 | - $cat_ids = $tt_ids; |
|
| 1683 | +if (!function_exists('geodir_set_post_terms')) {
|
|
| 1684 | + /** |
|
| 1685 | + * Set post Categories. |
|
| 1686 | + * |
|
| 1687 | + * @since 1.0.0 |
|
| 1688 | + * @package GeoDirectory |
|
| 1689 | + * @global object $wpdb WordPress Database object. |
|
| 1690 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 1691 | + * @param int $post_id The post ID. |
|
| 1692 | + * @param array $terms An array of term objects. |
|
| 1693 | + * @param array $tt_ids An array of term taxonomy IDs. |
|
| 1694 | + * @param string $taxonomy Taxonomy slug. |
|
| 1695 | + */ |
|
| 1696 | + function geodir_set_post_terms($post_id, $terms, $tt_ids, $taxonomy) |
|
| 1697 | + {
|
|
| 1698 | + global $wpdb, $plugin_prefix; |
|
| 1699 | + |
|
| 1700 | + $post_type = get_post_type($post_id); |
|
| 1701 | + |
|
| 1702 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1703 | + |
|
| 1704 | + if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {
|
|
| 1705 | + |
|
| 1706 | + if ($taxonomy == $post_type . '_tags') {
|
|
| 1707 | + if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
|
| 1708 | + geodir_save_post_meta($post_id, 'post_tags', $terms); |
|
| 1709 | + } |
|
| 1710 | + } elseif ($taxonomy == $post_type . 'category') {
|
|
| 1711 | + $srcharr = array('"', '\\');
|
|
| 1712 | + $replarr = array(""", '');
|
|
| 1719 | 1713 | |
| 1714 | + $post_obj = get_post($post_id); |
|
| 1720 | 1715 | |
| 1721 | - if (!empty($cat_ids)) {
|
|
| 1722 | - $cat_ids_array = $cat_ids; |
|
| 1723 | - $cat_ids_length = count($cat_ids_array); |
|
| 1724 | - $cat_ids_format = array_fill(0, $cat_ids_length, '%d'); |
|
| 1725 | - $format = implode(',', $cat_ids_format);
|
|
| 1716 | + $cat_ids = array('0');
|
|
| 1717 | + if (is_array($tt_ids)) |
|
| 1718 | + $cat_ids = $tt_ids; |
|
| 1726 | 1719 | |
| 1727 | - $cat_ids_array_del = $cat_ids_array; |
|
| 1728 | - $cat_ids_array_del[] = $post_id; |
|
| 1729 | 1720 | |
| 1730 | - $wpdb->get_var( |
|
| 1731 | - $wpdb->prepare( |
|
| 1732 | - "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ", |
|
| 1733 | - $cat_ids_array_del |
|
| 1734 | - ) |
|
| 1735 | - ); |
|
| 1721 | + if (!empty($cat_ids)) {
|
|
| 1722 | + $cat_ids_array = $cat_ids; |
|
| 1723 | + $cat_ids_length = count($cat_ids_array); |
|
| 1724 | + $cat_ids_format = array_fill(0, $cat_ids_length, '%d'); |
|
| 1725 | + $format = implode(',', $cat_ids_format);
|
|
| 1736 | 1726 | |
| 1727 | + $cat_ids_array_del = $cat_ids_array; |
|
| 1728 | + $cat_ids_array_del[] = $post_id; |
|
| 1737 | 1729 | |
| 1738 | - $post_term = $wpdb->get_col( |
|
| 1739 | - $wpdb->prepare( |
|
| 1740 | - "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id", |
|
| 1741 | - $cat_ids_array |
|
| 1742 | - ) |
|
| 1743 | - ); |
|
| 1730 | + $wpdb->get_var( |
|
| 1731 | + $wpdb->prepare( |
|
| 1732 | + "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ", |
|
| 1733 | + $cat_ids_array_del |
|
| 1734 | + ) |
|
| 1735 | + ); |
|
| 1744 | 1736 | |
| 1745 | - } |
|
| 1746 | 1737 | |
| 1747 | - $post_marker_json = ''; |
|
| 1738 | + $post_term = $wpdb->get_col( |
|
| 1739 | + $wpdb->prepare( |
|
| 1740 | + "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id", |
|
| 1741 | + $cat_ids_array |
|
| 1742 | + ) |
|
| 1743 | + ); |
|
| 1748 | 1744 | |
| 1749 | - if (!empty($post_term)): |
|
| 1745 | + } |
|
| 1750 | 1746 | |
| 1751 | - foreach ($post_term as $cat_id): |
|
| 1747 | + $post_marker_json = ''; |
|
| 1752 | 1748 | |
| 1753 | - $term_icon_url = geodir_get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type); |
|
| 1754 | - $term_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : ''; |
|
| 1749 | + if (!empty($post_term)): |
|
| 1755 | 1750 | |
| 1756 | - $post_title = $post_obj->title; |
|
| 1757 | - $title = str_replace($srcharr, $replarr, $post_title); |
|
| 1751 | + foreach ($post_term as $cat_id): |
|
| 1758 | 1752 | |
| 1759 | - $lat = geodir_get_post_meta($post_id, 'post_latitude', true); |
|
| 1760 | - $lng = geodir_get_post_meta($post_id, 'post_longitude', true); |
|
| 1753 | + $term_icon_url = geodir_get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type); |
|
| 1754 | + $term_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : ''; |
|
| 1761 | 1755 | |
| 1762 | - $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
|
|
| 1763 | - $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true); |
|
| 1756 | + $post_title = $post_obj->title; |
|
| 1757 | + $title = str_replace($srcharr, $replarr, $post_title); |
|
| 1764 | 1758 | |
| 1765 | - $json = '{';
|
|
| 1766 | - $json .= '"id":"' . $post_id . '",'; |
|
| 1767 | - $json .= '"lat_pos": "' . $lat . '",'; |
|
| 1768 | - $json .= '"long_pos": "' . $lng . '",'; |
|
| 1769 | - $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",'; |
|
| 1770 | - $json .= '"icon":"' . $term_icon . '",'; |
|
| 1771 | - $json .= '"group":"catgroup' . $cat_id . '"'; |
|
| 1772 | - $json .= '}'; |
|
| 1759 | + $lat = geodir_get_post_meta($post_id, 'post_latitude', true); |
|
| 1760 | + $lng = geodir_get_post_meta($post_id, 'post_longitude', true); |
|
| 1773 | 1761 | |
| 1762 | + $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
|
|
| 1763 | + $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true); |
|
| 1774 | 1764 | |
| 1775 | - if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true)) |
|
| 1776 | - $post_marker_json = $json; |
|
| 1765 | + $json = '{';
|
|
| 1766 | + $json .= '"id":"' . $post_id . '",'; |
|
| 1767 | + $json .= '"lat_pos": "' . $lat . '",'; |
|
| 1768 | + $json .= '"long_pos": "' . $lng . '",'; |
|
| 1769 | + $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",'; |
|
| 1770 | + $json .= '"icon":"' . $term_icon . '",'; |
|
| 1771 | + $json .= '"group":"catgroup' . $cat_id . '"'; |
|
| 1772 | + $json .= '}'; |
|
| 1777 | 1773 | |
| 1778 | 1774 | |
| 1779 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {
|
|
| 1775 | + if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true)) |
|
| 1776 | + $post_marker_json = $json; |
|
| 1780 | 1777 | |
| 1781 | - $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET
|
|
| 1778 | + |
|
| 1779 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {
|
|
| 1780 | + |
|
| 1781 | + $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET
|
|
| 1782 | 1782 | post_title = %s, |
| 1783 | 1783 | json = %s |
| 1784 | 1784 | WHERE post_id = %d AND cat_id = %d ", |
| 1785 | - array($post_title, $json, $post_id, $cat_id)); |
|
| 1785 | + array($post_title, $json, $post_id, $cat_id)); |
|
| 1786 | 1786 | |
| 1787 | - } else {
|
|
| 1787 | + } else {
|
|
| 1788 | 1788 | |
| 1789 | - $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET
|
|
| 1789 | + $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET
|
|
| 1790 | 1790 | post_id = %d, |
| 1791 | 1791 | post_title = %s, |
| 1792 | 1792 | cat_id = %d, |
| 1793 | 1793 | json = %s", |
| 1794 | - array($post_id, $post_title, $cat_id, $json)); |
|
| 1794 | + array($post_id, $post_title, $cat_id, $json)); |
|
| 1795 | 1795 | |
| 1796 | - } |
|
| 1796 | + } |
|
| 1797 | 1797 | |
| 1798 | - $wpdb->query($json_query); |
|
| 1798 | + $wpdb->query($json_query); |
|
| 1799 | 1799 | |
| 1800 | - endforeach; |
|
| 1800 | + endforeach; |
|
| 1801 | 1801 | |
| 1802 | - endif; |
|
| 1802 | + endif; |
|
| 1803 | 1803 | |
| 1804 | - if (!empty($post_term) && is_array($post_term)) {
|
|
| 1805 | - $categories = implode(',', $post_term);
|
|
| 1804 | + if (!empty($post_term) && is_array($post_term)) {
|
|
| 1805 | + $categories = implode(',', $post_term);
|
|
| 1806 | 1806 | |
| 1807 | - if ($categories != '' && $categories != 0) $categories = ',' . $categories . ','; |
|
| 1807 | + if ($categories != '' && $categories != 0) $categories = ',' . $categories . ','; |
|
| 1808 | 1808 | |
| 1809 | - if (empty($post_marker_json)) |
|
| 1810 | - $post_marker_json = isset($json) ? $json : ''; |
|
| 1809 | + if (empty($post_marker_json)) |
|
| 1810 | + $post_marker_json = isset($json) ? $json : ''; |
|
| 1811 | 1811 | |
| 1812 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 1812 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 1813 | 1813 | |
| 1814 | - $wpdb->query( |
|
| 1815 | - $wpdb->prepare( |
|
| 1816 | - "UPDATE " . $table . " SET |
|
| 1814 | + $wpdb->query( |
|
| 1815 | + $wpdb->prepare( |
|
| 1816 | + "UPDATE " . $table . " SET |
|
| 1817 | 1817 | " . $taxonomy . " = %s, |
| 1818 | 1818 | marker_json = %s |
| 1819 | 1819 | where post_id = %d", |
| 1820 | - array($categories, $post_marker_json, $post_id) |
|
| 1821 | - ) |
|
| 1822 | - ); |
|
| 1820 | + array($categories, $post_marker_json, $post_id) |
|
| 1821 | + ) |
|
| 1822 | + ); |
|
| 1823 | 1823 | |
| 1824 | - if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'inline-save') {
|
|
| 1824 | + if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'inline-save') {
|
|
| 1825 | 1825 | |
| 1826 | - $categories = trim($categories, ','); |
|
| 1826 | + $categories = trim($categories, ','); |
|
| 1827 | 1827 | |
| 1828 | - if ($categories) {
|
|
| 1828 | + if ($categories) {
|
|
| 1829 | 1829 | |
| 1830 | - $categories = explode(',', $categories);
|
|
| 1830 | + $categories = explode(',', $categories);
|
|
| 1831 | 1831 | |
| 1832 | - $default_category = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1832 | + $default_category = geodir_get_post_meta($post_id, 'default_category', true); |
|
| 1833 | 1833 | |
| 1834 | - if (!in_array($default_category, $categories)) {
|
|
| 1834 | + if (!in_array($default_category, $categories)) {
|
|
| 1835 | 1835 | |
| 1836 | - $wpdb->query( |
|
| 1837 | - $wpdb->prepare( |
|
| 1838 | - "UPDATE " . $table . " SET |
|
| 1836 | + $wpdb->query( |
|
| 1837 | + $wpdb->prepare( |
|
| 1838 | + "UPDATE " . $table . " SET |
|
| 1839 | 1839 | default_category = %s |
| 1840 | 1840 | where post_id = %d", |
| 1841 | - array($categories[0], $post_id) |
|
| 1842 | - ) |
|
| 1843 | - ); |
|
| 1841 | + array($categories[0], $post_id) |
|
| 1842 | + ) |
|
| 1843 | + ); |
|
| 1844 | 1844 | |
| 1845 | - $default_category = $categories[0]; |
|
| 1845 | + $default_category = $categories[0]; |
|
| 1846 | 1846 | |
| 1847 | - } |
|
| 1847 | + } |
|
| 1848 | 1848 | |
| 1849 | - if ($default_category == '') |
|
| 1850 | - $default_category = $categories[0]; |
|
| 1849 | + if ($default_category == '') |
|
| 1850 | + $default_category = $categories[0]; |
|
| 1851 | 1851 | |
| 1852 | - geodir_set_postcat_structure($post_id, $taxonomy, $default_category, ''); |
|
| 1852 | + geodir_set_postcat_structure($post_id, $taxonomy, $default_category, ''); |
|
| 1853 | 1853 | |
| 1854 | - } |
|
| 1854 | + } |
|
| 1855 | 1855 | |
| 1856 | - } |
|
| 1856 | + } |
|
| 1857 | 1857 | |
| 1858 | 1858 | |
| 1859 | - } else {
|
|
| 1859 | + } else {
|
|
| 1860 | 1860 | |
| 1861 | - $wpdb->query( |
|
| 1862 | - $wpdb->prepare( |
|
| 1863 | - "INSERT INTO " . $table . " SET |
|
| 1861 | + $wpdb->query( |
|
| 1862 | + $wpdb->prepare( |
|
| 1863 | + "INSERT INTO " . $table . " SET |
|
| 1864 | 1864 | post_id = %d, |
| 1865 | 1865 | " . $taxonomy . " = %s, |
| 1866 | 1866 | marker_json = %s ", |
| 1867 | 1867 | |
| 1868 | - array($post_id, $categories, $post_marker_json) |
|
| 1869 | - ) |
|
| 1870 | - ); |
|
| 1871 | - } |
|
| 1872 | - } |
|
| 1873 | - } |
|
| 1874 | - } |
|
| 1875 | - } |
|
| 1868 | + array($post_id, $categories, $post_marker_json) |
|
| 1869 | + ) |
|
| 1870 | + ); |
|
| 1871 | + } |
|
| 1872 | + } |
|
| 1873 | + } |
|
| 1874 | + } |
|
| 1875 | + } |
|
| 1876 | 1876 | } |
| 1877 | 1877 | |
| 1878 | 1878 | if (!function_exists('geodir_get_infowindow_html')) {
|
| 1879 | - /** |
|
| 1880 | - * Set post Map Marker info html. |
|
| 1881 | - * |
|
| 1882 | - * @since 1.0.0 |
|
| 1883 | - * @since 1.5.4 Modified to add new action "geodir_infowindow_meta_before". |
|
| 1884 | - * @since 1.6.16 Changes for disable review stars for certain post type. |
|
| 1885 | - * @since 1.6.18 Fix: Map marker not showing custom fields in bubble info. |
|
| 1886 | - * @package GeoDirectory |
|
| 1887 | - * @global array $geodir_addon_list List of active GeoDirectory extensions. |
|
| 1888 | - * @global object $gd_session GeoDirectory Session object. |
|
| 1889 | - * @param object $postinfo_obj The post details object. |
|
| 1890 | - * @param string $post_preview Is this a post preview?. |
|
| 1891 | - * @global object $post WordPress Post object. |
|
| 1892 | - * @return mixed|string|void |
|
| 1893 | - */ |
|
| 1894 | - function geodir_get_infowindow_html($postinfo_obj, $post_preview = '') {
|
|
| 1895 | - global $preview, $post, $gd_session; |
|
| 1896 | - $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 1897 | - $replarr = array("′", "⁄", "–", "“", '');
|
|
| 1898 | - |
|
| 1899 | - if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
|
|
| 1900 | - $ID = ''; |
|
| 1901 | - $plink = ''; |
|
| 1902 | - |
|
| 1903 | - if (isset($postinfo_obj->pid)) {
|
|
| 1904 | - $ID = $postinfo_obj->pid; |
|
| 1905 | - $plink = get_permalink($ID); |
|
| 1906 | - } |
|
| 1907 | - |
|
| 1908 | - $title = str_replace($srcharr, $replarr, ($postinfo_obj->post_title)); |
|
| 1909 | - $lat = $postinfo_obj->post_latitude; |
|
| 1910 | - $lng = $postinfo_obj->post_longitude; |
|
| 1911 | - } else {
|
|
| 1912 | - $ID = $postinfo_obj->post_id; |
|
| 1913 | - $title = str_replace($srcharr, $replarr, htmlentities($postinfo_obj->post_title, ENT_COMPAT, 'UTF-8')); // fix by Stiofan |
|
| 1914 | - $title = wp_specialchars_decode($title); // Fixed #post-320722 on 2016-12-08 |
|
| 1915 | - $plink = get_permalink($ID); |
|
| 1916 | - $lat = htmlentities(geodir_get_post_meta($ID, 'post_latitude', true)); |
|
| 1917 | - $lng = htmlentities(geodir_get_post_meta($ID, 'post_longitude', true)); |
|
| 1918 | - } |
|
| 1879 | + /** |
|
| 1880 | + * Set post Map Marker info html. |
|
| 1881 | + * |
|
| 1882 | + * @since 1.0.0 |
|
| 1883 | + * @since 1.5.4 Modified to add new action "geodir_infowindow_meta_before". |
|
| 1884 | + * @since 1.6.16 Changes for disable review stars for certain post type. |
|
| 1885 | + * @since 1.6.18 Fix: Map marker not showing custom fields in bubble info. |
|
| 1886 | + * @package GeoDirectory |
|
| 1887 | + * @global array $geodir_addon_list List of active GeoDirectory extensions. |
|
| 1888 | + * @global object $gd_session GeoDirectory Session object. |
|
| 1889 | + * @param object $postinfo_obj The post details object. |
|
| 1890 | + * @param string $post_preview Is this a post preview?. |
|
| 1891 | + * @global object $post WordPress Post object. |
|
| 1892 | + * @return mixed|string|void |
|
| 1893 | + */ |
|
| 1894 | + function geodir_get_infowindow_html($postinfo_obj, $post_preview = '') {
|
|
| 1895 | + global $preview, $post, $gd_session; |
|
| 1896 | + $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 1897 | + $replarr = array("′", "⁄", "–", "“", '');
|
|
| 1898 | + |
|
| 1899 | + if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
|
|
| 1900 | + $ID = ''; |
|
| 1901 | + $plink = ''; |
|
| 1902 | + |
|
| 1903 | + if (isset($postinfo_obj->pid)) {
|
|
| 1904 | + $ID = $postinfo_obj->pid; |
|
| 1905 | + $plink = get_permalink($ID); |
|
| 1906 | + } |
|
| 1907 | + |
|
| 1908 | + $title = str_replace($srcharr, $replarr, ($postinfo_obj->post_title)); |
|
| 1909 | + $lat = $postinfo_obj->post_latitude; |
|
| 1910 | + $lng = $postinfo_obj->post_longitude; |
|
| 1911 | + } else {
|
|
| 1912 | + $ID = $postinfo_obj->post_id; |
|
| 1913 | + $title = str_replace($srcharr, $replarr, htmlentities($postinfo_obj->post_title, ENT_COMPAT, 'UTF-8')); // fix by Stiofan |
|
| 1914 | + $title = wp_specialchars_decode($title); // Fixed #post-320722 on 2016-12-08 |
|
| 1915 | + $plink = get_permalink($ID); |
|
| 1916 | + $lat = htmlentities(geodir_get_post_meta($ID, 'post_latitude', true)); |
|
| 1917 | + $lng = htmlentities(geodir_get_post_meta($ID, 'post_longitude', true)); |
|
| 1918 | + } |
|
| 1919 | 1919 | |
| 1920 | - // Some theme overwrites global gd listing $post |
|
| 1921 | - if (!empty($ID) && (!empty($post->ID) && $post->ID != $ID) || empty($post)) {
|
|
| 1922 | - $post = geodir_get_post_info($ID); |
|
| 1923 | - } |
|
| 1920 | + // Some theme overwrites global gd listing $post |
|
| 1921 | + if (!empty($ID) && (!empty($post->ID) && $post->ID != $ID) || empty($post)) {
|
|
| 1922 | + $post = geodir_get_post_info($ID); |
|
| 1923 | + } |
|
| 1924 | 1924 | |
| 1925 | - $post_type = $ID ? get_post_type($ID) : ''; |
|
| 1926 | - |
|
| 1927 | - // filter field as per price package |
|
| 1928 | - global $geodir_addon_list; |
|
| 1929 | - if ($post_type && defined('GEODIRPAYMENT_VERSION')) {
|
|
| 1930 | - $package_id = isset($postinfo_obj->package_id) && $postinfo_obj->package_id ? $postinfo_obj->package_id : NULL; |
|
| 1931 | - $field_name = 'geodir_contact'; |
|
| 1932 | - if (!check_field_visibility($package_id, $field_name, $post_type)) {
|
|
| 1933 | - $contact = ''; |
|
| 1934 | - } |
|
| 1935 | - |
|
| 1936 | - $field_name = 'geodir_timing'; |
|
| 1937 | - if (!check_field_visibility($package_id, $field_name, $post_type)) {
|
|
| 1938 | - $timing = ''; |
|
| 1939 | - } |
|
| 1940 | - } |
|
| 1941 | - |
|
| 1942 | - if ($lat && $lng) {
|
|
| 1943 | - ob_start(); ?> |
|
| 1925 | + $post_type = $ID ? get_post_type($ID) : ''; |
|
| 1926 | + |
|
| 1927 | + // filter field as per price package |
|
| 1928 | + global $geodir_addon_list; |
|
| 1929 | + if ($post_type && defined('GEODIRPAYMENT_VERSION')) {
|
|
| 1930 | + $package_id = isset($postinfo_obj->package_id) && $postinfo_obj->package_id ? $postinfo_obj->package_id : NULL; |
|
| 1931 | + $field_name = 'geodir_contact'; |
|
| 1932 | + if (!check_field_visibility($package_id, $field_name, $post_type)) {
|
|
| 1933 | + $contact = ''; |
|
| 1934 | + } |
|
| 1935 | + |
|
| 1936 | + $field_name = 'geodir_timing'; |
|
| 1937 | + if (!check_field_visibility($package_id, $field_name, $post_type)) {
|
|
| 1938 | + $timing = ''; |
|
| 1939 | + } |
|
| 1940 | + } |
|
| 1941 | + |
|
| 1942 | + if ($lat && $lng) {
|
|
| 1943 | + ob_start(); ?> |
|
| 1944 | 1944 | <div class="gd-bubble" style=""> |
| 1945 | 1945 | <div class="gd-bubble-inside"> |
| 1946 | 1946 | <?php |
| 1947 | - $comment_count = ''; |
|
| 1948 | - $rating_star = ''; |
|
| 1949 | - if ($ID != '' && $post_type != '' && !geodir_cpt_has_rating_disabled($post_type)) {
|
|
| 1950 | - $rating_star = ''; |
|
| 1951 | - $comment_count = geodir_get_review_count_total($ID); |
|
| 1952 | - |
|
| 1953 | - if (!$preview) {
|
|
| 1954 | - $post_avgratings = geodir_get_post_rating($ID); |
|
| 1955 | - |
|
| 1956 | - $rating_star = geodir_get_rating_stars($post_avgratings, $ID, false); |
|
| 1957 | - |
|
| 1958 | - /** |
|
| 1959 | - * Filter to change rating stars |
|
| 1960 | - * |
|
| 1961 | - * You can use this filter to change Rating stars. |
|
| 1962 | - * |
|
| 1963 | - * @since 1.0.0 |
|
| 1964 | - * @package GeoDirectory |
|
| 1965 | - * @param string $rating_star Rating stars. |
|
| 1966 | - * @param float $post_avgratings Average ratings of the post. |
|
| 1967 | - * @param int $ID The post ID. |
|
| 1968 | - */ |
|
| 1969 | - $rating_star = apply_filters('geodir_review_rating_stars_on_infowindow', $rating_star, $post_avgratings, $ID);
|
|
| 1970 | - } |
|
| 1971 | - } |
|
| 1972 | - ?> |
|
| 1947 | + $comment_count = ''; |
|
| 1948 | + $rating_star = ''; |
|
| 1949 | + if ($ID != '' && $post_type != '' && !geodir_cpt_has_rating_disabled($post_type)) {
|
|
| 1950 | + $rating_star = ''; |
|
| 1951 | + $comment_count = geodir_get_review_count_total($ID); |
|
| 1952 | + |
|
| 1953 | + if (!$preview) {
|
|
| 1954 | + $post_avgratings = geodir_get_post_rating($ID); |
|
| 1955 | + |
|
| 1956 | + $rating_star = geodir_get_rating_stars($post_avgratings, $ID, false); |
|
| 1957 | + |
|
| 1958 | + /** |
|
| 1959 | + * Filter to change rating stars |
|
| 1960 | + * |
|
| 1961 | + * You can use this filter to change Rating stars. |
|
| 1962 | + * |
|
| 1963 | + * @since 1.0.0 |
|
| 1964 | + * @package GeoDirectory |
|
| 1965 | + * @param string $rating_star Rating stars. |
|
| 1966 | + * @param float $post_avgratings Average ratings of the post. |
|
| 1967 | + * @param int $ID The post ID. |
|
| 1968 | + */ |
|
| 1969 | + $rating_star = apply_filters('geodir_review_rating_stars_on_infowindow', $rating_star, $post_avgratings, $ID);
|
|
| 1970 | + } |
|
| 1971 | + } |
|
| 1972 | + ?> |
|
| 1973 | 1973 | <div class="geodir-bubble_desc"> |
| 1974 | 1974 | <h4> |
| 1975 | 1975 | <a href="<?php if ($plink != '') {
|
| 1976 | - echo $plink; |
|
| 1977 | - } else {
|
|
| 1978 | - echo 'javascript:void(0);'; |
|
| 1979 | - } ?>"><?php echo $title; ?></a> |
|
| 1976 | + echo $plink; |
|
| 1977 | + } else {
|
|
| 1978 | + echo 'javascript:void(0);'; |
|
| 1979 | + } ?>"><?php echo $title; ?></a> |
|
| 1980 | 1980 | </h4> |
| 1981 | 1981 | <?php |
| 1982 | - if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
|
|
| 1983 | - $post_images = array(); |
|
| 1984 | - if (!empty($postinfo_obj->post_images)) {
|
|
| 1985 | - $post_images = explode(",", $postinfo_obj->post_images);
|
|
| 1986 | - } |
|
| 1987 | - |
|
| 1988 | - if (!empty($post_images)) {
|
|
| 1989 | - ?> |
|
| 1982 | + if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {
|
|
| 1983 | + $post_images = array(); |
|
| 1984 | + if (!empty($postinfo_obj->post_images)) {
|
|
| 1985 | + $post_images = explode(",", $postinfo_obj->post_images);
|
|
| 1986 | + } |
|
| 1987 | + |
|
| 1988 | + if (!empty($post_images)) {
|
|
| 1989 | + ?> |
|
| 1990 | 1990 | <div class="geodir-bubble_image"><a href="<?php if ($plink != '') {
|
| 1991 | - echo $plink; |
|
| 1992 | - } else {
|
|
| 1993 | - echo 'javascript:void(0);'; |
|
| 1994 | - } ?>"><img alt="bubble image" style="max-height:50px;" |
|
| 1991 | + echo $plink; |
|
| 1992 | + } else {
|
|
| 1993 | + echo 'javascript:void(0);'; |
|
| 1994 | + } ?>"><img alt="bubble image" style="max-height:50px;" |
|
| 1995 | 1995 | src="<?php echo $post_images[0]; ?>"/></a></div> |
| 1996 | 1996 | <?php |
| 1997 | - }else{
|
|
| 1998 | - echo '<div class="geodir-bubble_image"></div>'; |
|
| 1999 | - } |
|
| 2000 | - } else {
|
|
| 2001 | - if ($image = geodir_show_featured_image($ID, 'widget-thumb', true, false, $postinfo_obj->featured_image)) {
|
|
| 2002 | - ?> |
|
| 1997 | + }else{
|
|
| 1998 | + echo '<div class="geodir-bubble_image"></div>'; |
|
| 1999 | + } |
|
| 2000 | + } else {
|
|
| 2001 | + if ($image = geodir_show_featured_image($ID, 'widget-thumb', true, false, $postinfo_obj->featured_image)) {
|
|
| 2002 | + ?> |
|
| 2003 | 2003 | <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div> |
| 2004 | 2004 | <?php |
| 2005 | - }else{
|
|
| 2006 | - echo '<div class="geodir-bubble_image"></div>'; |
|
| 2007 | - } |
|
| 2008 | - } |
|
| 2009 | - ?> |
|
| 2005 | + }else{
|
|
| 2006 | + echo '<div class="geodir-bubble_image"></div>'; |
|
| 2007 | + } |
|
| 2008 | + } |
|
| 2009 | + ?> |
|
| 2010 | 2010 | <div class="geodir-bubble-meta-side"> |
| 2011 | 2011 | <?php |
| 2012 | - /** |
|
| 2013 | - * Fires before the meta info in the map info window. |
|
| 2014 | - * |
|
| 2015 | - * This can be used to add more info to the map info window before the normal meta info. |
|
| 2016 | - * |
|
| 2017 | - * @since 1.5.4 |
|
| 2018 | - * @param int $ID The post id. |
|
| 2019 | - * @param object $postinfo_obj The posts info as an object. |
|
| 2020 | - * @param bool|string $post_preview True if currently in post preview page. Empty string if not. * |
|
| 2021 | - */ |
|
| 2022 | - do_action('geodir_infowindow_meta_before', $ID, $postinfo_obj, $post_preview);
|
|
| 2023 | - |
|
| 2024 | - echo geodir_show_listing_info('mapbubble');
|
|
| 2025 | - |
|
| 2026 | - /** |
|
| 2027 | - * Fires after the meta info in the map info window. |
|
| 2028 | - * |
|
| 2029 | - * This can be used to add more info to the map info window after the normal meta info. |
|
| 2030 | - * |
|
| 2031 | - * @since 1.4.2 |
|
| 2032 | - * @param object $postinfo_obj The posts info as an object. |
|
| 2033 | - * @param bool|string $post_preview True if currently in post preview page. Empty string if not. * |
|
| 2034 | - */ |
|
| 2035 | - do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );
|
|
| 2036 | - ?> |
|
| 2012 | + /** |
|
| 2013 | + * Fires before the meta info in the map info window. |
|
| 2014 | + * |
|
| 2015 | + * This can be used to add more info to the map info window before the normal meta info. |
|
| 2016 | + * |
|
| 2017 | + * @since 1.5.4 |
|
| 2018 | + * @param int $ID The post id. |
|
| 2019 | + * @param object $postinfo_obj The posts info as an object. |
|
| 2020 | + * @param bool|string $post_preview True if currently in post preview page. Empty string if not. * |
|
| 2021 | + */ |
|
| 2022 | + do_action('geodir_infowindow_meta_before', $ID, $postinfo_obj, $post_preview);
|
|
| 2023 | + |
|
| 2024 | + echo geodir_show_listing_info('mapbubble');
|
|
| 2025 | + |
|
| 2026 | + /** |
|
| 2027 | + * Fires after the meta info in the map info window. |
|
| 2028 | + * |
|
| 2029 | + * This can be used to add more info to the map info window after the normal meta info. |
|
| 2030 | + * |
|
| 2031 | + * @since 1.4.2 |
|
| 2032 | + * @param object $postinfo_obj The posts info as an object. |
|
| 2033 | + * @param bool|string $post_preview True if currently in post preview page. Empty string if not. * |
|
| 2034 | + */ |
|
| 2035 | + do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );
|
|
| 2036 | + ?> |
|
| 2037 | 2037 | </div> |
| 2038 | 2038 | <?php |
| 2039 | - if ($ID) {
|
|
| 2040 | - $post_author = isset($postinfo_obj->post_author) ? $postinfo_obj->post_author : get_post_field('post_author', $ID);
|
|
| 2041 | - ?> |
|
| 2039 | + if ($ID) {
|
|
| 2040 | + $post_author = isset($postinfo_obj->post_author) ? $postinfo_obj->post_author : get_post_field('post_author', $ID);
|
|
| 2041 | + ?> |
|
| 2042 | 2042 | <div class="geodir-bubble-meta-fade"></div> |
| 2043 | 2043 | <div class="geodir-bubble-meta-bottom"> |
| 2044 | 2044 | <?php if ($rating_star != '') { ?>
|
@@ -2054,69 +2054,69 @@ discard block |
||
| 2054 | 2054 | </div> |
| 2055 | 2055 | </div> |
| 2056 | 2056 | <?php |
| 2057 | - $html = ob_get_clean(); |
|
| 2058 | - /** |
|
| 2059 | - * Filter to change infowindow html |
|
| 2060 | - * |
|
| 2061 | - * You can use this filter to change infowindow html. |
|
| 2062 | - * |
|
| 2063 | - * @since 1.0.0 |
|
| 2064 | - * @package GeoDirectory |
|
| 2065 | - * @param string $html Infowindow html. |
|
| 2066 | - * @param object $postinfo_obj The Post object. |
|
| 2067 | - * @param bool|string $post_preview Is this a post preview? |
|
| 2068 | - */ |
|
| 2069 | - $html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);
|
|
| 2070 | - return $html; |
|
| 2071 | - } |
|
| 2072 | - } |
|
| 2057 | + $html = ob_get_clean(); |
|
| 2058 | + /** |
|
| 2059 | + * Filter to change infowindow html |
|
| 2060 | + * |
|
| 2061 | + * You can use this filter to change infowindow html. |
|
| 2062 | + * |
|
| 2063 | + * @since 1.0.0 |
|
| 2064 | + * @package GeoDirectory |
|
| 2065 | + * @param string $html Infowindow html. |
|
| 2066 | + * @param object $postinfo_obj The Post object. |
|
| 2067 | + * @param bool|string $post_preview Is this a post preview? |
|
| 2068 | + */ |
|
| 2069 | + $html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);
|
|
| 2070 | + return $html; |
|
| 2071 | + } |
|
| 2072 | + } |
|
| 2073 | 2073 | } |
| 2074 | 2074 | |
| 2075 | 2075 | |
| 2076 | 2076 | if (!function_exists('geodir_new_post_default_status')) {
|
| 2077 | - /** |
|
| 2078 | - * Default post status for new posts. |
|
| 2079 | - * |
|
| 2080 | - * @since 1.0.0 |
|
| 2081 | - * @package GeoDirectory |
|
| 2082 | - * @return string Returns the default post status for new posts. Ex: draft, publish etc. |
|
| 2083 | - */ |
|
| 2084 | - function geodir_new_post_default_status() |
|
| 2085 | - {
|
|
| 2086 | - if (get_option('geodir_new_post_default_status'))
|
|
| 2087 | - return get_option('geodir_new_post_default_status');
|
|
| 2088 | - else |
|
| 2089 | - return 'publish'; |
|
| 2090 | - |
|
| 2091 | - } |
|
| 2077 | + /** |
|
| 2078 | + * Default post status for new posts. |
|
| 2079 | + * |
|
| 2080 | + * @since 1.0.0 |
|
| 2081 | + * @package GeoDirectory |
|
| 2082 | + * @return string Returns the default post status for new posts. Ex: draft, publish etc. |
|
| 2083 | + */ |
|
| 2084 | + function geodir_new_post_default_status() |
|
| 2085 | + {
|
|
| 2086 | + if (get_option('geodir_new_post_default_status'))
|
|
| 2087 | + return get_option('geodir_new_post_default_status');
|
|
| 2088 | + else |
|
| 2089 | + return 'publish'; |
|
| 2090 | + |
|
| 2091 | + } |
|
| 2092 | 2092 | } |
| 2093 | 2093 | |
| 2094 | 2094 | if (!function_exists('geodir_change_post_status')) {
|
| 2095 | - /** |
|
| 2096 | - * Change post status of a post. |
|
| 2097 | - * |
|
| 2098 | - * @global object $wpdb WordPress Database object. |
|
| 2099 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2100 | - * @param int|string $post_id The post ID. |
|
| 2101 | - * @param string $status New post status. Ex: draft, publish etc. |
|
| 2102 | - */ |
|
| 2103 | - function geodir_change_post_status($post_id = '', $status = '') |
|
| 2104 | - {
|
|
| 2105 | - global $wpdb, $plugin_prefix; |
|
| 2106 | - |
|
| 2107 | - $post_type = get_post_type($post_id); |
|
| 2108 | - |
|
| 2109 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2110 | - |
|
| 2111 | - $wpdb->query( |
|
| 2112 | - $wpdb->prepare( |
|
| 2113 | - "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d", |
|
| 2114 | - array($status, $post_id) |
|
| 2115 | - ) |
|
| 2116 | - ); |
|
| 2117 | - |
|
| 2118 | - |
|
| 2119 | - } |
|
| 2095 | + /** |
|
| 2096 | + * Change post status of a post. |
|
| 2097 | + * |
|
| 2098 | + * @global object $wpdb WordPress Database object. |
|
| 2099 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2100 | + * @param int|string $post_id The post ID. |
|
| 2101 | + * @param string $status New post status. Ex: draft, publish etc. |
|
| 2102 | + */ |
|
| 2103 | + function geodir_change_post_status($post_id = '', $status = '') |
|
| 2104 | + {
|
|
| 2105 | + global $wpdb, $plugin_prefix; |
|
| 2106 | + |
|
| 2107 | + $post_type = get_post_type($post_id); |
|
| 2108 | + |
|
| 2109 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2110 | + |
|
| 2111 | + $wpdb->query( |
|
| 2112 | + $wpdb->prepare( |
|
| 2113 | + "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d", |
|
| 2114 | + array($status, $post_id) |
|
| 2115 | + ) |
|
| 2116 | + ); |
|
| 2117 | + |
|
| 2118 | + |
|
| 2119 | + } |
|
| 2120 | 2120 | } |
| 2121 | 2121 | |
| 2122 | 2122 | /** |
@@ -2130,13 +2130,13 @@ discard block |
||
| 2130 | 2130 | */ |
| 2131 | 2131 | function geodir_set_post_status($pid, $status) |
| 2132 | 2132 | {
|
| 2133 | - if ($pid) {
|
|
| 2134 | - global $wpdb; |
|
| 2135 | - $my_post = array(); |
|
| 2136 | - $my_post['post_status'] = $status; |
|
| 2137 | - $my_post['ID'] = $pid; |
|
| 2138 | - $last_postid = wp_update_post($my_post); |
|
| 2139 | - } |
|
| 2133 | + if ($pid) {
|
|
| 2134 | + global $wpdb; |
|
| 2135 | + $my_post = array(); |
|
| 2136 | + $my_post['post_status'] = $status; |
|
| 2137 | + $my_post['ID'] = $pid; |
|
| 2138 | + $last_postid = wp_update_post($my_post); |
|
| 2139 | + } |
|
| 2140 | 2140 | } |
| 2141 | 2141 | |
| 2142 | 2142 | |
@@ -2152,384 +2152,384 @@ discard block |
||
| 2152 | 2152 | */ |
| 2153 | 2153 | function geodir_update_poststatus($new_status, $old_status, $post) |
| 2154 | 2154 | {
|
| 2155 | - global $wpdb; |
|
| 2155 | + global $wpdb; |
|
| 2156 | 2156 | |
| 2157 | - $geodir_posttypes = geodir_get_posttypes(); |
|
| 2157 | + $geodir_posttypes = geodir_get_posttypes(); |
|
| 2158 | 2158 | |
| 2159 | - if (!wp_is_post_revision($post->ID) && in_array($post->post_type, $geodir_posttypes)) {
|
|
| 2159 | + if (!wp_is_post_revision($post->ID) && in_array($post->post_type, $geodir_posttypes)) {
|
|
| 2160 | 2160 | |
| 2161 | - geodir_change_post_status($post->ID, $new_status); |
|
| 2162 | - } |
|
| 2161 | + geodir_change_post_status($post->ID, $new_status); |
|
| 2162 | + } |
|
| 2163 | 2163 | } |
| 2164 | 2164 | |
| 2165 | 2165 | |
| 2166 | 2166 | if (!function_exists('geodir_update_listing_info')) {
|
| 2167 | - /** |
|
| 2168 | - * Update post info. |
|
| 2169 | - * |
|
| 2170 | - * @since 1.0.0 |
|
| 2171 | - * @package GeoDirectory |
|
| 2172 | - * @global object $wpdb WordPress Database object. |
|
| 2173 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2174 | - * @param int $updatingpost The updating post ID. |
|
| 2175 | - * @param int $temppost The temporary post ID. |
|
| 2176 | - * @todo fix post_id variable |
|
| 2177 | - */ |
|
| 2178 | - function geodir_update_listing_info($updatingpost, $temppost) |
|
| 2179 | - {
|
|
| 2180 | - |
|
| 2181 | - global $wpdb, $plugin_prefix; |
|
| 2182 | - |
|
| 2183 | - $post_type = get_post_type($post_id); |
|
| 2184 | - |
|
| 2185 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2186 | - |
|
| 2187 | - $wpdb->query( |
|
| 2188 | - $wpdb->prepare( |
|
| 2189 | - "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2190 | - array($updatingpost, $temppost) |
|
| 2191 | - ) |
|
| 2192 | - ); |
|
| 2193 | - |
|
| 2194 | - $wpdb->query( |
|
| 2195 | - $wpdb->prepare( |
|
| 2196 | - "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2197 | - array($updatingpost, $temppost) |
|
| 2198 | - ) |
|
| 2199 | - ); |
|
| 2200 | - |
|
| 2201 | - /* Update Attachments*/ |
|
| 2202 | - |
|
| 2203 | - $wpdb->query( |
|
| 2204 | - $wpdb->prepare( |
|
| 2205 | - "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2206 | - array($updatingpost, $temppost) |
|
| 2207 | - ) |
|
| 2208 | - ); |
|
| 2209 | - |
|
| 2210 | - } |
|
| 2167 | + /** |
|
| 2168 | + * Update post info. |
|
| 2169 | + * |
|
| 2170 | + * @since 1.0.0 |
|
| 2171 | + * @package GeoDirectory |
|
| 2172 | + * @global object $wpdb WordPress Database object. |
|
| 2173 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2174 | + * @param int $updatingpost The updating post ID. |
|
| 2175 | + * @param int $temppost The temporary post ID. |
|
| 2176 | + * @todo fix post_id variable |
|
| 2177 | + */ |
|
| 2178 | + function geodir_update_listing_info($updatingpost, $temppost) |
|
| 2179 | + {
|
|
| 2180 | + |
|
| 2181 | + global $wpdb, $plugin_prefix; |
|
| 2182 | + |
|
| 2183 | + $post_type = get_post_type($post_id); |
|
| 2184 | + |
|
| 2185 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2186 | + |
|
| 2187 | + $wpdb->query( |
|
| 2188 | + $wpdb->prepare( |
|
| 2189 | + "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2190 | + array($updatingpost, $temppost) |
|
| 2191 | + ) |
|
| 2192 | + ); |
|
| 2193 | + |
|
| 2194 | + $wpdb->query( |
|
| 2195 | + $wpdb->prepare( |
|
| 2196 | + "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2197 | + array($updatingpost, $temppost) |
|
| 2198 | + ) |
|
| 2199 | + ); |
|
| 2200 | + |
|
| 2201 | + /* Update Attachments*/ |
|
| 2202 | + |
|
| 2203 | + $wpdb->query( |
|
| 2204 | + $wpdb->prepare( |
|
| 2205 | + "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2206 | + array($updatingpost, $temppost) |
|
| 2207 | + ) |
|
| 2208 | + ); |
|
| 2209 | + |
|
| 2210 | + } |
|
| 2211 | 2211 | } |
| 2212 | 2212 | |
| 2213 | 2213 | |
| 2214 | 2214 | if (!function_exists('geodir_delete_listing_info')) {
|
| 2215 | - /** |
|
| 2216 | - * Delete Listing info from details table for the given post id. |
|
| 2217 | - * |
|
| 2218 | - * @since 1.0.0 |
|
| 2219 | - * @package GeoDirectory |
|
| 2220 | - * @global object $wpdb WordPress Database object. |
|
| 2221 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2222 | - * @param int $deleted_postid The post ID. |
|
| 2223 | - * @param bool $force Optional. Do you want to force delete it? Default: false. |
|
| 2224 | - * @return bool|void |
|
| 2225 | - */ |
|
| 2226 | - function geodir_delete_listing_info($deleted_postid, $force = false) |
|
| 2227 | - {
|
|
| 2228 | - global $wpdb, $plugin_prefix; |
|
| 2229 | - |
|
| 2230 | - // check for multisite deletions |
|
| 2231 | - if (strpos($plugin_prefix, $wpdb->prefix) !== false) {
|
|
| 2232 | - } else {
|
|
| 2233 | - return; |
|
| 2234 | - } |
|
| 2235 | - |
|
| 2236 | - $post_type = get_post_type($deleted_postid); |
|
| 2237 | - |
|
| 2238 | - $all_postypes = geodir_get_posttypes(); |
|
| 2239 | - |
|
| 2240 | - if (!in_array($post_type, $all_postypes)) |
|
| 2241 | - return false; |
|
| 2242 | - |
|
| 2243 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2244 | - |
|
| 2245 | - /* Delete custom post meta*/ |
|
| 2246 | - $wpdb->query( |
|
| 2247 | - $wpdb->prepare( |
|
| 2248 | - "DELETE FROM " . $table . " WHERE `post_id` = %d", |
|
| 2249 | - array($deleted_postid) |
|
| 2250 | - ) |
|
| 2251 | - ); |
|
| 2252 | - |
|
| 2253 | - /* Delete post map icons*/ |
|
| 2254 | - |
|
| 2255 | - $wpdb->query( |
|
| 2256 | - $wpdb->prepare( |
|
| 2257 | - "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d", |
|
| 2258 | - array($deleted_postid) |
|
| 2259 | - ) |
|
| 2260 | - ); |
|
| 2261 | - |
|
| 2262 | - /* Delete Attachments*/ |
|
| 2263 | - $postcurr_images = geodir_get_images($deleted_postid); |
|
| 2264 | - |
|
| 2265 | - $wpdb->query( |
|
| 2266 | - $wpdb->prepare( |
|
| 2267 | - "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d", |
|
| 2268 | - array($deleted_postid) |
|
| 2269 | - ) |
|
| 2270 | - ); |
|
| 2271 | - geodir_remove_attachments($postcurr_images); |
|
| 2272 | - |
|
| 2273 | - } |
|
| 2215 | + /** |
|
| 2216 | + * Delete Listing info from details table for the given post id. |
|
| 2217 | + * |
|
| 2218 | + * @since 1.0.0 |
|
| 2219 | + * @package GeoDirectory |
|
| 2220 | + * @global object $wpdb WordPress Database object. |
|
| 2221 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2222 | + * @param int $deleted_postid The post ID. |
|
| 2223 | + * @param bool $force Optional. Do you want to force delete it? Default: false. |
|
| 2224 | + * @return bool|void |
|
| 2225 | + */ |
|
| 2226 | + function geodir_delete_listing_info($deleted_postid, $force = false) |
|
| 2227 | + {
|
|
| 2228 | + global $wpdb, $plugin_prefix; |
|
| 2229 | + |
|
| 2230 | + // check for multisite deletions |
|
| 2231 | + if (strpos($plugin_prefix, $wpdb->prefix) !== false) {
|
|
| 2232 | + } else {
|
|
| 2233 | + return; |
|
| 2234 | + } |
|
| 2235 | + |
|
| 2236 | + $post_type = get_post_type($deleted_postid); |
|
| 2237 | + |
|
| 2238 | + $all_postypes = geodir_get_posttypes(); |
|
| 2239 | + |
|
| 2240 | + if (!in_array($post_type, $all_postypes)) |
|
| 2241 | + return false; |
|
| 2242 | + |
|
| 2243 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2244 | + |
|
| 2245 | + /* Delete custom post meta*/ |
|
| 2246 | + $wpdb->query( |
|
| 2247 | + $wpdb->prepare( |
|
| 2248 | + "DELETE FROM " . $table . " WHERE `post_id` = %d", |
|
| 2249 | + array($deleted_postid) |
|
| 2250 | + ) |
|
| 2251 | + ); |
|
| 2252 | + |
|
| 2253 | + /* Delete post map icons*/ |
|
| 2254 | + |
|
| 2255 | + $wpdb->query( |
|
| 2256 | + $wpdb->prepare( |
|
| 2257 | + "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d", |
|
| 2258 | + array($deleted_postid) |
|
| 2259 | + ) |
|
| 2260 | + ); |
|
| 2261 | + |
|
| 2262 | + /* Delete Attachments*/ |
|
| 2263 | + $postcurr_images = geodir_get_images($deleted_postid); |
|
| 2264 | + |
|
| 2265 | + $wpdb->query( |
|
| 2266 | + $wpdb->prepare( |
|
| 2267 | + "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d", |
|
| 2268 | + array($deleted_postid) |
|
| 2269 | + ) |
|
| 2270 | + ); |
|
| 2271 | + geodir_remove_attachments($postcurr_images); |
|
| 2272 | + |
|
| 2273 | + } |
|
| 2274 | 2274 | } |
| 2275 | 2275 | |
| 2276 | 2276 | |
| 2277 | 2277 | if (!function_exists('geodir_add_to_favorite')) {
|
| 2278 | - /** |
|
| 2279 | - * This function would add listing to favorite listing. |
|
| 2280 | - * |
|
| 2281 | - * @since 1.0.0 |
|
| 2282 | - * @package GeoDirectory |
|
| 2283 | - * @global object $current_user Current user object. |
|
| 2284 | - * @param int $post_id The post ID. |
|
| 2285 | - */ |
|
| 2286 | - function geodir_add_to_favorite($post_id) |
|
| 2287 | - {
|
|
| 2288 | - |
|
| 2289 | - global $current_user; |
|
| 2290 | - |
|
| 2291 | - /** |
|
| 2292 | - * Filter to modify "Unfavorite" text |
|
| 2293 | - * |
|
| 2294 | - * You can use this filter to rename "Unfavorite" text to something else. |
|
| 2295 | - * |
|
| 2296 | - * @since 1.0.0 |
|
| 2297 | - * @package GeoDirectory |
|
| 2298 | - */ |
|
| 2299 | - $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
|
|
| 2300 | - |
|
| 2301 | - /** |
|
| 2302 | - * Filter to modify "Remove from Favorites" text |
|
| 2303 | - * |
|
| 2304 | - * You can use this filter to rename "Remove from Favorites" text to something else. |
|
| 2305 | - * |
|
| 2306 | - * @since 1.0.0 |
|
| 2307 | - * @package GeoDirectory |
|
| 2308 | - */ |
|
| 2309 | - $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
|
|
| 2310 | - |
|
| 2311 | - /** |
|
| 2312 | - * Filter to modify "fa fa-heart" icon |
|
| 2313 | - * |
|
| 2314 | - * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2315 | - * |
|
| 2316 | - * @since 1.0.0 |
|
| 2317 | - * @package GeoDirectory |
|
| 2318 | - */ |
|
| 2319 | - $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2320 | - |
|
| 2321 | - $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2322 | - $user_meta_data = !empty($user_meta_data) && is_array($user_meta_data) ? $user_meta_data : array(); |
|
| 2323 | - |
|
| 2324 | - if (empty($user_meta_data) || (!empty($user_meta_data) && !in_array($post_id, $user_meta_data))) {
|
|
| 2325 | - $user_meta_data[] = $post_id; |
|
| 2326 | - } |
|
| 2327 | - |
|
| 2328 | - update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data); |
|
| 2278 | + /** |
|
| 2279 | + * This function would add listing to favorite listing. |
|
| 2280 | + * |
|
| 2281 | + * @since 1.0.0 |
|
| 2282 | + * @package GeoDirectory |
|
| 2283 | + * @global object $current_user Current user object. |
|
| 2284 | + * @param int $post_id The post ID. |
|
| 2285 | + */ |
|
| 2286 | + function geodir_add_to_favorite($post_id) |
|
| 2287 | + {
|
|
| 2288 | + |
|
| 2289 | + global $current_user; |
|
| 2290 | + |
|
| 2291 | + /** |
|
| 2292 | + * Filter to modify "Unfavorite" text |
|
| 2293 | + * |
|
| 2294 | + * You can use this filter to rename "Unfavorite" text to something else. |
|
| 2295 | + * |
|
| 2296 | + * @since 1.0.0 |
|
| 2297 | + * @package GeoDirectory |
|
| 2298 | + */ |
|
| 2299 | + $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
|
|
| 2300 | + |
|
| 2301 | + /** |
|
| 2302 | + * Filter to modify "Remove from Favorites" text |
|
| 2303 | + * |
|
| 2304 | + * You can use this filter to rename "Remove from Favorites" text to something else. |
|
| 2305 | + * |
|
| 2306 | + * @since 1.0.0 |
|
| 2307 | + * @package GeoDirectory |
|
| 2308 | + */ |
|
| 2309 | + $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
|
|
| 2310 | + |
|
| 2311 | + /** |
|
| 2312 | + * Filter to modify "fa fa-heart" icon |
|
| 2313 | + * |
|
| 2314 | + * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2315 | + * |
|
| 2316 | + * @since 1.0.0 |
|
| 2317 | + * @package GeoDirectory |
|
| 2318 | + */ |
|
| 2319 | + $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2320 | + |
|
| 2321 | + $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2322 | + $user_meta_data = !empty($user_meta_data) && is_array($user_meta_data) ? $user_meta_data : array(); |
|
| 2323 | + |
|
| 2324 | + if (empty($user_meta_data) || (!empty($user_meta_data) && !in_array($post_id, $user_meta_data))) {
|
|
| 2325 | + $user_meta_data[] = $post_id; |
|
| 2326 | + } |
|
| 2327 | + |
|
| 2328 | + update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data); |
|
| 2329 | + |
|
| 2330 | + /** |
|
| 2331 | + * Called before adding the post from favourites. |
|
| 2332 | + * |
|
| 2333 | + * @since 1.0.0 |
|
| 2334 | + * @package GeoDirectory |
|
| 2335 | + * @param int $post_id The post ID. |
|
| 2336 | + */ |
|
| 2337 | + do_action('geodir_before_add_from_favorite', $post_id);
|
|
| 2338 | + |
|
| 2339 | + echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>'; |
|
| 2340 | + |
|
| 2341 | + /** |
|
| 2342 | + * Called after adding the post from favourites. |
|
| 2343 | + * |
|
| 2344 | + * @since 1.0.0 |
|
| 2345 | + * @package GeoDirectory |
|
| 2346 | + * @param int $post_id The post ID. |
|
| 2347 | + */ |
|
| 2348 | + do_action('geodir_after_add_from_favorite', $post_id);
|
|
| 2329 | 2349 | |
| 2330 | - /** |
|
| 2331 | - * Called before adding the post from favourites. |
|
| 2332 | - * |
|
| 2333 | - * @since 1.0.0 |
|
| 2334 | - * @package GeoDirectory |
|
| 2335 | - * @param int $post_id The post ID. |
|
| 2336 | - */ |
|
| 2337 | - do_action('geodir_before_add_from_favorite', $post_id);
|
|
| 2338 | - |
|
| 2339 | - echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>'; |
|
| 2340 | - |
|
| 2341 | - /** |
|
| 2342 | - * Called after adding the post from favourites. |
|
| 2343 | - * |
|
| 2344 | - * @since 1.0.0 |
|
| 2345 | - * @package GeoDirectory |
|
| 2346 | - * @param int $post_id The post ID. |
|
| 2347 | - */ |
|
| 2348 | - do_action('geodir_after_add_from_favorite', $post_id);
|
|
| 2349 | - |
|
| 2350 | - } |
|
| 2350 | + } |
|
| 2351 | 2351 | } |
| 2352 | 2352 | |
| 2353 | 2353 | if (!function_exists('geodir_remove_from_favorite')) {
|
| 2354 | - /** |
|
| 2355 | - * This function would remove the favourited property earlier. |
|
| 2356 | - * |
|
| 2357 | - * @since 1.0.0 |
|
| 2358 | - * @package GeoDirectory |
|
| 2359 | - * @global object $current_user Current user object. |
|
| 2360 | - * @param int $post_id The post ID. |
|
| 2361 | - */ |
|
| 2362 | - function geodir_remove_from_favorite($post_id) |
|
| 2363 | - {
|
|
| 2364 | - global $current_user; |
|
| 2365 | - |
|
| 2366 | - /** |
|
| 2367 | - * Filter to modify "Add to Favorites" text |
|
| 2368 | - * |
|
| 2369 | - * You can use this filter to rename "Add to Favorites" text to something else. |
|
| 2370 | - * |
|
| 2371 | - * @since 1.0.0 |
|
| 2372 | - * @package GeoDirectory |
|
| 2373 | - */ |
|
| 2374 | - $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
|
|
| 2375 | - |
|
| 2376 | - /** |
|
| 2377 | - * Filter to modify "Favourite" text |
|
| 2378 | - * |
|
| 2379 | - * You can use this filter to rename "Favourite" text to something else. |
|
| 2380 | - * |
|
| 2381 | - * @since 1.0.0 |
|
| 2382 | - * @package GeoDirectory |
|
| 2383 | - */ |
|
| 2384 | - $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
|
|
| 2385 | - |
|
| 2386 | - /** |
|
| 2387 | - * Filter to modify "fa fa-heart" icon |
|
| 2388 | - * |
|
| 2389 | - * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2390 | - * |
|
| 2391 | - * @since 1.0.0 |
|
| 2392 | - * @package GeoDirectory |
|
| 2393 | - */ |
|
| 2394 | - $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2395 | - |
|
| 2396 | - $user_meta_data = array(); |
|
| 2397 | - $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2398 | - |
|
| 2399 | - if (!empty($user_meta_data)) {
|
|
| 2400 | - |
|
| 2401 | - if (($key = array_search($post_id, $user_meta_data)) !== false) {
|
|
| 2402 | - unset($user_meta_data[$key]); |
|
| 2403 | - } |
|
| 2354 | + /** |
|
| 2355 | + * This function would remove the favourited property earlier. |
|
| 2356 | + * |
|
| 2357 | + * @since 1.0.0 |
|
| 2358 | + * @package GeoDirectory |
|
| 2359 | + * @global object $current_user Current user object. |
|
| 2360 | + * @param int $post_id The post ID. |
|
| 2361 | + */ |
|
| 2362 | + function geodir_remove_from_favorite($post_id) |
|
| 2363 | + {
|
|
| 2364 | + global $current_user; |
|
| 2365 | + |
|
| 2366 | + /** |
|
| 2367 | + * Filter to modify "Add to Favorites" text |
|
| 2368 | + * |
|
| 2369 | + * You can use this filter to rename "Add to Favorites" text to something else. |
|
| 2370 | + * |
|
| 2371 | + * @since 1.0.0 |
|
| 2372 | + * @package GeoDirectory |
|
| 2373 | + */ |
|
| 2374 | + $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
|
|
| 2375 | + |
|
| 2376 | + /** |
|
| 2377 | + * Filter to modify "Favourite" text |
|
| 2378 | + * |
|
| 2379 | + * You can use this filter to rename "Favourite" text to something else. |
|
| 2380 | + * |
|
| 2381 | + * @since 1.0.0 |
|
| 2382 | + * @package GeoDirectory |
|
| 2383 | + */ |
|
| 2384 | + $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
|
|
| 2385 | + |
|
| 2386 | + /** |
|
| 2387 | + * Filter to modify "fa fa-heart" icon |
|
| 2388 | + * |
|
| 2389 | + * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2390 | + * |
|
| 2391 | + * @since 1.0.0 |
|
| 2392 | + * @package GeoDirectory |
|
| 2393 | + */ |
|
| 2394 | + $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2395 | + |
|
| 2396 | + $user_meta_data = array(); |
|
| 2397 | + $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2398 | + |
|
| 2399 | + if (!empty($user_meta_data)) {
|
|
| 2400 | + |
|
| 2401 | + if (($key = array_search($post_id, $user_meta_data)) !== false) {
|
|
| 2402 | + unset($user_meta_data[$key]); |
|
| 2403 | + } |
|
| 2404 | 2404 | |
| 2405 | - } |
|
| 2405 | + } |
|
| 2406 | 2406 | |
| 2407 | - update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data); |
|
| 2407 | + update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data); |
|
| 2408 | 2408 | |
| 2409 | - /** |
|
| 2410 | - * Called before removing the post from favourites. |
|
| 2411 | - * |
|
| 2412 | - * @since 1.0.0 |
|
| 2413 | - * @package GeoDirectory |
|
| 2414 | - * @param int $post_id The post ID. |
|
| 2415 | - */ |
|
| 2416 | - do_action('geodir_before_remove_from_favorite', $post_id);
|
|
| 2409 | + /** |
|
| 2410 | + * Called before removing the post from favourites. |
|
| 2411 | + * |
|
| 2412 | + * @since 1.0.0 |
|
| 2413 | + * @package GeoDirectory |
|
| 2414 | + * @param int $post_id The post ID. |
|
| 2415 | + */ |
|
| 2416 | + do_action('geodir_before_remove_from_favorite', $post_id);
|
|
| 2417 | 2417 | |
| 2418 | - echo '<a href="javascript:void(0);" title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>'; |
|
| 2418 | + echo '<a href="javascript:void(0);" title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>'; |
|
| 2419 | 2419 | |
| 2420 | - /** |
|
| 2421 | - * Called after removing the post from favourites. |
|
| 2422 | - * |
|
| 2423 | - * @since 1.0.0 |
|
| 2424 | - * @package GeoDirectory |
|
| 2425 | - * @param int $post_id The post ID. |
|
| 2426 | - */ |
|
| 2427 | - do_action('geodir_after_remove_from_favorite', $post_id);
|
|
| 2420 | + /** |
|
| 2421 | + * Called after removing the post from favourites. |
|
| 2422 | + * |
|
| 2423 | + * @since 1.0.0 |
|
| 2424 | + * @package GeoDirectory |
|
| 2425 | + * @param int $post_id The post ID. |
|
| 2426 | + */ |
|
| 2427 | + do_action('geodir_after_remove_from_favorite', $post_id);
|
|
| 2428 | 2428 | |
| 2429 | - } |
|
| 2429 | + } |
|
| 2430 | 2430 | } |
| 2431 | 2431 | |
| 2432 | 2432 | if (!function_exists('geodir_favourite_html')) {
|
| 2433 | - /** |
|
| 2434 | - * This function would display the html content for add to favorite or remove from favorite. |
|
| 2435 | - * |
|
| 2436 | - * @since 1.0.0 |
|
| 2437 | - * @package GeoDirectory |
|
| 2438 | - * @global object $current_user Current user object. |
|
| 2439 | - * @global object $post The current post object. |
|
| 2440 | - * @param int $user_id The user ID. |
|
| 2441 | - * @param int $post_id The post ID. |
|
| 2442 | - */ |
|
| 2443 | - function geodir_favourite_html($user_id, $post_id) |
|
| 2444 | - {
|
|
| 2445 | - |
|
| 2446 | - global $current_user, $post; |
|
| 2447 | - |
|
| 2448 | - /** |
|
| 2449 | - * Filter to modify "Add to Favorites" text |
|
| 2450 | - * |
|
| 2451 | - * You can use this filter to rename "Add to Favorites" text to something else. |
|
| 2452 | - * |
|
| 2453 | - * @since 1.0.0 |
|
| 2454 | - * @package GeoDirectory |
|
| 2455 | - */ |
|
| 2456 | - $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
|
|
| 2457 | - |
|
| 2458 | - /** |
|
| 2459 | - * Filter to modify "Favourite" text |
|
| 2460 | - * |
|
| 2461 | - * You can use this filter to rename "Favourite" text to something else. |
|
| 2462 | - * |
|
| 2463 | - * @since 1.0.0 |
|
| 2464 | - * @package GeoDirectory |
|
| 2465 | - */ |
|
| 2466 | - $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
|
|
| 2467 | - |
|
| 2468 | - /** |
|
| 2469 | - * Filter to modify "Unfavorite" text |
|
| 2470 | - * |
|
| 2471 | - * You can use this filter to rename "Unfavorite" text to something else. |
|
| 2472 | - * |
|
| 2473 | - * @since 1.0.0 |
|
| 2474 | - * @package GeoDirectory |
|
| 2475 | - */ |
|
| 2476 | - $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
|
|
| 2477 | - |
|
| 2478 | - /** |
|
| 2479 | - * Filter to modify "Remove from Favorites" text |
|
| 2480 | - * |
|
| 2481 | - * You can use this filter to rename "Remove from Favorites" text to something else. |
|
| 2482 | - * |
|
| 2483 | - * @since 1.0.0 |
|
| 2484 | - * @package GeoDirectory |
|
| 2485 | - */ |
|
| 2486 | - $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
|
|
| 2487 | - |
|
| 2488 | - /** |
|
| 2489 | - * Filter to modify "fa fa-heart" icon |
|
| 2490 | - * |
|
| 2491 | - * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2492 | - * |
|
| 2493 | - * @since 1.0.0 |
|
| 2494 | - * @package GeoDirectory |
|
| 2495 | - */ |
|
| 2496 | - $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2497 | - |
|
| 2498 | - /** |
|
| 2499 | - * Filter to modify "fa fa-heart" icon for "remove from favorites" link |
|
| 2500 | - * |
|
| 2501 | - * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2502 | - * |
|
| 2503 | - * @since 1.0.0 |
|
| 2504 | - * @package GeoDirectory |
|
| 2505 | - */ |
|
| 2506 | - $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');
|
|
| 2507 | - |
|
| 2508 | - $user_meta_data = ''; |
|
| 2509 | - if (isset($current_user->data->ID)) |
|
| 2510 | - $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2511 | - |
|
| 2512 | - if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
|
|
| 2513 | - ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>" ><a |
|
| 2433 | + /** |
|
| 2434 | + * This function would display the html content for add to favorite or remove from favorite. |
|
| 2435 | + * |
|
| 2436 | + * @since 1.0.0 |
|
| 2437 | + * @package GeoDirectory |
|
| 2438 | + * @global object $current_user Current user object. |
|
| 2439 | + * @global object $post The current post object. |
|
| 2440 | + * @param int $user_id The user ID. |
|
| 2441 | + * @param int $post_id The post ID. |
|
| 2442 | + */ |
|
| 2443 | + function geodir_favourite_html($user_id, $post_id) |
|
| 2444 | + {
|
|
| 2445 | + |
|
| 2446 | + global $current_user, $post; |
|
| 2447 | + |
|
| 2448 | + /** |
|
| 2449 | + * Filter to modify "Add to Favorites" text |
|
| 2450 | + * |
|
| 2451 | + * You can use this filter to rename "Add to Favorites" text to something else. |
|
| 2452 | + * |
|
| 2453 | + * @since 1.0.0 |
|
| 2454 | + * @package GeoDirectory |
|
| 2455 | + */ |
|
| 2456 | + $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);
|
|
| 2457 | + |
|
| 2458 | + /** |
|
| 2459 | + * Filter to modify "Favourite" text |
|
| 2460 | + * |
|
| 2461 | + * You can use this filter to rename "Favourite" text to something else. |
|
| 2462 | + * |
|
| 2463 | + * @since 1.0.0 |
|
| 2464 | + * @package GeoDirectory |
|
| 2465 | + */ |
|
| 2466 | + $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);
|
|
| 2467 | + |
|
| 2468 | + /** |
|
| 2469 | + * Filter to modify "Unfavorite" text |
|
| 2470 | + * |
|
| 2471 | + * You can use this filter to rename "Unfavorite" text to something else. |
|
| 2472 | + * |
|
| 2473 | + * @since 1.0.0 |
|
| 2474 | + * @package GeoDirectory |
|
| 2475 | + */ |
|
| 2476 | + $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);
|
|
| 2477 | + |
|
| 2478 | + /** |
|
| 2479 | + * Filter to modify "Remove from Favorites" text |
|
| 2480 | + * |
|
| 2481 | + * You can use this filter to rename "Remove from Favorites" text to something else. |
|
| 2482 | + * |
|
| 2483 | + * @since 1.0.0 |
|
| 2484 | + * @package GeoDirectory |
|
| 2485 | + */ |
|
| 2486 | + $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);
|
|
| 2487 | + |
|
| 2488 | + /** |
|
| 2489 | + * Filter to modify "fa fa-heart" icon |
|
| 2490 | + * |
|
| 2491 | + * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2492 | + * |
|
| 2493 | + * @since 1.0.0 |
|
| 2494 | + * @package GeoDirectory |
|
| 2495 | + */ |
|
| 2496 | + $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');
|
|
| 2497 | + |
|
| 2498 | + /** |
|
| 2499 | + * Filter to modify "fa fa-heart" icon for "remove from favorites" link |
|
| 2500 | + * |
|
| 2501 | + * You can use this filter to change "fa fa-heart" icon to something else. |
|
| 2502 | + * |
|
| 2503 | + * @since 1.0.0 |
|
| 2504 | + * @package GeoDirectory |
|
| 2505 | + */ |
|
| 2506 | + $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');
|
|
| 2507 | + |
|
| 2508 | + $user_meta_data = ''; |
|
| 2509 | + if (isset($current_user->data->ID)) |
|
| 2510 | + $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
|
| 2511 | + |
|
| 2512 | + if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
|
|
| 2513 | + ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>" ><a |
|
| 2514 | 2514 | class="geodir-removetofav-icon" href="javascript:void(0);" |
| 2515 | 2515 | onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');" |
| 2516 | 2516 | title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?> |
| 2517 | 2517 | </a> </span><?php |
| 2518 | 2518 | |
| 2519 | - } else {
|
|
| 2519 | + } else {
|
|
| 2520 | 2520 | |
| 2521 | - if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
|
|
| 2522 | - $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\''; |
|
| 2523 | - } else |
|
| 2524 | - $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
|
|
| 2521 | + if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
|
|
| 2522 | + $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\''; |
|
| 2523 | + } else |
|
| 2524 | + $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
|
|
| 2525 | 2525 | |
| 2526 | - ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon" |
|
| 2526 | + ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon" |
|
| 2527 | 2527 | href="javascript:void(0);" |
| 2528 | 2528 | onclick="<?php echo $script_text;?>" |
| 2529 | 2529 | title="<?php echo $add_favourite_text;?>"><i |
| 2530 | 2530 | class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span> |
| 2531 | 2531 | <?php } |
| 2532 | - } |
|
| 2532 | + } |
|
| 2533 | 2533 | } |
| 2534 | 2534 | |
| 2535 | 2535 | |
@@ -2546,54 +2546,54 @@ discard block |
||
| 2546 | 2546 | function geodir_get_cat_postcount($term = array()) |
| 2547 | 2547 | {
|
| 2548 | 2548 | |
| 2549 | - if (!empty($term)) {
|
|
| 2549 | + if (!empty($term)) {
|
|
| 2550 | 2550 | |
| 2551 | - global $wpdb, $plugin_prefix; |
|
| 2551 | + global $wpdb, $plugin_prefix; |
|
| 2552 | 2552 | |
| 2553 | - $where = ''; |
|
| 2554 | - $join = ''; |
|
| 2555 | - if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {
|
|
| 2556 | - $taxonomy_obj = get_taxonomy($term->taxonomy); |
|
| 2553 | + $where = ''; |
|
| 2554 | + $join = ''; |
|
| 2555 | + if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {
|
|
| 2556 | + $taxonomy_obj = get_taxonomy($term->taxonomy); |
|
| 2557 | 2557 | |
| 2558 | - $post_type = $taxonomy_obj->object_type[0]; |
|
| 2558 | + $post_type = $taxonomy_obj->object_type[0]; |
|
| 2559 | 2559 | |
| 2560 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2560 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2561 | 2561 | |
| 2562 | - /** |
|
| 2563 | - * Filter to modify the 'join' query |
|
| 2564 | - * |
|
| 2565 | - * @since 1.0.0 |
|
| 2566 | - * @package GeoDirectory |
|
| 2567 | - * @param object|array $term category / term object that need to be processed. |
|
| 2568 | - * @param string $join The join query. |
|
| 2569 | - */ |
|
| 2570 | - $join = apply_filters('geodir_cat_post_count_join', $join, $term);
|
|
| 2562 | + /** |
|
| 2563 | + * Filter to modify the 'join' query |
|
| 2564 | + * |
|
| 2565 | + * @since 1.0.0 |
|
| 2566 | + * @package GeoDirectory |
|
| 2567 | + * @param object|array $term category / term object that need to be processed. |
|
| 2568 | + * @param string $join The join query. |
|
| 2569 | + */ |
|
| 2570 | + $join = apply_filters('geodir_cat_post_count_join', $join, $term);
|
|
| 2571 | 2571 | |
| 2572 | - /** |
|
| 2573 | - * Filter to modify the 'where' query |
|
| 2574 | - * |
|
| 2575 | - * @since 1.0.0 |
|
| 2576 | - * @package GeoDirectory |
|
| 2577 | - * @param object|array $term category / term object that need to be processed. |
|
| 2578 | - * @param string $where The where query. |
|
| 2579 | - */ |
|
| 2580 | - $where = apply_filters('geodir_cat_post_count_where', $where, $term);
|
|
| 2572 | + /** |
|
| 2573 | + * Filter to modify the 'where' query |
|
| 2574 | + * |
|
| 2575 | + * @since 1.0.0 |
|
| 2576 | + * @package GeoDirectory |
|
| 2577 | + * @param object|array $term category / term object that need to be processed. |
|
| 2578 | + * @param string $where The where query. |
|
| 2579 | + */ |
|
| 2580 | + $where = apply_filters('geodir_cat_post_count_where', $where, $term);
|
|
| 2581 | 2581 | |
| 2582 | - $count_query = "SELECT count(post_id) FROM |
|
| 2582 | + $count_query = "SELECT count(post_id) FROM |
|
| 2583 | 2583 | " . $table . " as pd " . $join . " |
| 2584 | 2584 | WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;
|
| 2585 | 2585 | |
| 2586 | - $cat_post_count = $wpdb->get_var($count_query); |
|
| 2587 | - if (empty($cat_post_count) || is_wp_error($cat_post_count)) |
|
| 2588 | - $cat_post_count = 0; |
|
| 2586 | + $cat_post_count = $wpdb->get_var($count_query); |
|
| 2587 | + if (empty($cat_post_count) || is_wp_error($cat_post_count)) |
|
| 2588 | + $cat_post_count = 0; |
|
| 2589 | 2589 | |
| 2590 | - return $cat_post_count; |
|
| 2590 | + return $cat_post_count; |
|
| 2591 | 2591 | |
| 2592 | - } else |
|
| 2592 | + } else |
|
| 2593 | 2593 | |
| 2594 | - return $term->count; |
|
| 2595 | - } |
|
| 2596 | - return false; |
|
| 2594 | + return $term->count; |
|
| 2595 | + } |
|
| 2596 | + return false; |
|
| 2597 | 2597 | |
| 2598 | 2598 | } |
| 2599 | 2599 | |
@@ -2606,17 +2606,17 @@ discard block |
||
| 2606 | 2606 | */ |
| 2607 | 2607 | function geodir_allow_post_type_frontend() |
| 2608 | 2608 | {
|
| 2609 | - $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 2609 | + $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 2610 | 2610 | |
| 2611 | - if (!is_admin() && isset($_REQUEST['listing_type']) |
|
| 2612 | - && !empty($geodir_allow_posttype_frontend) |
|
| 2613 | - && !in_array($_REQUEST['listing_type'], $geodir_allow_posttype_frontend) |
|
| 2614 | - ) {
|
|
| 2611 | + if (!is_admin() && isset($_REQUEST['listing_type']) |
|
| 2612 | + && !empty($geodir_allow_posttype_frontend) |
|
| 2613 | + && !in_array($_REQUEST['listing_type'], $geodir_allow_posttype_frontend) |
|
| 2614 | + ) {
|
|
| 2615 | 2615 | |
| 2616 | - wp_redirect(home_url()); |
|
| 2617 | - exit; |
|
| 2616 | + wp_redirect(home_url()); |
|
| 2617 | + exit; |
|
| 2618 | 2618 | |
| 2619 | - } |
|
| 2619 | + } |
|
| 2620 | 2620 | |
| 2621 | 2621 | } |
| 2622 | 2622 | |
@@ -2633,20 +2633,20 @@ discard block |
||
| 2633 | 2633 | */ |
| 2634 | 2634 | function geodir_excerpt_length($length) |
| 2635 | 2635 | {
|
| 2636 | - global $wp_query, $geodir_is_widget_listing; |
|
| 2636 | + global $wp_query, $geodir_is_widget_listing; |
|
| 2637 | 2637 | if ($geodir_is_widget_listing) {
|
| 2638 | 2638 | return $length; |
| 2639 | 2639 | } |
| 2640 | 2640 | |
| 2641 | - if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))
|
|
| 2642 | - $length = get_option('geodir_desc_word_limit');
|
|
| 2643 | - elseif (get_query_var('excerpt_length'))
|
|
| 2644 | - $length = get_query_var('excerpt_length');
|
|
| 2641 | + if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))
|
|
| 2642 | + $length = get_option('geodir_desc_word_limit');
|
|
| 2643 | + elseif (get_query_var('excerpt_length'))
|
|
| 2644 | + $length = get_query_var('excerpt_length');
|
|
| 2645 | 2645 | |
| 2646 | - if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))
|
|
| 2647 | - $length = get_option('geodir_author_desc_word_limit');
|
|
| 2646 | + if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))
|
|
| 2647 | + $length = get_option('geodir_author_desc_word_limit');
|
|
| 2648 | 2648 | |
| 2649 | - return $length; |
|
| 2649 | + return $length; |
|
| 2650 | 2650 | } |
| 2651 | 2651 | |
| 2652 | 2652 | /** |
@@ -2661,21 +2661,21 @@ discard block |
||
| 2661 | 2661 | */ |
| 2662 | 2662 | function geodir_excerpt_more($more) |
| 2663 | 2663 | {
|
| 2664 | - global $post; |
|
| 2665 | - $all_postypes = geodir_get_posttypes(); |
|
| 2666 | - if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
|
|
| 2667 | - $out = ' <a class="excerpt-read-more" href="' . get_permalink($post->ID) . '" title="' . get_the_title($post->ID) . '">'; |
|
| 2668 | - /** |
|
| 2669 | - * Filter excerpt read more text. |
|
| 2670 | - * |
|
| 2671 | - * @since 1.0.0 |
|
| 2672 | - */ |
|
| 2673 | - $out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) ); |
|
| 2674 | - $out .= '</a>'; |
|
| 2675 | - return $out; |
|
| 2676 | - } |
|
| 2664 | + global $post; |
|
| 2665 | + $all_postypes = geodir_get_posttypes(); |
|
| 2666 | + if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
|
|
| 2667 | + $out = ' <a class="excerpt-read-more" href="' . get_permalink($post->ID) . '" title="' . get_the_title($post->ID) . '">'; |
|
| 2668 | + /** |
|
| 2669 | + * Filter excerpt read more text. |
|
| 2670 | + * |
|
| 2671 | + * @since 1.0.0 |
|
| 2672 | + */ |
|
| 2673 | + $out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) ); |
|
| 2674 | + $out .= '</a>'; |
|
| 2675 | + return $out; |
|
| 2676 | + } |
|
| 2677 | 2677 | |
| 2678 | - return $more; |
|
| 2678 | + return $more; |
|
| 2679 | 2679 | } |
| 2680 | 2680 | |
| 2681 | 2681 | |
@@ -2692,63 +2692,63 @@ discard block |
||
| 2692 | 2692 | */ |
| 2693 | 2693 | function geodir_update_markers_oncatedit($term_id, $tt_id, $taxonomy) |
| 2694 | 2694 | {
|
| 2695 | - global $plugin_prefix, $wpdb; |
|
| 2695 | + global $plugin_prefix, $wpdb; |
|
| 2696 | 2696 | |
| 2697 | - $gd_taxonomies = geodir_get_taxonomies(); |
|
| 2697 | + $gd_taxonomies = geodir_get_taxonomies(); |
|
| 2698 | 2698 | |
| 2699 | - if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
|
|
| 2699 | + if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
|
|
| 2700 | 2700 | |
| 2701 | - $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy); |
|
| 2702 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 2701 | + $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy); |
|
| 2702 | + $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 2703 | 2703 | |
| 2704 | - $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']); |
|
| 2705 | - $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png'; |
|
| 2704 | + $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']); |
|
| 2705 | + $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png'; |
|
| 2706 | 2706 | |
| 2707 | - $posts = $wpdb->get_results( |
|
| 2708 | - $wpdb->prepare( |
|
| 2709 | - "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ", |
|
| 2710 | - array($term_id, $taxonomy) |
|
| 2711 | - ) |
|
| 2712 | - ); |
|
| 2707 | + $posts = $wpdb->get_results( |
|
| 2708 | + $wpdb->prepare( |
|
| 2709 | + "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ", |
|
| 2710 | + array($term_id, $taxonomy) |
|
| 2711 | + ) |
|
| 2712 | + ); |
|
| 2713 | 2713 | |
| 2714 | - if (!empty($posts)): |
|
| 2715 | - foreach ($posts as $post_obj) {
|
|
| 2714 | + if (!empty($posts)): |
|
| 2715 | + foreach ($posts as $post_obj) {
|
|
| 2716 | 2716 | |
| 2717 | - $lat = $post_obj->post_latitude; |
|
| 2718 | - $lng = $post_obj->post_longitude; |
|
| 2717 | + $lat = $post_obj->post_latitude; |
|
| 2718 | + $lng = $post_obj->post_longitude; |
|
| 2719 | 2719 | |
| 2720 | - $json = '{';
|
|
| 2721 | - $json .= '"id":"' . $post_obj->post_id . '",'; |
|
| 2722 | - $json .= '"lat_pos": "' . $lat . '",'; |
|
| 2723 | - $json .= '"long_pos": "' . $lng . '",'; |
|
| 2724 | - $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",'; |
|
| 2725 | - $json .= '"icon":"' . $term_icon . '",'; |
|
| 2726 | - $json .= '"group":"catgroup' . $term_id . '"'; |
|
| 2727 | - $json .= '}'; |
|
| 2720 | + $json = '{';
|
|
| 2721 | + $json .= '"id":"' . $post_obj->post_id . '",'; |
|
| 2722 | + $json .= '"lat_pos": "' . $lat . '",'; |
|
| 2723 | + $json .= '"long_pos": "' . $lng . '",'; |
|
| 2724 | + $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",'; |
|
| 2725 | + $json .= '"icon":"' . $term_icon . '",'; |
|
| 2726 | + $json .= '"group":"catgroup' . $term_id . '"'; |
|
| 2727 | + $json .= '}'; |
|
| 2728 | 2728 | |
| 2729 | - if ($post_obj->default_category == $term_id) {
|
|
| 2729 | + if ($post_obj->default_category == $term_id) {
|
|
| 2730 | 2730 | |
| 2731 | - $wpdb->query( |
|
| 2732 | - $wpdb->prepare( |
|
| 2733 | - "UPDATE " . $table . " SET marker_json = %s where post_id = %d", |
|
| 2734 | - array($json, $post_obj->post_id) |
|
| 2735 | - ) |
|
| 2736 | - ); |
|
| 2737 | - } |
|
| 2731 | + $wpdb->query( |
|
| 2732 | + $wpdb->prepare( |
|
| 2733 | + "UPDATE " . $table . " SET marker_json = %s where post_id = %d", |
|
| 2734 | + array($json, $post_obj->post_id) |
|
| 2735 | + ) |
|
| 2736 | + ); |
|
| 2737 | + } |
|
| 2738 | 2738 | |
| 2739 | - $wpdb->query( |
|
| 2740 | - $wpdb->prepare( |
|
| 2741 | - "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d", |
|
| 2742 | - array($json, $post_obj->post_id, $term_id) |
|
| 2743 | - ) |
|
| 2744 | - ); |
|
| 2739 | + $wpdb->query( |
|
| 2740 | + $wpdb->prepare( |
|
| 2741 | + "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d", |
|
| 2742 | + array($json, $post_obj->post_id, $term_id) |
|
| 2743 | + ) |
|
| 2744 | + ); |
|
| 2745 | 2745 | |
| 2746 | - } |
|
| 2746 | + } |
|
| 2747 | 2747 | |
| 2748 | 2748 | |
| 2749 | - endif; |
|
| 2749 | + endif; |
|
| 2750 | 2750 | |
| 2751 | - } |
|
| 2751 | + } |
|
| 2752 | 2752 | |
| 2753 | 2753 | } |
| 2754 | 2754 | |
@@ -2762,14 +2762,14 @@ discard block |
||
| 2762 | 2762 | */ |
| 2763 | 2763 | function geodir_get_listing_author($listing_id = '') |
| 2764 | 2764 | {
|
| 2765 | - if ($listing_id == '') {
|
|
| 2766 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 2767 | - $listing_id = $_REQUEST['pid']; |
|
| 2768 | - } |
|
| 2769 | - } |
|
| 2770 | - $listing = get_post(strip_tags($listing_id)); |
|
| 2771 | - $listing_author_id = $listing->post_author; |
|
| 2772 | - return $listing_author_id; |
|
| 2765 | + if ($listing_id == '') {
|
|
| 2766 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 2767 | + $listing_id = $_REQUEST['pid']; |
|
| 2768 | + } |
|
| 2769 | + } |
|
| 2770 | + $listing = get_post(strip_tags($listing_id)); |
|
| 2771 | + $listing_author_id = $listing->post_author; |
|
| 2772 | + return $listing_author_id; |
|
| 2773 | 2773 | } |
| 2774 | 2774 | |
| 2775 | 2775 | |
@@ -2784,11 +2784,11 @@ discard block |
||
| 2784 | 2784 | */ |
| 2785 | 2785 | function geodir_lisiting_belong_to_user($listing_id, $user_id) |
| 2786 | 2786 | {
|
| 2787 | - $listing_author_id = geodir_get_listing_author($listing_id); |
|
| 2788 | - if ($listing_author_id == $user_id) |
|
| 2789 | - return true; |
|
| 2790 | - else |
|
| 2791 | - return false; |
|
| 2787 | + $listing_author_id = geodir_get_listing_author($listing_id); |
|
| 2788 | + if ($listing_author_id == $user_id) |
|
| 2789 | + return true; |
|
| 2790 | + else |
|
| 2791 | + return false; |
|
| 2792 | 2792 | |
| 2793 | 2793 | } |
| 2794 | 2794 | |
@@ -2804,17 +2804,17 @@ discard block |
||
| 2804 | 2804 | */ |
| 2805 | 2805 | function geodir_listing_belong_to_current_user($listing_id = '', $exclude_admin = true) |
| 2806 | 2806 | {
|
| 2807 | - global $current_user; |
|
| 2808 | - if ($exclude_admin) {
|
|
| 2809 | - foreach ($current_user->caps as $key => $caps) {
|
|
| 2810 | - if (geodir_strtolower($key) == 'administrator') {
|
|
| 2811 | - return true; |
|
| 2812 | - break; |
|
| 2813 | - } |
|
| 2814 | - } |
|
| 2815 | - } |
|
| 2816 | - |
|
| 2817 | - return geodir_lisiting_belong_to_user($listing_id, $current_user->ID); |
|
| 2807 | + global $current_user; |
|
| 2808 | + if ($exclude_admin) {
|
|
| 2809 | + foreach ($current_user->caps as $key => $caps) {
|
|
| 2810 | + if (geodir_strtolower($key) == 'administrator') {
|
|
| 2811 | + return true; |
|
| 2812 | + break; |
|
| 2813 | + } |
|
| 2814 | + } |
|
| 2815 | + } |
|
| 2816 | + |
|
| 2817 | + return geodir_lisiting_belong_to_user($listing_id, $current_user->ID); |
|
| 2818 | 2818 | } |
| 2819 | 2819 | |
| 2820 | 2820 | |
@@ -2830,17 +2830,17 @@ discard block |
||
| 2830 | 2830 | function geodir_only_supportable_attachments_remove($file) |
| 2831 | 2831 | {
|
| 2832 | 2832 | |
| 2833 | - global $wpdb; |
|
| 2833 | + global $wpdb; |
|
| 2834 | 2834 | |
| 2835 | - $matches = array(); |
|
| 2835 | + $matches = array(); |
|
| 2836 | 2836 | |
| 2837 | - $pattern = '/-\d+x\d+\./'; |
|
| 2838 | - preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE); |
|
| 2837 | + $pattern = '/-\d+x\d+\./'; |
|
| 2838 | + preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE); |
|
| 2839 | 2839 | |
| 2840 | - if (empty($matches)) |
|
| 2841 | - return ''; |
|
| 2842 | - else |
|
| 2843 | - return $file; |
|
| 2840 | + if (empty($matches)) |
|
| 2841 | + return ''; |
|
| 2842 | + else |
|
| 2843 | + return $file; |
|
| 2844 | 2844 | |
| 2845 | 2845 | } |
| 2846 | 2846 | |
@@ -2857,78 +2857,78 @@ discard block |
||
| 2857 | 2857 | function geodir_set_wp_featured_image($post_id) |
| 2858 | 2858 | {
|
| 2859 | 2859 | |
| 2860 | - global $wpdb, $plugin_prefix; |
|
| 2861 | - $uploads = wp_upload_dir(); |
|
| 2860 | + global $wpdb, $plugin_prefix; |
|
| 2861 | + $uploads = wp_upload_dir(); |
|
| 2862 | 2862 | // print_r($uploads ) ; |
| 2863 | - $post_first_image = $wpdb->get_results( |
|
| 2864 | - $wpdb->prepare( |
|
| 2865 | - "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1 ", array($post_id) |
|
| 2866 | - ) |
|
| 2867 | - ); |
|
| 2863 | + $post_first_image = $wpdb->get_results( |
|
| 2864 | + $wpdb->prepare( |
|
| 2865 | + "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1 ", array($post_id) |
|
| 2866 | + ) |
|
| 2867 | + ); |
|
| 2868 | 2868 | |
| 2869 | - $old_attachment_name = ''; |
|
| 2870 | - $post_thumbnail_id = ''; |
|
| 2871 | - if (has_post_thumbnail($post_id)) {
|
|
| 2869 | + $old_attachment_name = ''; |
|
| 2870 | + $post_thumbnail_id = ''; |
|
| 2871 | + if (has_post_thumbnail($post_id)) {
|
|
| 2872 | 2872 | |
| 2873 | - if (has_post_thumbnail($post_id)) {
|
|
| 2873 | + if (has_post_thumbnail($post_id)) {
|
|
| 2874 | 2874 | |
| 2875 | - $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2875 | + $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2876 | 2876 | |
| 2877 | - $old_attachment_name = basename(get_attached_file($post_thumbnail_id)); |
|
| 2877 | + $old_attachment_name = basename(get_attached_file($post_thumbnail_id)); |
|
| 2878 | 2878 | |
| 2879 | - } |
|
| 2880 | - } |
|
| 2881 | - |
|
| 2882 | - if (!empty($post_first_image)) {
|
|
| 2879 | + } |
|
| 2880 | + } |
|
| 2883 | 2881 | |
| 2884 | - $post_type = get_post_type($post_id); |
|
| 2882 | + if (!empty($post_first_image)) {
|
|
| 2885 | 2883 | |
| 2886 | - $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2884 | + $post_type = get_post_type($post_id); |
|
| 2887 | 2885 | |
| 2888 | - $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
|
|
| 2886 | + $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2889 | 2887 | |
| 2890 | - $new_attachment_name = basename($post_first_image[0]->file); |
|
| 2888 | + $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
|
|
| 2891 | 2889 | |
| 2892 | - if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {
|
|
| 2890 | + $new_attachment_name = basename($post_first_image[0]->file); |
|
| 2893 | 2891 | |
| 2894 | - if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
|
|
| 2892 | + if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {
|
|
| 2895 | 2893 | |
| 2896 | - add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');
|
|
| 2894 | + if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
|
|
| 2897 | 2895 | |
| 2898 | - wp_delete_attachment($post_thumbnail_id); |
|
| 2896 | + add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');
|
|
| 2899 | 2897 | |
| 2900 | - } |
|
| 2901 | - $filename = $uploads['basedir'] . $post_first_image[0]->file; |
|
| 2898 | + wp_delete_attachment($post_thumbnail_id); |
|
| 2902 | 2899 | |
| 2903 | - $attachment = array( |
|
| 2904 | - 'post_mime_type' => $post_first_image[0]->mime_type, |
|
| 2905 | - 'guid' => $uploads['baseurl'] . $post_first_image[0]->file, |
|
| 2906 | - 'post_parent' => $post_id, |
|
| 2907 | - 'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
|
|
| 2908 | - 'post_content' => '' |
|
| 2909 | - ); |
|
| 2900 | + } |
|
| 2901 | + $filename = $uploads['basedir'] . $post_first_image[0]->file; |
|
| 2902 | + |
|
| 2903 | + $attachment = array( |
|
| 2904 | + 'post_mime_type' => $post_first_image[0]->mime_type, |
|
| 2905 | + 'guid' => $uploads['baseurl'] . $post_first_image[0]->file, |
|
| 2906 | + 'post_parent' => $post_id, |
|
| 2907 | + 'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
|
|
| 2908 | + 'post_content' => '' |
|
| 2909 | + ); |
|
| 2910 | 2910 | |
| 2911 | 2911 | |
| 2912 | - $id = wp_insert_attachment($attachment, $filename, $post_id); |
|
| 2912 | + $id = wp_insert_attachment($attachment, $filename, $post_id); |
|
| 2913 | 2913 | |
| 2914 | - if (!is_wp_error($id)) {
|
|
| 2914 | + if (!is_wp_error($id)) {
|
|
| 2915 | 2915 | |
| 2916 | - set_post_thumbnail($post_id, $id); |
|
| 2916 | + set_post_thumbnail($post_id, $id); |
|
| 2917 | 2917 | |
| 2918 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 2919 | - wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename)); |
|
| 2918 | + require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 2919 | + wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename)); |
|
| 2920 | 2920 | |
| 2921 | - } |
|
| 2921 | + } |
|
| 2922 | 2922 | |
| 2923 | - } |
|
| 2923 | + } |
|
| 2924 | 2924 | |
| 2925 | - } else {
|
|
| 2926 | - //set_post_thumbnail($post_id,-1); |
|
| 2925 | + } else {
|
|
| 2926 | + //set_post_thumbnail($post_id,-1); |
|
| 2927 | 2927 | |
| 2928 | - if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) |
|
| 2929 | - wp_delete_attachment($post_thumbnail_id); |
|
| 2928 | + if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) |
|
| 2929 | + wp_delete_attachment($post_thumbnail_id); |
|
| 2930 | 2930 | |
| 2931 | - } |
|
| 2931 | + } |
|
| 2932 | 2932 | } |
| 2933 | 2933 | |
| 2934 | 2934 | |
@@ -2943,53 +2943,53 @@ discard block |
||
| 2943 | 2943 | */ |
| 2944 | 2944 | function gd_copy_original_translation() |
| 2945 | 2945 | {
|
| 2946 | - if (geodir_is_wpml()) {
|
|
| 2947 | - global $wpdb, $table_prefix, $plugin_prefix; |
|
| 2948 | - $post_id = absint($_POST['post_id']); |
|
| 2949 | - $upload_dir = wp_upload_dir(); |
|
| 2950 | - $post_type = get_post_type($_POST['post_id']); |
|
| 2951 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2952 | - |
|
| 2953 | - $post_arr = $wpdb->get_results($wpdb->prepare( |
|
| 2954 | - "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1", |
|
| 2955 | - array($post_id) |
|
| 2956 | - ) |
|
| 2957 | - , ARRAY_A); |
|
| 2958 | - |
|
| 2959 | - $arrImages = $wpdb->get_results( |
|
| 2960 | - $wpdb->prepare( |
|
| 2961 | - "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ", |
|
| 2962 | - array('%image%', $post_id)
|
|
| 2963 | - ) |
|
| 2964 | - ); |
|
| 2965 | - if ($arrImages) {
|
|
| 2966 | - $image_arr = array(); |
|
| 2967 | - foreach ($arrImages as $img) {
|
|
| 2968 | - $image_arr[] = $upload_dir['baseurl'] . $img->file; |
|
| 2969 | - } |
|
| 2970 | - $comma_separated = implode(",", $image_arr);
|
|
| 2971 | - $post_arr[0]['post_images'] = $comma_separated; |
|
| 2972 | - } |
|
| 2973 | - |
|
| 2974 | - |
|
| 2975 | - $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category']; |
|
| 2976 | - $cat_arr = array_filter(explode(",", $cats));
|
|
| 2977 | - $trans_cat = array(); |
|
| 2978 | - foreach ($cat_arr as $cat) {
|
|
| 2979 | - $trans_cat[] = geodir_wpml_object_id($cat, $post_arr[0]['post_type'] . 'category', false); |
|
| 2980 | - } |
|
| 2981 | - |
|
| 2982 | - |
|
| 2983 | - $post_arr[0]['categories'] = array_filter($trans_cat); |
|
| 2946 | + if (geodir_is_wpml()) {
|
|
| 2947 | + global $wpdb, $table_prefix, $plugin_prefix; |
|
| 2948 | + $post_id = absint($_POST['post_id']); |
|
| 2949 | + $upload_dir = wp_upload_dir(); |
|
| 2950 | + $post_type = get_post_type($_POST['post_id']); |
|
| 2951 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2952 | + |
|
| 2953 | + $post_arr = $wpdb->get_results($wpdb->prepare( |
|
| 2954 | + "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1", |
|
| 2955 | + array($post_id) |
|
| 2956 | + ) |
|
| 2957 | + , ARRAY_A); |
|
| 2958 | + |
|
| 2959 | + $arrImages = $wpdb->get_results( |
|
| 2960 | + $wpdb->prepare( |
|
| 2961 | + "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ", |
|
| 2962 | + array('%image%', $post_id)
|
|
| 2963 | + ) |
|
| 2964 | + ); |
|
| 2965 | + if ($arrImages) {
|
|
| 2966 | + $image_arr = array(); |
|
| 2967 | + foreach ($arrImages as $img) {
|
|
| 2968 | + $image_arr[] = $upload_dir['baseurl'] . $img->file; |
|
| 2969 | + } |
|
| 2970 | + $comma_separated = implode(",", $image_arr);
|
|
| 2971 | + $post_arr[0]['post_images'] = $comma_separated; |
|
| 2972 | + } |
|
| 2973 | + |
|
| 2974 | + |
|
| 2975 | + $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category']; |
|
| 2976 | + $cat_arr = array_filter(explode(",", $cats));
|
|
| 2977 | + $trans_cat = array(); |
|
| 2978 | + foreach ($cat_arr as $cat) {
|
|
| 2979 | + $trans_cat[] = geodir_wpml_object_id($cat, $post_arr[0]['post_type'] . 'category', false); |
|
| 2980 | + } |
|
| 2981 | + |
|
| 2982 | + |
|
| 2983 | + $post_arr[0]['categories'] = array_filter($trans_cat); |
|
| 2984 | 2984 | //print_r($image_arr); |
| 2985 | - //print_r($arrImages); |
|
| 2986 | - //echo $_REQUEST['lang']; |
|
| 2985 | + //print_r($arrImages); |
|
| 2986 | + //echo $_REQUEST['lang']; |
|
| 2987 | 2987 | //print_r($post_arr); |
| 2988 | 2988 | //print_r($trans_cat); |
| 2989 | - echo json_encode($post_arr[0]); |
|
| 2989 | + echo json_encode($post_arr[0]); |
|
| 2990 | 2990 | |
| 2991 | - } |
|
| 2992 | - die(); |
|
| 2991 | + } |
|
| 2992 | + die(); |
|
| 2993 | 2993 | } |
| 2994 | 2994 | |
| 2995 | 2995 | |
@@ -3009,54 +3009,54 @@ discard block |
||
| 3009 | 3009 | function geodir_get_custom_fields_type($listing_type = '') |
| 3010 | 3010 | {
|
| 3011 | 3011 | |
| 3012 | - global $wpdb; |
|
| 3012 | + global $wpdb; |
|
| 3013 | 3013 | |
| 3014 | - if ($listing_type == '') |
|
| 3015 | - $listing_type = 'gd_place'; |
|
| 3014 | + if ($listing_type == '') |
|
| 3015 | + $listing_type = 'gd_place'; |
|
| 3016 | 3016 | |
| 3017 | - $fields_info = array(); |
|
| 3017 | + $fields_info = array(); |
|
| 3018 | 3018 | |
| 3019 | - $get_data = $wpdb->get_results( |
|
| 3020 | - $wpdb->prepare( |
|
| 3021 | - "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'", |
|
| 3022 | - array($listing_type) |
|
| 3023 | - ) |
|
| 3024 | - ); |
|
| 3019 | + $get_data = $wpdb->get_results( |
|
| 3020 | + $wpdb->prepare( |
|
| 3021 | + "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'", |
|
| 3022 | + array($listing_type) |
|
| 3023 | + ) |
|
| 3024 | + ); |
|
| 3025 | 3025 | |
| 3026 | - if (!empty($get_data)) {
|
|
| 3026 | + if (!empty($get_data)) {
|
|
| 3027 | 3027 | |
| 3028 | - foreach ($get_data as $data) {
|
|
| 3028 | + foreach ($get_data as $data) {
|
|
| 3029 | 3029 | |
| 3030 | - if ($data->field_type == 'address') {
|
|
| 3030 | + if ($data->field_type == 'address') {
|
|
| 3031 | 3031 | |
| 3032 | - $extra_fields = unserialize($data->extra_fields); |
|
| 3032 | + $extra_fields = unserialize($data->extra_fields); |
|
| 3033 | 3033 | |
| 3034 | - $prefix = $data->htmlvar_name . '_'; |
|
| 3034 | + $prefix = $data->htmlvar_name . '_'; |
|
| 3035 | 3035 | |
| 3036 | - $fields_info[$prefix . 'address'] = $data->field_type; |
|
| 3036 | + $fields_info[$prefix . 'address'] = $data->field_type; |
|
| 3037 | 3037 | |
| 3038 | - if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) |
|
| 3039 | - $fields_info[$prefix . 'zip'] = $data->field_type; |
|
| 3038 | + if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) |
|
| 3039 | + $fields_info[$prefix . 'zip'] = $data->field_type; |
|
| 3040 | 3040 | |
| 3041 | - } else {
|
|
| 3041 | + } else {
|
|
| 3042 | 3042 | |
| 3043 | - $fields_info[$data->htmlvar_name] = $data->field_type; |
|
| 3043 | + $fields_info[$data->htmlvar_name] = $data->field_type; |
|
| 3044 | 3044 | |
| 3045 | - } |
|
| 3045 | + } |
|
| 3046 | 3046 | |
| 3047 | - } |
|
| 3047 | + } |
|
| 3048 | 3048 | |
| 3049 | - } |
|
| 3049 | + } |
|
| 3050 | 3050 | |
| 3051 | - /** |
|
| 3052 | - * Filter to modify custom fields info using listing post type. |
|
| 3053 | - * |
|
| 3054 | - * @since 1.0.0 |
|
| 3055 | - * @package GeoDirectory |
|
| 3056 | - * @return array $fields_info Custom fields info. |
|
| 3057 | - * @param string $listing_type The listing post type. |
|
| 3058 | - */ |
|
| 3059 | - return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);
|
|
| 3051 | + /** |
|
| 3052 | + * Filter to modify custom fields info using listing post type. |
|
| 3053 | + * |
|
| 3054 | + * @since 1.0.0 |
|
| 3055 | + * @package GeoDirectory |
|
| 3056 | + * @return array $fields_info Custom fields info. |
|
| 3057 | + * @param string $listing_type The listing post type. |
|
| 3058 | + */ |
|
| 3059 | + return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);
|
|
| 3060 | 3060 | } |
| 3061 | 3061 | |
| 3062 | 3062 | |
@@ -3071,58 +3071,58 @@ discard block |
||
| 3071 | 3071 | */ |
| 3072 | 3072 | function geodir_function_post_updated($post_ID, $post_after, $post_before) |
| 3073 | 3073 | {
|
| 3074 | - $post_type = get_post_type($post_ID); |
|
| 3074 | + $post_type = get_post_type($post_ID); |
|
| 3075 | 3075 | |
| 3076 | - if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {
|
|
| 3077 | - // send notification to client when post moves from draft to publish |
|
| 3078 | - 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')) {
|
|
| 3079 | - $post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL; |
|
| 3080 | - $post_author_data = get_userdata($post_author_id); |
|
| 3076 | + if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {
|
|
| 3077 | + // send notification to client when post moves from draft to publish |
|
| 3078 | + 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')) {
|
|
| 3079 | + $post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL; |
|
| 3080 | + $post_author_data = get_userdata($post_author_id); |
|
| 3081 | 3081 | |
| 3082 | - $to_name = geodir_get_client_name($post_author_id); |
|
| 3082 | + $to_name = geodir_get_client_name($post_author_id); |
|
| 3083 | 3083 | |
| 3084 | - $from_email = geodir_get_site_email_id(); |
|
| 3085 | - $from_name = get_site_emailName(); |
|
| 3086 | - $to_email = $post_author_data->user_email; |
|
| 3084 | + $from_email = geodir_get_site_email_id(); |
|
| 3085 | + $from_name = get_site_emailName(); |
|
| 3086 | + $to_email = $post_author_data->user_email; |
|
| 3087 | 3087 | |
| 3088 | - if (!is_email($to_email) && !empty($post_author_data->user_email)) {
|
|
| 3089 | - $to_email = $post_author_data->user_email; |
|
| 3090 | - } |
|
| 3088 | + if (!is_email($to_email) && !empty($post_author_data->user_email)) {
|
|
| 3089 | + $to_email = $post_author_data->user_email; |
|
| 3090 | + } |
|
| 3091 | 3091 | |
| 3092 | - $message_type = 'listing_published'; |
|
| 3092 | + $message_type = 'listing_published'; |
|
| 3093 | 3093 | |
| 3094 | - if (get_option('geodir_post_published_email_subject') == '') {
|
|
| 3095 | - update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));
|
|
| 3096 | - } |
|
| 3094 | + if (get_option('geodir_post_published_email_subject') == '') {
|
|
| 3095 | + update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));
|
|
| 3096 | + } |
|
| 3097 | 3097 | |
| 3098 | - if (get_option('geodir_post_published_email_content') == '') {
|
|
| 3099 | - 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'));
|
|
| 3100 | - } |
|
| 3098 | + if (get_option('geodir_post_published_email_content') == '') {
|
|
| 3099 | + 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'));
|
|
| 3100 | + } |
|
| 3101 | 3101 | |
| 3102 | - /** |
|
| 3103 | - * Called before sending the email when listing gets published. |
|
| 3104 | - * |
|
| 3105 | - * @since 1.0.0 |
|
| 3106 | - * @package GeoDirectory |
|
| 3107 | - * @param object $post_after The post object after update. |
|
| 3108 | - * @param object $post_before The post object before update. |
|
| 3109 | - */ |
|
| 3110 | - do_action('geodir_before_listing_published_email', $post_after, $post_before);
|
|
| 3111 | - if (is_email($to_email)) {
|
|
| 3112 | - geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID); |
|
| 3113 | - } |
|
| 3102 | + /** |
|
| 3103 | + * Called before sending the email when listing gets published. |
|
| 3104 | + * |
|
| 3105 | + * @since 1.0.0 |
|
| 3106 | + * @package GeoDirectory |
|
| 3107 | + * @param object $post_after The post object after update. |
|
| 3108 | + * @param object $post_before The post object before update. |
|
| 3109 | + */ |
|
| 3110 | + do_action('geodir_before_listing_published_email', $post_after, $post_before);
|
|
| 3111 | + if (is_email($to_email)) {
|
|
| 3112 | + geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID); |
|
| 3113 | + } |
|
| 3114 | 3114 | |
| 3115 | - /** |
|
| 3116 | - * Called after sending the email when listing gets published. |
|
| 3117 | - * |
|
| 3118 | - * @since 1.0.0 |
|
| 3119 | - * @package GeoDirectory |
|
| 3120 | - * @param object $post_after The post object after update. |
|
| 3121 | - * @param object $post_before The post object before update. |
|
| 3122 | - */ |
|
| 3123 | - do_action('geodir_after_listing_published_email', $post_after, $post_before);
|
|
| 3124 | - } |
|
| 3125 | - } |
|
| 3115 | + /** |
|
| 3116 | + * Called after sending the email when listing gets published. |
|
| 3117 | + * |
|
| 3118 | + * @since 1.0.0 |
|
| 3119 | + * @package GeoDirectory |
|
| 3120 | + * @param object $post_after The post object after update. |
|
| 3121 | + * @param object $post_before The post object before update. |
|
| 3122 | + */ |
|
| 3123 | + do_action('geodir_after_listing_published_email', $post_after, $post_before);
|
|
| 3124 | + } |
|
| 3125 | + } |
|
| 3126 | 3126 | } |
| 3127 | 3127 | |
| 3128 | 3128 | add_action('wp_head', 'geodir_fb_like_thumbnail');
|
@@ -3137,46 +3137,46 @@ discard block |
||
| 3137 | 3137 | */ |
| 3138 | 3138 | function geodir_fb_like_thumbnail(){
|
| 3139 | 3139 | |
| 3140 | - $facebook_image = ''; |
|
| 3141 | - |
|
| 3142 | - if(is_single()){// single post
|
|
| 3143 | - global $post; |
|
| 3144 | - if(isset($post->featured_image) && $post->featured_image){
|
|
| 3145 | - $upload_dir = wp_upload_dir(); |
|
| 3146 | - $facebook_image = $upload_dir['baseurl'].$post->featured_image; |
|
| 3147 | - |
|
| 3148 | - } |
|
| 3149 | - }elseif(geodir_is_page('location')){// location page
|
|
| 3150 | - if (function_exists('geodir_get_location_seo')) {
|
|
| 3151 | - $seo = geodir_get_location_seo(); |
|
| 3152 | - if (isset($seo->seo_image) && $seo->seo_image) {
|
|
| 3153 | - $image = wp_get_attachment_image_src($seo->seo_image, 'full'); |
|
| 3154 | - $facebook_image = isset($image[0]) ? $image[0] : ''; |
|
| 3155 | - } |
|
| 3156 | - } |
|
| 3157 | - |
|
| 3158 | - if(!$facebook_image){
|
|
| 3159 | - global $post; |
|
| 3160 | - |
|
| 3161 | - if (has_post_thumbnail( $post->ID ) ){
|
|
| 3162 | - $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'full' ); |
|
| 3163 | - $facebook_image = isset($image[0]) ? $image[0] : ''; |
|
| 3164 | - } |
|
| 3165 | - } |
|
| 3166 | - } |
|
| 3167 | - |
|
| 3168 | - |
|
| 3169 | - /** |
|
| 3170 | - * Filter the facebook share image. |
|
| 3171 | - * |
|
| 3172 | - * @since 1.6.22 |
|
| 3173 | - * @param string $facebook_image The image URL or blank. |
|
| 3174 | - */ |
|
| 3175 | - $facebook_image = apply_filters('geodir_fb_share_image',$facebook_image);
|
|
| 3176 | - |
|
| 3177 | - if($facebook_image){
|
|
| 3178 | - echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$facebook_image\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n"; |
|
| 3179 | - } |
|
| 3140 | + $facebook_image = ''; |
|
| 3141 | + |
|
| 3142 | + if(is_single()){// single post
|
|
| 3143 | + global $post; |
|
| 3144 | + if(isset($post->featured_image) && $post->featured_image){
|
|
| 3145 | + $upload_dir = wp_upload_dir(); |
|
| 3146 | + $facebook_image = $upload_dir['baseurl'].$post->featured_image; |
|
| 3147 | + |
|
| 3148 | + } |
|
| 3149 | + }elseif(geodir_is_page('location')){// location page
|
|
| 3150 | + if (function_exists('geodir_get_location_seo')) {
|
|
| 3151 | + $seo = geodir_get_location_seo(); |
|
| 3152 | + if (isset($seo->seo_image) && $seo->seo_image) {
|
|
| 3153 | + $image = wp_get_attachment_image_src($seo->seo_image, 'full'); |
|
| 3154 | + $facebook_image = isset($image[0]) ? $image[0] : ''; |
|
| 3155 | + } |
|
| 3156 | + } |
|
| 3157 | + |
|
| 3158 | + if(!$facebook_image){
|
|
| 3159 | + global $post; |
|
| 3160 | + |
|
| 3161 | + if (has_post_thumbnail( $post->ID ) ){
|
|
| 3162 | + $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'full' ); |
|
| 3163 | + $facebook_image = isset($image[0]) ? $image[0] : ''; |
|
| 3164 | + } |
|
| 3165 | + } |
|
| 3166 | + } |
|
| 3167 | + |
|
| 3168 | + |
|
| 3169 | + /** |
|
| 3170 | + * Filter the facebook share image. |
|
| 3171 | + * |
|
| 3172 | + * @since 1.6.22 |
|
| 3173 | + * @param string $facebook_image The image URL or blank. |
|
| 3174 | + */ |
|
| 3175 | + $facebook_image = apply_filters('geodir_fb_share_image',$facebook_image);
|
|
| 3176 | + |
|
| 3177 | + if($facebook_image){
|
|
| 3178 | + echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$facebook_image\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n"; |
|
| 3179 | + } |
|
| 3180 | 3180 | |
| 3181 | 3181 | |
| 3182 | 3182 | } |
| 3183 | 3183 | \ 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 | |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | |
| 146 | 146 | $gd_post = $post; |
| 147 | 147 | if (!empty($gd_post) && is_array($gd_post)) {
|
| 148 | - $gd_post = (object)$post; |
|
| 148 | + $gd_post = (object) $post; |
|
| 149 | 149 | |
| 150 | 150 | // Fix WPML duplicate. |
| 151 | 151 | if (geodir_is_wpml() && !empty($request_info['action']) && $request_info['action'] == 'editpost' && !empty($request_info['icl_trid']) && !isset($post['post_date'])) {
|
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | $send_post_submit_mail = false; |
| 240 | 240 | |
| 241 | 241 | // unhook this function so it doesn't loop infinitely |
| 242 | - remove_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 242 | + remove_action('save_post', 'geodir_post_information_save', 10, 2);
|
|
| 243 | 243 | |
| 244 | 244 | if (isset($request_info['pid']) && $request_info['pid'] != '') {
|
| 245 | 245 | $post['ID'] = $request_info['pid']; |
@@ -263,13 +263,13 @@ discard block |
||
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | // re-hook this function |
| 266 | - add_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 266 | + add_action('save_post', 'geodir_post_information_save', 10, 2);
|
|
| 267 | 267 | |
| 268 | 268 | $post_tags = ''; |
| 269 | 269 | if (!isset($request_info['post_tags'])) {
|
| 270 | 270 | |
| 271 | 271 | $post_type = $request_info['listing_type']; |
| 272 | - $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));
|
|
| 272 | + $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type.'_tags', array('fields' => 'names')));
|
|
| 273 | 273 | |
| 274 | 274 | } |
| 275 | 275 | |
@@ -287,13 +287,13 @@ discard block |
||
| 287 | 287 | $payment_info = array(); |
| 288 | 288 | $package_info = array(); |
| 289 | 289 | |
| 290 | - $package_info = (array)geodir_post_package_info($package_info, $post); |
|
| 290 | + $package_info = (array) geodir_post_package_info($package_info, $post); |
|
| 291 | 291 | |
| 292 | 292 | $post_package_id = geodir_get_post_meta($last_post_id, 'package_id'); |
| 293 | 293 | |
| 294 | 294 | if (!empty($package_info) && !$post_package_id) {
|
| 295 | 295 | if (isset($package_info['days']) && $package_info['days'] != 0) {
|
| 296 | - $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));
|
|
| 296 | + $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['days']." days"));
|
|
| 297 | 297 | } else {
|
| 298 | 298 | $payment_info['expire_date'] = 'Never'; |
| 299 | 299 | } |
@@ -314,8 +314,8 @@ discard block |
||
| 314 | 314 | $extrafields = $val['extra_fields']; |
| 315 | 315 | |
| 316 | 316 | if (trim($type) == 'address') {
|
| 317 | - $prefix = $name . '_'; |
|
| 318 | - $address = $prefix . 'address'; |
|
| 317 | + $prefix = $name.'_'; |
|
| 318 | + $address = $prefix.'address'; |
|
| 319 | 319 | |
| 320 | 320 | if (isset($request_info[$address]) && $request_info[$address] != '') {
|
| 321 | 321 | $gd_post_info[$address] = wp_slash($request_info[$address]); |
@@ -325,59 +325,59 @@ discard block |
||
| 325 | 325 | $extrafields = unserialize($extrafields); |
| 326 | 326 | |
| 327 | 327 | |
| 328 | - if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {
|
|
| 328 | + if (!isset($request_info[$prefix.'city']) || $request_info[$prefix.'city'] == '') {
|
|
| 329 | 329 | |
| 330 | 330 | $location_result = geodir_get_default_location(); |
| 331 | 331 | |
| 332 | - $gd_post_info[$prefix . 'city'] = $location_result->city; |
|
| 333 | - $gd_post_info[$prefix . 'region'] = $location_result->region; |
|
| 334 | - $gd_post_info[$prefix . 'country'] = $location_result->country; |
|
| 332 | + $gd_post_info[$prefix.'city'] = $location_result->city; |
|
| 333 | + $gd_post_info[$prefix.'region'] = $location_result->region; |
|
| 334 | + $gd_post_info[$prefix.'country'] = $location_result->country; |
|
| 335 | 335 | |
| 336 | - $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 336 | + $gd_post_info['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // set all overall post location |
|
| 337 | 337 | |
| 338 | 338 | } else {
|
| 339 | 339 | |
| 340 | - $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city']; |
|
| 341 | - $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region']; |
|
| 342 | - $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country']; |
|
| 340 | + $gd_post_info[$prefix.'city'] = $request_info[$prefix.'city']; |
|
| 341 | + $gd_post_info[$prefix.'region'] = $request_info[$prefix.'region']; |
|
| 342 | + $gd_post_info[$prefix.'country'] = $request_info[$prefix.'country']; |
|
| 343 | 343 | |
| 344 | 344 | //----------set post locations when import dummy data------- |
| 345 | 345 | $location_result = geodir_get_default_location(); |
| 346 | 346 | |
| 347 | - $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location |
|
| 347 | + $gd_post_info['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // set all overall post location |
|
| 348 | 348 | //----------------------------------------------------------------- |
| 349 | 349 | |
| 350 | 350 | } |
| 351 | 351 | |
| 352 | 352 | |
| 353 | - if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {
|
|
| 354 | - $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip']; |
|
| 353 | + if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix.'zip'])) {
|
|
| 354 | + $gd_post_info[$prefix.'zip'] = $request_info[$prefix.'zip']; |
|
| 355 | 355 | } |
| 356 | 356 | |
| 357 | 357 | |
| 358 | 358 | if (isset($extrafields['show_map']) && $extrafields['show_map']) {
|
| 359 | 359 | |
| 360 | - if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {
|
|
| 361 | - $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude']; |
|
| 360 | + if (isset($request_info[$prefix.'latitude']) && $request_info[$prefix.'latitude'] != '') {
|
|
| 361 | + $gd_post_info[$prefix.'latitude'] = $request_info[$prefix.'latitude']; |
|
| 362 | 362 | } |
| 363 | 363 | |
| 364 | - if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {
|
|
| 365 | - $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude']; |
|
| 364 | + if (isset($request_info[$prefix.'longitude']) && $request_info[$prefix.'longitude'] != '') {
|
|
| 365 | + $gd_post_info[$prefix.'longitude'] = $request_info[$prefix.'longitude']; |
|
| 366 | 366 | } |
| 367 | 367 | |
| 368 | - if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {
|
|
| 369 | - $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview']; |
|
| 368 | + if (isset($request_info[$prefix.'mapview']) && $request_info[$prefix.'mapview'] != '') {
|
|
| 369 | + $gd_post_info[$prefix.'mapview'] = $request_info[$prefix.'mapview']; |
|
| 370 | 370 | } |
| 371 | 371 | |
| 372 | - if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {
|
|
| 373 | - $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom']; |
|
| 372 | + if (isset($request_info[$prefix.'mapzoom']) && $request_info[$prefix.'mapzoom'] != '') {
|
|
| 373 | + $gd_post_info[$prefix.'mapzoom'] = $request_info[$prefix.'mapzoom']; |
|
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | // show lat lng |
| 379 | - if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {
|
|
| 380 | - $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng']; |
|
| 379 | + if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix.'latlng'])) {
|
|
| 380 | + $gd_post_info[$prefix.'latlng'] = $request_info[$prefix.'latlng']; |
|
| 381 | 381 | } |
| 382 | 382 | } |
| 383 | 383 | |
@@ -403,16 +403,16 @@ discard block |
||
| 403 | 403 | |
| 404 | 404 | // check if we need to change the format or not |
| 405 | 405 | $date_format_len = strlen(str_replace(' ', '', $date_format));
|
| 406 | - if($date_format_len>5){// if greater then 5 then it's the old style format.
|
|
| 406 | + if ($date_format_len > 5) {// if greater then 5 then it's the old style format.
|
|
| 407 | 407 | |
| 408 | - $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
|
|
| 409 | - $replace = array('d','j','l','m','n','F','Y');//PHP date format
|
|
| 408 | + $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format
|
|
| 409 | + $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format
|
|
| 410 | 410 | |
| 411 | 411 | $date_format = str_replace($search, $replace, $date_format); |
| 412 | 412 | |
| 413 | 413 | $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];
|
| 414 | 414 | |
| 415 | - }else{
|
|
| 415 | + } else {
|
|
| 416 | 416 | $post_htmlvar_value = $request_info[$name]; |
| 417 | 417 | } |
| 418 | 418 | |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | if (isset($request_info[$name])) {
|
| 427 | 427 | $gd_post_info[$name] = $request_info[$name]; |
| 428 | 428 | } else {
|
| 429 | - if (isset($request_info['gd_field_' . $name])) {
|
|
| 429 | + if (isset($request_info['gd_field_'.$name])) {
|
|
| 430 | 430 | $gd_post_info[$name] = ''; /* fix de-select for multiselect */ |
| 431 | 431 | } |
| 432 | 432 | } |
@@ -486,7 +486,7 @@ discard block |
||
| 486 | 486 | } |
| 487 | 487 | |
| 488 | 488 | if (is_array($post_tags)) {
|
| 489 | - $taxonomy = $request_info['listing_type'] . '_tags'; |
|
| 489 | + $taxonomy = $request_info['listing_type'].'_tags'; |
|
| 490 | 490 | wp_set_object_terms($last_post_id, $post_tags, $taxonomy); |
| 491 | 491 | } |
| 492 | 492 | |
@@ -498,7 +498,7 @@ discard block |
||
| 498 | 498 | $tmpimgArr = trim($request_info['post_images'], ","); |
| 499 | 499 | $tmpimgArr = explode(",", $tmpimgArr);
|
| 500 | 500 | geodir_save_post_images($last_post_id, $tmpimgArr, $dummy); |
| 501 | - } else{
|
|
| 501 | + } else {
|
|
| 502 | 502 | geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy); |
| 503 | 503 | } |
| 504 | 504 | |
@@ -579,7 +579,7 @@ discard block |
||
| 579 | 579 | if (!in_array($post_type, $all_postypes)) |
| 580 | 580 | return false; |
| 581 | 581 | |
| 582 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 582 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 583 | 583 | |
| 584 | 584 | /** |
| 585 | 585 | * Apply Filter to change Post info |
@@ -589,7 +589,7 @@ discard block |
||
| 589 | 589 | * @since 1.0.0 |
| 590 | 590 | * @package GeoDirectory |
| 591 | 591 | */ |
| 592 | - $query = apply_filters('geodir_post_info_query', $wpdb->prepare("SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd
|
|
| 592 | + $query = apply_filters('geodir_post_info_query', $wpdb->prepare("SELECT p.*,pd.* FROM ".$wpdb->posts." p,".$table." pd
|
|
| 593 | 593 | WHERE p.ID = pd.post_id |
| 594 | 594 | AND pd.post_id = %d", $post_id)); |
| 595 | 595 | |
@@ -652,7 +652,7 @@ discard block |
||
| 652 | 652 | |
| 653 | 653 | $post_type = get_post_type($post_id); |
| 654 | 654 | |
| 655 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 655 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 656 | 656 | |
| 657 | 657 | /** |
| 658 | 658 | * Filter to change Post info |
@@ -673,7 +673,7 @@ discard block |
||
| 673 | 673 | |
| 674 | 674 | $columns = $wpdb->get_col("show columns from $table");
|
| 675 | 675 | foreach ($postmeta as $mkey => $mval) {
|
| 676 | - if(in_array($mkey,$columns)) {
|
|
| 676 | + if (in_array($mkey, $columns)) {
|
|
| 677 | 677 | if (is_array($mval)) {
|
| 678 | 678 | $mval = implode(",", $mval);
|
| 679 | 679 | } |
@@ -702,12 +702,12 @@ discard block |
||
| 702 | 702 | */ |
| 703 | 703 | do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);
|
| 704 | 704 | |
| 705 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 705 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {
|
|
| 706 | 706 | |
| 707 | 707 | $query_string_array[] = $post_id; |
| 708 | 708 | $wpdb->query( |
| 709 | 709 | $wpdb->prepare( |
| 710 | - "UPDATE " . $table . " SET " . $query_string_escaped . " where post_id =%d", |
|
| 710 | + "UPDATE ".$table." SET ".$query_string_escaped." where post_id =%d", |
|
| 711 | 711 | $query_string_array |
| 712 | 712 | ) |
| 713 | 713 | ); |
@@ -718,7 +718,7 @@ discard block |
||
| 718 | 718 | array_unshift($query_string_array, $post_id); |
| 719 | 719 | $wpdb->query( |
| 720 | 720 | $wpdb->prepare( |
| 721 | - "INSERT INTO " . $table . " SET post_id = %d," . $query_string_escaped, |
|
| 721 | + "INSERT INTO ".$table." SET post_id = %d,".$query_string_escaped, |
|
| 722 | 722 | $query_string_array |
| 723 | 723 | ) |
| 724 | 724 | ); |
@@ -764,7 +764,7 @@ discard block |
||
| 764 | 764 | |
| 765 | 765 | $post_type = get_post_type($post_id); |
| 766 | 766 | |
| 767 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 767 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 768 | 768 | |
| 769 | 769 | if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {
|
| 770 | 770 | |
@@ -772,11 +772,11 @@ discard block |
||
| 772 | 772 | $meta_value = implode(",", $meta_value);
|
| 773 | 773 | } |
| 774 | 774 | |
| 775 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 775 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {
|
|
| 776 | 776 | |
| 777 | 777 | $wpdb->query( |
| 778 | 778 | $wpdb->prepare( |
| 779 | - "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d", |
|
| 779 | + "UPDATE ".$table." SET ".$postmeta." = '".$meta_value."' where post_id =%d", |
|
| 780 | 780 | array($post_id) |
| 781 | 781 | ) |
| 782 | 782 | ); |
@@ -785,7 +785,7 @@ discard block |
||
| 785 | 785 | |
| 786 | 786 | $wpdb->query( |
| 787 | 787 | $wpdb->prepare( |
| 788 | - "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'", |
|
| 788 | + "INSERT INTO ".$table." SET post_id = %d, ".$postmeta." = '".$meta_value."'", |
|
| 789 | 789 | array($post_id) |
| 790 | 790 | ) |
| 791 | 791 | ); |
@@ -818,14 +818,14 @@ discard block |
||
| 818 | 818 | |
| 819 | 819 | $post_type = get_post_type($post_id); |
| 820 | 820 | |
| 821 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 821 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 822 | 822 | |
| 823 | 823 | if (is_array($postmeta) && !empty($postmeta) && $post_id) {
|
| 824 | 824 | $post_meta_set_query = ''; |
| 825 | 825 | |
| 826 | 826 | foreach ($postmeta as $mkey) {
|
| 827 | 827 | if ($mval != '') |
| 828 | - $post_meta_set_query .= $mkey . " = '', "; |
|
| 828 | + $post_meta_set_query .= $mkey." = '', "; |
|
| 829 | 829 | } |
| 830 | 830 | |
| 831 | 831 | $post_meta_set_query = trim($post_meta_set_query, ", "); |
@@ -834,11 +834,11 @@ discard block |
||
| 834 | 834 | return false; |
| 835 | 835 | } |
| 836 | 836 | |
| 837 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 837 | + if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$postmeta."'") != '') {
|
|
| 838 | 838 | |
| 839 | 839 | $wpdb->query( |
| 840 | 840 | $wpdb->prepare( |
| 841 | - "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d", |
|
| 841 | + "UPDATE ".$table." SET ".$post_meta_set_query." where post_id = %d", |
|
| 842 | 842 | array($post_id) |
| 843 | 843 | ) |
| 844 | 844 | ); |
@@ -847,11 +847,11 @@ discard block |
||
| 847 | 847 | } |
| 848 | 848 | |
| 849 | 849 | } elseif ($postmeta != '' && $post_id) {
|
| 850 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {
|
|
| 850 | + if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$postmeta."'") != '') {
|
|
| 851 | 851 | |
| 852 | 852 | $wpdb->query( |
| 853 | 853 | $wpdb->prepare( |
| 854 | - "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d", |
|
| 854 | + "UPDATE ".$table." SET ".$postmeta."= '' where post_id = %d", |
|
| 855 | 855 | array($post_id) |
| 856 | 856 | ) |
| 857 | 857 | ); |
@@ -893,10 +893,10 @@ discard block |
||
| 893 | 893 | if (!in_array($post_type, $all_postypes)) |
| 894 | 894 | return false; |
| 895 | 895 | |
| 896 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 896 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 897 | 897 | |
| 898 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {
|
|
| 899 | - $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));
|
|
| 898 | + if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$meta_key."'") != '') {
|
|
| 899 | + $meta_value = $wpdb->get_var($wpdb->prepare("SELECT ".$meta_key." from ".$table." where post_id = %d", array($post_id)));
|
|
| 900 | 900 | |
| 901 | 901 | if ($meta_value && $meta_value !== '') {
|
| 902 | 902 | $meta_value = maybe_serialize($meta_value); |
@@ -915,7 +915,7 @@ discard block |
||
| 915 | 915 | * @param string $meta_key The meta key to retrieve. |
| 916 | 916 | * @param bool $single Optional. Whether to return a single value. Default false. |
| 917 | 917 | */ |
| 918 | - return apply_filters( 'geodir_get_post_meta', $meta_value, $post_id, $meta_key, $single ); |
|
| 918 | + return apply_filters('geodir_get_post_meta', $meta_value, $post_id, $meta_key, $single);
|
|
| 919 | 919 | } |
| 920 | 920 | } |
| 921 | 921 | |
@@ -941,13 +941,13 @@ discard block |
||
| 941 | 941 | |
| 942 | 942 | $post_type = get_post_type($post_id); |
| 943 | 943 | |
| 944 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 944 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 945 | 945 | |
| 946 | 946 | $post_images = geodir_get_images($post_id); |
| 947 | 947 | |
| 948 | 948 | $wpdb->query( |
| 949 | 949 | $wpdb->prepare( |
| 950 | - "UPDATE " . $table . " SET featured_image = '' where post_id =%d", |
|
| 950 | + "UPDATE ".$table." SET featured_image = '' where post_id =%d", |
|
| 951 | 951 | array($post_id) |
| 952 | 952 | ) |
| 953 | 953 | ); |
@@ -977,12 +977,12 @@ discard block |
||
| 977 | 977 | $file_path = ''; |
| 978 | 978 | /* --------- start ------- */ |
| 979 | 979 | |
| 980 | - $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));
|
|
| 980 | + $split_img_path = explode(str_replace(array('http://', 'https://'), '', $uploads['baseurl']), str_replace(array('http://', 'https://'), '', $post_image[$m]));
|
|
| 981 | 981 | |
| 982 | 982 | $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
| 983 | 983 | |
| 984 | 984 | |
| 985 | - if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {
|
|
| 985 | + if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM ".GEODIR_ATTACHMENT_TABLE." WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {
|
|
| 986 | 986 | |
| 987 | 987 | /* --------- end ------- */ |
| 988 | 988 | $curr_img_url = $post_image[$m]; |
@@ -1026,7 +1026,7 @@ discard block |
||
| 1026 | 1026 | // If the uploaded file is the right format |
| 1027 | 1027 | if (in_array($uploaded_file_type, $allowed_file_types)) {
|
| 1028 | 1028 | if (!function_exists('wp_handle_upload')) {
|
| 1029 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1029 | + require_once(ABSPATH.'wp-admin/includes/file.php'); |
|
| 1030 | 1030 | } |
| 1031 | 1031 | |
| 1032 | 1032 | if (!is_dir($geodir_uploadpath)) {
|
@@ -1034,41 +1034,41 @@ discard block |
||
| 1034 | 1034 | } |
| 1035 | 1035 | |
| 1036 | 1036 | $external_img = false; |
| 1037 | - if (strpos( str_replace( array('http://','https://'),'',$curr_img_url ), str_replace(array('http://','https://'),'',$uploads['baseurl'] ) ) !== false) {
|
|
| 1037 | + if (strpos(str_replace(array('http://', 'https://'), '', $curr_img_url), str_replace(array('http://', 'https://'), '', $uploads['baseurl'])) !== false) {
|
|
| 1038 | 1038 | } else {
|
| 1039 | 1039 | $external_img = true; |
| 1040 | 1040 | } |
| 1041 | 1041 | |
| 1042 | 1042 | if ($dummy || $external_img) {
|
| 1043 | 1043 | $uploaded_file = array(); |
| 1044 | - $uploaded = (array)fetch_remote_file($curr_img_url); |
|
| 1044 | + $uploaded = (array) fetch_remote_file($curr_img_url); |
|
| 1045 | 1045 | |
| 1046 | 1046 | if (isset($uploaded['error']) && empty($uploaded['error'])) {
|
| 1047 | 1047 | $new_name = basename($uploaded['file']); |
| 1048 | 1048 | $uploaded_file = $uploaded; |
| 1049 | - }else{
|
|
| 1050 | - print_r($uploaded);exit; |
|
| 1049 | + } else {
|
|
| 1050 | + print_r($uploaded); exit; |
|
| 1051 | 1051 | } |
| 1052 | 1052 | $external_img = false; |
| 1053 | 1053 | } else {
|
| 1054 | - $new_name = $post_id . '_' . $file_name; |
|
| 1054 | + $new_name = $post_id.'_'.$file_name; |
|
| 1055 | 1055 | |
| 1056 | 1056 | if ($curr_img_dir == $sub_dir) {
|
| 1057 | - $img_path = $geodir_uploadpath . '/' . $filename; |
|
| 1058 | - $img_url = $geodir_uploadurl . '/' . $filename; |
|
| 1057 | + $img_path = $geodir_uploadpath.'/'.$filename; |
|
| 1058 | + $img_url = $geodir_uploadurl.'/'.$filename; |
|
| 1059 | 1059 | } else {
|
| 1060 | - $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1061 | - $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1060 | + $img_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename; |
|
| 1061 | + $img_url = $uploads['url'].'/temp_'.$current_user->data->ID.'/'.$filename; |
|
| 1062 | 1062 | } |
| 1063 | 1063 | |
| 1064 | 1064 | $uploaded_file = ''; |
| 1065 | 1065 | |
| 1066 | 1066 | if (file_exists($img_path)) {
|
| 1067 | - $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); |
|
| 1067 | + $uploaded_file = copy($img_path, $geodir_uploadpath.'/'.$new_name); |
|
| 1068 | 1068 | $file_path = ''; |
| 1069 | - } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {
|
|
| 1069 | + } else if (file_exists($uploads['basedir'].$curr_img_dir.$filename)) {
|
|
| 1070 | 1070 | $uploaded_file = true; |
| 1071 | - $file_path = $curr_img_dir . '/' . $filename; |
|
| 1071 | + $file_path = $curr_img_dir.'/'.$filename; |
|
| 1072 | 1072 | } |
| 1073 | 1073 | |
| 1074 | 1074 | if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path)) |
@@ -1077,14 +1077,14 @@ discard block |
||
| 1077 | 1077 | |
| 1078 | 1078 | if (!empty($uploaded_file)) {
|
| 1079 | 1079 | if (!isset($file_path) || !$file_path) {
|
| 1080 | - $file_path = $sub_dir . '/' . $new_name; |
|
| 1080 | + $file_path = $sub_dir.'/'.$new_name; |
|
| 1081 | 1081 | } |
| 1082 | 1082 | |
| 1083 | - $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);
|
|
| 1083 | + $postcurr_images[] = str_replace(array('http://', 'https://'), '', $uploads['baseurl'].$file_path);
|
|
| 1084 | 1084 | |
| 1085 | 1085 | if ($menu_order == 1) {
|
| 1086 | 1086 | |
| 1087 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
|
|
| 1087 | + $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($file_path, $post_id)));
|
|
| 1088 | 1088 | |
| 1089 | 1089 | } |
| 1090 | 1090 | |
@@ -1102,12 +1102,12 @@ discard block |
||
| 1102 | 1102 | |
| 1103 | 1103 | foreach ($attachment as $key => $val) {
|
| 1104 | 1104 | if ($val != '') |
| 1105 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 1105 | + $attachment_set .= $key." = '".$val."', "; |
|
| 1106 | 1106 | } |
| 1107 | 1107 | |
| 1108 | 1108 | $attachment_set = trim($attachment_set, ", "); |
| 1109 | 1109 | |
| 1110 | - $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 1110 | + $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
|
|
| 1111 | 1111 | |
| 1112 | 1112 | $valid_file_ids[] = $wpdb->insert_id; |
| 1113 | 1113 | } |
@@ -1118,17 +1118,17 @@ discard block |
||
| 1118 | 1118 | } else {
|
| 1119 | 1119 | $valid_file_ids[] = $find_image; |
| 1120 | 1120 | |
| 1121 | - $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);
|
|
| 1121 | + $postcurr_images[] = str_replace(array('http://', 'https://'), '', $post_image[$m]);
|
|
| 1122 | 1122 | |
| 1123 | 1123 | $wpdb->query( |
| 1124 | 1124 | $wpdb->prepare( |
| 1125 | - "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d", |
|
| 1125 | + "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order = %d where file =%s AND post_id =%d", |
|
| 1126 | 1126 | array($menu_order, $split_img_path[1], $post_id) |
| 1127 | 1127 | ) |
| 1128 | 1128 | ); |
| 1129 | 1129 | |
| 1130 | 1130 | if ($menu_order == 1) |
| 1131 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
|
|
| 1131 | + $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
|
|
| 1132 | 1132 | |
| 1133 | 1133 | } |
| 1134 | 1134 | |
@@ -1152,9 +1152,9 @@ discard block |
||
| 1152 | 1152 | |
| 1153 | 1153 | foreach ($post_images as $img) {
|
| 1154 | 1154 | |
| 1155 | - if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {
|
|
| 1155 | + if (!in_array(str_replace(array('http://', 'https://'), '', $img->src), $postcurr_images)) {
|
|
| 1156 | 1156 | |
| 1157 | - $invalid_files[] = (object)array('src' => $img->src);
|
|
| 1157 | + $invalid_files[] = (object) array('src' => $img->src);
|
|
| 1158 | 1158 | |
| 1159 | 1159 | } |
| 1160 | 1160 | |
@@ -1162,12 +1162,12 @@ discard block |
||
| 1162 | 1162 | |
| 1163 | 1163 | } |
| 1164 | 1164 | |
| 1165 | - $invalid_files = (object)$invalid_files; |
|
| 1165 | + $invalid_files = (object) $invalid_files; |
|
| 1166 | 1166 | } |
| 1167 | 1167 | |
| 1168 | 1168 | $remove_files[] = $post_id; |
| 1169 | 1169 | |
| 1170 | - $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));
|
|
| 1170 | + $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE ".$valid_files_condition." post_id = %d", $remove_files));
|
|
| 1171 | 1171 | |
| 1172 | 1172 | if (!empty($invalid_files)) |
| 1173 | 1173 | geodir_remove_attachments($invalid_files); |
@@ -1207,7 +1207,7 @@ discard block |
||
| 1207 | 1207 | rmdir($dirPath); |
| 1208 | 1208 | } */ |
| 1209 | 1209 | |
| 1210 | - $dirname = $uploads_dir . '/temp_' . $current_user->ID; |
|
| 1210 | + $dirname = $uploads_dir.'/temp_'.$current_user->ID; |
|
| 1211 | 1211 | geodir_delete_directory($dirname); |
| 1212 | 1212 | } |
| 1213 | 1213 | |
@@ -1229,10 +1229,10 @@ discard block |
||
| 1229 | 1229 | return false; |
| 1230 | 1230 | while ($file = readdir($dir_handle)) {
|
| 1231 | 1231 | if ($file != "." && $file != "..") {
|
| 1232 | - if (!is_dir($dirname . "/" . $file)) |
|
| 1233 | - unlink($dirname . "/" . $file); |
|
| 1232 | + if (!is_dir($dirname."/".$file)) |
|
| 1233 | + unlink($dirname."/".$file); |
|
| 1234 | 1234 | else |
| 1235 | - geodir_delete_directory($dirname . '/' . $file); |
|
| 1235 | + geodir_delete_directory($dirname.'/'.$file); |
|
| 1236 | 1236 | } |
| 1237 | 1237 | } |
| 1238 | 1238 | closedir($dir_handle); |
@@ -1261,8 +1261,8 @@ discard block |
||
| 1261 | 1261 | foreach ($postcurr_images as $postimg) {
|
| 1262 | 1262 | $image_name_arr = explode('/', $postimg->src);
|
| 1263 | 1263 | $filename = end($image_name_arr); |
| 1264 | - if (file_exists($uploads_dir . '/' . $filename)) |
|
| 1265 | - unlink($uploads_dir . '/' . $filename); |
|
| 1264 | + if (file_exists($uploads_dir.'/'.$filename)) |
|
| 1265 | + unlink($uploads_dir.'/'.$filename); |
|
| 1266 | 1266 | } |
| 1267 | 1267 | |
| 1268 | 1268 | } // endif |
@@ -1303,28 +1303,28 @@ discard block |
||
| 1303 | 1303 | } |
| 1304 | 1304 | |
| 1305 | 1305 | if (!in_array($post_type, geodir_get_posttypes())) {
|
| 1306 | - return false;// if not a GD CPT return; |
|
| 1306 | + return false; // if not a GD CPT return; |
|
| 1307 | 1307 | } |
| 1308 | 1308 | |
| 1309 | 1309 | |
| 1310 | - $list_img_size = get_option('geodir_listing_img_size','default');
|
|
| 1310 | + $list_img_size = get_option('geodir_listing_img_size', 'default');
|
|
| 1311 | 1311 | |
| 1312 | - if( $size=='list-thumb' && $list_img_size != 'default' ){
|
|
| 1313 | - $fimg = get_the_post_thumbnail_url($post_id,$list_img_size); |
|
| 1314 | - if($fimg){
|
|
| 1312 | + if ($size == 'list-thumb' && $list_img_size != 'default') {
|
|
| 1313 | + $fimg = get_the_post_thumbnail_url($post_id, $list_img_size); |
|
| 1314 | + if ($fimg) {
|
|
| 1315 | 1315 | $uploads = wp_upload_dir(); |
| 1316 | 1316 | $uploads_baseurl = $uploads['baseurl']; |
| 1317 | - $file = str_replace($uploads_baseurl,'',$fimg); |
|
| 1317 | + $file = str_replace($uploads_baseurl, '', $fimg); |
|
| 1318 | 1318 | } |
| 1319 | 1319 | } |
| 1320 | 1320 | |
| 1321 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1321 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 1322 | 1322 | |
| 1323 | 1323 | if (!$file) {
|
| 1324 | 1324 | if (isset($post->featured_image)) {
|
| 1325 | 1325 | $file = $post->featured_image; |
| 1326 | 1326 | } else {
|
| 1327 | - $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));
|
|
| 1327 | + $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM ".$table." WHERE post_id = %d", array($post_id)));
|
|
| 1328 | 1328 | } |
| 1329 | 1329 | } |
| 1330 | 1330 | |
@@ -1343,7 +1343,7 @@ discard block |
||
| 1343 | 1343 | |
| 1344 | 1344 | $file_name = $file_info['basename']; |
| 1345 | 1345 | |
| 1346 | - $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1346 | + $uploads_url = $uploads_baseurl.$sub_dir; |
|
| 1347 | 1347 | /* |
| 1348 | 1348 | * Allows the filter of image src for such things as CDN change. |
| 1349 | 1349 | * |
@@ -1353,8 +1353,8 @@ discard block |
||
| 1353 | 1353 | * @param string $uploads_url The server upload directory url. |
| 1354 | 1354 | * @param string $uploads_baseurl The uploads dir base url. |
| 1355 | 1355 | */ |
| 1356 | - $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1357 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1356 | + $img_arr['src'] = apply_filters('geodir_get_featured_image_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);
|
|
| 1357 | + $img_arr['path'] = $uploads_path.'/'.$file_name; |
|
| 1358 | 1358 | $width = 0; |
| 1359 | 1359 | $height = 0; |
| 1360 | 1360 | if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
@@ -1397,7 +1397,7 @@ discard block |
||
| 1397 | 1397 | $file_name = $file_info['basename']; |
| 1398 | 1398 | |
| 1399 | 1399 | $img_arr['src'] = $default_img; |
| 1400 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1400 | + $img_arr['path'] = $uploads_path.'/'.$file_name; |
|
| 1401 | 1401 | |
| 1402 | 1402 | $width = 0; |
| 1403 | 1403 | $height = 0; |
@@ -1414,7 +1414,7 @@ discard block |
||
| 1414 | 1414 | } |
| 1415 | 1415 | |
| 1416 | 1416 | if (!empty($img_arr)) |
| 1417 | - return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path ); |
|
| 1417 | + return (object) $img_arr; //return (object)array( 'src' => $file_url, 'path' => $file_path ); |
|
| 1418 | 1418 | else |
| 1419 | 1419 | return false; |
| 1420 | 1420 | } |
@@ -1477,7 +1477,7 @@ discard block |
||
| 1477 | 1477 | |
| 1478 | 1478 | $arrImages = $wpdb->get_results( |
| 1479 | 1479 | $wpdb->prepare( |
| 1480 | - "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ", |
|
| 1480 | + "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d".$not_featured." ORDER BY menu_order ASC, ID DESC $limit_q ", |
|
| 1481 | 1481 | array('%image%', $post_id)
|
| 1482 | 1482 | ) |
| 1483 | 1483 | ); |
@@ -1503,7 +1503,7 @@ discard block |
||
| 1503 | 1503 | |
| 1504 | 1504 | $file_name = $file_info['basename']; |
| 1505 | 1505 | |
| 1506 | - $uploads_url = $uploads_baseurl . $sub_dir; |
|
| 1506 | + $uploads_url = $uploads_baseurl.$sub_dir; |
|
| 1507 | 1507 | /* |
| 1508 | 1508 | * Allows the filter of image src for such things as CDN change. |
| 1509 | 1509 | * |
@@ -1513,8 +1513,8 @@ discard block |
||
| 1513 | 1513 | * @param string $uploads_url The server upload directory url. |
| 1514 | 1514 | * @param string $uploads_baseurl The uploads dir base url. |
| 1515 | 1515 | */ |
| 1516 | - $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);
|
|
| 1517 | - $img_arr['path'] = $uploads_path . '/' . $file_name; |
|
| 1516 | + $img_arr['src'] = apply_filters('geodir_get_images_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);
|
|
| 1517 | + $img_arr['path'] = $uploads_path.'/'.$file_name; |
|
| 1518 | 1518 | $width = 0; |
| 1519 | 1519 | $height = 0; |
| 1520 | 1520 | if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {
|
@@ -1531,7 +1531,7 @@ discard block |
||
| 1531 | 1531 | $img_arr['content'] = $attechment->content; // add the description to the array |
| 1532 | 1532 | $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1. |
| 1533 | 1533 | |
| 1534 | - $return_arr[] = (object)$img_arr; |
|
| 1534 | + $return_arr[] = (object) $img_arr; |
|
| 1535 | 1535 | |
| 1536 | 1536 | $counter++; |
| 1537 | 1537 | } |
@@ -1542,7 +1542,7 @@ discard block |
||
| 1542 | 1542 | * @since 1.6.20 |
| 1543 | 1543 | * @param array $return_arr The array of image objects. |
| 1544 | 1544 | */ |
| 1545 | - return apply_filters('geodir_get_images_arr',$return_arr);
|
|
| 1545 | + return apply_filters('geodir_get_images_arr', $return_arr);
|
|
| 1546 | 1546 | } else if ($no_images) {
|
| 1547 | 1547 | $default_img = ''; |
| 1548 | 1548 | $default_cat = geodir_get_post_meta($post_id, 'default_category', true); |
@@ -1581,7 +1581,7 @@ discard block |
||
| 1581 | 1581 | $img_arr['title'] = $file_info['filename']; // add the title to the array |
| 1582 | 1582 | $img_arr['content'] = $file_info['filename']; // add the description to the array |
| 1583 | 1583 | |
| 1584 | - $return_arr[] = (object)$img_arr; |
|
| 1584 | + $return_arr[] = (object) $img_arr; |
|
| 1585 | 1585 | |
| 1586 | 1586 | /** |
| 1587 | 1587 | * Filter the images array so things can be changed. |
@@ -1589,7 +1589,7 @@ discard block |
||
| 1589 | 1589 | * @since 1.6.20 |
| 1590 | 1590 | * @param array $return_arr The array of image objects. |
| 1591 | 1591 | */ |
| 1592 | - return apply_filters('geodir_get_images_arr',$return_arr);
|
|
| 1592 | + return apply_filters('geodir_get_images_arr', $return_arr);
|
|
| 1593 | 1593 | } else |
| 1594 | 1594 | return false; |
| 1595 | 1595 | } |
@@ -1614,8 +1614,8 @@ discard block |
||
| 1614 | 1614 | |
| 1615 | 1615 | $html = ''; |
| 1616 | 1616 | if (!empty($request)) {
|
| 1617 | - if (!is_object($request)){
|
|
| 1618 | - $request = (object)$request; |
|
| 1617 | + if (!is_object($request)) {
|
|
| 1618 | + $request = (object) $request; |
|
| 1619 | 1619 | } |
| 1620 | 1620 | |
| 1621 | 1621 | if (isset($request->src) && !isset($request->path)) {
|
@@ -1629,7 +1629,7 @@ discard block |
||
| 1629 | 1629 | $img_no_http = str_replace(array("http://", "https://"), "", $request->path);
|
| 1630 | 1630 | $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);
|
| 1631 | 1631 | if (strpos($img_no_http, $upload_no_http) !== false) {
|
| 1632 | - $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path); |
|
| 1632 | + $request->path = str_replace($img_no_http, $upload_dir['basedir'], $request->path); |
|
| 1633 | 1633 | } |
| 1634 | 1634 | |
| 1635 | 1635 | $width = 0; |
@@ -1646,7 +1646,7 @@ discard block |
||
| 1646 | 1646 | $image->height = $height; |
| 1647 | 1647 | $image->title = isset($request->title) ? $request->title : ''; |
| 1648 | 1648 | |
| 1649 | - $max_size = (object)geodir_get_imagesize($size); |
|
| 1649 | + $max_size = (object) geodir_get_imagesize($size); |
|
| 1650 | 1650 | |
| 1651 | 1651 | if (!is_wp_error($max_size)) {
|
| 1652 | 1652 | if ($image->width) {
|
@@ -1658,13 +1658,13 @@ discard block |
||
| 1658 | 1658 | $width_per = 100; |
| 1659 | 1659 | } |
| 1660 | 1660 | |
| 1661 | - if (is_admin() && !isset($_REQUEST['geodir_ajax'])){
|
|
| 1662 | - $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '" /></div>'; |
|
| 1661 | + if (is_admin() && !isset($_REQUEST['geodir_ajax'])) {
|
|
| 1662 | + $html = '<div class="geodir_thumbnail"><img style="max-height:'.$max_size->h.'px;" alt="place image" src="'.$image->src.'" /></div>'; |
|
| 1663 | 1663 | } else {
|
| 1664 | - if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){
|
|
| 1665 | - $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');" title="'.$image->title.'" aria-label="'.$image->title.'" ></div>'; |
|
| 1666 | - }else{
|
|
| 1667 | - $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" title="'.$image->title.'" aria-label="'.$image->title.'"></div>';
|
|
| 1664 | + if ($size == 'widget-thumb' || !get_option('geodir_lazy_load', 1)) {
|
|
| 1665 | + $html = '<div class="geodir_thumbnail" style="background-image:url(\''.$image->src.'\');" title="'.$image->title.'" aria-label="'.$image->title.'" ></div>'; |
|
| 1666 | + } else {
|
|
| 1667 | + $html = '<div data-src="'.str_replace(' ', '%20', $image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" title="'.$image->title.'" aria-label="'.$image->title.'"></div>';
|
|
| 1668 | 1668 | } |
| 1669 | 1669 | |
| 1670 | 1670 | } |
@@ -1699,15 +1699,15 @@ discard block |
||
| 1699 | 1699 | |
| 1700 | 1700 | $post_type = get_post_type($post_id); |
| 1701 | 1701 | |
| 1702 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1702 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 1703 | 1703 | |
| 1704 | 1704 | if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {
|
| 1705 | 1705 | |
| 1706 | - if ($taxonomy == $post_type . '_tags') {
|
|
| 1706 | + if ($taxonomy == $post_type.'_tags') {
|
|
| 1707 | 1707 | if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
| 1708 | 1708 | geodir_save_post_meta($post_id, 'post_tags', $terms); |
| 1709 | 1709 | } |
| 1710 | - } elseif ($taxonomy == $post_type . 'category') {
|
|
| 1710 | + } elseif ($taxonomy == $post_type.'category') {
|
|
| 1711 | 1711 | $srcharr = array('"', '\\');
|
| 1712 | 1712 | $replarr = array(""", '');
|
| 1713 | 1713 | |
@@ -1729,7 +1729,7 @@ discard block |
||
| 1729 | 1729 | |
| 1730 | 1730 | $wpdb->get_var( |
| 1731 | 1731 | $wpdb->prepare( |
| 1732 | - "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ", |
|
| 1732 | + "DELETE from ".GEODIR_ICON_TABLE." WHERE cat_id NOT IN ($format) AND post_id = %d ", |
|
| 1733 | 1733 | $cat_ids_array_del |
| 1734 | 1734 | ) |
| 1735 | 1735 | ); |
@@ -1737,7 +1737,7 @@ discard block |
||
| 1737 | 1737 | |
| 1738 | 1738 | $post_term = $wpdb->get_col( |
| 1739 | 1739 | $wpdb->prepare( |
| 1740 | - "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id", |
|
| 1740 | + "SELECT term_id FROM ".$wpdb->term_taxonomy." WHERE term_taxonomy_id IN($format) GROUP BY term_id", |
|
| 1741 | 1741 | $cat_ids_array |
| 1742 | 1742 | ) |
| 1743 | 1743 | ); |
@@ -1759,16 +1759,16 @@ discard block |
||
| 1759 | 1759 | $lat = geodir_get_post_meta($post_id, 'post_latitude', true); |
| 1760 | 1760 | $lng = geodir_get_post_meta($post_id, 'post_longitude', true); |
| 1761 | 1761 | |
| 1762 | - $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
|
|
| 1763 | - $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true); |
|
| 1762 | + $timing = ' - '.date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));
|
|
| 1763 | + $timing .= ' - '.geodir_get_post_meta($post_id, 'st_time', true); |
|
| 1764 | 1764 | |
| 1765 | 1765 | $json = '{';
|
| 1766 | - $json .= '"id":"' . $post_id . '",'; |
|
| 1767 | - $json .= '"lat_pos": "' . $lat . '",'; |
|
| 1768 | - $json .= '"long_pos": "' . $lng . '",'; |
|
| 1769 | - $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",'; |
|
| 1770 | - $json .= '"icon":"' . $term_icon . '",'; |
|
| 1771 | - $json .= '"group":"catgroup' . $cat_id . '"'; |
|
| 1766 | + $json .= '"id":"'.$post_id.'",'; |
|
| 1767 | + $json .= '"lat_pos": "'.$lat.'",'; |
|
| 1768 | + $json .= '"long_pos": "'.$lng.'",'; |
|
| 1769 | + $json .= '"marker_id":"'.$post_id.'_'.$cat_id.'",'; |
|
| 1770 | + $json .= '"icon":"'.$term_icon.'",'; |
|
| 1771 | + $json .= '"group":"catgroup'.$cat_id.'"'; |
|
| 1772 | 1772 | $json .= '}'; |
| 1773 | 1773 | |
| 1774 | 1774 | |
@@ -1776,9 +1776,9 @@ discard block |
||
| 1776 | 1776 | $post_marker_json = $json; |
| 1777 | 1777 | |
| 1778 | 1778 | |
| 1779 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {
|
|
| 1779 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".GEODIR_ICON_TABLE." WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {
|
|
| 1780 | 1780 | |
| 1781 | - $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET
|
|
| 1781 | + $json_query = $wpdb->prepare("UPDATE ".GEODIR_ICON_TABLE." SET
|
|
| 1782 | 1782 | post_title = %s, |
| 1783 | 1783 | json = %s |
| 1784 | 1784 | WHERE post_id = %d AND cat_id = %d ", |
@@ -1786,7 +1786,7 @@ discard block |
||
| 1786 | 1786 | |
| 1787 | 1787 | } else {
|
| 1788 | 1788 | |
| 1789 | - $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET
|
|
| 1789 | + $json_query = $wpdb->prepare("INSERT INTO ".GEODIR_ICON_TABLE." SET
|
|
| 1790 | 1790 | post_id = %d, |
| 1791 | 1791 | post_title = %s, |
| 1792 | 1792 | cat_id = %d, |
@@ -1804,17 +1804,17 @@ discard block |
||
| 1804 | 1804 | if (!empty($post_term) && is_array($post_term)) {
|
| 1805 | 1805 | $categories = implode(',', $post_term);
|
| 1806 | 1806 | |
| 1807 | - if ($categories != '' && $categories != 0) $categories = ',' . $categories . ','; |
|
| 1807 | + if ($categories != '' && $categories != 0) $categories = ','.$categories.','; |
|
| 1808 | 1808 | |
| 1809 | 1809 | if (empty($post_marker_json)) |
| 1810 | 1810 | $post_marker_json = isset($json) ? $json : ''; |
| 1811 | 1811 | |
| 1812 | - if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {
|
|
| 1812 | + if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {
|
|
| 1813 | 1813 | |
| 1814 | 1814 | $wpdb->query( |
| 1815 | 1815 | $wpdb->prepare( |
| 1816 | - "UPDATE " . $table . " SET |
|
| 1817 | - " . $taxonomy . " = %s, |
|
| 1816 | + "UPDATE ".$table." SET |
|
| 1817 | + " . $taxonomy." = %s, |
|
| 1818 | 1818 | marker_json = %s |
| 1819 | 1819 | where post_id = %d", |
| 1820 | 1820 | array($categories, $post_marker_json, $post_id) |
@@ -1835,7 +1835,7 @@ discard block |
||
| 1835 | 1835 | |
| 1836 | 1836 | $wpdb->query( |
| 1837 | 1837 | $wpdb->prepare( |
| 1838 | - "UPDATE " . $table . " SET |
|
| 1838 | + "UPDATE ".$table." SET |
|
| 1839 | 1839 | default_category = %s |
| 1840 | 1840 | where post_id = %d", |
| 1841 | 1841 | array($categories[0], $post_id) |
@@ -1860,9 +1860,9 @@ discard block |
||
| 1860 | 1860 | |
| 1861 | 1861 | $wpdb->query( |
| 1862 | 1862 | $wpdb->prepare( |
| 1863 | - "INSERT INTO " . $table . " SET |
|
| 1863 | + "INSERT INTO ".$table." SET |
|
| 1864 | 1864 | post_id = %d, |
| 1865 | - " . $taxonomy . " = %s, |
|
| 1865 | + " . $taxonomy." = %s, |
|
| 1866 | 1866 | marker_json = %s ", |
| 1867 | 1867 | |
| 1868 | 1868 | array($post_id, $categories, $post_marker_json) |
@@ -1994,7 +1994,7 @@ discard block |
||
| 1994 | 1994 | } ?>"><img alt="bubble image" style="max-height:50px;" |
| 1995 | 1995 | src="<?php echo $post_images[0]; ?>"/></a></div> |
| 1996 | 1996 | <?php |
| 1997 | - }else{
|
|
| 1997 | + } else {
|
|
| 1998 | 1998 | echo '<div class="geodir-bubble_image"></div>'; |
| 1999 | 1999 | } |
| 2000 | 2000 | } else {
|
@@ -2002,7 +2002,7 @@ discard block |
||
| 2002 | 2002 | ?> |
| 2003 | 2003 | <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div> |
| 2004 | 2004 | <?php |
| 2005 | - }else{
|
|
| 2005 | + } else {
|
|
| 2006 | 2006 | echo '<div class="geodir-bubble_image"></div>'; |
| 2007 | 2007 | } |
| 2008 | 2008 | } |
@@ -2032,7 +2032,7 @@ discard block |
||
| 2032 | 2032 | * @param object $postinfo_obj The posts info as an object. |
| 2033 | 2033 | * @param bool|string $post_preview True if currently in post preview page. Empty string if not. * |
| 2034 | 2034 | */ |
| 2035 | - do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );
|
|
| 2035 | + do_action('geodir_infowindow_meta_after', $postinfo_obj, $post_preview);
|
|
| 2036 | 2036 | ?> |
| 2037 | 2037 | </div> |
| 2038 | 2038 | <?php |
@@ -2042,9 +2042,9 @@ discard block |
||
| 2042 | 2042 | <div class="geodir-bubble-meta-fade"></div> |
| 2043 | 2043 | <div class="geodir-bubble-meta-bottom"> |
| 2044 | 2044 | <?php if ($rating_star != '') { ?>
|
| 2045 | - <span class="geodir-bubble-rating"><?php echo $rating_star;?></span> |
|
| 2045 | + <span class="geodir-bubble-rating"><?php echo $rating_star; ?></span> |
|
| 2046 | 2046 | <?php } ?> |
| 2047 | - <span class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID);?></span> |
|
| 2047 | + <span class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID); ?></span> |
|
| 2048 | 2048 | <span class="geodir-bubble-reviews"> |
| 2049 | 2049 | <a href="<?php echo get_comments_link($ID); ?>" class="geodir-pcomments"><i class="fa fa-comments"></i> <?php echo get_comments_number($ID); ?></a> |
| 2050 | 2050 | </span> |
@@ -2106,11 +2106,11 @@ discard block |
||
| 2106 | 2106 | |
| 2107 | 2107 | $post_type = get_post_type($post_id); |
| 2108 | 2108 | |
| 2109 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2109 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2110 | 2110 | |
| 2111 | 2111 | $wpdb->query( |
| 2112 | 2112 | $wpdb->prepare( |
| 2113 | - "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d", |
|
| 2113 | + "UPDATE ".$table." SET post_status=%s WHERE post_id=%d", |
|
| 2114 | 2114 | array($status, $post_id) |
| 2115 | 2115 | ) |
| 2116 | 2116 | ); |
@@ -2182,18 +2182,18 @@ discard block |
||
| 2182 | 2182 | |
| 2183 | 2183 | $post_type = get_post_type($post_id); |
| 2184 | 2184 | |
| 2185 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2185 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2186 | 2186 | |
| 2187 | 2187 | $wpdb->query( |
| 2188 | 2188 | $wpdb->prepare( |
| 2189 | - "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2189 | + "UPDATE ".$table." SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2190 | 2190 | array($updatingpost, $temppost) |
| 2191 | 2191 | ) |
| 2192 | 2192 | ); |
| 2193 | 2193 | |
| 2194 | 2194 | $wpdb->query( |
| 2195 | 2195 | $wpdb->prepare( |
| 2196 | - "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2196 | + "UPDATE ".GEODIR_ICON_TABLE." SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2197 | 2197 | array($updatingpost, $temppost) |
| 2198 | 2198 | ) |
| 2199 | 2199 | ); |
@@ -2202,7 +2202,7 @@ discard block |
||
| 2202 | 2202 | |
| 2203 | 2203 | $wpdb->query( |
| 2204 | 2204 | $wpdb->prepare( |
| 2205 | - "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2205 | + "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET `post_id` = %d WHERE `post_id` = %d", |
|
| 2206 | 2206 | array($updatingpost, $temppost) |
| 2207 | 2207 | ) |
| 2208 | 2208 | ); |
@@ -2240,12 +2240,12 @@ discard block |
||
| 2240 | 2240 | if (!in_array($post_type, $all_postypes)) |
| 2241 | 2241 | return false; |
| 2242 | 2242 | |
| 2243 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2243 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2244 | 2244 | |
| 2245 | 2245 | /* Delete custom post meta*/ |
| 2246 | 2246 | $wpdb->query( |
| 2247 | 2247 | $wpdb->prepare( |
| 2248 | - "DELETE FROM " . $table . " WHERE `post_id` = %d", |
|
| 2248 | + "DELETE FROM ".$table." WHERE `post_id` = %d", |
|
| 2249 | 2249 | array($deleted_postid) |
| 2250 | 2250 | ) |
| 2251 | 2251 | ); |
@@ -2254,7 +2254,7 @@ discard block |
||
| 2254 | 2254 | |
| 2255 | 2255 | $wpdb->query( |
| 2256 | 2256 | $wpdb->prepare( |
| 2257 | - "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d", |
|
| 2257 | + "DELETE FROM ".GEODIR_ICON_TABLE." WHERE `post_id` = %d", |
|
| 2258 | 2258 | array($deleted_postid) |
| 2259 | 2259 | ) |
| 2260 | 2260 | ); |
@@ -2264,7 +2264,7 @@ discard block |
||
| 2264 | 2264 | |
| 2265 | 2265 | $wpdb->query( |
| 2266 | 2266 | $wpdb->prepare( |
| 2267 | - "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d", |
|
| 2267 | + "DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE `post_id` = %d", |
|
| 2268 | 2268 | array($deleted_postid) |
| 2269 | 2269 | ) |
| 2270 | 2270 | ); |
@@ -2336,7 +2336,7 @@ discard block |
||
| 2336 | 2336 | */ |
| 2337 | 2337 | do_action('geodir_before_add_from_favorite', $post_id);
|
| 2338 | 2338 | |
| 2339 | - echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>'; |
|
| 2339 | + echo '<a href="javascript:void(0);" title="'.$remove_favourite_text.'" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\''.$post_id.'\',\'remove\');"><i class="'.$favourite_icon.'"></i> '.$unfavourite_text.'</a>'; |
|
| 2340 | 2340 | |
| 2341 | 2341 | /** |
| 2342 | 2342 | * Called after adding the post from favourites. |
@@ -2415,7 +2415,7 @@ discard block |
||
| 2415 | 2415 | */ |
| 2416 | 2416 | do_action('geodir_before_remove_from_favorite', $post_id);
|
| 2417 | 2417 | |
| 2418 | - echo '<a href="javascript:void(0);" title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>'; |
|
| 2418 | + echo '<a href="javascript:void(0);" title="'.$add_favourite_text.'" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\''.$post_id.'\',\'add\');"><i class="'.$favourite_icon.'"></i> '.$favourite_text.'</a>'; |
|
| 2419 | 2419 | |
| 2420 | 2420 | /** |
| 2421 | 2421 | * Called after removing the post from favourites. |
@@ -2510,24 +2510,24 @@ discard block |
||
| 2510 | 2510 | $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true); |
| 2511 | 2511 | |
| 2512 | 2512 | if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {
|
| 2513 | - ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>" ><a |
|
| 2513 | + ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>" ><a |
|
| 2514 | 2514 | class="geodir-removetofav-icon" href="javascript:void(0);" |
| 2515 | - onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');" |
|
| 2516 | - title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?> |
|
| 2515 | + onclick="javascript:addToFavourite(<?php echo $post_id; ?>,'remove');" |
|
| 2516 | + title="<?php echo $remove_favourite_text; ?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text; ?> |
|
| 2517 | 2517 | </a> </span><?php |
| 2518 | 2518 | |
| 2519 | 2519 | } else {
|
| 2520 | 2520 | |
| 2521 | 2521 | if (!isset($current_user->data->ID) || $current_user->data->ID == '') {
|
| 2522 | - $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\''; |
|
| 2522 | + $script_text = 'javascript:window.location.href=\''.geodir_login_url().'\''; |
|
| 2523 | 2523 | } else |
| 2524 | - $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
|
|
| 2524 | + $script_text = 'javascript:addToFavourite('.$post_id.',\'add\')';
|
|
| 2525 | 2525 | |
| 2526 | - ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon" |
|
| 2526 | + ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"><a class="geodir-addtofav-icon" |
|
| 2527 | 2527 | href="javascript:void(0);" |
| 2528 | - onclick="<?php echo $script_text;?>" |
|
| 2529 | - title="<?php echo $add_favourite_text;?>"><i |
|
| 2530 | - class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span> |
|
| 2528 | + onclick="<?php echo $script_text; ?>" |
|
| 2529 | + title="<?php echo $add_favourite_text; ?>"><i |
|
| 2530 | + class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text; ?></a></span> |
|
| 2531 | 2531 | <?php } |
| 2532 | 2532 | } |
| 2533 | 2533 | } |
@@ -2557,7 +2557,7 @@ discard block |
||
| 2557 | 2557 | |
| 2558 | 2558 | $post_type = $taxonomy_obj->object_type[0]; |
| 2559 | 2559 | |
| 2560 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2560 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2561 | 2561 | |
| 2562 | 2562 | /** |
| 2563 | 2563 | * Filter to modify the 'join' query |
@@ -2580,8 +2580,8 @@ discard block |
||
| 2580 | 2580 | $where = apply_filters('geodir_cat_post_count_where', $where, $term);
|
| 2581 | 2581 | |
| 2582 | 2582 | $count_query = "SELECT count(post_id) FROM |
| 2583 | - " . $table . " as pd " . $join . " |
|
| 2584 | - WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;
|
|
| 2583 | + " . $table." as pd ".$join." |
|
| 2584 | + WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id."',".$term->taxonomy.") ".$where;
|
|
| 2585 | 2585 | |
| 2586 | 2586 | $cat_post_count = $wpdb->get_var($count_query); |
| 2587 | 2587 | if (empty($cat_post_count) || is_wp_error($cat_post_count)) |
@@ -2664,13 +2664,13 @@ discard block |
||
| 2664 | 2664 | global $post; |
| 2665 | 2665 | $all_postypes = geodir_get_posttypes(); |
| 2666 | 2666 | if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {
|
| 2667 | - $out = ' <a class="excerpt-read-more" href="' . get_permalink($post->ID) . '" title="' . get_the_title($post->ID) . '">'; |
|
| 2667 | + $out = ' <a class="excerpt-read-more" href="'.get_permalink($post->ID).'" title="'.get_the_title($post->ID).'">'; |
|
| 2668 | 2668 | /** |
| 2669 | 2669 | * Filter excerpt read more text. |
| 2670 | 2670 | * |
| 2671 | 2671 | * @since 1.0.0 |
| 2672 | 2672 | */ |
| 2673 | - $out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) ); |
|
| 2673 | + $out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));
|
|
| 2674 | 2674 | $out .= '</a>'; |
| 2675 | 2675 | return $out; |
| 2676 | 2676 | } |
@@ -2699,14 +2699,14 @@ discard block |
||
| 2699 | 2699 | if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {
|
| 2700 | 2700 | |
| 2701 | 2701 | $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy); |
| 2702 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 2702 | + $table = $plugin_prefix.$geodir_post_type.'_detail'; |
|
| 2703 | 2703 | |
| 2704 | 2704 | $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']); |
| 2705 | - $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png'; |
|
| 2705 | + $term_icon = $path_parts['dirname'].'/cat_icon_'.$term_id.'.png'; |
|
| 2706 | 2706 | |
| 2707 | 2707 | $posts = $wpdb->get_results( |
| 2708 | 2708 | $wpdb->prepare( |
| 2709 | - "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ", |
|
| 2709 | + "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM ".$table." WHERE FIND_IN_SET(%s,%1\$s ) ", |
|
| 2710 | 2710 | array($term_id, $taxonomy) |
| 2711 | 2711 | ) |
| 2712 | 2712 | ); |
@@ -2718,19 +2718,19 @@ discard block |
||
| 2718 | 2718 | $lng = $post_obj->post_longitude; |
| 2719 | 2719 | |
| 2720 | 2720 | $json = '{';
|
| 2721 | - $json .= '"id":"' . $post_obj->post_id . '",'; |
|
| 2722 | - $json .= '"lat_pos": "' . $lat . '",'; |
|
| 2723 | - $json .= '"long_pos": "' . $lng . '",'; |
|
| 2724 | - $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",'; |
|
| 2725 | - $json .= '"icon":"' . $term_icon . '",'; |
|
| 2726 | - $json .= '"group":"catgroup' . $term_id . '"'; |
|
| 2721 | + $json .= '"id":"'.$post_obj->post_id.'",'; |
|
| 2722 | + $json .= '"lat_pos": "'.$lat.'",'; |
|
| 2723 | + $json .= '"long_pos": "'.$lng.'",'; |
|
| 2724 | + $json .= '"marker_id":"'.$post_obj->post_id.'_'.$term_id.'",'; |
|
| 2725 | + $json .= '"icon":"'.$term_icon.'",'; |
|
| 2726 | + $json .= '"group":"catgroup'.$term_id.'"'; |
|
| 2727 | 2727 | $json .= '}'; |
| 2728 | 2728 | |
| 2729 | 2729 | if ($post_obj->default_category == $term_id) {
|
| 2730 | 2730 | |
| 2731 | 2731 | $wpdb->query( |
| 2732 | 2732 | $wpdb->prepare( |
| 2733 | - "UPDATE " . $table . " SET marker_json = %s where post_id = %d", |
|
| 2733 | + "UPDATE ".$table." SET marker_json = %s where post_id = %d", |
|
| 2734 | 2734 | array($json, $post_obj->post_id) |
| 2735 | 2735 | ) |
| 2736 | 2736 | ); |
@@ -2738,7 +2738,7 @@ discard block |
||
| 2738 | 2738 | |
| 2739 | 2739 | $wpdb->query( |
| 2740 | 2740 | $wpdb->prepare( |
| 2741 | - "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d", |
|
| 2741 | + "UPDATE ".GEODIR_ICON_TABLE." SET json = %s WHERE post_id = %d AND cat_id = %d", |
|
| 2742 | 2742 | array($json, $post_obj->post_id, $term_id) |
| 2743 | 2743 | ) |
| 2744 | 2744 | ); |
@@ -2862,7 +2862,7 @@ discard block |
||
| 2862 | 2862 | // print_r($uploads ) ; |
| 2863 | 2863 | $post_first_image = $wpdb->get_results( |
| 2864 | 2864 | $wpdb->prepare( |
| 2865 | - "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1 ", array($post_id) |
|
| 2865 | + "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = %d and menu_order = 1 ", array($post_id) |
|
| 2866 | 2866 | ) |
| 2867 | 2867 | ); |
| 2868 | 2868 | |
@@ -2883,9 +2883,9 @@ discard block |
||
| 2883 | 2883 | |
| 2884 | 2884 | $post_type = get_post_type($post_id); |
| 2885 | 2885 | |
| 2886 | - $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2886 | + $table_name = $plugin_prefix.$post_type.'_detail'; |
|
| 2887 | 2887 | |
| 2888 | - $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);
|
|
| 2888 | + $wpdb->query("UPDATE ".$table_name." SET featured_image='".$post_first_image[0]->file."' WHERE post_id =".$post_id);
|
|
| 2889 | 2889 | |
| 2890 | 2890 | $new_attachment_name = basename($post_first_image[0]->file); |
| 2891 | 2891 | |
@@ -2898,11 +2898,11 @@ discard block |
||
| 2898 | 2898 | wp_delete_attachment($post_thumbnail_id); |
| 2899 | 2899 | |
| 2900 | 2900 | } |
| 2901 | - $filename = $uploads['basedir'] . $post_first_image[0]->file; |
|
| 2901 | + $filename = $uploads['basedir'].$post_first_image[0]->file; |
|
| 2902 | 2902 | |
| 2903 | 2903 | $attachment = array( |
| 2904 | 2904 | 'post_mime_type' => $post_first_image[0]->mime_type, |
| 2905 | - 'guid' => $uploads['baseurl'] . $post_first_image[0]->file, |
|
| 2905 | + 'guid' => $uploads['baseurl'].$post_first_image[0]->file, |
|
| 2906 | 2906 | 'post_parent' => $post_id, |
| 2907 | 2907 | 'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),
|
| 2908 | 2908 | 'post_content' => '' |
@@ -2915,7 +2915,7 @@ discard block |
||
| 2915 | 2915 | |
| 2916 | 2916 | set_post_thumbnail($post_id, $id); |
| 2917 | 2917 | |
| 2918 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 2918 | + require_once(ABSPATH.'wp-admin/includes/image.php'); |
|
| 2919 | 2919 | wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename)); |
| 2920 | 2920 | |
| 2921 | 2921 | } |
@@ -2948,35 +2948,35 @@ discard block |
||
| 2948 | 2948 | $post_id = absint($_POST['post_id']); |
| 2949 | 2949 | $upload_dir = wp_upload_dir(); |
| 2950 | 2950 | $post_type = get_post_type($_POST['post_id']); |
| 2951 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2951 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2952 | 2952 | |
| 2953 | 2953 | $post_arr = $wpdb->get_results($wpdb->prepare( |
| 2954 | - "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1", |
|
| 2954 | + "SELECT * FROM $wpdb->posts p JOIN ".$table." gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1", |
|
| 2955 | 2955 | array($post_id) |
| 2956 | 2956 | ) |
| 2957 | 2957 | , ARRAY_A); |
| 2958 | 2958 | |
| 2959 | 2959 | $arrImages = $wpdb->get_results( |
| 2960 | 2960 | $wpdb->prepare( |
| 2961 | - "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ", |
|
| 2961 | + "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ", |
|
| 2962 | 2962 | array('%image%', $post_id)
|
| 2963 | 2963 | ) |
| 2964 | 2964 | ); |
| 2965 | 2965 | if ($arrImages) {
|
| 2966 | 2966 | $image_arr = array(); |
| 2967 | 2967 | foreach ($arrImages as $img) {
|
| 2968 | - $image_arr[] = $upload_dir['baseurl'] . $img->file; |
|
| 2968 | + $image_arr[] = $upload_dir['baseurl'].$img->file; |
|
| 2969 | 2969 | } |
| 2970 | 2970 | $comma_separated = implode(",", $image_arr);
|
| 2971 | 2971 | $post_arr[0]['post_images'] = $comma_separated; |
| 2972 | 2972 | } |
| 2973 | 2973 | |
| 2974 | 2974 | |
| 2975 | - $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category']; |
|
| 2975 | + $cats = $post_arr[0][$post_arr[0]['post_type'].'category']; |
|
| 2976 | 2976 | $cat_arr = array_filter(explode(",", $cats));
|
| 2977 | 2977 | $trans_cat = array(); |
| 2978 | 2978 | foreach ($cat_arr as $cat) {
|
| 2979 | - $trans_cat[] = geodir_wpml_object_id($cat, $post_arr[0]['post_type'] . 'category', false); |
|
| 2979 | + $trans_cat[] = geodir_wpml_object_id($cat, $post_arr[0]['post_type'].'category', false); |
|
| 2980 | 2980 | } |
| 2981 | 2981 | |
| 2982 | 2982 | |
@@ -3018,7 +3018,7 @@ discard block |
||
| 3018 | 3018 | |
| 3019 | 3019 | $get_data = $wpdb->get_results( |
| 3020 | 3020 | $wpdb->prepare( |
| 3021 | - "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'", |
|
| 3021 | + "SELECT htmlvar_name, field_type, extra_fields FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1'", |
|
| 3022 | 3022 | array($listing_type) |
| 3023 | 3023 | ) |
| 3024 | 3024 | ); |
@@ -3031,12 +3031,12 @@ discard block |
||
| 3031 | 3031 | |
| 3032 | 3032 | $extra_fields = unserialize($data->extra_fields); |
| 3033 | 3033 | |
| 3034 | - $prefix = $data->htmlvar_name . '_'; |
|
| 3034 | + $prefix = $data->htmlvar_name.'_'; |
|
| 3035 | 3035 | |
| 3036 | - $fields_info[$prefix . 'address'] = $data->field_type; |
|
| 3036 | + $fields_info[$prefix.'address'] = $data->field_type; |
|
| 3037 | 3037 | |
| 3038 | 3038 | if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) |
| 3039 | - $fields_info[$prefix . 'zip'] = $data->field_type; |
|
| 3039 | + $fields_info[$prefix.'zip'] = $data->field_type; |
|
| 3040 | 3040 | |
| 3041 | 3041 | } else {
|
| 3042 | 3042 | |
@@ -3135,18 +3135,18 @@ discard block |
||
| 3135 | 3135 | * @since 1.6.22 Added image from location page. |
| 3136 | 3136 | * @package GeoDirectory |
| 3137 | 3137 | */ |
| 3138 | -function geodir_fb_like_thumbnail(){
|
|
| 3138 | +function geodir_fb_like_thumbnail() {
|
|
| 3139 | 3139 | |
| 3140 | 3140 | $facebook_image = ''; |
| 3141 | 3141 | |
| 3142 | - if(is_single()){// single post
|
|
| 3142 | + if (is_single()) {// single post
|
|
| 3143 | 3143 | global $post; |
| 3144 | - if(isset($post->featured_image) && $post->featured_image){
|
|
| 3144 | + if (isset($post->featured_image) && $post->featured_image) {
|
|
| 3145 | 3145 | $upload_dir = wp_upload_dir(); |
| 3146 | 3146 | $facebook_image = $upload_dir['baseurl'].$post->featured_image; |
| 3147 | 3147 | |
| 3148 | 3148 | } |
| 3149 | - }elseif(geodir_is_page('location')){// location page
|
|
| 3149 | + }elseif (geodir_is_page('location')) {// location page
|
|
| 3150 | 3150 | if (function_exists('geodir_get_location_seo')) {
|
| 3151 | 3151 | $seo = geodir_get_location_seo(); |
| 3152 | 3152 | if (isset($seo->seo_image) && $seo->seo_image) {
|
@@ -3155,11 +3155,11 @@ discard block |
||
| 3155 | 3155 | } |
| 3156 | 3156 | } |
| 3157 | 3157 | |
| 3158 | - if(!$facebook_image){
|
|
| 3158 | + if (!$facebook_image) {
|
|
| 3159 | 3159 | global $post; |
| 3160 | 3160 | |
| 3161 | - if (has_post_thumbnail( $post->ID ) ){
|
|
| 3162 | - $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'full' ); |
|
| 3161 | + if (has_post_thumbnail($post->ID)) {
|
|
| 3162 | + $image = wp_get_attachment_image_src(get_post_thumbnail_id($post->ID), 'full'); |
|
| 3163 | 3163 | $facebook_image = isset($image[0]) ? $image[0] : ''; |
| 3164 | 3164 | } |
| 3165 | 3165 | } |
@@ -3172,9 +3172,9 @@ discard block |
||
| 3172 | 3172 | * @since 1.6.22 |
| 3173 | 3173 | * @param string $facebook_image The image URL or blank. |
| 3174 | 3174 | */ |
| 3175 | - $facebook_image = apply_filters('geodir_fb_share_image',$facebook_image);
|
|
| 3175 | + $facebook_image = apply_filters('geodir_fb_share_image', $facebook_image);
|
|
| 3176 | 3176 | |
| 3177 | - if($facebook_image){
|
|
| 3177 | + if ($facebook_image) {
|
|
| 3178 | 3178 | echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$facebook_image\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n"; |
| 3179 | 3179 | } |
| 3180 | 3180 | |
@@ -10,52 +10,52 @@ discard block |
||
| 10 | 10 | global $wpdb, $table_prefix; |
| 11 | 11 | |
| 12 | 12 | if (!function_exists('geodir_column_exist')) {
|
| 13 | - /** |
|
| 14 | - * Check table column exist or not. |
|
| 15 | - * |
|
| 16 | - * @since 1.0.0 |
|
| 17 | - * @package GeoDirectory |
|
| 18 | - * @global object $wpdb WordPress Database object. |
|
| 19 | - * @param string $db The table name. |
|
| 20 | - * @param string $column The column name. |
|
| 21 | - * @return bool If column exists returns true. Otherwise false. |
|
| 22 | - */ |
|
| 23 | - function geodir_column_exist($db, $column) |
|
| 24 | - {
|
|
| 25 | - global $wpdb; |
|
| 26 | - $exists = false; |
|
| 27 | - $columns = $wpdb->get_col("show columns from $db");
|
|
| 28 | - foreach ($columns as $c) {
|
|
| 29 | - if ($c == $column) {
|
|
| 30 | - $exists = true; |
|
| 31 | - break; |
|
| 32 | - } |
|
| 33 | - } |
|
| 34 | - return $exists; |
|
| 35 | - } |
|
| 13 | + /** |
|
| 14 | + * Check table column exist or not. |
|
| 15 | + * |
|
| 16 | + * @since 1.0.0 |
|
| 17 | + * @package GeoDirectory |
|
| 18 | + * @global object $wpdb WordPress Database object. |
|
| 19 | + * @param string $db The table name. |
|
| 20 | + * @param string $column The column name. |
|
| 21 | + * @return bool If column exists returns true. Otherwise false. |
|
| 22 | + */ |
|
| 23 | + function geodir_column_exist($db, $column) |
|
| 24 | + {
|
|
| 25 | + global $wpdb; |
|
| 26 | + $exists = false; |
|
| 27 | + $columns = $wpdb->get_col("show columns from $db");
|
|
| 28 | + foreach ($columns as $c) {
|
|
| 29 | + if ($c == $column) {
|
|
| 30 | + $exists = true; |
|
| 31 | + break; |
|
| 32 | + } |
|
| 33 | + } |
|
| 34 | + return $exists; |
|
| 35 | + } |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | if (!function_exists('geodir_add_column_if_not_exist')) {
|
| 39 | - /** |
|
| 40 | - * Add column if table column not exist. |
|
| 41 | - * |
|
| 42 | - * @since 1.0.0 |
|
| 43 | - * @package GeoDirectory |
|
| 44 | - * @global object $wpdb WordPress Database object. |
|
| 45 | - * @param string $db The table name. |
|
| 46 | - * @param string $column The column name. |
|
| 47 | - * @param string $column_attr The column attributes. |
|
| 48 | - */ |
|
| 49 | - function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL") |
|
| 50 | - {
|
|
| 51 | - global $wpdb; |
|
| 52 | - $result = 0;// no rows affected |
|
| 53 | - if (!geodir_column_exist($db, $column)) {
|
|
| 54 | - if (!empty($db) && !empty($column)) |
|
| 55 | - $result = $wpdb->query("ALTER TABLE `$db` ADD `$column` $column_attr");
|
|
| 56 | - } |
|
| 57 | - return $result; |
|
| 58 | - } |
|
| 39 | + /** |
|
| 40 | + * Add column if table column not exist. |
|
| 41 | + * |
|
| 42 | + * @since 1.0.0 |
|
| 43 | + * @package GeoDirectory |
|
| 44 | + * @global object $wpdb WordPress Database object. |
|
| 45 | + * @param string $db The table name. |
|
| 46 | + * @param string $column The column name. |
|
| 47 | + * @param string $column_attr The column attributes. |
|
| 48 | + */ |
|
| 49 | + function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL") |
|
| 50 | + {
|
|
| 51 | + global $wpdb; |
|
| 52 | + $result = 0;// no rows affected |
|
| 53 | + if (!geodir_column_exist($db, $column)) {
|
|
| 54 | + if (!empty($db) && !empty($column)) |
|
| 55 | + $result = $wpdb->query("ALTER TABLE `$db` ADD `$column` $column_attr");
|
|
| 56 | + } |
|
| 57 | + return $result; |
|
| 58 | + } |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | /** |
@@ -72,706 +72,706 @@ discard block |
||
| 72 | 72 | */ |
| 73 | 73 | function geodir_post_custom_fields($package_id = '', $default = 'all', $post_type = 'gd_place', $fields_location = 'none') |
| 74 | 74 | {
|
| 75 | - global $wpdb, $geodir_post_custom_fields_cache; |
|
| 76 | - |
|
| 77 | - $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location; |
|
| 78 | - |
|
| 79 | - if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {
|
|
| 80 | - return $geodir_post_custom_fields_cache[$cache_stored]; |
|
| 81 | - } |
|
| 82 | - |
|
| 83 | - $default_query = ''; |
|
| 84 | - |
|
| 85 | - if ($default == 'default') |
|
| 86 | - $default_query .= " and is_admin IN ('1') ";
|
|
| 87 | - elseif ($default == 'custom') |
|
| 88 | - $default_query .= " and is_admin = '0' "; |
|
| 89 | - |
|
| 90 | - if ($fields_location == 'none') {
|
|
| 91 | - } else{
|
|
| 92 | - $fields_location = esc_sql( $fields_location ); |
|
| 93 | - $default_query .= " and show_in LIKE '%%[$fields_location]%%' "; |
|
| 94 | - } |
|
| 95 | - |
|
| 96 | - $post_meta_info = $wpdb->get_results( |
|
| 97 | - $wpdb->prepare( |
|
| 98 | - "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
|
|
| 99 | - array($post_type) |
|
| 100 | - ) |
|
| 101 | - ); |
|
| 102 | - |
|
| 103 | - |
|
| 104 | - $return_arr = array(); |
|
| 105 | - if ($post_meta_info) {
|
|
| 106 | - |
|
| 107 | - foreach ($post_meta_info as $post_meta_info_obj) {
|
|
| 108 | - |
|
| 109 | - $custom_fields = array( |
|
| 110 | - "name" => $post_meta_info_obj->htmlvar_name, |
|
| 111 | - "label" => $post_meta_info_obj->clabels, |
|
| 112 | - "default" => $post_meta_info_obj->default_value, |
|
| 113 | - "type" => $post_meta_info_obj->field_type, |
|
| 114 | - "desc" => $post_meta_info_obj->admin_desc); |
|
| 115 | - |
|
| 116 | - if ($post_meta_info_obj->field_type) {
|
|
| 117 | - $options = explode(',', $post_meta_info_obj->option_values);
|
|
| 118 | - $custom_fields["options"] = $options; |
|
| 119 | - } |
|
| 120 | - |
|
| 121 | - foreach ($post_meta_info_obj as $key => $val) {
|
|
| 122 | - $custom_fields[$key] = $val; |
|
| 123 | - } |
|
| 124 | - |
|
| 125 | - $pricearr = array(); |
|
| 126 | - $pricearr = explode(',', $post_meta_info_obj->packages);
|
|
| 127 | - |
|
| 128 | - if ($package_id != '' && in_array($package_id, $pricearr)) {
|
|
| 129 | - $return_arr[$post_meta_info_obj->sort_order] = $custom_fields; |
|
| 130 | - } elseif ($package_id == '') {
|
|
| 131 | - $return_arr[$post_meta_info_obj->sort_order] = $custom_fields; |
|
| 132 | - } |
|
| 133 | - } |
|
| 134 | - } |
|
| 135 | - $geodir_post_custom_fields_cache[$cache_stored] = $return_arr; |
|
| 136 | - |
|
| 137 | - if (has_filter('geodir_filter_geodir_post_custom_fields')) {
|
|
| 138 | - /** |
|
| 139 | - * Filter the post custom fields array. |
|
| 140 | - * |
|
| 141 | - * @since 1.0.0 |
|
| 142 | - * |
|
| 143 | - * @param array $return_arr Post custom fields array. |
|
| 144 | - * @param int|string $package_id The package ID. |
|
| 145 | - * @param string $post_type Optional. The wordpress post type. |
|
| 146 | - * @param string $fields_location Optional. Where exactly are you going to place this custom fields?. |
|
| 147 | - */ |
|
| 148 | - $return_arr = apply_filters('geodir_filter_geodir_post_custom_fields', $return_arr, $package_id, $post_type, $fields_location);
|
|
| 149 | - } |
|
| 150 | - |
|
| 151 | - return $return_arr; |
|
| 75 | + global $wpdb, $geodir_post_custom_fields_cache; |
|
| 76 | + |
|
| 77 | + $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location; |
|
| 78 | + |
|
| 79 | + if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {
|
|
| 80 | + return $geodir_post_custom_fields_cache[$cache_stored]; |
|
| 81 | + } |
|
| 82 | + |
|
| 83 | + $default_query = ''; |
|
| 84 | + |
|
| 85 | + if ($default == 'default') |
|
| 86 | + $default_query .= " and is_admin IN ('1') ";
|
|
| 87 | + elseif ($default == 'custom') |
|
| 88 | + $default_query .= " and is_admin = '0' "; |
|
| 89 | + |
|
| 90 | + if ($fields_location == 'none') {
|
|
| 91 | + } else{
|
|
| 92 | + $fields_location = esc_sql( $fields_location ); |
|
| 93 | + $default_query .= " and show_in LIKE '%%[$fields_location]%%' "; |
|
| 94 | + } |
|
| 95 | + |
|
| 96 | + $post_meta_info = $wpdb->get_results( |
|
| 97 | + $wpdb->prepare( |
|
| 98 | + "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
|
|
| 99 | + array($post_type) |
|
| 100 | + ) |
|
| 101 | + ); |
|
| 102 | + |
|
| 103 | + |
|
| 104 | + $return_arr = array(); |
|
| 105 | + if ($post_meta_info) {
|
|
| 106 | + |
|
| 107 | + foreach ($post_meta_info as $post_meta_info_obj) {
|
|
| 108 | + |
|
| 109 | + $custom_fields = array( |
|
| 110 | + "name" => $post_meta_info_obj->htmlvar_name, |
|
| 111 | + "label" => $post_meta_info_obj->clabels, |
|
| 112 | + "default" => $post_meta_info_obj->default_value, |
|
| 113 | + "type" => $post_meta_info_obj->field_type, |
|
| 114 | + "desc" => $post_meta_info_obj->admin_desc); |
|
| 115 | + |
|
| 116 | + if ($post_meta_info_obj->field_type) {
|
|
| 117 | + $options = explode(',', $post_meta_info_obj->option_values);
|
|
| 118 | + $custom_fields["options"] = $options; |
|
| 119 | + } |
|
| 120 | + |
|
| 121 | + foreach ($post_meta_info_obj as $key => $val) {
|
|
| 122 | + $custom_fields[$key] = $val; |
|
| 123 | + } |
|
| 124 | + |
|
| 125 | + $pricearr = array(); |
|
| 126 | + $pricearr = explode(',', $post_meta_info_obj->packages);
|
|
| 127 | + |
|
| 128 | + if ($package_id != '' && in_array($package_id, $pricearr)) {
|
|
| 129 | + $return_arr[$post_meta_info_obj->sort_order] = $custom_fields; |
|
| 130 | + } elseif ($package_id == '') {
|
|
| 131 | + $return_arr[$post_meta_info_obj->sort_order] = $custom_fields; |
|
| 132 | + } |
|
| 133 | + } |
|
| 134 | + } |
|
| 135 | + $geodir_post_custom_fields_cache[$cache_stored] = $return_arr; |
|
| 136 | + |
|
| 137 | + if (has_filter('geodir_filter_geodir_post_custom_fields')) {
|
|
| 138 | + /** |
|
| 139 | + * Filter the post custom fields array. |
|
| 140 | + * |
|
| 141 | + * @since 1.0.0 |
|
| 142 | + * |
|
| 143 | + * @param array $return_arr Post custom fields array. |
|
| 144 | + * @param int|string $package_id The package ID. |
|
| 145 | + * @param string $post_type Optional. The wordpress post type. |
|
| 146 | + * @param string $fields_location Optional. Where exactly are you going to place this custom fields?. |
|
| 147 | + */ |
|
| 148 | + $return_arr = apply_filters('geodir_filter_geodir_post_custom_fields', $return_arr, $package_id, $post_type, $fields_location);
|
|
| 149 | + } |
|
| 150 | + |
|
| 151 | + return $return_arr; |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | - /** |
|
| 155 | - * Adds admin html for custom fields. |
|
| 156 | - * |
|
| 157 | - * @since 1.0.0 |
|
| 158 | - * @package GeoDirectory |
|
| 159 | - * @global object $wpdb WordPress Database object. |
|
| 160 | - * @param string $field_type The form field type. |
|
| 161 | - * @param object|int $result_str The custom field results object or row id. |
|
| 162 | - * @param string $field_ins_upd When set to "submit" displays form. |
|
| 163 | - * @param string $field_type_key The key of the custom field. |
|
| 164 | - */ |
|
| 165 | - function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='') |
|
| 166 | - {
|
|
| 167 | - global $wpdb; |
|
| 168 | - $cf = $result_str; |
|
| 169 | - if (!is_object($cf)) {
|
|
| 170 | - |
|
| 171 | - $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));
|
|
| 172 | - |
|
| 173 | - } else {
|
|
| 174 | - $field_info = $cf; |
|
| 175 | - $result_str = $cf->id; |
|
| 176 | - } |
|
| 177 | - /** |
|
| 178 | - * Contains custom field html. |
|
| 179 | - * |
|
| 180 | - * @since 1.0.0 |
|
| 181 | - */ |
|
| 182 | - include('custom_field_html.php');
|
|
| 183 | - |
|
| 184 | - } |
|
| 154 | + /** |
|
| 155 | + * Adds admin html for custom fields. |
|
| 156 | + * |
|
| 157 | + * @since 1.0.0 |
|
| 158 | + * @package GeoDirectory |
|
| 159 | + * @global object $wpdb WordPress Database object. |
|
| 160 | + * @param string $field_type The form field type. |
|
| 161 | + * @param object|int $result_str The custom field results object or row id. |
|
| 162 | + * @param string $field_ins_upd When set to "submit" displays form. |
|
| 163 | + * @param string $field_type_key The key of the custom field. |
|
| 164 | + */ |
|
| 165 | + function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='') |
|
| 166 | + {
|
|
| 167 | + global $wpdb; |
|
| 168 | + $cf = $result_str; |
|
| 169 | + if (!is_object($cf)) {
|
|
| 170 | + |
|
| 171 | + $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));
|
|
| 172 | + |
|
| 173 | + } else {
|
|
| 174 | + $field_info = $cf; |
|
| 175 | + $result_str = $cf->id; |
|
| 176 | + } |
|
| 177 | + /** |
|
| 178 | + * Contains custom field html. |
|
| 179 | + * |
|
| 180 | + * @since 1.0.0 |
|
| 181 | + */ |
|
| 182 | + include('custom_field_html.php');
|
|
| 183 | + |
|
| 184 | + } |
|
| 185 | 185 | |
| 186 | 186 | |
| 187 | 187 | if (!function_exists('geodir_custom_field_delete')) {
|
| 188 | - /** |
|
| 189 | - * Delete custom field using field id. |
|
| 190 | - * |
|
| 191 | - * @since 1.0.0 |
|
| 192 | - * @since 1.5.7 Delete field from sorting fields table when custom field deleted. |
|
| 193 | - * @package GeoDirectory |
|
| 194 | - * @global object $wpdb WordPress Database object. |
|
| 195 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 196 | - * @param string $field_id The custom field ID. |
|
| 197 | - * @return int|string If field deleted successfully, returns field id. Otherwise returns 0. |
|
| 198 | - */ |
|
| 199 | - function geodir_custom_field_delete($field_id = '') {
|
|
| 200 | - global $wpdb, $plugin_prefix; |
|
| 201 | - |
|
| 202 | - if ($field_id != '') {
|
|
| 203 | - $cf = trim($field_id, '_'); |
|
| 204 | - |
|
| 205 | - if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {
|
|
| 206 | - $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));
|
|
| 207 | - |
|
| 208 | - $post_type = $field->post_type; |
|
| 209 | - $htmlvar_name = $field->htmlvar_name; |
|
| 210 | - |
|
| 211 | - if ($post_type != '' && $htmlvar_name != '') {
|
|
| 212 | - $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
|
|
| 213 | - } |
|
| 214 | - |
|
| 215 | - /** |
|
| 216 | - * Called after a custom field is deleted. |
|
| 217 | - * |
|
| 218 | - * @since 1.0.0 |
|
| 219 | - * @param string $cf The fields ID. |
|
| 220 | - * @param string $field->htmlvar_name The html variable name for the field. |
|
| 221 | - * @param string $post_type The post type the field belongs to. |
|
| 222 | - */ |
|
| 223 | - do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);
|
|
| 224 | - |
|
| 225 | - if ($field->field_type == 'address') {
|
|
| 226 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");
|
|
| 227 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");
|
|
| 228 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");
|
|
| 229 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");
|
|
| 230 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");
|
|
| 231 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");
|
|
| 232 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");
|
|
| 233 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");
|
|
| 234 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");
|
|
| 235 | - } else {
|
|
| 236 | - if ($field->field_type != 'fieldset') {
|
|
| 237 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");
|
|
| 238 | - } |
|
| 239 | - } |
|
| 240 | - |
|
| 241 | - return $field_id; |
|
| 242 | - } else |
|
| 243 | - return 0; |
|
| 244 | - } else |
|
| 245 | - return 0; |
|
| 246 | - } |
|
| 188 | + /** |
|
| 189 | + * Delete custom field using field id. |
|
| 190 | + * |
|
| 191 | + * @since 1.0.0 |
|
| 192 | + * @since 1.5.7 Delete field from sorting fields table when custom field deleted. |
|
| 193 | + * @package GeoDirectory |
|
| 194 | + * @global object $wpdb WordPress Database object. |
|
| 195 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 196 | + * @param string $field_id The custom field ID. |
|
| 197 | + * @return int|string If field deleted successfully, returns field id. Otherwise returns 0. |
|
| 198 | + */ |
|
| 199 | + function geodir_custom_field_delete($field_id = '') {
|
|
| 200 | + global $wpdb, $plugin_prefix; |
|
| 201 | + |
|
| 202 | + if ($field_id != '') {
|
|
| 203 | + $cf = trim($field_id, '_'); |
|
| 204 | + |
|
| 205 | + if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {
|
|
| 206 | + $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));
|
|
| 207 | + |
|
| 208 | + $post_type = $field->post_type; |
|
| 209 | + $htmlvar_name = $field->htmlvar_name; |
|
| 210 | + |
|
| 211 | + if ($post_type != '' && $htmlvar_name != '') {
|
|
| 212 | + $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
|
|
| 213 | + } |
|
| 214 | + |
|
| 215 | + /** |
|
| 216 | + * Called after a custom field is deleted. |
|
| 217 | + * |
|
| 218 | + * @since 1.0.0 |
|
| 219 | + * @param string $cf The fields ID. |
|
| 220 | + * @param string $field->htmlvar_name The html variable name for the field. |
|
| 221 | + * @param string $post_type The post type the field belongs to. |
|
| 222 | + */ |
|
| 223 | + do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);
|
|
| 224 | + |
|
| 225 | + if ($field->field_type == 'address') {
|
|
| 226 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");
|
|
| 227 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");
|
|
| 228 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");
|
|
| 229 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");
|
|
| 230 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");
|
|
| 231 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");
|
|
| 232 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");
|
|
| 233 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");
|
|
| 234 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");
|
|
| 235 | + } else {
|
|
| 236 | + if ($field->field_type != 'fieldset') {
|
|
| 237 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");
|
|
| 238 | + } |
|
| 239 | + } |
|
| 240 | + |
|
| 241 | + return $field_id; |
|
| 242 | + } else |
|
| 243 | + return 0; |
|
| 244 | + } else |
|
| 245 | + return 0; |
|
| 246 | + } |
|
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | if (!function_exists('geodir_custom_field_save')) {
|
| 250 | - /** |
|
| 251 | - * Save or Update custom fields into the database. |
|
| 252 | - * |
|
| 253 | - * @since 1.0.0 |
|
| 254 | - * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt. |
|
| 255 | - * @package GeoDirectory |
|
| 256 | - * @global object $wpdb WordPress Database object. |
|
| 257 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 258 | - * @param array $request_field {
|
|
| 259 | - * Attributes of the request field array. |
|
| 260 | - * |
|
| 261 | - * @type string $action Ajax Action name. Default "geodir_ajax_action". |
|
| 262 | - * @type string $manage_field_type Field type Default "custom_fields". |
|
| 263 | - * @type string $create_field Create field Default "true". |
|
| 264 | - * @type string $field_ins_upd Field ins upd Default "submit". |
|
| 265 | - * @type string $_wpnonce WP nonce value. |
|
| 266 | - * @type string $listing_type Listing type Example "gd_place". |
|
| 267 | - * @type string $field_type Field type Example "radio". |
|
| 268 | - * @type string $field_id Field id Example "12". |
|
| 269 | - * @type string $data_type Data type Example "VARCHAR". |
|
| 270 | - * @type string $is_active Either "1" or "0". If "0" is used then the field will not be displayed anywhere. |
|
| 271 | - * @type array $show_on_pkg Package list to display this field. |
|
| 272 | - * @type string $admin_title Personal comment, it would not be displayed anywhere except in custom field settings. |
|
| 273 | - * @type string $site_title Section title which you wish to display in frontend. |
|
| 274 | - * @type string $admin_desc Section description which will appear in frontend. |
|
| 275 | - * @type string $htmlvar_name Html variable name. This should be a unique name. |
|
| 276 | - * @type string $clabels Section Title which will appear in backend. |
|
| 277 | - * @type string $default_value The default value (for "link" this will be used as the link text). |
|
| 278 | - * @type string $sort_order The display order of this field in backend. e.g. 5. |
|
| 279 | - * @type string $is_default Either "1" or "0". If "0" is used then the field will be displayed as main form field or additional field. |
|
| 280 | - * @type string $for_admin_use Either "1" or "0". If "0" is used then only site admin can edit this field. |
|
| 281 | - * @type string $is_required Use "1" to set field as required. |
|
| 282 | - * @type string $required_msg Enter text for error message if field required and have not full fill requirement. |
|
| 283 | - * @type string $show_on_listing Want to show this on listing page?. |
|
| 284 | - * @type string $show_in What locations to show the custom field in. |
|
| 285 | - * @type string $show_on_detail Want to show this in More Info tab on detail page?. |
|
| 286 | - * @type string $show_as_tab Want to display this as a tab on detail page? If "1" then "Show on detail page?" must be Yes. |
|
| 287 | - * @type string $option_values Option Values should be separated by comma. |
|
| 288 | - * @type string $field_icon Upload icon using media and enter its url path, or enter font awesome class. |
|
| 289 | - * @type string $css_class Enter custom css class for field custom style. |
|
| 290 | - * @type array $extra_fields An array of extra fields to store. |
|
| 291 | - * |
|
| 292 | - * } |
|
| 293 | - * @param bool $default Not yet implemented. |
|
| 294 | - * @return int|string If field is unique returns inserted row id. Otherwise returns error string. |
|
| 295 | - */ |
|
| 296 | - function geodir_custom_field_save($request_field = array(), $default = false) |
|
| 297 | - {
|
|
| 298 | - |
|
| 299 | - global $wpdb, $plugin_prefix; |
|
| 300 | - |
|
| 301 | - $old_html_variable = ''; |
|
| 302 | - |
|
| 303 | - $data_type = trim($request_field['data_type']); |
|
| 304 | - |
|
| 305 | - $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : ''; |
|
| 306 | - |
|
| 307 | - // some servers fail if a POST value is VARCHAR so we change it. |
|
| 308 | - if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){
|
|
| 309 | - $request_field['data_type'] = 'VARCHAR'; |
|
| 310 | - } |
|
| 311 | - |
|
| 312 | - $cf = trim($result_str, '_'); |
|
| 313 | - |
|
| 314 | - |
|
| 315 | - /*-------- check duplicate validation --------*/ |
|
| 316 | - |
|
| 317 | - $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; |
|
| 318 | - $post_type = $request_field['listing_type']; |
|
| 319 | - |
|
| 320 | - if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {
|
|
| 321 | - $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name; |
|
| 322 | - } |
|
| 323 | - |
|
| 324 | - $check_html_variable = $wpdb->get_var( |
|
| 325 | - $wpdb->prepare( |
|
| 326 | - "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ", |
|
| 327 | - array($cf, $cehhtmlvar_name, $post_type) |
|
| 328 | - ) |
|
| 329 | - ); |
|
| 330 | - |
|
| 331 | - |
|
| 332 | - if (!$check_html_variable || $request_field['field_type'] == 'fieldset') {
|
|
| 333 | - |
|
| 334 | - if ($cf != '') {
|
|
| 335 | - |
|
| 336 | - $post_meta_info = $wpdb->get_row( |
|
| 337 | - $wpdb->prepare( |
|
| 338 | - "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d", |
|
| 339 | - array($cf) |
|
| 340 | - ) |
|
| 341 | - ); |
|
| 342 | - |
|
| 343 | - } |
|
| 344 | - |
|
| 345 | - if (!empty($post_meta_info)) {
|
|
| 346 | - $post_val = $post_meta_info; |
|
| 347 | - $old_html_variable = $post_val->htmlvar_name; |
|
| 348 | - |
|
| 349 | - } |
|
| 350 | - |
|
| 351 | - |
|
| 352 | - |
|
| 353 | - if ($post_type == '') $post_type = 'gd_place'; |
|
| 354 | - |
|
| 355 | - |
|
| 356 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 357 | - |
|
| 358 | - $admin_title = $request_field['admin_title']; |
|
| 359 | - $site_title = $request_field['site_title']; |
|
| 360 | - $data_type = $request_field['data_type']; |
|
| 361 | - $field_type = $request_field['field_type']; |
|
| 362 | - $field_type_key = isset($request_field['field_type_key']) ? $request_field['field_type_key'] : $field_type; |
|
| 363 | - $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; |
|
| 364 | - $admin_desc = $request_field['admin_desc']; |
|
| 365 | - $clabels = isset($request_field['clabels']) ? $request_field['clabels'] : ''; |
|
| 366 | - $default_value = isset($request_field['default_value']) ? $request_field['default_value'] : ''; |
|
| 367 | - $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : ''; |
|
| 368 | - $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : ''; |
|
| 369 | - $is_required = isset($request_field['is_required']) ? $request_field['is_required'] : ''; |
|
| 370 | - $required_msg = isset($request_field['required_msg']) ? $request_field['required_msg'] : ''; |
|
| 371 | - $css_class = isset($request_field['css_class']) ? $request_field['css_class'] : ''; |
|
| 372 | - $field_icon = isset($request_field['field_icon']) ? $request_field['field_icon'] : ''; |
|
| 373 | - $show_on_listing = isset($request_field['show_on_listing']) ? $request_field['show_on_listing'] : ''; |
|
| 374 | - $show_in = isset($request_field['show_in']) ? $request_field['show_in'] : ''; |
|
| 375 | - $show_on_detail = isset($request_field['show_on_detail']) ? $request_field['show_on_detail'] : ''; |
|
| 376 | - $show_as_tab = isset($request_field['show_as_tab']) ? $request_field['show_as_tab'] : ''; |
|
| 377 | - $decimal_point = isset($request_field['decimal_point']) ? trim($request_field['decimal_point']) : ''; // decimal point for DECIMAL data type |
|
| 378 | - $decimal_point = $decimal_point > 0 ? ($decimal_point > 10 ? 10 : $decimal_point) : ''; |
|
| 379 | - $validation_pattern = isset($request_field['validation_pattern']) ? $request_field['validation_pattern'] : ''; |
|
| 380 | - $validation_msg = isset($request_field['validation_msg']) ? $request_field['validation_msg'] : ''; |
|
| 381 | - $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : ''; |
|
| 250 | + /** |
|
| 251 | + * Save or Update custom fields into the database. |
|
| 252 | + * |
|
| 253 | + * @since 1.0.0 |
|
| 254 | + * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt. |
|
| 255 | + * @package GeoDirectory |
|
| 256 | + * @global object $wpdb WordPress Database object. |
|
| 257 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 258 | + * @param array $request_field {
|
|
| 259 | + * Attributes of the request field array. |
|
| 260 | + * |
|
| 261 | + * @type string $action Ajax Action name. Default "geodir_ajax_action". |
|
| 262 | + * @type string $manage_field_type Field type Default "custom_fields". |
|
| 263 | + * @type string $create_field Create field Default "true". |
|
| 264 | + * @type string $field_ins_upd Field ins upd Default "submit". |
|
| 265 | + * @type string $_wpnonce WP nonce value. |
|
| 266 | + * @type string $listing_type Listing type Example "gd_place". |
|
| 267 | + * @type string $field_type Field type Example "radio". |
|
| 268 | + * @type string $field_id Field id Example "12". |
|
| 269 | + * @type string $data_type Data type Example "VARCHAR". |
|
| 270 | + * @type string $is_active Either "1" or "0". If "0" is used then the field will not be displayed anywhere. |
|
| 271 | + * @type array $show_on_pkg Package list to display this field. |
|
| 272 | + * @type string $admin_title Personal comment, it would not be displayed anywhere except in custom field settings. |
|
| 273 | + * @type string $site_title Section title which you wish to display in frontend. |
|
| 274 | + * @type string $admin_desc Section description which will appear in frontend. |
|
| 275 | + * @type string $htmlvar_name Html variable name. This should be a unique name. |
|
| 276 | + * @type string $clabels Section Title which will appear in backend. |
|
| 277 | + * @type string $default_value The default value (for "link" this will be used as the link text). |
|
| 278 | + * @type string $sort_order The display order of this field in backend. e.g. 5. |
|
| 279 | + * @type string $is_default Either "1" or "0". If "0" is used then the field will be displayed as main form field or additional field. |
|
| 280 | + * @type string $for_admin_use Either "1" or "0". If "0" is used then only site admin can edit this field. |
|
| 281 | + * @type string $is_required Use "1" to set field as required. |
|
| 282 | + * @type string $required_msg Enter text for error message if field required and have not full fill requirement. |
|
| 283 | + * @type string $show_on_listing Want to show this on listing page?. |
|
| 284 | + * @type string $show_in What locations to show the custom field in. |
|
| 285 | + * @type string $show_on_detail Want to show this in More Info tab on detail page?. |
|
| 286 | + * @type string $show_as_tab Want to display this as a tab on detail page? If "1" then "Show on detail page?" must be Yes. |
|
| 287 | + * @type string $option_values Option Values should be separated by comma. |
|
| 288 | + * @type string $field_icon Upload icon using media and enter its url path, or enter font awesome class. |
|
| 289 | + * @type string $css_class Enter custom css class for field custom style. |
|
| 290 | + * @type array $extra_fields An array of extra fields to store. |
|
| 291 | + * |
|
| 292 | + * } |
|
| 293 | + * @param bool $default Not yet implemented. |
|
| 294 | + * @return int|string If field is unique returns inserted row id. Otherwise returns error string. |
|
| 295 | + */ |
|
| 296 | + function geodir_custom_field_save($request_field = array(), $default = false) |
|
| 297 | + {
|
|
| 298 | + |
|
| 299 | + global $wpdb, $plugin_prefix; |
|
| 300 | + |
|
| 301 | + $old_html_variable = ''; |
|
| 302 | + |
|
| 303 | + $data_type = trim($request_field['data_type']); |
|
| 304 | + |
|
| 305 | + $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : ''; |
|
| 306 | + |
|
| 307 | + // some servers fail if a POST value is VARCHAR so we change it. |
|
| 308 | + if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){
|
|
| 309 | + $request_field['data_type'] = 'VARCHAR'; |
|
| 310 | + } |
|
| 311 | + |
|
| 312 | + $cf = trim($result_str, '_'); |
|
| 313 | + |
|
| 314 | + |
|
| 315 | + /*-------- check duplicate validation --------*/ |
|
| 316 | + |
|
| 317 | + $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; |
|
| 318 | + $post_type = $request_field['listing_type']; |
|
| 319 | + |
|
| 320 | + if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {
|
|
| 321 | + $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name; |
|
| 322 | + } |
|
| 323 | + |
|
| 324 | + $check_html_variable = $wpdb->get_var( |
|
| 325 | + $wpdb->prepare( |
|
| 326 | + "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ", |
|
| 327 | + array($cf, $cehhtmlvar_name, $post_type) |
|
| 328 | + ) |
|
| 329 | + ); |
|
| 330 | + |
|
| 331 | + |
|
| 332 | + if (!$check_html_variable || $request_field['field_type'] == 'fieldset') {
|
|
| 333 | + |
|
| 334 | + if ($cf != '') {
|
|
| 335 | + |
|
| 336 | + $post_meta_info = $wpdb->get_row( |
|
| 337 | + $wpdb->prepare( |
|
| 338 | + "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d", |
|
| 339 | + array($cf) |
|
| 340 | + ) |
|
| 341 | + ); |
|
| 342 | + |
|
| 343 | + } |
|
| 344 | + |
|
| 345 | + if (!empty($post_meta_info)) {
|
|
| 346 | + $post_val = $post_meta_info; |
|
| 347 | + $old_html_variable = $post_val->htmlvar_name; |
|
| 348 | + |
|
| 349 | + } |
|
| 350 | + |
|
| 351 | + |
|
| 352 | + |
|
| 353 | + if ($post_type == '') $post_type = 'gd_place'; |
|
| 354 | + |
|
| 355 | + |
|
| 356 | + $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 357 | + |
|
| 358 | + $admin_title = $request_field['admin_title']; |
|
| 359 | + $site_title = $request_field['site_title']; |
|
| 360 | + $data_type = $request_field['data_type']; |
|
| 361 | + $field_type = $request_field['field_type']; |
|
| 362 | + $field_type_key = isset($request_field['field_type_key']) ? $request_field['field_type_key'] : $field_type; |
|
| 363 | + $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; |
|
| 364 | + $admin_desc = $request_field['admin_desc']; |
|
| 365 | + $clabels = isset($request_field['clabels']) ? $request_field['clabels'] : ''; |
|
| 366 | + $default_value = isset($request_field['default_value']) ? $request_field['default_value'] : ''; |
|
| 367 | + $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : ''; |
|
| 368 | + $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : ''; |
|
| 369 | + $is_required = isset($request_field['is_required']) ? $request_field['is_required'] : ''; |
|
| 370 | + $required_msg = isset($request_field['required_msg']) ? $request_field['required_msg'] : ''; |
|
| 371 | + $css_class = isset($request_field['css_class']) ? $request_field['css_class'] : ''; |
|
| 372 | + $field_icon = isset($request_field['field_icon']) ? $request_field['field_icon'] : ''; |
|
| 373 | + $show_on_listing = isset($request_field['show_on_listing']) ? $request_field['show_on_listing'] : ''; |
|
| 374 | + $show_in = isset($request_field['show_in']) ? $request_field['show_in'] : ''; |
|
| 375 | + $show_on_detail = isset($request_field['show_on_detail']) ? $request_field['show_on_detail'] : ''; |
|
| 376 | + $show_as_tab = isset($request_field['show_as_tab']) ? $request_field['show_as_tab'] : ''; |
|
| 377 | + $decimal_point = isset($request_field['decimal_point']) ? trim($request_field['decimal_point']) : ''; // decimal point for DECIMAL data type |
|
| 378 | + $decimal_point = $decimal_point > 0 ? ($decimal_point > 10 ? 10 : $decimal_point) : ''; |
|
| 379 | + $validation_pattern = isset($request_field['validation_pattern']) ? $request_field['validation_pattern'] : ''; |
|
| 380 | + $validation_msg = isset($request_field['validation_msg']) ? $request_field['validation_msg'] : ''; |
|
| 381 | + $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : ''; |
|
| 382 | 382 | |
| 383 | 383 | |
| 384 | - if(is_array($show_in)){
|
|
| 385 | - $show_in = implode(",", $request_field['show_in']);
|
|
| 386 | - } |
|
| 384 | + if(is_array($show_in)){
|
|
| 385 | + $show_in = implode(",", $request_field['show_in']);
|
|
| 386 | + } |
|
| 387 | 387 | |
| 388 | - if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {
|
|
| 389 | - $htmlvar_name = 'geodir_' . $htmlvar_name; |
|
| 390 | - } |
|
| 388 | + if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {
|
|
| 389 | + $htmlvar_name = 'geodir_' . $htmlvar_name; |
|
| 390 | + } |
|
| 391 | 391 | |
| 392 | - $option_values = ''; |
|
| 393 | - if (isset($request_field['option_values'])) |
|
| 394 | - $option_values = $request_field['option_values']; |
|
| 392 | + $option_values = ''; |
|
| 393 | + if (isset($request_field['option_values'])) |
|
| 394 | + $option_values = $request_field['option_values']; |
|
| 395 | 395 | |
| 396 | - $cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0'; |
|
| 396 | + $cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0'; |
|
| 397 | 397 | |
| 398 | - $cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0'; |
|
| 398 | + $cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0'; |
|
| 399 | 399 | |
| 400 | - if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg'])) |
|
| 401 | - $price_pkg = implode(",", $request_field['show_on_pkg']);
|
|
| 402 | - else {
|
|
| 403 | - $package_info = array(); |
|
| 400 | + if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg'])) |
|
| 401 | + $price_pkg = implode(",", $request_field['show_on_pkg']);
|
|
| 402 | + else {
|
|
| 403 | + $package_info = array(); |
|
| 404 | 404 | |
| 405 | - $package_info = geodir_post_package_info($package_info, '', $post_type); |
|
| 406 | - $price_pkg = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 407 | - } |
|
| 405 | + $package_info = geodir_post_package_info($package_info, '', $post_type); |
|
| 406 | + $price_pkg = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 407 | + } |
|
| 408 | 408 | |
| 409 | 409 | |
| 410 | - if (isset($request_field['extra']) && !empty($request_field['extra'])) |
|
| 411 | - $extra_fields = $request_field['extra']; |
|
| 410 | + if (isset($request_field['extra']) && !empty($request_field['extra'])) |
|
| 411 | + $extra_fields = $request_field['extra']; |
|
| 412 | 412 | |
| 413 | - if (isset($request_field['is_default']) && $request_field['is_default'] != '') |
|
| 414 | - $is_default = $request_field['is_default']; |
|
| 415 | - else |
|
| 416 | - $is_default = '0'; |
|
| 413 | + if (isset($request_field['is_default']) && $request_field['is_default'] != '') |
|
| 414 | + $is_default = $request_field['is_default']; |
|
| 415 | + else |
|
| 416 | + $is_default = '0'; |
|
| 417 | 417 | |
| 418 | - if (isset($request_field['is_admin']) && $request_field['is_admin'] != '') |
|
| 419 | - $is_admin = $request_field['is_admin']; |
|
| 420 | - else |
|
| 421 | - $is_admin = '0'; |
|
| 418 | + if (isset($request_field['is_admin']) && $request_field['is_admin'] != '') |
|
| 419 | + $is_admin = $request_field['is_admin']; |
|
| 420 | + else |
|
| 421 | + $is_admin = '0'; |
|
| 422 | 422 | |
| 423 | 423 | |
| 424 | - if ($is_active == '') $is_active = 1; |
|
| 425 | - if ($is_required == '') $is_required = 0; |
|
| 424 | + if ($is_active == '') $is_active = 1; |
|
| 425 | + if ($is_required == '') $is_required = 0; |
|
| 426 | 426 | |
| 427 | 427 | |
| 428 | - if ($sort_order == '') {
|
|
| 428 | + if ($sort_order == '') {
|
|
| 429 | 429 | |
| 430 | - $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);
|
|
| 430 | + $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);
|
|
| 431 | 431 | |
| 432 | - $sort_order = (int)$last_order + 1; |
|
| 433 | - } |
|
| 432 | + $sort_order = (int)$last_order + 1; |
|
| 433 | + } |
|
| 434 | 434 | |
| 435 | - $default_value_add = ''; |
|
| 435 | + $default_value_add = ''; |
|
| 436 | 436 | |
| 437 | 437 | |
| 438 | - if (!empty($post_meta_info)) {
|
|
| 439 | - switch ($field_type): |
|
| 438 | + if (!empty($post_meta_info)) {
|
|
| 439 | + switch ($field_type): |
|
| 440 | 440 | |
| 441 | - case 'address': |
|
| 441 | + case 'address': |
|
| 442 | 442 | |
| 443 | - if ($htmlvar_name != '') {
|
|
| 444 | - $prefix = $htmlvar_name . '_'; |
|
| 445 | - } |
|
| 446 | - $old_prefix = $old_html_variable . '_'; |
|
| 443 | + if ($htmlvar_name != '') {
|
|
| 444 | + $prefix = $htmlvar_name . '_'; |
|
| 445 | + } |
|
| 446 | + $old_prefix = $old_html_variable . '_'; |
|
| 447 | 447 | |
| 448 | 448 | |
| 449 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL"; |
|
| 449 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL"; |
|
| 450 | 450 | |
| 451 | - if ($default_value != '') {
|
|
| 452 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 453 | - } |
|
| 451 | + if ($default_value != '') {
|
|
| 452 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 453 | + } |
|
| 454 | 454 | |
| 455 | - $wpdb->query($meta_field_add); |
|
| 455 | + $wpdb->query($meta_field_add); |
|
| 456 | 456 | |
| 457 | - if ($extra_fields != '') {
|
|
| 457 | + if ($extra_fields != '') {
|
|
| 458 | 458 | |
| 459 | - if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
|
|
| 459 | + if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
|
|
| 460 | 460 | |
| 461 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");
|
|
| 462 | - if ($is_column) {
|
|
| 463 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL"; |
|
| 461 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");
|
|
| 462 | + if ($is_column) {
|
|
| 463 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL"; |
|
| 464 | 464 | |
| 465 | - if ($default_value != '') {
|
|
| 466 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 467 | - } |
|
| 465 | + if ($default_value != '') {
|
|
| 466 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 467 | + } |
|
| 468 | 468 | |
| 469 | - $wpdb->query($meta_field_add); |
|
| 470 | - } else {
|
|
| 469 | + $wpdb->query($meta_field_add); |
|
| 470 | + } else {
|
|
| 471 | 471 | |
| 472 | - $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 473 | - if ($default_value != '') {
|
|
| 474 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 475 | - } |
|
| 476 | - geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add); |
|
| 472 | + $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 473 | + if ($default_value != '') {
|
|
| 474 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 475 | + } |
|
| 476 | + geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add); |
|
| 477 | 477 | |
| 478 | - } |
|
| 478 | + } |
|
| 479 | 479 | |
| 480 | 480 | |
| 481 | - } |
|
| 481 | + } |
|
| 482 | 482 | |
| 483 | 483 | |
| 484 | - if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
|
|
| 484 | + if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
|
|
| 485 | 485 | |
| 486 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");
|
|
| 486 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");
|
|
| 487 | 487 | |
| 488 | - if ($is_column) {
|
|
| 489 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL"; |
|
| 488 | + if ($is_column) {
|
|
| 489 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL"; |
|
| 490 | 490 | |
| 491 | - if ($default_value != '') {
|
|
| 492 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 493 | - } |
|
| 491 | + if ($default_value != '') {
|
|
| 492 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 493 | + } |
|
| 494 | 494 | |
| 495 | - $wpdb->query($meta_field_add); |
|
| 496 | - } else {
|
|
| 497 | - $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 498 | - if ($default_value != '') {
|
|
| 499 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 500 | - } |
|
| 495 | + $wpdb->query($meta_field_add); |
|
| 496 | + } else {
|
|
| 497 | + $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 498 | + if ($default_value != '') {
|
|
| 499 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 500 | + } |
|
| 501 | 501 | |
| 502 | - geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add); |
|
| 503 | - } |
|
| 502 | + geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add); |
|
| 503 | + } |
|
| 504 | 504 | |
| 505 | - } |
|
| 506 | - if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
|
|
| 505 | + } |
|
| 506 | + if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
|
|
| 507 | 507 | |
| 508 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");
|
|
| 508 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");
|
|
| 509 | 509 | |
| 510 | - if ($is_column) {
|
|
| 510 | + if ($is_column) {
|
|
| 511 | 511 | |
| 512 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL"; |
|
| 512 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL"; |
|
| 513 | 513 | |
| 514 | - if ($default_value != '') {
|
|
| 515 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 516 | - } |
|
| 514 | + if ($default_value != '') {
|
|
| 515 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 516 | + } |
|
| 517 | 517 | |
| 518 | - $wpdb->query($meta_field_add); |
|
| 519 | - } else {
|
|
| 518 | + $wpdb->query($meta_field_add); |
|
| 519 | + } else {
|
|
| 520 | 520 | |
| 521 | - $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 522 | - if ($default_value != '') {
|
|
| 523 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 524 | - } |
|
| 521 | + $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 522 | + if ($default_value != '') {
|
|
| 523 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 524 | + } |
|
| 525 | 525 | |
| 526 | - geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add); |
|
| 526 | + geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add); |
|
| 527 | 527 | |
| 528 | - } |
|
| 528 | + } |
|
| 529 | 529 | |
| 530 | - } |
|
| 531 | - if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
|
|
| 530 | + } |
|
| 531 | + if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
|
|
| 532 | 532 | |
| 533 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");
|
|
| 533 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");
|
|
| 534 | 534 | |
| 535 | - if ($is_column) {
|
|
| 535 | + if ($is_column) {
|
|
| 536 | 536 | |
| 537 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL"; |
|
| 537 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL"; |
|
| 538 | 538 | |
| 539 | - if ($default_value != '') {
|
|
| 540 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 541 | - } |
|
| 539 | + if ($default_value != '') {
|
|
| 540 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 541 | + } |
|
| 542 | 542 | |
| 543 | - $wpdb->query($meta_field_add); |
|
| 544 | - } else {
|
|
| 543 | + $wpdb->query($meta_field_add); |
|
| 544 | + } else {
|
|
| 545 | 545 | |
| 546 | - $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 547 | - if ($default_value != '') {
|
|
| 548 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 549 | - } |
|
| 546 | + $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 547 | + if ($default_value != '') {
|
|
| 548 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 549 | + } |
|
| 550 | 550 | |
| 551 | - geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add); |
|
| 551 | + geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add); |
|
| 552 | 552 | |
| 553 | - } |
|
| 553 | + } |
|
| 554 | 554 | |
| 555 | - } |
|
| 556 | - if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
|
|
| 555 | + } |
|
| 556 | + if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
|
|
| 557 | 557 | |
| 558 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");
|
|
| 559 | - if ($is_column) {
|
|
| 558 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");
|
|
| 559 | + if ($is_column) {
|
|
| 560 | 560 | |
| 561 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; |
|
| 561 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; |
|
| 562 | 562 | |
| 563 | - if ($default_value != '') {
|
|
| 564 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 565 | - } |
|
| 563 | + if ($default_value != '') {
|
|
| 564 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 565 | + } |
|
| 566 | 566 | |
| 567 | - $wpdb->query($meta_field_add); |
|
| 568 | - } else {
|
|
| 567 | + $wpdb->query($meta_field_add); |
|
| 568 | + } else {
|
|
| 569 | 569 | |
| 570 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; |
|
| 571 | - $meta_field_add = "VARCHAR( 20 ) NULL"; |
|
| 572 | - if ($default_value != '') {
|
|
| 573 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 574 | - } |
|
| 570 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; |
|
| 571 | + $meta_field_add = "VARCHAR( 20 ) NULL"; |
|
| 572 | + if ($default_value != '') {
|
|
| 573 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 574 | + } |
|
| 575 | 575 | |
| 576 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add); |
|
| 576 | + geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add); |
|
| 577 | 577 | |
| 578 | - } |
|
| 578 | + } |
|
| 579 | 579 | |
| 580 | 580 | |
| 581 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");
|
|
| 581 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");
|
|
| 582 | 582 | |
| 583 | - if ($is_column) {
|
|
| 584 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; |
|
| 583 | + if ($is_column) {
|
|
| 584 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; |
|
| 585 | 585 | |
| 586 | - if ($default_value != '') {
|
|
| 587 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 588 | - } |
|
| 586 | + if ($default_value != '') {
|
|
| 587 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 588 | + } |
|
| 589 | 589 | |
| 590 | - $wpdb->query($meta_field_add); |
|
| 591 | - } else {
|
|
| 590 | + $wpdb->query($meta_field_add); |
|
| 591 | + } else {
|
|
| 592 | 592 | |
| 593 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; |
|
| 594 | - $meta_field_add = "VARCHAR( 20 ) NULL"; |
|
| 595 | - if ($default_value != '') {
|
|
| 596 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 597 | - } |
|
| 593 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; |
|
| 594 | + $meta_field_add = "VARCHAR( 20 ) NULL"; |
|
| 595 | + if ($default_value != '') {
|
|
| 596 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 597 | + } |
|
| 598 | 598 | |
| 599 | - geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add); |
|
| 600 | - } |
|
| 599 | + geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add); |
|
| 600 | + } |
|
| 601 | 601 | |
| 602 | - } |
|
| 603 | - if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
|
|
| 602 | + } |
|
| 603 | + if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
|
|
| 604 | 604 | |
| 605 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");
|
|
| 605 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");
|
|
| 606 | 606 | |
| 607 | - if ($is_column) {
|
|
| 608 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; |
|
| 607 | + if ($is_column) {
|
|
| 608 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; |
|
| 609 | 609 | |
| 610 | - if ($default_value != '') {
|
|
| 611 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 612 | - } |
|
| 610 | + if ($default_value != '') {
|
|
| 611 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 612 | + } |
|
| 613 | 613 | |
| 614 | - $wpdb->query($meta_field_add); |
|
| 615 | - } else {
|
|
| 614 | + $wpdb->query($meta_field_add); |
|
| 615 | + } else {
|
|
| 616 | 616 | |
| 617 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; |
|
| 617 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; |
|
| 618 | 618 | |
| 619 | - $meta_field_add = "VARCHAR( 15 ) NULL"; |
|
| 620 | - if ($default_value != '') {
|
|
| 621 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 622 | - } |
|
| 619 | + $meta_field_add = "VARCHAR( 15 ) NULL"; |
|
| 620 | + if ($default_value != '') {
|
|
| 621 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 622 | + } |
|
| 623 | 623 | |
| 624 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add); |
|
| 625 | - } |
|
| 624 | + geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add); |
|
| 625 | + } |
|
| 626 | 626 | |
| 627 | 627 | |
| 628 | - } |
|
| 629 | - if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
|
|
| 628 | + } |
|
| 629 | + if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
|
|
| 630 | 630 | |
| 631 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");
|
|
| 632 | - if ($is_column) {
|
|
| 633 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; |
|
| 631 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");
|
|
| 632 | + if ($is_column) {
|
|
| 633 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; |
|
| 634 | 634 | |
| 635 | - if ($default_value != '') {
|
|
| 636 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 637 | - } |
|
| 635 | + if ($default_value != '') {
|
|
| 636 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 637 | + } |
|
| 638 | 638 | |
| 639 | - $wpdb->query($meta_field_add); |
|
| 639 | + $wpdb->query($meta_field_add); |
|
| 640 | 640 | |
| 641 | - } else {
|
|
| 641 | + } else {
|
|
| 642 | 642 | |
| 643 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; |
|
| 643 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; |
|
| 644 | 644 | |
| 645 | - $meta_field_add = "VARCHAR( 3 ) NULL"; |
|
| 646 | - if ($default_value != '') {
|
|
| 647 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 648 | - } |
|
| 645 | + $meta_field_add = "VARCHAR( 3 ) NULL"; |
|
| 646 | + if ($default_value != '') {
|
|
| 647 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 648 | + } |
|
| 649 | 649 | |
| 650 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add); |
|
| 651 | - } |
|
| 650 | + geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add); |
|
| 651 | + } |
|
| 652 | 652 | |
| 653 | - } |
|
| 654 | - // show lat lng |
|
| 655 | - if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
|
|
| 656 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");
|
|
| 653 | + } |
|
| 654 | + // show lat lng |
|
| 655 | + if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
|
|
| 656 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");
|
|
| 657 | 657 | |
| 658 | - if ($is_column) {
|
|
| 659 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; |
|
| 660 | - $meta_field_add .= " DEFAULT '1'"; |
|
| 658 | + if ($is_column) {
|
|
| 659 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; |
|
| 660 | + $meta_field_add .= " DEFAULT '1'"; |
|
| 661 | 661 | |
| 662 | - $wpdb->query($meta_field_add); |
|
| 663 | - } else {
|
|
| 664 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; |
|
| 662 | + $wpdb->query($meta_field_add); |
|
| 663 | + } else {
|
|
| 664 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; |
|
| 665 | 665 | |
| 666 | - $meta_field_add = "VARCHAR( 3 ) NULL"; |
|
| 667 | - $meta_field_add .= " DEFAULT '1'"; |
|
| 666 | + $meta_field_add = "VARCHAR( 3 ) NULL"; |
|
| 667 | + $meta_field_add .= " DEFAULT '1'"; |
|
| 668 | 668 | |
| 669 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add); |
|
| 670 | - } |
|
| 669 | + geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add); |
|
| 670 | + } |
|
| 671 | 671 | |
| 672 | - } |
|
| 673 | - }// end extra |
|
| 672 | + } |
|
| 673 | + }// end extra |
|
| 674 | 674 | |
| 675 | - break; |
|
| 675 | + break; |
|
| 676 | 676 | |
| 677 | - case 'checkbox': |
|
| 678 | - case 'multiselect': |
|
| 679 | - case 'select': |
|
| 680 | - case 'taxonomy': |
|
| 677 | + case 'checkbox': |
|
| 678 | + case 'multiselect': |
|
| 679 | + case 'select': |
|
| 680 | + case 'taxonomy': |
|
| 681 | 681 | |
| 682 | - $op_size = '500'; |
|
| 682 | + $op_size = '500'; |
|
| 683 | 683 | |
| 684 | - // only make the field as big as it needs to be. |
|
| 685 | - if(isset($option_values) && $option_values && $field_type=='select'){
|
|
| 686 | - $option_values_arr = explode(',',$option_values);
|
|
| 687 | - if(is_array($option_values_arr)){
|
|
| 688 | - $op_max = 0; |
|
| 689 | - foreach($option_values_arr as $op_val){
|
|
| 690 | - if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}
|
|
| 691 | - } |
|
| 692 | - if($op_max){$op_size =$op_max; }
|
|
| 693 | - } |
|
| 694 | - }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
|
|
| 695 | - if(strlen($option_values)){
|
|
| 696 | - $op_size = strlen($option_values); |
|
| 697 | - } |
|
| 698 | - } |
|
| 684 | + // only make the field as big as it needs to be. |
|
| 685 | + if(isset($option_values) && $option_values && $field_type=='select'){
|
|
| 686 | + $option_values_arr = explode(',',$option_values);
|
|
| 687 | + if(is_array($option_values_arr)){
|
|
| 688 | + $op_max = 0; |
|
| 689 | + foreach($option_values_arr as $op_val){
|
|
| 690 | + if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}
|
|
| 691 | + } |
|
| 692 | + if($op_max){$op_size =$op_max; }
|
|
| 693 | + } |
|
| 694 | + }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
|
|
| 695 | + if(strlen($option_values)){
|
|
| 696 | + $op_size = strlen($option_values); |
|
| 697 | + } |
|
| 698 | + } |
|
| 699 | 699 | |
| 700 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL"; |
|
| 700 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL"; |
|
| 701 | 701 | |
| 702 | - if ($default_value != '') {
|
|
| 703 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 704 | - } |
|
| 702 | + if ($default_value != '') {
|
|
| 703 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 704 | + } |
|
| 705 | 705 | |
| 706 | - $alter_result = $wpdb->query($meta_field_add); |
|
| 707 | - if($alter_result===false){
|
|
| 708 | - return __('Column change failed, you may have too many columns.','geodirectory');
|
|
| 709 | - } |
|
| 706 | + $alter_result = $wpdb->query($meta_field_add); |
|
| 707 | + if($alter_result===false){
|
|
| 708 | + return __('Column change failed, you may have too many columns.','geodirectory');
|
|
| 709 | + } |
|
| 710 | 710 | |
| 711 | - if (isset($request_field['cat_display_type'])) |
|
| 712 | - $extra_fields = $request_field['cat_display_type']; |
|
| 711 | + if (isset($request_field['cat_display_type'])) |
|
| 712 | + $extra_fields = $request_field['cat_display_type']; |
|
| 713 | 713 | |
| 714 | - if (isset($request_field['multi_display_type'])) |
|
| 715 | - $extra_fields = $request_field['multi_display_type']; |
|
| 714 | + if (isset($request_field['multi_display_type'])) |
|
| 715 | + $extra_fields = $request_field['multi_display_type']; |
|
| 716 | 716 | |
| 717 | 717 | |
| 718 | - break; |
|
| 718 | + break; |
|
| 719 | 719 | |
| 720 | - case 'textarea': |
|
| 721 | - case 'html': |
|
| 722 | - case 'url': |
|
| 723 | - case 'file': |
|
| 720 | + case 'textarea': |
|
| 721 | + case 'html': |
|
| 722 | + case 'url': |
|
| 723 | + case 'file': |
|
| 724 | 724 | |
| 725 | - $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");
|
|
| 726 | - if($alter_result===false){
|
|
| 727 | - return __('Column change failed, you may have too many columns.','geodirectory');
|
|
| 728 | - } |
|
| 729 | - if (isset($request_field['advanced_editor'])) |
|
| 730 | - $extra_fields = $request_field['advanced_editor']; |
|
| 731 | - |
|
| 732 | - break; |
|
| 725 | + $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");
|
|
| 726 | + if($alter_result===false){
|
|
| 727 | + return __('Column change failed, you may have too many columns.','geodirectory');
|
|
| 728 | + } |
|
| 729 | + if (isset($request_field['advanced_editor'])) |
|
| 730 | + $extra_fields = $request_field['advanced_editor']; |
|
| 731 | + |
|
| 732 | + break; |
|
| 733 | 733 | |
| 734 | - case 'fieldset': |
|
| 735 | - // Nothing happened for fieldset |
|
| 736 | - break; |
|
| 734 | + case 'fieldset': |
|
| 735 | + // Nothing happened for fieldset |
|
| 736 | + break; |
|
| 737 | 737 | |
| 738 | - default: |
|
| 739 | - if ($data_type != 'VARCHAR' && $data_type != '') {
|
|
| 740 | - if ($data_type == 'FLOAT' && $decimal_point > 0) {
|
|
| 741 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL"; |
|
| 742 | - } else {
|
|
| 743 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL"; |
|
| 744 | - } |
|
| 745 | - |
|
| 746 | - if (is_numeric($default_value) && $default_value != '') {
|
|
| 747 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 748 | - } |
|
| 749 | - } else {
|
|
| 750 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL"; |
|
| 751 | - if ($default_value != '') {
|
|
| 752 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 753 | - } |
|
| 754 | - } |
|
| 755 | - |
|
| 756 | - $alter_result = $wpdb->query($default_value_add); |
|
| 757 | - if($alter_result===false){
|
|
| 758 | - return __('Column change failed, you may have too many columns.','geodirectory');
|
|
| 759 | - } |
|
| 760 | - break; |
|
| 761 | - endswitch; |
|
| 762 | - |
|
| 763 | - $extra_field_query = ''; |
|
| 764 | - if (!empty($extra_fields)) {
|
|
| 765 | - $extra_field_query = serialize($extra_fields); |
|
| 766 | - } |
|
| 767 | - |
|
| 768 | - $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : ''; |
|
| 769 | - |
|
| 770 | - $wpdb->query( |
|
| 771 | - |
|
| 772 | - $wpdb->prepare( |
|
| 773 | - |
|
| 774 | - "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set |
|
| 738 | + default: |
|
| 739 | + if ($data_type != 'VARCHAR' && $data_type != '') {
|
|
| 740 | + if ($data_type == 'FLOAT' && $decimal_point > 0) {
|
|
| 741 | + $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL"; |
|
| 742 | + } else {
|
|
| 743 | + $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL"; |
|
| 744 | + } |
|
| 745 | + |
|
| 746 | + if (is_numeric($default_value) && $default_value != '') {
|
|
| 747 | + $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 748 | + } |
|
| 749 | + } else {
|
|
| 750 | + $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL"; |
|
| 751 | + if ($default_value != '') {
|
|
| 752 | + $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 753 | + } |
|
| 754 | + } |
|
| 755 | + |
|
| 756 | + $alter_result = $wpdb->query($default_value_add); |
|
| 757 | + if($alter_result===false){
|
|
| 758 | + return __('Column change failed, you may have too many columns.','geodirectory');
|
|
| 759 | + } |
|
| 760 | + break; |
|
| 761 | + endswitch; |
|
| 762 | + |
|
| 763 | + $extra_field_query = ''; |
|
| 764 | + if (!empty($extra_fields)) {
|
|
| 765 | + $extra_field_query = serialize($extra_fields); |
|
| 766 | + } |
|
| 767 | + |
|
| 768 | + $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : ''; |
|
| 769 | + |
|
| 770 | + $wpdb->query( |
|
| 771 | + |
|
| 772 | + $wpdb->prepare( |
|
| 773 | + |
|
| 774 | + "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set |
|
| 775 | 775 | post_type = %s, |
| 776 | 776 | admin_title = %s, |
| 777 | 777 | site_title = %s, |
@@ -805,308 +805,308 @@ discard block |
||
| 805 | 805 | for_admin_use = %s |
| 806 | 806 | where id = %d", |
| 807 | 807 | |
| 808 | - array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf) |
|
| 809 | - ) |
|
| 808 | + array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf) |
|
| 809 | + ) |
|
| 810 | 810 | |
| 811 | - ); |
|
| 811 | + ); |
|
| 812 | 812 | |
| 813 | - $lastid = trim($cf); |
|
| 813 | + $lastid = trim($cf); |
|
| 814 | 814 | |
| 815 | 815 | |
| 816 | - $wpdb->query( |
|
| 817 | - $wpdb->prepare( |
|
| 818 | - "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 816 | + $wpdb->query( |
|
| 817 | + $wpdb->prepare( |
|
| 818 | + "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 819 | 819 | site_title=%s |
| 820 | 820 | where post_type = %s and htmlvar_name = %s", |
| 821 | - array($site_title, $post_type, $htmlvar_name) |
|
| 822 | - ) |
|
| 823 | - ); |
|
| 824 | - |
|
| 825 | - |
|
| 826 | - if ($cat_sort == '') |
|
| 827 | - $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
|
|
| 828 | - |
|
| 829 | - |
|
| 830 | - /** |
|
| 831 | - * Called after all custom fields are saved for a post. |
|
| 832 | - * |
|
| 833 | - * @since 1.0.0 |
|
| 834 | - * @param int $lastid The post ID. |
|
| 835 | - */ |
|
| 836 | - do_action('geodir_after_custom_fields_updated', $lastid);
|
|
| 837 | - |
|
| 838 | - } else {
|
|
| 839 | - |
|
| 840 | - switch ($field_type): |
|
| 841 | - |
|
| 842 | - case 'address': |
|
| 843 | - |
|
| 844 | - $data_type = ''; |
|
| 845 | - |
|
| 846 | - if ($htmlvar_name != '') {
|
|
| 847 | - $prefix = $htmlvar_name . '_'; |
|
| 848 | - } |
|
| 849 | - $old_prefix = $old_html_variable; |
|
| 850 | - |
|
| 851 | - //$meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."address` VARCHAR( 254 ) NULL"; |
|
| 852 | - |
|
| 853 | - $meta_field_add = "VARCHAR( 254 ) NULL"; |
|
| 854 | - if ($default_value != '') {
|
|
| 855 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 856 | - } |
|
| 857 | - |
|
| 858 | - geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add); |
|
| 859 | - //$wpdb->query($meta_field_add); |
|
| 860 | - |
|
| 861 | - |
|
| 862 | - if (!empty($extra_fields)) {
|
|
| 821 | + array($site_title, $post_type, $htmlvar_name) |
|
| 822 | + ) |
|
| 823 | + ); |
|
| 824 | + |
|
| 825 | + |
|
| 826 | + if ($cat_sort == '') |
|
| 827 | + $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
|
|
| 828 | + |
|
| 829 | + |
|
| 830 | + /** |
|
| 831 | + * Called after all custom fields are saved for a post. |
|
| 832 | + * |
|
| 833 | + * @since 1.0.0 |
|
| 834 | + * @param int $lastid The post ID. |
|
| 835 | + */ |
|
| 836 | + do_action('geodir_after_custom_fields_updated', $lastid);
|
|
| 837 | + |
|
| 838 | + } else {
|
|
| 839 | + |
|
| 840 | + switch ($field_type): |
|
| 841 | + |
|
| 842 | + case 'address': |
|
| 843 | + |
|
| 844 | + $data_type = ''; |
|
| 845 | + |
|
| 846 | + if ($htmlvar_name != '') {
|
|
| 847 | + $prefix = $htmlvar_name . '_'; |
|
| 848 | + } |
|
| 849 | + $old_prefix = $old_html_variable; |
|
| 850 | + |
|
| 851 | + //$meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."address` VARCHAR( 254 ) NULL"; |
|
| 852 | + |
|
| 853 | + $meta_field_add = "VARCHAR( 254 ) NULL"; |
|
| 854 | + if ($default_value != '') {
|
|
| 855 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 856 | + } |
|
| 857 | + |
|
| 858 | + geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add); |
|
| 859 | + //$wpdb->query($meta_field_add); |
|
| 860 | + |
|
| 861 | + |
|
| 862 | + if (!empty($extra_fields)) {
|
|
| 863 | 863 | |
| 864 | - if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
|
|
| 865 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL"; |
|
| 866 | - $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 867 | - if ($default_value != '') {
|
|
| 868 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 869 | - } |
|
| 870 | - |
|
| 871 | - geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add); |
|
| 872 | - //$wpdb->query($meta_field_add); |
|
| 873 | - } |
|
| 874 | - if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
|
|
| 875 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL"; |
|
| 876 | - $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 877 | - if ($default_value != '') {
|
|
| 878 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 879 | - } |
|
| 880 | - |
|
| 881 | - geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add); |
|
| 882 | - //$wpdb->query($meta_field_add); |
|
| 883 | - } |
|
| 884 | - if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
|
|
| 885 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL"; |
|
| 886 | - |
|
| 887 | - $meta_field_add = "VARCHAR( 30 ) NULL"; |
|
| 888 | - if ($default_value != '') {
|
|
| 889 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 890 | - } |
|
| 891 | - |
|
| 892 | - geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add); |
|
| 893 | - //$wpdb->query($meta_field_add); |
|
| 894 | - } |
|
| 895 | - if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
|
|
| 896 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL"; |
|
| 897 | - $meta_field_add = "VARCHAR( 15 ) NULL"; |
|
| 898 | - if ($default_value != '') {
|
|
| 899 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 900 | - } |
|
| 901 | - |
|
| 902 | - geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add); |
|
| 903 | - //$wpdb->query($meta_field_add); |
|
| 904 | - } |
|
| 905 | - if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
|
|
| 906 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; |
|
| 907 | - $meta_field_add = "VARCHAR( 20 ) NULL"; |
|
| 908 | - if ($default_value != '') {
|
|
| 909 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 910 | - } |
|
| 911 | - |
|
| 912 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add); |
|
| 913 | - //$wpdb->query($meta_field_add); |
|
| 914 | - |
|
| 915 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; |
|
| 916 | - |
|
| 917 | - $meta_field_add = "VARCHAR( 20 ) NULL"; |
|
| 918 | - if ($default_value != '') {
|
|
| 919 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 920 | - } |
|
| 921 | - |
|
| 922 | - geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add); |
|
| 923 | - |
|
| 924 | - //$wpdb->query($meta_field_add); |
|
| 925 | - } |
|
| 926 | - if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
|
|
| 927 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; |
|
| 928 | - |
|
| 929 | - $meta_field_add = "VARCHAR( 15 ) NULL"; |
|
| 930 | - if ($default_value != '') {
|
|
| 931 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 932 | - } |
|
| 933 | - |
|
| 934 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add); |
|
| 935 | - |
|
| 936 | - //$wpdb->query($meta_field_add); |
|
| 937 | - } |
|
| 938 | - if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
|
|
| 939 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; |
|
| 940 | - |
|
| 941 | - $meta_field_add = "VARCHAR( 3 ) NULL"; |
|
| 942 | - if ($default_value != '') {
|
|
| 943 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 944 | - } |
|
| 945 | - |
|
| 946 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add); |
|
| 947 | - |
|
| 948 | - //$wpdb->query($meta_field_add); |
|
| 949 | - } |
|
| 950 | - // show lat lng |
|
| 951 | - if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
|
|
| 952 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; |
|
| 953 | - |
|
| 954 | - $meta_field_add = "VARCHAR( 3 ) NULL"; |
|
| 955 | - $meta_field_add .= " DEFAULT '1'"; |
|
| 956 | - |
|
| 957 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add); |
|
| 958 | - //$wpdb->query($meta_field_add); |
|
| 959 | - } |
|
| 960 | - } |
|
| 961 | - |
|
| 962 | - break; |
|
| 963 | - |
|
| 964 | - case 'checkbox': |
|
| 965 | - $data_type = 'TINYINT'; |
|
| 966 | - |
|
| 967 | - $meta_field_add = $data_type . "( 1 ) NOT NULL "; |
|
| 968 | - if ((int)$default_value === 1) {
|
|
| 969 | - $meta_field_add .= " DEFAULT '1'"; |
|
| 970 | - } |
|
| 971 | - |
|
| 972 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 973 | - if ($add_result === false) {
|
|
| 974 | - return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
|
|
| 975 | - } |
|
| 976 | - break; |
|
| 977 | - case 'multiselect': |
|
| 978 | - case 'select': |
|
| 979 | - $data_type = 'VARCHAR'; |
|
| 980 | - $op_size = '500'; |
|
| 981 | - |
|
| 982 | - // only make the field as big as it needs to be. |
|
| 983 | - if (isset($option_values) && $option_values && $field_type == 'select') {
|
|
| 984 | - $option_values_arr = explode(',', $option_values);
|
|
| 985 | - |
|
| 986 | - if (is_array($option_values_arr)) {
|
|
| 987 | - $op_max = 0; |
|
| 988 | - |
|
| 989 | - foreach ($option_values_arr as $op_val) {
|
|
| 990 | - if (strlen($op_val) && strlen($op_val) > $op_max) {
|
|
| 991 | - $op_max = strlen($op_val); |
|
| 992 | - } |
|
| 993 | - } |
|
| 994 | - |
|
| 995 | - if ($op_max) {
|
|
| 996 | - $op_size = $op_max; |
|
| 997 | - } |
|
| 998 | - } |
|
| 999 | - } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
|
|
| 1000 | - if (strlen($option_values)) {
|
|
| 1001 | - $op_size = strlen($option_values); |
|
| 1002 | - } |
|
| 1003 | - |
|
| 1004 | - if (isset($request_field['multi_display_type'])) {
|
|
| 1005 | - $extra_fields = $request_field['multi_display_type']; |
|
| 1006 | - } |
|
| 1007 | - } |
|
| 1008 | - |
|
| 1009 | - $meta_field_add = $data_type . "( $op_size ) NULL "; |
|
| 1010 | - if ($default_value != '') {
|
|
| 1011 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1012 | - } |
|
| 1013 | - |
|
| 1014 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1015 | - if ($add_result === false) {
|
|
| 1016 | - return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
|
|
| 1017 | - } |
|
| 1018 | - break; |
|
| 1019 | - case 'textarea': |
|
| 1020 | - case 'html': |
|
| 1021 | - case 'url': |
|
| 1022 | - case 'file': |
|
| 1023 | - |
|
| 1024 | - $data_type = 'TEXT'; |
|
| 1025 | - |
|
| 1026 | - $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; |
|
| 1027 | - |
|
| 1028 | - $meta_field_add = $data_type . " NULL "; |
|
| 1029 | - /*if($default_value != '') |
|
| 864 | + if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
|
|
| 865 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL"; |
|
| 866 | + $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 867 | + if ($default_value != '') {
|
|
| 868 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 869 | + } |
|
| 870 | + |
|
| 871 | + geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add); |
|
| 872 | + //$wpdb->query($meta_field_add); |
|
| 873 | + } |
|
| 874 | + if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
|
|
| 875 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL"; |
|
| 876 | + $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 877 | + if ($default_value != '') {
|
|
| 878 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 879 | + } |
|
| 880 | + |
|
| 881 | + geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add); |
|
| 882 | + //$wpdb->query($meta_field_add); |
|
| 883 | + } |
|
| 884 | + if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
|
|
| 885 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL"; |
|
| 886 | + |
|
| 887 | + $meta_field_add = "VARCHAR( 30 ) NULL"; |
|
| 888 | + if ($default_value != '') {
|
|
| 889 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 890 | + } |
|
| 891 | + |
|
| 892 | + geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add); |
|
| 893 | + //$wpdb->query($meta_field_add); |
|
| 894 | + } |
|
| 895 | + if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
|
|
| 896 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL"; |
|
| 897 | + $meta_field_add = "VARCHAR( 15 ) NULL"; |
|
| 898 | + if ($default_value != '') {
|
|
| 899 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 900 | + } |
|
| 901 | + |
|
| 902 | + geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add); |
|
| 903 | + //$wpdb->query($meta_field_add); |
|
| 904 | + } |
|
| 905 | + if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
|
|
| 906 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; |
|
| 907 | + $meta_field_add = "VARCHAR( 20 ) NULL"; |
|
| 908 | + if ($default_value != '') {
|
|
| 909 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 910 | + } |
|
| 911 | + |
|
| 912 | + geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add); |
|
| 913 | + //$wpdb->query($meta_field_add); |
|
| 914 | + |
|
| 915 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; |
|
| 916 | + |
|
| 917 | + $meta_field_add = "VARCHAR( 20 ) NULL"; |
|
| 918 | + if ($default_value != '') {
|
|
| 919 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 920 | + } |
|
| 921 | + |
|
| 922 | + geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add); |
|
| 923 | + |
|
| 924 | + //$wpdb->query($meta_field_add); |
|
| 925 | + } |
|
| 926 | + if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
|
|
| 927 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; |
|
| 928 | + |
|
| 929 | + $meta_field_add = "VARCHAR( 15 ) NULL"; |
|
| 930 | + if ($default_value != '') {
|
|
| 931 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 932 | + } |
|
| 933 | + |
|
| 934 | + geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add); |
|
| 935 | + |
|
| 936 | + //$wpdb->query($meta_field_add); |
|
| 937 | + } |
|
| 938 | + if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
|
|
| 939 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; |
|
| 940 | + |
|
| 941 | + $meta_field_add = "VARCHAR( 3 ) NULL"; |
|
| 942 | + if ($default_value != '') {
|
|
| 943 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 944 | + } |
|
| 945 | + |
|
| 946 | + geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add); |
|
| 947 | + |
|
| 948 | + //$wpdb->query($meta_field_add); |
|
| 949 | + } |
|
| 950 | + // show lat lng |
|
| 951 | + if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
|
|
| 952 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; |
|
| 953 | + |
|
| 954 | + $meta_field_add = "VARCHAR( 3 ) NULL"; |
|
| 955 | + $meta_field_add .= " DEFAULT '1'"; |
|
| 956 | + |
|
| 957 | + geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add); |
|
| 958 | + //$wpdb->query($meta_field_add); |
|
| 959 | + } |
|
| 960 | + } |
|
| 961 | + |
|
| 962 | + break; |
|
| 963 | + |
|
| 964 | + case 'checkbox': |
|
| 965 | + $data_type = 'TINYINT'; |
|
| 966 | + |
|
| 967 | + $meta_field_add = $data_type . "( 1 ) NOT NULL "; |
|
| 968 | + if ((int)$default_value === 1) {
|
|
| 969 | + $meta_field_add .= " DEFAULT '1'"; |
|
| 970 | + } |
|
| 971 | + |
|
| 972 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 973 | + if ($add_result === false) {
|
|
| 974 | + return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
|
|
| 975 | + } |
|
| 976 | + break; |
|
| 977 | + case 'multiselect': |
|
| 978 | + case 'select': |
|
| 979 | + $data_type = 'VARCHAR'; |
|
| 980 | + $op_size = '500'; |
|
| 981 | + |
|
| 982 | + // only make the field as big as it needs to be. |
|
| 983 | + if (isset($option_values) && $option_values && $field_type == 'select') {
|
|
| 984 | + $option_values_arr = explode(',', $option_values);
|
|
| 985 | + |
|
| 986 | + if (is_array($option_values_arr)) {
|
|
| 987 | + $op_max = 0; |
|
| 988 | + |
|
| 989 | + foreach ($option_values_arr as $op_val) {
|
|
| 990 | + if (strlen($op_val) && strlen($op_val) > $op_max) {
|
|
| 991 | + $op_max = strlen($op_val); |
|
| 992 | + } |
|
| 993 | + } |
|
| 994 | + |
|
| 995 | + if ($op_max) {
|
|
| 996 | + $op_size = $op_max; |
|
| 997 | + } |
|
| 998 | + } |
|
| 999 | + } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
|
|
| 1000 | + if (strlen($option_values)) {
|
|
| 1001 | + $op_size = strlen($option_values); |
|
| 1002 | + } |
|
| 1003 | + |
|
| 1004 | + if (isset($request_field['multi_display_type'])) {
|
|
| 1005 | + $extra_fields = $request_field['multi_display_type']; |
|
| 1006 | + } |
|
| 1007 | + } |
|
| 1008 | + |
|
| 1009 | + $meta_field_add = $data_type . "( $op_size ) NULL "; |
|
| 1010 | + if ($default_value != '') {
|
|
| 1011 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1012 | + } |
|
| 1013 | + |
|
| 1014 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1015 | + if ($add_result === false) {
|
|
| 1016 | + return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
|
|
| 1017 | + } |
|
| 1018 | + break; |
|
| 1019 | + case 'textarea': |
|
| 1020 | + case 'html': |
|
| 1021 | + case 'url': |
|
| 1022 | + case 'file': |
|
| 1023 | + |
|
| 1024 | + $data_type = 'TEXT'; |
|
| 1025 | + |
|
| 1026 | + $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; |
|
| 1027 | + |
|
| 1028 | + $meta_field_add = $data_type . " NULL "; |
|
| 1029 | + /*if($default_value != '') |
|
| 1030 | 1030 | { $meta_field_add .= " DEFAULT '".$default_value."'"; }*/
|
| 1031 | 1031 | |
| 1032 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1033 | - if ($add_result === false) {
|
|
| 1034 | - return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
|
|
| 1035 | - } |
|
| 1032 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1033 | + if ($add_result === false) {
|
|
| 1034 | + return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
|
|
| 1035 | + } |
|
| 1036 | 1036 | |
| 1037 | - break; |
|
| 1037 | + break; |
|
| 1038 | 1038 | |
| 1039 | - case 'datepicker': |
|
| 1039 | + case 'datepicker': |
|
| 1040 | 1040 | |
| 1041 | - $data_type = 'DATE'; |
|
| 1041 | + $data_type = 'DATE'; |
|
| 1042 | 1042 | |
| 1043 | - $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; |
|
| 1043 | + $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; |
|
| 1044 | 1044 | |
| 1045 | - $meta_field_add = $data_type . " NULL "; |
|
| 1045 | + $meta_field_add = $data_type . " NULL "; |
|
| 1046 | 1046 | |
| 1047 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1048 | - if ($add_result === false) {
|
|
| 1049 | - return __('Column creation failed, you may have too many columns or the default value might have a invalid date format.', 'geodirectory');
|
|
| 1050 | - } |
|
| 1047 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1048 | + if ($add_result === false) {
|
|
| 1049 | + return __('Column creation failed, you may have too many columns or the default value might have a invalid date format.', 'geodirectory');
|
|
| 1050 | + } |
|
| 1051 | 1051 | |
| 1052 | - break; |
|
| 1052 | + break; |
|
| 1053 | 1053 | |
| 1054 | - case 'time': |
|
| 1054 | + case 'time': |
|
| 1055 | 1055 | |
| 1056 | - $data_type = 'TIME'; |
|
| 1056 | + $data_type = 'TIME'; |
|
| 1057 | 1057 | |
| 1058 | - $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; |
|
| 1058 | + $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; |
|
| 1059 | 1059 | |
| 1060 | - $meta_field_add = $data_type . " NULL "; |
|
| 1060 | + $meta_field_add = $data_type . " NULL "; |
|
| 1061 | 1061 | |
| 1062 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1063 | - if ($add_result === false) {
|
|
| 1064 | - return __('Column creation failed, you may have too many columns or the default value might have a invalid time format.', 'geodirectory');
|
|
| 1065 | - } |
|
| 1062 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1063 | + if ($add_result === false) {
|
|
| 1064 | + return __('Column creation failed, you may have too many columns or the default value might have a invalid time format.', 'geodirectory');
|
|
| 1065 | + } |
|
| 1066 | 1066 | |
| 1067 | - break; |
|
| 1067 | + break; |
|
| 1068 | 1068 | |
| 1069 | - default: |
|
| 1069 | + default: |
|
| 1070 | 1070 | |
| 1071 | - if ($data_type != 'VARCHAR' && $data_type != '') {
|
|
| 1072 | - $meta_field_add = $data_type . " NULL "; |
|
| 1071 | + if ($data_type != 'VARCHAR' && $data_type != '') {
|
|
| 1072 | + $meta_field_add = $data_type . " NULL "; |
|
| 1073 | 1073 | |
| 1074 | - if ($data_type == 'FLOAT' && $decimal_point > 0) {
|
|
| 1075 | - $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL "; |
|
| 1076 | - } |
|
| 1074 | + if ($data_type == 'FLOAT' && $decimal_point > 0) {
|
|
| 1075 | + $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL "; |
|
| 1076 | + } |
|
| 1077 | 1077 | |
| 1078 | - if (is_numeric($default_value) && $default_value != '') {
|
|
| 1079 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1080 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1081 | - } |
|
| 1082 | - } else {
|
|
| 1083 | - $meta_field_add = " VARCHAR( 254 ) NULL "; |
|
| 1078 | + if (is_numeric($default_value) && $default_value != '') {
|
|
| 1079 | + $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1080 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1081 | + } |
|
| 1082 | + } else {
|
|
| 1083 | + $meta_field_add = " VARCHAR( 254 ) NULL "; |
|
| 1084 | 1084 | |
| 1085 | - if ($default_value != '') {
|
|
| 1086 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1087 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1088 | - } |
|
| 1089 | - } |
|
| 1085 | + if ($default_value != '') {
|
|
| 1086 | + $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1087 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1088 | + } |
|
| 1089 | + } |
|
| 1090 | 1090 | |
| 1091 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1092 | - if ($add_result === false) {
|
|
| 1093 | - return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
|
|
| 1094 | - } |
|
| 1095 | - break; |
|
| 1096 | - endswitch; |
|
| 1091 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1092 | + if ($add_result === false) {
|
|
| 1093 | + return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
|
|
| 1094 | + } |
|
| 1095 | + break; |
|
| 1096 | + endswitch; |
|
| 1097 | 1097 | |
| 1098 | - $extra_field_query = ''; |
|
| 1099 | - if (!empty($extra_fields)) {
|
|
| 1100 | - $extra_field_query = serialize($extra_fields); |
|
| 1101 | - } |
|
| 1098 | + $extra_field_query = ''; |
|
| 1099 | + if (!empty($extra_fields)) {
|
|
| 1100 | + $extra_field_query = serialize($extra_fields); |
|
| 1101 | + } |
|
| 1102 | 1102 | |
| 1103 | - $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : ''; |
|
| 1103 | + $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : ''; |
|
| 1104 | 1104 | |
| 1105 | - $wpdb->query( |
|
| 1105 | + $wpdb->query( |
|
| 1106 | 1106 | |
| 1107 | - $wpdb->prepare( |
|
| 1107 | + $wpdb->prepare( |
|
| 1108 | 1108 | |
| 1109 | - "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set |
|
| 1109 | + "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set |
|
| 1110 | 1110 | post_type = %s, |
| 1111 | 1111 | admin_title = %s, |
| 1112 | 1112 | site_title = %s, |
@@ -1139,26 +1139,26 @@ discard block |
||
| 1139 | 1139 | validation_msg = %s, |
| 1140 | 1140 | for_admin_use = %s ", |
| 1141 | 1141 | |
| 1142 | - array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use) |
|
| 1142 | + array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use) |
|
| 1143 | 1143 | |
| 1144 | - ) |
|
| 1144 | + ) |
|
| 1145 | 1145 | |
| 1146 | - ); |
|
| 1146 | + ); |
|
| 1147 | 1147 | |
| 1148 | - $lastid = $wpdb->insert_id; |
|
| 1148 | + $lastid = $wpdb->insert_id; |
|
| 1149 | 1149 | |
| 1150 | - $lastid = trim($lastid); |
|
| 1150 | + $lastid = trim($lastid); |
|
| 1151 | 1151 | |
| 1152 | - } |
|
| 1152 | + } |
|
| 1153 | 1153 | |
| 1154 | - return (int)$lastid; |
|
| 1154 | + return (int)$lastid; |
|
| 1155 | 1155 | |
| 1156 | 1156 | |
| 1157 | - } else {
|
|
| 1158 | - return 'HTML Variable Name should be a unique name'; |
|
| 1159 | - } |
|
| 1157 | + } else {
|
|
| 1158 | + return 'HTML Variable Name should be a unique name'; |
|
| 1159 | + } |
|
| 1160 | 1160 | |
| 1161 | - } |
|
| 1161 | + } |
|
| 1162 | 1162 | } |
| 1163 | 1163 | |
| 1164 | 1164 | /** |
@@ -1173,63 +1173,63 @@ discard block |
||
| 1173 | 1173 | function godir_set_field_order($field_ids = array()) |
| 1174 | 1174 | {
|
| 1175 | 1175 | |
| 1176 | - global $wpdb; |
|
| 1176 | + global $wpdb; |
|
| 1177 | 1177 | |
| 1178 | - $count = 0; |
|
| 1179 | - if (!empty($field_ids)): |
|
| 1180 | - $post_meta_info = false; |
|
| 1181 | - foreach ($field_ids as $id) {
|
|
| 1178 | + $count = 0; |
|
| 1179 | + if (!empty($field_ids)): |
|
| 1180 | + $post_meta_info = false; |
|
| 1181 | + foreach ($field_ids as $id) {
|
|
| 1182 | 1182 | |
| 1183 | - $cf = trim($id, '_'); |
|
| 1183 | + $cf = trim($id, '_'); |
|
| 1184 | 1184 | |
| 1185 | - $post_meta_info = $wpdb->query( |
|
| 1186 | - $wpdb->prepare( |
|
| 1187 | - "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set |
|
| 1185 | + $post_meta_info = $wpdb->query( |
|
| 1186 | + $wpdb->prepare( |
|
| 1187 | + "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set |
|
| 1188 | 1188 | sort_order=%d |
| 1189 | 1189 | where id= %d", |
| 1190 | - array($count, $cf) |
|
| 1191 | - ) |
|
| 1192 | - ); |
|
| 1193 | - $count++; |
|
| 1194 | - } |
|
| 1195 | - |
|
| 1196 | - return $post_meta_info; |
|
| 1197 | - else: |
|
| 1198 | - return false; |
|
| 1199 | - endif; |
|
| 1190 | + array($count, $cf) |
|
| 1191 | + ) |
|
| 1192 | + ); |
|
| 1193 | + $count++; |
|
| 1194 | + } |
|
| 1195 | + |
|
| 1196 | + return $post_meta_info; |
|
| 1197 | + else: |
|
| 1198 | + return false; |
|
| 1199 | + endif; |
|
| 1200 | 1200 | } |
| 1201 | 1201 | |
| 1202 | 1202 | function geodir_get_cf_value($cf) {
|
| 1203 | - global $gd_session; |
|
| 1204 | - $value = ''; |
|
| 1205 | - if (is_admin()) {
|
|
| 1206 | - global $post; |
|
| 1207 | - |
|
| 1208 | - if (isset($_REQUEST['post'])) {
|
|
| 1209 | - $_REQUEST['pid'] = (int)$_REQUEST['post']; |
|
| 1210 | - } |
|
| 1211 | - } |
|
| 1212 | - |
|
| 1213 | - if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
|
|
| 1214 | - $post = $gd_ses_listing; |
|
| 1215 | - $value = isset($post[$cf['name']]) ? $post[$cf['name']] : ''; |
|
| 1216 | - } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 1217 | - $value = geodir_get_post_meta($_REQUEST['pid'], $cf['name'], true); |
|
| 1218 | - } else {
|
|
| 1219 | - if ($value == '') {
|
|
| 1220 | - $value = $cf['default']; |
|
| 1221 | - } |
|
| 1222 | - } |
|
| 1203 | + global $gd_session; |
|
| 1204 | + $value = ''; |
|
| 1205 | + if (is_admin()) {
|
|
| 1206 | + global $post; |
|
| 1207 | + |
|
| 1208 | + if (isset($_REQUEST['post'])) {
|
|
| 1209 | + $_REQUEST['pid'] = (int)$_REQUEST['post']; |
|
| 1210 | + } |
|
| 1211 | + } |
|
| 1212 | + |
|
| 1213 | + if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
|
|
| 1214 | + $post = $gd_ses_listing; |
|
| 1215 | + $value = isset($post[$cf['name']]) ? $post[$cf['name']] : ''; |
|
| 1216 | + } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 1217 | + $value = geodir_get_post_meta($_REQUEST['pid'], $cf['name'], true); |
|
| 1218 | + } else {
|
|
| 1219 | + if ($value == '') {
|
|
| 1220 | + $value = $cf['default']; |
|
| 1221 | + } |
|
| 1222 | + } |
|
| 1223 | 1223 | |
| 1224 | - /** |
|
| 1225 | - * Filter the custom field value. |
|
| 1226 | - * |
|
| 1227 | - * @since 1.6.20 |
|
| 1228 | - * |
|
| 1229 | - * @param mixed $value Custom field value. |
|
| 1230 | - * @param array $cf Custom field info. |
|
| 1231 | - */ |
|
| 1232 | - return apply_filters( 'geodir_get_cf_value', $value, $cf ); |
|
| 1224 | + /** |
|
| 1225 | + * Filter the custom field value. |
|
| 1226 | + * |
|
| 1227 | + * @since 1.6.20 |
|
| 1228 | + * |
|
| 1229 | + * @param mixed $value Custom field value. |
|
| 1230 | + * @param array $cf Custom field info. |
|
| 1231 | + */ |
|
| 1232 | + return apply_filters( 'geodir_get_cf_value', $value, $cf ); |
|
| 1233 | 1233 | } |
| 1234 | 1234 | |
| 1235 | 1235 | /** |
@@ -1248,422 +1248,422 @@ discard block |
||
| 1248 | 1248 | * @param string $post_type Optional. The wordpress post type. |
| 1249 | 1249 | */ |
| 1250 | 1250 | function geodir_get_custom_fields_html($package_id = '', $default = 'custom', $post_type = 'gd_place') {
|
| 1251 | - global $is_default, $mapzoom, $gd_session; |
|
| 1251 | + global $is_default, $mapzoom, $gd_session; |
|
| 1252 | 1252 | |
| 1253 | - $listing_type = $post_type; |
|
| 1253 | + $listing_type = $post_type; |
|
| 1254 | 1254 | |
| 1255 | - $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type); |
|
| 1255 | + $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type); |
|
| 1256 | 1256 | |
| 1257 | - foreach ($custom_fields as $key => $val) {
|
|
| 1258 | - if(isset($val['extra_fields'])){$extra_fields = $val['extra_fields'];}
|
|
| 1259 | - $val = stripslashes_deep($val); // strip slashes from labels |
|
| 1260 | - if(isset($val['extra_fields'])){$val['extra_fields'] = $extra_fields;}
|
|
| 1257 | + foreach ($custom_fields as $key => $val) {
|
|
| 1258 | + if(isset($val['extra_fields'])){$extra_fields = $val['extra_fields'];}
|
|
| 1259 | + $val = stripslashes_deep($val); // strip slashes from labels |
|
| 1260 | + if(isset($val['extra_fields'])){$val['extra_fields'] = $extra_fields;}
|
|
| 1261 | 1261 | |
| 1262 | - $name = $val['name']; |
|
| 1263 | - $type = $val['type']; |
|
| 1264 | - $is_default = $val['is_default']; |
|
| 1262 | + $name = $val['name']; |
|
| 1263 | + $type = $val['type']; |
|
| 1264 | + $is_default = $val['is_default']; |
|
| 1265 | 1265 | |
| 1266 | - /* field available to site admin only for edit */ |
|
| 1267 | - $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false; |
|
| 1268 | - if ($for_admin_use && !is_super_admin()) {
|
|
| 1269 | - continue; |
|
| 1270 | - } |
|
| 1266 | + /* field available to site admin only for edit */ |
|
| 1267 | + $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false; |
|
| 1268 | + if ($for_admin_use && !is_super_admin()) {
|
|
| 1269 | + continue; |
|
| 1270 | + } |
|
| 1271 | 1271 | |
| 1272 | - if (is_admin()) {
|
|
| 1273 | - global $post; |
|
| 1272 | + if (is_admin()) {
|
|
| 1273 | + global $post; |
|
| 1274 | 1274 | |
| 1275 | - if (isset($_REQUEST['post'])) |
|
| 1276 | - $_REQUEST['pid'] = $_REQUEST['post']; |
|
| 1277 | - } |
|
| 1275 | + if (isset($_REQUEST['post'])) |
|
| 1276 | + $_REQUEST['pid'] = $_REQUEST['post']; |
|
| 1277 | + } |
|
| 1278 | 1278 | |
| 1279 | 1279 | |
| 1280 | 1280 | |
| 1281 | - /** |
|
| 1282 | - * Called before the custom fields info is output for submitting a post. |
|
| 1283 | - * |
|
| 1284 | - * Used dynamic hook type geodir_before_custom_form_field_$name. |
|
| 1285 | - * |
|
| 1286 | - * @since 1.0.0 |
|
| 1287 | - * @param string $listing_type The post post type. |
|
| 1288 | - * @param int $package_id The price package ID for the post. |
|
| 1289 | - * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
|
|
| 1290 | - * @see 'geodir_after_custom_form_field_$name' |
|
| 1291 | - */ |
|
| 1292 | - do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);
|
|
| 1293 | - |
|
| 1294 | - |
|
| 1295 | - $custom_field = $val; |
|
| 1296 | - $html =''; |
|
| 1297 | - /** |
|
| 1298 | - * Filter the output for custom fields. |
|
| 1299 | - * |
|
| 1300 | - * Here we can remove or add new functions depending on the field type. |
|
| 1301 | - * |
|
| 1302 | - * @param string $html The html to be filtered (blank). |
|
| 1303 | - * @param array $custom_field The custom field array values. |
|
| 1304 | - */ |
|
| 1305 | - echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);
|
|
| 1306 | - |
|
| 1307 | - |
|
| 1308 | - |
|
| 1309 | - /** |
|
| 1310 | - * Called after the custom fields info is output for submitting a post. |
|
| 1311 | - * |
|
| 1312 | - * Used dynamic hook type geodir_after_custom_form_field_$name. |
|
| 1313 | - * |
|
| 1314 | - * @since 1.0.0 |
|
| 1315 | - * @param string $listing_type The post post type. |
|
| 1316 | - * @param int $package_id The price package ID for the post. |
|
| 1317 | - * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
|
|
| 1318 | - * @see 'geodir_before_custom_form_field_$name' |
|
| 1319 | - */ |
|
| 1320 | - do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);
|
|
| 1321 | - |
|
| 1322 | - } |
|
| 1281 | + /** |
|
| 1282 | + * Called before the custom fields info is output for submitting a post. |
|
| 1283 | + * |
|
| 1284 | + * Used dynamic hook type geodir_before_custom_form_field_$name. |
|
| 1285 | + * |
|
| 1286 | + * @since 1.0.0 |
|
| 1287 | + * @param string $listing_type The post post type. |
|
| 1288 | + * @param int $package_id The price package ID for the post. |
|
| 1289 | + * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
|
|
| 1290 | + * @see 'geodir_after_custom_form_field_$name' |
|
| 1291 | + */ |
|
| 1292 | + do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);
|
|
| 1293 | + |
|
| 1294 | + |
|
| 1295 | + $custom_field = $val; |
|
| 1296 | + $html =''; |
|
| 1297 | + /** |
|
| 1298 | + * Filter the output for custom fields. |
|
| 1299 | + * |
|
| 1300 | + * Here we can remove or add new functions depending on the field type. |
|
| 1301 | + * |
|
| 1302 | + * @param string $html The html to be filtered (blank). |
|
| 1303 | + * @param array $custom_field The custom field array values. |
|
| 1304 | + */ |
|
| 1305 | + echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);
|
|
| 1306 | + |
|
| 1307 | + |
|
| 1308 | + |
|
| 1309 | + /** |
|
| 1310 | + * Called after the custom fields info is output for submitting a post. |
|
| 1311 | + * |
|
| 1312 | + * Used dynamic hook type geodir_after_custom_form_field_$name. |
|
| 1313 | + * |
|
| 1314 | + * @since 1.0.0 |
|
| 1315 | + * @param string $listing_type The post post type. |
|
| 1316 | + * @param int $package_id The price package ID for the post. |
|
| 1317 | + * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
|
|
| 1318 | + * @see 'geodir_before_custom_form_field_$name' |
|
| 1319 | + */ |
|
| 1320 | + do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);
|
|
| 1321 | + |
|
| 1322 | + } |
|
| 1323 | 1323 | |
| 1324 | 1324 | } |
| 1325 | 1325 | |
| 1326 | 1326 | |
| 1327 | 1327 | if (!function_exists('geodir_get_field_infoby')) {
|
| 1328 | - /** |
|
| 1329 | - * Get custom field using key and value. |
|
| 1330 | - * |
|
| 1331 | - * @since 1.0.0 |
|
| 1332 | - * @package GeoDirectory |
|
| 1333 | - * @global object $wpdb WordPress Database object. |
|
| 1334 | - * @param string $key The key you want to look for. |
|
| 1335 | - * @param string $value The value of the key you want to look for. |
|
| 1336 | - * @param string $geodir_post_type The post type. |
|
| 1337 | - * @return bool|mixed Returns field info when available. otherwise returns false. |
|
| 1338 | - */ |
|
| 1339 | - function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '') |
|
| 1340 | - {
|
|
| 1341 | - |
|
| 1342 | - global $wpdb; |
|
| 1343 | - |
|
| 1344 | - $filter = $wpdb->get_row( |
|
| 1345 | - $wpdb->prepare( |
|
| 1346 | - "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'", |
|
| 1347 | - array($geodir_post_type) |
|
| 1348 | - ) |
|
| 1349 | - ); |
|
| 1350 | - |
|
| 1351 | - if ($filter) {
|
|
| 1352 | - return $filter; |
|
| 1353 | - } else {
|
|
| 1354 | - return false; |
|
| 1355 | - } |
|
| 1356 | - |
|
| 1357 | - } |
|
| 1328 | + /** |
|
| 1329 | + * Get custom field using key and value. |
|
| 1330 | + * |
|
| 1331 | + * @since 1.0.0 |
|
| 1332 | + * @package GeoDirectory |
|
| 1333 | + * @global object $wpdb WordPress Database object. |
|
| 1334 | + * @param string $key The key you want to look for. |
|
| 1335 | + * @param string $value The value of the key you want to look for. |
|
| 1336 | + * @param string $geodir_post_type The post type. |
|
| 1337 | + * @return bool|mixed Returns field info when available. otherwise returns false. |
|
| 1338 | + */ |
|
| 1339 | + function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '') |
|
| 1340 | + {
|
|
| 1341 | + |
|
| 1342 | + global $wpdb; |
|
| 1343 | + |
|
| 1344 | + $filter = $wpdb->get_row( |
|
| 1345 | + $wpdb->prepare( |
|
| 1346 | + "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'", |
|
| 1347 | + array($geodir_post_type) |
|
| 1348 | + ) |
|
| 1349 | + ); |
|
| 1350 | + |
|
| 1351 | + if ($filter) {
|
|
| 1352 | + return $filter; |
|
| 1353 | + } else {
|
|
| 1354 | + return false; |
|
| 1355 | + } |
|
| 1356 | + |
|
| 1357 | + } |
|
| 1358 | 1358 | } |
| 1359 | 1359 | |
| 1360 | 1360 | |
| 1361 | 1361 | function geodir_field_icon_proccess($cf){
|
| 1362 | 1362 | |
| 1363 | 1363 | |
| 1364 | - if (strpos($cf['field_icon'], 'http') !== false) {
|
|
| 1365 | - $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
|
|
| 1366 | - } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
|
|
| 1367 | - $field_icon = '<i class="' . $cf['field_icon'] . '"></i>'; |
|
| 1368 | - }else{
|
|
| 1369 | - $field_icon = $cf['field_icon']; |
|
| 1370 | - } |
|
| 1364 | + if (strpos($cf['field_icon'], 'http') !== false) {
|
|
| 1365 | + $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
|
|
| 1366 | + } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
|
|
| 1367 | + $field_icon = '<i class="' . $cf['field_icon'] . '"></i>'; |
|
| 1368 | + }else{
|
|
| 1369 | + $field_icon = $cf['field_icon']; |
|
| 1370 | + } |
|
| 1371 | 1371 | |
| 1372 | - return $field_icon; |
|
| 1372 | + return $field_icon; |
|
| 1373 | 1373 | } |
| 1374 | 1374 | |
| 1375 | 1375 | if (!function_exists('geodir_show_listing_info')) {
|
| 1376 | - /** |
|
| 1377 | - * Show listing info depending on field location. |
|
| 1378 | - * |
|
| 1379 | - * @since 1.0.0 |
|
| 1380 | - * @since 1.5.7 Custom fields option values added to db translation. |
|
| 1381 | - * Changes to display url fields title. |
|
| 1382 | - * @package GeoDirectory |
|
| 1383 | - * @global object $wpdb WordPress Database object. |
|
| 1384 | - * @global object $post The current post object. |
|
| 1385 | - * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false. |
|
| 1386 | - * |
|
| 1387 | - * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc. |
|
| 1388 | - * @return string Returns listing info html. |
|
| 1389 | - */ |
|
| 1390 | - function geodir_show_listing_info($fields_location = '') {
|
|
| 1391 | - global $post, $preview, $wpdb, $send_to_friend; |
|
| 1392 | - |
|
| 1393 | - $package_info = array(); |
|
| 1394 | - |
|
| 1395 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 1396 | - $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 1397 | - $p_type = !empty($post->post_type) ? $post->post_type : geodir_get_current_posttype(); |
|
| 1398 | - $send_to_friend = false; |
|
| 1399 | - |
|
| 1400 | - ob_start(); |
|
| 1401 | - $fields_info = geodir_post_custom_fields($post_package_id, 'all', $p_type, $fields_location); |
|
| 1402 | - |
|
| 1403 | - if (!empty($fields_info)) {
|
|
| 1404 | - $post = stripslashes_deep($post); // strip slashes |
|
| 1376 | + /** |
|
| 1377 | + * Show listing info depending on field location. |
|
| 1378 | + * |
|
| 1379 | + * @since 1.0.0 |
|
| 1380 | + * @since 1.5.7 Custom fields option values added to db translation. |
|
| 1381 | + * Changes to display url fields title. |
|
| 1382 | + * @package GeoDirectory |
|
| 1383 | + * @global object $wpdb WordPress Database object. |
|
| 1384 | + * @global object $post The current post object. |
|
| 1385 | + * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false. |
|
| 1386 | + * |
|
| 1387 | + * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc. |
|
| 1388 | + * @return string Returns listing info html. |
|
| 1389 | + */ |
|
| 1390 | + function geodir_show_listing_info($fields_location = '') {
|
|
| 1391 | + global $post, $preview, $wpdb, $send_to_friend; |
|
| 1392 | + |
|
| 1393 | + $package_info = array(); |
|
| 1394 | + |
|
| 1395 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 1396 | + $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 1397 | + $p_type = !empty($post->post_type) ? $post->post_type : geodir_get_current_posttype(); |
|
| 1398 | + $send_to_friend = false; |
|
| 1399 | + |
|
| 1400 | + ob_start(); |
|
| 1401 | + $fields_info = geodir_post_custom_fields($post_package_id, 'all', $p_type, $fields_location); |
|
| 1402 | + |
|
| 1403 | + if (!empty($fields_info)) {
|
|
| 1404 | + $post = stripslashes_deep($post); // strip slashes |
|
| 1405 | 1405 | |
| 1406 | - //echo '<div class="geodir-company_info field-group">'; |
|
| 1407 | - global $field_set_start; |
|
| 1408 | - $field_set_start = 0; |
|
| 1409 | - |
|
| 1410 | - |
|
| 1411 | - |
|
| 1412 | - foreach ($fields_info as $type) {
|
|
| 1413 | - if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 1414 | - $type = stripslashes_deep($type); // strip slashes |
|
| 1415 | - if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 1416 | - $html = ''; |
|
| 1417 | - $field_icon = geodir_field_icon_proccess($type); |
|
| 1418 | - $filed_type = $type['type']; |
|
| 1419 | - $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 1420 | - if($html_var=='post'){$html_var='post_address';}
|
|
| 1421 | - |
|
| 1422 | - /** |
|
| 1423 | - * Filter the output for custom fields. |
|
| 1424 | - * |
|
| 1425 | - * Here we can remove or add new functions depending on the field type. |
|
| 1426 | - * |
|
| 1427 | - * @param string $html The html to be filtered (blank). |
|
| 1428 | - * @param string $fields_location The location the field is to be show. |
|
| 1429 | - * @param array $type The array of field values. |
|
| 1430 | - */ |
|
| 1431 | - $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 1432 | - |
|
| 1433 | - $variables_array = array(); |
|
| 1434 | - |
|
| 1435 | - |
|
| 1436 | - if ($type['type'] != 'fieldset'): |
|
| 1437 | - $variables_array['post_id'] = !empty($post->ID) ? $post->ID : (!empty($post->pid) ? $post->pid : NULL); |
|
| 1438 | - $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 1439 | - $variables_array['value'] = ''; |
|
| 1440 | - if (isset($post->{$type['htmlvar_name']}))
|
|
| 1441 | - $variables_array['value'] = $post->{$type['htmlvar_name']};
|
|
| 1442 | - endif; |
|
| 1443 | - |
|
| 1444 | - |
|
| 1445 | - if ($html): |
|
| 1446 | - |
|
| 1447 | - /** |
|
| 1448 | - * Called before a custom fields is output on the frontend. |
|
| 1449 | - * |
|
| 1450 | - * @since 1.0.0 |
|
| 1451 | - * @param string $html_var The HTML variable name for the field. |
|
| 1452 | - */ |
|
| 1453 | - do_action("geodir_before_show_{$html_var}");
|
|
| 1454 | - /** |
|
| 1455 | - * Filter custom field output. |
|
| 1456 | - * |
|
| 1457 | - * @since 1.0.0 |
|
| 1458 | - * |
|
| 1459 | - * @param string $html_var The HTML variable name for the field. |
|
| 1460 | - * @param string $html Custom field unfiltered HTML. |
|
| 1461 | - * @param array $variables_array Custom field variables array. |
|
| 1462 | - */ |
|
| 1463 | - if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
|
|
| 1464 | - |
|
| 1465 | - /** |
|
| 1466 | - * Called after a custom fields is output on the frontend. |
|
| 1467 | - * |
|
| 1468 | - * @since 1.0.0 |
|
| 1469 | - * @param string $html_var The HTML variable name for the field. |
|
| 1470 | - */ |
|
| 1471 | - do_action("geodir_after_show_{$html_var}");
|
|
| 1472 | - |
|
| 1473 | - endif; |
|
| 1474 | - |
|
| 1475 | - } |
|
| 1476 | - |
|
| 1477 | - //echo '</div>'; |
|
| 1478 | - |
|
| 1479 | - } |
|
| 1480 | - |
|
| 1481 | - |
|
| 1482 | - $html = ob_get_clean(); |
|
| 1483 | - |
|
| 1484 | - /** |
|
| 1485 | - * Filter the custom fields over all output. |
|
| 1486 | - * |
|
| 1487 | - * @param string $html The html of the custom fields. |
|
| 1488 | - * @param string $fields_location The location the fields are being output. |
|
| 1489 | - * @since 1.6.9 |
|
| 1490 | - */ |
|
| 1491 | - return apply_filters('geodir_show_listing_info',$html,$fields_location);
|
|
| 1492 | - |
|
| 1493 | - } |
|
| 1406 | + //echo '<div class="geodir-company_info field-group">'; |
|
| 1407 | + global $field_set_start; |
|
| 1408 | + $field_set_start = 0; |
|
| 1409 | + |
|
| 1410 | + |
|
| 1411 | + |
|
| 1412 | + foreach ($fields_info as $type) {
|
|
| 1413 | + if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 1414 | + $type = stripslashes_deep($type); // strip slashes |
|
| 1415 | + if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 1416 | + $html = ''; |
|
| 1417 | + $field_icon = geodir_field_icon_proccess($type); |
|
| 1418 | + $filed_type = $type['type']; |
|
| 1419 | + $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 1420 | + if($html_var=='post'){$html_var='post_address';}
|
|
| 1421 | + |
|
| 1422 | + /** |
|
| 1423 | + * Filter the output for custom fields. |
|
| 1424 | + * |
|
| 1425 | + * Here we can remove or add new functions depending on the field type. |
|
| 1426 | + * |
|
| 1427 | + * @param string $html The html to be filtered (blank). |
|
| 1428 | + * @param string $fields_location The location the field is to be show. |
|
| 1429 | + * @param array $type The array of field values. |
|
| 1430 | + */ |
|
| 1431 | + $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 1432 | + |
|
| 1433 | + $variables_array = array(); |
|
| 1434 | + |
|
| 1435 | + |
|
| 1436 | + if ($type['type'] != 'fieldset'): |
|
| 1437 | + $variables_array['post_id'] = !empty($post->ID) ? $post->ID : (!empty($post->pid) ? $post->pid : NULL); |
|
| 1438 | + $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 1439 | + $variables_array['value'] = ''; |
|
| 1440 | + if (isset($post->{$type['htmlvar_name']}))
|
|
| 1441 | + $variables_array['value'] = $post->{$type['htmlvar_name']};
|
|
| 1442 | + endif; |
|
| 1443 | + |
|
| 1444 | + |
|
| 1445 | + if ($html): |
|
| 1446 | + |
|
| 1447 | + /** |
|
| 1448 | + * Called before a custom fields is output on the frontend. |
|
| 1449 | + * |
|
| 1450 | + * @since 1.0.0 |
|
| 1451 | + * @param string $html_var The HTML variable name for the field. |
|
| 1452 | + */ |
|
| 1453 | + do_action("geodir_before_show_{$html_var}");
|
|
| 1454 | + /** |
|
| 1455 | + * Filter custom field output. |
|
| 1456 | + * |
|
| 1457 | + * @since 1.0.0 |
|
| 1458 | + * |
|
| 1459 | + * @param string $html_var The HTML variable name for the field. |
|
| 1460 | + * @param string $html Custom field unfiltered HTML. |
|
| 1461 | + * @param array $variables_array Custom field variables array. |
|
| 1462 | + */ |
|
| 1463 | + if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
|
|
| 1464 | + |
|
| 1465 | + /** |
|
| 1466 | + * Called after a custom fields is output on the frontend. |
|
| 1467 | + * |
|
| 1468 | + * @since 1.0.0 |
|
| 1469 | + * @param string $html_var The HTML variable name for the field. |
|
| 1470 | + */ |
|
| 1471 | + do_action("geodir_after_show_{$html_var}");
|
|
| 1472 | + |
|
| 1473 | + endif; |
|
| 1474 | + |
|
| 1475 | + } |
|
| 1476 | + |
|
| 1477 | + //echo '</div>'; |
|
| 1478 | + |
|
| 1479 | + } |
|
| 1480 | + |
|
| 1481 | + |
|
| 1482 | + $html = ob_get_clean(); |
|
| 1483 | + |
|
| 1484 | + /** |
|
| 1485 | + * Filter the custom fields over all output. |
|
| 1486 | + * |
|
| 1487 | + * @param string $html The html of the custom fields. |
|
| 1488 | + * @param string $fields_location The location the fields are being output. |
|
| 1489 | + * @since 1.6.9 |
|
| 1490 | + */ |
|
| 1491 | + return apply_filters('geodir_show_listing_info',$html,$fields_location);
|
|
| 1492 | + |
|
| 1493 | + } |
|
| 1494 | 1494 | } |
| 1495 | 1495 | |
| 1496 | 1496 | if (!function_exists('geodir_default_date_format')) {
|
| 1497 | - /** |
|
| 1498 | - * Returns default date format. |
|
| 1499 | - * |
|
| 1500 | - * @since 1.0.0 |
|
| 1501 | - * @package GeoDirectory |
|
| 1502 | - * @return mixed|string|void Returns default date format. |
|
| 1503 | - */ |
|
| 1504 | - function geodir_default_date_format() |
|
| 1505 | - {
|
|
| 1506 | - if ($format = get_option('date_format'))
|
|
| 1507 | - return $format; |
|
| 1508 | - else |
|
| 1509 | - return 'dd-mm-yy'; |
|
| 1510 | - } |
|
| 1497 | + /** |
|
| 1498 | + * Returns default date format. |
|
| 1499 | + * |
|
| 1500 | + * @since 1.0.0 |
|
| 1501 | + * @package GeoDirectory |
|
| 1502 | + * @return mixed|string|void Returns default date format. |
|
| 1503 | + */ |
|
| 1504 | + function geodir_default_date_format() |
|
| 1505 | + {
|
|
| 1506 | + if ($format = get_option('date_format'))
|
|
| 1507 | + return $format; |
|
| 1508 | + else |
|
| 1509 | + return 'dd-mm-yy'; |
|
| 1510 | + } |
|
| 1511 | 1511 | } |
| 1512 | 1512 | |
| 1513 | 1513 | if (!function_exists('geodir_get_formated_date')) {
|
| 1514 | - /** |
|
| 1515 | - * Returns formatted date. |
|
| 1516 | - * |
|
| 1517 | - * @since 1.0.0 |
|
| 1518 | - * @package GeoDirectory |
|
| 1519 | - * @param string $date Date string to convert. |
|
| 1520 | - * @return bool|int|string Returns formatted date. |
|
| 1521 | - */ |
|
| 1522 | - function geodir_get_formated_date($date) |
|
| 1523 | - {
|
|
| 1524 | - return mysql2date(get_option('date_format'), $date);
|
|
| 1525 | - } |
|
| 1514 | + /** |
|
| 1515 | + * Returns formatted date. |
|
| 1516 | + * |
|
| 1517 | + * @since 1.0.0 |
|
| 1518 | + * @package GeoDirectory |
|
| 1519 | + * @param string $date Date string to convert. |
|
| 1520 | + * @return bool|int|string Returns formatted date. |
|
| 1521 | + */ |
|
| 1522 | + function geodir_get_formated_date($date) |
|
| 1523 | + {
|
|
| 1524 | + return mysql2date(get_option('date_format'), $date);
|
|
| 1525 | + } |
|
| 1526 | 1526 | } |
| 1527 | 1527 | |
| 1528 | 1528 | if (!function_exists('geodir_get_formated_time')) {
|
| 1529 | - /** |
|
| 1530 | - * Returns formatted time. |
|
| 1531 | - * |
|
| 1532 | - * @since 1.0.0 |
|
| 1533 | - * @package GeoDirectory |
|
| 1534 | - * @param string $time Time string to convert. |
|
| 1535 | - * @return bool|int|string Returns formatted time. |
|
| 1536 | - */ |
|
| 1537 | - function geodir_get_formated_time($time) |
|
| 1538 | - {
|
|
| 1539 | - return mysql2date(get_option('time_format'), $time, $translate = true);
|
|
| 1540 | - } |
|
| 1529 | + /** |
|
| 1530 | + * Returns formatted time. |
|
| 1531 | + * |
|
| 1532 | + * @since 1.0.0 |
|
| 1533 | + * @package GeoDirectory |
|
| 1534 | + * @param string $time Time string to convert. |
|
| 1535 | + * @return bool|int|string Returns formatted time. |
|
| 1536 | + */ |
|
| 1537 | + function geodir_get_formated_time($time) |
|
| 1538 | + {
|
|
| 1539 | + return mysql2date(get_option('time_format'), $time, $translate = true);
|
|
| 1540 | + } |
|
| 1541 | 1541 | } |
| 1542 | 1542 | |
| 1543 | 1543 | |
| 1544 | 1544 | if (!function_exists('geodir_save_post_file_fields')) {
|
| 1545 | - /** |
|
| 1546 | - * Save post file fields |
|
| 1547 | - * |
|
| 1548 | - * @since 1.0.0 |
|
| 1549 | - * @since 1.4.7 Added `$extra_fields` parameter. |
|
| 1550 | - * @package GeoDirectory |
|
| 1551 | - * @global object $wpdb WordPress Database object. |
|
| 1552 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 1553 | - * @global object $current_user Current user object. |
|
| 1554 | - * @param int $post_id |
|
| 1555 | - * @param string $field_id |
|
| 1556 | - * @param array $post_image |
|
| 1557 | - * @param array $extra_fields Array of extra fields. |
|
| 1558 | - */ |
|
| 1559 | - function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array()) |
|
| 1560 | - {
|
|
| 1545 | + /** |
|
| 1546 | + * Save post file fields |
|
| 1547 | + * |
|
| 1548 | + * @since 1.0.0 |
|
| 1549 | + * @since 1.4.7 Added `$extra_fields` parameter. |
|
| 1550 | + * @package GeoDirectory |
|
| 1551 | + * @global object $wpdb WordPress Database object. |
|
| 1552 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 1553 | + * @global object $current_user Current user object. |
|
| 1554 | + * @param int $post_id |
|
| 1555 | + * @param string $field_id |
|
| 1556 | + * @param array $post_image |
|
| 1557 | + * @param array $extra_fields Array of extra fields. |
|
| 1558 | + */ |
|
| 1559 | + function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array()) |
|
| 1560 | + {
|
|
| 1561 | 1561 | |
| 1562 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 1562 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 1563 | 1563 | |
| 1564 | - $post_type = get_post_type($post_id); |
|
| 1565 | - //echo $field_id; exit; |
|
| 1566 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1564 | + $post_type = get_post_type($post_id); |
|
| 1565 | + //echo $field_id; exit; |
|
| 1566 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1567 | 1567 | |
| 1568 | - $postcurr_images = array(); |
|
| 1569 | - $postcurr_images = geodir_get_post_meta($post_id, $field_id, true); |
|
| 1570 | - $file_urls = ''; |
|
| 1568 | + $postcurr_images = array(); |
|
| 1569 | + $postcurr_images = geodir_get_post_meta($post_id, $field_id, true); |
|
| 1570 | + $file_urls = ''; |
|
| 1571 | 1571 | |
| 1572 | - if (!empty($post_image)) {
|
|
| 1572 | + if (!empty($post_image)) {
|
|
| 1573 | 1573 | |
| 1574 | - $invalid_files = array(); |
|
| 1574 | + $invalid_files = array(); |
|
| 1575 | 1575 | |
| 1576 | - //Get and remove all old images of post from database to set by new order |
|
| 1577 | - $geodir_uploaddir = ''; |
|
| 1578 | - $uploads = wp_upload_dir(); |
|
| 1579 | - $uploads_dir = $uploads['path']; |
|
| 1576 | + //Get and remove all old images of post from database to set by new order |
|
| 1577 | + $geodir_uploaddir = ''; |
|
| 1578 | + $uploads = wp_upload_dir(); |
|
| 1579 | + $uploads_dir = $uploads['path']; |
|
| 1580 | 1580 | |
| 1581 | - $geodir_uploadpath = $uploads['path']; |
|
| 1582 | - $geodir_uploadurl = $uploads['url']; |
|
| 1583 | - $sub_dir = $uploads['subdir']; |
|
| 1581 | + $geodir_uploadpath = $uploads['path']; |
|
| 1582 | + $geodir_uploadurl = $uploads['url']; |
|
| 1583 | + $sub_dir = $uploads['subdir']; |
|
| 1584 | 1584 | |
| 1585 | - $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
|
|
| 1585 | + $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
|
|
| 1586 | 1586 | |
| 1587 | - for ($m = 0; $m < count($post_image); $m++) {
|
|
| 1587 | + for ($m = 0; $m < count($post_image); $m++) {
|
|
| 1588 | 1588 | |
| 1589 | - /* --------- start ------- */ |
|
| 1589 | + /* --------- start ------- */ |
|
| 1590 | 1590 | |
| 1591 | - if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
|
|
| 1591 | + if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
|
|
| 1592 | 1592 | |
| 1593 | 1593 | |
| 1594 | - $curr_img_url = $post_image[$m]; |
|
| 1595 | - $image_name_arr = explode('/', $curr_img_url);
|
|
| 1596 | - $curr_img_dir = $image_name_arr[count($image_name_arr) - 2]; |
|
| 1597 | - $filename = end($image_name_arr); |
|
| 1598 | - $img_name_arr = explode('.', $filename);
|
|
| 1594 | + $curr_img_url = $post_image[$m]; |
|
| 1595 | + $image_name_arr = explode('/', $curr_img_url);
|
|
| 1596 | + $curr_img_dir = $image_name_arr[count($image_name_arr) - 2]; |
|
| 1597 | + $filename = end($image_name_arr); |
|
| 1598 | + $img_name_arr = explode('.', $filename);
|
|
| 1599 | 1599 | |
| 1600 | - $arr_file_type = wp_check_filetype($filename); |
|
| 1600 | + $arr_file_type = wp_check_filetype($filename); |
|
| 1601 | 1601 | |
| 1602 | - if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
|
|
| 1603 | - continue; |
|
| 1604 | - } |
|
| 1602 | + if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
|
|
| 1603 | + continue; |
|
| 1604 | + } |
|
| 1605 | 1605 | |
| 1606 | - $uploaded_file_type = $arr_file_type['type']; |
|
| 1607 | - $uploaded_file_ext = $arr_file_type['ext']; |
|
| 1606 | + $uploaded_file_type = $arr_file_type['type']; |
|
| 1607 | + $uploaded_file_ext = $arr_file_type['ext']; |
|
| 1608 | 1608 | |
| 1609 | - if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
|
|
| 1610 | - continue; // Invalid file type. |
|
| 1611 | - } |
|
| 1609 | + if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
|
|
| 1610 | + continue; // Invalid file type. |
|
| 1611 | + } |
|
| 1612 | 1612 | |
| 1613 | - // Set an array containing a list of acceptable formats |
|
| 1614 | - //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
|
|
| 1613 | + // Set an array containing a list of acceptable formats |
|
| 1614 | + //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
|
|
| 1615 | 1615 | |
| 1616 | - if (!function_exists('wp_handle_upload'))
|
|
| 1617 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1616 | + if (!function_exists('wp_handle_upload'))
|
|
| 1617 | + require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1618 | 1618 | |
| 1619 | - if (!is_dir($geodir_uploadpath)) |
|
| 1620 | - mkdir($geodir_uploadpath); |
|
| 1619 | + if (!is_dir($geodir_uploadpath)) |
|
| 1620 | + mkdir($geodir_uploadpath); |
|
| 1621 | 1621 | |
| 1622 | - $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1]; |
|
| 1623 | - $explode_sub_dir = explode("/", $sub_dir);
|
|
| 1624 | - if ($curr_img_dir == end($explode_sub_dir)) {
|
|
| 1625 | - $img_path = $geodir_uploadpath . '/' . $filename; |
|
| 1626 | - $img_url = $geodir_uploadurl . '/' . $filename; |
|
| 1627 | - } else {
|
|
| 1628 | - $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1629 | - $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1630 | - } |
|
| 1622 | + $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1]; |
|
| 1623 | + $explode_sub_dir = explode("/", $sub_dir);
|
|
| 1624 | + if ($curr_img_dir == end($explode_sub_dir)) {
|
|
| 1625 | + $img_path = $geodir_uploadpath . '/' . $filename; |
|
| 1626 | + $img_url = $geodir_uploadurl . '/' . $filename; |
|
| 1627 | + } else {
|
|
| 1628 | + $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1629 | + $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1630 | + } |
|
| 1631 | 1631 | |
| 1632 | - $uploaded_file = ''; |
|
| 1633 | - if (file_exists($img_path)) |
|
| 1634 | - $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); |
|
| 1632 | + $uploaded_file = ''; |
|
| 1633 | + if (file_exists($img_path)) |
|
| 1634 | + $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); |
|
| 1635 | 1635 | |
| 1636 | - if ($curr_img_dir != $geodir_uploaddir) {
|
|
| 1637 | - if (file_exists($img_path)) |
|
| 1638 | - unlink($img_path); |
|
| 1639 | - } |
|
| 1636 | + if ($curr_img_dir != $geodir_uploaddir) {
|
|
| 1637 | + if (file_exists($img_path)) |
|
| 1638 | + unlink($img_path); |
|
| 1639 | + } |
|
| 1640 | 1640 | |
| 1641 | - if (!empty($uploaded_file)) |
|
| 1642 | - $file_urls = $geodir_uploadurl . '/' . $new_name; |
|
| 1641 | + if (!empty($uploaded_file)) |
|
| 1642 | + $file_urls = $geodir_uploadurl . '/' . $new_name; |
|
| 1643 | 1643 | |
| 1644 | - } else {
|
|
| 1645 | - $file_urls = $post_image[$m]; |
|
| 1646 | - } |
|
| 1647 | - } |
|
| 1644 | + } else {
|
|
| 1645 | + $file_urls = $post_image[$m]; |
|
| 1646 | + } |
|
| 1647 | + } |
|
| 1648 | 1648 | |
| 1649 | 1649 | |
| 1650 | - } |
|
| 1650 | + } |
|
| 1651 | 1651 | |
| 1652 | - //Remove all old attachments and temp images |
|
| 1653 | - if (!empty($postcurr_images)) {
|
|
| 1652 | + //Remove all old attachments and temp images |
|
| 1653 | + if (!empty($postcurr_images)) {
|
|
| 1654 | 1654 | |
| 1655 | - if ($file_urls != $postcurr_images) {
|
|
| 1656 | - $invalid_files[] = (object)array('src' => $postcurr_images);
|
|
| 1657 | - $invalid_files = (object)$invalid_files; |
|
| 1658 | - } |
|
| 1659 | - } |
|
| 1655 | + if ($file_urls != $postcurr_images) {
|
|
| 1656 | + $invalid_files[] = (object)array('src' => $postcurr_images);
|
|
| 1657 | + $invalid_files = (object)$invalid_files; |
|
| 1658 | + } |
|
| 1659 | + } |
|
| 1660 | 1660 | |
| 1661 | - geodir_save_post_meta($post_id, $field_id, $file_urls); |
|
| 1661 | + geodir_save_post_meta($post_id, $field_id, $file_urls); |
|
| 1662 | 1662 | |
| 1663 | - if (!empty($invalid_files)) |
|
| 1664 | - geodir_remove_attachments($invalid_files); |
|
| 1663 | + if (!empty($invalid_files)) |
|
| 1664 | + geodir_remove_attachments($invalid_files); |
|
| 1665 | 1665 | |
| 1666 | - } |
|
| 1666 | + } |
|
| 1667 | 1667 | } |
| 1668 | 1668 | |
| 1669 | 1669 | |
@@ -1678,76 +1678,76 @@ discard block |
||
| 1678 | 1678 | */ |
| 1679 | 1679 | function geodir_custom_upload_mimes($existing_mimes = array()) |
| 1680 | 1680 | {
|
| 1681 | - $existing_mimes['wif'] = 'text/plain'; |
|
| 1682 | - $existing_mimes['jpg|jpeg'] = 'image/jpeg'; |
|
| 1683 | - $existing_mimes['gif'] = 'image/gif'; |
|
| 1684 | - $existing_mimes['png'] = 'image/png'; |
|
| 1685 | - $existing_mimes['pdf'] = 'application/pdf'; |
|
| 1686 | - $existing_mimes['txt'] = 'text/text'; |
|
| 1687 | - $existing_mimes['csv'] = 'application/octet-stream'; |
|
| 1688 | - $existing_mimes['doc'] = 'application/msword'; |
|
| 1689 | - $existing_mimes['xla|xls|xlt|xlw'] = 'application/vnd.ms-excel'; |
|
| 1690 | - $existing_mimes['docx'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; |
|
| 1691 | - $existing_mimes['xlsx'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; |
|
| 1692 | - return $existing_mimes; |
|
| 1681 | + $existing_mimes['wif'] = 'text/plain'; |
|
| 1682 | + $existing_mimes['jpg|jpeg'] = 'image/jpeg'; |
|
| 1683 | + $existing_mimes['gif'] = 'image/gif'; |
|
| 1684 | + $existing_mimes['png'] = 'image/png'; |
|
| 1685 | + $existing_mimes['pdf'] = 'application/pdf'; |
|
| 1686 | + $existing_mimes['txt'] = 'text/text'; |
|
| 1687 | + $existing_mimes['csv'] = 'application/octet-stream'; |
|
| 1688 | + $existing_mimes['doc'] = 'application/msword'; |
|
| 1689 | + $existing_mimes['xla|xls|xlt|xlw'] = 'application/vnd.ms-excel'; |
|
| 1690 | + $existing_mimes['docx'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; |
|
| 1691 | + $existing_mimes['xlsx'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; |
|
| 1692 | + return $existing_mimes; |
|
| 1693 | 1693 | } |
| 1694 | 1694 | |
| 1695 | 1695 | if (!function_exists('geodir_plupload_action')) {
|
| 1696 | 1696 | |
| 1697 | - /** |
|
| 1698 | - * Get upload directory path details |
|
| 1699 | - * |
|
| 1700 | - * @since 1.0.0 |
|
| 1701 | - * @package GeoDirectory |
|
| 1702 | - * @global object $current_user Current user object. |
|
| 1703 | - * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'. |
|
| 1704 | - * @return mixed Returns upload directory details as an array. |
|
| 1705 | - */ |
|
| 1706 | - function geodir_upload_dir($upload) |
|
| 1707 | - {
|
|
| 1708 | - global $current_user; |
|
| 1709 | - $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID; |
|
| 1710 | - $upload['path'] = $upload['basedir'] . $upload['subdir']; |
|
| 1711 | - $upload['url'] = $upload['baseurl'] . $upload['subdir']; |
|
| 1712 | - return $upload; |
|
| 1713 | - } |
|
| 1714 | - |
|
| 1715 | - /** |
|
| 1716 | - * Handles place file and image upload. |
|
| 1717 | - * |
|
| 1718 | - * @since 1.0.0 |
|
| 1719 | - * @package GeoDirectory |
|
| 1720 | - */ |
|
| 1721 | - function geodir_plupload_action() |
|
| 1722 | - {
|
|
| 1723 | - // check ajax nonce |
|
| 1724 | - $imgid = $_POST["imgid"]; |
|
| 1725 | - |
|
| 1726 | - check_ajax_referer($imgid . 'pluploadan'); |
|
| 1727 | - |
|
| 1728 | - // handle custom file uploaddir |
|
| 1729 | - add_filter('upload_dir', 'geodir_upload_dir');
|
|
| 1730 | - |
|
| 1731 | - // change file orientation if needed |
|
| 1732 | - $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']); |
|
| 1733 | - |
|
| 1734 | - // handle file upload |
|
| 1735 | - $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));
|
|
| 1736 | - // remove handle custom file uploaddir |
|
| 1737 | - remove_filter('upload_dir', 'geodir_upload_dir');
|
|
| 1738 | - |
|
| 1739 | - if(!isset($status['url']) && isset($status['error'])){
|
|
| 1740 | - print_r($status); |
|
| 1741 | - } |
|
| 1742 | - |
|
| 1743 | - // send the uploaded file url in response |
|
| 1744 | - if (isset($status['url'])) {
|
|
| 1745 | - echo $status['url']; |
|
| 1746 | - } else {
|
|
| 1747 | - echo 'x'; |
|
| 1748 | - } |
|
| 1749 | - exit; |
|
| 1750 | - } |
|
| 1697 | + /** |
|
| 1698 | + * Get upload directory path details |
|
| 1699 | + * |
|
| 1700 | + * @since 1.0.0 |
|
| 1701 | + * @package GeoDirectory |
|
| 1702 | + * @global object $current_user Current user object. |
|
| 1703 | + * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'. |
|
| 1704 | + * @return mixed Returns upload directory details as an array. |
|
| 1705 | + */ |
|
| 1706 | + function geodir_upload_dir($upload) |
|
| 1707 | + {
|
|
| 1708 | + global $current_user; |
|
| 1709 | + $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID; |
|
| 1710 | + $upload['path'] = $upload['basedir'] . $upload['subdir']; |
|
| 1711 | + $upload['url'] = $upload['baseurl'] . $upload['subdir']; |
|
| 1712 | + return $upload; |
|
| 1713 | + } |
|
| 1714 | + |
|
| 1715 | + /** |
|
| 1716 | + * Handles place file and image upload. |
|
| 1717 | + * |
|
| 1718 | + * @since 1.0.0 |
|
| 1719 | + * @package GeoDirectory |
|
| 1720 | + */ |
|
| 1721 | + function geodir_plupload_action() |
|
| 1722 | + {
|
|
| 1723 | + // check ajax nonce |
|
| 1724 | + $imgid = $_POST["imgid"]; |
|
| 1725 | + |
|
| 1726 | + check_ajax_referer($imgid . 'pluploadan'); |
|
| 1727 | + |
|
| 1728 | + // handle custom file uploaddir |
|
| 1729 | + add_filter('upload_dir', 'geodir_upload_dir');
|
|
| 1730 | + |
|
| 1731 | + // change file orientation if needed |
|
| 1732 | + $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']); |
|
| 1733 | + |
|
| 1734 | + // handle file upload |
|
| 1735 | + $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));
|
|
| 1736 | + // remove handle custom file uploaddir |
|
| 1737 | + remove_filter('upload_dir', 'geodir_upload_dir');
|
|
| 1738 | + |
|
| 1739 | + if(!isset($status['url']) && isset($status['error'])){
|
|
| 1740 | + print_r($status); |
|
| 1741 | + } |
|
| 1742 | + |
|
| 1743 | + // send the uploaded file url in response |
|
| 1744 | + if (isset($status['url'])) {
|
|
| 1745 | + echo $status['url']; |
|
| 1746 | + } else {
|
|
| 1747 | + echo 'x'; |
|
| 1748 | + } |
|
| 1749 | + exit; |
|
| 1750 | + } |
|
| 1751 | 1751 | } |
| 1752 | 1752 | |
| 1753 | 1753 | /** |
@@ -1762,17 +1762,17 @@ discard block |
||
| 1762 | 1762 | */ |
| 1763 | 1763 | function geodir_get_video($post_id) |
| 1764 | 1764 | {
|
| 1765 | - global $wpdb, $plugin_prefix; |
|
| 1765 | + global $wpdb, $plugin_prefix; |
|
| 1766 | 1766 | |
| 1767 | - $post_type = get_post_type($post_id); |
|
| 1767 | + $post_type = get_post_type($post_id); |
|
| 1768 | 1768 | |
| 1769 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1769 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1770 | 1770 | |
| 1771 | - $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));
|
|
| 1771 | + $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));
|
|
| 1772 | 1772 | |
| 1773 | - if ($results) {
|
|
| 1774 | - return $results[0]->geodir_video; |
|
| 1775 | - } |
|
| 1773 | + if ($results) {
|
|
| 1774 | + return $results[0]->geodir_video; |
|
| 1775 | + } |
|
| 1776 | 1776 | |
| 1777 | 1777 | } |
| 1778 | 1778 | |
@@ -1788,40 +1788,40 @@ discard block |
||
| 1788 | 1788 | */ |
| 1789 | 1789 | function geodir_get_special_offers($post_id) |
| 1790 | 1790 | {
|
| 1791 | - global $wpdb, $plugin_prefix; |
|
| 1791 | + global $wpdb, $plugin_prefix; |
|
| 1792 | 1792 | |
| 1793 | - $post_type = get_post_type($post_id); |
|
| 1793 | + $post_type = get_post_type($post_id); |
|
| 1794 | 1794 | |
| 1795 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1795 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1796 | 1796 | |
| 1797 | - $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));
|
|
| 1797 | + $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));
|
|
| 1798 | 1798 | |
| 1799 | - if ($results) {
|
|
| 1800 | - return $results[0]->geodir_special_offers; |
|
| 1801 | - } |
|
| 1799 | + if ($results) {
|
|
| 1800 | + return $results[0]->geodir_special_offers; |
|
| 1801 | + } |
|
| 1802 | 1802 | |
| 1803 | 1803 | } |
| 1804 | 1804 | |
| 1805 | 1805 | if (!function_exists('geodir_max_upload_size')) {
|
| 1806 | - /** |
|
| 1807 | - * Get max upload file size |
|
| 1808 | - * |
|
| 1809 | - * @since 1.0.0 |
|
| 1810 | - * @package GeoDirectory |
|
| 1811 | - * @return mixed|void Returns max upload file size. |
|
| 1812 | - */ |
|
| 1813 | - function geodir_max_upload_size() |
|
| 1814 | - {
|
|
| 1815 | - $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);
|
|
| 1816 | - |
|
| 1817 | - if ($max_filesize > 0 && $max_filesize < 1) {
|
|
| 1818 | - $max_filesize = (int)($max_filesize * 1024) . 'kb'; |
|
| 1819 | - } else {
|
|
| 1820 | - $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb'; |
|
| 1821 | - } |
|
| 1822 | - /** Filter documented in geodirectory-functions/general_functions.php **/ |
|
| 1823 | - return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
|
|
| 1824 | - } |
|
| 1806 | + /** |
|
| 1807 | + * Get max upload file size |
|
| 1808 | + * |
|
| 1809 | + * @since 1.0.0 |
|
| 1810 | + * @package GeoDirectory |
|
| 1811 | + * @return mixed|void Returns max upload file size. |
|
| 1812 | + */ |
|
| 1813 | + function geodir_max_upload_size() |
|
| 1814 | + {
|
|
| 1815 | + $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);
|
|
| 1816 | + |
|
| 1817 | + if ($max_filesize > 0 && $max_filesize < 1) {
|
|
| 1818 | + $max_filesize = (int)($max_filesize * 1024) . 'kb'; |
|
| 1819 | + } else {
|
|
| 1820 | + $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb'; |
|
| 1821 | + } |
|
| 1822 | + /** Filter documented in geodirectory-functions/general_functions.php **/ |
|
| 1823 | + return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
|
|
| 1824 | + } |
|
| 1825 | 1825 | } |
| 1826 | 1826 | |
| 1827 | 1827 | |
@@ -1839,33 +1839,33 @@ discard block |
||
| 1839 | 1839 | */ |
| 1840 | 1840 | function geodir_add_custom_sort_options($fields, $post_type) |
| 1841 | 1841 | {
|
| 1842 | - global $wpdb; |
|
| 1842 | + global $wpdb; |
|
| 1843 | 1843 | |
| 1844 | - if ($post_type != '') {
|
|
| 1844 | + if ($post_type != '') {
|
|
| 1845 | 1845 | |
| 1846 | - $all_postypes = geodir_get_posttypes(); |
|
| 1846 | + $all_postypes = geodir_get_posttypes(); |
|
| 1847 | 1847 | |
| 1848 | - if (in_array($post_type, $all_postypes)) {
|
|
| 1848 | + if (in_array($post_type, $all_postypes)) {
|
|
| 1849 | 1849 | |
| 1850 | - $custom_fields = $wpdb->get_results( |
|
| 1851 | - $wpdb->prepare( |
|
| 1852 | - "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc", |
|
| 1853 | - array($post_type) |
|
| 1854 | - ), 'ARRAY_A' |
|
| 1855 | - ); |
|
| 1850 | + $custom_fields = $wpdb->get_results( |
|
| 1851 | + $wpdb->prepare( |
|
| 1852 | + "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc", |
|
| 1853 | + array($post_type) |
|
| 1854 | + ), 'ARRAY_A' |
|
| 1855 | + ); |
|
| 1856 | 1856 | |
| 1857 | - if (!empty($custom_fields)) {
|
|
| 1857 | + if (!empty($custom_fields)) {
|
|
| 1858 | 1858 | |
| 1859 | - foreach ($custom_fields as $val) {
|
|
| 1860 | - $fields[] = $val; |
|
| 1861 | - } |
|
| 1862 | - } |
|
| 1859 | + foreach ($custom_fields as $val) {
|
|
| 1860 | + $fields[] = $val; |
|
| 1861 | + } |
|
| 1862 | + } |
|
| 1863 | 1863 | |
| 1864 | - } |
|
| 1864 | + } |
|
| 1865 | 1865 | |
| 1866 | - } |
|
| 1866 | + } |
|
| 1867 | 1867 | |
| 1868 | - return $fields; |
|
| 1868 | + return $fields; |
|
| 1869 | 1869 | } |
| 1870 | 1870 | |
| 1871 | 1871 | |
@@ -1881,76 +1881,76 @@ discard block |
||
| 1881 | 1881 | function geodir_get_custom_sort_options($post_type = '') |
| 1882 | 1882 | {
|
| 1883 | 1883 | |
| 1884 | - global $wpdb; |
|
| 1885 | - |
|
| 1886 | - if ($post_type != '') {
|
|
| 1887 | - |
|
| 1888 | - $all_postypes = geodir_get_posttypes(); |
|
| 1889 | - |
|
| 1890 | - if (!in_array($post_type, $all_postypes)) |
|
| 1891 | - return false; |
|
| 1892 | - |
|
| 1893 | - $fields = array(); |
|
| 1894 | - |
|
| 1895 | - $fields[] = array( |
|
| 1896 | - 'post_type' => $post_type, |
|
| 1897 | - 'data_type' => '', |
|
| 1898 | - 'field_type' => 'random', |
|
| 1899 | - 'site_title' => 'Random', |
|
| 1900 | - 'htmlvar_name' => 'post_title', |
|
| 1901 | - 'field_icon' => 'fa fa-random', |
|
| 1902 | - 'description' => __('Random sort (not recommended for large sites)', 'geodirectory')
|
|
| 1903 | - ); |
|
| 1904 | - |
|
| 1905 | - $fields[] = array( |
|
| 1906 | - 'post_type' => $post_type, |
|
| 1907 | - 'data_type' => '', |
|
| 1908 | - 'field_type' => 'datetime', |
|
| 1909 | - 'site_title' => __('Add date', 'geodirectory'),
|
|
| 1910 | - 'htmlvar_name' => 'post_date', |
|
| 1911 | - 'field_icon' => 'fa fa-calendar', |
|
| 1912 | - 'description' => __('Sort by date added', 'geodirectory')
|
|
| 1913 | - ); |
|
| 1914 | - $fields[] = array( |
|
| 1915 | - 'post_type' => $post_type, |
|
| 1916 | - 'data_type' => '', |
|
| 1917 | - 'field_type' => 'bigint', |
|
| 1918 | - 'site_title' => __('Review', 'geodirectory'),
|
|
| 1919 | - 'htmlvar_name' => 'comment_count', |
|
| 1920 | - 'field_icon' => 'fa fa-commenting-o', |
|
| 1921 | - 'description' => __('Sort by the number of reviews', 'geodirectory')
|
|
| 1922 | - ); |
|
| 1923 | - $fields[] = array( |
|
| 1924 | - 'post_type' => $post_type, |
|
| 1925 | - 'data_type' => '', |
|
| 1926 | - 'field_type' => 'float', |
|
| 1927 | - 'site_title' => __('Rating', 'geodirectory'),
|
|
| 1928 | - 'htmlvar_name' => 'overall_rating', |
|
| 1929 | - 'field_icon' => 'fa fa-star-o', |
|
| 1930 | - 'description' => __('Sort by the overall rating value', 'geodirectory')
|
|
| 1931 | - ); |
|
| 1932 | - $fields[] = array( |
|
| 1933 | - 'post_type' => $post_type, |
|
| 1934 | - 'data_type' => '', |
|
| 1935 | - 'field_type' => 'text', |
|
| 1936 | - 'site_title' => __('Title', 'geodirectory'),
|
|
| 1937 | - 'htmlvar_name' => 'post_title', |
|
| 1938 | - 'field_icon' => 'fa fa-sort-alpha-desc', |
|
| 1939 | - 'description' => __('Sort alphabetically by title', 'geodirectory')
|
|
| 1940 | - ); |
|
| 1941 | - |
|
| 1942 | - /** |
|
| 1943 | - * Hook to add custom sort options. |
|
| 1944 | - * |
|
| 1945 | - * @since 1.0.0 |
|
| 1946 | - * @param array $fields Unmodified sort options array. |
|
| 1947 | - * @param string $post_type Post type. |
|
| 1948 | - */ |
|
| 1949 | - return $fields = apply_filters('geodir_add_custom_sort_options', $fields, $post_type);
|
|
| 1950 | - |
|
| 1951 | - } |
|
| 1952 | - |
|
| 1953 | - return false; |
|
| 1884 | + global $wpdb; |
|
| 1885 | + |
|
| 1886 | + if ($post_type != '') {
|
|
| 1887 | + |
|
| 1888 | + $all_postypes = geodir_get_posttypes(); |
|
| 1889 | + |
|
| 1890 | + if (!in_array($post_type, $all_postypes)) |
|
| 1891 | + return false; |
|
| 1892 | + |
|
| 1893 | + $fields = array(); |
|
| 1894 | + |
|
| 1895 | + $fields[] = array( |
|
| 1896 | + 'post_type' => $post_type, |
|
| 1897 | + 'data_type' => '', |
|
| 1898 | + 'field_type' => 'random', |
|
| 1899 | + 'site_title' => 'Random', |
|
| 1900 | + 'htmlvar_name' => 'post_title', |
|
| 1901 | + 'field_icon' => 'fa fa-random', |
|
| 1902 | + 'description' => __('Random sort (not recommended for large sites)', 'geodirectory')
|
|
| 1903 | + ); |
|
| 1904 | + |
|
| 1905 | + $fields[] = array( |
|
| 1906 | + 'post_type' => $post_type, |
|
| 1907 | + 'data_type' => '', |
|
| 1908 | + 'field_type' => 'datetime', |
|
| 1909 | + 'site_title' => __('Add date', 'geodirectory'),
|
|
| 1910 | + 'htmlvar_name' => 'post_date', |
|
| 1911 | + 'field_icon' => 'fa fa-calendar', |
|
| 1912 | + 'description' => __('Sort by date added', 'geodirectory')
|
|
| 1913 | + ); |
|
| 1914 | + $fields[] = array( |
|
| 1915 | + 'post_type' => $post_type, |
|
| 1916 | + 'data_type' => '', |
|
| 1917 | + 'field_type' => 'bigint', |
|
| 1918 | + 'site_title' => __('Review', 'geodirectory'),
|
|
| 1919 | + 'htmlvar_name' => 'comment_count', |
|
| 1920 | + 'field_icon' => 'fa fa-commenting-o', |
|
| 1921 | + 'description' => __('Sort by the number of reviews', 'geodirectory')
|
|
| 1922 | + ); |
|
| 1923 | + $fields[] = array( |
|
| 1924 | + 'post_type' => $post_type, |
|
| 1925 | + 'data_type' => '', |
|
| 1926 | + 'field_type' => 'float', |
|
| 1927 | + 'site_title' => __('Rating', 'geodirectory'),
|
|
| 1928 | + 'htmlvar_name' => 'overall_rating', |
|
| 1929 | + 'field_icon' => 'fa fa-star-o', |
|
| 1930 | + 'description' => __('Sort by the overall rating value', 'geodirectory')
|
|
| 1931 | + ); |
|
| 1932 | + $fields[] = array( |
|
| 1933 | + 'post_type' => $post_type, |
|
| 1934 | + 'data_type' => '', |
|
| 1935 | + 'field_type' => 'text', |
|
| 1936 | + 'site_title' => __('Title', 'geodirectory'),
|
|
| 1937 | + 'htmlvar_name' => 'post_title', |
|
| 1938 | + 'field_icon' => 'fa fa-sort-alpha-desc', |
|
| 1939 | + 'description' => __('Sort alphabetically by title', 'geodirectory')
|
|
| 1940 | + ); |
|
| 1941 | + |
|
| 1942 | + /** |
|
| 1943 | + * Hook to add custom sort options. |
|
| 1944 | + * |
|
| 1945 | + * @since 1.0.0 |
|
| 1946 | + * @param array $fields Unmodified sort options array. |
|
| 1947 | + * @param string $post_type Post type. |
|
| 1948 | + */ |
|
| 1949 | + return $fields = apply_filters('geodir_add_custom_sort_options', $fields, $post_type);
|
|
| 1950 | + |
|
| 1951 | + } |
|
| 1952 | + |
|
| 1953 | + return false; |
|
| 1954 | 1954 | } |
| 1955 | 1955 | |
| 1956 | 1956 | |
@@ -1966,117 +1966,117 @@ discard block |
||
| 1966 | 1966 | function godir_set_sort_field_order($field_ids = array()) |
| 1967 | 1967 | {
|
| 1968 | 1968 | |
| 1969 | - global $wpdb; |
|
| 1969 | + global $wpdb; |
|
| 1970 | 1970 | |
| 1971 | - $count = 0; |
|
| 1972 | - if (!empty($field_ids)): |
|
| 1973 | - foreach ($field_ids as $id) {
|
|
| 1971 | + $count = 0; |
|
| 1972 | + if (!empty($field_ids)): |
|
| 1973 | + foreach ($field_ids as $id) {
|
|
| 1974 | 1974 | |
| 1975 | - $cf = trim($id, '_'); |
|
| 1975 | + $cf = trim($id, '_'); |
|
| 1976 | 1976 | |
| 1977 | - $post_meta_info = $wpdb->query( |
|
| 1978 | - $wpdb->prepare( |
|
| 1979 | - "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 1977 | + $post_meta_info = $wpdb->query( |
|
| 1978 | + $wpdb->prepare( |
|
| 1979 | + "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 1980 | 1980 | sort_order=%d |
| 1981 | 1981 | where id= %d", |
| 1982 | - array($count, $cf) |
|
| 1983 | - ) |
|
| 1984 | - ); |
|
| 1985 | - $count++; |
|
| 1986 | - } |
|
| 1987 | - |
|
| 1988 | - return $field_ids; |
|
| 1989 | - else: |
|
| 1990 | - return false; |
|
| 1991 | - endif; |
|
| 1982 | + array($count, $cf) |
|
| 1983 | + ) |
|
| 1984 | + ); |
|
| 1985 | + $count++; |
|
| 1986 | + } |
|
| 1987 | + |
|
| 1988 | + return $field_ids; |
|
| 1989 | + else: |
|
| 1990 | + return false; |
|
| 1991 | + endif; |
|
| 1992 | 1992 | } |
| 1993 | 1993 | |
| 1994 | 1994 | |
| 1995 | 1995 | if (!function_exists('geodir_custom_sort_field_save')) {
|
| 1996 | - /** |
|
| 1997 | - * Save or Update custom sort fields into the database. |
|
| 1998 | - * |
|
| 1999 | - * @since 1.0.0 |
|
| 2000 | - * @package GeoDirectory |
|
| 2001 | - * @global object $wpdb WordPress Database object. |
|
| 2002 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2003 | - * @param array $request_field {
|
|
| 2004 | - * Attributes of the Request field. |
|
| 2005 | - * |
|
| 2006 | - * @type string $action Ajax action name. |
|
| 2007 | - * @type string $manage_field_type Manage field type Default "sorting_options". |
|
| 2008 | - * @type string $create_field Do you want to create this field?. |
|
| 2009 | - * @type string $field_ins_upd Field created or updated?. |
|
| 2010 | - * @type string $_wpnonce Nonce value. |
|
| 2011 | - * @type string $listing_type The Post type. |
|
| 2012 | - * @type string $field_type Field Type. |
|
| 2013 | - * @type string $field_id Field ID. |
|
| 2014 | - * @type string $data_type Data Type. |
|
| 2015 | - * @type string $htmlvar_name HTML variable name. |
|
| 2016 | - * @type string $site_title Section title which you wish to display in frontend. |
|
| 2017 | - * @type string $is_default Is this default sorting?. |
|
| 2018 | - * @type string $is_active If not active then the field will not be displayed anywhere. |
|
| 2019 | - * @type string $sort_order Sort Order. |
|
| 2020 | - * |
|
| 2021 | - * } |
|
| 2022 | - * @param bool $default Not yet implemented. |
|
| 2023 | - * @return int Returns the last affected db table row id. |
|
| 2024 | - */ |
|
| 2025 | - function geodir_custom_sort_field_save($request_field = array(), $default = false) |
|
| 2026 | - {
|
|
| 2027 | - |
|
| 2028 | - global $wpdb, $plugin_prefix; |
|
| 2029 | - |
|
| 2030 | - $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : ''; |
|
| 2031 | - |
|
| 2032 | - $cf = trim($result_str, '_'); |
|
| 2033 | - |
|
| 2034 | - /*-------- check duplicate validation --------*/ |
|
| 2035 | - |
|
| 2036 | - $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : ''; |
|
| 2037 | - $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; |
|
| 2038 | - |
|
| 2039 | - $post_type = $request_field['listing_type']; |
|
| 2040 | - $data_type = isset($request_field['data_type']) ? $request_field['data_type'] : ''; |
|
| 2041 | - $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : ''; |
|
| 2042 | - $site_title = isset($request_field['site_title']) ? $request_field['site_title'] : ''; |
|
| 2043 | - $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; |
|
| 2044 | - $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : 0; |
|
| 2045 | - $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : 0; |
|
| 2046 | - $is_default = isset($request_field['is_default']) ? $request_field['is_default'] : ''; |
|
| 2047 | - $asc = isset($request_field['asc']) ? $request_field['asc'] : 0; |
|
| 2048 | - $desc = isset($request_field['desc']) ? $request_field['desc'] : 0; |
|
| 2049 | - $asc_title = isset($request_field['asc_title']) ? $request_field['asc_title'] : ''; |
|
| 2050 | - $desc_title = isset($request_field['desc_title']) ? $request_field['desc_title'] : ''; |
|
| 2051 | - |
|
| 2052 | - $default_order = ''; |
|
| 2053 | - if ($is_default != '') {
|
|
| 2054 | - $default_order = $is_default; |
|
| 2055 | - $is_default = '1'; |
|
| 2056 | - } |
|
| 2057 | - |
|
| 2058 | - |
|
| 2059 | - $check_html_variable = $wpdb->get_var( |
|
| 2060 | - $wpdb->prepare( |
|
| 2061 | - "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ", |
|
| 2062 | - array($cehhtmlvar_name, $post_type, $field_type) |
|
| 2063 | - ) |
|
| 2064 | - ); |
|
| 2065 | - |
|
| 2066 | - if ($is_default == 1) {
|
|
| 2067 | - |
|
| 2068 | - $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));
|
|
| 2069 | - |
|
| 2070 | - } |
|
| 2071 | - |
|
| 2072 | - |
|
| 2073 | - if (!$check_html_variable) {
|
|
| 2074 | - |
|
| 2075 | - $wpdb->query( |
|
| 2076 | - |
|
| 2077 | - $wpdb->prepare( |
|
| 2078 | - |
|
| 2079 | - "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 1996 | + /** |
|
| 1997 | + * Save or Update custom sort fields into the database. |
|
| 1998 | + * |
|
| 1999 | + * @since 1.0.0 |
|
| 2000 | + * @package GeoDirectory |
|
| 2001 | + * @global object $wpdb WordPress Database object. |
|
| 2002 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2003 | + * @param array $request_field {
|
|
| 2004 | + * Attributes of the Request field. |
|
| 2005 | + * |
|
| 2006 | + * @type string $action Ajax action name. |
|
| 2007 | + * @type string $manage_field_type Manage field type Default "sorting_options". |
|
| 2008 | + * @type string $create_field Do you want to create this field?. |
|
| 2009 | + * @type string $field_ins_upd Field created or updated?. |
|
| 2010 | + * @type string $_wpnonce Nonce value. |
|
| 2011 | + * @type string $listing_type The Post type. |
|
| 2012 | + * @type string $field_type Field Type. |
|
| 2013 | + * @type string $field_id Field ID. |
|
| 2014 | + * @type string $data_type Data Type. |
|
| 2015 | + * @type string $htmlvar_name HTML variable name. |
|
| 2016 | + * @type string $site_title Section title which you wish to display in frontend. |
|
| 2017 | + * @type string $is_default Is this default sorting?. |
|
| 2018 | + * @type string $is_active If not active then the field will not be displayed anywhere. |
|
| 2019 | + * @type string $sort_order Sort Order. |
|
| 2020 | + * |
|
| 2021 | + * } |
|
| 2022 | + * @param bool $default Not yet implemented. |
|
| 2023 | + * @return int Returns the last affected db table row id. |
|
| 2024 | + */ |
|
| 2025 | + function geodir_custom_sort_field_save($request_field = array(), $default = false) |
|
| 2026 | + {
|
|
| 2027 | + |
|
| 2028 | + global $wpdb, $plugin_prefix; |
|
| 2029 | + |
|
| 2030 | + $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : ''; |
|
| 2031 | + |
|
| 2032 | + $cf = trim($result_str, '_'); |
|
| 2033 | + |
|
| 2034 | + /*-------- check duplicate validation --------*/ |
|
| 2035 | + |
|
| 2036 | + $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : ''; |
|
| 2037 | + $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; |
|
| 2038 | + |
|
| 2039 | + $post_type = $request_field['listing_type']; |
|
| 2040 | + $data_type = isset($request_field['data_type']) ? $request_field['data_type'] : ''; |
|
| 2041 | + $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : ''; |
|
| 2042 | + $site_title = isset($request_field['site_title']) ? $request_field['site_title'] : ''; |
|
| 2043 | + $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; |
|
| 2044 | + $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : 0; |
|
| 2045 | + $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : 0; |
|
| 2046 | + $is_default = isset($request_field['is_default']) ? $request_field['is_default'] : ''; |
|
| 2047 | + $asc = isset($request_field['asc']) ? $request_field['asc'] : 0; |
|
| 2048 | + $desc = isset($request_field['desc']) ? $request_field['desc'] : 0; |
|
| 2049 | + $asc_title = isset($request_field['asc_title']) ? $request_field['asc_title'] : ''; |
|
| 2050 | + $desc_title = isset($request_field['desc_title']) ? $request_field['desc_title'] : ''; |
|
| 2051 | + |
|
| 2052 | + $default_order = ''; |
|
| 2053 | + if ($is_default != '') {
|
|
| 2054 | + $default_order = $is_default; |
|
| 2055 | + $is_default = '1'; |
|
| 2056 | + } |
|
| 2057 | + |
|
| 2058 | + |
|
| 2059 | + $check_html_variable = $wpdb->get_var( |
|
| 2060 | + $wpdb->prepare( |
|
| 2061 | + "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ", |
|
| 2062 | + array($cehhtmlvar_name, $post_type, $field_type) |
|
| 2063 | + ) |
|
| 2064 | + ); |
|
| 2065 | + |
|
| 2066 | + if ($is_default == 1) {
|
|
| 2067 | + |
|
| 2068 | + $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));
|
|
| 2069 | + |
|
| 2070 | + } |
|
| 2071 | + |
|
| 2072 | + |
|
| 2073 | + if (!$check_html_variable) {
|
|
| 2074 | + |
|
| 2075 | + $wpdb->query( |
|
| 2076 | + |
|
| 2077 | + $wpdb->prepare( |
|
| 2078 | + |
|
| 2079 | + "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 2080 | 2080 | post_type = %s, |
| 2081 | 2081 | data_type = %s, |
| 2082 | 2082 | field_type = %s, |
@@ -2091,23 +2091,23 @@ discard block |
||
| 2091 | 2091 | asc_title = %s, |
| 2092 | 2092 | desc_title = %s", |
| 2093 | 2093 | |
| 2094 | - array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title) |
|
| 2095 | - ) |
|
| 2094 | + array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title) |
|
| 2095 | + ) |
|
| 2096 | 2096 | |
| 2097 | - ); |
|
| 2097 | + ); |
|
| 2098 | 2098 | |
| 2099 | 2099 | |
| 2100 | - $lastid = $wpdb->insert_id; |
|
| 2100 | + $lastid = $wpdb->insert_id; |
|
| 2101 | 2101 | |
| 2102 | - $lastid = trim($lastid); |
|
| 2102 | + $lastid = trim($lastid); |
|
| 2103 | 2103 | |
| 2104 | - } else {
|
|
| 2104 | + } else {
|
|
| 2105 | 2105 | |
| 2106 | - $wpdb->query( |
|
| 2106 | + $wpdb->query( |
|
| 2107 | 2107 | |
| 2108 | - $wpdb->prepare( |
|
| 2108 | + $wpdb->prepare( |
|
| 2109 | 2109 | |
| 2110 | - "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 2110 | + "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 2111 | 2111 | post_type = %s, |
| 2112 | 2112 | data_type = %s, |
| 2113 | 2113 | field_type = %s, |
@@ -2123,123 +2123,123 @@ discard block |
||
| 2123 | 2123 | desc_title = %s |
| 2124 | 2124 | where id = %d", |
| 2125 | 2125 | |
| 2126 | - array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title, $cf) |
|
| 2127 | - ) |
|
| 2126 | + array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title, $cf) |
|
| 2127 | + ) |
|
| 2128 | 2128 | |
| 2129 | - ); |
|
| 2129 | + ); |
|
| 2130 | 2130 | |
| 2131 | - $lastid = trim($cf); |
|
| 2131 | + $lastid = trim($cf); |
|
| 2132 | 2132 | |
| 2133 | - } |
|
| 2133 | + } |
|
| 2134 | 2134 | |
| 2135 | 2135 | |
| 2136 | - return (int)$lastid; |
|
| 2136 | + return (int)$lastid; |
|
| 2137 | 2137 | |
| 2138 | - } |
|
| 2138 | + } |
|
| 2139 | 2139 | } |
| 2140 | 2140 | |
| 2141 | 2141 | |
| 2142 | 2142 | if (!function_exists('geodir_custom_sort_field_delete')) {
|
| 2143 | - /** |
|
| 2144 | - * Delete a custom sort field using field id. |
|
| 2145 | - * @since 1.0.0 |
|
| 2146 | - * @package GeoDirectory |
|
| 2147 | - * @global object $wpdb WordPress Database object. |
|
| 2148 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2149 | - * @param string $field_id The field ID. |
|
| 2150 | - * @return int|string Returns field id when successful deletion, else returns 0. |
|
| 2151 | - */ |
|
| 2152 | - function geodir_custom_sort_field_delete($field_id = '') |
|
| 2153 | - {
|
|
| 2154 | - |
|
| 2155 | - global $wpdb, $plugin_prefix; |
|
| 2156 | - if ($field_id != '') {
|
|
| 2157 | - $cf = trim($field_id, '_'); |
|
| 2158 | - |
|
| 2159 | - $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));
|
|
| 2160 | - |
|
| 2161 | - return $field_id; |
|
| 2162 | - |
|
| 2163 | - } else |
|
| 2164 | - return 0; |
|
| 2165 | - |
|
| 2166 | - } |
|
| 2143 | + /** |
|
| 2144 | + * Delete a custom sort field using field id. |
|
| 2145 | + * @since 1.0.0 |
|
| 2146 | + * @package GeoDirectory |
|
| 2147 | + * @global object $wpdb WordPress Database object. |
|
| 2148 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2149 | + * @param string $field_id The field ID. |
|
| 2150 | + * @return int|string Returns field id when successful deletion, else returns 0. |
|
| 2151 | + */ |
|
| 2152 | + function geodir_custom_sort_field_delete($field_id = '') |
|
| 2153 | + {
|
|
| 2154 | + |
|
| 2155 | + global $wpdb, $plugin_prefix; |
|
| 2156 | + if ($field_id != '') {
|
|
| 2157 | + $cf = trim($field_id, '_'); |
|
| 2158 | + |
|
| 2159 | + $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));
|
|
| 2160 | + |
|
| 2161 | + return $field_id; |
|
| 2162 | + |
|
| 2163 | + } else |
|
| 2164 | + return 0; |
|
| 2165 | + |
|
| 2166 | + } |
|
| 2167 | 2167 | } |
| 2168 | 2168 | |
| 2169 | 2169 | |
| 2170 | 2170 | if (!function_exists('geodir_custom_sort_field_adminhtml')) {
|
| 2171 | - /** |
|
| 2172 | - * Custom sort field admin html. |
|
| 2173 | - * |
|
| 2174 | - * @since 1.0.0 |
|
| 2175 | - * @package GeoDirectory |
|
| 2176 | - * @global object $wpdb WordPress Database object. |
|
| 2177 | - * @param string $field_type The form field type. |
|
| 2178 | - * @param object|int $result_str The custom field results object or row id. |
|
| 2179 | - * @param string $field_ins_upd When set to "submit" displays form. |
|
| 2180 | - * @param bool $default when set to true field will be for admin use only. |
|
| 2181 | - */ |
|
| 2182 | - function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='') |
|
| 2183 | - {
|
|
| 2184 | - global $wpdb; |
|
| 2185 | - $cf = $result_str; |
|
| 2186 | - if (!is_object($cf)) {
|
|
| 2187 | - $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));
|
|
| 2188 | - } else {
|
|
| 2189 | - $field_info = $cf; |
|
| 2190 | - $result_str = $cf->id; |
|
| 2191 | - } |
|
| 2192 | - |
|
| 2193 | - $field_info = stripslashes_deep($field_info); // strip slashes |
|
| 2194 | - |
|
| 2195 | - if (!isset($field_info->post_type)) {
|
|
| 2196 | - $post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2197 | - } else {
|
|
| 2198 | - $post_type = $field_info->post_type; |
|
| 2199 | - } |
|
| 2200 | - |
|
| 2201 | - |
|
| 2202 | - $htmlvar_name = isset($field_type_key) ? $field_type_key : ''; |
|
| 2203 | - |
|
| 2204 | - $site_title = ''; |
|
| 2205 | - if ($site_title == '') |
|
| 2206 | - $site_title = isset($field_info->site_title) ? $field_info->site_title : ''; |
|
| 2207 | - |
|
| 2208 | - if ($site_title == '') {
|
|
| 2209 | - $fields = geodir_get_custom_sort_options($post_type); |
|
| 2210 | - |
|
| 2211 | - foreach ($fields as $val) {
|
|
| 2212 | - $val = stripslashes_deep($val); // strip slashes |
|
| 2213 | - |
|
| 2214 | - if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {
|
|
| 2215 | - $site_title = isset($val['site_title']) ? $val['site_title'] : ''; |
|
| 2216 | - } |
|
| 2217 | - } |
|
| 2218 | - } |
|
| 2219 | - |
|
| 2220 | - if ($htmlvar_name == '') |
|
| 2221 | - $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : ''; |
|
| 2222 | - |
|
| 2223 | - $nonce = wp_create_nonce('custom_fields_' . $result_str);
|
|
| 2224 | - |
|
| 2225 | - $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 2226 | - $cso_arr = geodir_get_custom_sort_options($post_type); |
|
| 2227 | - |
|
| 2228 | - $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']); |
|
| 2229 | - foreach($cso_arr as $cso){
|
|
| 2230 | - if($cur_field_type==$cso['field_type']){
|
|
| 2231 | - |
|
| 2232 | - if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
|
|
| 2233 | - $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>'; |
|
| 2234 | - }elseif(isset($cso['field_icon']) && $cso['field_icon']){
|
|
| 2235 | - $field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';
|
|
| 2236 | - } |
|
| 2237 | - |
|
| 2238 | - } |
|
| 2239 | - } |
|
| 2240 | - |
|
| 2241 | - $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500); |
|
| 2242 | - ?> |
|
| 2171 | + /** |
|
| 2172 | + * Custom sort field admin html. |
|
| 2173 | + * |
|
| 2174 | + * @since 1.0.0 |
|
| 2175 | + * @package GeoDirectory |
|
| 2176 | + * @global object $wpdb WordPress Database object. |
|
| 2177 | + * @param string $field_type The form field type. |
|
| 2178 | + * @param object|int $result_str The custom field results object or row id. |
|
| 2179 | + * @param string $field_ins_upd When set to "submit" displays form. |
|
| 2180 | + * @param bool $default when set to true field will be for admin use only. |
|
| 2181 | + */ |
|
| 2182 | + function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='') |
|
| 2183 | + {
|
|
| 2184 | + global $wpdb; |
|
| 2185 | + $cf = $result_str; |
|
| 2186 | + if (!is_object($cf)) {
|
|
| 2187 | + $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));
|
|
| 2188 | + } else {
|
|
| 2189 | + $field_info = $cf; |
|
| 2190 | + $result_str = $cf->id; |
|
| 2191 | + } |
|
| 2192 | + |
|
| 2193 | + $field_info = stripslashes_deep($field_info); // strip slashes |
|
| 2194 | + |
|
| 2195 | + if (!isset($field_info->post_type)) {
|
|
| 2196 | + $post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2197 | + } else {
|
|
| 2198 | + $post_type = $field_info->post_type; |
|
| 2199 | + } |
|
| 2200 | + |
|
| 2201 | + |
|
| 2202 | + $htmlvar_name = isset($field_type_key) ? $field_type_key : ''; |
|
| 2203 | + |
|
| 2204 | + $site_title = ''; |
|
| 2205 | + if ($site_title == '') |
|
| 2206 | + $site_title = isset($field_info->site_title) ? $field_info->site_title : ''; |
|
| 2207 | + |
|
| 2208 | + if ($site_title == '') {
|
|
| 2209 | + $fields = geodir_get_custom_sort_options($post_type); |
|
| 2210 | + |
|
| 2211 | + foreach ($fields as $val) {
|
|
| 2212 | + $val = stripslashes_deep($val); // strip slashes |
|
| 2213 | + |
|
| 2214 | + if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {
|
|
| 2215 | + $site_title = isset($val['site_title']) ? $val['site_title'] : ''; |
|
| 2216 | + } |
|
| 2217 | + } |
|
| 2218 | + } |
|
| 2219 | + |
|
| 2220 | + if ($htmlvar_name == '') |
|
| 2221 | + $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : ''; |
|
| 2222 | + |
|
| 2223 | + $nonce = wp_create_nonce('custom_fields_' . $result_str);
|
|
| 2224 | + |
|
| 2225 | + $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 2226 | + $cso_arr = geodir_get_custom_sort_options($post_type); |
|
| 2227 | + |
|
| 2228 | + $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']); |
|
| 2229 | + foreach($cso_arr as $cso){
|
|
| 2230 | + if($cur_field_type==$cso['field_type']){
|
|
| 2231 | + |
|
| 2232 | + if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
|
|
| 2233 | + $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>'; |
|
| 2234 | + }elseif(isset($cso['field_icon']) && $cso['field_icon']){
|
|
| 2235 | + $field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';
|
|
| 2236 | + } |
|
| 2237 | + |
|
| 2238 | + } |
|
| 2239 | + } |
|
| 2240 | + |
|
| 2241 | + $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500); |
|
| 2242 | + ?> |
|
| 2243 | 2243 | |
| 2244 | 2244 | <li class="text" id="licontainer_<?php echo $result_str;?>"> |
| 2245 | 2245 | <form><!-- we need to wrap in a form so we can use radio buttons with same name --> |
@@ -2248,7 +2248,7 @@ discard block |
||
| 2248 | 2248 | ondblclick="show_hide('field_frm<?php echo $result_str;?>')">
|
| 2249 | 2249 | <?php |
| 2250 | 2250 | |
| 2251 | - ?> |
|
| 2251 | + ?> |
|
| 2252 | 2252 | |
| 2253 | 2253 | <div title="<?php _e('Click to remove field', 'geodirectory');?>"
|
| 2254 | 2254 | onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"
|
@@ -2263,17 +2263,17 @@ discard block |
||
| 2263 | 2263 | |
| 2264 | 2264 | <div id="field_frm<?php echo $result_str;?>" class="field_frm" |
| 2265 | 2265 | style="display:<?php if ($field_ins_upd == 'submit') {
|
| 2266 | - echo 'block;'; |
|
| 2267 | - } else {
|
|
| 2268 | - echo 'none;'; |
|
| 2269 | - } ?>"> |
|
| 2266 | + echo 'block;'; |
|
| 2267 | + } else {
|
|
| 2268 | + echo 'none;'; |
|
| 2269 | + } ?>"> |
|
| 2270 | 2270 | <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/> |
| 2271 | 2271 | <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/> |
| 2272 | 2272 | <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/> |
| 2273 | 2273 | <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str;?>"/> |
| 2274 | 2274 | <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {
|
| 2275 | - echo $field_info->data_type; |
|
| 2276 | - }?>"/> |
|
| 2275 | + echo $field_info->data_type; |
|
| 2276 | + }?>"/> |
|
| 2277 | 2277 | <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name;?>"/> |
| 2278 | 2278 | |
| 2279 | 2279 | |
@@ -2296,14 +2296,14 @@ discard block |
||
| 2296 | 2296 | |
| 2297 | 2297 | <input type="radio" id="asc_yes<?php echo $radio_id;?>" name="asc" class="gdri-enabled" value="1" |
| 2298 | 2298 | <?php if ($value == '1') {
|
| 2299 | - echo 'checked'; |
|
| 2300 | - } ?>/> |
|
| 2299 | + echo 'checked'; |
|
| 2300 | + } ?>/> |
|
| 2301 | 2301 | <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 2302 | 2302 | |
| 2303 | 2303 | <input type="radio" id="asc_no<?php echo $radio_id;?>" name="asc" class="gdri-disabled" value="0" |
| 2304 | 2304 | <?php if ($value == '0' || !$value) {
|
| 2305 | - echo 'checked'; |
|
| 2306 | - } ?>/> |
|
| 2305 | + echo 'checked'; |
|
| 2306 | + } ?>/> |
|
| 2307 | 2307 | <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 2308 | 2308 | |
| 2309 | 2309 | </div> |
@@ -2340,8 +2340,8 @@ discard block |
||
| 2340 | 2340 | |
| 2341 | 2341 | <input type="radio" name="is_default" |
| 2342 | 2342 | value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {
|
| 2343 | - echo 'checked="checked"'; |
|
| 2344 | - } ?>/> |
|
| 2343 | + echo 'checked="checked"'; |
|
| 2344 | + } ?>/> |
|
| 2345 | 2345 | </div> |
| 2346 | 2346 | |
| 2347 | 2347 | </li> |
@@ -2361,14 +2361,14 @@ discard block |
||
| 2361 | 2361 | |
| 2362 | 2362 | <input type="radio" id="desc_yes<?php echo $radio_id;?>" name="desc" class="gdri-enabled" value="1" |
| 2363 | 2363 | <?php if ($value == '1') {
|
| 2364 | - echo 'checked'; |
|
| 2365 | - } ?>/> |
|
| 2364 | + echo 'checked'; |
|
| 2365 | + } ?>/> |
|
| 2366 | 2366 | <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 2367 | 2367 | |
| 2368 | 2368 | <input type="radio" id="desc_no<?php echo $radio_id;?>" name="desc" class="gdri-disabled" value="0" |
| 2369 | 2369 | <?php if ($value == '0' || !$value) {
|
| 2370 | - echo 'checked'; |
|
| 2371 | - } ?>/> |
|
| 2370 | + echo 'checked'; |
|
| 2371 | + } ?>/> |
|
| 2372 | 2372 | <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 2373 | 2373 | |
| 2374 | 2374 | </div> |
@@ -2404,8 +2404,8 @@ discard block |
||
| 2404 | 2404 | |
| 2405 | 2405 | <input type="radio" name="is_default" |
| 2406 | 2406 | value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {
|
| 2407 | - echo 'checked="checked"'; |
|
| 2408 | - } ?>/> |
|
| 2407 | + echo 'checked="checked"'; |
|
| 2408 | + } ?>/> |
|
| 2409 | 2409 | </div> |
| 2410 | 2410 | |
| 2411 | 2411 | </li> |
@@ -2447,8 +2447,8 @@ discard block |
||
| 2447 | 2447 | |
| 2448 | 2448 | <input type="checkbox" name="is_default" |
| 2449 | 2449 | value="<?php echo $field_type; ?>" <?php if (isset($value) && $value == '1') {
|
| 2450 | - echo 'checked="checked"'; |
|
| 2451 | - } ?>/> |
|
| 2450 | + echo 'checked="checked"'; |
|
| 2451 | + } ?>/> |
|
| 2452 | 2452 | </div> |
| 2453 | 2453 | |
| 2454 | 2454 | |
@@ -2471,14 +2471,14 @@ discard block |
||
| 2471 | 2471 | |
| 2472 | 2472 | <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled" value="1" |
| 2473 | 2473 | <?php if ($value == '1') {
|
| 2474 | - echo 'checked'; |
|
| 2475 | - } ?>/> |
|
| 2474 | + echo 'checked'; |
|
| 2475 | + } ?>/> |
|
| 2476 | 2476 | <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 2477 | 2477 | |
| 2478 | 2478 | <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0" |
| 2479 | 2479 | <?php if ($value == '0' || !$value) {
|
| 2480 | - echo 'checked'; |
|
| 2481 | - } ?>/> |
|
| 2480 | + echo 'checked'; |
|
| 2481 | + } ?>/> |
|
| 2482 | 2482 | <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 2483 | 2483 | |
| 2484 | 2484 | </div> |
@@ -2488,8 +2488,8 @@ discard block |
||
| 2488 | 2488 | |
| 2489 | 2489 | <input type="hidden" readonly="readonly" name="sort_order" id="sort_order" |
| 2490 | 2490 | value="<?php if (isset($field_info->sort_order)) {
|
| 2491 | - echo esc_attr($field_info->sort_order); |
|
| 2492 | - }?>" size="50"/> |
|
| 2491 | + echo esc_attr($field_info->sort_order); |
|
| 2492 | + }?>" size="50"/> |
|
| 2493 | 2493 | |
| 2494 | 2494 | |
| 2495 | 2495 | |
@@ -2513,38 +2513,38 @@ discard block |
||
| 2513 | 2513 | </form> |
| 2514 | 2514 | </li> <?php |
| 2515 | 2515 | |
| 2516 | - } |
|
| 2516 | + } |
|
| 2517 | 2517 | } |
| 2518 | 2518 | |
| 2519 | 2519 | if (!function_exists('check_field_visibility')) {
|
| 2520 | - /** |
|
| 2521 | - * Check field visibility as per price package. |
|
| 2522 | - * |
|
| 2523 | - * @since 1.0.0 |
|
| 2524 | - * @package GeoDirectory |
|
| 2525 | - * @global object $wpdb WordPress Database object. |
|
| 2526 | - * @global array $geodir_addon_list List of active GeoDirectory extensions. |
|
| 2527 | - * @param int|string $package_id The package ID. |
|
| 2528 | - * @param string $field_name The field name. |
|
| 2529 | - * @param string $post_type Optional. The wordpress post type. |
|
| 2530 | - * @return bool Returns true when field visible, otherwise false. |
|
| 2531 | - */ |
|
| 2532 | - function check_field_visibility($package_id, $field_name, $post_type) |
|
| 2533 | - {
|
|
| 2534 | - global $wpdb, $geodir_addon_list; |
|
| 2535 | - if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {
|
|
| 2536 | - return true; |
|
| 2537 | - } |
|
| 2538 | - if (!$package_id || !$field_name || !$post_type) {
|
|
| 2539 | - return true; |
|
| 2540 | - } |
|
| 2541 | - $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));
|
|
| 2542 | - |
|
| 2543 | - if ($wpdb->get_var($sql)) {
|
|
| 2544 | - return true; |
|
| 2545 | - } |
|
| 2546 | - return false; |
|
| 2547 | - } |
|
| 2520 | + /** |
|
| 2521 | + * Check field visibility as per price package. |
|
| 2522 | + * |
|
| 2523 | + * @since 1.0.0 |
|
| 2524 | + * @package GeoDirectory |
|
| 2525 | + * @global object $wpdb WordPress Database object. |
|
| 2526 | + * @global array $geodir_addon_list List of active GeoDirectory extensions. |
|
| 2527 | + * @param int|string $package_id The package ID. |
|
| 2528 | + * @param string $field_name The field name. |
|
| 2529 | + * @param string $post_type Optional. The wordpress post type. |
|
| 2530 | + * @return bool Returns true when field visible, otherwise false. |
|
| 2531 | + */ |
|
| 2532 | + function check_field_visibility($package_id, $field_name, $post_type) |
|
| 2533 | + {
|
|
| 2534 | + global $wpdb, $geodir_addon_list; |
|
| 2535 | + if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {
|
|
| 2536 | + return true; |
|
| 2537 | + } |
|
| 2538 | + if (!$package_id || !$field_name || !$post_type) {
|
|
| 2539 | + return true; |
|
| 2540 | + } |
|
| 2541 | + $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));
|
|
| 2542 | + |
|
| 2543 | + if ($wpdb->get_var($sql)) {
|
|
| 2544 | + return true; |
|
| 2545 | + } |
|
| 2546 | + return false; |
|
| 2547 | + } |
|
| 2548 | 2548 | } |
| 2549 | 2549 | |
| 2550 | 2550 | /** |
@@ -2560,43 +2560,43 @@ discard block |
||
| 2560 | 2560 | */ |
| 2561 | 2561 | function geodir_string_to_options($input = '', $translated = false) |
| 2562 | 2562 | {
|
| 2563 | - $return = array(); |
|
| 2564 | - if ($input != '') {
|
|
| 2565 | - $input = trim($input); |
|
| 2566 | - $input = rtrim($input, ","); |
|
| 2567 | - $input = ltrim($input, ","); |
|
| 2568 | - $input = trim($input); |
|
| 2569 | - } |
|
| 2570 | - |
|
| 2571 | - $input_arr = explode(',', $input);
|
|
| 2572 | - |
|
| 2573 | - if (!empty($input_arr)) {
|
|
| 2574 | - foreach ($input_arr as $input_str) {
|
|
| 2575 | - $input_str = trim($input_str); |
|
| 2576 | - |
|
| 2577 | - if (strpos($input_str, "/") !== false) {
|
|
| 2578 | - $input_str = explode("/", $input_str, 2);
|
|
| 2579 | - $label = trim($input_str[0]); |
|
| 2580 | - if ($translated && $label != '') {
|
|
| 2581 | - $label = __($label, 'geodirectory'); |
|
| 2582 | - } |
|
| 2583 | - $label = geodir_utf8_ucfirst($label); |
|
| 2584 | - $value = trim($input_str[1]); |
|
| 2585 | - } else {
|
|
| 2586 | - $value = $input_str; |
|
| 2587 | - if ($translated && $input_str != '') {
|
|
| 2588 | - $input_str = __($input_str, 'geodirectory'); |
|
| 2589 | - } |
|
| 2590 | - $label = geodir_utf8_ucfirst($input_str); |
|
| 2591 | - } |
|
| 2592 | - |
|
| 2593 | - if ($label != '') {
|
|
| 2594 | - $return[] = array('label' => $label, 'value' => $value, 'optgroup' => NULL);
|
|
| 2595 | - } |
|
| 2596 | - } |
|
| 2597 | - } |
|
| 2598 | - |
|
| 2599 | - return $return; |
|
| 2563 | + $return = array(); |
|
| 2564 | + if ($input != '') {
|
|
| 2565 | + $input = trim($input); |
|
| 2566 | + $input = rtrim($input, ","); |
|
| 2567 | + $input = ltrim($input, ","); |
|
| 2568 | + $input = trim($input); |
|
| 2569 | + } |
|
| 2570 | + |
|
| 2571 | + $input_arr = explode(',', $input);
|
|
| 2572 | + |
|
| 2573 | + if (!empty($input_arr)) {
|
|
| 2574 | + foreach ($input_arr as $input_str) {
|
|
| 2575 | + $input_str = trim($input_str); |
|
| 2576 | + |
|
| 2577 | + if (strpos($input_str, "/") !== false) {
|
|
| 2578 | + $input_str = explode("/", $input_str, 2);
|
|
| 2579 | + $label = trim($input_str[0]); |
|
| 2580 | + if ($translated && $label != '') {
|
|
| 2581 | + $label = __($label, 'geodirectory'); |
|
| 2582 | + } |
|
| 2583 | + $label = geodir_utf8_ucfirst($label); |
|
| 2584 | + $value = trim($input_str[1]); |
|
| 2585 | + } else {
|
|
| 2586 | + $value = $input_str; |
|
| 2587 | + if ($translated && $input_str != '') {
|
|
| 2588 | + $input_str = __($input_str, 'geodirectory'); |
|
| 2589 | + } |
|
| 2590 | + $label = geodir_utf8_ucfirst($input_str); |
|
| 2591 | + } |
|
| 2592 | + |
|
| 2593 | + if ($label != '') {
|
|
| 2594 | + $return[] = array('label' => $label, 'value' => $value, 'optgroup' => NULL);
|
|
| 2595 | + } |
|
| 2596 | + } |
|
| 2597 | + } |
|
| 2598 | + |
|
| 2599 | + return $return; |
|
| 2600 | 2600 | } |
| 2601 | 2601 | |
| 2602 | 2602 | /** |
@@ -2611,66 +2611,66 @@ discard block |
||
| 2611 | 2611 | */ |
| 2612 | 2612 | function geodir_string_values_to_options($option_values = '', $translated = false) |
| 2613 | 2613 | {
|
| 2614 | - $options = array(); |
|
| 2615 | - if ($option_values == '') {
|
|
| 2616 | - return NULL; |
|
| 2617 | - } |
|
| 2618 | - |
|
| 2619 | - if (strpos($option_values, "{/optgroup}") !== false) {
|
|
| 2620 | - $option_values_arr = explode("{/optgroup}", $option_values);
|
|
| 2621 | - |
|
| 2622 | - foreach ($option_values_arr as $optgroup) {
|
|
| 2623 | - if (strpos($optgroup, "{optgroup}") !== false) {
|
|
| 2624 | - $optgroup_arr = explode("{optgroup}", $optgroup);
|
|
| 2625 | - |
|
| 2626 | - $count = 0; |
|
| 2627 | - foreach ($optgroup_arr as $optgroup_str) {
|
|
| 2628 | - $count++; |
|
| 2629 | - $optgroup_str = trim($optgroup_str); |
|
| 2630 | - |
|
| 2631 | - $optgroup_label = ''; |
|
| 2632 | - if (strpos($optgroup_str, "|") !== false) {
|
|
| 2633 | - $optgroup_str_arr = explode("|", $optgroup_str, 2);
|
|
| 2634 | - $optgroup_label = trim($optgroup_str_arr[0]); |
|
| 2635 | - if ($translated && $optgroup_label != '') {
|
|
| 2636 | - $optgroup_label = __($optgroup_label, 'geodirectory'); |
|
| 2637 | - } |
|
| 2638 | - $optgroup_label = geodir_utf8_ucfirst($optgroup_label); |
|
| 2639 | - $optgroup_str = $optgroup_str_arr[1]; |
|
| 2640 | - } |
|
| 2641 | - |
|
| 2642 | - $optgroup3 = geodir_string_to_options($optgroup_str, $translated); |
|
| 2643 | - |
|
| 2644 | - if ($count > 1 && $optgroup_label != '' && !empty($optgroup3)) {
|
|
| 2645 | - $optgroup_start = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'start'));
|
|
| 2646 | - $optgroup_end = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'end'));
|
|
| 2647 | - $optgroup3 = array_merge($optgroup_start, $optgroup3, $optgroup_end); |
|
| 2648 | - } |
|
| 2649 | - $options = array_merge($options, $optgroup3); |
|
| 2650 | - } |
|
| 2651 | - } else {
|
|
| 2652 | - $optgroup1 = geodir_string_to_options($optgroup, $translated); |
|
| 2653 | - $options = array_merge($options, $optgroup1); |
|
| 2654 | - } |
|
| 2655 | - } |
|
| 2656 | - } else {
|
|
| 2657 | - $options = geodir_string_to_options($option_values, $translated); |
|
| 2658 | - } |
|
| 2659 | - |
|
| 2660 | - return $options; |
|
| 2614 | + $options = array(); |
|
| 2615 | + if ($option_values == '') {
|
|
| 2616 | + return NULL; |
|
| 2617 | + } |
|
| 2618 | + |
|
| 2619 | + if (strpos($option_values, "{/optgroup}") !== false) {
|
|
| 2620 | + $option_values_arr = explode("{/optgroup}", $option_values);
|
|
| 2621 | + |
|
| 2622 | + foreach ($option_values_arr as $optgroup) {
|
|
| 2623 | + if (strpos($optgroup, "{optgroup}") !== false) {
|
|
| 2624 | + $optgroup_arr = explode("{optgroup}", $optgroup);
|
|
| 2625 | + |
|
| 2626 | + $count = 0; |
|
| 2627 | + foreach ($optgroup_arr as $optgroup_str) {
|
|
| 2628 | + $count++; |
|
| 2629 | + $optgroup_str = trim($optgroup_str); |
|
| 2630 | + |
|
| 2631 | + $optgroup_label = ''; |
|
| 2632 | + if (strpos($optgroup_str, "|") !== false) {
|
|
| 2633 | + $optgroup_str_arr = explode("|", $optgroup_str, 2);
|
|
| 2634 | + $optgroup_label = trim($optgroup_str_arr[0]); |
|
| 2635 | + if ($translated && $optgroup_label != '') {
|
|
| 2636 | + $optgroup_label = __($optgroup_label, 'geodirectory'); |
|
| 2637 | + } |
|
| 2638 | + $optgroup_label = geodir_utf8_ucfirst($optgroup_label); |
|
| 2639 | + $optgroup_str = $optgroup_str_arr[1]; |
|
| 2640 | + } |
|
| 2641 | + |
|
| 2642 | + $optgroup3 = geodir_string_to_options($optgroup_str, $translated); |
|
| 2643 | + |
|
| 2644 | + if ($count > 1 && $optgroup_label != '' && !empty($optgroup3)) {
|
|
| 2645 | + $optgroup_start = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'start'));
|
|
| 2646 | + $optgroup_end = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'end'));
|
|
| 2647 | + $optgroup3 = array_merge($optgroup_start, $optgroup3, $optgroup_end); |
|
| 2648 | + } |
|
| 2649 | + $options = array_merge($options, $optgroup3); |
|
| 2650 | + } |
|
| 2651 | + } else {
|
|
| 2652 | + $optgroup1 = geodir_string_to_options($optgroup, $translated); |
|
| 2653 | + $options = array_merge($options, $optgroup1); |
|
| 2654 | + } |
|
| 2655 | + } |
|
| 2656 | + } else {
|
|
| 2657 | + $options = geodir_string_to_options($option_values, $translated); |
|
| 2658 | + } |
|
| 2659 | + |
|
| 2660 | + return $options; |
|
| 2661 | 2661 | } |
| 2662 | 2662 | |
| 2663 | 2663 | |
| 2664 | 2664 | function geodir_cfa_data_type_text($output,$result_str,$cf,$field_info){
|
| 2665 | - ob_start(); |
|
| 2666 | - |
|
| 2667 | - $dt_value = ''; |
|
| 2668 | - if (isset($field_info->data_type)) {
|
|
| 2669 | - $dt_value = esc_attr($field_info->data_type); |
|
| 2670 | - }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
|
|
| 2671 | - $dt_value = $cf['defaults']['data_type']; |
|
| 2672 | - } |
|
| 2673 | - ?> |
|
| 2665 | + ob_start(); |
|
| 2666 | + |
|
| 2667 | + $dt_value = ''; |
|
| 2668 | + if (isset($field_info->data_type)) {
|
|
| 2669 | + $dt_value = esc_attr($field_info->data_type); |
|
| 2670 | + }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
|
|
| 2671 | + $dt_value = $cf['defaults']['data_type']; |
|
| 2672 | + } |
|
| 2673 | + ?> |
|
| 2674 | 2674 | <li> |
| 2675 | 2675 | <label for="data_type"><?php _e('Field Data Type ? :', 'geodirectory'); ?></label>
|
| 2676 | 2676 | <div class="gd-cf-input-wrap"> |
@@ -2679,16 +2679,16 @@ discard block |
||
| 2679 | 2679 | onchange="javascript:gd_data_type_changed(this, '<?php echo $result_str; ?>');"> |
| 2680 | 2680 | <option |
| 2681 | 2681 | value="XVARCHAR" <?php if ($dt_value == 'VARCHAR') {
|
| 2682 | - echo 'selected="selected"'; |
|
| 2683 | - } ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>
|
|
| 2682 | + echo 'selected="selected"'; |
|
| 2683 | + } ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>
|
|
| 2684 | 2684 | <option |
| 2685 | 2685 | value="INT" <?php if ($dt_value == 'INT') {
|
| 2686 | - echo 'selected="selected"'; |
|
| 2687 | - } ?>><?php _e('NUMBER', 'geodirectory'); ?></option>
|
|
| 2686 | + echo 'selected="selected"'; |
|
| 2687 | + } ?>><?php _e('NUMBER', 'geodirectory'); ?></option>
|
|
| 2688 | 2688 | <option |
| 2689 | 2689 | value="FLOAT" <?php if ($dt_value == 'FLOAT') {
|
| 2690 | - echo 'selected="selected"'; |
|
| 2691 | - } ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>
|
|
| 2690 | + echo 'selected="selected"'; |
|
| 2691 | + } ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>
|
|
| 2692 | 2692 | </select> |
| 2693 | 2693 | <br/> <span><?php _e('Select Custom Field type', 'geodirectory'); ?></span>
|
| 2694 | 2694 | |
@@ -2696,13 +2696,13 @@ discard block |
||
| 2696 | 2696 | </li> |
| 2697 | 2697 | |
| 2698 | 2698 | <?php |
| 2699 | - $value = ''; |
|
| 2700 | - if (isset($field_info->decimal_point)) {
|
|
| 2701 | - $value = esc_attr($field_info->decimal_point); |
|
| 2702 | - }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
|
|
| 2703 | - $value = $cf['defaults']['decimal_point']; |
|
| 2704 | - } |
|
| 2705 | - ?> |
|
| 2699 | + $value = ''; |
|
| 2700 | + if (isset($field_info->decimal_point)) {
|
|
| 2701 | + $value = esc_attr($field_info->decimal_point); |
|
| 2702 | + }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
|
|
| 2703 | + $value = $cf['defaults']['decimal_point']; |
|
| 2704 | + } |
|
| 2705 | + ?> |
|
| 2706 | 2706 | |
| 2707 | 2707 | <li class="decimal-point-wrapper" |
| 2708 | 2708 | style="<?php echo ($dt_value == 'FLOAT') ? '' : 'display:none' ?>"> |
@@ -2711,7 +2711,7 @@ discard block |
||
| 2711 | 2711 | <select name="decimal_point" id="decimal_point"> |
| 2712 | 2712 | <option value=""><?php echo _e('Select', 'geodirectory'); ?></option>
|
| 2713 | 2713 | <?php for ($i = 1; $i <= 10; $i++) {
|
| 2714 | - $selected = $i == $value ? 'selected="selected"' : ''; ?> |
|
| 2714 | + $selected = $i == $value ? 'selected="selected"' : ''; ?> |
|
| 2715 | 2715 | <option value="<?php echo $i; ?>" <?php echo $selected; ?>><?php echo $i; ?></option> |
| 2716 | 2716 | <?php } ?> |
| 2717 | 2717 | </select> |
@@ -2720,8 +2720,8 @@ discard block |
||
| 2720 | 2720 | </li> |
| 2721 | 2721 | <?php |
| 2722 | 2722 | |
| 2723 | - $output = ob_get_clean(); |
|
| 2724 | - return $output; |
|
| 2723 | + $output = ob_get_clean(); |
|
| 2724 | + return $output; |
|
| 2725 | 2725 | } |
| 2726 | 2726 | add_filter('geodir_cfa_data_type_text','geodir_cfa_data_type_text',10,4);
|
| 2727 | 2727 | |
@@ -2757,9 +2757,9 @@ discard block |
||
| 2757 | 2757 | |
| 2758 | 2758 | |
| 2759 | 2759 | function geodir_cfa_advanced_editor_geodir_special_offers($output,$result_str,$cf,$field_info){
|
| 2760 | - if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}
|
|
| 2761 | - ob_start(); |
|
| 2762 | - ?> |
|
| 2760 | + if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}
|
|
| 2761 | + ob_start(); |
|
| 2762 | + ?> |
|
| 2763 | 2763 | <li> |
| 2764 | 2764 | <label for="advanced_editor" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show advanced editor :', 'geodirectory'); ?>
|
| 2765 | 2765 | <div class="gdcf-tooltip"> |
@@ -2770,13 +2770,13 @@ discard block |
||
| 2770 | 2770 | <div class="gd-cf-input-wrap"> |
| 2771 | 2771 | |
| 2772 | 2772 | <?php |
| 2773 | - $selected = ''; |
|
| 2774 | - if (isset($field_info->extra_fields)) |
|
| 2775 | - $advanced_editor = unserialize($field_info->extra_fields); |
|
| 2773 | + $selected = ''; |
|
| 2774 | + if (isset($field_info->extra_fields)) |
|
| 2775 | + $advanced_editor = unserialize($field_info->extra_fields); |
|
| 2776 | 2776 | |
| 2777 | - if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))
|
|
| 2778 | - $selected = 'checked="checked"'; |
|
| 2779 | - ?> |
|
| 2777 | + if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))
|
|
| 2778 | + $selected = 'checked="checked"'; |
|
| 2779 | + ?> |
|
| 2780 | 2780 | |
| 2781 | 2781 | <input type="checkbox" name="advanced_editor[]" id="advanced_editor" |
| 2782 | 2782 | value="1" <?php echo $selected; ?>/> |
@@ -2785,22 +2785,22 @@ discard block |
||
| 2785 | 2785 | </li> |
| 2786 | 2786 | <?php |
| 2787 | 2787 | |
| 2788 | - $output = ob_get_clean(); |
|
| 2789 | - return $output; |
|
| 2788 | + $output = ob_get_clean(); |
|
| 2789 | + return $output; |
|
| 2790 | 2790 | } |
| 2791 | 2791 | add_filter('geodir_cfa_advanced_editor_textarea','geodir_cfa_advanced_editor_geodir_special_offers',10,4);
|
| 2792 | 2792 | |
| 2793 | 2793 | |
| 2794 | 2794 | function geodir_cfa_validation_pattern_text($output,$result_str,$cf,$field_info){
|
| 2795 | - ob_start(); |
|
| 2796 | - |
|
| 2797 | - $value = ''; |
|
| 2798 | - if (isset($field_info->validation_pattern)) {
|
|
| 2799 | - $value = esc_attr($field_info->validation_pattern); |
|
| 2800 | - }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
|
|
| 2801 | - $value = esc_attr($cf['defaults']['validation_pattern']); |
|
| 2802 | - } |
|
| 2803 | - ?> |
|
| 2795 | + ob_start(); |
|
| 2796 | + |
|
| 2797 | + $value = ''; |
|
| 2798 | + if (isset($field_info->validation_pattern)) {
|
|
| 2799 | + $value = esc_attr($field_info->validation_pattern); |
|
| 2800 | + }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
|
|
| 2801 | + $value = esc_attr($cf['defaults']['validation_pattern']); |
|
| 2802 | + } |
|
| 2803 | + ?> |
|
| 2804 | 2804 | <li> |
| 2805 | 2805 | <label for="validation_pattern" class="gd-cf-tooltip-wrap"> |
| 2806 | 2806 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Validation Pattern:', 'geodirectory'); ?>
|
@@ -2814,13 +2814,13 @@ discard block |
||
| 2814 | 2814 | </div> |
| 2815 | 2815 | </li> |
| 2816 | 2816 | <?php |
| 2817 | - $value = ''; |
|
| 2818 | - if (isset($field_info->validation_msg)) {
|
|
| 2819 | - $value = esc_attr($field_info->validation_msg); |
|
| 2820 | - }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
|
|
| 2821 | - $value = esc_attr($cf['defaults']['validation_msg']); |
|
| 2822 | - } |
|
| 2823 | - ?> |
|
| 2817 | + $value = ''; |
|
| 2818 | + if (isset($field_info->validation_msg)) {
|
|
| 2819 | + $value = esc_attr($field_info->validation_msg); |
|
| 2820 | + }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
|
|
| 2821 | + $value = esc_attr($cf['defaults']['validation_msg']); |
|
| 2822 | + } |
|
| 2823 | + ?> |
|
| 2824 | 2824 | <li> |
| 2825 | 2825 | <label for="validation_msg" class="gd-cf-tooltip-wrap"> |
| 2826 | 2826 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Validation Message:', 'geodirectory'); ?>
|
@@ -2835,21 +2835,21 @@ discard block |
||
| 2835 | 2835 | </li> |
| 2836 | 2836 | <?php |
| 2837 | 2837 | |
| 2838 | - $output = ob_get_clean(); |
|
| 2839 | - return $output; |
|
| 2838 | + $output = ob_get_clean(); |
|
| 2839 | + return $output; |
|
| 2840 | 2840 | } |
| 2841 | 2841 | add_filter('geodir_cfa_validation_pattern_text','geodir_cfa_validation_pattern_text',10,4);
|
| 2842 | 2842 | |
| 2843 | 2843 | |
| 2844 | 2844 | function geodir_cfa_htmlvar_name_taxonomy($output,$result_str,$cf,$field_info){
|
| 2845 | - ob_start(); |
|
| 2846 | - global $post_type; |
|
| 2847 | - |
|
| 2848 | - if (!isset($field_info->post_type)) {
|
|
| 2849 | - $post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2850 | - } else |
|
| 2851 | - $post_type = $field_info->post_type; |
|
| 2852 | - ?> |
|
| 2845 | + ob_start(); |
|
| 2846 | + global $post_type; |
|
| 2847 | + |
|
| 2848 | + if (!isset($field_info->post_type)) {
|
|
| 2849 | + $post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2850 | + } else |
|
| 2851 | + $post_type = $field_info->post_type; |
|
| 2852 | + ?> |
|
| 2853 | 2853 | <li style="display: none;"> |
| 2854 | 2854 | <label for="htmlvar_name" class="gd-cf-tooltip-wrap"> |
| 2855 | 2855 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Select taxonomy:', 'geodirectory'); ?>
|
@@ -2860,15 +2860,15 @@ discard block |
||
| 2860 | 2860 | <div class="gd-cf-input-wrap"> |
| 2861 | 2861 | <select name="htmlvar_name" id="htmlvar_name"> |
| 2862 | 2862 | <?php |
| 2863 | - $gd_taxonomy = geodir_get_taxonomies($post_type); |
|
| 2863 | + $gd_taxonomy = geodir_get_taxonomies($post_type); |
|
| 2864 | 2864 | |
| 2865 | - foreach ($gd_taxonomy as $gd_tax) {
|
|
| 2866 | - ?> |
|
| 2865 | + foreach ($gd_taxonomy as $gd_tax) {
|
|
| 2866 | + ?> |
|
| 2867 | 2867 | <option <?php if (isset($field_info->htmlvar_name) && $field_info->htmlvar_name == $gd_tax) {
|
| 2868 | - echo 'selected="selected"'; |
|
| 2869 | - }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php |
|
| 2870 | - } |
|
| 2871 | - ?> |
|
| 2868 | + echo 'selected="selected"'; |
|
| 2869 | + }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php |
|
| 2870 | + } |
|
| 2871 | + ?> |
|
| 2872 | 2872 | </select> |
| 2873 | 2873 | </div> |
| 2874 | 2874 | </li> |
@@ -2884,49 +2884,49 @@ discard block |
||
| 2884 | 2884 | |
| 2885 | 2885 | <select name="cat_display_type" id="cat_display_type"> |
| 2886 | 2886 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'ajax_chained') {
|
| 2887 | - echo 'selected="selected"'; |
|
| 2888 | - }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>
|
|
| 2887 | + echo 'selected="selected"'; |
|
| 2888 | + }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>
|
|
| 2889 | 2889 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
|
| 2890 | - echo 'selected="selected"'; |
|
| 2891 | - }?> value="select"><?php _e('Select', 'geodirectory');?></option>
|
|
| 2890 | + echo 'selected="selected"'; |
|
| 2891 | + }?> value="select"><?php _e('Select', 'geodirectory');?></option>
|
|
| 2892 | 2892 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'multiselect') {
|
| 2893 | - echo 'selected="selected"'; |
|
| 2894 | - }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>
|
|
| 2893 | + echo 'selected="selected"'; |
|
| 2894 | + }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>
|
|
| 2895 | 2895 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
|
| 2896 | - echo 'selected="selected"'; |
|
| 2897 | - }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
|
|
| 2896 | + echo 'selected="selected"'; |
|
| 2897 | + }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
|
|
| 2898 | 2898 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
|
| 2899 | - echo 'selected="selected"'; |
|
| 2900 | - }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
|
|
| 2899 | + echo 'selected="selected"'; |
|
| 2900 | + }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
|
|
| 2901 | 2901 | </select> |
| 2902 | 2902 | </div> |
| 2903 | 2903 | </li> |
| 2904 | 2904 | <?php |
| 2905 | 2905 | |
| 2906 | - $output = ob_get_clean(); |
|
| 2907 | - return $output; |
|
| 2906 | + $output = ob_get_clean(); |
|
| 2907 | + return $output; |
|
| 2908 | 2908 | } |
| 2909 | 2909 | add_filter('geodir_cfa_htmlvar_name_taxonomy','geodir_cfa_htmlvar_name_taxonomy',10,4);
|
| 2910 | 2910 | |
| 2911 | 2911 | |
| 2912 | 2912 | function geodir_cfa_extra_fields_address($output,$result_str,$cf,$field_info){
|
| 2913 | 2913 | |
| 2914 | - ob_start(); |
|
| 2915 | - if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
|
|
| 2916 | - $address = stripslashes_deep(unserialize($field_info->extra_fields)); |
|
| 2917 | - } |
|
| 2914 | + ob_start(); |
|
| 2915 | + if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
|
|
| 2916 | + $address = stripslashes_deep(unserialize($field_info->extra_fields)); |
|
| 2917 | + } |
|
| 2918 | 2918 | |
| 2919 | - $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500); |
|
| 2920 | - ?> |
|
| 2919 | + $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500); |
|
| 2920 | + ?> |
|
| 2921 | 2921 | <?php |
| 2922 | - /** |
|
| 2923 | - * Called on the add custom fields settings page before the address field is output. |
|
| 2924 | - * |
|
| 2925 | - * @since 1.0.0 |
|
| 2926 | - * @param array $address The address settings array. |
|
| 2927 | - * @param object $field_info Extra fields info. |
|
| 2928 | - */ |
|
| 2929 | - do_action('geodir_address_extra_admin_fields', $address, $field_info); ?>
|
|
| 2922 | + /** |
|
| 2923 | + * Called on the add custom fields settings page before the address field is output. |
|
| 2924 | + * |
|
| 2925 | + * @since 1.0.0 |
|
| 2926 | + * @param array $address The address settings array. |
|
| 2927 | + * @param object $field_info Extra fields info. |
|
| 2928 | + */ |
|
| 2929 | + do_action('geodir_address_extra_admin_fields', $address, $field_info); ?>
|
|
| 2930 | 2930 | |
| 2931 | 2931 | <li> |
| 2932 | 2932 | <label for="show_zip" class="gd-cf-tooltip-wrap"> |
@@ -2939,14 +2939,14 @@ discard block |
||
| 2939 | 2939 | |
| 2940 | 2940 | <input type="radio" id="show_zip_yes<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-enabled" value="1" |
| 2941 | 2941 | <?php if (isset($address['show_zip']) && $address['show_zip'] == '1') {
|
| 2942 | - echo 'checked'; |
|
| 2943 | - } ?>/> |
|
| 2942 | + echo 'checked'; |
|
| 2943 | + } ?>/> |
|
| 2944 | 2944 | <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 2945 | 2945 | |
| 2946 | 2946 | <input type="radio" id="show_zip_no<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-disabled" value="0" |
| 2947 | 2947 | <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {
|
| 2948 | - echo 'checked'; |
|
| 2949 | - } ?>/> |
|
| 2948 | + echo 'checked'; |
|
| 2949 | + } ?>/> |
|
| 2950 | 2950 | <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 2951 | 2951 | |
| 2952 | 2952 | |
@@ -2963,8 +2963,8 @@ discard block |
||
| 2963 | 2963 | <div class="gd-cf-input-wrap"> |
| 2964 | 2964 | <input type="text" name="extra[zip_lable]" id="zip_lable" |
| 2965 | 2965 | value="<?php if (isset($address['zip_lable'])) {
|
| 2966 | - echo esc_attr($address['zip_lable']); |
|
| 2967 | - }?>"/> |
|
| 2966 | + echo esc_attr($address['zip_lable']); |
|
| 2967 | + }?>"/> |
|
| 2968 | 2968 | </div> |
| 2969 | 2969 | </li> |
| 2970 | 2970 | |
@@ -2981,8 +2981,8 @@ discard block |
||
| 2981 | 2981 | <div class="gd-cf-input-wrap"> |
| 2982 | 2982 | <input type="text" name="extra[map_lable]" id="map_lable" |
| 2983 | 2983 | value="<?php if (isset($address['map_lable'])) {
|
| 2984 | - echo esc_attr($address['map_lable']); |
|
| 2985 | - }?>"/> |
|
| 2984 | + echo esc_attr($address['map_lable']); |
|
| 2985 | + }?>"/> |
|
| 2986 | 2986 | </div> |
| 2987 | 2987 | </li> |
| 2988 | 2988 | |
@@ -2997,14 +2997,14 @@ discard block |
||
| 2997 | 2997 | |
| 2998 | 2998 | <input type="radio" id="show_mapzoom_yes<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-enabled" value="1" |
| 2999 | 2999 | <?php if (isset($address['show_mapzoom']) && $address['show_mapzoom'] == '1') {
|
| 3000 | - echo 'checked'; |
|
| 3001 | - } ?>/> |
|
| 3000 | + echo 'checked'; |
|
| 3001 | + } ?>/> |
|
| 3002 | 3002 | <label for="show_mapzoom_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 3003 | 3003 | |
| 3004 | 3004 | <input type="radio" id="show_mapzoom_no<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0" |
| 3005 | 3005 | <?php if ((isset($address['show_mapzoom']) && !$address['show_mapzoom']) || !isset($address['show_mapzoom'])) {
|
| 3006 | - echo 'checked'; |
|
| 3007 | - } ?>/> |
|
| 3006 | + echo 'checked'; |
|
| 3007 | + } ?>/> |
|
| 3008 | 3008 | <label for="show_mapzoom_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 3009 | 3009 | |
| 3010 | 3010 | </div> |
@@ -3021,14 +3021,14 @@ discard block |
||
| 3021 | 3021 | |
| 3022 | 3022 | <input type="radio" id="show_mapview_yes<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-enabled" value="1" |
| 3023 | 3023 | <?php if (isset($address['show_mapview']) && $address['show_mapview'] == '1') {
|
| 3024 | - echo 'checked'; |
|
| 3025 | - } ?>/> |
|
| 3024 | + echo 'checked'; |
|
| 3025 | + } ?>/> |
|
| 3026 | 3026 | <label for="show_mapview_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 3027 | 3027 | |
| 3028 | 3028 | <input type="radio" id="show_mapview_no<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-disabled" value="0" |
| 3029 | 3029 | <?php if ((isset($address['show_mapview']) && !$address['show_mapview']) || !isset($address['show_mapview'])) {
|
| 3030 | - echo 'checked'; |
|
| 3031 | - } ?>/> |
|
| 3030 | + echo 'checked'; |
|
| 3031 | + } ?>/> |
|
| 3032 | 3032 | <label for="show_mapview_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 3033 | 3033 | |
| 3034 | 3034 | </div> |
@@ -3045,8 +3045,8 @@ discard block |
||
| 3045 | 3045 | <div class="gd-cf-input-wrap"> |
| 3046 | 3046 | <input type="text" name="extra[mapview_lable]" id="mapview_lable" |
| 3047 | 3047 | value="<?php if (isset($address['mapview_lable'])) {
|
| 3048 | - echo esc_attr($address['mapview_lable']); |
|
| 3049 | - }?>"/> |
|
| 3048 | + echo esc_attr($address['mapview_lable']); |
|
| 3049 | + }?>"/> |
|
| 3050 | 3050 | </div> |
| 3051 | 3051 | </li> |
| 3052 | 3052 | <li> |
@@ -3060,29 +3060,29 @@ discard block |
||
| 3060 | 3060 | |
| 3061 | 3061 | <input type="radio" id="show_latlng_yes<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-enabled" value="1" |
| 3062 | 3062 | <?php if (isset($address['show_latlng']) && $address['show_latlng'] == '1') {
|
| 3063 | - echo 'checked'; |
|
| 3064 | - } ?>/> |
|
| 3063 | + echo 'checked'; |
|
| 3064 | + } ?>/> |
|
| 3065 | 3065 | <label for="show_latlng_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 3066 | 3066 | |
| 3067 | 3067 | <input type="radio" id="show_latlng_no<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-disabled" value="0" |
| 3068 | 3068 | <?php if ((isset($address['show_latlng']) && !$address['show_latlng']) || !isset($address['show_latlng'])) {
|
| 3069 | - echo 'checked'; |
|
| 3070 | - } ?>/> |
|
| 3069 | + echo 'checked'; |
|
| 3070 | + } ?>/> |
|
| 3071 | 3071 | <label for="show_latlng_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 3072 | 3072 | |
| 3073 | 3073 | </div> |
| 3074 | 3074 | </li> |
| 3075 | 3075 | <?php |
| 3076 | 3076 | |
| 3077 | - $html = ob_get_clean(); |
|
| 3078 | - return $output.$html; |
|
| 3077 | + $html = ob_get_clean(); |
|
| 3078 | + return $output.$html; |
|
| 3079 | 3079 | } |
| 3080 | 3080 | add_filter('geodir_cfa_extra_fields_address','geodir_cfa_extra_fields_address',10,4);
|
| 3081 | 3081 | |
| 3082 | 3082 | |
| 3083 | 3083 | function geodir_cfa_extra_fields_multiselect($output,$result_str,$cf,$field_info){
|
| 3084 | - ob_start(); |
|
| 3085 | - ?> |
|
| 3084 | + ob_start(); |
|
| 3085 | + ?> |
|
| 3086 | 3086 | <li> |
| 3087 | 3087 | <label for="multi_display_type" class="gd-cf-tooltip-wrap"> |
| 3088 | 3088 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Multiselect display type :', 'geodirectory'); ?>
|
@@ -3094,14 +3094,14 @@ discard block |
||
| 3094 | 3094 | |
| 3095 | 3095 | <select name="multi_display_type" id="multi_display_type"> |
| 3096 | 3096 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
|
| 3097 | - echo 'selected="selected"'; |
|
| 3098 | - }?> value="select"><?php _e('Select', 'geodirectory');?></option>
|
|
| 3097 | + echo 'selected="selected"'; |
|
| 3098 | + }?> value="select"><?php _e('Select', 'geodirectory');?></option>
|
|
| 3099 | 3099 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
|
| 3100 | - echo 'selected="selected"'; |
|
| 3101 | - }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
|
|
| 3100 | + echo 'selected="selected"'; |
|
| 3101 | + }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
|
|
| 3102 | 3102 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
|
| 3103 | - echo 'selected="selected"'; |
|
| 3104 | - }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
|
|
| 3103 | + echo 'selected="selected"'; |
|
| 3104 | + }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
|
|
| 3105 | 3105 | </select> |
| 3106 | 3106 | |
| 3107 | 3107 | <br/> |
@@ -3109,25 +3109,25 @@ discard block |
||
| 3109 | 3109 | </li> |
| 3110 | 3110 | <?php |
| 3111 | 3111 | |
| 3112 | - $html = ob_get_clean(); |
|
| 3113 | - return $output.$html; |
|
| 3112 | + $html = ob_get_clean(); |
|
| 3113 | + return $output.$html; |
|
| 3114 | 3114 | } |
| 3115 | 3115 | add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_multiselect',10,4);
|
| 3116 | 3116 | |
| 3117 | 3117 | |
| 3118 | 3118 | function geodir_cfa_extra_fields_smr($output,$result_str,$cf,$field_info){
|
| 3119 | 3119 | |
| 3120 | - ob_start(); |
|
| 3120 | + ob_start(); |
|
| 3121 | 3121 | |
| 3122 | - $value = ''; |
|
| 3123 | - if (isset($field_info->option_values)) {
|
|
| 3124 | - $value = esc_attr($field_info->option_values); |
|
| 3125 | - }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
|
|
| 3126 | - $value = esc_attr($cf['defaults']['option_values']); |
|
| 3127 | - } |
|
| 3122 | + $value = ''; |
|
| 3123 | + if (isset($field_info->option_values)) {
|
|
| 3124 | + $value = esc_attr($field_info->option_values); |
|
| 3125 | + }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
|
|
| 3126 | + $value = esc_attr($cf['defaults']['option_values']); |
|
| 3127 | + } |
|
| 3128 | 3128 | |
| 3129 | - $field_type = isset($field_info->field_type) ? $field_info->field_type : ''; |
|
| 3130 | - ?> |
|
| 3129 | + $field_type = isset($field_info->field_type) ? $field_info->field_type : ''; |
|
| 3130 | + ?> |
|
| 3131 | 3131 | <li> |
| 3132 | 3132 | <label for="option_values" class="gd-cf-tooltip-wrap"> |
| 3133 | 3133 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Option Values :', 'geodirectory'); ?>
|
@@ -3154,8 +3154,8 @@ discard block |
||
| 3154 | 3154 | </li> |
| 3155 | 3155 | <?php |
| 3156 | 3156 | |
| 3157 | - $html = ob_get_clean(); |
|
| 3158 | - return $output.$html; |
|
| 3157 | + $html = ob_get_clean(); |
|
| 3158 | + return $output.$html; |
|
| 3159 | 3159 | } |
| 3160 | 3160 | add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_smr',10,4);
|
| 3161 | 3161 | add_filter('geodir_cfa_extra_fields_select','geodir_cfa_extra_fields_smr',10,4);
|
@@ -3163,12 +3163,12 @@ discard block |
||
| 3163 | 3163 | |
| 3164 | 3164 | |
| 3165 | 3165 | function geodir_cfa_extra_fields_datepicker($output,$result_str,$cf,$field_info){
|
| 3166 | - ob_start(); |
|
| 3167 | - $extra = array(); |
|
| 3168 | - if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
|
|
| 3169 | - $extra = unserialize($field_info->extra_fields); |
|
| 3170 | - } |
|
| 3171 | - ?> |
|
| 3166 | + ob_start(); |
|
| 3167 | + $extra = array(); |
|
| 3168 | + if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
|
|
| 3169 | + $extra = unserialize($field_info->extra_fields); |
|
| 3170 | + } |
|
| 3171 | + ?> |
|
| 3172 | 3172 | <li> |
| 3173 | 3173 | <label for="date_format" class="gd-cf-tooltip-wrap"> |
| 3174 | 3174 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Date Format :', 'geodirectory'); ?>
|
@@ -3178,52 +3178,52 @@ discard block |
||
| 3178 | 3178 | </label> |
| 3179 | 3179 | <div class="gd-cf-input-wrap" style="overflow:inherit;"> |
| 3180 | 3180 | <?php |
| 3181 | - $date_formats = array( |
|
| 3182 | - 'm/d/Y', |
|
| 3183 | - 'd/m/Y', |
|
| 3184 | - 'Y/m/d', |
|
| 3185 | - 'm-d-Y', |
|
| 3186 | - 'd-m-Y', |
|
| 3187 | - 'Y-m-d', |
|
| 3188 | - 'F j, Y', |
|
| 3189 | - ); |
|
| 3190 | - /** |
|
| 3191 | - * Filter the custom field date format options. |
|
| 3192 | - * |
|
| 3193 | - * @since 1.6.5 |
|
| 3194 | - * @param array $date_formats The PHP date format array. |
|
| 3195 | - */ |
|
| 3196 | - $date_formats = apply_filters('geodir_date_formats',$date_formats);
|
|
| 3197 | - ?> |
|
| 3181 | + $date_formats = array( |
|
| 3182 | + 'm/d/Y', |
|
| 3183 | + 'd/m/Y', |
|
| 3184 | + 'Y/m/d', |
|
| 3185 | + 'm-d-Y', |
|
| 3186 | + 'd-m-Y', |
|
| 3187 | + 'Y-m-d', |
|
| 3188 | + 'F j, Y', |
|
| 3189 | + ); |
|
| 3190 | + /** |
|
| 3191 | + * Filter the custom field date format options. |
|
| 3192 | + * |
|
| 3193 | + * @since 1.6.5 |
|
| 3194 | + * @param array $date_formats The PHP date format array. |
|
| 3195 | + */ |
|
| 3196 | + $date_formats = apply_filters('geodir_date_formats',$date_formats);
|
|
| 3197 | + ?> |
|
| 3198 | 3198 | <select name="extra[date_format]" id="date_format"> |
| 3199 | 3199 | <?php |
| 3200 | - foreach($date_formats as $format){
|
|
| 3201 | - $selected = ''; |
|
| 3202 | - if(!empty($extra) && esc_attr($extra['date_format'])==$format){
|
|
| 3203 | - $selected = "selected='selected'"; |
|
| 3204 | - } |
|
| 3205 | - echo "<option $selected value='$format'>$format (".date_i18n( $format, time()).")</option>";
|
|
| 3206 | - } |
|
| 3207 | - ?> |
|
| 3200 | + foreach($date_formats as $format){
|
|
| 3201 | + $selected = ''; |
|
| 3202 | + if(!empty($extra) && esc_attr($extra['date_format'])==$format){
|
|
| 3203 | + $selected = "selected='selected'"; |
|
| 3204 | + } |
|
| 3205 | + echo "<option $selected value='$format'>$format (".date_i18n( $format, time()).")</option>";
|
|
| 3206 | + } |
|
| 3207 | + ?> |
|
| 3208 | 3208 | </select> |
| 3209 | 3209 | |
| 3210 | 3210 | </div> |
| 3211 | 3211 | </li> |
| 3212 | 3212 | <?php |
| 3213 | 3213 | |
| 3214 | - $html = ob_get_clean(); |
|
| 3215 | - return $output.$html; |
|
| 3214 | + $html = ob_get_clean(); |
|
| 3215 | + return $output.$html; |
|
| 3216 | 3216 | } |
| 3217 | 3217 | add_filter('geodir_cfa_extra_fields_datepicker','geodir_cfa_extra_fields_datepicker',10,4);
|
| 3218 | 3218 | |
| 3219 | 3219 | |
| 3220 | 3220 | function geodir_cfa_extra_fields_file($output,$result_str,$cf,$field_info){
|
| 3221 | - ob_start(); |
|
| 3222 | - $allowed_file_types = geodir_allowed_mime_types(); |
|
| 3221 | + ob_start(); |
|
| 3222 | + $allowed_file_types = geodir_allowed_mime_types(); |
|
| 3223 | 3223 | |
| 3224 | - $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : ''; |
|
| 3225 | - $gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');
|
|
| 3226 | - ?> |
|
| 3224 | + $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : ''; |
|
| 3225 | + $gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');
|
|
| 3226 | + ?> |
|
| 3227 | 3227 | <li> |
| 3228 | 3228 | <label for="gd_file_types" class="gd-cf-tooltip-wrap"> |
| 3229 | 3229 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Allowed file types :', 'geodirectory'); ?>
|
@@ -3246,33 +3246,33 @@ discard block |
||
| 3246 | 3246 | </li> |
| 3247 | 3247 | <?php |
| 3248 | 3248 | |
| 3249 | - $html = ob_get_clean(); |
|
| 3250 | - return $output.$html; |
|
| 3249 | + $html = ob_get_clean(); |
|
| 3250 | + return $output.$html; |
|
| 3251 | 3251 | } |
| 3252 | 3252 | add_filter('geodir_cfa_extra_fields_file','geodir_cfa_extra_fields_file',10,4);
|
| 3253 | 3253 | |
| 3254 | 3254 | function geodir_cfa_extra_fields_text($output,$result_str,$cf,$field_info){
|
| 3255 | - ob_start(); |
|
| 3255 | + ob_start(); |
|
| 3256 | 3256 | |
| 3257 | - $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : ''; |
|
| 3257 | + $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : ''; |
|
| 3258 | 3258 | // print_r($cf);echo '###'; |
| 3259 | 3259 | |
| 3260 | 3260 | |
| 3261 | 3261 | |
| 3262 | - $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500); |
|
| 3262 | + $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500); |
|
| 3263 | 3263 | |
| 3264 | 3264 | |
| 3265 | - $value = ''; |
|
| 3266 | - if ($extra_fields && isset($extra_fields['is_price'])) {
|
|
| 3267 | - $value = esc_attr($extra_fields['is_price']); |
|
| 3268 | - }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){
|
|
| 3269 | - $value = esc_attr($cf['defaults']['extra_fields']['is_price']); |
|
| 3270 | - } |
|
| 3265 | + $value = ''; |
|
| 3266 | + if ($extra_fields && isset($extra_fields['is_price'])) {
|
|
| 3267 | + $value = esc_attr($extra_fields['is_price']); |
|
| 3268 | + }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){
|
|
| 3269 | + $value = esc_attr($cf['defaults']['extra_fields']['is_price']); |
|
| 3270 | + } |
|
| 3271 | 3271 | |
| 3272 | - $show_price_extra = ($value==1) ? 1 : 0; |
|
| 3272 | + $show_price_extra = ($value==1) ? 1 : 0; |
|
| 3273 | 3273 | |
| 3274 | - $show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0; |
|
| 3275 | - ?> |
|
| 3274 | + $show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0; |
|
| 3275 | + ?> |
|
| 3276 | 3276 | <li class="gdcf-price-extra-set" <?php if(!$show_price){ echo "style='display:none;'";}?>>
|
| 3277 | 3277 | <label for="is_price" class="gd-cf-tooltip-wrap"> |
| 3278 | 3278 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display as price? :', 'geodirectory'); ?>
|
@@ -3284,14 +3284,14 @@ discard block |
||
| 3284 | 3284 | |
| 3285 | 3285 | <input type="radio" id="is_price_yes<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-enabled" value="1" |
| 3286 | 3286 | <?php if ($value == '1') {
|
| 3287 | - echo 'checked'; |
|
| 3288 | - } ?>/> |
|
| 3287 | + echo 'checked'; |
|
| 3288 | + } ?>/> |
|
| 3289 | 3289 | <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 3290 | 3290 | |
| 3291 | 3291 | <input type="radio" id="is_price_no<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-disabled" value="0" |
| 3292 | 3292 | <?php if ($value == '0' || !$value) {
|
| 3293 | - echo 'checked'; |
|
| 3294 | - } ?>/> |
|
| 3293 | + echo 'checked'; |
|
| 3294 | + } ?>/> |
|
| 3295 | 3295 | <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 3296 | 3296 | |
| 3297 | 3297 | </div> |
@@ -3299,13 +3299,13 @@ discard block |
||
| 3299 | 3299 | |
| 3300 | 3300 | <?php |
| 3301 | 3301 | |
| 3302 | - $value = ''; |
|
| 3303 | - if ($extra_fields && isset($extra_fields['thousand_separator'])) {
|
|
| 3304 | - $value = esc_attr($extra_fields['thousand_separator']); |
|
| 3305 | - }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){
|
|
| 3306 | - $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']); |
|
| 3307 | - } |
|
| 3308 | - ?> |
|
| 3302 | + $value = ''; |
|
| 3303 | + if ($extra_fields && isset($extra_fields['thousand_separator'])) {
|
|
| 3304 | + $value = esc_attr($extra_fields['thousand_separator']); |
|
| 3305 | + }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){
|
|
| 3306 | + $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']); |
|
| 3307 | + } |
|
| 3308 | + ?> |
|
| 3309 | 3309 | <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
|
| 3310 | 3310 | <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory');?>
|
| 3311 | 3311 | <div class="gdcf-tooltip"> |
@@ -3326,13 +3326,13 @@ discard block |
||
| 3326 | 3326 | |
| 3327 | 3327 | <?php |
| 3328 | 3328 | |
| 3329 | - $value = ''; |
|
| 3330 | - if ($extra_fields && isset($extra_fields['decimal_separator'])) {
|
|
| 3331 | - $value = esc_attr($extra_fields['decimal_separator']); |
|
| 3332 | - }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){
|
|
| 3333 | - $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']); |
|
| 3334 | - } |
|
| 3335 | - ?> |
|
| 3329 | + $value = ''; |
|
| 3330 | + if ($extra_fields && isset($extra_fields['decimal_separator'])) {
|
|
| 3331 | + $value = esc_attr($extra_fields['decimal_separator']); |
|
| 3332 | + }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){
|
|
| 3333 | + $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']); |
|
| 3334 | + } |
|
| 3335 | + ?> |
|
| 3336 | 3336 | <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
|
| 3337 | 3337 | <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory');?>
|
| 3338 | 3338 | <div class="gdcf-tooltip"> |
@@ -3349,13 +3349,13 @@ discard block |
||
| 3349 | 3349 | |
| 3350 | 3350 | <?php |
| 3351 | 3351 | |
| 3352 | - $value = ''; |
|
| 3353 | - if ($extra_fields && isset($extra_fields['decimal_display'])) {
|
|
| 3354 | - $value = esc_attr($extra_fields['decimal_display']); |
|
| 3355 | - }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){
|
|
| 3356 | - $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']); |
|
| 3357 | - } |
|
| 3358 | - ?> |
|
| 3352 | + $value = ''; |
|
| 3353 | + if ($extra_fields && isset($extra_fields['decimal_display'])) {
|
|
| 3354 | + $value = esc_attr($extra_fields['decimal_display']); |
|
| 3355 | + }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){
|
|
| 3356 | + $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']); |
|
| 3357 | + } |
|
| 3358 | + ?> |
|
| 3359 | 3359 | <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
|
| 3360 | 3360 | <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory');?>
|
| 3361 | 3361 | <div class="gdcf-tooltip"> |
@@ -3372,13 +3372,13 @@ discard block |
||
| 3372 | 3372 | |
| 3373 | 3373 | <?php |
| 3374 | 3374 | |
| 3375 | - $value = ''; |
|
| 3376 | - if ($extra_fields && isset($extra_fields['currency_symbol'])) {
|
|
| 3377 | - $value = esc_attr($extra_fields['currency_symbol']); |
|
| 3378 | - }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){
|
|
| 3379 | - $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']); |
|
| 3380 | - } |
|
| 3381 | - ?> |
|
| 3375 | + $value = ''; |
|
| 3376 | + if ($extra_fields && isset($extra_fields['currency_symbol'])) {
|
|
| 3377 | + $value = esc_attr($extra_fields['currency_symbol']); |
|
| 3378 | + }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){
|
|
| 3379 | + $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']); |
|
| 3380 | + } |
|
| 3381 | + ?> |
|
| 3382 | 3382 | <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
|
| 3383 | 3383 | <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory');?>
|
| 3384 | 3384 | <div class="gdcf-tooltip"> |
@@ -3393,13 +3393,13 @@ discard block |
||
| 3393 | 3393 | |
| 3394 | 3394 | <?php |
| 3395 | 3395 | |
| 3396 | - $value = ''; |
|
| 3397 | - if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {
|
|
| 3398 | - $value = esc_attr($extra_fields['currency_symbol_placement']); |
|
| 3399 | - }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){
|
|
| 3400 | - $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']); |
|
| 3401 | - } |
|
| 3402 | - ?> |
|
| 3396 | + $value = ''; |
|
| 3397 | + if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {
|
|
| 3398 | + $value = esc_attr($extra_fields['currency_symbol_placement']); |
|
| 3399 | + }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){
|
|
| 3400 | + $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']); |
|
| 3401 | + } |
|
| 3402 | + ?> |
|
| 3403 | 3403 | <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
|
| 3404 | 3404 | <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory');?>
|
| 3405 | 3405 | <div class="gdcf-tooltip"> |
@@ -3417,225 +3417,225 @@ discard block |
||
| 3417 | 3417 | |
| 3418 | 3418 | <?php |
| 3419 | 3419 | |
| 3420 | - $html = ob_get_clean(); |
|
| 3421 | - return $output.$html; |
|
| 3420 | + $html = ob_get_clean(); |
|
| 3421 | + return $output.$html; |
|
| 3422 | 3422 | } |
| 3423 | 3423 | add_filter('geodir_cfa_extra_fields_text','geodir_cfa_extra_fields_text',10,4);
|
| 3424 | 3424 | |
| 3425 | 3425 | function geodir_default_custom_fields($post_type='gd_place',$package_id=''){
|
| 3426 | - $fields = array(); |
|
| 3427 | - $package = ($package_id=='') ? '' : array($package_id); |
|
| 3428 | - |
|
| 3429 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3430 | - 'data_type' => 'VARCHAR', |
|
| 3431 | - 'field_type' => 'taxonomy', |
|
| 3432 | - 'admin_title' => __('Category', 'geodirectory'),
|
|
| 3433 | - 'admin_desc' => __('SELECT listing category FROM here. SELECT at least one CATEGORY', 'geodirectory'),
|
|
| 3434 | - 'site_title' => __('Category', 'geodirectory'),
|
|
| 3435 | - 'htmlvar_name' => $post_type.'category', |
|
| 3436 | - 'default_value' => '', |
|
| 3437 | - 'is_default' => '1', |
|
| 3438 | - 'is_admin' => '1', |
|
| 3439 | - 'is_required' => '1', |
|
| 3440 | - 'show_in' => '[detail]', |
|
| 3441 | - 'show_on_pkg' => $package, |
|
| 3442 | - 'clabels' => __('Category', 'geodirectory'));
|
|
| 3443 | - |
|
| 3444 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3445 | - 'data_type' => 'VARCHAR', |
|
| 3446 | - 'field_type' => 'address', |
|
| 3447 | - 'admin_title' => __('Address', 'geodirectory'),
|
|
| 3448 | - 'admin_desc' => ADDRESS_MSG, |
|
| 3449 | - 'site_title' => __('Address', 'geodirectory'),
|
|
| 3450 | - 'htmlvar_name' => 'post', |
|
| 3451 | - 'default_value' => '', |
|
| 3452 | - 'option_values' => '', |
|
| 3453 | - 'is_default' => '1', |
|
| 3454 | - 'is_admin' => '1', |
|
| 3455 | - 'is_required' => '1', |
|
| 3456 | - 'show_in' => '[detail],[mapbubble]', |
|
| 3457 | - 'show_on_pkg' => $package, |
|
| 3458 | - 'required_msg' => __('Address fields are required', 'geodirectory'),
|
|
| 3459 | - 'clabels' => __('Address', 'geodirectory'),
|
|
| 3460 | - 'extra' => array('show_city' => 1, 'city_lable' => __('City', 'geodirectory'),
|
|
| 3461 | - 'show_region' => 1, 'region_lable' => __('Region', 'geodirectory'),
|
|
| 3462 | - 'show_country' => 1, 'country_lable' => __('Country', 'geodirectory'),
|
|
| 3463 | - 'show_zip' => 1, 'zip_lable' => __('Zip/Post Code', 'geodirectory'),
|
|
| 3464 | - 'show_map' => 1, 'map_lable' => __('Set Address On Map', 'geodirectory'),
|
|
| 3465 | - 'show_mapview' => 1, 'mapview_lable' => __('Select Map View', 'geodirectory'),
|
|
| 3466 | - 'show_mapzoom' => 1, 'mapzoom_lable' => 'hidden', |
|
| 3467 | - 'show_latlng' => 1)); |
|
| 3468 | - |
|
| 3469 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3470 | - 'data_type' => 'VARCHAR', |
|
| 3471 | - 'field_type' => 'text', |
|
| 3472 | - 'admin_title' => __('Time', 'geodirectory'),
|
|
| 3473 | - 'admin_desc' => __('Enter Business or Listing Timing Information.<br/>eg. : 10.00 am to 6 pm every day', 'geodirectory'),
|
|
| 3474 | - 'site_title' => __('Time', 'geodirectory'),
|
|
| 3475 | - 'htmlvar_name' => 'timing', |
|
| 3476 | - 'default_value' => '', |
|
| 3477 | - 'option_values' => '', |
|
| 3478 | - 'is_default' => '1', |
|
| 3479 | - 'is_admin' => '1', |
|
| 3480 | - 'show_in' => '[detail],[mapbubble]', |
|
| 3481 | - 'show_on_pkg' => $package, |
|
| 3482 | - 'clabels' => __('Time', 'geodirectory'));
|
|
| 3483 | - |
|
| 3484 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3485 | - 'data_type' => 'VARCHAR', |
|
| 3486 | - 'field_type' => 'phone', |
|
| 3487 | - 'admin_title' => __('Phone', 'geodirectory'),
|
|
| 3488 | - 'admin_desc' => __('You can enter phone number,cell phone number etc.', 'geodirectory'),
|
|
| 3489 | - 'site_title' => __('Phone', 'geodirectory'),
|
|
| 3490 | - 'htmlvar_name' => 'contact', |
|
| 3491 | - 'default_value' => '', |
|
| 3492 | - 'option_values' => '', |
|
| 3493 | - 'is_default' => '1', |
|
| 3494 | - 'is_admin' => '1', |
|
| 3495 | - 'show_in' => '[detail],[mapbubble]', |
|
| 3496 | - 'show_on_pkg' => $package, |
|
| 3497 | - 'clabels' => __('Phone', 'geodirectory'));
|
|
| 3498 | - |
|
| 3499 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3500 | - 'data_type' => 'VARCHAR', |
|
| 3501 | - 'field_type' => 'email', |
|
| 3502 | - 'admin_title' => __('Email', 'geodirectory'),
|
|
| 3503 | - 'admin_desc' => __('You can enter your business or listing email.', 'geodirectory'),
|
|
| 3504 | - 'site_title' => __('Email', 'geodirectory'),
|
|
| 3505 | - 'htmlvar_name' => 'email', |
|
| 3506 | - 'default_value' => '', |
|
| 3507 | - 'option_values' => '', |
|
| 3508 | - 'is_default' => '1', |
|
| 3509 | - 'is_admin' => '1', |
|
| 3510 | - 'show_in' => '[detail]', |
|
| 3511 | - 'show_on_pkg' => $package, |
|
| 3512 | - 'clabels' => __('Email', 'geodirectory'));
|
|
| 3513 | - |
|
| 3514 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3515 | - 'data_type' => 'VARCHAR', |
|
| 3516 | - 'field_type' => 'url', |
|
| 3517 | - 'admin_title' => __('Website', 'geodirectory'),
|
|
| 3518 | - 'admin_desc' => __('You can enter your business or listing website.', 'geodirectory'),
|
|
| 3519 | - 'site_title' => __('Website', 'geodirectory'),
|
|
| 3520 | - 'htmlvar_name' => 'website', |
|
| 3521 | - 'default_value' => '', |
|
| 3522 | - 'option_values' => '', |
|
| 3523 | - 'is_default' => '1', |
|
| 3524 | - 'is_admin' => '1', |
|
| 3525 | - 'show_in' => '[detail]', |
|
| 3526 | - 'show_on_pkg' => $package, |
|
| 3527 | - 'clabels' => __('Website', 'geodirectory'));
|
|
| 3528 | - |
|
| 3529 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3530 | - 'data_type' => 'VARCHAR', |
|
| 3531 | - 'field_type' => 'url', |
|
| 3532 | - 'admin_title' => __('Twitter', 'geodirectory'),
|
|
| 3533 | - 'admin_desc' => __('You can enter your business or listing twitter url.', 'geodirectory'),
|
|
| 3534 | - 'site_title' => __('Twitter', 'geodirectory'),
|
|
| 3535 | - 'htmlvar_name' => 'twitter', |
|
| 3536 | - 'default_value' => '', |
|
| 3537 | - 'option_values' => '', |
|
| 3538 | - 'is_default' => '1', |
|
| 3539 | - 'is_admin' => '1', |
|
| 3540 | - 'show_in' => '[detail]', |
|
| 3541 | - 'show_on_pkg' => $package, |
|
| 3542 | - 'clabels' => __('Twitter', 'geodirectory'));
|
|
| 3543 | - |
|
| 3544 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3545 | - 'data_type' => 'VARCHAR', |
|
| 3546 | - 'field_type' => 'url', |
|
| 3547 | - 'admin_title' => __('Facebook', 'geodirectory'),
|
|
| 3548 | - 'admin_desc' => __('You can enter your business or listing facebook url.', 'geodirectory'),
|
|
| 3549 | - 'site_title' => __('Facebook', 'geodirectory'),
|
|
| 3550 | - 'htmlvar_name' => 'facebook', |
|
| 3551 | - 'default_value' => '', |
|
| 3552 | - 'option_values' => '', |
|
| 3553 | - 'is_default' => '1', |
|
| 3554 | - 'is_admin' => '1', |
|
| 3555 | - 'show_in' => '[detail]', |
|
| 3556 | - 'show_on_pkg' => $package, |
|
| 3557 | - 'clabels' => __('Facebook', 'geodirectory'));
|
|
| 3558 | - |
|
| 3559 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3560 | - 'data_type' => 'TEXT', |
|
| 3561 | - 'field_type' => 'textarea', |
|
| 3562 | - 'admin_title' => __('Video', 'geodirectory'),
|
|
| 3563 | - 'admin_desc' => __('Add video code here, YouTube etc.', 'geodirectory'),
|
|
| 3564 | - 'site_title' => __('Video', 'geodirectory'),
|
|
| 3565 | - 'htmlvar_name' => 'video', |
|
| 3566 | - 'default_value' => '', |
|
| 3567 | - 'option_values' => '', |
|
| 3568 | - 'is_default' => '0', |
|
| 3569 | - 'is_admin' => '1', |
|
| 3570 | - 'show_in' => '[owntab]', |
|
| 3571 | - 'show_on_pkg' => $package, |
|
| 3572 | - 'clabels' => __('Video', 'geodirectory'));
|
|
| 3573 | - |
|
| 3574 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3575 | - 'data_type' => 'TEXT', |
|
| 3576 | - 'field_type' => 'textarea', |
|
| 3577 | - 'admin_title' => __('Special Offers', 'geodirectory'),
|
|
| 3578 | - 'admin_desc' => __('Note: List out any special offers (optional)', 'geodirectory'),
|
|
| 3579 | - 'site_title' => __('Special Offers', 'geodirectory'),
|
|
| 3580 | - 'htmlvar_name' => 'special_offers', |
|
| 3581 | - 'default_value' => '', |
|
| 3582 | - 'option_values' => '', |
|
| 3583 | - 'is_default' => '0', |
|
| 3584 | - 'is_admin' => '1', |
|
| 3585 | - 'show_in' => '[owntab]', |
|
| 3586 | - 'show_on_pkg' => $package, |
|
| 3587 | - 'clabels' => __('Special Offers', 'geodirectory'));
|
|
| 3588 | - |
|
| 3589 | - /** |
|
| 3590 | - * Filter the array of default custom fields DB table data. |
|
| 3591 | - * |
|
| 3592 | - * @since 1.6.6 |
|
| 3593 | - * @param string $fields The default custom fields as an array. |
|
| 3594 | - */ |
|
| 3595 | - $fields = apply_filters('geodir_default_custom_fields', $fields);
|
|
| 3596 | - |
|
| 3597 | - return $fields; |
|
| 3426 | + $fields = array(); |
|
| 3427 | + $package = ($package_id=='') ? '' : array($package_id); |
|
| 3428 | + |
|
| 3429 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3430 | + 'data_type' => 'VARCHAR', |
|
| 3431 | + 'field_type' => 'taxonomy', |
|
| 3432 | + 'admin_title' => __('Category', 'geodirectory'),
|
|
| 3433 | + 'admin_desc' => __('SELECT listing category FROM here. SELECT at least one CATEGORY', 'geodirectory'),
|
|
| 3434 | + 'site_title' => __('Category', 'geodirectory'),
|
|
| 3435 | + 'htmlvar_name' => $post_type.'category', |
|
| 3436 | + 'default_value' => '', |
|
| 3437 | + 'is_default' => '1', |
|
| 3438 | + 'is_admin' => '1', |
|
| 3439 | + 'is_required' => '1', |
|
| 3440 | + 'show_in' => '[detail]', |
|
| 3441 | + 'show_on_pkg' => $package, |
|
| 3442 | + 'clabels' => __('Category', 'geodirectory'));
|
|
| 3443 | + |
|
| 3444 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3445 | + 'data_type' => 'VARCHAR', |
|
| 3446 | + 'field_type' => 'address', |
|
| 3447 | + 'admin_title' => __('Address', 'geodirectory'),
|
|
| 3448 | + 'admin_desc' => ADDRESS_MSG, |
|
| 3449 | + 'site_title' => __('Address', 'geodirectory'),
|
|
| 3450 | + 'htmlvar_name' => 'post', |
|
| 3451 | + 'default_value' => '', |
|
| 3452 | + 'option_values' => '', |
|
| 3453 | + 'is_default' => '1', |
|
| 3454 | + 'is_admin' => '1', |
|
| 3455 | + 'is_required' => '1', |
|
| 3456 | + 'show_in' => '[detail],[mapbubble]', |
|
| 3457 | + 'show_on_pkg' => $package, |
|
| 3458 | + 'required_msg' => __('Address fields are required', 'geodirectory'),
|
|
| 3459 | + 'clabels' => __('Address', 'geodirectory'),
|
|
| 3460 | + 'extra' => array('show_city' => 1, 'city_lable' => __('City', 'geodirectory'),
|
|
| 3461 | + 'show_region' => 1, 'region_lable' => __('Region', 'geodirectory'),
|
|
| 3462 | + 'show_country' => 1, 'country_lable' => __('Country', 'geodirectory'),
|
|
| 3463 | + 'show_zip' => 1, 'zip_lable' => __('Zip/Post Code', 'geodirectory'),
|
|
| 3464 | + 'show_map' => 1, 'map_lable' => __('Set Address On Map', 'geodirectory'),
|
|
| 3465 | + 'show_mapview' => 1, 'mapview_lable' => __('Select Map View', 'geodirectory'),
|
|
| 3466 | + 'show_mapzoom' => 1, 'mapzoom_lable' => 'hidden', |
|
| 3467 | + 'show_latlng' => 1)); |
|
| 3468 | + |
|
| 3469 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3470 | + 'data_type' => 'VARCHAR', |
|
| 3471 | + 'field_type' => 'text', |
|
| 3472 | + 'admin_title' => __('Time', 'geodirectory'),
|
|
| 3473 | + 'admin_desc' => __('Enter Business or Listing Timing Information.<br/>eg. : 10.00 am to 6 pm every day', 'geodirectory'),
|
|
| 3474 | + 'site_title' => __('Time', 'geodirectory'),
|
|
| 3475 | + 'htmlvar_name' => 'timing', |
|
| 3476 | + 'default_value' => '', |
|
| 3477 | + 'option_values' => '', |
|
| 3478 | + 'is_default' => '1', |
|
| 3479 | + 'is_admin' => '1', |
|
| 3480 | + 'show_in' => '[detail],[mapbubble]', |
|
| 3481 | + 'show_on_pkg' => $package, |
|
| 3482 | + 'clabels' => __('Time', 'geodirectory'));
|
|
| 3483 | + |
|
| 3484 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3485 | + 'data_type' => 'VARCHAR', |
|
| 3486 | + 'field_type' => 'phone', |
|
| 3487 | + 'admin_title' => __('Phone', 'geodirectory'),
|
|
| 3488 | + 'admin_desc' => __('You can enter phone number,cell phone number etc.', 'geodirectory'),
|
|
| 3489 | + 'site_title' => __('Phone', 'geodirectory'),
|
|
| 3490 | + 'htmlvar_name' => 'contact', |
|
| 3491 | + 'default_value' => '', |
|
| 3492 | + 'option_values' => '', |
|
| 3493 | + 'is_default' => '1', |
|
| 3494 | + 'is_admin' => '1', |
|
| 3495 | + 'show_in' => '[detail],[mapbubble]', |
|
| 3496 | + 'show_on_pkg' => $package, |
|
| 3497 | + 'clabels' => __('Phone', 'geodirectory'));
|
|
| 3498 | + |
|
| 3499 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3500 | + 'data_type' => 'VARCHAR', |
|
| 3501 | + 'field_type' => 'email', |
|
| 3502 | + 'admin_title' => __('Email', 'geodirectory'),
|
|
| 3503 | + 'admin_desc' => __('You can enter your business or listing email.', 'geodirectory'),
|
|
| 3504 | + 'site_title' => __('Email', 'geodirectory'),
|
|
| 3505 | + 'htmlvar_name' => 'email', |
|
| 3506 | + 'default_value' => '', |
|
| 3507 | + 'option_values' => '', |
|
| 3508 | + 'is_default' => '1', |
|
| 3509 | + 'is_admin' => '1', |
|
| 3510 | + 'show_in' => '[detail]', |
|
| 3511 | + 'show_on_pkg' => $package, |
|
| 3512 | + 'clabels' => __('Email', 'geodirectory'));
|
|
| 3513 | + |
|
| 3514 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3515 | + 'data_type' => 'VARCHAR', |
|
| 3516 | + 'field_type' => 'url', |
|
| 3517 | + 'admin_title' => __('Website', 'geodirectory'),
|
|
| 3518 | + 'admin_desc' => __('You can enter your business or listing website.', 'geodirectory'),
|
|
| 3519 | + 'site_title' => __('Website', 'geodirectory'),
|
|
| 3520 | + 'htmlvar_name' => 'website', |
|
| 3521 | + 'default_value' => '', |
|
| 3522 | + 'option_values' => '', |
|
| 3523 | + 'is_default' => '1', |
|
| 3524 | + 'is_admin' => '1', |
|
| 3525 | + 'show_in' => '[detail]', |
|
| 3526 | + 'show_on_pkg' => $package, |
|
| 3527 | + 'clabels' => __('Website', 'geodirectory'));
|
|
| 3528 | + |
|
| 3529 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3530 | + 'data_type' => 'VARCHAR', |
|
| 3531 | + 'field_type' => 'url', |
|
| 3532 | + 'admin_title' => __('Twitter', 'geodirectory'),
|
|
| 3533 | + 'admin_desc' => __('You can enter your business or listing twitter url.', 'geodirectory'),
|
|
| 3534 | + 'site_title' => __('Twitter', 'geodirectory'),
|
|
| 3535 | + 'htmlvar_name' => 'twitter', |
|
| 3536 | + 'default_value' => '', |
|
| 3537 | + 'option_values' => '', |
|
| 3538 | + 'is_default' => '1', |
|
| 3539 | + 'is_admin' => '1', |
|
| 3540 | + 'show_in' => '[detail]', |
|
| 3541 | + 'show_on_pkg' => $package, |
|
| 3542 | + 'clabels' => __('Twitter', 'geodirectory'));
|
|
| 3543 | + |
|
| 3544 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3545 | + 'data_type' => 'VARCHAR', |
|
| 3546 | + 'field_type' => 'url', |
|
| 3547 | + 'admin_title' => __('Facebook', 'geodirectory'),
|
|
| 3548 | + 'admin_desc' => __('You can enter your business or listing facebook url.', 'geodirectory'),
|
|
| 3549 | + 'site_title' => __('Facebook', 'geodirectory'),
|
|
| 3550 | + 'htmlvar_name' => 'facebook', |
|
| 3551 | + 'default_value' => '', |
|
| 3552 | + 'option_values' => '', |
|
| 3553 | + 'is_default' => '1', |
|
| 3554 | + 'is_admin' => '1', |
|
| 3555 | + 'show_in' => '[detail]', |
|
| 3556 | + 'show_on_pkg' => $package, |
|
| 3557 | + 'clabels' => __('Facebook', 'geodirectory'));
|
|
| 3558 | + |
|
| 3559 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3560 | + 'data_type' => 'TEXT', |
|
| 3561 | + 'field_type' => 'textarea', |
|
| 3562 | + 'admin_title' => __('Video', 'geodirectory'),
|
|
| 3563 | + 'admin_desc' => __('Add video code here, YouTube etc.', 'geodirectory'),
|
|
| 3564 | + 'site_title' => __('Video', 'geodirectory'),
|
|
| 3565 | + 'htmlvar_name' => 'video', |
|
| 3566 | + 'default_value' => '', |
|
| 3567 | + 'option_values' => '', |
|
| 3568 | + 'is_default' => '0', |
|
| 3569 | + 'is_admin' => '1', |
|
| 3570 | + 'show_in' => '[owntab]', |
|
| 3571 | + 'show_on_pkg' => $package, |
|
| 3572 | + 'clabels' => __('Video', 'geodirectory'));
|
|
| 3573 | + |
|
| 3574 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3575 | + 'data_type' => 'TEXT', |
|
| 3576 | + 'field_type' => 'textarea', |
|
| 3577 | + 'admin_title' => __('Special Offers', 'geodirectory'),
|
|
| 3578 | + 'admin_desc' => __('Note: List out any special offers (optional)', 'geodirectory'),
|
|
| 3579 | + 'site_title' => __('Special Offers', 'geodirectory'),
|
|
| 3580 | + 'htmlvar_name' => 'special_offers', |
|
| 3581 | + 'default_value' => '', |
|
| 3582 | + 'option_values' => '', |
|
| 3583 | + 'is_default' => '0', |
|
| 3584 | + 'is_admin' => '1', |
|
| 3585 | + 'show_in' => '[owntab]', |
|
| 3586 | + 'show_on_pkg' => $package, |
|
| 3587 | + 'clabels' => __('Special Offers', 'geodirectory'));
|
|
| 3588 | + |
|
| 3589 | + /** |
|
| 3590 | + * Filter the array of default custom fields DB table data. |
|
| 3591 | + * |
|
| 3592 | + * @since 1.6.6 |
|
| 3593 | + * @param string $fields The default custom fields as an array. |
|
| 3594 | + */ |
|
| 3595 | + $fields = apply_filters('geodir_default_custom_fields', $fields);
|
|
| 3596 | + |
|
| 3597 | + return $fields; |
|
| 3598 | 3598 | } |
| 3599 | 3599 | |
| 3600 | 3600 | function geodir_currency_format_number($number='',$cf=''){
|
| 3601 | 3601 | |
| 3602 | - $cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : ''; |
|
| 3602 | + $cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : ''; |
|
| 3603 | 3603 | |
| 3604 | - $symbol = isset($cs['currency_symbol']) ? $cs['currency_symbol'] : '$'; |
|
| 3605 | - $decimals = isset($cf['decimal_point']) && $cf['decimal_point'] ? $cf['decimal_point'] : 2; |
|
| 3606 | - $decimal_display = !empty($cf['decimal_display']) ? $cf['decimal_display'] : (!empty($cs['decimal_display']) ? $cs['decimal_display'] : 'if'); |
|
| 3607 | - $decimalpoint = '.'; |
|
| 3604 | + $symbol = isset($cs['currency_symbol']) ? $cs['currency_symbol'] : '$'; |
|
| 3605 | + $decimals = isset($cf['decimal_point']) && $cf['decimal_point'] ? $cf['decimal_point'] : 2; |
|
| 3606 | + $decimal_display = !empty($cf['decimal_display']) ? $cf['decimal_display'] : (!empty($cs['decimal_display']) ? $cs['decimal_display'] : 'if'); |
|
| 3607 | + $decimalpoint = '.'; |
|
| 3608 | 3608 | |
| 3609 | - if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){
|
|
| 3610 | - $decimalpoint = ','; |
|
| 3611 | - } |
|
| 3609 | + if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){
|
|
| 3610 | + $decimalpoint = ','; |
|
| 3611 | + } |
|
| 3612 | 3612 | |
| 3613 | - $separator = ','; |
|
| 3613 | + $separator = ','; |
|
| 3614 | 3614 | |
| 3615 | - if(isset($cs['thousand_separator'])){
|
|
| 3616 | - if($cs['thousand_separator']=='comma'){$separator = ',';}
|
|
| 3617 | - if($cs['thousand_separator']=='slash'){$separator = '\\';}
|
|
| 3618 | - if($cs['thousand_separator']=='period'){$separator = '.';}
|
|
| 3619 | - if($cs['thousand_separator']=='space'){$separator = ' ';}
|
|
| 3620 | - if($cs['thousand_separator']=='none'){$separator = '';}
|
|
| 3621 | - } |
|
| 3615 | + if(isset($cs['thousand_separator'])){
|
|
| 3616 | + if($cs['thousand_separator']=='comma'){$separator = ',';}
|
|
| 3617 | + if($cs['thousand_separator']=='slash'){$separator = '\\';}
|
|
| 3618 | + if($cs['thousand_separator']=='period'){$separator = '.';}
|
|
| 3619 | + if($cs['thousand_separator']=='space'){$separator = ' ';}
|
|
| 3620 | + if($cs['thousand_separator']=='none'){$separator = '';}
|
|
| 3621 | + } |
|
| 3622 | 3622 | |
| 3623 | - $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left'; |
|
| 3623 | + $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left'; |
|
| 3624 | 3624 | |
| 3625 | - if($decimals>0 && $decimal_display=='if'){
|
|
| 3626 | - if(is_int($number) || floor( $number ) == $number) |
|
| 3627 | - $decimals = 0; |
|
| 3628 | - } |
|
| 3625 | + if($decimals>0 && $decimal_display=='if'){
|
|
| 3626 | + if(is_int($number) || floor( $number ) == $number) |
|
| 3627 | + $decimals = 0; |
|
| 3628 | + } |
|
| 3629 | 3629 | |
| 3630 | - $number = number_format($number,$decimals,$decimalpoint,$separator); |
|
| 3630 | + $number = number_format($number,$decimals,$decimalpoint,$separator); |
|
| 3631 | 3631 | |
| 3632 | 3632 | |
| 3633 | 3633 | |
| 3634 | - if($currency_symbol_placement=='left'){
|
|
| 3635 | - $number = $symbol . $number; |
|
| 3636 | - }else{
|
|
| 3637 | - $number = $number . $symbol; |
|
| 3638 | - } |
|
| 3634 | + if($currency_symbol_placement=='left'){
|
|
| 3635 | + $number = $symbol . $number; |
|
| 3636 | + }else{
|
|
| 3637 | + $number = $number . $symbol; |
|
| 3638 | + } |
|
| 3639 | 3639 | |
| 3640 | 3640 | |
| 3641 | 3641 | return $number; |
@@ -132,12 +132,12 @@ discard block |
||
| 132 | 132 | |
| 133 | 133 | if (strpos($geodir_map_options['height'], '%') !== false || strpos($geodir_map_options['height'], 'px') !== false || strpos($geodir_map_options['height'], 'vh') !== false) {
|
| 134 | 134 | } else {
|
| 135 | - $geodir_map_options['height'] = $geodir_map_options['height'] . 'px'; |
|
| 135 | + $geodir_map_options['height'] = $geodir_map_options['height'].'px'; |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | if (strpos($geodir_map_options['width'], '%') !== false || strpos($geodir_map_options['width'], 'px') !== false) {
|
| 139 | 139 | } else {
|
| 140 | - $geodir_map_options['width'] = $geodir_map_options['width'] . 'px'; |
|
| 140 | + $geodir_map_options['width'] = $geodir_map_options['width'].'px'; |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
@@ -169,10 +169,10 @@ discard block |
||
| 169 | 169 | */ |
| 170 | 170 | $exclude_post_types = apply_filters("geodir_exclude_post_type_on_map_{$map_canvas_name}", get_option('geodir_exclude_post_type_on_map'));
|
| 171 | 171 | |
| 172 | - if (count((array)$post_types) != count($exclude_post_types) || ($enable_jason_on_load)): |
|
| 172 | + if (count((array) $post_types) != count($exclude_post_types) || ($enable_jason_on_load)): |
|
| 173 | 173 | // Set default map options |
| 174 | 174 | |
| 175 | - wp_enqueue_script('geodir-map-widget', geodir_plugin_url() . '/geodirectory-functions/map-functions/js/map.min.js',array(),false,true);
|
|
| 175 | + wp_enqueue_script('geodir-map-widget', geodir_plugin_url().'/geodirectory-functions/map-functions/js/map.min.js', array(), false, true);
|
|
| 176 | 176 | |
| 177 | 177 | wp_localize_script('geodir-map-widget', $map_canvas_name, $geodir_map_options);
|
| 178 | 178 | |
@@ -191,41 +191,41 @@ discard block |
||
| 191 | 191 | */ |
| 192 | 192 | $map_width = apply_filters('geodir_change_map_width', $map_width);
|
| 193 | 193 | ?> |
| 194 | - <div id="catcher_<?php echo $map_canvas_name;?>"></div> |
|
| 194 | + <div id="catcher_<?php echo $map_canvas_name; ?>"></div> |
|
| 195 | 195 | <div class="stick_trigger_container"> |
| 196 | 196 | <div class="trigger_sticky triggeroff_sticky"></div> |
| 197 | - <div class="top_banner_section geodir_map_container <?php echo $map_class_name;?>" |
|
| 198 | - id="sticky_map_<?php echo $map_canvas_name;?>" |
|
| 199 | - style="min-height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"> |
|
| 197 | + <div class="top_banner_section geodir_map_container <?php echo $map_class_name; ?>" |
|
| 198 | + id="sticky_map_<?php echo $map_canvas_name; ?>" |
|
| 199 | + style="min-height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"> |
|
| 200 | 200 | |
| 201 | 201 | <div class="map_background"> |
| 202 | 202 | <div class="top_banner_section_in clearfix"> |
| 203 | - <div class="<?php echo $map_canvas_name;?>_TopLeft TopLeft"><span class="triggermap" id="<?php echo $map_canvas_name;?>_triggermap" <?php if (!$geodir_map_options['enable_map_resize_button']) { ?> <?php }?>><i class="fa fa-arrows-alt"></i></span></div>
|
|
| 204 | - <div class="<?php echo $map_canvas_name;?>_TopRight TopRight"></div> |
|
| 205 | - <div id="<?php echo $map_canvas_name;?>_wrapper" class="main_map_wrapper" |
|
| 206 | - style="height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"> |
|
| 203 | + <div class="<?php echo $map_canvas_name; ?>_TopLeft TopLeft"><span class="triggermap" id="<?php echo $map_canvas_name; ?>_triggermap" <?php if (!$geodir_map_options['enable_map_resize_button']) { ?> <?php }?>><i class="fa fa-arrows-alt"></i></span></div>
|
|
| 204 | + <div class="<?php echo $map_canvas_name; ?>_TopRight TopRight"></div> |
|
| 205 | + <div id="<?php echo $map_canvas_name; ?>_wrapper" class="main_map_wrapper" |
|
| 206 | + style="height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"> |
|
| 207 | 207 | <!-- new map start --> |
| 208 | 208 | <div class="iprelative"> |
| 209 | - <div class="geodir_marker_cluster" id="<?php echo $map_canvas_name;?>" |
|
| 210 | - style="height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"></div> |
|
| 211 | - <div id="<?php echo $map_canvas_name;?>_loading_div" class="loading_div" |
|
| 212 | - style=" height:<?php echo $geodir_map_options['height'];?>;width:<?php echo $map_width;?>;"></div> |
|
| 209 | + <div class="geodir_marker_cluster" id="<?php echo $map_canvas_name; ?>" |
|
| 210 | + style="height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"></div> |
|
| 211 | + <div id="<?php echo $map_canvas_name; ?>_loading_div" class="loading_div" |
|
| 212 | + style=" height:<?php echo $geodir_map_options['height']; ?>;width:<?php echo $map_width; ?>;"></div> |
|
| 213 | 213 | <!--<div id="home_map_counter"></div> --> |
| 214 | - <div id="<?php echo $map_canvas_name;?>_map_nofound" |
|
| 214 | + <div id="<?php echo $map_canvas_name; ?>_map_nofound" |
|
| 215 | 215 | class="advmap_nofound"><?php echo MAP_NO_RESULTS; ?></div> |
| 216 | - <div id="<?php echo $map_canvas_name;?>_map_notloaded" |
|
| 216 | + <div id="<?php echo $map_canvas_name; ?>_map_notloaded" |
|
| 217 | 217 | class="advmap_notloaded"><?php _e('<h3>Google Map Not Loaded</h3><p>Sorry, unable to load Google Maps API.', 'geodirectory'); ?></div>
|
| 218 | 218 | </div> |
| 219 | 219 | <!-- new map end --> |
| 220 | 220 | </div> |
| 221 | - <div class="<?php echo $map_canvas_name;?>_BottomLeft BottomLeft"></div> |
|
| 221 | + <div class="<?php echo $map_canvas_name; ?>_BottomLeft BottomLeft"></div> |
|
| 222 | 222 | </div> |
| 223 | 223 | </div> |
| 224 | 224 | <?php if ($geodir_map_options['enable_jason_on_load']) { ?>
|
| 225 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="1"/> |
|
| 225 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_jason_enabled" value="1"/> |
|
| 226 | 226 | <?php } else {
|
| 227 | 227 | ?> |
| 228 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_jason_enabled" value="0"/> |
|
| 228 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_jason_enabled" value="0"/> |
|
| 229 | 229 | <?php } |
| 230 | 230 | |
| 231 | 231 | if (!$geodir_map_options['enable_text_search'] && !$geodir_map_options['enable_cat_filters']) |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | <div class="gd-input-group-addon gd-directions-right gd-mylocation-go"><input type="button" value="<?php _e('Get Directions', 'geodirectory'); ?>" class="<?php echo $map_canvas_name; ?>_getdirection" id="directions" onclick="calcRoute('<?php echo $map_canvas_name; ?>')" /></div>
|
| 246 | 246 | </div> |
| 247 | 247 | <script> |
| 248 | - <?php if(geodir_is_page('detail')){?>
|
|
| 248 | + <?php if (geodir_is_page('detail')) {?>
|
|
| 249 | 249 | jQuery(function () {
|
| 250 | 250 | gd_initialize_ac(); |
| 251 | 251 | }); |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | // Create the autocomplete object, restricting the search |
| 257 | 257 | // to geographical location types. |
| 258 | 258 | autocomplete = new google.maps.places.Autocomplete( |
| 259 | - /** @type {HTMLInputElement} */(document.getElementById('<?php echo $map_canvas_name;?>_fromAddress')),
|
|
| 259 | + /** @type {HTMLInputElement} */(document.getElementById('<?php echo $map_canvas_name; ?>_fromAddress')),
|
|
| 260 | 260 | {types: ['geocode']});
|
| 261 | 261 | // When the user selects an address from the dropdown, |
| 262 | 262 | // populate the address fields in the form. |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | |
| 271 | 271 | if (window.gdMaps == 'osm') {
|
| 272 | 272 | window.setTimeout(function() {
|
| 273 | - calcRoute('<?php echo $map_canvas_name;?>');
|
|
| 273 | + calcRoute('<?php echo $map_canvas_name; ?>');
|
|
| 274 | 274 | }, 1000); |
| 275 | 275 | } |
| 276 | 276 | } |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | */ |
| 325 | 325 | $map_search_pt = apply_filters('geodir_default_map_search_pt', $geodir_default_map_search_pt);
|
| 326 | 326 | ?> |
| 327 | - <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel;?>"> |
|
| 327 | + <div class="map-category-listing-main" style="display:<?php echo $show_entire_cat_panel; ?>"> |
|
| 328 | 328 | <?php |
| 329 | 329 | $exclude_post_types = get_option('geodir_exclude_post_type_on_map');
|
| 330 | 330 | $geodir_available_pt_on_map = count(geodir_get_posttypes('array')) - count($exclude_post_types);
|
@@ -334,12 +334,12 @@ discard block |
||
| 334 | 334 | } |
| 335 | 335 | ?> |
| 336 | 336 | <div |
| 337 | - class="map-category-listing<?php echo $map_cat_class;?>"> |
|
| 337 | + class="map-category-listing<?php echo $map_cat_class; ?>"> |
|
| 338 | 338 | <div class="gd-trigger gd-triggeroff"><i class="fa fa-compress"></i><i class="fa fa-expand"></i></div> |
| 339 | - <div id="<?php echo $map_canvas_name;?>_cat" |
|
| 340 | - class="<?php echo $map_canvas_name;?>_map_category map_category" |
|
| 341 | - <?php if ($child_collapse){ ?>checked="checked" <?php }?>
|
|
| 342 | - style="max-height:<?php echo $geodir_map_options['height'];?>;"> |
|
| 339 | + <div id="<?php echo $map_canvas_name; ?>_cat" |
|
| 340 | + class="<?php echo $map_canvas_name; ?>_map_category map_category" |
|
| 341 | + <?php if ($child_collapse) { ?>checked="checked" <?php }?>
|
|
| 342 | + style="max-height:<?php echo $geodir_map_options['height']; ?>;"> |
|
| 343 | 343 | <input |
| 344 | 344 | onkeydown="if(event.keyCode == 13){build_map_ajax_search_param('<?php echo $map_canvas_name; ?>', false)}"
|
| 345 | 345 | type="text" |
@@ -351,11 +351,11 @@ discard block |
||
| 351 | 351 | <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="1"/> |
| 352 | 352 | <?php } else {$child_collapse = "0";
|
| 353 | 353 | ?> |
| 354 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_child_collapse" value="0"/> |
|
| 354 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_child_collapse" value="0"/> |
|
| 355 | 355 | <?php } ?> |
| 356 | 356 | <input type="hidden" id="<?php echo $map_canvas_name; ?>_cat_enabled" value="1"/> |
| 357 | 357 | <div class="geodir_toggle"> |
| 358 | - <?php echo home_map_taxonomy_walker(array($map_search_pt.'category'),0,true,0,$map_canvas_name,$child_collapse,true); ?> |
|
| 358 | + <?php echo home_map_taxonomy_walker(array($map_search_pt.'category'), 0, true, 0, $map_canvas_name, $child_collapse, true); ?> |
|
| 359 | 359 | <script>jQuery( document ).ready(function() {
|
| 360 | 360 | geodir_show_sub_cat_collapse_button(); |
| 361 | 361 | });</script> |
@@ -384,21 +384,21 @@ discard block |
||
| 384 | 384 | $city = $country != 'me' ? $city : ''; |
| 385 | 385 | $gd_neighbourhood = $country != 'me' ? $gd_neighbourhood : ''; |
| 386 | 386 | ?> |
| 387 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="1"/> |
|
| 388 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_country" name="gd_country" |
|
| 389 | - value="<?php echo $country;?>"/> |
|
| 390 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_region" name="gd_region" |
|
| 391 | - value="<?php echo $region;?>"/> |
|
| 392 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_city" name="gd_city" |
|
| 393 | - value="<?php echo $city;?>"/> |
|
| 394 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_neighbourhood" name="gd_neighbourhood" |
|
| 395 | - value="<?php echo $gd_neighbourhood;?>"/> |
|
| 387 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_location_enabled" value="1"/> |
|
| 388 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_country" name="gd_country" |
|
| 389 | + value="<?php echo $country; ?>"/> |
|
| 390 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_region" name="gd_region" |
|
| 391 | + value="<?php echo $region; ?>"/> |
|
| 392 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_city" name="gd_city" |
|
| 393 | + value="<?php echo $city; ?>"/> |
|
| 394 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_neighbourhood" name="gd_neighbourhood" |
|
| 395 | + value="<?php echo $gd_neighbourhood; ?>"/> |
|
| 396 | 396 | <?php } else { //end of location filter
|
| 397 | 397 | ?> |
| 398 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_location_enabled" value="0"/> |
|
| 398 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_location_enabled" value="0"/> |
|
| 399 | 399 | <?php }?> |
| 400 | 400 | |
| 401 | - <input type="hidden" id="<?php echo $map_canvas_name;?>_posttype" name="gd_posttype" value="<?php echo $map_search_pt;?>"/> |
|
| 401 | + <input type="hidden" id="<?php echo $map_canvas_name; ?>_posttype" name="gd_posttype" value="<?php echo $map_search_pt; ?>"/> |
|
| 402 | 402 | |
| 403 | 403 | <input type="hidden" name="limitstart" value=""/> |
| 404 | 404 | |
@@ -415,8 +415,8 @@ discard block |
||
| 415 | 415 | } |
| 416 | 416 | if (count($map_post_types) > 1) {
|
| 417 | 417 | ?> |
| 418 | - <div class="map-places-listing" id="<?php echo $map_canvas_name;?>_posttype_menu" |
|
| 419 | - style="max-width:<?php echo $map_width;?>!important;"> |
|
| 418 | + <div class="map-places-listing" id="<?php echo $map_canvas_name; ?>_posttype_menu" |
|
| 419 | + style="max-width:<?php echo $map_width; ?>!important;"> |
|
| 420 | 420 | |
| 421 | 421 | <?php if (isset($geodir_map_options['is_geodir_home_map_widget']) && $map_args['is_geodir_home_map_widget']) { ?>
|
| 422 | 422 | <div class="geodir-map-posttype-list"><?php } ?> |
@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | foreach ($post_types as $post_type => $args) {
|
| 428 | 428 | if (!in_array($post_type, $exclude_post_types)) {
|
| 429 | 429 | $class = $map_search_pt == $post_type ? 'class="gd-map-search-pt"' : ''; |
| 430 | - echo '<li id="' . $post_type . '" ' . $class . '><a href="javascript:void(0);" onclick="jQuery(\'#' . $map_canvas_name . '_posttype\').val(\'' . $post_type . '\');build_map_ajax_search_param(\'' . $map_canvas_name . '\', true)">' . __($args->labels->name, 'geodirectory') . '</a></li>'; |
|
| 430 | + echo '<li id="'.$post_type.'" '.$class.'><a href="javascript:void(0);" onclick="jQuery(\'#'.$map_canvas_name.'_posttype\').val(\''.$post_type.'\');build_map_ajax_search_param(\''.$map_canvas_name.'\', true)">'.__($args->labels->name, 'geodirectory').'</a></li>'; |
|
| 431 | 431 | } |
| 432 | 432 | } |
| 433 | 433 | ?> |
@@ -452,8 +452,8 @@ discard block |
||
| 452 | 452 | <script type="text/javascript"> |
| 453 | 453 | |
| 454 | 454 | jQuery(document).ready(function () {
|
| 455 | - build_map_ajax_search_param('<?php echo $map_canvas_name;?>', false);
|
|
| 456 | - map_sticky('<?php echo $map_canvas_name;?>');
|
|
| 455 | + build_map_ajax_search_param('<?php echo $map_canvas_name; ?>', false);
|
|
| 456 | + map_sticky('<?php echo $map_canvas_name; ?>');
|
|
| 457 | 457 | }); |
| 458 | 458 | |
| 459 | 459 | </script> |
@@ -464,18 +464,18 @@ discard block |
||
| 464 | 464 | <script> |
| 465 | 465 | (function () {
|
| 466 | 466 | var screenH = jQuery(window).height(); |
| 467 | - var heightVH = "<?php echo str_replace("vh", "", $geodir_map_options['height']);?>";
|
|
| 467 | + var heightVH = "<?php echo str_replace("vh", "", $geodir_map_options['height']); ?>";
|
|
| 468 | 468 | |
| 469 | 469 | var ptypeH = ''; |
| 470 | - if (jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").length) {
|
|
| 471 | - ptypeH = jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").outerHeight();
|
|
| 470 | + if (jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").length) {
|
|
| 471 | + ptypeH = jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").outerHeight();
|
|
| 472 | 472 | } |
| 473 | 473 | |
| 474 | - jQuery("#sticky_map_<?php echo $map_canvas_name;?>").css("min-height", screenH * (heightVH / 100) + 'px');
|
|
| 475 | - jQuery("#<?php echo $map_canvas_name;?>_wrapper").height(screenH * (heightVH / 100) + 'px');
|
|
| 476 | - jQuery("#<?php echo $map_canvas_name;?>").height(screenH * (heightVH / 100) + 'px');
|
|
| 477 | - jQuery("#<?php echo $map_canvas_name;?>_loading_div").height(screenH * (heightVH / 100) + 'px');
|
|
| 478 | - jQuery("#<?php echo $map_canvas_name;?>_cat").css("max-height", (screenH * (heightVH / 100)) - ptypeH + 'px');
|
|
| 474 | + jQuery("#sticky_map_<?php echo $map_canvas_name; ?>").css("min-height", screenH * (heightVH / 100) + 'px');
|
|
| 475 | + jQuery("#<?php echo $map_canvas_name; ?>_wrapper").height(screenH * (heightVH / 100) + 'px');
|
|
| 476 | + jQuery("#<?php echo $map_canvas_name; ?>").height(screenH * (heightVH / 100) + 'px');
|
|
| 477 | + jQuery("#<?php echo $map_canvas_name; ?>_loading_div").height(screenH * (heightVH / 100) + 'px');
|
|
| 478 | + jQuery("#<?php echo $map_canvas_name; ?>_cat").css("max-height", (screenH * (heightVH / 100)) - ptypeH + 'px');
|
|
| 479 | 479 | |
| 480 | 480 | }()); |
| 481 | 481 | </script> |
@@ -487,13 +487,13 @@ discard block |
||
| 487 | 487 | <script> |
| 488 | 488 | (function () {
|
| 489 | 489 | var screenH = jQuery(window).height(); |
| 490 | - var heightVH = "<?php echo str_replace("px", "", $geodir_map_options['height']);?>";
|
|
| 490 | + var heightVH = "<?php echo str_replace("px", "", $geodir_map_options['height']); ?>";
|
|
| 491 | 491 | var ptypeH = ''; |
| 492 | - if (jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").length) {
|
|
| 493 | - ptypeH = jQuery("#<?php echo $map_canvas_name;?>_posttype_menu").outerHeight();
|
|
| 492 | + if (jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").length) {
|
|
| 493 | + ptypeH = jQuery("#<?php echo $map_canvas_name; ?>_posttype_menu").outerHeight();
|
|
| 494 | 494 | } |
| 495 | 495 | |
| 496 | - jQuery("#<?php echo $map_canvas_name;?>_cat").css("max-height", heightVH - ptypeH + 'px');
|
|
| 496 | + jQuery("#<?php echo $map_canvas_name; ?>_cat").css("max-height", heightVH - ptypeH + 'px');
|
|
| 497 | 497 | |
| 498 | 498 | }()); |
| 499 | 499 | </script> |
@@ -508,7 +508,7 @@ discard block |
||
| 508 | 508 | * @param array $geodir_map_options Array of map settings. |
| 509 | 509 | * @param string $map_canvas_name The canvas name and ID for the map. |
| 510 | 510 | */ |
| 511 | - do_action('geodir_map_after_render',$geodir_map_options,$map_canvas_name);
|
|
| 511 | + do_action('geodir_map_after_render', $geodir_map_options, $map_canvas_name);
|
|
| 512 | 512 | |
| 513 | 513 | |
| 514 | 514 | endif; // Exclude posttypes if end |
@@ -15,8 +15,8 @@ discard block |
||
| 15 | 15 | */ |
| 16 | 16 | function geodir_init_map_jason() |
| 17 | 17 | {
|
| 18 | - global $map_jason; |
|
| 19 | - $map_jason = array(); |
|
| 18 | + global $map_jason; |
|
| 19 | + $map_jason = array(); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -28,8 +28,8 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | function geodir_init_map_canvas_array() |
| 30 | 30 | {
|
| 31 | - global $map_canvas_arr; |
|
| 32 | - $map_canvas_arr = array(); |
|
| 31 | + global $map_canvas_arr; |
|
| 32 | + $map_canvas_arr = array(); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | |
@@ -50,63 +50,63 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | function create_marker_jason_of_posts($post) |
| 52 | 52 | {
|
| 53 | - global $wpdb, $map_jason, $add_post_in_marker_array, $geodir_cat_icons, $gd_marker_sizes; |
|
| 53 | + global $wpdb, $map_jason, $add_post_in_marker_array, $geodir_cat_icons, $gd_marker_sizes; |
|
| 54 | 54 | |
| 55 | - if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {
|
|
| 55 | + if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {
|
|
| 56 | 56 | |
| 57 | - if(isset($map_jason[$post->ID])){return null;}
|
|
| 57 | + if(isset($map_jason[$post->ID])){return null;}
|
|
| 58 | 58 | |
| 59 | - $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 60 | - $replarr = array("′", "⁄", "–", "“", '');
|
|
| 59 | + $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 60 | + $replarr = array("′", "⁄", "–", "“", '');
|
|
| 61 | 61 | |
| 62 | 62 | |
| 63 | - $geodir_cat_icons = geodir_get_term_icon(); |
|
| 64 | - $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$post->default_category]) ? $geodir_cat_icons[$post->default_category] : ''; |
|
| 63 | + $geodir_cat_icons = geodir_get_term_icon(); |
|
| 64 | + $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$post->default_category]) ? $geodir_cat_icons[$post->default_category] : ''; |
|
| 65 | 65 | |
| 66 | - $post_title = $post->post_title; |
|
| 67 | - $title = str_replace($srcharr, $replarr, $post_title); |
|
| 66 | + $post_title = $post->post_title; |
|
| 67 | + $title = str_replace($srcharr, $replarr, $post_title); |
|
| 68 | 68 | |
| 69 | - if (is_ssl()) {
|
|
| 70 | - $icon = str_replace("http:","https:",$icon );
|
|
| 71 | - } |
|
| 69 | + if (is_ssl()) {
|
|
| 70 | + $icon = str_replace("http:","https:",$icon );
|
|
| 71 | + } |
|
| 72 | 72 | |
| 73 | - if ($icon != '') {
|
|
| 74 | - $gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes; |
|
| 73 | + if ($icon != '') {
|
|
| 74 | + $gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes; |
|
| 75 | 75 | |
| 76 | - if (isset($gd_marker_sizes[$icon])) {
|
|
| 77 | - $icon_size = $gd_marker_sizes[$icon]; |
|
| 78 | - } else {
|
|
| 79 | - $icon_size = geodir_get_marker_size($icon); |
|
| 80 | - $gd_marker_sizes[$icon] = $icon_size; |
|
| 81 | - } |
|
| 82 | - } else {
|
|
| 83 | - $icon_size = array('w' => 36, 'h' => 45);
|
|
| 84 | - } |
|
| 85 | - |
|
| 86 | - $post_json = '{"id":"' . $post->ID
|
|
| 87 | - . '","t": "' . $title |
|
| 88 | - . '","lt": "' . $post->post_latitude |
|
| 89 | - . '","ln": "' . $post->post_longitude |
|
| 90 | - . '","mk_id":"' . $post->ID . '_' . $post->default_category |
|
| 91 | - . '","i":"' . $icon |
|
| 92 | - . '","w":"' . $icon_size['w'] |
|
| 93 | - . '","h":"' . $icon_size['h'] . '"}'; |
|
| 94 | - |
|
| 95 | - /** |
|
| 96 | - * Filter the json data when creating output for post json marker.. |
|
| 97 | - * |
|
| 98 | - * @since 1.5.7 |
|
| 99 | - * @param string $post_json JSON representation of the post marker info. |
|
| 100 | - * @param object $post The post object. |
|
| 101 | - */ |
|
| 102 | - $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
|
|
| 103 | - |
|
| 104 | - // only assign it if it has a value |
|
| 105 | - if($post_map_json){
|
|
| 106 | - $map_jason[$post->ID] = $post_map_json; |
|
| 107 | - } |
|
| 108 | - |
|
| 109 | - } |
|
| 76 | + if (isset($gd_marker_sizes[$icon])) {
|
|
| 77 | + $icon_size = $gd_marker_sizes[$icon]; |
|
| 78 | + } else {
|
|
| 79 | + $icon_size = geodir_get_marker_size($icon); |
|
| 80 | + $gd_marker_sizes[$icon] = $icon_size; |
|
| 81 | + } |
|
| 82 | + } else {
|
|
| 83 | + $icon_size = array('w' => 36, 'h' => 45);
|
|
| 84 | + } |
|
| 85 | + |
|
| 86 | + $post_json = '{"id":"' . $post->ID
|
|
| 87 | + . '","t": "' . $title |
|
| 88 | + . '","lt": "' . $post->post_latitude |
|
| 89 | + . '","ln": "' . $post->post_longitude |
|
| 90 | + . '","mk_id":"' . $post->ID . '_' . $post->default_category |
|
| 91 | + . '","i":"' . $icon |
|
| 92 | + . '","w":"' . $icon_size['w'] |
|
| 93 | + . '","h":"' . $icon_size['h'] . '"}'; |
|
| 94 | + |
|
| 95 | + /** |
|
| 96 | + * Filter the json data when creating output for post json marker.. |
|
| 97 | + * |
|
| 98 | + * @since 1.5.7 |
|
| 99 | + * @param string $post_json JSON representation of the post marker info. |
|
| 100 | + * @param object $post The post object. |
|
| 101 | + */ |
|
| 102 | + $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
|
|
| 103 | + |
|
| 104 | + // only assign it if it has a value |
|
| 105 | + if($post_map_json){
|
|
| 106 | + $map_jason[$post->ID] = $post_map_json; |
|
| 107 | + } |
|
| 108 | + |
|
| 109 | + } |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | /** |
@@ -119,67 +119,67 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | function send_marker_jason_to_js() |
| 121 | 121 | {
|
| 122 | - global $map_jason, $map_canvas_arr; |
|
| 123 | - |
|
| 124 | - if (is_array($map_canvas_arr) && !empty($map_canvas_arr)) {
|
|
| 125 | - foreach ($map_canvas_arr as $canvas => $jason) {
|
|
| 126 | - if (is_array($map_jason) && !empty($map_jason)) {
|
|
| 127 | - |
|
| 128 | - // on details page only show the main marker on the map |
|
| 129 | - if(geodir_is_page('detail')){
|
|
| 130 | - global $post; |
|
| 131 | - if(isset($map_jason[$post->ID])){
|
|
| 132 | - $map_jason = array($map_jason[$post->ID]); |
|
| 133 | - } |
|
| 134 | - } |
|
| 135 | - $canvas_jason = $canvas . "_jason"; |
|
| 136 | - $map_canvas_arr[$canvas] = array_unique($map_jason); |
|
| 137 | - unset($cat_content_info); |
|
| 138 | - $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
|
|
| 139 | - $totalcount = count(array_unique($map_jason)); |
|
| 140 | - if (!empty($cat_content_info)) {
|
|
| 141 | - $json_content = substr(implode(',', $cat_content_info), 1);
|
|
| 142 | - $json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016
|
|
| 143 | - $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08 |
|
| 144 | - $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
|
|
| 145 | - } else {
|
|
| 146 | - $canvas_jason = '[{"totalcount":"0"}]';
|
|
| 147 | - } |
|
| 148 | - $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 149 | - |
|
| 150 | - /** |
|
| 151 | - * Filter the send_marker_jason_to_js() function map canvas json args. |
|
| 152 | - * |
|
| 153 | - * You can use this filter to modify map canvas json args. |
|
| 154 | - * |
|
| 155 | - * @since 1.0.0 |
|
| 156 | - * @package GeoDirectory |
|
| 157 | - * @param string $canvas Map canvas array key. |
|
| 158 | - * @param array $map_canvas_jason_args Map canvas args. |
|
| 159 | - */ |
|
| 160 | - $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 161 | - |
|
| 162 | - wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 163 | - } else {
|
|
| 164 | - $canvas_jason = '[{"totalcount":"0"}]';
|
|
| 165 | - $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 166 | - |
|
| 167 | - /** |
|
| 168 | - * Filter the send_marker_jason_to_js() function map canvas json args. |
|
| 169 | - * |
|
| 170 | - * You can use this filter to modify map canvas json args. |
|
| 171 | - * |
|
| 172 | - * @since 1.0.0 |
|
| 173 | - * @package GeoDirectory |
|
| 174 | - * @param string $canvas Map canvas array key. |
|
| 175 | - * @param array $map_canvas_jason_args Map canvas args. |
|
| 176 | - */ |
|
| 177 | - $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 178 | - wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 179 | - } |
|
| 180 | - } |
|
| 181 | - |
|
| 182 | - } |
|
| 122 | + global $map_jason, $map_canvas_arr; |
|
| 123 | + |
|
| 124 | + if (is_array($map_canvas_arr) && !empty($map_canvas_arr)) {
|
|
| 125 | + foreach ($map_canvas_arr as $canvas => $jason) {
|
|
| 126 | + if (is_array($map_jason) && !empty($map_jason)) {
|
|
| 127 | + |
|
| 128 | + // on details page only show the main marker on the map |
|
| 129 | + if(geodir_is_page('detail')){
|
|
| 130 | + global $post; |
|
| 131 | + if(isset($map_jason[$post->ID])){
|
|
| 132 | + $map_jason = array($map_jason[$post->ID]); |
|
| 133 | + } |
|
| 134 | + } |
|
| 135 | + $canvas_jason = $canvas . "_jason"; |
|
| 136 | + $map_canvas_arr[$canvas] = array_unique($map_jason); |
|
| 137 | + unset($cat_content_info); |
|
| 138 | + $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
|
|
| 139 | + $totalcount = count(array_unique($map_jason)); |
|
| 140 | + if (!empty($cat_content_info)) {
|
|
| 141 | + $json_content = substr(implode(',', $cat_content_info), 1);
|
|
| 142 | + $json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016
|
|
| 143 | + $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08 |
|
| 144 | + $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
|
|
| 145 | + } else {
|
|
| 146 | + $canvas_jason = '[{"totalcount":"0"}]';
|
|
| 147 | + } |
|
| 148 | + $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 149 | + |
|
| 150 | + /** |
|
| 151 | + * Filter the send_marker_jason_to_js() function map canvas json args. |
|
| 152 | + * |
|
| 153 | + * You can use this filter to modify map canvas json args. |
|
| 154 | + * |
|
| 155 | + * @since 1.0.0 |
|
| 156 | + * @package GeoDirectory |
|
| 157 | + * @param string $canvas Map canvas array key. |
|
| 158 | + * @param array $map_canvas_jason_args Map canvas args. |
|
| 159 | + */ |
|
| 160 | + $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 161 | + |
|
| 162 | + wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 163 | + } else {
|
|
| 164 | + $canvas_jason = '[{"totalcount":"0"}]';
|
|
| 165 | + $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 166 | + |
|
| 167 | + /** |
|
| 168 | + * Filter the send_marker_jason_to_js() function map canvas json args. |
|
| 169 | + * |
|
| 170 | + * You can use this filter to modify map canvas json args. |
|
| 171 | + * |
|
| 172 | + * @since 1.0.0 |
|
| 173 | + * @package GeoDirectory |
|
| 174 | + * @param string $canvas Map canvas array key. |
|
| 175 | + * @param array $map_canvas_jason_args Map canvas args. |
|
| 176 | + */ |
|
| 177 | + $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 178 | + wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 179 | + } |
|
| 180 | + } |
|
| 181 | + |
|
| 182 | + } |
|
| 183 | 183 | } |
| 184 | 184 | |
| 185 | 185 | /** |
@@ -202,99 +202,99 @@ discard block |
||
| 202 | 202 | */ |
| 203 | 203 | function home_map_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = true, $pading = 0, $map_canvas_name = '', $child_collapse, $is_home_map = false) |
| 204 | 204 | {
|
| 205 | - global $cat_count, $geodir_cat_icons, $gd_session; |
|
| 205 | + global $cat_count, $geodir_cat_icons, $gd_session; |
|
| 206 | 206 | |
| 207 | - $exclude_categories = get_option('geodir_exclude_cat_on_map');
|
|
| 208 | - $exclude_categories_new = get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 207 | + $exclude_categories = get_option('geodir_exclude_cat_on_map');
|
|
| 208 | + $exclude_categories_new = get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 209 | 209 | |
| 210 | - // check if exclude categories saved before fix of categories identical names |
|
| 211 | - if ($exclude_categories_new) {
|
|
| 212 | - $gd_cat_taxonomy = isset($cat_taxonomy[0]) ? $cat_taxonomy[0] : ''; |
|
| 213 | - $exclude_categories = !empty($exclude_categories[$gd_cat_taxonomy]) && is_array($exclude_categories[$gd_cat_taxonomy]) ? array_unique($exclude_categories[$gd_cat_taxonomy]) : array(); |
|
| 214 | - } |
|
| 210 | + // check if exclude categories saved before fix of categories identical names |
|
| 211 | + if ($exclude_categories_new) {
|
|
| 212 | + $gd_cat_taxonomy = isset($cat_taxonomy[0]) ? $cat_taxonomy[0] : ''; |
|
| 213 | + $exclude_categories = !empty($exclude_categories[$gd_cat_taxonomy]) && is_array($exclude_categories[$gd_cat_taxonomy]) ? array_unique($exclude_categories[$gd_cat_taxonomy]) : array(); |
|
| 214 | + } |
|
| 215 | 215 | |
| 216 | - $exclude_cat_str = implode(',', $exclude_categories);
|
|
| 216 | + $exclude_cat_str = implode(',', $exclude_categories);
|
|
| 217 | 217 | |
| 218 | - if ($exclude_cat_str == '') {
|
|
| 219 | - $exclude_cat_str = '0'; |
|
| 220 | - } |
|
| 218 | + if ($exclude_cat_str == '') {
|
|
| 219 | + $exclude_cat_str = '0'; |
|
| 220 | + } |
|
| 221 | 221 | |
| 222 | - $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'exclude' => $exclude_cat_str, 'hide_empty ' => $hide_empty));
|
|
| 222 | + $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'exclude' => $exclude_cat_str, 'hide_empty ' => $hide_empty));
|
|
| 223 | 223 | |
| 224 | - if ($hide_empty) {
|
|
| 225 | - $cat_terms = geodir_filter_empty_terms($cat_terms); |
|
| 226 | - } |
|
| 224 | + if ($hide_empty) {
|
|
| 225 | + $cat_terms = geodir_filter_empty_terms($cat_terms); |
|
| 226 | + } |
|
| 227 | 227 | |
| 228 | - $main_list_class = ''; |
|
| 229 | - //If there are terms, start displaying |
|
| 230 | - if (count($cat_terms) > 0) {
|
|
| 231 | - //Displaying as a list |
|
| 232 | - $p = $pading * 15; |
|
| 233 | - $pading++; |
|
| 228 | + $main_list_class = ''; |
|
| 229 | + //If there are terms, start displaying |
|
| 230 | + if (count($cat_terms) > 0) {
|
|
| 231 | + //Displaying as a list |
|
| 232 | + $p = $pading * 15; |
|
| 233 | + $pading++; |
|
| 234 | 234 | |
| 235 | - if ($cat_parent == 0) {
|
|
| 236 | - $list_class = 'main_list'; |
|
| 237 | - $display = ''; |
|
| 238 | - } else {
|
|
| 239 | - $list_class = 'sub_list'; |
|
| 240 | - $display = !$child_collapse ? '' : 'display:none'; |
|
| 241 | - } |
|
| 235 | + if ($cat_parent == 0) {
|
|
| 236 | + $list_class = 'main_list'; |
|
| 237 | + $display = ''; |
|
| 238 | + } else {
|
|
| 239 | + $list_class = 'sub_list'; |
|
| 240 | + $display = !$child_collapse ? '' : 'display:none'; |
|
| 241 | + } |
|
| 242 | 242 | |
| 243 | - $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 243 | + $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 244 | 244 | |
| 245 | - $geodir_cat_icons = geodir_get_term_icon(); |
|
| 245 | + $geodir_cat_icons = geodir_get_term_icon(); |
|
| 246 | 246 | |
| 247 | - $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';
|
|
| 248 | - if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
|
|
| 249 | - $geodir_default_map_search_pt = $homemap_catlist_ptype; |
|
| 250 | - } |
|
| 251 | - $post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : $geodir_default_map_search_pt); |
|
| 247 | + $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';
|
|
| 248 | + if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
|
|
| 249 | + $geodir_default_map_search_pt = $homemap_catlist_ptype; |
|
| 250 | + } |
|
| 251 | + $post_type = isset($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : $geodir_default_map_search_pt); |
|
| 252 | 252 | |
| 253 | - foreach ($cat_terms as $cat_term): |
|
| 254 | - $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$cat_term->term_id]) ? $geodir_cat_icons[$cat_term->term_id] : ''; |
|
| 255 | - |
|
| 256 | - if (!in_array($cat_term->term_id, $exclude_categories)): |
|
| 257 | - //Secret sauce. Function calls itself to display child elements, if any |
|
| 258 | - $checked = 'checked="checked"'; |
|
| 259 | - |
|
| 260 | - // Untick the category by default on home map |
|
| 261 | - if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {
|
|
| 262 | - if (geodir_wpml_is_taxonomy_translated($post_type . 'category')) { // if WPML
|
|
| 263 | - global $sitepress; |
|
| 264 | - $default_lang = $sitepress->get_default_language(); |
|
| 265 | - $term_id = geodir_wpml_object_id($cat_term->term_id, $post_type.'category', true, $default_lang); |
|
| 266 | - }else{
|
|
| 267 | - $term_id = $cat_term->term_id; |
|
| 268 | - } |
|
| 269 | - if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
|
|
| 270 | - $checked = ''; |
|
| 271 | - } |
|
| 272 | - } |
|
| 273 | - |
|
| 274 | - $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"'; |
|
| 275 | - $term_check .= ' name="' . $map_canvas_name . '_cat[]" '; |
|
| 276 | - $term_check .= ' title="' . esc_attr(geodir_utf8_ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">'; |
|
| 277 | - $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '"/>'; |
|
| 278 | - $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . geodir_utf8_ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>'; |
|
| 279 | - |
|
| 280 | - endif; |
|
| 281 | - |
|
| 282 | - |
|
| 283 | - // get sub category by recursion |
|
| 284 | - $out .= home_map_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading, $map_canvas_name, $child_collapse, $is_home_map); |
|
| 285 | - |
|
| 286 | - $out .= '</li>'; |
|
| 287 | - |
|
| 288 | - endforeach; |
|
| 289 | - |
|
| 290 | - $out .= '</ul>'; |
|
| 291 | - |
|
| 292 | - return $out; |
|
| 293 | - } else {
|
|
| 294 | - if ($cat_parent == 0) |
|
| 295 | - return _e('No category', 'geodirectory');
|
|
| 296 | - } |
|
| 297 | - return; |
|
| 253 | + foreach ($cat_terms as $cat_term): |
|
| 254 | + $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$cat_term->term_id]) ? $geodir_cat_icons[$cat_term->term_id] : ''; |
|
| 255 | + |
|
| 256 | + if (!in_array($cat_term->term_id, $exclude_categories)): |
|
| 257 | + //Secret sauce. Function calls itself to display child elements, if any |
|
| 258 | + $checked = 'checked="checked"'; |
|
| 259 | + |
|
| 260 | + // Untick the category by default on home map |
|
| 261 | + if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {
|
|
| 262 | + if (geodir_wpml_is_taxonomy_translated($post_type . 'category')) { // if WPML
|
|
| 263 | + global $sitepress; |
|
| 264 | + $default_lang = $sitepress->get_default_language(); |
|
| 265 | + $term_id = geodir_wpml_object_id($cat_term->term_id, $post_type.'category', true, $default_lang); |
|
| 266 | + }else{
|
|
| 267 | + $term_id = $cat_term->term_id; |
|
| 268 | + } |
|
| 269 | + if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
|
|
| 270 | + $checked = ''; |
|
| 271 | + } |
|
| 272 | + } |
|
| 273 | + |
|
| 274 | + $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"'; |
|
| 275 | + $term_check .= ' name="' . $map_canvas_name . '_cat[]" '; |
|
| 276 | + $term_check .= ' title="' . esc_attr(geodir_utf8_ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">'; |
|
| 277 | + $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '"/>'; |
|
| 278 | + $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . geodir_utf8_ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>'; |
|
| 279 | + |
|
| 280 | + endif; |
|
| 281 | + |
|
| 282 | + |
|
| 283 | + // get sub category by recursion |
|
| 284 | + $out .= home_map_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading, $map_canvas_name, $child_collapse, $is_home_map); |
|
| 285 | + |
|
| 286 | + $out .= '</li>'; |
|
| 287 | + |
|
| 288 | + endforeach; |
|
| 289 | + |
|
| 290 | + $out .= '</ul>'; |
|
| 291 | + |
|
| 292 | + return $out; |
|
| 293 | + } else {
|
|
| 294 | + if ($cat_parent == 0) |
|
| 295 | + return _e('No category', 'geodirectory');
|
|
| 296 | + } |
|
| 297 | + return; |
|
| 298 | 298 | } |
| 299 | 299 | |
| 300 | 300 | /** |
@@ -306,19 +306,19 @@ discard block |
||
| 306 | 306 | * @return string The map API provider name. |
| 307 | 307 | */ |
| 308 | 308 | function geodir_map_name() {
|
| 309 | - $geodir_map_name = get_option('geodir_load_map', 'google');
|
|
| 309 | + $geodir_map_name = get_option('geodir_load_map', 'google');
|
|
| 310 | 310 | |
| 311 | - if (!in_array($geodir_map_name, array('none', 'auto', 'google', 'osm'))) {
|
|
| 312 | - $geodir_map_name = 'auto'; |
|
| 313 | - } |
|
| 314 | - |
|
| 315 | - /** |
|
| 316 | - * Filter the map JS API provider name. |
|
| 317 | - * |
|
| 318 | - * @since 1.6.1 |
|
| 319 | - * @param string $geodir_map_name The map API provider name. |
|
| 320 | - */ |
|
| 321 | - return apply_filters('geodir_map_name', $geodir_map_name);
|
|
| 311 | + if (!in_array($geodir_map_name, array('none', 'auto', 'google', 'osm'))) {
|
|
| 312 | + $geodir_map_name = 'auto'; |
|
| 313 | + } |
|
| 314 | + |
|
| 315 | + /** |
|
| 316 | + * Filter the map JS API provider name. |
|
| 317 | + * |
|
| 318 | + * @since 1.6.1 |
|
| 319 | + * @param string $geodir_map_name The map API provider name. |
|
| 320 | + */ |
|
| 321 | + return apply_filters('geodir_map_name', $geodir_map_name);
|
|
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | /** |
@@ -334,48 +334,48 @@ discard block |
||
| 334 | 334 | * @return array The icon size. |
| 335 | 335 | */ |
| 336 | 336 | function geodir_get_marker_size($icon, $default_size = array('w' => 36, 'h' => 45)) {
|
| 337 | - global $gd_marker_sizes; |
|
| 337 | + global $gd_marker_sizes; |
|
| 338 | 338 | |
| 339 | - if (empty($gd_marker_sizes)) {
|
|
| 340 | - $gd_marker_sizes = array(); |
|
| 341 | - } |
|
| 339 | + if (empty($gd_marker_sizes)) {
|
|
| 340 | + $gd_marker_sizes = array(); |
|
| 341 | + } |
|
| 342 | 342 | |
| 343 | - if (!empty($gd_marker_sizes[$icon])) {
|
|
| 344 | - return $gd_marker_sizes[$icon]; |
|
| 345 | - } |
|
| 343 | + if (!empty($gd_marker_sizes[$icon])) {
|
|
| 344 | + return $gd_marker_sizes[$icon]; |
|
| 345 | + } |
|
| 346 | 346 | |
| 347 | - if (empty($icon)) {
|
|
| 348 | - $gd_marker_sizes[$icon] = $default_size; |
|
| 347 | + if (empty($icon)) {
|
|
| 348 | + $gd_marker_sizes[$icon] = $default_size; |
|
| 349 | 349 | |
| 350 | - return $default_size; |
|
| 351 | - } |
|
| 350 | + return $default_size; |
|
| 351 | + } |
|
| 352 | 352 | |
| 353 | - $icon_url = $icon; |
|
| 353 | + $icon_url = $icon; |
|
| 354 | 354 | |
| 355 | - $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 355 | + $uploads = wp_upload_dir(); // Array of key => value pairs |
|
| 356 | 356 | |
| 357 | - if (!path_is_absolute($icon)) {
|
|
| 358 | - $icon = str_replace($uploads['baseurl'], $uploads['basedir'], $icon); |
|
| 359 | - } |
|
| 357 | + if (!path_is_absolute($icon)) {
|
|
| 358 | + $icon = str_replace($uploads['baseurl'], $uploads['basedir'], $icon); |
|
| 359 | + } |
|
| 360 | 360 | |
| 361 | - if (!path_is_absolute($icon) && strpos($icon, WP_CONTENT_URL) !== false) {
|
|
| 362 | - $icon = str_replace(WP_CONTENT_URL, WP_CONTENT_DIR, $icon); |
|
| 363 | - } |
|
| 361 | + if (!path_is_absolute($icon) && strpos($icon, WP_CONTENT_URL) !== false) {
|
|
| 362 | + $icon = str_replace(WP_CONTENT_URL, WP_CONTENT_DIR, $icon); |
|
| 363 | + } |
|
| 364 | 364 | |
| 365 | - $sizes = array(); |
|
| 366 | - if (is_file($icon) && file_exists($icon)) {
|
|
| 367 | - $size = getimagesize(trim($icon)); |
|
| 365 | + $sizes = array(); |
|
| 366 | + if (is_file($icon) && file_exists($icon)) {
|
|
| 367 | + $size = getimagesize(trim($icon)); |
|
| 368 | 368 | |
| 369 | - if (!empty($size[0]) && !empty($size[1])) {
|
|
| 370 | - $sizes = array('w' => $size[0], 'h' => $size[1]);
|
|
| 371 | - } |
|
| 372 | - } |
|
| 369 | + if (!empty($size[0]) && !empty($size[1])) {
|
|
| 370 | + $sizes = array('w' => $size[0], 'h' => $size[1]);
|
|
| 371 | + } |
|
| 372 | + } |
|
| 373 | 373 | |
| 374 | - $sizes = !empty($sizes) ? $sizes : $default_size; |
|
| 374 | + $sizes = !empty($sizes) ? $sizes : $default_size; |
|
| 375 | 375 | |
| 376 | - $gd_marker_sizes[$icon_url] = $sizes; |
|
| 376 | + $gd_marker_sizes[$icon_url] = $sizes; |
|
| 377 | 377 | |
| 378 | - return $sizes; |
|
| 378 | + return $sizes; |
|
| 379 | 379 | } |
| 380 | 380 | |
| 381 | 381 | add_action('wp_footer', 'geodir_map_load_script', 10);
|
@@ -387,8 +387,8 @@ discard block |
||
| 387 | 387 | * @package GeoDirectory |
| 388 | 388 | */ |
| 389 | 389 | function geodir_map_load_script() {
|
| 390 | - if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'google-maps-api', 'done')) {
|
|
| 391 | - $plugin_url = geodir_plugin_url(); |
|
| 390 | + if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'google-maps-api', 'done')) {
|
|
| 391 | + $plugin_url = geodir_plugin_url(); |
|
| 392 | 392 | ?> |
| 393 | 393 | <script type="text/javascript"> |
| 394 | 394 | if (!(window.google && typeof google.maps !== 'undefined')) {
|
@@ -403,5 +403,5 @@ discard block |
||
| 403 | 403 | } |
| 404 | 404 | </script> |
| 405 | 405 | <?php |
| 406 | - } |
|
| 406 | + } |
|
| 407 | 407 | } |
| 408 | 408 | \ No newline at end of file |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | |
| 55 | 55 | if (!empty($post) && isset($post->ID) && $post->ID > 0 && (is_main_query() || $add_post_in_marker_array) && $post->marker_json != '') {
|
| 56 | 56 | |
| 57 | - if(isset($map_jason[$post->ID])){return null;}
|
|
| 57 | + if (isset($map_jason[$post->ID])) {return null; }
|
|
| 58 | 58 | |
| 59 | 59 | $srcharr = array("'", "/", "-", '"', '\\');
|
| 60 | 60 | $replarr = array("′", "⁄", "–", "“", '');
|
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | $title = str_replace($srcharr, $replarr, $post_title); |
| 68 | 68 | |
| 69 | 69 | if (is_ssl()) {
|
| 70 | - $icon = str_replace("http:","https:",$icon );
|
|
| 70 | + $icon = str_replace("http:", "https:", $icon);
|
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | if ($icon != '') {
|
@@ -83,14 +83,14 @@ discard block |
||
| 83 | 83 | $icon_size = array('w' => 36, 'h' => 45);
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - $post_json = '{"id":"' . $post->ID
|
|
| 87 | - . '","t": "' . $title |
|
| 88 | - . '","lt": "' . $post->post_latitude |
|
| 89 | - . '","ln": "' . $post->post_longitude |
|
| 90 | - . '","mk_id":"' . $post->ID . '_' . $post->default_category |
|
| 91 | - . '","i":"' . $icon |
|
| 92 | - . '","w":"' . $icon_size['w'] |
|
| 93 | - . '","h":"' . $icon_size['h'] . '"}'; |
|
| 86 | + $post_json = '{"id":"'.$post->ID
|
|
| 87 | + . '","t": "'.$title |
|
| 88 | + . '","lt": "'.$post->post_latitude |
|
| 89 | + . '","ln": "'.$post->post_longitude |
|
| 90 | + . '","mk_id":"'.$post->ID.'_'.$post->default_category |
|
| 91 | + . '","i":"'.$icon |
|
| 92 | + . '","w":"'.$icon_size['w'] |
|
| 93 | + . '","h":"'.$icon_size['h'].'"}'; |
|
| 94 | 94 | |
| 95 | 95 | /** |
| 96 | 96 | * Filter the json data when creating output for post json marker.. |
@@ -99,10 +99,10 @@ discard block |
||
| 99 | 99 | * @param string $post_json JSON representation of the post marker info. |
| 100 | 100 | * @param object $post The post object. |
| 101 | 101 | */ |
| 102 | - $post_map_json = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);
|
|
| 102 | + $post_map_json = apply_filters('geodir_create_marker_jason_of_posts', $post_json, $post);
|
|
| 103 | 103 | |
| 104 | 104 | // only assign it if it has a value |
| 105 | - if($post_map_json){
|
|
| 105 | + if ($post_map_json) {
|
|
| 106 | 106 | $map_jason[$post->ID] = $post_map_json; |
| 107 | 107 | } |
| 108 | 108 | |
@@ -126,13 +126,13 @@ discard block |
||
| 126 | 126 | if (is_array($map_jason) && !empty($map_jason)) {
|
| 127 | 127 | |
| 128 | 128 | // on details page only show the main marker on the map |
| 129 | - if(geodir_is_page('detail')){
|
|
| 129 | + if (geodir_is_page('detail')) {
|
|
| 130 | 130 | global $post; |
| 131 | - if(isset($map_jason[$post->ID])){
|
|
| 131 | + if (isset($map_jason[$post->ID])) {
|
|
| 132 | 132 | $map_jason = array($map_jason[$post->ID]); |
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | - $canvas_jason = $canvas . "_jason"; |
|
| 135 | + $canvas_jason = $canvas."_jason"; |
|
| 136 | 136 | $map_canvas_arr[$canvas] = array_unique($map_jason); |
| 137 | 137 | unset($cat_content_info); |
| 138 | 138 | $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);
|
@@ -141,11 +141,11 @@ discard block |
||
| 141 | 141 | $json_content = substr(implode(',', $cat_content_info), 1);
|
| 142 | 142 | $json_content = htmlentities($json_content, ENT_QUOTES, get_option('blog_charset')); // Quotes in csv title import break maps - FIXED by kiran on 2nd March, 2016
|
| 143 | 143 | $json_content = wp_specialchars_decode($json_content); // Fixed #post-320722 on 2016-12-08 |
| 144 | - $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . $json_content . ']';
|
|
| 144 | + $canvas_jason = '[{"totalcount":"'.$totalcount.'",'.$json_content.']';
|
|
| 145 | 145 | } else {
|
| 146 | 146 | $canvas_jason = '[{"totalcount":"0"}]';
|
| 147 | 147 | } |
| 148 | - $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 148 | + $map_canvas_jason_args = array($canvas.'_jason' => $canvas_jason); |
|
| 149 | 149 | |
| 150 | 150 | /** |
| 151 | 151 | * Filter the send_marker_jason_to_js() function map canvas json args. |
@@ -157,12 +157,12 @@ discard block |
||
| 157 | 157 | * @param string $canvas Map canvas array key. |
| 158 | 158 | * @param array $map_canvas_jason_args Map canvas args. |
| 159 | 159 | */ |
| 160 | - $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 160 | + $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_'.$canvas, $map_canvas_jason_args);
|
|
| 161 | 161 | |
| 162 | - wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 162 | + wp_localize_script('geodir-map-widget', $canvas.'_jason_args', $map_canvas_jason_args);
|
|
| 163 | 163 | } else {
|
| 164 | 164 | $canvas_jason = '[{"totalcount":"0"}]';
|
| 165 | - $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason); |
|
| 165 | + $map_canvas_jason_args = array($canvas.'_jason' => $canvas_jason); |
|
| 166 | 166 | |
| 167 | 167 | /** |
| 168 | 168 | * Filter the send_marker_jason_to_js() function map canvas json args. |
@@ -174,8 +174,8 @@ discard block |
||
| 174 | 174 | * @param string $canvas Map canvas array key. |
| 175 | 175 | * @param array $map_canvas_jason_args Map canvas args. |
| 176 | 176 | */ |
| 177 | - $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_' . $canvas, $map_canvas_jason_args);
|
|
| 178 | - wp_localize_script('geodir-map-widget', $canvas . '_jason_args', $map_canvas_jason_args);
|
|
| 177 | + $map_canvas_jason_args = apply_filters('geodir_map_canvas_jason_'.$canvas, $map_canvas_jason_args);
|
|
| 178 | + wp_localize_script('geodir-map-widget', $canvas.'_jason_args', $map_canvas_jason_args);
|
|
| 179 | 179 | } |
| 180 | 180 | } |
| 181 | 181 | |
@@ -240,11 +240,11 @@ discard block |
||
| 240 | 240 | $display = !$child_collapse ? '' : 'display:none'; |
| 241 | 241 | } |
| 242 | 242 | |
| 243 | - $out = '<ul class="treeview ' . $list_class . '" style="margin-left:' . $p . 'px;' . $display . ';">'; |
|
| 243 | + $out = '<ul class="treeview '.$list_class.'" style="margin-left:'.$p.'px;'.$display.';">'; |
|
| 244 | 244 | |
| 245 | 245 | $geodir_cat_icons = geodir_get_term_icon(); |
| 246 | 246 | |
| 247 | - $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';
|
|
| 247 | + $geodir_default_map_search_pt = (get_option('geodir_default_map_search_pt')) ? get_option('geodir_default_map_search_pt') : 'gd_place';
|
|
| 248 | 248 | if ($is_home_map && $homemap_catlist_ptype = $gd_session->get('homemap_catlist_ptype')) {
|
| 249 | 249 | $geodir_default_map_search_pt = $homemap_catlist_ptype; |
| 250 | 250 | } |
@@ -259,23 +259,23 @@ discard block |
||
| 259 | 259 | |
| 260 | 260 | // Untick the category by default on home map |
| 261 | 261 | if ($is_home_map && $geodir_home_map_untick = get_option('geodir_home_map_untick')) {
|
| 262 | - if (geodir_wpml_is_taxonomy_translated($post_type . 'category')) { // if WPML
|
|
| 262 | + if (geodir_wpml_is_taxonomy_translated($post_type.'category')) { // if WPML
|
|
| 263 | 263 | global $sitepress; |
| 264 | 264 | $default_lang = $sitepress->get_default_language(); |
| 265 | 265 | $term_id = geodir_wpml_object_id($cat_term->term_id, $post_type.'category', true, $default_lang); |
| 266 | - }else{
|
|
| 266 | + } else {
|
|
| 267 | 267 | $term_id = $cat_term->term_id; |
| 268 | 268 | } |
| 269 | - if (!empty($geodir_home_map_untick) && in_array($post_type . '_' . $term_id, $geodir_home_map_untick)) {
|
|
| 269 | + if (!empty($geodir_home_map_untick) && in_array($post_type.'_'.$term_id, $geodir_home_map_untick)) {
|
|
| 270 | 270 | $checked = ''; |
| 271 | 271 | } |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | - $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"'; |
|
| 275 | - $term_check .= ' name="' . $map_canvas_name . '_cat[]" '; |
|
| 276 | - $term_check .= ' title="' . esc_attr(geodir_utf8_ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">'; |
|
| 277 | - $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '"/>'; |
|
| 278 | - $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . geodir_utf8_ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>'; |
|
| 274 | + $term_check = '<input type="checkbox" '.$checked.' id="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'" class="group_selector '.$main_list_class.'"'; |
|
| 275 | + $term_check .= ' name="'.$map_canvas_name.'_cat[]" '; |
|
| 276 | + $term_check .= ' title="'.esc_attr(geodir_utf8_ucfirst($cat_term->name)).'" value="'.$cat_term->term_id.'" onclick="javascript:build_map_ajax_search_param(\''.$map_canvas_name.'\',false, this)">'; |
|
| 277 | + $term_img = '<img height="15" width="15" alt="'.$cat_term->taxonomy.'" src="'.$icon.'" title="'.geodir_utf8_ucfirst($cat_term->name).'"/>'; |
|
| 278 | + $out .= '<li>'.$term_check.'<label for="'.$map_canvas_name.'_tick_cat_'.$cat_term->term_id.'">'.$term_img.geodir_utf8_ucfirst($cat_term->name).'</label><i class="fa fa-long-arrow-down"></i>'; |
|
| 279 | 279 | |
| 280 | 280 | endif; |
| 281 | 281 | |
@@ -387,19 +387,19 @@ discard block |
||
| 387 | 387 | * @package GeoDirectory |
| 388 | 388 | */ |
| 389 | 389 | function geodir_map_load_script() {
|
| 390 | - if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is( 'google-maps-api', 'done')) {
|
|
| 390 | + if (in_array(geodir_map_name(), array('auto', 'google')) && wp_script_is('google-maps-api', 'done')) {
|
|
| 391 | 391 | $plugin_url = geodir_plugin_url(); |
| 392 | 392 | ?> |
| 393 | 393 | <script type="text/javascript"> |
| 394 | 394 | if (!(window.google && typeof google.maps !== 'undefined')) {
|
| 395 | - var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-style-css");css.setAttribute("href","<?php echo $plugin_url;?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION;?>");
|
|
| 395 | + var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-style-css");css.setAttribute("href","<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/leaflet.css?ver=<?php echo GEODIRECTORY_VERSION; ?>");
|
|
| 396 | 396 | document.getElementsByTagName("head")[0].appendChild(css);
|
| 397 | - var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-routing-style");css.setAttribute("href","<?php echo $plugin_url;?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css?ver=<?php echo GEODIRECTORY_VERSION;?>");
|
|
| 397 | + var css = document.createElement("link");css.setAttribute("rel","stylesheet");css.setAttribute("type","text/css");css.setAttribute("media","all");css.setAttribute("id","geodirectory-leaflet-routing-style");css.setAttribute("href","<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css?ver=<?php echo GEODIRECTORY_VERSION; ?>");
|
|
| 398 | 398 | document.getElementsByTagName("head")[0].appendChild(css);
|
| 399 | - document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
|
|
| 400 | - document.write('<' + 'script id="geodirectory-leaflet-geo-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/osm.geocode.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
|
|
| 401 | - document.write('<' + 'script id="geodirectory-leaflet-routing-script" src="<?php echo $plugin_url;?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
|
|
| 402 | - document.write('<' + 'script id="geodirectory-o-overlappingmarker-script" src="<?php echo $plugin_url;?>/geodirectory-assets/jawj/oms-leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION;?>" type="text/javascript"><' + '/script>');
|
|
| 399 | + document.write('<' + 'script id="geodirectory-leaflet-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
|
|
| 400 | + document.write('<' + 'script id="geodirectory-leaflet-geo-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/osm.geocode.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
|
|
| 401 | + document.write('<' + 'script id="geodirectory-leaflet-routing-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
|
|
| 402 | + document.write('<' + 'script id="geodirectory-o-overlappingmarker-script" src="<?php echo $plugin_url; ?>/geodirectory-assets/jawj/oms-leaflet.min.js?ver=<?php echo GEODIRECTORY_VERSION; ?>" type="text/javascript"><' + '/script>');
|
|
| 403 | 403 | } |
| 404 | 404 | </script> |
| 405 | 405 | <?php |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | break; |
| 328 | 328 | case 'preview': |
| 329 | 329 | if ( ( is_page() && get_query_var( 'page_id' ) == geodir_preview_page_id() ) && isset( $_REQUEST['listing_type'] ) |
| 330 | - && in_array( $_REQUEST['listing_type'], geodir_get_posttypes() ) |
|
| 330 | + && in_array( $_REQUEST['listing_type'], geodir_get_posttypes() ) |
|
| 331 | 331 | ) {
|
| 332 | 332 | return true; |
| 333 | 333 | } |
@@ -528,9 +528,9 @@ discard block |
||
| 528 | 528 | |
| 529 | 529 | //check if homepage |
| 530 | 530 | if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) |
| 531 | - && ! isset( $wp->query_vars['page_id'] ) |
|
| 532 | - && ! isset( $wp->query_vars['pagename'] ) |
|
| 533 | - && is_page_geodir_home() |
|
| 531 | + && ! isset( $wp->query_vars['page_id'] ) |
|
| 532 | + && ! isset( $wp->query_vars['pagename'] ) |
|
| 533 | + && is_page_geodir_home() |
|
| 534 | 534 | ) {
|
| 535 | 535 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 536 | 536 | } |
@@ -715,8 +715,8 @@ discard block |
||
| 715 | 715 | $deltaLatitude = deg2rad( (float) $point2['latitude'] - (float) $point1['latitude'] ); |
| 716 | 716 | $deltaLongitude = deg2rad( (float) $point2['longitude'] - (float) $point1['longitude'] ); |
| 717 | 717 | $a = sin( $deltaLatitude / 2 ) * sin( $deltaLatitude / 2 ) + |
| 718 | - cos( deg2rad( (float) $point1['latitude'] ) ) * cos( deg2rad( (float) $point2['latitude'] ) ) * |
|
| 719 | - sin( $deltaLongitude / 2 ) * sin( $deltaLongitude / 2 ); |
|
| 718 | + cos( deg2rad( (float) $point1['latitude'] ) ) * cos( deg2rad( (float) $point2['latitude'] ) ) * |
|
| 719 | + sin( $deltaLongitude / 2 ) * sin( $deltaLongitude / 2 ); |
|
| 720 | 720 | $c = 2 * atan2( sqrt( $a ), sqrt( 1 - $a ) ); |
| 721 | 721 | $distance = $earthMeanRadius * $c; |
| 722 | 722 | |
@@ -3865,10 +3865,10 @@ discard block |
||
| 3865 | 3865 | $gridview_columns_widget = ''; |
| 3866 | 3866 | } |
| 3867 | 3867 | /** |
| 3868 | - * Filter the widget listing listview template path. |
|
| 3869 | - * |
|
| 3870 | - * @since 1.0.0 |
|
| 3871 | - */ |
|
| 3868 | + * Filter the widget listing listview template path. |
|
| 3869 | + * |
|
| 3870 | + * @since 1.0.0 |
|
| 3871 | + */ |
|
| 3872 | 3872 | $template = apply_filters( "geodir_template_part-widget-listing-listview", geodir_locate_template( 'widget-listing-listview' ) ); |
| 3873 | 3873 | if ( ! isset( $character_count ) ) {
|
| 3874 | 3874 | /** |
@@ -5251,7 +5251,7 @@ discard block |
||
| 5251 | 5251 | * @param string $name The name of the string which helps to know what's being translated. |
| 5252 | 5252 | */ |
| 5253 | 5253 | function geodir_wpml_register_string( $string, $domain = 'geodirectory', $name = '' ) {
|
| 5254 | - do_action( 'wpml_register_single_string', $domain, $name, $string ); |
|
| 5254 | + do_action( 'wpml_register_single_string', $domain, $name, $string ); |
|
| 5255 | 5255 | } |
| 5256 | 5256 | |
| 5257 | 5257 | /** |
@@ -5267,5 +5267,5 @@ discard block |
||
| 5267 | 5267 | * @return string The translated string. |
| 5268 | 5268 | */ |
| 5269 | 5269 | function geodir_wpml_translate_string( $string, $domain = 'geodirectory', $name = '', $language_code = NULL ) {
|
| 5270 | - return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code ); |
|
| 5270 | + return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code ); |
|
| 5271 | 5271 | } |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | /** |
| 11 | 11 | * Get All Plugin functions from WordPress |
| 12 | 12 | */ |
| 13 | -include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); |
|
| 13 | +include_once(ABSPATH.'wp-admin/includes/plugin.php'); |
|
| 14 | 14 | |
| 15 | 15 | /*-----------------------------------------------------------------------------------*/ |
| 16 | 16 | /* Helper functions */ |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | * @return string example url eg: http://wpgeo.directory/wp-content/plugins/geodirectory |
| 28 | 28 | */ |
| 29 | 29 | function geodir_plugin_url() {
|
| 30 | - return plugins_url( '', dirname( __FILE__ ) ); |
|
| 30 | + return plugins_url('', dirname(__FILE__));
|
|
| 31 | 31 | /* |
| 32 | 32 | if ( is_ssl() ) : |
| 33 | 33 | return str_replace( 'http://', 'https://', WP_PLUGIN_URL ) . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) ); |
@@ -47,10 +47,10 @@ discard block |
||
| 47 | 47 | * @return string example url eg: /home/geo/public_html/wp-content/plugins/geodirectory |
| 48 | 48 | */ |
| 49 | 49 | function geodir_plugin_path() {
|
| 50 | - if ( defined( 'GD_TESTING_MODE' ) && GD_TESTING_MODE ) {
|
|
| 51 | - return dirname( dirname( __FILE__ ) ); |
|
| 50 | + if (defined('GD_TESTING_MODE') && GD_TESTING_MODE) {
|
|
| 51 | + return dirname(dirname(__FILE__)); |
|
| 52 | 52 | } else {
|
| 53 | - return WP_PLUGIN_DIR . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) ); |
|
| 53 | + return WP_PLUGIN_DIR."/".plugin_basename(dirname(dirname(__FILE__))); |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | |
@@ -65,10 +65,10 @@ discard block |
||
| 65 | 65 | * @return bool true or false. |
| 66 | 66 | * @todo check if this is faster than normal WP check and remove if not. |
| 67 | 67 | */ |
| 68 | -function geodir_is_plugin_active( $plugin ) {
|
|
| 69 | - $active_plugins = get_option( 'active_plugins' ); |
|
| 70 | - foreach ( $active_plugins as $key => $active_plugin ) {
|
|
| 71 | - if ( strstr( $active_plugin, $plugin ) ) {
|
|
| 68 | +function geodir_is_plugin_active($plugin) {
|
|
| 69 | + $active_plugins = get_option('active_plugins');
|
|
| 70 | + foreach ($active_plugins as $key => $active_plugin) {
|
|
| 71 | + if (strstr($active_plugin, $plugin)) {
|
|
| 72 | 72 | return true; |
| 73 | 73 | } |
| 74 | 74 | } |
@@ -90,8 +90,8 @@ discard block |
||
| 90 | 90 | * |
| 91 | 91 | * @return bool|int|string the formatted date. |
| 92 | 92 | */ |
| 93 | -function geodir_get_formated_date( $date ) {
|
|
| 94 | - return mysql2date( get_option( 'date_format' ), $date ); |
|
| 93 | +function geodir_get_formated_date($date) {
|
|
| 94 | + return mysql2date(get_option('date_format'), $date);
|
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | /** |
@@ -107,8 +107,8 @@ discard block |
||
| 107 | 107 | * |
| 108 | 108 | * @return bool|int|string the formatted time. |
| 109 | 109 | */ |
| 110 | -function geodir_get_formated_time( $time ) {
|
|
| 111 | - return mysql2date( get_option( 'time_format' ), $time, $translate = true ); |
|
| 110 | +function geodir_get_formated_time($time) {
|
|
| 111 | + return mysql2date(get_option('time_format'), $time, $translate = true);
|
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | |
@@ -126,35 +126,35 @@ discard block |
||
| 126 | 126 | * |
| 127 | 127 | * @return string Formatted link. |
| 128 | 128 | */ |
| 129 | -function geodir_getlink( $url, $params = array(), $use_existing_arguments = false ) {
|
|
| 130 | - if ( $use_existing_arguments ) {
|
|
| 129 | +function geodir_getlink($url, $params = array(), $use_existing_arguments = false) {
|
|
| 130 | + if ($use_existing_arguments) {
|
|
| 131 | 131 | $params = $params + $_GET; |
| 132 | 132 | } |
| 133 | - if ( ! $params ) {
|
|
| 133 | + if (!$params) {
|
|
| 134 | 134 | return $url; |
| 135 | 135 | } |
| 136 | 136 | $link = $url; |
| 137 | - if ( strpos( $link, '?' ) === false ) {
|
|
| 137 | + if (strpos($link, '?') === false) {
|
|
| 138 | 138 | $link .= '?'; |
| 139 | 139 | } //If there is no '?' add one at the end |
| 140 | - elseif ( strpos( $link, '//maps.google.com/maps/api/js?language=' ) ) {
|
|
| 140 | + elseif (strpos($link, '//maps.google.com/maps/api/js?language=')) {
|
|
| 141 | 141 | $link .= '&'; |
| 142 | 142 | } //If there is no '&' at the END, add one. |
| 143 | - elseif ( ! preg_match( '/(\?|\&(amp;)?)$/', $link ) ) {
|
|
| 143 | + elseif (!preg_match('/(\?|\&(amp;)?)$/', $link)) {
|
|
| 144 | 144 | $link .= '&'; |
| 145 | 145 | } //If there is no '&' at the END, add one. |
| 146 | 146 | |
| 147 | 147 | $params_arr = array(); |
| 148 | - foreach ( $params as $key => $value ) {
|
|
| 149 | - if ( gettype( $value ) == 'array' ) { //Handle array data properly
|
|
| 150 | - foreach ( $value as $val ) {
|
|
| 151 | - $params_arr[] = $key . '[]=' . urlencode( $val ); |
|
| 148 | + foreach ($params as $key => $value) {
|
|
| 149 | + if (gettype($value) == 'array') { //Handle array data properly
|
|
| 150 | + foreach ($value as $val) {
|
|
| 151 | + $params_arr[] = $key.'[]='.urlencode($val); |
|
| 152 | 152 | } |
| 153 | 153 | } else {
|
| 154 | - $params_arr[] = $key . '=' . urlencode( $value ); |
|
| 154 | + $params_arr[] = $key.'='.urlencode($value); |
|
| 155 | 155 | } |
| 156 | 156 | } |
| 157 | - $link .= implode( '&', $params_arr ); |
|
| 157 | + $link .= implode('&', $params_arr);
|
|
| 158 | 158 | |
| 159 | 159 | return $link; |
| 160 | 160 | } |
@@ -171,18 +171,18 @@ discard block |
||
| 171 | 171 | * |
| 172 | 172 | * @return string Listing page url if valid. Otherwise home url will be returned. |
| 173 | 173 | */ |
| 174 | -function geodir_get_addlisting_link( $post_type = '' ) {
|
|
| 174 | +function geodir_get_addlisting_link($post_type = '') {
|
|
| 175 | 175 | global $wpdb; |
| 176 | 176 | |
| 177 | 177 | //$check_pkg = $wpdb->get_var("SELECT pid FROM ".GEODIR_PRICE_TABLE." WHERE post_type='".$post_type."' and status != '0'");
|
| 178 | 178 | $check_pkg = 1; |
| 179 | - if ( post_type_exists( $post_type ) && $check_pkg ) {
|
|
| 179 | + if (post_type_exists($post_type) && $check_pkg) {
|
|
| 180 | 180 | |
| 181 | - $add_listing_link = get_page_link( geodir_add_listing_page_id() ); |
|
| 181 | + $add_listing_link = get_page_link(geodir_add_listing_page_id()); |
|
| 182 | 182 | |
| 183 | - return esc_url( add_query_arg( array( 'listing_type' => $post_type ), $add_listing_link ) ); |
|
| 183 | + return esc_url(add_query_arg(array('listing_type' => $post_type), $add_listing_link));
|
|
| 184 | 184 | } else {
|
| 185 | - return get_bloginfo( 'url' ); |
|
| 185 | + return get_bloginfo('url');
|
|
| 186 | 186 | } |
| 187 | 187 | } |
| 188 | 188 | |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | if (!empty($_SERVER['PHP_SELF']) && !empty($_SERVER['REQUEST_URI'])) {
|
| 211 | 211 | // To build the entire URI we need to prepend the protocol, and the http host |
| 212 | 212 | // to the URI string. |
| 213 | - $pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; |
|
| 213 | + $pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']; |
|
| 214 | 214 | } else {
|
| 215 | 215 | /* |
| 216 | 216 | * Since we do not have REQUEST_URI to work with, we will assume we are |
@@ -219,11 +219,11 @@ discard block |
||
| 219 | 219 | * |
| 220 | 220 | * IIS uses the SCRIPT_NAME variable instead of a REQUEST_URI variable... thanks, MS |
| 221 | 221 | */ |
| 222 | - $pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME']; |
|
| 222 | + $pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME']; |
|
| 223 | 223 | |
| 224 | 224 | // If the query string exists append it to the URI string |
| 225 | 225 | if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
|
| 226 | - $pageURL .= '?' . $_SERVER['QUERY_STRING']; |
|
| 226 | + $pageURL .= '?'.$_SERVER['QUERY_STRING']; |
|
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | 229 | |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | * |
| 235 | 235 | * @param string $pageURL The URL of the current page. |
| 236 | 236 | */ |
| 237 | - return apply_filters( 'geodir_curPageURL', $pageURL ); |
|
| 237 | + return apply_filters('geodir_curPageURL', $pageURL);
|
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | /** |
@@ -249,12 +249,12 @@ discard block |
||
| 249 | 249 | * |
| 250 | 250 | * @return string Cleaned variable. |
| 251 | 251 | */ |
| 252 | -function geodir_clean( $string ) {
|
|
| 252 | +function geodir_clean($string) {
|
|
| 253 | 253 | |
| 254 | - $string = trim( strip_tags( stripslashes( $string ) ) ); |
|
| 255 | - $string = str_replace( " ", "-", $string ); // Replaces all spaces with hyphens. |
|
| 256 | - $string = preg_replace( '/[^A-Za-z0-9\-\_]/', '', $string ); // Removes special chars. |
|
| 257 | - $string = preg_replace( '/-+/', '-', $string ); // Replaces multiple hyphens with single one. |
|
| 254 | + $string = trim(strip_tags(stripslashes($string))); |
|
| 255 | + $string = str_replace(" ", "-", $string); // Replaces all spaces with hyphens.
|
|
| 256 | + $string = preg_replace('/[^A-Za-z0-9\-\_]/', '', $string); // Removes special chars.
|
|
| 257 | + $string = preg_replace('/-+/', '-', $string); // Replaces multiple hyphens with single one.
|
|
| 258 | 258 | |
| 259 | 259 | return $string; |
| 260 | 260 | } |
@@ -268,13 +268,13 @@ discard block |
||
| 268 | 268 | */ |
| 269 | 269 | function geodir_get_weekday() {
|
| 270 | 270 | return array( |
| 271 | - __( 'Sunday', 'geodirectory' ), |
|
| 272 | - __( 'Monday', 'geodirectory' ), |
|
| 273 | - __( 'Tuesday', 'geodirectory' ), |
|
| 274 | - __( 'Wednesday', 'geodirectory' ), |
|
| 275 | - __( 'Thursday', 'geodirectory' ), |
|
| 276 | - __( 'Friday', 'geodirectory' ), |
|
| 277 | - __( 'Saturday', 'geodirectory' ) |
|
| 271 | + __('Sunday', 'geodirectory'),
|
|
| 272 | + __('Monday', 'geodirectory'),
|
|
| 273 | + __('Tuesday', 'geodirectory'),
|
|
| 274 | + __('Wednesday', 'geodirectory'),
|
|
| 275 | + __('Thursday', 'geodirectory'),
|
|
| 276 | + __('Friday', 'geodirectory'),
|
|
| 277 | + __('Saturday', 'geodirectory')
|
|
| 278 | 278 | ); |
| 279 | 279 | } |
| 280 | 280 | |
@@ -287,11 +287,11 @@ discard block |
||
| 287 | 287 | */ |
| 288 | 288 | function geodir_get_weeks() {
|
| 289 | 289 | return array( |
| 290 | - __( 'First', 'geodirectory' ), |
|
| 291 | - __( 'Second', 'geodirectory' ), |
|
| 292 | - __( 'Third', 'geodirectory' ), |
|
| 293 | - __( 'Fourth', 'geodirectory' ), |
|
| 294 | - __( 'Last', 'geodirectory' ) |
|
| 290 | + __('First', 'geodirectory'),
|
|
| 291 | + __('Second', 'geodirectory'),
|
|
| 292 | + __('Third', 'geodirectory'),
|
|
| 293 | + __('Fourth', 'geodirectory'),
|
|
| 294 | + __('Last', 'geodirectory')
|
|
| 295 | 295 | ); |
| 296 | 296 | } |
| 297 | 297 | |
@@ -310,112 +310,112 @@ discard block |
||
| 310 | 310 | * |
| 311 | 311 | * @return bool If valid returns true. Otherwise false. |
| 312 | 312 | */ |
| 313 | -function geodir_is_page( $gdpage = '' ) {
|
|
| 313 | +function geodir_is_page($gdpage = '') {
|
|
| 314 | 314 | |
| 315 | 315 | global $wp_query, $post, $wp; |
| 316 | 316 | //if(!is_admin()): |
| 317 | 317 | |
| 318 | - switch ( $gdpage ): |
|
| 318 | + switch ($gdpage): |
|
| 319 | 319 | case 'add-listing': |
| 320 | 320 | |
| 321 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_add_listing_page_id() ) {
|
|
| 321 | + if (is_page() && get_query_var('page_id') == geodir_add_listing_page_id()) {
|
|
| 322 | 322 | return true; |
| 323 | - } elseif ( is_page() && isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {
|
|
| 323 | + } elseif (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
|
|
| 324 | 324 | return true; |
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | break; |
| 328 | 328 | case 'preview': |
| 329 | - if ( ( is_page() && get_query_var( 'page_id' ) == geodir_preview_page_id() ) && isset( $_REQUEST['listing_type'] ) |
|
| 330 | - && in_array( $_REQUEST['listing_type'], geodir_get_posttypes() ) |
|
| 329 | + if ((is_page() && get_query_var('page_id') == geodir_preview_page_id()) && isset($_REQUEST['listing_type'])
|
|
| 330 | + && in_array($_REQUEST['listing_type'], geodir_get_posttypes()) |
|
| 331 | 331 | ) {
|
| 332 | 332 | return true; |
| 333 | 333 | } |
| 334 | 334 | break; |
| 335 | 335 | case 'listing-success': |
| 336 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_success_page_id() ) {
|
|
| 336 | + if (is_page() && get_query_var('page_id') == geodir_success_page_id()) {
|
|
| 337 | 337 | return true; |
| 338 | 338 | } |
| 339 | 339 | break; |
| 340 | 340 | case 'detail': |
| 341 | - $post_type = get_query_var( 'post_type' ); |
|
| 342 | - if ( is_array( $post_type ) ) {
|
|
| 343 | - $post_type = reset( $post_type ); |
|
| 341 | + $post_type = get_query_var('post_type');
|
|
| 342 | + if (is_array($post_type)) {
|
|
| 343 | + $post_type = reset($post_type); |
|
| 344 | 344 | } |
| 345 | - if ( is_single() && in_array( $post_type, geodir_get_posttypes() ) ) {
|
|
| 345 | + if (is_single() && in_array($post_type, geodir_get_posttypes())) {
|
|
| 346 | 346 | return true; |
| 347 | 347 | } |
| 348 | 348 | break; |
| 349 | 349 | case 'pt': |
| 350 | - $post_type = get_query_var( 'post_type' ); |
|
| 351 | - if ( is_array( $post_type ) ) {
|
|
| 352 | - $post_type = reset( $post_type ); |
|
| 350 | + $post_type = get_query_var('post_type');
|
|
| 351 | + if (is_array($post_type)) {
|
|
| 352 | + $post_type = reset($post_type); |
|
| 353 | 353 | } |
| 354 | - if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) && ! is_tax() ) {
|
|
| 354 | + if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes()) && !is_tax()) {
|
|
| 355 | 355 | return true; |
| 356 | 356 | } |
| 357 | 357 | |
| 358 | 358 | break; |
| 359 | 359 | case 'listing': |
| 360 | - if ( is_tax() && geodir_get_taxonomy_posttype() ) {
|
|
| 360 | + if (is_tax() && geodir_get_taxonomy_posttype()) {
|
|
| 361 | 361 | global $current_term, $taxonomy, $term; |
| 362 | 362 | |
| 363 | 363 | return true; |
| 364 | 364 | } |
| 365 | - $post_type = get_query_var( 'post_type' ); |
|
| 366 | - if ( is_array( $post_type ) ) {
|
|
| 367 | - $post_type = reset( $post_type ); |
|
| 365 | + $post_type = get_query_var('post_type');
|
|
| 366 | + if (is_array($post_type)) {
|
|
| 367 | + $post_type = reset($post_type); |
|
| 368 | 368 | } |
| 369 | - if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) ) {
|
|
| 369 | + if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes())) {
|
|
| 370 | 370 | return true; |
| 371 | 371 | } |
| 372 | 372 | |
| 373 | 373 | break; |
| 374 | 374 | case 'home': |
| 375 | 375 | |
| 376 | - if ( ( is_page() && get_query_var( 'page_id' ) == geodir_home_page_id() ) || is_page_geodir_home() ) {
|
|
| 376 | + if ((is_page() && get_query_var('page_id') == geodir_home_page_id()) || is_page_geodir_home()) {
|
|
| 377 | 377 | return true; |
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | break; |
| 381 | 381 | case 'location': |
| 382 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_location_page_id() ) {
|
|
| 382 | + if (is_page() && get_query_var('page_id') == geodir_location_page_id()) {
|
|
| 383 | 383 | return true; |
| 384 | 384 | } |
| 385 | 385 | break; |
| 386 | 386 | case 'author': |
| 387 | - if ( is_author() && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 387 | + if (is_author() && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 388 | 388 | return true; |
| 389 | 389 | } |
| 390 | 390 | |
| 391 | - if ( function_exists( 'bp_loggedin_user_id' ) && function_exists( 'bp_displayed_user_id' ) && $my_id = (int) bp_loggedin_user_id() ) {
|
|
| 392 | - if ( ( (bool) bp_is_current_component( 'listings' ) || (bool) bp_is_current_component( 'favorites' ) ) && $my_id > 0 && $my_id == (int) bp_displayed_user_id() ) {
|
|
| 391 | + if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int) bp_loggedin_user_id()) {
|
|
| 392 | + if (((bool) bp_is_current_component('listings') || (bool) bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int) bp_displayed_user_id()) {
|
|
| 393 | 393 | return true; |
| 394 | 394 | } |
| 395 | 395 | } |
| 396 | 396 | break; |
| 397 | 397 | case 'search': |
| 398 | - if ( is_search() && isset( $_REQUEST['geodir_search'] ) ) {
|
|
| 398 | + if (is_search() && isset($_REQUEST['geodir_search'])) {
|
|
| 399 | 399 | return true; |
| 400 | 400 | } |
| 401 | 401 | break; |
| 402 | 402 | case 'info': |
| 403 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_info_page_id() ) {
|
|
| 403 | + if (is_page() && get_query_var('page_id') == geodir_info_page_id()) {
|
|
| 404 | 404 | return true; |
| 405 | 405 | } |
| 406 | 406 | break; |
| 407 | 407 | case 'login': |
| 408 | - if ( is_page() && get_query_var( 'page_id' ) == geodir_login_page_id() ) {
|
|
| 408 | + if (is_page() && get_query_var('page_id') == geodir_login_page_id()) {
|
|
| 409 | 409 | return true; |
| 410 | 410 | } |
| 411 | 411 | break; |
| 412 | 412 | case 'checkout': |
| 413 | - if ( is_page() && function_exists( 'geodir_payment_checkout_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_checkout_page_id() ) {
|
|
| 413 | + if (is_page() && function_exists('geodir_payment_checkout_page_id') && get_query_var('page_id') == geodir_payment_checkout_page_id()) {
|
|
| 414 | 414 | return true; |
| 415 | 415 | } |
| 416 | 416 | break; |
| 417 | 417 | case 'invoices': |
| 418 | - if ( is_page() && function_exists( 'geodir_payment_invoices_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_invoices_page_id() ) {
|
|
| 418 | + if (is_page() && function_exists('geodir_payment_invoices_page_id') && get_query_var('page_id') == geodir_payment_invoices_page_id()) {
|
|
| 419 | 419 | return true; |
| 420 | 420 | } |
| 421 | 421 | break; |
@@ -440,25 +440,25 @@ discard block |
||
| 440 | 440 | * |
| 441 | 441 | * @param object $wp WordPress object. |
| 442 | 442 | */ |
| 443 | -function geodir_set_is_geodir_page( $wp ) {
|
|
| 444 | - if ( ! is_admin() ) {
|
|
| 443 | +function geodir_set_is_geodir_page($wp) {
|
|
| 444 | + if (!is_admin()) {
|
|
| 445 | 445 | //$wp->query_vars['gd_is_geodir_page'] = false; |
| 446 | 446 | //print_r() |
| 447 | - if ( empty( $wp->query_vars ) || ! array_diff( array_keys( $wp->query_vars ), array( |
|
| 447 | + if (empty($wp->query_vars) || !array_diff(array_keys($wp->query_vars), array( |
|
| 448 | 448 | 'preview', |
| 449 | 449 | 'page', |
| 450 | 450 | 'paged', |
| 451 | 451 | 'cpage' |
| 452 | - ) ) |
|
| 452 | + )) |
|
| 453 | 453 | ) {
|
| 454 | - if ( geodir_is_page( 'home' ) ) {
|
|
| 454 | + if (geodir_is_page('home')) {
|
|
| 455 | 455 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 456 | 456 | } |
| 457 | 457 | |
| 458 | 458 | |
| 459 | 459 | } |
| 460 | 460 | |
| 461 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['page_id'] ) ) {
|
|
| 461 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['page_id'])) {
|
|
| 462 | 462 | if ( |
| 463 | 463 | $wp->query_vars['page_id'] == geodir_add_listing_page_id() |
| 464 | 464 | || $wp->query_vars['page_id'] == geodir_preview_page_id() |
@@ -467,26 +467,26 @@ discard block |
||
| 467 | 467 | || $wp->query_vars['page_id'] == geodir_home_page_id() |
| 468 | 468 | || $wp->query_vars['page_id'] == geodir_info_page_id() |
| 469 | 469 | || $wp->query_vars['page_id'] == geodir_login_page_id() |
| 470 | - || ( function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() ) |
|
| 471 | - || ( function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() ) |
|
| 470 | + || (function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())
|
|
| 471 | + || (function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())
|
|
| 472 | 472 | ) {
|
| 473 | 473 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 474 | 474 | } |
| 475 | 475 | } |
| 476 | 476 | |
| 477 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['pagename'] ) ) {
|
|
| 478 | - $page = get_page_by_path( $wp->query_vars['pagename'] ); |
|
| 477 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['pagename'])) {
|
|
| 478 | + $page = get_page_by_path($wp->query_vars['pagename']); |
|
| 479 | 479 | |
| 480 | - if ( ! empty( $page ) && ( |
|
| 480 | + if (!empty($page) && ( |
|
| 481 | 481 | $page->ID == geodir_add_listing_page_id() |
| 482 | 482 | || $page->ID == geodir_preview_page_id() |
| 483 | 483 | || $page->ID == geodir_success_page_id() |
| 484 | 484 | || $page->ID == geodir_location_page_id() |
| 485 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_home_page_id() ) |
|
| 486 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_info_page_id() ) |
|
| 487 | - || ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_login_page_id() ) |
|
| 488 | - || ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() ) |
|
| 489 | - || ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() ) |
|
| 485 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_home_page_id()) |
|
| 486 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_info_page_id()) |
|
| 487 | + || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_login_page_id()) |
|
| 488 | + || (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())
|
|
| 489 | + || (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())
|
|
| 490 | 490 | ) |
| 491 | 491 | ) {
|
| 492 | 492 | $wp->query_vars['gd_is_geodir_page'] = true; |
@@ -494,20 +494,20 @@ discard block |
||
| 494 | 494 | } |
| 495 | 495 | |
| 496 | 496 | |
| 497 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['post_type'] ) && $wp->query_vars['post_type'] != '' ) {
|
|
| 497 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {
|
|
| 498 | 498 | $requested_post_type = $wp->query_vars['post_type']; |
| 499 | 499 | // check if this post type is geodirectory post types |
| 500 | 500 | $post_type_array = geodir_get_posttypes(); |
| 501 | - if ( in_array( $requested_post_type, $post_type_array ) ) {
|
|
| 501 | + if (in_array($requested_post_type, $post_type_array)) {
|
|
| 502 | 502 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 503 | 503 | } |
| 504 | 504 | } |
| 505 | 505 | |
| 506 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) ) {
|
|
| 507 | - $geodir_taxonomis = geodir_get_taxonomies( '', true ); |
|
| 508 | - if ( ! empty( $geodir_taxonomis ) ) {
|
|
| 509 | - foreach ( $geodir_taxonomis as $taxonomy ) {
|
|
| 510 | - if ( array_key_exists( $taxonomy, $wp->query_vars ) ) {
|
|
| 506 | + if (!isset($wp->query_vars['gd_is_geodir_page'])) {
|
|
| 507 | + $geodir_taxonomis = geodir_get_taxonomies('', true);
|
|
| 508 | + if (!empty($geodir_taxonomis)) {
|
|
| 509 | + foreach ($geodir_taxonomis as $taxonomy) {
|
|
| 510 | + if (array_key_exists($taxonomy, $wp->query_vars)) {
|
|
| 511 | 511 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 512 | 512 | break; |
| 513 | 513 | } |
@@ -516,20 +516,20 @@ discard block |
||
| 516 | 516 | |
| 517 | 517 | } |
| 518 | 518 | |
| 519 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['author_name'] ) && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 519 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['author_name']) && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 520 | 520 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 521 | 521 | } |
| 522 | 522 | |
| 523 | 523 | |
| 524 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $_REQUEST['geodir_search'] ) ) {
|
|
| 524 | + if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($_REQUEST['geodir_search'])) {
|
|
| 525 | 525 | $wp->query_vars['gd_is_geodir_page'] = true; |
| 526 | 526 | } |
| 527 | 527 | |
| 528 | 528 | |
| 529 | 529 | //check if homepage |
| 530 | - if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) |
|
| 531 | - && ! isset( $wp->query_vars['page_id'] ) |
|
| 532 | - && ! isset( $wp->query_vars['pagename'] ) |
|
| 530 | + if (!isset($wp->query_vars['gd_is_geodir_page']) |
|
| 531 | + && !isset($wp->query_vars['page_id']) |
|
| 532 | + && !isset($wp->query_vars['pagename']) |
|
| 533 | 533 | && is_page_geodir_home() |
| 534 | 534 | ) {
|
| 535 | 535 | $wp->query_vars['gd_is_geodir_page'] = true; |
@@ -553,14 +553,14 @@ discard block |
||
| 553 | 553 | */ |
| 554 | 554 | function geodir_is_geodir_page() {
|
| 555 | 555 | global $wp; |
| 556 | - if ( isset( $wp->query_vars['gd_is_geodir_page'] ) && $wp->query_vars['gd_is_geodir_page'] ) {
|
|
| 556 | + if (isset($wp->query_vars['gd_is_geodir_page']) && $wp->query_vars['gd_is_geodir_page']) {
|
|
| 557 | 557 | return true; |
| 558 | 558 | } else {
|
| 559 | 559 | return false; |
| 560 | 560 | } |
| 561 | 561 | } |
| 562 | 562 | |
| 563 | -if ( ! function_exists( 'geodir_get_imagesize' ) ) {
|
|
| 563 | +if (!function_exists('geodir_get_imagesize')) {
|
|
| 564 | 564 | /** |
| 565 | 565 | * Get image size using the size key . |
| 566 | 566 | * |
@@ -571,13 +571,13 @@ discard block |
||
| 571 | 571 | * |
| 572 | 572 | * @return array|mixed|void|WP_Error If valid returns image size. Else returns error. |
| 573 | 573 | */ |
| 574 | - function geodir_get_imagesize( $size = '' ) {
|
|
| 574 | + function geodir_get_imagesize($size = '') {
|
|
| 575 | 575 | |
| 576 | 576 | $imagesizes = array( |
| 577 | - 'list-thumb' => array( 'w' => 283, 'h' => 188 ), |
|
| 578 | - 'thumbnail' => array( 'w' => 125, 'h' => 125 ), |
|
| 579 | - 'widget-thumb' => array( 'w' => 50, 'h' => 50 ), |
|
| 580 | - 'slider-thumb' => array( 'w' => 100, 'h' => 100 ) |
|
| 577 | + 'list-thumb' => array('w' => 283, 'h' => 188),
|
|
| 578 | + 'thumbnail' => array('w' => 125, 'h' => 125),
|
|
| 579 | + 'widget-thumb' => array('w' => 50, 'h' => 50),
|
|
| 580 | + 'slider-thumb' => array('w' => 100, 'h' => 100)
|
|
| 581 | 581 | ); |
| 582 | 582 | |
| 583 | 583 | /** |
@@ -587,9 +587,9 @@ discard block |
||
| 587 | 587 | * |
| 588 | 588 | * @param array $imagesizes Image size array. |
| 589 | 589 | */ |
| 590 | - $imagesizes = apply_filters( 'geodir_imagesizes', $imagesizes ); |
|
| 590 | + $imagesizes = apply_filters('geodir_imagesizes', $imagesizes);
|
|
| 591 | 591 | |
| 592 | - if ( ! empty( $size ) && array_key_exists( $size, $imagesizes ) ) {
|
|
| 592 | + if (!empty($size) && array_key_exists($size, $imagesizes)) {
|
|
| 593 | 593 | /** |
| 594 | 594 | * Filters image size of the passed key. |
| 595 | 595 | * |
@@ -597,11 +597,11 @@ discard block |
||
| 597 | 597 | * |
| 598 | 598 | * @param array $imagesizes [$size] Image size array of the passed key. |
| 599 | 599 | */ |
| 600 | - return apply_filters( 'geodir_get_imagesize_' . $size, $imagesizes[ $size ] ); |
|
| 600 | + return apply_filters('geodir_get_imagesize_'.$size, $imagesizes[$size]);
|
|
| 601 | 601 | |
| 602 | - } elseif ( ! empty( $size ) ) {
|
|
| 602 | + } elseif (!empty($size)) {
|
|
| 603 | 603 | |
| 604 | - return new WP_Error( 'geodir_no_imagesize', __( "Given image size is not valid", 'geodirectory' ) ); |
|
| 604 | + return new WP_Error('geodir_no_imagesize', __("Given image size is not valid", 'geodirectory'));
|
|
| 605 | 605 | |
| 606 | 606 | } |
| 607 | 607 | |
@@ -625,7 +625,7 @@ discard block |
||
| 625 | 625 | */ |
| 626 | 626 | |
| 627 | 627 | |
| 628 | -if ( ! function_exists( 'createRandomString' ) ) {
|
|
| 628 | +if (!function_exists('createRandomString')) {
|
|
| 629 | 629 | /** |
| 630 | 630 | * Creates random string. |
| 631 | 631 | * |
@@ -635,21 +635,21 @@ discard block |
||
| 635 | 635 | */ |
| 636 | 636 | function createRandomString() {
|
| 637 | 637 | $chars = "abcdefghijkmlnopqrstuvwxyz1023456789"; |
| 638 | - srand( (double) microtime() * 1000000 ); |
|
| 638 | + srand((double) microtime() * 1000000); |
|
| 639 | 639 | $i = 0; |
| 640 | 640 | $rstring = ''; |
| 641 | - while ( $i <= 25 ) {
|
|
| 641 | + while ($i <= 25) {
|
|
| 642 | 642 | $num = rand() % 33; |
| 643 | - $tmp = substr( $chars, $num, 1 ); |
|
| 644 | - $rstring = $rstring . $tmp; |
|
| 645 | - $i ++; |
|
| 643 | + $tmp = substr($chars, $num, 1); |
|
| 644 | + $rstring = $rstring.$tmp; |
|
| 645 | + $i++; |
|
| 646 | 646 | } |
| 647 | 647 | |
| 648 | 648 | return $rstring; |
| 649 | 649 | } |
| 650 | 650 | } |
| 651 | 651 | |
| 652 | -if ( ! function_exists( 'geodir_getDistanceRadius' ) ) {
|
|
| 652 | +if (!function_exists('geodir_getDistanceRadius')) {
|
|
| 653 | 653 | /** |
| 654 | 654 | * Calculates the distance radius. |
| 655 | 655 | * |
@@ -660,9 +660,9 @@ discard block |
||
| 660 | 660 | * |
| 661 | 661 | * @return float The mean radius. |
| 662 | 662 | */ |
| 663 | - function geodir_getDistanceRadius( $uom = 'km' ) {
|
|
| 663 | + function geodir_getDistanceRadius($uom = 'km') {
|
|
| 664 | 664 | // Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude |
| 665 | - switch ( geodir_strtolower( $uom ) ): |
|
| 665 | + switch (geodir_strtolower($uom)): |
|
| 666 | 666 | case 'km' : |
| 667 | 667 | $earthMeanRadius = 6371.009; // km |
| 668 | 668 | break; |
@@ -694,7 +694,7 @@ discard block |
||
| 694 | 694 | } |
| 695 | 695 | |
| 696 | 696 | |
| 697 | -if ( ! function_exists( 'geodir_calculateDistanceFromLatLong' ) ) {
|
|
| 697 | +if (!function_exists('geodir_calculateDistanceFromLatLong')) {
|
|
| 698 | 698 | /** |
| 699 | 699 | * Calculate the great circle distance between two points identified by longitude and latitude. |
| 700 | 700 | * |
@@ -707,17 +707,17 @@ discard block |
||
| 707 | 707 | * |
| 708 | 708 | * @return float The distance. |
| 709 | 709 | */ |
| 710 | - function geodir_calculateDistanceFromLatLong( $point1, $point2, $uom = 'km' ) {
|
|
| 710 | + function geodir_calculateDistanceFromLatLong($point1, $point2, $uom = 'km') {
|
|
| 711 | 711 | // Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude |
| 712 | 712 | |
| 713 | - $earthMeanRadius = geodir_getDistanceRadius( $uom ); |
|
| 713 | + $earthMeanRadius = geodir_getDistanceRadius($uom); |
|
| 714 | 714 | |
| 715 | - $deltaLatitude = deg2rad( (float) $point2['latitude'] - (float) $point1['latitude'] ); |
|
| 716 | - $deltaLongitude = deg2rad( (float) $point2['longitude'] - (float) $point1['longitude'] ); |
|
| 717 | - $a = sin( $deltaLatitude / 2 ) * sin( $deltaLatitude / 2 ) + |
|
| 718 | - cos( deg2rad( (float) $point1['latitude'] ) ) * cos( deg2rad( (float) $point2['latitude'] ) ) * |
|
| 719 | - sin( $deltaLongitude / 2 ) * sin( $deltaLongitude / 2 ); |
|
| 720 | - $c = 2 * atan2( sqrt( $a ), sqrt( 1 - $a ) ); |
|
| 715 | + $deltaLatitude = deg2rad((float) $point2['latitude'] - (float) $point1['latitude']); |
|
| 716 | + $deltaLongitude = deg2rad((float) $point2['longitude'] - (float) $point1['longitude']); |
|
| 717 | + $a = sin($deltaLatitude / 2) * sin($deltaLatitude / 2) + |
|
| 718 | + cos(deg2rad((float) $point1['latitude'])) * cos(deg2rad((float) $point2['latitude'])) * |
|
| 719 | + sin($deltaLongitude / 2) * sin($deltaLongitude / 2); |
|
| 720 | + $c = 2 * atan2(sqrt($a), sqrt(1 - $a)); |
|
| 721 | 721 | $distance = $earthMeanRadius * $c; |
| 722 | 722 | |
| 723 | 723 | return $distance; |
@@ -726,7 +726,7 @@ discard block |
||
| 726 | 726 | } |
| 727 | 727 | |
| 728 | 728 | |
| 729 | -if ( ! function_exists( 'geodir_sendEmail' ) ) {
|
|
| 729 | +if (!function_exists('geodir_sendEmail')) {
|
|
| 730 | 730 | /** |
| 731 | 731 | * The main function that send transactional emails using the args provided. |
| 732 | 732 | * |
@@ -745,95 +745,95 @@ discard block |
||
| 745 | 745 | * @param string $post_id The post ID. |
| 746 | 746 | * @param string $user_id The user ID. |
| 747 | 747 | */ |
| 748 | - function geodir_sendEmail( $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '' ) {
|
|
| 748 | + function geodir_sendEmail($fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '') {
|
|
| 749 | 749 | $login_details = ''; |
| 750 | 750 | |
| 751 | 751 | // strip slashes from subject & message text |
| 752 | - $to_subject = stripslashes_deep( $to_subject ); |
|
| 753 | - $to_message = stripslashes_deep( $to_message ); |
|
| 752 | + $to_subject = stripslashes_deep($to_subject); |
|
| 753 | + $to_message = stripslashes_deep($to_message); |
|
| 754 | 754 | |
| 755 | - if ( $message_type == 'send_friend' ) {
|
|
| 756 | - $subject = get_option( 'geodir_email_friend_subject' ); |
|
| 757 | - $message = get_option( 'geodir_email_friend_content' ); |
|
| 758 | - } elseif ( $message_type == 'send_enquiry' ) {
|
|
| 759 | - $subject = get_option( 'geodir_email_enquiry_subject' ); |
|
| 760 | - $message = get_option( 'geodir_email_enquiry_content' ); |
|
| 755 | + if ($message_type == 'send_friend') {
|
|
| 756 | + $subject = get_option('geodir_email_friend_subject');
|
|
| 757 | + $message = get_option('geodir_email_friend_content');
|
|
| 758 | + } elseif ($message_type == 'send_enquiry') {
|
|
| 759 | + $subject = get_option('geodir_email_enquiry_subject');
|
|
| 760 | + $message = get_option('geodir_email_enquiry_content');
|
|
| 761 | 761 | |
| 762 | 762 | // change to name in some cases |
| 763 | - $post_author = get_post_field( 'post_author', $post_id ); |
|
| 764 | - if(is_super_admin( $post_author )){// if admin probably not the post author so change name
|
|
| 765 | - $toEmailName = __('Business Owner','geodirectory');
|
|
| 766 | - }elseif(defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id,'claimed')!='1'){// if claim manager installed but listing not claimed
|
|
| 767 | - $toEmailName = __('Business Owner','geodirectory');
|
|
| 763 | + $post_author = get_post_field('post_author', $post_id);
|
|
| 764 | + if (is_super_admin($post_author)) {// if admin probably not the post author so change name
|
|
| 765 | + $toEmailName = __('Business Owner', 'geodirectory');
|
|
| 766 | + }elseif (defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id, 'claimed') != '1') {// if claim manager installed but listing not claimed
|
|
| 767 | + $toEmailName = __('Business Owner', 'geodirectory');
|
|
| 768 | 768 | } |
| 769 | 769 | |
| 770 | 770 | |
| 771 | - } elseif ( $message_type == 'forgot_password' ) {
|
|
| 772 | - $subject = get_option( 'geodir_forgot_password_subject' ); |
|
| 773 | - $message = get_option( 'geodir_forgot_password_content' ); |
|
| 771 | + } elseif ($message_type == 'forgot_password') {
|
|
| 772 | + $subject = get_option('geodir_forgot_password_subject');
|
|
| 773 | + $message = get_option('geodir_forgot_password_content');
|
|
| 774 | 774 | $login_details = $to_message; |
| 775 | - } elseif ( $message_type == 'registration' ) {
|
|
| 776 | - $subject = get_option( 'geodir_registration_success_email_subject' ); |
|
| 777 | - $message = get_option( 'geodir_registration_success_email_content' ); |
|
| 775 | + } elseif ($message_type == 'registration') {
|
|
| 776 | + $subject = get_option('geodir_registration_success_email_subject');
|
|
| 777 | + $message = get_option('geodir_registration_success_email_content');
|
|
| 778 | 778 | $login_details = $to_message; |
| 779 | - } elseif ( $message_type == 'post_submit' ) {
|
|
| 780 | - $subject = get_option( 'geodir_post_submited_success_email_subject' ); |
|
| 781 | - $message = get_option( 'geodir_post_submited_success_email_content' ); |
|
| 782 | - } elseif ( $message_type == 'listing_published' ) {
|
|
| 783 | - $subject = get_option( 'geodir_post_published_email_subject' ); |
|
| 784 | - $message = get_option( 'geodir_post_published_email_content' ); |
|
| 785 | - } elseif ( $message_type == 'listing_edited' ) {
|
|
| 786 | - $subject = get_option( 'geodir_post_edited_email_subject_admin' ); |
|
| 787 | - $message = get_option( 'geodir_post_edited_email_content_admin' ); |
|
| 779 | + } elseif ($message_type == 'post_submit') {
|
|
| 780 | + $subject = get_option('geodir_post_submited_success_email_subject');
|
|
| 781 | + $message = get_option('geodir_post_submited_success_email_content');
|
|
| 782 | + } elseif ($message_type == 'listing_published') {
|
|
| 783 | + $subject = get_option('geodir_post_published_email_subject');
|
|
| 784 | + $message = get_option('geodir_post_published_email_content');
|
|
| 785 | + } elseif ($message_type == 'listing_edited') {
|
|
| 786 | + $subject = get_option('geodir_post_edited_email_subject_admin');
|
|
| 787 | + $message = get_option('geodir_post_edited_email_content_admin');
|
|
| 788 | 788 | } |
| 789 | 789 | |
| 790 | - if ( ! empty( $subject ) ) {
|
|
| 791 | - $subject = __( stripslashes_deep( $subject ), 'geodirectory' ); |
|
| 790 | + if (!empty($subject)) {
|
|
| 791 | + $subject = __(stripslashes_deep($subject), 'geodirectory'); |
|
| 792 | 792 | } |
| 793 | 793 | |
| 794 | - if ( ! empty( $message ) ) {
|
|
| 795 | - $message = __( stripslashes_deep( $message ), 'geodirectory' ); |
|
| 794 | + if (!empty($message)) {
|
|
| 795 | + $message = __(stripslashes_deep($message), 'geodirectory'); |
|
| 796 | 796 | } |
| 797 | 797 | |
| 798 | - $to_message = nl2br( $to_message ); |
|
| 799 | - $sitefromEmail = get_option( 'site_email' ); |
|
| 798 | + $to_message = nl2br($to_message); |
|
| 799 | + $sitefromEmail = get_option('site_email');
|
|
| 800 | 800 | $sitefromEmailName = get_site_emailName(); |
| 801 | - $productlink = get_permalink( $post_id ); |
|
| 801 | + $productlink = get_permalink($post_id); |
|
| 802 | 802 | |
| 803 | 803 | $user_login = ''; |
| 804 | - if ( $user_id > 0 && $user_info = get_userdata( $user_id ) ) {
|
|
| 804 | + if ($user_id > 0 && $user_info = get_userdata($user_id)) {
|
|
| 805 | 805 | $user_login = $user_info->user_login; |
| 806 | 806 | } |
| 807 | 807 | |
| 808 | 808 | $posted_date = ''; |
| 809 | 809 | $listingLink = ''; |
| 810 | 810 | |
| 811 | - $post_info = get_post( $post_id ); |
|
| 811 | + $post_info = get_post($post_id); |
|
| 812 | 812 | |
| 813 | - if ( $post_info ) {
|
|
| 813 | + if ($post_info) {
|
|
| 814 | 814 | $posted_date = $post_info->post_date; |
| 815 | - $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>'; |
|
| 815 | + $listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>'; |
|
| 816 | 816 | } |
| 817 | 817 | $siteurl = home_url(); |
| 818 | - $siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>'; |
|
| 818 | + $siteurl_link = '<a href="'.$siteurl.'">'.$siteurl.'</a>'; |
|
| 819 | 819 | $loginurl = geodir_login_url(); |
| 820 | - $loginurl_link = '<a href="' . $loginurl . '">login</a>'; |
|
| 820 | + $loginurl_link = '<a href="'.$loginurl.'">login</a>'; |
|
| 821 | 821 | |
| 822 | - $post_author_id = ! empty( $post_info ) ? $post_info->post_author : 0; |
|
| 823 | - $post_author_data = $post_author_id ? get_userdata( $post_author_id ) : NULL; |
|
| 824 | - $post_author_name = geodir_get_client_name( $post_author_id ); |
|
| 825 | - $post_author_email = !empty( $post_author_data->user_email ) ? $post_author_data->user_email : ''; |
|
| 826 | - $current_date = date_i18n( 'Y-m-d H:i:s', current_time( 'timestamp' ) ); |
|
| 827 | - |
|
| 828 | - if ( $fromEmail == '' ) {
|
|
| 829 | - $fromEmail = get_option( 'site_email' ); |
|
| 822 | + $post_author_id = !empty($post_info) ? $post_info->post_author : 0; |
|
| 823 | + $post_author_data = $post_author_id ? get_userdata($post_author_id) : NULL; |
|
| 824 | + $post_author_name = geodir_get_client_name($post_author_id); |
|
| 825 | + $post_author_email = !empty($post_author_data->user_email) ? $post_author_data->user_email : ''; |
|
| 826 | + $current_date = date_i18n('Y-m-d H:i:s', current_time('timestamp'));
|
|
| 827 | + |
|
| 828 | + if ($fromEmail == '') {
|
|
| 829 | + $fromEmail = get_option('site_email');
|
|
| 830 | 830 | } |
| 831 | 831 | |
| 832 | - if ( $fromEmailName == '' ) {
|
|
| 833 | - $fromEmailName = get_option( 'site_email_name' ); |
|
| 832 | + if ($fromEmailName == '') {
|
|
| 833 | + $fromEmailName = get_option('site_email_name');
|
|
| 834 | 834 | } |
| 835 | 835 | |
| 836 | - $search_array = array( |
|
| 836 | + $search_array = array( |
|
| 837 | 837 | '[#listing_link#]', |
| 838 | 838 | '[#site_name_url#]', |
| 839 | 839 | '[#post_id#]', |
@@ -875,7 +875,7 @@ discard block |
||
| 875 | 875 | $post_author_email, |
| 876 | 876 | $current_date, |
| 877 | 877 | ); |
| 878 | - $message = str_replace( $search_array, $replace_array, $message ); |
|
| 878 | + $message = str_replace($search_array, $replace_array, $message); |
|
| 879 | 879 | |
| 880 | 880 | $search_array = array( |
| 881 | 881 | '[#listing_link#]', |
@@ -913,12 +913,12 @@ discard block |
||
| 913 | 913 | $post_author_email, |
| 914 | 914 | $current_date |
| 915 | 915 | ); |
| 916 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 916 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 917 | 917 | |
| 918 | - $headers = array(); |
|
| 918 | + $headers = array(); |
|
| 919 | 919 | $headers[] = 'Content-type: text/html; charset=UTF-8'; |
| 920 | - $headers[] = "Reply-To: " . $fromEmail; |
|
| 921 | - $headers[] = 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>'; |
|
| 920 | + $headers[] = "Reply-To: ".$fromEmail; |
|
| 921 | + $headers[] = 'From: '.$sitefromEmailName.' <'.$sitefromEmail.'>'; |
|
| 922 | 922 | |
| 923 | 923 | $to = $toEmail; |
| 924 | 924 | |
@@ -940,7 +940,7 @@ discard block |
||
| 940 | 940 | * @param string $post_id The post ID. |
| 941 | 941 | * @param string $user_id The user ID. |
| 942 | 942 | */ |
| 943 | - $to = apply_filters( 'geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 943 | + $to = apply_filters('geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 944 | 944 | /** |
| 945 | 945 | * Filter the client email subject. |
| 946 | 946 | * |
@@ -959,7 +959,7 @@ discard block |
||
| 959 | 959 | * @param string $post_id The post ID. |
| 960 | 960 | * @param string $user_id The user ID. |
| 961 | 961 | */ |
| 962 | - $subject = apply_filters( 'geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 962 | + $subject = apply_filters('geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 963 | 963 | /** |
| 964 | 964 | * Filter the client email message. |
| 965 | 965 | * |
@@ -978,7 +978,7 @@ discard block |
||
| 978 | 978 | * @param string $post_id The post ID. |
| 979 | 979 | * @param string $user_id The user ID. |
| 980 | 980 | */ |
| 981 | - $message = apply_filters( 'geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 981 | + $message = apply_filters('geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 982 | 982 | /** |
| 983 | 983 | * Filter the client email headers. |
| 984 | 984 | * |
@@ -997,39 +997,39 @@ discard block |
||
| 997 | 997 | * @param string $post_id The post ID. |
| 998 | 998 | * @param string $user_id The user ID. |
| 999 | 999 | */ |
| 1000 | - $headers = apply_filters( 'geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1000 | + $headers = apply_filters('geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1001 | 1001 | |
| 1002 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1002 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1003 | 1003 | |
| 1004 | - if ( ! $sent ) {
|
|
| 1005 | - if ( is_array( $to ) ) {
|
|
| 1006 | - $to = implode( ',', $to ); |
|
| 1004 | + if (!$sent) {
|
|
| 1005 | + if (is_array($to)) {
|
|
| 1006 | + $to = implode(',', $to);
|
|
| 1007 | 1007 | } |
| 1008 | 1008 | $log_message = sprintf( |
| 1009 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1009 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1010 | 1010 | $message_type, |
| 1011 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1011 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1012 | 1012 | $to, |
| 1013 | 1013 | $subject |
| 1014 | 1014 | ); |
| 1015 | - geodir_error_log( $log_message ); |
|
| 1015 | + geodir_error_log($log_message); |
|
| 1016 | 1016 | } |
| 1017 | 1017 | |
| 1018 | 1018 | ///////// ADMIN BCC EMIALS |
| 1019 | - $adminEmail = get_bloginfo( 'admin_email' ); |
|
| 1019 | + $adminEmail = get_bloginfo('admin_email');
|
|
| 1020 | 1020 | $to = $adminEmail; |
| 1021 | 1021 | |
| 1022 | 1022 | $admin_bcc = false; |
| 1023 | - if ( $message_type == 'registration' ) {
|
|
| 1024 | - $message_raw = explode( __( "Password:", 'geodirectory' ), $message ); |
|
| 1025 | - $message_raw2 = explode( "</p>", $message_raw[1], 2 ); |
|
| 1026 | - $message = $message_raw[0] . __( 'Password:', 'geodirectory' ) . ' **********</p>' . $message_raw2[1]; |
|
| 1023 | + if ($message_type == 'registration') {
|
|
| 1024 | + $message_raw = explode(__("Password:", 'geodirectory'), $message);
|
|
| 1025 | + $message_raw2 = explode("</p>", $message_raw[1], 2);
|
|
| 1026 | + $message = $message_raw[0].__('Password:', 'geodirectory').' **********</p>'.$message_raw2[1];
|
|
| 1027 | 1027 | } |
| 1028 | - if ( $message_type == 'post_submit' && ( get_option( 'geodir_notify_post_submit' ) || get_option( 'geodir_notify_post_submit', '-1' ) == '-1' ) ) {
|
|
| 1029 | - $subject = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_subject_admin' ) ), 'geodirectory' ); |
|
| 1030 | - $message = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_content_admin' ) ), 'geodirectory' ); |
|
| 1028 | + if ($message_type == 'post_submit' && (get_option('geodir_notify_post_submit') || get_option('geodir_notify_post_submit', '-1') == '-1')) {
|
|
| 1029 | + $subject = __(stripslashes_deep(get_option('geodir_post_submited_success_email_subject_admin')), 'geodirectory');
|
|
| 1030 | + $message = __(stripslashes_deep(get_option('geodir_post_submited_success_email_content_admin')), 'geodirectory');
|
|
| 1031 | 1031 | |
| 1032 | - $search_array = array( |
|
| 1032 | + $search_array = array( |
|
| 1033 | 1033 | '[#listing_link#]', |
| 1034 | 1034 | '[#site_name_url#]', |
| 1035 | 1035 | '[#post_id#]', |
@@ -1065,7 +1065,7 @@ discard block |
||
| 1065 | 1065 | $user_login, |
| 1066 | 1066 | $post_author_email, |
| 1067 | 1067 | ); |
| 1068 | - $message = str_replace( $search_array, $replace_array, $message ); |
|
| 1068 | + $message = str_replace($search_array, $replace_array, $message); |
|
| 1069 | 1069 | |
| 1070 | 1070 | $search_array = array( |
| 1071 | 1071 | '[#listing_link#]', |
@@ -1097,26 +1097,26 @@ discard block |
||
| 1097 | 1097 | $user_login, |
| 1098 | 1098 | $post_author_email, |
| 1099 | 1099 | ); |
| 1100 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 1100 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 1101 | 1101 | |
| 1102 | 1102 | $subject .= ' - ADMIN BCC COPY'; |
| 1103 | 1103 | $admin_bcc = true; |
| 1104 | 1104 | |
| 1105 | - } elseif ( $message_type == 'registration' && get_option( 'geodir_bcc_new_user' ) ) {
|
|
| 1105 | + } elseif ($message_type == 'registration' && get_option('geodir_bcc_new_user')) {
|
|
| 1106 | 1106 | $subject .= ' - ADMIN BCC COPY'; |
| 1107 | 1107 | $admin_bcc = true; |
| 1108 | - } elseif ( $message_type == 'send_friend' && get_option( 'geodir_bcc_friend' ) ) {
|
|
| 1108 | + } elseif ($message_type == 'send_friend' && get_option('geodir_bcc_friend')) {
|
|
| 1109 | 1109 | $subject .= ' - ADMIN BCC COPY'; |
| 1110 | 1110 | $admin_bcc = true; |
| 1111 | - } elseif ( $message_type == 'send_enquiry' && get_option( 'geodir_bcc_enquiry' ) ) {
|
|
| 1111 | + } elseif ($message_type == 'send_enquiry' && get_option('geodir_bcc_enquiry')) {
|
|
| 1112 | 1112 | $subject .= ' - ADMIN BCC COPY'; |
| 1113 | 1113 | $admin_bcc = true; |
| 1114 | - } elseif ( $message_type == 'listing_published' && get_option( 'geodir_bcc_listing_published' ) ) {
|
|
| 1114 | + } elseif ($message_type == 'listing_published' && get_option('geodir_bcc_listing_published')) {
|
|
| 1115 | 1115 | $subject .= ' - ADMIN BCC COPY'; |
| 1116 | 1116 | $admin_bcc = true; |
| 1117 | 1117 | } |
| 1118 | 1118 | |
| 1119 | - if ( $admin_bcc === true ) {
|
|
| 1119 | + if ($admin_bcc === true) {
|
|
| 1120 | 1120 | |
| 1121 | 1121 | /** |
| 1122 | 1122 | * Filter the client email subject. |
@@ -1136,7 +1136,7 @@ discard block |
||
| 1136 | 1136 | * @param string $post_id The post ID. |
| 1137 | 1137 | * @param string $user_id The user ID. |
| 1138 | 1138 | */ |
| 1139 | - $subject = apply_filters( 'geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1139 | + $subject = apply_filters('geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1140 | 1140 | /** |
| 1141 | 1141 | * Filter the client email message. |
| 1142 | 1142 | * |
@@ -1155,23 +1155,23 @@ discard block |
||
| 1155 | 1155 | * @param string $post_id The post ID. |
| 1156 | 1156 | * @param string $user_id The user ID. |
| 1157 | 1157 | */ |
| 1158 | - $message = apply_filters( 'geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id ); |
|
| 1158 | + $message = apply_filters('geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);
|
|
| 1159 | 1159 | |
| 1160 | 1160 | |
| 1161 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1161 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1162 | 1162 | |
| 1163 | - if ( ! $sent ) {
|
|
| 1164 | - if ( is_array( $to ) ) {
|
|
| 1165 | - $to = implode( ',', $to ); |
|
| 1163 | + if (!$sent) {
|
|
| 1164 | + if (is_array($to)) {
|
|
| 1165 | + $to = implode(',', $to);
|
|
| 1166 | 1166 | } |
| 1167 | 1167 | $log_message = sprintf( |
| 1168 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1168 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1169 | 1169 | $message_type, |
| 1170 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1170 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1171 | 1171 | $to, |
| 1172 | 1172 | $subject |
| 1173 | 1173 | ); |
| 1174 | - geodir_error_log( $log_message ); |
|
| 1174 | + geodir_error_log($log_message); |
|
| 1175 | 1175 | } |
| 1176 | 1176 | } |
| 1177 | 1177 | |
@@ -1187,51 +1187,51 @@ discard block |
||
| 1187 | 1187 | */ |
| 1188 | 1188 | function geodir_taxonomy_breadcrumb() {
|
| 1189 | 1189 | |
| 1190 | - $term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) ); |
|
| 1190 | + $term = get_term_by('slug', get_query_var('term'), get_query_var('taxonomy'));
|
|
| 1191 | 1191 | $parent = $term->parent; |
| 1192 | 1192 | |
| 1193 | - while ( $parent ): |
|
| 1193 | + while ($parent): |
|
| 1194 | 1194 | $parents[] = $parent; |
| 1195 | - $new_parent = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); |
|
| 1195 | + $new_parent = get_term_by('id', $parent, get_query_var('taxonomy'));
|
|
| 1196 | 1196 | $parent = $new_parent->parent; |
| 1197 | 1197 | endwhile; |
| 1198 | 1198 | |
| 1199 | - if ( ! empty( $parents ) ): |
|
| 1200 | - $parents = array_reverse( $parents ); |
|
| 1199 | + if (!empty($parents)): |
|
| 1200 | + $parents = array_reverse($parents); |
|
| 1201 | 1201 | |
| 1202 | - foreach ( $parents as $parent ): |
|
| 1203 | - $item = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) ); |
|
| 1204 | - $url = get_term_link( $item, get_query_var( 'taxonomy' ) ); |
|
| 1205 | - echo '<li> > <a href="' . $url . '">' . $item->name . '</a></li>'; |
|
| 1202 | + foreach ($parents as $parent): |
|
| 1203 | + $item = get_term_by('id', $parent, get_query_var('taxonomy'));
|
|
| 1204 | + $url = get_term_link($item, get_query_var('taxonomy'));
|
|
| 1205 | + echo '<li> > <a href="'.$url.'">'.$item->name.'</a></li>'; |
|
| 1206 | 1206 | endforeach; |
| 1207 | 1207 | |
| 1208 | 1208 | endif; |
| 1209 | 1209 | |
| 1210 | - echo '<li> > ' . $term->name . '</li>'; |
|
| 1210 | + echo '<li> > '.$term->name.'</li>'; |
|
| 1211 | 1211 | } |
| 1212 | 1212 | |
| 1213 | -function geodir_wpml_post_type_archive_link($link, $post_type){
|
|
| 1213 | +function geodir_wpml_post_type_archive_link($link, $post_type) {
|
|
| 1214 | 1214 | if (geodir_is_wpml()) {
|
| 1215 | - $post_types = get_option( 'geodir_post_types' ); |
|
| 1215 | + $post_types = get_option('geodir_post_types');
|
|
| 1216 | 1216 | |
| 1217 | - if ( isset( $post_types[ $post_type ] ) ) {
|
|
| 1218 | - $slug = $post_types[ $post_type ]['rewrite']['slug']; |
|
| 1217 | + if (isset($post_types[$post_type])) {
|
|
| 1218 | + $slug = $post_types[$post_type]['rewrite']['slug']; |
|
| 1219 | 1219 | |
| 1220 | 1220 | // Alter the CPT slug if WPML is set to do so |
| 1221 | - if ( geodir_wpml_is_post_type_translated( $post_type ) ) {
|
|
| 1222 | - if ( gd_wpml_slug_translation_turned_on( $post_type ) && $language_code = gd_wpml_get_lang_from_url( $link) ) {
|
|
| 1221 | + if (geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 1222 | + if (gd_wpml_slug_translation_turned_on($post_type) && $language_code = gd_wpml_get_lang_from_url($link)) {
|
|
| 1223 | 1223 | |
| 1224 | 1224 | $org_slug = $slug; |
| 1225 | - $slug = apply_filters( 'wpml_translate_single_string', |
|
| 1225 | + $slug = apply_filters('wpml_translate_single_string',
|
|
| 1226 | 1226 | $slug, |
| 1227 | 1227 | 'WordPress', |
| 1228 | - 'URL slug: ' . $slug, |
|
| 1229 | - $language_code ); |
|
| 1228 | + 'URL slug: '.$slug, |
|
| 1229 | + $language_code); |
|
| 1230 | 1230 | |
| 1231 | - if ( ! $slug ) {
|
|
| 1231 | + if (!$slug) {
|
|
| 1232 | 1232 | $slug = $org_slug; |
| 1233 | 1233 | } else {
|
| 1234 | - $link = str_replace( $org_slug, $slug, $link ); |
|
| 1234 | + $link = str_replace($org_slug, $slug, $link); |
|
| 1235 | 1235 | } |
| 1236 | 1236 | } |
| 1237 | 1237 | } |
@@ -1240,7 +1240,7 @@ discard block |
||
| 1240 | 1240 | |
| 1241 | 1241 | return $link; |
| 1242 | 1242 | } |
| 1243 | -add_filter( 'post_type_archive_link','geodir_wpml_post_type_archive_link', 1000, 2); |
|
| 1243 | +add_filter('post_type_archive_link', 'geodir_wpml_post_type_archive_link', 1000, 2);
|
|
| 1244 | 1244 | |
| 1245 | 1245 | /** |
| 1246 | 1246 | * Main function that generates breadcrumb for all pages. |
@@ -1261,9 +1261,9 @@ discard block |
||
| 1261 | 1261 | * |
| 1262 | 1262 | * @since 1.0.0 |
| 1263 | 1263 | */ |
| 1264 | - $separator = apply_filters( 'geodir_breadcrumb_separator', ' > ' ); |
|
| 1264 | + $separator = apply_filters('geodir_breadcrumb_separator', ' > ');
|
|
| 1265 | 1265 | |
| 1266 | - if ( ! geodir_is_page( 'home' ) ) {
|
|
| 1266 | + if (!geodir_is_page('home')) {
|
|
| 1267 | 1267 | $breadcrumb = ''; |
| 1268 | 1268 | $url_categoris = ''; |
| 1269 | 1269 | $breadcrumb .= '<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">'; |
@@ -1272,167 +1272,167 @@ discard block |
||
| 1272 | 1272 | * |
| 1273 | 1273 | * @since 1.0.0 |
| 1274 | 1274 | */ |
| 1275 | - $breadcrumb .= '<li>' . apply_filters( 'geodir_breadcrumb_first_link', '<a href="' . home_url() . '">' . __( 'Home', 'geodirectory' ) . '</a>' ) . '</li>'; |
|
| 1275 | + $breadcrumb .= '<li>'.apply_filters('geodir_breadcrumb_first_link', '<a href="'.home_url().'">'.__('Home', 'geodirectory').'</a>').'</li>';
|
|
| 1276 | 1276 | |
| 1277 | 1277 | $gd_post_type = geodir_get_current_posttype(); |
| 1278 | - $post_type_info = get_post_type_object( $gd_post_type ); |
|
| 1278 | + $post_type_info = get_post_type_object($gd_post_type); |
|
| 1279 | 1279 | |
| 1280 | - remove_filter( 'post_type_archive_link', 'geodir_get_posttype_link' ); |
|
| 1280 | + remove_filter('post_type_archive_link', 'geodir_get_posttype_link');
|
|
| 1281 | 1281 | |
| 1282 | - $listing_link = get_post_type_archive_link( $gd_post_type ); |
|
| 1282 | + $listing_link = get_post_type_archive_link($gd_post_type); |
|
| 1283 | 1283 | |
| 1284 | - add_filter( 'post_type_archive_link', 'geodir_get_posttype_link', 10, 2 ); |
|
| 1285 | - $listing_link = rtrim( $listing_link, '/' ); |
|
| 1284 | + add_filter('post_type_archive_link', 'geodir_get_posttype_link', 10, 2);
|
|
| 1285 | + $listing_link = rtrim($listing_link, '/'); |
|
| 1286 | 1286 | $listing_link .= '/'; |
| 1287 | 1287 | |
| 1288 | 1288 | $post_type_for_location_link = $listing_link; |
| 1289 | - $location_terms = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 1289 | + $location_terms = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 1290 | 1290 | |
| 1291 | 1291 | global $wp, $gd_session; |
| 1292 | 1292 | $location_link = $post_type_for_location_link; |
| 1293 | 1293 | |
| 1294 | - if ( geodir_is_page( 'detail' ) || geodir_is_page( 'listing' ) ) {
|
|
| 1294 | + if (geodir_is_page('detail') || geodir_is_page('listing')) {
|
|
| 1295 | 1295 | global $post; |
| 1296 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; |
|
| 1297 | - $neighbourhood_active = $location_manager && get_option( 'location_neighbourhoods' ) ? true : false; |
|
| 1296 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 1297 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 1298 | 1298 | |
| 1299 | - if ( geodir_is_page( 'detail' ) && isset( $post->country_slug ) ) {
|
|
| 1299 | + if (geodir_is_page('detail') && isset($post->country_slug)) {
|
|
| 1300 | 1300 | $location_terms = array( |
| 1301 | 1301 | 'gd_country' => $post->country_slug, |
| 1302 | 1302 | 'gd_region' => $post->region_slug, |
| 1303 | 1303 | 'gd_city' => $post->city_slug |
| 1304 | 1304 | ); |
| 1305 | 1305 | |
| 1306 | - if ( $neighbourhood_active && ! empty( $location_terms['gd_city'] ) && $gd_ses_neighbourhood = $gd_session->get( 'gd_neighbourhood' ) ) {
|
|
| 1306 | + if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
|
|
| 1307 | 1307 | $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood; |
| 1308 | 1308 | } |
| 1309 | 1309 | } |
| 1310 | 1310 | |
| 1311 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); |
|
| 1311 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 1312 | 1312 | |
| 1313 | 1313 | $hide_url_part = array(); |
| 1314 | - if ( $location_manager ) {
|
|
| 1315 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); |
|
| 1316 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); |
|
| 1317 | - |
|
| 1318 | - if ( $hide_region_part && $hide_country_part ) {
|
|
| 1319 | - $hide_url_part = array( 'gd_country', 'gd_region' ); |
|
| 1320 | - } else if ( $hide_region_part && ! $hide_country_part ) {
|
|
| 1321 | - $hide_url_part = array( 'gd_region' ); |
|
| 1322 | - } else if ( ! $hide_region_part && $hide_country_part ) {
|
|
| 1323 | - $hide_url_part = array( 'gd_country' ); |
|
| 1314 | + if ($location_manager) {
|
|
| 1315 | + $hide_country_part = get_option('geodir_location_hide_country_part');
|
|
| 1316 | + $hide_region_part = get_option('geodir_location_hide_region_part');
|
|
| 1317 | + |
|
| 1318 | + if ($hide_region_part && $hide_country_part) {
|
|
| 1319 | + $hide_url_part = array('gd_country', 'gd_region');
|
|
| 1320 | + } else if ($hide_region_part && !$hide_country_part) {
|
|
| 1321 | + $hide_url_part = array('gd_region');
|
|
| 1322 | + } else if (!$hide_region_part && $hide_country_part) {
|
|
| 1323 | + $hide_url_part = array('gd_country');
|
|
| 1324 | 1324 | } |
| 1325 | 1325 | } |
| 1326 | 1326 | |
| 1327 | 1327 | $hide_text_part = array(); |
| 1328 | - if ( $geodir_show_location_url == 'country_city' ) {
|
|
| 1329 | - $hide_text_part = array( 'gd_region' ); |
|
| 1328 | + if ($geodir_show_location_url == 'country_city') {
|
|
| 1329 | + $hide_text_part = array('gd_region');
|
|
| 1330 | 1330 | |
| 1331 | - if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
|
|
| 1332 | - unset( $location_terms['gd_region'] ); |
|
| 1331 | + if (isset($location_terms['gd_region']) && !$location_manager) {
|
|
| 1332 | + unset($location_terms['gd_region']); |
|
| 1333 | 1333 | } |
| 1334 | - } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
| 1335 | - $hide_text_part = array( 'gd_country' ); |
|
| 1334 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 1335 | + $hide_text_part = array('gd_country');
|
|
| 1336 | 1336 | |
| 1337 | - if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
|
|
| 1338 | - unset( $location_terms['gd_country'] ); |
|
| 1337 | + if (isset($location_terms['gd_country']) && !$location_manager) {
|
|
| 1338 | + unset($location_terms['gd_country']); |
|
| 1339 | 1339 | } |
| 1340 | - } else if ( $geodir_show_location_url == 'city' ) {
|
|
| 1341 | - $hide_text_part = array( 'gd_country', 'gd_region' ); |
|
| 1340 | + } else if ($geodir_show_location_url == 'city') {
|
|
| 1341 | + $hide_text_part = array('gd_country', 'gd_region');
|
|
| 1342 | 1342 | |
| 1343 | - if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {
|
|
| 1344 | - unset( $location_terms['gd_country'] ); |
|
| 1343 | + if (isset($location_terms['gd_country']) && !$location_manager) {
|
|
| 1344 | + unset($location_terms['gd_country']); |
|
| 1345 | 1345 | } |
| 1346 | - if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {
|
|
| 1347 | - unset( $location_terms['gd_region'] ); |
|
| 1346 | + if (isset($location_terms['gd_region']) && !$location_manager) {
|
|
| 1347 | + unset($location_terms['gd_region']); |
|
| 1348 | 1348 | } |
| 1349 | 1349 | } |
| 1350 | 1350 | |
| 1351 | 1351 | $is_location_last = ''; |
| 1352 | 1352 | $is_taxonomy_last = ''; |
| 1353 | 1353 | $breadcrumb .= '<li>'; |
| 1354 | - if ( get_query_var( $gd_post_type . 'category' ) ) {
|
|
| 1355 | - $gd_taxonomy = $gd_post_type . 'category'; |
|
| 1356 | - } elseif ( get_query_var( $gd_post_type . '_tags' ) ) {
|
|
| 1357 | - $gd_taxonomy = $gd_post_type . '_tags'; |
|
| 1354 | + if (get_query_var($gd_post_type.'category')) {
|
|
| 1355 | + $gd_taxonomy = $gd_post_type.'category'; |
|
| 1356 | + } elseif (get_query_var($gd_post_type.'_tags')) {
|
|
| 1357 | + $gd_taxonomy = $gd_post_type.'_tags'; |
|
| 1358 | 1358 | } |
| 1359 | 1359 | |
| 1360 | - $breadcrumb .= $separator . '<a href="' . $listing_link . '">' . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; |
|
| 1361 | - if ( ! empty( $gd_taxonomy ) || geodir_is_page( 'detail' ) ) {
|
|
| 1360 | + $breadcrumb .= $separator.'<a href="'.$listing_link.'">'.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory').'</a>'; |
|
| 1361 | + if (!empty($gd_taxonomy) || geodir_is_page('detail')) {
|
|
| 1362 | 1362 | $is_location_last = false; |
| 1363 | 1363 | } else {
|
| 1364 | 1364 | $is_location_last = true; |
| 1365 | 1365 | } |
| 1366 | 1366 | |
| 1367 | - if ( ! empty( $gd_taxonomy ) && geodir_is_page( 'listing' ) ) {
|
|
| 1367 | + if (!empty($gd_taxonomy) && geodir_is_page('listing')) {
|
|
| 1368 | 1368 | $is_taxonomy_last = true; |
| 1369 | 1369 | } else {
|
| 1370 | 1370 | $is_taxonomy_last = false; |
| 1371 | 1371 | } |
| 1372 | 1372 | |
| 1373 | - if ( ! empty( $location_terms ) ) {
|
|
| 1374 | - $geodir_get_locations = function_exists( 'get_actual_location_name' ) ? true : false; |
|
| 1373 | + if (!empty($location_terms)) {
|
|
| 1374 | + $geodir_get_locations = function_exists('get_actual_location_name') ? true : false;
|
|
| 1375 | 1375 | |
| 1376 | - foreach ( $location_terms as $key => $location_term ) {
|
|
| 1377 | - if ( $location_term != '' ) {
|
|
| 1378 | - if ( ! empty( $hide_url_part ) && in_array( $key, $hide_url_part ) ) { // Hide location part from url & breadcrumb.
|
|
| 1376 | + foreach ($location_terms as $key => $location_term) {
|
|
| 1377 | + if ($location_term != '') {
|
|
| 1378 | + if (!empty($hide_url_part) && in_array($key, $hide_url_part)) { // Hide location part from url & breadcrumb.
|
|
| 1379 | 1379 | continue; |
| 1380 | 1380 | } |
| 1381 | 1381 | |
| 1382 | - $gd_location_link_text = preg_replace( '/-(\d+)$/', '', $location_term ); |
|
| 1383 | - $gd_location_link_text = preg_replace( '/[_-]/', ' ', $gd_location_link_text ); |
|
| 1384 | - $gd_location_link_text = geodir_utf8_ucfirst( $gd_location_link_text ); |
|
| 1382 | + $gd_location_link_text = preg_replace('/-(\d+)$/', '', $location_term);
|
|
| 1383 | + $gd_location_link_text = preg_replace('/[_-]/', ' ', $gd_location_link_text);
|
|
| 1384 | + $gd_location_link_text = geodir_utf8_ucfirst($gd_location_link_text); |
|
| 1385 | 1385 | |
| 1386 | 1386 | $location_term_actual_country = ''; |
| 1387 | 1387 | $location_term_actual_region = ''; |
| 1388 | 1388 | $location_term_actual_city = ''; |
| 1389 | 1389 | $location_term_actual_neighbourhood = ''; |
| 1390 | - if ( $geodir_get_locations ) {
|
|
| 1391 | - if ( $key == 'gd_country' ) {
|
|
| 1392 | - $location_term_actual_country = get_actual_location_name( 'country', $location_term, true ); |
|
| 1393 | - } else if ( $key == 'gd_region' ) {
|
|
| 1394 | - $location_term_actual_region = get_actual_location_name( 'region', $location_term, true ); |
|
| 1395 | - } else if ( $key == 'gd_city' ) {
|
|
| 1396 | - $location_term_actual_city = get_actual_location_name( 'city', $location_term, true ); |
|
| 1397 | - } else if ( $key == 'gd_neighbourhood' ) {
|
|
| 1398 | - $location_term_actual_neighbourhood = get_actual_location_name( 'neighbourhood', $location_term, true ); |
|
| 1390 | + if ($geodir_get_locations) {
|
|
| 1391 | + if ($key == 'gd_country') {
|
|
| 1392 | + $location_term_actual_country = get_actual_location_name('country', $location_term, true);
|
|
| 1393 | + } else if ($key == 'gd_region') {
|
|
| 1394 | + $location_term_actual_region = get_actual_location_name('region', $location_term, true);
|
|
| 1395 | + } else if ($key == 'gd_city') {
|
|
| 1396 | + $location_term_actual_city = get_actual_location_name('city', $location_term, true);
|
|
| 1397 | + } else if ($key == 'gd_neighbourhood') {
|
|
| 1398 | + $location_term_actual_neighbourhood = get_actual_location_name('neighbourhood', $location_term, true);
|
|
| 1399 | 1399 | } |
| 1400 | 1400 | } else {
|
| 1401 | 1401 | $location_info = geodir_get_location(); |
| 1402 | 1402 | |
| 1403 | - if ( ! empty( $location_info ) && isset( $location_info->location_id ) ) {
|
|
| 1404 | - if ( $key == 'gd_country' ) {
|
|
| 1405 | - $location_term_actual_country = __( $location_info->country, 'geodirectory' ); |
|
| 1406 | - } else if ( $key == 'gd_region' ) {
|
|
| 1407 | - $location_term_actual_region = __( $location_info->region, 'geodirectory' ); |
|
| 1408 | - } else if ( $key == 'gd_city' ) {
|
|
| 1409 | - $location_term_actual_city = __( $location_info->city, 'geodirectory' ); |
|
| 1403 | + if (!empty($location_info) && isset($location_info->location_id)) {
|
|
| 1404 | + if ($key == 'gd_country') {
|
|
| 1405 | + $location_term_actual_country = __($location_info->country, 'geodirectory'); |
|
| 1406 | + } else if ($key == 'gd_region') {
|
|
| 1407 | + $location_term_actual_region = __($location_info->region, 'geodirectory'); |
|
| 1408 | + } else if ($key == 'gd_city') {
|
|
| 1409 | + $location_term_actual_city = __($location_info->city, 'geodirectory'); |
|
| 1410 | 1410 | } |
| 1411 | 1411 | } |
| 1412 | 1412 | } |
| 1413 | 1413 | |
| 1414 | - if ( $is_location_last && $key == 'gd_country' && ! ( isset( $location_terms['gd_region'] ) && $location_terms['gd_region'] != '' ) && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {
|
|
| 1415 | - $breadcrumb .= $location_term_actual_country != '' ? $separator . $location_term_actual_country : $separator . $gd_location_link_text; |
|
| 1416 | - } else if ( $is_location_last && $key == 'gd_region' && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {
|
|
| 1417 | - $breadcrumb .= $location_term_actual_region != '' ? $separator . $location_term_actual_region : $separator . $gd_location_link_text; |
|
| 1418 | - } else if ( $is_location_last && $key == 'gd_city' && empty( $location_terms['gd_neighbourhood'] ) ) {
|
|
| 1419 | - $breadcrumb .= $location_term_actual_city != '' ? $separator . $location_term_actual_city : $separator . $gd_location_link_text; |
|
| 1420 | - } else if ( $is_location_last && $key == 'gd_neighbourhood' ) {
|
|
| 1421 | - $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator . $location_term_actual_neighbourhood : $separator . $gd_location_link_text; |
|
| 1414 | + if ($is_location_last && $key == 'gd_country' && !(isset($location_terms['gd_region']) && $location_terms['gd_region'] != '') && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {
|
|
| 1415 | + $breadcrumb .= $location_term_actual_country != '' ? $separator.$location_term_actual_country : $separator.$gd_location_link_text; |
|
| 1416 | + } else if ($is_location_last && $key == 'gd_region' && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {
|
|
| 1417 | + $breadcrumb .= $location_term_actual_region != '' ? $separator.$location_term_actual_region : $separator.$gd_location_link_text; |
|
| 1418 | + } else if ($is_location_last && $key == 'gd_city' && empty($location_terms['gd_neighbourhood'])) {
|
|
| 1419 | + $breadcrumb .= $location_term_actual_city != '' ? $separator.$location_term_actual_city : $separator.$gd_location_link_text; |
|
| 1420 | + } else if ($is_location_last && $key == 'gd_neighbourhood') {
|
|
| 1421 | + $breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator.$location_term_actual_neighbourhood : $separator.$gd_location_link_text; |
|
| 1422 | 1422 | } else {
|
| 1423 | - if ( get_option( 'permalink_structure' ) != '' ) {
|
|
| 1424 | - $location_link .= $location_term . '/'; |
|
| 1423 | + if (get_option('permalink_structure') != '') {
|
|
| 1424 | + $location_link .= $location_term.'/'; |
|
| 1425 | 1425 | } else {
|
| 1426 | - $location_link .= "&$key=" . $location_term; |
|
| 1426 | + $location_link .= "&$key=".$location_term; |
|
| 1427 | 1427 | } |
| 1428 | 1428 | |
| 1429 | - if ( $key == 'gd_country' && $location_term_actual_country != '' ) {
|
|
| 1429 | + if ($key == 'gd_country' && $location_term_actual_country != '') {
|
|
| 1430 | 1430 | $gd_location_link_text = $location_term_actual_country; |
| 1431 | - } else if ( $key == 'gd_region' && $location_term_actual_region != '' ) {
|
|
| 1431 | + } else if ($key == 'gd_region' && $location_term_actual_region != '') {
|
|
| 1432 | 1432 | $gd_location_link_text = $location_term_actual_region; |
| 1433 | - } else if ( $key == 'gd_city' && $location_term_actual_city != '' ) {
|
|
| 1433 | + } else if ($key == 'gd_city' && $location_term_actual_city != '') {
|
|
| 1434 | 1434 | $gd_location_link_text = $location_term_actual_city; |
| 1435 | - } else if ( $key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '' ) {
|
|
| 1435 | + } else if ($key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '') {
|
|
| 1436 | 1436 | $gd_location_link_text = $location_term_actual_neighbourhood; |
| 1437 | 1437 | } |
| 1438 | 1438 | |
@@ -1442,77 +1442,77 @@ discard block |
||
| 1442 | 1442 | } |
| 1443 | 1443 | */ |
| 1444 | 1444 | |
| 1445 | - $breadcrumb .= $separator . '<a href="' . $location_link . '">' . $gd_location_link_text . '</a>'; |
|
| 1445 | + $breadcrumb .= $separator.'<a href="'.$location_link.'">'.$gd_location_link_text.'</a>'; |
|
| 1446 | 1446 | } |
| 1447 | 1447 | } |
| 1448 | 1448 | } |
| 1449 | 1449 | } |
| 1450 | 1450 | |
| 1451 | - if ( ! empty( $gd_taxonomy ) ) {
|
|
| 1451 | + if (!empty($gd_taxonomy)) {
|
|
| 1452 | 1452 | $term_index = 1; |
| 1453 | 1453 | |
| 1454 | 1454 | //if(get_option('geodir_add_categories_url'))
|
| 1455 | 1455 | {
|
| 1456 | - if ( get_query_var( $gd_post_type . '_tags' ) ) {
|
|
| 1457 | - $cat_link = $listing_link . 'tags/'; |
|
| 1456 | + if (get_query_var($gd_post_type.'_tags')) {
|
|
| 1457 | + $cat_link = $listing_link.'tags/'; |
|
| 1458 | 1458 | } else {
|
| 1459 | 1459 | $cat_link = $listing_link; |
| 1460 | 1460 | } |
| 1461 | 1461 | |
| 1462 | - foreach ( $location_terms as $key => $location_term ) {
|
|
| 1463 | - if ( $location_manager && in_array( $key, $hide_url_part ) ) {
|
|
| 1462 | + foreach ($location_terms as $key => $location_term) {
|
|
| 1463 | + if ($location_manager && in_array($key, $hide_url_part)) {
|
|
| 1464 | 1464 | continue; |
| 1465 | 1465 | } |
| 1466 | 1466 | |
| 1467 | - if ( $location_term != '' ) {
|
|
| 1468 | - if ( get_option( 'permalink_structure' ) != '' ) {
|
|
| 1469 | - $cat_link .= $location_term . '/'; |
|
| 1467 | + if ($location_term != '') {
|
|
| 1468 | + if (get_option('permalink_structure') != '') {
|
|
| 1469 | + $cat_link .= $location_term.'/'; |
|
| 1470 | 1470 | } |
| 1471 | 1471 | } |
| 1472 | 1472 | } |
| 1473 | 1473 | |
| 1474 | - $term_array = explode( "/", trim( $wp_query->query[ $gd_taxonomy ], "/" ) ); |
|
| 1475 | - foreach ( $term_array as $term ) {
|
|
| 1476 | - $term_link_text = preg_replace( '/-(\d+)$/', '', $term ); |
|
| 1477 | - $term_link_text = preg_replace( '/[_-]/', ' ', $term_link_text ); |
|
| 1474 | + $term_array = explode("/", trim($wp_query->query[$gd_taxonomy], "/"));
|
|
| 1475 | + foreach ($term_array as $term) {
|
|
| 1476 | + $term_link_text = preg_replace('/-(\d+)$/', '', $term);
|
|
| 1477 | + $term_link_text = preg_replace('/[_-]/', ' ', $term_link_text);
|
|
| 1478 | 1478 | |
| 1479 | 1479 | // get term actual name |
| 1480 | - $term_info = get_term_by( 'slug', $term, $gd_taxonomy, 'ARRAY_A' ); |
|
| 1481 | - if ( ! empty( $term_info ) && isset( $term_info['name'] ) && $term_info['name'] != '' ) {
|
|
| 1482 | - $term_link_text = urldecode( $term_info['name'] ); |
|
| 1480 | + $term_info = get_term_by('slug', $term, $gd_taxonomy, 'ARRAY_A');
|
|
| 1481 | + if (!empty($term_info) && isset($term_info['name']) && $term_info['name'] != '') {
|
|
| 1482 | + $term_link_text = urldecode($term_info['name']); |
|
| 1483 | 1483 | } else {
|
| 1484 | 1484 | continue; |
| 1485 | 1485 | //$term_link_text = wp_strip_all_tags(geodir_ucwords(urldecode($term_link_text))); |
| 1486 | 1486 | } |
| 1487 | 1487 | |
| 1488 | - if ( $term_index == count( $term_array ) && $is_taxonomy_last ) {
|
|
| 1489 | - $breadcrumb .= $separator . $term_link_text; |
|
| 1488 | + if ($term_index == count($term_array) && $is_taxonomy_last) {
|
|
| 1489 | + $breadcrumb .= $separator.$term_link_text; |
|
| 1490 | 1490 | } else {
|
| 1491 | - $cat_link .= $term . '/'; |
|
| 1492 | - $breadcrumb .= $separator . '<a href="' . $cat_link . '">' . $term_link_text . '</a>'; |
|
| 1491 | + $cat_link .= $term.'/'; |
|
| 1492 | + $breadcrumb .= $separator.'<a href="'.$cat_link.'">'.$term_link_text.'</a>'; |
|
| 1493 | 1493 | } |
| 1494 | - $term_index ++; |
|
| 1494 | + $term_index++; |
|
| 1495 | 1495 | } |
| 1496 | 1496 | } |
| 1497 | 1497 | |
| 1498 | 1498 | |
| 1499 | 1499 | } |
| 1500 | 1500 | |
| 1501 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 1502 | - $breadcrumb .= $separator . get_the_title(); |
|
| 1501 | + if (geodir_is_page('detail')) {
|
|
| 1502 | + $breadcrumb .= $separator.get_the_title(); |
|
| 1503 | 1503 | } |
| 1504 | 1504 | |
| 1505 | 1505 | $breadcrumb .= '</li>'; |
| 1506 | 1506 | |
| 1507 | 1507 | |
| 1508 | - } elseif ( geodir_is_page( 'author' ) ) {
|
|
| 1508 | + } elseif (geodir_is_page('author')) {
|
|
| 1509 | 1509 | $dashboard_post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : $gd_post_type; |
| 1510 | 1510 | $user_id = get_current_user_id(); |
| 1511 | - $author_link = get_author_posts_url( $user_id ); |
|
| 1512 | - $default_author_link = geodir_getlink( $author_link, array( |
|
| 1511 | + $author_link = get_author_posts_url($user_id); |
|
| 1512 | + $default_author_link = geodir_getlink($author_link, array( |
|
| 1513 | 1513 | 'geodir_dashbord' => 'true', |
| 1514 | 1514 | 'stype' => $dashboard_post_type |
| 1515 | - ), false ); |
|
| 1515 | + ), false); |
|
| 1516 | 1516 | |
| 1517 | 1517 | /** |
| 1518 | 1518 | * Filter author page link. |
@@ -1522,16 +1522,16 @@ discard block |
||
| 1522 | 1522 | * @param string $default_author_link Default author link. |
| 1523 | 1523 | * @param int $user_id Author ID. |
| 1524 | 1524 | */ |
| 1525 | - $default_author_link = apply_filters( 'geodir_dashboard_author_link', $default_author_link, $user_id ); |
|
| 1525 | + $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_id);
|
|
| 1526 | 1526 | |
| 1527 | 1527 | $breadcrumb .= '<li>'; |
| 1528 | - $breadcrumb .= $separator . '<a href="' . $default_author_link . '">' . __( 'My Dashboard', 'geodirectory' ) . '</a>'; |
|
| 1528 | + $breadcrumb .= $separator.'<a href="'.$default_author_link.'">'.__('My Dashboard', 'geodirectory').'</a>';
|
|
| 1529 | 1529 | |
| 1530 | - if ( isset( $_REQUEST['list'] ) ) {
|
|
| 1531 | - $author_link = geodir_getlink( $author_link, array( |
|
| 1530 | + if (isset($_REQUEST['list'])) {
|
|
| 1531 | + $author_link = geodir_getlink($author_link, array( |
|
| 1532 | 1532 | 'geodir_dashbord' => 'true', |
| 1533 | 1533 | 'stype' => $_REQUEST['stype'] |
| 1534 | - ), false ); |
|
| 1534 | + ), false); |
|
| 1535 | 1535 | |
| 1536 | 1536 | /** |
| 1537 | 1537 | * Filter author page link. |
@@ -1542,61 +1542,61 @@ discard block |
||
| 1542 | 1542 | * @param int $user_id Author ID. |
| 1543 | 1543 | * @param string $_REQUEST ['stype'] Post type. |
| 1544 | 1544 | */ |
| 1545 | - $author_link = apply_filters( 'geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype'] ); |
|
| 1545 | + $author_link = apply_filters('geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype']);
|
|
| 1546 | 1546 | |
| 1547 | - $breadcrumb .= $separator . '<a href="' . $author_link . '">' . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>'; |
|
| 1548 | - $breadcrumb .= $separator . geodir_utf8_ucfirst( __( 'My', 'geodirectory' ) . ' ' . $_REQUEST['list'] ); |
|
| 1547 | + $breadcrumb .= $separator.'<a href="'.$author_link.'">'.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory').'</a>'; |
|
| 1548 | + $breadcrumb .= $separator.geodir_utf8_ucfirst(__('My', 'geodirectory').' '.$_REQUEST['list']);
|
|
| 1549 | 1549 | } else {
|
| 1550 | - $breadcrumb .= $separator . __( geodir_utf8_ucfirst( $post_type_info->label ), 'geodirectory' ); |
|
| 1550 | + $breadcrumb .= $separator.__(geodir_utf8_ucfirst($post_type_info->label), 'geodirectory'); |
|
| 1551 | 1551 | } |
| 1552 | 1552 | |
| 1553 | 1553 | $breadcrumb .= '</li>'; |
| 1554 | - } elseif ( is_category() || is_single() ) {
|
|
| 1554 | + } elseif (is_category() || is_single()) {
|
|
| 1555 | 1555 | $category = get_the_category(); |
| 1556 | - if ( is_category() ) {
|
|
| 1557 | - $breadcrumb .= '<li>' . $separator . $category[0]->cat_name . '</li>'; |
|
| 1556 | + if (is_category()) {
|
|
| 1557 | + $breadcrumb .= '<li>'.$separator.$category[0]->cat_name.'</li>'; |
|
| 1558 | 1558 | } |
| 1559 | - if ( is_single() ) {
|
|
| 1560 | - $breadcrumb .= '<li>' . $separator . '<a href="' . get_category_link( $category[0]->term_id ) . '">' . $category[0]->cat_name . '</a></li>'; |
|
| 1561 | - $breadcrumb .= '<li>' . $separator . get_the_title() . '</li>'; |
|
| 1559 | + if (is_single()) {
|
|
| 1560 | + $breadcrumb .= '<li>'.$separator.'<a href="'.get_category_link($category[0]->term_id).'">'.$category[0]->cat_name.'</a></li>'; |
|
| 1561 | + $breadcrumb .= '<li>'.$separator.get_the_title().'</li>'; |
|
| 1562 | 1562 | } |
| 1563 | 1563 | /* End of my version ##################################################### */ |
| 1564 | - } else if ( is_page() ) {
|
|
| 1564 | + } else if (is_page()) {
|
|
| 1565 | 1565 | $page_title = get_the_title(); |
| 1566 | 1566 | |
| 1567 | - if ( geodir_is_page( 'location' ) ) {
|
|
| 1567 | + if (geodir_is_page('location')) {
|
|
| 1568 | 1568 | $location_page_id = geodir_location_page_id(); |
| 1569 | - $loc_post = get_post( $location_page_id ); |
|
| 1569 | + $loc_post = get_post($location_page_id); |
|
| 1570 | 1570 | $post_name = $loc_post->post_name; |
| 1571 | - $slug = ucwords( str_replace( '-', ' ', $post_name ) ); |
|
| 1572 | - $page_title = ! empty( $slug ) ? $slug : __( 'Location', 'geodirectory' ); |
|
| 1571 | + $slug = ucwords(str_replace('-', ' ', $post_name));
|
|
| 1572 | + $page_title = !empty($slug) ? $slug : __('Location', 'geodirectory');
|
|
| 1573 | 1573 | } |
| 1574 | 1574 | |
| 1575 | - $breadcrumb .= '<li>' . $separator; |
|
| 1576 | - $breadcrumb .= stripslashes_deep( $page_title ); |
|
| 1575 | + $breadcrumb .= '<li>'.$separator; |
|
| 1576 | + $breadcrumb .= stripslashes_deep($page_title); |
|
| 1577 | 1577 | $breadcrumb .= '</li>'; |
| 1578 | - } else if ( is_tag() ) {
|
|
| 1579 | - $breadcrumb .= "<li> " . $separator . single_tag_title( '', false ) . '</li>'; |
|
| 1580 | - } else if ( is_day() ) {
|
|
| 1581 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1582 | - the_time( 'F jS, Y' ); |
|
| 1578 | + } else if (is_tag()) {
|
|
| 1579 | + $breadcrumb .= "<li> ".$separator.single_tag_title('', false).'</li>';
|
|
| 1580 | + } else if (is_day()) {
|
|
| 1581 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1582 | + the_time('F jS, Y');
|
|
| 1583 | 1583 | $breadcrumb .= '</li>'; |
| 1584 | - } else if ( is_month() ) {
|
|
| 1585 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1586 | - the_time( 'F, Y' ); |
|
| 1584 | + } else if (is_month()) {
|
|
| 1585 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1586 | + the_time('F, Y');
|
|
| 1587 | 1587 | $breadcrumb .= '</li>'; |
| 1588 | - } else if ( is_year() ) {
|
|
| 1589 | - $breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " "; |
|
| 1590 | - the_time( 'Y' ); |
|
| 1588 | + } else if (is_year()) {
|
|
| 1589 | + $breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";
|
|
| 1590 | + the_time('Y');
|
|
| 1591 | 1591 | $breadcrumb .= '</li>'; |
| 1592 | - } else if ( is_author() ) {
|
|
| 1593 | - $breadcrumb .= "<li> " . $separator . __( " Author Archive", 'geodirectory' ); |
|
| 1592 | + } else if (is_author()) {
|
|
| 1593 | + $breadcrumb .= "<li> ".$separator.__(" Author Archive", 'geodirectory');
|
|
| 1594 | 1594 | $breadcrumb .= '</li>'; |
| 1595 | - } else if ( isset( $_GET['paged'] ) && ! empty( $_GET['paged'] ) ) {
|
|
| 1596 | - $breadcrumb .= "<li>" . $separator . __( "Blog Archives", 'geodirectory' ); |
|
| 1595 | + } else if (isset($_GET['paged']) && !empty($_GET['paged'])) {
|
|
| 1596 | + $breadcrumb .= "<li>".$separator.__("Blog Archives", 'geodirectory');
|
|
| 1597 | 1597 | $breadcrumb .= '</li>'; |
| 1598 | - } else if ( is_search() ) {
|
|
| 1599 | - $breadcrumb .= "<li> " . $separator . __( " Search Results", 'geodirectory' ); |
|
| 1598 | + } else if (is_search()) {
|
|
| 1599 | + $breadcrumb .= "<li> ".$separator.__(" Search Results", 'geodirectory');
|
|
| 1600 | 1600 | $breadcrumb .= '</li>'; |
| 1601 | 1601 | } |
| 1602 | 1602 | $breadcrumb .= '</ul></div>'; |
@@ -1609,13 +1609,13 @@ discard block |
||
| 1609 | 1609 | * @param string $breadcrumb Breadcrumb HTML. |
| 1610 | 1610 | * @param string $separator Breadcrumb separator. |
| 1611 | 1611 | */ |
| 1612 | - echo $breadcrumb = apply_filters( 'geodir_breadcrumb', $breadcrumb, $separator ); |
|
| 1612 | + echo $breadcrumb = apply_filters('geodir_breadcrumb', $breadcrumb, $separator);
|
|
| 1613 | 1613 | } |
| 1614 | 1614 | } |
| 1615 | 1615 | |
| 1616 | 1616 | |
| 1617 | -add_action( "admin_init", "geodir_allow_wpadmin" ); // check user is admin |
|
| 1618 | -if ( ! function_exists( 'geodir_allow_wpadmin' ) ) {
|
|
| 1617 | +add_action("admin_init", "geodir_allow_wpadmin"); // check user is admin
|
|
| 1618 | +if (!function_exists('geodir_allow_wpadmin')) {
|
|
| 1619 | 1619 | /** |
| 1620 | 1620 | * Allow only admins to access wp-admin. |
| 1621 | 1621 | * |
@@ -1627,12 +1627,12 @@ discard block |
||
| 1627 | 1627 | */ |
| 1628 | 1628 | function geodir_allow_wpadmin() {
|
| 1629 | 1629 | global $wpdb; |
| 1630 | - if ( get_option( 'geodir_allow_wpadmin' ) == '0' && is_user_logged_in() && ( ! defined( 'DOING_AJAX' ) ) ) // checking action in request to allow ajax request go through |
|
| 1630 | + if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && (!defined('DOING_AJAX'))) // checking action in request to allow ajax request go through
|
|
| 1631 | 1631 | {
|
| 1632 | - if ( current_user_can( 'administrator' ) ) {
|
|
| 1632 | + if (current_user_can('administrator')) {
|
|
| 1633 | 1633 | } else {
|
| 1634 | 1634 | |
| 1635 | - wp_redirect( home_url() ); |
|
| 1635 | + wp_redirect(home_url()); |
|
| 1636 | 1636 | exit; |
| 1637 | 1637 | } |
| 1638 | 1638 | |
@@ -1651,23 +1651,23 @@ discard block |
||
| 1651 | 1651 | * |
| 1652 | 1652 | * @return array|WP_Error The uploaded data as array. When failure returns error. |
| 1653 | 1653 | */ |
| 1654 | -function fetch_remote_file( $url ) {
|
|
| 1654 | +function fetch_remote_file($url) {
|
|
| 1655 | 1655 | // extract the file name and extension from the url |
| 1656 | - require_once( ABSPATH . 'wp-includes/pluggable.php' ); |
|
| 1657 | - $file_name = basename( $url ); |
|
| 1658 | - if ( strpos( $file_name, '?' ) !== false ) {
|
|
| 1659 | - list( $file_name ) = explode( '?', $file_name ); |
|
| 1656 | + require_once(ABSPATH.'wp-includes/pluggable.php'); |
|
| 1657 | + $file_name = basename($url); |
|
| 1658 | + if (strpos($file_name, '?') !== false) {
|
|
| 1659 | + list($file_name) = explode('?', $file_name);
|
|
| 1660 | 1660 | } |
| 1661 | 1661 | $dummy = false; |
| 1662 | 1662 | $add_to_cache = false; |
| 1663 | 1663 | $key = null; |
| 1664 | - if ( strpos( $url, '/dummy/' ) !== false ) {
|
|
| 1664 | + if (strpos($url, '/dummy/') !== false) {
|
|
| 1665 | 1665 | $dummy = true; |
| 1666 | - $key = "dummy_" . str_replace( '.', '_', $file_name ); |
|
| 1667 | - $value = get_transient( 'cached_dummy_images' ); |
|
| 1668 | - if ( $value ) {
|
|
| 1669 | - if ( isset( $value[ $key ] ) ) {
|
|
| 1670 | - return $value[ $key ]; |
|
| 1666 | + $key = "dummy_".str_replace('.', '_', $file_name);
|
|
| 1667 | + $value = get_transient('cached_dummy_images');
|
|
| 1668 | + if ($value) {
|
|
| 1669 | + if (isset($value[$key])) {
|
|
| 1670 | + return $value[$key]; |
|
| 1671 | 1671 | } else {
|
| 1672 | 1672 | $add_to_cache = true; |
| 1673 | 1673 | } |
@@ -1678,62 +1678,62 @@ discard block |
||
| 1678 | 1678 | |
| 1679 | 1679 | // get placeholder file in the upload dir with a unique, sanitized filename |
| 1680 | 1680 | |
| 1681 | - $post_upload_date = isset( $post['upload_date'] ) ? $post['upload_date'] : ''; |
|
| 1681 | + $post_upload_date = isset($post['upload_date']) ? $post['upload_date'] : ''; |
|
| 1682 | 1682 | |
| 1683 | - $upload = wp_upload_bits( $file_name, 0, '', $post_upload_date ); |
|
| 1684 | - if ( $upload['error'] ) {
|
|
| 1685 | - return new WP_Error( 'upload_dir_error', $upload['error'] ); |
|
| 1683 | + $upload = wp_upload_bits($file_name, 0, '', $post_upload_date); |
|
| 1684 | + if ($upload['error']) {
|
|
| 1685 | + return new WP_Error('upload_dir_error', $upload['error']);
|
|
| 1686 | 1686 | } |
| 1687 | 1687 | |
| 1688 | 1688 | |
| 1689 | - sleep( 0.3 );// if multiple remote file this can cause the remote server to timeout so we add a slight delay |
|
| 1689 | + sleep(0.3); // if multiple remote file this can cause the remote server to timeout so we add a slight delay |
|
| 1690 | 1690 | |
| 1691 | 1691 | // fetch the remote url and write it to the placeholder file |
| 1692 | - $headers = wp_remote_get( $url, array( 'stream' => true, 'filename' => $upload['file'] ) ); |
|
| 1692 | + $headers = wp_remote_get($url, array('stream' => true, 'filename' => $upload['file']));
|
|
| 1693 | 1693 | |
| 1694 | 1694 | $log_message = ''; |
| 1695 | - if ( is_wp_error( $headers ) ) {
|
|
| 1696 | - echo 'file: ' . $url; |
|
| 1695 | + if (is_wp_error($headers)) {
|
|
| 1696 | + echo 'file: '.$url; |
|
| 1697 | 1697 | |
| 1698 | - return new WP_Error( 'import_file_error', $headers->get_error_message() ); |
|
| 1698 | + return new WP_Error('import_file_error', $headers->get_error_message());
|
|
| 1699 | 1699 | } |
| 1700 | 1700 | |
| 1701 | 1701 | // clear cache to make compat with EWWW Image Optimizer |
| 1702 | - if(defined( 'EWWW_IMAGE_OPTIMIZER_PLUGIN_FILE')){
|
|
| 1702 | + if (defined('EWWW_IMAGE_OPTIMIZER_PLUGIN_FILE')) {
|
|
| 1703 | 1703 | clearstatcache(); |
| 1704 | 1704 | } |
| 1705 | - $filesize = filesize( $upload['file'] ); |
|
| 1705 | + $filesize = filesize($upload['file']); |
|
| 1706 | 1706 | // request failed |
| 1707 | - if ( ! $headers ) {
|
|
| 1708 | - $log_message = __( 'Remote server did not respond', 'geodirectory' ); |
|
| 1707 | + if (!$headers) {
|
|
| 1708 | + $log_message = __('Remote server did not respond', 'geodirectory');
|
|
| 1709 | 1709 | } // make sure the fetch was successful |
| 1710 | - elseif ( $headers['response']['code'] != '200' ) {
|
|
| 1711 | - $log_message = sprintf( __( 'Remote server returned error response %1$d %2$s', 'geodirectory' ), esc_html( $headers['response'] ), get_status_header_desc( $headers['response'] ) ); |
|
| 1712 | - } elseif ( isset( $headers['headers']['content-length'] ) && $filesize != $headers['headers']['content-length'] ) {
|
|
| 1713 | - $log_message = __( 'Remote file is incorrect size', 'geodirectory' ); |
|
| 1714 | - } elseif ( 0 == $filesize ) {
|
|
| 1715 | - $log_message = __( 'Zero size file downloaded', 'geodirectory' ); |
|
| 1716 | - } |
|
| 1717 | - |
|
| 1718 | - if ( $log_message ) {
|
|
| 1719 | - $del = unlink( $upload['file'] ); |
|
| 1720 | - if ( ! $del ) {
|
|
| 1721 | - geodir_error_log( __( 'GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory' ) ); |
|
| 1710 | + elseif ($headers['response']['code'] != '200') {
|
|
| 1711 | + $log_message = sprintf(__('Remote server returned error response %1$d %2$s', 'geodirectory'), esc_html($headers['response']), get_status_header_desc($headers['response']));
|
|
| 1712 | + } elseif (isset($headers['headers']['content-length']) && $filesize != $headers['headers']['content-length']) {
|
|
| 1713 | + $log_message = __('Remote file is incorrect size', 'geodirectory');
|
|
| 1714 | + } elseif (0 == $filesize) {
|
|
| 1715 | + $log_message = __('Zero size file downloaded', 'geodirectory');
|
|
| 1716 | + } |
|
| 1717 | + |
|
| 1718 | + if ($log_message) {
|
|
| 1719 | + $del = unlink($upload['file']); |
|
| 1720 | + if (!$del) {
|
|
| 1721 | + geodir_error_log(__('GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory'));
|
|
| 1722 | 1722 | } |
| 1723 | 1723 | |
| 1724 | - return new WP_Error( 'import_file_error', $log_message ); |
|
| 1724 | + return new WP_Error('import_file_error', $log_message);
|
|
| 1725 | 1725 | } |
| 1726 | 1726 | |
| 1727 | - if ( $dummy && $add_to_cache && is_array( $upload ) ) {
|
|
| 1728 | - $images = get_transient( 'cached_dummy_images' ); |
|
| 1729 | - if ( is_array( $images ) ) {
|
|
| 1730 | - $images[ $key ] = $upload; |
|
| 1727 | + if ($dummy && $add_to_cache && is_array($upload)) {
|
|
| 1728 | + $images = get_transient('cached_dummy_images');
|
|
| 1729 | + if (is_array($images)) {
|
|
| 1730 | + $images[$key] = $upload; |
|
| 1731 | 1731 | } else {
|
| 1732 | - $images = array( $key => $upload ); |
|
| 1732 | + $images = array($key => $upload); |
|
| 1733 | 1733 | } |
| 1734 | 1734 | |
| 1735 | 1735 | //setting the cache using the WP Transient API |
| 1736 | - set_transient( 'cached_dummy_images', $images, 60 * 10 ); //10 minutes cache |
|
| 1736 | + set_transient('cached_dummy_images', $images, 60 * 10); //10 minutes cache
|
|
| 1737 | 1737 | } |
| 1738 | 1738 | |
| 1739 | 1739 | return $upload; |
@@ -1747,12 +1747,12 @@ discard block |
||
| 1747 | 1747 | * @return string|void Max upload size. |
| 1748 | 1748 | */ |
| 1749 | 1749 | function geodir_max_upload_size() {
|
| 1750 | - $max_filesize = (float) get_option( 'geodir_upload_max_filesize', 2 ); |
|
| 1750 | + $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);
|
|
| 1751 | 1751 | |
| 1752 | - if ( $max_filesize > 0 && $max_filesize < 1 ) {
|
|
| 1753 | - $max_filesize = (int) ( $max_filesize * 1024 ) . 'kb'; |
|
| 1752 | + if ($max_filesize > 0 && $max_filesize < 1) {
|
|
| 1753 | + $max_filesize = (int) ($max_filesize * 1024).'kb'; |
|
| 1754 | 1754 | } else {
|
| 1755 | - $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb'; |
|
| 1755 | + $max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb'; |
|
| 1756 | 1756 | } |
| 1757 | 1757 | |
| 1758 | 1758 | /** |
@@ -1762,7 +1762,7 @@ discard block |
||
| 1762 | 1762 | * |
| 1763 | 1763 | * @param string $max_filesize Max file upload size. Ex. 10mb, 512kb. |
| 1764 | 1764 | */ |
| 1765 | - return apply_filters( 'geodir_default_image_upload_size_limit', $max_filesize ); |
|
| 1765 | + return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
|
|
| 1766 | 1766 | } |
| 1767 | 1767 | |
| 1768 | 1768 | /** |
@@ -1775,8 +1775,8 @@ discard block |
||
| 1775 | 1775 | * @return bool If dummy folder exists returns true, else false. |
| 1776 | 1776 | */ |
| 1777 | 1777 | function geodir_dummy_folder_exists() {
|
| 1778 | - $path = geodir_plugin_path() . '/geodirectory-admin/dummy/'; |
|
| 1779 | - if ( ! is_dir( $path ) ) {
|
|
| 1778 | + $path = geodir_plugin_path().'/geodirectory-admin/dummy/'; |
|
| 1779 | + if (!is_dir($path)) {
|
|
| 1780 | 1780 | return false; |
| 1781 | 1781 | } else {
|
| 1782 | 1782 | return true; |
@@ -1795,17 +1795,17 @@ discard block |
||
| 1795 | 1795 | * |
| 1796 | 1796 | * @return object Author info. |
| 1797 | 1797 | */ |
| 1798 | -function geodir_get_author_info( $aid ) {
|
|
| 1798 | +function geodir_get_author_info($aid) {
|
|
| 1799 | 1799 | global $wpdb; |
| 1800 | 1800 | /*$infosql = "select * from $wpdb->users where ID=$aid";*/ |
| 1801 | - $infosql = $wpdb->prepare( "select * from $wpdb->users where ID=%d", array( $aid ) ); |
|
| 1802 | - $info = $wpdb->get_results( $infosql ); |
|
| 1803 | - if ( $info ) {
|
|
| 1801 | + $infosql = $wpdb->prepare("select * from $wpdb->users where ID=%d", array($aid));
|
|
| 1802 | + $info = $wpdb->get_results($infosql); |
|
| 1803 | + if ($info) {
|
|
| 1804 | 1804 | return $info[0]; |
| 1805 | 1805 | } |
| 1806 | 1806 | } |
| 1807 | 1807 | |
| 1808 | -if ( ! function_exists( 'adminEmail' ) ) {
|
|
| 1808 | +if (!function_exists('adminEmail')) {
|
|
| 1809 | 1809 | /** |
| 1810 | 1810 | * Send emails to client on post submission, renew etc. |
| 1811 | 1811 | * |
@@ -1818,67 +1818,67 @@ discard block |
||
| 1818 | 1818 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1819 | 1819 | * @param string $custom_1 Custom data to be sent. |
| 1820 | 1820 | */ |
| 1821 | - function adminEmail( $page_id, $user_id, $message_type, $custom_1 = '' ) {
|
|
| 1821 | + function adminEmail($page_id, $user_id, $message_type, $custom_1 = '') {
|
|
| 1822 | 1822 | global $wpdb; |
| 1823 | - if ( $message_type == 'expiration' ) {
|
|
| 1824 | - $subject = stripslashes( __( get_option( 'renew_email_subject' ), 'geodirectory' ) ); |
|
| 1825 | - $client_message = stripslashes( __( get_option( 'renew_email_content' ), 'geodirectory' ) ); |
|
| 1826 | - } elseif ( $message_type == 'post_submited' ) {
|
|
| 1827 | - $subject = __( get_option( 'post_submited_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1828 | - $client_message = __( get_option( 'post_submited_success_email_content_admin' ), 'geodirectory' ); |
|
| 1829 | - } elseif ( $message_type == 'renew' ) {
|
|
| 1830 | - $subject = __( get_option( 'post_renew_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1831 | - $client_message = __( get_option( 'post_renew_success_email_content_admin' ), 'geodirectory' ); |
|
| 1832 | - } elseif ( $message_type == 'upgrade' ) {
|
|
| 1833 | - $subject = __( get_option( 'post_upgrade_success_email_subject_admin' ), 'geodirectory' ); |
|
| 1834 | - $client_message = __( get_option( 'post_upgrade_success_email_content_admin' ), 'geodirectory' ); |
|
| 1835 | - } elseif ( $message_type == 'claim_approved' ) {
|
|
| 1836 | - $subject = __( get_option( 'claim_approved_email_subject' ), 'geodirectory' ); |
|
| 1837 | - $client_message = __( get_option( 'claim_approved_email_content' ), 'geodirectory' ); |
|
| 1838 | - } elseif ( $message_type == 'claim_rejected' ) {
|
|
| 1839 | - $subject = __( get_option( 'claim_rejected_email_subject' ), 'geodirectory' ); |
|
| 1840 | - $client_message = __( get_option( 'claim_rejected_email_content' ), 'geodirectory' ); |
|
| 1841 | - } elseif ( $message_type == 'claim_requested' ) {
|
|
| 1842 | - $subject = __( get_option( 'claim_email_subject_admin' ), 'geodirectory' ); |
|
| 1843 | - $client_message = __( get_option( 'claim_email_content_admin' ), 'geodirectory' ); |
|
| 1844 | - } elseif ( $message_type == 'auto_claim' ) {
|
|
| 1845 | - $subject = __( get_option( 'auto_claim_email_subject' ), 'geodirectory' ); |
|
| 1846 | - $client_message = __( get_option( 'auto_claim_email_content' ), 'geodirectory' ); |
|
| 1847 | - } elseif ( $message_type == 'payment_success' ) {
|
|
| 1848 | - $subject = __( get_option( 'post_payment_success_admin_email_subject' ), 'geodirectory' ); |
|
| 1849 | - $client_message = __( get_option( 'post_payment_success_admin_email_content' ), 'geodirectory' ); |
|
| 1850 | - } elseif ( $message_type == 'payment_fail' ) {
|
|
| 1851 | - $subject = __( get_option( 'post_payment_fail_admin_email_subject' ), 'geodirectory' ); |
|
| 1852 | - $client_message = __( get_option( 'post_payment_fail_admin_email_content' ), 'geodirectory' ); |
|
| 1823 | + if ($message_type == 'expiration') {
|
|
| 1824 | + $subject = stripslashes(__(get_option('renew_email_subject'), 'geodirectory'));
|
|
| 1825 | + $client_message = stripslashes(__(get_option('renew_email_content'), 'geodirectory'));
|
|
| 1826 | + } elseif ($message_type == 'post_submited') {
|
|
| 1827 | + $subject = __(get_option('post_submited_success_email_subject_admin'), 'geodirectory');
|
|
| 1828 | + $client_message = __(get_option('post_submited_success_email_content_admin'), 'geodirectory');
|
|
| 1829 | + } elseif ($message_type == 'renew') {
|
|
| 1830 | + $subject = __(get_option('post_renew_success_email_subject_admin'), 'geodirectory');
|
|
| 1831 | + $client_message = __(get_option('post_renew_success_email_content_admin'), 'geodirectory');
|
|
| 1832 | + } elseif ($message_type == 'upgrade') {
|
|
| 1833 | + $subject = __(get_option('post_upgrade_success_email_subject_admin'), 'geodirectory');
|
|
| 1834 | + $client_message = __(get_option('post_upgrade_success_email_content_admin'), 'geodirectory');
|
|
| 1835 | + } elseif ($message_type == 'claim_approved') {
|
|
| 1836 | + $subject = __(get_option('claim_approved_email_subject'), 'geodirectory');
|
|
| 1837 | + $client_message = __(get_option('claim_approved_email_content'), 'geodirectory');
|
|
| 1838 | + } elseif ($message_type == 'claim_rejected') {
|
|
| 1839 | + $subject = __(get_option('claim_rejected_email_subject'), 'geodirectory');
|
|
| 1840 | + $client_message = __(get_option('claim_rejected_email_content'), 'geodirectory');
|
|
| 1841 | + } elseif ($message_type == 'claim_requested') {
|
|
| 1842 | + $subject = __(get_option('claim_email_subject_admin'), 'geodirectory');
|
|
| 1843 | + $client_message = __(get_option('claim_email_content_admin'), 'geodirectory');
|
|
| 1844 | + } elseif ($message_type == 'auto_claim') {
|
|
| 1845 | + $subject = __(get_option('auto_claim_email_subject'), 'geodirectory');
|
|
| 1846 | + $client_message = __(get_option('auto_claim_email_content'), 'geodirectory');
|
|
| 1847 | + } elseif ($message_type == 'payment_success') {
|
|
| 1848 | + $subject = __(get_option('post_payment_success_admin_email_subject'), 'geodirectory');
|
|
| 1849 | + $client_message = __(get_option('post_payment_success_admin_email_content'), 'geodirectory');
|
|
| 1850 | + } elseif ($message_type == 'payment_fail') {
|
|
| 1851 | + $subject = __(get_option('post_payment_fail_admin_email_subject'), 'geodirectory');
|
|
| 1852 | + $client_message = __(get_option('post_payment_fail_admin_email_content'), 'geodirectory');
|
|
| 1853 | 1853 | } |
| 1854 | 1854 | $transaction_details = $custom_1; |
| 1855 | - $fromEmail = get_option( 'site_email' ); |
|
| 1855 | + $fromEmail = get_option('site_email');
|
|
| 1856 | 1856 | $fromEmailName = get_site_emailName(); |
| 1857 | 1857 | //$alivedays = get_post_meta($page_id,'alive_days',true); |
| 1858 | - $pkg_limit = get_property_price_info_listing( $page_id ); |
|
| 1858 | + $pkg_limit = get_property_price_info_listing($page_id); |
|
| 1859 | 1859 | $alivedays = $pkg_limit['days']; |
| 1860 | - $productlink = get_permalink( $page_id ); |
|
| 1861 | - $post_info = get_post( $page_id ); |
|
| 1862 | - $post_date = date( 'dS F,Y', strtotime( $post_info->post_date ) ); |
|
| 1863 | - $listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>'; |
|
| 1860 | + $productlink = get_permalink($page_id); |
|
| 1861 | + $post_info = get_post($page_id); |
|
| 1862 | + $post_date = date('dS F,Y', strtotime($post_info->post_date));
|
|
| 1863 | + $listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>'; |
|
| 1864 | 1864 | $loginurl = geodir_login_url(); |
| 1865 | - $loginurl_link = '<a href="' . $loginurl . '">login</a>'; |
|
| 1865 | + $loginurl_link = '<a href="'.$loginurl.'">login</a>'; |
|
| 1866 | 1866 | $siteurl = home_url(); |
| 1867 | - $siteurl_link = '<a href="' . $siteurl . '">' . $fromEmailName . '</a>'; |
|
| 1868 | - $user_info = get_userdata( $user_id ); |
|
| 1867 | + $siteurl_link = '<a href="'.$siteurl.'">'.$fromEmailName.'</a>'; |
|
| 1868 | + $user_info = get_userdata($user_id); |
|
| 1869 | 1869 | $user_email = $user_info->user_email; |
| 1870 | - $display_name = geodir_get_client_name( $user_id ); |
|
| 1870 | + $display_name = geodir_get_client_name($user_id); |
|
| 1871 | 1871 | $user_login = $user_info->user_login; |
| 1872 | - $number_of_grace_days = get_option( 'ptthemes_listing_preexpiry_notice_days' ); |
|
| 1873 | - if ( $number_of_grace_days == '' ) {
|
|
| 1872 | + $number_of_grace_days = get_option('ptthemes_listing_preexpiry_notice_days');
|
|
| 1873 | + if ($number_of_grace_days == '') {
|
|
| 1874 | 1874 | $number_of_grace_days = 1; |
| 1875 | 1875 | } |
| 1876 | - if ( $post_info->post_type == 'event' ) {
|
|
| 1876 | + if ($post_info->post_type == 'event') {
|
|
| 1877 | 1877 | $post_type = 'event'; |
| 1878 | 1878 | } else {
|
| 1879 | 1879 | $post_type = 'listing'; |
| 1880 | 1880 | } |
| 1881 | - $renew_link = '<a href="' . $siteurl . '?ptype=post_' . $post_type . '&renew=1&pid=' . $page_id . '">' . RENEW_LINK . '</a>'; |
|
| 1881 | + $renew_link = '<a href="'.$siteurl.'?ptype=post_'.$post_type.'&renew=1&pid='.$page_id.'">'.RENEW_LINK.'</a>'; |
|
| 1882 | 1882 | $search_array = array( |
| 1883 | 1883 | '[#client_name#]', |
| 1884 | 1884 | '[#listing_link#]', |
@@ -1894,7 +1894,7 @@ discard block |
||
| 1894 | 1894 | '[#site_name#]', |
| 1895 | 1895 | '[#transaction_details#]' |
| 1896 | 1896 | ); |
| 1897 | - $replace_array = array( |
|
| 1897 | + $replace_array = array( |
|
| 1898 | 1898 | $display_name, |
| 1899 | 1899 | $listingLink, |
| 1900 | 1900 | $post_date, |
@@ -1909,13 +1909,13 @@ discard block |
||
| 1909 | 1909 | $fromEmailName, |
| 1910 | 1910 | $transaction_details |
| 1911 | 1911 | ); |
| 1912 | - $client_message = str_replace( $search_array, $replace_array, $client_message ); |
|
| 1913 | - $subject = str_replace( $search_array, $replace_array, $subject ); |
|
| 1912 | + $client_message = str_replace($search_array, $replace_array, $client_message); |
|
| 1913 | + $subject = str_replace($search_array, $replace_array, $subject); |
|
| 1914 | 1914 | |
| 1915 | 1915 | |
| 1916 | - $headers = array(); |
|
| 1916 | + $headers = array(); |
|
| 1917 | 1917 | $headers[] = 'Content-type: text/html; charset=UTF-8'; |
| 1918 | - $headers[] = 'From: ' . $fromEmailName . ' <' . $fromEmail . '>'; |
|
| 1918 | + $headers[] = 'From: '.$fromEmailName.' <'.$fromEmail.'>'; |
|
| 1919 | 1919 | |
| 1920 | 1920 | $to = $fromEmail; |
| 1921 | 1921 | $message = $client_message; |
@@ -1933,7 +1933,7 @@ discard block |
||
| 1933 | 1933 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1934 | 1934 | * @param string $custom_1 Custom data to be sent. |
| 1935 | 1935 | */ |
| 1936 | - $to = apply_filters( 'geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1936 | + $to = apply_filters('geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1937 | 1937 | /** |
| 1938 | 1938 | * Filter the admin email subject. |
| 1939 | 1939 | * |
@@ -1946,7 +1946,7 @@ discard block |
||
| 1946 | 1946 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1947 | 1947 | * @param string $custom_1 Custom data to be sent. |
| 1948 | 1948 | */ |
| 1949 | - $subject = apply_filters( 'geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1949 | + $subject = apply_filters('geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1950 | 1950 | /** |
| 1951 | 1951 | * Filter the admin email message. |
| 1952 | 1952 | * |
@@ -1959,7 +1959,7 @@ discard block |
||
| 1959 | 1959 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1960 | 1960 | * @param string $custom_1 Custom data to be sent. |
| 1961 | 1961 | */ |
| 1962 | - $message = apply_filters( 'geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1962 | + $message = apply_filters('geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1963 | 1963 | /** |
| 1964 | 1964 | * Filter the admin email headers. |
| 1965 | 1965 | * |
@@ -1972,22 +1972,22 @@ discard block |
||
| 1972 | 1972 | * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'. |
| 1973 | 1973 | * @param string $custom_1 Custom data to be sent. |
| 1974 | 1974 | */ |
| 1975 | - $headers = apply_filters( 'geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1 ); |
|
| 1975 | + $headers = apply_filters('geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1);
|
|
| 1976 | 1976 | |
| 1977 | 1977 | |
| 1978 | - $sent = wp_mail( $to, $subject, $message, $headers ); |
|
| 1979 | - if ( ! $sent ) {
|
|
| 1980 | - if ( is_array( $to ) ) {
|
|
| 1981 | - $to = implode( ',', $to ); |
|
| 1978 | + $sent = wp_mail($to, $subject, $message, $headers); |
|
| 1979 | + if (!$sent) {
|
|
| 1980 | + if (is_array($to)) {
|
|
| 1981 | + $to = implode(',', $to);
|
|
| 1982 | 1982 | } |
| 1983 | 1983 | $log_message = sprintf( |
| 1984 | - __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ), |
|
| 1984 | + __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),
|
|
| 1985 | 1985 | $message_type, |
| 1986 | - date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), |
|
| 1986 | + date_i18n('F j Y H:i:s', current_time('timestamp')),
|
|
| 1987 | 1987 | $to, |
| 1988 | 1988 | $subject |
| 1989 | 1989 | ); |
| 1990 | - geodir_error_log( $log_message ); |
|
| 1990 | + geodir_error_log($log_message); |
|
| 1991 | 1991 | } |
| 1992 | 1992 | } |
| 1993 | 1993 | } |
@@ -2007,12 +2007,12 @@ discard block |
||
| 2007 | 2007 | * |
| 2008 | 2008 | * @return array Category IDs. |
| 2009 | 2009 | */ |
| 2010 | -function gd_lang_object_ids( $ids_array, $type ) {
|
|
| 2011 | - if ( geodir_is_wpml() ) {
|
|
| 2010 | +function gd_lang_object_ids($ids_array, $type) {
|
|
| 2011 | + if (geodir_is_wpml()) {
|
|
| 2012 | 2012 | $res = array(); |
| 2013 | - foreach ( $ids_array as $id ) {
|
|
| 2014 | - $xlat = geodir_wpml_object_id( $id, $type, false ); |
|
| 2015 | - if ( ! is_null( $xlat ) ) {
|
|
| 2013 | + foreach ($ids_array as $id) {
|
|
| 2014 | + $xlat = geodir_wpml_object_id($id, $type, false); |
|
| 2015 | + if (!is_null($xlat)) {
|
|
| 2016 | 2016 | $res[] = $xlat; |
| 2017 | 2017 | } |
| 2018 | 2018 | } |
@@ -2036,20 +2036,20 @@ discard block |
||
| 2036 | 2036 | * |
| 2037 | 2037 | * @return array Modified Body CSS classes. |
| 2038 | 2038 | */ |
| 2039 | -function geodir_custom_posts_body_class( $classes ) {
|
|
| 2039 | +function geodir_custom_posts_body_class($classes) {
|
|
| 2040 | 2040 | global $wpdb, $wp; |
| 2041 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 2042 | - if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {
|
|
| 2041 | + $post_types = geodir_get_posttypes('object');
|
|
| 2042 | + if (!empty($post_types) && count((array) $post_types) > 1) {
|
|
| 2043 | 2043 | $classes[] = 'geodir_custom_posts'; |
| 2044 | 2044 | } |
| 2045 | 2045 | |
| 2046 | 2046 | // fix body class for signup page |
| 2047 | - if ( geodir_is_page( 'login' ) ) {
|
|
| 2047 | + if (geodir_is_page('login')) {
|
|
| 2048 | 2048 | $new_classes = array(); |
| 2049 | 2049 | $new_classes[] = 'signup page-geodir-signup'; |
| 2050 | - if ( ! empty( $classes ) ) {
|
|
| 2051 | - foreach ( $classes as $class ) {
|
|
| 2052 | - if ( $class && $class != 'home' && $class != 'blog' ) {
|
|
| 2050 | + if (!empty($classes)) {
|
|
| 2051 | + foreach ($classes as $class) {
|
|
| 2052 | + if ($class && $class != 'home' && $class != 'blog') {
|
|
| 2053 | 2053 | $new_classes[] = $class; |
| 2054 | 2054 | } |
| 2055 | 2055 | } |
@@ -2057,14 +2057,14 @@ discard block |
||
| 2057 | 2057 | $classes = $new_classes; |
| 2058 | 2058 | } |
| 2059 | 2059 | |
| 2060 | - if ( geodir_is_geodir_page() ) {
|
|
| 2060 | + if (geodir_is_geodir_page()) {
|
|
| 2061 | 2061 | $classes[] = 'geodir-page'; |
| 2062 | 2062 | } |
| 2063 | 2063 | |
| 2064 | 2064 | return $classes; |
| 2065 | 2065 | } |
| 2066 | 2066 | |
| 2067 | -add_filter( 'body_class', 'geodir_custom_posts_body_class' ); // let's add a class to the body so we can style the new addition to the search |
|
| 2067 | +add_filter('body_class', 'geodir_custom_posts_body_class'); // let's add a class to the body so we can style the new addition to the search
|
|
| 2068 | 2068 | |
| 2069 | 2069 | |
| 2070 | 2070 | /** |
@@ -2080,7 +2080,7 @@ discard block |
||
| 2080 | 2080 | * |
| 2081 | 2081 | * @since 1.0.0 |
| 2082 | 2082 | */ |
| 2083 | - return apply_filters( 'geodir_map_zoom_level', array( |
|
| 2083 | + return apply_filters('geodir_map_zoom_level', array(
|
|
| 2084 | 2084 | 1, |
| 2085 | 2085 | 2, |
| 2086 | 2086 | 3, |
@@ -2100,7 +2100,7 @@ discard block |
||
| 2100 | 2100 | 17, |
| 2101 | 2101 | 18, |
| 2102 | 2102 | 19 |
| 2103 | - ) ); |
|
| 2103 | + )); |
|
| 2104 | 2104 | |
| 2105 | 2105 | } |
| 2106 | 2106 | |
@@ -2113,12 +2113,12 @@ discard block |
||
| 2113 | 2113 | * |
| 2114 | 2114 | * @param string $geodir_option_name Option key. |
| 2115 | 2115 | */ |
| 2116 | -function geodir_option_version_backup( $geodir_option_name ) {
|
|
| 2116 | +function geodir_option_version_backup($geodir_option_name) {
|
|
| 2117 | 2117 | $version_date = time(); |
| 2118 | - $geodir_option = get_option( $geodir_option_name ); |
|
| 2118 | + $geodir_option = get_option($geodir_option_name); |
|
| 2119 | 2119 | |
| 2120 | - if ( ! empty( $geodir_option ) ) {
|
|
| 2121 | - add_option( $geodir_option_name . '_' . $version_date, $geodir_option ); |
|
| 2120 | + if (!empty($geodir_option)) {
|
|
| 2121 | + add_option($geodir_option_name.'_'.$version_date, $geodir_option); |
|
| 2122 | 2122 | } |
| 2123 | 2123 | } |
| 2124 | 2124 | |
@@ -2132,10 +2132,10 @@ discard block |
||
| 2132 | 2132 | * |
| 2133 | 2133 | * @return int Page ID. |
| 2134 | 2134 | */ |
| 2135 | -function get_page_id_geodir_add_listing_page( $page_id ) {
|
|
| 2136 | - if ( geodir_wpml_multilingual_status() ) {
|
|
| 2135 | +function get_page_id_geodir_add_listing_page($page_id) {
|
|
| 2136 | + if (geodir_wpml_multilingual_status()) {
|
|
| 2137 | 2137 | $post_type = 'post_page'; |
| 2138 | - $page_id = geodir_get_wpml_element_id( $page_id, $post_type ); |
|
| 2138 | + $page_id = geodir_get_wpml_element_id($page_id, $post_type); |
|
| 2139 | 2139 | } |
| 2140 | 2140 | |
| 2141 | 2141 | return $page_id; |
@@ -2149,7 +2149,7 @@ discard block |
||
| 2149 | 2149 | * @return bool Returns true when sitepress multilingual CMS active. else returns false. |
| 2150 | 2150 | */ |
| 2151 | 2151 | function geodir_wpml_multilingual_status() {
|
| 2152 | - if ( geodir_is_wpml() ) {
|
|
| 2152 | + if (geodir_is_wpml()) {
|
|
| 2153 | 2153 | return true; |
| 2154 | 2154 | } |
| 2155 | 2155 | |
@@ -2167,19 +2167,19 @@ discard block |
||
| 2167 | 2167 | * |
| 2168 | 2168 | * @return int Element ID when exists. Else the page id. |
| 2169 | 2169 | */ |
| 2170 | -function geodir_get_wpml_element_id( $page_id, $post_type ) {
|
|
| 2170 | +function geodir_get_wpml_element_id($page_id, $post_type) {
|
|
| 2171 | 2171 | global $sitepress; |
| 2172 | - if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {
|
|
| 2173 | - $trid = $sitepress->get_element_trid( $page_id, $post_type ); |
|
| 2172 | + if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {
|
|
| 2173 | + $trid = $sitepress->get_element_trid($page_id, $post_type); |
|
| 2174 | 2174 | |
| 2175 | - if ( $trid > 0 ) {
|
|
| 2176 | - $translations = $sitepress->get_element_translations( $trid, $post_type ); |
|
| 2175 | + if ($trid > 0) {
|
|
| 2176 | + $translations = $sitepress->get_element_translations($trid, $post_type); |
|
| 2177 | 2177 | |
| 2178 | 2178 | $lang = $sitepress->get_current_language(); |
| 2179 | 2179 | $lang = $lang ? $lang : $sitepress->get_default_language(); |
| 2180 | 2180 | |
| 2181 | - if ( ! empty( $translations ) && ! empty( $lang ) && isset( $translations[ $lang ] ) && isset( $translations[ $lang ]->element_id ) && ! empty( $translations[ $lang ]->element_id ) ) {
|
|
| 2182 | - $page_id = $translations[ $lang ]->element_id; |
|
| 2181 | + if (!empty($translations) && !empty($lang) && isset($translations[$lang]) && isset($translations[$lang]->element_id) && !empty($translations[$lang]->element_id)) {
|
|
| 2182 | + $page_id = $translations[$lang]->element_id; |
|
| 2183 | 2183 | } |
| 2184 | 2184 | } |
| 2185 | 2185 | } |
@@ -2196,15 +2196,15 @@ discard block |
||
| 2196 | 2196 | */ |
| 2197 | 2197 | function geodir_wpml_check_element_id() {
|
| 2198 | 2198 | global $sitepress; |
| 2199 | - if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {
|
|
| 2199 | + if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {
|
|
| 2200 | 2200 | $el_type = 'post_page'; |
| 2201 | - $el_id = get_option( 'geodir_add_listing_page' ); |
|
| 2201 | + $el_id = get_option('geodir_add_listing_page');
|
|
| 2202 | 2202 | $default_lang = $sitepress->get_default_language(); |
| 2203 | - $el_details = $sitepress->get_element_language_details( $el_id, $el_type ); |
|
| 2203 | + $el_details = $sitepress->get_element_language_details($el_id, $el_type); |
|
| 2204 | 2204 | |
| 2205 | - if ( ! ( $el_id > 0 && $default_lang && ! empty( $el_details ) && isset( $el_details->language_code ) && $el_details->language_code == $default_lang ) ) {
|
|
| 2206 | - if ( ! $el_details->source_language_code ) {
|
|
| 2207 | - $sitepress->set_element_language_details( $el_id, $el_type, '', $default_lang ); |
|
| 2205 | + if (!($el_id > 0 && $default_lang && !empty($el_details) && isset($el_details->language_code) && $el_details->language_code == $default_lang)) {
|
|
| 2206 | + if (!$el_details->source_language_code) {
|
|
| 2207 | + $sitepress->set_element_language_details($el_id, $el_type, '', $default_lang); |
|
| 2208 | 2208 | $sitepress->icl_translations_cache->clear(); |
| 2209 | 2209 | } |
| 2210 | 2210 | } |
@@ -2224,44 +2224,44 @@ discard block |
||
| 2224 | 2224 | * |
| 2225 | 2225 | * @return string Orderby SQL. |
| 2226 | 2226 | */ |
| 2227 | -function geodir_widget_listings_get_order( $query_args ) {
|
|
| 2227 | +function geodir_widget_listings_get_order($query_args) {
|
|
| 2228 | 2228 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2229 | 2229 | |
| 2230 | 2230 | $query_args = $gd_query_args_widgets; |
| 2231 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2232 | - return $wpdb->posts . ".post_date DESC, "; |
|
| 2231 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2232 | + return $wpdb->posts.".post_date DESC, "; |
|
| 2233 | 2233 | } |
| 2234 | 2234 | |
| 2235 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2236 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2235 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2236 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2237 | 2237 | |
| 2238 | - $sort_by = ! empty( $query_args['order_by'] ) ? $query_args['order_by'] : ''; |
|
| 2238 | + $sort_by = !empty($query_args['order_by']) ? $query_args['order_by'] : ''; |
|
| 2239 | 2239 | |
| 2240 | - switch ( $sort_by ) {
|
|
| 2240 | + switch ($sort_by) {
|
|
| 2241 | 2241 | case 'latest': |
| 2242 | 2242 | case 'newest': |
| 2243 | - $orderby = $wpdb->posts . ".post_date DESC, "; |
|
| 2243 | + $orderby = $wpdb->posts.".post_date DESC, "; |
|
| 2244 | 2244 | break; |
| 2245 | 2245 | case 'featured': |
| 2246 | - $orderby = $table . ".is_featured ASC, ". $wpdb->posts . ".post_date DESC, "; |
|
| 2246 | + $orderby = $table.".is_featured ASC, ".$wpdb->posts.".post_date DESC, "; |
|
| 2247 | 2247 | break; |
| 2248 | 2248 | case 'az': |
| 2249 | - $orderby = $wpdb->posts . ".post_title ASC, "; |
|
| 2249 | + $orderby = $wpdb->posts.".post_title ASC, "; |
|
| 2250 | 2250 | break; |
| 2251 | 2251 | case 'high_review': |
| 2252 | - $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
| 2252 | + $orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, "; |
|
| 2253 | 2253 | break; |
| 2254 | 2254 | case 'high_rating': |
| 2255 | - $orderby = "( " . $table . ".overall_rating ) DESC, "; |
|
| 2255 | + $orderby = "( ".$table.".overall_rating ) DESC, "; |
|
| 2256 | 2256 | break; |
| 2257 | 2257 | case 'random': |
| 2258 | 2258 | $orderby = "RAND(), "; |
| 2259 | 2259 | break; |
| 2260 | 2260 | default: |
| 2261 | - if ( $custom_orderby = geodir_prepare_custom_sorting( $sort_by, $table ) ) {
|
|
| 2262 | - $orderby = $custom_orderby . ", "; |
|
| 2261 | + if ($custom_orderby = geodir_prepare_custom_sorting($sort_by, $table)) {
|
|
| 2262 | + $orderby = $custom_orderby.", "; |
|
| 2263 | 2263 | } else {
|
| 2264 | - $orderby = $wpdb->posts . ".post_title ASC, "; |
|
| 2264 | + $orderby = $wpdb->posts.".post_title ASC, "; |
|
| 2265 | 2265 | } |
| 2266 | 2266 | break; |
| 2267 | 2267 | } |
@@ -2286,16 +2286,16 @@ discard block |
||
| 2286 | 2286 | * |
| 2287 | 2287 | * @return mixed Result object. |
| 2288 | 2288 | */ |
| 2289 | -function geodir_get_widget_listings( $query_args = array(), $count_only = false ) {
|
|
| 2289 | +function geodir_get_widget_listings($query_args = array(), $count_only = false) {
|
|
| 2290 | 2290 | global $wpdb, $plugin_prefix, $table_prefix; |
| 2291 | 2291 | $GLOBALS['gd_query_args_widgets'] = $query_args; |
| 2292 | 2292 | $gd_query_args_widgets = $query_args; |
| 2293 | 2293 | |
| 2294 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2295 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2296 | - $supports_wpml = geodir_wpml_is_post_type_translated( $post_type ); |
|
| 2294 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2295 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2296 | + $supports_wpml = geodir_wpml_is_post_type_translated($post_type); |
|
| 2297 | 2297 | |
| 2298 | - $fields = $wpdb->posts . ".*, " . $table . ".*"; |
|
| 2298 | + $fields = $wpdb->posts.".*, ".$table.".*"; |
|
| 2299 | 2299 | /** |
| 2300 | 2300 | * Filter widget listing fields string part that is being used for query. |
| 2301 | 2301 | * |
@@ -2305,17 +2305,17 @@ discard block |
||
| 2305 | 2305 | * @param string $table Table name. |
| 2306 | 2306 | * @param string $post_type Post type. |
| 2307 | 2307 | */ |
| 2308 | - $fields = apply_filters( 'geodir_filter_widget_listings_fields', $fields, $table, $post_type ); |
|
| 2308 | + $fields = apply_filters('geodir_filter_widget_listings_fields', $fields, $table, $post_type);
|
|
| 2309 | 2309 | |
| 2310 | - $join = "INNER JOIN " . $table . " ON (" . $table . ".post_id = " . $wpdb->posts . ".ID)";
|
|
| 2310 | + $join = "INNER JOIN ".$table." ON (".$table.".post_id = ".$wpdb->posts.".ID)";
|
|
| 2311 | 2311 | |
| 2312 | 2312 | ########### WPML ########### |
| 2313 | 2313 | |
| 2314 | - if ( $supports_wpml ) {
|
|
| 2314 | + if ($supports_wpml) {
|
|
| 2315 | 2315 | global $sitepress; |
| 2316 | 2316 | $lang_code = ICL_LANGUAGE_CODE; |
| 2317 | - if ( $lang_code ) {
|
|
| 2318 | - $join .= " JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
| 2317 | + if ($lang_code) {
|
|
| 2318 | + $join .= " JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID"; |
|
| 2319 | 2319 | } |
| 2320 | 2320 | } |
| 2321 | 2321 | |
@@ -2329,15 +2329,15 @@ discard block |
||
| 2329 | 2329 | * @param string $join Join clause string. |
| 2330 | 2330 | * @param string $post_type Post type. |
| 2331 | 2331 | */ |
| 2332 | - $join = apply_filters( 'geodir_filter_widget_listings_join', $join, $post_type ); |
|
| 2332 | + $join = apply_filters('geodir_filter_widget_listings_join', $join, $post_type);
|
|
| 2333 | 2333 | |
| 2334 | - $post_status = is_super_admin() ? " OR " . $wpdb->posts . ".post_status = 'private'" : ''; |
|
| 2334 | + $post_status = is_super_admin() ? " OR ".$wpdb->posts.".post_status = 'private'" : ''; |
|
| 2335 | 2335 | |
| 2336 | - $where = " AND ( " . $wpdb->posts . ".post_status = 'publish' " . $post_status . " ) AND " . $wpdb->posts . ".post_type = '" . $post_type . "'"; |
|
| 2336 | + $where = " AND ( ".$wpdb->posts.".post_status = 'publish' ".$post_status." ) AND ".$wpdb->posts.".post_type = '".$post_type."'"; |
|
| 2337 | 2337 | |
| 2338 | 2338 | ########### WPML ########### |
| 2339 | - if ( $supports_wpml ) {
|
|
| 2340 | - if ( $lang_code ) {
|
|
| 2339 | + if ($supports_wpml) {
|
|
| 2340 | + if ($lang_code) {
|
|
| 2341 | 2341 | $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type = 'post_$post_type' "; |
| 2342 | 2342 | } |
| 2343 | 2343 | } |
@@ -2350,8 +2350,8 @@ discard block |
||
| 2350 | 2350 | * @param string $where Where clause string. |
| 2351 | 2351 | * @param string $post_type Post type. |
| 2352 | 2352 | */ |
| 2353 | - $where = apply_filters( 'geodir_filter_widget_listings_where', $where, $post_type ); |
|
| 2354 | - $where = $where != '' ? " WHERE 1=1 " . $where : ''; |
|
| 2353 | + $where = apply_filters('geodir_filter_widget_listings_where', $where, $post_type);
|
|
| 2354 | + $where = $where != '' ? " WHERE 1=1 ".$where : ''; |
|
| 2355 | 2355 | |
| 2356 | 2356 | $groupby = " GROUP BY $wpdb->posts.ID "; //@todo is this needed? faster without |
| 2357 | 2357 | /** |
@@ -2362,15 +2362,15 @@ discard block |
||
| 2362 | 2362 | * @param string $groupby Group by clause string. |
| 2363 | 2363 | * @param string $post_type Post type. |
| 2364 | 2364 | */ |
| 2365 | - $groupby = apply_filters( 'geodir_filter_widget_listings_groupby', $groupby, $post_type ); |
|
| 2365 | + $groupby = apply_filters('geodir_filter_widget_listings_groupby', $groupby, $post_type);
|
|
| 2366 | 2366 | |
| 2367 | - if ( $count_only ) {
|
|
| 2368 | - $sql = "SELECT COUNT(DISTINCT " . $wpdb->posts . ".ID) AS total FROM " . $wpdb->posts . " |
|
| 2369 | - " . $join . " |
|
| 2367 | + if ($count_only) {
|
|
| 2368 | + $sql = "SELECT COUNT(DISTINCT ".$wpdb->posts.".ID) AS total FROM ".$wpdb->posts." |
|
| 2369 | + " . $join." |
|
| 2370 | 2370 | " . $where; |
| 2371 | - $rows = (int) $wpdb->get_var( $sql ); |
|
| 2371 | + $rows = (int) $wpdb->get_var($sql); |
|
| 2372 | 2372 | } else {
|
| 2373 | - $orderby = geodir_widget_listings_get_order( $query_args ); |
|
| 2373 | + $orderby = geodir_widget_listings_get_order($query_args); |
|
| 2374 | 2374 | /** |
| 2375 | 2375 | * Filter widget listing orderby clause string part that is being used for query. |
| 2376 | 2376 | * |
@@ -2380,33 +2380,33 @@ discard block |
||
| 2380 | 2380 | * @param string $table Table name. |
| 2381 | 2381 | * @param string $post_type Post type. |
| 2382 | 2382 | */ |
| 2383 | - $orderby = apply_filters( 'geodir_filter_widget_listings_orderby', $orderby, $table, $post_type ); |
|
| 2383 | + $orderby = apply_filters('geodir_filter_widget_listings_orderby', $orderby, $table, $post_type);
|
|
| 2384 | 2384 | |
| 2385 | 2385 | $second_orderby = array(); |
| 2386 | - if ( strpos( $orderby, strtolower( $table . ".is_featured" ) ) === false ) {
|
|
| 2387 | - $second_orderby[] = $table . ".is_featured ASC"; |
|
| 2386 | + if (strpos($orderby, strtolower($table.".is_featured")) === false) {
|
|
| 2387 | + $second_orderby[] = $table.".is_featured ASC"; |
|
| 2388 | 2388 | } |
| 2389 | 2389 | |
| 2390 | - if ( strpos( $orderby, strtolower( $wpdb->posts . ".post_date" ) ) === false ) {
|
|
| 2391 | - $second_orderby[] = $wpdb->posts . ".post_date DESC"; |
|
| 2390 | + if (strpos($orderby, strtolower($wpdb->posts.".post_date")) === false) {
|
|
| 2391 | + $second_orderby[] = $wpdb->posts.".post_date DESC"; |
|
| 2392 | 2392 | } |
| 2393 | 2393 | |
| 2394 | - if ( strpos( $orderby, strtolower( $wpdb->posts . ".post_title" ) ) === false ) {
|
|
| 2395 | - $second_orderby[] = $wpdb->posts . ".post_title ASC"; |
|
| 2394 | + if (strpos($orderby, strtolower($wpdb->posts.".post_title")) === false) {
|
|
| 2395 | + $second_orderby[] = $wpdb->posts.".post_title ASC"; |
|
| 2396 | 2396 | } |
| 2397 | 2397 | |
| 2398 | - if ( !empty( $second_orderby ) ) {
|
|
| 2399 | - $orderby .= implode( ', ', $second_orderby ); |
|
| 2398 | + if (!empty($second_orderby)) {
|
|
| 2399 | + $orderby .= implode(', ', $second_orderby);
|
|
| 2400 | 2400 | } |
| 2401 | 2401 | |
| 2402 | - if ( !empty( $orderby ) ) {
|
|
| 2403 | - $orderby = trim( $orderby ); |
|
| 2404 | - $orderby = rtrim( $orderby, "," ); |
|
| 2402 | + if (!empty($orderby)) {
|
|
| 2403 | + $orderby = trim($orderby); |
|
| 2404 | + $orderby = rtrim($orderby, ","); |
|
| 2405 | 2405 | } |
| 2406 | 2406 | |
| 2407 | - $orderby = $orderby != '' ? " ORDER BY " . $orderby : ''; |
|
| 2407 | + $orderby = $orderby != '' ? " ORDER BY ".$orderby : ''; |
|
| 2408 | 2408 | |
| 2409 | - $limit = ! empty( $query_args['posts_per_page'] ) ? $query_args['posts_per_page'] : 5; |
|
| 2409 | + $limit = !empty($query_args['posts_per_page']) ? $query_args['posts_per_page'] : 5; |
|
| 2410 | 2410 | /** |
| 2411 | 2411 | * Filter widget listing limit that is being used for query. |
| 2412 | 2412 | * |
@@ -2415,27 +2415,27 @@ discard block |
||
| 2415 | 2415 | * @param int $limit Query results limit. |
| 2416 | 2416 | * @param string $post_type Post type. |
| 2417 | 2417 | */ |
| 2418 | - $limit = apply_filters( 'geodir_filter_widget_listings_limit', $limit, $post_type ); |
|
| 2418 | + $limit = apply_filters('geodir_filter_widget_listings_limit', $limit, $post_type);
|
|
| 2419 | 2419 | |
| 2420 | - $page = ! empty( $query_args['pageno'] ) ? absint( $query_args['pageno'] ) : 1; |
|
| 2421 | - if ( ! $page ) {
|
|
| 2420 | + $page = !empty($query_args['pageno']) ? absint($query_args['pageno']) : 1; |
|
| 2421 | + if (!$page) {
|
|
| 2422 | 2422 | $page = 1; |
| 2423 | 2423 | } |
| 2424 | 2424 | |
| 2425 | - $limit = (int) $limit > 0 ? " LIMIT " . absint( ( $page - 1 ) * (int) $limit ) . ", " . (int) $limit : ""; |
|
| 2425 | + $limit = (int) $limit > 0 ? " LIMIT ".absint(($page - 1) * (int) $limit).", ".(int) $limit : ""; |
|
| 2426 | 2426 | |
| 2427 | 2427 | //@todo removed SQL_CALC_FOUND_ROWS from below as don't think it is needed and query is faster without |
| 2428 | - $sql = "SELECT " . $fields . " FROM " . $wpdb->posts . " |
|
| 2429 | - " . $join . " |
|
| 2430 | - " . $where . " |
|
| 2431 | - " . $groupby . " |
|
| 2432 | - " . $orderby . " |
|
| 2428 | + $sql = "SELECT ".$fields." FROM ".$wpdb->posts." |
|
| 2429 | + " . $join." |
|
| 2430 | + " . $where." |
|
| 2431 | + " . $groupby." |
|
| 2432 | + " . $orderby." |
|
| 2433 | 2433 | " . $limit; |
| 2434 | - $rows = $wpdb->get_results( $sql ); |
|
| 2434 | + $rows = $wpdb->get_results($sql); |
|
| 2435 | 2435 | } |
| 2436 | 2436 | |
| 2437 | - unset( $GLOBALS['gd_query_args_widgets'] ); |
|
| 2438 | - unset( $gd_query_args_widgets ); |
|
| 2437 | + unset($GLOBALS['gd_query_args_widgets']); |
|
| 2438 | + unset($gd_query_args_widgets); |
|
| 2439 | 2439 | |
| 2440 | 2440 | return $rows; |
| 2441 | 2441 | } |
@@ -2452,11 +2452,11 @@ discard block |
||
| 2452 | 2452 | * |
| 2453 | 2453 | * @return string Modified fields SQL. |
| 2454 | 2454 | */ |
| 2455 | -function geodir_function_widget_listings_fields( $fields ) {
|
|
| 2455 | +function geodir_function_widget_listings_fields($fields) {
|
|
| 2456 | 2456 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2457 | 2457 | |
| 2458 | 2458 | $query_args = $gd_query_args_widgets; |
| 2459 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2459 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2460 | 2460 | return $fields; |
| 2461 | 2461 | } |
| 2462 | 2462 | |
@@ -2475,24 +2475,24 @@ discard block |
||
| 2475 | 2475 | * |
| 2476 | 2476 | * @return string Modified join clause SQL. |
| 2477 | 2477 | */ |
| 2478 | -function geodir_function_widget_listings_join( $join ) {
|
|
| 2478 | +function geodir_function_widget_listings_join($join) {
|
|
| 2479 | 2479 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2480 | 2480 | |
| 2481 | 2481 | $query_args = $gd_query_args_widgets; |
| 2482 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2482 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2483 | 2483 | return $join; |
| 2484 | 2484 | } |
| 2485 | 2485 | |
| 2486 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2487 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2486 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2487 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2488 | 2488 | |
| 2489 | - if ( ! empty( $query_args['with_pics_only'] ) ) {
|
|
| 2490 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 2489 | + if (!empty($query_args['with_pics_only'])) {
|
|
| 2490 | + $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )"; |
|
| 2491 | 2491 | } |
| 2492 | 2492 | |
| 2493 | - if ( ! empty( $query_args['tax_query'] ) ) {
|
|
| 2494 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); |
|
| 2495 | - if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
|
|
| 2493 | + if (!empty($query_args['tax_query'])) {
|
|
| 2494 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); |
|
| 2495 | + if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
|
|
| 2496 | 2496 | $join .= $tax_queries['join']; |
| 2497 | 2497 | } |
| 2498 | 2498 | } |
@@ -2513,60 +2513,60 @@ discard block |
||
| 2513 | 2513 | * |
| 2514 | 2514 | * @return string Modified where clause SQL. |
| 2515 | 2515 | */ |
| 2516 | -function geodir_function_widget_listings_where( $where ) {
|
|
| 2516 | +function geodir_function_widget_listings_where($where) {
|
|
| 2517 | 2517 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2518 | 2518 | |
| 2519 | 2519 | $query_args = $gd_query_args_widgets; |
| 2520 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2520 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2521 | 2521 | return $where; |
| 2522 | 2522 | } |
| 2523 | - $post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type']; |
|
| 2524 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2523 | + $post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type']; |
|
| 2524 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2525 | 2525 | |
| 2526 | - if ( ! empty( $query_args ) ) {
|
|
| 2527 | - if ( ! empty( $query_args['gd_location'] ) && function_exists( 'geodir_default_location_where' ) ) {
|
|
| 2528 | - $where = geodir_default_location_where( $where, $table ); |
|
| 2526 | + if (!empty($query_args)) {
|
|
| 2527 | + if (!empty($query_args['gd_location']) && function_exists('geodir_default_location_where')) {
|
|
| 2528 | + $where = geodir_default_location_where($where, $table); |
|
| 2529 | 2529 | } |
| 2530 | 2530 | |
| 2531 | - if ( ! empty( $query_args['post_author'] ) ) {
|
|
| 2532 | - $where .= " AND " . $wpdb->posts . ".post_author = " . (int) $query_args['post_author']; |
|
| 2531 | + if (!empty($query_args['post_author'])) {
|
|
| 2532 | + $where .= " AND ".$wpdb->posts.".post_author = ".(int) $query_args['post_author']; |
|
| 2533 | 2533 | } |
| 2534 | 2534 | |
| 2535 | - if ( ! empty( $query_args['show_featured_only'] ) ) {
|
|
| 2536 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 2535 | + if (!empty($query_args['show_featured_only'])) {
|
|
| 2536 | + $where .= " AND ".$table.".is_featured = '1'"; |
|
| 2537 | 2537 | } |
| 2538 | 2538 | |
| 2539 | - if ( ! empty( $query_args['show_special_only'] ) ) {
|
|
| 2540 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 2539 | + if (!empty($query_args['show_special_only'])) {
|
|
| 2540 | + $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )"; |
|
| 2541 | 2541 | } |
| 2542 | 2542 | |
| 2543 | - if ( ! empty( $query_args['with_pics_only'] ) ) {
|
|
| 2544 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL "; |
|
| 2543 | + if (!empty($query_args['with_pics_only'])) {
|
|
| 2544 | + $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL "; |
|
| 2545 | 2545 | } |
| 2546 | 2546 | |
| 2547 | - if ( ! empty( $query_args['featured_image_only'] ) ) {
|
|
| 2548 | - $where .= " AND " . $table . ".featured_image IS NOT NULL AND " . $table . ".featured_image!='' "; |
|
| 2547 | + if (!empty($query_args['featured_image_only'])) {
|
|
| 2548 | + $where .= " AND ".$table.".featured_image IS NOT NULL AND ".$table.".featured_image!='' "; |
|
| 2549 | 2549 | } |
| 2550 | 2550 | |
| 2551 | - if ( ! empty( $query_args['with_videos_only'] ) ) {
|
|
| 2552 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 2551 | + if (!empty($query_args['with_videos_only'])) {
|
|
| 2552 | + $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )"; |
|
| 2553 | 2553 | } |
| 2554 | 2554 | |
| 2555 | - if ( ! empty( $query_args['show_favorites_only'] ) ) {
|
|
| 2555 | + if (!empty($query_args['show_favorites_only'])) {
|
|
| 2556 | 2556 | $user_favorites = '-1'; |
| 2557 | 2557 | |
| 2558 | - if ( !empty( $query_args['favorites_by_user'] ) ) {
|
|
| 2559 | - $user_favorites = get_user_meta( (int)$query_args['favorites_by_user'], 'gd_user_favourite_post', true ); |
|
| 2558 | + if (!empty($query_args['favorites_by_user'])) {
|
|
| 2559 | + $user_favorites = get_user_meta((int) $query_args['favorites_by_user'], 'gd_user_favourite_post', true); |
|
| 2560 | 2560 | $user_favorites = !empty($user_favorites) && is_array($user_favorites) ? implode("','", $user_favorites) : '-1';
|
| 2561 | 2561 | } |
| 2562 | 2562 | |
| 2563 | - $where .= " AND `" . $wpdb->posts . "`.`ID` IN('" . $user_favorites . "')";
|
|
| 2563 | + $where .= " AND `".$wpdb->posts."`.`ID` IN('".$user_favorites."')";
|
|
| 2564 | 2564 | } |
| 2565 | 2565 | |
| 2566 | - if ( ! empty( $query_args['tax_query'] ) ) {
|
|
| 2567 | - $tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' ); |
|
| 2566 | + if (!empty($query_args['tax_query'])) {
|
|
| 2567 | + $tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID'); |
|
| 2568 | 2568 | |
| 2569 | - if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {
|
|
| 2569 | + if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {
|
|
| 2570 | 2570 | $where .= $tax_queries['where']; |
| 2571 | 2571 | } |
| 2572 | 2572 | } |
@@ -2587,11 +2587,11 @@ discard block |
||
| 2587 | 2587 | * |
| 2588 | 2588 | * @return string Modified orderby clause SQL. |
| 2589 | 2589 | */ |
| 2590 | -function geodir_function_widget_listings_orderby( $orderby ) {
|
|
| 2590 | +function geodir_function_widget_listings_orderby($orderby) {
|
|
| 2591 | 2591 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2592 | 2592 | |
| 2593 | 2593 | $query_args = $gd_query_args_widgets; |
| 2594 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2594 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2595 | 2595 | return $orderby; |
| 2596 | 2596 | } |
| 2597 | 2597 | |
@@ -2610,15 +2610,15 @@ discard block |
||
| 2610 | 2610 | * |
| 2611 | 2611 | * @return int Query limit. |
| 2612 | 2612 | */ |
| 2613 | -function geodir_function_widget_listings_limit( $limit ) {
|
|
| 2613 | +function geodir_function_widget_listings_limit($limit) {
|
|
| 2614 | 2614 | global $wpdb, $plugin_prefix, $gd_query_args_widgets; |
| 2615 | 2615 | |
| 2616 | 2616 | $query_args = $gd_query_args_widgets; |
| 2617 | - if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {
|
|
| 2617 | + if (empty($query_args) || empty($query_args['is_geodir_loop'])) {
|
|
| 2618 | 2618 | return $limit; |
| 2619 | 2619 | } |
| 2620 | 2620 | |
| 2621 | - if ( ! empty( $query_args ) && ! empty( $query_args['posts_per_page'] ) ) {
|
|
| 2621 | + if (!empty($query_args) && !empty($query_args['posts_per_page'])) {
|
|
| 2622 | 2622 | $limit = (int) $query_args['posts_per_page']; |
| 2623 | 2623 | } |
| 2624 | 2624 | |
@@ -2636,12 +2636,12 @@ discard block |
||
| 2636 | 2636 | * |
| 2637 | 2637 | * @return int Large size width. |
| 2638 | 2638 | */ |
| 2639 | -function geodir_media_image_large_width( $default = 800, $params = '' ) {
|
|
| 2640 | - $large_size_w = get_option( 'large_size_w' ); |
|
| 2639 | +function geodir_media_image_large_width($default = 800, $params = '') {
|
|
| 2640 | + $large_size_w = get_option('large_size_w');
|
|
| 2641 | 2641 | $large_size_w = $large_size_w > 0 ? $large_size_w : $default; |
| 2642 | - $large_size_w = absint( $large_size_w ); |
|
| 2642 | + $large_size_w = absint($large_size_w); |
|
| 2643 | 2643 | |
| 2644 | - if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
|
|
| 2644 | + if (!get_option('geodir_use_wp_media_large_size')) {
|
|
| 2645 | 2645 | $large_size_w = 800; |
| 2646 | 2646 | } |
| 2647 | 2647 | |
@@ -2654,7 +2654,7 @@ discard block |
||
| 2654 | 2654 | * @param int $default Default width. |
| 2655 | 2655 | * @param string|array $params Image parameters. |
| 2656 | 2656 | */ |
| 2657 | - $large_size_w = apply_filters( 'geodir_filter_media_image_large_width', $large_size_w, $default, $params ); |
|
| 2657 | + $large_size_w = apply_filters('geodir_filter_media_image_large_width', $large_size_w, $default, $params);
|
|
| 2658 | 2658 | |
| 2659 | 2659 | return $large_size_w; |
| 2660 | 2660 | } |
@@ -2670,12 +2670,12 @@ discard block |
||
| 2670 | 2670 | * |
| 2671 | 2671 | * @return int Large size height. |
| 2672 | 2672 | */ |
| 2673 | -function geodir_media_image_large_height( $default = 800, $params = '' ) {
|
|
| 2674 | - $large_size_h = get_option( 'large_size_h' ); |
|
| 2673 | +function geodir_media_image_large_height($default = 800, $params = '') {
|
|
| 2674 | + $large_size_h = get_option('large_size_h');
|
|
| 2675 | 2675 | $large_size_h = $large_size_h > 0 ? $large_size_h : $default; |
| 2676 | - $large_size_h = absint( $large_size_h ); |
|
| 2676 | + $large_size_h = absint($large_size_h); |
|
| 2677 | 2677 | |
| 2678 | - if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {
|
|
| 2678 | + if (!get_option('geodir_use_wp_media_large_size')) {
|
|
| 2679 | 2679 | $large_size_h = 800; |
| 2680 | 2680 | } |
| 2681 | 2681 | |
@@ -2688,7 +2688,7 @@ discard block |
||
| 2688 | 2688 | * @param int $default Default height. |
| 2689 | 2689 | * @param string|array $params Image parameters. |
| 2690 | 2690 | */ |
| 2691 | - $large_size_h = apply_filters( 'geodir_filter_media_image_large_height', $large_size_h, $default, $params ); |
|
| 2691 | + $large_size_h = apply_filters('geodir_filter_media_image_large_height', $large_size_h, $default, $params);
|
|
| 2692 | 2692 | |
| 2693 | 2693 | return $large_size_h; |
| 2694 | 2694 | } |
@@ -2705,8 +2705,8 @@ discard block |
||
| 2705 | 2705 | * |
| 2706 | 2706 | * @return string Sanitized name. |
| 2707 | 2707 | */ |
| 2708 | -function geodir_sanitize_location_name( $type, $name, $translate = true ) {
|
|
| 2709 | - if ( $name == '' ) {
|
|
| 2708 | +function geodir_sanitize_location_name($type, $name, $translate = true) {
|
|
| 2709 | + if ($name == '') {
|
|
| 2710 | 2710 | return null; |
| 2711 | 2711 | } |
| 2712 | 2712 | |
@@ -2715,13 +2715,13 @@ discard block |
||
| 2715 | 2715 | $type = $type == 'gd_city' ? 'city' : $type; |
| 2716 | 2716 | |
| 2717 | 2717 | $return = $name; |
| 2718 | - if ( function_exists( 'get_actual_location_name' ) ) {
|
|
| 2719 | - $return = get_actual_location_name( $type, $name, $translate ); |
|
| 2718 | + if (function_exists('get_actual_location_name')) {
|
|
| 2719 | + $return = get_actual_location_name($type, $name, $translate); |
|
| 2720 | 2720 | } else {
|
| 2721 | - $return = preg_replace( '/-(\d+)$/', '', $return ); |
|
| 2722 | - $return = preg_replace( '/[_-]/', ' ', $return ); |
|
| 2723 | - $return = geodir_ucwords( $return ); |
|
| 2724 | - $return = $translate ? __( $return, 'geodirectory' ) : $return; |
|
| 2721 | + $return = preg_replace('/-(\d+)$/', '', $return);
|
|
| 2722 | + $return = preg_replace('/[_-]/', ' ', $return);
|
|
| 2723 | + $return = geodir_ucwords($return); |
|
| 2724 | + $return = $translate ? __($return, 'geodirectory') : $return; |
|
| 2725 | 2725 | } |
| 2726 | 2726 | |
| 2727 | 2727 | return $return; |
@@ -2739,26 +2739,26 @@ discard block |
||
| 2739 | 2739 | * |
| 2740 | 2740 | * @param int $number Comments number. |
| 2741 | 2741 | */ |
| 2742 | -function geodir_comments_number( $number ) {
|
|
| 2742 | +function geodir_comments_number($number) {
|
|
| 2743 | 2743 | global $post; |
| 2744 | 2744 | |
| 2745 | - if ( !empty( $post->post_type ) && geodir_cpt_has_rating_disabled( $post->post_type ) ) {
|
|
| 2745 | + if (!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type)) {
|
|
| 2746 | 2746 | $number = get_comments_number(); |
| 2747 | 2747 | |
| 2748 | - if ( $number > 1 ) {
|
|
| 2749 | - $output = str_replace( '%', number_format_i18n( $number ), __( '% Comments', 'geodirectory' ) ); |
|
| 2750 | - } elseif ( $number == 0 || $number == '' ) {
|
|
| 2751 | - $output = __( 'No Comments', 'geodirectory' ); |
|
| 2748 | + if ($number > 1) {
|
|
| 2749 | + $output = str_replace('%', number_format_i18n($number), __('% Comments', 'geodirectory'));
|
|
| 2750 | + } elseif ($number == 0 || $number == '') {
|
|
| 2751 | + $output = __('No Comments', 'geodirectory');
|
|
| 2752 | 2752 | } else { // must be one
|
| 2753 | - $output = __( '1 Comment', 'geodirectory' ); |
|
| 2753 | + $output = __('1 Comment', 'geodirectory');
|
|
| 2754 | 2754 | } |
| 2755 | 2755 | } else {
|
| 2756 | - if ( $number > 1 ) {
|
|
| 2757 | - $output = str_replace( '%', number_format_i18n( $number ), __( '% Reviews', 'geodirectory' ) ); |
|
| 2758 | - } elseif ( $number == 0 || $number == '' ) {
|
|
| 2759 | - $output = __( 'No Reviews', 'geodirectory' ); |
|
| 2756 | + if ($number > 1) {
|
|
| 2757 | + $output = str_replace('%', number_format_i18n($number), __('% Reviews', 'geodirectory'));
|
|
| 2758 | + } elseif ($number == 0 || $number == '') {
|
|
| 2759 | + $output = __('No Reviews', 'geodirectory');
|
|
| 2760 | 2760 | } else { // must be one
|
| 2761 | - $output = __( '1 Review', 'geodirectory' ); |
|
| 2761 | + $output = __('1 Review', 'geodirectory');
|
|
| 2762 | 2762 | } |
| 2763 | 2763 | } |
| 2764 | 2764 | |
@@ -2775,18 +2775,18 @@ discard block |
||
| 2775 | 2775 | */ |
| 2776 | 2776 | function is_page_geodir_home() {
|
| 2777 | 2777 | global $wpdb; |
| 2778 | - $cur_url = str_replace( array( "https://", "http://", "www." ), array( '', '', '' ), geodir_curPageURL() ); |
|
| 2779 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 2780 | - remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
| 2778 | + $cur_url = str_replace(array("https://", "http://", "www."), array('', '', ''), geodir_curPageURL());
|
|
| 2779 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 2780 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 2781 | 2781 | } |
| 2782 | - $home_url = home_url( '', 'http' ); |
|
| 2783 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 2784 | - add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
| 2782 | + $home_url = home_url('', 'http');
|
|
| 2783 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 2784 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 2785 | 2785 | } |
| 2786 | - $home_url = str_replace( "www.", "", $home_url ); |
|
| 2787 | - if ( ( strpos( $home_url, $cur_url ) !== false || strpos( $home_url . '/', $cur_url ) !== false ) && ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && get_option( 'page_on_front' ) == get_option( 'geodir_home_page' ) ) ) {
|
|
| 2786 | + $home_url = str_replace("www.", "", $home_url);
|
|
| 2787 | + if ((strpos($home_url, $cur_url) !== false || strpos($home_url.'/', $cur_url) !== false) && ('page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page'))) {
|
|
| 2788 | 2788 | return true; |
| 2789 | - } elseif ( get_query_var( 'page_id' ) == get_option( 'page_on_front' ) && 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && get_option( 'page_on_front' ) == get_option( 'geodir_home_page' ) ) {
|
|
| 2789 | + } elseif (get_query_var('page_id') == get_option('page_on_front') && 'page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page')) {
|
|
| 2790 | 2790 | return true; |
| 2791 | 2791 | } else {
|
| 2792 | 2792 | return false; |
@@ -2806,18 +2806,18 @@ discard block |
||
| 2806 | 2806 | * |
| 2807 | 2807 | * @return string The canonical URL. |
| 2808 | 2808 | */ |
| 2809 | -function geodir_wpseo_homepage_canonical( $url ) {
|
|
| 2809 | +function geodir_wpseo_homepage_canonical($url) {
|
|
| 2810 | 2810 | global $post; |
| 2811 | 2811 | |
| 2812 | - if ( is_page_geodir_home() ) {
|
|
| 2812 | + if (is_page_geodir_home()) {
|
|
| 2813 | 2813 | return home_url(); |
| 2814 | 2814 | } |
| 2815 | 2815 | |
| 2816 | 2816 | return $url; |
| 2817 | 2817 | } |
| 2818 | 2818 | |
| 2819 | -add_filter( 'wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10 ); |
|
| 2820 | -add_filter( 'aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10 ); |
|
| 2819 | +add_filter('wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10);
|
|
| 2820 | +add_filter('aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10);
|
|
| 2821 | 2821 | |
| 2822 | 2822 | /** |
| 2823 | 2823 | * Add extra fields to google maps script call. |
@@ -2830,20 +2830,20 @@ discard block |
||
| 2830 | 2830 | * |
| 2831 | 2831 | * @return string Modified extra string. |
| 2832 | 2832 | */ |
| 2833 | -function geodir_googlemap_script_extra_details_page( $extra ) {
|
|
| 2833 | +function geodir_googlemap_script_extra_details_page($extra) {
|
|
| 2834 | 2834 | global $post; |
| 2835 | 2835 | $add_google_places_api = false; |
| 2836 | - if ( isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {
|
|
| 2836 | + if (isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {
|
|
| 2837 | 2837 | $add_google_places_api = true; |
| 2838 | 2838 | } |
| 2839 | - if ( ! str_replace( 'libraries=places', '', $extra ) && ( geodir_is_page( 'detail' ) || $add_google_places_api ) ) {
|
|
| 2839 | + if (!str_replace('libraries=places', '', $extra) && (geodir_is_page('detail') || $add_google_places_api)) {
|
|
| 2840 | 2840 | $extra .= "&libraries=places"; |
| 2841 | 2841 | } |
| 2842 | 2842 | |
| 2843 | 2843 | return $extra; |
| 2844 | 2844 | } |
| 2845 | 2845 | |
| 2846 | -add_filter( 'geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1 ); |
|
| 2846 | +add_filter('geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1);
|
|
| 2847 | 2847 | |
| 2848 | 2848 | |
| 2849 | 2849 | /** |
@@ -2862,120 +2862,120 @@ discard block |
||
| 2862 | 2862 | * after_widget. |
| 2863 | 2863 | * @param array|string $instance The settings for the particular instance of the widget. |
| 2864 | 2864 | */ |
| 2865 | -function geodir_popular_post_category_output( $args = '', $instance = '' ) {
|
|
| 2865 | +function geodir_popular_post_category_output($args = '', $instance = '') {
|
|
| 2866 | 2866 | // prints the widget |
| 2867 | 2867 | global $wpdb, $plugin_prefix, $geodir_post_category_str; |
| 2868 | - extract( $args, EXTR_SKIP ); |
|
| 2868 | + extract($args, EXTR_SKIP); |
|
| 2869 | 2869 | |
| 2870 | 2870 | echo $before_widget; |
| 2871 | 2871 | |
| 2872 | 2872 | /** This filter is documented in geodirectory_widgets.php */ |
| 2873 | - $title = empty( $instance['title'] ) ? __( 'Popular Categories', 'geodirectory' ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 2873 | + $title = empty($instance['title']) ? __('Popular Categories', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 2874 | 2874 | |
| 2875 | 2875 | $gd_post_type = geodir_get_current_posttype(); |
| 2876 | 2876 | |
| 2877 | - $category_limit = isset( $instance['category_limit'] ) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; |
|
| 2877 | + $category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15; |
|
| 2878 | 2878 | if (!isset($category_restrict)) {
|
| 2879 | 2879 | $category_restrict = false; |
| 2880 | 2880 | } |
| 2881 | - if ( ! empty( $gd_post_type ) ) {
|
|
| 2881 | + if (!empty($gd_post_type)) {
|
|
| 2882 | 2882 | $default_post_type = $gd_post_type; |
| 2883 | - } elseif ( isset( $instance['default_post_type'] ) && gdsc_is_post_type_valid( $instance['default_post_type'] ) ) {
|
|
| 2883 | + } elseif (isset($instance['default_post_type']) && gdsc_is_post_type_valid($instance['default_post_type'])) {
|
|
| 2884 | 2884 | $default_post_type = $instance['default_post_type']; |
| 2885 | 2885 | } else {
|
| 2886 | 2886 | $all_gd_post_type = geodir_get_posttypes(); |
| 2887 | - $default_post_type = ( isset( $all_gd_post_type[0] ) ) ? $all_gd_post_type[0] : ''; |
|
| 2887 | + $default_post_type = (isset($all_gd_post_type[0])) ? $all_gd_post_type[0] : ''; |
|
| 2888 | 2888 | } |
| 2889 | - $parent_only = !empty( $instance['parent_only'] ) ? true : false; |
|
| 2889 | + $parent_only = !empty($instance['parent_only']) ? true : false; |
|
| 2890 | 2890 | |
| 2891 | 2891 | $taxonomy = array(); |
| 2892 | - if ( ! empty( $gd_post_type ) ) {
|
|
| 2893 | - $taxonomy[] = $gd_post_type . "category"; |
|
| 2892 | + if (!empty($gd_post_type)) {
|
|
| 2893 | + $taxonomy[] = $gd_post_type."category"; |
|
| 2894 | 2894 | } else {
|
| 2895 | - $taxonomy = geodir_get_taxonomies( $gd_post_type ); |
|
| 2895 | + $taxonomy = geodir_get_taxonomies($gd_post_type); |
|
| 2896 | 2896 | } |
| 2897 | 2897 | |
| 2898 | 2898 | $taxonomy = apply_filters('geodir_pp_category_taxonomy', $taxonomy);
|
| 2899 | 2899 | |
| 2900 | - $term_args = array( 'taxonomy' => $taxonomy ); |
|
| 2901 | - if ( $parent_only ) {
|
|
| 2900 | + $term_args = array('taxonomy' => $taxonomy);
|
|
| 2901 | + if ($parent_only) {
|
|
| 2902 | 2902 | $term_args['parent'] = 0; |
| 2903 | 2903 | } |
| 2904 | 2904 | |
| 2905 | - $terms = get_terms( $term_args ); |
|
| 2905 | + $terms = get_terms($term_args); |
|
| 2906 | 2906 | $a_terms = array(); |
| 2907 | 2907 | $b_terms = array(); |
| 2908 | 2908 | |
| 2909 | - foreach ( $terms as $term ) {
|
|
| 2910 | - if ( $term->count > 0 ) {
|
|
| 2911 | - $a_terms[ $term->taxonomy ][] = $term; |
|
| 2909 | + foreach ($terms as $term) {
|
|
| 2910 | + if ($term->count > 0) {
|
|
| 2911 | + $a_terms[$term->taxonomy][] = $term; |
|
| 2912 | 2912 | } |
| 2913 | 2913 | } |
| 2914 | 2914 | |
| 2915 | - if ( ! empty( $a_terms ) ) {
|
|
| 2915 | + if (!empty($a_terms)) {
|
|
| 2916 | 2916 | // Sort CPT taxonomies in categories widget. |
| 2917 | - if ( !empty( $taxonomy ) && is_array( $taxonomy ) && count( $taxonomy ) > 1 ) {
|
|
| 2917 | + if (!empty($taxonomy) && is_array($taxonomy) && count($taxonomy) > 1) {
|
|
| 2918 | 2918 | $gd_post_types = geodir_get_posttypes(); |
| 2919 | 2919 | $sort_taxonomies = array(); |
| 2920 | 2920 | |
| 2921 | - foreach ( $gd_post_types as $gd_post_type ) {
|
|
| 2922 | - $taxonomy_name = $gd_post_type . 'category'; |
|
| 2921 | + foreach ($gd_post_types as $gd_post_type) {
|
|
| 2922 | + $taxonomy_name = $gd_post_type.'category'; |
|
| 2923 | 2923 | |
| 2924 | - if ( !empty( $a_terms[$taxonomy_name] ) ) {
|
|
| 2924 | + if (!empty($a_terms[$taxonomy_name])) {
|
|
| 2925 | 2925 | $sort_taxonomies[$taxonomy_name] = $a_terms[$taxonomy_name]; |
| 2926 | 2926 | } |
| 2927 | 2927 | } |
| 2928 | - $a_terms = !empty( $sort_taxonomies ) ? $sort_taxonomies : $a_terms; |
|
| 2928 | + $a_terms = !empty($sort_taxonomies) ? $sort_taxonomies : $a_terms; |
|
| 2929 | 2929 | } |
| 2930 | 2930 | |
| 2931 | 2931 | $sort_by = apply_filters('geodir_pp_category_sort', 'count');
|
| 2932 | - foreach ( $a_terms as $b_key => $b_val ) {
|
|
| 2933 | - $b_terms[ $b_key ] = geodir_sort_terms( $b_val, $sort_by ); |
|
| 2932 | + foreach ($a_terms as $b_key => $b_val) {
|
|
| 2933 | + $b_terms[$b_key] = geodir_sort_terms($b_val, $sort_by); |
|
| 2934 | 2934 | } |
| 2935 | 2935 | |
| 2936 | - $default_taxonomy = $default_post_type != '' && isset( $b_terms[ $default_post_type . 'category' ] ) ? $default_post_type . 'category' : ''; |
|
| 2936 | + $default_taxonomy = $default_post_type != '' && isset($b_terms[$default_post_type.'category']) ? $default_post_type.'category' : ''; |
|
| 2937 | 2937 | |
| 2938 | 2938 | $tax_change_output = ''; |
| 2939 | - if ( count( $b_terms ) > 1 ) {
|
|
| 2940 | - $tax_change_output .= "<select data-limit='$category_limit' data-parent='" . (int)$parent_only . "' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; |
|
| 2941 | - foreach ( $b_terms as $key => $val ) {
|
|
| 2942 | - $ptype = get_post_type_object( str_replace( "category", "", $key ) ); |
|
| 2943 | - $cpt_name = __( $ptype->labels->singular_name, 'geodirectory' ); |
|
| 2944 | - $tax_change_output .= "<option value='$key' " . selected( $key, $default_taxonomy, false ) . ">" . sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name ) . "</option>"; |
|
| 2939 | + if (count($b_terms) > 1) {
|
|
| 2940 | + $tax_change_output .= "<select data-limit='$category_limit' data-parent='".(int) $parent_only."' class='geodir-cat-list-tax' onchange='geodir_get_post_term(this);'>"; |
|
| 2941 | + foreach ($b_terms as $key => $val) {
|
|
| 2942 | + $ptype = get_post_type_object(str_replace("category", "", $key));
|
|
| 2943 | + $cpt_name = __($ptype->labels->singular_name, 'geodirectory'); |
|
| 2944 | + $tax_change_output .= "<option value='$key' ".selected($key, $default_taxonomy, false).">".sprintf(__('%s Categories', 'geodirectory'), $cpt_name)."</option>";
|
|
| 2945 | 2945 | } |
| 2946 | 2946 | $tax_change_output .= "</select>"; |
| 2947 | 2947 | } |
| 2948 | 2948 | |
| 2949 | - if ( ! empty( $b_terms ) ) {
|
|
| 2950 | - $terms = $default_taxonomy != '' && isset( $b_terms[ $default_taxonomy ] ) ? $b_terms[ $default_taxonomy ] : reset( $b_terms );// get the first array |
|
| 2951 | - global $cat_count;//make global so we can change via function |
|
| 2949 | + if (!empty($b_terms)) {
|
|
| 2950 | + $terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms); // get the first array |
|
| 2951 | + global $cat_count; //make global so we can change via function |
|
| 2952 | 2952 | $cat_count = 0; |
| 2953 | 2953 | ?> |
| 2954 | 2954 | <div class="geodir-category-list-in clearfix"> |
| 2955 | 2955 | <div class="geodir-cat-list clearfix"> |
| 2956 | 2956 | <?php |
| 2957 | - echo $before_title . __( $title ) . $after_title; |
|
| 2957 | + echo $before_title.__($title).$after_title; |
|
| 2958 | 2958 | |
| 2959 | 2959 | echo $tax_change_output; |
| 2960 | 2960 | |
| 2961 | 2961 | echo '<ul class="geodir-popular-cat-list">'; |
| 2962 | 2962 | |
| 2963 | - geodir_helper_cat_list_output( $terms, $category_limit, $category_restrict); |
|
| 2963 | + geodir_helper_cat_list_output($terms, $category_limit, $category_restrict); |
|
| 2964 | 2964 | |
| 2965 | 2965 | echo '</ul>'; |
| 2966 | 2966 | ?> |
| 2967 | 2967 | </div> |
| 2968 | 2968 | <?php |
| 2969 | 2969 | $hide = ''; |
| 2970 | - if ( $cat_count < $category_limit ) {
|
|
| 2970 | + if ($cat_count < $category_limit) {
|
|
| 2971 | 2971 | $hide = 'style="display:none;"'; |
| 2972 | 2972 | } |
| 2973 | 2973 | echo "<div class='geodir-cat-list-more' $hide >"; |
| 2974 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">' . __( 'More Categories', 'geodirectory' ) . '</a>'; |
|
| 2975 | - echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">' . __( 'Less Categories', 'geodirectory' ) . '</a>'; |
|
| 2974 | + echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">'.__('More Categories', 'geodirectory').'</a>';
|
|
| 2975 | + echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">'.__('Less Categories', 'geodirectory').'</a>';
|
|
| 2976 | 2976 | echo "</div>"; |
| 2977 | 2977 | /* add scripts */ |
| 2978 | - add_action( 'wp_footer', 'geodir_popular_category_add_scripts', 100 ); |
|
| 2978 | + add_action('wp_footer', 'geodir_popular_category_add_scripts', 100);
|
|
| 2979 | 2979 | ?> |
| 2980 | 2980 | </div> |
| 2981 | 2981 | <?php |
@@ -2995,28 +2995,28 @@ discard block |
||
| 2995 | 2995 | * @param int $category_limit Number of categories to display by default. |
| 2996 | 2996 | * @param bool $category_restrict If the cat limit should be hidden or not shown. |
| 2997 | 2997 | */ |
| 2998 | -function geodir_helper_cat_list_output( $terms, $category_limit , $category_restrict=false) {
|
|
| 2998 | +function geodir_helper_cat_list_output($terms, $category_limit, $category_restrict = false) {
|
|
| 2999 | 2999 | global $geodir_post_category_str, $cat_count; |
| 3000 | 3000 | $term_icons = geodir_get_term_icon(); |
| 3001 | 3001 | |
| 3002 | 3002 | $geodir_post_category_str = array(); |
| 3003 | 3003 | |
| 3004 | 3004 | |
| 3005 | - foreach ( $terms as $cat ) {
|
|
| 3006 | - $post_type = str_replace( "category", "", $cat->taxonomy ); |
|
| 3007 | - $term_icon_url = ! empty( $term_icons ) && isset( $term_icons[ $cat->term_id ] ) ? $term_icons[ $cat->term_id ] : ''; |
|
| 3005 | + foreach ($terms as $cat) {
|
|
| 3006 | + $post_type = str_replace("category", "", $cat->taxonomy);
|
|
| 3007 | + $term_icon_url = !empty($term_icons) && isset($term_icons[$cat->term_id]) ? $term_icons[$cat->term_id] : ''; |
|
| 3008 | 3008 | |
| 3009 | - $cat_count ++; |
|
| 3009 | + $cat_count++; |
|
| 3010 | 3010 | |
| 3011 | - $geodir_post_category_str[] = array( 'posttype' => $post_type, 'termid' => $cat->term_id ); |
|
| 3011 | + $geodir_post_category_str[] = array('posttype' => $post_type, 'termid' => $cat->term_id);
|
|
| 3012 | 3012 | |
| 3013 | - $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; |
|
| 3014 | - if($category_restrict && $cat_count > $category_limit ){
|
|
| 3013 | + $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show'; |
|
| 3014 | + if ($category_restrict && $cat_count > $category_limit) {
|
|
| 3015 | 3015 | continue; |
| 3016 | 3016 | } |
| 3017 | 3017 | $total_post = $cat->count; |
| 3018 | 3018 | |
| 3019 | - $term_link = get_term_link( $cat, $cat->taxonomy ); |
|
| 3019 | + $term_link = get_term_link($cat, $cat->taxonomy); |
|
| 3020 | 3020 | /** |
| 3021 | 3021 | * Filer the category term link. |
| 3022 | 3022 | * |
@@ -3026,11 +3026,11 @@ discard block |
||
| 3026 | 3026 | * @param int $cat ->term_id The term id. |
| 3027 | 3027 | * @param string $post_type Wordpress post type. |
| 3028 | 3028 | */ |
| 3029 | - $term_link = apply_filters( 'geodir_category_term_link', $term_link, $cat->term_id, $post_type ); |
|
| 3029 | + $term_link = apply_filters('geodir_category_term_link', $term_link, $cat->term_id, $post_type);
|
|
| 3030 | 3030 | |
| 3031 | - echo '<li class="' . $class_row . '"><a href="' . $term_link . '">'; |
|
| 3032 | - echo '<img alt="' . esc_attr( $cat->name ) . ' icon" style="height:20px;vertical-align:middle;" src="' . $term_icon_url . '"/> <span class="cat-link">'; |
|
| 3033 | - echo $cat->name . '</span> <span class="geodir_term_class geodir_link_span geodir_category_class_' . $post_type . '_' . $cat->term_id . '">(' . $total_post . ')</span> ';
|
|
| 3031 | + echo '<li class="'.$class_row.'"><a href="'.$term_link.'">'; |
|
| 3032 | + echo '<img alt="'.esc_attr($cat->name).' icon" style="height:20px;vertical-align:middle;" src="'.$term_icon_url.'"/> <span class="cat-link">'; |
|
| 3033 | + echo $cat->name.'</span> <span class="geodir_term_class geodir_link_span geodir_category_class_'.$post_type.'_'.$cat->term_id.'">('.$total_post.')</span> ';
|
|
| 3034 | 3034 | echo '</a></li>'; |
| 3035 | 3035 | } |
| 3036 | 3036 | } |
@@ -3045,14 +3045,14 @@ discard block |
||
| 3045 | 3045 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. |
| 3046 | 3046 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3047 | 3047 | */ |
| 3048 | -function geodir_listing_slider_widget_output( $args = '', $instance = '' ) {
|
|
| 3048 | +function geodir_listing_slider_widget_output($args = '', $instance = '') {
|
|
| 3049 | 3049 | // prints the widget |
| 3050 | - extract( $args, EXTR_SKIP ); |
|
| 3050 | + extract($args, EXTR_SKIP); |
|
| 3051 | 3051 | |
| 3052 | 3052 | echo $before_widget; |
| 3053 | 3053 | |
| 3054 | 3054 | /** This filter is documented in geodirectory_widgets.php */ |
| 3055 | - $title = empty( $instance['title'] ) ? '' : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3055 | + $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3056 | 3056 | /** |
| 3057 | 3057 | * Filter the widget post type. |
| 3058 | 3058 | * |
@@ -3060,7 +3060,7 @@ discard block |
||
| 3060 | 3060 | * |
| 3061 | 3061 | * @param string $instance ['post_type'] Post type of listing. |
| 3062 | 3062 | */ |
| 3063 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); |
|
| 3063 | + $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
|
|
| 3064 | 3064 | /** |
| 3065 | 3065 | * Filter the widget's term. |
| 3066 | 3066 | * |
@@ -3068,7 +3068,7 @@ discard block |
||
| 3068 | 3068 | * |
| 3069 | 3069 | * @param string $instance ['category'] Filter by term. Can be any valid term. |
| 3070 | 3070 | */ |
| 3071 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); |
|
| 3071 | + $category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
|
|
| 3072 | 3072 | /** |
| 3073 | 3073 | * Filter widget's "add_location_filter" value. |
| 3074 | 3074 | * |
@@ -3076,7 +3076,7 @@ discard block |
||
| 3076 | 3076 | * |
| 3077 | 3077 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. |
| 3078 | 3078 | */ |
| 3079 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); |
|
| 3079 | + $add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
|
|
| 3080 | 3080 | /** |
| 3081 | 3081 | * Filter the widget listings limit. |
| 3082 | 3082 | * |
@@ -3084,7 +3084,7 @@ discard block |
||
| 3084 | 3084 | * |
| 3085 | 3085 | * @param string $instance ['post_number'] Number of listings to display. |
| 3086 | 3086 | */ |
| 3087 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); |
|
| 3087 | + $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
|
|
| 3088 | 3088 | /** |
| 3089 | 3089 | * Filter the widget listings limit shown at one time. |
| 3090 | 3090 | * |
@@ -3092,7 +3092,7 @@ discard block |
||
| 3092 | 3092 | * |
| 3093 | 3093 | * @param string $instance ['max_show'] Number of listings to display on screen. |
| 3094 | 3094 | */ |
| 3095 | - $max_show = empty( $instance['max_show'] ) ? '1' : apply_filters( 'widget_max_show', $instance['max_show'] ); |
|
| 3095 | + $max_show = empty($instance['max_show']) ? '1' : apply_filters('widget_max_show', $instance['max_show']);
|
|
| 3096 | 3096 | /** |
| 3097 | 3097 | * Filter the widget slide width. |
| 3098 | 3098 | * |
@@ -3100,7 +3100,7 @@ discard block |
||
| 3100 | 3100 | * |
| 3101 | 3101 | * @param string $instance ['slide_width'] Width of the slides shown. |
| 3102 | 3102 | */ |
| 3103 | - $slide_width = empty( $instance['slide_width'] ) ? '' : apply_filters( 'widget_slide_width', $instance['slide_width'] ); |
|
| 3103 | + $slide_width = empty($instance['slide_width']) ? '' : apply_filters('widget_slide_width', $instance['slide_width']);
|
|
| 3104 | 3104 | /** |
| 3105 | 3105 | * Filter widget's "show title" value. |
| 3106 | 3106 | * |
@@ -3108,7 +3108,7 @@ discard block |
||
| 3108 | 3108 | * |
| 3109 | 3109 | * @param string|bool $instance ['show_title'] Do you want to display title? Can be 1 or 0. |
| 3110 | 3110 | */ |
| 3111 | - $show_title = empty( $instance['show_title'] ) ? '' : apply_filters( 'widget_show_title', $instance['show_title'] ); |
|
| 3111 | + $show_title = empty($instance['show_title']) ? '' : apply_filters('widget_show_title', $instance['show_title']);
|
|
| 3112 | 3112 | /** |
| 3113 | 3113 | * Filter widget's "slideshow" value. |
| 3114 | 3114 | * |
@@ -3116,7 +3116,7 @@ discard block |
||
| 3116 | 3116 | * |
| 3117 | 3117 | * @param int $instance ['slideshow'] Setup a slideshow for the slider to animate automatically. |
| 3118 | 3118 | */ |
| 3119 | - $slideshow = empty( $instance['slideshow'] ) ? 0 : apply_filters( 'widget_slideshow', $instance['slideshow'] ); |
|
| 3119 | + $slideshow = empty($instance['slideshow']) ? 0 : apply_filters('widget_slideshow', $instance['slideshow']);
|
|
| 3120 | 3120 | /** |
| 3121 | 3121 | * Filter widget's "animationLoop" value. |
| 3122 | 3122 | * |
@@ -3124,7 +3124,7 @@ discard block |
||
| 3124 | 3124 | * |
| 3125 | 3125 | * @param int $instance ['animationLoop'] Gives the slider a seamless infinite loop. |
| 3126 | 3126 | */ |
| 3127 | - $animationLoop = empty( $instance['animationLoop'] ) ? 0 : apply_filters( 'widget_animationLoop', $instance['animationLoop'] ); |
|
| 3127 | + $animationLoop = empty($instance['animationLoop']) ? 0 : apply_filters('widget_animationLoop', $instance['animationLoop']);
|
|
| 3128 | 3128 | /** |
| 3129 | 3129 | * Filter widget's "directionNav" value. |
| 3130 | 3130 | * |
@@ -3132,7 +3132,7 @@ discard block |
||
| 3132 | 3132 | * |
| 3133 | 3133 | * @param int $instance ['directionNav'] Enable previous/next arrow navigation?. Can be 1 or 0. |
| 3134 | 3134 | */ |
| 3135 | - $directionNav = empty( $instance['directionNav'] ) ? 0 : apply_filters( 'widget_directionNav', $instance['directionNav'] ); |
|
| 3135 | + $directionNav = empty($instance['directionNav']) ? 0 : apply_filters('widget_directionNav', $instance['directionNav']);
|
|
| 3136 | 3136 | /** |
| 3137 | 3137 | * Filter widget's "slideshowSpeed" value. |
| 3138 | 3138 | * |
@@ -3140,7 +3140,7 @@ discard block |
||
| 3140 | 3140 | * |
| 3141 | 3141 | * @param int $instance ['slideshowSpeed'] Set the speed of the slideshow cycling, in milliseconds. |
| 3142 | 3142 | */ |
| 3143 | - $slideshowSpeed = empty( $instance['slideshowSpeed'] ) ? 5000 : apply_filters( 'widget_slideshowSpeed', $instance['slideshowSpeed'] ); |
|
| 3143 | + $slideshowSpeed = empty($instance['slideshowSpeed']) ? 5000 : apply_filters('widget_slideshowSpeed', $instance['slideshowSpeed']);
|
|
| 3144 | 3144 | /** |
| 3145 | 3145 | * Filter widget's "animationSpeed" value. |
| 3146 | 3146 | * |
@@ -3148,7 +3148,7 @@ discard block |
||
| 3148 | 3148 | * |
| 3149 | 3149 | * @param int $instance ['animationSpeed'] Set the speed of animations, in milliseconds. |
| 3150 | 3150 | */ |
| 3151 | - $animationSpeed = empty( $instance['animationSpeed'] ) ? 600 : apply_filters( 'widget_animationSpeed', $instance['animationSpeed'] ); |
|
| 3151 | + $animationSpeed = empty($instance['animationSpeed']) ? 600 : apply_filters('widget_animationSpeed', $instance['animationSpeed']);
|
|
| 3152 | 3152 | /** |
| 3153 | 3153 | * Filter widget's "animation" value. |
| 3154 | 3154 | * |
@@ -3156,7 +3156,7 @@ discard block |
||
| 3156 | 3156 | * |
| 3157 | 3157 | * @param string $instance ['animation'] Controls the animation type, "fade" or "slide". |
| 3158 | 3158 | */ |
| 3159 | - $animation = empty( $instance['animation'] ) ? 'slide' : apply_filters( 'widget_animation', $instance['animation'] ); |
|
| 3159 | + $animation = empty($instance['animation']) ? 'slide' : apply_filters('widget_animation', $instance['animation']);
|
|
| 3160 | 3160 | /** |
| 3161 | 3161 | * Filter widget's "list_sort" type. |
| 3162 | 3162 | * |
@@ -3164,10 +3164,10 @@ discard block |
||
| 3164 | 3164 | * |
| 3165 | 3165 | * @param string $instance ['list_sort'] Listing sort by type. |
| 3166 | 3166 | */ |
| 3167 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); |
|
| 3168 | - $show_featured_only = ! empty( $instance['show_featured_only'] ) ? 1 : null; |
|
| 3167 | + $list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
|
|
| 3168 | + $show_featured_only = !empty($instance['show_featured_only']) ? 1 : null; |
|
| 3169 | 3169 | |
| 3170 | - wp_enqueue_script( 'geodirectory-jquery-flexslider-js' ); |
|
| 3170 | + wp_enqueue_script('geodirectory-jquery-flexslider-js');
|
|
| 3171 | 3171 | ?> |
| 3172 | 3172 | <script type="text/javascript"> |
| 3173 | 3173 | jQuery(window).load(function () {
|
@@ -3186,7 +3186,7 @@ discard block |
||
| 3186 | 3186 | itemWidth: 75, |
| 3187 | 3187 | itemMargin: 5, |
| 3188 | 3188 | asNavFor: '#geodir_widget_slider', |
| 3189 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?>, |
|
| 3189 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?>, |
|
| 3190 | 3190 | start: function (slider) {
|
| 3191 | 3191 | // chrome 53 introduced a bug, so we need to repaint the slider when shown. |
| 3192 | 3192 | jQuery('.geodir-slides', jQuery(slider)).removeClass('flexslider-fix-rtl');
|
@@ -3194,19 +3194,19 @@ discard block |
||
| 3194 | 3194 | }); |
| 3195 | 3195 | |
| 3196 | 3196 | jQuery('#geodir_widget_slider').flexslider({
|
| 3197 | - animation: "<?php echo $animation;?>", |
|
| 3197 | + animation: "<?php echo $animation; ?>", |
|
| 3198 | 3198 | selector: ".geodir-slides > li", |
| 3199 | 3199 | namespace: "geodir-", |
| 3200 | 3200 | controlNav: true, |
| 3201 | - animationLoop: <?php echo $animationLoop;?>, |
|
| 3202 | - slideshow: <?php echo $slideshow;?>, |
|
| 3203 | - slideshowSpeed: <?php echo $slideshowSpeed;?>, |
|
| 3204 | - animationSpeed: <?php echo $animationSpeed;?>, |
|
| 3205 | - directionNav: <?php echo $directionNav;?>, |
|
| 3206 | - maxItems: <?php echo $max_show;?>, |
|
| 3201 | + animationLoop: <?php echo $animationLoop; ?>, |
|
| 3202 | + slideshow: <?php echo $slideshow; ?>, |
|
| 3203 | + slideshowSpeed: <?php echo $slideshowSpeed; ?>, |
|
| 3204 | + animationSpeed: <?php echo $animationSpeed; ?>, |
|
| 3205 | + directionNav: <?php echo $directionNav; ?>, |
|
| 3206 | + maxItems: <?php echo $max_show; ?>, |
|
| 3207 | 3207 | move: 1, |
| 3208 | - <?php if ( $slide_width ) {
|
|
| 3209 | - echo "itemWidth: " . $slide_width . ","; |
|
| 3208 | + <?php if ($slide_width) {
|
|
| 3209 | + echo "itemWidth: ".$slide_width.","; |
|
| 3210 | 3210 | }?> |
| 3211 | 3211 | sync: "#geodir_widget_carousel", |
| 3212 | 3212 | start: function (slider) {
|
@@ -3217,7 +3217,7 @@ discard block |
||
| 3217 | 3217 | jQuery('#geodir_widget_slider').css({'visibility': 'visible'});
|
| 3218 | 3218 | jQuery('#geodir_widget_carousel').css({'visibility': 'visible'});
|
| 3219 | 3219 | }, |
| 3220 | - rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?> |
|
| 3220 | + rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?> |
|
| 3221 | 3221 | }); |
| 3222 | 3222 | }); |
| 3223 | 3223 | </script> |
@@ -3230,62 +3230,62 @@ discard block |
||
| 3230 | 3230 | 'order_by' => $list_sort |
| 3231 | 3231 | ); |
| 3232 | 3232 | |
| 3233 | - if ( $show_featured_only ) {
|
|
| 3233 | + if ($show_featured_only) {
|
|
| 3234 | 3234 | $query_args['show_featured_only'] = 1; |
| 3235 | 3235 | } |
| 3236 | 3236 | |
| 3237 | - if ( $category != 0 || $category != '' ) {
|
|
| 3238 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 3237 | + if ($category != 0 || $category != '') {
|
|
| 3238 | + $category_taxonomy = geodir_get_taxonomies($post_type); |
|
| 3239 | 3239 | $tax_query = array( |
| 3240 | 3240 | 'taxonomy' => $category_taxonomy[0], |
| 3241 | 3241 | 'field' => 'id', |
| 3242 | 3242 | 'terms' => $category |
| 3243 | 3243 | ); |
| 3244 | 3244 | |
| 3245 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 3245 | + $query_args['tax_query'] = array($tax_query); |
|
| 3246 | 3246 | } |
| 3247 | 3247 | |
| 3248 | 3248 | // we want listings with featured image only |
| 3249 | 3249 | $query_args['featured_image_only'] = 1; |
| 3250 | 3250 | |
| 3251 | - if ( $post_type == 'gd_event' ) {
|
|
| 3251 | + if ($post_type == 'gd_event') {
|
|
| 3252 | 3252 | $query_args['gedir_event_listing_filter'] = 'upcoming'; |
| 3253 | 3253 | }// show only upcoming events |
| 3254 | 3254 | |
| 3255 | - $widget_listings = geodir_get_widget_listings( $query_args ); |
|
| 3256 | - if ( ! empty( $widget_listings ) || ( isset( $with_no_results ) && $with_no_results ) ) {
|
|
| 3257 | - if ( $title ) {
|
|
| 3258 | - echo $before_title . $title . $after_title; |
|
| 3255 | + $widget_listings = geodir_get_widget_listings($query_args); |
|
| 3256 | + if (!empty($widget_listings) || (isset($with_no_results) && $with_no_results)) {
|
|
| 3257 | + if ($title) {
|
|
| 3258 | + echo $before_title.$title.$after_title; |
|
| 3259 | 3259 | } |
| 3260 | 3260 | |
| 3261 | 3261 | global $post; |
| 3262 | 3262 | |
| 3263 | - $current_post = $post;// keep current post info |
|
| 3263 | + $current_post = $post; // keep current post info |
|
| 3264 | 3264 | |
| 3265 | 3265 | $widget_main_slides = ''; |
| 3266 | 3266 | $nav_slides = ''; |
| 3267 | 3267 | $widget_slides = 0; |
| 3268 | 3268 | |
| 3269 | - foreach ( $widget_listings as $widget_listing ) {
|
|
| 3269 | + foreach ($widget_listings as $widget_listing) {
|
|
| 3270 | 3270 | global $gd_widget_listing_type; |
| 3271 | 3271 | $post = $widget_listing; |
| 3272 | - $widget_image = geodir_get_featured_image( $post->ID, 'thumbnail', get_option( 'geodir_listing_no_img' ) ); |
|
| 3272 | + $widget_image = geodir_get_featured_image($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
|
|
| 3273 | 3273 | |
| 3274 | - if ( ! empty( $widget_image ) ) {
|
|
| 3275 | - if ( $widget_image->height >= 200 ) {
|
|
| 3274 | + if (!empty($widget_image)) {
|
|
| 3275 | + if ($widget_image->height >= 200) {
|
|
| 3276 | 3276 | $widget_spacer_height = 0; |
| 3277 | 3277 | } else {
|
| 3278 | - $widget_spacer_height = ( ( 200 - $widget_image->height ) / 2 ); |
|
| 3278 | + $widget_spacer_height = ((200 - $widget_image->height) / 2); |
|
| 3279 | 3279 | } |
| 3280 | 3280 | |
| 3281 | - $widget_main_slides .= '<li class="geodir-listing-slider-widget"><img class="geodir-listing-slider-spacer" src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:' . $widget_spacer_height . 'px !important;margin:0 auto;" width="100" />'; |
|
| 3281 | + $widget_main_slides .= '<li class="geodir-listing-slider-widget"><img class="geodir-listing-slider-spacer" src="'.geodir_plugin_url()."/geodirectory-assets/images/spacer.gif".'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:'.$widget_spacer_height.'px !important;margin:0 auto;" width="100" />'; |
|
| 3282 | 3282 | |
| 3283 | 3283 | $title = ''; |
| 3284 | - if ( $show_title ) {
|
|
| 3285 | - $title_html = '<div class="geodir-slider-title"><a href="' . get_permalink( $post->ID ) . '">' . get_the_title( $post->ID ) . '</a></div>'; |
|
| 3284 | + if ($show_title) {
|
|
| 3285 | + $title_html = '<div class="geodir-slider-title"><a href="'.get_permalink($post->ID).'">'.get_the_title($post->ID).'</a></div>'; |
|
| 3286 | 3286 | $post_id = $post->ID; |
| 3287 | - $post_permalink = get_permalink( $post->ID ); |
|
| 3288 | - $post_title = get_the_title( $post->ID ); |
|
| 3287 | + $post_permalink = get_permalink($post->ID); |
|
| 3288 | + $post_title = get_the_title($post->ID); |
|
| 3289 | 3289 | /** |
| 3290 | 3290 | * Filter the listing slider widget title. |
| 3291 | 3291 | * |
@@ -3296,12 +3296,12 @@ discard block |
||
| 3296 | 3296 | * @param string $post_permalink The post permalink url. |
| 3297 | 3297 | * @param string $post_title The post title text. |
| 3298 | 3298 | */ |
| 3299 | - $title = apply_filters( 'geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title ); |
|
| 3299 | + $title = apply_filters('geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title);
|
|
| 3300 | 3300 | } |
| 3301 | 3301 | |
| 3302 | - $widget_main_slides .= $title . '<a href="' . get_permalink( $post->ID ) . '"><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:200px;margin:0 auto;" /></a></li>'; |
|
| 3303 | - $nav_slides .= '<li><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 3304 | - $widget_slides ++; |
|
| 3302 | + $widget_main_slides .= $title.'<a href="'.get_permalink($post->ID).'"><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:200px;margin:0 auto;" /></a></li>'; |
|
| 3303 | + $nav_slides .= '<li><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 3304 | + $widget_slides++; |
|
| 3305 | 3305 | } |
| 3306 | 3306 | } |
| 3307 | 3307 | ?> |
@@ -3310,7 +3310,7 @@ discard block |
||
| 3310 | 3310 | <div id="geodir_widget_slider" class="geodir_flexslider"> |
| 3311 | 3311 | <ul class="geodir-slides clearfix"><?php echo $widget_main_slides; ?></ul> |
| 3312 | 3312 | </div> |
| 3313 | - <?php if ( $widget_slides > 1 ) { ?>
|
|
| 3313 | + <?php if ($widget_slides > 1) { ?>
|
|
| 3314 | 3314 | <div id="geodir_widget_carousel" class="geodir_flexslider"> |
| 3315 | 3315 | <ul class="geodir-slides clearfix"><?php echo $nav_slides; ?></ul> |
| 3316 | 3316 | </div> |
@@ -3318,7 +3318,7 @@ discard block |
||
| 3318 | 3318 | </div> |
| 3319 | 3319 | <?php |
| 3320 | 3320 | $GLOBALS['post'] = $current_post; |
| 3321 | - setup_postdata( $current_post ); |
|
| 3321 | + setup_postdata($current_post); |
|
| 3322 | 3322 | } |
| 3323 | 3323 | echo $after_widget; |
| 3324 | 3324 | } |
@@ -3334,50 +3334,50 @@ discard block |
||
| 3334 | 3334 | * @param array|string $args Display arguments including before_title, after_title, before_widget, and after_widget. |
| 3335 | 3335 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3336 | 3336 | */ |
| 3337 | -function geodir_loginwidget_output( $args = '', $instance = '' ) {
|
|
| 3337 | +function geodir_loginwidget_output($args = '', $instance = '') {
|
|
| 3338 | 3338 | //print_r($args); |
| 3339 | 3339 | //print_r($instance); |
| 3340 | 3340 | // prints the widget |
| 3341 | - extract( $args, EXTR_SKIP ); |
|
| 3341 | + extract($args, EXTR_SKIP); |
|
| 3342 | 3342 | |
| 3343 | 3343 | /** This filter is documented in geodirectory_widgets.php */ |
| 3344 | - $title = empty( $instance['title'] ) ? __( 'My Dashboard', 'geodirectory' ) : apply_filters( 'my_dashboard_widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3344 | + $title = empty($instance['title']) ? __('My Dashboard', 'geodirectory') : apply_filters('my_dashboard_widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3345 | 3345 | |
| 3346 | 3346 | echo $before_widget; |
| 3347 | - echo $before_title . $title . $after_title; |
|
| 3347 | + echo $before_title.$title.$after_title; |
|
| 3348 | 3348 | |
| 3349 | 3349 | // global $gd_session; |
| 3350 | 3350 | // print_r($gd_session); |
| 3351 | 3351 | // print_r($_SESSION); |
| 3352 | 3352 | |
| 3353 | - if ( is_user_logged_in() ) {
|
|
| 3353 | + if (is_user_logged_in()) {
|
|
| 3354 | 3354 | global $current_user; |
| 3355 | 3355 | |
| 3356 | - $author_link = get_author_posts_url( $current_user->data->ID ); |
|
| 3357 | - $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false ); |
|
| 3356 | + $author_link = get_author_posts_url($current_user->data->ID); |
|
| 3357 | + $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
|
|
| 3358 | 3358 | |
| 3359 | 3359 | echo '<ul class="geodir-loginbox-list">'; |
| 3360 | 3360 | ob_start(); |
| 3361 | 3361 | ?> |
| 3362 | 3362 | <li><a class="signin" |
| 3363 | - href="<?php echo wp_logout_url( home_url() ); ?>"><?php _e( 'Logout', 'geodirectory' ); ?></a></li> |
|
| 3363 | + href="<?php echo wp_logout_url(home_url()); ?>"><?php _e('Logout', 'geodirectory'); ?></a></li>
|
|
| 3364 | 3364 | <?php |
| 3365 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 3366 | - $show_add_listing_post_types_main_nav = get_option( 'geodir_add_listing_link_user_dashboard' ); |
|
| 3367 | - $geodir_allow_posttype_frontend = get_option( 'geodir_allow_posttype_frontend' ); |
|
| 3365 | + $post_types = geodir_get_posttypes('object');
|
|
| 3366 | + $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_user_dashboard');
|
|
| 3367 | + $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
|
|
| 3368 | 3368 | |
| 3369 | - if ( ! empty( $show_add_listing_post_types_main_nav ) ) {
|
|
| 3369 | + if (!empty($show_add_listing_post_types_main_nav)) {
|
|
| 3370 | 3370 | $addlisting_links = ''; |
| 3371 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3371 | + foreach ($post_types as $key => $postobj) {
|
|
| 3372 | 3372 | |
| 3373 | - if ( in_array( $key, $show_add_listing_post_types_main_nav ) ) {
|
|
| 3373 | + if (in_array($key, $show_add_listing_post_types_main_nav)) {
|
|
| 3374 | 3374 | |
| 3375 | - if ( $add_link = geodir_get_addlisting_link( $key ) ) {
|
|
| 3375 | + if ($add_link = geodir_get_addlisting_link($key)) {
|
|
| 3376 | 3376 | |
| 3377 | 3377 | $name = $postobj->labels->name; |
| 3378 | 3378 | |
| 3379 | 3379 | $selected = ''; |
| 3380 | - if ( geodir_get_current_posttype() == $key && geodir_is_page( 'add-listing' ) ) {
|
|
| 3380 | + if (geodir_get_current_posttype() == $key && geodir_is_page('add-listing')) {
|
|
| 3381 | 3381 | $selected = 'selected="selected"'; |
| 3382 | 3382 | } |
| 3383 | 3383 | |
@@ -3390,23 +3390,23 @@ discard block |
||
| 3390 | 3390 | * @param string $key Add listing array key. |
| 3391 | 3391 | * @param int $current_user ->ID Current user ID. |
| 3392 | 3392 | */ |
| 3393 | - $add_link = apply_filters( 'geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID ); |
|
| 3394 | - $name = apply_filters( 'geodir_dashboard_label_add_listing', $name, $key, $current_user->ID ); |
|
| 3393 | + $add_link = apply_filters('geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID);
|
|
| 3394 | + $name = apply_filters('geodir_dashboard_label_add_listing', $name, $key, $current_user->ID);
|
|
| 3395 | 3395 | |
| 3396 | - $addlisting_links .= '<option ' . $selected . ' value="' . $add_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3396 | + $addlisting_links .= '<option '.$selected.' value="'.$add_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>'; |
|
| 3397 | 3397 | |
| 3398 | 3398 | } |
| 3399 | 3399 | } |
| 3400 | 3400 | |
| 3401 | 3401 | } |
| 3402 | 3402 | |
| 3403 | - if ( $addlisting_links != '' ) { ?>
|
|
| 3403 | + if ($addlisting_links != '') { ?>
|
|
| 3404 | 3404 | |
| 3405 | 3405 | <li><select id="geodir_add_listing" class="chosen_select" onchange="window.location.href=this.value" |
| 3406 | 3406 | option-autoredirect="1" name="geodir_add_listing" option-ajaxchosen="false" |
| 3407 | - data-placeholder="<?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?>"> |
|
| 3407 | + data-placeholder="<?php echo esc_attr(__('Add Listing', 'geodirectory')); ?>">
|
|
| 3408 | 3408 | <option value="" disabled="disabled" selected="selected" |
| 3409 | - style='display:none;'><?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?></option> |
|
| 3409 | + style='display:none;'><?php echo esc_attr(__('Add Listing', 'geodirectory')); ?></option>
|
|
| 3410 | 3410 | <?php echo $addlisting_links; ?> |
| 3411 | 3411 | </select></li> <?php |
| 3412 | 3412 | |
@@ -3414,24 +3414,24 @@ discard block |
||
| 3414 | 3414 | |
| 3415 | 3415 | } |
| 3416 | 3416 | // My Favourites in Dashboard |
| 3417 | - $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' ); |
|
| 3417 | + $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
|
|
| 3418 | 3418 | $user_favourite = geodir_user_favourite_listing_count(); |
| 3419 | 3419 | |
| 3420 | - if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
|
|
| 3420 | + if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
|
|
| 3421 | 3421 | $favourite_links = ''; |
| 3422 | 3422 | |
| 3423 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3424 | - if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
|
|
| 3423 | + foreach ($post_types as $key => $postobj) {
|
|
| 3424 | + if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
|
|
| 3425 | 3425 | $name = $postobj->labels->name; |
| 3426 | 3426 | $fav_author_link = apply_filters('gd_dash_fav_author_link', $author_link, $current_user->data->ID);
|
| 3427 | - $post_type_link = geodir_getlink( $fav_author_link, array( |
|
| 3427 | + $post_type_link = geodir_getlink($fav_author_link, array( |
|
| 3428 | 3428 | 'stype' => $key, |
| 3429 | 3429 | 'list' => 'favourite' |
| 3430 | - ), false ); |
|
| 3430 | + ), false); |
|
| 3431 | 3431 | |
| 3432 | 3432 | $selected = ''; |
| 3433 | 3433 | |
| 3434 | - if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
|
|
| 3434 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
|
|
| 3435 | 3435 | $selected = 'selected="selected"'; |
| 3436 | 3436 | } |
| 3437 | 3437 | /** |
@@ -3443,20 +3443,20 @@ discard block |
||
| 3443 | 3443 | * @param string $key Favorite listing array key. |
| 3444 | 3444 | * @param int $current_user ->ID Current user ID. |
| 3445 | 3445 | */ |
| 3446 | - $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID ); |
|
| 3446 | + $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID);
|
|
| 3447 | 3447 | |
| 3448 | - $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3448 | + $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>'; |
|
| 3449 | 3449 | } |
| 3450 | 3450 | } |
| 3451 | 3451 | |
| 3452 | - if ( $favourite_links != '' ) {
|
|
| 3452 | + if ($favourite_links != '') {
|
|
| 3453 | 3453 | ?> |
| 3454 | 3454 | <li> |
| 3455 | 3455 | <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" |
| 3456 | 3456 | option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" |
| 3457 | - data-placeholder="<?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?>"> |
|
| 3457 | + data-placeholder="<?php echo esc_attr(__('My Favorites', 'geodirectory')); ?>">
|
|
| 3458 | 3458 | <option value="" disabled="disabled" selected="selected" |
| 3459 | - style='display:none;'><?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?></option> |
|
| 3459 | + style='display:none;'><?php echo esc_attr(__('My Favorites', 'geodirectory')); ?></option>
|
|
| 3460 | 3460 | <?php echo $favourite_links; ?> |
| 3461 | 3461 | </select> |
| 3462 | 3462 | </li> |
@@ -3465,20 +3465,20 @@ discard block |
||
| 3465 | 3465 | } |
| 3466 | 3466 | |
| 3467 | 3467 | |
| 3468 | - $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' ); |
|
| 3468 | + $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
|
|
| 3469 | 3469 | $user_listing = geodir_user_post_listing_count(); |
| 3470 | 3470 | |
| 3471 | - if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
|
|
| 3471 | + if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
|
|
| 3472 | 3472 | $listing_links = ''; |
| 3473 | 3473 | |
| 3474 | - foreach ( $post_types as $key => $postobj ) {
|
|
| 3475 | - if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
|
|
| 3474 | + foreach ($post_types as $key => $postobj) {
|
|
| 3475 | + if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
|
|
| 3476 | 3476 | $name = $postobj->labels->name; |
| 3477 | 3477 | $listing_author_link = apply_filters('gd_dash_listing_author_link', $author_link, $current_user->data->ID);
|
| 3478 | - $listing_link = geodir_getlink( $listing_author_link, array( 'stype' => $key ), false ); |
|
| 3478 | + $listing_link = geodir_getlink($listing_author_link, array('stype' => $key), false);
|
|
| 3479 | 3479 | |
| 3480 | 3480 | $selected = ''; |
| 3481 | - if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
|
|
| 3481 | + if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
|
|
| 3482 | 3482 | $selected = 'selected="selected"'; |
| 3483 | 3483 | } |
| 3484 | 3484 | |
@@ -3491,20 +3491,20 @@ discard block |
||
| 3491 | 3491 | * @param string $key My listing array key. |
| 3492 | 3492 | * @param int $current_user ->ID Current user ID. |
| 3493 | 3493 | */ |
| 3494 | - $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID ); |
|
| 3494 | + $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID);
|
|
| 3495 | 3495 | |
| 3496 | - $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>'; |
|
| 3496 | + $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>'; |
|
| 3497 | 3497 | } |
| 3498 | 3498 | } |
| 3499 | 3499 | |
| 3500 | - if ( $listing_links != '' ) {
|
|
| 3500 | + if ($listing_links != '') {
|
|
| 3501 | 3501 | ?> |
| 3502 | 3502 | <li> |
| 3503 | 3503 | <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" |
| 3504 | 3504 | option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" |
| 3505 | - data-placeholder="<?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?>"> |
|
| 3505 | + data-placeholder="<?php echo esc_attr(__('My Listings', 'geodirectory')); ?>">
|
|
| 3506 | 3506 | <option value="" disabled="disabled" selected="selected" |
| 3507 | - style='display:none;'><?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?></option> |
|
| 3507 | + style='display:none;'><?php echo esc_attr(__('My Listings', 'geodirectory')); ?></option>
|
|
| 3508 | 3508 | <?php echo $listing_links; ?> |
| 3509 | 3509 | </select> |
| 3510 | 3510 | </li> |
@@ -3520,7 +3520,7 @@ discard block |
||
| 3520 | 3520 | * |
| 3521 | 3521 | * @param string $dashboard_link Dashboard links HTML. |
| 3522 | 3522 | */ |
| 3523 | - echo apply_filters( 'geodir_dashboard_links', $dashboard_link ); |
|
| 3523 | + echo apply_filters('geodir_dashboard_links', $dashboard_link);
|
|
| 3524 | 3524 | echo '</ul>'; |
| 3525 | 3525 | |
| 3526 | 3526 | /** |
@@ -3528,7 +3528,7 @@ discard block |
||
| 3528 | 3528 | * |
| 3529 | 3529 | * @since 1.6.6 |
| 3530 | 3530 | */ |
| 3531 | - do_action( 'geodir_after_loginwidget_form_logged_in' ); |
|
| 3531 | + do_action('geodir_after_loginwidget_form_logged_in');
|
|
| 3532 | 3532 | |
| 3533 | 3533 | |
| 3534 | 3534 | } else {
|
@@ -3543,18 +3543,18 @@ discard block |
||
| 3543 | 3543 | <form name="loginform" class="loginform1" |
| 3544 | 3544 | action="<?php echo geodir_login_url(); ?>" |
| 3545 | 3545 | method="post"> |
| 3546 | - <div class="geodir_form_row"><input placeholder="<?php echo apply_filters('gd_login_wid_login_placeholder', __( 'Email', 'geodirectory' )); ?>" name="<?php echo apply_filters('gd_login_wid_login_name', 'log'); ?>"
|
|
| 3546 | + <div class="geodir_form_row"><input placeholder="<?php echo apply_filters('gd_login_wid_login_placeholder', __('Email', 'geodirectory')); ?>" name="<?php echo apply_filters('gd_login_wid_login_name', 'log'); ?>"
|
|
| 3547 | 3547 | type="text" class="textfield user_login1"/> <span |
| 3548 | 3548 | class="user_loginInfo"></span></div> |
| 3549 | - <div class="geodir_form_row"><input placeholder="<?php _e( 'Password', 'geodirectory' ); ?>" |
|
| 3549 | + <div class="geodir_form_row"><input placeholder="<?php _e('Password', 'geodirectory'); ?>"
|
|
| 3550 | 3550 | name="<?php echo apply_filters('gd_login_wid_login_pwd', 'pwd'); ?>" type="password"
|
| 3551 | 3551 | class="textfield user_pass1 input-text"/><span |
| 3552 | 3552 | class="user_passInfo"></span></div> |
| 3553 | 3553 | |
| 3554 | - <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars( geodir_curPageURL() ); ?>"/> |
|
| 3554 | + <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars(geodir_curPageURL()); ?>"/> |
|
| 3555 | 3555 | <input type="hidden" name="testcookie" value="1"/> |
| 3556 | 3556 | |
| 3557 | - <?php do_action( 'login_form' ); ?> |
|
| 3557 | + <?php do_action('login_form'); ?>
|
|
| 3558 | 3558 | |
| 3559 | 3559 | <div class="geodir_form_row clearfix"><input type="submit" name="submit" |
| 3560 | 3560 | value="<?php echo SIGN_IN_BUTTON; ?>" class="b_signin"/> |
@@ -3566,11 +3566,11 @@ discard block |
||
| 3566 | 3566 | * |
| 3567 | 3567 | * @since 1.0.0 |
| 3568 | 3568 | */ |
| 3569 | - $is_enable_signup = get_option( 'users_can_register' ); |
|
| 3569 | + $is_enable_signup = get_option('users_can_register');
|
|
| 3570 | 3570 | |
| 3571 | - if ( $is_enable_signup ) {
|
|
| 3571 | + if ($is_enable_signup) {
|
|
| 3572 | 3572 | ?> |
| 3573 | - <a href="<?php echo geodir_login_url( array( 'signup' => true ) ); ?>" |
|
| 3573 | + <a href="<?php echo geodir_login_url(array('signup' => true)); ?>"
|
|
| 3574 | 3574 | class="goedir-newuser-link"><?php echo NEW_USER_TEXT; ?></a> |
| 3575 | 3575 | |
| 3576 | 3576 | <?php |
@@ -3581,7 +3581,7 @@ discard block |
||
| 3581 | 3581 | * @since 1.0.0 |
| 3582 | 3582 | */ |
| 3583 | 3583 | ?> |
| 3584 | - <a href="<?php echo geodir_login_url( array( 'forgot' => true ) ); ?>" |
|
| 3584 | + <a href="<?php echo geodir_login_url(array('forgot' => true)); ?>"
|
|
| 3585 | 3585 | class="goedir-forgot-link"><?php echo FORGOT_PW_TEXT; ?></a></p></div> |
| 3586 | 3586 | </form> |
| 3587 | 3587 | <?php |
@@ -3590,7 +3590,7 @@ discard block |
||
| 3590 | 3590 | * |
| 3591 | 3591 | * @since 1.6.6 |
| 3592 | 3592 | */ |
| 3593 | - do_action( 'geodir_after_loginwidget_form_logged_out' ); |
|
| 3593 | + do_action('geodir_after_loginwidget_form_logged_out');
|
|
| 3594 | 3594 | } |
| 3595 | 3595 | |
| 3596 | 3596 | echo $after_widget; |
@@ -3612,14 +3612,14 @@ discard block |
||
| 3612 | 3612 | * after_widget. |
| 3613 | 3613 | * @param array|string $instance The settings for the particular instance of the widget. |
| 3614 | 3614 | */ |
| 3615 | -function geodir_popular_postview_output( $args = '', $instance = '' ) {
|
|
| 3615 | +function geodir_popular_postview_output($args = '', $instance = '') {
|
|
| 3616 | 3616 | global $gd_session; |
| 3617 | 3617 | |
| 3618 | 3618 | // prints the widget |
| 3619 | - extract( $args, EXTR_SKIP ); |
|
| 3619 | + extract($args, EXTR_SKIP); |
|
| 3620 | 3620 | |
| 3621 | 3621 | /** This filter is documented in geodirectory_widgets.php */ |
| 3622 | - $title = empty( $instance['title'] ) ? geodir_ucwords( $instance['category_title'] ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) ); |
|
| 3622 | + $title = empty($instance['title']) ? geodir_ucwords($instance['category_title']) : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 3623 | 3623 | /** |
| 3624 | 3624 | * Filter the widget post type. |
| 3625 | 3625 | * |
@@ -3627,7 +3627,7 @@ discard block |
||
| 3627 | 3627 | * |
| 3628 | 3628 | * @param string $instance ['post_type'] Post type of listing. |
| 3629 | 3629 | */ |
| 3630 | - $post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] ); |
|
| 3630 | + $post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);
|
|
| 3631 | 3631 | /** |
| 3632 | 3632 | * Filter the widget's term. |
| 3633 | 3633 | * |
@@ -3635,7 +3635,7 @@ discard block |
||
| 3635 | 3635 | * |
| 3636 | 3636 | * @param string $instance ['category'] Filter by term. Can be any valid term. |
| 3637 | 3637 | */ |
| 3638 | - $category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] ); |
|
| 3638 | + $category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);
|
|
| 3639 | 3639 | /** |
| 3640 | 3640 | * Filter the widget listings limit. |
| 3641 | 3641 | * |
@@ -3643,7 +3643,7 @@ discard block |
||
| 3643 | 3643 | * |
| 3644 | 3644 | * @param string $instance ['post_number'] Number of listings to display. |
| 3645 | 3645 | */ |
| 3646 | - $post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] ); |
|
| 3646 | + $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
|
|
| 3647 | 3647 | /** |
| 3648 | 3648 | * Filter widget's "layout" type. |
| 3649 | 3649 | * |
@@ -3651,7 +3651,7 @@ discard block |
||
| 3651 | 3651 | * |
| 3652 | 3652 | * @param string $instance ['layout'] Widget layout type. |
| 3653 | 3653 | */ |
| 3654 | - $layout = empty( $instance['layout'] ) ? 'gridview_onehalf' : apply_filters( 'widget_layout', $instance['layout'] ); |
|
| 3654 | + $layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);
|
|
| 3655 | 3655 | /** |
| 3656 | 3656 | * Filter widget's "add_location_filter" value. |
| 3657 | 3657 | * |
@@ -3659,7 +3659,7 @@ discard block |
||
| 3659 | 3659 | * |
| 3660 | 3660 | * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0. |
| 3661 | 3661 | */ |
| 3662 | - $add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] ); |
|
| 3662 | + $add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
|
|
| 3663 | 3663 | /** |
| 3664 | 3664 | * Filter widget's listing width. |
| 3665 | 3665 | * |
@@ -3667,7 +3667,7 @@ discard block |
||
| 3667 | 3667 | * |
| 3668 | 3668 | * @param string $instance ['listing_width'] Listing width. |
| 3669 | 3669 | */ |
| 3670 | - $listing_width = empty( $instance['listing_width'] ) ? '' : apply_filters( 'widget_listing_width', $instance['listing_width'] ); |
|
| 3670 | + $listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);
|
|
| 3671 | 3671 | /** |
| 3672 | 3672 | * Filter widget's "list_sort" type. |
| 3673 | 3673 | * |
@@ -3675,36 +3675,36 @@ discard block |
||
| 3675 | 3675 | * |
| 3676 | 3676 | * @param string $instance ['list_sort'] Listing sort by type. |
| 3677 | 3677 | */ |
| 3678 | - $list_sort = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] ); |
|
| 3679 | - $use_viewing_post_type = ! empty( $instance['use_viewing_post_type'] ) ? true : false; |
|
| 3678 | + $list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
|
|
| 3679 | + $use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false; |
|
| 3680 | 3680 | |
| 3681 | 3681 | // set post type to current viewing post type |
| 3682 | - if ( $use_viewing_post_type ) {
|
|
| 3682 | + if ($use_viewing_post_type) {
|
|
| 3683 | 3683 | $current_post_type = geodir_get_current_posttype(); |
| 3684 | - if ( $current_post_type != '' && $current_post_type != $post_type ) {
|
|
| 3684 | + if ($current_post_type != '' && $current_post_type != $post_type) {
|
|
| 3685 | 3685 | $post_type = $current_post_type; |
| 3686 | 3686 | $category = array(); // old post type category will not work for current changed post type |
| 3687 | 3687 | } |
| 3688 | 3688 | } |
| 3689 | 3689 | // replace widget title dynamically |
| 3690 | - $posttype_plural_label = __( get_post_type_plural_label( $post_type ), 'geodirectory' ); |
|
| 3691 | - $posttype_singular_label = __( get_post_type_singular_label( $post_type ), 'geodirectory' ); |
|
| 3690 | + $posttype_plural_label = __(get_post_type_plural_label($post_type), 'geodirectory'); |
|
| 3691 | + $posttype_singular_label = __(get_post_type_singular_label($post_type), 'geodirectory'); |
|
| 3692 | 3692 | |
| 3693 | - $title = str_replace( "%posttype_plural_label%", $posttype_plural_label, $title ); |
|
| 3694 | - $title = str_replace( "%posttype_singular_label%", $posttype_singular_label, $title ); |
|
| 3693 | + $title = str_replace("%posttype_plural_label%", $posttype_plural_label, $title);
|
|
| 3694 | + $title = str_replace("%posttype_singular_label%", $posttype_singular_label, $title);
|
|
| 3695 | 3695 | |
| 3696 | 3696 | $categories = $category; |
| 3697 | - if ( ! empty( $category ) && $category[0] != '0' ) {
|
|
| 3698 | - $category_taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 3697 | + if (!empty($category) && $category[0] != '0') {
|
|
| 3698 | + $category_taxonomy = geodir_get_taxonomies($post_type); |
|
| 3699 | 3699 | |
| 3700 | 3700 | ######### WPML ######### |
| 3701 | - if ( geodir_wpml_is_taxonomy_translated( $category_taxonomy[0] ) ) {
|
|
| 3702 | - $category = gd_lang_object_ids( $category, $category_taxonomy[0] ); |
|
| 3701 | + if (geodir_wpml_is_taxonomy_translated($category_taxonomy[0])) {
|
|
| 3702 | + $category = gd_lang_object_ids($category, $category_taxonomy[0]); |
|
| 3703 | 3703 | } |
| 3704 | 3704 | ######### WPML ######### |
| 3705 | 3705 | } |
| 3706 | 3706 | |
| 3707 | - if ( isset( $instance['character_count'] ) ) {
|
|
| 3707 | + if (isset($instance['character_count'])) {
|
|
| 3708 | 3708 | /** |
| 3709 | 3709 | * Filter the widget's excerpt character count. |
| 3710 | 3710 | * |
@@ -3712,37 +3712,37 @@ discard block |
||
| 3712 | 3712 | * |
| 3713 | 3713 | * @param int $instance ['character_count'] Excerpt character count. |
| 3714 | 3714 | */ |
| 3715 | - $character_count = apply_filters( 'widget_list_character_count', $instance['character_count'] ); |
|
| 3715 | + $character_count = apply_filters('widget_list_character_count', $instance['character_count']);
|
|
| 3716 | 3716 | } else {
|
| 3717 | 3717 | $character_count = ''; |
| 3718 | 3718 | } |
| 3719 | 3719 | |
| 3720 | - if ( empty( $title ) || $title == 'All' ) {
|
|
| 3721 | - $title .= ' ' . __( get_post_type_plural_label( $post_type ), 'geodirectory' ); |
|
| 3720 | + if (empty($title) || $title == 'All') {
|
|
| 3721 | + $title .= ' '.__(get_post_type_plural_label($post_type), 'geodirectory'); |
|
| 3722 | 3722 | } |
| 3723 | 3723 | |
| 3724 | 3724 | $location_url = array(); |
| 3725 | - $city = get_query_var( 'gd_city' ); |
|
| 3726 | - if ( ! empty( $city ) ) {
|
|
| 3727 | - $country = get_query_var( 'gd_country' ); |
|
| 3728 | - $region = get_query_var( 'gd_region' ); |
|
| 3725 | + $city = get_query_var('gd_city');
|
|
| 3726 | + if (!empty($city)) {
|
|
| 3727 | + $country = get_query_var('gd_country');
|
|
| 3728 | + $region = get_query_var('gd_region');
|
|
| 3729 | 3729 | |
| 3730 | - $geodir_show_location_url = get_option( 'geodir_show_location_url' ); |
|
| 3730 | + $geodir_show_location_url = get_option('geodir_show_location_url');
|
|
| 3731 | 3731 | |
| 3732 | - if ( $geodir_show_location_url == 'all' ) {
|
|
| 3733 | - if ( $country != '' ) {
|
|
| 3732 | + if ($geodir_show_location_url == 'all') {
|
|
| 3733 | + if ($country != '') {
|
|
| 3734 | 3734 | $location_url[] = $country; |
| 3735 | 3735 | } |
| 3736 | 3736 | |
| 3737 | - if ( $region != '' ) {
|
|
| 3737 | + if ($region != '') {
|
|
| 3738 | 3738 | $location_url[] = $region; |
| 3739 | 3739 | } |
| 3740 | - } else if ( $geodir_show_location_url == 'country_city' ) {
|
|
| 3741 | - if ( $country != '' ) {
|
|
| 3740 | + } else if ($geodir_show_location_url == 'country_city') {
|
|
| 3741 | + if ($country != '') {
|
|
| 3742 | 3742 | $location_url[] = $country; |
| 3743 | 3743 | } |
| 3744 | - } else if ( $geodir_show_location_url == 'region_city' ) {
|
|
| 3745 | - if ( $region != '' ) {
|
|
| 3744 | + } else if ($geodir_show_location_url == 'region_city') {
|
|
| 3745 | + if ($region != '') {
|
|
| 3746 | 3746 | $location_url[] = $region; |
| 3747 | 3747 | } |
| 3748 | 3748 | } |
@@ -3750,37 +3750,37 @@ discard block |
||
| 3750 | 3750 | $location_url[] = $city; |
| 3751 | 3751 | } |
| 3752 | 3752 | |
| 3753 | - $location_url = implode( '/', $location_url ); |
|
| 3753 | + $location_url = implode('/', $location_url);
|
|
| 3754 | 3754 | $skip_location = false; |
| 3755 | - if ( ! $add_location_filter && $gd_session->get( 'gd_multi_location' ) ) {
|
|
| 3755 | + if (!$add_location_filter && $gd_session->get('gd_multi_location')) {
|
|
| 3756 | 3756 | $skip_location = true; |
| 3757 | - $gd_session->un_set( 'gd_multi_location' ); |
|
| 3757 | + $gd_session->un_set('gd_multi_location');
|
|
| 3758 | 3758 | } |
| 3759 | 3759 | |
| 3760 | - if ( get_option( 'permalink_structure' ) ) {
|
|
| 3761 | - $viewall_url = get_post_type_archive_link( $post_type ); |
|
| 3760 | + if (get_option('permalink_structure')) {
|
|
| 3761 | + $viewall_url = get_post_type_archive_link($post_type); |
|
| 3762 | 3762 | } else {
|
| 3763 | - $viewall_url = get_post_type_archive_link( $post_type ); |
|
| 3763 | + $viewall_url = get_post_type_archive_link($post_type); |
|
| 3764 | 3764 | } |
| 3765 | 3765 | |
| 3766 | - if ( ! empty( $category ) && $category[0] != '0' ) {
|
|
| 3766 | + if (!empty($category) && $category[0] != '0') {
|
|
| 3767 | 3767 | global $geodir_add_location_url; |
| 3768 | 3768 | |
| 3769 | 3769 | $geodir_add_location_url = '0'; |
| 3770 | 3770 | |
| 3771 | - if ( $add_location_filter != '0' ) {
|
|
| 3771 | + if ($add_location_filter != '0') {
|
|
| 3772 | 3772 | $geodir_add_location_url = '1'; |
| 3773 | 3773 | } |
| 3774 | 3774 | |
| 3775 | - $viewall_url = get_term_link( (int) $category[0], $post_type . 'category' ); |
|
| 3775 | + $viewall_url = get_term_link((int) $category[0], $post_type.'category'); |
|
| 3776 | 3776 | |
| 3777 | 3777 | $geodir_add_location_url = null; |
| 3778 | 3778 | } |
| 3779 | - if ( $skip_location ) {
|
|
| 3780 | - $gd_session->set( 'gd_multi_location', 1 ); |
|
| 3779 | + if ($skip_location) {
|
|
| 3780 | + $gd_session->set('gd_multi_location', 1);
|
|
| 3781 | 3781 | } |
| 3782 | 3782 | |
| 3783 | - if ( is_wp_error( $viewall_url ) ) {
|
|
| 3783 | + if (is_wp_error($viewall_url)) {
|
|
| 3784 | 3784 | $viewall_url = ''; |
| 3785 | 3785 | } |
| 3786 | 3786 | |
@@ -3792,43 +3792,43 @@ discard block |
||
| 3792 | 3792 | 'order_by' => $list_sort |
| 3793 | 3793 | ); |
| 3794 | 3794 | |
| 3795 | - if ( $character_count ) {
|
|
| 3795 | + if ($character_count) {
|
|
| 3796 | 3796 | $query_args['excerpt_length'] = $character_count; |
| 3797 | 3797 | } |
| 3798 | 3798 | |
| 3799 | - if ( ! empty( $instance['show_featured_only'] ) ) {
|
|
| 3799 | + if (!empty($instance['show_featured_only'])) {
|
|
| 3800 | 3800 | $query_args['show_featured_only'] = 1; |
| 3801 | 3801 | } |
| 3802 | 3802 | |
| 3803 | - if ( ! empty( $instance['show_special_only'] ) ) {
|
|
| 3803 | + if (!empty($instance['show_special_only'])) {
|
|
| 3804 | 3804 | $query_args['show_special_only'] = 1; |
| 3805 | 3805 | } |
| 3806 | 3806 | |
| 3807 | - if ( ! empty( $instance['with_pics_only'] ) ) {
|
|
| 3807 | + if (!empty($instance['with_pics_only'])) {
|
|
| 3808 | 3808 | $query_args['with_pics_only'] = 0; |
| 3809 | 3809 | $query_args['featured_image_only'] = 1; |
| 3810 | 3810 | } |
| 3811 | 3811 | |
| 3812 | - if ( ! empty( $instance['with_videos_only'] ) ) {
|
|
| 3812 | + if (!empty($instance['with_videos_only'])) {
|
|
| 3813 | 3813 | $query_args['with_videos_only'] = 1; |
| 3814 | 3814 | } |
| 3815 | - $hide_if_empty = ! empty( $instance['hide_if_empty'] ) ? true : false; |
|
| 3815 | + $hide_if_empty = !empty($instance['hide_if_empty']) ? true : false; |
|
| 3816 | 3816 | |
| 3817 | - if ( ! empty( $categories ) && $categories[0] != '0' && !empty( $category_taxonomy ) ) {
|
|
| 3817 | + if (!empty($categories) && $categories[0] != '0' && !empty($category_taxonomy)) {
|
|
| 3818 | 3818 | $tax_query = array( |
| 3819 | 3819 | 'taxonomy' => $category_taxonomy[0], |
| 3820 | 3820 | 'field' => 'id', |
| 3821 | 3821 | 'terms' => $category |
| 3822 | 3822 | ); |
| 3823 | 3823 | |
| 3824 | - $query_args['tax_query'] = array( $tax_query ); |
|
| 3824 | + $query_args['tax_query'] = array($tax_query); |
|
| 3825 | 3825 | } |
| 3826 | 3826 | |
| 3827 | 3827 | global $gridview_columns_widget, $geodir_is_widget_listing; |
| 3828 | 3828 | |
| 3829 | - $widget_listings = geodir_get_widget_listings( $query_args ); |
|
| 3829 | + $widget_listings = geodir_get_widget_listings($query_args); |
|
| 3830 | 3830 | |
| 3831 | - if ( $hide_if_empty && empty( $widget_listings ) ) {
|
|
| 3831 | + if ($hide_if_empty && empty($widget_listings)) {
|
|
| 3832 | 3832 | return; |
| 3833 | 3833 | } |
| 3834 | 3834 | |
@@ -3843,11 +3843,11 @@ discard block |
||
| 3843 | 3843 | * |
| 3844 | 3844 | * @since 1.0.0 |
| 3845 | 3845 | */ |
| 3846 | - do_action( 'geodir_before_view_all_link_in_widget' ); ?> |
|
| 3846 | + do_action('geodir_before_view_all_link_in_widget'); ?>
|
|
| 3847 | 3847 | <div class="geodir_list_heading clearfix"> |
| 3848 | - <?php echo $before_title . $title . $after_title; ?> |
|
| 3848 | + <?php echo $before_title.$title.$after_title; ?> |
|
| 3849 | 3849 | <a href="<?php echo $viewall_url; ?>" |
| 3850 | - class="geodir-viewall"><?php _e( 'View all', 'geodirectory' ); ?></a> |
|
| 3850 | + class="geodir-viewall"><?php _e('View all', 'geodirectory'); ?></a>
|
|
| 3851 | 3851 | </div> |
| 3852 | 3852 | <?php |
| 3853 | 3853 | /** |
@@ -3855,10 +3855,10 @@ discard block |
||
| 3855 | 3855 | * |
| 3856 | 3856 | * @since 1.0.0 |
| 3857 | 3857 | */ |
| 3858 | - do_action( 'geodir_after_view_all_link_in_widget' ); ?> |
|
| 3858 | + do_action('geodir_after_view_all_link_in_widget'); ?>
|
|
| 3859 | 3859 | <?php |
| 3860 | - if ( strstr( $layout, 'gridview' ) ) {
|
|
| 3861 | - $listing_view_exp = explode( '_', $layout ); |
|
| 3860 | + if (strstr($layout, 'gridview')) {
|
|
| 3861 | + $listing_view_exp = explode('_', $layout);
|
|
| 3862 | 3862 | $gridview_columns_widget = $layout; |
| 3863 | 3863 | $layout = $listing_view_exp[0]; |
| 3864 | 3864 | } else {
|
@@ -3869,8 +3869,8 @@ discard block |
||
| 3869 | 3869 | * |
| 3870 | 3870 | * @since 1.0.0 |
| 3871 | 3871 | */ |
| 3872 | - $template = apply_filters( "geodir_template_part-widget-listing-listview", geodir_locate_template( 'widget-listing-listview' ) ); |
|
| 3873 | - if ( ! isset( $character_count ) ) {
|
|
| 3872 | + $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
|
|
| 3873 | + if (!isset($character_count)) {
|
|
| 3874 | 3874 | /** |
| 3875 | 3875 | * Filter the widget's excerpt character count. |
| 3876 | 3876 | * |
@@ -3878,7 +3878,7 @@ discard block |
||
| 3878 | 3878 | * |
| 3879 | 3879 | * @param int $instance ['character_count'] Excerpt character count. |
| 3880 | 3880 | */ |
| 3881 | - $character_count = $character_count == '' ? 50 : apply_filters( 'widget_character_count', $character_count ); |
|
| 3881 | + $character_count = $character_count == '' ? 50 : apply_filters('widget_character_count', $character_count);
|
|
| 3882 | 3882 | } |
| 3883 | 3883 | |
| 3884 | 3884 | global $post, $map_jason, $map_canvas_arr; |
@@ -3893,13 +3893,13 @@ discard block |
||
| 3893 | 3893 | * |
| 3894 | 3894 | * @since 1.0.0 |
| 3895 | 3895 | */ |
| 3896 | - include( $template ); |
|
| 3896 | + include($template); |
|
| 3897 | 3897 | |
| 3898 | 3898 | $geodir_is_widget_listing = false; |
| 3899 | 3899 | |
| 3900 | 3900 | $GLOBALS['post'] = $current_post; |
| 3901 | - if ( ! empty( $current_post ) ) {
|
|
| 3902 | - setup_postdata( $current_post ); |
|
| 3901 | + if (!empty($current_post)) {
|
|
| 3902 | + setup_postdata($current_post); |
|
| 3903 | 3903 | } |
| 3904 | 3904 | $map_jason = $current_map_jason; |
| 3905 | 3905 | $map_canvas_arr = $current_map_canvas_arr; |
@@ -3928,12 +3928,12 @@ discard block |
||
| 3928 | 3928 | * |
| 3929 | 3929 | * @return int Reviews count. |
| 3930 | 3930 | */ |
| 3931 | -function geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ) {
|
|
| 3931 | +function geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type) {
|
|
| 3932 | 3932 | global $wpdb, $plugin_prefix; |
| 3933 | 3933 | |
| 3934 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 3934 | + $detail_table = $plugin_prefix.$post_type.'_detail'; |
|
| 3935 | 3935 | |
| 3936 | - $sql = "SELECT COALESCE(SUM(rating_count),0) FROM " . $detail_table . " WHERE post_status = 'publish' AND rating_count > 0 AND FIND_IN_SET(" . $term_id . ", " . $taxonomy . ")";
|
|
| 3936 | + $sql = "SELECT COALESCE(SUM(rating_count),0) FROM ".$detail_table." WHERE post_status = 'publish' AND rating_count > 0 AND FIND_IN_SET(".$term_id.", ".$taxonomy.")";
|
|
| 3937 | 3937 | |
| 3938 | 3938 | /** |
| 3939 | 3939 | * Filter count review sql query. |
@@ -3945,9 +3945,9 @@ discard block |
||
| 3945 | 3945 | * @param int $taxonomy The taxonomy Id. |
| 3946 | 3946 | * @param string $post_type The post type. |
| 3947 | 3947 | */ |
| 3948 | - $sql = apply_filters( 'geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type ); |
|
| 3948 | + $sql = apply_filters('geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type);
|
|
| 3949 | 3949 | |
| 3950 | - $count = $wpdb->get_var( $sql ); |
|
| 3950 | + $count = $wpdb->get_var($sql); |
|
| 3951 | 3951 | |
| 3952 | 3952 | return $count; |
| 3953 | 3953 | } |
@@ -3965,7 +3965,7 @@ discard block |
||
| 3965 | 3965 | * |
| 3966 | 3966 | * @return array Term array data. |
| 3967 | 3967 | */ |
| 3968 | -function geodir_count_reviews_by_terms( $force_update = false, $post_ID = 0 ) {
|
|
| 3968 | +function geodir_count_reviews_by_terms($force_update = false, $post_ID = 0) {
|
|
| 3969 | 3969 | /** |
| 3970 | 3970 | * Filter review count option data. |
| 3971 | 3971 | * |
@@ -3975,78 +3975,78 @@ discard block |
||
| 3975 | 3975 | * @param bool $force_update Force update option value?. Default.false. |
| 3976 | 3976 | * @param int $post_ID The post id to update if any. |
| 3977 | 3977 | */ |
| 3978 | - $option_data = apply_filters( 'geodir_count_reviews_by_terms_before', '', $force_update, $post_ID ); |
|
| 3979 | - if ( ! empty( $option_data ) ) {
|
|
| 3978 | + $option_data = apply_filters('geodir_count_reviews_by_terms_before', '', $force_update, $post_ID);
|
|
| 3979 | + if (!empty($option_data)) {
|
|
| 3980 | 3980 | return $option_data; |
| 3981 | 3981 | } |
| 3982 | 3982 | |
| 3983 | - $option_data = get_option( 'geodir_global_review_count' ); |
|
| 3983 | + $option_data = get_option('geodir_global_review_count');
|
|
| 3984 | 3984 | |
| 3985 | - if ( ! $option_data || $force_update ) {
|
|
| 3986 | - if ( (int) $post_ID > 0 ) { // Update reviews count for specific post categories only.
|
|
| 3985 | + if (!$option_data || $force_update) {
|
|
| 3986 | + if ((int) $post_ID > 0) { // Update reviews count for specific post categories only.
|
|
| 3987 | 3987 | global $gd_session; |
| 3988 | 3988 | $term_array = (array) $option_data; |
| 3989 | - $post_type = get_post_type( $post_ID ); |
|
| 3990 | - $taxonomy = $post_type . 'category'; |
|
| 3991 | - $terms = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) ); |
|
| 3992 | - |
|
| 3993 | - if ( ! empty( $terms ) && ! is_wp_error( $terms ) ) {
|
|
| 3994 | - foreach ( $terms as $term_id ) {
|
|
| 3995 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); |
|
| 3996 | - $children = get_term_children( $term_id, $taxonomy ); |
|
| 3997 | - $term_array[ $term_id ] = $count; |
|
| 3989 | + $post_type = get_post_type($post_ID); |
|
| 3990 | + $taxonomy = $post_type.'category'; |
|
| 3991 | + $terms = wp_get_object_terms($post_ID, $taxonomy, array('fields' => 'ids'));
|
|
| 3992 | + |
|
| 3993 | + if (!empty($terms) && !is_wp_error($terms)) {
|
|
| 3994 | + foreach ($terms as $term_id) {
|
|
| 3995 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); |
|
| 3996 | + $children = get_term_children($term_id, $taxonomy); |
|
| 3997 | + $term_array[$term_id] = $count; |
|
| 3998 | 3998 | } |
| 3999 | 3999 | } |
| 4000 | 4000 | |
| 4001 | - $session_listing = $gd_session->get( 'listing' ); |
|
| 4001 | + $session_listing = $gd_session->get('listing');
|
|
| 4002 | 4002 | |
| 4003 | 4003 | $terms = array(); |
| 4004 | - if ( isset( $_POST['post_category'][ $taxonomy ] ) ) {
|
|
| 4005 | - $terms = (array) $_POST['post_category'][ $taxonomy ]; |
|
| 4006 | - } else if ( ! empty( $session_listing ) && isset( $session_listing['post_category'][ $taxonomy ] ) ) {
|
|
| 4007 | - $terms = (array) $session_listing['post_category'][ $taxonomy ]; |
|
| 4004 | + if (isset($_POST['post_category'][$taxonomy])) {
|
|
| 4005 | + $terms = (array) $_POST['post_category'][$taxonomy]; |
|
| 4006 | + } else if (!empty($session_listing) && isset($session_listing['post_category'][$taxonomy])) {
|
|
| 4007 | + $terms = (array) $session_listing['post_category'][$taxonomy]; |
|
| 4008 | 4008 | } |
| 4009 | 4009 | |
| 4010 | - if ( ! empty( $terms ) ) {
|
|
| 4011 | - foreach ( $terms as $term_id ) {
|
|
| 4012 | - if ( $term_id > 0 ) {
|
|
| 4013 | - $count = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ); |
|
| 4014 | - $children = get_term_children( $term_id, $taxonomy ); |
|
| 4015 | - $term_array[ $term_id ] = $count; |
|
| 4010 | + if (!empty($terms)) {
|
|
| 4011 | + foreach ($terms as $term_id) {
|
|
| 4012 | + if ($term_id > 0) {
|
|
| 4013 | + $count = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type); |
|
| 4014 | + $children = get_term_children($term_id, $taxonomy); |
|
| 4015 | + $term_array[$term_id] = $count; |
|
| 4016 | 4016 | } |
| 4017 | 4017 | } |
| 4018 | 4018 | } |
| 4019 | 4019 | } else { // Update reviews count for all post categories.
|
| 4020 | 4020 | $term_array = array(); |
| 4021 | 4021 | $post_types = geodir_get_posttypes(); |
| 4022 | - foreach ( $post_types as $post_type ) {
|
|
| 4022 | + foreach ($post_types as $post_type) {
|
|
| 4023 | 4023 | |
| 4024 | - $taxonomy = geodir_get_taxonomies( $post_type ); |
|
| 4024 | + $taxonomy = geodir_get_taxonomies($post_type); |
|
| 4025 | 4025 | $taxonomy = $taxonomy[0]; |
| 4026 | 4026 | |
| 4027 | 4027 | $args = array( |
| 4028 | 4028 | 'hide_empty' => false |
| 4029 | 4029 | ); |
| 4030 | 4030 | |
| 4031 | - $terms = get_terms( $taxonomy, $args ); |
|
| 4031 | + $terms = get_terms($taxonomy, $args); |
|
| 4032 | 4032 | |
| 4033 | - foreach ( $terms as $term ) {
|
|
| 4034 | - $count = geodir_count_reviews_by_term_id( $term->term_id, $taxonomy, $post_type ); |
|
| 4035 | - $children = get_term_children( $term->term_id, $taxonomy ); |
|
| 4033 | + foreach ($terms as $term) {
|
|
| 4034 | + $count = geodir_count_reviews_by_term_id($term->term_id, $taxonomy, $post_type); |
|
| 4035 | + $children = get_term_children($term->term_id, $taxonomy); |
|
| 4036 | 4036 | /*if ( is_array( $children ) ) {
|
| 4037 | 4037 | foreach ( $children as $child_id ) {
|
| 4038 | 4038 | $child_count = geodir_count_reviews_by_term_id($child_id, $taxonomy, $post_type); |
| 4039 | 4039 | $count = $count + $child_count; |
| 4040 | 4040 | } |
| 4041 | 4041 | }*/ |
| 4042 | - $term_array[ $term->term_id ] = $count; |
|
| 4042 | + $term_array[$term->term_id] = $count; |
|
| 4043 | 4043 | } |
| 4044 | 4044 | } |
| 4045 | 4045 | } |
| 4046 | 4046 | |
| 4047 | - update_option( 'geodir_global_review_count', $term_array ); |
|
| 4047 | + update_option('geodir_global_review_count', $term_array);
|
|
| 4048 | 4048 | //clear cache |
| 4049 | - wp_cache_delete( 'geodir_global_review_count' ); |
|
| 4049 | + wp_cache_delete('geodir_global_review_count');
|
|
| 4050 | 4050 | |
| 4051 | 4051 | return $term_array; |
| 4052 | 4052 | } else {
|
@@ -4062,39 +4062,39 @@ discard block |
||
| 4062 | 4062 | * @package GeoDirectory |
| 4063 | 4063 | * @return bool |
| 4064 | 4064 | */ |
| 4065 | -function geodir_term_review_count_force_update( $new_status, $old_status = '', $post = '' ) {
|
|
| 4066 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'geodir_import_export' ) {
|
|
| 4065 | +function geodir_term_review_count_force_update($new_status, $old_status = '', $post = '') {
|
|
| 4066 | + if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'geodir_import_export') {
|
|
| 4067 | 4067 | return; // do not run if importing listings |
| 4068 | 4068 | } |
| 4069 | 4069 | |
| 4070 | - if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
|
|
| 4070 | + if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
|
|
| 4071 | 4071 | return; |
| 4072 | 4072 | } |
| 4073 | 4073 | |
| 4074 | 4074 | $post_ID = 0; |
| 4075 | - if ( ! empty( $post ) ) {
|
|
| 4076 | - if ( isset( $post->post_type ) && strpos( $post->post_type, 'gd_' ) !== 0 ) {
|
|
| 4075 | + if (!empty($post)) {
|
|
| 4076 | + if (isset($post->post_type) && strpos($post->post_type, 'gd_') !== 0) {
|
|
| 4077 | 4077 | return; |
| 4078 | 4078 | } |
| 4079 | 4079 | |
| 4080 | - if ( $new_status == 'auto-draft' && $old_status == 'new' ) {
|
|
| 4080 | + if ($new_status == 'auto-draft' && $old_status == 'new') {
|
|
| 4081 | 4081 | return; |
| 4082 | 4082 | } |
| 4083 | 4083 | |
| 4084 | - if ( ! empty( $post->ID ) ) {
|
|
| 4084 | + if (!empty($post->ID)) {
|
|
| 4085 | 4085 | $post_ID = $post->ID; |
| 4086 | 4086 | } |
| 4087 | 4087 | } |
| 4088 | 4088 | |
| 4089 | - if ( $new_status != $old_status ) {
|
|
| 4090 | - geodir_count_reviews_by_terms( true, $post_ID ); |
|
| 4089 | + if ($new_status != $old_status) {
|
|
| 4090 | + geodir_count_reviews_by_terms(true, $post_ID); |
|
| 4091 | 4091 | } |
| 4092 | 4092 | |
| 4093 | 4093 | return true; |
| 4094 | 4094 | } |
| 4095 | 4095 | |
| 4096 | -function geodir_term_review_count_force_update_single_post( $post_id ) {
|
|
| 4097 | - geodir_count_reviews_by_terms( true, $post_id ); |
|
| 4096 | +function geodir_term_review_count_force_update_single_post($post_id) {
|
|
| 4097 | + geodir_count_reviews_by_terms(true, $post_id); |
|
| 4098 | 4098 | } |
| 4099 | 4099 | |
| 4100 | 4100 | /*-----------------------------------------------------------------------------------*/ |
@@ -4111,11 +4111,11 @@ discard block |
||
| 4111 | 4111 | * |
| 4112 | 4112 | * @return int Post count. |
| 4113 | 4113 | */ |
| 4114 | -function geodir_count_posts_by_term( $data, $term ) {
|
|
| 4114 | +function geodir_count_posts_by_term($data, $term) {
|
|
| 4115 | 4115 | |
| 4116 | - if ( $data ) {
|
|
| 4117 | - if ( isset( $data[ $term->term_id ] ) ) {
|
|
| 4118 | - return $data[ $term->term_id ]; |
|
| 4116 | + if ($data) {
|
|
| 4117 | + if (isset($data[$term->term_id])) {
|
|
| 4118 | + return $data[$term->term_id]; |
|
| 4119 | 4119 | } else {
|
| 4120 | 4120 | return 0; |
| 4121 | 4121 | } |
@@ -4132,8 +4132,8 @@ discard block |
||
| 4132 | 4132 | * param array $terms An array of term objects. |
| 4133 | 4133 | * @return array Sorted terms array. |
| 4134 | 4134 | */ |
| 4135 | -function geodir_sort_terms_by_count( $terms ) {
|
|
| 4136 | - usort( $terms, "geodir_sort_by_count_obj" ); |
|
| 4135 | +function geodir_sort_terms_by_count($terms) {
|
|
| 4136 | + usort($terms, "geodir_sort_by_count_obj"); |
|
| 4137 | 4137 | |
| 4138 | 4138 | return $terms; |
| 4139 | 4139 | } |
@@ -4148,8 +4148,8 @@ discard block |
||
| 4148 | 4148 | * |
| 4149 | 4149 | * @return array Sorted terms array. |
| 4150 | 4150 | */ |
| 4151 | -function geodir_sort_terms_by_review_count( $terms ) {
|
|
| 4152 | - usort( $terms, "geodir_sort_by_review_count_obj" ); |
|
| 4151 | +function geodir_sort_terms_by_review_count($terms) {
|
|
| 4152 | + usort($terms, "geodir_sort_by_review_count_obj"); |
|
| 4153 | 4153 | |
| 4154 | 4154 | return $terms; |
| 4155 | 4155 | } |
@@ -4165,12 +4165,12 @@ discard block |
||
| 4165 | 4165 | * |
| 4166 | 4166 | * @return array Sorted terms array. |
| 4167 | 4167 | */ |
| 4168 | -function geodir_sort_terms( $terms, $sort = 'count' ) {
|
|
| 4169 | - if ( $sort == 'count' ) {
|
|
| 4170 | - return geodir_sort_terms_by_count( $terms ); |
|
| 4168 | +function geodir_sort_terms($terms, $sort = 'count') {
|
|
| 4169 | + if ($sort == 'count') {
|
|
| 4170 | + return geodir_sort_terms_by_count($terms); |
|
| 4171 | 4171 | } |
| 4172 | - if ( $sort == 'review_count' ) {
|
|
| 4173 | - return geodir_sort_terms_by_review_count( $terms ); |
|
| 4172 | + if ($sort == 'review_count') {
|
|
| 4173 | + return geodir_sort_terms_by_review_count($terms); |
|
| 4174 | 4174 | } |
| 4175 | 4175 | return $terms; |
| 4176 | 4176 | } |
@@ -4189,7 +4189,7 @@ discard block |
||
| 4189 | 4189 | * |
| 4190 | 4190 | * @return bool |
| 4191 | 4191 | */ |
| 4192 | -function geodir_sort_by_count( $a, $b ) {
|
|
| 4192 | +function geodir_sort_by_count($a, $b) {
|
|
| 4193 | 4193 | return $a['count'] < $b['count']; |
| 4194 | 4194 | } |
| 4195 | 4195 | |
@@ -4204,7 +4204,7 @@ discard block |
||
| 4204 | 4204 | * |
| 4205 | 4205 | * @return bool |
| 4206 | 4206 | */ |
| 4207 | -function geodir_sort_by_count_obj( $a, $b ) {
|
|
| 4207 | +function geodir_sort_by_count_obj($a, $b) {
|
|
| 4208 | 4208 | return $a->count < $b->count; |
| 4209 | 4209 | } |
| 4210 | 4210 | |
@@ -4219,7 +4219,7 @@ discard block |
||
| 4219 | 4219 | * |
| 4220 | 4220 | * @return bool |
| 4221 | 4221 | */ |
| 4222 | -function geodir_sort_by_review_count_obj( $a, $b ) {
|
|
| 4222 | +function geodir_sort_by_review_count_obj($a, $b) {
|
|
| 4223 | 4223 | return $a->review_count < $b->review_count; |
| 4224 | 4224 | } |
| 4225 | 4225 | |
@@ -4236,35 +4236,35 @@ discard block |
||
| 4236 | 4236 | * @since 1.4.2 |
| 4237 | 4237 | * @package GeoDirectory |
| 4238 | 4238 | */ |
| 4239 | - $locale = apply_filters( 'plugin_locale', get_locale(), 'geodirectory' ); |
|
| 4239 | + $locale = apply_filters('plugin_locale', get_locale(), 'geodirectory');
|
|
| 4240 | 4240 | |
| 4241 | - load_textdomain( 'geodirectory', WP_LANG_DIR . '/' . 'geodirectory' . '/' . 'geodirectory' . '-' . $locale . '.mo' ); |
|
| 4242 | - load_plugin_textdomain( 'geodirectory', false, plugin_basename( dirname( dirname( __FILE__ ) ) ) . '/geodirectory-languages' ); |
|
| 4241 | + load_textdomain('geodirectory', WP_LANG_DIR.'/'.'geodirectory'.'/'.'geodirectory'.'-'.$locale.'.mo');
|
|
| 4242 | + load_plugin_textdomain('geodirectory', false, plugin_basename(dirname(dirname(__FILE__))).'/geodirectory-languages');
|
|
| 4243 | 4243 | |
| 4244 | 4244 | /** |
| 4245 | 4245 | * Define language constants. |
| 4246 | 4246 | * |
| 4247 | 4247 | * @since 1.0.0 |
| 4248 | 4248 | */ |
| 4249 | - require_once( geodir_plugin_path() . '/language.php' ); |
|
| 4249 | + require_once(geodir_plugin_path().'/language.php'); |
|
| 4250 | 4250 | |
| 4251 | - $language_file = geodir_plugin_path() . '/db-language.php'; |
|
| 4251 | + $language_file = geodir_plugin_path().'/db-language.php'; |
|
| 4252 | 4252 | |
| 4253 | 4253 | // Load language string file if not created yet |
| 4254 | - if ( ! file_exists( $language_file ) ) {
|
|
| 4254 | + if (!file_exists($language_file)) {
|
|
| 4255 | 4255 | geodirectory_load_db_language(); |
| 4256 | 4256 | } |
| 4257 | 4257 | |
| 4258 | - if ( file_exists( $language_file ) ) {
|
|
| 4258 | + if (file_exists($language_file)) {
|
|
| 4259 | 4259 | /** |
| 4260 | 4260 | * Language strings from database. |
| 4261 | 4261 | * |
| 4262 | 4262 | * @since 1.4.2 |
| 4263 | 4263 | */ |
| 4264 | 4264 | try {
|
| 4265 | - require_once( $language_file ); |
|
| 4266 | - } catch ( Exception $e ) {
|
|
| 4267 | - error_log( 'Language Error: ' . $e->getMessage() ); |
|
| 4265 | + require_once($language_file); |
|
| 4266 | + } catch (Exception $e) {
|
|
| 4267 | + error_log('Language Error: '.$e->getMessage());
|
|
| 4268 | 4268 | } |
| 4269 | 4269 | } |
| 4270 | 4270 | } |
@@ -4281,19 +4281,19 @@ discard block |
||
| 4281 | 4281 | */ |
| 4282 | 4282 | function geodirectory_load_db_language() {
|
| 4283 | 4283 | global $wp_filesystem; |
| 4284 | - if ( empty( $wp_filesystem ) ) {
|
|
| 4285 | - require_once( ABSPATH . '/wp-admin/includes/file.php' ); |
|
| 4284 | + if (empty($wp_filesystem)) {
|
|
| 4285 | + require_once(ABSPATH.'/wp-admin/includes/file.php'); |
|
| 4286 | 4286 | WP_Filesystem(); |
| 4287 | 4287 | global $wp_filesystem; |
| 4288 | 4288 | } |
| 4289 | 4289 | |
| 4290 | - $language_file = geodir_plugin_path() . '/db-language.php'; |
|
| 4290 | + $language_file = geodir_plugin_path().'/db-language.php'; |
|
| 4291 | 4291 | |
| 4292 | - if ( is_file( $language_file ) && ! is_writable( $language_file ) ) {
|
|
| 4292 | + if (is_file($language_file) && !is_writable($language_file)) {
|
|
| 4293 | 4293 | return false; |
| 4294 | 4294 | } // Not possible to create. |
| 4295 | 4295 | |
| 4296 | - if ( ! is_file( $language_file ) && ! is_writable( dirname( $language_file ) ) ) {
|
|
| 4296 | + if (!is_file($language_file) && !is_writable(dirname($language_file))) {
|
|
| 4297 | 4297 | return false; |
| 4298 | 4298 | } // Not possible to create. |
| 4299 | 4299 | |
@@ -4307,9 +4307,9 @@ discard block |
||
| 4307 | 4307 | * |
| 4308 | 4308 | * @param array $contents_strings Array of strings. |
| 4309 | 4309 | */ |
| 4310 | - $contents_strings = apply_filters( 'geodir_load_db_language', $contents_strings ); |
|
| 4310 | + $contents_strings = apply_filters('geodir_load_db_language', $contents_strings);
|
|
| 4311 | 4311 | |
| 4312 | - $contents_strings = array_unique( $contents_strings ); |
|
| 4312 | + $contents_strings = array_unique($contents_strings); |
|
| 4313 | 4313 | |
| 4314 | 4314 | $contents_head = array(); |
| 4315 | 4315 | $contents_head[] = "<?php"; |
@@ -4326,21 +4326,21 @@ discard block |
||
| 4326 | 4326 | $contents_foot[] = ""; |
| 4327 | 4327 | $contents_foot[] = ""; |
| 4328 | 4328 | |
| 4329 | - $contents = implode( PHP_EOL, $contents_head ); |
|
| 4329 | + $contents = implode(PHP_EOL, $contents_head); |
|
| 4330 | 4330 | |
| 4331 | - if ( ! empty( $contents_strings ) ) {
|
|
| 4332 | - foreach ( $contents_strings as $string ) {
|
|
| 4333 | - if ( is_scalar( $string ) && $string != '' ) {
|
|
| 4334 | - $string = str_replace( "'", "\'", $string ); |
|
| 4335 | - geodir_wpml_register_string( $string ); |
|
| 4336 | - $contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";
|
|
| 4331 | + if (!empty($contents_strings)) {
|
|
| 4332 | + foreach ($contents_strings as $string) {
|
|
| 4333 | + if (is_scalar($string) && $string != '') {
|
|
| 4334 | + $string = str_replace("'", "\'", $string);
|
|
| 4335 | + geodir_wpml_register_string($string); |
|
| 4336 | + $contents .= PHP_EOL."__('".$string."', 'geodirectory');";
|
|
| 4337 | 4337 | } |
| 4338 | 4338 | } |
| 4339 | 4339 | } |
| 4340 | 4340 | |
| 4341 | - $contents .= implode( PHP_EOL, $contents_foot ); |
|
| 4341 | + $contents .= implode(PHP_EOL, $contents_foot); |
|
| 4342 | 4342 | |
| 4343 | - if ( $wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE ) ) {
|
|
| 4343 | + if ($wp_filesystem->put_contents($language_file, $contents, FS_CHMOD_FILE)) {
|
|
| 4344 | 4344 | return false; |
| 4345 | 4345 | } // Failure; could not write file. |
| 4346 | 4346 | |
@@ -4361,49 +4361,49 @@ discard block |
||
| 4361 | 4361 | * |
| 4362 | 4362 | * @return array Translation texts. |
| 4363 | 4363 | */ |
| 4364 | -function geodir_load_custom_field_translation( $translation_texts = array() ) {
|
|
| 4364 | +function geodir_load_custom_field_translation($translation_texts = array()) {
|
|
| 4365 | 4365 | global $wpdb; |
| 4366 | 4366 | |
| 4367 | 4367 | // Custom fields table |
| 4368 | - $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM " . GEODIR_CUSTOM_FIELDS_TABLE; |
|
| 4369 | - $rows = $wpdb->get_results( $sql ); |
|
| 4368 | + $sql = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM ".GEODIR_CUSTOM_FIELDS_TABLE; |
|
| 4369 | + $rows = $wpdb->get_results($sql); |
|
| 4370 | 4370 | |
| 4371 | - if ( ! empty( $rows ) ) {
|
|
| 4372 | - foreach ( $rows as $row ) {
|
|
| 4373 | - if ( ! empty( $row->admin_title ) ) {
|
|
| 4374 | - $translation_texts[] = stripslashes_deep( $row->admin_title ); |
|
| 4371 | + if (!empty($rows)) {
|
|
| 4372 | + foreach ($rows as $row) {
|
|
| 4373 | + if (!empty($row->admin_title)) {
|
|
| 4374 | + $translation_texts[] = stripslashes_deep($row->admin_title); |
|
| 4375 | 4375 | } |
| 4376 | 4376 | |
| 4377 | - if ( ! empty( $row->admin_desc ) ) {
|
|
| 4378 | - $translation_texts[] = stripslashes_deep( $row->admin_desc ); |
|
| 4377 | + if (!empty($row->admin_desc)) {
|
|
| 4378 | + $translation_texts[] = stripslashes_deep($row->admin_desc); |
|
| 4379 | 4379 | } |
| 4380 | 4380 | |
| 4381 | - if ( ! empty( $row->site_title ) ) {
|
|
| 4382 | - $translation_texts[] = stripslashes_deep( $row->site_title ); |
|
| 4381 | + if (!empty($row->site_title)) {
|
|
| 4382 | + $translation_texts[] = stripslashes_deep($row->site_title); |
|
| 4383 | 4383 | } |
| 4384 | 4384 | |
| 4385 | - if ( ! empty( $row->clabels ) ) {
|
|
| 4386 | - $translation_texts[] = stripslashes_deep( $row->clabels ); |
|
| 4385 | + if (!empty($row->clabels)) {
|
|
| 4386 | + $translation_texts[] = stripslashes_deep($row->clabels); |
|
| 4387 | 4387 | } |
| 4388 | 4388 | |
| 4389 | - if ( ! empty( $row->required_msg ) ) {
|
|
| 4390 | - $translation_texts[] = stripslashes_deep( $row->required_msg ); |
|
| 4389 | + if (!empty($row->required_msg)) {
|
|
| 4390 | + $translation_texts[] = stripslashes_deep($row->required_msg); |
|
| 4391 | 4391 | } |
| 4392 | 4392 | |
| 4393 | - if ( ! empty( $row->validation_msg ) ) {
|
|
| 4394 | - $translation_texts[] = stripslashes_deep( $row->validation_msg ); |
|
| 4393 | + if (!empty($row->validation_msg)) {
|
|
| 4394 | + $translation_texts[] = stripslashes_deep($row->validation_msg); |
|
| 4395 | 4395 | } |
| 4396 | 4396 | |
| 4397 | - if ( ! empty( $row->default_value ) ) {
|
|
| 4398 | - $translation_texts[] = stripslashes_deep( $row->default_value ); |
|
| 4397 | + if (!empty($row->default_value)) {
|
|
| 4398 | + $translation_texts[] = stripslashes_deep($row->default_value); |
|
| 4399 | 4399 | } |
| 4400 | 4400 | |
| 4401 | - if ( ! empty( $row->option_values ) ) {
|
|
| 4402 | - $option_values = geodir_string_values_to_options( stripslashes_deep( $row->option_values ) ); |
|
| 4401 | + if (!empty($row->option_values)) {
|
|
| 4402 | + $option_values = geodir_string_values_to_options(stripslashes_deep($row->option_values)); |
|
| 4403 | 4403 | |
| 4404 | - if ( ! empty( $option_values ) ) {
|
|
| 4405 | - foreach ( $option_values as $option_value ) {
|
|
| 4406 | - if ( ! empty( $option_value['label'] ) ) {
|
|
| 4404 | + if (!empty($option_values)) {
|
|
| 4405 | + foreach ($option_values as $option_value) {
|
|
| 4406 | + if (!empty($option_value['label'])) {
|
|
| 4407 | 4407 | $translation_texts[] = $option_value['label']; |
| 4408 | 4408 | } |
| 4409 | 4409 | } |
@@ -4413,56 +4413,56 @@ discard block |
||
| 4413 | 4413 | } |
| 4414 | 4414 | |
| 4415 | 4415 | // Custom sorting fields table |
| 4416 | - $sql = "SELECT site_title, asc_title, desc_title FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE; |
|
| 4417 | - $rows = $wpdb->get_results( $sql ); |
|
| 4416 | + $sql = "SELECT site_title, asc_title, desc_title FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE; |
|
| 4417 | + $rows = $wpdb->get_results($sql); |
|
| 4418 | 4418 | |
| 4419 | - if ( ! empty( $rows ) ) {
|
|
| 4420 | - foreach ( $rows as $row ) {
|
|
| 4421 | - if ( ! empty( $row->site_title ) ) {
|
|
| 4422 | - $translation_texts[] = stripslashes_deep( $row->site_title ); |
|
| 4419 | + if (!empty($rows)) {
|
|
| 4420 | + foreach ($rows as $row) {
|
|
| 4421 | + if (!empty($row->site_title)) {
|
|
| 4422 | + $translation_texts[] = stripslashes_deep($row->site_title); |
|
| 4423 | 4423 | } |
| 4424 | 4424 | |
| 4425 | - if ( ! empty( $row->asc_title ) ) {
|
|
| 4426 | - $translation_texts[] = stripslashes_deep( $row->asc_title ); |
|
| 4425 | + if (!empty($row->asc_title)) {
|
|
| 4426 | + $translation_texts[] = stripslashes_deep($row->asc_title); |
|
| 4427 | 4427 | } |
| 4428 | 4428 | |
| 4429 | - if ( ! empty( $row->desc_title ) ) {
|
|
| 4430 | - $translation_texts[] = stripslashes_deep( $row->desc_title ); |
|
| 4429 | + if (!empty($row->desc_title)) {
|
|
| 4430 | + $translation_texts[] = stripslashes_deep($row->desc_title); |
|
| 4431 | 4431 | } |
| 4432 | 4432 | } |
| 4433 | 4433 | } |
| 4434 | 4434 | |
| 4435 | 4435 | // Advance search filter fields table |
| 4436 | - if ( defined( 'GEODIR_ADVANCE_SEARCH_TABLE' ) ) {
|
|
| 4437 | - $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM " . GEODIR_ADVANCE_SEARCH_TABLE; |
|
| 4438 | - $rows = $wpdb->get_results( $sql ); |
|
| 4439 | - |
|
| 4440 | - if ( ! empty( $rows ) ) {
|
|
| 4441 | - foreach ( $rows as $row ) {
|
|
| 4442 | - if ( ! empty( $row->field_site_name ) ) {
|
|
| 4443 | - $translation_texts[] = stripslashes_deep( $row->field_site_name ); |
|
| 4436 | + if (defined('GEODIR_ADVANCE_SEARCH_TABLE')) {
|
|
| 4437 | + $sql = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM ".GEODIR_ADVANCE_SEARCH_TABLE; |
|
| 4438 | + $rows = $wpdb->get_results($sql); |
|
| 4439 | + |
|
| 4440 | + if (!empty($rows)) {
|
|
| 4441 | + foreach ($rows as $row) {
|
|
| 4442 | + if (!empty($row->field_site_name)) {
|
|
| 4443 | + $translation_texts[] = stripslashes_deep($row->field_site_name); |
|
| 4444 | 4444 | } |
| 4445 | 4445 | |
| 4446 | - if ( ! empty( $row->front_search_title ) ) {
|
|
| 4447 | - $translation_texts[] = stripslashes_deep( $row->front_search_title ); |
|
| 4446 | + if (!empty($row->front_search_title)) {
|
|
| 4447 | + $translation_texts[] = stripslashes_deep($row->front_search_title); |
|
| 4448 | 4448 | } |
| 4449 | 4449 | |
| 4450 | - if ( ! empty( $row->first_search_text ) ) {
|
|
| 4451 | - $translation_texts[] = stripslashes_deep( $row->first_search_text ); |
|
| 4450 | + if (!empty($row->first_search_text)) {
|
|
| 4451 | + $translation_texts[] = stripslashes_deep($row->first_search_text); |
|
| 4452 | 4452 | } |
| 4453 | 4453 | |
| 4454 | - if ( ! empty( $row->last_search_text ) ) {
|
|
| 4455 | - $translation_texts[] = stripslashes_deep( $row->last_search_text ); |
|
| 4454 | + if (!empty($row->last_search_text)) {
|
|
| 4455 | + $translation_texts[] = stripslashes_deep($row->last_search_text); |
|
| 4456 | 4456 | } |
| 4457 | 4457 | |
| 4458 | - if ( ! empty( $row->field_desc ) ) {
|
|
| 4459 | - $translation_texts[] = stripslashes_deep( $row->field_desc ); |
|
| 4458 | + if (!empty($row->field_desc)) {
|
|
| 4459 | + $translation_texts[] = stripslashes_deep($row->field_desc); |
|
| 4460 | 4460 | } |
| 4461 | 4461 | } |
| 4462 | 4462 | } |
| 4463 | 4463 | } |
| 4464 | 4464 | |
| 4465 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; |
|
| 4465 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 4466 | 4466 | |
| 4467 | 4467 | return $translation_texts; |
| 4468 | 4468 | } |
@@ -4484,7 +4484,7 @@ discard block |
||
| 4484 | 4484 | * |
| 4485 | 4485 | * @param array $geodir_allowed_mime_types and file extensions. |
| 4486 | 4486 | */ |
| 4487 | - return apply_filters( 'geodir_allowed_mime_types', array( |
|
| 4487 | + return apply_filters('geodir_allowed_mime_types', array(
|
|
| 4488 | 4488 | 'Image' => array( // Image formats. |
| 4489 | 4489 | 'jpg' => 'image/jpeg', |
| 4490 | 4490 | 'jpe' => 'image/jpeg', |
@@ -4553,18 +4553,18 @@ discard block |
||
| 4553 | 4553 | * |
| 4554 | 4554 | * @return string User display name. |
| 4555 | 4555 | */ |
| 4556 | -function geodir_get_client_name( $user_id ) {
|
|
| 4556 | +function geodir_get_client_name($user_id) {
|
|
| 4557 | 4557 | $client_name = ''; |
| 4558 | 4558 | |
| 4559 | - $user_data = get_userdata( $user_id ); |
|
| 4559 | + $user_data = get_userdata($user_id); |
|
| 4560 | 4560 | |
| 4561 | - if ( ! empty( $user_data ) ) {
|
|
| 4562 | - if ( isset( $user_data->display_name ) && trim( $user_data->display_name ) != '' ) {
|
|
| 4563 | - $client_name = trim( $user_data->display_name ); |
|
| 4564 | - } else if ( isset( $user_data->user_nicename ) && trim( $user_data->user_nicename ) != '' ) {
|
|
| 4565 | - $client_name = trim( $user_data->user_nicename ); |
|
| 4561 | + if (!empty($user_data)) {
|
|
| 4562 | + if (isset($user_data->display_name) && trim($user_data->display_name) != '') {
|
|
| 4563 | + $client_name = trim($user_data->display_name); |
|
| 4564 | + } else if (isset($user_data->user_nicename) && trim($user_data->user_nicename) != '') {
|
|
| 4565 | + $client_name = trim($user_data->user_nicename); |
|
| 4566 | 4566 | } else {
|
| 4567 | - $client_name = trim( $user_data->user_login ); |
|
| 4567 | + $client_name = trim($user_data->user_login); |
|
| 4568 | 4568 | } |
| 4569 | 4569 | } |
| 4570 | 4570 | |
@@ -4572,17 +4572,17 @@ discard block |
||
| 4572 | 4572 | } |
| 4573 | 4573 | |
| 4574 | 4574 | |
| 4575 | -add_filter( 'wpseo_replacements', 'geodir_wpseo_replacements', 10, 1 ); |
|
| 4575 | +add_filter('wpseo_replacements', 'geodir_wpseo_replacements', 10, 1);
|
|
| 4576 | 4576 | /* |
| 4577 | 4577 | * Add location variables to wpseo replacements. |
| 4578 | 4578 | * |
| 4579 | 4579 | * @since 1.5.4 |
| 4580 | 4580 | */ |
| 4581 | -function geodir_wpseo_replacements( $vars ) {
|
|
| 4581 | +function geodir_wpseo_replacements($vars) {
|
|
| 4582 | 4582 | |
| 4583 | 4583 | // location variables |
| 4584 | 4584 | $gd_post_type = geodir_get_current_posttype(); |
| 4585 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 4585 | + $location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 4586 | 4586 | /** |
| 4587 | 4587 | * Filter the title variables location variables array |
| 4588 | 4588 | * |
@@ -4592,7 +4592,7 @@ discard block |
||
| 4592 | 4592 | * @param array $location_array The array of location variables. |
| 4593 | 4593 | * @param array $vars The page title variables. |
| 4594 | 4594 | */ |
| 4595 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr_seo', $location_array, $vars ); |
|
| 4595 | + $location_array = apply_filters('geodir_filter_title_variables_location_arr_seo', $location_array, $vars);
|
|
| 4596 | 4596 | |
| 4597 | 4597 | |
| 4598 | 4598 | $location_replace_vars = geodir_location_replace_vars($location_array, NULL, ''); |
@@ -4607,13 +4607,13 @@ discard block |
||
| 4607 | 4607 | * @param string $vars The title with variables. |
| 4608 | 4608 | * @param array $location_array The array of location variables. |
| 4609 | 4609 | */ |
| 4610 | - return apply_filters( 'geodir_wpseo_replacements_vars', $vars, $location_array ); |
|
| 4610 | + return apply_filters('geodir_wpseo_replacements_vars', $vars, $location_array);
|
|
| 4611 | 4611 | } |
| 4612 | 4612 | |
| 4613 | 4613 | |
| 4614 | -add_filter( 'geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3 ); |
|
| 4615 | -add_filter( 'geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2 ); |
|
| 4616 | -add_filter( 'geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3 ); |
|
| 4614 | +add_filter('geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3);
|
|
| 4615 | +add_filter('geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2);
|
|
| 4616 | +add_filter('geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3);
|
|
| 4617 | 4617 | |
| 4618 | 4618 | /** |
| 4619 | 4619 | * Filter the title variables. |
@@ -4655,14 +4655,14 @@ discard block |
||
| 4655 | 4655 | * |
| 4656 | 4656 | * @return string Title after filtered variables. |
| 4657 | 4657 | */ |
| 4658 | -function geodir_filter_title_variables( $title, $gd_page, $sep = '' ) {
|
|
| 4658 | +function geodir_filter_title_variables($title, $gd_page, $sep = '') {
|
|
| 4659 | 4659 | global $wp, $post; |
| 4660 | 4660 | |
| 4661 | - if ( ! $gd_page || ! $title ) {
|
|
| 4661 | + if (!$gd_page || !$title) {
|
|
| 4662 | 4662 | return $title; // if no a GD page then bail. |
| 4663 | 4663 | } |
| 4664 | 4664 | |
| 4665 | - if ( $sep == '' ) {
|
|
| 4665 | + if ($sep == '') {
|
|
| 4666 | 4666 | /** |
| 4667 | 4667 | * Filter the page title separator. |
| 4668 | 4668 | * |
@@ -4671,100 +4671,100 @@ discard block |
||
| 4671 | 4671 | * |
| 4672 | 4672 | * @param string $sep The separator, default: `|`. |
| 4673 | 4673 | */ |
| 4674 | - $sep = apply_filters( 'geodir_page_title_separator', '|' ); |
|
| 4674 | + $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 4675 | 4675 | } |
| 4676 | 4676 | |
| 4677 | - if ( strpos( $title, '%%title%%' ) !== false ) {
|
|
| 4678 | - $title = str_replace( "%%title%%", $post->post_title, $title ); |
|
| 4677 | + if (strpos($title, '%%title%%') !== false) {
|
|
| 4678 | + $title = str_replace("%%title%%", $post->post_title, $title);
|
|
| 4679 | 4679 | } |
| 4680 | 4680 | |
| 4681 | - if ( strpos( $title, '%%sitename%%' ) !== false ) {
|
|
| 4682 | - $title = str_replace( "%%sitename%%", get_bloginfo( 'name' ), $title ); |
|
| 4681 | + if (strpos($title, '%%sitename%%') !== false) {
|
|
| 4682 | + $title = str_replace("%%sitename%%", get_bloginfo('name'), $title);
|
|
| 4683 | 4683 | } |
| 4684 | 4684 | |
| 4685 | - if ( strpos( $title, '%%sitedesc%%' ) !== false ) {
|
|
| 4686 | - $title = str_replace( "%%sitedesc%%", get_bloginfo( 'description' ), $title ); |
|
| 4685 | + if (strpos($title, '%%sitedesc%%') !== false) {
|
|
| 4686 | + $title = str_replace("%%sitedesc%%", get_bloginfo('description'), $title);
|
|
| 4687 | 4687 | } |
| 4688 | 4688 | |
| 4689 | - if ( strpos( $title, '%%excerpt%%' ) !== false ) {
|
|
| 4690 | - $title = str_replace( "%%excerpt%%", strip_tags( get_the_excerpt() ), $title ); |
|
| 4689 | + if (strpos($title, '%%excerpt%%') !== false) {
|
|
| 4690 | + $title = str_replace("%%excerpt%%", strip_tags(get_the_excerpt()), $title);
|
|
| 4691 | 4691 | } |
| 4692 | 4692 | |
| 4693 | - if ( $gd_page == 'search' || $gd_page == 'author' ) {
|
|
| 4694 | - $post_type = isset( $_REQUEST['stype'] ) ? sanitize_text_field( $_REQUEST['stype'] ) : ''; |
|
| 4695 | - } else if ( $gd_page == 'add-listing' ) {
|
|
| 4696 | - $post_type = ( isset( $_REQUEST['listing_type'] ) ) ? sanitize_text_field( $_REQUEST['listing_type'] ) : ''; |
|
| 4697 | - $post_type = ! $post_type && ! empty( $_REQUEST['pid'] ) ? get_post_type( (int) $_REQUEST['pid'] ) : $post_type; |
|
| 4698 | - } else if ( isset( $post->post_type ) && $post->post_type && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 4693 | + if ($gd_page == 'search' || $gd_page == 'author') {
|
|
| 4694 | + $post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : ''; |
|
| 4695 | + } else if ($gd_page == 'add-listing') {
|
|
| 4696 | + $post_type = (isset($_REQUEST['listing_type'])) ? sanitize_text_field($_REQUEST['listing_type']) : ''; |
|
| 4697 | + $post_type = !$post_type && !empty($_REQUEST['pid']) ? get_post_type((int) $_REQUEST['pid']) : $post_type; |
|
| 4698 | + } else if (isset($post->post_type) && $post->post_type && in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 4699 | 4699 | $post_type = $post->post_type; |
| 4700 | 4700 | } else {
|
| 4701 | - $post_type = get_query_var( 'post_type' ); |
|
| 4701 | + $post_type = get_query_var('post_type');
|
|
| 4702 | 4702 | } |
| 4703 | 4703 | |
| 4704 | - if ( strpos( $title, '%%pt_single%%' ) !== false ) {
|
|
| 4704 | + if (strpos($title, '%%pt_single%%') !== false) {
|
|
| 4705 | 4705 | $singular_name = ''; |
| 4706 | - if ( $post_type && $singular_name = get_post_type_singular_label( $post_type ) ) {
|
|
| 4707 | - $singular_name = __( $singular_name, 'geodirectory' ); |
|
| 4706 | + if ($post_type && $singular_name = get_post_type_singular_label($post_type)) {
|
|
| 4707 | + $singular_name = __($singular_name, 'geodirectory'); |
|
| 4708 | 4708 | } |
| 4709 | 4709 | |
| 4710 | - $title = str_replace( "%%pt_single%%", $singular_name, $title ); |
|
| 4710 | + $title = str_replace("%%pt_single%%", $singular_name, $title);
|
|
| 4711 | 4711 | } |
| 4712 | 4712 | |
| 4713 | - if ( strpos( $title, '%%pt_plural%%' ) !== false ) {
|
|
| 4713 | + if (strpos($title, '%%pt_plural%%') !== false) {
|
|
| 4714 | 4714 | $plural_name = ''; |
| 4715 | - if ( $post_type && $plural_name = get_post_type_plural_label( $post_type ) ) {
|
|
| 4716 | - $plural_name = __( $plural_name, 'geodirectory' ); |
|
| 4715 | + if ($post_type && $plural_name = get_post_type_plural_label($post_type)) {
|
|
| 4716 | + $plural_name = __($plural_name, 'geodirectory'); |
|
| 4717 | 4717 | } |
| 4718 | 4718 | |
| 4719 | - $title = str_replace( "%%pt_plural%%", $plural_name, $title ); |
|
| 4719 | + $title = str_replace("%%pt_plural%%", $plural_name, $title);
|
|
| 4720 | 4720 | } |
| 4721 | 4721 | |
| 4722 | - if ( strpos( $title, '%%category%%' ) !== false ) {
|
|
| 4722 | + if (strpos($title, '%%category%%') !== false) {
|
|
| 4723 | 4723 | $cat_name = ''; |
| 4724 | 4724 | |
| 4725 | - if ( $gd_page == 'detail' ) {
|
|
| 4726 | - if ( $post->default_category ) {
|
|
| 4727 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); |
|
| 4728 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; |
|
| 4725 | + if ($gd_page == 'detail') {
|
|
| 4726 | + if ($post->default_category) {
|
|
| 4727 | + $cat = get_term($post->default_category, $post->post_type.'category'); |
|
| 4728 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; |
|
| 4729 | 4729 | } |
| 4730 | - } else if ( $gd_page == 'listing' ) {
|
|
| 4730 | + } else if ($gd_page == 'listing') {
|
|
| 4731 | 4731 | $queried_object = get_queried_object(); |
| 4732 | - if ( isset( $queried_object->name ) ) {
|
|
| 4732 | + if (isset($queried_object->name)) {
|
|
| 4733 | 4733 | $cat_name = $queried_object->name; |
| 4734 | 4734 | } |
| 4735 | 4735 | } |
| 4736 | - $title = str_replace( "%%category%%", $cat_name, $title ); |
|
| 4736 | + $title = str_replace("%%category%%", $cat_name, $title);
|
|
| 4737 | 4737 | } |
| 4738 | 4738 | |
| 4739 | - if ( strpos( $title, '%%tag%%' ) !== false ) {
|
|
| 4739 | + if (strpos($title, '%%tag%%') !== false) {
|
|
| 4740 | 4740 | $cat_name = ''; |
| 4741 | 4741 | |
| 4742 | - if ( $gd_page == 'detail' ) {
|
|
| 4743 | - if ( $post->default_category ) {
|
|
| 4744 | - $cat = get_term( $post->default_category, $post->post_type . 'category' ); |
|
| 4745 | - $cat_name = ( isset( $cat->name ) ) ? $cat->name : ''; |
|
| 4742 | + if ($gd_page == 'detail') {
|
|
| 4743 | + if ($post->default_category) {
|
|
| 4744 | + $cat = get_term($post->default_category, $post->post_type.'category'); |
|
| 4745 | + $cat_name = (isset($cat->name)) ? $cat->name : ''; |
|
| 4746 | 4746 | } |
| 4747 | - } else if ( $gd_page == 'listing' ) {
|
|
| 4747 | + } else if ($gd_page == 'listing') {
|
|
| 4748 | 4748 | $queried_object = get_queried_object(); |
| 4749 | - if ( isset( $queried_object->name ) ) {
|
|
| 4749 | + if (isset($queried_object->name)) {
|
|
| 4750 | 4750 | $cat_name = $queried_object->name; |
| 4751 | 4751 | } |
| 4752 | 4752 | } |
| 4753 | - $title = str_replace( "%%tag%%", $cat_name, $title ); |
|
| 4753 | + $title = str_replace("%%tag%%", $cat_name, $title);
|
|
| 4754 | 4754 | } |
| 4755 | 4755 | |
| 4756 | - if ( strpos( $title, '%%id%%' ) !== false ) {
|
|
| 4757 | - $ID = ( isset( $post->ID ) ) ? $post->ID : ''; |
|
| 4758 | - $title = str_replace( "%%id%%", $ID, $title ); |
|
| 4756 | + if (strpos($title, '%%id%%') !== false) {
|
|
| 4757 | + $ID = (isset($post->ID)) ? $post->ID : ''; |
|
| 4758 | + $title = str_replace("%%id%%", $ID, $title);
|
|
| 4759 | 4759 | } |
| 4760 | 4760 | |
| 4761 | - if ( strpos( $title, '%%sep%%' ) !== false ) {
|
|
| 4762 | - $title = str_replace( "%%sep%%", $sep, $title ); |
|
| 4761 | + if (strpos($title, '%%sep%%') !== false) {
|
|
| 4762 | + $title = str_replace("%%sep%%", $sep, $title);
|
|
| 4763 | 4763 | } |
| 4764 | 4764 | |
| 4765 | 4765 | // location variables |
| 4766 | 4766 | $gd_post_type = geodir_get_current_posttype(); |
| 4767 | - $location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type ); |
|
| 4767 | + $location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);
|
|
| 4768 | 4768 | |
| 4769 | 4769 | /** |
| 4770 | 4770 | * Filter the title variables location variables array |
@@ -4777,20 +4777,20 @@ discard block |
||
| 4777 | 4777 | * @param string $gd_page The page being filtered. |
| 4778 | 4778 | * @param string $sep The separator, default: `|`. |
| 4779 | 4779 | */ |
| 4780 | - $location_array = apply_filters( 'geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep ); |
|
| 4780 | + $location_array = apply_filters('geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep);
|
|
| 4781 | 4781 | |
| 4782 | - if ( $gd_page == 'location' && get_query_var( 'gd_country_full' ) ) {
|
|
| 4783 | - if ( get_query_var( 'gd_country_full' ) ) {
|
|
| 4784 | - $location_array['gd_country'] = get_query_var( 'gd_country_full' ); |
|
| 4782 | + if ($gd_page == 'location' && get_query_var('gd_country_full')) {
|
|
| 4783 | + if (get_query_var('gd_country_full')) {
|
|
| 4784 | + $location_array['gd_country'] = get_query_var('gd_country_full');
|
|
| 4785 | 4785 | } |
| 4786 | - if ( get_query_var( 'gd_region_full' ) ) {
|
|
| 4787 | - $location_array['gd_region'] = get_query_var( 'gd_region_full' ); |
|
| 4786 | + if (get_query_var('gd_region_full')) {
|
|
| 4787 | + $location_array['gd_region'] = get_query_var('gd_region_full');
|
|
| 4788 | 4788 | } |
| 4789 | - if ( get_query_var( 'gd_city_full' ) ) {
|
|
| 4790 | - $location_array['gd_city'] = get_query_var( 'gd_city_full' ); |
|
| 4789 | + if (get_query_var('gd_city_full')) {
|
|
| 4790 | + $location_array['gd_city'] = get_query_var('gd_city_full');
|
|
| 4791 | 4791 | } |
| 4792 | - if ( get_query_var( 'gd_neighbourhood_full' ) ) {
|
|
| 4793 | - $location_array['gd_neighbourhood'] = get_query_var( 'gd_neighbourhood_full' ); |
|
| 4792 | + if (get_query_var('gd_neighbourhood_full')) {
|
|
| 4793 | + $location_array['gd_neighbourhood'] = get_query_var('gd_neighbourhood_full');
|
|
| 4794 | 4794 | } |
| 4795 | 4795 | } |
| 4796 | 4796 | |
@@ -4805,57 +4805,57 @@ discard block |
||
| 4805 | 4805 | * @param string $gd_page The page being filtered. |
| 4806 | 4806 | * @param string $sep The separator, default: `|`. |
| 4807 | 4807 | */ |
| 4808 | - $title = apply_filters( 'geodir_replace_location_variables', $title, $location_array, $gd_page, $sep ); |
|
| 4808 | + $title = apply_filters('geodir_replace_location_variables', $title, $location_array, $gd_page, $sep);
|
|
| 4809 | 4809 | |
| 4810 | - if ( strpos( $title, '%%search_term%%' ) !== false ) {
|
|
| 4810 | + if (strpos($title, '%%search_term%%') !== false) {
|
|
| 4811 | 4811 | $search_term = ''; |
| 4812 | - if ( isset( $_REQUEST['s'] ) ) {
|
|
| 4813 | - $search_term = esc_attr( $_REQUEST['s'] ); |
|
| 4812 | + if (isset($_REQUEST['s'])) {
|
|
| 4813 | + $search_term = esc_attr($_REQUEST['s']); |
|
| 4814 | 4814 | } |
| 4815 | - $title = str_replace( "%%search_term%%", $search_term, $title ); |
|
| 4815 | + $title = str_replace("%%search_term%%", $search_term, $title);
|
|
| 4816 | 4816 | } |
| 4817 | 4817 | |
| 4818 | - if ( strpos( $title, '%%search_near%%' ) !== false ) {
|
|
| 4818 | + if (strpos($title, '%%search_near%%') !== false) {
|
|
| 4819 | 4819 | $search_term = ''; |
| 4820 | - if ( isset( $_REQUEST['snear'] ) ) {
|
|
| 4821 | - $search_term = esc_attr( $_REQUEST['snear'] ); |
|
| 4820 | + if (isset($_REQUEST['snear'])) {
|
|
| 4821 | + $search_term = esc_attr($_REQUEST['snear']); |
|
| 4822 | 4822 | } |
| 4823 | - $title = str_replace( "%%search_near%%", $search_term, $title ); |
|
| 4823 | + $title = str_replace("%%search_near%%", $search_term, $title);
|
|
| 4824 | 4824 | } |
| 4825 | 4825 | |
| 4826 | - if ( strpos( $title, '%%name%%' ) !== false ) {
|
|
| 4827 | - if ( is_author() ) {
|
|
| 4828 | - $curauth = ( get_query_var( 'author_name' ) ) ? get_user_by( 'slug', get_query_var( 'author_name' ) ) : get_userdata( get_query_var( 'author' ) ); |
|
| 4826 | + if (strpos($title, '%%name%%') !== false) {
|
|
| 4827 | + if (is_author()) {
|
|
| 4828 | + $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 4829 | 4829 | $author_name = $curauth->display_name; |
| 4830 | 4830 | } else {
|
| 4831 | 4831 | $author_name = get_the_author(); |
| 4832 | 4832 | } |
| 4833 | - if ( ! $author_name || $author_name === '' ) {
|
|
| 4833 | + if (!$author_name || $author_name === '') {
|
|
| 4834 | 4834 | $queried_object = get_queried_object(); |
| 4835 | 4835 | |
| 4836 | - if ( isset( $queried_object->data->user_nicename ) ) {
|
|
| 4836 | + if (isset($queried_object->data->user_nicename)) {
|
|
| 4837 | 4837 | $author_name = $queried_object->data->display_name; |
| 4838 | 4838 | } |
| 4839 | 4839 | } |
| 4840 | - $title = str_replace( "%%name%%", $author_name, $title ); |
|
| 4840 | + $title = str_replace("%%name%%", $author_name, $title);
|
|
| 4841 | 4841 | } |
| 4842 | 4842 | |
| 4843 | - if ( strpos( $title, '%%page%%' ) !== false ) {
|
|
| 4844 | - $page = geodir_title_meta_page( $sep ); |
|
| 4845 | - $title = str_replace( "%%page%%", $page, $title ); |
|
| 4843 | + if (strpos($title, '%%page%%') !== false) {
|
|
| 4844 | + $page = geodir_title_meta_page($sep); |
|
| 4845 | + $title = str_replace("%%page%%", $page, $title);
|
|
| 4846 | 4846 | } |
| 4847 | - if ( strpos( $title, '%%pagenumber%%' ) !== false ) {
|
|
| 4847 | + if (strpos($title, '%%pagenumber%%') !== false) {
|
|
| 4848 | 4848 | $pagenumber = geodir_title_meta_pagenumber(); |
| 4849 | - $title = str_replace( "%%pagenumber%%", $pagenumber, $title ); |
|
| 4849 | + $title = str_replace("%%pagenumber%%", $pagenumber, $title);
|
|
| 4850 | 4850 | } |
| 4851 | - if ( strpos( $title, '%%pagetotal%%' ) !== false ) {
|
|
| 4851 | + if (strpos($title, '%%pagetotal%%') !== false) {
|
|
| 4852 | 4852 | $pagetotal = geodir_title_meta_pagetotal(); |
| 4853 | - $title = str_replace( "%%pagetotal%%", $pagetotal, $title ); |
|
| 4853 | + $title = str_replace("%%pagetotal%%", $pagetotal, $title);
|
|
| 4854 | 4854 | } |
| 4855 | 4855 | |
| 4856 | - $title = wptexturize( $title ); |
|
| 4857 | - $title = convert_chars( $title ); |
|
| 4858 | - $title = esc_html( $title ); |
|
| 4856 | + $title = wptexturize($title); |
|
| 4857 | + $title = convert_chars($title); |
|
| 4858 | + $title = esc_html($title); |
|
| 4859 | 4859 | |
| 4860 | 4860 | /** |
| 4861 | 4861 | * Filter the title variables after standard ones have been filtered. |
@@ -4869,7 +4869,7 @@ discard block |
||
| 4869 | 4869 | * @param string $sep The separator, default: `|`. |
| 4870 | 4870 | */ |
| 4871 | 4871 | |
| 4872 | - return apply_filters( 'geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep ); |
|
| 4872 | + return apply_filters('geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep);
|
|
| 4873 | 4873 | } |
| 4874 | 4874 | |
| 4875 | 4875 | /** |
@@ -4882,82 +4882,82 @@ discard block |
||
| 4882 | 4882 | * |
| 4883 | 4883 | * @return array Translation texts. |
| 4884 | 4884 | */ |
| 4885 | -function geodir_load_cpt_text_translation( $translation_texts = array() ) {
|
|
| 4886 | - $gd_post_types = geodir_get_posttypes( 'array' ); |
|
| 4885 | +function geodir_load_cpt_text_translation($translation_texts = array()) {
|
|
| 4886 | + $gd_post_types = geodir_get_posttypes('array');
|
|
| 4887 | 4887 | |
| 4888 | - if ( ! empty( $gd_post_types ) ) {
|
|
| 4889 | - foreach ( $gd_post_types as $post_type => $cpt_info ) {
|
|
| 4890 | - $labels = isset( $cpt_info['labels'] ) ? $cpt_info['labels'] : ''; |
|
| 4891 | - $description = isset( $cpt_info['description'] ) ? $cpt_info['description'] : ''; |
|
| 4892 | - $seo = isset( $cpt_info['seo'] ) ? $cpt_info['seo'] : ''; |
|
| 4888 | + if (!empty($gd_post_types)) {
|
|
| 4889 | + foreach ($gd_post_types as $post_type => $cpt_info) {
|
|
| 4890 | + $labels = isset($cpt_info['labels']) ? $cpt_info['labels'] : ''; |
|
| 4891 | + $description = isset($cpt_info['description']) ? $cpt_info['description'] : ''; |
|
| 4892 | + $seo = isset($cpt_info['seo']) ? $cpt_info['seo'] : ''; |
|
| 4893 | 4893 | |
| 4894 | - if ( ! empty( $labels ) ) {
|
|
| 4895 | - if ( $labels['name'] != '' && ! in_array( $labels['name'], $translation_texts ) ) {
|
|
| 4894 | + if (!empty($labels)) {
|
|
| 4895 | + if ($labels['name'] != '' && !in_array($labels['name'], $translation_texts)) {
|
|
| 4896 | 4896 | $translation_texts[] = $labels['name']; |
| 4897 | 4897 | } |
| 4898 | - if ( $labels['singular_name'] != '' && ! in_array( $labels['singular_name'], $translation_texts ) ) {
|
|
| 4898 | + if ($labels['singular_name'] != '' && !in_array($labels['singular_name'], $translation_texts)) {
|
|
| 4899 | 4899 | $translation_texts[] = $labels['singular_name']; |
| 4900 | 4900 | } |
| 4901 | - if ( $labels['add_new'] != '' && ! in_array( $labels['add_new'], $translation_texts ) ) {
|
|
| 4901 | + if ($labels['add_new'] != '' && !in_array($labels['add_new'], $translation_texts)) {
|
|
| 4902 | 4902 | $translation_texts[] = $labels['add_new']; |
| 4903 | 4903 | } |
| 4904 | - if ( $labels['add_new_item'] != '' && ! in_array( $labels['add_new_item'], $translation_texts ) ) {
|
|
| 4904 | + if ($labels['add_new_item'] != '' && !in_array($labels['add_new_item'], $translation_texts)) {
|
|
| 4905 | 4905 | $translation_texts[] = $labels['add_new_item']; |
| 4906 | 4906 | } |
| 4907 | - if ( $labels['edit_item'] != '' && ! in_array( $labels['edit_item'], $translation_texts ) ) {
|
|
| 4907 | + if ($labels['edit_item'] != '' && !in_array($labels['edit_item'], $translation_texts)) {
|
|
| 4908 | 4908 | $translation_texts[] = $labels['edit_item']; |
| 4909 | 4909 | } |
| 4910 | - if ( $labels['new_item'] != '' && ! in_array( $labels['new_item'], $translation_texts ) ) {
|
|
| 4910 | + if ($labels['new_item'] != '' && !in_array($labels['new_item'], $translation_texts)) {
|
|
| 4911 | 4911 | $translation_texts[] = $labels['new_item']; |
| 4912 | 4912 | } |
| 4913 | - if ( $labels['view_item'] != '' && ! in_array( $labels['view_item'], $translation_texts ) ) {
|
|
| 4913 | + if ($labels['view_item'] != '' && !in_array($labels['view_item'], $translation_texts)) {
|
|
| 4914 | 4914 | $translation_texts[] = $labels['view_item']; |
| 4915 | 4915 | } |
| 4916 | - if ( $labels['search_items'] != '' && ! in_array( $labels['search_items'], $translation_texts ) ) {
|
|
| 4916 | + if ($labels['search_items'] != '' && !in_array($labels['search_items'], $translation_texts)) {
|
|
| 4917 | 4917 | $translation_texts[] = $labels['search_items']; |
| 4918 | 4918 | } |
| 4919 | - if ( $labels['not_found'] != '' && ! in_array( $labels['not_found'], $translation_texts ) ) {
|
|
| 4919 | + if ($labels['not_found'] != '' && !in_array($labels['not_found'], $translation_texts)) {
|
|
| 4920 | 4920 | $translation_texts[] = $labels['not_found']; |
| 4921 | 4921 | } |
| 4922 | - if ( $labels['not_found_in_trash'] != '' && ! in_array( $labels['not_found_in_trash'], $translation_texts ) ) {
|
|
| 4922 | + if ($labels['not_found_in_trash'] != '' && !in_array($labels['not_found_in_trash'], $translation_texts)) {
|
|
| 4923 | 4923 | $translation_texts[] = $labels['not_found_in_trash']; |
| 4924 | 4924 | } |
| 4925 | - if ( isset( $labels['label_post_profile'] ) && $labels['label_post_profile'] != '' && ! in_array( $labels['label_post_profile'], $translation_texts ) ) {
|
|
| 4925 | + if (isset($labels['label_post_profile']) && $labels['label_post_profile'] != '' && !in_array($labels['label_post_profile'], $translation_texts)) {
|
|
| 4926 | 4926 | $translation_texts[] = $labels['label_post_profile']; |
| 4927 | 4927 | } |
| 4928 | - if ( isset( $labels['label_post_info'] ) && $labels['label_post_info'] != '' && ! in_array( $labels['label_post_info'], $translation_texts ) ) {
|
|
| 4928 | + if (isset($labels['label_post_info']) && $labels['label_post_info'] != '' && !in_array($labels['label_post_info'], $translation_texts)) {
|
|
| 4929 | 4929 | $translation_texts[] = $labels['label_post_info']; |
| 4930 | 4930 | } |
| 4931 | - if ( isset( $labels['label_post_images'] ) && $labels['label_post_images'] != '' && ! in_array( $labels['label_post_images'], $translation_texts ) ) {
|
|
| 4931 | + if (isset($labels['label_post_images']) && $labels['label_post_images'] != '' && !in_array($labels['label_post_images'], $translation_texts)) {
|
|
| 4932 | 4932 | $translation_texts[] = $labels['label_post_images']; |
| 4933 | 4933 | } |
| 4934 | - if ( isset( $labels['label_post_map'] ) && $labels['label_post_map'] != '' && ! in_array( $labels['label_post_map'], $translation_texts ) ) {
|
|
| 4934 | + if (isset($labels['label_post_map']) && $labels['label_post_map'] != '' && !in_array($labels['label_post_map'], $translation_texts)) {
|
|
| 4935 | 4935 | $translation_texts[] = $labels['label_post_map']; |
| 4936 | 4936 | } |
| 4937 | - if ( isset( $labels['label_reviews'] ) && $labels['label_reviews'] != '' && ! in_array( $labels['label_reviews'], $translation_texts ) ) {
|
|
| 4937 | + if (isset($labels['label_reviews']) && $labels['label_reviews'] != '' && !in_array($labels['label_reviews'], $translation_texts)) {
|
|
| 4938 | 4938 | $translation_texts[] = $labels['label_reviews']; |
| 4939 | 4939 | } |
| 4940 | - if ( isset( $labels['label_related_listing'] ) && $labels['label_related_listing'] != '' && ! in_array( $labels['label_related_listing'], $translation_texts ) ) {
|
|
| 4940 | + if (isset($labels['label_related_listing']) && $labels['label_related_listing'] != '' && !in_array($labels['label_related_listing'], $translation_texts)) {
|
|
| 4941 | 4941 | $translation_texts[] = $labels['label_related_listing']; |
| 4942 | 4942 | } |
| 4943 | 4943 | } |
| 4944 | 4944 | |
| 4945 | - if ( $description != '' && ! in_array( $description, $translation_texts ) ) {
|
|
| 4946 | - $translation_texts[] = normalize_whitespace( $description ); |
|
| 4945 | + if ($description != '' && !in_array($description, $translation_texts)) {
|
|
| 4946 | + $translation_texts[] = normalize_whitespace($description); |
|
| 4947 | 4947 | } |
| 4948 | 4948 | |
| 4949 | - if ( ! empty( $seo ) ) {
|
|
| 4950 | - if ( isset( $seo['meta_keyword'] ) && $seo['meta_keyword'] != '' && ! in_array( $seo['meta_keyword'], $translation_texts ) ) {
|
|
| 4951 | - $translation_texts[] = normalize_whitespace( $seo['meta_keyword'] ); |
|
| 4949 | + if (!empty($seo)) {
|
|
| 4950 | + if (isset($seo['meta_keyword']) && $seo['meta_keyword'] != '' && !in_array($seo['meta_keyword'], $translation_texts)) {
|
|
| 4951 | + $translation_texts[] = normalize_whitespace($seo['meta_keyword']); |
|
| 4952 | 4952 | } |
| 4953 | 4953 | |
| 4954 | - if ( isset( $seo['meta_description'] ) && $seo['meta_description'] != '' && ! in_array( $seo['meta_description'], $translation_texts ) ) {
|
|
| 4955 | - $translation_texts[] = normalize_whitespace( $seo['meta_description'] ); |
|
| 4954 | + if (isset($seo['meta_description']) && $seo['meta_description'] != '' && !in_array($seo['meta_description'], $translation_texts)) {
|
|
| 4955 | + $translation_texts[] = normalize_whitespace($seo['meta_description']); |
|
| 4956 | 4956 | } |
| 4957 | 4957 | } |
| 4958 | 4958 | } |
| 4959 | 4959 | } |
| 4960 | - $translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts; |
|
| 4960 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 4961 | 4961 | |
| 4962 | 4962 | return $translation_texts; |
| 4963 | 4963 | } |
@@ -4972,27 +4972,27 @@ discard block |
||
| 4972 | 4972 | * |
| 4973 | 4973 | * @return array Location terms. |
| 4974 | 4974 | */ |
| 4975 | -function geodir_remove_location_terms( $location_terms = array() ) {
|
|
| 4976 | - $location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false; |
|
| 4975 | +function geodir_remove_location_terms($location_terms = array()) {
|
|
| 4976 | + $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
|
|
| 4977 | 4977 | |
| 4978 | - if ( ! empty( $location_terms ) && $location_manager ) {
|
|
| 4979 | - $hide_country_part = get_option( 'geodir_location_hide_country_part' ); |
|
| 4980 | - $hide_region_part = get_option( 'geodir_location_hide_region_part' ); |
|
| 4978 | + if (!empty($location_terms) && $location_manager) {
|
|
| 4979 | + $hide_country_part = get_option('geodir_location_hide_country_part');
|
|
| 4980 | + $hide_region_part = get_option('geodir_location_hide_region_part');
|
|
| 4981 | 4981 | |
| 4982 | - if ( $hide_region_part && $hide_country_part ) {
|
|
| 4983 | - if ( isset( $location_terms['gd_country'] ) ) {
|
|
| 4984 | - unset( $location_terms['gd_country'] ); |
|
| 4982 | + if ($hide_region_part && $hide_country_part) {
|
|
| 4983 | + if (isset($location_terms['gd_country'])) {
|
|
| 4984 | + unset($location_terms['gd_country']); |
|
| 4985 | 4985 | } |
| 4986 | - if ( isset( $location_terms['gd_region'] ) ) {
|
|
| 4987 | - unset( $location_terms['gd_region'] ); |
|
| 4986 | + if (isset($location_terms['gd_region'])) {
|
|
| 4987 | + unset($location_terms['gd_region']); |
|
| 4988 | 4988 | } |
| 4989 | - } else if ( $hide_region_part && ! $hide_country_part ) {
|
|
| 4990 | - if ( isset( $location_terms['gd_region'] ) ) {
|
|
| 4991 | - unset( $location_terms['gd_region'] ); |
|
| 4989 | + } else if ($hide_region_part && !$hide_country_part) {
|
|
| 4990 | + if (isset($location_terms['gd_region'])) {
|
|
| 4991 | + unset($location_terms['gd_region']); |
|
| 4992 | 4992 | } |
| 4993 | - } else if ( ! $hide_region_part && $hide_country_part ) {
|
|
| 4994 | - if ( isset( $location_terms['gd_country'] ) ) {
|
|
| 4995 | - unset( $location_terms['gd_country'] ); |
|
| 4993 | + } else if (!$hide_region_part && $hide_country_part) {
|
|
| 4994 | + if (isset($location_terms['gd_country'])) {
|
|
| 4995 | + unset($location_terms['gd_country']); |
|
| 4996 | 4996 | } |
| 4997 | 4997 | } |
| 4998 | 4998 | } |
@@ -5003,7 +5003,7 @@ discard block |
||
| 5003 | 5003 | * @since 1.6.22 |
| 5004 | 5004 | * @param array $location_terms The array of location terms. |
| 5005 | 5005 | */ |
| 5006 | - return apply_filters('geodir_remove_location_terms',$location_terms);
|
|
| 5006 | + return apply_filters('geodir_remove_location_terms', $location_terms);
|
|
| 5007 | 5007 | } |
| 5008 | 5008 | |
| 5009 | 5009 | /** |
@@ -5019,40 +5019,40 @@ discard block |
||
| 5019 | 5019 | * @param WP_Post $post Post object. |
| 5020 | 5020 | * @param bool $update Whether this is an existing listing being updated or not. |
| 5021 | 5021 | */ |
| 5022 | -function geodir_on_wp_insert_post( $post_ID, $post, $update ) {
|
|
| 5022 | +function geodir_on_wp_insert_post($post_ID, $post, $update) {
|
|
| 5023 | 5023 | global $gd_notified_edited; |
| 5024 | 5024 | |
| 5025 | - if ( ! $update ) {
|
|
| 5025 | + if (!$update) {
|
|
| 5026 | 5026 | return; |
| 5027 | 5027 | } |
| 5028 | 5028 | |
| 5029 | - $action = isset( $_REQUEST['action'] ) ? sanitize_text_field( $_REQUEST['action'] ) : ''; |
|
| 5030 | - $is_admin = is_admin() && ( ! defined( 'DOING_AJAX' ) || ( defined( 'DOING_AJAX' ) && ! DOING_AJAX ) ) ? true : false; |
|
| 5029 | + $action = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : ''; |
|
| 5030 | + $is_admin = is_admin() && (!defined('DOING_AJAX') || (defined('DOING_AJAX') && !DOING_AJAX)) ? true : false;
|
|
| 5031 | 5031 | $inline_save = $action == 'inline-save' ? true : false; |
| 5032 | 5032 | |
| 5033 | - if ( empty( $post->post_type ) || $is_admin || $inline_save || ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) ) {
|
|
| 5033 | + if (empty($post->post_type) || $is_admin || $inline_save || (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)) {
|
|
| 5034 | 5034 | return; |
| 5035 | 5035 | } |
| 5036 | 5036 | |
| 5037 | - if ( $action != '' && in_array( $action, array( 'geodir_import_export' ) ) ) {
|
|
| 5037 | + if ($action != '' && in_array($action, array('geodir_import_export'))) {
|
|
| 5038 | 5038 | return; |
| 5039 | 5039 | } |
| 5040 | 5040 | |
| 5041 | 5041 | $user_id = (int) get_current_user_id(); |
| 5042 | 5042 | |
| 5043 | - if ( $user_id > 0 && get_option( 'geodir_notify_post_edited' ) && ! wp_is_post_revision( $post_ID ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 5044 | - $author_id = ! empty( $post->post_author ) ? $post->post_author : 0; |
|
| 5043 | + if ($user_id > 0 && get_option('geodir_notify_post_edited') && !wp_is_post_revision($post_ID) && in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 5044 | + $author_id = !empty($post->post_author) ? $post->post_author : 0; |
|
| 5045 | 5045 | |
| 5046 | - if ( $user_id == $author_id && ! is_super_admin() && empty( $gd_notified_edited[$post_ID] ) ) {
|
|
| 5047 | - if ( !empty( $gd_notified_edited ) ) {
|
|
| 5046 | + if ($user_id == $author_id && !is_super_admin() && empty($gd_notified_edited[$post_ID])) {
|
|
| 5047 | + if (!empty($gd_notified_edited)) {
|
|
| 5048 | 5048 | $gd_notified_edited = array(); |
| 5049 | 5049 | } |
| 5050 | 5050 | $gd_notified_edited[$post_ID] = true; |
| 5051 | 5051 | |
| 5052 | - $from_email = get_option( 'site_email' ); |
|
| 5052 | + $from_email = get_option('site_email');
|
|
| 5053 | 5053 | $from_name = get_site_emailName(); |
| 5054 | - $to_email = get_option( 'admin_email' ); |
|
| 5055 | - $to_name = get_option( 'name' ); |
|
| 5054 | + $to_email = get_option('admin_email');
|
|
| 5055 | + $to_name = get_option('name');
|
|
| 5056 | 5056 | $message_type = 'listing_edited'; |
| 5057 | 5057 | |
| 5058 | 5058 | $notify_edited = true; |
@@ -5064,9 +5064,9 @@ discard block |
||
| 5064 | 5064 | * @param bool $notify_edited Notify on listing edited by author? |
| 5065 | 5065 | * @param object $post The current post object. |
| 5066 | 5066 | */ |
| 5067 | - $notify_edited = apply_filters( 'geodir_notify_on_listing_edited', $notify_edited, $post ); |
|
| 5067 | + $notify_edited = apply_filters('geodir_notify_on_listing_edited', $notify_edited, $post);
|
|
| 5068 | 5068 | |
| 5069 | - geodir_sendEmail( $from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID ); |
|
| 5069 | + geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID); |
|
| 5070 | 5070 | } |
| 5071 | 5071 | } |
| 5072 | 5072 | } |
@@ -5081,14 +5081,14 @@ discard block |
||
| 5081 | 5081 | * |
| 5082 | 5082 | * @return string|null The current page start & end numbering. |
| 5083 | 5083 | */ |
| 5084 | -function geodir_title_meta_page( $sep ) {
|
|
| 5084 | +function geodir_title_meta_page($sep) {
|
|
| 5085 | 5085 | $replacement = null; |
| 5086 | 5086 | |
| 5087 | - $max = geodir_title_meta_pagenumbering( 'max' ); |
|
| 5088 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); |
|
| 5087 | + $max = geodir_title_meta_pagenumbering('max');
|
|
| 5088 | + $nr = geodir_title_meta_pagenumbering('nr');
|
|
| 5089 | 5089 | |
| 5090 | - if ( $max > 1 && $nr > 1 ) {
|
|
| 5091 | - $replacement = sprintf( $sep . ' ' . __( 'Page %1$d of %2$d', 'geodirectory' ), $nr, $max ); |
|
| 5090 | + if ($max > 1 && $nr > 1) {
|
|
| 5091 | + $replacement = sprintf($sep.' '.__('Page %1$d of %2$d', 'geodirectory'), $nr, $max);
|
|
| 5092 | 5092 | } |
| 5093 | 5093 | |
| 5094 | 5094 | return $replacement; |
@@ -5105,8 +5105,8 @@ discard block |
||
| 5105 | 5105 | function geodir_title_meta_pagenumber() {
|
| 5106 | 5106 | $replacement = null; |
| 5107 | 5107 | |
| 5108 | - $nr = geodir_title_meta_pagenumbering( 'nr' ); |
|
| 5109 | - if ( isset( $nr ) && $nr > 0 ) {
|
|
| 5108 | + $nr = geodir_title_meta_pagenumbering('nr');
|
|
| 5109 | + if (isset($nr) && $nr > 0) {
|
|
| 5110 | 5110 | $replacement = (string) $nr; |
| 5111 | 5111 | } |
| 5112 | 5112 | |
@@ -5124,8 +5124,8 @@ discard block |
||
| 5124 | 5124 | function geodir_title_meta_pagetotal() {
|
| 5125 | 5125 | $replacement = null; |
| 5126 | 5126 | |
| 5127 | - $max = geodir_title_meta_pagenumbering( 'max' ); |
|
| 5128 | - if ( isset( $max ) && $max > 0 ) {
|
|
| 5127 | + $max = geodir_title_meta_pagenumbering('max');
|
|
| 5128 | + if (isset($max) && $max > 0) {
|
|
| 5129 | 5129 | $replacement = (string) $max; |
| 5130 | 5130 | } |
| 5131 | 5131 | |
@@ -5145,36 +5145,36 @@ discard block |
||
| 5145 | 5145 | * |
| 5146 | 5146 | * @return int|null The current page numbering. |
| 5147 | 5147 | */ |
| 5148 | -function geodir_title_meta_pagenumbering( $request = 'nr' ) {
|
|
| 5148 | +function geodir_title_meta_pagenumbering($request = 'nr') {
|
|
| 5149 | 5149 | global $wp_query, $post; |
| 5150 | 5150 | $max_num_pages = null; |
| 5151 | 5151 | $page_number = null; |
| 5152 | 5152 | |
| 5153 | 5153 | $max_num_pages = 1; |
| 5154 | 5154 | |
| 5155 | - if ( ! is_singular() ) {
|
|
| 5156 | - $page_number = get_query_var( 'paged' ); |
|
| 5157 | - if ( $page_number === 0 || $page_number === '' ) {
|
|
| 5155 | + if (!is_singular()) {
|
|
| 5156 | + $page_number = get_query_var('paged');
|
|
| 5157 | + if ($page_number === 0 || $page_number === '') {
|
|
| 5158 | 5158 | $page_number = 1; |
| 5159 | 5159 | } |
| 5160 | 5160 | |
| 5161 | - if ( isset( $wp_query->max_num_pages ) && ( $wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0 ) ) {
|
|
| 5161 | + if (isset($wp_query->max_num_pages) && ($wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0)) {
|
|
| 5162 | 5162 | $max_num_pages = $wp_query->max_num_pages; |
| 5163 | 5163 | } |
| 5164 | 5164 | } else {
|
| 5165 | - $page_number = get_query_var( 'page' ); |
|
| 5166 | - if ( $page_number === 0 || $page_number === '' ) {
|
|
| 5165 | + $page_number = get_query_var('page');
|
|
| 5166 | + if ($page_number === 0 || $page_number === '') {
|
|
| 5167 | 5167 | $page_number = 1; |
| 5168 | 5168 | } |
| 5169 | 5169 | |
| 5170 | - if ( isset( $post->post_content ) ) {
|
|
| 5171 | - $max_num_pages = ( substr_count( $post->post_content, '<!--nextpage-->' ) + 1 ); |
|
| 5170 | + if (isset($post->post_content)) {
|
|
| 5171 | + $max_num_pages = (substr_count($post->post_content, '<!--nextpage-->') + 1); |
|
| 5172 | 5172 | } |
| 5173 | 5173 | } |
| 5174 | 5174 | |
| 5175 | 5175 | $return = null; |
| 5176 | 5176 | |
| 5177 | - switch ( $request ) {
|
|
| 5177 | + switch ($request) {
|
|
| 5178 | 5178 | case 'nr': |
| 5179 | 5179 | $return = $page_number; |
| 5180 | 5180 | break; |
@@ -5195,14 +5195,14 @@ discard block |
||
| 5195 | 5195 | * |
| 5196 | 5196 | * @return array Terms. |
| 5197 | 5197 | */ |
| 5198 | -function geodir_filter_empty_terms( $terms ) {
|
|
| 5199 | - if ( empty( $terms ) ) {
|
|
| 5198 | +function geodir_filter_empty_terms($terms) {
|
|
| 5199 | + if (empty($terms)) {
|
|
| 5200 | 5200 | return $terms; |
| 5201 | 5201 | } |
| 5202 | 5202 | |
| 5203 | 5203 | $return = array(); |
| 5204 | - foreach ( $terms as $term ) {
|
|
| 5205 | - if ( isset( $term->count ) && $term->count > 0 ) {
|
|
| 5204 | + foreach ($terms as $term) {
|
|
| 5205 | + if (isset($term->count) && $term->count > 0) {
|
|
| 5206 | 5206 | $return[] = $term; |
| 5207 | 5207 | } else {
|
| 5208 | 5208 | /** |
@@ -5213,7 +5213,7 @@ discard block |
||
| 5213 | 5213 | * @param array $return The array of terms to return. |
| 5214 | 5214 | * @param object $term The term object. |
| 5215 | 5215 | */ |
| 5216 | - $return = apply_filters( 'geodir_filter_empty_terms_filter', $return, $term ); |
|
| 5216 | + $return = apply_filters('geodir_filter_empty_terms_filter', $return, $term);
|
|
| 5217 | 5217 | } |
| 5218 | 5218 | } |
| 5219 | 5219 | |
@@ -5230,15 +5230,15 @@ discard block |
||
| 5230 | 5230 | * |
| 5231 | 5231 | * @return array |
| 5232 | 5232 | */ |
| 5233 | -function geodir_remove_hentry( $class ) {
|
|
| 5234 | - if ( geodir_is_page( 'detail' ) ) {
|
|
| 5235 | - $class = array_diff( $class, array( 'hentry' ) ); |
|
| 5233 | +function geodir_remove_hentry($class) {
|
|
| 5234 | + if (geodir_is_page('detail')) {
|
|
| 5235 | + $class = array_diff($class, array('hentry'));
|
|
| 5236 | 5236 | } |
| 5237 | 5237 | |
| 5238 | 5238 | return $class; |
| 5239 | 5239 | } |
| 5240 | 5240 | |
| 5241 | -add_filter( 'post_class', 'geodir_remove_hentry' ); |
|
| 5241 | +add_filter('post_class', 'geodir_remove_hentry');
|
|
| 5242 | 5242 | |
| 5243 | 5243 | /** |
| 5244 | 5244 | * Registers a individual text string for WPML translation. |
@@ -5250,8 +5250,8 @@ discard block |
||
| 5250 | 5250 | * @param string $domain The plugin domain. Default geodirectory. |
| 5251 | 5251 | * @param string $name The name of the string which helps to know what's being translated. |
| 5252 | 5252 | */ |
| 5253 | -function geodir_wpml_register_string( $string, $domain = 'geodirectory', $name = '' ) {
|
|
| 5254 | - do_action( 'wpml_register_single_string', $domain, $name, $string ); |
|
| 5253 | +function geodir_wpml_register_string($string, $domain = 'geodirectory', $name = '') {
|
|
| 5254 | + do_action('wpml_register_single_string', $domain, $name, $string);
|
|
| 5255 | 5255 | } |
| 5256 | 5256 | |
| 5257 | 5257 | /** |
@@ -5266,6 +5266,6 @@ discard block |
||
| 5266 | 5266 | * @param string $language_code Return the translation in this language. Default is NULL which returns the current language. |
| 5267 | 5267 | * @return string The translated string. |
| 5268 | 5268 | */ |
| 5269 | -function geodir_wpml_translate_string( $string, $domain = 'geodirectory', $name = '', $language_code = NULL ) {
|
|
| 5270 | - return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code ); |
|
| 5269 | +function geodir_wpml_translate_string($string, $domain = 'geodirectory', $name = '', $language_code = NULL) {
|
|
| 5270 | + return apply_filters('wpml_translate_single_string', $string, $domain, $name, $language_code);
|
|
| 5271 | 5271 | } |
@@ -36,175 +36,175 @@ discard block |
||
| 36 | 36 | */ |
| 37 | 37 | function geodir_templates_scripts() |
| 38 | 38 | {
|
| 39 | - $is_detail_page = false; |
|
| 40 | - $geodir_map_name = geodir_map_name(); |
|
| 39 | + $is_detail_page = false; |
|
| 40 | + $geodir_map_name = geodir_map_name(); |
|
| 41 | 41 | |
| 42 | - if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
|
|
| 43 | - $is_detail_page = true; |
|
| 44 | - } |
|
| 45 | - |
|
| 46 | - wp_enqueue_script('jquery');
|
|
| 47 | - |
|
| 48 | - wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 49 | - wp_enqueue_script('geodirectory-script');
|
|
| 50 | - |
|
| 51 | - $geodir_vars_data = array( |
|
| 52 | - 'siteurl' => get_option('siteurl'),
|
|
| 53 | - 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 54 | - 'geodir_lazy_load' => get_option('geodir_lazy_load',1),
|
|
| 55 | - 'geodir_ajax_url' => geodir_get_ajax_url(), |
|
| 56 | - 'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
|
|
| 57 | - 'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue |
|
| 58 | - ); |
|
| 59 | - |
|
| 60 | - /** |
|
| 61 | - * Filter the `geodir_var` data array that outputs the wp_localize_script() translations and variables. |
|
| 62 | - * |
|
| 63 | - * This is used by addons to add JS translatable variables. |
|
| 64 | - * |
|
| 65 | - * @since 1.4.4 |
|
| 66 | - * @param array $geodir_vars_data {
|
|
| 67 | - * geodir var data used by addons to add JS translatable variables. |
|
| 68 | - * |
|
| 69 | - * @type string $siteurl Site url. |
|
| 70 | - * @type string $geodir_plugin_url Geodirectory core plugin url. |
|
| 71 | - * @type string $geodir_ajax_url Geodirectory plugin ajax url. |
|
| 72 | - * @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?. |
|
| 73 | - * @type int $is_rtl Checks if current locale is RTL. |
|
| 74 | - * |
|
| 75 | - * } |
|
| 76 | - */ |
|
| 77 | - $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
|
|
| 78 | - |
|
| 79 | - wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
|
|
| 80 | - |
|
| 81 | - wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 82 | - if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
|
|
| 83 | - |
|
| 84 | - wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 85 | - wp_enqueue_script('geodirectory-lightbox-jquery');
|
|
| 42 | + if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
|
|
| 43 | + $is_detail_page = true; |
|
| 44 | + } |
|
| 86 | 45 | |
| 87 | - wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 88 | - if ($is_detail_page) {
|
|
| 89 | - wp_enqueue_script('geodirectory-jquery-simplemodal');
|
|
| 90 | - } |
|
| 46 | + wp_enqueue_script('jquery');
|
|
| 47 | + |
|
| 48 | + wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 49 | + wp_enqueue_script('geodirectory-script');
|
|
| 50 | + |
|
| 51 | + $geodir_vars_data = array( |
|
| 52 | + 'siteurl' => get_option('siteurl'),
|
|
| 53 | + 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 54 | + 'geodir_lazy_load' => get_option('geodir_lazy_load',1),
|
|
| 55 | + 'geodir_ajax_url' => geodir_get_ajax_url(), |
|
| 56 | + 'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
|
|
| 57 | + 'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue |
|
| 58 | + ); |
|
| 59 | + |
|
| 60 | + /** |
|
| 61 | + * Filter the `geodir_var` data array that outputs the wp_localize_script() translations and variables. |
|
| 62 | + * |
|
| 63 | + * This is used by addons to add JS translatable variables. |
|
| 64 | + * |
|
| 65 | + * @since 1.4.4 |
|
| 66 | + * @param array $geodir_vars_data {
|
|
| 67 | + * geodir var data used by addons to add JS translatable variables. |
|
| 68 | + * |
|
| 69 | + * @type string $siteurl Site url. |
|
| 70 | + * @type string $geodir_plugin_url Geodirectory core plugin url. |
|
| 71 | + * @type string $geodir_ajax_url Geodirectory plugin ajax url. |
|
| 72 | + * @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?. |
|
| 73 | + * @type int $is_rtl Checks if current locale is RTL. |
|
| 74 | + * |
|
| 75 | + * } |
|
| 76 | + */ |
|
| 77 | + $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
|
|
| 78 | + |
|
| 79 | + wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
|
|
| 80 | + |
|
| 81 | + wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 82 | + if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
|
|
| 83 | + |
|
| 84 | + wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 85 | + wp_enqueue_script('geodirectory-lightbox-jquery');
|
|
| 86 | + |
|
| 87 | + wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 88 | + if ($is_detail_page) {
|
|
| 89 | + wp_enqueue_script('geodirectory-jquery-simplemodal');
|
|
| 90 | + } |
|
| 91 | 91 | |
| 92 | - if (in_array($geodir_map_name, array('auto', 'google'))) {
|
|
| 93 | - $map_lang = "&language=" . geodir_get_map_default_language(); |
|
| 94 | - $map_key = "&key=" . geodir_get_map_api_key(); |
|
| 95 | - /** |
|
| 96 | - * Filter the variables that are added to the end of the google maps script call. |
|
| 97 | - * |
|
| 98 | - * This i used to change things like google maps language etc. |
|
| 99 | - * |
|
| 100 | - * @since 1.0.0 |
|
| 101 | - * @param string $var The string to filter, default is empty string. |
|
| 102 | - */ |
|
| 103 | - $map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
|
| 104 | - wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
|
|
| 92 | + if (in_array($geodir_map_name, array('auto', 'google'))) {
|
|
| 93 | + $map_lang = "&language=" . geodir_get_map_default_language(); |
|
| 94 | + $map_key = "&key=" . geodir_get_map_api_key(); |
|
| 95 | + /** |
|
| 96 | + * Filter the variables that are added to the end of the google maps script call. |
|
| 97 | + * |
|
| 98 | + * This i used to change things like google maps language etc. |
|
| 99 | + * |
|
| 100 | + * @since 1.0.0 |
|
| 101 | + * @param string $var The string to filter, default is empty string. |
|
| 102 | + */ |
|
| 103 | + $map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
|
| 104 | + wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
|
|
| 105 | 105 | |
| 106 | - // Overlapping Marker Spiderfier |
|
| 107 | - wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 108 | - wp_enqueue_script('geodirectory-g-overlappingmarker-script');
|
|
| 109 | - } |
|
| 106 | + // Overlapping Marker Spiderfier |
|
| 107 | + wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 108 | + wp_enqueue_script('geodirectory-g-overlappingmarker-script');
|
|
| 109 | + } |
|
| 110 | 110 | |
| 111 | - if ($geodir_map_name == 'osm') {
|
|
| 112 | - // Leaflet OpenStreetMap |
|
| 113 | - wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 114 | - wp_enqueue_style('geodirectory-leaflet-style');
|
|
| 111 | + if ($geodir_map_name == 'osm') {
|
|
| 112 | + // Leaflet OpenStreetMap |
|
| 113 | + wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 114 | + wp_enqueue_style('geodirectory-leaflet-style');
|
|
| 115 | 115 | |
| 116 | - wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 117 | - wp_enqueue_script('geodirectory-leaflet-script');
|
|
| 116 | + wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 117 | + wp_enqueue_script('geodirectory-leaflet-script');
|
|
| 118 | 118 | |
| 119 | - wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 120 | - wp_enqueue_script('geodirectory-leaflet-geo-script');
|
|
| 119 | + wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 120 | + wp_enqueue_script('geodirectory-leaflet-geo-script');
|
|
| 121 | 121 | |
| 122 | - if ($is_detail_page) {
|
|
| 123 | - wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
|
|
| 124 | - wp_enqueue_style('geodirectory-leaflet-routing-style');
|
|
| 122 | + if ($is_detail_page) {
|
|
| 123 | + wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
|
|
| 124 | + wp_enqueue_style('geodirectory-leaflet-routing-style');
|
|
| 125 | 125 | |
| 126 | - wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 127 | - wp_enqueue_script('geodirectory-leaflet-routing-script');
|
|
| 128 | - } |
|
| 126 | + wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 127 | + wp_enqueue_script('geodirectory-leaflet-routing-script');
|
|
| 128 | + } |
|
| 129 | 129 | |
| 130 | - // Overlapping Marker Spiderfier Leaflet |
|
| 131 | - wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 132 | - wp_enqueue_script('geodirectory-o-overlappingmarker-script');
|
|
| 133 | - } |
|
| 134 | - wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 130 | + // Overlapping Marker Spiderfier Leaflet |
|
| 131 | + wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 132 | + wp_enqueue_script('geodirectory-o-overlappingmarker-script');
|
|
| 133 | + } |
|
| 134 | + wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 135 | 135 | |
| 136 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 137 | - wp_enqueue_script('geodirectory-goMap-script');
|
|
| 138 | - |
|
| 139 | - wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 140 | - wp_enqueue_script('chosen');
|
|
| 141 | - |
|
| 142 | - wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 143 | - wp_enqueue_script('geodirectory-choose-ajax');
|
|
| 144 | - |
|
| 145 | - wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
|
|
| 146 | - |
|
| 147 | - if (is_page() && geodir_is_page('add-listing')) {
|
|
| 148 | - // SCRIPT FOR UPLOAD |
|
| 149 | - wp_enqueue_script('plupload-all');
|
|
| 150 | - wp_enqueue_script('jquery-ui-sortable');
|
|
| 151 | - |
|
| 152 | - wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
|
|
| 153 | - wp_enqueue_script('geodirectory-plupload-script');
|
|
| 154 | - // SCRIPT FOR UPLOAD END |
|
| 155 | - |
|
| 156 | - // check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls |
|
| 157 | - if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 158 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 159 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 160 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 161 | - } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 162 | - $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 163 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 164 | - $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 165 | - } else {
|
|
| 166 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 167 | - } |
|
| 136 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 137 | + wp_enqueue_script('geodirectory-goMap-script');
|
|
| 138 | + |
|
| 139 | + wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 140 | + wp_enqueue_script('chosen');
|
|
| 141 | + |
|
| 142 | + wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 143 | + wp_enqueue_script('geodirectory-choose-ajax');
|
|
| 144 | + |
|
| 145 | + wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
|
|
| 146 | + |
|
| 147 | + if (is_page() && geodir_is_page('add-listing')) {
|
|
| 148 | + // SCRIPT FOR UPLOAD |
|
| 149 | + wp_enqueue_script('plupload-all');
|
|
| 150 | + wp_enqueue_script('jquery-ui-sortable');
|
|
| 151 | + |
|
| 152 | + wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
|
|
| 153 | + wp_enqueue_script('geodirectory-plupload-script');
|
|
| 154 | + // SCRIPT FOR UPLOAD END |
|
| 155 | + |
|
| 156 | + // check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls |
|
| 157 | + if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 158 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 159 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 160 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 161 | + } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 162 | + $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 163 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 164 | + $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 165 | + } else {
|
|
| 166 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 167 | + } |
|
| 168 | 168 | |
| 169 | - // place js config array for plupload |
|
| 170 | - $plupload_init = array( |
|
| 171 | - 'runtimes' => 'html5,silverlight,flash,browserplus,gears,html4', |
|
| 172 | - 'browse_button' => 'plupload-browse-button', // will be adjusted per uploader |
|
| 173 | - 'container' => 'plupload-upload-ui', // will be adjusted per uploader |
|
| 174 | - 'drop_element' => 'dropbox', // will be adjusted per uploader |
|
| 175 | - 'file_data_name' => 'async-upload', // will be adjusted per uploader |
|
| 176 | - 'multiple_queues' => true, |
|
| 177 | - 'max_file_size' => geodir_max_upload_size(), |
|
| 178 | - 'url' => $ajax_url, |
|
| 179 | - 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
|
|
| 180 | - 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
|
|
| 181 | - 'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
|
|
| 182 | - 'multipart' => true, |
|
| 183 | - 'urlstream_upload' => true, |
|
| 184 | - 'multi_selection' => false, // will be added per uploader |
|
| 185 | - // additional post data to send to our ajax hook |
|
| 186 | - 'multipart_params' => array( |
|
| 187 | - '_ajax_nonce' => "", // will be added per uploader |
|
| 188 | - 'action' => 'plupload_action', // the ajax action name |
|
| 189 | - 'imgid' => 0 // will be added per uploader |
|
| 190 | - ) |
|
| 191 | - ); |
|
| 192 | - $base_plupload_config = json_encode($plupload_init); |
|
| 193 | - |
|
| 194 | - $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
|
|
| 195 | - 'upload_img_size' => geodir_max_upload_size()); |
|
| 196 | - |
|
| 197 | - wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
|
| 198 | - |
|
| 199 | - wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
|
|
| 200 | - } // End if for add place page |
|
| 201 | - |
|
| 202 | - wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 203 | - if ($is_detail_page) {
|
|
| 169 | + // place js config array for plupload |
|
| 170 | + $plupload_init = array( |
|
| 171 | + 'runtimes' => 'html5,silverlight,flash,browserplus,gears,html4', |
|
| 172 | + 'browse_button' => 'plupload-browse-button', // will be adjusted per uploader |
|
| 173 | + 'container' => 'plupload-upload-ui', // will be adjusted per uploader |
|
| 174 | + 'drop_element' => 'dropbox', // will be adjusted per uploader |
|
| 175 | + 'file_data_name' => 'async-upload', // will be adjusted per uploader |
|
| 176 | + 'multiple_queues' => true, |
|
| 177 | + 'max_file_size' => geodir_max_upload_size(), |
|
| 178 | + 'url' => $ajax_url, |
|
| 179 | + 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
|
|
| 180 | + 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
|
|
| 181 | + 'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
|
|
| 182 | + 'multipart' => true, |
|
| 183 | + 'urlstream_upload' => true, |
|
| 184 | + 'multi_selection' => false, // will be added per uploader |
|
| 185 | + // additional post data to send to our ajax hook |
|
| 186 | + 'multipart_params' => array( |
|
| 187 | + '_ajax_nonce' => "", // will be added per uploader |
|
| 188 | + 'action' => 'plupload_action', // the ajax action name |
|
| 189 | + 'imgid' => 0 // will be added per uploader |
|
| 190 | + ) |
|
| 191 | + ); |
|
| 192 | + $base_plupload_config = json_encode($plupload_init); |
|
| 193 | + |
|
| 194 | + $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
|
|
| 195 | + 'upload_img_size' => geodir_max_upload_size()); |
|
| 196 | + |
|
| 197 | + wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
|
| 198 | + |
|
| 199 | + wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
|
|
| 200 | + } // End if for add place page |
|
| 201 | + |
|
| 202 | + wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 203 | + if ($is_detail_page) {
|
|
| 204 | 204 | wp_enqueue_script('geodirectory-post-custom-js');
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | - // font awesome rating script |
|
| 207 | + // font awesome rating script |
|
| 208 | 208 | if (get_option('geodir_reviewrating_enable_font_awesome')) {
|
| 209 | 209 | wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);
|
| 210 | 210 | wp_enqueue_script('geodir-barrating-js');
|
@@ -213,11 +213,11 @@ discard block |
||
| 213 | 213 | wp_enqueue_script('geodir-jRating-js');
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | - wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 217 | - wp_enqueue_script('geodir-on-document-load');
|
|
| 216 | + wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 217 | + wp_enqueue_script('geodir-on-document-load');
|
|
| 218 | 218 | |
| 219 | - wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 220 | - wp_enqueue_script('google-geometa');
|
|
| 219 | + wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 220 | + wp_enqueue_script('google-geometa');
|
|
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | /** |
@@ -231,8 +231,8 @@ discard block |
||
| 231 | 231 | */ |
| 232 | 232 | function geodir_header_scripts() |
| 233 | 233 | {
|
| 234 | - echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';
|
|
| 235 | - echo stripslashes(get_option('geodir_header_scripts'));
|
|
| 234 | + echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';
|
|
| 235 | + echo stripslashes(get_option('geodir_header_scripts'));
|
|
| 236 | 236 | } |
| 237 | 237 | |
| 238 | 238 | /** |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | */ |
| 246 | 246 | function geodir_google_analytics_tracking_code() |
| 247 | 247 | {
|
| 248 | - if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
|
|
| 248 | + if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
|
|
| 249 | 249 | |
| 250 | 250 | <script> |
| 251 | 251 | (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
@@ -260,9 +260,9 @@ discard block |
||
| 260 | 260 | </script> |
| 261 | 261 | |
| 262 | 262 | <?php |
| 263 | - }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
|
|
| 264 | - echo stripslashes(get_option('geodir_ga_tracking_code'));
|
|
| 265 | - } |
|
| 263 | + }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
|
|
| 264 | + echo stripslashes(get_option('geodir_ga_tracking_code'));
|
|
| 265 | + } |
|
| 266 | 266 | } |
| 267 | 267 | |
| 268 | 268 | /** |
@@ -276,16 +276,16 @@ discard block |
||
| 276 | 276 | function geodir_footer_scripts() |
| 277 | 277 | {
|
| 278 | 278 | |
| 279 | - echo stripslashes(get_option('geodir_footer_scripts'));
|
|
| 279 | + echo stripslashes(get_option('geodir_footer_scripts'));
|
|
| 280 | 280 | |
| 281 | - /* |
|
| 281 | + /* |
|
| 282 | 282 | * Apple suck and can't/won't fix bugs: https://bugs.webkit.org/show_bug.cgi?id=136041 |
| 283 | 283 | * |
| 284 | 284 | * Flexbox wont wrap on ios for search form items |
| 285 | 285 | */ |
| 286 | - if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
|
|
| 287 | - echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
|
|
| 288 | - } |
|
| 286 | + if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
|
|
| 287 | + echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
|
|
| 288 | + } |
|
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | |
@@ -299,12 +299,12 @@ discard block |
||
| 299 | 299 | */ |
| 300 | 300 | function geodir_add_async_forscript($url) |
| 301 | 301 | {
|
| 302 | - if (strpos($url, '#asyncload')===false) |
|
| 303 | - return $url; |
|
| 304 | - else if (is_admin()) |
|
| 305 | - return str_replace('#asyncload', '', $url);
|
|
| 306 | - else |
|
| 307 | - return str_replace('#asyncload', '', $url)."' async='async";
|
|
| 302 | + if (strpos($url, '#asyncload')===false) |
|
| 303 | + return $url; |
|
| 304 | + else if (is_admin()) |
|
| 305 | + return str_replace('#asyncload', '', $url);
|
|
| 306 | + else |
|
| 307 | + return str_replace('#asyncload', '', $url)."' async='async";
|
|
| 308 | 308 | } |
| 309 | 309 | add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);
|
| 310 | 310 | |
@@ -317,17 +317,17 @@ discard block |
||
| 317 | 317 | function geodir_templates_styles() |
| 318 | 318 | {
|
| 319 | 319 | |
| 320 | - wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 321 | - wp_enqueue_style('geodir-core-scss');
|
|
| 322 | - wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
|
|
| 320 | + wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 321 | + wp_enqueue_style('geodir-core-scss');
|
|
| 322 | + wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
|
|
| 323 | 323 | |
| 324 | - if(is_rtl()){
|
|
| 325 | - wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 326 | - wp_enqueue_style('geodirectory-frontend-rtl-style');
|
|
| 327 | - } |
|
| 324 | + if(is_rtl()){
|
|
| 325 | + wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 326 | + wp_enqueue_style('geodirectory-frontend-rtl-style');
|
|
| 327 | + } |
|
| 328 | 328 | |
| 329 | - wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
|
|
| 330 | - wp_enqueue_style('font-awesome');
|
|
| 329 | + wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
|
|
| 330 | + wp_enqueue_style('font-awesome');
|
|
| 331 | 331 | |
| 332 | 332 | |
| 333 | 333 | } |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | */ |
| 342 | 342 | function geodir_get_sidebar() |
| 343 | 343 | {
|
| 344 | - get_sidebar('geodirectory');
|
|
| 344 | + get_sidebar('geodirectory');
|
|
| 345 | 345 | } |
| 346 | 346 | |
| 347 | 347 | /** |
@@ -360,122 +360,122 @@ discard block |
||
| 360 | 360 | * @param bool $always_show Do you want to show the pagination always? Default: false. |
| 361 | 361 | */ |
| 362 | 362 | function geodir_pagination($before = '', $after = '', $prelabel = '', $nxtlabel = '', $pages_to_show = 5, $always_show = false) {
|
| 363 | - global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id; |
|
| 363 | + global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id; |
|
| 364 | 364 | |
| 365 | - if (empty($prelabel)) {
|
|
| 366 | - $prelabel = '<strong><</strong>'; |
|
| 367 | - } |
|
| 365 | + if (empty($prelabel)) {
|
|
| 366 | + $prelabel = '<strong><</strong>'; |
|
| 367 | + } |
|
| 368 | 368 | |
| 369 | - if (empty($nxtlabel)) {
|
|
| 370 | - $nxtlabel = '<strong>></strong>'; |
|
| 371 | - } |
|
| 369 | + if (empty($nxtlabel)) {
|
|
| 370 | + $nxtlabel = '<strong>></strong>'; |
|
| 371 | + } |
|
| 372 | 372 | |
| 373 | - $half_pages_to_show = round($pages_to_show / 2); |
|
| 373 | + $half_pages_to_show = round($pages_to_show / 2); |
|
| 374 | 374 | |
| 375 | - if (geodir_is_page('home')) // dont apply default pagination for geodirectory home page.
|
|
| 376 | - return; |
|
| 375 | + if (geodir_is_page('home')) // dont apply default pagination for geodirectory home page.
|
|
| 376 | + return; |
|
| 377 | 377 | |
| 378 | - if (!is_single()) {
|
|
| 379 | - if (function_exists('geodir_location_geo_home_link')) {
|
|
| 380 | - remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 381 | - } |
|
| 382 | - $numposts = $wp_query->found_posts; |
|
| 378 | + if (!is_single()) {
|
|
| 379 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 380 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
|
|
| 381 | + } |
|
| 382 | + $numposts = $wp_query->found_posts; |
|
| 383 | 383 | |
| 384 | - $max_page = ceil($numposts / $posts_per_page); |
|
| 384 | + $max_page = ceil($numposts / $posts_per_page); |
|
| 385 | 385 | |
| 386 | - if (empty($paged)) {
|
|
| 387 | - $paged = 1; |
|
| 388 | - } |
|
| 386 | + if (empty($paged)) {
|
|
| 387 | + $paged = 1; |
|
| 388 | + } |
|
| 389 | 389 | |
| 390 | - $post_type = geodir_get_current_posttype(); |
|
| 391 | - $listing_type_name = get_post_type_plural_label($post_type); |
|
| 392 | - if (geodir_is_page('listing') || geodir_is_page('search')) {
|
|
| 393 | - $term = array(); |
|
| 390 | + $post_type = geodir_get_current_posttype(); |
|
| 391 | + $listing_type_name = get_post_type_plural_label($post_type); |
|
| 392 | + if (geodir_is_page('listing') || geodir_is_page('search')) {
|
|
| 393 | + $term = array(); |
|
| 394 | 394 | |
| 395 | - if (is_tax()) {
|
|
| 396 | - $term_id = get_queried_object_id(); |
|
| 397 | - $taxonomy = get_query_var('taxonomy');
|
|
| 395 | + if (is_tax()) {
|
|
| 396 | + $term_id = get_queried_object_id(); |
|
| 397 | + $taxonomy = get_query_var('taxonomy');
|
|
| 398 | 398 | |
| 399 | - if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
|
|
| 400 | - $term = get_term($term_id, $post_type . 'category'); |
|
| 401 | - } |
|
| 402 | - } |
|
| 399 | + if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
|
|
| 400 | + $term = get_term($term_id, $post_type . 'category'); |
|
| 401 | + } |
|
| 402 | + } |
|
| 403 | 403 | |
| 404 | - if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
|
|
| 405 | - $taxonomy_search = $_REQUEST['s' . $post_type . 'category']; |
|
| 404 | + if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
|
|
| 405 | + $taxonomy_search = $_REQUEST['s' . $post_type . 'category']; |
|
| 406 | 406 | |
| 407 | - if (!is_array($taxonomy_search)) {
|
|
| 408 | - $term = get_term((int)$taxonomy_search, $post_type . 'category'); |
|
| 409 | - } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
|
|
| 410 | - $term = get_term((int)$taxonomy_search[0], $post_type . 'category'); |
|
| 411 | - } |
|
| 412 | - } |
|
| 407 | + if (!is_array($taxonomy_search)) {
|
|
| 408 | + $term = get_term((int)$taxonomy_search, $post_type . 'category'); |
|
| 409 | + } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
|
|
| 410 | + $term = get_term((int)$taxonomy_search[0], $post_type . 'category'); |
|
| 411 | + } |
|
| 412 | + } |
|
| 413 | 413 | |
| 414 | - if (!empty($term) && !is_wp_error($term)) {
|
|
| 415 | - $listing_type_name = $term->name; |
|
| 416 | - } |
|
| 417 | - } |
|
| 414 | + if (!empty($term) && !is_wp_error($term)) {
|
|
| 415 | + $listing_type_name = $term->name; |
|
| 416 | + } |
|
| 417 | + } |
|
| 418 | 418 | |
| 419 | - if ($max_page > 1 || $always_show) {
|
|
| 420 | - // Extra pagination info |
|
| 421 | - $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
|
|
| 422 | - $start_no = ( $paged - 1 ) * $posts_per_page + 1; |
|
| 423 | - $end_no = min($paged * $posts_per_page, $numposts); |
|
| 419 | + if ($max_page > 1 || $always_show) {
|
|
| 420 | + // Extra pagination info |
|
| 421 | + $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
|
|
| 422 | + $start_no = ( $paged - 1 ) * $posts_per_page + 1; |
|
| 423 | + $end_no = min($paged * $posts_per_page, $numposts); |
|
| 424 | 424 | |
| 425 | - if ($geodir_pagination_more_info != '') {
|
|
| 426 | - if ($listing_type_name) {
|
|
| 427 | - $listing_type_name = __($listing_type_name, 'geodirectory'); |
|
| 428 | - $pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);
|
|
| 429 | - } else {
|
|
| 430 | - $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
|
|
| 431 | - } |
|
| 432 | - $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>'; |
|
| 433 | - /** |
|
| 434 | - * Adds an extra pagination info above/under pagination. |
|
| 435 | - * |
|
| 436 | - * @since 1.5.9 |
|
| 437 | - * |
|
| 438 | - * @param string $pagination_info Extra pagination info content. |
|
| 439 | - * @param string $listing_type_name Listing results type. |
|
| 440 | - * @param string $start_no First result number. |
|
| 441 | - * @param string $end_no Last result number. |
|
| 442 | - * @param string $numposts Total number of listings. |
|
| 443 | - * @param string $post_type The post type. |
|
| 444 | - */ |
|
| 445 | - $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
|
|
| 425 | + if ($geodir_pagination_more_info != '') {
|
|
| 426 | + if ($listing_type_name) {
|
|
| 427 | + $listing_type_name = __($listing_type_name, 'geodirectory'); |
|
| 428 | + $pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);
|
|
| 429 | + } else {
|
|
| 430 | + $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
|
|
| 431 | + } |
|
| 432 | + $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>'; |
|
| 433 | + /** |
|
| 434 | + * Adds an extra pagination info above/under pagination. |
|
| 435 | + * |
|
| 436 | + * @since 1.5.9 |
|
| 437 | + * |
|
| 438 | + * @param string $pagination_info Extra pagination info content. |
|
| 439 | + * @param string $listing_type_name Listing results type. |
|
| 440 | + * @param string $start_no First result number. |
|
| 441 | + * @param string $end_no Last result number. |
|
| 442 | + * @param string $numposts Total number of listings. |
|
| 443 | + * @param string $post_type The post type. |
|
| 444 | + */ |
|
| 445 | + $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
|
|
| 446 | 446 | |
| 447 | - if ($geodir_pagination_more_info == 'before') {
|
|
| 448 | - $before = $before . $pagination_info; |
|
| 449 | - } else if ($geodir_pagination_more_info == 'after') {
|
|
| 450 | - $after = $pagination_info . $after; |
|
| 451 | - } |
|
| 452 | - } |
|
| 447 | + if ($geodir_pagination_more_info == 'before') {
|
|
| 448 | + $before = $before . $pagination_info; |
|
| 449 | + } else if ($geodir_pagination_more_info == 'after') {
|
|
| 450 | + $after = $pagination_info . $after; |
|
| 451 | + } |
|
| 452 | + } |
|
| 453 | 453 | |
| 454 | - echo "$before <div class='Navi gd-navi'>"; |
|
| 455 | - if ($paged >= ($pages_to_show - 1)) {
|
|
| 456 | - echo '<a href="' . str_replace('&paged', '&paged', get_pagenum_link()) . '">«</a>';
|
|
| 457 | - } |
|
| 458 | - previous_posts_link($prelabel); |
|
| 459 | - for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {
|
|
| 460 | - if ($i >= 1 && $i <= $max_page) {
|
|
| 461 | - if ($i == $paged) {
|
|
| 462 | - echo "<strong class='on'>$i</strong>"; |
|
| 463 | - } else {
|
|
| 464 | - echo ' <a href="' . str_replace('&paged', '&paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
|
|
| 465 | - } |
|
| 466 | - } |
|
| 467 | - } |
|
| 468 | - next_posts_link($nxtlabel, $max_page); |
|
| 469 | - if (($paged + $half_pages_to_show) < ($max_page)) {
|
|
| 470 | - echo '<a href="' . str_replace('&paged', '&paged', get_pagenum_link($max_page)) . '">»</a>';
|
|
| 471 | - } |
|
| 472 | - echo "</div> $after"; |
|
| 473 | - } |
|
| 454 | + echo "$before <div class='Navi gd-navi'>"; |
|
| 455 | + if ($paged >= ($pages_to_show - 1)) {
|
|
| 456 | + echo '<a href="' . str_replace('&paged', '&paged', get_pagenum_link()) . '">«</a>';
|
|
| 457 | + } |
|
| 458 | + previous_posts_link($prelabel); |
|
| 459 | + for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {
|
|
| 460 | + if ($i >= 1 && $i <= $max_page) {
|
|
| 461 | + if ($i == $paged) {
|
|
| 462 | + echo "<strong class='on'>$i</strong>"; |
|
| 463 | + } else {
|
|
| 464 | + echo ' <a href="' . str_replace('&paged', '&paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
|
|
| 465 | + } |
|
| 466 | + } |
|
| 467 | + } |
|
| 468 | + next_posts_link($nxtlabel, $max_page); |
|
| 469 | + if (($paged + $half_pages_to_show) < ($max_page)) {
|
|
| 470 | + echo '<a href="' . str_replace('&paged', '&paged', get_pagenum_link($max_page)) . '">»</a>';
|
|
| 471 | + } |
|
| 472 | + echo "</div> $after"; |
|
| 473 | + } |
|
| 474 | 474 | |
| 475 | - if (function_exists('geodir_location_geo_home_link')) {
|
|
| 476 | - add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 477 | - } |
|
| 478 | - } |
|
| 475 | + if (function_exists('geodir_location_geo_home_link')) {
|
|
| 476 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
|
|
| 477 | + } |
|
| 478 | + } |
|
| 479 | 479 | } |
| 480 | 480 | |
| 481 | 481 | /** |
@@ -486,20 +486,20 @@ discard block |
||
| 486 | 486 | */ |
| 487 | 487 | function geodir_listingsearch_scripts() |
| 488 | 488 | {
|
| 489 | - if (get_option('gd_search_dist') != '') {
|
|
| 490 | - $dist = get_option('gd_search_dist');
|
|
| 491 | - } else {
|
|
| 492 | - $dist = 500; |
|
| 493 | - } |
|
| 494 | - $dist_dif = 1000; |
|
| 495 | - |
|
| 496 | - if ($dist <= 5000) $dist_dif = 500; |
|
| 497 | - if ($dist <= 1000) $dist_dif = 100; |
|
| 498 | - if ($dist <= 500) $dist_dif = 50; |
|
| 499 | - if ($dist <= 100) $dist_dif = 10; |
|
| 500 | - if ($dist <= 50) $dist_dif = 5; |
|
| 501 | - |
|
| 502 | - ?> |
|
| 489 | + if (get_option('gd_search_dist') != '') {
|
|
| 490 | + $dist = get_option('gd_search_dist');
|
|
| 491 | + } else {
|
|
| 492 | + $dist = 500; |
|
| 493 | + } |
|
| 494 | + $dist_dif = 1000; |
|
| 495 | + |
|
| 496 | + if ($dist <= 5000) $dist_dif = 500; |
|
| 497 | + if ($dist <= 1000) $dist_dif = 100; |
|
| 498 | + if ($dist <= 500) $dist_dif = 50; |
|
| 499 | + if ($dist <= 100) $dist_dif = 10; |
|
| 500 | + if ($dist <= 50) $dist_dif = 5; |
|
| 501 | + |
|
| 502 | + ?> |
|
| 503 | 503 | <script type="text/javascript"> |
| 504 | 504 | |
| 505 | 505 | jQuery(function ($) {
|
@@ -557,20 +557,20 @@ discard block |
||
| 557 | 557 | * @package GeoDirectory |
| 558 | 558 | */ |
| 559 | 559 | function geodir_add_sharelocation_scripts() {
|
| 560 | - $default_search_for_text = SEARCH_FOR_TEXT; |
|
| 561 | - if (get_option('geodir_search_field_default_text'))
|
|
| 562 | - $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
|
|
| 560 | + $default_search_for_text = SEARCH_FOR_TEXT; |
|
| 561 | + if (get_option('geodir_search_field_default_text'))
|
|
| 562 | + $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
|
|
| 563 | 563 | |
| 564 | - $default_near_text = NEAR_TEXT; |
|
| 565 | - if (get_option('geodir_near_field_default_text'))
|
|
| 566 | - $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
|
|
| 564 | + $default_near_text = NEAR_TEXT; |
|
| 565 | + if (get_option('geodir_near_field_default_text'))
|
|
| 566 | + $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
|
|
| 567 | 567 | |
| 568 | - $search_location = geodir_get_default_location(); |
|
| 568 | + $search_location = geodir_get_default_location(); |
|
| 569 | 569 | |
| 570 | - $default_search_for_text = addslashes(stripslashes($default_search_for_text)); |
|
| 571 | - $default_near_text = addslashes(stripslashes($default_near_text)); |
|
| 572 | - $city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : ''; |
|
| 573 | - ?> |
|
| 570 | + $default_search_for_text = addslashes(stripslashes($default_search_for_text)); |
|
| 571 | + $default_near_text = addslashes(stripslashes($default_near_text)); |
|
| 572 | + $city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : ''; |
|
| 573 | + ?> |
|
| 574 | 574 | <script type="text/javascript"> |
| 575 | 575 | var default_location = '<?php echo $city ;?>'; |
| 576 | 576 | var latlng; |
@@ -651,14 +651,14 @@ discard block |
||
| 651 | 651 | initialise2(); |
| 652 | 652 | } else {
|
| 653 | 653 | <?php |
| 654 | - $near_add = get_option('geodir_search_near_addition');
|
|
| 655 | - /** |
|
| 656 | - * Adds any extra info to the near search box query when trying to geolocate it via google api. |
|
| 657 | - * |
|
| 658 | - * @since 1.0.0 |
|
| 659 | - */ |
|
| 660 | - $near_add2 = apply_filters('geodir_search_near_addition', '');
|
|
| 661 | - ?> |
|
| 654 | + $near_add = get_option('geodir_search_near_addition');
|
|
| 655 | + /** |
|
| 656 | + * Adds any extra info to the near search box query when trying to geolocate it via google api. |
|
| 657 | + * |
|
| 658 | + * @since 1.0.0 |
|
| 659 | + */ |
|
| 660 | + $near_add2 = apply_filters('geodir_search_near_addition', '');
|
|
| 661 | + ?> |
|
| 662 | 662 | if (window.gdMaps === 'google') {
|
| 663 | 663 | Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},
|
| 664 | 664 | function (results, status) {
|
@@ -772,32 +772,32 @@ discard block |
||
| 772 | 772 | */ |
| 773 | 773 | function geodir_show_badges_on_image($which, $post, $link) |
| 774 | 774 | {
|
| 775 | - $return = ''; |
|
| 776 | - switch ($which) {
|
|
| 777 | - case 'featured': |
|
| 778 | - /** |
|
| 779 | - * Filter the featured image badge html that appears in the listings pages over the thumbnail. |
|
| 780 | - * |
|
| 781 | - * @since 1.0.0 |
|
| 782 | - * @param object $post The post object. |
|
| 783 | - * @param string $link The link to the post. |
|
| 784 | - */ |
|
| 785 | - $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img"> </span></a>',$post,$link);
|
|
| 786 | - break; |
|
| 787 | - case 'new' : |
|
| 788 | - /** |
|
| 789 | - * Filter the new image badge html that appears in the listings pages over the thumbnail. |
|
| 790 | - * |
|
| 791 | - * @since 1.0.0 |
|
| 792 | - * @param object $post The post object. |
|
| 793 | - * @param string $link The link to the post. |
|
| 794 | - */ |
|
| 795 | - $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing"> </span></a>',$post,$link);
|
|
| 796 | - break; |
|
| 797 | - |
|
| 798 | - } |
|
| 775 | + $return = ''; |
|
| 776 | + switch ($which) {
|
|
| 777 | + case 'featured': |
|
| 778 | + /** |
|
| 779 | + * Filter the featured image badge html that appears in the listings pages over the thumbnail. |
|
| 780 | + * |
|
| 781 | + * @since 1.0.0 |
|
| 782 | + * @param object $post The post object. |
|
| 783 | + * @param string $link The link to the post. |
|
| 784 | + */ |
|
| 785 | + $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img"> </span></a>',$post,$link);
|
|
| 786 | + break; |
|
| 787 | + case 'new' : |
|
| 788 | + /** |
|
| 789 | + * Filter the new image badge html that appears in the listings pages over the thumbnail. |
|
| 790 | + * |
|
| 791 | + * @since 1.0.0 |
|
| 792 | + * @param object $post The post object. |
|
| 793 | + * @param string $link The link to the post. |
|
| 794 | + */ |
|
| 795 | + $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing"> </span></a>',$post,$link);
|
|
| 796 | + break; |
|
| 797 | + |
|
| 798 | + } |
|
| 799 | 799 | |
| 800 | - return $return; |
|
| 800 | + return $return; |
|
| 801 | 801 | } |
| 802 | 802 | |
| 803 | 803 | /** |
@@ -806,8 +806,8 @@ discard block |
||
| 806 | 806 | * @since 1.6.22 |
| 807 | 807 | */ |
| 808 | 808 | function geodir_fix_script_conflict() {
|
| 809 | - if ( wp_script_is( 'flexslider', 'enqueued' ) && wp_script_is( 'geodirectory-jquery-flexslider-js', 'enqueued' ) ) {
|
|
| 810 | - wp_dequeue_script( 'flexslider' ); |
|
| 811 | - } |
|
| 809 | + if ( wp_script_is( 'flexslider', 'enqueued' ) && wp_script_is( 'geodirectory-jquery-flexslider-js', 'enqueued' ) ) {
|
|
| 810 | + wp_dequeue_script( 'flexslider' ); |
|
| 811 | + } |
|
| 812 | 812 | } |
| 813 | 813 | add_action( 'wp_enqueue_scripts', 'geodir_fix_script_conflict', 100 ); |
| 814 | 814 | \ No newline at end of file |
@@ -39,21 +39,21 @@ discard block |
||
| 39 | 39 | $is_detail_page = false; |
| 40 | 40 | $geodir_map_name = geodir_map_name(); |
| 41 | 41 | |
| 42 | - if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
|
|
| 42 | + if ((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview'))) {
|
|
| 43 | 43 | $is_detail_page = true; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | wp_enqueue_script('jquery');
|
| 47 | 47 | |
| 48 | - wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 48 | + wp_register_script('geodirectory-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 49 | 49 | wp_enqueue_script('geodirectory-script');
|
| 50 | 50 | |
| 51 | 51 | $geodir_vars_data = array( |
| 52 | 52 | 'siteurl' => get_option('siteurl'),
|
| 53 | 53 | 'geodir_plugin_url' => geodir_plugin_url(), |
| 54 | - 'geodir_lazy_load' => get_option('geodir_lazy_load',1),
|
|
| 54 | + 'geodir_lazy_load' => get_option('geodir_lazy_load', 1),
|
|
| 55 | 55 | 'geodir_ajax_url' => geodir_get_ajax_url(), |
| 56 | - 'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
|
|
| 56 | + 'geodir_gd_modal' => (int) get_option('geodir_disable_gb_modal'),
|
|
| 57 | 57 | 'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue |
| 58 | 58 | ); |
| 59 | 59 | |
@@ -74,24 +74,24 @@ discard block |
||
| 74 | 74 | * |
| 75 | 75 | * } |
| 76 | 76 | */ |
| 77 | - $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
|
|
| 77 | + $geodir_vars_data = apply_filters('geodir_vars_data', $geodir_vars_data);
|
|
| 78 | 78 | |
| 79 | 79 | wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
|
| 80 | 80 | |
| 81 | - wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 82 | - if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
|
|
| 81 | + wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 82 | + if ($is_detail_page) {wp_enqueue_script('geodirectory-jquery-flexslider-js'); }
|
|
| 83 | 83 | |
| 84 | - wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 84 | + wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url().'/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 85 | 85 | wp_enqueue_script('geodirectory-lightbox-jquery');
|
| 86 | 86 | |
| 87 | - wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 87 | + wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url().'/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 88 | 88 | if ($is_detail_page) {
|
| 89 | 89 | wp_enqueue_script('geodirectory-jquery-simplemodal');
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | if (in_array($geodir_map_name, array('auto', 'google'))) {
|
| 93 | - $map_lang = "&language=" . geodir_get_map_default_language(); |
|
| 94 | - $map_key = "&key=" . geodir_get_map_api_key(); |
|
| 93 | + $map_lang = "&language=".geodir_get_map_default_language(); |
|
| 94 | + $map_key = "&key=".geodir_get_map_api_key(); |
|
| 95 | 95 | /** |
| 96 | 96 | * Filter the variables that are added to the end of the google maps script call. |
| 97 | 97 | * |
@@ -101,55 +101,55 @@ discard block |
||
| 101 | 101 | * @param string $var The string to filter, default is empty string. |
| 102 | 102 | */ |
| 103 | 103 | $map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
| 104 | - wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
|
|
| 104 | + wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);
|
|
| 105 | 105 | |
| 106 | 106 | // Overlapping Marker Spiderfier |
| 107 | - wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 107 | + wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 108 | 108 | wp_enqueue_script('geodirectory-g-overlappingmarker-script');
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | if ($geodir_map_name == 'osm') {
|
| 112 | 112 | // Leaflet OpenStreetMap |
| 113 | - wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 113 | + wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 114 | 114 | wp_enqueue_style('geodirectory-leaflet-style');
|
| 115 | 115 | |
| 116 | - wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 116 | + wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 117 | 117 | wp_enqueue_script('geodirectory-leaflet-script');
|
| 118 | 118 | |
| 119 | - wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 119 | + wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 120 | 120 | wp_enqueue_script('geodirectory-leaflet-geo-script');
|
| 121 | 121 | |
| 122 | 122 | if ($is_detail_page) {
|
| 123 | - wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
|
|
| 123 | + wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
|
|
| 124 | 124 | wp_enqueue_style('geodirectory-leaflet-routing-style');
|
| 125 | 125 | |
| 126 | - wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 126 | + wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 127 | 127 | wp_enqueue_script('geodirectory-leaflet-routing-script');
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | // Overlapping Marker Spiderfier Leaflet |
| 131 | - wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 131 | + wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 132 | 132 | wp_enqueue_script('geodirectory-o-overlappingmarker-script');
|
| 133 | 133 | } |
| 134 | - wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 134 | + wp_enqueue_script('jquery-ui-autocomplete');
|
|
| 135 | 135 | |
| 136 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 136 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 137 | 137 | wp_enqueue_script('geodirectory-goMap-script');
|
| 138 | 138 | |
| 139 | - wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 139 | + wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 140 | 140 | wp_enqueue_script('chosen');
|
| 141 | 141 | |
| 142 | - wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 142 | + wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 143 | 143 | wp_enqueue_script('geodirectory-choose-ajax');
|
| 144 | 144 | |
| 145 | - wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
|
|
| 145 | + wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
|
|
| 146 | 146 | |
| 147 | 147 | if (is_page() && geodir_is_page('add-listing')) {
|
| 148 | 148 | // SCRIPT FOR UPLOAD |
| 149 | 149 | wp_enqueue_script('plupload-all');
|
| 150 | 150 | wp_enqueue_script('jquery-ui-sortable');
|
| 151 | 151 | |
| 152 | - wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
|
|
| 152 | + wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 153 | 153 | wp_enqueue_script('geodirectory-plupload-script');
|
| 154 | 154 | // SCRIPT FOR UPLOAD END |
| 155 | 155 | |
@@ -196,27 +196,27 @@ discard block |
||
| 196 | 196 | |
| 197 | 197 | wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
| 198 | 198 | |
| 199 | - wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
|
|
| 199 | + wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation.min.js#asyncload');
|
|
| 200 | 200 | } // End if for add place page |
| 201 | 201 | |
| 202 | - wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 202 | + wp_register_script('geodirectory-post-custom-js', geodir_plugin_url().'/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 203 | 203 | if ($is_detail_page) {
|
| 204 | 204 | wp_enqueue_script('geodirectory-post-custom-js');
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | // font awesome rating script |
| 208 | 208 | if (get_option('geodir_reviewrating_enable_font_awesome')) {
|
| 209 | - wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 209 | + wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 210 | 210 | wp_enqueue_script('geodir-barrating-js');
|
| 211 | 211 | } else { // default rating script
|
| 212 | - wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 212 | + wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 213 | 213 | wp_enqueue_script('geodir-jRating-js');
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | - wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 216 | + wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 217 | 217 | wp_enqueue_script('geodir-on-document-load');
|
| 218 | 218 | |
| 219 | - wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 219 | + wp_register_script('google-geometa', geodir_plugin_url().'/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
|
|
| 220 | 220 | wp_enqueue_script('google-geometa');
|
| 221 | 221 | } |
| 222 | 222 | |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | */ |
| 232 | 232 | function geodir_header_scripts() |
| 233 | 233 | {
|
| 234 | - echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';
|
|
| 234 | + echo '<style>'.stripslashes(get_option('geodir_coustem_css')).'</style>';
|
|
| 235 | 235 | echo stripslashes(get_option('geodir_header_scripts'));
|
| 236 | 236 | } |
| 237 | 237 | |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | */ |
| 246 | 246 | function geodir_google_analytics_tracking_code() |
| 247 | 247 | {
|
| 248 | - if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
|
|
| 248 | + if (get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')) {?>
|
|
| 249 | 249 | |
| 250 | 250 | <script> |
| 251 | 251 | (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
@@ -253,14 +253,14 @@ discard block |
||
| 253 | 253 | m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
| 254 | 254 | })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); |
| 255 | 255 | |
| 256 | - ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id'));?>', 'auto');
|
|
| 257 | - <?php if(get_option('geodir_ga_anonymize_ip')){echo "ga('set', 'anonymizeIP', true);";}?>
|
|
| 256 | + ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id')); ?>', 'auto');
|
|
| 257 | + <?php if (get_option('geodir_ga_anonymize_ip')) {echo "ga('set', 'anonymizeIP', true);"; }?>
|
|
| 258 | 258 | ga('send', 'pageview');
|
| 259 | 259 | |
| 260 | 260 | </script> |
| 261 | 261 | |
| 262 | 262 | <?php |
| 263 | - }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
|
|
| 263 | + }elseif (get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')) {
|
|
| 264 | 264 | echo stripslashes(get_option('geodir_ga_tracking_code'));
|
| 265 | 265 | } |
| 266 | 266 | } |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | * |
| 284 | 284 | * Flexbox wont wrap on ios for search form items |
| 285 | 285 | */ |
| 286 | - if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
|
|
| 286 | + if (!empty($_SERVER['HTTP_USER_AGENT']) && preg_match('/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'])) {
|
|
| 287 | 287 | echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
|
| 288 | 288 | } |
| 289 | 289 | } |
@@ -299,7 +299,7 @@ discard block |
||
| 299 | 299 | */ |
| 300 | 300 | function geodir_add_async_forscript($url) |
| 301 | 301 | {
|
| 302 | - if (strpos($url, '#asyncload')===false) |
|
| 302 | + if (strpos($url, '#asyncload') === false) |
|
| 303 | 303 | return $url; |
| 304 | 304 | else if (is_admin()) |
| 305 | 305 | return str_replace('#asyncload', '', $url);
|
@@ -317,12 +317,12 @@ discard block |
||
| 317 | 317 | function geodir_templates_styles() |
| 318 | 318 | {
|
| 319 | 319 | |
| 320 | - wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 320 | + wp_register_style('geodir-core-scss', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 321 | 321 | wp_enqueue_style('geodir-core-scss');
|
| 322 | - wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
|
|
| 322 | + wp_register_style('geodir-core-scss-footer', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
|
|
| 323 | 323 | |
| 324 | - if(is_rtl()){
|
|
| 325 | - wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 324 | + if (is_rtl()) {
|
|
| 325 | + wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
|
|
| 326 | 326 | wp_enqueue_style('geodirectory-frontend-rtl-style');
|
| 327 | 327 | } |
| 328 | 328 | |
@@ -396,18 +396,18 @@ discard block |
||
| 396 | 396 | $term_id = get_queried_object_id(); |
| 397 | 397 | $taxonomy = get_query_var('taxonomy');
|
| 398 | 398 | |
| 399 | - if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
|
|
| 400 | - $term = get_term($term_id, $post_type . 'category'); |
|
| 399 | + if ($term_id && $post_type && get_query_var('taxonomy') == $post_type.'category') {
|
|
| 400 | + $term = get_term($term_id, $post_type.'category'); |
|
| 401 | 401 | } |
| 402 | 402 | } |
| 403 | 403 | |
| 404 | - if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
|
|
| 405 | - $taxonomy_search = $_REQUEST['s' . $post_type . 'category']; |
|
| 404 | + if (geodir_is_page('search') && !empty($_REQUEST['s'.$post_type.'category'])) {
|
|
| 405 | + $taxonomy_search = $_REQUEST['s'.$post_type.'category']; |
|
| 406 | 406 | |
| 407 | 407 | if (!is_array($taxonomy_search)) {
|
| 408 | - $term = get_term((int)$taxonomy_search, $post_type . 'category'); |
|
| 409 | - } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
|
|
| 410 | - $term = get_term((int)$taxonomy_search[0], $post_type . 'category'); |
|
| 408 | + $term = get_term((int) $taxonomy_search, $post_type.'category'); |
|
| 409 | + } else if (is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
|
|
| 410 | + $term = get_term((int) $taxonomy_search[0], $post_type.'category'); |
|
| 411 | 411 | } |
| 412 | 412 | } |
| 413 | 413 | |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | if ($max_page > 1 || $always_show) {
|
| 420 | 420 | // Extra pagination info |
| 421 | 421 | $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
|
| 422 | - $start_no = ( $paged - 1 ) * $posts_per_page + 1; |
|
| 422 | + $start_no = ($paged - 1) * $posts_per_page + 1; |
|
| 423 | 423 | $end_no = min($paged * $posts_per_page, $numposts); |
| 424 | 424 | |
| 425 | 425 | if ($geodir_pagination_more_info != '') {
|
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | } else {
|
| 430 | 430 | $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
|
| 431 | 431 | } |
| 432 | - $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>'; |
|
| 432 | + $pagination_info = '<div class="gd-pagination-details">'.$pegination_desc.'</div>'; |
|
| 433 | 433 | /** |
| 434 | 434 | * Adds an extra pagination info above/under pagination. |
| 435 | 435 | * |
@@ -445,15 +445,15 @@ discard block |
||
| 445 | 445 | $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
|
| 446 | 446 | |
| 447 | 447 | if ($geodir_pagination_more_info == 'before') {
|
| 448 | - $before = $before . $pagination_info; |
|
| 448 | + $before = $before.$pagination_info; |
|
| 449 | 449 | } else if ($geodir_pagination_more_info == 'after') {
|
| 450 | - $after = $pagination_info . $after; |
|
| 450 | + $after = $pagination_info.$after; |
|
| 451 | 451 | } |
| 452 | 452 | } |
| 453 | 453 | |
| 454 | 454 | echo "$before <div class='Navi gd-navi'>"; |
| 455 | 455 | if ($paged >= ($pages_to_show - 1)) {
|
| 456 | - echo '<a href="' . str_replace('&paged', '&paged', get_pagenum_link()) . '">«</a>';
|
|
| 456 | + echo '<a href="'.str_replace('&paged', '&paged', get_pagenum_link()).'">«</a>';
|
|
| 457 | 457 | } |
| 458 | 458 | previous_posts_link($prelabel); |
| 459 | 459 | for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {
|
@@ -461,13 +461,13 @@ discard block |
||
| 461 | 461 | if ($i == $paged) {
|
| 462 | 462 | echo "<strong class='on'>$i</strong>"; |
| 463 | 463 | } else {
|
| 464 | - echo ' <a href="' . str_replace('&paged', '&paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
|
|
| 464 | + echo ' <a href="'.str_replace('&paged', '&paged', get_pagenum_link($i)).'">'.$i.'</a> ';
|
|
| 465 | 465 | } |
| 466 | 466 | } |
| 467 | 467 | } |
| 468 | 468 | next_posts_link($nxtlabel, $max_page); |
| 469 | 469 | if (($paged + $half_pages_to_show) < ($max_page)) {
|
| 470 | - echo '<a href="' . str_replace('&paged', '&paged', get_pagenum_link($max_page)) . '">»</a>';
|
|
| 470 | + echo '<a href="'.str_replace('&paged', '&paged', get_pagenum_link($max_page)).'">»</a>';
|
|
| 471 | 471 | } |
| 472 | 472 | echo "</div> $after"; |
| 473 | 473 | } |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | jQuery(function ($) {
|
| 506 | 506 | $("#distance_slider").slider({
|
| 507 | 507 | range: true, |
| 508 | - values: [0, <?php echo ($_REQUEST['sdist']!='') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>], |
|
| 508 | + values: [0, <?php echo ($_REQUEST['sdist'] != '') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>], |
|
| 509 | 509 | min: 0, |
| 510 | 510 | max: <?php echo $dist; ?>, |
| 511 | 511 | step: <?php echo $dist_dif; ?>, |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | $city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : ''; |
| 573 | 573 | ?> |
| 574 | 574 | <script type="text/javascript"> |
| 575 | - var default_location = '<?php echo $city ;?>'; |
|
| 575 | + var default_location = '<?php echo $city; ?>'; |
|
| 576 | 576 | var latlng; |
| 577 | 577 | var address; |
| 578 | 578 | var dist = 0; |
@@ -588,7 +588,7 @@ discard block |
||
| 588 | 588 | var $form = jQuery(this).closest('form');
|
| 589 | 589 | |
| 590 | 590 | if (jQuery("#sdist input[type='radio']:checked").length != 0) dist = jQuery("#sdist input[type='radio']:checked").val();
|
| 591 | - if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text;?>') jQuery('.search_text', $form).val(s);
|
|
| 591 | + if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text; ?>') jQuery('.search_text', $form).val(s);
|
|
| 592 | 592 | |
| 593 | 593 | // Disable location based search for disabled location post type. |
| 594 | 594 | if (jQuery('.search_by_post', $form).val() != '' && typeof gd_cpt_no_location == 'function') {
|
@@ -602,7 +602,7 @@ discard block |
||
| 602 | 602 | } |
| 603 | 603 | } |
| 604 | 604 | |
| 605 | - if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text;?>')) {
|
|
| 605 | + if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text; ?>')) {
|
|
| 606 | 606 | geodir_setsearch($form); |
| 607 | 607 | } else {
|
| 608 | 608 | jQuery(".snear", $form).val('');
|
@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | }); |
| 621 | 621 | |
| 622 | 622 | function geodir_setsearch($form) {
|
| 623 | - if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text;?>')) jQuery(".snear", $form).val(default_location);
|
|
| 623 | + if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text; ?>')) jQuery(".snear", $form).val(default_location);
|
|
| 624 | 624 | geocodeAddress($form); |
| 625 | 625 | } |
| 626 | 626 | |
@@ -639,15 +639,15 @@ discard block |
||
| 639 | 639 | // Call the geocode function |
| 640 | 640 | Sgeocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null; |
| 641 | 641 | |
| 642 | - if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != '' ) || jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {
|
|
| 643 | - if (jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {
|
|
| 642 | + if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != '' ) || jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {
|
|
| 643 | + if (jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {
|
|
| 644 | 644 | jQuery(".snear", $form).val('');
|
| 645 | 645 | } |
| 646 | 646 | jQuery($form).submit(); |
| 647 | 647 | } else {
|
| 648 | 648 | var address = jQuery(".snear", $form).val();
|
| 649 | 649 | |
| 650 | - if (jQuery('.snear', $form).val() == '<?php echo $default_near_text;?>') {
|
|
| 650 | + if (jQuery('.snear', $form).val() == '<?php echo $default_near_text; ?>') {
|
|
| 651 | 651 | initialise2(); |
| 652 | 652 | } else {
|
| 653 | 653 | <?php |
@@ -660,12 +660,12 @@ discard block |
||
| 660 | 660 | $near_add2 = apply_filters('geodir_search_near_addition', '');
|
| 661 | 661 | ?> |
| 662 | 662 | if (window.gdMaps === 'google') {
|
| 663 | - Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},
|
|
| 663 | + Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", '.$near_add.'"' : '').$near_add2; ?>},
|
|
| 664 | 664 | function (results, status) {
|
| 665 | 665 | if (status == google.maps.GeocoderStatus.OK) {
|
| 666 | 666 | updateSearchPosition(results[0].geometry.location, $form); |
| 667 | 667 | } else {
|
| 668 | - alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory');?>" + status);
|
|
| 668 | + alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory'); ?>" + status);
|
|
| 669 | 669 | } |
| 670 | 670 | }); |
| 671 | 671 | } else if (window.gdMaps === 'osm') {
|
@@ -674,7 +674,7 @@ discard block |
||
| 674 | 674 | if (typeof geo !== 'undefined' && geo.lat && geo.lon) {
|
| 675 | 675 | updateSearchPosition(geo, $form); |
| 676 | 676 | } else {
|
| 677 | - alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory');?>");
|
|
| 677 | + alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory'); ?>");
|
|
| 678 | 678 | } |
| 679 | 679 | }); |
| 680 | 680 | } else {
|
@@ -720,19 +720,19 @@ discard block |
||
| 720 | 720 | var msg; |
| 721 | 721 | switch (err.code) {
|
| 722 | 722 | case err.UNKNOWN_ERROR: |
| 723 | - msg = "<?php _e('Unable to find your location','geodirectory');?>";
|
|
| 723 | + msg = "<?php _e('Unable to find your location', 'geodirectory'); ?>";
|
|
| 724 | 724 | break; |
| 725 | 725 | case err.PERMISSION_DENINED: |
| 726 | - msg = "<?php _e('Permission denied in finding your location','geodirectory');?>";
|
|
| 726 | + msg = "<?php _e('Permission denied in finding your location', 'geodirectory'); ?>";
|
|
| 727 | 727 | break; |
| 728 | 728 | case err.POSITION_UNAVAILABLE: |
| 729 | - msg = "<?php _e('Your location is currently unknown','geodirectory');?>";
|
|
| 729 | + msg = "<?php _e('Your location is currently unknown', 'geodirectory'); ?>";
|
|
| 730 | 730 | break; |
| 731 | 731 | case err.BREAK: |
| 732 | - msg = "<?php _e('Attempt to find location took too long','geodirectory');?>";
|
|
| 732 | + msg = "<?php _e('Attempt to find location took too long', 'geodirectory'); ?>";
|
|
| 733 | 733 | break; |
| 734 | 734 | default: |
| 735 | - msg = "<?php _e('Location detection not supported in browser','geodirectory');?>";
|
|
| 735 | + msg = "<?php _e('Location detection not supported in browser', 'geodirectory'); ?>";
|
|
| 736 | 736 | } |
| 737 | 737 | jQuery('#info').html(msg);
|
| 738 | 738 | } |
@@ -782,7 +782,7 @@ discard block |
||
| 782 | 782 | * @param object $post The post object. |
| 783 | 783 | * @param string $link The link to the post. |
| 784 | 784 | */ |
| 785 | - $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img"> </span></a>',$post,$link);
|
|
| 785 | + $return = apply_filters('geodir_featured_badge_on_image', '<a href="'.$link.'"><span class="geodir_featured_img"> </span></a>', $post, $link);
|
|
| 786 | 786 | break; |
| 787 | 787 | case 'new' : |
| 788 | 788 | /** |
@@ -792,7 +792,7 @@ discard block |
||
| 792 | 792 | * @param object $post The post object. |
| 793 | 793 | * @param string $link The link to the post. |
| 794 | 794 | */ |
| 795 | - $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing"> </span></a>',$post,$link);
|
|
| 795 | + $return = apply_filters('geodir_new_badge_on_image', '<a href="'.$link.'"><span class="geodir_new_listing"> </span></a>', $post, $link);
|
|
| 796 | 796 | break; |
| 797 | 797 | |
| 798 | 798 | } |
@@ -806,8 +806,8 @@ discard block |
||
| 806 | 806 | * @since 1.6.22 |
| 807 | 807 | */ |
| 808 | 808 | function geodir_fix_script_conflict() {
|
| 809 | - if ( wp_script_is( 'flexslider', 'enqueued' ) && wp_script_is( 'geodirectory-jquery-flexslider-js', 'enqueued' ) ) {
|
|
| 810 | - wp_dequeue_script( 'flexslider' ); |
|
| 809 | + if (wp_script_is('flexslider', 'enqueued') && wp_script_is('geodirectory-jquery-flexslider-js', 'enqueued')) {
|
|
| 810 | + wp_dequeue_script('flexslider');
|
|
| 811 | 811 | } |
| 812 | 812 | } |
| 813 | -add_action( 'wp_enqueue_scripts', 'geodir_fix_script_conflict', 100 ); |
|
| 814 | 813 | \ No newline at end of file |
| 814 | +add_action('wp_enqueue_scripts', 'geodir_fix_script_conflict', 100); |
|
| 815 | 815 | \ No newline at end of file |
@@ -10,33 +10,33 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | add_action('admin_init', 'geodir_admin_init');
|
| 12 | 12 | if (!function_exists('geodir_admin_init')) {
|
| 13 | - /** |
|
| 14 | - * Adds GD setting pages in admin. |
|
| 15 | - * |
|
| 16 | - * @since 1.0.0 |
|
| 17 | - * @package GeoDirectory |
|
| 18 | - * @global string $current_tab The current settings tab name. |
|
| 19 | - */ |
|
| 20 | - function geodir_admin_init() |
|
| 21 | - {
|
|
| 22 | - |
|
| 23 | - if (is_admin()): |
|
| 24 | - global $current_tab; |
|
| 25 | - geodir_redirect_to_admin_panel_on_installed(); |
|
| 26 | - $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings'; |
|
| 27 | - if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests |
|
| 28 | - geodir_handle_option_form_submit($current_tab); // located in admin function.php |
|
| 29 | - /** |
|
| 30 | - * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area. |
|
| 31 | - * |
|
| 32 | - * @since 1.0.0 |
|
| 33 | - */ |
|
| 34 | - do_action('admin_panel_init');
|
|
| 35 | - add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);
|
|
| 36 | - |
|
| 37 | - |
|
| 38 | - endif; |
|
| 39 | - } |
|
| 13 | + /** |
|
| 14 | + * Adds GD setting pages in admin. |
|
| 15 | + * |
|
| 16 | + * @since 1.0.0 |
|
| 17 | + * @package GeoDirectory |
|
| 18 | + * @global string $current_tab The current settings tab name. |
|
| 19 | + */ |
|
| 20 | + function geodir_admin_init() |
|
| 21 | + {
|
|
| 22 | + |
|
| 23 | + if (is_admin()): |
|
| 24 | + global $current_tab; |
|
| 25 | + geodir_redirect_to_admin_panel_on_installed(); |
|
| 26 | + $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings'; |
|
| 27 | + if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests |
|
| 28 | + geodir_handle_option_form_submit($current_tab); // located in admin function.php |
|
| 29 | + /** |
|
| 30 | + * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area. |
|
| 31 | + * |
|
| 32 | + * @since 1.0.0 |
|
| 33 | + */ |
|
| 34 | + do_action('admin_panel_init');
|
|
| 35 | + add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);
|
|
| 36 | + |
|
| 37 | + |
|
| 38 | + endif; |
|
| 39 | + } |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** |
@@ -47,10 +47,10 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | function geodir_redirect_to_admin_panel_on_installed() |
| 49 | 49 | {
|
| 50 | - if (get_option('geodir_installation_redirect', false)) {
|
|
| 51 | - delete_option('geodir_installation_redirect');
|
|
| 52 | - wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));
|
|
| 53 | - } |
|
| 50 | + if (get_option('geodir_installation_redirect', false)) {
|
|
| 51 | + delete_option('geodir_installation_redirect');
|
|
| 52 | + wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));
|
|
| 53 | + } |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | /** |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | function geodir_get_admin_option_form($current_tab) |
| 64 | 64 | {
|
| 65 | - geodir_admin_option_form($current_tab);// defined in admin template tags.php |
|
| 65 | + geodir_admin_option_form($current_tab);// defined in admin template tags.php |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | |
@@ -86,24 +86,24 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | function geodir_conditional_admin_script_load() |
| 88 | 88 | {
|
| 89 | - global $pagenow; |
|
| 89 | + global $pagenow; |
|
| 90 | 90 | |
| 91 | 91 | // Get the current post type |
| 92 | 92 | $post_type = geodir_admin_current_post_type(); |
| 93 | 93 | $geodir_post_types = geodir_get_posttypes(); |
| 94 | 94 | |
| 95 | 95 | if ((isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') || (($pagenow == 'post.php' || $pagenow == 'post-new.php' || $pagenow == 'edit.php') && $post_type && in_array($post_type, $geodir_post_types)) || ($pagenow == 'edit-tags.php' || $pagenow == 'term.php' || $pagenow == 'edit-comments.php' || $pagenow == 'comment.php')) {
|
| 96 | - add_action('admin_enqueue_scripts', 'geodir_admin_scripts');
|
|
| 97 | - add_action('admin_enqueue_scripts', 'geodir_admin_styles');
|
|
| 98 | - add_action('admin_enqueue_scripts', 'geodir_admin_dequeue_scripts', 100);
|
|
| 96 | + add_action('admin_enqueue_scripts', 'geodir_admin_scripts');
|
|
| 97 | + add_action('admin_enqueue_scripts', 'geodir_admin_styles');
|
|
| 98 | + add_action('admin_enqueue_scripts', 'geodir_admin_dequeue_scripts', 100);
|
|
| 99 | 99 | |
| 100 | - // Disable VC editor for GD post types. |
|
| 101 | - if (class_exists('Vc_Role_Access_Controller')) {
|
|
| 102 | - add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 ); |
|
| 103 | - } |
|
| 104 | - } |
|
| 100 | + // Disable VC editor for GD post types. |
|
| 101 | + if (class_exists('Vc_Role_Access_Controller')) {
|
|
| 102 | + add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 ); |
|
| 103 | + } |
|
| 104 | + } |
|
| 105 | 105 | |
| 106 | - add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');
|
|
| 106 | + add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');
|
|
| 107 | 107 | |
| 108 | 108 | } |
| 109 | 109 | |
@@ -138,12 +138,12 @@ discard block |
||
| 138 | 138 | */ |
| 139 | 139 | function create_default_admin_main_nav() |
| 140 | 140 | {
|
| 141 | - add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);
|
|
| 142 | - add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);
|
|
| 143 | - add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);
|
|
| 144 | - add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);
|
|
| 145 | - add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);
|
|
| 146 | - //add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);
|
|
| 141 | + add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);
|
|
| 142 | + add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);
|
|
| 143 | + add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);
|
|
| 144 | + add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);
|
|
| 145 | + add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);
|
|
| 146 | + //add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);
|
|
| 147 | 147 | |
| 148 | 148 | } |
| 149 | 149 | |
@@ -156,16 +156,16 @@ discard block |
||
| 156 | 156 | */ |
| 157 | 157 | function geodir_admin_list_columns() |
| 158 | 158 | {
|
| 159 | - if ($post_types = geodir_get_posttypes()) {
|
|
| 159 | + if ($post_types = geodir_get_posttypes()) {
|
|
| 160 | 160 | |
| 161 | - foreach ($post_types as $post_type): |
|
| 162 | - add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);
|
|
| 163 | - //Filter-Payment-Manager to show Package |
|
| 164 | - add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);
|
|
| 161 | + foreach ($post_types as $post_type): |
|
| 162 | + add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);
|
|
| 163 | + //Filter-Payment-Manager to show Package |
|
| 164 | + add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);
|
|
| 165 | 165 | |
| 166 | - add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');
|
|
| 167 | - endforeach; |
|
| 168 | - } |
|
| 166 | + add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');
|
|
| 167 | + endforeach; |
|
| 168 | + } |
|
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | /** |
@@ -178,15 +178,15 @@ discard block |
||
| 178 | 178 | */ |
| 179 | 179 | function geodir_default_admin_main_tabs($tabs) |
| 180 | 180 | {
|
| 181 | - return $tabs = array( |
|
| 182 | - 'general_settings' => array('label' => __('General', 'geodirectory')),
|
|
| 183 | - 'design_settings' => array('label' => __('Design', 'geodirectory')),
|
|
| 184 | - 'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),
|
|
| 185 | - 'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),
|
|
| 186 | - 'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),
|
|
| 187 | - 'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),
|
|
| 188 | - |
|
| 189 | - ); |
|
| 181 | + return $tabs = array( |
|
| 182 | + 'general_settings' => array('label' => __('General', 'geodirectory')),
|
|
| 183 | + 'design_settings' => array('label' => __('Design', 'geodirectory')),
|
|
| 184 | + 'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),
|
|
| 185 | + 'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),
|
|
| 186 | + 'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),
|
|
| 187 | + 'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),
|
|
| 188 | + |
|
| 189 | + ); |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | add_action('do_meta_boxes', 'geodir_remove_image_box');
|
@@ -199,16 +199,16 @@ discard block |
||
| 199 | 199 | */ |
| 200 | 200 | function geodir_remove_image_box() |
| 201 | 201 | {
|
| 202 | - global $post; |
|
| 202 | + global $post; |
|
| 203 | 203 | |
| 204 | - $geodir_posttypes = geodir_get_posttypes(); |
|
| 204 | + $geodir_posttypes = geodir_get_posttypes(); |
|
| 205 | 205 | |
| 206 | - if (isset($post) && in_array($post->post_type, $geodir_posttypes)): |
|
| 206 | + if (isset($post) && in_array($post->post_type, $geodir_posttypes)): |
|
| 207 | 207 | |
| 208 | - remove_meta_box('postimagediv', $post->post_type, 'side');
|
|
| 209 | - remove_meta_box('revisionsdiv', $post->post_type, 'normal');
|
|
| 208 | + remove_meta_box('postimagediv', $post->post_type, 'side');
|
|
| 209 | + remove_meta_box('revisionsdiv', $post->post_type, 'normal');
|
|
| 210 | 210 | |
| 211 | - endif; |
|
| 211 | + endif; |
|
| 212 | 212 | |
| 213 | 213 | } |
| 214 | 214 | |
@@ -223,27 +223,27 @@ discard block |
||
| 223 | 223 | */ |
| 224 | 224 | function geodir_meta_box_add() |
| 225 | 225 | {
|
| 226 | - global $post; |
|
| 226 | + global $post; |
|
| 227 | 227 | |
| 228 | - $geodir_post_types = geodir_get_posttypes('array');
|
|
| 229 | - $geodir_posttypes = array_keys($geodir_post_types); |
|
| 228 | + $geodir_post_types = geodir_get_posttypes('array');
|
|
| 229 | + $geodir_posttypes = array_keys($geodir_post_types); |
|
| 230 | 230 | |
| 231 | - if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)): |
|
| 231 | + if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)): |
|
| 232 | 232 | |
| 233 | - $geodir_posttype = $post->post_type; |
|
| 234 | - $post_typename = __($geodir_post_types[$geodir_posttype]['labels']['singular_name'], 'geodirectory'); |
|
| 235 | - $post_typename = geodir_ucwords($post_typename); |
|
| 233 | + $geodir_posttype = $post->post_type; |
|
| 234 | + $post_typename = __($geodir_post_types[$geodir_posttype]['labels']['singular_name'], 'geodirectory'); |
|
| 235 | + $post_typename = geodir_ucwords($post_typename); |
|
| 236 | 236 | |
| 237 | - // Filter-Payment-Manager |
|
| 237 | + // Filter-Payment-Manager |
|
| 238 | 238 | |
| 239 | - add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
|
|
| 239 | + add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
|
|
| 240 | 240 | |
| 241 | - add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
|
|
| 241 | + add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
|
|
| 242 | 242 | |
| 243 | - // no need of this box as all fields moved to main information box |
|
| 244 | - //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );
|
|
| 243 | + // no need of this box as all fields moved to main information box |
|
| 244 | + //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );
|
|
| 245 | 245 | |
| 246 | - endif; |
|
| 246 | + endif; |
|
| 247 | 247 | |
| 248 | 248 | } |
| 249 | 249 | |
@@ -267,23 +267,23 @@ discard block |
||
| 267 | 267 | function geodir_hide_post_taxonomy_meta_boxes() |
| 268 | 268 | {
|
| 269 | 269 | |
| 270 | - $geodir_post_types = get_option('geodir_post_types');
|
|
| 270 | + $geodir_post_types = get_option('geodir_post_types');
|
|
| 271 | 271 | |
| 272 | - if (!empty($geodir_post_types)) {
|
|
| 273 | - foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info) {
|
|
| 272 | + if (!empty($geodir_post_types)) {
|
|
| 273 | + foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info) {
|
|
| 274 | 274 | |
| 275 | - $gd_taxonomy = geodir_get_taxonomies($geodir_post_type); |
|
| 275 | + $gd_taxonomy = geodir_get_taxonomies($geodir_post_type); |
|
| 276 | 276 | |
| 277 | - if(!empty($gd_taxonomy)) {
|
|
| 278 | - foreach ($gd_taxonomy as $tax) {
|
|
| 277 | + if(!empty($gd_taxonomy)) {
|
|
| 278 | + foreach ($gd_taxonomy as $tax) {
|
|
| 279 | 279 | |
| 280 | - remove_meta_box($tax . 'div', $geodir_post_type, 'normal'); |
|
| 280 | + remove_meta_box($tax . 'div', $geodir_post_type, 'normal'); |
|
| 281 | 281 | |
| 282 | - } |
|
| 283 | - } |
|
| 282 | + } |
|
| 283 | + } |
|
| 284 | 284 | |
| 285 | - } |
|
| 286 | - } |
|
| 285 | + } |
|
| 286 | + } |
|
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | add_filter('geodir_add_listing_map_restrict', 'geodir_add_listing_map_restrict');
|
@@ -297,12 +297,12 @@ discard block |
||
| 297 | 297 | */ |
| 298 | 298 | function geodir_add_listing_map_restrict($map_restirct) |
| 299 | 299 | {
|
| 300 | - if (is_admin()) {
|
|
| 301 | - if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'default_location_settings') {
|
|
| 302 | - $map_restirct = false; |
|
| 303 | - } |
|
| 304 | - } |
|
| 305 | - return $map_restirct; |
|
| 300 | + if (is_admin()) {
|
|
| 301 | + if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'default_location_settings') {
|
|
| 302 | + $map_restirct = false; |
|
| 303 | + } |
|
| 304 | + } |
|
| 305 | + return $map_restirct; |
|
| 306 | 306 | } |
| 307 | 307 | |
| 308 | 308 | |
@@ -321,16 +321,16 @@ discard block |
||
| 321 | 321 | function geodir_enable_editor_on_notifications($notification) |
| 322 | 322 | {
|
| 323 | 323 | |
| 324 | - if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {
|
|
| 324 | + if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {
|
|
| 325 | 325 | |
| 326 | - foreach ($notification as $key => $value) {
|
|
| 327 | - if ($value['type'] == 'textarea') |
|
| 328 | - $notification[$key]['type'] = 'editor'; |
|
| 329 | - } |
|
| 326 | + foreach ($notification as $key => $value) {
|
|
| 327 | + if ($value['type'] == 'textarea') |
|
| 328 | + $notification[$key]['type'] = 'editor'; |
|
| 329 | + } |
|
| 330 | 330 | |
| 331 | - } |
|
| 331 | + } |
|
| 332 | 332 | |
| 333 | - return $notification; |
|
| 333 | + return $notification; |
|
| 334 | 334 | } |
| 335 | 335 | |
| 336 | 336 | |
@@ -347,16 +347,16 @@ discard block |
||
| 347 | 347 | function geodir_enable_editor_on_design_settings($design_setting) |
| 348 | 348 | {
|
| 349 | 349 | |
| 350 | - if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {
|
|
| 350 | + if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {
|
|
| 351 | 351 | |
| 352 | - foreach ($design_setting as $key => $value) {
|
|
| 353 | - if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content') |
|
| 354 | - $design_setting[$key]['type'] = 'editor'; |
|
| 355 | - } |
|
| 352 | + foreach ($design_setting as $key => $value) {
|
|
| 353 | + if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content') |
|
| 354 | + $design_setting[$key]['type'] = 'editor'; |
|
| 355 | + } |
|
| 356 | 356 | |
| 357 | - } |
|
| 357 | + } |
|
| 358 | 358 | |
| 359 | - return $design_setting; |
|
| 359 | + return $design_setting; |
|
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | /* ----------- START MANAGE CUSTOM FIELDS ---------------- */ |
@@ -364,15 +364,15 @@ discard block |
||
| 364 | 364 | add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');
|
| 365 | 365 | |
| 366 | 366 | function geodir_manage_available_fields_predefined($sub_tab){
|
| 367 | - if($sub_tab=='custom_fields'){
|
|
| 368 | - geodir_custom_available_fields('predefined');
|
|
| 369 | - } |
|
| 367 | + if($sub_tab=='custom_fields'){
|
|
| 368 | + geodir_custom_available_fields('predefined');
|
|
| 369 | + } |
|
| 370 | 370 | } |
| 371 | 371 | |
| 372 | 372 | function geodir_manage_available_fields_custom($sub_tab){
|
| 373 | - if($sub_tab=='custom_fields'){
|
|
| 374 | - geodir_custom_available_fields('custom');
|
|
| 375 | - } |
|
| 373 | + if($sub_tab=='custom_fields'){
|
|
| 374 | + geodir_custom_available_fields('custom');
|
|
| 375 | + } |
|
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | |
@@ -391,16 +391,16 @@ discard block |
||
| 391 | 391 | function geodir_manage_available_fields($sub_tab) |
| 392 | 392 | {
|
| 393 | 393 | |
| 394 | - switch ($sub_tab) {
|
|
| 395 | - case 'custom_fields': |
|
| 396 | - geodir_custom_available_fields(); |
|
| 397 | - break; |
|
| 394 | + switch ($sub_tab) {
|
|
| 395 | + case 'custom_fields': |
|
| 396 | + geodir_custom_available_fields(); |
|
| 397 | + break; |
|
| 398 | 398 | |
| 399 | - case 'sorting_options': |
|
| 400 | - geodir_sorting_options_available_fields(); |
|
| 401 | - break; |
|
| 399 | + case 'sorting_options': |
|
| 400 | + geodir_sorting_options_available_fields(); |
|
| 401 | + break; |
|
| 402 | 402 | |
| 403 | - } |
|
| 403 | + } |
|
| 404 | 404 | } |
| 405 | 405 | |
| 406 | 406 | |
@@ -416,16 +416,16 @@ discard block |
||
| 416 | 416 | function geodir_manage_selected_fields($sub_tab) |
| 417 | 417 | {
|
| 418 | 418 | |
| 419 | - switch ($sub_tab) {
|
|
| 420 | - case 'custom_fields': |
|
| 421 | - geodir_custom_selected_fields(); |
|
| 422 | - break; |
|
| 419 | + switch ($sub_tab) {
|
|
| 420 | + case 'custom_fields': |
|
| 421 | + geodir_custom_selected_fields(); |
|
| 422 | + break; |
|
| 423 | 423 | |
| 424 | - case 'sorting_options': |
|
| 425 | - geodir_sorting_options_selected_fields(); |
|
| 426 | - break; |
|
| 424 | + case 'sorting_options': |
|
| 425 | + geodir_sorting_options_selected_fields(); |
|
| 426 | + break; |
|
| 427 | 427 | |
| 428 | - } |
|
| 428 | + } |
|
| 429 | 429 | } |
| 430 | 430 | |
| 431 | 431 | /** |
@@ -437,52 +437,52 @@ discard block |
||
| 437 | 437 | */ |
| 438 | 438 | function geodir_sorting_options_available_fields() |
| 439 | 439 | {
|
| 440 | - global $wpdb; |
|
| 441 | - $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 442 | - ?> |
|
| 440 | + global $wpdb; |
|
| 441 | + $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 442 | + ?> |
|
| 443 | 443 | <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/> |
| 444 | 444 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/> |
| 445 | 445 | <ul> |
| 446 | 446 | <?php |
| 447 | - $sort_options = geodir_get_custom_sort_options($listing_type); |
|
| 447 | + $sort_options = geodir_get_custom_sort_options($listing_type); |
|
| 448 | 448 | |
| 449 | - foreach ($sort_options as $key => $val) {
|
|
| 450 | - $val = stripslashes_deep($val); // strip slashes |
|
| 451 | - |
|
| 452 | - $check_html_variable = $wpdb->get_var( |
|
| 453 | - $wpdb->prepare( |
|
| 454 | - "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s", |
|
| 455 | - array($val['htmlvar_name'], $listing_type, $val['field_type']) |
|
| 456 | - ) |
|
| 457 | - ); |
|
| 449 | + foreach ($sort_options as $key => $val) {
|
|
| 450 | + $val = stripslashes_deep($val); // strip slashes |
|
| 451 | + |
|
| 452 | + $check_html_variable = $wpdb->get_var( |
|
| 453 | + $wpdb->prepare( |
|
| 454 | + "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s", |
|
| 455 | + array($val['htmlvar_name'], $listing_type, $val['field_type']) |
|
| 456 | + ) |
|
| 457 | + ); |
|
| 458 | 458 | |
| 459 | - $display = $check_html_variable ? ' style="display:none;"' : ''; |
|
| 460 | - ?> |
|
| 459 | + $display = $check_html_variable ? ' style="display:none;"' : ''; |
|
| 460 | + ?> |
|
| 461 | 461 | |
| 462 | 462 | <li class="gd-cf-tooltip-wrap" <?php echo $display;?>> |
| 463 | 463 | <?php |
| 464 | - if(isset($val['description']) && $val['description']){
|
|
| 465 | - echo '<div class="gdcf-tooltip">'.$val['description'].'</div>'; |
|
| 466 | - }?> |
|
| 464 | + if(isset($val['description']) && $val['description']){
|
|
| 465 | + echo '<div class="gdcf-tooltip">'.$val['description'].'</div>'; |
|
| 466 | + }?> |
|
| 467 | 467 | |
| 468 | 468 | <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>" data-field-type="<?php echo $val['field_type'];?>" |
| 469 | 469 | title="<?php echo $val['site_title'];?>" |
| 470 | 470 | class="gd-draggable-form-items gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);"> |
| 471 | 471 | <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {
|
| 472 | - echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>'; |
|
| 473 | - }elseif(isset($val['field_icon']) && $val['field_icon'] ){
|
|
| 474 | - echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';
|
|
| 475 | - }else{
|
|
| 476 | - echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 477 | - }?> |
|
| 472 | + echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>'; |
|
| 473 | + }elseif(isset($val['field_icon']) && $val['field_icon'] ){
|
|
| 474 | + echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';
|
|
| 475 | + }else{
|
|
| 476 | + echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 477 | + }?> |
|
| 478 | 478 | <?php echo $val['site_title'];?> |
| 479 | 479 | </a> |
| 480 | 480 | </li> |
| 481 | 481 | |
| 482 | 482 | |
| 483 | 483 | <?php |
| 484 | - } |
|
| 485 | - ?> |
|
| 484 | + } |
|
| 485 | + ?> |
|
| 486 | 486 | </ul> |
| 487 | 487 | <?php |
| 488 | 488 | } |
@@ -496,28 +496,28 @@ discard block |
||
| 496 | 496 | */ |
| 497 | 497 | function geodir_sorting_options_selected_fields() |
| 498 | 498 | {
|
| 499 | - $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 500 | - ?> |
|
| 499 | + $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 500 | + ?> |
|
| 501 | 501 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/> |
| 502 | 502 | <ul class="core"> |
| 503 | 503 | <?php |
| 504 | - global $wpdb; |
|
| 504 | + global $wpdb; |
|
| 505 | 505 | |
| 506 | - $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
|
|
| 506 | + $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
|
|
| 507 | 507 | |
| 508 | - if (!empty($fields)) {
|
|
| 509 | - foreach ($fields as $field) {
|
|
| 510 | - //$result_str = $field->id; |
|
| 511 | - $result_str = $field; |
|
| 512 | - $field_type = $field->field_type; |
|
| 513 | - $field_ins_upd = 'display'; |
|
| 508 | + if (!empty($fields)) {
|
|
| 509 | + foreach ($fields as $field) {
|
|
| 510 | + //$result_str = $field->id; |
|
| 511 | + $result_str = $field; |
|
| 512 | + $field_type = $field->field_type; |
|
| 513 | + $field_ins_upd = 'display'; |
|
| 514 | 514 | |
| 515 | - $default = false; |
|
| 515 | + $default = false; |
|
| 516 | 516 | |
| 517 | - geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default); |
|
| 518 | - } |
|
| 519 | - } |
|
| 520 | - ?> |
|
| 517 | + geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default); |
|
| 518 | + } |
|
| 519 | + } |
|
| 520 | + ?> |
|
| 521 | 521 | </ul> |
| 522 | 522 | <?php |
| 523 | 523 | } |
@@ -530,12 +530,12 @@ discard block |
||
| 530 | 530 | */ |
| 531 | 531 | function geodir_custom_fields_custom($post_type=''){
|
| 532 | 532 | |
| 533 | - $custom_fields = array(); |
|
| 533 | + $custom_fields = array(); |
|
| 534 | 534 | |
| 535 | - /** |
|
| 536 | - * @see `geodir_custom_fields` |
|
| 537 | - */ |
|
| 538 | - return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);
|
|
| 535 | + /** |
|
| 536 | + * @see `geodir_custom_fields` |
|
| 537 | + */ |
|
| 538 | + return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);
|
|
| 539 | 539 | } |
| 540 | 540 | |
| 541 | 541 | |
@@ -548,140 +548,140 @@ discard block |
||
| 548 | 548 | */ |
| 549 | 549 | function geodir_custom_fields($post_type=''){
|
| 550 | 550 | |
| 551 | - $custom_fields = array( |
|
| 552 | - 'text' => array( |
|
| 553 | - 'field_type' => 'text', |
|
| 554 | - 'class' => 'gd-text', |
|
| 555 | - 'icon' => 'fa fa-minus', |
|
| 556 | - 'name' => __('Text', 'geodirectory'),
|
|
| 557 | - 'description' => __('Add any sort of text field, text or numbers', 'geodirectory')
|
|
| 558 | - ), |
|
| 559 | - 'datepicker' => array( |
|
| 560 | - 'field_type' => 'datepicker', |
|
| 561 | - 'class' => 'gd-datepicker', |
|
| 562 | - 'icon' => 'fa fa-calendar', |
|
| 563 | - 'name' => __('Date', 'geodirectory'),
|
|
| 564 | - 'description' => __('Adds a date picker.', 'geodirectory')
|
|
| 565 | - ), |
|
| 566 | - 'textarea' => array( |
|
| 567 | - 'field_type' => 'textarea', |
|
| 568 | - 'class' => 'gd-textarea', |
|
| 569 | - 'icon' => 'fa fa-bars', |
|
| 570 | - 'name' => __('Textarea', 'geodirectory'),
|
|
| 571 | - 'description' => __('Adds a textarea', 'geodirectory')
|
|
| 572 | - ), |
|
| 573 | - 'time' => array( |
|
| 574 | - 'field_type' => 'time', |
|
| 575 | - 'class' => 'gd-time', |
|
| 576 | - 'icon' => 'fa fa-clock-o', |
|
| 577 | - 'name' => __('Time', 'geodirectory'),
|
|
| 578 | - 'description' => __('Adds a time picker', 'geodirectory')
|
|
| 579 | - ), |
|
| 580 | - 'checkbox' => array( |
|
| 581 | - 'field_type' => 'checkbox', |
|
| 582 | - 'class' => 'gd-checkbox', |
|
| 583 | - 'icon' => 'fa fa-check-square-o', |
|
| 584 | - 'name' => __('Checkbox', 'geodirectory'),
|
|
| 585 | - 'description' => __('Adds a checkbox', 'geodirectory')
|
|
| 586 | - ), |
|
| 587 | - 'phone' => array( |
|
| 588 | - 'field_type' => 'phone', |
|
| 589 | - 'class' => 'gd-phone', |
|
| 590 | - 'icon' => 'fa fa-phone', |
|
| 591 | - 'name' => __('Phone', 'geodirectory'),
|
|
| 592 | - 'description' => __('Adds a phone input', 'geodirectory')
|
|
| 593 | - ), |
|
| 594 | - 'radio' => array( |
|
| 595 | - 'field_type' => 'radio', |
|
| 596 | - 'class' => 'gd-radio', |
|
| 597 | - 'icon' => 'fa fa-dot-circle-o', |
|
| 598 | - 'name' => __('Radio', 'geodirectory'),
|
|
| 599 | - 'description' => __('Adds a radio input', 'geodirectory')
|
|
| 600 | - ), |
|
| 601 | - 'email' => array( |
|
| 602 | - 'field_type' => 'email', |
|
| 603 | - 'class' => 'gd-email', |
|
| 604 | - 'icon' => 'fa fa-envelope-o', |
|
| 605 | - 'name' => __('Email', 'geodirectory'),
|
|
| 606 | - 'description' => __('Adds a email input', 'geodirectory')
|
|
| 607 | - ), |
|
| 608 | - 'select' => array( |
|
| 609 | - 'field_type' => 'select', |
|
| 610 | - 'class' => 'gd-select', |
|
| 611 | - 'icon' => 'fa fa-caret-square-o-down', |
|
| 612 | - 'name' => __('Select', 'geodirectory'),
|
|
| 613 | - 'description' => __('Adds a select input', 'geodirectory')
|
|
| 614 | - ), |
|
| 615 | - 'multiselect' => array( |
|
| 616 | - 'field_type' => 'multiselect', |
|
| 617 | - 'class' => 'gd-multiselect', |
|
| 618 | - 'icon' => 'fa fa-caret-square-o-down', |
|
| 619 | - 'name' => __('Multi Select', 'geodirectory'),
|
|
| 620 | - 'description' => __('Adds a multiselect input', 'geodirectory')
|
|
| 621 | - ), |
|
| 622 | - 'url' => array( |
|
| 623 | - 'field_type' => 'url', |
|
| 624 | - 'class' => 'gd-url', |
|
| 625 | - 'icon' => 'fa fa-link', |
|
| 626 | - 'name' => __('URL', 'geodirectory'),
|
|
| 627 | - 'description' => __('Adds a url input', 'geodirectory')
|
|
| 628 | - ), |
|
| 629 | - 'html' => array( |
|
| 630 | - 'field_type' => 'html', |
|
| 631 | - 'class' => 'gd-html', |
|
| 632 | - 'icon' => 'fa fa-code', |
|
| 633 | - 'name' => __('HTML', 'geodirectory'),
|
|
| 634 | - 'description' => __('Adds a html input textarea', 'geodirectory')
|
|
| 635 | - ), |
|
| 636 | - 'file' => array( |
|
| 637 | - 'field_type' => 'file', |
|
| 638 | - 'class' => 'gd-file', |
|
| 639 | - 'icon' => 'fa fa-file', |
|
| 640 | - 'name' => __('File Upload', 'geodirectory'),
|
|
| 641 | - 'description' => __('Adds a file input', 'geodirectory')
|
|
| 642 | - ) |
|
| 643 | - ); |
|
| 644 | - |
|
| 645 | - /** |
|
| 646 | - * Filter the custom fields array to be able to add or remove items. |
|
| 647 | - * |
|
| 648 | - * @since 1.6.6 |
|
| 649 | - * |
|
| 650 | - * @param array $custom_fields {
|
|
| 651 | - * The custom fields array to be filtered. |
|
| 652 | - * |
|
| 653 | - * @type string $field_type The type of field, eg: text, datepicker, textarea, time, checkbox, phone, radio, email, select, multiselect, url, html, file. |
|
| 654 | - * @type string $class The class for the field in backend. |
|
| 655 | - * @type string $icon Can be font-awesome class name or icon image url. |
|
| 656 | - * @type string $name The name of the field. |
|
| 657 | - * @type string $description A short description about the field. |
|
| 658 | - * @type array $defaults {
|
|
| 659 | - * Optional. Used to set the default value of the field. |
|
| 660 | - * |
|
| 661 | - * @type string data_type The SQL data type for the field. VARCHAR, TEXT, TIME, TINYINT, INT, FLOAT, DATE |
|
| 662 | - * @type int decimal_point limit if using FLOAT data_type |
|
| 663 | - * @type string admin_title The admin title for the field. |
|
| 664 | - * @type string site_title This will be the title for the field on the frontend. |
|
| 665 | - * @type string admin_desc This will be shown below the field on the add listing form. |
|
| 666 | - * @type string htmlvar_name This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters. |
|
| 667 | - * @type bool is_active If false the field will not be displayed anywhere. |
|
| 668 | - * @type bool for_admin_use If true then only site admin can see and edit this field. |
|
| 669 | - * @type string default_value The default value for the input on the add listing page. |
|
| 670 | - * @type string show_in The locations to show in. [detail],[moreinfo],[listing],[owntab],[mapbubble] |
|
| 671 | - * @type bool is_required If true the field will be required on the add listing page. |
|
| 672 | - * @type string option_values The option values for select and multiselect only |
|
| 673 | - * @type string validation_pattern HTML5 validation pattern (text input only by default). |
|
| 674 | - * @type string validation_msg HTML5 validation message (text input only by default). |
|
| 675 | - * @type string required_msg Required warning message. |
|
| 676 | - * @type string field_icon Icon url or font awesome class. |
|
| 677 | - * @type string css_class Field custom css class for field custom style. |
|
| 678 | - * @type bool cat_sort If true the field will appear in the category sort options, if false the field will be hidden, leave blank to show option. |
|
| 679 | - * @type bool cat_sort If true the field will appear in the advanced search sort options, if false the field will be hidden, leave blank to show option. (advanced search addon required) |
|
| 680 | - * } |
|
| 681 | - * } |
|
| 682 | - * @param string $post_type The post type requested. |
|
| 683 | - */ |
|
| 684 | - return apply_filters('geodir_custom_fields',$custom_fields,$post_type);
|
|
| 551 | + $custom_fields = array( |
|
| 552 | + 'text' => array( |
|
| 553 | + 'field_type' => 'text', |
|
| 554 | + 'class' => 'gd-text', |
|
| 555 | + 'icon' => 'fa fa-minus', |
|
| 556 | + 'name' => __('Text', 'geodirectory'),
|
|
| 557 | + 'description' => __('Add any sort of text field, text or numbers', 'geodirectory')
|
|
| 558 | + ), |
|
| 559 | + 'datepicker' => array( |
|
| 560 | + 'field_type' => 'datepicker', |
|
| 561 | + 'class' => 'gd-datepicker', |
|
| 562 | + 'icon' => 'fa fa-calendar', |
|
| 563 | + 'name' => __('Date', 'geodirectory'),
|
|
| 564 | + 'description' => __('Adds a date picker.', 'geodirectory')
|
|
| 565 | + ), |
|
| 566 | + 'textarea' => array( |
|
| 567 | + 'field_type' => 'textarea', |
|
| 568 | + 'class' => 'gd-textarea', |
|
| 569 | + 'icon' => 'fa fa-bars', |
|
| 570 | + 'name' => __('Textarea', 'geodirectory'),
|
|
| 571 | + 'description' => __('Adds a textarea', 'geodirectory')
|
|
| 572 | + ), |
|
| 573 | + 'time' => array( |
|
| 574 | + 'field_type' => 'time', |
|
| 575 | + 'class' => 'gd-time', |
|
| 576 | + 'icon' => 'fa fa-clock-o', |
|
| 577 | + 'name' => __('Time', 'geodirectory'),
|
|
| 578 | + 'description' => __('Adds a time picker', 'geodirectory')
|
|
| 579 | + ), |
|
| 580 | + 'checkbox' => array( |
|
| 581 | + 'field_type' => 'checkbox', |
|
| 582 | + 'class' => 'gd-checkbox', |
|
| 583 | + 'icon' => 'fa fa-check-square-o', |
|
| 584 | + 'name' => __('Checkbox', 'geodirectory'),
|
|
| 585 | + 'description' => __('Adds a checkbox', 'geodirectory')
|
|
| 586 | + ), |
|
| 587 | + 'phone' => array( |
|
| 588 | + 'field_type' => 'phone', |
|
| 589 | + 'class' => 'gd-phone', |
|
| 590 | + 'icon' => 'fa fa-phone', |
|
| 591 | + 'name' => __('Phone', 'geodirectory'),
|
|
| 592 | + 'description' => __('Adds a phone input', 'geodirectory')
|
|
| 593 | + ), |
|
| 594 | + 'radio' => array( |
|
| 595 | + 'field_type' => 'radio', |
|
| 596 | + 'class' => 'gd-radio', |
|
| 597 | + 'icon' => 'fa fa-dot-circle-o', |
|
| 598 | + 'name' => __('Radio', 'geodirectory'),
|
|
| 599 | + 'description' => __('Adds a radio input', 'geodirectory')
|
|
| 600 | + ), |
|
| 601 | + 'email' => array( |
|
| 602 | + 'field_type' => 'email', |
|
| 603 | + 'class' => 'gd-email', |
|
| 604 | + 'icon' => 'fa fa-envelope-o', |
|
| 605 | + 'name' => __('Email', 'geodirectory'),
|
|
| 606 | + 'description' => __('Adds a email input', 'geodirectory')
|
|
| 607 | + ), |
|
| 608 | + 'select' => array( |
|
| 609 | + 'field_type' => 'select', |
|
| 610 | + 'class' => 'gd-select', |
|
| 611 | + 'icon' => 'fa fa-caret-square-o-down', |
|
| 612 | + 'name' => __('Select', 'geodirectory'),
|
|
| 613 | + 'description' => __('Adds a select input', 'geodirectory')
|
|
| 614 | + ), |
|
| 615 | + 'multiselect' => array( |
|
| 616 | + 'field_type' => 'multiselect', |
|
| 617 | + 'class' => 'gd-multiselect', |
|
| 618 | + 'icon' => 'fa fa-caret-square-o-down', |
|
| 619 | + 'name' => __('Multi Select', 'geodirectory'),
|
|
| 620 | + 'description' => __('Adds a multiselect input', 'geodirectory')
|
|
| 621 | + ), |
|
| 622 | + 'url' => array( |
|
| 623 | + 'field_type' => 'url', |
|
| 624 | + 'class' => 'gd-url', |
|
| 625 | + 'icon' => 'fa fa-link', |
|
| 626 | + 'name' => __('URL', 'geodirectory'),
|
|
| 627 | + 'description' => __('Adds a url input', 'geodirectory')
|
|
| 628 | + ), |
|
| 629 | + 'html' => array( |
|
| 630 | + 'field_type' => 'html', |
|
| 631 | + 'class' => 'gd-html', |
|
| 632 | + 'icon' => 'fa fa-code', |
|
| 633 | + 'name' => __('HTML', 'geodirectory'),
|
|
| 634 | + 'description' => __('Adds a html input textarea', 'geodirectory')
|
|
| 635 | + ), |
|
| 636 | + 'file' => array( |
|
| 637 | + 'field_type' => 'file', |
|
| 638 | + 'class' => 'gd-file', |
|
| 639 | + 'icon' => 'fa fa-file', |
|
| 640 | + 'name' => __('File Upload', 'geodirectory'),
|
|
| 641 | + 'description' => __('Adds a file input', 'geodirectory')
|
|
| 642 | + ) |
|
| 643 | + ); |
|
| 644 | + |
|
| 645 | + /** |
|
| 646 | + * Filter the custom fields array to be able to add or remove items. |
|
| 647 | + * |
|
| 648 | + * @since 1.6.6 |
|
| 649 | + * |
|
| 650 | + * @param array $custom_fields {
|
|
| 651 | + * The custom fields array to be filtered. |
|
| 652 | + * |
|
| 653 | + * @type string $field_type The type of field, eg: text, datepicker, textarea, time, checkbox, phone, radio, email, select, multiselect, url, html, file. |
|
| 654 | + * @type string $class The class for the field in backend. |
|
| 655 | + * @type string $icon Can be font-awesome class name or icon image url. |
|
| 656 | + * @type string $name The name of the field. |
|
| 657 | + * @type string $description A short description about the field. |
|
| 658 | + * @type array $defaults {
|
|
| 659 | + * Optional. Used to set the default value of the field. |
|
| 660 | + * |
|
| 661 | + * @type string data_type The SQL data type for the field. VARCHAR, TEXT, TIME, TINYINT, INT, FLOAT, DATE |
|
| 662 | + * @type int decimal_point limit if using FLOAT data_type |
|
| 663 | + * @type string admin_title The admin title for the field. |
|
| 664 | + * @type string site_title This will be the title for the field on the frontend. |
|
| 665 | + * @type string admin_desc This will be shown below the field on the add listing form. |
|
| 666 | + * @type string htmlvar_name This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters. |
|
| 667 | + * @type bool is_active If false the field will not be displayed anywhere. |
|
| 668 | + * @type bool for_admin_use If true then only site admin can see and edit this field. |
|
| 669 | + * @type string default_value The default value for the input on the add listing page. |
|
| 670 | + * @type string show_in The locations to show in. [detail],[moreinfo],[listing],[owntab],[mapbubble] |
|
| 671 | + * @type bool is_required If true the field will be required on the add listing page. |
|
| 672 | + * @type string option_values The option values for select and multiselect only |
|
| 673 | + * @type string validation_pattern HTML5 validation pattern (text input only by default). |
|
| 674 | + * @type string validation_msg HTML5 validation message (text input only by default). |
|
| 675 | + * @type string required_msg Required warning message. |
|
| 676 | + * @type string field_icon Icon url or font awesome class. |
|
| 677 | + * @type string css_class Field custom css class for field custom style. |
|
| 678 | + * @type bool cat_sort If true the field will appear in the category sort options, if false the field will be hidden, leave blank to show option. |
|
| 679 | + * @type bool cat_sort If true the field will appear in the advanced search sort options, if false the field will be hidden, leave blank to show option. (advanced search addon required) |
|
| 680 | + * } |
|
| 681 | + * } |
|
| 682 | + * @param string $post_type The post type requested. |
|
| 683 | + */ |
|
| 684 | + return apply_filters('geodir_custom_fields',$custom_fields,$post_type);
|
|
| 685 | 685 | } |
| 686 | 686 | |
| 687 | 687 | /** |
@@ -694,19 +694,19 @@ discard block |
||
| 694 | 694 | */ |
| 695 | 695 | function geodir_custom_available_fields($type='') |
| 696 | 696 | {
|
| 697 | - $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 698 | - ?> |
|
| 697 | + $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 698 | + ?> |
|
| 699 | 699 | <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/> |
| 700 | 700 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>" /> |
| 701 | 701 | |
| 702 | 702 | <?php |
| 703 | - if($type=='predefined'){
|
|
| 704 | - $cfs = geodir_custom_fields_predefined($listing_type); |
|
| 705 | - }elseif($type=='custom'){
|
|
| 706 | - $cfs = geodir_custom_fields_custom($listing_type); |
|
| 707 | - }else{
|
|
| 708 | - $cfs = geodir_custom_fields($listing_type); |
|
| 709 | - ?> |
|
| 703 | + if($type=='predefined'){
|
|
| 704 | + $cfs = geodir_custom_fields_predefined($listing_type); |
|
| 705 | + }elseif($type=='custom'){
|
|
| 706 | + $cfs = geodir_custom_fields_custom($listing_type); |
|
| 707 | + }else{
|
|
| 708 | + $cfs = geodir_custom_fields($listing_type); |
|
| 709 | + ?> |
|
| 710 | 710 | <ul class="full gd-cf-tooltip-wrap"> |
| 711 | 711 | <li> |
| 712 | 712 | <div class="gdcf-tooltip"> |
@@ -727,18 +727,18 @@ discard block |
||
| 727 | 727 | </ul> |
| 728 | 728 | |
| 729 | 729 | <?php |
| 730 | - } |
|
| 730 | + } |
|
| 731 | 731 | |
| 732 | - if(!empty($cfs)) {
|
|
| 733 | - echo '<ul>'; |
|
| 734 | - foreach ( $cfs as $id => $cf ) {
|
|
| 735 | - ?> |
|
| 732 | + if(!empty($cfs)) {
|
|
| 733 | + echo '<ul>'; |
|
| 734 | + foreach ( $cfs as $id => $cf ) {
|
|
| 735 | + ?> |
|
| 736 | 736 | |
| 737 | 737 | <li class="gd-cf-tooltip-wrap"> |
| 738 | 738 | <?php |
| 739 | - if ( isset( $cf['description'] ) && $cf['description'] ) {
|
|
| 740 | - echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>'; |
|
| 741 | - } ?> |
|
| 739 | + if ( isset( $cf['description'] ) && $cf['description'] ) {
|
|
| 740 | + echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>'; |
|
| 741 | + } ?> |
|
| 742 | 742 | |
| 743 | 743 | <a id="gd-<?php echo $id; ?>" |
| 744 | 744 | data-field-custom-type="<?php echo $type; ?>" |
@@ -748,21 +748,21 @@ discard block |
||
| 748 | 748 | href="javascript:void(0);"> |
| 749 | 749 | |
| 750 | 750 | <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {
|
| 751 | - echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>'; |
|
| 752 | - } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {
|
|
| 753 | - echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';
|
|
| 754 | - } else {
|
|
| 755 | - echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 756 | - } ?> |
|
| 751 | + echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>'; |
|
| 752 | + } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {
|
|
| 753 | + echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';
|
|
| 754 | + } else {
|
|
| 755 | + echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 756 | + } ?> |
|
| 757 | 757 | <?php echo $cf['name']; ?> |
| 758 | 758 | </a> |
| 759 | 759 | </li> |
| 760 | 760 | <?php |
| 761 | - } |
|
| 762 | - }else{
|
|
| 763 | - _e('There are no custom fields here yet.', 'geodirectory');
|
|
| 764 | - } |
|
| 765 | - ?> |
|
| 761 | + } |
|
| 762 | + }else{
|
|
| 763 | + _e('There are no custom fields here yet.', 'geodirectory');
|
|
| 764 | + } |
|
| 765 | + ?> |
|
| 766 | 766 | |
| 767 | 767 | |
| 768 | 768 | </ul> |
@@ -781,26 +781,26 @@ discard block |
||
| 781 | 781 | */ |
| 782 | 782 | function geodir_custom_selected_fields() |
| 783 | 783 | {
|
| 784 | - $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 785 | - ?> |
|
| 784 | + $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 785 | + ?> |
|
| 786 | 786 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/> |
| 787 | 787 | <ul class="core"> |
| 788 | 788 | <?php |
| 789 | - global $wpdb; |
|
| 790 | - $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
|
|
| 791 | - |
|
| 792 | - if (!empty($fields)) {
|
|
| 793 | - foreach ($fields as $field) {
|
|
| 794 | - //$result_str = $field->id; |
|
| 795 | - $result_str = $field; |
|
| 796 | - $field_type = $field->field_type; |
|
| 797 | - $field_type_key = $field->field_type_key; |
|
| 798 | - $field_ins_upd = 'display'; |
|
| 799 | - |
|
| 800 | - geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key); |
|
| 801 | - } |
|
| 802 | - } |
|
| 803 | - ?></ul> |
|
| 789 | + global $wpdb; |
|
| 790 | + $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
|
|
| 791 | + |
|
| 792 | + if (!empty($fields)) {
|
|
| 793 | + foreach ($fields as $field) {
|
|
| 794 | + //$result_str = $field->id; |
|
| 795 | + $result_str = $field; |
|
| 796 | + $field_type = $field->field_type; |
|
| 797 | + $field_type_key = $field->field_type_key; |
|
| 798 | + $field_ins_upd = 'display'; |
|
| 799 | + |
|
| 800 | + geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key); |
|
| 801 | + } |
|
| 802 | + } |
|
| 803 | + ?></ul> |
|
| 804 | 804 | <?php |
| 805 | 805 | |
| 806 | 806 | } |
@@ -819,16 +819,16 @@ discard block |
||
| 819 | 819 | function geodir_custom_fields_panel_head($heading, $sub_tab, $listing_type) |
| 820 | 820 | {
|
| 821 | 821 | |
| 822 | - switch ($sub_tab) {
|
|
| 823 | - case 'custom_fields': |
|
| 824 | - $heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 825 | - break; |
|
| 822 | + switch ($sub_tab) {
|
|
| 823 | + case 'custom_fields': |
|
| 824 | + $heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 825 | + break; |
|
| 826 | 826 | |
| 827 | - case 'sorting_options': |
|
| 828 | - $heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 829 | - break; |
|
| 830 | - } |
|
| 831 | - return $heading; |
|
| 827 | + case 'sorting_options': |
|
| 828 | + $heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 829 | + break; |
|
| 830 | + } |
|
| 831 | + return $heading; |
|
| 832 | 832 | } |
| 833 | 833 | |
| 834 | 834 | |
@@ -846,16 +846,16 @@ discard block |
||
| 846 | 846 | function geodir_cf_panel_available_fields_head($heading, $sub_tab, $listing_type) |
| 847 | 847 | {
|
| 848 | 848 | |
| 849 | - switch ($sub_tab) {
|
|
| 850 | - case 'custom_fields': |
|
| 851 | - $heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 852 | - break; |
|
| 849 | + switch ($sub_tab) {
|
|
| 850 | + case 'custom_fields': |
|
| 851 | + $heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 852 | + break; |
|
| 853 | 853 | |
| 854 | - case 'sorting_options': |
|
| 855 | - $heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 856 | - break; |
|
| 857 | - } |
|
| 858 | - return $heading; |
|
| 854 | + case 'sorting_options': |
|
| 855 | + $heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 856 | + break; |
|
| 857 | + } |
|
| 858 | + return $heading; |
|
| 859 | 859 | } |
| 860 | 860 | |
| 861 | 861 | |
@@ -873,16 +873,16 @@ discard block |
||
| 873 | 873 | function geodir_cf_panel_available_fields_note($note, $sub_tab, $listing_type) |
| 874 | 874 | {
|
| 875 | 875 | |
| 876 | - switch ($sub_tab) {
|
|
| 877 | - case 'custom_fields': |
|
| 878 | - $note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 879 | - break; |
|
| 876 | + switch ($sub_tab) {
|
|
| 877 | + case 'custom_fields': |
|
| 878 | + $note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 879 | + break; |
|
| 880 | 880 | |
| 881 | - case 'sorting_options': |
|
| 882 | - $note = sprintf(__('Click on any box below to make it appear in the sorting option dropdown on %s listing and search results.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 883 | - break; |
|
| 884 | - } |
|
| 885 | - return $note; |
|
| 881 | + case 'sorting_options': |
|
| 882 | + $note = sprintf(__('Click on any box below to make it appear in the sorting option dropdown on %s listing and search results.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 883 | + break; |
|
| 884 | + } |
|
| 885 | + return $note; |
|
| 886 | 886 | } |
| 887 | 887 | |
| 888 | 888 | |
@@ -900,16 +900,16 @@ discard block |
||
| 900 | 900 | function geodir_cf_panel_selected_fields_head($heading, $sub_tab, $listing_type) |
| 901 | 901 | {
|
| 902 | 902 | |
| 903 | - switch ($sub_tab) {
|
|
| 904 | - case 'custom_fields': |
|
| 905 | - $heading = sprintf(__('List of fields that will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 906 | - break; |
|
| 903 | + switch ($sub_tab) {
|
|
| 904 | + case 'custom_fields': |
|
| 905 | + $heading = sprintf(__('List of fields that will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 906 | + break; |
|
| 907 | 907 | |
| 908 | - case 'sorting_options': |
|
| 909 | - $heading = sprintf(__('List of fields that will appear in %s listing and search results sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 910 | - break; |
|
| 911 | - } |
|
| 912 | - return $heading; |
|
| 908 | + case 'sorting_options': |
|
| 909 | + $heading = sprintf(__('List of fields that will appear in %s listing and search results sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 910 | + break; |
|
| 911 | + } |
|
| 912 | + return $heading; |
|
| 913 | 913 | } |
| 914 | 914 | |
| 915 | 915 | |
@@ -927,16 +927,16 @@ discard block |
||
| 927 | 927 | function geodir_cf_panel_selected_fields_note($note, $sub_tab, $listing_type) |
| 928 | 928 | {
|
| 929 | 929 | |
| 930 | - switch ($sub_tab) {
|
|
| 931 | - case 'custom_fields': |
|
| 932 | - $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 933 | - break; |
|
| 930 | + switch ($sub_tab) {
|
|
| 931 | + case 'custom_fields': |
|
| 932 | + $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 933 | + break; |
|
| 934 | 934 | |
| 935 | - case 'sorting_options': |
|
| 936 | - $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing and search results page.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 937 | - break; |
|
| 938 | - } |
|
| 939 | - return $note; |
|
| 935 | + case 'sorting_options': |
|
| 936 | + $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing and search results page.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 937 | + break; |
|
| 938 | + } |
|
| 939 | + return $note; |
|
| 940 | 940 | } |
| 941 | 941 | |
| 942 | 942 | |
@@ -952,16 +952,16 @@ discard block |
||
| 952 | 952 | */ |
| 953 | 953 | function geodir_remove_unnecessary_fields() |
| 954 | 954 | {
|
| 955 | - global $wpdb, $plugin_prefix; |
|
| 955 | + global $wpdb, $plugin_prefix; |
|
| 956 | 956 | |
| 957 | - if (!get_option('geodir_remove_unnecessary_fields')) {
|
|
| 957 | + if (!get_option('geodir_remove_unnecessary_fields')) {
|
|
| 958 | 958 | |
| 959 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
|
|
| 960 | - $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
|
|
| 959 | + if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
|
|
| 960 | + $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
|
|
| 961 | 961 | |
| 962 | - update_option('geodir_remove_unnecessary_fields', '1');
|
|
| 962 | + update_option('geodir_remove_unnecessary_fields', '1');
|
|
| 963 | 963 | |
| 964 | - } |
|
| 964 | + } |
|
| 965 | 965 | |
| 966 | 966 | } |
| 967 | 967 | |
@@ -979,28 +979,28 @@ discard block |
||
| 979 | 979 | */ |
| 980 | 980 | function geodir_admin_ajax_handler() |
| 981 | 981 | {
|
| 982 | - if (isset($_REQUEST['geodir_admin_ajax_action']) && $_REQUEST['geodir_admin_ajax_action'] != '') {
|
|
| 983 | - $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action']; |
|
| 984 | - $diagnose_this = ""; |
|
| 985 | - switch ($geodir_admin_ajax_action) {
|
|
| 986 | - case 'diagnosis' : |
|
| 987 | - if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
|
|
| 988 | - $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
|
| 989 | - call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 990 | - |
|
| 991 | - } |
|
| 992 | - exit(); |
|
| 993 | - break; |
|
| 994 | - |
|
| 995 | - case 'diagnosis-fix' : |
|
| 996 | - if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') |
|
| 997 | - $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
|
| 998 | - call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 999 | - exit(); |
|
| 1000 | - break; |
|
| 1001 | - } |
|
| 1002 | - } |
|
| 1003 | - exit(); |
|
| 982 | + if (isset($_REQUEST['geodir_admin_ajax_action']) && $_REQUEST['geodir_admin_ajax_action'] != '') {
|
|
| 983 | + $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action']; |
|
| 984 | + $diagnose_this = ""; |
|
| 985 | + switch ($geodir_admin_ajax_action) {
|
|
| 986 | + case 'diagnosis' : |
|
| 987 | + if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
|
|
| 988 | + $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
|
| 989 | + call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 990 | + |
|
| 991 | + } |
|
| 992 | + exit(); |
|
| 993 | + break; |
|
| 994 | + |
|
| 995 | + case 'diagnosis-fix' : |
|
| 996 | + if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') |
|
| 997 | + $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
|
| 998 | + call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 999 | + exit(); |
|
| 1000 | + break; |
|
| 1001 | + } |
|
| 1002 | + } |
|
| 1003 | + exit(); |
|
| 1004 | 1004 | } |
| 1005 | 1005 | |
| 1006 | 1006 | |
@@ -1018,127 +1018,127 @@ discard block |
||
| 1018 | 1018 | */ |
| 1019 | 1019 | function geodir_diagnose_multisite_table($filter_arr, $table, $tabel_name, $fix) |
| 1020 | 1020 | {
|
| 1021 | - global $wpdb; |
|
| 1022 | - //$filter_arr['output_str'] .='###'.$table.'###'; |
|
| 1023 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {
|
|
| 1024 | - $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";
|
|
| 1025 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1026 | - |
|
| 1027 | - } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1028 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1029 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1030 | - $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";
|
|
| 1031 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1032 | - |
|
| 1033 | - if ($fix) {
|
|
| 1034 | - $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count
|
|
| 1035 | - $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count
|
|
| 1036 | - |
|
| 1037 | - if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2
|
|
| 1038 | - //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;
|
|
| 1039 | - |
|
| 1040 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table
|
|
| 1041 | - |
|
| 1042 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1043 | - $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";
|
|
| 1044 | - } else {
|
|
| 1045 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1046 | - } |
|
| 1047 | - |
|
| 1048 | - } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it
|
|
| 1049 | - |
|
| 1050 | - $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2
|
|
| 1051 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table
|
|
| 1052 | - |
|
| 1053 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1054 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1055 | - } else {
|
|
| 1056 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1057 | - } |
|
| 1058 | - |
|
| 1059 | - } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors
|
|
| 1060 | - |
|
| 1061 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2
|
|
| 1062 | - |
|
| 1063 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1064 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";
|
|
| 1065 | - } else {
|
|
| 1066 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1067 | - } |
|
| 1068 | - |
|
| 1069 | - } |
|
| 1070 | - |
|
| 1071 | - } |
|
| 1072 | - |
|
| 1073 | - |
|
| 1074 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1075 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1076 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1077 | - |
|
| 1078 | - if ($fix) {
|
|
| 1079 | - if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it
|
|
| 1080 | - if ($wpdb->query("DROP TABLE IF EXISTS $table")) {
|
|
| 1081 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1082 | - } else {
|
|
| 1083 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";
|
|
| 1084 | - } |
|
| 1085 | - |
|
| 1086 | - } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original
|
|
| 1087 | - if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {
|
|
| 1088 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1089 | - } else {
|
|
| 1090 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1091 | - } |
|
| 1092 | - if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1093 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1094 | - } else {
|
|
| 1095 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1096 | - } |
|
| 1097 | - } else {// else rename the original table to _ms_bak
|
|
| 1098 | - if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1099 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1100 | - } else {
|
|
| 1101 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1102 | - } |
|
| 1103 | - } |
|
| 1104 | - } |
|
| 1105 | - |
|
| 1106 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1107 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1108 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1109 | - |
|
| 1110 | - if ($fix) {
|
|
| 1111 | - // if original table exists but new does not, rename |
|
| 1112 | - if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1113 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1114 | - } else {
|
|
| 1115 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1116 | - } |
|
| 1117 | - |
|
| 1118 | - } |
|
| 1119 | - |
|
| 1120 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1121 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1122 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1123 | - |
|
| 1124 | - if ($fix) {
|
|
| 1125 | - // if original table does not exist try deleting db_vers of all addons so the initial db_install scripts run; |
|
| 1126 | - delete_option('geodirlocation_db_version');
|
|
| 1127 | - delete_option('geodirevents_db_version');
|
|
| 1128 | - delete_option('geodir_reviewrating_db_version');
|
|
| 1129 | - delete_option('gdevents_db_version');
|
|
| 1130 | - delete_option('geodirectory_db_version');
|
|
| 1131 | - delete_option('geodirclaim_db_version');
|
|
| 1132 | - delete_option('geodir_custom_posts_db_version');
|
|
| 1133 | - delete_option('geodir_reviewratings_db_version');
|
|
| 1134 | - delete_option('geodiradvancesearch_db_version');
|
|
| 1135 | - $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";
|
|
| 1136 | - } |
|
| 1137 | - |
|
| 1138 | - } else {
|
|
| 1139 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1140 | - } |
|
| 1141 | - return $filter_arr; |
|
| 1021 | + global $wpdb; |
|
| 1022 | + //$filter_arr['output_str'] .='###'.$table.'###'; |
|
| 1023 | + if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {
|
|
| 1024 | + $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";
|
|
| 1025 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1026 | + |
|
| 1027 | + } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1028 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1029 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1030 | + $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";
|
|
| 1031 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1032 | + |
|
| 1033 | + if ($fix) {
|
|
| 1034 | + $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count
|
|
| 1035 | + $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count
|
|
| 1036 | + |
|
| 1037 | + if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2
|
|
| 1038 | + //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;
|
|
| 1039 | + |
|
| 1040 | + $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table
|
|
| 1041 | + |
|
| 1042 | + if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1043 | + $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";
|
|
| 1044 | + } else {
|
|
| 1045 | + $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1046 | + } |
|
| 1047 | + |
|
| 1048 | + } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it
|
|
| 1049 | + |
|
| 1050 | + $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2
|
|
| 1051 | + $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table
|
|
| 1052 | + |
|
| 1053 | + if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1054 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1055 | + } else {
|
|
| 1056 | + $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1057 | + } |
|
| 1058 | + |
|
| 1059 | + } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors
|
|
| 1060 | + |
|
| 1061 | + $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2
|
|
| 1062 | + |
|
| 1063 | + if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1064 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";
|
|
| 1065 | + } else {
|
|
| 1066 | + $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1067 | + } |
|
| 1068 | + |
|
| 1069 | + } |
|
| 1070 | + |
|
| 1071 | + } |
|
| 1072 | + |
|
| 1073 | + |
|
| 1074 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1075 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1076 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1077 | + |
|
| 1078 | + if ($fix) {
|
|
| 1079 | + if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it
|
|
| 1080 | + if ($wpdb->query("DROP TABLE IF EXISTS $table")) {
|
|
| 1081 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1082 | + } else {
|
|
| 1083 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";
|
|
| 1084 | + } |
|
| 1085 | + |
|
| 1086 | + } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original
|
|
| 1087 | + if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {
|
|
| 1088 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1089 | + } else {
|
|
| 1090 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1091 | + } |
|
| 1092 | + if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1093 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1094 | + } else {
|
|
| 1095 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1096 | + } |
|
| 1097 | + } else {// else rename the original table to _ms_bak
|
|
| 1098 | + if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1099 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1100 | + } else {
|
|
| 1101 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1102 | + } |
|
| 1103 | + } |
|
| 1104 | + } |
|
| 1105 | + |
|
| 1106 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1107 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1108 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1109 | + |
|
| 1110 | + if ($fix) {
|
|
| 1111 | + // if original table exists but new does not, rename |
|
| 1112 | + if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1113 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1114 | + } else {
|
|
| 1115 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1116 | + } |
|
| 1117 | + |
|
| 1118 | + } |
|
| 1119 | + |
|
| 1120 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1121 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1122 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1123 | + |
|
| 1124 | + if ($fix) {
|
|
| 1125 | + // if original table does not exist try deleting db_vers of all addons so the initial db_install scripts run; |
|
| 1126 | + delete_option('geodirlocation_db_version');
|
|
| 1127 | + delete_option('geodirevents_db_version');
|
|
| 1128 | + delete_option('geodir_reviewrating_db_version');
|
|
| 1129 | + delete_option('gdevents_db_version');
|
|
| 1130 | + delete_option('geodirectory_db_version');
|
|
| 1131 | + delete_option('geodirclaim_db_version');
|
|
| 1132 | + delete_option('geodir_custom_posts_db_version');
|
|
| 1133 | + delete_option('geodir_reviewratings_db_version');
|
|
| 1134 | + delete_option('geodiradvancesearch_db_version');
|
|
| 1135 | + $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";
|
|
| 1136 | + } |
|
| 1137 | + |
|
| 1138 | + } else {
|
|
| 1139 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1140 | + } |
|
| 1141 | + return $filter_arr; |
|
| 1142 | 1142 | } |
| 1143 | 1143 | |
| 1144 | 1144 | |
@@ -1152,111 +1152,111 @@ discard block |
||
| 1152 | 1152 | */ |
| 1153 | 1153 | function geodir_diagnose_tags_sync() |
| 1154 | 1154 | {
|
| 1155 | - global $wpdb, $plugin_prefix; |
|
| 1156 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1157 | - $step = isset($_POST['step']) ? strip_tags(esc_sql($_POST['step'])) : 0; |
|
| 1158 | - $step_max_items = geodir_get_diagnose_step_max_items(); |
|
| 1159 | - $offset = (int) $step * $step_max_items; |
|
| 1160 | - $ptype = isset($_POST['ptype']) ? strip_tags(esc_sql($_POST['ptype'])) : false; |
|
| 1161 | - |
|
| 1162 | - $total_listings = geodir_total_listings_count(); |
|
| 1163 | - $total_ptype_listings = 0; |
|
| 1164 | - if ($ptype) {
|
|
| 1165 | - $total_ptype_listings = geodir_total_listings_count($ptype); |
|
| 1166 | - } |
|
| 1167 | - $max_step = ceil($total_ptype_listings / $step_max_items) - 1; |
|
| 1155 | + global $wpdb, $plugin_prefix; |
|
| 1156 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1157 | + $step = isset($_POST['step']) ? strip_tags(esc_sql($_POST['step'])) : 0; |
|
| 1158 | + $step_max_items = geodir_get_diagnose_step_max_items(); |
|
| 1159 | + $offset = (int) $step * $step_max_items; |
|
| 1160 | + $ptype = isset($_POST['ptype']) ? strip_tags(esc_sql($_POST['ptype'])) : false; |
|
| 1161 | + |
|
| 1162 | + $total_listings = geodir_total_listings_count(); |
|
| 1163 | + $total_ptype_listings = 0; |
|
| 1164 | + if ($ptype) {
|
|
| 1165 | + $total_ptype_listings = geodir_total_listings_count($ptype); |
|
| 1166 | + } |
|
| 1167 | + $max_step = ceil($total_ptype_listings / $step_max_items) - 1; |
|
| 1168 | 1168 | |
| 1169 | - //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1170 | - $is_error_during_diagnose = false; |
|
| 1171 | - $output_str = ''; |
|
| 1169 | + //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1170 | + $is_error_during_diagnose = false; |
|
| 1171 | + $output_str = ''; |
|
| 1172 | 1172 | |
| 1173 | - if ($ptype && !empty($ptype) && $total_listings > $step_max_items) {
|
|
| 1174 | - $stepped_process = true; |
|
| 1175 | - } else {
|
|
| 1176 | - $stepped_process = false; |
|
| 1177 | - } |
|
| 1178 | - |
|
| 1179 | - if ($stepped_process) {
|
|
| 1180 | - $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset ); |
|
| 1181 | - $posts = $wpdb->get_results( $sql ); |
|
| 1182 | - |
|
| 1183 | - if (!empty($posts)) {
|
|
| 1184 | - |
|
| 1185 | - foreach ($posts as $p) {
|
|
| 1186 | - $p->post_type = $ptype; |
|
| 1187 | - $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1188 | - if (empty($raw_tags)) {
|
|
| 1189 | - $post_tags = ''; |
|
| 1190 | - } else {
|
|
| 1191 | - $post_tags = implode(",", $raw_tags);
|
|
| 1192 | - } |
|
| 1193 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1194 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1195 | - |
|
| 1196 | - } |
|
| 1197 | - if ($step >= $max_step) {
|
|
| 1198 | - $output_str = "done"; |
|
| 1199 | - } else {
|
|
| 1200 | - $output_str = $step + 1; |
|
| 1201 | - } |
|
| 1202 | - } |
|
| 1203 | - |
|
| 1204 | - } else {
|
|
| 1205 | - $all_postypes = geodir_get_posttypes(); |
|
| 1206 | - |
|
| 1207 | - if (!empty($all_postypes)) {
|
|
| 1208 | - foreach ($all_postypes as $key) {
|
|
| 1209 | - // update each GD CPT |
|
| 1210 | - $posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail"); |
|
| 1211 | - |
|
| 1212 | - if (!empty($posts)) {
|
|
| 1213 | - |
|
| 1214 | - foreach ($posts as $p) {
|
|
| 1215 | - $p->post_type = $key; |
|
| 1216 | - $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1217 | - if (empty($raw_tags)) {
|
|
| 1218 | - $post_tags = ''; |
|
| 1219 | - } else {
|
|
| 1220 | - $post_tags = implode(",", $raw_tags);
|
|
| 1221 | - } |
|
| 1222 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1223 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1224 | - |
|
| 1225 | - } |
|
| 1226 | - $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1227 | - } |
|
| 1228 | - |
|
| 1229 | - } |
|
| 1230 | - |
|
| 1231 | - } |
|
| 1232 | - } |
|
| 1233 | - |
|
| 1234 | - |
|
| 1235 | - if ($is_error_during_diagnose) {
|
|
| 1236 | - $info_div_class = "geodir_problem_info"; |
|
| 1237 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1238 | - } else {
|
|
| 1239 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1240 | - $fix_button_txt = ''; |
|
| 1241 | - } |
|
| 1242 | - |
|
| 1243 | - if ($stepped_process) {
|
|
| 1244 | - $percent = ($step/$max_step) * 100; |
|
| 1245 | - if ($output_str == 'done') {
|
|
| 1246 | - echo $output_str; |
|
| 1247 | - } else {
|
|
| 1248 | - $output = array( |
|
| 1249 | - 'step' => $output_str, |
|
| 1250 | - 'percent' => $percent |
|
| 1251 | - ); |
|
| 1252 | - echo json_encode($output); |
|
| 1253 | - } |
|
| 1254 | - } else {
|
|
| 1255 | - echo "<ul class='$info_div_class'>"; |
|
| 1256 | - echo $output_str; |
|
| 1257 | - echo $fix_button_txt; |
|
| 1258 | - echo "</ul>"; |
|
| 1259 | - } |
|
| 1173 | + if ($ptype && !empty($ptype) && $total_listings > $step_max_items) {
|
|
| 1174 | + $stepped_process = true; |
|
| 1175 | + } else {
|
|
| 1176 | + $stepped_process = false; |
|
| 1177 | + } |
|
| 1178 | + |
|
| 1179 | + if ($stepped_process) {
|
|
| 1180 | + $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset ); |
|
| 1181 | + $posts = $wpdb->get_results( $sql ); |
|
| 1182 | + |
|
| 1183 | + if (!empty($posts)) {
|
|
| 1184 | + |
|
| 1185 | + foreach ($posts as $p) {
|
|
| 1186 | + $p->post_type = $ptype; |
|
| 1187 | + $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1188 | + if (empty($raw_tags)) {
|
|
| 1189 | + $post_tags = ''; |
|
| 1190 | + } else {
|
|
| 1191 | + $post_tags = implode(",", $raw_tags);
|
|
| 1192 | + } |
|
| 1193 | + $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1194 | + $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1195 | + |
|
| 1196 | + } |
|
| 1197 | + if ($step >= $max_step) {
|
|
| 1198 | + $output_str = "done"; |
|
| 1199 | + } else {
|
|
| 1200 | + $output_str = $step + 1; |
|
| 1201 | + } |
|
| 1202 | + } |
|
| 1203 | + |
|
| 1204 | + } else {
|
|
| 1205 | + $all_postypes = geodir_get_posttypes(); |
|
| 1206 | + |
|
| 1207 | + if (!empty($all_postypes)) {
|
|
| 1208 | + foreach ($all_postypes as $key) {
|
|
| 1209 | + // update each GD CPT |
|
| 1210 | + $posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail"); |
|
| 1211 | + |
|
| 1212 | + if (!empty($posts)) {
|
|
| 1213 | + |
|
| 1214 | + foreach ($posts as $p) {
|
|
| 1215 | + $p->post_type = $key; |
|
| 1216 | + $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1217 | + if (empty($raw_tags)) {
|
|
| 1218 | + $post_tags = ''; |
|
| 1219 | + } else {
|
|
| 1220 | + $post_tags = implode(",", $raw_tags);
|
|
| 1221 | + } |
|
| 1222 | + $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1223 | + $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1224 | + |
|
| 1225 | + } |
|
| 1226 | + $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1227 | + } |
|
| 1228 | + |
|
| 1229 | + } |
|
| 1230 | + |
|
| 1231 | + } |
|
| 1232 | + } |
|
| 1233 | + |
|
| 1234 | + |
|
| 1235 | + if ($is_error_during_diagnose) {
|
|
| 1236 | + $info_div_class = "geodir_problem_info"; |
|
| 1237 | + $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1238 | + } else {
|
|
| 1239 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1240 | + $fix_button_txt = ''; |
|
| 1241 | + } |
|
| 1242 | + |
|
| 1243 | + if ($stepped_process) {
|
|
| 1244 | + $percent = ($step/$max_step) * 100; |
|
| 1245 | + if ($output_str == 'done') {
|
|
| 1246 | + echo $output_str; |
|
| 1247 | + } else {
|
|
| 1248 | + $output = array( |
|
| 1249 | + 'step' => $output_str, |
|
| 1250 | + 'percent' => $percent |
|
| 1251 | + ); |
|
| 1252 | + echo json_encode($output); |
|
| 1253 | + } |
|
| 1254 | + } else {
|
|
| 1255 | + echo "<ul class='$info_div_class'>"; |
|
| 1256 | + echo $output_str; |
|
| 1257 | + echo $fix_button_txt; |
|
| 1258 | + echo "</ul>"; |
|
| 1259 | + } |
|
| 1260 | 1260 | } |
| 1261 | 1261 | |
| 1262 | 1262 | /** |
@@ -1271,75 +1271,75 @@ discard block |
||
| 1271 | 1271 | */ |
| 1272 | 1272 | function geodir_diagnose_cats_sync() |
| 1273 | 1273 | {
|
| 1274 | - global $wpdb, $plugin_prefix; |
|
| 1275 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1274 | + global $wpdb, $plugin_prefix; |
|
| 1275 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1276 | 1276 | |
| 1277 | - //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1278 | - $is_error_during_diagnose = false; |
|
| 1279 | - $output_str = ''; |
|
| 1277 | + //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1278 | + $is_error_during_diagnose = false; |
|
| 1279 | + $output_str = ''; |
|
| 1280 | 1280 | |
| 1281 | 1281 | |
| 1282 | - $all_postypes = geodir_get_posttypes(); |
|
| 1282 | + $all_postypes = geodir_get_posttypes(); |
|
| 1283 | 1283 | |
| 1284 | - if (!empty($all_postypes)) {
|
|
| 1285 | - foreach ($all_postypes as $key) {
|
|
| 1286 | - // update each GD CTP |
|
| 1287 | - $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");
|
|
| 1284 | + if (!empty($all_postypes)) {
|
|
| 1285 | + foreach ($all_postypes as $key) {
|
|
| 1286 | + // update each GD CTP |
|
| 1287 | + $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");
|
|
| 1288 | 1288 | |
| 1289 | - if (!empty($posts)) {
|
|
| 1289 | + if (!empty($posts)) {
|
|
| 1290 | 1290 | |
| 1291 | - foreach ($posts as $p) {
|
|
| 1292 | - $p->post_type = $key; |
|
| 1293 | - $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));
|
|
| 1291 | + foreach ($posts as $p) {
|
|
| 1292 | + $p->post_type = $key; |
|
| 1293 | + $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));
|
|
| 1294 | 1294 | |
| 1295 | - if (empty($raw_cats)) {
|
|
| 1296 | - $post_categories = get_post_meta($p->post_id, 'post_categories', true); |
|
| 1295 | + if (empty($raw_cats)) {
|
|
| 1296 | + $post_categories = get_post_meta($p->post_id, 'post_categories', true); |
|
| 1297 | 1297 | |
| 1298 | - if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {
|
|
| 1299 | - $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);
|
|
| 1300 | - foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {
|
|
| 1301 | - if (is_numeric($cat_part)) {
|
|
| 1302 | - $raw_cats[] = (int)$cat_part; |
|
| 1303 | - } |
|
| 1304 | - } |
|
| 1298 | + if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {
|
|
| 1299 | + $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);
|
|
| 1300 | + foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {
|
|
| 1301 | + if (is_numeric($cat_part)) {
|
|
| 1302 | + $raw_cats[] = (int)$cat_part; |
|
| 1303 | + } |
|
| 1304 | + } |
|
| 1305 | 1305 | |
| 1306 | - } |
|
| 1306 | + } |
|
| 1307 | 1307 | |
| 1308 | - if (!empty($raw_cats)) {
|
|
| 1309 | - $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category'); |
|
| 1308 | + if (!empty($raw_cats)) {
|
|
| 1309 | + $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category'); |
|
| 1310 | 1310 | |
| 1311 | - } |
|
| 1311 | + } |
|
| 1312 | 1312 | |
| 1313 | - } |
|
| 1313 | + } |
|
| 1314 | 1314 | |
| 1315 | 1315 | |
| 1316 | - if (empty($raw_cats)) {
|
|
| 1317 | - $post_cats = ''; |
|
| 1318 | - } else {
|
|
| 1319 | - $post_cats = ',' . implode(",", $raw_cats) . ',';
|
|
| 1320 | - } |
|
| 1321 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1322 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));
|
|
| 1323 | - } |
|
| 1316 | + if (empty($raw_cats)) {
|
|
| 1317 | + $post_cats = ''; |
|
| 1318 | + } else {
|
|
| 1319 | + $post_cats = ',' . implode(",", $raw_cats) . ',';
|
|
| 1320 | + } |
|
| 1321 | + $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1322 | + $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));
|
|
| 1323 | + } |
|
| 1324 | 1324 | |
| 1325 | - } |
|
| 1326 | - $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1325 | + } |
|
| 1326 | + $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1327 | 1327 | |
| 1328 | - } |
|
| 1328 | + } |
|
| 1329 | 1329 | |
| 1330 | - } |
|
| 1330 | + } |
|
| 1331 | 1331 | |
| 1332 | - if ($is_error_during_diagnose) {
|
|
| 1333 | - $info_div_class = "geodir_problem_info"; |
|
| 1334 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1335 | - } else {
|
|
| 1336 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1337 | - $fix_button_txt = ''; |
|
| 1338 | - } |
|
| 1339 | - echo "<ul class='$info_div_class'>"; |
|
| 1340 | - echo $output_str; |
|
| 1341 | - echo $fix_button_txt; |
|
| 1342 | - echo "</ul>"; |
|
| 1332 | + if ($is_error_during_diagnose) {
|
|
| 1333 | + $info_div_class = "geodir_problem_info"; |
|
| 1334 | + $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1335 | + } else {
|
|
| 1336 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1337 | + $fix_button_txt = ''; |
|
| 1338 | + } |
|
| 1339 | + echo "<ul class='$info_div_class'>"; |
|
| 1340 | + echo $output_str; |
|
| 1341 | + echo $fix_button_txt; |
|
| 1342 | + echo "</ul>"; |
|
| 1343 | 1343 | |
| 1344 | 1344 | } |
| 1345 | 1345 | |
@@ -1353,61 +1353,61 @@ discard block |
||
| 1353 | 1353 | */ |
| 1354 | 1354 | function geodir_diagnose_version_clear() |
| 1355 | 1355 | {
|
| 1356 | - global $wpdb, $plugin_prefix; |
|
| 1357 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1358 | - |
|
| 1359 | - //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1360 | - $is_error_during_diagnose = false; |
|
| 1361 | - $output_str = ''; |
|
| 1362 | - |
|
| 1363 | - |
|
| 1364 | - $gd_arr = array('GeoDirectory' => 'geodirectory_db_version',
|
|
| 1365 | - 'Payment Manager' => 'geodir_payments_db_version', |
|
| 1366 | - 'GeoDirectory Framework' => 'gdf_db_version', |
|
| 1367 | - 'Advanced Search' => 'geodiradvancesearch_db_version', |
|
| 1368 | - 'Review Rating Manager' => 'geodir_reviewratings_db_version', |
|
| 1369 | - 'Claim Manager' => 'geodirclaim_db_version', |
|
| 1370 | - 'CPT Manager' => 'geodir_custom_posts_db_version', |
|
| 1371 | - 'Location Manager' => 'geodirlocation_db_version', |
|
| 1372 | - 'Payment Manager' => 'geodir_payments_db_version', |
|
| 1373 | - 'Events Manager' => 'geodirevents_db_version', |
|
| 1374 | - ); |
|
| 1375 | - |
|
| 1376 | - /** |
|
| 1377 | - * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers. |
|
| 1378 | - * |
|
| 1379 | - * @since 1.0.0 |
|
| 1380 | - * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...
|
|
| 1381 | - */ |
|
| 1382 | - $ver_arr = apply_filters('geodir_db_version_name', $gd_arr);
|
|
| 1383 | - |
|
| 1384 | - if (!empty($ver_arr)) {
|
|
| 1385 | - foreach ($ver_arr as $key => $val) {
|
|
| 1386 | - if (delete_option($val)) {
|
|
| 1387 | - $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";
|
|
| 1388 | - } else {
|
|
| 1389 | - $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";
|
|
| 1390 | - } |
|
| 1391 | - |
|
| 1392 | - } |
|
| 1393 | - |
|
| 1394 | - if ($output_str) {
|
|
| 1395 | - $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";
|
|
| 1396 | - } |
|
| 1397 | - |
|
| 1398 | - } |
|
| 1399 | - |
|
| 1400 | - if ($is_error_during_diagnose) {
|
|
| 1401 | - $info_div_class = "geodir_problem_info"; |
|
| 1402 | - $fix_button_txt = ""; |
|
| 1403 | - } else {
|
|
| 1404 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1405 | - $fix_button_txt = ''; |
|
| 1406 | - } |
|
| 1407 | - echo "<ul class='$info_div_class'>"; |
|
| 1408 | - echo $output_str; |
|
| 1409 | - echo $fix_button_txt; |
|
| 1410 | - echo "</ul>"; |
|
| 1356 | + global $wpdb, $plugin_prefix; |
|
| 1357 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1358 | + |
|
| 1359 | + //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1360 | + $is_error_during_diagnose = false; |
|
| 1361 | + $output_str = ''; |
|
| 1362 | + |
|
| 1363 | + |
|
| 1364 | + $gd_arr = array('GeoDirectory' => 'geodirectory_db_version',
|
|
| 1365 | + 'Payment Manager' => 'geodir_payments_db_version', |
|
| 1366 | + 'GeoDirectory Framework' => 'gdf_db_version', |
|
| 1367 | + 'Advanced Search' => 'geodiradvancesearch_db_version', |
|
| 1368 | + 'Review Rating Manager' => 'geodir_reviewratings_db_version', |
|
| 1369 | + 'Claim Manager' => 'geodirclaim_db_version', |
|
| 1370 | + 'CPT Manager' => 'geodir_custom_posts_db_version', |
|
| 1371 | + 'Location Manager' => 'geodirlocation_db_version', |
|
| 1372 | + 'Payment Manager' => 'geodir_payments_db_version', |
|
| 1373 | + 'Events Manager' => 'geodirevents_db_version', |
|
| 1374 | + ); |
|
| 1375 | + |
|
| 1376 | + /** |
|
| 1377 | + * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers. |
|
| 1378 | + * |
|
| 1379 | + * @since 1.0.0 |
|
| 1380 | + * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...
|
|
| 1381 | + */ |
|
| 1382 | + $ver_arr = apply_filters('geodir_db_version_name', $gd_arr);
|
|
| 1383 | + |
|
| 1384 | + if (!empty($ver_arr)) {
|
|
| 1385 | + foreach ($ver_arr as $key => $val) {
|
|
| 1386 | + if (delete_option($val)) {
|
|
| 1387 | + $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";
|
|
| 1388 | + } else {
|
|
| 1389 | + $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";
|
|
| 1390 | + } |
|
| 1391 | + |
|
| 1392 | + } |
|
| 1393 | + |
|
| 1394 | + if ($output_str) {
|
|
| 1395 | + $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";
|
|
| 1396 | + } |
|
| 1397 | + |
|
| 1398 | + } |
|
| 1399 | + |
|
| 1400 | + if ($is_error_during_diagnose) {
|
|
| 1401 | + $info_div_class = "geodir_problem_info"; |
|
| 1402 | + $fix_button_txt = ""; |
|
| 1403 | + } else {
|
|
| 1404 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1405 | + $fix_button_txt = ''; |
|
| 1406 | + } |
|
| 1407 | + echo "<ul class='$info_div_class'>"; |
|
| 1408 | + echo $output_str; |
|
| 1409 | + echo $fix_button_txt; |
|
| 1410 | + echo "</ul>"; |
|
| 1411 | 1411 | |
| 1412 | 1412 | } |
| 1413 | 1413 | |
@@ -1421,59 +1421,59 @@ discard block |
||
| 1421 | 1421 | */ |
| 1422 | 1422 | function geodir_diagnose_ratings() |
| 1423 | 1423 | {
|
| 1424 | - global $wpdb; |
|
| 1425 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1426 | - |
|
| 1427 | - //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1428 | - $is_error_during_diagnose = false; |
|
| 1429 | - $output_str = ''; |
|
| 1430 | - |
|
| 1431 | - // check review locations |
|
| 1432 | - if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
|
|
| 1433 | - $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";
|
|
| 1434 | - $is_error_during_diagnose = true; |
|
| 1435 | - |
|
| 1436 | - if ($fix) {
|
|
| 1437 | - if (geodir_fix_review_location()) {
|
|
| 1438 | - $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";
|
|
| 1439 | - } else {
|
|
| 1440 | - $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1441 | - } |
|
| 1442 | - } |
|
| 1443 | - |
|
| 1444 | - } else {
|
|
| 1445 | - $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";
|
|
| 1446 | - } |
|
| 1447 | - |
|
| 1448 | - // check review content |
|
| 1449 | - if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {
|
|
| 1450 | - $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";
|
|
| 1451 | - $is_error_during_diagnose = true; |
|
| 1452 | - |
|
| 1453 | - if ($fix) {
|
|
| 1454 | - if (geodir_fix_review_content()) {
|
|
| 1455 | - $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";
|
|
| 1456 | - } else {
|
|
| 1457 | - $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1458 | - } |
|
| 1459 | - } |
|
| 1460 | - |
|
| 1461 | - } else {
|
|
| 1462 | - $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";
|
|
| 1463 | - } |
|
| 1464 | - |
|
| 1465 | - |
|
| 1466 | - if ($is_error_during_diagnose) {
|
|
| 1467 | - $info_div_class = "geodir_problem_info"; |
|
| 1468 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1469 | - } else {
|
|
| 1470 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1471 | - $fix_button_txt = ''; |
|
| 1472 | - } |
|
| 1473 | - echo "<ul class='$info_div_class'>"; |
|
| 1474 | - echo $output_str; |
|
| 1475 | - echo $fix_button_txt; |
|
| 1476 | - echo "</ul>"; |
|
| 1424 | + global $wpdb; |
|
| 1425 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1426 | + |
|
| 1427 | + //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1428 | + $is_error_during_diagnose = false; |
|
| 1429 | + $output_str = ''; |
|
| 1430 | + |
|
| 1431 | + // check review locations |
|
| 1432 | + if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
|
|
| 1433 | + $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";
|
|
| 1434 | + $is_error_during_diagnose = true; |
|
| 1435 | + |
|
| 1436 | + if ($fix) {
|
|
| 1437 | + if (geodir_fix_review_location()) {
|
|
| 1438 | + $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";
|
|
| 1439 | + } else {
|
|
| 1440 | + $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1441 | + } |
|
| 1442 | + } |
|
| 1443 | + |
|
| 1444 | + } else {
|
|
| 1445 | + $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";
|
|
| 1446 | + } |
|
| 1447 | + |
|
| 1448 | + // check review content |
|
| 1449 | + if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {
|
|
| 1450 | + $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";
|
|
| 1451 | + $is_error_during_diagnose = true; |
|
| 1452 | + |
|
| 1453 | + if ($fix) {
|
|
| 1454 | + if (geodir_fix_review_content()) {
|
|
| 1455 | + $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";
|
|
| 1456 | + } else {
|
|
| 1457 | + $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1458 | + } |
|
| 1459 | + } |
|
| 1460 | + |
|
| 1461 | + } else {
|
|
| 1462 | + $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";
|
|
| 1463 | + } |
|
| 1464 | + |
|
| 1465 | + |
|
| 1466 | + if ($is_error_during_diagnose) {
|
|
| 1467 | + $info_div_class = "geodir_problem_info"; |
|
| 1468 | + $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1469 | + } else {
|
|
| 1470 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1471 | + $fix_button_txt = ''; |
|
| 1472 | + } |
|
| 1473 | + echo "<ul class='$info_div_class'>"; |
|
| 1474 | + echo $output_str; |
|
| 1475 | + echo $fix_button_txt; |
|
| 1476 | + echo "</ul>"; |
|
| 1477 | 1477 | |
| 1478 | 1478 | } |
| 1479 | 1479 | |
@@ -1487,57 +1487,57 @@ discard block |
||
| 1487 | 1487 | */ |
| 1488 | 1488 | function geodir_diagnose_multisite_conversion() |
| 1489 | 1489 | {
|
| 1490 | - global $wpdb; |
|
| 1491 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1492 | - //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1493 | - $is_error_during_diagnose = false; |
|
| 1494 | - $output_str = ''; |
|
| 1495 | - |
|
| 1496 | - $filter_arr = array(); |
|
| 1497 | - $filter_arr['output_str'] = $output_str; |
|
| 1498 | - $filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose; |
|
| 1499 | - $table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),
|
|
| 1500 | - 'geodir_custom_fields' => __('Custom fields', 'geodirectory'),
|
|
| 1501 | - 'geodir_post_icon' => __('Post icon', 'geodirectory'),
|
|
| 1502 | - 'geodir_attachments' => __('Attachments', 'geodirectory'),
|
|
| 1503 | - 'geodir_post_review' => __('Reviews', 'geodirectory'),
|
|
| 1504 | - 'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),
|
|
| 1505 | - 'geodir_gd_place_detail' => __('Place detail', 'geodirectory')
|
|
| 1506 | - ); |
|
| 1507 | - |
|
| 1508 | - // allow other addons to hook in and add their checks |
|
| 1509 | - |
|
| 1510 | - /** |
|
| 1511 | - * Filter the array of tables. |
|
| 1512 | - * |
|
| 1513 | - * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows addons to add their DB tables to the checks. |
|
| 1514 | - * |
|
| 1515 | - * @since 1.0.0 |
|
| 1516 | - * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...
|
|
| 1517 | - */ |
|
| 1518 | - $table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);
|
|
| 1519 | - |
|
| 1520 | - foreach ($table_arr as $table => $table_name) {
|
|
| 1521 | - // Diagnose table |
|
| 1522 | - $filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix); |
|
| 1523 | - } |
|
| 1524 | - |
|
| 1525 | - |
|
| 1526 | - $output_str = $filter_arr['output_str']; |
|
| 1527 | - $is_error_during_diagnose = $filter_arr['is_error_during_diagnose']; |
|
| 1528 | - |
|
| 1529 | - |
|
| 1530 | - if ($is_error_during_diagnose) {
|
|
| 1531 | - $info_div_class = "geodir_problem_info"; |
|
| 1532 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
|
|
| 1533 | - } else {
|
|
| 1534 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1535 | - $fix_button_txt = ''; |
|
| 1536 | - } |
|
| 1537 | - echo "<ul class='$info_div_class'>"; |
|
| 1538 | - echo $output_str; |
|
| 1539 | - echo $fix_button_txt; |
|
| 1540 | - echo "</ul>"; |
|
| 1490 | + global $wpdb; |
|
| 1491 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1492 | + //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1493 | + $is_error_during_diagnose = false; |
|
| 1494 | + $output_str = ''; |
|
| 1495 | + |
|
| 1496 | + $filter_arr = array(); |
|
| 1497 | + $filter_arr['output_str'] = $output_str; |
|
| 1498 | + $filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose; |
|
| 1499 | + $table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),
|
|
| 1500 | + 'geodir_custom_fields' => __('Custom fields', 'geodirectory'),
|
|
| 1501 | + 'geodir_post_icon' => __('Post icon', 'geodirectory'),
|
|
| 1502 | + 'geodir_attachments' => __('Attachments', 'geodirectory'),
|
|
| 1503 | + 'geodir_post_review' => __('Reviews', 'geodirectory'),
|
|
| 1504 | + 'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),
|
|
| 1505 | + 'geodir_gd_place_detail' => __('Place detail', 'geodirectory')
|
|
| 1506 | + ); |
|
| 1507 | + |
|
| 1508 | + // allow other addons to hook in and add their checks |
|
| 1509 | + |
|
| 1510 | + /** |
|
| 1511 | + * Filter the array of tables. |
|
| 1512 | + * |
|
| 1513 | + * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows addons to add their DB tables to the checks. |
|
| 1514 | + * |
|
| 1515 | + * @since 1.0.0 |
|
| 1516 | + * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...
|
|
| 1517 | + */ |
|
| 1518 | + $table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);
|
|
| 1519 | + |
|
| 1520 | + foreach ($table_arr as $table => $table_name) {
|
|
| 1521 | + // Diagnose table |
|
| 1522 | + $filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix); |
|
| 1523 | + } |
|
| 1524 | + |
|
| 1525 | + |
|
| 1526 | + $output_str = $filter_arr['output_str']; |
|
| 1527 | + $is_error_during_diagnose = $filter_arr['is_error_during_diagnose']; |
|
| 1528 | + |
|
| 1529 | + |
|
| 1530 | + if ($is_error_during_diagnose) {
|
|
| 1531 | + $info_div_class = "geodir_problem_info"; |
|
| 1532 | + $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
|
|
| 1533 | + } else {
|
|
| 1534 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1535 | + $fix_button_txt = ''; |
|
| 1536 | + } |
|
| 1537 | + echo "<ul class='$info_div_class'>"; |
|
| 1538 | + echo $output_str; |
|
| 1539 | + echo $fix_button_txt; |
|
| 1540 | + echo "</ul>"; |
|
| 1541 | 1541 | } |
| 1542 | 1542 | |
| 1543 | 1543 | /** |
@@ -1555,39 +1555,39 @@ discard block |
||
| 1555 | 1555 | */ |
| 1556 | 1556 | function geodir_fix_virtual_page($slug, $page_title, $old_id, $option) |
| 1557 | 1557 | {
|
| 1558 | - global $wpdb, $current_user; |
|
| 1559 | - |
|
| 1560 | - if (!empty($old_id)) {
|
|
| 1561 | - wp_delete_post($old_id, true); |
|
| 1562 | - }//delete post if already there |
|
| 1563 | - else {
|
|
| 1564 | - $page_found = $wpdb->get_var( |
|
| 1565 | - $wpdb->prepare( |
|
| 1566 | - "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 1567 | - array($slug) |
|
| 1568 | - ) |
|
| 1569 | - ); |
|
| 1570 | - wp_delete_post($page_found, true); |
|
| 1571 | - |
|
| 1572 | - } |
|
| 1573 | - |
|
| 1574 | - $page_data = array( |
|
| 1575 | - 'post_status' => 'publish', |
|
| 1576 | - 'post_type' => 'page', |
|
| 1577 | - 'post_author' => $current_user->ID, |
|
| 1578 | - 'post_name' => $slug, |
|
| 1579 | - 'post_title' => $page_title, |
|
| 1580 | - 'post_content' => '', |
|
| 1581 | - 'post_parent' => 0, |
|
| 1582 | - 'comment_status' => 'closed' |
|
| 1583 | - ); |
|
| 1584 | - $page_id = wp_insert_post($page_data); |
|
| 1585 | - update_option($option, $page_id); |
|
| 1586 | - if ($page_id) {
|
|
| 1587 | - return true; |
|
| 1588 | - } else {
|
|
| 1589 | - return false; |
|
| 1590 | - } |
|
| 1558 | + global $wpdb, $current_user; |
|
| 1559 | + |
|
| 1560 | + if (!empty($old_id)) {
|
|
| 1561 | + wp_delete_post($old_id, true); |
|
| 1562 | + }//delete post if already there |
|
| 1563 | + else {
|
|
| 1564 | + $page_found = $wpdb->get_var( |
|
| 1565 | + $wpdb->prepare( |
|
| 1566 | + "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 1567 | + array($slug) |
|
| 1568 | + ) |
|
| 1569 | + ); |
|
| 1570 | + wp_delete_post($page_found, true); |
|
| 1571 | + |
|
| 1572 | + } |
|
| 1573 | + |
|
| 1574 | + $page_data = array( |
|
| 1575 | + 'post_status' => 'publish', |
|
| 1576 | + 'post_type' => 'page', |
|
| 1577 | + 'post_author' => $current_user->ID, |
|
| 1578 | + 'post_name' => $slug, |
|
| 1579 | + 'post_title' => $page_title, |
|
| 1580 | + 'post_content' => '', |
|
| 1581 | + 'post_parent' => 0, |
|
| 1582 | + 'comment_status' => 'closed' |
|
| 1583 | + ); |
|
| 1584 | + $page_id = wp_insert_post($page_data); |
|
| 1585 | + update_option($option, $page_id); |
|
| 1586 | + if ($page_id) {
|
|
| 1587 | + return true; |
|
| 1588 | + } else {
|
|
| 1589 | + return false; |
|
| 1590 | + } |
|
| 1591 | 1591 | } |
| 1592 | 1592 | |
| 1593 | 1593 | /** |
@@ -1599,212 +1599,212 @@ discard block |
||
| 1599 | 1599 | */ |
| 1600 | 1600 | function geodir_diagnose_default_pages() |
| 1601 | 1601 | {
|
| 1602 | - global $wpdb; |
|
| 1603 | - $is_error_during_diagnose = false; |
|
| 1604 | - $output_str = ''; |
|
| 1605 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1606 | - |
|
| 1607 | - ////////////////////////////////// |
|
| 1608 | - /* Diagnose GD Home Page Starts */ |
|
| 1609 | - ////////////////////////////////// |
|
| 1610 | - $option_value = get_option('geodir_home_page');
|
|
| 1611 | - $page = get_post($option_value); |
|
| 1612 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1613 | - |
|
| 1614 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1615 | - $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1616 | - else {
|
|
| 1617 | - $is_error_during_diagnose = true; |
|
| 1618 | - $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1619 | - if ($fix) {
|
|
| 1620 | - if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {
|
|
| 1621 | - $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1622 | - } else {
|
|
| 1623 | - $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1624 | - } |
|
| 1625 | - } |
|
| 1626 | - } |
|
| 1627 | - |
|
| 1628 | - //////////////////////////////// |
|
| 1629 | - /* Diagnose GD Home Page Ends */ |
|
| 1630 | - //////////////////////////////// |
|
| 1631 | - |
|
| 1632 | - ////////////////////////////////// |
|
| 1633 | - /* Diagnose Add Listing Page Starts */ |
|
| 1634 | - ////////////////////////////////// |
|
| 1635 | - $option_value = get_option('geodir_add_listing_page');
|
|
| 1636 | - $page = get_post($option_value); |
|
| 1637 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1638 | - |
|
| 1639 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1640 | - $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1641 | - else {
|
|
| 1642 | - $is_error_during_diagnose = true; |
|
| 1643 | - $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1644 | - if ($fix) {
|
|
| 1645 | - if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {
|
|
| 1646 | - $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1647 | - } else {
|
|
| 1648 | - $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1649 | - } |
|
| 1650 | - } |
|
| 1651 | - } |
|
| 1652 | - |
|
| 1653 | - //////////////////////////////// |
|
| 1654 | - /* Diagnose Add Listing Page Ends */ |
|
| 1655 | - //////////////////////////////// |
|
| 1656 | - |
|
| 1657 | - |
|
| 1658 | - ////////////////////////////////// |
|
| 1659 | - /* Diagnose Listing Preview Page Starts */ |
|
| 1660 | - ////////////////////////////////// |
|
| 1661 | - $option_value = get_option('geodir_preview_page');
|
|
| 1662 | - $page = get_post($option_value); |
|
| 1663 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1664 | - |
|
| 1665 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1666 | - $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1667 | - else {
|
|
| 1668 | - $is_error_during_diagnose = true; |
|
| 1669 | - $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1670 | - if ($fix) {
|
|
| 1671 | - if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {
|
|
| 1672 | - $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1673 | - } else {
|
|
| 1674 | - $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1675 | - } |
|
| 1676 | - } |
|
| 1677 | - } |
|
| 1678 | - |
|
| 1679 | - //////////////////////////////// |
|
| 1680 | - /* Diagnose Listing Preview Page Ends */ |
|
| 1681 | - //////////////////////////////// |
|
| 1682 | - |
|
| 1683 | - ////////////////////////////////// |
|
| 1684 | - /* Diagnose Listing Success Page Starts */ |
|
| 1685 | - ////////////////////////////////// |
|
| 1686 | - $option_value = get_option('geodir_success_page');
|
|
| 1687 | - $page = get_post($option_value); |
|
| 1688 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1689 | - |
|
| 1690 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1691 | - $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1692 | - else {
|
|
| 1693 | - $is_error_during_diagnose = true; |
|
| 1694 | - $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1695 | - if ($fix) {
|
|
| 1696 | - if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {
|
|
| 1697 | - $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1698 | - } else {
|
|
| 1699 | - $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1700 | - } |
|
| 1701 | - } |
|
| 1702 | - } |
|
| 1703 | - |
|
| 1704 | - //////////////////////////////// |
|
| 1705 | - /* Diagnose Listing Sucess Page Ends */ |
|
| 1706 | - //////////////////////////////// |
|
| 1707 | - |
|
| 1708 | - ////////////////////////////////// |
|
| 1709 | - /* Diagnose Info Page Starts */ |
|
| 1710 | - ////////////////////////////////// |
|
| 1711 | - $option_value = get_option('geodir_info_page');
|
|
| 1712 | - $page = get_post($option_value); |
|
| 1713 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1714 | - |
|
| 1715 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1716 | - $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1717 | - else {
|
|
| 1718 | - $is_error_during_diagnose = true; |
|
| 1719 | - $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1720 | - if ($fix) {
|
|
| 1721 | - if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {
|
|
| 1722 | - $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1723 | - } else {
|
|
| 1724 | - $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1725 | - } |
|
| 1726 | - } |
|
| 1727 | - } |
|
| 1728 | - |
|
| 1729 | - //////////////////////////////// |
|
| 1730 | - /* Diagnose Info Page Ends */ |
|
| 1731 | - //////////////////////////////// |
|
| 1732 | - |
|
| 1733 | - ////////////////////////////////// |
|
| 1734 | - /* Diagnose Login Page Starts */ |
|
| 1735 | - ////////////////////////////////// |
|
| 1736 | - $option_value = get_option('geodir_login_page');
|
|
| 1737 | - $page = get_post($option_value); |
|
| 1738 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1739 | - |
|
| 1740 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1741 | - $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1742 | - else {
|
|
| 1743 | - $is_error_during_diagnose = true; |
|
| 1744 | - $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1745 | - if ($fix) {
|
|
| 1746 | - if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {
|
|
| 1747 | - $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1748 | - } else {
|
|
| 1749 | - $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1750 | - } |
|
| 1751 | - } |
|
| 1752 | - } |
|
| 1753 | - |
|
| 1754 | - //////////////////////////////// |
|
| 1755 | - /* Diagnose Info Page Ends */ |
|
| 1756 | - //////////////////////////////// |
|
| 1757 | - |
|
| 1758 | - ////////////////////////////////// |
|
| 1759 | - /* Diagnose Location Page Starts */ |
|
| 1760 | - ////////////////////////////////// |
|
| 1761 | - $option_value = get_option('geodir_location_page');
|
|
| 1762 | - $page = get_post($option_value); |
|
| 1763 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1764 | - |
|
| 1765 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1766 | - $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1767 | - else {
|
|
| 1768 | - $is_error_during_diagnose = true; |
|
| 1769 | - $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1770 | - if ($fix) {
|
|
| 1771 | - if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {
|
|
| 1772 | - $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1773 | - } else {
|
|
| 1774 | - $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1775 | - } |
|
| 1776 | - } |
|
| 1777 | - } |
|
| 1778 | - |
|
| 1779 | - //////////////////////////////// |
|
| 1780 | - /* Diagnose Location Page Ends */ |
|
| 1781 | - //////////////////////////////// |
|
| 1782 | - |
|
| 1783 | - $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );
|
|
| 1784 | - /** |
|
| 1785 | - * This action is called at the end of the GD Tools page check function. |
|
| 1786 | - * |
|
| 1787 | - * @since 1.5.2 |
|
| 1788 | - */ |
|
| 1789 | - $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);
|
|
| 1790 | - |
|
| 1791 | - $output_str = $page_chk_arr['output_str']; |
|
| 1792 | - $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose']; |
|
| 1793 | - |
|
| 1794 | - if ($is_error_during_diagnose) {
|
|
| 1795 | - if ($fix) {
|
|
| 1796 | - flush_rewrite_rules(); |
|
| 1797 | - } |
|
| 1798 | - $info_div_class = "geodir_problem_info"; |
|
| 1799 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
|
|
| 1800 | - } else {
|
|
| 1801 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1802 | - $fix_button_txt = ''; |
|
| 1803 | - } |
|
| 1804 | - echo "<ul class='$info_div_class'>"; |
|
| 1805 | - echo $output_str; |
|
| 1806 | - echo $fix_button_txt; |
|
| 1807 | - echo "</ul>"; |
|
| 1602 | + global $wpdb; |
|
| 1603 | + $is_error_during_diagnose = false; |
|
| 1604 | + $output_str = ''; |
|
| 1605 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1606 | + |
|
| 1607 | + ////////////////////////////////// |
|
| 1608 | + /* Diagnose GD Home Page Starts */ |
|
| 1609 | + ////////////////////////////////// |
|
| 1610 | + $option_value = get_option('geodir_home_page');
|
|
| 1611 | + $page = get_post($option_value); |
|
| 1612 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1613 | + |
|
| 1614 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1615 | + $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1616 | + else {
|
|
| 1617 | + $is_error_during_diagnose = true; |
|
| 1618 | + $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1619 | + if ($fix) {
|
|
| 1620 | + if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {
|
|
| 1621 | + $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1622 | + } else {
|
|
| 1623 | + $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1624 | + } |
|
| 1625 | + } |
|
| 1626 | + } |
|
| 1627 | + |
|
| 1628 | + //////////////////////////////// |
|
| 1629 | + /* Diagnose GD Home Page Ends */ |
|
| 1630 | + //////////////////////////////// |
|
| 1631 | + |
|
| 1632 | + ////////////////////////////////// |
|
| 1633 | + /* Diagnose Add Listing Page Starts */ |
|
| 1634 | + ////////////////////////////////// |
|
| 1635 | + $option_value = get_option('geodir_add_listing_page');
|
|
| 1636 | + $page = get_post($option_value); |
|
| 1637 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1638 | + |
|
| 1639 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1640 | + $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1641 | + else {
|
|
| 1642 | + $is_error_during_diagnose = true; |
|
| 1643 | + $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1644 | + if ($fix) {
|
|
| 1645 | + if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {
|
|
| 1646 | + $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1647 | + } else {
|
|
| 1648 | + $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1649 | + } |
|
| 1650 | + } |
|
| 1651 | + } |
|
| 1652 | + |
|
| 1653 | + //////////////////////////////// |
|
| 1654 | + /* Diagnose Add Listing Page Ends */ |
|
| 1655 | + //////////////////////////////// |
|
| 1656 | + |
|
| 1657 | + |
|
| 1658 | + ////////////////////////////////// |
|
| 1659 | + /* Diagnose Listing Preview Page Starts */ |
|
| 1660 | + ////////////////////////////////// |
|
| 1661 | + $option_value = get_option('geodir_preview_page');
|
|
| 1662 | + $page = get_post($option_value); |
|
| 1663 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1664 | + |
|
| 1665 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1666 | + $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1667 | + else {
|
|
| 1668 | + $is_error_during_diagnose = true; |
|
| 1669 | + $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1670 | + if ($fix) {
|
|
| 1671 | + if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {
|
|
| 1672 | + $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1673 | + } else {
|
|
| 1674 | + $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1675 | + } |
|
| 1676 | + } |
|
| 1677 | + } |
|
| 1678 | + |
|
| 1679 | + //////////////////////////////// |
|
| 1680 | + /* Diagnose Listing Preview Page Ends */ |
|
| 1681 | + //////////////////////////////// |
|
| 1682 | + |
|
| 1683 | + ////////////////////////////////// |
|
| 1684 | + /* Diagnose Listing Success Page Starts */ |
|
| 1685 | + ////////////////////////////////// |
|
| 1686 | + $option_value = get_option('geodir_success_page');
|
|
| 1687 | + $page = get_post($option_value); |
|
| 1688 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1689 | + |
|
| 1690 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1691 | + $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1692 | + else {
|
|
| 1693 | + $is_error_during_diagnose = true; |
|
| 1694 | + $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1695 | + if ($fix) {
|
|
| 1696 | + if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {
|
|
| 1697 | + $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1698 | + } else {
|
|
| 1699 | + $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1700 | + } |
|
| 1701 | + } |
|
| 1702 | + } |
|
| 1703 | + |
|
| 1704 | + //////////////////////////////// |
|
| 1705 | + /* Diagnose Listing Sucess Page Ends */ |
|
| 1706 | + //////////////////////////////// |
|
| 1707 | + |
|
| 1708 | + ////////////////////////////////// |
|
| 1709 | + /* Diagnose Info Page Starts */ |
|
| 1710 | + ////////////////////////////////// |
|
| 1711 | + $option_value = get_option('geodir_info_page');
|
|
| 1712 | + $page = get_post($option_value); |
|
| 1713 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1714 | + |
|
| 1715 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1716 | + $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1717 | + else {
|
|
| 1718 | + $is_error_during_diagnose = true; |
|
| 1719 | + $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1720 | + if ($fix) {
|
|
| 1721 | + if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {
|
|
| 1722 | + $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1723 | + } else {
|
|
| 1724 | + $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1725 | + } |
|
| 1726 | + } |
|
| 1727 | + } |
|
| 1728 | + |
|
| 1729 | + //////////////////////////////// |
|
| 1730 | + /* Diagnose Info Page Ends */ |
|
| 1731 | + //////////////////////////////// |
|
| 1732 | + |
|
| 1733 | + ////////////////////////////////// |
|
| 1734 | + /* Diagnose Login Page Starts */ |
|
| 1735 | + ////////////////////////////////// |
|
| 1736 | + $option_value = get_option('geodir_login_page');
|
|
| 1737 | + $page = get_post($option_value); |
|
| 1738 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1739 | + |
|
| 1740 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1741 | + $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1742 | + else {
|
|
| 1743 | + $is_error_during_diagnose = true; |
|
| 1744 | + $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1745 | + if ($fix) {
|
|
| 1746 | + if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {
|
|
| 1747 | + $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1748 | + } else {
|
|
| 1749 | + $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1750 | + } |
|
| 1751 | + } |
|
| 1752 | + } |
|
| 1753 | + |
|
| 1754 | + //////////////////////////////// |
|
| 1755 | + /* Diagnose Info Page Ends */ |
|
| 1756 | + //////////////////////////////// |
|
| 1757 | + |
|
| 1758 | + ////////////////////////////////// |
|
| 1759 | + /* Diagnose Location Page Starts */ |
|
| 1760 | + ////////////////////////////////// |
|
| 1761 | + $option_value = get_option('geodir_location_page');
|
|
| 1762 | + $page = get_post($option_value); |
|
| 1763 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1764 | + |
|
| 1765 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1766 | + $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1767 | + else {
|
|
| 1768 | + $is_error_during_diagnose = true; |
|
| 1769 | + $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1770 | + if ($fix) {
|
|
| 1771 | + if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {
|
|
| 1772 | + $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1773 | + } else {
|
|
| 1774 | + $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1775 | + } |
|
| 1776 | + } |
|
| 1777 | + } |
|
| 1778 | + |
|
| 1779 | + //////////////////////////////// |
|
| 1780 | + /* Diagnose Location Page Ends */ |
|
| 1781 | + //////////////////////////////// |
|
| 1782 | + |
|
| 1783 | + $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );
|
|
| 1784 | + /** |
|
| 1785 | + * This action is called at the end of the GD Tools page check function. |
|
| 1786 | + * |
|
| 1787 | + * @since 1.5.2 |
|
| 1788 | + */ |
|
| 1789 | + $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);
|
|
| 1790 | + |
|
| 1791 | + $output_str = $page_chk_arr['output_str']; |
|
| 1792 | + $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose']; |
|
| 1793 | + |
|
| 1794 | + if ($is_error_during_diagnose) {
|
|
| 1795 | + if ($fix) {
|
|
| 1796 | + flush_rewrite_rules(); |
|
| 1797 | + } |
|
| 1798 | + $info_div_class = "geodir_problem_info"; |
|
| 1799 | + $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
|
|
| 1800 | + } else {
|
|
| 1801 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1802 | + $fix_button_txt = ''; |
|
| 1803 | + } |
|
| 1804 | + echo "<ul class='$info_div_class'>"; |
|
| 1805 | + echo $output_str; |
|
| 1806 | + echo $fix_button_txt; |
|
| 1807 | + echo "</ul>"; |
|
| 1808 | 1808 | |
| 1809 | 1809 | } |
| 1810 | 1810 | |
@@ -1816,26 +1816,26 @@ discard block |
||
| 1816 | 1816 | * @global object $wpdb WordPress Database object. |
| 1817 | 1817 | */ |
| 1818 | 1818 | function geodir_diagnose_load_db_language() {
|
| 1819 | - global $wpdb; |
|
| 1819 | + global $wpdb; |
|
| 1820 | 1820 | |
| 1821 | 1821 | $is_error_during_diagnose = geodirectory_load_db_language(); |
| 1822 | 1822 | |
| 1823 | - $output_str = ''; |
|
| 1824 | - $fix_button_txt = ''; |
|
| 1823 | + $output_str = ''; |
|
| 1824 | + $fix_button_txt = ''; |
|
| 1825 | 1825 | |
| 1826 | - if ($is_error_during_diagnose) {
|
|
| 1827 | - $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";
|
|
| 1826 | + if ($is_error_during_diagnose) {
|
|
| 1827 | + $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";
|
|
| 1828 | 1828 | $info_div_class = "geodir_problem_info"; |
| 1829 | - } else {
|
|
| 1830 | - $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";
|
|
| 1829 | + } else {
|
|
| 1830 | + $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";
|
|
| 1831 | 1831 | $info_div_class = "geodir_noproblem_info"; |
| 1832 | - $fix_button_txt = ''; |
|
| 1833 | - } |
|
| 1832 | + $fix_button_txt = ''; |
|
| 1833 | + } |
|
| 1834 | 1834 | |
| 1835 | 1835 | echo "<ul class='$info_div_class'>"; |
| 1836 | - echo $output_str; |
|
| 1837 | - echo $fix_button_txt; |
|
| 1838 | - echo "</ul>"; |
|
| 1836 | + echo $output_str; |
|
| 1837 | + echo $fix_button_txt; |
|
| 1838 | + echo "</ul>"; |
|
| 1839 | 1839 | |
| 1840 | 1840 | } |
| 1841 | 1841 | |
@@ -1866,23 +1866,23 @@ discard block |
||
| 1866 | 1866 | */ |
| 1867 | 1867 | function geodir_posts_clauses_request($clauses) |
| 1868 | 1868 | {
|
| 1869 | - global $wpdb, $wp_query, $plugin_prefix; |
|
| 1869 | + global $wpdb, $wp_query, $plugin_prefix; |
|
| 1870 | 1870 | |
| 1871 | - if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {
|
|
| 1872 | - $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail'; |
|
| 1871 | + if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {
|
|
| 1872 | + $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail'; |
|
| 1873 | 1873 | |
| 1874 | - $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)'; |
|
| 1875 | - $clauses['join'] = $join; |
|
| 1874 | + $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)'; |
|
| 1875 | + $clauses['join'] = $join; |
|
| 1876 | 1876 | |
| 1877 | - $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : ''; |
|
| 1878 | - $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire'; |
|
| 1879 | - $clauses['fields'] = $fields; |
|
| 1877 | + $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : ''; |
|
| 1878 | + $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire'; |
|
| 1879 | + $clauses['fields'] = $fields; |
|
| 1880 | 1880 | |
| 1881 | - $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC'; |
|
| 1882 | - $orderby = 'gd_expire ' . $order; |
|
| 1883 | - $clauses['orderby'] = $orderby; |
|
| 1884 | - } |
|
| 1885 | - return $clauses; |
|
| 1881 | + $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC'; |
|
| 1882 | + $orderby = 'gd_expire ' . $order; |
|
| 1883 | + $clauses['orderby'] = $orderby; |
|
| 1884 | + } |
|
| 1885 | + return $clauses; |
|
| 1886 | 1886 | } |
| 1887 | 1887 | |
| 1888 | 1888 | |
@@ -1903,7 +1903,7 @@ discard block |
||
| 1903 | 1903 | */ |
| 1904 | 1904 | function gd_theme_switch_compat_check() |
| 1905 | 1905 | {
|
| 1906 | - gd_set_theme_compat(); |
|
| 1906 | + gd_set_theme_compat(); |
|
| 1907 | 1907 | } |
| 1908 | 1908 | |
| 1909 | 1909 | /** |
@@ -1916,27 +1916,27 @@ discard block |
||
| 1916 | 1916 | */ |
| 1917 | 1917 | function geodir_str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\") |
| 1918 | 1918 | {
|
| 1919 | - if (function_exists('str_getcsv')) {
|
|
| 1920 | - $fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape); |
|
| 1921 | - } else {
|
|
| 1922 | - global $current_user; |
|
| 1923 | - $upload_dir = wp_upload_dir(); |
|
| 1924 | - |
|
| 1925 | - $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv'; |
|
| 1926 | - $handle = fopen($file, 'w'); |
|
| 1927 | - |
|
| 1928 | - fwrite($handle, $input); |
|
| 1929 | - fclose($handle); |
|
| 1930 | - |
|
| 1931 | - $handle = fopen($file, 'rt'); |
|
| 1932 | - if (PHP_VERSION >= '5.3.0') {
|
|
| 1933 | - $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape); |
|
| 1934 | - } else {
|
|
| 1935 | - $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure); |
|
| 1936 | - } |
|
| 1937 | - fclose($handle); |
|
| 1938 | - } |
|
| 1939 | - return $fgetcsv; |
|
| 1919 | + if (function_exists('str_getcsv')) {
|
|
| 1920 | + $fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape); |
|
| 1921 | + } else {
|
|
| 1922 | + global $current_user; |
|
| 1923 | + $upload_dir = wp_upload_dir(); |
|
| 1924 | + |
|
| 1925 | + $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv'; |
|
| 1926 | + $handle = fopen($file, 'w'); |
|
| 1927 | + |
|
| 1928 | + fwrite($handle, $input); |
|
| 1929 | + fclose($handle); |
|
| 1930 | + |
|
| 1931 | + $handle = fopen($file, 'rt'); |
|
| 1932 | + if (PHP_VERSION >= '5.3.0') {
|
|
| 1933 | + $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape); |
|
| 1934 | + } else {
|
|
| 1935 | + $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure); |
|
| 1936 | + } |
|
| 1937 | + fclose($handle); |
|
| 1938 | + } |
|
| 1939 | + return $fgetcsv; |
|
| 1940 | 1940 | } |
| 1941 | 1941 | |
| 1942 | 1942 | add_action('wp_ajax_gdImportCsv', 'geodir_ajax_import_csv');
|
@@ -1951,375 +1951,375 @@ discard block |
||
| 1951 | 1951 | */ |
| 1952 | 1952 | function geodir_ajax_import_csv() |
| 1953 | 1953 | {
|
| 1954 | - error_reporting(0); // hide error to get clean json response |
|
| 1954 | + error_reporting(0); // hide error to get clean json response |
|
| 1955 | 1955 | |
| 1956 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 1957 | - $uploads = wp_upload_dir(); |
|
| 1958 | - ini_set('auto_detect_line_endings', true);
|
|
| 1956 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 1957 | + $uploads = wp_upload_dir(); |
|
| 1958 | + ini_set('auto_detect_line_endings', true);
|
|
| 1959 | 1959 | |
| 1960 | 1960 | $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
| 1961 | 1961 | |
| 1962 | - $task = isset($_POST['task']) ? $_POST['task'] : ''; |
|
| 1963 | - $uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL; |
|
| 1964 | - $filename = $uploadedFile; |
|
| 1965 | - |
|
| 1966 | - $uploads = wp_upload_dir(); |
|
| 1967 | - $uploads_dir = $uploads['path']; |
|
| 1968 | - $image_name_arr = explode('/', $filename);
|
|
| 1969 | - $filename = end($image_name_arr); |
|
| 1970 | - $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1971 | - $return = array(); |
|
| 1972 | - $return['file'] = $uploadedFile; |
|
| 1973 | - $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
|
|
| 1974 | - |
|
| 1975 | - if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {
|
|
| 1976 | - $wp_filetype = wp_check_filetype_and_ext($target_path, $filename); |
|
| 1977 | - |
|
| 1978 | - if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
| 1979 | - $return['error'] = NULL; |
|
| 1980 | - |
|
| 1981 | - $return['rows'] = 0; |
|
| 1982 | - |
|
| 1983 | - |
|
| 1984 | - |
|
| 1985 | - if (($handle = fopen($target_path, "r")) !== FALSE) {
|
|
| 1986 | - while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
|
|
| 1987 | - if(is_array($data) && !empty($data)) {
|
|
| 1988 | - $file[] = '"' . implode('","', $data) . '"';
|
|
| 1989 | - } |
|
| 1990 | - } |
|
| 1991 | - fclose($handle); |
|
| 1992 | - $file = $file; |
|
| 1993 | - } |
|
| 1994 | - |
|
| 1995 | - |
|
| 1996 | - |
|
| 1997 | - $return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
| 1998 | - |
|
| 1999 | - |
|
| 2000 | - if (!$return['rows'] > 0) {
|
|
| 2001 | - $return['error'] = __('No data found in csv file.', 'geodirectory');
|
|
| 2002 | - } |
|
| 2003 | - } |
|
| 2004 | - } |
|
| 2005 | - if ($task == 'prepare' || !empty($return['error'])) {
|
|
| 2006 | - echo json_encode($return); |
|
| 2007 | - exit; |
|
| 2008 | - } |
|
| 2009 | - |
|
| 2010 | - $totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL; |
|
| 2011 | - $importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1; |
|
| 2012 | - $count = $importlimit; |
|
| 2013 | - $requested_limit = $importlimit; |
|
| 2014 | - $tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0; |
|
| 2015 | - |
|
| 2016 | - if ($count < $totRecords) {
|
|
| 2017 | - $count = $tmpCnt + $count; |
|
| 2018 | - if ($count > $totRecords) {
|
|
| 2019 | - $count = $totRecords; |
|
| 2020 | - } |
|
| 2021 | - } else {
|
|
| 2022 | - $count = $totRecords; |
|
| 2023 | - } |
|
| 2024 | - |
|
| 2025 | - $total_records = 0; |
|
| 2026 | - $rowcount = 0; |
|
| 2027 | - $address_invalid = 0; |
|
| 2028 | - $blank_address = 0; |
|
| 2029 | - $upload_files = 0; |
|
| 2030 | - $invalid_post_type = 0; |
|
| 2031 | - $invalid_title = 0; |
|
| 2032 | - $customKeyarray = array(); |
|
| 2033 | - $gd_post_info = array(); |
|
| 2034 | - $post_location = array(); |
|
| 2035 | - $countpost = 0; |
|
| 2036 | - |
|
| 2037 | - if (!empty($file)) {
|
|
| 2038 | - $columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL; |
|
| 2039 | - $customKeyarray = $columns; |
|
| 2040 | - |
|
| 2041 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 2042 | - $return['error'] = CSV_INVAILD_FILE; |
|
| 2043 | - echo json_encode($return); |
|
| 2044 | - exit; |
|
| 2045 | - } |
|
| 2046 | - |
|
| 2047 | - for ($i = 1; $i <= $importlimit; $i++) {
|
|
| 2048 | - $current_index = $tmpCnt + $i; |
|
| 2049 | - if (isset($file[$current_index])) {
|
|
| 2050 | - $total_records++; |
|
| 2051 | - |
|
| 2052 | - $buffer = geodir_str_getcsv($file[$current_index]); |
|
| 2053 | - $post_title = addslashes($buffer[0]); |
|
| 2054 | - $current_post_author = $buffer[1]; |
|
| 2055 | - $post_desc = addslashes($buffer[2]); |
|
| 2056 | - $post_cat = array(); |
|
| 2057 | - $catids_arr = array(); |
|
| 2058 | - $post_cat = trim($buffer[3]); // comma seperated category name |
|
| 2059 | - |
|
| 2060 | - if ($post_cat) {
|
|
| 2061 | - $post_cat_arr = explode(',', $post_cat);
|
|
| 2062 | - |
|
| 2063 | - for ($c = 0; $c < count($post_cat_arr); $c++) {
|
|
| 2064 | - $catid = wp_kses_normalize_entities(trim($post_cat_arr[$c])); |
|
| 2065 | - |
|
| 2066 | - if (!empty($buffer[5])) {
|
|
| 2067 | - if (in_array($buffer[5], geodir_get_posttypes())) {
|
|
| 2068 | - |
|
| 2069 | - $p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5])); |
|
| 2070 | - |
|
| 2071 | - if (get_term_by('name', $catid, $p_taxonomy[0])) {
|
|
| 2072 | - $cat = get_term_by('name', $catid, $p_taxonomy[0]);
|
|
| 2073 | - $catids_arr[] = $cat->slug; |
|
| 2074 | - } else if (get_term_by('slug', $catid, $p_taxonomy[0])) {
|
|
| 2075 | - $cat = get_term_by('slug', $catid, $p_taxonomy[0]);
|
|
| 2076 | - $catids_arr[] = $cat->slug; |
|
| 2077 | - } else {
|
|
| 2078 | - $ret = wp_insert_term($catid, $p_taxonomy[0]); |
|
| 2079 | - if ($ret && !is_wp_error($ret)) {
|
|
| 2080 | - if (get_term_by('name', $catid, $p_taxonomy[0])) {
|
|
| 2081 | - $cat = get_term_by('name', $catid, $p_taxonomy[0]);
|
|
| 2082 | - $catids_arr[] = $cat->slug; |
|
| 2083 | - } elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {
|
|
| 2084 | - $cat = get_term_by('slug', $catid, $p_taxonomy[0]);
|
|
| 2085 | - $catids_arr[] = $cat->slug; |
|
| 2086 | - } |
|
| 2087 | - } |
|
| 2088 | - } |
|
| 2089 | - } |
|
| 2090 | - } |
|
| 2091 | - } |
|
| 2092 | - } |
|
| 2093 | - |
|
| 2094 | - if (!$catids_arr) {
|
|
| 2095 | - $catids_arr[] = 1; |
|
| 2096 | - } |
|
| 2097 | - |
|
| 2098 | - $post_tags = trim($buffer[4]); // comma seperated tags |
|
| 2099 | - |
|
| 2100 | - $tag_arr = ''; |
|
| 2101 | - if ($post_tags) {
|
|
| 2102 | - $tag_arr = explode(',', $post_tags);
|
|
| 2103 | - } |
|
| 2104 | - |
|
| 2105 | - $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database |
|
| 2106 | - |
|
| 2107 | - $error = ''; |
|
| 2108 | - if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {
|
|
| 2109 | - $invalid_post_type++; |
|
| 2110 | - continue; |
|
| 2111 | - } |
|
| 2112 | - |
|
| 2113 | - if ($post_title != '') {
|
|
| 2114 | - $menu_order = 0; |
|
| 2115 | - $image_folder_name = 'uplaod/'; |
|
| 2116 | - |
|
| 2117 | - $image_names = array(); |
|
| 2118 | - |
|
| 2119 | - for ($c = 5; $c < count($customKeyarray); $c++) {
|
|
| 2120 | - $gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]); |
|
| 2121 | - |
|
| 2122 | - if ($customKeyarray[$c] == 'IMAGE') {
|
|
| 2123 | - $buffer[$c] = trim($buffer[$c]); |
|
| 2124 | - |
|
| 2125 | - if (!empty($buffer[$c])) {
|
|
| 2126 | - $image_names[] = $buffer[$c]; |
|
| 2127 | - } |
|
| 2128 | - } |
|
| 2129 | - |
|
| 2130 | - if ($customKeyarray[$c] == 'alive_days') {
|
|
| 2131 | - if ($buffer[$c] != '0' && $buffer[$c] != '') {
|
|
| 2132 | - $submitdata = date('Y-m-d');
|
|
| 2133 | - |
|
| 2134 | - $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));
|
|
| 2135 | - } else {
|
|
| 2136 | - $gd_post_info['expire_date'] = 'Never'; |
|
| 2137 | - } |
|
| 2138 | - } |
|
| 2139 | - |
|
| 2140 | - if ($customKeyarray[$c] == 'post_city') {
|
|
| 2141 | - $post_city = addslashes($buffer[$c]); |
|
| 2142 | - } |
|
| 2143 | - |
|
| 2144 | - if ($customKeyarray[$c] == 'post_region') {
|
|
| 2145 | - $post_region = addslashes($buffer[$c]); |
|
| 2146 | - } |
|
| 2147 | - |
|
| 2148 | - if ($customKeyarray[$c] == 'post_country') {
|
|
| 2149 | - $post_country = addslashes($buffer[$c]); |
|
| 2150 | - } |
|
| 2151 | - |
|
| 2152 | - if ($customKeyarray[$c] == 'post_latitude') {
|
|
| 2153 | - $post_latitude = addslashes($buffer[$c]); |
|
| 2154 | - } |
|
| 2155 | - |
|
| 2156 | - if ($customKeyarray[$c] == 'post_longitude') {
|
|
| 2157 | - $post_longitude = addslashes($buffer[$c]); |
|
| 2158 | - } |
|
| 1962 | + $task = isset($_POST['task']) ? $_POST['task'] : ''; |
|
| 1963 | + $uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL; |
|
| 1964 | + $filename = $uploadedFile; |
|
| 1965 | + |
|
| 1966 | + $uploads = wp_upload_dir(); |
|
| 1967 | + $uploads_dir = $uploads['path']; |
|
| 1968 | + $image_name_arr = explode('/', $filename);
|
|
| 1969 | + $filename = end($image_name_arr); |
|
| 1970 | + $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1971 | + $return = array(); |
|
| 1972 | + $return['file'] = $uploadedFile; |
|
| 1973 | + $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
|
|
| 1974 | + |
|
| 1975 | + if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {
|
|
| 1976 | + $wp_filetype = wp_check_filetype_and_ext($target_path, $filename); |
|
| 1977 | + |
|
| 1978 | + if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
| 1979 | + $return['error'] = NULL; |
|
| 1980 | + |
|
| 1981 | + $return['rows'] = 0; |
|
| 1982 | + |
|
| 1983 | + |
|
| 1984 | + |
|
| 1985 | + if (($handle = fopen($target_path, "r")) !== FALSE) {
|
|
| 1986 | + while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
|
|
| 1987 | + if(is_array($data) && !empty($data)) {
|
|
| 1988 | + $file[] = '"' . implode('","', $data) . '"';
|
|
| 1989 | + } |
|
| 1990 | + } |
|
| 1991 | + fclose($handle); |
|
| 1992 | + $file = $file; |
|
| 1993 | + } |
|
| 1994 | + |
|
| 1995 | + |
|
| 1996 | + |
|
| 1997 | + $return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
| 1998 | + |
|
| 1999 | + |
|
| 2000 | + if (!$return['rows'] > 0) {
|
|
| 2001 | + $return['error'] = __('No data found in csv file.', 'geodirectory');
|
|
| 2002 | + } |
|
| 2003 | + } |
|
| 2004 | + } |
|
| 2005 | + if ($task == 'prepare' || !empty($return['error'])) {
|
|
| 2006 | + echo json_encode($return); |
|
| 2007 | + exit; |
|
| 2008 | + } |
|
| 2009 | + |
|
| 2010 | + $totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL; |
|
| 2011 | + $importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1; |
|
| 2012 | + $count = $importlimit; |
|
| 2013 | + $requested_limit = $importlimit; |
|
| 2014 | + $tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0; |
|
| 2015 | + |
|
| 2016 | + if ($count < $totRecords) {
|
|
| 2017 | + $count = $tmpCnt + $count; |
|
| 2018 | + if ($count > $totRecords) {
|
|
| 2019 | + $count = $totRecords; |
|
| 2020 | + } |
|
| 2021 | + } else {
|
|
| 2022 | + $count = $totRecords; |
|
| 2023 | + } |
|
| 2024 | + |
|
| 2025 | + $total_records = 0; |
|
| 2026 | + $rowcount = 0; |
|
| 2027 | + $address_invalid = 0; |
|
| 2028 | + $blank_address = 0; |
|
| 2029 | + $upload_files = 0; |
|
| 2030 | + $invalid_post_type = 0; |
|
| 2031 | + $invalid_title = 0; |
|
| 2032 | + $customKeyarray = array(); |
|
| 2033 | + $gd_post_info = array(); |
|
| 2034 | + $post_location = array(); |
|
| 2035 | + $countpost = 0; |
|
| 2036 | + |
|
| 2037 | + if (!empty($file)) {
|
|
| 2038 | + $columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL; |
|
| 2039 | + $customKeyarray = $columns; |
|
| 2040 | + |
|
| 2041 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 2042 | + $return['error'] = CSV_INVAILD_FILE; |
|
| 2043 | + echo json_encode($return); |
|
| 2044 | + exit; |
|
| 2045 | + } |
|
| 2046 | + |
|
| 2047 | + for ($i = 1; $i <= $importlimit; $i++) {
|
|
| 2048 | + $current_index = $tmpCnt + $i; |
|
| 2049 | + if (isset($file[$current_index])) {
|
|
| 2050 | + $total_records++; |
|
| 2051 | + |
|
| 2052 | + $buffer = geodir_str_getcsv($file[$current_index]); |
|
| 2053 | + $post_title = addslashes($buffer[0]); |
|
| 2054 | + $current_post_author = $buffer[1]; |
|
| 2055 | + $post_desc = addslashes($buffer[2]); |
|
| 2056 | + $post_cat = array(); |
|
| 2057 | + $catids_arr = array(); |
|
| 2058 | + $post_cat = trim($buffer[3]); // comma seperated category name |
|
| 2059 | + |
|
| 2060 | + if ($post_cat) {
|
|
| 2061 | + $post_cat_arr = explode(',', $post_cat);
|
|
| 2062 | + |
|
| 2063 | + for ($c = 0; $c < count($post_cat_arr); $c++) {
|
|
| 2064 | + $catid = wp_kses_normalize_entities(trim($post_cat_arr[$c])); |
|
| 2065 | + |
|
| 2066 | + if (!empty($buffer[5])) {
|
|
| 2067 | + if (in_array($buffer[5], geodir_get_posttypes())) {
|
|
| 2068 | + |
|
| 2069 | + $p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5])); |
|
| 2070 | + |
|
| 2071 | + if (get_term_by('name', $catid, $p_taxonomy[0])) {
|
|
| 2072 | + $cat = get_term_by('name', $catid, $p_taxonomy[0]);
|
|
| 2073 | + $catids_arr[] = $cat->slug; |
|
| 2074 | + } else if (get_term_by('slug', $catid, $p_taxonomy[0])) {
|
|
| 2075 | + $cat = get_term_by('slug', $catid, $p_taxonomy[0]);
|
|
| 2076 | + $catids_arr[] = $cat->slug; |
|
| 2077 | + } else {
|
|
| 2078 | + $ret = wp_insert_term($catid, $p_taxonomy[0]); |
|
| 2079 | + if ($ret && !is_wp_error($ret)) {
|
|
| 2080 | + if (get_term_by('name', $catid, $p_taxonomy[0])) {
|
|
| 2081 | + $cat = get_term_by('name', $catid, $p_taxonomy[0]);
|
|
| 2082 | + $catids_arr[] = $cat->slug; |
|
| 2083 | + } elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {
|
|
| 2084 | + $cat = get_term_by('slug', $catid, $p_taxonomy[0]);
|
|
| 2085 | + $catids_arr[] = $cat->slug; |
|
| 2086 | + } |
|
| 2087 | + } |
|
| 2088 | + } |
|
| 2089 | + } |
|
| 2090 | + } |
|
| 2091 | + } |
|
| 2092 | + } |
|
| 2093 | + |
|
| 2094 | + if (!$catids_arr) {
|
|
| 2095 | + $catids_arr[] = 1; |
|
| 2096 | + } |
|
| 2097 | + |
|
| 2098 | + $post_tags = trim($buffer[4]); // comma seperated tags |
|
| 2099 | + |
|
| 2100 | + $tag_arr = ''; |
|
| 2101 | + if ($post_tags) {
|
|
| 2102 | + $tag_arr = explode(',', $post_tags);
|
|
| 2103 | + } |
|
| 2104 | + |
|
| 2105 | + $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database |
|
| 2106 | + |
|
| 2107 | + $error = ''; |
|
| 2108 | + if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {
|
|
| 2109 | + $invalid_post_type++; |
|
| 2110 | + continue; |
|
| 2111 | + } |
|
| 2112 | + |
|
| 2113 | + if ($post_title != '') {
|
|
| 2114 | + $menu_order = 0; |
|
| 2115 | + $image_folder_name = 'uplaod/'; |
|
| 2116 | + |
|
| 2117 | + $image_names = array(); |
|
| 2118 | + |
|
| 2119 | + for ($c = 5; $c < count($customKeyarray); $c++) {
|
|
| 2120 | + $gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]); |
|
| 2121 | + |
|
| 2122 | + if ($customKeyarray[$c] == 'IMAGE') {
|
|
| 2123 | + $buffer[$c] = trim($buffer[$c]); |
|
| 2124 | + |
|
| 2125 | + if (!empty($buffer[$c])) {
|
|
| 2126 | + $image_names[] = $buffer[$c]; |
|
| 2127 | + } |
|
| 2128 | + } |
|
| 2129 | + |
|
| 2130 | + if ($customKeyarray[$c] == 'alive_days') {
|
|
| 2131 | + if ($buffer[$c] != '0' && $buffer[$c] != '') {
|
|
| 2132 | + $submitdata = date('Y-m-d');
|
|
| 2133 | + |
|
| 2134 | + $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));
|
|
| 2135 | + } else {
|
|
| 2136 | + $gd_post_info['expire_date'] = 'Never'; |
|
| 2137 | + } |
|
| 2138 | + } |
|
| 2139 | + |
|
| 2140 | + if ($customKeyarray[$c] == 'post_city') {
|
|
| 2141 | + $post_city = addslashes($buffer[$c]); |
|
| 2142 | + } |
|
| 2143 | + |
|
| 2144 | + if ($customKeyarray[$c] == 'post_region') {
|
|
| 2145 | + $post_region = addslashes($buffer[$c]); |
|
| 2146 | + } |
|
| 2147 | + |
|
| 2148 | + if ($customKeyarray[$c] == 'post_country') {
|
|
| 2149 | + $post_country = addslashes($buffer[$c]); |
|
| 2150 | + } |
|
| 2151 | + |
|
| 2152 | + if ($customKeyarray[$c] == 'post_latitude') {
|
|
| 2153 | + $post_latitude = addslashes($buffer[$c]); |
|
| 2154 | + } |
|
| 2155 | + |
|
| 2156 | + if ($customKeyarray[$c] == 'post_longitude') {
|
|
| 2157 | + $post_longitude = addslashes($buffer[$c]); |
|
| 2158 | + } |
|
| 2159 | 2159 | |
| 2160 | 2160 | // Post status |
| 2161 | 2161 | if ($customKeyarray[$c] == 'post_status') {
|
| 2162 | - $post_status = sanitize_key( $buffer[$c] ); |
|
| 2163 | - } |
|
| 2164 | - } |
|
| 2165 | - |
|
| 2166 | - /* ================ before array create ============== */ |
|
| 2167 | - $location_result = geodir_get_default_location(); |
|
| 2168 | - if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {
|
|
| 2169 | - $blank_address++; |
|
| 2170 | - continue; |
|
| 2171 | - } else if ($location_result->location_id == 0) {
|
|
| 2172 | - if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {
|
|
| 2173 | - $address_invalid++; |
|
| 2174 | - continue; |
|
| 2175 | - } |
|
| 2176 | - } |
|
| 2162 | + $post_status = sanitize_key( $buffer[$c] ); |
|
| 2163 | + } |
|
| 2164 | + } |
|
| 2165 | + |
|
| 2166 | + /* ================ before array create ============== */ |
|
| 2167 | + $location_result = geodir_get_default_location(); |
|
| 2168 | + if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {
|
|
| 2169 | + $blank_address++; |
|
| 2170 | + continue; |
|
| 2171 | + } else if ($location_result->location_id == 0) {
|
|
| 2172 | + if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {
|
|
| 2173 | + $address_invalid++; |
|
| 2174 | + continue; |
|
| 2175 | + } |
|
| 2176 | + } |
|
| 2177 | 2177 | |
| 2178 | 2178 | // Default post status |
| 2179 | 2179 | $default_status = 'publish'; |
| 2180 | 2180 | $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
| 2181 | 2181 | $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
| 2182 | 2182 | |
| 2183 | - $my_post['post_title'] = $post_title; |
|
| 2184 | - $my_post['post_content'] = $post_desc; |
|
| 2185 | - $my_post['post_type'] = addslashes($buffer[5]); |
|
| 2186 | - $my_post['post_author'] = $current_post_author; |
|
| 2187 | - $my_post['post_status'] = $post_status; |
|
| 2188 | - $my_post['post_category'] = $catids_arr; |
|
| 2189 | - $my_post['post_tags'] = $tag_arr; |
|
| 2190 | - |
|
| 2191 | - $gd_post_info['post_tags'] = $tag_arr; |
|
| 2192 | - $gd_post_info['post_title'] = $post_title; |
|
| 2193 | - $gd_post_info['post_status'] = $post_status; |
|
| 2194 | - $gd_post_info['submit_time'] = time(); |
|
| 2195 | - $gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
| 2196 | - |
|
| 2197 | - $last_postid = wp_insert_post($my_post); |
|
| 2198 | - $countpost++; |
|
| 2199 | - |
|
| 2200 | - // Check if we need to save post location as new location |
|
| 2201 | - if ($location_result->location_id > 0) {
|
|
| 2202 | - if (isset($post_city) && isset($post_region)) {
|
|
| 2203 | - $request_info['post_location'] = array( |
|
| 2204 | - 'city' => $post_city, |
|
| 2205 | - 'region' => $post_region, |
|
| 2206 | - 'country' => $post_country, |
|
| 2207 | - 'geo_lat' => $post_latitude, |
|
| 2208 | - 'geo_lng' => $post_longitude |
|
| 2209 | - ); |
|
| 2210 | - |
|
| 2211 | - $post_location_info = $request_info['post_location']; |
|
| 2212 | - if ($location_id = geodir_add_new_location($post_location_info)) |
|
| 2213 | - $post_location_id = $location_id; |
|
| 2214 | - } else {
|
|
| 2215 | - $post_location_id = 0; |
|
| 2216 | - } |
|
| 2217 | - } else {
|
|
| 2218 | - $post_location_id = 0; |
|
| 2219 | - } |
|
| 2220 | - |
|
| 2221 | - /* ------- get default package info ----- */ |
|
| 2222 | - $payment_info = array(); |
|
| 2223 | - $package_info = array(); |
|
| 2224 | - |
|
| 2225 | - $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]); |
|
| 2226 | - $package_id = ''; |
|
| 2227 | - if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {
|
|
| 2228 | - $package_id = $gd_post_info['package_id']; |
|
| 2229 | - } |
|
| 2230 | - |
|
| 2231 | - if (!empty($package_info)) {
|
|
| 2232 | - $payment_info['package_id'] = $package_info['pid']; |
|
| 2233 | - |
|
| 2234 | - if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {
|
|
| 2235 | - $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));
|
|
| 2236 | - } else {
|
|
| 2237 | - $payment_info['expire_date'] = 'Never'; |
|
| 2238 | - } |
|
| 2239 | - |
|
| 2240 | - $gd_post_info = array_merge($gd_post_info, $payment_info); |
|
| 2241 | - } |
|
| 2242 | - |
|
| 2243 | - $gd_post_info['post_location_id'] = $post_location_id; |
|
| 2244 | - |
|
| 2245 | - $post_type = get_post_type($last_postid); |
|
| 2246 | - |
|
| 2247 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2248 | - |
|
| 2249 | - geodir_save_post_info($last_postid, $gd_post_info); |
|
| 2250 | - |
|
| 2251 | - if (!empty($image_names)) {
|
|
| 2252 | - $upload_files++; |
|
| 2253 | - $menu_order = 1; |
|
| 2254 | - |
|
| 2255 | - foreach ($image_names as $image_name) {
|
|
| 2256 | - $img_name_arr = explode('.', $image_name);
|
|
| 2257 | - |
|
| 2258 | - $uploads = wp_upload_dir(); |
|
| 2259 | - $sub_dir = $uploads['subdir']; |
|
| 2260 | - |
|
| 2261 | - $arr_file_type = wp_check_filetype($image_name); |
|
| 2262 | - $uploaded_file_type = $arr_file_type['type']; |
|
| 2263 | - |
|
| 2264 | - $attachment = array(); |
|
| 2265 | - $attachment['post_id'] = $last_postid; |
|
| 2266 | - $attachment['title'] = $img_name_arr[0]; |
|
| 2267 | - $attachment['content'] = ''; |
|
| 2268 | - $attachment['file'] = $sub_dir . '/' . $image_name; |
|
| 2269 | - $attachment['mime_type'] = $uploaded_file_type; |
|
| 2270 | - $attachment['menu_order'] = $menu_order; |
|
| 2271 | - $attachment['is_featured'] = 0; |
|
| 2272 | - |
|
| 2273 | - $attachment_set = ''; |
|
| 2274 | - |
|
| 2275 | - foreach ($attachment as $key => $val) {
|
|
| 2276 | - if ($val != '') |
|
| 2277 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 2278 | - } |
|
| 2279 | - $attachment_set = trim($attachment_set, ", "); |
|
| 2280 | - |
|
| 2281 | - $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 2282 | - |
|
| 2283 | - if ($menu_order == 1) {
|
|
| 2284 | - $post_type = get_post_type($last_postid); |
|
| 2285 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));
|
|
| 2286 | - } |
|
| 2287 | - $menu_order++; |
|
| 2288 | - } |
|
| 2289 | - } |
|
| 2290 | - |
|
| 2291 | - $gd_post_info['package_id'] = $package_id; |
|
| 2292 | - |
|
| 2293 | - /** This action is documented in geodirectory-functions/post-functions.php */ |
|
| 2294 | - do_action('geodir_after_save_listing', $last_postid, $gd_post_info);
|
|
| 2295 | - |
|
| 2296 | - if (!empty($buffer[5])) {
|
|
| 2297 | - if (in_array($buffer[5], geodir_get_posttypes())) {
|
|
| 2298 | - $taxonomies = geodir_get_posttype_info(addslashes($buffer[5])); |
|
| 2299 | - wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]); |
|
| 2300 | - wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]); |
|
| 2301 | - |
|
| 2302 | - $post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : ''; |
|
| 2303 | - $post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : ''; |
|
| 2304 | - geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str); |
|
| 2305 | - } |
|
| 2306 | - } |
|
| 2307 | - } else {
|
|
| 2308 | - $invalid_title++; |
|
| 2309 | - } |
|
| 2310 | - } |
|
| 2311 | - } |
|
| 2312 | - } |
|
| 2313 | - $return['rowcount'] = $countpost; |
|
| 2314 | - $return['invalidcount'] = $address_invalid; |
|
| 2315 | - $return['blank_address'] = $blank_address; |
|
| 2316 | - $return['upload_files'] = $upload_files; |
|
| 2317 | - $return['invalid_post_type'] = $invalid_post_type; |
|
| 2318 | - $return['invalid_title'] = $invalid_title; |
|
| 2319 | - $return['total_records'] = $total_records; |
|
| 2320 | - |
|
| 2321 | - echo json_encode($return); |
|
| 2322 | - exit; |
|
| 2183 | + $my_post['post_title'] = $post_title; |
|
| 2184 | + $my_post['post_content'] = $post_desc; |
|
| 2185 | + $my_post['post_type'] = addslashes($buffer[5]); |
|
| 2186 | + $my_post['post_author'] = $current_post_author; |
|
| 2187 | + $my_post['post_status'] = $post_status; |
|
| 2188 | + $my_post['post_category'] = $catids_arr; |
|
| 2189 | + $my_post['post_tags'] = $tag_arr; |
|
| 2190 | + |
|
| 2191 | + $gd_post_info['post_tags'] = $tag_arr; |
|
| 2192 | + $gd_post_info['post_title'] = $post_title; |
|
| 2193 | + $gd_post_info['post_status'] = $post_status; |
|
| 2194 | + $gd_post_info['submit_time'] = time(); |
|
| 2195 | + $gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
| 2196 | + |
|
| 2197 | + $last_postid = wp_insert_post($my_post); |
|
| 2198 | + $countpost++; |
|
| 2199 | + |
|
| 2200 | + // Check if we need to save post location as new location |
|
| 2201 | + if ($location_result->location_id > 0) {
|
|
| 2202 | + if (isset($post_city) && isset($post_region)) {
|
|
| 2203 | + $request_info['post_location'] = array( |
|
| 2204 | + 'city' => $post_city, |
|
| 2205 | + 'region' => $post_region, |
|
| 2206 | + 'country' => $post_country, |
|
| 2207 | + 'geo_lat' => $post_latitude, |
|
| 2208 | + 'geo_lng' => $post_longitude |
|
| 2209 | + ); |
|
| 2210 | + |
|
| 2211 | + $post_location_info = $request_info['post_location']; |
|
| 2212 | + if ($location_id = geodir_add_new_location($post_location_info)) |
|
| 2213 | + $post_location_id = $location_id; |
|
| 2214 | + } else {
|
|
| 2215 | + $post_location_id = 0; |
|
| 2216 | + } |
|
| 2217 | + } else {
|
|
| 2218 | + $post_location_id = 0; |
|
| 2219 | + } |
|
| 2220 | + |
|
| 2221 | + /* ------- get default package info ----- */ |
|
| 2222 | + $payment_info = array(); |
|
| 2223 | + $package_info = array(); |
|
| 2224 | + |
|
| 2225 | + $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]); |
|
| 2226 | + $package_id = ''; |
|
| 2227 | + if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {
|
|
| 2228 | + $package_id = $gd_post_info['package_id']; |
|
| 2229 | + } |
|
| 2230 | + |
|
| 2231 | + if (!empty($package_info)) {
|
|
| 2232 | + $payment_info['package_id'] = $package_info['pid']; |
|
| 2233 | + |
|
| 2234 | + if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {
|
|
| 2235 | + $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));
|
|
| 2236 | + } else {
|
|
| 2237 | + $payment_info['expire_date'] = 'Never'; |
|
| 2238 | + } |
|
| 2239 | + |
|
| 2240 | + $gd_post_info = array_merge($gd_post_info, $payment_info); |
|
| 2241 | + } |
|
| 2242 | + |
|
| 2243 | + $gd_post_info['post_location_id'] = $post_location_id; |
|
| 2244 | + |
|
| 2245 | + $post_type = get_post_type($last_postid); |
|
| 2246 | + |
|
| 2247 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2248 | + |
|
| 2249 | + geodir_save_post_info($last_postid, $gd_post_info); |
|
| 2250 | + |
|
| 2251 | + if (!empty($image_names)) {
|
|
| 2252 | + $upload_files++; |
|
| 2253 | + $menu_order = 1; |
|
| 2254 | + |
|
| 2255 | + foreach ($image_names as $image_name) {
|
|
| 2256 | + $img_name_arr = explode('.', $image_name);
|
|
| 2257 | + |
|
| 2258 | + $uploads = wp_upload_dir(); |
|
| 2259 | + $sub_dir = $uploads['subdir']; |
|
| 2260 | + |
|
| 2261 | + $arr_file_type = wp_check_filetype($image_name); |
|
| 2262 | + $uploaded_file_type = $arr_file_type['type']; |
|
| 2263 | + |
|
| 2264 | + $attachment = array(); |
|
| 2265 | + $attachment['post_id'] = $last_postid; |
|
| 2266 | + $attachment['title'] = $img_name_arr[0]; |
|
| 2267 | + $attachment['content'] = ''; |
|
| 2268 | + $attachment['file'] = $sub_dir . '/' . $image_name; |
|
| 2269 | + $attachment['mime_type'] = $uploaded_file_type; |
|
| 2270 | + $attachment['menu_order'] = $menu_order; |
|
| 2271 | + $attachment['is_featured'] = 0; |
|
| 2272 | + |
|
| 2273 | + $attachment_set = ''; |
|
| 2274 | + |
|
| 2275 | + foreach ($attachment as $key => $val) {
|
|
| 2276 | + if ($val != '') |
|
| 2277 | + $attachment_set .= $key . " = '" . $val . "', "; |
|
| 2278 | + } |
|
| 2279 | + $attachment_set = trim($attachment_set, ", "); |
|
| 2280 | + |
|
| 2281 | + $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 2282 | + |
|
| 2283 | + if ($menu_order == 1) {
|
|
| 2284 | + $post_type = get_post_type($last_postid); |
|
| 2285 | + $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));
|
|
| 2286 | + } |
|
| 2287 | + $menu_order++; |
|
| 2288 | + } |
|
| 2289 | + } |
|
| 2290 | + |
|
| 2291 | + $gd_post_info['package_id'] = $package_id; |
|
| 2292 | + |
|
| 2293 | + /** This action is documented in geodirectory-functions/post-functions.php */ |
|
| 2294 | + do_action('geodir_after_save_listing', $last_postid, $gd_post_info);
|
|
| 2295 | + |
|
| 2296 | + if (!empty($buffer[5])) {
|
|
| 2297 | + if (in_array($buffer[5], geodir_get_posttypes())) {
|
|
| 2298 | + $taxonomies = geodir_get_posttype_info(addslashes($buffer[5])); |
|
| 2299 | + wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]); |
|
| 2300 | + wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]); |
|
| 2301 | + |
|
| 2302 | + $post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : ''; |
|
| 2303 | + $post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : ''; |
|
| 2304 | + geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str); |
|
| 2305 | + } |
|
| 2306 | + } |
|
| 2307 | + } else {
|
|
| 2308 | + $invalid_title++; |
|
| 2309 | + } |
|
| 2310 | + } |
|
| 2311 | + } |
|
| 2312 | + } |
|
| 2313 | + $return['rowcount'] = $countpost; |
|
| 2314 | + $return['invalidcount'] = $address_invalid; |
|
| 2315 | + $return['blank_address'] = $blank_address; |
|
| 2316 | + $return['upload_files'] = $upload_files; |
|
| 2317 | + $return['invalid_post_type'] = $invalid_post_type; |
|
| 2318 | + $return['invalid_title'] = $invalid_title; |
|
| 2319 | + $return['total_records'] = $total_records; |
|
| 2320 | + |
|
| 2321 | + echo json_encode($return); |
|
| 2322 | + exit; |
|
| 2323 | 2323 | } |
| 2324 | 2324 | |
| 2325 | 2325 | // Add the tab in left sidebar menu fro import & export page. |
@@ -2339,9 +2339,9 @@ discard block |
||
| 2339 | 2339 | * @param $post object $post The post object of the post being saved. |
| 2340 | 2340 | */ |
| 2341 | 2341 | function geodir_update_location_prefix($post_id,$post){
|
| 2342 | - if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){
|
|
| 2343 | - update_option('geodir_location_prefix',$post->post_name);
|
|
| 2344 | - } |
|
| 2342 | + if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){
|
|
| 2343 | + update_option('geodir_location_prefix',$post->post_name);
|
|
| 2344 | + } |
|
| 2345 | 2345 | |
| 2346 | 2346 | } |
| 2347 | 2347 | |
@@ -2352,50 +2352,50 @@ discard block |
||
| 2352 | 2352 | function geodir_ga_callback(){
|
| 2353 | 2353 | |
| 2354 | 2354 | if(isset($_REQUEST['code']) && $_REQUEST['code']) {
|
| 2355 | - $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?"; |
|
| 2356 | - $code = "code=".$_REQUEST['code']; |
|
| 2357 | - $grant_type = "&grant_type=authorization_code"; |
|
| 2358 | - $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 2359 | - $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
| 2360 | - $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
|
|
| 2355 | + $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?"; |
|
| 2356 | + $code = "code=".$_REQUEST['code']; |
|
| 2357 | + $grant_type = "&grant_type=authorization_code"; |
|
| 2358 | + $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 2359 | + $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
| 2360 | + $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
|
|
| 2361 | 2361 | |
| 2362 | - $auth_url = $oAuthURL . $code . $redirect_uri . $grant_type . $client_id .$client_secret; |
|
| 2362 | + $auth_url = $oAuthURL . $code . $redirect_uri . $grant_type . $client_id .$client_secret; |
|
| 2363 | 2363 | |
| 2364 | - $response = wp_remote_post($auth_url, array('timeout' => 15));
|
|
| 2364 | + $response = wp_remote_post($auth_url, array('timeout' => 15));
|
|
| 2365 | 2365 | |
| 2366 | - //print_r($response); |
|
| 2366 | + //print_r($response); |
|
| 2367 | 2367 | |
| 2368 | - $error_msg = __('Something went wrong','geodirectory');
|
|
| 2369 | - if(!empty($response['response']['code']) && $response['response']['code']==200){
|
|
| 2368 | + $error_msg = __('Something went wrong','geodirectory');
|
|
| 2369 | + if(!empty($response['response']['code']) && $response['response']['code']==200){
|
|
| 2370 | 2370 | |
| 2371 | - $parts = json_decode($response['body']); |
|
| 2372 | - //print_r($parts); |
|
| 2373 | - if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
|
|
| 2374 | - else{
|
|
| 2371 | + $parts = json_decode($response['body']); |
|
| 2372 | + //print_r($parts); |
|
| 2373 | + if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
|
|
| 2374 | + else{
|
|
| 2375 | 2375 | |
| 2376 | - update_option('gd_ga_access_token', $parts->access_token);
|
|
| 2377 | - update_option('gd_ga_refresh_token', $parts->refresh_token);
|
|
| 2378 | - ?><script>window.close();</script><?php |
|
| 2379 | - } |
|
| 2376 | + update_option('gd_ga_access_token', $parts->access_token);
|
|
| 2377 | + update_option('gd_ga_refresh_token', $parts->refresh_token);
|
|
| 2378 | + ?><script>window.close();</script><?php |
|
| 2379 | + } |
|
| 2380 | 2380 | |
| 2381 | 2381 | |
| 2382 | - } |
|
| 2383 | - elseif(!empty($response['response']['code'])) {
|
|
| 2384 | - $parts = json_decode($response['body']); |
|
| 2382 | + } |
|
| 2383 | + elseif(!empty($response['response']['code'])) {
|
|
| 2384 | + $parts = json_decode($response['body']); |
|
| 2385 | 2385 | |
| 2386 | - if(isset($parts->error)){
|
|
| 2387 | - echo $parts->error.": ".$parts->error_description;exit; |
|
| 2388 | - }else{
|
|
| 2389 | - echo $error_msg." - #2";exit; |
|
| 2390 | - } |
|
| 2386 | + if(isset($parts->error)){
|
|
| 2387 | + echo $parts->error.": ".$parts->error_description;exit; |
|
| 2388 | + }else{
|
|
| 2389 | + echo $error_msg." - #2";exit; |
|
| 2390 | + } |
|
| 2391 | 2391 | |
| 2392 | - }else{
|
|
| 2392 | + }else{
|
|
| 2393 | 2393 | |
| 2394 | - echo $error_msg." - #3";exit; |
|
| 2394 | + echo $error_msg." - #3";exit; |
|
| 2395 | 2395 | |
| 2396 | - } |
|
| 2396 | + } |
|
| 2397 | 2397 | } |
| 2398 | - exit; |
|
| 2398 | + exit; |
|
| 2399 | 2399 | } |
| 2400 | 2400 | |
| 2401 | 2401 | if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {
|
@@ -2411,45 +2411,45 @@ discard block |
||
| 2411 | 2411 | * @return array Array of settings. |
| 2412 | 2412 | */ |
| 2413 | 2413 | function geodir_uninstall_settings($general_settings) {
|
| 2414 | - $settings = array(); |
|
| 2415 | - $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));
|
|
| 2416 | - $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));
|
|
| 2414 | + $settings = array(); |
|
| 2415 | + $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));
|
|
| 2416 | + $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));
|
|
| 2417 | 2417 | |
| 2418 | - $plugins = get_plugins(); |
|
| 2419 | - $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());
|
|
| 2418 | + $plugins = get_plugins(); |
|
| 2419 | + $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());
|
|
| 2420 | 2420 | |
| 2421 | - if (!empty($plugins) && !empty($un_plugins)) {
|
|
| 2422 | - foreach ($plugins as $plugin => $data) {
|
|
| 2423 | - $plugin_name = plugin_basename(dirname($plugin)); |
|
| 2421 | + if (!empty($plugins) && !empty($un_plugins)) {
|
|
| 2422 | + foreach ($plugins as $plugin => $data) {
|
|
| 2423 | + $plugin_name = plugin_basename(dirname($plugin)); |
|
| 2424 | 2424 | |
| 2425 | - if (in_array($plugin_name, $un_plugins)) {
|
|
| 2426 | - $settings[] = array( |
|
| 2427 | - 'type' => 'checkbox', |
|
| 2428 | - 'id' => 'geodir_un_' . $plugin_name, |
|
| 2429 | - 'name' => $data['Name'], |
|
| 2430 | - 'desc' => __('Remove all data when deleted?', 'geodirectory'),
|
|
| 2431 | - 'std' => '0' |
|
| 2432 | - ); |
|
| 2433 | - } |
|
| 2434 | - } |
|
| 2435 | - } |
|
| 2425 | + if (in_array($plugin_name, $un_plugins)) {
|
|
| 2426 | + $settings[] = array( |
|
| 2427 | + 'type' => 'checkbox', |
|
| 2428 | + 'id' => 'geodir_un_' . $plugin_name, |
|
| 2429 | + 'name' => $data['Name'], |
|
| 2430 | + 'desc' => __('Remove all data when deleted?', 'geodirectory'),
|
|
| 2431 | + 'std' => '0' |
|
| 2432 | + ); |
|
| 2433 | + } |
|
| 2434 | + } |
|
| 2435 | + } |
|
| 2436 | 2436 | |
| 2437 | - $settings[] = array('type' => 'sectionend', 'id' => 'uninstall_settings_main');
|
|
| 2437 | + $settings[] = array('type' => 'sectionend', 'id' => 'uninstall_settings_main');
|
|
| 2438 | 2438 | |
| 2439 | - /** |
|
| 2440 | - * Filter the uninstall settings array. |
|
| 2441 | - * |
|
| 2442 | - * @since 1.6.9 |
|
| 2443 | - * |
|
| 2444 | - * @param array $settings The settings array. |
|
| 2445 | - */ |
|
| 2446 | - $settings = apply_filters('geodir_uninstall_settings', $settings);
|
|
| 2439 | + /** |
|
| 2440 | + * Filter the uninstall settings array. |
|
| 2441 | + * |
|
| 2442 | + * @since 1.6.9 |
|
| 2443 | + * |
|
| 2444 | + * @param array $settings The settings array. |
|
| 2445 | + */ |
|
| 2446 | + $settings = apply_filters('geodir_uninstall_settings', $settings);
|
|
| 2447 | 2447 | |
| 2448 | - if (!empty($settings) && count($settings) > 3) {
|
|
| 2449 | - return array_merge($general_settings, $settings); |
|
| 2450 | - } |
|
| 2448 | + if (!empty($settings) && count($settings) > 3) {
|
|
| 2449 | + return array_merge($general_settings, $settings); |
|
| 2450 | + } |
|
| 2451 | 2451 | |
| 2452 | - return $general_settings; |
|
| 2452 | + return $general_settings; |
|
| 2453 | 2453 | } |
| 2454 | 2454 | add_filter('geodir_general_settings', 'geodir_uninstall_settings', 100, 1);
|
| 2455 | 2455 | |
@@ -2459,7 +2459,7 @@ discard block |
||
| 2459 | 2459 | * @since 1.6.9 |
| 2460 | 2460 | */ |
| 2461 | 2461 | function geodir_uninstall_settings_desc() {
|
| 2462 | - echo '<p class="gd-un-settings-desc">' . __('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory') . '</p>';
|
|
| 2462 | + echo '<p class="gd-un-settings-desc">' . __('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory') . '</p>';
|
|
| 2463 | 2463 | } |
| 2464 | 2464 | add_action('geodir_settings_uninstall_settings_main_start', 'geodir_uninstall_settings_desc');
|
| 2465 | 2465 | |
@@ -2475,18 +2475,18 @@ discard block |
||
| 2475 | 2475 | * @return array The settings array. |
| 2476 | 2476 | */ |
| 2477 | 2477 | function geodir_resave_settings($settings = array()) {
|
| 2478 | - if (!empty($settings) && is_array($settings)) {
|
|
| 2479 | - $c = 0; |
|
| 2478 | + if (!empty($settings) && is_array($settings)) {
|
|
| 2479 | + $c = 0; |
|
| 2480 | 2480 | |
| 2481 | - foreach ($settings as $setting) {
|
|
| 2482 | - if (!empty($setting['id']) && false !== ($value = get_option($setting['id']))) {
|
|
| 2483 | - $settings[$c]['std'] = $value; |
|
| 2484 | - } |
|
| 2485 | - $c++; |
|
| 2486 | - } |
|
| 2487 | - } |
|
| 2488 | - |
|
| 2489 | - return $settings; |
|
| 2481 | + foreach ($settings as $setting) {
|
|
| 2482 | + if (!empty($setting['id']) && false !== ($value = get_option($setting['id']))) {
|
|
| 2483 | + $settings[$c]['std'] = $value; |
|
| 2484 | + } |
|
| 2485 | + $c++; |
|
| 2486 | + } |
|
| 2487 | + } |
|
| 2488 | + |
|
| 2489 | + return $settings; |
|
| 2490 | 2490 | } |
| 2491 | 2491 | |
| 2492 | 2492 | /** |
@@ -2498,9 +2498,9 @@ discard block |
||
| 2498 | 2498 | * @return array The modified settings. |
| 2499 | 2499 | */ |
| 2500 | 2500 | function geodir_core_uninstall_settings($settings) {
|
| 2501 | - $settings[] = plugin_basename(dirname(dirname(__FILE__))); |
|
| 2501 | + $settings[] = plugin_basename(dirname(dirname(__FILE__))); |
|
| 2502 | 2502 | |
| 2503 | - return $settings; |
|
| 2503 | + return $settings; |
|
| 2504 | 2504 | } |
| 2505 | 2505 | add_filter('geodir_plugins_uninstall_settings', 'geodir_core_uninstall_settings', 10, 1);
|
| 2506 | 2506 | |
@@ -2514,34 +2514,34 @@ discard block |
||
| 2514 | 2514 | */ |
| 2515 | 2515 | function geodir_diagnose_reload_db_countries() |
| 2516 | 2516 | {
|
| 2517 | - global $wpdb, $plugin_prefix; |
|
| 2518 | - |
|
| 2519 | - $is_error_during_diagnose = false; |
|
| 2520 | - $output_str = ''; |
|
| 2521 | - |
|
| 2522 | - $delete = $wpdb->query("TRUNCATE TABLE ".GEODIR_COUNTRIES_TABLE);
|
|
| 2523 | - |
|
| 2524 | - |
|
| 2525 | - if ($delete) {
|
|
| 2526 | - $output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";
|
|
| 2527 | - ob_start(); |
|
| 2528 | - geodir_diagnose_version_clear(); |
|
| 2529 | - ob_end_clean(); |
|
| 2530 | - }else{
|
|
| 2531 | - $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";
|
|
| 2532 | - } |
|
| 2533 | - |
|
| 2534 | - if ($is_error_during_diagnose) {
|
|
| 2535 | - $info_div_class = "geodir_problem_info"; |
|
| 2536 | - $fix_button_txt = ""; |
|
| 2537 | - } else {
|
|
| 2538 | - $info_div_class = "geodir_noproblem_info"; |
|
| 2539 | - $fix_button_txt = ''; |
|
| 2540 | - } |
|
| 2541 | - echo "<ul class='$info_div_class'>"; |
|
| 2542 | - echo $output_str; |
|
| 2543 | - echo $fix_button_txt; |
|
| 2544 | - echo "</ul>"; |
|
| 2517 | + global $wpdb, $plugin_prefix; |
|
| 2518 | + |
|
| 2519 | + $is_error_during_diagnose = false; |
|
| 2520 | + $output_str = ''; |
|
| 2521 | + |
|
| 2522 | + $delete = $wpdb->query("TRUNCATE TABLE ".GEODIR_COUNTRIES_TABLE);
|
|
| 2523 | + |
|
| 2524 | + |
|
| 2525 | + if ($delete) {
|
|
| 2526 | + $output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";
|
|
| 2527 | + ob_start(); |
|
| 2528 | + geodir_diagnose_version_clear(); |
|
| 2529 | + ob_end_clean(); |
|
| 2530 | + }else{
|
|
| 2531 | + $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";
|
|
| 2532 | + } |
|
| 2533 | + |
|
| 2534 | + if ($is_error_during_diagnose) {
|
|
| 2535 | + $info_div_class = "geodir_problem_info"; |
|
| 2536 | + $fix_button_txt = ""; |
|
| 2537 | + } else {
|
|
| 2538 | + $info_div_class = "geodir_noproblem_info"; |
|
| 2539 | + $fix_button_txt = ''; |
|
| 2540 | + } |
|
| 2541 | + echo "<ul class='$info_div_class'>"; |
|
| 2542 | + echo $output_str; |
|
| 2543 | + echo $fix_button_txt; |
|
| 2544 | + echo "</ul>"; |
|
| 2545 | 2545 | } |
| 2546 | 2546 | |
| 2547 | 2547 | /** |
@@ -2554,11 +2554,11 @@ discard block |
||
| 2554 | 2554 | * @return array Filtered actions. |
| 2555 | 2555 | */ |
| 2556 | 2556 | function geodir_disable_quick_edit( $actions = array(), $row = null ) {
|
| 2557 | - if ( isset( $actions['inline hide-if-no-js'] ) ) {
|
|
| 2558 | - unset( $actions['inline hide-if-no-js'] ); |
|
| 2559 | - } |
|
| 2557 | + if ( isset( $actions['inline hide-if-no-js'] ) ) {
|
|
| 2558 | + unset( $actions['inline hide-if-no-js'] ); |
|
| 2559 | + } |
|
| 2560 | 2560 | |
| 2561 | - return $actions; |
|
| 2561 | + return $actions; |
|
| 2562 | 2562 | } |
| 2563 | 2563 | |
| 2564 | 2564 | /** |
@@ -2572,25 +2572,25 @@ discard block |
||
| 2572 | 2572 | * @global bool $gd_cpt_screen True if current scrrrn has GD post type. |
| 2573 | 2573 | */ |
| 2574 | 2574 | function geodir_check_quick_edit() {
|
| 2575 | - global $pagenow, $current_screen, $gd_cpt_screen; |
|
| 2576 | - |
|
| 2577 | - if ( ( $pagenow == 'edit.php' || $pagenow == 'edit-tags.php' ) && !empty( $current_screen->post_type ) ) {
|
|
| 2578 | - if ( empty( $gd_cpt_screen ) ) {
|
|
| 2579 | - if ( in_array( $current_screen->post_type, geodir_get_posttypes() ) ) {
|
|
| 2580 | - $gd_cpt_screen = 'y'; |
|
| 2581 | - } else {
|
|
| 2582 | - $gd_cpt_screen = 'n'; |
|
| 2583 | - } |
|
| 2584 | - } |
|
| 2585 | - |
|
| 2586 | - if ( $gd_cpt_screen == 'y' ) {
|
|
| 2587 | - if ( $pagenow == 'edit.php' ) {
|
|
| 2588 | - add_filter( 'post_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2589 | - add_filter( 'page_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2590 | - } elseif ( $pagenow == 'edit-tags.php' && !empty( $current_screen->taxonomy ) ) {
|
|
| 2591 | - add_filter( $current_screen->taxonomy . '_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2592 | - } |
|
| 2593 | - } |
|
| 2594 | - } |
|
| 2575 | + global $pagenow, $current_screen, $gd_cpt_screen; |
|
| 2576 | + |
|
| 2577 | + if ( ( $pagenow == 'edit.php' || $pagenow == 'edit-tags.php' ) && !empty( $current_screen->post_type ) ) {
|
|
| 2578 | + if ( empty( $gd_cpt_screen ) ) {
|
|
| 2579 | + if ( in_array( $current_screen->post_type, geodir_get_posttypes() ) ) {
|
|
| 2580 | + $gd_cpt_screen = 'y'; |
|
| 2581 | + } else {
|
|
| 2582 | + $gd_cpt_screen = 'n'; |
|
| 2583 | + } |
|
| 2584 | + } |
|
| 2585 | + |
|
| 2586 | + if ( $gd_cpt_screen == 'y' ) {
|
|
| 2587 | + if ( $pagenow == 'edit.php' ) {
|
|
| 2588 | + add_filter( 'post_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2589 | + add_filter( 'page_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2590 | + } elseif ( $pagenow == 'edit-tags.php' && !empty( $current_screen->taxonomy ) ) {
|
|
| 2591 | + add_filter( $current_screen->taxonomy . '_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2592 | + } |
|
| 2593 | + } |
|
| 2594 | + } |
|
| 2595 | 2595 | } |
| 2596 | 2596 | add_action( 'admin_head', 'geodir_check_quick_edit', 10 ); |
| 2597 | 2597 | \ No newline at end of file |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | function geodir_get_admin_option_form($current_tab) |
| 64 | 64 | {
|
| 65 | - geodir_admin_option_form($current_tab);// defined in admin template tags.php |
|
| 65 | + geodir_admin_option_form($current_tab); // defined in admin template tags.php |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | add_action('geodir_update_options_compatibility_settings', 'geodir_update_options_compatibility_settings');
|
| 71 | 71 | add_action('geodir_update_options_default_location_settings', 'geodir_location_form_submit');
|
| 72 | 72 | add_action('geodir_before_admin_panel', 'geodir_before_admin_panel'); // this function is in admin_functions.php
|
| 73 | -add_action('geodir_before_update_options', 'geodir_before_update_options',10,2);
|
|
| 73 | +add_action('geodir_before_update_options', 'geodir_before_update_options', 10, 2);
|
|
| 74 | 74 | |
| 75 | 75 | //add_action('geodir_before_admin_panel', 'geodir_autoinstall_admin_header');
|
| 76 | 76 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | // Disable VC editor for GD post types. |
| 101 | 101 | if (class_exists('Vc_Role_Access_Controller')) {
|
| 102 | - add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 ); |
|
| 102 | + add_filter('vc_role_access_with_post_types_can', '__return_false', 100);
|
|
| 103 | 103 | } |
| 104 | 104 | } |
| 105 | 105 | |
@@ -126,8 +126,8 @@ discard block |
||
| 126 | 126 | add_action('admin_panel_init', 'geodir_admin_list_columns', 2);
|
| 127 | 127 | |
| 128 | 128 | /* --- insert dummy post action ---*/ |
| 129 | -add_action('geodir_insert_dummy_posts', 'geodir_insert_dummy_posts', 1,3);
|
|
| 130 | -add_action('geodir_delete_dummy_posts', 'geodir_delete_dummy_posts', 1,3);
|
|
| 129 | +add_action('geodir_insert_dummy_posts', 'geodir_insert_dummy_posts', 1, 3);
|
|
| 130 | +add_action('geodir_delete_dummy_posts', 'geodir_delete_dummy_posts', 1, 3);
|
|
| 131 | 131 | |
| 132 | 132 | |
| 133 | 133 | /** |
@@ -236,9 +236,9 @@ discard block |
||
| 236 | 236 | |
| 237 | 237 | // Filter-Payment-Manager |
| 238 | 238 | |
| 239 | - add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
|
|
| 239 | + add_meta_box('geodir_post_images', $post_typename.' '.__('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
|
|
| 240 | 240 | |
| 241 | - add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
|
|
| 241 | + add_meta_box('geodir_post_info', $post_typename.' '.__('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
|
|
| 242 | 242 | |
| 243 | 243 | // no need of this box as all fields moved to main information box |
| 244 | 244 | //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );
|
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | |
| 248 | 248 | } |
| 249 | 249 | |
| 250 | -add_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 250 | +add_action('save_post', 'geodir_post_information_save', 10, 2);
|
|
| 251 | 251 | |
| 252 | 252 | |
| 253 | 253 | |
@@ -274,10 +274,10 @@ discard block |
||
| 274 | 274 | |
| 275 | 275 | $gd_taxonomy = geodir_get_taxonomies($geodir_post_type); |
| 276 | 276 | |
| 277 | - if(!empty($gd_taxonomy)) {
|
|
| 277 | + if (!empty($gd_taxonomy)) {
|
|
| 278 | 278 | foreach ($gd_taxonomy as $tax) {
|
| 279 | 279 | |
| 280 | - remove_meta_box($tax . 'div', $geodir_post_type, 'normal'); |
|
| 280 | + remove_meta_box($tax.'div', $geodir_post_type, 'normal'); |
|
| 281 | 281 | |
| 282 | 282 | } |
| 283 | 283 | } |
@@ -363,14 +363,14 @@ discard block |
||
| 363 | 363 | add_action('geodir_manage_available_fields_predefined', 'geodir_manage_available_fields_predefined');
|
| 364 | 364 | add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');
|
| 365 | 365 | |
| 366 | -function geodir_manage_available_fields_predefined($sub_tab){
|
|
| 367 | - if($sub_tab=='custom_fields'){
|
|
| 366 | +function geodir_manage_available_fields_predefined($sub_tab) {
|
|
| 367 | + if ($sub_tab == 'custom_fields') {
|
|
| 368 | 368 | geodir_custom_available_fields('predefined');
|
| 369 | 369 | } |
| 370 | 370 | } |
| 371 | 371 | |
| 372 | -function geodir_manage_available_fields_custom($sub_tab){
|
|
| 373 | - if($sub_tab=='custom_fields'){
|
|
| 372 | +function geodir_manage_available_fields_custom($sub_tab) {
|
|
| 373 | + if ($sub_tab == 'custom_fields') {
|
|
| 374 | 374 | geodir_custom_available_fields('custom');
|
| 375 | 375 | } |
| 376 | 376 | } |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | global $wpdb; |
| 441 | 441 | $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
| 442 | 442 | ?> |
| 443 | - <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/> |
|
| 443 | + <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/> |
|
| 444 | 444 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/> |
| 445 | 445 | <ul> |
| 446 | 446 | <?php |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | |
| 452 | 452 | $check_html_variable = $wpdb->get_var( |
| 453 | 453 | $wpdb->prepare( |
| 454 | - "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s", |
|
| 454 | + "SELECT htmlvar_name FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s", |
|
| 455 | 455 | array($val['htmlvar_name'], $listing_type, $val['field_type']) |
| 456 | 456 | ) |
| 457 | 457 | ); |
@@ -459,23 +459,23 @@ discard block |
||
| 459 | 459 | $display = $check_html_variable ? ' style="display:none;"' : ''; |
| 460 | 460 | ?> |
| 461 | 461 | |
| 462 | - <li class="gd-cf-tooltip-wrap" <?php echo $display;?>> |
|
| 462 | + <li class="gd-cf-tooltip-wrap" <?php echo $display; ?>> |
|
| 463 | 463 | <?php |
| 464 | - if(isset($val['description']) && $val['description']){
|
|
| 464 | + if (isset($val['description']) && $val['description']) {
|
|
| 465 | 465 | echo '<div class="gdcf-tooltip">'.$val['description'].'</div>'; |
| 466 | 466 | }?> |
| 467 | 467 | |
| 468 | - <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>" data-field-type="<?php echo $val['field_type'];?>" |
|
| 469 | - title="<?php echo $val['site_title'];?>" |
|
| 470 | - class="gd-draggable-form-items gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);"> |
|
| 468 | + <a id="gd-<?php echo $val['field_type']; ?>-_-<?php echo $val['htmlvar_name']; ?>" data-field-type-key="<?php echo $val['htmlvar_name']; ?>" data-field-type="<?php echo $val['field_type']; ?>" |
|
| 469 | + title="<?php echo $val['site_title']; ?>" |
|
| 470 | + class="gd-draggable-form-items gd-<?php echo $val['field_type']; ?> geodir-sort-<?php echo $val['htmlvar_name']; ?>" href="javascript:void(0);"> |
|
| 471 | 471 | <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {
|
| 472 | 472 | echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>'; |
| 473 | - }elseif(isset($val['field_icon']) && $val['field_icon'] ){
|
|
| 473 | + }elseif (isset($val['field_icon']) && $val['field_icon']) {
|
|
| 474 | 474 | echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';
|
| 475 | - }else{
|
|
| 475 | + } else {
|
|
| 476 | 476 | echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
| 477 | 477 | }?> |
| 478 | - <?php echo $val['site_title'];?> |
|
| 478 | + <?php echo $val['site_title']; ?> |
|
| 479 | 479 | </a> |
| 480 | 480 | </li> |
| 481 | 481 | |
@@ -503,7 +503,7 @@ discard block |
||
| 503 | 503 | <?php |
| 504 | 504 | global $wpdb; |
| 505 | 505 | |
| 506 | - $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
|
|
| 506 | + $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
|
|
| 507 | 507 | |
| 508 | 508 | if (!empty($fields)) {
|
| 509 | 509 | foreach ($fields as $field) {
|
@@ -528,14 +528,14 @@ discard block |
||
| 528 | 528 | * @since 1.6.9 |
| 529 | 529 | * @package GeoDirectory |
| 530 | 530 | */ |
| 531 | -function geodir_custom_fields_custom($post_type=''){
|
|
| 531 | +function geodir_custom_fields_custom($post_type = '') {
|
|
| 532 | 532 | |
| 533 | 533 | $custom_fields = array(); |
| 534 | 534 | |
| 535 | 535 | /** |
| 536 | 536 | * @see `geodir_custom_fields` |
| 537 | 537 | */ |
| 538 | - return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);
|
|
| 538 | + return apply_filters('geodir_custom_fields_custom', $custom_fields, $post_type);
|
|
| 539 | 539 | } |
| 540 | 540 | |
| 541 | 541 | |
@@ -546,7 +546,7 @@ discard block |
||
| 546 | 546 | * @since 1.6.6 |
| 547 | 547 | * @package GeoDirectory |
| 548 | 548 | */ |
| 549 | -function geodir_custom_fields($post_type=''){
|
|
| 549 | +function geodir_custom_fields($post_type = '') {
|
|
| 550 | 550 | |
| 551 | 551 | $custom_fields = array( |
| 552 | 552 | 'text' => array( |
@@ -681,7 +681,7 @@ discard block |
||
| 681 | 681 | * } |
| 682 | 682 | * @param string $post_type The post type requested. |
| 683 | 683 | */ |
| 684 | - return apply_filters('geodir_custom_fields',$custom_fields,$post_type);
|
|
| 684 | + return apply_filters('geodir_custom_fields', $custom_fields, $post_type);
|
|
| 685 | 685 | } |
| 686 | 686 | |
| 687 | 687 | /** |
@@ -692,25 +692,25 @@ discard block |
||
| 692 | 692 | * @param string $type The custom field type, predefined, custom or blank for default |
| 693 | 693 | * @package GeoDirectory |
| 694 | 694 | */ |
| 695 | -function geodir_custom_available_fields($type='') |
|
| 695 | +function geodir_custom_available_fields($type = '') |
|
| 696 | 696 | {
|
| 697 | 697 | $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
| 698 | 698 | ?> |
| 699 | - <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/> |
|
| 699 | + <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/> |
|
| 700 | 700 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>" /> |
| 701 | 701 | |
| 702 | 702 | <?php |
| 703 | - if($type=='predefined'){
|
|
| 703 | + if ($type == 'predefined') {
|
|
| 704 | 704 | $cfs = geodir_custom_fields_predefined($listing_type); |
| 705 | - }elseif($type=='custom'){
|
|
| 705 | + }elseif ($type == 'custom') {
|
|
| 706 | 706 | $cfs = geodir_custom_fields_custom($listing_type); |
| 707 | - }else{
|
|
| 707 | + } else {
|
|
| 708 | 708 | $cfs = geodir_custom_fields($listing_type); |
| 709 | 709 | ?> |
| 710 | 710 | <ul class="full gd-cf-tooltip-wrap"> |
| 711 | 711 | <li> |
| 712 | 712 | <div class="gdcf-tooltip"> |
| 713 | - <?php _e('This adds a section separator with a title.', 'geodirectory');?>
|
|
| 713 | + <?php _e('This adds a section separator with a title.', 'geodirectory'); ?>
|
|
| 714 | 714 | </div> |
| 715 | 715 | <a id="gt-fieldset" |
| 716 | 716 | class="gd-draggable-form-items gt-fieldset" |
@@ -721,7 +721,7 @@ discard block |
||
| 721 | 721 | |
| 722 | 722 | <i class="fa fa-long-arrow-left " aria-hidden="true"></i> |
| 723 | 723 | <i class="fa fa-long-arrow-right " aria-hidden="true"></i> |
| 724 | - <?php _e('Fieldset (section separator)', 'geodirectory');?>
|
|
| 724 | + <?php _e('Fieldset (section separator)', 'geodirectory'); ?>
|
|
| 725 | 725 | </a> |
| 726 | 726 | </li> |
| 727 | 727 | </ul> |
@@ -729,15 +729,15 @@ discard block |
||
| 729 | 729 | <?php |
| 730 | 730 | } |
| 731 | 731 | |
| 732 | - if(!empty($cfs)) {
|
|
| 732 | + if (!empty($cfs)) {
|
|
| 733 | 733 | echo '<ul>'; |
| 734 | - foreach ( $cfs as $id => $cf ) {
|
|
| 734 | + foreach ($cfs as $id => $cf) {
|
|
| 735 | 735 | ?> |
| 736 | 736 | |
| 737 | 737 | <li class="gd-cf-tooltip-wrap"> |
| 738 | 738 | <?php |
| 739 | - if ( isset( $cf['description'] ) && $cf['description'] ) {
|
|
| 740 | - echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>'; |
|
| 739 | + if (isset($cf['description']) && $cf['description']) {
|
|
| 740 | + echo '<div class="gdcf-tooltip">'.$cf['description'].'</div>'; |
|
| 741 | 741 | } ?> |
| 742 | 742 | |
| 743 | 743 | <a id="gd-<?php echo $id; ?>" |
@@ -747,10 +747,10 @@ discard block |
||
| 747 | 747 | class="gd-draggable-form-items <?php echo $cf['class']; ?>" |
| 748 | 748 | href="javascript:void(0);"> |
| 749 | 749 | |
| 750 | - <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {
|
|
| 751 | - echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>'; |
|
| 752 | - } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {
|
|
| 753 | - echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';
|
|
| 750 | + <?php if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {
|
|
| 751 | + echo '<i class="'.$cf['icon'].'" aria-hidden="true"></i>'; |
|
| 752 | + } elseif (isset($cf['icon']) && $cf['icon']) {
|
|
| 753 | + echo '<b style="background-image: url("'.$cf['icon'].'")"></b>';
|
|
| 754 | 754 | } else {
|
| 755 | 755 | echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
| 756 | 756 | } ?> |
@@ -759,7 +759,7 @@ discard block |
||
| 759 | 759 | </li> |
| 760 | 760 | <?php |
| 761 | 761 | } |
| 762 | - }else{
|
|
| 762 | + } else {
|
|
| 763 | 763 | _e('There are no custom fields here yet.', 'geodirectory');
|
| 764 | 764 | } |
| 765 | 765 | ?> |
@@ -787,7 +787,7 @@ discard block |
||
| 787 | 787 | <ul class="core"> |
| 788 | 788 | <?php |
| 789 | 789 | global $wpdb; |
| 790 | - $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
|
|
| 790 | + $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
|
|
| 791 | 791 | |
| 792 | 792 | if (!empty($fields)) {
|
| 793 | 793 | foreach ($fields as $field) {
|
@@ -797,7 +797,7 @@ discard block |
||
| 797 | 797 | $field_type_key = $field->field_type_key; |
| 798 | 798 | $field_ins_upd = 'display'; |
| 799 | 799 | |
| 800 | - geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key); |
|
| 800 | + geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd, $field_type_key); |
|
| 801 | 801 | } |
| 802 | 802 | } |
| 803 | 803 | ?></ul> |
@@ -956,8 +956,8 @@ discard block |
||
| 956 | 956 | |
| 957 | 957 | if (!get_option('geodir_remove_unnecessary_fields')) {
|
| 958 | 958 | |
| 959 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
|
|
| 960 | - $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
|
|
| 959 | + if ($wpdb->get_var("SHOW COLUMNS FROM ".$plugin_prefix."gd_place_detail WHERE field = 'categories'"))
|
|
| 960 | + $wpdb->query("ALTER TABLE `".$plugin_prefix."gd_place_detail` DROP `categories`");
|
|
| 961 | 961 | |
| 962 | 962 | update_option('geodir_remove_unnecessary_fields', '1');
|
| 963 | 963 | |
@@ -986,7 +986,7 @@ discard block |
||
| 986 | 986 | case 'diagnosis' : |
| 987 | 987 | if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
|
| 988 | 988 | $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
| 989 | - call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 989 | + call_user_func('geodir_diagnose_'.$diagnose_this);
|
|
| 990 | 990 | |
| 991 | 991 | } |
| 992 | 992 | exit(); |
@@ -995,7 +995,7 @@ discard block |
||
| 995 | 995 | case 'diagnosis-fix' : |
| 996 | 996 | if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') |
| 997 | 997 | $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
| 998 | - call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 998 | + call_user_func('geodir_diagnose_'.$diagnose_this);
|
|
| 999 | 999 | exit(); |
| 1000 | 1000 | break; |
| 1001 | 1001 | } |
@@ -1020,50 +1020,50 @@ discard block |
||
| 1020 | 1020 | {
|
| 1021 | 1021 | global $wpdb; |
| 1022 | 1022 | //$filter_arr['output_str'] .='###'.$table.'###'; |
| 1023 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {
|
|
| 1024 | - $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";
|
|
| 1023 | + if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0) {
|
|
| 1024 | + $filter_arr['output_str'] .= "<li>".__('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory')."</li>";
|
|
| 1025 | 1025 | $filter_arr['is_error_during_diagnose'] = true; |
| 1026 | 1026 | |
| 1027 | - } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1028 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1027 | + } elseif ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {
|
|
| 1028 | + $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name)."</li>";
|
|
| 1029 | 1029 | $filter_arr['is_error_during_diagnose'] = true; |
| 1030 | - $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";
|
|
| 1030 | + $filter_arr['output_str'] .= "<li>".__('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory')."</li>";
|
|
| 1031 | 1031 | $filter_arr['is_error_during_diagnose'] = true; |
| 1032 | 1032 | |
| 1033 | 1033 | if ($fix) {
|
| 1034 | - $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count
|
|
| 1035 | - $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count
|
|
| 1034 | + $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$table."_ms_bak"); // get backup table count
|
|
| 1035 | + $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table"); // get new table count
|
|
| 1036 | 1036 | |
| 1037 | 1037 | if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2
|
| 1038 | 1038 | //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;
|
| 1039 | 1039 | |
| 1040 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table
|
|
| 1040 | + $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename bak table to new table
|
|
| 1041 | 1041 | |
| 1042 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1043 | - $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";
|
|
| 1042 | + if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {
|
|
| 1043 | + $filter_arr['output_str'] .= "<li>".__('-->FIXED: Renamed and backed up the tables', 'geodirectory')."</li>";
|
|
| 1044 | 1044 | } else {
|
| 1045 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1045 | + $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";
|
|
| 1046 | 1046 | } |
| 1047 | 1047 | |
| 1048 | 1048 | } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it
|
| 1049 | 1049 | |
| 1050 | - $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2
|
|
| 1051 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table
|
|
| 1050 | + $wpdb->query("RENAME TABLE ".$wpdb->prefix."$table TO ".$table."_ms_bak2"); // rename new table to bak2
|
|
| 1051 | + $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$wpdb->prefix."$table"); // rename bak table to new table
|
|
| 1052 | 1052 | |
| 1053 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1054 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1053 | + if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1054 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table)."</li>";
|
|
| 1055 | 1055 | } else {
|
| 1056 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1056 | + $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";
|
|
| 1057 | 1057 | } |
| 1058 | 1058 | |
| 1059 | 1059 | } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors
|
| 1060 | 1060 | |
| 1061 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2
|
|
| 1061 | + $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename ms_bak table to ms_bak2
|
|
| 1062 | 1062 | |
| 1063 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1064 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";
|
|
| 1063 | + if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {
|
|
| 1064 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table)."</li>";
|
|
| 1065 | 1065 | } else {
|
| 1066 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1066 | + $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";
|
|
| 1067 | 1067 | } |
| 1068 | 1068 | |
| 1069 | 1069 | } |
@@ -1071,54 +1071,54 @@ discard block |
||
| 1071 | 1071 | } |
| 1072 | 1072 | |
| 1073 | 1073 | |
| 1074 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1075 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1074 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {
|
|
| 1075 | + $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name)."</li>";
|
|
| 1076 | 1076 | $filter_arr['is_error_during_diagnose'] = true; |
| 1077 | 1077 | |
| 1078 | 1078 | if ($fix) {
|
| 1079 | 1079 | if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it
|
| 1080 | 1080 | if ($wpdb->query("DROP TABLE IF EXISTS $table")) {
|
| 1081 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1081 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table)."</li>";
|
|
| 1082 | 1082 | } else {
|
| 1083 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";
|
|
| 1083 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table)."</li>";
|
|
| 1084 | 1084 | } |
| 1085 | 1085 | |
| 1086 | - } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original
|
|
| 1087 | - if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {
|
|
| 1088 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1086 | + } elseif ($wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table") == 0) {// if main table is empty but original is not, delete main and rename original
|
|
| 1087 | + if ($wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."$table")) {
|
|
| 1088 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix.$table)."</li>";
|
|
| 1089 | 1089 | } else {
|
| 1090 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1090 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix.$table)."</li>";
|
|
| 1091 | 1091 | } |
| 1092 | - if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1093 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1092 | + if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1093 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
|
|
| 1094 | 1094 | } else {
|
| 1095 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1095 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
|
|
| 1096 | 1096 | } |
| 1097 | 1097 | } else {// else rename the original table to _ms_bak
|
| 1098 | - if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1099 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1098 | + if ($wpdb->query("RENAME TABLE $table TO ".$table."_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1099 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table."_ms_bak")."</li>";
|
|
| 1100 | 1100 | } else {
|
| 1101 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1101 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table."_ms_bak")."</li>";
|
|
| 1102 | 1102 | } |
| 1103 | 1103 | } |
| 1104 | 1104 | } |
| 1105 | 1105 | |
| 1106 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1107 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1106 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {
|
|
| 1107 | + $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name)."</li>";
|
|
| 1108 | 1108 | $filter_arr['is_error_during_diagnose'] = true; |
| 1109 | 1109 | |
| 1110 | 1110 | if ($fix) {
|
| 1111 | 1111 | // if original table exists but new does not, rename |
| 1112 | - if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1113 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1112 | + if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1113 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
|
|
| 1114 | 1114 | } else {
|
| 1115 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1115 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
|
|
| 1116 | 1116 | } |
| 1117 | 1117 | |
| 1118 | 1118 | } |
| 1119 | 1119 | |
| 1120 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1121 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1120 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {
|
|
| 1121 | + $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name)."</li>";
|
|
| 1122 | 1122 | $filter_arr['is_error_during_diagnose'] = true; |
| 1123 | 1123 | |
| 1124 | 1124 | if ($fix) {
|
@@ -1132,11 +1132,11 @@ discard block |
||
| 1132 | 1132 | delete_option('geodir_custom_posts_db_version');
|
| 1133 | 1133 | delete_option('geodir_reviewratings_db_version');
|
| 1134 | 1134 | delete_option('geodiradvancesearch_db_version');
|
| 1135 | - $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";
|
|
| 1135 | + $filter_arr['output_str'] .= "<li>".__('-->TRY: Please refresh page to run table install functions', 'geodirectory')."</li>";
|
|
| 1136 | 1136 | } |
| 1137 | 1137 | |
| 1138 | 1138 | } else {
|
| 1139 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1139 | + $filter_arr['output_str'] .= "<li>".sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name)."</li>";
|
|
| 1140 | 1140 | } |
| 1141 | 1141 | return $filter_arr; |
| 1142 | 1142 | } |
@@ -1177,21 +1177,21 @@ discard block |
||
| 1177 | 1177 | } |
| 1178 | 1178 | |
| 1179 | 1179 | if ($stepped_process) {
|
| 1180 | - $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset ); |
|
| 1181 | - $posts = $wpdb->get_results( $sql ); |
|
| 1180 | + $sql = $wpdb->prepare("SELECT * FROM ".$wpdb->prefix."geodir_".$ptype."_detail LIMIT %d OFFSET %d", $step_max_items, $offset);
|
|
| 1181 | + $posts = $wpdb->get_results($sql); |
|
| 1182 | 1182 | |
| 1183 | 1183 | if (!empty($posts)) {
|
| 1184 | 1184 | |
| 1185 | 1185 | foreach ($posts as $p) {
|
| 1186 | 1186 | $p->post_type = $ptype; |
| 1187 | - $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1187 | + $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));
|
|
| 1188 | 1188 | if (empty($raw_tags)) {
|
| 1189 | 1189 | $post_tags = ''; |
| 1190 | 1190 | } else {
|
| 1191 | 1191 | $post_tags = implode(",", $raw_tags);
|
| 1192 | 1192 | } |
| 1193 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1194 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1193 | + $tablename = $plugin_prefix.$p->post_type.'_detail'; |
|
| 1194 | + $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1195 | 1195 | |
| 1196 | 1196 | } |
| 1197 | 1197 | if ($step >= $max_step) {
|
@@ -1207,23 +1207,23 @@ discard block |
||
| 1207 | 1207 | if (!empty($all_postypes)) {
|
| 1208 | 1208 | foreach ($all_postypes as $key) {
|
| 1209 | 1209 | // update each GD CPT |
| 1210 | - $posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail"); |
|
| 1210 | + $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail");
|
|
| 1211 | 1211 | |
| 1212 | 1212 | if (!empty($posts)) {
|
| 1213 | 1213 | |
| 1214 | 1214 | foreach ($posts as $p) {
|
| 1215 | 1215 | $p->post_type = $key; |
| 1216 | - $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1216 | + $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));
|
|
| 1217 | 1217 | if (empty($raw_tags)) {
|
| 1218 | 1218 | $post_tags = ''; |
| 1219 | 1219 | } else {
|
| 1220 | 1220 | $post_tags = implode(",", $raw_tags);
|
| 1221 | 1221 | } |
| 1222 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1223 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1222 | + $tablename = $plugin_prefix.$p->post_type.'_detail'; |
|
| 1223 | + $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1224 | 1224 | |
| 1225 | 1225 | } |
| 1226 | - $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1226 | + $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";
|
|
| 1227 | 1227 | } |
| 1228 | 1228 | |
| 1229 | 1229 | } |
@@ -1234,14 +1234,14 @@ discard block |
||
| 1234 | 1234 | |
| 1235 | 1235 | if ($is_error_during_diagnose) {
|
| 1236 | 1236 | $info_div_class = "geodir_problem_info"; |
| 1237 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1237 | + $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1238 | 1238 | } else {
|
| 1239 | 1239 | $info_div_class = "geodir_noproblem_info"; |
| 1240 | 1240 | $fix_button_txt = ''; |
| 1241 | 1241 | } |
| 1242 | 1242 | |
| 1243 | 1243 | if ($stepped_process) {
|
| 1244 | - $percent = ($step/$max_step) * 100; |
|
| 1244 | + $percent = ($step / $max_step) * 100; |
|
| 1245 | 1245 | if ($output_str == 'done') {
|
| 1246 | 1246 | echo $output_str; |
| 1247 | 1247 | } else {
|
@@ -1284,29 +1284,29 @@ discard block |
||
| 1284 | 1284 | if (!empty($all_postypes)) {
|
| 1285 | 1285 | foreach ($all_postypes as $key) {
|
| 1286 | 1286 | // update each GD CTP |
| 1287 | - $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");
|
|
| 1287 | + $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail d WHERE d.".$key."category='' ");
|
|
| 1288 | 1288 | |
| 1289 | 1289 | if (!empty($posts)) {
|
| 1290 | 1290 | |
| 1291 | 1291 | foreach ($posts as $p) {
|
| 1292 | 1292 | $p->post_type = $key; |
| 1293 | - $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));
|
|
| 1293 | + $raw_cats = wp_get_object_terms($p->post_id, $p->post_type.'category', array('fields' => 'ids'));
|
|
| 1294 | 1294 | |
| 1295 | 1295 | if (empty($raw_cats)) {
|
| 1296 | 1296 | $post_categories = get_post_meta($p->post_id, 'post_categories', true); |
| 1297 | 1297 | |
| 1298 | - if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {
|
|
| 1299 | - $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);
|
|
| 1300 | - foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {
|
|
| 1298 | + if (!empty($post_categories) && !empty($post_categories[$p->post_type.'category'])) {
|
|
| 1299 | + $post_categories[$p->post_type.'category'] = str_replace("d:", "", $post_categories[$p->post_type.'category']);
|
|
| 1300 | + foreach (explode(",", $post_categories[$p->post_type.'category']) as $cat_part) {
|
|
| 1301 | 1301 | if (is_numeric($cat_part)) {
|
| 1302 | - $raw_cats[] = (int)$cat_part; |
|
| 1302 | + $raw_cats[] = (int) $cat_part; |
|
| 1303 | 1303 | } |
| 1304 | 1304 | } |
| 1305 | 1305 | |
| 1306 | 1306 | } |
| 1307 | 1307 | |
| 1308 | 1308 | if (!empty($raw_cats)) {
|
| 1309 | - $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category'); |
|
| 1309 | + $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type.'category'); |
|
| 1310 | 1310 | |
| 1311 | 1311 | } |
| 1312 | 1312 | |
@@ -1316,14 +1316,14 @@ discard block |
||
| 1316 | 1316 | if (empty($raw_cats)) {
|
| 1317 | 1317 | $post_cats = ''; |
| 1318 | 1318 | } else {
|
| 1319 | - $post_cats = ',' . implode(",", $raw_cats) . ',';
|
|
| 1319 | + $post_cats = ','.implode(",", $raw_cats).',';
|
|
| 1320 | 1320 | } |
| 1321 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1322 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));
|
|
| 1321 | + $tablename = $plugin_prefix.$p->post_type.'_detail'; |
|
| 1322 | + $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET ".$p->post_type."category=%s WHERE post_id =%d", $post_cats, $p->post_id));
|
|
| 1323 | 1323 | } |
| 1324 | 1324 | |
| 1325 | 1325 | } |
| 1326 | - $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1326 | + $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";
|
|
| 1327 | 1327 | |
| 1328 | 1328 | } |
| 1329 | 1329 | |
@@ -1331,7 +1331,7 @@ discard block |
||
| 1331 | 1331 | |
| 1332 | 1332 | if ($is_error_during_diagnose) {
|
| 1333 | 1333 | $info_div_class = "geodir_problem_info"; |
| 1334 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1334 | + $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1335 | 1335 | } else {
|
| 1336 | 1336 | $info_div_class = "geodir_noproblem_info"; |
| 1337 | 1337 | $fix_button_txt = ''; |
@@ -1384,15 +1384,15 @@ discard block |
||
| 1384 | 1384 | if (!empty($ver_arr)) {
|
| 1385 | 1385 | foreach ($ver_arr as $key => $val) {
|
| 1386 | 1386 | if (delete_option($val)) {
|
| 1387 | - $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";
|
|
| 1387 | + $output_str .= "<li>".$key.__(' Version: Deleted', 'geodirectory')."</li>";
|
|
| 1388 | 1388 | } else {
|
| 1389 | - $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";
|
|
| 1389 | + $output_str .= "<li>".$key.__(' Version: Not Found', 'geodirectory')."</li>";
|
|
| 1390 | 1390 | } |
| 1391 | 1391 | |
| 1392 | 1392 | } |
| 1393 | 1393 | |
| 1394 | 1394 | if ($output_str) {
|
| 1395 | - $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";
|
|
| 1395 | + $output_str .= "<li><strong>".__(' Upgrade/install scripts will run on next page reload.', 'geodirectory')."</strong></li>";
|
|
| 1396 | 1396 | } |
| 1397 | 1397 | |
| 1398 | 1398 | } |
@@ -1429,43 +1429,43 @@ discard block |
||
| 1429 | 1429 | $output_str = ''; |
| 1430 | 1430 | |
| 1431 | 1431 | // check review locations |
| 1432 | - if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
|
|
| 1433 | - $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";
|
|
| 1432 | + if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
|
|
| 1433 | + $output_str .= "<li>".__('Review locations missing or broken', 'geodirectory')."</li>";
|
|
| 1434 | 1434 | $is_error_during_diagnose = true; |
| 1435 | 1435 | |
| 1436 | 1436 | if ($fix) {
|
| 1437 | 1437 | if (geodir_fix_review_location()) {
|
| 1438 | - $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";
|
|
| 1438 | + $output_str .= "<li><strong>".__('-->FIXED: Review locations fixed', 'geodirectory')."</strong></li>";
|
|
| 1439 | 1439 | } else {
|
| 1440 | - $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1440 | + $output_str .= "<li><strong>".__('-->FAILED: Review locations fix failed', 'geodirectory')."</strong></li>";
|
|
| 1441 | 1441 | } |
| 1442 | 1442 | } |
| 1443 | 1443 | |
| 1444 | 1444 | } else {
|
| 1445 | - $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";
|
|
| 1445 | + $output_str .= "<li>".__('Review locations ok', 'geodirectory')."</li>";
|
|
| 1446 | 1446 | } |
| 1447 | 1447 | |
| 1448 | 1448 | // check review content |
| 1449 | - if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {
|
|
| 1450 | - $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";
|
|
| 1449 | + if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_content IS NULL")) {
|
|
| 1450 | + $output_str .= "<li>".__('Review content missing or broken', 'geodirectory')."</li>";
|
|
| 1451 | 1451 | $is_error_during_diagnose = true; |
| 1452 | 1452 | |
| 1453 | 1453 | if ($fix) {
|
| 1454 | 1454 | if (geodir_fix_review_content()) {
|
| 1455 | - $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";
|
|
| 1455 | + $output_str .= "<li><strong>".__('-->FIXED: Review content fixed', 'geodirectory')."</strong></li>";
|
|
| 1456 | 1456 | } else {
|
| 1457 | - $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1457 | + $output_str .= "<li><strong>".__('-->FAILED: Review content fix failed', 'geodirectory')."</strong></li>";
|
|
| 1458 | 1458 | } |
| 1459 | 1459 | } |
| 1460 | 1460 | |
| 1461 | 1461 | } else {
|
| 1462 | - $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";
|
|
| 1462 | + $output_str .= "<li>".__('Review content ok', 'geodirectory')."</li>";
|
|
| 1463 | 1463 | } |
| 1464 | 1464 | |
| 1465 | 1465 | |
| 1466 | 1466 | if ($is_error_during_diagnose) {
|
| 1467 | 1467 | $info_div_class = "geodir_problem_info"; |
| 1468 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1468 | + $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1469 | 1469 | } else {
|
| 1470 | 1470 | $info_div_class = "geodir_noproblem_info"; |
| 1471 | 1471 | $fix_button_txt = ''; |
@@ -1529,7 +1529,7 @@ discard block |
||
| 1529 | 1529 | |
| 1530 | 1530 | if ($is_error_during_diagnose) {
|
| 1531 | 1531 | $info_div_class = "geodir_problem_info"; |
| 1532 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
|
|
| 1532 | + $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
|
|
| 1533 | 1533 | } else {
|
| 1534 | 1534 | $info_div_class = "geodir_noproblem_info"; |
| 1535 | 1535 | $fix_button_txt = ''; |
@@ -1563,7 +1563,7 @@ discard block |
||
| 1563 | 1563 | else {
|
| 1564 | 1564 | $page_found = $wpdb->get_var( |
| 1565 | 1565 | $wpdb->prepare( |
| 1566 | - "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 1566 | + "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;", |
|
| 1567 | 1567 | array($slug) |
| 1568 | 1568 | ) |
| 1569 | 1569 | ); |
@@ -1609,18 +1609,18 @@ discard block |
||
| 1609 | 1609 | ////////////////////////////////// |
| 1610 | 1610 | $option_value = get_option('geodir_home_page');
|
| 1611 | 1611 | $page = get_post($option_value); |
| 1612 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1612 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1613 | 1613 | |
| 1614 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1615 | - $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1614 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1615 | + $output_str .= "<li>".__('GD Home page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1616 | 1616 | else {
|
| 1617 | 1617 | $is_error_during_diagnose = true; |
| 1618 | - $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1618 | + $output_str .= "<li><strong>".__('GD Home page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1619 | 1619 | if ($fix) {
|
| 1620 | 1620 | if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {
|
| 1621 | - $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1621 | + $output_str .= "<li><strong>".__('-->FIXED: GD Home page fixed', 'geodirectory')."</strong></li>";
|
|
| 1622 | 1622 | } else {
|
| 1623 | - $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1623 | + $output_str .= "<li><strong>".__('-->FAILED: GD Home page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1624 | 1624 | } |
| 1625 | 1625 | } |
| 1626 | 1626 | } |
@@ -1634,18 +1634,18 @@ discard block |
||
| 1634 | 1634 | ////////////////////////////////// |
| 1635 | 1635 | $option_value = get_option('geodir_add_listing_page');
|
| 1636 | 1636 | $page = get_post($option_value); |
| 1637 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1637 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1638 | 1638 | |
| 1639 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1640 | - $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1639 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1640 | + $output_str .= "<li>".__('Add Listing page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1641 | 1641 | else {
|
| 1642 | 1642 | $is_error_during_diagnose = true; |
| 1643 | - $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1643 | + $output_str .= "<li><strong>".__('Add Listing page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1644 | 1644 | if ($fix) {
|
| 1645 | 1645 | if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {
|
| 1646 | - $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1646 | + $output_str .= "<li><strong>".__('-->FIXED: Add Listing page fixed', 'geodirectory')."</strong></li>";
|
|
| 1647 | 1647 | } else {
|
| 1648 | - $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1648 | + $output_str .= "<li><strong>".__('-->FAILED: Add Listing page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1649 | 1649 | } |
| 1650 | 1650 | } |
| 1651 | 1651 | } |
@@ -1660,18 +1660,18 @@ discard block |
||
| 1660 | 1660 | ////////////////////////////////// |
| 1661 | 1661 | $option_value = get_option('geodir_preview_page');
|
| 1662 | 1662 | $page = get_post($option_value); |
| 1663 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1663 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1664 | 1664 | |
| 1665 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1666 | - $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1665 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1666 | + $output_str .= "<li>".__('Listing Preview page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1667 | 1667 | else {
|
| 1668 | 1668 | $is_error_during_diagnose = true; |
| 1669 | - $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1669 | + $output_str .= "<li><strong>".__('Listing Preview page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1670 | 1670 | if ($fix) {
|
| 1671 | 1671 | if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {
|
| 1672 | - $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1672 | + $output_str .= "<li><strong>".__('-->FIXED: Listing Preview page fixed', 'geodirectory')."</strong></li>";
|
|
| 1673 | 1673 | } else {
|
| 1674 | - $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1674 | + $output_str .= "<li><strong>".__('-->FAILED: Listing Preview page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1675 | 1675 | } |
| 1676 | 1676 | } |
| 1677 | 1677 | } |
@@ -1685,18 +1685,18 @@ discard block |
||
| 1685 | 1685 | ////////////////////////////////// |
| 1686 | 1686 | $option_value = get_option('geodir_success_page');
|
| 1687 | 1687 | $page = get_post($option_value); |
| 1688 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1688 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1689 | 1689 | |
| 1690 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1691 | - $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1690 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1691 | + $output_str .= "<li>".__('Listing Success page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1692 | 1692 | else {
|
| 1693 | 1693 | $is_error_during_diagnose = true; |
| 1694 | - $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1694 | + $output_str .= "<li><strong>".__('Listing Success page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1695 | 1695 | if ($fix) {
|
| 1696 | 1696 | if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {
|
| 1697 | - $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1697 | + $output_str .= "<li><strong>".__('-->FIXED: Listing Success page fixed', 'geodirectory')."</strong></li>";
|
|
| 1698 | 1698 | } else {
|
| 1699 | - $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1699 | + $output_str .= "<li><strong>".__('-->FAILED: Listing Success page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1700 | 1700 | } |
| 1701 | 1701 | } |
| 1702 | 1702 | } |
@@ -1710,18 +1710,18 @@ discard block |
||
| 1710 | 1710 | ////////////////////////////////// |
| 1711 | 1711 | $option_value = get_option('geodir_info_page');
|
| 1712 | 1712 | $page = get_post($option_value); |
| 1713 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1713 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1714 | 1714 | |
| 1715 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1716 | - $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1715 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1716 | + $output_str .= "<li>".__('Info page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1717 | 1717 | else {
|
| 1718 | 1718 | $is_error_during_diagnose = true; |
| 1719 | - $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1719 | + $output_str .= "<li><strong>".__('Info page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1720 | 1720 | if ($fix) {
|
| 1721 | 1721 | if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {
|
| 1722 | - $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1722 | + $output_str .= "<li><strong>".__('-->FIXED: Info page fixed', 'geodirectory')."</strong></li>";
|
|
| 1723 | 1723 | } else {
|
| 1724 | - $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1724 | + $output_str .= "<li><strong>".__('-->FAILED: Info page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1725 | 1725 | } |
| 1726 | 1726 | } |
| 1727 | 1727 | } |
@@ -1735,18 +1735,18 @@ discard block |
||
| 1735 | 1735 | ////////////////////////////////// |
| 1736 | 1736 | $option_value = get_option('geodir_login_page');
|
| 1737 | 1737 | $page = get_post($option_value); |
| 1738 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1738 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1739 | 1739 | |
| 1740 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1741 | - $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1740 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1741 | + $output_str .= "<li>".__('Login page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1742 | 1742 | else {
|
| 1743 | 1743 | $is_error_during_diagnose = true; |
| 1744 | - $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1744 | + $output_str .= "<li><strong>".__('Login page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1745 | 1745 | if ($fix) {
|
| 1746 | 1746 | if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {
|
| 1747 | - $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1747 | + $output_str .= "<li><strong>".__('-->FIXED: Login page fixed', 'geodirectory')."</strong></li>";
|
|
| 1748 | 1748 | } else {
|
| 1749 | - $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1749 | + $output_str .= "<li><strong>".__('-->FAILED: Login page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1750 | 1750 | } |
| 1751 | 1751 | } |
| 1752 | 1752 | } |
@@ -1760,18 +1760,18 @@ discard block |
||
| 1760 | 1760 | ////////////////////////////////// |
| 1761 | 1761 | $option_value = get_option('geodir_location_page');
|
| 1762 | 1762 | $page = get_post($option_value); |
| 1763 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1763 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1764 | 1764 | |
| 1765 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1766 | - $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1765 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1766 | + $output_str .= "<li>".__('Location page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1767 | 1767 | else {
|
| 1768 | 1768 | $is_error_during_diagnose = true; |
| 1769 | - $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1769 | + $output_str .= "<li><strong>".__('Location page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1770 | 1770 | if ($fix) {
|
| 1771 | 1771 | if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {
|
| 1772 | - $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1772 | + $output_str .= "<li><strong>".__('-->FIXED: Location page fixed', 'geodirectory')."</strong></li>";
|
|
| 1773 | 1773 | } else {
|
| 1774 | - $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1774 | + $output_str .= "<li><strong>".__('-->FAILED: Location page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1775 | 1775 | } |
| 1776 | 1776 | } |
| 1777 | 1777 | } |
@@ -1780,13 +1780,13 @@ discard block |
||
| 1780 | 1780 | /* Diagnose Location Page Ends */ |
| 1781 | 1781 | //////////////////////////////// |
| 1782 | 1782 | |
| 1783 | - $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );
|
|
| 1783 | + $page_chk_arr = array('output_str'=>$output_str, 'is_error_during_diagnose'=>$is_error_during_diagnose);
|
|
| 1784 | 1784 | /** |
| 1785 | 1785 | * This action is called at the end of the GD Tools page check function. |
| 1786 | 1786 | * |
| 1787 | 1787 | * @since 1.5.2 |
| 1788 | 1788 | */ |
| 1789 | - $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);
|
|
| 1789 | + $page_chk_arr = apply_filters('geodir_diagnose_default_pages', $page_chk_arr);
|
|
| 1790 | 1790 | |
| 1791 | 1791 | $output_str = $page_chk_arr['output_str']; |
| 1792 | 1792 | $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose']; |
@@ -1796,7 +1796,7 @@ discard block |
||
| 1796 | 1796 | flush_rewrite_rules(); |
| 1797 | 1797 | } |
| 1798 | 1798 | $info_div_class = "geodir_problem_info"; |
| 1799 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
|
|
| 1799 | + $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
|
|
| 1800 | 1800 | } else {
|
| 1801 | 1801 | $info_div_class = "geodir_noproblem_info"; |
| 1802 | 1802 | $fix_button_txt = ''; |
@@ -1824,10 +1824,10 @@ discard block |
||
| 1824 | 1824 | $fix_button_txt = ''; |
| 1825 | 1825 | |
| 1826 | 1826 | if ($is_error_during_diagnose) {
|
| 1827 | - $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";
|
|
| 1827 | + $output_str .= "<li>".__('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory').' '.geodir_plugin_path().'/db-language.php'."</li>";
|
|
| 1828 | 1828 | $info_div_class = "geodir_problem_info"; |
| 1829 | 1829 | } else {
|
| 1830 | - $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";
|
|
| 1830 | + $output_str .= "<li>".__('Load custom fields in to file for translation: ok', 'geodirectory')."</li>";
|
|
| 1831 | 1831 | $info_div_class = "geodir_noproblem_info"; |
| 1832 | 1832 | $fix_button_txt = ''; |
| 1833 | 1833 | } |
@@ -1869,17 +1869,17 @@ discard block |
||
| 1869 | 1869 | global $wpdb, $wp_query, $plugin_prefix; |
| 1870 | 1870 | |
| 1871 | 1871 | if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {
|
| 1872 | - $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail'; |
|
| 1872 | + $table = $plugin_prefix.$wp_query->query_vars['post_type'].'_detail'; |
|
| 1873 | 1873 | |
| 1874 | - $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)'; |
|
| 1874 | + $join = $clauses['join'].' INNER JOIN '.$table.' AS gd_posts ON (gd_posts.post_id = '.$wpdb->posts.'.ID)'; |
|
| 1875 | 1875 | $clauses['join'] = $join; |
| 1876 | 1876 | |
| 1877 | - $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : ''; |
|
| 1877 | + $fields = $clauses['fields'] != '' ? $clauses['fields'].', ' : ''; |
|
| 1878 | 1878 | $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire'; |
| 1879 | 1879 | $clauses['fields'] = $fields; |
| 1880 | 1880 | |
| 1881 | 1881 | $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC'; |
| 1882 | - $orderby = 'gd_expire ' . $order; |
|
| 1882 | + $orderby = 'gd_expire '.$order; |
|
| 1883 | 1883 | $clauses['orderby'] = $orderby; |
| 1884 | 1884 | } |
| 1885 | 1885 | return $clauses; |
@@ -1922,7 +1922,7 @@ discard block |
||
| 1922 | 1922 | global $current_user; |
| 1923 | 1923 | $upload_dir = wp_upload_dir(); |
| 1924 | 1924 | |
| 1925 | - $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv'; |
|
| 1925 | + $file = $upload_dir['path'].'/temp_'.$current_user->data->ID.'/geodir_tmp.csv'; |
|
| 1926 | 1926 | $handle = fopen($file, 'w'); |
| 1927 | 1927 | |
| 1928 | 1928 | fwrite($handle, $input); |
@@ -1967,7 +1967,7 @@ discard block |
||
| 1967 | 1967 | $uploads_dir = $uploads['path']; |
| 1968 | 1968 | $image_name_arr = explode('/', $filename);
|
| 1969 | 1969 | $filename = end($image_name_arr); |
| 1970 | - $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1970 | + $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename; |
|
| 1971 | 1971 | $return = array(); |
| 1972 | 1972 | $return['file'] = $uploadedFile; |
| 1973 | 1973 | $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
|
@@ -1984,8 +1984,8 @@ discard block |
||
| 1984 | 1984 | |
| 1985 | 1985 | if (($handle = fopen($target_path, "r")) !== FALSE) {
|
| 1986 | 1986 | while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
|
| 1987 | - if(is_array($data) && !empty($data)) {
|
|
| 1988 | - $file[] = '"' . implode('","', $data) . '"';
|
|
| 1987 | + if (is_array($data) && !empty($data)) {
|
|
| 1988 | + $file[] = '"'.implode('","', $data).'"';
|
|
| 1989 | 1989 | } |
| 1990 | 1990 | } |
| 1991 | 1991 | fclose($handle); |
@@ -2102,10 +2102,10 @@ discard block |
||
| 2102 | 2102 | $tag_arr = explode(',', $post_tags);
|
| 2103 | 2103 | } |
| 2104 | 2104 | |
| 2105 | - $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database |
|
| 2105 | + $table = $plugin_prefix.$buffer[5].'_detail'; // check table in database |
|
| 2106 | 2106 | |
| 2107 | 2107 | $error = ''; |
| 2108 | - if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {
|
|
| 2108 | + if ($wpdb->get_var("SHOW TABLES LIKE '".$table."'") != $table) {
|
|
| 2109 | 2109 | $invalid_post_type++; |
| 2110 | 2110 | continue; |
| 2111 | 2111 | } |
@@ -2131,7 +2131,7 @@ discard block |
||
| 2131 | 2131 | if ($buffer[$c] != '0' && $buffer[$c] != '') {
|
| 2132 | 2132 | $submitdata = date('Y-m-d');
|
| 2133 | 2133 | |
| 2134 | - $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));
|
|
| 2134 | + $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata."+".addslashes($buffer[$c])." days"));
|
|
| 2135 | 2135 | } else {
|
| 2136 | 2136 | $gd_post_info['expire_date'] = 'Never'; |
| 2137 | 2137 | } |
@@ -2159,7 +2159,7 @@ discard block |
||
| 2159 | 2159 | |
| 2160 | 2160 | // Post status |
| 2161 | 2161 | if ($customKeyarray[$c] == 'post_status') {
|
| 2162 | - $post_status = sanitize_key( $buffer[$c] ); |
|
| 2162 | + $post_status = sanitize_key($buffer[$c]); |
|
| 2163 | 2163 | } |
| 2164 | 2164 | } |
| 2165 | 2165 | |
@@ -2177,8 +2177,8 @@ discard block |
||
| 2177 | 2177 | |
| 2178 | 2178 | // Default post status |
| 2179 | 2179 | $default_status = 'publish'; |
| 2180 | - $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 2181 | - $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 2180 | + $post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status; |
|
| 2181 | + $post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status; |
|
| 2182 | 2182 | |
| 2183 | 2183 | $my_post['post_title'] = $post_title; |
| 2184 | 2184 | $my_post['post_content'] = $post_desc; |
@@ -2222,7 +2222,7 @@ discard block |
||
| 2222 | 2222 | $payment_info = array(); |
| 2223 | 2223 | $package_info = array(); |
| 2224 | 2224 | |
| 2225 | - $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]); |
|
| 2225 | + $package_info = (array) geodir_post_package_info($package_info, '', $buffer[5]); |
|
| 2226 | 2226 | $package_id = ''; |
| 2227 | 2227 | if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {
|
| 2228 | 2228 | $package_id = $gd_post_info['package_id']; |
@@ -2232,7 +2232,7 @@ discard block |
||
| 2232 | 2232 | $payment_info['package_id'] = $package_info['pid']; |
| 2233 | 2233 | |
| 2234 | 2234 | if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {
|
| 2235 | - $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));
|
|
| 2235 | + $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['alive_days']." days"));
|
|
| 2236 | 2236 | } else {
|
| 2237 | 2237 | $payment_info['expire_date'] = 'Never'; |
| 2238 | 2238 | } |
@@ -2244,7 +2244,7 @@ discard block |
||
| 2244 | 2244 | |
| 2245 | 2245 | $post_type = get_post_type($last_postid); |
| 2246 | 2246 | |
| 2247 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2247 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2248 | 2248 | |
| 2249 | 2249 | geodir_save_post_info($last_postid, $gd_post_info); |
| 2250 | 2250 | |
@@ -2265,7 +2265,7 @@ discard block |
||
| 2265 | 2265 | $attachment['post_id'] = $last_postid; |
| 2266 | 2266 | $attachment['title'] = $img_name_arr[0]; |
| 2267 | 2267 | $attachment['content'] = ''; |
| 2268 | - $attachment['file'] = $sub_dir . '/' . $image_name; |
|
| 2268 | + $attachment['file'] = $sub_dir.'/'.$image_name; |
|
| 2269 | 2269 | $attachment['mime_type'] = $uploaded_file_type; |
| 2270 | 2270 | $attachment['menu_order'] = $menu_order; |
| 2271 | 2271 | $attachment['is_featured'] = 0; |
@@ -2274,15 +2274,15 @@ discard block |
||
| 2274 | 2274 | |
| 2275 | 2275 | foreach ($attachment as $key => $val) {
|
| 2276 | 2276 | if ($val != '') |
| 2277 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 2277 | + $attachment_set .= $key." = '".$val."', "; |
|
| 2278 | 2278 | } |
| 2279 | 2279 | $attachment_set = trim($attachment_set, ", "); |
| 2280 | 2280 | |
| 2281 | - $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 2281 | + $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
|
|
| 2282 | 2282 | |
| 2283 | 2283 | if ($menu_order == 1) {
|
| 2284 | 2284 | $post_type = get_post_type($last_postid); |
| 2285 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));
|
|
| 2285 | + $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($sub_dir.'/'.$image_name, $last_postid)));
|
|
| 2286 | 2286 | } |
| 2287 | 2287 | $menu_order++; |
| 2288 | 2288 | } |
@@ -2323,11 +2323,11 @@ discard block |
||
| 2323 | 2323 | } |
| 2324 | 2324 | |
| 2325 | 2325 | // Add the tab in left sidebar menu fro import & export page. |
| 2326 | -add_filter( 'geodir_settings_tabs_array', 'geodir_import_export_tab', 94 ); |
|
| 2326 | +add_filter('geodir_settings_tabs_array', 'geodir_import_export_tab', 94);
|
|
| 2327 | 2327 | |
| 2328 | 2328 | // Handle ajax request for import/export. |
| 2329 | -add_action( 'wp_ajax_geodir_import_export', 'geodir_ajax_import_export' ); |
|
| 2330 | -add_action( 'wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export' ); |
|
| 2329 | +add_action('wp_ajax_geodir_import_export', 'geodir_ajax_import_export');
|
|
| 2330 | +add_action('wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export');
|
|
| 2331 | 2331 | |
| 2332 | 2332 | |
| 2333 | 2333 | /** |
@@ -2338,40 +2338,40 @@ discard block |
||
| 2338 | 2338 | * @param $post_id int $post_id The post ID of the post being saved. |
| 2339 | 2339 | * @param $post object $post The post object of the post being saved. |
| 2340 | 2340 | */ |
| 2341 | -function geodir_update_location_prefix($post_id,$post){
|
|
| 2342 | - if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){
|
|
| 2343 | - update_option('geodir_location_prefix',$post->post_name);
|
|
| 2341 | +function geodir_update_location_prefix($post_id, $post) {
|
|
| 2342 | + if ($post->post_type == 'page' && $post->post_name && $post_id == get_option('geodir_location_page')) {
|
|
| 2343 | + update_option('geodir_location_prefix', $post->post_name);
|
|
| 2344 | 2344 | } |
| 2345 | 2345 | |
| 2346 | 2346 | } |
| 2347 | 2347 | |
| 2348 | -add_action('save_post', 'geodir_update_location_prefix',10,2);
|
|
| 2348 | +add_action('save_post', 'geodir_update_location_prefix', 10, 2);
|
|
| 2349 | 2349 | |
| 2350 | -add_action( 'wp_ajax_geodir_ga_callback', 'geodir_ga_callback' ); |
|
| 2350 | +add_action('wp_ajax_geodir_ga_callback', 'geodir_ga_callback');
|
|
| 2351 | 2351 | |
| 2352 | -function geodir_ga_callback(){
|
|
| 2352 | +function geodir_ga_callback() {
|
|
| 2353 | 2353 | |
| 2354 | -if(isset($_REQUEST['code']) && $_REQUEST['code']) {
|
|
| 2354 | +if (isset($_REQUEST['code']) && $_REQUEST['code']) {
|
|
| 2355 | 2355 | $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?"; |
| 2356 | 2356 | $code = "code=".$_REQUEST['code']; |
| 2357 | 2357 | $grant_type = "&grant_type=authorization_code"; |
| 2358 | - $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 2358 | + $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";
|
|
| 2359 | 2359 | $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
| 2360 | 2360 | $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
|
| 2361 | 2361 | |
| 2362 | - $auth_url = $oAuthURL . $code . $redirect_uri . $grant_type . $client_id .$client_secret; |
|
| 2362 | + $auth_url = $oAuthURL.$code.$redirect_uri.$grant_type.$client_id.$client_secret; |
|
| 2363 | 2363 | |
| 2364 | 2364 | $response = wp_remote_post($auth_url, array('timeout' => 15));
|
| 2365 | 2365 | |
| 2366 | 2366 | //print_r($response); |
| 2367 | 2367 | |
| 2368 | - $error_msg = __('Something went wrong','geodirectory');
|
|
| 2369 | - if(!empty($response['response']['code']) && $response['response']['code']==200){
|
|
| 2368 | + $error_msg = __('Something went wrong', 'geodirectory');
|
|
| 2369 | + if (!empty($response['response']['code']) && $response['response']['code'] == 200) {
|
|
| 2370 | 2370 | |
| 2371 | 2371 | $parts = json_decode($response['body']); |
| 2372 | 2372 | //print_r($parts); |
| 2373 | - if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
|
|
| 2374 | - else{
|
|
| 2373 | + if (!isset($parts->access_token)) {echo $error_msg." - #1"; exit; }
|
|
| 2374 | + else {
|
|
| 2375 | 2375 | |
| 2376 | 2376 | update_option('gd_ga_access_token', $parts->access_token);
|
| 2377 | 2377 | update_option('gd_ga_refresh_token', $parts->refresh_token);
|
@@ -2380,18 +2380,18 @@ discard block |
||
| 2380 | 2380 | |
| 2381 | 2381 | |
| 2382 | 2382 | } |
| 2383 | - elseif(!empty($response['response']['code'])) {
|
|
| 2383 | + elseif (!empty($response['response']['code'])) {
|
|
| 2384 | 2384 | $parts = json_decode($response['body']); |
| 2385 | 2385 | |
| 2386 | - if(isset($parts->error)){
|
|
| 2387 | - echo $parts->error.": ".$parts->error_description;exit; |
|
| 2388 | - }else{
|
|
| 2389 | - echo $error_msg." - #2";exit; |
|
| 2386 | + if (isset($parts->error)) {
|
|
| 2387 | + echo $parts->error.": ".$parts->error_description; exit; |
|
| 2388 | + } else {
|
|
| 2389 | + echo $error_msg." - #2"; exit; |
|
| 2390 | 2390 | } |
| 2391 | 2391 | |
| 2392 | - }else{
|
|
| 2392 | + } else {
|
|
| 2393 | 2393 | |
| 2394 | - echo $error_msg." - #3";exit; |
|
| 2394 | + echo $error_msg." - #3"; exit; |
|
| 2395 | 2395 | |
| 2396 | 2396 | } |
| 2397 | 2397 | } |
@@ -2413,7 +2413,7 @@ discard block |
||
| 2413 | 2413 | function geodir_uninstall_settings($general_settings) {
|
| 2414 | 2414 | $settings = array(); |
| 2415 | 2415 | $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));
|
| 2416 | - $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));
|
|
| 2416 | + $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory'));
|
|
| 2417 | 2417 | |
| 2418 | 2418 | $plugins = get_plugins(); |
| 2419 | 2419 | $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());
|
@@ -2425,7 +2425,7 @@ discard block |
||
| 2425 | 2425 | if (in_array($plugin_name, $un_plugins)) {
|
| 2426 | 2426 | $settings[] = array( |
| 2427 | 2427 | 'type' => 'checkbox', |
| 2428 | - 'id' => 'geodir_un_' . $plugin_name, |
|
| 2428 | + 'id' => 'geodir_un_'.$plugin_name, |
|
| 2429 | 2429 | 'name' => $data['Name'], |
| 2430 | 2430 | 'desc' => __('Remove all data when deleted?', 'geodirectory'),
|
| 2431 | 2431 | 'std' => '0' |
@@ -2459,7 +2459,7 @@ discard block |
||
| 2459 | 2459 | * @since 1.6.9 |
| 2460 | 2460 | */ |
| 2461 | 2461 | function geodir_uninstall_settings_desc() {
|
| 2462 | - echo '<p class="gd-un-settings-desc">' . __('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory') . '</p>';
|
|
| 2462 | + echo '<p class="gd-un-settings-desc">'.__('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory').'</p>';
|
|
| 2463 | 2463 | } |
| 2464 | 2464 | add_action('geodir_settings_uninstall_settings_main_start', 'geodir_uninstall_settings_desc');
|
| 2465 | 2465 | |
@@ -2523,12 +2523,12 @@ discard block |
||
| 2523 | 2523 | |
| 2524 | 2524 | |
| 2525 | 2525 | if ($delete) {
|
| 2526 | - $output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";
|
|
| 2526 | + $output_str .= "<li><strong>".__('Table dropped, refresh page to reinstall.', 'geodirectory')."</strong></li>";
|
|
| 2527 | 2527 | ob_start(); |
| 2528 | 2528 | geodir_diagnose_version_clear(); |
| 2529 | 2529 | ob_end_clean(); |
| 2530 | - }else{
|
|
| 2531 | - $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";
|
|
| 2530 | + } else {
|
|
| 2531 | + $output_str .= "<li><strong>".__('Something went wrong.', 'geodirectory')."</strong></li>";
|
|
| 2532 | 2532 | } |
| 2533 | 2533 | |
| 2534 | 2534 | if ($is_error_during_diagnose) {
|
@@ -2553,9 +2553,9 @@ discard block |
||
| 2553 | 2553 | * @param object $row The post|taxonomy object. |
| 2554 | 2554 | * @return array Filtered actions. |
| 2555 | 2555 | */ |
| 2556 | -function geodir_disable_quick_edit( $actions = array(), $row = null ) {
|
|
| 2557 | - if ( isset( $actions['inline hide-if-no-js'] ) ) {
|
|
| 2558 | - unset( $actions['inline hide-if-no-js'] ); |
|
| 2556 | +function geodir_disable_quick_edit($actions = array(), $row = null) {
|
|
| 2557 | + if (isset($actions['inline hide-if-no-js'])) {
|
|
| 2558 | + unset($actions['inline hide-if-no-js']); |
|
| 2559 | 2559 | } |
| 2560 | 2560 | |
| 2561 | 2561 | return $actions; |
@@ -2574,23 +2574,23 @@ discard block |
||
| 2574 | 2574 | function geodir_check_quick_edit() {
|
| 2575 | 2575 | global $pagenow, $current_screen, $gd_cpt_screen; |
| 2576 | 2576 | |
| 2577 | - if ( ( $pagenow == 'edit.php' || $pagenow == 'edit-tags.php' ) && !empty( $current_screen->post_type ) ) {
|
|
| 2578 | - if ( empty( $gd_cpt_screen ) ) {
|
|
| 2579 | - if ( in_array( $current_screen->post_type, geodir_get_posttypes() ) ) {
|
|
| 2577 | + if (($pagenow == 'edit.php' || $pagenow == 'edit-tags.php') && !empty($current_screen->post_type)) {
|
|
| 2578 | + if (empty($gd_cpt_screen)) {
|
|
| 2579 | + if (in_array($current_screen->post_type, geodir_get_posttypes())) {
|
|
| 2580 | 2580 | $gd_cpt_screen = 'y'; |
| 2581 | 2581 | } else {
|
| 2582 | 2582 | $gd_cpt_screen = 'n'; |
| 2583 | 2583 | } |
| 2584 | 2584 | } |
| 2585 | 2585 | |
| 2586 | - if ( $gd_cpt_screen == 'y' ) {
|
|
| 2587 | - if ( $pagenow == 'edit.php' ) {
|
|
| 2588 | - add_filter( 'post_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2589 | - add_filter( 'page_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2590 | - } elseif ( $pagenow == 'edit-tags.php' && !empty( $current_screen->taxonomy ) ) {
|
|
| 2591 | - add_filter( $current_screen->taxonomy . '_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2586 | + if ($gd_cpt_screen == 'y') {
|
|
| 2587 | + if ($pagenow == 'edit.php') {
|
|
| 2588 | + add_filter('post_row_actions', 'geodir_disable_quick_edit', 10, 2);
|
|
| 2589 | + add_filter('page_row_actions', 'geodir_disable_quick_edit', 10, 2);
|
|
| 2590 | + } elseif ($pagenow == 'edit-tags.php' && !empty($current_screen->taxonomy)) {
|
|
| 2591 | + add_filter($current_screen->taxonomy.'_row_actions', 'geodir_disable_quick_edit', 10, 2); |
|
| 2592 | 2592 | } |
| 2593 | 2593 | } |
| 2594 | 2594 | } |
| 2595 | 2595 | } |
| 2596 | -add_action( 'admin_head', 'geodir_check_quick_edit', 10 ); |
|
| 2597 | 2596 | \ No newline at end of file |
| 2597 | +add_action('admin_head', 'geodir_check_quick_edit', 10); |
|
| 2598 | 2598 | \ No newline at end of file |
@@ -13,133 +13,133 @@ discard block |
||
| 13 | 13 | * @package GeoDirectory |
| 14 | 14 | */ |
| 15 | 15 | function geodir_deactivation() {
|
| 16 | - // Update installed variable |
|
| 17 | - update_option("geodir_installed", 0);
|
|
| 16 | + // Update installed variable |
|
| 17 | + update_option("geodir_installed", 0);
|
|
| 18 | 18 | |
| 19 | - // Remove rewrite rules and then recreate rewrite rules. |
|
| 20 | - flush_rewrite_rules(); |
|
| 19 | + // Remove rewrite rules and then recreate rewrite rules. |
|
| 20 | + flush_rewrite_rules(); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | if (!function_exists('geodir_admin_styles')) {
|
| 24 | - /** |
|
| 25 | - * Enqueue Admin Styles. |
|
| 26 | - * |
|
| 27 | - * @since 1.0.0 |
|
| 28 | - * @package GeoDirectory |
|
| 29 | - */ |
|
| 30 | - function geodir_admin_styles() {
|
|
| 31 | - wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
|
|
| 32 | - wp_enqueue_style('geodirectory-admin-css');
|
|
| 24 | + /** |
|
| 25 | + * Enqueue Admin Styles. |
|
| 26 | + * |
|
| 27 | + * @since 1.0.0 |
|
| 28 | + * @package GeoDirectory |
|
| 29 | + */ |
|
| 30 | + function geodir_admin_styles() {
|
|
| 31 | + wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
|
|
| 32 | + wp_enqueue_style('geodirectory-admin-css');
|
|
| 33 | 33 | |
| 34 | - wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
|
|
| 35 | - wp_enqueue_style('geodirectory-frontend-style');
|
|
| 34 | + wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
|
|
| 35 | + wp_enqueue_style('geodirectory-frontend-style');
|
|
| 36 | 36 | |
| 37 | - wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
|
|
| 38 | - wp_enqueue_style('geodir-chosen-style');
|
|
| 37 | + wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
|
|
| 38 | + wp_enqueue_style('geodir-chosen-style');
|
|
| 39 | 39 | |
| 40 | - wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
|
|
| 41 | - wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');
|
|
| 40 | + wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
|
|
| 41 | + wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');
|
|
| 42 | 42 | |
| 43 | - wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
|
|
| 44 | - wp_enqueue_style('geodirectory-jquery-ui-css');
|
|
| 43 | + wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
|
|
| 44 | + wp_enqueue_style('geodirectory-jquery-ui-css');
|
|
| 45 | 45 | |
| 46 | - wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
|
|
| 47 | - wp_enqueue_style('geodirectory-custom-fields-css');
|
|
| 46 | + wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
|
|
| 47 | + wp_enqueue_style('geodirectory-custom-fields-css');
|
|
| 48 | 48 | |
| 49 | - wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
|
|
| 50 | - wp_enqueue_style('geodirectory-pluplodar-css');
|
|
| 49 | + wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
|
|
| 50 | + wp_enqueue_style('geodirectory-pluplodar-css');
|
|
| 51 | 51 | |
| 52 | - wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
|
|
| 53 | - wp_enqueue_style('geodir-rating-style');
|
|
| 52 | + wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
|
|
| 53 | + wp_enqueue_style('geodir-rating-style');
|
|
| 54 | 54 | |
| 55 | - wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
|
|
| 56 | - wp_enqueue_style('geodir-rtl-style');
|
|
| 57 | - } |
|
| 55 | + wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
|
|
| 56 | + wp_enqueue_style('geodir-rtl-style');
|
|
| 57 | + } |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | if (!function_exists('geodir_admin_styles_req')) {
|
| 61 | - /** |
|
| 62 | - * Loads stylesheets from CDN. |
|
| 63 | - * |
|
| 64 | - * @since 1.0.0 |
|
| 65 | - * @package GeoDirectory |
|
| 66 | - */ |
|
| 67 | - function geodir_admin_styles_req() |
|
| 68 | - {
|
|
| 61 | + /** |
|
| 62 | + * Loads stylesheets from CDN. |
|
| 63 | + * |
|
| 64 | + * @since 1.0.0 |
|
| 65 | + * @package GeoDirectory |
|
| 66 | + */ |
|
| 67 | + function geodir_admin_styles_req() |
|
| 68 | + {
|
|
| 69 | 69 | |
| 70 | - wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
|
|
| 71 | - wp_enqueue_style('font-awesome');
|
|
| 70 | + wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
|
|
| 71 | + wp_enqueue_style('font-awesome');
|
|
| 72 | 72 | |
| 73 | - wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 74 | - wp_enqueue_script('geodirectory-admin');
|
|
| 73 | + wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 74 | + wp_enqueue_script('geodirectory-admin');
|
|
| 75 | 75 | |
| 76 | - } |
|
| 76 | + } |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | if (!function_exists('geodir_admin_scripts')) {
|
| 80 | - /** |
|
| 81 | - * Enqueue Admin Scripts. |
|
| 82 | - * |
|
| 83 | - * @since 1.0.0 |
|
| 84 | - * @package GeoDirectory |
|
| 85 | - */ |
|
| 86 | - function geodir_admin_scripts() |
|
| 87 | - {
|
|
| 88 | - $geodir_map_name = geodir_map_name(); |
|
| 80 | + /** |
|
| 81 | + * Enqueue Admin Scripts. |
|
| 82 | + * |
|
| 83 | + * @since 1.0.0 |
|
| 84 | + * @package GeoDirectory |
|
| 85 | + */ |
|
| 86 | + function geodir_admin_scripts() |
|
| 87 | + {
|
|
| 88 | + $geodir_map_name = geodir_map_name(); |
|
| 89 | 89 | |
| 90 | - wp_enqueue_script('jquery');
|
|
| 90 | + wp_enqueue_script('jquery');
|
|
| 91 | 91 | |
| 92 | - wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);
|
|
| 92 | + wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);
|
|
| 93 | 93 | |
| 94 | - wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 95 | - wp_enqueue_script('chosen');
|
|
| 94 | + wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 95 | + wp_enqueue_script('chosen');
|
|
| 96 | 96 | |
| 97 | - wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
|
|
| 98 | - wp_enqueue_script('geodirectory-choose-ajax');
|
|
| 97 | + wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
|
|
| 98 | + wp_enqueue_script('geodirectory-choose-ajax');
|
|
| 99 | 99 | |
| 100 | - if (isset($_REQUEST['listing_type'])) {
|
|
| 101 | - wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
|
|
| 102 | - } |
|
| 100 | + if (isset($_REQUEST['listing_type'])) {
|
|
| 101 | + wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
|
|
| 102 | + } |
|
| 103 | 103 | |
| 104 | - wp_enqueue_script('geodirectory-custom-fields-script');
|
|
| 105 | - $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions'; |
|
| 104 | + wp_enqueue_script('geodirectory-custom-fields-script');
|
|
| 105 | + $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions'; |
|
| 106 | 106 | |
| 107 | - wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);
|
|
| 107 | + wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);
|
|
| 108 | 108 | |
| 109 | - if (in_array($geodir_map_name, array('auto', 'google'))) {
|
|
| 110 | - $map_lang = "&language=" . geodir_get_map_default_language(); |
|
| 111 | - $map_key = "&key=" . geodir_get_map_api_key(); |
|
| 112 | - /** This filter is documented in geodirectory_template_tags.php */ |
|
| 113 | - $map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
|
| 114 | - wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);
|
|
| 109 | + if (in_array($geodir_map_name, array('auto', 'google'))) {
|
|
| 110 | + $map_lang = "&language=" . geodir_get_map_default_language(); |
|
| 111 | + $map_key = "&key=" . geodir_get_map_api_key(); |
|
| 112 | + /** This filter is documented in geodirectory_template_tags.php */ |
|
| 113 | + $map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
|
| 114 | + wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);
|
|
| 115 | 115 | |
| 116 | - // Overlapping Marker Spiderfier |
|
| 117 | - wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 118 | - wp_enqueue_script('geodirectory-g-overlappingmarker-script');
|
|
| 119 | - } |
|
| 116 | + // Overlapping Marker Spiderfier |
|
| 117 | + wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 118 | + wp_enqueue_script('geodirectory-g-overlappingmarker-script');
|
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | - if ($geodir_map_name == 'osm') {
|
|
| 122 | - // Leaflet OpenStreetMap |
|
| 123 | - wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 124 | - wp_enqueue_style('geodirectory-leaflet-style');
|
|
| 121 | + if ($geodir_map_name == 'osm') {
|
|
| 122 | + // Leaflet OpenStreetMap |
|
| 123 | + wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 124 | + wp_enqueue_style('geodirectory-leaflet-style');
|
|
| 125 | 125 | |
| 126 | - wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 127 | - wp_enqueue_script('geodirectory-leaflet-script');
|
|
| 126 | + wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 127 | + wp_enqueue_script('geodirectory-leaflet-script');
|
|
| 128 | 128 | |
| 129 | - wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
| 130 | - wp_enqueue_script('geodirectory-leaflet-geo-script');
|
|
| 129 | + wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
| 130 | + wp_enqueue_script('geodirectory-leaflet-geo-script');
|
|
| 131 | 131 | |
| 132 | - // Overlapping Marker Spiderfier Leaflet |
|
| 133 | - wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 134 | - wp_enqueue_script('geodirectory-o-overlappingmarker-script');
|
|
| 135 | - } |
|
| 136 | - wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 132 | + // Overlapping Marker Spiderfier Leaflet |
|
| 133 | + wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 134 | + wp_enqueue_script('geodirectory-o-overlappingmarker-script');
|
|
| 135 | + } |
|
| 136 | + wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 137 | 137 | |
| 138 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 139 | - wp_enqueue_script('geodirectory-goMap-script');
|
|
| 138 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 139 | + wp_enqueue_script('geodirectory-goMap-script');
|
|
| 140 | 140 | |
| 141 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
| 142 | - wp_enqueue_script('geodirectory-goMap-script');
|
|
| 141 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
| 142 | + wp_enqueue_script('geodirectory-goMap-script');
|
|
| 143 | 143 | |
| 144 | 144 | // font awesome rating script |
| 145 | 145 | if (get_option('geodir_reviewrating_enable_font_awesome')) {
|
@@ -150,167 +150,167 @@ discard block |
||
| 150 | 150 | wp_enqueue_script('geodir-jRating-js');
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 154 | - wp_enqueue_script('geodir-on-document-load');
|
|
| 155 | - |
|
| 156 | - |
|
| 157 | - // SCRIPT FOR UPLOAD |
|
| 158 | - wp_enqueue_script('plupload-all');
|
|
| 159 | - wp_enqueue_script('jquery-ui-sortable');
|
|
| 160 | - |
|
| 161 | - wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
| 162 | - wp_enqueue_script('geodirectory-plupload-script');
|
|
| 163 | - |
|
| 164 | - // SCRIPT FOR UPLOAD END |
|
| 165 | - |
|
| 166 | - |
|
| 167 | - // place js config array for plupload |
|
| 168 | - $plupload_init = array( |
|
| 169 | - 'runtimes' => 'html5,silverlight,flash,html4', |
|
| 170 | - 'browse_button' => 'plupload-browse-button', // will be adjusted per uploader |
|
| 171 | - 'container' => 'plupload-upload-ui', // will be adjusted per uploader |
|
| 172 | - 'drop_element' => 'dropbox', // will be adjusted per uploader |
|
| 173 | - 'file_data_name' => 'async-upload', // will be adjusted per uploader |
|
| 174 | - 'multiple_queues' => true, |
|
| 175 | - 'max_file_size' => geodir_max_upload_size(), |
|
| 176 | - 'url' => admin_url('admin-ajax.php'),
|
|
| 177 | - 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
|
|
| 178 | - 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
|
|
| 179 | - 'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
|
|
| 180 | - 'multipart' => true, |
|
| 181 | - 'urlstream_upload' => true, |
|
| 182 | - 'multi_selection' => false, // will be added per uploader |
|
| 183 | - // additional post data to send to our ajax hook |
|
| 184 | - 'multipart_params' => array( |
|
| 185 | - '_ajax_nonce' => "", // will be added per uploader |
|
| 186 | - 'action' => 'plupload_action', // the ajax action name |
|
| 187 | - 'imgid' => 0 // will be added per uploader |
|
| 188 | - ) |
|
| 189 | - ); |
|
| 190 | - $base_plupload_config = json_encode($plupload_init); |
|
| 191 | - |
|
| 192 | - |
|
| 193 | - $thumb_img_arr = array(); |
|
| 194 | - |
|
| 195 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 196 | - $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
| 197 | - |
|
| 198 | - $totImg = ''; |
|
| 199 | - $image_limit = ''; |
|
| 200 | - if (!empty($thumb_img_arr)) {
|
|
| 201 | - $totImg = count($thumb_img_arr); |
|
| 202 | - } |
|
| 153 | + wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 154 | + wp_enqueue_script('geodir-on-document-load');
|
|
| 155 | + |
|
| 156 | + |
|
| 157 | + // SCRIPT FOR UPLOAD |
|
| 158 | + wp_enqueue_script('plupload-all');
|
|
| 159 | + wp_enqueue_script('jquery-ui-sortable');
|
|
| 160 | + |
|
| 161 | + wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
| 162 | + wp_enqueue_script('geodirectory-plupload-script');
|
|
| 163 | + |
|
| 164 | + // SCRIPT FOR UPLOAD END |
|
| 165 | + |
|
| 166 | + |
|
| 167 | + // place js config array for plupload |
|
| 168 | + $plupload_init = array( |
|
| 169 | + 'runtimes' => 'html5,silverlight,flash,html4', |
|
| 170 | + 'browse_button' => 'plupload-browse-button', // will be adjusted per uploader |
|
| 171 | + 'container' => 'plupload-upload-ui', // will be adjusted per uploader |
|
| 172 | + 'drop_element' => 'dropbox', // will be adjusted per uploader |
|
| 173 | + 'file_data_name' => 'async-upload', // will be adjusted per uploader |
|
| 174 | + 'multiple_queues' => true, |
|
| 175 | + 'max_file_size' => geodir_max_upload_size(), |
|
| 176 | + 'url' => admin_url('admin-ajax.php'),
|
|
| 177 | + 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
|
|
| 178 | + 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
|
|
| 179 | + 'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
|
|
| 180 | + 'multipart' => true, |
|
| 181 | + 'urlstream_upload' => true, |
|
| 182 | + 'multi_selection' => false, // will be added per uploader |
|
| 183 | + // additional post data to send to our ajax hook |
|
| 184 | + 'multipart_params' => array( |
|
| 185 | + '_ajax_nonce' => "", // will be added per uploader |
|
| 186 | + 'action' => 'plupload_action', // the ajax action name |
|
| 187 | + 'imgid' => 0 // will be added per uploader |
|
| 188 | + ) |
|
| 189 | + ); |
|
| 190 | + $base_plupload_config = json_encode($plupload_init); |
|
| 191 | + |
|
| 192 | + |
|
| 193 | + $thumb_img_arr = array(); |
|
| 194 | + |
|
| 195 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 196 | + $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
| 197 | + |
|
| 198 | + $totImg = ''; |
|
| 199 | + $image_limit = ''; |
|
| 200 | + if (!empty($thumb_img_arr)) {
|
|
| 201 | + $totImg = count($thumb_img_arr); |
|
| 202 | + } |
|
| 203 | 203 | |
| 204 | - $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
|
|
| 205 | - 'totalImg' => $totImg, |
|
| 206 | - 'image_limit' => $image_limit, |
|
| 207 | - 'upload_img_size' => geodir_max_upload_size()); |
|
| 204 | + $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
|
|
| 205 | + 'totalImg' => $totImg, |
|
| 206 | + 'image_limit' => $image_limit, |
|
| 207 | + 'upload_img_size' => geodir_max_upload_size()); |
|
| 208 | 208 | |
| 209 | - wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
|
| 209 | + wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
|
| 210 | 210 | |
| 211 | - $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));
|
|
| 212 | - wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);
|
|
| 211 | + $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));
|
|
| 212 | + wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);
|
|
| 213 | 213 | |
| 214 | 214 | |
| 215 | - wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
| 216 | - wp_enqueue_script('geodirectory-admin-script');
|
|
| 215 | + wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
| 216 | + wp_enqueue_script('geodirectory-admin-script');
|
|
| 217 | 217 | |
| 218 | - wp_enqueue_style('farbtastic');
|
|
| 219 | - wp_enqueue_script('farbtastic');
|
|
| 218 | + wp_enqueue_style('farbtastic');
|
|
| 219 | + wp_enqueue_script('farbtastic');
|
|
| 220 | 220 | |
| 221 | - $screen = get_current_screen(); |
|
| 222 | - if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {
|
|
| 223 | - wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');
|
|
| 224 | - } |
|
| 221 | + $screen = get_current_screen(); |
|
| 222 | + if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {
|
|
| 223 | + wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');
|
|
| 224 | + } |
|
| 225 | 225 | |
| 226 | - $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
|
|
| 227 | - wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
|
|
| 226 | + $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
|
|
| 227 | + wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
|
|
| 228 | 228 | |
| 229 | - } |
|
| 229 | + } |
|
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | if (!function_exists('geodir_admin_menu')) {
|
| 233 | - /** |
|
| 234 | - * Admin Menus |
|
| 235 | - * |
|
| 236 | - * Sets up the admin menus in wordpress. |
|
| 237 | - * |
|
| 238 | - * @since 1.0.0 |
|
| 239 | - * @package GeoDirectory |
|
| 240 | - * @global array $menu Menu array. |
|
| 241 | - * @global object $geodirectory GeoDirectory plugin object. |
|
| 242 | - */ |
|
| 243 | - function geodir_admin_menu() |
|
| 244 | - {
|
|
| 245 | - global $menu, $geodirectory; |
|
| 233 | + /** |
|
| 234 | + * Admin Menus |
|
| 235 | + * |
|
| 236 | + * Sets up the admin menus in wordpress. |
|
| 237 | + * |
|
| 238 | + * @since 1.0.0 |
|
| 239 | + * @package GeoDirectory |
|
| 240 | + * @global array $menu Menu array. |
|
| 241 | + * @global object $geodirectory GeoDirectory plugin object. |
|
| 242 | + */ |
|
| 243 | + function geodir_admin_menu() |
|
| 244 | + {
|
|
| 245 | + global $menu, $geodirectory; |
|
| 246 | 246 | |
| 247 | - if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
|
|
| 247 | + if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
|
|
| 248 | 248 | |
| 249 | - add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
|
|
| 249 | + add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
|
|
| 250 | 250 | |
| 251 | 251 | |
| 252 | - } |
|
| 252 | + } |
|
| 253 | 253 | } |
| 254 | 254 | |
| 255 | 255 | if (!function_exists('geodir_admin_menu_order')) {
|
| 256 | - /** |
|
| 257 | - * Order admin menus. |
|
| 258 | - * |
|
| 259 | - * @since 1.0.0 |
|
| 260 | - * @package GeoDirectory |
|
| 261 | - * @param array $menu_order Menu order array. |
|
| 262 | - * @return array Modified menu order array. |
|
| 263 | - */ |
|
| 264 | - function geodir_admin_menu_order($menu_order) |
|
| 265 | - {
|
|
| 266 | - |
|
| 267 | - // Initialize our custom order array |
|
| 268 | - $geodir_menu_order = array(); |
|
| 269 | - |
|
| 270 | - // Get the index of our custom separator |
|
| 271 | - $geodir_separator = array_search('separator-geodirectory', $menu_order);
|
|
| 272 | - |
|
| 273 | - // Get index of posttype menu |
|
| 274 | - $post_types = geodir_get_posttypes(); |
|
| 275 | - |
|
| 276 | - // Loop through menu order and do some rearranging |
|
| 277 | - foreach ($menu_order as $index => $item) : |
|
| 278 | - |
|
| 279 | - if ((('geodirectory') == $item)) :
|
|
| 280 | - $geodir_menu_order[] = 'separator-geodirectory'; |
|
| 281 | - if (!empty($post_types)) {
|
|
| 282 | - foreach ($post_types as $post_type) {
|
|
| 283 | - $geodir_menu_order[] = 'edit.php?post_type=' . $post_type; |
|
| 284 | - } |
|
| 285 | - } |
|
| 286 | - $geodir_menu_order[] = $item; |
|
| 256 | + /** |
|
| 257 | + * Order admin menus. |
|
| 258 | + * |
|
| 259 | + * @since 1.0.0 |
|
| 260 | + * @package GeoDirectory |
|
| 261 | + * @param array $menu_order Menu order array. |
|
| 262 | + * @return array Modified menu order array. |
|
| 263 | + */ |
|
| 264 | + function geodir_admin_menu_order($menu_order) |
|
| 265 | + {
|
|
| 287 | 266 | |
| 288 | - unset($menu_order[$geodir_separator]); |
|
| 289 | - //unset( $menu_order[$geodir_places] ); |
|
| 290 | - elseif (!in_array($item, array('separator-geodirectory'))) :
|
|
| 291 | - $geodir_menu_order[] = $item; |
|
| 292 | - endif; |
|
| 267 | + // Initialize our custom order array |
|
| 268 | + $geodir_menu_order = array(); |
|
| 293 | 269 | |
| 294 | - endforeach; |
|
| 270 | + // Get the index of our custom separator |
|
| 271 | + $geodir_separator = array_search('separator-geodirectory', $menu_order);
|
|
| 295 | 272 | |
| 296 | - // Return order |
|
| 297 | - return $geodir_menu_order; |
|
| 298 | - } |
|
| 273 | + // Get index of posttype menu |
|
| 274 | + $post_types = geodir_get_posttypes(); |
|
| 275 | + |
|
| 276 | + // Loop through menu order and do some rearranging |
|
| 277 | + foreach ($menu_order as $index => $item) : |
|
| 278 | + |
|
| 279 | + if ((('geodirectory') == $item)) :
|
|
| 280 | + $geodir_menu_order[] = 'separator-geodirectory'; |
|
| 281 | + if (!empty($post_types)) {
|
|
| 282 | + foreach ($post_types as $post_type) {
|
|
| 283 | + $geodir_menu_order[] = 'edit.php?post_type=' . $post_type; |
|
| 284 | + } |
|
| 285 | + } |
|
| 286 | + $geodir_menu_order[] = $item; |
|
| 287 | + |
|
| 288 | + unset($menu_order[$geodir_separator]); |
|
| 289 | + //unset( $menu_order[$geodir_places] ); |
|
| 290 | + elseif (!in_array($item, array('separator-geodirectory'))) :
|
|
| 291 | + $geodir_menu_order[] = $item; |
|
| 292 | + endif; |
|
| 293 | + |
|
| 294 | + endforeach; |
|
| 295 | + |
|
| 296 | + // Return order |
|
| 297 | + return $geodir_menu_order; |
|
| 298 | + } |
|
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | if (!function_exists('geodir_admin_custom_menu_order')) {
|
| 302 | - /** |
|
| 303 | - * Enables custom menu order. |
|
| 304 | - * |
|
| 305 | - * @since 1.0.0 |
|
| 306 | - * @package GeoDirectory |
|
| 307 | - * @return bool |
|
| 308 | - */ |
|
| 309 | - function geodir_admin_custom_menu_order() |
|
| 310 | - {
|
|
| 311 | - if (!current_user_can('manage_options')) return false;
|
|
| 312 | - return true; |
|
| 313 | - } |
|
| 302 | + /** |
|
| 303 | + * Enables custom menu order. |
|
| 304 | + * |
|
| 305 | + * @since 1.0.0 |
|
| 306 | + * @package GeoDirectory |
|
| 307 | + * @return bool |
|
| 308 | + */ |
|
| 309 | + function geodir_admin_custom_menu_order() |
|
| 310 | + {
|
|
| 311 | + if (!current_user_can('manage_options')) return false;
|
|
| 312 | + return true; |
|
| 313 | + } |
|
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | /** |
@@ -321,51 +321,51 @@ discard block |
||
| 321 | 321 | */ |
| 322 | 322 | function geodir_before_admin_panel() |
| 323 | 323 | {
|
| 324 | - if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
|
|
| 325 | - echo '<div id="message" class="updated fade"> |
|
| 324 | + if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
|
|
| 325 | + echo '<div id="message" class="updated fade"> |
|
| 326 | 326 | <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p>
|
| 327 | 327 | <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>
|
| 328 | 328 | </div>'; |
| 329 | 329 | |
| 330 | - } |
|
| 330 | + } |
|
| 331 | 331 | |
| 332 | - if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
|
|
| 333 | - switch ($_REQUEST['msg']) {
|
|
| 334 | - case 'success': |
|
| 335 | - echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
|
|
| 336 | - flush_rewrite_rules(false); |
|
| 332 | + if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
|
|
| 333 | + switch ($_REQUEST['msg']) {
|
|
| 334 | + case 'success': |
|
| 335 | + echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
|
|
| 336 | + flush_rewrite_rules(false); |
|
| 337 | 337 | |
| 338 | - break; |
|
| 338 | + break; |
|
| 339 | 339 | case 'fail': |
| 340 | 340 | $gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : ''; |
| 341 | 341 | |
| 342 | 342 | if ($gderr == 21) |
| 343 | - echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';
|
|
| 343 | + echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';
|
|
| 344 | 344 | else |
| 345 | 345 | echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
|
| 346 | - break; |
|
| 347 | - } |
|
| 348 | - } |
|
| 346 | + break; |
|
| 347 | + } |
|
| 348 | + } |
|
| 349 | 349 | |
| 350 | - $geodir_load_map = get_option('geodir_load_map');
|
|
| 351 | - $need_map_key = false; |
|
| 352 | - if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
|
|
| 353 | - $need_map_key = true; |
|
| 354 | - } |
|
| 350 | + $geodir_load_map = get_option('geodir_load_map');
|
|
| 351 | + $need_map_key = false; |
|
| 352 | + if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
|
|
| 353 | + $need_map_key = true; |
|
| 354 | + } |
|
| 355 | 355 | |
| 356 | - if (!geodir_get_map_api_key() && $need_map_key) {
|
|
| 357 | - echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 358 | - } |
|
| 356 | + if (!geodir_get_map_api_key() && $need_map_key) {
|
|
| 357 | + echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 358 | + } |
|
| 359 | 359 | |
| 360 | - if (!geodir_is_default_location_set()) {
|
|
| 361 | - echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 360 | + if (!geodir_is_default_location_set()) {
|
|
| 361 | + echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 362 | 362 | |
| 363 | - } |
|
| 363 | + } |
|
| 364 | 364 | |
| 365 | - if (!function_exists('curl_init')) {
|
|
| 366 | - echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';
|
|
| 365 | + if (!function_exists('curl_init')) {
|
|
| 366 | + echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';
|
|
| 367 | 367 | |
| 368 | - } |
|
| 368 | + } |
|
| 369 | 369 | |
| 370 | 370 | |
| 371 | 371 | |
@@ -382,19 +382,19 @@ discard block |
||
| 382 | 382 | */ |
| 383 | 383 | function geodir_handle_option_form_submit($current_tab) |
| 384 | 384 | {
|
| 385 | - global $geodir_settings; |
|
| 386 | - if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
|
|
| 387 | - /** |
|
| 388 | - * Contains settings array for current tab. |
|
| 389 | - * |
|
| 390 | - * @since 1.0.0 |
|
| 391 | - * @package GeoDirectory |
|
| 392 | - */ |
|
| 393 | - include_once('option-pages/' . $current_tab . '_array.php');
|
|
| 394 | - } |
|
| 395 | - if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') : |
|
| 396 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 397 | - if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 385 | + global $geodir_settings; |
|
| 386 | + if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
|
|
| 387 | + /** |
|
| 388 | + * Contains settings array for current tab. |
|
| 389 | + * |
|
| 390 | + * @since 1.0.0 |
|
| 391 | + * @package GeoDirectory |
|
| 392 | + */ |
|
| 393 | + include_once('option-pages/' . $current_tab . '_array.php');
|
|
| 394 | + } |
|
| 395 | + if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') : |
|
| 396 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 397 | + if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 398 | 398 | |
| 399 | 399 | /** |
| 400 | 400 | * Fires before updating geodirectory admin settings. |
@@ -406,38 +406,38 @@ discard block |
||
| 406 | 406 | */ |
| 407 | 407 | do_action('geodir_before_update_options', $current_tab, $geodir_settings);
|
| 408 | 408 | |
| 409 | - if (!empty($geodir_settings[$current_tab])) |
|
| 410 | - geodir_update_options($geodir_settings[$current_tab]); |
|
| 409 | + if (!empty($geodir_settings[$current_tab])) |
|
| 410 | + geodir_update_options($geodir_settings[$current_tab]); |
|
| 411 | 411 | |
| 412 | - /** |
|
| 413 | - * Called after GeoDirectory options settings are updated. |
|
| 414 | - * |
|
| 415 | - * @since 1.0.0 |
|
| 416 | - * @param array $geodir_settings The array of GeoDirectory settings. |
|
| 417 | - * @see 'geodir_before_update_options' |
|
| 418 | - */ |
|
| 419 | - do_action('geodir_update_options', $geodir_settings);
|
|
| 412 | + /** |
|
| 413 | + * Called after GeoDirectory options settings are updated. |
|
| 414 | + * |
|
| 415 | + * @since 1.0.0 |
|
| 416 | + * @param array $geodir_settings The array of GeoDirectory settings. |
|
| 417 | + * @see 'geodir_before_update_options' |
|
| 418 | + */ |
|
| 419 | + do_action('geodir_update_options', $geodir_settings);
|
|
| 420 | 420 | |
| 421 | - /** |
|
| 422 | - * Called after GeoDirectory options settings are updated. |
|
| 423 | - * |
|
| 424 | - * Provides tab specific settings. |
|
| 425 | - * |
|
| 426 | - * @since 1.0.0 |
|
| 427 | - * @param string $current_tab The current settings tab name. |
|
| 428 | - * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab. |
|
| 429 | - */ |
|
| 430 | - do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
|
|
| 421 | + /** |
|
| 422 | + * Called after GeoDirectory options settings are updated. |
|
| 423 | + * |
|
| 424 | + * Provides tab specific settings. |
|
| 425 | + * |
|
| 426 | + * @since 1.0.0 |
|
| 427 | + * @param string $current_tab The current settings tab name. |
|
| 428 | + * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab. |
|
| 429 | + */ |
|
| 430 | + do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
|
|
| 431 | 431 | |
| 432 | - flush_rewrite_rules(false); |
|
| 432 | + flush_rewrite_rules(false); |
|
| 433 | 433 | |
| 434 | - $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : ''; |
|
| 434 | + $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : ''; |
|
| 435 | 435 | |
| 436 | - $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');
|
|
| 436 | + $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');
|
|
| 437 | 437 | |
| 438 | - wp_redirect($redirect_url); |
|
| 439 | - exit(); |
|
| 440 | - endif; |
|
| 438 | + wp_redirect($redirect_url); |
|
| 439 | + exit(); |
|
| 440 | + endif; |
|
| 441 | 441 | |
| 442 | 442 | |
| 443 | 443 | } |
@@ -455,144 +455,144 @@ discard block |
||
| 455 | 455 | * @return bool Returns true if saved. |
| 456 | 456 | */ |
| 457 | 457 | function geodir_update_options($options, $dummy = false) {
|
| 458 | - if ((!isset($_POST) || !$_POST) && !$dummy) return false; |
|
| 458 | + if ((!isset($_POST) || !$_POST) && !$dummy) return false; |
|
| 459 | 459 | |
| 460 | - foreach ($options as $value) {
|
|
| 461 | - if ($dummy && isset($value['std'])) |
|
| 462 | - $_POST[$value['id']] = $value['std']; |
|
| 460 | + foreach ($options as $value) {
|
|
| 461 | + if ($dummy && isset($value['std'])) |
|
| 462 | + $_POST[$value['id']] = $value['std']; |
|
| 463 | 463 | |
| 464 | 464 | |
| 465 | - if (isset($value['type']) && $value['type'] == 'checkbox') : |
|
| 465 | + if (isset($value['type']) && $value['type'] == 'checkbox') : |
|
| 466 | 466 | |
| 467 | - if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 468 | - update_option($value['id'], $_POST[$value['id']]); |
|
| 469 | - } else {
|
|
| 470 | - update_option($value['id'], 0); |
|
| 471 | - } |
|
| 467 | + if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 468 | + update_option($value['id'], $_POST[$value['id']]); |
|
| 469 | + } else {
|
|
| 470 | + update_option($value['id'], 0); |
|
| 471 | + } |
|
| 472 | 472 | |
| 473 | - elseif (isset($value['type']) && $value['type'] == 'image_width') : |
|
| 473 | + elseif (isset($value['type']) && $value['type'] == 'image_width') : |
|
| 474 | 474 | |
| 475 | - if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
|
|
| 476 | - update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']); |
|
| 477 | - update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']); |
|
| 478 | - if (isset($_POST[$value['id'] . '_crop'])) : |
|
| 479 | - update_option($value['id'] . '_crop', 1); |
|
| 480 | - else : |
|
| 481 | - update_option($value['id'] . '_crop', 0); |
|
| 482 | - endif; |
|
| 483 | - } else {
|
|
| 484 | - update_option($value['id'] . '_width', $value['std']); |
|
| 485 | - update_option($value['id'] . '_height', $value['std']); |
|
| 486 | - update_option($value['id'] . '_crop', 1); |
|
| 487 | - } |
|
| 475 | + if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
|
|
| 476 | + update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']); |
|
| 477 | + update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']); |
|
| 478 | + if (isset($_POST[$value['id'] . '_crop'])) : |
|
| 479 | + update_option($value['id'] . '_crop', 1); |
|
| 480 | + else : |
|
| 481 | + update_option($value['id'] . '_crop', 0); |
|
| 482 | + endif; |
|
| 483 | + } else {
|
|
| 484 | + update_option($value['id'] . '_width', $value['std']); |
|
| 485 | + update_option($value['id'] . '_height', $value['std']); |
|
| 486 | + update_option($value['id'] . '_crop', 1); |
|
| 487 | + } |
|
| 488 | 488 | |
| 489 | - elseif (isset($value['type']) && $value['type'] == 'map') : |
|
| 490 | - $post_types = array(); |
|
| 491 | - $categories = array(); |
|
| 489 | + elseif (isset($value['type']) && $value['type'] == 'map') : |
|
| 490 | + $post_types = array(); |
|
| 491 | + $categories = array(); |
|
| 492 | 492 | |
| 493 | - if (!empty($_POST['home_map_post_types'])) : |
|
| 494 | - foreach ($_POST['home_map_post_types'] as $post_type) : |
|
| 495 | - $post_types[] = $post_type; |
|
| 496 | - endforeach; |
|
| 497 | - endif; |
|
| 493 | + if (!empty($_POST['home_map_post_types'])) : |
|
| 494 | + foreach ($_POST['home_map_post_types'] as $post_type) : |
|
| 495 | + $post_types[] = $post_type; |
|
| 496 | + endforeach; |
|
| 497 | + endif; |
|
| 498 | 498 | |
| 499 | - update_option('geodir_exclude_post_type_on_map', $post_types);
|
|
| 499 | + update_option('geodir_exclude_post_type_on_map', $post_types);
|
|
| 500 | 500 | |
| 501 | - if (!empty($_POST['post_category'])) : |
|
| 502 | - foreach ($_POST['post_category'] as $texonomy => $cat_arr) : |
|
| 503 | - $categories[$texonomy] = array(); |
|
| 504 | - foreach ($cat_arr as $category) : |
|
| 505 | - $categories[$texonomy][] = $category; |
|
| 506 | - endforeach; |
|
| 507 | - $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array(); |
|
| 508 | - endforeach; |
|
| 509 | - endif; |
|
| 510 | - update_option('geodir_exclude_cat_on_map', $categories);
|
|
| 511 | - update_option('geodir_exclude_cat_on_map_upgrade', 1);
|
|
| 512 | - elseif (isset($value['type']) && $value['type'] == 'map_default_settings') : |
|
| 501 | + if (!empty($_POST['post_category'])) : |
|
| 502 | + foreach ($_POST['post_category'] as $texonomy => $cat_arr) : |
|
| 503 | + $categories[$texonomy] = array(); |
|
| 504 | + foreach ($cat_arr as $category) : |
|
| 505 | + $categories[$texonomy][] = $category; |
|
| 506 | + endforeach; |
|
| 507 | + $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array(); |
|
| 508 | + endforeach; |
|
| 509 | + endif; |
|
| 510 | + update_option('geodir_exclude_cat_on_map', $categories);
|
|
| 511 | + update_option('geodir_exclude_cat_on_map_upgrade', 1);
|
|
| 512 | + elseif (isset($value['type']) && $value['type'] == 'map_default_settings') : |
|
| 513 | 513 | |
| 514 | 514 | |
| 515 | - if (!empty($_POST['geodir_default_map_language'])): |
|
| 516 | - update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);
|
|
| 517 | - endif; |
|
| 515 | + if (!empty($_POST['geodir_default_map_language'])): |
|
| 516 | + update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);
|
|
| 517 | + endif; |
|
| 518 | 518 | |
| 519 | 519 | |
| 520 | - if (!empty($_POST['geodir_default_map_search_pt'])): |
|
| 521 | - update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);
|
|
| 522 | - endif; |
|
| 520 | + if (!empty($_POST['geodir_default_map_search_pt'])): |
|
| 521 | + update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);
|
|
| 522 | + endif; |
|
| 523 | 523 | |
| 524 | 524 | |
| 525 | - elseif (isset($value['type']) && $value['type'] == 'file') : |
|
| 525 | + elseif (isset($value['type']) && $value['type'] == 'file') : |
|
| 526 | 526 | |
| 527 | 527 | |
| 528 | - if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file
|
|
| 528 | + if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file
|
|
| 529 | 529 | |
| 530 | - if (get_option($value['id'])) {
|
|
| 531 | - $image_name_arr = explode('/', get_option($value['id']));
|
|
| 532 | - $noimg_name = end($image_name_arr); |
|
| 533 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 534 | - if (file_exists($img_path)) |
|
| 535 | - unlink($img_path); |
|
| 536 | - } |
|
| 530 | + if (get_option($value['id'])) {
|
|
| 531 | + $image_name_arr = explode('/', get_option($value['id']));
|
|
| 532 | + $noimg_name = end($image_name_arr); |
|
| 533 | + $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 534 | + if (file_exists($img_path)) |
|
| 535 | + unlink($img_path); |
|
| 536 | + } |
|
| 537 | 537 | |
| 538 | - update_option($value['id'], ''); |
|
| 539 | - } |
|
| 538 | + update_option($value['id'], ''); |
|
| 539 | + } |
|
| 540 | 540 | |
| 541 | - $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : ''; |
|
| 542 | - $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : ''; |
|
| 543 | - |
|
| 544 | - if (!empty($filename)): |
|
| 545 | - $ext = pathinfo($filename, PATHINFO_EXTENSION); |
|
| 546 | - $uplaods = array(); |
|
| 547 | - |
|
| 548 | - foreach ($uploadedfile as $key => $uplaod): |
|
| 549 | - if ($key == 'name'): |
|
| 550 | - $uplaods[$key] = $filename; |
|
| 551 | - else : |
|
| 552 | - $uplaods[$key] = $uplaod; |
|
| 553 | - endif; |
|
| 554 | - endforeach; |
|
| 555 | - |
|
| 556 | - $uploads = wp_upload_dir(); |
|
| 557 | - |
|
| 558 | - if (get_option($value['id'])) {
|
|
| 559 | - $image_name_arr = explode('/', get_option($value['id']));
|
|
| 560 | - $noimg_name = end($image_name_arr); |
|
| 561 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 562 | - if (file_exists($img_path)) |
|
| 563 | - unlink($img_path); |
|
| 564 | - } |
|
| 541 | + $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : ''; |
|
| 542 | + $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : ''; |
|
| 543 | + |
|
| 544 | + if (!empty($filename)): |
|
| 545 | + $ext = pathinfo($filename, PATHINFO_EXTENSION); |
|
| 546 | + $uplaods = array(); |
|
| 547 | + |
|
| 548 | + foreach ($uploadedfile as $key => $uplaod): |
|
| 549 | + if ($key == 'name'): |
|
| 550 | + $uplaods[$key] = $filename; |
|
| 551 | + else : |
|
| 552 | + $uplaods[$key] = $uplaod; |
|
| 553 | + endif; |
|
| 554 | + endforeach; |
|
| 555 | + |
|
| 556 | + $uploads = wp_upload_dir(); |
|
| 557 | + |
|
| 558 | + if (get_option($value['id'])) {
|
|
| 559 | + $image_name_arr = explode('/', get_option($value['id']));
|
|
| 560 | + $noimg_name = end($image_name_arr); |
|
| 561 | + $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 562 | + if (file_exists($img_path)) |
|
| 563 | + unlink($img_path); |
|
| 564 | + } |
|
| 565 | 565 | |
| 566 | - $upload_overrides = array('test_form' => false);
|
|
| 567 | - $movefile = wp_handle_upload($uplaods, $upload_overrides); |
|
| 566 | + $upload_overrides = array('test_form' => false);
|
|
| 567 | + $movefile = wp_handle_upload($uplaods, $upload_overrides); |
|
| 568 | 568 | |
| 569 | - update_option($value['id'], $movefile['url']); |
|
| 569 | + update_option($value['id'], $movefile['url']); |
|
| 570 | 570 | |
| 571 | - endif; |
|
| 571 | + endif; |
|
| 572 | 572 | |
| 573 | - if (!get_option($value['id']) && isset($value['value'])): |
|
| 574 | - update_option($value['id'], $value['value']); |
|
| 575 | - endif; |
|
| 573 | + if (!get_option($value['id']) && isset($value['value'])): |
|
| 574 | + update_option($value['id'], $value['value']); |
|
| 575 | + endif; |
|
| 576 | 576 | |
| 577 | 577 | |
| 578 | - else : |
|
| 579 | - // same menu setting per theme. |
|
| 580 | - if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
|
|
| 581 | - $theme = wp_get_theme(); |
|
| 582 | - update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
|
|
| 583 | - } |
|
| 578 | + else : |
|
| 579 | + // same menu setting per theme. |
|
| 580 | + if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
|
|
| 581 | + $theme = wp_get_theme(); |
|
| 582 | + update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
|
|
| 583 | + } |
|
| 584 | 584 | |
| 585 | - if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 586 | - update_option($value['id'], $_POST[$value['id']]); |
|
| 587 | - } else {
|
|
| 588 | - delete_option($value['id']); |
|
| 589 | - } |
|
| 585 | + if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 586 | + update_option($value['id'], $_POST[$value['id']]); |
|
| 587 | + } else {
|
|
| 588 | + delete_option($value['id']); |
|
| 589 | + } |
|
| 590 | 590 | |
| 591 | - endif; |
|
| 592 | - } |
|
| 593 | - if ($dummy) |
|
| 594 | - $_POST = array(); |
|
| 595 | - return true; |
|
| 591 | + endif; |
|
| 592 | + } |
|
| 593 | + if ($dummy) |
|
| 594 | + $_POST = array(); |
|
| 595 | + return true; |
|
| 596 | 596 | |
| 597 | 597 | } |
| 598 | 598 | |
@@ -641,33 +641,33 @@ discard block |
||
| 641 | 641 | function places_custom_fields_tab($tabs) |
| 642 | 642 | {
|
| 643 | 643 | |
| 644 | - $geodir_post_types = get_option('geodir_post_types');
|
|
| 644 | + $geodir_post_types = get_option('geodir_post_types');
|
|
| 645 | 645 | |
| 646 | - if (!empty($geodir_post_types)) {
|
|
| 646 | + if (!empty($geodir_post_types)) {
|
|
| 647 | 647 | |
| 648 | - foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info): |
|
| 648 | + foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info): |
|
| 649 | 649 | |
| 650 | - $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory'); |
|
| 650 | + $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory'); |
|
| 651 | 651 | |
| 652 | - $tabs[$geodir_post_type . '_fields_settings'] = array( |
|
| 653 | - 'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),
|
|
| 654 | - 'subtabs' => array( |
|
| 655 | - array('subtab' => 'custom_fields',
|
|
| 656 | - 'label' => __('Custom Fields', 'geodirectory'),
|
|
| 657 | - 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 658 | - array('subtab' => 'sorting_options',
|
|
| 659 | - 'label' => __('Sorting Options', 'geodirectory'),
|
|
| 660 | - 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 661 | - ), |
|
| 662 | - 'tab_index' => 9, |
|
| 663 | - 'request' => array('listing_type' => $geodir_post_type)
|
|
| 664 | - ); |
|
| 652 | + $tabs[$geodir_post_type . '_fields_settings'] = array( |
|
| 653 | + 'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),
|
|
| 654 | + 'subtabs' => array( |
|
| 655 | + array('subtab' => 'custom_fields',
|
|
| 656 | + 'label' => __('Custom Fields', 'geodirectory'),
|
|
| 657 | + 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 658 | + array('subtab' => 'sorting_options',
|
|
| 659 | + 'label' => __('Sorting Options', 'geodirectory'),
|
|
| 660 | + 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 661 | + ), |
|
| 662 | + 'tab_index' => 9, |
|
| 663 | + 'request' => array('listing_type' => $geodir_post_type)
|
|
| 664 | + ); |
|
| 665 | 665 | |
| 666 | - endforeach; |
|
| 666 | + endforeach; |
|
| 667 | 667 | |
| 668 | - } |
|
| 668 | + } |
|
| 669 | 669 | |
| 670 | - return $tabs; |
|
| 670 | + return $tabs; |
|
| 671 | 671 | } |
| 672 | 672 | |
| 673 | 673 | |
@@ -683,9 +683,9 @@ discard block |
||
| 683 | 683 | */ |
| 684 | 684 | function geodir_tools_setting_tab($tabs) |
| 685 | 685 | {
|
| 686 | - wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
| 687 | - $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
|
|
| 688 | - return $tabs; |
|
| 686 | + wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
| 687 | + $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
|
|
| 688 | + return $tabs; |
|
| 689 | 689 | } |
| 690 | 690 | |
| 691 | 691 | /** |
@@ -700,8 +700,8 @@ discard block |
||
| 700 | 700 | */ |
| 701 | 701 | function geodir_compatibility_setting_tab($tabs) |
| 702 | 702 | {
|
| 703 | - $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));
|
|
| 704 | - return $tabs; |
|
| 703 | + $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));
|
|
| 704 | + return $tabs; |
|
| 705 | 705 | } |
| 706 | 706 | |
| 707 | 707 | |
@@ -717,144 +717,144 @@ discard block |
||
| 717 | 717 | */ |
| 718 | 718 | function geodir_extend_geodirectory_setting_tab($tabs) |
| 719 | 719 | {
|
| 720 | - $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
| 721 | - return $tabs; |
|
| 720 | + $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
| 721 | + return $tabs; |
|
| 722 | 722 | } |
| 723 | 723 | |
| 724 | 724 | |
| 725 | 725 | if (!function_exists('geodir_edit_post_columns')) {
|
| 726 | - /** |
|
| 727 | - * Modify admin post listing page columns. |
|
| 728 | - * |
|
| 729 | - * @since 1.0.0 |
|
| 730 | - * @package GeoDirectory |
|
| 731 | - * @param array $columns The column array. |
|
| 732 | - * @return array Altered column array. |
|
| 733 | - */ |
|
| 734 | - function geodir_edit_post_columns($columns) |
|
| 735 | - {
|
|
| 736 | - |
|
| 737 | - $new_columns = array('location' => __('Location (ID)', 'geodirectory'),
|
|
| 738 | - 'categorys' => __('Categories', 'geodirectory'));
|
|
| 739 | - |
|
| 740 | - if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist
|
|
| 741 | - {
|
|
| 742 | - $offset = 0; // should we prepend $array with $data? |
|
| 743 | - $offset = count($columns); // or should we append $array with $data? lets pick this one... |
|
| 744 | - } |
|
| 726 | + /** |
|
| 727 | + * Modify admin post listing page columns. |
|
| 728 | + * |
|
| 729 | + * @since 1.0.0 |
|
| 730 | + * @package GeoDirectory |
|
| 731 | + * @param array $columns The column array. |
|
| 732 | + * @return array Altered column array. |
|
| 733 | + */ |
|
| 734 | + function geodir_edit_post_columns($columns) |
|
| 735 | + {
|
|
| 745 | 736 | |
| 746 | - $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset)); |
|
| 737 | + $new_columns = array('location' => __('Location (ID)', 'geodirectory'),
|
|
| 738 | + 'categorys' => __('Categories', 'geodirectory'));
|
|
| 747 | 739 | |
| 748 | - $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));
|
|
| 740 | + if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist
|
|
| 741 | + {
|
|
| 742 | + $offset = 0; // should we prepend $array with $data? |
|
| 743 | + $offset = count($columns); // or should we append $array with $data? lets pick this one... |
|
| 744 | + } |
|
| 749 | 745 | |
| 750 | - return $columns; |
|
| 751 | - } |
|
| 746 | + $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset)); |
|
| 747 | + |
|
| 748 | + $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));
|
|
| 749 | + |
|
| 750 | + return $columns; |
|
| 751 | + } |
|
| 752 | 752 | } |
| 753 | 753 | |
| 754 | 754 | |
| 755 | 755 | if (!function_exists('geodir_manage_post_columns')) {
|
| 756 | - /** |
|
| 757 | - * Adds content to our custom post listing page columns. |
|
| 758 | - * |
|
| 759 | - * @since 1.0.0 |
|
| 760 | - * @package GeoDirectory |
|
| 761 | - * @global object $wpdb WordPress Database object. |
|
| 762 | - * @global object $post WordPress Post object. |
|
| 763 | - * @param string $column The column name. |
|
| 764 | - * @param int $post_id The post ID. |
|
| 765 | - */ |
|
| 766 | - function geodir_manage_post_columns($column, $post_id) |
|
| 767 | - {
|
|
| 768 | - global $post, $wpdb; |
|
| 769 | - |
|
| 770 | - switch ($column): |
|
| 771 | - /* If displaying the 'city' column. */ |
|
| 772 | - case 'location' : |
|
| 773 | - $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true); |
|
| 774 | - $location = geodir_get_location($location_id); |
|
| 775 | - /* If no city is found, output a default message. */ |
|
| 776 | - if (empty($location)) {
|
|
| 777 | - _e('Unknown', 'geodirectory');
|
|
| 778 | - } else {
|
|
| 779 | - /* If there is a city id, append 'city name' to the text string. */ |
|
| 780 | - $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';
|
|
| 781 | - echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id); |
|
| 782 | - } |
|
| 783 | - break; |
|
| 784 | - |
|
| 785 | - /* If displaying the 'expire' column. */ |
|
| 786 | - case 'expire' : |
|
| 787 | - $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true); |
|
| 788 | - $d1 = $expire_date; // get expire_date |
|
| 789 | - $d2 = date('Y-m-d'); // get current date
|
|
| 790 | - $state = __('days left', 'geodirectory');
|
|
| 791 | - $date_diff_text = ''; |
|
| 792 | - $expire_class = 'expire_left'; |
|
| 793 | - if ($expire_date != 'Never') {
|
|
| 794 | - if (strtotime($d1) < strtotime($d2)) {
|
|
| 795 | - $state = __('days overdue', 'geodirectory');
|
|
| 796 | - $expire_class = 'expire_over'; |
|
| 797 | - } |
|
| 798 | - $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days |
|
| 799 | - $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
|
|
| 800 | - } |
|
| 801 | - /* If no expire_date is found, output a default message. */ |
|
| 802 | - if (empty($expire_date)) |
|
| 803 | - echo __('Unknown', 'geodirectory');
|
|
| 804 | - /* If there is a expire_date, append 'days left' to the text string. */ |
|
| 805 | - else |
|
| 806 | - echo $expire_date . $date_diff_text; |
|
| 807 | - break; |
|
| 808 | - |
|
| 809 | - /* If displaying the 'categorys' column. */ |
|
| 810 | - case 'categorys' : |
|
| 811 | - |
|
| 812 | - /* Get the categorys for the post. */ |
|
| 813 | - |
|
| 814 | - |
|
| 815 | - $terms = wp_get_object_terms($post_id, get_object_taxonomies($post)); |
|
| 816 | - |
|
| 817 | - /* If terms were found. */ |
|
| 818 | - if (!empty($terms)) {
|
|
| 819 | - $out = array(); |
|
| 820 | - /* Loop through each term, linking to the 'edit posts' page for the specific term. */ |
|
| 821 | - foreach ($terms as $term) {
|
|
| 822 | - if (!strstr($term->taxonomy, 'tag')) {
|
|
| 823 | - $out[] = sprintf('<a href="%s">%s</a>',
|
|
| 824 | - esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),
|
|
| 825 | - esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))
|
|
| 826 | - ); |
|
| 827 | - } |
|
| 828 | - } |
|
| 829 | - /* Join the terms, separating them with a comma. */ |
|
| 830 | - echo(join(', ', $out));
|
|
| 831 | - } /* If no terms were found, output a default message. */ |
|
| 832 | - else {
|
|
| 833 | - _e('No Categories', 'geodirectory');
|
|
| 834 | - } |
|
| 835 | - break; |
|
| 756 | + /** |
|
| 757 | + * Adds content to our custom post listing page columns. |
|
| 758 | + * |
|
| 759 | + * @since 1.0.0 |
|
| 760 | + * @package GeoDirectory |
|
| 761 | + * @global object $wpdb WordPress Database object. |
|
| 762 | + * @global object $post WordPress Post object. |
|
| 763 | + * @param string $column The column name. |
|
| 764 | + * @param int $post_id The post ID. |
|
| 765 | + */ |
|
| 766 | + function geodir_manage_post_columns($column, $post_id) |
|
| 767 | + {
|
|
| 768 | + global $post, $wpdb; |
|
| 769 | + |
|
| 770 | + switch ($column): |
|
| 771 | + /* If displaying the 'city' column. */ |
|
| 772 | + case 'location' : |
|
| 773 | + $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true); |
|
| 774 | + $location = geodir_get_location($location_id); |
|
| 775 | + /* If no city is found, output a default message. */ |
|
| 776 | + if (empty($location)) {
|
|
| 777 | + _e('Unknown', 'geodirectory');
|
|
| 778 | + } else {
|
|
| 779 | + /* If there is a city id, append 'city name' to the text string. */ |
|
| 780 | + $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';
|
|
| 781 | + echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id); |
|
| 782 | + } |
|
| 783 | + break; |
|
| 784 | + |
|
| 785 | + /* If displaying the 'expire' column. */ |
|
| 786 | + case 'expire' : |
|
| 787 | + $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true); |
|
| 788 | + $d1 = $expire_date; // get expire_date |
|
| 789 | + $d2 = date('Y-m-d'); // get current date
|
|
| 790 | + $state = __('days left', 'geodirectory');
|
|
| 791 | + $date_diff_text = ''; |
|
| 792 | + $expire_class = 'expire_left'; |
|
| 793 | + if ($expire_date != 'Never') {
|
|
| 794 | + if (strtotime($d1) < strtotime($d2)) {
|
|
| 795 | + $state = __('days overdue', 'geodirectory');
|
|
| 796 | + $expire_class = 'expire_over'; |
|
| 797 | + } |
|
| 798 | + $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days |
|
| 799 | + $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
|
|
| 800 | + } |
|
| 801 | + /* If no expire_date is found, output a default message. */ |
|
| 802 | + if (empty($expire_date)) |
|
| 803 | + echo __('Unknown', 'geodirectory');
|
|
| 804 | + /* If there is a expire_date, append 'days left' to the text string. */ |
|
| 805 | + else |
|
| 806 | + echo $expire_date . $date_diff_text; |
|
| 807 | + break; |
|
| 836 | 808 | |
| 837 | - endswitch; |
|
| 838 | - } |
|
| 809 | + /* If displaying the 'categorys' column. */ |
|
| 810 | + case 'categorys' : |
|
| 811 | + |
|
| 812 | + /* Get the categorys for the post. */ |
|
| 813 | + |
|
| 814 | + |
|
| 815 | + $terms = wp_get_object_terms($post_id, get_object_taxonomies($post)); |
|
| 816 | + |
|
| 817 | + /* If terms were found. */ |
|
| 818 | + if (!empty($terms)) {
|
|
| 819 | + $out = array(); |
|
| 820 | + /* Loop through each term, linking to the 'edit posts' page for the specific term. */ |
|
| 821 | + foreach ($terms as $term) {
|
|
| 822 | + if (!strstr($term->taxonomy, 'tag')) {
|
|
| 823 | + $out[] = sprintf('<a href="%s">%s</a>',
|
|
| 824 | + esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),
|
|
| 825 | + esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))
|
|
| 826 | + ); |
|
| 827 | + } |
|
| 828 | + } |
|
| 829 | + /* Join the terms, separating them with a comma. */ |
|
| 830 | + echo(join(', ', $out));
|
|
| 831 | + } /* If no terms were found, output a default message. */ |
|
| 832 | + else {
|
|
| 833 | + _e('No Categories', 'geodirectory');
|
|
| 834 | + } |
|
| 835 | + break; |
|
| 836 | + |
|
| 837 | + endswitch; |
|
| 838 | + } |
|
| 839 | 839 | } |
| 840 | 840 | |
| 841 | 841 | |
| 842 | 842 | if (!function_exists('geodir_post_sortable_columns')) {
|
| 843 | - /** |
|
| 844 | - * Makes admin post listing page columns sortable. |
|
| 845 | - * |
|
| 846 | - * @since 1.0.0 |
|
| 847 | - * @package GeoDirectory |
|
| 848 | - * @param array $columns The column array. |
|
| 849 | - * @return array Altered column array. |
|
| 850 | - */ |
|
| 851 | - function geodir_post_sortable_columns($columns) |
|
| 852 | - {
|
|
| 853 | - |
|
| 854 | - $columns['expire'] = 'expire'; |
|
| 855 | - |
|
| 856 | - return $columns; |
|
| 857 | - } |
|
| 843 | + /** |
|
| 844 | + * Makes admin post listing page columns sortable. |
|
| 845 | + * |
|
| 846 | + * @since 1.0.0 |
|
| 847 | + * @package GeoDirectory |
|
| 848 | + * @param array $columns The column array. |
|
| 849 | + * @return array Altered column array. |
|
| 850 | + */ |
|
| 851 | + function geodir_post_sortable_columns($columns) |
|
| 852 | + {
|
|
| 853 | + |
|
| 854 | + $columns['expire'] = 'expire'; |
|
| 855 | + |
|
| 856 | + return $columns; |
|
| 857 | + } |
|
| 858 | 858 | } |
| 859 | 859 | |
| 860 | 860 | /** |
@@ -868,32 +868,32 @@ discard block |
||
| 868 | 868 | * @param int $post_id The post ID. |
| 869 | 869 | */ |
| 870 | 870 | function geodir_post_information_save($post_id, $post) {
|
| 871 | - global $wpdb, $current_user; |
|
| 871 | + global $wpdb, $current_user; |
|
| 872 | 872 | |
| 873 | - if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {
|
|
| 874 | - return; |
|
| 875 | - } |
|
| 873 | + if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {
|
|
| 874 | + return; |
|
| 875 | + } |
|
| 876 | 876 | |
| 877 | - $geodir_posttypes = geodir_get_posttypes(); |
|
| 877 | + $geodir_posttypes = geodir_get_posttypes(); |
|
| 878 | 878 | |
| 879 | - if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
|
|
| 880 | - return; |
|
| 879 | + if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
|
|
| 880 | + return; |
|
| 881 | 881 | |
| 882 | - if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {
|
|
| 883 | - if (isset($_REQUEST['_status'])) |
|
| 884 | - geodir_change_post_status($post_id, $_REQUEST['_status']); |
|
| 882 | + if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {
|
|
| 883 | + if (isset($_REQUEST['_status'])) |
|
| 884 | + geodir_change_post_status($post_id, $_REQUEST['_status']); |
|
| 885 | 885 | |
| 886 | - if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) |
|
| 887 | - return; |
|
| 886 | + if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) |
|
| 887 | + return; |
|
| 888 | 888 | |
| 889 | - if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) |
|
| 890 | - return; |
|
| 889 | + if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) |
|
| 890 | + return; |
|
| 891 | 891 | |
| 892 | - if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) |
|
| 893 | - return; |
|
| 892 | + if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) |
|
| 893 | + return; |
|
| 894 | 894 | |
| 895 | - geodir_save_listing($_REQUEST); |
|
| 896 | - } |
|
| 895 | + geodir_save_listing($_REQUEST); |
|
| 896 | + } |
|
| 897 | 897 | } |
| 898 | 898 | |
| 899 | 899 | /** |
@@ -909,102 +909,102 @@ discard block |
||
| 909 | 909 | */ |
| 910 | 910 | function geodir_admin_fields($options) |
| 911 | 911 | {
|
| 912 | - global $geodirectory; |
|
| 913 | - |
|
| 914 | - $first_title = true; |
|
| 915 | - $tab_id = ''; |
|
| 916 | - $i = 0; |
|
| 917 | - foreach ($options as $value) : |
|
| 918 | - if (!isset($value['name'])) $value['name'] = ''; |
|
| 919 | - if (!isset($value['class'])) $value['class'] = ''; |
|
| 920 | - if (!isset($value['css'])) $value['css'] = ''; |
|
| 921 | - if (!isset($value['std'])) $value['std'] = ''; |
|
| 922 | - $desc = ''; |
|
| 923 | - switch ($value['type']) : |
|
| 924 | - case 'dummy_installer': |
|
| 925 | - $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place'; |
|
| 926 | - geodir_autoinstall_admin_header($post_type); |
|
| 927 | - break; |
|
| 928 | - case 'title': |
|
| 929 | - |
|
| 930 | - if ($i == 0) {
|
|
| 931 | - echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>'; |
|
| 932 | - echo '<div class="inner_content_tab_main">'; |
|
| 933 | - } |
|
| 912 | + global $geodirectory; |
|
| 913 | + |
|
| 914 | + $first_title = true; |
|
| 915 | + $tab_id = ''; |
|
| 916 | + $i = 0; |
|
| 917 | + foreach ($options as $value) : |
|
| 918 | + if (!isset($value['name'])) $value['name'] = ''; |
|
| 919 | + if (!isset($value['class'])) $value['class'] = ''; |
|
| 920 | + if (!isset($value['css'])) $value['css'] = ''; |
|
| 921 | + if (!isset($value['std'])) $value['std'] = ''; |
|
| 922 | + $desc = ''; |
|
| 923 | + switch ($value['type']) : |
|
| 924 | + case 'dummy_installer': |
|
| 925 | + $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place'; |
|
| 926 | + geodir_autoinstall_admin_header($post_type); |
|
| 927 | + break; |
|
| 928 | + case 'title': |
|
| 929 | + |
|
| 930 | + if ($i == 0) {
|
|
| 931 | + echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>'; |
|
| 932 | + echo '<div class="inner_content_tab_main">'; |
|
| 933 | + } |
|
| 934 | 934 | |
| 935 | - $i++; |
|
| 935 | + $i++; |
|
| 936 | 936 | |
| 937 | - if (isset($value['id']) && $value['id']) |
|
| 938 | - $tab_id = $value['id']; |
|
| 937 | + if (isset($value['id']) && $value['id']) |
|
| 938 | + $tab_id = $value['id']; |
|
| 939 | 939 | |
| 940 | - if (isset($value['desc']) && $value['desc']) |
|
| 941 | - $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
| 940 | + if (isset($value['desc']) && $value['desc']) |
|
| 941 | + $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
| 942 | 942 | |
| 943 | - if (isset($value['name']) && $value['name']) {
|
|
| 944 | - if ($first_title === true) {
|
|
| 945 | - $first_title = false; |
|
| 946 | - } else {
|
|
| 947 | - echo '</div>'; |
|
| 948 | - } |
|
| 949 | - echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>'; |
|
| 943 | + if (isset($value['name']) && $value['name']) {
|
|
| 944 | + if ($first_title === true) {
|
|
| 945 | + $first_title = false; |
|
| 946 | + } else {
|
|
| 947 | + echo '</div>'; |
|
| 948 | + } |
|
| 949 | + echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>'; |
|
| 950 | 950 | |
| 951 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 952 | - } |
|
| 951 | + echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 952 | + } |
|
| 953 | 953 | |
| 954 | - /** |
|
| 955 | - * Called after a GeoDirectory settings title is output in the GD settings page. |
|
| 956 | - * |
|
| 957 | - * The action is called dynamically geodir_settings_$value['id']. |
|
| 958 | - * |
|
| 959 | - * @since 1.0.0 |
|
| 960 | - */ |
|
| 961 | - do_action('geodir_settings_' . sanitize_title($value['id']));
|
|
| 962 | - break; |
|
| 963 | - |
|
| 964 | - case 'no_tabs': |
|
| 965 | - |
|
| 966 | - echo '<div class="inner_content_tab_main">'; |
|
| 967 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 968 | - |
|
| 969 | - break; |
|
| 970 | - |
|
| 971 | - case 'sectionstart': |
|
| 972 | - if (isset($value['desc']) && $value['desc']) |
|
| 973 | - $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
| 974 | - if (isset($value['name']) && $value['name']) |
|
| 975 | - echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
| 976 | - /** |
|
| 977 | - * Called after a GeoDirectory settings sectionstart is output in the GD settings page. |
|
| 978 | - * |
|
| 979 | - * The action is called dynamically geodir_settings_$value['id']_start. |
|
| 980 | - * |
|
| 981 | - * @since 1.0.0 |
|
| 982 | - */ |
|
| 983 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
|
|
| 984 | - echo '<table class="form-table">' . "\n\n"; |
|
| 985 | - |
|
| 986 | - break; |
|
| 987 | - case 'sectionend': |
|
| 988 | - /** |
|
| 989 | - * Called before a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 990 | - * |
|
| 991 | - * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 992 | - * |
|
| 993 | - * @since 1.0.0 |
|
| 994 | - */ |
|
| 995 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
|
|
| 996 | - echo '</table>'; |
|
| 997 | - /** |
|
| 998 | - * Called after a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 999 | - * |
|
| 1000 | - * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 1001 | - * |
|
| 1002 | - * @since 1.0.0 |
|
| 1003 | - */ |
|
| 1004 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
|
|
| 1005 | - break; |
|
| 1006 | - case 'text': |
|
| 1007 | - ?> |
|
| 954 | + /** |
|
| 955 | + * Called after a GeoDirectory settings title is output in the GD settings page. |
|
| 956 | + * |
|
| 957 | + * The action is called dynamically geodir_settings_$value['id']. |
|
| 958 | + * |
|
| 959 | + * @since 1.0.0 |
|
| 960 | + */ |
|
| 961 | + do_action('geodir_settings_' . sanitize_title($value['id']));
|
|
| 962 | + break; |
|
| 963 | + |
|
| 964 | + case 'no_tabs': |
|
| 965 | + |
|
| 966 | + echo '<div class="inner_content_tab_main">'; |
|
| 967 | + echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 968 | + |
|
| 969 | + break; |
|
| 970 | + |
|
| 971 | + case 'sectionstart': |
|
| 972 | + if (isset($value['desc']) && $value['desc']) |
|
| 973 | + $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
| 974 | + if (isset($value['name']) && $value['name']) |
|
| 975 | + echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
| 976 | + /** |
|
| 977 | + * Called after a GeoDirectory settings sectionstart is output in the GD settings page. |
|
| 978 | + * |
|
| 979 | + * The action is called dynamically geodir_settings_$value['id']_start. |
|
| 980 | + * |
|
| 981 | + * @since 1.0.0 |
|
| 982 | + */ |
|
| 983 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
|
|
| 984 | + echo '<table class="form-table">' . "\n\n"; |
|
| 985 | + |
|
| 986 | + break; |
|
| 987 | + case 'sectionend': |
|
| 988 | + /** |
|
| 989 | + * Called before a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 990 | + * |
|
| 991 | + * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 992 | + * |
|
| 993 | + * @since 1.0.0 |
|
| 994 | + */ |
|
| 995 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
|
|
| 996 | + echo '</table>'; |
|
| 997 | + /** |
|
| 998 | + * Called after a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 999 | + * |
|
| 1000 | + * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 1001 | + * |
|
| 1002 | + * @since 1.0.0 |
|
| 1003 | + */ |
|
| 1004 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
|
|
| 1005 | + break; |
|
| 1006 | + case 'text': |
|
| 1007 | + ?> |
|
| 1008 | 1008 | <tr valign="top"> |
| 1009 | 1009 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1010 | 1010 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1013,15 +1013,15 @@ discard block |
||
| 1013 | 1013 | <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
| 1014 | 1014 | style=" <?php echo esc_attr($value['css']); ?>" |
| 1015 | 1015 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1016 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1017 | - } else {
|
|
| 1018 | - echo esc_attr($value['std']); |
|
| 1019 | - } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1016 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1017 | + } else {
|
|
| 1018 | + echo esc_attr($value['std']); |
|
| 1019 | + } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1020 | 1020 | </tr><?php |
| 1021 | - break; |
|
| 1021 | + break; |
|
| 1022 | 1022 | |
| 1023 | - case 'map-key': |
|
| 1024 | - ?> |
|
| 1023 | + case 'map-key': |
|
| 1024 | + ?> |
|
| 1025 | 1025 | <tr valign="top"> |
| 1026 | 1026 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1027 | 1027 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1030,17 +1030,17 @@ discard block |
||
| 1030 | 1030 | <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
| 1031 | 1031 | style=" <?php echo esc_attr($value['css']); ?>" |
| 1032 | 1032 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1033 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1034 | - } else {
|
|
| 1035 | - echo esc_attr($value['std']); |
|
| 1036 | - } ?>"/> |
|
| 1033 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1034 | + } else {
|
|
| 1035 | + echo esc_attr($value['std']); |
|
| 1036 | + } ?>"/> |
|
| 1037 | 1037 | <a href='https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]&TB_iframe=true&width=600&height=400' class="thickbox button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )','geodirectory');?>" ><?php _e('Generate API Key','geodirectory');?></a>
|
| 1038 | 1038 | <span class="description"><?php echo $value['desc']; ?></span></td> |
| 1039 | 1039 | </tr><?php |
| 1040 | - break; |
|
| 1040 | + break; |
|
| 1041 | 1041 | |
| 1042 | - case 'password': |
|
| 1043 | - ?> |
|
| 1042 | + case 'password': |
|
| 1043 | + ?> |
|
| 1044 | 1044 | <tr valign="top"> |
| 1045 | 1045 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1046 | 1046 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1049,42 +1049,42 @@ discard block |
||
| 1049 | 1049 | <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
| 1050 | 1050 | style="<?php echo esc_attr($value['css']); ?>" |
| 1051 | 1051 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1052 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1053 | - } else {
|
|
| 1054 | - echo esc_attr($value['std']); |
|
| 1055 | - } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1052 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1053 | + } else {
|
|
| 1054 | + echo esc_attr($value['std']); |
|
| 1055 | + } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1056 | 1056 | </tr><?php |
| 1057 | - break; |
|
| 1057 | + break; |
|
| 1058 | 1058 | |
| 1059 | - case 'html_content': |
|
| 1060 | - ?> |
|
| 1059 | + case 'html_content': |
|
| 1060 | + ?> |
|
| 1061 | 1061 | <tr valign="top"> |
| 1062 | 1062 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1063 | 1063 | <td class="forminp"><span class="description"><?php echo $value['desc']; ?></span></td> |
| 1064 | 1064 | </tr><?php |
| 1065 | - break; |
|
| 1065 | + break; |
|
| 1066 | 1066 | |
| 1067 | - case 'color' : |
|
| 1068 | - ?> |
|
| 1067 | + case 'color' : |
|
| 1068 | + ?> |
|
| 1069 | 1069 | <tr valign="top"> |
| 1070 | 1070 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1071 | 1071 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
| 1072 | 1072 | id="<?php echo esc_attr($value['id']); ?>" type="text" |
| 1073 | 1073 | style="<?php echo esc_attr($value['css']); ?>" |
| 1074 | 1074 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1075 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1076 | - } else {
|
|
| 1077 | - echo esc_attr($value['std']); |
|
| 1078 | - } ?>" class="colorpick"/> <span |
|
| 1075 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1076 | + } else {
|
|
| 1077 | + echo esc_attr($value['std']); |
|
| 1078 | + } ?>" class="colorpick"/> <span |
|
| 1079 | 1079 | class="description"><?php echo $value['desc']; ?></span> |
| 1080 | 1080 | |
| 1081 | 1081 | <div id="colorPickerDiv_<?php echo esc_attr($value['id']); ?>" class="colorpickdiv" |
| 1082 | 1082 | style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"></div> |
| 1083 | 1083 | </td> |
| 1084 | 1084 | </tr><?php |
| 1085 | - break; |
|
| 1086 | - case 'image_width' : |
|
| 1087 | - ?> |
|
| 1085 | + break; |
|
| 1086 | + case 'image_width' : |
|
| 1087 | + ?> |
|
| 1088 | 1088 | <tr valign="top"> |
| 1089 | 1089 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1090 | 1090 | <td class="forminp"> |
@@ -1106,11 +1106,11 @@ discard block |
||
| 1106 | 1106 | |
| 1107 | 1107 | <span class="description"><?php echo $value['desc'] ?></span></td> |
| 1108 | 1108 | </tr><?php |
| 1109 | - break; |
|
| 1110 | - case 'select': |
|
| 1111 | - $option_value = get_option($value['id']); |
|
| 1112 | - $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value; |
|
| 1113 | - ?> |
|
| 1109 | + break; |
|
| 1110 | + case 'select': |
|
| 1111 | + $option_value = get_option($value['id']); |
|
| 1112 | + $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value; |
|
| 1113 | + ?> |
|
| 1114 | 1114 | <tr valign="top"> |
| 1115 | 1115 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1116 | 1116 | <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>" |
@@ -1119,33 +1119,33 @@ discard block |
||
| 1119 | 1119 | class="<?php if (isset($value['class'])) echo $value['class']; ?>" |
| 1120 | 1120 | option-ajaxchosen="false"> |
| 1121 | 1121 | <?php |
| 1122 | - foreach ($value['options'] as $key => $val) {
|
|
| 1123 | - $geodir_select_value = ''; |
|
| 1124 | - if ($option_value != '') {
|
|
| 1125 | - if ($option_value != '' && $option_value == $key) |
|
| 1126 | - $geodir_select_value = ' selected="selected" '; |
|
| 1127 | - } else {
|
|
| 1128 | - if ($value['std'] == $key) |
|
| 1129 | - $geodir_select_value = ' selected="selected" '; |
|
| 1130 | - } |
|
| 1131 | - ?> |
|
| 1122 | + foreach ($value['options'] as $key => $val) {
|
|
| 1123 | + $geodir_select_value = ''; |
|
| 1124 | + if ($option_value != '') {
|
|
| 1125 | + if ($option_value != '' && $option_value == $key) |
|
| 1126 | + $geodir_select_value = ' selected="selected" '; |
|
| 1127 | + } else {
|
|
| 1128 | + if ($value['std'] == $key) |
|
| 1129 | + $geodir_select_value = ' selected="selected" '; |
|
| 1130 | + } |
|
| 1131 | + ?> |
|
| 1132 | 1132 | <option |
| 1133 | 1133 | value="<?php echo esc_attr($key); ?>" <?php echo $geodir_select_value; ?> ><?php echo geodir_utf8_ucfirst($val) ?></option> |
| 1134 | 1134 | <?php |
| 1135 | - } |
|
| 1136 | - ?> |
|
| 1135 | + } |
|
| 1136 | + ?> |
|
| 1137 | 1137 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
| 1138 | 1138 | </td> |
| 1139 | 1139 | </tr><?php |
| 1140 | - break; |
|
| 1140 | + break; |
|
| 1141 | 1141 | |
| 1142 | - case 'multiselect': |
|
| 1143 | - $option_values = get_option($value['id']); |
|
| 1144 | - if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {
|
|
| 1145 | - $option_values = $value['std']; |
|
| 1146 | - } |
|
| 1147 | - $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values; |
|
| 1148 | - ?> |
|
| 1142 | + case 'multiselect': |
|
| 1143 | + $option_values = get_option($value['id']); |
|
| 1144 | + if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {
|
|
| 1145 | + $option_values = $value['std']; |
|
| 1146 | + } |
|
| 1147 | + $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values; |
|
| 1148 | + ?> |
|
| 1149 | 1149 | <tr valign="top"> |
| 1150 | 1150 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1151 | 1151 | <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]" |
@@ -1155,26 +1155,26 @@ discard block |
||
| 1155 | 1155 | data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>" |
| 1156 | 1156 | option-ajaxchosen="false"> |
| 1157 | 1157 | <?php |
| 1158 | - foreach ($value['options'] as $key => $val) {
|
|
| 1159 | - if (strpos($key, 'optgroup_start-') === 0) {
|
|
| 1160 | - ?><optgroup label="<?php echo geodir_utf8_ucfirst($val); ?>"><?php |
|
| 1161 | - } else if (strpos($key, 'optgroup_end-') === 0) {
|
|
| 1162 | - ?></optgroup><?php |
|
| 1163 | - } else {
|
|
| 1164 | - ?> |
|
| 1158 | + foreach ($value['options'] as $key => $val) {
|
|
| 1159 | + if (strpos($key, 'optgroup_start-') === 0) {
|
|
| 1160 | + ?><optgroup label="<?php echo geodir_utf8_ucfirst($val); ?>"><?php |
|
| 1161 | + } else if (strpos($key, 'optgroup_end-') === 0) {
|
|
| 1162 | + ?></optgroup><?php |
|
| 1163 | + } else {
|
|
| 1164 | + ?> |
|
| 1165 | 1165 | <option value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>> |
| 1166 | 1166 | <?php echo geodir_utf8_ucfirst($val) ?> |
| 1167 | 1167 | </option> |
| 1168 | 1168 | <?php |
| 1169 | - } |
|
| 1170 | - } |
|
| 1171 | - ?> |
|
| 1169 | + } |
|
| 1170 | + } |
|
| 1171 | + ?> |
|
| 1172 | 1172 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
| 1173 | 1173 | </td> |
| 1174 | 1174 | </tr><?php |
| 1175 | - break; |
|
| 1176 | - case 'file': |
|
| 1177 | - ?> |
|
| 1175 | + break; |
|
| 1176 | + case 'file': |
|
| 1177 | + ?> |
|
| 1178 | 1178 | <tr valign="top"> |
| 1179 | 1179 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1180 | 1180 | <td class="forminp"> |
@@ -1194,87 +1194,87 @@ discard block |
||
| 1194 | 1194 | <?php } ?> |
| 1195 | 1195 | </td> |
| 1196 | 1196 | </tr><?php |
| 1197 | - break; |
|
| 1198 | - case 'map_default_settings' : |
|
| 1199 | - ?> |
|
| 1197 | + break; |
|
| 1198 | + case 'map_default_settings' : |
|
| 1199 | + ?> |
|
| 1200 | 1200 | |
| 1201 | 1201 | <tr valign="top"> |
| 1202 | 1202 | <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>
|
| 1203 | 1203 | <td width="60%"> |
| 1204 | 1204 | <select name="geodir_default_map_language" style="width:60%"> |
| 1205 | 1205 | <?php |
| 1206 | - $arr_map_langages = array( |
|
| 1207 | - 'ar' => __('ARABIC', 'geodirectory'),
|
|
| 1208 | - 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1209 | - 'bg' => __('BULGARIAN', 'geodirectory'),
|
|
| 1210 | - 'bn' => __('BENGALI', 'geodirectory'),
|
|
| 1211 | - 'ca' => __('CATALAN', 'geodirectory'),
|
|
| 1212 | - 'cs' => __('CZECH', 'geodirectory'),
|
|
| 1213 | - 'da' => __('DANISH', 'geodirectory'),
|
|
| 1214 | - 'de' => __('GERMAN', 'geodirectory'),
|
|
| 1215 | - 'el' => __('GREEK', 'geodirectory'),
|
|
| 1216 | - 'en' => __('ENGLISH', 'geodirectory'),
|
|
| 1217 | - 'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),
|
|
| 1218 | - 'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),
|
|
| 1219 | - 'es' => __('SPANISH', 'geodirectory'),
|
|
| 1220 | - 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1221 | - 'fa' => __('FARSI', 'geodirectory'),
|
|
| 1222 | - 'fi' => __('FINNISH', 'geodirectory'),
|
|
| 1223 | - 'fil' => __('FILIPINO', 'geodirectory'),
|
|
| 1224 | - 'fr' => __('FRENCH', 'geodirectory'),
|
|
| 1225 | - 'gl' => __('GALICIAN', 'geodirectory'),
|
|
| 1226 | - 'gu' => __('GUJARATI', 'geodirectory'),
|
|
| 1227 | - 'hi' => __('HINDI', 'geodirectory'),
|
|
| 1228 | - 'hr' => __('CROATIAN', 'geodirectory'),
|
|
| 1229 | - 'hu' => __('HUNGARIAN', 'geodirectory'),
|
|
| 1230 | - 'id' => __('INDONESIAN', 'geodirectory'),
|
|
| 1231 | - 'it' => __('ITALIAN', 'geodirectory'),
|
|
| 1232 | - 'iw' => __('HEBREW', 'geodirectory'),
|
|
| 1233 | - 'ja' => __('JAPANESE', 'geodirectory'),
|
|
| 1234 | - 'kn' => __('KANNADA', 'geodirectory'),
|
|
| 1235 | - 'ko' => __('KOREAN', 'geodirectory'),
|
|
| 1236 | - 'lt' => __('LITHUANIAN', 'geodirectory'),
|
|
| 1237 | - 'lv' => __('LATVIAN', 'geodirectory'),
|
|
| 1238 | - 'ml' => __('MALAYALAM', 'geodirectory'),
|
|
| 1239 | - 'mr' => __('MARATHI', 'geodirectory'),
|
|
| 1240 | - 'nl' => __('DUTCH', 'geodirectory'),
|
|
| 1241 | - 'no' => __('NORWEGIAN', 'geodirectory'),
|
|
| 1242 | - 'pl' => __('POLISH', 'geodirectory'),
|
|
| 1243 | - 'pt' => __('PORTUGUESE', 'geodirectory'),
|
|
| 1244 | - 'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),
|
|
| 1245 | - 'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),
|
|
| 1246 | - 'ro' => __('ROMANIAN', 'geodirectory'),
|
|
| 1247 | - 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1248 | - 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1249 | - 'sk' => __('SLOVAK', 'geodirectory'),
|
|
| 1250 | - 'sl' => __('SLOVENIAN', 'geodirectory'),
|
|
| 1251 | - 'sr' => __('SERBIAN', 'geodirectory'),
|
|
| 1252 | - 'sv' => __(' SWEDISH', 'geodirectory'),
|
|
| 1253 | - 'tl' => __('TAGALOG', 'geodirectory'),
|
|
| 1254 | - 'ta' => __('TAMIL', 'geodirectory'),
|
|
| 1255 | - 'te' => __('TELUGU', 'geodirectory'),
|
|
| 1256 | - 'th' => __('THAI', 'geodirectory'),
|
|
| 1257 | - 'tr' => __('TURKISH', 'geodirectory'),
|
|
| 1258 | - 'uk' => __('UKRAINIAN', 'geodirectory'),
|
|
| 1259 | - 'vi' => __('VIETNAMESE', 'geodirectory'),
|
|
| 1260 | - 'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),
|
|
| 1261 | - 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),
|
|
| 1262 | - ); |
|
| 1263 | - $geodir_default_map_language = get_option('geodir_default_map_language');
|
|
| 1264 | - if (empty($geodir_default_map_language)) |
|
| 1265 | - $geodir_default_map_language = 'en'; |
|
| 1266 | - foreach ($arr_map_langages as $language_key => $language_txt) {
|
|
| 1267 | - if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) |
|
| 1268 | - $geodir_default_language_selected = "selected='selected'"; |
|
| 1269 | - else |
|
| 1270 | - $geodir_default_language_selected = ''; |
|
| 1271 | - |
|
| 1272 | - ?> |
|
| 1206 | + $arr_map_langages = array( |
|
| 1207 | + 'ar' => __('ARABIC', 'geodirectory'),
|
|
| 1208 | + 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1209 | + 'bg' => __('BULGARIAN', 'geodirectory'),
|
|
| 1210 | + 'bn' => __('BENGALI', 'geodirectory'),
|
|
| 1211 | + 'ca' => __('CATALAN', 'geodirectory'),
|
|
| 1212 | + 'cs' => __('CZECH', 'geodirectory'),
|
|
| 1213 | + 'da' => __('DANISH', 'geodirectory'),
|
|
| 1214 | + 'de' => __('GERMAN', 'geodirectory'),
|
|
| 1215 | + 'el' => __('GREEK', 'geodirectory'),
|
|
| 1216 | + 'en' => __('ENGLISH', 'geodirectory'),
|
|
| 1217 | + 'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),
|
|
| 1218 | + 'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),
|
|
| 1219 | + 'es' => __('SPANISH', 'geodirectory'),
|
|
| 1220 | + 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1221 | + 'fa' => __('FARSI', 'geodirectory'),
|
|
| 1222 | + 'fi' => __('FINNISH', 'geodirectory'),
|
|
| 1223 | + 'fil' => __('FILIPINO', 'geodirectory'),
|
|
| 1224 | + 'fr' => __('FRENCH', 'geodirectory'),
|
|
| 1225 | + 'gl' => __('GALICIAN', 'geodirectory'),
|
|
| 1226 | + 'gu' => __('GUJARATI', 'geodirectory'),
|
|
| 1227 | + 'hi' => __('HINDI', 'geodirectory'),
|
|
| 1228 | + 'hr' => __('CROATIAN', 'geodirectory'),
|
|
| 1229 | + 'hu' => __('HUNGARIAN', 'geodirectory'),
|
|
| 1230 | + 'id' => __('INDONESIAN', 'geodirectory'),
|
|
| 1231 | + 'it' => __('ITALIAN', 'geodirectory'),
|
|
| 1232 | + 'iw' => __('HEBREW', 'geodirectory'),
|
|
| 1233 | + 'ja' => __('JAPANESE', 'geodirectory'),
|
|
| 1234 | + 'kn' => __('KANNADA', 'geodirectory'),
|
|
| 1235 | + 'ko' => __('KOREAN', 'geodirectory'),
|
|
| 1236 | + 'lt' => __('LITHUANIAN', 'geodirectory'),
|
|
| 1237 | + 'lv' => __('LATVIAN', 'geodirectory'),
|
|
| 1238 | + 'ml' => __('MALAYALAM', 'geodirectory'),
|
|
| 1239 | + 'mr' => __('MARATHI', 'geodirectory'),
|
|
| 1240 | + 'nl' => __('DUTCH', 'geodirectory'),
|
|
| 1241 | + 'no' => __('NORWEGIAN', 'geodirectory'),
|
|
| 1242 | + 'pl' => __('POLISH', 'geodirectory'),
|
|
| 1243 | + 'pt' => __('PORTUGUESE', 'geodirectory'),
|
|
| 1244 | + 'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),
|
|
| 1245 | + 'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),
|
|
| 1246 | + 'ro' => __('ROMANIAN', 'geodirectory'),
|
|
| 1247 | + 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1248 | + 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1249 | + 'sk' => __('SLOVAK', 'geodirectory'),
|
|
| 1250 | + 'sl' => __('SLOVENIAN', 'geodirectory'),
|
|
| 1251 | + 'sr' => __('SERBIAN', 'geodirectory'),
|
|
| 1252 | + 'sv' => __(' SWEDISH', 'geodirectory'),
|
|
| 1253 | + 'tl' => __('TAGALOG', 'geodirectory'),
|
|
| 1254 | + 'ta' => __('TAMIL', 'geodirectory'),
|
|
| 1255 | + 'te' => __('TELUGU', 'geodirectory'),
|
|
| 1256 | + 'th' => __('THAI', 'geodirectory'),
|
|
| 1257 | + 'tr' => __('TURKISH', 'geodirectory'),
|
|
| 1258 | + 'uk' => __('UKRAINIAN', 'geodirectory'),
|
|
| 1259 | + 'vi' => __('VIETNAMESE', 'geodirectory'),
|
|
| 1260 | + 'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),
|
|
| 1261 | + 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),
|
|
| 1262 | + ); |
|
| 1263 | + $geodir_default_map_language = get_option('geodir_default_map_language');
|
|
| 1264 | + if (empty($geodir_default_map_language)) |
|
| 1265 | + $geodir_default_map_language = 'en'; |
|
| 1266 | + foreach ($arr_map_langages as $language_key => $language_txt) {
|
|
| 1267 | + if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) |
|
| 1268 | + $geodir_default_language_selected = "selected='selected'"; |
|
| 1269 | + else |
|
| 1270 | + $geodir_default_language_selected = ''; |
|
| 1271 | + |
|
| 1272 | + ?> |
|
| 1273 | 1273 | <option |
| 1274 | 1274 | value="<?php echo $language_key?>" <?php echo $geodir_default_language_selected; ?>><?php echo $language_txt; ?></option> |
| 1275 | 1275 | |
| 1276 | 1276 | <?php } |
| 1277 | - ?> |
|
| 1277 | + ?> |
|
| 1278 | 1278 | </select> |
| 1279 | 1279 | </td> |
| 1280 | 1280 | </tr> |
@@ -1285,46 +1285,46 @@ discard block |
||
| 1285 | 1285 | <td width="60%"> |
| 1286 | 1286 | <select name="geodir_default_map_search_pt" style="width:60%"> |
| 1287 | 1287 | <?php |
| 1288 | - $post_types = geodir_get_posttypes('array');
|
|
| 1289 | - $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');
|
|
| 1290 | - if (empty($geodir_default_map_search_pt)) |
|
| 1291 | - $geodir_default_map_search_pt = 'gd_place'; |
|
| 1292 | - if (is_array($post_types)) {
|
|
| 1293 | - foreach ($post_types as $key => $post_types_obj) {
|
|
| 1294 | - if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) |
|
| 1295 | - $geodir_search_pt_selected = "selected='selected'"; |
|
| 1296 | - else |
|
| 1297 | - $geodir_search_pt_selected = ''; |
|
| 1298 | - |
|
| 1299 | - ?> |
|
| 1288 | + $post_types = geodir_get_posttypes('array');
|
|
| 1289 | + $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');
|
|
| 1290 | + if (empty($geodir_default_map_search_pt)) |
|
| 1291 | + $geodir_default_map_search_pt = 'gd_place'; |
|
| 1292 | + if (is_array($post_types)) {
|
|
| 1293 | + foreach ($post_types as $key => $post_types_obj) {
|
|
| 1294 | + if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) |
|
| 1295 | + $geodir_search_pt_selected = "selected='selected'"; |
|
| 1296 | + else |
|
| 1297 | + $geodir_search_pt_selected = ''; |
|
| 1298 | + |
|
| 1299 | + ?> |
|
| 1300 | 1300 | <option |
| 1301 | 1301 | value="<?php echo $key?>" <?php echo $geodir_search_pt_selected; ?>><?php echo __($post_types_obj['labels']['singular_name'], 'geodirectory'); ?></option> |
| 1302 | 1302 | |
| 1303 | 1303 | <?php } |
| 1304 | 1304 | |
| 1305 | - } |
|
| 1305 | + } |
|
| 1306 | 1306 | |
| 1307 | - ?> |
|
| 1307 | + ?> |
|
| 1308 | 1308 | </select> |
| 1309 | 1309 | </td> |
| 1310 | 1310 | </tr> |
| 1311 | 1311 | |
| 1312 | 1312 | <?php |
| 1313 | - break; |
|
| 1313 | + break; |
|
| 1314 | 1314 | |
| 1315 | - case 'map': |
|
| 1316 | - ?> |
|
| 1315 | + case 'map': |
|
| 1316 | + ?> |
|
| 1317 | 1317 | <tr valign="top"> |
| 1318 | 1318 | <td class="forminp"> |
| 1319 | 1319 | <?php |
| 1320 | - global $post_cat, $cat_display; |
|
| 1321 | - $post_types = geodir_get_posttypes('object');
|
|
| 1322 | - $cat_display = 'checkbox'; |
|
| 1323 | - $gd_post_types = get_option('geodir_exclude_post_type_on_map');
|
|
| 1324 | - $gd_cats = get_option('geodir_exclude_cat_on_map');
|
|
| 1325 | - $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 1326 | - $count = 1; |
|
| 1327 | - ?> |
|
| 1320 | + global $post_cat, $cat_display; |
|
| 1321 | + $post_types = geodir_get_posttypes('object');
|
|
| 1322 | + $cat_display = 'checkbox'; |
|
| 1323 | + $gd_post_types = get_option('geodir_exclude_post_type_on_map');
|
|
| 1324 | + $gd_cats = get_option('geodir_exclude_cat_on_map');
|
|
| 1325 | + $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 1326 | + $count = 1; |
|
| 1327 | + ?> |
|
| 1328 | 1328 | <table width="70%" class="widefat"> |
| 1329 | 1329 | <thead> |
| 1330 | 1330 | <tr> |
@@ -1333,18 +1333,18 @@ discard block |
||
| 1333 | 1333 | <th><b><?php echo DESIGN_POST_TYPE_CAT; ?></b></th> |
| 1334 | 1334 | </tr> |
| 1335 | 1335 | <?php |
| 1336 | - $gd_categs = $gd_cats; |
|
| 1337 | - foreach ($post_types as $key => $post_types_obj) : |
|
| 1338 | - $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : ''; |
|
| 1339 | - $gd_taxonomy = geodir_get_taxonomies($key); |
|
| 1340 | - if ($gd_cats_upgrade) {
|
|
| 1341 | - $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : ''; |
|
| 1342 | - $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array(); |
|
| 1343 | - $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array(); |
|
| 1344 | - } |
|
| 1345 | - $post_cat = implode(',', $gd_cats);
|
|
| 1346 | - $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy); |
|
| 1347 | - ?> |
|
| 1336 | + $gd_categs = $gd_cats; |
|
| 1337 | + foreach ($post_types as $key => $post_types_obj) : |
|
| 1338 | + $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : ''; |
|
| 1339 | + $gd_taxonomy = geodir_get_taxonomies($key); |
|
| 1340 | + if ($gd_cats_upgrade) {
|
|
| 1341 | + $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : ''; |
|
| 1342 | + $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array(); |
|
| 1343 | + $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array(); |
|
| 1344 | + } |
|
| 1345 | + $post_cat = implode(',', $gd_cats);
|
|
| 1346 | + $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy); |
|
| 1347 | + ?> |
|
| 1348 | 1348 | <tr> |
| 1349 | 1349 | <td valign="top" width="5%"><?php echo $count; ?></td> |
| 1350 | 1350 | <td valign="top" width="25%" id="td_post_types"><input type="checkbox" |
@@ -1365,19 +1365,19 @@ discard block |
||
| 1365 | 1365 | </td> |
| 1366 | 1366 | </tr> |
| 1367 | 1367 | <?php |
| 1368 | - break; |
|
| 1368 | + break; |
|
| 1369 | 1369 | |
| 1370 | - case 'checkbox' : |
|
| 1370 | + case 'checkbox' : |
|
| 1371 | 1371 | |
| 1372 | - if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) : |
|
| 1373 | - ?> |
|
| 1372 | + if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) : |
|
| 1373 | + ?> |
|
| 1374 | 1374 | <tr valign="top"> |
| 1375 | 1375 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1376 | 1376 | <td class="forminp"> |
| 1377 | 1377 | <?php |
| 1378 | - endif; |
|
| 1378 | + endif; |
|
| 1379 | 1379 | |
| 1380 | - ?> |
|
| 1380 | + ?> |
|
| 1381 | 1381 | <fieldset> |
| 1382 | 1382 | <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend> |
| 1383 | 1383 | <label for="<?php echo $value['id'] ?>"> |
@@ -1387,49 +1387,49 @@ discard block |
||
| 1387 | 1387 | </fieldset> |
| 1388 | 1388 | <?php |
| 1389 | 1389 | |
| 1390 | - if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) : |
|
| 1391 | - ?> |
|
| 1390 | + if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) : |
|
| 1391 | + ?> |
|
| 1392 | 1392 | </td> |
| 1393 | 1393 | </tr> |
| 1394 | 1394 | <?php |
| 1395 | - endif; |
|
| 1395 | + endif; |
|
| 1396 | 1396 | |
| 1397 | - break; |
|
| 1397 | + break; |
|
| 1398 | 1398 | |
| 1399 | - case 'radio' : |
|
| 1399 | + case 'radio' : |
|
| 1400 | 1400 | |
| 1401 | - if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) : |
|
| 1402 | - ?> |
|
| 1401 | + if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) : |
|
| 1402 | + ?> |
|
| 1403 | 1403 | <tr valign="top"> |
| 1404 | 1404 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1405 | 1405 | <td class="forminp"> |
| 1406 | 1406 | <?php |
| 1407 | - endif; |
|
| 1407 | + endif; |
|
| 1408 | 1408 | |
| 1409 | - ?> |
|
| 1409 | + ?> |
|
| 1410 | 1410 | <fieldset> |
| 1411 | 1411 | <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend> |
| 1412 | 1412 | <label for="<?php echo $value['id'];?>"> |
| 1413 | 1413 | <input name="<?php echo esc_attr($value['id']); ?>" |
| 1414 | 1414 | id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio" |
| 1415 | 1415 | value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {
|
| 1416 | - echo 'checked="checked"'; |
|
| 1417 | - }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
|
|
| 1416 | + echo 'checked="checked"'; |
|
| 1417 | + }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
|
|
| 1418 | 1418 | <?php echo $value['desc']; ?></label><br> |
| 1419 | 1419 | </fieldset> |
| 1420 | 1420 | <?php |
| 1421 | 1421 | |
| 1422 | - if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) : |
|
| 1423 | - ?> |
|
| 1422 | + if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) : |
|
| 1423 | + ?> |
|
| 1424 | 1424 | </td> |
| 1425 | 1425 | </tr> |
| 1426 | 1426 | <?php |
| 1427 | - endif; |
|
| 1427 | + endif; |
|
| 1428 | 1428 | |
| 1429 | - break; |
|
| 1429 | + break; |
|
| 1430 | 1430 | |
| 1431 | - case 'textarea': |
|
| 1432 | - ?> |
|
| 1431 | + case 'textarea': |
|
| 1432 | + ?> |
|
| 1433 | 1433 | <tr valign="top"> |
| 1434 | 1434 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1435 | 1435 | <td class="forminp"> |
@@ -1442,30 +1442,30 @@ discard block |
||
| 1442 | 1442 | |
| 1443 | 1443 | </td> |
| 1444 | 1444 | </tr><?php |
| 1445 | - break; |
|
| 1445 | + break; |
|
| 1446 | 1446 | |
| 1447 | - case 'editor': |
|
| 1448 | - ?> |
|
| 1447 | + case 'editor': |
|
| 1448 | + ?> |
|
| 1449 | 1449 | <tr valign="top"> |
| 1450 | 1450 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1451 | 1451 | <td class="forminp"><?php |
| 1452 | - if (get_option($value['id'])) |
|
| 1453 | - $content = stripslashes(get_option($value['id'])); |
|
| 1454 | - else |
|
| 1455 | - $content = $value['std']; |
|
| 1452 | + if (get_option($value['id'])) |
|
| 1453 | + $content = stripslashes(get_option($value['id'])); |
|
| 1454 | + else |
|
| 1455 | + $content = $value['std']; |
|
| 1456 | 1456 | |
| 1457 | - $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
|
|
| 1457 | + $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
|
|
| 1458 | 1458 | |
| 1459 | - wp_editor($content, esc_attr($value['id']), $editor_settings); |
|
| 1459 | + wp_editor($content, esc_attr($value['id']), $editor_settings); |
|
| 1460 | 1460 | |
| 1461 | - ?> <span class="description"><?php echo $value['desc'] ?></span> |
|
| 1461 | + ?> <span class="description"><?php echo $value['desc'] ?></span> |
|
| 1462 | 1462 | |
| 1463 | 1463 | </td> |
| 1464 | 1464 | </tr><?php |
| 1465 | - break; |
|
| 1465 | + break; |
|
| 1466 | 1466 | |
| 1467 | - case 'single_select_page' : |
|
| 1468 | - // WPML |
|
| 1467 | + case 'single_select_page' : |
|
| 1468 | + // WPML |
|
| 1469 | 1469 | $switch_lang = false; |
| 1470 | 1470 | $disabled = ''; |
| 1471 | 1471 | if (geodir_is_wpml() && isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {
|
@@ -1483,18 +1483,18 @@ discard block |
||
| 1483 | 1483 | // |
| 1484 | 1484 | $page_setting = (int)get_option($value['id']); |
| 1485 | 1485 | |
| 1486 | - $args = array('name' => $value['id'],
|
|
| 1487 | - 'id' => $value['id'], |
|
| 1488 | - 'sort_column' => 'menu_order', |
|
| 1489 | - 'sort_order' => 'ASC', |
|
| 1490 | - 'show_option_none' => ' ', |
|
| 1491 | - 'class' => $value['class'], |
|
| 1492 | - 'echo' => false, |
|
| 1493 | - 'selected' => $page_setting); |
|
| 1486 | + $args = array('name' => $value['id'],
|
|
| 1487 | + 'id' => $value['id'], |
|
| 1488 | + 'sort_column' => 'menu_order', |
|
| 1489 | + 'sort_order' => 'ASC', |
|
| 1490 | + 'show_option_none' => ' ', |
|
| 1491 | + 'class' => $value['class'], |
|
| 1492 | + 'echo' => false, |
|
| 1493 | + 'selected' => $page_setting); |
|
| 1494 | 1494 | |
| 1495 | - if (isset($value['args'])) $args = wp_parse_args($value['args'], $args); |
|
| 1495 | + if (isset($value['args'])) $args = wp_parse_args($value['args'], $args); |
|
| 1496 | 1496 | |
| 1497 | - ?> |
|
| 1497 | + ?> |
|
| 1498 | 1498 | <tr valign="top" class="single_select_page"> |
| 1499 | 1499 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1500 | 1500 | <td class="forminp"> |
@@ -1505,17 +1505,17 @@ discard block |
||
| 1505 | 1505 | if ($switch_lang) {
|
| 1506 | 1506 | $sitepress->switch_lang($switch_lang, true); |
| 1507 | 1507 | } |
| 1508 | - break; |
|
| 1509 | - case 'single_select_country' : |
|
| 1510 | - $country_setting = (string)get_option($value['id']); |
|
| 1511 | - if (strstr($country_setting, ':')) : |
|
| 1512 | - $country = current(explode(':', $country_setting));
|
|
| 1513 | - $state = end(explode(':', $country_setting));
|
|
| 1514 | - else : |
|
| 1515 | - $country = $country_setting; |
|
| 1516 | - $state = '*'; |
|
| 1517 | - endif; |
|
| 1518 | - ?> |
|
| 1508 | + break; |
|
| 1509 | + case 'single_select_country' : |
|
| 1510 | + $country_setting = (string)get_option($value['id']); |
|
| 1511 | + if (strstr($country_setting, ':')) : |
|
| 1512 | + $country = current(explode(':', $country_setting));
|
|
| 1513 | + $state = end(explode(':', $country_setting));
|
|
| 1514 | + else : |
|
| 1515 | + $country = $country_setting; |
|
| 1516 | + $state = '*'; |
|
| 1517 | + endif; |
|
| 1518 | + ?> |
|
| 1519 | 1519 | <tr valign="top"> |
| 1520 | 1520 | <th scope="rpw" class="titledesc"><?php echo $value['name'] ?></th> |
| 1521 | 1521 | <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>" |
@@ -1526,12 +1526,12 @@ discard block |
||
| 1526 | 1526 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
| 1527 | 1527 | </td> |
| 1528 | 1528 | </tr><?php |
| 1529 | - break; |
|
| 1530 | - case 'multi_select_countries' : |
|
| 1531 | - $countries = $geodirectory->countries->countries; |
|
| 1532 | - asort($countries); |
|
| 1533 | - $selections = (array)get_option($value['id']); |
|
| 1534 | - ?> |
|
| 1529 | + break; |
|
| 1530 | + case 'multi_select_countries' : |
|
| 1531 | + $countries = $geodirectory->countries->countries; |
|
| 1532 | + asort($countries); |
|
| 1533 | + $selections = (array)get_option($value['id']); |
|
| 1534 | + ?> |
|
| 1535 | 1535 | <tr valign="top"> |
| 1536 | 1536 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1537 | 1537 | <td class="forminp"> |
@@ -1539,21 +1539,21 @@ discard block |
||
| 1539 | 1539 | data-placeholder="<?php _e('Choose countries…', 'geodirectory'); ?>"
|
| 1540 | 1540 | title="Country" class="chosen_select"> |
| 1541 | 1541 | <?php |
| 1542 | - if ($countries) foreach ($countries as $key => $val) : |
|
| 1543 | - echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
| 1544 | - endforeach; |
|
| 1545 | - ?> |
|
| 1542 | + if ($countries) foreach ($countries as $key => $val) : |
|
| 1543 | + echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
| 1544 | + endforeach; |
|
| 1545 | + ?> |
|
| 1546 | 1546 | </select> |
| 1547 | 1547 | </td> |
| 1548 | 1548 | </tr> |
| 1549 | 1549 | |
| 1550 | 1550 | <?php |
| 1551 | 1551 | |
| 1552 | - break; |
|
| 1552 | + break; |
|
| 1553 | 1553 | |
| 1554 | - case 'google_analytics' : |
|
| 1555 | - $selections = (array)get_option($value['id']); |
|
| 1556 | - ?> |
|
| 1554 | + case 'google_analytics' : |
|
| 1555 | + $selections = (array)get_option($value['id']); |
|
| 1556 | + ?> |
|
| 1557 | 1557 | <tr valign="top"> |
| 1558 | 1558 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1559 | 1559 | <td class="forminp"> |
@@ -1561,62 +1561,62 @@ discard block |
||
| 1561 | 1561 | |
| 1562 | 1562 | <?php |
| 1563 | 1563 | |
| 1564 | - $oAuthURL = "https://accounts.google.com/o/oauth2/auth?"; |
|
| 1565 | - $scope = "scope=https://www.googleapis.com/auth/analytics.readonly"; |
|
| 1566 | - $state = "&state=123";//any string |
|
| 1567 | - $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 1568 | - $response_type = "&response_type=code"; |
|
| 1569 | - $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
| 1570 | - $access_type = "&access_type=offline"; |
|
| 1571 | - $approval_prompt = "&approval_prompt=force"; |
|
| 1564 | + $oAuthURL = "https://accounts.google.com/o/oauth2/auth?"; |
|
| 1565 | + $scope = "scope=https://www.googleapis.com/auth/analytics.readonly"; |
|
| 1566 | + $state = "&state=123";//any string |
|
| 1567 | + $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 1568 | + $response_type = "&response_type=code"; |
|
| 1569 | + $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
| 1570 | + $access_type = "&access_type=offline"; |
|
| 1571 | + $approval_prompt = "&approval_prompt=force"; |
|
| 1572 | 1572 | |
| 1573 | - $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt; |
|
| 1573 | + $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt; |
|
| 1574 | 1574 | |
| 1575 | 1575 | |
| 1576 | - if (get_option('geodir_ga_auth_token')) {
|
|
| 1577 | - ?> |
|
| 1576 | + if (get_option('geodir_ga_auth_token')) {
|
|
| 1577 | + ?> |
|
| 1578 | 1578 | <span class="button-primary" |
| 1579 | 1579 | onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize');?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>
|
| 1580 | 1580 | <span style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>
|
| 1581 | 1581 | <?php |
| 1582 | - global $gd_ga_errors; |
|
| 1583 | - if(!empty($gd_ga_errors)){
|
|
| 1584 | - print_r($gd_ga_errors); |
|
| 1585 | - } |
|
| 1586 | - } else {
|
|
| 1587 | - ?> |
|
| 1582 | + global $gd_ga_errors; |
|
| 1583 | + if(!empty($gd_ga_errors)){
|
|
| 1584 | + print_r($gd_ga_errors); |
|
| 1585 | + } |
|
| 1586 | + } else {
|
|
| 1587 | + ?> |
|
| 1588 | 1588 | <span class="button-primary" |
| 1589 | 1589 | onclick="window.open('<?php echo geodir_ga_activation_url();?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory');?></span>
|
| 1590 | 1590 | <?php |
| 1591 | - } |
|
| 1592 | - ?> |
|
| 1591 | + } |
|
| 1592 | + ?> |
|
| 1593 | 1593 | </td> |
| 1594 | 1594 | </tr> |
| 1595 | 1595 | |
| 1596 | 1596 | <?php |
| 1597 | 1597 | |
| 1598 | 1598 | |
| 1599 | - break; |
|
| 1599 | + break; |
|
| 1600 | 1600 | |
| 1601 | - case 'field_seperator' : |
|
| 1601 | + case 'field_seperator' : |
|
| 1602 | 1602 | |
| 1603 | - ?> |
|
| 1603 | + ?> |
|
| 1604 | 1604 | <tr valign="top"> |
| 1605 | 1605 | <td colspan="2" class="forminp geodir_line_seperator"></td> |
| 1606 | 1606 | </tr> |
| 1607 | 1607 | <?php |
| 1608 | 1608 | |
| 1609 | - break; |
|
| 1609 | + break; |
|
| 1610 | 1610 | |
| 1611 | - endswitch; |
|
| 1611 | + endswitch; |
|
| 1612 | 1612 | |
| 1613 | - endforeach; |
|
| 1613 | + endforeach; |
|
| 1614 | 1614 | |
| 1615 | - if ($first_title === false) {
|
|
| 1616 | - echo "</div>"; |
|
| 1617 | - } |
|
| 1615 | + if ($first_title === false) {
|
|
| 1616 | + echo "</div>"; |
|
| 1617 | + } |
|
| 1618 | 1618 | |
| 1619 | - ?> |
|
| 1619 | + ?> |
|
| 1620 | 1620 | |
| 1621 | 1621 | <script type="text/javascript"> |
| 1622 | 1622 | |
@@ -1676,33 +1676,33 @@ discard block |
||
| 1676 | 1676 | */ |
| 1677 | 1677 | function geodir_post_info_setting() |
| 1678 | 1678 | {
|
| 1679 | - global $post, $post_id; |
|
| 1680 | - |
|
| 1681 | - $post_type = get_post_type(); |
|
| 1682 | - |
|
| 1683 | - $package_info = array(); |
|
| 1684 | - |
|
| 1685 | - $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1686 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename'); |
|
| 1687 | - echo '<div id="geodir_wrapper">'; |
|
| 1688 | - /** |
|
| 1689 | - * Called before the GD custom fields are output in the wp-admin area. |
|
| 1690 | - * |
|
| 1691 | - * @since 1.0.0 |
|
| 1692 | - * @see 'geodir_after_default_field_in_meta_box' |
|
| 1693 | - */ |
|
| 1694 | - do_action('geodir_before_default_field_in_meta_box');
|
|
| 1695 | - //geodir_get_custom_fields_html($package_info->pid,'default',$post_type); |
|
| 1696 | - // to display all fields in one information box |
|
| 1697 | - geodir_get_custom_fields_html($package_info->pid, 'all', $post_type); |
|
| 1698 | - /** |
|
| 1699 | - * Called after the GD custom fields are output in the wp-admin area. |
|
| 1700 | - * |
|
| 1701 | - * @since 1.0.0 |
|
| 1702 | - * @see 'geodir_before_default_field_in_meta_box' |
|
| 1703 | - */ |
|
| 1704 | - do_action('geodir_after_default_field_in_meta_box');
|
|
| 1705 | - echo '</div>'; |
|
| 1679 | + global $post, $post_id; |
|
| 1680 | + |
|
| 1681 | + $post_type = get_post_type(); |
|
| 1682 | + |
|
| 1683 | + $package_info = array(); |
|
| 1684 | + |
|
| 1685 | + $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1686 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename'); |
|
| 1687 | + echo '<div id="geodir_wrapper">'; |
|
| 1688 | + /** |
|
| 1689 | + * Called before the GD custom fields are output in the wp-admin area. |
|
| 1690 | + * |
|
| 1691 | + * @since 1.0.0 |
|
| 1692 | + * @see 'geodir_after_default_field_in_meta_box' |
|
| 1693 | + */ |
|
| 1694 | + do_action('geodir_before_default_field_in_meta_box');
|
|
| 1695 | + //geodir_get_custom_fields_html($package_info->pid,'default',$post_type); |
|
| 1696 | + // to display all fields in one information box |
|
| 1697 | + geodir_get_custom_fields_html($package_info->pid, 'all', $post_type); |
|
| 1698 | + /** |
|
| 1699 | + * Called after the GD custom fields are output in the wp-admin area. |
|
| 1700 | + * |
|
| 1701 | + * @since 1.0.0 |
|
| 1702 | + * @see 'geodir_before_default_field_in_meta_box' |
|
| 1703 | + */ |
|
| 1704 | + do_action('geodir_after_default_field_in_meta_box');
|
|
| 1705 | + echo '</div>'; |
|
| 1706 | 1706 | } |
| 1707 | 1707 | |
| 1708 | 1708 | /** |
@@ -1715,18 +1715,18 @@ discard block |
||
| 1715 | 1715 | */ |
| 1716 | 1716 | function geodir_post_addinfo_setting() |
| 1717 | 1717 | {
|
| 1718 | - global $post, $post_id; |
|
| 1718 | + global $post, $post_id; |
|
| 1719 | 1719 | |
| 1720 | - $post_type = get_post_type(); |
|
| 1720 | + $post_type = get_post_type(); |
|
| 1721 | 1721 | |
| 1722 | - $package_info = array(); |
|
| 1722 | + $package_info = array(); |
|
| 1723 | 1723 | |
| 1724 | - $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1724 | + $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1725 | 1725 | |
| 1726 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename'); |
|
| 1727 | - echo '<div id="geodir_wrapper">'; |
|
| 1728 | - geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type); |
|
| 1729 | - echo '</div>'; |
|
| 1726 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename'); |
|
| 1727 | + echo '<div id="geodir_wrapper">'; |
|
| 1728 | + geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type); |
|
| 1729 | + echo '</div>'; |
|
| 1730 | 1730 | |
| 1731 | 1731 | } |
| 1732 | 1732 | |
@@ -1740,60 +1740,60 @@ discard block |
||
| 1740 | 1740 | */ |
| 1741 | 1741 | function geodir_post_attachments() |
| 1742 | 1742 | {
|
| 1743 | - global $post, $post_id; |
|
| 1743 | + global $post, $post_id; |
|
| 1744 | 1744 | |
| 1745 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename'); |
|
| 1745 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename'); |
|
| 1746 | 1746 | |
| 1747 | - if (geodir_get_featured_image($post_id, 'thumbnail')) {
|
|
| 1748 | - echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
|
|
| 1749 | - geodir_show_featured_image($post_id, 'thumbnail'); |
|
| 1750 | - } |
|
| 1747 | + if (geodir_get_featured_image($post_id, 'thumbnail')) {
|
|
| 1748 | + echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
|
|
| 1749 | + geodir_show_featured_image($post_id, 'thumbnail'); |
|
| 1750 | + } |
|
| 1751 | 1751 | |
| 1752 | - $image_limit = 0; |
|
| 1752 | + $image_limit = 0; |
|
| 1753 | 1753 | |
| 1754 | - ?> |
|
| 1754 | + ?> |
|
| 1755 | 1755 | |
| 1756 | 1756 | |
| 1757 | 1757 | <h5 class="form_title"> |
| 1758 | 1758 | <?php if ($image_limit != 0 && $image_limit == 1) {
|
| 1759 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 1760 | - } ?> |
|
| 1759 | + echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 1760 | + } ?> |
|
| 1761 | 1761 | <?php if ($image_limit != 0 && $image_limit > 1) {
|
| 1762 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 1763 | - } ?> |
|
| 1762 | + echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 1763 | + } ?> |
|
| 1764 | 1764 | <?php if ($image_limit == 0) {
|
| 1765 | - echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 1766 | - } ?> |
|
| 1765 | + echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 1766 | + } ?> |
|
| 1767 | 1767 | </h5> |
| 1768 | 1768 | |
| 1769 | 1769 | |
| 1770 | 1770 | <?php |
| 1771 | 1771 | |
| 1772 | - $curImages = geodir_get_images($post_id); |
|
| 1773 | - $place_img_array = array(); |
|
| 1772 | + $curImages = geodir_get_images($post_id); |
|
| 1773 | + $place_img_array = array(); |
|
| 1774 | 1774 | |
| 1775 | - if (!empty($curImages)): |
|
| 1776 | - foreach ($curImages as $p_img): |
|
| 1777 | - $place_img_array[] = $p_img->src; |
|
| 1778 | - endforeach; |
|
| 1779 | - endif; |
|
| 1775 | + if (!empty($curImages)): |
|
| 1776 | + foreach ($curImages as $p_img): |
|
| 1777 | + $place_img_array[] = $p_img->src; |
|
| 1778 | + endforeach; |
|
| 1779 | + endif; |
|
| 1780 | 1780 | |
| 1781 | - if (!empty($place_img_array)) |
|
| 1782 | - $curImages = implode(',', $place_img_array);
|
|
| 1781 | + if (!empty($place_img_array)) |
|
| 1782 | + $curImages = implode(',', $place_img_array);
|
|
| 1783 | 1783 | |
| 1784 | 1784 | |
| 1785 | - // adjust values here |
|
| 1786 | - $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls |
|
| 1785 | + // adjust values here |
|
| 1786 | + $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls |
|
| 1787 | 1787 | |
| 1788 | - $svalue = $curImages; // this will be initial value of the above form field. Image urls. |
|
| 1788 | + $svalue = $curImages; // this will be initial value of the above form field. Image urls. |
|
| 1789 | 1789 | |
| 1790 | - $multiple = true; // allow multiple files upload |
|
| 1790 | + $multiple = true; // allow multiple files upload |
|
| 1791 | 1791 | |
| 1792 | - $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels) |
|
| 1792 | + $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels) |
|
| 1793 | 1793 | |
| 1794 | - $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels) |
|
| 1794 | + $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels) |
|
| 1795 | 1795 | |
| 1796 | - ?> |
|
| 1796 | + ?> |
|
| 1797 | 1797 | |
| 1798 | 1798 | <div class="gtd-form_row clearfix" id="<?php echo $id; ?>dropbox" style="border:1px solid #999999;padding:5px;text-align:center;"> |
| 1799 | 1799 | <input type="hidden" name="<?php echo $id; ?>" id="<?php echo $id; ?>" value="<?php echo $svalue; ?>"/> |
@@ -1835,13 +1835,13 @@ discard block |
||
| 1835 | 1835 | */ |
| 1836 | 1836 | function geodir_action_post_updated($post_ID, $post_after, $post_before) |
| 1837 | 1837 | {
|
| 1838 | - $post_type = get_post_type($post_ID); |
|
| 1838 | + $post_type = get_post_type($post_ID); |
|
| 1839 | 1839 | |
| 1840 | - if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
|
| 1841 | - if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {
|
|
| 1842 | - geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title); |
|
| 1843 | - } |
|
| 1844 | - } |
|
| 1840 | + if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
|
| 1841 | + if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {
|
|
| 1842 | + geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title); |
|
| 1843 | + } |
|
| 1844 | + } |
|
| 1845 | 1845 | } |
| 1846 | 1846 | |
| 1847 | 1847 | /** |
@@ -1856,39 +1856,39 @@ discard block |
||
| 1856 | 1856 | */ |
| 1857 | 1857 | function geodir_notification_add_bcc_option($settings) |
| 1858 | 1858 | {
|
| 1859 | - if (!empty($settings)) {
|
|
| 1860 | - $new_settings = array(); |
|
| 1861 | - foreach ($settings as $setting) {
|
|
| 1862 | - if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {
|
|
| 1863 | - $geodir_bcc_listing_published_yes = array( |
|
| 1864 | - 'name' => __('Listing published', 'geodirectory'),
|
|
| 1865 | - 'desc' => __('Yes', 'geodirectory'),
|
|
| 1866 | - 'id' => 'geodir_bcc_listing_published', |
|
| 1867 | - 'std' => 'yes', |
|
| 1868 | - 'type' => 'radio', |
|
| 1869 | - 'value' => '1', |
|
| 1870 | - 'radiogroup' => 'start' |
|
| 1871 | - ); |
|
| 1872 | - |
|
| 1873 | - $geodir_bcc_listing_published_no = array( |
|
| 1874 | - 'name' => __('Listing published', 'geodirectory'),
|
|
| 1875 | - 'desc' => __('No', 'geodirectory'),
|
|
| 1876 | - 'id' => 'geodir_bcc_listing_published', |
|
| 1877 | - 'std' => 'yes', |
|
| 1878 | - 'type' => 'radio', |
|
| 1879 | - 'value' => '0', |
|
| 1880 | - 'radiogroup' => 'end' |
|
| 1881 | - ); |
|
| 1882 | - |
|
| 1883 | - $new_settings[] = $geodir_bcc_listing_published_yes; |
|
| 1884 | - $new_settings[] = $geodir_bcc_listing_published_no; |
|
| 1885 | - } |
|
| 1886 | - $new_settings[] = $setting; |
|
| 1887 | - } |
|
| 1888 | - $settings = $new_settings; |
|
| 1889 | - } |
|
| 1859 | + if (!empty($settings)) {
|
|
| 1860 | + $new_settings = array(); |
|
| 1861 | + foreach ($settings as $setting) {
|
|
| 1862 | + if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {
|
|
| 1863 | + $geodir_bcc_listing_published_yes = array( |
|
| 1864 | + 'name' => __('Listing published', 'geodirectory'),
|
|
| 1865 | + 'desc' => __('Yes', 'geodirectory'),
|
|
| 1866 | + 'id' => 'geodir_bcc_listing_published', |
|
| 1867 | + 'std' => 'yes', |
|
| 1868 | + 'type' => 'radio', |
|
| 1869 | + 'value' => '1', |
|
| 1870 | + 'radiogroup' => 'start' |
|
| 1871 | + ); |
|
| 1872 | + |
|
| 1873 | + $geodir_bcc_listing_published_no = array( |
|
| 1874 | + 'name' => __('Listing published', 'geodirectory'),
|
|
| 1875 | + 'desc' => __('No', 'geodirectory'),
|
|
| 1876 | + 'id' => 'geodir_bcc_listing_published', |
|
| 1877 | + 'std' => 'yes', |
|
| 1878 | + 'type' => 'radio', |
|
| 1879 | + 'value' => '0', |
|
| 1880 | + 'radiogroup' => 'end' |
|
| 1881 | + ); |
|
| 1882 | + |
|
| 1883 | + $new_settings[] = $geodir_bcc_listing_published_yes; |
|
| 1884 | + $new_settings[] = $geodir_bcc_listing_published_no; |
|
| 1885 | + } |
|
| 1886 | + $new_settings[] = $setting; |
|
| 1887 | + } |
|
| 1888 | + $settings = $new_settings; |
|
| 1889 | + } |
|
| 1890 | 1890 | |
| 1891 | - return $settings; |
|
| 1891 | + return $settings; |
|
| 1892 | 1892 | } |
| 1893 | 1893 | |
| 1894 | 1894 | |
@@ -1903,19 +1903,19 @@ discard block |
||
| 1903 | 1903 | */ |
| 1904 | 1904 | function get_gd_theme_compat_callback() |
| 1905 | 1905 | {
|
| 1906 | - global $wpdb; |
|
| 1907 | - $themes = get_option('gd_theme_compats');
|
|
| 1908 | - |
|
| 1909 | - if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {
|
|
| 1910 | - if (isset($_POST['export'])) {
|
|
| 1911 | - echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']])); |
|
| 1912 | - } else {
|
|
| 1913 | - echo json_encode($themes[$_POST['theme']]); |
|
| 1914 | - } |
|
| 1906 | + global $wpdb; |
|
| 1907 | + $themes = get_option('gd_theme_compats');
|
|
| 1915 | 1908 | |
| 1916 | - } |
|
| 1909 | + if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {
|
|
| 1910 | + if (isset($_POST['export'])) {
|
|
| 1911 | + echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']])); |
|
| 1912 | + } else {
|
|
| 1913 | + echo json_encode($themes[$_POST['theme']]); |
|
| 1914 | + } |
|
| 1915 | + |
|
| 1916 | + } |
|
| 1917 | 1917 | |
| 1918 | - die(); |
|
| 1918 | + die(); |
|
| 1919 | 1919 | } |
| 1920 | 1920 | |
| 1921 | 1921 | add_action('wp_ajax_get_gd_theme_compat_import_callback', 'get_gd_theme_compat_import_callback');
|
@@ -1929,20 +1929,20 @@ discard block |
||
| 1929 | 1929 | */ |
| 1930 | 1930 | function get_gd_theme_compat_import_callback() |
| 1931 | 1931 | {
|
| 1932 | - global $wpdb; |
|
| 1933 | - $themes = get_option('gd_theme_compats');
|
|
| 1934 | - if (isset($_POST['theme']) && !empty($_POST['theme'])) {
|
|
| 1935 | - $json = json_decode(stripslashes($_POST['theme']), true); |
|
| 1936 | - if (!empty($json) && is_array($json)) {
|
|
| 1937 | - $key = sanitize_text_field(key($json)); |
|
| 1938 | - $themes[$key] = $json[$key]; |
|
| 1939 | - update_option('gd_theme_compats', $themes);
|
|
| 1940 | - echo $key; |
|
| 1941 | - die(); |
|
| 1942 | - } |
|
| 1943 | - } |
|
| 1944 | - echo '0'; |
|
| 1945 | - die(); |
|
| 1932 | + global $wpdb; |
|
| 1933 | + $themes = get_option('gd_theme_compats');
|
|
| 1934 | + if (isset($_POST['theme']) && !empty($_POST['theme'])) {
|
|
| 1935 | + $json = json_decode(stripslashes($_POST['theme']), true); |
|
| 1936 | + if (!empty($json) && is_array($json)) {
|
|
| 1937 | + $key = sanitize_text_field(key($json)); |
|
| 1938 | + $themes[$key] = $json[$key]; |
|
| 1939 | + update_option('gd_theme_compats', $themes);
|
|
| 1940 | + echo $key; |
|
| 1941 | + die(); |
|
| 1942 | + } |
|
| 1943 | + } |
|
| 1944 | + echo '0'; |
|
| 1945 | + die(); |
|
| 1946 | 1946 | } |
| 1947 | 1947 | |
| 1948 | 1948 | |
@@ -1955,39 +1955,39 @@ discard block |
||
| 1955 | 1955 | */ |
| 1956 | 1956 | function gd_set_theme_compat() |
| 1957 | 1957 | {
|
| 1958 | - global $wpdb; |
|
| 1959 | - $theme = wp_get_theme(); |
|
| 1958 | + global $wpdb; |
|
| 1959 | + $theme = wp_get_theme(); |
|
| 1960 | 1960 | |
| 1961 | - if ($theme->parent()) {
|
|
| 1962 | - $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));
|
|
| 1963 | - } else {
|
|
| 1964 | - $theme_name = str_replace(" ", "_", $theme->get('Name'));
|
|
| 1965 | - } |
|
| 1961 | + if ($theme->parent()) {
|
|
| 1962 | + $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));
|
|
| 1963 | + } else {
|
|
| 1964 | + $theme_name = str_replace(" ", "_", $theme->get('Name'));
|
|
| 1965 | + } |
|
| 1966 | 1966 | |
| 1967 | - $theme_compats = get_option('gd_theme_compats');
|
|
| 1968 | - $current_compat = get_option('gd_theme_compat');
|
|
| 1969 | - $current_compat = str_replace("_custom", "", $current_compat);
|
|
| 1967 | + $theme_compats = get_option('gd_theme_compats');
|
|
| 1968 | + $current_compat = get_option('gd_theme_compat');
|
|
| 1969 | + $current_compat = str_replace("_custom", "", $current_compat);
|
|
| 1970 | 1970 | |
| 1971 | - if ($current_compat == $theme_name && strpos(get_option('gd_theme_compat'), "_custom") !== false) {
|
|
| 1972 | - return; |
|
| 1973 | - }// if already running correct compat then bail |
|
| 1971 | + if ($current_compat == $theme_name && strpos(get_option('gd_theme_compat'), "_custom") !== false) {
|
|
| 1972 | + return; |
|
| 1973 | + }// if already running correct compat then bail |
|
| 1974 | 1974 | |
| 1975 | - if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it
|
|
| 1976 | - update_option('gd_theme_compat', $theme_name);
|
|
| 1977 | - update_option('theme_compatibility_setting', $theme_compats[$theme_name]);
|
|
| 1975 | + if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it
|
|
| 1976 | + update_option('gd_theme_compat', $theme_name);
|
|
| 1977 | + update_option('theme_compatibility_setting', $theme_compats[$theme_name]);
|
|
| 1978 | 1978 | |
| 1979 | - // if there are default options to set then set them |
|
| 1980 | - if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {
|
|
| 1979 | + // if there are default options to set then set them |
|
| 1980 | + if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {
|
|
| 1981 | 1981 | |
| 1982 | - foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {
|
|
| 1983 | - update_option($key, $val); |
|
| 1984 | - } |
|
| 1985 | - } |
|
| 1982 | + foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {
|
|
| 1983 | + update_option($key, $val); |
|
| 1984 | + } |
|
| 1985 | + } |
|
| 1986 | 1986 | |
| 1987 | - } else {
|
|
| 1988 | - update_option('gd_theme_compat', '');
|
|
| 1989 | - update_option('theme_compatibility_setting', '');
|
|
| 1990 | - } |
|
| 1987 | + } else {
|
|
| 1988 | + update_option('gd_theme_compat', '');
|
|
| 1989 | + update_option('theme_compatibility_setting', '');
|
|
| 1990 | + } |
|
| 1991 | 1991 | |
| 1992 | 1992 | |
| 1993 | 1993 | } |
@@ -2002,9 +2002,9 @@ discard block |
||
| 2002 | 2002 | */ |
| 2003 | 2003 | function gd_check_avada_compat() |
| 2004 | 2004 | {
|
| 2005 | - if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {
|
|
| 2006 | - add_action('admin_notices', 'gd_avada_compat_warning');
|
|
| 2007 | - } |
|
| 2005 | + if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {
|
|
| 2006 | + add_action('admin_notices', 'gd_avada_compat_warning');
|
|
| 2007 | + } |
|
| 2008 | 2008 | } |
| 2009 | 2009 | |
| 2010 | 2010 | |
@@ -2017,22 +2017,22 @@ discard block |
||
| 2017 | 2017 | function gd_avada_compat_warning() |
| 2018 | 2018 | {
|
| 2019 | 2019 | |
| 2020 | - /* |
|
| 2020 | + /* |
|
| 2021 | 2021 | $msg_type = error |
| 2022 | 2022 | $msg_type = updated fade |
| 2023 | 2023 | $msg_type = update-nag |
| 2024 | 2024 | */ |
| 2025 | 2025 | |
| 2026 | - $plugin = 'avada-nag'; |
|
| 2027 | - $timestamp = 'avada-nag1234'; |
|
| 2028 | - $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');
|
|
| 2029 | - echo '<div id="' . $timestamp . '" class="error">'; |
|
| 2030 | - echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>'; |
|
| 2031 | - echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";
|
|
| 2032 | - echo "<p>$message</p>"; |
|
| 2033 | - echo "</div>"; |
|
| 2026 | + $plugin = 'avada-nag'; |
|
| 2027 | + $timestamp = 'avada-nag1234'; |
|
| 2028 | + $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');
|
|
| 2029 | + echo '<div id="' . $timestamp . '" class="error">'; |
|
| 2030 | + echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>'; |
|
| 2031 | + echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";
|
|
| 2032 | + echo "<p>$message</p>"; |
|
| 2033 | + echo "</div>"; |
|
| 2034 | 2034 | |
| 2035 | - ?> |
|
| 2035 | + ?> |
|
| 2036 | 2036 | <script> |
| 2037 | 2037 | function gdRemoveANotification($plugin, $timestamp) {
|
| 2038 | 2038 | |
@@ -2100,10 +2100,10 @@ discard block |
||
| 2100 | 2100 | */ |
| 2101 | 2101 | function geodir_avada_remove_notification() |
| 2102 | 2102 | {
|
| 2103 | - update_option('avada_nag', TRUE);
|
|
| 2103 | + update_option('avada_nag', TRUE);
|
|
| 2104 | 2104 | |
| 2105 | - // Always die in functions echoing ajax content |
|
| 2106 | - die(); |
|
| 2105 | + // Always die in functions echoing ajax content |
|
| 2106 | + die(); |
|
| 2107 | 2107 | } |
| 2108 | 2108 | |
| 2109 | 2109 | |
@@ -2125,11 +2125,11 @@ discard block |
||
| 2125 | 2125 | global $post, $typenow, $current_screen; |
| 2126 | 2126 | |
| 2127 | 2127 | $post_type = NULL; |
| 2128 | - if (isset($_REQUEST['post_type'])) |
|
| 2128 | + if (isset($_REQUEST['post_type'])) |
|
| 2129 | 2129 | $post_type = sanitize_key($_REQUEST['post_type']); |
| 2130 | - elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) |
|
| 2130 | + elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) |
|
| 2131 | 2131 | $post_type = get_post_type($_REQUEST['post']); |
| 2132 | - elseif ($post && isset($post->post_type)) |
|
| 2132 | + elseif ($post && isset($post->post_type)) |
|
| 2133 | 2133 | $post_type = $post->post_type; |
| 2134 | 2134 | elseif ($typenow) |
| 2135 | 2135 | $post_type = $typenow; |
@@ -2163,7 +2163,7 @@ discard block |
||
| 2163 | 2163 | // Don't allow same slug url for listing and location |
| 2164 | 2164 | if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {
|
| 2165 | 2165 | $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');
|
| 2166 | - wp_redirect($redirect_url); |
|
| 2166 | + wp_redirect($redirect_url); |
|
| 2167 | 2167 | exit; |
| 2168 | 2168 | } |
| 2169 | 2169 | |
@@ -2193,10 +2193,10 @@ discard block |
||
| 2193 | 2193 | * @package GeoDirectory |
| 2194 | 2194 | */ |
| 2195 | 2195 | function geodir_hide_admin_preview_button() {
|
| 2196 | - global $post_type; |
|
| 2197 | - $post_types = geodir_get_posttypes(); |
|
| 2198 | - if(in_array($post_type, $post_types)) |
|
| 2199 | - echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
|
|
| 2196 | + global $post_type; |
|
| 2197 | + $post_types = geodir_get_posttypes(); |
|
| 2198 | + if(in_array($post_type, $post_types)) |
|
| 2199 | + echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
|
|
| 2200 | 2200 | } |
| 2201 | 2201 | add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' ); |
| 2202 | 2202 | add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' ); |
@@ -2211,7 +2211,7 @@ discard block |
||
| 2211 | 2211 | */ |
| 2212 | 2212 | function geodir_import_export_tab( $tabs ) {
|
| 2213 | 2213 | $tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) ); |
| 2214 | - return $tabs; |
|
| 2214 | + return $tabs; |
|
| 2215 | 2215 | } |
| 2216 | 2216 | |
| 2217 | 2217 | /** |
@@ -2226,26 +2226,26 @@ discard block |
||
| 2226 | 2226 | function geodir_import_export_page() {
|
| 2227 | 2227 | $nonce = wp_create_nonce( 'geodir_import_export_nonce' ); |
| 2228 | 2228 | $gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv'; |
| 2229 | - /** |
|
| 2230 | - * Filter sample category data csv file url. |
|
| 2231 | - * |
|
| 2232 | - * @since 1.0.0 |
|
| 2233 | - * @package GeoDirectory |
|
| 2234 | - * |
|
| 2235 | - * @param string $gd_cats_sample_csv Sample category data csv file url. |
|
| 2236 | - */ |
|
| 2229 | + /** |
|
| 2230 | + * Filter sample category data csv file url. |
|
| 2231 | + * |
|
| 2232 | + * @since 1.0.0 |
|
| 2233 | + * @package GeoDirectory |
|
| 2234 | + * |
|
| 2235 | + * @param string $gd_cats_sample_csv Sample category data csv file url. |
|
| 2236 | + */ |
|
| 2237 | 2237 | $gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv ); |
| 2238 | 2238 | |
| 2239 | 2239 | $gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv'; |
| 2240 | - /** |
|
| 2241 | - * Filter sample post data csv file url. |
|
| 2242 | - * |
|
| 2243 | - * @since 1.0.0 |
|
| 2244 | - * @package GeoDirectory |
|
| 2245 | - * |
|
| 2246 | - * @param string $gd_posts_sample_csv Sample post data csv file url. |
|
| 2247 | - */ |
|
| 2248 | - $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv ); |
|
| 2240 | + /** |
|
| 2241 | + * Filter sample post data csv file url. |
|
| 2242 | + * |
|
| 2243 | + * @since 1.0.0 |
|
| 2244 | + * @package GeoDirectory |
|
| 2245 | + * |
|
| 2246 | + * @param string $gd_posts_sample_csv Sample post data csv file url. |
|
| 2247 | + */ |
|
| 2248 | + $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv ); |
|
| 2249 | 2249 | |
| 2250 | 2250 | $gd_posttypes = geodir_get_posttypes( 'array' ); |
| 2251 | 2251 | |
@@ -2268,14 +2268,14 @@ discard block |
||
| 2268 | 2268 | $gd_chunksize_options[100000] = 100000; |
| 2269 | 2269 | |
| 2270 | 2270 | /** |
| 2271 | - * Filter max entries per export csv file. |
|
| 2272 | - * |
|
| 2273 | - * @since 1.5.6 |
|
| 2274 | - * @package GeoDirectory |
|
| 2275 | - * |
|
| 2276 | - * @param string $gd_chunksize_options Entries options. |
|
| 2277 | - */ |
|
| 2278 | - $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options ); |
|
| 2271 | + * Filter max entries per export csv file. |
|
| 2272 | + * |
|
| 2273 | + * @since 1.5.6 |
|
| 2274 | + * @package GeoDirectory |
|
| 2275 | + * |
|
| 2276 | + * @param string $gd_chunksize_options Entries options. |
|
| 2277 | + */ |
|
| 2278 | + $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options ); |
|
| 2279 | 2279 | |
| 2280 | 2280 | $gd_chunksize_option = ''; |
| 2281 | 2281 | foreach ($gd_chunksize_options as $value => $title) {
|
@@ -2292,12 +2292,12 @@ discard block |
||
| 2292 | 2292 | <div class="gd-content-heading"> |
| 2293 | 2293 | |
| 2294 | 2294 | <?php |
| 2295 | - ini_set('max_execution_time', 999999);
|
|
| 2296 | - $ini_max_execution_time_check = @ini_get( 'max_execution_time' ); |
|
| 2297 | - ini_restore('max_execution_time');
|
|
| 2295 | + ini_set('max_execution_time', 999999);
|
|
| 2296 | + $ini_max_execution_time_check = @ini_get( 'max_execution_time' ); |
|
| 2297 | + ini_restore('max_execution_time');
|
|
| 2298 | 2298 | |
| 2299 | - if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting
|
|
| 2300 | - ?> |
|
| 2299 | + if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting
|
|
| 2300 | + ?> |
|
| 2301 | 2301 | <div id="gd_ie_reqs" class="metabox-holder"> |
| 2302 | 2302 | <div class="meta-box-sortables ui-sortable"> |
| 2303 | 2303 | <div class="postbox"> |
@@ -2472,7 +2472,7 @@ discard block |
||
| 2472 | 2472 | * Called just after the sample CSV download link. |
| 2473 | 2473 | * |
| 2474 | 2474 | * @since 1.0.0 |
| 2475 | - * @package GeoDirectory |
|
| 2475 | + * @package GeoDirectory |
|
| 2476 | 2476 | */ |
| 2477 | 2477 | do_action('geodir_sample_cats_csv_download_link');
|
| 2478 | 2478 | ?> |
@@ -2557,11 +2557,11 @@ discard block |
||
| 2557 | 2557 | * |
| 2558 | 2558 | * Called after the last setting on the GD > Import & Export page. |
| 2559 | 2559 | * @since 1.4.6 |
| 2560 | - * @package GeoDirectory |
|
| 2560 | + * @package GeoDirectory |
|
| 2561 | 2561 | * |
| 2562 | 2562 | * @param array $gd_posttypes GD post types. |
| 2563 | - * @param array $gd_chunksize_options File chunk size options. |
|
| 2564 | - * @param string $nonce Wordpress security token for GD import & export. |
|
| 2563 | + * @param array $gd_chunksize_options File chunk size options. |
|
| 2564 | + * @param string $nonce Wordpress security token for GD import & export. |
|
| 2565 | 2565 | */ |
| 2566 | 2566 | do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce ); |
| 2567 | 2567 | ?> |
@@ -3248,44 +3248,44 @@ discard block |
||
| 3248 | 3248 | function geodir_init_filesystem() |
| 3249 | 3249 | {
|
| 3250 | 3250 | |
| 3251 | - if(!function_exists('get_filesystem_method')){
|
|
| 3252 | - require_once(ABSPATH."/wp-admin/includes/file.php"); |
|
| 3253 | - } |
|
| 3254 | - $access_type = get_filesystem_method(); |
|
| 3255 | - if ($access_type === 'direct') {
|
|
| 3256 | - /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */ |
|
| 3257 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3258 | - |
|
| 3259 | - /* initialize the API */ |
|
| 3260 | - if (!WP_Filesystem($creds)) {
|
|
| 3261 | - /* any problems and we exit */ |
|
| 3262 | - //return '@@@3'; |
|
| 3263 | - return false; |
|
| 3264 | - } |
|
| 3251 | + if(!function_exists('get_filesystem_method')){
|
|
| 3252 | + require_once(ABSPATH."/wp-admin/includes/file.php"); |
|
| 3253 | + } |
|
| 3254 | + $access_type = get_filesystem_method(); |
|
| 3255 | + if ($access_type === 'direct') {
|
|
| 3256 | + /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */ |
|
| 3257 | + $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3258 | + |
|
| 3259 | + /* initialize the API */ |
|
| 3260 | + if (!WP_Filesystem($creds)) {
|
|
| 3261 | + /* any problems and we exit */ |
|
| 3262 | + //return '@@@3'; |
|
| 3263 | + return false; |
|
| 3264 | + } |
|
| 3265 | 3265 | |
| 3266 | - global $wp_filesystem; |
|
| 3267 | - return $wp_filesystem; |
|
| 3268 | - /* do our file manipulations below */ |
|
| 3269 | - } elseif (defined('FTP_USER')) {
|
|
| 3270 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3266 | + global $wp_filesystem; |
|
| 3267 | + return $wp_filesystem; |
|
| 3268 | + /* do our file manipulations below */ |
|
| 3269 | + } elseif (defined('FTP_USER')) {
|
|
| 3270 | + $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3271 | + |
|
| 3272 | + /* initialize the API */ |
|
| 3273 | + if (!WP_Filesystem($creds)) {
|
|
| 3274 | + /* any problems and we exit */ |
|
| 3275 | + //return '@@@33'; |
|
| 3276 | + return false; |
|
| 3277 | + } |
|
| 3271 | 3278 | |
| 3272 | - /* initialize the API */ |
|
| 3273 | - if (!WP_Filesystem($creds)) {
|
|
| 3274 | - /* any problems and we exit */ |
|
| 3275 | - //return '@@@33'; |
|
| 3276 | - return false; |
|
| 3277 | - } |
|
| 3279 | + global $wp_filesystem; |
|
| 3280 | + //return '@@@1'; |
|
| 3281 | + return $wp_filesystem; |
|
| 3278 | 3282 | |
| 3279 | - global $wp_filesystem; |
|
| 3280 | - //return '@@@1'; |
|
| 3281 | - return $wp_filesystem; |
|
| 3282 | - |
|
| 3283 | - } else {
|
|
| 3284 | - //return '@@@2'; |
|
| 3285 | - /* don't have direct write access. Prompt user with our notice */ |
|
| 3286 | - add_action('admin_notice', 'geodir_filesystem_notice');
|
|
| 3287 | - return false; |
|
| 3288 | - } |
|
| 3283 | + } else {
|
|
| 3284 | + //return '@@@2'; |
|
| 3285 | + /* don't have direct write access. Prompt user with our notice */ |
|
| 3286 | + add_action('admin_notice', 'geodir_filesystem_notice');
|
|
| 3287 | + return false; |
|
| 3288 | + } |
|
| 3289 | 3289 | |
| 3290 | 3290 | } |
| 3291 | 3291 | |
@@ -3303,10 +3303,10 @@ discard block |
||
| 3303 | 3303 | */ |
| 3304 | 3304 | function geodir_filesystem_notice() |
| 3305 | 3305 | { if ( defined( 'DOING_AJAX' ) ){return;}
|
| 3306 | - $access_type = get_filesystem_method(); |
|
| 3307 | - if ($access_type === 'direct') {
|
|
| 3308 | - } elseif (!defined('FTP_USER')) {
|
|
| 3309 | - ?> |
|
| 3306 | + $access_type = get_filesystem_method(); |
|
| 3307 | + if ($access_type === 'direct') {
|
|
| 3308 | + } elseif (!defined('FTP_USER')) {
|
|
| 3309 | + ?> |
|
| 3310 | 3310 | <div class="error"> |
| 3311 | 3311 | <p><?php _e('GeoDirectory does not have access to your filesystem, thing like import/export will not work. Please define your details in wp-config.php as explained here', 'geodirectory'); ?>
|
| 3312 | 3312 | <a target="_blank" href="http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants">http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants</a> |
@@ -3334,1280 +3334,1280 @@ discard block |
||
| 3334 | 3334 | * @return string Json data. |
| 3335 | 3335 | */ |
| 3336 | 3336 | function geodir_ajax_import_export() {
|
| 3337 | - global $wpdb, $plugin_prefix, $current_user, $wp_filesystem; |
|
| 3337 | + global $wpdb, $plugin_prefix, $current_user, $wp_filesystem; |
|
| 3338 | 3338 | |
| 3339 | - error_reporting(0); |
|
| 3339 | + error_reporting(0); |
|
| 3340 | 3340 | |
| 3341 | - $xstart = microtime(true); |
|
| 3341 | + $xstart = microtime(true); |
|
| 3342 | 3342 | |
| 3343 | - // try to set higher limits for import |
|
| 3344 | - $max_input_time = ini_get('max_input_time');
|
|
| 3345 | - $max_execution_time = ini_get('max_execution_time');
|
|
| 3346 | - $memory_limit= ini_get('memory_limit');
|
|
| 3343 | + // try to set higher limits for import |
|
| 3344 | + $max_input_time = ini_get('max_input_time');
|
|
| 3345 | + $max_execution_time = ini_get('max_execution_time');
|
|
| 3346 | + $memory_limit= ini_get('memory_limit');
|
|
| 3347 | 3347 | |
| 3348 | - if(!$max_input_time || $max_input_time<3000){
|
|
| 3349 | - ini_set('max_input_time', 3000);
|
|
| 3350 | - } |
|
| 3348 | + if(!$max_input_time || $max_input_time<3000){
|
|
| 3349 | + ini_set('max_input_time', 3000);
|
|
| 3350 | + } |
|
| 3351 | 3351 | |
| 3352 | - if(!$max_execution_time || $max_execution_time<3000){
|
|
| 3353 | - ini_set('max_execution_time', 3000);
|
|
| 3354 | - } |
|
| 3352 | + if(!$max_execution_time || $max_execution_time<3000){
|
|
| 3353 | + ini_set('max_execution_time', 3000);
|
|
| 3354 | + } |
|
| 3355 | 3355 | |
| 3356 | - if($memory_limit && str_replace('M','',$memory_limit)){
|
|
| 3357 | - if(str_replace('M','',$memory_limit)<256){
|
|
| 3358 | - ini_set('memory_limit', '256M');
|
|
| 3359 | - } |
|
| 3360 | - } |
|
| 3356 | + if($memory_limit && str_replace('M','',$memory_limit)){
|
|
| 3357 | + if(str_replace('M','',$memory_limit)<256){
|
|
| 3358 | + ini_set('memory_limit', '256M');
|
|
| 3359 | + } |
|
| 3360 | + } |
|
| 3361 | 3361 | |
| 3362 | - $json = array(); |
|
| 3362 | + $json = array(); |
|
| 3363 | 3363 | |
| 3364 | - if ( !current_user_can( 'manage_options' ) ) {
|
|
| 3365 | - wp_send_json( $json ); |
|
| 3366 | - } |
|
| 3364 | + if ( !current_user_can( 'manage_options' ) ) {
|
|
| 3365 | + wp_send_json( $json ); |
|
| 3366 | + } |
|
| 3367 | 3367 | |
| 3368 | - $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL; |
|
| 3369 | - $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL; |
|
| 3370 | - $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false; |
|
| 3368 | + $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL; |
|
| 3369 | + $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL; |
|
| 3370 | + $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false; |
|
| 3371 | 3371 | |
| 3372 | - if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {
|
|
| 3373 | - wp_send_json( $json ); |
|
| 3374 | - } |
|
| 3372 | + if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {
|
|
| 3373 | + wp_send_json( $json ); |
|
| 3374 | + } |
|
| 3375 | 3375 | |
| 3376 | - $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL; |
|
| 3377 | - $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL; |
|
| 3378 | - $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page; |
|
| 3379 | - $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1; |
|
| 3376 | + $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL; |
|
| 3377 | + $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL; |
|
| 3378 | + $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page; |
|
| 3379 | + $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1; |
|
| 3380 | 3380 | |
| 3381 | - $wp_filesystem = geodir_init_filesystem(); |
|
| 3382 | - if (!$wp_filesystem) {
|
|
| 3383 | - $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' ); |
|
| 3384 | - wp_send_json( $json ); |
|
| 3385 | - } |
|
| 3381 | + $wp_filesystem = geodir_init_filesystem(); |
|
| 3382 | + if (!$wp_filesystem) {
|
|
| 3383 | + $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' ); |
|
| 3384 | + wp_send_json( $json ); |
|
| 3385 | + } |
|
| 3386 | 3386 | |
| 3387 | - if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
|
|
| 3388 | - $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' ); |
|
| 3389 | - wp_send_json( $json ); |
|
| 3390 | - } |
|
| 3387 | + if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
|
|
| 3388 | + $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' ); |
|
| 3389 | + wp_send_json( $json ); |
|
| 3390 | + } |
|
| 3391 | 3391 | |
| 3392 | - $csv_file_dir = geodir_path_import_export( false ); |
|
| 3393 | - if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {
|
|
| 3394 | - if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {
|
|
| 3395 | - $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3396 | - wp_send_json( $json ); |
|
| 3397 | - } |
|
| 3398 | - } |
|
| 3392 | + $csv_file_dir = geodir_path_import_export( false ); |
|
| 3393 | + if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {
|
|
| 3394 | + if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {
|
|
| 3395 | + $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3396 | + wp_send_json( $json ); |
|
| 3397 | + } |
|
| 3398 | + } |
|
| 3399 | 3399 | |
| 3400 | - $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
|
| 3401 | - $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 3402 | - |
|
| 3403 | - switch ( $task ) {
|
|
| 3404 | - case 'export_posts': {
|
|
| 3405 | - // WPML |
|
| 3406 | - $is_wpml = geodir_is_wpml(); |
|
| 3407 | - if ($is_wpml) {
|
|
| 3408 | - global $sitepress; |
|
| 3409 | - $active_lang = ICL_LANGUAGE_CODE; |
|
| 3400 | + $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
|
| 3401 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 3402 | + |
|
| 3403 | + switch ( $task ) {
|
|
| 3404 | + case 'export_posts': {
|
|
| 3405 | + // WPML |
|
| 3406 | + $is_wpml = geodir_is_wpml(); |
|
| 3407 | + if ($is_wpml) {
|
|
| 3408 | + global $sitepress; |
|
| 3409 | + $active_lang = ICL_LANGUAGE_CODE; |
|
| 3410 | 3410 | |
| 3411 | - $sitepress->switch_lang('all', true);
|
|
| 3412 | - } |
|
| 3413 | - // WPML |
|
| 3414 | - if ( $post_type == 'gd_event' ) {
|
|
| 3415 | - add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 ); |
|
| 3416 | - } |
|
| 3417 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 3411 | + $sitepress->switch_lang('all', true);
|
|
| 3412 | + } |
|
| 3413 | + // WPML |
|
| 3414 | + if ( $post_type == 'gd_event' ) {
|
|
| 3415 | + add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 ); |
|
| 3416 | + } |
|
| 3417 | + $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 3418 | 3418 | |
| 3419 | - $file_name = $post_type . '_' . date( 'dmyHi' ); |
|
| 3420 | - if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {
|
|
| 3421 | - $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) ); |
|
| 3422 | - } |
|
| 3423 | - $posts_count = geodir_get_posts_count( $post_type ); |
|
| 3424 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3425 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3426 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3427 | - $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv'; |
|
| 3419 | + $file_name = $post_type . '_' . date( 'dmyHi' ); |
|
| 3420 | + if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {
|
|
| 3421 | + $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) ); |
|
| 3422 | + } |
|
| 3423 | + $posts_count = geodir_get_posts_count( $post_type ); |
|
| 3424 | + $file_url_base = geodir_path_import_export() . '/'; |
|
| 3425 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3426 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3427 | + $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv'; |
|
| 3428 | 3428 | |
| 3429 | - $chunk_file_paths = array(); |
|
| 3429 | + $chunk_file_paths = array(); |
|
| 3430 | 3430 | |
| 3431 | - if ( isset( $_REQUEST['_c'] ) ) {
|
|
| 3432 | - $json['total'] = $posts_count; |
|
| 3433 | - // WPML |
|
| 3434 | - if ($is_wpml) {
|
|
| 3435 | - $sitepress->switch_lang($active_lang, true); |
|
| 3436 | - } |
|
| 3437 | - // WPML |
|
| 3438 | - wp_send_json( $json ); |
|
| 3439 | - gd_die(); |
|
| 3440 | - } else if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3441 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3442 | - $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0; |
|
| 3443 | - $percentage = min( $percentage, 100 ); |
|
| 3431 | + if ( isset( $_REQUEST['_c'] ) ) {
|
|
| 3432 | + $json['total'] = $posts_count; |
|
| 3433 | + // WPML |
|
| 3434 | + if ($is_wpml) {
|
|
| 3435 | + $sitepress->switch_lang($active_lang, true); |
|
| 3436 | + } |
|
| 3437 | + // WPML |
|
| 3438 | + wp_send_json( $json ); |
|
| 3439 | + gd_die(); |
|
| 3440 | + } else if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3441 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3442 | + $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0; |
|
| 3443 | + $percentage = min( $percentage, 100 ); |
|
| 3444 | 3444 | |
| 3445 | - $json['percentage'] = $percentage; |
|
| 3446 | - // WPML |
|
| 3447 | - if ($is_wpml) {
|
|
| 3448 | - $sitepress->switch_lang($active_lang, true); |
|
| 3449 | - } |
|
| 3450 | - // WPML |
|
| 3451 | - wp_send_json( $json ); |
|
| 3452 | - gd_die(); |
|
| 3453 | - } else {
|
|
| 3454 | - if ( !$posts_count > 0 ) {
|
|
| 3455 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3456 | - } else {
|
|
| 3457 | - $total_posts = $posts_count; |
|
| 3458 | - if ($chunk_per_page > $total_posts) {
|
|
| 3459 | - $chunk_per_page = $total_posts; |
|
| 3460 | - } |
|
| 3461 | - $chunk_total_pages = ceil( $total_posts / $chunk_per_page ); |
|
| 3445 | + $json['percentage'] = $percentage; |
|
| 3446 | + // WPML |
|
| 3447 | + if ($is_wpml) {
|
|
| 3448 | + $sitepress->switch_lang($active_lang, true); |
|
| 3449 | + } |
|
| 3450 | + // WPML |
|
| 3451 | + wp_send_json( $json ); |
|
| 3452 | + gd_die(); |
|
| 3453 | + } else {
|
|
| 3454 | + if ( !$posts_count > 0 ) {
|
|
| 3455 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3456 | + } else {
|
|
| 3457 | + $total_posts = $posts_count; |
|
| 3458 | + if ($chunk_per_page > $total_posts) {
|
|
| 3459 | + $chunk_per_page = $total_posts; |
|
| 3460 | + } |
|
| 3461 | + $chunk_total_pages = ceil( $total_posts / $chunk_per_page ); |
|
| 3462 | 3462 | |
| 3463 | - $j = $chunk_page_no; |
|
| 3464 | - $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j ); |
|
| 3463 | + $j = $chunk_page_no; |
|
| 3464 | + $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j ); |
|
| 3465 | 3465 | |
| 3466 | - $per_page = 500; |
|
| 3467 | - if ($per_page > $chunk_per_page) {
|
|
| 3468 | - $per_page = $chunk_per_page; |
|
| 3469 | - } |
|
| 3470 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3466 | + $per_page = 500; |
|
| 3467 | + if ($per_page > $chunk_per_page) {
|
|
| 3468 | + $per_page = $chunk_per_page; |
|
| 3469 | + } |
|
| 3470 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3471 | 3471 | |
| 3472 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3473 | - $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page ); |
|
| 3472 | + for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3473 | + $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page ); |
|
| 3474 | 3474 | |
| 3475 | - $clear = $i == 0 ? true : false; |
|
| 3476 | - geodir_save_csv_data( $file_path_temp, $save_posts, $clear ); |
|
| 3477 | - } |
|
| 3475 | + $clear = $i == 0 ? true : false; |
|
| 3476 | + geodir_save_csv_data( $file_path_temp, $save_posts, $clear ); |
|
| 3477 | + } |
|
| 3478 | 3478 | |
| 3479 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3480 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3481 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3482 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3483 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3479 | + if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3480 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3481 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3482 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3483 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3484 | 3484 | |
| 3485 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3486 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3487 | - } |
|
| 3485 | + $file_url = $file_url_base . $chunk_file_name; |
|
| 3486 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3487 | + } |
|
| 3488 | 3488 | |
| 3489 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3490 | - $json['total'] = $posts_count; |
|
| 3491 | - $json['files'] = $chunk_file_paths; |
|
| 3492 | - } else {
|
|
| 3493 | - if ($j > 1) {
|
|
| 3494 | - $json['total'] = $posts_count; |
|
| 3495 | - $json['files'] = array(); |
|
| 3496 | - } else {
|
|
| 3497 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3498 | - } |
|
| 3499 | - } |
|
| 3500 | - } |
|
| 3501 | - // WPML |
|
| 3502 | - if ($is_wpml) {
|
|
| 3503 | - $sitepress->switch_lang($active_lang, true); |
|
| 3504 | - } |
|
| 3505 | - // WPML |
|
| 3506 | - wp_send_json( $json ); |
|
| 3507 | - } |
|
| 3508 | - } |
|
| 3509 | - break; |
|
| 3510 | - case 'export_cats': {
|
|
| 3511 | - // WPML |
|
| 3512 | - $is_wpml = geodir_is_wpml(); |
|
| 3513 | - if ($is_wpml) {
|
|
| 3514 | - global $sitepress; |
|
| 3515 | - $active_lang = ICL_LANGUAGE_CODE; |
|
| 3489 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3490 | + $json['total'] = $posts_count; |
|
| 3491 | + $json['files'] = $chunk_file_paths; |
|
| 3492 | + } else {
|
|
| 3493 | + if ($j > 1) {
|
|
| 3494 | + $json['total'] = $posts_count; |
|
| 3495 | + $json['files'] = array(); |
|
| 3496 | + } else {
|
|
| 3497 | + $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3498 | + } |
|
| 3499 | + } |
|
| 3500 | + } |
|
| 3501 | + // WPML |
|
| 3502 | + if ($is_wpml) {
|
|
| 3503 | + $sitepress->switch_lang($active_lang, true); |
|
| 3504 | + } |
|
| 3505 | + // WPML |
|
| 3506 | + wp_send_json( $json ); |
|
| 3507 | + } |
|
| 3508 | + } |
|
| 3509 | + break; |
|
| 3510 | + case 'export_cats': {
|
|
| 3511 | + // WPML |
|
| 3512 | + $is_wpml = geodir_is_wpml(); |
|
| 3513 | + if ($is_wpml) {
|
|
| 3514 | + global $sitepress; |
|
| 3515 | + $active_lang = ICL_LANGUAGE_CODE; |
|
| 3516 | 3516 | |
| 3517 | - $sitepress->switch_lang('all', true);
|
|
| 3518 | - } |
|
| 3519 | - // WPML |
|
| 3520 | - $file_name = $post_type . 'category_' . date( 'dmyHi' ); |
|
| 3517 | + $sitepress->switch_lang('all', true);
|
|
| 3518 | + } |
|
| 3519 | + // WPML |
|
| 3520 | + $file_name = $post_type . 'category_' . date( 'dmyHi' ); |
|
| 3521 | 3521 | |
| 3522 | - $terms_count = geodir_get_terms_count( $post_type ); |
|
| 3523 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3524 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3525 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3526 | - $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv'; |
|
| 3522 | + $terms_count = geodir_get_terms_count( $post_type ); |
|
| 3523 | + $file_url_base = geodir_path_import_export() . '/'; |
|
| 3524 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3525 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3526 | + $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv'; |
|
| 3527 | 3527 | |
| 3528 | - $chunk_file_paths = array(); |
|
| 3528 | + $chunk_file_paths = array(); |
|
| 3529 | 3529 | |
| 3530 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3531 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3532 | - $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0; |
|
| 3533 | - $percentage = min( $percentage, 100 ); |
|
| 3530 | + if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3531 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3532 | + $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0; |
|
| 3533 | + $percentage = min( $percentage, 100 ); |
|
| 3534 | 3534 | |
| 3535 | - $json['percentage'] = $percentage; |
|
| 3536 | - // WPML |
|
| 3537 | - if ($is_wpml) {
|
|
| 3538 | - $sitepress->switch_lang($active_lang, true); |
|
| 3539 | - } |
|
| 3540 | - // WPML |
|
| 3541 | - wp_send_json( $json ); |
|
| 3542 | - } else {
|
|
| 3543 | - if ( !$terms_count > 0 ) {
|
|
| 3544 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3545 | - } else {
|
|
| 3546 | - $total_terms = $terms_count; |
|
| 3547 | - if ($chunk_per_page > $terms_count) {
|
|
| 3548 | - $chunk_per_page = $terms_count; |
|
| 3549 | - } |
|
| 3550 | - $chunk_total_pages = ceil( $total_terms / $chunk_per_page ); |
|
| 3535 | + $json['percentage'] = $percentage; |
|
| 3536 | + // WPML |
|
| 3537 | + if ($is_wpml) {
|
|
| 3538 | + $sitepress->switch_lang($active_lang, true); |
|
| 3539 | + } |
|
| 3540 | + // WPML |
|
| 3541 | + wp_send_json( $json ); |
|
| 3542 | + } else {
|
|
| 3543 | + if ( !$terms_count > 0 ) {
|
|
| 3544 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3545 | + } else {
|
|
| 3546 | + $total_terms = $terms_count; |
|
| 3547 | + if ($chunk_per_page > $terms_count) {
|
|
| 3548 | + $chunk_per_page = $terms_count; |
|
| 3549 | + } |
|
| 3550 | + $chunk_total_pages = ceil( $total_terms / $chunk_per_page ); |
|
| 3551 | 3551 | |
| 3552 | - $j = $chunk_page_no; |
|
| 3553 | - $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j ); |
|
| 3552 | + $j = $chunk_page_no; |
|
| 3553 | + $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j ); |
|
| 3554 | 3554 | |
| 3555 | - $per_page = 500; |
|
| 3556 | - if ($per_page > $chunk_per_page) {
|
|
| 3557 | - $per_page = $chunk_per_page; |
|
| 3558 | - } |
|
| 3559 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3555 | + $per_page = 500; |
|
| 3556 | + if ($per_page > $chunk_per_page) {
|
|
| 3557 | + $per_page = $chunk_per_page; |
|
| 3558 | + } |
|
| 3559 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3560 | 3560 | |
| 3561 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3562 | - $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page ); |
|
| 3561 | + for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3562 | + $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page ); |
|
| 3563 | 3563 | |
| 3564 | - $clear = $i == 0 ? true : false; |
|
| 3565 | - geodir_save_csv_data( $file_path_temp, $save_terms, $clear ); |
|
| 3566 | - } |
|
| 3564 | + $clear = $i == 0 ? true : false; |
|
| 3565 | + geodir_save_csv_data( $file_path_temp, $save_terms, $clear ); |
|
| 3566 | + } |
|
| 3567 | 3567 | |
| 3568 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3569 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3570 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3571 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3572 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3568 | + if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3569 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3570 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3571 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3572 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3573 | 3573 | |
| 3574 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3575 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3576 | - } |
|
| 3574 | + $file_url = $file_url_base . $chunk_file_name; |
|
| 3575 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3576 | + } |
|
| 3577 | 3577 | |
| 3578 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3579 | - $json['total'] = $terms_count; |
|
| 3580 | - $json['files'] = $chunk_file_paths; |
|
| 3581 | - } else {
|
|
| 3582 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3583 | - } |
|
| 3584 | - } |
|
| 3585 | - // WPML |
|
| 3586 | - if ($is_wpml) {
|
|
| 3587 | - $sitepress->switch_lang($active_lang, true); |
|
| 3588 | - } |
|
| 3589 | - // WPML |
|
| 3590 | - wp_send_json( $json ); |
|
| 3591 | - } |
|
| 3592 | - } |
|
| 3593 | - break; |
|
| 3594 | - case 'export_locations': {
|
|
| 3595 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3596 | - $file_name = 'gd_locations_' . date( 'dmyHi' ); |
|
| 3597 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3598 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3599 | - $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv'; |
|
| 3578 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3579 | + $json['total'] = $terms_count; |
|
| 3580 | + $json['files'] = $chunk_file_paths; |
|
| 3581 | + } else {
|
|
| 3582 | + $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3583 | + } |
|
| 3584 | + } |
|
| 3585 | + // WPML |
|
| 3586 | + if ($is_wpml) {
|
|
| 3587 | + $sitepress->switch_lang($active_lang, true); |
|
| 3588 | + } |
|
| 3589 | + // WPML |
|
| 3590 | + wp_send_json( $json ); |
|
| 3591 | + } |
|
| 3592 | + } |
|
| 3593 | + break; |
|
| 3594 | + case 'export_locations': {
|
|
| 3595 | + $file_url_base = geodir_path_import_export() . '/'; |
|
| 3596 | + $file_name = 'gd_locations_' . date( 'dmyHi' ); |
|
| 3597 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3598 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3599 | + $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv'; |
|
| 3600 | 3600 | |
| 3601 | - $items_count = (int)geodir_location_imex_count_locations(); |
|
| 3601 | + $items_count = (int)geodir_location_imex_count_locations(); |
|
| 3602 | 3602 | |
| 3603 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3604 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3605 | - $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3606 | - $percentage = min( $percentage, 100 ); |
|
| 3603 | + if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3604 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3605 | + $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3606 | + $percentage = min( $percentage, 100 ); |
|
| 3607 | 3607 | |
| 3608 | - $json['percentage'] = $percentage; |
|
| 3609 | - wp_send_json( $json ); |
|
| 3610 | - } else {
|
|
| 3611 | - $chunk_file_paths = array(); |
|
| 3608 | + $json['percentage'] = $percentage; |
|
| 3609 | + wp_send_json( $json ); |
|
| 3610 | + } else {
|
|
| 3611 | + $chunk_file_paths = array(); |
|
| 3612 | 3612 | |
| 3613 | - if ( !$items_count > 0 ) {
|
|
| 3614 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3615 | - } else {
|
|
| 3616 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3617 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3613 | + if ( !$items_count > 0 ) {
|
|
| 3614 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3615 | + } else {
|
|
| 3616 | + $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3617 | + $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3618 | 3618 | |
| 3619 | - $j = $chunk_page_no; |
|
| 3620 | - $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j ); |
|
| 3619 | + $j = $chunk_page_no; |
|
| 3620 | + $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j ); |
|
| 3621 | 3621 | |
| 3622 | - $per_page = 500; |
|
| 3623 | - $per_page = min( $per_page, $chunk_per_page ); |
|
| 3624 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3622 | + $per_page = 500; |
|
| 3623 | + $per_page = min( $per_page, $chunk_per_page ); |
|
| 3624 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3625 | 3625 | |
| 3626 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3627 | - $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3626 | + for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3627 | + $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3628 | 3628 | |
| 3629 | - $clear = $i == 0 ? true : false; |
|
| 3630 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3631 | - } |
|
| 3629 | + $clear = $i == 0 ? true : false; |
|
| 3630 | + geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3631 | + } |
|
| 3632 | 3632 | |
| 3633 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3634 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3635 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3636 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3637 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3633 | + if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3634 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3635 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3636 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3637 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3638 | 3638 | |
| 3639 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3640 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3641 | - } |
|
| 3639 | + $file_url = $file_url_base . $chunk_file_name; |
|
| 3640 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3641 | + } |
|
| 3642 | 3642 | |
| 3643 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3644 | - $json['total'] = $items_count; |
|
| 3645 | - $json['files'] = $chunk_file_paths; |
|
| 3646 | - } else {
|
|
| 3647 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3648 | - } |
|
| 3649 | - } |
|
| 3650 | - wp_send_json( $json ); |
|
| 3651 | - } |
|
| 3652 | - } |
|
| 3653 | - break; |
|
| 3654 | - case 'export_hoods': {
|
|
| 3655 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3656 | - $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' ); |
|
| 3657 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3658 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3659 | - $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv'; |
|
| 3643 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3644 | + $json['total'] = $items_count; |
|
| 3645 | + $json['files'] = $chunk_file_paths; |
|
| 3646 | + } else {
|
|
| 3647 | + $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3648 | + } |
|
| 3649 | + } |
|
| 3650 | + wp_send_json( $json ); |
|
| 3651 | + } |
|
| 3652 | + } |
|
| 3653 | + break; |
|
| 3654 | + case 'export_hoods': {
|
|
| 3655 | + $file_url_base = geodir_path_import_export() . '/'; |
|
| 3656 | + $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' ); |
|
| 3657 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3658 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3659 | + $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv'; |
|
| 3660 | 3660 | |
| 3661 | - $items_count = (int)geodir_location_imex_count_neighbourhoods(); |
|
| 3661 | + $items_count = (int)geodir_location_imex_count_neighbourhoods(); |
|
| 3662 | 3662 | |
| 3663 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3664 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3665 | - $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3666 | - $percentage = min( $percentage, 100 ); |
|
| 3663 | + if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3664 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3665 | + $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3666 | + $percentage = min( $percentage, 100 ); |
|
| 3667 | 3667 | |
| 3668 | - $json['percentage'] = $percentage; |
|
| 3669 | - wp_send_json( $json ); |
|
| 3670 | - } else {
|
|
| 3671 | - $chunk_file_paths = array(); |
|
| 3668 | + $json['percentage'] = $percentage; |
|
| 3669 | + wp_send_json( $json ); |
|
| 3670 | + } else {
|
|
| 3671 | + $chunk_file_paths = array(); |
|
| 3672 | 3672 | |
| 3673 | - if ( !$items_count > 0 ) {
|
|
| 3674 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3675 | - } else {
|
|
| 3676 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3677 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3673 | + if ( !$items_count > 0 ) {
|
|
| 3674 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3675 | + } else {
|
|
| 3676 | + $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3677 | + $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3678 | 3678 | |
| 3679 | - $j = $chunk_page_no; |
|
| 3680 | - $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j ); |
|
| 3679 | + $j = $chunk_page_no; |
|
| 3680 | + $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j ); |
|
| 3681 | 3681 | |
| 3682 | - $per_page = 500; |
|
| 3683 | - $per_page = min( $per_page, $chunk_per_page ); |
|
| 3684 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3682 | + $per_page = 500; |
|
| 3683 | + $per_page = min( $per_page, $chunk_per_page ); |
|
| 3684 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3685 | 3685 | |
| 3686 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3687 | - $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3686 | + for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3687 | + $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3688 | 3688 | |
| 3689 | - $clear = $i == 0 ? true : false; |
|
| 3690 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3691 | - } |
|
| 3689 | + $clear = $i == 0 ? true : false; |
|
| 3690 | + geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3691 | + } |
|
| 3692 | 3692 | |
| 3693 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3694 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3695 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3696 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3697 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3693 | + if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3694 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3695 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3696 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3697 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3698 | 3698 | |
| 3699 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3700 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3701 | - } |
|
| 3699 | + $file_url = $file_url_base . $chunk_file_name; |
|
| 3700 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3701 | + } |
|
| 3702 | 3702 | |
| 3703 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3704 | - $json['total'] = $items_count; |
|
| 3705 | - $json['files'] = $chunk_file_paths; |
|
| 3706 | - } else {
|
|
| 3707 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3708 | - } |
|
| 3709 | - } |
|
| 3710 | - wp_send_json( $json ); |
|
| 3711 | - } |
|
| 3712 | - } |
|
| 3713 | - break; |
|
| 3714 | - case 'prepare_import': |
|
| 3715 | - case 'import_cat': |
|
| 3716 | - case 'import_post': |
|
| 3717 | - case 'import_loc': |
|
| 3718 | - case 'import_hood': {
|
|
| 3719 | - // WPML |
|
| 3720 | - $is_wpml = geodir_is_wpml(); |
|
| 3721 | - if ($is_wpml) {
|
|
| 3722 | - global $sitepress; |
|
| 3723 | - $active_lang = ICL_LANGUAGE_CODE; |
|
| 3724 | - } |
|
| 3725 | - // WPML |
|
| 3703 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3704 | + $json['total'] = $items_count; |
|
| 3705 | + $json['files'] = $chunk_file_paths; |
|
| 3706 | + } else {
|
|
| 3707 | + $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3708 | + } |
|
| 3709 | + } |
|
| 3710 | + wp_send_json( $json ); |
|
| 3711 | + } |
|
| 3712 | + } |
|
| 3713 | + break; |
|
| 3714 | + case 'prepare_import': |
|
| 3715 | + case 'import_cat': |
|
| 3716 | + case 'import_post': |
|
| 3717 | + case 'import_loc': |
|
| 3718 | + case 'import_hood': {
|
|
| 3719 | + // WPML |
|
| 3720 | + $is_wpml = geodir_is_wpml(); |
|
| 3721 | + if ($is_wpml) {
|
|
| 3722 | + global $sitepress; |
|
| 3723 | + $active_lang = ICL_LANGUAGE_CODE; |
|
| 3724 | + } |
|
| 3725 | + // WPML |
|
| 3726 | 3726 | |
| 3727 | - ini_set( 'auto_detect_line_endings', true ); |
|
| 3727 | + ini_set( 'auto_detect_line_endings', true ); |
|
| 3728 | 3728 | |
| 3729 | - $uploads = wp_upload_dir(); |
|
| 3730 | - $uploads_dir = $uploads['path']; |
|
| 3731 | - $uploads_subdir = $uploads['subdir']; |
|
| 3729 | + $uploads = wp_upload_dir(); |
|
| 3730 | + $uploads_dir = $uploads['path']; |
|
| 3731 | + $uploads_subdir = $uploads['subdir']; |
|
| 3732 | 3732 | |
| 3733 | - $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL; |
|
| 3734 | - $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip'; |
|
| 3733 | + $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL; |
|
| 3734 | + $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip'; |
|
| 3735 | 3735 | |
| 3736 | - $csv_file_arr = explode( '/', $csv_file ); |
|
| 3737 | - $csv_filename = end( $csv_file_arr ); |
|
| 3738 | - $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename; |
|
| 3736 | + $csv_file_arr = explode( '/', $csv_file ); |
|
| 3737 | + $csv_filename = end( $csv_file_arr ); |
|
| 3738 | + $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename; |
|
| 3739 | 3739 | |
| 3740 | - $json['file'] = $csv_file; |
|
| 3741 | - $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' ); |
|
| 3742 | - $file = array(); |
|
| 3740 | + $json['file'] = $csv_file; |
|
| 3741 | + $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' ); |
|
| 3742 | + $file = array(); |
|
| 3743 | 3743 | |
| 3744 | - if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {
|
|
| 3745 | - $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename ); |
|
| 3744 | + if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {
|
|
| 3745 | + $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename ); |
|
| 3746 | 3746 | |
| 3747 | - if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
| 3748 | - $json['error'] = NULL; |
|
| 3749 | - |
|
| 3750 | - $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line |
|
| 3751 | - setlocale(LC_ALL, 'en_US.UTF-8'); |
|
| 3752 | - if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {
|
|
| 3753 | - while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {
|
|
| 3754 | - if ( !empty( $data ) ) {
|
|
| 3755 | - $file[] = $data; |
|
| 3756 | - } |
|
| 3757 | - } |
|
| 3758 | - fclose($handle); |
|
| 3759 | - } |
|
| 3760 | - setlocale(LC_ALL, $lc_all); |
|
| 3747 | + if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
| 3748 | + $json['error'] = NULL; |
|
| 3749 | + |
|
| 3750 | + $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line |
|
| 3751 | + setlocale(LC_ALL, 'en_US.UTF-8'); |
|
| 3752 | + if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {
|
|
| 3753 | + while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {
|
|
| 3754 | + if ( !empty( $data ) ) {
|
|
| 3755 | + $file[] = $data; |
|
| 3756 | + } |
|
| 3757 | + } |
|
| 3758 | + fclose($handle); |
|
| 3759 | + } |
|
| 3760 | + setlocale(LC_ALL, $lc_all); |
|
| 3761 | 3761 | |
| 3762 | - $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
| 3762 | + $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
| 3763 | 3763 | |
| 3764 | - if (!$json['rows'] > 0) {
|
|
| 3765 | - $json['error'] = __('No data found in csv file.', 'geodirectory');
|
|
| 3766 | - } |
|
| 3767 | - } else {
|
|
| 3768 | - wp_send_json( $json ); |
|
| 3769 | - } |
|
| 3770 | - } else {
|
|
| 3771 | - wp_send_json( $json ); |
|
| 3772 | - } |
|
| 3764 | + if (!$json['rows'] > 0) {
|
|
| 3765 | + $json['error'] = __('No data found in csv file.', 'geodirectory');
|
|
| 3766 | + } |
|
| 3767 | + } else {
|
|
| 3768 | + wp_send_json( $json ); |
|
| 3769 | + } |
|
| 3770 | + } else {
|
|
| 3771 | + wp_send_json( $json ); |
|
| 3772 | + } |
|
| 3773 | 3773 | |
| 3774 | - if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
|
|
| 3775 | - wp_send_json( $json ); |
|
| 3776 | - } |
|
| 3774 | + if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
|
|
| 3775 | + wp_send_json( $json ); |
|
| 3776 | + } |
|
| 3777 | 3777 | |
| 3778 | - $total = $json['rows']; |
|
| 3779 | - $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1; |
|
| 3780 | - $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0; |
|
| 3778 | + $total = $json['rows']; |
|
| 3779 | + $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1; |
|
| 3780 | + $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0; |
|
| 3781 | 3781 | |
| 3782 | - $count = $limit; |
|
| 3782 | + $count = $limit; |
|
| 3783 | 3783 | |
| 3784 | - if ($count < $total) {
|
|
| 3785 | - $count = $processed + $count; |
|
| 3786 | - if ($count > $total) {
|
|
| 3787 | - $count = $total; |
|
| 3788 | - } |
|
| 3789 | - } else {
|
|
| 3790 | - $count = $total; |
|
| 3791 | - } |
|
| 3784 | + if ($count < $total) {
|
|
| 3785 | + $count = $processed + $count; |
|
| 3786 | + if ($count > $total) {
|
|
| 3787 | + $count = $total; |
|
| 3788 | + } |
|
| 3789 | + } else {
|
|
| 3790 | + $count = $total; |
|
| 3791 | + } |
|
| 3792 | 3792 | |
| 3793 | - $created = 0; |
|
| 3794 | - $updated = 0; |
|
| 3795 | - $skipped = 0; |
|
| 3796 | - $invalid = 0; |
|
| 3797 | - $invalid_addr = 0; |
|
| 3798 | - $images = 0; |
|
| 3793 | + $created = 0; |
|
| 3794 | + $updated = 0; |
|
| 3795 | + $skipped = 0; |
|
| 3796 | + $invalid = 0; |
|
| 3797 | + $invalid_addr = 0; |
|
| 3798 | + $images = 0; |
|
| 3799 | 3799 | |
| 3800 | - $gd_post_info = array(); |
|
| 3801 | - $countpost = 0; |
|
| 3800 | + $gd_post_info = array(); |
|
| 3801 | + $countpost = 0; |
|
| 3802 | 3802 | |
| 3803 | - $post_types = geodir_get_posttypes(); |
|
| 3803 | + $post_types = geodir_get_posttypes(); |
|
| 3804 | 3804 | |
| 3805 | - if ( $task == 'import_cat' ) {
|
|
| 3806 | - if (!empty($file)) {
|
|
| 3807 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 3805 | + if ( $task == 'import_cat' ) {
|
|
| 3806 | + if (!empty($file)) {
|
|
| 3807 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 3808 | 3808 | |
| 3809 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 3810 | - $json['error'] = CSV_INVAILD_FILE; |
|
| 3811 | - wp_send_json( $json ); |
|
| 3812 | - exit; |
|
| 3813 | - } |
|
| 3809 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 3810 | + $json['error'] = CSV_INVAILD_FILE; |
|
| 3811 | + wp_send_json( $json ); |
|
| 3812 | + exit; |
|
| 3813 | + } |
|
| 3814 | 3814 | |
| 3815 | - $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');
|
|
| 3815 | + $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');
|
|
| 3816 | 3816 | |
| 3817 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 3818 | - $index = $processed + $i; |
|
| 3817 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 3818 | + $index = $processed + $i; |
|
| 3819 | 3819 | |
| 3820 | - if (isset($file[$index])) {
|
|
| 3821 | - $row = $file[$index]; |
|
| 3822 | - $row = array_map( 'trim', $row ); |
|
| 3823 | - //$row = array_map( 'utf8_encode', $row ); |
|
| 3820 | + if (isset($file[$index])) {
|
|
| 3821 | + $row = $file[$index]; |
|
| 3822 | + $row = array_map( 'trim', $row ); |
|
| 3823 | + //$row = array_map( 'utf8_encode', $row ); |
|
| 3824 | 3824 | |
| 3825 | - $cat_id = ''; |
|
| 3826 | - $cat_name = ''; |
|
| 3827 | - $cat_slug = ''; |
|
| 3828 | - $cat_posttype = ''; |
|
| 3829 | - $cat_parent = ''; |
|
| 3830 | - $cat_description = ''; |
|
| 3831 | - $cat_schema = ''; |
|
| 3832 | - $cat_top_description = ''; |
|
| 3833 | - $cat_image = ''; |
|
| 3834 | - $cat_icon = ''; |
|
| 3835 | - $cat_language = ''; |
|
| 3836 | - $cat_id_original = ''; |
|
| 3825 | + $cat_id = ''; |
|
| 3826 | + $cat_name = ''; |
|
| 3827 | + $cat_slug = ''; |
|
| 3828 | + $cat_posttype = ''; |
|
| 3829 | + $cat_parent = ''; |
|
| 3830 | + $cat_description = ''; |
|
| 3831 | + $cat_schema = ''; |
|
| 3832 | + $cat_top_description = ''; |
|
| 3833 | + $cat_image = ''; |
|
| 3834 | + $cat_icon = ''; |
|
| 3835 | + $cat_language = ''; |
|
| 3836 | + $cat_id_original = ''; |
|
| 3837 | 3837 | |
| 3838 | - $c = 0; |
|
| 3839 | - foreach ($columns as $column ) {
|
|
| 3840 | - if ( $column == 'cat_id' ) {
|
|
| 3841 | - $cat_id = (int)$row[$c]; |
|
| 3842 | - } else if ( $column == 'cat_name' ) {
|
|
| 3843 | - $cat_name = $row[$c]; |
|
| 3844 | - } else if ( $column == 'cat_slug' ) {
|
|
| 3845 | - $cat_slug = $row[$c]; |
|
| 3846 | - } else if ( $column == 'cat_posttype' ) {
|
|
| 3847 | - $cat_posttype = $row[$c]; |
|
| 3848 | - } else if ( $column == 'cat_parent' ) {
|
|
| 3849 | - $cat_parent = trim($row[$c]); |
|
| 3850 | - } else if ( $column == 'cat_schema' && $row[$c] != '' ) {
|
|
| 3851 | - $cat_schema = $row[$c]; |
|
| 3852 | - } else if ( $column == 'cat_description' ) {
|
|
| 3853 | - $cat_description = $row[$c]; |
|
| 3854 | - } else if ( $column == 'cat_top_description' ) {
|
|
| 3855 | - $cat_top_description = $row[$c]; |
|
| 3856 | - } else if ( $column == 'cat_image' ) {
|
|
| 3857 | - $cat_image = $row[$c]; |
|
| 3858 | - } else if ( $column == 'cat_icon' ) {
|
|
| 3859 | - $cat_icon = $row[$c]; |
|
| 3860 | - } |
|
| 3861 | - // WPML |
|
| 3862 | - if ( $is_wpml ) {
|
|
| 3863 | - if ( $column == 'cat_language' ) {
|
|
| 3864 | - $cat_language = geodir_strtolower( trim( $row[$c] ) ); |
|
| 3865 | - } else if ( $column == 'cat_id_original' ) {
|
|
| 3866 | - $cat_id_original = (int)$row[$c]; |
|
| 3867 | - } |
|
| 3868 | - } |
|
| 3869 | - // WPML |
|
| 3870 | - $c++; |
|
| 3871 | - } |
|
| 3838 | + $c = 0; |
|
| 3839 | + foreach ($columns as $column ) {
|
|
| 3840 | + if ( $column == 'cat_id' ) {
|
|
| 3841 | + $cat_id = (int)$row[$c]; |
|
| 3842 | + } else if ( $column == 'cat_name' ) {
|
|
| 3843 | + $cat_name = $row[$c]; |
|
| 3844 | + } else if ( $column == 'cat_slug' ) {
|
|
| 3845 | + $cat_slug = $row[$c]; |
|
| 3846 | + } else if ( $column == 'cat_posttype' ) {
|
|
| 3847 | + $cat_posttype = $row[$c]; |
|
| 3848 | + } else if ( $column == 'cat_parent' ) {
|
|
| 3849 | + $cat_parent = trim($row[$c]); |
|
| 3850 | + } else if ( $column == 'cat_schema' && $row[$c] != '' ) {
|
|
| 3851 | + $cat_schema = $row[$c]; |
|
| 3852 | + } else if ( $column == 'cat_description' ) {
|
|
| 3853 | + $cat_description = $row[$c]; |
|
| 3854 | + } else if ( $column == 'cat_top_description' ) {
|
|
| 3855 | + $cat_top_description = $row[$c]; |
|
| 3856 | + } else if ( $column == 'cat_image' ) {
|
|
| 3857 | + $cat_image = $row[$c]; |
|
| 3858 | + } else if ( $column == 'cat_icon' ) {
|
|
| 3859 | + $cat_icon = $row[$c]; |
|
| 3860 | + } |
|
| 3861 | + // WPML |
|
| 3862 | + if ( $is_wpml ) {
|
|
| 3863 | + if ( $column == 'cat_language' ) {
|
|
| 3864 | + $cat_language = geodir_strtolower( trim( $row[$c] ) ); |
|
| 3865 | + } else if ( $column == 'cat_id_original' ) {
|
|
| 3866 | + $cat_id_original = (int)$row[$c]; |
|
| 3867 | + } |
|
| 3868 | + } |
|
| 3869 | + // WPML |
|
| 3870 | + $c++; |
|
| 3871 | + } |
|
| 3872 | 3872 | |
| 3873 | - if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {
|
|
| 3874 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 3873 | + if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {
|
|
| 3874 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 3875 | 3875 | |
| 3876 | - $invalid++; |
|
| 3877 | - continue; |
|
| 3878 | - } |
|
| 3876 | + $invalid++; |
|
| 3877 | + continue; |
|
| 3878 | + } |
|
| 3879 | 3879 | |
| 3880 | - // WPML |
|
| 3881 | - if ($is_wpml && $cat_language != '') {
|
|
| 3882 | - $sitepress->switch_lang($cat_language, true); |
|
| 3883 | - } |
|
| 3884 | - // WPML |
|
| 3880 | + // WPML |
|
| 3881 | + if ($is_wpml && $cat_language != '') {
|
|
| 3882 | + $sitepress->switch_lang($cat_language, true); |
|
| 3883 | + } |
|
| 3884 | + // WPML |
|
| 3885 | 3885 | |
| 3886 | - $term_data = array(); |
|
| 3887 | - $term_data['name'] = $cat_name; |
|
| 3888 | - $term_data['slug'] = $cat_slug; |
|
| 3889 | - $term_data['description'] = $cat_description; |
|
| 3890 | - $term_data['cat_schema'] = $cat_schema; |
|
| 3891 | - $term_data['top_description'] = $cat_top_description; |
|
| 3892 | - $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : ''; |
|
| 3893 | - $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : ''; |
|
| 3886 | + $term_data = array(); |
|
| 3887 | + $term_data['name'] = $cat_name; |
|
| 3888 | + $term_data['slug'] = $cat_slug; |
|
| 3889 | + $term_data['description'] = $cat_description; |
|
| 3890 | + $term_data['cat_schema'] = $cat_schema; |
|
| 3891 | + $term_data['top_description'] = $cat_top_description; |
|
| 3892 | + $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : ''; |
|
| 3893 | + $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : ''; |
|
| 3894 | 3894 | |
| 3895 | - //$term_data = array_map( 'utf8_encode', $term_data ); |
|
| 3895 | + //$term_data = array_map( 'utf8_encode', $term_data ); |
|
| 3896 | 3896 | |
| 3897 | - $taxonomy = $cat_posttype . 'category'; |
|
| 3897 | + $taxonomy = $cat_posttype . 'category'; |
|
| 3898 | 3898 | |
| 3899 | - $term_data['taxonomy'] = $taxonomy; |
|
| 3899 | + $term_data['taxonomy'] = $taxonomy; |
|
| 3900 | 3900 | |
| 3901 | - $term_parent_id = 0; |
|
| 3902 | - if ($cat_parent != "" || (int)$cat_parent > 0) {
|
|
| 3903 | - $term_parent = ''; |
|
| 3901 | + $term_parent_id = 0; |
|
| 3902 | + if ($cat_parent != "" || (int)$cat_parent > 0) {
|
|
| 3903 | + $term_parent = ''; |
|
| 3904 | 3904 | |
| 3905 | - if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
|
|
| 3906 | - // |
|
| 3907 | - } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
|
|
| 3908 | - // |
|
| 3909 | - } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
|
|
| 3910 | - // |
|
| 3911 | - } else {
|
|
| 3912 | - $term_parent_data = array(); |
|
| 3913 | - $term_parent_data['name'] = $cat_parent; |
|
| 3914 | - //$term_parent_data = array_map( 'utf8_encode', $term_parent_data ); |
|
| 3915 | - $term_parent_data['taxonomy'] = $taxonomy; |
|
| 3905 | + if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
|
|
| 3906 | + // |
|
| 3907 | + } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
|
|
| 3908 | + // |
|
| 3909 | + } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
|
|
| 3910 | + // |
|
| 3911 | + } else {
|
|
| 3912 | + $term_parent_data = array(); |
|
| 3913 | + $term_parent_data['name'] = $cat_parent; |
|
| 3914 | + //$term_parent_data = array_map( 'utf8_encode', $term_parent_data ); |
|
| 3915 | + $term_parent_data['taxonomy'] = $taxonomy; |
|
| 3916 | 3916 | |
| 3917 | - $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data ); |
|
| 3918 | - } |
|
| 3917 | + $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data ); |
|
| 3918 | + } |
|
| 3919 | 3919 | |
| 3920 | - if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
|
|
| 3921 | - $term_parent_id = (int)$term_parent->term_id; |
|
| 3922 | - } |
|
| 3923 | - } |
|
| 3924 | - $term_data['parent'] = (int)$term_parent_id; |
|
| 3920 | + if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
|
|
| 3921 | + $term_parent_id = (int)$term_parent->term_id; |
|
| 3922 | + } |
|
| 3923 | + } |
|
| 3924 | + $term_data['parent'] = (int)$term_parent_id; |
|
| 3925 | 3925 | |
| 3926 | - $term_id = NULL; |
|
| 3927 | - if ( $import_choice == 'update' ) {
|
|
| 3928 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3929 | - $term_data['term_id'] = $term['term_id']; |
|
| 3926 | + $term_id = NULL; |
|
| 3927 | + if ( $import_choice == 'update' ) {
|
|
| 3928 | + if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3929 | + $term_data['term_id'] = $term['term_id']; |
|
| 3930 | 3930 | |
| 3931 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3932 | - $updated++; |
|
| 3933 | - } else {
|
|
| 3934 | - $invalid++; |
|
| 3935 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3936 | - } |
|
| 3937 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3938 | - $term_data['term_id'] = $term['term_id']; |
|
| 3931 | + if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3932 | + $updated++; |
|
| 3933 | + } else {
|
|
| 3934 | + $invalid++; |
|
| 3935 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3936 | + } |
|
| 3937 | + } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3938 | + $term_data['term_id'] = $term['term_id']; |
|
| 3939 | 3939 | |
| 3940 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3941 | - $updated++; |
|
| 3942 | - } else {
|
|
| 3943 | - $invalid++; |
|
| 3944 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3945 | - } |
|
| 3946 | - } else {
|
|
| 3947 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3948 | - $created++; |
|
| 3949 | - } else {
|
|
| 3950 | - $invalid++; |
|
| 3951 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3952 | - } |
|
| 3953 | - } |
|
| 3954 | - } else if ( $import_choice == 'skip' ) {
|
|
| 3955 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3956 | - $skipped++; |
|
| 3957 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3958 | - $skipped++; |
|
| 3959 | - } else {
|
|
| 3960 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3961 | - $created++; |
|
| 3962 | - } else {
|
|
| 3963 | - $invalid++; |
|
| 3964 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3965 | - } |
|
| 3966 | - } |
|
| 3967 | - } else {
|
|
| 3968 | - $invalid++; |
|
| 3969 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3970 | - } |
|
| 3940 | + if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3941 | + $updated++; |
|
| 3942 | + } else {
|
|
| 3943 | + $invalid++; |
|
| 3944 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3945 | + } |
|
| 3946 | + } else {
|
|
| 3947 | + if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3948 | + $created++; |
|
| 3949 | + } else {
|
|
| 3950 | + $invalid++; |
|
| 3951 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3952 | + } |
|
| 3953 | + } |
|
| 3954 | + } else if ( $import_choice == 'skip' ) {
|
|
| 3955 | + if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3956 | + $skipped++; |
|
| 3957 | + } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3958 | + $skipped++; |
|
| 3959 | + } else {
|
|
| 3960 | + if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3961 | + $created++; |
|
| 3962 | + } else {
|
|
| 3963 | + $invalid++; |
|
| 3964 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3965 | + } |
|
| 3966 | + } |
|
| 3967 | + } else {
|
|
| 3968 | + $invalid++; |
|
| 3969 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3970 | + } |
|
| 3971 | 3971 | |
| 3972 | - if ( $term_id ) {
|
|
| 3973 | - // WPML |
|
| 3974 | - if ($is_wpml && geodir_wpml_is_taxonomy_translated($taxonomy) && $cat_id_original > 0 && $cat_language != '') {
|
|
| 3975 | - $wpml_element_type = 'tax_' . $taxonomy; |
|
| 3976 | - $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type ); |
|
| 3977 | - $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 3978 | - |
|
| 3979 | - $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type ); |
|
| 3972 | + if ( $term_id ) {
|
|
| 3973 | + // WPML |
|
| 3974 | + if ($is_wpml && geodir_wpml_is_taxonomy_translated($taxonomy) && $cat_id_original > 0 && $cat_language != '') {
|
|
| 3975 | + $wpml_element_type = 'tax_' . $taxonomy; |
|
| 3976 | + $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type ); |
|
| 3977 | + $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 3978 | + |
|
| 3979 | + $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type ); |
|
| 3980 | 3980 | |
| 3981 | - $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language ); |
|
| 3982 | - } |
|
| 3983 | - // WPML |
|
| 3981 | + $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language ); |
|
| 3982 | + } |
|
| 3983 | + // WPML |
|
| 3984 | 3984 | |
| 3985 | - if ( isset( $term_data['top_description'] ) ) {
|
|
| 3986 | - geodir_update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype ); |
|
| 3987 | - } |
|
| 3985 | + if ( isset( $term_data['top_description'] ) ) {
|
|
| 3986 | + geodir_update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype ); |
|
| 3987 | + } |
|
| 3988 | 3988 | |
| 3989 | - if ( isset( $term_data['cat_schema'] ) ) {
|
|
| 3990 | - geodir_update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype ); |
|
| 3991 | - } |
|
| 3989 | + if ( isset( $term_data['cat_schema'] ) ) {
|
|
| 3990 | + geodir_update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype ); |
|
| 3991 | + } |
|
| 3992 | 3992 | |
| 3993 | - $attachment = false; |
|
| 3994 | - if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {
|
|
| 3995 | - $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype ); |
|
| 3996 | - $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
| 3993 | + $attachment = false; |
|
| 3994 | + if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {
|
|
| 3995 | + $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype ); |
|
| 3996 | + $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
| 3997 | 3997 | |
| 3998 | - if ( basename($cat_image) != $term_data['image'] ) {
|
|
| 3999 | - $attachment = true; |
|
| 4000 | - geodir_update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype ); |
|
| 4001 | - } |
|
| 4002 | - } |
|
| 3998 | + if ( basename($cat_image) != $term_data['image'] ) {
|
|
| 3999 | + $attachment = true; |
|
| 4000 | + geodir_update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype ); |
|
| 4001 | + } |
|
| 4002 | + } |
|
| 4003 | 4003 | |
| 4004 | - if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {
|
|
| 4005 | - $cat_icon = geodir_get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype ); |
|
| 4006 | - $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
| 4007 | - |
|
| 4008 | - if ( basename($cat_icon) != $term_data['icon'] ) {
|
|
| 4009 | - $attachment = true; |
|
| 4010 | - geodir_update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype ); |
|
| 4011 | - } |
|
| 4012 | - } |
|
| 4004 | + if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {
|
|
| 4005 | + $cat_icon = geodir_get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype ); |
|
| 4006 | + $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
| 4007 | + |
|
| 4008 | + if ( basename($cat_icon) != $term_data['icon'] ) {
|
|
| 4009 | + $attachment = true; |
|
| 4010 | + geodir_update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype ); |
|
| 4011 | + } |
|
| 4012 | + } |
|
| 4013 | 4013 | |
| 4014 | - if ( $attachment ) {
|
|
| 4015 | - $images++; |
|
| 4016 | - } |
|
| 4017 | - } |
|
| 4014 | + if ( $attachment ) {
|
|
| 4015 | + $images++; |
|
| 4016 | + } |
|
| 4017 | + } |
|
| 4018 | 4018 | |
| 4019 | - // WPML |
|
| 4020 | - if ($is_wpml && $cat_language != '') {
|
|
| 4021 | - $sitepress->switch_lang($active_lang, true); |
|
| 4022 | - } |
|
| 4023 | - // WPML |
|
| 4024 | - } |
|
| 4025 | - } |
|
| 4026 | - } |
|
| 4019 | + // WPML |
|
| 4020 | + if ($is_wpml && $cat_language != '') {
|
|
| 4021 | + $sitepress->switch_lang($active_lang, true); |
|
| 4022 | + } |
|
| 4023 | + // WPML |
|
| 4024 | + } |
|
| 4025 | + } |
|
| 4026 | + } |
|
| 4027 | 4027 | |
| 4028 | - $json = array(); |
|
| 4029 | - $json['processed'] = $limit; |
|
| 4030 | - $json['created'] = $created; |
|
| 4031 | - $json['updated'] = $updated; |
|
| 4032 | - $json['skipped'] = $skipped; |
|
| 4033 | - $json['invalid'] = $invalid; |
|
| 4034 | - $json['images'] = $images; |
|
| 4028 | + $json = array(); |
|
| 4029 | + $json['processed'] = $limit; |
|
| 4030 | + $json['created'] = $created; |
|
| 4031 | + $json['updated'] = $updated; |
|
| 4032 | + $json['skipped'] = $skipped; |
|
| 4033 | + $json['invalid'] = $invalid; |
|
| 4034 | + $json['images'] = $images; |
|
| 4035 | 4035 | |
| 4036 | - wp_send_json( $json ); |
|
| 4037 | - exit; |
|
| 4038 | - } else if ( $task == 'import_post' ) {
|
|
| 4039 | - $xtimings['###1'] = microtime(true)-$xstart; |
|
| 4040 | - //run some stuff to make the import quicker |
|
| 4041 | - wp_defer_term_counting( true ); |
|
| 4042 | - wp_defer_comment_counting( true ); |
|
| 4043 | - $wpdb->query( 'SET autocommit = 0;' ); |
|
| 4036 | + wp_send_json( $json ); |
|
| 4037 | + exit; |
|
| 4038 | + } else if ( $task == 'import_post' ) {
|
|
| 4039 | + $xtimings['###1'] = microtime(true)-$xstart; |
|
| 4040 | + //run some stuff to make the import quicker |
|
| 4041 | + wp_defer_term_counting( true ); |
|
| 4042 | + wp_defer_comment_counting( true ); |
|
| 4043 | + $wpdb->query( 'SET autocommit = 0;' ); |
|
| 4044 | 4044 | // |
| 4045 | 4045 | // remove_all_actions('publish_post');
|
| 4046 | 4046 | // remove_all_actions('transition_post_status');
|
| 4047 | 4047 | // remove_all_actions('publish_future_post');
|
| 4048 | 4048 | |
| 4049 | - if (!empty($file)) {
|
|
| 4050 | - $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 4051 | - $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
|
| 4052 | - $default_status = 'publish'; |
|
| 4053 | - $current_date = date_i18n( 'Y-m-d', time() ); |
|
| 4049 | + if (!empty($file)) {
|
|
| 4050 | + $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 4051 | + $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
|
| 4052 | + $default_status = 'publish'; |
|
| 4053 | + $current_date = date_i18n( 'Y-m-d', time() ); |
|
| 4054 | 4054 | |
| 4055 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4055 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4056 | 4056 | |
| 4057 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4058 | - $json['error'] = CSV_INVAILD_FILE; |
|
| 4059 | - wp_send_json( $json ); |
|
| 4060 | - exit; |
|
| 4061 | - } |
|
| 4062 | - $xtimings['###2'] = microtime(true)-$xstart; |
|
| 4063 | - $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
|
|
| 4064 | - $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' ); |
|
| 4065 | - $processed_actual = 0; |
|
| 4066 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 4067 | - $index = $processed + $i; |
|
| 4068 | - $gd_post = array(); |
|
| 4057 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4058 | + $json['error'] = CSV_INVAILD_FILE; |
|
| 4059 | + wp_send_json( $json ); |
|
| 4060 | + exit; |
|
| 4061 | + } |
|
| 4062 | + $xtimings['###2'] = microtime(true)-$xstart; |
|
| 4063 | + $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
|
|
| 4064 | + $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' ); |
|
| 4065 | + $processed_actual = 0; |
|
| 4066 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 4067 | + $index = $processed + $i; |
|
| 4068 | + $gd_post = array(); |
|
| 4069 | 4069 | |
| 4070 | - if (isset($file[$index])) {
|
|
| 4071 | - $processed_actual++; |
|
| 4072 | - $row = $file[$index]; |
|
| 4073 | - $row = array_map( 'trim', $row ); |
|
| 4074 | - //$row = array_map( 'utf8_encode', $row ); |
|
| 4075 | - $row = array_map( 'addslashes_gpc', $row ); |
|
| 4070 | + if (isset($file[$index])) {
|
|
| 4071 | + $processed_actual++; |
|
| 4072 | + $row = $file[$index]; |
|
| 4073 | + $row = array_map( 'trim', $row ); |
|
| 4074 | + //$row = array_map( 'utf8_encode', $row ); |
|
| 4075 | + $row = array_map( 'addslashes_gpc', $row ); |
|
| 4076 | 4076 | |
| 4077 | - $post_id = ''; |
|
| 4078 | - $post_title = ''; |
|
| 4079 | - $post_date = ''; |
|
| 4080 | - $post_author = ''; |
|
| 4081 | - $post_content = ''; |
|
| 4082 | - $post_category_arr = array(); |
|
| 4083 | - $default_category = ''; |
|
| 4084 | - $post_tags = array(); |
|
| 4085 | - $post_type = ''; |
|
| 4086 | - $post_status = ''; |
|
| 4087 | - $is_featured = 0; |
|
| 4088 | - $geodir_video = ''; |
|
| 4089 | - $post_address = ''; |
|
| 4090 | - $post_city = ''; |
|
| 4091 | - $post_region = ''; |
|
| 4092 | - $post_country = ''; |
|
| 4093 | - $post_zip = ''; |
|
| 4094 | - $post_latitude = ''; |
|
| 4095 | - $post_longitude = ''; |
|
| 4096 | - $post_neighbourhood = ''; |
|
| 4097 | - $neighbourhood_latitude = ''; |
|
| 4098 | - $neighbourhood_longitude = ''; |
|
| 4099 | - $geodir_timing = ''; |
|
| 4100 | - $geodir_contact = ''; |
|
| 4101 | - $geodir_email = ''; |
|
| 4102 | - $geodir_website = ''; |
|
| 4103 | - $geodir_twitter = ''; |
|
| 4104 | - $geodir_facebook = ''; |
|
| 4105 | - $geodir_twitter = ''; |
|
| 4106 | - $geodir_link_business = null; |
|
| 4107 | - $post_images = array(); |
|
| 4077 | + $post_id = ''; |
|
| 4078 | + $post_title = ''; |
|
| 4079 | + $post_date = ''; |
|
| 4080 | + $post_author = ''; |
|
| 4081 | + $post_content = ''; |
|
| 4082 | + $post_category_arr = array(); |
|
| 4083 | + $default_category = ''; |
|
| 4084 | + $post_tags = array(); |
|
| 4085 | + $post_type = ''; |
|
| 4086 | + $post_status = ''; |
|
| 4087 | + $is_featured = 0; |
|
| 4088 | + $geodir_video = ''; |
|
| 4089 | + $post_address = ''; |
|
| 4090 | + $post_city = ''; |
|
| 4091 | + $post_region = ''; |
|
| 4092 | + $post_country = ''; |
|
| 4093 | + $post_zip = ''; |
|
| 4094 | + $post_latitude = ''; |
|
| 4095 | + $post_longitude = ''; |
|
| 4096 | + $post_neighbourhood = ''; |
|
| 4097 | + $neighbourhood_latitude = ''; |
|
| 4098 | + $neighbourhood_longitude = ''; |
|
| 4099 | + $geodir_timing = ''; |
|
| 4100 | + $geodir_contact = ''; |
|
| 4101 | + $geodir_email = ''; |
|
| 4102 | + $geodir_website = ''; |
|
| 4103 | + $geodir_twitter = ''; |
|
| 4104 | + $geodir_facebook = ''; |
|
| 4105 | + $geodir_twitter = ''; |
|
| 4106 | + $geodir_link_business = null; |
|
| 4107 | + $post_images = array(); |
|
| 4108 | 4108 | |
| 4109 | - $expire_date = 'Never'; |
|
| 4109 | + $expire_date = 'Never'; |
|
| 4110 | 4110 | |
| 4111 | - $language = ''; |
|
| 4112 | - $original_post_id = ''; |
|
| 4111 | + $language = ''; |
|
| 4112 | + $original_post_id = ''; |
|
| 4113 | 4113 | |
| 4114 | - $c = 0; |
|
| 4115 | - foreach ($columns as $column ) {
|
|
| 4116 | - $gd_post[$column] = $row[$c]; |
|
| 4114 | + $c = 0; |
|
| 4115 | + foreach ($columns as $column ) {
|
|
| 4116 | + $gd_post[$column] = $row[$c]; |
|
| 4117 | 4117 | |
| 4118 | - if ( $column == 'post_id' ) {
|
|
| 4119 | - $post_id = $row[$c]; |
|
| 4120 | - } else if ( $column == 'post_title' ) {
|
|
| 4121 | - $post_title = sanitize_text_field($row[$c]); |
|
| 4122 | - } else if ( $column == 'post_author' ) {
|
|
| 4123 | - $post_author = $row[$c]; |
|
| 4124 | - } else if ( $column == 'post_date' ) {
|
|
| 4125 | - $post_date = $row[$c]; |
|
| 4126 | - } else if ( $column == 'post_content' ) {
|
|
| 4127 | - $post_content = $row[$c]; |
|
| 4128 | - } else if ( $column == 'post_category' && $row[$c] != '' ) {
|
|
| 4129 | - $post_category_arr = explode( ',', $row[$c] ); |
|
| 4130 | - } else if ( $column == 'default_category' ) {
|
|
| 4131 | - $default_category = wp_kses_normalize_entities($row[$c]); |
|
| 4132 | - } else if ( $column == 'post_tags' && $row[$c] != '' ) {
|
|
| 4133 | - $post_tags = explode( ',', sanitize_text_field($row[$c]) ); |
|
| 4134 | - } else if ( $column == 'post_type' ) {
|
|
| 4135 | - $post_type = $row[$c]; |
|
| 4136 | - } else if ( $column == 'post_status' ) {
|
|
| 4137 | - $post_status = sanitize_key( $row[$c] ); |
|
| 4138 | - } else if ( $column == 'is_featured' ) {
|
|
| 4139 | - $is_featured = (int)$row[$c]; |
|
| 4140 | - } else if ( $column == 'geodir_video' ) {
|
|
| 4141 | - $geodir_video = $row[$c]; |
|
| 4142 | - } else if ( $column == 'post_address' ) {
|
|
| 4143 | - $post_address = sanitize_text_field($row[$c]); |
|
| 4144 | - } else if ( $column == 'post_city' ) {
|
|
| 4145 | - $post_city = sanitize_text_field($row[$c]); |
|
| 4146 | - } else if ( $column == 'post_region' ) {
|
|
| 4147 | - $post_region = sanitize_text_field($row[$c]); |
|
| 4148 | - } else if ( $column == 'post_country' ) {
|
|
| 4149 | - $post_country = sanitize_text_field($row[$c]); |
|
| 4150 | - } else if ( $column == 'post_zip' ) {
|
|
| 4151 | - $post_zip = sanitize_text_field($row[$c]); |
|
| 4152 | - } else if ( $column == 'post_latitude' ) {
|
|
| 4153 | - $post_latitude = sanitize_text_field($row[$c]); |
|
| 4154 | - } else if ( $column == 'post_longitude' ) {
|
|
| 4155 | - $post_longitude = sanitize_text_field($row[$c]); |
|
| 4156 | - } else if ( $column == 'post_neighbourhood' ) {
|
|
| 4157 | - $post_neighbourhood = sanitize_text_field($row[$c]); |
|
| 4158 | - unset($gd_post[$column]); |
|
| 4159 | - } else if ( $column == 'neighbourhood_latitude' ) {
|
|
| 4160 | - $neighbourhood_latitude = sanitize_text_field($row[$c]); |
|
| 4161 | - } else if ( $column == 'neighbourhood_longitude' ) {
|
|
| 4162 | - $neighbourhood_longitude = sanitize_text_field($row[$c]); |
|
| 4163 | - } else if ( $column == 'geodir_timing' ) {
|
|
| 4164 | - $geodir_timing = sanitize_text_field($row[$c]); |
|
| 4165 | - } else if ( $column == 'geodir_contact' ) {
|
|
| 4166 | - $geodir_contact = sanitize_text_field($row[$c]); |
|
| 4167 | - } else if ( $column == 'geodir_email' ) {
|
|
| 4168 | - $geodir_email = sanitize_email($row[$c]); |
|
| 4169 | - } else if ( $column == 'geodir_website' ) {
|
|
| 4170 | - $geodir_website = sanitize_text_field($row[$c]); |
|
| 4171 | - } else if ( $column == 'geodir_twitter' ) {
|
|
| 4172 | - $geodir_twitter = sanitize_text_field($row[$c]); |
|
| 4173 | - } else if ( $column == 'geodir_facebook' ) {
|
|
| 4174 | - $geodir_facebook = sanitize_text_field($row[$c]); |
|
| 4175 | - } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
|
|
| 4176 | - $post_images[] = $row[$c]; |
|
| 4177 | - } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
|
|
| 4178 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) ); |
|
| 4179 | - } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
|
|
| 4180 | - $row[$c] = str_replace('/', '-', $row[$c]);
|
|
| 4181 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) ); |
|
| 4182 | - } else if ( strpos( $column, 'linked_' ) === 0 ) {
|
|
| 4183 | - $geodir_link_business = (int)$row[$c]; |
|
| 4184 | - } |
|
| 4185 | - // WPML |
|
| 4186 | - if ($is_wpml) {
|
|
| 4187 | - if ($column == 'language') {
|
|
| 4188 | - $language = geodir_strtolower(trim($row[$c])); |
|
| 4189 | - } else if ($column == 'original_post_id') {
|
|
| 4190 | - $original_post_id = (int)$row[$c]; |
|
| 4191 | - } |
|
| 4192 | - } |
|
| 4193 | - // WPML |
|
| 4194 | - $c++; |
|
| 4195 | - } |
|
| 4196 | - // listing claimed or not |
|
| 4197 | - if ($is_claim_active && isset($gd_post['claimed'])) {
|
|
| 4198 | - $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4199 | - } |
|
| 4118 | + if ( $column == 'post_id' ) {
|
|
| 4119 | + $post_id = $row[$c]; |
|
| 4120 | + } else if ( $column == 'post_title' ) {
|
|
| 4121 | + $post_title = sanitize_text_field($row[$c]); |
|
| 4122 | + } else if ( $column == 'post_author' ) {
|
|
| 4123 | + $post_author = $row[$c]; |
|
| 4124 | + } else if ( $column == 'post_date' ) {
|
|
| 4125 | + $post_date = $row[$c]; |
|
| 4126 | + } else if ( $column == 'post_content' ) {
|
|
| 4127 | + $post_content = $row[$c]; |
|
| 4128 | + } else if ( $column == 'post_category' && $row[$c] != '' ) {
|
|
| 4129 | + $post_category_arr = explode( ',', $row[$c] ); |
|
| 4130 | + } else if ( $column == 'default_category' ) {
|
|
| 4131 | + $default_category = wp_kses_normalize_entities($row[$c]); |
|
| 4132 | + } else if ( $column == 'post_tags' && $row[$c] != '' ) {
|
|
| 4133 | + $post_tags = explode( ',', sanitize_text_field($row[$c]) ); |
|
| 4134 | + } else if ( $column == 'post_type' ) {
|
|
| 4135 | + $post_type = $row[$c]; |
|
| 4136 | + } else if ( $column == 'post_status' ) {
|
|
| 4137 | + $post_status = sanitize_key( $row[$c] ); |
|
| 4138 | + } else if ( $column == 'is_featured' ) {
|
|
| 4139 | + $is_featured = (int)$row[$c]; |
|
| 4140 | + } else if ( $column == 'geodir_video' ) {
|
|
| 4141 | + $geodir_video = $row[$c]; |
|
| 4142 | + } else if ( $column == 'post_address' ) {
|
|
| 4143 | + $post_address = sanitize_text_field($row[$c]); |
|
| 4144 | + } else if ( $column == 'post_city' ) {
|
|
| 4145 | + $post_city = sanitize_text_field($row[$c]); |
|
| 4146 | + } else if ( $column == 'post_region' ) {
|
|
| 4147 | + $post_region = sanitize_text_field($row[$c]); |
|
| 4148 | + } else if ( $column == 'post_country' ) {
|
|
| 4149 | + $post_country = sanitize_text_field($row[$c]); |
|
| 4150 | + } else if ( $column == 'post_zip' ) {
|
|
| 4151 | + $post_zip = sanitize_text_field($row[$c]); |
|
| 4152 | + } else if ( $column == 'post_latitude' ) {
|
|
| 4153 | + $post_latitude = sanitize_text_field($row[$c]); |
|
| 4154 | + } else if ( $column == 'post_longitude' ) {
|
|
| 4155 | + $post_longitude = sanitize_text_field($row[$c]); |
|
| 4156 | + } else if ( $column == 'post_neighbourhood' ) {
|
|
| 4157 | + $post_neighbourhood = sanitize_text_field($row[$c]); |
|
| 4158 | + unset($gd_post[$column]); |
|
| 4159 | + } else if ( $column == 'neighbourhood_latitude' ) {
|
|
| 4160 | + $neighbourhood_latitude = sanitize_text_field($row[$c]); |
|
| 4161 | + } else if ( $column == 'neighbourhood_longitude' ) {
|
|
| 4162 | + $neighbourhood_longitude = sanitize_text_field($row[$c]); |
|
| 4163 | + } else if ( $column == 'geodir_timing' ) {
|
|
| 4164 | + $geodir_timing = sanitize_text_field($row[$c]); |
|
| 4165 | + } else if ( $column == 'geodir_contact' ) {
|
|
| 4166 | + $geodir_contact = sanitize_text_field($row[$c]); |
|
| 4167 | + } else if ( $column == 'geodir_email' ) {
|
|
| 4168 | + $geodir_email = sanitize_email($row[$c]); |
|
| 4169 | + } else if ( $column == 'geodir_website' ) {
|
|
| 4170 | + $geodir_website = sanitize_text_field($row[$c]); |
|
| 4171 | + } else if ( $column == 'geodir_twitter' ) {
|
|
| 4172 | + $geodir_twitter = sanitize_text_field($row[$c]); |
|
| 4173 | + } else if ( $column == 'geodir_facebook' ) {
|
|
| 4174 | + $geodir_facebook = sanitize_text_field($row[$c]); |
|
| 4175 | + } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
|
|
| 4176 | + $post_images[] = $row[$c]; |
|
| 4177 | + } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
|
|
| 4178 | + $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) ); |
|
| 4179 | + } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
|
|
| 4180 | + $row[$c] = str_replace('/', '-', $row[$c]);
|
|
| 4181 | + $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) ); |
|
| 4182 | + } else if ( strpos( $column, 'linked_' ) === 0 ) {
|
|
| 4183 | + $geodir_link_business = (int)$row[$c]; |
|
| 4184 | + } |
|
| 4185 | + // WPML |
|
| 4186 | + if ($is_wpml) {
|
|
| 4187 | + if ($column == 'language') {
|
|
| 4188 | + $language = geodir_strtolower(trim($row[$c])); |
|
| 4189 | + } else if ($column == 'original_post_id') {
|
|
| 4190 | + $original_post_id = (int)$row[$c]; |
|
| 4191 | + } |
|
| 4192 | + } |
|
| 4193 | + // WPML |
|
| 4194 | + $c++; |
|
| 4195 | + } |
|
| 4196 | + // listing claimed or not |
|
| 4197 | + if ($is_claim_active && isset($gd_post['claimed'])) {
|
|
| 4198 | + $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4199 | + } |
|
| 4200 | 4200 | |
| 4201 | - // WPML |
|
| 4202 | - if ($is_wpml && $language != '') {
|
|
| 4203 | - $sitepress->switch_lang($language, true); |
|
| 4204 | - } |
|
| 4205 | - // WPML |
|
| 4201 | + // WPML |
|
| 4202 | + if ($is_wpml && $language != '') {
|
|
| 4203 | + $sitepress->switch_lang($language, true); |
|
| 4204 | + } |
|
| 4205 | + // WPML |
|
| 4206 | 4206 | |
| 4207 | - $gd_post['IMAGE'] = $post_images; |
|
| 4207 | + $gd_post['IMAGE'] = $post_images; |
|
| 4208 | 4208 | |
| 4209 | - $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 4210 | - $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 4209 | + $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 4210 | + $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 4211 | 4211 | |
| 4212 | - $valid = true; |
|
| 4212 | + $valid = true; |
|
| 4213 | 4213 | |
| 4214 | - if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
|
|
| 4215 | - $invalid++; |
|
| 4216 | - $valid = false; |
|
| 4217 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 4218 | - } |
|
| 4219 | - $xtimings['###3'] = microtime(true)-$xstart; |
|
| 4220 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 4221 | - if ( $location_allowed ) {
|
|
| 4222 | - $location_result = geodir_get_default_location(); |
|
| 4223 | - if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
|
|
| 4224 | - $invalid_addr++; |
|
| 4225 | - $valid = false; |
|
| 4226 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4227 | - } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
|
|
| 4228 | - if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {
|
|
| 4229 | - $invalid_addr++; |
|
| 4230 | - $valid = false; |
|
| 4231 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4232 | - } else {
|
|
| 4233 | - if (!$location_manager) {
|
|
| 4234 | - $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated. |
|
| 4235 | - } |
|
| 4236 | - } |
|
| 4237 | - } |
|
| 4238 | - } |
|
| 4239 | - $xtimings['###4'] = microtime(true)-$xstart; |
|
| 4240 | - if ( !$valid ) {
|
|
| 4241 | - continue; |
|
| 4242 | - } |
|
| 4214 | + if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
|
|
| 4215 | + $invalid++; |
|
| 4216 | + $valid = false; |
|
| 4217 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 4218 | + } |
|
| 4219 | + $xtimings['###3'] = microtime(true)-$xstart; |
|
| 4220 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 4221 | + if ( $location_allowed ) {
|
|
| 4222 | + $location_result = geodir_get_default_location(); |
|
| 4223 | + if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
|
|
| 4224 | + $invalid_addr++; |
|
| 4225 | + $valid = false; |
|
| 4226 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4227 | + } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
|
|
| 4228 | + if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {
|
|
| 4229 | + $invalid_addr++; |
|
| 4230 | + $valid = false; |
|
| 4231 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4232 | + } else {
|
|
| 4233 | + if (!$location_manager) {
|
|
| 4234 | + $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated. |
|
| 4235 | + } |
|
| 4236 | + } |
|
| 4237 | + } |
|
| 4238 | + } |
|
| 4239 | + $xtimings['###4'] = microtime(true)-$xstart; |
|
| 4240 | + if ( !$valid ) {
|
|
| 4241 | + continue; |
|
| 4242 | + } |
|
| 4243 | 4243 | |
| 4244 | - $cat_taxonomy = $post_type . 'category'; |
|
| 4245 | - $tags_taxonomy = $post_type . '_tags'; |
|
| 4244 | + $cat_taxonomy = $post_type . 'category'; |
|
| 4245 | + $tags_taxonomy = $post_type . '_tags'; |
|
| 4246 | 4246 | |
| 4247 | - if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
|
|
| 4248 | - $post_category_arr = array_merge(array($default_category), $post_category_arr); |
|
| 4249 | - } |
|
| 4247 | + if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
|
|
| 4248 | + $post_category_arr = array_merge(array($default_category), $post_category_arr); |
|
| 4249 | + } |
|
| 4250 | 4250 | |
| 4251 | - $post_category = array(); |
|
| 4252 | - $default_category_id = NULL; |
|
| 4253 | - if ( !empty( $post_category_arr ) ) {
|
|
| 4254 | - foreach ( $post_category_arr as $value ) {
|
|
| 4255 | - $category_name = wp_kses_normalize_entities( trim( $value ) ); |
|
| 4251 | + $post_category = array(); |
|
| 4252 | + $default_category_id = NULL; |
|
| 4253 | + if ( !empty( $post_category_arr ) ) {
|
|
| 4254 | + foreach ( $post_category_arr as $value ) {
|
|
| 4255 | + $category_name = wp_kses_normalize_entities( trim( $value ) ); |
|
| 4256 | 4256 | |
| 4257 | - if ( $category_name != '' ) {
|
|
| 4258 | - $term_category = array(); |
|
| 4257 | + if ( $category_name != '' ) {
|
|
| 4258 | + $term_category = array(); |
|
| 4259 | 4259 | |
| 4260 | - if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
|
|
| 4261 | - $term_category = $term; |
|
| 4262 | - } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
|
|
| 4263 | - $term_category = $term; |
|
| 4264 | - } else {
|
|
| 4265 | - $term_data = array(); |
|
| 4266 | - $term_data['name'] = $category_name; |
|
| 4267 | - $term_data['taxonomy'] = $cat_taxonomy; |
|
| 4260 | + if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
|
|
| 4261 | + $term_category = $term; |
|
| 4262 | + } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
|
|
| 4263 | + $term_category = $term; |
|
| 4264 | + } else {
|
|
| 4265 | + $term_data = array(); |
|
| 4266 | + $term_data['name'] = $category_name; |
|
| 4267 | + $term_data['taxonomy'] = $cat_taxonomy; |
|
| 4268 | 4268 | |
| 4269 | - $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data ); |
|
| 4270 | - if ( $term_id ) {
|
|
| 4271 | - $term_category = get_term( $term_id, $cat_taxonomy ); |
|
| 4272 | - } |
|
| 4273 | - } |
|
| 4269 | + $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data ); |
|
| 4270 | + if ( $term_id ) {
|
|
| 4271 | + $term_category = get_term( $term_id, $cat_taxonomy ); |
|
| 4272 | + } |
|
| 4273 | + } |
|
| 4274 | 4274 | |
| 4275 | - if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
|
|
| 4276 | - $post_category[] = intval($term_category->term_id); |
|
| 4275 | + if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
|
|
| 4276 | + $post_category[] = intval($term_category->term_id); |
|
| 4277 | 4277 | |
| 4278 | - if ($category_name == $default_category) {
|
|
| 4279 | - $default_category_id = intval($term_category->term_id); |
|
| 4280 | - } |
|
| 4281 | - } |
|
| 4282 | - } |
|
| 4283 | - } |
|
| 4284 | - } |
|
| 4285 | - $xtimings['###5'] = microtime(true)-$xstart; |
|
| 4286 | - $save_post = array(); |
|
| 4287 | - $save_post['post_title'] = $post_title; |
|
| 4288 | - if (!empty($post_date)) {
|
|
| 4289 | - $post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format. |
|
| 4278 | + if ($category_name == $default_category) {
|
|
| 4279 | + $default_category_id = intval($term_category->term_id); |
|
| 4280 | + } |
|
| 4281 | + } |
|
| 4282 | + } |
|
| 4283 | + } |
|
| 4284 | + } |
|
| 4285 | + $xtimings['###5'] = microtime(true)-$xstart; |
|
| 4286 | + $save_post = array(); |
|
| 4287 | + $save_post['post_title'] = $post_title; |
|
| 4288 | + if (!empty($post_date)) {
|
|
| 4289 | + $post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format. |
|
| 4290 | 4290 | |
| 4291 | - $save_post['post_date'] = $post_date; |
|
| 4292 | - $save_post['post_date_gmt'] = get_gmt_from_date( $post_date ); |
|
| 4293 | - } |
|
| 4294 | - $save_post['post_content'] = $post_content; |
|
| 4295 | - $save_post['post_type'] = $post_type; |
|
| 4296 | - $save_post['post_author'] = $post_author; |
|
| 4297 | - $save_post['post_status'] = $post_status; |
|
| 4298 | - $save_post['post_category'] = $post_category; |
|
| 4299 | - $save_post['post_tags'] = $post_tags; |
|
| 4300 | - |
|
| 4301 | - $saved_post_id = NULL; |
|
| 4302 | - if ( $import_choice == 'update' ) {
|
|
| 4303 | - $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' ); |
|
| 4291 | + $save_post['post_date'] = $post_date; |
|
| 4292 | + $save_post['post_date_gmt'] = get_gmt_from_date( $post_date ); |
|
| 4293 | + } |
|
| 4294 | + $save_post['post_content'] = $post_content; |
|
| 4295 | + $save_post['post_type'] = $post_type; |
|
| 4296 | + $save_post['post_author'] = $post_author; |
|
| 4297 | + $save_post['post_status'] = $post_status; |
|
| 4298 | + $save_post['post_category'] = $post_category; |
|
| 4299 | + $save_post['post_tags'] = $post_tags; |
|
| 4300 | + |
|
| 4301 | + $saved_post_id = NULL; |
|
| 4302 | + if ( $import_choice == 'update' ) {
|
|
| 4303 | + $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' ); |
|
| 4304 | 4304 | |
| 4305 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4306 | - $save_post['ID'] = $post_id; |
|
| 4305 | + if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4306 | + $save_post['ID'] = $post_id; |
|
| 4307 | 4307 | |
| 4308 | - if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
|
|
| 4309 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4310 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4311 | - $saved_post_id = 0; |
|
| 4312 | - } else {
|
|
| 4313 | - $saved_post_id = $post_id; |
|
| 4314 | - $updated++; |
|
| 4315 | - } |
|
| 4316 | - } |
|
| 4317 | - } else {
|
|
| 4318 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4319 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4320 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4321 | - $saved_post_id = 0; |
|
| 4322 | - } else {
|
|
| 4323 | - $created++; |
|
| 4324 | - } |
|
| 4325 | - } |
|
| 4326 | - } |
|
| 4308 | + if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
|
|
| 4309 | + if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4310 | + $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4311 | + $saved_post_id = 0; |
|
| 4312 | + } else {
|
|
| 4313 | + $saved_post_id = $post_id; |
|
| 4314 | + $updated++; |
|
| 4315 | + } |
|
| 4316 | + } |
|
| 4317 | + } else {
|
|
| 4318 | + if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4319 | + if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4320 | + $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4321 | + $saved_post_id = 0; |
|
| 4322 | + } else {
|
|
| 4323 | + $created++; |
|
| 4324 | + } |
|
| 4325 | + } |
|
| 4326 | + } |
|
| 4327 | 4327 | |
| 4328 | - if ( !$saved_post_id > 0 ) {
|
|
| 4329 | - $invalid++; |
|
| 4330 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error ); |
|
| 4331 | - } |
|
| 4332 | - } else if ( $import_choice == 'skip' ) {
|
|
| 4333 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4334 | - $skipped++; |
|
| 4335 | - } else {
|
|
| 4336 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4337 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4338 | - $invalid++; |
|
| 4328 | + if ( !$saved_post_id > 0 ) {
|
|
| 4329 | + $invalid++; |
|
| 4330 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error ); |
|
| 4331 | + } |
|
| 4332 | + } else if ( $import_choice == 'skip' ) {
|
|
| 4333 | + if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4334 | + $skipped++; |
|
| 4335 | + } else {
|
|
| 4336 | + if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4337 | + if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4338 | + $invalid++; |
|
| 4339 | 4339 | |
| 4340 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error ); |
|
| 4341 | - $saved_post_id = 0; |
|
| 4342 | - } else {
|
|
| 4343 | - $created++; |
|
| 4344 | - } |
|
| 4345 | - } else {
|
|
| 4346 | - $invalid++; |
|
| 4340 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error ); |
|
| 4341 | + $saved_post_id = 0; |
|
| 4342 | + } else {
|
|
| 4343 | + $created++; |
|
| 4344 | + } |
|
| 4345 | + } else {
|
|
| 4346 | + $invalid++; |
|
| 4347 | 4347 | |
| 4348 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4349 | - } |
|
| 4350 | - } |
|
| 4351 | - } else {
|
|
| 4352 | - $invalid++; |
|
| 4348 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4349 | + } |
|
| 4350 | + } |
|
| 4351 | + } else {
|
|
| 4352 | + $invalid++; |
|
| 4353 | 4353 | |
| 4354 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4355 | - } |
|
| 4356 | - $xtimings['###6'] = microtime(true)-$xstart; |
|
| 4357 | - if ( (int)$saved_post_id > 0 ) {
|
|
| 4358 | - // WPML |
|
| 4359 | - if ($is_wpml && geodir_wpml_is_post_type_translated($post_type) && $original_post_id > 0 && $language != '') {
|
|
| 4360 | - $wpml_post_type = 'post_' . $post_type; |
|
| 4361 | - $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type ); |
|
| 4362 | - $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 4363 | - |
|
| 4364 | - $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type ); |
|
| 4354 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4355 | + } |
|
| 4356 | + $xtimings['###6'] = microtime(true)-$xstart; |
|
| 4357 | + if ( (int)$saved_post_id > 0 ) {
|
|
| 4358 | + // WPML |
|
| 4359 | + if ($is_wpml && geodir_wpml_is_post_type_translated($post_type) && $original_post_id > 0 && $language != '') {
|
|
| 4360 | + $wpml_post_type = 'post_' . $post_type; |
|
| 4361 | + $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type ); |
|
| 4362 | + $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 4363 | + |
|
| 4364 | + $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type ); |
|
| 4365 | 4365 | |
| 4366 | - $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language ); |
|
| 4367 | - } |
|
| 4368 | - // WPML |
|
| 4369 | - $gd_post_info = geodir_get_post_info( $saved_post_id ); |
|
| 4366 | + $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language ); |
|
| 4367 | + } |
|
| 4368 | + // WPML |
|
| 4369 | + $gd_post_info = geodir_get_post_info( $saved_post_id ); |
|
| 4370 | 4370 | |
| 4371 | - $gd_post['post_id'] = $saved_post_id; |
|
| 4372 | - $gd_post['ID'] = $saved_post_id; |
|
| 4373 | - $gd_post['post_tags'] = $post_tags; |
|
| 4374 | - $gd_post['post_title'] = $post_title; |
|
| 4375 | - $gd_post['post_status'] = $post_status; |
|
| 4376 | - $gd_post['submit_time'] = time(); |
|
| 4377 | - $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
| 4371 | + $gd_post['post_id'] = $saved_post_id; |
|
| 4372 | + $gd_post['ID'] = $saved_post_id; |
|
| 4373 | + $gd_post['post_tags'] = $post_tags; |
|
| 4374 | + $gd_post['post_title'] = $post_title; |
|
| 4375 | + $gd_post['post_status'] = $post_status; |
|
| 4376 | + $gd_post['submit_time'] = time(); |
|
| 4377 | + $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
| 4378 | 4378 | |
| 4379 | - // post location |
|
| 4380 | - $post_location_id = 0; |
|
| 4381 | - if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
|
|
| 4382 | - $gd_post['post_neighbourhood'] = ''; |
|
| 4379 | + // post location |
|
| 4380 | + $post_location_id = 0; |
|
| 4381 | + if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
|
|
| 4382 | + $gd_post['post_neighbourhood'] = ''; |
|
| 4383 | 4383 | |
| 4384 | - $post_location_info = array( |
|
| 4385 | - 'city' => $post_city, |
|
| 4386 | - 'region' => $post_region, |
|
| 4387 | - 'country' => $post_country, |
|
| 4388 | - 'geo_lat' => $post_latitude, |
|
| 4389 | - 'geo_lng' => $post_longitude |
|
| 4390 | - ); |
|
| 4391 | - if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
|
|
| 4392 | - $post_location_id = $location_id; |
|
| 4393 | - } |
|
| 4384 | + $post_location_info = array( |
|
| 4385 | + 'city' => $post_city, |
|
| 4386 | + 'region' => $post_region, |
|
| 4387 | + 'country' => $post_country, |
|
| 4388 | + 'geo_lat' => $post_latitude, |
|
| 4389 | + 'geo_lng' => $post_longitude |
|
| 4390 | + ); |
|
| 4391 | + if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
|
|
| 4392 | + $post_location_id = $location_id; |
|
| 4393 | + } |
|
| 4394 | 4394 | |
| 4395 | - if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {
|
|
| 4396 | - $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id); |
|
| 4395 | + if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {
|
|
| 4396 | + $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id); |
|
| 4397 | 4397 | |
| 4398 | - $hood_data = array(); |
|
| 4399 | - $hood_data['hood_location_id'] = $post_location_id; |
|
| 4400 | - $hood_data['hood_name'] = $post_neighbourhood; |
|
| 4398 | + $hood_data = array(); |
|
| 4399 | + $hood_data['hood_location_id'] = $post_location_id; |
|
| 4400 | + $hood_data['hood_name'] = $post_neighbourhood; |
|
| 4401 | 4401 | |
| 4402 | - if (!empty($neighbourhood_info)) {
|
|
| 4403 | - $hood_data['hood_id'] = $neighbourhood_info->hood_id; |
|
| 4404 | - $hood_data['hood_slug'] = $neighbourhood_info->hood_slug; |
|
| 4402 | + if (!empty($neighbourhood_info)) {
|
|
| 4403 | + $hood_data['hood_id'] = $neighbourhood_info->hood_id; |
|
| 4404 | + $hood_data['hood_slug'] = $neighbourhood_info->hood_slug; |
|
| 4405 | 4405 | |
| 4406 | - if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4407 | - $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4408 | - $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4409 | - } |
|
| 4410 | - } |
|
| 4406 | + if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4407 | + $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4408 | + $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4409 | + } |
|
| 4410 | + } |
|
| 4411 | 4411 | |
| 4412 | - if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4413 | - $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4414 | - $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4415 | - } |
|
| 4412 | + if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4413 | + $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4414 | + $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4415 | + } |
|
| 4416 | 4416 | |
| 4417 | - $hood_data['hood_latitude'] = $post_latitude; |
|
| 4418 | - $hood_data['hood_longitude'] = $post_longitude; |
|
| 4419 | - |
|
| 4420 | - $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data); |
|
| 4421 | - if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {
|
|
| 4422 | - $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug; |
|
| 4423 | - } |
|
| 4424 | - } |
|
| 4425 | - } |
|
| 4426 | - $gd_post['post_location_id'] = $post_location_id; |
|
| 4417 | + $hood_data['hood_latitude'] = $post_latitude; |
|
| 4418 | + $hood_data['hood_longitude'] = $post_longitude; |
|
| 4419 | + |
|
| 4420 | + $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data); |
|
| 4421 | + if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {
|
|
| 4422 | + $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug; |
|
| 4423 | + } |
|
| 4424 | + } |
|
| 4425 | + } |
|
| 4426 | + $gd_post['post_location_id'] = $post_location_id; |
|
| 4427 | 4427 | |
| 4428 | - if ($geodir_link_business !== null) {
|
|
| 4429 | - $gd_post['geodir_link_business'] = $geodir_link_business > 0 ? $geodir_link_business : ''; |
|
| 4430 | - } |
|
| 4428 | + if ($geodir_link_business !== null) {
|
|
| 4429 | + $gd_post['geodir_link_business'] = $geodir_link_business > 0 ? $geodir_link_business : ''; |
|
| 4430 | + } |
|
| 4431 | 4431 | |
| 4432 | - // post package info |
|
| 4433 | - $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0; |
|
| 4434 | - if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
|
|
| 4435 | - $package_id = $gd_post_info->package_id; |
|
| 4436 | - } |
|
| 4432 | + // post package info |
|
| 4433 | + $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0; |
|
| 4434 | + if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
|
|
| 4435 | + $package_id = $gd_post_info->package_id; |
|
| 4436 | + } |
|
| 4437 | 4437 | |
| 4438 | - $package_info = array(); |
|
| 4439 | - if ($package_id && function_exists('geodir_get_package_info_by_id')) {
|
|
| 4440 | - $package_info = (array)geodir_get_package_info_by_id($package_id); |
|
| 4438 | + $package_info = array(); |
|
| 4439 | + if ($package_id && function_exists('geodir_get_package_info_by_id')) {
|
|
| 4440 | + $package_info = (array)geodir_get_package_info_by_id($package_id); |
|
| 4441 | 4441 | |
| 4442 | - if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
|
|
| 4443 | - $package_info = array(); |
|
| 4444 | - } |
|
| 4445 | - } |
|
| 4442 | + if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
|
|
| 4443 | + $package_info = array(); |
|
| 4444 | + } |
|
| 4445 | + } |
|
| 4446 | 4446 | |
| 4447 | - if (empty($package_info)) {
|
|
| 4448 | - $package_info = (array)geodir_post_package_info( array(), '', $post_type ); |
|
| 4449 | - } |
|
| 4447 | + if (empty($package_info)) {
|
|
| 4448 | + $package_info = (array)geodir_post_package_info( array(), '', $post_type ); |
|
| 4449 | + } |
|
| 4450 | 4450 | |
| 4451 | - if (!empty($package_info)) {
|
|
| 4452 | - $package_id = $package_info['pid']; |
|
| 4451 | + if (!empty($package_info)) {
|
|
| 4452 | + $package_id = $package_info['pid']; |
|
| 4453 | 4453 | |
| 4454 | - if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
|
|
| 4455 | - $gd_post['expire_date'] = $expire_date; |
|
| 4456 | - } else {
|
|
| 4457 | - if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
|
|
| 4458 | - $gd_post['alive_days'] = (int)$package_info['days']; |
|
| 4459 | - $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) ); |
|
| 4460 | - } else {
|
|
| 4461 | - $gd_post['expire_date'] = 'Never'; |
|
| 4462 | - } |
|
| 4463 | - } |
|
| 4454 | + if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
|
|
| 4455 | + $gd_post['expire_date'] = $expire_date; |
|
| 4456 | + } else {
|
|
| 4457 | + if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
|
|
| 4458 | + $gd_post['alive_days'] = (int)$package_info['days']; |
|
| 4459 | + $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) ); |
|
| 4460 | + } else {
|
|
| 4461 | + $gd_post['expire_date'] = 'Never'; |
|
| 4462 | + } |
|
| 4463 | + } |
|
| 4464 | 4464 | |
| 4465 | - $gd_post['package_id'] = $package_id; |
|
| 4466 | - } |
|
| 4465 | + $gd_post['package_id'] = $package_id; |
|
| 4466 | + } |
|
| 4467 | 4467 | |
| 4468 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 4468 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 4469 | 4469 | |
| 4470 | - if ($post_type == 'gd_event') {
|
|
| 4471 | - $gd_post = geodir_imex_process_event_data($gd_post); |
|
| 4472 | - } |
|
| 4470 | + if ($post_type == 'gd_event') {
|
|
| 4471 | + $gd_post = geodir_imex_process_event_data($gd_post); |
|
| 4472 | + } |
|
| 4473 | 4473 | |
| 4474 | - if (isset($gd_post['post_id'])) {
|
|
| 4475 | - unset($gd_post['post_id']); |
|
| 4476 | - } |
|
| 4474 | + if (isset($gd_post['post_id'])) {
|
|
| 4475 | + unset($gd_post['post_id']); |
|
| 4476 | + } |
|
| 4477 | 4477 | |
| 4478 | - // Export franchise fields |
|
| 4479 | - $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 4480 | - if ($is_franchise_active) {
|
|
| 4481 | - if ( isset( $gd_post['gd_is_franchise'] ) && empty( $gd_post['franchise'] ) ) {
|
|
| 4482 | - if ( absint( $gd_post['gd_is_franchise'] ) != 0 ) {
|
|
| 4483 | - $gd_franchise_lock = array(); |
|
| 4478 | + // Export franchise fields |
|
| 4479 | + $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 4480 | + if ($is_franchise_active) {
|
|
| 4481 | + if ( isset( $gd_post['gd_is_franchise'] ) && empty( $gd_post['franchise'] ) ) {
|
|
| 4482 | + if ( absint( $gd_post['gd_is_franchise'] ) != 0 ) {
|
|
| 4483 | + $gd_franchise_lock = array(); |
|
| 4484 | 4484 | |
| 4485 | - if ( isset( $gd_post['gd_franchise_lock'] ) ) {
|
|
| 4486 | - $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
|
|
| 4487 | - $gd_franchise_lock = trim( $gd_franchise_lock ); |
|
| 4488 | - $gd_franchise_lock = explode( ",", $gd_franchise_lock ); |
|
| 4489 | - } |
|
| 4485 | + if ( isset( $gd_post['gd_franchise_lock'] ) ) {
|
|
| 4486 | + $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
|
|
| 4487 | + $gd_franchise_lock = trim( $gd_franchise_lock ); |
|
| 4488 | + $gd_franchise_lock = explode( ",", $gd_franchise_lock ); |
|
| 4489 | + } |
|
| 4490 | 4490 | |
| 4491 | - update_post_meta( $saved_post_id, 'gd_is_franchise', 1 ); |
|
| 4492 | - update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock ); |
|
| 4493 | - } else {
|
|
| 4494 | - if ( function_exists( 'geodir_franchise_remove_franchise' ) ) {
|
|
| 4495 | - geodir_franchise_remove_franchise( $saved_post_id ); |
|
| 4496 | - } |
|
| 4497 | - } |
|
| 4498 | - } else {
|
|
| 4499 | - if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
|
|
| 4500 | - geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] ); |
|
| 4501 | - } |
|
| 4502 | - } |
|
| 4503 | - } |
|
| 4491 | + update_post_meta( $saved_post_id, 'gd_is_franchise', 1 ); |
|
| 4492 | + update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock ); |
|
| 4493 | + } else {
|
|
| 4494 | + if ( function_exists( 'geodir_franchise_remove_franchise' ) ) {
|
|
| 4495 | + geodir_franchise_remove_franchise( $saved_post_id ); |
|
| 4496 | + } |
|
| 4497 | + } |
|
| 4498 | + } else {
|
|
| 4499 | + if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
|
|
| 4500 | + geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] ); |
|
| 4501 | + } |
|
| 4502 | + } |
|
| 4503 | + } |
|
| 4504 | 4504 | |
| 4505 | - if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
|
|
| 4506 | - $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) ); |
|
| 4507 | - if ($default_category_id) {
|
|
| 4508 | - $save_post['post_default_category'] = $default_category_id; |
|
| 4509 | - $gd_post['default_category'] = $default_category_id; |
|
| 4510 | - } |
|
| 4511 | - $gd_post[$cat_taxonomy] = $save_post['post_category']; |
|
| 4512 | - } |
|
| 4513 | - $xtimings['###7'] = microtime(true)-$xstart; |
|
| 4514 | - // Save post info |
|
| 4515 | - geodir_save_post_info( $saved_post_id, $gd_post ); |
|
| 4516 | - $xtimings['###8'] = microtime(true)-$xstart; |
|
| 4517 | - // post taxonomies |
|
| 4518 | - if ( !empty( $save_post['post_category'] ) ) {
|
|
| 4519 | - wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy ); |
|
| 4505 | + if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
|
|
| 4506 | + $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) ); |
|
| 4507 | + if ($default_category_id) {
|
|
| 4508 | + $save_post['post_default_category'] = $default_category_id; |
|
| 4509 | + $gd_post['default_category'] = $default_category_id; |
|
| 4510 | + } |
|
| 4511 | + $gd_post[$cat_taxonomy] = $save_post['post_category']; |
|
| 4512 | + } |
|
| 4513 | + $xtimings['###7'] = microtime(true)-$xstart; |
|
| 4514 | + // Save post info |
|
| 4515 | + geodir_save_post_info( $saved_post_id, $gd_post ); |
|
| 4516 | + $xtimings['###8'] = microtime(true)-$xstart; |
|
| 4517 | + // post taxonomies |
|
| 4518 | + if ( !empty( $save_post['post_category'] ) ) {
|
|
| 4519 | + wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy ); |
|
| 4520 | 4520 | |
| 4521 | - $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : ''; |
|
| 4522 | - if ($default_category_id) {
|
|
| 4523 | - $post_default_category = $default_category_id; |
|
| 4524 | - } |
|
| 4525 | - $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy); |
|
| 4526 | - $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
|
|
| 4527 | - $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
|
|
| 4521 | + $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : ''; |
|
| 4522 | + if ($default_category_id) {
|
|
| 4523 | + $post_default_category = $default_category_id; |
|
| 4524 | + } |
|
| 4525 | + $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy); |
|
| 4526 | + $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
|
|
| 4527 | + $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
|
|
| 4528 | 4528 | |
| 4529 | - if ($post_category_str != '' && $post_default_category) {
|
|
| 4530 | - $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str); |
|
| 4531 | - } |
|
| 4529 | + if ($post_category_str != '' && $post_default_category) {
|
|
| 4530 | + $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str); |
|
| 4531 | + } |
|
| 4532 | 4532 | |
| 4533 | - $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : ''; |
|
| 4533 | + $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : ''; |
|
| 4534 | 4534 | |
| 4535 | - geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str ); |
|
| 4536 | - } |
|
| 4537 | - $xtimings['###8.1'] = microtime(true)-$xstart; |
|
| 4538 | - if ( !empty( $save_post['post_tags'] ) ) {
|
|
| 4539 | - wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy ); |
|
| 4540 | - } |
|
| 4541 | - $xtimings['###9'] = microtime(true)-$xstart; |
|
| 4542 | - // Post images |
|
| 4543 | - if ( !empty( $post_images ) ) {
|
|
| 4544 | - $post_images = array_unique($post_images); |
|
| 4535 | + geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str ); |
|
| 4536 | + } |
|
| 4537 | + $xtimings['###8.1'] = microtime(true)-$xstart; |
|
| 4538 | + if ( !empty( $save_post['post_tags'] ) ) {
|
|
| 4539 | + wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy ); |
|
| 4540 | + } |
|
| 4541 | + $xtimings['###9'] = microtime(true)-$xstart; |
|
| 4542 | + // Post images |
|
| 4543 | + if ( !empty( $post_images ) ) {
|
|
| 4544 | + $post_images = array_unique($post_images); |
|
| 4545 | 4545 | |
| 4546 | - $old_post_images_arr = array(); |
|
| 4547 | - $saved_post_images_arr = array(); |
|
| 4546 | + $old_post_images_arr = array(); |
|
| 4547 | + $saved_post_images_arr = array(); |
|
| 4548 | 4548 | |
| 4549 | - $order = 1; |
|
| 4549 | + $order = 1; |
|
| 4550 | 4550 | |
| 4551 | - $old_post_images = geodir_get_images( $saved_post_id ); |
|
| 4552 | - $xtimings['###9.1'] = microtime(true)-$xstart; |
|
| 4553 | - if (!empty($old_post_images)) {
|
|
| 4554 | - foreach( $old_post_images as $old_post_image ) {
|
|
| 4555 | - if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
|
|
| 4556 | - $old_post_images_arr[] = $old_post_image->file; |
|
| 4557 | - } |
|
| 4558 | - } |
|
| 4559 | - } |
|
| 4551 | + $old_post_images = geodir_get_images( $saved_post_id ); |
|
| 4552 | + $xtimings['###9.1'] = microtime(true)-$xstart; |
|
| 4553 | + if (!empty($old_post_images)) {
|
|
| 4554 | + foreach( $old_post_images as $old_post_image ) {
|
|
| 4555 | + if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
|
|
| 4556 | + $old_post_images_arr[] = $old_post_image->file; |
|
| 4557 | + } |
|
| 4558 | + } |
|
| 4559 | + } |
|
| 4560 | 4560 | |
| 4561 | - foreach ( $post_images as $post_image ) {
|
|
| 4562 | - $image_name = basename( $post_image ); |
|
| 4563 | - $saved_post_images_arr[] = $image_name; |
|
| 4561 | + foreach ( $post_images as $post_image ) {
|
|
| 4562 | + $image_name = basename( $post_image ); |
|
| 4563 | + $saved_post_images_arr[] = $image_name; |
|
| 4564 | 4564 | |
| 4565 | - if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
|
|
| 4566 | - continue; // Skip if image already exists. |
|
| 4567 | - } |
|
| 4565 | + if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
|
|
| 4566 | + continue; // Skip if image already exists. |
|
| 4567 | + } |
|
| 4568 | 4568 | |
| 4569 | - $image_name_parts = explode( '.', $image_name ); |
|
| 4570 | - array_pop( $image_name_parts ); |
|
| 4571 | - $proper_image_name = implode( '.', $image_name_parts ); |
|
| 4572 | - $xtimings['###9.2'] = microtime(true)-$xstart; |
|
| 4573 | - $arr_file_type = wp_check_filetype( $image_name ); |
|
| 4574 | - $xtimings['###9.3'] = microtime(true)-$xstart; |
|
| 4575 | - if ( !empty( $arr_file_type ) ) {
|
|
| 4576 | - $uploaded_file_type = $arr_file_type['type']; |
|
| 4569 | + $image_name_parts = explode( '.', $image_name ); |
|
| 4570 | + array_pop( $image_name_parts ); |
|
| 4571 | + $proper_image_name = implode( '.', $image_name_parts ); |
|
| 4572 | + $xtimings['###9.2'] = microtime(true)-$xstart; |
|
| 4573 | + $arr_file_type = wp_check_filetype( $image_name ); |
|
| 4574 | + $xtimings['###9.3'] = microtime(true)-$xstart; |
|
| 4575 | + if ( !empty( $arr_file_type ) ) {
|
|
| 4576 | + $uploaded_file_type = $arr_file_type['type']; |
|
| 4577 | 4577 | |
| 4578 | - $attachment = array(); |
|
| 4579 | - $attachment['post_id'] = $saved_post_id; |
|
| 4580 | - $attachment['title'] = $proper_image_name; |
|
| 4581 | - $attachment['content'] = ''; |
|
| 4582 | - $attachment['file'] = $uploads_subdir . '/' . $image_name; |
|
| 4583 | - $attachment['mime_type'] = $uploaded_file_type; |
|
| 4584 | - $attachment['menu_order'] = $order; |
|
| 4585 | - $attachment['is_featured'] = 0; |
|
| 4586 | - |
|
| 4587 | - $attachment_set = ''; |
|
| 4588 | - foreach ( $attachment as $key => $val ) {
|
|
| 4589 | - if ( $val != '' ) {
|
|
| 4590 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 4591 | - } |
|
| 4592 | - } |
|
| 4593 | - $attachment_set = trim( $attachment_set, ", " ); |
|
| 4578 | + $attachment = array(); |
|
| 4579 | + $attachment['post_id'] = $saved_post_id; |
|
| 4580 | + $attachment['title'] = $proper_image_name; |
|
| 4581 | + $attachment['content'] = ''; |
|
| 4582 | + $attachment['file'] = $uploads_subdir . '/' . $image_name; |
|
| 4583 | + $attachment['mime_type'] = $uploaded_file_type; |
|
| 4584 | + $attachment['menu_order'] = $order; |
|
| 4585 | + $attachment['is_featured'] = 0; |
|
| 4586 | + |
|
| 4587 | + $attachment_set = ''; |
|
| 4588 | + foreach ( $attachment as $key => $val ) {
|
|
| 4589 | + if ( $val != '' ) {
|
|
| 4590 | + $attachment_set .= $key . " = '" . $val . "', "; |
|
| 4591 | + } |
|
| 4592 | + } |
|
| 4593 | + $attachment_set = trim( $attachment_set, ", " ); |
|
| 4594 | 4594 | |
| 4595 | - // Add new attachment |
|
| 4596 | - $xtimings['###9.4'] = microtime(true)-$xstart; |
|
| 4597 | - $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set ); |
|
| 4598 | - $xtimings['###9.5'] = microtime(true)-$xstart; |
|
| 4599 | - $order++; |
|
| 4600 | - } |
|
| 4601 | - } |
|
| 4602 | - |
|
| 4603 | - $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : '';
|
|
| 4604 | - // Remove previous attachment |
|
| 4605 | - $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql ); |
|
| 4606 | - $xtimings['###9.6'] = microtime(true)-$xstart; |
|
| 4607 | - if ( !empty( $saved_post_images_arr ) ) {
|
|
| 4608 | - geodir_set_wp_featured_image($saved_post_id); |
|
| 4609 | - $xtimings['###9.7'] = microtime(true)-$xstart; |
|
| 4610 | - /* |
|
| 4595 | + // Add new attachment |
|
| 4596 | + $xtimings['###9.4'] = microtime(true)-$xstart; |
|
| 4597 | + $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set ); |
|
| 4598 | + $xtimings['###9.5'] = microtime(true)-$xstart; |
|
| 4599 | + $order++; |
|
| 4600 | + } |
|
| 4601 | + } |
|
| 4602 | + |
|
| 4603 | + $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : '';
|
|
| 4604 | + // Remove previous attachment |
|
| 4605 | + $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql ); |
|
| 4606 | + $xtimings['###9.6'] = microtime(true)-$xstart; |
|
| 4607 | + if ( !empty( $saved_post_images_arr ) ) {
|
|
| 4608 | + geodir_set_wp_featured_image($saved_post_id); |
|
| 4609 | + $xtimings['###9.7'] = microtime(true)-$xstart; |
|
| 4610 | + /* |
|
| 4611 | 4611 | $menu_order = 1; |
| 4612 | 4612 | |
| 4613 | 4613 | foreach ( $saved_post_images_arr as $img_name ) {
|
@@ -4620,288 +4620,288 @@ discard block |
||
| 4620 | 4620 | } |
| 4621 | 4621 | $menu_order++; |
| 4622 | 4622 | }*/ |
| 4623 | - } |
|
| 4623 | + } |
|
| 4624 | 4624 | |
| 4625 | - if ( $order > 1 ) {
|
|
| 4626 | - $images++; |
|
| 4627 | - } |
|
| 4628 | - } |
|
| 4629 | - $xtimings['###10'] = microtime(true)-$xstart; |
|
| 4630 | - /** This action is documented in geodirectory-functions/post-functions.php */ |
|
| 4631 | - do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post ); |
|
| 4632 | - $xtimings['###11'] = microtime(true)-$xstart; |
|
| 4633 | - if (isset($is_featured)) {
|
|
| 4634 | - geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured); |
|
| 4635 | - } |
|
| 4636 | - if (isset($gd_post['alive_days'])) {
|
|
| 4637 | - geodir_save_post_meta($saved_post_id, 'alive_days', $gd_post['alive_days']); |
|
| 4638 | - } |
|
| 4639 | - if (isset($gd_post['expire_date'])) {
|
|
| 4640 | - geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']); |
|
| 4641 | - } |
|
| 4642 | - $xtimings['###12'] = microtime(true)-$xstart; |
|
| 4643 | - } |
|
| 4625 | + if ( $order > 1 ) {
|
|
| 4626 | + $images++; |
|
| 4627 | + } |
|
| 4628 | + } |
|
| 4629 | + $xtimings['###10'] = microtime(true)-$xstart; |
|
| 4630 | + /** This action is documented in geodirectory-functions/post-functions.php */ |
|
| 4631 | + do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post ); |
|
| 4632 | + $xtimings['###11'] = microtime(true)-$xstart; |
|
| 4633 | + if (isset($is_featured)) {
|
|
| 4634 | + geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured); |
|
| 4635 | + } |
|
| 4636 | + if (isset($gd_post['alive_days'])) {
|
|
| 4637 | + geodir_save_post_meta($saved_post_id, 'alive_days', $gd_post['alive_days']); |
|
| 4638 | + } |
|
| 4639 | + if (isset($gd_post['expire_date'])) {
|
|
| 4640 | + geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']); |
|
| 4641 | + } |
|
| 4642 | + $xtimings['###12'] = microtime(true)-$xstart; |
|
| 4643 | + } |
|
| 4644 | 4644 | |
| 4645 | - // WPML |
|
| 4646 | - if ($is_wpml && $language != '') {
|
|
| 4647 | - $sitepress->switch_lang($active_lang, true); |
|
| 4648 | - } |
|
| 4649 | - // WPML |
|
| 4650 | - } |
|
| 4651 | - } |
|
| 4652 | - } |
|
| 4645 | + // WPML |
|
| 4646 | + if ($is_wpml && $language != '') {
|
|
| 4647 | + $sitepress->switch_lang($active_lang, true); |
|
| 4648 | + } |
|
| 4649 | + // WPML |
|
| 4650 | + } |
|
| 4651 | + } |
|
| 4652 | + } |
|
| 4653 | 4653 | |
| 4654 | - //undo some stuff to make the import quicker |
|
| 4655 | - wp_defer_term_counting( false ); |
|
| 4656 | - wp_defer_comment_counting( false ); |
|
| 4657 | - $wpdb->query( 'COMMIT;' ); |
|
| 4658 | - $wpdb->query( 'SET autocommit = 1;' ); |
|
| 4659 | - $xtimings['###13'] = microtime(true)-$xstart; |
|
| 4660 | - $json = array(); |
|
| 4661 | - $json['processed'] = $processed_actual; |
|
| 4662 | - $json['created'] = $created; |
|
| 4663 | - $json['updated'] = $updated; |
|
| 4664 | - $json['skipped'] = $skipped; |
|
| 4665 | - $json['invalid'] = $invalid; |
|
| 4666 | - $json['invalid_addr'] = $invalid_addr; |
|
| 4667 | - $json['images'] = $images; |
|
| 4668 | - $json['timing'] = microtime(true)-$xstart; |
|
| 4669 | - $json['timings'] = $xtimings; |
|
| 4654 | + //undo some stuff to make the import quicker |
|
| 4655 | + wp_defer_term_counting( false ); |
|
| 4656 | + wp_defer_comment_counting( false ); |
|
| 4657 | + $wpdb->query( 'COMMIT;' ); |
|
| 4658 | + $wpdb->query( 'SET autocommit = 1;' ); |
|
| 4659 | + $xtimings['###13'] = microtime(true)-$xstart; |
|
| 4660 | + $json = array(); |
|
| 4661 | + $json['processed'] = $processed_actual; |
|
| 4662 | + $json['created'] = $created; |
|
| 4663 | + $json['updated'] = $updated; |
|
| 4664 | + $json['skipped'] = $skipped; |
|
| 4665 | + $json['invalid'] = $invalid; |
|
| 4666 | + $json['invalid_addr'] = $invalid_addr; |
|
| 4667 | + $json['images'] = $images; |
|
| 4668 | + $json['timing'] = microtime(true)-$xstart; |
|
| 4669 | + $json['timings'] = $xtimings; |
|
| 4670 | 4670 | |
| 4671 | 4671 | |
| 4672 | - wp_send_json( $json ); |
|
| 4673 | - exit; |
|
| 4674 | - } else if ( $task == 'import_loc' ) {
|
|
| 4675 | - global $gd_post_types; |
|
| 4676 | - $gd_post_types = $post_types; |
|
| 4672 | + wp_send_json( $json ); |
|
| 4673 | + exit; |
|
| 4674 | + } else if ( $task == 'import_loc' ) {
|
|
| 4675 | + global $gd_post_types; |
|
| 4676 | + $gd_post_types = $post_types; |
|
| 4677 | 4677 | |
| 4678 | - if (!empty($file)) {
|
|
| 4679 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4678 | + if (!empty($file)) {
|
|
| 4679 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4680 | 4680 | |
| 4681 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4682 | - $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
|
| 4683 | - wp_send_json( $json ); |
|
| 4684 | - } |
|
| 4681 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4682 | + $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
|
| 4683 | + wp_send_json( $json ); |
|
| 4684 | + } |
|
| 4685 | 4685 | |
| 4686 | - $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
|
|
| 4687 | - $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' ); |
|
| 4688 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 4689 | - $index = $processed + $i; |
|
| 4686 | + $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
|
|
| 4687 | + $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' ); |
|
| 4688 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 4689 | + $index = $processed + $i; |
|
| 4690 | 4690 | |
| 4691 | - if (isset($file[$index])) {
|
|
| 4692 | - $row = $file[$index]; |
|
| 4693 | - $row = array_map( 'trim', $row ); |
|
| 4694 | - $data = array(); |
|
| 4691 | + if (isset($file[$index])) {
|
|
| 4692 | + $row = $file[$index]; |
|
| 4693 | + $row = array_map( 'trim', $row ); |
|
| 4694 | + $data = array(); |
|
| 4695 | 4695 | |
| 4696 | - foreach ($columns as $c => $column ) {
|
|
| 4697 | - if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {
|
|
| 4698 | - $data[$column] = $row[$c]; |
|
| 4699 | - } |
|
| 4700 | - } |
|
| 4696 | + foreach ($columns as $c => $column ) {
|
|
| 4697 | + if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {
|
|
| 4698 | + $data[$column] = $row[$c]; |
|
| 4699 | + } |
|
| 4700 | + } |
|
| 4701 | 4701 | |
| 4702 | - if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
|
|
| 4703 | - $invalid++; |
|
| 4704 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4705 | - continue; |
|
| 4706 | - } |
|
| 4702 | + if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
|
|
| 4703 | + $invalid++; |
|
| 4704 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4705 | + continue; |
|
| 4706 | + } |
|
| 4707 | 4707 | |
| 4708 | - $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0; |
|
| 4708 | + $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0; |
|
| 4709 | 4709 | |
| 4710 | - if ( $import_choice == 'update' ) {
|
|
| 4711 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4712 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4713 | - $updated++; |
|
| 4714 | - } else {
|
|
| 4715 | - $invalid++; |
|
| 4716 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4717 | - } |
|
| 4718 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4719 | - $data['location_id'] = (int)$location->location_id; |
|
| 4710 | + if ( $import_choice == 'update' ) {
|
|
| 4711 | + if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4712 | + if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4713 | + $updated++; |
|
| 4714 | + } else {
|
|
| 4715 | + $invalid++; |
|
| 4716 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4717 | + } |
|
| 4718 | + } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4719 | + $data['location_id'] = (int)$location->location_id; |
|
| 4720 | 4720 | |
| 4721 | - if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
|
|
| 4722 | - $data['location_id'] = (int)$location->location_id; |
|
| 4723 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
|
|
| 4724 | - $data['location_id'] = (int)$location->location_id; |
|
| 4725 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
|
|
| 4726 | - $data['location_id'] = (int)$location->location_id; |
|
| 4727 | - } |
|
| 4721 | + if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
|
|
| 4722 | + $data['location_id'] = (int)$location->location_id; |
|
| 4723 | + } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
|
|
| 4724 | + $data['location_id'] = (int)$location->location_id; |
|
| 4725 | + } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
|
|
| 4726 | + $data['location_id'] = (int)$location->location_id; |
|
| 4727 | + } |
|
| 4728 | 4728 | |
| 4729 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4730 | - $updated++; |
|
| 4731 | - } else {
|
|
| 4732 | - $invalid++; |
|
| 4733 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4734 | - } |
|
| 4735 | - } else {
|
|
| 4736 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4737 | - $created++; |
|
| 4738 | - } else {
|
|
| 4739 | - $invalid++; |
|
| 4740 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4741 | - } |
|
| 4742 | - } |
|
| 4743 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4744 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4745 | - $skipped++; |
|
| 4746 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4747 | - $skipped++; |
|
| 4748 | - } else {
|
|
| 4749 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4750 | - $created++; |
|
| 4751 | - } else {
|
|
| 4752 | - $invalid++; |
|
| 4753 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4754 | - } |
|
| 4755 | - } |
|
| 4756 | - } else {
|
|
| 4757 | - $invalid++; |
|
| 4758 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4759 | - } |
|
| 4760 | - } |
|
| 4761 | - } |
|
| 4762 | - } |
|
| 4729 | + if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4730 | + $updated++; |
|
| 4731 | + } else {
|
|
| 4732 | + $invalid++; |
|
| 4733 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4734 | + } |
|
| 4735 | + } else {
|
|
| 4736 | + if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4737 | + $created++; |
|
| 4738 | + } else {
|
|
| 4739 | + $invalid++; |
|
| 4740 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4741 | + } |
|
| 4742 | + } |
|
| 4743 | + } elseif ( $import_choice == 'skip' ) {
|
|
| 4744 | + if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4745 | + $skipped++; |
|
| 4746 | + } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4747 | + $skipped++; |
|
| 4748 | + } else {
|
|
| 4749 | + if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4750 | + $created++; |
|
| 4751 | + } else {
|
|
| 4752 | + $invalid++; |
|
| 4753 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4754 | + } |
|
| 4755 | + } |
|
| 4756 | + } else {
|
|
| 4757 | + $invalid++; |
|
| 4758 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4759 | + } |
|
| 4760 | + } |
|
| 4761 | + } |
|
| 4762 | + } |
|
| 4763 | 4763 | |
| 4764 | - $json = array(); |
|
| 4765 | - $json['processed'] = $limit; |
|
| 4766 | - $json['created'] = $created; |
|
| 4767 | - $json['updated'] = $updated; |
|
| 4768 | - $json['skipped'] = $skipped; |
|
| 4769 | - $json['invalid'] = $invalid; |
|
| 4770 | - $json['images'] = $images; |
|
| 4764 | + $json = array(); |
|
| 4765 | + $json['processed'] = $limit; |
|
| 4766 | + $json['created'] = $created; |
|
| 4767 | + $json['updated'] = $updated; |
|
| 4768 | + $json['skipped'] = $skipped; |
|
| 4769 | + $json['invalid'] = $invalid; |
|
| 4770 | + $json['images'] = $images; |
|
| 4771 | 4771 | |
| 4772 | - wp_send_json( $json ); |
|
| 4773 | - } else if ( $task == 'import_hood' ) {
|
|
| 4774 | - if (!empty($file)) {
|
|
| 4775 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4772 | + wp_send_json( $json ); |
|
| 4773 | + } else if ( $task == 'import_hood' ) {
|
|
| 4774 | + if (!empty($file)) {
|
|
| 4775 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4776 | 4776 | |
| 4777 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4778 | - $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
|
| 4779 | - wp_send_json( $json ); |
|
| 4780 | - } |
|
| 4777 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4778 | + $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
|
| 4779 | + wp_send_json( $json ); |
|
| 4780 | + } |
|
| 4781 | 4781 | |
| 4782 | - $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
|
|
| 4783 | - $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ); |
|
| 4784 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 4785 | - $index = $processed + $i; |
|
| 4782 | + $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
|
|
| 4783 | + $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ); |
|
| 4784 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 4785 | + $index = $processed + $i; |
|
| 4786 | 4786 | |
| 4787 | - if (isset($file[$index])) {
|
|
| 4788 | - $row = $file[$index]; |
|
| 4789 | - $row = array_map( 'trim', $row ); |
|
| 4790 | - $data = array(); |
|
| 4787 | + if (isset($file[$index])) {
|
|
| 4788 | + $row = $file[$index]; |
|
| 4789 | + $row = array_map( 'trim', $row ); |
|
| 4790 | + $data = array(); |
|
| 4791 | 4791 | |
| 4792 | - foreach ($columns as $c => $column) {
|
|
| 4793 | - if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {
|
|
| 4794 | - $data[$column] = sanitize_text_field($row[$c]); |
|
| 4795 | - } |
|
| 4796 | - } |
|
| 4792 | + foreach ($columns as $c => $column) {
|
|
| 4793 | + if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {
|
|
| 4794 | + $data[$column] = sanitize_text_field($row[$c]); |
|
| 4795 | + } |
|
| 4796 | + } |
|
| 4797 | 4797 | |
| 4798 | - if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
|
|
| 4799 | - $invalid++; |
|
| 4800 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4801 | - continue; |
|
| 4802 | - } |
|
| 4798 | + if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
|
|
| 4799 | + $invalid++; |
|
| 4800 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4801 | + continue; |
|
| 4802 | + } |
|
| 4803 | 4803 | |
| 4804 | - $location_info = array(); |
|
| 4805 | - if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
|
|
| 4806 | - $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
|
|
| 4807 | - } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
|
|
| 4808 | - $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
|
|
| 4809 | - } |
|
| 4804 | + $location_info = array(); |
|
| 4805 | + if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
|
|
| 4806 | + $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
|
|
| 4807 | + } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
|
|
| 4808 | + $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
|
|
| 4809 | + } |
|
| 4810 | 4810 | |
| 4811 | - if (empty($location_info)) {
|
|
| 4812 | - $invalid++; |
|
| 4813 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4814 | - continue; |
|
| 4815 | - } |
|
| 4811 | + if (empty($location_info)) {
|
|
| 4812 | + $invalid++; |
|
| 4813 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4814 | + continue; |
|
| 4815 | + } |
|
| 4816 | 4816 | |
| 4817 | - $location_id = $location_info->location_id; |
|
| 4817 | + $location_id = $location_info->location_id; |
|
| 4818 | 4818 | |
| 4819 | - $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0; |
|
| 4819 | + $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0; |
|
| 4820 | 4820 | |
| 4821 | - $hood_data = array(); |
|
| 4822 | - $hood_data['hood_name'] = $data['neighbourhood_name']; |
|
| 4823 | - $hood_data['hood_slug'] = $data['neighbourhood_slug']; |
|
| 4824 | - $hood_data['hood_latitude'] = $data['latitude']; |
|
| 4825 | - $hood_data['hood_longitude'] = $data['longitude']; |
|
| 4826 | - $hood_data['hood_location_id'] = $location_id; |
|
| 4821 | + $hood_data = array(); |
|
| 4822 | + $hood_data['hood_name'] = $data['neighbourhood_name']; |
|
| 4823 | + $hood_data['hood_slug'] = $data['neighbourhood_slug']; |
|
| 4824 | + $hood_data['hood_latitude'] = $data['latitude']; |
|
| 4825 | + $hood_data['hood_longitude'] = $data['longitude']; |
|
| 4826 | + $hood_data['hood_location_id'] = $location_id; |
|
| 4827 | 4827 | |
| 4828 | - if ( $import_choice == 'update' ) {
|
|
| 4829 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4830 | - $hood_data['hood_id'] = (int)$data['neighbourhood_id']; |
|
| 4828 | + if ( $import_choice == 'update' ) {
|
|
| 4829 | + if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4830 | + $hood_data['hood_id'] = (int)$data['neighbourhood_id']; |
|
| 4831 | 4831 | |
| 4832 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4833 | - $updated++; |
|
| 4834 | - } else {
|
|
| 4835 | - $invalid++; |
|
| 4836 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4837 | - } |
|
| 4838 | - } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4839 | - $hood_data['hood_id'] = (int)$neighbourhood->hood_id; |
|
| 4832 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4833 | + $updated++; |
|
| 4834 | + } else {
|
|
| 4835 | + $invalid++; |
|
| 4836 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4837 | + } |
|
| 4838 | + } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4839 | + $hood_data['hood_id'] = (int)$neighbourhood->hood_id; |
|
| 4840 | 4840 | |
| 4841 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4842 | - $updated++; |
|
| 4843 | - } else {
|
|
| 4844 | - $invalid++; |
|
| 4845 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4846 | - } |
|
| 4847 | - } else {
|
|
| 4848 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4849 | - $created++; |
|
| 4850 | - } else {
|
|
| 4851 | - $invalid++; |
|
| 4852 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4853 | - } |
|
| 4854 | - } |
|
| 4855 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4856 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4857 | - $skipped++; |
|
| 4858 | - } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4859 | - $skipped++; |
|
| 4860 | - } else {
|
|
| 4841 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4842 | + $updated++; |
|
| 4843 | + } else {
|
|
| 4844 | + $invalid++; |
|
| 4845 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4846 | + } |
|
| 4847 | + } else {
|
|
| 4848 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4849 | + $created++; |
|
| 4850 | + } else {
|
|
| 4851 | + $invalid++; |
|
| 4852 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4853 | + } |
|
| 4854 | + } |
|
| 4855 | + } elseif ( $import_choice == 'skip' ) {
|
|
| 4856 | + if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4857 | + $skipped++; |
|
| 4858 | + } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4859 | + $skipped++; |
|
| 4860 | + } else {
|
|
| 4861 | 4861 | |
| 4862 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4863 | - $created++; |
|
| 4864 | - } else {
|
|
| 4865 | - $invalid++; |
|
| 4866 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4867 | - } |
|
| 4868 | - } |
|
| 4869 | - } else {
|
|
| 4870 | - $invalid++; |
|
| 4871 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4872 | - } |
|
| 4873 | - } |
|
| 4874 | - } |
|
| 4875 | - } |
|
| 4862 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4863 | + $created++; |
|
| 4864 | + } else {
|
|
| 4865 | + $invalid++; |
|
| 4866 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4867 | + } |
|
| 4868 | + } |
|
| 4869 | + } else {
|
|
| 4870 | + $invalid++; |
|
| 4871 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4872 | + } |
|
| 4873 | + } |
|
| 4874 | + } |
|
| 4875 | + } |
|
| 4876 | 4876 | |
| 4877 | - $json = array(); |
|
| 4878 | - $json['processed'] = $limit; |
|
| 4879 | - $json['created'] = $created; |
|
| 4880 | - $json['updated'] = $updated; |
|
| 4881 | - $json['skipped'] = $skipped; |
|
| 4882 | - $json['invalid'] = $invalid; |
|
| 4883 | - $json['images'] = $images; |
|
| 4877 | + $json = array(); |
|
| 4878 | + $json['processed'] = $limit; |
|
| 4879 | + $json['created'] = $created; |
|
| 4880 | + $json['updated'] = $updated; |
|
| 4881 | + $json['skipped'] = $skipped; |
|
| 4882 | + $json['invalid'] = $invalid; |
|
| 4883 | + $json['images'] = $images; |
|
| 4884 | 4884 | |
| 4885 | - wp_send_json( $json ); |
|
| 4886 | - } |
|
| 4887 | - } |
|
| 4888 | - break; |
|
| 4889 | - case 'import_finish':{
|
|
| 4890 | - /** |
|
| 4891 | - * Run an action when an import finishes. |
|
| 4892 | - * |
|
| 4893 | - * This action can be used to fire functions after an import ends. |
|
| 4894 | - * |
|
| 4895 | - * @since 1.5.3 |
|
| 4896 | - * @package GeoDirectory |
|
| 4897 | - */ |
|
| 4898 | - do_action('geodir_import_finished');
|
|
| 4899 | - } |
|
| 4900 | - break; |
|
| 4885 | + wp_send_json( $json ); |
|
| 4886 | + } |
|
| 4887 | + } |
|
| 4888 | + break; |
|
| 4889 | + case 'import_finish':{
|
|
| 4890 | + /** |
|
| 4891 | + * Run an action when an import finishes. |
|
| 4892 | + * |
|
| 4893 | + * This action can be used to fire functions after an import ends. |
|
| 4894 | + * |
|
| 4895 | + * @since 1.5.3 |
|
| 4896 | + * @package GeoDirectory |
|
| 4897 | + */ |
|
| 4898 | + do_action('geodir_import_finished');
|
|
| 4899 | + } |
|
| 4900 | + break; |
|
| 4901 | 4901 | |
| 4902 | - } |
|
| 4903 | - echo '0'; |
|
| 4904 | - gd_die(); |
|
| 4902 | + } |
|
| 4903 | + echo '0'; |
|
| 4904 | + gd_die(); |
|
| 4905 | 4905 | } |
| 4906 | 4906 | |
| 4907 | 4907 | /** |
@@ -4945,12 +4945,12 @@ discard block |
||
| 4945 | 4945 | $args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args ); |
| 4946 | 4946 | } |
| 4947 | 4947 | |
| 4948 | - if( !empty( $term ) ) {
|
|
| 4948 | + if( !empty( $term ) ) {
|
|
| 4949 | 4949 | $result = wp_insert_term( $term, $taxonomy, $args ); |
| 4950 | - if( !is_wp_error( $result ) ) {
|
|
| 4951 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4952 | - } |
|
| 4953 | - } |
|
| 4950 | + if( !is_wp_error( $result ) ) {
|
|
| 4951 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4952 | + } |
|
| 4953 | + } |
|
| 4954 | 4954 | |
| 4955 | 4955 | return false; |
| 4956 | 4956 | } |
@@ -4996,16 +4996,16 @@ discard block |
||
| 4996 | 4996 | $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
| 4997 | 4997 | |
| 4998 | 4998 | if( !is_wp_error( $result ) ) {
|
| 4999 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 5000 | - } |
|
| 4999 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 5000 | + } |
|
| 5001 | 5001 | } else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
| 5002 | 5002 | $term_data['term_id'] = $term_info['term_id']; |
| 5003 | 5003 | |
| 5004 | 5004 | $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
| 5005 | 5005 | |
| 5006 | 5006 | if( !is_wp_error( $result ) ) {
|
| 5007 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 5008 | - } |
|
| 5007 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 5008 | + } |
|
| 5009 | 5009 | } else {
|
| 5010 | 5010 | return geodir_imex_insert_term( $taxonomy, $term_data ); |
| 5011 | 5011 | } |
@@ -5027,47 +5027,47 @@ discard block |
||
| 5027 | 5027 | * @return int Posts count. |
| 5028 | 5028 | */ |
| 5029 | 5029 | function geodir_get_posts_count( $post_type ) {
|
| 5030 | - global $wpdb, $plugin_prefix; |
|
| 5030 | + global $wpdb, $plugin_prefix; |
|
| 5031 | 5031 | |
| 5032 | - if ( !post_type_exists( $post_type ) ) {
|
|
| 5033 | - return 0; |
|
| 5034 | - } |
|
| 5032 | + if ( !post_type_exists( $post_type ) ) {
|
|
| 5033 | + return 0; |
|
| 5034 | + } |
|
| 5035 | 5035 | |
| 5036 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5036 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5037 | 5037 | |
| 5038 | - // Skip listing with statuses trash, auto-draft etc... |
|
| 5039 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5040 | - $where_statuses = ''; |
|
| 5041 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5042 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5043 | - } |
|
| 5038 | + // Skip listing with statuses trash, auto-draft etc... |
|
| 5039 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5040 | + $where_statuses = ''; |
|
| 5041 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5042 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5043 | + } |
|
| 5044 | 5044 | |
| 5045 | - /** |
|
| 5046 | - * Filter the SQL where clause part to filter posts count in import/export. |
|
| 5047 | - * |
|
| 5048 | - * @since 1.6.4 |
|
| 5049 | - * @package GeoDirectory |
|
| 5050 | - * |
|
| 5051 | - * @param string $where SQL where clause part. |
|
| 5052 | - */ |
|
| 5053 | - $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type ); |
|
| 5054 | - |
|
| 5055 | - $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );
|
|
| 5056 | - |
|
| 5057 | - $posts_count = (int)$wpdb->get_var( $query ); |
|
| 5045 | + /** |
|
| 5046 | + * Filter the SQL where clause part to filter posts count in import/export. |
|
| 5047 | + * |
|
| 5048 | + * @since 1.6.4 |
|
| 5049 | + * @package GeoDirectory |
|
| 5050 | + * |
|
| 5051 | + * @param string $where SQL where clause part. |
|
| 5052 | + */ |
|
| 5053 | + $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type ); |
|
| 5054 | + |
|
| 5055 | + $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );
|
|
| 5056 | + |
|
| 5057 | + $posts_count = (int)$wpdb->get_var( $query ); |
|
| 5058 | 5058 | |
| 5059 | - /** |
|
| 5060 | - * Modify returned post counts for the current post type. |
|
| 5061 | - * |
|
| 5062 | - * @since 1.4.6 |
|
| 5063 | - * @package GeoDirectory |
|
| 5064 | - * |
|
| 5065 | - * @param int $posts_count Post counts. |
|
| 5066 | - * @param string $post_type Post type. |
|
| 5067 | - */ |
|
| 5068 | - $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type ); |
|
| 5069 | - |
|
| 5070 | - return $posts_count; |
|
| 5059 | + /** |
|
| 5060 | + * Modify returned post counts for the current post type. |
|
| 5061 | + * |
|
| 5062 | + * @since 1.4.6 |
|
| 5063 | + * @package GeoDirectory |
|
| 5064 | + * |
|
| 5065 | + * @param int $posts_count Post counts. |
|
| 5066 | + * @param string $post_type Post type. |
|
| 5067 | + */ |
|
| 5068 | + $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type ); |
|
| 5069 | + |
|
| 5070 | + return $posts_count; |
|
| 5071 | 5071 | } |
| 5072 | 5072 | |
| 5073 | 5073 | /** |
@@ -5135,7 +5135,7 @@ discard block |
||
| 5135 | 5135 | } |
| 5136 | 5136 | $csv_row[] = 'post_status'; |
| 5137 | 5137 | $csv_row[] = 'is_featured'; |
| 5138 | - // Export claim listing field |
|
| 5138 | + // Export claim listing field |
|
| 5139 | 5139 | if ($is_claim_active) {
|
| 5140 | 5140 | $csv_row[] = 'claimed'; |
| 5141 | 5141 | } |
@@ -5144,7 +5144,7 @@ discard block |
||
| 5144 | 5144 | $csv_row[] = 'alive_days'; |
| 5145 | 5145 | $csv_row[] = 'expire_date'; |
| 5146 | 5146 | } |
| 5147 | - $csv_row[] = 'post_date'; |
|
| 5147 | + $csv_row[] = 'post_date'; |
|
| 5148 | 5148 | $csv_row[] = 'post_address'; |
| 5149 | 5149 | $csv_row[] = 'post_city'; |
| 5150 | 5150 | $csv_row[] = 'post_region'; |
@@ -5152,11 +5152,11 @@ discard block |
||
| 5152 | 5152 | $csv_row[] = 'post_zip'; |
| 5153 | 5153 | $csv_row[] = 'post_latitude'; |
| 5154 | 5154 | $csv_row[] = 'post_longitude'; |
| 5155 | - if ($neighbourhood_active) {
|
|
| 5156 | - $csv_row[] = 'post_neighbourhood'; |
|
| 5157 | - $csv_row[] = 'neighbourhood_latitude'; |
|
| 5158 | - $csv_row[] = 'neighbourhood_longitude'; |
|
| 5159 | - } |
|
| 5155 | + if ($neighbourhood_active) {
|
|
| 5156 | + $csv_row[] = 'post_neighbourhood'; |
|
| 5157 | + $csv_row[] = 'neighbourhood_latitude'; |
|
| 5158 | + $csv_row[] = 'neighbourhood_longitude'; |
|
| 5159 | + } |
|
| 5160 | 5160 | $csv_row[] = 'geodir_timing'; |
| 5161 | 5161 | $csv_row[] = 'geodir_contact'; |
| 5162 | 5162 | $csv_row[] = 'geodir_email'; |
@@ -5191,21 +5191,21 @@ discard block |
||
| 5191 | 5191 | $csv_row[] = 'franchise'; |
| 5192 | 5192 | } |
| 5193 | 5193 | |
| 5194 | - /** |
|
| 5195 | - * Filter columns field names of gd export listings csv. |
|
| 5196 | - * |
|
| 5197 | - * @since 1.6.5 |
|
| 5198 | - * @package GeoDirectory |
|
| 5199 | - * |
|
| 5200 | - * @param array $csv_row Column names being exported in csv. |
|
| 5201 | - * @param string $post_type The post type. |
|
| 5202 | - */ |
|
| 5203 | - $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);
|
|
| 5194 | + /** |
|
| 5195 | + * Filter columns field names of gd export listings csv. |
|
| 5196 | + * |
|
| 5197 | + * @since 1.6.5 |
|
| 5198 | + * @package GeoDirectory |
|
| 5199 | + * |
|
| 5200 | + * @param array $csv_row Column names being exported in csv. |
|
| 5201 | + * @param string $post_type The post type. |
|
| 5202 | + */ |
|
| 5203 | + $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);
|
|
| 5204 | 5204 | |
| 5205 | 5205 | $csv_rows[] = $csv_row; |
| 5206 | 5206 | |
| 5207 | 5207 | $images_count = 5; |
| 5208 | - $xx=0; |
|
| 5208 | + $xx=0; |
|
| 5209 | 5209 | foreach ( $posts as $post ) {$xx++;
|
| 5210 | 5210 | $post_id = $post['ID']; |
| 5211 | 5211 | |
@@ -5336,15 +5336,15 @@ discard block |
||
| 5336 | 5336 | } |
| 5337 | 5337 | $csv_row[] = $post_info['post_status']; // post_status |
| 5338 | 5338 | $csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured |
| 5339 | - if ($is_claim_active) {
|
|
| 5340 | - $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5341 | - } |
|
| 5339 | + if ($is_claim_active) {
|
|
| 5340 | + $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5341 | + } |
|
| 5342 | 5342 | if ($is_payment_plugin) {
|
| 5343 | 5343 | $csv_row[] = (int)$post_info['package_id']; // package_id |
| 5344 | 5344 | $csv_row[] = $post_info['alive_days'] !== '' ? absint($post_info['alive_days']) : ''; // alive_days |
| 5345 | 5345 | $csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date
|
| 5346 | 5346 | } |
| 5347 | - $csv_row[] = $post_info['post_date']; // post_date |
|
| 5347 | + $csv_row[] = $post_info['post_date']; // post_date |
|
| 5348 | 5348 | $csv_row[] = stripslashes($post_info['post_address']); // post_address |
| 5349 | 5349 | $csv_row[] = stripslashes($post_info['post_city']); // post_city |
| 5350 | 5350 | $csv_row[] = stripslashes($post_info['post_region']); // post_region |
@@ -5352,21 +5352,21 @@ discard block |
||
| 5352 | 5352 | $csv_row[] = stripslashes($post_info['post_zip']); // post_zip |
| 5353 | 5353 | $csv_row[] = $post_info['post_latitude']; // post_latitude |
| 5354 | 5354 | $csv_row[] = $post_info['post_longitude']; // post_longitude |
| 5355 | - if ($neighbourhood_active) {
|
|
| 5356 | - $post_neighbourhood = ''; |
|
| 5357 | - $neighbourhood_latitude = ''; |
|
| 5358 | - $neighbourhood_longitude = ''; |
|
| 5359 | - if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {
|
|
| 5360 | - if (!empty($hood_info)) {
|
|
| 5361 | - $post_neighbourhood = $hood_info->hood_name; |
|
| 5362 | - $neighbourhood_latitude = $hood_info->hood_latitude; |
|
| 5363 | - $neighbourhood_longitude = $hood_info->hood_longitude; |
|
| 5364 | - } |
|
| 5365 | - } |
|
| 5366 | - $csv_row[] = stripslashes($post_neighbourhood); // post_neighbourhood |
|
| 5367 | - $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude |
|
| 5368 | - $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude |
|
| 5369 | - } |
|
| 5355 | + if ($neighbourhood_active) {
|
|
| 5356 | + $post_neighbourhood = ''; |
|
| 5357 | + $neighbourhood_latitude = ''; |
|
| 5358 | + $neighbourhood_longitude = ''; |
|
| 5359 | + if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {
|
|
| 5360 | + if (!empty($hood_info)) {
|
|
| 5361 | + $post_neighbourhood = $hood_info->hood_name; |
|
| 5362 | + $neighbourhood_latitude = $hood_info->hood_latitude; |
|
| 5363 | + $neighbourhood_longitude = $hood_info->hood_longitude; |
|
| 5364 | + } |
|
| 5365 | + } |
|
| 5366 | + $csv_row[] = stripslashes($post_neighbourhood); // post_neighbourhood |
|
| 5367 | + $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude |
|
| 5368 | + $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude |
|
| 5369 | + } |
|
| 5370 | 5370 | $csv_row[] = stripslashes($post_info['geodir_timing']); // geodir_timing |
| 5371 | 5371 | $csv_row[] = stripslashes($post_info['geodir_contact']); // geodir_contact |
| 5372 | 5372 | $csv_row[] = stripslashes($post_info['geodir_email']); // geodir_email |
@@ -5409,16 +5409,16 @@ discard block |
||
| 5409 | 5409 | $csv_row[] = (int)$franchise; // franchise id |
| 5410 | 5410 | } |
| 5411 | 5411 | |
| 5412 | - /** |
|
| 5413 | - * Filter columns values of gd export listings csv file |
|
| 5414 | - * |
|
| 5415 | - * @since 1.6.5 |
|
| 5416 | - * @package GeoDirectory |
|
| 5417 | - * |
|
| 5418 | - * @param array $csv_row Field values being exported in csv. |
|
| 5419 | - * @param array $post_info The post info. |
|
| 5420 | - */ |
|
| 5421 | - $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
|
|
| 5412 | + /** |
|
| 5413 | + * Filter columns values of gd export listings csv file |
|
| 5414 | + * |
|
| 5415 | + * @since 1.6.5 |
|
| 5416 | + * @package GeoDirectory |
|
| 5417 | + * |
|
| 5418 | + * @param array $csv_row Field values being exported in csv. |
|
| 5419 | + * @param array $post_info The post info. |
|
| 5420 | + */ |
|
| 5421 | + $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
|
|
| 5422 | 5422 | |
| 5423 | 5423 | for ( $c = 0; $c < $images_count; $c++ ) {
|
| 5424 | 5424 | $csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE |
@@ -5451,64 +5451,64 @@ discard block |
||
| 5451 | 5451 | * @return array Array of posts data. |
| 5452 | 5452 | */ |
| 5453 | 5453 | function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {
|
| 5454 | - global $wpdb, $plugin_prefix; |
|
| 5454 | + global $wpdb, $plugin_prefix; |
|
| 5455 | 5455 | |
| 5456 | - if ( ! post_type_exists( $post_type ) ) |
|
| 5457 | - return new stdClass; |
|
| 5456 | + if ( ! post_type_exists( $post_type ) ) |
|
| 5457 | + return new stdClass; |
|
| 5458 | 5458 | |
| 5459 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5459 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5460 | 5460 | |
| 5461 | - $limit = ''; |
|
| 5462 | - if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5463 | - $offset = ( $page_no - 1 ) * $per_page; |
|
| 5461 | + $limit = ''; |
|
| 5462 | + if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5463 | + $offset = ( $page_no - 1 ) * $per_page; |
|
| 5464 | 5464 | |
| 5465 | - if ( $offset > 0 ) {
|
|
| 5466 | - $limit = " LIMIT " . $offset . "," . $per_page; |
|
| 5467 | - } else {
|
|
| 5468 | - $limit = " LIMIT " . $per_page; |
|
| 5469 | - } |
|
| 5470 | - } |
|
| 5465 | + if ( $offset > 0 ) {
|
|
| 5466 | + $limit = " LIMIT " . $offset . "," . $per_page; |
|
| 5467 | + } else {
|
|
| 5468 | + $limit = " LIMIT " . $per_page; |
|
| 5469 | + } |
|
| 5470 | + } |
|
| 5471 | 5471 | |
| 5472 | - // Skip listing with statuses trash, auto-draft etc... |
|
| 5473 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5474 | - $where_statuses = ''; |
|
| 5475 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5476 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5477 | - } |
|
| 5472 | + // Skip listing with statuses trash, auto-draft etc... |
|
| 5473 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5474 | + $where_statuses = ''; |
|
| 5475 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5476 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5477 | + } |
|
| 5478 | 5478 | |
| 5479 | - /** |
|
| 5480 | - * Filter the SQL where clause part to filter posts in import/export. |
|
| 5481 | - * |
|
| 5482 | - * @since 1.6.4 |
|
| 5483 | - * @package GeoDirectory |
|
| 5484 | - * |
|
| 5485 | - * @param string $where SQL where clause part. |
|
| 5486 | - */ |
|
| 5487 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5488 | - |
|
| 5489 | - $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );
|
|
| 5490 | - /** |
|
| 5491 | - * Modify returned posts SQL query for the current post type. |
|
| 5492 | - * |
|
| 5493 | - * @since 1.4.6 |
|
| 5494 | - * @package GeoDirectory |
|
| 5495 | - * |
|
| 5496 | - * @param int $query The SQL query. |
|
| 5497 | - * @param string $post_type Post type. |
|
| 5498 | - */ |
|
| 5499 | - $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type ); |
|
| 5500 | - $results = (array)$wpdb->get_results( $query, ARRAY_A ); |
|
| 5501 | - |
|
| 5502 | - /** |
|
| 5503 | - * Modify returned post results for the current post type. |
|
| 5504 | - * |
|
| 5505 | - * @since 1.4.6 |
|
| 5506 | - * @package GeoDirectory |
|
| 5507 | - * |
|
| 5508 | - * @param object $results An object containing all post ids. |
|
| 5509 | - * @param string $post_type Post type. |
|
| 5510 | - */ |
|
| 5511 | - return apply_filters( 'geodir_export_posts', $results, $post_type ); |
|
| 5479 | + /** |
|
| 5480 | + * Filter the SQL where clause part to filter posts in import/export. |
|
| 5481 | + * |
|
| 5482 | + * @since 1.6.4 |
|
| 5483 | + * @package GeoDirectory |
|
| 5484 | + * |
|
| 5485 | + * @param string $where SQL where clause part. |
|
| 5486 | + */ |
|
| 5487 | + $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5488 | + |
|
| 5489 | + $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );
|
|
| 5490 | + /** |
|
| 5491 | + * Modify returned posts SQL query for the current post type. |
|
| 5492 | + * |
|
| 5493 | + * @since 1.4.6 |
|
| 5494 | + * @package GeoDirectory |
|
| 5495 | + * |
|
| 5496 | + * @param int $query The SQL query. |
|
| 5497 | + * @param string $post_type Post type. |
|
| 5498 | + */ |
|
| 5499 | + $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type ); |
|
| 5500 | + $results = (array)$wpdb->get_results( $query, ARRAY_A ); |
|
| 5501 | + |
|
| 5502 | + /** |
|
| 5503 | + * Modify returned post results for the current post type. |
|
| 5504 | + * |
|
| 5505 | + * @since 1.4.6 |
|
| 5506 | + * @package GeoDirectory |
|
| 5507 | + * |
|
| 5508 | + * @param object $results An object containing all post ids. |
|
| 5509 | + * @param string $post_type Post type. |
|
| 5510 | + */ |
|
| 5511 | + return apply_filters( 'geodir_export_posts', $results, $post_type ); |
|
| 5512 | 5512 | } |
| 5513 | 5513 | |
| 5514 | 5514 | /** |
@@ -5527,26 +5527,26 @@ discard block |
||
| 5527 | 5527 | * @return string The SQL query. |
| 5528 | 5528 | */ |
| 5529 | 5529 | function geodir_imex_get_events_query( $query, $post_type ) {
|
| 5530 | - if ( $post_type == 'gd_event' ) {
|
|
| 5531 | - global $wpdb, $plugin_prefix; |
|
| 5530 | + if ( $post_type == 'gd_event' ) {
|
|
| 5531 | + global $wpdb, $plugin_prefix; |
|
| 5532 | 5532 | |
| 5533 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5534 | - $schedule_table = EVENT_SCHEDULE; |
|
| 5533 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5534 | + $schedule_table = EVENT_SCHEDULE; |
|
| 5535 | 5535 | |
| 5536 | - // Skip listing with statuses trash, auto-draft etc... |
|
| 5537 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5538 | - $where_statuses = ''; |
|
| 5539 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5540 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5541 | - } |
|
| 5536 | + // Skip listing with statuses trash, auto-draft etc... |
|
| 5537 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5538 | + $where_statuses = ''; |
|
| 5539 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5540 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5541 | + } |
|
| 5542 | 5542 | |
| 5543 | - /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */ |
|
| 5544 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5543 | + /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */ |
|
| 5544 | + $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5545 | 5545 | |
| 5546 | - $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );
|
|
| 5547 | - } |
|
| 5546 | + $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );
|
|
| 5547 | + } |
|
| 5548 | 5548 | |
| 5549 | - return $query; |
|
| 5549 | + return $query; |
|
| 5550 | 5550 | } |
| 5551 | 5551 | |
| 5552 | 5552 | /** |
@@ -5568,36 +5568,36 @@ discard block |
||
| 5568 | 5568 | * @return int Total terms count. |
| 5569 | 5569 | */ |
| 5570 | 5570 | function geodir_get_terms_count( $post_type ) {
|
| 5571 | - $args = array( 'hide_empty' => 0 ); |
|
| 5571 | + $args = array( 'hide_empty' => 0 ); |
|
| 5572 | 5572 | |
| 5573 | - remove_all_filters( 'get_terms' ); |
|
| 5573 | + remove_all_filters( 'get_terms' ); |
|
| 5574 | 5574 | |
| 5575 | - $taxonomy = $post_type . 'category'; |
|
| 5575 | + $taxonomy = $post_type . 'category'; |
|
| 5576 | 5576 | |
| 5577 | - // WPML |
|
| 5578 | - $is_wpml = geodir_is_wpml(); |
|
| 5579 | - $active_lang = 'all'; |
|
| 5580 | - if ( $is_wpml ) {
|
|
| 5581 | - global $sitepress; |
|
| 5582 | - $active_lang = $sitepress->get_current_language(); |
|
| 5577 | + // WPML |
|
| 5578 | + $is_wpml = geodir_is_wpml(); |
|
| 5579 | + $active_lang = 'all'; |
|
| 5580 | + if ( $is_wpml ) {
|
|
| 5581 | + global $sitepress; |
|
| 5582 | + $active_lang = $sitepress->get_current_language(); |
|
| 5583 | 5583 | |
| 5584 | - if ( $active_lang != 'all' ) {
|
|
| 5585 | - $sitepress->switch_lang( 'all', true ); |
|
| 5586 | - } |
|
| 5587 | - } |
|
| 5588 | - // WPML |
|
| 5584 | + if ( $active_lang != 'all' ) {
|
|
| 5585 | + $sitepress->switch_lang( 'all', true ); |
|
| 5586 | + } |
|
| 5587 | + } |
|
| 5588 | + // WPML |
|
| 5589 | 5589 | |
| 5590 | - $count_terms = wp_count_terms( $taxonomy, $args ); |
|
| 5590 | + $count_terms = wp_count_terms( $taxonomy, $args ); |
|
| 5591 | 5591 | |
| 5592 | - // WPML |
|
| 5593 | - if ( $is_wpml && $active_lang !== 'all' ) {
|
|
| 5594 | - global $sitepress; |
|
| 5595 | - $sitepress->switch_lang( $active_lang, true ); |
|
| 5596 | - } |
|
| 5597 | - // WPML |
|
| 5598 | - $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0; |
|
| 5592 | + // WPML |
|
| 5593 | + if ( $is_wpml && $active_lang !== 'all' ) {
|
|
| 5594 | + global $sitepress; |
|
| 5595 | + $sitepress->switch_lang( $active_lang, true ); |
|
| 5596 | + } |
|
| 5597 | + // WPML |
|
| 5598 | + $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0; |
|
| 5599 | 5599 | |
| 5600 | - return $count_terms; |
|
| 5600 | + return $count_terms; |
|
| 5601 | 5601 | } |
| 5602 | 5602 | |
| 5603 | 5603 | /** |
@@ -5636,11 +5636,11 @@ discard block |
||
| 5636 | 5636 | $csv_row[] = 'cat_posttype'; |
| 5637 | 5637 | $csv_row[] = 'cat_parent'; |
| 5638 | 5638 | $csv_row[] = 'cat_schema'; |
| 5639 | - // WPML |
|
| 5639 | + // WPML |
|
| 5640 | 5640 | $is_wpml = geodir_wpml_is_taxonomy_translated( $taxonomy ); |
| 5641 | 5641 | if ($is_wpml) {
|
| 5642 | 5642 | $csv_row[] = 'cat_language'; |
| 5643 | - $csv_row[] = 'cat_id_original'; |
|
| 5643 | + $csv_row[] = 'cat_id_original'; |
|
| 5644 | 5644 | } |
| 5645 | 5645 | // WPML |
| 5646 | 5646 | $csv_row[] = 'cat_description'; |
@@ -5670,10 +5670,10 @@ discard block |
||
| 5670 | 5670 | $csv_row[] = $post_type; |
| 5671 | 5671 | $csv_row[] = $cat_parent; |
| 5672 | 5672 | $csv_row[] = geodir_get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type ); |
| 5673 | - // WPML |
|
| 5673 | + // WPML |
|
| 5674 | 5674 | if ($is_wpml) {
|
| 5675 | 5675 | $csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy ); |
| 5676 | - $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5676 | + $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5677 | 5677 | } |
| 5678 | 5678 | // WPML |
| 5679 | 5679 | $csv_row[] = $term->description; |
@@ -6091,43 +6091,43 @@ discard block |
||
| 6091 | 6091 | * @param string $status Post status. |
| 6092 | 6092 | */ |
| 6093 | 6093 | function geodir_create_page($slug, $option, $page_title = '', $page_content = '', $post_parent = 0, $status = 'publish') {
|
| 6094 | - global $wpdb, $current_user; |
|
| 6095 | - |
|
| 6096 | - $option_value = get_option($option); |
|
| 6097 | - |
|
| 6098 | - if ($option_value > 0) : |
|
| 6099 | - if (get_post($option_value)) : |
|
| 6100 | - // Page exists |
|
| 6101 | - return; |
|
| 6102 | - endif; |
|
| 6103 | - endif; |
|
| 6104 | - |
|
| 6105 | - $page_found = $wpdb->get_var( |
|
| 6106 | - $wpdb->prepare( |
|
| 6107 | - "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 6108 | - array($slug) |
|
| 6109 | - ) |
|
| 6110 | - ); |
|
| 6111 | - |
|
| 6112 | - if ($page_found) : |
|
| 6113 | - // Page exists |
|
| 6114 | - if (!$option_value) update_option($option, $page_found); |
|
| 6115 | - return; |
|
| 6116 | - endif; |
|
| 6117 | - |
|
| 6118 | - $page_data = array( |
|
| 6119 | - 'post_status' => $status, |
|
| 6120 | - 'post_type' => 'page', |
|
| 6121 | - 'post_author' => $current_user->ID, |
|
| 6122 | - 'post_name' => $slug, |
|
| 6123 | - 'post_title' => $page_title, |
|
| 6124 | - 'post_content' => $page_content, |
|
| 6125 | - 'post_parent' => $post_parent, |
|
| 6126 | - 'comment_status' => 'closed' |
|
| 6127 | - ); |
|
| 6128 | - $page_id = wp_insert_post($page_data); |
|
| 6129 | - |
|
| 6130 | - add_option($option, $page_id); |
|
| 6094 | + global $wpdb, $current_user; |
|
| 6095 | + |
|
| 6096 | + $option_value = get_option($option); |
|
| 6097 | + |
|
| 6098 | + if ($option_value > 0) : |
|
| 6099 | + if (get_post($option_value)) : |
|
| 6100 | + // Page exists |
|
| 6101 | + return; |
|
| 6102 | + endif; |
|
| 6103 | + endif; |
|
| 6104 | + |
|
| 6105 | + $page_found = $wpdb->get_var( |
|
| 6106 | + $wpdb->prepare( |
|
| 6107 | + "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 6108 | + array($slug) |
|
| 6109 | + ) |
|
| 6110 | + ); |
|
| 6111 | + |
|
| 6112 | + if ($page_found) : |
|
| 6113 | + // Page exists |
|
| 6114 | + if (!$option_value) update_option($option, $page_found); |
|
| 6115 | + return; |
|
| 6116 | + endif; |
|
| 6117 | + |
|
| 6118 | + $page_data = array( |
|
| 6119 | + 'post_status' => $status, |
|
| 6120 | + 'post_type' => 'page', |
|
| 6121 | + 'post_author' => $current_user->ID, |
|
| 6122 | + 'post_name' => $slug, |
|
| 6123 | + 'post_title' => $page_title, |
|
| 6124 | + 'post_content' => $page_content, |
|
| 6125 | + 'post_parent' => $post_parent, |
|
| 6126 | + 'comment_status' => 'closed' |
|
| 6127 | + ); |
|
| 6128 | + $page_id = wp_insert_post($page_data); |
|
| 6129 | + |
|
| 6130 | + add_option($option, $page_id); |
|
| 6131 | 6131 | |
| 6132 | 6132 | } |
| 6133 | 6133 | |
@@ -6158,9 +6158,9 @@ discard block |
||
| 6158 | 6158 | * @package GeoDirectory |
| 6159 | 6159 | */ |
| 6160 | 6160 | function geodir_admin_upgrade_notice() {
|
| 6161 | - $class = "error"; |
|
| 6162 | - $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
|
|
| 6163 | - echo"<div class=\"$class\"> <p>$message</p></div>"; |
|
| 6161 | + $class = "error"; |
|
| 6162 | + $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
|
|
| 6163 | + echo"<div class=\"$class\"> <p>$message</p></div>"; |
|
| 6164 | 6164 | } |
| 6165 | 6165 | |
| 6166 | 6166 | /** |
@@ -6173,18 +6173,18 @@ discard block |
||
| 6173 | 6173 | */ |
| 6174 | 6174 | function geodire_admin_upgrade_notice( $plugin_data, $r ) |
| 6175 | 6175 | {
|
| 6176 | - // readme contents |
|
| 6177 | - $args = array( |
|
| 6178 | - 'timeout' => 15, |
|
| 6179 | - 'redirection' => 5 |
|
| 6180 | - ); |
|
| 6181 | - $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt"; |
|
| 6182 | - $data = wp_remote_get( $url, $args ); |
|
| 6176 | + // readme contents |
|
| 6177 | + $args = array( |
|
| 6178 | + 'timeout' => 15, |
|
| 6179 | + 'redirection' => 5 |
|
| 6180 | + ); |
|
| 6181 | + $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt"; |
|
| 6182 | + $data = wp_remote_get( $url, $args ); |
|
| 6183 | 6183 | |
| 6184 | - if (!is_wp_error($data) && $data['response']['code'] == 200) {
|
|
| 6184 | + if (!is_wp_error($data) && $data['response']['code'] == 200) {
|
|
| 6185 | 6185 | |
| 6186 | - geodir_in_plugin_update_message($data['body']); |
|
| 6187 | - } |
|
| 6186 | + geodir_in_plugin_update_message($data['body']); |
|
| 6187 | + } |
|
| 6188 | 6188 | } |
| 6189 | 6189 | |
| 6190 | 6190 | |
@@ -6192,28 +6192,28 @@ discard block |
||
| 6192 | 6192 | * @param string $content http response body |
| 6193 | 6193 | */ |
| 6194 | 6194 | function geodir_in_plugin_update_message($content) {
|
| 6195 | - // Output Upgrade Notice |
|
| 6196 | - $matches = null; |
|
| 6197 | - $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis'; |
|
| 6198 | - $upgrade_notice = ''; |
|
| 6199 | - if ( preg_match( $regexp, $content, $matches ) ) {
|
|
| 6200 | - if(empty($matches)){return;}
|
|
| 6201 | - |
|
| 6202 | - $version = trim( $matches[1] ); |
|
| 6203 | - if($version && $version>GEODIRECTORY_VERSION){
|
|
| 6204 | - |
|
| 6205 | - |
|
| 6206 | - $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
|
|
| 6207 | - if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
|
|
| 6208 | - $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">'; |
|
| 6209 | - foreach ( $notices as $index => $line ) {
|
|
| 6210 | - $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
|
|
| 6211 | - } |
|
| 6212 | - $upgrade_notice .= '</div> '; |
|
| 6213 | - } |
|
| 6214 | - } |
|
| 6215 | - } |
|
| 6216 | - echo $upgrade_notice; |
|
| 6195 | + // Output Upgrade Notice |
|
| 6196 | + $matches = null; |
|
| 6197 | + $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis'; |
|
| 6198 | + $upgrade_notice = ''; |
|
| 6199 | + if ( preg_match( $regexp, $content, $matches ) ) {
|
|
| 6200 | + if(empty($matches)){return;}
|
|
| 6201 | + |
|
| 6202 | + $version = trim( $matches[1] ); |
|
| 6203 | + if($version && $version>GEODIRECTORY_VERSION){
|
|
| 6204 | + |
|
| 6205 | + |
|
| 6206 | + $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
|
|
| 6207 | + if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
|
|
| 6208 | + $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">'; |
|
| 6209 | + foreach ( $notices as $index => $line ) {
|
|
| 6210 | + $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
|
|
| 6211 | + } |
|
| 6212 | + $upgrade_notice .= '</div> '; |
|
| 6213 | + } |
|
| 6214 | + } |
|
| 6215 | + } |
|
| 6216 | + echo $upgrade_notice; |
|
| 6217 | 6217 | } |
| 6218 | 6218 | |
| 6219 | 6219 | /** |
@@ -6246,19 +6246,19 @@ discard block |
||
| 6246 | 6246 | * @param array Listing statuses to be skipped. |
| 6247 | 6247 | */ |
| 6248 | 6248 | function geodir_imex_export_skip_statuses() {
|
| 6249 | - $statuses = array( 'trash', 'auto-draft' ); |
|
| 6249 | + $statuses = array( 'trash', 'auto-draft' ); |
|
| 6250 | 6250 | |
| 6251 | - /** |
|
| 6252 | - * Filter the statuses to skip during GD export listings. |
|
| 6253 | - * |
|
| 6254 | - * @since 1.6.0 |
|
| 6255 | - * @package GeoDirectory |
|
| 6256 | - * |
|
| 6257 | - * @param array $statuses Listing statuses to be skipped. |
|
| 6258 | - */ |
|
| 6259 | - $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses ); |
|
| 6251 | + /** |
|
| 6252 | + * Filter the statuses to skip during GD export listings. |
|
| 6253 | + * |
|
| 6254 | + * @since 1.6.0 |
|
| 6255 | + * @package GeoDirectory |
|
| 6256 | + * |
|
| 6257 | + * @param array $statuses Listing statuses to be skipped. |
|
| 6258 | + */ |
|
| 6259 | + $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses ); |
|
| 6260 | 6260 | |
| 6261 | - return $statuses; |
|
| 6261 | + return $statuses; |
|
| 6262 | 6262 | } |
| 6263 | 6263 | |
| 6264 | 6264 | /** |
@@ -6274,42 +6274,42 @@ discard block |
||
| 6274 | 6274 | * @global string $typenow Current post type. |
| 6275 | 6275 | */ |
| 6276 | 6276 | function geodir_admin_dequeue_scripts() {
|
| 6277 | - global $typenow; |
|
| 6277 | + global $typenow; |
|
| 6278 | 6278 | |
| 6279 | - // EDD |
|
| 6280 | - if (wp_script_is('jquery-chosen', 'enqueued')) {
|
|
| 6281 | - wp_dequeue_script('jquery-chosen');
|
|
| 6282 | - } |
|
| 6279 | + // EDD |
|
| 6280 | + if (wp_script_is('jquery-chosen', 'enqueued')) {
|
|
| 6281 | + wp_dequeue_script('jquery-chosen');
|
|
| 6282 | + } |
|
| 6283 | 6283 | |
| 6284 | - // Ultimate Addons for Visual Composer |
|
| 6285 | - if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {
|
|
| 6286 | - wp_dequeue_script('ultimate-vc-backend-script');
|
|
| 6287 | - } |
|
| 6284 | + // Ultimate Addons for Visual Composer |
|
| 6285 | + if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {
|
|
| 6286 | + wp_dequeue_script('ultimate-vc-backend-script');
|
|
| 6287 | + } |
|
| 6288 | 6288 | |
| 6289 | - // VC editor conflicts |
|
| 6290 | - if (class_exists('Vc_Role_Access_Controller') && wp_script_is('dfd_vc_damin_scripts', 'enqueued')) {
|
|
| 6291 | - wp_dequeue_script('dfd_vc_damin_scripts');
|
|
| 6292 | - } |
|
| 6289 | + // VC editor conflicts |
|
| 6290 | + if (class_exists('Vc_Role_Access_Controller') && wp_script_is('dfd_vc_damin_scripts', 'enqueued')) {
|
|
| 6291 | + wp_dequeue_script('dfd_vc_damin_scripts');
|
|
| 6292 | + } |
|
| 6293 | 6293 | |
| 6294 | - // Ultimate chosen |
|
| 6295 | - if (wp_script_is('ultimate-chosen-script', 'enqueued')) {
|
|
| 6296 | - wp_dequeue_script('ultimate-chosen-script');
|
|
| 6297 | - } |
|
| 6294 | + // Ultimate chosen |
|
| 6295 | + if (wp_script_is('ultimate-chosen-script', 'enqueued')) {
|
|
| 6296 | + wp_dequeue_script('ultimate-chosen-script');
|
|
| 6297 | + } |
|
| 6298 | 6298 | |
| 6299 | - // Crum composer choosen |
|
| 6300 | - if (wp_script_is('crum-composer-choosen', 'enqueued')) {
|
|
| 6301 | - wp_dequeue_script('crum-composer-choosen');
|
|
| 6302 | - } |
|
| 6299 | + // Crum composer choosen |
|
| 6300 | + if (wp_script_is('crum-composer-choosen', 'enqueued')) {
|
|
| 6301 | + wp_dequeue_script('crum-composer-choosen');
|
|
| 6302 | + } |
|
| 6303 | 6303 | |
| 6304 | - // Fix conflict Fusion Builder jquery chosen with GD jquery chosen. |
|
| 6305 | - if (class_exists('FusionBuilder') && wp_script_is('fusion_builder_chosen_js', 'enqueued')) {
|
|
| 6306 | - wp_dequeue_script('fusion_builder_chosen_js');
|
|
| 6307 | - } |
|
| 6304 | + // Fix conflict Fusion Builder jquery chosen with GD jquery chosen. |
|
| 6305 | + if (class_exists('FusionBuilder') && wp_script_is('fusion_builder_chosen_js', 'enqueued')) {
|
|
| 6306 | + wp_dequeue_script('fusion_builder_chosen_js');
|
|
| 6307 | + } |
|
| 6308 | 6308 | |
| 6309 | - // Fix conflicts timepicker & setting date value. |
|
| 6310 | - if (class_exists('acf') && wp_script_is('acf-timepicker', 'enqueued')) {
|
|
| 6311 | - wp_dequeue_script('acf-timepicker');
|
|
| 6312 | - } |
|
| 6309 | + // Fix conflicts timepicker & setting date value. |
|
| 6310 | + if (class_exists('acf') && wp_script_is('acf-timepicker', 'enqueued')) {
|
|
| 6311 | + wp_dequeue_script('acf-timepicker');
|
|
| 6312 | + } |
|
| 6313 | 6313 | } |
| 6314 | 6314 | |
| 6315 | 6315 | /** |
@@ -6325,48 +6325,48 @@ discard block |
||
| 6325 | 6325 | * @return string SQL where clause part. |
| 6326 | 6326 | */ |
| 6327 | 6327 | function geodir_imex_get_filter_where($where = '', $post_type = '') {
|
| 6328 | - global $wpdb; |
|
| 6328 | + global $wpdb; |
|
| 6329 | 6329 | |
| 6330 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6330 | + $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6331 | 6331 | |
| 6332 | - if ( !empty( $filters ) ) {
|
|
| 6333 | - foreach ( $filters as $field => $value ) {
|
|
| 6334 | - switch ($field) {
|
|
| 6335 | - case 'start_date': |
|
| 6336 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'"; |
|
| 6337 | - break; |
|
| 6338 | - case 'end_date': |
|
| 6339 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'"; |
|
| 6340 | - break; |
|
| 6341 | - } |
|
| 6342 | - } |
|
| 6343 | - } |
|
| 6332 | + if ( !empty( $filters ) ) {
|
|
| 6333 | + foreach ( $filters as $field => $value ) {
|
|
| 6334 | + switch ($field) {
|
|
| 6335 | + case 'start_date': |
|
| 6336 | + $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'"; |
|
| 6337 | + break; |
|
| 6338 | + case 'end_date': |
|
| 6339 | + $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'"; |
|
| 6340 | + break; |
|
| 6341 | + } |
|
| 6342 | + } |
|
| 6343 | + } |
|
| 6344 | 6344 | |
| 6345 | - return $where; |
|
| 6345 | + return $where; |
|
| 6346 | 6346 | } |
| 6347 | 6347 | add_filter('geodir_get_posts_count', 'geodir_imex_get_filter_where', 10, 2);
|
| 6348 | 6348 | add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);
|
| 6349 | 6349 | |
| 6350 | 6350 | |
| 6351 | 6351 | function geodir_fix_for_primer_theme(){
|
| 6352 | - if(!defined( 'PRIMER_VERSION' )){return;}
|
|
| 6353 | - global $pagenow; |
|
| 6352 | + if(!defined( 'PRIMER_VERSION' )){return;}
|
|
| 6353 | + global $pagenow; |
|
| 6354 | 6354 | |
| 6355 | - if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){
|
|
| 6355 | + if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){
|
|
| 6356 | 6356 | |
| 6357 | - $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] ); |
|
| 6357 | + $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] ); |
|
| 6358 | 6358 | |
| 6359 | - $post_types = geodir_get_posttypes(); |
|
| 6360 | - if ($post_type && in_array($post_type, $post_types) ) {
|
|
| 6361 | - global $primer_customizer_layouts; |
|
| 6362 | - remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10); |
|
| 6363 | - } |
|
| 6364 | - } |
|
| 6359 | + $post_types = geodir_get_posttypes(); |
|
| 6360 | + if ($post_type && in_array($post_type, $post_types) ) {
|
|
| 6361 | + global $primer_customizer_layouts; |
|
| 6362 | + remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10); |
|
| 6363 | + } |
|
| 6364 | + } |
|
| 6365 | 6365 | |
| 6366 | 6366 | } |
| 6367 | 6367 | |
| 6368 | 6368 | if(is_admin()){
|
| 6369 | - add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
|
|
| 6369 | + add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
|
|
| 6370 | 6370 | } |
| 6371 | 6371 | |
| 6372 | 6372 | |
@@ -6499,96 +6499,96 @@ discard block |
||
| 6499 | 6499 | |
| 6500 | 6500 | function geodir_ga_activation_url() {
|
| 6501 | 6501 | |
| 6502 | - return add_query_arg( array( |
|
| 6503 | - 'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
|
|
| 6504 | - 'scope' => GEODIR_GA_SCOPE, |
|
| 6505 | - 'response_type' => 'code', |
|
| 6506 | - 'redirect_uri' => GEODIR_GA_REDIRECT, |
|
| 6507 | - 'client_id' => GEODIR_GA_CLIENTID, |
|
| 6508 | - ), 'https://accounts.google.com/o/oauth2/auth' ); |
|
| 6502 | + return add_query_arg( array( |
|
| 6503 | + 'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
|
|
| 6504 | + 'scope' => GEODIR_GA_SCOPE, |
|
| 6505 | + 'response_type' => 'code', |
|
| 6506 | + 'redirect_uri' => GEODIR_GA_REDIRECT, |
|
| 6507 | + 'client_id' => GEODIR_GA_CLIENTID, |
|
| 6508 | + ), 'https://accounts.google.com/o/oauth2/auth' ); |
|
| 6509 | 6509 | |
| 6510 | - return $url; |
|
| 6510 | + return $url; |
|
| 6511 | 6511 | } |
| 6512 | 6512 | |
| 6513 | 6513 | function geodir_gd_accounts(){
|
| 6514 | - $accounts = array(); |
|
| 6515 | - $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true ); |
|
| 6516 | - if($useAuth){
|
|
| 6517 | - try {
|
|
| 6518 | - $accounts = geodir_ga_get_analytics_accounts(); |
|
| 6519 | - } catch (Exception $e) {
|
|
| 6520 | - geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 6521 | - } |
|
| 6514 | + $accounts = array(); |
|
| 6515 | + $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true ); |
|
| 6516 | + if($useAuth){
|
|
| 6517 | + try {
|
|
| 6518 | + $accounts = geodir_ga_get_analytics_accounts(); |
|
| 6519 | + } catch (Exception $e) {
|
|
| 6520 | + geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 6521 | + } |
|
| 6522 | 6522 | |
| 6523 | - if(is_array($accounts)){
|
|
| 6524 | - $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
|
|
| 6525 | - }elseif(get_option('geodir_ga_account_id')){
|
|
| 6526 | - $accounts = array(); |
|
| 6527 | - $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6528 | - } |
|
| 6529 | - } |
|
| 6530 | - return $accounts; |
|
| 6523 | + if(is_array($accounts)){
|
|
| 6524 | + $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
|
|
| 6525 | + }elseif(get_option('geodir_ga_account_id')){
|
|
| 6526 | + $accounts = array(); |
|
| 6527 | + $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6528 | + } |
|
| 6529 | + } |
|
| 6530 | + return $accounts; |
|
| 6531 | 6531 | } |
| 6532 | 6532 | |
| 6533 | 6533 | function geodir_ga_get_analytics_accounts() |
| 6534 | 6534 | {
|
| 6535 | - global $gd_ga_errors; |
|
| 6536 | - $accounts = array(); |
|
| 6535 | + global $gd_ga_errors; |
|
| 6536 | + $accounts = array(); |
|
| 6537 | 6537 | |
| 6538 | - if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
|
|
| 6538 | + if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
|
|
| 6539 | 6539 | |
| 6540 | 6540 | |
| 6541 | - if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
|
|
| 6542 | - return get_option('geodir_gd_uids');
|
|
| 6543 | - } |
|
| 6541 | + if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
|
|
| 6542 | + return get_option('geodir_gd_uids');
|
|
| 6543 | + } |
|
| 6544 | 6544 | |
| 6545 | - # Create a new Gdata call |
|
| 6546 | - if ( trim(get_option('geodir_ga_auth_code')) != '' )
|
|
| 6547 | - $stats = new GDGoogleAnalyticsStats(); |
|
| 6548 | - else |
|
| 6549 | - return false; |
|
| 6545 | + # Create a new Gdata call |
|
| 6546 | + if ( trim(get_option('geodir_ga_auth_code')) != '' )
|
|
| 6547 | + $stats = new GDGoogleAnalyticsStats(); |
|
| 6548 | + else |
|
| 6549 | + return false; |
|
| 6550 | 6550 | |
| 6551 | - # Check if Google sucessfully logged in |
|
| 6552 | - if ( ! $stats->checkLogin() ) |
|
| 6553 | - return false; |
|
| 6551 | + # Check if Google sucessfully logged in |
|
| 6552 | + if ( ! $stats->checkLogin() ) |
|
| 6553 | + return false; |
|
| 6554 | 6554 | |
| 6555 | - # Get a list of accounts |
|
| 6556 | - try {
|
|
| 6557 | - $accounts = $stats->getAllProfiles(); |
|
| 6558 | - } catch (Exception $e) {
|
|
| 6559 | - $gd_ga_errors[] = $e->getMessage(); |
|
| 6560 | - return false; |
|
| 6561 | - } |
|
| 6555 | + # Get a list of accounts |
|
| 6556 | + try {
|
|
| 6557 | + $accounts = $stats->getAllProfiles(); |
|
| 6558 | + } catch (Exception $e) {
|
|
| 6559 | + $gd_ga_errors[] = $e->getMessage(); |
|
| 6560 | + return false; |
|
| 6561 | + } |
|
| 6562 | 6562 | |
| 6563 | 6563 | |
| 6564 | - natcasesort ($accounts); |
|
| 6564 | + natcasesort ($accounts); |
|
| 6565 | 6565 | |
| 6566 | - # Return the account array if there are accounts |
|
| 6567 | - if ( count($accounts) > 0 ){
|
|
| 6568 | - update_option('geodir_gd_uids',$accounts);
|
|
| 6569 | - return $accounts; |
|
| 6570 | - } |
|
| 6571 | - else |
|
| 6572 | - return false; |
|
| 6566 | + # Return the account array if there are accounts |
|
| 6567 | + if ( count($accounts) > 0 ){
|
|
| 6568 | + update_option('geodir_gd_uids',$accounts);
|
|
| 6569 | + return $accounts; |
|
| 6570 | + } |
|
| 6571 | + else |
|
| 6572 | + return false; |
|
| 6573 | 6573 | } |
| 6574 | 6574 | |
| 6575 | 6575 | add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' ); |
| 6576 | 6576 | function geodir_ga_deauthorize(){
|
| 6577 | 6577 | |
| 6578 | - if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
|
|
| 6578 | + if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
|
|
| 6579 | 6579 | |
| 6580 | - die( 'Security check' ); |
|
| 6580 | + die( 'Security check' ); |
|
| 6581 | 6581 | |
| 6582 | - } else {
|
|
| 6583 | - update_option('geodir_ga_auth_token','');
|
|
| 6584 | - update_option('geodir_ga_auth_code','');
|
|
| 6585 | - update_option('geodir_gd_uids','');
|
|
| 6582 | + } else {
|
|
| 6583 | + update_option('geodir_ga_auth_token','');
|
|
| 6584 | + update_option('geodir_ga_auth_code','');
|
|
| 6585 | + update_option('geodir_gd_uids','');
|
|
| 6586 | 6586 | |
| 6587 | 6587 | |
| 6588 | - echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
|
|
| 6589 | - } |
|
| 6588 | + echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
|
|
| 6589 | + } |
|
| 6590 | 6590 | |
| 6591 | - die(); |
|
| 6591 | + die(); |
|
| 6592 | 6592 | } |
| 6593 | 6593 | |
| 6594 | 6594 | |
@@ -6599,14 +6599,14 @@ discard block |
||
| 6599 | 6599 | * @package GeoDirectory |
| 6600 | 6600 | */ |
| 6601 | 6601 | function geodir_post_type_setting_fun() {
|
| 6602 | - $post_type_arr = array(); |
|
| 6602 | + $post_type_arr = array(); |
|
| 6603 | 6603 | |
| 6604 | - $post_types = geodir_get_posttypes('object');
|
|
| 6604 | + $post_types = geodir_get_posttypes('object');
|
|
| 6605 | 6605 | |
| 6606 | - foreach ($post_types as $key => $post_types_obj) {
|
|
| 6607 | - $post_type_arr[$key] = $post_types_obj->labels->singular_name; |
|
| 6608 | - } |
|
| 6609 | - return $post_type_arr; |
|
| 6606 | + foreach ($post_types as $key => $post_types_obj) {
|
|
| 6607 | + $post_type_arr[$key] = $post_types_obj->labels->singular_name; |
|
| 6608 | + } |
|
| 6609 | + return $post_type_arr; |
|
| 6610 | 6610 | } |
| 6611 | 6611 | |
| 6612 | 6612 | /** |
@@ -6617,35 +6617,35 @@ discard block |
||
| 6617 | 6617 | */ |
| 6618 | 6618 | function geodir_listing_image_size_arr(){
|
| 6619 | 6619 | |
| 6620 | - global $_wp_additional_image_sizes; |
|
| 6621 | - |
|
| 6622 | - $sizes = array(); |
|
| 6623 | - |
|
| 6624 | - foreach ( get_intermediate_image_sizes() as $_size ) {
|
|
| 6625 | - if ( in_array( $_size, array('thumbnail', 'medium', 'medium_large', 'large') ) ) {
|
|
| 6626 | - $sizes[ $_size ]['width'] = get_option( "{$_size}_size_w" );
|
|
| 6627 | - $sizes[ $_size ]['height'] = get_option( "{$_size}_size_h" );
|
|
| 6628 | - $sizes[ $_size ]['crop'] = (bool) get_option( "{$_size}_crop" );
|
|
| 6629 | - } elseif ( isset( $_wp_additional_image_sizes[ $_size ] ) ) {
|
|
| 6630 | - $sizes[ $_size ] = array( |
|
| 6631 | - 'width' => $_wp_additional_image_sizes[ $_size ]['width'], |
|
| 6632 | - 'height' => $_wp_additional_image_sizes[ $_size ]['height'], |
|
| 6633 | - 'crop' => $_wp_additional_image_sizes[ $_size ]['crop'], |
|
| 6634 | - ); |
|
| 6635 | - } |
|
| 6636 | - } |
|
| 6620 | + global $_wp_additional_image_sizes; |
|
| 6621 | + |
|
| 6622 | + $sizes = array(); |
|
| 6623 | + |
|
| 6624 | + foreach ( get_intermediate_image_sizes() as $_size ) {
|
|
| 6625 | + if ( in_array( $_size, array('thumbnail', 'medium', 'medium_large', 'large') ) ) {
|
|
| 6626 | + $sizes[ $_size ]['width'] = get_option( "{$_size}_size_w" );
|
|
| 6627 | + $sizes[ $_size ]['height'] = get_option( "{$_size}_size_h" );
|
|
| 6628 | + $sizes[ $_size ]['crop'] = (bool) get_option( "{$_size}_crop" );
|
|
| 6629 | + } elseif ( isset( $_wp_additional_image_sizes[ $_size ] ) ) {
|
|
| 6630 | + $sizes[ $_size ] = array( |
|
| 6631 | + 'width' => $_wp_additional_image_sizes[ $_size ]['width'], |
|
| 6632 | + 'height' => $_wp_additional_image_sizes[ $_size ]['height'], |
|
| 6633 | + 'crop' => $_wp_additional_image_sizes[ $_size ]['crop'], |
|
| 6634 | + ); |
|
| 6635 | + } |
|
| 6636 | + } |
|
| 6637 | 6637 | |
| 6638 | 6638 | |
| 6639 | 6639 | |
| 6640 | - $options = array(); |
|
| 6640 | + $options = array(); |
|
| 6641 | 6641 | |
| 6642 | - $options['default'] = __('GD Default', 'geodirectory');
|
|
| 6642 | + $options['default'] = __('GD Default', 'geodirectory');
|
|
| 6643 | 6643 | |
| 6644 | - if(!empty($sizes)){
|
|
| 6645 | - foreach($sizes as $key=>$val){
|
|
| 6646 | - $options[$key] = $key. ' ( '.$val['width'].' x '.$val['height']. ' )'; |
|
| 6647 | - } |
|
| 6648 | - } |
|
| 6644 | + if(!empty($sizes)){
|
|
| 6645 | + foreach($sizes as $key=>$val){
|
|
| 6646 | + $options[$key] = $key. ' ( '.$val['width'].' x '.$val['height']. ' )'; |
|
| 6647 | + } |
|
| 6648 | + } |
|
| 6649 | 6649 | |
| 6650 | - return $options; |
|
| 6650 | + return $options; |
|
| 6651 | 6651 | } |
| 6652 | 6652 | \ No newline at end of file |
@@ -28,31 +28,31 @@ discard block |
||
| 28 | 28 | * @package GeoDirectory |
| 29 | 29 | */ |
| 30 | 30 | function geodir_admin_styles() {
|
| 31 | - wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
|
|
| 31 | + wp_register_style('geodirectory-admin-css', geodir_plugin_url().'/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
|
|
| 32 | 32 | wp_enqueue_style('geodirectory-admin-css');
|
| 33 | 33 | |
| 34 | - wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
|
|
| 34 | + wp_register_style('geodirectory-frontend-style', geodir_plugin_url().'/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
|
|
| 35 | 35 | wp_enqueue_style('geodirectory-frontend-style');
|
| 36 | 36 | |
| 37 | - wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
|
|
| 37 | + wp_register_style('geodir-chosen-style', geodir_plugin_url().'/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
|
|
| 38 | 38 | wp_enqueue_style('geodir-chosen-style');
|
| 39 | 39 | |
| 40 | - wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
|
|
| 40 | + wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url().'/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
|
|
| 41 | 41 | wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');
|
| 42 | 42 | |
| 43 | - wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
|
|
| 43 | + wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url().'/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
|
|
| 44 | 44 | wp_enqueue_style('geodirectory-jquery-ui-css');
|
| 45 | 45 | |
| 46 | - wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
|
|
| 46 | + wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url().'/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
|
|
| 47 | 47 | wp_enqueue_style('geodirectory-custom-fields-css');
|
| 48 | 48 | |
| 49 | - wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
|
|
| 49 | + wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url().'/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
|
|
| 50 | 50 | wp_enqueue_style('geodirectory-pluplodar-css');
|
| 51 | 51 | |
| 52 | - wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
|
|
| 52 | + wp_register_style('geodir-rating-style', geodir_plugin_url().'/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
|
|
| 53 | 53 | wp_enqueue_style('geodir-rating-style');
|
| 54 | 54 | |
| 55 | - wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
|
|
| 55 | + wp_register_style('geodir-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
|
|
| 56 | 56 | wp_enqueue_style('geodir-rtl-style');
|
| 57 | 57 | } |
| 58 | 58 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
|
| 71 | 71 | wp_enqueue_style('font-awesome');
|
| 72 | 72 | |
| 73 | - wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 73 | + wp_register_script('geodirectory-admin', geodir_plugin_url().'/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 74 | 74 | wp_enqueue_script('geodirectory-admin');
|
| 75 | 75 | |
| 76 | 76 | } |
@@ -89,68 +89,68 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | wp_enqueue_script('jquery');
|
| 91 | 91 | |
| 92 | - wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);
|
|
| 92 | + wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);
|
|
| 93 | 93 | |
| 94 | - wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 94 | + wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 95 | 95 | wp_enqueue_script('chosen');
|
| 96 | 96 | |
| 97 | - wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
|
|
| 97 | + wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
|
|
| 98 | 98 | wp_enqueue_script('geodirectory-choose-ajax');
|
| 99 | 99 | |
| 100 | 100 | if (isset($_REQUEST['listing_type'])) {
|
| 101 | - wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
|
|
| 101 | + wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url().'/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
|
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | wp_enqueue_script('geodirectory-custom-fields-script');
|
| 105 | - $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions'; |
|
| 105 | + $plugin_path = geodir_plugin_url().'/geodirectory-functions/cat-meta-functions'; |
|
| 106 | 106 | |
| 107 | - wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);
|
|
| 107 | + wp_enqueue_script('tax-meta-clss', $plugin_path.'/js/tax-meta-clss.js', array('jquery'), null, true);
|
|
| 108 | 108 | |
| 109 | 109 | if (in_array($geodir_map_name, array('auto', 'google'))) {
|
| 110 | - $map_lang = "&language=" . geodir_get_map_default_language(); |
|
| 111 | - $map_key = "&key=" . geodir_get_map_api_key(); |
|
| 110 | + $map_lang = "&language=".geodir_get_map_default_language(); |
|
| 111 | + $map_key = "&key=".geodir_get_map_api_key(); |
|
| 112 | 112 | /** This filter is documented in geodirectory_template_tags.php */ |
| 113 | 113 | $map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
| 114 | - wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);
|
|
| 114 | + wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);
|
|
| 115 | 115 | |
| 116 | 116 | // Overlapping Marker Spiderfier |
| 117 | - wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 117 | + wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 118 | 118 | wp_enqueue_script('geodirectory-g-overlappingmarker-script');
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | if ($geodir_map_name == 'osm') {
|
| 122 | 122 | // Leaflet OpenStreetMap |
| 123 | - wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 123 | + wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 124 | 124 | wp_enqueue_style('geodirectory-leaflet-style');
|
| 125 | 125 | |
| 126 | - wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 126 | + wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 127 | 127 | wp_enqueue_script('geodirectory-leaflet-script');
|
| 128 | 128 | |
| 129 | - wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
| 129 | + wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
| 130 | 130 | wp_enqueue_script('geodirectory-leaflet-geo-script');
|
| 131 | 131 | |
| 132 | 132 | // Overlapping Marker Spiderfier Leaflet |
| 133 | - wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 133 | + wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 134 | 134 | wp_enqueue_script('geodirectory-o-overlappingmarker-script');
|
| 135 | 135 | } |
| 136 | - wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 136 | + wp_enqueue_script('jquery-ui-autocomplete');
|
|
| 137 | 137 | |
| 138 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 138 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
|
|
| 139 | 139 | wp_enqueue_script('geodirectory-goMap-script');
|
| 140 | 140 | |
| 141 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
| 141 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
| 142 | 142 | wp_enqueue_script('geodirectory-goMap-script');
|
| 143 | 143 | |
| 144 | 144 | // font awesome rating script |
| 145 | 145 | if (get_option('geodir_reviewrating_enable_font_awesome')) {
|
| 146 | - wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 146 | + wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 147 | 147 | wp_enqueue_script('geodir-barrating-js');
|
| 148 | 148 | } else { // default rating script
|
| 149 | - wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);
|
|
| 149 | + wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);
|
|
| 150 | 150 | wp_enqueue_script('geodir-jRating-js');
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 153 | + wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 154 | 154 | wp_enqueue_script('geodir-on-document-load');
|
| 155 | 155 | |
| 156 | 156 | |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | wp_enqueue_script('plupload-all');
|
| 159 | 159 | wp_enqueue_script('jquery-ui-sortable');
|
| 160 | 160 | |
| 161 | - wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
| 161 | + wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
| 162 | 162 | wp_enqueue_script('geodirectory-plupload-script');
|
| 163 | 163 | |
| 164 | 164 | // SCRIPT FOR UPLOAD END |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);
|
| 213 | 213 | |
| 214 | 214 | |
| 215 | - wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
| 215 | + wp_register_script('geodirectory-admin-script', geodir_plugin_url().'/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
| 216 | 216 | wp_enqueue_script('geodirectory-admin-script');
|
| 217 | 217 | |
| 218 | 218 | wp_enqueue_style('farbtastic');
|
@@ -220,10 +220,10 @@ discard block |
||
| 220 | 220 | |
| 221 | 221 | $screen = get_current_screen(); |
| 222 | 222 | if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {
|
| 223 | - wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');
|
|
| 223 | + wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation_admin.js');
|
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | - $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
|
|
| 226 | + $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl').'?geodir_ajax=true')));
|
|
| 227 | 227 | wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
|
| 228 | 228 | |
| 229 | 229 | } |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | |
| 247 | 247 | if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
|
| 248 | 248 | |
| 249 | - add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
|
|
| 249 | + add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url().'/geodirectory-assets/images/favicon.ico', '55.1984');
|
|
| 250 | 250 | |
| 251 | 251 | |
| 252 | 252 | } |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | $geodir_menu_order[] = 'separator-geodirectory'; |
| 281 | 281 | if (!empty($post_types)) {
|
| 282 | 282 | foreach ($post_types as $post_type) {
|
| 283 | - $geodir_menu_order[] = 'edit.php?post_type=' . $post_type; |
|
| 283 | + $geodir_menu_order[] = 'edit.php?post_type='.$post_type; |
|
| 284 | 284 | } |
| 285 | 285 | } |
| 286 | 286 | $geodir_menu_order[] = $item; |
@@ -323,8 +323,8 @@ discard block |
||
| 323 | 323 | {
|
| 324 | 324 | if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
|
| 325 | 325 | echo '<div id="message" class="updated fade"> |
| 326 | - <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p>
|
|
| 327 | - <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>
|
|
| 326 | + <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory').' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">'.__('Support us by leaving a rating!', 'geodirectory').'</a></p>
|
|
| 327 | + <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory').'</strong></p>
|
|
| 328 | 328 | </div>'; |
| 329 | 329 | |
| 330 | 330 | } |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
|
| 333 | 333 | switch ($_REQUEST['msg']) {
|
| 334 | 334 | case 'success': |
| 335 | - echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
|
|
| 335 | + echo '<div id="message" class="updated fade"><p><strong>'.__('Your settings have been saved.', 'geodirectory').'</strong></p></div>';
|
|
| 336 | 336 | flush_rewrite_rules(false); |
| 337 | 337 | |
| 338 | 338 | break; |
@@ -340,30 +340,30 @@ discard block |
||
| 340 | 340 | $gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : ''; |
| 341 | 341 | |
| 342 | 342 | if ($gderr == 21) |
| 343 | - echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';
|
|
| 343 | + echo '<div id="message" class="error fade"><p><strong>'.__('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory').'</strong></p></div>';
|
|
| 344 | 344 | else |
| 345 | - echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
|
|
| 345 | + echo '<div id="message" class="error fade"><p><strong>'.__('Error: Your settings have not been saved, please try again.', 'geodirectory').'</strong></p></div>';
|
|
| 346 | 346 | break; |
| 347 | 347 | } |
| 348 | 348 | } |
| 349 | 349 | |
| 350 | 350 | $geodir_load_map = get_option('geodir_load_map');
|
| 351 | 351 | $need_map_key = false; |
| 352 | - if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
|
|
| 352 | + if ($geodir_load_map == '' || $geodir_load_map == 'google' || $geodir_load_map == 'auto') {
|
|
| 353 | 353 | $need_map_key = true; |
| 354 | 354 | } |
| 355 | 355 | |
| 356 | 356 | if (!geodir_get_map_api_key() && $need_map_key) {
|
| 357 | - echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 357 | + echo '<div class="error"><p><strong>'.sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings').'\'>', '</a>').'</strong></p></div>';
|
|
| 358 | 358 | } |
| 359 | 359 | |
| 360 | 360 | if (!geodir_is_default_location_set()) {
|
| 361 | - echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 361 | + echo '<div class="updated fade"><p><strong>'.sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>').'</strong></p></div>';
|
|
| 362 | 362 | |
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | if (!function_exists('curl_init')) {
|
| 366 | - echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';
|
|
| 366 | + echo '<div class="error"><p><strong>'.__('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory').'</strong></p></div>';
|
|
| 367 | 367 | |
| 368 | 368 | } |
| 369 | 369 | |
@@ -383,18 +383,18 @@ discard block |
||
| 383 | 383 | function geodir_handle_option_form_submit($current_tab) |
| 384 | 384 | {
|
| 385 | 385 | global $geodir_settings; |
| 386 | - if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
|
|
| 386 | + if (file_exists(dirname(__FILE__).'/option-pages/'.$current_tab.'_array.php')) {
|
|
| 387 | 387 | /** |
| 388 | 388 | * Contains settings array for current tab. |
| 389 | 389 | * |
| 390 | 390 | * @since 1.0.0 |
| 391 | 391 | * @package GeoDirectory |
| 392 | 392 | */ |
| 393 | - include_once('option-pages/' . $current_tab . '_array.php');
|
|
| 393 | + include_once('option-pages/'.$current_tab.'_array.php');
|
|
| 394 | 394 | } |
| 395 | 395 | if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') : |
| 396 | 396 | if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
| 397 | - if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 397 | + if (!wp_verify_nonce($_REQUEST['_wpnonce-'.$current_tab], 'geodir-settings-'.$current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 398 | 398 | |
| 399 | 399 | /** |
| 400 | 400 | * Fires before updating geodirectory admin settings. |
@@ -427,13 +427,13 @@ discard block |
||
| 427 | 427 | * @param string $current_tab The current settings tab name. |
| 428 | 428 | * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab. |
| 429 | 429 | */ |
| 430 | - do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
|
|
| 430 | + do_action('geodir_update_options_'.$current_tab, $geodir_settings[$current_tab]);
|
|
| 431 | 431 | |
| 432 | 432 | flush_rewrite_rules(false); |
| 433 | 433 | |
| 434 | 434 | $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : ''; |
| 435 | 435 | |
| 436 | - $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');
|
|
| 436 | + $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$_REQUEST['active_tab'].'&msg=success');
|
|
| 437 | 437 | |
| 438 | 438 | wp_redirect($redirect_url); |
| 439 | 439 | exit(); |
@@ -472,18 +472,18 @@ discard block |
||
| 472 | 472 | |
| 473 | 473 | elseif (isset($value['type']) && $value['type'] == 'image_width') : |
| 474 | 474 | |
| 475 | - if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
|
|
| 476 | - update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']); |
|
| 477 | - update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']); |
|
| 478 | - if (isset($_POST[$value['id'] . '_crop'])) : |
|
| 479 | - update_option($value['id'] . '_crop', 1); |
|
| 475 | + if (isset($value['id']) && isset($_POST[$value['id'].'_width'])) {
|
|
| 476 | + update_option($value['id'].'_width', $_POST[$value['id'].'_width']); |
|
| 477 | + update_option($value['id'].'_height', $_POST[$value['id'].'_height']); |
|
| 478 | + if (isset($_POST[$value['id'].'_crop'])) : |
|
| 479 | + update_option($value['id'].'_crop', 1); |
|
| 480 | 480 | else : |
| 481 | - update_option($value['id'] . '_crop', 0); |
|
| 481 | + update_option($value['id'].'_crop', 0); |
|
| 482 | 482 | endif; |
| 483 | 483 | } else {
|
| 484 | - update_option($value['id'] . '_width', $value['std']); |
|
| 485 | - update_option($value['id'] . '_height', $value['std']); |
|
| 486 | - update_option($value['id'] . '_crop', 1); |
|
| 484 | + update_option($value['id'].'_width', $value['std']); |
|
| 485 | + update_option($value['id'].'_height', $value['std']); |
|
| 486 | + update_option($value['id'].'_crop', 1); |
|
| 487 | 487 | } |
| 488 | 488 | |
| 489 | 489 | elseif (isset($value['type']) && $value['type'] == 'map') : |
@@ -525,12 +525,12 @@ discard block |
||
| 525 | 525 | elseif (isset($value['type']) && $value['type'] == 'file') : |
| 526 | 526 | |
| 527 | 527 | |
| 528 | - if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file
|
|
| 528 | + if (isset($_POST[$value['id'].'_remove']) && $_POST[$value['id'].'_remove']) {// if remove is set then remove the file
|
|
| 529 | 529 | |
| 530 | 530 | if (get_option($value['id'])) {
|
| 531 | 531 | $image_name_arr = explode('/', get_option($value['id']));
|
| 532 | 532 | $noimg_name = end($image_name_arr); |
| 533 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 533 | + $img_path = $uploads['path'].'/'.$noimg_name; |
|
| 534 | 534 | if (file_exists($img_path)) |
| 535 | 535 | unlink($img_path); |
| 536 | 536 | } |
@@ -558,7 +558,7 @@ discard block |
||
| 558 | 558 | if (get_option($value['id'])) {
|
| 559 | 559 | $image_name_arr = explode('/', get_option($value['id']));
|
| 560 | 560 | $noimg_name = end($image_name_arr); |
| 561 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 561 | + $img_path = $uploads['path'].'/'.$noimg_name; |
|
| 562 | 562 | if (file_exists($img_path)) |
| 563 | 563 | unlink($img_path); |
| 564 | 564 | } |
@@ -579,7 +579,7 @@ discard block |
||
| 579 | 579 | // same menu setting per theme. |
| 580 | 580 | if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
|
| 581 | 581 | $theme = wp_get_theme(); |
| 582 | - update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
|
|
| 582 | + update_option('geodir_theme_location_nav_'.$theme->name, $_POST[$value['id']]);
|
|
| 583 | 583 | } |
| 584 | 584 | |
| 585 | 585 | if (isset($value['id']) && isset($_POST[$value['id']])) {
|
@@ -649,7 +649,7 @@ discard block |
||
| 649 | 649 | |
| 650 | 650 | $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory'); |
| 651 | 651 | |
| 652 | - $tabs[$geodir_post_type . '_fields_settings'] = array( |
|
| 652 | + $tabs[$geodir_post_type.'_fields_settings'] = array( |
|
| 653 | 653 | 'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),
|
| 654 | 654 | 'subtabs' => array( |
| 655 | 655 | array('subtab' => 'custom_fields',
|
@@ -683,7 +683,7 @@ discard block |
||
| 683 | 683 | */ |
| 684 | 684 | function geodir_tools_setting_tab($tabs) |
| 685 | 685 | {
|
| 686 | - wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
| 686 | + wp_enqueue_script('jquery-ui-progressbar');
|
|
| 687 | 687 | $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
|
| 688 | 688 | return $tabs; |
| 689 | 689 | } |
@@ -717,7 +717,7 @@ discard block |
||
| 717 | 717 | */ |
| 718 | 718 | function geodir_extend_geodirectory_setting_tab($tabs) |
| 719 | 719 | {
|
| 720 | - $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
| 720 | + $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory').' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
| 721 | 721 | return $tabs; |
| 722 | 722 | } |
| 723 | 723 | |
@@ -777,8 +777,8 @@ discard block |
||
| 777 | 777 | _e('Unknown', 'geodirectory');
|
| 778 | 778 | } else {
|
| 779 | 779 | /* If there is a city id, append 'city name' to the text string. */ |
| 780 | - $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';
|
|
| 781 | - echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id); |
|
| 780 | + $add_location_id = $location_id > 0 ? ' ('.$location_id.')' : '';
|
|
| 781 | + echo(__($location->country, 'geodirectory').'-'.$location->region.'-'.$location->city.$add_location_id); |
|
| 782 | 782 | } |
| 783 | 783 | break; |
| 784 | 784 | |
@@ -796,14 +796,14 @@ discard block |
||
| 796 | 796 | $expire_class = 'expire_over'; |
| 797 | 797 | } |
| 798 | 798 | $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days |
| 799 | - $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
|
|
| 799 | + $date_diff_text = '<br /><span class="'.$expire_class.'">('.$date_diff.' '.$state.')</span>';
|
|
| 800 | 800 | } |
| 801 | 801 | /* If no expire_date is found, output a default message. */ |
| 802 | 802 | if (empty($expire_date)) |
| 803 | 803 | echo __('Unknown', 'geodirectory');
|
| 804 | 804 | /* If there is a expire_date, append 'days left' to the text string. */ |
| 805 | 805 | else |
| 806 | - echo $expire_date . $date_diff_text; |
|
| 806 | + echo $expire_date.$date_diff_text; |
|
| 807 | 807 | break; |
| 808 | 808 | |
| 809 | 809 | /* If displaying the 'categorys' column. */ |
@@ -870,7 +870,7 @@ discard block |
||
| 870 | 870 | function geodir_post_information_save($post_id, $post) {
|
| 871 | 871 | global $wpdb, $current_user; |
| 872 | 872 | |
| 873 | - if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {
|
|
| 873 | + if (isset($post->post_type) && ($post->post_type == 'nav_menu_item' || $post->post_type == 'page' || $post->post_type == 'post')) {
|
|
| 874 | 874 | return; |
| 875 | 875 | } |
| 876 | 876 | |
@@ -938,7 +938,7 @@ discard block |
||
| 938 | 938 | $tab_id = $value['id']; |
| 939 | 939 | |
| 940 | 940 | if (isset($value['desc']) && $value['desc']) |
| 941 | - $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
| 941 | + $desc = '<span style=" text-transform:none;">:- '.$value['desc'].'</span>'; |
|
| 942 | 942 | |
| 943 | 943 | if (isset($value['name']) && $value['name']) {
|
| 944 | 944 | if ($first_title === true) {
|
@@ -946,9 +946,9 @@ discard block |
||
| 946 | 946 | } else {
|
| 947 | 947 | echo '</div>'; |
| 948 | 948 | } |
| 949 | - echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>'; |
|
| 949 | + echo '<dd id="'.trim($tab_id).'" class="geodir_option_tabs" ><a href="javascript:void(0);">'.$value['name'].'</a></dd>'; |
|
| 950 | 950 | |
| 951 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 951 | + echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 952 | 952 | } |
| 953 | 953 | |
| 954 | 954 | /** |
@@ -958,21 +958,21 @@ discard block |
||
| 958 | 958 | * |
| 959 | 959 | * @since 1.0.0 |
| 960 | 960 | */ |
| 961 | - do_action('geodir_settings_' . sanitize_title($value['id']));
|
|
| 961 | + do_action('geodir_settings_'.sanitize_title($value['id']));
|
|
| 962 | 962 | break; |
| 963 | 963 | |
| 964 | 964 | case 'no_tabs': |
| 965 | 965 | |
| 966 | 966 | echo '<div class="inner_content_tab_main">'; |
| 967 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 967 | + echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 968 | 968 | |
| 969 | 969 | break; |
| 970 | 970 | |
| 971 | 971 | case 'sectionstart': |
| 972 | 972 | if (isset($value['desc']) && $value['desc']) |
| 973 | - $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
| 973 | + $desc = '<span style=" text-transform:none;"> - '.$value['desc'].'</span>'; |
|
| 974 | 974 | if (isset($value['name']) && $value['name']) |
| 975 | - echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
| 975 | + echo '<h3>'.$value['name'].$desc.'</h3>'; |
|
| 976 | 976 | /** |
| 977 | 977 | * Called after a GeoDirectory settings sectionstart is output in the GD settings page. |
| 978 | 978 | * |
@@ -980,8 +980,8 @@ discard block |
||
| 980 | 980 | * |
| 981 | 981 | * @since 1.0.0 |
| 982 | 982 | */ |
| 983 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
|
|
| 984 | - echo '<table class="form-table">' . "\n\n"; |
|
| 983 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_start');
|
|
| 984 | + echo '<table class="form-table">'."\n\n"; |
|
| 985 | 985 | |
| 986 | 986 | break; |
| 987 | 987 | case 'sectionend': |
@@ -992,7 +992,7 @@ discard block |
||
| 992 | 992 | * |
| 993 | 993 | * @since 1.0.0 |
| 994 | 994 | */ |
| 995 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
|
|
| 995 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_end');
|
|
| 996 | 996 | echo '</table>'; |
| 997 | 997 | /** |
| 998 | 998 | * Called after a GeoDirectory settings sectionend is output in the GD settings page. |
@@ -1001,7 +1001,7 @@ discard block |
||
| 1001 | 1001 | * |
| 1002 | 1002 | * @since 1.0.0 |
| 1003 | 1003 | */ |
| 1004 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
|
|
| 1004 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_after');
|
|
| 1005 | 1005 | break; |
| 1006 | 1006 | case 'text': |
| 1007 | 1007 | ?> |
@@ -1010,7 +1010,7 @@ discard block |
||
| 1010 | 1010 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
| 1011 | 1011 | id="<?php echo esc_attr($value['id']); ?>" |
| 1012 | 1012 | type="<?php echo esc_attr($value['type']); ?>" |
| 1013 | - <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1013 | + <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1014 | 1014 | style=" <?php echo esc_attr($value['css']); ?>" |
| 1015 | 1015 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1016 | 1016 | echo esc_attr(stripslashes(get_option($value['id']))); |
@@ -1027,14 +1027,14 @@ discard block |
||
| 1027 | 1027 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
| 1028 | 1028 | id="<?php echo esc_attr($value['id']); ?>" |
| 1029 | 1029 | type="<?php echo esc_attr($value['type']); ?>" |
| 1030 | - <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1030 | + <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1031 | 1031 | style=" <?php echo esc_attr($value['css']); ?>" |
| 1032 | 1032 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1033 | 1033 | echo esc_attr(stripslashes(get_option($value['id']))); |
| 1034 | 1034 | } else {
|
| 1035 | 1035 | echo esc_attr($value['std']); |
| 1036 | 1036 | } ?>"/> |
| 1037 | - <a href='https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]&TB_iframe=true&width=600&height=400' class="thickbox button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )','geodirectory');?>" ><?php _e('Generate API Key','geodirectory');?></a>
|
|
| 1037 | + <a href='https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]&TB_iframe=true&width=600&height=400' class="thickbox button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )', 'geodirectory'); ?>" ><?php _e('Generate API Key', 'geodirectory'); ?></a>
|
|
| 1038 | 1038 | <span class="description"><?php echo $value['desc']; ?></span></td> |
| 1039 | 1039 | </tr><?php |
| 1040 | 1040 | break; |
@@ -1046,7 +1046,7 @@ discard block |
||
| 1046 | 1046 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
| 1047 | 1047 | id="<?php echo esc_attr($value['id']); ?>" |
| 1048 | 1048 | type="<?php echo esc_attr($value['type']); ?>" |
| 1049 | - <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1049 | + <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1050 | 1050 | style="<?php echo esc_attr($value['css']); ?>" |
| 1051 | 1051 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1052 | 1052 | echo esc_attr(stripslashes(get_option($value['id']))); |
@@ -1092,17 +1092,17 @@ discard block |
||
| 1092 | 1092 | <?php _e('Width', 'geodirectory'); ?> <input
|
| 1093 | 1093 | name="<?php echo esc_attr($value['id']); ?>_width" |
| 1094 | 1094 | id="<?php echo esc_attr($value['id']); ?>_width" type="text" size="3" |
| 1095 | - value="<?php if ($size = get_option($value['id'] . '_width')) echo stripslashes($size); else echo $value['std']; ?>"/> |
|
| 1095 | + value="<?php if ($size = get_option($value['id'].'_width')) echo stripslashes($size); else echo $value['std']; ?>"/> |
|
| 1096 | 1096 | |
| 1097 | 1097 | <?php _e('Height', 'geodirectory'); ?> <input
|
| 1098 | 1098 | name="<?php echo esc_attr($value['id']); ?>_height" |
| 1099 | 1099 | id="<?php echo esc_attr($value['id']); ?>_height" type="text" size="3" |
| 1100 | - value="<?php if ($size = get_option($value['id'] . '_height')) echo stripslashes($size); else echo $value['std']; ?>"/> |
|
| 1100 | + value="<?php if ($size = get_option($value['id'].'_height')) echo stripslashes($size); else echo $value['std']; ?>"/> |
|
| 1101 | 1101 | |
| 1102 | 1102 | <label><?php _e('Hard Crop', 'geodirectory'); ?> <input
|
| 1103 | 1103 | name="<?php echo esc_attr($value['id']); ?>_crop" |
| 1104 | 1104 | id="<?php echo esc_attr($value['id']); ?>_crop" |
| 1105 | - type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label> |
|
| 1105 | + type="checkbox" <?php if (get_option($value['id'].'_crop') != '') checked(get_option($value['id'].'_crop'), 1); else checked(1); ?> /></label> |
|
| 1106 | 1106 | |
| 1107 | 1107 | <span class="description"><?php echo $value['desc'] ?></span></td> |
| 1108 | 1108 | </tr><?php |
@@ -1152,7 +1152,7 @@ discard block |
||
| 1152 | 1152 | id="<?php echo esc_attr($value['id']); ?>" |
| 1153 | 1153 | style="<?php echo esc_attr($value['css']); ?>" |
| 1154 | 1154 | class="<?php if (isset($value['class'])) echo $value['class']; ?>" |
| 1155 | - data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>" |
|
| 1155 | + data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text']; ?>" |
|
| 1156 | 1156 | option-ajaxchosen="false"> |
| 1157 | 1157 | <?php |
| 1158 | 1158 | foreach ($value['options'] as $key => $val) {
|
@@ -1162,7 +1162,7 @@ discard block |
||
| 1162 | 1162 | ?></optgroup><?php |
| 1163 | 1163 | } else {
|
| 1164 | 1164 | ?> |
| 1165 | - <option value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>> |
|
| 1165 | + <option value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values))); ?>> |
|
| 1166 | 1166 | <?php echo geodir_utf8_ucfirst($val) ?> |
| 1167 | 1167 | </option> |
| 1168 | 1168 | <?php |
@@ -1199,7 +1199,7 @@ discard block |
||
| 1199 | 1199 | ?> |
| 1200 | 1200 | |
| 1201 | 1201 | <tr valign="top"> |
| 1202 | - <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>
|
|
| 1202 | + <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory'); ?></th>
|
|
| 1203 | 1203 | <td width="60%"> |
| 1204 | 1204 | <select name="geodir_default_map_language" style="width:60%"> |
| 1205 | 1205 | <?php |
@@ -1281,7 +1281,7 @@ discard block |
||
| 1281 | 1281 | |
| 1282 | 1282 | <tr valign="top"> |
| 1283 | 1283 | <th class="titledesc" |
| 1284 | - width="40%"><?php _e('Default post type search on map', 'geodirectory');?></th>
|
|
| 1284 | + width="40%"><?php _e('Default post type search on map', 'geodirectory'); ?></th>
|
|
| 1285 | 1285 | <td width="60%"> |
| 1286 | 1286 | <select name="geodir_default_map_search_pt" style="width:60%"> |
| 1287 | 1287 | <?php |
@@ -1322,7 +1322,7 @@ discard block |
||
| 1322 | 1322 | $cat_display = 'checkbox'; |
| 1323 | 1323 | $gd_post_types = get_option('geodir_exclude_post_type_on_map');
|
| 1324 | 1324 | $gd_cats = get_option('geodir_exclude_cat_on_map');
|
| 1325 | - $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 1325 | + $gd_cats_upgrade = (int) get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 1326 | 1326 | $count = 1; |
| 1327 | 1327 | ?> |
| 1328 | 1328 | <table width="70%" class="widefat"> |
@@ -1351,7 +1351,7 @@ discard block |
||
| 1351 | 1351 | name="home_map_post_types[]" |
| 1352 | 1352 | id="<?php echo esc_attr($value['id']); ?>" |
| 1353 | 1353 | value="<?php echo $key; ?>" |
| 1354 | - class="map_post_type" <?php echo $checked;?> /> |
|
| 1354 | + class="map_post_type" <?php echo $checked; ?> /> |
|
| 1355 | 1355 | <?php echo __($post_types_obj->labels->singular_name, 'geodirectory'); ?></td> |
| 1356 | 1356 | <td width="40%"> |
| 1357 | 1357 | <div class="home_map_category" style="overflow:auto;width:200px;height:100px;" |
@@ -1409,12 +1409,12 @@ discard block |
||
| 1409 | 1409 | ?> |
| 1410 | 1410 | <fieldset> |
| 1411 | 1411 | <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend> |
| 1412 | - <label for="<?php echo $value['id'];?>"> |
|
| 1412 | + <label for="<?php echo $value['id']; ?>"> |
|
| 1413 | 1413 | <input name="<?php echo esc_attr($value['id']); ?>" |
| 1414 | - id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio" |
|
| 1414 | + id="<?php echo esc_attr($value['id'].$value['value']); ?>" type="radio" |
|
| 1415 | 1415 | value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {
|
| 1416 | 1416 | echo 'checked="checked"'; |
| 1417 | - }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
|
|
| 1417 | + }elseif (get_option($value['id']) == '' && $value['std'] == $value['value']) {echo 'checked="checked"'; } ?> />
|
|
| 1418 | 1418 | <?php echo $value['desc']; ?></label><br> |
| 1419 | 1419 | </fieldset> |
| 1420 | 1420 | <?php |
@@ -1434,9 +1434,9 @@ discard block |
||
| 1434 | 1434 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1435 | 1435 | <td class="forminp"> |
| 1436 | 1436 | <textarea |
| 1437 | - <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>" |
|
| 1437 | + <?php if (isset($value['args'])) echo $value['args'].' '; ?>name="<?php echo esc_attr($value['id']); ?>" |
|
| 1438 | 1438 | id="<?php echo esc_attr($value['id']); ?>" |
| 1439 | - <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1439 | + <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
|
| 1440 | 1440 | style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) echo esc_textarea(stripslashes(get_option($value['id']))); else echo esc_textarea($value['std']); ?></textarea><span |
| 1441 | 1441 | class="description"><?php echo $value['desc'] ?></span> |
| 1442 | 1442 | |
@@ -1481,7 +1481,7 @@ discard block |
||
| 1481 | 1481 | } |
| 1482 | 1482 | } |
| 1483 | 1483 | // |
| 1484 | - $page_setting = (int)get_option($value['id']); |
|
| 1484 | + $page_setting = (int) get_option($value['id']); |
|
| 1485 | 1485 | |
| 1486 | 1486 | $args = array('name' => $value['id'],
|
| 1487 | 1487 | 'id' => $value['id'], |
@@ -1498,7 +1498,7 @@ discard block |
||
| 1498 | 1498 | <tr valign="top" class="single_select_page"> |
| 1499 | 1499 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1500 | 1500 | <td class="forminp"> |
| 1501 | - <?php echo str_replace(' id=', " data-placeholder='" . __('Select a page...', 'geodirectory') . "' style='" . $value['css'] . "' class='" . $value['class'] . "' " . $disabled . " id=", wp_dropdown_pages($args)); ?>
|
|
| 1501 | + <?php echo str_replace(' id=', " data-placeholder='".__('Select a page...', 'geodirectory')."' style='".$value['css']."' class='".$value['class']."' ".$disabled." id=", wp_dropdown_pages($args)); ?>
|
|
| 1502 | 1502 | <span class="description"><?php echo $value['desc'] ?></span> |
| 1503 | 1503 | </td> |
| 1504 | 1504 | </tr><?php |
@@ -1507,7 +1507,7 @@ discard block |
||
| 1507 | 1507 | } |
| 1508 | 1508 | break; |
| 1509 | 1509 | case 'single_select_country' : |
| 1510 | - $country_setting = (string)get_option($value['id']); |
|
| 1510 | + $country_setting = (string) get_option($value['id']); |
|
| 1511 | 1511 | if (strstr($country_setting, ':')) : |
| 1512 | 1512 | $country = current(explode(':', $country_setting));
|
| 1513 | 1513 | $state = end(explode(':', $country_setting));
|
@@ -1530,7 +1530,7 @@ discard block |
||
| 1530 | 1530 | case 'multi_select_countries' : |
| 1531 | 1531 | $countries = $geodirectory->countries->countries; |
| 1532 | 1532 | asort($countries); |
| 1533 | - $selections = (array)get_option($value['id']); |
|
| 1533 | + $selections = (array) get_option($value['id']); |
|
| 1534 | 1534 | ?> |
| 1535 | 1535 | <tr valign="top"> |
| 1536 | 1536 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
@@ -1540,7 +1540,7 @@ discard block |
||
| 1540 | 1540 | title="Country" class="chosen_select"> |
| 1541 | 1541 | <?php |
| 1542 | 1542 | if ($countries) foreach ($countries as $key => $val) : |
| 1543 | - echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
| 1543 | + echo '<option value="'.$key.'" '.selected(in_array($key, $selections), true, false).'>'.$val.'</option>'; |
|
| 1544 | 1544 | endforeach; |
| 1545 | 1545 | ?> |
| 1546 | 1546 | </select> |
@@ -1552,7 +1552,7 @@ discard block |
||
| 1552 | 1552 | break; |
| 1553 | 1553 | |
| 1554 | 1554 | case 'google_analytics' : |
| 1555 | - $selections = (array)get_option($value['id']); |
|
| 1555 | + $selections = (array) get_option($value['id']); |
|
| 1556 | 1556 | ?> |
| 1557 | 1557 | <tr valign="top"> |
| 1558 | 1558 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
@@ -1563,30 +1563,30 @@ discard block |
||
| 1563 | 1563 | |
| 1564 | 1564 | $oAuthURL = "https://accounts.google.com/o/oauth2/auth?"; |
| 1565 | 1565 | $scope = "scope=https://www.googleapis.com/auth/analytics.readonly"; |
| 1566 | - $state = "&state=123";//any string |
|
| 1567 | - $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 1566 | + $state = "&state=123"; //any string |
|
| 1567 | + $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";
|
|
| 1568 | 1568 | $response_type = "&response_type=code"; |
| 1569 | 1569 | $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
| 1570 | 1570 | $access_type = "&access_type=offline"; |
| 1571 | 1571 | $approval_prompt = "&approval_prompt=force"; |
| 1572 | 1572 | |
| 1573 | - $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt; |
|
| 1573 | + $auth_url = $oAuthURL.$scope.$state.$redirect_uri.$response_type.$client_id.$access_type.$approval_prompt; |
|
| 1574 | 1574 | |
| 1575 | 1575 | |
| 1576 | 1576 | if (get_option('geodir_ga_auth_token')) {
|
| 1577 | 1577 | ?> |
| 1578 | 1578 | <span class="button-primary" |
| 1579 | - onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize');?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>
|
|
| 1579 | + onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize'); ?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>
|
|
| 1580 | 1580 | <span style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>
|
| 1581 | 1581 | <?php |
| 1582 | 1582 | global $gd_ga_errors; |
| 1583 | - if(!empty($gd_ga_errors)){
|
|
| 1583 | + if (!empty($gd_ga_errors)) {
|
|
| 1584 | 1584 | print_r($gd_ga_errors); |
| 1585 | 1585 | } |
| 1586 | 1586 | } else {
|
| 1587 | 1587 | ?> |
| 1588 | 1588 | <span class="button-primary" |
| 1589 | - onclick="window.open('<?php echo geodir_ga_activation_url();?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory');?></span>
|
|
| 1589 | + onclick="window.open('<?php echo geodir_ga_activation_url(); ?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory'); ?></span>
|
|
| 1590 | 1590 | <?php |
| 1591 | 1591 | } |
| 1592 | 1592 | ?> |
@@ -1657,9 +1657,9 @@ discard block |
||
| 1657 | 1657 | |
| 1658 | 1658 | <?php if (isset($_REQUEST['active_tab']) && $_REQUEST['active_tab'] != '') { ?>
|
| 1659 | 1659 | jQuery('.geodir_option_tabs').removeClass('gd-tab-active');
|
| 1660 | - jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').addClass('gd-tab-active');
|
|
| 1660 | + jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').addClass('gd-tab-active');
|
|
| 1661 | 1661 | jQuery('.gd-content-heading').hide();
|
| 1662 | - jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').show();
|
|
| 1662 | + jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').show();
|
|
| 1663 | 1663 | <?php } ?> |
| 1664 | 1664 | }); |
| 1665 | 1665 | </script> |
@@ -1745,7 +1745,7 @@ discard block |
||
| 1745 | 1745 | wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename'); |
| 1746 | 1746 | |
| 1747 | 1747 | if (geodir_get_featured_image($post_id, 'thumbnail')) {
|
| 1748 | - echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
|
|
| 1748 | + echo '<h4>'.__('Featured Image', 'geodirectory').'</h4>';
|
|
| 1749 | 1749 | geodir_show_featured_image($post_id, 'thumbnail'); |
| 1750 | 1750 | } |
| 1751 | 1751 | |
@@ -1756,13 +1756,13 @@ discard block |
||
| 1756 | 1756 | |
| 1757 | 1757 | <h5 class="form_title"> |
| 1758 | 1758 | <?php if ($image_limit != 0 && $image_limit == 1) {
|
| 1759 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 1759 | + echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('image with this package', 'geodirectory').')</small>';
|
|
| 1760 | 1760 | } ?> |
| 1761 | 1761 | <?php if ($image_limit != 0 && $image_limit > 1) {
|
| 1762 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 1762 | + echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('images with this package', 'geodirectory').')</small>';
|
|
| 1763 | 1763 | } ?> |
| 1764 | 1764 | <?php if ($image_limit == 0) {
|
| 1765 | - echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 1765 | + echo '<br /><small>('.__('You can upload unlimited images with this package', 'geodirectory').')</small>';
|
|
| 1766 | 1766 | } ?> |
| 1767 | 1767 | </h5> |
| 1768 | 1768 | |
@@ -1801,10 +1801,10 @@ discard block |
||
| 1801 | 1801 | <div |
| 1802 | 1802 | class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>" |
| 1803 | 1803 | id="<?php echo $id; ?>plupload-upload-ui"> |
| 1804 | - <h4><?php _e('Drop files to upload', 'geodirectory');?></h4>
|
|
| 1804 | + <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4>
|
|
| 1805 | 1805 | <input id="<?php echo $id; ?>plupload-browse-button" type="button" |
| 1806 | 1806 | value="<?php _e('Select Files', 'geodirectory'); ?>" class="button"/>
|
| 1807 | - <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span> |
|
| 1807 | + <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id.'pluploadan'); ?>"></span> |
|
| 1808 | 1808 | <?php if ($width && $height): ?> |
| 1809 | 1809 | <span class="plupload-resize"></span> |
| 1810 | 1810 | <span class="plupload-width" id="plupload-width<?php echo $width; ?>"></span> |
@@ -1816,7 +1816,7 @@ discard block |
||
| 1816 | 1816 | id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;"> |
| 1817 | 1817 | </div> |
| 1818 | 1818 | <span |
| 1819 | - id="upload-msg"><?php _e('Please drag & drop the images to rearrange the order', 'geodirectory');?></span>
|
|
| 1819 | + id="upload-msg"><?php _e('Please drag & drop the images to rearrange the order', 'geodirectory'); ?></span>
|
|
| 1820 | 1820 | <span id="<?php echo $id; ?>upload-error" style="display:none"></span> |
| 1821 | 1821 | </div> |
| 1822 | 1822 | |
@@ -2026,9 +2026,9 @@ discard block |
||
| 2026 | 2026 | $plugin = 'avada-nag'; |
| 2027 | 2027 | $timestamp = 'avada-nag1234'; |
| 2028 | 2028 | $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');
|
| 2029 | - echo '<div id="' . $timestamp . '" class="error">'; |
|
| 2030 | - echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>'; |
|
| 2031 | - echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";
|
|
| 2029 | + echo '<div id="'.$timestamp.'" class="error">'; |
|
| 2030 | + echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\''.$plugin.'\',\''.$timestamp.'\');" ><i class="fa fa-times"></i></span>'; |
|
| 2031 | + echo "<img class='gd-icon-noti' src='".plugin_dir_url('')."geodirectory/geodirectory-assets/images/favicon.ico' > ";
|
|
| 2032 | 2032 | echo "<p>$message</p>"; |
| 2033 | 2033 | echo "</div>"; |
| 2034 | 2034 | |
@@ -2162,7 +2162,7 @@ discard block |
||
| 2162 | 2162 | |
| 2163 | 2163 | // Don't allow same slug url for listing and location |
| 2164 | 2164 | if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {
|
| 2165 | - $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');
|
|
| 2165 | + $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab.'&msg=fail&gderr=21');
|
|
| 2166 | 2166 | wp_redirect($redirect_url); |
| 2167 | 2167 | exit; |
| 2168 | 2168 | } |
@@ -2174,7 +2174,7 @@ discard block |
||
| 2174 | 2174 | $default_language = $sitepress->get_default_language(); |
| 2175 | 2175 | |
| 2176 | 2176 | if ($current_language != 'all' && $current_language != $default_language) {
|
| 2177 | - $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab);
|
|
| 2177 | + $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab);
|
|
| 2178 | 2178 | wp_redirect($redirect_url); |
| 2179 | 2179 | exit; |
| 2180 | 2180 | } |
@@ -2195,11 +2195,11 @@ discard block |
||
| 2195 | 2195 | function geodir_hide_admin_preview_button() {
|
| 2196 | 2196 | global $post_type; |
| 2197 | 2197 | $post_types = geodir_get_posttypes(); |
| 2198 | - if(in_array($post_type, $post_types)) |
|
| 2198 | + if (in_array($post_type, $post_types)) |
|
| 2199 | 2199 | echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
|
| 2200 | 2200 | } |
| 2201 | -add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' ); |
|
| 2202 | -add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' ); |
|
| 2201 | +add_action('admin_head-post-new.php', 'geodir_hide_admin_preview_button');
|
|
| 2202 | +add_action('admin_head-post.php', 'geodir_hide_admin_preview_button');
|
|
| 2203 | 2203 | |
| 2204 | 2204 | /** |
| 2205 | 2205 | * Add the tab in left sidebar menu fro import & export page. |
@@ -2209,8 +2209,8 @@ discard block |
||
| 2209 | 2209 | * |
| 2210 | 2210 | * @return array Array of tab data. |
| 2211 | 2211 | */ |
| 2212 | -function geodir_import_export_tab( $tabs ) {
|
|
| 2213 | - $tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) ); |
|
| 2212 | +function geodir_import_export_tab($tabs) {
|
|
| 2213 | + $tabs['import_export'] = array('label' => __('Import & Export', 'geodirectory'));
|
|
| 2214 | 2214 | return $tabs; |
| 2215 | 2215 | } |
| 2216 | 2216 | |
@@ -2224,8 +2224,8 @@ discard block |
||
| 2224 | 2224 | * @return string Html content. |
| 2225 | 2225 | */ |
| 2226 | 2226 | function geodir_import_export_page() {
|
| 2227 | - $nonce = wp_create_nonce( 'geodir_import_export_nonce' ); |
|
| 2228 | - $gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv'; |
|
| 2227 | + $nonce = wp_create_nonce('geodir_import_export_nonce');
|
|
| 2228 | + $gd_cats_sample_csv = geodir_plugin_url().'/geodirectory-assets/gd_sample_categories.csv'; |
|
| 2229 | 2229 | /** |
| 2230 | 2230 | * Filter sample category data csv file url. |
| 2231 | 2231 | * |
@@ -2234,9 +2234,9 @@ discard block |
||
| 2234 | 2234 | * |
| 2235 | 2235 | * @param string $gd_cats_sample_csv Sample category data csv file url. |
| 2236 | 2236 | */ |
| 2237 | - $gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv ); |
|
| 2237 | + $gd_cats_sample_csv = apply_filters('geodir_export_cats_sample_csv', $gd_cats_sample_csv);
|
|
| 2238 | 2238 | |
| 2239 | - $gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv'; |
|
| 2239 | + $gd_posts_sample_csv = geodir_plugin_url().'/geodirectory-assets/place_listing.csv'; |
|
| 2240 | 2240 | /** |
| 2241 | 2241 | * Filter sample post data csv file url. |
| 2242 | 2242 | * |
@@ -2245,15 +2245,15 @@ discard block |
||
| 2245 | 2245 | * |
| 2246 | 2246 | * @param string $gd_posts_sample_csv Sample post data csv file url. |
| 2247 | 2247 | */ |
| 2248 | - $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv ); |
|
| 2248 | + $gd_posts_sample_csv = apply_filters('geodir_export_posts_sample_csv', $gd_posts_sample_csv);
|
|
| 2249 | 2249 | |
| 2250 | - $gd_posttypes = geodir_get_posttypes( 'array' ); |
|
| 2250 | + $gd_posttypes = geodir_get_posttypes('array');
|
|
| 2251 | 2251 | |
| 2252 | 2252 | $gd_posttypes_option = ''; |
| 2253 | - foreach ( $gd_posttypes as $gd_posttype => $row ) {
|
|
| 2254 | - $gd_posttypes_option .= '<option value="' . $gd_posttype . '" data-cats="' . (int)geodir_get_terms_count( $gd_posttype ) . '" data-posts="' . (int)geodir_get_posts_count( $gd_posttype ) . '">' . __( $row['labels']['name'], 'geodirectory' ) . '</option>'; |
|
| 2253 | + foreach ($gd_posttypes as $gd_posttype => $row) {
|
|
| 2254 | + $gd_posttypes_option .= '<option value="'.$gd_posttype.'" data-cats="'.(int) geodir_get_terms_count($gd_posttype).'" data-posts="'.(int) geodir_get_posts_count($gd_posttype).'">'.__($row['labels']['name'], 'geodirectory').'</option>'; |
|
| 2255 | 2255 | } |
| 2256 | - wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
| 2256 | + wp_enqueue_script('jquery-ui-progressbar');
|
|
| 2257 | 2257 | |
| 2258 | 2258 | $gd_chunksize_options = array(); |
| 2259 | 2259 | $gd_chunksize_options[100] = 100; |
@@ -2275,50 +2275,50 @@ discard block |
||
| 2275 | 2275 | * |
| 2276 | 2276 | * @param string $gd_chunksize_options Entries options. |
| 2277 | 2277 | */ |
| 2278 | - $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options ); |
|
| 2278 | + $gd_chunksize_options = apply_filters('geodir_export_csv_chunksize_options', $gd_chunksize_options);
|
|
| 2279 | 2279 | |
| 2280 | 2280 | $gd_chunksize_option = ''; |
| 2281 | 2281 | foreach ($gd_chunksize_options as $value => $title) {
|
| 2282 | - $gd_chunksize_option .= '<option value="' . $value . '" ' . selected($value, 5000, false) . '>' . $title . '</option>'; |
|
| 2282 | + $gd_chunksize_option .= '<option value="'.$value.'" '.selected($value, 5000, false).'>'.$title.'</option>'; |
|
| 2283 | 2283 | } |
| 2284 | 2284 | |
| 2285 | 2285 | $uploads = wp_upload_dir(); |
| 2286 | - $upload_dir = wp_sprintf( CSV_TRANSFER_IMG_FOLDER, str_replace( ABSPATH, '', $uploads['path'] ) ); |
|
| 2286 | + $upload_dir = wp_sprintf(CSV_TRANSFER_IMG_FOLDER, str_replace(ABSPATH, '', $uploads['path'])); |
|
| 2287 | 2287 | ?> |
| 2288 | 2288 | </form> |
| 2289 | 2289 | <div class="inner_content_tab_main gd-import-export"> |
| 2290 | - <h3><?php _e( 'GD Import & Export CSV', 'geodirectory' ) ;?></h3> |
|
| 2291 | - <span class="description"><?php _e( 'Import & export csv for GD listings & categories.', 'geodirectory' ) ;?></span> |
|
| 2290 | + <h3><?php _e('GD Import & Export CSV', 'geodirectory'); ?></h3>
|
|
| 2291 | + <span class="description"><?php _e('Import & export csv for GD listings & categories.', 'geodirectory'); ?></span>
|
|
| 2292 | 2292 | <div class="gd-content-heading"> |
| 2293 | 2293 | |
| 2294 | 2294 | <?php |
| 2295 | 2295 | ini_set('max_execution_time', 999999);
|
| 2296 | - $ini_max_execution_time_check = @ini_get( 'max_execution_time' ); |
|
| 2296 | + $ini_max_execution_time_check = @ini_get('max_execution_time');
|
|
| 2297 | 2297 | ini_restore('max_execution_time');
|
| 2298 | 2298 | |
| 2299 | - if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting
|
|
| 2299 | + if ($ini_max_execution_time_check != 999999) { // only show these setting to the user if we can't change the ini setting
|
|
| 2300 | 2300 | ?> |
| 2301 | 2301 | <div id="gd_ie_reqs" class="metabox-holder"> |
| 2302 | 2302 | <div class="meta-box-sortables ui-sortable"> |
| 2303 | 2303 | <div class="postbox"> |
| 2304 | - <h3 class="hndle"><span style='vertical-align:top;'><?php echo __( 'PHP Requirements for GD Import & Export CSV', 'geodirectory' );?></span></h3> |
|
| 2304 | + <h3 class="hndle"><span style='vertical-align:top;'><?php echo __('PHP Requirements for GD Import & Export CSV', 'geodirectory'); ?></span></h3>
|
|
| 2305 | 2305 | <div class="inside"> |
| 2306 | - <span class="description"><?php echo __( 'Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory' );?></span> |
|
| 2306 | + <span class="description"><?php echo __('Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory'); ?></span>
|
|
| 2307 | 2307 | <table class="form-table"> |
| 2308 | 2308 | <thead> |
| 2309 | 2309 | <tr> |
| 2310 | - <th><?php _e( 'PHP Settings', 'geodirectory' );?></th><th><?php _e( 'Current Value', 'geodirectory' );?></th><th><?php _e( 'Recommended Value', 'geodirectory' );?></th> |
|
| 2310 | + <th><?php _e('PHP Settings', 'geodirectory'); ?></th><th><?php _e('Current Value', 'geodirectory'); ?></th><th><?php _e('Recommended Value', 'geodirectory'); ?></th>
|
|
| 2311 | 2311 | </tr> |
| 2312 | 2312 | </thead> |
| 2313 | 2313 | <tbody> |
| 2314 | 2314 | <tr> |
| 2315 | - <td>max_input_time</td><td><?php echo @ini_get( 'max_input_time' );?></td><td>3000</td> |
|
| 2315 | + <td>max_input_time</td><td><?php echo @ini_get('max_input_time'); ?></td><td>3000</td>
|
|
| 2316 | 2316 | </tr> |
| 2317 | 2317 | <tr> |
| 2318 | - <td>max_execution_time</td><td><?php echo @ini_get( 'max_execution_time' );?></td><td>3000</td> |
|
| 2318 | + <td>max_execution_time</td><td><?php echo @ini_get('max_execution_time'); ?></td><td>3000</td>
|
|
| 2319 | 2319 | </tr> |
| 2320 | 2320 | <tr> |
| 2321 | - <td>memory_limit</td><td><?php echo @ini_get( 'memory_limit' );?></td><td>256M</td> |
|
| 2321 | + <td>memory_limit</td><td><?php echo @ini_get('memory_limit'); ?></td><td>256M</td>
|
|
| 2322 | 2322 | </tr> |
| 2323 | 2323 | </tbody> |
| 2324 | 2324 | </table> |
@@ -2330,21 +2330,21 @@ discard block |
||
| 2330 | 2330 | <div id="gd_ie_imposts" class="metabox-holder"> |
| 2331 | 2331 | <div class="meta-box-sortables ui-sortable"> |
| 2332 | 2332 | <div id="gd_ie_im_posts" class="postbox gd-hndle-pbox"> |
| 2333 | - <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Listings: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button> |
|
| 2334 | - <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Import CSV', 'geodirectory' );?></span></h3> |
|
| 2333 | + <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Listings: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
| 2334 | + <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Import CSV', 'geodirectory'); ?></span></h3>
|
|
| 2335 | 2335 | <div class="inside"> |
| 2336 | 2336 | <table class="form-table"> |
| 2337 | 2337 | <tbody> |
| 2338 | 2338 | <tr> |
| 2339 | 2339 | <td class="gd-imex-box"> |
| 2340 | 2340 | <div class="gd-im-choices"> |
| 2341 | - <p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e( 'Update listing if post with post_id already exists.', 'geodirectory' );?></label></p> |
|
| 2342 | - <p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e( 'Ignore listing if post with post_id already exists.', 'geodirectory' );?></label></p> |
|
| 2341 | + <p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e('Update listing if post with post_id already exists.', 'geodirectory'); ?></label></p>
|
|
| 2342 | + <p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e('Ignore listing if post with post_id already exists.', 'geodirectory'); ?></label></p>
|
|
| 2343 | 2343 | </div> |
| 2344 | 2344 | <div class="plupload-upload-uic hide-if-no-js" id="gd_im_postplupload-upload-ui"> |
| 2345 | 2345 | <input type="text" readonly="readonly" name="gd_im_post_file" class="gd-imex-file gd_im_post_file" id="gd_im_post" onclick="jQuery('#gd_im_postplupload-browse-button').trigger('click');" />
|
| 2346 | - <input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample"> |
|
| 2347 | - <input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv;?>" /> |
|
| 2346 | + <input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">
|
|
| 2347 | + <input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv; ?>" /> |
|
| 2348 | 2348 | <input type="hidden" id="gd_im_post_allowed_types" data-exts=".csv" value="csv" /> |
| 2349 | 2349 | <?php |
| 2350 | 2350 | /** |
@@ -2354,7 +2354,7 @@ discard block |
||
| 2354 | 2354 | */ |
| 2355 | 2355 | do_action('geodir_sample_csv_download_link');
|
| 2356 | 2356 | ?> |
| 2357 | - <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_postpluploadan' ); ?>"></span> |
|
| 2357 | + <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_postpluploadan'); ?>"></span>
|
|
| 2358 | 2358 | <div class="filelist"></div> |
| 2359 | 2359 | </div> |
| 2360 | 2360 | <span id="gd_im_postupload-error" style="display:none"></span> |
@@ -2372,7 +2372,7 @@ discard block |
||
| 2372 | 2372 | <input type="hidden" id="gd_terminateaction" value="continue"/> |
| 2373 | 2373 | </div> |
| 2374 | 2374 | <div class="gd-import-progress" id="gd-import-progress" style="display:none"> |
| 2375 | - <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font
|
|
| 2375 | + <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font
|
|
| 2376 | 2376 | id="gd-import-done">0</font> / <font id="gd-import-total">0</font> ( <font |
| 2377 | 2377 | id="gd-import-perc">0%</font> ) |
| 2378 | 2378 | <div class="gd-fileprogress"></div> |
@@ -2384,10 +2384,10 @@ discard block |
||
| 2384 | 2384 | <div class="gd-imex-btns" style="display:none;"> |
| 2385 | 2385 | <input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/> |
| 2386 | 2386 | <input onclick="gd_imex_PrepareImport(this, 'post')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" /> |
| 2387 | - <input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/> |
|
| 2388 | - <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>
|
|
| 2387 | + <input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>
|
|
| 2388 | + <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>
|
|
| 2389 | 2389 | <div id="gd_process_data" style="display:none"> |
| 2390 | - <span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>
|
|
| 2390 | + <span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>
|
|
| 2391 | 2391 | </div> |
| 2392 | 2392 | </div> |
| 2393 | 2393 | </td> |
@@ -2401,30 +2401,30 @@ discard block |
||
| 2401 | 2401 | <div id="gd_ie_excategs" class="metabox-holder"> |
| 2402 | 2402 | <div class="meta-box-sortables ui-sortable"> |
| 2403 | 2403 | <div id="gd_ie_ex_posts" class="postbox gd-hndle-pbox"> |
| 2404 | - <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - Listings: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button> |
|
| 2405 | - <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Export CSV', 'geodirectory' );?></span></h3> |
|
| 2404 | + <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - Listings: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
| 2405 | + <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Export CSV', 'geodirectory'); ?></span></h3>
|
|
| 2406 | 2406 | <div class="inside"> |
| 2407 | 2407 | <table class="form-table"> |
| 2408 | 2408 | <tbody> |
| 2409 | 2409 | <tr> |
| 2410 | 2410 | <td class="fld"><label for="gd_post_type"> |
| 2411 | - <?php _e( 'Post Type:', 'geodirectory' );?> |
|
| 2411 | + <?php _e('Post Type:', 'geodirectory'); ?>
|
|
| 2412 | 2412 | </label></td> |
| 2413 | 2413 | <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"> |
| 2414 | - <?php echo $gd_posttypes_option;?> |
|
| 2414 | + <?php echo $gd_posttypes_option; ?> |
|
| 2415 | 2415 | </select></td> |
| 2416 | 2416 | </tr> |
| 2417 | 2417 | <tr> |
| 2418 | - <td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td> |
|
| 2419 | - <td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td> |
|
| 2418 | + <td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>
|
|
| 2419 | + <td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>
|
|
| 2420 | 2420 | </tr> |
| 2421 | 2421 | <tr class="gd-imex-dates"> |
| 2422 | - <td class="fld"><label><?php _e( 'Published Date:', 'geodirectory' );?></label></td> |
|
| 2423 | - <td><label><span class="label-responsive"><?php _e( 'Start date:', 'geodirectory' );?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e( 'End date:', 'geodirectory' );?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td> |
|
| 2422 | + <td class="fld"><label><?php _e('Published Date:', 'geodirectory'); ?></label></td>
|
|
| 2423 | + <td><label><span class="label-responsive"><?php _e('Start date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e('End date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>
|
|
| 2424 | 2424 | </tr> |
| 2425 | 2425 | <tr> |
| 2426 | 2426 | <td class="fld" style="vertical-align:top"><label> |
| 2427 | - <?php _e( 'Progress:', 'geodirectory' );?> |
|
| 2427 | + <?php _e('Progress:', 'geodirectory'); ?>
|
|
| 2428 | 2428 | </label></td> |
| 2429 | 2429 | <td><div id='gd_progressbar_box'> |
| 2430 | 2430 | <div id="gd_progressbar" class="gd_progressbar"> |
@@ -2432,13 +2432,13 @@ discard block |
||
| 2432 | 2432 | </div> |
| 2433 | 2433 | </div> |
| 2434 | 2434 | <p style="display:inline-block"> |
| 2435 | - <?php _e( 'Elapsed Time:', 'geodirectory' );?> |
|
| 2435 | + <?php _e('Elapsed Time:', 'geodirectory'); ?>
|
|
| 2436 | 2436 | </p> |
| 2437 | 2437 | |
| 2438 | 2438 | <p id="gd_timer" class="gd_timer">00:00:00</p></td> |
| 2439 | 2439 | </tr> |
| 2440 | 2440 | <tr class="gd-ie-actions"> |
| 2441 | - <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit"> |
|
| 2441 | + <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">
|
|
| 2442 | 2442 | </td> |
| 2443 | 2443 | <td id="gd_ie_ex_files" class="gd-ie-files"></td> |
| 2444 | 2444 | </tr> |
@@ -2451,21 +2451,21 @@ discard block |
||
| 2451 | 2451 | <div id="gd_ie_imcategs" class="metabox-holder"> |
| 2452 | 2452 | <div class="meta-box-sortables ui-sortable"> |
| 2453 | 2453 | <div id="gd_ie_imcats" class="postbox gd-hndle-pbox"> |
| 2454 | - <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button> |
|
| 2455 | - <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Import CSV', 'geodirectory' );?></span></h3> |
|
| 2454 | + <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
| 2455 | + <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Import CSV', 'geodirectory'); ?></span></h3>
|
|
| 2456 | 2456 | <div class="inside"> |
| 2457 | 2457 | <table class="form-table"> |
| 2458 | 2458 | <tbody> |
| 2459 | 2459 | <tr> |
| 2460 | 2460 | <td class="gd-imex-box"> |
| 2461 | 2461 | <div class="gd-im-choices"> |
| 2462 | - <p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e( 'Update item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p> |
|
| 2463 | - <p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e( 'Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p> |
|
| 2462 | + <p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e('Update item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>
|
|
| 2463 | + <p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e('Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>
|
|
| 2464 | 2464 | </div> |
| 2465 | 2465 | <div class="plupload-upload-uic hide-if-no-js" id="gd_im_catplupload-upload-ui"> |
| 2466 | 2466 | <input type="text" readonly="readonly" name="gd_im_cat_file" class="gd-imex-file gd_im_cat_file" id="gd_im_cat" onclick="jQuery('#gd_im_catplupload-browse-button').trigger('click');" />
|
| 2467 | - <input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample"> |
|
| 2468 | - <input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv;?>" /> |
|
| 2467 | + <input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">
|
|
| 2468 | + <input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv; ?>" /> |
|
| 2469 | 2469 | <input type="hidden" id="gd_im_cat_allowed_types" data-exts=".csv" value="csv" /> |
| 2470 | 2470 | <?php |
| 2471 | 2471 | /** |
@@ -2476,7 +2476,7 @@ discard block |
||
| 2476 | 2476 | */ |
| 2477 | 2477 | do_action('geodir_sample_cats_csv_download_link');
|
| 2478 | 2478 | ?> |
| 2479 | - <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_catpluploadan' ); ?>"></span> |
|
| 2479 | + <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_catpluploadan'); ?>"></span>
|
|
| 2480 | 2480 | <div class="filelist"></div> |
| 2481 | 2481 | </div> |
| 2482 | 2482 | <span id="gd_im_catupload-error" style="display:none"></span> |
@@ -2493,7 +2493,7 @@ discard block |
||
| 2493 | 2493 | <input type="hidden" id="gd_terminateaction" value="continue"/> |
| 2494 | 2494 | </div> |
| 2495 | 2495 | <div class="gd-import-progress" id="gd-import-progress" style="display:none"> |
| 2496 | - <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font
|
|
| 2496 | + <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font
|
|
| 2497 | 2497 | id="gd-import-done">0</font> / <font id="gd-import-total">0</font> ( <font |
| 2498 | 2498 | id="gd-import-perc">0%</font> ) |
| 2499 | 2499 | <div class="gd-fileprogress"></div> |
@@ -2505,10 +2505,10 @@ discard block |
||
| 2505 | 2505 | <div class="gd-imex-btns" style="display:none;"> |
| 2506 | 2506 | <input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/> |
| 2507 | 2507 | <input onclick="gd_imex_PrepareImport(this, 'cat')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" /> |
| 2508 | - <input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/> |
|
| 2509 | - <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>
|
|
| 2508 | + <input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>
|
|
| 2509 | + <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>
|
|
| 2510 | 2510 | <div id="gd_process_data" style="display:none"> |
| 2511 | - <span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>
|
|
| 2511 | + <span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>
|
|
| 2512 | 2512 | </div> |
| 2513 | 2513 | </div> |
| 2514 | 2514 | </td> |
@@ -2522,26 +2522,26 @@ discard block |
||
| 2522 | 2522 | <div id="gd_ie_excategs" class="metabox-holder"> |
| 2523 | 2523 | <div class="meta-box-sortables ui-sortable"> |
| 2524 | 2524 | <div id="gd_ie_ex_cats" class="postbox gd-hndle-pbox"> |
| 2525 | - <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button> |
|
| 2526 | - <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Export CSV', 'geodirectory' );?></span></h3> |
|
| 2525 | + <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>
|
|
| 2526 | + <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Export CSV', 'geodirectory'); ?></span></h3>
|
|
| 2527 | 2527 | <div class="inside"> |
| 2528 | 2528 | <table class="form-table"> |
| 2529 | 2529 | <tbody> |
| 2530 | 2530 | <tr> |
| 2531 | - <td class="fld"><label for="gd_post_type"><?php _e( 'Post Type:', 'geodirectory' );?></label></td> |
|
| 2532 | - <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option;?></select></td> |
|
| 2531 | + <td class="fld"><label for="gd_post_type"><?php _e('Post Type:', 'geodirectory'); ?></label></td>
|
|
| 2532 | + <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option; ?></select></td> |
|
| 2533 | 2533 | </tr> |
| 2534 | 2534 | <tr> |
| 2535 | - <td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td> |
|
| 2536 | - <td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td> |
|
| 2535 | + <td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>
|
|
| 2536 | + <td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>
|
|
| 2537 | 2537 | </tr> |
| 2538 | 2538 | <tr> |
| 2539 | - <td class="fld" style="vertical-align:top"><label><?php _e( 'Progress:', 'geodirectory' );?></label></td> |
|
| 2540 | - <td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e( 'Elapsed Time:', 'geodirectory' );?></p> <p id="gd_timer" class="gd_timer">00:00:00</p></td> |
|
| 2539 | + <td class="fld" style="vertical-align:top"><label><?php _e('Progress:', 'geodirectory'); ?></label></td>
|
|
| 2540 | + <td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e('Elapsed Time:', 'geodirectory'); ?></p> <p id="gd_timer" class="gd_timer">00:00:00</p></td>
|
|
| 2541 | 2541 | </tr> |
| 2542 | 2542 | <tr class="gd-ie-actions"> |
| 2543 | 2543 | <td style="vertical-align:top"> |
| 2544 | - <input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit"> |
|
| 2544 | + <input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">
|
|
| 2545 | 2545 | </td> |
| 2546 | 2546 | <td id="gd_ie_ex_files" class="gd-ie-files"></td> |
| 2547 | 2547 | </tr> |
@@ -2563,7 +2563,7 @@ discard block |
||
| 2563 | 2563 | * @param array $gd_chunksize_options File chunk size options. |
| 2564 | 2564 | * @param string $nonce Wordpress security token for GD import & export. |
| 2565 | 2565 | */ |
| 2566 | - do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce ); |
|
| 2566 | + do_action('geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce);
|
|
| 2567 | 2567 | ?> |
| 2568 | 2568 | </div> |
| 2569 | 2569 | </div> |
@@ -2582,7 +2582,7 @@ discard block |
||
| 2582 | 2582 | jQuery.ajax({
|
| 2583 | 2583 | url: ajaxurl, |
| 2584 | 2584 | type: "POST", |
| 2585 | - data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce;?>', |
|
| 2585 | + data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce; ?>', |
|
| 2586 | 2586 | dataType: 'json', |
| 2587 | 2587 | cache: false, |
| 2588 | 2588 | success: function(data) {
|
@@ -2634,7 +2634,7 @@ discard block |
||
| 2634 | 2634 | |
| 2635 | 2635 | jQuery(cont).find('.filelist .file').remove();
|
| 2636 | 2636 | |
| 2637 | - jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr( PLZ_SELECT_CSV_FILE );?></p>");
|
|
| 2637 | + jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr(PLZ_SELECT_CSV_FILE); ?></p>");
|
|
| 2638 | 2638 | jQuery('#gd-import-msg', cont).show();
|
| 2639 | 2639 | |
| 2640 | 2640 | return false; |
@@ -2693,7 +2693,7 @@ discard block |
||
| 2693 | 2693 | jQuery.ajax({
|
| 2694 | 2694 | url: ajaxurl, |
| 2695 | 2695 | type: "POST", |
| 2696 | - data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce;?>', |
|
| 2696 | + data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce; ?>', |
|
| 2697 | 2697 | dataType : 'json', |
| 2698 | 2698 | cache: false, |
| 2699 | 2699 | success: function (data) {
|
@@ -2882,27 +2882,27 @@ discard block |
||
| 2882 | 2882 | |
| 2883 | 2883 | var gdMsg = '<p></p>'; |
| 2884 | 2884 | if ( processed > 0 ) {
|
| 2885 | - var msgParse = '<p><?php echo addslashes( sprintf( __( 'Total %s item(s) found.', 'geodirectory' ), '%s' ) );?></p>'; |
|
| 2885 | + var msgParse = '<p><?php echo addslashes(sprintf(__('Total %s item(s) found.', 'geodirectory'), '%s')); ?></p>';
|
|
| 2886 | 2886 | msgParse = msgParse.replace("%s", processed);
|
| 2887 | 2887 | gdMsg += msgParse; |
| 2888 | 2888 | } |
| 2889 | 2889 | |
| 2890 | 2890 | if ( updated > 0 ) {
|
| 2891 | - var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) updated.', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2891 | + var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) updated.', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2892 | 2892 | msgParse = msgParse.replace("%s", updated);
|
| 2893 | 2893 | msgParse = msgParse.replace("%d", processed);
|
| 2894 | 2894 | gdMsg += msgParse; |
| 2895 | 2895 | } |
| 2896 | 2896 | |
| 2897 | 2897 | if ( created > 0 ) {
|
| 2898 | - var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) added.', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2898 | + var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) added.', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2899 | 2899 | msgParse = msgParse.replace("%s", created);
|
| 2900 | 2900 | msgParse = msgParse.replace("%d", processed);
|
| 2901 | 2901 | gdMsg += msgParse; |
| 2902 | 2902 | } |
| 2903 | 2903 | |
| 2904 | 2904 | if ( skipped > 0 ) {
|
| 2905 | - var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) ignored due to already exists.', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2905 | + var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) ignored due to already exists.', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2906 | 2906 | msgParse = msgParse.replace("%s", skipped);
|
| 2907 | 2907 | msgParse = msgParse.replace("%d", processed);
|
| 2908 | 2908 | gdMsg += msgParse; |
@@ -2912,17 +2912,17 @@ discard block |
||
| 2912 | 2912 | if (type=='loc') {
|
| 2913 | 2913 | invalid_addr = invalid; |
| 2914 | 2914 | } |
| 2915 | - var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2915 | + var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2916 | 2916 | msgParse = msgParse.replace("%s", invalid_addr);
|
| 2917 | 2917 | msgParse = msgParse.replace("%d", total);
|
| 2918 | 2918 | gdMsg += msgParse; |
| 2919 | 2919 | } |
| 2920 | 2920 | |
| 2921 | 2921 | if (invalid > 0 && type!='loc') {
|
| 2922 | - var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2922 | + var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2923 | 2923 | |
| 2924 | 2924 | if (type=='hood') {
|
| 2925 | - msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ), '%s', '%d' ) );?></p>'; |
|
| 2925 | + msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory'), '%s', '%d')); ?></p>';
|
|
| 2926 | 2926 | } |
| 2927 | 2927 | msgParse = msgParse.replace("%s", invalid);
|
| 2928 | 2928 | msgParse = msgParse.replace("%d", total);
|
@@ -2930,7 +2930,7 @@ discard block |
||
| 2930 | 2930 | } |
| 2931 | 2931 | |
| 2932 | 2932 | if (images > 0) {
|
| 2933 | - gdMsg += '<p><?php echo addslashes( $upload_dir );?></p>'; |
|
| 2933 | + gdMsg += '<p><?php echo addslashes($upload_dir); ?></p>'; |
|
| 2934 | 2934 | } |
| 2935 | 2935 | gdMsg += '<p></p>'; |
| 2936 | 2936 | jQuery('#gd-import-msg', cont).find('#message').removeClass('error').addClass('updated').html(gdMsg);
|
@@ -3094,9 +3094,9 @@ discard block |
||
| 3094 | 3094 | if (typeof filters !== 'undefined' && filters && doFilter) {
|
| 3095 | 3095 | getTotal = true; |
| 3096 | 3096 | attach += '&_c=1'; |
| 3097 | - gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Preparing...', 'geodirectory' ) );?>'); |
|
| 3097 | + gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Preparing...', 'geodirectory')); ?>');
|
|
| 3098 | 3098 | } else {
|
| 3099 | - gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>'); |
|
| 3099 | + gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');
|
|
| 3100 | 3100 | } |
| 3101 | 3101 | jQuery(el).find('#gd_timer').text('00:00:01');
|
| 3102 | 3102 | jQuery('#gd_ie_ex_files', el).html('');
|
@@ -3105,7 +3105,7 @@ discard block |
||
| 3105 | 3105 | jQuery.ajax({
|
| 3106 | 3106 | url: ajaxurl, |
| 3107 | 3107 | type: "POST", |
| 3108 | - data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page + attach, |
|
| 3108 | + data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page + attach, |
|
| 3109 | 3109 | dataType : 'json', |
| 3110 | 3110 | cache: false, |
| 3111 | 3111 | beforeSend: function (jqXHR, settings) {},
|
@@ -3130,11 +3130,11 @@ discard block |
||
| 3130 | 3130 | } else {
|
| 3131 | 3131 | if (pages < page || pages == page) {
|
| 3132 | 3132 | window.clearInterval(timer_posts); |
| 3133 | - gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');
|
|
| 3133 | + gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');
|
|
| 3134 | 3134 | } else {
|
| 3135 | 3135 | var percentage = Math.round(((page * chunk_size) / total_posts) * 100); |
| 3136 | 3136 | percentage = percentage > 100 ? 100 : percentage; |
| 3137 | - gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');
|
|
| 3137 | + gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');
|
|
| 3138 | 3138 | } |
| 3139 | 3139 | if (typeof data.files != 'undefined' && jQuery(data.files).length ) {
|
| 3140 | 3140 | var obj_files = data.files; |
@@ -3165,7 +3165,7 @@ discard block |
||
| 3165 | 3165 | |
| 3166 | 3166 | function gd_process_export_cats(el, post_type, total_cats, chunk_size, pages, page) {
|
| 3167 | 3167 | if (page < 2) {
|
| 3168 | - gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>'); |
|
| 3168 | + gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');
|
|
| 3169 | 3169 | jQuery(el).find('#gd_timer').text('00:00:01');
|
| 3170 | 3170 | jQuery('#gd_ie_ex_files', el).html('');
|
| 3171 | 3171 | } |
@@ -3173,7 +3173,7 @@ discard block |
||
| 3173 | 3173 | jQuery.ajax({
|
| 3174 | 3174 | url: ajaxurl, |
| 3175 | 3175 | type: "POST", |
| 3176 | - data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page, |
|
| 3176 | + data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page, |
|
| 3177 | 3177 | dataType : 'json', |
| 3178 | 3178 | cache: false, |
| 3179 | 3179 | beforeSend: function (jqXHR, settings) {},
|
@@ -3187,11 +3187,11 @@ discard block |
||
| 3187 | 3187 | } else {
|
| 3188 | 3188 | if (pages < page || pages == page) {
|
| 3189 | 3189 | window.clearInterval(timer_cats); |
| 3190 | - gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');
|
|
| 3190 | + gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');
|
|
| 3191 | 3191 | } else {
|
| 3192 | 3192 | var percentage = Math.round(((page * chunk_size) / total_cats) * 100); |
| 3193 | 3193 | percentage = percentage > 100 ? 100 : percentage; |
| 3194 | - gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e( 'Exporting...', 'geodirectory' );?>');
|
|
| 3194 | + gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e('Exporting...', 'geodirectory'); ?>');
|
|
| 3195 | 3195 | } |
| 3196 | 3196 | if (typeof data.files != 'undefined' && jQuery(data.files).length ) {
|
| 3197 | 3197 | var obj_files = data.files; |
@@ -3248,13 +3248,13 @@ discard block |
||
| 3248 | 3248 | function geodir_init_filesystem() |
| 3249 | 3249 | {
|
| 3250 | 3250 | |
| 3251 | - if(!function_exists('get_filesystem_method')){
|
|
| 3251 | + if (!function_exists('get_filesystem_method')) {
|
|
| 3252 | 3252 | require_once(ABSPATH."/wp-admin/includes/file.php"); |
| 3253 | 3253 | } |
| 3254 | 3254 | $access_type = get_filesystem_method(); |
| 3255 | 3255 | if ($access_type === 'direct') {
|
| 3256 | 3256 | /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */ |
| 3257 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3257 | + $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array()); |
|
| 3258 | 3258 | |
| 3259 | 3259 | /* initialize the API */ |
| 3260 | 3260 | if (!WP_Filesystem($creds)) {
|
@@ -3267,7 +3267,7 @@ discard block |
||
| 3267 | 3267 | return $wp_filesystem; |
| 3268 | 3268 | /* do our file manipulations below */ |
| 3269 | 3269 | } elseif (defined('FTP_USER')) {
|
| 3270 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3270 | + $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array()); |
|
| 3271 | 3271 | |
| 3272 | 3272 | /* initialize the API */ |
| 3273 | 3273 | if (!WP_Filesystem($creds)) {
|
@@ -3302,7 +3302,7 @@ discard block |
||
| 3302 | 3302 | * @package GeoDirectory |
| 3303 | 3303 | */ |
| 3304 | 3304 | function geodir_filesystem_notice() |
| 3305 | -{ if ( defined( 'DOING_AJAX' ) ){return;}
|
|
| 3305 | +{ if (defined('DOING_AJAX')) {return; }
|
|
| 3306 | 3306 | $access_type = get_filesystem_method(); |
| 3307 | 3307 | if ($access_type === 'direct') {
|
| 3308 | 3308 | } elseif (!defined('FTP_USER')) {
|
@@ -3343,64 +3343,64 @@ discard block |
||
| 3343 | 3343 | // try to set higher limits for import |
| 3344 | 3344 | $max_input_time = ini_get('max_input_time');
|
| 3345 | 3345 | $max_execution_time = ini_get('max_execution_time');
|
| 3346 | - $memory_limit= ini_get('memory_limit');
|
|
| 3346 | + $memory_limit = ini_get('memory_limit');
|
|
| 3347 | 3347 | |
| 3348 | - if(!$max_input_time || $max_input_time<3000){
|
|
| 3348 | + if (!$max_input_time || $max_input_time < 3000) {
|
|
| 3349 | 3349 | ini_set('max_input_time', 3000);
|
| 3350 | 3350 | } |
| 3351 | 3351 | |
| 3352 | - if(!$max_execution_time || $max_execution_time<3000){
|
|
| 3352 | + if (!$max_execution_time || $max_execution_time < 3000) {
|
|
| 3353 | 3353 | ini_set('max_execution_time', 3000);
|
| 3354 | 3354 | } |
| 3355 | 3355 | |
| 3356 | - if($memory_limit && str_replace('M','',$memory_limit)){
|
|
| 3357 | - if(str_replace('M','',$memory_limit)<256){
|
|
| 3356 | + if ($memory_limit && str_replace('M', '', $memory_limit)) {
|
|
| 3357 | + if (str_replace('M', '', $memory_limit) < 256) {
|
|
| 3358 | 3358 | ini_set('memory_limit', '256M');
|
| 3359 | 3359 | } |
| 3360 | 3360 | } |
| 3361 | 3361 | |
| 3362 | 3362 | $json = array(); |
| 3363 | 3363 | |
| 3364 | - if ( !current_user_can( 'manage_options' ) ) {
|
|
| 3365 | - wp_send_json( $json ); |
|
| 3364 | + if (!current_user_can('manage_options')) {
|
|
| 3365 | + wp_send_json($json); |
|
| 3366 | 3366 | } |
| 3367 | 3367 | |
| 3368 | - $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL; |
|
| 3369 | - $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL; |
|
| 3370 | - $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false; |
|
| 3368 | + $task = isset($_REQUEST['task']) ? $_REQUEST['task'] : NULL; |
|
| 3369 | + $nonce = isset($_REQUEST['_nonce']) ? $_REQUEST['_nonce'] : NULL; |
|
| 3370 | + $stat = isset($_REQUEST['_st']) ? $_REQUEST['_st'] : false; |
|
| 3371 | 3371 | |
| 3372 | - if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {
|
|
| 3373 | - wp_send_json( $json ); |
|
| 3372 | + if (!wp_verify_nonce($nonce, 'geodir_import_export_nonce')) {
|
|
| 3373 | + wp_send_json($json); |
|
| 3374 | 3374 | } |
| 3375 | 3375 | |
| 3376 | - $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL; |
|
| 3377 | - $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL; |
|
| 3376 | + $post_type = isset($_REQUEST['_pt']) ? $_REQUEST['_pt'] : NULL; |
|
| 3377 | + $chunk_per_page = isset($_REQUEST['_n']) ? absint($_REQUEST['_n']) : NULL; |
|
| 3378 | 3378 | $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page; |
| 3379 | - $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1; |
|
| 3379 | + $chunk_page_no = isset($_REQUEST['_p']) ? absint($_REQUEST['_p']) : 1; |
|
| 3380 | 3380 | |
| 3381 | 3381 | $wp_filesystem = geodir_init_filesystem(); |
| 3382 | 3382 | if (!$wp_filesystem) {
|
| 3383 | - $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' ); |
|
| 3384 | - wp_send_json( $json ); |
|
| 3383 | + $json['error'] = __('Filesystem ERROR: Could not access filesystem.', 'geodirectory');
|
|
| 3384 | + wp_send_json($json); |
|
| 3385 | 3385 | } |
| 3386 | 3386 | |
| 3387 | 3387 | if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
|
| 3388 | - $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' ); |
|
| 3389 | - wp_send_json( $json ); |
|
| 3388 | + $json['error'] = __('Filesystem ERROR: '.$wp_filesystem->errors->get_error_message(), 'geodirectory');
|
|
| 3389 | + wp_send_json($json); |
|
| 3390 | 3390 | } |
| 3391 | 3391 | |
| 3392 | - $csv_file_dir = geodir_path_import_export( false ); |
|
| 3393 | - if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {
|
|
| 3394 | - if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {
|
|
| 3395 | - $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3396 | - wp_send_json( $json ); |
|
| 3392 | + $csv_file_dir = geodir_path_import_export(false); |
|
| 3393 | + if (!$wp_filesystem->is_dir($csv_file_dir)) {
|
|
| 3394 | + if (!$wp_filesystem->mkdir($csv_file_dir, FS_CHMOD_DIR)) {
|
|
| 3395 | + $json['error'] = __('ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory');
|
|
| 3396 | + wp_send_json($json); |
|
| 3397 | 3397 | } |
| 3398 | 3398 | } |
| 3399 | 3399 | |
| 3400 | 3400 | $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
| 3401 | 3401 | $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
| 3402 | 3402 | |
| 3403 | - switch ( $task ) {
|
|
| 3403 | + switch ($task) {
|
|
| 3404 | 3404 | case 'export_posts': {
|
| 3405 | 3405 | // WPML |
| 3406 | 3406 | $is_wpml = geodir_is_wpml(); |
@@ -3411,36 +3411,36 @@ discard block |
||
| 3411 | 3411 | $sitepress->switch_lang('all', true);
|
| 3412 | 3412 | } |
| 3413 | 3413 | // WPML |
| 3414 | - if ( $post_type == 'gd_event' ) {
|
|
| 3415 | - add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 ); |
|
| 3414 | + if ($post_type == 'gd_event') {
|
|
| 3415 | + add_filter('geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2);
|
|
| 3416 | 3416 | } |
| 3417 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 3417 | + $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL; |
|
| 3418 | 3418 | |
| 3419 | - $file_name = $post_type . '_' . date( 'dmyHi' ); |
|
| 3420 | - if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {
|
|
| 3421 | - $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) ); |
|
| 3419 | + $file_name = $post_type.'_'.date('dmyHi');
|
|
| 3420 | + if ($filters && isset($filters['start_date']) && isset($filters['end_date'])) {
|
|
| 3421 | + $file_name = $post_type.'_'.date_i18n('dmy', strtotime($filters['start_date'])).'_'.date_i18n('dmy', strtotime($filters['end_date']));
|
|
| 3422 | 3422 | } |
| 3423 | - $posts_count = geodir_get_posts_count( $post_type ); |
|
| 3424 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3425 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3426 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3427 | - $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv'; |
|
| 3423 | + $posts_count = geodir_get_posts_count($post_type); |
|
| 3424 | + $file_url_base = geodir_path_import_export().'/'; |
|
| 3425 | + $file_url = $file_url_base.$file_name.'.csv'; |
|
| 3426 | + $file_path = $csv_file_dir.'/'.$file_name.'.csv'; |
|
| 3427 | + $file_path_temp = $csv_file_dir.'/'.$post_type.'_'.$nonce.'.csv'; |
|
| 3428 | 3428 | |
| 3429 | 3429 | $chunk_file_paths = array(); |
| 3430 | 3430 | |
| 3431 | - if ( isset( $_REQUEST['_c'] ) ) {
|
|
| 3431 | + if (isset($_REQUEST['_c'])) {
|
|
| 3432 | 3432 | $json['total'] = $posts_count; |
| 3433 | 3433 | // WPML |
| 3434 | 3434 | if ($is_wpml) {
|
| 3435 | 3435 | $sitepress->switch_lang($active_lang, true); |
| 3436 | 3436 | } |
| 3437 | 3437 | // WPML |
| 3438 | - wp_send_json( $json ); |
|
| 3438 | + wp_send_json($json); |
|
| 3439 | 3439 | gd_die(); |
| 3440 | - } else if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3441 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3442 | - $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0; |
|
| 3443 | - $percentage = min( $percentage, 100 ); |
|
| 3440 | + } else if (isset($_REQUEST['_st'])) {
|
|
| 3441 | + $line_count = (int) geodir_import_export_line_count($file_path_temp); |
|
| 3442 | + $percentage = count($posts_count) > 0 && $line_count > 0 ? ceil($line_count / $posts_count) * 100 : 0; |
|
| 3443 | + $percentage = min($percentage, 100); |
|
| 3444 | 3444 | |
| 3445 | 3445 | $json['percentage'] = $percentage; |
| 3446 | 3446 | // WPML |
@@ -3448,45 +3448,45 @@ discard block |
||
| 3448 | 3448 | $sitepress->switch_lang($active_lang, true); |
| 3449 | 3449 | } |
| 3450 | 3450 | // WPML |
| 3451 | - wp_send_json( $json ); |
|
| 3451 | + wp_send_json($json); |
|
| 3452 | 3452 | gd_die(); |
| 3453 | 3453 | } else {
|
| 3454 | - if ( !$posts_count > 0 ) {
|
|
| 3455 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3454 | + if (!$posts_count > 0) {
|
|
| 3455 | + $json['error'] = __('No records to export.', 'geodirectory');
|
|
| 3456 | 3456 | } else {
|
| 3457 | 3457 | $total_posts = $posts_count; |
| 3458 | 3458 | if ($chunk_per_page > $total_posts) {
|
| 3459 | 3459 | $chunk_per_page = $total_posts; |
| 3460 | 3460 | } |
| 3461 | - $chunk_total_pages = ceil( $total_posts / $chunk_per_page ); |
|
| 3461 | + $chunk_total_pages = ceil($total_posts / $chunk_per_page); |
|
| 3462 | 3462 | |
| 3463 | 3463 | $j = $chunk_page_no; |
| 3464 | - $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j ); |
|
| 3464 | + $chunk_save_posts = geodir_imex_get_posts($post_type, $chunk_per_page, $j); |
|
| 3465 | 3465 | |
| 3466 | 3466 | $per_page = 500; |
| 3467 | 3467 | if ($per_page > $chunk_per_page) {
|
| 3468 | 3468 | $per_page = $chunk_per_page; |
| 3469 | 3469 | } |
| 3470 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3470 | + $total_pages = ceil($chunk_per_page / $per_page); |
|
| 3471 | 3471 | |
| 3472 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3473 | - $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page ); |
|
| 3472 | + for ($i = 0; $i <= $total_pages; $i++) {
|
|
| 3473 | + $save_posts = array_slice($chunk_save_posts, ($i * $per_page), $per_page); |
|
| 3474 | 3474 | |
| 3475 | 3475 | $clear = $i == 0 ? true : false; |
| 3476 | - geodir_save_csv_data( $file_path_temp, $save_posts, $clear ); |
|
| 3476 | + geodir_save_csv_data($file_path_temp, $save_posts, $clear); |
|
| 3477 | 3477 | } |
| 3478 | 3478 | |
| 3479 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3480 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3481 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3482 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3483 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3479 | + if ($wp_filesystem->exists($file_path_temp)) {
|
|
| 3480 | + $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : ''; |
|
| 3481 | + $chunk_file_name = $file_name.$chunk_page_no.'.csv'; |
|
| 3482 | + $file_path = $csv_file_dir.'/'.$chunk_file_name; |
|
| 3483 | + $wp_filesystem->move($file_path_temp, $file_path, true); |
|
| 3484 | 3484 | |
| 3485 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3486 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3485 | + $file_url = $file_url_base.$chunk_file_name; |
|
| 3486 | + $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3487 | 3487 | } |
| 3488 | 3488 | |
| 3489 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3489 | + if (!empty($chunk_file_paths)) {
|
|
| 3490 | 3490 | $json['total'] = $posts_count; |
| 3491 | 3491 | $json['files'] = $chunk_file_paths; |
| 3492 | 3492 | } else {
|
@@ -3494,7 +3494,7 @@ discard block |
||
| 3494 | 3494 | $json['total'] = $posts_count; |
| 3495 | 3495 | $json['files'] = array(); |
| 3496 | 3496 | } else {
|
| 3497 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3497 | + $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');
|
|
| 3498 | 3498 | } |
| 3499 | 3499 | } |
| 3500 | 3500 | } |
@@ -3503,7 +3503,7 @@ discard block |
||
| 3503 | 3503 | $sitepress->switch_lang($active_lang, true); |
| 3504 | 3504 | } |
| 3505 | 3505 | // WPML |
| 3506 | - wp_send_json( $json ); |
|
| 3506 | + wp_send_json($json); |
|
| 3507 | 3507 | } |
| 3508 | 3508 | } |
| 3509 | 3509 | break; |
@@ -3517,20 +3517,20 @@ discard block |
||
| 3517 | 3517 | $sitepress->switch_lang('all', true);
|
| 3518 | 3518 | } |
| 3519 | 3519 | // WPML |
| 3520 | - $file_name = $post_type . 'category_' . date( 'dmyHi' ); |
|
| 3520 | + $file_name = $post_type.'category_'.date('dmyHi');
|
|
| 3521 | 3521 | |
| 3522 | - $terms_count = geodir_get_terms_count( $post_type ); |
|
| 3523 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3524 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3525 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3526 | - $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv'; |
|
| 3522 | + $terms_count = geodir_get_terms_count($post_type); |
|
| 3523 | + $file_url_base = geodir_path_import_export().'/'; |
|
| 3524 | + $file_url = $file_url_base.$file_name.'.csv'; |
|
| 3525 | + $file_path = $csv_file_dir.'/'.$file_name.'.csv'; |
|
| 3526 | + $file_path_temp = $csv_file_dir.'/'.$post_type.'category_'.$nonce.'.csv'; |
|
| 3527 | 3527 | |
| 3528 | 3528 | $chunk_file_paths = array(); |
| 3529 | 3529 | |
| 3530 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3531 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3532 | - $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0; |
|
| 3533 | - $percentage = min( $percentage, 100 ); |
|
| 3530 | + if (isset($_REQUEST['_st'])) {
|
|
| 3531 | + $line_count = (int) geodir_import_export_line_count($file_path_temp); |
|
| 3532 | + $percentage = count($terms_count) > 0 && $line_count > 0 ? ceil($line_count / $terms_count) * 100 : 0; |
|
| 3533 | + $percentage = min($percentage, 100); |
|
| 3534 | 3534 | |
| 3535 | 3535 | $json['percentage'] = $percentage; |
| 3536 | 3536 | // WPML |
@@ -3538,48 +3538,48 @@ discard block |
||
| 3538 | 3538 | $sitepress->switch_lang($active_lang, true); |
| 3539 | 3539 | } |
| 3540 | 3540 | // WPML |
| 3541 | - wp_send_json( $json ); |
|
| 3541 | + wp_send_json($json); |
|
| 3542 | 3542 | } else {
|
| 3543 | - if ( !$terms_count > 0 ) {
|
|
| 3544 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3543 | + if (!$terms_count > 0) {
|
|
| 3544 | + $json['error'] = __('No records to export.', 'geodirectory');
|
|
| 3545 | 3545 | } else {
|
| 3546 | 3546 | $total_terms = $terms_count; |
| 3547 | 3547 | if ($chunk_per_page > $terms_count) {
|
| 3548 | 3548 | $chunk_per_page = $terms_count; |
| 3549 | 3549 | } |
| 3550 | - $chunk_total_pages = ceil( $total_terms / $chunk_per_page ); |
|
| 3550 | + $chunk_total_pages = ceil($total_terms / $chunk_per_page); |
|
| 3551 | 3551 | |
| 3552 | 3552 | $j = $chunk_page_no; |
| 3553 | - $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j ); |
|
| 3553 | + $chunk_save_terms = geodir_imex_get_terms($post_type, $chunk_per_page, $j); |
|
| 3554 | 3554 | |
| 3555 | 3555 | $per_page = 500; |
| 3556 | 3556 | if ($per_page > $chunk_per_page) {
|
| 3557 | 3557 | $per_page = $chunk_per_page; |
| 3558 | 3558 | } |
| 3559 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3559 | + $total_pages = ceil($chunk_per_page / $per_page); |
|
| 3560 | 3560 | |
| 3561 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3562 | - $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page ); |
|
| 3561 | + for ($i = 0; $i <= $total_pages; $i++) {
|
|
| 3562 | + $save_terms = array_slice($chunk_save_terms, ($i * $per_page), $per_page); |
|
| 3563 | 3563 | |
| 3564 | 3564 | $clear = $i == 0 ? true : false; |
| 3565 | - geodir_save_csv_data( $file_path_temp, $save_terms, $clear ); |
|
| 3565 | + geodir_save_csv_data($file_path_temp, $save_terms, $clear); |
|
| 3566 | 3566 | } |
| 3567 | 3567 | |
| 3568 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3569 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3570 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3571 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3572 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3568 | + if ($wp_filesystem->exists($file_path_temp)) {
|
|
| 3569 | + $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : ''; |
|
| 3570 | + $chunk_file_name = $file_name.$chunk_page_no.'.csv'; |
|
| 3571 | + $file_path = $csv_file_dir.'/'.$chunk_file_name; |
|
| 3572 | + $wp_filesystem->move($file_path_temp, $file_path, true); |
|
| 3573 | 3573 | |
| 3574 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3575 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3574 | + $file_url = $file_url_base.$chunk_file_name; |
|
| 3575 | + $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3576 | 3576 | } |
| 3577 | 3577 | |
| 3578 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3578 | + if (!empty($chunk_file_paths)) {
|
|
| 3579 | 3579 | $json['total'] = $terms_count; |
| 3580 | 3580 | $json['files'] = $chunk_file_paths; |
| 3581 | 3581 | } else {
|
| 3582 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3582 | + $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');
|
|
| 3583 | 3583 | } |
| 3584 | 3584 | } |
| 3585 | 3585 | // WPML |
@@ -3587,127 +3587,127 @@ discard block |
||
| 3587 | 3587 | $sitepress->switch_lang($active_lang, true); |
| 3588 | 3588 | } |
| 3589 | 3589 | // WPML |
| 3590 | - wp_send_json( $json ); |
|
| 3590 | + wp_send_json($json); |
|
| 3591 | 3591 | } |
| 3592 | 3592 | } |
| 3593 | 3593 | break; |
| 3594 | 3594 | case 'export_locations': {
|
| 3595 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3596 | - $file_name = 'gd_locations_' . date( 'dmyHi' ); |
|
| 3597 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3598 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3599 | - $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv'; |
|
| 3595 | + $file_url_base = geodir_path_import_export().'/'; |
|
| 3596 | + $file_name = 'gd_locations_'.date('dmyHi');
|
|
| 3597 | + $file_url = $file_url_base.$file_name.'.csv'; |
|
| 3598 | + $file_path = $csv_file_dir.'/'.$file_name.'.csv'; |
|
| 3599 | + $file_path_temp = $csv_file_dir.'/gd_locations_'.$nonce.'.csv'; |
|
| 3600 | 3600 | |
| 3601 | - $items_count = (int)geodir_location_imex_count_locations(); |
|
| 3601 | + $items_count = (int) geodir_location_imex_count_locations(); |
|
| 3602 | 3602 | |
| 3603 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3604 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3605 | - $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3606 | - $percentage = min( $percentage, 100 ); |
|
| 3603 | + if (isset($_REQUEST['_st'])) {
|
|
| 3604 | + $line_count = (int) geodir_import_export_line_count($file_path_temp); |
|
| 3605 | + $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0; |
|
| 3606 | + $percentage = min($percentage, 100); |
|
| 3607 | 3607 | |
| 3608 | 3608 | $json['percentage'] = $percentage; |
| 3609 | - wp_send_json( $json ); |
|
| 3609 | + wp_send_json($json); |
|
| 3610 | 3610 | } else {
|
| 3611 | 3611 | $chunk_file_paths = array(); |
| 3612 | 3612 | |
| 3613 | - if ( !$items_count > 0 ) {
|
|
| 3614 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3613 | + if (!$items_count > 0) {
|
|
| 3614 | + $json['error'] = __('No records to export.', 'geodirectory');
|
|
| 3615 | 3615 | } else {
|
| 3616 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3617 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3616 | + $chunk_per_page = min($chunk_per_page, $items_count); |
|
| 3617 | + $chunk_total_pages = ceil($items_count / $chunk_per_page); |
|
| 3618 | 3618 | |
| 3619 | 3619 | $j = $chunk_page_no; |
| 3620 | - $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j ); |
|
| 3620 | + $chunk_save_items = geodir_location_imex_locations_data($chunk_per_page, $j); |
|
| 3621 | 3621 | |
| 3622 | 3622 | $per_page = 500; |
| 3623 | - $per_page = min( $per_page, $chunk_per_page ); |
|
| 3624 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3623 | + $per_page = min($per_page, $chunk_per_page); |
|
| 3624 | + $total_pages = ceil($chunk_per_page / $per_page); |
|
| 3625 | 3625 | |
| 3626 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3627 | - $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3626 | + for ($i = 0; $i <= $total_pages; $i++) {
|
|
| 3627 | + $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page); |
|
| 3628 | 3628 | |
| 3629 | 3629 | $clear = $i == 0 ? true : false; |
| 3630 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3630 | + geodir_save_csv_data($file_path_temp, $save_items, $clear); |
|
| 3631 | 3631 | } |
| 3632 | 3632 | |
| 3633 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3634 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3635 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3636 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3637 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3633 | + if ($wp_filesystem->exists($file_path_temp)) {
|
|
| 3634 | + $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : ''; |
|
| 3635 | + $chunk_file_name = $file_name.$chunk_page_no.'.csv'; |
|
| 3636 | + $file_path = $csv_file_dir.'/'.$chunk_file_name; |
|
| 3637 | + $wp_filesystem->move($file_path_temp, $file_path, true); |
|
| 3638 | 3638 | |
| 3639 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3640 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3639 | + $file_url = $file_url_base.$chunk_file_name; |
|
| 3640 | + $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3641 | 3641 | } |
| 3642 | 3642 | |
| 3643 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3643 | + if (!empty($chunk_file_paths)) {
|
|
| 3644 | 3644 | $json['total'] = $items_count; |
| 3645 | 3645 | $json['files'] = $chunk_file_paths; |
| 3646 | 3646 | } else {
|
| 3647 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3647 | + $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');
|
|
| 3648 | 3648 | } |
| 3649 | 3649 | } |
| 3650 | - wp_send_json( $json ); |
|
| 3650 | + wp_send_json($json); |
|
| 3651 | 3651 | } |
| 3652 | 3652 | } |
| 3653 | 3653 | break; |
| 3654 | 3654 | case 'export_hoods': {
|
| 3655 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3656 | - $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' ); |
|
| 3657 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3658 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3659 | - $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv'; |
|
| 3655 | + $file_url_base = geodir_path_import_export().'/'; |
|
| 3656 | + $file_name = 'gd_neighbourhoods_'.date('dmyHi');
|
|
| 3657 | + $file_url = $file_url_base.$file_name.'.csv'; |
|
| 3658 | + $file_path = $csv_file_dir.'/'.$file_name.'.csv'; |
|
| 3659 | + $file_path_temp = $csv_file_dir.'/gd_neighbourhoods_'.$nonce.'.csv'; |
|
| 3660 | 3660 | |
| 3661 | - $items_count = (int)geodir_location_imex_count_neighbourhoods(); |
|
| 3661 | + $items_count = (int) geodir_location_imex_count_neighbourhoods(); |
|
| 3662 | 3662 | |
| 3663 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3664 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3665 | - $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3666 | - $percentage = min( $percentage, 100 ); |
|
| 3663 | + if (isset($_REQUEST['_st'])) {
|
|
| 3664 | + $line_count = (int) geodir_import_export_line_count($file_path_temp); |
|
| 3665 | + $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0; |
|
| 3666 | + $percentage = min($percentage, 100); |
|
| 3667 | 3667 | |
| 3668 | 3668 | $json['percentage'] = $percentage; |
| 3669 | - wp_send_json( $json ); |
|
| 3669 | + wp_send_json($json); |
|
| 3670 | 3670 | } else {
|
| 3671 | 3671 | $chunk_file_paths = array(); |
| 3672 | 3672 | |
| 3673 | - if ( !$items_count > 0 ) {
|
|
| 3674 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3673 | + if (!$items_count > 0) {
|
|
| 3674 | + $json['error'] = __('No records to export.', 'geodirectory');
|
|
| 3675 | 3675 | } else {
|
| 3676 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3677 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3676 | + $chunk_per_page = min($chunk_per_page, $items_count); |
|
| 3677 | + $chunk_total_pages = ceil($items_count / $chunk_per_page); |
|
| 3678 | 3678 | |
| 3679 | 3679 | $j = $chunk_page_no; |
| 3680 | - $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j ); |
|
| 3680 | + $chunk_save_items = geodir_location_imex_neighbourhoods_data($chunk_per_page, $j); |
|
| 3681 | 3681 | |
| 3682 | 3682 | $per_page = 500; |
| 3683 | - $per_page = min( $per_page, $chunk_per_page ); |
|
| 3684 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3683 | + $per_page = min($per_page, $chunk_per_page); |
|
| 3684 | + $total_pages = ceil($chunk_per_page / $per_page); |
|
| 3685 | 3685 | |
| 3686 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3687 | - $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3686 | + for ($i = 0; $i <= $total_pages; $i++) {
|
|
| 3687 | + $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page); |
|
| 3688 | 3688 | |
| 3689 | 3689 | $clear = $i == 0 ? true : false; |
| 3690 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3690 | + geodir_save_csv_data($file_path_temp, $save_items, $clear); |
|
| 3691 | 3691 | } |
| 3692 | 3692 | |
| 3693 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3694 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3695 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3696 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3697 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3693 | + if ($wp_filesystem->exists($file_path_temp)) {
|
|
| 3694 | + $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : ''; |
|
| 3695 | + $chunk_file_name = $file_name.$chunk_page_no.'.csv'; |
|
| 3696 | + $file_path = $csv_file_dir.'/'.$chunk_file_name; |
|
| 3697 | + $wp_filesystem->move($file_path_temp, $file_path, true); |
|
| 3698 | 3698 | |
| 3699 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3700 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3699 | + $file_url = $file_url_base.$chunk_file_name; |
|
| 3700 | + $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3701 | 3701 | } |
| 3702 | 3702 | |
| 3703 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3703 | + if (!empty($chunk_file_paths)) {
|
|
| 3704 | 3704 | $json['total'] = $items_count; |
| 3705 | 3705 | $json['files'] = $chunk_file_paths; |
| 3706 | 3706 | } else {
|
| 3707 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3707 | + $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');
|
|
| 3708 | 3708 | } |
| 3709 | 3709 | } |
| 3710 | - wp_send_json( $json ); |
|
| 3710 | + wp_send_json($json); |
|
| 3711 | 3711 | } |
| 3712 | 3712 | } |
| 3713 | 3713 | break; |
@@ -3724,34 +3724,34 @@ discard block |
||
| 3724 | 3724 | } |
| 3725 | 3725 | // WPML |
| 3726 | 3726 | |
| 3727 | - ini_set( 'auto_detect_line_endings', true ); |
|
| 3727 | + ini_set('auto_detect_line_endings', true);
|
|
| 3728 | 3728 | |
| 3729 | 3729 | $uploads = wp_upload_dir(); |
| 3730 | 3730 | $uploads_dir = $uploads['path']; |
| 3731 | 3731 | $uploads_subdir = $uploads['subdir']; |
| 3732 | 3732 | |
| 3733 | - $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL; |
|
| 3734 | - $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip'; |
|
| 3733 | + $csv_file = isset($_POST['_file']) ? $_POST['_file'] : NULL; |
|
| 3734 | + $import_choice = isset($_REQUEST['_ch']) ? $_REQUEST['_ch'] : 'skip'; |
|
| 3735 | 3735 | |
| 3736 | - $csv_file_arr = explode( '/', $csv_file ); |
|
| 3737 | - $csv_filename = end( $csv_file_arr ); |
|
| 3738 | - $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename; |
|
| 3736 | + $csv_file_arr = explode('/', $csv_file);
|
|
| 3737 | + $csv_filename = end($csv_file_arr); |
|
| 3738 | + $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$csv_filename; |
|
| 3739 | 3739 | |
| 3740 | 3740 | $json['file'] = $csv_file; |
| 3741 | - $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' ); |
|
| 3741 | + $json['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
|
|
| 3742 | 3742 | $file = array(); |
| 3743 | 3743 | |
| 3744 | - if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {
|
|
| 3745 | - $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename ); |
|
| 3744 | + if ($csv_file && $wp_filesystem->is_file($target_path) && $wp_filesystem->exists($target_path)) {
|
|
| 3745 | + $wp_filetype = wp_check_filetype_and_ext($target_path, $csv_filename); |
|
| 3746 | 3746 | |
| 3747 | 3747 | if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
| 3748 | 3748 | $json['error'] = NULL; |
| 3749 | 3749 | |
| 3750 | 3750 | $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line |
| 3751 | 3751 | setlocale(LC_ALL, 'en_US.UTF-8'); |
| 3752 | - if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {
|
|
| 3753 | - while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {
|
|
| 3754 | - if ( !empty( $data ) ) {
|
|
| 3752 | + if (($handle = fopen($target_path, "r")) !== FALSE) {
|
|
| 3753 | + while (($data = fgetcsv($handle, 100000, ",")) !== FALSE) {
|
|
| 3754 | + if (!empty($data)) {
|
|
| 3755 | 3755 | $file[] = $data; |
| 3756 | 3756 | } |
| 3757 | 3757 | } |
@@ -3765,19 +3765,19 @@ discard block |
||
| 3765 | 3765 | $json['error'] = __('No data found in csv file.', 'geodirectory');
|
| 3766 | 3766 | } |
| 3767 | 3767 | } else {
|
| 3768 | - wp_send_json( $json ); |
|
| 3768 | + wp_send_json($json); |
|
| 3769 | 3769 | } |
| 3770 | 3770 | } else {
|
| 3771 | - wp_send_json( $json ); |
|
| 3771 | + wp_send_json($json); |
|
| 3772 | 3772 | } |
| 3773 | 3773 | |
| 3774 | - if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
|
|
| 3775 | - wp_send_json( $json ); |
|
| 3774 | + if ($task == 'prepare_import' || !empty($json['error'])) {
|
|
| 3775 | + wp_send_json($json); |
|
| 3776 | 3776 | } |
| 3777 | 3777 | |
| 3778 | 3778 | $total = $json['rows']; |
| 3779 | - $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1; |
|
| 3780 | - $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0; |
|
| 3779 | + $limit = isset($_POST['limit']) ? (int) $_POST['limit'] : 1; |
|
| 3780 | + $processed = isset($_POST['processed']) ? (int) $_POST['processed'] : 0; |
|
| 3781 | 3781 | |
| 3782 | 3782 | $count = $limit; |
| 3783 | 3783 | |
@@ -3802,13 +3802,13 @@ discard block |
||
| 3802 | 3802 | |
| 3803 | 3803 | $post_types = geodir_get_posttypes(); |
| 3804 | 3804 | |
| 3805 | - if ( $task == 'import_cat' ) {
|
|
| 3805 | + if ($task == 'import_cat') {
|
|
| 3806 | 3806 | if (!empty($file)) {
|
| 3807 | 3807 | $columns = isset($file[0]) ? $file[0] : NULL; |
| 3808 | 3808 | |
| 3809 | 3809 | if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
| 3810 | 3810 | $json['error'] = CSV_INVAILD_FILE; |
| 3811 | - wp_send_json( $json ); |
|
| 3811 | + wp_send_json($json); |
|
| 3812 | 3812 | exit; |
| 3813 | 3813 | } |
| 3814 | 3814 | |
@@ -3819,7 +3819,7 @@ discard block |
||
| 3819 | 3819 | |
| 3820 | 3820 | if (isset($file[$index])) {
|
| 3821 | 3821 | $row = $file[$index]; |
| 3822 | - $row = array_map( 'trim', $row ); |
|
| 3822 | + $row = array_map('trim', $row);
|
|
| 3823 | 3823 | //$row = array_map( 'utf8_encode', $row ); |
| 3824 | 3824 | |
| 3825 | 3825 | $cat_id = ''; |
@@ -3836,42 +3836,42 @@ discard block |
||
| 3836 | 3836 | $cat_id_original = ''; |
| 3837 | 3837 | |
| 3838 | 3838 | $c = 0; |
| 3839 | - foreach ($columns as $column ) {
|
|
| 3840 | - if ( $column == 'cat_id' ) {
|
|
| 3841 | - $cat_id = (int)$row[$c]; |
|
| 3842 | - } else if ( $column == 'cat_name' ) {
|
|
| 3839 | + foreach ($columns as $column) {
|
|
| 3840 | + if ($column == 'cat_id') {
|
|
| 3841 | + $cat_id = (int) $row[$c]; |
|
| 3842 | + } else if ($column == 'cat_name') {
|
|
| 3843 | 3843 | $cat_name = $row[$c]; |
| 3844 | - } else if ( $column == 'cat_slug' ) {
|
|
| 3844 | + } else if ($column == 'cat_slug') {
|
|
| 3845 | 3845 | $cat_slug = $row[$c]; |
| 3846 | - } else if ( $column == 'cat_posttype' ) {
|
|
| 3846 | + } else if ($column == 'cat_posttype') {
|
|
| 3847 | 3847 | $cat_posttype = $row[$c]; |
| 3848 | - } else if ( $column == 'cat_parent' ) {
|
|
| 3848 | + } else if ($column == 'cat_parent') {
|
|
| 3849 | 3849 | $cat_parent = trim($row[$c]); |
| 3850 | - } else if ( $column == 'cat_schema' && $row[$c] != '' ) {
|
|
| 3850 | + } else if ($column == 'cat_schema' && $row[$c] != '') {
|
|
| 3851 | 3851 | $cat_schema = $row[$c]; |
| 3852 | - } else if ( $column == 'cat_description' ) {
|
|
| 3852 | + } else if ($column == 'cat_description') {
|
|
| 3853 | 3853 | $cat_description = $row[$c]; |
| 3854 | - } else if ( $column == 'cat_top_description' ) {
|
|
| 3854 | + } else if ($column == 'cat_top_description') {
|
|
| 3855 | 3855 | $cat_top_description = $row[$c]; |
| 3856 | - } else if ( $column == 'cat_image' ) {
|
|
| 3856 | + } else if ($column == 'cat_image') {
|
|
| 3857 | 3857 | $cat_image = $row[$c]; |
| 3858 | - } else if ( $column == 'cat_icon' ) {
|
|
| 3858 | + } else if ($column == 'cat_icon') {
|
|
| 3859 | 3859 | $cat_icon = $row[$c]; |
| 3860 | 3860 | } |
| 3861 | 3861 | // WPML |
| 3862 | - if ( $is_wpml ) {
|
|
| 3863 | - if ( $column == 'cat_language' ) {
|
|
| 3864 | - $cat_language = geodir_strtolower( trim( $row[$c] ) ); |
|
| 3865 | - } else if ( $column == 'cat_id_original' ) {
|
|
| 3866 | - $cat_id_original = (int)$row[$c]; |
|
| 3862 | + if ($is_wpml) {
|
|
| 3863 | + if ($column == 'cat_language') {
|
|
| 3864 | + $cat_language = geodir_strtolower(trim($row[$c])); |
|
| 3865 | + } else if ($column == 'cat_id_original') {
|
|
| 3866 | + $cat_id_original = (int) $row[$c]; |
|
| 3867 | 3867 | } |
| 3868 | 3868 | } |
| 3869 | 3869 | // WPML |
| 3870 | 3870 | $c++; |
| 3871 | 3871 | } |
| 3872 | 3872 | |
| 3873 | - if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {
|
|
| 3874 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 3873 | + if ($cat_name == '' || !in_array($cat_posttype, $post_types)) {
|
|
| 3874 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));
|
|
| 3875 | 3875 | |
| 3876 | 3876 | $invalid++; |
| 3877 | 3877 | continue; |
@@ -3889,24 +3889,24 @@ discard block |
||
| 3889 | 3889 | $term_data['description'] = $cat_description; |
| 3890 | 3890 | $term_data['cat_schema'] = $cat_schema; |
| 3891 | 3891 | $term_data['top_description'] = $cat_top_description; |
| 3892 | - $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : ''; |
|
| 3893 | - $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : ''; |
|
| 3892 | + $term_data['image'] = $cat_image != '' ? basename($cat_image) : ''; |
|
| 3893 | + $term_data['icon'] = $cat_icon != '' ? basename($cat_icon) : ''; |
|
| 3894 | 3894 | |
| 3895 | 3895 | //$term_data = array_map( 'utf8_encode', $term_data ); |
| 3896 | 3896 | |
| 3897 | - $taxonomy = $cat_posttype . 'category'; |
|
| 3897 | + $taxonomy = $cat_posttype.'category'; |
|
| 3898 | 3898 | |
| 3899 | 3899 | $term_data['taxonomy'] = $taxonomy; |
| 3900 | 3900 | |
| 3901 | 3901 | $term_parent_id = 0; |
| 3902 | - if ($cat_parent != "" || (int)$cat_parent > 0) {
|
|
| 3902 | + if ($cat_parent != "" || (int) $cat_parent > 0) {
|
|
| 3903 | 3903 | $term_parent = ''; |
| 3904 | 3904 | |
| 3905 | - if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
|
|
| 3905 | + if ($term_parent = get_term_by('name', $cat_parent, $taxonomy)) {
|
|
| 3906 | 3906 | // |
| 3907 | - } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
|
|
| 3907 | + } else if ($term_parent = get_term_by('slug', $cat_parent, $taxonomy)) {
|
|
| 3908 | 3908 | // |
| 3909 | - } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
|
|
| 3909 | + } else if ($term_parent = get_term_by('id', $cat_parent, $taxonomy)) {
|
|
| 3910 | 3910 | // |
| 3911 | 3911 | } else {
|
| 3912 | 3912 | $term_parent_data = array(); |
@@ -3914,104 +3914,104 @@ discard block |
||
| 3914 | 3914 | //$term_parent_data = array_map( 'utf8_encode', $term_parent_data ); |
| 3915 | 3915 | $term_parent_data['taxonomy'] = $taxonomy; |
| 3916 | 3916 | |
| 3917 | - $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data ); |
|
| 3917 | + $term_parent_id = (int) geodir_imex_insert_term($taxonomy, $term_parent_data); |
|
| 3918 | 3918 | } |
| 3919 | 3919 | |
| 3920 | - if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
|
|
| 3921 | - $term_parent_id = (int)$term_parent->term_id; |
|
| 3920 | + if (!empty($term_parent) && !is_wp_error($term_parent)) {
|
|
| 3921 | + $term_parent_id = (int) $term_parent->term_id; |
|
| 3922 | 3922 | } |
| 3923 | 3923 | } |
| 3924 | - $term_data['parent'] = (int)$term_parent_id; |
|
| 3924 | + $term_data['parent'] = (int) $term_parent_id; |
|
| 3925 | 3925 | |
| 3926 | 3926 | $term_id = NULL; |
| 3927 | - if ( $import_choice == 'update' ) {
|
|
| 3928 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3927 | + if ($import_choice == 'update') {
|
|
| 3928 | + if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {
|
|
| 3929 | 3929 | $term_data['term_id'] = $term['term_id']; |
| 3930 | 3930 | |
| 3931 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3931 | + if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {
|
|
| 3932 | 3932 | $updated++; |
| 3933 | 3933 | } else {
|
| 3934 | 3934 | $invalid++; |
| 3935 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3935 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));
|
|
| 3936 | 3936 | } |
| 3937 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3937 | + } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {
|
|
| 3938 | 3938 | $term_data['term_id'] = $term['term_id']; |
| 3939 | 3939 | |
| 3940 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3940 | + if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {
|
|
| 3941 | 3941 | $updated++; |
| 3942 | 3942 | } else {
|
| 3943 | 3943 | $invalid++; |
| 3944 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3944 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));
|
|
| 3945 | 3945 | } |
| 3946 | 3946 | } else {
|
| 3947 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3947 | + if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {
|
|
| 3948 | 3948 | $created++; |
| 3949 | 3949 | } else {
|
| 3950 | 3950 | $invalid++; |
| 3951 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3951 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));
|
|
| 3952 | 3952 | } |
| 3953 | 3953 | } |
| 3954 | - } else if ( $import_choice == 'skip' ) {
|
|
| 3955 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3954 | + } else if ($import_choice == 'skip') {
|
|
| 3955 | + if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {
|
|
| 3956 | 3956 | $skipped++; |
| 3957 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3957 | + } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {
|
|
| 3958 | 3958 | $skipped++; |
| 3959 | 3959 | } else {
|
| 3960 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3960 | + if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {
|
|
| 3961 | 3961 | $created++; |
| 3962 | 3962 | } else {
|
| 3963 | 3963 | $invalid++; |
| 3964 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3964 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));
|
|
| 3965 | 3965 | } |
| 3966 | 3966 | } |
| 3967 | 3967 | } else {
|
| 3968 | 3968 | $invalid++; |
| 3969 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3969 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));
|
|
| 3970 | 3970 | } |
| 3971 | 3971 | |
| 3972 | - if ( $term_id ) {
|
|
| 3972 | + if ($term_id) {
|
|
| 3973 | 3973 | // WPML |
| 3974 | 3974 | if ($is_wpml && geodir_wpml_is_taxonomy_translated($taxonomy) && $cat_id_original > 0 && $cat_language != '') {
|
| 3975 | - $wpml_element_type = 'tax_' . $taxonomy; |
|
| 3976 | - $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type ); |
|
| 3975 | + $wpml_element_type = 'tax_'.$taxonomy; |
|
| 3976 | + $source_language = geodir_get_language_for_element($cat_id_original, $wpml_element_type); |
|
| 3977 | 3977 | $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
| 3978 | 3978 | |
| 3979 | - $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type ); |
|
| 3979 | + $trid = $sitepress->get_element_trid($cat_id_original, $wpml_element_type); |
|
| 3980 | 3980 | |
| 3981 | - $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language ); |
|
| 3981 | + $sitepress->set_element_language_details($term_id, $wpml_element_type, $trid, $cat_language, $source_language); |
|
| 3982 | 3982 | } |
| 3983 | 3983 | // WPML |
| 3984 | 3984 | |
| 3985 | - if ( isset( $term_data['top_description'] ) ) {
|
|
| 3986 | - geodir_update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype ); |
|
| 3985 | + if (isset($term_data['top_description'])) {
|
|
| 3986 | + geodir_update_tax_meta($term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype); |
|
| 3987 | 3987 | } |
| 3988 | 3988 | |
| 3989 | - if ( isset( $term_data['cat_schema'] ) ) {
|
|
| 3990 | - geodir_update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype ); |
|
| 3989 | + if (isset($term_data['cat_schema'])) {
|
|
| 3990 | + geodir_update_tax_meta($term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype); |
|
| 3991 | 3991 | } |
| 3992 | 3992 | |
| 3993 | 3993 | $attachment = false; |
| 3994 | - if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {
|
|
| 3995 | - $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype ); |
|
| 3996 | - $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
| 3994 | + if (isset($term_data['image']) && $term_data['image'] != '') {
|
|
| 3995 | + $cat_image = geodir_get_default_catimage($term_id, $cat_posttype); |
|
| 3996 | + $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : ''; |
|
| 3997 | 3997 | |
| 3998 | - if ( basename($cat_image) != $term_data['image'] ) {
|
|
| 3998 | + if (basename($cat_image) != $term_data['image']) {
|
|
| 3999 | 3999 | $attachment = true; |
| 4000 | - geodir_update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype ); |
|
| 4000 | + geodir_update_tax_meta($term_id, 'ct_cat_default_img', array('id' => 'image', 'src' => $uploads['url'].'/'.$term_data['image']), $cat_posttype);
|
|
| 4001 | 4001 | } |
| 4002 | 4002 | } |
| 4003 | 4003 | |
| 4004 | - if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {
|
|
| 4005 | - $cat_icon = geodir_get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype ); |
|
| 4006 | - $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
| 4004 | + if (isset($term_data['icon']) && $term_data['icon'] != '') {
|
|
| 4005 | + $cat_icon = geodir_get_tax_meta($term_id, 'ct_cat_icon', false, $cat_posttype); |
|
| 4006 | + $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : ''; |
|
| 4007 | 4007 | |
| 4008 | - if ( basename($cat_icon) != $term_data['icon'] ) {
|
|
| 4008 | + if (basename($cat_icon) != $term_data['icon']) {
|
|
| 4009 | 4009 | $attachment = true; |
| 4010 | - geodir_update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype ); |
|
| 4010 | + geodir_update_tax_meta($term_id, 'ct_cat_icon', array('id' => 'icon', 'src' => $uploads['url'].'/'.$term_data['icon']), $cat_posttype);
|
|
| 4011 | 4011 | } |
| 4012 | 4012 | } |
| 4013 | 4013 | |
| 4014 | - if ( $attachment ) {
|
|
| 4014 | + if ($attachment) {
|
|
| 4015 | 4015 | $images++; |
| 4016 | 4016 | } |
| 4017 | 4017 | } |
@@ -4033,35 +4033,35 @@ discard block |
||
| 4033 | 4033 | $json['invalid'] = $invalid; |
| 4034 | 4034 | $json['images'] = $images; |
| 4035 | 4035 | |
| 4036 | - wp_send_json( $json ); |
|
| 4036 | + wp_send_json($json); |
|
| 4037 | 4037 | exit; |
| 4038 | - } else if ( $task == 'import_post' ) {
|
|
| 4039 | - $xtimings['###1'] = microtime(true)-$xstart; |
|
| 4038 | + } else if ($task == 'import_post') {
|
|
| 4039 | + $xtimings['###1'] = microtime(true) - $xstart; |
|
| 4040 | 4040 | //run some stuff to make the import quicker |
| 4041 | - wp_defer_term_counting( true ); |
|
| 4042 | - wp_defer_comment_counting( true ); |
|
| 4043 | - $wpdb->query( 'SET autocommit = 0;' ); |
|
| 4041 | + wp_defer_term_counting(true); |
|
| 4042 | + wp_defer_comment_counting(true); |
|
| 4043 | + $wpdb->query('SET autocommit = 0;');
|
|
| 4044 | 4044 | // |
| 4045 | 4045 | // remove_all_actions('publish_post');
|
| 4046 | 4046 | // remove_all_actions('transition_post_status');
|
| 4047 | 4047 | // remove_all_actions('publish_future_post');
|
| 4048 | 4048 | |
| 4049 | 4049 | if (!empty($file)) {
|
| 4050 | - $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 4050 | + $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 4051 | 4051 | $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
| 4052 | 4052 | $default_status = 'publish'; |
| 4053 | - $current_date = date_i18n( 'Y-m-d', time() ); |
|
| 4053 | + $current_date = date_i18n('Y-m-d', time());
|
|
| 4054 | 4054 | |
| 4055 | 4055 | $columns = isset($file[0]) ? $file[0] : NULL; |
| 4056 | 4056 | |
| 4057 | 4057 | if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
| 4058 | 4058 | $json['error'] = CSV_INVAILD_FILE; |
| 4059 | - wp_send_json( $json ); |
|
| 4059 | + wp_send_json($json); |
|
| 4060 | 4060 | exit; |
| 4061 | 4061 | } |
| 4062 | - $xtimings['###2'] = microtime(true)-$xstart; |
|
| 4062 | + $xtimings['###2'] = microtime(true) - $xstart; |
|
| 4063 | 4063 | $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
|
| 4064 | - $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' ); |
|
| 4064 | + $wp_chars_error = __('(check & remove if any invalid characters used in data)', 'geodirectory');
|
|
| 4065 | 4065 | $processed_actual = 0; |
| 4066 | 4066 | for ($i = 1; $i <= $limit; $i++) {
|
| 4067 | 4067 | $index = $processed + $i; |
@@ -4070,9 +4070,9 @@ discard block |
||
| 4070 | 4070 | if (isset($file[$index])) {
|
| 4071 | 4071 | $processed_actual++; |
| 4072 | 4072 | $row = $file[$index]; |
| 4073 | - $row = array_map( 'trim', $row ); |
|
| 4073 | + $row = array_map('trim', $row);
|
|
| 4074 | 4074 | //$row = array_map( 'utf8_encode', $row ); |
| 4075 | - $row = array_map( 'addslashes_gpc', $row ); |
|
| 4075 | + $row = array_map('addslashes_gpc', $row);
|
|
| 4076 | 4076 | |
| 4077 | 4077 | $post_id = ''; |
| 4078 | 4078 | $post_title = ''; |
@@ -4112,82 +4112,82 @@ discard block |
||
| 4112 | 4112 | $original_post_id = ''; |
| 4113 | 4113 | |
| 4114 | 4114 | $c = 0; |
| 4115 | - foreach ($columns as $column ) {
|
|
| 4115 | + foreach ($columns as $column) {
|
|
| 4116 | 4116 | $gd_post[$column] = $row[$c]; |
| 4117 | 4117 | |
| 4118 | - if ( $column == 'post_id' ) {
|
|
| 4118 | + if ($column == 'post_id') {
|
|
| 4119 | 4119 | $post_id = $row[$c]; |
| 4120 | - } else if ( $column == 'post_title' ) {
|
|
| 4120 | + } else if ($column == 'post_title') {
|
|
| 4121 | 4121 | $post_title = sanitize_text_field($row[$c]); |
| 4122 | - } else if ( $column == 'post_author' ) {
|
|
| 4122 | + } else if ($column == 'post_author') {
|
|
| 4123 | 4123 | $post_author = $row[$c]; |
| 4124 | - } else if ( $column == 'post_date' ) {
|
|
| 4124 | + } else if ($column == 'post_date') {
|
|
| 4125 | 4125 | $post_date = $row[$c]; |
| 4126 | - } else if ( $column == 'post_content' ) {
|
|
| 4126 | + } else if ($column == 'post_content') {
|
|
| 4127 | 4127 | $post_content = $row[$c]; |
| 4128 | - } else if ( $column == 'post_category' && $row[$c] != '' ) {
|
|
| 4129 | - $post_category_arr = explode( ',', $row[$c] ); |
|
| 4130 | - } else if ( $column == 'default_category' ) {
|
|
| 4128 | + } else if ($column == 'post_category' && $row[$c] != '') {
|
|
| 4129 | + $post_category_arr = explode(',', $row[$c]);
|
|
| 4130 | + } else if ($column == 'default_category') {
|
|
| 4131 | 4131 | $default_category = wp_kses_normalize_entities($row[$c]); |
| 4132 | - } else if ( $column == 'post_tags' && $row[$c] != '' ) {
|
|
| 4133 | - $post_tags = explode( ',', sanitize_text_field($row[$c]) ); |
|
| 4134 | - } else if ( $column == 'post_type' ) {
|
|
| 4132 | + } else if ($column == 'post_tags' && $row[$c] != '') {
|
|
| 4133 | + $post_tags = explode(',', sanitize_text_field($row[$c]));
|
|
| 4134 | + } else if ($column == 'post_type') {
|
|
| 4135 | 4135 | $post_type = $row[$c]; |
| 4136 | - } else if ( $column == 'post_status' ) {
|
|
| 4137 | - $post_status = sanitize_key( $row[$c] ); |
|
| 4138 | - } else if ( $column == 'is_featured' ) {
|
|
| 4139 | - $is_featured = (int)$row[$c]; |
|
| 4140 | - } else if ( $column == 'geodir_video' ) {
|
|
| 4136 | + } else if ($column == 'post_status') {
|
|
| 4137 | + $post_status = sanitize_key($row[$c]); |
|
| 4138 | + } else if ($column == 'is_featured') {
|
|
| 4139 | + $is_featured = (int) $row[$c]; |
|
| 4140 | + } else if ($column == 'geodir_video') {
|
|
| 4141 | 4141 | $geodir_video = $row[$c]; |
| 4142 | - } else if ( $column == 'post_address' ) {
|
|
| 4142 | + } else if ($column == 'post_address') {
|
|
| 4143 | 4143 | $post_address = sanitize_text_field($row[$c]); |
| 4144 | - } else if ( $column == 'post_city' ) {
|
|
| 4144 | + } else if ($column == 'post_city') {
|
|
| 4145 | 4145 | $post_city = sanitize_text_field($row[$c]); |
| 4146 | - } else if ( $column == 'post_region' ) {
|
|
| 4146 | + } else if ($column == 'post_region') {
|
|
| 4147 | 4147 | $post_region = sanitize_text_field($row[$c]); |
| 4148 | - } else if ( $column == 'post_country' ) {
|
|
| 4148 | + } else if ($column == 'post_country') {
|
|
| 4149 | 4149 | $post_country = sanitize_text_field($row[$c]); |
| 4150 | - } else if ( $column == 'post_zip' ) {
|
|
| 4150 | + } else if ($column == 'post_zip') {
|
|
| 4151 | 4151 | $post_zip = sanitize_text_field($row[$c]); |
| 4152 | - } else if ( $column == 'post_latitude' ) {
|
|
| 4152 | + } else if ($column == 'post_latitude') {
|
|
| 4153 | 4153 | $post_latitude = sanitize_text_field($row[$c]); |
| 4154 | - } else if ( $column == 'post_longitude' ) {
|
|
| 4154 | + } else if ($column == 'post_longitude') {
|
|
| 4155 | 4155 | $post_longitude = sanitize_text_field($row[$c]); |
| 4156 | - } else if ( $column == 'post_neighbourhood' ) {
|
|
| 4156 | + } else if ($column == 'post_neighbourhood') {
|
|
| 4157 | 4157 | $post_neighbourhood = sanitize_text_field($row[$c]); |
| 4158 | 4158 | unset($gd_post[$column]); |
| 4159 | - } else if ( $column == 'neighbourhood_latitude' ) {
|
|
| 4159 | + } else if ($column == 'neighbourhood_latitude') {
|
|
| 4160 | 4160 | $neighbourhood_latitude = sanitize_text_field($row[$c]); |
| 4161 | - } else if ( $column == 'neighbourhood_longitude' ) {
|
|
| 4161 | + } else if ($column == 'neighbourhood_longitude') {
|
|
| 4162 | 4162 | $neighbourhood_longitude = sanitize_text_field($row[$c]); |
| 4163 | - } else if ( $column == 'geodir_timing' ) {
|
|
| 4163 | + } else if ($column == 'geodir_timing') {
|
|
| 4164 | 4164 | $geodir_timing = sanitize_text_field($row[$c]); |
| 4165 | - } else if ( $column == 'geodir_contact' ) {
|
|
| 4165 | + } else if ($column == 'geodir_contact') {
|
|
| 4166 | 4166 | $geodir_contact = sanitize_text_field($row[$c]); |
| 4167 | - } else if ( $column == 'geodir_email' ) {
|
|
| 4167 | + } else if ($column == 'geodir_email') {
|
|
| 4168 | 4168 | $geodir_email = sanitize_email($row[$c]); |
| 4169 | - } else if ( $column == 'geodir_website' ) {
|
|
| 4169 | + } else if ($column == 'geodir_website') {
|
|
| 4170 | 4170 | $geodir_website = sanitize_text_field($row[$c]); |
| 4171 | - } else if ( $column == 'geodir_twitter' ) {
|
|
| 4171 | + } else if ($column == 'geodir_twitter') {
|
|
| 4172 | 4172 | $geodir_twitter = sanitize_text_field($row[$c]); |
| 4173 | - } else if ( $column == 'geodir_facebook' ) {
|
|
| 4173 | + } else if ($column == 'geodir_facebook') {
|
|
| 4174 | 4174 | $geodir_facebook = sanitize_text_field($row[$c]); |
| 4175 | - } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
|
|
| 4175 | + } else if ($column == 'IMAGE' && !empty($row[$c]) && $row[$c] != '') {
|
|
| 4176 | 4176 | $post_images[] = $row[$c]; |
| 4177 | - } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
|
|
| 4178 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) ); |
|
| 4179 | - } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
|
|
| 4177 | + } else if ($column == 'alive_days' && (int) $row[$c] > 0) {
|
|
| 4178 | + $expire_date = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $row[$c].' days'));
|
|
| 4179 | + } else if ($column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never') {
|
|
| 4180 | 4180 | $row[$c] = str_replace('/', '-', $row[$c]);
|
| 4181 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) ); |
|
| 4182 | - } else if ( strpos( $column, 'linked_' ) === 0 ) {
|
|
| 4183 | - $geodir_link_business = (int)$row[$c]; |
|
| 4181 | + $expire_date = date_i18n('Y-m-d', strtotime($row[$c]));
|
|
| 4182 | + } else if (strpos($column, 'linked_') === 0) {
|
|
| 4183 | + $geodir_link_business = (int) $row[$c]; |
|
| 4184 | 4184 | } |
| 4185 | 4185 | // WPML |
| 4186 | 4186 | if ($is_wpml) {
|
| 4187 | 4187 | if ($column == 'language') {
|
| 4188 | 4188 | $language = geodir_strtolower(trim($row[$c])); |
| 4189 | 4189 | } else if ($column == 'original_post_id') {
|
| 4190 | - $original_post_id = (int)$row[$c]; |
|
| 4190 | + $original_post_id = (int) $row[$c]; |
|
| 4191 | 4191 | } |
| 4192 | 4192 | } |
| 4193 | 4193 | // WPML |
@@ -4195,7 +4195,7 @@ discard block |
||
| 4195 | 4195 | } |
| 4196 | 4196 | // listing claimed or not |
| 4197 | 4197 | if ($is_claim_active && isset($gd_post['claimed'])) {
|
| 4198 | - $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4198 | + $gd_post['claimed'] = (int) $gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4199 | 4199 | } |
| 4200 | 4200 | |
| 4201 | 4201 | // WPML |
@@ -4206,43 +4206,43 @@ discard block |
||
| 4206 | 4206 | |
| 4207 | 4207 | $gd_post['IMAGE'] = $post_images; |
| 4208 | 4208 | |
| 4209 | - $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 4210 | - $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 4209 | + $post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status; |
|
| 4210 | + $post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status; |
|
| 4211 | 4211 | |
| 4212 | 4212 | $valid = true; |
| 4213 | 4213 | |
| 4214 | - if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
|
|
| 4214 | + if ($post_title == '' || !in_array($post_type, $post_types)) {
|
|
| 4215 | 4215 | $invalid++; |
| 4216 | 4216 | $valid = false; |
| 4217 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 4217 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));
|
|
| 4218 | 4218 | } |
| 4219 | - $xtimings['###3'] = microtime(true)-$xstart; |
|
| 4220 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 4221 | - if ( $location_allowed ) {
|
|
| 4219 | + $xtimings['###3'] = microtime(true) - $xstart; |
|
| 4220 | + $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
|
|
| 4221 | + if ($location_allowed) {
|
|
| 4222 | 4222 | $location_result = geodir_get_default_location(); |
| 4223 | - if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
|
|
| 4223 | + if ($post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '') {
|
|
| 4224 | 4224 | $invalid_addr++; |
| 4225 | 4225 | $valid = false; |
| 4226 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4227 | - } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
|
|
| 4228 | - if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {
|
|
| 4226 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));
|
|
| 4227 | + } else if (!empty($location_result) && $location_result->location_id == 0) {
|
|
| 4228 | + if ((geodir_strtolower($post_city) != geodir_strtolower($location_result->city)) || (geodir_strtolower($post_region) != geodir_strtolower($location_result->region)) || (geodir_strtolower($post_country) != geodir_strtolower($location_result->country))) {
|
|
| 4229 | 4229 | $invalid_addr++; |
| 4230 | 4230 | $valid = false; |
| 4231 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4231 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));
|
|
| 4232 | 4232 | } else {
|
| 4233 | 4233 | if (!$location_manager) {
|
| 4234 | - $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated. |
|
| 4234 | + $gd_post['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // Set the default location when location manager not activated. |
|
| 4235 | 4235 | } |
| 4236 | 4236 | } |
| 4237 | 4237 | } |
| 4238 | 4238 | } |
| 4239 | - $xtimings['###4'] = microtime(true)-$xstart; |
|
| 4240 | - if ( !$valid ) {
|
|
| 4239 | + $xtimings['###4'] = microtime(true) - $xstart; |
|
| 4240 | + if (!$valid) {
|
|
| 4241 | 4241 | continue; |
| 4242 | 4242 | } |
| 4243 | 4243 | |
| 4244 | - $cat_taxonomy = $post_type . 'category'; |
|
| 4245 | - $tags_taxonomy = $post_type . '_tags'; |
|
| 4244 | + $cat_taxonomy = $post_type.'category'; |
|
| 4245 | + $tags_taxonomy = $post_type.'_tags'; |
|
| 4246 | 4246 | |
| 4247 | 4247 | if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
|
| 4248 | 4248 | $post_category_arr = array_merge(array($default_category), $post_category_arr); |
@@ -4250,29 +4250,29 @@ discard block |
||
| 4250 | 4250 | |
| 4251 | 4251 | $post_category = array(); |
| 4252 | 4252 | $default_category_id = NULL; |
| 4253 | - if ( !empty( $post_category_arr ) ) {
|
|
| 4254 | - foreach ( $post_category_arr as $value ) {
|
|
| 4255 | - $category_name = wp_kses_normalize_entities( trim( $value ) ); |
|
| 4253 | + if (!empty($post_category_arr)) {
|
|
| 4254 | + foreach ($post_category_arr as $value) {
|
|
| 4255 | + $category_name = wp_kses_normalize_entities(trim($value)); |
|
| 4256 | 4256 | |
| 4257 | - if ( $category_name != '' ) {
|
|
| 4257 | + if ($category_name != '') {
|
|
| 4258 | 4258 | $term_category = array(); |
| 4259 | 4259 | |
| 4260 | - if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
|
|
| 4260 | + if ($term = get_term_by('name', $category_name, $cat_taxonomy)) {
|
|
| 4261 | 4261 | $term_category = $term; |
| 4262 | - } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
|
|
| 4262 | + } else if ($term = get_term_by('slug', $category_name, $cat_taxonomy)) {
|
|
| 4263 | 4263 | $term_category = $term; |
| 4264 | 4264 | } else {
|
| 4265 | 4265 | $term_data = array(); |
| 4266 | 4266 | $term_data['name'] = $category_name; |
| 4267 | 4267 | $term_data['taxonomy'] = $cat_taxonomy; |
| 4268 | 4268 | |
| 4269 | - $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data ); |
|
| 4270 | - if ( $term_id ) {
|
|
| 4271 | - $term_category = get_term( $term_id, $cat_taxonomy ); |
|
| 4269 | + $term_id = geodir_imex_insert_term($cat_taxonomy, $term_data); |
|
| 4270 | + if ($term_id) {
|
|
| 4271 | + $term_category = get_term($term_id, $cat_taxonomy); |
|
| 4272 | 4272 | } |
| 4273 | 4273 | } |
| 4274 | 4274 | |
| 4275 | - if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
|
|
| 4275 | + if (!empty($term_category) && !is_wp_error($term_category)) {
|
|
| 4276 | 4276 | $post_category[] = intval($term_category->term_id); |
| 4277 | 4277 | |
| 4278 | 4278 | if ($category_name == $default_category) {
|
@@ -4282,14 +4282,14 @@ discard block |
||
| 4282 | 4282 | } |
| 4283 | 4283 | } |
| 4284 | 4284 | } |
| 4285 | - $xtimings['###5'] = microtime(true)-$xstart; |
|
| 4285 | + $xtimings['###5'] = microtime(true) - $xstart; |
|
| 4286 | 4286 | $save_post = array(); |
| 4287 | 4287 | $save_post['post_title'] = $post_title; |
| 4288 | 4288 | if (!empty($post_date)) {
|
| 4289 | - $post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format. |
|
| 4289 | + $post_date = geodir_date($post_date, 'Y-m-d H:i:s'); // convert to mysql date format. |
|
| 4290 | 4290 | |
| 4291 | 4291 | $save_post['post_date'] = $post_date; |
| 4292 | - $save_post['post_date_gmt'] = get_gmt_from_date( $post_date ); |
|
| 4292 | + $save_post['post_date_gmt'] = get_gmt_from_date($post_date); |
|
| 4293 | 4293 | } |
| 4294 | 4294 | $save_post['post_content'] = $post_content; |
| 4295 | 4295 | $save_post['post_type'] = $post_type; |
@@ -4299,15 +4299,15 @@ discard block |
||
| 4299 | 4299 | $save_post['post_tags'] = $post_tags; |
| 4300 | 4300 | |
| 4301 | 4301 | $saved_post_id = NULL; |
| 4302 | - if ( $import_choice == 'update' ) {
|
|
| 4303 | - $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' ); |
|
| 4302 | + if ($import_choice == 'update') {
|
|
| 4303 | + $gd_wp_error = __('Unable to add listing, please check the listing data.', 'geodirectory');
|
|
| 4304 | 4304 | |
| 4305 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4305 | + if ($post_id > 0 && get_post($post_id)) {
|
|
| 4306 | 4306 | $save_post['ID'] = $post_id; |
| 4307 | 4307 | |
| 4308 | - if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
|
|
| 4309 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4310 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4308 | + if ($saved_post_id = wp_update_post($save_post, true)) {
|
|
| 4309 | + if (is_wp_error($saved_post_id)) {
|
|
| 4310 | + $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error; |
|
| 4311 | 4311 | $saved_post_id = 0; |
| 4312 | 4312 | } else {
|
| 4313 | 4313 | $saved_post_id = $post_id; |
@@ -4315,9 +4315,9 @@ discard block |
||
| 4315 | 4315 | } |
| 4316 | 4316 | } |
| 4317 | 4317 | } else {
|
| 4318 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4319 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4320 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4318 | + if ($saved_post_id = wp_insert_post($save_post, true)) {
|
|
| 4319 | + if (is_wp_error($saved_post_id)) {
|
|
| 4320 | + $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error; |
|
| 4321 | 4321 | $saved_post_id = 0; |
| 4322 | 4322 | } else {
|
| 4323 | 4323 | $created++; |
@@ -4325,19 +4325,19 @@ discard block |
||
| 4325 | 4325 | } |
| 4326 | 4326 | } |
| 4327 | 4327 | |
| 4328 | - if ( !$saved_post_id > 0 ) {
|
|
| 4328 | + if (!$saved_post_id > 0) {
|
|
| 4329 | 4329 | $invalid++; |
| 4330 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error ); |
|
| 4330 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_wp_error); |
|
| 4331 | 4331 | } |
| 4332 | - } else if ( $import_choice == 'skip' ) {
|
|
| 4333 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4332 | + } else if ($import_choice == 'skip') {
|
|
| 4333 | + if ($post_id > 0 && get_post($post_id)) {
|
|
| 4334 | 4334 | $skipped++; |
| 4335 | 4335 | } else {
|
| 4336 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4337 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4336 | + if ($saved_post_id = wp_insert_post($save_post, true)) {
|
|
| 4337 | + if (is_wp_error($saved_post_id)) {
|
|
| 4338 | 4338 | $invalid++; |
| 4339 | 4339 | |
| 4340 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error ); |
|
| 4340 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$saved_post_id->get_error_message().' '.$wp_chars_error); |
|
| 4341 | 4341 | $saved_post_id = 0; |
| 4342 | 4342 | } else {
|
| 4343 | 4343 | $created++; |
@@ -4345,28 +4345,28 @@ discard block |
||
| 4345 | 4345 | } else {
|
| 4346 | 4346 | $invalid++; |
| 4347 | 4347 | |
| 4348 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4348 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error); |
|
| 4349 | 4349 | } |
| 4350 | 4350 | } |
| 4351 | 4351 | } else {
|
| 4352 | 4352 | $invalid++; |
| 4353 | 4353 | |
| 4354 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4354 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error); |
|
| 4355 | 4355 | } |
| 4356 | - $xtimings['###6'] = microtime(true)-$xstart; |
|
| 4357 | - if ( (int)$saved_post_id > 0 ) {
|
|
| 4356 | + $xtimings['###6'] = microtime(true) - $xstart; |
|
| 4357 | + if ((int) $saved_post_id > 0) {
|
|
| 4358 | 4358 | // WPML |
| 4359 | 4359 | if ($is_wpml && geodir_wpml_is_post_type_translated($post_type) && $original_post_id > 0 && $language != '') {
|
| 4360 | - $wpml_post_type = 'post_' . $post_type; |
|
| 4361 | - $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type ); |
|
| 4360 | + $wpml_post_type = 'post_'.$post_type; |
|
| 4361 | + $source_language = geodir_get_language_for_element($original_post_id, $wpml_post_type); |
|
| 4362 | 4362 | $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
| 4363 | 4363 | |
| 4364 | - $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type ); |
|
| 4364 | + $trid = $sitepress->get_element_trid($original_post_id, $wpml_post_type); |
|
| 4365 | 4365 | |
| 4366 | - $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language ); |
|
| 4366 | + $sitepress->set_element_language_details($saved_post_id, $wpml_post_type, $trid, $language, $source_language); |
|
| 4367 | 4367 | } |
| 4368 | 4368 | // WPML |
| 4369 | - $gd_post_info = geodir_get_post_info( $saved_post_id ); |
|
| 4369 | + $gd_post_info = geodir_get_post_info($saved_post_id); |
|
| 4370 | 4370 | |
| 4371 | 4371 | $gd_post['post_id'] = $saved_post_id; |
| 4372 | 4372 | $gd_post['ID'] = $saved_post_id; |
@@ -4378,7 +4378,7 @@ discard block |
||
| 4378 | 4378 | |
| 4379 | 4379 | // post location |
| 4380 | 4380 | $post_location_id = 0; |
| 4381 | - if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
|
|
| 4381 | + if ($location_allowed && !empty($location_result) && $location_result->location_id > 0) {
|
|
| 4382 | 4382 | $gd_post['post_neighbourhood'] = ''; |
| 4383 | 4383 | |
| 4384 | 4384 | $post_location_info = array( |
@@ -4388,7 +4388,7 @@ discard block |
||
| 4388 | 4388 | 'geo_lat' => $post_latitude, |
| 4389 | 4389 | 'geo_lng' => $post_longitude |
| 4390 | 4390 | ); |
| 4391 | - if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
|
|
| 4391 | + if ($location_id = (int) geodir_add_new_location($post_location_info)) {
|
|
| 4392 | 4392 | $post_location_id = $location_id; |
| 4393 | 4393 | } |
| 4394 | 4394 | |
@@ -4430,14 +4430,14 @@ discard block |
||
| 4430 | 4430 | } |
| 4431 | 4431 | |
| 4432 | 4432 | // post package info |
| 4433 | - $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0; |
|
| 4433 | + $package_id = isset($gd_post['package_id']) && !empty($gd_post['package_id']) ? (int) $gd_post['package_id'] : 0; |
|
| 4434 | 4434 | if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
|
| 4435 | 4435 | $package_id = $gd_post_info->package_id; |
| 4436 | 4436 | } |
| 4437 | 4437 | |
| 4438 | 4438 | $package_info = array(); |
| 4439 | 4439 | if ($package_id && function_exists('geodir_get_package_info_by_id')) {
|
| 4440 | - $package_info = (array)geodir_get_package_info_by_id($package_id); |
|
| 4440 | + $package_info = (array) geodir_get_package_info_by_id($package_id); |
|
| 4441 | 4441 | |
| 4442 | 4442 | if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
|
| 4443 | 4443 | $package_info = array(); |
@@ -4445,18 +4445,18 @@ discard block |
||
| 4445 | 4445 | } |
| 4446 | 4446 | |
| 4447 | 4447 | if (empty($package_info)) {
|
| 4448 | - $package_info = (array)geodir_post_package_info( array(), '', $post_type ); |
|
| 4448 | + $package_info = (array) geodir_post_package_info(array(), '', $post_type); |
|
| 4449 | 4449 | } |
| 4450 | 4450 | |
| 4451 | - if (!empty($package_info)) {
|
|
| 4451 | + if (!empty($package_info)) {
|
|
| 4452 | 4452 | $package_id = $package_info['pid']; |
| 4453 | 4453 | |
| 4454 | 4454 | if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
|
| 4455 | 4455 | $gd_post['expire_date'] = $expire_date; |
| 4456 | 4456 | } else {
|
| 4457 | - if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
|
|
| 4458 | - $gd_post['alive_days'] = (int)$package_info['days']; |
|
| 4459 | - $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) ); |
|
| 4457 | + if (isset($package_info['days']) && (int) $package_info['days'] > 0) {
|
|
| 4458 | + $gd_post['alive_days'] = (int) $package_info['days']; |
|
| 4459 | + $gd_post['expire_date'] = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $package_info['days'].' days'));
|
|
| 4460 | 4460 | } else {
|
| 4461 | 4461 | $gd_post['expire_date'] = 'Never'; |
| 4462 | 4462 | } |
@@ -4465,7 +4465,7 @@ discard block |
||
| 4465 | 4465 | $gd_post['package_id'] = $package_id; |
| 4466 | 4466 | } |
| 4467 | 4467 | |
| 4468 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 4468 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 4469 | 4469 | |
| 4470 | 4470 | if ($post_type == 'gd_event') {
|
| 4471 | 4471 | $gd_post = geodir_imex_process_event_data($gd_post); |
@@ -4476,71 +4476,71 @@ discard block |
||
| 4476 | 4476 | } |
| 4477 | 4477 | |
| 4478 | 4478 | // Export franchise fields |
| 4479 | - $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 4479 | + $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;
|
|
| 4480 | 4480 | if ($is_franchise_active) {
|
| 4481 | - if ( isset( $gd_post['gd_is_franchise'] ) && empty( $gd_post['franchise'] ) ) {
|
|
| 4482 | - if ( absint( $gd_post['gd_is_franchise'] ) != 0 ) {
|
|
| 4481 | + if (isset($gd_post['gd_is_franchise']) && empty($gd_post['franchise'])) {
|
|
| 4482 | + if (absint($gd_post['gd_is_franchise']) != 0) {
|
|
| 4483 | 4483 | $gd_franchise_lock = array(); |
| 4484 | 4484 | |
| 4485 | - if ( isset( $gd_post['gd_franchise_lock'] ) ) {
|
|
| 4486 | - $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
|
|
| 4487 | - $gd_franchise_lock = trim( $gd_franchise_lock ); |
|
| 4488 | - $gd_franchise_lock = explode( ",", $gd_franchise_lock ); |
|
| 4485 | + if (isset($gd_post['gd_franchise_lock'])) {
|
|
| 4486 | + $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock']);
|
|
| 4487 | + $gd_franchise_lock = trim($gd_franchise_lock); |
|
| 4488 | + $gd_franchise_lock = explode(",", $gd_franchise_lock);
|
|
| 4489 | 4489 | } |
| 4490 | 4490 | |
| 4491 | - update_post_meta( $saved_post_id, 'gd_is_franchise', 1 ); |
|
| 4492 | - update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock ); |
|
| 4491 | + update_post_meta($saved_post_id, 'gd_is_franchise', 1); |
|
| 4492 | + update_post_meta($saved_post_id, 'gd_franchise_lock', $gd_franchise_lock); |
|
| 4493 | 4493 | } else {
|
| 4494 | - if ( function_exists( 'geodir_franchise_remove_franchise' ) ) {
|
|
| 4495 | - geodir_franchise_remove_franchise( $saved_post_id ); |
|
| 4494 | + if (function_exists('geodir_franchise_remove_franchise')) {
|
|
| 4495 | + geodir_franchise_remove_franchise($saved_post_id); |
|
| 4496 | 4496 | } |
| 4497 | 4497 | } |
| 4498 | 4498 | } else {
|
| 4499 | - if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
|
|
| 4500 | - geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] ); |
|
| 4499 | + if (isset($gd_post['franchise']) && (int) $gd_post['franchise'] > 0 && geodir_franchise_check((int) $gd_post['franchise'])) {
|
|
| 4500 | + geodir_save_post_meta($saved_post_id, 'franchise', (int) $gd_post['franchise']); |
|
| 4501 | 4501 | } |
| 4502 | 4502 | } |
| 4503 | 4503 | } |
| 4504 | 4504 | |
| 4505 | 4505 | if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
|
| 4506 | - $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) ); |
|
| 4506 | + $save_post['post_category'] = array_unique(array_map('intval', $save_post['post_category']));
|
|
| 4507 | 4507 | if ($default_category_id) {
|
| 4508 | 4508 | $save_post['post_default_category'] = $default_category_id; |
| 4509 | 4509 | $gd_post['default_category'] = $default_category_id; |
| 4510 | 4510 | } |
| 4511 | 4511 | $gd_post[$cat_taxonomy] = $save_post['post_category']; |
| 4512 | 4512 | } |
| 4513 | - $xtimings['###7'] = microtime(true)-$xstart; |
|
| 4513 | + $xtimings['###7'] = microtime(true) - $xstart; |
|
| 4514 | 4514 | // Save post info |
| 4515 | - geodir_save_post_info( $saved_post_id, $gd_post ); |
|
| 4516 | - $xtimings['###8'] = microtime(true)-$xstart; |
|
| 4515 | + geodir_save_post_info($saved_post_id, $gd_post); |
|
| 4516 | + $xtimings['###8'] = microtime(true) - $xstart; |
|
| 4517 | 4517 | // post taxonomies |
| 4518 | - if ( !empty( $save_post['post_category'] ) ) {
|
|
| 4519 | - wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy ); |
|
| 4518 | + if (!empty($save_post['post_category'])) {
|
|
| 4519 | + wp_set_object_terms($saved_post_id, $save_post['post_category'], $cat_taxonomy); |
|
| 4520 | 4520 | |
| 4521 | - $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : ''; |
|
| 4521 | + $post_default_category = isset($save_post['post_default_category']) ? $save_post['post_default_category'] : ''; |
|
| 4522 | 4522 | if ($default_category_id) {
|
| 4523 | 4523 | $post_default_category = $default_category_id; |
| 4524 | 4524 | } |
| 4525 | 4525 | $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy); |
| 4526 | 4526 | $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
|
| 4527 | - $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
|
|
| 4527 | + $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']).',y:' : '';
|
|
| 4528 | 4528 | |
| 4529 | 4529 | if ($post_category_str != '' && $post_default_category) {
|
| 4530 | - $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str); |
|
| 4530 | + $post_category_str = str_replace($post_default_category.',y:', $post_default_category.',y,d:', $post_category_str); |
|
| 4531 | 4531 | } |
| 4532 | 4532 | |
| 4533 | 4533 | $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : ''; |
| 4534 | 4534 | |
| 4535 | - geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str ); |
|
| 4535 | + geodir_set_postcat_structure($saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str); |
|
| 4536 | 4536 | } |
| 4537 | - $xtimings['###8.1'] = microtime(true)-$xstart; |
|
| 4538 | - if ( !empty( $save_post['post_tags'] ) ) {
|
|
| 4539 | - wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy ); |
|
| 4537 | + $xtimings['###8.1'] = microtime(true) - $xstart; |
|
| 4538 | + if (!empty($save_post['post_tags'])) {
|
|
| 4539 | + wp_set_object_terms($saved_post_id, $save_post['post_tags'], $tags_taxonomy); |
|
| 4540 | 4540 | } |
| 4541 | - $xtimings['###9'] = microtime(true)-$xstart; |
|
| 4541 | + $xtimings['###9'] = microtime(true) - $xstart; |
|
| 4542 | 4542 | // Post images |
| 4543 | - if ( !empty( $post_images ) ) {
|
|
| 4543 | + if (!empty($post_images)) {
|
|
| 4544 | 4544 | $post_images = array_unique($post_images); |
| 4545 | 4545 | |
| 4546 | 4546 | $old_post_images_arr = array(); |
@@ -4548,65 +4548,65 @@ discard block |
||
| 4548 | 4548 | |
| 4549 | 4549 | $order = 1; |
| 4550 | 4550 | |
| 4551 | - $old_post_images = geodir_get_images( $saved_post_id ); |
|
| 4552 | - $xtimings['###9.1'] = microtime(true)-$xstart; |
|
| 4551 | + $old_post_images = geodir_get_images($saved_post_id); |
|
| 4552 | + $xtimings['###9.1'] = microtime(true) - $xstart; |
|
| 4553 | 4553 | if (!empty($old_post_images)) {
|
| 4554 | - foreach( $old_post_images as $old_post_image ) {
|
|
| 4554 | + foreach ($old_post_images as $old_post_image) {
|
|
| 4555 | 4555 | if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
|
| 4556 | 4556 | $old_post_images_arr[] = $old_post_image->file; |
| 4557 | 4557 | } |
| 4558 | 4558 | } |
| 4559 | 4559 | } |
| 4560 | 4560 | |
| 4561 | - foreach ( $post_images as $post_image ) {
|
|
| 4562 | - $image_name = basename( $post_image ); |
|
| 4561 | + foreach ($post_images as $post_image) {
|
|
| 4562 | + $image_name = basename($post_image); |
|
| 4563 | 4563 | $saved_post_images_arr[] = $image_name; |
| 4564 | 4564 | |
| 4565 | - if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
|
|
| 4565 | + if (!empty($old_post_images_arr) && in_array($image_name, $old_post_images_arr)) {
|
|
| 4566 | 4566 | continue; // Skip if image already exists. |
| 4567 | 4567 | } |
| 4568 | 4568 | |
| 4569 | - $image_name_parts = explode( '.', $image_name ); |
|
| 4570 | - array_pop( $image_name_parts ); |
|
| 4571 | - $proper_image_name = implode( '.', $image_name_parts ); |
|
| 4572 | - $xtimings['###9.2'] = microtime(true)-$xstart; |
|
| 4573 | - $arr_file_type = wp_check_filetype( $image_name ); |
|
| 4574 | - $xtimings['###9.3'] = microtime(true)-$xstart; |
|
| 4575 | - if ( !empty( $arr_file_type ) ) {
|
|
| 4569 | + $image_name_parts = explode('.', $image_name);
|
|
| 4570 | + array_pop($image_name_parts); |
|
| 4571 | + $proper_image_name = implode('.', $image_name_parts);
|
|
| 4572 | + $xtimings['###9.2'] = microtime(true) - $xstart; |
|
| 4573 | + $arr_file_type = wp_check_filetype($image_name); |
|
| 4574 | + $xtimings['###9.3'] = microtime(true) - $xstart; |
|
| 4575 | + if (!empty($arr_file_type)) {
|
|
| 4576 | 4576 | $uploaded_file_type = $arr_file_type['type']; |
| 4577 | 4577 | |
| 4578 | 4578 | $attachment = array(); |
| 4579 | 4579 | $attachment['post_id'] = $saved_post_id; |
| 4580 | 4580 | $attachment['title'] = $proper_image_name; |
| 4581 | 4581 | $attachment['content'] = ''; |
| 4582 | - $attachment['file'] = $uploads_subdir . '/' . $image_name; |
|
| 4582 | + $attachment['file'] = $uploads_subdir.'/'.$image_name; |
|
| 4583 | 4583 | $attachment['mime_type'] = $uploaded_file_type; |
| 4584 | 4584 | $attachment['menu_order'] = $order; |
| 4585 | 4585 | $attachment['is_featured'] = 0; |
| 4586 | 4586 | |
| 4587 | 4587 | $attachment_set = ''; |
| 4588 | - foreach ( $attachment as $key => $val ) {
|
|
| 4589 | - if ( $val != '' ) {
|
|
| 4590 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 4588 | + foreach ($attachment as $key => $val) {
|
|
| 4589 | + if ($val != '') {
|
|
| 4590 | + $attachment_set .= $key." = '".$val."', "; |
|
| 4591 | 4591 | } |
| 4592 | 4592 | } |
| 4593 | - $attachment_set = trim( $attachment_set, ", " ); |
|
| 4593 | + $attachment_set = trim($attachment_set, ", "); |
|
| 4594 | 4594 | |
| 4595 | 4595 | // Add new attachment |
| 4596 | - $xtimings['###9.4'] = microtime(true)-$xstart; |
|
| 4597 | - $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set ); |
|
| 4598 | - $xtimings['###9.5'] = microtime(true)-$xstart; |
|
| 4596 | + $xtimings['###9.4'] = microtime(true) - $xstart; |
|
| 4597 | + $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
|
|
| 4598 | + $xtimings['###9.5'] = microtime(true) - $xstart; |
|
| 4599 | 4599 | $order++; |
| 4600 | 4600 | } |
| 4601 | 4601 | } |
| 4602 | 4602 | |
| 4603 | - $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : '';
|
|
| 4603 | + $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/".implode("' AND file NOT LIKE '%/", $saved_post_images_arr)."' )" : '';
|
|
| 4604 | 4604 | // Remove previous attachment |
| 4605 | - $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql ); |
|
| 4606 | - $xtimings['###9.6'] = microtime(true)-$xstart; |
|
| 4607 | - if ( !empty( $saved_post_images_arr ) ) {
|
|
| 4605 | + $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = ".(int) $saved_post_id." ".$saved_post_images_sql);
|
|
| 4606 | + $xtimings['###9.6'] = microtime(true) - $xstart; |
|
| 4607 | + if (!empty($saved_post_images_arr)) {
|
|
| 4608 | 4608 | geodir_set_wp_featured_image($saved_post_id); |
| 4609 | - $xtimings['###9.7'] = microtime(true)-$xstart; |
|
| 4609 | + $xtimings['###9.7'] = microtime(true) - $xstart; |
|
| 4610 | 4610 | /* |
| 4611 | 4611 | $menu_order = 1; |
| 4612 | 4612 | |
@@ -4622,14 +4622,14 @@ discard block |
||
| 4622 | 4622 | }*/ |
| 4623 | 4623 | } |
| 4624 | 4624 | |
| 4625 | - if ( $order > 1 ) {
|
|
| 4625 | + if ($order > 1) {
|
|
| 4626 | 4626 | $images++; |
| 4627 | 4627 | } |
| 4628 | 4628 | } |
| 4629 | - $xtimings['###10'] = microtime(true)-$xstart; |
|
| 4629 | + $xtimings['###10'] = microtime(true) - $xstart; |
|
| 4630 | 4630 | /** This action is documented in geodirectory-functions/post-functions.php */ |
| 4631 | - do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post ); |
|
| 4632 | - $xtimings['###11'] = microtime(true)-$xstart; |
|
| 4631 | + do_action('geodir_after_save_listing', $saved_post_id, $gd_post);
|
|
| 4632 | + $xtimings['###11'] = microtime(true) - $xstart; |
|
| 4633 | 4633 | if (isset($is_featured)) {
|
| 4634 | 4634 | geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured); |
| 4635 | 4635 | } |
@@ -4639,7 +4639,7 @@ discard block |
||
| 4639 | 4639 | if (isset($gd_post['expire_date'])) {
|
| 4640 | 4640 | geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']); |
| 4641 | 4641 | } |
| 4642 | - $xtimings['###12'] = microtime(true)-$xstart; |
|
| 4642 | + $xtimings['###12'] = microtime(true) - $xstart; |
|
| 4643 | 4643 | } |
| 4644 | 4644 | |
| 4645 | 4645 | // WPML |
@@ -4652,11 +4652,11 @@ discard block |
||
| 4652 | 4652 | } |
| 4653 | 4653 | |
| 4654 | 4654 | //undo some stuff to make the import quicker |
| 4655 | - wp_defer_term_counting( false ); |
|
| 4656 | - wp_defer_comment_counting( false ); |
|
| 4657 | - $wpdb->query( 'COMMIT;' ); |
|
| 4658 | - $wpdb->query( 'SET autocommit = 1;' ); |
|
| 4659 | - $xtimings['###13'] = microtime(true)-$xstart; |
|
| 4655 | + wp_defer_term_counting(false); |
|
| 4656 | + wp_defer_comment_counting(false); |
|
| 4657 | + $wpdb->query('COMMIT;');
|
|
| 4658 | + $wpdb->query('SET autocommit = 1;');
|
|
| 4659 | + $xtimings['###13'] = microtime(true) - $xstart; |
|
| 4660 | 4660 | $json = array(); |
| 4661 | 4661 | $json['processed'] = $processed_actual; |
| 4662 | 4662 | $json['created'] = $created; |
@@ -4665,13 +4665,13 @@ discard block |
||
| 4665 | 4665 | $json['invalid'] = $invalid; |
| 4666 | 4666 | $json['invalid_addr'] = $invalid_addr; |
| 4667 | 4667 | $json['images'] = $images; |
| 4668 | - $json['timing'] = microtime(true)-$xstart; |
|
| 4668 | + $json['timing'] = microtime(true) - $xstart; |
|
| 4669 | 4669 | $json['timings'] = $xtimings; |
| 4670 | 4670 | |
| 4671 | 4671 | |
| 4672 | - wp_send_json( $json ); |
|
| 4672 | + wp_send_json($json); |
|
| 4673 | 4673 | exit; |
| 4674 | - } else if ( $task == 'import_loc' ) {
|
|
| 4674 | + } else if ($task == 'import_loc') {
|
|
| 4675 | 4675 | global $gd_post_types; |
| 4676 | 4676 | $gd_post_types = $post_types; |
| 4677 | 4677 | |
@@ -4680,82 +4680,82 @@ discard block |
||
| 4680 | 4680 | |
| 4681 | 4681 | if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
| 4682 | 4682 | $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
| 4683 | - wp_send_json( $json ); |
|
| 4683 | + wp_send_json($json); |
|
| 4684 | 4684 | } |
| 4685 | 4685 | |
| 4686 | 4686 | $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
|
| 4687 | - $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' ); |
|
| 4687 | + $gd_error_location = __('Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory');
|
|
| 4688 | 4688 | for ($i = 1; $i <= $limit; $i++) {
|
| 4689 | 4689 | $index = $processed + $i; |
| 4690 | 4690 | |
| 4691 | 4691 | if (isset($file[$index])) {
|
| 4692 | 4692 | $row = $file[$index]; |
| 4693 | - $row = array_map( 'trim', $row ); |
|
| 4693 | + $row = array_map('trim', $row);
|
|
| 4694 | 4694 | $data = array(); |
| 4695 | 4695 | |
| 4696 | - foreach ($columns as $c => $column ) {
|
|
| 4696 | + foreach ($columns as $c => $column) {
|
|
| 4697 | 4697 | if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {
|
| 4698 | 4698 | $data[$column] = $row[$c]; |
| 4699 | 4699 | } |
| 4700 | 4700 | } |
| 4701 | 4701 | |
| 4702 | - if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
|
|
| 4702 | + if (empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude'])) {
|
|
| 4703 | 4703 | $invalid++; |
| 4704 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4704 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4705 | 4705 | continue; |
| 4706 | 4706 | } |
| 4707 | 4707 | |
| 4708 | 4708 | $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0; |
| 4709 | 4709 | |
| 4710 | - if ( $import_choice == 'update' ) {
|
|
| 4711 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4712 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4710 | + if ($import_choice == 'update') {
|
|
| 4711 | + if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {
|
|
| 4712 | + if ($location_id = geodir_location_update_city($data, true, $location)) {
|
|
| 4713 | 4713 | $updated++; |
| 4714 | 4714 | } else {
|
| 4715 | 4715 | $invalid++; |
| 4716 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4716 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4717 | 4717 | } |
| 4718 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4719 | - $data['location_id'] = (int)$location->location_id; |
|
| 4718 | + } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {
|
|
| 4719 | + $data['location_id'] = (int) $location->location_id; |
|
| 4720 | 4720 | |
| 4721 | - if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
|
|
| 4722 | - $data['location_id'] = (int)$location->location_id; |
|
| 4723 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
|
|
| 4724 | - $data['location_id'] = (int)$location->location_id; |
|
| 4725 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
|
|
| 4726 | - $data['location_id'] = (int)$location->location_id; |
|
| 4721 | + if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region']))) {
|
|
| 4722 | + $data['location_id'] = (int) $location->location_id; |
|
| 4723 | + } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'region' => $data['region']))) {
|
|
| 4724 | + $data['location_id'] = (int) $location->location_id; |
|
| 4725 | + } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country']))) {
|
|
| 4726 | + $data['location_id'] = (int) $location->location_id; |
|
| 4727 | 4727 | } |
| 4728 | 4728 | |
| 4729 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4729 | + if ($location_id = geodir_location_update_city($data, true, $location)) {
|
|
| 4730 | 4730 | $updated++; |
| 4731 | 4731 | } else {
|
| 4732 | 4732 | $invalid++; |
| 4733 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4733 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4734 | 4734 | } |
| 4735 | 4735 | } else {
|
| 4736 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4736 | + if ($location_id = geodir_location_insert_city($data, true)) {
|
|
| 4737 | 4737 | $created++; |
| 4738 | 4738 | } else {
|
| 4739 | 4739 | $invalid++; |
| 4740 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4740 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4741 | 4741 | } |
| 4742 | 4742 | } |
| 4743 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4744 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4743 | + } elseif ($import_choice == 'skip') {
|
|
| 4744 | + if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {
|
|
| 4745 | 4745 | $skipped++; |
| 4746 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4746 | + } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {
|
|
| 4747 | 4747 | $skipped++; |
| 4748 | 4748 | } else {
|
| 4749 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4749 | + if ($location_id = geodir_location_insert_city($data, true)) {
|
|
| 4750 | 4750 | $created++; |
| 4751 | 4751 | } else {
|
| 4752 | 4752 | $invalid++; |
| 4753 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4753 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4754 | 4754 | } |
| 4755 | 4755 | } |
| 4756 | 4756 | } else {
|
| 4757 | 4757 | $invalid++; |
| 4758 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4758 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location); |
|
| 4759 | 4759 | } |
| 4760 | 4760 | } |
| 4761 | 4761 | } |
@@ -4769,24 +4769,24 @@ discard block |
||
| 4769 | 4769 | $json['invalid'] = $invalid; |
| 4770 | 4770 | $json['images'] = $images; |
| 4771 | 4771 | |
| 4772 | - wp_send_json( $json ); |
|
| 4773 | - } else if ( $task == 'import_hood' ) {
|
|
| 4772 | + wp_send_json($json); |
|
| 4773 | + } else if ($task == 'import_hood') {
|
|
| 4774 | 4774 | if (!empty($file)) {
|
| 4775 | 4775 | $columns = isset($file[0]) ? $file[0] : NULL; |
| 4776 | 4776 | |
| 4777 | 4777 | if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
| 4778 | 4778 | $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
| 4779 | - wp_send_json( $json ); |
|
| 4779 | + wp_send_json($json); |
|
| 4780 | 4780 | } |
| 4781 | 4781 | |
| 4782 | 4782 | $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
|
| 4783 | - $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ); |
|
| 4783 | + $gd_error_hood = __('Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory');
|
|
| 4784 | 4784 | for ($i = 1; $i <= $limit; $i++) {
|
| 4785 | 4785 | $index = $processed + $i; |
| 4786 | 4786 | |
| 4787 | 4787 | if (isset($file[$index])) {
|
| 4788 | 4788 | $row = $file[$index]; |
| 4789 | - $row = array_map( 'trim', $row ); |
|
| 4789 | + $row = array_map('trim', $row);
|
|
| 4790 | 4790 | $data = array(); |
| 4791 | 4791 | |
| 4792 | 4792 | foreach ($columns as $c => $column) {
|
@@ -4797,20 +4797,20 @@ discard block |
||
| 4797 | 4797 | |
| 4798 | 4798 | if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
|
| 4799 | 4799 | $invalid++; |
| 4800 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4800 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4801 | 4801 | continue; |
| 4802 | 4802 | } |
| 4803 | 4803 | |
| 4804 | 4804 | $location_info = array(); |
| 4805 | - if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
|
|
| 4806 | - $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
|
|
| 4805 | + if (!empty($data['location_id']) && (int) $data['location_id'] > 0) {
|
|
| 4806 | + $location_info = geodir_get_location_by_id('', (int) $data['location_id']);
|
|
| 4807 | 4807 | } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
|
| 4808 | 4808 | $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
|
| 4809 | 4809 | } |
| 4810 | 4810 | |
| 4811 | 4811 | if (empty($location_info)) {
|
| 4812 | 4812 | $invalid++; |
| 4813 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4813 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4814 | 4814 | continue; |
| 4815 | 4815 | } |
| 4816 | 4816 | |
@@ -4825,35 +4825,35 @@ discard block |
||
| 4825 | 4825 | $hood_data['hood_longitude'] = $data['longitude']; |
| 4826 | 4826 | $hood_data['hood_location_id'] = $location_id; |
| 4827 | 4827 | |
| 4828 | - if ( $import_choice == 'update' ) {
|
|
| 4829 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4830 | - $hood_data['hood_id'] = (int)$data['neighbourhood_id']; |
|
| 4828 | + if ($import_choice == 'update') {
|
|
| 4829 | + if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {
|
|
| 4830 | + $hood_data['hood_id'] = (int) $data['neighbourhood_id']; |
|
| 4831 | 4831 | |
| 4832 | 4832 | if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
| 4833 | 4833 | $updated++; |
| 4834 | 4834 | } else {
|
| 4835 | 4835 | $invalid++; |
| 4836 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4836 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4837 | 4837 | } |
| 4838 | 4838 | } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
| 4839 | - $hood_data['hood_id'] = (int)$neighbourhood->hood_id; |
|
| 4839 | + $hood_data['hood_id'] = (int) $neighbourhood->hood_id; |
|
| 4840 | 4840 | |
| 4841 | 4841 | if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
| 4842 | 4842 | $updated++; |
| 4843 | 4843 | } else {
|
| 4844 | 4844 | $invalid++; |
| 4845 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4845 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4846 | 4846 | } |
| 4847 | 4847 | } else {
|
| 4848 | 4848 | if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
| 4849 | 4849 | $created++; |
| 4850 | 4850 | } else {
|
| 4851 | 4851 | $invalid++; |
| 4852 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4852 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4853 | 4853 | } |
| 4854 | 4854 | } |
| 4855 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4856 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4855 | + } elseif ($import_choice == 'skip') {
|
|
| 4856 | + if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {
|
|
| 4857 | 4857 | $skipped++; |
| 4858 | 4858 | } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
| 4859 | 4859 | $skipped++; |
@@ -4863,12 +4863,12 @@ discard block |
||
| 4863 | 4863 | $created++; |
| 4864 | 4864 | } else {
|
| 4865 | 4865 | $invalid++; |
| 4866 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4866 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4867 | 4867 | } |
| 4868 | 4868 | } |
| 4869 | 4869 | } else {
|
| 4870 | 4870 | $invalid++; |
| 4871 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4871 | + geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood); |
|
| 4872 | 4872 | } |
| 4873 | 4873 | } |
| 4874 | 4874 | } |
@@ -4882,7 +4882,7 @@ discard block |
||
| 4882 | 4882 | $json['invalid'] = $invalid; |
| 4883 | 4883 | $json['images'] = $images; |
| 4884 | 4884 | |
| 4885 | - wp_send_json( $json ); |
|
| 4885 | + wp_send_json($json); |
|
| 4886 | 4886 | } |
| 4887 | 4887 | } |
| 4888 | 4888 | break; |
@@ -4926,29 +4926,29 @@ discard block |
||
| 4926 | 4926 | * } |
| 4927 | 4927 | * @return int|bool Term id when success, false when fail. |
| 4928 | 4928 | */ |
| 4929 | -function geodir_imex_insert_term( $taxonomy, $term_data ) {
|
|
| 4930 | - if ( empty( $taxonomy ) || empty( $term_data ) ) {
|
|
| 4929 | +function geodir_imex_insert_term($taxonomy, $term_data) {
|
|
| 4930 | + if (empty($taxonomy) || empty($term_data)) {
|
|
| 4931 | 4931 | return false; |
| 4932 | 4932 | } |
| 4933 | 4933 | |
| 4934 | - $term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : ''; |
|
| 4934 | + $term = isset($term_data['name']) && !empty($term_data['name']) ? $term_data['name'] : ''; |
|
| 4935 | 4935 | $args = array(); |
| 4936 | - $args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : ''; |
|
| 4937 | - $args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : ''; |
|
| 4938 | - $args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : ''; |
|
| 4936 | + $args['description'] = isset($term_data['description']) ? $term_data['description'] : ''; |
|
| 4937 | + $args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : ''; |
|
| 4938 | + $args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : ''; |
|
| 4939 | 4939 | |
| 4940 | - if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {
|
|
| 4941 | - $term_args = array_merge( $term_data, $args ); |
|
| 4942 | - $defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => ''); |
|
| 4943 | - $term_args = wp_parse_args( $term_args, $defaults ); |
|
| 4944 | - $term_args = sanitize_term( $term_args, $taxonomy, 'db' ); |
|
| 4945 | - $args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args ); |
|
| 4940 | + if ((!empty($args['slug']) && term_exists($args['slug'], $taxonomy)) || empty($args['slug'])) {
|
|
| 4941 | + $term_args = array_merge($term_data, $args); |
|
| 4942 | + $defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
|
|
| 4943 | + $term_args = wp_parse_args($term_args, $defaults); |
|
| 4944 | + $term_args = sanitize_term($term_args, $taxonomy, 'db'); |
|
| 4945 | + $args['slug'] = wp_unique_term_slug($args['slug'], (object) $term_args); |
|
| 4946 | 4946 | } |
| 4947 | 4947 | |
| 4948 | - if( !empty( $term ) ) {
|
|
| 4949 | - $result = wp_insert_term( $term, $taxonomy, $args ); |
|
| 4950 | - if( !is_wp_error( $result ) ) {
|
|
| 4951 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4948 | + if (!empty($term)) {
|
|
| 4949 | + $result = wp_insert_term($term, $taxonomy, $args); |
|
| 4950 | + if (!is_wp_error($result)) {
|
|
| 4951 | + return isset($result['term_id']) ? $result['term_id'] : 0; |
|
| 4952 | 4952 | } |
| 4953 | 4953 | } |
| 4954 | 4954 | |
@@ -4978,36 +4978,36 @@ discard block |
||
| 4978 | 4978 | * } |
| 4979 | 4979 | * @return int|bool Term id when success, false when fail. |
| 4980 | 4980 | */ |
| 4981 | -function geodir_imex_update_term( $taxonomy, $term_data ) {
|
|
| 4982 | - if ( empty( $taxonomy ) || empty( $term_data ) ) {
|
|
| 4981 | +function geodir_imex_update_term($taxonomy, $term_data) {
|
|
| 4982 | + if (empty($taxonomy) || empty($term_data)) {
|
|
| 4983 | 4983 | return false; |
| 4984 | 4984 | } |
| 4985 | 4985 | |
| 4986 | - $term_id = isset( $term_data['term_id'] ) && !empty( $term_data['term_id'] ) ? $term_data['term_id'] : 0; |
|
| 4986 | + $term_id = isset($term_data['term_id']) && !empty($term_data['term_id']) ? $term_data['term_id'] : 0; |
|
| 4987 | 4987 | |
| 4988 | 4988 | $args = array(); |
| 4989 | - $args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : ''; |
|
| 4990 | - $args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : ''; |
|
| 4991 | - $args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : ''; |
|
| 4989 | + $args['description'] = isset($term_data['description']) ? $term_data['description'] : ''; |
|
| 4990 | + $args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : ''; |
|
| 4991 | + $args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : ''; |
|
| 4992 | 4992 | |
| 4993 | - if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {
|
|
| 4993 | + if ($term_id > 0 && $term_info = (array) get_term($term_id, $taxonomy)) {
|
|
| 4994 | 4994 | $term_data['term_id'] = $term_info['term_id']; |
| 4995 | 4995 | |
| 4996 | - $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
|
| 4996 | + $result = wp_update_term($term_data['term_id'], $taxonomy, $term_data); |
|
| 4997 | 4997 | |
| 4998 | - if( !is_wp_error( $result ) ) {
|
|
| 4999 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4998 | + if (!is_wp_error($result)) {
|
|
| 4999 | + return isset($result['term_id']) ? $result['term_id'] : 0; |
|
| 5000 | 5000 | } |
| 5001 | - } else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 5001 | + } else if ($term_data['slug'] != '' && $term_info = (array) term_exists($term_data['slug'], $taxonomy)) {
|
|
| 5002 | 5002 | $term_data['term_id'] = $term_info['term_id']; |
| 5003 | 5003 | |
| 5004 | - $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
|
| 5004 | + $result = wp_update_term($term_data['term_id'], $taxonomy, $term_data); |
|
| 5005 | 5005 | |
| 5006 | - if( !is_wp_error( $result ) ) {
|
|
| 5007 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 5006 | + if (!is_wp_error($result)) {
|
|
| 5007 | + return isset($result['term_id']) ? $result['term_id'] : 0; |
|
| 5008 | 5008 | } |
| 5009 | 5009 | } else {
|
| 5010 | - return geodir_imex_insert_term( $taxonomy, $term_data ); |
|
| 5010 | + return geodir_imex_insert_term($taxonomy, $term_data); |
|
| 5011 | 5011 | } |
| 5012 | 5012 | |
| 5013 | 5013 | return false; |
@@ -5026,20 +5026,20 @@ discard block |
||
| 5026 | 5026 | * @param string $post_type Post type. |
| 5027 | 5027 | * @return int Posts count. |
| 5028 | 5028 | */ |
| 5029 | -function geodir_get_posts_count( $post_type ) {
|
|
| 5029 | +function geodir_get_posts_count($post_type) {
|
|
| 5030 | 5030 | global $wpdb, $plugin_prefix; |
| 5031 | 5031 | |
| 5032 | - if ( !post_type_exists( $post_type ) ) {
|
|
| 5032 | + if (!post_type_exists($post_type)) {
|
|
| 5033 | 5033 | return 0; |
| 5034 | 5034 | } |
| 5035 | 5035 | |
| 5036 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5036 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 5037 | 5037 | |
| 5038 | 5038 | // Skip listing with statuses trash, auto-draft etc... |
| 5039 | 5039 | $skip_statuses = geodir_imex_export_skip_statuses(); |
| 5040 | 5040 | $where_statuses = ''; |
| 5041 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5042 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5041 | + if (!empty($skip_statuses) && is_array($skip_statuses)) {
|
|
| 5042 | + $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
|
|
| 5043 | 5043 | } |
| 5044 | 5044 | |
| 5045 | 5045 | /** |
@@ -5050,11 +5050,11 @@ discard block |
||
| 5050 | 5050 | * |
| 5051 | 5051 | * @param string $where SQL where clause part. |
| 5052 | 5052 | */ |
| 5053 | - $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type ); |
|
| 5053 | + $where_statuses = apply_filters('geodir_get_posts_count', $where_statuses, $post_type);
|
|
| 5054 | 5054 | |
| 5055 | - $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );
|
|
| 5055 | + $query = $wpdb->prepare("SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses, $post_type);
|
|
| 5056 | 5056 | |
| 5057 | - $posts_count = (int)$wpdb->get_var( $query ); |
|
| 5057 | + $posts_count = (int) $wpdb->get_var($query); |
|
| 5058 | 5058 | |
| 5059 | 5059 | /** |
| 5060 | 5060 | * Modify returned post counts for the current post type. |
@@ -5065,7 +5065,7 @@ discard block |
||
| 5065 | 5065 | * @param int $posts_count Post counts. |
| 5066 | 5066 | * @param string $post_type Post type. |
| 5067 | 5067 | */ |
| 5068 | - $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type ); |
|
| 5068 | + $posts_count = apply_filters('geodir_imex_count_posts', $posts_count, $post_type);
|
|
| 5069 | 5069 | |
| 5070 | 5070 | return $posts_count; |
| 5071 | 5071 | } |
@@ -5087,19 +5087,19 @@ discard block |
||
| 5087 | 5087 | * @param int $page_no Page number. Default 0. |
| 5088 | 5088 | * @return array Array of posts data. |
| 5089 | 5089 | */ |
| 5090 | -function geodir_imex_get_posts( $post_type, $per_page = 0, $page_no = 0 ) {
|
|
| 5090 | +function geodir_imex_get_posts($post_type, $per_page = 0, $page_no = 0) {
|
|
| 5091 | 5091 | global $wp_filesystem; |
| 5092 | 5092 | |
| 5093 | - $posts = geodir_get_export_posts( $post_type, $per_page, $page_no ); |
|
| 5093 | + $posts = geodir_get_export_posts($post_type, $per_page, $page_no); |
|
| 5094 | 5094 | |
| 5095 | 5095 | $csv_rows = array(); |
| 5096 | 5096 | |
| 5097 | - if ( !empty( $posts ) ) {
|
|
| 5098 | - $is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' ); |
|
| 5097 | + if (!empty($posts)) {
|
|
| 5098 | + $is_payment_plugin = is_plugin_active('geodir_payment_manager/geodir_payment_manager.php');
|
|
| 5099 | 5099 | $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
| 5100 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 5100 | + $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
|
|
| 5101 | 5101 | $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;
|
| 5102 | - $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 5102 | + $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 5103 | 5103 | $is_events_active = function_exists('geodir_event_plugin_activated') ? true : false;
|
| 5104 | 5104 | $is_custom_posts_active = function_exists('geodir_custom_post_type_plugin_activated') ? true : false;
|
| 5105 | 5105 | |
@@ -5114,7 +5114,7 @@ discard block |
||
| 5114 | 5114 | $csv_row[] = 'default_category'; |
| 5115 | 5115 | $csv_row[] = 'post_tags'; |
| 5116 | 5116 | $csv_row[] = 'post_type'; |
| 5117 | - if ( $post_type == 'gd_event' ) {
|
|
| 5117 | + if ($post_type == 'gd_event') {
|
|
| 5118 | 5118 | $csv_row[] = 'event_date'; |
| 5119 | 5119 | $csv_row[] = 'event_enddate'; |
| 5120 | 5120 | $csv_row[] = 'starttime'; |
@@ -5166,25 +5166,25 @@ discard block |
||
| 5166 | 5166 | $csv_row[] = 'geodir_video'; |
| 5167 | 5167 | $csv_row[] = 'geodir_special_offers'; |
| 5168 | 5168 | if ($is_events_active || $is_custom_posts_active) {
|
| 5169 | - $csv_row[] = !empty($post_ypes[$post_type]['linkable_to']) ? 'linked_' . $post_ypes[$post_type]['linkable_to'] . '_ID' : 'linked_cpt_ID'; |
|
| 5169 | + $csv_row[] = !empty($post_ypes[$post_type]['linkable_to']) ? 'linked_'.$post_ypes[$post_type]['linkable_to'].'_ID' : 'linked_cpt_ID'; |
|
| 5170 | 5170 | } |
| 5171 | 5171 | // WPML |
| 5172 | - $is_wpml = geodir_wpml_is_post_type_translated( $post_type ); |
|
| 5172 | + $is_wpml = geodir_wpml_is_post_type_translated($post_type); |
|
| 5173 | 5173 | if ($is_wpml) {
|
| 5174 | 5174 | $csv_row[] = 'language'; |
| 5175 | 5175 | $csv_row[] = 'original_post_id'; |
| 5176 | 5176 | } |
| 5177 | 5177 | // WPML |
| 5178 | 5178 | |
| 5179 | - $custom_fields = geodir_imex_get_custom_fields( $post_type ); |
|
| 5180 | - if ( !empty( $custom_fields ) ) {
|
|
| 5181 | - foreach ( $custom_fields as $custom_field ) {
|
|
| 5179 | + $custom_fields = geodir_imex_get_custom_fields($post_type); |
|
| 5180 | + if (!empty($custom_fields)) {
|
|
| 5181 | + foreach ($custom_fields as $custom_field) {
|
|
| 5182 | 5182 | $csv_row[] = $custom_field->htmlvar_name; |
| 5183 | 5183 | } |
| 5184 | 5184 | } |
| 5185 | 5185 | |
| 5186 | 5186 | // Export franchise fields |
| 5187 | - $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 5187 | + $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;
|
|
| 5188 | 5188 | if ($is_franchise_active) {
|
| 5189 | 5189 | $csv_row[] = 'gd_is_franchise'; |
| 5190 | 5190 | $csv_row[] = 'gd_franchise_lock'; |
@@ -5205,28 +5205,28 @@ discard block |
||
| 5205 | 5205 | $csv_rows[] = $csv_row; |
| 5206 | 5206 | |
| 5207 | 5207 | $images_count = 5; |
| 5208 | - $xx=0; |
|
| 5209 | - foreach ( $posts as $post ) {$xx++;
|
|
| 5208 | + $xx = 0; |
|
| 5209 | + foreach ($posts as $post) {$xx++;
|
|
| 5210 | 5210 | $post_id = $post['ID']; |
| 5211 | 5211 | |
| 5212 | - $gd_post_info = geodir_get_post_info( $post_id ); |
|
| 5213 | - $post_info = (array)$gd_post_info; |
|
| 5212 | + $gd_post_info = geodir_get_post_info($post_id); |
|
| 5213 | + $post_info = (array) $gd_post_info; |
|
| 5214 | 5214 | |
| 5215 | - $taxonomy_category = $post_type . 'category'; |
|
| 5216 | - $taxonomy_tags = $post_type . '_tags'; |
|
| 5215 | + $taxonomy_category = $post_type.'category'; |
|
| 5216 | + $taxonomy_tags = $post_type.'_tags'; |
|
| 5217 | 5217 | |
| 5218 | 5218 | $post_category = ''; |
| 5219 | 5219 | $default_category_id = $gd_post_info->default_category; |
| 5220 | 5220 | $default_category = ''; |
| 5221 | 5221 | $post_tags = ''; |
| 5222 | - $terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) ); |
|
| 5222 | + $terms = wp_get_post_terms($post_id, array($taxonomy_category, $taxonomy_tags)); |
|
| 5223 | 5223 | |
| 5224 | - if ( !empty( $terms ) && !is_wp_error( $terms ) ) {
|
|
| 5224 | + if (!empty($terms) && !is_wp_error($terms)) {
|
|
| 5225 | 5225 | $post_category = array(); |
| 5226 | 5226 | $post_tags = array(); |
| 5227 | 5227 | |
| 5228 | - foreach ( $terms as $term ) {
|
|
| 5229 | - if ( $term->taxonomy == $taxonomy_category ) {
|
|
| 5228 | + foreach ($terms as $term) {
|
|
| 5229 | + if ($term->taxonomy == $taxonomy_category) {
|
|
| 5230 | 5230 | $post_category[] = $term->name; |
| 5231 | 5231 | |
| 5232 | 5232 | if ($default_category_id == $term->term_id) {
|
@@ -5234,7 +5234,7 @@ discard block |
||
| 5234 | 5234 | } |
| 5235 | 5235 | } |
| 5236 | 5236 | |
| 5237 | - if ( $term->taxonomy == $taxonomy_tags ) {
|
|
| 5237 | + if ($term->taxonomy == $taxonomy_tags) {
|
|
| 5238 | 5238 | $post_tags[] = $term->name; |
| 5239 | 5239 | } |
| 5240 | 5240 | } |
@@ -5242,47 +5242,47 @@ discard block |
||
| 5242 | 5242 | if (empty($default_category) && !empty($post_category)) {
|
| 5243 | 5243 | $default_category = $post_category[0]; // Set first one as default category. |
| 5244 | 5244 | } |
| 5245 | - $post_category = !empty( $post_category ) ? implode( ',', $post_category ) : ''; |
|
| 5246 | - $post_tags = !empty( $post_tags ) ? implode( ',', $post_tags ) : ''; |
|
| 5245 | + $post_category = !empty($post_category) ? implode(',', $post_category) : '';
|
|
| 5246 | + $post_tags = !empty($post_tags) ? implode(',', $post_tags) : '';
|
|
| 5247 | 5247 | } |
| 5248 | 5248 | |
| 5249 | 5249 | // Franchise data |
| 5250 | - if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {
|
|
| 5250 | + if ($is_franchise_active && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 && geodir_franchise_check((int) $post_info['franchise'])) {
|
|
| 5251 | 5251 | $franchise_id = $post_info['franchise']; |
| 5252 | 5252 | $gd_franchise_info = geodir_get_post_info($franchise_id); |
| 5253 | 5253 | |
| 5254 | 5254 | if (geodir_franchise_pkg_is_active($gd_franchise_info)) {
|
| 5255 | - $franchise_info = (array)$gd_franchise_info; |
|
| 5255 | + $franchise_info = (array) $gd_franchise_info; |
|
| 5256 | 5256 | $locked_fields = geodir_franchise_get_locked_fields($franchise_id, true); |
| 5257 | 5257 | |
| 5258 | 5258 | if (!empty($locked_fields)) {
|
| 5259 | - foreach( $locked_fields as $locked_field) {
|
|
| 5259 | + foreach ($locked_fields as $locked_field) {
|
|
| 5260 | 5260 | if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {
|
| 5261 | 5261 | $post_info[$locked_field] = $franchise_info[$locked_field]; |
| 5262 | 5262 | } |
| 5263 | 5263 | |
| 5264 | 5264 | if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {
|
| 5265 | - $franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) ); |
|
| 5265 | + $franchise_terms = wp_get_post_terms($franchise_id, array($taxonomy_category, $taxonomy_tags)); |
|
| 5266 | 5266 | |
| 5267 | - if ( !empty( $franchise_terms ) && !is_wp_error( $franchise_terms ) ) {
|
|
| 5267 | + if (!empty($franchise_terms) && !is_wp_error($franchise_terms)) {
|
|
| 5268 | 5268 | $franchise_post_category = array(); |
| 5269 | 5269 | $franchise_post_tags = array(); |
| 5270 | 5270 | |
| 5271 | - foreach ( $franchise_terms as $franchise_term ) {
|
|
| 5272 | - if ( $franchise_term->taxonomy == $taxonomy_category ) {
|
|
| 5271 | + foreach ($franchise_terms as $franchise_term) {
|
|
| 5272 | + if ($franchise_term->taxonomy == $taxonomy_category) {
|
|
| 5273 | 5273 | $franchise_post_category[] = $franchise_term->name; |
| 5274 | 5274 | } |
| 5275 | 5275 | |
| 5276 | - if ( $franchise_term->taxonomy == $taxonomy_tags ) {
|
|
| 5276 | + if ($franchise_term->taxonomy == $taxonomy_tags) {
|
|
| 5277 | 5277 | $franchise_post_tags[] = $franchise_term->name; |
| 5278 | 5278 | } |
| 5279 | 5279 | } |
| 5280 | 5280 | |
| 5281 | 5281 | if (in_array($taxonomy_category, $locked_fields)) {
|
| 5282 | - $post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : ''; |
|
| 5282 | + $post_category = !empty($franchise_post_category) ? implode(',', $franchise_post_category) : '';
|
|
| 5283 | 5283 | } |
| 5284 | 5284 | if (in_array('post_tags', $locked_fields)) {
|
| 5285 | - $post_tags = !empty( $franchise_post_tags ) ? implode( ',', $franchise_post_tags ) : ''; |
|
| 5285 | + $post_tags = !empty($franchise_post_tags) ? implode(',', $franchise_post_tags) : '';
|
|
| 5286 | 5286 | } |
| 5287 | 5287 | } |
| 5288 | 5288 | } |
@@ -5291,18 +5291,18 @@ discard block |
||
| 5291 | 5291 | } |
| 5292 | 5292 | } |
| 5293 | 5293 | |
| 5294 | - $post_images = geodir_get_images( $post_id ); |
|
| 5294 | + $post_images = geodir_get_images($post_id); |
|
| 5295 | 5295 | $current_images = array(); |
| 5296 | - if ( !empty( $post_images ) ) {
|
|
| 5297 | - foreach ( $post_images as $post_image ) {
|
|
| 5298 | - $post_image = (array)$post_image; |
|
| 5299 | - $image = !empty( $post_image ) && isset( $post_image['path'] ) && $wp_filesystem->is_file( $post_image['path'] ) && $wp_filesystem->exists( $post_image['path'] ) ? $post_image['src'] : ''; |
|
| 5300 | - if ( $image ) {
|
|
| 5296 | + if (!empty($post_images)) {
|
|
| 5297 | + foreach ($post_images as $post_image) {
|
|
| 5298 | + $post_image = (array) $post_image; |
|
| 5299 | + $image = !empty($post_image) && isset($post_image['path']) && $wp_filesystem->is_file($post_image['path']) && $wp_filesystem->exists($post_image['path']) ? $post_image['src'] : ''; |
|
| 5300 | + if ($image) {
|
|
| 5301 | 5301 | $current_images[] = $image; |
| 5302 | 5302 | } |
| 5303 | 5303 | } |
| 5304 | 5304 | |
| 5305 | - $images_count = max( $images_count, count( $current_images ) ); |
|
| 5305 | + $images_count = max($images_count, count($current_images)); |
|
| 5306 | 5306 | } |
| 5307 | 5307 | |
| 5308 | 5308 | $csv_row = array(); |
@@ -5314,7 +5314,7 @@ discard block |
||
| 5314 | 5314 | $csv_row[] = $default_category; // default_category |
| 5315 | 5315 | $csv_row[] = $post_tags; // post_tags |
| 5316 | 5316 | $csv_row[] = $post_type; // post_type |
| 5317 | - if ( $post_type == 'gd_event' ) {
|
|
| 5317 | + if ($post_type == 'gd_event') {
|
|
| 5318 | 5318 | $event_data = geodir_imex_get_event_data($post, $gd_post_info); |
| 5319 | 5319 | $csv_row[] = $event_data['event_date']; // event_date |
| 5320 | 5320 | $csv_row[] = $event_data['event_enddate']; // enddate |
@@ -5335,12 +5335,12 @@ discard block |
||
| 5335 | 5335 | $csv_row[] = $event_data['recurring_end_date']; // repeat_end |
| 5336 | 5336 | } |
| 5337 | 5337 | $csv_row[] = $post_info['post_status']; // post_status |
| 5338 | - $csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured |
|
| 5338 | + $csv_row[] = (int) $post_info['is_featured'] == 1 ? 1 : ''; // is_featured |
|
| 5339 | 5339 | if ($is_claim_active) {
|
| 5340 | - $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5340 | + $csv_row[] = !empty($post_info['claimed']) && (int) $post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5341 | 5341 | } |
| 5342 | 5342 | if ($is_payment_plugin) {
|
| 5343 | - $csv_row[] = (int)$post_info['package_id']; // package_id |
|
| 5343 | + $csv_row[] = (int) $post_info['package_id']; // package_id |
|
| 5344 | 5344 | $csv_row[] = $post_info['alive_days'] !== '' ? absint($post_info['alive_days']) : ''; // alive_days |
| 5345 | 5345 | $csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date
|
| 5346 | 5346 | } |
@@ -5376,18 +5376,18 @@ discard block |
||
| 5376 | 5376 | $csv_row[] = stripslashes($post_info['geodir_video']); // geodir_video |
| 5377 | 5377 | $csv_row[] = stripslashes($post_info['geodir_special_offers']); // geodir_special_offers |
| 5378 | 5378 | if ($is_events_active || $is_custom_posts_active) {
|
| 5379 | - $csv_row[] = !empty($post_info['geodir_link_business']) ? (int)$post_info['geodir_link_business'] : ''; // linked business |
|
| 5379 | + $csv_row[] = !empty($post_info['geodir_link_business']) ? (int) $post_info['geodir_link_business'] : ''; // linked business |
|
| 5380 | 5380 | } |
| 5381 | 5381 | // WPML |
| 5382 | 5382 | if ($is_wpml) {
|
| 5383 | - $csv_row[] = geodir_get_language_for_element( $post_id, 'post_' . $post_type ); |
|
| 5384 | - $csv_row[] = geodir_imex_original_post_id( $post_id, 'post_' . $post_type ); |
|
| 5383 | + $csv_row[] = geodir_get_language_for_element($post_id, 'post_'.$post_type); |
|
| 5384 | + $csv_row[] = geodir_imex_original_post_id($post_id, 'post_'.$post_type); |
|
| 5385 | 5385 | } |
| 5386 | 5386 | // WPML |
| 5387 | 5387 | |
| 5388 | - if ( !empty( $custom_fields ) ) {
|
|
| 5389 | - foreach ( $custom_fields as $custom_field ) {
|
|
| 5390 | - $csv_row[] = isset( $post_info[$custom_field->htmlvar_name] ) ? $post_info[$custom_field->htmlvar_name] : ''; |
|
| 5388 | + if (!empty($custom_fields)) {
|
|
| 5389 | + foreach ($custom_fields as $custom_field) {
|
|
| 5390 | + $csv_row[] = isset($post_info[$custom_field->htmlvar_name]) ? $post_info[$custom_field->htmlvar_name] : ''; |
|
| 5391 | 5391 | } |
| 5392 | 5392 | } |
| 5393 | 5393 | |
@@ -5398,15 +5398,15 @@ discard block |
||
| 5398 | 5398 | $franchise = ''; |
| 5399 | 5399 | |
| 5400 | 5400 | if (geodir_franchise_pkg_is_active($gd_post_info)) {
|
| 5401 | - $gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true ); |
|
| 5402 | - $locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : ''; |
|
| 5401 | + $gd_is_franchise = (int) get_post_meta($post_id, 'gd_is_franchise', true); |
|
| 5402 | + $locaked_fields = $gd_is_franchise ? get_post_meta($post_id, 'gd_franchise_lock', true) : ''; |
|
| 5403 | 5403 | $locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');
|
| 5404 | - $franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id |
|
| 5404 | + $franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 ? (int) $post_info['franchise'] : 0; // franchise id |
|
| 5405 | 5405 | } |
| 5406 | 5406 | |
| 5407 | - $csv_row[] = (int)$gd_is_franchise; // gd_is_franchise |
|
| 5407 | + $csv_row[] = (int) $gd_is_franchise; // gd_is_franchise |
|
| 5408 | 5408 | $csv_row[] = $locaked_fields; // gd_franchise_lock fields |
| 5409 | - $csv_row[] = (int)$franchise; // franchise id |
|
| 5409 | + $csv_row[] = (int) $franchise; // franchise id |
|
| 5410 | 5410 | } |
| 5411 | 5411 | |
| 5412 | 5412 | /** |
@@ -5420,15 +5420,15 @@ discard block |
||
| 5420 | 5420 | */ |
| 5421 | 5421 | $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
|
| 5422 | 5422 | |
| 5423 | - for ( $c = 0; $c < $images_count; $c++ ) {
|
|
| 5424 | - $csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE |
|
| 5423 | + for ($c = 0; $c < $images_count; $c++) {
|
|
| 5424 | + $csv_row[] = isset($current_images[$c]) ? $current_images[$c] : ''; // IMAGE |
|
| 5425 | 5425 | } |
| 5426 | 5426 | |
| 5427 | 5427 | $csv_rows[] = $csv_row; |
| 5428 | 5428 | |
| 5429 | 5429 | } |
| 5430 | 5430 | |
| 5431 | - for ( $c = 0; $c < $images_count; $c++ ) {
|
|
| 5431 | + for ($c = 0; $c < $images_count; $c++) {
|
|
| 5432 | 5432 | $csv_rows[0][] = 'IMAGE'; |
| 5433 | 5433 | } |
| 5434 | 5434 | } |
@@ -5450,30 +5450,30 @@ discard block |
||
| 5450 | 5450 | * @param int $page_no Page number. Default 0. |
| 5451 | 5451 | * @return array Array of posts data. |
| 5452 | 5452 | */ |
| 5453 | -function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {
|
|
| 5453 | +function geodir_get_export_posts($post_type, $per_page = 0, $page_no = 0) {
|
|
| 5454 | 5454 | global $wpdb, $plugin_prefix; |
| 5455 | 5455 | |
| 5456 | - if ( ! post_type_exists( $post_type ) ) |
|
| 5456 | + if (!post_type_exists($post_type)) |
|
| 5457 | 5457 | return new stdClass; |
| 5458 | 5458 | |
| 5459 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5459 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 5460 | 5460 | |
| 5461 | 5461 | $limit = ''; |
| 5462 | - if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5463 | - $offset = ( $page_no - 1 ) * $per_page; |
|
| 5462 | + if ($per_page > 0 && $page_no > 0) {
|
|
| 5463 | + $offset = ($page_no - 1) * $per_page; |
|
| 5464 | 5464 | |
| 5465 | - if ( $offset > 0 ) {
|
|
| 5466 | - $limit = " LIMIT " . $offset . "," . $per_page; |
|
| 5465 | + if ($offset > 0) {
|
|
| 5466 | + $limit = " LIMIT ".$offset.",".$per_page; |
|
| 5467 | 5467 | } else {
|
| 5468 | - $limit = " LIMIT " . $per_page; |
|
| 5468 | + $limit = " LIMIT ".$per_page; |
|
| 5469 | 5469 | } |
| 5470 | 5470 | } |
| 5471 | 5471 | |
| 5472 | 5472 | // Skip listing with statuses trash, auto-draft etc... |
| 5473 | 5473 | $skip_statuses = geodir_imex_export_skip_statuses(); |
| 5474 | 5474 | $where_statuses = ''; |
| 5475 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5476 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5475 | + if (!empty($skip_statuses) && is_array($skip_statuses)) {
|
|
| 5476 | + $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
|
|
| 5477 | 5477 | } |
| 5478 | 5478 | |
| 5479 | 5479 | /** |
@@ -5484,9 +5484,9 @@ discard block |
||
| 5484 | 5484 | * |
| 5485 | 5485 | * @param string $where SQL where clause part. |
| 5486 | 5486 | */ |
| 5487 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5487 | + $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);
|
|
| 5488 | 5488 | |
| 5489 | - $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );
|
|
| 5489 | + $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." ORDER BY {$wpdb->posts}.ID ASC".$limit, $post_type);
|
|
| 5490 | 5490 | /** |
| 5491 | 5491 | * Modify returned posts SQL query for the current post type. |
| 5492 | 5492 | * |
@@ -5496,8 +5496,8 @@ discard block |
||
| 5496 | 5496 | * @param int $query The SQL query. |
| 5497 | 5497 | * @param string $post_type Post type. |
| 5498 | 5498 | */ |
| 5499 | - $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type ); |
|
| 5500 | - $results = (array)$wpdb->get_results( $query, ARRAY_A ); |
|
| 5499 | + $query = apply_filters('geodir_imex_export_posts_query', $query, $post_type);
|
|
| 5500 | + $results = (array) $wpdb->get_results($query, ARRAY_A); |
|
| 5501 | 5501 | |
| 5502 | 5502 | /** |
| 5503 | 5503 | * Modify returned post results for the current post type. |
@@ -5508,7 +5508,7 @@ discard block |
||
| 5508 | 5508 | * @param object $results An object containing all post ids. |
| 5509 | 5509 | * @param string $post_type Post type. |
| 5510 | 5510 | */ |
| 5511 | - return apply_filters( 'geodir_export_posts', $results, $post_type ); |
|
| 5511 | + return apply_filters('geodir_export_posts', $results, $post_type);
|
|
| 5512 | 5512 | } |
| 5513 | 5513 | |
| 5514 | 5514 | /** |
@@ -5526,24 +5526,24 @@ discard block |
||
| 5526 | 5526 | * @param string $post_type Post type. |
| 5527 | 5527 | * @return string The SQL query. |
| 5528 | 5528 | */ |
| 5529 | -function geodir_imex_get_events_query( $query, $post_type ) {
|
|
| 5530 | - if ( $post_type == 'gd_event' ) {
|
|
| 5529 | +function geodir_imex_get_events_query($query, $post_type) {
|
|
| 5530 | + if ($post_type == 'gd_event') {
|
|
| 5531 | 5531 | global $wpdb, $plugin_prefix; |
| 5532 | 5532 | |
| 5533 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5533 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 5534 | 5534 | $schedule_table = EVENT_SCHEDULE; |
| 5535 | 5535 | |
| 5536 | 5536 | // Skip listing with statuses trash, auto-draft etc... |
| 5537 | 5537 | $skip_statuses = geodir_imex_export_skip_statuses(); |
| 5538 | 5538 | $where_statuses = ''; |
| 5539 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5540 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5539 | + if (!empty($skip_statuses) && is_array($skip_statuses)) {
|
|
| 5540 | + $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
|
|
| 5541 | 5541 | } |
| 5542 | 5542 | |
| 5543 | 5543 | /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */ |
| 5544 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5544 | + $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);
|
|
| 5545 | 5545 | |
| 5546 | - $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );
|
|
| 5546 | + $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type);
|
|
| 5547 | 5547 | } |
| 5548 | 5548 | |
| 5549 | 5549 | return $query; |
@@ -5567,35 +5567,35 @@ discard block |
||
| 5567 | 5567 | * @param string $post_type Post type. |
| 5568 | 5568 | * @return int Total terms count. |
| 5569 | 5569 | */ |
| 5570 | -function geodir_get_terms_count( $post_type ) {
|
|
| 5571 | - $args = array( 'hide_empty' => 0 ); |
|
| 5570 | +function geodir_get_terms_count($post_type) {
|
|
| 5571 | + $args = array('hide_empty' => 0);
|
|
| 5572 | 5572 | |
| 5573 | - remove_all_filters( 'get_terms' ); |
|
| 5573 | + remove_all_filters('get_terms');
|
|
| 5574 | 5574 | |
| 5575 | - $taxonomy = $post_type . 'category'; |
|
| 5575 | + $taxonomy = $post_type.'category'; |
|
| 5576 | 5576 | |
| 5577 | 5577 | // WPML |
| 5578 | 5578 | $is_wpml = geodir_is_wpml(); |
| 5579 | 5579 | $active_lang = 'all'; |
| 5580 | - if ( $is_wpml ) {
|
|
| 5580 | + if ($is_wpml) {
|
|
| 5581 | 5581 | global $sitepress; |
| 5582 | 5582 | $active_lang = $sitepress->get_current_language(); |
| 5583 | 5583 | |
| 5584 | - if ( $active_lang != 'all' ) {
|
|
| 5585 | - $sitepress->switch_lang( 'all', true ); |
|
| 5584 | + if ($active_lang != 'all') {
|
|
| 5585 | + $sitepress->switch_lang('all', true);
|
|
| 5586 | 5586 | } |
| 5587 | 5587 | } |
| 5588 | 5588 | // WPML |
| 5589 | 5589 | |
| 5590 | - $count_terms = wp_count_terms( $taxonomy, $args ); |
|
| 5590 | + $count_terms = wp_count_terms($taxonomy, $args); |
|
| 5591 | 5591 | |
| 5592 | 5592 | // WPML |
| 5593 | - if ( $is_wpml && $active_lang !== 'all' ) {
|
|
| 5593 | + if ($is_wpml && $active_lang !== 'all') {
|
|
| 5594 | 5594 | global $sitepress; |
| 5595 | - $sitepress->switch_lang( $active_lang, true ); |
|
| 5595 | + $sitepress->switch_lang($active_lang, true); |
|
| 5596 | 5596 | } |
| 5597 | 5597 | // WPML |
| 5598 | - $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0; |
|
| 5598 | + $count_terms = !is_wp_error($count_terms) ? $count_terms : 0; |
|
| 5599 | 5599 | |
| 5600 | 5600 | return $count_terms; |
| 5601 | 5601 | } |
@@ -5612,23 +5612,23 @@ discard block |
||
| 5612 | 5612 | * @param int $page_no Page number. Default 0. |
| 5613 | 5613 | * @return array Array of terms data. |
| 5614 | 5614 | */ |
| 5615 | -function geodir_imex_get_terms( $post_type, $per_page = 0, $page_no = 0 ) {
|
|
| 5616 | - $args = array( 'hide_empty' => 0, 'orderby' => 'id' ); |
|
| 5615 | +function geodir_imex_get_terms($post_type, $per_page = 0, $page_no = 0) {
|
|
| 5616 | + $args = array('hide_empty' => 0, 'orderby' => 'id');
|
|
| 5617 | 5617 | |
| 5618 | - remove_all_filters( 'get_terms' ); |
|
| 5618 | + remove_all_filters('get_terms');
|
|
| 5619 | 5619 | |
| 5620 | - $taxonomy = $post_type . 'category'; |
|
| 5620 | + $taxonomy = $post_type.'category'; |
|
| 5621 | 5621 | |
| 5622 | - if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5623 | - $args['offset'] = ( $page_no - 1 ) * $per_page; |
|
| 5622 | + if ($per_page > 0 && $page_no > 0) {
|
|
| 5623 | + $args['offset'] = ($page_no - 1) * $per_page; |
|
| 5624 | 5624 | $args['number'] = $per_page; |
| 5625 | 5625 | } |
| 5626 | 5626 | |
| 5627 | - $terms = get_terms( $taxonomy, $args ); |
|
| 5627 | + $terms = get_terms($taxonomy, $args); |
|
| 5628 | 5628 | |
| 5629 | 5629 | $csv_rows = array(); |
| 5630 | 5630 | |
| 5631 | - if ( !empty( $terms ) ) {
|
|
| 5631 | + if (!empty($terms)) {
|
|
| 5632 | 5632 | $csv_row = array(); |
| 5633 | 5633 | $csv_row[] = 'cat_id'; |
| 5634 | 5634 | $csv_row[] = 'cat_name'; |
@@ -5637,7 +5637,7 @@ discard block |
||
| 5637 | 5637 | $csv_row[] = 'cat_parent'; |
| 5638 | 5638 | $csv_row[] = 'cat_schema'; |
| 5639 | 5639 | // WPML |
| 5640 | - $is_wpml = geodir_wpml_is_taxonomy_translated( $taxonomy ); |
|
| 5640 | + $is_wpml = geodir_wpml_is_taxonomy_translated($taxonomy); |
|
| 5641 | 5641 | if ($is_wpml) {
|
| 5642 | 5642 | $csv_row[] = 'cat_language'; |
| 5643 | 5643 | $csv_row[] = 'cat_id_original'; |
@@ -5650,16 +5650,16 @@ discard block |
||
| 5650 | 5650 | |
| 5651 | 5651 | $csv_rows[] = $csv_row; |
| 5652 | 5652 | |
| 5653 | - foreach ( $terms as $term ) {
|
|
| 5654 | - $cat_icon = geodir_get_tax_meta( $term->term_id, 'ct_cat_icon', false, $post_type ); |
|
| 5655 | - $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
| 5653 | + foreach ($terms as $term) {
|
|
| 5654 | + $cat_icon = geodir_get_tax_meta($term->term_id, 'ct_cat_icon', false, $post_type); |
|
| 5655 | + $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : ''; |
|
| 5656 | 5656 | |
| 5657 | - $cat_image = geodir_get_default_catimage( $term->term_id, $post_type ); |
|
| 5658 | - $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
| 5657 | + $cat_image = geodir_get_default_catimage($term->term_id, $post_type); |
|
| 5658 | + $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : ''; |
|
| 5659 | 5659 | |
| 5660 | 5660 | $cat_parent = ''; |
| 5661 | - if (isset($term->parent) && (int)$term->parent > 0 && term_exists((int)$term->parent, $taxonomy)) {
|
|
| 5662 | - $parent_term = (array)get_term_by( 'id', (int)$term->parent, $taxonomy ); |
|
| 5661 | + if (isset($term->parent) && (int) $term->parent > 0 && term_exists((int) $term->parent, $taxonomy)) {
|
|
| 5662 | + $parent_term = (array) get_term_by('id', (int) $term->parent, $taxonomy);
|
|
| 5663 | 5663 | $cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : ''; |
| 5664 | 5664 | } |
| 5665 | 5665 | |
@@ -5669,15 +5669,15 @@ discard block |
||
| 5669 | 5669 | $csv_row[] = $term->slug; |
| 5670 | 5670 | $csv_row[] = $post_type; |
| 5671 | 5671 | $csv_row[] = $cat_parent; |
| 5672 | - $csv_row[] = geodir_get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type ); |
|
| 5672 | + $csv_row[] = geodir_get_tax_meta($term->term_id, 'ct_cat_schema', false, $post_type); |
|
| 5673 | 5673 | // WPML |
| 5674 | 5674 | if ($is_wpml) {
|
| 5675 | - $csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5676 | - $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5675 | + $csv_row[] = geodir_get_language_for_element($term->term_id, 'tax_'.$taxonomy); |
|
| 5676 | + $csv_row[] = geodir_imex_original_post_id($term->term_id, 'tax_'.$taxonomy); |
|
| 5677 | 5677 | } |
| 5678 | 5678 | // WPML |
| 5679 | 5679 | $csv_row[] = $term->description; |
| 5680 | - $csv_row[] = geodir_get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type ); |
|
| 5680 | + $csv_row[] = geodir_get_tax_meta($term->term_id, 'ct_cat_top_desc', false, $post_type); |
|
| 5681 | 5681 | $csv_row[] = $cat_image; |
| 5682 | 5682 | $csv_row[] = $cat_icon; |
| 5683 | 5683 | |
@@ -5696,10 +5696,10 @@ discard block |
||
| 5696 | 5696 | * @param bool $relative True for relative path & False for absolute path. |
| 5697 | 5697 | * @return string Path to the cache directory. |
| 5698 | 5698 | */ |
| 5699 | -function geodir_path_import_export( $relative = true ) {
|
|
| 5699 | +function geodir_path_import_export($relative = true) {
|
|
| 5700 | 5700 | $upload_dir = wp_upload_dir(); |
| 5701 | 5701 | |
| 5702 | - return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache'; |
|
| 5702 | + return $relative ? $upload_dir['baseurl'].'/cache' : $upload_dir['basedir'].'/cache'; |
|
| 5703 | 5703 | } |
| 5704 | 5704 | |
| 5705 | 5705 | /** |
@@ -5715,8 +5715,8 @@ discard block |
||
| 5715 | 5715 | * @param bool $clear If true then it overwrite data otherwise add rows at the end of file. |
| 5716 | 5716 | * @return bool true if success otherwise false. |
| 5717 | 5717 | */ |
| 5718 | -function geodir_save_csv_data( $file_path, $csv_data = array(), $clear = true ) {
|
|
| 5719 | - if ( empty( $csv_data ) ) {
|
|
| 5718 | +function geodir_save_csv_data($file_path, $csv_data = array(), $clear = true) {
|
|
| 5719 | + if (empty($csv_data)) {
|
|
| 5720 | 5720 | return false; |
| 5721 | 5721 | } |
| 5722 | 5722 | |
@@ -5724,17 +5724,17 @@ discard block |
||
| 5724 | 5724 | |
| 5725 | 5725 | $mode = $clear ? 'w+' : 'a+'; |
| 5726 | 5726 | |
| 5727 | - if ( function_exists( 'fputcsv' ) ) {
|
|
| 5728 | - $file = fopen( $file_path, $mode ); |
|
| 5729 | - foreach( $csv_data as $csv_row ) {
|
|
| 5727 | + if (function_exists('fputcsv')) {
|
|
| 5728 | + $file = fopen($file_path, $mode); |
|
| 5729 | + foreach ($csv_data as $csv_row) {
|
|
| 5730 | 5730 | //$csv_row = array_map( 'utf8_decode', $csv_row ); |
| 5731 | - $write_successful = fputcsv( $file, $csv_row, ",", $enclosure = '"' ); |
|
| 5731 | + $write_successful = fputcsv($file, $csv_row, ",", $enclosure = '"'); |
|
| 5732 | 5732 | } |
| 5733 | - fclose( $file ); |
|
| 5733 | + fclose($file); |
|
| 5734 | 5734 | } else {
|
| 5735 | - foreach( $csv_data as $csv_row ) {
|
|
| 5735 | + foreach ($csv_data as $csv_row) {
|
|
| 5736 | 5736 | //$csv_row = array_map( 'utf8_decode', $csv_row ); |
| 5737 | - $wp_filesystem->put_contents( $file_path, $csv_row ); |
|
| 5737 | + $wp_filesystem->put_contents($file_path, $csv_row); |
|
| 5738 | 5738 | } |
| 5739 | 5739 | } |
| 5740 | 5740 | |
@@ -5752,14 +5752,14 @@ discard block |
||
| 5752 | 5752 | * @param string $file Full path to file. |
| 5753 | 5753 | * @return int No of file rows. |
| 5754 | 5754 | */ |
| 5755 | -function geodir_import_export_line_count( $file ) {
|
|
| 5755 | +function geodir_import_export_line_count($file) {
|
|
| 5756 | 5756 | global $wp_filesystem; |
| 5757 | 5757 | |
| 5758 | - if ( $wp_filesystem->is_file( $file ) && $wp_filesystem->exists( $file ) ) {
|
|
| 5759 | - $contents = $wp_filesystem->get_contents_array( $file ); |
|
| 5758 | + if ($wp_filesystem->is_file($file) && $wp_filesystem->exists($file)) {
|
|
| 5759 | + $contents = $wp_filesystem->get_contents_array($file); |
|
| 5760 | 5760 | |
| 5761 | - if ( !empty( $contents ) && is_array( $contents ) ) {
|
|
| 5762 | - return count( $contents ) - 1; |
|
| 5761 | + if (!empty($contents) && is_array($contents)) {
|
|
| 5762 | + return count($contents) - 1; |
|
| 5763 | 5763 | } |
| 5764 | 5764 | } |
| 5765 | 5765 | |
@@ -5776,11 +5776,11 @@ discard block |
||
| 5776 | 5776 | * @param string $post_type The post type. |
| 5777 | 5777 | * @return object Queried object. |
| 5778 | 5778 | */ |
| 5779 | -function geodir_imex_get_custom_fields( $post_type ) {
|
|
| 5779 | +function geodir_imex_get_custom_fields($post_type) {
|
|
| 5780 | 5780 | global $wpdb; |
| 5781 | 5781 | |
| 5782 | - $sql = $wpdb->prepare("SELECT htmlvar_name FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array( $post_type ) );
|
|
| 5783 | - $rows = $wpdb->get_results( $sql ); |
|
| 5782 | + $sql = $wpdb->prepare("SELECT htmlvar_name FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array($post_type));
|
|
| 5783 | + $rows = $wpdb->get_results($sql); |
|
| 5784 | 5784 | |
| 5785 | 5785 | return $rows; |
| 5786 | 5786 | } |
@@ -5796,10 +5796,10 @@ discard block |
||
| 5796 | 5796 | * @return array Event data array. |
| 5797 | 5797 | */ |
| 5798 | 5798 | function geodir_imex_get_event_data($post, $gd_post_info) {
|
| 5799 | - $event_date = isset( $post['event_date'] ) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $post['event_date'] ) ) : ''; |
|
| 5799 | + $event_date = isset($post['event_date']) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($post['event_date'])) : '';
|
|
| 5800 | 5800 | $event_enddate = $event_date; |
| 5801 | - $starttime = isset( $post['starttime'] ) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['starttime'] ) ) : ''; |
|
| 5802 | - $endtime = isset( $post['endtime'] ) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['endtime'] ) ) : ''; |
|
| 5801 | + $starttime = isset($post['starttime']) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['starttime'])) : '';
|
|
| 5802 | + $endtime = isset($post['endtime']) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['endtime'])) : '';
|
|
| 5803 | 5803 | |
| 5804 | 5804 | $is_recurring_event = ''; |
| 5805 | 5805 | $event_duration_days = ''; |
@@ -5816,15 +5816,15 @@ discard block |
||
| 5816 | 5816 | |
| 5817 | 5817 | $recurring_data = isset($gd_post_info->recurring_dates) ? maybe_unserialize($gd_post_info->recurring_dates) : array(); |
| 5818 | 5818 | if (!empty($recurring_data)) {
|
| 5819 | - $event_date = isset( $recurring_data['event_start'] ) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_start'] ) ) : $event_date; |
|
| 5820 | - $event_enddate = isset( $recurring_data['event_end'] ) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_end'] ) ) : $event_date; |
|
| 5821 | - $starttime = isset( $recurring_data['starttime'] ) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['starttime'] ) ) : $starttime; |
|
| 5822 | - $endtime = isset( $recurring_data['endtime'] ) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['endtime'] ) ) : $endtime; |
|
| 5819 | + $event_date = isset($recurring_data['event_start']) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_start'])) : $event_date;
|
|
| 5820 | + $event_enddate = isset($recurring_data['event_end']) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_end'])) : $event_date;
|
|
| 5821 | + $starttime = isset($recurring_data['starttime']) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['starttime'])) : $starttime;
|
|
| 5822 | + $endtime = isset($recurring_data['endtime']) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['endtime'])) : $endtime;
|
|
| 5823 | 5823 | $is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : ''; |
| 5824 | 5824 | $different_times = !empty($recurring_data['different_times']) ? true : false; |
| 5825 | 5825 | |
| 5826 | - $recurring_pkg = geodir_event_recurring_pkg( $gd_post_info ); |
|
| 5827 | - $is_recurring = isset( $gd_post_info->is_recurring ) && (int)$gd_post_info->is_recurring == 0 ? false : true; |
|
| 5826 | + $recurring_pkg = geodir_event_recurring_pkg($gd_post_info); |
|
| 5827 | + $is_recurring = isset($gd_post_info->is_recurring) && (int) $gd_post_info->is_recurring == 0 ? false : true; |
|
| 5828 | 5828 | |
| 5829 | 5829 | if ($recurring_pkg && $is_recurring) {
|
| 5830 | 5830 | $recurring_dates = $event_date; |
@@ -5834,13 +5834,13 @@ discard block |
||
| 5834 | 5834 | $recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';
|
| 5835 | 5835 | |
| 5836 | 5836 | if (!empty($recurring_data['event_recurring_dates'])) {
|
| 5837 | - $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] ); |
|
| 5837 | + $event_recurring_dates = explode(',', $recurring_data['event_recurring_dates']);
|
|
| 5838 | 5838 | |
| 5839 | 5839 | if (!empty($event_recurring_dates)) {
|
| 5840 | 5840 | $recurring_dates = array(); |
| 5841 | 5841 | |
| 5842 | 5842 | foreach ($event_recurring_dates as $date) {
|
| 5843 | - $recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) ); |
|
| 5843 | + $recurring_dates[] = date_i18n('d/m/Y', strtotime($date));
|
|
| 5844 | 5844 | } |
| 5845 | 5845 | |
| 5846 | 5846 | $recurring_dates = implode(",", $recurring_dates);
|
@@ -5856,7 +5856,7 @@ discard block |
||
| 5856 | 5856 | $times = array(); |
| 5857 | 5857 | |
| 5858 | 5858 | foreach ($recurring_data['starttimes'] as $time) {
|
| 5859 | - $times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00'; |
|
| 5859 | + $times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';
|
|
| 5860 | 5860 | } |
| 5861 | 5861 | |
| 5862 | 5862 | $event_starttimes = implode(",", $times);
|
@@ -5866,7 +5866,7 @@ discard block |
||
| 5866 | 5866 | $times = array(); |
| 5867 | 5867 | |
| 5868 | 5868 | foreach ($recurring_data['endtimes'] as $time) {
|
| 5869 | - $times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00'; |
|
| 5869 | + $times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';
|
|
| 5870 | 5870 | } |
| 5871 | 5871 | |
| 5872 | 5872 | $event_endtimes = implode(",", $times);
|
@@ -5878,8 +5878,8 @@ discard block |
||
| 5878 | 5878 | } |
| 5879 | 5879 | } |
| 5880 | 5880 | } else {
|
| 5881 | - $event_duration_days = isset($recurring_data['duration_x']) ? (int)$recurring_data['duration_x'] : 1; |
|
| 5882 | - $recurring_interval = !empty($recurring_data['repeat_x']) && (int)$recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1; |
|
| 5881 | + $event_duration_days = isset($recurring_data['duration_x']) ? (int) $recurring_data['duration_x'] : 1; |
|
| 5882 | + $recurring_interval = !empty($recurring_data['repeat_x']) && (int) $recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1; |
|
| 5883 | 5883 | |
| 5884 | 5884 | if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {
|
| 5885 | 5885 | $week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');
|
@@ -5895,11 +5895,11 @@ discard block |
||
| 5895 | 5895 | } |
| 5896 | 5896 | |
| 5897 | 5897 | $recurring_week_nos = $recurring_type == 'month' && !empty($recurring_data['repeat_weeks']) ? implode(",", $recurring_data['repeat_weeks']) : $recurring_week_nos;
|
| 5898 | - if (!empty($recurring_data['repeat_end_type']) && (int)$recurring_data['repeat_end_type'] == 1) {
|
|
| 5899 | - $recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['repeat_end'] ) ) : ''; |
|
| 5898 | + if (!empty($recurring_data['repeat_end_type']) && (int) $recurring_data['repeat_end_type'] == 1) {
|
|
| 5899 | + $recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['repeat_end'])) : '';
|
|
| 5900 | 5900 | $max_recurring_count = empty($recurring_end_date) ? 1 : ''; |
| 5901 | 5901 | } else {
|
| 5902 | - $max_recurring_count = (!empty($recurring_data['max_repeat']) && (int)$recurring_data['max_repeat'] > 0 ? (int)$recurring_data['max_repeat'] : 1); |
|
| 5902 | + $max_recurring_count = (!empty($recurring_data['max_repeat']) && (int) $recurring_data['max_repeat'] > 0 ? (int) $recurring_data['max_repeat'] : 1); |
|
| 5903 | 5903 | } |
| 5904 | 5904 | } |
| 5905 | 5905 | } |
@@ -5963,9 +5963,9 @@ discard block |
||
| 5963 | 5963 | * @return array Event data array. |
| 5964 | 5964 | */ |
| 5965 | 5965 | function geodir_imex_process_event_data($gd_post) {
|
| 5966 | - $recurring_pkg = geodir_event_recurring_pkg( (object)$gd_post ); |
|
| 5966 | + $recurring_pkg = geodir_event_recurring_pkg((object) $gd_post); |
|
| 5967 | 5967 | |
| 5968 | - $is_recurring = isset( $gd_post['is_recurring_event'] ) && (int)$gd_post['is_recurring_event'] == 0 ? false : true; |
|
| 5968 | + $is_recurring = isset($gd_post['is_recurring_event']) && (int) $gd_post['is_recurring_event'] == 0 ? false : true; |
|
| 5969 | 5969 | $event_date = isset($gd_post['event_date']) && $gd_post['event_date'] != '' ? geodir_date($gd_post['event_date'], 'Y-m-d') : ''; |
| 5970 | 5970 | $event_enddate = isset($gd_post['event_enddate']) && $gd_post['event_enddate'] != '' ? geodir_date($gd_post['event_enddate'], 'Y-m-d') : $event_date; |
| 5971 | 5971 | $all_day = isset($gd_post['is_whole_day_event']) && !empty($gd_post['is_whole_day_event']) ? true : false; |
@@ -6012,17 +6012,17 @@ discard block |
||
| 6012 | 6012 | $event_recurring_dates = implode(",", $event_recurring_dates);
|
| 6013 | 6013 | } |
| 6014 | 6014 | } else {
|
| 6015 | - $duration_x = !empty( $gd_post['event_duration_days'] ) ? (int)$gd_post['event_duration_days'] : 1; |
|
| 6016 | - $repeat_x = !empty( $gd_post['recurring_interval'] ) ? (int)$gd_post['recurring_interval'] : 1; |
|
| 6017 | - $max_repeat = !empty( $gd_post['max_recurring_count'] ) ? (int)$gd_post['max_recurring_count'] : 1; |
|
| 6018 | - $repeat_end = !empty( $gd_post['recurring_end_date'] ) ? geodir_date($gd_post['recurring_end_date'], 'Y-m-d') : ''; |
|
| 6015 | + $duration_x = !empty($gd_post['event_duration_days']) ? (int) $gd_post['event_duration_days'] : 1; |
|
| 6016 | + $repeat_x = !empty($gd_post['recurring_interval']) ? (int) $gd_post['recurring_interval'] : 1; |
|
| 6017 | + $max_repeat = !empty($gd_post['max_recurring_count']) ? (int) $gd_post['max_recurring_count'] : 1; |
|
| 6018 | + $repeat_end = !empty($gd_post['recurring_end_date']) ? geodir_date($gd_post['recurring_end_date'], 'Y-m-d') : ''; |
|
| 6019 | 6019 | |
| 6020 | 6020 | $repeat_end_type = $repeat_end != '' ? 1 : 0; |
| 6021 | 6021 | $max_repeat = $repeat_end != '' ? '' : $max_repeat; |
| 6022 | 6022 | |
| 6023 | 6023 | $week_days = array_flip(array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'));
|
| 6024 | 6024 | |
| 6025 | - $a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days'])!='' ? explode(',', trim($gd_post['recurring_week_days'])) : array();
|
|
| 6025 | + $a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days']) != '' ? explode(',', trim($gd_post['recurring_week_days'])) : array();
|
|
| 6026 | 6026 | $repeat_days = array(); |
| 6027 | 6027 | if (!empty($a_repeat_days)) {
|
| 6028 | 6028 | foreach ($a_repeat_days as $repeat_day) {
|
@@ -6040,7 +6040,7 @@ discard block |
||
| 6040 | 6040 | $repeat_weeks = array(); |
| 6041 | 6041 | if (!empty($a_repeat_weeks)) {
|
| 6042 | 6042 | foreach ($a_repeat_weeks as $repeat_week) {
|
| 6043 | - $repeat_weeks[] = (int)$repeat_week; |
|
| 6043 | + $repeat_weeks[] = (int) $repeat_week; |
|
| 6044 | 6044 | } |
| 6045 | 6045 | |
| 6046 | 6046 | $repeat_weeks = array_unique($repeat_weeks); |
@@ -6104,7 +6104,7 @@ discard block |
||
| 6104 | 6104 | |
| 6105 | 6105 | $page_found = $wpdb->get_var( |
| 6106 | 6106 | $wpdb->prepare( |
| 6107 | - "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 6107 | + "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;", |
|
| 6108 | 6108 | array($slug) |
| 6109 | 6109 | ) |
| 6110 | 6110 | ); |
@@ -6159,7 +6159,7 @@ discard block |
||
| 6159 | 6159 | */ |
| 6160 | 6160 | function geodir_admin_upgrade_notice() {
|
| 6161 | 6161 | $class = "error"; |
| 6162 | - $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
|
|
| 6162 | + $message = __("Please update core GeoDirectory or some addons may not function correctly.", "geodirectory");
|
|
| 6163 | 6163 | echo"<div class=\"$class\"> <p>$message</p></div>"; |
| 6164 | 6164 | } |
| 6165 | 6165 | |
@@ -6171,7 +6171,7 @@ discard block |
||
| 6171 | 6171 | * @param (object) $r |
| 6172 | 6172 | * @return (string) $output |
| 6173 | 6173 | */ |
| 6174 | -function geodire_admin_upgrade_notice( $plugin_data, $r ) |
|
| 6174 | +function geodire_admin_upgrade_notice($plugin_data, $r) |
|
| 6175 | 6175 | {
|
| 6176 | 6176 | // readme contents |
| 6177 | 6177 | $args = array( |
@@ -6179,7 +6179,7 @@ discard block |
||
| 6179 | 6179 | 'redirection' => 5 |
| 6180 | 6180 | ); |
| 6181 | 6181 | $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt"; |
| 6182 | - $data = wp_remote_get( $url, $args ); |
|
| 6182 | + $data = wp_remote_get($url, $args); |
|
| 6183 | 6183 | |
| 6184 | 6184 | if (!is_wp_error($data) && $data['response']['code'] == 200) {
|
| 6185 | 6185 | |
@@ -6194,20 +6194,20 @@ discard block |
||
| 6194 | 6194 | function geodir_in_plugin_update_message($content) {
|
| 6195 | 6195 | // Output Upgrade Notice |
| 6196 | 6196 | $matches = null; |
| 6197 | - $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis'; |
|
| 6197 | + $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*'.preg_quote(GEODIRECTORY_VERSION).'\s*=|$)~Uis'; |
|
| 6198 | 6198 | $upgrade_notice = ''; |
| 6199 | - if ( preg_match( $regexp, $content, $matches ) ) {
|
|
| 6200 | - if(empty($matches)){return;}
|
|
| 6199 | + if (preg_match($regexp, $content, $matches)) {
|
|
| 6200 | + if (empty($matches)) {return; }
|
|
| 6201 | 6201 | |
| 6202 | - $version = trim( $matches[1] ); |
|
| 6203 | - if($version && $version>GEODIRECTORY_VERSION){
|
|
| 6202 | + $version = trim($matches[1]); |
|
| 6203 | + if ($version && $version > GEODIRECTORY_VERSION) {
|
|
| 6204 | 6204 | |
| 6205 | 6205 | |
| 6206 | - $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
|
|
| 6207 | - if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
|
|
| 6206 | + $notices = (array) preg_split('~[\r\n]+~', trim($matches[2]));
|
|
| 6207 | + if (version_compare(GEODIRECTORY_VERSION, $version, '<')) {
|
|
| 6208 | 6208 | $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">'; |
| 6209 | - foreach ( $notices as $index => $line ) {
|
|
| 6210 | - $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
|
|
| 6209 | + foreach ($notices as $index => $line) {
|
|
| 6210 | + $upgrade_notice .= wp_kses_post(preg_replace('~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line));
|
|
| 6211 | 6211 | } |
| 6212 | 6212 | $upgrade_notice .= '</div> '; |
| 6213 | 6213 | } |
@@ -6231,7 +6231,7 @@ discard block |
||
| 6231 | 6231 | $default_language = $sitepress->get_default_language(); |
| 6232 | 6232 | if ($current_language != 'all' && $current_language != $default_language) {
|
| 6233 | 6233 | ?> |
| 6234 | - <div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory');?></strong></p></div>
|
|
| 6234 | + <div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory'); ?></strong></p></div>
|
|
| 6235 | 6235 | <?php |
| 6236 | 6236 | } |
| 6237 | 6237 | } |
@@ -6246,7 +6246,7 @@ discard block |
||
| 6246 | 6246 | * @param array Listing statuses to be skipped. |
| 6247 | 6247 | */ |
| 6248 | 6248 | function geodir_imex_export_skip_statuses() {
|
| 6249 | - $statuses = array( 'trash', 'auto-draft' ); |
|
| 6249 | + $statuses = array('trash', 'auto-draft');
|
|
| 6250 | 6250 | |
| 6251 | 6251 | /** |
| 6252 | 6252 | * Filter the statuses to skip during GD export listings. |
@@ -6256,7 +6256,7 @@ discard block |
||
| 6256 | 6256 | * |
| 6257 | 6257 | * @param array $statuses Listing statuses to be skipped. |
| 6258 | 6258 | */ |
| 6259 | - $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses ); |
|
| 6259 | + $statuses = apply_filters('geodir_imex_export_skip_statuses', $statuses);
|
|
| 6260 | 6260 | |
| 6261 | 6261 | return $statuses; |
| 6262 | 6262 | } |
@@ -6327,16 +6327,16 @@ discard block |
||
| 6327 | 6327 | function geodir_imex_get_filter_where($where = '', $post_type = '') {
|
| 6328 | 6328 | global $wpdb; |
| 6329 | 6329 | |
| 6330 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6330 | + $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6331 | 6331 | |
| 6332 | - if ( !empty( $filters ) ) {
|
|
| 6333 | - foreach ( $filters as $field => $value ) {
|
|
| 6332 | + if (!empty($filters)) {
|
|
| 6333 | + foreach ($filters as $field => $value) {
|
|
| 6334 | 6334 | switch ($field) {
|
| 6335 | 6335 | case 'start_date': |
| 6336 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'"; |
|
| 6336 | + $where .= " AND `".$wpdb->posts."`.`post_date` >= '".sanitize_text_field($value)." 00:00:00'"; |
|
| 6337 | 6337 | break; |
| 6338 | 6338 | case 'end_date': |
| 6339 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'"; |
|
| 6339 | + $where .= " AND `".$wpdb->posts."`.`post_date` <= '".sanitize_text_field($value)." 23:59:59'"; |
|
| 6340 | 6340 | break; |
| 6341 | 6341 | } |
| 6342 | 6342 | } |
@@ -6348,25 +6348,25 @@ discard block |
||
| 6348 | 6348 | add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);
|
| 6349 | 6349 | |
| 6350 | 6350 | |
| 6351 | -function geodir_fix_for_primer_theme(){
|
|
| 6352 | - if(!defined( 'PRIMER_VERSION' )){return;}
|
|
| 6351 | +function geodir_fix_for_primer_theme() {
|
|
| 6352 | + if (!defined('PRIMER_VERSION')) {return; }
|
|
| 6353 | 6353 | global $pagenow; |
| 6354 | 6354 | |
| 6355 | - if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){
|
|
| 6355 | + if (('post.php' === $pagenow || 'post-new.php' === $pagenow) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']))) {
|
|
| 6356 | 6356 | |
| 6357 | - $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] ); |
|
| 6357 | + $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type($_GET['post']); |
|
| 6358 | 6358 | |
| 6359 | 6359 | $post_types = geodir_get_posttypes(); |
| 6360 | - if ($post_type && in_array($post_type, $post_types) ) {
|
|
| 6360 | + if ($post_type && in_array($post_type, $post_types)) {
|
|
| 6361 | 6361 | global $primer_customizer_layouts; |
| 6362 | - remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10); |
|
| 6362 | + remove_action('add_meta_boxes', array($primer_customizer_layouts, 'add_meta_box'), 10);
|
|
| 6363 | 6363 | } |
| 6364 | 6364 | } |
| 6365 | 6365 | |
| 6366 | 6366 | } |
| 6367 | 6367 | |
| 6368 | -if(is_admin()){
|
|
| 6369 | - add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
|
|
| 6368 | +if (is_admin()) {
|
|
| 6369 | + add_action('add_meta_boxes', 'geodir_fix_for_primer_theme', 0);
|
|
| 6370 | 6370 | } |
| 6371 | 6371 | |
| 6372 | 6372 | |
@@ -6499,32 +6499,32 @@ discard block |
||
| 6499 | 6499 | |
| 6500 | 6500 | function geodir_ga_activation_url() {
|
| 6501 | 6501 | |
| 6502 | - return add_query_arg( array( |
|
| 6502 | + return add_query_arg(array( |
|
| 6503 | 6503 | 'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
|
| 6504 | 6504 | 'scope' => GEODIR_GA_SCOPE, |
| 6505 | 6505 | 'response_type' => 'code', |
| 6506 | 6506 | 'redirect_uri' => GEODIR_GA_REDIRECT, |
| 6507 | 6507 | 'client_id' => GEODIR_GA_CLIENTID, |
| 6508 | - ), 'https://accounts.google.com/o/oauth2/auth' ); |
|
| 6508 | + ), 'https://accounts.google.com/o/oauth2/auth'); |
|
| 6509 | 6509 | |
| 6510 | 6510 | return $url; |
| 6511 | 6511 | } |
| 6512 | 6512 | |
| 6513 | -function geodir_gd_accounts(){
|
|
| 6513 | +function geodir_gd_accounts() {
|
|
| 6514 | 6514 | $accounts = array(); |
| 6515 | - $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true ); |
|
| 6516 | - if($useAuth){
|
|
| 6515 | + $useAuth = (get_option('geodir_ga_auth_code') == '' ? false : true);
|
|
| 6516 | + if ($useAuth) {
|
|
| 6517 | 6517 | try {
|
| 6518 | 6518 | $accounts = geodir_ga_get_analytics_accounts(); |
| 6519 | 6519 | } catch (Exception $e) {
|
| 6520 | - geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 6520 | + geodir_error_log(wp_sprintf(__('GD Google Analytics API Error(%s) : %s', 'geodirectory'), $e->getCode(), $e->getMessage()));
|
|
| 6521 | 6521 | } |
| 6522 | 6522 | |
| 6523 | - if(is_array($accounts)){
|
|
| 6524 | - $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
|
|
| 6525 | - }elseif(get_option('geodir_ga_account_id')){
|
|
| 6523 | + if (is_array($accounts)) {
|
|
| 6524 | + $accounts = array_merge(array(__('Select Account', 'geodirectory')), $accounts);
|
|
| 6525 | + }elseif (get_option('geodir_ga_account_id')) {
|
|
| 6526 | 6526 | $accounts = array(); |
| 6527 | - $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6527 | + $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required', 'geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6528 | 6528 | } |
| 6529 | 6529 | } |
| 6530 | 6530 | return $accounts; |
@@ -6535,21 +6535,21 @@ discard block |
||
| 6535 | 6535 | global $gd_ga_errors; |
| 6536 | 6536 | $accounts = array(); |
| 6537 | 6537 | |
| 6538 | - if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
|
|
| 6538 | + if (get_option('geodir_ga_auth_token') === false) {update_option('geodir_ga_auth_token', ''); }
|
|
| 6539 | 6539 | |
| 6540 | 6540 | |
| 6541 | - if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
|
|
| 6541 | + if (get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])) {
|
|
| 6542 | 6542 | return get_option('geodir_gd_uids');
|
| 6543 | 6543 | } |
| 6544 | 6544 | |
| 6545 | 6545 | # Create a new Gdata call |
| 6546 | - if ( trim(get_option('geodir_ga_auth_code')) != '' )
|
|
| 6546 | + if (trim(get_option('geodir_ga_auth_code')) != '')
|
|
| 6547 | 6547 | $stats = new GDGoogleAnalyticsStats(); |
| 6548 | 6548 | else |
| 6549 | 6549 | return false; |
| 6550 | 6550 | |
| 6551 | 6551 | # Check if Google sucessfully logged in |
| 6552 | - if ( ! $stats->checkLogin() ) |
|
| 6552 | + if (!$stats->checkLogin()) |
|
| 6553 | 6553 | return false; |
| 6554 | 6554 | |
| 6555 | 6555 | # Get a list of accounts |
@@ -6561,28 +6561,28 @@ discard block |
||
| 6561 | 6561 | } |
| 6562 | 6562 | |
| 6563 | 6563 | |
| 6564 | - natcasesort ($accounts); |
|
| 6564 | + natcasesort($accounts); |
|
| 6565 | 6565 | |
| 6566 | 6566 | # Return the account array if there are accounts |
| 6567 | - if ( count($accounts) > 0 ){
|
|
| 6568 | - update_option('geodir_gd_uids',$accounts);
|
|
| 6567 | + if (count($accounts) > 0) {
|
|
| 6568 | + update_option('geodir_gd_uids', $accounts);
|
|
| 6569 | 6569 | return $accounts; |
| 6570 | 6570 | } |
| 6571 | 6571 | else |
| 6572 | 6572 | return false; |
| 6573 | 6573 | } |
| 6574 | 6574 | |
| 6575 | -add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' ); |
|
| 6576 | -function geodir_ga_deauthorize(){
|
|
| 6575 | +add_action('wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize');
|
|
| 6576 | +function geodir_ga_deauthorize() {
|
|
| 6577 | 6577 | |
| 6578 | - if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
|
|
| 6578 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'gd_ga_deauthorize')) {
|
|
| 6579 | 6579 | |
| 6580 | - die( 'Security check' ); |
|
| 6580 | + die('Security check');
|
|
| 6581 | 6581 | |
| 6582 | 6582 | } else {
|
| 6583 | - update_option('geodir_ga_auth_token','');
|
|
| 6584 | - update_option('geodir_ga_auth_code','');
|
|
| 6585 | - update_option('geodir_gd_uids','');
|
|
| 6583 | + update_option('geodir_ga_auth_token', '');
|
|
| 6584 | + update_option('geodir_ga_auth_code', '');
|
|
| 6585 | + update_option('geodir_gd_uids', '');
|
|
| 6586 | 6586 | |
| 6587 | 6587 | |
| 6588 | 6588 | echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
|
@@ -6615,22 +6615,22 @@ discard block |
||
| 6615 | 6615 | * @since 1.6.21 |
| 6616 | 6616 | * @return array |
| 6617 | 6617 | */ |
| 6618 | -function geodir_listing_image_size_arr(){
|
|
| 6618 | +function geodir_listing_image_size_arr() {
|
|
| 6619 | 6619 | |
| 6620 | 6620 | global $_wp_additional_image_sizes; |
| 6621 | 6621 | |
| 6622 | 6622 | $sizes = array(); |
| 6623 | 6623 | |
| 6624 | - foreach ( get_intermediate_image_sizes() as $_size ) {
|
|
| 6625 | - if ( in_array( $_size, array('thumbnail', 'medium', 'medium_large', 'large') ) ) {
|
|
| 6626 | - $sizes[ $_size ]['width'] = get_option( "{$_size}_size_w" );
|
|
| 6627 | - $sizes[ $_size ]['height'] = get_option( "{$_size}_size_h" );
|
|
| 6628 | - $sizes[ $_size ]['crop'] = (bool) get_option( "{$_size}_crop" );
|
|
| 6629 | - } elseif ( isset( $_wp_additional_image_sizes[ $_size ] ) ) {
|
|
| 6630 | - $sizes[ $_size ] = array( |
|
| 6631 | - 'width' => $_wp_additional_image_sizes[ $_size ]['width'], |
|
| 6632 | - 'height' => $_wp_additional_image_sizes[ $_size ]['height'], |
|
| 6633 | - 'crop' => $_wp_additional_image_sizes[ $_size ]['crop'], |
|
| 6624 | + foreach (get_intermediate_image_sizes() as $_size) {
|
|
| 6625 | + if (in_array($_size, array('thumbnail', 'medium', 'medium_large', 'large'))) {
|
|
| 6626 | + $sizes[$_size]['width'] = get_option("{$_size}_size_w");
|
|
| 6627 | + $sizes[$_size]['height'] = get_option("{$_size}_size_h");
|
|
| 6628 | + $sizes[$_size]['crop'] = (bool) get_option("{$_size}_crop");
|
|
| 6629 | + } elseif (isset($_wp_additional_image_sizes[$_size])) {
|
|
| 6630 | + $sizes[$_size] = array( |
|
| 6631 | + 'width' => $_wp_additional_image_sizes[$_size]['width'], |
|
| 6632 | + 'height' => $_wp_additional_image_sizes[$_size]['height'], |
|
| 6633 | + 'crop' => $_wp_additional_image_sizes[$_size]['crop'], |
|
| 6634 | 6634 | ); |
| 6635 | 6635 | } |
| 6636 | 6636 | } |
@@ -6641,9 +6641,9 @@ discard block |
||
| 6641 | 6641 | |
| 6642 | 6642 | $options['default'] = __('GD Default', 'geodirectory');
|
| 6643 | 6643 | |
| 6644 | - if(!empty($sizes)){
|
|
| 6645 | - foreach($sizes as $key=>$val){
|
|
| 6646 | - $options[$key] = $key. ' ( '.$val['width'].' x '.$val['height']. ' )'; |
|
| 6644 | + if (!empty($sizes)) {
|
|
| 6645 | + foreach ($sizes as $key=>$val) {
|
|
| 6646 | + $options[$key] = $key.' ( '.$val['width'].' x '.$val['height'].' )'; |
|
| 6647 | 6647 | } |
| 6648 | 6648 | } |
| 6649 | 6649 | |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | function geodir_get_ajax_url() |
| 21 | 21 | {
|
| 22 | - return admin_url('admin-ajax.php?action=geodir_ajax_action');
|
|
| 22 | + return admin_url('admin-ajax.php?action=geodir_ajax_action');
|
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | ///////////////////// |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | add_filter('query_vars', 'geodir_add_geodir_page_var');
|
| 88 | 88 | add_action('wp', 'geodir_add_page_id_in_query_var'); // problem fix in wordpress 3.8
|
| 89 | 89 | if (get_option('permalink_structure') != '')
|
| 90 | - add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
|
|
| 90 | + add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
|
|
| 91 | 91 | |
| 92 | 92 | add_filter('parse_query', 'geodir_modified_query');
|
| 93 | 93 | |
@@ -154,14 +154,14 @@ discard block |
||
| 154 | 154 | /* POST AND LOOP ACTIONS */ |
| 155 | 155 | //////////////////////// |
| 156 | 156 | if (!is_admin()) {
|
| 157 | - add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtual page from everywhere
|
|
| 158 | - add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);
|
|
| 159 | - /** Exclude Virtual Pages From Pages List **/ |
|
| 160 | - add_action('pre_get_posts', 'set_listing_request', 0);
|
|
| 161 | - add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);
|
|
| 162 | - add_filter('excerpt_more', 'geodir_excerpt_more', 1000);
|
|
| 163 | - add_filter('excerpt_length', 'geodir_excerpt_length', 1000);
|
|
| 164 | - add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter
|
|
| 157 | + add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtual page from everywhere
|
|
| 158 | + add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);
|
|
| 159 | + /** Exclude Virtual Pages From Pages List **/ |
|
| 160 | + add_action('pre_get_posts', 'set_listing_request', 0);
|
|
| 161 | + add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);
|
|
| 162 | + add_filter('excerpt_more', 'geodir_excerpt_more', 1000);
|
|
| 163 | + add_filter('excerpt_length', 'geodir_excerpt_length', 1000);
|
|
| 164 | + add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter
|
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | |
@@ -223,12 +223,12 @@ discard block |
||
| 223 | 223 | */ |
| 224 | 224 | function geodir_unset_prev_theme_nav_location($newname) |
| 225 | 225 | {
|
| 226 | - $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);
|
|
| 227 | - if ($geodir_theme_location) {
|
|
| 228 | - update_option('geodir_theme_location_nav', $geodir_theme_location);
|
|
| 229 | - } else {
|
|
| 230 | - update_option('geodir_theme_location_nav', '');
|
|
| 231 | - } |
|
| 226 | + $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);
|
|
| 227 | + if ($geodir_theme_location) {
|
|
| 228 | + update_option('geodir_theme_location_nav', $geodir_theme_location);
|
|
| 229 | + } else {
|
|
| 230 | + update_option('geodir_theme_location_nav', '');
|
|
| 231 | + } |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | /// add action for theme switch to blank previous theme navigation location setting |
@@ -249,42 +249,42 @@ discard block |
||
| 249 | 249 | */ |
| 250 | 250 | function geodir_add_post_filters() |
| 251 | 251 | {
|
| 252 | - /** |
|
| 253 | - * Contains all function for filtering listing. |
|
| 254 | - * |
|
| 255 | - * @since 1.0.0 |
|
| 256 | - * @package GeoDirectory |
|
| 257 | - */ |
|
| 258 | - include_once('geodirectory-functions/listing_filters.php');
|
|
| 252 | + /** |
|
| 253 | + * Contains all function for filtering listing. |
|
| 254 | + * |
|
| 255 | + * @since 1.0.0 |
|
| 256 | + * @package GeoDirectory |
|
| 257 | + */ |
|
| 258 | + include_once('geodirectory-functions/listing_filters.php');
|
|
| 259 | 259 | |
| 260 | - // Theme My Login compatibility fix |
|
| 261 | - if ( isset( $_REQUEST['geodir_search'] ) && class_exists( 'Theme_My_Login' ) ) {
|
|
| 262 | - remove_action( 'pre_get_posts', array( Theme_My_Login::get_object(), 'pre_get_posts' ) ); |
|
| 263 | - } |
|
| 260 | + // Theme My Login compatibility fix |
|
| 261 | + if ( isset( $_REQUEST['geodir_search'] ) && class_exists( 'Theme_My_Login' ) ) {
|
|
| 262 | + remove_action( 'pre_get_posts', array( Theme_My_Login::get_object(), 'pre_get_posts' ) ); |
|
| 263 | + } |
|
| 264 | 264 | |
| 265 | - if ( isset( $_REQUEST['geodir_search'] ) ) {
|
|
| 266 | - add_filter( 'geodir_filter_widget_listings_fields', 'geodir_search_widget_location_filter_fields', 100, 3 ); |
|
| 267 | - add_filter( 'geodir_filter_widget_listings_orderby', 'geodir_search_widget_location_filter_orderby', 100, 3 ); |
|
| 268 | - } |
|
| 265 | + if ( isset( $_REQUEST['geodir_search'] ) ) {
|
|
| 266 | + add_filter( 'geodir_filter_widget_listings_fields', 'geodir_search_widget_location_filter_fields', 100, 3 ); |
|
| 267 | + add_filter( 'geodir_filter_widget_listings_orderby', 'geodir_search_widget_location_filter_orderby', 100, 3 ); |
|
| 268 | + } |
|
| 269 | 269 | } |
| 270 | 270 | |
| 271 | 271 | |
| 272 | 272 | if (!function_exists('geodir_init_defaults')) {
|
| 273 | - /** |
|
| 274 | - * Calls the function to register the GeoDirectory default CPT and taxonomies. |
|
| 275 | - * |
|
| 276 | - * @since 1.0.0 |
|
| 277 | - * @package GeoDirectory |
|
| 278 | - */ |
|
| 279 | - function geodir_init_defaults() |
|
| 280 | - {
|
|
| 281 | - if (function_exists('geodir_register_defaults')) {
|
|
| 273 | + /** |
|
| 274 | + * Calls the function to register the GeoDirectory default CPT and taxonomies. |
|
| 275 | + * |
|
| 276 | + * @since 1.0.0 |
|
| 277 | + * @package GeoDirectory |
|
| 278 | + */ |
|
| 279 | + function geodir_init_defaults() |
|
| 280 | + {
|
|
| 281 | + if (function_exists('geodir_register_defaults')) {
|
|
| 282 | 282 | |
| 283 | - geodir_register_defaults(); |
|
| 283 | + geodir_register_defaults(); |
|
| 284 | 284 | |
| 285 | - } |
|
| 285 | + } |
|
| 286 | 286 | |
| 287 | - } |
|
| 287 | + } |
|
| 288 | 288 | } |
| 289 | 289 | |
| 290 | 290 | |
@@ -306,26 +306,26 @@ discard block |
||
| 306 | 306 | // CALLED ON 'sidebars_widgets' FILTER |
| 307 | 307 | |
| 308 | 308 | if (!function_exists('geodir_restrict_widget')) {
|
| 309 | - /** |
|
| 310 | - * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page. |
|
| 311 | - * |
|
| 312 | - * @global bool $is_listing Sets the global value to true if on a GD category page. False if not. |
|
| 313 | - * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not. |
|
| 314 | - * @since 1.0.0 |
|
| 315 | - * @package GeoDirectory |
|
| 316 | - */ |
|
| 317 | - function geodir_restrict_widget() |
|
| 318 | - {
|
|
| 319 | - global $is_listing, $is_single_place; |
|
| 309 | + /** |
|
| 310 | + * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page. |
|
| 311 | + * |
|
| 312 | + * @global bool $is_listing Sets the global value to true if on a GD category page. False if not. |
|
| 313 | + * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not. |
|
| 314 | + * @since 1.0.0 |
|
| 315 | + * @package GeoDirectory |
|
| 316 | + */ |
|
| 317 | + function geodir_restrict_widget() |
|
| 318 | + {
|
|
| 319 | + global $is_listing, $is_single_place; |
|
| 320 | 320 | |
| 321 | - // set is listing |
|
| 322 | - (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;
|
|
| 321 | + // set is listing |
|
| 322 | + (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;
|
|
| 323 | 323 | |
| 324 | - // set is single place |
|
| 325 | - (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;
|
|
| 324 | + // set is single place |
|
| 325 | + (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;
|
|
| 326 | 326 | |
| 327 | 327 | |
| 328 | - } |
|
| 328 | + } |
|
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | |
@@ -346,31 +346,31 @@ discard block |
||
| 346 | 346 | */ |
| 347 | 347 | function geodir_detail_page_sidebar_content_sorting() |
| 348 | 348 | {
|
| 349 | - $arr_detail_page_sidebar_content = |
|
| 350 | - /** |
|
| 351 | - * An array of functions to be called to be displayed on the details (post) page sidebar. |
|
| 352 | - * |
|
| 353 | - * This filter can be used to remove sections of the details page sidebar, |
|
| 354 | - * add new sections or rearrange the order of the sections. |
|
| 355 | - * |
|
| 356 | - * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.
|
|
| 357 | - * @since 1.0.0 |
|
| 358 | - */ |
|
| 359 | - apply_filters('geodir_detail_page_sidebar_content',
|
|
| 360 | - array('geodir_social_sharing_buttons',
|
|
| 361 | - 'geodir_detail_page_google_analytics', |
|
| 362 | - 'geodir_edit_post_link', |
|
| 363 | - 'geodir_detail_page_review_rating', |
|
| 364 | - 'geodir_detail_page_more_info' |
|
| 365 | - ) // end of array |
|
| 366 | - ); // end of apply filter |
|
| 367 | - if (!empty($arr_detail_page_sidebar_content)) {
|
|
| 368 | - foreach ($arr_detail_page_sidebar_content as $content_function) {
|
|
| 369 | - if (function_exists($content_function)) {
|
|
| 370 | - add_action('geodir_detail_page_sidebar', $content_function);
|
|
| 371 | - } |
|
| 372 | - } |
|
| 373 | - } |
|
| 349 | + $arr_detail_page_sidebar_content = |
|
| 350 | + /** |
|
| 351 | + * An array of functions to be called to be displayed on the details (post) page sidebar. |
|
| 352 | + * |
|
| 353 | + * This filter can be used to remove sections of the details page sidebar, |
|
| 354 | + * add new sections or rearrange the order of the sections. |
|
| 355 | + * |
|
| 356 | + * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.
|
|
| 357 | + * @since 1.0.0 |
|
| 358 | + */ |
|
| 359 | + apply_filters('geodir_detail_page_sidebar_content',
|
|
| 360 | + array('geodir_social_sharing_buttons',
|
|
| 361 | + 'geodir_detail_page_google_analytics', |
|
| 362 | + 'geodir_edit_post_link', |
|
| 363 | + 'geodir_detail_page_review_rating', |
|
| 364 | + 'geodir_detail_page_more_info' |
|
| 365 | + ) // end of array |
|
| 366 | + ); // end of apply filter |
|
| 367 | + if (!empty($arr_detail_page_sidebar_content)) {
|
|
| 368 | + foreach ($arr_detail_page_sidebar_content as $content_function) {
|
|
| 369 | + if (function_exists($content_function)) {
|
|
| 370 | + add_action('geodir_detail_page_sidebar', $content_function);
|
|
| 371 | + } |
|
| 372 | + } |
|
| 373 | + } |
|
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | add_action('geodir_after_edit_post_link', 'geodir_add_to_favourite_link', 1);
|
@@ -385,14 +385,14 @@ discard block |
||
| 385 | 385 | */ |
| 386 | 386 | function geodir_add_to_favourite_link() |
| 387 | 387 | {
|
| 388 | - global $post, $preview; |
|
| 389 | - if (!$preview && geodir_is_page('detail')) {
|
|
| 390 | - ?> |
|
| 388 | + global $post, $preview; |
|
| 389 | + if (!$preview && geodir_is_page('detail')) {
|
|
| 390 | + ?> |
|
| 391 | 391 | <p class="edit_link"> |
| 392 | 392 | <?php geodir_favourite_html($post->post_author, $post->ID); ?> |
| 393 | 393 | </p> |
| 394 | 394 | <?php |
| 395 | - } |
|
| 395 | + } |
|
| 396 | 396 | } |
| 397 | 397 | |
| 398 | 398 | /** |
@@ -406,41 +406,41 @@ discard block |
||
| 406 | 406 | */ |
| 407 | 407 | function geodir_social_sharing_buttons() |
| 408 | 408 | {
|
| 409 | - global $preview; |
|
| 410 | - ob_start(); // Start buffering; |
|
| 411 | - /** |
|
| 412 | - * This action is called before the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 413 | - * |
|
| 414 | - * @since 1.0.0 |
|
| 415 | - */ |
|
| 416 | - do_action('geodir_before_social_sharing_buttons');
|
|
| 417 | - if (!$preview) {
|
|
| 418 | - ?> |
|
| 409 | + global $preview; |
|
| 410 | + ob_start(); // Start buffering; |
|
| 411 | + /** |
|
| 412 | + * This action is called before the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 413 | + * |
|
| 414 | + * @since 1.0.0 |
|
| 415 | + */ |
|
| 416 | + do_action('geodir_before_social_sharing_buttons');
|
|
| 417 | + if (!$preview) {
|
|
| 418 | + ?> |
|
| 419 | 419 | <div class="likethis"> |
| 420 | 420 | <?php geodir_twitter_tweet_button(); ?> |
| 421 | 421 | <?php geodir_fb_like_button(); ?> |
| 422 | 422 | <?php geodir_google_plus_button(); ?> |
| 423 | 423 | </div> |
| 424 | 424 | <?php |
| 425 | - }// end of if, if its a preview or not |
|
| 426 | - |
|
| 427 | - /** |
|
| 428 | - * This action is called after the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 429 | - * |
|
| 430 | - * @since 1.0.0 |
|
| 431 | - */ |
|
| 432 | - do_action('geodir_after_social_sharing_buttons');
|
|
| 433 | - $content_html = ob_get_clean(); |
|
| 434 | - if (trim($content_html) != '') |
|
| 435 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 436 | - if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
| 437 | - /** |
|
| 438 | - * Filter the geodir_social_sharing_buttons() function content. |
|
| 439 | - * |
|
| 440 | - * @param string $content_html The output html of the geodir_social_sharing_buttons() function. |
|
| 441 | - */ |
|
| 442 | - echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);
|
|
| 443 | - } |
|
| 425 | + }// end of if, if its a preview or not |
|
| 426 | + |
|
| 427 | + /** |
|
| 428 | + * This action is called after the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 429 | + * |
|
| 430 | + * @since 1.0.0 |
|
| 431 | + */ |
|
| 432 | + do_action('geodir_after_social_sharing_buttons');
|
|
| 433 | + $content_html = ob_get_clean(); |
|
| 434 | + if (trim($content_html) != '') |
|
| 435 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 436 | + if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
| 437 | + /** |
|
| 438 | + * Filter the geodir_social_sharing_buttons() function content. |
|
| 439 | + * |
|
| 440 | + * @param string $content_html The output html of the geodir_social_sharing_buttons() function. |
|
| 441 | + */ |
|
| 442 | + echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);
|
|
| 443 | + } |
|
| 444 | 444 | |
| 445 | 445 | |
| 446 | 446 | } |
@@ -458,46 +458,46 @@ discard block |
||
| 458 | 458 | */ |
| 459 | 459 | function geodir_edit_post_link() |
| 460 | 460 | {
|
| 461 | - global $post, $preview; |
|
| 462 | - ob_start(); // Start buffering; |
|
| 463 | - /** |
|
| 464 | - * This is called before the edit post link html in the function geodir_edit_post_link() |
|
| 465 | - * |
|
| 466 | - * @since 1.0.0 |
|
| 467 | - */ |
|
| 468 | - do_action('geodir_before_edit_post_link');
|
|
| 469 | - if (!$preview) {
|
|
| 470 | - $is_current_user_owner = geodir_listing_belong_to_current_user(); |
|
| 461 | + global $post, $preview; |
|
| 462 | + ob_start(); // Start buffering; |
|
| 463 | + /** |
|
| 464 | + * This is called before the edit post link html in the function geodir_edit_post_link() |
|
| 465 | + * |
|
| 466 | + * @since 1.0.0 |
|
| 467 | + */ |
|
| 468 | + do_action('geodir_before_edit_post_link');
|
|
| 469 | + if (!$preview) {
|
|
| 470 | + $is_current_user_owner = geodir_listing_belong_to_current_user(); |
|
| 471 | 471 | |
| 472 | - if ($is_current_user_owner) {
|
|
| 473 | - $post_id = $post->ID; |
|
| 472 | + if ($is_current_user_owner) {
|
|
| 473 | + $post_id = $post->ID; |
|
| 474 | 474 | |
| 475 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 476 | - $post_id = (int)$_REQUEST['pid']; |
|
| 477 | - } |
|
| 475 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 476 | + $post_id = (int)$_REQUEST['pid']; |
|
| 477 | + } |
|
| 478 | 478 | |
| 479 | - $postlink = get_permalink(geodir_add_listing_page_id()); |
|
| 480 | - $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);
|
|
| 481 | - echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';
|
|
| 482 | - } |
|
| 483 | - }// end of if, if its a preview or not |
|
| 484 | - /** |
|
| 485 | - * This is called after the edit post link html in the function geodir_edit_post_link() |
|
| 486 | - * |
|
| 487 | - * @since 1.0.0 |
|
| 488 | - */ |
|
| 489 | - do_action('geodir_after_edit_post_link');
|
|
| 490 | - $content_html = ob_get_clean(); |
|
| 491 | - if (trim($content_html) != '') |
|
| 492 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 493 | - if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
|
| 494 | - /** |
|
| 495 | - * Filter the geodir_edit_post_link() function content. |
|
| 496 | - * |
|
| 497 | - * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 498 | - */ |
|
| 499 | - echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);
|
|
| 500 | - } |
|
| 479 | + $postlink = get_permalink(geodir_add_listing_page_id()); |
|
| 480 | + $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);
|
|
| 481 | + echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';
|
|
| 482 | + } |
|
| 483 | + }// end of if, if its a preview or not |
|
| 484 | + /** |
|
| 485 | + * This is called after the edit post link html in the function geodir_edit_post_link() |
|
| 486 | + * |
|
| 487 | + * @since 1.0.0 |
|
| 488 | + */ |
|
| 489 | + do_action('geodir_after_edit_post_link');
|
|
| 490 | + $content_html = ob_get_clean(); |
|
| 491 | + if (trim($content_html) != '') |
|
| 492 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 493 | + if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
|
| 494 | + /** |
|
| 495 | + * Filter the geodir_edit_post_link() function content. |
|
| 496 | + * |
|
| 497 | + * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 498 | + */ |
|
| 499 | + echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);
|
|
| 500 | + } |
|
| 501 | 501 | } |
| 502 | 502 | |
| 503 | 503 | /** |
@@ -511,42 +511,42 @@ discard block |
||
| 511 | 511 | */ |
| 512 | 512 | function geodir_detail_page_google_analytics() |
| 513 | 513 | {
|
| 514 | - global $post,$preview; |
|
| 515 | - if($preview){return '';}
|
|
| 516 | - $package_info = array(); |
|
| 517 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 514 | + global $post,$preview; |
|
| 515 | + if($preview){return '';}
|
|
| 516 | + $package_info = array(); |
|
| 517 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 518 | 518 | |
| 519 | - $id = trim(get_option('geodir_ga_account_id'));
|
|
| 519 | + $id = trim(get_option('geodir_ga_account_id'));
|
|
| 520 | 520 | |
| 521 | - if (!$id) {
|
|
| 522 | - return; //if no Google Analytics ID then bail. |
|
| 523 | - } |
|
| 521 | + if (!$id) {
|
|
| 522 | + return; //if no Google Analytics ID then bail. |
|
| 523 | + } |
|
| 524 | 524 | |
| 525 | - ob_start(); // Start buffering; |
|
| 526 | - /** |
|
| 527 | - * This is called before the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 528 | - * |
|
| 529 | - * @since 1.0.0 |
|
| 530 | - */ |
|
| 531 | - do_action('geodir_before_google_analytics');
|
|
| 525 | + ob_start(); // Start buffering; |
|
| 526 | + /** |
|
| 527 | + * This is called before the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 528 | + * |
|
| 529 | + * @since 1.0.0 |
|
| 530 | + */ |
|
| 531 | + do_action('geodir_before_google_analytics');
|
|
| 532 | 532 | |
| 533 | - $refresh_time = get_option('geodir_ga_refresh_time', 5);
|
|
| 534 | - /** |
|
| 535 | - * Filter the time interval to check & refresh new users results. |
|
| 536 | - * |
|
| 537 | - * @since 1.5.9 |
|
| 538 | - * |
|
| 539 | - * @param int $refresh_time Time interval to check & refresh new users results. |
|
| 540 | - */ |
|
| 541 | - $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);
|
|
| 542 | - $refresh_time = absint($refresh_time * 1000); |
|
| 533 | + $refresh_time = get_option('geodir_ga_refresh_time', 5);
|
|
| 534 | + /** |
|
| 535 | + * Filter the time interval to check & refresh new users results. |
|
| 536 | + * |
|
| 537 | + * @since 1.5.9 |
|
| 538 | + * |
|
| 539 | + * @param int $refresh_time Time interval to check & refresh new users results. |
|
| 540 | + */ |
|
| 541 | + $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);
|
|
| 542 | + $refresh_time = absint($refresh_time * 1000); |
|
| 543 | 543 | |
| 544 | - $hide_refresh = get_option('geodir_ga_auto_refresh');
|
|
| 544 | + $hide_refresh = get_option('geodir_ga_auto_refresh');
|
|
| 545 | 545 | |
| 546 | - $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0; |
|
| 547 | - if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {
|
|
| 548 | - $page_url = urlencode($_SERVER['REQUEST_URI']); |
|
| 549 | - ?> |
|
| 546 | + $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0; |
|
| 547 | + if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {
|
|
| 548 | + $page_url = urlencode($_SERVER['REQUEST_URI']); |
|
| 549 | + ?> |
|
| 550 | 550 | <script type="text/javascript"> |
| 551 | 551 | var gd_gaTimeOut; |
| 552 | 552 | var gd_gaTime = parseInt('<?php echo $refresh_time;?>');
|
@@ -798,15 +798,15 @@ discard block |
||
| 798 | 798 | var labels = results[1].rows.map(function(row) { return +row[0]; });
|
| 799 | 799 | |
| 800 | 800 | <?php |
| 801 | - // Here we list the shorthand days of the week so it can be used in translation. |
|
| 802 | - __("Mon",'geodirectory');
|
|
| 803 | - __("Tue",'geodirectory');
|
|
| 804 | - __("Wed",'geodirectory');
|
|
| 805 | - __("Thu",'geodirectory');
|
|
| 806 | - __("Fri",'geodirectory');
|
|
| 807 | - __("Sat",'geodirectory');
|
|
| 808 | - __("Sun",'geodirectory');
|
|
| 809 | - ?> |
|
| 801 | + // Here we list the shorthand days of the week so it can be used in translation. |
|
| 802 | + __("Mon",'geodirectory');
|
|
| 803 | + __("Tue",'geodirectory');
|
|
| 804 | + __("Wed",'geodirectory');
|
|
| 805 | + __("Thu",'geodirectory');
|
|
| 806 | + __("Fri",'geodirectory');
|
|
| 807 | + __("Sat",'geodirectory');
|
|
| 808 | + __("Sun",'geodirectory');
|
|
| 809 | + ?> |
|
| 810 | 810 | |
| 811 | 811 | labels = [ |
| 812 | 812 | "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",
|
@@ -1055,24 +1055,24 @@ discard block |
||
| 1055 | 1055 | </span> |
| 1056 | 1056 | |
| 1057 | 1057 | <?php |
| 1058 | - } |
|
| 1059 | - /** |
|
| 1060 | - * This is called after the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 1061 | - * |
|
| 1062 | - * @since 1.0.0 |
|
| 1063 | - */ |
|
| 1064 | - do_action('geodir_after_google_analytics');
|
|
| 1065 | - $content_html = ob_get_clean(); |
|
| 1066 | - if (trim($content_html) != '') |
|
| 1067 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1068 | - if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
|
| 1069 | - /** |
|
| 1070 | - * Filter the geodir_edit_post_link() function content. |
|
| 1071 | - * |
|
| 1072 | - * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 1073 | - */ |
|
| 1074 | - echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);
|
|
| 1075 | - } |
|
| 1058 | + } |
|
| 1059 | + /** |
|
| 1060 | + * This is called after the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 1061 | + * |
|
| 1062 | + * @since 1.0.0 |
|
| 1063 | + */ |
|
| 1064 | + do_action('geodir_after_google_analytics');
|
|
| 1065 | + $content_html = ob_get_clean(); |
|
| 1066 | + if (trim($content_html) != '') |
|
| 1067 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1068 | + if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
|
| 1069 | + /** |
|
| 1070 | + * Filter the geodir_edit_post_link() function content. |
|
| 1071 | + * |
|
| 1072 | + * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 1073 | + */ |
|
| 1074 | + echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);
|
|
| 1075 | + } |
|
| 1076 | 1076 | } |
| 1077 | 1077 | |
| 1078 | 1078 | /** |
@@ -1089,94 +1089,94 @@ discard block |
||
| 1089 | 1089 | */ |
| 1090 | 1090 | function geodir_detail_page_review_rating() |
| 1091 | 1091 | {
|
| 1092 | - global $post, $preview, $post_images; |
|
| 1092 | + global $post, $preview, $post_images; |
|
| 1093 | 1093 | |
| 1094 | - if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int)$post->ID)) {
|
|
| 1095 | - return; |
|
| 1096 | - } |
|
| 1097 | - ob_start(); // Start buffering; |
|
| 1098 | - /** |
|
| 1099 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1100 | - * |
|
| 1101 | - * This is called outside the check for an actual rating and the check for preview page. |
|
| 1102 | - * |
|
| 1103 | - * @since 1.0.0 |
|
| 1104 | - */ |
|
| 1105 | - do_action('geodir_before_detail_page_review_rating');
|
|
| 1106 | - |
|
| 1107 | - $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1108 | - $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1109 | - |
|
| 1110 | - if ($post_avgratings != 0 && !$preview) {
|
|
| 1111 | - /** |
|
| 1112 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1113 | - * |
|
| 1114 | - * This is called inside the check for an actual rating and the check for preview page. |
|
| 1115 | - * |
|
| 1116 | - * @since 1.0.0 |
|
| 1117 | - * @param float $post_avgratings Average rating for the current post. |
|
| 1118 | - * @param int $post->ID Current post ID. |
|
| 1119 | - */ |
|
| 1120 | - do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1121 | - |
|
| 1122 | - $html = '<p style=" float:left;">'; |
|
| 1123 | - $html .= geodir_get_rating_stars($post_avgratings, $post->ID); |
|
| 1124 | - $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">'; |
|
| 1125 | - $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings; |
|
| 1094 | + if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int)$post->ID)) {
|
|
| 1095 | + return; |
|
| 1096 | + } |
|
| 1097 | + ob_start(); // Start buffering; |
|
| 1098 | + /** |
|
| 1099 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1100 | + * |
|
| 1101 | + * This is called outside the check for an actual rating and the check for preview page. |
|
| 1102 | + * |
|
| 1103 | + * @since 1.0.0 |
|
| 1104 | + */ |
|
| 1105 | + do_action('geodir_before_detail_page_review_rating');
|
|
| 1106 | + |
|
| 1107 | + $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1108 | + $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1109 | + |
|
| 1110 | + if ($post_avgratings != 0 && !$preview) {
|
|
| 1111 | + /** |
|
| 1112 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1113 | + * |
|
| 1114 | + * This is called inside the check for an actual rating and the check for preview page. |
|
| 1115 | + * |
|
| 1116 | + * @since 1.0.0 |
|
| 1117 | + * @param float $post_avgratings Average rating for the current post. |
|
| 1118 | + * @param int $post->ID Current post ID. |
|
| 1119 | + */ |
|
| 1120 | + do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1121 | + |
|
| 1122 | + $html = '<p style=" float:left;">'; |
|
| 1123 | + $html .= geodir_get_rating_stars($post_avgratings, $post->ID); |
|
| 1124 | + $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">'; |
|
| 1125 | + $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings; |
|
| 1126 | 1126 | |
| 1127 | 1127 | $reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');
|
| 1128 | 1128 | |
| 1129 | 1129 | $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';
|
| 1130 | 1130 | |
| 1131 | - $html .= '<span class="item">'; |
|
| 1132 | - $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>'; |
|
| 1131 | + $html .= '<span class="item">'; |
|
| 1132 | + $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>'; |
|
| 1133 | 1133 | |
| 1134 | - if ($post_images) {
|
|
| 1135 | - foreach ($post_images as $img) {
|
|
| 1136 | - $post_img = $img->src; |
|
| 1137 | - break; |
|
| 1138 | - } |
|
| 1139 | - } |
|
| 1140 | - |
|
| 1141 | - if (isset($post_img) && $post_img) {
|
|
| 1142 | - $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />'; |
|
| 1143 | - } |
|
| 1144 | - |
|
| 1145 | - $html .= '</span>'; |
|
| 1146 | - |
|
| 1147 | - echo $html .= '</div>'; |
|
| 1148 | - /** |
|
| 1149 | - * This is called after the rating html in the function geodir_detail_page_review_rating(). |
|
| 1150 | - * |
|
| 1151 | - * This is called inside the check for an actual rating and the check for preview page. |
|
| 1152 | - * |
|
| 1153 | - * @since 1.0.0 |
|
| 1154 | - * @param float $post_avgratings Average rating for the current post. |
|
| 1155 | - * @param int $post->ID Current post ID. |
|
| 1156 | - */ |
|
| 1157 | - do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1158 | - } |
|
| 1159 | - /** |
|
| 1160 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1161 | - * |
|
| 1162 | - * This is called outside the check for an actual rating and the check for preview page. |
|
| 1163 | - * |
|
| 1164 | - * @since 1.0.0 |
|
| 1165 | - */ |
|
| 1166 | - do_action('geodir_after_detail_page_review_rating');
|
|
| 1167 | - $content_html = ob_get_clean(); |
|
| 1168 | - if (trim($content_html) != '') {
|
|
| 1169 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>'; |
|
| 1170 | - } |
|
| 1171 | - if ((int)get_option('geodir_disable_rating_info_section') != 1) {
|
|
| 1172 | - /** |
|
| 1173 | - * Filter the geodir_detail_page_review_rating() function content. |
|
| 1174 | - * |
|
| 1175 | - * @since 1.0.0 |
|
| 1176 | - * @param string $content_html The output html of the geodir_detail_page_review_rating() function. |
|
| 1177 | - */ |
|
| 1178 | - echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);
|
|
| 1179 | - } |
|
| 1134 | + if ($post_images) {
|
|
| 1135 | + foreach ($post_images as $img) {
|
|
| 1136 | + $post_img = $img->src; |
|
| 1137 | + break; |
|
| 1138 | + } |
|
| 1139 | + } |
|
| 1140 | + |
|
| 1141 | + if (isset($post_img) && $post_img) {
|
|
| 1142 | + $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />'; |
|
| 1143 | + } |
|
| 1144 | + |
|
| 1145 | + $html .= '</span>'; |
|
| 1146 | + |
|
| 1147 | + echo $html .= '</div>'; |
|
| 1148 | + /** |
|
| 1149 | + * This is called after the rating html in the function geodir_detail_page_review_rating(). |
|
| 1150 | + * |
|
| 1151 | + * This is called inside the check for an actual rating and the check for preview page. |
|
| 1152 | + * |
|
| 1153 | + * @since 1.0.0 |
|
| 1154 | + * @param float $post_avgratings Average rating for the current post. |
|
| 1155 | + * @param int $post->ID Current post ID. |
|
| 1156 | + */ |
|
| 1157 | + do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1158 | + } |
|
| 1159 | + /** |
|
| 1160 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1161 | + * |
|
| 1162 | + * This is called outside the check for an actual rating and the check for preview page. |
|
| 1163 | + * |
|
| 1164 | + * @since 1.0.0 |
|
| 1165 | + */ |
|
| 1166 | + do_action('geodir_after_detail_page_review_rating');
|
|
| 1167 | + $content_html = ob_get_clean(); |
|
| 1168 | + if (trim($content_html) != '') {
|
|
| 1169 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>'; |
|
| 1170 | + } |
|
| 1171 | + if ((int)get_option('geodir_disable_rating_info_section') != 1) {
|
|
| 1172 | + /** |
|
| 1173 | + * Filter the geodir_detail_page_review_rating() function content. |
|
| 1174 | + * |
|
| 1175 | + * @since 1.0.0 |
|
| 1176 | + * @param string $content_html The output html of the geodir_detail_page_review_rating() function. |
|
| 1177 | + */ |
|
| 1178 | + echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);
|
|
| 1179 | + } |
|
| 1180 | 1180 | } |
| 1181 | 1181 | |
| 1182 | 1182 | /** |
@@ -1188,35 +1188,35 @@ discard block |
||
| 1188 | 1188 | */ |
| 1189 | 1189 | function geodir_detail_page_more_info() |
| 1190 | 1190 | {
|
| 1191 | - ob_start(); // Start buffering; |
|
| 1192 | - /** |
|
| 1193 | - * This is called before the info section html. |
|
| 1194 | - * |
|
| 1195 | - * @since 1.0.0 |
|
| 1196 | - */ |
|
| 1197 | - do_action('geodir_before_detail_page_more_info');
|
|
| 1198 | - if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {
|
|
| 1199 | - echo $geodir_post_detail_fields; |
|
| 1200 | - } |
|
| 1201 | - /** |
|
| 1202 | - * This is called after the info section html. |
|
| 1203 | - * |
|
| 1204 | - * @since 1.0.0 |
|
| 1205 | - */ |
|
| 1206 | - do_action('geodir_after_detail_page_more_info');
|
|
| 1207 | - |
|
| 1208 | - $content_html = ob_get_clean(); |
|
| 1209 | - if (trim($content_html) != '') |
|
| 1210 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1211 | - if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
|
| 1212 | - /** |
|
| 1213 | - * Filter the output html for function geodir_detail_page_more_info(). |
|
| 1214 | - * |
|
| 1215 | - * @since 1.0.0 |
|
| 1216 | - * @param string $content_html The output html of the geodir_detail_page_more_info() function. |
|
| 1217 | - */ |
|
| 1218 | - echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);
|
|
| 1219 | - } |
|
| 1191 | + ob_start(); // Start buffering; |
|
| 1192 | + /** |
|
| 1193 | + * This is called before the info section html. |
|
| 1194 | + * |
|
| 1195 | + * @since 1.0.0 |
|
| 1196 | + */ |
|
| 1197 | + do_action('geodir_before_detail_page_more_info');
|
|
| 1198 | + if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {
|
|
| 1199 | + echo $geodir_post_detail_fields; |
|
| 1200 | + } |
|
| 1201 | + /** |
|
| 1202 | + * This is called after the info section html. |
|
| 1203 | + * |
|
| 1204 | + * @since 1.0.0 |
|
| 1205 | + */ |
|
| 1206 | + do_action('geodir_after_detail_page_more_info');
|
|
| 1207 | + |
|
| 1208 | + $content_html = ob_get_clean(); |
|
| 1209 | + if (trim($content_html) != '') |
|
| 1210 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1211 | + if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
|
| 1212 | + /** |
|
| 1213 | + * Filter the output html for function geodir_detail_page_more_info(). |
|
| 1214 | + * |
|
| 1215 | + * @since 1.0.0 |
|
| 1216 | + * @param string $content_html The output html of the geodir_detail_page_more_info() function. |
|
| 1217 | + */ |
|
| 1218 | + echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);
|
|
| 1219 | + } |
|
| 1220 | 1220 | } |
| 1221 | 1221 | |
| 1222 | 1222 | |
@@ -1230,15 +1230,15 @@ discard block |
||
| 1230 | 1230 | */ |
| 1231 | 1231 | function geodir_localize_all_js_msg() |
| 1232 | 1232 | {// check_ajax_referer function is used to make sure no files are uploaded remotely but it will fail if used between https and non https so we do the check below of the urls
|
| 1233 | - if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1234 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 1235 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1236 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 1237 | - } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1238 | - $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 1239 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1240 | - $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 1241 | - } |
|
| 1233 | + if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1234 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 1235 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1236 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 1237 | + } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1238 | + $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 1239 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1240 | + $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 1241 | + } |
|
| 1242 | 1242 | |
| 1243 | 1243 | /** |
| 1244 | 1244 | * Filter the allowed image type extensions for post images. |
@@ -1248,60 +1248,60 @@ discard block |
||
| 1248 | 1248 | */ |
| 1249 | 1249 | $allowed_img_types = apply_filters('geodir_allowed_post_image_exts', array('jpg', 'jpeg', 'jpe', 'gif', 'png'));
|
| 1250 | 1250 | |
| 1251 | - $default_marker_icon = get_option('geodir_default_marker_icon');
|
|
| 1252 | - $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));
|
|
| 1253 | - $default_marker_width = $default_marker_size['w']; |
|
| 1254 | - $default_marker_height = $default_marker_size['h']; |
|
| 1251 | + $default_marker_icon = get_option('geodir_default_marker_icon');
|
|
| 1252 | + $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));
|
|
| 1253 | + $default_marker_width = $default_marker_size['w']; |
|
| 1254 | + $default_marker_height = $default_marker_size['h']; |
|
| 1255 | 1255 | |
| 1256 | - $arr_alert_msg = array( |
|
| 1257 | - 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 1258 | - 'geodir_admin_ajax_url' => $ajax_url, |
|
| 1259 | - 'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),
|
|
| 1260 | - 'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),
|
|
| 1261 | - 'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),
|
|
| 1262 | - 'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),
|
|
| 1263 | - //start not show alert msg |
|
| 1264 | - 'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),
|
|
| 1265 | - 'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),
|
|
| 1266 | - 'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),
|
|
| 1267 | - 'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),
|
|
| 1268 | - 'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),
|
|
| 1269 | - // end not show alert msg |
|
| 1270 | - 'my_place_listing_del' => __('Are you sure you wish to delete this listing?', 'geodirectory'),
|
|
| 1271 | - 'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),
|
|
| 1272 | - //start not show alert msg |
|
| 1273 | - 'rating_error_msg' => __('Error : please retry', 'geodirectory'),
|
|
| 1274 | - 'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),
|
|
| 1275 | - 'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),
|
|
| 1276 | - 'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),
|
|
| 1277 | - 'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),
|
|
| 1278 | - 'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),
|
|
| 1279 | - 'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),
|
|
| 1280 | - 'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),
|
|
| 1281 | - 'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),
|
|
| 1282 | - 'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),
|
|
| 1283 | - 'geodir_field_id_required' => __('This field is required.', 'geodirectory'),
|
|
| 1284 | - 'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),
|
|
| 1285 | - 'geodir_default_marker_icon' => $default_marker_icon, |
|
| 1286 | - 'geodir_default_marker_w' => $default_marker_width, |
|
| 1287 | - 'geodir_default_marker_h' => $default_marker_height, |
|
| 1288 | - 'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG, |
|
| 1289 | - 'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG, |
|
| 1290 | - 'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),
|
|
| 1291 | - 'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),
|
|
| 1292 | - 'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),
|
|
| 1293 | - 'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),
|
|
| 1294 | - 'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),
|
|
| 1295 | - 'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),
|
|
| 1296 | - /* on/off dragging for phone devices */ |
|
| 1297 | - 'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,
|
|
| 1298 | - 'geodir_is_mobile' => wp_is_mobile() ? true : false, |
|
| 1299 | - 'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),
|
|
| 1300 | - 'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),
|
|
| 1301 | - 'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),
|
|
| 1302 | - 'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),
|
|
| 1303 | - 'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),
|
|
| 1304 | - 'geodir_action_remove' => __('Remove', 'geodirectory'),
|
|
| 1256 | + $arr_alert_msg = array( |
|
| 1257 | + 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 1258 | + 'geodir_admin_ajax_url' => $ajax_url, |
|
| 1259 | + 'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),
|
|
| 1260 | + 'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),
|
|
| 1261 | + 'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),
|
|
| 1262 | + 'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),
|
|
| 1263 | + //start not show alert msg |
|
| 1264 | + 'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),
|
|
| 1265 | + 'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),
|
|
| 1266 | + 'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),
|
|
| 1267 | + 'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),
|
|
| 1268 | + 'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),
|
|
| 1269 | + // end not show alert msg |
|
| 1270 | + 'my_place_listing_del' => __('Are you sure you wish to delete this listing?', 'geodirectory'),
|
|
| 1271 | + 'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),
|
|
| 1272 | + //start not show alert msg |
|
| 1273 | + 'rating_error_msg' => __('Error : please retry', 'geodirectory'),
|
|
| 1274 | + 'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),
|
|
| 1275 | + 'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),
|
|
| 1276 | + 'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),
|
|
| 1277 | + 'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),
|
|
| 1278 | + 'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),
|
|
| 1279 | + 'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),
|
|
| 1280 | + 'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),
|
|
| 1281 | + 'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),
|
|
| 1282 | + 'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),
|
|
| 1283 | + 'geodir_field_id_required' => __('This field is required.', 'geodirectory'),
|
|
| 1284 | + 'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),
|
|
| 1285 | + 'geodir_default_marker_icon' => $default_marker_icon, |
|
| 1286 | + 'geodir_default_marker_w' => $default_marker_width, |
|
| 1287 | + 'geodir_default_marker_h' => $default_marker_height, |
|
| 1288 | + 'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG, |
|
| 1289 | + 'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG, |
|
| 1290 | + 'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),
|
|
| 1291 | + 'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),
|
|
| 1292 | + 'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),
|
|
| 1293 | + 'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),
|
|
| 1294 | + 'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),
|
|
| 1295 | + 'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),
|
|
| 1296 | + /* on/off dragging for phone devices */ |
|
| 1297 | + 'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,
|
|
| 1298 | + 'geodir_is_mobile' => wp_is_mobile() ? true : false, |
|
| 1299 | + 'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),
|
|
| 1300 | + 'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),
|
|
| 1301 | + 'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),
|
|
| 1302 | + 'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),
|
|
| 1303 | + 'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),
|
|
| 1304 | + 'geodir_action_remove' => __('Remove', 'geodirectory'),
|
|
| 1305 | 1305 | 'geodir_txt_all_files' => __('Allowed files', 'geodirectory'),
|
| 1306 | 1306 | 'geodir_err_file_type' => __('File type error. Allowed file types: %s', 'geodirectory'),
|
| 1307 | 1307 | 'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',
|
@@ -1309,40 +1309,40 @@ discard block |
||
| 1309 | 1309 | 'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),
|
| 1310 | 1310 | 'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',
|
| 1311 | 1311 | 'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',
|
| 1312 | - 'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,
|
|
| 1313 | - 'geodir_map_name' => geodir_map_name(), |
|
| 1314 | - 'osmStart' => __('Start', 'geodirectory'),
|
|
| 1315 | - 'osmVia' => __('Via {viaNumber}', 'geodirectory'),
|
|
| 1316 | - 'osmEnd' => __('Enter Your Location', 'geodirectory'),
|
|
| 1317 | - 'ga_delete_check' => __('Do you wish to Deauthorize and break Analytics?', 'geodirectory'),
|
|
| 1318 | - 'geoMyLocation' => __('My Location', 'geodirectory'),
|
|
| 1319 | - 'geoErrUNKNOWN_ERROR' => addslashes(__('Unable to find your location', 'geodirectory')),
|
|
| 1320 | - 'geoErrPERMISSION_DENINED' => addslashes(__('Permission denied in finding your location', 'geodirectory')),
|
|
| 1321 | - 'geoErrPOSITION_UNAVAILABLE' => addslashes(__('Your location is currently unknown', 'geodirectory')),
|
|
| 1322 | - 'geoErrBREAK' => addslashes(__('Attempt to find location took too long', 'geodirectory')),
|
|
| 1323 | - 'geoErrDEFAULT' => addslashes(__('Location detection not supported in browser', 'geodirectory')),
|
|
| 1324 | - ); |
|
| 1325 | - |
|
| 1326 | - /** |
|
| 1327 | - * Filters the translated JS strings from function geodir_localize_all_js_msg(). |
|
| 1328 | - * |
|
| 1329 | - * With this filter you can add, remove or change translated JS strings. |
|
| 1330 | - * You should add your own translations to this if you are building an addon rather than adding another script block. |
|
| 1331 | - * |
|
| 1332 | - * @since 1.0.0 |
|
| 1333 | - */ |
|
| 1334 | - $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);
|
|
| 1335 | - |
|
| 1336 | - foreach ($arr_alert_msg as $key => $value) {
|
|
| 1337 | - if (!is_scalar($value)) |
|
| 1338 | - continue; |
|
| 1339 | - $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8'); |
|
| 1340 | - } |
|
| 1312 | + 'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,
|
|
| 1313 | + 'geodir_map_name' => geodir_map_name(), |
|
| 1314 | + 'osmStart' => __('Start', 'geodirectory'),
|
|
| 1315 | + 'osmVia' => __('Via {viaNumber}', 'geodirectory'),
|
|
| 1316 | + 'osmEnd' => __('Enter Your Location', 'geodirectory'),
|
|
| 1317 | + 'ga_delete_check' => __('Do you wish to Deauthorize and break Analytics?', 'geodirectory'),
|
|
| 1318 | + 'geoMyLocation' => __('My Location', 'geodirectory'),
|
|
| 1319 | + 'geoErrUNKNOWN_ERROR' => addslashes(__('Unable to find your location', 'geodirectory')),
|
|
| 1320 | + 'geoErrPERMISSION_DENINED' => addslashes(__('Permission denied in finding your location', 'geodirectory')),
|
|
| 1321 | + 'geoErrPOSITION_UNAVAILABLE' => addslashes(__('Your location is currently unknown', 'geodirectory')),
|
|
| 1322 | + 'geoErrBREAK' => addslashes(__('Attempt to find location took too long', 'geodirectory')),
|
|
| 1323 | + 'geoErrDEFAULT' => addslashes(__('Location detection not supported in browser', 'geodirectory')),
|
|
| 1324 | + ); |
|
| 1325 | + |
|
| 1326 | + /** |
|
| 1327 | + * Filters the translated JS strings from function geodir_localize_all_js_msg(). |
|
| 1328 | + * |
|
| 1329 | + * With this filter you can add, remove or change translated JS strings. |
|
| 1330 | + * You should add your own translations to this if you are building an addon rather than adding another script block. |
|
| 1331 | + * |
|
| 1332 | + * @since 1.0.0 |
|
| 1333 | + */ |
|
| 1334 | + $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);
|
|
| 1341 | 1335 | |
| 1342 | - $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';'; |
|
| 1343 | - echo '<script>'; |
|
| 1344 | - echo $script; |
|
| 1345 | - echo '</script>'; |
|
| 1336 | + foreach ($arr_alert_msg as $key => $value) {
|
|
| 1337 | + if (!is_scalar($value)) |
|
| 1338 | + continue; |
|
| 1339 | + $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8'); |
|
| 1340 | + } |
|
| 1341 | + |
|
| 1342 | + $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';'; |
|
| 1343 | + echo '<script>'; |
|
| 1344 | + echo $script; |
|
| 1345 | + echo '</script>'; |
|
| 1346 | 1346 | } |
| 1347 | 1347 | |
| 1348 | 1348 | add_action('admin_bar_menu', 'geodir_admin_bar_site_menu', 31);
|
@@ -1358,11 +1358,11 @@ discard block |
||
| 1358 | 1358 | */ |
| 1359 | 1359 | function geodir_admin_bar_site_menu($wp_admin_bar) |
| 1360 | 1360 | {
|
| 1361 | - if (get_option("geodir_installed")) {
|
|
| 1362 | - if (current_user_can('manage_options')) {
|
|
| 1363 | - $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));
|
|
| 1364 | - } |
|
| 1365 | - } |
|
| 1361 | + if (get_option("geodir_installed")) {
|
|
| 1362 | + if (current_user_can('manage_options')) {
|
|
| 1363 | + $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));
|
|
| 1364 | + } |
|
| 1365 | + } |
|
| 1366 | 1366 | } |
| 1367 | 1367 | |
| 1368 | 1368 | add_action('geodir_before_listing', 'geodir_display_sort_options'); /*function in custom_functions.php*/
|
@@ -1388,25 +1388,25 @@ discard block |
||
| 1388 | 1388 | */ |
| 1389 | 1389 | function geodir_store_sidebars() |
| 1390 | 1390 | {
|
| 1391 | - global $geodir_sidebars; |
|
| 1392 | - global $sidebars_widgets; |
|
| 1393 | - |
|
| 1394 | - if (!is_array($sidebars_widgets)) |
|
| 1395 | - $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1396 | - $geodir_old_sidebars = array(); |
|
| 1397 | - |
|
| 1398 | - if (is_array($geodir_sidebars)) {
|
|
| 1399 | - foreach ($geodir_sidebars as $val) {
|
|
| 1400 | - if (is_array($sidebars_widgets)) {
|
|
| 1401 | - if (array_key_exists($val, $sidebars_widgets)) |
|
| 1402 | - $geodir_old_sidebars[$val] = $sidebars_widgets[$val]; |
|
| 1403 | - else |
|
| 1404 | - $geodir_old_sidebars[$val] = array(); |
|
| 1405 | - } |
|
| 1406 | - } |
|
| 1407 | - } |
|
| 1408 | - update_option('geodir_sidebars', $geodir_old_sidebars);
|
|
| 1409 | - geodir_option_version_backup('geodir_sidebars');
|
|
| 1391 | + global $geodir_sidebars; |
|
| 1392 | + global $sidebars_widgets; |
|
| 1393 | + |
|
| 1394 | + if (!is_array($sidebars_widgets)) |
|
| 1395 | + $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1396 | + $geodir_old_sidebars = array(); |
|
| 1397 | + |
|
| 1398 | + if (is_array($geodir_sidebars)) {
|
|
| 1399 | + foreach ($geodir_sidebars as $val) {
|
|
| 1400 | + if (is_array($sidebars_widgets)) {
|
|
| 1401 | + if (array_key_exists($val, $sidebars_widgets)) |
|
| 1402 | + $geodir_old_sidebars[$val] = $sidebars_widgets[$val]; |
|
| 1403 | + else |
|
| 1404 | + $geodir_old_sidebars[$val] = array(); |
|
| 1405 | + } |
|
| 1406 | + } |
|
| 1407 | + } |
|
| 1408 | + update_option('geodir_sidebars', $geodir_old_sidebars);
|
|
| 1409 | + geodir_option_version_backup('geodir_sidebars');
|
|
| 1410 | 1410 | |
| 1411 | 1411 | } |
| 1412 | 1412 | |
@@ -1420,28 +1420,28 @@ discard block |
||
| 1420 | 1420 | */ |
| 1421 | 1421 | function geodir_restore_sidebars() |
| 1422 | 1422 | {
|
| 1423 | - global $sidebars_widgets; |
|
| 1424 | - |
|
| 1425 | - if (!is_array($sidebars_widgets)) |
|
| 1426 | - $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1427 | - |
|
| 1428 | - if (is_array($sidebars_widgets)) {
|
|
| 1429 | - $geodir_old_sidebars = get_option('geodir_sidebars');
|
|
| 1430 | - if (is_array($geodir_old_sidebars)) {
|
|
| 1431 | - foreach ($geodir_old_sidebars as $key => $val) {
|
|
| 1432 | - if(0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1433 | - {
|
|
| 1434 | - $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
|
| 1435 | - } |
|
| 1423 | + global $sidebars_widgets; |
|
| 1436 | 1424 | |
| 1425 | + if (!is_array($sidebars_widgets)) |
|
| 1426 | + $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1437 | 1427 | |
| 1438 | - } |
|
| 1439 | - } |
|
| 1428 | + if (is_array($sidebars_widgets)) {
|
|
| 1429 | + $geodir_old_sidebars = get_option('geodir_sidebars');
|
|
| 1430 | + if (is_array($geodir_old_sidebars)) {
|
|
| 1431 | + foreach ($geodir_old_sidebars as $key => $val) {
|
|
| 1432 | + if(0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1433 | + {
|
|
| 1434 | + $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
|
| 1435 | + } |
|
| 1440 | 1436 | |
| 1441 | - } |
|
| 1442 | 1437 | |
| 1443 | - update_option('sidebars_widgets', $sidebars_widgets);
|
|
| 1444 | - update_option('geodir_sidebars', '');
|
|
| 1438 | + } |
|
| 1439 | + } |
|
| 1440 | + |
|
| 1441 | + } |
|
| 1442 | + |
|
| 1443 | + update_option('sidebars_widgets', $sidebars_widgets);
|
|
| 1444 | + update_option('geodir_sidebars', '');
|
|
| 1445 | 1445 | } |
| 1446 | 1446 | |
| 1447 | 1447 | add_action('geodir_after_listing_post_gridview', 'geodir_after_listing_post_gridview');
|
@@ -1454,9 +1454,9 @@ discard block |
||
| 1454 | 1454 | */ |
| 1455 | 1455 | function geodir_after_listing_post_gridview() |
| 1456 | 1456 | {
|
| 1457 | - global $gridview_columns; |
|
| 1457 | + global $gridview_columns; |
|
| 1458 | 1458 | |
| 1459 | - $gridview_columns = ''; |
|
| 1459 | + $gridview_columns = ''; |
|
| 1460 | 1460 | |
| 1461 | 1461 | } |
| 1462 | 1462 | |
@@ -1484,11 +1484,11 @@ discard block |
||
| 1484 | 1484 | */ |
| 1485 | 1485 | function so_handle_038($url, $original_url, $_context) |
| 1486 | 1486 | {
|
| 1487 | - if (strstr($url, "maps.google.com/maps/api/js") !== false) {
|
|
| 1488 | - $url = str_replace("&", "&", $url); // or $url = $original_url
|
|
| 1489 | - } |
|
| 1487 | + if (strstr($url, "maps.google.com/maps/api/js") !== false) {
|
|
| 1488 | + $url = str_replace("&", "&", $url); // or $url = $original_url
|
|
| 1489 | + } |
|
| 1490 | 1490 | |
| 1491 | - return $url; |
|
| 1491 | + return $url; |
|
| 1492 | 1492 | } |
| 1493 | 1493 | |
| 1494 | 1494 | |
@@ -1504,34 +1504,34 @@ discard block |
||
| 1504 | 1504 | function geodir_after_main_form_fields() {
|
| 1505 | 1505 | global $gd_session; |
| 1506 | 1506 | |
| 1507 | - if (get_option('geodir_accept_term_condition')) {
|
|
| 1508 | - global $post; |
|
| 1509 | - $term_condition = ''; |
|
| 1510 | - if (isset($_REQUEST['backandedit'])) {
|
|
| 1511 | - $post = (object)$gd_session->get('listing');
|
|
| 1512 | - $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : ''; |
|
| 1513 | - } |
|
| 1514 | - |
|
| 1515 | - ?> |
|
| 1507 | + if (get_option('geodir_accept_term_condition')) {
|
|
| 1508 | + global $post; |
|
| 1509 | + $term_condition = ''; |
|
| 1510 | + if (isset($_REQUEST['backandedit'])) {
|
|
| 1511 | + $post = (object)$gd_session->get('listing');
|
|
| 1512 | + $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : ''; |
|
| 1513 | + } |
|
| 1514 | + |
|
| 1515 | + ?> |
|
| 1516 | 1516 | <div id="geodir_accept_term_condition_row" class="required_field geodir_form_row clearfix"> |
| 1517 | 1517 | <label> </label> |
| 1518 | 1518 | |
| 1519 | 1519 | <div class="geodir_taxonomy_field" style="float:left; width:70%;"> |
| 1520 | 1520 | <span style="display:block"> |
| 1521 | 1521 | <input class="main_list_selecter" type="checkbox" <?php if ($term_condition == '1') {
|
| 1522 | - echo 'checked="checked"'; |
|
| 1523 | - } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition" |
|
| 1522 | + echo 'checked="checked"'; |
|
| 1523 | + } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition" |
|
| 1524 | 1524 | class="geodir_textfield" value="1" |
| 1525 | 1525 | style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>
|
| 1526 | 1526 | </span> |
| 1527 | 1527 | </div> |
| 1528 | 1528 | <span class="geodir_message_error"><?php if (isset($required_msg)) {
|
| 1529 | - _e($required_msg, 'geodirectory'); |
|
| 1530 | - } ?></span> |
|
| 1529 | + _e($required_msg, 'geodirectory'); |
|
| 1530 | + } ?></span> |
|
| 1531 | 1531 | </div> |
| 1532 | 1532 | <?php |
| 1533 | 1533 | |
| 1534 | - } |
|
| 1534 | + } |
|
| 1535 | 1535 | } |
| 1536 | 1536 | |
| 1537 | 1537 | |
@@ -1556,42 +1556,42 @@ discard block |
||
| 1556 | 1556 | */ |
| 1557 | 1557 | function geodir_detail_page_tab_is_display($is_display, $tab) |
| 1558 | 1558 | {
|
| 1559 | - global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields; |
|
| 1559 | + global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields; |
|
| 1560 | 1560 | |
| 1561 | - if ($tab == 'post_profile') {
|
|
| 1562 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1563 | - $desc_limit = apply_filters('geodir_description_field_desc_limit', '');
|
|
| 1561 | + if ($tab == 'post_profile') {
|
|
| 1562 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1563 | + $desc_limit = apply_filters('geodir_description_field_desc_limit', '');
|
|
| 1564 | 1564 | |
| 1565 | - if (!($desc_limit === '' || (int)$desc_limit > 0)) {
|
|
| 1566 | - $is_display = false; |
|
| 1567 | - } |
|
| 1568 | - } |
|
| 1565 | + if (!($desc_limit === '' || (int)$desc_limit > 0)) {
|
|
| 1566 | + $is_display = false; |
|
| 1567 | + } |
|
| 1568 | + } |
|
| 1569 | 1569 | |
| 1570 | - if ($tab == 'post_info') |
|
| 1571 | - $is_display = (!empty($geodir_post_detail_fields)) ? true : false; |
|
| 1570 | + if ($tab == 'post_info') |
|
| 1571 | + $is_display = (!empty($geodir_post_detail_fields)) ? true : false; |
|
| 1572 | 1572 | |
| 1573 | - if ($tab == 'post_images') |
|
| 1574 | - $is_display = (!empty($post_images)) ? true : false; |
|
| 1573 | + if ($tab == 'post_images') |
|
| 1574 | + $is_display = (!empty($post_images)) ? true : false; |
|
| 1575 | 1575 | |
| 1576 | - if ($tab == 'post_video') |
|
| 1577 | - $is_display = (!empty($video)) ? true : false; |
|
| 1576 | + if ($tab == 'post_video') |
|
| 1577 | + $is_display = (!empty($video)) ? true : false; |
|
| 1578 | 1578 | |
| 1579 | - if ($tab == 'special_offers') |
|
| 1580 | - $is_display = (!empty($special_offers)) ? true : false; |
|
| 1579 | + if ($tab == 'special_offers') |
|
| 1580 | + $is_display = (!empty($special_offers)) ? true : false; |
|
| 1581 | 1581 | |
| 1582 | - if ($tab == 'reviews') |
|
| 1583 | - $is_display = (geodir_is_page('detail')) ? true : false;
|
|
| 1582 | + if ($tab == 'reviews') |
|
| 1583 | + $is_display = (geodir_is_page('detail')) ? true : false;
|
|
| 1584 | 1584 | |
| 1585 | - if ($tab == 'related_listing') {
|
|
| 1586 | - $message = __('No listings found which match your selection.', 'geodirectory');
|
|
| 1585 | + if ($tab == 'related_listing') {
|
|
| 1586 | + $message = __('No listings found which match your selection.', 'geodirectory');
|
|
| 1587 | 1587 | |
| 1588 | - /** This action is documented in geodirectory-functions/template_functions.php */ |
|
| 1589 | - $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);
|
|
| 1588 | + /** This action is documented in geodirectory-functions/template_functions.php */ |
|
| 1589 | + $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);
|
|
| 1590 | 1590 | |
| 1591 | - $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;
|
|
| 1592 | - } |
|
| 1591 | + $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;
|
|
| 1592 | + } |
|
| 1593 | 1593 | |
| 1594 | - return $is_display; |
|
| 1594 | + return $is_display; |
|
| 1595 | 1595 | } |
| 1596 | 1596 | |
| 1597 | 1597 | |
@@ -1607,69 +1607,69 @@ discard block |
||
| 1607 | 1607 | * @global string $plugin_prefix Geodirectory plugin table prefix. |
| 1608 | 1608 | */ |
| 1609 | 1609 | function geodir_changes_in_custom_fields_table() {
|
| 1610 | - global $wpdb, $plugin_prefix; |
|
| 1610 | + global $wpdb, $plugin_prefix; |
|
| 1611 | 1611 | |
| 1612 | 1612 | // Remove unused virtual page |
| 1613 | 1613 | $listings_page_id = (int)get_option('geodir_listing_page');
|
| 1614 | 1614 | if ($listings_page_id) {
|
| 1615 | 1615 | $wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));
|
| 1616 | - delete_option('geodir_listing_page');
|
|
| 1616 | + delete_option('geodir_listing_page');
|
|
| 1617 | 1617 | } |
| 1618 | 1618 | |
| 1619 | - if (!get_option('geodir_changes_in_custom_fields_table')) {
|
|
| 1620 | - $wpdb->query( |
|
| 1621 | - $wpdb->prepare( |
|
| 1622 | - "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s", |
|
| 1623 | - array('1', '1', 'admin')
|
|
| 1624 | - ) |
|
| 1625 | - ); |
|
| 1619 | + if (!get_option('geodir_changes_in_custom_fields_table')) {
|
|
| 1620 | + $wpdb->query( |
|
| 1621 | + $wpdb->prepare( |
|
| 1622 | + "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s", |
|
| 1623 | + array('1', '1', 'admin')
|
|
| 1624 | + ) |
|
| 1625 | + ); |
|
| 1626 | 1626 | |
| 1627 | 1627 | |
| 1628 | - /* --- terms meta value set --- */ |
|
| 1628 | + /* --- terms meta value set --- */ |
|
| 1629 | 1629 | |
| 1630 | - update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');
|
|
| 1630 | + update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');
|
|
| 1631 | 1631 | |
| 1632 | - $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
| 1632 | + $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
| 1633 | 1633 | |
| 1634 | - if (!empty($options_data)) {
|
|
| 1634 | + if (!empty($options_data)) {
|
|
| 1635 | 1635 | |
| 1636 | - foreach ($options_data as $optobj) {
|
|
| 1636 | + foreach ($options_data as $optobj) {
|
|
| 1637 | 1637 | |
| 1638 | - $option_val = str_replace('tax_meta_', '', $optobj->option_name);
|
|
| 1638 | + $option_val = str_replace('tax_meta_', '', $optobj->option_name);
|
|
| 1639 | 1639 | |
| 1640 | - $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
| 1640 | + $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
| 1641 | 1641 | |
| 1642 | - if (!empty($taxonomies_data)) {
|
|
| 1642 | + if (!empty($taxonomies_data)) {
|
|
| 1643 | 1643 | |
| 1644 | - foreach ($taxonomies_data as $taxobj) {
|
|
| 1644 | + foreach ($taxonomies_data as $taxobj) {
|
|
| 1645 | 1645 | |
| 1646 | - $taxObject = get_taxonomy($taxobj->taxonomy); |
|
| 1647 | - $post_type = $taxObject->object_type[0]; |
|
| 1646 | + $taxObject = get_taxonomy($taxobj->taxonomy); |
|
| 1647 | + $post_type = $taxObject->object_type[0]; |
|
| 1648 | 1648 | |
| 1649 | - $opt_value = 'tax_meta_' . $post_type . '_' . $option_val; |
|
| 1649 | + $opt_value = 'tax_meta_' . $post_type . '_' . $option_val; |
|
| 1650 | 1650 | |
| 1651 | - $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));
|
|
| 1651 | + $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));
|
|
| 1652 | 1652 | |
| 1653 | - if ($duplicate_data) {
|
|
| 1653 | + if ($duplicate_data) {
|
|
| 1654 | 1654 | |
| 1655 | - $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
| 1655 | + $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
| 1656 | 1656 | |
| 1657 | - } else {
|
|
| 1657 | + } else {
|
|
| 1658 | 1658 | |
| 1659 | - $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
| 1659 | + $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
| 1660 | 1660 | |
| 1661 | - } |
|
| 1661 | + } |
|
| 1662 | 1662 | |
| 1663 | - } |
|
| 1663 | + } |
|
| 1664 | 1664 | |
| 1665 | - } |
|
| 1665 | + } |
|
| 1666 | 1666 | |
| 1667 | - } |
|
| 1668 | - } |
|
| 1667 | + } |
|
| 1668 | + } |
|
| 1669 | 1669 | |
| 1670 | - update_option('geodir_changes_in_custom_fields_table', '1');
|
|
| 1670 | + update_option('geodir_changes_in_custom_fields_table', '1');
|
|
| 1671 | 1671 | |
| 1672 | - } |
|
| 1672 | + } |
|
| 1673 | 1673 | |
| 1674 | 1674 | } |
| 1675 | 1675 | |
@@ -1688,24 +1688,24 @@ discard block |
||
| 1688 | 1688 | function geodir_location_slug_check($slug) |
| 1689 | 1689 | {
|
| 1690 | 1690 | |
| 1691 | - global $wpdb, $table_prefix; |
|
| 1691 | + global $wpdb, $table_prefix; |
|
| 1692 | 1692 | |
| 1693 | - $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));
|
|
| 1693 | + $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));
|
|
| 1694 | 1694 | |
| 1695 | - if ($slug_exists) {
|
|
| 1695 | + if ($slug_exists) {
|
|
| 1696 | 1696 | |
| 1697 | - $suffix = 1; |
|
| 1698 | - do {
|
|
| 1699 | - $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1700 | - $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));
|
|
| 1701 | - $suffix++; |
|
| 1702 | - } while ($location_slug_check && $suffix < 100); |
|
| 1697 | + $suffix = 1; |
|
| 1698 | + do {
|
|
| 1699 | + $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1700 | + $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));
|
|
| 1701 | + $suffix++; |
|
| 1702 | + } while ($location_slug_check && $suffix < 100); |
|
| 1703 | 1703 | |
| 1704 | - $slug = $alt_location_name; |
|
| 1704 | + $slug = $alt_location_name; |
|
| 1705 | 1705 | |
| 1706 | - } |
|
| 1706 | + } |
|
| 1707 | 1707 | |
| 1708 | - return $slug; |
|
| 1708 | + return $slug; |
|
| 1709 | 1709 | |
| 1710 | 1710 | } |
| 1711 | 1711 | |
@@ -1730,42 +1730,42 @@ discard block |
||
| 1730 | 1730 | function geodir_update_term_slug($term_id, $tt_id, $taxonomy) |
| 1731 | 1731 | {
|
| 1732 | 1732 | |
| 1733 | - global $wpdb, $plugin_prefix, $table_prefix; |
|
| 1733 | + global $wpdb, $plugin_prefix, $table_prefix; |
|
| 1734 | 1734 | |
| 1735 | - $tern_data = get_term_by('id', $term_id, $taxonomy);
|
|
| 1735 | + $tern_data = get_term_by('id', $term_id, $taxonomy);
|
|
| 1736 | 1736 | |
| 1737 | - $slug = $tern_data->slug; |
|
| 1737 | + $slug = $tern_data->slug; |
|
| 1738 | 1738 | |
| 1739 | - /** |
|
| 1740 | - * Filter if a term slug exists. |
|
| 1741 | - * |
|
| 1742 | - * @since 1.0.0 |
|
| 1743 | - * @package GeoDirectory |
|
| 1744 | - * @param bool $bool Default: false. |
|
| 1745 | - * @param string $slug The term slug. |
|
| 1746 | - * @param int $term_id The term ID. |
|
| 1747 | - */ |
|
| 1748 | - $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);
|
|
| 1739 | + /** |
|
| 1740 | + * Filter if a term slug exists. |
|
| 1741 | + * |
|
| 1742 | + * @since 1.0.0 |
|
| 1743 | + * @package GeoDirectory |
|
| 1744 | + * @param bool $bool Default: false. |
|
| 1745 | + * @param string $slug The term slug. |
|
| 1746 | + * @param int $term_id The term ID. |
|
| 1747 | + */ |
|
| 1748 | + $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);
|
|
| 1749 | 1749 | |
| 1750 | - if ($slug_exists) {
|
|
| 1750 | + if ($slug_exists) {
|
|
| 1751 | 1751 | |
| 1752 | - $suffix = 1; |
|
| 1753 | - do {
|
|
| 1754 | - $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1752 | + $suffix = 1; |
|
| 1753 | + do {
|
|
| 1754 | + $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1755 | 1755 | |
| 1756 | - /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 1757 | - $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);
|
|
| 1756 | + /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 1757 | + $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);
|
|
| 1758 | 1758 | |
| 1759 | - $suffix++; |
|
| 1760 | - } while ($term_slug_check && $suffix < 100); |
|
| 1759 | + $suffix++; |
|
| 1760 | + } while ($term_slug_check && $suffix < 100); |
|
| 1761 | 1761 | |
| 1762 | - $slug = $new_slug; |
|
| 1762 | + $slug = $new_slug; |
|
| 1763 | 1763 | |
| 1764 | - //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );
|
|
| 1764 | + //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );
|
|
| 1765 | 1765 | |
| 1766 | - $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
| 1766 | + $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
| 1767 | 1767 | |
| 1768 | - } |
|
| 1768 | + } |
|
| 1769 | 1769 | |
| 1770 | 1770 | // Update tag in detail table. |
| 1771 | 1771 | $taxonomy_obj = get_taxonomy($taxonomy); |
@@ -1806,21 +1806,21 @@ discard block |
||
| 1806 | 1806 | function geodir_term_slug_is_exists($slug_exists, $slug, $term_id) |
| 1807 | 1807 | {
|
| 1808 | 1808 | |
| 1809 | - global $wpdb, $table_prefix; |
|
| 1809 | + global $wpdb, $table_prefix; |
|
| 1810 | 1810 | |
| 1811 | - $default_location = geodir_get_default_location(); |
|
| 1811 | + $default_location = geodir_get_default_location(); |
|
| 1812 | 1812 | |
| 1813 | - $country_slug = $default_location->country_slug; |
|
| 1814 | - $region_slug = $default_location->region_slug; |
|
| 1815 | - $city_slug = $default_location->city_slug; |
|
| 1813 | + $country_slug = $default_location->country_slug; |
|
| 1814 | + $region_slug = $default_location->region_slug; |
|
| 1815 | + $city_slug = $default_location->city_slug; |
|
| 1816 | 1816 | |
| 1817 | - if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) |
|
| 1818 | - return $slug_exists = true; |
|
| 1817 | + if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) |
|
| 1818 | + return $slug_exists = true; |
|
| 1819 | 1819 | |
| 1820 | - if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1821 | - return $slug_exists = true; |
|
| 1820 | + if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1821 | + return $slug_exists = true; |
|
| 1822 | 1822 | |
| 1823 | - return $slug_exists; |
|
| 1823 | + return $slug_exists; |
|
| 1824 | 1824 | } |
| 1825 | 1825 | |
| 1826 | 1826 | |
@@ -1840,75 +1840,75 @@ discard block |
||
| 1840 | 1840 | */ |
| 1841 | 1841 | function geodir_custom_page_title($title = '', $sep = '') |
| 1842 | 1842 | {
|
| 1843 | - global $wp; |
|
| 1844 | - if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
|
|
| 1845 | - return $title; |
|
| 1846 | - } |
|
| 1843 | + global $wp; |
|
| 1844 | + if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
|
|
| 1845 | + return $title; |
|
| 1846 | + } |
|
| 1847 | 1847 | |
| 1848 | - if ($sep == '') {
|
|
| 1849 | - /** |
|
| 1850 | - * Filter the page title separator. |
|
| 1851 | - * |
|
| 1852 | - * @since 1.0.0 |
|
| 1853 | - * @package GeoDirectory |
|
| 1854 | - * @param string $sep The separator, default: `|`. |
|
| 1855 | - */ |
|
| 1856 | - $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 1857 | - } |
|
| 1848 | + if ($sep == '') {
|
|
| 1849 | + /** |
|
| 1850 | + * Filter the page title separator. |
|
| 1851 | + * |
|
| 1852 | + * @since 1.0.0 |
|
| 1853 | + * @package GeoDirectory |
|
| 1854 | + * @param string $sep The separator, default: `|`. |
|
| 1855 | + */ |
|
| 1856 | + $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 1857 | + } |
|
| 1858 | 1858 | |
| 1859 | 1859 | |
| 1860 | - $gd_page = ''; |
|
| 1861 | - if(geodir_is_page('home')){
|
|
| 1862 | - $gd_page = 'home'; |
|
| 1863 | - $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
|
| 1864 | - } |
|
| 1865 | - elseif(geodir_is_page('detail')){
|
|
| 1866 | - $gd_page = 'detail'; |
|
| 1867 | - $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
|
| 1868 | - } |
|
| 1869 | - elseif(geodir_is_page('pt')){
|
|
| 1870 | - $gd_page = 'pt'; |
|
| 1871 | - $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
|
| 1872 | - } |
|
| 1873 | - elseif(geodir_is_page('listing')){
|
|
| 1874 | - $gd_page = 'listing'; |
|
| 1875 | - $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
|
| 1876 | - } |
|
| 1877 | - elseif(geodir_is_page('location')){
|
|
| 1878 | - $gd_page = 'location'; |
|
| 1879 | - $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
|
| 1880 | - } |
|
| 1881 | - elseif(geodir_is_page('search')){
|
|
| 1882 | - $gd_page = 'search'; |
|
| 1883 | - $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
|
| 1884 | - } |
|
| 1885 | - elseif(geodir_is_page('add-listing')){
|
|
| 1886 | - $gd_page = 'add-listing'; |
|
| 1887 | - $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
|
| 1888 | - } |
|
| 1889 | - elseif(geodir_is_page('author')){
|
|
| 1890 | - $gd_page = 'author'; |
|
| 1891 | - $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
|
| 1892 | - } |
|
| 1893 | - elseif(geodir_is_page('login')){
|
|
| 1894 | - $gd_page = 'login'; |
|
| 1895 | - $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
|
| 1896 | - } |
|
| 1897 | - elseif(geodir_is_page('listing-success')){
|
|
| 1898 | - $gd_page = 'listing-success'; |
|
| 1899 | - $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
|
| 1900 | - } |
|
| 1860 | + $gd_page = ''; |
|
| 1861 | + if(geodir_is_page('home')){
|
|
| 1862 | + $gd_page = 'home'; |
|
| 1863 | + $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
|
| 1864 | + } |
|
| 1865 | + elseif(geodir_is_page('detail')){
|
|
| 1866 | + $gd_page = 'detail'; |
|
| 1867 | + $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
|
| 1868 | + } |
|
| 1869 | + elseif(geodir_is_page('pt')){
|
|
| 1870 | + $gd_page = 'pt'; |
|
| 1871 | + $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
|
| 1872 | + } |
|
| 1873 | + elseif(geodir_is_page('listing')){
|
|
| 1874 | + $gd_page = 'listing'; |
|
| 1875 | + $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
|
| 1876 | + } |
|
| 1877 | + elseif(geodir_is_page('location')){
|
|
| 1878 | + $gd_page = 'location'; |
|
| 1879 | + $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
|
| 1880 | + } |
|
| 1881 | + elseif(geodir_is_page('search')){
|
|
| 1882 | + $gd_page = 'search'; |
|
| 1883 | + $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
|
| 1884 | + } |
|
| 1885 | + elseif(geodir_is_page('add-listing')){
|
|
| 1886 | + $gd_page = 'add-listing'; |
|
| 1887 | + $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
|
| 1888 | + } |
|
| 1889 | + elseif(geodir_is_page('author')){
|
|
| 1890 | + $gd_page = 'author'; |
|
| 1891 | + $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
|
| 1892 | + } |
|
| 1893 | + elseif(geodir_is_page('login')){
|
|
| 1894 | + $gd_page = 'login'; |
|
| 1895 | + $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
|
| 1896 | + } |
|
| 1897 | + elseif(geodir_is_page('listing-success')){
|
|
| 1898 | + $gd_page = 'listing-success'; |
|
| 1899 | + $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
|
| 1900 | + } |
|
| 1901 | 1901 | |
| 1902 | 1902 | |
| 1903 | - /** |
|
| 1904 | - * Filter page meta title to replace variables. |
|
| 1905 | - * |
|
| 1906 | - * @since 1.5.4 |
|
| 1907 | - * @param string $title The page title including variables. |
|
| 1908 | - * @param string $gd_page The GeoDirectory page type if any. |
|
| 1909 | - * @param string $sep The title separator symbol. |
|
| 1910 | - */ |
|
| 1911 | - return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);
|
|
| 1903 | + /** |
|
| 1904 | + * Filter page meta title to replace variables. |
|
| 1905 | + * |
|
| 1906 | + * @since 1.5.4 |
|
| 1907 | + * @param string $title The page title including variables. |
|
| 1908 | + * @param string $gd_page The GeoDirectory page type if any. |
|
| 1909 | + * @param string $sep The title separator symbol. |
|
| 1910 | + */ |
|
| 1911 | + return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);
|
|
| 1912 | 1912 | |
| 1913 | 1913 | } |
| 1914 | 1914 | |
@@ -1924,36 +1924,36 @@ discard block |
||
| 1924 | 1924 | function geodir_set_post_attachment() |
| 1925 | 1925 | {
|
| 1926 | 1926 | |
| 1927 | - if (!get_option('geodir_set_post_attachments')) {
|
|
| 1927 | + if (!get_option('geodir_set_post_attachments')) {
|
|
| 1928 | 1928 | |
| 1929 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 1930 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1929 | + require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 1930 | + require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1931 | 1931 | |
| 1932 | - $all_postypes = geodir_get_posttypes(); |
|
| 1932 | + $all_postypes = geodir_get_posttypes(); |
|
| 1933 | 1933 | |
| 1934 | - foreach($all_postypes as $post_type){
|
|
| 1935 | - $args = array( |
|
| 1936 | - 'posts_per_page' => -1, |
|
| 1937 | - 'post_type' => $post_type, |
|
| 1938 | - 'post_status' => 'publish'); |
|
| 1934 | + foreach($all_postypes as $post_type){
|
|
| 1935 | + $args = array( |
|
| 1936 | + 'posts_per_page' => -1, |
|
| 1937 | + 'post_type' => $post_type, |
|
| 1938 | + 'post_status' => 'publish'); |
|
| 1939 | 1939 | |
| 1940 | - $posts_array = get_posts($args); |
|
| 1940 | + $posts_array = get_posts($args); |
|
| 1941 | 1941 | |
| 1942 | - if (!empty($posts_array)) {
|
|
| 1942 | + if (!empty($posts_array)) {
|
|
| 1943 | 1943 | |
| 1944 | - foreach ($posts_array as $post) {
|
|
| 1944 | + foreach ($posts_array as $post) {
|
|
| 1945 | 1945 | |
| 1946 | - geodir_set_wp_featured_image($post->ID); |
|
| 1946 | + geodir_set_wp_featured_image($post->ID); |
|
| 1947 | 1947 | |
| 1948 | - } |
|
| 1948 | + } |
|
| 1949 | 1949 | |
| 1950 | - } |
|
| 1951 | - } |
|
| 1950 | + } |
|
| 1951 | + } |
|
| 1952 | 1952 | |
| 1953 | 1953 | |
| 1954 | - update_option('geodir_set_post_attachments', '1');
|
|
| 1954 | + update_option('geodir_set_post_attachments', '1');
|
|
| 1955 | 1955 | |
| 1956 | - } |
|
| 1956 | + } |
|
| 1957 | 1957 | |
| 1958 | 1958 | } |
| 1959 | 1959 | |
@@ -1970,19 +1970,19 @@ discard block |
||
| 1970 | 1970 | function geodir_remove_url_seperator() |
| 1971 | 1971 | {
|
| 1972 | 1972 | |
| 1973 | - if (!get_option('geodir_remove_url_seperator')) {
|
|
| 1973 | + if (!get_option('geodir_remove_url_seperator')) {
|
|
| 1974 | 1974 | |
| 1975 | - if (get_option('geodir_listingurl_separator'))
|
|
| 1976 | - delete_option('geodir_listingurl_separator');
|
|
| 1975 | + if (get_option('geodir_listingurl_separator'))
|
|
| 1976 | + delete_option('geodir_listingurl_separator');
|
|
| 1977 | 1977 | |
| 1978 | - if (get_option('geodir_detailurl_separator'))
|
|
| 1979 | - delete_option('geodir_detailurl_separator');
|
|
| 1978 | + if (get_option('geodir_detailurl_separator'))
|
|
| 1979 | + delete_option('geodir_detailurl_separator');
|
|
| 1980 | 1980 | |
| 1981 | - flush_rewrite_rules(false); |
|
| 1981 | + flush_rewrite_rules(false); |
|
| 1982 | 1982 | |
| 1983 | - update_option('geodir_remove_url_seperator', '1');
|
|
| 1983 | + update_option('geodir_remove_url_seperator', '1');
|
|
| 1984 | 1984 | |
| 1985 | - } |
|
| 1985 | + } |
|
| 1986 | 1986 | |
| 1987 | 1987 | } |
| 1988 | 1988 | |
@@ -1998,19 +1998,19 @@ discard block |
||
| 1998 | 1998 | */ |
| 1999 | 1999 | function geodir_remove_url_seperator_form_permalink_settings($permalink_arr) |
| 2000 | 2000 | {
|
| 2001 | - foreach ($permalink_arr as $key => $value) {
|
|
| 2001 | + foreach ($permalink_arr as $key => $value) {
|
|
| 2002 | 2002 | |
| 2003 | - if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') |
|
| 2004 | - unset($permalink_arr[$key]); |
|
| 2003 | + if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') |
|
| 2004 | + unset($permalink_arr[$key]); |
|
| 2005 | 2005 | |
| 2006 | - } |
|
| 2006 | + } |
|
| 2007 | 2007 | |
| 2008 | - return $permalink_arr; |
|
| 2008 | + return $permalink_arr; |
|
| 2009 | 2009 | |
| 2010 | 2010 | } |
| 2011 | 2011 | |
| 2012 | 2012 | if (!is_admin()) {
|
| 2013 | - add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');
|
|
| 2013 | + add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');
|
|
| 2014 | 2014 | } |
| 2015 | 2015 | /** |
| 2016 | 2016 | * Set status from draft to publish. |
@@ -2023,16 +2023,16 @@ discard block |
||
| 2023 | 2023 | */ |
| 2024 | 2024 | function geodir_set_status_draft_to_publish_for_own_post($post) |
| 2025 | 2025 | {
|
| 2026 | - $user_id = get_current_user_id(); |
|
| 2026 | + $user_id = get_current_user_id(); |
|
| 2027 | 2027 | |
| 2028 | - if(!$user_id){return $post;}
|
|
| 2028 | + if(!$user_id){return $post;}
|
|
| 2029 | 2029 | |
| 2030 | - $gd_post_types = geodir_get_posttypes(); |
|
| 2030 | + $gd_post_types = geodir_get_posttypes(); |
|
| 2031 | 2031 | |
| 2032 | - if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {
|
|
| 2033 | - $post[0]->post_status = 'publish'; |
|
| 2034 | - } |
|
| 2035 | - return $post; |
|
| 2032 | + if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {
|
|
| 2033 | + $post[0]->post_status = 'publish'; |
|
| 2034 | + } |
|
| 2035 | + return $post; |
|
| 2036 | 2036 | } |
| 2037 | 2037 | |
| 2038 | 2038 | |
@@ -2124,33 +2124,33 @@ discard block |
||
| 2124 | 2124 | */ |
| 2125 | 2125 | function geodir_detail_page_tab_headings_change($tabs_arr) |
| 2126 | 2126 | {
|
| 2127 | - global $wpdb; |
|
| 2127 | + global $wpdb; |
|
| 2128 | 2128 | |
| 2129 | - $post_type = geodir_get_current_posttype(); |
|
| 2129 | + $post_type = geodir_get_current_posttype(); |
|
| 2130 | 2130 | |
| 2131 | - $all_postypes = geodir_get_posttypes(); |
|
| 2131 | + $all_postypes = geodir_get_posttypes(); |
|
| 2132 | 2132 | |
| 2133 | - if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {
|
|
| 2133 | + if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {
|
|
| 2134 | 2134 | |
| 2135 | - if (array_key_exists('post_video', $tabs_arr)) {
|
|
| 2135 | + if (array_key_exists('post_video', $tabs_arr)) {
|
|
| 2136 | 2136 | |
| 2137 | - $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
| 2137 | + $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
| 2138 | 2138 | |
| 2139 | - if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') |
|
| 2140 | - $tabs_arr['post_video']['heading_text'] = $field_title; |
|
| 2141 | - } |
|
| 2139 | + if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') |
|
| 2140 | + $tabs_arr['post_video']['heading_text'] = $field_title; |
|
| 2141 | + } |
|
| 2142 | 2142 | |
| 2143 | - if (array_key_exists('special_offers', $tabs_arr)) {
|
|
| 2143 | + if (array_key_exists('special_offers', $tabs_arr)) {
|
|
| 2144 | 2144 | |
| 2145 | - $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
| 2145 | + $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
| 2146 | 2146 | |
| 2147 | - if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') |
|
| 2148 | - $tabs_arr['special_offers']['heading_text'] = $field_title; |
|
| 2149 | - } |
|
| 2147 | + if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') |
|
| 2148 | + $tabs_arr['special_offers']['heading_text'] = $field_title; |
|
| 2149 | + } |
|
| 2150 | 2150 | |
| 2151 | - } |
|
| 2151 | + } |
|
| 2152 | 2152 | |
| 2153 | - return $tabs_arr; |
|
| 2153 | + return $tabs_arr; |
|
| 2154 | 2154 | |
| 2155 | 2155 | } |
| 2156 | 2156 | |
@@ -2163,10 +2163,10 @@ discard block |
||
| 2163 | 2163 | */ |
| 2164 | 2164 | function geodir_remove_template_redirect_actions() |
| 2165 | 2165 | {
|
| 2166 | - if (geodir_is_page('login')){
|
|
| 2167 | - remove_all_actions('template_redirect');
|
|
| 2168 | - remove_action('init', 'avia_modify_front', 10);
|
|
| 2169 | - } |
|
| 2166 | + if (geodir_is_page('login')){
|
|
| 2167 | + remove_all_actions('template_redirect');
|
|
| 2168 | + remove_action('init', 'avia_modify_front', 10);
|
|
| 2169 | + } |
|
| 2170 | 2170 | } |
| 2171 | 2171 | |
| 2172 | 2172 | |
@@ -2188,51 +2188,51 @@ discard block |
||
| 2188 | 2188 | function geodirectory_before_featured_image_delete($attachment_id) |
| 2189 | 2189 | {
|
| 2190 | 2190 | |
| 2191 | - global $wpdb, $plugin_prefix; |
|
| 2191 | + global $wpdb, $plugin_prefix; |
|
| 2192 | 2192 | |
| 2193 | - $post_id = get_post_field('post_parent', $attachment_id);
|
|
| 2193 | + $post_id = get_post_field('post_parent', $attachment_id);
|
|
| 2194 | 2194 | |
| 2195 | - $attachment_url = wp_get_attachment_url($attachment_id); |
|
| 2195 | + $attachment_url = wp_get_attachment_url($attachment_id); |
|
| 2196 | 2196 | |
| 2197 | - if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {
|
|
| 2197 | + if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {
|
|
| 2198 | 2198 | |
| 2199 | - $post_type = get_post_type($post_id); |
|
| 2199 | + $post_type = get_post_type($post_id); |
|
| 2200 | 2200 | |
| 2201 | - $all_postypes = geodir_get_posttypes(); |
|
| 2201 | + $all_postypes = geodir_get_posttypes(); |
|
| 2202 | 2202 | |
| 2203 | - if (!in_array($post_type, $all_postypes) || !is_admin()) |
|
| 2204 | - return false; |
|
| 2203 | + if (!in_array($post_type, $all_postypes) || !is_admin()) |
|
| 2204 | + return false; |
|
| 2205 | 2205 | |
| 2206 | - $uploads = wp_upload_dir(); |
|
| 2206 | + $uploads = wp_upload_dir(); |
|
| 2207 | 2207 | |
| 2208 | - $split_img_path = explode($uploads['baseurl'], $attachment_url); |
|
| 2208 | + $split_img_path = explode($uploads['baseurl'], $attachment_url); |
|
| 2209 | 2209 | |
| 2210 | - $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 2210 | + $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 2211 | 2211 | |
| 2212 | - $wpdb->query( |
|
| 2213 | - $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",
|
|
| 2214 | - array($post_id, $split_img_file_path) |
|
| 2215 | - ) |
|
| 2216 | - ); |
|
| 2212 | + $wpdb->query( |
|
| 2213 | + $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",
|
|
| 2214 | + array($post_id, $split_img_file_path) |
|
| 2215 | + ) |
|
| 2216 | + ); |
|
| 2217 | 2217 | |
| 2218 | - $attachment_data = $wpdb->get_row( |
|
| 2219 | - $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",
|
|
| 2220 | - array($post_id) |
|
| 2221 | - ) |
|
| 2222 | - ); |
|
| 2218 | + $attachment_data = $wpdb->get_row( |
|
| 2219 | + $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",
|
|
| 2220 | + array($post_id) |
|
| 2221 | + ) |
|
| 2222 | + ); |
|
| 2223 | 2223 | |
| 2224 | - if (!empty($attachment_data)) {
|
|
| 2225 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2226 | - } |
|
| 2224 | + if (!empty($attachment_data)) {
|
|
| 2225 | + $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2226 | + } |
|
| 2227 | 2227 | |
| 2228 | 2228 | |
| 2229 | - $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2229 | + $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2230 | 2230 | |
| 2231 | - $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2231 | + $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2232 | 2232 | |
| 2233 | - geodir_set_wp_featured_image($post_id); |
|
| 2233 | + geodir_set_wp_featured_image($post_id); |
|
| 2234 | 2234 | |
| 2235 | - } |
|
| 2235 | + } |
|
| 2236 | 2236 | |
| 2237 | 2237 | } |
| 2238 | 2238 | |
@@ -2250,79 +2250,79 @@ discard block |
||
| 2250 | 2250 | function geodir_temp_set_post_attachment() |
| 2251 | 2251 | {
|
| 2252 | 2252 | |
| 2253 | - global $wpdb, $plugin_prefix; |
|
| 2253 | + global $wpdb, $plugin_prefix; |
|
| 2254 | 2254 | |
| 2255 | - $all_postypes = geodir_get_posttypes(); |
|
| 2255 | + $all_postypes = geodir_get_posttypes(); |
|
| 2256 | 2256 | |
| 2257 | - foreach ($all_postypes as $posttype) {
|
|
| 2257 | + foreach ($all_postypes as $posttype) {
|
|
| 2258 | 2258 | |
| 2259 | - $tablename = $plugin_prefix . $posttype . '_detail'; |
|
| 2259 | + $tablename = $plugin_prefix . $posttype . '_detail'; |
|
| 2260 | 2260 | |
| 2261 | - $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);
|
|
| 2261 | + $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);
|
|
| 2262 | 2262 | |
| 2263 | - if (!empty($get_post_data)) {
|
|
| 2263 | + if (!empty($get_post_data)) {
|
|
| 2264 | 2264 | |
| 2265 | - foreach ($get_post_data as $data) {
|
|
| 2265 | + foreach ($get_post_data as $data) {
|
|
| 2266 | 2266 | |
| 2267 | - $post_id = $data->post_id; |
|
| 2267 | + $post_id = $data->post_id; |
|
| 2268 | 2268 | |
| 2269 | - $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");
|
|
| 2269 | + $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");
|
|
| 2270 | 2270 | |
| 2271 | - if (!empty($attachment_data)) {
|
|
| 2271 | + if (!empty($attachment_data)) {
|
|
| 2272 | 2272 | |
| 2273 | - foreach ($attachment_data as $attach) {
|
|
| 2273 | + foreach ($attachment_data as $attach) {
|
|
| 2274 | 2274 | |
| 2275 | - $file_info = pathinfo($attach->file); |
|
| 2275 | + $file_info = pathinfo($attach->file); |
|
| 2276 | 2276 | |
| 2277 | - $sub_dir = ''; |
|
| 2278 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 2279 | - $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 2277 | + $sub_dir = ''; |
|
| 2278 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 2279 | + $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 2280 | 2280 | |
| 2281 | - $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 2282 | - $uploads_path = $uploads['basedir']; |
|
| 2281 | + $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 2282 | + $uploads_path = $uploads['basedir']; |
|
| 2283 | 2283 | |
| 2284 | - $file_name = $file_info['basename']; |
|
| 2284 | + $file_name = $file_info['basename']; |
|
| 2285 | 2285 | |
| 2286 | - $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name; |
|
| 2286 | + $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name; |
|
| 2287 | 2287 | |
| 2288 | - if (!file_exists($img_arr['path'])) {
|
|
| 2288 | + if (!file_exists($img_arr['path'])) {
|
|
| 2289 | 2289 | |
| 2290 | - $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);
|
|
| 2290 | + $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);
|
|
| 2291 | 2291 | |
| 2292 | - } |
|
| 2292 | + } |
|
| 2293 | 2293 | |
| 2294 | - } |
|
| 2294 | + } |
|
| 2295 | 2295 | |
| 2296 | - $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");
|
|
| 2296 | + $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");
|
|
| 2297 | 2297 | |
| 2298 | - if (!empty($attachment_data)) {
|
|
| 2298 | + if (!empty($attachment_data)) {
|
|
| 2299 | 2299 | |
| 2300 | - if ($attachment_data->ID) |
|
| 2301 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2300 | + if ($attachment_data->ID) |
|
| 2301 | + $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2302 | 2302 | |
| 2303 | - } else {
|
|
| 2303 | + } else {
|
|
| 2304 | 2304 | |
| 2305 | - if (has_post_thumbnail($post_id)) {
|
|
| 2305 | + if (has_post_thumbnail($post_id)) {
|
|
| 2306 | 2306 | |
| 2307 | - $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2307 | + $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2308 | 2308 | |
| 2309 | - wp_delete_attachment($post_thumbnail_id); |
|
| 2309 | + wp_delete_attachment($post_thumbnail_id); |
|
| 2310 | 2310 | |
| 2311 | - } |
|
| 2311 | + } |
|
| 2312 | 2312 | |
| 2313 | - } |
|
| 2313 | + } |
|
| 2314 | 2314 | |
| 2315 | - $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2315 | + $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2316 | 2316 | |
| 2317 | - geodir_set_wp_featured_image($post_id); |
|
| 2317 | + geodir_set_wp_featured_image($post_id); |
|
| 2318 | 2318 | |
| 2319 | - } |
|
| 2319 | + } |
|
| 2320 | 2320 | |
| 2321 | - } |
|
| 2321 | + } |
|
| 2322 | 2322 | |
| 2323 | - } |
|
| 2323 | + } |
|
| 2324 | 2324 | |
| 2325 | - } |
|
| 2325 | + } |
|
| 2326 | 2326 | |
| 2327 | 2327 | } |
| 2328 | 2328 | |
@@ -2340,9 +2340,9 @@ discard block |
||
| 2340 | 2340 | function geodir_default_rating_star_icon() |
| 2341 | 2341 | {
|
| 2342 | 2342 | |
| 2343 | - if (!get_option('geodir_default_rating_star_icon')) {
|
|
| 2344 | - update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');
|
|
| 2345 | - } |
|
| 2343 | + if (!get_option('geodir_default_rating_star_icon')) {
|
|
| 2344 | + update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');
|
|
| 2345 | + } |
|
| 2346 | 2346 | |
| 2347 | 2347 | } |
| 2348 | 2348 | |
@@ -2360,25 +2360,25 @@ discard block |
||
| 2360 | 2360 | */ |
| 2361 | 2361 | function geodir_user_post_listing_count($user_id = 0) |
| 2362 | 2362 | {
|
| 2363 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 2364 | - if(!$user_id){
|
|
| 2365 | - $user_id = $current_user->ID; |
|
| 2366 | - } |
|
| 2363 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 2364 | + if(!$user_id){
|
|
| 2365 | + $user_id = $current_user->ID; |
|
| 2366 | + } |
|
| 2367 | 2367 | |
| 2368 | - $all_posts = get_option('geodir_listing_link_user_dashboard');
|
|
| 2368 | + $all_posts = get_option('geodir_listing_link_user_dashboard');
|
|
| 2369 | 2369 | |
| 2370 | - $user_listing = array(); |
|
| 2371 | - if ($user_id && is_array($all_posts) && !empty($all_posts)) {
|
|
| 2372 | - foreach ($all_posts as $ptype) {
|
|
| 2373 | - $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");
|
|
| 2370 | + $user_listing = array(); |
|
| 2371 | + if ($user_id && is_array($all_posts) && !empty($all_posts)) {
|
|
| 2372 | + foreach ($all_posts as $ptype) {
|
|
| 2373 | + $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");
|
|
| 2374 | 2374 | |
| 2375 | - if ($total_posts > 0) {
|
|
| 2376 | - $user_listing[$ptype] = $total_posts; |
|
| 2377 | - } |
|
| 2378 | - } |
|
| 2379 | - } |
|
| 2375 | + if ($total_posts > 0) {
|
|
| 2376 | + $user_listing[$ptype] = $total_posts; |
|
| 2377 | + } |
|
| 2378 | + } |
|
| 2379 | + } |
|
| 2380 | 2380 | |
| 2381 | - return $user_listing; |
|
| 2381 | + return $user_listing; |
|
| 2382 | 2382 | } |
| 2383 | 2383 | |
| 2384 | 2384 | |
@@ -2398,189 +2398,189 @@ discard block |
||
| 2398 | 2398 | */ |
| 2399 | 2399 | function geodir_detail_page_custom_field_tab($tabs_arr) |
| 2400 | 2400 | {
|
| 2401 | - global $post; |
|
| 2402 | - |
|
| 2403 | - $post_type = geodir_get_current_posttype(); |
|
| 2404 | - $all_postypes = geodir_get_posttypes(); |
|
| 2405 | - |
|
| 2406 | - if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {
|
|
| 2407 | - $package_info = array(); |
|
| 2408 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 2409 | - $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 2410 | - $fields_location = 'owntab'; |
|
| 2411 | - |
|
| 2412 | - $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location); |
|
| 2413 | - //remove video and special offers if it is already set to show |
|
| 2414 | - if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){
|
|
| 2415 | - $unset_video = true; |
|
| 2416 | - } |
|
| 2417 | - |
|
| 2418 | - if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){
|
|
| 2419 | - $unset_special_offers = true; |
|
| 2420 | - } |
|
| 2421 | - if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){
|
|
| 2422 | - foreach($custom_fields as $key => $custom_field){
|
|
| 2423 | - if($custom_field['name']=='geodir_video' && isset($unset_video)){
|
|
| 2424 | - unset($custom_fields[$key]); |
|
| 2425 | - } |
|
| 2426 | - if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){
|
|
| 2427 | - unset($custom_fields[$key]); |
|
| 2428 | - } |
|
| 2429 | - } |
|
| 2430 | - } |
|
| 2431 | - |
|
| 2432 | - |
|
| 2433 | - if (!empty($custom_fields)) {
|
|
| 2434 | - $parse_custom_fields = array(); |
|
| 2435 | - foreach ($custom_fields as $field) {
|
|
| 2436 | - $field = stripslashes_deep($field); // strip slashes |
|
| 2437 | - $type = $field; |
|
| 2438 | - $field_name = $field['htmlvar_name']; |
|
| 2439 | - if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2440 | - $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2441 | - } |
|
| 2401 | + global $post; |
|
| 2442 | 2402 | |
| 2443 | - if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2444 | - if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2445 | - continue; |
|
| 2446 | - } |
|
| 2403 | + $post_type = geodir_get_current_posttype(); |
|
| 2404 | + $all_postypes = geodir_get_posttypes(); |
|
| 2447 | 2405 | |
| 2448 | - $parse_custom_fields[] = $field; |
|
| 2449 | - } |
|
| 2450 | - } |
|
| 2451 | - $custom_fields = $parse_custom_fields; |
|
| 2452 | - } |
|
| 2453 | - //print_r($custom_fields); |
|
| 2454 | - if (!empty($custom_fields)) {
|
|
| 2406 | + if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {
|
|
| 2407 | + $package_info = array(); |
|
| 2408 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 2409 | + $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 2410 | + $fields_location = 'owntab'; |
|
| 2455 | 2411 | |
| 2456 | - global $field_set_start; |
|
| 2412 | + $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location); |
|
| 2413 | + //remove video and special offers if it is already set to show |
|
| 2414 | + if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){
|
|
| 2415 | + $unset_video = true; |
|
| 2416 | + } |
|
| 2457 | 2417 | |
| 2458 | - $post = stripslashes_deep($post); // strip slashes |
|
| 2459 | - |
|
| 2460 | - $field_set_start = 0; |
|
| 2461 | - $fieldset_count = 0; |
|
| 2462 | - $fieldset = ''; |
|
| 2463 | - $total_fields = count($custom_fields); |
|
| 2464 | - $count_field = 0; |
|
| 2465 | - $fieldset_arr = array(); |
|
| 2466 | - $i = 0; |
|
| 2467 | - $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL; |
|
| 2468 | - |
|
| 2469 | - foreach ($custom_fields as $field) {
|
|
| 2470 | - $count_field++; |
|
| 2471 | - $field_name = $field['htmlvar_name']; |
|
| 2472 | - if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2473 | - $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2474 | - } |
|
| 2418 | + if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){
|
|
| 2419 | + $unset_special_offers = true; |
|
| 2420 | + } |
|
| 2421 | + if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){
|
|
| 2422 | + foreach($custom_fields as $key => $custom_field){
|
|
| 2423 | + if($custom_field['name']=='geodir_video' && isset($unset_video)){
|
|
| 2424 | + unset($custom_fields[$key]); |
|
| 2425 | + } |
|
| 2426 | + if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){
|
|
| 2427 | + unset($custom_fields[$key]); |
|
| 2428 | + } |
|
| 2429 | + } |
|
| 2430 | + } |
|
| 2475 | 2431 | |
| 2476 | - if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2477 | - $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title']; |
|
| 2478 | - $site_title = trim($field['site_title']); |
|
| 2479 | - $type = $field; |
|
| 2480 | - $variables_array = array(); |
|
| 2481 | 2432 | |
| 2482 | - if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2483 | - continue; |
|
| 2484 | - } |
|
| 2433 | + if (!empty($custom_fields)) {
|
|
| 2434 | + $parse_custom_fields = array(); |
|
| 2435 | + foreach ($custom_fields as $field) {
|
|
| 2436 | + $field = stripslashes_deep($field); // strip slashes |
|
| 2437 | + $type = $field; |
|
| 2438 | + $field_name = $field['htmlvar_name']; |
|
| 2439 | + if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2440 | + $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2441 | + } |
|
| 2485 | 2442 | |
| 2486 | - if ($type['type'] != 'fieldset') {
|
|
| 2487 | - $i++; |
|
| 2488 | - $variables_array['post_id'] = $post->ID; |
|
| 2489 | - $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 2490 | - $variables_array['value'] = isset($post->{$type['htmlvar_name']}) ? $post->{$type['htmlvar_name']} : '';
|
|
| 2491 | - |
|
| 2492 | - }else{
|
|
| 2493 | - $i = 0; |
|
| 2494 | - $fieldset_count++; |
|
| 2495 | - $field_set_start = 1; |
|
| 2496 | - $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count; |
|
| 2497 | - $fieldset_arr[$fieldset_count]['label'] = $label; |
|
| 2498 | - } |
|
| 2443 | + if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2444 | + if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2445 | + continue; |
|
| 2446 | + } |
|
| 2499 | 2447 | |
| 2448 | + $parse_custom_fields[] = $field; |
|
| 2449 | + } |
|
| 2450 | + } |
|
| 2451 | + $custom_fields = $parse_custom_fields; |
|
| 2452 | + } |
|
| 2453 | + //print_r($custom_fields); |
|
| 2454 | + if (!empty($custom_fields)) {
|
|
| 2500 | 2455 | |
| 2501 | - if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 2502 | - $type = stripslashes_deep($type); // strip slashes |
|
| 2503 | - if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 2504 | - $html = ''; |
|
| 2505 | - $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 2506 | - if($html_var=='post'){$html_var='post_address';}
|
|
| 2507 | - $field_icon = geodir_field_icon_proccess($type); |
|
| 2508 | - $filed_type = $type['type']; |
|
| 2509 | - |
|
| 2510 | - /** |
|
| 2511 | - * Filter the output for custom fields. |
|
| 2512 | - * |
|
| 2513 | - * Here we can remove or add new functions depending on the field type. |
|
| 2514 | - * |
|
| 2515 | - * @param string $html The html to be filtered (blank). |
|
| 2516 | - * @param string $fields_location The location the field is to be show. |
|
| 2517 | - * @param array $type The array of field values. |
|
| 2518 | - */ |
|
| 2519 | - $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 2520 | - |
|
| 2521 | - |
|
| 2522 | - /** |
|
| 2523 | - * Filter custom field output in tab. |
|
| 2524 | - * |
|
| 2525 | - * @since 1.5.6 |
|
| 2526 | - * |
|
| 2527 | - * @param string $html_var The HTML variable name for the field. |
|
| 2528 | - * @param string $html Custom field unfiltered HTML. |
|
| 2529 | - * @param array $variables_array Custom field variables array. |
|
| 2530 | - */ |
|
| 2531 | - $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);
|
|
| 2532 | - |
|
| 2533 | - $fieldset_html = ''; |
|
| 2534 | - if ($field_set_start == 1) {
|
|
| 2535 | - $add_html = false; |
|
| 2536 | - if ($type['type'] == 'fieldset' && $fieldset_count > 1) {
|
|
| 2537 | - if ($fieldset != '') {
|
|
| 2538 | - $add_html = true; |
|
| 2539 | - $label = $fieldset_arr[$fieldset_count - 1]['label']; |
|
| 2540 | - $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name']; |
|
| 2541 | - } |
|
| 2542 | - $fieldset_html = $fieldset; |
|
| 2543 | - $fieldset = ''; |
|
| 2544 | - } else {
|
|
| 2545 | - $fieldset .= $html; |
|
| 2546 | - if ($total_fields == $count_field && $fieldset != '') {
|
|
| 2547 | - $add_html = true; |
|
| 2548 | - $label = $fieldset_arr[$fieldset_count]['label']; |
|
| 2549 | - $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name']; |
|
| 2550 | - $fieldset_html = $fieldset; |
|
| 2551 | - } |
|
| 2552 | - } |
|
| 2456 | + global $field_set_start; |
|
| 2553 | 2457 | |
| 2554 | - if ($add_html) {
|
|
| 2555 | - $tabs_arr[$htmlvar_name] = array( |
|
| 2556 | - 'heading_text' => __($label, 'geodirectory'), |
|
| 2557 | - 'is_active_tab' => false, |
|
| 2558 | - /** |
|
| 2559 | - * Filter if a custom field should be displayed on the details page tab. |
|
| 2560 | - * |
|
| 2561 | - * @since 1.0.0 |
|
| 2562 | - * @param string $htmlvar_name The field HTML var name. |
|
| 2563 | - */ |
|
| 2564 | - 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),
|
|
| 2565 | - 'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>' |
|
| 2566 | - ); |
|
| 2567 | - } |
|
| 2568 | - } else {
|
|
| 2569 | - if ($html != '') {
|
|
| 2570 | - $tabs_arr[$html_var] = array( |
|
| 2571 | - 'heading_text' => __($label, 'geodirectory'), |
|
| 2572 | - 'is_active_tab' => false, |
|
| 2573 | - /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 2574 | - 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),
|
|
| 2575 | - 'tab_content' => $html |
|
| 2576 | - ); |
|
| 2577 | - } |
|
| 2578 | - } |
|
| 2579 | - } |
|
| 2580 | - } |
|
| 2581 | - } |
|
| 2582 | - } |
|
| 2583 | - return $tabs_arr; |
|
| 2458 | + $post = stripslashes_deep($post); // strip slashes |
|
| 2459 | + |
|
| 2460 | + $field_set_start = 0; |
|
| 2461 | + $fieldset_count = 0; |
|
| 2462 | + $fieldset = ''; |
|
| 2463 | + $total_fields = count($custom_fields); |
|
| 2464 | + $count_field = 0; |
|
| 2465 | + $fieldset_arr = array(); |
|
| 2466 | + $i = 0; |
|
| 2467 | + $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL; |
|
| 2468 | + |
|
| 2469 | + foreach ($custom_fields as $field) {
|
|
| 2470 | + $count_field++; |
|
| 2471 | + $field_name = $field['htmlvar_name']; |
|
| 2472 | + if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2473 | + $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2474 | + } |
|
| 2475 | + |
|
| 2476 | + if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2477 | + $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title']; |
|
| 2478 | + $site_title = trim($field['site_title']); |
|
| 2479 | + $type = $field; |
|
| 2480 | + $variables_array = array(); |
|
| 2481 | + |
|
| 2482 | + if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2483 | + continue; |
|
| 2484 | + } |
|
| 2485 | + |
|
| 2486 | + if ($type['type'] != 'fieldset') {
|
|
| 2487 | + $i++; |
|
| 2488 | + $variables_array['post_id'] = $post->ID; |
|
| 2489 | + $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 2490 | + $variables_array['value'] = isset($post->{$type['htmlvar_name']}) ? $post->{$type['htmlvar_name']} : '';
|
|
| 2491 | + |
|
| 2492 | + }else{
|
|
| 2493 | + $i = 0; |
|
| 2494 | + $fieldset_count++; |
|
| 2495 | + $field_set_start = 1; |
|
| 2496 | + $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count; |
|
| 2497 | + $fieldset_arr[$fieldset_count]['label'] = $label; |
|
| 2498 | + } |
|
| 2499 | + |
|
| 2500 | + |
|
| 2501 | + if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 2502 | + $type = stripslashes_deep($type); // strip slashes |
|
| 2503 | + if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 2504 | + $html = ''; |
|
| 2505 | + $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 2506 | + if($html_var=='post'){$html_var='post_address';}
|
|
| 2507 | + $field_icon = geodir_field_icon_proccess($type); |
|
| 2508 | + $filed_type = $type['type']; |
|
| 2509 | + |
|
| 2510 | + /** |
|
| 2511 | + * Filter the output for custom fields. |
|
| 2512 | + * |
|
| 2513 | + * Here we can remove or add new functions depending on the field type. |
|
| 2514 | + * |
|
| 2515 | + * @param string $html The html to be filtered (blank). |
|
| 2516 | + * @param string $fields_location The location the field is to be show. |
|
| 2517 | + * @param array $type The array of field values. |
|
| 2518 | + */ |
|
| 2519 | + $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 2520 | + |
|
| 2521 | + |
|
| 2522 | + /** |
|
| 2523 | + * Filter custom field output in tab. |
|
| 2524 | + * |
|
| 2525 | + * @since 1.5.6 |
|
| 2526 | + * |
|
| 2527 | + * @param string $html_var The HTML variable name for the field. |
|
| 2528 | + * @param string $html Custom field unfiltered HTML. |
|
| 2529 | + * @param array $variables_array Custom field variables array. |
|
| 2530 | + */ |
|
| 2531 | + $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);
|
|
| 2532 | + |
|
| 2533 | + $fieldset_html = ''; |
|
| 2534 | + if ($field_set_start == 1) {
|
|
| 2535 | + $add_html = false; |
|
| 2536 | + if ($type['type'] == 'fieldset' && $fieldset_count > 1) {
|
|
| 2537 | + if ($fieldset != '') {
|
|
| 2538 | + $add_html = true; |
|
| 2539 | + $label = $fieldset_arr[$fieldset_count - 1]['label']; |
|
| 2540 | + $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name']; |
|
| 2541 | + } |
|
| 2542 | + $fieldset_html = $fieldset; |
|
| 2543 | + $fieldset = ''; |
|
| 2544 | + } else {
|
|
| 2545 | + $fieldset .= $html; |
|
| 2546 | + if ($total_fields == $count_field && $fieldset != '') {
|
|
| 2547 | + $add_html = true; |
|
| 2548 | + $label = $fieldset_arr[$fieldset_count]['label']; |
|
| 2549 | + $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name']; |
|
| 2550 | + $fieldset_html = $fieldset; |
|
| 2551 | + } |
|
| 2552 | + } |
|
| 2553 | + |
|
| 2554 | + if ($add_html) {
|
|
| 2555 | + $tabs_arr[$htmlvar_name] = array( |
|
| 2556 | + 'heading_text' => __($label, 'geodirectory'), |
|
| 2557 | + 'is_active_tab' => false, |
|
| 2558 | + /** |
|
| 2559 | + * Filter if a custom field should be displayed on the details page tab. |
|
| 2560 | + * |
|
| 2561 | + * @since 1.0.0 |
|
| 2562 | + * @param string $htmlvar_name The field HTML var name. |
|
| 2563 | + */ |
|
| 2564 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),
|
|
| 2565 | + 'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>' |
|
| 2566 | + ); |
|
| 2567 | + } |
|
| 2568 | + } else {
|
|
| 2569 | + if ($html != '') {
|
|
| 2570 | + $tabs_arr[$html_var] = array( |
|
| 2571 | + 'heading_text' => __($label, 'geodirectory'), |
|
| 2572 | + 'is_active_tab' => false, |
|
| 2573 | + /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 2574 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),
|
|
| 2575 | + 'tab_content' => $html |
|
| 2576 | + ); |
|
| 2577 | + } |
|
| 2578 | + } |
|
| 2579 | + } |
|
| 2580 | + } |
|
| 2581 | + } |
|
| 2582 | + } |
|
| 2583 | + return $tabs_arr; |
|
| 2584 | 2584 | } |
| 2585 | 2585 | |
| 2586 | 2586 | /* display add listing page for wpml */ |
@@ -2604,39 +2604,39 @@ discard block |
||
| 2604 | 2604 | */ |
| 2605 | 2605 | function geodir_add_post_status_author_page() |
| 2606 | 2606 | {
|
| 2607 | - global $wpdb, $post; |
|
| 2608 | - |
|
| 2609 | - $html = ''; |
|
| 2610 | - if (get_current_user_id()) {
|
|
| 2611 | - |
|
| 2612 | - $is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));
|
|
| 2613 | - if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {
|
|
| 2614 | - |
|
| 2615 | - // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them. |
|
| 2616 | - $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");
|
|
| 2617 | - $status = "<strong>(";
|
|
| 2618 | - $status_icon = '<i class="fa fa-play"></i>'; |
|
| 2619 | - if ($real_status == 'publish') {
|
|
| 2620 | - $status .= __('Published', 'geodirectory');
|
|
| 2621 | - } else {
|
|
| 2622 | - $status .= __('Not published', 'geodirectory');
|
|
| 2623 | - $status_icon = '<i class="fa fa-pause"></i>'; |
|
| 2624 | - } |
|
| 2625 | - $status .= ")</strong>"; |
|
| 2607 | + global $wpdb, $post; |
|
| 2608 | + |
|
| 2609 | + $html = ''; |
|
| 2610 | + if (get_current_user_id()) {
|
|
| 2611 | + |
|
| 2612 | + $is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));
|
|
| 2613 | + if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {
|
|
| 2614 | + |
|
| 2615 | + // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them. |
|
| 2616 | + $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");
|
|
| 2617 | + $status = "<strong>(";
|
|
| 2618 | + $status_icon = '<i class="fa fa-play"></i>'; |
|
| 2619 | + if ($real_status == 'publish') {
|
|
| 2620 | + $status .= __('Published', 'geodirectory');
|
|
| 2621 | + } else {
|
|
| 2622 | + $status .= __('Not published', 'geodirectory');
|
|
| 2623 | + $status_icon = '<i class="fa fa-pause"></i>'; |
|
| 2624 | + } |
|
| 2625 | + $status .= ")</strong>"; |
|
| 2626 | 2626 | |
| 2627 | - $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';
|
|
| 2628 | - } |
|
| 2629 | - } |
|
| 2627 | + $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';
|
|
| 2628 | + } |
|
| 2629 | + } |
|
| 2630 | 2630 | |
| 2631 | - if ($html != '') {
|
|
| 2632 | - /** |
|
| 2633 | - * Filter the post status text on the author page. |
|
| 2634 | - * |
|
| 2635 | - * @since 1.0.0 |
|
| 2636 | - * @param string $html The HTML of the status. |
|
| 2637 | - */ |
|
| 2638 | - echo apply_filters('geodir_filter_status_text_on_author_page', $html);
|
|
| 2639 | - } |
|
| 2631 | + if ($html != '') {
|
|
| 2632 | + /** |
|
| 2633 | + * Filter the post status text on the author page. |
|
| 2634 | + * |
|
| 2635 | + * @since 1.0.0 |
|
| 2636 | + * @param string $html The HTML of the status. |
|
| 2637 | + */ |
|
| 2638 | + echo apply_filters('geodir_filter_status_text_on_author_page', $html);
|
|
| 2639 | + } |
|
| 2640 | 2640 | |
| 2641 | 2641 | |
| 2642 | 2642 | } |
@@ -2650,9 +2650,9 @@ discard block |
||
| 2650 | 2650 | * @package GeoDirectory |
| 2651 | 2651 | */ |
| 2652 | 2652 | function geodir_init_no_rating() {
|
| 2653 | - if (geodir_rating_disabled_post_types()) {
|
|
| 2654 | - add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);
|
|
| 2655 | - } |
|
| 2653 | + if (geodir_rating_disabled_post_types()) {
|
|
| 2654 | + add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);
|
|
| 2655 | + } |
|
| 2656 | 2656 | } |
| 2657 | 2657 | |
| 2658 | 2658 | /** |
@@ -2666,22 +2666,22 @@ discard block |
||
| 2666 | 2666 | * @return array Modified sort options array. |
| 2667 | 2667 | */ |
| 2668 | 2668 | function geodir_no_rating_get_sort_options($options, $post_type = '') {
|
| 2669 | - if (!empty($post_type) && geodir_cpt_has_rating_disabled($post_type)) {
|
|
| 2670 | - $new_options = array(); |
|
| 2669 | + if (!empty($post_type) && geodir_cpt_has_rating_disabled($post_type)) {
|
|
| 2670 | + $new_options = array(); |
|
| 2671 | 2671 | |
| 2672 | - if (!empty($options)) {
|
|
| 2673 | - foreach ($options as $option) {
|
|
| 2674 | - if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {
|
|
| 2675 | - continue; |
|
| 2676 | - } |
|
| 2677 | - $new_options[] = $option; |
|
| 2678 | - } |
|
| 2672 | + if (!empty($options)) {
|
|
| 2673 | + foreach ($options as $option) {
|
|
| 2674 | + if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {
|
|
| 2675 | + continue; |
|
| 2676 | + } |
|
| 2677 | + $new_options[] = $option; |
|
| 2678 | + } |
|
| 2679 | 2679 | |
| 2680 | - $options = $new_options; |
|
| 2681 | - } |
|
| 2682 | - } |
|
| 2680 | + $options = $new_options; |
|
| 2681 | + } |
|
| 2682 | + } |
|
| 2683 | 2683 | |
| 2684 | - return $options; |
|
| 2684 | + return $options; |
|
| 2685 | 2685 | } |
| 2686 | 2686 | |
| 2687 | 2687 | /** |
@@ -2693,9 +2693,9 @@ discard block |
||
| 2693 | 2693 | * @return array Modified class array. |
| 2694 | 2694 | */ |
| 2695 | 2695 | function geodir_body_class_active_map($classes = array()) {
|
| 2696 | - $classes[] = 'gd-map-' . geodir_map_name(); |
|
| 2696 | + $classes[] = 'gd-map-' . geodir_map_name(); |
|
| 2697 | 2697 | |
| 2698 | - return $classes; |
|
| 2698 | + return $classes; |
|
| 2699 | 2699 | } |
| 2700 | 2700 | add_filter('body_class', 'geodir_body_class_active_map', 100);
|
| 2701 | 2701 | |
@@ -2708,9 +2708,9 @@ discard block |
||
| 2708 | 2708 | * @return string Modified class string. |
| 2709 | 2709 | */ |
| 2710 | 2710 | function geodir_admin_body_class_active_map($class = '') {
|
| 2711 | - $class .= ' gd-map-' . geodir_map_name(); |
|
| 2711 | + $class .= ' gd-map-' . geodir_map_name(); |
|
| 2712 | 2712 | |
| 2713 | - return $class; |
|
| 2713 | + return $class; |
|
| 2714 | 2714 | } |
| 2715 | 2715 | add_filter('admin_body_class', 'geodir_admin_body_class_active_map', 100);
|
| 2716 | 2716 | |
@@ -2728,36 +2728,36 @@ discard block |
||
| 2728 | 2728 | * @return array Translation texts. |
| 2729 | 2729 | */ |
| 2730 | 2730 | function geodir_load_gd_options_text_translation($translation_texts = array()) {
|
| 2731 | - $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array(); |
|
| 2732 | - |
|
| 2733 | - $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');
|
|
| 2734 | - |
|
| 2735 | - /** |
|
| 2736 | - * Filters the geodirectory option names that requires to add for translation. |
|
| 2737 | - * |
|
| 2738 | - * @since 1.5.7 |
|
| 2739 | - * @package GeoDirectory |
|
| 2740 | - * |
|
| 2741 | - * @param array $gd_options Array of option names. |
|
| 2742 | - */ |
|
| 2743 | - $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);
|
|
| 2744 | - $gd_options = array_unique($gd_options); |
|
| 2745 | - |
|
| 2746 | - if (!empty($gd_options)) {
|
|
| 2747 | - foreach ($gd_options as $gd_option) {
|
|
| 2748 | - if ($gd_option != '' && $option_value = get_option($gd_option)) {
|
|
| 2749 | - $option_value = is_string($option_value) ? stripslashes_deep($option_value) : ''; |
|
| 2731 | + $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array(); |
|
| 2732 | + |
|
| 2733 | + $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');
|
|
| 2734 | + |
|
| 2735 | + /** |
|
| 2736 | + * Filters the geodirectory option names that requires to add for translation. |
|
| 2737 | + * |
|
| 2738 | + * @since 1.5.7 |
|
| 2739 | + * @package GeoDirectory |
|
| 2740 | + * |
|
| 2741 | + * @param array $gd_options Array of option names. |
|
| 2742 | + */ |
|
| 2743 | + $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);
|
|
| 2744 | + $gd_options = array_unique($gd_options); |
|
| 2745 | + |
|
| 2746 | + if (!empty($gd_options)) {
|
|
| 2747 | + foreach ($gd_options as $gd_option) {
|
|
| 2748 | + if ($gd_option != '' && $option_value = get_option($gd_option)) {
|
|
| 2749 | + $option_value = is_string($option_value) ? stripslashes_deep($option_value) : ''; |
|
| 2750 | 2750 | |
| 2751 | - if ($option_value != '' && !in_array($option_value, $translation_texts)) {
|
|
| 2752 | - $translation_texts[] = stripslashes_deep($option_value); |
|
| 2753 | - } |
|
| 2754 | - } |
|
| 2755 | - } |
|
| 2756 | - } |
|
| 2751 | + if ($option_value != '' && !in_array($option_value, $translation_texts)) {
|
|
| 2752 | + $translation_texts[] = stripslashes_deep($option_value); |
|
| 2753 | + } |
|
| 2754 | + } |
|
| 2755 | + } |
|
| 2756 | + } |
|
| 2757 | 2757 | |
| 2758 | - $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 2758 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 2759 | 2759 | |
| 2760 | - return $translation_texts; |
|
| 2760 | + return $translation_texts; |
|
| 2761 | 2761 | } |
| 2762 | 2762 | |
| 2763 | 2763 | add_filter('geodir_load_db_language', 'geodir_load_gd_options_text_translation');
|
@@ -2771,15 +2771,15 @@ discard block |
||
| 2771 | 2771 | |
| 2772 | 2772 | add_filter('get_comments_link', 'gd_get_comments_link', 10, 2);
|
| 2773 | 2773 | function gd_get_comments_link($comments_link, $post_id) {
|
| 2774 | - $post_type = get_post_type($post_id); |
|
| 2774 | + $post_type = get_post_type($post_id); |
|
| 2775 | 2775 | |
| 2776 | - $all_postypes = geodir_get_posttypes(); |
|
| 2777 | - if (in_array($post_type, $all_postypes)) {
|
|
| 2778 | - $comments_link = str_replace('#comments', '#reviews', $comments_link);
|
|
| 2779 | - $comments_link = str_replace('#respond', '#reviews', $comments_link);
|
|
| 2780 | - } |
|
| 2776 | + $all_postypes = geodir_get_posttypes(); |
|
| 2777 | + if (in_array($post_type, $all_postypes)) {
|
|
| 2778 | + $comments_link = str_replace('#comments', '#reviews', $comments_link);
|
|
| 2779 | + $comments_link = str_replace('#respond', '#reviews', $comments_link);
|
|
| 2780 | + } |
|
| 2781 | 2781 | |
| 2782 | - return $comments_link; |
|
| 2782 | + return $comments_link; |
|
| 2783 | 2783 | } |
| 2784 | 2784 | |
| 2785 | 2785 | |
@@ -2797,11 +2797,11 @@ discard block |
||
| 2797 | 2797 | function geodir_add_nav_menu_class( $args ) |
| 2798 | 2798 | {
|
| 2799 | 2799 | |
| 2800 | - if(isset($args['menu_class'])){
|
|
| 2801 | - $args['menu_class'] = $args['menu_class']." gd-menu-z"; |
|
| 2802 | - } |
|
| 2800 | + if(isset($args['menu_class'])){
|
|
| 2801 | + $args['menu_class'] = $args['menu_class']." gd-menu-z"; |
|
| 2802 | + } |
|
| 2803 | 2803 | |
| 2804 | - return $args; |
|
| 2804 | + return $args; |
|
| 2805 | 2805 | } |
| 2806 | 2806 | |
| 2807 | 2807 | add_filter( 'wp_nav_menu_args', 'geodir_add_nav_menu_class' ); |
@@ -2818,15 +2818,15 @@ discard block |
||
| 2818 | 2818 | * @return string Filtered locale ID. |
| 2819 | 2819 | */ |
| 2820 | 2820 | function geodir_wpml_filter_locale($locale) {
|
| 2821 | - global $sitepress; |
|
| 2821 | + global $sitepress; |
|
| 2822 | 2822 | |
| 2823 | - $post_type = !empty($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (!empty($_REQUEST['post']) ? get_post_type($_REQUEST['post']) : ''); |
|
| 2823 | + $post_type = !empty($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (!empty($_REQUEST['post']) ? get_post_type($_REQUEST['post']) : ''); |
|
| 2824 | 2824 | |
| 2825 | - if (!empty($sitepress) && $sitepress->is_post_edit_screen() && $post_type && in_array($post_type, geodir_get_posttypes()) && $current_lang = $sitepress->get_current_language()) {
|
|
| 2826 | - $locale = $sitepress->get_locale($current_lang); |
|
| 2827 | - } |
|
| 2825 | + if (!empty($sitepress) && $sitepress->is_post_edit_screen() && $post_type && in_array($post_type, geodir_get_posttypes()) && $current_lang = $sitepress->get_current_language()) {
|
|
| 2826 | + $locale = $sitepress->get_locale($current_lang); |
|
| 2827 | + } |
|
| 2828 | 2828 | |
| 2829 | - return $locale; |
|
| 2829 | + return $locale; |
|
| 2830 | 2830 | } |
| 2831 | 2831 | |
| 2832 | 2832 | /** |
@@ -2836,19 +2836,19 @@ discard block |
||
| 2836 | 2836 | * @package GeoDirectory |
| 2837 | 2837 | */ |
| 2838 | 2838 | function geodir_wpml_set_filter() {
|
| 2839 | - if (geodir_is_wpml()) {
|
|
| 2840 | - global $sitepress; |
|
| 2839 | + if (geodir_is_wpml()) {
|
|
| 2840 | + global $sitepress; |
|
| 2841 | 2841 | |
| 2842 | - if ($sitepress->get_setting('sync_comments_on_duplicates')) {
|
|
| 2843 | - add_action('comment_post', 'gepdir_wpml_sync_comment', 100, 1);
|
|
| 2844 | - } |
|
| 2842 | + if ($sitepress->get_setting('sync_comments_on_duplicates')) {
|
|
| 2843 | + add_action('comment_post', 'gepdir_wpml_sync_comment', 100, 1);
|
|
| 2844 | + } |
|
| 2845 | 2845 | |
| 2846 | - add_action('geodir_after_save_listing', 'geodir_wpml_duplicate_listing', 100, 2);
|
|
| 2847 | - add_action( 'geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1 ); |
|
| 2848 | - if (is_admin()) {
|
|
| 2849 | - add_filter( 'geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1 ); |
|
| 2850 | - } |
|
| 2851 | - } |
|
| 2846 | + add_action('geodir_after_save_listing', 'geodir_wpml_duplicate_listing', 100, 2);
|
|
| 2847 | + add_action( 'geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1 ); |
|
| 2848 | + if (is_admin()) {
|
|
| 2849 | + add_filter( 'geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1 ); |
|
| 2850 | + } |
|
| 2851 | + } |
|
| 2852 | 2852 | } |
| 2853 | 2853 | add_filter('plugins_loaded', 'geodir_wpml_set_filter');
|
| 2854 | 2854 | |
@@ -2861,38 +2861,38 @@ discard block |
||
| 2861 | 2861 | * @return array Filtered languages. |
| 2862 | 2862 | */ |
| 2863 | 2863 | function geodir_wpml_filter_ls_languages($languages) {
|
| 2864 | - if (geodir_is_geodir_page()) {
|
|
| 2865 | - $keep_vars = array(); |
|
| 2864 | + if (geodir_is_geodir_page()) {
|
|
| 2865 | + $keep_vars = array(); |
|
| 2866 | 2866 | |
| 2867 | - if (geodir_is_page('add-listing')) {
|
|
| 2868 | - $keep_vars = array('listing_type', 'package_id');
|
|
| 2869 | - } else if (geodir_is_page('search')) {
|
|
| 2870 | - $keep_vars = array('geodir_search', 'stype', 'snear', 'set_location_type', 'set_location_val', 'sgeo_lat', 'sgeo_lon');
|
|
| 2871 | - } else if (geodir_is_page('author')) {
|
|
| 2872 | - $keep_vars = array('geodir_dashbord', 'stype', 'list');
|
|
| 2873 | - } else if (geodir_is_page('login')) {
|
|
| 2874 | - $keep_vars = array('forgot', 'signup');
|
|
| 2875 | - } |
|
| 2867 | + if (geodir_is_page('add-listing')) {
|
|
| 2868 | + $keep_vars = array('listing_type', 'package_id');
|
|
| 2869 | + } else if (geodir_is_page('search')) {
|
|
| 2870 | + $keep_vars = array('geodir_search', 'stype', 'snear', 'set_location_type', 'set_location_val', 'sgeo_lat', 'sgeo_lon');
|
|
| 2871 | + } else if (geodir_is_page('author')) {
|
|
| 2872 | + $keep_vars = array('geodir_dashbord', 'stype', 'list');
|
|
| 2873 | + } else if (geodir_is_page('login')) {
|
|
| 2874 | + $keep_vars = array('forgot', 'signup');
|
|
| 2875 | + } |
|
| 2876 | 2876 | |
| 2877 | - if (!empty($keep_vars)) {
|
|
| 2878 | - foreach ( $languages as $code => $url) {
|
|
| 2879 | - $filter_url = $url['url']; |
|
| 2877 | + if (!empty($keep_vars)) {
|
|
| 2878 | + foreach ( $languages as $code => $url) {
|
|
| 2879 | + $filter_url = $url['url']; |
|
| 2880 | 2880 | |
| 2881 | - foreach ($keep_vars as $var) {
|
|
| 2882 | - if (isset($_GET[$var]) && !is_array($_GET[$var])) {
|
|
| 2883 | - $filter_url = remove_query_arg(array($var), $filter_url); |
|
| 2884 | - $filter_url = add_query_arg(array($var => $_GET[$var]), $filter_url); |
|
| 2885 | - } |
|
| 2886 | - } |
|
| 2881 | + foreach ($keep_vars as $var) {
|
|
| 2882 | + if (isset($_GET[$var]) && !is_array($_GET[$var])) {
|
|
| 2883 | + $filter_url = remove_query_arg(array($var), $filter_url); |
|
| 2884 | + $filter_url = add_query_arg(array($var => $_GET[$var]), $filter_url); |
|
| 2885 | + } |
|
| 2886 | + } |
|
| 2887 | 2887 | |
| 2888 | - if ($filter_url != $url['url']) {
|
|
| 2889 | - $languages[$code]['url'] = $filter_url; |
|
| 2890 | - } |
|
| 2891 | - } |
|
| 2892 | - } |
|
| 2893 | - } |
|
| 2888 | + if ($filter_url != $url['url']) {
|
|
| 2889 | + $languages[$code]['url'] = $filter_url; |
|
| 2890 | + } |
|
| 2891 | + } |
|
| 2892 | + } |
|
| 2893 | + } |
|
| 2894 | 2894 | |
| 2895 | - return $languages; |
|
| 2895 | + return $languages; |
|
| 2896 | 2896 | } |
| 2897 | 2897 | add_filter( 'icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1 ); |
| 2898 | 2898 | |
@@ -2903,18 +2903,18 @@ discard block |
||
| 2903 | 2903 | * |
| 2904 | 2904 | */ |
| 2905 | 2905 | function geodir_remove_yoast_seo_metas(){
|
| 2906 | - if ( class_exists( 'WPSEO_Frontend' ) && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas() ) {
|
|
| 2907 | - $wpseo = WPSEO_Frontend::get_instance(); |
|
| 2906 | + if ( class_exists( 'WPSEO_Frontend' ) && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas() ) {
|
|
| 2907 | + $wpseo = WPSEO_Frontend::get_instance(); |
|
| 2908 | 2908 | |
| 2909 | - remove_action( 'wp_head', array( $wpseo, 'metadesc' ), 6 ); |
|
| 2910 | - remove_action( 'wp_head', array( $wpseo, 'metakeywords' ), 11 ); |
|
| 2911 | - remove_filter( 'pre_get_document_title', array( $wpseo, 'title' ), 15 ); |
|
| 2912 | - remove_filter( 'wp_title', array( $wpseo, 'title' ), 15, 3 ); |
|
| 2913 | - remove_filter( 'thematic_doctitle', array( $wpseo, 'title' ), 15 ); |
|
| 2914 | - remove_filter( 'woo_title', array( $wpseo, 'fix_woo_title' ), 99 ); |
|
| 2909 | + remove_action( 'wp_head', array( $wpseo, 'metadesc' ), 6 ); |
|
| 2910 | + remove_action( 'wp_head', array( $wpseo, 'metakeywords' ), 11 ); |
|
| 2911 | + remove_filter( 'pre_get_document_title', array( $wpseo, 'title' ), 15 ); |
|
| 2912 | + remove_filter( 'wp_title', array( $wpseo, 'title' ), 15, 3 ); |
|
| 2913 | + remove_filter( 'thematic_doctitle', array( $wpseo, 'title' ), 15 ); |
|
| 2914 | + remove_filter( 'woo_title', array( $wpseo, 'fix_woo_title' ), 99 ); |
|
| 2915 | 2915 | |
| 2916 | - remove_action( 'template_redirect', 'wpseo_frontend_head_init', 999 ); |
|
| 2917 | - } |
|
| 2916 | + remove_action( 'template_redirect', 'wpseo_frontend_head_init', 999 ); |
|
| 2917 | + } |
|
| 2918 | 2918 | } |
| 2919 | 2919 | |
| 2920 | 2920 | /** |
@@ -2928,20 +2928,20 @@ discard block |
||
| 2928 | 2928 | * |
| 2929 | 2929 | */ |
| 2930 | 2930 | function geodir_wpml_ajax_set_guest_lang() {
|
| 2931 | - if ( geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in() ) {
|
|
| 2932 | - if ( empty( $_GET['lang'] ) && !( !empty( $_SERVER['REQUEST_URI'] ) && preg_match( '@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename( preg_replace( '@\?.*$@', '', $_SERVER['REQUEST_URI'] ) ) ) ) ) {
|
|
| 2933 | - global $sitepress; |
|
| 2931 | + if ( geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in() ) {
|
|
| 2932 | + if ( empty( $_GET['lang'] ) && !( !empty( $_SERVER['REQUEST_URI'] ) && preg_match( '@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename( preg_replace( '@\?.*$@', '', $_SERVER['REQUEST_URI'] ) ) ) ) ) {
|
|
| 2933 | + global $sitepress; |
|
| 2934 | 2934 | |
| 2935 | - $referer = wp_get_referer(); |
|
| 2935 | + $referer = wp_get_referer(); |
|
| 2936 | 2936 | |
| 2937 | - $current_lang = $sitepress->get_current_language(); |
|
| 2938 | - $referrer_lang = $sitepress->get_language_from_url( $referer ); |
|
| 2937 | + $current_lang = $sitepress->get_current_language(); |
|
| 2938 | + $referrer_lang = $sitepress->get_language_from_url( $referer ); |
|
| 2939 | 2939 | |
| 2940 | - if ( $referrer_lang && $current_lang != $referrer_lang ) {
|
|
| 2941 | - $_GET['lang'] = $referrer_lang; |
|
| 2942 | - } |
|
| 2943 | - } |
|
| 2944 | - } |
|
| 2940 | + if ( $referrer_lang && $current_lang != $referrer_lang ) {
|
|
| 2941 | + $_GET['lang'] = $referrer_lang; |
|
| 2942 | + } |
|
| 2943 | + } |
|
| 2944 | + } |
|
| 2945 | 2945 | } |
| 2946 | 2946 | add_action( 'plugins_loaded', 'geodir_wpml_ajax_set_guest_lang', -1 ); |
| 2947 | 2947 | |
@@ -2953,36 +2953,36 @@ discard block |
||
| 2953 | 2953 | * @param object $wp The WordPress object. |
| 2954 | 2954 | */ |
| 2955 | 2955 | function geodir_check_redirect($wp) {
|
| 2956 | - if (is_404() || (!empty($wp->query_vars['error']) && $wp->query_vars['error'] == '404')) {
|
|
| 2957 | - $current_url = geodir_curPageURL(); |
|
| 2958 | - $search = 'czech-republic'; |
|
| 2959 | - $replace = 'czechia'; |
|
| 2956 | + if (is_404() || (!empty($wp->query_vars['error']) && $wp->query_vars['error'] == '404')) {
|
|
| 2957 | + $current_url = geodir_curPageURL(); |
|
| 2958 | + $search = 'czech-republic'; |
|
| 2959 | + $replace = 'czechia'; |
|
| 2960 | 2960 | |
| 2961 | - $has_slash = substr($current_url, -1); |
|
| 2962 | - if ($has_slash != "/") {
|
|
| 2963 | - $current_url .= '/'; |
|
| 2964 | - } |
|
| 2961 | + $has_slash = substr($current_url, -1); |
|
| 2962 | + if ($has_slash != "/") {
|
|
| 2963 | + $current_url .= '/'; |
|
| 2964 | + } |
|
| 2965 | 2965 | |
| 2966 | - $redirect = false; |
|
| 2967 | - if (strpos($current_url, '/' . $search . '/') !== false) {
|
|
| 2968 | - $redirect = true; |
|
| 2969 | - $current_url = preg_replace('/\/' . $search . '\//', '/' . $replace . '/', $current_url, 1);
|
|
| 2970 | - } |
|
| 2966 | + $redirect = false; |
|
| 2967 | + if (strpos($current_url, '/' . $search . '/') !== false) {
|
|
| 2968 | + $redirect = true; |
|
| 2969 | + $current_url = preg_replace('/\/' . $search . '\//', '/' . $replace . '/', $current_url, 1);
|
|
| 2970 | + } |
|
| 2971 | 2971 | |
| 2972 | - if ($has_slash != "/") {
|
|
| 2973 | - $current_url = trim($current_url, '/'); |
|
| 2974 | - } |
|
| 2972 | + if ($has_slash != "/") {
|
|
| 2973 | + $current_url = trim($current_url, '/'); |
|
| 2974 | + } |
|
| 2975 | 2975 | |
| 2976 | - if (strpos($current_url, 'gd_country=' . $search) !== false) {
|
|
| 2977 | - $redirect = true; |
|
| 2978 | - $current_url = str_replace('gd_country=' . $search, 'gd_country=' . $replace, $current_url);
|
|
| 2979 | - } |
|
| 2980 | - |
|
| 2981 | - if ($redirect) {
|
|
| 2982 | - wp_redirect($current_url); |
|
| 2983 | - exit; |
|
| 2984 | - } |
|
| 2985 | - } |
|
| 2976 | + if (strpos($current_url, 'gd_country=' . $search) !== false) {
|
|
| 2977 | + $redirect = true; |
|
| 2978 | + $current_url = str_replace('gd_country=' . $search, 'gd_country=' . $replace, $current_url);
|
|
| 2979 | + } |
|
| 2980 | + |
|
| 2981 | + if ($redirect) {
|
|
| 2982 | + wp_redirect($current_url); |
|
| 2983 | + exit; |
|
| 2984 | + } |
|
| 2985 | + } |
|
| 2986 | 2986 | } |
| 2987 | 2987 | add_action('parse_request', 'geodir_check_redirect', 101, 1);
|
| 2988 | 2988 | |
@@ -3002,50 +3002,50 @@ discard block |
||
| 3002 | 3002 | * @param string $original_slug The original post slug. |
| 3003 | 3003 | */ |
| 3004 | 3004 | function geodir_check_post_to_term_slug( $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug ) {
|
| 3005 | - global $wpdb, $sitepress; |
|
| 3005 | + global $wpdb, $sitepress; |
|
| 3006 | 3006 | |
| 3007 | - if ( $post_type && strpos( $post_type, 'gd_' ) === 0 ) {
|
|
| 3008 | - $wpml_post_join = ""; |
|
| 3009 | - $wpml_post_where = ""; |
|
| 3010 | - $wpml_term_join = ""; |
|
| 3011 | - $wpml_term_where = ""; |
|
| 3007 | + if ( $post_type && strpos( $post_type, 'gd_' ) === 0 ) {
|
|
| 3008 | + $wpml_post_join = ""; |
|
| 3009 | + $wpml_post_where = ""; |
|
| 3010 | + $wpml_term_join = ""; |
|
| 3011 | + $wpml_term_where = ""; |
|
| 3012 | 3012 | |
| 3013 | - if (geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 3014 | - $post_language = $post_ID ? $sitepress->post_translations()->get_element_lang_code($post_ID) : $sitepress->get_current_language(); |
|
| 3015 | - $post_language = $post_language ? $post_language : $sitepress->post_translations()->get_save_post_lang($post_ID, $sitepress); |
|
| 3016 | - if (!$post_language) {
|
|
| 3017 | - $post_language = $sitepress->get_current_language(); |
|
| 3018 | - } |
|
| 3013 | + if (geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 3014 | + $post_language = $post_ID ? $sitepress->post_translations()->get_element_lang_code($post_ID) : $sitepress->get_current_language(); |
|
| 3015 | + $post_language = $post_language ? $post_language : $sitepress->post_translations()->get_save_post_lang($post_ID, $sitepress); |
|
| 3016 | + if (!$post_language) {
|
|
| 3017 | + $post_language = $sitepress->get_current_language(); |
|
| 3018 | + } |
|
| 3019 | 3019 | |
| 3020 | - $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";
|
|
| 3021 | - $wpml_post_where = " AND icl_t.language_code = '" . $post_language ."'"; |
|
| 3020 | + $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";
|
|
| 3021 | + $wpml_post_where = " AND icl_t.language_code = '" . $post_language ."'"; |
|
| 3022 | 3022 | |
| 3023 | - $wpml_term_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON icl_t.element_id = tt.term_taxonomy_id AND icl_t.element_type = CONCAT('tax_', tt.taxonomy)";
|
|
| 3024 | - $wpml_term_where = " AND icl_t.language_code = '" . $post_language ."'"; |
|
| 3025 | - } |
|
| 3023 | + $wpml_term_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON icl_t.element_id = tt.term_taxonomy_id AND icl_t.element_type = CONCAT('tax_', tt.taxonomy)";
|
|
| 3024 | + $wpml_term_where = " AND icl_t.language_code = '" . $post_language ."'"; |
|
| 3025 | + } |
|
| 3026 | 3026 | |
| 3027 | - $term_slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $slug ) );
|
|
| 3027 | + $term_slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $slug ) );
|
|
| 3028 | 3028 | |
| 3029 | - if ( $term_slug_check ) {
|
|
| 3030 | - $suffix = 1; |
|
| 3029 | + if ( $term_slug_check ) {
|
|
| 3030 | + $suffix = 1; |
|
| 3031 | 3031 | |
| 3032 | - do {
|
|
| 3033 | - $alt_slug = _truncate_post_slug( $original_slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; |
|
| 3032 | + do {
|
|
| 3033 | + $alt_slug = _truncate_post_slug( $original_slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; |
|
| 3034 | 3034 | |
| 3035 | - $term_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $alt_slug ) );
|
|
| 3035 | + $term_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $alt_slug ) );
|
|
| 3036 | 3036 | |
| 3037 | - $post_check = !$term_check && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s AND p.ID != %d {$wpml_term_where} LIMIT 1", $alt_slug, $post_type, $post_ID ) );
|
|
| 3037 | + $post_check = !$term_check && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s AND p.ID != %d {$wpml_term_where} LIMIT 1", $alt_slug, $post_type, $post_ID ) );
|
|
| 3038 | 3038 | |
| 3039 | - $term_slug_check = $term_check || $post_check; |
|
| 3039 | + $term_slug_check = $term_check || $post_check; |
|
| 3040 | 3040 | |
| 3041 | - $suffix++; |
|
| 3042 | - } while ( $term_slug_check ); |
|
| 3041 | + $suffix++; |
|
| 3042 | + } while ( $term_slug_check ); |
|
| 3043 | 3043 | |
| 3044 | - $slug = $alt_slug; |
|
| 3045 | - } |
|
| 3046 | - } |
|
| 3044 | + $slug = $alt_slug; |
|
| 3045 | + } |
|
| 3046 | + } |
|
| 3047 | 3047 | |
| 3048 | - return $slug; |
|
| 3048 | + return $slug; |
|
| 3049 | 3049 | } |
| 3050 | 3050 | add_filter( 'wp_unique_post_slug', 'geodir_check_post_to_term_slug', 101, 6 ); |
| 3051 | 3051 | |
@@ -3065,47 +3065,47 @@ discard block |
||
| 3065 | 3065 | * @return bool true when exists. false when not exists. |
| 3066 | 3066 | */ |
| 3067 | 3067 | function geodir_check_term_to_post_slug( $slug_exists, $slug, $term_id ) {
|
| 3068 | - global $wpdb, $gd_term_post_type, $gd_term_taxonomy, $sitepress; |
|
| 3068 | + global $wpdb, $gd_term_post_type, $gd_term_taxonomy, $sitepress; |
|
| 3069 | 3069 | |
| 3070 | - if ( $slug_exists ) {
|
|
| 3071 | - return $slug_exists; |
|
| 3072 | - } |
|
| 3070 | + if ( $slug_exists ) {
|
|
| 3071 | + return $slug_exists; |
|
| 3072 | + } |
|
| 3073 | 3073 | |
| 3074 | - if ( !empty( $gd_term_taxonomy ) && isset($gd_term_taxonomy[$term_id]) ) {
|
|
| 3075 | - $taxonomy = $gd_term_taxonomy[$term_id]; |
|
| 3076 | - } else {
|
|
| 3077 | - $taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id ) ); |
|
| 3078 | - $gd_term_taxonomy[$term_id] = $taxonomy; |
|
| 3079 | - } |
|
| 3074 | + if ( !empty( $gd_term_taxonomy ) && isset($gd_term_taxonomy[$term_id]) ) {
|
|
| 3075 | + $taxonomy = $gd_term_taxonomy[$term_id]; |
|
| 3076 | + } else {
|
|
| 3077 | + $taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id ) ); |
|
| 3078 | + $gd_term_taxonomy[$term_id] = $taxonomy; |
|
| 3079 | + } |
|
| 3080 | 3080 | |
| 3081 | - if ( empty($taxonomy) ) {
|
|
| 3082 | - return $slug_exists; |
|
| 3083 | - } |
|
| 3081 | + if ( empty($taxonomy) ) {
|
|
| 3082 | + return $slug_exists; |
|
| 3083 | + } |
|
| 3084 | 3084 | |
| 3085 | - if ( !empty( $gd_term_post_type ) && $gd_term_post_type[$term_id] ) {
|
|
| 3086 | - $post_type = $gd_term_post_type[$term_id]; |
|
| 3087 | - } else {
|
|
| 3088 | - $taxonomy_obj = get_taxonomy( $taxonomy ); |
|
| 3089 | - $post_type = !empty( $taxonomy_obj->object_type ) ? $taxonomy_obj->object_type[0] : NULL; |
|
| 3090 | - } |
|
| 3085 | + if ( !empty( $gd_term_post_type ) && $gd_term_post_type[$term_id] ) {
|
|
| 3086 | + $post_type = $gd_term_post_type[$term_id]; |
|
| 3087 | + } else {
|
|
| 3088 | + $taxonomy_obj = get_taxonomy( $taxonomy ); |
|
| 3089 | + $post_type = !empty( $taxonomy_obj->object_type ) ? $taxonomy_obj->object_type[0] : NULL; |
|
| 3090 | + } |
|
| 3091 | 3091 | |
| 3092 | - $wpml_post_join = ""; |
|
| 3093 | - $wpml_post_where = ""; |
|
| 3092 | + $wpml_post_join = ""; |
|
| 3093 | + $wpml_post_where = ""; |
|
| 3094 | 3094 | |
| 3095 | - if (geodir_wpml_is_taxonomy_translated($taxonomy) || geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 3096 | - $term_language = $term_id ? geodir_get_language_for_element($term_id, 'tax_' . $taxonomy) : $sitepress->get_current_language(); |
|
| 3097 | - if (!$term_language) {
|
|
| 3098 | - $term_language = $sitepress->get_current_language(); |
|
| 3099 | - } |
|
| 3095 | + if (geodir_wpml_is_taxonomy_translated($taxonomy) || geodir_wpml_is_post_type_translated($post_type)) {
|
|
| 3096 | + $term_language = $term_id ? geodir_get_language_for_element($term_id, 'tax_' . $taxonomy) : $sitepress->get_current_language(); |
|
| 3097 | + if (!$term_language) {
|
|
| 3098 | + $term_language = $sitepress->get_current_language(); |
|
| 3099 | + } |
|
| 3100 | 3100 | |
| 3101 | - $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";
|
|
| 3102 | - $wpml_post_where = " AND icl_t.language_code = '" . $term_language ."'"; |
|
| 3103 | - } |
|
| 3101 | + $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";
|
|
| 3102 | + $wpml_post_where = " AND icl_t.language_code = '" . $term_language ."'"; |
|
| 3103 | + } |
|
| 3104 | 3104 | |
| 3105 | - if ( $post_type && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s {$wpml_post_where} LIMIT 1", $slug, $post_type ) ) ) {
|
|
| 3106 | - $slug_exists = true; |
|
| 3107 | - } |
|
| 3105 | + if ( $post_type && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s {$wpml_post_where} LIMIT 1", $slug, $post_type ) ) ) {
|
|
| 3106 | + $slug_exists = true; |
|
| 3107 | + } |
|
| 3108 | 3108 | |
| 3109 | - return $slug_exists; |
|
| 3109 | + return $slug_exists; |
|
| 3110 | 3110 | } |
| 3111 | 3111 | add_filter( 'geodir_term_slug_is_exists', 'geodir_check_term_to_post_slug', 10, 3 ); |
| 3112 | 3112 | \ No newline at end of file |
