GeoDirectory /
geodirectory
@@ -13,125 +13,125 @@ 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('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);
|
|
| 115 | - } |
|
| 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('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);
|
|
| 115 | + } |
|
| 116 | 116 | |
| 117 | - if ($geodir_map_name == 'osm') {
|
|
| 118 | - // Leaflet OpenStreetMap |
|
| 119 | - wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 120 | - wp_enqueue_style('geodirectory-leaflet-style');
|
|
| 117 | + if ($geodir_map_name == 'osm') {
|
|
| 118 | + // Leaflet OpenStreetMap |
|
| 119 | + wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 120 | + wp_enqueue_style('geodirectory-leaflet-style');
|
|
| 121 | 121 | |
| 122 | - wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 123 | - wp_enqueue_script('geodirectory-leaflet-script');
|
|
| 122 | + wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 123 | + wp_enqueue_script('geodirectory-leaflet-script');
|
|
| 124 | 124 | |
| 125 | - wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
| 126 | - wp_enqueue_script('geodirectory-leaflet-geo-script');
|
|
| 127 | - } |
|
| 128 | - wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 125 | + wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
| 126 | + wp_enqueue_script('geodirectory-leaflet-geo-script');
|
|
| 127 | + } |
|
| 128 | + wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 129 | 129 | |
| 130 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 131 | - wp_enqueue_script('geodirectory-goMap-script');
|
|
| 130 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 131 | + wp_enqueue_script('geodirectory-goMap-script');
|
|
| 132 | 132 | |
| 133 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
| 134 | - wp_enqueue_script('geodirectory-goMap-script');
|
|
| 133 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
| 134 | + wp_enqueue_script('geodirectory-goMap-script');
|
|
| 135 | 135 | |
| 136 | 136 | // font awesome rating script |
| 137 | 137 | if (get_option('geodir_reviewrating_enable_font_awesome')) {
|
@@ -142,167 +142,167 @@ discard block |
||
| 142 | 142 | wp_enqueue_script('geodir-jRating-js');
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 146 | - wp_enqueue_script('geodir-on-document-load');
|
|
| 147 | - |
|
| 148 | - |
|
| 149 | - // SCRIPT FOR UPLOAD |
|
| 150 | - wp_enqueue_script('plupload-all');
|
|
| 151 | - wp_enqueue_script('jquery-ui-sortable');
|
|
| 152 | - |
|
| 153 | - wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
| 154 | - wp_enqueue_script('geodirectory-plupload-script');
|
|
| 155 | - |
|
| 156 | - // SCRIPT FOR UPLOAD END |
|
| 157 | - |
|
| 158 | - |
|
| 159 | - // place js config array for plupload |
|
| 160 | - $plupload_init = array( |
|
| 161 | - 'runtimes' => 'html5,silverlight,flash,html4', |
|
| 162 | - 'browse_button' => 'plupload-browse-button', // will be adjusted per uploader |
|
| 163 | - 'container' => 'plupload-upload-ui', // will be adjusted per uploader |
|
| 164 | - 'drop_element' => 'dropbox', // will be adjusted per uploader |
|
| 165 | - 'file_data_name' => 'async-upload', // will be adjusted per uploader |
|
| 166 | - 'multiple_queues' => true, |
|
| 167 | - 'max_file_size' => geodir_max_upload_size(), |
|
| 168 | - 'url' => admin_url('admin-ajax.php'),
|
|
| 169 | - 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
|
|
| 170 | - 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
|
|
| 171 | - 'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
|
|
| 172 | - 'multipart' => true, |
|
| 173 | - 'urlstream_upload' => true, |
|
| 174 | - 'multi_selection' => false, // will be added per uploader |
|
| 175 | - // additional post data to send to our ajax hook |
|
| 176 | - 'multipart_params' => array( |
|
| 177 | - '_ajax_nonce' => "", // will be added per uploader |
|
| 178 | - 'action' => 'plupload_action', // the ajax action name |
|
| 179 | - 'imgid' => 0 // will be added per uploader |
|
| 180 | - ) |
|
| 181 | - ); |
|
| 182 | - $base_plupload_config = json_encode($plupload_init); |
|
| 183 | - |
|
| 184 | - |
|
| 185 | - $thumb_img_arr = array(); |
|
| 186 | - |
|
| 187 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 188 | - $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
| 189 | - |
|
| 190 | - $totImg = ''; |
|
| 191 | - $image_limit = ''; |
|
| 192 | - if (!empty($thumb_img_arr)) {
|
|
| 193 | - $totImg = count($thumb_img_arr); |
|
| 194 | - } |
|
| 145 | + wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 146 | + wp_enqueue_script('geodir-on-document-load');
|
|
| 147 | + |
|
| 148 | + |
|
| 149 | + // SCRIPT FOR UPLOAD |
|
| 150 | + wp_enqueue_script('plupload-all');
|
|
| 151 | + wp_enqueue_script('jquery-ui-sortable');
|
|
| 152 | + |
|
| 153 | + wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
| 154 | + wp_enqueue_script('geodirectory-plupload-script');
|
|
| 155 | + |
|
| 156 | + // SCRIPT FOR UPLOAD END |
|
| 157 | + |
|
| 158 | + |
|
| 159 | + // place js config array for plupload |
|
| 160 | + $plupload_init = array( |
|
| 161 | + 'runtimes' => 'html5,silverlight,flash,html4', |
|
| 162 | + 'browse_button' => 'plupload-browse-button', // will be adjusted per uploader |
|
| 163 | + 'container' => 'plupload-upload-ui', // will be adjusted per uploader |
|
| 164 | + 'drop_element' => 'dropbox', // will be adjusted per uploader |
|
| 165 | + 'file_data_name' => 'async-upload', // will be adjusted per uploader |
|
| 166 | + 'multiple_queues' => true, |
|
| 167 | + 'max_file_size' => geodir_max_upload_size(), |
|
| 168 | + 'url' => admin_url('admin-ajax.php'),
|
|
| 169 | + 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
|
|
| 170 | + 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
|
|
| 171 | + 'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
|
|
| 172 | + 'multipart' => true, |
|
| 173 | + 'urlstream_upload' => true, |
|
| 174 | + 'multi_selection' => false, // will be added per uploader |
|
| 175 | + // additional post data to send to our ajax hook |
|
| 176 | + 'multipart_params' => array( |
|
| 177 | + '_ajax_nonce' => "", // will be added per uploader |
|
| 178 | + 'action' => 'plupload_action', // the ajax action name |
|
| 179 | + 'imgid' => 0 // will be added per uploader |
|
| 180 | + ) |
|
| 181 | + ); |
|
| 182 | + $base_plupload_config = json_encode($plupload_init); |
|
| 183 | + |
|
| 184 | + |
|
| 185 | + $thumb_img_arr = array(); |
|
| 186 | + |
|
| 187 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 188 | + $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
| 189 | + |
|
| 190 | + $totImg = ''; |
|
| 191 | + $image_limit = ''; |
|
| 192 | + if (!empty($thumb_img_arr)) {
|
|
| 193 | + $totImg = count($thumb_img_arr); |
|
| 194 | + } |
|
| 195 | 195 | |
| 196 | - $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
|
|
| 197 | - 'totalImg' => $totImg, |
|
| 198 | - 'image_limit' => $image_limit, |
|
| 199 | - 'upload_img_size' => geodir_max_upload_size()); |
|
| 196 | + $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
|
|
| 197 | + 'totalImg' => $totImg, |
|
| 198 | + 'image_limit' => $image_limit, |
|
| 199 | + 'upload_img_size' => geodir_max_upload_size()); |
|
| 200 | 200 | |
| 201 | - wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
|
| 201 | + wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
|
| 202 | 202 | |
| 203 | - $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));
|
|
| 204 | - wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);
|
|
| 203 | + $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));
|
|
| 204 | + wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);
|
|
| 205 | 205 | |
| 206 | 206 | |
| 207 | - wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
| 208 | - wp_enqueue_script('geodirectory-admin-script');
|
|
| 207 | + wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
| 208 | + wp_enqueue_script('geodirectory-admin-script');
|
|
| 209 | 209 | |
| 210 | - wp_enqueue_style('farbtastic');
|
|
| 211 | - wp_enqueue_script('farbtastic');
|
|
| 210 | + wp_enqueue_style('farbtastic');
|
|
| 211 | + wp_enqueue_script('farbtastic');
|
|
| 212 | 212 | |
| 213 | - $screen = get_current_screen(); |
|
| 214 | - if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {
|
|
| 215 | - wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');
|
|
| 216 | - } |
|
| 213 | + $screen = get_current_screen(); |
|
| 214 | + if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {
|
|
| 215 | + wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');
|
|
| 216 | + } |
|
| 217 | 217 | |
| 218 | - $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
|
|
| 219 | - wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
|
|
| 218 | + $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
|
|
| 219 | + wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
|
|
| 220 | 220 | |
| 221 | - } |
|
| 221 | + } |
|
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | if (!function_exists('geodir_admin_menu')) {
|
| 225 | - /** |
|
| 226 | - * Admin Menus |
|
| 227 | - * |
|
| 228 | - * Sets up the admin menus in wordpress. |
|
| 229 | - * |
|
| 230 | - * @since 1.0.0 |
|
| 231 | - * @package GeoDirectory |
|
| 232 | - * @global array $menu Menu array. |
|
| 233 | - * @global object $geodirectory GeoDirectory plugin object. |
|
| 234 | - */ |
|
| 235 | - function geodir_admin_menu() |
|
| 236 | - {
|
|
| 237 | - global $menu, $geodirectory; |
|
| 225 | + /** |
|
| 226 | + * Admin Menus |
|
| 227 | + * |
|
| 228 | + * Sets up the admin menus in wordpress. |
|
| 229 | + * |
|
| 230 | + * @since 1.0.0 |
|
| 231 | + * @package GeoDirectory |
|
| 232 | + * @global array $menu Menu array. |
|
| 233 | + * @global object $geodirectory GeoDirectory plugin object. |
|
| 234 | + */ |
|
| 235 | + function geodir_admin_menu() |
|
| 236 | + {
|
|
| 237 | + global $menu, $geodirectory; |
|
| 238 | 238 | |
| 239 | - if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
|
|
| 239 | + if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
|
|
| 240 | 240 | |
| 241 | - add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
|
|
| 241 | + add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
|
|
| 242 | 242 | |
| 243 | 243 | |
| 244 | - } |
|
| 244 | + } |
|
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | if (!function_exists('geodir_admin_menu_order')) {
|
| 248 | - /** |
|
| 249 | - * Order admin menus. |
|
| 250 | - * |
|
| 251 | - * @since 1.0.0 |
|
| 252 | - * @package GeoDirectory |
|
| 253 | - * @param array $menu_order Menu order array. |
|
| 254 | - * @return array Modified menu order array. |
|
| 255 | - */ |
|
| 256 | - function geodir_admin_menu_order($menu_order) |
|
| 257 | - {
|
|
| 258 | - |
|
| 259 | - // Initialize our custom order array |
|
| 260 | - $geodir_menu_order = array(); |
|
| 261 | - |
|
| 262 | - // Get the index of our custom separator |
|
| 263 | - $geodir_separator = array_search('separator-geodirectory', $menu_order);
|
|
| 264 | - |
|
| 265 | - // Get index of posttype menu |
|
| 266 | - $post_types = geodir_get_posttypes(); |
|
| 267 | - |
|
| 268 | - // Loop through menu order and do some rearranging |
|
| 269 | - foreach ($menu_order as $index => $item) : |
|
| 270 | - |
|
| 271 | - if ((('geodirectory') == $item)) :
|
|
| 272 | - $geodir_menu_order[] = 'separator-geodirectory'; |
|
| 273 | - if (!empty($post_types)) {
|
|
| 274 | - foreach ($post_types as $post_type) {
|
|
| 275 | - $geodir_menu_order[] = 'edit.php?post_type=' . $post_type; |
|
| 276 | - } |
|
| 277 | - } |
|
| 278 | - $geodir_menu_order[] = $item; |
|
| 248 | + /** |
|
| 249 | + * Order admin menus. |
|
| 250 | + * |
|
| 251 | + * @since 1.0.0 |
|
| 252 | + * @package GeoDirectory |
|
| 253 | + * @param array $menu_order Menu order array. |
|
| 254 | + * @return array Modified menu order array. |
|
| 255 | + */ |
|
| 256 | + function geodir_admin_menu_order($menu_order) |
|
| 257 | + {
|
|
| 279 | 258 | |
| 280 | - unset($menu_order[$geodir_separator]); |
|
| 281 | - //unset( $menu_order[$geodir_places] ); |
|
| 282 | - elseif (!in_array($item, array('separator-geodirectory'))) :
|
|
| 283 | - $geodir_menu_order[] = $item; |
|
| 284 | - endif; |
|
| 259 | + // Initialize our custom order array |
|
| 260 | + $geodir_menu_order = array(); |
|
| 285 | 261 | |
| 286 | - endforeach; |
|
| 262 | + // Get the index of our custom separator |
|
| 263 | + $geodir_separator = array_search('separator-geodirectory', $menu_order);
|
|
| 287 | 264 | |
| 288 | - // Return order |
|
| 289 | - return $geodir_menu_order; |
|
| 290 | - } |
|
| 265 | + // Get index of posttype menu |
|
| 266 | + $post_types = geodir_get_posttypes(); |
|
| 267 | + |
|
| 268 | + // Loop through menu order and do some rearranging |
|
| 269 | + foreach ($menu_order as $index => $item) : |
|
| 270 | + |
|
| 271 | + if ((('geodirectory') == $item)) :
|
|
| 272 | + $geodir_menu_order[] = 'separator-geodirectory'; |
|
| 273 | + if (!empty($post_types)) {
|
|
| 274 | + foreach ($post_types as $post_type) {
|
|
| 275 | + $geodir_menu_order[] = 'edit.php?post_type=' . $post_type; |
|
| 276 | + } |
|
| 277 | + } |
|
| 278 | + $geodir_menu_order[] = $item; |
|
| 279 | + |
|
| 280 | + unset($menu_order[$geodir_separator]); |
|
| 281 | + //unset( $menu_order[$geodir_places] ); |
|
| 282 | + elseif (!in_array($item, array('separator-geodirectory'))) :
|
|
| 283 | + $geodir_menu_order[] = $item; |
|
| 284 | + endif; |
|
| 285 | + |
|
| 286 | + endforeach; |
|
| 287 | + |
|
| 288 | + // Return order |
|
| 289 | + return $geodir_menu_order; |
|
| 290 | + } |
|
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | if (!function_exists('geodir_admin_custom_menu_order')) {
|
| 294 | - /** |
|
| 295 | - * Enables custom menu order. |
|
| 296 | - * |
|
| 297 | - * @since 1.0.0 |
|
| 298 | - * @package GeoDirectory |
|
| 299 | - * @return bool |
|
| 300 | - */ |
|
| 301 | - function geodir_admin_custom_menu_order() |
|
| 302 | - {
|
|
| 303 | - if (!current_user_can('manage_options')) return false;
|
|
| 304 | - return true; |
|
| 305 | - } |
|
| 294 | + /** |
|
| 295 | + * Enables custom menu order. |
|
| 296 | + * |
|
| 297 | + * @since 1.0.0 |
|
| 298 | + * @package GeoDirectory |
|
| 299 | + * @return bool |
|
| 300 | + */ |
|
| 301 | + function geodir_admin_custom_menu_order() |
|
| 302 | + {
|
|
| 303 | + if (!current_user_can('manage_options')) return false;
|
|
| 304 | + return true; |
|
| 305 | + } |
|
| 306 | 306 | } |
| 307 | 307 | |
| 308 | 308 | /** |
@@ -313,51 +313,51 @@ discard block |
||
| 313 | 313 | */ |
| 314 | 314 | function geodir_before_admin_panel() |
| 315 | 315 | {
|
| 316 | - if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
|
|
| 317 | - echo '<div id="message" class="updated fade"> |
|
| 316 | + if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
|
|
| 317 | + echo '<div id="message" class="updated fade"> |
|
| 318 | 318 | <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>
|
| 319 | 319 | <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>
|
| 320 | 320 | </div>'; |
| 321 | 321 | |
| 322 | - } |
|
| 322 | + } |
|
| 323 | 323 | |
| 324 | - if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
|
|
| 325 | - switch ($_REQUEST['msg']) {
|
|
| 326 | - case 'success': |
|
| 327 | - echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
|
|
| 328 | - flush_rewrite_rules(false); |
|
| 324 | + if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
|
|
| 325 | + switch ($_REQUEST['msg']) {
|
|
| 326 | + case 'success': |
|
| 327 | + echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
|
|
| 328 | + flush_rewrite_rules(false); |
|
| 329 | 329 | |
| 330 | - break; |
|
| 330 | + break; |
|
| 331 | 331 | case 'fail': |
| 332 | 332 | $gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : ''; |
| 333 | 333 | |
| 334 | 334 | if ($gderr == 21) |
| 335 | - 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>';
|
|
| 335 | + 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>';
|
|
| 336 | 336 | else |
| 337 | 337 | echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
|
| 338 | - break; |
|
| 339 | - } |
|
| 340 | - } |
|
| 338 | + break; |
|
| 339 | + } |
|
| 340 | + } |
|
| 341 | 341 | |
| 342 | - $geodir_load_map = get_option('geodir_load_map');
|
|
| 343 | - $need_map_key = false; |
|
| 344 | - if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
|
|
| 345 | - $need_map_key = true; |
|
| 346 | - } |
|
| 342 | + $geodir_load_map = get_option('geodir_load_map');
|
|
| 343 | + $need_map_key = false; |
|
| 344 | + if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
|
|
| 345 | + $need_map_key = true; |
|
| 346 | + } |
|
| 347 | 347 | |
| 348 | - if (!geodir_get_map_api_key() && $need_map_key) {
|
|
| 349 | - 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>';
|
|
| 350 | - } |
|
| 348 | + if (!geodir_get_map_api_key() && $need_map_key) {
|
|
| 349 | + 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>';
|
|
| 350 | + } |
|
| 351 | 351 | |
| 352 | - if (!geodir_is_default_location_set()) {
|
|
| 353 | - 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>';
|
|
| 352 | + if (!geodir_is_default_location_set()) {
|
|
| 353 | + 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>';
|
|
| 354 | 354 | |
| 355 | - } |
|
| 355 | + } |
|
| 356 | 356 | |
| 357 | - if (!function_exists('curl_init')) {
|
|
| 358 | - 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>';
|
|
| 357 | + if (!function_exists('curl_init')) {
|
|
| 358 | + 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>';
|
|
| 359 | 359 | |
| 360 | - } |
|
| 360 | + } |
|
| 361 | 361 | |
| 362 | 362 | |
| 363 | 363 | |
@@ -374,19 +374,19 @@ discard block |
||
| 374 | 374 | */ |
| 375 | 375 | function geodir_handle_option_form_submit($current_tab) |
| 376 | 376 | {
|
| 377 | - global $geodir_settings; |
|
| 378 | - if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
|
|
| 379 | - /** |
|
| 380 | - * Contains settings array for current tab. |
|
| 381 | - * |
|
| 382 | - * @since 1.0.0 |
|
| 383 | - * @package GeoDirectory |
|
| 384 | - */ |
|
| 385 | - include_once('option-pages/' . $current_tab . '_array.php');
|
|
| 386 | - } |
|
| 387 | - if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') : |
|
| 388 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 389 | - if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 377 | + global $geodir_settings; |
|
| 378 | + if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
|
|
| 379 | + /** |
|
| 380 | + * Contains settings array for current tab. |
|
| 381 | + * |
|
| 382 | + * @since 1.0.0 |
|
| 383 | + * @package GeoDirectory |
|
| 384 | + */ |
|
| 385 | + include_once('option-pages/' . $current_tab . '_array.php');
|
|
| 386 | + } |
|
| 387 | + if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') : |
|
| 388 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 389 | + if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 390 | 390 | |
| 391 | 391 | /** |
| 392 | 392 | * Fires before updating geodirectory admin settings. |
@@ -398,38 +398,38 @@ discard block |
||
| 398 | 398 | */ |
| 399 | 399 | do_action('geodir_before_update_options', $current_tab, $geodir_settings);
|
| 400 | 400 | |
| 401 | - if (!empty($geodir_settings[$current_tab])) |
|
| 402 | - geodir_update_options($geodir_settings[$current_tab]); |
|
| 401 | + if (!empty($geodir_settings[$current_tab])) |
|
| 402 | + geodir_update_options($geodir_settings[$current_tab]); |
|
| 403 | 403 | |
| 404 | - /** |
|
| 405 | - * Called after GeoDirectory options settings are updated. |
|
| 406 | - * |
|
| 407 | - * @since 1.0.0 |
|
| 408 | - * @param array $geodir_settings The array of GeoDirectory settings. |
|
| 409 | - * @see 'geodir_before_update_options' |
|
| 410 | - */ |
|
| 411 | - do_action('geodir_update_options', $geodir_settings);
|
|
| 404 | + /** |
|
| 405 | + * Called after GeoDirectory options settings are updated. |
|
| 406 | + * |
|
| 407 | + * @since 1.0.0 |
|
| 408 | + * @param array $geodir_settings The array of GeoDirectory settings. |
|
| 409 | + * @see 'geodir_before_update_options' |
|
| 410 | + */ |
|
| 411 | + do_action('geodir_update_options', $geodir_settings);
|
|
| 412 | 412 | |
| 413 | - /** |
|
| 414 | - * Called after GeoDirectory options settings are updated. |
|
| 415 | - * |
|
| 416 | - * Provides tab specific settings. |
|
| 417 | - * |
|
| 418 | - * @since 1.0.0 |
|
| 419 | - * @param string $current_tab The current settings tab name. |
|
| 420 | - * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab. |
|
| 421 | - */ |
|
| 422 | - do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
|
|
| 413 | + /** |
|
| 414 | + * Called after GeoDirectory options settings are updated. |
|
| 415 | + * |
|
| 416 | + * Provides tab specific settings. |
|
| 417 | + * |
|
| 418 | + * @since 1.0.0 |
|
| 419 | + * @param string $current_tab The current settings tab name. |
|
| 420 | + * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab. |
|
| 421 | + */ |
|
| 422 | + do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
|
|
| 423 | 423 | |
| 424 | - flush_rewrite_rules(false); |
|
| 424 | + flush_rewrite_rules(false); |
|
| 425 | 425 | |
| 426 | - $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : ''; |
|
| 426 | + $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : ''; |
|
| 427 | 427 | |
| 428 | - $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');
|
|
| 428 | + $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');
|
|
| 429 | 429 | |
| 430 | - wp_redirect($redirect_url); |
|
| 431 | - exit(); |
|
| 432 | - endif; |
|
| 430 | + wp_redirect($redirect_url); |
|
| 431 | + exit(); |
|
| 432 | + endif; |
|
| 433 | 433 | |
| 434 | 434 | |
| 435 | 435 | } |
@@ -447,144 +447,144 @@ discard block |
||
| 447 | 447 | * @return bool Returns true if saved. |
| 448 | 448 | */ |
| 449 | 449 | function geodir_update_options($options, $dummy = false) {
|
| 450 | - if ((!isset($_POST) || !$_POST) && !$dummy) return false; |
|
| 450 | + if ((!isset($_POST) || !$_POST) && !$dummy) return false; |
|
| 451 | 451 | |
| 452 | - foreach ($options as $value) {
|
|
| 453 | - if ($dummy && isset($value['std'])) |
|
| 454 | - $_POST[$value['id']] = $value['std']; |
|
| 452 | + foreach ($options as $value) {
|
|
| 453 | + if ($dummy && isset($value['std'])) |
|
| 454 | + $_POST[$value['id']] = $value['std']; |
|
| 455 | 455 | |
| 456 | 456 | |
| 457 | - if (isset($value['type']) && $value['type'] == 'checkbox') : |
|
| 457 | + if (isset($value['type']) && $value['type'] == 'checkbox') : |
|
| 458 | 458 | |
| 459 | - if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 460 | - update_option($value['id'], $_POST[$value['id']]); |
|
| 461 | - } else {
|
|
| 462 | - update_option($value['id'], 0); |
|
| 463 | - } |
|
| 459 | + if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 460 | + update_option($value['id'], $_POST[$value['id']]); |
|
| 461 | + } else {
|
|
| 462 | + update_option($value['id'], 0); |
|
| 463 | + } |
|
| 464 | 464 | |
| 465 | - elseif (isset($value['type']) && $value['type'] == 'image_width') : |
|
| 465 | + elseif (isset($value['type']) && $value['type'] == 'image_width') : |
|
| 466 | 466 | |
| 467 | - if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
|
|
| 468 | - update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']); |
|
| 469 | - update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']); |
|
| 470 | - if (isset($_POST[$value['id'] . '_crop'])) : |
|
| 471 | - update_option($value['id'] . '_crop', 1); |
|
| 472 | - else : |
|
| 473 | - update_option($value['id'] . '_crop', 0); |
|
| 474 | - endif; |
|
| 475 | - } else {
|
|
| 476 | - update_option($value['id'] . '_width', $value['std']); |
|
| 477 | - update_option($value['id'] . '_height', $value['std']); |
|
| 478 | - update_option($value['id'] . '_crop', 1); |
|
| 479 | - } |
|
| 467 | + if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
|
|
| 468 | + update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']); |
|
| 469 | + update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']); |
|
| 470 | + if (isset($_POST[$value['id'] . '_crop'])) : |
|
| 471 | + update_option($value['id'] . '_crop', 1); |
|
| 472 | + else : |
|
| 473 | + update_option($value['id'] . '_crop', 0); |
|
| 474 | + endif; |
|
| 475 | + } else {
|
|
| 476 | + update_option($value['id'] . '_width', $value['std']); |
|
| 477 | + update_option($value['id'] . '_height', $value['std']); |
|
| 478 | + update_option($value['id'] . '_crop', 1); |
|
| 479 | + } |
|
| 480 | 480 | |
| 481 | - elseif (isset($value['type']) && $value['type'] == 'map') : |
|
| 482 | - $post_types = array(); |
|
| 483 | - $categories = array(); |
|
| 481 | + elseif (isset($value['type']) && $value['type'] == 'map') : |
|
| 482 | + $post_types = array(); |
|
| 483 | + $categories = array(); |
|
| 484 | 484 | |
| 485 | - if (!empty($_POST['home_map_post_types'])) : |
|
| 486 | - foreach ($_POST['home_map_post_types'] as $post_type) : |
|
| 487 | - $post_types[] = $post_type; |
|
| 488 | - endforeach; |
|
| 489 | - endif; |
|
| 485 | + if (!empty($_POST['home_map_post_types'])) : |
|
| 486 | + foreach ($_POST['home_map_post_types'] as $post_type) : |
|
| 487 | + $post_types[] = $post_type; |
|
| 488 | + endforeach; |
|
| 489 | + endif; |
|
| 490 | 490 | |
| 491 | - update_option('geodir_exclude_post_type_on_map', $post_types);
|
|
| 491 | + update_option('geodir_exclude_post_type_on_map', $post_types);
|
|
| 492 | 492 | |
| 493 | - if (!empty($_POST['post_category'])) : |
|
| 494 | - foreach ($_POST['post_category'] as $texonomy => $cat_arr) : |
|
| 495 | - $categories[$texonomy] = array(); |
|
| 496 | - foreach ($cat_arr as $category) : |
|
| 497 | - $categories[$texonomy][] = $category; |
|
| 498 | - endforeach; |
|
| 499 | - $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array(); |
|
| 500 | - endforeach; |
|
| 501 | - endif; |
|
| 502 | - update_option('geodir_exclude_cat_on_map', $categories);
|
|
| 503 | - update_option('geodir_exclude_cat_on_map_upgrade', 1);
|
|
| 504 | - elseif (isset($value['type']) && $value['type'] == 'map_default_settings') : |
|
| 493 | + if (!empty($_POST['post_category'])) : |
|
| 494 | + foreach ($_POST['post_category'] as $texonomy => $cat_arr) : |
|
| 495 | + $categories[$texonomy] = array(); |
|
| 496 | + foreach ($cat_arr as $category) : |
|
| 497 | + $categories[$texonomy][] = $category; |
|
| 498 | + endforeach; |
|
| 499 | + $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array(); |
|
| 500 | + endforeach; |
|
| 501 | + endif; |
|
| 502 | + update_option('geodir_exclude_cat_on_map', $categories);
|
|
| 503 | + update_option('geodir_exclude_cat_on_map_upgrade', 1);
|
|
| 504 | + elseif (isset($value['type']) && $value['type'] == 'map_default_settings') : |
|
| 505 | 505 | |
| 506 | 506 | |
| 507 | - if (!empty($_POST['geodir_default_map_language'])): |
|
| 508 | - update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);
|
|
| 509 | - endif; |
|
| 507 | + if (!empty($_POST['geodir_default_map_language'])): |
|
| 508 | + update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);
|
|
| 509 | + endif; |
|
| 510 | 510 | |
| 511 | 511 | |
| 512 | - if (!empty($_POST['geodir_default_map_search_pt'])): |
|
| 513 | - update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);
|
|
| 514 | - endif; |
|
| 512 | + if (!empty($_POST['geodir_default_map_search_pt'])): |
|
| 513 | + update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);
|
|
| 514 | + endif; |
|
| 515 | 515 | |
| 516 | 516 | |
| 517 | - elseif (isset($value['type']) && $value['type'] == 'file') : |
|
| 517 | + elseif (isset($value['type']) && $value['type'] == 'file') : |
|
| 518 | 518 | |
| 519 | 519 | |
| 520 | - if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file
|
|
| 520 | + if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file
|
|
| 521 | 521 | |
| 522 | - if (get_option($value['id'])) {
|
|
| 523 | - $image_name_arr = explode('/', get_option($value['id']));
|
|
| 524 | - $noimg_name = end($image_name_arr); |
|
| 525 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 526 | - if (file_exists($img_path)) |
|
| 527 | - unlink($img_path); |
|
| 528 | - } |
|
| 522 | + if (get_option($value['id'])) {
|
|
| 523 | + $image_name_arr = explode('/', get_option($value['id']));
|
|
| 524 | + $noimg_name = end($image_name_arr); |
|
| 525 | + $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 526 | + if (file_exists($img_path)) |
|
| 527 | + unlink($img_path); |
|
| 528 | + } |
|
| 529 | 529 | |
| 530 | - update_option($value['id'], ''); |
|
| 531 | - } |
|
| 530 | + update_option($value['id'], ''); |
|
| 531 | + } |
|
| 532 | 532 | |
| 533 | - $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : ''; |
|
| 534 | - $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : ''; |
|
| 535 | - |
|
| 536 | - if (!empty($filename)): |
|
| 537 | - $ext = pathinfo($filename, PATHINFO_EXTENSION); |
|
| 538 | - $uplaods = array(); |
|
| 539 | - |
|
| 540 | - foreach ($uploadedfile as $key => $uplaod): |
|
| 541 | - if ($key == 'name'): |
|
| 542 | - $uplaods[$key] = $filename; |
|
| 543 | - else : |
|
| 544 | - $uplaods[$key] = $uplaod; |
|
| 545 | - endif; |
|
| 546 | - endforeach; |
|
| 547 | - |
|
| 548 | - $uploads = wp_upload_dir(); |
|
| 549 | - |
|
| 550 | - if (get_option($value['id'])) {
|
|
| 551 | - $image_name_arr = explode('/', get_option($value['id']));
|
|
| 552 | - $noimg_name = end($image_name_arr); |
|
| 553 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 554 | - if (file_exists($img_path)) |
|
| 555 | - unlink($img_path); |
|
| 556 | - } |
|
| 533 | + $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : ''; |
|
| 534 | + $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : ''; |
|
| 535 | + |
|
| 536 | + if (!empty($filename)): |
|
| 537 | + $ext = pathinfo($filename, PATHINFO_EXTENSION); |
|
| 538 | + $uplaods = array(); |
|
| 539 | + |
|
| 540 | + foreach ($uploadedfile as $key => $uplaod): |
|
| 541 | + if ($key == 'name'): |
|
| 542 | + $uplaods[$key] = $filename; |
|
| 543 | + else : |
|
| 544 | + $uplaods[$key] = $uplaod; |
|
| 545 | + endif; |
|
| 546 | + endforeach; |
|
| 547 | + |
|
| 548 | + $uploads = wp_upload_dir(); |
|
| 549 | + |
|
| 550 | + if (get_option($value['id'])) {
|
|
| 551 | + $image_name_arr = explode('/', get_option($value['id']));
|
|
| 552 | + $noimg_name = end($image_name_arr); |
|
| 553 | + $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 554 | + if (file_exists($img_path)) |
|
| 555 | + unlink($img_path); |
|
| 556 | + } |
|
| 557 | 557 | |
| 558 | - $upload_overrides = array('test_form' => false);
|
|
| 559 | - $movefile = wp_handle_upload($uplaods, $upload_overrides); |
|
| 558 | + $upload_overrides = array('test_form' => false);
|
|
| 559 | + $movefile = wp_handle_upload($uplaods, $upload_overrides); |
|
| 560 | 560 | |
| 561 | - update_option($value['id'], $movefile['url']); |
|
| 561 | + update_option($value['id'], $movefile['url']); |
|
| 562 | 562 | |
| 563 | - endif; |
|
| 563 | + endif; |
|
| 564 | 564 | |
| 565 | - if (!get_option($value['id']) && isset($value['value'])): |
|
| 566 | - update_option($value['id'], $value['value']); |
|
| 567 | - endif; |
|
| 565 | + if (!get_option($value['id']) && isset($value['value'])): |
|
| 566 | + update_option($value['id'], $value['value']); |
|
| 567 | + endif; |
|
| 568 | 568 | |
| 569 | 569 | |
| 570 | - else : |
|
| 571 | - // same menu setting per theme. |
|
| 572 | - if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
|
|
| 573 | - $theme = wp_get_theme(); |
|
| 574 | - update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
|
|
| 575 | - } |
|
| 570 | + else : |
|
| 571 | + // same menu setting per theme. |
|
| 572 | + if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
|
|
| 573 | + $theme = wp_get_theme(); |
|
| 574 | + update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
|
|
| 575 | + } |
|
| 576 | 576 | |
| 577 | - if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 578 | - update_option($value['id'], $_POST[$value['id']]); |
|
| 579 | - } else {
|
|
| 580 | - delete_option($value['id']); |
|
| 581 | - } |
|
| 577 | + if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 578 | + update_option($value['id'], $_POST[$value['id']]); |
|
| 579 | + } else {
|
|
| 580 | + delete_option($value['id']); |
|
| 581 | + } |
|
| 582 | 582 | |
| 583 | - endif; |
|
| 584 | - } |
|
| 585 | - if ($dummy) |
|
| 586 | - $_POST = array(); |
|
| 587 | - return true; |
|
| 583 | + endif; |
|
| 584 | + } |
|
| 585 | + if ($dummy) |
|
| 586 | + $_POST = array(); |
|
| 587 | + return true; |
|
| 588 | 588 | |
| 589 | 589 | } |
| 590 | 590 | |
@@ -633,33 +633,33 @@ discard block |
||
| 633 | 633 | function places_custom_fields_tab($tabs) |
| 634 | 634 | {
|
| 635 | 635 | |
| 636 | - $geodir_post_types = get_option('geodir_post_types');
|
|
| 636 | + $geodir_post_types = get_option('geodir_post_types');
|
|
| 637 | 637 | |
| 638 | - if (!empty($geodir_post_types)) {
|
|
| 638 | + if (!empty($geodir_post_types)) {
|
|
| 639 | 639 | |
| 640 | - foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info): |
|
| 640 | + foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info): |
|
| 641 | 641 | |
| 642 | - $listing_slug = $geodir_posttype_info['labels']['singular_name']; |
|
| 642 | + $listing_slug = $geodir_posttype_info['labels']['singular_name']; |
|
| 643 | 643 | |
| 644 | - $tabs[$geodir_post_type . '_fields_settings'] = array( |
|
| 645 | - 'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'), |
|
| 646 | - 'subtabs' => array( |
|
| 647 | - array('subtab' => 'custom_fields',
|
|
| 648 | - 'label' => __('Custom Fields', 'geodirectory'),
|
|
| 649 | - 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 650 | - array('subtab' => 'sorting_options',
|
|
| 651 | - 'label' => __('Sorting Options', 'geodirectory'),
|
|
| 652 | - 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 653 | - ), |
|
| 654 | - 'tab_index' => 9, |
|
| 655 | - 'request' => array('listing_type' => $geodir_post_type)
|
|
| 656 | - ); |
|
| 644 | + $tabs[$geodir_post_type . '_fields_settings'] = array( |
|
| 645 | + 'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'), |
|
| 646 | + 'subtabs' => array( |
|
| 647 | + array('subtab' => 'custom_fields',
|
|
| 648 | + 'label' => __('Custom Fields', 'geodirectory'),
|
|
| 649 | + 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 650 | + array('subtab' => 'sorting_options',
|
|
| 651 | + 'label' => __('Sorting Options', 'geodirectory'),
|
|
| 652 | + 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 653 | + ), |
|
| 654 | + 'tab_index' => 9, |
|
| 655 | + 'request' => array('listing_type' => $geodir_post_type)
|
|
| 656 | + ); |
|
| 657 | 657 | |
| 658 | - endforeach; |
|
| 658 | + endforeach; |
|
| 659 | 659 | |
| 660 | - } |
|
| 660 | + } |
|
| 661 | 661 | |
| 662 | - return $tabs; |
|
| 662 | + return $tabs; |
|
| 663 | 663 | } |
| 664 | 664 | |
| 665 | 665 | |
@@ -675,9 +675,9 @@ discard block |
||
| 675 | 675 | */ |
| 676 | 676 | function geodir_tools_setting_tab($tabs) |
| 677 | 677 | {
|
| 678 | - wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
| 679 | - $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
|
|
| 680 | - return $tabs; |
|
| 678 | + wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
| 679 | + $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
|
|
| 680 | + return $tabs; |
|
| 681 | 681 | } |
| 682 | 682 | |
| 683 | 683 | /** |
@@ -692,8 +692,8 @@ discard block |
||
| 692 | 692 | */ |
| 693 | 693 | function geodir_compatibility_setting_tab($tabs) |
| 694 | 694 | {
|
| 695 | - $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));
|
|
| 696 | - return $tabs; |
|
| 695 | + $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));
|
|
| 696 | + return $tabs; |
|
| 697 | 697 | } |
| 698 | 698 | |
| 699 | 699 | |
@@ -709,144 +709,144 @@ discard block |
||
| 709 | 709 | */ |
| 710 | 710 | function geodir_extend_geodirectory_setting_tab($tabs) |
| 711 | 711 | {
|
| 712 | - $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
| 713 | - return $tabs; |
|
| 712 | + $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
| 713 | + return $tabs; |
|
| 714 | 714 | } |
| 715 | 715 | |
| 716 | 716 | |
| 717 | 717 | if (!function_exists('geodir_edit_post_columns')) {
|
| 718 | - /** |
|
| 719 | - * Modify admin post listing page columns. |
|
| 720 | - * |
|
| 721 | - * @since 1.0.0 |
|
| 722 | - * @package GeoDirectory |
|
| 723 | - * @param array $columns The column array. |
|
| 724 | - * @return array Altered column array. |
|
| 725 | - */ |
|
| 726 | - function geodir_edit_post_columns($columns) |
|
| 727 | - {
|
|
| 728 | - |
|
| 729 | - $new_columns = array('location' => __('Location (ID)', 'geodirectory'),
|
|
| 730 | - 'categorys' => __('Categories', 'geodirectory'));
|
|
| 731 | - |
|
| 732 | - if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist
|
|
| 733 | - {
|
|
| 734 | - $offset = 0; // should we prepend $array with $data? |
|
| 735 | - $offset = count($columns); // or should we append $array with $data? lets pick this one... |
|
| 736 | - } |
|
| 718 | + /** |
|
| 719 | + * Modify admin post listing page columns. |
|
| 720 | + * |
|
| 721 | + * @since 1.0.0 |
|
| 722 | + * @package GeoDirectory |
|
| 723 | + * @param array $columns The column array. |
|
| 724 | + * @return array Altered column array. |
|
| 725 | + */ |
|
| 726 | + function geodir_edit_post_columns($columns) |
|
| 727 | + {
|
|
| 737 | 728 | |
| 738 | - $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset)); |
|
| 729 | + $new_columns = array('location' => __('Location (ID)', 'geodirectory'),
|
|
| 730 | + 'categorys' => __('Categories', 'geodirectory'));
|
|
| 739 | 731 | |
| 740 | - $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));
|
|
| 732 | + if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist
|
|
| 733 | + {
|
|
| 734 | + $offset = 0; // should we prepend $array with $data? |
|
| 735 | + $offset = count($columns); // or should we append $array with $data? lets pick this one... |
|
| 736 | + } |
|
| 741 | 737 | |
| 742 | - return $columns; |
|
| 743 | - } |
|
| 738 | + $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset)); |
|
| 739 | + |
|
| 740 | + $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));
|
|
| 741 | + |
|
| 742 | + return $columns; |
|
| 743 | + } |
|
| 744 | 744 | } |
| 745 | 745 | |
| 746 | 746 | |
| 747 | 747 | if (!function_exists('geodir_manage_post_columns')) {
|
| 748 | - /** |
|
| 749 | - * Adds content to our custom post listing page columns. |
|
| 750 | - * |
|
| 751 | - * @since 1.0.0 |
|
| 752 | - * @package GeoDirectory |
|
| 753 | - * @global object $wpdb WordPress Database object. |
|
| 754 | - * @global object $post WordPress Post object. |
|
| 755 | - * @param string $column The column name. |
|
| 756 | - * @param int $post_id The post ID. |
|
| 757 | - */ |
|
| 758 | - function geodir_manage_post_columns($column, $post_id) |
|
| 759 | - {
|
|
| 760 | - global $post, $wpdb; |
|
| 761 | - |
|
| 762 | - switch ($column): |
|
| 763 | - /* If displaying the 'city' column. */ |
|
| 764 | - case 'location' : |
|
| 765 | - $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true); |
|
| 766 | - $location = geodir_get_location($location_id); |
|
| 767 | - /* If no city is found, output a default message. */ |
|
| 768 | - if (empty($location)) {
|
|
| 769 | - _e('Unknown', 'geodirectory');
|
|
| 770 | - } else {
|
|
| 771 | - /* If there is a city id, append 'city name' to the text string. */ |
|
| 772 | - $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';
|
|
| 773 | - echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id); |
|
| 774 | - } |
|
| 775 | - break; |
|
| 776 | - |
|
| 777 | - /* If displaying the 'expire' column. */ |
|
| 778 | - case 'expire' : |
|
| 779 | - $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true); |
|
| 780 | - $d1 = $expire_date; // get expire_date |
|
| 781 | - $d2 = date('Y-m-d'); // get current date
|
|
| 782 | - $state = __('days left', 'geodirectory');
|
|
| 783 | - $date_diff_text = ''; |
|
| 784 | - $expire_class = 'expire_left'; |
|
| 785 | - if ($expire_date != 'Never') {
|
|
| 786 | - if (strtotime($d1) < strtotime($d2)) {
|
|
| 787 | - $state = __('days overdue', 'geodirectory');
|
|
| 788 | - $expire_class = 'expire_over'; |
|
| 789 | - } |
|
| 790 | - $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days |
|
| 791 | - $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
|
|
| 792 | - } |
|
| 793 | - /* If no expire_date is found, output a default message. */ |
|
| 794 | - if (empty($expire_date)) |
|
| 795 | - echo __('Unknown', 'geodirectory');
|
|
| 796 | - /* If there is a expire_date, append 'days left' to the text string. */ |
|
| 797 | - else |
|
| 798 | - echo $expire_date . $date_diff_text; |
|
| 799 | - break; |
|
| 800 | - |
|
| 801 | - /* If displaying the 'categorys' column. */ |
|
| 802 | - case 'categorys' : |
|
| 803 | - |
|
| 804 | - /* Get the categorys for the post. */ |
|
| 805 | - |
|
| 806 | - |
|
| 807 | - $terms = wp_get_object_terms($post_id, get_object_taxonomies($post)); |
|
| 808 | - |
|
| 809 | - /* If terms were found. */ |
|
| 810 | - if (!empty($terms)) {
|
|
| 811 | - $out = array(); |
|
| 812 | - /* Loop through each term, linking to the 'edit posts' page for the specific term. */ |
|
| 813 | - foreach ($terms as $term) {
|
|
| 814 | - if (!strstr($term->taxonomy, 'tag')) {
|
|
| 815 | - $out[] = sprintf('<a href="%s">%s</a>',
|
|
| 816 | - esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),
|
|
| 817 | - esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))
|
|
| 818 | - ); |
|
| 819 | - } |
|
| 820 | - } |
|
| 821 | - /* Join the terms, separating them with a comma. */ |
|
| 822 | - echo(join(', ', $out));
|
|
| 823 | - } /* If no terms were found, output a default message. */ |
|
| 824 | - else {
|
|
| 825 | - _e('No Categories', 'geodirectory');
|
|
| 826 | - } |
|
| 827 | - break; |
|
| 748 | + /** |
|
| 749 | + * Adds content to our custom post listing page columns. |
|
| 750 | + * |
|
| 751 | + * @since 1.0.0 |
|
| 752 | + * @package GeoDirectory |
|
| 753 | + * @global object $wpdb WordPress Database object. |
|
| 754 | + * @global object $post WordPress Post object. |
|
| 755 | + * @param string $column The column name. |
|
| 756 | + * @param int $post_id The post ID. |
|
| 757 | + */ |
|
| 758 | + function geodir_manage_post_columns($column, $post_id) |
|
| 759 | + {
|
|
| 760 | + global $post, $wpdb; |
|
| 761 | + |
|
| 762 | + switch ($column): |
|
| 763 | + /* If displaying the 'city' column. */ |
|
| 764 | + case 'location' : |
|
| 765 | + $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true); |
|
| 766 | + $location = geodir_get_location($location_id); |
|
| 767 | + /* If no city is found, output a default message. */ |
|
| 768 | + if (empty($location)) {
|
|
| 769 | + _e('Unknown', 'geodirectory');
|
|
| 770 | + } else {
|
|
| 771 | + /* If there is a city id, append 'city name' to the text string. */ |
|
| 772 | + $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';
|
|
| 773 | + echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id); |
|
| 774 | + } |
|
| 775 | + break; |
|
| 776 | + |
|
| 777 | + /* If displaying the 'expire' column. */ |
|
| 778 | + case 'expire' : |
|
| 779 | + $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true); |
|
| 780 | + $d1 = $expire_date; // get expire_date |
|
| 781 | + $d2 = date('Y-m-d'); // get current date
|
|
| 782 | + $state = __('days left', 'geodirectory');
|
|
| 783 | + $date_diff_text = ''; |
|
| 784 | + $expire_class = 'expire_left'; |
|
| 785 | + if ($expire_date != 'Never') {
|
|
| 786 | + if (strtotime($d1) < strtotime($d2)) {
|
|
| 787 | + $state = __('days overdue', 'geodirectory');
|
|
| 788 | + $expire_class = 'expire_over'; |
|
| 789 | + } |
|
| 790 | + $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days |
|
| 791 | + $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
|
|
| 792 | + } |
|
| 793 | + /* If no expire_date is found, output a default message. */ |
|
| 794 | + if (empty($expire_date)) |
|
| 795 | + echo __('Unknown', 'geodirectory');
|
|
| 796 | + /* If there is a expire_date, append 'days left' to the text string. */ |
|
| 797 | + else |
|
| 798 | + echo $expire_date . $date_diff_text; |
|
| 799 | + break; |
|
| 828 | 800 | |
| 829 | - endswitch; |
|
| 830 | - } |
|
| 801 | + /* If displaying the 'categorys' column. */ |
|
| 802 | + case 'categorys' : |
|
| 803 | + |
|
| 804 | + /* Get the categorys for the post. */ |
|
| 805 | + |
|
| 806 | + |
|
| 807 | + $terms = wp_get_object_terms($post_id, get_object_taxonomies($post)); |
|
| 808 | + |
|
| 809 | + /* If terms were found. */ |
|
| 810 | + if (!empty($terms)) {
|
|
| 811 | + $out = array(); |
|
| 812 | + /* Loop through each term, linking to the 'edit posts' page for the specific term. */ |
|
| 813 | + foreach ($terms as $term) {
|
|
| 814 | + if (!strstr($term->taxonomy, 'tag')) {
|
|
| 815 | + $out[] = sprintf('<a href="%s">%s</a>',
|
|
| 816 | + esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),
|
|
| 817 | + esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))
|
|
| 818 | + ); |
|
| 819 | + } |
|
| 820 | + } |
|
| 821 | + /* Join the terms, separating them with a comma. */ |
|
| 822 | + echo(join(', ', $out));
|
|
| 823 | + } /* If no terms were found, output a default message. */ |
|
| 824 | + else {
|
|
| 825 | + _e('No Categories', 'geodirectory');
|
|
| 826 | + } |
|
| 827 | + break; |
|
| 828 | + |
|
| 829 | + endswitch; |
|
| 830 | + } |
|
| 831 | 831 | } |
| 832 | 832 | |
| 833 | 833 | |
| 834 | 834 | if (!function_exists('geodir_post_sortable_columns')) {
|
| 835 | - /** |
|
| 836 | - * Makes admin post listing page columns sortable. |
|
| 837 | - * |
|
| 838 | - * @since 1.0.0 |
|
| 839 | - * @package GeoDirectory |
|
| 840 | - * @param array $columns The column array. |
|
| 841 | - * @return array Altered column array. |
|
| 842 | - */ |
|
| 843 | - function geodir_post_sortable_columns($columns) |
|
| 844 | - {
|
|
| 845 | - |
|
| 846 | - $columns['expire'] = 'expire'; |
|
| 847 | - |
|
| 848 | - return $columns; |
|
| 849 | - } |
|
| 835 | + /** |
|
| 836 | + * Makes admin post listing page columns sortable. |
|
| 837 | + * |
|
| 838 | + * @since 1.0.0 |
|
| 839 | + * @package GeoDirectory |
|
| 840 | + * @param array $columns The column array. |
|
| 841 | + * @return array Altered column array. |
|
| 842 | + */ |
|
| 843 | + function geodir_post_sortable_columns($columns) |
|
| 844 | + {
|
|
| 845 | + |
|
| 846 | + $columns['expire'] = 'expire'; |
|
| 847 | + |
|
| 848 | + return $columns; |
|
| 849 | + } |
|
| 850 | 850 | } |
| 851 | 851 | |
| 852 | 852 | /** |
@@ -860,32 +860,32 @@ discard block |
||
| 860 | 860 | * @param int $post_id The post ID. |
| 861 | 861 | */ |
| 862 | 862 | function geodir_post_information_save($post_id, $post) {
|
| 863 | - global $wpdb, $current_user; |
|
| 863 | + global $wpdb, $current_user; |
|
| 864 | 864 | |
| 865 | - if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {
|
|
| 866 | - return; |
|
| 867 | - } |
|
| 865 | + if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {
|
|
| 866 | + return; |
|
| 867 | + } |
|
| 868 | 868 | |
| 869 | - $geodir_posttypes = geodir_get_posttypes(); |
|
| 869 | + $geodir_posttypes = geodir_get_posttypes(); |
|
| 870 | 870 | |
| 871 | - if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
|
|
| 872 | - return; |
|
| 871 | + if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
|
|
| 872 | + return; |
|
| 873 | 873 | |
| 874 | - if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {
|
|
| 875 | - if (isset($_REQUEST['_status'])) |
|
| 876 | - geodir_change_post_status($post_id, $_REQUEST['_status']); |
|
| 874 | + if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {
|
|
| 875 | + if (isset($_REQUEST['_status'])) |
|
| 876 | + geodir_change_post_status($post_id, $_REQUEST['_status']); |
|
| 877 | 877 | |
| 878 | - if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) |
|
| 879 | - return; |
|
| 878 | + if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) |
|
| 879 | + return; |
|
| 880 | 880 | |
| 881 | - if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) |
|
| 882 | - return; |
|
| 881 | + if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) |
|
| 882 | + return; |
|
| 883 | 883 | |
| 884 | - if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) |
|
| 885 | - return; |
|
| 884 | + if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) |
|
| 885 | + return; |
|
| 886 | 886 | |
| 887 | - geodir_save_listing($_REQUEST); |
|
| 888 | - } |
|
| 887 | + geodir_save_listing($_REQUEST); |
|
| 888 | + } |
|
| 889 | 889 | } |
| 890 | 890 | |
| 891 | 891 | /** |
@@ -901,102 +901,102 @@ discard block |
||
| 901 | 901 | */ |
| 902 | 902 | function geodir_admin_fields($options) |
| 903 | 903 | {
|
| 904 | - global $geodirectory; |
|
| 905 | - |
|
| 906 | - $first_title = true; |
|
| 907 | - $tab_id = ''; |
|
| 908 | - $i = 0; |
|
| 909 | - foreach ($options as $value) : |
|
| 910 | - if (!isset($value['name'])) $value['name'] = ''; |
|
| 911 | - if (!isset($value['class'])) $value['class'] = ''; |
|
| 912 | - if (!isset($value['css'])) $value['css'] = ''; |
|
| 913 | - if (!isset($value['std'])) $value['std'] = ''; |
|
| 914 | - $desc = ''; |
|
| 915 | - switch ($value['type']) : |
|
| 916 | - case 'dummy_installer': |
|
| 917 | - $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place'; |
|
| 918 | - geodir_autoinstall_admin_header($post_type); |
|
| 919 | - break; |
|
| 920 | - case 'title': |
|
| 921 | - |
|
| 922 | - if ($i == 0) {
|
|
| 923 | - echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>'; |
|
| 924 | - echo '<div class="inner_content_tab_main">'; |
|
| 925 | - } |
|
| 904 | + global $geodirectory; |
|
| 905 | + |
|
| 906 | + $first_title = true; |
|
| 907 | + $tab_id = ''; |
|
| 908 | + $i = 0; |
|
| 909 | + foreach ($options as $value) : |
|
| 910 | + if (!isset($value['name'])) $value['name'] = ''; |
|
| 911 | + if (!isset($value['class'])) $value['class'] = ''; |
|
| 912 | + if (!isset($value['css'])) $value['css'] = ''; |
|
| 913 | + if (!isset($value['std'])) $value['std'] = ''; |
|
| 914 | + $desc = ''; |
|
| 915 | + switch ($value['type']) : |
|
| 916 | + case 'dummy_installer': |
|
| 917 | + $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place'; |
|
| 918 | + geodir_autoinstall_admin_header($post_type); |
|
| 919 | + break; |
|
| 920 | + case 'title': |
|
| 921 | + |
|
| 922 | + if ($i == 0) {
|
|
| 923 | + echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>'; |
|
| 924 | + echo '<div class="inner_content_tab_main">'; |
|
| 925 | + } |
|
| 926 | 926 | |
| 927 | - $i++; |
|
| 927 | + $i++; |
|
| 928 | 928 | |
| 929 | - if (isset($value['id']) && $value['id']) |
|
| 930 | - $tab_id = $value['id']; |
|
| 929 | + if (isset($value['id']) && $value['id']) |
|
| 930 | + $tab_id = $value['id']; |
|
| 931 | 931 | |
| 932 | - if (isset($value['desc']) && $value['desc']) |
|
| 933 | - $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
| 932 | + if (isset($value['desc']) && $value['desc']) |
|
| 933 | + $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
| 934 | 934 | |
| 935 | - if (isset($value['name']) && $value['name']) {
|
|
| 936 | - if ($first_title === true) {
|
|
| 937 | - $first_title = false; |
|
| 938 | - } else {
|
|
| 939 | - echo '</div>'; |
|
| 940 | - } |
|
| 941 | - echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>'; |
|
| 935 | + if (isset($value['name']) && $value['name']) {
|
|
| 936 | + if ($first_title === true) {
|
|
| 937 | + $first_title = false; |
|
| 938 | + } else {
|
|
| 939 | + echo '</div>'; |
|
| 940 | + } |
|
| 941 | + echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>'; |
|
| 942 | 942 | |
| 943 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 944 | - } |
|
| 943 | + echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 944 | + } |
|
| 945 | 945 | |
| 946 | - /** |
|
| 947 | - * Called after a GeoDirectory settings title is output in the GD settings page. |
|
| 948 | - * |
|
| 949 | - * The action is called dynamically geodir_settings_$value['id']. |
|
| 950 | - * |
|
| 951 | - * @since 1.0.0 |
|
| 952 | - */ |
|
| 953 | - do_action('geodir_settings_' . sanitize_title($value['id']));
|
|
| 954 | - break; |
|
| 955 | - |
|
| 956 | - case 'no_tabs': |
|
| 957 | - |
|
| 958 | - echo '<div class="inner_content_tab_main">'; |
|
| 959 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 960 | - |
|
| 961 | - break; |
|
| 962 | - |
|
| 963 | - case 'sectionstart': |
|
| 964 | - if (isset($value['desc']) && $value['desc']) |
|
| 965 | - $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
| 966 | - if (isset($value['name']) && $value['name']) |
|
| 967 | - echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
| 968 | - /** |
|
| 969 | - * Called after a GeoDirectory settings sectionstart is output in the GD settings page. |
|
| 970 | - * |
|
| 971 | - * The action is called dynamically geodir_settings_$value['id']_start. |
|
| 972 | - * |
|
| 973 | - * @since 1.0.0 |
|
| 974 | - */ |
|
| 975 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
|
|
| 976 | - echo '<table class="form-table">' . "\n\n"; |
|
| 977 | - |
|
| 978 | - break; |
|
| 979 | - case 'sectionend': |
|
| 980 | - /** |
|
| 981 | - * Called before a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 982 | - * |
|
| 983 | - * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 984 | - * |
|
| 985 | - * @since 1.0.0 |
|
| 986 | - */ |
|
| 987 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
|
|
| 988 | - echo '</table>'; |
|
| 989 | - /** |
|
| 990 | - * Called after a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 991 | - * |
|
| 992 | - * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 993 | - * |
|
| 994 | - * @since 1.0.0 |
|
| 995 | - */ |
|
| 996 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
|
|
| 997 | - break; |
|
| 998 | - case 'text': |
|
| 999 | - ?> |
|
| 946 | + /** |
|
| 947 | + * Called after a GeoDirectory settings title is output in the GD settings page. |
|
| 948 | + * |
|
| 949 | + * The action is called dynamically geodir_settings_$value['id']. |
|
| 950 | + * |
|
| 951 | + * @since 1.0.0 |
|
| 952 | + */ |
|
| 953 | + do_action('geodir_settings_' . sanitize_title($value['id']));
|
|
| 954 | + break; |
|
| 955 | + |
|
| 956 | + case 'no_tabs': |
|
| 957 | + |
|
| 958 | + echo '<div class="inner_content_tab_main">'; |
|
| 959 | + echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 960 | + |
|
| 961 | + break; |
|
| 962 | + |
|
| 963 | + case 'sectionstart': |
|
| 964 | + if (isset($value['desc']) && $value['desc']) |
|
| 965 | + $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
| 966 | + if (isset($value['name']) && $value['name']) |
|
| 967 | + echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
| 968 | + /** |
|
| 969 | + * Called after a GeoDirectory settings sectionstart is output in the GD settings page. |
|
| 970 | + * |
|
| 971 | + * The action is called dynamically geodir_settings_$value['id']_start. |
|
| 972 | + * |
|
| 973 | + * @since 1.0.0 |
|
| 974 | + */ |
|
| 975 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
|
|
| 976 | + echo '<table class="form-table">' . "\n\n"; |
|
| 977 | + |
|
| 978 | + break; |
|
| 979 | + case 'sectionend': |
|
| 980 | + /** |
|
| 981 | + * Called before a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 982 | + * |
|
| 983 | + * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 984 | + * |
|
| 985 | + * @since 1.0.0 |
|
| 986 | + */ |
|
| 987 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
|
|
| 988 | + echo '</table>'; |
|
| 989 | + /** |
|
| 990 | + * Called after a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 991 | + * |
|
| 992 | + * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 993 | + * |
|
| 994 | + * @since 1.0.0 |
|
| 995 | + */ |
|
| 996 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
|
|
| 997 | + break; |
|
| 998 | + case 'text': |
|
| 999 | + ?> |
|
| 1000 | 1000 | <tr valign="top"> |
| 1001 | 1001 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1002 | 1002 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1005,15 +1005,15 @@ discard block |
||
| 1005 | 1005 | <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
| 1006 | 1006 | style=" <?php echo esc_attr($value['css']); ?>" |
| 1007 | 1007 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1008 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1009 | - } else {
|
|
| 1010 | - echo esc_attr($value['std']); |
|
| 1011 | - } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1008 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1009 | + } else {
|
|
| 1010 | + echo esc_attr($value['std']); |
|
| 1011 | + } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1012 | 1012 | </tr><?php |
| 1013 | - break; |
|
| 1013 | + break; |
|
| 1014 | 1014 | |
| 1015 | - case 'map-key': |
|
| 1016 | - ?> |
|
| 1015 | + case 'map-key': |
|
| 1016 | + ?> |
|
| 1017 | 1017 | <tr valign="top"> |
| 1018 | 1018 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1019 | 1019 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1022,17 +1022,17 @@ discard block |
||
| 1022 | 1022 | <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
| 1023 | 1023 | style=" <?php echo esc_attr($value['css']); ?>" |
| 1024 | 1024 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1025 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1026 | - } else {
|
|
| 1027 | - echo esc_attr($value['std']); |
|
| 1028 | - } ?>"/> |
|
| 1025 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1026 | + } else {
|
|
| 1027 | + echo esc_attr($value['std']); |
|
| 1028 | + } ?>"/> |
|
| 1029 | 1029 | <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>
|
| 1030 | 1030 | <span class="description"><?php echo $value['desc']; ?></span></td> |
| 1031 | 1031 | </tr><?php |
| 1032 | - break; |
|
| 1032 | + break; |
|
| 1033 | 1033 | |
| 1034 | - case 'password': |
|
| 1035 | - ?> |
|
| 1034 | + case 'password': |
|
| 1035 | + ?> |
|
| 1036 | 1036 | <tr valign="top"> |
| 1037 | 1037 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1038 | 1038 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1041,42 +1041,42 @@ discard block |
||
| 1041 | 1041 | <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
| 1042 | 1042 | style="<?php echo esc_attr($value['css']); ?>" |
| 1043 | 1043 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1044 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1045 | - } else {
|
|
| 1046 | - echo esc_attr($value['std']); |
|
| 1047 | - } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1044 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1045 | + } else {
|
|
| 1046 | + echo esc_attr($value['std']); |
|
| 1047 | + } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1048 | 1048 | </tr><?php |
| 1049 | - break; |
|
| 1049 | + break; |
|
| 1050 | 1050 | |
| 1051 | - case 'html_content': |
|
| 1052 | - ?> |
|
| 1051 | + case 'html_content': |
|
| 1052 | + ?> |
|
| 1053 | 1053 | <tr valign="top"> |
| 1054 | 1054 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1055 | 1055 | <td class="forminp"><span class="description"><?php echo $value['desc']; ?></span></td> |
| 1056 | 1056 | </tr><?php |
| 1057 | - break; |
|
| 1057 | + break; |
|
| 1058 | 1058 | |
| 1059 | - case 'color' : |
|
| 1060 | - ?> |
|
| 1059 | + case 'color' : |
|
| 1060 | + ?> |
|
| 1061 | 1061 | <tr valign="top"> |
| 1062 | 1062 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1063 | 1063 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
| 1064 | 1064 | id="<?php echo esc_attr($value['id']); ?>" type="text" |
| 1065 | 1065 | style="<?php echo esc_attr($value['css']); ?>" |
| 1066 | 1066 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1067 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1068 | - } else {
|
|
| 1069 | - echo esc_attr($value['std']); |
|
| 1070 | - } ?>" class="colorpick"/> <span |
|
| 1067 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1068 | + } else {
|
|
| 1069 | + echo esc_attr($value['std']); |
|
| 1070 | + } ?>" class="colorpick"/> <span |
|
| 1071 | 1071 | class="description"><?php echo $value['desc']; ?></span> |
| 1072 | 1072 | |
| 1073 | 1073 | <div id="colorPickerDiv_<?php echo esc_attr($value['id']); ?>" class="colorpickdiv" |
| 1074 | 1074 | style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"></div> |
| 1075 | 1075 | </td> |
| 1076 | 1076 | </tr><?php |
| 1077 | - break; |
|
| 1078 | - case 'image_width' : |
|
| 1079 | - ?> |
|
| 1077 | + break; |
|
| 1078 | + case 'image_width' : |
|
| 1079 | + ?> |
|
| 1080 | 1080 | <tr valign="top"> |
| 1081 | 1081 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1082 | 1082 | <td class="forminp"> |
@@ -1098,11 +1098,11 @@ discard block |
||
| 1098 | 1098 | |
| 1099 | 1099 | <span class="description"><?php echo $value['desc'] ?></span></td> |
| 1100 | 1100 | </tr><?php |
| 1101 | - break; |
|
| 1102 | - case 'select': |
|
| 1103 | - $option_value = get_option($value['id']); |
|
| 1104 | - $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value; |
|
| 1105 | - ?> |
|
| 1101 | + break; |
|
| 1102 | + case 'select': |
|
| 1103 | + $option_value = get_option($value['id']); |
|
| 1104 | + $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value; |
|
| 1105 | + ?> |
|
| 1106 | 1106 | <tr valign="top"> |
| 1107 | 1107 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1108 | 1108 | <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>" |
@@ -1111,33 +1111,33 @@ discard block |
||
| 1111 | 1111 | class="<?php if (isset($value['class'])) echo $value['class']; ?>" |
| 1112 | 1112 | option-ajaxchosen="false"> |
| 1113 | 1113 | <?php |
| 1114 | - foreach ($value['options'] as $key => $val) {
|
|
| 1115 | - $geodir_select_value = ''; |
|
| 1116 | - if ($option_value != '') {
|
|
| 1117 | - if ($option_value != '' && $option_value == $key) |
|
| 1118 | - $geodir_select_value = ' selected="selected" '; |
|
| 1119 | - } else {
|
|
| 1120 | - if ($value['std'] == $key) |
|
| 1121 | - $geodir_select_value = ' selected="selected" '; |
|
| 1122 | - } |
|
| 1123 | - ?> |
|
| 1114 | + foreach ($value['options'] as $key => $val) {
|
|
| 1115 | + $geodir_select_value = ''; |
|
| 1116 | + if ($option_value != '') {
|
|
| 1117 | + if ($option_value != '' && $option_value == $key) |
|
| 1118 | + $geodir_select_value = ' selected="selected" '; |
|
| 1119 | + } else {
|
|
| 1120 | + if ($value['std'] == $key) |
|
| 1121 | + $geodir_select_value = ' selected="selected" '; |
|
| 1122 | + } |
|
| 1123 | + ?> |
|
| 1124 | 1124 | <option |
| 1125 | 1125 | value="<?php echo esc_attr($key); ?>" <?php echo $geodir_select_value; ?> ><?php echo ucfirst($val) ?></option> |
| 1126 | 1126 | <?php |
| 1127 | - } |
|
| 1128 | - ?> |
|
| 1127 | + } |
|
| 1128 | + ?> |
|
| 1129 | 1129 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
| 1130 | 1130 | </td> |
| 1131 | 1131 | </tr><?php |
| 1132 | - break; |
|
| 1132 | + break; |
|
| 1133 | 1133 | |
| 1134 | - case 'multiselect': |
|
| 1135 | - $option_values = get_option($value['id']); |
|
| 1136 | - if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {
|
|
| 1137 | - $option_values = $value['std']; |
|
| 1138 | - } |
|
| 1139 | - $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values; |
|
| 1140 | - ?> |
|
| 1134 | + case 'multiselect': |
|
| 1135 | + $option_values = get_option($value['id']); |
|
| 1136 | + if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {
|
|
| 1137 | + $option_values = $value['std']; |
|
| 1138 | + } |
|
| 1139 | + $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values; |
|
| 1140 | + ?> |
|
| 1141 | 1141 | <tr valign="top"> |
| 1142 | 1142 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1143 | 1143 | <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]" |
@@ -1147,25 +1147,25 @@ discard block |
||
| 1147 | 1147 | data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>" |
| 1148 | 1148 | option-ajaxchosen="false"> |
| 1149 | 1149 | <?php |
| 1150 | - foreach ($value['options'] as $key => $val) {
|
|
| 1151 | - if (strpos($key, 'optgroup_start-') === 0) {
|
|
| 1152 | - ?><optgroup label="<?php echo ucfirst($val); ?>"><?php |
|
| 1153 | - } else if (strpos($key, 'optgroup_end-') === 0) {
|
|
| 1154 | - ?></optgroup><?php |
|
| 1155 | - } else {
|
|
| 1156 | - ?> |
|
| 1150 | + foreach ($value['options'] as $key => $val) {
|
|
| 1151 | + if (strpos($key, 'optgroup_start-') === 0) {
|
|
| 1152 | + ?><optgroup label="<?php echo ucfirst($val); ?>"><?php |
|
| 1153 | + } else if (strpos($key, 'optgroup_end-') === 0) {
|
|
| 1154 | + ?></optgroup><?php |
|
| 1155 | + } else {
|
|
| 1156 | + ?> |
|
| 1157 | 1157 | <option |
| 1158 | 1158 | value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>><?php echo ucfirst($val) ?></option> |
| 1159 | 1159 | <?php |
| 1160 | - } |
|
| 1161 | - } |
|
| 1162 | - ?> |
|
| 1160 | + } |
|
| 1161 | + } |
|
| 1162 | + ?> |
|
| 1163 | 1163 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
| 1164 | 1164 | </td> |
| 1165 | 1165 | </tr><?php |
| 1166 | - break; |
|
| 1167 | - case 'file': |
|
| 1168 | - ?> |
|
| 1166 | + break; |
|
| 1167 | + case 'file': |
|
| 1168 | + ?> |
|
| 1169 | 1169 | <tr valign="top"> |
| 1170 | 1170 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1171 | 1171 | <td class="forminp"> |
@@ -1185,87 +1185,87 @@ discard block |
||
| 1185 | 1185 | <?php } ?> |
| 1186 | 1186 | </td> |
| 1187 | 1187 | </tr><?php |
| 1188 | - break; |
|
| 1189 | - case 'map_default_settings' : |
|
| 1190 | - ?> |
|
| 1188 | + break; |
|
| 1189 | + case 'map_default_settings' : |
|
| 1190 | + ?> |
|
| 1191 | 1191 | |
| 1192 | 1192 | <tr valign="top"> |
| 1193 | 1193 | <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>
|
| 1194 | 1194 | <td width="60%"> |
| 1195 | 1195 | <select name="geodir_default_map_language" style="width:60%"> |
| 1196 | 1196 | <?php |
| 1197 | - $arr_map_langages = array( |
|
| 1198 | - 'ar' => __('ARABIC', 'geodirectory'),
|
|
| 1199 | - 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1200 | - 'bg' => __('BULGARIAN', 'geodirectory'),
|
|
| 1201 | - 'bn' => __('BENGALI', 'geodirectory'),
|
|
| 1202 | - 'ca' => __('CATALAN', 'geodirectory'),
|
|
| 1203 | - 'cs' => __('CZECH', 'geodirectory'),
|
|
| 1204 | - 'da' => __('DANISH', 'geodirectory'),
|
|
| 1205 | - 'de' => __('GERMAN', 'geodirectory'),
|
|
| 1206 | - 'el' => __('GREEK', 'geodirectory'),
|
|
| 1207 | - 'en' => __('ENGLISH', 'geodirectory'),
|
|
| 1208 | - 'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),
|
|
| 1209 | - 'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),
|
|
| 1210 | - 'es' => __('SPANISH', 'geodirectory'),
|
|
| 1211 | - 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1212 | - 'fa' => __('FARSI', 'geodirectory'),
|
|
| 1213 | - 'fi' => __('FINNISH', 'geodirectory'),
|
|
| 1214 | - 'fil' => __('FILIPINO', 'geodirectory'),
|
|
| 1215 | - 'fr' => __('FRENCH', 'geodirectory'),
|
|
| 1216 | - 'gl' => __('GALICIAN', 'geodirectory'),
|
|
| 1217 | - 'gu' => __('GUJARATI', 'geodirectory'),
|
|
| 1218 | - 'hi' => __('HINDI', 'geodirectory'),
|
|
| 1219 | - 'hr' => __('CROATIAN', 'geodirectory'),
|
|
| 1220 | - 'hu' => __('HUNGARIAN', 'geodirectory'),
|
|
| 1221 | - 'id' => __('INDONESIAN', 'geodirectory'),
|
|
| 1222 | - 'it' => __('ITALIAN', 'geodirectory'),
|
|
| 1223 | - 'iw' => __('HEBREW', 'geodirectory'),
|
|
| 1224 | - 'ja' => __('JAPANESE', 'geodirectory'),
|
|
| 1225 | - 'kn' => __('KANNADA', 'geodirectory'),
|
|
| 1226 | - 'ko' => __('KOREAN', 'geodirectory'),
|
|
| 1227 | - 'lt' => __('LITHUANIAN', 'geodirectory'),
|
|
| 1228 | - 'lv' => __('LATVIAN', 'geodirectory'),
|
|
| 1229 | - 'ml' => __('MALAYALAM', 'geodirectory'),
|
|
| 1230 | - 'mr' => __('MARATHI', 'geodirectory'),
|
|
| 1231 | - 'nl' => __('DUTCH', 'geodirectory'),
|
|
| 1232 | - 'no' => __('NORWEGIAN', 'geodirectory'),
|
|
| 1233 | - 'pl' => __('POLISH', 'geodirectory'),
|
|
| 1234 | - 'pt' => __('PORTUGUESE', 'geodirectory'),
|
|
| 1235 | - 'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),
|
|
| 1236 | - 'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),
|
|
| 1237 | - 'ro' => __('ROMANIAN', 'geodirectory'),
|
|
| 1238 | - 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1239 | - 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1240 | - 'sk' => __('SLOVAK', 'geodirectory'),
|
|
| 1241 | - 'sl' => __('SLOVENIAN', 'geodirectory'),
|
|
| 1242 | - 'sr' => __('SERBIAN', 'geodirectory'),
|
|
| 1243 | - 'sv' => __(' SWEDISH', 'geodirectory'),
|
|
| 1244 | - 'tl' => __('TAGALOG', 'geodirectory'),
|
|
| 1245 | - 'ta' => __('TAMIL', 'geodirectory'),
|
|
| 1246 | - 'te' => __('TELUGU', 'geodirectory'),
|
|
| 1247 | - 'th' => __('THAI', 'geodirectory'),
|
|
| 1248 | - 'tr' => __('TURKISH', 'geodirectory'),
|
|
| 1249 | - 'uk' => __('UKRAINIAN', 'geodirectory'),
|
|
| 1250 | - 'vi' => __('VIETNAMESE', 'geodirectory'),
|
|
| 1251 | - 'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),
|
|
| 1252 | - 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),
|
|
| 1253 | - ); |
|
| 1254 | - $geodir_default_map_language = get_option('geodir_default_map_language');
|
|
| 1255 | - if (empty($geodir_default_map_language)) |
|
| 1256 | - $geodir_default_map_language = 'en'; |
|
| 1257 | - foreach ($arr_map_langages as $language_key => $language_txt) {
|
|
| 1258 | - if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) |
|
| 1259 | - $geodir_default_language_selected = "selected='selected'"; |
|
| 1260 | - else |
|
| 1261 | - $geodir_default_language_selected = ''; |
|
| 1262 | - |
|
| 1263 | - ?> |
|
| 1197 | + $arr_map_langages = array( |
|
| 1198 | + 'ar' => __('ARABIC', 'geodirectory'),
|
|
| 1199 | + 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1200 | + 'bg' => __('BULGARIAN', 'geodirectory'),
|
|
| 1201 | + 'bn' => __('BENGALI', 'geodirectory'),
|
|
| 1202 | + 'ca' => __('CATALAN', 'geodirectory'),
|
|
| 1203 | + 'cs' => __('CZECH', 'geodirectory'),
|
|
| 1204 | + 'da' => __('DANISH', 'geodirectory'),
|
|
| 1205 | + 'de' => __('GERMAN', 'geodirectory'),
|
|
| 1206 | + 'el' => __('GREEK', 'geodirectory'),
|
|
| 1207 | + 'en' => __('ENGLISH', 'geodirectory'),
|
|
| 1208 | + 'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),
|
|
| 1209 | + 'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),
|
|
| 1210 | + 'es' => __('SPANISH', 'geodirectory'),
|
|
| 1211 | + 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1212 | + 'fa' => __('FARSI', 'geodirectory'),
|
|
| 1213 | + 'fi' => __('FINNISH', 'geodirectory'),
|
|
| 1214 | + 'fil' => __('FILIPINO', 'geodirectory'),
|
|
| 1215 | + 'fr' => __('FRENCH', 'geodirectory'),
|
|
| 1216 | + 'gl' => __('GALICIAN', 'geodirectory'),
|
|
| 1217 | + 'gu' => __('GUJARATI', 'geodirectory'),
|
|
| 1218 | + 'hi' => __('HINDI', 'geodirectory'),
|
|
| 1219 | + 'hr' => __('CROATIAN', 'geodirectory'),
|
|
| 1220 | + 'hu' => __('HUNGARIAN', 'geodirectory'),
|
|
| 1221 | + 'id' => __('INDONESIAN', 'geodirectory'),
|
|
| 1222 | + 'it' => __('ITALIAN', 'geodirectory'),
|
|
| 1223 | + 'iw' => __('HEBREW', 'geodirectory'),
|
|
| 1224 | + 'ja' => __('JAPANESE', 'geodirectory'),
|
|
| 1225 | + 'kn' => __('KANNADA', 'geodirectory'),
|
|
| 1226 | + 'ko' => __('KOREAN', 'geodirectory'),
|
|
| 1227 | + 'lt' => __('LITHUANIAN', 'geodirectory'),
|
|
| 1228 | + 'lv' => __('LATVIAN', 'geodirectory'),
|
|
| 1229 | + 'ml' => __('MALAYALAM', 'geodirectory'),
|
|
| 1230 | + 'mr' => __('MARATHI', 'geodirectory'),
|
|
| 1231 | + 'nl' => __('DUTCH', 'geodirectory'),
|
|
| 1232 | + 'no' => __('NORWEGIAN', 'geodirectory'),
|
|
| 1233 | + 'pl' => __('POLISH', 'geodirectory'),
|
|
| 1234 | + 'pt' => __('PORTUGUESE', 'geodirectory'),
|
|
| 1235 | + 'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),
|
|
| 1236 | + 'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),
|
|
| 1237 | + 'ro' => __('ROMANIAN', 'geodirectory'),
|
|
| 1238 | + 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1239 | + 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1240 | + 'sk' => __('SLOVAK', 'geodirectory'),
|
|
| 1241 | + 'sl' => __('SLOVENIAN', 'geodirectory'),
|
|
| 1242 | + 'sr' => __('SERBIAN', 'geodirectory'),
|
|
| 1243 | + 'sv' => __(' SWEDISH', 'geodirectory'),
|
|
| 1244 | + 'tl' => __('TAGALOG', 'geodirectory'),
|
|
| 1245 | + 'ta' => __('TAMIL', 'geodirectory'),
|
|
| 1246 | + 'te' => __('TELUGU', 'geodirectory'),
|
|
| 1247 | + 'th' => __('THAI', 'geodirectory'),
|
|
| 1248 | + 'tr' => __('TURKISH', 'geodirectory'),
|
|
| 1249 | + 'uk' => __('UKRAINIAN', 'geodirectory'),
|
|
| 1250 | + 'vi' => __('VIETNAMESE', 'geodirectory'),
|
|
| 1251 | + 'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),
|
|
| 1252 | + 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),
|
|
| 1253 | + ); |
|
| 1254 | + $geodir_default_map_language = get_option('geodir_default_map_language');
|
|
| 1255 | + if (empty($geodir_default_map_language)) |
|
| 1256 | + $geodir_default_map_language = 'en'; |
|
| 1257 | + foreach ($arr_map_langages as $language_key => $language_txt) {
|
|
| 1258 | + if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) |
|
| 1259 | + $geodir_default_language_selected = "selected='selected'"; |
|
| 1260 | + else |
|
| 1261 | + $geodir_default_language_selected = ''; |
|
| 1262 | + |
|
| 1263 | + ?> |
|
| 1264 | 1264 | <option |
| 1265 | 1265 | value="<?php echo $language_key?>" <?php echo $geodir_default_language_selected; ?>><?php echo $language_txt; ?></option> |
| 1266 | 1266 | |
| 1267 | 1267 | <?php } |
| 1268 | - ?> |
|
| 1268 | + ?> |
|
| 1269 | 1269 | </select> |
| 1270 | 1270 | </td> |
| 1271 | 1271 | </tr> |
@@ -1276,46 +1276,46 @@ discard block |
||
| 1276 | 1276 | <td width="60%"> |
| 1277 | 1277 | <select name="geodir_default_map_search_pt" style="width:60%"> |
| 1278 | 1278 | <?php |
| 1279 | - $post_types = geodir_get_posttypes('array');
|
|
| 1280 | - $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');
|
|
| 1281 | - if (empty($geodir_default_map_search_pt)) |
|
| 1282 | - $geodir_default_map_search_pt = 'gd_place'; |
|
| 1283 | - if (is_array($post_types)) {
|
|
| 1284 | - foreach ($post_types as $key => $post_types_obj) {
|
|
| 1285 | - if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) |
|
| 1286 | - $geodir_search_pt_selected = "selected='selected'"; |
|
| 1287 | - else |
|
| 1288 | - $geodir_search_pt_selected = ''; |
|
| 1289 | - |
|
| 1290 | - ?> |
|
| 1279 | + $post_types = geodir_get_posttypes('array');
|
|
| 1280 | + $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');
|
|
| 1281 | + if (empty($geodir_default_map_search_pt)) |
|
| 1282 | + $geodir_default_map_search_pt = 'gd_place'; |
|
| 1283 | + if (is_array($post_types)) {
|
|
| 1284 | + foreach ($post_types as $key => $post_types_obj) {
|
|
| 1285 | + if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) |
|
| 1286 | + $geodir_search_pt_selected = "selected='selected'"; |
|
| 1287 | + else |
|
| 1288 | + $geodir_search_pt_selected = ''; |
|
| 1289 | + |
|
| 1290 | + ?> |
|
| 1291 | 1291 | <option |
| 1292 | 1292 | value="<?php echo $key?>" <?php echo $geodir_search_pt_selected; ?>><?php echo $post_types_obj['labels']['singular_name']; ?></option> |
| 1293 | 1293 | |
| 1294 | 1294 | <?php } |
| 1295 | 1295 | |
| 1296 | - } |
|
| 1296 | + } |
|
| 1297 | 1297 | |
| 1298 | - ?> |
|
| 1298 | + ?> |
|
| 1299 | 1299 | </select> |
| 1300 | 1300 | </td> |
| 1301 | 1301 | </tr> |
| 1302 | 1302 | |
| 1303 | 1303 | <?php |
| 1304 | - break; |
|
| 1304 | + break; |
|
| 1305 | 1305 | |
| 1306 | - case 'map': |
|
| 1307 | - ?> |
|
| 1306 | + case 'map': |
|
| 1307 | + ?> |
|
| 1308 | 1308 | <tr valign="top"> |
| 1309 | 1309 | <td class="forminp"> |
| 1310 | 1310 | <?php |
| 1311 | - global $post_cat, $cat_display; |
|
| 1312 | - $post_types = geodir_get_posttypes('object');
|
|
| 1313 | - $cat_display = 'checkbox'; |
|
| 1314 | - $gd_post_types = get_option('geodir_exclude_post_type_on_map');
|
|
| 1315 | - $gd_cats = get_option('geodir_exclude_cat_on_map');
|
|
| 1316 | - $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 1317 | - $count = 1; |
|
| 1318 | - ?> |
|
| 1311 | + global $post_cat, $cat_display; |
|
| 1312 | + $post_types = geodir_get_posttypes('object');
|
|
| 1313 | + $cat_display = 'checkbox'; |
|
| 1314 | + $gd_post_types = get_option('geodir_exclude_post_type_on_map');
|
|
| 1315 | + $gd_cats = get_option('geodir_exclude_cat_on_map');
|
|
| 1316 | + $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 1317 | + $count = 1; |
|
| 1318 | + ?> |
|
| 1319 | 1319 | <table width="70%" class="widefat"> |
| 1320 | 1320 | <thead> |
| 1321 | 1321 | <tr> |
@@ -1324,18 +1324,18 @@ discard block |
||
| 1324 | 1324 | <th><b><?php echo DESIGN_POST_TYPE_CAT; ?></b></th> |
| 1325 | 1325 | </tr> |
| 1326 | 1326 | <?php |
| 1327 | - $gd_categs = $gd_cats; |
|
| 1328 | - foreach ($post_types as $key => $post_types_obj) : |
|
| 1329 | - $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : ''; |
|
| 1330 | - $gd_taxonomy = geodir_get_taxonomies($key); |
|
| 1331 | - if ($gd_cats_upgrade) {
|
|
| 1332 | - $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : ''; |
|
| 1333 | - $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array(); |
|
| 1334 | - $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array(); |
|
| 1335 | - } |
|
| 1336 | - $post_cat = implode(',', $gd_cats);
|
|
| 1337 | - $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy); |
|
| 1338 | - ?> |
|
| 1327 | + $gd_categs = $gd_cats; |
|
| 1328 | + foreach ($post_types as $key => $post_types_obj) : |
|
| 1329 | + $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : ''; |
|
| 1330 | + $gd_taxonomy = geodir_get_taxonomies($key); |
|
| 1331 | + if ($gd_cats_upgrade) {
|
|
| 1332 | + $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : ''; |
|
| 1333 | + $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array(); |
|
| 1334 | + $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array(); |
|
| 1335 | + } |
|
| 1336 | + $post_cat = implode(',', $gd_cats);
|
|
| 1337 | + $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy); |
|
| 1338 | + ?> |
|
| 1339 | 1339 | <tr> |
| 1340 | 1340 | <td valign="top" width="5%"><?php echo $count; ?></td> |
| 1341 | 1341 | <td valign="top" width="25%" id="td_post_types"><input type="checkbox" |
@@ -1356,19 +1356,19 @@ discard block |
||
| 1356 | 1356 | </td> |
| 1357 | 1357 | </tr> |
| 1358 | 1358 | <?php |
| 1359 | - break; |
|
| 1359 | + break; |
|
| 1360 | 1360 | |
| 1361 | - case 'checkbox' : |
|
| 1361 | + case 'checkbox' : |
|
| 1362 | 1362 | |
| 1363 | - if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) : |
|
| 1364 | - ?> |
|
| 1363 | + if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) : |
|
| 1364 | + ?> |
|
| 1365 | 1365 | <tr valign="top"> |
| 1366 | 1366 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1367 | 1367 | <td class="forminp"> |
| 1368 | 1368 | <?php |
| 1369 | - endif; |
|
| 1369 | + endif; |
|
| 1370 | 1370 | |
| 1371 | - ?> |
|
| 1371 | + ?> |
|
| 1372 | 1372 | <fieldset> |
| 1373 | 1373 | <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend> |
| 1374 | 1374 | <label for="<?php echo $value['id'] ?>"> |
@@ -1378,49 +1378,49 @@ discard block |
||
| 1378 | 1378 | </fieldset> |
| 1379 | 1379 | <?php |
| 1380 | 1380 | |
| 1381 | - if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) : |
|
| 1382 | - ?> |
|
| 1381 | + if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) : |
|
| 1382 | + ?> |
|
| 1383 | 1383 | </td> |
| 1384 | 1384 | </tr> |
| 1385 | 1385 | <?php |
| 1386 | - endif; |
|
| 1386 | + endif; |
|
| 1387 | 1387 | |
| 1388 | - break; |
|
| 1388 | + break; |
|
| 1389 | 1389 | |
| 1390 | - case 'radio' : |
|
| 1390 | + case 'radio' : |
|
| 1391 | 1391 | |
| 1392 | - if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) : |
|
| 1393 | - ?> |
|
| 1392 | + if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) : |
|
| 1393 | + ?> |
|
| 1394 | 1394 | <tr valign="top"> |
| 1395 | 1395 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1396 | 1396 | <td class="forminp"> |
| 1397 | 1397 | <?php |
| 1398 | - endif; |
|
| 1398 | + endif; |
|
| 1399 | 1399 | |
| 1400 | - ?> |
|
| 1400 | + ?> |
|
| 1401 | 1401 | <fieldset> |
| 1402 | 1402 | <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend> |
| 1403 | 1403 | <label for="<?php echo $value['id'];?>"> |
| 1404 | 1404 | <input name="<?php echo esc_attr($value['id']); ?>" |
| 1405 | 1405 | id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio" |
| 1406 | 1406 | value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {
|
| 1407 | - echo 'checked="checked"'; |
|
| 1408 | - }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
|
|
| 1407 | + echo 'checked="checked"'; |
|
| 1408 | + }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
|
|
| 1409 | 1409 | <?php echo $value['desc']; ?></label><br> |
| 1410 | 1410 | </fieldset> |
| 1411 | 1411 | <?php |
| 1412 | 1412 | |
| 1413 | - if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) : |
|
| 1414 | - ?> |
|
| 1413 | + if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) : |
|
| 1414 | + ?> |
|
| 1415 | 1415 | </td> |
| 1416 | 1416 | </tr> |
| 1417 | 1417 | <?php |
| 1418 | - endif; |
|
| 1418 | + endif; |
|
| 1419 | 1419 | |
| 1420 | - break; |
|
| 1420 | + break; |
|
| 1421 | 1421 | |
| 1422 | - case 'textarea': |
|
| 1423 | - ?> |
|
| 1422 | + case 'textarea': |
|
| 1423 | + ?> |
|
| 1424 | 1424 | <tr valign="top"> |
| 1425 | 1425 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1426 | 1426 | <td class="forminp"> |
@@ -1433,30 +1433,30 @@ discard block |
||
| 1433 | 1433 | |
| 1434 | 1434 | </td> |
| 1435 | 1435 | </tr><?php |
| 1436 | - break; |
|
| 1436 | + break; |
|
| 1437 | 1437 | |
| 1438 | - case 'editor': |
|
| 1439 | - ?> |
|
| 1438 | + case 'editor': |
|
| 1439 | + ?> |
|
| 1440 | 1440 | <tr valign="top"> |
| 1441 | 1441 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1442 | 1442 | <td class="forminp"><?php |
| 1443 | - if (get_option($value['id'])) |
|
| 1444 | - $content = stripslashes(get_option($value['id'])); |
|
| 1445 | - else |
|
| 1446 | - $content = $value['std']; |
|
| 1443 | + if (get_option($value['id'])) |
|
| 1444 | + $content = stripslashes(get_option($value['id'])); |
|
| 1445 | + else |
|
| 1446 | + $content = $value['std']; |
|
| 1447 | 1447 | |
| 1448 | - $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
|
|
| 1448 | + $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
|
|
| 1449 | 1449 | |
| 1450 | - wp_editor($content, esc_attr($value['id']), $editor_settings); |
|
| 1450 | + wp_editor($content, esc_attr($value['id']), $editor_settings); |
|
| 1451 | 1451 | |
| 1452 | - ?> <span class="description"><?php echo $value['desc'] ?></span> |
|
| 1452 | + ?> <span class="description"><?php echo $value['desc'] ?></span> |
|
| 1453 | 1453 | |
| 1454 | 1454 | </td> |
| 1455 | 1455 | </tr><?php |
| 1456 | - break; |
|
| 1456 | + break; |
|
| 1457 | 1457 | |
| 1458 | - case 'single_select_page' : |
|
| 1459 | - // WPML |
|
| 1458 | + case 'single_select_page' : |
|
| 1459 | + // WPML |
|
| 1460 | 1460 | $switch_lang = false; |
| 1461 | 1461 | $disabled = ''; |
| 1462 | 1462 | if (geodir_is_wpml() && isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {
|
@@ -1474,18 +1474,18 @@ discard block |
||
| 1474 | 1474 | // |
| 1475 | 1475 | $page_setting = (int)get_option($value['id']); |
| 1476 | 1476 | |
| 1477 | - $args = array('name' => $value['id'],
|
|
| 1478 | - 'id' => $value['id'], |
|
| 1479 | - 'sort_column' => 'menu_order', |
|
| 1480 | - 'sort_order' => 'ASC', |
|
| 1481 | - 'show_option_none' => ' ', |
|
| 1482 | - 'class' => $value['class'], |
|
| 1483 | - 'echo' => false, |
|
| 1484 | - 'selected' => $page_setting); |
|
| 1477 | + $args = array('name' => $value['id'],
|
|
| 1478 | + 'id' => $value['id'], |
|
| 1479 | + 'sort_column' => 'menu_order', |
|
| 1480 | + 'sort_order' => 'ASC', |
|
| 1481 | + 'show_option_none' => ' ', |
|
| 1482 | + 'class' => $value['class'], |
|
| 1483 | + 'echo' => false, |
|
| 1484 | + 'selected' => $page_setting); |
|
| 1485 | 1485 | |
| 1486 | - if (isset($value['args'])) $args = wp_parse_args($value['args'], $args); |
|
| 1486 | + if (isset($value['args'])) $args = wp_parse_args($value['args'], $args); |
|
| 1487 | 1487 | |
| 1488 | - ?> |
|
| 1488 | + ?> |
|
| 1489 | 1489 | <tr valign="top" class="single_select_page"> |
| 1490 | 1490 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1491 | 1491 | <td class="forminp"> |
@@ -1496,17 +1496,17 @@ discard block |
||
| 1496 | 1496 | if ($switch_lang) {
|
| 1497 | 1497 | $sitepress->switch_lang($switch_lang, true); |
| 1498 | 1498 | } |
| 1499 | - break; |
|
| 1500 | - case 'single_select_country' : |
|
| 1501 | - $country_setting = (string)get_option($value['id']); |
|
| 1502 | - if (strstr($country_setting, ':')) : |
|
| 1503 | - $country = current(explode(':', $country_setting));
|
|
| 1504 | - $state = end(explode(':', $country_setting));
|
|
| 1505 | - else : |
|
| 1506 | - $country = $country_setting; |
|
| 1507 | - $state = '*'; |
|
| 1508 | - endif; |
|
| 1509 | - ?> |
|
| 1499 | + break; |
|
| 1500 | + case 'single_select_country' : |
|
| 1501 | + $country_setting = (string)get_option($value['id']); |
|
| 1502 | + if (strstr($country_setting, ':')) : |
|
| 1503 | + $country = current(explode(':', $country_setting));
|
|
| 1504 | + $state = end(explode(':', $country_setting));
|
|
| 1505 | + else : |
|
| 1506 | + $country = $country_setting; |
|
| 1507 | + $state = '*'; |
|
| 1508 | + endif; |
|
| 1509 | + ?> |
|
| 1510 | 1510 | <tr valign="top"> |
| 1511 | 1511 | <th scope="rpw" class="titledesc"><?php echo $value['name'] ?></th> |
| 1512 | 1512 | <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>" |
@@ -1517,12 +1517,12 @@ discard block |
||
| 1517 | 1517 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
| 1518 | 1518 | </td> |
| 1519 | 1519 | </tr><?php |
| 1520 | - break; |
|
| 1521 | - case 'multi_select_countries' : |
|
| 1522 | - $countries = $geodirectory->countries->countries; |
|
| 1523 | - asort($countries); |
|
| 1524 | - $selections = (array)get_option($value['id']); |
|
| 1525 | - ?> |
|
| 1520 | + break; |
|
| 1521 | + case 'multi_select_countries' : |
|
| 1522 | + $countries = $geodirectory->countries->countries; |
|
| 1523 | + asort($countries); |
|
| 1524 | + $selections = (array)get_option($value['id']); |
|
| 1525 | + ?> |
|
| 1526 | 1526 | <tr valign="top"> |
| 1527 | 1527 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1528 | 1528 | <td class="forminp"> |
@@ -1530,21 +1530,21 @@ discard block |
||
| 1530 | 1530 | data-placeholder="<?php _e('Choose countries…', 'geodirectory'); ?>"
|
| 1531 | 1531 | title="Country" class="chosen_select"> |
| 1532 | 1532 | <?php |
| 1533 | - if ($countries) foreach ($countries as $key => $val) : |
|
| 1534 | - echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
| 1535 | - endforeach; |
|
| 1536 | - ?> |
|
| 1533 | + if ($countries) foreach ($countries as $key => $val) : |
|
| 1534 | + echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
| 1535 | + endforeach; |
|
| 1536 | + ?> |
|
| 1537 | 1537 | </select> |
| 1538 | 1538 | </td> |
| 1539 | 1539 | </tr> |
| 1540 | 1540 | |
| 1541 | 1541 | <?php |
| 1542 | 1542 | |
| 1543 | - break; |
|
| 1543 | + break; |
|
| 1544 | 1544 | |
| 1545 | - case 'google_analytics' : |
|
| 1546 | - $selections = (array)get_option($value['id']); |
|
| 1547 | - ?> |
|
| 1545 | + case 'google_analytics' : |
|
| 1546 | + $selections = (array)get_option($value['id']); |
|
| 1547 | + ?> |
|
| 1548 | 1548 | <tr valign="top"> |
| 1549 | 1549 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1550 | 1550 | <td class="forminp"> |
@@ -1552,62 +1552,62 @@ discard block |
||
| 1552 | 1552 | |
| 1553 | 1553 | <?php |
| 1554 | 1554 | |
| 1555 | - $oAuthURL = "https://accounts.google.com/o/oauth2/auth?"; |
|
| 1556 | - $scope = "scope=https://www.googleapis.com/auth/analytics.readonly"; |
|
| 1557 | - $state = "&state=123";//any string |
|
| 1558 | - $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 1559 | - $response_type = "&response_type=code"; |
|
| 1560 | - $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
| 1561 | - $access_type = "&access_type=offline"; |
|
| 1562 | - $approval_prompt = "&approval_prompt=force"; |
|
| 1555 | + $oAuthURL = "https://accounts.google.com/o/oauth2/auth?"; |
|
| 1556 | + $scope = "scope=https://www.googleapis.com/auth/analytics.readonly"; |
|
| 1557 | + $state = "&state=123";//any string |
|
| 1558 | + $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 1559 | + $response_type = "&response_type=code"; |
|
| 1560 | + $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
| 1561 | + $access_type = "&access_type=offline"; |
|
| 1562 | + $approval_prompt = "&approval_prompt=force"; |
|
| 1563 | 1563 | |
| 1564 | - $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt; |
|
| 1564 | + $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt; |
|
| 1565 | 1565 | |
| 1566 | 1566 | |
| 1567 | - if (get_option('geodir_ga_auth_token')) {
|
|
| 1568 | - ?> |
|
| 1567 | + if (get_option('geodir_ga_auth_token')) {
|
|
| 1568 | + ?> |
|
| 1569 | 1569 | <span class="button-primary" |
| 1570 | 1570 | onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize');?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>
|
| 1571 | 1571 | <span style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>
|
| 1572 | 1572 | <?php |
| 1573 | - global $gd_ga_errors; |
|
| 1574 | - if(!empty($gd_ga_errors)){
|
|
| 1575 | - print_r($gd_ga_errors); |
|
| 1576 | - } |
|
| 1577 | - } else {
|
|
| 1578 | - ?> |
|
| 1573 | + global $gd_ga_errors; |
|
| 1574 | + if(!empty($gd_ga_errors)){
|
|
| 1575 | + print_r($gd_ga_errors); |
|
| 1576 | + } |
|
| 1577 | + } else {
|
|
| 1578 | + ?> |
|
| 1579 | 1579 | <span class="button-primary" |
| 1580 | 1580 | 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>
|
| 1581 | 1581 | <?php |
| 1582 | - } |
|
| 1583 | - ?> |
|
| 1582 | + } |
|
| 1583 | + ?> |
|
| 1584 | 1584 | </td> |
| 1585 | 1585 | </tr> |
| 1586 | 1586 | |
| 1587 | 1587 | <?php |
| 1588 | 1588 | |
| 1589 | 1589 | |
| 1590 | - break; |
|
| 1590 | + break; |
|
| 1591 | 1591 | |
| 1592 | - case 'field_seperator' : |
|
| 1592 | + case 'field_seperator' : |
|
| 1593 | 1593 | |
| 1594 | - ?> |
|
| 1594 | + ?> |
|
| 1595 | 1595 | <tr valign="top"> |
| 1596 | 1596 | <td colspan="2" class="forminp geodir_line_seperator"></td> |
| 1597 | 1597 | </tr> |
| 1598 | 1598 | <?php |
| 1599 | 1599 | |
| 1600 | - break; |
|
| 1600 | + break; |
|
| 1601 | 1601 | |
| 1602 | - endswitch; |
|
| 1602 | + endswitch; |
|
| 1603 | 1603 | |
| 1604 | - endforeach; |
|
| 1604 | + endforeach; |
|
| 1605 | 1605 | |
| 1606 | - if ($first_title === false) {
|
|
| 1607 | - echo "</div>"; |
|
| 1608 | - } |
|
| 1606 | + if ($first_title === false) {
|
|
| 1607 | + echo "</div>"; |
|
| 1608 | + } |
|
| 1609 | 1609 | |
| 1610 | - ?> |
|
| 1610 | + ?> |
|
| 1611 | 1611 | |
| 1612 | 1612 | <script type="text/javascript"> |
| 1613 | 1613 | |
@@ -1667,33 +1667,33 @@ discard block |
||
| 1667 | 1667 | */ |
| 1668 | 1668 | function geodir_post_info_setting() |
| 1669 | 1669 | {
|
| 1670 | - global $post, $post_id; |
|
| 1671 | - |
|
| 1672 | - $post_type = get_post_type(); |
|
| 1673 | - |
|
| 1674 | - $package_info = array(); |
|
| 1675 | - |
|
| 1676 | - $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1677 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename'); |
|
| 1678 | - echo '<div id="geodir_wrapper">'; |
|
| 1679 | - /** |
|
| 1680 | - * Called before the GD custom fields are output in the wp-admin area. |
|
| 1681 | - * |
|
| 1682 | - * @since 1.0.0 |
|
| 1683 | - * @see 'geodir_after_default_field_in_meta_box' |
|
| 1684 | - */ |
|
| 1685 | - do_action('geodir_before_default_field_in_meta_box');
|
|
| 1686 | - //geodir_get_custom_fields_html($package_info->pid,'default',$post_type); |
|
| 1687 | - // to display all fields in one information box |
|
| 1688 | - geodir_get_custom_fields_html($package_info->pid, 'all', $post_type); |
|
| 1689 | - /** |
|
| 1690 | - * Called after the GD custom fields are output in the wp-admin area. |
|
| 1691 | - * |
|
| 1692 | - * @since 1.0.0 |
|
| 1693 | - * @see 'geodir_before_default_field_in_meta_box' |
|
| 1694 | - */ |
|
| 1695 | - do_action('geodir_after_default_field_in_meta_box');
|
|
| 1696 | - echo '</div>'; |
|
| 1670 | + global $post, $post_id; |
|
| 1671 | + |
|
| 1672 | + $post_type = get_post_type(); |
|
| 1673 | + |
|
| 1674 | + $package_info = array(); |
|
| 1675 | + |
|
| 1676 | + $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1677 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename'); |
|
| 1678 | + echo '<div id="geodir_wrapper">'; |
|
| 1679 | + /** |
|
| 1680 | + * Called before the GD custom fields are output in the wp-admin area. |
|
| 1681 | + * |
|
| 1682 | + * @since 1.0.0 |
|
| 1683 | + * @see 'geodir_after_default_field_in_meta_box' |
|
| 1684 | + */ |
|
| 1685 | + do_action('geodir_before_default_field_in_meta_box');
|
|
| 1686 | + //geodir_get_custom_fields_html($package_info->pid,'default',$post_type); |
|
| 1687 | + // to display all fields in one information box |
|
| 1688 | + geodir_get_custom_fields_html($package_info->pid, 'all', $post_type); |
|
| 1689 | + /** |
|
| 1690 | + * Called after the GD custom fields are output in the wp-admin area. |
|
| 1691 | + * |
|
| 1692 | + * @since 1.0.0 |
|
| 1693 | + * @see 'geodir_before_default_field_in_meta_box' |
|
| 1694 | + */ |
|
| 1695 | + do_action('geodir_after_default_field_in_meta_box');
|
|
| 1696 | + echo '</div>'; |
|
| 1697 | 1697 | } |
| 1698 | 1698 | |
| 1699 | 1699 | /** |
@@ -1706,18 +1706,18 @@ discard block |
||
| 1706 | 1706 | */ |
| 1707 | 1707 | function geodir_post_addinfo_setting() |
| 1708 | 1708 | {
|
| 1709 | - global $post, $post_id; |
|
| 1709 | + global $post, $post_id; |
|
| 1710 | 1710 | |
| 1711 | - $post_type = get_post_type(); |
|
| 1711 | + $post_type = get_post_type(); |
|
| 1712 | 1712 | |
| 1713 | - $package_info = array(); |
|
| 1713 | + $package_info = array(); |
|
| 1714 | 1714 | |
| 1715 | - $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1715 | + $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1716 | 1716 | |
| 1717 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename'); |
|
| 1718 | - echo '<div id="geodir_wrapper">'; |
|
| 1719 | - geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type); |
|
| 1720 | - echo '</div>'; |
|
| 1717 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename'); |
|
| 1718 | + echo '<div id="geodir_wrapper">'; |
|
| 1719 | + geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type); |
|
| 1720 | + echo '</div>'; |
|
| 1721 | 1721 | |
| 1722 | 1722 | } |
| 1723 | 1723 | |
@@ -1731,60 +1731,60 @@ discard block |
||
| 1731 | 1731 | */ |
| 1732 | 1732 | function geodir_post_attachments() |
| 1733 | 1733 | {
|
| 1734 | - global $post, $post_id; |
|
| 1734 | + global $post, $post_id; |
|
| 1735 | 1735 | |
| 1736 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename'); |
|
| 1736 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename'); |
|
| 1737 | 1737 | |
| 1738 | - if (geodir_get_featured_image($post_id, 'thumbnail')) {
|
|
| 1739 | - echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
|
|
| 1740 | - geodir_show_featured_image($post_id, 'thumbnail'); |
|
| 1741 | - } |
|
| 1738 | + if (geodir_get_featured_image($post_id, 'thumbnail')) {
|
|
| 1739 | + echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
|
|
| 1740 | + geodir_show_featured_image($post_id, 'thumbnail'); |
|
| 1741 | + } |
|
| 1742 | 1742 | |
| 1743 | - $image_limit = 0; |
|
| 1743 | + $image_limit = 0; |
|
| 1744 | 1744 | |
| 1745 | - ?> |
|
| 1745 | + ?> |
|
| 1746 | 1746 | |
| 1747 | 1747 | |
| 1748 | 1748 | <h5 class="form_title"> |
| 1749 | 1749 | <?php if ($image_limit != 0 && $image_limit == 1) {
|
| 1750 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 1751 | - } ?> |
|
| 1750 | + echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 1751 | + } ?> |
|
| 1752 | 1752 | <?php if ($image_limit != 0 && $image_limit > 1) {
|
| 1753 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 1754 | - } ?> |
|
| 1753 | + echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 1754 | + } ?> |
|
| 1755 | 1755 | <?php if ($image_limit == 0) {
|
| 1756 | - echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 1757 | - } ?> |
|
| 1756 | + echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 1757 | + } ?> |
|
| 1758 | 1758 | </h5> |
| 1759 | 1759 | |
| 1760 | 1760 | |
| 1761 | 1761 | <?php |
| 1762 | 1762 | |
| 1763 | - $curImages = geodir_get_images($post_id); |
|
| 1764 | - $place_img_array = array(); |
|
| 1763 | + $curImages = geodir_get_images($post_id); |
|
| 1764 | + $place_img_array = array(); |
|
| 1765 | 1765 | |
| 1766 | - if (!empty($curImages)): |
|
| 1767 | - foreach ($curImages as $p_img): |
|
| 1768 | - $place_img_array[] = $p_img->src; |
|
| 1769 | - endforeach; |
|
| 1770 | - endif; |
|
| 1766 | + if (!empty($curImages)): |
|
| 1767 | + foreach ($curImages as $p_img): |
|
| 1768 | + $place_img_array[] = $p_img->src; |
|
| 1769 | + endforeach; |
|
| 1770 | + endif; |
|
| 1771 | 1771 | |
| 1772 | - if (!empty($place_img_array)) |
|
| 1773 | - $curImages = implode(',', $place_img_array);
|
|
| 1772 | + if (!empty($place_img_array)) |
|
| 1773 | + $curImages = implode(',', $place_img_array);
|
|
| 1774 | 1774 | |
| 1775 | 1775 | |
| 1776 | - // adjust values here |
|
| 1777 | - $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 |
|
| 1776 | + // adjust values here |
|
| 1777 | + $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 |
|
| 1778 | 1778 | |
| 1779 | - $svalue = $curImages; // this will be initial value of the above form field. Image urls. |
|
| 1779 | + $svalue = $curImages; // this will be initial value of the above form field. Image urls. |
|
| 1780 | 1780 | |
| 1781 | - $multiple = true; // allow multiple files upload |
|
| 1781 | + $multiple = true; // allow multiple files upload |
|
| 1782 | 1782 | |
| 1783 | - $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels) |
|
| 1783 | + $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels) |
|
| 1784 | 1784 | |
| 1785 | - $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels) |
|
| 1785 | + $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels) |
|
| 1786 | 1786 | |
| 1787 | - ?> |
|
| 1787 | + ?> |
|
| 1788 | 1788 | |
| 1789 | 1789 | <div class="gtd-form_row clearfix" id="<?php echo $id; ?>dropbox" style="border:1px solid #999999;padding:5px;text-align:center;"> |
| 1790 | 1790 | <input type="hidden" name="<?php echo $id; ?>" id="<?php echo $id; ?>" value="<?php echo $svalue; ?>"/> |
@@ -1826,13 +1826,13 @@ discard block |
||
| 1826 | 1826 | */ |
| 1827 | 1827 | function geodir_action_post_updated($post_ID, $post_after, $post_before) |
| 1828 | 1828 | {
|
| 1829 | - $post_type = get_post_type($post_ID); |
|
| 1829 | + $post_type = get_post_type($post_ID); |
|
| 1830 | 1830 | |
| 1831 | - if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
|
| 1832 | - 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) {
|
|
| 1833 | - geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title); |
|
| 1834 | - } |
|
| 1835 | - } |
|
| 1831 | + if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
|
| 1832 | + 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) {
|
|
| 1833 | + geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title); |
|
| 1834 | + } |
|
| 1835 | + } |
|
| 1836 | 1836 | } |
| 1837 | 1837 | |
| 1838 | 1838 | /** |
@@ -1847,39 +1847,39 @@ discard block |
||
| 1847 | 1847 | */ |
| 1848 | 1848 | function geodir_notification_add_bcc_option($settings) |
| 1849 | 1849 | {
|
| 1850 | - if (!empty($settings)) {
|
|
| 1851 | - $new_settings = array(); |
|
| 1852 | - foreach ($settings as $setting) {
|
|
| 1853 | - if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {
|
|
| 1854 | - $geodir_bcc_listing_published_yes = array( |
|
| 1855 | - 'name' => __('Listing published', 'geodirectory'),
|
|
| 1856 | - 'desc' => __('Yes', 'geodirectory'),
|
|
| 1857 | - 'id' => 'geodir_bcc_listing_published', |
|
| 1858 | - 'std' => 'yes', |
|
| 1859 | - 'type' => 'radio', |
|
| 1860 | - 'value' => '1', |
|
| 1861 | - 'radiogroup' => 'start' |
|
| 1862 | - ); |
|
| 1863 | - |
|
| 1864 | - $geodir_bcc_listing_published_no = array( |
|
| 1865 | - 'name' => __('Listing published', 'geodirectory'),
|
|
| 1866 | - 'desc' => __('No', 'geodirectory'),
|
|
| 1867 | - 'id' => 'geodir_bcc_listing_published', |
|
| 1868 | - 'std' => 'yes', |
|
| 1869 | - 'type' => 'radio', |
|
| 1870 | - 'value' => '0', |
|
| 1871 | - 'radiogroup' => 'end' |
|
| 1872 | - ); |
|
| 1873 | - |
|
| 1874 | - $new_settings[] = $geodir_bcc_listing_published_yes; |
|
| 1875 | - $new_settings[] = $geodir_bcc_listing_published_no; |
|
| 1876 | - } |
|
| 1877 | - $new_settings[] = $setting; |
|
| 1878 | - } |
|
| 1879 | - $settings = $new_settings; |
|
| 1880 | - } |
|
| 1850 | + if (!empty($settings)) {
|
|
| 1851 | + $new_settings = array(); |
|
| 1852 | + foreach ($settings as $setting) {
|
|
| 1853 | + if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {
|
|
| 1854 | + $geodir_bcc_listing_published_yes = array( |
|
| 1855 | + 'name' => __('Listing published', 'geodirectory'),
|
|
| 1856 | + 'desc' => __('Yes', 'geodirectory'),
|
|
| 1857 | + 'id' => 'geodir_bcc_listing_published', |
|
| 1858 | + 'std' => 'yes', |
|
| 1859 | + 'type' => 'radio', |
|
| 1860 | + 'value' => '1', |
|
| 1861 | + 'radiogroup' => 'start' |
|
| 1862 | + ); |
|
| 1863 | + |
|
| 1864 | + $geodir_bcc_listing_published_no = array( |
|
| 1865 | + 'name' => __('Listing published', 'geodirectory'),
|
|
| 1866 | + 'desc' => __('No', 'geodirectory'),
|
|
| 1867 | + 'id' => 'geodir_bcc_listing_published', |
|
| 1868 | + 'std' => 'yes', |
|
| 1869 | + 'type' => 'radio', |
|
| 1870 | + 'value' => '0', |
|
| 1871 | + 'radiogroup' => 'end' |
|
| 1872 | + ); |
|
| 1873 | + |
|
| 1874 | + $new_settings[] = $geodir_bcc_listing_published_yes; |
|
| 1875 | + $new_settings[] = $geodir_bcc_listing_published_no; |
|
| 1876 | + } |
|
| 1877 | + $new_settings[] = $setting; |
|
| 1878 | + } |
|
| 1879 | + $settings = $new_settings; |
|
| 1880 | + } |
|
| 1881 | 1881 | |
| 1882 | - return $settings; |
|
| 1882 | + return $settings; |
|
| 1883 | 1883 | } |
| 1884 | 1884 | |
| 1885 | 1885 | |
@@ -1894,19 +1894,19 @@ discard block |
||
| 1894 | 1894 | */ |
| 1895 | 1895 | function get_gd_theme_compat_callback() |
| 1896 | 1896 | {
|
| 1897 | - global $wpdb; |
|
| 1898 | - $themes = get_option('gd_theme_compats');
|
|
| 1899 | - |
|
| 1900 | - if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {
|
|
| 1901 | - if (isset($_POST['export'])) {
|
|
| 1902 | - echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']])); |
|
| 1903 | - } else {
|
|
| 1904 | - echo json_encode($themes[$_POST['theme']]); |
|
| 1905 | - } |
|
| 1897 | + global $wpdb; |
|
| 1898 | + $themes = get_option('gd_theme_compats');
|
|
| 1906 | 1899 | |
| 1907 | - } |
|
| 1900 | + if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {
|
|
| 1901 | + if (isset($_POST['export'])) {
|
|
| 1902 | + echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']])); |
|
| 1903 | + } else {
|
|
| 1904 | + echo json_encode($themes[$_POST['theme']]); |
|
| 1905 | + } |
|
| 1906 | + |
|
| 1907 | + } |
|
| 1908 | 1908 | |
| 1909 | - die(); |
|
| 1909 | + die(); |
|
| 1910 | 1910 | } |
| 1911 | 1911 | |
| 1912 | 1912 | add_action('wp_ajax_get_gd_theme_compat_import_callback', 'get_gd_theme_compat_import_callback');
|
@@ -1920,20 +1920,20 @@ discard block |
||
| 1920 | 1920 | */ |
| 1921 | 1921 | function get_gd_theme_compat_import_callback() |
| 1922 | 1922 | {
|
| 1923 | - global $wpdb; |
|
| 1924 | - $themes = get_option('gd_theme_compats');
|
|
| 1925 | - if (isset($_POST['theme']) && !empty($_POST['theme'])) {
|
|
| 1926 | - $json = json_decode(stripslashes($_POST['theme']), true); |
|
| 1927 | - if (!empty($json) && is_array($json)) {
|
|
| 1928 | - $key = sanitize_text_field(key($json)); |
|
| 1929 | - $themes[$key] = $json[$key]; |
|
| 1930 | - update_option('gd_theme_compats', $themes);
|
|
| 1931 | - echo $key; |
|
| 1932 | - die(); |
|
| 1933 | - } |
|
| 1934 | - } |
|
| 1935 | - echo '0'; |
|
| 1936 | - die(); |
|
| 1923 | + global $wpdb; |
|
| 1924 | + $themes = get_option('gd_theme_compats');
|
|
| 1925 | + if (isset($_POST['theme']) && !empty($_POST['theme'])) {
|
|
| 1926 | + $json = json_decode(stripslashes($_POST['theme']), true); |
|
| 1927 | + if (!empty($json) && is_array($json)) {
|
|
| 1928 | + $key = sanitize_text_field(key($json)); |
|
| 1929 | + $themes[$key] = $json[$key]; |
|
| 1930 | + update_option('gd_theme_compats', $themes);
|
|
| 1931 | + echo $key; |
|
| 1932 | + die(); |
|
| 1933 | + } |
|
| 1934 | + } |
|
| 1935 | + echo '0'; |
|
| 1936 | + die(); |
|
| 1937 | 1937 | } |
| 1938 | 1938 | |
| 1939 | 1939 | |
@@ -1946,39 +1946,39 @@ discard block |
||
| 1946 | 1946 | */ |
| 1947 | 1947 | function gd_set_theme_compat() |
| 1948 | 1948 | {
|
| 1949 | - global $wpdb; |
|
| 1950 | - $theme = wp_get_theme(); |
|
| 1949 | + global $wpdb; |
|
| 1950 | + $theme = wp_get_theme(); |
|
| 1951 | 1951 | |
| 1952 | - if ($theme->parent()) {
|
|
| 1953 | - $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));
|
|
| 1954 | - } else {
|
|
| 1955 | - $theme_name = str_replace(" ", "_", $theme->get('Name'));
|
|
| 1956 | - } |
|
| 1952 | + if ($theme->parent()) {
|
|
| 1953 | + $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));
|
|
| 1954 | + } else {
|
|
| 1955 | + $theme_name = str_replace(" ", "_", $theme->get('Name'));
|
|
| 1956 | + } |
|
| 1957 | 1957 | |
| 1958 | - $theme_compats = get_option('gd_theme_compats');
|
|
| 1959 | - $current_compat = get_option('gd_theme_compat');
|
|
| 1960 | - $current_compat = str_replace("_custom", "", $current_compat);
|
|
| 1958 | + $theme_compats = get_option('gd_theme_compats');
|
|
| 1959 | + $current_compat = get_option('gd_theme_compat');
|
|
| 1960 | + $current_compat = str_replace("_custom", "", $current_compat);
|
|
| 1961 | 1961 | |
| 1962 | - if ($current_compat == $theme_name && strpos(get_option('gd_theme_compat'), "_custom") !== false) {
|
|
| 1963 | - return; |
|
| 1964 | - }// if already running correct compat then bail |
|
| 1962 | + if ($current_compat == $theme_name && strpos(get_option('gd_theme_compat'), "_custom") !== false) {
|
|
| 1963 | + return; |
|
| 1964 | + }// if already running correct compat then bail |
|
| 1965 | 1965 | |
| 1966 | - if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it
|
|
| 1967 | - update_option('gd_theme_compat', $theme_name);
|
|
| 1968 | - update_option('theme_compatibility_setting', $theme_compats[$theme_name]);
|
|
| 1966 | + if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it
|
|
| 1967 | + update_option('gd_theme_compat', $theme_name);
|
|
| 1968 | + update_option('theme_compatibility_setting', $theme_compats[$theme_name]);
|
|
| 1969 | 1969 | |
| 1970 | - // if there are default options to set then set them |
|
| 1971 | - if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {
|
|
| 1970 | + // if there are default options to set then set them |
|
| 1971 | + if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {
|
|
| 1972 | 1972 | |
| 1973 | - foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {
|
|
| 1974 | - update_option($key, $val); |
|
| 1975 | - } |
|
| 1976 | - } |
|
| 1973 | + foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {
|
|
| 1974 | + update_option($key, $val); |
|
| 1975 | + } |
|
| 1976 | + } |
|
| 1977 | 1977 | |
| 1978 | - } else {
|
|
| 1979 | - update_option('gd_theme_compat', '');
|
|
| 1980 | - update_option('theme_compatibility_setting', '');
|
|
| 1981 | - } |
|
| 1978 | + } else {
|
|
| 1979 | + update_option('gd_theme_compat', '');
|
|
| 1980 | + update_option('theme_compatibility_setting', '');
|
|
| 1981 | + } |
|
| 1982 | 1982 | |
| 1983 | 1983 | |
| 1984 | 1984 | } |
@@ -1993,9 +1993,9 @@ discard block |
||
| 1993 | 1993 | */ |
| 1994 | 1994 | function gd_check_avada_compat() |
| 1995 | 1995 | {
|
| 1996 | - if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {
|
|
| 1997 | - add_action('admin_notices', 'gd_avada_compat_warning');
|
|
| 1998 | - } |
|
| 1996 | + if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {
|
|
| 1997 | + add_action('admin_notices', 'gd_avada_compat_warning');
|
|
| 1998 | + } |
|
| 1999 | 1999 | } |
| 2000 | 2000 | |
| 2001 | 2001 | |
@@ -2008,22 +2008,22 @@ discard block |
||
| 2008 | 2008 | function gd_avada_compat_warning() |
| 2009 | 2009 | {
|
| 2010 | 2010 | |
| 2011 | - /* |
|
| 2011 | + /* |
|
| 2012 | 2012 | $msg_type = error |
| 2013 | 2013 | $msg_type = updated fade |
| 2014 | 2014 | $msg_type = update-nag |
| 2015 | 2015 | */ |
| 2016 | 2016 | |
| 2017 | - $plugin = 'avada-nag'; |
|
| 2018 | - $timestamp = 'avada-nag1234'; |
|
| 2019 | - $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');
|
|
| 2020 | - echo '<div id="' . $timestamp . '" class="error">'; |
|
| 2021 | - echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>'; |
|
| 2022 | - echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";
|
|
| 2023 | - echo "<p>$message</p>"; |
|
| 2024 | - echo "</div>"; |
|
| 2017 | + $plugin = 'avada-nag'; |
|
| 2018 | + $timestamp = 'avada-nag1234'; |
|
| 2019 | + $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');
|
|
| 2020 | + echo '<div id="' . $timestamp . '" class="error">'; |
|
| 2021 | + echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>'; |
|
| 2022 | + echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";
|
|
| 2023 | + echo "<p>$message</p>"; |
|
| 2024 | + echo "</div>"; |
|
| 2025 | 2025 | |
| 2026 | - ?> |
|
| 2026 | + ?> |
|
| 2027 | 2027 | <script> |
| 2028 | 2028 | function gdRemoveANotification($plugin, $timestamp) {
|
| 2029 | 2029 | |
@@ -2091,10 +2091,10 @@ discard block |
||
| 2091 | 2091 | */ |
| 2092 | 2092 | function geodir_avada_remove_notification() |
| 2093 | 2093 | {
|
| 2094 | - update_option('avada_nag', TRUE);
|
|
| 2094 | + update_option('avada_nag', TRUE);
|
|
| 2095 | 2095 | |
| 2096 | - // Always die in functions echoing ajax content |
|
| 2097 | - die(); |
|
| 2096 | + // Always die in functions echoing ajax content |
|
| 2097 | + die(); |
|
| 2098 | 2098 | } |
| 2099 | 2099 | |
| 2100 | 2100 | |
@@ -2116,9 +2116,9 @@ discard block |
||
| 2116 | 2116 | global $post, $typenow, $current_screen; |
| 2117 | 2117 | |
| 2118 | 2118 | $post_type = NULL; |
| 2119 | - if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) |
|
| 2119 | + if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) |
|
| 2120 | 2120 | $post_type = get_post_type($_REQUEST['post']); |
| 2121 | - elseif ($post && isset($post->post_type)) |
|
| 2121 | + elseif ($post && isset($post->post_type)) |
|
| 2122 | 2122 | $post_type = $post->post_type; |
| 2123 | 2123 | elseif ($typenow) |
| 2124 | 2124 | $post_type = $typenow; |
@@ -2153,7 +2153,7 @@ discard block |
||
| 2153 | 2153 | // Don't allow same slug url for listing and location |
| 2154 | 2154 | if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {
|
| 2155 | 2155 | $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');
|
| 2156 | - wp_redirect($redirect_url); |
|
| 2156 | + wp_redirect($redirect_url); |
|
| 2157 | 2157 | exit; |
| 2158 | 2158 | } |
| 2159 | 2159 | |
@@ -2183,10 +2183,10 @@ discard block |
||
| 2183 | 2183 | * @package GeoDirectory |
| 2184 | 2184 | */ |
| 2185 | 2185 | function geodir_hide_admin_preview_button() {
|
| 2186 | - global $post_type; |
|
| 2187 | - $post_types = geodir_get_posttypes(); |
|
| 2188 | - if(in_array($post_type, $post_types)) |
|
| 2189 | - echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
|
|
| 2186 | + global $post_type; |
|
| 2187 | + $post_types = geodir_get_posttypes(); |
|
| 2188 | + if(in_array($post_type, $post_types)) |
|
| 2189 | + echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
|
|
| 2190 | 2190 | } |
| 2191 | 2191 | add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' ); |
| 2192 | 2192 | add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' ); |
@@ -2201,7 +2201,7 @@ discard block |
||
| 2201 | 2201 | */ |
| 2202 | 2202 | function geodir_import_export_tab( $tabs ) {
|
| 2203 | 2203 | $tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) ); |
| 2204 | - return $tabs; |
|
| 2204 | + return $tabs; |
|
| 2205 | 2205 | } |
| 2206 | 2206 | |
| 2207 | 2207 | /** |
@@ -2216,26 +2216,26 @@ discard block |
||
| 2216 | 2216 | function geodir_import_export_page() {
|
| 2217 | 2217 | $nonce = wp_create_nonce( 'geodir_import_export_nonce' ); |
| 2218 | 2218 | $gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv'; |
| 2219 | - /** |
|
| 2220 | - * Filter sample category data csv file url. |
|
| 2221 | - * |
|
| 2222 | - * @since 1.0.0 |
|
| 2223 | - * @package GeoDirectory |
|
| 2224 | - * |
|
| 2225 | - * @param string $gd_cats_sample_csv Sample category data csv file url. |
|
| 2226 | - */ |
|
| 2219 | + /** |
|
| 2220 | + * Filter sample category data csv file url. |
|
| 2221 | + * |
|
| 2222 | + * @since 1.0.0 |
|
| 2223 | + * @package GeoDirectory |
|
| 2224 | + * |
|
| 2225 | + * @param string $gd_cats_sample_csv Sample category data csv file url. |
|
| 2226 | + */ |
|
| 2227 | 2227 | $gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv ); |
| 2228 | 2228 | |
| 2229 | 2229 | $gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv'; |
| 2230 | - /** |
|
| 2231 | - * Filter sample post data csv file url. |
|
| 2232 | - * |
|
| 2233 | - * @since 1.0.0 |
|
| 2234 | - * @package GeoDirectory |
|
| 2235 | - * |
|
| 2236 | - * @param string $gd_posts_sample_csv Sample post data csv file url. |
|
| 2237 | - */ |
|
| 2238 | - $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv ); |
|
| 2230 | + /** |
|
| 2231 | + * Filter sample post data csv file url. |
|
| 2232 | + * |
|
| 2233 | + * @since 1.0.0 |
|
| 2234 | + * @package GeoDirectory |
|
| 2235 | + * |
|
| 2236 | + * @param string $gd_posts_sample_csv Sample post data csv file url. |
|
| 2237 | + */ |
|
| 2238 | + $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv ); |
|
| 2239 | 2239 | |
| 2240 | 2240 | $gd_posttypes = geodir_get_posttypes( 'array' ); |
| 2241 | 2241 | |
@@ -2258,14 +2258,14 @@ discard block |
||
| 2258 | 2258 | $gd_chunksize_options[100000] = 100000; |
| 2259 | 2259 | |
| 2260 | 2260 | /** |
| 2261 | - * Filter max entries per export csv file. |
|
| 2262 | - * |
|
| 2263 | - * @since 1.5.6 |
|
| 2264 | - * @package GeoDirectory |
|
| 2265 | - * |
|
| 2266 | - * @param string $gd_chunksize_options Entries options. |
|
| 2267 | - */ |
|
| 2268 | - $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options ); |
|
| 2261 | + * Filter max entries per export csv file. |
|
| 2262 | + * |
|
| 2263 | + * @since 1.5.6 |
|
| 2264 | + * @package GeoDirectory |
|
| 2265 | + * |
|
| 2266 | + * @param string $gd_chunksize_options Entries options. |
|
| 2267 | + */ |
|
| 2268 | + $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options ); |
|
| 2269 | 2269 | |
| 2270 | 2270 | $gd_chunksize_option = ''; |
| 2271 | 2271 | foreach ($gd_chunksize_options as $value => $title) {
|
@@ -2282,12 +2282,12 @@ discard block |
||
| 2282 | 2282 | <div class="gd-content-heading"> |
| 2283 | 2283 | |
| 2284 | 2284 | <?php |
| 2285 | - ini_set('max_execution_time', 999999);
|
|
| 2286 | - $ini_max_execution_time_check = @ini_get( 'max_execution_time' ); |
|
| 2287 | - ini_restore('max_execution_time');
|
|
| 2285 | + ini_set('max_execution_time', 999999);
|
|
| 2286 | + $ini_max_execution_time_check = @ini_get( 'max_execution_time' ); |
|
| 2287 | + ini_restore('max_execution_time');
|
|
| 2288 | 2288 | |
| 2289 | - if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting
|
|
| 2290 | - ?> |
|
| 2289 | + if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting
|
|
| 2290 | + ?> |
|
| 2291 | 2291 | <div id="gd_ie_reqs" class="metabox-holder"> |
| 2292 | 2292 | <div class="meta-box-sortables ui-sortable"> |
| 2293 | 2293 | <div class="postbox"> |
@@ -2460,7 +2460,7 @@ discard block |
||
| 2460 | 2460 | * Called just after the sample CSV download link. |
| 2461 | 2461 | * |
| 2462 | 2462 | * @since 1.0.0 |
| 2463 | - * @package GeoDirectory |
|
| 2463 | + * @package GeoDirectory |
|
| 2464 | 2464 | */ |
| 2465 | 2465 | do_action('geodir_sample_cats_csv_download_link');
|
| 2466 | 2466 | ?> |
@@ -2545,11 +2545,11 @@ discard block |
||
| 2545 | 2545 | * |
| 2546 | 2546 | * Called after the last setting on the GD > Import & Export page. |
| 2547 | 2547 | * @since 1.4.6 |
| 2548 | - * @package GeoDirectory |
|
| 2548 | + * @package GeoDirectory |
|
| 2549 | 2549 | * |
| 2550 | 2550 | * @param array $gd_posttypes GD post types. |
| 2551 | - * @param array $gd_chunksize_options File chunk size options. |
|
| 2552 | - * @param string $nonce Wordpress security token for GD import & export. |
|
| 2551 | + * @param array $gd_chunksize_options File chunk size options. |
|
| 2552 | + * @param string $nonce Wordpress security token for GD import & export. |
|
| 2553 | 2553 | */ |
| 2554 | 2554 | do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce ); |
| 2555 | 2555 | ?> |
@@ -3236,44 +3236,44 @@ discard block |
||
| 3236 | 3236 | function geodir_init_filesystem() |
| 3237 | 3237 | {
|
| 3238 | 3238 | |
| 3239 | - if(!function_exists('get_filesystem_method')){
|
|
| 3240 | - require_once(ABSPATH."/wp-admin/includes/file.php"); |
|
| 3241 | - } |
|
| 3242 | - $access_type = get_filesystem_method(); |
|
| 3243 | - if ($access_type === 'direct') {
|
|
| 3244 | - /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */ |
|
| 3245 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3246 | - |
|
| 3247 | - /* initialize the API */ |
|
| 3248 | - if (!WP_Filesystem($creds)) {
|
|
| 3249 | - /* any problems and we exit */ |
|
| 3250 | - //return '@@@3'; |
|
| 3251 | - return false; |
|
| 3252 | - } |
|
| 3239 | + if(!function_exists('get_filesystem_method')){
|
|
| 3240 | + require_once(ABSPATH."/wp-admin/includes/file.php"); |
|
| 3241 | + } |
|
| 3242 | + $access_type = get_filesystem_method(); |
|
| 3243 | + if ($access_type === 'direct') {
|
|
| 3244 | + /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */ |
|
| 3245 | + $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3246 | + |
|
| 3247 | + /* initialize the API */ |
|
| 3248 | + if (!WP_Filesystem($creds)) {
|
|
| 3249 | + /* any problems and we exit */ |
|
| 3250 | + //return '@@@3'; |
|
| 3251 | + return false; |
|
| 3252 | + } |
|
| 3253 | 3253 | |
| 3254 | - global $wp_filesystem; |
|
| 3255 | - return $wp_filesystem; |
|
| 3256 | - /* do our file manipulations below */ |
|
| 3257 | - } elseif (defined('FTP_USER')) {
|
|
| 3258 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3254 | + global $wp_filesystem; |
|
| 3255 | + return $wp_filesystem; |
|
| 3256 | + /* do our file manipulations below */ |
|
| 3257 | + } elseif (defined('FTP_USER')) {
|
|
| 3258 | + $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3259 | + |
|
| 3260 | + /* initialize the API */ |
|
| 3261 | + if (!WP_Filesystem($creds)) {
|
|
| 3262 | + /* any problems and we exit */ |
|
| 3263 | + //return '@@@33'; |
|
| 3264 | + return false; |
|
| 3265 | + } |
|
| 3259 | 3266 | |
| 3260 | - /* initialize the API */ |
|
| 3261 | - if (!WP_Filesystem($creds)) {
|
|
| 3262 | - /* any problems and we exit */ |
|
| 3263 | - //return '@@@33'; |
|
| 3264 | - return false; |
|
| 3265 | - } |
|
| 3267 | + global $wp_filesystem; |
|
| 3268 | + //return '@@@1'; |
|
| 3269 | + return $wp_filesystem; |
|
| 3266 | 3270 | |
| 3267 | - global $wp_filesystem; |
|
| 3268 | - //return '@@@1'; |
|
| 3269 | - return $wp_filesystem; |
|
| 3270 | - |
|
| 3271 | - } else {
|
|
| 3272 | - //return '@@@2'; |
|
| 3273 | - /* don't have direct write access. Prompt user with our notice */ |
|
| 3274 | - add_action('admin_notice', 'geodir_filesystem_notice');
|
|
| 3275 | - return false; |
|
| 3276 | - } |
|
| 3271 | + } else {
|
|
| 3272 | + //return '@@@2'; |
|
| 3273 | + /* don't have direct write access. Prompt user with our notice */ |
|
| 3274 | + add_action('admin_notice', 'geodir_filesystem_notice');
|
|
| 3275 | + return false; |
|
| 3276 | + } |
|
| 3277 | 3277 | |
| 3278 | 3278 | } |
| 3279 | 3279 | |
@@ -3291,10 +3291,10 @@ discard block |
||
| 3291 | 3291 | */ |
| 3292 | 3292 | function geodir_filesystem_notice() |
| 3293 | 3293 | { if ( defined( 'DOING_AJAX' ) ){return;}
|
| 3294 | - $access_type = get_filesystem_method(); |
|
| 3295 | - if ($access_type === 'direct') {
|
|
| 3296 | - } elseif (!defined('FTP_USER')) {
|
|
| 3297 | - ?> |
|
| 3294 | + $access_type = get_filesystem_method(); |
|
| 3295 | + if ($access_type === 'direct') {
|
|
| 3296 | + } elseif (!defined('FTP_USER')) {
|
|
| 3297 | + ?> |
|
| 3298 | 3298 | <div class="error"> |
| 3299 | 3299 | <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'); ?>
|
| 3300 | 3300 | <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> |
@@ -3321,1258 +3321,1258 @@ discard block |
||
| 3321 | 3321 | * @return string Json data. |
| 3322 | 3322 | */ |
| 3323 | 3323 | function geodir_ajax_import_export() {
|
| 3324 | - global $wpdb, $plugin_prefix, $current_user, $wp_filesystem; |
|
| 3324 | + global $wpdb, $plugin_prefix, $current_user, $wp_filesystem; |
|
| 3325 | 3325 | |
| 3326 | - error_reporting(0); |
|
| 3326 | + error_reporting(0); |
|
| 3327 | 3327 | |
| 3328 | - $xstart = microtime(true); |
|
| 3328 | + $xstart = microtime(true); |
|
| 3329 | 3329 | |
| 3330 | - // try to set higher limits for import |
|
| 3331 | - $max_input_time = ini_get('max_input_time');
|
|
| 3332 | - $max_execution_time = ini_get('max_execution_time');
|
|
| 3333 | - $memory_limit= ini_get('memory_limit');
|
|
| 3330 | + // try to set higher limits for import |
|
| 3331 | + $max_input_time = ini_get('max_input_time');
|
|
| 3332 | + $max_execution_time = ini_get('max_execution_time');
|
|
| 3333 | + $memory_limit= ini_get('memory_limit');
|
|
| 3334 | 3334 | |
| 3335 | - if(!$max_input_time || $max_input_time<3000){
|
|
| 3336 | - ini_set('max_input_time', 3000);
|
|
| 3337 | - } |
|
| 3335 | + if(!$max_input_time || $max_input_time<3000){
|
|
| 3336 | + ini_set('max_input_time', 3000);
|
|
| 3337 | + } |
|
| 3338 | 3338 | |
| 3339 | - if(!$max_execution_time || $max_execution_time<3000){
|
|
| 3340 | - ini_set('max_execution_time', 3000);
|
|
| 3341 | - } |
|
| 3339 | + if(!$max_execution_time || $max_execution_time<3000){
|
|
| 3340 | + ini_set('max_execution_time', 3000);
|
|
| 3341 | + } |
|
| 3342 | 3342 | |
| 3343 | - if($memory_limit && str_replace('M','',$memory_limit)){
|
|
| 3344 | - if(str_replace('M','',$memory_limit)<256){
|
|
| 3345 | - ini_set('memory_limit', '256M');
|
|
| 3346 | - } |
|
| 3347 | - } |
|
| 3343 | + if($memory_limit && str_replace('M','',$memory_limit)){
|
|
| 3344 | + if(str_replace('M','',$memory_limit)<256){
|
|
| 3345 | + ini_set('memory_limit', '256M');
|
|
| 3346 | + } |
|
| 3347 | + } |
|
| 3348 | 3348 | |
| 3349 | - $json = array(); |
|
| 3349 | + $json = array(); |
|
| 3350 | 3350 | |
| 3351 | - if ( !current_user_can( 'manage_options' ) ) {
|
|
| 3352 | - wp_send_json( $json ); |
|
| 3353 | - } |
|
| 3351 | + if ( !current_user_can( 'manage_options' ) ) {
|
|
| 3352 | + wp_send_json( $json ); |
|
| 3353 | + } |
|
| 3354 | 3354 | |
| 3355 | - $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL; |
|
| 3356 | - $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL; |
|
| 3357 | - $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false; |
|
| 3355 | + $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL; |
|
| 3356 | + $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL; |
|
| 3357 | + $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false; |
|
| 3358 | 3358 | |
| 3359 | - if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {
|
|
| 3360 | - wp_send_json( $json ); |
|
| 3361 | - } |
|
| 3359 | + if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {
|
|
| 3360 | + wp_send_json( $json ); |
|
| 3361 | + } |
|
| 3362 | 3362 | |
| 3363 | - $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL; |
|
| 3364 | - $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL; |
|
| 3365 | - $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page; |
|
| 3366 | - $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1; |
|
| 3363 | + $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL; |
|
| 3364 | + $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL; |
|
| 3365 | + $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page; |
|
| 3366 | + $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1; |
|
| 3367 | 3367 | |
| 3368 | - $wp_filesystem = geodir_init_filesystem(); |
|
| 3369 | - if (!$wp_filesystem) {
|
|
| 3370 | - $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' ); |
|
| 3371 | - wp_send_json( $json ); |
|
| 3372 | - } |
|
| 3368 | + $wp_filesystem = geodir_init_filesystem(); |
|
| 3369 | + if (!$wp_filesystem) {
|
|
| 3370 | + $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' ); |
|
| 3371 | + wp_send_json( $json ); |
|
| 3372 | + } |
|
| 3373 | 3373 | |
| 3374 | - if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
|
|
| 3375 | - $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' ); |
|
| 3376 | - wp_send_json( $json ); |
|
| 3377 | - } |
|
| 3374 | + if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
|
|
| 3375 | + $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' ); |
|
| 3376 | + wp_send_json( $json ); |
|
| 3377 | + } |
|
| 3378 | 3378 | |
| 3379 | - $csv_file_dir = geodir_path_import_export( false ); |
|
| 3380 | - if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {
|
|
| 3381 | - if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {
|
|
| 3382 | - $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3383 | - wp_send_json( $json ); |
|
| 3384 | - } |
|
| 3385 | - } |
|
| 3379 | + $csv_file_dir = geodir_path_import_export( false ); |
|
| 3380 | + if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {
|
|
| 3381 | + if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {
|
|
| 3382 | + $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3383 | + wp_send_json( $json ); |
|
| 3384 | + } |
|
| 3385 | + } |
|
| 3386 | 3386 | |
| 3387 | - $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
|
| 3388 | - $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 3389 | - |
|
| 3390 | - switch ( $task ) {
|
|
| 3391 | - case 'export_posts': {
|
|
| 3392 | - // WPML |
|
| 3393 | - $is_wpml = geodir_is_wpml(); |
|
| 3394 | - if ($is_wpml) {
|
|
| 3395 | - global $sitepress; |
|
| 3396 | - $active_lang = ICL_LANGUAGE_CODE; |
|
| 3387 | + $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
|
| 3388 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 3389 | + |
|
| 3390 | + switch ( $task ) {
|
|
| 3391 | + case 'export_posts': {
|
|
| 3392 | + // WPML |
|
| 3393 | + $is_wpml = geodir_is_wpml(); |
|
| 3394 | + if ($is_wpml) {
|
|
| 3395 | + global $sitepress; |
|
| 3396 | + $active_lang = ICL_LANGUAGE_CODE; |
|
| 3397 | 3397 | |
| 3398 | - $sitepress->switch_lang('all', true);
|
|
| 3399 | - } |
|
| 3400 | - // WPML |
|
| 3401 | - if ( $post_type == 'gd_event' ) {
|
|
| 3402 | - add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 ); |
|
| 3403 | - } |
|
| 3404 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 3398 | + $sitepress->switch_lang('all', true);
|
|
| 3399 | + } |
|
| 3400 | + // WPML |
|
| 3401 | + if ( $post_type == 'gd_event' ) {
|
|
| 3402 | + add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 ); |
|
| 3403 | + } |
|
| 3404 | + $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 3405 | 3405 | |
| 3406 | - $file_name = $post_type . '_' . date( 'dmyHi' ); |
|
| 3407 | - if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {
|
|
| 3408 | - $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) ); |
|
| 3409 | - } |
|
| 3410 | - $posts_count = geodir_get_posts_count( $post_type ); |
|
| 3411 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3412 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3413 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3414 | - $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv'; |
|
| 3406 | + $file_name = $post_type . '_' . date( 'dmyHi' ); |
|
| 3407 | + if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {
|
|
| 3408 | + $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) ); |
|
| 3409 | + } |
|
| 3410 | + $posts_count = geodir_get_posts_count( $post_type ); |
|
| 3411 | + $file_url_base = geodir_path_import_export() . '/'; |
|
| 3412 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3413 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3414 | + $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv'; |
|
| 3415 | 3415 | |
| 3416 | - $chunk_file_paths = array(); |
|
| 3416 | + $chunk_file_paths = array(); |
|
| 3417 | 3417 | |
| 3418 | - if ( isset( $_REQUEST['_c'] ) ) {
|
|
| 3419 | - $json['total'] = $posts_count; |
|
| 3420 | - // WPML |
|
| 3421 | - if ($is_wpml) {
|
|
| 3422 | - $sitepress->switch_lang($active_lang, true); |
|
| 3423 | - } |
|
| 3424 | - // WPML |
|
| 3425 | - wp_send_json( $json ); |
|
| 3426 | - gd_die(); |
|
| 3427 | - } else if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3428 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3429 | - $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0; |
|
| 3430 | - $percentage = min( $percentage, 100 ); |
|
| 3418 | + if ( isset( $_REQUEST['_c'] ) ) {
|
|
| 3419 | + $json['total'] = $posts_count; |
|
| 3420 | + // WPML |
|
| 3421 | + if ($is_wpml) {
|
|
| 3422 | + $sitepress->switch_lang($active_lang, true); |
|
| 3423 | + } |
|
| 3424 | + // WPML |
|
| 3425 | + wp_send_json( $json ); |
|
| 3426 | + gd_die(); |
|
| 3427 | + } else if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3428 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3429 | + $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0; |
|
| 3430 | + $percentage = min( $percentage, 100 ); |
|
| 3431 | 3431 | |
| 3432 | - $json['percentage'] = $percentage; |
|
| 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 {
|
|
| 3441 | - if ( !$posts_count > 0 ) {
|
|
| 3442 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3443 | - } else {
|
|
| 3444 | - $total_posts = $posts_count; |
|
| 3445 | - if ($chunk_per_page > $total_posts) {
|
|
| 3446 | - $chunk_per_page = $total_posts; |
|
| 3447 | - } |
|
| 3448 | - $chunk_total_pages = ceil( $total_posts / $chunk_per_page ); |
|
| 3432 | + $json['percentage'] = $percentage; |
|
| 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 {
|
|
| 3441 | + if ( !$posts_count > 0 ) {
|
|
| 3442 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3443 | + } else {
|
|
| 3444 | + $total_posts = $posts_count; |
|
| 3445 | + if ($chunk_per_page > $total_posts) {
|
|
| 3446 | + $chunk_per_page = $total_posts; |
|
| 3447 | + } |
|
| 3448 | + $chunk_total_pages = ceil( $total_posts / $chunk_per_page ); |
|
| 3449 | 3449 | |
| 3450 | - $j = $chunk_page_no; |
|
| 3451 | - $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j ); |
|
| 3450 | + $j = $chunk_page_no; |
|
| 3451 | + $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j ); |
|
| 3452 | 3452 | |
| 3453 | - $per_page = 500; |
|
| 3454 | - if ($per_page > $chunk_per_page) {
|
|
| 3455 | - $per_page = $chunk_per_page; |
|
| 3456 | - } |
|
| 3457 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3453 | + $per_page = 500; |
|
| 3454 | + if ($per_page > $chunk_per_page) {
|
|
| 3455 | + $per_page = $chunk_per_page; |
|
| 3456 | + } |
|
| 3457 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3458 | 3458 | |
| 3459 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3460 | - $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page ); |
|
| 3459 | + for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3460 | + $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page ); |
|
| 3461 | 3461 | |
| 3462 | - $clear = $i == 0 ? true : false; |
|
| 3463 | - geodir_save_csv_data( $file_path_temp, $save_posts, $clear ); |
|
| 3464 | - } |
|
| 3462 | + $clear = $i == 0 ? true : false; |
|
| 3463 | + geodir_save_csv_data( $file_path_temp, $save_posts, $clear ); |
|
| 3464 | + } |
|
| 3465 | 3465 | |
| 3466 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3467 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3468 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3469 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3470 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3466 | + if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3467 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3468 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3469 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3470 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3471 | 3471 | |
| 3472 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3473 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3474 | - } |
|
| 3472 | + $file_url = $file_url_base . $chunk_file_name; |
|
| 3473 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3474 | + } |
|
| 3475 | 3475 | |
| 3476 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3477 | - $json['total'] = $posts_count; |
|
| 3478 | - $json['files'] = $chunk_file_paths; |
|
| 3479 | - } else {
|
|
| 3480 | - if ($j > 1) {
|
|
| 3481 | - $json['total'] = $posts_count; |
|
| 3482 | - $json['files'] = array(); |
|
| 3483 | - } else {
|
|
| 3484 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3485 | - } |
|
| 3486 | - } |
|
| 3487 | - } |
|
| 3488 | - // WPML |
|
| 3489 | - if ($is_wpml) {
|
|
| 3490 | - $sitepress->switch_lang($active_lang, true); |
|
| 3491 | - } |
|
| 3492 | - // WPML |
|
| 3493 | - wp_send_json( $json ); |
|
| 3494 | - } |
|
| 3495 | - } |
|
| 3496 | - break; |
|
| 3497 | - case 'export_cats': {
|
|
| 3498 | - // WPML |
|
| 3499 | - $is_wpml = geodir_is_wpml(); |
|
| 3500 | - if ($is_wpml) {
|
|
| 3501 | - global $sitepress; |
|
| 3502 | - $active_lang = ICL_LANGUAGE_CODE; |
|
| 3476 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3477 | + $json['total'] = $posts_count; |
|
| 3478 | + $json['files'] = $chunk_file_paths; |
|
| 3479 | + } else {
|
|
| 3480 | + if ($j > 1) {
|
|
| 3481 | + $json['total'] = $posts_count; |
|
| 3482 | + $json['files'] = array(); |
|
| 3483 | + } else {
|
|
| 3484 | + $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3485 | + } |
|
| 3486 | + } |
|
| 3487 | + } |
|
| 3488 | + // WPML |
|
| 3489 | + if ($is_wpml) {
|
|
| 3490 | + $sitepress->switch_lang($active_lang, true); |
|
| 3491 | + } |
|
| 3492 | + // WPML |
|
| 3493 | + wp_send_json( $json ); |
|
| 3494 | + } |
|
| 3495 | + } |
|
| 3496 | + break; |
|
| 3497 | + case 'export_cats': {
|
|
| 3498 | + // WPML |
|
| 3499 | + $is_wpml = geodir_is_wpml(); |
|
| 3500 | + if ($is_wpml) {
|
|
| 3501 | + global $sitepress; |
|
| 3502 | + $active_lang = ICL_LANGUAGE_CODE; |
|
| 3503 | 3503 | |
| 3504 | - $sitepress->switch_lang('all', true);
|
|
| 3505 | - } |
|
| 3506 | - // WPML |
|
| 3507 | - $file_name = $post_type . 'category_' . date( 'dmyHi' ); |
|
| 3504 | + $sitepress->switch_lang('all', true);
|
|
| 3505 | + } |
|
| 3506 | + // WPML |
|
| 3507 | + $file_name = $post_type . 'category_' . date( 'dmyHi' ); |
|
| 3508 | 3508 | |
| 3509 | - $terms_count = geodir_get_terms_count( $post_type ); |
|
| 3510 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3511 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3512 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3513 | - $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv'; |
|
| 3509 | + $terms_count = geodir_get_terms_count( $post_type ); |
|
| 3510 | + $file_url_base = geodir_path_import_export() . '/'; |
|
| 3511 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3512 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3513 | + $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv'; |
|
| 3514 | 3514 | |
| 3515 | - $chunk_file_paths = array(); |
|
| 3515 | + $chunk_file_paths = array(); |
|
| 3516 | 3516 | |
| 3517 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3518 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3519 | - $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0; |
|
| 3520 | - $percentage = min( $percentage, 100 ); |
|
| 3517 | + if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3518 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3519 | + $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0; |
|
| 3520 | + $percentage = min( $percentage, 100 ); |
|
| 3521 | 3521 | |
| 3522 | - $json['percentage'] = $percentage; |
|
| 3523 | - // WPML |
|
| 3524 | - if ($is_wpml) {
|
|
| 3525 | - $sitepress->switch_lang($active_lang, true); |
|
| 3526 | - } |
|
| 3527 | - // WPML |
|
| 3528 | - wp_send_json( $json ); |
|
| 3529 | - } else {
|
|
| 3530 | - if ( !$terms_count > 0 ) {
|
|
| 3531 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3532 | - } else {
|
|
| 3533 | - $total_terms = $terms_count; |
|
| 3534 | - if ($chunk_per_page > $terms_count) {
|
|
| 3535 | - $chunk_per_page = $terms_count; |
|
| 3536 | - } |
|
| 3537 | - $chunk_total_pages = ceil( $total_terms / $chunk_per_page ); |
|
| 3522 | + $json['percentage'] = $percentage; |
|
| 3523 | + // WPML |
|
| 3524 | + if ($is_wpml) {
|
|
| 3525 | + $sitepress->switch_lang($active_lang, true); |
|
| 3526 | + } |
|
| 3527 | + // WPML |
|
| 3528 | + wp_send_json( $json ); |
|
| 3529 | + } else {
|
|
| 3530 | + if ( !$terms_count > 0 ) {
|
|
| 3531 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3532 | + } else {
|
|
| 3533 | + $total_terms = $terms_count; |
|
| 3534 | + if ($chunk_per_page > $terms_count) {
|
|
| 3535 | + $chunk_per_page = $terms_count; |
|
| 3536 | + } |
|
| 3537 | + $chunk_total_pages = ceil( $total_terms / $chunk_per_page ); |
|
| 3538 | 3538 | |
| 3539 | - $j = $chunk_page_no; |
|
| 3540 | - $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j ); |
|
| 3539 | + $j = $chunk_page_no; |
|
| 3540 | + $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j ); |
|
| 3541 | 3541 | |
| 3542 | - $per_page = 500; |
|
| 3543 | - if ($per_page > $chunk_per_page) {
|
|
| 3544 | - $per_page = $chunk_per_page; |
|
| 3545 | - } |
|
| 3546 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3542 | + $per_page = 500; |
|
| 3543 | + if ($per_page > $chunk_per_page) {
|
|
| 3544 | + $per_page = $chunk_per_page; |
|
| 3545 | + } |
|
| 3546 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3547 | 3547 | |
| 3548 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3549 | - $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page ); |
|
| 3548 | + for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3549 | + $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page ); |
|
| 3550 | 3550 | |
| 3551 | - $clear = $i == 0 ? true : false; |
|
| 3552 | - geodir_save_csv_data( $file_path_temp, $save_terms, $clear ); |
|
| 3553 | - } |
|
| 3551 | + $clear = $i == 0 ? true : false; |
|
| 3552 | + geodir_save_csv_data( $file_path_temp, $save_terms, $clear ); |
|
| 3553 | + } |
|
| 3554 | 3554 | |
| 3555 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3556 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3557 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3558 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3559 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3555 | + if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3556 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3557 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3558 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3559 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3560 | 3560 | |
| 3561 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3562 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3563 | - } |
|
| 3561 | + $file_url = $file_url_base . $chunk_file_name; |
|
| 3562 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3563 | + } |
|
| 3564 | 3564 | |
| 3565 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3566 | - $json['total'] = $terms_count; |
|
| 3567 | - $json['files'] = $chunk_file_paths; |
|
| 3568 | - } else {
|
|
| 3569 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3570 | - } |
|
| 3571 | - } |
|
| 3572 | - // WPML |
|
| 3573 | - if ($is_wpml) {
|
|
| 3574 | - $sitepress->switch_lang($active_lang, true); |
|
| 3575 | - } |
|
| 3576 | - // WPML |
|
| 3577 | - wp_send_json( $json ); |
|
| 3578 | - } |
|
| 3579 | - } |
|
| 3580 | - break; |
|
| 3581 | - case 'export_locations': {
|
|
| 3582 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3583 | - $file_name = 'gd_locations_' . date( 'dmyHi' ); |
|
| 3584 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3585 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3586 | - $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv'; |
|
| 3565 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3566 | + $json['total'] = $terms_count; |
|
| 3567 | + $json['files'] = $chunk_file_paths; |
|
| 3568 | + } else {
|
|
| 3569 | + $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3570 | + } |
|
| 3571 | + } |
|
| 3572 | + // WPML |
|
| 3573 | + if ($is_wpml) {
|
|
| 3574 | + $sitepress->switch_lang($active_lang, true); |
|
| 3575 | + } |
|
| 3576 | + // WPML |
|
| 3577 | + wp_send_json( $json ); |
|
| 3578 | + } |
|
| 3579 | + } |
|
| 3580 | + break; |
|
| 3581 | + case 'export_locations': {
|
|
| 3582 | + $file_url_base = geodir_path_import_export() . '/'; |
|
| 3583 | + $file_name = 'gd_locations_' . date( 'dmyHi' ); |
|
| 3584 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3585 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3586 | + $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv'; |
|
| 3587 | 3587 | |
| 3588 | - $items_count = (int)geodir_location_imex_count_locations(); |
|
| 3588 | + $items_count = (int)geodir_location_imex_count_locations(); |
|
| 3589 | 3589 | |
| 3590 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3591 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3592 | - $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3593 | - $percentage = min( $percentage, 100 ); |
|
| 3590 | + if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3591 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3592 | + $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3593 | + $percentage = min( $percentage, 100 ); |
|
| 3594 | 3594 | |
| 3595 | - $json['percentage'] = $percentage; |
|
| 3596 | - wp_send_json( $json ); |
|
| 3597 | - } else {
|
|
| 3598 | - $chunk_file_paths = array(); |
|
| 3595 | + $json['percentage'] = $percentage; |
|
| 3596 | + wp_send_json( $json ); |
|
| 3597 | + } else {
|
|
| 3598 | + $chunk_file_paths = array(); |
|
| 3599 | 3599 | |
| 3600 | - if ( !$items_count > 0 ) {
|
|
| 3601 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3602 | - } else {
|
|
| 3603 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3604 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3600 | + if ( !$items_count > 0 ) {
|
|
| 3601 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3602 | + } else {
|
|
| 3603 | + $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3604 | + $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3605 | 3605 | |
| 3606 | - $j = $chunk_page_no; |
|
| 3607 | - $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j ); |
|
| 3606 | + $j = $chunk_page_no; |
|
| 3607 | + $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j ); |
|
| 3608 | 3608 | |
| 3609 | - $per_page = 500; |
|
| 3610 | - $per_page = min( $per_page, $chunk_per_page ); |
|
| 3611 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3609 | + $per_page = 500; |
|
| 3610 | + $per_page = min( $per_page, $chunk_per_page ); |
|
| 3611 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3612 | 3612 | |
| 3613 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3614 | - $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3613 | + for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3614 | + $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3615 | 3615 | |
| 3616 | - $clear = $i == 0 ? true : false; |
|
| 3617 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3618 | - } |
|
| 3616 | + $clear = $i == 0 ? true : false; |
|
| 3617 | + geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3618 | + } |
|
| 3619 | 3619 | |
| 3620 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3621 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3622 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3623 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3624 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3620 | + if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3621 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3622 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3623 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3624 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3625 | 3625 | |
| 3626 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3627 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3628 | - } |
|
| 3626 | + $file_url = $file_url_base . $chunk_file_name; |
|
| 3627 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3628 | + } |
|
| 3629 | 3629 | |
| 3630 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3631 | - $json['total'] = $items_count; |
|
| 3632 | - $json['files'] = $chunk_file_paths; |
|
| 3633 | - } else {
|
|
| 3634 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3635 | - } |
|
| 3636 | - } |
|
| 3637 | - wp_send_json( $json ); |
|
| 3638 | - } |
|
| 3639 | - } |
|
| 3640 | - break; |
|
| 3641 | - case 'export_hoods': {
|
|
| 3642 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3643 | - $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' ); |
|
| 3644 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3645 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3646 | - $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv'; |
|
| 3630 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3631 | + $json['total'] = $items_count; |
|
| 3632 | + $json['files'] = $chunk_file_paths; |
|
| 3633 | + } else {
|
|
| 3634 | + $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3635 | + } |
|
| 3636 | + } |
|
| 3637 | + wp_send_json( $json ); |
|
| 3638 | + } |
|
| 3639 | + } |
|
| 3640 | + break; |
|
| 3641 | + case 'export_hoods': {
|
|
| 3642 | + $file_url_base = geodir_path_import_export() . '/'; |
|
| 3643 | + $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' ); |
|
| 3644 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3645 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3646 | + $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv'; |
|
| 3647 | 3647 | |
| 3648 | - $items_count = (int)geodir_location_imex_count_neighbourhoods(); |
|
| 3648 | + $items_count = (int)geodir_location_imex_count_neighbourhoods(); |
|
| 3649 | 3649 | |
| 3650 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3651 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3652 | - $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3653 | - $percentage = min( $percentage, 100 ); |
|
| 3650 | + if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3651 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3652 | + $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3653 | + $percentage = min( $percentage, 100 ); |
|
| 3654 | 3654 | |
| 3655 | - $json['percentage'] = $percentage; |
|
| 3656 | - wp_send_json( $json ); |
|
| 3657 | - } else {
|
|
| 3658 | - $chunk_file_paths = array(); |
|
| 3655 | + $json['percentage'] = $percentage; |
|
| 3656 | + wp_send_json( $json ); |
|
| 3657 | + } else {
|
|
| 3658 | + $chunk_file_paths = array(); |
|
| 3659 | 3659 | |
| 3660 | - if ( !$items_count > 0 ) {
|
|
| 3661 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3662 | - } else {
|
|
| 3663 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3664 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3660 | + if ( !$items_count > 0 ) {
|
|
| 3661 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3662 | + } else {
|
|
| 3663 | + $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3664 | + $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3665 | 3665 | |
| 3666 | - $j = $chunk_page_no; |
|
| 3667 | - $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j ); |
|
| 3666 | + $j = $chunk_page_no; |
|
| 3667 | + $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j ); |
|
| 3668 | 3668 | |
| 3669 | - $per_page = 500; |
|
| 3670 | - $per_page = min( $per_page, $chunk_per_page ); |
|
| 3671 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3669 | + $per_page = 500; |
|
| 3670 | + $per_page = min( $per_page, $chunk_per_page ); |
|
| 3671 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3672 | 3672 | |
| 3673 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3674 | - $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3673 | + for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3674 | + $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3675 | 3675 | |
| 3676 | - $clear = $i == 0 ? true : false; |
|
| 3677 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3678 | - } |
|
| 3676 | + $clear = $i == 0 ? true : false; |
|
| 3677 | + geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3678 | + } |
|
| 3679 | 3679 | |
| 3680 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3681 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3682 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3683 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3684 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3680 | + if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3681 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3682 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3683 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3684 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3685 | 3685 | |
| 3686 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3687 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3688 | - } |
|
| 3686 | + $file_url = $file_url_base . $chunk_file_name; |
|
| 3687 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3688 | + } |
|
| 3689 | 3689 | |
| 3690 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3691 | - $json['total'] = $items_count; |
|
| 3692 | - $json['files'] = $chunk_file_paths; |
|
| 3693 | - } else {
|
|
| 3694 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3695 | - } |
|
| 3696 | - } |
|
| 3697 | - wp_send_json( $json ); |
|
| 3698 | - } |
|
| 3699 | - } |
|
| 3700 | - break; |
|
| 3701 | - case 'prepare_import': |
|
| 3702 | - case 'import_cat': |
|
| 3703 | - case 'import_post': |
|
| 3704 | - case 'import_loc': |
|
| 3705 | - case 'import_hood': {
|
|
| 3706 | - // WPML |
|
| 3707 | - $is_wpml = geodir_is_wpml(); |
|
| 3708 | - if ($is_wpml) {
|
|
| 3709 | - global $sitepress; |
|
| 3710 | - $active_lang = ICL_LANGUAGE_CODE; |
|
| 3711 | - } |
|
| 3712 | - // WPML |
|
| 3690 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3691 | + $json['total'] = $items_count; |
|
| 3692 | + $json['files'] = $chunk_file_paths; |
|
| 3693 | + } else {
|
|
| 3694 | + $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3695 | + } |
|
| 3696 | + } |
|
| 3697 | + wp_send_json( $json ); |
|
| 3698 | + } |
|
| 3699 | + } |
|
| 3700 | + break; |
|
| 3701 | + case 'prepare_import': |
|
| 3702 | + case 'import_cat': |
|
| 3703 | + case 'import_post': |
|
| 3704 | + case 'import_loc': |
|
| 3705 | + case 'import_hood': {
|
|
| 3706 | + // WPML |
|
| 3707 | + $is_wpml = geodir_is_wpml(); |
|
| 3708 | + if ($is_wpml) {
|
|
| 3709 | + global $sitepress; |
|
| 3710 | + $active_lang = ICL_LANGUAGE_CODE; |
|
| 3711 | + } |
|
| 3712 | + // WPML |
|
| 3713 | 3713 | |
| 3714 | - ini_set( 'auto_detect_line_endings', true ); |
|
| 3714 | + ini_set( 'auto_detect_line_endings', true ); |
|
| 3715 | 3715 | |
| 3716 | - $uploads = wp_upload_dir(); |
|
| 3717 | - $uploads_dir = $uploads['path']; |
|
| 3718 | - $uploads_subdir = $uploads['subdir']; |
|
| 3716 | + $uploads = wp_upload_dir(); |
|
| 3717 | + $uploads_dir = $uploads['path']; |
|
| 3718 | + $uploads_subdir = $uploads['subdir']; |
|
| 3719 | 3719 | |
| 3720 | - $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL; |
|
| 3721 | - $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip'; |
|
| 3720 | + $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL; |
|
| 3721 | + $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip'; |
|
| 3722 | 3722 | |
| 3723 | - $csv_file_arr = explode( '/', $csv_file ); |
|
| 3724 | - $csv_filename = end( $csv_file_arr ); |
|
| 3725 | - $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename; |
|
| 3723 | + $csv_file_arr = explode( '/', $csv_file ); |
|
| 3724 | + $csv_filename = end( $csv_file_arr ); |
|
| 3725 | + $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename; |
|
| 3726 | 3726 | |
| 3727 | - $json['file'] = $csv_file; |
|
| 3728 | - $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' ); |
|
| 3729 | - $file = array(); |
|
| 3727 | + $json['file'] = $csv_file; |
|
| 3728 | + $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' ); |
|
| 3729 | + $file = array(); |
|
| 3730 | 3730 | |
| 3731 | - if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {
|
|
| 3732 | - $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename ); |
|
| 3731 | + if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {
|
|
| 3732 | + $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename ); |
|
| 3733 | 3733 | |
| 3734 | - if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
| 3735 | - $json['error'] = NULL; |
|
| 3736 | - $json['rows'] = 0; |
|
| 3734 | + if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
| 3735 | + $json['error'] = NULL; |
|
| 3736 | + $json['rows'] = 0; |
|
| 3737 | 3737 | |
| 3738 | - $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line |
|
| 3739 | - setlocale(LC_ALL, 'en_US.UTF-8'); |
|
| 3740 | - if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {
|
|
| 3741 | - while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {
|
|
| 3742 | - if ( !empty( $data ) ) {
|
|
| 3743 | - $file[] = $data; |
|
| 3744 | - } |
|
| 3745 | - } |
|
| 3746 | - fclose($handle); |
|
| 3747 | - } |
|
| 3748 | - setlocale(LC_ALL, $lc_all); |
|
| 3738 | + $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line |
|
| 3739 | + setlocale(LC_ALL, 'en_US.UTF-8'); |
|
| 3740 | + if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {
|
|
| 3741 | + while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {
|
|
| 3742 | + if ( !empty( $data ) ) {
|
|
| 3743 | + $file[] = $data; |
|
| 3744 | + } |
|
| 3745 | + } |
|
| 3746 | + fclose($handle); |
|
| 3747 | + } |
|
| 3748 | + setlocale(LC_ALL, $lc_all); |
|
| 3749 | 3749 | |
| 3750 | - $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
| 3750 | + $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
| 3751 | 3751 | |
| 3752 | - if (!$json['rows'] > 0) {
|
|
| 3753 | - $json['error'] = __('No data found in csv file.', 'geodirectory');
|
|
| 3754 | - } |
|
| 3755 | - } else {
|
|
| 3756 | - wp_send_json( $json ); |
|
| 3757 | - } |
|
| 3758 | - } else {
|
|
| 3759 | - wp_send_json( $json ); |
|
| 3760 | - } |
|
| 3752 | + if (!$json['rows'] > 0) {
|
|
| 3753 | + $json['error'] = __('No data found in csv file.', 'geodirectory');
|
|
| 3754 | + } |
|
| 3755 | + } else {
|
|
| 3756 | + wp_send_json( $json ); |
|
| 3757 | + } |
|
| 3758 | + } else {
|
|
| 3759 | + wp_send_json( $json ); |
|
| 3760 | + } |
|
| 3761 | 3761 | |
| 3762 | - if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
|
|
| 3763 | - wp_send_json( $json ); |
|
| 3764 | - } |
|
| 3762 | + if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
|
|
| 3763 | + wp_send_json( $json ); |
|
| 3764 | + } |
|
| 3765 | 3765 | |
| 3766 | - $total = $json['rows']; |
|
| 3767 | - $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1; |
|
| 3768 | - $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0; |
|
| 3766 | + $total = $json['rows']; |
|
| 3767 | + $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1; |
|
| 3768 | + $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0; |
|
| 3769 | 3769 | |
| 3770 | - $count = $limit; |
|
| 3770 | + $count = $limit; |
|
| 3771 | 3771 | |
| 3772 | - if ($count < $total) {
|
|
| 3773 | - $count = $processed + $count; |
|
| 3774 | - if ($count > $total) {
|
|
| 3775 | - $count = $total; |
|
| 3776 | - } |
|
| 3777 | - } else {
|
|
| 3778 | - $count = $total; |
|
| 3779 | - } |
|
| 3772 | + if ($count < $total) {
|
|
| 3773 | + $count = $processed + $count; |
|
| 3774 | + if ($count > $total) {
|
|
| 3775 | + $count = $total; |
|
| 3776 | + } |
|
| 3777 | + } else {
|
|
| 3778 | + $count = $total; |
|
| 3779 | + } |
|
| 3780 | 3780 | |
| 3781 | - $created = 0; |
|
| 3782 | - $updated = 0; |
|
| 3783 | - $skipped = 0; |
|
| 3784 | - $invalid = 0; |
|
| 3785 | - $invalid_addr = 0; |
|
| 3786 | - $images = 0; |
|
| 3781 | + $created = 0; |
|
| 3782 | + $updated = 0; |
|
| 3783 | + $skipped = 0; |
|
| 3784 | + $invalid = 0; |
|
| 3785 | + $invalid_addr = 0; |
|
| 3786 | + $images = 0; |
|
| 3787 | 3787 | |
| 3788 | - $gd_post_info = array(); |
|
| 3789 | - $countpost = 0; |
|
| 3788 | + $gd_post_info = array(); |
|
| 3789 | + $countpost = 0; |
|
| 3790 | 3790 | |
| 3791 | - $post_types = geodir_get_posttypes(); |
|
| 3791 | + $post_types = geodir_get_posttypes(); |
|
| 3792 | 3792 | |
| 3793 | - if ( $task == 'import_cat' ) {
|
|
| 3794 | - if (!empty($file)) {
|
|
| 3795 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 3793 | + if ( $task == 'import_cat' ) {
|
|
| 3794 | + if (!empty($file)) {
|
|
| 3795 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 3796 | 3796 | |
| 3797 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 3798 | - $json['error'] = CSV_INVAILD_FILE; |
|
| 3799 | - wp_send_json( $json ); |
|
| 3800 | - exit; |
|
| 3801 | - } |
|
| 3797 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 3798 | + $json['error'] = CSV_INVAILD_FILE; |
|
| 3799 | + wp_send_json( $json ); |
|
| 3800 | + exit; |
|
| 3801 | + } |
|
| 3802 | 3802 | |
| 3803 | - $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');
|
|
| 3803 | + $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');
|
|
| 3804 | 3804 | |
| 3805 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 3806 | - $index = $processed + $i; |
|
| 3805 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 3806 | + $index = $processed + $i; |
|
| 3807 | 3807 | |
| 3808 | - if (isset($file[$index])) {
|
|
| 3809 | - $row = $file[$index]; |
|
| 3810 | - $row = array_map( 'trim', $row ); |
|
| 3811 | - //$row = array_map( 'utf8_encode', $row ); |
|
| 3808 | + if (isset($file[$index])) {
|
|
| 3809 | + $row = $file[$index]; |
|
| 3810 | + $row = array_map( 'trim', $row ); |
|
| 3811 | + //$row = array_map( 'utf8_encode', $row ); |
|
| 3812 | 3812 | |
| 3813 | - $cat_id = ''; |
|
| 3814 | - $cat_name = ''; |
|
| 3815 | - $cat_slug = ''; |
|
| 3816 | - $cat_posttype = ''; |
|
| 3817 | - $cat_parent = ''; |
|
| 3818 | - $cat_description = ''; |
|
| 3819 | - $cat_schema = ''; |
|
| 3820 | - $cat_top_description = ''; |
|
| 3821 | - $cat_image = ''; |
|
| 3822 | - $cat_icon = ''; |
|
| 3823 | - $cat_language = ''; |
|
| 3824 | - $cat_id_original = ''; |
|
| 3813 | + $cat_id = ''; |
|
| 3814 | + $cat_name = ''; |
|
| 3815 | + $cat_slug = ''; |
|
| 3816 | + $cat_posttype = ''; |
|
| 3817 | + $cat_parent = ''; |
|
| 3818 | + $cat_description = ''; |
|
| 3819 | + $cat_schema = ''; |
|
| 3820 | + $cat_top_description = ''; |
|
| 3821 | + $cat_image = ''; |
|
| 3822 | + $cat_icon = ''; |
|
| 3823 | + $cat_language = ''; |
|
| 3824 | + $cat_id_original = ''; |
|
| 3825 | 3825 | |
| 3826 | - $c = 0; |
|
| 3827 | - foreach ($columns as $column ) {
|
|
| 3828 | - if ( $column == 'cat_id' ) {
|
|
| 3829 | - $cat_id = (int)$row[$c]; |
|
| 3830 | - } else if ( $column == 'cat_name' ) {
|
|
| 3831 | - $cat_name = $row[$c]; |
|
| 3832 | - } else if ( $column == 'cat_slug' ) {
|
|
| 3833 | - $cat_slug = $row[$c]; |
|
| 3834 | - } else if ( $column == 'cat_posttype' ) {
|
|
| 3835 | - $cat_posttype = $row[$c]; |
|
| 3836 | - } else if ( $column == 'cat_parent' ) {
|
|
| 3837 | - $cat_parent = trim($row[$c]); |
|
| 3838 | - } else if ( $column == 'cat_schema' && $row[$c] != '' ) {
|
|
| 3839 | - $cat_schema = $row[$c]; |
|
| 3840 | - } else if ( $column == 'cat_description' ) {
|
|
| 3841 | - $cat_description = $row[$c]; |
|
| 3842 | - } else if ( $column == 'cat_top_description' ) {
|
|
| 3843 | - $cat_top_description = $row[$c]; |
|
| 3844 | - } else if ( $column == 'cat_image' ) {
|
|
| 3845 | - $cat_image = $row[$c]; |
|
| 3846 | - } else if ( $column == 'cat_icon' ) {
|
|
| 3847 | - $cat_icon = $row[$c]; |
|
| 3848 | - } |
|
| 3849 | - // WPML |
|
| 3850 | - if ( $is_wpml ) {
|
|
| 3851 | - if ( $column == 'cat_language' ) {
|
|
| 3852 | - $cat_language = geodir_strtolower( trim( $row[$c] ) ); |
|
| 3853 | - } else if ( $column == 'cat_id_original' ) {
|
|
| 3854 | - $cat_id_original = (int)$row[$c]; |
|
| 3855 | - } |
|
| 3856 | - } |
|
| 3857 | - // WPML |
|
| 3858 | - $c++; |
|
| 3859 | - } |
|
| 3826 | + $c = 0; |
|
| 3827 | + foreach ($columns as $column ) {
|
|
| 3828 | + if ( $column == 'cat_id' ) {
|
|
| 3829 | + $cat_id = (int)$row[$c]; |
|
| 3830 | + } else if ( $column == 'cat_name' ) {
|
|
| 3831 | + $cat_name = $row[$c]; |
|
| 3832 | + } else if ( $column == 'cat_slug' ) {
|
|
| 3833 | + $cat_slug = $row[$c]; |
|
| 3834 | + } else if ( $column == 'cat_posttype' ) {
|
|
| 3835 | + $cat_posttype = $row[$c]; |
|
| 3836 | + } else if ( $column == 'cat_parent' ) {
|
|
| 3837 | + $cat_parent = trim($row[$c]); |
|
| 3838 | + } else if ( $column == 'cat_schema' && $row[$c] != '' ) {
|
|
| 3839 | + $cat_schema = $row[$c]; |
|
| 3840 | + } else if ( $column == 'cat_description' ) {
|
|
| 3841 | + $cat_description = $row[$c]; |
|
| 3842 | + } else if ( $column == 'cat_top_description' ) {
|
|
| 3843 | + $cat_top_description = $row[$c]; |
|
| 3844 | + } else if ( $column == 'cat_image' ) {
|
|
| 3845 | + $cat_image = $row[$c]; |
|
| 3846 | + } else if ( $column == 'cat_icon' ) {
|
|
| 3847 | + $cat_icon = $row[$c]; |
|
| 3848 | + } |
|
| 3849 | + // WPML |
|
| 3850 | + if ( $is_wpml ) {
|
|
| 3851 | + if ( $column == 'cat_language' ) {
|
|
| 3852 | + $cat_language = geodir_strtolower( trim( $row[$c] ) ); |
|
| 3853 | + } else if ( $column == 'cat_id_original' ) {
|
|
| 3854 | + $cat_id_original = (int)$row[$c]; |
|
| 3855 | + } |
|
| 3856 | + } |
|
| 3857 | + // WPML |
|
| 3858 | + $c++; |
|
| 3859 | + } |
|
| 3860 | 3860 | |
| 3861 | - if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {
|
|
| 3862 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 3861 | + if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {
|
|
| 3862 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 3863 | 3863 | |
| 3864 | - $invalid++; |
|
| 3865 | - continue; |
|
| 3866 | - } |
|
| 3864 | + $invalid++; |
|
| 3865 | + continue; |
|
| 3866 | + } |
|
| 3867 | 3867 | |
| 3868 | - // WPML |
|
| 3869 | - if ($is_wpml && $cat_language != '') {
|
|
| 3870 | - $sitepress->switch_lang($cat_language, true); |
|
| 3871 | - } |
|
| 3872 | - // WPML |
|
| 3868 | + // WPML |
|
| 3869 | + if ($is_wpml && $cat_language != '') {
|
|
| 3870 | + $sitepress->switch_lang($cat_language, true); |
|
| 3871 | + } |
|
| 3872 | + // WPML |
|
| 3873 | 3873 | |
| 3874 | - $term_data = array(); |
|
| 3875 | - $term_data['name'] = $cat_name; |
|
| 3876 | - $term_data['slug'] = $cat_slug; |
|
| 3877 | - $term_data['description'] = $cat_description; |
|
| 3878 | - $term_data['cat_schema'] = $cat_schema; |
|
| 3879 | - $term_data['top_description'] = $cat_top_description; |
|
| 3880 | - $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : ''; |
|
| 3881 | - $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : ''; |
|
| 3874 | + $term_data = array(); |
|
| 3875 | + $term_data['name'] = $cat_name; |
|
| 3876 | + $term_data['slug'] = $cat_slug; |
|
| 3877 | + $term_data['description'] = $cat_description; |
|
| 3878 | + $term_data['cat_schema'] = $cat_schema; |
|
| 3879 | + $term_data['top_description'] = $cat_top_description; |
|
| 3880 | + $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : ''; |
|
| 3881 | + $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : ''; |
|
| 3882 | 3882 | |
| 3883 | - //$term_data = array_map( 'utf8_encode', $term_data ); |
|
| 3883 | + //$term_data = array_map( 'utf8_encode', $term_data ); |
|
| 3884 | 3884 | |
| 3885 | - $taxonomy = $cat_posttype . 'category'; |
|
| 3885 | + $taxonomy = $cat_posttype . 'category'; |
|
| 3886 | 3886 | |
| 3887 | - $term_data['taxonomy'] = $taxonomy; |
|
| 3887 | + $term_data['taxonomy'] = $taxonomy; |
|
| 3888 | 3888 | |
| 3889 | - $term_parent_id = 0; |
|
| 3890 | - if ($cat_parent != "" || (int)$cat_parent > 0) {
|
|
| 3891 | - $term_parent = ''; |
|
| 3889 | + $term_parent_id = 0; |
|
| 3890 | + if ($cat_parent != "" || (int)$cat_parent > 0) {
|
|
| 3891 | + $term_parent = ''; |
|
| 3892 | 3892 | |
| 3893 | - if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
|
|
| 3894 | - // |
|
| 3895 | - } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
|
|
| 3896 | - // |
|
| 3897 | - } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
|
|
| 3898 | - // |
|
| 3899 | - } else {
|
|
| 3900 | - $term_parent_data = array(); |
|
| 3901 | - $term_parent_data['name'] = $cat_parent; |
|
| 3902 | - //$term_parent_data = array_map( 'utf8_encode', $term_parent_data ); |
|
| 3903 | - $term_parent_data['taxonomy'] = $taxonomy; |
|
| 3893 | + if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
|
|
| 3894 | + // |
|
| 3895 | + } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
|
|
| 3896 | + // |
|
| 3897 | + } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
|
|
| 3898 | + // |
|
| 3899 | + } else {
|
|
| 3900 | + $term_parent_data = array(); |
|
| 3901 | + $term_parent_data['name'] = $cat_parent; |
|
| 3902 | + //$term_parent_data = array_map( 'utf8_encode', $term_parent_data ); |
|
| 3903 | + $term_parent_data['taxonomy'] = $taxonomy; |
|
| 3904 | 3904 | |
| 3905 | - $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data ); |
|
| 3906 | - } |
|
| 3905 | + $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data ); |
|
| 3906 | + } |
|
| 3907 | 3907 | |
| 3908 | - if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
|
|
| 3909 | - $term_parent_id = (int)$term_parent->term_id; |
|
| 3910 | - } |
|
| 3911 | - } |
|
| 3912 | - $term_data['parent'] = (int)$term_parent_id; |
|
| 3908 | + if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
|
|
| 3909 | + $term_parent_id = (int)$term_parent->term_id; |
|
| 3910 | + } |
|
| 3911 | + } |
|
| 3912 | + $term_data['parent'] = (int)$term_parent_id; |
|
| 3913 | 3913 | |
| 3914 | - $term_id = NULL; |
|
| 3915 | - if ( $import_choice == 'update' ) {
|
|
| 3916 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3917 | - $term_data['term_id'] = $term['term_id']; |
|
| 3914 | + $term_id = NULL; |
|
| 3915 | + if ( $import_choice == 'update' ) {
|
|
| 3916 | + if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3917 | + $term_data['term_id'] = $term['term_id']; |
|
| 3918 | 3918 | |
| 3919 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3920 | - $updated++; |
|
| 3921 | - } else {
|
|
| 3922 | - $invalid++; |
|
| 3923 | - 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' ) ); |
|
| 3924 | - } |
|
| 3925 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3926 | - $term_data['term_id'] = $term['term_id']; |
|
| 3919 | + if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3920 | + $updated++; |
|
| 3921 | + } else {
|
|
| 3922 | + $invalid++; |
|
| 3923 | + 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' ) ); |
|
| 3924 | + } |
|
| 3925 | + } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3926 | + $term_data['term_id'] = $term['term_id']; |
|
| 3927 | 3927 | |
| 3928 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3929 | - $updated++; |
|
| 3930 | - } else {
|
|
| 3931 | - $invalid++; |
|
| 3932 | - 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' ) ); |
|
| 3933 | - } |
|
| 3934 | - } else {
|
|
| 3935 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3936 | - $created++; |
|
| 3937 | - } else {
|
|
| 3938 | - $invalid++; |
|
| 3939 | - 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' ) ); |
|
| 3940 | - } |
|
| 3941 | - } |
|
| 3942 | - } else if ( $import_choice == 'skip' ) {
|
|
| 3943 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3944 | - $skipped++; |
|
| 3945 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3946 | - $skipped++; |
|
| 3947 | - } else {
|
|
| 3948 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3949 | - $created++; |
|
| 3950 | - } else {
|
|
| 3951 | - $invalid++; |
|
| 3952 | - 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' ) ); |
|
| 3953 | - } |
|
| 3954 | - } |
|
| 3955 | - } else {
|
|
| 3956 | - $invalid++; |
|
| 3957 | - 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' ) ); |
|
| 3958 | - } |
|
| 3928 | + if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3929 | + $updated++; |
|
| 3930 | + } else {
|
|
| 3931 | + $invalid++; |
|
| 3932 | + 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' ) ); |
|
| 3933 | + } |
|
| 3934 | + } else {
|
|
| 3935 | + if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3936 | + $created++; |
|
| 3937 | + } else {
|
|
| 3938 | + $invalid++; |
|
| 3939 | + 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' ) ); |
|
| 3940 | + } |
|
| 3941 | + } |
|
| 3942 | + } else if ( $import_choice == 'skip' ) {
|
|
| 3943 | + if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3944 | + $skipped++; |
|
| 3945 | + } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3946 | + $skipped++; |
|
| 3947 | + } else {
|
|
| 3948 | + if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3949 | + $created++; |
|
| 3950 | + } else {
|
|
| 3951 | + $invalid++; |
|
| 3952 | + 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' ) ); |
|
| 3953 | + } |
|
| 3954 | + } |
|
| 3955 | + } else {
|
|
| 3956 | + $invalid++; |
|
| 3957 | + 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' ) ); |
|
| 3958 | + } |
|
| 3959 | 3959 | |
| 3960 | - if ( $term_id ) {
|
|
| 3961 | - // WPML |
|
| 3962 | - if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {
|
|
| 3963 | - $wpml_element_type = 'tax_' . $taxonomy; |
|
| 3964 | - $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type ); |
|
| 3965 | - $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 3966 | - |
|
| 3967 | - $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type ); |
|
| 3960 | + if ( $term_id ) {
|
|
| 3961 | + // WPML |
|
| 3962 | + if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {
|
|
| 3963 | + $wpml_element_type = 'tax_' . $taxonomy; |
|
| 3964 | + $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type ); |
|
| 3965 | + $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 3966 | + |
|
| 3967 | + $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type ); |
|
| 3968 | 3968 | |
| 3969 | - $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language ); |
|
| 3970 | - } |
|
| 3971 | - // WPML |
|
| 3969 | + $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language ); |
|
| 3970 | + } |
|
| 3971 | + // WPML |
|
| 3972 | 3972 | |
| 3973 | - if ( isset( $term_data['top_description'] ) ) {
|
|
| 3974 | - update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype ); |
|
| 3975 | - } |
|
| 3973 | + if ( isset( $term_data['top_description'] ) ) {
|
|
| 3974 | + update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype ); |
|
| 3975 | + } |
|
| 3976 | 3976 | |
| 3977 | - if ( isset( $term_data['cat_schema'] ) ) {
|
|
| 3978 | - update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype ); |
|
| 3979 | - } |
|
| 3977 | + if ( isset( $term_data['cat_schema'] ) ) {
|
|
| 3978 | + update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype ); |
|
| 3979 | + } |
|
| 3980 | 3980 | |
| 3981 | - $attachment = false; |
|
| 3982 | - if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {
|
|
| 3983 | - $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype ); |
|
| 3984 | - $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
| 3981 | + $attachment = false; |
|
| 3982 | + if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {
|
|
| 3983 | + $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype ); |
|
| 3984 | + $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
| 3985 | 3985 | |
| 3986 | - if ( basename($cat_image) != $term_data['image'] ) {
|
|
| 3987 | - $attachment = true; |
|
| 3988 | - update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype ); |
|
| 3989 | - } |
|
| 3990 | - } |
|
| 3986 | + if ( basename($cat_image) != $term_data['image'] ) {
|
|
| 3987 | + $attachment = true; |
|
| 3988 | + update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype ); |
|
| 3989 | + } |
|
| 3990 | + } |
|
| 3991 | 3991 | |
| 3992 | - if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {
|
|
| 3993 | - $cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype ); |
|
| 3994 | - $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
| 3992 | + if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {
|
|
| 3993 | + $cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype ); |
|
| 3994 | + $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
| 3995 | 3995 | |
| 3996 | - if ( basename($cat_icon) != $term_data['icon'] ) {
|
|
| 3997 | - $attachment = true; |
|
| 3998 | - update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype ); |
|
| 3999 | - } |
|
| 4000 | - } |
|
| 3996 | + if ( basename($cat_icon) != $term_data['icon'] ) {
|
|
| 3997 | + $attachment = true; |
|
| 3998 | + update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype ); |
|
| 3999 | + } |
|
| 4000 | + } |
|
| 4001 | 4001 | |
| 4002 | - if ( $attachment ) {
|
|
| 4003 | - $images++; |
|
| 4004 | - } |
|
| 4005 | - } |
|
| 4002 | + if ( $attachment ) {
|
|
| 4003 | + $images++; |
|
| 4004 | + } |
|
| 4005 | + } |
|
| 4006 | 4006 | |
| 4007 | - // WPML |
|
| 4008 | - if ($is_wpml && $cat_language != '') {
|
|
| 4009 | - $sitepress->switch_lang($active_lang, true); |
|
| 4010 | - } |
|
| 4011 | - // WPML |
|
| 4012 | - } |
|
| 4013 | - } |
|
| 4014 | - } |
|
| 4007 | + // WPML |
|
| 4008 | + if ($is_wpml && $cat_language != '') {
|
|
| 4009 | + $sitepress->switch_lang($active_lang, true); |
|
| 4010 | + } |
|
| 4011 | + // WPML |
|
| 4012 | + } |
|
| 4013 | + } |
|
| 4014 | + } |
|
| 4015 | 4015 | |
| 4016 | - $json = array(); |
|
| 4017 | - $json['processed'] = $limit; |
|
| 4018 | - $json['created'] = $created; |
|
| 4019 | - $json['updated'] = $updated; |
|
| 4020 | - $json['skipped'] = $skipped; |
|
| 4021 | - $json['invalid'] = $invalid; |
|
| 4022 | - $json['images'] = $images; |
|
| 4016 | + $json = array(); |
|
| 4017 | + $json['processed'] = $limit; |
|
| 4018 | + $json['created'] = $created; |
|
| 4019 | + $json['updated'] = $updated; |
|
| 4020 | + $json['skipped'] = $skipped; |
|
| 4021 | + $json['invalid'] = $invalid; |
|
| 4022 | + $json['images'] = $images; |
|
| 4023 | 4023 | |
| 4024 | - wp_send_json( $json ); |
|
| 4025 | - exit; |
|
| 4026 | - } else if ( $task == 'import_post' ) {
|
|
| 4027 | - $xtimings['###1'] = microtime(true)-$xstart; |
|
| 4028 | - //run some stuff to make the import quicker |
|
| 4029 | - wp_defer_term_counting( true ); |
|
| 4030 | - wp_defer_comment_counting( true ); |
|
| 4031 | - $wpdb->query( 'SET autocommit = 0;' ); |
|
| 4024 | + wp_send_json( $json ); |
|
| 4025 | + exit; |
|
| 4026 | + } else if ( $task == 'import_post' ) {
|
|
| 4027 | + $xtimings['###1'] = microtime(true)-$xstart; |
|
| 4028 | + //run some stuff to make the import quicker |
|
| 4029 | + wp_defer_term_counting( true ); |
|
| 4030 | + wp_defer_comment_counting( true ); |
|
| 4031 | + $wpdb->query( 'SET autocommit = 0;' ); |
|
| 4032 | 4032 | // |
| 4033 | 4033 | // remove_all_actions('publish_post');
|
| 4034 | 4034 | // remove_all_actions('transition_post_status');
|
| 4035 | 4035 | // remove_all_actions('publish_future_post');
|
| 4036 | 4036 | |
| 4037 | - if (!empty($file)) {
|
|
| 4038 | - $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 4039 | - $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
|
| 4040 | - $default_status = 'publish'; |
|
| 4041 | - $current_date = date_i18n( 'Y-m-d', time() ); |
|
| 4037 | + if (!empty($file)) {
|
|
| 4038 | + $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 4039 | + $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
|
| 4040 | + $default_status = 'publish'; |
|
| 4041 | + $current_date = date_i18n( 'Y-m-d', time() ); |
|
| 4042 | 4042 | |
| 4043 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4043 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4044 | 4044 | |
| 4045 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4046 | - $json['error'] = CSV_INVAILD_FILE; |
|
| 4047 | - wp_send_json( $json ); |
|
| 4048 | - exit; |
|
| 4049 | - } |
|
| 4050 | - $xtimings['###2'] = microtime(true)-$xstart; |
|
| 4051 | - $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
|
|
| 4052 | - $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' ); |
|
| 4053 | - $processed_actual = 0; |
|
| 4054 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 4055 | - $index = $processed + $i; |
|
| 4056 | - $gd_post = array(); |
|
| 4045 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4046 | + $json['error'] = CSV_INVAILD_FILE; |
|
| 4047 | + wp_send_json( $json ); |
|
| 4048 | + exit; |
|
| 4049 | + } |
|
| 4050 | + $xtimings['###2'] = microtime(true)-$xstart; |
|
| 4051 | + $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
|
|
| 4052 | + $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' ); |
|
| 4053 | + $processed_actual = 0; |
|
| 4054 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 4055 | + $index = $processed + $i; |
|
| 4056 | + $gd_post = array(); |
|
| 4057 | 4057 | |
| 4058 | - if (isset($file[$index])) {
|
|
| 4059 | - $processed_actual++; |
|
| 4060 | - $row = $file[$index]; |
|
| 4061 | - $row = array_map( 'trim', $row ); |
|
| 4062 | - //$row = array_map( 'utf8_encode', $row ); |
|
| 4063 | - $row = array_map( 'addslashes_gpc', $row ); |
|
| 4058 | + if (isset($file[$index])) {
|
|
| 4059 | + $processed_actual++; |
|
| 4060 | + $row = $file[$index]; |
|
| 4061 | + $row = array_map( 'trim', $row ); |
|
| 4062 | + //$row = array_map( 'utf8_encode', $row ); |
|
| 4063 | + $row = array_map( 'addslashes_gpc', $row ); |
|
| 4064 | 4064 | |
| 4065 | - $post_id = ''; |
|
| 4066 | - $post_title = ''; |
|
| 4067 | - $post_author = ''; |
|
| 4068 | - $post_content = ''; |
|
| 4069 | - $post_category_arr = array(); |
|
| 4070 | - $default_category = ''; |
|
| 4071 | - $post_tags = array(); |
|
| 4072 | - $post_type = ''; |
|
| 4073 | - $post_status = ''; |
|
| 4074 | - $geodir_video = ''; |
|
| 4075 | - $post_address = ''; |
|
| 4076 | - $post_city = ''; |
|
| 4077 | - $post_region = ''; |
|
| 4078 | - $post_country = ''; |
|
| 4079 | - $post_zip = ''; |
|
| 4080 | - $post_latitude = ''; |
|
| 4081 | - $post_longitude = ''; |
|
| 4082 | - $post_neighbourhood = ''; |
|
| 4083 | - $neighbourhood_latitude = ''; |
|
| 4084 | - $neighbourhood_longitude = ''; |
|
| 4085 | - $geodir_timing = ''; |
|
| 4086 | - $geodir_contact = ''; |
|
| 4087 | - $geodir_email = ''; |
|
| 4088 | - $geodir_website = ''; |
|
| 4089 | - $geodir_twitter = ''; |
|
| 4090 | - $geodir_facebook = ''; |
|
| 4091 | - $geodir_twitter = ''; |
|
| 4092 | - $post_images = array(); |
|
| 4065 | + $post_id = ''; |
|
| 4066 | + $post_title = ''; |
|
| 4067 | + $post_author = ''; |
|
| 4068 | + $post_content = ''; |
|
| 4069 | + $post_category_arr = array(); |
|
| 4070 | + $default_category = ''; |
|
| 4071 | + $post_tags = array(); |
|
| 4072 | + $post_type = ''; |
|
| 4073 | + $post_status = ''; |
|
| 4074 | + $geodir_video = ''; |
|
| 4075 | + $post_address = ''; |
|
| 4076 | + $post_city = ''; |
|
| 4077 | + $post_region = ''; |
|
| 4078 | + $post_country = ''; |
|
| 4079 | + $post_zip = ''; |
|
| 4080 | + $post_latitude = ''; |
|
| 4081 | + $post_longitude = ''; |
|
| 4082 | + $post_neighbourhood = ''; |
|
| 4083 | + $neighbourhood_latitude = ''; |
|
| 4084 | + $neighbourhood_longitude = ''; |
|
| 4085 | + $geodir_timing = ''; |
|
| 4086 | + $geodir_contact = ''; |
|
| 4087 | + $geodir_email = ''; |
|
| 4088 | + $geodir_website = ''; |
|
| 4089 | + $geodir_twitter = ''; |
|
| 4090 | + $geodir_facebook = ''; |
|
| 4091 | + $geodir_twitter = ''; |
|
| 4092 | + $post_images = array(); |
|
| 4093 | 4093 | |
| 4094 | - $expire_date = 'Never'; |
|
| 4094 | + $expire_date = 'Never'; |
|
| 4095 | 4095 | |
| 4096 | - $language = ''; |
|
| 4097 | - $original_post_id = ''; |
|
| 4096 | + $language = ''; |
|
| 4097 | + $original_post_id = ''; |
|
| 4098 | 4098 | |
| 4099 | - $c = 0; |
|
| 4100 | - foreach ($columns as $column ) {
|
|
| 4101 | - $gd_post[$column] = $row[$c]; |
|
| 4099 | + $c = 0; |
|
| 4100 | + foreach ($columns as $column ) {
|
|
| 4101 | + $gd_post[$column] = $row[$c]; |
|
| 4102 | 4102 | |
| 4103 | - if ( $column == 'post_id' ) {
|
|
| 4104 | - $post_id = $row[$c]; |
|
| 4105 | - } else if ( $column == 'post_title' ) {
|
|
| 4106 | - $post_title = sanitize_text_field($row[$c]); |
|
| 4107 | - } else if ( $column == 'post_author' ) {
|
|
| 4108 | - $post_author = $row[$c]; |
|
| 4109 | - } else if ( $column == 'post_content' ) {
|
|
| 4110 | - $post_content = $row[$c]; |
|
| 4111 | - } else if ( $column == 'post_category' && $row[$c] != '' ) {
|
|
| 4112 | - $post_category_arr = explode( ',', $row[$c] ); |
|
| 4113 | - } else if ( $column == 'default_category' ) {
|
|
| 4114 | - $default_category = wp_kses_normalize_entities($row[$c]); |
|
| 4115 | - } else if ( $column == 'post_tags' && $row[$c] != '' ) {
|
|
| 4116 | - $post_tags = explode( ',', sanitize_text_field($row[$c]) ); |
|
| 4117 | - } else if ( $column == 'post_type' ) {
|
|
| 4118 | - $post_type = $row[$c]; |
|
| 4119 | - } else if ( $column == 'post_status' ) {
|
|
| 4120 | - $post_status = sanitize_key( $row[$c] ); |
|
| 4121 | - } else if ( $column == 'is_featured' ) {
|
|
| 4122 | - $is_featured = (int)$row[$c]; |
|
| 4123 | - } else if ( $column == 'geodir_video' ) {
|
|
| 4124 | - $geodir_video = $row[$c]; |
|
| 4125 | - } else if ( $column == 'post_address' ) {
|
|
| 4126 | - $post_address = sanitize_text_field($row[$c]); |
|
| 4127 | - } else if ( $column == 'post_city' ) {
|
|
| 4128 | - $post_city = sanitize_text_field($row[$c]); |
|
| 4129 | - } else if ( $column == 'post_region' ) {
|
|
| 4130 | - $post_region = sanitize_text_field($row[$c]); |
|
| 4131 | - } else if ( $column == 'post_country' ) {
|
|
| 4132 | - $post_country = sanitize_text_field($row[$c]); |
|
| 4133 | - } else if ( $column == 'post_zip' ) {
|
|
| 4134 | - $post_zip = sanitize_text_field($row[$c]); |
|
| 4135 | - } else if ( $column == 'post_latitude' ) {
|
|
| 4136 | - $post_latitude = sanitize_text_field($row[$c]); |
|
| 4137 | - } else if ( $column == 'post_longitude' ) {
|
|
| 4138 | - $post_longitude = sanitize_text_field($row[$c]); |
|
| 4139 | - } else if ( $column == 'post_neighbourhood' ) {
|
|
| 4140 | - $post_neighbourhood = sanitize_text_field($row[$c]); |
|
| 4141 | - unset($gd_post[$column]); |
|
| 4142 | - } else if ( $column == 'neighbourhood_latitude' ) {
|
|
| 4143 | - $neighbourhood_latitude = sanitize_text_field($row[$c]); |
|
| 4144 | - } else if ( $column == 'neighbourhood_longitude' ) {
|
|
| 4145 | - $neighbourhood_longitude = sanitize_text_field($row[$c]); |
|
| 4146 | - } else if ( $column == 'geodir_timing' ) {
|
|
| 4147 | - $geodir_timing = sanitize_text_field($row[$c]); |
|
| 4148 | - } else if ( $column == 'geodir_contact' ) {
|
|
| 4149 | - $geodir_contact = sanitize_text_field($row[$c]); |
|
| 4150 | - } else if ( $column == 'geodir_email' ) {
|
|
| 4151 | - $geodir_email = sanitize_email($row[$c]); |
|
| 4152 | - } else if ( $column == 'geodir_website' ) {
|
|
| 4153 | - $geodir_website = sanitize_text_field($row[$c]); |
|
| 4154 | - } else if ( $column == 'geodir_twitter' ) {
|
|
| 4155 | - $geodir_twitter = sanitize_text_field($row[$c]); |
|
| 4156 | - } else if ( $column == 'geodir_facebook' ) {
|
|
| 4157 | - $geodir_facebook = sanitize_text_field($row[$c]); |
|
| 4158 | - } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
|
|
| 4159 | - $post_images[] = $row[$c]; |
|
| 4160 | - } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
|
|
| 4161 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) ); |
|
| 4162 | - } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
|
|
| 4163 | - $row[$c] = str_replace('/', '-', $row[$c]);
|
|
| 4164 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) ); |
|
| 4165 | - } |
|
| 4166 | - // WPML |
|
| 4167 | - if ($is_wpml) {
|
|
| 4168 | - if ($column == 'language') {
|
|
| 4169 | - $language = geodir_strtolower(trim($row[$c])); |
|
| 4170 | - } else if ($column == 'original_post_id') {
|
|
| 4171 | - $original_post_id = (int)$row[$c]; |
|
| 4172 | - } |
|
| 4173 | - } |
|
| 4174 | - // WPML |
|
| 4175 | - $c++; |
|
| 4176 | - } |
|
| 4177 | - // listing claimed or not |
|
| 4178 | - if ($is_claim_active && isset($gd_post['claimed'])) {
|
|
| 4179 | - $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4180 | - } |
|
| 4103 | + if ( $column == 'post_id' ) {
|
|
| 4104 | + $post_id = $row[$c]; |
|
| 4105 | + } else if ( $column == 'post_title' ) {
|
|
| 4106 | + $post_title = sanitize_text_field($row[$c]); |
|
| 4107 | + } else if ( $column == 'post_author' ) {
|
|
| 4108 | + $post_author = $row[$c]; |
|
| 4109 | + } else if ( $column == 'post_content' ) {
|
|
| 4110 | + $post_content = $row[$c]; |
|
| 4111 | + } else if ( $column == 'post_category' && $row[$c] != '' ) {
|
|
| 4112 | + $post_category_arr = explode( ',', $row[$c] ); |
|
| 4113 | + } else if ( $column == 'default_category' ) {
|
|
| 4114 | + $default_category = wp_kses_normalize_entities($row[$c]); |
|
| 4115 | + } else if ( $column == 'post_tags' && $row[$c] != '' ) {
|
|
| 4116 | + $post_tags = explode( ',', sanitize_text_field($row[$c]) ); |
|
| 4117 | + } else if ( $column == 'post_type' ) {
|
|
| 4118 | + $post_type = $row[$c]; |
|
| 4119 | + } else if ( $column == 'post_status' ) {
|
|
| 4120 | + $post_status = sanitize_key( $row[$c] ); |
|
| 4121 | + } else if ( $column == 'is_featured' ) {
|
|
| 4122 | + $is_featured = (int)$row[$c]; |
|
| 4123 | + } else if ( $column == 'geodir_video' ) {
|
|
| 4124 | + $geodir_video = $row[$c]; |
|
| 4125 | + } else if ( $column == 'post_address' ) {
|
|
| 4126 | + $post_address = sanitize_text_field($row[$c]); |
|
| 4127 | + } else if ( $column == 'post_city' ) {
|
|
| 4128 | + $post_city = sanitize_text_field($row[$c]); |
|
| 4129 | + } else if ( $column == 'post_region' ) {
|
|
| 4130 | + $post_region = sanitize_text_field($row[$c]); |
|
| 4131 | + } else if ( $column == 'post_country' ) {
|
|
| 4132 | + $post_country = sanitize_text_field($row[$c]); |
|
| 4133 | + } else if ( $column == 'post_zip' ) {
|
|
| 4134 | + $post_zip = sanitize_text_field($row[$c]); |
|
| 4135 | + } else if ( $column == 'post_latitude' ) {
|
|
| 4136 | + $post_latitude = sanitize_text_field($row[$c]); |
|
| 4137 | + } else if ( $column == 'post_longitude' ) {
|
|
| 4138 | + $post_longitude = sanitize_text_field($row[$c]); |
|
| 4139 | + } else if ( $column == 'post_neighbourhood' ) {
|
|
| 4140 | + $post_neighbourhood = sanitize_text_field($row[$c]); |
|
| 4141 | + unset($gd_post[$column]); |
|
| 4142 | + } else if ( $column == 'neighbourhood_latitude' ) {
|
|
| 4143 | + $neighbourhood_latitude = sanitize_text_field($row[$c]); |
|
| 4144 | + } else if ( $column == 'neighbourhood_longitude' ) {
|
|
| 4145 | + $neighbourhood_longitude = sanitize_text_field($row[$c]); |
|
| 4146 | + } else if ( $column == 'geodir_timing' ) {
|
|
| 4147 | + $geodir_timing = sanitize_text_field($row[$c]); |
|
| 4148 | + } else if ( $column == 'geodir_contact' ) {
|
|
| 4149 | + $geodir_contact = sanitize_text_field($row[$c]); |
|
| 4150 | + } else if ( $column == 'geodir_email' ) {
|
|
| 4151 | + $geodir_email = sanitize_email($row[$c]); |
|
| 4152 | + } else if ( $column == 'geodir_website' ) {
|
|
| 4153 | + $geodir_website = sanitize_text_field($row[$c]); |
|
| 4154 | + } else if ( $column == 'geodir_twitter' ) {
|
|
| 4155 | + $geodir_twitter = sanitize_text_field($row[$c]); |
|
| 4156 | + } else if ( $column == 'geodir_facebook' ) {
|
|
| 4157 | + $geodir_facebook = sanitize_text_field($row[$c]); |
|
| 4158 | + } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
|
|
| 4159 | + $post_images[] = $row[$c]; |
|
| 4160 | + } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
|
|
| 4161 | + $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) ); |
|
| 4162 | + } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
|
|
| 4163 | + $row[$c] = str_replace('/', '-', $row[$c]);
|
|
| 4164 | + $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) ); |
|
| 4165 | + } |
|
| 4166 | + // WPML |
|
| 4167 | + if ($is_wpml) {
|
|
| 4168 | + if ($column == 'language') {
|
|
| 4169 | + $language = geodir_strtolower(trim($row[$c])); |
|
| 4170 | + } else if ($column == 'original_post_id') {
|
|
| 4171 | + $original_post_id = (int)$row[$c]; |
|
| 4172 | + } |
|
| 4173 | + } |
|
| 4174 | + // WPML |
|
| 4175 | + $c++; |
|
| 4176 | + } |
|
| 4177 | + // listing claimed or not |
|
| 4178 | + if ($is_claim_active && isset($gd_post['claimed'])) {
|
|
| 4179 | + $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4180 | + } |
|
| 4181 | 4181 | |
| 4182 | - // WPML |
|
| 4183 | - if ($is_wpml && $language != '') {
|
|
| 4184 | - $sitepress->switch_lang($language, true); |
|
| 4185 | - } |
|
| 4186 | - // WPML |
|
| 4182 | + // WPML |
|
| 4183 | + if ($is_wpml && $language != '') {
|
|
| 4184 | + $sitepress->switch_lang($language, true); |
|
| 4185 | + } |
|
| 4186 | + // WPML |
|
| 4187 | 4187 | |
| 4188 | - $gd_post['IMAGE'] = $post_images; |
|
| 4188 | + $gd_post['IMAGE'] = $post_images; |
|
| 4189 | 4189 | |
| 4190 | - $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 4191 | - $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 4190 | + $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 4191 | + $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 4192 | 4192 | |
| 4193 | - $valid = true; |
|
| 4193 | + $valid = true; |
|
| 4194 | 4194 | |
| 4195 | - if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
|
|
| 4196 | - $invalid++; |
|
| 4197 | - $valid = false; |
|
| 4198 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 4199 | - } |
|
| 4200 | - $xtimings['###3'] = microtime(true)-$xstart; |
|
| 4201 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 4202 | - if ( $location_allowed ) {
|
|
| 4203 | - $location_result = geodir_get_default_location(); |
|
| 4204 | - if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
|
|
| 4205 | - $invalid_addr++; |
|
| 4206 | - $valid = false; |
|
| 4207 | - 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' ) ); |
|
| 4208 | - } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
|
|
| 4209 | - 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 ) ) ) {
|
|
| 4210 | - $invalid_addr++; |
|
| 4211 | - $valid = false; |
|
| 4212 | - 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' ) ); |
|
| 4213 | - } else {
|
|
| 4214 | - if (!$location_manager) {
|
|
| 4215 | - $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. |
|
| 4216 | - } |
|
| 4217 | - } |
|
| 4218 | - } |
|
| 4219 | - } |
|
| 4220 | - $xtimings['###4'] = microtime(true)-$xstart; |
|
| 4221 | - if ( !$valid ) {
|
|
| 4222 | - continue; |
|
| 4223 | - } |
|
| 4195 | + if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
|
|
| 4196 | + $invalid++; |
|
| 4197 | + $valid = false; |
|
| 4198 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 4199 | + } |
|
| 4200 | + $xtimings['###3'] = microtime(true)-$xstart; |
|
| 4201 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 4202 | + if ( $location_allowed ) {
|
|
| 4203 | + $location_result = geodir_get_default_location(); |
|
| 4204 | + if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
|
|
| 4205 | + $invalid_addr++; |
|
| 4206 | + $valid = false; |
|
| 4207 | + 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' ) ); |
|
| 4208 | + } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
|
|
| 4209 | + 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 ) ) ) {
|
|
| 4210 | + $invalid_addr++; |
|
| 4211 | + $valid = false; |
|
| 4212 | + 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' ) ); |
|
| 4213 | + } else {
|
|
| 4214 | + if (!$location_manager) {
|
|
| 4215 | + $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. |
|
| 4216 | + } |
|
| 4217 | + } |
|
| 4218 | + } |
|
| 4219 | + } |
|
| 4220 | + $xtimings['###4'] = microtime(true)-$xstart; |
|
| 4221 | + if ( !$valid ) {
|
|
| 4222 | + continue; |
|
| 4223 | + } |
|
| 4224 | 4224 | |
| 4225 | - $cat_taxonomy = $post_type . 'category'; |
|
| 4226 | - $tags_taxonomy = $post_type . '_tags'; |
|
| 4225 | + $cat_taxonomy = $post_type . 'category'; |
|
| 4226 | + $tags_taxonomy = $post_type . '_tags'; |
|
| 4227 | 4227 | |
| 4228 | - if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
|
|
| 4229 | - $post_category_arr = array_merge(array($default_category), $post_category_arr); |
|
| 4230 | - } |
|
| 4228 | + if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
|
|
| 4229 | + $post_category_arr = array_merge(array($default_category), $post_category_arr); |
|
| 4230 | + } |
|
| 4231 | 4231 | |
| 4232 | - $post_category = array(); |
|
| 4233 | - $default_category_id = NULL; |
|
| 4234 | - if ( !empty( $post_category_arr ) ) {
|
|
| 4235 | - foreach ( $post_category_arr as $value ) {
|
|
| 4236 | - $category_name = wp_kses_normalize_entities( trim( $value ) ); |
|
| 4232 | + $post_category = array(); |
|
| 4233 | + $default_category_id = NULL; |
|
| 4234 | + if ( !empty( $post_category_arr ) ) {
|
|
| 4235 | + foreach ( $post_category_arr as $value ) {
|
|
| 4236 | + $category_name = wp_kses_normalize_entities( trim( $value ) ); |
|
| 4237 | 4237 | |
| 4238 | - if ( $category_name != '' ) {
|
|
| 4239 | - $term_category = array(); |
|
| 4238 | + if ( $category_name != '' ) {
|
|
| 4239 | + $term_category = array(); |
|
| 4240 | 4240 | |
| 4241 | - if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
|
|
| 4242 | - $term_category = $term; |
|
| 4243 | - } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
|
|
| 4244 | - $term_category = $term; |
|
| 4245 | - } else {
|
|
| 4246 | - $term_data = array(); |
|
| 4247 | - $term_data['name'] = $category_name; |
|
| 4248 | - $term_data['taxonomy'] = $cat_taxonomy; |
|
| 4241 | + if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
|
|
| 4242 | + $term_category = $term; |
|
| 4243 | + } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
|
|
| 4244 | + $term_category = $term; |
|
| 4245 | + } else {
|
|
| 4246 | + $term_data = array(); |
|
| 4247 | + $term_data['name'] = $category_name; |
|
| 4248 | + $term_data['taxonomy'] = $cat_taxonomy; |
|
| 4249 | 4249 | |
| 4250 | - $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data ); |
|
| 4251 | - if ( $term_id ) {
|
|
| 4252 | - $term_category = get_term( $term_id, $cat_taxonomy ); |
|
| 4253 | - } |
|
| 4254 | - } |
|
| 4250 | + $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data ); |
|
| 4251 | + if ( $term_id ) {
|
|
| 4252 | + $term_category = get_term( $term_id, $cat_taxonomy ); |
|
| 4253 | + } |
|
| 4254 | + } |
|
| 4255 | 4255 | |
| 4256 | - if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
|
|
| 4257 | - $post_category[] = intval($term_category->term_id); |
|
| 4256 | + if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
|
|
| 4257 | + $post_category[] = intval($term_category->term_id); |
|
| 4258 | 4258 | |
| 4259 | - if ($category_name == $default_category) {
|
|
| 4260 | - $default_category_id = intval($term_category->term_id); |
|
| 4261 | - } |
|
| 4262 | - } |
|
| 4263 | - } |
|
| 4264 | - } |
|
| 4265 | - } |
|
| 4266 | - $xtimings['###5'] = microtime(true)-$xstart; |
|
| 4267 | - $save_post = array(); |
|
| 4268 | - $save_post['post_title'] = $post_title; |
|
| 4269 | - $save_post['post_content'] = $post_content; |
|
| 4270 | - $save_post['post_type'] = $post_type; |
|
| 4271 | - $save_post['post_author'] = $post_author; |
|
| 4272 | - $save_post['post_status'] = $post_status; |
|
| 4273 | - $save_post['post_category'] = $post_category; |
|
| 4274 | - $save_post['post_tags'] = $post_tags; |
|
| 4275 | - |
|
| 4276 | - $saved_post_id = NULL; |
|
| 4277 | - if ( $import_choice == 'update' ) {
|
|
| 4278 | - $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' ); |
|
| 4259 | + if ($category_name == $default_category) {
|
|
| 4260 | + $default_category_id = intval($term_category->term_id); |
|
| 4261 | + } |
|
| 4262 | + } |
|
| 4263 | + } |
|
| 4264 | + } |
|
| 4265 | + } |
|
| 4266 | + $xtimings['###5'] = microtime(true)-$xstart; |
|
| 4267 | + $save_post = array(); |
|
| 4268 | + $save_post['post_title'] = $post_title; |
|
| 4269 | + $save_post['post_content'] = $post_content; |
|
| 4270 | + $save_post['post_type'] = $post_type; |
|
| 4271 | + $save_post['post_author'] = $post_author; |
|
| 4272 | + $save_post['post_status'] = $post_status; |
|
| 4273 | + $save_post['post_category'] = $post_category; |
|
| 4274 | + $save_post['post_tags'] = $post_tags; |
|
| 4275 | + |
|
| 4276 | + $saved_post_id = NULL; |
|
| 4277 | + if ( $import_choice == 'update' ) {
|
|
| 4278 | + $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' ); |
|
| 4279 | 4279 | |
| 4280 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4281 | - $save_post['ID'] = $post_id; |
|
| 4280 | + if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4281 | + $save_post['ID'] = $post_id; |
|
| 4282 | 4282 | |
| 4283 | - if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
|
|
| 4284 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4285 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4286 | - $saved_post_id = 0; |
|
| 4287 | - } else {
|
|
| 4288 | - $saved_post_id = $post_id; |
|
| 4289 | - $updated++; |
|
| 4290 | - } |
|
| 4291 | - } |
|
| 4292 | - } else {
|
|
| 4293 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4294 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4295 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4296 | - $saved_post_id = 0; |
|
| 4297 | - } else {
|
|
| 4298 | - $created++; |
|
| 4299 | - } |
|
| 4300 | - } |
|
| 4301 | - } |
|
| 4283 | + if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
|
|
| 4284 | + if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4285 | + $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4286 | + $saved_post_id = 0; |
|
| 4287 | + } else {
|
|
| 4288 | + $saved_post_id = $post_id; |
|
| 4289 | + $updated++; |
|
| 4290 | + } |
|
| 4291 | + } |
|
| 4292 | + } else {
|
|
| 4293 | + if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4294 | + if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4295 | + $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4296 | + $saved_post_id = 0; |
|
| 4297 | + } else {
|
|
| 4298 | + $created++; |
|
| 4299 | + } |
|
| 4300 | + } |
|
| 4301 | + } |
|
| 4302 | 4302 | |
| 4303 | - if ( !$saved_post_id > 0 ) {
|
|
| 4304 | - $invalid++; |
|
| 4305 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error ); |
|
| 4306 | - } |
|
| 4307 | - } else if ( $import_choice == 'skip' ) {
|
|
| 4308 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4309 | - $skipped++; |
|
| 4310 | - } else {
|
|
| 4311 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4312 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4313 | - $invalid++; |
|
| 4303 | + if ( !$saved_post_id > 0 ) {
|
|
| 4304 | + $invalid++; |
|
| 4305 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error ); |
|
| 4306 | + } |
|
| 4307 | + } else if ( $import_choice == 'skip' ) {
|
|
| 4308 | + if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4309 | + $skipped++; |
|
| 4310 | + } else {
|
|
| 4311 | + if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4312 | + if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4313 | + $invalid++; |
|
| 4314 | 4314 | |
| 4315 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error ); |
|
| 4316 | - $saved_post_id = 0; |
|
| 4317 | - } else {
|
|
| 4318 | - $created++; |
|
| 4319 | - } |
|
| 4320 | - } else {
|
|
| 4321 | - $invalid++; |
|
| 4315 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error ); |
|
| 4316 | + $saved_post_id = 0; |
|
| 4317 | + } else {
|
|
| 4318 | + $created++; |
|
| 4319 | + } |
|
| 4320 | + } else {
|
|
| 4321 | + $invalid++; |
|
| 4322 | 4322 | |
| 4323 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4324 | - } |
|
| 4325 | - } |
|
| 4326 | - } else {
|
|
| 4327 | - $invalid++; |
|
| 4323 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4324 | + } |
|
| 4325 | + } |
|
| 4326 | + } else {
|
|
| 4327 | + $invalid++; |
|
| 4328 | 4328 | |
| 4329 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4330 | - } |
|
| 4331 | - $xtimings['###6'] = microtime(true)-$xstart; |
|
| 4332 | - if ( (int)$saved_post_id > 0 ) {
|
|
| 4333 | - // WPML |
|
| 4334 | - if ($is_wpml && $original_post_id > 0 && $language != '') {
|
|
| 4335 | - $wpml_post_type = 'post_' . $post_type; |
|
| 4336 | - $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type ); |
|
| 4337 | - $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 4338 | - |
|
| 4339 | - $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type ); |
|
| 4329 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4330 | + } |
|
| 4331 | + $xtimings['###6'] = microtime(true)-$xstart; |
|
| 4332 | + if ( (int)$saved_post_id > 0 ) {
|
|
| 4333 | + // WPML |
|
| 4334 | + if ($is_wpml && $original_post_id > 0 && $language != '') {
|
|
| 4335 | + $wpml_post_type = 'post_' . $post_type; |
|
| 4336 | + $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type ); |
|
| 4337 | + $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 4338 | + |
|
| 4339 | + $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type ); |
|
| 4340 | 4340 | |
| 4341 | - $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language ); |
|
| 4342 | - } |
|
| 4343 | - // WPML |
|
| 4344 | - $gd_post_info = geodir_get_post_info( $saved_post_id ); |
|
| 4341 | + $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language ); |
|
| 4342 | + } |
|
| 4343 | + // WPML |
|
| 4344 | + $gd_post_info = geodir_get_post_info( $saved_post_id ); |
|
| 4345 | 4345 | |
| 4346 | - $gd_post['post_id'] = $saved_post_id; |
|
| 4347 | - $gd_post['ID'] = $saved_post_id; |
|
| 4348 | - $gd_post['post_tags'] = $post_tags; |
|
| 4349 | - $gd_post['post_title'] = $post_title; |
|
| 4350 | - $gd_post['post_status'] = $post_status; |
|
| 4351 | - $gd_post['submit_time'] = time(); |
|
| 4352 | - $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
| 4346 | + $gd_post['post_id'] = $saved_post_id; |
|
| 4347 | + $gd_post['ID'] = $saved_post_id; |
|
| 4348 | + $gd_post['post_tags'] = $post_tags; |
|
| 4349 | + $gd_post['post_title'] = $post_title; |
|
| 4350 | + $gd_post['post_status'] = $post_status; |
|
| 4351 | + $gd_post['submit_time'] = time(); |
|
| 4352 | + $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
| 4353 | 4353 | |
| 4354 | - // post location |
|
| 4355 | - $post_location_id = 0; |
|
| 4356 | - if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
|
|
| 4357 | - $gd_post['post_neighbourhood'] = ''; |
|
| 4354 | + // post location |
|
| 4355 | + $post_location_id = 0; |
|
| 4356 | + if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
|
|
| 4357 | + $gd_post['post_neighbourhood'] = ''; |
|
| 4358 | 4358 | |
| 4359 | - $post_location_info = array( |
|
| 4360 | - 'city' => $post_city, |
|
| 4361 | - 'region' => $post_region, |
|
| 4362 | - 'country' => $post_country, |
|
| 4363 | - 'geo_lat' => $post_latitude, |
|
| 4364 | - 'geo_lng' => $post_longitude |
|
| 4365 | - ); |
|
| 4366 | - if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
|
|
| 4367 | - $post_location_id = $location_id; |
|
| 4368 | - } |
|
| 4359 | + $post_location_info = array( |
|
| 4360 | + 'city' => $post_city, |
|
| 4361 | + 'region' => $post_region, |
|
| 4362 | + 'country' => $post_country, |
|
| 4363 | + 'geo_lat' => $post_latitude, |
|
| 4364 | + 'geo_lng' => $post_longitude |
|
| 4365 | + ); |
|
| 4366 | + if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
|
|
| 4367 | + $post_location_id = $location_id; |
|
| 4368 | + } |
|
| 4369 | 4369 | |
| 4370 | - if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {
|
|
| 4371 | - $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id); |
|
| 4370 | + if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {
|
|
| 4371 | + $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id); |
|
| 4372 | 4372 | |
| 4373 | - $hood_data = array(); |
|
| 4374 | - $hood_data['hood_location_id'] = $post_location_id; |
|
| 4375 | - $hood_data['hood_name'] = $post_neighbourhood; |
|
| 4373 | + $hood_data = array(); |
|
| 4374 | + $hood_data['hood_location_id'] = $post_location_id; |
|
| 4375 | + $hood_data['hood_name'] = $post_neighbourhood; |
|
| 4376 | 4376 | |
| 4377 | - if (!empty($neighbourhood_info)) {
|
|
| 4378 | - $hood_data['hood_id'] = $neighbourhood_info->hood_id; |
|
| 4379 | - $hood_data['hood_slug'] = $neighbourhood_info->hood_slug; |
|
| 4377 | + if (!empty($neighbourhood_info)) {
|
|
| 4378 | + $hood_data['hood_id'] = $neighbourhood_info->hood_id; |
|
| 4379 | + $hood_data['hood_slug'] = $neighbourhood_info->hood_slug; |
|
| 4380 | 4380 | |
| 4381 | - if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4382 | - $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4383 | - $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4384 | - } |
|
| 4385 | - } |
|
| 4381 | + if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4382 | + $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4383 | + $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4384 | + } |
|
| 4385 | + } |
|
| 4386 | 4386 | |
| 4387 | - if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4388 | - $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4389 | - $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4390 | - } |
|
| 4387 | + if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4388 | + $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4389 | + $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4390 | + } |
|
| 4391 | 4391 | |
| 4392 | - $hood_data['hood_latitude'] = $post_latitude; |
|
| 4393 | - $hood_data['hood_longitude'] = $post_longitude; |
|
| 4394 | - |
|
| 4395 | - $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data); |
|
| 4396 | - if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {
|
|
| 4397 | - $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug; |
|
| 4398 | - } |
|
| 4399 | - } |
|
| 4400 | - } |
|
| 4401 | - $gd_post['post_location_id'] = $post_location_id; |
|
| 4392 | + $hood_data['hood_latitude'] = $post_latitude; |
|
| 4393 | + $hood_data['hood_longitude'] = $post_longitude; |
|
| 4394 | + |
|
| 4395 | + $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data); |
|
| 4396 | + if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {
|
|
| 4397 | + $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug; |
|
| 4398 | + } |
|
| 4399 | + } |
|
| 4400 | + } |
|
| 4401 | + $gd_post['post_location_id'] = $post_location_id; |
|
| 4402 | 4402 | |
| 4403 | - // post package info |
|
| 4404 | - $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0; |
|
| 4405 | - if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
|
|
| 4406 | - $package_id = $gd_post_info->package_id; |
|
| 4407 | - } |
|
| 4403 | + // post package info |
|
| 4404 | + $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0; |
|
| 4405 | + if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
|
|
| 4406 | + $package_id = $gd_post_info->package_id; |
|
| 4407 | + } |
|
| 4408 | 4408 | |
| 4409 | - $package_info = array(); |
|
| 4410 | - if ($package_id && function_exists('geodir_get_package_info_by_id')) {
|
|
| 4411 | - $package_info = (array)geodir_get_package_info_by_id($package_id); |
|
| 4409 | + $package_info = array(); |
|
| 4410 | + if ($package_id && function_exists('geodir_get_package_info_by_id')) {
|
|
| 4411 | + $package_info = (array)geodir_get_package_info_by_id($package_id); |
|
| 4412 | 4412 | |
| 4413 | - if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
|
|
| 4414 | - $package_info = array(); |
|
| 4415 | - } |
|
| 4416 | - } |
|
| 4413 | + if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
|
|
| 4414 | + $package_info = array(); |
|
| 4415 | + } |
|
| 4416 | + } |
|
| 4417 | 4417 | |
| 4418 | - if (empty($package_info)) {
|
|
| 4419 | - $package_info = (array)geodir_post_package_info( array(), '', $post_type ); |
|
| 4420 | - } |
|
| 4418 | + if (empty($package_info)) {
|
|
| 4419 | + $package_info = (array)geodir_post_package_info( array(), '', $post_type ); |
|
| 4420 | + } |
|
| 4421 | 4421 | |
| 4422 | - if (!empty($package_info)) {
|
|
| 4423 | - $package_id = $package_info['pid']; |
|
| 4422 | + if (!empty($package_info)) {
|
|
| 4423 | + $package_id = $package_info['pid']; |
|
| 4424 | 4424 | |
| 4425 | - if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
|
|
| 4426 | - $gd_post['expire_date'] = $expire_date; |
|
| 4427 | - } else {
|
|
| 4428 | - if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
|
|
| 4429 | - $gd_post['alive_days'] = (int)$package_info['days']; |
|
| 4430 | - $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) ); |
|
| 4431 | - } else {
|
|
| 4432 | - $gd_post['expire_date'] = 'Never'; |
|
| 4433 | - } |
|
| 4434 | - } |
|
| 4425 | + if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
|
|
| 4426 | + $gd_post['expire_date'] = $expire_date; |
|
| 4427 | + } else {
|
|
| 4428 | + if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
|
|
| 4429 | + $gd_post['alive_days'] = (int)$package_info['days']; |
|
| 4430 | + $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) ); |
|
| 4431 | + } else {
|
|
| 4432 | + $gd_post['expire_date'] = 'Never'; |
|
| 4433 | + } |
|
| 4434 | + } |
|
| 4435 | 4435 | |
| 4436 | - $gd_post['package_id'] = $package_id; |
|
| 4437 | - } |
|
| 4436 | + $gd_post['package_id'] = $package_id; |
|
| 4437 | + } |
|
| 4438 | 4438 | |
| 4439 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 4439 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 4440 | 4440 | |
| 4441 | - if ($post_type == 'gd_event') {
|
|
| 4442 | - $gd_post = geodir_imex_process_event_data($gd_post); |
|
| 4443 | - } |
|
| 4441 | + if ($post_type == 'gd_event') {
|
|
| 4442 | + $gd_post = geodir_imex_process_event_data($gd_post); |
|
| 4443 | + } |
|
| 4444 | 4444 | |
| 4445 | - if (isset($gd_post['post_id'])) {
|
|
| 4446 | - unset($gd_post['post_id']); |
|
| 4447 | - } |
|
| 4445 | + if (isset($gd_post['post_id'])) {
|
|
| 4446 | + unset($gd_post['post_id']); |
|
| 4447 | + } |
|
| 4448 | 4448 | |
| 4449 | - // Export franchise fields |
|
| 4450 | - $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 4451 | - if ($is_franchise_active) {
|
|
| 4452 | - if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {
|
|
| 4453 | - $gd_franchise_lock = array(); |
|
| 4449 | + // Export franchise fields |
|
| 4450 | + $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 4451 | + if ($is_franchise_active) {
|
|
| 4452 | + if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {
|
|
| 4453 | + $gd_franchise_lock = array(); |
|
| 4454 | 4454 | |
| 4455 | - if ( isset( $gd_post['gd_franchise_lock'] ) ) {
|
|
| 4456 | - $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
|
|
| 4457 | - $gd_franchise_lock = trim( $gd_franchise_lock ); |
|
| 4458 | - $gd_franchise_lock = explode( ",", $gd_franchise_lock ); |
|
| 4459 | - } |
|
| 4455 | + if ( isset( $gd_post['gd_franchise_lock'] ) ) {
|
|
| 4456 | + $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
|
|
| 4457 | + $gd_franchise_lock = trim( $gd_franchise_lock ); |
|
| 4458 | + $gd_franchise_lock = explode( ",", $gd_franchise_lock ); |
|
| 4459 | + } |
|
| 4460 | 4460 | |
| 4461 | - update_post_meta( $saved_post_id, 'gd_is_franchise', 1 ); |
|
| 4462 | - update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock ); |
|
| 4463 | - } else {
|
|
| 4464 | - if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
|
|
| 4465 | - geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] ); |
|
| 4466 | - } |
|
| 4467 | - } |
|
| 4468 | - } |
|
| 4461 | + update_post_meta( $saved_post_id, 'gd_is_franchise', 1 ); |
|
| 4462 | + update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock ); |
|
| 4463 | + } else {
|
|
| 4464 | + if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
|
|
| 4465 | + geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] ); |
|
| 4466 | + } |
|
| 4467 | + } |
|
| 4468 | + } |
|
| 4469 | 4469 | |
| 4470 | - if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
|
|
| 4471 | - $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) ); |
|
| 4472 | - if ($default_category_id) {
|
|
| 4473 | - $save_post['post_default_category'] = $default_category_id; |
|
| 4474 | - $gd_post['default_category'] = $default_category_id; |
|
| 4475 | - } |
|
| 4476 | - $gd_post[$cat_taxonomy] = $save_post['post_category']; |
|
| 4477 | - } |
|
| 4478 | - $xtimings['###7'] = microtime(true)-$xstart; |
|
| 4479 | - // Save post info |
|
| 4480 | - geodir_save_post_info( $saved_post_id, $gd_post ); |
|
| 4481 | - $xtimings['###8'] = microtime(true)-$xstart; |
|
| 4482 | - // post taxonomies |
|
| 4483 | - if ( !empty( $save_post['post_category'] ) ) {
|
|
| 4484 | - wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy ); |
|
| 4470 | + if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
|
|
| 4471 | + $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) ); |
|
| 4472 | + if ($default_category_id) {
|
|
| 4473 | + $save_post['post_default_category'] = $default_category_id; |
|
| 4474 | + $gd_post['default_category'] = $default_category_id; |
|
| 4475 | + } |
|
| 4476 | + $gd_post[$cat_taxonomy] = $save_post['post_category']; |
|
| 4477 | + } |
|
| 4478 | + $xtimings['###7'] = microtime(true)-$xstart; |
|
| 4479 | + // Save post info |
|
| 4480 | + geodir_save_post_info( $saved_post_id, $gd_post ); |
|
| 4481 | + $xtimings['###8'] = microtime(true)-$xstart; |
|
| 4482 | + // post taxonomies |
|
| 4483 | + if ( !empty( $save_post['post_category'] ) ) {
|
|
| 4484 | + wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy ); |
|
| 4485 | 4485 | |
| 4486 | - $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : ''; |
|
| 4487 | - if ($default_category_id) {
|
|
| 4488 | - $post_default_category = $default_category_id; |
|
| 4489 | - } |
|
| 4490 | - $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy); |
|
| 4491 | - $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
|
|
| 4492 | - $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
|
|
| 4486 | + $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : ''; |
|
| 4487 | + if ($default_category_id) {
|
|
| 4488 | + $post_default_category = $default_category_id; |
|
| 4489 | + } |
|
| 4490 | + $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy); |
|
| 4491 | + $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
|
|
| 4492 | + $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
|
|
| 4493 | 4493 | |
| 4494 | - if ($post_category_str != '' && $post_default_category) {
|
|
| 4495 | - $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str); |
|
| 4496 | - } |
|
| 4494 | + if ($post_category_str != '' && $post_default_category) {
|
|
| 4495 | + $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str); |
|
| 4496 | + } |
|
| 4497 | 4497 | |
| 4498 | - $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : ''; |
|
| 4498 | + $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : ''; |
|
| 4499 | 4499 | |
| 4500 | - geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str ); |
|
| 4501 | - } |
|
| 4502 | - $xtimings['###8.1'] = microtime(true)-$xstart; |
|
| 4503 | - if ( !empty( $save_post['post_tags'] ) ) {
|
|
| 4504 | - wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy ); |
|
| 4505 | - } |
|
| 4506 | - $xtimings['###9'] = microtime(true)-$xstart; |
|
| 4507 | - // Post images |
|
| 4508 | - if ( !empty( $post_images ) ) {
|
|
| 4509 | - $post_images = array_unique($post_images); |
|
| 4500 | + geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str ); |
|
| 4501 | + } |
|
| 4502 | + $xtimings['###8.1'] = microtime(true)-$xstart; |
|
| 4503 | + if ( !empty( $save_post['post_tags'] ) ) {
|
|
| 4504 | + wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy ); |
|
| 4505 | + } |
|
| 4506 | + $xtimings['###9'] = microtime(true)-$xstart; |
|
| 4507 | + // Post images |
|
| 4508 | + if ( !empty( $post_images ) ) {
|
|
| 4509 | + $post_images = array_unique($post_images); |
|
| 4510 | 4510 | |
| 4511 | - $old_post_images_arr = array(); |
|
| 4512 | - $saved_post_images_arr = array(); |
|
| 4511 | + $old_post_images_arr = array(); |
|
| 4512 | + $saved_post_images_arr = array(); |
|
| 4513 | 4513 | |
| 4514 | - $order = 1; |
|
| 4514 | + $order = 1; |
|
| 4515 | 4515 | |
| 4516 | - $old_post_images = geodir_get_images( $saved_post_id ); |
|
| 4517 | - $xtimings['###9.1'] = microtime(true)-$xstart; |
|
| 4518 | - if (!empty($old_post_images)) {
|
|
| 4519 | - foreach( $old_post_images as $old_post_image ) {
|
|
| 4520 | - if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
|
|
| 4521 | - $old_post_images_arr[] = $old_post_image->file; |
|
| 4522 | - } |
|
| 4523 | - } |
|
| 4524 | - } |
|
| 4516 | + $old_post_images = geodir_get_images( $saved_post_id ); |
|
| 4517 | + $xtimings['###9.1'] = microtime(true)-$xstart; |
|
| 4518 | + if (!empty($old_post_images)) {
|
|
| 4519 | + foreach( $old_post_images as $old_post_image ) {
|
|
| 4520 | + if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
|
|
| 4521 | + $old_post_images_arr[] = $old_post_image->file; |
|
| 4522 | + } |
|
| 4523 | + } |
|
| 4524 | + } |
|
| 4525 | 4525 | |
| 4526 | - foreach ( $post_images as $post_image ) {
|
|
| 4527 | - $image_name = basename( $post_image ); |
|
| 4528 | - $saved_post_images_arr[] = $image_name; |
|
| 4526 | + foreach ( $post_images as $post_image ) {
|
|
| 4527 | + $image_name = basename( $post_image ); |
|
| 4528 | + $saved_post_images_arr[] = $image_name; |
|
| 4529 | 4529 | |
| 4530 | - if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
|
|
| 4531 | - continue; // Skip if image already exists. |
|
| 4532 | - } |
|
| 4530 | + if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
|
|
| 4531 | + continue; // Skip if image already exists. |
|
| 4532 | + } |
|
| 4533 | 4533 | |
| 4534 | - $image_name_parts = explode( '.', $image_name ); |
|
| 4535 | - array_pop( $image_name_parts ); |
|
| 4536 | - $proper_image_name = implode( '.', $image_name_parts ); |
|
| 4537 | - $xtimings['###9.2'] = microtime(true)-$xstart; |
|
| 4538 | - $arr_file_type = wp_check_filetype( $image_name ); |
|
| 4539 | - $xtimings['###9.3'] = microtime(true)-$xstart; |
|
| 4540 | - if ( !empty( $arr_file_type ) ) {
|
|
| 4541 | - $uploaded_file_type = $arr_file_type['type']; |
|
| 4534 | + $image_name_parts = explode( '.', $image_name ); |
|
| 4535 | + array_pop( $image_name_parts ); |
|
| 4536 | + $proper_image_name = implode( '.', $image_name_parts ); |
|
| 4537 | + $xtimings['###9.2'] = microtime(true)-$xstart; |
|
| 4538 | + $arr_file_type = wp_check_filetype( $image_name ); |
|
| 4539 | + $xtimings['###9.3'] = microtime(true)-$xstart; |
|
| 4540 | + if ( !empty( $arr_file_type ) ) {
|
|
| 4541 | + $uploaded_file_type = $arr_file_type['type']; |
|
| 4542 | 4542 | |
| 4543 | - $attachment = array(); |
|
| 4544 | - $attachment['post_id'] = $saved_post_id; |
|
| 4545 | - $attachment['title'] = $proper_image_name; |
|
| 4546 | - $attachment['content'] = ''; |
|
| 4547 | - $attachment['file'] = $uploads_subdir . '/' . $image_name; |
|
| 4548 | - $attachment['mime_type'] = $uploaded_file_type; |
|
| 4549 | - $attachment['menu_order'] = $order; |
|
| 4550 | - $attachment['is_featured'] = 0; |
|
| 4551 | - |
|
| 4552 | - $attachment_set = ''; |
|
| 4553 | - foreach ( $attachment as $key => $val ) {
|
|
| 4554 | - if ( $val != '' ) {
|
|
| 4555 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 4556 | - } |
|
| 4557 | - } |
|
| 4558 | - $attachment_set = trim( $attachment_set, ", " ); |
|
| 4543 | + $attachment = array(); |
|
| 4544 | + $attachment['post_id'] = $saved_post_id; |
|
| 4545 | + $attachment['title'] = $proper_image_name; |
|
| 4546 | + $attachment['content'] = ''; |
|
| 4547 | + $attachment['file'] = $uploads_subdir . '/' . $image_name; |
|
| 4548 | + $attachment['mime_type'] = $uploaded_file_type; |
|
| 4549 | + $attachment['menu_order'] = $order; |
|
| 4550 | + $attachment['is_featured'] = 0; |
|
| 4551 | + |
|
| 4552 | + $attachment_set = ''; |
|
| 4553 | + foreach ( $attachment as $key => $val ) {
|
|
| 4554 | + if ( $val != '' ) {
|
|
| 4555 | + $attachment_set .= $key . " = '" . $val . "', "; |
|
| 4556 | + } |
|
| 4557 | + } |
|
| 4558 | + $attachment_set = trim( $attachment_set, ", " ); |
|
| 4559 | 4559 | |
| 4560 | - // Add new attachment |
|
| 4561 | - $xtimings['###9.4'] = microtime(true)-$xstart; |
|
| 4562 | - $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set ); |
|
| 4563 | - $xtimings['###9.5'] = microtime(true)-$xstart; |
|
| 4564 | - $order++; |
|
| 4565 | - } |
|
| 4566 | - } |
|
| 4567 | - |
|
| 4568 | - $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : '';
|
|
| 4569 | - // Remove previous attachment |
|
| 4570 | - $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql ); |
|
| 4571 | - $xtimings['###9.6'] = microtime(true)-$xstart; |
|
| 4572 | - if ( !empty( $saved_post_images_arr ) ) {
|
|
| 4573 | - geodir_set_wp_featured_image($saved_post_id); |
|
| 4574 | - $xtimings['###9.7'] = microtime(true)-$xstart; |
|
| 4575 | - /* |
|
| 4560 | + // Add new attachment |
|
| 4561 | + $xtimings['###9.4'] = microtime(true)-$xstart; |
|
| 4562 | + $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set ); |
|
| 4563 | + $xtimings['###9.5'] = microtime(true)-$xstart; |
|
| 4564 | + $order++; |
|
| 4565 | + } |
|
| 4566 | + } |
|
| 4567 | + |
|
| 4568 | + $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : '';
|
|
| 4569 | + // Remove previous attachment |
|
| 4570 | + $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql ); |
|
| 4571 | + $xtimings['###9.6'] = microtime(true)-$xstart; |
|
| 4572 | + if ( !empty( $saved_post_images_arr ) ) {
|
|
| 4573 | + geodir_set_wp_featured_image($saved_post_id); |
|
| 4574 | + $xtimings['###9.7'] = microtime(true)-$xstart; |
|
| 4575 | + /* |
|
| 4576 | 4576 | $menu_order = 1; |
| 4577 | 4577 | |
| 4578 | 4578 | foreach ( $saved_post_images_arr as $img_name ) {
|
@@ -4585,288 +4585,288 @@ discard block |
||
| 4585 | 4585 | } |
| 4586 | 4586 | $menu_order++; |
| 4587 | 4587 | }*/ |
| 4588 | - } |
|
| 4588 | + } |
|
| 4589 | 4589 | |
| 4590 | - if ( $order > 1 ) {
|
|
| 4591 | - $images++; |
|
| 4592 | - } |
|
| 4593 | - } |
|
| 4594 | - $xtimings['###10'] = microtime(true)-$xstart; |
|
| 4595 | - /** This action is documented in geodirectory-functions/post-functions.php */ |
|
| 4596 | - do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post ); |
|
| 4597 | - $xtimings['###11'] = microtime(true)-$xstart; |
|
| 4598 | - if (isset($is_featured)) {
|
|
| 4599 | - geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured); |
|
| 4600 | - } |
|
| 4601 | - if (isset($gd_post['alive_days'])) {
|
|
| 4602 | - geodir_save_post_meta($saved_post_id, 'alive_days', $gd_post['alive_days']); |
|
| 4603 | - } |
|
| 4604 | - if (isset($gd_post['expire_date'])) {
|
|
| 4605 | - geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']); |
|
| 4606 | - } |
|
| 4607 | - $xtimings['###12'] = microtime(true)-$xstart; |
|
| 4608 | - } |
|
| 4590 | + if ( $order > 1 ) {
|
|
| 4591 | + $images++; |
|
| 4592 | + } |
|
| 4593 | + } |
|
| 4594 | + $xtimings['###10'] = microtime(true)-$xstart; |
|
| 4595 | + /** This action is documented in geodirectory-functions/post-functions.php */ |
|
| 4596 | + do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post ); |
|
| 4597 | + $xtimings['###11'] = microtime(true)-$xstart; |
|
| 4598 | + if (isset($is_featured)) {
|
|
| 4599 | + geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured); |
|
| 4600 | + } |
|
| 4601 | + if (isset($gd_post['alive_days'])) {
|
|
| 4602 | + geodir_save_post_meta($saved_post_id, 'alive_days', $gd_post['alive_days']); |
|
| 4603 | + } |
|
| 4604 | + if (isset($gd_post['expire_date'])) {
|
|
| 4605 | + geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']); |
|
| 4606 | + } |
|
| 4607 | + $xtimings['###12'] = microtime(true)-$xstart; |
|
| 4608 | + } |
|
| 4609 | 4609 | |
| 4610 | - // WPML |
|
| 4611 | - if ($is_wpml && $language != '') {
|
|
| 4612 | - $sitepress->switch_lang($active_lang, true); |
|
| 4613 | - } |
|
| 4614 | - // WPML |
|
| 4615 | - } |
|
| 4616 | - } |
|
| 4617 | - } |
|
| 4610 | + // WPML |
|
| 4611 | + if ($is_wpml && $language != '') {
|
|
| 4612 | + $sitepress->switch_lang($active_lang, true); |
|
| 4613 | + } |
|
| 4614 | + // WPML |
|
| 4615 | + } |
|
| 4616 | + } |
|
| 4617 | + } |
|
| 4618 | 4618 | |
| 4619 | - //undo some stuff to make the import quicker |
|
| 4620 | - wp_defer_term_counting( false ); |
|
| 4621 | - wp_defer_comment_counting( false ); |
|
| 4622 | - $wpdb->query( 'COMMIT;' ); |
|
| 4623 | - $wpdb->query( 'SET autocommit = 1;' ); |
|
| 4624 | - $xtimings['###13'] = microtime(true)-$xstart; |
|
| 4625 | - $json = array(); |
|
| 4626 | - $json['processed'] = $processed_actual; |
|
| 4627 | - $json['created'] = $created; |
|
| 4628 | - $json['updated'] = $updated; |
|
| 4629 | - $json['skipped'] = $skipped; |
|
| 4630 | - $json['invalid'] = $invalid; |
|
| 4631 | - $json['invalid_addr'] = $invalid_addr; |
|
| 4632 | - $json['images'] = $images; |
|
| 4633 | - $json['timing'] = microtime(true)-$xstart; |
|
| 4634 | - $json['timings'] = $xtimings; |
|
| 4619 | + //undo some stuff to make the import quicker |
|
| 4620 | + wp_defer_term_counting( false ); |
|
| 4621 | + wp_defer_comment_counting( false ); |
|
| 4622 | + $wpdb->query( 'COMMIT;' ); |
|
| 4623 | + $wpdb->query( 'SET autocommit = 1;' ); |
|
| 4624 | + $xtimings['###13'] = microtime(true)-$xstart; |
|
| 4625 | + $json = array(); |
|
| 4626 | + $json['processed'] = $processed_actual; |
|
| 4627 | + $json['created'] = $created; |
|
| 4628 | + $json['updated'] = $updated; |
|
| 4629 | + $json['skipped'] = $skipped; |
|
| 4630 | + $json['invalid'] = $invalid; |
|
| 4631 | + $json['invalid_addr'] = $invalid_addr; |
|
| 4632 | + $json['images'] = $images; |
|
| 4633 | + $json['timing'] = microtime(true)-$xstart; |
|
| 4634 | + $json['timings'] = $xtimings; |
|
| 4635 | 4635 | |
| 4636 | 4636 | |
| 4637 | - wp_send_json( $json ); |
|
| 4638 | - exit; |
|
| 4639 | - } else if ( $task == 'import_loc' ) {
|
|
| 4640 | - global $gd_post_types; |
|
| 4641 | - $gd_post_types = $post_types; |
|
| 4637 | + wp_send_json( $json ); |
|
| 4638 | + exit; |
|
| 4639 | + } else if ( $task == 'import_loc' ) {
|
|
| 4640 | + global $gd_post_types; |
|
| 4641 | + $gd_post_types = $post_types; |
|
| 4642 | 4642 | |
| 4643 | - if (!empty($file)) {
|
|
| 4644 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4643 | + if (!empty($file)) {
|
|
| 4644 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4645 | 4645 | |
| 4646 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4647 | - $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
|
|
| 4648 | - wp_send_json( $json ); |
|
| 4649 | - } |
|
| 4646 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4647 | + $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
|
|
| 4648 | + wp_send_json( $json ); |
|
| 4649 | + } |
|
| 4650 | 4650 | |
| 4651 | - $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
|
|
| 4652 | - $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' ); |
|
| 4653 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 4654 | - $index = $processed + $i; |
|
| 4651 | + $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
|
|
| 4652 | + $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' ); |
|
| 4653 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 4654 | + $index = $processed + $i; |
|
| 4655 | 4655 | |
| 4656 | - if (isset($file[$index])) {
|
|
| 4657 | - $row = $file[$index]; |
|
| 4658 | - $row = array_map( 'trim', $row ); |
|
| 4659 | - $data = array(); |
|
| 4656 | + if (isset($file[$index])) {
|
|
| 4657 | + $row = $file[$index]; |
|
| 4658 | + $row = array_map( 'trim', $row ); |
|
| 4659 | + $data = array(); |
|
| 4660 | 4660 | |
| 4661 | - foreach ($columns as $c => $column ) {
|
|
| 4662 | - 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'))) {
|
|
| 4663 | - $data[$column] = $row[$c]; |
|
| 4664 | - } |
|
| 4665 | - } |
|
| 4661 | + foreach ($columns as $c => $column ) {
|
|
| 4662 | + 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'))) {
|
|
| 4663 | + $data[$column] = $row[$c]; |
|
| 4664 | + } |
|
| 4665 | + } |
|
| 4666 | 4666 | |
| 4667 | - if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
|
|
| 4668 | - $invalid++; |
|
| 4669 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4670 | - continue; |
|
| 4671 | - } |
|
| 4667 | + if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
|
|
| 4668 | + $invalid++; |
|
| 4669 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4670 | + continue; |
|
| 4671 | + } |
|
| 4672 | 4672 | |
| 4673 | - $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0; |
|
| 4673 | + $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0; |
|
| 4674 | 4674 | |
| 4675 | - if ( $import_choice == 'update' ) {
|
|
| 4676 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4677 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4678 | - $updated++; |
|
| 4679 | - } else {
|
|
| 4680 | - $invalid++; |
|
| 4681 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4682 | - } |
|
| 4683 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4684 | - $data['location_id'] = (int)$location->location_id; |
|
| 4675 | + if ( $import_choice == 'update' ) {
|
|
| 4676 | + if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4677 | + if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4678 | + $updated++; |
|
| 4679 | + } else {
|
|
| 4680 | + $invalid++; |
|
| 4681 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4682 | + } |
|
| 4683 | + } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4684 | + $data['location_id'] = (int)$location->location_id; |
|
| 4685 | 4685 | |
| 4686 | - if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
|
|
| 4687 | - $data['location_id'] = (int)$location->location_id; |
|
| 4688 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
|
|
| 4689 | - $data['location_id'] = (int)$location->location_id; |
|
| 4690 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
|
|
| 4691 | - $data['location_id'] = (int)$location->location_id; |
|
| 4692 | - } |
|
| 4686 | + if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
|
|
| 4687 | + $data['location_id'] = (int)$location->location_id; |
|
| 4688 | + } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
|
|
| 4689 | + $data['location_id'] = (int)$location->location_id; |
|
| 4690 | + } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
|
|
| 4691 | + $data['location_id'] = (int)$location->location_id; |
|
| 4692 | + } |
|
| 4693 | 4693 | |
| 4694 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4695 | - $updated++; |
|
| 4696 | - } else {
|
|
| 4697 | - $invalid++; |
|
| 4698 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4699 | - } |
|
| 4700 | - } else {
|
|
| 4701 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4702 | - $created++; |
|
| 4703 | - } else {
|
|
| 4704 | - $invalid++; |
|
| 4705 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4706 | - } |
|
| 4707 | - } |
|
| 4708 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4709 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4710 | - $skipped++; |
|
| 4711 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4712 | - $skipped++; |
|
| 4713 | - } else {
|
|
| 4714 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4715 | - $created++; |
|
| 4716 | - } else {
|
|
| 4717 | - $invalid++; |
|
| 4718 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4719 | - } |
|
| 4720 | - } |
|
| 4721 | - } else {
|
|
| 4722 | - $invalid++; |
|
| 4723 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4724 | - } |
|
| 4725 | - } |
|
| 4726 | - } |
|
| 4727 | - } |
|
| 4694 | + if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4695 | + $updated++; |
|
| 4696 | + } else {
|
|
| 4697 | + $invalid++; |
|
| 4698 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4699 | + } |
|
| 4700 | + } else {
|
|
| 4701 | + if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4702 | + $created++; |
|
| 4703 | + } else {
|
|
| 4704 | + $invalid++; |
|
| 4705 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4706 | + } |
|
| 4707 | + } |
|
| 4708 | + } elseif ( $import_choice == 'skip' ) {
|
|
| 4709 | + if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4710 | + $skipped++; |
|
| 4711 | + } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4712 | + $skipped++; |
|
| 4713 | + } else {
|
|
| 4714 | + if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4715 | + $created++; |
|
| 4716 | + } else {
|
|
| 4717 | + $invalid++; |
|
| 4718 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4719 | + } |
|
| 4720 | + } |
|
| 4721 | + } else {
|
|
| 4722 | + $invalid++; |
|
| 4723 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4724 | + } |
|
| 4725 | + } |
|
| 4726 | + } |
|
| 4727 | + } |
|
| 4728 | 4728 | |
| 4729 | - $json = array(); |
|
| 4730 | - $json['processed'] = $limit; |
|
| 4731 | - $json['created'] = $created; |
|
| 4732 | - $json['updated'] = $updated; |
|
| 4733 | - $json['skipped'] = $skipped; |
|
| 4734 | - $json['invalid'] = $invalid; |
|
| 4735 | - $json['images'] = $images; |
|
| 4729 | + $json = array(); |
|
| 4730 | + $json['processed'] = $limit; |
|
| 4731 | + $json['created'] = $created; |
|
| 4732 | + $json['updated'] = $updated; |
|
| 4733 | + $json['skipped'] = $skipped; |
|
| 4734 | + $json['invalid'] = $invalid; |
|
| 4735 | + $json['images'] = $images; |
|
| 4736 | 4736 | |
| 4737 | - wp_send_json( $json ); |
|
| 4738 | - } else if ( $task == 'import_hood' ) {
|
|
| 4739 | - if (!empty($file)) {
|
|
| 4740 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4737 | + wp_send_json( $json ); |
|
| 4738 | + } else if ( $task == 'import_hood' ) {
|
|
| 4739 | + if (!empty($file)) {
|
|
| 4740 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4741 | 4741 | |
| 4742 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4743 | - $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
|
|
| 4744 | - wp_send_json( $json ); |
|
| 4745 | - } |
|
| 4742 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4743 | + $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
|
|
| 4744 | + wp_send_json( $json ); |
|
| 4745 | + } |
|
| 4746 | 4746 | |
| 4747 | - $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
|
|
| 4748 | - $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' ); |
|
| 4749 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 4750 | - $index = $processed + $i; |
|
| 4747 | + $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
|
|
| 4748 | + $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' ); |
|
| 4749 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 4750 | + $index = $processed + $i; |
|
| 4751 | 4751 | |
| 4752 | - if (isset($file[$index])) {
|
|
| 4753 | - $row = $file[$index]; |
|
| 4754 | - $row = array_map( 'trim', $row ); |
|
| 4755 | - $data = array(); |
|
| 4752 | + if (isset($file[$index])) {
|
|
| 4753 | + $row = $file[$index]; |
|
| 4754 | + $row = array_map( 'trim', $row ); |
|
| 4755 | + $data = array(); |
|
| 4756 | 4756 | |
| 4757 | - foreach ($columns as $c => $column) {
|
|
| 4758 | - if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {
|
|
| 4759 | - $data[$column] = sanitize_text_field($row[$c]); |
|
| 4760 | - } |
|
| 4761 | - } |
|
| 4757 | + foreach ($columns as $c => $column) {
|
|
| 4758 | + if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {
|
|
| 4759 | + $data[$column] = sanitize_text_field($row[$c]); |
|
| 4760 | + } |
|
| 4761 | + } |
|
| 4762 | 4762 | |
| 4763 | - if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
|
|
| 4764 | - $invalid++; |
|
| 4765 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4766 | - continue; |
|
| 4767 | - } |
|
| 4763 | + if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
|
|
| 4764 | + $invalid++; |
|
| 4765 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4766 | + continue; |
|
| 4767 | + } |
|
| 4768 | 4768 | |
| 4769 | - $location_info = array(); |
|
| 4770 | - if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
|
|
| 4771 | - $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
|
|
| 4772 | - } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
|
|
| 4773 | - $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
|
|
| 4774 | - } |
|
| 4769 | + $location_info = array(); |
|
| 4770 | + if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
|
|
| 4771 | + $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
|
|
| 4772 | + } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
|
|
| 4773 | + $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
|
|
| 4774 | + } |
|
| 4775 | 4775 | |
| 4776 | - if (empty($location_info)) {
|
|
| 4777 | - $invalid++; |
|
| 4778 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4779 | - continue; |
|
| 4780 | - } |
|
| 4776 | + if (empty($location_info)) {
|
|
| 4777 | + $invalid++; |
|
| 4778 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4779 | + continue; |
|
| 4780 | + } |
|
| 4781 | 4781 | |
| 4782 | - $location_id = $location_info->location_id; |
|
| 4782 | + $location_id = $location_info->location_id; |
|
| 4783 | 4783 | |
| 4784 | - $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0; |
|
| 4784 | + $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0; |
|
| 4785 | 4785 | |
| 4786 | - $hood_data = array(); |
|
| 4787 | - $hood_data['hood_name'] = $data['neighbourhood_name']; |
|
| 4788 | - $hood_data['hood_slug'] = $data['neighbourhood_slug']; |
|
| 4789 | - $hood_data['hood_latitude'] = $data['latitude']; |
|
| 4790 | - $hood_data['hood_longitude'] = $data['longitude']; |
|
| 4791 | - $hood_data['hood_location_id'] = $location_id; |
|
| 4786 | + $hood_data = array(); |
|
| 4787 | + $hood_data['hood_name'] = $data['neighbourhood_name']; |
|
| 4788 | + $hood_data['hood_slug'] = $data['neighbourhood_slug']; |
|
| 4789 | + $hood_data['hood_latitude'] = $data['latitude']; |
|
| 4790 | + $hood_data['hood_longitude'] = $data['longitude']; |
|
| 4791 | + $hood_data['hood_location_id'] = $location_id; |
|
| 4792 | 4792 | |
| 4793 | - if ( $import_choice == 'update' ) {
|
|
| 4794 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4795 | - $hood_data['hood_id'] = (int)$data['neighbourhood_id']; |
|
| 4793 | + if ( $import_choice == 'update' ) {
|
|
| 4794 | + if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4795 | + $hood_data['hood_id'] = (int)$data['neighbourhood_id']; |
|
| 4796 | 4796 | |
| 4797 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4798 | - $updated++; |
|
| 4799 | - } else {
|
|
| 4800 | - $invalid++; |
|
| 4801 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4802 | - } |
|
| 4803 | - } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4804 | - $hood_data['hood_id'] = (int)$neighbourhood->hood_id; |
|
| 4797 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4798 | + $updated++; |
|
| 4799 | + } else {
|
|
| 4800 | + $invalid++; |
|
| 4801 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4802 | + } |
|
| 4803 | + } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4804 | + $hood_data['hood_id'] = (int)$neighbourhood->hood_id; |
|
| 4805 | 4805 | |
| 4806 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4807 | - $updated++; |
|
| 4808 | - } else {
|
|
| 4809 | - $invalid++; |
|
| 4810 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4811 | - } |
|
| 4812 | - } else {
|
|
| 4813 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4814 | - $created++; |
|
| 4815 | - } else {
|
|
| 4816 | - $invalid++; |
|
| 4817 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4818 | - } |
|
| 4819 | - } |
|
| 4820 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4821 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4822 | - $skipped++; |
|
| 4823 | - } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4824 | - $skipped++; |
|
| 4825 | - } else {
|
|
| 4806 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4807 | + $updated++; |
|
| 4808 | + } else {
|
|
| 4809 | + $invalid++; |
|
| 4810 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4811 | + } |
|
| 4812 | + } else {
|
|
| 4813 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4814 | + $created++; |
|
| 4815 | + } else {
|
|
| 4816 | + $invalid++; |
|
| 4817 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4818 | + } |
|
| 4819 | + } |
|
| 4820 | + } elseif ( $import_choice == 'skip' ) {
|
|
| 4821 | + if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4822 | + $skipped++; |
|
| 4823 | + } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4824 | + $skipped++; |
|
| 4825 | + } else {
|
|
| 4826 | 4826 | |
| 4827 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4828 | - $created++; |
|
| 4829 | - } else {
|
|
| 4830 | - $invalid++; |
|
| 4831 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4832 | - } |
|
| 4833 | - } |
|
| 4834 | - } else {
|
|
| 4835 | - $invalid++; |
|
| 4836 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4837 | - } |
|
| 4838 | - } |
|
| 4839 | - } |
|
| 4840 | - } |
|
| 4827 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4828 | + $created++; |
|
| 4829 | + } else {
|
|
| 4830 | + $invalid++; |
|
| 4831 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4832 | + } |
|
| 4833 | + } |
|
| 4834 | + } else {
|
|
| 4835 | + $invalid++; |
|
| 4836 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4837 | + } |
|
| 4838 | + } |
|
| 4839 | + } |
|
| 4840 | + } |
|
| 4841 | 4841 | |
| 4842 | - $json = array(); |
|
| 4843 | - $json['processed'] = $limit; |
|
| 4844 | - $json['created'] = $created; |
|
| 4845 | - $json['updated'] = $updated; |
|
| 4846 | - $json['skipped'] = $skipped; |
|
| 4847 | - $json['invalid'] = $invalid; |
|
| 4848 | - $json['images'] = $images; |
|
| 4842 | + $json = array(); |
|
| 4843 | + $json['processed'] = $limit; |
|
| 4844 | + $json['created'] = $created; |
|
| 4845 | + $json['updated'] = $updated; |
|
| 4846 | + $json['skipped'] = $skipped; |
|
| 4847 | + $json['invalid'] = $invalid; |
|
| 4848 | + $json['images'] = $images; |
|
| 4849 | 4849 | |
| 4850 | - wp_send_json( $json ); |
|
| 4851 | - } |
|
| 4852 | - } |
|
| 4853 | - break; |
|
| 4854 | - case 'import_finish':{
|
|
| 4855 | - /** |
|
| 4856 | - * Run an action when an import finishes. |
|
| 4857 | - * |
|
| 4858 | - * This action can be used to fire functions after an import ends. |
|
| 4859 | - * |
|
| 4860 | - * @since 1.5.3 |
|
| 4861 | - * @package GeoDirectory |
|
| 4862 | - */ |
|
| 4863 | - do_action('geodir_import_finished');
|
|
| 4864 | - } |
|
| 4865 | - break; |
|
| 4850 | + wp_send_json( $json ); |
|
| 4851 | + } |
|
| 4852 | + } |
|
| 4853 | + break; |
|
| 4854 | + case 'import_finish':{
|
|
| 4855 | + /** |
|
| 4856 | + * Run an action when an import finishes. |
|
| 4857 | + * |
|
| 4858 | + * This action can be used to fire functions after an import ends. |
|
| 4859 | + * |
|
| 4860 | + * @since 1.5.3 |
|
| 4861 | + * @package GeoDirectory |
|
| 4862 | + */ |
|
| 4863 | + do_action('geodir_import_finished');
|
|
| 4864 | + } |
|
| 4865 | + break; |
|
| 4866 | 4866 | |
| 4867 | - } |
|
| 4868 | - echo '0'; |
|
| 4869 | - gd_die(); |
|
| 4867 | + } |
|
| 4868 | + echo '0'; |
|
| 4869 | + gd_die(); |
|
| 4870 | 4870 | } |
| 4871 | 4871 | |
| 4872 | 4872 | /** |
@@ -4910,12 +4910,12 @@ discard block |
||
| 4910 | 4910 | $args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args ); |
| 4911 | 4911 | } |
| 4912 | 4912 | |
| 4913 | - if( !empty( $term ) ) {
|
|
| 4913 | + if( !empty( $term ) ) {
|
|
| 4914 | 4914 | $result = wp_insert_term( $term, $taxonomy, $args ); |
| 4915 | - if( !is_wp_error( $result ) ) {
|
|
| 4916 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4917 | - } |
|
| 4918 | - } |
|
| 4915 | + if( !is_wp_error( $result ) ) {
|
|
| 4916 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4917 | + } |
|
| 4918 | + } |
|
| 4919 | 4919 | |
| 4920 | 4920 | return false; |
| 4921 | 4921 | } |
@@ -4961,16 +4961,16 @@ discard block |
||
| 4961 | 4961 | $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
| 4962 | 4962 | |
| 4963 | 4963 | if( !is_wp_error( $result ) ) {
|
| 4964 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4965 | - } |
|
| 4964 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4965 | + } |
|
| 4966 | 4966 | } else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
| 4967 | 4967 | $term_data['term_id'] = $term_info['term_id']; |
| 4968 | 4968 | |
| 4969 | 4969 | $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
| 4970 | 4970 | |
| 4971 | 4971 | if( !is_wp_error( $result ) ) {
|
| 4972 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4973 | - } |
|
| 4972 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4973 | + } |
|
| 4974 | 4974 | } else {
|
| 4975 | 4975 | return geodir_imex_insert_term( $taxonomy, $term_data ); |
| 4976 | 4976 | } |
@@ -4992,47 +4992,47 @@ discard block |
||
| 4992 | 4992 | * @return int Posts count. |
| 4993 | 4993 | */ |
| 4994 | 4994 | function geodir_get_posts_count( $post_type ) {
|
| 4995 | - global $wpdb, $plugin_prefix; |
|
| 4995 | + global $wpdb, $plugin_prefix; |
|
| 4996 | 4996 | |
| 4997 | - if ( !post_type_exists( $post_type ) ) {
|
|
| 4998 | - return 0; |
|
| 4999 | - } |
|
| 4997 | + if ( !post_type_exists( $post_type ) ) {
|
|
| 4998 | + return 0; |
|
| 4999 | + } |
|
| 5000 | 5000 | |
| 5001 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5001 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5002 | 5002 | |
| 5003 | - // Skip listing with statuses trash, auto-draft etc... |
|
| 5004 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5005 | - $where_statuses = ''; |
|
| 5006 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5007 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5008 | - } |
|
| 5003 | + // Skip listing with statuses trash, auto-draft etc... |
|
| 5004 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5005 | + $where_statuses = ''; |
|
| 5006 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5007 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5008 | + } |
|
| 5009 | 5009 | |
| 5010 | - /** |
|
| 5011 | - * Filter the SQL where clause part to filter posts count in import/export. |
|
| 5012 | - * |
|
| 5013 | - * @since 1.6.4 |
|
| 5014 | - * @package GeoDirectory |
|
| 5015 | - * |
|
| 5016 | - * @param string $where SQL where clause part. |
|
| 5017 | - */ |
|
| 5018 | - $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type ); |
|
| 5019 | - |
|
| 5020 | - $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 );
|
|
| 5021 | - |
|
| 5022 | - $posts_count = (int)$wpdb->get_var( $query ); |
|
| 5010 | + /** |
|
| 5011 | + * Filter the SQL where clause part to filter posts count in import/export. |
|
| 5012 | + * |
|
| 5013 | + * @since 1.6.4 |
|
| 5014 | + * @package GeoDirectory |
|
| 5015 | + * |
|
| 5016 | + * @param string $where SQL where clause part. |
|
| 5017 | + */ |
|
| 5018 | + $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type ); |
|
| 5019 | + |
|
| 5020 | + $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 );
|
|
| 5021 | + |
|
| 5022 | + $posts_count = (int)$wpdb->get_var( $query ); |
|
| 5023 | 5023 | |
| 5024 | - /** |
|
| 5025 | - * Modify returned post counts for the current post type. |
|
| 5026 | - * |
|
| 5027 | - * @since 1.4.6 |
|
| 5028 | - * @package GeoDirectory |
|
| 5029 | - * |
|
| 5030 | - * @param int $posts_count Post counts. |
|
| 5031 | - * @param string $post_type Post type. |
|
| 5032 | - */ |
|
| 5033 | - $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type ); |
|
| 5034 | - |
|
| 5035 | - return $posts_count; |
|
| 5024 | + /** |
|
| 5025 | + * Modify returned post counts for the current post type. |
|
| 5026 | + * |
|
| 5027 | + * @since 1.4.6 |
|
| 5028 | + * @package GeoDirectory |
|
| 5029 | + * |
|
| 5030 | + * @param int $posts_count Post counts. |
|
| 5031 | + * @param string $post_type Post type. |
|
| 5032 | + */ |
|
| 5033 | + $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type ); |
|
| 5034 | + |
|
| 5035 | + return $posts_count; |
|
| 5036 | 5036 | } |
| 5037 | 5037 | |
| 5038 | 5038 | /** |
@@ -5061,10 +5061,10 @@ discard block |
||
| 5061 | 5061 | |
| 5062 | 5062 | if ( !empty( $posts ) ) {
|
| 5063 | 5063 | $is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' ); |
| 5064 | - $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
|
| 5065 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 5066 | - $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;
|
|
| 5067 | - $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 5064 | + $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
|
| 5065 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 5066 | + $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;
|
|
| 5067 | + $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 5068 | 5068 | |
| 5069 | 5069 | $csv_row = array(); |
| 5070 | 5070 | $csv_row[] = 'post_id'; |
@@ -5096,7 +5096,7 @@ discard block |
||
| 5096 | 5096 | } |
| 5097 | 5097 | $csv_row[] = 'post_status'; |
| 5098 | 5098 | $csv_row[] = 'is_featured'; |
| 5099 | - // Export claim listing field |
|
| 5099 | + // Export claim listing field |
|
| 5100 | 5100 | if ($is_claim_active) {
|
| 5101 | 5101 | $csv_row[] = 'claimed'; |
| 5102 | 5102 | } |
@@ -5105,7 +5105,7 @@ discard block |
||
| 5105 | 5105 | $csv_row[] = 'alive_days'; |
| 5106 | 5106 | $csv_row[] = 'expire_date'; |
| 5107 | 5107 | } |
| 5108 | - $csv_row[] = 'post_date'; |
|
| 5108 | + $csv_row[] = 'post_date'; |
|
| 5109 | 5109 | $csv_row[] = 'post_address'; |
| 5110 | 5110 | $csv_row[] = 'post_city'; |
| 5111 | 5111 | $csv_row[] = 'post_region'; |
@@ -5113,11 +5113,11 @@ discard block |
||
| 5113 | 5113 | $csv_row[] = 'post_zip'; |
| 5114 | 5114 | $csv_row[] = 'post_latitude'; |
| 5115 | 5115 | $csv_row[] = 'post_longitude'; |
| 5116 | - if ($neighbourhood_active) {
|
|
| 5117 | - $csv_row[] = 'post_neighbourhood'; |
|
| 5118 | - $csv_row[] = 'neighbourhood_latitude'; |
|
| 5119 | - $csv_row[] = 'neighbourhood_longitude'; |
|
| 5120 | - } |
|
| 5116 | + if ($neighbourhood_active) {
|
|
| 5117 | + $csv_row[] = 'post_neighbourhood'; |
|
| 5118 | + $csv_row[] = 'neighbourhood_latitude'; |
|
| 5119 | + $csv_row[] = 'neighbourhood_longitude'; |
|
| 5120 | + } |
|
| 5121 | 5121 | $csv_row[] = 'geodir_timing'; |
| 5122 | 5122 | $csv_row[] = 'geodir_contact'; |
| 5123 | 5123 | $csv_row[] = 'geodir_email'; |
@@ -5149,21 +5149,21 @@ discard block |
||
| 5149 | 5149 | $csv_row[] = 'franchise'; |
| 5150 | 5150 | } |
| 5151 | 5151 | |
| 5152 | - /** |
|
| 5153 | - * Filter columns field names of gd export listings csv. |
|
| 5154 | - * |
|
| 5155 | - * @since 1.6.5 |
|
| 5156 | - * @package GeoDirectory |
|
| 5157 | - * |
|
| 5158 | - * @param array $csv_row Column names being exported in csv. |
|
| 5159 | - * @param string $post_type The post type. |
|
| 5160 | - */ |
|
| 5161 | - $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);
|
|
| 5152 | + /** |
|
| 5153 | + * Filter columns field names of gd export listings csv. |
|
| 5154 | + * |
|
| 5155 | + * @since 1.6.5 |
|
| 5156 | + * @package GeoDirectory |
|
| 5157 | + * |
|
| 5158 | + * @param array $csv_row Column names being exported in csv. |
|
| 5159 | + * @param string $post_type The post type. |
|
| 5160 | + */ |
|
| 5161 | + $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);
|
|
| 5162 | 5162 | |
| 5163 | 5163 | $csv_rows[] = $csv_row; |
| 5164 | 5164 | |
| 5165 | 5165 | $images_count = 5; |
| 5166 | - $xx=0; |
|
| 5166 | + $xx=0; |
|
| 5167 | 5167 | foreach ( $posts as $post ) {$xx++;
|
| 5168 | 5168 | $post_id = $post['ID']; |
| 5169 | 5169 | |
@@ -5294,15 +5294,15 @@ discard block |
||
| 5294 | 5294 | } |
| 5295 | 5295 | $csv_row[] = $post_info['post_status']; // post_status |
| 5296 | 5296 | $csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured |
| 5297 | - if ($is_claim_active) {
|
|
| 5298 | - $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5299 | - } |
|
| 5297 | + if ($is_claim_active) {
|
|
| 5298 | + $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5299 | + } |
|
| 5300 | 5300 | if ($is_payment_plugin) {
|
| 5301 | 5301 | $csv_row[] = (int)$post_info['package_id']; // package_id |
| 5302 | 5302 | $csv_row[] = $post_info['alive_days'] !== '' ? absint($post_info['alive_days']) : ''; // alive_days |
| 5303 | 5303 | $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
|
| 5304 | 5304 | } |
| 5305 | - $csv_row[] = $post_info['post_date']; // post_date |
|
| 5305 | + $csv_row[] = $post_info['post_date']; // post_date |
|
| 5306 | 5306 | $csv_row[] = stripslashes($post_info['post_address']); // post_address |
| 5307 | 5307 | $csv_row[] = stripslashes($post_info['post_city']); // post_city |
| 5308 | 5308 | $csv_row[] = stripslashes($post_info['post_region']); // post_region |
@@ -5310,21 +5310,21 @@ discard block |
||
| 5310 | 5310 | $csv_row[] = stripslashes($post_info['post_zip']); // post_zip |
| 5311 | 5311 | $csv_row[] = $post_info['post_latitude']; // post_latitude |
| 5312 | 5312 | $csv_row[] = $post_info['post_longitude']; // post_longitude |
| 5313 | - if ($neighbourhood_active) {
|
|
| 5314 | - $post_neighbourhood = ''; |
|
| 5315 | - $neighbourhood_latitude = ''; |
|
| 5316 | - $neighbourhood_longitude = ''; |
|
| 5317 | - if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {
|
|
| 5318 | - if (!empty($hood_info)) {
|
|
| 5319 | - $post_neighbourhood = $hood_info->hood_name; |
|
| 5320 | - $neighbourhood_latitude = $hood_info->hood_latitude; |
|
| 5321 | - $neighbourhood_longitude = $hood_info->hood_longitude; |
|
| 5322 | - } |
|
| 5323 | - } |
|
| 5324 | - $csv_row[] = stripslashes($post_neighbourhood); // post_neighbourhood |
|
| 5325 | - $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude |
|
| 5326 | - $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude |
|
| 5327 | - } |
|
| 5313 | + if ($neighbourhood_active) {
|
|
| 5314 | + $post_neighbourhood = ''; |
|
| 5315 | + $neighbourhood_latitude = ''; |
|
| 5316 | + $neighbourhood_longitude = ''; |
|
| 5317 | + if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {
|
|
| 5318 | + if (!empty($hood_info)) {
|
|
| 5319 | + $post_neighbourhood = $hood_info->hood_name; |
|
| 5320 | + $neighbourhood_latitude = $hood_info->hood_latitude; |
|
| 5321 | + $neighbourhood_longitude = $hood_info->hood_longitude; |
|
| 5322 | + } |
|
| 5323 | + } |
|
| 5324 | + $csv_row[] = stripslashes($post_neighbourhood); // post_neighbourhood |
|
| 5325 | + $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude |
|
| 5326 | + $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude |
|
| 5327 | + } |
|
| 5328 | 5328 | $csv_row[] = stripslashes($post_info['geodir_timing']); // geodir_timing |
| 5329 | 5329 | $csv_row[] = stripslashes($post_info['geodir_contact']); // geodir_contact |
| 5330 | 5330 | $csv_row[] = stripslashes($post_info['geodir_email']); // geodir_email |
@@ -5364,16 +5364,16 @@ discard block |
||
| 5364 | 5364 | $csv_row[] = (int)$franchise; // franchise id |
| 5365 | 5365 | } |
| 5366 | 5366 | |
| 5367 | - /** |
|
| 5368 | - * Filter columns values of gd export listings csv file |
|
| 5369 | - * |
|
| 5370 | - * @since 1.6.5 |
|
| 5371 | - * @package GeoDirectory |
|
| 5372 | - * |
|
| 5373 | - * @param array $csv_row Field values being exported in csv. |
|
| 5374 | - * @param array $post_info The post info. |
|
| 5375 | - */ |
|
| 5376 | - $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
|
|
| 5367 | + /** |
|
| 5368 | + * Filter columns values of gd export listings csv file |
|
| 5369 | + * |
|
| 5370 | + * @since 1.6.5 |
|
| 5371 | + * @package GeoDirectory |
|
| 5372 | + * |
|
| 5373 | + * @param array $csv_row Field values being exported in csv. |
|
| 5374 | + * @param array $post_info The post info. |
|
| 5375 | + */ |
|
| 5376 | + $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
|
|
| 5377 | 5377 | |
| 5378 | 5378 | for ( $c = 0; $c < $images_count; $c++ ) {
|
| 5379 | 5379 | $csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE |
@@ -5406,64 +5406,64 @@ discard block |
||
| 5406 | 5406 | * @return array Array of posts data. |
| 5407 | 5407 | */ |
| 5408 | 5408 | function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {
|
| 5409 | - global $wpdb, $plugin_prefix; |
|
| 5409 | + global $wpdb, $plugin_prefix; |
|
| 5410 | 5410 | |
| 5411 | - if ( ! post_type_exists( $post_type ) ) |
|
| 5412 | - return new stdClass; |
|
| 5411 | + if ( ! post_type_exists( $post_type ) ) |
|
| 5412 | + return new stdClass; |
|
| 5413 | 5413 | |
| 5414 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5414 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5415 | 5415 | |
| 5416 | - $limit = ''; |
|
| 5417 | - if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5418 | - $offset = ( $page_no - 1 ) * $per_page; |
|
| 5416 | + $limit = ''; |
|
| 5417 | + if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5418 | + $offset = ( $page_no - 1 ) * $per_page; |
|
| 5419 | 5419 | |
| 5420 | - if ( $offset > 0 ) {
|
|
| 5421 | - $limit = " LIMIT " . $offset . "," . $per_page; |
|
| 5422 | - } else {
|
|
| 5423 | - $limit = " LIMIT " . $per_page; |
|
| 5424 | - } |
|
| 5425 | - } |
|
| 5420 | + if ( $offset > 0 ) {
|
|
| 5421 | + $limit = " LIMIT " . $offset . "," . $per_page; |
|
| 5422 | + } else {
|
|
| 5423 | + $limit = " LIMIT " . $per_page; |
|
| 5424 | + } |
|
| 5425 | + } |
|
| 5426 | 5426 | |
| 5427 | - // Skip listing with statuses trash, auto-draft etc... |
|
| 5428 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5429 | - $where_statuses = ''; |
|
| 5430 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5431 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5432 | - } |
|
| 5427 | + // Skip listing with statuses trash, auto-draft etc... |
|
| 5428 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5429 | + $where_statuses = ''; |
|
| 5430 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5431 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5432 | + } |
|
| 5433 | 5433 | |
| 5434 | - /** |
|
| 5435 | - * Filter the SQL where clause part to filter posts in import/export. |
|
| 5436 | - * |
|
| 5437 | - * @since 1.6.4 |
|
| 5438 | - * @package GeoDirectory |
|
| 5439 | - * |
|
| 5440 | - * @param string $where SQL where clause part. |
|
| 5441 | - */ |
|
| 5442 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5443 | - |
|
| 5444 | - $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 );
|
|
| 5445 | - /** |
|
| 5446 | - * Modify returned posts SQL query for the current post type. |
|
| 5447 | - * |
|
| 5448 | - * @since 1.4.6 |
|
| 5449 | - * @package GeoDirectory |
|
| 5450 | - * |
|
| 5451 | - * @param int $query The SQL query. |
|
| 5452 | - * @param string $post_type Post type. |
|
| 5453 | - */ |
|
| 5454 | - $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type ); |
|
| 5455 | - $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A ); |
|
| 5456 | - |
|
| 5457 | - /** |
|
| 5458 | - * Modify returned post results for the current post type. |
|
| 5459 | - * |
|
| 5460 | - * @since 1.4.6 |
|
| 5461 | - * @package GeoDirectory |
|
| 5462 | - * |
|
| 5463 | - * @param object $results An object containing all post ids. |
|
| 5464 | - * @param string $post_type Post type. |
|
| 5465 | - */ |
|
| 5466 | - return apply_filters( 'geodir_export_posts', $results, $post_type ); |
|
| 5434 | + /** |
|
| 5435 | + * Filter the SQL where clause part to filter posts in import/export. |
|
| 5436 | + * |
|
| 5437 | + * @since 1.6.4 |
|
| 5438 | + * @package GeoDirectory |
|
| 5439 | + * |
|
| 5440 | + * @param string $where SQL where clause part. |
|
| 5441 | + */ |
|
| 5442 | + $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5443 | + |
|
| 5444 | + $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 );
|
|
| 5445 | + /** |
|
| 5446 | + * Modify returned posts SQL query for the current post type. |
|
| 5447 | + * |
|
| 5448 | + * @since 1.4.6 |
|
| 5449 | + * @package GeoDirectory |
|
| 5450 | + * |
|
| 5451 | + * @param int $query The SQL query. |
|
| 5452 | + * @param string $post_type Post type. |
|
| 5453 | + */ |
|
| 5454 | + $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type ); |
|
| 5455 | + $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A ); |
|
| 5456 | + |
|
| 5457 | + /** |
|
| 5458 | + * Modify returned post results for the current post type. |
|
| 5459 | + * |
|
| 5460 | + * @since 1.4.6 |
|
| 5461 | + * @package GeoDirectory |
|
| 5462 | + * |
|
| 5463 | + * @param object $results An object containing all post ids. |
|
| 5464 | + * @param string $post_type Post type. |
|
| 5465 | + */ |
|
| 5466 | + return apply_filters( 'geodir_export_posts', $results, $post_type ); |
|
| 5467 | 5467 | } |
| 5468 | 5468 | |
| 5469 | 5469 | /** |
@@ -5482,26 +5482,26 @@ discard block |
||
| 5482 | 5482 | * @return string The SQL query. |
| 5483 | 5483 | */ |
| 5484 | 5484 | function geodir_imex_get_events_query( $query, $post_type ) {
|
| 5485 | - if ( $post_type == 'gd_event' ) {
|
|
| 5486 | - global $wpdb, $plugin_prefix; |
|
| 5485 | + if ( $post_type == 'gd_event' ) {
|
|
| 5486 | + global $wpdb, $plugin_prefix; |
|
| 5487 | 5487 | |
| 5488 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5489 | - $schedule_table = EVENT_SCHEDULE; |
|
| 5488 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5489 | + $schedule_table = EVENT_SCHEDULE; |
|
| 5490 | 5490 | |
| 5491 | - // Skip listing with statuses trash, auto-draft etc... |
|
| 5492 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5493 | - $where_statuses = ''; |
|
| 5494 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5495 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5496 | - } |
|
| 5491 | + // Skip listing with statuses trash, auto-draft etc... |
|
| 5492 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5493 | + $where_statuses = ''; |
|
| 5494 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5495 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5496 | + } |
|
| 5497 | 5497 | |
| 5498 | - /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */ |
|
| 5499 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5498 | + /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */ |
|
| 5499 | + $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5500 | 5500 | |
| 5501 | - $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 );
|
|
| 5502 | - } |
|
| 5501 | + $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 );
|
|
| 5502 | + } |
|
| 5503 | 5503 | |
| 5504 | - return $query; |
|
| 5504 | + return $query; |
|
| 5505 | 5505 | } |
| 5506 | 5506 | |
| 5507 | 5507 | /** |
@@ -5523,36 +5523,36 @@ discard block |
||
| 5523 | 5523 | * @return int Total terms count. |
| 5524 | 5524 | */ |
| 5525 | 5525 | function geodir_get_terms_count( $post_type ) {
|
| 5526 | - $args = array( 'hide_empty' => 0 ); |
|
| 5526 | + $args = array( 'hide_empty' => 0 ); |
|
| 5527 | 5527 | |
| 5528 | - remove_all_filters( 'get_terms' ); |
|
| 5528 | + remove_all_filters( 'get_terms' ); |
|
| 5529 | 5529 | |
| 5530 | - $taxonomy = $post_type . 'category'; |
|
| 5530 | + $taxonomy = $post_type . 'category'; |
|
| 5531 | 5531 | |
| 5532 | - // WPML |
|
| 5533 | - $is_wpml = geodir_is_wpml(); |
|
| 5534 | - $active_lang = 'all'; |
|
| 5535 | - if ( $is_wpml ) {
|
|
| 5536 | - global $sitepress; |
|
| 5537 | - $active_lang = $sitepress->get_current_language(); |
|
| 5532 | + // WPML |
|
| 5533 | + $is_wpml = geodir_is_wpml(); |
|
| 5534 | + $active_lang = 'all'; |
|
| 5535 | + if ( $is_wpml ) {
|
|
| 5536 | + global $sitepress; |
|
| 5537 | + $active_lang = $sitepress->get_current_language(); |
|
| 5538 | 5538 | |
| 5539 | - if ( $active_lang != 'all' ) {
|
|
| 5540 | - $sitepress->switch_lang( 'all', true ); |
|
| 5541 | - } |
|
| 5542 | - } |
|
| 5543 | - // WPML |
|
| 5539 | + if ( $active_lang != 'all' ) {
|
|
| 5540 | + $sitepress->switch_lang( 'all', true ); |
|
| 5541 | + } |
|
| 5542 | + } |
|
| 5543 | + // WPML |
|
| 5544 | 5544 | |
| 5545 | - $count_terms = wp_count_terms( $taxonomy, $args ); |
|
| 5545 | + $count_terms = wp_count_terms( $taxonomy, $args ); |
|
| 5546 | 5546 | |
| 5547 | - // WPML |
|
| 5548 | - if ( $is_wpml && $active_lang !== 'all' ) {
|
|
| 5549 | - global $sitepress; |
|
| 5550 | - $sitepress->switch_lang( $active_lang, true ); |
|
| 5551 | - } |
|
| 5552 | - // WPML |
|
| 5553 | - $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0; |
|
| 5547 | + // WPML |
|
| 5548 | + if ( $is_wpml && $active_lang !== 'all' ) {
|
|
| 5549 | + global $sitepress; |
|
| 5550 | + $sitepress->switch_lang( $active_lang, true ); |
|
| 5551 | + } |
|
| 5552 | + // WPML |
|
| 5553 | + $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0; |
|
| 5554 | 5554 | |
| 5555 | - return $count_terms; |
|
| 5555 | + return $count_terms; |
|
| 5556 | 5556 | } |
| 5557 | 5557 | |
| 5558 | 5558 | /** |
@@ -5591,11 +5591,11 @@ discard block |
||
| 5591 | 5591 | $csv_row[] = 'cat_posttype'; |
| 5592 | 5592 | $csv_row[] = 'cat_parent'; |
| 5593 | 5593 | $csv_row[] = 'cat_schema'; |
| 5594 | - // WPML |
|
| 5594 | + // WPML |
|
| 5595 | 5595 | $is_wpml = geodir_is_wpml(); |
| 5596 | 5596 | if ($is_wpml) {
|
| 5597 | 5597 | $csv_row[] = 'cat_language'; |
| 5598 | - $csv_row[] = 'cat_id_original'; |
|
| 5598 | + $csv_row[] = 'cat_id_original'; |
|
| 5599 | 5599 | } |
| 5600 | 5600 | // WPML |
| 5601 | 5601 | $csv_row[] = 'cat_description'; |
@@ -5625,10 +5625,10 @@ discard block |
||
| 5625 | 5625 | $csv_row[] = $post_type; |
| 5626 | 5626 | $csv_row[] = $cat_parent; |
| 5627 | 5627 | $csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type ); |
| 5628 | - // WPML |
|
| 5628 | + // WPML |
|
| 5629 | 5629 | if ($is_wpml) {
|
| 5630 | 5630 | $csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy ); |
| 5631 | - $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5631 | + $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5632 | 5632 | } |
| 5633 | 5633 | // WPML |
| 5634 | 5634 | $csv_row[] = $term->description; |
@@ -6046,43 +6046,43 @@ discard block |
||
| 6046 | 6046 | * @param string $status Post status. |
| 6047 | 6047 | */ |
| 6048 | 6048 | function geodir_create_page($slug, $option, $page_title = '', $page_content = '', $post_parent = 0, $status = 'publish') {
|
| 6049 | - global $wpdb, $current_user; |
|
| 6050 | - |
|
| 6051 | - $option_value = get_option($option); |
|
| 6052 | - |
|
| 6053 | - if ($option_value > 0) : |
|
| 6054 | - if (get_post($option_value)) : |
|
| 6055 | - // Page exists |
|
| 6056 | - return; |
|
| 6057 | - endif; |
|
| 6058 | - endif; |
|
| 6059 | - |
|
| 6060 | - $page_found = $wpdb->get_var( |
|
| 6061 | - $wpdb->prepare( |
|
| 6062 | - "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 6063 | - array($slug) |
|
| 6064 | - ) |
|
| 6065 | - ); |
|
| 6066 | - |
|
| 6067 | - if ($page_found) : |
|
| 6068 | - // Page exists |
|
| 6069 | - if (!$option_value) update_option($option, $page_found); |
|
| 6070 | - return; |
|
| 6071 | - endif; |
|
| 6072 | - |
|
| 6073 | - $page_data = array( |
|
| 6074 | - 'post_status' => $status, |
|
| 6075 | - 'post_type' => 'page', |
|
| 6076 | - 'post_author' => $current_user->ID, |
|
| 6077 | - 'post_name' => $slug, |
|
| 6078 | - 'post_title' => $page_title, |
|
| 6079 | - 'post_content' => $page_content, |
|
| 6080 | - 'post_parent' => $post_parent, |
|
| 6081 | - 'comment_status' => 'closed' |
|
| 6082 | - ); |
|
| 6083 | - $page_id = wp_insert_post($page_data); |
|
| 6084 | - |
|
| 6085 | - add_option($option, $page_id); |
|
| 6049 | + global $wpdb, $current_user; |
|
| 6050 | + |
|
| 6051 | + $option_value = get_option($option); |
|
| 6052 | + |
|
| 6053 | + if ($option_value > 0) : |
|
| 6054 | + if (get_post($option_value)) : |
|
| 6055 | + // Page exists |
|
| 6056 | + return; |
|
| 6057 | + endif; |
|
| 6058 | + endif; |
|
| 6059 | + |
|
| 6060 | + $page_found = $wpdb->get_var( |
|
| 6061 | + $wpdb->prepare( |
|
| 6062 | + "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 6063 | + array($slug) |
|
| 6064 | + ) |
|
| 6065 | + ); |
|
| 6066 | + |
|
| 6067 | + if ($page_found) : |
|
| 6068 | + // Page exists |
|
| 6069 | + if (!$option_value) update_option($option, $page_found); |
|
| 6070 | + return; |
|
| 6071 | + endif; |
|
| 6072 | + |
|
| 6073 | + $page_data = array( |
|
| 6074 | + 'post_status' => $status, |
|
| 6075 | + 'post_type' => 'page', |
|
| 6076 | + 'post_author' => $current_user->ID, |
|
| 6077 | + 'post_name' => $slug, |
|
| 6078 | + 'post_title' => $page_title, |
|
| 6079 | + 'post_content' => $page_content, |
|
| 6080 | + 'post_parent' => $post_parent, |
|
| 6081 | + 'comment_status' => 'closed' |
|
| 6082 | + ); |
|
| 6083 | + $page_id = wp_insert_post($page_data); |
|
| 6084 | + |
|
| 6085 | + add_option($option, $page_id); |
|
| 6086 | 6086 | |
| 6087 | 6087 | } |
| 6088 | 6088 | |
@@ -6113,9 +6113,9 @@ discard block |
||
| 6113 | 6113 | * @package GeoDirectory |
| 6114 | 6114 | */ |
| 6115 | 6115 | function geodir_admin_upgrade_notice() {
|
| 6116 | - $class = "error"; |
|
| 6117 | - $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
|
|
| 6118 | - echo"<div class=\"$class\"> <p>$message</p></div>"; |
|
| 6116 | + $class = "error"; |
|
| 6117 | + $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
|
|
| 6118 | + echo"<div class=\"$class\"> <p>$message</p></div>"; |
|
| 6119 | 6119 | } |
| 6120 | 6120 | |
| 6121 | 6121 | /** |
@@ -6128,18 +6128,18 @@ discard block |
||
| 6128 | 6128 | */ |
| 6129 | 6129 | function geodire_admin_upgrade_notice( $plugin_data, $r ) |
| 6130 | 6130 | {
|
| 6131 | - // readme contents |
|
| 6132 | - $args = array( |
|
| 6133 | - 'timeout' => 15, |
|
| 6134 | - 'redirection' => 5 |
|
| 6135 | - ); |
|
| 6136 | - $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt"; |
|
| 6137 | - $data = wp_remote_get( $url, $args ); |
|
| 6131 | + // readme contents |
|
| 6132 | + $args = array( |
|
| 6133 | + 'timeout' => 15, |
|
| 6134 | + 'redirection' => 5 |
|
| 6135 | + ); |
|
| 6136 | + $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt"; |
|
| 6137 | + $data = wp_remote_get( $url, $args ); |
|
| 6138 | 6138 | |
| 6139 | - if (!is_wp_error($data) && $data['response']['code'] == 200) {
|
|
| 6139 | + if (!is_wp_error($data) && $data['response']['code'] == 200) {
|
|
| 6140 | 6140 | |
| 6141 | - geodir_in_plugin_update_message($data['body']); |
|
| 6142 | - } |
|
| 6141 | + geodir_in_plugin_update_message($data['body']); |
|
| 6142 | + } |
|
| 6143 | 6143 | } |
| 6144 | 6144 | |
| 6145 | 6145 | |
@@ -6147,28 +6147,28 @@ discard block |
||
| 6147 | 6147 | * @param string $content http response body |
| 6148 | 6148 | */ |
| 6149 | 6149 | function geodir_in_plugin_update_message($content) {
|
| 6150 | - // Output Upgrade Notice |
|
| 6151 | - $matches = null; |
|
| 6152 | - $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis'; |
|
| 6153 | - $upgrade_notice = ''; |
|
| 6154 | - if ( preg_match( $regexp, $content, $matches ) ) {
|
|
| 6155 | - if(empty($matches)){return;}
|
|
| 6156 | - |
|
| 6157 | - $version = trim( $matches[1] ); |
|
| 6158 | - if($version && $version>GEODIRECTORY_VERSION){
|
|
| 6159 | - |
|
| 6160 | - |
|
| 6161 | - $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
|
|
| 6162 | - if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
|
|
| 6163 | - $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">'; |
|
| 6164 | - foreach ( $notices as $index => $line ) {
|
|
| 6165 | - $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
|
|
| 6166 | - } |
|
| 6167 | - $upgrade_notice .= '</div> '; |
|
| 6168 | - } |
|
| 6169 | - } |
|
| 6170 | - } |
|
| 6171 | - echo $upgrade_notice; |
|
| 6150 | + // Output Upgrade Notice |
|
| 6151 | + $matches = null; |
|
| 6152 | + $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis'; |
|
| 6153 | + $upgrade_notice = ''; |
|
| 6154 | + if ( preg_match( $regexp, $content, $matches ) ) {
|
|
| 6155 | + if(empty($matches)){return;}
|
|
| 6156 | + |
|
| 6157 | + $version = trim( $matches[1] ); |
|
| 6158 | + if($version && $version>GEODIRECTORY_VERSION){
|
|
| 6159 | + |
|
| 6160 | + |
|
| 6161 | + $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
|
|
| 6162 | + if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
|
|
| 6163 | + $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">'; |
|
| 6164 | + foreach ( $notices as $index => $line ) {
|
|
| 6165 | + $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
|
|
| 6166 | + } |
|
| 6167 | + $upgrade_notice .= '</div> '; |
|
| 6168 | + } |
|
| 6169 | + } |
|
| 6170 | + } |
|
| 6171 | + echo $upgrade_notice; |
|
| 6172 | 6172 | } |
| 6173 | 6173 | |
| 6174 | 6174 | /** |
@@ -6201,19 +6201,19 @@ discard block |
||
| 6201 | 6201 | * @param array Listing statuses to be skipped. |
| 6202 | 6202 | */ |
| 6203 | 6203 | function geodir_imex_export_skip_statuses() {
|
| 6204 | - $statuses = array( 'trash', 'auto-draft' ); |
|
| 6204 | + $statuses = array( 'trash', 'auto-draft' ); |
|
| 6205 | 6205 | |
| 6206 | - /** |
|
| 6207 | - * Filter the statuses to skip during GD export listings. |
|
| 6208 | - * |
|
| 6209 | - * @since 1.6.0 |
|
| 6210 | - * @package GeoDirectory |
|
| 6211 | - * |
|
| 6212 | - * @param array $statuses Listing statuses to be skipped. |
|
| 6213 | - */ |
|
| 6214 | - $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses ); |
|
| 6206 | + /** |
|
| 6207 | + * Filter the statuses to skip during GD export listings. |
|
| 6208 | + * |
|
| 6209 | + * @since 1.6.0 |
|
| 6210 | + * @package GeoDirectory |
|
| 6211 | + * |
|
| 6212 | + * @param array $statuses Listing statuses to be skipped. |
|
| 6213 | + */ |
|
| 6214 | + $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses ); |
|
| 6215 | 6215 | |
| 6216 | - return $statuses; |
|
| 6216 | + return $statuses; |
|
| 6217 | 6217 | } |
| 6218 | 6218 | |
| 6219 | 6219 | /** |
@@ -6228,24 +6228,24 @@ discard block |
||
| 6228 | 6228 | * @global string $typenow Current post type. |
| 6229 | 6229 | */ |
| 6230 | 6230 | function geodir_admin_dequeue_scripts() {
|
| 6231 | - global $typenow; |
|
| 6231 | + global $typenow; |
|
| 6232 | 6232 | |
| 6233 | - // EDD |
|
| 6234 | - if (wp_script_is('jquery-chosen', 'enqueued')) {
|
|
| 6235 | - wp_dequeue_script('jquery-chosen');
|
|
| 6236 | - } |
|
| 6233 | + // EDD |
|
| 6234 | + if (wp_script_is('jquery-chosen', 'enqueued')) {
|
|
| 6235 | + wp_dequeue_script('jquery-chosen');
|
|
| 6236 | + } |
|
| 6237 | 6237 | |
| 6238 | - // Ultimate Addons for Visual Composer |
|
| 6239 | - if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {
|
|
| 6240 | - wp_dequeue_script('ultimate-vc-backend-script');
|
|
| 6241 | - } |
|
| 6238 | + // Ultimate Addons for Visual Composer |
|
| 6239 | + if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {
|
|
| 6240 | + wp_dequeue_script('ultimate-vc-backend-script');
|
|
| 6241 | + } |
|
| 6242 | 6242 | |
| 6243 | - // Fix conflict Fusion Builder jquery chosen with GD jquery chosen. |
|
| 6244 | - if (class_exists('FusionBuilder')) {
|
|
| 6245 | - if (wp_script_is('fusion_builder_chosen_js', 'enqueued') && $typenow && in_array($typenow, geodir_get_posttypes())) {
|
|
| 6246 | - wp_dequeue_script('fusion_builder_chosen_js');
|
|
| 6247 | - } |
|
| 6248 | - } |
|
| 6243 | + // Fix conflict Fusion Builder jquery chosen with GD jquery chosen. |
|
| 6244 | + if (class_exists('FusionBuilder')) {
|
|
| 6245 | + if (wp_script_is('fusion_builder_chosen_js', 'enqueued') && $typenow && in_array($typenow, geodir_get_posttypes())) {
|
|
| 6246 | + wp_dequeue_script('fusion_builder_chosen_js');
|
|
| 6247 | + } |
|
| 6248 | + } |
|
| 6249 | 6249 | } |
| 6250 | 6250 | |
| 6251 | 6251 | /** |
@@ -6261,48 +6261,48 @@ discard block |
||
| 6261 | 6261 | * @return string SQL where clause part. |
| 6262 | 6262 | */ |
| 6263 | 6263 | function geodir_imex_get_filter_where($where = '', $post_type = '') {
|
| 6264 | - global $wpdb; |
|
| 6264 | + global $wpdb; |
|
| 6265 | 6265 | |
| 6266 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6266 | + $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6267 | 6267 | |
| 6268 | - if ( !empty( $filters ) ) {
|
|
| 6269 | - foreach ( $filters as $field => $value ) {
|
|
| 6270 | - switch ($field) {
|
|
| 6271 | - case 'start_date': |
|
| 6272 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'"; |
|
| 6273 | - break; |
|
| 6274 | - case 'end_date': |
|
| 6275 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'"; |
|
| 6276 | - break; |
|
| 6277 | - } |
|
| 6278 | - } |
|
| 6279 | - } |
|
| 6268 | + if ( !empty( $filters ) ) {
|
|
| 6269 | + foreach ( $filters as $field => $value ) {
|
|
| 6270 | + switch ($field) {
|
|
| 6271 | + case 'start_date': |
|
| 6272 | + $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'"; |
|
| 6273 | + break; |
|
| 6274 | + case 'end_date': |
|
| 6275 | + $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'"; |
|
| 6276 | + break; |
|
| 6277 | + } |
|
| 6278 | + } |
|
| 6279 | + } |
|
| 6280 | 6280 | |
| 6281 | - return $where; |
|
| 6281 | + return $where; |
|
| 6282 | 6282 | } |
| 6283 | 6283 | add_filter('geodir_get_posts_count', 'geodir_imex_get_filter_where', 10, 2);
|
| 6284 | 6284 | add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);
|
| 6285 | 6285 | |
| 6286 | 6286 | |
| 6287 | 6287 | function geodir_fix_for_primer_theme(){
|
| 6288 | - if(!defined( 'PRIMER_VERSION' )){return;}
|
|
| 6289 | - global $pagenow; |
|
| 6288 | + if(!defined( 'PRIMER_VERSION' )){return;}
|
|
| 6289 | + global $pagenow; |
|
| 6290 | 6290 | |
| 6291 | - if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){
|
|
| 6291 | + if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){
|
|
| 6292 | 6292 | |
| 6293 | - $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] ); |
|
| 6293 | + $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] ); |
|
| 6294 | 6294 | |
| 6295 | - $post_types = geodir_get_posttypes(); |
|
| 6296 | - if ($post_type && in_array($post_type, $post_types) ) {
|
|
| 6297 | - global $primer_customizer_layouts; |
|
| 6298 | - remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10); |
|
| 6299 | - } |
|
| 6300 | - } |
|
| 6295 | + $post_types = geodir_get_posttypes(); |
|
| 6296 | + if ($post_type && in_array($post_type, $post_types) ) {
|
|
| 6297 | + global $primer_customizer_layouts; |
|
| 6298 | + remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10); |
|
| 6299 | + } |
|
| 6300 | + } |
|
| 6301 | 6301 | |
| 6302 | 6302 | } |
| 6303 | 6303 | |
| 6304 | 6304 | if(is_admin()){
|
| 6305 | - add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
|
|
| 6305 | + add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
|
|
| 6306 | 6306 | } |
| 6307 | 6307 | |
| 6308 | 6308 | |
@@ -6435,94 +6435,94 @@ discard block |
||
| 6435 | 6435 | |
| 6436 | 6436 | function geodir_ga_activation_url() {
|
| 6437 | 6437 | |
| 6438 | - return add_query_arg( array( |
|
| 6439 | - 'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
|
|
| 6440 | - 'scope' => GEODIR_GA_SCOPE, |
|
| 6441 | - 'response_type' => 'code', |
|
| 6442 | - 'redirect_uri' => GEODIR_GA_REDIRECT, |
|
| 6443 | - 'client_id' => GEODIR_GA_CLIENTID, |
|
| 6444 | - ), 'https://accounts.google.com/o/oauth2/auth' ); |
|
| 6438 | + return add_query_arg( array( |
|
| 6439 | + 'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
|
|
| 6440 | + 'scope' => GEODIR_GA_SCOPE, |
|
| 6441 | + 'response_type' => 'code', |
|
| 6442 | + 'redirect_uri' => GEODIR_GA_REDIRECT, |
|
| 6443 | + 'client_id' => GEODIR_GA_CLIENTID, |
|
| 6444 | + ), 'https://accounts.google.com/o/oauth2/auth' ); |
|
| 6445 | 6445 | |
| 6446 | - return $url; |
|
| 6446 | + return $url; |
|
| 6447 | 6447 | } |
| 6448 | 6448 | |
| 6449 | 6449 | function geodir_gd_accounts(){
|
| 6450 | - $accounts = array(); |
|
| 6451 | - $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true ); |
|
| 6452 | - if($useAuth){
|
|
| 6453 | - try {
|
|
| 6454 | - $accounts = geodir_ga_get_analytics_accounts(); |
|
| 6455 | - } catch (Exception $e) {
|
|
| 6456 | - geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 6457 | - } |
|
| 6450 | + $accounts = array(); |
|
| 6451 | + $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true ); |
|
| 6452 | + if($useAuth){
|
|
| 6453 | + try {
|
|
| 6454 | + $accounts = geodir_ga_get_analytics_accounts(); |
|
| 6455 | + } catch (Exception $e) {
|
|
| 6456 | + geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 6457 | + } |
|
| 6458 | 6458 | |
| 6459 | - if(is_array($accounts)){
|
|
| 6460 | - $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
|
|
| 6461 | - }elseif(get_option('geodir_ga_account_id')){
|
|
| 6462 | - $accounts = array(); |
|
| 6463 | - $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6464 | - } |
|
| 6465 | - } |
|
| 6466 | - return $accounts; |
|
| 6459 | + if(is_array($accounts)){
|
|
| 6460 | + $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
|
|
| 6461 | + }elseif(get_option('geodir_ga_account_id')){
|
|
| 6462 | + $accounts = array(); |
|
| 6463 | + $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6464 | + } |
|
| 6465 | + } |
|
| 6466 | + return $accounts; |
|
| 6467 | 6467 | } |
| 6468 | 6468 | |
| 6469 | 6469 | function geodir_ga_get_analytics_accounts() |
| 6470 | 6470 | {
|
| 6471 | - global $gd_ga_errors; |
|
| 6472 | - $accounts = array(); |
|
| 6471 | + global $gd_ga_errors; |
|
| 6472 | + $accounts = array(); |
|
| 6473 | 6473 | |
| 6474 | - if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
|
|
| 6474 | + if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
|
|
| 6475 | 6475 | |
| 6476 | 6476 | |
| 6477 | - if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
|
|
| 6478 | - return get_option('geodir_gd_uids');
|
|
| 6479 | - } |
|
| 6477 | + if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
|
|
| 6478 | + return get_option('geodir_gd_uids');
|
|
| 6479 | + } |
|
| 6480 | 6480 | |
| 6481 | - # Create a new Gdata call |
|
| 6482 | - if ( trim(get_option('geodir_ga_auth_code')) != '' )
|
|
| 6483 | - $stats = new GDGoogleAnalyticsStats(); |
|
| 6484 | - else |
|
| 6485 | - return false; |
|
| 6481 | + # Create a new Gdata call |
|
| 6482 | + if ( trim(get_option('geodir_ga_auth_code')) != '' )
|
|
| 6483 | + $stats = new GDGoogleAnalyticsStats(); |
|
| 6484 | + else |
|
| 6485 | + return false; |
|
| 6486 | 6486 | |
| 6487 | - # Check if Google sucessfully logged in |
|
| 6488 | - if ( ! $stats->checkLogin() ) |
|
| 6489 | - return false; |
|
| 6487 | + # Check if Google sucessfully logged in |
|
| 6488 | + if ( ! $stats->checkLogin() ) |
|
| 6489 | + return false; |
|
| 6490 | 6490 | |
| 6491 | - # Get a list of accounts |
|
| 6492 | - try {
|
|
| 6493 | - $accounts = $stats->getAllProfiles(); |
|
| 6494 | - } catch (Exception $e) {
|
|
| 6495 | - $gd_ga_errors[] = $e->getMessage(); |
|
| 6496 | - return false; |
|
| 6497 | - } |
|
| 6491 | + # Get a list of accounts |
|
| 6492 | + try {
|
|
| 6493 | + $accounts = $stats->getAllProfiles(); |
|
| 6494 | + } catch (Exception $e) {
|
|
| 6495 | + $gd_ga_errors[] = $e->getMessage(); |
|
| 6496 | + return false; |
|
| 6497 | + } |
|
| 6498 | 6498 | |
| 6499 | 6499 | |
| 6500 | - natcasesort ($accounts); |
|
| 6500 | + natcasesort ($accounts); |
|
| 6501 | 6501 | |
| 6502 | - # Return the account array if there are accounts |
|
| 6503 | - if ( count($accounts) > 0 ){
|
|
| 6504 | - update_option('geodir_gd_uids',$accounts);
|
|
| 6505 | - return $accounts; |
|
| 6506 | - } |
|
| 6507 | - else |
|
| 6508 | - return false; |
|
| 6502 | + # Return the account array if there are accounts |
|
| 6503 | + if ( count($accounts) > 0 ){
|
|
| 6504 | + update_option('geodir_gd_uids',$accounts);
|
|
| 6505 | + return $accounts; |
|
| 6506 | + } |
|
| 6507 | + else |
|
| 6508 | + return false; |
|
| 6509 | 6509 | } |
| 6510 | 6510 | |
| 6511 | 6511 | add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' ); |
| 6512 | 6512 | function geodir_ga_deauthorize(){
|
| 6513 | 6513 | |
| 6514 | - if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
|
|
| 6514 | + if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
|
|
| 6515 | 6515 | |
| 6516 | - die( 'Security check' ); |
|
| 6516 | + die( 'Security check' ); |
|
| 6517 | 6517 | |
| 6518 | - } else {
|
|
| 6519 | - update_option('geodir_ga_auth_token','');
|
|
| 6520 | - update_option('geodir_ga_auth_code','');
|
|
| 6521 | - update_option('geodir_gd_uids','');
|
|
| 6518 | + } else {
|
|
| 6519 | + update_option('geodir_ga_auth_token','');
|
|
| 6520 | + update_option('geodir_ga_auth_code','');
|
|
| 6521 | + update_option('geodir_gd_uids','');
|
|
| 6522 | 6522 | |
| 6523 | 6523 | |
| 6524 | - echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
|
|
| 6525 | - } |
|
| 6524 | + echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
|
|
| 6525 | + } |
|
| 6526 | 6526 | |
| 6527 | - die(); |
|
| 6527 | + die(); |
|
| 6528 | 6528 | } |
| 6529 | 6529 | \ No newline at end of file |
@@ -31,14 +31,14 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | function geodir_comment_meta_row_action($a) |
| 33 | 33 | {
|
| 34 | - global $comment; |
|
| 35 | - |
|
| 36 | - $rating = geodir_get_commentoverall($comment->comment_ID); |
|
| 37 | - if ($rating != 0) {
|
|
| 38 | - //echo '<div class="gd_rating_show" data-average="'.$rating.'" data-id="'.$comment->comment_ID.'"></div>'; |
|
| 39 | - echo geodir_get_rating_stars($rating, $comment->comment_ID); |
|
| 40 | - } |
|
| 41 | - return $a; |
|
| 34 | + global $comment; |
|
| 35 | + |
|
| 36 | + $rating = geodir_get_commentoverall($comment->comment_ID); |
|
| 37 | + if ($rating != 0) {
|
|
| 38 | + //echo '<div class="gd_rating_show" data-average="'.$rating.'" data-id="'.$comment->comment_ID.'"></div>'; |
|
| 39 | + echo geodir_get_rating_stars($rating, $comment->comment_ID); |
|
| 40 | + } |
|
| 41 | + return $a; |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | add_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');
|
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | function geodir_comment_add_meta_box($comment) |
| 55 | 55 | {
|
| 56 | - add_meta_box('gd-comment-rating', __('Comment Rating', 'geodirectory'), 'geodir_comment_rating_meta', 'comment', 'normal', 'high');
|
|
| 56 | + add_meta_box('gd-comment-rating', __('Comment Rating', 'geodirectory'), 'geodir_comment_rating_meta', 'comment', 'normal', 'high');
|
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | /** |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | function geodir_comment_rating_meta($comment) |
| 69 | 69 | {
|
| 70 | - $post_type = get_post_type($comment->comment_post_ID); |
|
| 70 | + $post_type = get_post_type($comment->comment_post_ID); |
|
| 71 | 71 | if (in_array($post_type, (array)geodir_get_posttypes()) && (int)$comment->comment_parent == 0) {
|
| 72 | 72 | $rating = geodir_get_commentoverall($comment->comment_ID); |
| 73 | 73 | |
@@ -107,12 +107,12 @@ discard block |
||
| 107 | 107 | */ |
| 108 | 108 | function geodir_comment_rating_fields() |
| 109 | 109 | {
|
| 110 | - global $post; |
|
| 110 | + global $post; |
|
| 111 | 111 | |
| 112 | - $post_types = geodir_get_posttypes(); |
|
| 112 | + $post_types = geodir_get_posttypes(); |
|
| 113 | 113 | |
| 114 | - if (in_array($post->post_type, $post_types)) {
|
|
| 115 | - $star_texts = array(); |
|
| 114 | + if (in_array($post->post_type, $post_types)) {
|
|
| 115 | + $star_texts = array(); |
|
| 116 | 116 | $star_texts[] = __('Terrible', 'geodirectory');
|
| 117 | 117 | $star_texts[] = __('Poor', 'geodirectory');
|
| 118 | 118 | $star_texts[] = __('Average', 'geodirectory');
|
@@ -120,10 +120,10 @@ discard block |
||
| 120 | 120 | $star_texts[] = __('Excellent', 'geodirectory');
|
| 121 | 121 | |
| 122 | 122 | $gd_rating_html = apply_filters('gd_rating_form_html', '<div class="gd_rating" data-average="0" data-id="5"></div>', $star_texts);
|
| 123 | - echo $gd_rating_html; |
|
| 124 | - ?> |
|
| 123 | + echo $gd_rating_html; |
|
| 124 | + ?> |
|
| 125 | 125 | <input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="0"/><?php |
| 126 | - } |
|
| 126 | + } |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | |
@@ -139,9 +139,9 @@ discard block |
||
| 139 | 139 | function geodir_comment_replaylink($link) |
| 140 | 140 | {
|
| 141 | 141 | |
| 142 | - $link = '<div class="gd_comment_replaylink">' . $link . '</div>'; |
|
| 142 | + $link = '<div class="gd_comment_replaylink">' . $link . '</div>'; |
|
| 143 | 143 | |
| 144 | - return $link; |
|
| 144 | + return $link; |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | add_filter('cancel_comment_reply_link', 'geodir_cancle_replaylink');
|
@@ -156,9 +156,9 @@ discard block |
||
| 156 | 156 | function geodir_cancle_replaylink($link) |
| 157 | 157 | {
|
| 158 | 158 | |
| 159 | - $link = '<span class="gd-cancel-replaylink">' . $link . '</span>'; |
|
| 159 | + $link = '<span class="gd-cancel-replaylink">' . $link . '</span>'; |
|
| 160 | 160 | |
| 161 | - return $link; |
|
| 161 | + return $link; |
|
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | add_action('comment_post', 'geodir_save_rating');
|
@@ -174,32 +174,32 @@ discard block |
||
| 174 | 174 | */ |
| 175 | 175 | function geodir_save_rating($comment = 0) |
| 176 | 176 | {
|
| 177 | - global $wpdb, $user_ID, $plugin_prefix; |
|
| 177 | + global $wpdb, $user_ID, $plugin_prefix; |
|
| 178 | 178 | |
| 179 | - $comment_info = get_comment($comment); |
|
| 179 | + $comment_info = get_comment($comment); |
|
| 180 | 180 | |
| 181 | - $post_id = $comment_info->comment_post_ID; |
|
| 182 | - $status = $comment_info->comment_approved; |
|
| 183 | - $rating_ip = getenv("REMOTE_ADDR");
|
|
| 181 | + $post_id = $comment_info->comment_post_ID; |
|
| 182 | + $status = $comment_info->comment_approved; |
|
| 183 | + $rating_ip = getenv("REMOTE_ADDR");
|
|
| 184 | 184 | |
| 185 | - $post = geodir_get_post_info($post_id); |
|
| 186 | - if (empty($post)) {
|
|
| 187 | - return; |
|
| 188 | - } |
|
| 189 | - |
|
| 190 | - if ($post->post_status == 'publish') {
|
|
| 191 | - $post_status = '1'; |
|
| 192 | - } else {
|
|
| 193 | - $post_status = '0'; |
|
| 194 | - } |
|
| 185 | + $post = geodir_get_post_info($post_id); |
|
| 186 | + if (empty($post)) {
|
|
| 187 | + return; |
|
| 188 | + } |
|
| 189 | + |
|
| 190 | + if ($post->post_status == 'publish') {
|
|
| 191 | + $post_status = '1'; |
|
| 192 | + } else {
|
|
| 193 | + $post_status = '0'; |
|
| 194 | + } |
|
| 195 | 195 | |
| 196 | - if (isset($_REQUEST['geodir_overallrating'])) {
|
|
| 197 | - $overall_rating = $_REQUEST['geodir_overallrating']; |
|
| 196 | + if (isset($_REQUEST['geodir_overallrating'])) {
|
|
| 197 | + $overall_rating = $_REQUEST['geodir_overallrating']; |
|
| 198 | 198 | |
| 199 | 199 | if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {
|
| 200 | - $overall_rating = $overall_rating > 0 ? $overall_rating : '0'; |
|
| 200 | + $overall_rating = $overall_rating > 0 ? $overall_rating : '0'; |
|
| 201 | 201 | |
| 202 | - $sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET
|
|
| 202 | + $sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET
|
|
| 203 | 203 | post_id = %d, |
| 204 | 204 | post_type = %s, |
| 205 | 205 | post_title = %s, |
@@ -217,35 +217,35 @@ discard block |
||
| 217 | 217 | post_latitude = %s, |
| 218 | 218 | comment_content = %s |
| 219 | 219 | ", |
| 220 | - array($post_id, $post->post_type, $post->post_title, $user_ID, $comment, $rating_ip, $overall_rating, $status, $post_status, date_i18n('Y-m-d H:i:s', current_time('timestamp')), $post->post_city, $post->post_region, $post->post_country, $post->post_latitude, $post->post_longitude, $comment_info->comment_content)
|
|
| 221 | - ); |
|
| 222 | - |
|
| 223 | - $wpdb->query($sqlqry); |
|
| 224 | - |
|
| 225 | - /** |
|
| 226 | - * Called after saving the comment. |
|
| 227 | - * |
|
| 228 | - * @since 1.0.0 |
|
| 229 | - * @package GeoDirectory |
|
| 230 | - * @param array $_REQUEST {
|
|
| 231 | - * Attributes of the $_REQUEST variable. |
|
| 232 | - * |
|
| 233 | - * @type string $geodir_overallrating Overall rating. |
|
| 234 | - * @type string $comment Comment text. |
|
| 235 | - * @type string $submit Submit button text. |
|
| 236 | - * @type string $comment_post_ID Comment post ID. |
|
| 237 | - * @type string $comment_parent Comment Parent ID. |
|
| 238 | - * @type string $_wp_unfiltered_html_comment Unfiltered html comment string. |
|
| 239 | - * |
|
| 240 | - * } |
|
| 241 | - */ |
|
| 242 | - do_action('geodir_after_save_comment', $_REQUEST, 'Comment Your Post');
|
|
| 243 | - |
|
| 244 | - if ($status) {
|
|
| 245 | - geodir_update_postrating($post_id); |
|
| 246 | - } |
|
| 247 | - } |
|
| 248 | - } |
|
| 220 | + array($post_id, $post->post_type, $post->post_title, $user_ID, $comment, $rating_ip, $overall_rating, $status, $post_status, date_i18n('Y-m-d H:i:s', current_time('timestamp')), $post->post_city, $post->post_region, $post->post_country, $post->post_latitude, $post->post_longitude, $comment_info->comment_content)
|
|
| 221 | + ); |
|
| 222 | + |
|
| 223 | + $wpdb->query($sqlqry); |
|
| 224 | + |
|
| 225 | + /** |
|
| 226 | + * Called after saving the comment. |
|
| 227 | + * |
|
| 228 | + * @since 1.0.0 |
|
| 229 | + * @package GeoDirectory |
|
| 230 | + * @param array $_REQUEST {
|
|
| 231 | + * Attributes of the $_REQUEST variable. |
|
| 232 | + * |
|
| 233 | + * @type string $geodir_overallrating Overall rating. |
|
| 234 | + * @type string $comment Comment text. |
|
| 235 | + * @type string $submit Submit button text. |
|
| 236 | + * @type string $comment_post_ID Comment post ID. |
|
| 237 | + * @type string $comment_parent Comment Parent ID. |
|
| 238 | + * @type string $_wp_unfiltered_html_comment Unfiltered html comment string. |
|
| 239 | + * |
|
| 240 | + * } |
|
| 241 | + */ |
|
| 242 | + do_action('geodir_after_save_comment', $_REQUEST, 'Comment Your Post');
|
|
| 243 | + |
|
| 244 | + if ($status) {
|
|
| 245 | + geodir_update_postrating($post_id); |
|
| 246 | + } |
|
| 247 | + } |
|
| 248 | + } |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | |
@@ -263,51 +263,51 @@ discard block |
||
| 263 | 263 | */ |
| 264 | 264 | function geodir_update_rating_status_change($comment_id, $status) |
| 265 | 265 | {
|
| 266 | - if ($status == 'delete') {
|
|
| 267 | - return; |
|
| 268 | - } |
|
| 269 | - global $wpdb, $plugin_prefix, $user_ID; |
|
| 266 | + if ($status == 'delete') {
|
|
| 267 | + return; |
|
| 268 | + } |
|
| 269 | + global $wpdb, $plugin_prefix, $user_ID; |
|
| 270 | 270 | |
| 271 | - $comment_info = get_comment($comment_id); |
|
| 271 | + $comment_info = get_comment($comment_id); |
|
| 272 | 272 | |
| 273 | - $post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : ''; |
|
| 273 | + $post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : ''; |
|
| 274 | 274 | |
| 275 | - if (!empty($comment_info)) |
|
| 276 | - $status = $comment_info->comment_approved; |
|
| 275 | + if (!empty($comment_info)) |
|
| 276 | + $status = $comment_info->comment_approved; |
|
| 277 | 277 | |
| 278 | - if ($status == 'approve' || $status == 1) {
|
|
| 279 | - $status = 1; |
|
| 280 | - } else {
|
|
| 281 | - $status = 0; |
|
| 282 | - } |
|
| 278 | + if ($status == 'approve' || $status == 1) {
|
|
| 279 | + $status = 1; |
|
| 280 | + } else {
|
|
| 281 | + $status = 0; |
|
| 282 | + } |
|
| 283 | 283 | |
| 284 | - $comment_info_ID = isset($comment_info->comment_ID) ? $comment_info->comment_ID : ''; |
|
| 285 | - $old_rating = geodir_get_commentoverall($comment_info_ID); |
|
| 284 | + $comment_info_ID = isset($comment_info->comment_ID) ? $comment_info->comment_ID : ''; |
|
| 285 | + $old_rating = geodir_get_commentoverall($comment_info_ID); |
|
| 286 | 286 | |
| 287 | - $post_type = get_post_type($post_id); |
|
| 287 | + $post_type = get_post_type($post_id); |
|
| 288 | 288 | |
| 289 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 289 | + $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 290 | 290 | |
| 291 | - if ($comment_id) {
|
|
| 291 | + if ($comment_id) {
|
|
| 292 | 292 | |
| 293 | - $overall_rating = $old_rating; |
|
| 293 | + $overall_rating = $old_rating; |
|
| 294 | 294 | |
| 295 | - if (isset($old_rating)) {
|
|
| 295 | + if (isset($old_rating)) {
|
|
| 296 | 296 | |
| 297 | - $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET
|
|
| 297 | + $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET
|
|
| 298 | 298 | overall_rating = %f, |
| 299 | 299 | status = %s, |
| 300 | 300 | comment_content = %s |
| 301 | 301 | WHERE comment_id = %d ", array($overall_rating, $status, $comment_info->comment_content, $comment_id)); |
| 302 | 302 | |
| 303 | - $wpdb->query($sqlqry); |
|
| 303 | + $wpdb->query($sqlqry); |
|
| 304 | 304 | |
| 305 | - //update rating |
|
| 306 | - geodir_update_postrating($post_id, $post_type); |
|
| 305 | + //update rating |
|
| 306 | + geodir_update_postrating($post_id, $post_type); |
|
| 307 | 307 | |
| 308 | - } |
|
| 308 | + } |
|
| 309 | 309 | |
| 310 | - } |
|
| 310 | + } |
|
| 311 | 311 | |
| 312 | 312 | } |
| 313 | 313 | |
@@ -326,41 +326,41 @@ discard block |
||
| 326 | 326 | function geodir_update_rating($comment_id = 0) |
| 327 | 327 | {
|
| 328 | 328 | |
| 329 | - global $wpdb, $plugin_prefix, $user_ID; |
|
| 329 | + global $wpdb, $plugin_prefix, $user_ID; |
|
| 330 | 330 | |
| 331 | - $comment_info = get_comment($comment_id); |
|
| 331 | + $comment_info = get_comment($comment_id); |
|
| 332 | 332 | |
| 333 | - $post_id = $comment_info->comment_post_ID; |
|
| 334 | - $status = $comment_info->comment_approved; |
|
| 335 | - $old_rating = geodir_get_commentoverall($comment_info->comment_ID); |
|
| 333 | + $post_id = $comment_info->comment_post_ID; |
|
| 334 | + $status = $comment_info->comment_approved; |
|
| 335 | + $old_rating = geodir_get_commentoverall($comment_info->comment_ID); |
|
| 336 | 336 | |
| 337 | - $post_type = get_post_type($post_id); |
|
| 337 | + $post_type = get_post_type($post_id); |
|
| 338 | 338 | |
| 339 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 339 | + $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 340 | 340 | |
| 341 | - if (isset($_REQUEST['geodir_overallrating'])) {
|
|
| 341 | + if (isset($_REQUEST['geodir_overallrating'])) {
|
|
| 342 | 342 | |
| 343 | - $overall_rating = $_REQUEST['geodir_overallrating']; |
|
| 343 | + $overall_rating = $_REQUEST['geodir_overallrating']; |
|
| 344 | 344 | |
| 345 | - if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {
|
|
| 346 | - $overall_rating = $overall_rating > 0 ? $overall_rating : '0'; |
|
| 345 | + if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {
|
|
| 346 | + $overall_rating = $overall_rating > 0 ? $overall_rating : '0'; |
|
| 347 | 347 | |
| 348 | - if (isset($old_rating)) {
|
|
| 348 | + if (isset($old_rating)) {
|
|
| 349 | 349 | |
| 350 | - $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET
|
|
| 350 | + $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET
|
|
| 351 | 351 | overall_rating = %f, |
| 352 | 352 | status = %s, |
| 353 | 353 | comment_content = %s |
| 354 | 354 | WHERE comment_id = %d ", array($overall_rating, $status, $comment_info->comment_content, $comment_id)); |
| 355 | 355 | |
| 356 | - $wpdb->query($sqlqry); |
|
| 356 | + $wpdb->query($sqlqry); |
|
| 357 | 357 | |
| 358 | - //update rating |
|
| 359 | - geodir_update_postrating($post_id, $post_type); |
|
| 358 | + //update rating |
|
| 359 | + geodir_update_postrating($post_id, $post_type); |
|
| 360 | 360 | |
| 361 | - } |
|
| 362 | - } |
|
| 363 | - } |
|
| 361 | + } |
|
| 362 | + } |
|
| 363 | + } |
|
| 364 | 364 | |
| 365 | 365 | |
| 366 | 366 | } |
@@ -376,19 +376,19 @@ discard block |
||
| 376 | 376 | */ |
| 377 | 377 | function geodir_comment_delete_comment($comment_id) |
| 378 | 378 | {
|
| 379 | - global $wpdb; |
|
| 379 | + global $wpdb; |
|
| 380 | 380 | |
| 381 | - $review_info = geodir_get_review($comment_id); |
|
| 382 | - if ($review_info) {
|
|
| 383 | - geodir_update_postrating($review_info->post_id); |
|
| 384 | - } |
|
| 381 | + $review_info = geodir_get_review($comment_id); |
|
| 382 | + if ($review_info) {
|
|
| 383 | + geodir_update_postrating($review_info->post_id); |
|
| 384 | + } |
|
| 385 | 385 | |
| 386 | - $wpdb->query( |
|
| 387 | - $wpdb->prepare( |
|
| 388 | - "DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d", |
|
| 389 | - array($comment_id) |
|
| 390 | - ) |
|
| 391 | - ); |
|
| 386 | + $wpdb->query( |
|
| 387 | + $wpdb->prepare( |
|
| 388 | + "DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d", |
|
| 389 | + array($comment_id) |
|
| 390 | + ) |
|
| 391 | + ); |
|
| 392 | 392 | |
| 393 | 393 | } |
| 394 | 394 | |
@@ -404,13 +404,13 @@ discard block |
||
| 404 | 404 | */ |
| 405 | 405 | function geodir_wrap_comment_text($content, $comment = '') |
| 406 | 406 | {
|
| 407 | - $rating = 0; |
|
| 408 | - if (!empty($comment)) |
|
| 409 | - $rating = geodir_get_commentoverall($comment->comment_ID); |
|
| 410 | - if ($rating != 0 && !is_admin()) {
|
|
| 411 | - return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';
|
|
| 412 | - } else |
|
| 413 | - return $content; |
|
| 407 | + $rating = 0; |
|
| 408 | + if (!empty($comment)) |
|
| 409 | + $rating = geodir_get_commentoverall($comment->comment_ID); |
|
| 410 | + if ($rating != 0 && !is_admin()) {
|
|
| 411 | + return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';
|
|
| 412 | + } else |
|
| 413 | + return $content; |
|
| 414 | 414 | |
| 415 | 415 | } |
| 416 | 416 | |
@@ -428,41 +428,41 @@ discard block |
||
| 428 | 428 | */ |
| 429 | 429 | function geodir_update_postrating($post_id = 0, $post_type = '', $delete = false) |
| 430 | 430 | {
|
| 431 | - global $wpdb, $plugin_prefix, $comment; |
|
| 432 | - if (!$post_type) {
|
|
| 433 | - $post_type = get_post_type($post_id); |
|
| 434 | - } |
|
| 435 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 436 | - $post_newrating = geodir_get_post_rating($post_id, 1); |
|
| 437 | - $post_newrating_count = geodir_get_review_count_total($post_id); |
|
| 431 | + global $wpdb, $plugin_prefix, $comment; |
|
| 432 | + if (!$post_type) {
|
|
| 433 | + $post_type = get_post_type($post_id); |
|
| 434 | + } |
|
| 435 | + $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 436 | + $post_newrating = geodir_get_post_rating($post_id, 1); |
|
| 437 | + $post_newrating_count = geodir_get_review_count_total($post_id); |
|
| 438 | 438 | |
| 439 | 439 | |
| 440 | - //$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ; |
|
| 440 | + //$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ; |
|
| 441 | 441 | |
| 442 | - if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {
|
|
| 442 | + if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {
|
|
| 443 | 443 | |
| 444 | - $wpdb->query( |
|
| 445 | - $wpdb->prepare( |
|
| 446 | - "UPDATE " . $detail_table . " SET |
|
| 444 | + $wpdb->query( |
|
| 445 | + $wpdb->prepare( |
|
| 446 | + "UPDATE " . $detail_table . " SET |
|
| 447 | 447 | overall_rating = %f, |
| 448 | 448 | rating_count = %f |
| 449 | 449 | where post_id = %d", |
| 450 | - array($post_newrating, $post_newrating_count, $post_id) |
|
| 451 | - ) |
|
| 452 | - ); |
|
| 453 | - |
|
| 454 | - update_post_meta($post_id, 'overall_rating', $post_newrating); |
|
| 455 | - update_post_meta($post_id, 'rating_count', $post_newrating_count); |
|
| 456 | - } |
|
| 457 | - /** |
|
| 458 | - * Called after Updating post overall rating and rating count. |
|
| 459 | - * |
|
| 460 | - * @since 1.0.0 |
|
| 461 | - * @since 1.4.3 Added `$post_id` param. |
|
| 462 | - * @package GeoDirectory |
|
| 463 | - * @param int $post_id The post ID. |
|
| 464 | - */ |
|
| 465 | - do_action('geodir_update_postrating',$post_id);
|
|
| 450 | + array($post_newrating, $post_newrating_count, $post_id) |
|
| 451 | + ) |
|
| 452 | + ); |
|
| 453 | + |
|
| 454 | + update_post_meta($post_id, 'overall_rating', $post_newrating); |
|
| 455 | + update_post_meta($post_id, 'rating_count', $post_newrating_count); |
|
| 456 | + } |
|
| 457 | + /** |
|
| 458 | + * Called after Updating post overall rating and rating count. |
|
| 459 | + * |
|
| 460 | + * @since 1.0.0 |
|
| 461 | + * @since 1.4.3 Added `$post_id` param. |
|
| 462 | + * @package GeoDirectory |
|
| 463 | + * @param int $post_id The post ID. |
|
| 464 | + */ |
|
| 465 | + do_action('geodir_update_postrating',$post_id);
|
|
| 466 | 466 | |
| 467 | 467 | } |
| 468 | 468 | |
@@ -480,29 +480,29 @@ discard block |
||
| 480 | 480 | */ |
| 481 | 481 | function geodir_get_postoverall($post_id = 0) |
| 482 | 482 | {
|
| 483 | - global $wpdb, $plugin_prefix; |
|
| 483 | + global $wpdb, $plugin_prefix; |
|
| 484 | 484 | |
| 485 | - $post_type = get_post_type($post_id); |
|
| 486 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 485 | + $post_type = get_post_type($post_id); |
|
| 486 | + $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 487 | 487 | |
| 488 | - if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {
|
|
| 488 | + if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {
|
|
| 489 | 489 | |
| 490 | - $post_ratings = $wpdb->get_var( |
|
| 491 | - $wpdb->prepare( |
|
| 492 | - "SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d", |
|
| 493 | - array($post_id) |
|
| 494 | - ) |
|
| 495 | - ); |
|
| 490 | + $post_ratings = $wpdb->get_var( |
|
| 491 | + $wpdb->prepare( |
|
| 492 | + "SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d", |
|
| 493 | + array($post_id) |
|
| 494 | + ) |
|
| 495 | + ); |
|
| 496 | 496 | |
| 497 | 497 | |
| 498 | - } else {
|
|
| 499 | - $post_ratings = get_post_meta($post_id, 'overall_rating'); |
|
| 500 | - } |
|
| 498 | + } else {
|
|
| 499 | + $post_ratings = get_post_meta($post_id, 'overall_rating'); |
|
| 500 | + } |
|
| 501 | 501 | |
| 502 | - if ($post_ratings) |
|
| 503 | - return $post_ratings; |
|
| 504 | - else |
|
| 505 | - return false; |
|
| 502 | + if ($post_ratings) |
|
| 503 | + return $post_ratings; |
|
| 504 | + else |
|
| 505 | + return false; |
|
| 506 | 506 | } |
| 507 | 507 | |
| 508 | 508 | |
@@ -519,19 +519,19 @@ discard block |
||
| 519 | 519 | */ |
| 520 | 520 | function geodir_get_review($comment_id = 0) |
| 521 | 521 | {
|
| 522 | - global $wpdb; |
|
| 523 | - |
|
| 524 | - $reatings = $wpdb->get_row( |
|
| 525 | - $wpdb->prepare( |
|
| 526 | - "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d", |
|
| 527 | - array($comment_id) |
|
| 528 | - ) |
|
| 529 | - ); |
|
| 530 | - |
|
| 531 | - if (!empty($reatings)) |
|
| 532 | - return $reatings; |
|
| 533 | - else |
|
| 534 | - return false; |
|
| 522 | + global $wpdb; |
|
| 523 | + |
|
| 524 | + $reatings = $wpdb->get_row( |
|
| 525 | + $wpdb->prepare( |
|
| 526 | + "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d", |
|
| 527 | + array($comment_id) |
|
| 528 | + ) |
|
| 529 | + ); |
|
| 530 | + |
|
| 531 | + if (!empty($reatings)) |
|
| 532 | + return $reatings; |
|
| 533 | + else |
|
| 534 | + return false; |
|
| 535 | 535 | } |
| 536 | 536 | |
| 537 | 537 | /** |
@@ -547,19 +547,19 @@ discard block |
||
| 547 | 547 | */ |
| 548 | 548 | function geodir_get_review_total($post_id = 0) |
| 549 | 549 | {
|
| 550 | - global $wpdb; |
|
| 551 | - |
|
| 552 | - $results = $wpdb->get_var( |
|
| 553 | - $wpdb->prepare( |
|
| 554 | - "SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 555 | - array($post_id) |
|
| 556 | - ) |
|
| 557 | - ); |
|
| 558 | - |
|
| 559 | - if (!empty($results)) |
|
| 560 | - return $results; |
|
| 561 | - else |
|
| 562 | - return false; |
|
| 550 | + global $wpdb; |
|
| 551 | + |
|
| 552 | + $results = $wpdb->get_var( |
|
| 553 | + $wpdb->prepare( |
|
| 554 | + "SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 555 | + array($post_id) |
|
| 556 | + ) |
|
| 557 | + ); |
|
| 558 | + |
|
| 559 | + if (!empty($results)) |
|
| 560 | + return $results; |
|
| 561 | + else |
|
| 562 | + return false; |
|
| 563 | 563 | } |
| 564 | 564 | |
| 565 | 565 | /** |
@@ -575,18 +575,18 @@ discard block |
||
| 575 | 575 | */ |
| 576 | 576 | function geodir_get_review_count_by_user_id($user_id = 0) |
| 577 | 577 | {
|
| 578 | - global $wpdb; |
|
| 579 | - $results = $wpdb->get_var( |
|
| 580 | - $wpdb->prepare( |
|
| 581 | - "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0", |
|
| 582 | - array($user_id) |
|
| 583 | - ) |
|
| 584 | - ); |
|
| 585 | - |
|
| 586 | - if (!empty($results)) |
|
| 587 | - return $results; |
|
| 588 | - else |
|
| 589 | - return false; |
|
| 578 | + global $wpdb; |
|
| 579 | + $results = $wpdb->get_var( |
|
| 580 | + $wpdb->prepare( |
|
| 581 | + "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0", |
|
| 582 | + array($user_id) |
|
| 583 | + ) |
|
| 584 | + ); |
|
| 585 | + |
|
| 586 | + if (!empty($results)) |
|
| 587 | + return $results; |
|
| 588 | + else |
|
| 589 | + return false; |
|
| 590 | 590 | } |
| 591 | 591 | |
| 592 | 592 | /** |
@@ -604,27 +604,27 @@ discard block |
||
| 604 | 604 | */ |
| 605 | 605 | function geodir_get_post_rating($post_id = 0, $force_query = 0) |
| 606 | 606 | {
|
| 607 | - global $wpdb, $post; |
|
| 608 | - |
|
| 609 | - if (isset($post->ID) && $post->ID == $post_id && !$force_query) {
|
|
| 610 | - if (isset($post->rating_count) && $post->rating_count > 0 && isset($post->overall_rating) && $post->overall_rating > 0) {
|
|
| 611 | - return $post->overall_rating; |
|
| 612 | - } else {
|
|
| 613 | - return 0; |
|
| 614 | - } |
|
| 615 | - } |
|
| 616 | - |
|
| 617 | - $results = $wpdb->get_var( |
|
| 618 | - $wpdb->prepare( |
|
| 619 | - "SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 620 | - array($post_id) |
|
| 621 | - ) |
|
| 622 | - ); |
|
| 623 | - |
|
| 624 | - if (!empty($results)) |
|
| 625 | - return $results; |
|
| 626 | - else |
|
| 627 | - return false; |
|
| 607 | + global $wpdb, $post; |
|
| 608 | + |
|
| 609 | + if (isset($post->ID) && $post->ID == $post_id && !$force_query) {
|
|
| 610 | + if (isset($post->rating_count) && $post->rating_count > 0 && isset($post->overall_rating) && $post->overall_rating > 0) {
|
|
| 611 | + return $post->overall_rating; |
|
| 612 | + } else {
|
|
| 613 | + return 0; |
|
| 614 | + } |
|
| 615 | + } |
|
| 616 | + |
|
| 617 | + $results = $wpdb->get_var( |
|
| 618 | + $wpdb->prepare( |
|
| 619 | + "SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 620 | + array($post_id) |
|
| 621 | + ) |
|
| 622 | + ); |
|
| 623 | + |
|
| 624 | + if (!empty($results)) |
|
| 625 | + return $results; |
|
| 626 | + else |
|
| 627 | + return false; |
|
| 628 | 628 | } |
| 629 | 629 | |
| 630 | 630 | /** |
@@ -640,19 +640,19 @@ discard block |
||
| 640 | 640 | */ |
| 641 | 641 | function geodir_get_review_count_total($post_id = 0) |
| 642 | 642 | {
|
| 643 | - global $wpdb; |
|
| 644 | - |
|
| 645 | - $results = $wpdb->get_var( |
|
| 646 | - $wpdb->prepare( |
|
| 647 | - "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 648 | - array($post_id) |
|
| 649 | - ) |
|
| 650 | - ); |
|
| 651 | - |
|
| 652 | - if (!empty($results)) |
|
| 653 | - return $results; |
|
| 654 | - else |
|
| 655 | - return false; |
|
| 643 | + global $wpdb; |
|
| 644 | + |
|
| 645 | + $results = $wpdb->get_var( |
|
| 646 | + $wpdb->prepare( |
|
| 647 | + "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 648 | + array($post_id) |
|
| 649 | + ) |
|
| 650 | + ); |
|
| 651 | + |
|
| 652 | + if (!empty($results)) |
|
| 653 | + return $results; |
|
| 654 | + else |
|
| 655 | + return false; |
|
| 656 | 656 | } |
| 657 | 657 | |
| 658 | 658 | /** |
@@ -669,20 +669,20 @@ discard block |
||
| 669 | 669 | */ |
| 670 | 670 | function geodir_get_comments_number($post_id = 0) |
| 671 | 671 | {
|
| 672 | - global $wpdb; |
|
| 672 | + global $wpdb; |
|
| 673 | 673 | |
| 674 | - $results = $wpdb->get_var( |
|
| 675 | - $wpdb->prepare( |
|
| 676 | - "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 677 | - array($post_id) |
|
| 678 | - ) |
|
| 679 | - ); |
|
| 674 | + $results = $wpdb->get_var( |
|
| 675 | + $wpdb->prepare( |
|
| 676 | + "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0", |
|
| 677 | + array($post_id) |
|
| 678 | + ) |
|
| 679 | + ); |
|
| 680 | 680 | |
| 681 | 681 | |
| 682 | - if (!empty($results)) |
|
| 683 | - return $results; |
|
| 684 | - else |
|
| 685 | - return false; |
|
| 682 | + if (!empty($results)) |
|
| 683 | + return $results; |
|
| 684 | + else |
|
| 685 | + return false; |
|
| 686 | 686 | } |
| 687 | 687 | |
| 688 | 688 | /** |
@@ -698,19 +698,19 @@ discard block |
||
| 698 | 698 | */ |
| 699 | 699 | function geodir_get_commentoverall($comment_id = 0) |
| 700 | 700 | {
|
| 701 | - global $wpdb; |
|
| 702 | - |
|
| 703 | - $reatings = $wpdb->get_var( |
|
| 704 | - $wpdb->prepare( |
|
| 705 | - "SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d", |
|
| 706 | - array($comment_id) |
|
| 707 | - ) |
|
| 708 | - ); |
|
| 709 | - |
|
| 710 | - if ($reatings) |
|
| 711 | - return $reatings; |
|
| 712 | - else |
|
| 713 | - return false; |
|
| 701 | + global $wpdb; |
|
| 702 | + |
|
| 703 | + $reatings = $wpdb->get_var( |
|
| 704 | + $wpdb->prepare( |
|
| 705 | + "SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d", |
|
| 706 | + array($comment_id) |
|
| 707 | + ) |
|
| 708 | + ); |
|
| 709 | + |
|
| 710 | + if ($reatings) |
|
| 711 | + return $reatings; |
|
| 712 | + else |
|
| 713 | + return false; |
|
| 714 | 714 | } |
| 715 | 715 | |
| 716 | 716 | /** |
@@ -724,7 +724,7 @@ discard block |
||
| 724 | 724 | */ |
| 725 | 725 | function geodir_get_commentoverall_number($post_id = 0) |
| 726 | 726 | {
|
| 727 | - return geodir_get_post_rating($post_id); |
|
| 727 | + return geodir_get_post_rating($post_id); |
|
| 728 | 728 | } |
| 729 | 729 | |
| 730 | 730 | |
@@ -742,98 +742,98 @@ discard block |
||
| 742 | 742 | */ |
| 743 | 743 | function geodir_comment_template($comment_template) |
| 744 | 744 | {
|
| 745 | - global $post; |
|
| 746 | - |
|
| 747 | - $post_types = geodir_get_posttypes(); |
|
| 748 | - |
|
| 749 | - if (!(is_singular() && (have_comments() || (isset($post->comment_status) && 'open' == $post->comment_status)))) {
|
|
| 750 | - return; |
|
| 751 | - } |
|
| 752 | - if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business
|
|
| 753 | - $template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available
|
|
| 754 | - if (!$template) {
|
|
| 755 | - $template = dirname(__FILE__) . '/reviews.php'; |
|
| 756 | - } |
|
| 757 | - return $template; |
|
| 758 | - } |
|
| 745 | + global $post; |
|
| 746 | + |
|
| 747 | + $post_types = geodir_get_posttypes(); |
|
| 748 | + |
|
| 749 | + if (!(is_singular() && (have_comments() || (isset($post->comment_status) && 'open' == $post->comment_status)))) {
|
|
| 750 | + return; |
|
| 751 | + } |
|
| 752 | + if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business
|
|
| 753 | + $template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available
|
|
| 754 | + if (!$template) {
|
|
| 755 | + $template = dirname(__FILE__) . '/reviews.php'; |
|
| 756 | + } |
|
| 757 | + return $template; |
|
| 758 | + } |
|
| 759 | 759 | } |
| 760 | 760 | |
| 761 | 761 | add_filter("comments_template", "geodir_comment_template");
|
| 762 | 762 | |
| 763 | 763 | |
| 764 | 764 | if (!function_exists('geodir_comment')) {
|
| 765 | - /** |
|
| 766 | - * Comment HTML markup. |
|
| 767 | - * |
|
| 768 | - * @since 1.0.0 |
|
| 769 | - * @package GeoDirectory |
|
| 770 | - * @global object $post The current post object. |
|
| 771 | - * @param object $comment The comment object. |
|
| 772 | - * @param string|array $args {
|
|
| 773 | - * Optional. Formatting options. |
|
| 774 | - * |
|
| 775 | - * @type object $walker Instance of a Walker class to list comments. Default null. |
|
| 776 | - * @type int $max_depth The maximum comments depth. Default empty. |
|
| 777 | - * @type string $style The style of list ordering. Default 'ul'. Accepts 'ul', 'ol'. |
|
| 778 | - * @type string $callback Callback function to use. Default null. |
|
| 779 | - * @type string $end-callback Callback function to use at the end. Default null. |
|
| 780 | - * @type string $type Type of comments to list. |
|
| 781 | - * Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'. |
|
| 782 | - * @type int $page Page ID to list comments for. Default empty. |
|
| 783 | - * @type int $per_page Number of comments to list per page. Default empty. |
|
| 784 | - * @type int $avatar_size Height and width dimensions of the avatar size. Default 32. |
|
| 785 | - * @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'. |
|
| 786 | - * @type bool $reverse_children Whether to reverse child comments in the list. Default null. |
|
| 787 | - * @type string $format How to format the comments list. |
|
| 788 | - * Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'. |
|
| 789 | - * @type bool $short_ping Whether to output short pings. Default false. |
|
| 790 | - * @type bool $echo Whether to echo the output or return it. Default true. |
|
| 791 | - * } |
|
| 792 | - * @param int $depth Depth of comment. |
|
| 793 | - */ |
|
| 794 | - function geodir_comment($comment, $args, $depth) |
|
| 795 | - {
|
|
| 796 | - $GLOBALS['comment'] = $comment; |
|
| 797 | - switch ($comment->comment_type) : |
|
| 798 | - case 'pingback' : |
|
| 799 | - case 'trackback' : |
|
| 800 | - // Display trackbacks differently than normal comments. |
|
| 801 | - ?> |
|
| 765 | + /** |
|
| 766 | + * Comment HTML markup. |
|
| 767 | + * |
|
| 768 | + * @since 1.0.0 |
|
| 769 | + * @package GeoDirectory |
|
| 770 | + * @global object $post The current post object. |
|
| 771 | + * @param object $comment The comment object. |
|
| 772 | + * @param string|array $args {
|
|
| 773 | + * Optional. Formatting options. |
|
| 774 | + * |
|
| 775 | + * @type object $walker Instance of a Walker class to list comments. Default null. |
|
| 776 | + * @type int $max_depth The maximum comments depth. Default empty. |
|
| 777 | + * @type string $style The style of list ordering. Default 'ul'. Accepts 'ul', 'ol'. |
|
| 778 | + * @type string $callback Callback function to use. Default null. |
|
| 779 | + * @type string $end-callback Callback function to use at the end. Default null. |
|
| 780 | + * @type string $type Type of comments to list. |
|
| 781 | + * Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'. |
|
| 782 | + * @type int $page Page ID to list comments for. Default empty. |
|
| 783 | + * @type int $per_page Number of comments to list per page. Default empty. |
|
| 784 | + * @type int $avatar_size Height and width dimensions of the avatar size. Default 32. |
|
| 785 | + * @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'. |
|
| 786 | + * @type bool $reverse_children Whether to reverse child comments in the list. Default null. |
|
| 787 | + * @type string $format How to format the comments list. |
|
| 788 | + * Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'. |
|
| 789 | + * @type bool $short_ping Whether to output short pings. Default false. |
|
| 790 | + * @type bool $echo Whether to echo the output or return it. Default true. |
|
| 791 | + * } |
|
| 792 | + * @param int $depth Depth of comment. |
|
| 793 | + */ |
|
| 794 | + function geodir_comment($comment, $args, $depth) |
|
| 795 | + {
|
|
| 796 | + $GLOBALS['comment'] = $comment; |
|
| 797 | + switch ($comment->comment_type) : |
|
| 798 | + case 'pingback' : |
|
| 799 | + case 'trackback' : |
|
| 800 | + // Display trackbacks differently than normal comments. |
|
| 801 | + ?> |
|
| 802 | 802 | <li <?php comment_class('geodir-comment'); ?> id="comment-<?php comment_ID(); ?>">
|
| 803 | 803 | <p><?php _e('Pingback:', 'geodirectory'); ?> <?php comment_author_link(); ?> <?php edit_comment_link(__('(Edit)', 'geodirectory'), '<span class="edit-link">', '</span>'); ?></p>
|
| 804 | 804 | <?php |
| 805 | - break; |
|
| 806 | - default : |
|
| 807 | - // Proceed with normal comments. |
|
| 808 | - global $post; |
|
| 809 | - ?> |
|
| 805 | + break; |
|
| 806 | + default : |
|
| 807 | + // Proceed with normal comments. |
|
| 808 | + global $post; |
|
| 809 | + ?> |
|
| 810 | 810 | <li <?php comment_class('geodir-comment'); ?> id="li-comment-<?php comment_ID(); ?>">
|
| 811 | 811 | <article id="comment-<?php comment_ID(); ?>" class="comment"> |
| 812 | 812 | <header class="comment-meta comment-author vcard"> |
| 813 | 813 | <?php |
| 814 | - /** |
|
| 815 | - * Filter to modify comment avatar size |
|
| 816 | - * |
|
| 817 | - * You can use this filter to change comment avatar size. |
|
| 818 | - * |
|
| 819 | - * @since 1.0.0 |
|
| 820 | - * @package GeoDirectory |
|
| 821 | - */ |
|
| 822 | - $avatar_size = apply_filters('geodir_comment_avatar_size', 44);
|
|
| 823 | - echo get_avatar($comment, $avatar_size); |
|
| 824 | - printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',
|
|
| 825 | - get_comment_author_link(), |
|
| 826 | - // If current post author is also comment author, make it known visually. |
|
| 827 | - ($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''
|
|
| 828 | - ); |
|
| 829 | - echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>"; |
|
| 830 | - printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',
|
|
| 831 | - esc_url(get_comment_link($comment->comment_ID)), |
|
| 832 | - get_comment_time('c'),
|
|
| 833 | - /* translators: 1: date, 2: time */ |
|
| 834 | - sprintf(__('%1$s at %2$s', 'geodirectory'), get_comment_date(), get_comment_time())
|
|
| 835 | - ); |
|
| 836 | - ?> |
|
| 814 | + /** |
|
| 815 | + * Filter to modify comment avatar size |
|
| 816 | + * |
|
| 817 | + * You can use this filter to change comment avatar size. |
|
| 818 | + * |
|
| 819 | + * @since 1.0.0 |
|
| 820 | + * @package GeoDirectory |
|
| 821 | + */ |
|
| 822 | + $avatar_size = apply_filters('geodir_comment_avatar_size', 44);
|
|
| 823 | + echo get_avatar($comment, $avatar_size); |
|
| 824 | + printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',
|
|
| 825 | + get_comment_author_link(), |
|
| 826 | + // If current post author is also comment author, make it known visually. |
|
| 827 | + ($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''
|
|
| 828 | + ); |
|
| 829 | + echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>"; |
|
| 830 | + printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',
|
|
| 831 | + esc_url(get_comment_link($comment->comment_ID)), |
|
| 832 | + get_comment_time('c'),
|
|
| 833 | + /* translators: 1: date, 2: time */ |
|
| 834 | + sprintf(__('%1$s at %2$s', 'geodirectory'), get_comment_date(), get_comment_time())
|
|
| 835 | + ); |
|
| 836 | + ?> |
|
| 837 | 837 | </header> |
| 838 | 838 | <!-- .comment-meta --> |
| 839 | 839 | |
@@ -857,47 +857,47 @@ discard block |
||
| 857 | 857 | </article> |
| 858 | 858 | <!-- #comment-## --> |
| 859 | 859 | <?php |
| 860 | - break; |
|
| 861 | - endswitch; // end comment_type check |
|
| 862 | - } |
|
| 860 | + break; |
|
| 861 | + endswitch; // end comment_type check |
|
| 862 | + } |
|
| 863 | 863 | } |
| 864 | 864 | |
| 865 | 865 | |
| 866 | 866 | add_filter('get_comments_number', 'geodir_fix_comment_count', 10, 2);
|
| 867 | 867 | if (!function_exists('geodir_fix_comment_count')) {
|
| 868 | - /** |
|
| 869 | - * Fix comment count by not listing replies as reviews |
|
| 870 | - * |
|
| 871 | - * @since 1.0.0 |
|
| 872 | - * @package GeoDirectory |
|
| 873 | - * @global object $post The current post object. |
|
| 874 | - * @param int $count The comment count. |
|
| 875 | - * @param int $post_id The post ID. |
|
| 876 | - * @todo $post is unreachable since the function return the count before that variable. |
|
| 877 | - * @return bool|null|string The comment count. |
|
| 878 | - */ |
|
| 879 | - function geodir_fix_comment_count($count, $post_id) |
|
| 880 | - {
|
|
| 881 | - if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {
|
|
| 882 | - global $post; |
|
| 883 | - $post_types = geodir_get_posttypes(); |
|
| 884 | - |
|
| 885 | - if (in_array(get_post_type($post_id), $post_types)) {
|
|
| 886 | - $review_count = geodir_get_review_count_total($post_id); |
|
| 887 | - return $review_count; |
|
| 888 | - |
|
| 889 | - if ($post && isset($post->rating_count)) {
|
|
| 890 | - return $post->rating_count; |
|
| 891 | - } else {
|
|
| 892 | - return geodir_get_comments_number($post_id); |
|
| 893 | - } |
|
| 894 | - } else {
|
|
| 895 | - return $count; |
|
| 896 | - } |
|
| 897 | - } else {
|
|
| 898 | - return $count; |
|
| 899 | - } |
|
| 900 | - } |
|
| 868 | + /** |
|
| 869 | + * Fix comment count by not listing replies as reviews |
|
| 870 | + * |
|
| 871 | + * @since 1.0.0 |
|
| 872 | + * @package GeoDirectory |
|
| 873 | + * @global object $post The current post object. |
|
| 874 | + * @param int $count The comment count. |
|
| 875 | + * @param int $post_id The post ID. |
|
| 876 | + * @todo $post is unreachable since the function return the count before that variable. |
|
| 877 | + * @return bool|null|string The comment count. |
|
| 878 | + */ |
|
| 879 | + function geodir_fix_comment_count($count, $post_id) |
|
| 880 | + {
|
|
| 881 | + if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {
|
|
| 882 | + global $post; |
|
| 883 | + $post_types = geodir_get_posttypes(); |
|
| 884 | + |
|
| 885 | + if (in_array(get_post_type($post_id), $post_types)) {
|
|
| 886 | + $review_count = geodir_get_review_count_total($post_id); |
|
| 887 | + return $review_count; |
|
| 888 | + |
|
| 889 | + if ($post && isset($post->rating_count)) {
|
|
| 890 | + return $post->rating_count; |
|
| 891 | + } else {
|
|
| 892 | + return geodir_get_comments_number($post_id); |
|
| 893 | + } |
|
| 894 | + } else {
|
|
| 895 | + return $count; |
|
| 896 | + } |
|
| 897 | + } else {
|
|
| 898 | + return $count; |
|
| 899 | + } |
|
| 900 | + } |
|
| 901 | 901 | } |
| 902 | 902 | |
| 903 | 903 | /** |
@@ -914,11 +914,11 @@ discard block |
||
| 914 | 914 | */ |
| 915 | 915 | function geodir_get_rating_stars($rating, $post_id, $small = false) |
| 916 | 916 | {
|
| 917 | - $a_rating = $rating / 5 * 100; |
|
| 917 | + $a_rating = $rating / 5 * 100; |
|
| 918 | 918 | |
| 919 | - if ($small) {
|
|
| 920 | - $r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>'; |
|
| 921 | - } else {
|
|
| 919 | + if ($small) {
|
|
| 920 | + $r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>'; |
|
| 921 | + } else {
|
|
| 922 | 922 | if (function_exists('geodir_reviewrating_draw_overall_rating')) {
|
| 923 | 923 | // Show rating stars from review rating manager |
| 924 | 924 | $r_html = geodir_reviewrating_draw_overall_rating($rating); |
@@ -936,8 +936,8 @@ discard block |
||
| 936 | 936 | } |
| 937 | 937 | $r_html = '<div class="geodir-rating" style="' . $attach_style . '"><div class="gd_rating_show" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingAverage" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star">' . $rating_img . $rating_img . $rating_img . $rating_img . $rating_img . '</div></div></div>'; |
| 938 | 938 | } |
| 939 | - } |
|
| 940 | - return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);
|
|
| 939 | + } |
|
| 940 | + return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);
|
|
| 941 | 941 | } |
| 942 | 942 | |
| 943 | 943 | /** |
@@ -951,23 +951,23 @@ discard block |
||
| 951 | 951 | function geodir_is_reviews_show($pageview = '') |
| 952 | 952 | {
|
| 953 | 953 | |
| 954 | - $active_tabs = get_option('geodir_detail_page_tabs_excluded');
|
|
| 955 | - |
|
| 956 | - $is_display = true; |
|
| 957 | - if (!empty($active_tabs) && in_array('reviews', $active_tabs))
|
|
| 958 | - $is_display = false; |
|
| 959 | - |
|
| 960 | - /** |
|
| 961 | - * Filter to change display value. |
|
| 962 | - * |
|
| 963 | - * You can use this filter to change the is_display value. |
|
| 964 | - * |
|
| 965 | - * @since 1.0.0 |
|
| 966 | - * @package GeoDirectory |
|
| 967 | - * @param bool $is_display Display ratings when set to true. |
|
| 968 | - * @param string $pageview The view template. Ex: listview, gridview etc. |
|
| 969 | - */ |
|
| 970 | - return apply_filters('geodir_is_reviews_show', $is_display, $pageview);
|
|
| 954 | + $active_tabs = get_option('geodir_detail_page_tabs_excluded');
|
|
| 955 | + |
|
| 956 | + $is_display = true; |
|
| 957 | + if (!empty($active_tabs) && in_array('reviews', $active_tabs))
|
|
| 958 | + $is_display = false; |
|
| 959 | + |
|
| 960 | + /** |
|
| 961 | + * Filter to change display value. |
|
| 962 | + * |
|
| 963 | + * You can use this filter to change the is_display value. |
|
| 964 | + * |
|
| 965 | + * @since 1.0.0 |
|
| 966 | + * @package GeoDirectory |
|
| 967 | + * @param bool $is_display Display ratings when set to true. |
|
| 968 | + * @param string $pageview The view template. Ex: listview, gridview etc. |
|
| 969 | + */ |
|
| 970 | + return apply_filters('geodir_is_reviews_show', $is_display, $pageview);
|
|
| 971 | 971 | } |
| 972 | 972 | |
| 973 | 973 | |
@@ -975,9 +975,9 @@ discard block |
||
| 975 | 975 | * If Disqus plugin is active, do some fixes to show on blogs but no on GD post types |
| 976 | 976 | */ |
| 977 | 977 | if(function_exists('dsq_can_replace')) {
|
| 978 | - remove_filter('comments_template', 'dsq_comments_template');
|
|
| 979 | - add_filter('comments_template', 'dsq_comments_template', 100);
|
|
| 980 | - add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);
|
|
| 978 | + remove_filter('comments_template', 'dsq_comments_template');
|
|
| 979 | + add_filter('comments_template', 'dsq_comments_template', 100);
|
|
| 980 | + add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);
|
|
| 981 | 981 | } |
| 982 | 982 | |
| 983 | 983 | |
@@ -991,13 +991,13 @@ discard block |
||
| 991 | 991 | * @return string `1` if active `0` if disabled. |
| 992 | 992 | */ |
| 993 | 993 | function geodir_option_disqus_active($disqus_active){
|
| 994 | - global $post; |
|
| 995 | - $all_postypes = geodir_get_posttypes(); |
|
| 994 | + global $post; |
|
| 995 | + $all_postypes = geodir_get_posttypes(); |
|
| 996 | 996 | |
| 997 | - if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){
|
|
| 998 | - $disqus_active = '0'; |
|
| 999 | - } |
|
| 997 | + if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){
|
|
| 998 | + $disqus_active = '0'; |
|
| 999 | + } |
|
| 1000 | 1000 | |
| 1001 | - return $disqus_active; |
|
| 1001 | + return $disqus_active; |
|
| 1002 | 1002 | } |
| 1003 | 1003 | |
@@ -2362,10 +2362,10 @@ discard block |
||
| 2362 | 2362 | ?> |
| 2363 | 2363 | <input class="search_text" name="s" |
| 2364 | 2364 | value="<?php if ( isset( $_REQUEST['s'] ) && trim( $_REQUEST['s'] ) != '' ) {
|
| 2365 | - echo esc_attr( stripslashes_deep( $_REQUEST['s'] ) ); |
|
| 2366 | - } else {
|
|
| 2367 | - echo $default_search_for_text; |
|
| 2368 | - } ?>" type="text" |
|
| 2365 | + echo esc_attr( stripslashes_deep( $_REQUEST['s'] ) ); |
|
| 2366 | + } else {
|
|
| 2367 | + echo $default_search_for_text; |
|
| 2368 | + } ?>" type="text" |
|
| 2369 | 2369 | onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql( $default_search_for_text ); ?>';}"
|
| 2370 | 2370 | onfocus="if (this.value == '<?php echo esc_sql( $default_search_for_text ); ?>') {this.value = '';}"
|
| 2371 | 2371 | onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);"> |
@@ -2492,11 +2492,11 @@ discard block |
||
| 2492 | 2492 | * @return True if WPML is active else False. |
| 2493 | 2493 | */ |
| 2494 | 2494 | function geodir_is_wpml() {
|
| 2495 | - if (function_exists('icl_object_id')) {
|
|
| 2496 | - return true; |
|
| 2497 | - } |
|
| 2495 | + if (function_exists('icl_object_id')) {
|
|
| 2496 | + return true; |
|
| 2497 | + } |
|
| 2498 | 2498 | |
| 2499 | - return false; |
|
| 2499 | + return false; |
|
| 2500 | 2500 | } |
| 2501 | 2501 | |
| 2502 | 2502 | /** |
@@ -2511,9 +2511,9 @@ discard block |
||
| 2511 | 2511 | * @return Language code. |
| 2512 | 2512 | */ |
| 2513 | 2513 | function geodir_get_language_for_element($element_id, $element_type) {
|
| 2514 | - global $sitepress; |
|
| 2514 | + global $sitepress; |
|
| 2515 | 2515 | |
| 2516 | - return $sitepress->get_language_for_element($element_id, $element_type); |
|
| 2516 | + return $sitepress->get_language_for_element($element_id, $element_type); |
|
| 2517 | 2517 | } |
| 2518 | 2518 | |
| 2519 | 2519 | /** |
@@ -2528,25 +2528,25 @@ discard block |
||
| 2528 | 2528 | * @param int $tr_post_id Translation Post ID. |
| 2529 | 2529 | */ |
| 2530 | 2530 | function geodir_icl_make_duplicate($master_post_id, $lang, $postarr, $tr_post_id) {
|
| 2531 | - global $sitepress; |
|
| 2531 | + global $sitepress; |
|
| 2532 | 2532 | |
| 2533 | - $post_type = get_post_type($master_post_id); |
|
| 2533 | + $post_type = get_post_type($master_post_id); |
|
| 2534 | 2534 | |
| 2535 | - if (in_array($post_type, geodir_get_posttypes())) {
|
|
| 2536 | - // Duplicate post details |
|
| 2537 | - geodir_icl_duplicate_post_details($master_post_id, $tr_post_id, $lang); |
|
| 2535 | + if (in_array($post_type, geodir_get_posttypes())) {
|
|
| 2536 | + // Duplicate post details |
|
| 2537 | + geodir_icl_duplicate_post_details($master_post_id, $tr_post_id, $lang); |
|
| 2538 | 2538 | |
| 2539 | - // Duplicate taxonomies |
|
| 2540 | - geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang); |
|
| 2539 | + // Duplicate taxonomies |
|
| 2540 | + geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang); |
|
| 2541 | 2541 | |
| 2542 | - // Duplicate post images |
|
| 2543 | - geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang); |
|
| 2542 | + // Duplicate post images |
|
| 2543 | + geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang); |
|
| 2544 | 2544 | |
| 2545 | - // Sync post reviews |
|
| 2546 | - if ($sitepress->get_setting('sync_comments_on_duplicates')) {
|
|
| 2547 | - geodir_wpml_duplicate_post_reviews($master_post_id, $tr_post_id, $lang); |
|
| 2548 | - } |
|
| 2549 | - } |
|
| 2545 | + // Sync post reviews |
|
| 2546 | + if ($sitepress->get_setting('sync_comments_on_duplicates')) {
|
|
| 2547 | + geodir_wpml_duplicate_post_reviews($master_post_id, $tr_post_id, $lang); |
|
| 2548 | + } |
|
| 2549 | + } |
|
| 2550 | 2550 | } |
| 2551 | 2551 | add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 ); |
| 2552 | 2552 | |
@@ -2563,17 +2563,17 @@ discard block |
||
| 2563 | 2563 | * @return bool True for success, False for fail. |
| 2564 | 2564 | */ |
| 2565 | 2565 | function geodir_wpml_duplicate_post_reviews($master_post_id, $tr_post_id, $lang) {
|
| 2566 | - global $wpdb; |
|
| 2566 | + global $wpdb; |
|
| 2567 | 2567 | |
| 2568 | - $reviews = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id=%d ORDER BY id ASC", $master_post_id), ARRAY_A);
|
|
| 2568 | + $reviews = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id=%d ORDER BY id ASC", $master_post_id), ARRAY_A);
|
|
| 2569 | 2569 | |
| 2570 | - if (!empty($reviews)) {
|
|
| 2571 | - foreach ($reviews as $review) {
|
|
| 2572 | - geodir_wpml_duplicate_post_review($review['comment_id'], $master_post_id, $tr_post_id, $lang); |
|
| 2573 | - } |
|
| 2574 | - } |
|
| 2570 | + if (!empty($reviews)) {
|
|
| 2571 | + foreach ($reviews as $review) {
|
|
| 2572 | + geodir_wpml_duplicate_post_review($review['comment_id'], $master_post_id, $tr_post_id, $lang); |
|
| 2573 | + } |
|
| 2574 | + } |
|
| 2575 | 2575 | |
| 2576 | - return false; |
|
| 2576 | + return false; |
|
| 2577 | 2577 | } |
| 2578 | 2578 | |
| 2579 | 2579 | /** |
@@ -2590,23 +2590,23 @@ discard block |
||
| 2590 | 2590 | * @return bool True for success, False for fail. |
| 2591 | 2591 | */ |
| 2592 | 2592 | function geodir_icl_duplicate_post_details($master_post_id, $tr_post_id, $lang) {
|
| 2593 | - global $wpdb, $plugin_prefix; |
|
| 2593 | + global $wpdb, $plugin_prefix; |
|
| 2594 | 2594 | |
| 2595 | - $post_type = get_post_type($master_post_id); |
|
| 2596 | - $post_table = $plugin_prefix . $post_type . '_detail'; |
|
| 2595 | + $post_type = get_post_type($master_post_id); |
|
| 2596 | + $post_table = $plugin_prefix . $post_type . '_detail'; |
|
| 2597 | 2597 | |
| 2598 | - $query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));
|
|
| 2599 | - $data = (array)$wpdb->get_row($query); |
|
| 2598 | + $query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));
|
|
| 2599 | + $data = (array)$wpdb->get_row($query); |
|
| 2600 | 2600 | |
| 2601 | - if ( !empty( $data ) ) {
|
|
| 2602 | - $data['post_id'] = $tr_post_id; |
|
| 2603 | - unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']); |
|
| 2601 | + if ( !empty( $data ) ) {
|
|
| 2602 | + $data['post_id'] = $tr_post_id; |
|
| 2603 | + unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']); |
|
| 2604 | 2604 | |
| 2605 | - $wpdb->update($post_table, $data, array('post_id' => $tr_post_id));
|
|
| 2606 | - return true; |
|
| 2607 | - } |
|
| 2605 | + $wpdb->update($post_table, $data, array('post_id' => $tr_post_id));
|
|
| 2606 | + return true; |
|
| 2607 | + } |
|
| 2608 | 2608 | |
| 2609 | - return false; |
|
| 2609 | + return false; |
|
| 2610 | 2610 | } |
| 2611 | 2611 | |
| 2612 | 2612 | /** |
@@ -2623,40 +2623,40 @@ discard block |
||
| 2623 | 2623 | * @return bool True for success, False for fail. |
| 2624 | 2624 | */ |
| 2625 | 2625 | function geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang) {
|
| 2626 | - global $sitepress, $wpdb; |
|
| 2627 | - $post_type = get_post_type($master_post_id); |
|
| 2626 | + global $sitepress, $wpdb; |
|
| 2627 | + $post_type = get_post_type($master_post_id); |
|
| 2628 | 2628 | |
| 2629 | - remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language
|
|
| 2629 | + remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language
|
|
| 2630 | 2630 | |
| 2631 | - $taxonomies = get_object_taxonomies($post_type); |
|
| 2632 | - foreach ($taxonomies as $taxonomy) {
|
|
| 2633 | - $terms = get_the_terms($master_post_id, $taxonomy); |
|
| 2634 | - $terms_array = array(); |
|
| 2631 | + $taxonomies = get_object_taxonomies($post_type); |
|
| 2632 | + foreach ($taxonomies as $taxonomy) {
|
|
| 2633 | + $terms = get_the_terms($master_post_id, $taxonomy); |
|
| 2634 | + $terms_array = array(); |
|
| 2635 | 2635 | |
| 2636 | - if ($terms) {
|
|
| 2637 | - foreach ($terms as $term) {
|
|
| 2638 | - $tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang); |
|
| 2636 | + if ($terms) {
|
|
| 2637 | + foreach ($terms as $term) {
|
|
| 2638 | + $tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang); |
|
| 2639 | 2639 | |
| 2640 | - if (!is_null($tr_id)){
|
|
| 2641 | - // not using get_term - unfiltered get_term |
|
| 2642 | - $translated_term = $wpdb->get_row($wpdb->prepare("
|
|
| 2640 | + if (!is_null($tr_id)){
|
|
| 2641 | + // not using get_term - unfiltered get_term |
|
| 2642 | + $translated_term = $wpdb->get_row($wpdb->prepare("
|
|
| 2643 | 2643 | SELECT * FROM {$wpdb->terms} t JOIN {$wpdb->term_taxonomy} x ON x.term_id = t.term_id WHERE t.term_id = %d AND x.taxonomy = %s", $tr_id, $taxonomy));
|
| 2644 | 2644 | |
| 2645 | - $terms_array[] = $translated_term->term_id; |
|
| 2646 | - } |
|
| 2647 | - } |
|
| 2645 | + $terms_array[] = $translated_term->term_id; |
|
| 2646 | + } |
|
| 2647 | + } |
|
| 2648 | 2648 | |
| 2649 | - if (!is_taxonomy_hierarchical($taxonomy)){
|
|
| 2650 | - $terms_array = array_unique( array_map( 'intval', $terms_array ) ); |
|
| 2651 | - } |
|
| 2649 | + if (!is_taxonomy_hierarchical($taxonomy)){
|
|
| 2650 | + $terms_array = array_unique( array_map( 'intval', $terms_array ) ); |
|
| 2651 | + } |
|
| 2652 | 2652 | |
| 2653 | - wp_set_post_terms($tr_post_id, $terms_array, $taxonomy); |
|
| 2653 | + wp_set_post_terms($tr_post_id, $terms_array, $taxonomy); |
|
| 2654 | 2654 | |
| 2655 | - if ($taxonomy == $post_type . 'category') {
|
|
| 2656 | - geodir_set_postcat_structure($tr_post_id, $post_type . 'category'); |
|
| 2657 | - } |
|
| 2658 | - } |
|
| 2659 | - } |
|
| 2655 | + if ($taxonomy == $post_type . 'category') {
|
|
| 2656 | + geodir_set_postcat_structure($tr_post_id, $post_type . 'category'); |
|
| 2657 | + } |
|
| 2658 | + } |
|
| 2659 | + } |
|
| 2660 | 2660 | } |
| 2661 | 2661 | |
| 2662 | 2662 | /** |
@@ -2672,29 +2672,29 @@ discard block |
||
| 2672 | 2672 | * @return bool True for success, False for fail. |
| 2673 | 2673 | */ |
| 2674 | 2674 | function geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang) {
|
| 2675 | - global $wpdb; |
|
| 2675 | + global $wpdb; |
|
| 2676 | 2676 | |
| 2677 | - $query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));
|
|
| 2678 | - $wpdb->query($query); |
|
| 2677 | + $query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));
|
|
| 2678 | + $wpdb->query($query); |
|
| 2679 | 2679 | |
| 2680 | - $query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));
|
|
| 2681 | - $post_images = $wpdb->get_results($query); |
|
| 2680 | + $query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));
|
|
| 2681 | + $post_images = $wpdb->get_results($query); |
|
| 2682 | 2682 | |
| 2683 | - if ( !empty( $post_images ) ) {
|
|
| 2684 | - foreach ( $post_images as $post_image) {
|
|
| 2685 | - $image_data = (array)$post_image; |
|
| 2686 | - unset($image_data['ID']); |
|
| 2687 | - $image_data['post_id'] = $tr_post_id; |
|
| 2683 | + if ( !empty( $post_images ) ) {
|
|
| 2684 | + foreach ( $post_images as $post_image) {
|
|
| 2685 | + $image_data = (array)$post_image; |
|
| 2686 | + unset($image_data['ID']); |
|
| 2687 | + $image_data['post_id'] = $tr_post_id; |
|
| 2688 | 2688 | |
| 2689 | - $wpdb->insert(GEODIR_ATTACHMENT_TABLE, $image_data); |
|
| 2689 | + $wpdb->insert(GEODIR_ATTACHMENT_TABLE, $image_data); |
|
| 2690 | 2690 | |
| 2691 | - geodir_set_wp_featured_image($tr_post_id); |
|
| 2692 | - } |
|
| 2691 | + geodir_set_wp_featured_image($tr_post_id); |
|
| 2692 | + } |
|
| 2693 | 2693 | |
| 2694 | - return true; |
|
| 2695 | - } |
|
| 2694 | + return true; |
|
| 2695 | + } |
|
| 2696 | 2696 | |
| 2697 | - return false; |
|
| 2697 | + return false; |
|
| 2698 | 2698 | } |
| 2699 | 2699 | |
| 2700 | 2700 | |
@@ -2713,59 +2713,59 @@ discard block |
||
| 2713 | 2713 | * @return bool True for success, False for fail. |
| 2714 | 2714 | */ |
| 2715 | 2715 | function geodir_wpml_duplicate_post_review($master_comment_id, $master_post_id, $tr_post_id, $lang) {
|
| 2716 | - global $wpdb, $plugin_prefix; |
|
| 2717 | - |
|
| 2718 | - $review = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d ORDER BY id ASC", $master_comment_id), ARRAY_A);
|
|
| 2719 | - |
|
| 2720 | - if (empty($review)) {
|
|
| 2721 | - return false; |
|
| 2722 | - } |
|
| 2723 | - if ($review['post_id'] != $master_post_id) {
|
|
| 2724 | - $wpdb->query($wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET post_id=%d WHERE comment_id=%d", $master_post_id, $master_comment_id));
|
|
| 2725 | - geodir_update_postrating($master_post_id, $post_type); |
|
| 2726 | - } |
|
| 2727 | - |
|
| 2728 | - $tr_comment_id = geodir_wpml_duplicate_comment_exists($tr_post_id, $master_comment_id); |
|
| 2729 | - |
|
| 2730 | - if (empty($tr_comment_id)) {
|
|
| 2731 | - return false; |
|
| 2732 | - } |
|
| 2733 | - |
|
| 2734 | - $post_type = get_post_type($master_post_id); |
|
| 2735 | - $post_table = $plugin_prefix . $post_type . '_detail'; |
|
| 2736 | - |
|
| 2737 | - $translated_post = $wpdb->get_row($wpdb->prepare("SELECT post_title, post_latitude, post_longitude, post_city, post_region, post_country FROM " . $post_table . " WHERE post_id = %d", $tr_post_id), ARRAY_A);
|
|
| 2738 | - if (empty($translated_post)) {
|
|
| 2739 | - return false; |
|
| 2740 | - } |
|
| 2741 | - |
|
| 2742 | - $review['comment_id'] = $tr_comment_id; |
|
| 2743 | - $review['post_id'] = $tr_post_id; |
|
| 2744 | - $review['post_title'] = $translated_post['post_title']; |
|
| 2745 | - $review['post_city'] = $translated_post['post_city']; |
|
| 2746 | - $review['post_region'] = $translated_post['post_region']; |
|
| 2747 | - $review['post_country'] = $translated_post['post_country']; |
|
| 2748 | - $review['post_latitude'] = $translated_post['post_latitude']; |
|
| 2749 | - $review['post_longitude'] = $translated_post['post_longitude']; |
|
| 2750 | - |
|
| 2751 | - if (isset($review['id'])) {
|
|
| 2752 | - unset($review['id']); |
|
| 2753 | - } |
|
| 2754 | - |
|
| 2755 | - $tr_review_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d AND post_id=%d ORDER BY id ASC", $tr_comment_id, $tr_post_id));
|
|
| 2756 | - |
|
| 2757 | - if ($tr_review_id) { // update review
|
|
| 2758 | - $wpdb->update(GEODIR_REVIEW_TABLE, $review, array('id' => $$tr_review_id));
|
|
| 2759 | - } else { // insert review
|
|
| 2760 | - $wpdb->insert(GEODIR_REVIEW_TABLE, $review); |
|
| 2761 | - $tr_review_id = $wpdb->insert_id; |
|
| 2762 | - } |
|
| 2763 | - |
|
| 2764 | - if ($tr_post_id) {
|
|
| 2765 | - geodir_update_postrating($tr_post_id, $post_type); |
|
| 2766 | - } |
|
| 2767 | - |
|
| 2768 | - return $tr_review_id; |
|
| 2716 | + global $wpdb, $plugin_prefix; |
|
| 2717 | + |
|
| 2718 | + $review = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d ORDER BY id ASC", $master_comment_id), ARRAY_A);
|
|
| 2719 | + |
|
| 2720 | + if (empty($review)) {
|
|
| 2721 | + return false; |
|
| 2722 | + } |
|
| 2723 | + if ($review['post_id'] != $master_post_id) {
|
|
| 2724 | + $wpdb->query($wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET post_id=%d WHERE comment_id=%d", $master_post_id, $master_comment_id));
|
|
| 2725 | + geodir_update_postrating($master_post_id, $post_type); |
|
| 2726 | + } |
|
| 2727 | + |
|
| 2728 | + $tr_comment_id = geodir_wpml_duplicate_comment_exists($tr_post_id, $master_comment_id); |
|
| 2729 | + |
|
| 2730 | + if (empty($tr_comment_id)) {
|
|
| 2731 | + return false; |
|
| 2732 | + } |
|
| 2733 | + |
|
| 2734 | + $post_type = get_post_type($master_post_id); |
|
| 2735 | + $post_table = $plugin_prefix . $post_type . '_detail'; |
|
| 2736 | + |
|
| 2737 | + $translated_post = $wpdb->get_row($wpdb->prepare("SELECT post_title, post_latitude, post_longitude, post_city, post_region, post_country FROM " . $post_table . " WHERE post_id = %d", $tr_post_id), ARRAY_A);
|
|
| 2738 | + if (empty($translated_post)) {
|
|
| 2739 | + return false; |
|
| 2740 | + } |
|
| 2741 | + |
|
| 2742 | + $review['comment_id'] = $tr_comment_id; |
|
| 2743 | + $review['post_id'] = $tr_post_id; |
|
| 2744 | + $review['post_title'] = $translated_post['post_title']; |
|
| 2745 | + $review['post_city'] = $translated_post['post_city']; |
|
| 2746 | + $review['post_region'] = $translated_post['post_region']; |
|
| 2747 | + $review['post_country'] = $translated_post['post_country']; |
|
| 2748 | + $review['post_latitude'] = $translated_post['post_latitude']; |
|
| 2749 | + $review['post_longitude'] = $translated_post['post_longitude']; |
|
| 2750 | + |
|
| 2751 | + if (isset($review['id'])) {
|
|
| 2752 | + unset($review['id']); |
|
| 2753 | + } |
|
| 2754 | + |
|
| 2755 | + $tr_review_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d AND post_id=%d ORDER BY id ASC", $tr_comment_id, $tr_post_id));
|
|
| 2756 | + |
|
| 2757 | + if ($tr_review_id) { // update review
|
|
| 2758 | + $wpdb->update(GEODIR_REVIEW_TABLE, $review, array('id' => $$tr_review_id));
|
|
| 2759 | + } else { // insert review
|
|
| 2760 | + $wpdb->insert(GEODIR_REVIEW_TABLE, $review); |
|
| 2761 | + $tr_review_id = $wpdb->insert_id; |
|
| 2762 | + } |
|
| 2763 | + |
|
| 2764 | + if ($tr_post_id) {
|
|
| 2765 | + geodir_update_postrating($tr_post_id, $post_type); |
|
| 2766 | + } |
|
| 2767 | + |
|
| 2768 | + return $tr_review_id; |
|
| 2769 | 2769 | } |
| 2770 | 2770 | |
| 2771 | 2771 | /** |
@@ -2780,36 +2780,36 @@ discard block |
||
| 2780 | 2780 | * @param int $comment_id The Comment ID. |
| 2781 | 2781 | */ |
| 2782 | 2782 | function gepdir_wpml_sync_comment($comment_id) {
|
| 2783 | - global $wpdb, $sitepress, $gd_wpml_posttypes; |
|
| 2784 | - |
|
| 2785 | - if (empty($gd_post_types)) {
|
|
| 2786 | - $gd_wpml_posttypes = geodir_get_posttypes(); |
|
| 2787 | - } |
|
| 2788 | - |
|
| 2789 | - $comment = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->comments} WHERE comment_ID=%d", $comment_id), ARRAY_A);
|
|
| 2790 | - if (empty($comment)) {
|
|
| 2791 | - return; |
|
| 2792 | - } |
|
| 2793 | - |
|
| 2794 | - $post_id = $comment['comment_post_ID']; |
|
| 2795 | - $post_type = $post_id ? get_post_type($post_id) : NULL; |
|
| 2796 | - |
|
| 2797 | - if (!($post_type && in_array($post_type, $gd_wpml_posttypes))) {
|
|
| 2798 | - return; |
|
| 2799 | - } |
|
| 2800 | - |
|
| 2801 | - $post_duplicates = $sitepress->get_duplicates($post_id); |
|
| 2802 | - if (empty($post_duplicates)) {
|
|
| 2803 | - return; |
|
| 2804 | - } |
|
| 2805 | - |
|
| 2806 | - foreach ($post_duplicates as $lang => $dup_post_id) {
|
|
| 2807 | - if (empty($comment['comment_parent'])) {
|
|
| 2808 | - geodir_wpml_duplicate_post_review($comment_id, $post_id, $dup_post_id, $lang); |
|
| 2809 | - } |
|
| 2810 | - } |
|
| 2783 | + global $wpdb, $sitepress, $gd_wpml_posttypes; |
|
| 2784 | + |
|
| 2785 | + if (empty($gd_post_types)) {
|
|
| 2786 | + $gd_wpml_posttypes = geodir_get_posttypes(); |
|
| 2787 | + } |
|
| 2788 | + |
|
| 2789 | + $comment = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->comments} WHERE comment_ID=%d", $comment_id), ARRAY_A);
|
|
| 2790 | + if (empty($comment)) {
|
|
| 2791 | + return; |
|
| 2792 | + } |
|
| 2793 | + |
|
| 2794 | + $post_id = $comment['comment_post_ID']; |
|
| 2795 | + $post_type = $post_id ? get_post_type($post_id) : NULL; |
|
| 2796 | + |
|
| 2797 | + if (!($post_type && in_array($post_type, $gd_wpml_posttypes))) {
|
|
| 2798 | + return; |
|
| 2799 | + } |
|
| 2800 | + |
|
| 2801 | + $post_duplicates = $sitepress->get_duplicates($post_id); |
|
| 2802 | + if (empty($post_duplicates)) {
|
|
| 2803 | + return; |
|
| 2804 | + } |
|
| 2805 | + |
|
| 2806 | + foreach ($post_duplicates as $lang => $dup_post_id) {
|
|
| 2807 | + if (empty($comment['comment_parent'])) {
|
|
| 2808 | + geodir_wpml_duplicate_post_review($comment_id, $post_id, $dup_post_id, $lang); |
|
| 2809 | + } |
|
| 2810 | + } |
|
| 2811 | 2811 | |
| 2812 | - return true; |
|
| 2812 | + return true; |
|
| 2813 | 2813 | } |
| 2814 | 2814 | |
| 2815 | 2815 | /** |
@@ -2824,11 +2824,11 @@ discard block |
||
| 2824 | 2824 | * @return int The duplicate comment ID. |
| 2825 | 2825 | */ |
| 2826 | 2826 | function geodir_wpml_duplicate_comment_exists($dup_post_id, $original_cid) {
|
| 2827 | - global $wpdb; |
|
| 2827 | + global $wpdb; |
|
| 2828 | 2828 | |
| 2829 | - $duplicate = $wpdb->get_var( |
|
| 2830 | - $wpdb->prepare( |
|
| 2831 | - " SELECT comm.comment_ID |
|
| 2829 | + $duplicate = $wpdb->get_var( |
|
| 2830 | + $wpdb->prepare( |
|
| 2831 | + " SELECT comm.comment_ID |
|
| 2832 | 2832 | FROM {$wpdb->comments} comm
|
| 2833 | 2833 | JOIN {$wpdb->commentmeta} cm
|
| 2834 | 2834 | ON comm.comment_ID = cm.comment_id |
@@ -2836,10 +2836,10 @@ discard block |
||
| 2836 | 2836 | AND cm.meta_key = '_icl_duplicate_of' |
| 2837 | 2837 | AND cm.meta_value = %d |
| 2838 | 2838 | LIMIT 1", |
| 2839 | - $dup_post_id, |
|
| 2840 | - $original_cid |
|
| 2841 | - ) |
|
| 2842 | - ); |
|
| 2839 | + $dup_post_id, |
|
| 2840 | + $original_cid |
|
| 2841 | + ) |
|
| 2842 | + ); |
|
| 2843 | 2843 | |
| 2844 | - return $duplicate; |
|
| 2844 | + return $duplicate; |
|
| 2845 | 2845 | } |
| 2846 | 2846 | \ No newline at end of file |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | function geodir_get_ajax_url() |
| 21 | 21 | {
|
| 22 | - return admin_url('admin-ajax.php?action=geodir_ajax_action');
|
|
| 22 | + return admin_url('admin-ajax.php?action=geodir_ajax_action');
|
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | ///////////////////// |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | add_filter('query_vars', 'geodir_add_geodir_page_var');
|
| 88 | 88 | add_action('wp', 'geodir_add_page_id_in_query_var'); // problem fix in wordpress 3.8
|
| 89 | 89 | if (get_option('permalink_structure') != '')
|
| 90 | - add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
|
|
| 90 | + add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
|
|
| 91 | 91 | |
| 92 | 92 | add_filter('parse_query', 'geodir_modified_query');
|
| 93 | 93 | |
@@ -154,14 +154,14 @@ discard block |
||
| 154 | 154 | /* POST AND LOOP ACTIONS */ |
| 155 | 155 | //////////////////////// |
| 156 | 156 | if (!is_admin()) {
|
| 157 | - add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtural page from everywhere
|
|
| 158 | - add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);
|
|
| 159 | - /** Exclude Virtual Pages From Pages List **/ |
|
| 160 | - add_action('pre_get_posts', 'set_listing_request', 0);
|
|
| 161 | - add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);
|
|
| 162 | - add_filter('excerpt_more', 'geodir_excerpt_more', 1000);
|
|
| 163 | - add_filter('excerpt_length', 'geodir_excerpt_length', 1000);
|
|
| 164 | - add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter
|
|
| 157 | + add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtural page from everywhere
|
|
| 158 | + add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);
|
|
| 159 | + /** Exclude Virtual Pages From Pages List **/ |
|
| 160 | + add_action('pre_get_posts', 'set_listing_request', 0);
|
|
| 161 | + add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);
|
|
| 162 | + add_filter('excerpt_more', 'geodir_excerpt_more', 1000);
|
|
| 163 | + add_filter('excerpt_length', 'geodir_excerpt_length', 1000);
|
|
| 164 | + add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter
|
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | |
@@ -222,12 +222,12 @@ discard block |
||
| 222 | 222 | */ |
| 223 | 223 | function geodir_unset_prev_theme_nav_location($newname) |
| 224 | 224 | {
|
| 225 | - $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);
|
|
| 226 | - if ($geodir_theme_location) {
|
|
| 227 | - update_option('geodir_theme_location_nav', $geodir_theme_location);
|
|
| 228 | - } else {
|
|
| 229 | - update_option('geodir_theme_location_nav', '');
|
|
| 230 | - } |
|
| 225 | + $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);
|
|
| 226 | + if ($geodir_theme_location) {
|
|
| 227 | + update_option('geodir_theme_location_nav', $geodir_theme_location);
|
|
| 228 | + } else {
|
|
| 229 | + update_option('geodir_theme_location_nav', '');
|
|
| 230 | + } |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | /// add action for theme switch to blank previous theme navigation location setting |
@@ -248,32 +248,32 @@ discard block |
||
| 248 | 248 | */ |
| 249 | 249 | function geodir_add_post_filters() |
| 250 | 250 | {
|
| 251 | - /** |
|
| 252 | - * Contains all function for filtering listing. |
|
| 253 | - * |
|
| 254 | - * @since 1.0.0 |
|
| 255 | - * @package GeoDirectory |
|
| 256 | - */ |
|
| 257 | - include_once('geodirectory-functions/listing_filters.php');
|
|
| 251 | + /** |
|
| 252 | + * Contains all function for filtering listing. |
|
| 253 | + * |
|
| 254 | + * @since 1.0.0 |
|
| 255 | + * @package GeoDirectory |
|
| 256 | + */ |
|
| 257 | + include_once('geodirectory-functions/listing_filters.php');
|
|
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | |
| 261 | 261 | if (!function_exists('geodir_init_defaults')) {
|
| 262 | - /** |
|
| 263 | - * Calls the function to register the GeoDirectory default CPT and taxonomies. |
|
| 264 | - * |
|
| 265 | - * @since 1.0.0 |
|
| 266 | - * @package GeoDirectory |
|
| 267 | - */ |
|
| 268 | - function geodir_init_defaults() |
|
| 269 | - {
|
|
| 270 | - if (function_exists('geodir_register_defaults')) {
|
|
| 262 | + /** |
|
| 263 | + * Calls the function to register the GeoDirectory default CPT and taxonomies. |
|
| 264 | + * |
|
| 265 | + * @since 1.0.0 |
|
| 266 | + * @package GeoDirectory |
|
| 267 | + */ |
|
| 268 | + function geodir_init_defaults() |
|
| 269 | + {
|
|
| 270 | + if (function_exists('geodir_register_defaults')) {
|
|
| 271 | 271 | |
| 272 | - geodir_register_defaults(); |
|
| 272 | + geodir_register_defaults(); |
|
| 273 | 273 | |
| 274 | - } |
|
| 274 | + } |
|
| 275 | 275 | |
| 276 | - } |
|
| 276 | + } |
|
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | |
@@ -295,26 +295,26 @@ discard block |
||
| 295 | 295 | // CALLED ON 'sidebars_widgets' FILTER |
| 296 | 296 | |
| 297 | 297 | if (!function_exists('geodir_restrict_widget')) {
|
| 298 | - /** |
|
| 299 | - * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page. |
|
| 300 | - * |
|
| 301 | - * @global bool $is_listing Sets the global value to true if on a GD category page. False if not. |
|
| 302 | - * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not. |
|
| 303 | - * @since 1.0.0 |
|
| 304 | - * @package GeoDirectory |
|
| 305 | - */ |
|
| 306 | - function geodir_restrict_widget() |
|
| 307 | - {
|
|
| 308 | - global $is_listing, $is_single_place; |
|
| 298 | + /** |
|
| 299 | + * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page. |
|
| 300 | + * |
|
| 301 | + * @global bool $is_listing Sets the global value to true if on a GD category page. False if not. |
|
| 302 | + * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not. |
|
| 303 | + * @since 1.0.0 |
|
| 304 | + * @package GeoDirectory |
|
| 305 | + */ |
|
| 306 | + function geodir_restrict_widget() |
|
| 307 | + {
|
|
| 308 | + global $is_listing, $is_single_place; |
|
| 309 | 309 | |
| 310 | - // set is listing |
|
| 311 | - (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;
|
|
| 310 | + // set is listing |
|
| 311 | + (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;
|
|
| 312 | 312 | |
| 313 | - // set is single place |
|
| 314 | - (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;
|
|
| 313 | + // set is single place |
|
| 314 | + (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;
|
|
| 315 | 315 | |
| 316 | 316 | |
| 317 | - } |
|
| 317 | + } |
|
| 318 | 318 | } |
| 319 | 319 | |
| 320 | 320 | |
@@ -335,31 +335,31 @@ discard block |
||
| 335 | 335 | */ |
| 336 | 336 | function geodir_detail_page_sidebar_content_sorting() |
| 337 | 337 | {
|
| 338 | - $arr_detail_page_sidebar_content = |
|
| 339 | - /** |
|
| 340 | - * An array of functions to be called to be displayed on the details (post) page sidebar. |
|
| 341 | - * |
|
| 342 | - * This filter can be used to remove sections of the details page sidebar, |
|
| 343 | - * add new sections or rearrange the order of the sections. |
|
| 344 | - * |
|
| 345 | - * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.
|
|
| 346 | - * @since 1.0.0 |
|
| 347 | - */ |
|
| 348 | - apply_filters('geodir_detail_page_sidebar_content',
|
|
| 349 | - array('geodir_social_sharing_buttons',
|
|
| 350 | - 'geodir_detail_page_google_analytics', |
|
| 351 | - 'geodir_edit_post_link', |
|
| 352 | - 'geodir_detail_page_review_rating', |
|
| 353 | - 'geodir_detail_page_more_info' |
|
| 354 | - ) // end of array |
|
| 355 | - ); // end of apply filter |
|
| 356 | - if (!empty($arr_detail_page_sidebar_content)) {
|
|
| 357 | - foreach ($arr_detail_page_sidebar_content as $content_function) {
|
|
| 358 | - if (function_exists($content_function)) {
|
|
| 359 | - add_action('geodir_detail_page_sidebar', $content_function);
|
|
| 360 | - } |
|
| 361 | - } |
|
| 362 | - } |
|
| 338 | + $arr_detail_page_sidebar_content = |
|
| 339 | + /** |
|
| 340 | + * An array of functions to be called to be displayed on the details (post) page sidebar. |
|
| 341 | + * |
|
| 342 | + * This filter can be used to remove sections of the details page sidebar, |
|
| 343 | + * add new sections or rearrange the order of the sections. |
|
| 344 | + * |
|
| 345 | + * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.
|
|
| 346 | + * @since 1.0.0 |
|
| 347 | + */ |
|
| 348 | + apply_filters('geodir_detail_page_sidebar_content',
|
|
| 349 | + array('geodir_social_sharing_buttons',
|
|
| 350 | + 'geodir_detail_page_google_analytics', |
|
| 351 | + 'geodir_edit_post_link', |
|
| 352 | + 'geodir_detail_page_review_rating', |
|
| 353 | + 'geodir_detail_page_more_info' |
|
| 354 | + ) // end of array |
|
| 355 | + ); // end of apply filter |
|
| 356 | + if (!empty($arr_detail_page_sidebar_content)) {
|
|
| 357 | + foreach ($arr_detail_page_sidebar_content as $content_function) {
|
|
| 358 | + if (function_exists($content_function)) {
|
|
| 359 | + add_action('geodir_detail_page_sidebar', $content_function);
|
|
| 360 | + } |
|
| 361 | + } |
|
| 362 | + } |
|
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | add_action('geodir_after_edit_post_link', 'geodir_add_to_favourite_link', 1);
|
@@ -374,14 +374,14 @@ discard block |
||
| 374 | 374 | */ |
| 375 | 375 | function geodir_add_to_favourite_link() |
| 376 | 376 | {
|
| 377 | - global $post, $preview; |
|
| 378 | - if (!$preview && geodir_is_page('detail')) {
|
|
| 379 | - ?> |
|
| 377 | + global $post, $preview; |
|
| 378 | + if (!$preview && geodir_is_page('detail')) {
|
|
| 379 | + ?> |
|
| 380 | 380 | <p class="edit_link"> |
| 381 | 381 | <?php geodir_favourite_html($post->post_author, $post->ID); ?> |
| 382 | 382 | </p> |
| 383 | 383 | <?php |
| 384 | - } |
|
| 384 | + } |
|
| 385 | 385 | } |
| 386 | 386 | |
| 387 | 387 | /** |
@@ -395,41 +395,41 @@ discard block |
||
| 395 | 395 | */ |
| 396 | 396 | function geodir_social_sharing_buttons() |
| 397 | 397 | {
|
| 398 | - global $preview; |
|
| 399 | - ob_start(); // Start buffering; |
|
| 400 | - /** |
|
| 401 | - * This action is called before the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 402 | - * |
|
| 403 | - * @since 1.0.0 |
|
| 404 | - */ |
|
| 405 | - do_action('geodir_before_social_sharing_buttons');
|
|
| 406 | - if (!$preview) {
|
|
| 407 | - ?> |
|
| 398 | + global $preview; |
|
| 399 | + ob_start(); // Start buffering; |
|
| 400 | + /** |
|
| 401 | + * This action is called before the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 402 | + * |
|
| 403 | + * @since 1.0.0 |
|
| 404 | + */ |
|
| 405 | + do_action('geodir_before_social_sharing_buttons');
|
|
| 406 | + if (!$preview) {
|
|
| 407 | + ?> |
|
| 408 | 408 | <div class="likethis"> |
| 409 | 409 | <?php geodir_twitter_tweet_button(); ?> |
| 410 | 410 | <?php geodir_fb_like_button(); ?> |
| 411 | 411 | <?php geodir_google_plus_button(); ?> |
| 412 | 412 | </div> |
| 413 | 413 | <?php |
| 414 | - }// end of if, if its a preview or not |
|
| 415 | - |
|
| 416 | - /** |
|
| 417 | - * This action is called after the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 418 | - * |
|
| 419 | - * @since 1.0.0 |
|
| 420 | - */ |
|
| 421 | - do_action('geodir_after_social_sharing_buttons');
|
|
| 422 | - $content_html = ob_get_clean(); |
|
| 423 | - if (trim($content_html) != '') |
|
| 424 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 425 | - if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
| 426 | - /** |
|
| 427 | - * Filter the geodir_social_sharing_buttons() function content. |
|
| 428 | - * |
|
| 429 | - * @param string $content_html The output html of the geodir_social_sharing_buttons() function. |
|
| 430 | - */ |
|
| 431 | - echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);
|
|
| 432 | - } |
|
| 414 | + }// end of if, if its a preview or not |
|
| 415 | + |
|
| 416 | + /** |
|
| 417 | + * This action is called after the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 418 | + * |
|
| 419 | + * @since 1.0.0 |
|
| 420 | + */ |
|
| 421 | + do_action('geodir_after_social_sharing_buttons');
|
|
| 422 | + $content_html = ob_get_clean(); |
|
| 423 | + if (trim($content_html) != '') |
|
| 424 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 425 | + if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
| 426 | + /** |
|
| 427 | + * Filter the geodir_social_sharing_buttons() function content. |
|
| 428 | + * |
|
| 429 | + * @param string $content_html The output html of the geodir_social_sharing_buttons() function. |
|
| 430 | + */ |
|
| 431 | + echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);
|
|
| 432 | + } |
|
| 433 | 433 | |
| 434 | 434 | |
| 435 | 435 | } |
@@ -447,46 +447,46 @@ discard block |
||
| 447 | 447 | */ |
| 448 | 448 | function geodir_edit_post_link() |
| 449 | 449 | {
|
| 450 | - global $post, $preview; |
|
| 451 | - ob_start(); // Start buffering; |
|
| 452 | - /** |
|
| 453 | - * This is called before the edit post link html in the function geodir_edit_post_link() |
|
| 454 | - * |
|
| 455 | - * @since 1.0.0 |
|
| 456 | - */ |
|
| 457 | - do_action('geodir_before_edit_post_link');
|
|
| 458 | - if (!$preview) {
|
|
| 459 | - $is_current_user_owner = geodir_listing_belong_to_current_user(); |
|
| 450 | + global $post, $preview; |
|
| 451 | + ob_start(); // Start buffering; |
|
| 452 | + /** |
|
| 453 | + * This is called before the edit post link html in the function geodir_edit_post_link() |
|
| 454 | + * |
|
| 455 | + * @since 1.0.0 |
|
| 456 | + */ |
|
| 457 | + do_action('geodir_before_edit_post_link');
|
|
| 458 | + if (!$preview) {
|
|
| 459 | + $is_current_user_owner = geodir_listing_belong_to_current_user(); |
|
| 460 | 460 | |
| 461 | - if ($is_current_user_owner) {
|
|
| 462 | - $post_id = $post->ID; |
|
| 461 | + if ($is_current_user_owner) {
|
|
| 462 | + $post_id = $post->ID; |
|
| 463 | 463 | |
| 464 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 465 | - $post_id = (int)$_REQUEST['pid']; |
|
| 466 | - } |
|
| 464 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 465 | + $post_id = (int)$_REQUEST['pid']; |
|
| 466 | + } |
|
| 467 | 467 | |
| 468 | - $postlink = get_permalink(geodir_add_listing_page_id()); |
|
| 469 | - $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);
|
|
| 470 | - echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';
|
|
| 471 | - } |
|
| 472 | - }// end of if, if its a preview or not |
|
| 473 | - /** |
|
| 474 | - * This is called after the edit post link html in the function geodir_edit_post_link() |
|
| 475 | - * |
|
| 476 | - * @since 1.0.0 |
|
| 477 | - */ |
|
| 478 | - do_action('geodir_after_edit_post_link');
|
|
| 479 | - $content_html = ob_get_clean(); |
|
| 480 | - if (trim($content_html) != '') |
|
| 481 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 482 | - if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
|
| 483 | - /** |
|
| 484 | - * Filter the geodir_edit_post_link() function content. |
|
| 485 | - * |
|
| 486 | - * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 487 | - */ |
|
| 488 | - echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);
|
|
| 489 | - } |
|
| 468 | + $postlink = get_permalink(geodir_add_listing_page_id()); |
|
| 469 | + $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);
|
|
| 470 | + echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';
|
|
| 471 | + } |
|
| 472 | + }// end of if, if its a preview or not |
|
| 473 | + /** |
|
| 474 | + * This is called after the edit post link html in the function geodir_edit_post_link() |
|
| 475 | + * |
|
| 476 | + * @since 1.0.0 |
|
| 477 | + */ |
|
| 478 | + do_action('geodir_after_edit_post_link');
|
|
| 479 | + $content_html = ob_get_clean(); |
|
| 480 | + if (trim($content_html) != '') |
|
| 481 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 482 | + if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
|
| 483 | + /** |
|
| 484 | + * Filter the geodir_edit_post_link() function content. |
|
| 485 | + * |
|
| 486 | + * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 487 | + */ |
|
| 488 | + echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);
|
|
| 489 | + } |
|
| 490 | 490 | } |
| 491 | 491 | |
| 492 | 492 | /** |
@@ -500,42 +500,42 @@ discard block |
||
| 500 | 500 | */ |
| 501 | 501 | function geodir_detail_page_google_analytics() |
| 502 | 502 | {
|
| 503 | - global $post,$preview; |
|
| 504 | - if($preview){return '';}
|
|
| 505 | - $package_info = array(); |
|
| 506 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 503 | + global $post,$preview; |
|
| 504 | + if($preview){return '';}
|
|
| 505 | + $package_info = array(); |
|
| 506 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 507 | 507 | |
| 508 | - $id = trim(get_option('geodir_ga_account_id'));
|
|
| 508 | + $id = trim(get_option('geodir_ga_account_id'));
|
|
| 509 | 509 | |
| 510 | - if (!$id) {
|
|
| 511 | - return; //if no Google Analytics ID then bail. |
|
| 512 | - } |
|
| 510 | + if (!$id) {
|
|
| 511 | + return; //if no Google Analytics ID then bail. |
|
| 512 | + } |
|
| 513 | 513 | |
| 514 | - ob_start(); // Start buffering; |
|
| 515 | - /** |
|
| 516 | - * This is called before the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 517 | - * |
|
| 518 | - * @since 1.0.0 |
|
| 519 | - */ |
|
| 520 | - do_action('geodir_before_google_analytics');
|
|
| 514 | + ob_start(); // Start buffering; |
|
| 515 | + /** |
|
| 516 | + * This is called before the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 517 | + * |
|
| 518 | + * @since 1.0.0 |
|
| 519 | + */ |
|
| 520 | + do_action('geodir_before_google_analytics');
|
|
| 521 | 521 | |
| 522 | - $refresh_time = get_option('geodir_ga_refresh_time', 5);
|
|
| 523 | - /** |
|
| 524 | - * Filter the time interval to check & refresh new users results. |
|
| 525 | - * |
|
| 526 | - * @since 1.5.9 |
|
| 527 | - * |
|
| 528 | - * @param int $refresh_time Time interval to check & refresh new users results. |
|
| 529 | - */ |
|
| 530 | - $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);
|
|
| 531 | - $refresh_time = absint($refresh_time * 1000); |
|
| 522 | + $refresh_time = get_option('geodir_ga_refresh_time', 5);
|
|
| 523 | + /** |
|
| 524 | + * Filter the time interval to check & refresh new users results. |
|
| 525 | + * |
|
| 526 | + * @since 1.5.9 |
|
| 527 | + * |
|
| 528 | + * @param int $refresh_time Time interval to check & refresh new users results. |
|
| 529 | + */ |
|
| 530 | + $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);
|
|
| 531 | + $refresh_time = absint($refresh_time * 1000); |
|
| 532 | 532 | |
| 533 | - $hide_refresh = get_option('geodir_ga_auto_refresh');
|
|
| 533 | + $hide_refresh = get_option('geodir_ga_auto_refresh');
|
|
| 534 | 534 | |
| 535 | - $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0; |
|
| 536 | - if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {
|
|
| 537 | - $page_url = urlencode($_SERVER['REQUEST_URI']); |
|
| 538 | - ?> |
|
| 535 | + $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0; |
|
| 536 | + if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {
|
|
| 537 | + $page_url = urlencode($_SERVER['REQUEST_URI']); |
|
| 538 | + ?> |
|
| 539 | 539 | <script type="text/javascript"> |
| 540 | 540 | var gd_gaTimeOut; |
| 541 | 541 | var gd_gaTime = parseInt('<?php echo $refresh_time;?>');
|
@@ -787,15 +787,15 @@ discard block |
||
| 787 | 787 | var labels = results[1].rows.map(function(row) { return +row[0]; });
|
| 788 | 788 | |
| 789 | 789 | <?php |
| 790 | - // Here we list the shorthand days of the week so it can be used in translation. |
|
| 791 | - __("Mon",'geodirectory');
|
|
| 792 | - __("Tue",'geodirectory');
|
|
| 793 | - __("Wed",'geodirectory');
|
|
| 794 | - __("Thu",'geodirectory');
|
|
| 795 | - __("Fri",'geodirectory');
|
|
| 796 | - __("Sat",'geodirectory');
|
|
| 797 | - __("Sun",'geodirectory');
|
|
| 798 | - ?> |
|
| 790 | + // Here we list the shorthand days of the week so it can be used in translation. |
|
| 791 | + __("Mon",'geodirectory');
|
|
| 792 | + __("Tue",'geodirectory');
|
|
| 793 | + __("Wed",'geodirectory');
|
|
| 794 | + __("Thu",'geodirectory');
|
|
| 795 | + __("Fri",'geodirectory');
|
|
| 796 | + __("Sat",'geodirectory');
|
|
| 797 | + __("Sun",'geodirectory');
|
|
| 798 | + ?> |
|
| 799 | 799 | |
| 800 | 800 | labels = [ |
| 801 | 801 | "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",
|
@@ -1044,24 +1044,24 @@ discard block |
||
| 1044 | 1044 | </span> |
| 1045 | 1045 | |
| 1046 | 1046 | <?php |
| 1047 | - } |
|
| 1048 | - /** |
|
| 1049 | - * This is called after the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 1050 | - * |
|
| 1051 | - * @since 1.0.0 |
|
| 1052 | - */ |
|
| 1053 | - do_action('geodir_after_google_analytics');
|
|
| 1054 | - $content_html = ob_get_clean(); |
|
| 1055 | - if (trim($content_html) != '') |
|
| 1056 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1057 | - if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
|
| 1058 | - /** |
|
| 1059 | - * Filter the geodir_edit_post_link() function content. |
|
| 1060 | - * |
|
| 1061 | - * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 1062 | - */ |
|
| 1063 | - echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);
|
|
| 1064 | - } |
|
| 1047 | + } |
|
| 1048 | + /** |
|
| 1049 | + * This is called after the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 1050 | + * |
|
| 1051 | + * @since 1.0.0 |
|
| 1052 | + */ |
|
| 1053 | + do_action('geodir_after_google_analytics');
|
|
| 1054 | + $content_html = ob_get_clean(); |
|
| 1055 | + if (trim($content_html) != '') |
|
| 1056 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1057 | + if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
|
| 1058 | + /** |
|
| 1059 | + * Filter the geodir_edit_post_link() function content. |
|
| 1060 | + * |
|
| 1061 | + * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 1062 | + */ |
|
| 1063 | + echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);
|
|
| 1064 | + } |
|
| 1065 | 1065 | } |
| 1066 | 1066 | |
| 1067 | 1067 | /** |
@@ -1077,90 +1077,90 @@ discard block |
||
| 1077 | 1077 | */ |
| 1078 | 1078 | function geodir_detail_page_review_rating() |
| 1079 | 1079 | {
|
| 1080 | - global $post, $preview, $post_images; |
|
| 1081 | - ob_start(); // Start buffering; |
|
| 1082 | - /** |
|
| 1083 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1084 | - * |
|
| 1085 | - * This is called outside the check for an actual rating and the check for preview page. |
|
| 1086 | - * |
|
| 1087 | - * @since 1.0.0 |
|
| 1088 | - */ |
|
| 1089 | - do_action('geodir_before_detail_page_review_rating');
|
|
| 1090 | - |
|
| 1091 | - $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1092 | - $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1093 | - |
|
| 1094 | - if ($post_avgratings != 0 && !$preview) {
|
|
| 1095 | - /** |
|
| 1096 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1097 | - * |
|
| 1098 | - * This is called inside the check for an actual rating and the check for preview page. |
|
| 1099 | - * |
|
| 1100 | - * @since 1.0.0 |
|
| 1101 | - * @param float $post_avgratings Average rating for the surrent post. |
|
| 1102 | - * @param int $post->ID Current post ID. |
|
| 1103 | - */ |
|
| 1104 | - do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1105 | - |
|
| 1106 | - $html = '<p style=" float:left;">'; |
|
| 1107 | - $html .= geodir_get_rating_stars($post_avgratings, $post->ID); |
|
| 1108 | - $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">'; |
|
| 1109 | - $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings; |
|
| 1080 | + global $post, $preview, $post_images; |
|
| 1081 | + ob_start(); // Start buffering; |
|
| 1082 | + /** |
|
| 1083 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1084 | + * |
|
| 1085 | + * This is called outside the check for an actual rating and the check for preview page. |
|
| 1086 | + * |
|
| 1087 | + * @since 1.0.0 |
|
| 1088 | + */ |
|
| 1089 | + do_action('geodir_before_detail_page_review_rating');
|
|
| 1090 | + |
|
| 1091 | + $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1092 | + $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1093 | + |
|
| 1094 | + if ($post_avgratings != 0 && !$preview) {
|
|
| 1095 | + /** |
|
| 1096 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1097 | + * |
|
| 1098 | + * This is called inside the check for an actual rating and the check for preview page. |
|
| 1099 | + * |
|
| 1100 | + * @since 1.0.0 |
|
| 1101 | + * @param float $post_avgratings Average rating for the surrent post. |
|
| 1102 | + * @param int $post->ID Current post ID. |
|
| 1103 | + */ |
|
| 1104 | + do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1105 | + |
|
| 1106 | + $html = '<p style=" float:left;">'; |
|
| 1107 | + $html .= geodir_get_rating_stars($post_avgratings, $post->ID); |
|
| 1108 | + $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">'; |
|
| 1109 | + $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings; |
|
| 1110 | 1110 | |
| 1111 | 1111 | $reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');
|
| 1112 | 1112 | |
| 1113 | 1113 | $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';
|
| 1114 | 1114 | |
| 1115 | - $html .= '<span class="item">'; |
|
| 1116 | - $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>'; |
|
| 1115 | + $html .= '<span class="item">'; |
|
| 1116 | + $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>'; |
|
| 1117 | 1117 | |
| 1118 | - if ($post_images) {
|
|
| 1119 | - foreach ($post_images as $img) {
|
|
| 1120 | - $post_img = $img->src; |
|
| 1121 | - break; |
|
| 1122 | - } |
|
| 1123 | - } |
|
| 1124 | - |
|
| 1125 | - if (isset($post_img) && $post_img) {
|
|
| 1126 | - $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />'; |
|
| 1127 | - } |
|
| 1128 | - |
|
| 1129 | - $html .= '</span>'; |
|
| 1130 | - |
|
| 1131 | - echo $html .= '</div>'; |
|
| 1132 | - /** |
|
| 1133 | - * This is called after the rating html in the function geodir_detail_page_review_rating(). |
|
| 1134 | - * |
|
| 1135 | - * This is called inside the check for an actual rating and the check for preview page. |
|
| 1136 | - * |
|
| 1137 | - * @since 1.0.0 |
|
| 1138 | - * @param float $post_avgratings Average rating for the surrent post. |
|
| 1139 | - * @param int $post->ID Current post ID. |
|
| 1140 | - */ |
|
| 1141 | - do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1142 | - } |
|
| 1143 | - /** |
|
| 1144 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1145 | - * |
|
| 1146 | - * This is called outside the check for an actual rating and the check for preview page. |
|
| 1147 | - * |
|
| 1148 | - * @since 1.0.0 |
|
| 1149 | - */ |
|
| 1150 | - do_action('geodir_after_detail_page_review_rating');
|
|
| 1151 | - $content_html = ob_get_clean(); |
|
| 1152 | - if (trim($content_html) != '') {
|
|
| 1153 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>'; |
|
| 1154 | - } |
|
| 1155 | - if ((int)get_option('geodir_disable_rating_info_section') != 1) {
|
|
| 1156 | - /** |
|
| 1157 | - * Filter the geodir_detail_page_review_rating() function content. |
|
| 1158 | - * |
|
| 1159 | - * @since 1.0.0 |
|
| 1160 | - * @param string $content_html The output html of the geodir_detail_page_review_rating() function. |
|
| 1161 | - */ |
|
| 1162 | - echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);
|
|
| 1163 | - } |
|
| 1118 | + if ($post_images) {
|
|
| 1119 | + foreach ($post_images as $img) {
|
|
| 1120 | + $post_img = $img->src; |
|
| 1121 | + break; |
|
| 1122 | + } |
|
| 1123 | + } |
|
| 1124 | + |
|
| 1125 | + if (isset($post_img) && $post_img) {
|
|
| 1126 | + $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />'; |
|
| 1127 | + } |
|
| 1128 | + |
|
| 1129 | + $html .= '</span>'; |
|
| 1130 | + |
|
| 1131 | + echo $html .= '</div>'; |
|
| 1132 | + /** |
|
| 1133 | + * This is called after the rating html in the function geodir_detail_page_review_rating(). |
|
| 1134 | + * |
|
| 1135 | + * This is called inside the check for an actual rating and the check for preview page. |
|
| 1136 | + * |
|
| 1137 | + * @since 1.0.0 |
|
| 1138 | + * @param float $post_avgratings Average rating for the surrent post. |
|
| 1139 | + * @param int $post->ID Current post ID. |
|
| 1140 | + */ |
|
| 1141 | + do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1142 | + } |
|
| 1143 | + /** |
|
| 1144 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1145 | + * |
|
| 1146 | + * This is called outside the check for an actual rating and the check for preview page. |
|
| 1147 | + * |
|
| 1148 | + * @since 1.0.0 |
|
| 1149 | + */ |
|
| 1150 | + do_action('geodir_after_detail_page_review_rating');
|
|
| 1151 | + $content_html = ob_get_clean(); |
|
| 1152 | + if (trim($content_html) != '') {
|
|
| 1153 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>'; |
|
| 1154 | + } |
|
| 1155 | + if ((int)get_option('geodir_disable_rating_info_section') != 1) {
|
|
| 1156 | + /** |
|
| 1157 | + * Filter the geodir_detail_page_review_rating() function content. |
|
| 1158 | + * |
|
| 1159 | + * @since 1.0.0 |
|
| 1160 | + * @param string $content_html The output html of the geodir_detail_page_review_rating() function. |
|
| 1161 | + */ |
|
| 1162 | + echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);
|
|
| 1163 | + } |
|
| 1164 | 1164 | } |
| 1165 | 1165 | |
| 1166 | 1166 | /** |
@@ -1172,35 +1172,35 @@ discard block |
||
| 1172 | 1172 | */ |
| 1173 | 1173 | function geodir_detail_page_more_info() |
| 1174 | 1174 | {
|
| 1175 | - ob_start(); // Start buffering; |
|
| 1176 | - /** |
|
| 1177 | - * This is called before the info section html. |
|
| 1178 | - * |
|
| 1179 | - * @since 1.0.0 |
|
| 1180 | - */ |
|
| 1181 | - do_action('geodir_before_detail_page_more_info');
|
|
| 1182 | - if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {
|
|
| 1183 | - echo $geodir_post_detail_fields; |
|
| 1184 | - } |
|
| 1185 | - /** |
|
| 1186 | - * This is called after the info section html. |
|
| 1187 | - * |
|
| 1188 | - * @since 1.0.0 |
|
| 1189 | - */ |
|
| 1190 | - do_action('geodir_after_detail_page_more_info');
|
|
| 1191 | - |
|
| 1192 | - $content_html = ob_get_clean(); |
|
| 1193 | - if (trim($content_html) != '') |
|
| 1194 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1195 | - if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
|
| 1196 | - /** |
|
| 1197 | - * Filter the output html for function geodir_detail_page_more_info(). |
|
| 1198 | - * |
|
| 1199 | - * @since 1.0.0 |
|
| 1200 | - * @param string $content_html The output html of the geodir_detail_page_more_info() function. |
|
| 1201 | - */ |
|
| 1202 | - echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);
|
|
| 1203 | - } |
|
| 1175 | + ob_start(); // Start buffering; |
|
| 1176 | + /** |
|
| 1177 | + * This is called before the info section html. |
|
| 1178 | + * |
|
| 1179 | + * @since 1.0.0 |
|
| 1180 | + */ |
|
| 1181 | + do_action('geodir_before_detail_page_more_info');
|
|
| 1182 | + if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {
|
|
| 1183 | + echo $geodir_post_detail_fields; |
|
| 1184 | + } |
|
| 1185 | + /** |
|
| 1186 | + * This is called after the info section html. |
|
| 1187 | + * |
|
| 1188 | + * @since 1.0.0 |
|
| 1189 | + */ |
|
| 1190 | + do_action('geodir_after_detail_page_more_info');
|
|
| 1191 | + |
|
| 1192 | + $content_html = ob_get_clean(); |
|
| 1193 | + if (trim($content_html) != '') |
|
| 1194 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1195 | + if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
|
| 1196 | + /** |
|
| 1197 | + * Filter the output html for function geodir_detail_page_more_info(). |
|
| 1198 | + * |
|
| 1199 | + * @since 1.0.0 |
|
| 1200 | + * @param string $content_html The output html of the geodir_detail_page_more_info() function. |
|
| 1201 | + */ |
|
| 1202 | + echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);
|
|
| 1203 | + } |
|
| 1204 | 1204 | } |
| 1205 | 1205 | |
| 1206 | 1206 | |
@@ -1214,15 +1214,15 @@ discard block |
||
| 1214 | 1214 | */ |
| 1215 | 1215 | function geodir_localize_all_js_msg() |
| 1216 | 1216 | {// check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls
|
| 1217 | - if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1218 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 1219 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1220 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 1221 | - } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1222 | - $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 1223 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1224 | - $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 1225 | - } |
|
| 1217 | + if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1218 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 1219 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1220 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 1221 | + } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1222 | + $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 1223 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1224 | + $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 1225 | + } |
|
| 1226 | 1226 | |
| 1227 | 1227 | /** |
| 1228 | 1228 | * Filter the allowed image type extensions for post images. |
@@ -1232,60 +1232,60 @@ discard block |
||
| 1232 | 1232 | */ |
| 1233 | 1233 | $allowed_img_types = apply_filters('geodir_allowed_post_image_exts', array('jpg', 'jpeg', 'jpe', 'gif', 'png'));
|
| 1234 | 1234 | |
| 1235 | - $default_marker_icon = get_option('geodir_default_marker_icon');
|
|
| 1236 | - $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));
|
|
| 1237 | - $default_marker_width = $default_marker_size['w']; |
|
| 1238 | - $default_marker_height = $default_marker_size['h']; |
|
| 1235 | + $default_marker_icon = get_option('geodir_default_marker_icon');
|
|
| 1236 | + $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));
|
|
| 1237 | + $default_marker_width = $default_marker_size['w']; |
|
| 1238 | + $default_marker_height = $default_marker_size['h']; |
|
| 1239 | 1239 | |
| 1240 | - $arr_alert_msg = array( |
|
| 1241 | - 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 1242 | - 'geodir_admin_ajax_url' => $ajax_url, |
|
| 1243 | - 'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),
|
|
| 1244 | - 'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),
|
|
| 1245 | - 'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),
|
|
| 1246 | - 'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),
|
|
| 1247 | - //start not show alert msg |
|
| 1248 | - 'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),
|
|
| 1249 | - 'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),
|
|
| 1250 | - 'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),
|
|
| 1251 | - 'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),
|
|
| 1252 | - 'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),
|
|
| 1253 | - // end not show alert msg |
|
| 1254 | - 'my_place_listing_del' => __('Are you wish to delete this listing?', 'geodirectory'),
|
|
| 1255 | - 'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),
|
|
| 1256 | - //start not show alert msg |
|
| 1257 | - 'rating_error_msg' => __('Error : please retry', 'geodirectory'),
|
|
| 1258 | - 'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),
|
|
| 1259 | - 'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),
|
|
| 1260 | - 'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),
|
|
| 1261 | - 'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),
|
|
| 1262 | - 'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),
|
|
| 1263 | - 'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),
|
|
| 1264 | - 'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),
|
|
| 1265 | - 'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),
|
|
| 1266 | - 'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),
|
|
| 1267 | - 'geodir_field_id_required' => __('This field is required.', 'geodirectory'),
|
|
| 1268 | - 'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),
|
|
| 1269 | - 'geodir_default_marker_icon' => $default_marker_icon, |
|
| 1270 | - 'geodir_default_marker_w' => $default_marker_width, |
|
| 1271 | - 'geodir_default_marker_h' => $default_marker_height, |
|
| 1272 | - 'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG, |
|
| 1273 | - 'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG, |
|
| 1274 | - 'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),
|
|
| 1275 | - 'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),
|
|
| 1276 | - 'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),
|
|
| 1277 | - 'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),
|
|
| 1278 | - 'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),
|
|
| 1279 | - 'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),
|
|
| 1280 | - /* on/off dragging for phone devices */ |
|
| 1281 | - 'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,
|
|
| 1282 | - 'geodir_is_mobile' => wp_is_mobile() ? true : false, |
|
| 1283 | - 'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),
|
|
| 1284 | - 'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),
|
|
| 1285 | - 'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),
|
|
| 1286 | - 'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),
|
|
| 1287 | - 'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),
|
|
| 1288 | - 'geodir_action_remove' => __('Remove', 'geodirectory'),
|
|
| 1240 | + $arr_alert_msg = array( |
|
| 1241 | + 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 1242 | + 'geodir_admin_ajax_url' => $ajax_url, |
|
| 1243 | + 'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),
|
|
| 1244 | + 'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),
|
|
| 1245 | + 'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),
|
|
| 1246 | + 'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),
|
|
| 1247 | + //start not show alert msg |
|
| 1248 | + 'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),
|
|
| 1249 | + 'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),
|
|
| 1250 | + 'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),
|
|
| 1251 | + 'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),
|
|
| 1252 | + 'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),
|
|
| 1253 | + // end not show alert msg |
|
| 1254 | + 'my_place_listing_del' => __('Are you wish to delete this listing?', 'geodirectory'),
|
|
| 1255 | + 'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),
|
|
| 1256 | + //start not show alert msg |
|
| 1257 | + 'rating_error_msg' => __('Error : please retry', 'geodirectory'),
|
|
| 1258 | + 'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),
|
|
| 1259 | + 'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),
|
|
| 1260 | + 'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),
|
|
| 1261 | + 'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),
|
|
| 1262 | + 'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),
|
|
| 1263 | + 'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),
|
|
| 1264 | + 'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),
|
|
| 1265 | + 'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),
|
|
| 1266 | + 'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),
|
|
| 1267 | + 'geodir_field_id_required' => __('This field is required.', 'geodirectory'),
|
|
| 1268 | + 'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),
|
|
| 1269 | + 'geodir_default_marker_icon' => $default_marker_icon, |
|
| 1270 | + 'geodir_default_marker_w' => $default_marker_width, |
|
| 1271 | + 'geodir_default_marker_h' => $default_marker_height, |
|
| 1272 | + 'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG, |
|
| 1273 | + 'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG, |
|
| 1274 | + 'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),
|
|
| 1275 | + 'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),
|
|
| 1276 | + 'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),
|
|
| 1277 | + 'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),
|
|
| 1278 | + 'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),
|
|
| 1279 | + 'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),
|
|
| 1280 | + /* on/off dragging for phone devices */ |
|
| 1281 | + 'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,
|
|
| 1282 | + 'geodir_is_mobile' => wp_is_mobile() ? true : false, |
|
| 1283 | + 'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),
|
|
| 1284 | + 'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),
|
|
| 1285 | + 'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),
|
|
| 1286 | + 'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),
|
|
| 1287 | + 'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),
|
|
| 1288 | + 'geodir_action_remove' => __('Remove', 'geodirectory'),
|
|
| 1289 | 1289 | 'geodir_txt_all_files' => __('Allowed files', 'geodirectory'),
|
| 1290 | 1290 | 'geodir_err_file_type' => __('File type error. Allowed file types: %s', 'geodirectory'),
|
| 1291 | 1291 | 'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',
|
@@ -1293,35 +1293,35 @@ discard block |
||
| 1293 | 1293 | 'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),
|
| 1294 | 1294 | 'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',
|
| 1295 | 1295 | 'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',
|
| 1296 | - 'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,
|
|
| 1297 | - 'geodir_map_name' => geodir_map_name(), |
|
| 1298 | - 'osmStart' => __('Start', 'geodirectory'),
|
|
| 1299 | - 'osmVia' => __('Via {viaNumber}', 'geodirectory'),
|
|
| 1300 | - 'osmEnd' => __('Enter Your Location', 'geodirectory'),
|
|
| 1301 | - 'ga_delete_check' => __('Are you wish to Deauthorize and break Analytics?', 'geodirectory'),
|
|
| 1302 | - |
|
| 1303 | - ); |
|
| 1304 | - |
|
| 1305 | - /** |
|
| 1306 | - * Filters the translated JS strings from function geodir_localize_all_js_msg(). |
|
| 1307 | - * |
|
| 1308 | - * With this filter you can add, remove or change translated JS strings. |
|
| 1309 | - * You should add your own translations to this if you are building an addon rather than adding another script block. |
|
| 1310 | - * |
|
| 1311 | - * @since 1.0.0 |
|
| 1312 | - */ |
|
| 1313 | - $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);
|
|
| 1314 | - |
|
| 1315 | - foreach ($arr_alert_msg as $key => $value) {
|
|
| 1316 | - if (!is_scalar($value)) |
|
| 1317 | - continue; |
|
| 1318 | - $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8'); |
|
| 1319 | - } |
|
| 1296 | + 'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,
|
|
| 1297 | + 'geodir_map_name' => geodir_map_name(), |
|
| 1298 | + 'osmStart' => __('Start', 'geodirectory'),
|
|
| 1299 | + 'osmVia' => __('Via {viaNumber}', 'geodirectory'),
|
|
| 1300 | + 'osmEnd' => __('Enter Your Location', 'geodirectory'),
|
|
| 1301 | + 'ga_delete_check' => __('Are you wish to Deauthorize and break Analytics?', 'geodirectory'),
|
|
| 1302 | + |
|
| 1303 | + ); |
|
| 1304 | + |
|
| 1305 | + /** |
|
| 1306 | + * Filters the translated JS strings from function geodir_localize_all_js_msg(). |
|
| 1307 | + * |
|
| 1308 | + * With this filter you can add, remove or change translated JS strings. |
|
| 1309 | + * You should add your own translations to this if you are building an addon rather than adding another script block. |
|
| 1310 | + * |
|
| 1311 | + * @since 1.0.0 |
|
| 1312 | + */ |
|
| 1313 | + $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);
|
|
| 1320 | 1314 | |
| 1321 | - $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';'; |
|
| 1322 | - echo '<script>'; |
|
| 1323 | - echo $script; |
|
| 1324 | - echo '</script>'; |
|
| 1315 | + foreach ($arr_alert_msg as $key => $value) {
|
|
| 1316 | + if (!is_scalar($value)) |
|
| 1317 | + continue; |
|
| 1318 | + $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8'); |
|
| 1319 | + } |
|
| 1320 | + |
|
| 1321 | + $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';'; |
|
| 1322 | + echo '<script>'; |
|
| 1323 | + echo $script; |
|
| 1324 | + echo '</script>'; |
|
| 1325 | 1325 | } |
| 1326 | 1326 | |
| 1327 | 1327 | add_action('admin_bar_menu', 'geodir_admin_bar_site_menu', 31);
|
@@ -1337,11 +1337,11 @@ discard block |
||
| 1337 | 1337 | */ |
| 1338 | 1338 | function geodir_admin_bar_site_menu($wp_admin_bar) |
| 1339 | 1339 | {
|
| 1340 | - if (get_option("geodir_installed")) {
|
|
| 1341 | - if (current_user_can('manage_options')) {
|
|
| 1342 | - $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));
|
|
| 1343 | - } |
|
| 1344 | - } |
|
| 1340 | + if (get_option("geodir_installed")) {
|
|
| 1341 | + if (current_user_can('manage_options')) {
|
|
| 1342 | + $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));
|
|
| 1343 | + } |
|
| 1344 | + } |
|
| 1345 | 1345 | } |
| 1346 | 1346 | |
| 1347 | 1347 | add_action('geodir_before_listing', 'geodir_display_sort_options'); /*function in custom_functions.php*/
|
@@ -1367,25 +1367,25 @@ discard block |
||
| 1367 | 1367 | */ |
| 1368 | 1368 | function geodir_store_sidebars() |
| 1369 | 1369 | {
|
| 1370 | - global $geodir_sidebars; |
|
| 1371 | - global $sidebars_widgets; |
|
| 1372 | - |
|
| 1373 | - if (!is_array($sidebars_widgets)) |
|
| 1374 | - $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1375 | - $geodir_old_sidebars = array(); |
|
| 1376 | - |
|
| 1377 | - if (is_array($geodir_sidebars)) {
|
|
| 1378 | - foreach ($geodir_sidebars as $val) {
|
|
| 1379 | - if (is_array($sidebars_widgets)) {
|
|
| 1380 | - if (array_key_exists($val, $sidebars_widgets)) |
|
| 1381 | - $geodir_old_sidebars[$val] = $sidebars_widgets[$val]; |
|
| 1382 | - else |
|
| 1383 | - $geodir_old_sidebars[$val] = array(); |
|
| 1384 | - } |
|
| 1385 | - } |
|
| 1386 | - } |
|
| 1387 | - update_option('geodir_sidebars', $geodir_old_sidebars);
|
|
| 1388 | - geodir_option_version_backup('geodir_sidebars');
|
|
| 1370 | + global $geodir_sidebars; |
|
| 1371 | + global $sidebars_widgets; |
|
| 1372 | + |
|
| 1373 | + if (!is_array($sidebars_widgets)) |
|
| 1374 | + $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1375 | + $geodir_old_sidebars = array(); |
|
| 1376 | + |
|
| 1377 | + if (is_array($geodir_sidebars)) {
|
|
| 1378 | + foreach ($geodir_sidebars as $val) {
|
|
| 1379 | + if (is_array($sidebars_widgets)) {
|
|
| 1380 | + if (array_key_exists($val, $sidebars_widgets)) |
|
| 1381 | + $geodir_old_sidebars[$val] = $sidebars_widgets[$val]; |
|
| 1382 | + else |
|
| 1383 | + $geodir_old_sidebars[$val] = array(); |
|
| 1384 | + } |
|
| 1385 | + } |
|
| 1386 | + } |
|
| 1387 | + update_option('geodir_sidebars', $geodir_old_sidebars);
|
|
| 1388 | + geodir_option_version_backup('geodir_sidebars');
|
|
| 1389 | 1389 | |
| 1390 | 1390 | } |
| 1391 | 1391 | |
@@ -1399,28 +1399,28 @@ discard block |
||
| 1399 | 1399 | */ |
| 1400 | 1400 | function geodir_restore_sidebars() |
| 1401 | 1401 | {
|
| 1402 | - global $sidebars_widgets; |
|
| 1403 | - |
|
| 1404 | - if (!is_array($sidebars_widgets)) |
|
| 1405 | - $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1406 | - |
|
| 1407 | - if (is_array($sidebars_widgets)) {
|
|
| 1408 | - $geodir_old_sidebars = get_option('geodir_sidebars');
|
|
| 1409 | - if (is_array($geodir_old_sidebars)) {
|
|
| 1410 | - foreach ($geodir_old_sidebars as $key => $val) {
|
|
| 1411 | - if(0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1412 | - {
|
|
| 1413 | - $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
|
| 1414 | - } |
|
| 1402 | + global $sidebars_widgets; |
|
| 1415 | 1403 | |
| 1404 | + if (!is_array($sidebars_widgets)) |
|
| 1405 | + $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1416 | 1406 | |
| 1417 | - } |
|
| 1418 | - } |
|
| 1407 | + if (is_array($sidebars_widgets)) {
|
|
| 1408 | + $geodir_old_sidebars = get_option('geodir_sidebars');
|
|
| 1409 | + if (is_array($geodir_old_sidebars)) {
|
|
| 1410 | + foreach ($geodir_old_sidebars as $key => $val) {
|
|
| 1411 | + if(0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1412 | + {
|
|
| 1413 | + $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
|
| 1414 | + } |
|
| 1419 | 1415 | |
| 1420 | - } |
|
| 1421 | 1416 | |
| 1422 | - update_option('sidebars_widgets', $sidebars_widgets);
|
|
| 1423 | - update_option('geodir_sidebars', '');
|
|
| 1417 | + } |
|
| 1418 | + } |
|
| 1419 | + |
|
| 1420 | + } |
|
| 1421 | + |
|
| 1422 | + update_option('sidebars_widgets', $sidebars_widgets);
|
|
| 1423 | + update_option('geodir_sidebars', '');
|
|
| 1424 | 1424 | } |
| 1425 | 1425 | |
| 1426 | 1426 | add_action('geodir_after_listing_post_gridview', 'geodir_after_listing_post_gridview');
|
@@ -1433,9 +1433,9 @@ discard block |
||
| 1433 | 1433 | */ |
| 1434 | 1434 | function geodir_after_listing_post_gridview() |
| 1435 | 1435 | {
|
| 1436 | - global $gridview_columns; |
|
| 1436 | + global $gridview_columns; |
|
| 1437 | 1437 | |
| 1438 | - $gridview_columns = ''; |
|
| 1438 | + $gridview_columns = ''; |
|
| 1439 | 1439 | |
| 1440 | 1440 | } |
| 1441 | 1441 | |
@@ -1463,11 +1463,11 @@ discard block |
||
| 1463 | 1463 | */ |
| 1464 | 1464 | function so_handle_038($url, $original_url, $_context) |
| 1465 | 1465 | {
|
| 1466 | - if (strstr($url, "maps.google.com/maps/api/js") !== false) {
|
|
| 1467 | - $url = str_replace("&", "&", $url); // or $url = $original_url
|
|
| 1468 | - } |
|
| 1466 | + if (strstr($url, "maps.google.com/maps/api/js") !== false) {
|
|
| 1467 | + $url = str_replace("&", "&", $url); // or $url = $original_url
|
|
| 1468 | + } |
|
| 1469 | 1469 | |
| 1470 | - return $url; |
|
| 1470 | + return $url; |
|
| 1471 | 1471 | } |
| 1472 | 1472 | |
| 1473 | 1473 | |
@@ -1483,34 +1483,34 @@ discard block |
||
| 1483 | 1483 | function geodir_after_main_form_fields() {
|
| 1484 | 1484 | global $gd_session; |
| 1485 | 1485 | |
| 1486 | - if (get_option('geodir_accept_term_condition')) {
|
|
| 1487 | - global $post; |
|
| 1488 | - $term_condition = ''; |
|
| 1489 | - if (isset($_REQUEST['backandedit'])) {
|
|
| 1490 | - $post = (object)$gd_session->get('listing');
|
|
| 1491 | - $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : ''; |
|
| 1492 | - } |
|
| 1493 | - |
|
| 1494 | - ?> |
|
| 1486 | + if (get_option('geodir_accept_term_condition')) {
|
|
| 1487 | + global $post; |
|
| 1488 | + $term_condition = ''; |
|
| 1489 | + if (isset($_REQUEST['backandedit'])) {
|
|
| 1490 | + $post = (object)$gd_session->get('listing');
|
|
| 1491 | + $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : ''; |
|
| 1492 | + } |
|
| 1493 | + |
|
| 1494 | + ?> |
|
| 1495 | 1495 | <div id="geodir_accept_term_condition_row" class="required_field geodir_form_row clearfix"> |
| 1496 | 1496 | <label> </label> |
| 1497 | 1497 | |
| 1498 | 1498 | <div class="geodir_taxonomy_field" style="float:left; width:70%;"> |
| 1499 | 1499 | <span style="display:block"> |
| 1500 | 1500 | <input class="main_list_selecter" type="checkbox" <?php if ($term_condition == '1') {
|
| 1501 | - echo 'checked="checked"'; |
|
| 1502 | - } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition" |
|
| 1501 | + echo 'checked="checked"'; |
|
| 1502 | + } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition" |
|
| 1503 | 1503 | class="geodir_textfield" value="1" |
| 1504 | 1504 | style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>
|
| 1505 | 1505 | </span> |
| 1506 | 1506 | </div> |
| 1507 | 1507 | <span class="geodir_message_error"><?php if (isset($required_msg)) {
|
| 1508 | - _e($required_msg, 'geodirectory'); |
|
| 1509 | - } ?></span> |
|
| 1508 | + _e($required_msg, 'geodirectory'); |
|
| 1509 | + } ?></span> |
|
| 1510 | 1510 | </div> |
| 1511 | 1511 | <?php |
| 1512 | 1512 | |
| 1513 | - } |
|
| 1513 | + } |
|
| 1514 | 1514 | } |
| 1515 | 1515 | |
| 1516 | 1516 | |
@@ -1535,42 +1535,42 @@ discard block |
||
| 1535 | 1535 | */ |
| 1536 | 1536 | function geodir_detail_page_tab_is_display($is_display, $tab) |
| 1537 | 1537 | {
|
| 1538 | - global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields; |
|
| 1538 | + global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields; |
|
| 1539 | 1539 | |
| 1540 | - if ($tab == 'post_profile') {
|
|
| 1541 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1542 | - $desc_limit = apply_filters('geodir_description_field_desc_limit', '');
|
|
| 1540 | + if ($tab == 'post_profile') {
|
|
| 1541 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1542 | + $desc_limit = apply_filters('geodir_description_field_desc_limit', '');
|
|
| 1543 | 1543 | |
| 1544 | - if (!($desc_limit === '' || (int)$desc_limit > 0)) {
|
|
| 1545 | - $is_display = false; |
|
| 1546 | - } |
|
| 1547 | - } |
|
| 1544 | + if (!($desc_limit === '' || (int)$desc_limit > 0)) {
|
|
| 1545 | + $is_display = false; |
|
| 1546 | + } |
|
| 1547 | + } |
|
| 1548 | 1548 | |
| 1549 | - if ($tab == 'post_info') |
|
| 1550 | - $is_display = (!empty($geodir_post_detail_fields)) ? true : false; |
|
| 1549 | + if ($tab == 'post_info') |
|
| 1550 | + $is_display = (!empty($geodir_post_detail_fields)) ? true : false; |
|
| 1551 | 1551 | |
| 1552 | - if ($tab == 'post_images') |
|
| 1553 | - $is_display = (!empty($post_images)) ? true : false; |
|
| 1552 | + if ($tab == 'post_images') |
|
| 1553 | + $is_display = (!empty($post_images)) ? true : false; |
|
| 1554 | 1554 | |
| 1555 | - if ($tab == 'post_video') |
|
| 1556 | - $is_display = (!empty($video)) ? true : false; |
|
| 1555 | + if ($tab == 'post_video') |
|
| 1556 | + $is_display = (!empty($video)) ? true : false; |
|
| 1557 | 1557 | |
| 1558 | - if ($tab == 'special_offers') |
|
| 1559 | - $is_display = (!empty($special_offers)) ? true : false; |
|
| 1558 | + if ($tab == 'special_offers') |
|
| 1559 | + $is_display = (!empty($special_offers)) ? true : false; |
|
| 1560 | 1560 | |
| 1561 | - if ($tab == 'reviews') |
|
| 1562 | - $is_display = (geodir_is_page('detail')) ? true : false;
|
|
| 1561 | + if ($tab == 'reviews') |
|
| 1562 | + $is_display = (geodir_is_page('detail')) ? true : false;
|
|
| 1563 | 1563 | |
| 1564 | - if ($tab == 'related_listing') {
|
|
| 1565 | - $message = __('No listings found which match your selection.', 'geodirectory');
|
|
| 1564 | + if ($tab == 'related_listing') {
|
|
| 1565 | + $message = __('No listings found which match your selection.', 'geodirectory');
|
|
| 1566 | 1566 | |
| 1567 | - /** This action is documented in geodirectory-functions/template_functions.php */ |
|
| 1568 | - $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);
|
|
| 1567 | + /** This action is documented in geodirectory-functions/template_functions.php */ |
|
| 1568 | + $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);
|
|
| 1569 | 1569 | |
| 1570 | - $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;
|
|
| 1571 | - } |
|
| 1570 | + $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;
|
|
| 1571 | + } |
|
| 1572 | 1572 | |
| 1573 | - return $is_display; |
|
| 1573 | + return $is_display; |
|
| 1574 | 1574 | } |
| 1575 | 1575 | |
| 1576 | 1576 | |
@@ -1586,69 +1586,69 @@ discard block |
||
| 1586 | 1586 | * @global string $plugin_prefix Geodirectory plugin table prefix. |
| 1587 | 1587 | */ |
| 1588 | 1588 | function geodir_changes_in_custom_fields_table() {
|
| 1589 | - global $wpdb, $plugin_prefix; |
|
| 1589 | + global $wpdb, $plugin_prefix; |
|
| 1590 | 1590 | |
| 1591 | 1591 | // Remove unused virtual page |
| 1592 | 1592 | $listings_page_id = (int)get_option('geodir_listing_page');
|
| 1593 | 1593 | if ($listings_page_id) {
|
| 1594 | 1594 | $wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));
|
| 1595 | - delete_option('geodir_listing_page');
|
|
| 1595 | + delete_option('geodir_listing_page');
|
|
| 1596 | 1596 | } |
| 1597 | 1597 | |
| 1598 | - if (!get_option('geodir_changes_in_custom_fields_table')) {
|
|
| 1599 | - $wpdb->query( |
|
| 1600 | - $wpdb->prepare( |
|
| 1601 | - "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s", |
|
| 1602 | - array('1', '1', 'admin')
|
|
| 1603 | - ) |
|
| 1604 | - ); |
|
| 1598 | + if (!get_option('geodir_changes_in_custom_fields_table')) {
|
|
| 1599 | + $wpdb->query( |
|
| 1600 | + $wpdb->prepare( |
|
| 1601 | + "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s", |
|
| 1602 | + array('1', '1', 'admin')
|
|
| 1603 | + ) |
|
| 1604 | + ); |
|
| 1605 | 1605 | |
| 1606 | 1606 | |
| 1607 | - /* --- terms meta value set --- */ |
|
| 1607 | + /* --- terms meta value set --- */ |
|
| 1608 | 1608 | |
| 1609 | - update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');
|
|
| 1609 | + update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');
|
|
| 1610 | 1610 | |
| 1611 | - $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
| 1611 | + $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
| 1612 | 1612 | |
| 1613 | - if (!empty($options_data)) {
|
|
| 1613 | + if (!empty($options_data)) {
|
|
| 1614 | 1614 | |
| 1615 | - foreach ($options_data as $optobj) {
|
|
| 1615 | + foreach ($options_data as $optobj) {
|
|
| 1616 | 1616 | |
| 1617 | - $option_val = str_replace('tax_meta_', '', $optobj->option_name);
|
|
| 1617 | + $option_val = str_replace('tax_meta_', '', $optobj->option_name);
|
|
| 1618 | 1618 | |
| 1619 | - $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
| 1619 | + $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
| 1620 | 1620 | |
| 1621 | - if (!empty($taxonomies_data)) {
|
|
| 1621 | + if (!empty($taxonomies_data)) {
|
|
| 1622 | 1622 | |
| 1623 | - foreach ($taxonomies_data as $taxobj) {
|
|
| 1623 | + foreach ($taxonomies_data as $taxobj) {
|
|
| 1624 | 1624 | |
| 1625 | - $taxObject = get_taxonomy($taxobj->taxonomy); |
|
| 1626 | - $post_type = $taxObject->object_type[0]; |
|
| 1625 | + $taxObject = get_taxonomy($taxobj->taxonomy); |
|
| 1626 | + $post_type = $taxObject->object_type[0]; |
|
| 1627 | 1627 | |
| 1628 | - $opt_value = 'tax_meta_' . $post_type . '_' . $option_val; |
|
| 1628 | + $opt_value = 'tax_meta_' . $post_type . '_' . $option_val; |
|
| 1629 | 1629 | |
| 1630 | - $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));
|
|
| 1630 | + $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));
|
|
| 1631 | 1631 | |
| 1632 | - if ($duplicate_data) {
|
|
| 1632 | + if ($duplicate_data) {
|
|
| 1633 | 1633 | |
| 1634 | - $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
| 1634 | + $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
| 1635 | 1635 | |
| 1636 | - } else {
|
|
| 1636 | + } else {
|
|
| 1637 | 1637 | |
| 1638 | - $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
| 1638 | + $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
| 1639 | 1639 | |
| 1640 | - } |
|
| 1640 | + } |
|
| 1641 | 1641 | |
| 1642 | - } |
|
| 1642 | + } |
|
| 1643 | 1643 | |
| 1644 | - } |
|
| 1644 | + } |
|
| 1645 | 1645 | |
| 1646 | - } |
|
| 1647 | - } |
|
| 1646 | + } |
|
| 1647 | + } |
|
| 1648 | 1648 | |
| 1649 | - update_option('geodir_changes_in_custom_fields_table', '1');
|
|
| 1649 | + update_option('geodir_changes_in_custom_fields_table', '1');
|
|
| 1650 | 1650 | |
| 1651 | - } |
|
| 1651 | + } |
|
| 1652 | 1652 | |
| 1653 | 1653 | } |
| 1654 | 1654 | |
@@ -1667,24 +1667,24 @@ discard block |
||
| 1667 | 1667 | function geodir_location_slug_check($slug) |
| 1668 | 1668 | {
|
| 1669 | 1669 | |
| 1670 | - global $wpdb, $table_prefix; |
|
| 1670 | + global $wpdb, $table_prefix; |
|
| 1671 | 1671 | |
| 1672 | - $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));
|
|
| 1672 | + $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));
|
|
| 1673 | 1673 | |
| 1674 | - if ($slug_exists) {
|
|
| 1674 | + if ($slug_exists) {
|
|
| 1675 | 1675 | |
| 1676 | - $suffix = 1; |
|
| 1677 | - do {
|
|
| 1678 | - $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1679 | - $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));
|
|
| 1680 | - $suffix++; |
|
| 1681 | - } while ($location_slug_check && $suffix < 100); |
|
| 1676 | + $suffix = 1; |
|
| 1677 | + do {
|
|
| 1678 | + $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1679 | + $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));
|
|
| 1680 | + $suffix++; |
|
| 1681 | + } while ($location_slug_check && $suffix < 100); |
|
| 1682 | 1682 | |
| 1683 | - $slug = $alt_location_name; |
|
| 1683 | + $slug = $alt_location_name; |
|
| 1684 | 1684 | |
| 1685 | - } |
|
| 1685 | + } |
|
| 1686 | 1686 | |
| 1687 | - return $slug; |
|
| 1687 | + return $slug; |
|
| 1688 | 1688 | |
| 1689 | 1689 | } |
| 1690 | 1690 | |
@@ -1709,42 +1709,42 @@ discard block |
||
| 1709 | 1709 | function geodir_update_term_slug($term_id, $tt_id, $taxonomy) |
| 1710 | 1710 | {
|
| 1711 | 1711 | |
| 1712 | - global $wpdb, $plugin_prefix, $table_prefix; |
|
| 1712 | + global $wpdb, $plugin_prefix, $table_prefix; |
|
| 1713 | 1713 | |
| 1714 | - $tern_data = get_term_by('id', $term_id, $taxonomy);
|
|
| 1714 | + $tern_data = get_term_by('id', $term_id, $taxonomy);
|
|
| 1715 | 1715 | |
| 1716 | - $slug = $tern_data->slug; |
|
| 1716 | + $slug = $tern_data->slug; |
|
| 1717 | 1717 | |
| 1718 | - /** |
|
| 1719 | - * Filter if a term slug exists. |
|
| 1720 | - * |
|
| 1721 | - * @since 1.0.0 |
|
| 1722 | - * @package GeoDirectory |
|
| 1723 | - * @param bool $bool Default: false. |
|
| 1724 | - * @param string $slug The term slug. |
|
| 1725 | - * @param int $term_id The term ID. |
|
| 1726 | - */ |
|
| 1727 | - $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);
|
|
| 1718 | + /** |
|
| 1719 | + * Filter if a term slug exists. |
|
| 1720 | + * |
|
| 1721 | + * @since 1.0.0 |
|
| 1722 | + * @package GeoDirectory |
|
| 1723 | + * @param bool $bool Default: false. |
|
| 1724 | + * @param string $slug The term slug. |
|
| 1725 | + * @param int $term_id The term ID. |
|
| 1726 | + */ |
|
| 1727 | + $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);
|
|
| 1728 | 1728 | |
| 1729 | - if ($slug_exists) {
|
|
| 1729 | + if ($slug_exists) {
|
|
| 1730 | 1730 | |
| 1731 | - $suffix = 1; |
|
| 1732 | - do {
|
|
| 1733 | - $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1731 | + $suffix = 1; |
|
| 1732 | + do {
|
|
| 1733 | + $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1734 | 1734 | |
| 1735 | - /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 1736 | - $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);
|
|
| 1735 | + /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 1736 | + $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);
|
|
| 1737 | 1737 | |
| 1738 | - $suffix++; |
|
| 1739 | - } while ($term_slug_check && $suffix < 100); |
|
| 1738 | + $suffix++; |
|
| 1739 | + } while ($term_slug_check && $suffix < 100); |
|
| 1740 | 1740 | |
| 1741 | - $slug = $new_slug; |
|
| 1741 | + $slug = $new_slug; |
|
| 1742 | 1742 | |
| 1743 | - //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );
|
|
| 1743 | + //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );
|
|
| 1744 | 1744 | |
| 1745 | - $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
| 1745 | + $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
| 1746 | 1746 | |
| 1747 | - } |
|
| 1747 | + } |
|
| 1748 | 1748 | |
| 1749 | 1749 | // Update tag in detail table. |
| 1750 | 1750 | $taxonomy_obj = get_taxonomy($taxonomy); |
@@ -1785,21 +1785,21 @@ discard block |
||
| 1785 | 1785 | function geodir_term_slug_is_exists($slug_exists, $slug, $term_id) |
| 1786 | 1786 | {
|
| 1787 | 1787 | |
| 1788 | - global $wpdb, $table_prefix; |
|
| 1788 | + global $wpdb, $table_prefix; |
|
| 1789 | 1789 | |
| 1790 | - $default_location = geodir_get_default_location(); |
|
| 1790 | + $default_location = geodir_get_default_location(); |
|
| 1791 | 1791 | |
| 1792 | - $country_slug = $default_location->country_slug; |
|
| 1793 | - $region_slug = $default_location->region_slug; |
|
| 1794 | - $city_slug = $default_location->city_slug; |
|
| 1792 | + $country_slug = $default_location->country_slug; |
|
| 1793 | + $region_slug = $default_location->region_slug; |
|
| 1794 | + $city_slug = $default_location->city_slug; |
|
| 1795 | 1795 | |
| 1796 | - if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) |
|
| 1797 | - return $slug_exists = true; |
|
| 1796 | + if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) |
|
| 1797 | + return $slug_exists = true; |
|
| 1798 | 1798 | |
| 1799 | - if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1800 | - return $slug_exists = true; |
|
| 1799 | + if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1800 | + return $slug_exists = true; |
|
| 1801 | 1801 | |
| 1802 | - return $slug_exists; |
|
| 1802 | + return $slug_exists; |
|
| 1803 | 1803 | } |
| 1804 | 1804 | |
| 1805 | 1805 | |
@@ -1818,75 +1818,75 @@ discard block |
||
| 1818 | 1818 | */ |
| 1819 | 1819 | function geodir_custom_page_title($title = '', $sep = '') |
| 1820 | 1820 | {
|
| 1821 | - global $wp; |
|
| 1822 | - if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {
|
|
| 1823 | - return $title; |
|
| 1824 | - } |
|
| 1821 | + global $wp; |
|
| 1822 | + if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {
|
|
| 1823 | + return $title; |
|
| 1824 | + } |
|
| 1825 | 1825 | |
| 1826 | - if ($sep == '') {
|
|
| 1827 | - /** |
|
| 1828 | - * Filter the page title separator. |
|
| 1829 | - * |
|
| 1830 | - * @since 1.0.0 |
|
| 1831 | - * @package GeoDirectory |
|
| 1832 | - * @param string $sep The separator, default: `|`. |
|
| 1833 | - */ |
|
| 1834 | - $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 1835 | - } |
|
| 1826 | + if ($sep == '') {
|
|
| 1827 | + /** |
|
| 1828 | + * Filter the page title separator. |
|
| 1829 | + * |
|
| 1830 | + * @since 1.0.0 |
|
| 1831 | + * @package GeoDirectory |
|
| 1832 | + * @param string $sep The separator, default: `|`. |
|
| 1833 | + */ |
|
| 1834 | + $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 1835 | + } |
|
| 1836 | 1836 | |
| 1837 | 1837 | |
| 1838 | - $gd_page = ''; |
|
| 1839 | - if(geodir_is_page('home')){
|
|
| 1840 | - $gd_page = 'home'; |
|
| 1841 | - $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
|
| 1842 | - } |
|
| 1843 | - elseif(geodir_is_page('detail')){
|
|
| 1844 | - $gd_page = 'detail'; |
|
| 1845 | - $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
|
| 1846 | - } |
|
| 1847 | - elseif(geodir_is_page('pt')){
|
|
| 1848 | - $gd_page = 'pt'; |
|
| 1849 | - $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
|
| 1850 | - } |
|
| 1851 | - elseif(geodir_is_page('listing')){
|
|
| 1852 | - $gd_page = 'listing'; |
|
| 1853 | - $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
|
| 1854 | - } |
|
| 1855 | - elseif(geodir_is_page('location')){
|
|
| 1856 | - $gd_page = 'location'; |
|
| 1857 | - $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
|
| 1858 | - } |
|
| 1859 | - elseif(geodir_is_page('search')){
|
|
| 1860 | - $gd_page = 'search'; |
|
| 1861 | - $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
|
| 1862 | - } |
|
| 1863 | - elseif(geodir_is_page('add-listing')){
|
|
| 1864 | - $gd_page = 'add-listing'; |
|
| 1865 | - $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
|
| 1866 | - } |
|
| 1867 | - elseif(geodir_is_page('author')){
|
|
| 1868 | - $gd_page = 'author'; |
|
| 1869 | - $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
|
| 1870 | - } |
|
| 1871 | - elseif(geodir_is_page('login')){
|
|
| 1872 | - $gd_page = 'login'; |
|
| 1873 | - $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
|
| 1874 | - } |
|
| 1875 | - elseif(geodir_is_page('listing-success')){
|
|
| 1876 | - $gd_page = 'listing-success'; |
|
| 1877 | - $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
|
| 1878 | - } |
|
| 1838 | + $gd_page = ''; |
|
| 1839 | + if(geodir_is_page('home')){
|
|
| 1840 | + $gd_page = 'home'; |
|
| 1841 | + $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
|
| 1842 | + } |
|
| 1843 | + elseif(geodir_is_page('detail')){
|
|
| 1844 | + $gd_page = 'detail'; |
|
| 1845 | + $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
|
| 1846 | + } |
|
| 1847 | + elseif(geodir_is_page('pt')){
|
|
| 1848 | + $gd_page = 'pt'; |
|
| 1849 | + $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
|
| 1850 | + } |
|
| 1851 | + elseif(geodir_is_page('listing')){
|
|
| 1852 | + $gd_page = 'listing'; |
|
| 1853 | + $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
|
| 1854 | + } |
|
| 1855 | + elseif(geodir_is_page('location')){
|
|
| 1856 | + $gd_page = 'location'; |
|
| 1857 | + $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
|
| 1858 | + } |
|
| 1859 | + elseif(geodir_is_page('search')){
|
|
| 1860 | + $gd_page = 'search'; |
|
| 1861 | + $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
|
| 1862 | + } |
|
| 1863 | + elseif(geodir_is_page('add-listing')){
|
|
| 1864 | + $gd_page = 'add-listing'; |
|
| 1865 | + $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
|
| 1866 | + } |
|
| 1867 | + elseif(geodir_is_page('author')){
|
|
| 1868 | + $gd_page = 'author'; |
|
| 1869 | + $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
|
| 1870 | + } |
|
| 1871 | + elseif(geodir_is_page('login')){
|
|
| 1872 | + $gd_page = 'login'; |
|
| 1873 | + $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
|
| 1874 | + } |
|
| 1875 | + elseif(geodir_is_page('listing-success')){
|
|
| 1876 | + $gd_page = 'listing-success'; |
|
| 1877 | + $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
|
| 1878 | + } |
|
| 1879 | 1879 | |
| 1880 | 1880 | |
| 1881 | - /** |
|
| 1882 | - * Filter page meta title to replace variables. |
|
| 1883 | - * |
|
| 1884 | - * @since 1.5.4 |
|
| 1885 | - * @param string $title The page title including variables. |
|
| 1886 | - * @param string $gd_page The GeoDirectory page type if any. |
|
| 1887 | - * @param string $sep The title separator symbol. |
|
| 1888 | - */ |
|
| 1889 | - return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);
|
|
| 1881 | + /** |
|
| 1882 | + * Filter page meta title to replace variables. |
|
| 1883 | + * |
|
| 1884 | + * @since 1.5.4 |
|
| 1885 | + * @param string $title The page title including variables. |
|
| 1886 | + * @param string $gd_page The GeoDirectory page type if any. |
|
| 1887 | + * @param string $sep The title separator symbol. |
|
| 1888 | + */ |
|
| 1889 | + return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);
|
|
| 1890 | 1890 | |
| 1891 | 1891 | } |
| 1892 | 1892 | |
@@ -1902,36 +1902,36 @@ discard block |
||
| 1902 | 1902 | function geodir_set_post_attachment() |
| 1903 | 1903 | {
|
| 1904 | 1904 | |
| 1905 | - if (!get_option('geodir_set_post_attachments')) {
|
|
| 1905 | + if (!get_option('geodir_set_post_attachments')) {
|
|
| 1906 | 1906 | |
| 1907 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 1908 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1907 | + require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 1908 | + require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1909 | 1909 | |
| 1910 | - $all_postypes = geodir_get_posttypes(); |
|
| 1910 | + $all_postypes = geodir_get_posttypes(); |
|
| 1911 | 1911 | |
| 1912 | - foreach($all_postypes as $post_type){
|
|
| 1913 | - $args = array( |
|
| 1914 | - 'posts_per_page' => -1, |
|
| 1915 | - 'post_type' => $post_type, |
|
| 1916 | - 'post_status' => 'publish'); |
|
| 1912 | + foreach($all_postypes as $post_type){
|
|
| 1913 | + $args = array( |
|
| 1914 | + 'posts_per_page' => -1, |
|
| 1915 | + 'post_type' => $post_type, |
|
| 1916 | + 'post_status' => 'publish'); |
|
| 1917 | 1917 | |
| 1918 | - $posts_array = get_posts($args); |
|
| 1918 | + $posts_array = get_posts($args); |
|
| 1919 | 1919 | |
| 1920 | - if (!empty($posts_array)) {
|
|
| 1920 | + if (!empty($posts_array)) {
|
|
| 1921 | 1921 | |
| 1922 | - foreach ($posts_array as $post) {
|
|
| 1922 | + foreach ($posts_array as $post) {
|
|
| 1923 | 1923 | |
| 1924 | - geodir_set_wp_featured_image($post->ID); |
|
| 1924 | + geodir_set_wp_featured_image($post->ID); |
|
| 1925 | 1925 | |
| 1926 | - } |
|
| 1926 | + } |
|
| 1927 | 1927 | |
| 1928 | - } |
|
| 1929 | - } |
|
| 1928 | + } |
|
| 1929 | + } |
|
| 1930 | 1930 | |
| 1931 | 1931 | |
| 1932 | - update_option('geodir_set_post_attachments', '1');
|
|
| 1932 | + update_option('geodir_set_post_attachments', '1');
|
|
| 1933 | 1933 | |
| 1934 | - } |
|
| 1934 | + } |
|
| 1935 | 1935 | |
| 1936 | 1936 | } |
| 1937 | 1937 | |
@@ -1948,19 +1948,19 @@ discard block |
||
| 1948 | 1948 | function geodir_remove_url_seperator() |
| 1949 | 1949 | {
|
| 1950 | 1950 | |
| 1951 | - if (!get_option('geodir_remove_url_seperator')) {
|
|
| 1951 | + if (!get_option('geodir_remove_url_seperator')) {
|
|
| 1952 | 1952 | |
| 1953 | - if (get_option('geodir_listingurl_separator'))
|
|
| 1954 | - delete_option('geodir_listingurl_separator');
|
|
| 1953 | + if (get_option('geodir_listingurl_separator'))
|
|
| 1954 | + delete_option('geodir_listingurl_separator');
|
|
| 1955 | 1955 | |
| 1956 | - if (get_option('geodir_detailurl_separator'))
|
|
| 1957 | - delete_option('geodir_detailurl_separator');
|
|
| 1956 | + if (get_option('geodir_detailurl_separator'))
|
|
| 1957 | + delete_option('geodir_detailurl_separator');
|
|
| 1958 | 1958 | |
| 1959 | - flush_rewrite_rules(false); |
|
| 1959 | + flush_rewrite_rules(false); |
|
| 1960 | 1960 | |
| 1961 | - update_option('geodir_remove_url_seperator', '1');
|
|
| 1961 | + update_option('geodir_remove_url_seperator', '1');
|
|
| 1962 | 1962 | |
| 1963 | - } |
|
| 1963 | + } |
|
| 1964 | 1964 | |
| 1965 | 1965 | } |
| 1966 | 1966 | |
@@ -1976,19 +1976,19 @@ discard block |
||
| 1976 | 1976 | */ |
| 1977 | 1977 | function geodir_remove_url_seperator_form_permalink_settings($permalink_arr) |
| 1978 | 1978 | {
|
| 1979 | - foreach ($permalink_arr as $key => $value) {
|
|
| 1979 | + foreach ($permalink_arr as $key => $value) {
|
|
| 1980 | 1980 | |
| 1981 | - if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') |
|
| 1982 | - unset($permalink_arr[$key]); |
|
| 1981 | + if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') |
|
| 1982 | + unset($permalink_arr[$key]); |
|
| 1983 | 1983 | |
| 1984 | - } |
|
| 1984 | + } |
|
| 1985 | 1985 | |
| 1986 | - return $permalink_arr; |
|
| 1986 | + return $permalink_arr; |
|
| 1987 | 1987 | |
| 1988 | 1988 | } |
| 1989 | 1989 | |
| 1990 | 1990 | if (!is_admin()) {
|
| 1991 | - add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');
|
|
| 1991 | + add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');
|
|
| 1992 | 1992 | } |
| 1993 | 1993 | /** |
| 1994 | 1994 | * Set status from draft to publish. |
@@ -2001,16 +2001,16 @@ discard block |
||
| 2001 | 2001 | */ |
| 2002 | 2002 | function geodir_set_status_draft_to_publish_for_own_post($post) |
| 2003 | 2003 | {
|
| 2004 | - $user_id = get_current_user_id(); |
|
| 2004 | + $user_id = get_current_user_id(); |
|
| 2005 | 2005 | |
| 2006 | - if(!$user_id){return $post;}
|
|
| 2006 | + if(!$user_id){return $post;}
|
|
| 2007 | 2007 | |
| 2008 | - $gd_post_types = geodir_get_posttypes(); |
|
| 2008 | + $gd_post_types = geodir_get_posttypes(); |
|
| 2009 | 2009 | |
| 2010 | - if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {
|
|
| 2011 | - $post[0]->post_status = 'publish'; |
|
| 2012 | - } |
|
| 2013 | - return $post; |
|
| 2010 | + if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {
|
|
| 2011 | + $post[0]->post_status = 'publish'; |
|
| 2012 | + } |
|
| 2013 | + return $post; |
|
| 2014 | 2014 | } |
| 2015 | 2015 | |
| 2016 | 2016 | |
@@ -2102,33 +2102,33 @@ discard block |
||
| 2102 | 2102 | */ |
| 2103 | 2103 | function geodir_detail_page_tab_headings_change($tabs_arr) |
| 2104 | 2104 | {
|
| 2105 | - global $wpdb; |
|
| 2105 | + global $wpdb; |
|
| 2106 | 2106 | |
| 2107 | - $post_type = geodir_get_current_posttype(); |
|
| 2107 | + $post_type = geodir_get_current_posttype(); |
|
| 2108 | 2108 | |
| 2109 | - $all_postypes = geodir_get_posttypes(); |
|
| 2109 | + $all_postypes = geodir_get_posttypes(); |
|
| 2110 | 2110 | |
| 2111 | - if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {
|
|
| 2111 | + if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {
|
|
| 2112 | 2112 | |
| 2113 | - if (array_key_exists('post_video', $tabs_arr)) {
|
|
| 2113 | + if (array_key_exists('post_video', $tabs_arr)) {
|
|
| 2114 | 2114 | |
| 2115 | - $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
| 2115 | + $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
| 2116 | 2116 | |
| 2117 | - if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') |
|
| 2118 | - $tabs_arr['post_video']['heading_text'] = $field_title; |
|
| 2119 | - } |
|
| 2117 | + if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') |
|
| 2118 | + $tabs_arr['post_video']['heading_text'] = $field_title; |
|
| 2119 | + } |
|
| 2120 | 2120 | |
| 2121 | - if (array_key_exists('special_offers', $tabs_arr)) {
|
|
| 2121 | + if (array_key_exists('special_offers', $tabs_arr)) {
|
|
| 2122 | 2122 | |
| 2123 | - $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
| 2123 | + $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
| 2124 | 2124 | |
| 2125 | - if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') |
|
| 2126 | - $tabs_arr['special_offers']['heading_text'] = $field_title; |
|
| 2127 | - } |
|
| 2125 | + if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') |
|
| 2126 | + $tabs_arr['special_offers']['heading_text'] = $field_title; |
|
| 2127 | + } |
|
| 2128 | 2128 | |
| 2129 | - } |
|
| 2129 | + } |
|
| 2130 | 2130 | |
| 2131 | - return $tabs_arr; |
|
| 2131 | + return $tabs_arr; |
|
| 2132 | 2132 | |
| 2133 | 2133 | } |
| 2134 | 2134 | |
@@ -2141,10 +2141,10 @@ discard block |
||
| 2141 | 2141 | */ |
| 2142 | 2142 | function geodir_remove_template_redirect_actions() |
| 2143 | 2143 | {
|
| 2144 | - if (geodir_is_page('login')){
|
|
| 2145 | - remove_all_actions('template_redirect');
|
|
| 2146 | - remove_action('init', 'avia_modify_front', 10);
|
|
| 2147 | - } |
|
| 2144 | + if (geodir_is_page('login')){
|
|
| 2145 | + remove_all_actions('template_redirect');
|
|
| 2146 | + remove_action('init', 'avia_modify_front', 10);
|
|
| 2147 | + } |
|
| 2148 | 2148 | } |
| 2149 | 2149 | |
| 2150 | 2150 | |
@@ -2166,51 +2166,51 @@ discard block |
||
| 2166 | 2166 | function geodirectory_before_featured_image_delete($attachment_id) |
| 2167 | 2167 | {
|
| 2168 | 2168 | |
| 2169 | - global $wpdb, $plugin_prefix; |
|
| 2169 | + global $wpdb, $plugin_prefix; |
|
| 2170 | 2170 | |
| 2171 | - $post_id = get_post_field('post_parent', $attachment_id);
|
|
| 2171 | + $post_id = get_post_field('post_parent', $attachment_id);
|
|
| 2172 | 2172 | |
| 2173 | - $attachment_url = wp_get_attachment_url($attachment_id); |
|
| 2173 | + $attachment_url = wp_get_attachment_url($attachment_id); |
|
| 2174 | 2174 | |
| 2175 | - if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {
|
|
| 2175 | + if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {
|
|
| 2176 | 2176 | |
| 2177 | - $post_type = get_post_type($post_id); |
|
| 2177 | + $post_type = get_post_type($post_id); |
|
| 2178 | 2178 | |
| 2179 | - $all_postypes = geodir_get_posttypes(); |
|
| 2179 | + $all_postypes = geodir_get_posttypes(); |
|
| 2180 | 2180 | |
| 2181 | - if (!in_array($post_type, $all_postypes) || !is_admin()) |
|
| 2182 | - return false; |
|
| 2181 | + if (!in_array($post_type, $all_postypes) || !is_admin()) |
|
| 2182 | + return false; |
|
| 2183 | 2183 | |
| 2184 | - $uploads = wp_upload_dir(); |
|
| 2184 | + $uploads = wp_upload_dir(); |
|
| 2185 | 2185 | |
| 2186 | - $split_img_path = explode($uploads['baseurl'], $attachment_url); |
|
| 2186 | + $split_img_path = explode($uploads['baseurl'], $attachment_url); |
|
| 2187 | 2187 | |
| 2188 | - $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 2188 | + $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 2189 | 2189 | |
| 2190 | - $wpdb->query( |
|
| 2191 | - $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",
|
|
| 2192 | - array($post_id, $split_img_file_path) |
|
| 2193 | - ) |
|
| 2194 | - ); |
|
| 2190 | + $wpdb->query( |
|
| 2191 | + $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",
|
|
| 2192 | + array($post_id, $split_img_file_path) |
|
| 2193 | + ) |
|
| 2194 | + ); |
|
| 2195 | 2195 | |
| 2196 | - $attachment_data = $wpdb->get_row( |
|
| 2197 | - $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",
|
|
| 2198 | - array($post_id) |
|
| 2199 | - ) |
|
| 2200 | - ); |
|
| 2196 | + $attachment_data = $wpdb->get_row( |
|
| 2197 | + $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",
|
|
| 2198 | + array($post_id) |
|
| 2199 | + ) |
|
| 2200 | + ); |
|
| 2201 | 2201 | |
| 2202 | - if (!empty($attachment_data)) {
|
|
| 2203 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2204 | - } |
|
| 2202 | + if (!empty($attachment_data)) {
|
|
| 2203 | + $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2204 | + } |
|
| 2205 | 2205 | |
| 2206 | 2206 | |
| 2207 | - $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2207 | + $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2208 | 2208 | |
| 2209 | - $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2209 | + $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2210 | 2210 | |
| 2211 | - geodir_set_wp_featured_image($post_id); |
|
| 2211 | + geodir_set_wp_featured_image($post_id); |
|
| 2212 | 2212 | |
| 2213 | - } |
|
| 2213 | + } |
|
| 2214 | 2214 | |
| 2215 | 2215 | } |
| 2216 | 2216 | |
@@ -2228,79 +2228,79 @@ discard block |
||
| 2228 | 2228 | function geodir_temp_set_post_attachment() |
| 2229 | 2229 | {
|
| 2230 | 2230 | |
| 2231 | - global $wpdb, $plugin_prefix; |
|
| 2231 | + global $wpdb, $plugin_prefix; |
|
| 2232 | 2232 | |
| 2233 | - $all_postypes = geodir_get_posttypes(); |
|
| 2233 | + $all_postypes = geodir_get_posttypes(); |
|
| 2234 | 2234 | |
| 2235 | - foreach ($all_postypes as $posttype) {
|
|
| 2235 | + foreach ($all_postypes as $posttype) {
|
|
| 2236 | 2236 | |
| 2237 | - $tablename = $plugin_prefix . $posttype . '_detail'; |
|
| 2237 | + $tablename = $plugin_prefix . $posttype . '_detail'; |
|
| 2238 | 2238 | |
| 2239 | - $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);
|
|
| 2239 | + $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);
|
|
| 2240 | 2240 | |
| 2241 | - if (!empty($get_post_data)) {
|
|
| 2241 | + if (!empty($get_post_data)) {
|
|
| 2242 | 2242 | |
| 2243 | - foreach ($get_post_data as $data) {
|
|
| 2243 | + foreach ($get_post_data as $data) {
|
|
| 2244 | 2244 | |
| 2245 | - $post_id = $data->post_id; |
|
| 2245 | + $post_id = $data->post_id; |
|
| 2246 | 2246 | |
| 2247 | - $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");
|
|
| 2247 | + $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");
|
|
| 2248 | 2248 | |
| 2249 | - if (!empty($attachment_data)) {
|
|
| 2249 | + if (!empty($attachment_data)) {
|
|
| 2250 | 2250 | |
| 2251 | - foreach ($attachment_data as $attach) {
|
|
| 2251 | + foreach ($attachment_data as $attach) {
|
|
| 2252 | 2252 | |
| 2253 | - $file_info = pathinfo($attach->file); |
|
| 2253 | + $file_info = pathinfo($attach->file); |
|
| 2254 | 2254 | |
| 2255 | - $sub_dir = ''; |
|
| 2256 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 2257 | - $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 2255 | + $sub_dir = ''; |
|
| 2256 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 2257 | + $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 2258 | 2258 | |
| 2259 | - $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 2260 | - $uploads_path = $uploads['basedir']; |
|
| 2259 | + $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 2260 | + $uploads_path = $uploads['basedir']; |
|
| 2261 | 2261 | |
| 2262 | - $file_name = $file_info['basename']; |
|
| 2262 | + $file_name = $file_info['basename']; |
|
| 2263 | 2263 | |
| 2264 | - $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name; |
|
| 2264 | + $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name; |
|
| 2265 | 2265 | |
| 2266 | - if (!file_exists($img_arr['path'])) {
|
|
| 2266 | + if (!file_exists($img_arr['path'])) {
|
|
| 2267 | 2267 | |
| 2268 | - $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);
|
|
| 2268 | + $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);
|
|
| 2269 | 2269 | |
| 2270 | - } |
|
| 2270 | + } |
|
| 2271 | 2271 | |
| 2272 | - } |
|
| 2272 | + } |
|
| 2273 | 2273 | |
| 2274 | - $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");
|
|
| 2274 | + $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");
|
|
| 2275 | 2275 | |
| 2276 | - if (!empty($attachment_data)) {
|
|
| 2276 | + if (!empty($attachment_data)) {
|
|
| 2277 | 2277 | |
| 2278 | - if ($attachment_data->ID) |
|
| 2279 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2278 | + if ($attachment_data->ID) |
|
| 2279 | + $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2280 | 2280 | |
| 2281 | - } else {
|
|
| 2281 | + } else {
|
|
| 2282 | 2282 | |
| 2283 | - if (has_post_thumbnail($post_id)) {
|
|
| 2283 | + if (has_post_thumbnail($post_id)) {
|
|
| 2284 | 2284 | |
| 2285 | - $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2285 | + $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2286 | 2286 | |
| 2287 | - wp_delete_attachment($post_thumbnail_id); |
|
| 2287 | + wp_delete_attachment($post_thumbnail_id); |
|
| 2288 | 2288 | |
| 2289 | - } |
|
| 2289 | + } |
|
| 2290 | 2290 | |
| 2291 | - } |
|
| 2291 | + } |
|
| 2292 | 2292 | |
| 2293 | - $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2293 | + $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2294 | 2294 | |
| 2295 | - geodir_set_wp_featured_image($post_id); |
|
| 2295 | + geodir_set_wp_featured_image($post_id); |
|
| 2296 | 2296 | |
| 2297 | - } |
|
| 2297 | + } |
|
| 2298 | 2298 | |
| 2299 | - } |
|
| 2299 | + } |
|
| 2300 | 2300 | |
| 2301 | - } |
|
| 2301 | + } |
|
| 2302 | 2302 | |
| 2303 | - } |
|
| 2303 | + } |
|
| 2304 | 2304 | |
| 2305 | 2305 | } |
| 2306 | 2306 | |
@@ -2318,9 +2318,9 @@ discard block |
||
| 2318 | 2318 | function geodir_default_rating_star_icon() |
| 2319 | 2319 | {
|
| 2320 | 2320 | |
| 2321 | - if (!get_option('geodir_default_rating_star_icon')) {
|
|
| 2322 | - update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');
|
|
| 2323 | - } |
|
| 2321 | + if (!get_option('geodir_default_rating_star_icon')) {
|
|
| 2322 | + update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');
|
|
| 2323 | + } |
|
| 2324 | 2324 | |
| 2325 | 2325 | } |
| 2326 | 2326 | |
@@ -2338,27 +2338,27 @@ discard block |
||
| 2338 | 2338 | */ |
| 2339 | 2339 | function geodir_user_post_listing_count($user_id=null) |
| 2340 | 2340 | {
|
| 2341 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 2342 | - if(!$user_id){
|
|
| 2343 | - $user_id = $current_user->ID; |
|
| 2344 | - } |
|
| 2341 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 2342 | + if(!$user_id){
|
|
| 2343 | + $user_id = $current_user->ID; |
|
| 2344 | + } |
|
| 2345 | 2345 | |
| 2346 | - $user_id = $current_user->ID; |
|
| 2347 | - $all_postypes = geodir_get_posttypes(); |
|
| 2348 | - $all_posts = get_option('geodir_listing_link_user_dashboard');
|
|
| 2346 | + $user_id = $current_user->ID; |
|
| 2347 | + $all_postypes = geodir_get_posttypes(); |
|
| 2348 | + $all_posts = get_option('geodir_listing_link_user_dashboard');
|
|
| 2349 | 2349 | |
| 2350 | - $user_listing = array(); |
|
| 2351 | - if (is_array($all_posts) && !empty($all_posts)) {
|
|
| 2352 | - foreach ($all_posts as $ptype) {
|
|
| 2353 | - $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");
|
|
| 2350 | + $user_listing = array(); |
|
| 2351 | + if (is_array($all_posts) && !empty($all_posts)) {
|
|
| 2352 | + foreach ($all_posts as $ptype) {
|
|
| 2353 | + $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");
|
|
| 2354 | 2354 | |
| 2355 | - if ($total_posts > 0) {
|
|
| 2356 | - $user_listing[$ptype] = $total_posts; |
|
| 2357 | - } |
|
| 2358 | - } |
|
| 2359 | - } |
|
| 2355 | + if ($total_posts > 0) {
|
|
| 2356 | + $user_listing[$ptype] = $total_posts; |
|
| 2357 | + } |
|
| 2358 | + } |
|
| 2359 | + } |
|
| 2360 | 2360 | |
| 2361 | - return $user_listing; |
|
| 2361 | + return $user_listing; |
|
| 2362 | 2362 | } |
| 2363 | 2363 | |
| 2364 | 2364 | |
@@ -2378,189 +2378,189 @@ discard block |
||
| 2378 | 2378 | */ |
| 2379 | 2379 | function geodir_detail_page_custom_field_tab($tabs_arr) |
| 2380 | 2380 | {
|
| 2381 | - global $post; |
|
| 2382 | - |
|
| 2383 | - $post_type = geodir_get_current_posttype(); |
|
| 2384 | - $all_postypes = geodir_get_posttypes(); |
|
| 2385 | - |
|
| 2386 | - if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {
|
|
| 2387 | - $package_info = array(); |
|
| 2388 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 2389 | - $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 2390 | - $fields_location = 'owntab'; |
|
| 2391 | - |
|
| 2392 | - $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location); |
|
| 2393 | - //remove video and special offers if it is already set to show |
|
| 2394 | - if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){
|
|
| 2395 | - $unset_video = true; |
|
| 2396 | - } |
|
| 2397 | - |
|
| 2398 | - if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){
|
|
| 2399 | - $unset_special_offers = true; |
|
| 2400 | - } |
|
| 2401 | - if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){
|
|
| 2402 | - foreach($custom_fields as $key => $custom_field){
|
|
| 2403 | - if($custom_field['name']=='geodir_video' && isset($unset_video)){
|
|
| 2404 | - unset($custom_fields[$key]); |
|
| 2405 | - } |
|
| 2406 | - if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){
|
|
| 2407 | - unset($custom_fields[$key]); |
|
| 2408 | - } |
|
| 2409 | - } |
|
| 2410 | - } |
|
| 2411 | - |
|
| 2412 | - |
|
| 2413 | - if (!empty($custom_fields)) {
|
|
| 2414 | - $parse_custom_fields = array(); |
|
| 2415 | - foreach ($custom_fields as $field) {
|
|
| 2416 | - $field = stripslashes_deep($field); // strip slashes |
|
| 2417 | - $type = $field; |
|
| 2418 | - $field_name = $field['htmlvar_name']; |
|
| 2419 | - if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2420 | - $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2421 | - } |
|
| 2381 | + global $post; |
|
| 2422 | 2382 | |
| 2423 | - if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2424 | - if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2425 | - continue; |
|
| 2426 | - } |
|
| 2383 | + $post_type = geodir_get_current_posttype(); |
|
| 2384 | + $all_postypes = geodir_get_posttypes(); |
|
| 2427 | 2385 | |
| 2428 | - $parse_custom_fields[] = $field; |
|
| 2429 | - } |
|
| 2430 | - } |
|
| 2431 | - $custom_fields = $parse_custom_fields; |
|
| 2432 | - } |
|
| 2433 | - //print_r($custom_fields); |
|
| 2434 | - if (!empty($custom_fields)) {
|
|
| 2386 | + if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {
|
|
| 2387 | + $package_info = array(); |
|
| 2388 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 2389 | + $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 2390 | + $fields_location = 'owntab'; |
|
| 2435 | 2391 | |
| 2436 | - global $field_set_start; |
|
| 2392 | + $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location); |
|
| 2393 | + //remove video and special offers if it is already set to show |
|
| 2394 | + if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){
|
|
| 2395 | + $unset_video = true; |
|
| 2396 | + } |
|
| 2437 | 2397 | |
| 2438 | - $post = stripslashes_deep($post); // strip slashes |
|
| 2439 | - |
|
| 2440 | - $field_set_start = 0; |
|
| 2441 | - $fieldset_count = 0; |
|
| 2442 | - $fieldset = ''; |
|
| 2443 | - $total_fields = count($custom_fields); |
|
| 2444 | - $count_field = 0; |
|
| 2445 | - $fieldset_arr = array(); |
|
| 2446 | - $i = 0; |
|
| 2447 | - $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL; |
|
| 2448 | - |
|
| 2449 | - foreach ($custom_fields as $field) {
|
|
| 2450 | - $count_field++; |
|
| 2451 | - $field_name = $field['htmlvar_name']; |
|
| 2452 | - if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2453 | - $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2454 | - } |
|
| 2398 | + if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){
|
|
| 2399 | + $unset_special_offers = true; |
|
| 2400 | + } |
|
| 2401 | + if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){
|
|
| 2402 | + foreach($custom_fields as $key => $custom_field){
|
|
| 2403 | + if($custom_field['name']=='geodir_video' && isset($unset_video)){
|
|
| 2404 | + unset($custom_fields[$key]); |
|
| 2405 | + } |
|
| 2406 | + if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){
|
|
| 2407 | + unset($custom_fields[$key]); |
|
| 2408 | + } |
|
| 2409 | + } |
|
| 2410 | + } |
|
| 2455 | 2411 | |
| 2456 | - if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2457 | - $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title']; |
|
| 2458 | - $site_title = trim($field['site_title']); |
|
| 2459 | - $type = $field; |
|
| 2460 | - $variables_array = array(); |
|
| 2461 | 2412 | |
| 2462 | - if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2463 | - continue; |
|
| 2464 | - } |
|
| 2413 | + if (!empty($custom_fields)) {
|
|
| 2414 | + $parse_custom_fields = array(); |
|
| 2415 | + foreach ($custom_fields as $field) {
|
|
| 2416 | + $field = stripslashes_deep($field); // strip slashes |
|
| 2417 | + $type = $field; |
|
| 2418 | + $field_name = $field['htmlvar_name']; |
|
| 2419 | + if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2420 | + $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2421 | + } |
|
| 2465 | 2422 | |
| 2466 | - if ($type['type'] != 'fieldset') {
|
|
| 2467 | - $i++; |
|
| 2468 | - $variables_array['post_id'] = $post->ID; |
|
| 2469 | - $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 2470 | - $variables_array['value'] = ''; |
|
| 2471 | - $variables_array['value'] = $post->{$type['htmlvar_name']};
|
|
| 2472 | - }else{
|
|
| 2473 | - $i = 0; |
|
| 2474 | - $fieldset_count++; |
|
| 2475 | - $field_set_start = 1; |
|
| 2476 | - $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count; |
|
| 2477 | - $fieldset_arr[$fieldset_count]['label'] = $label; |
|
| 2478 | - } |
|
| 2423 | + if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2424 | + if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2425 | + continue; |
|
| 2426 | + } |
|
| 2479 | 2427 | |
| 2428 | + $parse_custom_fields[] = $field; |
|
| 2429 | + } |
|
| 2430 | + } |
|
| 2431 | + $custom_fields = $parse_custom_fields; |
|
| 2432 | + } |
|
| 2433 | + //print_r($custom_fields); |
|
| 2434 | + if (!empty($custom_fields)) {
|
|
| 2480 | 2435 | |
| 2481 | - if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 2482 | - $type = stripslashes_deep($type); // strip slashes |
|
| 2483 | - if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 2484 | - $html = ''; |
|
| 2485 | - $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 2486 | - if($html_var=='post'){$html_var='post_address';}
|
|
| 2487 | - $field_icon = geodir_field_icon_proccess($type); |
|
| 2488 | - $filed_type = $type['type']; |
|
| 2489 | - |
|
| 2490 | - /** |
|
| 2491 | - * Filter the output for custom fields. |
|
| 2492 | - * |
|
| 2493 | - * Here we can remove or add new functions depending on the field type. |
|
| 2494 | - * |
|
| 2495 | - * @param string $html The html to be filtered (blank). |
|
| 2496 | - * @param string $fields_location The location the field is to be show. |
|
| 2497 | - * @param array $type The array of field values. |
|
| 2498 | - */ |
|
| 2499 | - $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 2500 | - |
|
| 2501 | - |
|
| 2502 | - /** |
|
| 2503 | - * Filter custom field output in tab. |
|
| 2504 | - * |
|
| 2505 | - * @since 1.5.6 |
|
| 2506 | - * |
|
| 2507 | - * @param string $html_var The HTML variable name for the field. |
|
| 2508 | - * @param string $html Custom field unfiltered HTML. |
|
| 2509 | - * @param array $variables_array Custom field variables array. |
|
| 2510 | - */ |
|
| 2511 | - $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);
|
|
| 2512 | - |
|
| 2513 | - $fieldset_html = ''; |
|
| 2514 | - if ($field_set_start == 1) {
|
|
| 2515 | - $add_html = false; |
|
| 2516 | - if ($type['type'] == 'fieldset' && $fieldset_count > 1) {
|
|
| 2517 | - if ($fieldset != '') {
|
|
| 2518 | - $add_html = true; |
|
| 2519 | - $label = $fieldset_arr[$fieldset_count - 1]['label']; |
|
| 2520 | - $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name']; |
|
| 2521 | - } |
|
| 2522 | - $fieldset_html = $fieldset; |
|
| 2523 | - $fieldset = ''; |
|
| 2524 | - } else {
|
|
| 2525 | - $fieldset .= $html; |
|
| 2526 | - if ($total_fields == $count_field && $fieldset != '') {
|
|
| 2527 | - $add_html = true; |
|
| 2528 | - $label = $fieldset_arr[$fieldset_count]['label']; |
|
| 2529 | - $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name']; |
|
| 2530 | - $fieldset_html = $fieldset; |
|
| 2531 | - } |
|
| 2532 | - } |
|
| 2436 | + global $field_set_start; |
|
| 2533 | 2437 | |
| 2534 | - if ($add_html) {
|
|
| 2535 | - $tabs_arr[$htmlvar_name] = array( |
|
| 2536 | - 'heading_text' => __($label, 'geodirectory'), |
|
| 2537 | - 'is_active_tab' => false, |
|
| 2538 | - /** |
|
| 2539 | - * Filter if a custom field should be displayed on the details page tab. |
|
| 2540 | - * |
|
| 2541 | - * @since 1.0.0 |
|
| 2542 | - * @param string $htmlvar_name The field HTML var name. |
|
| 2543 | - */ |
|
| 2544 | - 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),
|
|
| 2545 | - 'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>' |
|
| 2546 | - ); |
|
| 2547 | - } |
|
| 2548 | - } else {
|
|
| 2549 | - if ($html != '') {
|
|
| 2550 | - $tabs_arr[$html_var] = array( |
|
| 2551 | - 'heading_text' => __($label, 'geodirectory'), |
|
| 2552 | - 'is_active_tab' => false, |
|
| 2553 | - /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 2554 | - 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),
|
|
| 2555 | - 'tab_content' => $html |
|
| 2556 | - ); |
|
| 2557 | - } |
|
| 2558 | - } |
|
| 2559 | - } |
|
| 2560 | - } |
|
| 2561 | - } |
|
| 2562 | - } |
|
| 2563 | - return $tabs_arr; |
|
| 2438 | + $post = stripslashes_deep($post); // strip slashes |
|
| 2439 | + |
|
| 2440 | + $field_set_start = 0; |
|
| 2441 | + $fieldset_count = 0; |
|
| 2442 | + $fieldset = ''; |
|
| 2443 | + $total_fields = count($custom_fields); |
|
| 2444 | + $count_field = 0; |
|
| 2445 | + $fieldset_arr = array(); |
|
| 2446 | + $i = 0; |
|
| 2447 | + $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL; |
|
| 2448 | + |
|
| 2449 | + foreach ($custom_fields as $field) {
|
|
| 2450 | + $count_field++; |
|
| 2451 | + $field_name = $field['htmlvar_name']; |
|
| 2452 | + if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2453 | + $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2454 | + } |
|
| 2455 | + |
|
| 2456 | + if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2457 | + $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title']; |
|
| 2458 | + $site_title = trim($field['site_title']); |
|
| 2459 | + $type = $field; |
|
| 2460 | + $variables_array = array(); |
|
| 2461 | + |
|
| 2462 | + if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2463 | + continue; |
|
| 2464 | + } |
|
| 2465 | + |
|
| 2466 | + if ($type['type'] != 'fieldset') {
|
|
| 2467 | + $i++; |
|
| 2468 | + $variables_array['post_id'] = $post->ID; |
|
| 2469 | + $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 2470 | + $variables_array['value'] = ''; |
|
| 2471 | + $variables_array['value'] = $post->{$type['htmlvar_name']};
|
|
| 2472 | + }else{
|
|
| 2473 | + $i = 0; |
|
| 2474 | + $fieldset_count++; |
|
| 2475 | + $field_set_start = 1; |
|
| 2476 | + $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count; |
|
| 2477 | + $fieldset_arr[$fieldset_count]['label'] = $label; |
|
| 2478 | + } |
|
| 2479 | + |
|
| 2480 | + |
|
| 2481 | + if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 2482 | + $type = stripslashes_deep($type); // strip slashes |
|
| 2483 | + if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 2484 | + $html = ''; |
|
| 2485 | + $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 2486 | + if($html_var=='post'){$html_var='post_address';}
|
|
| 2487 | + $field_icon = geodir_field_icon_proccess($type); |
|
| 2488 | + $filed_type = $type['type']; |
|
| 2489 | + |
|
| 2490 | + /** |
|
| 2491 | + * Filter the output for custom fields. |
|
| 2492 | + * |
|
| 2493 | + * Here we can remove or add new functions depending on the field type. |
|
| 2494 | + * |
|
| 2495 | + * @param string $html The html to be filtered (blank). |
|
| 2496 | + * @param string $fields_location The location the field is to be show. |
|
| 2497 | + * @param array $type The array of field values. |
|
| 2498 | + */ |
|
| 2499 | + $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 2500 | + |
|
| 2501 | + |
|
| 2502 | + /** |
|
| 2503 | + * Filter custom field output in tab. |
|
| 2504 | + * |
|
| 2505 | + * @since 1.5.6 |
|
| 2506 | + * |
|
| 2507 | + * @param string $html_var The HTML variable name for the field. |
|
| 2508 | + * @param string $html Custom field unfiltered HTML. |
|
| 2509 | + * @param array $variables_array Custom field variables array. |
|
| 2510 | + */ |
|
| 2511 | + $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);
|
|
| 2512 | + |
|
| 2513 | + $fieldset_html = ''; |
|
| 2514 | + if ($field_set_start == 1) {
|
|
| 2515 | + $add_html = false; |
|
| 2516 | + if ($type['type'] == 'fieldset' && $fieldset_count > 1) {
|
|
| 2517 | + if ($fieldset != '') {
|
|
| 2518 | + $add_html = true; |
|
| 2519 | + $label = $fieldset_arr[$fieldset_count - 1]['label']; |
|
| 2520 | + $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name']; |
|
| 2521 | + } |
|
| 2522 | + $fieldset_html = $fieldset; |
|
| 2523 | + $fieldset = ''; |
|
| 2524 | + } else {
|
|
| 2525 | + $fieldset .= $html; |
|
| 2526 | + if ($total_fields == $count_field && $fieldset != '') {
|
|
| 2527 | + $add_html = true; |
|
| 2528 | + $label = $fieldset_arr[$fieldset_count]['label']; |
|
| 2529 | + $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name']; |
|
| 2530 | + $fieldset_html = $fieldset; |
|
| 2531 | + } |
|
| 2532 | + } |
|
| 2533 | + |
|
| 2534 | + if ($add_html) {
|
|
| 2535 | + $tabs_arr[$htmlvar_name] = array( |
|
| 2536 | + 'heading_text' => __($label, 'geodirectory'), |
|
| 2537 | + 'is_active_tab' => false, |
|
| 2538 | + /** |
|
| 2539 | + * Filter if a custom field should be displayed on the details page tab. |
|
| 2540 | + * |
|
| 2541 | + * @since 1.0.0 |
|
| 2542 | + * @param string $htmlvar_name The field HTML var name. |
|
| 2543 | + */ |
|
| 2544 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),
|
|
| 2545 | + 'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>' |
|
| 2546 | + ); |
|
| 2547 | + } |
|
| 2548 | + } else {
|
|
| 2549 | + if ($html != '') {
|
|
| 2550 | + $tabs_arr[$html_var] = array( |
|
| 2551 | + 'heading_text' => __($label, 'geodirectory'), |
|
| 2552 | + 'is_active_tab' => false, |
|
| 2553 | + /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 2554 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),
|
|
| 2555 | + 'tab_content' => $html |
|
| 2556 | + ); |
|
| 2557 | + } |
|
| 2558 | + } |
|
| 2559 | + } |
|
| 2560 | + } |
|
| 2561 | + } |
|
| 2562 | + } |
|
| 2563 | + return $tabs_arr; |
|
| 2564 | 2564 | } |
| 2565 | 2565 | |
| 2566 | 2566 | /* display add listing page for wpml */ |
@@ -2584,39 +2584,39 @@ discard block |
||
| 2584 | 2584 | */ |
| 2585 | 2585 | function geodir_add_post_status_author_page() |
| 2586 | 2586 | {
|
| 2587 | - global $wpdb, $post; |
|
| 2588 | - |
|
| 2589 | - $html = ''; |
|
| 2590 | - if (get_current_user_id()) {
|
|
| 2591 | - |
|
| 2592 | - $is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));
|
|
| 2593 | - if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {
|
|
| 2594 | - |
|
| 2595 | - // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them. |
|
| 2596 | - $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");
|
|
| 2597 | - $status = "<strong>(";
|
|
| 2598 | - $status_icon = '<i class="fa fa-play"></i>'; |
|
| 2599 | - if ($real_status == 'publish') {
|
|
| 2600 | - $status .= __('Published', 'geodirectory');
|
|
| 2601 | - } else {
|
|
| 2602 | - $status .= __('Not published', 'geodirectory');
|
|
| 2603 | - $status_icon = '<i class="fa fa-pause"></i>'; |
|
| 2604 | - } |
|
| 2605 | - $status .= ")</strong>"; |
|
| 2587 | + global $wpdb, $post; |
|
| 2588 | + |
|
| 2589 | + $html = ''; |
|
| 2590 | + if (get_current_user_id()) {
|
|
| 2591 | + |
|
| 2592 | + $is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));
|
|
| 2593 | + if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {
|
|
| 2594 | + |
|
| 2595 | + // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them. |
|
| 2596 | + $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");
|
|
| 2597 | + $status = "<strong>(";
|
|
| 2598 | + $status_icon = '<i class="fa fa-play"></i>'; |
|
| 2599 | + if ($real_status == 'publish') {
|
|
| 2600 | + $status .= __('Published', 'geodirectory');
|
|
| 2601 | + } else {
|
|
| 2602 | + $status .= __('Not published', 'geodirectory');
|
|
| 2603 | + $status_icon = '<i class="fa fa-pause"></i>'; |
|
| 2604 | + } |
|
| 2605 | + $status .= ")</strong>"; |
|
| 2606 | 2606 | |
| 2607 | - $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';
|
|
| 2608 | - } |
|
| 2609 | - } |
|
| 2607 | + $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';
|
|
| 2608 | + } |
|
| 2609 | + } |
|
| 2610 | 2610 | |
| 2611 | - if ($html != '') {
|
|
| 2612 | - /** |
|
| 2613 | - * Filter the post status text on the author page. |
|
| 2614 | - * |
|
| 2615 | - * @since 1.0.0 |
|
| 2616 | - * @param string $html The HTML of the status. |
|
| 2617 | - */ |
|
| 2618 | - echo apply_filters('geodir_filter_status_text_on_author_page', $html);
|
|
| 2619 | - } |
|
| 2611 | + if ($html != '') {
|
|
| 2612 | + /** |
|
| 2613 | + * Filter the post status text on the author page. |
|
| 2614 | + * |
|
| 2615 | + * @since 1.0.0 |
|
| 2616 | + * @param string $html The HTML of the status. |
|
| 2617 | + */ |
|
| 2618 | + echo apply_filters('geodir_filter_status_text_on_author_page', $html);
|
|
| 2619 | + } |
|
| 2620 | 2620 | |
| 2621 | 2621 | |
| 2622 | 2622 | } |
@@ -2630,21 +2630,21 @@ discard block |
||
| 2630 | 2630 | */ |
| 2631 | 2631 | function geodir_init_no_rating() |
| 2632 | 2632 | {
|
| 2633 | - if (get_option('geodir_disable_rating')) {
|
|
| 2634 | - remove_action('comment_form_logged_in_after', 'geodir_comment_rating_fields');
|
|
| 2635 | - remove_action('comment_form_before_fields', 'geodir_comment_rating_fields');
|
|
| 2636 | - remove_action('comment_form_logged_in_after', 'geodir_reviewrating_comment_rating_fields');
|
|
| 2637 | - remove_action('comment_form_before_fields', 'geodir_reviewrating_comment_rating_fields');
|
|
| 2638 | - remove_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');
|
|
| 2639 | - remove_action('add_meta_boxes', 'geodir_reviewrating_comment_metabox', 13);
|
|
| 2640 | - remove_filter('comment_text', 'geodir_wrap_comment_text', 40);
|
|
| 2641 | - |
|
| 2642 | - add_action('comment_form_logged_in_after', 'geodir_no_rating_rating_fields');
|
|
| 2643 | - add_action('comment_form_before_fields', 'geodir_no_rating_rating_fields');
|
|
| 2644 | - add_filter('comment_text', 'geodir_no_rating_comment_text', 100, 2);
|
|
| 2645 | - add_filter('geodir_detail_page_review_rating_html', 'geodir_no_rating_review_rating_html', 100);
|
|
| 2646 | - add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);
|
|
| 2647 | - } |
|
| 2633 | + if (get_option('geodir_disable_rating')) {
|
|
| 2634 | + remove_action('comment_form_logged_in_after', 'geodir_comment_rating_fields');
|
|
| 2635 | + remove_action('comment_form_before_fields', 'geodir_comment_rating_fields');
|
|
| 2636 | + remove_action('comment_form_logged_in_after', 'geodir_reviewrating_comment_rating_fields');
|
|
| 2637 | + remove_action('comment_form_before_fields', 'geodir_reviewrating_comment_rating_fields');
|
|
| 2638 | + remove_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');
|
|
| 2639 | + remove_action('add_meta_boxes', 'geodir_reviewrating_comment_metabox', 13);
|
|
| 2640 | + remove_filter('comment_text', 'geodir_wrap_comment_text', 40);
|
|
| 2641 | + |
|
| 2642 | + add_action('comment_form_logged_in_after', 'geodir_no_rating_rating_fields');
|
|
| 2643 | + add_action('comment_form_before_fields', 'geodir_no_rating_rating_fields');
|
|
| 2644 | + add_filter('comment_text', 'geodir_no_rating_comment_text', 100, 2);
|
|
| 2645 | + add_filter('geodir_detail_page_review_rating_html', 'geodir_no_rating_review_rating_html', 100);
|
|
| 2646 | + add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);
|
|
| 2647 | + } |
|
| 2648 | 2648 | } |
| 2649 | 2649 | |
| 2650 | 2650 | /** |
@@ -2656,24 +2656,24 @@ discard block |
||
| 2656 | 2656 | */ |
| 2657 | 2657 | function geodir_no_rating_rating_fields() |
| 2658 | 2658 | {
|
| 2659 | - global $post; |
|
| 2659 | + global $post; |
|
| 2660 | 2660 | |
| 2661 | - $post_types = geodir_get_posttypes(); |
|
| 2661 | + $post_types = geodir_get_posttypes(); |
|
| 2662 | 2662 | |
| 2663 | - if (!empty($post) && isset($post->post_type) && in_array($post->post_type, $post_types)) {
|
|
| 2664 | - if (is_plugin_active('geodir_review_rating_manager/geodir_review_rating_manager.php')) {
|
|
| 2665 | - if (get_option('geodir_reviewrating_enable_rating')) {
|
|
| 2666 | - echo '<input type="hidden" value="1" name="geodir_rating[overall]" />'; |
|
| 2667 | - } else {
|
|
| 2668 | - echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="1" />'; |
|
| 2669 | - } |
|
| 2670 | - if (get_option('geodir_reviewrating_enable_images')) {
|
|
| 2671 | - geodir_reviewrating_rating_img_html(); |
|
| 2672 | - } |
|
| 2673 | - } else {
|
|
| 2674 | - echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="1" />'; |
|
| 2675 | - } |
|
| 2676 | - } |
|
| 2663 | + if (!empty($post) && isset($post->post_type) && in_array($post->post_type, $post_types)) {
|
|
| 2664 | + if (is_plugin_active('geodir_review_rating_manager/geodir_review_rating_manager.php')) {
|
|
| 2665 | + if (get_option('geodir_reviewrating_enable_rating')) {
|
|
| 2666 | + echo '<input type="hidden" value="1" name="geodir_rating[overall]" />'; |
|
| 2667 | + } else {
|
|
| 2668 | + echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="1" />'; |
|
| 2669 | + } |
|
| 2670 | + if (get_option('geodir_reviewrating_enable_images')) {
|
|
| 2671 | + geodir_reviewrating_rating_img_html(); |
|
| 2672 | + } |
|
| 2673 | + } else {
|
|
| 2674 | + echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="1" />'; |
|
| 2675 | + } |
|
| 2676 | + } |
|
| 2677 | 2677 | } |
| 2678 | 2678 | |
| 2679 | 2679 | /** |
@@ -2687,11 +2687,11 @@ discard block |
||
| 2687 | 2687 | */ |
| 2688 | 2688 | function geodir_no_rating_comment_text($content, $comment = '') |
| 2689 | 2689 | {
|
| 2690 | - if (!is_admin()) {
|
|
| 2691 | - return '<div class="description">' . $content . '</div>'; |
|
| 2692 | - } else {
|
|
| 2693 | - return $content; |
|
| 2694 | - } |
|
| 2690 | + if (!is_admin()) {
|
|
| 2691 | + return '<div class="description">' . $content . '</div>'; |
|
| 2692 | + } else {
|
|
| 2693 | + return $content; |
|
| 2694 | + } |
|
| 2695 | 2695 | } |
| 2696 | 2696 | |
| 2697 | 2697 | /** |
@@ -2704,7 +2704,7 @@ discard block |
||
| 2704 | 2704 | */ |
| 2705 | 2705 | function geodir_no_rating_review_rating_html($content = '') |
| 2706 | 2706 | {
|
| 2707 | - return NULL; |
|
| 2707 | + return NULL; |
|
| 2708 | 2708 | } |
| 2709 | 2709 | |
| 2710 | 2710 | /** |
@@ -2718,19 +2718,19 @@ discard block |
||
| 2718 | 2718 | */ |
| 2719 | 2719 | function geodir_no_rating_get_sort_options($options, $post_type = '') |
| 2720 | 2720 | {
|
| 2721 | - $new_options = array(); |
|
| 2722 | - if (!empty($options)) {
|
|
| 2723 | - foreach ($options as $option) {
|
|
| 2724 | - if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {
|
|
| 2725 | - continue; |
|
| 2726 | - } |
|
| 2727 | - $new_options[] = $option; |
|
| 2728 | - } |
|
| 2721 | + $new_options = array(); |
|
| 2722 | + if (!empty($options)) {
|
|
| 2723 | + foreach ($options as $option) {
|
|
| 2724 | + if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {
|
|
| 2725 | + continue; |
|
| 2726 | + } |
|
| 2727 | + $new_options[] = $option; |
|
| 2728 | + } |
|
| 2729 | 2729 | |
| 2730 | - $options = $new_options; |
|
| 2731 | - } |
|
| 2730 | + $options = $new_options; |
|
| 2731 | + } |
|
| 2732 | 2732 | |
| 2733 | - return $options; |
|
| 2733 | + return $options; |
|
| 2734 | 2734 | } |
| 2735 | 2735 | |
| 2736 | 2736 | add_filter('geodir_all_js_msg', 'geodir_all_js_msg_no_rating', 100);
|
@@ -2744,11 +2744,11 @@ discard block |
||
| 2744 | 2744 | */ |
| 2745 | 2745 | function geodir_all_js_msg_no_rating($msg = array()) |
| 2746 | 2746 | {
|
| 2747 | - if (get_option('geodir_disable_rating')) {
|
|
| 2748 | - $msg['gd_cmt_no_rating'] = true; |
|
| 2749 | - } |
|
| 2747 | + if (get_option('geodir_disable_rating')) {
|
|
| 2748 | + $msg['gd_cmt_no_rating'] = true; |
|
| 2749 | + } |
|
| 2750 | 2750 | |
| 2751 | - return $msg; |
|
| 2751 | + return $msg; |
|
| 2752 | 2752 | } |
| 2753 | 2753 | |
| 2754 | 2754 | add_filter('body_class', 'geodir_body_class_no_rating', 100);
|
@@ -2762,13 +2762,13 @@ discard block |
||
| 2762 | 2762 | */ |
| 2763 | 2763 | function geodir_body_class_no_rating($classes = array()) |
| 2764 | 2764 | {
|
| 2765 | - if (get_option('geodir_disable_rating')) {
|
|
| 2766 | - $classes[] = 'gd-no-rating'; |
|
| 2767 | - } |
|
| 2765 | + if (get_option('geodir_disable_rating')) {
|
|
| 2766 | + $classes[] = 'gd-no-rating'; |
|
| 2767 | + } |
|
| 2768 | 2768 | |
| 2769 | - $classes[] = 'gd-map-' . geodir_map_name(); |
|
| 2769 | + $classes[] = 'gd-map-' . geodir_map_name(); |
|
| 2770 | 2770 | |
| 2771 | - return $classes; |
|
| 2771 | + return $classes; |
|
| 2772 | 2772 | } |
| 2773 | 2773 | |
| 2774 | 2774 | add_filter('admin_body_class', 'geodir_admin_body_class_no_rating', 100);
|
@@ -2782,13 +2782,13 @@ discard block |
||
| 2782 | 2782 | */ |
| 2783 | 2783 | function geodir_admin_body_class_no_rating($class = '') |
| 2784 | 2784 | {
|
| 2785 | - if (get_option('geodir_disable_rating')) {
|
|
| 2786 | - $class .= ' gd-no-rating'; |
|
| 2787 | - } |
|
| 2785 | + if (get_option('geodir_disable_rating')) {
|
|
| 2786 | + $class .= ' gd-no-rating'; |
|
| 2787 | + } |
|
| 2788 | 2788 | |
| 2789 | - $class .= ' gd-map-' . geodir_map_name(); |
|
| 2789 | + $class .= ' gd-map-' . geodir_map_name(); |
|
| 2790 | 2790 | |
| 2791 | - return $class; |
|
| 2791 | + return $class; |
|
| 2792 | 2792 | } |
| 2793 | 2793 | |
| 2794 | 2794 | add_action('wp_head', 'geodir_wp_head_no_rating');
|
@@ -2801,10 +2801,10 @@ discard block |
||
| 2801 | 2801 | */ |
| 2802 | 2802 | function geodir_wp_head_no_rating() |
| 2803 | 2803 | {
|
| 2804 | - if (get_option('geodir_disable_rating')) {
|
|
| 2805 | - echo '<style>body .geodir-rating, body .geodir-bubble-rating, body .gd_ratings_module_box{display:none!important;}</style>';
|
|
| 2806 | - echo '<script type="text/javascript">jQuery(function(){jQuery(".gd_rating_show").parent(".geodir-rating").remove();});</script>';
|
|
| 2807 | - } |
|
| 2804 | + if (get_option('geodir_disable_rating')) {
|
|
| 2805 | + echo '<style>body .geodir-rating, body .geodir-bubble-rating, body .gd_ratings_module_box{display:none!important;}</style>';
|
|
| 2806 | + echo '<script type="text/javascript">jQuery(function(){jQuery(".gd_rating_show").parent(".geodir-rating").remove();});</script>';
|
|
| 2807 | + } |
|
| 2808 | 2808 | } |
| 2809 | 2809 | |
| 2810 | 2810 | add_filter('geodir_load_db_language', 'geodir_load_custom_field_translation');
|
@@ -2821,36 +2821,36 @@ discard block |
||
| 2821 | 2821 | * @return array Translation texts. |
| 2822 | 2822 | */ |
| 2823 | 2823 | function geodir_load_gd_options_text_translation($translation_texts = array()) {
|
| 2824 | - $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array(); |
|
| 2825 | - |
|
| 2826 | - $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');
|
|
| 2827 | - |
|
| 2828 | - /** |
|
| 2829 | - * Filters the geodirectory option names that requires to add for translation. |
|
| 2830 | - * |
|
| 2831 | - * @since 1.5.7 |
|
| 2832 | - * @package GeoDirectory |
|
| 2833 | - * |
|
| 2834 | - * @param array $gd_options Array of option names. |
|
| 2835 | - */ |
|
| 2836 | - $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);
|
|
| 2837 | - $gd_options = array_unique($gd_options); |
|
| 2838 | - |
|
| 2839 | - if (!empty($gd_options)) {
|
|
| 2840 | - foreach ($gd_options as $gd_option) {
|
|
| 2841 | - if ($gd_option != '' && $option_value = get_option($gd_option)) {
|
|
| 2842 | - $option_value = is_string($option_value) ? stripslashes_deep($option_value) : ''; |
|
| 2824 | + $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array(); |
|
| 2825 | + |
|
| 2826 | + $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');
|
|
| 2827 | + |
|
| 2828 | + /** |
|
| 2829 | + * Filters the geodirectory option names that requires to add for translation. |
|
| 2830 | + * |
|
| 2831 | + * @since 1.5.7 |
|
| 2832 | + * @package GeoDirectory |
|
| 2833 | + * |
|
| 2834 | + * @param array $gd_options Array of option names. |
|
| 2835 | + */ |
|
| 2836 | + $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);
|
|
| 2837 | + $gd_options = array_unique($gd_options); |
|
| 2838 | + |
|
| 2839 | + if (!empty($gd_options)) {
|
|
| 2840 | + foreach ($gd_options as $gd_option) {
|
|
| 2841 | + if ($gd_option != '' && $option_value = get_option($gd_option)) {
|
|
| 2842 | + $option_value = is_string($option_value) ? stripslashes_deep($option_value) : ''; |
|
| 2843 | 2843 | |
| 2844 | - if ($option_value != '' && !in_array($option_value, $translation_texts)) {
|
|
| 2845 | - $translation_texts[] = stripslashes_deep($option_value); |
|
| 2846 | - } |
|
| 2847 | - } |
|
| 2848 | - } |
|
| 2849 | - } |
|
| 2844 | + if ($option_value != '' && !in_array($option_value, $translation_texts)) {
|
|
| 2845 | + $translation_texts[] = stripslashes_deep($option_value); |
|
| 2846 | + } |
|
| 2847 | + } |
|
| 2848 | + } |
|
| 2849 | + } |
|
| 2850 | 2850 | |
| 2851 | - $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 2851 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 2852 | 2852 | |
| 2853 | - return $translation_texts; |
|
| 2853 | + return $translation_texts; |
|
| 2854 | 2854 | } |
| 2855 | 2855 | |
| 2856 | 2856 | add_filter('geodir_load_db_language', 'geodir_load_gd_options_text_translation');
|
@@ -2864,15 +2864,15 @@ discard block |
||
| 2864 | 2864 | |
| 2865 | 2865 | add_filter('get_comments_link', 'gd_get_comments_link', 10, 2);
|
| 2866 | 2866 | function gd_get_comments_link($comments_link, $post_id) {
|
| 2867 | - $post_type = get_post_type($post_id); |
|
| 2867 | + $post_type = get_post_type($post_id); |
|
| 2868 | 2868 | |
| 2869 | - $all_postypes = geodir_get_posttypes(); |
|
| 2870 | - if (in_array($post_type, $all_postypes)) {
|
|
| 2871 | - $comments_link = str_replace('#comments', '#reviews', $comments_link);
|
|
| 2872 | - $comments_link = str_replace('#respond', '#reviews', $comments_link);
|
|
| 2873 | - } |
|
| 2869 | + $all_postypes = geodir_get_posttypes(); |
|
| 2870 | + if (in_array($post_type, $all_postypes)) {
|
|
| 2871 | + $comments_link = str_replace('#comments', '#reviews', $comments_link);
|
|
| 2872 | + $comments_link = str_replace('#respond', '#reviews', $comments_link);
|
|
| 2873 | + } |
|
| 2874 | 2874 | |
| 2875 | - return $comments_link; |
|
| 2875 | + return $comments_link; |
|
| 2876 | 2876 | } |
| 2877 | 2877 | |
| 2878 | 2878 | |
@@ -2890,11 +2890,11 @@ discard block |
||
| 2890 | 2890 | function geodir_add_nav_menu_class( $args ) |
| 2891 | 2891 | {
|
| 2892 | 2892 | |
| 2893 | - if(isset($args['menu_class'])){
|
|
| 2894 | - $args['menu_class'] = $args['menu_class']." gd-menu-z"; |
|
| 2895 | - } |
|
| 2893 | + if(isset($args['menu_class'])){
|
|
| 2894 | + $args['menu_class'] = $args['menu_class']." gd-menu-z"; |
|
| 2895 | + } |
|
| 2896 | 2896 | |
| 2897 | - return $args; |
|
| 2897 | + return $args; |
|
| 2898 | 2898 | } |
| 2899 | 2899 | |
| 2900 | 2900 | add_filter( 'wp_nav_menu_args', 'geodir_add_nav_menu_class' ); |
@@ -2911,15 +2911,15 @@ discard block |
||
| 2911 | 2911 | * @return string Filtered locale ID. |
| 2912 | 2912 | */ |
| 2913 | 2913 | function geodir_wpml_filter_locale($locale) {
|
| 2914 | - global $sitepress; |
|
| 2914 | + global $sitepress; |
|
| 2915 | 2915 | |
| 2916 | - $post_type = !empty($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (!empty($_REQUEST['post']) ? get_post_type($_REQUEST['post']) : ''); |
|
| 2916 | + $post_type = !empty($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (!empty($_REQUEST['post']) ? get_post_type($_REQUEST['post']) : ''); |
|
| 2917 | 2917 | |
| 2918 | - if (!empty($sitepress) && $sitepress->is_post_edit_screen() && $post_type && in_array($post_type, geodir_get_posttypes()) && $current_lang = $sitepress->get_current_language()) {
|
|
| 2919 | - $locale = $sitepress->get_locale($current_lang); |
|
| 2920 | - } |
|
| 2918 | + if (!empty($sitepress) && $sitepress->is_post_edit_screen() && $post_type && in_array($post_type, geodir_get_posttypes()) && $current_lang = $sitepress->get_current_language()) {
|
|
| 2919 | + $locale = $sitepress->get_locale($current_lang); |
|
| 2920 | + } |
|
| 2921 | 2921 | |
| 2922 | - return $locale; |
|
| 2922 | + return $locale; |
|
| 2923 | 2923 | } |
| 2924 | 2924 | |
| 2925 | 2925 | /** |
@@ -2929,13 +2929,13 @@ discard block |
||
| 2929 | 2929 | * @package GeoDirectory |
| 2930 | 2930 | */ |
| 2931 | 2931 | function geodir_wpml_set_filter() {
|
| 2932 | - if (function_exists('icl_object_id')) {
|
|
| 2933 | - global $sitepress; |
|
| 2932 | + if (function_exists('icl_object_id')) {
|
|
| 2933 | + global $sitepress; |
|
| 2934 | 2934 | |
| 2935 | - if ($sitepress->get_setting('sync_comments_on_duplicates')) {
|
|
| 2936 | - add_action('comment_post', 'gepdir_wpml_sync_comment', 100, 1);
|
|
| 2937 | - } |
|
| 2938 | - } |
|
| 2935 | + if ($sitepress->get_setting('sync_comments_on_duplicates')) {
|
|
| 2936 | + add_action('comment_post', 'gepdir_wpml_sync_comment', 100, 1);
|
|
| 2937 | + } |
|
| 2938 | + } |
|
| 2939 | 2939 | } |
| 2940 | 2940 | add_filter('plugins_loaded', 'geodir_wpml_set_filter');
|
| 2941 | 2941 | |
@@ -2948,44 +2948,44 @@ discard block |
||
| 2948 | 2948 | * @return array Filtered languages. |
| 2949 | 2949 | */ |
| 2950 | 2950 | function geodir_wpml_filter_ls_languages($languages) {
|
| 2951 | - global $gd_icl_ls_languages; |
|
| 2951 | + global $gd_icl_ls_languages; |
|
| 2952 | 2952 | |
| 2953 | - if (geodir_is_geodir_page()) {
|
|
| 2954 | - if ($gd_icl_ls_languages) {
|
|
| 2955 | - return $languages; |
|
| 2956 | - } |
|
| 2953 | + if (geodir_is_geodir_page()) {
|
|
| 2954 | + if ($gd_icl_ls_languages) {
|
|
| 2955 | + return $languages; |
|
| 2956 | + } |
|
| 2957 | 2957 | |
| 2958 | - $keep_vars = array(); |
|
| 2958 | + $keep_vars = array(); |
|
| 2959 | 2959 | |
| 2960 | - if (geodir_is_page('add-listing')) {
|
|
| 2961 | - $keep_vars = array('listing_type', 'package_id');
|
|
| 2962 | - } else if (geodir_is_page('search')) {
|
|
| 2963 | - $keep_vars = array('geodir_search', 'stype', 'snear', 'set_location_type', 'set_location_val', 'sgeo_lat', 'sgeo_lon');
|
|
| 2964 | - } else if (geodir_is_page('author')) {
|
|
| 2965 | - $keep_vars = array('geodir_dashbord', 'stype', 'list');
|
|
| 2966 | - } else if (geodir_is_page('login')) {
|
|
| 2967 | - $keep_vars = array('forgot', 'signup');
|
|
| 2968 | - } |
|
| 2960 | + if (geodir_is_page('add-listing')) {
|
|
| 2961 | + $keep_vars = array('listing_type', 'package_id');
|
|
| 2962 | + } else if (geodir_is_page('search')) {
|
|
| 2963 | + $keep_vars = array('geodir_search', 'stype', 'snear', 'set_location_type', 'set_location_val', 'sgeo_lat', 'sgeo_lon');
|
|
| 2964 | + } else if (geodir_is_page('author')) {
|
|
| 2965 | + $keep_vars = array('geodir_dashbord', 'stype', 'list');
|
|
| 2966 | + } else if (geodir_is_page('login')) {
|
|
| 2967 | + $keep_vars = array('forgot', 'signup');
|
|
| 2968 | + } |
|
| 2969 | 2969 | |
| 2970 | - if (!empty($keep_vars)) {
|
|
| 2971 | - foreach ( $languages as $code => $url) {
|
|
| 2972 | - $filter_url = $url['url']; |
|
| 2970 | + if (!empty($keep_vars)) {
|
|
| 2971 | + foreach ( $languages as $code => $url) {
|
|
| 2972 | + $filter_url = $url['url']; |
|
| 2973 | 2973 | |
| 2974 | - foreach ($keep_vars as $var) {
|
|
| 2975 | - if (isset($_GET[$var]) && !is_array($_GET[$var])) {
|
|
| 2976 | - $filter_url = remove_query_arg(array($var), $filter_url); |
|
| 2977 | - $filter_url = add_query_arg(array($var => $_GET[$var]), $filter_url); |
|
| 2978 | - } |
|
| 2979 | - } |
|
| 2974 | + foreach ($keep_vars as $var) {
|
|
| 2975 | + if (isset($_GET[$var]) && !is_array($_GET[$var])) {
|
|
| 2976 | + $filter_url = remove_query_arg(array($var), $filter_url); |
|
| 2977 | + $filter_url = add_query_arg(array($var => $_GET[$var]), $filter_url); |
|
| 2978 | + } |
|
| 2979 | + } |
|
| 2980 | 2980 | |
| 2981 | - if ($filter_url != $url['url']) {
|
|
| 2982 | - $languages[$code]['url'] = $filter_url; |
|
| 2983 | - } |
|
| 2984 | - } |
|
| 2985 | - $gd_icl_ls_languages = true; |
|
| 2986 | - } |
|
| 2987 | - } |
|
| 2981 | + if ($filter_url != $url['url']) {
|
|
| 2982 | + $languages[$code]['url'] = $filter_url; |
|
| 2983 | + } |
|
| 2984 | + } |
|
| 2985 | + $gd_icl_ls_languages = true; |
|
| 2986 | + } |
|
| 2987 | + } |
|
| 2988 | 2988 | |
| 2989 | - return $languages; |
|
| 2989 | + return $languages; |
|
| 2990 | 2990 | } |
| 2991 | 2991 | add_filter( 'icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1 ); |
| 2992 | 2992 | \ No newline at end of file |
