GeoDirectory /
geodirectory
@@ -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,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,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 |
@@ -8,8 +8,8 @@ discard block |
||
| 8 | 8 | |
| 9 | 9 | // Enable map cache if set |
| 10 | 10 | if(get_option('geodir_enable_map_cache')){
|
| 11 | - add_filter('geodir_get_markers_cache','geodir_get_map_cache');
|
|
| 12 | - add_filter('geodir_markers_json','geodir_save_map_cache',10);
|
|
| 11 | + add_filter('geodir_get_markers_cache','geodir_get_map_cache');
|
|
| 12 | + add_filter('geodir_markers_json','geodir_save_map_cache',10);
|
|
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | |
@@ -23,56 +23,56 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | function geodir_get_map_cache($cache){
|
| 25 | 25 | |
| 26 | - // if a search is going on then dont even try to check for cache. |
|
| 27 | - if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){
|
|
| 28 | - return $cache; |
|
| 29 | - } |
|
| 30 | - |
|
| 31 | - $url_params = array(); |
|
| 32 | - $url_params[] = isset($_REQUEST['cat_id']) ? $_REQUEST['cat_id'] : ''; |
|
| 33 | - $url_params[] = isset($_REQUEST['zl']) ? $_REQUEST['zl'] : ''; |
|
| 34 | - $url_params[] = isset($_REQUEST['gd_map_h']) ? $_REQUEST['gd_map_h'] : ''; |
|
| 35 | - $url_params[] = isset($_REQUEST['gd_map_w']) ? $_REQUEST['gd_map_w'] : ''; |
|
| 36 | - $url_params[] = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : ''; |
|
| 37 | - $url_params[] = isset($_REQUEST['lat_ne']) ? $_REQUEST['lat_ne'] : ''; |
|
| 38 | - $url_params[] = isset($_REQUEST['lon_ne']) ? $_REQUEST['lon_ne'] : ''; |
|
| 39 | - $url_params[] = isset($_REQUEST['lat_sw']) ? $_REQUEST['lat_sw'] : ''; |
|
| 40 | - $url_params[] = isset($_REQUEST['lon_sw']) ? $_REQUEST['lon_sw'] : ''; |
|
| 41 | - $url_params[] = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : ''; |
|
| 42 | - $url_params[] = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : ''; |
|
| 43 | - $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : ''; |
|
| 44 | - $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : ''; |
|
| 45 | - |
|
| 46 | - $file_name = sanitize_file_name( md5( implode("-",$url_params) ) );
|
|
| 47 | - |
|
| 48 | - $blog_id = get_current_blog_id(); |
|
| 49 | - if($blog_id>1){
|
|
| 50 | - $file_name = $blog_id."_".$file_name; |
|
| 51 | - } |
|
| 52 | - |
|
| 53 | - $file_path = realpath(dirname(__FILE__))."/map-cache/"; |
|
| 54 | - $file = $file_path . $file_name . ".json"; |
|
| 55 | - |
|
| 56 | - if(file_exists($file)){
|
|
| 57 | - // do the cache delete stuff |
|
| 58 | - $cache_time = get_option('geodir_map_cache');
|
|
| 59 | - if(!$cache_time){
|
|
| 60 | - $cache_time = time(); |
|
| 61 | - update_option('geodir_map_cache', $cache_time);
|
|
| 62 | - } |
|
| 63 | - |
|
| 64 | - if((time() - $cache_time) > 86400){ // delete the cache every 24 hours
|
|
| 65 | - geodir_delete_map_cache(); |
|
| 66 | - } |
|
| 67 | - |
|
| 68 | - if(file_exists($file) && is_readable($file)){
|
|
| 69 | - ob_start(); |
|
| 70 | - readfile($file); // readfile is quicker then file get contents |
|
| 71 | - return ob_get_clean(); |
|
| 72 | - } |
|
| 73 | - } |
|
| 74 | - |
|
| 75 | - return $cache; |
|
| 26 | + // if a search is going on then dont even try to check for cache. |
|
| 27 | + if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){
|
|
| 28 | + return $cache; |
|
| 29 | + } |
|
| 30 | + |
|
| 31 | + $url_params = array(); |
|
| 32 | + $url_params[] = isset($_REQUEST['cat_id']) ? $_REQUEST['cat_id'] : ''; |
|
| 33 | + $url_params[] = isset($_REQUEST['zl']) ? $_REQUEST['zl'] : ''; |
|
| 34 | + $url_params[] = isset($_REQUEST['gd_map_h']) ? $_REQUEST['gd_map_h'] : ''; |
|
| 35 | + $url_params[] = isset($_REQUEST['gd_map_w']) ? $_REQUEST['gd_map_w'] : ''; |
|
| 36 | + $url_params[] = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : ''; |
|
| 37 | + $url_params[] = isset($_REQUEST['lat_ne']) ? $_REQUEST['lat_ne'] : ''; |
|
| 38 | + $url_params[] = isset($_REQUEST['lon_ne']) ? $_REQUEST['lon_ne'] : ''; |
|
| 39 | + $url_params[] = isset($_REQUEST['lat_sw']) ? $_REQUEST['lat_sw'] : ''; |
|
| 40 | + $url_params[] = isset($_REQUEST['lon_sw']) ? $_REQUEST['lon_sw'] : ''; |
|
| 41 | + $url_params[] = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : ''; |
|
| 42 | + $url_params[] = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : ''; |
|
| 43 | + $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : ''; |
|
| 44 | + $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : ''; |
|
| 45 | + |
|
| 46 | + $file_name = sanitize_file_name( md5( implode("-",$url_params) ) );
|
|
| 47 | + |
|
| 48 | + $blog_id = get_current_blog_id(); |
|
| 49 | + if($blog_id>1){
|
|
| 50 | + $file_name = $blog_id."_".$file_name; |
|
| 51 | + } |
|
| 52 | + |
|
| 53 | + $file_path = realpath(dirname(__FILE__))."/map-cache/"; |
|
| 54 | + $file = $file_path . $file_name . ".json"; |
|
| 55 | + |
|
| 56 | + if(file_exists($file)){
|
|
| 57 | + // do the cache delete stuff |
|
| 58 | + $cache_time = get_option('geodir_map_cache');
|
|
| 59 | + if(!$cache_time){
|
|
| 60 | + $cache_time = time(); |
|
| 61 | + update_option('geodir_map_cache', $cache_time);
|
|
| 62 | + } |
|
| 63 | + |
|
| 64 | + if((time() - $cache_time) > 86400){ // delete the cache every 24 hours
|
|
| 65 | + geodir_delete_map_cache(); |
|
| 66 | + } |
|
| 67 | + |
|
| 68 | + if(file_exists($file) && is_readable($file)){
|
|
| 69 | + ob_start(); |
|
| 70 | + readfile($file); // readfile is quicker then file get contents |
|
| 71 | + return ob_get_clean(); |
|
| 72 | + } |
|
| 73 | + } |
|
| 74 | + |
|
| 75 | + return $cache; |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | |
@@ -85,109 +85,109 @@ discard block |
||
| 85 | 85 | */ |
| 86 | 86 | function geodir_save_map_cache($map_json){
|
| 87 | 87 | |
| 88 | - // if a search is going on then dont even try to check for cache. |
|
| 89 | - if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){
|
|
| 90 | - return $map_json; |
|
| 91 | - } |
|
| 92 | - |
|
| 93 | - $url_params = array(); |
|
| 94 | - $url_params[] = isset($_REQUEST['cat_id']) ? $_REQUEST['cat_id'] : ''; |
|
| 95 | - $url_params[] = isset($_REQUEST['zl']) ? $_REQUEST['zl'] : ''; |
|
| 96 | - $url_params[] = isset($_REQUEST['gd_map_h']) ? $_REQUEST['gd_map_h'] : ''; |
|
| 97 | - $url_params[] = isset($_REQUEST['gd_map_w']) ? $_REQUEST['gd_map_w'] : ''; |
|
| 98 | - $url_params[] = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : ''; |
|
| 99 | - $url_params[] = isset($_REQUEST['lat_ne']) ? $_REQUEST['lat_ne'] : ''; |
|
| 100 | - $url_params[] = isset($_REQUEST['lon_ne']) ? $_REQUEST['lon_ne'] : ''; |
|
| 101 | - $url_params[] = isset($_REQUEST['lat_sw']) ? $_REQUEST['lat_sw'] : ''; |
|
| 102 | - $url_params[] = isset($_REQUEST['lon_sw']) ? $_REQUEST['lon_sw'] : ''; |
|
| 103 | - $url_params[] = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : ''; |
|
| 104 | - $url_params[] = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : ''; |
|
| 105 | - $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : ''; |
|
| 106 | - $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : ''; |
|
| 107 | - |
|
| 108 | - $file_name = sanitize_file_name( md5( implode("-",$url_params) ) );
|
|
| 109 | - |
|
| 110 | - $blog_id = get_current_blog_id(); |
|
| 111 | - if($blog_id>1){
|
|
| 112 | - $file_name = $blog_id."_".$file_name; |
|
| 113 | - } |
|
| 114 | - |
|
| 115 | - $file_path = realpath(dirname(__FILE__))."/map-cache/"; |
|
| 116 | - |
|
| 117 | - |
|
| 118 | - global $wp_filesystem; |
|
| 119 | - if (empty($wp_filesystem)) {
|
|
| 120 | - require_once (ABSPATH . '/wp-admin/includes/file.php'); |
|
| 121 | - WP_Filesystem(); |
|
| 122 | - } |
|
| 123 | - $wp_filesystem->put_contents( |
|
| 124 | - $file_path.$file_name.".json", |
|
| 125 | - $map_json, |
|
| 126 | - FS_CHMOD_FILE // predefined mode settings for WP files |
|
| 127 | - ); |
|
| 128 | - |
|
| 129 | - |
|
| 130 | - return $map_json; |
|
| 88 | + // if a search is going on then dont even try to check for cache. |
|
| 89 | + if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){
|
|
| 90 | + return $map_json; |
|
| 91 | + } |
|
| 92 | + |
|
| 93 | + $url_params = array(); |
|
| 94 | + $url_params[] = isset($_REQUEST['cat_id']) ? $_REQUEST['cat_id'] : ''; |
|
| 95 | + $url_params[] = isset($_REQUEST['zl']) ? $_REQUEST['zl'] : ''; |
|
| 96 | + $url_params[] = isset($_REQUEST['gd_map_h']) ? $_REQUEST['gd_map_h'] : ''; |
|
| 97 | + $url_params[] = isset($_REQUEST['gd_map_w']) ? $_REQUEST['gd_map_w'] : ''; |
|
| 98 | + $url_params[] = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : ''; |
|
| 99 | + $url_params[] = isset($_REQUEST['lat_ne']) ? $_REQUEST['lat_ne'] : ''; |
|
| 100 | + $url_params[] = isset($_REQUEST['lon_ne']) ? $_REQUEST['lon_ne'] : ''; |
|
| 101 | + $url_params[] = isset($_REQUEST['lat_sw']) ? $_REQUEST['lat_sw'] : ''; |
|
| 102 | + $url_params[] = isset($_REQUEST['lon_sw']) ? $_REQUEST['lon_sw'] : ''; |
|
| 103 | + $url_params[] = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : ''; |
|
| 104 | + $url_params[] = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : ''; |
|
| 105 | + $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : ''; |
|
| 106 | + $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : ''; |
|
| 107 | + |
|
| 108 | + $file_name = sanitize_file_name( md5( implode("-",$url_params) ) );
|
|
| 109 | + |
|
| 110 | + $blog_id = get_current_blog_id(); |
|
| 111 | + if($blog_id>1){
|
|
| 112 | + $file_name = $blog_id."_".$file_name; |
|
| 113 | + } |
|
| 114 | + |
|
| 115 | + $file_path = realpath(dirname(__FILE__))."/map-cache/"; |
|
| 116 | + |
|
| 117 | + |
|
| 118 | + global $wp_filesystem; |
|
| 119 | + if (empty($wp_filesystem)) {
|
|
| 120 | + require_once (ABSPATH . '/wp-admin/includes/file.php'); |
|
| 121 | + WP_Filesystem(); |
|
| 122 | + } |
|
| 123 | + $wp_filesystem->put_contents( |
|
| 124 | + $file_path.$file_name.".json", |
|
| 125 | + $map_json, |
|
| 126 | + FS_CHMOD_FILE // predefined mode settings for WP files |
|
| 127 | + ); |
|
| 128 | + |
|
| 129 | + |
|
| 130 | + return $map_json; |
|
| 131 | 131 | |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | |
| 135 | 135 | if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'homemap_catlist') {
|
| 136 | - global $gd_session; |
|
| 137 | - $gd_post_type = sanitize_text_field($_REQUEST['post_type']); |
|
| 138 | - $gd_session->set('homemap_catlist_ptype', $gd_post_type);
|
|
| 139 | - $post_taxonomy = geodir_get_taxonomies($gd_post_type); |
|
| 140 | - $map_canvas_name = sanitize_text_field($_REQUEST['map_canvas']); |
|
| 141 | - $child_collapse = (bool)$_REQUEST['child_collapse']; |
|
| 142 | - echo home_map_taxonomy_walker($post_taxonomy, 0, true, 0, $map_canvas_name, $child_collapse, true); |
|
| 143 | - die; |
|
| 136 | + global $gd_session; |
|
| 137 | + $gd_post_type = sanitize_text_field($_REQUEST['post_type']); |
|
| 138 | + $gd_session->set('homemap_catlist_ptype', $gd_post_type);
|
|
| 139 | + $post_taxonomy = geodir_get_taxonomies($gd_post_type); |
|
| 140 | + $map_canvas_name = sanitize_text_field($_REQUEST['map_canvas']); |
|
| 141 | + $child_collapse = (bool)$_REQUEST['child_collapse']; |
|
| 142 | + echo home_map_taxonomy_walker($post_taxonomy, 0, true, 0, $map_canvas_name, $child_collapse, true); |
|
| 143 | + die; |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | // Send the content-type header with correct encoding |
| 147 | 147 | header("Content-type: text/javascript; charset=utf-8");
|
| 148 | 148 | |
| 149 | 149 | if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'cat') { // Retrives markers data for categories
|
| 150 | - echo get_markers(); |
|
| 151 | - exit; |
|
| 150 | + echo get_markers(); |
|
| 151 | + exit; |
|
| 152 | 152 | } else if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'info') { // Retrives marker info window html
|
| 153 | - /** |
|
| 154 | - * @global object $wpdb WordPress Database object. |
|
| 155 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 156 | - * @global object $gd_session GeoDirectory Session object. |
|
| 157 | - */ |
|
| 158 | - global $wpdb, $plugin_prefix, $gd_session; |
|
| 159 | - |
|
| 160 | - if ($_REQUEST['m_id'] != '') {
|
|
| 161 | - $pid = (int)$_REQUEST['m_id']; |
|
| 162 | - } else {
|
|
| 163 | - echo __('No marker data found', 'geodirectory');
|
|
| 164 | - exit; |
|
| 165 | - } |
|
| 166 | - |
|
| 167 | - if (isset($_REQUEST['post_preview']) && $_REQUEST['post_preview'] != '' && $gd_ses_listing = $gd_session->get('listing')) {
|
|
| 168 | - $post = (object)$gd_ses_listing; |
|
| 169 | - echo geodir_get_infowindow_html($post, $_REQUEST['post_preview']); |
|
| 170 | - } else {
|
|
| 171 | - $geodir_post_type = get_post_type($pid); |
|
| 172 | - |
|
| 173 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 174 | - |
|
| 175 | - $sql = $wpdb->prepare("SELECT * FROM " . $table . " WHERE post_id = %d", array($pid));
|
|
| 176 | - |
|
| 177 | - $postinfo = $wpdb->get_results($sql); |
|
| 178 | - |
|
| 179 | - $data_arr = array(); |
|
| 180 | - |
|
| 181 | - if ($postinfo) {
|
|
| 182 | - $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 183 | - $replarr = array("′", "⁄", "–", "“", '');
|
|
| 184 | - |
|
| 185 | - foreach ($postinfo as $postinfo_obj) {
|
|
| 186 | - echo geodir_get_infowindow_html($postinfo_obj); |
|
| 187 | - } |
|
| 188 | - } |
|
| 189 | - } |
|
| 190 | - exit; |
|
| 153 | + /** |
|
| 154 | + * @global object $wpdb WordPress Database object. |
|
| 155 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 156 | + * @global object $gd_session GeoDirectory Session object. |
|
| 157 | + */ |
|
| 158 | + global $wpdb, $plugin_prefix, $gd_session; |
|
| 159 | + |
|
| 160 | + if ($_REQUEST['m_id'] != '') {
|
|
| 161 | + $pid = (int)$_REQUEST['m_id']; |
|
| 162 | + } else {
|
|
| 163 | + echo __('No marker data found', 'geodirectory');
|
|
| 164 | + exit; |
|
| 165 | + } |
|
| 166 | + |
|
| 167 | + if (isset($_REQUEST['post_preview']) && $_REQUEST['post_preview'] != '' && $gd_ses_listing = $gd_session->get('listing')) {
|
|
| 168 | + $post = (object)$gd_ses_listing; |
|
| 169 | + echo geodir_get_infowindow_html($post, $_REQUEST['post_preview']); |
|
| 170 | + } else {
|
|
| 171 | + $geodir_post_type = get_post_type($pid); |
|
| 172 | + |
|
| 173 | + $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 174 | + |
|
| 175 | + $sql = $wpdb->prepare("SELECT * FROM " . $table . " WHERE post_id = %d", array($pid));
|
|
| 176 | + |
|
| 177 | + $postinfo = $wpdb->get_results($sql); |
|
| 178 | + |
|
| 179 | + $data_arr = array(); |
|
| 180 | + |
|
| 181 | + if ($postinfo) {
|
|
| 182 | + $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 183 | + $replarr = array("′", "⁄", "–", "“", '');
|
|
| 184 | + |
|
| 185 | + foreach ($postinfo as $postinfo_obj) {
|
|
| 186 | + echo geodir_get_infowindow_html($postinfo_obj); |
|
| 187 | + } |
|
| 188 | + } |
|
| 189 | + } |
|
| 190 | + exit; |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | /** |
@@ -206,93 +206,93 @@ discard block |
||
| 206 | 206 | */ |
| 207 | 207 | function get_markers() {
|
| 208 | 208 | |
| 209 | - global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes,$gd_session; |
|
| 209 | + global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes,$gd_session; |
|
| 210 | 210 | |
| 211 | 211 | |
| 212 | - /** |
|
| 213 | - * Filter to allow for any map caching to be output before queries. |
|
| 214 | - * |
|
| 215 | - * @since 1.6.22 |
|
| 216 | - */ |
|
| 217 | - $map_cache = apply_filters('geodir_get_markers_cache','');
|
|
| 218 | - if($map_cache){
|
|
| 219 | - return $map_cache; |
|
| 220 | - wp_die(); |
|
| 221 | - } |
|
| 212 | + /** |
|
| 213 | + * Filter to allow for any map caching to be output before queries. |
|
| 214 | + * |
|
| 215 | + * @since 1.6.22 |
|
| 216 | + */ |
|
| 217 | + $map_cache = apply_filters('geodir_get_markers_cache','');
|
|
| 218 | + if($map_cache){
|
|
| 219 | + return $map_cache; |
|
| 220 | + wp_die(); |
|
| 221 | + } |
|
| 222 | 222 | |
| 223 | 223 | |
| 224 | 224 | |
| 225 | - $search = ''; |
|
| 225 | + $search = ''; |
|
| 226 | 226 | |
| 227 | - $srcharr = array("'", "/", "-", '"', '\\', ''');
|
|
| 228 | - $replarr = array("′", "⁄", "–", "“", '', "′");
|
|
| 227 | + $srcharr = array("'", "/", "-", '"', '\\', ''');
|
|
| 228 | + $replarr = array("′", "⁄", "–", "“", '', "′");
|
|
| 229 | 229 | |
| 230 | - $post_type = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : 'gd_place'; |
|
| 230 | + $post_type = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : 'gd_place'; |
|
| 231 | 231 | |
| 232 | - $map_cat_ids_array = array('0');
|
|
| 233 | - $cat_find_array = array(" FIND_IN_SET(%d, pd." . $post_type . "category)");
|
|
| 232 | + $map_cat_ids_array = array('0');
|
|
| 233 | + $cat_find_array = array(" FIND_IN_SET(%d, pd." . $post_type . "category)");
|
|
| 234 | 234 | |
| 235 | 235 | |
| 236 | - $field_default_cat = ''; |
|
| 237 | - if (isset($_REQUEST['cat_id']) && $_REQUEST['cat_id'] != '') {
|
|
| 238 | - $map_cat_arr = trim($_REQUEST['cat_id'], ','); |
|
| 236 | + $field_default_cat = ''; |
|
| 237 | + if (isset($_REQUEST['cat_id']) && $_REQUEST['cat_id'] != '') {
|
|
| 238 | + $map_cat_arr = trim($_REQUEST['cat_id'], ','); |
|
| 239 | 239 | |
| 240 | - if (!empty($map_cat_arr)) {
|
|
| 241 | - $field_default_cat .= "WHEN (default_category IN (" . $map_cat_arr . ")) THEN default_category ";
|
|
| 240 | + if (!empty($map_cat_arr)) {
|
|
| 241 | + $field_default_cat .= "WHEN (default_category IN (" . $map_cat_arr . ")) THEN default_category ";
|
|
| 242 | 242 | |
| 243 | - $map_cat_ids_array = explode(',', $map_cat_arr);
|
|
| 244 | - $cat_find_array = array(); |
|
| 245 | - foreach ($map_cat_ids_array as $cat_id) {
|
|
| 246 | - $field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `" . $post_type . "category`) > 0) THEN $cat_id "; |
|
| 247 | - $cat_find_array[] = " FIND_IN_SET(%d, pd." . $post_type . "category)"; |
|
| 248 | - $main_query_array[] = $cat_id; |
|
| 249 | - } |
|
| 243 | + $map_cat_ids_array = explode(',', $map_cat_arr);
|
|
| 244 | + $cat_find_array = array(); |
|
| 245 | + foreach ($map_cat_ids_array as $cat_id) {
|
|
| 246 | + $field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `" . $post_type . "category`) > 0) THEN $cat_id "; |
|
| 247 | + $cat_find_array[] = " FIND_IN_SET(%d, pd." . $post_type . "category)"; |
|
| 248 | + $main_query_array[] = $cat_id; |
|
| 249 | + } |
|
| 250 | 250 | |
| 251 | - } |
|
| 252 | - } |
|
| 251 | + } |
|
| 252 | + } |
|
| 253 | 253 | |
| 254 | - if (!empty($field_default_cat)) |
|
| 255 | - $field_default_cat = ''; |
|
| 254 | + if (!empty($field_default_cat)) |
|
| 255 | + $field_default_cat = ''; |
|
| 256 | 256 | |
| 257 | - if (!empty($cat_find_array)) |
|
| 258 | - $search .= "AND (" . implode(' OR ', $cat_find_array) . ")";
|
|
| 257 | + if (!empty($cat_find_array)) |
|
| 258 | + $search .= "AND (" . implode(' OR ', $cat_find_array) . ")";
|
|
| 259 | 259 | |
| 260 | - $main_query_array = $map_cat_ids_array; |
|
| 260 | + $main_query_array = $map_cat_ids_array; |
|
| 261 | 261 | |
| 262 | - if (isset($_REQUEST['search']) && !empty($_REQUEST['search']) && $_REQUEST['search'] != __('Title', 'geodirectory')) {
|
|
| 263 | - $search .= " AND p.post_title LIKE %s"; |
|
| 264 | - $main_query_array[] = "%" . $_REQUEST['search'] . "%"; |
|
| 265 | - } |
|
| 266 | - |
|
| 267 | - /** |
|
| 268 | - * Filter the marker query search SQL, values are replaces with %s or %d. |
|
| 269 | - * |
|
| 270 | - * @since 1.5.3 |
|
| 271 | - * |
|
| 272 | - * @param string $search The SQL query for search/where. |
|
| 273 | - */ |
|
| 274 | - $search = apply_filters('geodir_marker_search', $search);
|
|
| 275 | - /** |
|
| 276 | - * Filter the marker query search SQL values %s and %d, this is an array of values. |
|
| 277 | - * |
|
| 278 | - * @since 1.5.3 |
|
| 279 | - * |
|
| 280 | - * @param array $main_query_array The SQL query values for search/where. |
|
| 281 | - */ |
|
| 282 | - $main_query_array = apply_filters('geodir_marker_main_query_array', $main_query_array);
|
|
| 283 | - |
|
| 284 | - $gd_posttype = ''; |
|
| 285 | - if (isset($_REQUEST['gd_posttype']) && $_REQUEST['gd_posttype'] != '') {
|
|
| 286 | - $table = $plugin_prefix . $_REQUEST['gd_posttype'] . '_detail'; |
|
| 287 | - $gd_posttype = " AND p.post_type = %s"; |
|
| 288 | - $main_query_array[] = $_REQUEST['gd_posttype']; |
|
| 289 | - |
|
| 290 | - } else |
|
| 291 | - $table = $plugin_prefix . 'gd_place_detail'; |
|
| 292 | - |
|
| 293 | - $join = ", " . $table . " AS pd "; |
|
| 294 | - |
|
| 295 | - /** |
|
| 262 | + if (isset($_REQUEST['search']) && !empty($_REQUEST['search']) && $_REQUEST['search'] != __('Title', 'geodirectory')) {
|
|
| 263 | + $search .= " AND p.post_title LIKE %s"; |
|
| 264 | + $main_query_array[] = "%" . $_REQUEST['search'] . "%"; |
|
| 265 | + } |
|
| 266 | + |
|
| 267 | + /** |
|
| 268 | + * Filter the marker query search SQL, values are replaces with %s or %d. |
|
| 269 | + * |
|
| 270 | + * @since 1.5.3 |
|
| 271 | + * |
|
| 272 | + * @param string $search The SQL query for search/where. |
|
| 273 | + */ |
|
| 274 | + $search = apply_filters('geodir_marker_search', $search);
|
|
| 275 | + /** |
|
| 276 | + * Filter the marker query search SQL values %s and %d, this is an array of values. |
|
| 277 | + * |
|
| 278 | + * @since 1.5.3 |
|
| 279 | + * |
|
| 280 | + * @param array $main_query_array The SQL query values for search/where. |
|
| 281 | + */ |
|
| 282 | + $main_query_array = apply_filters('geodir_marker_main_query_array', $main_query_array);
|
|
| 283 | + |
|
| 284 | + $gd_posttype = ''; |
|
| 285 | + if (isset($_REQUEST['gd_posttype']) && $_REQUEST['gd_posttype'] != '') {
|
|
| 286 | + $table = $plugin_prefix . $_REQUEST['gd_posttype'] . '_detail'; |
|
| 287 | + $gd_posttype = " AND p.post_type = %s"; |
|
| 288 | + $main_query_array[] = $_REQUEST['gd_posttype']; |
|
| 289 | + |
|
| 290 | + } else |
|
| 291 | + $table = $plugin_prefix . 'gd_place_detail'; |
|
| 292 | + |
|
| 293 | + $join = ", " . $table . " AS pd "; |
|
| 294 | + |
|
| 295 | + /** |
|
| 296 | 296 | * Filter the SQL JOIN clause for the markers data |
| 297 | 297 | * |
| 298 | 298 | * @since 1.0.0 |
@@ -309,16 +309,16 @@ discard block |
||
| 309 | 309 | * @param string $search Row of searched fields to use in WHERE clause. |
| 310 | 310 | */ |
| 311 | 311 | $search = apply_filters('geodir_home_map_listing_where', $search);
|
| 312 | - $search = str_replace(array("'%", "%'"), array("'%%", "%%'"), $search);
|
|
| 313 | - $cat_type = $post_type . 'category'; |
|
| 314 | - if ($post_type == 'gd_event') {
|
|
| 315 | - $event_select = ", pd.recurring_dates, pd.is_recurring"; |
|
| 316 | - } else {
|
|
| 317 | - $event_select = ""; |
|
| 318 | - } |
|
| 319 | - |
|
| 320 | - $sql_select = 'SELECT pd.default_category, pd.' . $cat_type . ', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude' . $event_select; |
|
| 321 | - /** |
|
| 312 | + $search = str_replace(array("'%", "%'"), array("'%%", "%%'"), $search);
|
|
| 313 | + $cat_type = $post_type . 'category'; |
|
| 314 | + if ($post_type == 'gd_event') {
|
|
| 315 | + $event_select = ", pd.recurring_dates, pd.is_recurring"; |
|
| 316 | + } else {
|
|
| 317 | + $event_select = ""; |
|
| 318 | + } |
|
| 319 | + |
|
| 320 | + $sql_select = 'SELECT pd.default_category, pd.' . $cat_type . ', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude' . $event_select; |
|
| 321 | + /** |
|
| 322 | 322 | * Filter the SQL SELECT clause to retrive fields data |
| 323 | 323 | * |
| 324 | 324 | * @since 1.0.0 |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | */ |
| 338 | 338 | $groupby = apply_filters('geodir_home_map_listing_groupby', $groupby);
|
| 339 | 339 | |
| 340 | - $catsql = $wpdb->prepare("$select $field_default_cat FROM " . $wpdb->posts . " as p" . $join . " WHERE p.ID = pd.post_id AND p.post_status = 'publish' " . $search . $gd_posttype . $groupby , $main_query_array);
|
|
| 340 | + $catsql = $wpdb->prepare("$select $field_default_cat FROM " . $wpdb->posts . " as p" . $join . " WHERE p.ID = pd.post_id AND p.post_status = 'publish' " . $search . $gd_posttype . $groupby , $main_query_array);
|
|
| 341 | 341 | |
| 342 | 342 | /** |
| 343 | 343 | * Filter the SQL query to retrive markers data |
@@ -353,276 +353,276 @@ discard block |
||
| 353 | 353 | // print_r($gd_session); |
| 354 | 354 | // print_r($_SESSION); |
| 355 | 355 | |
| 356 | - $catinfo = $wpdb->get_results($catsql); |
|
| 356 | + $catinfo = $wpdb->get_results($catsql); |
|
| 357 | 357 | |
| 358 | - $cat_content_info = array(); |
|
| 359 | - $content_data = array(); |
|
| 360 | - $post_ids = array(); |
|
| 361 | - |
|
| 362 | - /** |
|
| 363 | - * Called before marker data is processed into JSON. |
|
| 364 | - * |
|
| 365 | - * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers. |
|
| 366 | - * |
|
| 367 | - * @since 1.5.3 |
|
| 368 | - * @param object $catinfo The posts object containing all marker data. |
|
| 369 | - * @see 'geodir_after_marker_post_process' |
|
| 370 | - */ |
|
| 371 | - $catinfo = apply_filters('geodir_before_marker_post_process', $catinfo);
|
|
| 372 | - |
|
| 373 | - /** |
|
| 374 | - * Called before marker data is processed into JSON. |
|
| 375 | - * |
|
| 376 | - * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers. |
|
| 377 | - * |
|
| 378 | - * @since 1.4.9 |
|
| 379 | - * @param object $catinfo The posts object containing all marker data. |
|
| 380 | - * @see 'geodir_after_marker_post_process' |
|
| 381 | - */ |
|
| 382 | - do_action('geodir_before_marker_post_process_action', $catinfo);
|
|
| 383 | - |
|
| 384 | - // Sort any posts into a ajax array |
|
| 385 | - if (!empty($catinfo)) {
|
|
| 386 | - $geodir_cat_icons = geodir_get_term_icon(); |
|
| 387 | - global $geodir_date_time_format, $geodir_date_format, $geodir_time_format; |
|
| 388 | - |
|
| 389 | - $today = strtotime(date_i18n('Y-m-d'));
|
|
| 390 | - $show_dates = $post_type == 'gd_event' ? (int)get_option('geodir_event_infowindow_dates_count', 1) : 0;
|
|
| 358 | + $cat_content_info = array(); |
|
| 359 | + $content_data = array(); |
|
| 360 | + $post_ids = array(); |
|
| 361 | + |
|
| 362 | + /** |
|
| 363 | + * Called before marker data is processed into JSON. |
|
| 364 | + * |
|
| 365 | + * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers. |
|
| 366 | + * |
|
| 367 | + * @since 1.5.3 |
|
| 368 | + * @param object $catinfo The posts object containing all marker data. |
|
| 369 | + * @see 'geodir_after_marker_post_process' |
|
| 370 | + */ |
|
| 371 | + $catinfo = apply_filters('geodir_before_marker_post_process', $catinfo);
|
|
| 372 | + |
|
| 373 | + /** |
|
| 374 | + * Called before marker data is processed into JSON. |
|
| 375 | + * |
|
| 376 | + * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers. |
|
| 377 | + * |
|
| 378 | + * @since 1.4.9 |
|
| 379 | + * @param object $catinfo The posts object containing all marker data. |
|
| 380 | + * @see 'geodir_after_marker_post_process' |
|
| 381 | + */ |
|
| 382 | + do_action('geodir_before_marker_post_process_action', $catinfo);
|
|
| 383 | + |
|
| 384 | + // Sort any posts into a ajax array |
|
| 385 | + if (!empty($catinfo)) {
|
|
| 386 | + $geodir_cat_icons = geodir_get_term_icon(); |
|
| 387 | + global $geodir_date_time_format, $geodir_date_format, $geodir_time_format; |
|
| 388 | + |
|
| 389 | + $today = strtotime(date_i18n('Y-m-d'));
|
|
| 390 | + $show_dates = $post_type == 'gd_event' ? (int)get_option('geodir_event_infowindow_dates_count', 1) : 0;
|
|
| 391 | 391 | |
| 392 | - foreach ($catinfo as $catinfo_obj) {
|
|
| 393 | - $post_title = $catinfo_obj->post_title; |
|
| 392 | + foreach ($catinfo as $catinfo_obj) {
|
|
| 393 | + $post_title = $catinfo_obj->post_title; |
|
| 394 | 394 | |
| 395 | - if ($post_type == 'gd_event' && !empty($catinfo_obj->recurring_dates) && $show_dates > 0) {
|
|
| 396 | - $event_dates = ''; |
|
| 397 | - $recurring_data = isset($catinfo_obj->recurring_dates) ? maybe_unserialize($catinfo_obj->recurring_dates) : array(); |
|
| 395 | + if ($post_type == 'gd_event' && !empty($catinfo_obj->recurring_dates) && $show_dates > 0) {
|
|
| 396 | + $event_dates = ''; |
|
| 397 | + $recurring_data = isset($catinfo_obj->recurring_dates) ? maybe_unserialize($catinfo_obj->recurring_dates) : array(); |
|
| 398 | 398 | |
| 399 | - $post_info = geodir_get_post_info($catinfo_obj->post_id); |
|
| 399 | + $post_info = geodir_get_post_info($catinfo_obj->post_id); |
|
| 400 | 400 | |
| 401 | - if (!empty($catinfo_obj->is_recurring) && !empty($recurring_data) && !empty($recurring_data['is_recurring']) && geodir_event_recurring_pkg($post_info)) {
|
|
| 402 | - $starttimes = ''; |
|
| 403 | - $endtimes = ''; |
|
| 404 | - $astarttimes = array(); |
|
| 405 | - $aendtimes = array(); |
|
| 406 | - if ( !isset( $recurring_data['repeat_type'] ) ) {
|
|
| 407 | - $recurring_data['repeat_type'] = 'custom'; |
|
| 408 | - } |
|
| 409 | - $repeat_type = isset( $recurring_data['repeat_type'] ) && in_array( $recurring_data['repeat_type'], array( 'day', 'week', 'month', 'year', 'custom' ) ) ? $recurring_data['repeat_type'] : 'year'; // day, week, month, year, custom |
|
| 410 | - $different_times = isset( $recurring_data['different_times'] ) && !empty( $recurring_data['different_times'] ) ? true : false; |
|
| 401 | + if (!empty($catinfo_obj->is_recurring) && !empty($recurring_data) && !empty($recurring_data['is_recurring']) && geodir_event_recurring_pkg($post_info)) {
|
|
| 402 | + $starttimes = ''; |
|
| 403 | + $endtimes = ''; |
|
| 404 | + $astarttimes = array(); |
|
| 405 | + $aendtimes = array(); |
|
| 406 | + if ( !isset( $recurring_data['repeat_type'] ) ) {
|
|
| 407 | + $recurring_data['repeat_type'] = 'custom'; |
|
| 408 | + } |
|
| 409 | + $repeat_type = isset( $recurring_data['repeat_type'] ) && in_array( $recurring_data['repeat_type'], array( 'day', 'week', 'month', 'year', 'custom' ) ) ? $recurring_data['repeat_type'] : 'year'; // day, week, month, year, custom |
|
| 410 | + $different_times = isset( $recurring_data['different_times'] ) && !empty( $recurring_data['different_times'] ) ? true : false; |
|
| 411 | 411 | |
| 412 | - $recurring_dates = explode(',', $recurring_data['event_recurring_dates']);
|
|
| 412 | + $recurring_dates = explode(',', $recurring_data['event_recurring_dates']);
|
|
| 413 | 413 | |
| 414 | - if ( !empty( $recurring_dates ) ) {
|
|
| 415 | - if ( empty( $recurring_data['all_day'] ) ) {
|
|
| 416 | - if ( $repeat_type == 'custom' && $different_times ) {
|
|
| 417 | - $astarttimes = isset( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array(); |
|
| 418 | - $aendtimes = isset( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array(); |
|
| 419 | - } else {
|
|
| 420 | - $starttimes = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : ''; |
|
| 421 | - $endtimes = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : ''; |
|
| 422 | - } |
|
| 423 | - } |
|
| 414 | + if ( !empty( $recurring_dates ) ) {
|
|
| 415 | + if ( empty( $recurring_data['all_day'] ) ) {
|
|
| 416 | + if ( $repeat_type == 'custom' && $different_times ) {
|
|
| 417 | + $astarttimes = isset( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array(); |
|
| 418 | + $aendtimes = isset( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array(); |
|
| 419 | + } else {
|
|
| 420 | + $starttimes = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : ''; |
|
| 421 | + $endtimes = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : ''; |
|
| 422 | + } |
|
| 423 | + } |
|
| 424 | 424 | |
| 425 | - $e = 0; |
|
| 426 | - foreach( $recurring_dates as $key => $date ) {
|
|
| 427 | - if ( $repeat_type == 'custom' && $different_times ) {
|
|
| 428 | - if ( !empty( $astarttimes ) && isset( $astarttimes[$key] ) ) {
|
|
| 429 | - $starttimes = $astarttimes[$key]; |
|
| 430 | - $endtimes = $aendtimes[$key]; |
|
| 431 | - } else {
|
|
| 432 | - $starttimes = ''; |
|
| 433 | - $endtimes = ''; |
|
| 434 | - } |
|
| 435 | - } |
|
| 425 | + $e = 0; |
|
| 426 | + foreach( $recurring_dates as $key => $date ) {
|
|
| 427 | + if ( $repeat_type == 'custom' && $different_times ) {
|
|
| 428 | + if ( !empty( $astarttimes ) && isset( $astarttimes[$key] ) ) {
|
|
| 429 | + $starttimes = $astarttimes[$key]; |
|
| 430 | + $endtimes = $aendtimes[$key]; |
|
| 431 | + } else {
|
|
| 432 | + $starttimes = ''; |
|
| 433 | + $endtimes = ''; |
|
| 434 | + } |
|
| 435 | + } |
|
| 436 | 436 | |
| 437 | - $duration = isset( $recurring_data['duration_x'] ) && (int)$recurring_data['duration_x'] > 0 ? (int)$recurring_data['duration_x'] : 1; |
|
| 438 | - $duration--; |
|
| 439 | - $enddate = date_i18n( 'Y-m-d', strtotime( $date . ' + ' . $duration . ' day' ) ); |
|
| 437 | + $duration = isset( $recurring_data['duration_x'] ) && (int)$recurring_data['duration_x'] > 0 ? (int)$recurring_data['duration_x'] : 1; |
|
| 438 | + $duration--; |
|
| 439 | + $enddate = date_i18n( 'Y-m-d', strtotime( $date . ' + ' . $duration . ' day' ) ); |
|
| 440 | 440 | |
| 441 | - // Hide past dates |
|
| 442 | - if ( strtotime( $enddate ) < $today ) {
|
|
| 443 | - continue; |
|
| 444 | - } |
|
| 441 | + // Hide past dates |
|
| 442 | + if ( strtotime( $enddate ) < $today ) {
|
|
| 443 | + continue; |
|
| 444 | + } |
|
| 445 | 445 | |
| 446 | - $sdate = strtotime( $date . ' ' . $starttimes ); |
|
| 447 | - $edate = strtotime( $enddate . ' ' . $endtimes ); |
|
| 446 | + $sdate = strtotime( $date . ' ' . $starttimes ); |
|
| 447 | + $edate = strtotime( $enddate . ' ' . $endtimes ); |
|
| 448 | 448 | |
| 449 | - $start_date = date_i18n( $geodir_date_time_format, $sdate ); |
|
| 450 | - $end_date = date_i18n( $geodir_date_time_format, $edate ); |
|
| 449 | + $start_date = date_i18n( $geodir_date_time_format, $sdate ); |
|
| 450 | + $end_date = date_i18n( $geodir_date_time_format, $edate ); |
|
| 451 | 451 | |
| 452 | - $same_day = false; |
|
| 453 | - $full_day = false; |
|
| 454 | - $same_datetime = false; |
|
| 452 | + $same_day = false; |
|
| 453 | + $full_day = false; |
|
| 454 | + $same_datetime = false; |
|
| 455 | 455 | |
| 456 | - if ( $starttimes == $endtimes && ( $starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00' ) ) {
|
|
| 457 | - $full_day = true; |
|
| 458 | - } |
|
| 456 | + if ( $starttimes == $endtimes && ( $starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00' ) ) {
|
|
| 457 | + $full_day = true; |
|
| 458 | + } |
|
| 459 | 459 | |
| 460 | - if ( $start_date == $end_date && $full_day ) {
|
|
| 461 | - $same_datetime = true; |
|
| 462 | - } |
|
| 463 | - |
|
| 464 | - $link_date = date_i18n( 'Y-m-d', $sdate ); |
|
| 465 | - $title_date = date_i18n( $geodir_date_format, $sdate ); |
|
| 466 | - if ( $full_day ) {
|
|
| 467 | - $start_date = $title_date; |
|
| 468 | - $end_date = date_i18n( $geodir_date_format, $edate ); |
|
| 469 | - } |
|
| 460 | + if ( $start_date == $end_date && $full_day ) {
|
|
| 461 | + $same_datetime = true; |
|
| 462 | + } |
|
| 463 | + |
|
| 464 | + $link_date = date_i18n( 'Y-m-d', $sdate ); |
|
| 465 | + $title_date = date_i18n( $geodir_date_format, $sdate ); |
|
| 466 | + if ( $full_day ) {
|
|
| 467 | + $start_date = $title_date; |
|
| 468 | + $end_date = date_i18n( $geodir_date_format, $edate ); |
|
| 469 | + } |
|
| 470 | 470 | |
| 471 | - if ( !$same_datetime && !$full_day && date_i18n( 'Y-m-d', $sdate ) == date_i18n( 'Y-m-d', $edate ) ) {
|
|
| 472 | - $same_day = true; |
|
| 471 | + if ( !$same_datetime && !$full_day && date_i18n( 'Y-m-d', $sdate ) == date_i18n( 'Y-m-d', $edate ) ) {
|
|
| 472 | + $same_day = true; |
|
| 473 | 473 | |
| 474 | - $start_date .= ' - ' . date_i18n( $geodir_time_format, $edate ); |
|
| 475 | - } |
|
| 474 | + $start_date .= ' - ' . date_i18n( $geodir_time_format, $edate ); |
|
| 475 | + } |
|
| 476 | 476 | |
| 477 | - $event_dates .= ' :: ' . $start_date; |
|
| 477 | + $event_dates .= ' :: ' . $start_date; |
|
| 478 | 478 | |
| 479 | - if ( !$same_day && !$same_datetime ) {
|
|
| 480 | - $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date; |
|
| 481 | - } |
|
| 479 | + if ( !$same_day && !$same_datetime ) {
|
|
| 480 | + $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date; |
|
| 481 | + } |
|
| 482 | 482 | |
| 483 | - $e++; |
|
| 483 | + $e++; |
|
| 484 | 484 | |
| 485 | - if ($show_dates > 0 && $e == $show_dates) { // only show 3 event dates
|
|
| 486 | - break; |
|
| 487 | - } |
|
| 488 | - } |
|
| 489 | - } |
|
| 490 | - } else {
|
|
| 491 | - $start_date = isset( $recurring_data['event_start'] ) ? $recurring_data['event_start'] : ''; |
|
| 492 | - $end_date = isset( $recurring_data['event_end'] ) ? $recurring_data['event_end'] : $start_date; |
|
| 493 | - $all_day = isset( $recurring_data['all_day'] ) && !empty( $recurring_data['all_day'] ) ? true : false; |
|
| 494 | - $starttime = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : ''; |
|
| 495 | - $endtime = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : ''; |
|
| 485 | + if ($show_dates > 0 && $e == $show_dates) { // only show 3 event dates
|
|
| 486 | + break; |
|
| 487 | + } |
|
| 488 | + } |
|
| 489 | + } |
|
| 490 | + } else {
|
|
| 491 | + $start_date = isset( $recurring_data['event_start'] ) ? $recurring_data['event_start'] : ''; |
|
| 492 | + $end_date = isset( $recurring_data['event_end'] ) ? $recurring_data['event_end'] : $start_date; |
|
| 493 | + $all_day = isset( $recurring_data['all_day'] ) && !empty( $recurring_data['all_day'] ) ? true : false; |
|
| 494 | + $starttime = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : ''; |
|
| 495 | + $endtime = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : ''; |
|
| 496 | 496 | |
| 497 | - $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] ); |
|
| 498 | - $starttimes = isset( $recurring_data['starttimes'] ) && !empty( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array(); |
|
| 499 | - $endtimes = isset( $recurring_data['endtimes'] ) && !empty( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array(); |
|
| 497 | + $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] ); |
|
| 498 | + $starttimes = isset( $recurring_data['starttimes'] ) && !empty( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array(); |
|
| 499 | + $endtimes = isset( $recurring_data['endtimes'] ) && !empty( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array(); |
|
| 500 | 500 | |
| 501 | - if ( !geodir_event_is_date( $start_date ) && !empty( $event_recurring_dates ) ) {
|
|
| 502 | - $start_date = $event_recurring_dates[0]; |
|
| 503 | - } |
|
| 501 | + if ( !geodir_event_is_date( $start_date ) && !empty( $event_recurring_dates ) ) {
|
|
| 502 | + $start_date = $event_recurring_dates[0]; |
|
| 503 | + } |
|
| 504 | 504 | |
| 505 | - if ( strtotime( $end_date ) < strtotime( $start_date ) ) {
|
|
| 506 | - $end_date = $start_date; |
|
| 507 | - } |
|
| 505 | + if ( strtotime( $end_date ) < strtotime( $start_date ) ) {
|
|
| 506 | + $end_date = $start_date; |
|
| 507 | + } |
|
| 508 | 508 | |
| 509 | - if ($end_date != '' && strtotime($end_date) >= $today) {
|
|
| 510 | - if ( $starttime == '' && !empty( $starttimes ) ) {
|
|
| 511 | - $starttime = $starttimes[0]; |
|
| 512 | - $endtime = $endtimes[0]; |
|
| 513 | - } |
|
| 509 | + if ($end_date != '' && strtotime($end_date) >= $today) {
|
|
| 510 | + if ( $starttime == '' && !empty( $starttimes ) ) {
|
|
| 511 | + $starttime = $starttimes[0]; |
|
| 512 | + $endtime = $endtimes[0]; |
|
| 513 | + } |
|
| 514 | 514 | |
| 515 | - $same_day = false; |
|
| 516 | - $one_day = false; |
|
| 517 | - if ( $start_date == $end_date && $all_day ) {
|
|
| 518 | - $one_day = true; |
|
| 519 | - } |
|
| 520 | - |
|
| 521 | - if ( $all_day ) {
|
|
| 522 | - $start_datetime = strtotime( $start_date ); |
|
| 523 | - $end_datetime = strtotime( $end_date ); |
|
| 515 | + $same_day = false; |
|
| 516 | + $one_day = false; |
|
| 517 | + if ( $start_date == $end_date && $all_day ) {
|
|
| 518 | + $one_day = true; |
|
| 519 | + } |
|
| 520 | + |
|
| 521 | + if ( $all_day ) {
|
|
| 522 | + $start_datetime = strtotime( $start_date ); |
|
| 523 | + $end_datetime = strtotime( $end_date ); |
|
| 524 | 524 | |
| 525 | - $start_date = date_i18n( $geodir_date_format, $start_datetime ); |
|
| 526 | - $end_date = date_i18n( $geodir_date_format, $end_datetime ); |
|
| 527 | - if ( $start_date == $end_date ) {
|
|
| 528 | - $one_day = true; |
|
| 529 | - } |
|
| 530 | - } else {
|
|
| 531 | - if ( $start_date == $end_date && $starttime == $endtime ) {
|
|
| 532 | - $end_date = date_i18n( 'Y-m-d', strtotime( $start_date . ' ' . $starttime . ' +1 day' ) ); |
|
| 533 | - $one_day = false; |
|
| 534 | - } |
|
| 535 | - $start_datetime = strtotime( $start_date . ' ' . $starttime ); |
|
| 536 | - $end_datetime = strtotime( $end_date . ' ' . $endtime ); |
|
| 525 | + $start_date = date_i18n( $geodir_date_format, $start_datetime ); |
|
| 526 | + $end_date = date_i18n( $geodir_date_format, $end_datetime ); |
|
| 527 | + if ( $start_date == $end_date ) {
|
|
| 528 | + $one_day = true; |
|
| 529 | + } |
|
| 530 | + } else {
|
|
| 531 | + if ( $start_date == $end_date && $starttime == $endtime ) {
|
|
| 532 | + $end_date = date_i18n( 'Y-m-d', strtotime( $start_date . ' ' . $starttime . ' +1 day' ) ); |
|
| 533 | + $one_day = false; |
|
| 534 | + } |
|
| 535 | + $start_datetime = strtotime( $start_date . ' ' . $starttime ); |
|
| 536 | + $end_datetime = strtotime( $end_date . ' ' . $endtime ); |
|
| 537 | 537 | |
| 538 | - $start_date = date_i18n( $geodir_date_time_format, $start_datetime ); |
|
| 539 | - $end_date = date_i18n( $geodir_date_time_format, $end_datetime ); |
|
| 540 | - } |
|
| 538 | + $start_date = date_i18n( $geodir_date_time_format, $start_datetime ); |
|
| 539 | + $end_date = date_i18n( $geodir_date_time_format, $end_datetime ); |
|
| 540 | + } |
|
| 541 | 541 | |
| 542 | - if ( !$one_day && date_i18n( 'Y-m-d', $start_datetime ) == date_i18n( 'Y-m-d', $end_datetime ) ) {
|
|
| 543 | - $same_day = true; |
|
| 542 | + if ( !$one_day && date_i18n( 'Y-m-d', $start_datetime ) == date_i18n( 'Y-m-d', $end_datetime ) ) {
|
|
| 543 | + $same_day = true; |
|
| 544 | 544 | |
| 545 | - $start_date .= ' - ' . date_i18n( $geodir_time_format, $end_datetime ); |
|
| 546 | - } |
|
| 545 | + $start_date .= ' - ' . date_i18n( $geodir_time_format, $end_datetime ); |
|
| 546 | + } |
|
| 547 | 547 | |
| 548 | - $event_dates .= ' :: ' . $start_date; |
|
| 548 | + $event_dates .= ' :: ' . $start_date; |
|
| 549 | 549 | |
| 550 | - if ( !$same_day && !$one_day ) {
|
|
| 551 | - $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date; |
|
| 552 | - } |
|
| 553 | - } |
|
| 554 | - } |
|
| 555 | - |
|
| 556 | - if (empty($event_dates)) {
|
|
| 557 | - continue; |
|
| 558 | - } |
|
| 550 | + if ( !$same_day && !$one_day ) {
|
|
| 551 | + $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date; |
|
| 552 | + } |
|
| 553 | + } |
|
| 554 | + } |
|
| 555 | + |
|
| 556 | + if (empty($event_dates)) {
|
|
| 557 | + continue; |
|
| 558 | + } |
|
| 559 | 559 | |
| 560 | - $post_title .= $event_dates; |
|
| 561 | - } |
|
| 560 | + $post_title .= $event_dates; |
|
| 561 | + } |
|
| 562 | 562 | |
| 563 | - $map_cat_ids_array; |
|
| 564 | - $default_cat = isset($catinfo_obj->default_category) ? $catinfo_obj->default_category : ''; |
|
| 563 | + $map_cat_ids_array; |
|
| 564 | + $default_cat = isset($catinfo_obj->default_category) ? $catinfo_obj->default_category : ''; |
|
| 565 | 565 | |
| 566 | - // if single cat lets just show that icon |
|
| 567 | - if(is_array($map_cat_ids_array) && count($map_cat_ids_array)==1){
|
|
| 568 | - $default_cat = (int)$map_cat_ids_array[0]; |
|
| 569 | - } |
|
| 566 | + // if single cat lets just show that icon |
|
| 567 | + if(is_array($map_cat_ids_array) && count($map_cat_ids_array)==1){
|
|
| 568 | + $default_cat = (int)$map_cat_ids_array[0]; |
|
| 569 | + } |
|
| 570 | 570 | |
| 571 | - $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$default_cat]) ? $geodir_cat_icons[$default_cat] : ''; |
|
| 572 | - $mark_extra = (isset($catinfo_obj->marker_extra)) ? $catinfo_obj->marker_extra : ''; |
|
| 573 | - $title = str_replace($srcharr, $replarr, $post_title); |
|
| 571 | + $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$default_cat]) ? $geodir_cat_icons[$default_cat] : ''; |
|
| 572 | + $mark_extra = (isset($catinfo_obj->marker_extra)) ? $catinfo_obj->marker_extra : ''; |
|
| 573 | + $title = str_replace($srcharr, $replarr, $post_title); |
|
| 574 | 574 | |
| 575 | - if ($icon != '') {
|
|
| 576 | - $gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes; |
|
| 575 | + if ($icon != '') {
|
|
| 576 | + $gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes; |
|
| 577 | 577 | |
| 578 | - if (isset($gd_marker_sizes[$icon])) {
|
|
| 579 | - $icon_size = $gd_marker_sizes[$icon]; |
|
| 580 | - } else {
|
|
| 581 | - $icon_size = geodir_get_marker_size($icon); |
|
| 582 | - $gd_marker_sizes[$icon] = $icon_size; |
|
| 583 | - } |
|
| 584 | - } else {
|
|
| 585 | - $icon_size = array('w' => 36, 'h' => 45);
|
|
| 586 | - } |
|
| 587 | - |
|
| 588 | - $content_data[] = '{"id":"' . $catinfo_obj->post_id . '","t": "' . $title . '","lt": "' . $catinfo_obj->post_latitude . '","ln": "' . $catinfo_obj->post_longitude . '","mk_id":"' . $catinfo_obj->post_id . '_' . $default_cat . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"'.$mark_extra.'}';
|
|
| 589 | - $post_ids[] = $catinfo_obj->post_id; |
|
| 590 | - } |
|
| 591 | - } |
|
| 592 | - |
|
| 593 | - /** |
|
| 594 | - * Called after marker data is processed into JSON. |
|
| 595 | - * |
|
| 596 | - * Called after marker data is processed into JSON, this action can be used to change the format or add/remove markers. |
|
| 597 | - * |
|
| 598 | - * @since 1.4.9 |
|
| 599 | - * @param array $content_data The array containing all markers in JSON format. |
|
| 600 | - * @param object $catinfo The posts object containing all marker data. |
|
| 601 | - * @see 'geodir_before_marker_post_process' |
|
| 602 | - */ |
|
| 603 | - do_action('geodir_after_marker_post_process', $content_data, $catinfo);
|
|
| 604 | - |
|
| 605 | - if (!empty($content_data)) {
|
|
| 606 | - $cat_content_info[] = implode(',', $content_data);
|
|
| 607 | - } |
|
| 608 | - |
|
| 609 | - $totalcount = count(array_unique($post_ids)); |
|
| 610 | - |
|
| 611 | - if (!empty($cat_content_info)) {
|
|
| 612 | - $map_json = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';
|
|
| 613 | - } |
|
| 614 | - else {
|
|
| 615 | - $map_json = '[{"totalcount":"0"}]';
|
|
| 616 | - } |
|
| 617 | - |
|
| 618 | - |
|
| 619 | - /** |
|
| 620 | - * Filter the marker json return. |
|
| 621 | - * |
|
| 622 | - * @since 1.6.22 |
|
| 623 | - * @param string $map_json The JSON string of the map markers results. |
|
| 624 | - */ |
|
| 625 | - return apply_filters('geodir_markers_json',$map_json);
|
|
| 578 | + if (isset($gd_marker_sizes[$icon])) {
|
|
| 579 | + $icon_size = $gd_marker_sizes[$icon]; |
|
| 580 | + } else {
|
|
| 581 | + $icon_size = geodir_get_marker_size($icon); |
|
| 582 | + $gd_marker_sizes[$icon] = $icon_size; |
|
| 583 | + } |
|
| 584 | + } else {
|
|
| 585 | + $icon_size = array('w' => 36, 'h' => 45);
|
|
| 586 | + } |
|
| 587 | + |
|
| 588 | + $content_data[] = '{"id":"' . $catinfo_obj->post_id . '","t": "' . $title . '","lt": "' . $catinfo_obj->post_latitude . '","ln": "' . $catinfo_obj->post_longitude . '","mk_id":"' . $catinfo_obj->post_id . '_' . $default_cat . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"'.$mark_extra.'}';
|
|
| 589 | + $post_ids[] = $catinfo_obj->post_id; |
|
| 590 | + } |
|
| 591 | + } |
|
| 592 | + |
|
| 593 | + /** |
|
| 594 | + * Called after marker data is processed into JSON. |
|
| 595 | + * |
|
| 596 | + * Called after marker data is processed into JSON, this action can be used to change the format or add/remove markers. |
|
| 597 | + * |
|
| 598 | + * @since 1.4.9 |
|
| 599 | + * @param array $content_data The array containing all markers in JSON format. |
|
| 600 | + * @param object $catinfo The posts object containing all marker data. |
|
| 601 | + * @see 'geodir_before_marker_post_process' |
|
| 602 | + */ |
|
| 603 | + do_action('geodir_after_marker_post_process', $content_data, $catinfo);
|
|
| 604 | + |
|
| 605 | + if (!empty($content_data)) {
|
|
| 606 | + $cat_content_info[] = implode(',', $content_data);
|
|
| 607 | + } |
|
| 608 | + |
|
| 609 | + $totalcount = count(array_unique($post_ids)); |
|
| 610 | + |
|
| 611 | + if (!empty($cat_content_info)) {
|
|
| 612 | + $map_json = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';
|
|
| 613 | + } |
|
| 614 | + else {
|
|
| 615 | + $map_json = '[{"totalcount":"0"}]';
|
|
| 616 | + } |
|
| 617 | + |
|
| 618 | + |
|
| 619 | + /** |
|
| 620 | + * Filter the marker json return. |
|
| 621 | + * |
|
| 622 | + * @since 1.6.22 |
|
| 623 | + * @param string $map_json The JSON string of the map markers results. |
|
| 624 | + */ |
|
| 625 | + return apply_filters('geodir_markers_json',$map_json);
|
|
| 626 | 626 | } |
| 627 | 627 | |
| 628 | 628 | |
@@ -7,9 +7,9 @@ discard block |
||
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | // Enable map cache if set |
| 10 | -if(get_option('geodir_enable_map_cache')){
|
|
| 11 | - add_filter('geodir_get_markers_cache','geodir_get_map_cache');
|
|
| 12 | - add_filter('geodir_markers_json','geodir_save_map_cache',10);
|
|
| 10 | +if (get_option('geodir_enable_map_cache')) {
|
|
| 11 | + add_filter('geodir_get_markers_cache', 'geodir_get_map_cache');
|
|
| 12 | + add_filter('geodir_markers_json', 'geodir_save_map_cache', 10);
|
|
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | |
@@ -21,10 +21,10 @@ discard block |
||
| 21 | 21 | * @since 1.6.22 |
| 22 | 22 | * @return string |
| 23 | 23 | */ |
| 24 | -function geodir_get_map_cache($cache){
|
|
| 24 | +function geodir_get_map_cache($cache) {
|
|
| 25 | 25 | |
| 26 | 26 | // if a search is going on then dont even try to check for cache. |
| 27 | - if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){
|
|
| 27 | + if (isset($_REQUEST['search']) && !empty($_REQUEST['search'])) {
|
|
| 28 | 28 | return $cache; |
| 29 | 29 | } |
| 30 | 30 | |
@@ -43,29 +43,29 @@ discard block |
||
| 43 | 43 | $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : ''; |
| 44 | 44 | $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : ''; |
| 45 | 45 | |
| 46 | - $file_name = sanitize_file_name( md5( implode("-",$url_params) ) );
|
|
| 46 | + $file_name = sanitize_file_name(md5(implode("-", $url_params)));
|
|
| 47 | 47 | |
| 48 | 48 | $blog_id = get_current_blog_id(); |
| 49 | - if($blog_id>1){
|
|
| 49 | + if ($blog_id > 1) {
|
|
| 50 | 50 | $file_name = $blog_id."_".$file_name; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | $file_path = realpath(dirname(__FILE__))."/map-cache/"; |
| 54 | - $file = $file_path . $file_name . ".json"; |
|
| 54 | + $file = $file_path.$file_name.".json"; |
|
| 55 | 55 | |
| 56 | - if(file_exists($file)){
|
|
| 56 | + if (file_exists($file)) {
|
|
| 57 | 57 | // do the cache delete stuff |
| 58 | 58 | $cache_time = get_option('geodir_map_cache');
|
| 59 | - if(!$cache_time){
|
|
| 59 | + if (!$cache_time) {
|
|
| 60 | 60 | $cache_time = time(); |
| 61 | 61 | update_option('geodir_map_cache', $cache_time);
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - if((time() - $cache_time) > 86400){ // delete the cache every 24 hours
|
|
| 64 | + if ((time() - $cache_time) > 86400) { // delete the cache every 24 hours
|
|
| 65 | 65 | geodir_delete_map_cache(); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - if(file_exists($file) && is_readable($file)){
|
|
| 68 | + if (file_exists($file) && is_readable($file)) {
|
|
| 69 | 69 | ob_start(); |
| 70 | 70 | readfile($file); // readfile is quicker then file get contents |
| 71 | 71 | return ob_get_clean(); |
@@ -83,10 +83,10 @@ discard block |
||
| 83 | 83 | * @since 1.6.22 |
| 84 | 84 | * @return mixed |
| 85 | 85 | */ |
| 86 | -function geodir_save_map_cache($map_json){
|
|
| 86 | +function geodir_save_map_cache($map_json) {
|
|
| 87 | 87 | |
| 88 | 88 | // if a search is going on then dont even try to check for cache. |
| 89 | - if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){
|
|
| 89 | + if (isset($_REQUEST['search']) && !empty($_REQUEST['search'])) {
|
|
| 90 | 90 | return $map_json; |
| 91 | 91 | } |
| 92 | 92 | |
@@ -105,10 +105,10 @@ discard block |
||
| 105 | 105 | $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : ''; |
| 106 | 106 | $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : ''; |
| 107 | 107 | |
| 108 | - $file_name = sanitize_file_name( md5( implode("-",$url_params) ) );
|
|
| 108 | + $file_name = sanitize_file_name(md5(implode("-", $url_params)));
|
|
| 109 | 109 | |
| 110 | 110 | $blog_id = get_current_blog_id(); |
| 111 | - if($blog_id>1){
|
|
| 111 | + if ($blog_id > 1) {
|
|
| 112 | 112 | $file_name = $blog_id."_".$file_name; |
| 113 | 113 | } |
| 114 | 114 | |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | global $wp_filesystem; |
| 119 | 119 | if (empty($wp_filesystem)) {
|
| 120 | - require_once (ABSPATH . '/wp-admin/includes/file.php'); |
|
| 120 | + require_once (ABSPATH.'/wp-admin/includes/file.php'); |
|
| 121 | 121 | WP_Filesystem(); |
| 122 | 122 | } |
| 123 | 123 | $wp_filesystem->put_contents( |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | $gd_session->set('homemap_catlist_ptype', $gd_post_type);
|
| 139 | 139 | $post_taxonomy = geodir_get_taxonomies($gd_post_type); |
| 140 | 140 | $map_canvas_name = sanitize_text_field($_REQUEST['map_canvas']); |
| 141 | - $child_collapse = (bool)$_REQUEST['child_collapse']; |
|
| 141 | + $child_collapse = (bool) $_REQUEST['child_collapse']; |
|
| 142 | 142 | echo home_map_taxonomy_walker($post_taxonomy, 0, true, 0, $map_canvas_name, $child_collapse, true); |
| 143 | 143 | die; |
| 144 | 144 | } |
@@ -158,21 +158,21 @@ discard block |
||
| 158 | 158 | global $wpdb, $plugin_prefix, $gd_session; |
| 159 | 159 | |
| 160 | 160 | if ($_REQUEST['m_id'] != '') {
|
| 161 | - $pid = (int)$_REQUEST['m_id']; |
|
| 161 | + $pid = (int) $_REQUEST['m_id']; |
|
| 162 | 162 | } else {
|
| 163 | 163 | echo __('No marker data found', 'geodirectory');
|
| 164 | 164 | exit; |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | if (isset($_REQUEST['post_preview']) && $_REQUEST['post_preview'] != '' && $gd_ses_listing = $gd_session->get('listing')) {
|
| 168 | - $post = (object)$gd_ses_listing; |
|
| 168 | + $post = (object) $gd_ses_listing; |
|
| 169 | 169 | echo geodir_get_infowindow_html($post, $_REQUEST['post_preview']); |
| 170 | 170 | } else {
|
| 171 | 171 | $geodir_post_type = get_post_type($pid); |
| 172 | 172 | |
| 173 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 173 | + $table = $plugin_prefix.$geodir_post_type.'_detail'; |
|
| 174 | 174 | |
| 175 | - $sql = $wpdb->prepare("SELECT * FROM " . $table . " WHERE post_id = %d", array($pid));
|
|
| 175 | + $sql = $wpdb->prepare("SELECT * FROM ".$table." WHERE post_id = %d", array($pid));
|
|
| 176 | 176 | |
| 177 | 177 | $postinfo = $wpdb->get_results($sql); |
| 178 | 178 | |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | */ |
| 207 | 207 | function get_markers() {
|
| 208 | 208 | |
| 209 | - global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes,$gd_session; |
|
| 209 | + global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes, $gd_session; |
|
| 210 | 210 | |
| 211 | 211 | |
| 212 | 212 | /** |
@@ -214,8 +214,8 @@ discard block |
||
| 214 | 214 | * |
| 215 | 215 | * @since 1.6.22 |
| 216 | 216 | */ |
| 217 | - $map_cache = apply_filters('geodir_get_markers_cache','');
|
|
| 218 | - if($map_cache){
|
|
| 217 | + $map_cache = apply_filters('geodir_get_markers_cache', '');
|
|
| 218 | + if ($map_cache) {
|
|
| 219 | 219 | return $map_cache; |
| 220 | 220 | wp_die(); |
| 221 | 221 | } |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | $post_type = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : 'gd_place'; |
| 231 | 231 | |
| 232 | 232 | $map_cat_ids_array = array('0');
|
| 233 | - $cat_find_array = array(" FIND_IN_SET(%d, pd." . $post_type . "category)");
|
|
| 233 | + $cat_find_array = array(" FIND_IN_SET(%d, pd.".$post_type."category)");
|
|
| 234 | 234 | |
| 235 | 235 | |
| 236 | 236 | $field_default_cat = ''; |
@@ -238,13 +238,13 @@ discard block |
||
| 238 | 238 | $map_cat_arr = trim($_REQUEST['cat_id'], ','); |
| 239 | 239 | |
| 240 | 240 | if (!empty($map_cat_arr)) {
|
| 241 | - $field_default_cat .= "WHEN (default_category IN (" . $map_cat_arr . ")) THEN default_category ";
|
|
| 241 | + $field_default_cat .= "WHEN (default_category IN (".$map_cat_arr.")) THEN default_category ";
|
|
| 242 | 242 | |
| 243 | 243 | $map_cat_ids_array = explode(',', $map_cat_arr);
|
| 244 | 244 | $cat_find_array = array(); |
| 245 | 245 | foreach ($map_cat_ids_array as $cat_id) {
|
| 246 | - $field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `" . $post_type . "category`) > 0) THEN $cat_id "; |
|
| 247 | - $cat_find_array[] = " FIND_IN_SET(%d, pd." . $post_type . "category)"; |
|
| 246 | + $field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `".$post_type."category`) > 0) THEN $cat_id "; |
|
| 247 | + $cat_find_array[] = " FIND_IN_SET(%d, pd.".$post_type."category)"; |
|
| 248 | 248 | $main_query_array[] = $cat_id; |
| 249 | 249 | } |
| 250 | 250 | |
@@ -255,13 +255,13 @@ discard block |
||
| 255 | 255 | $field_default_cat = ''; |
| 256 | 256 | |
| 257 | 257 | if (!empty($cat_find_array)) |
| 258 | - $search .= "AND (" . implode(' OR ', $cat_find_array) . ")";
|
|
| 258 | + $search .= "AND (".implode(' OR ', $cat_find_array).")";
|
|
| 259 | 259 | |
| 260 | 260 | $main_query_array = $map_cat_ids_array; |
| 261 | 261 | |
| 262 | 262 | if (isset($_REQUEST['search']) && !empty($_REQUEST['search']) && $_REQUEST['search'] != __('Title', 'geodirectory')) {
|
| 263 | 263 | $search .= " AND p.post_title LIKE %s"; |
| 264 | - $main_query_array[] = "%" . $_REQUEST['search'] . "%"; |
|
| 264 | + $main_query_array[] = "%".$_REQUEST['search']."%"; |
|
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | /** |
@@ -283,14 +283,14 @@ discard block |
||
| 283 | 283 | |
| 284 | 284 | $gd_posttype = ''; |
| 285 | 285 | if (isset($_REQUEST['gd_posttype']) && $_REQUEST['gd_posttype'] != '') {
|
| 286 | - $table = $plugin_prefix . $_REQUEST['gd_posttype'] . '_detail'; |
|
| 286 | + $table = $plugin_prefix.$_REQUEST['gd_posttype'].'_detail'; |
|
| 287 | 287 | $gd_posttype = " AND p.post_type = %s"; |
| 288 | 288 | $main_query_array[] = $_REQUEST['gd_posttype']; |
| 289 | 289 | |
| 290 | 290 | } else |
| 291 | - $table = $plugin_prefix . 'gd_place_detail'; |
|
| 291 | + $table = $plugin_prefix.'gd_place_detail'; |
|
| 292 | 292 | |
| 293 | - $join = ", " . $table . " AS pd "; |
|
| 293 | + $join = ", ".$table." AS pd "; |
|
| 294 | 294 | |
| 295 | 295 | /** |
| 296 | 296 | * Filter the SQL JOIN clause for the markers data |
@@ -310,14 +310,14 @@ discard block |
||
| 310 | 310 | */ |
| 311 | 311 | $search = apply_filters('geodir_home_map_listing_where', $search);
|
| 312 | 312 | $search = str_replace(array("'%", "%'"), array("'%%", "%%'"), $search);
|
| 313 | - $cat_type = $post_type . 'category'; |
|
| 313 | + $cat_type = $post_type.'category'; |
|
| 314 | 314 | if ($post_type == 'gd_event') {
|
| 315 | 315 | $event_select = ", pd.recurring_dates, pd.is_recurring"; |
| 316 | 316 | } else {
|
| 317 | 317 | $event_select = ""; |
| 318 | 318 | } |
| 319 | 319 | |
| 320 | - $sql_select = 'SELECT pd.default_category, pd.' . $cat_type . ', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude' . $event_select; |
|
| 320 | + $sql_select = 'SELECT pd.default_category, pd.'.$cat_type.', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude'.$event_select; |
|
| 321 | 321 | /** |
| 322 | 322 | * Filter the SQL SELECT clause to retrive fields data |
| 323 | 323 | * |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | */ |
| 338 | 338 | $groupby = apply_filters('geodir_home_map_listing_groupby', $groupby);
|
| 339 | 339 | |
| 340 | - $catsql = $wpdb->prepare("$select $field_default_cat FROM " . $wpdb->posts . " as p" . $join . " WHERE p.ID = pd.post_id AND p.post_status = 'publish' " . $search . $gd_posttype . $groupby , $main_query_array);
|
|
| 340 | + $catsql = $wpdb->prepare("$select $field_default_cat FROM ".$wpdb->posts." as p".$join." WHERE p.ID = pd.post_id AND p.post_status = 'publish' ".$search.$gd_posttype.$groupby, $main_query_array);
|
|
| 341 | 341 | |
| 342 | 342 | /** |
| 343 | 343 | * Filter the SQL query to retrive markers data |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | global $geodir_date_time_format, $geodir_date_format, $geodir_time_format; |
| 388 | 388 | |
| 389 | 389 | $today = strtotime(date_i18n('Y-m-d'));
|
| 390 | - $show_dates = $post_type == 'gd_event' ? (int)get_option('geodir_event_infowindow_dates_count', 1) : 0;
|
|
| 390 | + $show_dates = $post_type == 'gd_event' ? (int) get_option('geodir_event_infowindow_dates_count', 1) : 0;
|
|
| 391 | 391 | |
| 392 | 392 | foreach ($catinfo as $catinfo_obj) {
|
| 393 | 393 | $post_title = $catinfo_obj->post_title; |
@@ -403,29 +403,29 @@ discard block |
||
| 403 | 403 | $endtimes = ''; |
| 404 | 404 | $astarttimes = array(); |
| 405 | 405 | $aendtimes = array(); |
| 406 | - if ( !isset( $recurring_data['repeat_type'] ) ) {
|
|
| 406 | + if (!isset($recurring_data['repeat_type'])) {
|
|
| 407 | 407 | $recurring_data['repeat_type'] = 'custom'; |
| 408 | 408 | } |
| 409 | - $repeat_type = isset( $recurring_data['repeat_type'] ) && in_array( $recurring_data['repeat_type'], array( 'day', 'week', 'month', 'year', 'custom' ) ) ? $recurring_data['repeat_type'] : 'year'; // day, week, month, year, custom |
|
| 410 | - $different_times = isset( $recurring_data['different_times'] ) && !empty( $recurring_data['different_times'] ) ? true : false; |
|
| 409 | + $repeat_type = isset($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'year'; // day, week, month, year, custom
|
|
| 410 | + $different_times = isset($recurring_data['different_times']) && !empty($recurring_data['different_times']) ? true : false; |
|
| 411 | 411 | |
| 412 | 412 | $recurring_dates = explode(',', $recurring_data['event_recurring_dates']);
|
| 413 | 413 | |
| 414 | - if ( !empty( $recurring_dates ) ) {
|
|
| 415 | - if ( empty( $recurring_data['all_day'] ) ) {
|
|
| 416 | - if ( $repeat_type == 'custom' && $different_times ) {
|
|
| 417 | - $astarttimes = isset( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array(); |
|
| 418 | - $aendtimes = isset( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array(); |
|
| 414 | + if (!empty($recurring_dates)) {
|
|
| 415 | + if (empty($recurring_data['all_day'])) {
|
|
| 416 | + if ($repeat_type == 'custom' && $different_times) {
|
|
| 417 | + $astarttimes = isset($recurring_data['starttimes']) ? $recurring_data['starttimes'] : array(); |
|
| 418 | + $aendtimes = isset($recurring_data['endtimes']) ? $recurring_data['endtimes'] : array(); |
|
| 419 | 419 | } else {
|
| 420 | - $starttimes = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : ''; |
|
| 421 | - $endtimes = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : ''; |
|
| 420 | + $starttimes = isset($recurring_data['starttime']) ? $recurring_data['starttime'] : ''; |
|
| 421 | + $endtimes = isset($recurring_data['endtime']) ? $recurring_data['endtime'] : ''; |
|
| 422 | 422 | } |
| 423 | 423 | } |
| 424 | 424 | |
| 425 | 425 | $e = 0; |
| 426 | - foreach( $recurring_dates as $key => $date ) {
|
|
| 427 | - if ( $repeat_type == 'custom' && $different_times ) {
|
|
| 428 | - if ( !empty( $astarttimes ) && isset( $astarttimes[$key] ) ) {
|
|
| 426 | + foreach ($recurring_dates as $key => $date) {
|
|
| 427 | + if ($repeat_type == 'custom' && $different_times) {
|
|
| 428 | + if (!empty($astarttimes) && isset($astarttimes[$key])) {
|
|
| 429 | 429 | $starttimes = $astarttimes[$key]; |
| 430 | 430 | $endtimes = $aendtimes[$key]; |
| 431 | 431 | } else {
|
@@ -434,50 +434,50 @@ discard block |
||
| 434 | 434 | } |
| 435 | 435 | } |
| 436 | 436 | |
| 437 | - $duration = isset( $recurring_data['duration_x'] ) && (int)$recurring_data['duration_x'] > 0 ? (int)$recurring_data['duration_x'] : 1; |
|
| 437 | + $duration = isset($recurring_data['duration_x']) && (int) $recurring_data['duration_x'] > 0 ? (int) $recurring_data['duration_x'] : 1; |
|
| 438 | 438 | $duration--; |
| 439 | - $enddate = date_i18n( 'Y-m-d', strtotime( $date . ' + ' . $duration . ' day' ) ); |
|
| 439 | + $enddate = date_i18n('Y-m-d', strtotime($date.' + '.$duration.' day'));
|
|
| 440 | 440 | |
| 441 | 441 | // Hide past dates |
| 442 | - if ( strtotime( $enddate ) < $today ) {
|
|
| 442 | + if (strtotime($enddate) < $today) {
|
|
| 443 | 443 | continue; |
| 444 | 444 | } |
| 445 | 445 | |
| 446 | - $sdate = strtotime( $date . ' ' . $starttimes ); |
|
| 447 | - $edate = strtotime( $enddate . ' ' . $endtimes ); |
|
| 446 | + $sdate = strtotime($date.' '.$starttimes); |
|
| 447 | + $edate = strtotime($enddate.' '.$endtimes); |
|
| 448 | 448 | |
| 449 | - $start_date = date_i18n( $geodir_date_time_format, $sdate ); |
|
| 450 | - $end_date = date_i18n( $geodir_date_time_format, $edate ); |
|
| 449 | + $start_date = date_i18n($geodir_date_time_format, $sdate); |
|
| 450 | + $end_date = date_i18n($geodir_date_time_format, $edate); |
|
| 451 | 451 | |
| 452 | 452 | $same_day = false; |
| 453 | 453 | $full_day = false; |
| 454 | 454 | $same_datetime = false; |
| 455 | 455 | |
| 456 | - if ( $starttimes == $endtimes && ( $starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00' ) ) {
|
|
| 456 | + if ($starttimes == $endtimes && ($starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00')) {
|
|
| 457 | 457 | $full_day = true; |
| 458 | 458 | } |
| 459 | 459 | |
| 460 | - if ( $start_date == $end_date && $full_day ) {
|
|
| 460 | + if ($start_date == $end_date && $full_day) {
|
|
| 461 | 461 | $same_datetime = true; |
| 462 | 462 | } |
| 463 | 463 | |
| 464 | - $link_date = date_i18n( 'Y-m-d', $sdate ); |
|
| 465 | - $title_date = date_i18n( $geodir_date_format, $sdate ); |
|
| 466 | - if ( $full_day ) {
|
|
| 464 | + $link_date = date_i18n('Y-m-d', $sdate);
|
|
| 465 | + $title_date = date_i18n($geodir_date_format, $sdate); |
|
| 466 | + if ($full_day) {
|
|
| 467 | 467 | $start_date = $title_date; |
| 468 | - $end_date = date_i18n( $geodir_date_format, $edate ); |
|
| 468 | + $end_date = date_i18n($geodir_date_format, $edate); |
|
| 469 | 469 | } |
| 470 | 470 | |
| 471 | - if ( !$same_datetime && !$full_day && date_i18n( 'Y-m-d', $sdate ) == date_i18n( 'Y-m-d', $edate ) ) {
|
|
| 471 | + if (!$same_datetime && !$full_day && date_i18n('Y-m-d', $sdate) == date_i18n('Y-m-d', $edate)) {
|
|
| 472 | 472 | $same_day = true; |
| 473 | 473 | |
| 474 | - $start_date .= ' - ' . date_i18n( $geodir_time_format, $edate ); |
|
| 474 | + $start_date .= ' - '.date_i18n($geodir_time_format, $edate); |
|
| 475 | 475 | } |
| 476 | 476 | |
| 477 | - $event_dates .= ' :: ' . $start_date; |
|
| 477 | + $event_dates .= ' :: '.$start_date; |
|
| 478 | 478 | |
| 479 | - if ( !$same_day && !$same_datetime ) {
|
|
| 480 | - $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date; |
|
| 479 | + if (!$same_day && !$same_datetime) {
|
|
| 480 | + $event_dates .= ' '.__('to', 'geodirectory').' '.$end_date;
|
|
| 481 | 481 | } |
| 482 | 482 | |
| 483 | 483 | $e++; |
@@ -488,67 +488,67 @@ discard block |
||
| 488 | 488 | } |
| 489 | 489 | } |
| 490 | 490 | } else {
|
| 491 | - $start_date = isset( $recurring_data['event_start'] ) ? $recurring_data['event_start'] : ''; |
|
| 492 | - $end_date = isset( $recurring_data['event_end'] ) ? $recurring_data['event_end'] : $start_date; |
|
| 493 | - $all_day = isset( $recurring_data['all_day'] ) && !empty( $recurring_data['all_day'] ) ? true : false; |
|
| 494 | - $starttime = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : ''; |
|
| 495 | - $endtime = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : ''; |
|
| 491 | + $start_date = isset($recurring_data['event_start']) ? $recurring_data['event_start'] : ''; |
|
| 492 | + $end_date = isset($recurring_data['event_end']) ? $recurring_data['event_end'] : $start_date; |
|
| 493 | + $all_day = isset($recurring_data['all_day']) && !empty($recurring_data['all_day']) ? true : false; |
|
| 494 | + $starttime = isset($recurring_data['starttime']) ? $recurring_data['starttime'] : ''; |
|
| 495 | + $endtime = isset($recurring_data['endtime']) ? $recurring_data['endtime'] : ''; |
|
| 496 | 496 | |
| 497 | - $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] ); |
|
| 498 | - $starttimes = isset( $recurring_data['starttimes'] ) && !empty( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array(); |
|
| 499 | - $endtimes = isset( $recurring_data['endtimes'] ) && !empty( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array(); |
|
| 497 | + $event_recurring_dates = explode(',', $recurring_data['event_recurring_dates']);
|
|
| 498 | + $starttimes = isset($recurring_data['starttimes']) && !empty($recurring_data['starttimes']) ? $recurring_data['starttimes'] : array(); |
|
| 499 | + $endtimes = isset($recurring_data['endtimes']) && !empty($recurring_data['endtimes']) ? $recurring_data['endtimes'] : array(); |
|
| 500 | 500 | |
| 501 | - if ( !geodir_event_is_date( $start_date ) && !empty( $event_recurring_dates ) ) {
|
|
| 501 | + if (!geodir_event_is_date($start_date) && !empty($event_recurring_dates)) {
|
|
| 502 | 502 | $start_date = $event_recurring_dates[0]; |
| 503 | 503 | } |
| 504 | 504 | |
| 505 | - if ( strtotime( $end_date ) < strtotime( $start_date ) ) {
|
|
| 505 | + if (strtotime($end_date) < strtotime($start_date)) {
|
|
| 506 | 506 | $end_date = $start_date; |
| 507 | 507 | } |
| 508 | 508 | |
| 509 | 509 | if ($end_date != '' && strtotime($end_date) >= $today) {
|
| 510 | - if ( $starttime == '' && !empty( $starttimes ) ) {
|
|
| 510 | + if ($starttime == '' && !empty($starttimes)) {
|
|
| 511 | 511 | $starttime = $starttimes[0]; |
| 512 | 512 | $endtime = $endtimes[0]; |
| 513 | 513 | } |
| 514 | 514 | |
| 515 | 515 | $same_day = false; |
| 516 | 516 | $one_day = false; |
| 517 | - if ( $start_date == $end_date && $all_day ) {
|
|
| 517 | + if ($start_date == $end_date && $all_day) {
|
|
| 518 | 518 | $one_day = true; |
| 519 | 519 | } |
| 520 | 520 | |
| 521 | - if ( $all_day ) {
|
|
| 522 | - $start_datetime = strtotime( $start_date ); |
|
| 523 | - $end_datetime = strtotime( $end_date ); |
|
| 521 | + if ($all_day) {
|
|
| 522 | + $start_datetime = strtotime($start_date); |
|
| 523 | + $end_datetime = strtotime($end_date); |
|
| 524 | 524 | |
| 525 | - $start_date = date_i18n( $geodir_date_format, $start_datetime ); |
|
| 526 | - $end_date = date_i18n( $geodir_date_format, $end_datetime ); |
|
| 527 | - if ( $start_date == $end_date ) {
|
|
| 525 | + $start_date = date_i18n($geodir_date_format, $start_datetime); |
|
| 526 | + $end_date = date_i18n($geodir_date_format, $end_datetime); |
|
| 527 | + if ($start_date == $end_date) {
|
|
| 528 | 528 | $one_day = true; |
| 529 | 529 | } |
| 530 | 530 | } else {
|
| 531 | - if ( $start_date == $end_date && $starttime == $endtime ) {
|
|
| 532 | - $end_date = date_i18n( 'Y-m-d', strtotime( $start_date . ' ' . $starttime . ' +1 day' ) ); |
|
| 531 | + if ($start_date == $end_date && $starttime == $endtime) {
|
|
| 532 | + $end_date = date_i18n('Y-m-d', strtotime($start_date.' '.$starttime.' +1 day'));
|
|
| 533 | 533 | $one_day = false; |
| 534 | 534 | } |
| 535 | - $start_datetime = strtotime( $start_date . ' ' . $starttime ); |
|
| 536 | - $end_datetime = strtotime( $end_date . ' ' . $endtime ); |
|
| 535 | + $start_datetime = strtotime($start_date.' '.$starttime); |
|
| 536 | + $end_datetime = strtotime($end_date.' '.$endtime); |
|
| 537 | 537 | |
| 538 | - $start_date = date_i18n( $geodir_date_time_format, $start_datetime ); |
|
| 539 | - $end_date = date_i18n( $geodir_date_time_format, $end_datetime ); |
|
| 538 | + $start_date = date_i18n($geodir_date_time_format, $start_datetime); |
|
| 539 | + $end_date = date_i18n($geodir_date_time_format, $end_datetime); |
|
| 540 | 540 | } |
| 541 | 541 | |
| 542 | - if ( !$one_day && date_i18n( 'Y-m-d', $start_datetime ) == date_i18n( 'Y-m-d', $end_datetime ) ) {
|
|
| 542 | + if (!$one_day && date_i18n('Y-m-d', $start_datetime) == date_i18n('Y-m-d', $end_datetime)) {
|
|
| 543 | 543 | $same_day = true; |
| 544 | 544 | |
| 545 | - $start_date .= ' - ' . date_i18n( $geodir_time_format, $end_datetime ); |
|
| 545 | + $start_date .= ' - '.date_i18n($geodir_time_format, $end_datetime); |
|
| 546 | 546 | } |
| 547 | 547 | |
| 548 | - $event_dates .= ' :: ' . $start_date; |
|
| 548 | + $event_dates .= ' :: '.$start_date; |
|
| 549 | 549 | |
| 550 | - if ( !$same_day && !$one_day ) {
|
|
| 551 | - $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date; |
|
| 550 | + if (!$same_day && !$one_day) {
|
|
| 551 | + $event_dates .= ' '.__('to', 'geodirectory').' '.$end_date;
|
|
| 552 | 552 | } |
| 553 | 553 | } |
| 554 | 554 | } |
@@ -564,8 +564,8 @@ discard block |
||
| 564 | 564 | $default_cat = isset($catinfo_obj->default_category) ? $catinfo_obj->default_category : ''; |
| 565 | 565 | |
| 566 | 566 | // if single cat lets just show that icon |
| 567 | - if(is_array($map_cat_ids_array) && count($map_cat_ids_array)==1){
|
|
| 568 | - $default_cat = (int)$map_cat_ids_array[0]; |
|
| 567 | + if (is_array($map_cat_ids_array) && count($map_cat_ids_array) == 1) {
|
|
| 568 | + $default_cat = (int) $map_cat_ids_array[0]; |
|
| 569 | 569 | } |
| 570 | 570 | |
| 571 | 571 | $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$default_cat]) ? $geodir_cat_icons[$default_cat] : ''; |
@@ -585,7 +585,7 @@ discard block |
||
| 585 | 585 | $icon_size = array('w' => 36, 'h' => 45);
|
| 586 | 586 | } |
| 587 | 587 | |
| 588 | - $content_data[] = '{"id":"' . $catinfo_obj->post_id . '","t": "' . $title . '","lt": "' . $catinfo_obj->post_latitude . '","ln": "' . $catinfo_obj->post_longitude . '","mk_id":"' . $catinfo_obj->post_id . '_' . $default_cat . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"'.$mark_extra.'}';
|
|
| 588 | + $content_data[] = '{"id":"'.$catinfo_obj->post_id.'","t": "'.$title.'","lt": "'.$catinfo_obj->post_latitude.'","ln": "'.$catinfo_obj->post_longitude.'","mk_id":"'.$catinfo_obj->post_id.'_'.$default_cat.'","i":"'.$icon.'","w":"'.$icon_size['w'].'","h":"'.$icon_size['h'].'"'.$mark_extra.'}';
|
|
| 589 | 589 | $post_ids[] = $catinfo_obj->post_id; |
| 590 | 590 | } |
| 591 | 591 | } |
@@ -609,10 +609,10 @@ discard block |
||
| 609 | 609 | $totalcount = count(array_unique($post_ids)); |
| 610 | 610 | |
| 611 | 611 | if (!empty($cat_content_info)) {
|
| 612 | - $map_json = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';
|
|
| 612 | + $map_json = '[{"totalcount":"'.$totalcount.'",'.substr(implode(',', $cat_content_info), 1).']';
|
|
| 613 | 613 | } |
| 614 | 614 | else {
|
| 615 | - $map_json = '[{"totalcount":"0"}]';
|
|
| 615 | + $map_json = '[{"totalcount":"0"}]';
|
|
| 616 | 616 | } |
| 617 | 617 | |
| 618 | 618 | |
@@ -622,7 +622,7 @@ discard block |
||
| 622 | 622 | * @since 1.6.22 |
| 623 | 623 | * @param string $map_json The JSON string of the map markers results. |
| 624 | 624 | */ |
| 625 | - return apply_filters('geodir_markers_json',$map_json);
|
|
| 625 | + return apply_filters('geodir_markers_json', $map_json);
|
|
| 626 | 626 | } |
| 627 | 627 | |
| 628 | 628 | |
@@ -17,26 +17,26 @@ discard block |
||
| 17 | 17 | function gd_compat_php_genesis() |
| 18 | 18 | { |
| 19 | 19 | // REPLACE GENESIS BREADCRUMBS WITH GD BREADCRUMBS |
| 20 | - remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20); |
|
| 21 | - remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20); |
|
| 22 | - remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20); |
|
| 23 | - remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20); |
|
| 24 | - remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20); |
|
| 25 | - remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20); |
|
| 20 | + remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20); |
|
| 21 | + remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20); |
|
| 22 | + remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20); |
|
| 23 | + remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20); |
|
| 24 | + remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20); |
|
| 25 | + remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20); |
|
| 26 | 26 | |
| 27 | 27 | |
| 28 | - // make top section wide |
|
| 29 | - remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 30 | - remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 31 | - remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10); |
|
| 32 | - remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10); |
|
| 33 | - remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10); |
|
| 34 | - remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10); |
|
| 28 | + // make top section wide |
|
| 29 | + remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 30 | + remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 31 | + remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10); |
|
| 32 | + remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10); |
|
| 33 | + remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10); |
|
| 34 | + remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10); |
|
| 35 | 35 | |
| 36 | - // REMOVE PAGE TITLES |
|
| 37 | - remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10); |
|
| 38 | - remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10); |
|
| 39 | - remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10); |
|
| 36 | + // REMOVE PAGE TITLES |
|
| 37 | + remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10); |
|
| 38 | + remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10); |
|
| 39 | + remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10); |
|
| 40 | 40 | |
| 41 | 41 | |
| 42 | 42 | } |
@@ -53,25 +53,25 @@ discard block |
||
| 53 | 53 | function gd_genesis_compat_left_sidebars() |
| 54 | 54 | { |
| 55 | 55 | |
| 56 | - if (is_page_geodir_home()) { |
|
| 57 | - remove_action('geodir_home_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 58 | - add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 59 | - } elseif (geodir_is_page('location')) { |
|
| 60 | - remove_action('geodir_location_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 61 | - add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 62 | - } elseif (geodir_is_page('listing')) { |
|
| 63 | - remove_action('geodir_listings_sidebar_left', 'geodir_action_listings_sidebar_left', 10); |
|
| 64 | - add_action('geodir_wrapper_close', 'geodir_action_listings_sidebar_left', 11); |
|
| 65 | - } elseif (geodir_is_page('detail') && get_option('geodir_detail_sidebar_left_section')) { |
|
| 66 | - //remove_action( 'geodir_detail_sidebar', 'geodir_action_details_sidebar', 10 ); |
|
| 67 | - //add_action( 'geodir_wrapper_close', 'geodir_action_details_sidebar', 11 ); |
|
| 68 | - } elseif (geodir_is_page('search')) { |
|
| 69 | - remove_action('geodir_search_sidebar_left', 'geodir_action_search_sidebar_left', 10); |
|
| 70 | - add_action('geodir_wrapper_close', 'geodir_action_search_sidebar_left', 11); |
|
| 71 | - } elseif (geodir_is_page('author')) { |
|
| 72 | - remove_action('geodir_author_sidebar_left', 'geodir_action_author_sidebar_left', 10); |
|
| 73 | - add_action('geodir_wrapper_close', 'geodir_action_author_sidebar_left', 11); |
|
| 74 | - } |
|
| 56 | + if (is_page_geodir_home()) { |
|
| 57 | + remove_action('geodir_home_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 58 | + add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 59 | + } elseif (geodir_is_page('location')) { |
|
| 60 | + remove_action('geodir_location_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 61 | + add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 62 | + } elseif (geodir_is_page('listing')) { |
|
| 63 | + remove_action('geodir_listings_sidebar_left', 'geodir_action_listings_sidebar_left', 10); |
|
| 64 | + add_action('geodir_wrapper_close', 'geodir_action_listings_sidebar_left', 11); |
|
| 65 | + } elseif (geodir_is_page('detail') && get_option('geodir_detail_sidebar_left_section')) { |
|
| 66 | + //remove_action( 'geodir_detail_sidebar', 'geodir_action_details_sidebar', 10 ); |
|
| 67 | + //add_action( 'geodir_wrapper_close', 'geodir_action_details_sidebar', 11 ); |
|
| 68 | + } elseif (geodir_is_page('search')) { |
|
| 69 | + remove_action('geodir_search_sidebar_left', 'geodir_action_search_sidebar_left', 10); |
|
| 70 | + add_action('geodir_wrapper_close', 'geodir_action_search_sidebar_left', 11); |
|
| 71 | + } elseif (geodir_is_page('author')) { |
|
| 72 | + remove_action('geodir_author_sidebar_left', 'geodir_action_author_sidebar_left', 10); |
|
| 73 | + add_action('geodir_wrapper_close', 'geodir_action_author_sidebar_left', 11); |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | 76 | |
| 77 | 77 | } |
@@ -88,68 +88,68 @@ discard block |
||
| 88 | 88 | */ |
| 89 | 89 | function geodir_set_body_scs($classes) |
| 90 | 90 | { |
| 91 | - $remove_class = false; |
|
| 92 | - $new_class = ''; |
|
| 93 | - if (is_page_geodir_home() || geodir_is_page('location') || geodir_is_page('home')) { |
|
| 94 | - $remove_class = true; |
|
| 95 | - if (get_option('geodir_show_home_left_section')) { |
|
| 96 | - $new_class .= 'sidebar-'; |
|
| 97 | - } |
|
| 98 | - if (get_option('geodir_show_home_contant_section')) { |
|
| 99 | - $new_class .= 'content'; |
|
| 100 | - } |
|
| 101 | - if (get_option('geodir_show_home_right_section')) { |
|
| 102 | - $new_class .= '-sidebar'; |
|
| 103 | - } |
|
| 104 | - } elseif (geodir_is_page('listing')) { |
|
| 105 | - $remove_class = true; |
|
| 106 | - if (get_option('geodir_show_listing_left_section')) { |
|
| 107 | - $new_class .= 'sidebar-'; |
|
| 108 | - } |
|
| 109 | - $new_class .= 'content'; |
|
| 110 | - if (get_option('geodir_show_listing_right_section')) { |
|
| 111 | - $new_class .= '-sidebar'; |
|
| 112 | - } |
|
| 113 | - } elseif (geodir_is_page('detail')) { |
|
| 114 | - $remove_class = true; |
|
| 115 | - if (get_option('geodir_detail_sidebar_left_section')) { |
|
| 116 | - $new_class .= 'sidebar-content gd-details-sidebar-left'; |
|
| 117 | - } else { |
|
| 118 | - $new_class .= 'content-sidebar'; |
|
| 119 | - } |
|
| 120 | - } elseif (geodir_is_page('search')) { |
|
| 121 | - $remove_class = true; |
|
| 122 | - if (get_option('geodir_show_search_left_section')) { |
|
| 123 | - $new_class .= 'sidebar-'; |
|
| 124 | - } |
|
| 125 | - $new_class .= 'content'; |
|
| 126 | - if (get_option('geodir_show_search_right_section')) { |
|
| 127 | - $new_class .= '-sidebar'; |
|
| 128 | - } |
|
| 129 | - } elseif (geodir_is_page('author')) { |
|
| 130 | - $remove_class = true; |
|
| 131 | - if (get_option('geodir_show_author_left_section')) { |
|
| 132 | - $new_class .= 'sidebar-'; |
|
| 133 | - } |
|
| 134 | - $new_class .= 'content'; |
|
| 135 | - if (get_option('geodir_show_author_right_section')) { |
|
| 136 | - $new_class .= '-sidebar'; |
|
| 137 | - } |
|
| 138 | - } elseif (geodir_is_page('add-listing')) { |
|
| 139 | - $remove_class = true; |
|
| 140 | - $new_class .= 'content-sidebar'; |
|
| 141 | - } |
|
| 142 | - |
|
| 143 | - if ($remove_class) { |
|
| 144 | - $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content')); |
|
| 145 | - if ( $new_class == 'content' ) { |
|
| 146 | - $new_class = 'content-no-sidebar'; |
|
| 147 | - $classes[] = 'full-width-content'; |
|
| 148 | - } |
|
| 149 | - $classes[] = $new_class; |
|
| 150 | - } |
|
| 151 | - |
|
| 152 | - return $classes; |
|
| 91 | + $remove_class = false; |
|
| 92 | + $new_class = ''; |
|
| 93 | + if (is_page_geodir_home() || geodir_is_page('location') || geodir_is_page('home')) { |
|
| 94 | + $remove_class = true; |
|
| 95 | + if (get_option('geodir_show_home_left_section')) { |
|
| 96 | + $new_class .= 'sidebar-'; |
|
| 97 | + } |
|
| 98 | + if (get_option('geodir_show_home_contant_section')) { |
|
| 99 | + $new_class .= 'content'; |
|
| 100 | + } |
|
| 101 | + if (get_option('geodir_show_home_right_section')) { |
|
| 102 | + $new_class .= '-sidebar'; |
|
| 103 | + } |
|
| 104 | + } elseif (geodir_is_page('listing')) { |
|
| 105 | + $remove_class = true; |
|
| 106 | + if (get_option('geodir_show_listing_left_section')) { |
|
| 107 | + $new_class .= 'sidebar-'; |
|
| 108 | + } |
|
| 109 | + $new_class .= 'content'; |
|
| 110 | + if (get_option('geodir_show_listing_right_section')) { |
|
| 111 | + $new_class .= '-sidebar'; |
|
| 112 | + } |
|
| 113 | + } elseif (geodir_is_page('detail')) { |
|
| 114 | + $remove_class = true; |
|
| 115 | + if (get_option('geodir_detail_sidebar_left_section')) { |
|
| 116 | + $new_class .= 'sidebar-content gd-details-sidebar-left'; |
|
| 117 | + } else { |
|
| 118 | + $new_class .= 'content-sidebar'; |
|
| 119 | + } |
|
| 120 | + } elseif (geodir_is_page('search')) { |
|
| 121 | + $remove_class = true; |
|
| 122 | + if (get_option('geodir_show_search_left_section')) { |
|
| 123 | + $new_class .= 'sidebar-'; |
|
| 124 | + } |
|
| 125 | + $new_class .= 'content'; |
|
| 126 | + if (get_option('geodir_show_search_right_section')) { |
|
| 127 | + $new_class .= '-sidebar'; |
|
| 128 | + } |
|
| 129 | + } elseif (geodir_is_page('author')) { |
|
| 130 | + $remove_class = true; |
|
| 131 | + if (get_option('geodir_show_author_left_section')) { |
|
| 132 | + $new_class .= 'sidebar-'; |
|
| 133 | + } |
|
| 134 | + $new_class .= 'content'; |
|
| 135 | + if (get_option('geodir_show_author_right_section')) { |
|
| 136 | + $new_class .= '-sidebar'; |
|
| 137 | + } |
|
| 138 | + } elseif (geodir_is_page('add-listing')) { |
|
| 139 | + $remove_class = true; |
|
| 140 | + $new_class .= 'content-sidebar'; |
|
| 141 | + } |
|
| 142 | + |
|
| 143 | + if ($remove_class) { |
|
| 144 | + $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content')); |
|
| 145 | + if ( $new_class == 'content' ) { |
|
| 146 | + $new_class = 'content-no-sidebar'; |
|
| 147 | + $classes[] = 'full-width-content'; |
|
| 148 | + } |
|
| 149 | + $classes[] = $new_class; |
|
| 150 | + } |
|
| 151 | + |
|
| 152 | + return $classes; |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | add_action('genesis_after_header', 'gd_genesis_compat_add_top_section_back', 11); |
@@ -162,17 +162,17 @@ discard block |
||
| 162 | 162 | function gd_genesis_compat_add_top_section_back() |
| 163 | 163 | { |
| 164 | 164 | |
| 165 | - if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 166 | - geodir_action_geodir_sidebar_home_top(); |
|
| 167 | - } elseif (geodir_is_page('listing')) { |
|
| 168 | - geodir_action_geodir_sidebar_listings_top(); |
|
| 169 | - } elseif (geodir_is_page('detail')) { |
|
| 170 | - geodir_action_geodir_sidebar_detail_top(); |
|
| 171 | - } elseif (geodir_is_page('search')) { |
|
| 172 | - geodir_action_geodir_sidebar_search_top(); |
|
| 173 | - } elseif (geodir_is_page('author')) { |
|
| 174 | - geodir_action_geodir_sidebar_author_top(); |
|
| 175 | - } |
|
| 165 | + if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 166 | + geodir_action_geodir_sidebar_home_top(); |
|
| 167 | + } elseif (geodir_is_page('listing')) { |
|
| 168 | + geodir_action_geodir_sidebar_listings_top(); |
|
| 169 | + } elseif (geodir_is_page('detail')) { |
|
| 170 | + geodir_action_geodir_sidebar_detail_top(); |
|
| 171 | + } elseif (geodir_is_page('search')) { |
|
| 172 | + geodir_action_geodir_sidebar_search_top(); |
|
| 173 | + } elseif (geodir_is_page('author')) { |
|
| 174 | + geodir_action_geodir_sidebar_author_top(); |
|
| 175 | + } |
|
| 176 | 176 | |
| 177 | 177 | |
| 178 | 178 | } |
@@ -185,12 +185,12 @@ discard block |
||
| 185 | 185 | */ |
| 186 | 186 | function geodir_replace_breadcrumb() |
| 187 | 187 | { |
| 188 | - if (is_front_page() && geodir_is_page('home') && !geodir_is_page('login')) { |
|
| 189 | - } else { |
|
| 190 | - echo '<div class="geodir-breadcrumb-bar"><div class="wrap">'; |
|
| 191 | - geodir_breadcrumb(); |
|
| 192 | - echo '</div></div>'; |
|
| 193 | - } |
|
| 188 | + if (is_front_page() && geodir_is_page('home') && !geodir_is_page('login')) { |
|
| 189 | + } else { |
|
| 190 | + echo '<div class="geodir-breadcrumb-bar"><div class="wrap">'; |
|
| 191 | + geodir_breadcrumb(); |
|
| 192 | + echo '</div></div>'; |
|
| 193 | + } |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | // Force Full Width on signup page |
@@ -203,9 +203,9 @@ discard block |
||
| 203 | 203 | */ |
| 204 | 204 | function geodir_genesis_meta() |
| 205 | 205 | { |
| 206 | - if (geodir_is_page('login')) { |
|
| 207 | - add_filter('genesis_pre_get_option_site_layout', '__genesis_return_full_width_content'); |
|
| 208 | - } |
|
| 206 | + if (geodir_is_page('login')) { |
|
| 207 | + add_filter('genesis_pre_get_option_site_layout', '__genesis_return_full_width_content'); |
|
| 208 | + } |
|
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | add_action('geodir_add_listing_page_title', 'geodir_add_listing_page_title_genesis_before', 8); |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | function geodir_add_listing_page_title_genesis_before() |
| 219 | 219 | { |
| 220 | 220 | |
| 221 | - echo "<div class='entry' >"; |
|
| 221 | + echo "<div class='entry' >"; |
|
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | function geodir_add_listing_form_genesis_after() |
| 233 | 233 | { |
| 234 | 234 | |
| 235 | - echo "</div>"; |
|
| 235 | + echo "</div>"; |
|
| 236 | 236 | } |
| 237 | 237 | |
| 238 | 238 | |
@@ -251,38 +251,38 @@ discard block |
||
| 251 | 251 | { |
| 252 | 252 | |
| 253 | 253 | |
| 254 | - $title = ''; |
|
| 255 | - $subtitle = ''; |
|
| 256 | - |
|
| 257 | - if (geodir_is_page('listing')) { |
|
| 258 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 259 | - geodir_action_listings_title(); |
|
| 260 | - echo '</div>'; |
|
| 261 | - } |
|
| 262 | - |
|
| 263 | - if (geodir_is_page('add-listing')) { |
|
| 264 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 265 | - geodir_action_add_listing_page_title(); |
|
| 266 | - echo '</div>'; |
|
| 267 | - } |
|
| 268 | - |
|
| 269 | - if (geodir_is_page('author')) { |
|
| 270 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 271 | - geodir_action_author_page_title(); |
|
| 272 | - echo '</div>'; |
|
| 273 | - } |
|
| 274 | - |
|
| 275 | - if (geodir_is_page('detail') || geodir_is_page('preview')) { |
|
| 276 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 277 | - echo get_the_title(); |
|
| 278 | - echo '</div>'; |
|
| 279 | - } |
|
| 280 | - |
|
| 281 | - if (geodir_is_page('search')) { |
|
| 282 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 283 | - geodir_action_search_page_title(); |
|
| 284 | - echo '</div>'; |
|
| 285 | - } |
|
| 254 | + $title = ''; |
|
| 255 | + $subtitle = ''; |
|
| 256 | + |
|
| 257 | + if (geodir_is_page('listing')) { |
|
| 258 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 259 | + geodir_action_listings_title(); |
|
| 260 | + echo '</div>'; |
|
| 261 | + } |
|
| 262 | + |
|
| 263 | + if (geodir_is_page('add-listing')) { |
|
| 264 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 265 | + geodir_action_add_listing_page_title(); |
|
| 266 | + echo '</div>'; |
|
| 267 | + } |
|
| 268 | + |
|
| 269 | + if (geodir_is_page('author')) { |
|
| 270 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 271 | + geodir_action_author_page_title(); |
|
| 272 | + echo '</div>'; |
|
| 273 | + } |
|
| 274 | + |
|
| 275 | + if (geodir_is_page('detail') || geodir_is_page('preview')) { |
|
| 276 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 277 | + echo get_the_title(); |
|
| 278 | + echo '</div>'; |
|
| 279 | + } |
|
| 280 | + |
|
| 281 | + if (geodir_is_page('search')) { |
|
| 282 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 283 | + geodir_action_search_page_title(); |
|
| 284 | + echo '</div>'; |
|
| 285 | + } |
|
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | |
@@ -295,8 +295,8 @@ discard block |
||
| 295 | 295 | */ |
| 296 | 296 | function gd_genesis_listing_page_title_bar() |
| 297 | 297 | { |
| 298 | - geodir_action_listings_title(); |
|
| 299 | - //geodir_action_listings_description(); |
|
| 298 | + geodir_action_listings_title(); |
|
| 299 | + //geodir_action_listings_description(); |
|
| 300 | 300 | } |
| 301 | 301 | |
| 302 | 302 | |
@@ -309,19 +309,19 @@ discard block |
||
| 309 | 309 | */ |
| 310 | 310 | function gd_compat_php_genesis_geo_1280_fix() |
| 311 | 311 | { |
| 312 | - if (function_exists('geo1280_search_bar')) { |
|
| 313 | - remove_action('genesis_after_header', 'geo1280_search_bar', 20); |
|
| 314 | - add_action('genesis_after_header', 'geo1280_search_bar_fix', 4); |
|
| 312 | + if (function_exists('geo1280_search_bar')) { |
|
| 313 | + remove_action('genesis_after_header', 'geo1280_search_bar', 20); |
|
| 314 | + add_action('genesis_after_header', 'geo1280_search_bar_fix', 4); |
|
| 315 | 315 | |
| 316 | - // |
|
| 316 | + // |
|
| 317 | 317 | |
| 318 | - remove_action('genesis_after_header', 'geodir_replace_breadcrumb', 20); |
|
| 319 | - remove_action('genesis_before_content_sidebar_wrap', 'geodir_replace_breadcrumb', 20); |
|
| 320 | - add_action('geodir_wrapper_open', 'geodir_replace_breadcrumb', 105); |
|
| 318 | + remove_action('genesis_after_header', 'geodir_replace_breadcrumb', 20); |
|
| 319 | + remove_action('genesis_before_content_sidebar_wrap', 'geodir_replace_breadcrumb', 20); |
|
| 320 | + add_action('geodir_wrapper_open', 'geodir_replace_breadcrumb', 105); |
|
| 321 | 321 | |
| 322 | - remove_action('genesis_before_content_sidebar_wrap', 'geo1280_page_title', 10); |
|
| 323 | - add_action('geodir_wrapper_open', 'geo1280_page_title', 101); |
|
| 324 | - } |
|
| 322 | + remove_action('genesis_before_content_sidebar_wrap', 'geo1280_page_title', 10); |
|
| 323 | + add_action('geodir_wrapper_open', 'geo1280_page_title', 101); |
|
| 324 | + } |
|
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | /** |
@@ -333,11 +333,11 @@ discard block |
||
| 333 | 333 | function geo1280_search_bar_fix() |
| 334 | 334 | { |
| 335 | 335 | |
| 336 | - echo '<div class="geo1280-placeholder"></div>'; |
|
| 337 | - if (is_active_sidebar('search-bar')) { |
|
| 338 | - genesis_widget_area('search-bar', array( |
|
| 339 | - 'before' => '<div class="search-bar widget-area"><div class="wrap">', |
|
| 340 | - 'after' => '</div></div>', |
|
| 341 | - )); |
|
| 342 | - } |
|
| 336 | + echo '<div class="geo1280-placeholder"></div>'; |
|
| 337 | + if (is_active_sidebar('search-bar')) { |
|
| 338 | + genesis_widget_area('search-bar', array( |
|
| 339 | + 'before' => '<div class="search-bar widget-area"><div class="wrap">', |
|
| 340 | + 'after' => '</div></div>', |
|
| 341 | + )); |
|
| 342 | + } |
|
| 343 | 343 | } |
@@ -142,7 +142,7 @@ |
||
| 142 | 142 | |
| 143 | 143 | if ($remove_class) { |
| 144 | 144 | $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content')); |
| 145 | - if ( $new_class == 'content' ) { |
|
| 145 | + if ($new_class == 'content') { |
|
| 146 | 146 | $new_class = 'content-no-sidebar'; |
| 147 | 147 | $classes[] = 'full-width-content'; |
| 148 | 148 | } |
