GeoDirectory /
geodirectory
@@ -13,133 +13,133 @@ discard block |
||
| 13 | 13 | * @package GeoDirectory |
| 14 | 14 | */ |
| 15 | 15 | function geodir_deactivation() {
|
| 16 | - // Update installed variable |
|
| 17 | - update_option("geodir_installed", 0);
|
|
| 16 | + // Update installed variable |
|
| 17 | + update_option("geodir_installed", 0);
|
|
| 18 | 18 | |
| 19 | - // Remove rewrite rules and then recreate rewrite rules. |
|
| 20 | - flush_rewrite_rules(); |
|
| 19 | + // Remove rewrite rules and then recreate rewrite rules. |
|
| 20 | + flush_rewrite_rules(); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | if (!function_exists('geodir_admin_styles')) {
|
| 24 | - /** |
|
| 25 | - * Enqueue Admin Styles. |
|
| 26 | - * |
|
| 27 | - * @since 1.0.0 |
|
| 28 | - * @package GeoDirectory |
|
| 29 | - */ |
|
| 30 | - function geodir_admin_styles() {
|
|
| 31 | - wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
|
|
| 32 | - wp_enqueue_style('geodirectory-admin-css');
|
|
| 24 | + /** |
|
| 25 | + * Enqueue Admin Styles. |
|
| 26 | + * |
|
| 27 | + * @since 1.0.0 |
|
| 28 | + * @package GeoDirectory |
|
| 29 | + */ |
|
| 30 | + function geodir_admin_styles() {
|
|
| 31 | + wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
|
|
| 32 | + wp_enqueue_style('geodirectory-admin-css');
|
|
| 33 | 33 | |
| 34 | - wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
|
|
| 35 | - wp_enqueue_style('geodirectory-frontend-style');
|
|
| 34 | + wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
|
|
| 35 | + wp_enqueue_style('geodirectory-frontend-style');
|
|
| 36 | 36 | |
| 37 | - wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
|
|
| 38 | - wp_enqueue_style('geodir-chosen-style');
|
|
| 37 | + wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
|
|
| 38 | + wp_enqueue_style('geodir-chosen-style');
|
|
| 39 | 39 | |
| 40 | - wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
|
|
| 41 | - wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');
|
|
| 40 | + wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
|
|
| 41 | + wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');
|
|
| 42 | 42 | |
| 43 | - wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
|
|
| 44 | - wp_enqueue_style('geodirectory-jquery-ui-css');
|
|
| 43 | + wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
|
|
| 44 | + wp_enqueue_style('geodirectory-jquery-ui-css');
|
|
| 45 | 45 | |
| 46 | - wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
|
|
| 47 | - wp_enqueue_style('geodirectory-custom-fields-css');
|
|
| 46 | + wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
|
|
| 47 | + wp_enqueue_style('geodirectory-custom-fields-css');
|
|
| 48 | 48 | |
| 49 | - wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
|
|
| 50 | - wp_enqueue_style('geodirectory-pluplodar-css');
|
|
| 49 | + wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
|
|
| 50 | + wp_enqueue_style('geodirectory-pluplodar-css');
|
|
| 51 | 51 | |
| 52 | - wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
|
|
| 53 | - wp_enqueue_style('geodir-rating-style');
|
|
| 52 | + wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
|
|
| 53 | + wp_enqueue_style('geodir-rating-style');
|
|
| 54 | 54 | |
| 55 | - wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
|
|
| 56 | - wp_enqueue_style('geodir-rtl-style');
|
|
| 57 | - } |
|
| 55 | + wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
|
|
| 56 | + wp_enqueue_style('geodir-rtl-style');
|
|
| 57 | + } |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | if (!function_exists('geodir_admin_styles_req')) {
|
| 61 | - /** |
|
| 62 | - * Loads stylesheets from CDN. |
|
| 63 | - * |
|
| 64 | - * @since 1.0.0 |
|
| 65 | - * @package GeoDirectory |
|
| 66 | - */ |
|
| 67 | - function geodir_admin_styles_req() |
|
| 68 | - {
|
|
| 61 | + /** |
|
| 62 | + * Loads stylesheets from CDN. |
|
| 63 | + * |
|
| 64 | + * @since 1.0.0 |
|
| 65 | + * @package GeoDirectory |
|
| 66 | + */ |
|
| 67 | + function geodir_admin_styles_req() |
|
| 68 | + {
|
|
| 69 | 69 | |
| 70 | - wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
|
|
| 71 | - wp_enqueue_style('font-awesome');
|
|
| 70 | + wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
|
|
| 71 | + wp_enqueue_style('font-awesome');
|
|
| 72 | 72 | |
| 73 | - wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 74 | - wp_enqueue_script('geodirectory-admin');
|
|
| 73 | + wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 74 | + wp_enqueue_script('geodirectory-admin');
|
|
| 75 | 75 | |
| 76 | - } |
|
| 76 | + } |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | if (!function_exists('geodir_admin_scripts')) {
|
| 80 | - /** |
|
| 81 | - * Enqueue Admin Scripts. |
|
| 82 | - * |
|
| 83 | - * @since 1.0.0 |
|
| 84 | - * @package GeoDirectory |
|
| 85 | - */ |
|
| 86 | - function geodir_admin_scripts() |
|
| 87 | - {
|
|
| 88 | - $geodir_map_name = geodir_map_name(); |
|
| 80 | + /** |
|
| 81 | + * Enqueue Admin Scripts. |
|
| 82 | + * |
|
| 83 | + * @since 1.0.0 |
|
| 84 | + * @package GeoDirectory |
|
| 85 | + */ |
|
| 86 | + function geodir_admin_scripts() |
|
| 87 | + {
|
|
| 88 | + $geodir_map_name = geodir_map_name(); |
|
| 89 | 89 | |
| 90 | - wp_enqueue_script('jquery');
|
|
| 90 | + wp_enqueue_script('jquery');
|
|
| 91 | 91 | |
| 92 | - wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);
|
|
| 92 | + wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);
|
|
| 93 | 93 | |
| 94 | - wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 95 | - wp_enqueue_script('chosen');
|
|
| 94 | + wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
|
|
| 95 | + wp_enqueue_script('chosen');
|
|
| 96 | 96 | |
| 97 | - wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
|
|
| 98 | - wp_enqueue_script('geodirectory-choose-ajax');
|
|
| 97 | + wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
|
|
| 98 | + wp_enqueue_script('geodirectory-choose-ajax');
|
|
| 99 | 99 | |
| 100 | - if (isset($_REQUEST['listing_type'])) {
|
|
| 101 | - wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
|
|
| 102 | - } |
|
| 100 | + if (isset($_REQUEST['listing_type'])) {
|
|
| 101 | + wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
|
|
| 102 | + } |
|
| 103 | 103 | |
| 104 | - wp_enqueue_script('geodirectory-custom-fields-script');
|
|
| 105 | - $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions'; |
|
| 104 | + wp_enqueue_script('geodirectory-custom-fields-script');
|
|
| 105 | + $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions'; |
|
| 106 | 106 | |
| 107 | - wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);
|
|
| 107 | + wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);
|
|
| 108 | 108 | |
| 109 | - if (in_array($geodir_map_name, array('auto', 'google'))) {
|
|
| 110 | - $map_lang = "&language=" . geodir_get_map_default_language(); |
|
| 111 | - $map_key = "&key=" . geodir_get_map_api_key(); |
|
| 112 | - /** This filter is documented in geodirectory_template_tags.php */ |
|
| 113 | - $map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
|
| 114 | - wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);
|
|
| 109 | + if (in_array($geodir_map_name, array('auto', 'google'))) {
|
|
| 110 | + $map_lang = "&language=" . geodir_get_map_default_language(); |
|
| 111 | + $map_key = "&key=" . geodir_get_map_api_key(); |
|
| 112 | + /** This filter is documented in geodirectory_template_tags.php */ |
|
| 113 | + $map_extra = apply_filters('geodir_googlemap_script_extra', '');
|
|
| 114 | + wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);
|
|
| 115 | 115 | |
| 116 | - // Overlapping Marker Spiderfier |
|
| 117 | - wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 118 | - wp_enqueue_script('geodirectory-g-overlappingmarker-script');
|
|
| 119 | - } |
|
| 116 | + // Overlapping Marker Spiderfier |
|
| 117 | + wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 118 | + wp_enqueue_script('geodirectory-g-overlappingmarker-script');
|
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | - if ($geodir_map_name == 'osm') {
|
|
| 122 | - // Leaflet OpenStreetMap |
|
| 123 | - wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 124 | - wp_enqueue_style('geodirectory-leaflet-style');
|
|
| 121 | + if ($geodir_map_name == 'osm') {
|
|
| 122 | + // Leaflet OpenStreetMap |
|
| 123 | + wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
|
|
| 124 | + wp_enqueue_style('geodirectory-leaflet-style');
|
|
| 125 | 125 | |
| 126 | - wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 127 | - wp_enqueue_script('geodirectory-leaflet-script');
|
|
| 126 | + wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 127 | + wp_enqueue_script('geodirectory-leaflet-script');
|
|
| 128 | 128 | |
| 129 | - wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
| 130 | - wp_enqueue_script('geodirectory-leaflet-geo-script');
|
|
| 129 | + wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
|
|
| 130 | + wp_enqueue_script('geodirectory-leaflet-geo-script');
|
|
| 131 | 131 | |
| 132 | - // Overlapping Marker Spiderfier Leaflet |
|
| 133 | - wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 134 | - wp_enqueue_script('geodirectory-o-overlappingmarker-script');
|
|
| 135 | - } |
|
| 136 | - wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 132 | + // Overlapping Marker Spiderfier Leaflet |
|
| 133 | + wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 134 | + wp_enqueue_script('geodirectory-o-overlappingmarker-script');
|
|
| 135 | + } |
|
| 136 | + wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
| 137 | 137 | |
| 138 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 139 | - wp_enqueue_script('geodirectory-goMap-script');
|
|
| 138 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
|
|
| 139 | + wp_enqueue_script('geodirectory-goMap-script');
|
|
| 140 | 140 | |
| 141 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
| 142 | - wp_enqueue_script('geodirectory-goMap-script');
|
|
| 141 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
|
|
| 142 | + wp_enqueue_script('geodirectory-goMap-script');
|
|
| 143 | 143 | |
| 144 | 144 | // font awesome rating script |
| 145 | 145 | if (get_option('geodir_reviewrating_enable_font_awesome')) {
|
@@ -150,167 +150,167 @@ discard block |
||
| 150 | 150 | wp_enqueue_script('geodir-jRating-js');
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 154 | - wp_enqueue_script('geodir-on-document-load');
|
|
| 155 | - |
|
| 156 | - |
|
| 157 | - // SCRIPT FOR UPLOAD |
|
| 158 | - wp_enqueue_script('plupload-all');
|
|
| 159 | - wp_enqueue_script('jquery-ui-sortable');
|
|
| 160 | - |
|
| 161 | - wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
| 162 | - wp_enqueue_script('geodirectory-plupload-script');
|
|
| 163 | - |
|
| 164 | - // SCRIPT FOR UPLOAD END |
|
| 165 | - |
|
| 166 | - |
|
| 167 | - // place js config array for plupload |
|
| 168 | - $plupload_init = array( |
|
| 169 | - 'runtimes' => 'html5,silverlight,html4', |
|
| 170 | - 'browse_button' => 'plupload-browse-button', // will be adjusted per uploader |
|
| 171 | - 'container' => 'plupload-upload-ui', // will be adjusted per uploader |
|
| 172 | - 'drop_element' => 'dropbox', // will be adjusted per uploader |
|
| 173 | - 'file_data_name' => 'async-upload', // will be adjusted per uploader |
|
| 174 | - 'multiple_queues' => true, |
|
| 175 | - 'max_file_size' => geodir_max_upload_size(), |
|
| 176 | - 'url' => admin_url('admin-ajax.php'),
|
|
| 177 | - 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
|
|
| 178 | - 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
|
|
| 179 | - 'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
|
|
| 180 | - 'multipart' => true, |
|
| 181 | - 'urlstream_upload' => true, |
|
| 182 | - 'multi_selection' => false, // will be added per uploader |
|
| 183 | - // additional post data to send to our ajax hook |
|
| 184 | - 'multipart_params' => array( |
|
| 185 | - '_ajax_nonce' => "", // will be added per uploader |
|
| 186 | - 'action' => 'plupload_action', // the ajax action name |
|
| 187 | - 'imgid' => 0 // will be added per uploader |
|
| 188 | - ) |
|
| 189 | - ); |
|
| 190 | - $base_plupload_config = json_encode($plupload_init); |
|
| 191 | - |
|
| 192 | - |
|
| 193 | - $thumb_img_arr = array(); |
|
| 194 | - |
|
| 195 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 196 | - $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
| 197 | - |
|
| 198 | - $totImg = ''; |
|
| 199 | - $image_limit = ''; |
|
| 200 | - if (!empty($thumb_img_arr)) {
|
|
| 201 | - $totImg = count($thumb_img_arr); |
|
| 202 | - } |
|
| 153 | + wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
|
|
| 154 | + wp_enqueue_script('geodir-on-document-load');
|
|
| 155 | + |
|
| 156 | + |
|
| 157 | + // SCRIPT FOR UPLOAD |
|
| 158 | + wp_enqueue_script('plupload-all');
|
|
| 159 | + wp_enqueue_script('jquery-ui-sortable');
|
|
| 160 | + |
|
| 161 | + wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
|
|
| 162 | + wp_enqueue_script('geodirectory-plupload-script');
|
|
| 163 | + |
|
| 164 | + // SCRIPT FOR UPLOAD END |
|
| 165 | + |
|
| 166 | + |
|
| 167 | + // place js config array for plupload |
|
| 168 | + $plupload_init = array( |
|
| 169 | + 'runtimes' => 'html5,silverlight,html4', |
|
| 170 | + 'browse_button' => 'plupload-browse-button', // will be adjusted per uploader |
|
| 171 | + 'container' => 'plupload-upload-ui', // will be adjusted per uploader |
|
| 172 | + 'drop_element' => 'dropbox', // will be adjusted per uploader |
|
| 173 | + 'file_data_name' => 'async-upload', // will be adjusted per uploader |
|
| 174 | + 'multiple_queues' => true, |
|
| 175 | + 'max_file_size' => geodir_max_upload_size(), |
|
| 176 | + 'url' => admin_url('admin-ajax.php'),
|
|
| 177 | + 'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
|
|
| 178 | + 'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
|
|
| 179 | + 'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
|
|
| 180 | + 'multipart' => true, |
|
| 181 | + 'urlstream_upload' => true, |
|
| 182 | + 'multi_selection' => false, // will be added per uploader |
|
| 183 | + // additional post data to send to our ajax hook |
|
| 184 | + 'multipart_params' => array( |
|
| 185 | + '_ajax_nonce' => "", // will be added per uploader |
|
| 186 | + 'action' => 'plupload_action', // the ajax action name |
|
| 187 | + 'imgid' => 0 // will be added per uploader |
|
| 188 | + ) |
|
| 189 | + ); |
|
| 190 | + $base_plupload_config = json_encode($plupload_init); |
|
| 191 | + |
|
| 192 | + |
|
| 193 | + $thumb_img_arr = array(); |
|
| 194 | + |
|
| 195 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
| 196 | + $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
| 197 | + |
|
| 198 | + $totImg = ''; |
|
| 199 | + $image_limit = ''; |
|
| 200 | + if (!empty($thumb_img_arr)) {
|
|
| 201 | + $totImg = count($thumb_img_arr); |
|
| 202 | + } |
|
| 203 | 203 | |
| 204 | - $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
|
|
| 205 | - 'totalImg' => $totImg, |
|
| 206 | - 'image_limit' => $image_limit, |
|
| 207 | - 'upload_img_size' => geodir_max_upload_size()); |
|
| 204 | + $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
|
|
| 205 | + 'totalImg' => $totImg, |
|
| 206 | + 'image_limit' => $image_limit, |
|
| 207 | + 'upload_img_size' => geodir_max_upload_size()); |
|
| 208 | 208 | |
| 209 | - wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
|
| 209 | + wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
|
|
| 210 | 210 | |
| 211 | - $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));
|
|
| 212 | - wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);
|
|
| 211 | + $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));
|
|
| 212 | + wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);
|
|
| 213 | 213 | |
| 214 | 214 | |
| 215 | - wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
| 216 | - wp_enqueue_script('geodirectory-admin-script');
|
|
| 215 | + wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
|
|
| 216 | + wp_enqueue_script('geodirectory-admin-script');
|
|
| 217 | 217 | |
| 218 | - wp_enqueue_style('farbtastic');
|
|
| 219 | - wp_enqueue_script('farbtastic');
|
|
| 218 | + wp_enqueue_style('farbtastic');
|
|
| 219 | + wp_enqueue_script('farbtastic');
|
|
| 220 | 220 | |
| 221 | - $screen = get_current_screen(); |
|
| 222 | - if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {
|
|
| 223 | - wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');
|
|
| 224 | - } |
|
| 221 | + $screen = get_current_screen(); |
|
| 222 | + if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {
|
|
| 223 | + wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');
|
|
| 224 | + } |
|
| 225 | 225 | |
| 226 | - $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
|
|
| 227 | - wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
|
|
| 226 | + $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
|
|
| 227 | + wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
|
|
| 228 | 228 | |
| 229 | - } |
|
| 229 | + } |
|
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | if (!function_exists('geodir_admin_menu')) {
|
| 233 | - /** |
|
| 234 | - * Admin Menus |
|
| 235 | - * |
|
| 236 | - * Sets up the admin menus in wordpress. |
|
| 237 | - * |
|
| 238 | - * @since 1.0.0 |
|
| 239 | - * @package GeoDirectory |
|
| 240 | - * @global array $menu Menu array. |
|
| 241 | - * @global object $geodirectory GeoDirectory plugin object. |
|
| 242 | - */ |
|
| 243 | - function geodir_admin_menu() |
|
| 244 | - {
|
|
| 245 | - global $menu, $geodirectory; |
|
| 233 | + /** |
|
| 234 | + * Admin Menus |
|
| 235 | + * |
|
| 236 | + * Sets up the admin menus in wordpress. |
|
| 237 | + * |
|
| 238 | + * @since 1.0.0 |
|
| 239 | + * @package GeoDirectory |
|
| 240 | + * @global array $menu Menu array. |
|
| 241 | + * @global object $geodirectory GeoDirectory plugin object. |
|
| 242 | + */ |
|
| 243 | + function geodir_admin_menu() |
|
| 244 | + {
|
|
| 245 | + global $menu, $geodirectory; |
|
| 246 | 246 | |
| 247 | - if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
|
|
| 247 | + if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
|
|
| 248 | 248 | |
| 249 | - add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
|
|
| 249 | + add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
|
|
| 250 | 250 | |
| 251 | 251 | |
| 252 | - } |
|
| 252 | + } |
|
| 253 | 253 | } |
| 254 | 254 | |
| 255 | 255 | if (!function_exists('geodir_admin_menu_order')) {
|
| 256 | - /** |
|
| 257 | - * Order admin menus. |
|
| 258 | - * |
|
| 259 | - * @since 1.0.0 |
|
| 260 | - * @package GeoDirectory |
|
| 261 | - * @param array $menu_order Menu order array. |
|
| 262 | - * @return array Modified menu order array. |
|
| 263 | - */ |
|
| 264 | - function geodir_admin_menu_order($menu_order) |
|
| 265 | - {
|
|
| 266 | - |
|
| 267 | - // Initialize our custom order array |
|
| 268 | - $geodir_menu_order = array(); |
|
| 269 | - |
|
| 270 | - // Get the index of our custom separator |
|
| 271 | - $geodir_separator = array_search('separator-geodirectory', $menu_order);
|
|
| 272 | - |
|
| 273 | - // Get index of posttype menu |
|
| 274 | - $post_types = geodir_get_posttypes(); |
|
| 275 | - |
|
| 276 | - // Loop through menu order and do some rearranging |
|
| 277 | - foreach ($menu_order as $index => $item) : |
|
| 278 | - |
|
| 279 | - if ((('geodirectory') == $item)) :
|
|
| 280 | - $geodir_menu_order[] = 'separator-geodirectory'; |
|
| 281 | - if (!empty($post_types)) {
|
|
| 282 | - foreach ($post_types as $post_type) {
|
|
| 283 | - $geodir_menu_order[] = 'edit.php?post_type=' . $post_type; |
|
| 284 | - } |
|
| 285 | - } |
|
| 286 | - $geodir_menu_order[] = $item; |
|
| 256 | + /** |
|
| 257 | + * Order admin menus. |
|
| 258 | + * |
|
| 259 | + * @since 1.0.0 |
|
| 260 | + * @package GeoDirectory |
|
| 261 | + * @param array $menu_order Menu order array. |
|
| 262 | + * @return array Modified menu order array. |
|
| 263 | + */ |
|
| 264 | + function geodir_admin_menu_order($menu_order) |
|
| 265 | + {
|
|
| 287 | 266 | |
| 288 | - unset($menu_order[$geodir_separator]); |
|
| 289 | - //unset( $menu_order[$geodir_places] ); |
|
| 290 | - elseif (!in_array($item, array('separator-geodirectory'))) :
|
|
| 291 | - $geodir_menu_order[] = $item; |
|
| 292 | - endif; |
|
| 267 | + // Initialize our custom order array |
|
| 268 | + $geodir_menu_order = array(); |
|
| 293 | 269 | |
| 294 | - endforeach; |
|
| 270 | + // Get the index of our custom separator |
|
| 271 | + $geodir_separator = array_search('separator-geodirectory', $menu_order);
|
|
| 295 | 272 | |
| 296 | - // Return order |
|
| 297 | - return $geodir_menu_order; |
|
| 298 | - } |
|
| 273 | + // Get index of posttype menu |
|
| 274 | + $post_types = geodir_get_posttypes(); |
|
| 275 | + |
|
| 276 | + // Loop through menu order and do some rearranging |
|
| 277 | + foreach ($menu_order as $index => $item) : |
|
| 278 | + |
|
| 279 | + if ((('geodirectory') == $item)) :
|
|
| 280 | + $geodir_menu_order[] = 'separator-geodirectory'; |
|
| 281 | + if (!empty($post_types)) {
|
|
| 282 | + foreach ($post_types as $post_type) {
|
|
| 283 | + $geodir_menu_order[] = 'edit.php?post_type=' . $post_type; |
|
| 284 | + } |
|
| 285 | + } |
|
| 286 | + $geodir_menu_order[] = $item; |
|
| 287 | + |
|
| 288 | + unset($menu_order[$geodir_separator]); |
|
| 289 | + //unset( $menu_order[$geodir_places] ); |
|
| 290 | + elseif (!in_array($item, array('separator-geodirectory'))) :
|
|
| 291 | + $geodir_menu_order[] = $item; |
|
| 292 | + endif; |
|
| 293 | + |
|
| 294 | + endforeach; |
|
| 295 | + |
|
| 296 | + // Return order |
|
| 297 | + return $geodir_menu_order; |
|
| 298 | + } |
|
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | if (!function_exists('geodir_admin_custom_menu_order')) {
|
| 302 | - /** |
|
| 303 | - * Enables custom menu order. |
|
| 304 | - * |
|
| 305 | - * @since 1.0.0 |
|
| 306 | - * @package GeoDirectory |
|
| 307 | - * @return bool |
|
| 308 | - */ |
|
| 309 | - function geodir_admin_custom_menu_order() |
|
| 310 | - {
|
|
| 311 | - if (!current_user_can('manage_options')) return false;
|
|
| 312 | - return true; |
|
| 313 | - } |
|
| 302 | + /** |
|
| 303 | + * Enables custom menu order. |
|
| 304 | + * |
|
| 305 | + * @since 1.0.0 |
|
| 306 | + * @package GeoDirectory |
|
| 307 | + * @return bool |
|
| 308 | + */ |
|
| 309 | + function geodir_admin_custom_menu_order() |
|
| 310 | + {
|
|
| 311 | + if (!current_user_can('manage_options')) return false;
|
|
| 312 | + return true; |
|
| 313 | + } |
|
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | /** |
@@ -321,51 +321,51 @@ discard block |
||
| 321 | 321 | */ |
| 322 | 322 | function geodir_before_admin_panel() |
| 323 | 323 | {
|
| 324 | - if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
|
|
| 325 | - echo '<div id="message" class="updated fade"> |
|
| 324 | + if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
|
|
| 325 | + echo '<div id="message" class="updated fade"> |
|
| 326 | 326 | <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p>
|
| 327 | 327 | <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>
|
| 328 | 328 | </div>'; |
| 329 | 329 | |
| 330 | - } |
|
| 330 | + } |
|
| 331 | 331 | |
| 332 | - if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
|
|
| 333 | - switch ($_REQUEST['msg']) {
|
|
| 334 | - case 'success': |
|
| 335 | - echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
|
|
| 336 | - flush_rewrite_rules(false); |
|
| 332 | + if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
|
|
| 333 | + switch ($_REQUEST['msg']) {
|
|
| 334 | + case 'success': |
|
| 335 | + echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
|
|
| 336 | + flush_rewrite_rules(false); |
|
| 337 | 337 | |
| 338 | - break; |
|
| 338 | + break; |
|
| 339 | 339 | case 'fail': |
| 340 | 340 | $gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : ''; |
| 341 | 341 | |
| 342 | 342 | if ($gderr == 21) |
| 343 | - echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';
|
|
| 343 | + echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';
|
|
| 344 | 344 | else |
| 345 | 345 | echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
|
| 346 | - break; |
|
| 347 | - } |
|
| 348 | - } |
|
| 346 | + break; |
|
| 347 | + } |
|
| 348 | + } |
|
| 349 | 349 | |
| 350 | - $geodir_load_map = get_option('geodir_load_map');
|
|
| 351 | - $need_map_key = false; |
|
| 352 | - if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
|
|
| 353 | - $need_map_key = true; |
|
| 354 | - } |
|
| 350 | + $geodir_load_map = get_option('geodir_load_map');
|
|
| 351 | + $need_map_key = false; |
|
| 352 | + if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
|
|
| 353 | + $need_map_key = true; |
|
| 354 | + } |
|
| 355 | 355 | |
| 356 | - if (!geodir_get_map_api_key() && $need_map_key) {
|
|
| 357 | - echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 358 | - } |
|
| 356 | + if (!geodir_get_map_api_key() && $need_map_key) {
|
|
| 357 | + echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 358 | + } |
|
| 359 | 359 | |
| 360 | - if (!geodir_is_default_location_set()) {
|
|
| 361 | - echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 360 | + if (!geodir_is_default_location_set()) {
|
|
| 361 | + echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
|
|
| 362 | 362 | |
| 363 | - } |
|
| 363 | + } |
|
| 364 | 364 | |
| 365 | - if (!function_exists('curl_init')) {
|
|
| 366 | - echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';
|
|
| 365 | + if (!function_exists('curl_init')) {
|
|
| 366 | + echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';
|
|
| 367 | 367 | |
| 368 | - } |
|
| 368 | + } |
|
| 369 | 369 | |
| 370 | 370 | |
| 371 | 371 | |
@@ -382,19 +382,19 @@ discard block |
||
| 382 | 382 | */ |
| 383 | 383 | function geodir_handle_option_form_submit($current_tab) |
| 384 | 384 | {
|
| 385 | - global $geodir_settings; |
|
| 386 | - if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
|
|
| 387 | - /** |
|
| 388 | - * Contains settings array for current tab. |
|
| 389 | - * |
|
| 390 | - * @since 1.0.0 |
|
| 391 | - * @package GeoDirectory |
|
| 392 | - */ |
|
| 393 | - include_once('option-pages/' . $current_tab . '_array.php');
|
|
| 394 | - } |
|
| 395 | - if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') : |
|
| 396 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 397 | - if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 385 | + global $geodir_settings; |
|
| 386 | + if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
|
|
| 387 | + /** |
|
| 388 | + * Contains settings array for current tab. |
|
| 389 | + * |
|
| 390 | + * @since 1.0.0 |
|
| 391 | + * @package GeoDirectory |
|
| 392 | + */ |
|
| 393 | + include_once('option-pages/' . $current_tab . '_array.php');
|
|
| 394 | + } |
|
| 395 | + if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') : |
|
| 396 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 397 | + if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
|
|
| 398 | 398 | |
| 399 | 399 | /** |
| 400 | 400 | * Fires before updating geodirectory admin settings. |
@@ -406,38 +406,38 @@ discard block |
||
| 406 | 406 | */ |
| 407 | 407 | do_action('geodir_before_update_options', $current_tab, $geodir_settings);
|
| 408 | 408 | |
| 409 | - if (!empty($geodir_settings[$current_tab])) |
|
| 410 | - geodir_update_options($geodir_settings[$current_tab]); |
|
| 409 | + if (!empty($geodir_settings[$current_tab])) |
|
| 410 | + geodir_update_options($geodir_settings[$current_tab]); |
|
| 411 | 411 | |
| 412 | - /** |
|
| 413 | - * Called after GeoDirectory options settings are updated. |
|
| 414 | - * |
|
| 415 | - * @since 1.0.0 |
|
| 416 | - * @param array $geodir_settings The array of GeoDirectory settings. |
|
| 417 | - * @see 'geodir_before_update_options' |
|
| 418 | - */ |
|
| 419 | - do_action('geodir_update_options', $geodir_settings);
|
|
| 412 | + /** |
|
| 413 | + * Called after GeoDirectory options settings are updated. |
|
| 414 | + * |
|
| 415 | + * @since 1.0.0 |
|
| 416 | + * @param array $geodir_settings The array of GeoDirectory settings. |
|
| 417 | + * @see 'geodir_before_update_options' |
|
| 418 | + */ |
|
| 419 | + do_action('geodir_update_options', $geodir_settings);
|
|
| 420 | 420 | |
| 421 | - /** |
|
| 422 | - * Called after GeoDirectory options settings are updated. |
|
| 423 | - * |
|
| 424 | - * Provides tab specific settings. |
|
| 425 | - * |
|
| 426 | - * @since 1.0.0 |
|
| 427 | - * @param string $current_tab The current settings tab name. |
|
| 428 | - * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab. |
|
| 429 | - */ |
|
| 430 | - do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
|
|
| 421 | + /** |
|
| 422 | + * Called after GeoDirectory options settings are updated. |
|
| 423 | + * |
|
| 424 | + * Provides tab specific settings. |
|
| 425 | + * |
|
| 426 | + * @since 1.0.0 |
|
| 427 | + * @param string $current_tab The current settings tab name. |
|
| 428 | + * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab. |
|
| 429 | + */ |
|
| 430 | + do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
|
|
| 431 | 431 | |
| 432 | - flush_rewrite_rules(false); |
|
| 432 | + flush_rewrite_rules(false); |
|
| 433 | 433 | |
| 434 | - $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : ''; |
|
| 434 | + $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : ''; |
|
| 435 | 435 | |
| 436 | - $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');
|
|
| 436 | + $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');
|
|
| 437 | 437 | |
| 438 | - wp_redirect($redirect_url); |
|
| 439 | - exit(); |
|
| 440 | - endif; |
|
| 438 | + wp_redirect($redirect_url); |
|
| 439 | + exit(); |
|
| 440 | + endif; |
|
| 441 | 441 | |
| 442 | 442 | |
| 443 | 443 | } |
@@ -455,144 +455,144 @@ discard block |
||
| 455 | 455 | * @return bool Returns true if saved. |
| 456 | 456 | */ |
| 457 | 457 | function geodir_update_options($options, $dummy = false) {
|
| 458 | - if ((!isset($_POST) || !$_POST) && !$dummy) return false; |
|
| 458 | + if ((!isset($_POST) || !$_POST) && !$dummy) return false; |
|
| 459 | 459 | |
| 460 | - foreach ($options as $value) {
|
|
| 461 | - if ($dummy && isset($value['std'])) |
|
| 462 | - $_POST[$value['id']] = $value['std']; |
|
| 460 | + foreach ($options as $value) {
|
|
| 461 | + if ($dummy && isset($value['std'])) |
|
| 462 | + $_POST[$value['id']] = $value['std']; |
|
| 463 | 463 | |
| 464 | 464 | |
| 465 | - if (isset($value['type']) && $value['type'] == 'checkbox') : |
|
| 465 | + if (isset($value['type']) && $value['type'] == 'checkbox') : |
|
| 466 | 466 | |
| 467 | - if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 468 | - update_option($value['id'], $_POST[$value['id']]); |
|
| 469 | - } else {
|
|
| 470 | - update_option($value['id'], 0); |
|
| 471 | - } |
|
| 467 | + if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 468 | + update_option($value['id'], $_POST[$value['id']]); |
|
| 469 | + } else {
|
|
| 470 | + update_option($value['id'], 0); |
|
| 471 | + } |
|
| 472 | 472 | |
| 473 | - elseif (isset($value['type']) && $value['type'] == 'image_width') : |
|
| 473 | + elseif (isset($value['type']) && $value['type'] == 'image_width') : |
|
| 474 | 474 | |
| 475 | - if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
|
|
| 476 | - update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']); |
|
| 477 | - update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']); |
|
| 478 | - if (isset($_POST[$value['id'] . '_crop'])) : |
|
| 479 | - update_option($value['id'] . '_crop', 1); |
|
| 480 | - else : |
|
| 481 | - update_option($value['id'] . '_crop', 0); |
|
| 482 | - endif; |
|
| 483 | - } else {
|
|
| 484 | - update_option($value['id'] . '_width', $value['std']); |
|
| 485 | - update_option($value['id'] . '_height', $value['std']); |
|
| 486 | - update_option($value['id'] . '_crop', 1); |
|
| 487 | - } |
|
| 475 | + if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
|
|
| 476 | + update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']); |
|
| 477 | + update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']); |
|
| 478 | + if (isset($_POST[$value['id'] . '_crop'])) : |
|
| 479 | + update_option($value['id'] . '_crop', 1); |
|
| 480 | + else : |
|
| 481 | + update_option($value['id'] . '_crop', 0); |
|
| 482 | + endif; |
|
| 483 | + } else {
|
|
| 484 | + update_option($value['id'] . '_width', $value['std']); |
|
| 485 | + update_option($value['id'] . '_height', $value['std']); |
|
| 486 | + update_option($value['id'] . '_crop', 1); |
|
| 487 | + } |
|
| 488 | 488 | |
| 489 | - elseif (isset($value['type']) && $value['type'] == 'map') : |
|
| 490 | - $post_types = array(); |
|
| 491 | - $categories = array(); |
|
| 489 | + elseif (isset($value['type']) && $value['type'] == 'map') : |
|
| 490 | + $post_types = array(); |
|
| 491 | + $categories = array(); |
|
| 492 | 492 | |
| 493 | - if (!empty($_POST['home_map_post_types'])) : |
|
| 494 | - foreach ($_POST['home_map_post_types'] as $post_type) : |
|
| 495 | - $post_types[] = $post_type; |
|
| 496 | - endforeach; |
|
| 497 | - endif; |
|
| 493 | + if (!empty($_POST['home_map_post_types'])) : |
|
| 494 | + foreach ($_POST['home_map_post_types'] as $post_type) : |
|
| 495 | + $post_types[] = $post_type; |
|
| 496 | + endforeach; |
|
| 497 | + endif; |
|
| 498 | 498 | |
| 499 | - update_option('geodir_exclude_post_type_on_map', $post_types);
|
|
| 499 | + update_option('geodir_exclude_post_type_on_map', $post_types);
|
|
| 500 | 500 | |
| 501 | - if (!empty($_POST['post_category'])) : |
|
| 502 | - foreach ($_POST['post_category'] as $texonomy => $cat_arr) : |
|
| 503 | - $categories[$texonomy] = array(); |
|
| 504 | - foreach ($cat_arr as $category) : |
|
| 505 | - $categories[$texonomy][] = $category; |
|
| 506 | - endforeach; |
|
| 507 | - $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array(); |
|
| 508 | - endforeach; |
|
| 509 | - endif; |
|
| 510 | - update_option('geodir_exclude_cat_on_map', $categories);
|
|
| 511 | - update_option('geodir_exclude_cat_on_map_upgrade', 1);
|
|
| 512 | - elseif (isset($value['type']) && $value['type'] == 'map_default_settings') : |
|
| 501 | + if (!empty($_POST['post_category'])) : |
|
| 502 | + foreach ($_POST['post_category'] as $texonomy => $cat_arr) : |
|
| 503 | + $categories[$texonomy] = array(); |
|
| 504 | + foreach ($cat_arr as $category) : |
|
| 505 | + $categories[$texonomy][] = $category; |
|
| 506 | + endforeach; |
|
| 507 | + $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array(); |
|
| 508 | + endforeach; |
|
| 509 | + endif; |
|
| 510 | + update_option('geodir_exclude_cat_on_map', $categories);
|
|
| 511 | + update_option('geodir_exclude_cat_on_map_upgrade', 1);
|
|
| 512 | + elseif (isset($value['type']) && $value['type'] == 'map_default_settings') : |
|
| 513 | 513 | |
| 514 | 514 | |
| 515 | - if (!empty($_POST['geodir_default_map_language'])): |
|
| 516 | - update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);
|
|
| 517 | - endif; |
|
| 515 | + if (!empty($_POST['geodir_default_map_language'])): |
|
| 516 | + update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);
|
|
| 517 | + endif; |
|
| 518 | 518 | |
| 519 | 519 | |
| 520 | - if (!empty($_POST['geodir_default_map_search_pt'])): |
|
| 521 | - update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);
|
|
| 522 | - endif; |
|
| 520 | + if (!empty($_POST['geodir_default_map_search_pt'])): |
|
| 521 | + update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);
|
|
| 522 | + endif; |
|
| 523 | 523 | |
| 524 | 524 | |
| 525 | - elseif (isset($value['type']) && $value['type'] == 'file') : |
|
| 525 | + elseif (isset($value['type']) && $value['type'] == 'file') : |
|
| 526 | 526 | |
| 527 | 527 | |
| 528 | - if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file
|
|
| 528 | + if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file
|
|
| 529 | 529 | |
| 530 | - if (get_option($value['id'])) {
|
|
| 531 | - $image_name_arr = explode('/', get_option($value['id']));
|
|
| 532 | - $noimg_name = end($image_name_arr); |
|
| 533 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 534 | - if (file_exists($img_path)) |
|
| 535 | - unlink($img_path); |
|
| 536 | - } |
|
| 530 | + if (get_option($value['id'])) {
|
|
| 531 | + $image_name_arr = explode('/', get_option($value['id']));
|
|
| 532 | + $noimg_name = end($image_name_arr); |
|
| 533 | + $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 534 | + if (file_exists($img_path)) |
|
| 535 | + unlink($img_path); |
|
| 536 | + } |
|
| 537 | 537 | |
| 538 | - update_option($value['id'], ''); |
|
| 539 | - } |
|
| 538 | + update_option($value['id'], ''); |
|
| 539 | + } |
|
| 540 | 540 | |
| 541 | - $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : ''; |
|
| 542 | - $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : ''; |
|
| 543 | - |
|
| 544 | - if (!empty($filename)): |
|
| 545 | - $ext = pathinfo($filename, PATHINFO_EXTENSION); |
|
| 546 | - $uplaods = array(); |
|
| 547 | - |
|
| 548 | - foreach ($uploadedfile as $key => $uplaod): |
|
| 549 | - if ($key == 'name'): |
|
| 550 | - $uplaods[$key] = $filename; |
|
| 551 | - else : |
|
| 552 | - $uplaods[$key] = $uplaod; |
|
| 553 | - endif; |
|
| 554 | - endforeach; |
|
| 555 | - |
|
| 556 | - $uploads = wp_upload_dir(); |
|
| 557 | - |
|
| 558 | - if (get_option($value['id'])) {
|
|
| 559 | - $image_name_arr = explode('/', get_option($value['id']));
|
|
| 560 | - $noimg_name = end($image_name_arr); |
|
| 561 | - $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 562 | - if (file_exists($img_path)) |
|
| 563 | - unlink($img_path); |
|
| 564 | - } |
|
| 541 | + $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : ''; |
|
| 542 | + $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : ''; |
|
| 543 | + |
|
| 544 | + if (!empty($filename)): |
|
| 545 | + $ext = pathinfo($filename, PATHINFO_EXTENSION); |
|
| 546 | + $uplaods = array(); |
|
| 547 | + |
|
| 548 | + foreach ($uploadedfile as $key => $uplaod): |
|
| 549 | + if ($key == 'name'): |
|
| 550 | + $uplaods[$key] = $filename; |
|
| 551 | + else : |
|
| 552 | + $uplaods[$key] = $uplaod; |
|
| 553 | + endif; |
|
| 554 | + endforeach; |
|
| 555 | + |
|
| 556 | + $uploads = wp_upload_dir(); |
|
| 557 | + |
|
| 558 | + if (get_option($value['id'])) {
|
|
| 559 | + $image_name_arr = explode('/', get_option($value['id']));
|
|
| 560 | + $noimg_name = end($image_name_arr); |
|
| 561 | + $img_path = $uploads['path'] . '/' . $noimg_name; |
|
| 562 | + if (file_exists($img_path)) |
|
| 563 | + unlink($img_path); |
|
| 564 | + } |
|
| 565 | 565 | |
| 566 | - $upload_overrides = array('test_form' => false);
|
|
| 567 | - $movefile = wp_handle_upload($uplaods, $upload_overrides); |
|
| 566 | + $upload_overrides = array('test_form' => false);
|
|
| 567 | + $movefile = wp_handle_upload($uplaods, $upload_overrides); |
|
| 568 | 568 | |
| 569 | - update_option($value['id'], $movefile['url']); |
|
| 569 | + update_option($value['id'], $movefile['url']); |
|
| 570 | 570 | |
| 571 | - endif; |
|
| 571 | + endif; |
|
| 572 | 572 | |
| 573 | - if (!get_option($value['id']) && isset($value['value'])): |
|
| 574 | - update_option($value['id'], $value['value']); |
|
| 575 | - endif; |
|
| 573 | + if (!get_option($value['id']) && isset($value['value'])): |
|
| 574 | + update_option($value['id'], $value['value']); |
|
| 575 | + endif; |
|
| 576 | 576 | |
| 577 | 577 | |
| 578 | - else : |
|
| 579 | - // same menu setting per theme. |
|
| 580 | - if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
|
|
| 581 | - $theme = wp_get_theme(); |
|
| 582 | - update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
|
|
| 583 | - } |
|
| 578 | + else : |
|
| 579 | + // same menu setting per theme. |
|
| 580 | + if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
|
|
| 581 | + $theme = wp_get_theme(); |
|
| 582 | + update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
|
|
| 583 | + } |
|
| 584 | 584 | |
| 585 | - if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 586 | - update_option($value['id'], $_POST[$value['id']]); |
|
| 587 | - } else {
|
|
| 588 | - delete_option($value['id']); |
|
| 589 | - } |
|
| 585 | + if (isset($value['id']) && isset($_POST[$value['id']])) {
|
|
| 586 | + update_option($value['id'], $_POST[$value['id']]); |
|
| 587 | + } else {
|
|
| 588 | + delete_option($value['id']); |
|
| 589 | + } |
|
| 590 | 590 | |
| 591 | - endif; |
|
| 592 | - } |
|
| 593 | - if ($dummy) |
|
| 594 | - $_POST = array(); |
|
| 595 | - return true; |
|
| 591 | + endif; |
|
| 592 | + } |
|
| 593 | + if ($dummy) |
|
| 594 | + $_POST = array(); |
|
| 595 | + return true; |
|
| 596 | 596 | |
| 597 | 597 | } |
| 598 | 598 | |
@@ -641,33 +641,33 @@ discard block |
||
| 641 | 641 | function places_custom_fields_tab($tabs) |
| 642 | 642 | {
|
| 643 | 643 | |
| 644 | - $geodir_post_types = get_option('geodir_post_types');
|
|
| 644 | + $geodir_post_types = get_option('geodir_post_types');
|
|
| 645 | 645 | |
| 646 | - if (!empty($geodir_post_types)) {
|
|
| 646 | + if (!empty($geodir_post_types)) {
|
|
| 647 | 647 | |
| 648 | - foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info): |
|
| 648 | + foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info): |
|
| 649 | 649 | |
| 650 | - $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory'); |
|
| 650 | + $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory'); |
|
| 651 | 651 | |
| 652 | - $tabs[$geodir_post_type . '_fields_settings'] = array( |
|
| 653 | - 'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),
|
|
| 654 | - 'subtabs' => array( |
|
| 655 | - array('subtab' => 'custom_fields',
|
|
| 656 | - 'label' => __('Custom Fields', 'geodirectory'),
|
|
| 657 | - 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 658 | - array('subtab' => 'sorting_options',
|
|
| 659 | - 'label' => __('Sorting Options', 'geodirectory'),
|
|
| 660 | - 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 661 | - ), |
|
| 662 | - 'tab_index' => 9, |
|
| 663 | - 'request' => array('listing_type' => $geodir_post_type)
|
|
| 664 | - ); |
|
| 652 | + $tabs[$geodir_post_type . '_fields_settings'] = array( |
|
| 653 | + 'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),
|
|
| 654 | + 'subtabs' => array( |
|
| 655 | + array('subtab' => 'custom_fields',
|
|
| 656 | + 'label' => __('Custom Fields', 'geodirectory'),
|
|
| 657 | + 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 658 | + array('subtab' => 'sorting_options',
|
|
| 659 | + 'label' => __('Sorting Options', 'geodirectory'),
|
|
| 660 | + 'request' => array('listing_type' => $geodir_post_type)),
|
|
| 661 | + ), |
|
| 662 | + 'tab_index' => 9, |
|
| 663 | + 'request' => array('listing_type' => $geodir_post_type)
|
|
| 664 | + ); |
|
| 665 | 665 | |
| 666 | - endforeach; |
|
| 666 | + endforeach; |
|
| 667 | 667 | |
| 668 | - } |
|
| 668 | + } |
|
| 669 | 669 | |
| 670 | - return $tabs; |
|
| 670 | + return $tabs; |
|
| 671 | 671 | } |
| 672 | 672 | |
| 673 | 673 | |
@@ -683,9 +683,9 @@ discard block |
||
| 683 | 683 | */ |
| 684 | 684 | function geodir_tools_setting_tab($tabs) |
| 685 | 685 | {
|
| 686 | - wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
| 687 | - $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
|
|
| 688 | - return $tabs; |
|
| 686 | + wp_enqueue_script( 'jquery-ui-progressbar' ); |
|
| 687 | + $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
|
|
| 688 | + return $tabs; |
|
| 689 | 689 | } |
| 690 | 690 | |
| 691 | 691 | /** |
@@ -700,8 +700,8 @@ discard block |
||
| 700 | 700 | */ |
| 701 | 701 | function geodir_compatibility_setting_tab($tabs) |
| 702 | 702 | {
|
| 703 | - $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));
|
|
| 704 | - return $tabs; |
|
| 703 | + $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));
|
|
| 704 | + return $tabs; |
|
| 705 | 705 | } |
| 706 | 706 | |
| 707 | 707 | |
@@ -717,144 +717,144 @@ discard block |
||
| 717 | 717 | */ |
| 718 | 718 | function geodir_extend_geodirectory_setting_tab($tabs) |
| 719 | 719 | {
|
| 720 | - $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
| 721 | - return $tabs; |
|
| 720 | + $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
|
|
| 721 | + return $tabs; |
|
| 722 | 722 | } |
| 723 | 723 | |
| 724 | 724 | |
| 725 | 725 | if (!function_exists('geodir_edit_post_columns')) {
|
| 726 | - /** |
|
| 727 | - * Modify admin post listing page columns. |
|
| 728 | - * |
|
| 729 | - * @since 1.0.0 |
|
| 730 | - * @package GeoDirectory |
|
| 731 | - * @param array $columns The column array. |
|
| 732 | - * @return array Altered column array. |
|
| 733 | - */ |
|
| 734 | - function geodir_edit_post_columns($columns) |
|
| 735 | - {
|
|
| 736 | - |
|
| 737 | - $new_columns = array('location' => __('Location (ID)', 'geodirectory'),
|
|
| 738 | - 'categorys' => __('Categories', 'geodirectory'));
|
|
| 739 | - |
|
| 740 | - if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist
|
|
| 741 | - {
|
|
| 742 | - $offset = 0; // should we prepend $array with $data? |
|
| 743 | - $offset = count($columns); // or should we append $array with $data? lets pick this one... |
|
| 744 | - } |
|
| 726 | + /** |
|
| 727 | + * Modify admin post listing page columns. |
|
| 728 | + * |
|
| 729 | + * @since 1.0.0 |
|
| 730 | + * @package GeoDirectory |
|
| 731 | + * @param array $columns The column array. |
|
| 732 | + * @return array Altered column array. |
|
| 733 | + */ |
|
| 734 | + function geodir_edit_post_columns($columns) |
|
| 735 | + {
|
|
| 745 | 736 | |
| 746 | - $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset)); |
|
| 737 | + $new_columns = array('location' => __('Location (ID)', 'geodirectory'),
|
|
| 738 | + 'categorys' => __('Categories', 'geodirectory'));
|
|
| 747 | 739 | |
| 748 | - $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));
|
|
| 740 | + if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist
|
|
| 741 | + {
|
|
| 742 | + $offset = 0; // should we prepend $array with $data? |
|
| 743 | + $offset = count($columns); // or should we append $array with $data? lets pick this one... |
|
| 744 | + } |
|
| 749 | 745 | |
| 750 | - return $columns; |
|
| 751 | - } |
|
| 746 | + $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset)); |
|
| 747 | + |
|
| 748 | + $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));
|
|
| 749 | + |
|
| 750 | + return $columns; |
|
| 751 | + } |
|
| 752 | 752 | } |
| 753 | 753 | |
| 754 | 754 | |
| 755 | 755 | if (!function_exists('geodir_manage_post_columns')) {
|
| 756 | - /** |
|
| 757 | - * Adds content to our custom post listing page columns. |
|
| 758 | - * |
|
| 759 | - * @since 1.0.0 |
|
| 760 | - * @package GeoDirectory |
|
| 761 | - * @global object $wpdb WordPress Database object. |
|
| 762 | - * @global object $post WordPress Post object. |
|
| 763 | - * @param string $column The column name. |
|
| 764 | - * @param int $post_id The post ID. |
|
| 765 | - */ |
|
| 766 | - function geodir_manage_post_columns($column, $post_id) |
|
| 767 | - {
|
|
| 768 | - global $post, $wpdb; |
|
| 769 | - |
|
| 770 | - switch ($column): |
|
| 771 | - /* If displaying the 'city' column. */ |
|
| 772 | - case 'location' : |
|
| 773 | - $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true); |
|
| 774 | - $location = geodir_get_location($location_id); |
|
| 775 | - /* If no city is found, output a default message. */ |
|
| 776 | - if (empty($location)) {
|
|
| 777 | - _e('Unknown', 'geodirectory');
|
|
| 778 | - } else {
|
|
| 779 | - /* If there is a city id, append 'city name' to the text string. */ |
|
| 780 | - $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';
|
|
| 781 | - echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id); |
|
| 782 | - } |
|
| 783 | - break; |
|
| 784 | - |
|
| 785 | - /* If displaying the 'expire' column. */ |
|
| 786 | - case 'expire' : |
|
| 787 | - $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true); |
|
| 788 | - $d1 = $expire_date; // get expire_date |
|
| 789 | - $d2 = date('Y-m-d'); // get current date
|
|
| 790 | - $state = __('days left', 'geodirectory');
|
|
| 791 | - $date_diff_text = ''; |
|
| 792 | - $expire_class = 'expire_left'; |
|
| 793 | - if ($expire_date != 'Never') {
|
|
| 794 | - if (strtotime($d1) < strtotime($d2)) {
|
|
| 795 | - $state = __('days overdue', 'geodirectory');
|
|
| 796 | - $expire_class = 'expire_over'; |
|
| 797 | - } |
|
| 798 | - $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days |
|
| 799 | - $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
|
|
| 800 | - } |
|
| 801 | - /* If no expire_date is found, output a default message. */ |
|
| 802 | - if (empty($expire_date)) |
|
| 803 | - echo __('Unknown', 'geodirectory');
|
|
| 804 | - /* If there is a expire_date, append 'days left' to the text string. */ |
|
| 805 | - else |
|
| 806 | - echo $expire_date . $date_diff_text; |
|
| 807 | - break; |
|
| 808 | - |
|
| 809 | - /* If displaying the 'categorys' column. */ |
|
| 810 | - case 'categorys' : |
|
| 811 | - |
|
| 812 | - /* Get the categorys for the post. */ |
|
| 813 | - |
|
| 814 | - |
|
| 815 | - $terms = wp_get_object_terms($post_id, get_object_taxonomies($post)); |
|
| 816 | - |
|
| 817 | - /* If terms were found. */ |
|
| 818 | - if (!empty($terms)) {
|
|
| 819 | - $out = array(); |
|
| 820 | - /* Loop through each term, linking to the 'edit posts' page for the specific term. */ |
|
| 821 | - foreach ($terms as $term) {
|
|
| 822 | - if (!strstr($term->taxonomy, 'tag')) {
|
|
| 823 | - $out[] = sprintf('<a href="%s">%s</a>',
|
|
| 824 | - esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),
|
|
| 825 | - esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))
|
|
| 826 | - ); |
|
| 827 | - } |
|
| 828 | - } |
|
| 829 | - /* Join the terms, separating them with a comma. */ |
|
| 830 | - echo(join(', ', $out));
|
|
| 831 | - } /* If no terms were found, output a default message. */ |
|
| 832 | - else {
|
|
| 833 | - _e('No Categories', 'geodirectory');
|
|
| 834 | - } |
|
| 835 | - break; |
|
| 756 | + /** |
|
| 757 | + * Adds content to our custom post listing page columns. |
|
| 758 | + * |
|
| 759 | + * @since 1.0.0 |
|
| 760 | + * @package GeoDirectory |
|
| 761 | + * @global object $wpdb WordPress Database object. |
|
| 762 | + * @global object $post WordPress Post object. |
|
| 763 | + * @param string $column The column name. |
|
| 764 | + * @param int $post_id The post ID. |
|
| 765 | + */ |
|
| 766 | + function geodir_manage_post_columns($column, $post_id) |
|
| 767 | + {
|
|
| 768 | + global $post, $wpdb; |
|
| 769 | + |
|
| 770 | + switch ($column): |
|
| 771 | + /* If displaying the 'city' column. */ |
|
| 772 | + case 'location' : |
|
| 773 | + $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true); |
|
| 774 | + $location = geodir_get_location($location_id); |
|
| 775 | + /* If no city is found, output a default message. */ |
|
| 776 | + if (empty($location)) {
|
|
| 777 | + _e('Unknown', 'geodirectory');
|
|
| 778 | + } else {
|
|
| 779 | + /* If there is a city id, append 'city name' to the text string. */ |
|
| 780 | + $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';
|
|
| 781 | + echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id); |
|
| 782 | + } |
|
| 783 | + break; |
|
| 784 | + |
|
| 785 | + /* If displaying the 'expire' column. */ |
|
| 786 | + case 'expire' : |
|
| 787 | + $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true); |
|
| 788 | + $d1 = $expire_date; // get expire_date |
|
| 789 | + $d2 = date('Y-m-d'); // get current date
|
|
| 790 | + $state = __('days left', 'geodirectory');
|
|
| 791 | + $date_diff_text = ''; |
|
| 792 | + $expire_class = 'expire_left'; |
|
| 793 | + if ($expire_date != 'Never') {
|
|
| 794 | + if (strtotime($d1) < strtotime($d2)) {
|
|
| 795 | + $state = __('days overdue', 'geodirectory');
|
|
| 796 | + $expire_class = 'expire_over'; |
|
| 797 | + } |
|
| 798 | + $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days |
|
| 799 | + $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
|
|
| 800 | + } |
|
| 801 | + /* If no expire_date is found, output a default message. */ |
|
| 802 | + if (empty($expire_date)) |
|
| 803 | + echo __('Unknown', 'geodirectory');
|
|
| 804 | + /* If there is a expire_date, append 'days left' to the text string. */ |
|
| 805 | + else |
|
| 806 | + echo $expire_date . $date_diff_text; |
|
| 807 | + break; |
|
| 836 | 808 | |
| 837 | - endswitch; |
|
| 838 | - } |
|
| 809 | + /* If displaying the 'categorys' column. */ |
|
| 810 | + case 'categorys' : |
|
| 811 | + |
|
| 812 | + /* Get the categorys for the post. */ |
|
| 813 | + |
|
| 814 | + |
|
| 815 | + $terms = wp_get_object_terms($post_id, get_object_taxonomies($post)); |
|
| 816 | + |
|
| 817 | + /* If terms were found. */ |
|
| 818 | + if (!empty($terms)) {
|
|
| 819 | + $out = array(); |
|
| 820 | + /* Loop through each term, linking to the 'edit posts' page for the specific term. */ |
|
| 821 | + foreach ($terms as $term) {
|
|
| 822 | + if (!strstr($term->taxonomy, 'tag')) {
|
|
| 823 | + $out[] = sprintf('<a href="%s">%s</a>',
|
|
| 824 | + esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),
|
|
| 825 | + esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))
|
|
| 826 | + ); |
|
| 827 | + } |
|
| 828 | + } |
|
| 829 | + /* Join the terms, separating them with a comma. */ |
|
| 830 | + echo(join(', ', $out));
|
|
| 831 | + } /* If no terms were found, output a default message. */ |
|
| 832 | + else {
|
|
| 833 | + _e('No Categories', 'geodirectory');
|
|
| 834 | + } |
|
| 835 | + break; |
|
| 836 | + |
|
| 837 | + endswitch; |
|
| 838 | + } |
|
| 839 | 839 | } |
| 840 | 840 | |
| 841 | 841 | |
| 842 | 842 | if (!function_exists('geodir_post_sortable_columns')) {
|
| 843 | - /** |
|
| 844 | - * Makes admin post listing page columns sortable. |
|
| 845 | - * |
|
| 846 | - * @since 1.0.0 |
|
| 847 | - * @package GeoDirectory |
|
| 848 | - * @param array $columns The column array. |
|
| 849 | - * @return array Altered column array. |
|
| 850 | - */ |
|
| 851 | - function geodir_post_sortable_columns($columns) |
|
| 852 | - {
|
|
| 853 | - |
|
| 854 | - $columns['expire'] = 'expire'; |
|
| 855 | - |
|
| 856 | - return $columns; |
|
| 857 | - } |
|
| 843 | + /** |
|
| 844 | + * Makes admin post listing page columns sortable. |
|
| 845 | + * |
|
| 846 | + * @since 1.0.0 |
|
| 847 | + * @package GeoDirectory |
|
| 848 | + * @param array $columns The column array. |
|
| 849 | + * @return array Altered column array. |
|
| 850 | + */ |
|
| 851 | + function geodir_post_sortable_columns($columns) |
|
| 852 | + {
|
|
| 853 | + |
|
| 854 | + $columns['expire'] = 'expire'; |
|
| 855 | + |
|
| 856 | + return $columns; |
|
| 857 | + } |
|
| 858 | 858 | } |
| 859 | 859 | |
| 860 | 860 | /** |
@@ -868,32 +868,32 @@ discard block |
||
| 868 | 868 | * @param int $post_id The post ID. |
| 869 | 869 | */ |
| 870 | 870 | function geodir_post_information_save($post_id, $post) {
|
| 871 | - global $wpdb, $current_user; |
|
| 871 | + global $wpdb, $current_user; |
|
| 872 | 872 | |
| 873 | - if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {
|
|
| 874 | - return; |
|
| 875 | - } |
|
| 873 | + if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {
|
|
| 874 | + return; |
|
| 875 | + } |
|
| 876 | 876 | |
| 877 | - $geodir_posttypes = geodir_get_posttypes(); |
|
| 877 | + $geodir_posttypes = geodir_get_posttypes(); |
|
| 878 | 878 | |
| 879 | - if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
|
|
| 880 | - return; |
|
| 879 | + if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
|
|
| 880 | + return; |
|
| 881 | 881 | |
| 882 | - if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {
|
|
| 883 | - if (isset($_REQUEST['_status'])) |
|
| 884 | - geodir_change_post_status($post_id, $_REQUEST['_status']); |
|
| 882 | + if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {
|
|
| 883 | + if (isset($_REQUEST['_status'])) |
|
| 884 | + geodir_change_post_status($post_id, $_REQUEST['_status']); |
|
| 885 | 885 | |
| 886 | - if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) |
|
| 887 | - return; |
|
| 886 | + if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) |
|
| 887 | + return; |
|
| 888 | 888 | |
| 889 | - if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) |
|
| 890 | - return; |
|
| 889 | + if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) |
|
| 890 | + return; |
|
| 891 | 891 | |
| 892 | - if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) |
|
| 893 | - return; |
|
| 892 | + if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) |
|
| 893 | + return; |
|
| 894 | 894 | |
| 895 | - geodir_save_listing($_REQUEST); |
|
| 896 | - } |
|
| 895 | + geodir_save_listing($_REQUEST); |
|
| 896 | + } |
|
| 897 | 897 | } |
| 898 | 898 | |
| 899 | 899 | /** |
@@ -909,102 +909,102 @@ discard block |
||
| 909 | 909 | */ |
| 910 | 910 | function geodir_admin_fields($options) |
| 911 | 911 | {
|
| 912 | - global $geodirectory; |
|
| 913 | - |
|
| 914 | - $first_title = true; |
|
| 915 | - $tab_id = ''; |
|
| 916 | - $i = 0; |
|
| 917 | - foreach ($options as $value) : |
|
| 918 | - if (!isset($value['name'])) $value['name'] = ''; |
|
| 919 | - if (!isset($value['class'])) $value['class'] = ''; |
|
| 920 | - if (!isset($value['css'])) $value['css'] = ''; |
|
| 921 | - if (!isset($value['std'])) $value['std'] = ''; |
|
| 922 | - $desc = ''; |
|
| 923 | - switch ($value['type']) : |
|
| 924 | - case 'dummy_installer': |
|
| 925 | - $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place'; |
|
| 926 | - geodir_autoinstall_admin_header($post_type); |
|
| 927 | - break; |
|
| 928 | - case 'title': |
|
| 929 | - |
|
| 930 | - if ($i == 0) {
|
|
| 931 | - echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>'; |
|
| 932 | - echo '<div class="inner_content_tab_main">'; |
|
| 933 | - } |
|
| 912 | + global $geodirectory; |
|
| 913 | + |
|
| 914 | + $first_title = true; |
|
| 915 | + $tab_id = ''; |
|
| 916 | + $i = 0; |
|
| 917 | + foreach ($options as $value) : |
|
| 918 | + if (!isset($value['name'])) $value['name'] = ''; |
|
| 919 | + if (!isset($value['class'])) $value['class'] = ''; |
|
| 920 | + if (!isset($value['css'])) $value['css'] = ''; |
|
| 921 | + if (!isset($value['std'])) $value['std'] = ''; |
|
| 922 | + $desc = ''; |
|
| 923 | + switch ($value['type']) : |
|
| 924 | + case 'dummy_installer': |
|
| 925 | + $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place'; |
|
| 926 | + geodir_autoinstall_admin_header($post_type); |
|
| 927 | + break; |
|
| 928 | + case 'title': |
|
| 929 | + |
|
| 930 | + if ($i == 0) {
|
|
| 931 | + echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>'; |
|
| 932 | + echo '<div class="inner_content_tab_main">'; |
|
| 933 | + } |
|
| 934 | 934 | |
| 935 | - $i++; |
|
| 935 | + $i++; |
|
| 936 | 936 | |
| 937 | - if (isset($value['id']) && $value['id']) |
|
| 938 | - $tab_id = $value['id']; |
|
| 937 | + if (isset($value['id']) && $value['id']) |
|
| 938 | + $tab_id = $value['id']; |
|
| 939 | 939 | |
| 940 | - if (isset($value['desc']) && $value['desc']) |
|
| 941 | - $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
| 940 | + if (isset($value['desc']) && $value['desc']) |
|
| 941 | + $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>'; |
|
| 942 | 942 | |
| 943 | - if (isset($value['name']) && $value['name']) {
|
|
| 944 | - if ($first_title === true) {
|
|
| 945 | - $first_title = false; |
|
| 946 | - } else {
|
|
| 947 | - echo '</div>'; |
|
| 948 | - } |
|
| 949 | - echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>'; |
|
| 943 | + if (isset($value['name']) && $value['name']) {
|
|
| 944 | + if ($first_title === true) {
|
|
| 945 | + $first_title = false; |
|
| 946 | + } else {
|
|
| 947 | + echo '</div>'; |
|
| 948 | + } |
|
| 949 | + echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>'; |
|
| 950 | 950 | |
| 951 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 952 | - } |
|
| 951 | + echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 952 | + } |
|
| 953 | 953 | |
| 954 | - /** |
|
| 955 | - * Called after a GeoDirectory settings title is output in the GD settings page. |
|
| 956 | - * |
|
| 957 | - * The action is called dynamically geodir_settings_$value['id']. |
|
| 958 | - * |
|
| 959 | - * @since 1.0.0 |
|
| 960 | - */ |
|
| 961 | - do_action('geodir_settings_' . sanitize_title($value['id']));
|
|
| 962 | - break; |
|
| 963 | - |
|
| 964 | - case 'no_tabs': |
|
| 965 | - |
|
| 966 | - echo '<div class="inner_content_tab_main">'; |
|
| 967 | - echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 968 | - |
|
| 969 | - break; |
|
| 970 | - |
|
| 971 | - case 'sectionstart': |
|
| 972 | - if (isset($value['desc']) && $value['desc']) |
|
| 973 | - $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
| 974 | - if (isset($value['name']) && $value['name']) |
|
| 975 | - echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
| 976 | - /** |
|
| 977 | - * Called after a GeoDirectory settings sectionstart is output in the GD settings page. |
|
| 978 | - * |
|
| 979 | - * The action is called dynamically geodir_settings_$value['id']_start. |
|
| 980 | - * |
|
| 981 | - * @since 1.0.0 |
|
| 982 | - */ |
|
| 983 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
|
|
| 984 | - echo '<table class="form-table">' . "\n\n"; |
|
| 985 | - |
|
| 986 | - break; |
|
| 987 | - case 'sectionend': |
|
| 988 | - /** |
|
| 989 | - * Called before a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 990 | - * |
|
| 991 | - * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 992 | - * |
|
| 993 | - * @since 1.0.0 |
|
| 994 | - */ |
|
| 995 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
|
|
| 996 | - echo '</table>'; |
|
| 997 | - /** |
|
| 998 | - * Called after a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 999 | - * |
|
| 1000 | - * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 1001 | - * |
|
| 1002 | - * @since 1.0.0 |
|
| 1003 | - */ |
|
| 1004 | - if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
|
|
| 1005 | - break; |
|
| 1006 | - case 'text': |
|
| 1007 | - ?> |
|
| 954 | + /** |
|
| 955 | + * Called after a GeoDirectory settings title is output in the GD settings page. |
|
| 956 | + * |
|
| 957 | + * The action is called dynamically geodir_settings_$value['id']. |
|
| 958 | + * |
|
| 959 | + * @since 1.0.0 |
|
| 960 | + */ |
|
| 961 | + do_action('geodir_settings_' . sanitize_title($value['id']));
|
|
| 962 | + break; |
|
| 963 | + |
|
| 964 | + case 'no_tabs': |
|
| 965 | + |
|
| 966 | + echo '<div class="inner_content_tab_main">'; |
|
| 967 | + echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >'; |
|
| 968 | + |
|
| 969 | + break; |
|
| 970 | + |
|
| 971 | + case 'sectionstart': |
|
| 972 | + if (isset($value['desc']) && $value['desc']) |
|
| 973 | + $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>'; |
|
| 974 | + if (isset($value['name']) && $value['name']) |
|
| 975 | + echo '<h3>' . $value['name'] . $desc . '</h3>'; |
|
| 976 | + /** |
|
| 977 | + * Called after a GeoDirectory settings sectionstart is output in the GD settings page. |
|
| 978 | + * |
|
| 979 | + * The action is called dynamically geodir_settings_$value['id']_start. |
|
| 980 | + * |
|
| 981 | + * @since 1.0.0 |
|
| 982 | + */ |
|
| 983 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
|
|
| 984 | + echo '<table class="form-table">' . "\n\n"; |
|
| 985 | + |
|
| 986 | + break; |
|
| 987 | + case 'sectionend': |
|
| 988 | + /** |
|
| 989 | + * Called before a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 990 | + * |
|
| 991 | + * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 992 | + * |
|
| 993 | + * @since 1.0.0 |
|
| 994 | + */ |
|
| 995 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
|
|
| 996 | + echo '</table>'; |
|
| 997 | + /** |
|
| 998 | + * Called after a GeoDirectory settings sectionend is output in the GD settings page. |
|
| 999 | + * |
|
| 1000 | + * The action is called dynamically geodir_settings_$value['id']_end. |
|
| 1001 | + * |
|
| 1002 | + * @since 1.0.0 |
|
| 1003 | + */ |
|
| 1004 | + if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
|
|
| 1005 | + break; |
|
| 1006 | + case 'text': |
|
| 1007 | + ?> |
|
| 1008 | 1008 | <tr valign="top"> |
| 1009 | 1009 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1010 | 1010 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1013,15 +1013,15 @@ discard block |
||
| 1013 | 1013 | <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
| 1014 | 1014 | style=" <?php echo esc_attr($value['css']); ?>" |
| 1015 | 1015 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1016 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1017 | - } else {
|
|
| 1018 | - echo esc_attr($value['std']); |
|
| 1019 | - } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1016 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1017 | + } else {
|
|
| 1018 | + echo esc_attr($value['std']); |
|
| 1019 | + } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1020 | 1020 | </tr><?php |
| 1021 | - break; |
|
| 1021 | + break; |
|
| 1022 | 1022 | |
| 1023 | - case 'map-key': |
|
| 1024 | - ?> |
|
| 1023 | + case 'map-key': |
|
| 1024 | + ?> |
|
| 1025 | 1025 | <tr valign="top"> |
| 1026 | 1026 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1027 | 1027 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1030,17 +1030,17 @@ discard block |
||
| 1030 | 1030 | <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
| 1031 | 1031 | style=" <?php echo esc_attr($value['css']); ?>" |
| 1032 | 1032 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1033 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1034 | - } else {
|
|
| 1035 | - echo esc_attr($value['std']); |
|
| 1036 | - } ?>"/> |
|
| 1033 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1034 | + } else {
|
|
| 1035 | + echo esc_attr($value['std']); |
|
| 1036 | + } ?>"/> |
|
| 1037 | 1037 | <a href='https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]&TB_iframe=true&width=600&height=400' class="thickbox button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )','geodirectory');?>" ><?php _e('Generate API Key','geodirectory');?></a>
|
| 1038 | 1038 | <span class="description"><?php echo $value['desc']; ?></span></td> |
| 1039 | 1039 | </tr><?php |
| 1040 | - break; |
|
| 1040 | + break; |
|
| 1041 | 1041 | |
| 1042 | - case 'password': |
|
| 1043 | - ?> |
|
| 1042 | + case 'password': |
|
| 1043 | + ?> |
|
| 1044 | 1044 | <tr valign="top"> |
| 1045 | 1045 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1046 | 1046 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
@@ -1049,42 +1049,42 @@ discard block |
||
| 1049 | 1049 | <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
|
| 1050 | 1050 | style="<?php echo esc_attr($value['css']); ?>" |
| 1051 | 1051 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1052 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1053 | - } else {
|
|
| 1054 | - echo esc_attr($value['std']); |
|
| 1055 | - } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1052 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1053 | + } else {
|
|
| 1054 | + echo esc_attr($value['std']); |
|
| 1055 | + } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td> |
|
| 1056 | 1056 | </tr><?php |
| 1057 | - break; |
|
| 1057 | + break; |
|
| 1058 | 1058 | |
| 1059 | - case 'html_content': |
|
| 1060 | - ?> |
|
| 1059 | + case 'html_content': |
|
| 1060 | + ?> |
|
| 1061 | 1061 | <tr valign="top"> |
| 1062 | 1062 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1063 | 1063 | <td class="forminp"><span class="description"><?php echo $value['desc']; ?></span></td> |
| 1064 | 1064 | </tr><?php |
| 1065 | - break; |
|
| 1065 | + break; |
|
| 1066 | 1066 | |
| 1067 | - case 'color' : |
|
| 1068 | - ?> |
|
| 1067 | + case 'color' : |
|
| 1068 | + ?> |
|
| 1069 | 1069 | <tr valign="top"> |
| 1070 | 1070 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1071 | 1071 | <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>" |
| 1072 | 1072 | id="<?php echo esc_attr($value['id']); ?>" type="text" |
| 1073 | 1073 | style="<?php echo esc_attr($value['css']); ?>" |
| 1074 | 1074 | value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
|
| 1075 | - echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1076 | - } else {
|
|
| 1077 | - echo esc_attr($value['std']); |
|
| 1078 | - } ?>" class="colorpick"/> <span |
|
| 1075 | + echo esc_attr(stripslashes(get_option($value['id']))); |
|
| 1076 | + } else {
|
|
| 1077 | + echo esc_attr($value['std']); |
|
| 1078 | + } ?>" class="colorpick"/> <span |
|
| 1079 | 1079 | class="description"><?php echo $value['desc']; ?></span> |
| 1080 | 1080 | |
| 1081 | 1081 | <div id="colorPickerDiv_<?php echo esc_attr($value['id']); ?>" class="colorpickdiv" |
| 1082 | 1082 | style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"></div> |
| 1083 | 1083 | </td> |
| 1084 | 1084 | </tr><?php |
| 1085 | - break; |
|
| 1086 | - case 'image_width' : |
|
| 1087 | - ?> |
|
| 1085 | + break; |
|
| 1086 | + case 'image_width' : |
|
| 1087 | + ?> |
|
| 1088 | 1088 | <tr valign="top"> |
| 1089 | 1089 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1090 | 1090 | <td class="forminp"> |
@@ -1106,11 +1106,11 @@ discard block |
||
| 1106 | 1106 | |
| 1107 | 1107 | <span class="description"><?php echo $value['desc'] ?></span></td> |
| 1108 | 1108 | </tr><?php |
| 1109 | - break; |
|
| 1110 | - case 'select': |
|
| 1111 | - $option_value = get_option($value['id']); |
|
| 1112 | - $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value; |
|
| 1113 | - ?> |
|
| 1109 | + break; |
|
| 1110 | + case 'select': |
|
| 1111 | + $option_value = get_option($value['id']); |
|
| 1112 | + $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value; |
|
| 1113 | + ?> |
|
| 1114 | 1114 | <tr valign="top"> |
| 1115 | 1115 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1116 | 1116 | <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>" |
@@ -1119,33 +1119,33 @@ discard block |
||
| 1119 | 1119 | class="<?php if (isset($value['class'])) echo $value['class']; ?>" |
| 1120 | 1120 | option-ajaxchosen="false"> |
| 1121 | 1121 | <?php |
| 1122 | - foreach ($value['options'] as $key => $val) {
|
|
| 1123 | - $geodir_select_value = ''; |
|
| 1124 | - if ($option_value != '') {
|
|
| 1125 | - if ($option_value != '' && $option_value == $key) |
|
| 1126 | - $geodir_select_value = ' selected="selected" '; |
|
| 1127 | - } else {
|
|
| 1128 | - if ($value['std'] == $key) |
|
| 1129 | - $geodir_select_value = ' selected="selected" '; |
|
| 1130 | - } |
|
| 1131 | - ?> |
|
| 1122 | + foreach ($value['options'] as $key => $val) {
|
|
| 1123 | + $geodir_select_value = ''; |
|
| 1124 | + if ($option_value != '') {
|
|
| 1125 | + if ($option_value != '' && $option_value == $key) |
|
| 1126 | + $geodir_select_value = ' selected="selected" '; |
|
| 1127 | + } else {
|
|
| 1128 | + if ($value['std'] == $key) |
|
| 1129 | + $geodir_select_value = ' selected="selected" '; |
|
| 1130 | + } |
|
| 1131 | + ?> |
|
| 1132 | 1132 | <option |
| 1133 | 1133 | value="<?php echo esc_attr($key); ?>" <?php echo $geodir_select_value; ?> ><?php echo geodir_utf8_ucfirst($val) ?></option> |
| 1134 | 1134 | <?php |
| 1135 | - } |
|
| 1136 | - ?> |
|
| 1135 | + } |
|
| 1136 | + ?> |
|
| 1137 | 1137 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
| 1138 | 1138 | </td> |
| 1139 | 1139 | </tr><?php |
| 1140 | - break; |
|
| 1140 | + break; |
|
| 1141 | 1141 | |
| 1142 | - case 'multiselect': |
|
| 1143 | - $option_values = get_option($value['id']); |
|
| 1144 | - if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {
|
|
| 1145 | - $option_values = $value['std']; |
|
| 1146 | - } |
|
| 1147 | - $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values; |
|
| 1148 | - ?> |
|
| 1142 | + case 'multiselect': |
|
| 1143 | + $option_values = get_option($value['id']); |
|
| 1144 | + if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {
|
|
| 1145 | + $option_values = $value['std']; |
|
| 1146 | + } |
|
| 1147 | + $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values; |
|
| 1148 | + ?> |
|
| 1149 | 1149 | <tr valign="top"> |
| 1150 | 1150 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1151 | 1151 | <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]" |
@@ -1155,26 +1155,26 @@ discard block |
||
| 1155 | 1155 | data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>" |
| 1156 | 1156 | option-ajaxchosen="false"> |
| 1157 | 1157 | <?php |
| 1158 | - foreach ($value['options'] as $key => $val) {
|
|
| 1159 | - if (strpos($key, 'optgroup_start-') === 0) {
|
|
| 1160 | - ?><optgroup label="<?php echo geodir_utf8_ucfirst($val); ?>"><?php |
|
| 1161 | - } else if (strpos($key, 'optgroup_end-') === 0) {
|
|
| 1162 | - ?></optgroup><?php |
|
| 1163 | - } else {
|
|
| 1164 | - ?> |
|
| 1158 | + foreach ($value['options'] as $key => $val) {
|
|
| 1159 | + if (strpos($key, 'optgroup_start-') === 0) {
|
|
| 1160 | + ?><optgroup label="<?php echo geodir_utf8_ucfirst($val); ?>"><?php |
|
| 1161 | + } else if (strpos($key, 'optgroup_end-') === 0) {
|
|
| 1162 | + ?></optgroup><?php |
|
| 1163 | + } else {
|
|
| 1164 | + ?> |
|
| 1165 | 1165 | <option value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>> |
| 1166 | 1166 | <?php echo geodir_utf8_ucfirst($val) ?> |
| 1167 | 1167 | </option> |
| 1168 | 1168 | <?php |
| 1169 | - } |
|
| 1170 | - } |
|
| 1171 | - ?> |
|
| 1169 | + } |
|
| 1170 | + } |
|
| 1171 | + ?> |
|
| 1172 | 1172 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
| 1173 | 1173 | </td> |
| 1174 | 1174 | </tr><?php |
| 1175 | - break; |
|
| 1176 | - case 'file': |
|
| 1177 | - ?> |
|
| 1175 | + break; |
|
| 1176 | + case 'file': |
|
| 1177 | + ?> |
|
| 1178 | 1178 | <tr valign="top"> |
| 1179 | 1179 | <th scope="row" class="titledesc"><?php echo $value['name']; ?></th> |
| 1180 | 1180 | <td class="forminp"> |
@@ -1194,87 +1194,87 @@ discard block |
||
| 1194 | 1194 | <?php } ?> |
| 1195 | 1195 | </td> |
| 1196 | 1196 | </tr><?php |
| 1197 | - break; |
|
| 1198 | - case 'map_default_settings' : |
|
| 1199 | - ?> |
|
| 1197 | + break; |
|
| 1198 | + case 'map_default_settings' : |
|
| 1199 | + ?> |
|
| 1200 | 1200 | |
| 1201 | 1201 | <tr valign="top"> |
| 1202 | 1202 | <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>
|
| 1203 | 1203 | <td width="60%"> |
| 1204 | 1204 | <select name="geodir_default_map_language" style="width:60%"> |
| 1205 | 1205 | <?php |
| 1206 | - $arr_map_langages = array( |
|
| 1207 | - 'ar' => __('ARABIC', 'geodirectory'),
|
|
| 1208 | - 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1209 | - 'bg' => __('BULGARIAN', 'geodirectory'),
|
|
| 1210 | - 'bn' => __('BENGALI', 'geodirectory'),
|
|
| 1211 | - 'ca' => __('CATALAN', 'geodirectory'),
|
|
| 1212 | - 'cs' => __('CZECH', 'geodirectory'),
|
|
| 1213 | - 'da' => __('DANISH', 'geodirectory'),
|
|
| 1214 | - 'de' => __('GERMAN', 'geodirectory'),
|
|
| 1215 | - 'el' => __('GREEK', 'geodirectory'),
|
|
| 1216 | - 'en' => __('ENGLISH', 'geodirectory'),
|
|
| 1217 | - 'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),
|
|
| 1218 | - 'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),
|
|
| 1219 | - 'es' => __('SPANISH', 'geodirectory'),
|
|
| 1220 | - 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1221 | - 'fa' => __('FARSI', 'geodirectory'),
|
|
| 1222 | - 'fi' => __('FINNISH', 'geodirectory'),
|
|
| 1223 | - 'fil' => __('FILIPINO', 'geodirectory'),
|
|
| 1224 | - 'fr' => __('FRENCH', 'geodirectory'),
|
|
| 1225 | - 'gl' => __('GALICIAN', 'geodirectory'),
|
|
| 1226 | - 'gu' => __('GUJARATI', 'geodirectory'),
|
|
| 1227 | - 'hi' => __('HINDI', 'geodirectory'),
|
|
| 1228 | - 'hr' => __('CROATIAN', 'geodirectory'),
|
|
| 1229 | - 'hu' => __('HUNGARIAN', 'geodirectory'),
|
|
| 1230 | - 'id' => __('INDONESIAN', 'geodirectory'),
|
|
| 1231 | - 'it' => __('ITALIAN', 'geodirectory'),
|
|
| 1232 | - 'iw' => __('HEBREW', 'geodirectory'),
|
|
| 1233 | - 'ja' => __('JAPANESE', 'geodirectory'),
|
|
| 1234 | - 'kn' => __('KANNADA', 'geodirectory'),
|
|
| 1235 | - 'ko' => __('KOREAN', 'geodirectory'),
|
|
| 1236 | - 'lt' => __('LITHUANIAN', 'geodirectory'),
|
|
| 1237 | - 'lv' => __('LATVIAN', 'geodirectory'),
|
|
| 1238 | - 'ml' => __('MALAYALAM', 'geodirectory'),
|
|
| 1239 | - 'mr' => __('MARATHI', 'geodirectory'),
|
|
| 1240 | - 'nl' => __('DUTCH', 'geodirectory'),
|
|
| 1241 | - 'no' => __('NORWEGIAN', 'geodirectory'),
|
|
| 1242 | - 'pl' => __('POLISH', 'geodirectory'),
|
|
| 1243 | - 'pt' => __('PORTUGUESE', 'geodirectory'),
|
|
| 1244 | - 'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),
|
|
| 1245 | - 'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),
|
|
| 1246 | - 'ro' => __('ROMANIAN', 'geodirectory'),
|
|
| 1247 | - 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1248 | - 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1249 | - 'sk' => __('SLOVAK', 'geodirectory'),
|
|
| 1250 | - 'sl' => __('SLOVENIAN', 'geodirectory'),
|
|
| 1251 | - 'sr' => __('SERBIAN', 'geodirectory'),
|
|
| 1252 | - 'sv' => __(' SWEDISH', 'geodirectory'),
|
|
| 1253 | - 'tl' => __('TAGALOG', 'geodirectory'),
|
|
| 1254 | - 'ta' => __('TAMIL', 'geodirectory'),
|
|
| 1255 | - 'te' => __('TELUGU', 'geodirectory'),
|
|
| 1256 | - 'th' => __('THAI', 'geodirectory'),
|
|
| 1257 | - 'tr' => __('TURKISH', 'geodirectory'),
|
|
| 1258 | - 'uk' => __('UKRAINIAN', 'geodirectory'),
|
|
| 1259 | - 'vi' => __('VIETNAMESE', 'geodirectory'),
|
|
| 1260 | - 'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),
|
|
| 1261 | - 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),
|
|
| 1262 | - ); |
|
| 1263 | - $geodir_default_map_language = get_option('geodir_default_map_language');
|
|
| 1264 | - if (empty($geodir_default_map_language)) |
|
| 1265 | - $geodir_default_map_language = 'en'; |
|
| 1266 | - foreach ($arr_map_langages as $language_key => $language_txt) {
|
|
| 1267 | - if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) |
|
| 1268 | - $geodir_default_language_selected = "selected='selected'"; |
|
| 1269 | - else |
|
| 1270 | - $geodir_default_language_selected = ''; |
|
| 1271 | - |
|
| 1272 | - ?> |
|
| 1206 | + $arr_map_langages = array( |
|
| 1207 | + 'ar' => __('ARABIC', 'geodirectory'),
|
|
| 1208 | + 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1209 | + 'bg' => __('BULGARIAN', 'geodirectory'),
|
|
| 1210 | + 'bn' => __('BENGALI', 'geodirectory'),
|
|
| 1211 | + 'ca' => __('CATALAN', 'geodirectory'),
|
|
| 1212 | + 'cs' => __('CZECH', 'geodirectory'),
|
|
| 1213 | + 'da' => __('DANISH', 'geodirectory'),
|
|
| 1214 | + 'de' => __('GERMAN', 'geodirectory'),
|
|
| 1215 | + 'el' => __('GREEK', 'geodirectory'),
|
|
| 1216 | + 'en' => __('ENGLISH', 'geodirectory'),
|
|
| 1217 | + 'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),
|
|
| 1218 | + 'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),
|
|
| 1219 | + 'es' => __('SPANISH', 'geodirectory'),
|
|
| 1220 | + 'eu' => __('BASQUE', 'geodirectory'),
|
|
| 1221 | + 'fa' => __('FARSI', 'geodirectory'),
|
|
| 1222 | + 'fi' => __('FINNISH', 'geodirectory'),
|
|
| 1223 | + 'fil' => __('FILIPINO', 'geodirectory'),
|
|
| 1224 | + 'fr' => __('FRENCH', 'geodirectory'),
|
|
| 1225 | + 'gl' => __('GALICIAN', 'geodirectory'),
|
|
| 1226 | + 'gu' => __('GUJARATI', 'geodirectory'),
|
|
| 1227 | + 'hi' => __('HINDI', 'geodirectory'),
|
|
| 1228 | + 'hr' => __('CROATIAN', 'geodirectory'),
|
|
| 1229 | + 'hu' => __('HUNGARIAN', 'geodirectory'),
|
|
| 1230 | + 'id' => __('INDONESIAN', 'geodirectory'),
|
|
| 1231 | + 'it' => __('ITALIAN', 'geodirectory'),
|
|
| 1232 | + 'iw' => __('HEBREW', 'geodirectory'),
|
|
| 1233 | + 'ja' => __('JAPANESE', 'geodirectory'),
|
|
| 1234 | + 'kn' => __('KANNADA', 'geodirectory'),
|
|
| 1235 | + 'ko' => __('KOREAN', 'geodirectory'),
|
|
| 1236 | + 'lt' => __('LITHUANIAN', 'geodirectory'),
|
|
| 1237 | + 'lv' => __('LATVIAN', 'geodirectory'),
|
|
| 1238 | + 'ml' => __('MALAYALAM', 'geodirectory'),
|
|
| 1239 | + 'mr' => __('MARATHI', 'geodirectory'),
|
|
| 1240 | + 'nl' => __('DUTCH', 'geodirectory'),
|
|
| 1241 | + 'no' => __('NORWEGIAN', 'geodirectory'),
|
|
| 1242 | + 'pl' => __('POLISH', 'geodirectory'),
|
|
| 1243 | + 'pt' => __('PORTUGUESE', 'geodirectory'),
|
|
| 1244 | + 'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),
|
|
| 1245 | + 'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),
|
|
| 1246 | + 'ro' => __('ROMANIAN', 'geodirectory'),
|
|
| 1247 | + 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1248 | + 'ru' => __('RUSSIAN', 'geodirectory'),
|
|
| 1249 | + 'sk' => __('SLOVAK', 'geodirectory'),
|
|
| 1250 | + 'sl' => __('SLOVENIAN', 'geodirectory'),
|
|
| 1251 | + 'sr' => __('SERBIAN', 'geodirectory'),
|
|
| 1252 | + 'sv' => __(' SWEDISH', 'geodirectory'),
|
|
| 1253 | + 'tl' => __('TAGALOG', 'geodirectory'),
|
|
| 1254 | + 'ta' => __('TAMIL', 'geodirectory'),
|
|
| 1255 | + 'te' => __('TELUGU', 'geodirectory'),
|
|
| 1256 | + 'th' => __('THAI', 'geodirectory'),
|
|
| 1257 | + 'tr' => __('TURKISH', 'geodirectory'),
|
|
| 1258 | + 'uk' => __('UKRAINIAN', 'geodirectory'),
|
|
| 1259 | + 'vi' => __('VIETNAMESE', 'geodirectory'),
|
|
| 1260 | + 'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),
|
|
| 1261 | + 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),
|
|
| 1262 | + ); |
|
| 1263 | + $geodir_default_map_language = get_option('geodir_default_map_language');
|
|
| 1264 | + if (empty($geodir_default_map_language)) |
|
| 1265 | + $geodir_default_map_language = 'en'; |
|
| 1266 | + foreach ($arr_map_langages as $language_key => $language_txt) {
|
|
| 1267 | + if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) |
|
| 1268 | + $geodir_default_language_selected = "selected='selected'"; |
|
| 1269 | + else |
|
| 1270 | + $geodir_default_language_selected = ''; |
|
| 1271 | + |
|
| 1272 | + ?> |
|
| 1273 | 1273 | <option |
| 1274 | 1274 | value="<?php echo $language_key?>" <?php echo $geodir_default_language_selected; ?>><?php echo $language_txt; ?></option> |
| 1275 | 1275 | |
| 1276 | 1276 | <?php } |
| 1277 | - ?> |
|
| 1277 | + ?> |
|
| 1278 | 1278 | </select> |
| 1279 | 1279 | </td> |
| 1280 | 1280 | </tr> |
@@ -1285,46 +1285,46 @@ discard block |
||
| 1285 | 1285 | <td width="60%"> |
| 1286 | 1286 | <select name="geodir_default_map_search_pt" style="width:60%"> |
| 1287 | 1287 | <?php |
| 1288 | - $post_types = geodir_get_posttypes('array');
|
|
| 1289 | - $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');
|
|
| 1290 | - if (empty($geodir_default_map_search_pt)) |
|
| 1291 | - $geodir_default_map_search_pt = 'gd_place'; |
|
| 1292 | - if (is_array($post_types)) {
|
|
| 1293 | - foreach ($post_types as $key => $post_types_obj) {
|
|
| 1294 | - if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) |
|
| 1295 | - $geodir_search_pt_selected = "selected='selected'"; |
|
| 1296 | - else |
|
| 1297 | - $geodir_search_pt_selected = ''; |
|
| 1298 | - |
|
| 1299 | - ?> |
|
| 1288 | + $post_types = geodir_get_posttypes('array');
|
|
| 1289 | + $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');
|
|
| 1290 | + if (empty($geodir_default_map_search_pt)) |
|
| 1291 | + $geodir_default_map_search_pt = 'gd_place'; |
|
| 1292 | + if (is_array($post_types)) {
|
|
| 1293 | + foreach ($post_types as $key => $post_types_obj) {
|
|
| 1294 | + if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) |
|
| 1295 | + $geodir_search_pt_selected = "selected='selected'"; |
|
| 1296 | + else |
|
| 1297 | + $geodir_search_pt_selected = ''; |
|
| 1298 | + |
|
| 1299 | + ?> |
|
| 1300 | 1300 | <option |
| 1301 | 1301 | value="<?php echo $key?>" <?php echo $geodir_search_pt_selected; ?>><?php echo __($post_types_obj['labels']['singular_name'], 'geodirectory'); ?></option> |
| 1302 | 1302 | |
| 1303 | 1303 | <?php } |
| 1304 | 1304 | |
| 1305 | - } |
|
| 1305 | + } |
|
| 1306 | 1306 | |
| 1307 | - ?> |
|
| 1307 | + ?> |
|
| 1308 | 1308 | </select> |
| 1309 | 1309 | </td> |
| 1310 | 1310 | </tr> |
| 1311 | 1311 | |
| 1312 | 1312 | <?php |
| 1313 | - break; |
|
| 1313 | + break; |
|
| 1314 | 1314 | |
| 1315 | - case 'map': |
|
| 1316 | - ?> |
|
| 1315 | + case 'map': |
|
| 1316 | + ?> |
|
| 1317 | 1317 | <tr valign="top"> |
| 1318 | 1318 | <td class="forminp"> |
| 1319 | 1319 | <?php |
| 1320 | - global $post_cat, $cat_display; |
|
| 1321 | - $post_types = geodir_get_posttypes('object');
|
|
| 1322 | - $cat_display = 'checkbox'; |
|
| 1323 | - $gd_post_types = get_option('geodir_exclude_post_type_on_map');
|
|
| 1324 | - $gd_cats = get_option('geodir_exclude_cat_on_map');
|
|
| 1325 | - $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 1326 | - $count = 1; |
|
| 1327 | - ?> |
|
| 1320 | + global $post_cat, $cat_display; |
|
| 1321 | + $post_types = geodir_get_posttypes('object');
|
|
| 1322 | + $cat_display = 'checkbox'; |
|
| 1323 | + $gd_post_types = get_option('geodir_exclude_post_type_on_map');
|
|
| 1324 | + $gd_cats = get_option('geodir_exclude_cat_on_map');
|
|
| 1325 | + $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
|
|
| 1326 | + $count = 1; |
|
| 1327 | + ?> |
|
| 1328 | 1328 | <table width="70%" class="widefat"> |
| 1329 | 1329 | <thead> |
| 1330 | 1330 | <tr> |
@@ -1333,18 +1333,18 @@ discard block |
||
| 1333 | 1333 | <th><b><?php echo DESIGN_POST_TYPE_CAT; ?></b></th> |
| 1334 | 1334 | </tr> |
| 1335 | 1335 | <?php |
| 1336 | - $gd_categs = $gd_cats; |
|
| 1337 | - foreach ($post_types as $key => $post_types_obj) : |
|
| 1338 | - $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : ''; |
|
| 1339 | - $gd_taxonomy = geodir_get_taxonomies($key); |
|
| 1340 | - if ($gd_cats_upgrade) {
|
|
| 1341 | - $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : ''; |
|
| 1342 | - $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array(); |
|
| 1343 | - $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array(); |
|
| 1344 | - } |
|
| 1345 | - $post_cat = implode(',', $gd_cats);
|
|
| 1346 | - $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy); |
|
| 1347 | - ?> |
|
| 1336 | + $gd_categs = $gd_cats; |
|
| 1337 | + foreach ($post_types as $key => $post_types_obj) : |
|
| 1338 | + $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : ''; |
|
| 1339 | + $gd_taxonomy = geodir_get_taxonomies($key); |
|
| 1340 | + if ($gd_cats_upgrade) {
|
|
| 1341 | + $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : ''; |
|
| 1342 | + $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array(); |
|
| 1343 | + $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array(); |
|
| 1344 | + } |
|
| 1345 | + $post_cat = implode(',', $gd_cats);
|
|
| 1346 | + $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy); |
|
| 1347 | + ?> |
|
| 1348 | 1348 | <tr> |
| 1349 | 1349 | <td valign="top" width="5%"><?php echo $count; ?></td> |
| 1350 | 1350 | <td valign="top" width="25%" id="td_post_types"><input type="checkbox" |
@@ -1365,19 +1365,19 @@ discard block |
||
| 1365 | 1365 | </td> |
| 1366 | 1366 | </tr> |
| 1367 | 1367 | <?php |
| 1368 | - break; |
|
| 1368 | + break; |
|
| 1369 | 1369 | |
| 1370 | - case 'checkbox' : |
|
| 1370 | + case 'checkbox' : |
|
| 1371 | 1371 | |
| 1372 | - if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) : |
|
| 1373 | - ?> |
|
| 1372 | + if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) : |
|
| 1373 | + ?> |
|
| 1374 | 1374 | <tr valign="top"> |
| 1375 | 1375 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1376 | 1376 | <td class="forminp"> |
| 1377 | 1377 | <?php |
| 1378 | - endif; |
|
| 1378 | + endif; |
|
| 1379 | 1379 | |
| 1380 | - ?> |
|
| 1380 | + ?> |
|
| 1381 | 1381 | <fieldset> |
| 1382 | 1382 | <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend> |
| 1383 | 1383 | <label for="<?php echo $value['id'] ?>"> |
@@ -1387,49 +1387,49 @@ discard block |
||
| 1387 | 1387 | </fieldset> |
| 1388 | 1388 | <?php |
| 1389 | 1389 | |
| 1390 | - if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) : |
|
| 1391 | - ?> |
|
| 1390 | + if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) : |
|
| 1391 | + ?> |
|
| 1392 | 1392 | </td> |
| 1393 | 1393 | </tr> |
| 1394 | 1394 | <?php |
| 1395 | - endif; |
|
| 1395 | + endif; |
|
| 1396 | 1396 | |
| 1397 | - break; |
|
| 1397 | + break; |
|
| 1398 | 1398 | |
| 1399 | - case 'radio' : |
|
| 1399 | + case 'radio' : |
|
| 1400 | 1400 | |
| 1401 | - if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) : |
|
| 1402 | - ?> |
|
| 1401 | + if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) : |
|
| 1402 | + ?> |
|
| 1403 | 1403 | <tr valign="top"> |
| 1404 | 1404 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1405 | 1405 | <td class="forminp"> |
| 1406 | 1406 | <?php |
| 1407 | - endif; |
|
| 1407 | + endif; |
|
| 1408 | 1408 | |
| 1409 | - ?> |
|
| 1409 | + ?> |
|
| 1410 | 1410 | <fieldset> |
| 1411 | 1411 | <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend> |
| 1412 | 1412 | <label for="<?php echo $value['id'];?>"> |
| 1413 | 1413 | <input name="<?php echo esc_attr($value['id']); ?>" |
| 1414 | 1414 | id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio" |
| 1415 | 1415 | value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {
|
| 1416 | - echo 'checked="checked"'; |
|
| 1417 | - }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
|
|
| 1416 | + echo 'checked="checked"'; |
|
| 1417 | + }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
|
|
| 1418 | 1418 | <?php echo $value['desc']; ?></label><br> |
| 1419 | 1419 | </fieldset> |
| 1420 | 1420 | <?php |
| 1421 | 1421 | |
| 1422 | - if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) : |
|
| 1423 | - ?> |
|
| 1422 | + if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) : |
|
| 1423 | + ?> |
|
| 1424 | 1424 | </td> |
| 1425 | 1425 | </tr> |
| 1426 | 1426 | <?php |
| 1427 | - endif; |
|
| 1427 | + endif; |
|
| 1428 | 1428 | |
| 1429 | - break; |
|
| 1429 | + break; |
|
| 1430 | 1430 | |
| 1431 | - case 'textarea': |
|
| 1432 | - ?> |
|
| 1431 | + case 'textarea': |
|
| 1432 | + ?> |
|
| 1433 | 1433 | <tr valign="top"> |
| 1434 | 1434 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1435 | 1435 | <td class="forminp"> |
@@ -1442,30 +1442,30 @@ discard block |
||
| 1442 | 1442 | |
| 1443 | 1443 | </td> |
| 1444 | 1444 | </tr><?php |
| 1445 | - break; |
|
| 1445 | + break; |
|
| 1446 | 1446 | |
| 1447 | - case 'editor': |
|
| 1448 | - ?> |
|
| 1447 | + case 'editor': |
|
| 1448 | + ?> |
|
| 1449 | 1449 | <tr valign="top"> |
| 1450 | 1450 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1451 | 1451 | <td class="forminp"><?php |
| 1452 | - if (get_option($value['id'])) |
|
| 1453 | - $content = stripslashes(get_option($value['id'])); |
|
| 1454 | - else |
|
| 1455 | - $content = $value['std']; |
|
| 1452 | + if (get_option($value['id'])) |
|
| 1453 | + $content = stripslashes(get_option($value['id'])); |
|
| 1454 | + else |
|
| 1455 | + $content = $value['std']; |
|
| 1456 | 1456 | |
| 1457 | - $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
|
|
| 1457 | + $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
|
|
| 1458 | 1458 | |
| 1459 | - wp_editor($content, esc_attr($value['id']), $editor_settings); |
|
| 1459 | + wp_editor($content, esc_attr($value['id']), $editor_settings); |
|
| 1460 | 1460 | |
| 1461 | - ?> <span class="description"><?php echo $value['desc'] ?></span> |
|
| 1461 | + ?> <span class="description"><?php echo $value['desc'] ?></span> |
|
| 1462 | 1462 | |
| 1463 | 1463 | </td> |
| 1464 | 1464 | </tr><?php |
| 1465 | - break; |
|
| 1465 | + break; |
|
| 1466 | 1466 | |
| 1467 | - case 'single_select_page' : |
|
| 1468 | - // WPML |
|
| 1467 | + case 'single_select_page' : |
|
| 1468 | + // WPML |
|
| 1469 | 1469 | $switch_lang = false; |
| 1470 | 1470 | $disabled = ''; |
| 1471 | 1471 | if (geodir_is_wpml() && isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {
|
@@ -1483,18 +1483,18 @@ discard block |
||
| 1483 | 1483 | // |
| 1484 | 1484 | $page_setting = (int)get_option($value['id']); |
| 1485 | 1485 | |
| 1486 | - $args = array('name' => $value['id'],
|
|
| 1487 | - 'id' => $value['id'], |
|
| 1488 | - 'sort_column' => 'menu_order', |
|
| 1489 | - 'sort_order' => 'ASC', |
|
| 1490 | - 'show_option_none' => ' ', |
|
| 1491 | - 'class' => $value['class'], |
|
| 1492 | - 'echo' => false, |
|
| 1493 | - 'selected' => $page_setting); |
|
| 1486 | + $args = array('name' => $value['id'],
|
|
| 1487 | + 'id' => $value['id'], |
|
| 1488 | + 'sort_column' => 'menu_order', |
|
| 1489 | + 'sort_order' => 'ASC', |
|
| 1490 | + 'show_option_none' => ' ', |
|
| 1491 | + 'class' => $value['class'], |
|
| 1492 | + 'echo' => false, |
|
| 1493 | + 'selected' => $page_setting); |
|
| 1494 | 1494 | |
| 1495 | - if (isset($value['args'])) $args = wp_parse_args($value['args'], $args); |
|
| 1495 | + if (isset($value['args'])) $args = wp_parse_args($value['args'], $args); |
|
| 1496 | 1496 | |
| 1497 | - ?> |
|
| 1497 | + ?> |
|
| 1498 | 1498 | <tr valign="top" class="single_select_page"> |
| 1499 | 1499 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1500 | 1500 | <td class="forminp"> |
@@ -1505,17 +1505,17 @@ discard block |
||
| 1505 | 1505 | if ($switch_lang) {
|
| 1506 | 1506 | $sitepress->switch_lang($switch_lang, true); |
| 1507 | 1507 | } |
| 1508 | - break; |
|
| 1509 | - case 'single_select_country' : |
|
| 1510 | - $country_setting = (string)get_option($value['id']); |
|
| 1511 | - if (strstr($country_setting, ':')) : |
|
| 1512 | - $country = current(explode(':', $country_setting));
|
|
| 1513 | - $state = end(explode(':', $country_setting));
|
|
| 1514 | - else : |
|
| 1515 | - $country = $country_setting; |
|
| 1516 | - $state = '*'; |
|
| 1517 | - endif; |
|
| 1518 | - ?> |
|
| 1508 | + break; |
|
| 1509 | + case 'single_select_country' : |
|
| 1510 | + $country_setting = (string)get_option($value['id']); |
|
| 1511 | + if (strstr($country_setting, ':')) : |
|
| 1512 | + $country = current(explode(':', $country_setting));
|
|
| 1513 | + $state = end(explode(':', $country_setting));
|
|
| 1514 | + else : |
|
| 1515 | + $country = $country_setting; |
|
| 1516 | + $state = '*'; |
|
| 1517 | + endif; |
|
| 1518 | + ?> |
|
| 1519 | 1519 | <tr valign="top"> |
| 1520 | 1520 | <th scope="rpw" class="titledesc"><?php echo $value['name'] ?></th> |
| 1521 | 1521 | <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>" |
@@ -1526,12 +1526,12 @@ discard block |
||
| 1526 | 1526 | </select> <span class="description"><?php echo $value['desc'] ?></span> |
| 1527 | 1527 | </td> |
| 1528 | 1528 | </tr><?php |
| 1529 | - break; |
|
| 1530 | - case 'multi_select_countries' : |
|
| 1531 | - $countries = $geodirectory->countries->countries; |
|
| 1532 | - asort($countries); |
|
| 1533 | - $selections = (array)get_option($value['id']); |
|
| 1534 | - ?> |
|
| 1529 | + break; |
|
| 1530 | + case 'multi_select_countries' : |
|
| 1531 | + $countries = $geodirectory->countries->countries; |
|
| 1532 | + asort($countries); |
|
| 1533 | + $selections = (array)get_option($value['id']); |
|
| 1534 | + ?> |
|
| 1535 | 1535 | <tr valign="top"> |
| 1536 | 1536 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1537 | 1537 | <td class="forminp"> |
@@ -1539,21 +1539,21 @@ discard block |
||
| 1539 | 1539 | data-placeholder="<?php _e('Choose countries…', 'geodirectory'); ?>"
|
| 1540 | 1540 | title="Country" class="chosen_select"> |
| 1541 | 1541 | <?php |
| 1542 | - if ($countries) foreach ($countries as $key => $val) : |
|
| 1543 | - echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
| 1544 | - endforeach; |
|
| 1545 | - ?> |
|
| 1542 | + if ($countries) foreach ($countries as $key => $val) : |
|
| 1543 | + echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>'; |
|
| 1544 | + endforeach; |
|
| 1545 | + ?> |
|
| 1546 | 1546 | </select> |
| 1547 | 1547 | </td> |
| 1548 | 1548 | </tr> |
| 1549 | 1549 | |
| 1550 | 1550 | <?php |
| 1551 | 1551 | |
| 1552 | - break; |
|
| 1552 | + break; |
|
| 1553 | 1553 | |
| 1554 | - case 'google_analytics' : |
|
| 1555 | - $selections = (array)get_option($value['id']); |
|
| 1556 | - ?> |
|
| 1554 | + case 'google_analytics' : |
|
| 1555 | + $selections = (array)get_option($value['id']); |
|
| 1556 | + ?> |
|
| 1557 | 1557 | <tr valign="top"> |
| 1558 | 1558 | <th scope="row" class="titledesc"><?php echo $value['name'] ?></th> |
| 1559 | 1559 | <td class="forminp"> |
@@ -1561,62 +1561,62 @@ discard block |
||
| 1561 | 1561 | |
| 1562 | 1562 | <?php |
| 1563 | 1563 | |
| 1564 | - $oAuthURL = "https://accounts.google.com/o/oauth2/auth?"; |
|
| 1565 | - $scope = "scope=https://www.googleapis.com/auth/analytics.readonly"; |
|
| 1566 | - $state = "&state=123";//any string |
|
| 1567 | - $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 1568 | - $response_type = "&response_type=code"; |
|
| 1569 | - $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
| 1570 | - $access_type = "&access_type=offline"; |
|
| 1571 | - $approval_prompt = "&approval_prompt=force"; |
|
| 1564 | + $oAuthURL = "https://accounts.google.com/o/oauth2/auth?"; |
|
| 1565 | + $scope = "scope=https://www.googleapis.com/auth/analytics.readonly"; |
|
| 1566 | + $state = "&state=123";//any string |
|
| 1567 | + $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 1568 | + $response_type = "&response_type=code"; |
|
| 1569 | + $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
| 1570 | + $access_type = "&access_type=offline"; |
|
| 1571 | + $approval_prompt = "&approval_prompt=force"; |
|
| 1572 | 1572 | |
| 1573 | - $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt; |
|
| 1573 | + $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt; |
|
| 1574 | 1574 | |
| 1575 | 1575 | |
| 1576 | - if (get_option('geodir_ga_auth_token')) {
|
|
| 1577 | - ?> |
|
| 1576 | + if (get_option('geodir_ga_auth_token')) {
|
|
| 1577 | + ?> |
|
| 1578 | 1578 | <span class="button-primary" |
| 1579 | 1579 | onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize');?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>
|
| 1580 | 1580 | <span style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>
|
| 1581 | 1581 | <?php |
| 1582 | - global $gd_ga_errors; |
|
| 1583 | - if(!empty($gd_ga_errors)){
|
|
| 1584 | - print_r($gd_ga_errors); |
|
| 1585 | - } |
|
| 1586 | - } else {
|
|
| 1587 | - ?> |
|
| 1582 | + global $gd_ga_errors; |
|
| 1583 | + if(!empty($gd_ga_errors)){
|
|
| 1584 | + print_r($gd_ga_errors); |
|
| 1585 | + } |
|
| 1586 | + } else {
|
|
| 1587 | + ?> |
|
| 1588 | 1588 | <span class="button-primary" |
| 1589 | 1589 | onclick="window.open('<?php echo geodir_ga_activation_url();?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory');?></span>
|
| 1590 | 1590 | <?php |
| 1591 | - } |
|
| 1592 | - ?> |
|
| 1591 | + } |
|
| 1592 | + ?> |
|
| 1593 | 1593 | </td> |
| 1594 | 1594 | </tr> |
| 1595 | 1595 | |
| 1596 | 1596 | <?php |
| 1597 | 1597 | |
| 1598 | 1598 | |
| 1599 | - break; |
|
| 1599 | + break; |
|
| 1600 | 1600 | |
| 1601 | - case 'field_seperator' : |
|
| 1601 | + case 'field_seperator' : |
|
| 1602 | 1602 | |
| 1603 | - ?> |
|
| 1603 | + ?> |
|
| 1604 | 1604 | <tr valign="top"> |
| 1605 | 1605 | <td colspan="2" class="forminp geodir_line_seperator"></td> |
| 1606 | 1606 | </tr> |
| 1607 | 1607 | <?php |
| 1608 | 1608 | |
| 1609 | - break; |
|
| 1609 | + break; |
|
| 1610 | 1610 | |
| 1611 | - endswitch; |
|
| 1611 | + endswitch; |
|
| 1612 | 1612 | |
| 1613 | - endforeach; |
|
| 1613 | + endforeach; |
|
| 1614 | 1614 | |
| 1615 | - if ($first_title === false) {
|
|
| 1616 | - echo "</div>"; |
|
| 1617 | - } |
|
| 1615 | + if ($first_title === false) {
|
|
| 1616 | + echo "</div>"; |
|
| 1617 | + } |
|
| 1618 | 1618 | |
| 1619 | - ?> |
|
| 1619 | + ?> |
|
| 1620 | 1620 | |
| 1621 | 1621 | <script type="text/javascript"> |
| 1622 | 1622 | |
@@ -1676,33 +1676,33 @@ discard block |
||
| 1676 | 1676 | */ |
| 1677 | 1677 | function geodir_post_info_setting() |
| 1678 | 1678 | {
|
| 1679 | - global $post, $post_id; |
|
| 1680 | - |
|
| 1681 | - $post_type = get_post_type(); |
|
| 1682 | - |
|
| 1683 | - $package_info = array(); |
|
| 1684 | - |
|
| 1685 | - $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1686 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename'); |
|
| 1687 | - echo '<div id="geodir_wrapper">'; |
|
| 1688 | - /** |
|
| 1689 | - * Called before the GD custom fields are output in the wp-admin area. |
|
| 1690 | - * |
|
| 1691 | - * @since 1.0.0 |
|
| 1692 | - * @see 'geodir_after_default_field_in_meta_box' |
|
| 1693 | - */ |
|
| 1694 | - do_action('geodir_before_default_field_in_meta_box');
|
|
| 1695 | - //geodir_get_custom_fields_html($package_info->pid,'default',$post_type); |
|
| 1696 | - // to display all fields in one information box |
|
| 1697 | - geodir_get_custom_fields_html($package_info->pid, 'all', $post_type); |
|
| 1698 | - /** |
|
| 1699 | - * Called after the GD custom fields are output in the wp-admin area. |
|
| 1700 | - * |
|
| 1701 | - * @since 1.0.0 |
|
| 1702 | - * @see 'geodir_before_default_field_in_meta_box' |
|
| 1703 | - */ |
|
| 1704 | - do_action('geodir_after_default_field_in_meta_box');
|
|
| 1705 | - echo '</div>'; |
|
| 1679 | + global $post, $post_id; |
|
| 1680 | + |
|
| 1681 | + $post_type = get_post_type(); |
|
| 1682 | + |
|
| 1683 | + $package_info = array(); |
|
| 1684 | + |
|
| 1685 | + $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1686 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename'); |
|
| 1687 | + echo '<div id="geodir_wrapper">'; |
|
| 1688 | + /** |
|
| 1689 | + * Called before the GD custom fields are output in the wp-admin area. |
|
| 1690 | + * |
|
| 1691 | + * @since 1.0.0 |
|
| 1692 | + * @see 'geodir_after_default_field_in_meta_box' |
|
| 1693 | + */ |
|
| 1694 | + do_action('geodir_before_default_field_in_meta_box');
|
|
| 1695 | + //geodir_get_custom_fields_html($package_info->pid,'default',$post_type); |
|
| 1696 | + // to display all fields in one information box |
|
| 1697 | + geodir_get_custom_fields_html($package_info->pid, 'all', $post_type); |
|
| 1698 | + /** |
|
| 1699 | + * Called after the GD custom fields are output in the wp-admin area. |
|
| 1700 | + * |
|
| 1701 | + * @since 1.0.0 |
|
| 1702 | + * @see 'geodir_before_default_field_in_meta_box' |
|
| 1703 | + */ |
|
| 1704 | + do_action('geodir_after_default_field_in_meta_box');
|
|
| 1705 | + echo '</div>'; |
|
| 1706 | 1706 | } |
| 1707 | 1707 | |
| 1708 | 1708 | /** |
@@ -1715,18 +1715,18 @@ discard block |
||
| 1715 | 1715 | */ |
| 1716 | 1716 | function geodir_post_addinfo_setting() |
| 1717 | 1717 | {
|
| 1718 | - global $post, $post_id; |
|
| 1718 | + global $post, $post_id; |
|
| 1719 | 1719 | |
| 1720 | - $post_type = get_post_type(); |
|
| 1720 | + $post_type = get_post_type(); |
|
| 1721 | 1721 | |
| 1722 | - $package_info = array(); |
|
| 1722 | + $package_info = array(); |
|
| 1723 | 1723 | |
| 1724 | - $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1724 | + $package_info = geodir_post_package_info($package_info, $post, $post_type); |
|
| 1725 | 1725 | |
| 1726 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename'); |
|
| 1727 | - echo '<div id="geodir_wrapper">'; |
|
| 1728 | - geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type); |
|
| 1729 | - echo '</div>'; |
|
| 1726 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename'); |
|
| 1727 | + echo '<div id="geodir_wrapper">'; |
|
| 1728 | + geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type); |
|
| 1729 | + echo '</div>'; |
|
| 1730 | 1730 | |
| 1731 | 1731 | } |
| 1732 | 1732 | |
@@ -1740,60 +1740,60 @@ discard block |
||
| 1740 | 1740 | */ |
| 1741 | 1741 | function geodir_post_attachments() |
| 1742 | 1742 | {
|
| 1743 | - global $post, $post_id; |
|
| 1743 | + global $post, $post_id; |
|
| 1744 | 1744 | |
| 1745 | - wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename'); |
|
| 1745 | + wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename'); |
|
| 1746 | 1746 | |
| 1747 | - if (geodir_get_featured_image($post_id, 'thumbnail')) {
|
|
| 1748 | - echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
|
|
| 1749 | - geodir_show_featured_image($post_id, 'thumbnail'); |
|
| 1750 | - } |
|
| 1747 | + if (geodir_get_featured_image($post_id, 'thumbnail')) {
|
|
| 1748 | + echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
|
|
| 1749 | + geodir_show_featured_image($post_id, 'thumbnail'); |
|
| 1750 | + } |
|
| 1751 | 1751 | |
| 1752 | - $image_limit = 0; |
|
| 1752 | + $image_limit = 0; |
|
| 1753 | 1753 | |
| 1754 | - ?> |
|
| 1754 | + ?> |
|
| 1755 | 1755 | |
| 1756 | 1756 | |
| 1757 | 1757 | <h5 class="form_title"> |
| 1758 | 1758 | <?php if ($image_limit != 0 && $image_limit == 1) {
|
| 1759 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 1760 | - } ?> |
|
| 1759 | + echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 1760 | + } ?> |
|
| 1761 | 1761 | <?php if ($image_limit != 0 && $image_limit > 1) {
|
| 1762 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 1763 | - } ?> |
|
| 1762 | + echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 1763 | + } ?> |
|
| 1764 | 1764 | <?php if ($image_limit == 0) {
|
| 1765 | - echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 1766 | - } ?> |
|
| 1765 | + echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 1766 | + } ?> |
|
| 1767 | 1767 | </h5> |
| 1768 | 1768 | |
| 1769 | 1769 | |
| 1770 | 1770 | <?php |
| 1771 | 1771 | |
| 1772 | - $curImages = geodir_get_images($post_id); |
|
| 1773 | - $place_img_array = array(); |
|
| 1772 | + $curImages = geodir_get_images($post_id); |
|
| 1773 | + $place_img_array = array(); |
|
| 1774 | 1774 | |
| 1775 | - if (!empty($curImages)): |
|
| 1776 | - foreach ($curImages as $p_img): |
|
| 1777 | - $place_img_array[] = $p_img->src; |
|
| 1778 | - endforeach; |
|
| 1779 | - endif; |
|
| 1775 | + if (!empty($curImages)): |
|
| 1776 | + foreach ($curImages as $p_img): |
|
| 1777 | + $place_img_array[] = $p_img->src; |
|
| 1778 | + endforeach; |
|
| 1779 | + endif; |
|
| 1780 | 1780 | |
| 1781 | - if (!empty($place_img_array)) |
|
| 1782 | - $curImages = implode(',', $place_img_array);
|
|
| 1781 | + if (!empty($place_img_array)) |
|
| 1782 | + $curImages = implode(',', $place_img_array);
|
|
| 1783 | 1783 | |
| 1784 | 1784 | |
| 1785 | - // adjust values here |
|
| 1786 | - $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls |
|
| 1785 | + // adjust values here |
|
| 1786 | + $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls |
|
| 1787 | 1787 | |
| 1788 | - $svalue = $curImages; // this will be initial value of the above form field. Image urls. |
|
| 1788 | + $svalue = $curImages; // this will be initial value of the above form field. Image urls. |
|
| 1789 | 1789 | |
| 1790 | - $multiple = true; // allow multiple files upload |
|
| 1790 | + $multiple = true; // allow multiple files upload |
|
| 1791 | 1791 | |
| 1792 | - $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels) |
|
| 1792 | + $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels) |
|
| 1793 | 1793 | |
| 1794 | - $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels) |
|
| 1794 | + $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels) |
|
| 1795 | 1795 | |
| 1796 | - ?> |
|
| 1796 | + ?> |
|
| 1797 | 1797 | |
| 1798 | 1798 | <div class="gtd-form_row clearfix" id="<?php echo $id; ?>dropbox" style="border:1px solid #999999;padding:5px;text-align:center;"> |
| 1799 | 1799 | <input type="hidden" name="<?php echo $id; ?>" id="<?php echo $id; ?>" value="<?php echo $svalue; ?>"/> |
@@ -1835,13 +1835,13 @@ discard block |
||
| 1835 | 1835 | */ |
| 1836 | 1836 | function geodir_action_post_updated($post_ID, $post_after, $post_before) |
| 1837 | 1837 | {
|
| 1838 | - $post_type = get_post_type($post_ID); |
|
| 1838 | + $post_type = get_post_type($post_ID); |
|
| 1839 | 1839 | |
| 1840 | - if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
|
| 1841 | - if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {
|
|
| 1842 | - geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title); |
|
| 1843 | - } |
|
| 1844 | - } |
|
| 1840 | + if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
|
|
| 1841 | + if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {
|
|
| 1842 | + geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title); |
|
| 1843 | + } |
|
| 1844 | + } |
|
| 1845 | 1845 | } |
| 1846 | 1846 | |
| 1847 | 1847 | /** |
@@ -1856,39 +1856,39 @@ discard block |
||
| 1856 | 1856 | */ |
| 1857 | 1857 | function geodir_notification_add_bcc_option($settings) |
| 1858 | 1858 | {
|
| 1859 | - if (!empty($settings)) {
|
|
| 1860 | - $new_settings = array(); |
|
| 1861 | - foreach ($settings as $setting) {
|
|
| 1862 | - if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {
|
|
| 1863 | - $geodir_bcc_listing_published_yes = array( |
|
| 1864 | - 'name' => __('Listing published', 'geodirectory'),
|
|
| 1865 | - 'desc' => __('Yes', 'geodirectory'),
|
|
| 1866 | - 'id' => 'geodir_bcc_listing_published', |
|
| 1867 | - 'std' => 'yes', |
|
| 1868 | - 'type' => 'radio', |
|
| 1869 | - 'value' => '1', |
|
| 1870 | - 'radiogroup' => 'start' |
|
| 1871 | - ); |
|
| 1872 | - |
|
| 1873 | - $geodir_bcc_listing_published_no = array( |
|
| 1874 | - 'name' => __('Listing published', 'geodirectory'),
|
|
| 1875 | - 'desc' => __('No', 'geodirectory'),
|
|
| 1876 | - 'id' => 'geodir_bcc_listing_published', |
|
| 1877 | - 'std' => 'yes', |
|
| 1878 | - 'type' => 'radio', |
|
| 1879 | - 'value' => '0', |
|
| 1880 | - 'radiogroup' => 'end' |
|
| 1881 | - ); |
|
| 1882 | - |
|
| 1883 | - $new_settings[] = $geodir_bcc_listing_published_yes; |
|
| 1884 | - $new_settings[] = $geodir_bcc_listing_published_no; |
|
| 1885 | - } |
|
| 1886 | - $new_settings[] = $setting; |
|
| 1887 | - } |
|
| 1888 | - $settings = $new_settings; |
|
| 1889 | - } |
|
| 1859 | + if (!empty($settings)) {
|
|
| 1860 | + $new_settings = array(); |
|
| 1861 | + foreach ($settings as $setting) {
|
|
| 1862 | + if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {
|
|
| 1863 | + $geodir_bcc_listing_published_yes = array( |
|
| 1864 | + 'name' => __('Listing published', 'geodirectory'),
|
|
| 1865 | + 'desc' => __('Yes', 'geodirectory'),
|
|
| 1866 | + 'id' => 'geodir_bcc_listing_published', |
|
| 1867 | + 'std' => 'yes', |
|
| 1868 | + 'type' => 'radio', |
|
| 1869 | + 'value' => '1', |
|
| 1870 | + 'radiogroup' => 'start' |
|
| 1871 | + ); |
|
| 1872 | + |
|
| 1873 | + $geodir_bcc_listing_published_no = array( |
|
| 1874 | + 'name' => __('Listing published', 'geodirectory'),
|
|
| 1875 | + 'desc' => __('No', 'geodirectory'),
|
|
| 1876 | + 'id' => 'geodir_bcc_listing_published', |
|
| 1877 | + 'std' => 'yes', |
|
| 1878 | + 'type' => 'radio', |
|
| 1879 | + 'value' => '0', |
|
| 1880 | + 'radiogroup' => 'end' |
|
| 1881 | + ); |
|
| 1882 | + |
|
| 1883 | + $new_settings[] = $geodir_bcc_listing_published_yes; |
|
| 1884 | + $new_settings[] = $geodir_bcc_listing_published_no; |
|
| 1885 | + } |
|
| 1886 | + $new_settings[] = $setting; |
|
| 1887 | + } |
|
| 1888 | + $settings = $new_settings; |
|
| 1889 | + } |
|
| 1890 | 1890 | |
| 1891 | - return $settings; |
|
| 1891 | + return $settings; |
|
| 1892 | 1892 | } |
| 1893 | 1893 | |
| 1894 | 1894 | |
@@ -1903,19 +1903,19 @@ discard block |
||
| 1903 | 1903 | */ |
| 1904 | 1904 | function get_gd_theme_compat_callback() |
| 1905 | 1905 | {
|
| 1906 | - global $wpdb; |
|
| 1907 | - $themes = get_option('gd_theme_compats');
|
|
| 1908 | - |
|
| 1909 | - if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {
|
|
| 1910 | - if (isset($_POST['export'])) {
|
|
| 1911 | - echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']])); |
|
| 1912 | - } else {
|
|
| 1913 | - echo json_encode($themes[$_POST['theme']]); |
|
| 1914 | - } |
|
| 1906 | + global $wpdb; |
|
| 1907 | + $themes = get_option('gd_theme_compats');
|
|
| 1915 | 1908 | |
| 1916 | - } |
|
| 1909 | + if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {
|
|
| 1910 | + if (isset($_POST['export'])) {
|
|
| 1911 | + echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']])); |
|
| 1912 | + } else {
|
|
| 1913 | + echo json_encode($themes[$_POST['theme']]); |
|
| 1914 | + } |
|
| 1915 | + |
|
| 1916 | + } |
|
| 1917 | 1917 | |
| 1918 | - die(); |
|
| 1918 | + die(); |
|
| 1919 | 1919 | } |
| 1920 | 1920 | |
| 1921 | 1921 | add_action('wp_ajax_get_gd_theme_compat_import_callback', 'get_gd_theme_compat_import_callback');
|
@@ -1929,20 +1929,20 @@ discard block |
||
| 1929 | 1929 | */ |
| 1930 | 1930 | function get_gd_theme_compat_import_callback() |
| 1931 | 1931 | {
|
| 1932 | - global $wpdb; |
|
| 1933 | - $themes = get_option('gd_theme_compats');
|
|
| 1934 | - if (isset($_POST['theme']) && !empty($_POST['theme'])) {
|
|
| 1935 | - $json = json_decode(stripslashes($_POST['theme']), true); |
|
| 1936 | - if (!empty($json) && is_array($json)) {
|
|
| 1937 | - $key = sanitize_text_field(key($json)); |
|
| 1938 | - $themes[$key] = $json[$key]; |
|
| 1939 | - update_option('gd_theme_compats', $themes);
|
|
| 1940 | - echo $key; |
|
| 1941 | - die(); |
|
| 1942 | - } |
|
| 1943 | - } |
|
| 1944 | - echo '0'; |
|
| 1945 | - die(); |
|
| 1932 | + global $wpdb; |
|
| 1933 | + $themes = get_option('gd_theme_compats');
|
|
| 1934 | + if (isset($_POST['theme']) && !empty($_POST['theme'])) {
|
|
| 1935 | + $json = json_decode(stripslashes($_POST['theme']), true); |
|
| 1936 | + if (!empty($json) && is_array($json)) {
|
|
| 1937 | + $key = sanitize_text_field(key($json)); |
|
| 1938 | + $themes[$key] = $json[$key]; |
|
| 1939 | + update_option('gd_theme_compats', $themes);
|
|
| 1940 | + echo $key; |
|
| 1941 | + die(); |
|
| 1942 | + } |
|
| 1943 | + } |
|
| 1944 | + echo '0'; |
|
| 1945 | + die(); |
|
| 1946 | 1946 | } |
| 1947 | 1947 | |
| 1948 | 1948 | |
@@ -1955,39 +1955,39 @@ discard block |
||
| 1955 | 1955 | */ |
| 1956 | 1956 | function gd_set_theme_compat() |
| 1957 | 1957 | {
|
| 1958 | - global $wpdb; |
|
| 1959 | - $theme = wp_get_theme(); |
|
| 1958 | + global $wpdb; |
|
| 1959 | + $theme = wp_get_theme(); |
|
| 1960 | 1960 | |
| 1961 | - if ($theme->parent()) {
|
|
| 1962 | - $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));
|
|
| 1963 | - } else {
|
|
| 1964 | - $theme_name = str_replace(" ", "_", $theme->get('Name'));
|
|
| 1965 | - } |
|
| 1961 | + if ($theme->parent()) {
|
|
| 1962 | + $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));
|
|
| 1963 | + } else {
|
|
| 1964 | + $theme_name = str_replace(" ", "_", $theme->get('Name'));
|
|
| 1965 | + } |
|
| 1966 | 1966 | |
| 1967 | - $theme_compats = get_option('gd_theme_compats');
|
|
| 1968 | - $current_compat = get_option('gd_theme_compat');
|
|
| 1969 | - $current_compat = str_replace("_custom", "", $current_compat);
|
|
| 1967 | + $theme_compats = get_option('gd_theme_compats');
|
|
| 1968 | + $current_compat = get_option('gd_theme_compat');
|
|
| 1969 | + $current_compat = str_replace("_custom", "", $current_compat);
|
|
| 1970 | 1970 | |
| 1971 | - if ($current_compat == $theme_name && strpos(get_option('gd_theme_compat'), "_custom") !== false) {
|
|
| 1972 | - return; |
|
| 1973 | - }// if already running correct compat then bail |
|
| 1971 | + if ($current_compat == $theme_name && strpos(get_option('gd_theme_compat'), "_custom") !== false) {
|
|
| 1972 | + return; |
|
| 1973 | + }// if already running correct compat then bail |
|
| 1974 | 1974 | |
| 1975 | - if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it
|
|
| 1976 | - update_option('gd_theme_compat', $theme_name);
|
|
| 1977 | - update_option('theme_compatibility_setting', $theme_compats[$theme_name]);
|
|
| 1975 | + if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it
|
|
| 1976 | + update_option('gd_theme_compat', $theme_name);
|
|
| 1977 | + update_option('theme_compatibility_setting', $theme_compats[$theme_name]);
|
|
| 1978 | 1978 | |
| 1979 | - // if there are default options to set then set them |
|
| 1980 | - if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {
|
|
| 1979 | + // if there are default options to set then set them |
|
| 1980 | + if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {
|
|
| 1981 | 1981 | |
| 1982 | - foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {
|
|
| 1983 | - update_option($key, $val); |
|
| 1984 | - } |
|
| 1985 | - } |
|
| 1982 | + foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {
|
|
| 1983 | + update_option($key, $val); |
|
| 1984 | + } |
|
| 1985 | + } |
|
| 1986 | 1986 | |
| 1987 | - } else {
|
|
| 1988 | - update_option('gd_theme_compat', '');
|
|
| 1989 | - update_option('theme_compatibility_setting', '');
|
|
| 1990 | - } |
|
| 1987 | + } else {
|
|
| 1988 | + update_option('gd_theme_compat', '');
|
|
| 1989 | + update_option('theme_compatibility_setting', '');
|
|
| 1990 | + } |
|
| 1991 | 1991 | |
| 1992 | 1992 | |
| 1993 | 1993 | } |
@@ -2002,9 +2002,9 @@ discard block |
||
| 2002 | 2002 | */ |
| 2003 | 2003 | function gd_check_avada_compat() |
| 2004 | 2004 | {
|
| 2005 | - if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {
|
|
| 2006 | - add_action('admin_notices', 'gd_avada_compat_warning');
|
|
| 2007 | - } |
|
| 2005 | + if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {
|
|
| 2006 | + add_action('admin_notices', 'gd_avada_compat_warning');
|
|
| 2007 | + } |
|
| 2008 | 2008 | } |
| 2009 | 2009 | |
| 2010 | 2010 | |
@@ -2017,22 +2017,22 @@ discard block |
||
| 2017 | 2017 | function gd_avada_compat_warning() |
| 2018 | 2018 | {
|
| 2019 | 2019 | |
| 2020 | - /* |
|
| 2020 | + /* |
|
| 2021 | 2021 | $msg_type = error |
| 2022 | 2022 | $msg_type = updated fade |
| 2023 | 2023 | $msg_type = update-nag |
| 2024 | 2024 | */ |
| 2025 | 2025 | |
| 2026 | - $plugin = 'avada-nag'; |
|
| 2027 | - $timestamp = 'avada-nag1234'; |
|
| 2028 | - $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');
|
|
| 2029 | - echo '<div id="' . $timestamp . '" class="error">'; |
|
| 2030 | - echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>'; |
|
| 2031 | - echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";
|
|
| 2032 | - echo "<p>$message</p>"; |
|
| 2033 | - echo "</div>"; |
|
| 2026 | + $plugin = 'avada-nag'; |
|
| 2027 | + $timestamp = 'avada-nag1234'; |
|
| 2028 | + $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');
|
|
| 2029 | + echo '<div id="' . $timestamp . '" class="error">'; |
|
| 2030 | + echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>'; |
|
| 2031 | + echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";
|
|
| 2032 | + echo "<p>$message</p>"; |
|
| 2033 | + echo "</div>"; |
|
| 2034 | 2034 | |
| 2035 | - ?> |
|
| 2035 | + ?> |
|
| 2036 | 2036 | <script> |
| 2037 | 2037 | function gdRemoveANotification($plugin, $timestamp) {
|
| 2038 | 2038 | |
@@ -2100,10 +2100,10 @@ discard block |
||
| 2100 | 2100 | */ |
| 2101 | 2101 | function geodir_avada_remove_notification() |
| 2102 | 2102 | {
|
| 2103 | - update_option('avada_nag', TRUE);
|
|
| 2103 | + update_option('avada_nag', TRUE);
|
|
| 2104 | 2104 | |
| 2105 | - // Always die in functions echoing ajax content |
|
| 2106 | - die(); |
|
| 2105 | + // Always die in functions echoing ajax content |
|
| 2106 | + die(); |
|
| 2107 | 2107 | } |
| 2108 | 2108 | |
| 2109 | 2109 | |
@@ -2125,11 +2125,11 @@ discard block |
||
| 2125 | 2125 | global $post, $typenow, $current_screen; |
| 2126 | 2126 | |
| 2127 | 2127 | $post_type = NULL; |
| 2128 | - if (isset($_REQUEST['post_type'])) |
|
| 2128 | + if (isset($_REQUEST['post_type'])) |
|
| 2129 | 2129 | $post_type = sanitize_key($_REQUEST['post_type']); |
| 2130 | - elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) |
|
| 2130 | + elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) |
|
| 2131 | 2131 | $post_type = get_post_type($_REQUEST['post']); |
| 2132 | - elseif ($post && isset($post->post_type)) |
|
| 2132 | + elseif ($post && isset($post->post_type)) |
|
| 2133 | 2133 | $post_type = $post->post_type; |
| 2134 | 2134 | elseif ($typenow) |
| 2135 | 2135 | $post_type = $typenow; |
@@ -2163,7 +2163,7 @@ discard block |
||
| 2163 | 2163 | // Don't allow same slug url for listing and location |
| 2164 | 2164 | if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {
|
| 2165 | 2165 | $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');
|
| 2166 | - wp_redirect($redirect_url); |
|
| 2166 | + wp_redirect($redirect_url); |
|
| 2167 | 2167 | exit; |
| 2168 | 2168 | } |
| 2169 | 2169 | |
@@ -2193,10 +2193,10 @@ discard block |
||
| 2193 | 2193 | * @package GeoDirectory |
| 2194 | 2194 | */ |
| 2195 | 2195 | function geodir_hide_admin_preview_button() {
|
| 2196 | - global $post_type; |
|
| 2197 | - $post_types = geodir_get_posttypes(); |
|
| 2198 | - if(in_array($post_type, $post_types)) |
|
| 2199 | - echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
|
|
| 2196 | + global $post_type; |
|
| 2197 | + $post_types = geodir_get_posttypes(); |
|
| 2198 | + if(in_array($post_type, $post_types)) |
|
| 2199 | + echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
|
|
| 2200 | 2200 | } |
| 2201 | 2201 | add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' ); |
| 2202 | 2202 | add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' ); |
@@ -2211,7 +2211,7 @@ discard block |
||
| 2211 | 2211 | */ |
| 2212 | 2212 | function geodir_import_export_tab( $tabs ) {
|
| 2213 | 2213 | $tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) ); |
| 2214 | - return $tabs; |
|
| 2214 | + return $tabs; |
|
| 2215 | 2215 | } |
| 2216 | 2216 | |
| 2217 | 2217 | /** |
@@ -2226,26 +2226,26 @@ discard block |
||
| 2226 | 2226 | function geodir_import_export_page() {
|
| 2227 | 2227 | $nonce = wp_create_nonce( 'geodir_import_export_nonce' ); |
| 2228 | 2228 | $gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv'; |
| 2229 | - /** |
|
| 2230 | - * Filter sample category data csv file url. |
|
| 2231 | - * |
|
| 2232 | - * @since 1.0.0 |
|
| 2233 | - * @package GeoDirectory |
|
| 2234 | - * |
|
| 2235 | - * @param string $gd_cats_sample_csv Sample category data csv file url. |
|
| 2236 | - */ |
|
| 2229 | + /** |
|
| 2230 | + * Filter sample category data csv file url. |
|
| 2231 | + * |
|
| 2232 | + * @since 1.0.0 |
|
| 2233 | + * @package GeoDirectory |
|
| 2234 | + * |
|
| 2235 | + * @param string $gd_cats_sample_csv Sample category data csv file url. |
|
| 2236 | + */ |
|
| 2237 | 2237 | $gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv ); |
| 2238 | 2238 | |
| 2239 | 2239 | $gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv'; |
| 2240 | - /** |
|
| 2241 | - * Filter sample post data csv file url. |
|
| 2242 | - * |
|
| 2243 | - * @since 1.0.0 |
|
| 2244 | - * @package GeoDirectory |
|
| 2245 | - * |
|
| 2246 | - * @param string $gd_posts_sample_csv Sample post data csv file url. |
|
| 2247 | - */ |
|
| 2248 | - $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv ); |
|
| 2240 | + /** |
|
| 2241 | + * Filter sample post data csv file url. |
|
| 2242 | + * |
|
| 2243 | + * @since 1.0.0 |
|
| 2244 | + * @package GeoDirectory |
|
| 2245 | + * |
|
| 2246 | + * @param string $gd_posts_sample_csv Sample post data csv file url. |
|
| 2247 | + */ |
|
| 2248 | + $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv ); |
|
| 2249 | 2249 | |
| 2250 | 2250 | $gd_posttypes = geodir_get_posttypes( 'array' ); |
| 2251 | 2251 | |
@@ -2268,14 +2268,14 @@ discard block |
||
| 2268 | 2268 | $gd_chunksize_options[100000] = 100000; |
| 2269 | 2269 | |
| 2270 | 2270 | /** |
| 2271 | - * Filter max entries per export csv file. |
|
| 2272 | - * |
|
| 2273 | - * @since 1.5.6 |
|
| 2274 | - * @package GeoDirectory |
|
| 2275 | - * |
|
| 2276 | - * @param string $gd_chunksize_options Entries options. |
|
| 2277 | - */ |
|
| 2278 | - $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options ); |
|
| 2271 | + * Filter max entries per export csv file. |
|
| 2272 | + * |
|
| 2273 | + * @since 1.5.6 |
|
| 2274 | + * @package GeoDirectory |
|
| 2275 | + * |
|
| 2276 | + * @param string $gd_chunksize_options Entries options. |
|
| 2277 | + */ |
|
| 2278 | + $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options ); |
|
| 2279 | 2279 | |
| 2280 | 2280 | $gd_chunksize_option = ''; |
| 2281 | 2281 | foreach ($gd_chunksize_options as $value => $title) {
|
@@ -2292,12 +2292,12 @@ discard block |
||
| 2292 | 2292 | <div class="gd-content-heading"> |
| 2293 | 2293 | |
| 2294 | 2294 | <?php |
| 2295 | - ini_set('max_execution_time', 999999);
|
|
| 2296 | - $ini_max_execution_time_check = @ini_get( 'max_execution_time' ); |
|
| 2297 | - ini_restore('max_execution_time');
|
|
| 2295 | + ini_set('max_execution_time', 999999);
|
|
| 2296 | + $ini_max_execution_time_check = @ini_get( 'max_execution_time' ); |
|
| 2297 | + ini_restore('max_execution_time');
|
|
| 2298 | 2298 | |
| 2299 | - if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting
|
|
| 2300 | - ?> |
|
| 2299 | + if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting
|
|
| 2300 | + ?> |
|
| 2301 | 2301 | <div id="gd_ie_reqs" class="metabox-holder"> |
| 2302 | 2302 | <div class="meta-box-sortables ui-sortable"> |
| 2303 | 2303 | <div class="postbox"> |
@@ -2472,7 +2472,7 @@ discard block |
||
| 2472 | 2472 | * Called just after the sample CSV download link. |
| 2473 | 2473 | * |
| 2474 | 2474 | * @since 1.0.0 |
| 2475 | - * @package GeoDirectory |
|
| 2475 | + * @package GeoDirectory |
|
| 2476 | 2476 | */ |
| 2477 | 2477 | do_action('geodir_sample_cats_csv_download_link');
|
| 2478 | 2478 | ?> |
@@ -2557,11 +2557,11 @@ discard block |
||
| 2557 | 2557 | * |
| 2558 | 2558 | * Called after the last setting on the GD > Import & Export page. |
| 2559 | 2559 | * @since 1.4.6 |
| 2560 | - * @package GeoDirectory |
|
| 2560 | + * @package GeoDirectory |
|
| 2561 | 2561 | * |
| 2562 | 2562 | * @param array $gd_posttypes GD post types. |
| 2563 | - * @param array $gd_chunksize_options File chunk size options. |
|
| 2564 | - * @param string $nonce Wordpress security token for GD import & export. |
|
| 2563 | + * @param array $gd_chunksize_options File chunk size options. |
|
| 2564 | + * @param string $nonce Wordpress security token for GD import & export. |
|
| 2565 | 2565 | */ |
| 2566 | 2566 | do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce ); |
| 2567 | 2567 | ?> |
@@ -3248,44 +3248,44 @@ discard block |
||
| 3248 | 3248 | function geodir_init_filesystem() |
| 3249 | 3249 | {
|
| 3250 | 3250 | |
| 3251 | - if(!function_exists('get_filesystem_method')){
|
|
| 3252 | - require_once(ABSPATH."/wp-admin/includes/file.php"); |
|
| 3253 | - } |
|
| 3254 | - $access_type = get_filesystem_method(); |
|
| 3255 | - if ($access_type === 'direct') {
|
|
| 3256 | - /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */ |
|
| 3257 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3258 | - |
|
| 3259 | - /* initialize the API */ |
|
| 3260 | - if (!WP_Filesystem($creds)) {
|
|
| 3261 | - /* any problems and we exit */ |
|
| 3262 | - //return '@@@3'; |
|
| 3263 | - return false; |
|
| 3264 | - } |
|
| 3251 | + if(!function_exists('get_filesystem_method')){
|
|
| 3252 | + require_once(ABSPATH."/wp-admin/includes/file.php"); |
|
| 3253 | + } |
|
| 3254 | + $access_type = get_filesystem_method(); |
|
| 3255 | + if ($access_type === 'direct') {
|
|
| 3256 | + /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */ |
|
| 3257 | + $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3258 | + |
|
| 3259 | + /* initialize the API */ |
|
| 3260 | + if (!WP_Filesystem($creds)) {
|
|
| 3261 | + /* any problems and we exit */ |
|
| 3262 | + //return '@@@3'; |
|
| 3263 | + return false; |
|
| 3264 | + } |
|
| 3265 | 3265 | |
| 3266 | - global $wp_filesystem; |
|
| 3267 | - return $wp_filesystem; |
|
| 3268 | - /* do our file manipulations below */ |
|
| 3269 | - } elseif (defined('FTP_USER')) {
|
|
| 3270 | - $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3266 | + global $wp_filesystem; |
|
| 3267 | + return $wp_filesystem; |
|
| 3268 | + /* do our file manipulations below */ |
|
| 3269 | + } elseif (defined('FTP_USER')) {
|
|
| 3270 | + $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array()); |
|
| 3271 | + |
|
| 3272 | + /* initialize the API */ |
|
| 3273 | + if (!WP_Filesystem($creds)) {
|
|
| 3274 | + /* any problems and we exit */ |
|
| 3275 | + //return '@@@33'; |
|
| 3276 | + return false; |
|
| 3277 | + } |
|
| 3271 | 3278 | |
| 3272 | - /* initialize the API */ |
|
| 3273 | - if (!WP_Filesystem($creds)) {
|
|
| 3274 | - /* any problems and we exit */ |
|
| 3275 | - //return '@@@33'; |
|
| 3276 | - return false; |
|
| 3277 | - } |
|
| 3279 | + global $wp_filesystem; |
|
| 3280 | + //return '@@@1'; |
|
| 3281 | + return $wp_filesystem; |
|
| 3278 | 3282 | |
| 3279 | - global $wp_filesystem; |
|
| 3280 | - //return '@@@1'; |
|
| 3281 | - return $wp_filesystem; |
|
| 3282 | - |
|
| 3283 | - } else {
|
|
| 3284 | - //return '@@@2'; |
|
| 3285 | - /* don't have direct write access. Prompt user with our notice */ |
|
| 3286 | - add_action('admin_notice', 'geodir_filesystem_notice');
|
|
| 3287 | - return false; |
|
| 3288 | - } |
|
| 3283 | + } else {
|
|
| 3284 | + //return '@@@2'; |
|
| 3285 | + /* don't have direct write access. Prompt user with our notice */ |
|
| 3286 | + add_action('admin_notice', 'geodir_filesystem_notice');
|
|
| 3287 | + return false; |
|
| 3288 | + } |
|
| 3289 | 3289 | |
| 3290 | 3290 | } |
| 3291 | 3291 | |
@@ -3303,10 +3303,10 @@ discard block |
||
| 3303 | 3303 | */ |
| 3304 | 3304 | function geodir_filesystem_notice() |
| 3305 | 3305 | { if ( defined( 'DOING_AJAX' ) ){return;}
|
| 3306 | - $access_type = get_filesystem_method(); |
|
| 3307 | - if ($access_type === 'direct') {
|
|
| 3308 | - } elseif (!defined('FTP_USER')) {
|
|
| 3309 | - ?> |
|
| 3306 | + $access_type = get_filesystem_method(); |
|
| 3307 | + if ($access_type === 'direct') {
|
|
| 3308 | + } elseif (!defined('FTP_USER')) {
|
|
| 3309 | + ?> |
|
| 3310 | 3310 | <div class="error"> |
| 3311 | 3311 | <p><?php _e('GeoDirectory does not have access to your filesystem, thing like import/export will not work. Please define your details in wp-config.php as explained here', 'geodirectory'); ?>
|
| 3312 | 3312 | <a target="_blank" href="http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants">http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants</a> |
@@ -3334,1280 +3334,1280 @@ discard block |
||
| 3334 | 3334 | * @return string Json data. |
| 3335 | 3335 | */ |
| 3336 | 3336 | function geodir_ajax_import_export() {
|
| 3337 | - global $wpdb, $plugin_prefix, $current_user, $wp_filesystem; |
|
| 3337 | + global $wpdb, $plugin_prefix, $current_user, $wp_filesystem; |
|
| 3338 | 3338 | |
| 3339 | - error_reporting(0); |
|
| 3339 | + error_reporting(0); |
|
| 3340 | 3340 | |
| 3341 | - $xstart = microtime(true); |
|
| 3341 | + $xstart = microtime(true); |
|
| 3342 | 3342 | |
| 3343 | - // try to set higher limits for import |
|
| 3344 | - $max_input_time = ini_get('max_input_time');
|
|
| 3345 | - $max_execution_time = ini_get('max_execution_time');
|
|
| 3346 | - $memory_limit= ini_get('memory_limit');
|
|
| 3343 | + // try to set higher limits for import |
|
| 3344 | + $max_input_time = ini_get('max_input_time');
|
|
| 3345 | + $max_execution_time = ini_get('max_execution_time');
|
|
| 3346 | + $memory_limit= ini_get('memory_limit');
|
|
| 3347 | 3347 | |
| 3348 | - if(!$max_input_time || $max_input_time<3000){
|
|
| 3349 | - ini_set('max_input_time', 3000);
|
|
| 3350 | - } |
|
| 3348 | + if(!$max_input_time || $max_input_time<3000){
|
|
| 3349 | + ini_set('max_input_time', 3000);
|
|
| 3350 | + } |
|
| 3351 | 3351 | |
| 3352 | - if(!$max_execution_time || $max_execution_time<3000){
|
|
| 3353 | - ini_set('max_execution_time', 3000);
|
|
| 3354 | - } |
|
| 3352 | + if(!$max_execution_time || $max_execution_time<3000){
|
|
| 3353 | + ini_set('max_execution_time', 3000);
|
|
| 3354 | + } |
|
| 3355 | 3355 | |
| 3356 | - if($memory_limit && str_replace('M','',$memory_limit)){
|
|
| 3357 | - if(str_replace('M','',$memory_limit)<256){
|
|
| 3358 | - ini_set('memory_limit', '256M');
|
|
| 3359 | - } |
|
| 3360 | - } |
|
| 3356 | + if($memory_limit && str_replace('M','',$memory_limit)){
|
|
| 3357 | + if(str_replace('M','',$memory_limit)<256){
|
|
| 3358 | + ini_set('memory_limit', '256M');
|
|
| 3359 | + } |
|
| 3360 | + } |
|
| 3361 | 3361 | |
| 3362 | - $json = array(); |
|
| 3362 | + $json = array(); |
|
| 3363 | 3363 | |
| 3364 | - if ( !current_user_can( 'manage_options' ) ) {
|
|
| 3365 | - wp_send_json( $json ); |
|
| 3366 | - } |
|
| 3364 | + if ( !current_user_can( 'manage_options' ) ) {
|
|
| 3365 | + wp_send_json( $json ); |
|
| 3366 | + } |
|
| 3367 | 3367 | |
| 3368 | - $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL; |
|
| 3369 | - $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL; |
|
| 3370 | - $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false; |
|
| 3368 | + $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL; |
|
| 3369 | + $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL; |
|
| 3370 | + $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false; |
|
| 3371 | 3371 | |
| 3372 | - if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {
|
|
| 3373 | - wp_send_json( $json ); |
|
| 3374 | - } |
|
| 3372 | + if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {
|
|
| 3373 | + wp_send_json( $json ); |
|
| 3374 | + } |
|
| 3375 | 3375 | |
| 3376 | - $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL; |
|
| 3377 | - $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL; |
|
| 3378 | - $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page; |
|
| 3379 | - $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1; |
|
| 3376 | + $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL; |
|
| 3377 | + $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL; |
|
| 3378 | + $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page; |
|
| 3379 | + $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1; |
|
| 3380 | 3380 | |
| 3381 | - $wp_filesystem = geodir_init_filesystem(); |
|
| 3382 | - if (!$wp_filesystem) {
|
|
| 3383 | - $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' ); |
|
| 3384 | - wp_send_json( $json ); |
|
| 3385 | - } |
|
| 3381 | + $wp_filesystem = geodir_init_filesystem(); |
|
| 3382 | + if (!$wp_filesystem) {
|
|
| 3383 | + $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' ); |
|
| 3384 | + wp_send_json( $json ); |
|
| 3385 | + } |
|
| 3386 | 3386 | |
| 3387 | - if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
|
|
| 3388 | - $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' ); |
|
| 3389 | - wp_send_json( $json ); |
|
| 3390 | - } |
|
| 3387 | + if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
|
|
| 3388 | + $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' ); |
|
| 3389 | + wp_send_json( $json ); |
|
| 3390 | + } |
|
| 3391 | 3391 | |
| 3392 | - $csv_file_dir = geodir_path_import_export( false ); |
|
| 3393 | - if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {
|
|
| 3394 | - if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {
|
|
| 3395 | - $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3396 | - wp_send_json( $json ); |
|
| 3397 | - } |
|
| 3398 | - } |
|
| 3392 | + $csv_file_dir = geodir_path_import_export( false ); |
|
| 3393 | + if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {
|
|
| 3394 | + if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {
|
|
| 3395 | + $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3396 | + wp_send_json( $json ); |
|
| 3397 | + } |
|
| 3398 | + } |
|
| 3399 | 3399 | |
| 3400 | - $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
|
| 3401 | - $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 3402 | - |
|
| 3403 | - switch ( $task ) {
|
|
| 3404 | - case 'export_posts': {
|
|
| 3405 | - // WPML |
|
| 3406 | - $is_wpml = geodir_is_wpml(); |
|
| 3407 | - if ($is_wpml) {
|
|
| 3408 | - global $sitepress; |
|
| 3409 | - $active_lang = ICL_LANGUAGE_CODE; |
|
| 3400 | + $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
|
|
| 3401 | + $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
|
|
| 3402 | + |
|
| 3403 | + switch ( $task ) {
|
|
| 3404 | + case 'export_posts': {
|
|
| 3405 | + // WPML |
|
| 3406 | + $is_wpml = geodir_is_wpml(); |
|
| 3407 | + if ($is_wpml) {
|
|
| 3408 | + global $sitepress; |
|
| 3409 | + $active_lang = ICL_LANGUAGE_CODE; |
|
| 3410 | 3410 | |
| 3411 | - $sitepress->switch_lang('all', true);
|
|
| 3412 | - } |
|
| 3413 | - // WPML |
|
| 3414 | - if ( $post_type == 'gd_event' ) {
|
|
| 3415 | - add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 ); |
|
| 3416 | - } |
|
| 3417 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 3411 | + $sitepress->switch_lang('all', true);
|
|
| 3412 | + } |
|
| 3413 | + // WPML |
|
| 3414 | + if ( $post_type == 'gd_event' ) {
|
|
| 3415 | + add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 ); |
|
| 3416 | + } |
|
| 3417 | + $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 3418 | 3418 | |
| 3419 | - $file_name = $post_type . '_' . date( 'dmyHi' ); |
|
| 3420 | - if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {
|
|
| 3421 | - $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) ); |
|
| 3422 | - } |
|
| 3423 | - $posts_count = geodir_get_posts_count( $post_type ); |
|
| 3424 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3425 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3426 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3427 | - $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv'; |
|
| 3419 | + $file_name = $post_type . '_' . date( 'dmyHi' ); |
|
| 3420 | + if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {
|
|
| 3421 | + $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) ); |
|
| 3422 | + } |
|
| 3423 | + $posts_count = geodir_get_posts_count( $post_type ); |
|
| 3424 | + $file_url_base = geodir_path_import_export() . '/'; |
|
| 3425 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3426 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3427 | + $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv'; |
|
| 3428 | 3428 | |
| 3429 | - $chunk_file_paths = array(); |
|
| 3429 | + $chunk_file_paths = array(); |
|
| 3430 | 3430 | |
| 3431 | - if ( isset( $_REQUEST['_c'] ) ) {
|
|
| 3432 | - $json['total'] = $posts_count; |
|
| 3433 | - // WPML |
|
| 3434 | - if ($is_wpml) {
|
|
| 3435 | - $sitepress->switch_lang($active_lang, true); |
|
| 3436 | - } |
|
| 3437 | - // WPML |
|
| 3438 | - wp_send_json( $json ); |
|
| 3439 | - gd_die(); |
|
| 3440 | - } else if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3441 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3442 | - $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0; |
|
| 3443 | - $percentage = min( $percentage, 100 ); |
|
| 3431 | + if ( isset( $_REQUEST['_c'] ) ) {
|
|
| 3432 | + $json['total'] = $posts_count; |
|
| 3433 | + // WPML |
|
| 3434 | + if ($is_wpml) {
|
|
| 3435 | + $sitepress->switch_lang($active_lang, true); |
|
| 3436 | + } |
|
| 3437 | + // WPML |
|
| 3438 | + wp_send_json( $json ); |
|
| 3439 | + gd_die(); |
|
| 3440 | + } else if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3441 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3442 | + $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0; |
|
| 3443 | + $percentage = min( $percentage, 100 ); |
|
| 3444 | 3444 | |
| 3445 | - $json['percentage'] = $percentage; |
|
| 3446 | - // WPML |
|
| 3447 | - if ($is_wpml) {
|
|
| 3448 | - $sitepress->switch_lang($active_lang, true); |
|
| 3449 | - } |
|
| 3450 | - // WPML |
|
| 3451 | - wp_send_json( $json ); |
|
| 3452 | - gd_die(); |
|
| 3453 | - } else {
|
|
| 3454 | - if ( !$posts_count > 0 ) {
|
|
| 3455 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3456 | - } else {
|
|
| 3457 | - $total_posts = $posts_count; |
|
| 3458 | - if ($chunk_per_page > $total_posts) {
|
|
| 3459 | - $chunk_per_page = $total_posts; |
|
| 3460 | - } |
|
| 3461 | - $chunk_total_pages = ceil( $total_posts / $chunk_per_page ); |
|
| 3445 | + $json['percentage'] = $percentage; |
|
| 3446 | + // WPML |
|
| 3447 | + if ($is_wpml) {
|
|
| 3448 | + $sitepress->switch_lang($active_lang, true); |
|
| 3449 | + } |
|
| 3450 | + // WPML |
|
| 3451 | + wp_send_json( $json ); |
|
| 3452 | + gd_die(); |
|
| 3453 | + } else {
|
|
| 3454 | + if ( !$posts_count > 0 ) {
|
|
| 3455 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3456 | + } else {
|
|
| 3457 | + $total_posts = $posts_count; |
|
| 3458 | + if ($chunk_per_page > $total_posts) {
|
|
| 3459 | + $chunk_per_page = $total_posts; |
|
| 3460 | + } |
|
| 3461 | + $chunk_total_pages = ceil( $total_posts / $chunk_per_page ); |
|
| 3462 | 3462 | |
| 3463 | - $j = $chunk_page_no; |
|
| 3464 | - $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j ); |
|
| 3463 | + $j = $chunk_page_no; |
|
| 3464 | + $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j ); |
|
| 3465 | 3465 | |
| 3466 | - $per_page = 500; |
|
| 3467 | - if ($per_page > $chunk_per_page) {
|
|
| 3468 | - $per_page = $chunk_per_page; |
|
| 3469 | - } |
|
| 3470 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3466 | + $per_page = 500; |
|
| 3467 | + if ($per_page > $chunk_per_page) {
|
|
| 3468 | + $per_page = $chunk_per_page; |
|
| 3469 | + } |
|
| 3470 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3471 | 3471 | |
| 3472 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3473 | - $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page ); |
|
| 3472 | + for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3473 | + $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page ); |
|
| 3474 | 3474 | |
| 3475 | - $clear = $i == 0 ? true : false; |
|
| 3476 | - geodir_save_csv_data( $file_path_temp, $save_posts, $clear ); |
|
| 3477 | - } |
|
| 3475 | + $clear = $i == 0 ? true : false; |
|
| 3476 | + geodir_save_csv_data( $file_path_temp, $save_posts, $clear ); |
|
| 3477 | + } |
|
| 3478 | 3478 | |
| 3479 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3480 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3481 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3482 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3483 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3479 | + if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3480 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3481 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3482 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3483 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3484 | 3484 | |
| 3485 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3486 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3487 | - } |
|
| 3485 | + $file_url = $file_url_base . $chunk_file_name; |
|
| 3486 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3487 | + } |
|
| 3488 | 3488 | |
| 3489 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3490 | - $json['total'] = $posts_count; |
|
| 3491 | - $json['files'] = $chunk_file_paths; |
|
| 3492 | - } else {
|
|
| 3493 | - if ($j > 1) {
|
|
| 3494 | - $json['total'] = $posts_count; |
|
| 3495 | - $json['files'] = array(); |
|
| 3496 | - } else {
|
|
| 3497 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3498 | - } |
|
| 3499 | - } |
|
| 3500 | - } |
|
| 3501 | - // WPML |
|
| 3502 | - if ($is_wpml) {
|
|
| 3503 | - $sitepress->switch_lang($active_lang, true); |
|
| 3504 | - } |
|
| 3505 | - // WPML |
|
| 3506 | - wp_send_json( $json ); |
|
| 3507 | - } |
|
| 3508 | - } |
|
| 3509 | - break; |
|
| 3510 | - case 'export_cats': {
|
|
| 3511 | - // WPML |
|
| 3512 | - $is_wpml = geodir_is_wpml(); |
|
| 3513 | - if ($is_wpml) {
|
|
| 3514 | - global $sitepress; |
|
| 3515 | - $active_lang = ICL_LANGUAGE_CODE; |
|
| 3489 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3490 | + $json['total'] = $posts_count; |
|
| 3491 | + $json['files'] = $chunk_file_paths; |
|
| 3492 | + } else {
|
|
| 3493 | + if ($j > 1) {
|
|
| 3494 | + $json['total'] = $posts_count; |
|
| 3495 | + $json['files'] = array(); |
|
| 3496 | + } else {
|
|
| 3497 | + $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3498 | + } |
|
| 3499 | + } |
|
| 3500 | + } |
|
| 3501 | + // WPML |
|
| 3502 | + if ($is_wpml) {
|
|
| 3503 | + $sitepress->switch_lang($active_lang, true); |
|
| 3504 | + } |
|
| 3505 | + // WPML |
|
| 3506 | + wp_send_json( $json ); |
|
| 3507 | + } |
|
| 3508 | + } |
|
| 3509 | + break; |
|
| 3510 | + case 'export_cats': {
|
|
| 3511 | + // WPML |
|
| 3512 | + $is_wpml = geodir_is_wpml(); |
|
| 3513 | + if ($is_wpml) {
|
|
| 3514 | + global $sitepress; |
|
| 3515 | + $active_lang = ICL_LANGUAGE_CODE; |
|
| 3516 | 3516 | |
| 3517 | - $sitepress->switch_lang('all', true);
|
|
| 3518 | - } |
|
| 3519 | - // WPML |
|
| 3520 | - $file_name = $post_type . 'category_' . date( 'dmyHi' ); |
|
| 3517 | + $sitepress->switch_lang('all', true);
|
|
| 3518 | + } |
|
| 3519 | + // WPML |
|
| 3520 | + $file_name = $post_type . 'category_' . date( 'dmyHi' ); |
|
| 3521 | 3521 | |
| 3522 | - $terms_count = geodir_get_terms_count( $post_type ); |
|
| 3523 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3524 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3525 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3526 | - $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv'; |
|
| 3522 | + $terms_count = geodir_get_terms_count( $post_type ); |
|
| 3523 | + $file_url_base = geodir_path_import_export() . '/'; |
|
| 3524 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3525 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3526 | + $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv'; |
|
| 3527 | 3527 | |
| 3528 | - $chunk_file_paths = array(); |
|
| 3528 | + $chunk_file_paths = array(); |
|
| 3529 | 3529 | |
| 3530 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3531 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3532 | - $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0; |
|
| 3533 | - $percentage = min( $percentage, 100 ); |
|
| 3530 | + if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3531 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3532 | + $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0; |
|
| 3533 | + $percentage = min( $percentage, 100 ); |
|
| 3534 | 3534 | |
| 3535 | - $json['percentage'] = $percentage; |
|
| 3536 | - // WPML |
|
| 3537 | - if ($is_wpml) {
|
|
| 3538 | - $sitepress->switch_lang($active_lang, true); |
|
| 3539 | - } |
|
| 3540 | - // WPML |
|
| 3541 | - wp_send_json( $json ); |
|
| 3542 | - } else {
|
|
| 3543 | - if ( !$terms_count > 0 ) {
|
|
| 3544 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3545 | - } else {
|
|
| 3546 | - $total_terms = $terms_count; |
|
| 3547 | - if ($chunk_per_page > $terms_count) {
|
|
| 3548 | - $chunk_per_page = $terms_count; |
|
| 3549 | - } |
|
| 3550 | - $chunk_total_pages = ceil( $total_terms / $chunk_per_page ); |
|
| 3535 | + $json['percentage'] = $percentage; |
|
| 3536 | + // WPML |
|
| 3537 | + if ($is_wpml) {
|
|
| 3538 | + $sitepress->switch_lang($active_lang, true); |
|
| 3539 | + } |
|
| 3540 | + // WPML |
|
| 3541 | + wp_send_json( $json ); |
|
| 3542 | + } else {
|
|
| 3543 | + if ( !$terms_count > 0 ) {
|
|
| 3544 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3545 | + } else {
|
|
| 3546 | + $total_terms = $terms_count; |
|
| 3547 | + if ($chunk_per_page > $terms_count) {
|
|
| 3548 | + $chunk_per_page = $terms_count; |
|
| 3549 | + } |
|
| 3550 | + $chunk_total_pages = ceil( $total_terms / $chunk_per_page ); |
|
| 3551 | 3551 | |
| 3552 | - $j = $chunk_page_no; |
|
| 3553 | - $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j ); |
|
| 3552 | + $j = $chunk_page_no; |
|
| 3553 | + $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j ); |
|
| 3554 | 3554 | |
| 3555 | - $per_page = 500; |
|
| 3556 | - if ($per_page > $chunk_per_page) {
|
|
| 3557 | - $per_page = $chunk_per_page; |
|
| 3558 | - } |
|
| 3559 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3555 | + $per_page = 500; |
|
| 3556 | + if ($per_page > $chunk_per_page) {
|
|
| 3557 | + $per_page = $chunk_per_page; |
|
| 3558 | + } |
|
| 3559 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3560 | 3560 | |
| 3561 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3562 | - $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page ); |
|
| 3561 | + for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3562 | + $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page ); |
|
| 3563 | 3563 | |
| 3564 | - $clear = $i == 0 ? true : false; |
|
| 3565 | - geodir_save_csv_data( $file_path_temp, $save_terms, $clear ); |
|
| 3566 | - } |
|
| 3564 | + $clear = $i == 0 ? true : false; |
|
| 3565 | + geodir_save_csv_data( $file_path_temp, $save_terms, $clear ); |
|
| 3566 | + } |
|
| 3567 | 3567 | |
| 3568 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3569 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3570 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3571 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3572 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3568 | + if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3569 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3570 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3571 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3572 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3573 | 3573 | |
| 3574 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3575 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3576 | - } |
|
| 3574 | + $file_url = $file_url_base . $chunk_file_name; |
|
| 3575 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3576 | + } |
|
| 3577 | 3577 | |
| 3578 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3579 | - $json['total'] = $terms_count; |
|
| 3580 | - $json['files'] = $chunk_file_paths; |
|
| 3581 | - } else {
|
|
| 3582 | - $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3583 | - } |
|
| 3584 | - } |
|
| 3585 | - // WPML |
|
| 3586 | - if ($is_wpml) {
|
|
| 3587 | - $sitepress->switch_lang($active_lang, true); |
|
| 3588 | - } |
|
| 3589 | - // WPML |
|
| 3590 | - wp_send_json( $json ); |
|
| 3591 | - } |
|
| 3592 | - } |
|
| 3593 | - break; |
|
| 3594 | - case 'export_locations': {
|
|
| 3595 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3596 | - $file_name = 'gd_locations_' . date( 'dmyHi' ); |
|
| 3597 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3598 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3599 | - $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv'; |
|
| 3578 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3579 | + $json['total'] = $terms_count; |
|
| 3580 | + $json['files'] = $chunk_file_paths; |
|
| 3581 | + } else {
|
|
| 3582 | + $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' ); |
|
| 3583 | + } |
|
| 3584 | + } |
|
| 3585 | + // WPML |
|
| 3586 | + if ($is_wpml) {
|
|
| 3587 | + $sitepress->switch_lang($active_lang, true); |
|
| 3588 | + } |
|
| 3589 | + // WPML |
|
| 3590 | + wp_send_json( $json ); |
|
| 3591 | + } |
|
| 3592 | + } |
|
| 3593 | + break; |
|
| 3594 | + case 'export_locations': {
|
|
| 3595 | + $file_url_base = geodir_path_import_export() . '/'; |
|
| 3596 | + $file_name = 'gd_locations_' . date( 'dmyHi' ); |
|
| 3597 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3598 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3599 | + $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv'; |
|
| 3600 | 3600 | |
| 3601 | - $items_count = (int)geodir_location_imex_count_locations(); |
|
| 3601 | + $items_count = (int)geodir_location_imex_count_locations(); |
|
| 3602 | 3602 | |
| 3603 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3604 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3605 | - $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3606 | - $percentage = min( $percentage, 100 ); |
|
| 3603 | + if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3604 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3605 | + $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3606 | + $percentage = min( $percentage, 100 ); |
|
| 3607 | 3607 | |
| 3608 | - $json['percentage'] = $percentage; |
|
| 3609 | - wp_send_json( $json ); |
|
| 3610 | - } else {
|
|
| 3611 | - $chunk_file_paths = array(); |
|
| 3608 | + $json['percentage'] = $percentage; |
|
| 3609 | + wp_send_json( $json ); |
|
| 3610 | + } else {
|
|
| 3611 | + $chunk_file_paths = array(); |
|
| 3612 | 3612 | |
| 3613 | - if ( !$items_count > 0 ) {
|
|
| 3614 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3615 | - } else {
|
|
| 3616 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3617 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3613 | + if ( !$items_count > 0 ) {
|
|
| 3614 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3615 | + } else {
|
|
| 3616 | + $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3617 | + $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3618 | 3618 | |
| 3619 | - $j = $chunk_page_no; |
|
| 3620 | - $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j ); |
|
| 3619 | + $j = $chunk_page_no; |
|
| 3620 | + $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j ); |
|
| 3621 | 3621 | |
| 3622 | - $per_page = 500; |
|
| 3623 | - $per_page = min( $per_page, $chunk_per_page ); |
|
| 3624 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3622 | + $per_page = 500; |
|
| 3623 | + $per_page = min( $per_page, $chunk_per_page ); |
|
| 3624 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3625 | 3625 | |
| 3626 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3627 | - $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3626 | + for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3627 | + $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3628 | 3628 | |
| 3629 | - $clear = $i == 0 ? true : false; |
|
| 3630 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3631 | - } |
|
| 3629 | + $clear = $i == 0 ? true : false; |
|
| 3630 | + geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3631 | + } |
|
| 3632 | 3632 | |
| 3633 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3634 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3635 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3636 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3637 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3633 | + if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3634 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3635 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3636 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3637 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3638 | 3638 | |
| 3639 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3640 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3641 | - } |
|
| 3639 | + $file_url = $file_url_base . $chunk_file_name; |
|
| 3640 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3641 | + } |
|
| 3642 | 3642 | |
| 3643 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3644 | - $json['total'] = $items_count; |
|
| 3645 | - $json['files'] = $chunk_file_paths; |
|
| 3646 | - } else {
|
|
| 3647 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3648 | - } |
|
| 3649 | - } |
|
| 3650 | - wp_send_json( $json ); |
|
| 3651 | - } |
|
| 3652 | - } |
|
| 3653 | - break; |
|
| 3654 | - case 'export_hoods': {
|
|
| 3655 | - $file_url_base = geodir_path_import_export() . '/'; |
|
| 3656 | - $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' ); |
|
| 3657 | - $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3658 | - $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3659 | - $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv'; |
|
| 3643 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3644 | + $json['total'] = $items_count; |
|
| 3645 | + $json['files'] = $chunk_file_paths; |
|
| 3646 | + } else {
|
|
| 3647 | + $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3648 | + } |
|
| 3649 | + } |
|
| 3650 | + wp_send_json( $json ); |
|
| 3651 | + } |
|
| 3652 | + } |
|
| 3653 | + break; |
|
| 3654 | + case 'export_hoods': {
|
|
| 3655 | + $file_url_base = geodir_path_import_export() . '/'; |
|
| 3656 | + $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' ); |
|
| 3657 | + $file_url = $file_url_base . $file_name . '.csv'; |
|
| 3658 | + $file_path = $csv_file_dir . '/' . $file_name . '.csv'; |
|
| 3659 | + $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv'; |
|
| 3660 | 3660 | |
| 3661 | - $items_count = (int)geodir_location_imex_count_neighbourhoods(); |
|
| 3661 | + $items_count = (int)geodir_location_imex_count_neighbourhoods(); |
|
| 3662 | 3662 | |
| 3663 | - if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3664 | - $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3665 | - $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3666 | - $percentage = min( $percentage, 100 ); |
|
| 3663 | + if ( isset( $_REQUEST['_st'] ) ) {
|
|
| 3664 | + $line_count = (int)geodir_import_export_line_count( $file_path_temp ); |
|
| 3665 | + $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0; |
|
| 3666 | + $percentage = min( $percentage, 100 ); |
|
| 3667 | 3667 | |
| 3668 | - $json['percentage'] = $percentage; |
|
| 3669 | - wp_send_json( $json ); |
|
| 3670 | - } else {
|
|
| 3671 | - $chunk_file_paths = array(); |
|
| 3668 | + $json['percentage'] = $percentage; |
|
| 3669 | + wp_send_json( $json ); |
|
| 3670 | + } else {
|
|
| 3671 | + $chunk_file_paths = array(); |
|
| 3672 | 3672 | |
| 3673 | - if ( !$items_count > 0 ) {
|
|
| 3674 | - $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3675 | - } else {
|
|
| 3676 | - $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3677 | - $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3673 | + if ( !$items_count > 0 ) {
|
|
| 3674 | + $json['error'] = __( 'No records to export.', 'geodirectory' ); |
|
| 3675 | + } else {
|
|
| 3676 | + $chunk_per_page = min( $chunk_per_page, $items_count ); |
|
| 3677 | + $chunk_total_pages = ceil( $items_count / $chunk_per_page ); |
|
| 3678 | 3678 | |
| 3679 | - $j = $chunk_page_no; |
|
| 3680 | - $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j ); |
|
| 3679 | + $j = $chunk_page_no; |
|
| 3680 | + $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j ); |
|
| 3681 | 3681 | |
| 3682 | - $per_page = 500; |
|
| 3683 | - $per_page = min( $per_page, $chunk_per_page ); |
|
| 3684 | - $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3682 | + $per_page = 500; |
|
| 3683 | + $per_page = min( $per_page, $chunk_per_page ); |
|
| 3684 | + $total_pages = ceil( $chunk_per_page / $per_page ); |
|
| 3685 | 3685 | |
| 3686 | - for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3687 | - $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3686 | + for ( $i = 0; $i <= $total_pages; $i++ ) {
|
|
| 3687 | + $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page ); |
|
| 3688 | 3688 | |
| 3689 | - $clear = $i == 0 ? true : false; |
|
| 3690 | - geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3691 | - } |
|
| 3689 | + $clear = $i == 0 ? true : false; |
|
| 3690 | + geodir_save_csv_data( $file_path_temp, $save_items, $clear ); |
|
| 3691 | + } |
|
| 3692 | 3692 | |
| 3693 | - if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3694 | - $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3695 | - $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3696 | - $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3697 | - $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3693 | + if ( $wp_filesystem->exists( $file_path_temp ) ) {
|
|
| 3694 | + $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : ''; |
|
| 3695 | + $chunk_file_name = $file_name . $chunk_page_no . '.csv'; |
|
| 3696 | + $file_path = $csv_file_dir . '/' . $chunk_file_name; |
|
| 3697 | + $wp_filesystem->move( $file_path_temp, $file_path, true ); |
|
| 3698 | 3698 | |
| 3699 | - $file_url = $file_url_base . $chunk_file_name; |
|
| 3700 | - $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3701 | - } |
|
| 3699 | + $file_url = $file_url_base . $chunk_file_name; |
|
| 3700 | + $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
|
|
| 3701 | + } |
|
| 3702 | 3702 | |
| 3703 | - if ( !empty($chunk_file_paths) ) {
|
|
| 3704 | - $json['total'] = $items_count; |
|
| 3705 | - $json['files'] = $chunk_file_paths; |
|
| 3706 | - } else {
|
|
| 3707 | - $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3708 | - } |
|
| 3709 | - } |
|
| 3710 | - wp_send_json( $json ); |
|
| 3711 | - } |
|
| 3712 | - } |
|
| 3713 | - break; |
|
| 3714 | - case 'prepare_import': |
|
| 3715 | - case 'import_cat': |
|
| 3716 | - case 'import_post': |
|
| 3717 | - case 'import_loc': |
|
| 3718 | - case 'import_hood': {
|
|
| 3719 | - // WPML |
|
| 3720 | - $is_wpml = geodir_is_wpml(); |
|
| 3721 | - if ($is_wpml) {
|
|
| 3722 | - global $sitepress; |
|
| 3723 | - $active_lang = ICL_LANGUAGE_CODE; |
|
| 3724 | - } |
|
| 3725 | - // WPML |
|
| 3703 | + if ( !empty($chunk_file_paths) ) {
|
|
| 3704 | + $json['total'] = $items_count; |
|
| 3705 | + $json['files'] = $chunk_file_paths; |
|
| 3706 | + } else {
|
|
| 3707 | + $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' ); |
|
| 3708 | + } |
|
| 3709 | + } |
|
| 3710 | + wp_send_json( $json ); |
|
| 3711 | + } |
|
| 3712 | + } |
|
| 3713 | + break; |
|
| 3714 | + case 'prepare_import': |
|
| 3715 | + case 'import_cat': |
|
| 3716 | + case 'import_post': |
|
| 3717 | + case 'import_loc': |
|
| 3718 | + case 'import_hood': {
|
|
| 3719 | + // WPML |
|
| 3720 | + $is_wpml = geodir_is_wpml(); |
|
| 3721 | + if ($is_wpml) {
|
|
| 3722 | + global $sitepress; |
|
| 3723 | + $active_lang = ICL_LANGUAGE_CODE; |
|
| 3724 | + } |
|
| 3725 | + // WPML |
|
| 3726 | 3726 | |
| 3727 | - ini_set( 'auto_detect_line_endings', true ); |
|
| 3727 | + ini_set( 'auto_detect_line_endings', true ); |
|
| 3728 | 3728 | |
| 3729 | - $uploads = wp_upload_dir(); |
|
| 3730 | - $uploads_dir = $uploads['path']; |
|
| 3731 | - $uploads_subdir = $uploads['subdir']; |
|
| 3729 | + $uploads = wp_upload_dir(); |
|
| 3730 | + $uploads_dir = $uploads['path']; |
|
| 3731 | + $uploads_subdir = $uploads['subdir']; |
|
| 3732 | 3732 | |
| 3733 | - $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL; |
|
| 3734 | - $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip'; |
|
| 3733 | + $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL; |
|
| 3734 | + $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip'; |
|
| 3735 | 3735 | |
| 3736 | - $csv_file_arr = explode( '/', $csv_file ); |
|
| 3737 | - $csv_filename = end( $csv_file_arr ); |
|
| 3738 | - $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename; |
|
| 3736 | + $csv_file_arr = explode( '/', $csv_file ); |
|
| 3737 | + $csv_filename = end( $csv_file_arr ); |
|
| 3738 | + $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename; |
|
| 3739 | 3739 | |
| 3740 | - $json['file'] = $csv_file; |
|
| 3741 | - $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' ); |
|
| 3742 | - $file = array(); |
|
| 3740 | + $json['file'] = $csv_file; |
|
| 3741 | + $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' ); |
|
| 3742 | + $file = array(); |
|
| 3743 | 3743 | |
| 3744 | - if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {
|
|
| 3745 | - $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename ); |
|
| 3744 | + if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {
|
|
| 3745 | + $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename ); |
|
| 3746 | 3746 | |
| 3747 | - if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
| 3748 | - $json['error'] = NULL; |
|
| 3749 | - |
|
| 3750 | - $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line |
|
| 3751 | - setlocale(LC_ALL, 'en_US.UTF-8'); |
|
| 3752 | - if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {
|
|
| 3753 | - while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {
|
|
| 3754 | - if ( !empty( $data ) ) {
|
|
| 3755 | - $file[] = $data; |
|
| 3756 | - } |
|
| 3757 | - } |
|
| 3758 | - fclose($handle); |
|
| 3759 | - } |
|
| 3760 | - setlocale(LC_ALL, $lc_all); |
|
| 3747 | + if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
| 3748 | + $json['error'] = NULL; |
|
| 3749 | + |
|
| 3750 | + $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line |
|
| 3751 | + setlocale(LC_ALL, 'en_US.UTF-8'); |
|
| 3752 | + if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {
|
|
| 3753 | + while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {
|
|
| 3754 | + if ( !empty( $data ) ) {
|
|
| 3755 | + $file[] = $data; |
|
| 3756 | + } |
|
| 3757 | + } |
|
| 3758 | + fclose($handle); |
|
| 3759 | + } |
|
| 3760 | + setlocale(LC_ALL, $lc_all); |
|
| 3761 | 3761 | |
| 3762 | - $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
| 3762 | + $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
| 3763 | 3763 | |
| 3764 | - if (!$json['rows'] > 0) {
|
|
| 3765 | - $json['error'] = __('No data found in csv file.', 'geodirectory');
|
|
| 3766 | - } |
|
| 3767 | - } else {
|
|
| 3768 | - wp_send_json( $json ); |
|
| 3769 | - } |
|
| 3770 | - } else {
|
|
| 3771 | - wp_send_json( $json ); |
|
| 3772 | - } |
|
| 3764 | + if (!$json['rows'] > 0) {
|
|
| 3765 | + $json['error'] = __('No data found in csv file.', 'geodirectory');
|
|
| 3766 | + } |
|
| 3767 | + } else {
|
|
| 3768 | + wp_send_json( $json ); |
|
| 3769 | + } |
|
| 3770 | + } else {
|
|
| 3771 | + wp_send_json( $json ); |
|
| 3772 | + } |
|
| 3773 | 3773 | |
| 3774 | - if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
|
|
| 3775 | - wp_send_json( $json ); |
|
| 3776 | - } |
|
| 3774 | + if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
|
|
| 3775 | + wp_send_json( $json ); |
|
| 3776 | + } |
|
| 3777 | 3777 | |
| 3778 | - $total = $json['rows']; |
|
| 3779 | - $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1; |
|
| 3780 | - $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0; |
|
| 3778 | + $total = $json['rows']; |
|
| 3779 | + $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1; |
|
| 3780 | + $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0; |
|
| 3781 | 3781 | |
| 3782 | - $count = $limit; |
|
| 3782 | + $count = $limit; |
|
| 3783 | 3783 | |
| 3784 | - if ($count < $total) {
|
|
| 3785 | - $count = $processed + $count; |
|
| 3786 | - if ($count > $total) {
|
|
| 3787 | - $count = $total; |
|
| 3788 | - } |
|
| 3789 | - } else {
|
|
| 3790 | - $count = $total; |
|
| 3791 | - } |
|
| 3784 | + if ($count < $total) {
|
|
| 3785 | + $count = $processed + $count; |
|
| 3786 | + if ($count > $total) {
|
|
| 3787 | + $count = $total; |
|
| 3788 | + } |
|
| 3789 | + } else {
|
|
| 3790 | + $count = $total; |
|
| 3791 | + } |
|
| 3792 | 3792 | |
| 3793 | - $created = 0; |
|
| 3794 | - $updated = 0; |
|
| 3795 | - $skipped = 0; |
|
| 3796 | - $invalid = 0; |
|
| 3797 | - $invalid_addr = 0; |
|
| 3798 | - $images = 0; |
|
| 3793 | + $created = 0; |
|
| 3794 | + $updated = 0; |
|
| 3795 | + $skipped = 0; |
|
| 3796 | + $invalid = 0; |
|
| 3797 | + $invalid_addr = 0; |
|
| 3798 | + $images = 0; |
|
| 3799 | 3799 | |
| 3800 | - $gd_post_info = array(); |
|
| 3801 | - $countpost = 0; |
|
| 3800 | + $gd_post_info = array(); |
|
| 3801 | + $countpost = 0; |
|
| 3802 | 3802 | |
| 3803 | - $post_types = geodir_get_posttypes(); |
|
| 3803 | + $post_types = geodir_get_posttypes(); |
|
| 3804 | 3804 | |
| 3805 | - if ( $task == 'import_cat' ) {
|
|
| 3806 | - if (!empty($file)) {
|
|
| 3807 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 3805 | + if ( $task == 'import_cat' ) {
|
|
| 3806 | + if (!empty($file)) {
|
|
| 3807 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 3808 | 3808 | |
| 3809 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 3810 | - $json['error'] = CSV_INVAILD_FILE; |
|
| 3811 | - wp_send_json( $json ); |
|
| 3812 | - exit; |
|
| 3813 | - } |
|
| 3809 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 3810 | + $json['error'] = CSV_INVAILD_FILE; |
|
| 3811 | + wp_send_json( $json ); |
|
| 3812 | + exit; |
|
| 3813 | + } |
|
| 3814 | 3814 | |
| 3815 | - $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');
|
|
| 3815 | + $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');
|
|
| 3816 | 3816 | |
| 3817 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 3818 | - $index = $processed + $i; |
|
| 3817 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 3818 | + $index = $processed + $i; |
|
| 3819 | 3819 | |
| 3820 | - if (isset($file[$index])) {
|
|
| 3821 | - $row = $file[$index]; |
|
| 3822 | - $row = array_map( 'trim', $row ); |
|
| 3823 | - //$row = array_map( 'utf8_encode', $row ); |
|
| 3820 | + if (isset($file[$index])) {
|
|
| 3821 | + $row = $file[$index]; |
|
| 3822 | + $row = array_map( 'trim', $row ); |
|
| 3823 | + //$row = array_map( 'utf8_encode', $row ); |
|
| 3824 | 3824 | |
| 3825 | - $cat_id = ''; |
|
| 3826 | - $cat_name = ''; |
|
| 3827 | - $cat_slug = ''; |
|
| 3828 | - $cat_posttype = ''; |
|
| 3829 | - $cat_parent = ''; |
|
| 3830 | - $cat_description = ''; |
|
| 3831 | - $cat_schema = ''; |
|
| 3832 | - $cat_top_description = ''; |
|
| 3833 | - $cat_image = ''; |
|
| 3834 | - $cat_icon = ''; |
|
| 3835 | - $cat_language = ''; |
|
| 3836 | - $cat_id_original = ''; |
|
| 3825 | + $cat_id = ''; |
|
| 3826 | + $cat_name = ''; |
|
| 3827 | + $cat_slug = ''; |
|
| 3828 | + $cat_posttype = ''; |
|
| 3829 | + $cat_parent = ''; |
|
| 3830 | + $cat_description = ''; |
|
| 3831 | + $cat_schema = ''; |
|
| 3832 | + $cat_top_description = ''; |
|
| 3833 | + $cat_image = ''; |
|
| 3834 | + $cat_icon = ''; |
|
| 3835 | + $cat_language = ''; |
|
| 3836 | + $cat_id_original = ''; |
|
| 3837 | 3837 | |
| 3838 | - $c = 0; |
|
| 3839 | - foreach ($columns as $column ) {
|
|
| 3840 | - if ( $column == 'cat_id' ) {
|
|
| 3841 | - $cat_id = (int)$row[$c]; |
|
| 3842 | - } else if ( $column == 'cat_name' ) {
|
|
| 3843 | - $cat_name = $row[$c]; |
|
| 3844 | - } else if ( $column == 'cat_slug' ) {
|
|
| 3845 | - $cat_slug = $row[$c]; |
|
| 3846 | - } else if ( $column == 'cat_posttype' ) {
|
|
| 3847 | - $cat_posttype = $row[$c]; |
|
| 3848 | - } else if ( $column == 'cat_parent' ) {
|
|
| 3849 | - $cat_parent = trim($row[$c]); |
|
| 3850 | - } else if ( $column == 'cat_schema' && $row[$c] != '' ) {
|
|
| 3851 | - $cat_schema = $row[$c]; |
|
| 3852 | - } else if ( $column == 'cat_description' ) {
|
|
| 3853 | - $cat_description = $row[$c]; |
|
| 3854 | - } else if ( $column == 'cat_top_description' ) {
|
|
| 3855 | - $cat_top_description = $row[$c]; |
|
| 3856 | - } else if ( $column == 'cat_image' ) {
|
|
| 3857 | - $cat_image = $row[$c]; |
|
| 3858 | - } else if ( $column == 'cat_icon' ) {
|
|
| 3859 | - $cat_icon = $row[$c]; |
|
| 3860 | - } |
|
| 3861 | - // WPML |
|
| 3862 | - if ( $is_wpml ) {
|
|
| 3863 | - if ( $column == 'cat_language' ) {
|
|
| 3864 | - $cat_language = geodir_strtolower( trim( $row[$c] ) ); |
|
| 3865 | - } else if ( $column == 'cat_id_original' ) {
|
|
| 3866 | - $cat_id_original = (int)$row[$c]; |
|
| 3867 | - } |
|
| 3868 | - } |
|
| 3869 | - // WPML |
|
| 3870 | - $c++; |
|
| 3871 | - } |
|
| 3838 | + $c = 0; |
|
| 3839 | + foreach ($columns as $column ) {
|
|
| 3840 | + if ( $column == 'cat_id' ) {
|
|
| 3841 | + $cat_id = (int)$row[$c]; |
|
| 3842 | + } else if ( $column == 'cat_name' ) {
|
|
| 3843 | + $cat_name = $row[$c]; |
|
| 3844 | + } else if ( $column == 'cat_slug' ) {
|
|
| 3845 | + $cat_slug = $row[$c]; |
|
| 3846 | + } else if ( $column == 'cat_posttype' ) {
|
|
| 3847 | + $cat_posttype = $row[$c]; |
|
| 3848 | + } else if ( $column == 'cat_parent' ) {
|
|
| 3849 | + $cat_parent = trim($row[$c]); |
|
| 3850 | + } else if ( $column == 'cat_schema' && $row[$c] != '' ) {
|
|
| 3851 | + $cat_schema = $row[$c]; |
|
| 3852 | + } else if ( $column == 'cat_description' ) {
|
|
| 3853 | + $cat_description = $row[$c]; |
|
| 3854 | + } else if ( $column == 'cat_top_description' ) {
|
|
| 3855 | + $cat_top_description = $row[$c]; |
|
| 3856 | + } else if ( $column == 'cat_image' ) {
|
|
| 3857 | + $cat_image = $row[$c]; |
|
| 3858 | + } else if ( $column == 'cat_icon' ) {
|
|
| 3859 | + $cat_icon = $row[$c]; |
|
| 3860 | + } |
|
| 3861 | + // WPML |
|
| 3862 | + if ( $is_wpml ) {
|
|
| 3863 | + if ( $column == 'cat_language' ) {
|
|
| 3864 | + $cat_language = geodir_strtolower( trim( $row[$c] ) ); |
|
| 3865 | + } else if ( $column == 'cat_id_original' ) {
|
|
| 3866 | + $cat_id_original = (int)$row[$c]; |
|
| 3867 | + } |
|
| 3868 | + } |
|
| 3869 | + // WPML |
|
| 3870 | + $c++; |
|
| 3871 | + } |
|
| 3872 | 3872 | |
| 3873 | - if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {
|
|
| 3874 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 3873 | + if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {
|
|
| 3874 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 3875 | 3875 | |
| 3876 | - $invalid++; |
|
| 3877 | - continue; |
|
| 3878 | - } |
|
| 3876 | + $invalid++; |
|
| 3877 | + continue; |
|
| 3878 | + } |
|
| 3879 | 3879 | |
| 3880 | - // WPML |
|
| 3881 | - if ($is_wpml && $cat_language != '') {
|
|
| 3882 | - $sitepress->switch_lang($cat_language, true); |
|
| 3883 | - } |
|
| 3884 | - // WPML |
|
| 3880 | + // WPML |
|
| 3881 | + if ($is_wpml && $cat_language != '') {
|
|
| 3882 | + $sitepress->switch_lang($cat_language, true); |
|
| 3883 | + } |
|
| 3884 | + // WPML |
|
| 3885 | 3885 | |
| 3886 | - $term_data = array(); |
|
| 3887 | - $term_data['name'] = $cat_name; |
|
| 3888 | - $term_data['slug'] = $cat_slug; |
|
| 3889 | - $term_data['description'] = $cat_description; |
|
| 3890 | - $term_data['cat_schema'] = $cat_schema; |
|
| 3891 | - $term_data['top_description'] = $cat_top_description; |
|
| 3892 | - $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : ''; |
|
| 3893 | - $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : ''; |
|
| 3886 | + $term_data = array(); |
|
| 3887 | + $term_data['name'] = $cat_name; |
|
| 3888 | + $term_data['slug'] = $cat_slug; |
|
| 3889 | + $term_data['description'] = $cat_description; |
|
| 3890 | + $term_data['cat_schema'] = $cat_schema; |
|
| 3891 | + $term_data['top_description'] = $cat_top_description; |
|
| 3892 | + $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : ''; |
|
| 3893 | + $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : ''; |
|
| 3894 | 3894 | |
| 3895 | - //$term_data = array_map( 'utf8_encode', $term_data ); |
|
| 3895 | + //$term_data = array_map( 'utf8_encode', $term_data ); |
|
| 3896 | 3896 | |
| 3897 | - $taxonomy = $cat_posttype . 'category'; |
|
| 3897 | + $taxonomy = $cat_posttype . 'category'; |
|
| 3898 | 3898 | |
| 3899 | - $term_data['taxonomy'] = $taxonomy; |
|
| 3899 | + $term_data['taxonomy'] = $taxonomy; |
|
| 3900 | 3900 | |
| 3901 | - $term_parent_id = 0; |
|
| 3902 | - if ($cat_parent != "" || (int)$cat_parent > 0) {
|
|
| 3903 | - $term_parent = ''; |
|
| 3901 | + $term_parent_id = 0; |
|
| 3902 | + if ($cat_parent != "" || (int)$cat_parent > 0) {
|
|
| 3903 | + $term_parent = ''; |
|
| 3904 | 3904 | |
| 3905 | - if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
|
|
| 3906 | - // |
|
| 3907 | - } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
|
|
| 3908 | - // |
|
| 3909 | - } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
|
|
| 3910 | - // |
|
| 3911 | - } else {
|
|
| 3912 | - $term_parent_data = array(); |
|
| 3913 | - $term_parent_data['name'] = $cat_parent; |
|
| 3914 | - //$term_parent_data = array_map( 'utf8_encode', $term_parent_data ); |
|
| 3915 | - $term_parent_data['taxonomy'] = $taxonomy; |
|
| 3905 | + if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
|
|
| 3906 | + // |
|
| 3907 | + } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
|
|
| 3908 | + // |
|
| 3909 | + } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
|
|
| 3910 | + // |
|
| 3911 | + } else {
|
|
| 3912 | + $term_parent_data = array(); |
|
| 3913 | + $term_parent_data['name'] = $cat_parent; |
|
| 3914 | + //$term_parent_data = array_map( 'utf8_encode', $term_parent_data ); |
|
| 3915 | + $term_parent_data['taxonomy'] = $taxonomy; |
|
| 3916 | 3916 | |
| 3917 | - $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data ); |
|
| 3918 | - } |
|
| 3917 | + $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data ); |
|
| 3918 | + } |
|
| 3919 | 3919 | |
| 3920 | - if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
|
|
| 3921 | - $term_parent_id = (int)$term_parent->term_id; |
|
| 3922 | - } |
|
| 3923 | - } |
|
| 3924 | - $term_data['parent'] = (int)$term_parent_id; |
|
| 3920 | + if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
|
|
| 3921 | + $term_parent_id = (int)$term_parent->term_id; |
|
| 3922 | + } |
|
| 3923 | + } |
|
| 3924 | + $term_data['parent'] = (int)$term_parent_id; |
|
| 3925 | 3925 | |
| 3926 | - $term_id = NULL; |
|
| 3927 | - if ( $import_choice == 'update' ) {
|
|
| 3928 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3929 | - $term_data['term_id'] = $term['term_id']; |
|
| 3926 | + $term_id = NULL; |
|
| 3927 | + if ( $import_choice == 'update' ) {
|
|
| 3928 | + if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3929 | + $term_data['term_id'] = $term['term_id']; |
|
| 3930 | 3930 | |
| 3931 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3932 | - $updated++; |
|
| 3933 | - } else {
|
|
| 3934 | - $invalid++; |
|
| 3935 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3936 | - } |
|
| 3937 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3938 | - $term_data['term_id'] = $term['term_id']; |
|
| 3931 | + if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3932 | + $updated++; |
|
| 3933 | + } else {
|
|
| 3934 | + $invalid++; |
|
| 3935 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3936 | + } |
|
| 3937 | + } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3938 | + $term_data['term_id'] = $term['term_id']; |
|
| 3939 | 3939 | |
| 3940 | - if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3941 | - $updated++; |
|
| 3942 | - } else {
|
|
| 3943 | - $invalid++; |
|
| 3944 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3945 | - } |
|
| 3946 | - } else {
|
|
| 3947 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3948 | - $created++; |
|
| 3949 | - } else {
|
|
| 3950 | - $invalid++; |
|
| 3951 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3952 | - } |
|
| 3953 | - } |
|
| 3954 | - } else if ( $import_choice == 'skip' ) {
|
|
| 3955 | - if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3956 | - $skipped++; |
|
| 3957 | - } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3958 | - $skipped++; |
|
| 3959 | - } else {
|
|
| 3960 | - if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3961 | - $created++; |
|
| 3962 | - } else {
|
|
| 3963 | - $invalid++; |
|
| 3964 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3965 | - } |
|
| 3966 | - } |
|
| 3967 | - } else {
|
|
| 3968 | - $invalid++; |
|
| 3969 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3970 | - } |
|
| 3940 | + if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
|
|
| 3941 | + $updated++; |
|
| 3942 | + } else {
|
|
| 3943 | + $invalid++; |
|
| 3944 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3945 | + } |
|
| 3946 | + } else {
|
|
| 3947 | + if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3948 | + $created++; |
|
| 3949 | + } else {
|
|
| 3950 | + $invalid++; |
|
| 3951 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3952 | + } |
|
| 3953 | + } |
|
| 3954 | + } else if ( $import_choice == 'skip' ) {
|
|
| 3955 | + if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
|
|
| 3956 | + $skipped++; |
|
| 3957 | + } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
|
| 3958 | + $skipped++; |
|
| 3959 | + } else {
|
|
| 3960 | + if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
|
|
| 3961 | + $created++; |
|
| 3962 | + } else {
|
|
| 3963 | + $invalid++; |
|
| 3964 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3965 | + } |
|
| 3966 | + } |
|
| 3967 | + } else {
|
|
| 3968 | + $invalid++; |
|
| 3969 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) ); |
|
| 3970 | + } |
|
| 3971 | 3971 | |
| 3972 | - if ( $term_id ) {
|
|
| 3973 | - // WPML |
|
| 3974 | - if ($is_wpml && geodir_wpml_is_taxonomy_translated($taxonomy) && $cat_id_original > 0 && $cat_language != '') {
|
|
| 3975 | - $wpml_element_type = 'tax_' . $taxonomy; |
|
| 3976 | - $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type ); |
|
| 3977 | - $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 3978 | - |
|
| 3979 | - $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type ); |
|
| 3972 | + if ( $term_id ) {
|
|
| 3973 | + // WPML |
|
| 3974 | + if ($is_wpml && geodir_wpml_is_taxonomy_translated($taxonomy) && $cat_id_original > 0 && $cat_language != '') {
|
|
| 3975 | + $wpml_element_type = 'tax_' . $taxonomy; |
|
| 3976 | + $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type ); |
|
| 3977 | + $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 3978 | + |
|
| 3979 | + $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type ); |
|
| 3980 | 3980 | |
| 3981 | - $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language ); |
|
| 3982 | - } |
|
| 3983 | - // WPML |
|
| 3981 | + $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language ); |
|
| 3982 | + } |
|
| 3983 | + // WPML |
|
| 3984 | 3984 | |
| 3985 | - if ( isset( $term_data['top_description'] ) ) {
|
|
| 3986 | - geodir_update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype ); |
|
| 3987 | - } |
|
| 3985 | + if ( isset( $term_data['top_description'] ) ) {
|
|
| 3986 | + geodir_update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype ); |
|
| 3987 | + } |
|
| 3988 | 3988 | |
| 3989 | - if ( isset( $term_data['cat_schema'] ) ) {
|
|
| 3990 | - geodir_update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype ); |
|
| 3991 | - } |
|
| 3989 | + if ( isset( $term_data['cat_schema'] ) ) {
|
|
| 3990 | + geodir_update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype ); |
|
| 3991 | + } |
|
| 3992 | 3992 | |
| 3993 | - $attachment = false; |
|
| 3994 | - if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {
|
|
| 3995 | - $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype ); |
|
| 3996 | - $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
| 3993 | + $attachment = false; |
|
| 3994 | + if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {
|
|
| 3995 | + $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype ); |
|
| 3996 | + $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; |
|
| 3997 | 3997 | |
| 3998 | - if ( basename($cat_image) != $term_data['image'] ) {
|
|
| 3999 | - $attachment = true; |
|
| 4000 | - geodir_update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype ); |
|
| 4001 | - } |
|
| 4002 | - } |
|
| 3998 | + if ( basename($cat_image) != $term_data['image'] ) {
|
|
| 3999 | + $attachment = true; |
|
| 4000 | + geodir_update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype ); |
|
| 4001 | + } |
|
| 4002 | + } |
|
| 4003 | 4003 | |
| 4004 | - if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {
|
|
| 4005 | - $cat_icon = geodir_get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype ); |
|
| 4006 | - $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
| 4007 | - |
|
| 4008 | - if ( basename($cat_icon) != $term_data['icon'] ) {
|
|
| 4009 | - $attachment = true; |
|
| 4010 | - geodir_update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype ); |
|
| 4011 | - } |
|
| 4012 | - } |
|
| 4004 | + if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {
|
|
| 4005 | + $cat_icon = geodir_get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype ); |
|
| 4006 | + $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : ''; |
|
| 4007 | + |
|
| 4008 | + if ( basename($cat_icon) != $term_data['icon'] ) {
|
|
| 4009 | + $attachment = true; |
|
| 4010 | + geodir_update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype ); |
|
| 4011 | + } |
|
| 4012 | + } |
|
| 4013 | 4013 | |
| 4014 | - if ( $attachment ) {
|
|
| 4015 | - $images++; |
|
| 4016 | - } |
|
| 4017 | - } |
|
| 4014 | + if ( $attachment ) {
|
|
| 4015 | + $images++; |
|
| 4016 | + } |
|
| 4017 | + } |
|
| 4018 | 4018 | |
| 4019 | - // WPML |
|
| 4020 | - if ($is_wpml && $cat_language != '') {
|
|
| 4021 | - $sitepress->switch_lang($active_lang, true); |
|
| 4022 | - } |
|
| 4023 | - // WPML |
|
| 4024 | - } |
|
| 4025 | - } |
|
| 4026 | - } |
|
| 4019 | + // WPML |
|
| 4020 | + if ($is_wpml && $cat_language != '') {
|
|
| 4021 | + $sitepress->switch_lang($active_lang, true); |
|
| 4022 | + } |
|
| 4023 | + // WPML |
|
| 4024 | + } |
|
| 4025 | + } |
|
| 4026 | + } |
|
| 4027 | 4027 | |
| 4028 | - $json = array(); |
|
| 4029 | - $json['processed'] = $limit; |
|
| 4030 | - $json['created'] = $created; |
|
| 4031 | - $json['updated'] = $updated; |
|
| 4032 | - $json['skipped'] = $skipped; |
|
| 4033 | - $json['invalid'] = $invalid; |
|
| 4034 | - $json['images'] = $images; |
|
| 4028 | + $json = array(); |
|
| 4029 | + $json['processed'] = $limit; |
|
| 4030 | + $json['created'] = $created; |
|
| 4031 | + $json['updated'] = $updated; |
|
| 4032 | + $json['skipped'] = $skipped; |
|
| 4033 | + $json['invalid'] = $invalid; |
|
| 4034 | + $json['images'] = $images; |
|
| 4035 | 4035 | |
| 4036 | - wp_send_json( $json ); |
|
| 4037 | - exit; |
|
| 4038 | - } else if ( $task == 'import_post' ) {
|
|
| 4039 | - $xtimings['###1'] = microtime(true)-$xstart; |
|
| 4040 | - //run some stuff to make the import quicker |
|
| 4041 | - wp_defer_term_counting( true ); |
|
| 4042 | - wp_defer_comment_counting( true ); |
|
| 4043 | - $wpdb->query( 'SET autocommit = 0;' ); |
|
| 4036 | + wp_send_json( $json ); |
|
| 4037 | + exit; |
|
| 4038 | + } else if ( $task == 'import_post' ) {
|
|
| 4039 | + $xtimings['###1'] = microtime(true)-$xstart; |
|
| 4040 | + //run some stuff to make the import quicker |
|
| 4041 | + wp_defer_term_counting( true ); |
|
| 4042 | + wp_defer_comment_counting( true ); |
|
| 4043 | + $wpdb->query( 'SET autocommit = 0;' ); |
|
| 4044 | 4044 | // |
| 4045 | 4045 | // remove_all_actions('publish_post');
|
| 4046 | 4046 | // remove_all_actions('transition_post_status');
|
| 4047 | 4047 | // remove_all_actions('publish_future_post');
|
| 4048 | 4048 | |
| 4049 | - if (!empty($file)) {
|
|
| 4050 | - $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 4051 | - $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
|
| 4052 | - $default_status = 'publish'; |
|
| 4053 | - $current_date = date_i18n( 'Y-m-d', time() ); |
|
| 4049 | + if (!empty($file)) {
|
|
| 4050 | + $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
|
|
| 4051 | + $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
|
| 4052 | + $default_status = 'publish'; |
|
| 4053 | + $current_date = date_i18n( 'Y-m-d', time() ); |
|
| 4054 | 4054 | |
| 4055 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4055 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4056 | 4056 | |
| 4057 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4058 | - $json['error'] = CSV_INVAILD_FILE; |
|
| 4059 | - wp_send_json( $json ); |
|
| 4060 | - exit; |
|
| 4061 | - } |
|
| 4062 | - $xtimings['###2'] = microtime(true)-$xstart; |
|
| 4063 | - $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
|
|
| 4064 | - $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' ); |
|
| 4065 | - $processed_actual = 0; |
|
| 4066 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 4067 | - $index = $processed + $i; |
|
| 4068 | - $gd_post = array(); |
|
| 4057 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4058 | + $json['error'] = CSV_INVAILD_FILE; |
|
| 4059 | + wp_send_json( $json ); |
|
| 4060 | + exit; |
|
| 4061 | + } |
|
| 4062 | + $xtimings['###2'] = microtime(true)-$xstart; |
|
| 4063 | + $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
|
|
| 4064 | + $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' ); |
|
| 4065 | + $processed_actual = 0; |
|
| 4066 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 4067 | + $index = $processed + $i; |
|
| 4068 | + $gd_post = array(); |
|
| 4069 | 4069 | |
| 4070 | - if (isset($file[$index])) {
|
|
| 4071 | - $processed_actual++; |
|
| 4072 | - $row = $file[$index]; |
|
| 4073 | - $row = array_map( 'trim', $row ); |
|
| 4074 | - //$row = array_map( 'utf8_encode', $row ); |
|
| 4075 | - $row = array_map( 'addslashes_gpc', $row ); |
|
| 4070 | + if (isset($file[$index])) {
|
|
| 4071 | + $processed_actual++; |
|
| 4072 | + $row = $file[$index]; |
|
| 4073 | + $row = array_map( 'trim', $row ); |
|
| 4074 | + //$row = array_map( 'utf8_encode', $row ); |
|
| 4075 | + $row = array_map( 'addslashes_gpc', $row ); |
|
| 4076 | 4076 | |
| 4077 | - $post_id = ''; |
|
| 4078 | - $post_title = ''; |
|
| 4079 | - $post_date = ''; |
|
| 4080 | - $post_author = ''; |
|
| 4081 | - $post_content = ''; |
|
| 4082 | - $post_category_arr = array(); |
|
| 4083 | - $default_category = ''; |
|
| 4084 | - $post_tags = array(); |
|
| 4085 | - $post_type = ''; |
|
| 4086 | - $post_status = ''; |
|
| 4087 | - $is_featured = 0; |
|
| 4088 | - $geodir_video = ''; |
|
| 4089 | - $post_address = ''; |
|
| 4090 | - $post_city = ''; |
|
| 4091 | - $post_region = ''; |
|
| 4092 | - $post_country = ''; |
|
| 4093 | - $post_zip = ''; |
|
| 4094 | - $post_latitude = ''; |
|
| 4095 | - $post_longitude = ''; |
|
| 4096 | - $post_neighbourhood = ''; |
|
| 4097 | - $neighbourhood_latitude = ''; |
|
| 4098 | - $neighbourhood_longitude = ''; |
|
| 4099 | - $geodir_timing = ''; |
|
| 4100 | - $geodir_contact = ''; |
|
| 4101 | - $geodir_email = ''; |
|
| 4102 | - $geodir_website = ''; |
|
| 4103 | - $geodir_twitter = ''; |
|
| 4104 | - $geodir_facebook = ''; |
|
| 4105 | - $geodir_twitter = ''; |
|
| 4106 | - $geodir_link_business = null; |
|
| 4107 | - $post_images = array(); |
|
| 4077 | + $post_id = ''; |
|
| 4078 | + $post_title = ''; |
|
| 4079 | + $post_date = ''; |
|
| 4080 | + $post_author = ''; |
|
| 4081 | + $post_content = ''; |
|
| 4082 | + $post_category_arr = array(); |
|
| 4083 | + $default_category = ''; |
|
| 4084 | + $post_tags = array(); |
|
| 4085 | + $post_type = ''; |
|
| 4086 | + $post_status = ''; |
|
| 4087 | + $is_featured = 0; |
|
| 4088 | + $geodir_video = ''; |
|
| 4089 | + $post_address = ''; |
|
| 4090 | + $post_city = ''; |
|
| 4091 | + $post_region = ''; |
|
| 4092 | + $post_country = ''; |
|
| 4093 | + $post_zip = ''; |
|
| 4094 | + $post_latitude = ''; |
|
| 4095 | + $post_longitude = ''; |
|
| 4096 | + $post_neighbourhood = ''; |
|
| 4097 | + $neighbourhood_latitude = ''; |
|
| 4098 | + $neighbourhood_longitude = ''; |
|
| 4099 | + $geodir_timing = ''; |
|
| 4100 | + $geodir_contact = ''; |
|
| 4101 | + $geodir_email = ''; |
|
| 4102 | + $geodir_website = ''; |
|
| 4103 | + $geodir_twitter = ''; |
|
| 4104 | + $geodir_facebook = ''; |
|
| 4105 | + $geodir_twitter = ''; |
|
| 4106 | + $geodir_link_business = null; |
|
| 4107 | + $post_images = array(); |
|
| 4108 | 4108 | |
| 4109 | - $expire_date = 'Never'; |
|
| 4109 | + $expire_date = 'Never'; |
|
| 4110 | 4110 | |
| 4111 | - $language = ''; |
|
| 4112 | - $original_post_id = ''; |
|
| 4111 | + $language = ''; |
|
| 4112 | + $original_post_id = ''; |
|
| 4113 | 4113 | |
| 4114 | - $c = 0; |
|
| 4115 | - foreach ($columns as $column ) {
|
|
| 4116 | - $gd_post[$column] = $row[$c]; |
|
| 4114 | + $c = 0; |
|
| 4115 | + foreach ($columns as $column ) {
|
|
| 4116 | + $gd_post[$column] = $row[$c]; |
|
| 4117 | 4117 | |
| 4118 | - if ( $column == 'post_id' ) {
|
|
| 4119 | - $post_id = $row[$c]; |
|
| 4120 | - } else if ( $column == 'post_title' ) {
|
|
| 4121 | - $post_title = sanitize_text_field($row[$c]); |
|
| 4122 | - } else if ( $column == 'post_author' ) {
|
|
| 4123 | - $post_author = $row[$c]; |
|
| 4124 | - } else if ( $column == 'post_date' ) {
|
|
| 4125 | - $post_date = $row[$c]; |
|
| 4126 | - } else if ( $column == 'post_content' ) {
|
|
| 4127 | - $post_content = $row[$c]; |
|
| 4128 | - } else if ( $column == 'post_category' && $row[$c] != '' ) {
|
|
| 4129 | - $post_category_arr = explode( ',', $row[$c] ); |
|
| 4130 | - } else if ( $column == 'default_category' ) {
|
|
| 4131 | - $default_category = wp_kses_normalize_entities($row[$c]); |
|
| 4132 | - } else if ( $column == 'post_tags' && $row[$c] != '' ) {
|
|
| 4133 | - $post_tags = explode( ',', sanitize_text_field($row[$c]) ); |
|
| 4134 | - } else if ( $column == 'post_type' ) {
|
|
| 4135 | - $post_type = $row[$c]; |
|
| 4136 | - } else if ( $column == 'post_status' ) {
|
|
| 4137 | - $post_status = sanitize_key( $row[$c] ); |
|
| 4138 | - } else if ( $column == 'is_featured' ) {
|
|
| 4139 | - $is_featured = (int)$row[$c]; |
|
| 4140 | - } else if ( $column == 'geodir_video' ) {
|
|
| 4141 | - $geodir_video = $row[$c]; |
|
| 4142 | - } else if ( $column == 'post_address' ) {
|
|
| 4143 | - $post_address = sanitize_text_field($row[$c]); |
|
| 4144 | - } else if ( $column == 'post_city' ) {
|
|
| 4145 | - $post_city = sanitize_text_field($row[$c]); |
|
| 4146 | - } else if ( $column == 'post_region' ) {
|
|
| 4147 | - $post_region = sanitize_text_field($row[$c]); |
|
| 4148 | - } else if ( $column == 'post_country' ) {
|
|
| 4149 | - $post_country = sanitize_text_field($row[$c]); |
|
| 4150 | - } else if ( $column == 'post_zip' ) {
|
|
| 4151 | - $post_zip = sanitize_text_field($row[$c]); |
|
| 4152 | - } else if ( $column == 'post_latitude' ) {
|
|
| 4153 | - $post_latitude = sanitize_text_field($row[$c]); |
|
| 4154 | - } else if ( $column == 'post_longitude' ) {
|
|
| 4155 | - $post_longitude = sanitize_text_field($row[$c]); |
|
| 4156 | - } else if ( $column == 'post_neighbourhood' ) {
|
|
| 4157 | - $post_neighbourhood = sanitize_text_field($row[$c]); |
|
| 4158 | - unset($gd_post[$column]); |
|
| 4159 | - } else if ( $column == 'neighbourhood_latitude' ) {
|
|
| 4160 | - $neighbourhood_latitude = sanitize_text_field($row[$c]); |
|
| 4161 | - } else if ( $column == 'neighbourhood_longitude' ) {
|
|
| 4162 | - $neighbourhood_longitude = sanitize_text_field($row[$c]); |
|
| 4163 | - } else if ( $column == 'geodir_timing' ) {
|
|
| 4164 | - $geodir_timing = sanitize_text_field($row[$c]); |
|
| 4165 | - } else if ( $column == 'geodir_contact' ) {
|
|
| 4166 | - $geodir_contact = sanitize_text_field($row[$c]); |
|
| 4167 | - } else if ( $column == 'geodir_email' ) {
|
|
| 4168 | - $geodir_email = sanitize_email($row[$c]); |
|
| 4169 | - } else if ( $column == 'geodir_website' ) {
|
|
| 4170 | - $geodir_website = sanitize_text_field($row[$c]); |
|
| 4171 | - } else if ( $column == 'geodir_twitter' ) {
|
|
| 4172 | - $geodir_twitter = sanitize_text_field($row[$c]); |
|
| 4173 | - } else if ( $column == 'geodir_facebook' ) {
|
|
| 4174 | - $geodir_facebook = sanitize_text_field($row[$c]); |
|
| 4175 | - } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
|
|
| 4176 | - $post_images[] = $row[$c]; |
|
| 4177 | - } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
|
|
| 4178 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) ); |
|
| 4179 | - } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
|
|
| 4180 | - $row[$c] = str_replace('/', '-', $row[$c]);
|
|
| 4181 | - $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) ); |
|
| 4182 | - } else if ( strpos( $column, 'linked_' ) === 0 ) {
|
|
| 4183 | - $geodir_link_business = (int)$row[$c]; |
|
| 4184 | - } |
|
| 4185 | - // WPML |
|
| 4186 | - if ($is_wpml) {
|
|
| 4187 | - if ($column == 'language') {
|
|
| 4188 | - $language = geodir_strtolower(trim($row[$c])); |
|
| 4189 | - } else if ($column == 'original_post_id') {
|
|
| 4190 | - $original_post_id = (int)$row[$c]; |
|
| 4191 | - } |
|
| 4192 | - } |
|
| 4193 | - // WPML |
|
| 4194 | - $c++; |
|
| 4195 | - } |
|
| 4196 | - // listing claimed or not |
|
| 4197 | - if ($is_claim_active && isset($gd_post['claimed'])) {
|
|
| 4198 | - $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4199 | - } |
|
| 4118 | + if ( $column == 'post_id' ) {
|
|
| 4119 | + $post_id = $row[$c]; |
|
| 4120 | + } else if ( $column == 'post_title' ) {
|
|
| 4121 | + $post_title = sanitize_text_field($row[$c]); |
|
| 4122 | + } else if ( $column == 'post_author' ) {
|
|
| 4123 | + $post_author = $row[$c]; |
|
| 4124 | + } else if ( $column == 'post_date' ) {
|
|
| 4125 | + $post_date = $row[$c]; |
|
| 4126 | + } else if ( $column == 'post_content' ) {
|
|
| 4127 | + $post_content = $row[$c]; |
|
| 4128 | + } else if ( $column == 'post_category' && $row[$c] != '' ) {
|
|
| 4129 | + $post_category_arr = explode( ',', $row[$c] ); |
|
| 4130 | + } else if ( $column == 'default_category' ) {
|
|
| 4131 | + $default_category = wp_kses_normalize_entities($row[$c]); |
|
| 4132 | + } else if ( $column == 'post_tags' && $row[$c] != '' ) {
|
|
| 4133 | + $post_tags = explode( ',', sanitize_text_field($row[$c]) ); |
|
| 4134 | + } else if ( $column == 'post_type' ) {
|
|
| 4135 | + $post_type = $row[$c]; |
|
| 4136 | + } else if ( $column == 'post_status' ) {
|
|
| 4137 | + $post_status = sanitize_key( $row[$c] ); |
|
| 4138 | + } else if ( $column == 'is_featured' ) {
|
|
| 4139 | + $is_featured = (int)$row[$c]; |
|
| 4140 | + } else if ( $column == 'geodir_video' ) {
|
|
| 4141 | + $geodir_video = $row[$c]; |
|
| 4142 | + } else if ( $column == 'post_address' ) {
|
|
| 4143 | + $post_address = sanitize_text_field($row[$c]); |
|
| 4144 | + } else if ( $column == 'post_city' ) {
|
|
| 4145 | + $post_city = sanitize_text_field($row[$c]); |
|
| 4146 | + } else if ( $column == 'post_region' ) {
|
|
| 4147 | + $post_region = sanitize_text_field($row[$c]); |
|
| 4148 | + } else if ( $column == 'post_country' ) {
|
|
| 4149 | + $post_country = sanitize_text_field($row[$c]); |
|
| 4150 | + } else if ( $column == 'post_zip' ) {
|
|
| 4151 | + $post_zip = sanitize_text_field($row[$c]); |
|
| 4152 | + } else if ( $column == 'post_latitude' ) {
|
|
| 4153 | + $post_latitude = sanitize_text_field($row[$c]); |
|
| 4154 | + } else if ( $column == 'post_longitude' ) {
|
|
| 4155 | + $post_longitude = sanitize_text_field($row[$c]); |
|
| 4156 | + } else if ( $column == 'post_neighbourhood' ) {
|
|
| 4157 | + $post_neighbourhood = sanitize_text_field($row[$c]); |
|
| 4158 | + unset($gd_post[$column]); |
|
| 4159 | + } else if ( $column == 'neighbourhood_latitude' ) {
|
|
| 4160 | + $neighbourhood_latitude = sanitize_text_field($row[$c]); |
|
| 4161 | + } else if ( $column == 'neighbourhood_longitude' ) {
|
|
| 4162 | + $neighbourhood_longitude = sanitize_text_field($row[$c]); |
|
| 4163 | + } else if ( $column == 'geodir_timing' ) {
|
|
| 4164 | + $geodir_timing = sanitize_text_field($row[$c]); |
|
| 4165 | + } else if ( $column == 'geodir_contact' ) {
|
|
| 4166 | + $geodir_contact = sanitize_text_field($row[$c]); |
|
| 4167 | + } else if ( $column == 'geodir_email' ) {
|
|
| 4168 | + $geodir_email = sanitize_email($row[$c]); |
|
| 4169 | + } else if ( $column == 'geodir_website' ) {
|
|
| 4170 | + $geodir_website = sanitize_text_field($row[$c]); |
|
| 4171 | + } else if ( $column == 'geodir_twitter' ) {
|
|
| 4172 | + $geodir_twitter = sanitize_text_field($row[$c]); |
|
| 4173 | + } else if ( $column == 'geodir_facebook' ) {
|
|
| 4174 | + $geodir_facebook = sanitize_text_field($row[$c]); |
|
| 4175 | + } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
|
|
| 4176 | + $post_images[] = $row[$c]; |
|
| 4177 | + } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
|
|
| 4178 | + $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) ); |
|
| 4179 | + } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
|
|
| 4180 | + $row[$c] = str_replace('/', '-', $row[$c]);
|
|
| 4181 | + $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) ); |
|
| 4182 | + } else if ( strpos( $column, 'linked_' ) === 0 ) {
|
|
| 4183 | + $geodir_link_business = (int)$row[$c]; |
|
| 4184 | + } |
|
| 4185 | + // WPML |
|
| 4186 | + if ($is_wpml) {
|
|
| 4187 | + if ($column == 'language') {
|
|
| 4188 | + $language = geodir_strtolower(trim($row[$c])); |
|
| 4189 | + } else if ($column == 'original_post_id') {
|
|
| 4190 | + $original_post_id = (int)$row[$c]; |
|
| 4191 | + } |
|
| 4192 | + } |
|
| 4193 | + // WPML |
|
| 4194 | + $c++; |
|
| 4195 | + } |
|
| 4196 | + // listing claimed or not |
|
| 4197 | + if ($is_claim_active && isset($gd_post['claimed'])) {
|
|
| 4198 | + $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0; |
|
| 4199 | + } |
|
| 4200 | 4200 | |
| 4201 | - // WPML |
|
| 4202 | - if ($is_wpml && $language != '') {
|
|
| 4203 | - $sitepress->switch_lang($language, true); |
|
| 4204 | - } |
|
| 4205 | - // WPML |
|
| 4201 | + // WPML |
|
| 4202 | + if ($is_wpml && $language != '') {
|
|
| 4203 | + $sitepress->switch_lang($language, true); |
|
| 4204 | + } |
|
| 4205 | + // WPML |
|
| 4206 | 4206 | |
| 4207 | - $gd_post['IMAGE'] = $post_images; |
|
| 4207 | + $gd_post['IMAGE'] = $post_images; |
|
| 4208 | 4208 | |
| 4209 | - $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 4210 | - $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 4209 | + $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 4210 | + $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 4211 | 4211 | |
| 4212 | - $valid = true; |
|
| 4212 | + $valid = true; |
|
| 4213 | 4213 | |
| 4214 | - if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
|
|
| 4215 | - $invalid++; |
|
| 4216 | - $valid = false; |
|
| 4217 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 4218 | - } |
|
| 4219 | - $xtimings['###3'] = microtime(true)-$xstart; |
|
| 4220 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 4221 | - if ( $location_allowed ) {
|
|
| 4222 | - $location_result = geodir_get_default_location(); |
|
| 4223 | - if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
|
|
| 4224 | - $invalid_addr++; |
|
| 4225 | - $valid = false; |
|
| 4226 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4227 | - } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
|
|
| 4228 | - if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {
|
|
| 4229 | - $invalid_addr++; |
|
| 4230 | - $valid = false; |
|
| 4231 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4232 | - } else {
|
|
| 4233 | - if (!$location_manager) {
|
|
| 4234 | - $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated. |
|
| 4235 | - } |
|
| 4236 | - } |
|
| 4237 | - } |
|
| 4238 | - } |
|
| 4239 | - $xtimings['###4'] = microtime(true)-$xstart; |
|
| 4240 | - if ( !$valid ) {
|
|
| 4241 | - continue; |
|
| 4242 | - } |
|
| 4214 | + if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
|
|
| 4215 | + $invalid++; |
|
| 4216 | + $valid = false; |
|
| 4217 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) ); |
|
| 4218 | + } |
|
| 4219 | + $xtimings['###3'] = microtime(true)-$xstart; |
|
| 4220 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 4221 | + if ( $location_allowed ) {
|
|
| 4222 | + $location_result = geodir_get_default_location(); |
|
| 4223 | + if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
|
|
| 4224 | + $invalid_addr++; |
|
| 4225 | + $valid = false; |
|
| 4226 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4227 | + } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
|
|
| 4228 | + if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {
|
|
| 4229 | + $invalid_addr++; |
|
| 4230 | + $valid = false; |
|
| 4231 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) ); |
|
| 4232 | + } else {
|
|
| 4233 | + if (!$location_manager) {
|
|
| 4234 | + $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated. |
|
| 4235 | + } |
|
| 4236 | + } |
|
| 4237 | + } |
|
| 4238 | + } |
|
| 4239 | + $xtimings['###4'] = microtime(true)-$xstart; |
|
| 4240 | + if ( !$valid ) {
|
|
| 4241 | + continue; |
|
| 4242 | + } |
|
| 4243 | 4243 | |
| 4244 | - $cat_taxonomy = $post_type . 'category'; |
|
| 4245 | - $tags_taxonomy = $post_type . '_tags'; |
|
| 4244 | + $cat_taxonomy = $post_type . 'category'; |
|
| 4245 | + $tags_taxonomy = $post_type . '_tags'; |
|
| 4246 | 4246 | |
| 4247 | - if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
|
|
| 4248 | - $post_category_arr = array_merge(array($default_category), $post_category_arr); |
|
| 4249 | - } |
|
| 4247 | + if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
|
|
| 4248 | + $post_category_arr = array_merge(array($default_category), $post_category_arr); |
|
| 4249 | + } |
|
| 4250 | 4250 | |
| 4251 | - $post_category = array(); |
|
| 4252 | - $default_category_id = NULL; |
|
| 4253 | - if ( !empty( $post_category_arr ) ) {
|
|
| 4254 | - foreach ( $post_category_arr as $value ) {
|
|
| 4255 | - $category_name = wp_kses_normalize_entities( trim( $value ) ); |
|
| 4251 | + $post_category = array(); |
|
| 4252 | + $default_category_id = NULL; |
|
| 4253 | + if ( !empty( $post_category_arr ) ) {
|
|
| 4254 | + foreach ( $post_category_arr as $value ) {
|
|
| 4255 | + $category_name = wp_kses_normalize_entities( trim( $value ) ); |
|
| 4256 | 4256 | |
| 4257 | - if ( $category_name != '' ) {
|
|
| 4258 | - $term_category = array(); |
|
| 4257 | + if ( $category_name != '' ) {
|
|
| 4258 | + $term_category = array(); |
|
| 4259 | 4259 | |
| 4260 | - if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
|
|
| 4261 | - $term_category = $term; |
|
| 4262 | - } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
|
|
| 4263 | - $term_category = $term; |
|
| 4264 | - } else {
|
|
| 4265 | - $term_data = array(); |
|
| 4266 | - $term_data['name'] = $category_name; |
|
| 4267 | - $term_data['taxonomy'] = $cat_taxonomy; |
|
| 4260 | + if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
|
|
| 4261 | + $term_category = $term; |
|
| 4262 | + } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
|
|
| 4263 | + $term_category = $term; |
|
| 4264 | + } else {
|
|
| 4265 | + $term_data = array(); |
|
| 4266 | + $term_data['name'] = $category_name; |
|
| 4267 | + $term_data['taxonomy'] = $cat_taxonomy; |
|
| 4268 | 4268 | |
| 4269 | - $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data ); |
|
| 4270 | - if ( $term_id ) {
|
|
| 4271 | - $term_category = get_term( $term_id, $cat_taxonomy ); |
|
| 4272 | - } |
|
| 4273 | - } |
|
| 4269 | + $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data ); |
|
| 4270 | + if ( $term_id ) {
|
|
| 4271 | + $term_category = get_term( $term_id, $cat_taxonomy ); |
|
| 4272 | + } |
|
| 4273 | + } |
|
| 4274 | 4274 | |
| 4275 | - if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
|
|
| 4276 | - $post_category[] = intval($term_category->term_id); |
|
| 4275 | + if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
|
|
| 4276 | + $post_category[] = intval($term_category->term_id); |
|
| 4277 | 4277 | |
| 4278 | - if ($category_name == $default_category) {
|
|
| 4279 | - $default_category_id = intval($term_category->term_id); |
|
| 4280 | - } |
|
| 4281 | - } |
|
| 4282 | - } |
|
| 4283 | - } |
|
| 4284 | - } |
|
| 4285 | - $xtimings['###5'] = microtime(true)-$xstart; |
|
| 4286 | - $save_post = array(); |
|
| 4287 | - $save_post['post_title'] = $post_title; |
|
| 4288 | - if (!empty($post_date)) {
|
|
| 4289 | - $post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format. |
|
| 4278 | + if ($category_name == $default_category) {
|
|
| 4279 | + $default_category_id = intval($term_category->term_id); |
|
| 4280 | + } |
|
| 4281 | + } |
|
| 4282 | + } |
|
| 4283 | + } |
|
| 4284 | + } |
|
| 4285 | + $xtimings['###5'] = microtime(true)-$xstart; |
|
| 4286 | + $save_post = array(); |
|
| 4287 | + $save_post['post_title'] = $post_title; |
|
| 4288 | + if (!empty($post_date)) {
|
|
| 4289 | + $post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format. |
|
| 4290 | 4290 | |
| 4291 | - $save_post['post_date'] = $post_date; |
|
| 4292 | - $save_post['post_date_gmt'] = get_gmt_from_date( $post_date ); |
|
| 4293 | - } |
|
| 4294 | - $save_post['post_content'] = $post_content; |
|
| 4295 | - $save_post['post_type'] = $post_type; |
|
| 4296 | - $save_post['post_author'] = $post_author; |
|
| 4297 | - $save_post['post_status'] = $post_status; |
|
| 4298 | - $save_post['post_category'] = $post_category; |
|
| 4299 | - $save_post['post_tags'] = $post_tags; |
|
| 4300 | - |
|
| 4301 | - $saved_post_id = NULL; |
|
| 4302 | - if ( $import_choice == 'update' ) {
|
|
| 4303 | - $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' ); |
|
| 4291 | + $save_post['post_date'] = $post_date; |
|
| 4292 | + $save_post['post_date_gmt'] = get_gmt_from_date( $post_date ); |
|
| 4293 | + } |
|
| 4294 | + $save_post['post_content'] = $post_content; |
|
| 4295 | + $save_post['post_type'] = $post_type; |
|
| 4296 | + $save_post['post_author'] = $post_author; |
|
| 4297 | + $save_post['post_status'] = $post_status; |
|
| 4298 | + $save_post['post_category'] = $post_category; |
|
| 4299 | + $save_post['post_tags'] = $post_tags; |
|
| 4300 | + |
|
| 4301 | + $saved_post_id = NULL; |
|
| 4302 | + if ( $import_choice == 'update' ) {
|
|
| 4303 | + $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' ); |
|
| 4304 | 4304 | |
| 4305 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4306 | - $save_post['ID'] = $post_id; |
|
| 4305 | + if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4306 | + $save_post['ID'] = $post_id; |
|
| 4307 | 4307 | |
| 4308 | - if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
|
|
| 4309 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4310 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4311 | - $saved_post_id = 0; |
|
| 4312 | - } else {
|
|
| 4313 | - $saved_post_id = $post_id; |
|
| 4314 | - $updated++; |
|
| 4315 | - } |
|
| 4316 | - } |
|
| 4317 | - } else {
|
|
| 4318 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4319 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4320 | - $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4321 | - $saved_post_id = 0; |
|
| 4322 | - } else {
|
|
| 4323 | - $created++; |
|
| 4324 | - } |
|
| 4325 | - } |
|
| 4326 | - } |
|
| 4308 | + if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
|
|
| 4309 | + if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4310 | + $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4311 | + $saved_post_id = 0; |
|
| 4312 | + } else {
|
|
| 4313 | + $saved_post_id = $post_id; |
|
| 4314 | + $updated++; |
|
| 4315 | + } |
|
| 4316 | + } |
|
| 4317 | + } else {
|
|
| 4318 | + if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4319 | + if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4320 | + $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error; |
|
| 4321 | + $saved_post_id = 0; |
|
| 4322 | + } else {
|
|
| 4323 | + $created++; |
|
| 4324 | + } |
|
| 4325 | + } |
|
| 4326 | + } |
|
| 4327 | 4327 | |
| 4328 | - if ( !$saved_post_id > 0 ) {
|
|
| 4329 | - $invalid++; |
|
| 4330 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error ); |
|
| 4331 | - } |
|
| 4332 | - } else if ( $import_choice == 'skip' ) {
|
|
| 4333 | - if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4334 | - $skipped++; |
|
| 4335 | - } else {
|
|
| 4336 | - if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4337 | - if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4338 | - $invalid++; |
|
| 4328 | + if ( !$saved_post_id > 0 ) {
|
|
| 4329 | + $invalid++; |
|
| 4330 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error ); |
|
| 4331 | + } |
|
| 4332 | + } else if ( $import_choice == 'skip' ) {
|
|
| 4333 | + if ( $post_id > 0 && get_post( $post_id ) ) {
|
|
| 4334 | + $skipped++; |
|
| 4335 | + } else {
|
|
| 4336 | + if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
|
|
| 4337 | + if ( is_wp_error( $saved_post_id ) ) {
|
|
| 4338 | + $invalid++; |
|
| 4339 | 4339 | |
| 4340 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error ); |
|
| 4341 | - $saved_post_id = 0; |
|
| 4342 | - } else {
|
|
| 4343 | - $created++; |
|
| 4344 | - } |
|
| 4345 | - } else {
|
|
| 4346 | - $invalid++; |
|
| 4340 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error ); |
|
| 4341 | + $saved_post_id = 0; |
|
| 4342 | + } else {
|
|
| 4343 | + $created++; |
|
| 4344 | + } |
|
| 4345 | + } else {
|
|
| 4346 | + $invalid++; |
|
| 4347 | 4347 | |
| 4348 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4349 | - } |
|
| 4350 | - } |
|
| 4351 | - } else {
|
|
| 4352 | - $invalid++; |
|
| 4348 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4349 | + } |
|
| 4350 | + } |
|
| 4351 | + } else {
|
|
| 4352 | + $invalid++; |
|
| 4353 | 4353 | |
| 4354 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4355 | - } |
|
| 4356 | - $xtimings['###6'] = microtime(true)-$xstart; |
|
| 4357 | - if ( (int)$saved_post_id > 0 ) {
|
|
| 4358 | - // WPML |
|
| 4359 | - if ($is_wpml && geodir_wpml_is_post_type_translated($post_type) && $original_post_id > 0 && $language != '') {
|
|
| 4360 | - $wpml_post_type = 'post_' . $post_type; |
|
| 4361 | - $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type ); |
|
| 4362 | - $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 4363 | - |
|
| 4364 | - $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type ); |
|
| 4354 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error ); |
|
| 4355 | + } |
|
| 4356 | + $xtimings['###6'] = microtime(true)-$xstart; |
|
| 4357 | + if ( (int)$saved_post_id > 0 ) {
|
|
| 4358 | + // WPML |
|
| 4359 | + if ($is_wpml && geodir_wpml_is_post_type_translated($post_type) && $original_post_id > 0 && $language != '') {
|
|
| 4360 | + $wpml_post_type = 'post_' . $post_type; |
|
| 4361 | + $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type ); |
|
| 4362 | + $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language(); |
|
| 4363 | + |
|
| 4364 | + $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type ); |
|
| 4365 | 4365 | |
| 4366 | - $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language ); |
|
| 4367 | - } |
|
| 4368 | - // WPML |
|
| 4369 | - $gd_post_info = geodir_get_post_info( $saved_post_id ); |
|
| 4366 | + $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language ); |
|
| 4367 | + } |
|
| 4368 | + // WPML |
|
| 4369 | + $gd_post_info = geodir_get_post_info( $saved_post_id ); |
|
| 4370 | 4370 | |
| 4371 | - $gd_post['post_id'] = $saved_post_id; |
|
| 4372 | - $gd_post['ID'] = $saved_post_id; |
|
| 4373 | - $gd_post['post_tags'] = $post_tags; |
|
| 4374 | - $gd_post['post_title'] = $post_title; |
|
| 4375 | - $gd_post['post_status'] = $post_status; |
|
| 4376 | - $gd_post['submit_time'] = time(); |
|
| 4377 | - $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
| 4371 | + $gd_post['post_id'] = $saved_post_id; |
|
| 4372 | + $gd_post['ID'] = $saved_post_id; |
|
| 4373 | + $gd_post['post_tags'] = $post_tags; |
|
| 4374 | + $gd_post['post_title'] = $post_title; |
|
| 4375 | + $gd_post['post_status'] = $post_status; |
|
| 4376 | + $gd_post['submit_time'] = time(); |
|
| 4377 | + $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
| 4378 | 4378 | |
| 4379 | - // post location |
|
| 4380 | - $post_location_id = 0; |
|
| 4381 | - if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
|
|
| 4382 | - $gd_post['post_neighbourhood'] = ''; |
|
| 4379 | + // post location |
|
| 4380 | + $post_location_id = 0; |
|
| 4381 | + if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
|
|
| 4382 | + $gd_post['post_neighbourhood'] = ''; |
|
| 4383 | 4383 | |
| 4384 | - $post_location_info = array( |
|
| 4385 | - 'city' => $post_city, |
|
| 4386 | - 'region' => $post_region, |
|
| 4387 | - 'country' => $post_country, |
|
| 4388 | - 'geo_lat' => $post_latitude, |
|
| 4389 | - 'geo_lng' => $post_longitude |
|
| 4390 | - ); |
|
| 4391 | - if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
|
|
| 4392 | - $post_location_id = $location_id; |
|
| 4393 | - } |
|
| 4384 | + $post_location_info = array( |
|
| 4385 | + 'city' => $post_city, |
|
| 4386 | + 'region' => $post_region, |
|
| 4387 | + 'country' => $post_country, |
|
| 4388 | + 'geo_lat' => $post_latitude, |
|
| 4389 | + 'geo_lng' => $post_longitude |
|
| 4390 | + ); |
|
| 4391 | + if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
|
|
| 4392 | + $post_location_id = $location_id; |
|
| 4393 | + } |
|
| 4394 | 4394 | |
| 4395 | - if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {
|
|
| 4396 | - $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id); |
|
| 4395 | + if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {
|
|
| 4396 | + $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id); |
|
| 4397 | 4397 | |
| 4398 | - $hood_data = array(); |
|
| 4399 | - $hood_data['hood_location_id'] = $post_location_id; |
|
| 4400 | - $hood_data['hood_name'] = $post_neighbourhood; |
|
| 4398 | + $hood_data = array(); |
|
| 4399 | + $hood_data['hood_location_id'] = $post_location_id; |
|
| 4400 | + $hood_data['hood_name'] = $post_neighbourhood; |
|
| 4401 | 4401 | |
| 4402 | - if (!empty($neighbourhood_info)) {
|
|
| 4403 | - $hood_data['hood_id'] = $neighbourhood_info->hood_id; |
|
| 4404 | - $hood_data['hood_slug'] = $neighbourhood_info->hood_slug; |
|
| 4402 | + if (!empty($neighbourhood_info)) {
|
|
| 4403 | + $hood_data['hood_id'] = $neighbourhood_info->hood_id; |
|
| 4404 | + $hood_data['hood_slug'] = $neighbourhood_info->hood_slug; |
|
| 4405 | 4405 | |
| 4406 | - if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4407 | - $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4408 | - $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4409 | - } |
|
| 4410 | - } |
|
| 4406 | + if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4407 | + $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4408 | + $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4409 | + } |
|
| 4410 | + } |
|
| 4411 | 4411 | |
| 4412 | - if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4413 | - $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4414 | - $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4415 | - } |
|
| 4412 | + if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
|
|
| 4413 | + $neighbourhood_latitude = $neighbourhood_info->hood_latitude; |
|
| 4414 | + $neighbourhood_longitude = $neighbourhood_info->hood_longitude; |
|
| 4415 | + } |
|
| 4416 | 4416 | |
| 4417 | - $hood_data['hood_latitude'] = $post_latitude; |
|
| 4418 | - $hood_data['hood_longitude'] = $post_longitude; |
|
| 4419 | - |
|
| 4420 | - $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data); |
|
| 4421 | - if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {
|
|
| 4422 | - $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug; |
|
| 4423 | - } |
|
| 4424 | - } |
|
| 4425 | - } |
|
| 4426 | - $gd_post['post_location_id'] = $post_location_id; |
|
| 4417 | + $hood_data['hood_latitude'] = $post_latitude; |
|
| 4418 | + $hood_data['hood_longitude'] = $post_longitude; |
|
| 4419 | + |
|
| 4420 | + $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data); |
|
| 4421 | + if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {
|
|
| 4422 | + $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug; |
|
| 4423 | + } |
|
| 4424 | + } |
|
| 4425 | + } |
|
| 4426 | + $gd_post['post_location_id'] = $post_location_id; |
|
| 4427 | 4427 | |
| 4428 | - if ($geodir_link_business !== null) {
|
|
| 4429 | - $gd_post['geodir_link_business'] = $geodir_link_business > 0 ? $geodir_link_business : ''; |
|
| 4430 | - } |
|
| 4428 | + if ($geodir_link_business !== null) {
|
|
| 4429 | + $gd_post['geodir_link_business'] = $geodir_link_business > 0 ? $geodir_link_business : ''; |
|
| 4430 | + } |
|
| 4431 | 4431 | |
| 4432 | - // post package info |
|
| 4433 | - $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0; |
|
| 4434 | - if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
|
|
| 4435 | - $package_id = $gd_post_info->package_id; |
|
| 4436 | - } |
|
| 4432 | + // post package info |
|
| 4433 | + $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0; |
|
| 4434 | + if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
|
|
| 4435 | + $package_id = $gd_post_info->package_id; |
|
| 4436 | + } |
|
| 4437 | 4437 | |
| 4438 | - $package_info = array(); |
|
| 4439 | - if ($package_id && function_exists('geodir_get_package_info_by_id')) {
|
|
| 4440 | - $package_info = (array)geodir_get_package_info_by_id($package_id); |
|
| 4438 | + $package_info = array(); |
|
| 4439 | + if ($package_id && function_exists('geodir_get_package_info_by_id')) {
|
|
| 4440 | + $package_info = (array)geodir_get_package_info_by_id($package_id); |
|
| 4441 | 4441 | |
| 4442 | - if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
|
|
| 4443 | - $package_info = array(); |
|
| 4444 | - } |
|
| 4445 | - } |
|
| 4442 | + if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
|
|
| 4443 | + $package_info = array(); |
|
| 4444 | + } |
|
| 4445 | + } |
|
| 4446 | 4446 | |
| 4447 | - if (empty($package_info)) {
|
|
| 4448 | - $package_info = (array)geodir_post_package_info( array(), '', $post_type ); |
|
| 4449 | - } |
|
| 4447 | + if (empty($package_info)) {
|
|
| 4448 | + $package_info = (array)geodir_post_package_info( array(), '', $post_type ); |
|
| 4449 | + } |
|
| 4450 | 4450 | |
| 4451 | - if (!empty($package_info)) {
|
|
| 4452 | - $package_id = $package_info['pid']; |
|
| 4451 | + if (!empty($package_info)) {
|
|
| 4452 | + $package_id = $package_info['pid']; |
|
| 4453 | 4453 | |
| 4454 | - if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
|
|
| 4455 | - $gd_post['expire_date'] = $expire_date; |
|
| 4456 | - } else {
|
|
| 4457 | - if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
|
|
| 4458 | - $gd_post['alive_days'] = (int)$package_info['days']; |
|
| 4459 | - $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) ); |
|
| 4460 | - } else {
|
|
| 4461 | - $gd_post['expire_date'] = 'Never'; |
|
| 4462 | - } |
|
| 4463 | - } |
|
| 4454 | + if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
|
|
| 4455 | + $gd_post['expire_date'] = $expire_date; |
|
| 4456 | + } else {
|
|
| 4457 | + if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
|
|
| 4458 | + $gd_post['alive_days'] = (int)$package_info['days']; |
|
| 4459 | + $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) ); |
|
| 4460 | + } else {
|
|
| 4461 | + $gd_post['expire_date'] = 'Never'; |
|
| 4462 | + } |
|
| 4463 | + } |
|
| 4464 | 4464 | |
| 4465 | - $gd_post['package_id'] = $package_id; |
|
| 4466 | - } |
|
| 4465 | + $gd_post['package_id'] = $package_id; |
|
| 4466 | + } |
|
| 4467 | 4467 | |
| 4468 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 4468 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 4469 | 4469 | |
| 4470 | - if ($post_type == 'gd_event') {
|
|
| 4471 | - $gd_post = geodir_imex_process_event_data($gd_post); |
|
| 4472 | - } |
|
| 4470 | + if ($post_type == 'gd_event') {
|
|
| 4471 | + $gd_post = geodir_imex_process_event_data($gd_post); |
|
| 4472 | + } |
|
| 4473 | 4473 | |
| 4474 | - if (isset($gd_post['post_id'])) {
|
|
| 4475 | - unset($gd_post['post_id']); |
|
| 4476 | - } |
|
| 4474 | + if (isset($gd_post['post_id'])) {
|
|
| 4475 | + unset($gd_post['post_id']); |
|
| 4476 | + } |
|
| 4477 | 4477 | |
| 4478 | - // Export franchise fields |
|
| 4479 | - $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 4480 | - if ($is_franchise_active) {
|
|
| 4481 | - if ( isset( $gd_post['gd_is_franchise'] ) && empty( $gd_post['franchise'] ) ) {
|
|
| 4482 | - if ( absint( $gd_post['gd_is_franchise'] ) != 0 ) {
|
|
| 4483 | - $gd_franchise_lock = array(); |
|
| 4478 | + // Export franchise fields |
|
| 4479 | + $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false; |
|
| 4480 | + if ($is_franchise_active) {
|
|
| 4481 | + if ( isset( $gd_post['gd_is_franchise'] ) && empty( $gd_post['franchise'] ) ) {
|
|
| 4482 | + if ( absint( $gd_post['gd_is_franchise'] ) != 0 ) {
|
|
| 4483 | + $gd_franchise_lock = array(); |
|
| 4484 | 4484 | |
| 4485 | - if ( isset( $gd_post['gd_franchise_lock'] ) ) {
|
|
| 4486 | - $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
|
|
| 4487 | - $gd_franchise_lock = trim( $gd_franchise_lock ); |
|
| 4488 | - $gd_franchise_lock = explode( ",", $gd_franchise_lock ); |
|
| 4489 | - } |
|
| 4485 | + if ( isset( $gd_post['gd_franchise_lock'] ) ) {
|
|
| 4486 | + $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
|
|
| 4487 | + $gd_franchise_lock = trim( $gd_franchise_lock ); |
|
| 4488 | + $gd_franchise_lock = explode( ",", $gd_franchise_lock ); |
|
| 4489 | + } |
|
| 4490 | 4490 | |
| 4491 | - update_post_meta( $saved_post_id, 'gd_is_franchise', 1 ); |
|
| 4492 | - update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock ); |
|
| 4493 | - } else {
|
|
| 4494 | - if ( function_exists( 'geodir_franchise_remove_franchise' ) ) {
|
|
| 4495 | - geodir_franchise_remove_franchise( $saved_post_id ); |
|
| 4496 | - } |
|
| 4497 | - } |
|
| 4498 | - } else {
|
|
| 4499 | - if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
|
|
| 4500 | - geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] ); |
|
| 4501 | - } |
|
| 4502 | - } |
|
| 4503 | - } |
|
| 4491 | + update_post_meta( $saved_post_id, 'gd_is_franchise', 1 ); |
|
| 4492 | + update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock ); |
|
| 4493 | + } else {
|
|
| 4494 | + if ( function_exists( 'geodir_franchise_remove_franchise' ) ) {
|
|
| 4495 | + geodir_franchise_remove_franchise( $saved_post_id ); |
|
| 4496 | + } |
|
| 4497 | + } |
|
| 4498 | + } else {
|
|
| 4499 | + if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
|
|
| 4500 | + geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] ); |
|
| 4501 | + } |
|
| 4502 | + } |
|
| 4503 | + } |
|
| 4504 | 4504 | |
| 4505 | - if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
|
|
| 4506 | - $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) ); |
|
| 4507 | - if ($default_category_id) {
|
|
| 4508 | - $save_post['post_default_category'] = $default_category_id; |
|
| 4509 | - $gd_post['default_category'] = $default_category_id; |
|
| 4510 | - } |
|
| 4511 | - $gd_post[$cat_taxonomy] = $save_post['post_category']; |
|
| 4512 | - } |
|
| 4513 | - $xtimings['###7'] = microtime(true)-$xstart; |
|
| 4514 | - // Save post info |
|
| 4515 | - geodir_save_post_info( $saved_post_id, $gd_post ); |
|
| 4516 | - $xtimings['###8'] = microtime(true)-$xstart; |
|
| 4517 | - // post taxonomies |
|
| 4518 | - if ( !empty( $save_post['post_category'] ) ) {
|
|
| 4519 | - wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy ); |
|
| 4505 | + if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
|
|
| 4506 | + $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) ); |
|
| 4507 | + if ($default_category_id) {
|
|
| 4508 | + $save_post['post_default_category'] = $default_category_id; |
|
| 4509 | + $gd_post['default_category'] = $default_category_id; |
|
| 4510 | + } |
|
| 4511 | + $gd_post[$cat_taxonomy] = $save_post['post_category']; |
|
| 4512 | + } |
|
| 4513 | + $xtimings['###7'] = microtime(true)-$xstart; |
|
| 4514 | + // Save post info |
|
| 4515 | + geodir_save_post_info( $saved_post_id, $gd_post ); |
|
| 4516 | + $xtimings['###8'] = microtime(true)-$xstart; |
|
| 4517 | + // post taxonomies |
|
| 4518 | + if ( !empty( $save_post['post_category'] ) ) {
|
|
| 4519 | + wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy ); |
|
| 4520 | 4520 | |
| 4521 | - $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : ''; |
|
| 4522 | - if ($default_category_id) {
|
|
| 4523 | - $post_default_category = $default_category_id; |
|
| 4524 | - } |
|
| 4525 | - $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy); |
|
| 4526 | - $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
|
|
| 4527 | - $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
|
|
| 4521 | + $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : ''; |
|
| 4522 | + if ($default_category_id) {
|
|
| 4523 | + $post_default_category = $default_category_id; |
|
| 4524 | + } |
|
| 4525 | + $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy); |
|
| 4526 | + $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
|
|
| 4527 | + $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
|
|
| 4528 | 4528 | |
| 4529 | - if ($post_category_str != '' && $post_default_category) {
|
|
| 4530 | - $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str); |
|
| 4531 | - } |
|
| 4529 | + if ($post_category_str != '' && $post_default_category) {
|
|
| 4530 | + $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str); |
|
| 4531 | + } |
|
| 4532 | 4532 | |
| 4533 | - $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : ''; |
|
| 4533 | + $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : ''; |
|
| 4534 | 4534 | |
| 4535 | - geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str ); |
|
| 4536 | - } |
|
| 4537 | - $xtimings['###8.1'] = microtime(true)-$xstart; |
|
| 4538 | - if ( !empty( $save_post['post_tags'] ) ) {
|
|
| 4539 | - wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy ); |
|
| 4540 | - } |
|
| 4541 | - $xtimings['###9'] = microtime(true)-$xstart; |
|
| 4542 | - // Post images |
|
| 4543 | - if ( !empty( $post_images ) ) {
|
|
| 4544 | - $post_images = array_unique($post_images); |
|
| 4535 | + geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str ); |
|
| 4536 | + } |
|
| 4537 | + $xtimings['###8.1'] = microtime(true)-$xstart; |
|
| 4538 | + if ( !empty( $save_post['post_tags'] ) ) {
|
|
| 4539 | + wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy ); |
|
| 4540 | + } |
|
| 4541 | + $xtimings['###9'] = microtime(true)-$xstart; |
|
| 4542 | + // Post images |
|
| 4543 | + if ( !empty( $post_images ) ) {
|
|
| 4544 | + $post_images = array_unique($post_images); |
|
| 4545 | 4545 | |
| 4546 | - $old_post_images_arr = array(); |
|
| 4547 | - $saved_post_images_arr = array(); |
|
| 4546 | + $old_post_images_arr = array(); |
|
| 4547 | + $saved_post_images_arr = array(); |
|
| 4548 | 4548 | |
| 4549 | - $order = 1; |
|
| 4549 | + $order = 1; |
|
| 4550 | 4550 | |
| 4551 | - $old_post_images = geodir_get_images( $saved_post_id ); |
|
| 4552 | - $xtimings['###9.1'] = microtime(true)-$xstart; |
|
| 4553 | - if (!empty($old_post_images)) {
|
|
| 4554 | - foreach( $old_post_images as $old_post_image ) {
|
|
| 4555 | - if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
|
|
| 4556 | - $old_post_images_arr[] = $old_post_image->file; |
|
| 4557 | - } |
|
| 4558 | - } |
|
| 4559 | - } |
|
| 4551 | + $old_post_images = geodir_get_images( $saved_post_id ); |
|
| 4552 | + $xtimings['###9.1'] = microtime(true)-$xstart; |
|
| 4553 | + if (!empty($old_post_images)) {
|
|
| 4554 | + foreach( $old_post_images as $old_post_image ) {
|
|
| 4555 | + if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
|
|
| 4556 | + $old_post_images_arr[] = $old_post_image->file; |
|
| 4557 | + } |
|
| 4558 | + } |
|
| 4559 | + } |
|
| 4560 | 4560 | |
| 4561 | - foreach ( $post_images as $post_image ) {
|
|
| 4562 | - $image_name = basename( $post_image ); |
|
| 4563 | - $saved_post_images_arr[] = $image_name; |
|
| 4561 | + foreach ( $post_images as $post_image ) {
|
|
| 4562 | + $image_name = basename( $post_image ); |
|
| 4563 | + $saved_post_images_arr[] = $image_name; |
|
| 4564 | 4564 | |
| 4565 | - if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
|
|
| 4566 | - continue; // Skip if image already exists. |
|
| 4567 | - } |
|
| 4565 | + if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
|
|
| 4566 | + continue; // Skip if image already exists. |
|
| 4567 | + } |
|
| 4568 | 4568 | |
| 4569 | - $image_name_parts = explode( '.', $image_name ); |
|
| 4570 | - array_pop( $image_name_parts ); |
|
| 4571 | - $proper_image_name = implode( '.', $image_name_parts ); |
|
| 4572 | - $xtimings['###9.2'] = microtime(true)-$xstart; |
|
| 4573 | - $arr_file_type = wp_check_filetype( $image_name ); |
|
| 4574 | - $xtimings['###9.3'] = microtime(true)-$xstart; |
|
| 4575 | - if ( !empty( $arr_file_type ) ) {
|
|
| 4576 | - $uploaded_file_type = $arr_file_type['type']; |
|
| 4569 | + $image_name_parts = explode( '.', $image_name ); |
|
| 4570 | + array_pop( $image_name_parts ); |
|
| 4571 | + $proper_image_name = implode( '.', $image_name_parts ); |
|
| 4572 | + $xtimings['###9.2'] = microtime(true)-$xstart; |
|
| 4573 | + $arr_file_type = wp_check_filetype( $image_name ); |
|
| 4574 | + $xtimings['###9.3'] = microtime(true)-$xstart; |
|
| 4575 | + if ( !empty( $arr_file_type ) ) {
|
|
| 4576 | + $uploaded_file_type = $arr_file_type['type']; |
|
| 4577 | 4577 | |
| 4578 | - $attachment = array(); |
|
| 4579 | - $attachment['post_id'] = $saved_post_id; |
|
| 4580 | - $attachment['title'] = $proper_image_name; |
|
| 4581 | - $attachment['content'] = ''; |
|
| 4582 | - $attachment['file'] = $uploads_subdir . '/' . $image_name; |
|
| 4583 | - $attachment['mime_type'] = $uploaded_file_type; |
|
| 4584 | - $attachment['menu_order'] = $order; |
|
| 4585 | - $attachment['is_featured'] = 0; |
|
| 4586 | - |
|
| 4587 | - $attachment_set = ''; |
|
| 4588 | - foreach ( $attachment as $key => $val ) {
|
|
| 4589 | - if ( $val != '' ) {
|
|
| 4590 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 4591 | - } |
|
| 4592 | - } |
|
| 4593 | - $attachment_set = trim( $attachment_set, ", " ); |
|
| 4578 | + $attachment = array(); |
|
| 4579 | + $attachment['post_id'] = $saved_post_id; |
|
| 4580 | + $attachment['title'] = $proper_image_name; |
|
| 4581 | + $attachment['content'] = ''; |
|
| 4582 | + $attachment['file'] = $uploads_subdir . '/' . $image_name; |
|
| 4583 | + $attachment['mime_type'] = $uploaded_file_type; |
|
| 4584 | + $attachment['menu_order'] = $order; |
|
| 4585 | + $attachment['is_featured'] = 0; |
|
| 4586 | + |
|
| 4587 | + $attachment_set = ''; |
|
| 4588 | + foreach ( $attachment as $key => $val ) {
|
|
| 4589 | + if ( $val != '' ) {
|
|
| 4590 | + $attachment_set .= $key . " = '" . $val . "', "; |
|
| 4591 | + } |
|
| 4592 | + } |
|
| 4593 | + $attachment_set = trim( $attachment_set, ", " ); |
|
| 4594 | 4594 | |
| 4595 | - // Add new attachment |
|
| 4596 | - $xtimings['###9.4'] = microtime(true)-$xstart; |
|
| 4597 | - $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set ); |
|
| 4598 | - $xtimings['###9.5'] = microtime(true)-$xstart; |
|
| 4599 | - $order++; |
|
| 4600 | - } |
|
| 4601 | - } |
|
| 4602 | - |
|
| 4603 | - $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : '';
|
|
| 4604 | - // Remove previous attachment |
|
| 4605 | - $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql ); |
|
| 4606 | - $xtimings['###9.6'] = microtime(true)-$xstart; |
|
| 4607 | - if ( !empty( $saved_post_images_arr ) ) {
|
|
| 4608 | - geodir_set_wp_featured_image($saved_post_id); |
|
| 4609 | - $xtimings['###9.7'] = microtime(true)-$xstart; |
|
| 4610 | - /* |
|
| 4595 | + // Add new attachment |
|
| 4596 | + $xtimings['###9.4'] = microtime(true)-$xstart; |
|
| 4597 | + $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set ); |
|
| 4598 | + $xtimings['###9.5'] = microtime(true)-$xstart; |
|
| 4599 | + $order++; |
|
| 4600 | + } |
|
| 4601 | + } |
|
| 4602 | + |
|
| 4603 | + $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : '';
|
|
| 4604 | + // Remove previous attachment |
|
| 4605 | + $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql ); |
|
| 4606 | + $xtimings['###9.6'] = microtime(true)-$xstart; |
|
| 4607 | + if ( !empty( $saved_post_images_arr ) ) {
|
|
| 4608 | + geodir_set_wp_featured_image($saved_post_id); |
|
| 4609 | + $xtimings['###9.7'] = microtime(true)-$xstart; |
|
| 4610 | + /* |
|
| 4611 | 4611 | $menu_order = 1; |
| 4612 | 4612 | |
| 4613 | 4613 | foreach ( $saved_post_images_arr as $img_name ) {
|
@@ -4620,288 +4620,288 @@ discard block |
||
| 4620 | 4620 | } |
| 4621 | 4621 | $menu_order++; |
| 4622 | 4622 | }*/ |
| 4623 | - } |
|
| 4623 | + } |
|
| 4624 | 4624 | |
| 4625 | - if ( $order > 1 ) {
|
|
| 4626 | - $images++; |
|
| 4627 | - } |
|
| 4628 | - } |
|
| 4629 | - $xtimings['###10'] = microtime(true)-$xstart; |
|
| 4630 | - /** This action is documented in geodirectory-functions/post-functions.php */ |
|
| 4631 | - do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post ); |
|
| 4632 | - $xtimings['###11'] = microtime(true)-$xstart; |
|
| 4633 | - if (isset($is_featured)) {
|
|
| 4634 | - geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured); |
|
| 4635 | - } |
|
| 4636 | - if (isset($gd_post['alive_days'])) {
|
|
| 4637 | - geodir_save_post_meta($saved_post_id, 'alive_days', $gd_post['alive_days']); |
|
| 4638 | - } |
|
| 4639 | - if (isset($gd_post['expire_date'])) {
|
|
| 4640 | - geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']); |
|
| 4641 | - } |
|
| 4642 | - $xtimings['###12'] = microtime(true)-$xstart; |
|
| 4643 | - } |
|
| 4625 | + if ( $order > 1 ) {
|
|
| 4626 | + $images++; |
|
| 4627 | + } |
|
| 4628 | + } |
|
| 4629 | + $xtimings['###10'] = microtime(true)-$xstart; |
|
| 4630 | + /** This action is documented in geodirectory-functions/post-functions.php */ |
|
| 4631 | + do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post ); |
|
| 4632 | + $xtimings['###11'] = microtime(true)-$xstart; |
|
| 4633 | + if (isset($is_featured)) {
|
|
| 4634 | + geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured); |
|
| 4635 | + } |
|
| 4636 | + if (isset($gd_post['alive_days'])) {
|
|
| 4637 | + geodir_save_post_meta($saved_post_id, 'alive_days', $gd_post['alive_days']); |
|
| 4638 | + } |
|
| 4639 | + if (isset($gd_post['expire_date'])) {
|
|
| 4640 | + geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']); |
|
| 4641 | + } |
|
| 4642 | + $xtimings['###12'] = microtime(true)-$xstart; |
|
| 4643 | + } |
|
| 4644 | 4644 | |
| 4645 | - // WPML |
|
| 4646 | - if ($is_wpml && $language != '') {
|
|
| 4647 | - $sitepress->switch_lang($active_lang, true); |
|
| 4648 | - } |
|
| 4649 | - // WPML |
|
| 4650 | - } |
|
| 4651 | - } |
|
| 4652 | - } |
|
| 4645 | + // WPML |
|
| 4646 | + if ($is_wpml && $language != '') {
|
|
| 4647 | + $sitepress->switch_lang($active_lang, true); |
|
| 4648 | + } |
|
| 4649 | + // WPML |
|
| 4650 | + } |
|
| 4651 | + } |
|
| 4652 | + } |
|
| 4653 | 4653 | |
| 4654 | - //undo some stuff to make the import quicker |
|
| 4655 | - wp_defer_term_counting( false ); |
|
| 4656 | - wp_defer_comment_counting( false ); |
|
| 4657 | - $wpdb->query( 'COMMIT;' ); |
|
| 4658 | - $wpdb->query( 'SET autocommit = 1;' ); |
|
| 4659 | - $xtimings['###13'] = microtime(true)-$xstart; |
|
| 4660 | - $json = array(); |
|
| 4661 | - $json['processed'] = $processed_actual; |
|
| 4662 | - $json['created'] = $created; |
|
| 4663 | - $json['updated'] = $updated; |
|
| 4664 | - $json['skipped'] = $skipped; |
|
| 4665 | - $json['invalid'] = $invalid; |
|
| 4666 | - $json['invalid_addr'] = $invalid_addr; |
|
| 4667 | - $json['images'] = $images; |
|
| 4668 | - $json['timing'] = microtime(true)-$xstart; |
|
| 4669 | - $json['timings'] = $xtimings; |
|
| 4654 | + //undo some stuff to make the import quicker |
|
| 4655 | + wp_defer_term_counting( false ); |
|
| 4656 | + wp_defer_comment_counting( false ); |
|
| 4657 | + $wpdb->query( 'COMMIT;' ); |
|
| 4658 | + $wpdb->query( 'SET autocommit = 1;' ); |
|
| 4659 | + $xtimings['###13'] = microtime(true)-$xstart; |
|
| 4660 | + $json = array(); |
|
| 4661 | + $json['processed'] = $processed_actual; |
|
| 4662 | + $json['created'] = $created; |
|
| 4663 | + $json['updated'] = $updated; |
|
| 4664 | + $json['skipped'] = $skipped; |
|
| 4665 | + $json['invalid'] = $invalid; |
|
| 4666 | + $json['invalid_addr'] = $invalid_addr; |
|
| 4667 | + $json['images'] = $images; |
|
| 4668 | + $json['timing'] = microtime(true)-$xstart; |
|
| 4669 | + $json['timings'] = $xtimings; |
|
| 4670 | 4670 | |
| 4671 | 4671 | |
| 4672 | - wp_send_json( $json ); |
|
| 4673 | - exit; |
|
| 4674 | - } else if ( $task == 'import_loc' ) {
|
|
| 4675 | - global $gd_post_types; |
|
| 4676 | - $gd_post_types = $post_types; |
|
| 4672 | + wp_send_json( $json ); |
|
| 4673 | + exit; |
|
| 4674 | + } else if ( $task == 'import_loc' ) {
|
|
| 4675 | + global $gd_post_types; |
|
| 4676 | + $gd_post_types = $post_types; |
|
| 4677 | 4677 | |
| 4678 | - if (!empty($file)) {
|
|
| 4679 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4678 | + if (!empty($file)) {
|
|
| 4679 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4680 | 4680 | |
| 4681 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4682 | - $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
|
| 4683 | - wp_send_json( $json ); |
|
| 4684 | - } |
|
| 4681 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4682 | + $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
|
| 4683 | + wp_send_json( $json ); |
|
| 4684 | + } |
|
| 4685 | 4685 | |
| 4686 | - $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
|
|
| 4687 | - $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' ); |
|
| 4688 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 4689 | - $index = $processed + $i; |
|
| 4686 | + $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
|
|
| 4687 | + $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' ); |
|
| 4688 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 4689 | + $index = $processed + $i; |
|
| 4690 | 4690 | |
| 4691 | - if (isset($file[$index])) {
|
|
| 4692 | - $row = $file[$index]; |
|
| 4693 | - $row = array_map( 'trim', $row ); |
|
| 4694 | - $data = array(); |
|
| 4691 | + if (isset($file[$index])) {
|
|
| 4692 | + $row = $file[$index]; |
|
| 4693 | + $row = array_map( 'trim', $row ); |
|
| 4694 | + $data = array(); |
|
| 4695 | 4695 | |
| 4696 | - foreach ($columns as $c => $column ) {
|
|
| 4697 | - if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {
|
|
| 4698 | - $data[$column] = $row[$c]; |
|
| 4699 | - } |
|
| 4700 | - } |
|
| 4696 | + foreach ($columns as $c => $column ) {
|
|
| 4697 | + if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {
|
|
| 4698 | + $data[$column] = $row[$c]; |
|
| 4699 | + } |
|
| 4700 | + } |
|
| 4701 | 4701 | |
| 4702 | - if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
|
|
| 4703 | - $invalid++; |
|
| 4704 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4705 | - continue; |
|
| 4706 | - } |
|
| 4702 | + if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
|
|
| 4703 | + $invalid++; |
|
| 4704 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4705 | + continue; |
|
| 4706 | + } |
|
| 4707 | 4707 | |
| 4708 | - $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0; |
|
| 4708 | + $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0; |
|
| 4709 | 4709 | |
| 4710 | - if ( $import_choice == 'update' ) {
|
|
| 4711 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4712 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4713 | - $updated++; |
|
| 4714 | - } else {
|
|
| 4715 | - $invalid++; |
|
| 4716 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4717 | - } |
|
| 4718 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4719 | - $data['location_id'] = (int)$location->location_id; |
|
| 4710 | + if ( $import_choice == 'update' ) {
|
|
| 4711 | + if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4712 | + if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4713 | + $updated++; |
|
| 4714 | + } else {
|
|
| 4715 | + $invalid++; |
|
| 4716 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4717 | + } |
|
| 4718 | + } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4719 | + $data['location_id'] = (int)$location->location_id; |
|
| 4720 | 4720 | |
| 4721 | - if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
|
|
| 4722 | - $data['location_id'] = (int)$location->location_id; |
|
| 4723 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
|
|
| 4724 | - $data['location_id'] = (int)$location->location_id; |
|
| 4725 | - } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
|
|
| 4726 | - $data['location_id'] = (int)$location->location_id; |
|
| 4727 | - } |
|
| 4721 | + if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
|
|
| 4722 | + $data['location_id'] = (int)$location->location_id; |
|
| 4723 | + } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
|
|
| 4724 | + $data['location_id'] = (int)$location->location_id; |
|
| 4725 | + } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
|
|
| 4726 | + $data['location_id'] = (int)$location->location_id; |
|
| 4727 | + } |
|
| 4728 | 4728 | |
| 4729 | - if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4730 | - $updated++; |
|
| 4731 | - } else {
|
|
| 4732 | - $invalid++; |
|
| 4733 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4734 | - } |
|
| 4735 | - } else {
|
|
| 4736 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4737 | - $created++; |
|
| 4738 | - } else {
|
|
| 4739 | - $invalid++; |
|
| 4740 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4741 | - } |
|
| 4742 | - } |
|
| 4743 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4744 | - if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4745 | - $skipped++; |
|
| 4746 | - } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4747 | - $skipped++; |
|
| 4748 | - } else {
|
|
| 4749 | - if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4750 | - $created++; |
|
| 4751 | - } else {
|
|
| 4752 | - $invalid++; |
|
| 4753 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4754 | - } |
|
| 4755 | - } |
|
| 4756 | - } else {
|
|
| 4757 | - $invalid++; |
|
| 4758 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4759 | - } |
|
| 4760 | - } |
|
| 4761 | - } |
|
| 4762 | - } |
|
| 4729 | + if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
|
|
| 4730 | + $updated++; |
|
| 4731 | + } else {
|
|
| 4732 | + $invalid++; |
|
| 4733 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4734 | + } |
|
| 4735 | + } else {
|
|
| 4736 | + if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4737 | + $created++; |
|
| 4738 | + } else {
|
|
| 4739 | + $invalid++; |
|
| 4740 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4741 | + } |
|
| 4742 | + } |
|
| 4743 | + } elseif ( $import_choice == 'skip' ) {
|
|
| 4744 | + if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
|
|
| 4745 | + $skipped++; |
|
| 4746 | + } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
|
|
| 4747 | + $skipped++; |
|
| 4748 | + } else {
|
|
| 4749 | + if ( $location_id = geodir_location_insert_city( $data, true ) ) {
|
|
| 4750 | + $created++; |
|
| 4751 | + } else {
|
|
| 4752 | + $invalid++; |
|
| 4753 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4754 | + } |
|
| 4755 | + } |
|
| 4756 | + } else {
|
|
| 4757 | + $invalid++; |
|
| 4758 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location ); |
|
| 4759 | + } |
|
| 4760 | + } |
|
| 4761 | + } |
|
| 4762 | + } |
|
| 4763 | 4763 | |
| 4764 | - $json = array(); |
|
| 4765 | - $json['processed'] = $limit; |
|
| 4766 | - $json['created'] = $created; |
|
| 4767 | - $json['updated'] = $updated; |
|
| 4768 | - $json['skipped'] = $skipped; |
|
| 4769 | - $json['invalid'] = $invalid; |
|
| 4770 | - $json['images'] = $images; |
|
| 4764 | + $json = array(); |
|
| 4765 | + $json['processed'] = $limit; |
|
| 4766 | + $json['created'] = $created; |
|
| 4767 | + $json['updated'] = $updated; |
|
| 4768 | + $json['skipped'] = $skipped; |
|
| 4769 | + $json['invalid'] = $invalid; |
|
| 4770 | + $json['images'] = $images; |
|
| 4771 | 4771 | |
| 4772 | - wp_send_json( $json ); |
|
| 4773 | - } else if ( $task == 'import_hood' ) {
|
|
| 4774 | - if (!empty($file)) {
|
|
| 4775 | - $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4772 | + wp_send_json( $json ); |
|
| 4773 | + } else if ( $task == 'import_hood' ) {
|
|
| 4774 | + if (!empty($file)) {
|
|
| 4775 | + $columns = isset($file[0]) ? $file[0] : NULL; |
|
| 4776 | 4776 | |
| 4777 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4778 | - $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
|
| 4779 | - wp_send_json( $json ); |
|
| 4780 | - } |
|
| 4777 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 4778 | + $json['error'] = __('The file you are uploading is not valid. There are problems with the file columns.', 'geodirectory');
|
|
| 4779 | + wp_send_json( $json ); |
|
| 4780 | + } |
|
| 4781 | 4781 | |
| 4782 | - $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
|
|
| 4783 | - $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ); |
|
| 4784 | - for ($i = 1; $i <= $limit; $i++) {
|
|
| 4785 | - $index = $processed + $i; |
|
| 4782 | + $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
|
|
| 4783 | + $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ); |
|
| 4784 | + for ($i = 1; $i <= $limit; $i++) {
|
|
| 4785 | + $index = $processed + $i; |
|
| 4786 | 4786 | |
| 4787 | - if (isset($file[$index])) {
|
|
| 4788 | - $row = $file[$index]; |
|
| 4789 | - $row = array_map( 'trim', $row ); |
|
| 4790 | - $data = array(); |
|
| 4787 | + if (isset($file[$index])) {
|
|
| 4788 | + $row = $file[$index]; |
|
| 4789 | + $row = array_map( 'trim', $row ); |
|
| 4790 | + $data = array(); |
|
| 4791 | 4791 | |
| 4792 | - foreach ($columns as $c => $column) {
|
|
| 4793 | - if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {
|
|
| 4794 | - $data[$column] = sanitize_text_field($row[$c]); |
|
| 4795 | - } |
|
| 4796 | - } |
|
| 4792 | + foreach ($columns as $c => $column) {
|
|
| 4793 | + if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {
|
|
| 4794 | + $data[$column] = sanitize_text_field($row[$c]); |
|
| 4795 | + } |
|
| 4796 | + } |
|
| 4797 | 4797 | |
| 4798 | - if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
|
|
| 4799 | - $invalid++; |
|
| 4800 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4801 | - continue; |
|
| 4802 | - } |
|
| 4798 | + if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
|
|
| 4799 | + $invalid++; |
|
| 4800 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4801 | + continue; |
|
| 4802 | + } |
|
| 4803 | 4803 | |
| 4804 | - $location_info = array(); |
|
| 4805 | - if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
|
|
| 4806 | - $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
|
|
| 4807 | - } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
|
|
| 4808 | - $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
|
|
| 4809 | - } |
|
| 4804 | + $location_info = array(); |
|
| 4805 | + if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
|
|
| 4806 | + $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
|
|
| 4807 | + } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
|
|
| 4808 | + $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
|
|
| 4809 | + } |
|
| 4810 | 4810 | |
| 4811 | - if (empty($location_info)) {
|
|
| 4812 | - $invalid++; |
|
| 4813 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4814 | - continue; |
|
| 4815 | - } |
|
| 4811 | + if (empty($location_info)) {
|
|
| 4812 | + $invalid++; |
|
| 4813 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4814 | + continue; |
|
| 4815 | + } |
|
| 4816 | 4816 | |
| 4817 | - $location_id = $location_info->location_id; |
|
| 4817 | + $location_id = $location_info->location_id; |
|
| 4818 | 4818 | |
| 4819 | - $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0; |
|
| 4819 | + $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0; |
|
| 4820 | 4820 | |
| 4821 | - $hood_data = array(); |
|
| 4822 | - $hood_data['hood_name'] = $data['neighbourhood_name']; |
|
| 4823 | - $hood_data['hood_slug'] = $data['neighbourhood_slug']; |
|
| 4824 | - $hood_data['hood_latitude'] = $data['latitude']; |
|
| 4825 | - $hood_data['hood_longitude'] = $data['longitude']; |
|
| 4826 | - $hood_data['hood_location_id'] = $location_id; |
|
| 4821 | + $hood_data = array(); |
|
| 4822 | + $hood_data['hood_name'] = $data['neighbourhood_name']; |
|
| 4823 | + $hood_data['hood_slug'] = $data['neighbourhood_slug']; |
|
| 4824 | + $hood_data['hood_latitude'] = $data['latitude']; |
|
| 4825 | + $hood_data['hood_longitude'] = $data['longitude']; |
|
| 4826 | + $hood_data['hood_location_id'] = $location_id; |
|
| 4827 | 4827 | |
| 4828 | - if ( $import_choice == 'update' ) {
|
|
| 4829 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4830 | - $hood_data['hood_id'] = (int)$data['neighbourhood_id']; |
|
| 4828 | + if ( $import_choice == 'update' ) {
|
|
| 4829 | + if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4830 | + $hood_data['hood_id'] = (int)$data['neighbourhood_id']; |
|
| 4831 | 4831 | |
| 4832 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4833 | - $updated++; |
|
| 4834 | - } else {
|
|
| 4835 | - $invalid++; |
|
| 4836 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4837 | - } |
|
| 4838 | - } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4839 | - $hood_data['hood_id'] = (int)$neighbourhood->hood_id; |
|
| 4832 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4833 | + $updated++; |
|
| 4834 | + } else {
|
|
| 4835 | + $invalid++; |
|
| 4836 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4837 | + } |
|
| 4838 | + } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4839 | + $hood_data['hood_id'] = (int)$neighbourhood->hood_id; |
|
| 4840 | 4840 | |
| 4841 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4842 | - $updated++; |
|
| 4843 | - } else {
|
|
| 4844 | - $invalid++; |
|
| 4845 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4846 | - } |
|
| 4847 | - } else {
|
|
| 4848 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4849 | - $created++; |
|
| 4850 | - } else {
|
|
| 4851 | - $invalid++; |
|
| 4852 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4853 | - } |
|
| 4854 | - } |
|
| 4855 | - } elseif ( $import_choice == 'skip' ) {
|
|
| 4856 | - if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4857 | - $skipped++; |
|
| 4858 | - } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4859 | - $skipped++; |
|
| 4860 | - } else {
|
|
| 4841 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4842 | + $updated++; |
|
| 4843 | + } else {
|
|
| 4844 | + $invalid++; |
|
| 4845 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4846 | + } |
|
| 4847 | + } else {
|
|
| 4848 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4849 | + $created++; |
|
| 4850 | + } else {
|
|
| 4851 | + $invalid++; |
|
| 4852 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4853 | + } |
|
| 4854 | + } |
|
| 4855 | + } elseif ( $import_choice == 'skip' ) {
|
|
| 4856 | + if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
|
|
| 4857 | + $skipped++; |
|
| 4858 | + } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
|
|
| 4859 | + $skipped++; |
|
| 4860 | + } else {
|
|
| 4861 | 4861 | |
| 4862 | - if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4863 | - $created++; |
|
| 4864 | - } else {
|
|
| 4865 | - $invalid++; |
|
| 4866 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4867 | - } |
|
| 4868 | - } |
|
| 4869 | - } else {
|
|
| 4870 | - $invalid++; |
|
| 4871 | - geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4872 | - } |
|
| 4873 | - } |
|
| 4874 | - } |
|
| 4875 | - } |
|
| 4862 | + if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
|
|
| 4863 | + $created++; |
|
| 4864 | + } else {
|
|
| 4865 | + $invalid++; |
|
| 4866 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4867 | + } |
|
| 4868 | + } |
|
| 4869 | + } else {
|
|
| 4870 | + $invalid++; |
|
| 4871 | + geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood ); |
|
| 4872 | + } |
|
| 4873 | + } |
|
| 4874 | + } |
|
| 4875 | + } |
|
| 4876 | 4876 | |
| 4877 | - $json = array(); |
|
| 4878 | - $json['processed'] = $limit; |
|
| 4879 | - $json['created'] = $created; |
|
| 4880 | - $json['updated'] = $updated; |
|
| 4881 | - $json['skipped'] = $skipped; |
|
| 4882 | - $json['invalid'] = $invalid; |
|
| 4883 | - $json['images'] = $images; |
|
| 4877 | + $json = array(); |
|
| 4878 | + $json['processed'] = $limit; |
|
| 4879 | + $json['created'] = $created; |
|
| 4880 | + $json['updated'] = $updated; |
|
| 4881 | + $json['skipped'] = $skipped; |
|
| 4882 | + $json['invalid'] = $invalid; |
|
| 4883 | + $json['images'] = $images; |
|
| 4884 | 4884 | |
| 4885 | - wp_send_json( $json ); |
|
| 4886 | - } |
|
| 4887 | - } |
|
| 4888 | - break; |
|
| 4889 | - case 'import_finish':{
|
|
| 4890 | - /** |
|
| 4891 | - * Run an action when an import finishes. |
|
| 4892 | - * |
|
| 4893 | - * This action can be used to fire functions after an import ends. |
|
| 4894 | - * |
|
| 4895 | - * @since 1.5.3 |
|
| 4896 | - * @package GeoDirectory |
|
| 4897 | - */ |
|
| 4898 | - do_action('geodir_import_finished');
|
|
| 4899 | - } |
|
| 4900 | - break; |
|
| 4885 | + wp_send_json( $json ); |
|
| 4886 | + } |
|
| 4887 | + } |
|
| 4888 | + break; |
|
| 4889 | + case 'import_finish':{
|
|
| 4890 | + /** |
|
| 4891 | + * Run an action when an import finishes. |
|
| 4892 | + * |
|
| 4893 | + * This action can be used to fire functions after an import ends. |
|
| 4894 | + * |
|
| 4895 | + * @since 1.5.3 |
|
| 4896 | + * @package GeoDirectory |
|
| 4897 | + */ |
|
| 4898 | + do_action('geodir_import_finished');
|
|
| 4899 | + } |
|
| 4900 | + break; |
|
| 4901 | 4901 | |
| 4902 | - } |
|
| 4903 | - echo '0'; |
|
| 4904 | - gd_die(); |
|
| 4902 | + } |
|
| 4903 | + echo '0'; |
|
| 4904 | + gd_die(); |
|
| 4905 | 4905 | } |
| 4906 | 4906 | |
| 4907 | 4907 | /** |
@@ -4945,12 +4945,12 @@ discard block |
||
| 4945 | 4945 | $args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args ); |
| 4946 | 4946 | } |
| 4947 | 4947 | |
| 4948 | - if( !empty( $term ) ) {
|
|
| 4948 | + if( !empty( $term ) ) {
|
|
| 4949 | 4949 | $result = wp_insert_term( $term, $taxonomy, $args ); |
| 4950 | - if( !is_wp_error( $result ) ) {
|
|
| 4951 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4952 | - } |
|
| 4953 | - } |
|
| 4950 | + if( !is_wp_error( $result ) ) {
|
|
| 4951 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 4952 | + } |
|
| 4953 | + } |
|
| 4954 | 4954 | |
| 4955 | 4955 | return false; |
| 4956 | 4956 | } |
@@ -4996,16 +4996,16 @@ discard block |
||
| 4996 | 4996 | $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
| 4997 | 4997 | |
| 4998 | 4998 | if( !is_wp_error( $result ) ) {
|
| 4999 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 5000 | - } |
|
| 4999 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 5000 | + } |
|
| 5001 | 5001 | } else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
|
| 5002 | 5002 | $term_data['term_id'] = $term_info['term_id']; |
| 5003 | 5003 | |
| 5004 | 5004 | $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data ); |
| 5005 | 5005 | |
| 5006 | 5006 | if( !is_wp_error( $result ) ) {
|
| 5007 | - return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 5008 | - } |
|
| 5007 | + return isset( $result['term_id'] ) ? $result['term_id'] : 0; |
|
| 5008 | + } |
|
| 5009 | 5009 | } else {
|
| 5010 | 5010 | return geodir_imex_insert_term( $taxonomy, $term_data ); |
| 5011 | 5011 | } |
@@ -5027,47 +5027,47 @@ discard block |
||
| 5027 | 5027 | * @return int Posts count. |
| 5028 | 5028 | */ |
| 5029 | 5029 | function geodir_get_posts_count( $post_type ) {
|
| 5030 | - global $wpdb, $plugin_prefix; |
|
| 5030 | + global $wpdb, $plugin_prefix; |
|
| 5031 | 5031 | |
| 5032 | - if ( !post_type_exists( $post_type ) ) {
|
|
| 5033 | - return 0; |
|
| 5034 | - } |
|
| 5032 | + if ( !post_type_exists( $post_type ) ) {
|
|
| 5033 | + return 0; |
|
| 5034 | + } |
|
| 5035 | 5035 | |
| 5036 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5036 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5037 | 5037 | |
| 5038 | - // Skip listing with statuses trash, auto-draft etc... |
|
| 5039 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5040 | - $where_statuses = ''; |
|
| 5041 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5042 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5043 | - } |
|
| 5038 | + // Skip listing with statuses trash, auto-draft etc... |
|
| 5039 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5040 | + $where_statuses = ''; |
|
| 5041 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5042 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5043 | + } |
|
| 5044 | 5044 | |
| 5045 | - /** |
|
| 5046 | - * Filter the SQL where clause part to filter posts count in import/export. |
|
| 5047 | - * |
|
| 5048 | - * @since 1.6.4 |
|
| 5049 | - * @package GeoDirectory |
|
| 5050 | - * |
|
| 5051 | - * @param string $where SQL where clause part. |
|
| 5052 | - */ |
|
| 5053 | - $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type ); |
|
| 5054 | - |
|
| 5055 | - $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );
|
|
| 5056 | - |
|
| 5057 | - $posts_count = (int)$wpdb->get_var( $query ); |
|
| 5045 | + /** |
|
| 5046 | + * Filter the SQL where clause part to filter posts count in import/export. |
|
| 5047 | + * |
|
| 5048 | + * @since 1.6.4 |
|
| 5049 | + * @package GeoDirectory |
|
| 5050 | + * |
|
| 5051 | + * @param string $where SQL where clause part. |
|
| 5052 | + */ |
|
| 5053 | + $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type ); |
|
| 5054 | + |
|
| 5055 | + $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );
|
|
| 5056 | + |
|
| 5057 | + $posts_count = (int)$wpdb->get_var( $query ); |
|
| 5058 | 5058 | |
| 5059 | - /** |
|
| 5060 | - * Modify returned post counts for the current post type. |
|
| 5061 | - * |
|
| 5062 | - * @since 1.4.6 |
|
| 5063 | - * @package GeoDirectory |
|
| 5064 | - * |
|
| 5065 | - * @param int $posts_count Post counts. |
|
| 5066 | - * @param string $post_type Post type. |
|
| 5067 | - */ |
|
| 5068 | - $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type ); |
|
| 5069 | - |
|
| 5070 | - return $posts_count; |
|
| 5059 | + /** |
|
| 5060 | + * Modify returned post counts for the current post type. |
|
| 5061 | + * |
|
| 5062 | + * @since 1.4.6 |
|
| 5063 | + * @package GeoDirectory |
|
| 5064 | + * |
|
| 5065 | + * @param int $posts_count Post counts. |
|
| 5066 | + * @param string $post_type Post type. |
|
| 5067 | + */ |
|
| 5068 | + $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type ); |
|
| 5069 | + |
|
| 5070 | + return $posts_count; |
|
| 5071 | 5071 | } |
| 5072 | 5072 | |
| 5073 | 5073 | /** |
@@ -5135,7 +5135,7 @@ discard block |
||
| 5135 | 5135 | } |
| 5136 | 5136 | $csv_row[] = 'post_status'; |
| 5137 | 5137 | $csv_row[] = 'is_featured'; |
| 5138 | - // Export claim listing field |
|
| 5138 | + // Export claim listing field |
|
| 5139 | 5139 | if ($is_claim_active) {
|
| 5140 | 5140 | $csv_row[] = 'claimed'; |
| 5141 | 5141 | } |
@@ -5144,7 +5144,7 @@ discard block |
||
| 5144 | 5144 | $csv_row[] = 'alive_days'; |
| 5145 | 5145 | $csv_row[] = 'expire_date'; |
| 5146 | 5146 | } |
| 5147 | - $csv_row[] = 'post_date'; |
|
| 5147 | + $csv_row[] = 'post_date'; |
|
| 5148 | 5148 | $csv_row[] = 'post_address'; |
| 5149 | 5149 | $csv_row[] = 'post_city'; |
| 5150 | 5150 | $csv_row[] = 'post_region'; |
@@ -5152,11 +5152,11 @@ discard block |
||
| 5152 | 5152 | $csv_row[] = 'post_zip'; |
| 5153 | 5153 | $csv_row[] = 'post_latitude'; |
| 5154 | 5154 | $csv_row[] = 'post_longitude'; |
| 5155 | - if ($neighbourhood_active) {
|
|
| 5156 | - $csv_row[] = 'post_neighbourhood'; |
|
| 5157 | - $csv_row[] = 'neighbourhood_latitude'; |
|
| 5158 | - $csv_row[] = 'neighbourhood_longitude'; |
|
| 5159 | - } |
|
| 5155 | + if ($neighbourhood_active) {
|
|
| 5156 | + $csv_row[] = 'post_neighbourhood'; |
|
| 5157 | + $csv_row[] = 'neighbourhood_latitude'; |
|
| 5158 | + $csv_row[] = 'neighbourhood_longitude'; |
|
| 5159 | + } |
|
| 5160 | 5160 | $csv_row[] = 'geodir_timing'; |
| 5161 | 5161 | $csv_row[] = 'geodir_contact'; |
| 5162 | 5162 | $csv_row[] = 'geodir_email'; |
@@ -5191,21 +5191,21 @@ discard block |
||
| 5191 | 5191 | $csv_row[] = 'franchise'; |
| 5192 | 5192 | } |
| 5193 | 5193 | |
| 5194 | - /** |
|
| 5195 | - * Filter columns field names of gd export listings csv. |
|
| 5196 | - * |
|
| 5197 | - * @since 1.6.5 |
|
| 5198 | - * @package GeoDirectory |
|
| 5199 | - * |
|
| 5200 | - * @param array $csv_row Column names being exported in csv. |
|
| 5201 | - * @param string $post_type The post type. |
|
| 5202 | - */ |
|
| 5203 | - $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);
|
|
| 5194 | + /** |
|
| 5195 | + * Filter columns field names of gd export listings csv. |
|
| 5196 | + * |
|
| 5197 | + * @since 1.6.5 |
|
| 5198 | + * @package GeoDirectory |
|
| 5199 | + * |
|
| 5200 | + * @param array $csv_row Column names being exported in csv. |
|
| 5201 | + * @param string $post_type The post type. |
|
| 5202 | + */ |
|
| 5203 | + $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);
|
|
| 5204 | 5204 | |
| 5205 | 5205 | $csv_rows[] = $csv_row; |
| 5206 | 5206 | |
| 5207 | 5207 | $images_count = 5; |
| 5208 | - $xx=0; |
|
| 5208 | + $xx=0; |
|
| 5209 | 5209 | foreach ( $posts as $post ) {$xx++;
|
| 5210 | 5210 | $post_id = $post['ID']; |
| 5211 | 5211 | |
@@ -5336,15 +5336,15 @@ discard block |
||
| 5336 | 5336 | } |
| 5337 | 5337 | $csv_row[] = $post_info['post_status']; // post_status |
| 5338 | 5338 | $csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured |
| 5339 | - if ($is_claim_active) {
|
|
| 5340 | - $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5341 | - } |
|
| 5339 | + if ($is_claim_active) {
|
|
| 5340 | + $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed |
|
| 5341 | + } |
|
| 5342 | 5342 | if ($is_payment_plugin) {
|
| 5343 | 5343 | $csv_row[] = (int)$post_info['package_id']; // package_id |
| 5344 | 5344 | $csv_row[] = $post_info['alive_days'] !== '' ? absint($post_info['alive_days']) : ''; // alive_days |
| 5345 | 5345 | $csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date
|
| 5346 | 5346 | } |
| 5347 | - $csv_row[] = $post_info['post_date']; // post_date |
|
| 5347 | + $csv_row[] = $post_info['post_date']; // post_date |
|
| 5348 | 5348 | $csv_row[] = stripslashes($post_info['post_address']); // post_address |
| 5349 | 5349 | $csv_row[] = stripslashes($post_info['post_city']); // post_city |
| 5350 | 5350 | $csv_row[] = stripslashes($post_info['post_region']); // post_region |
@@ -5352,21 +5352,21 @@ discard block |
||
| 5352 | 5352 | $csv_row[] = stripslashes($post_info['post_zip']); // post_zip |
| 5353 | 5353 | $csv_row[] = $post_info['post_latitude']; // post_latitude |
| 5354 | 5354 | $csv_row[] = $post_info['post_longitude']; // post_longitude |
| 5355 | - if ($neighbourhood_active) {
|
|
| 5356 | - $post_neighbourhood = ''; |
|
| 5357 | - $neighbourhood_latitude = ''; |
|
| 5358 | - $neighbourhood_longitude = ''; |
|
| 5359 | - if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {
|
|
| 5360 | - if (!empty($hood_info)) {
|
|
| 5361 | - $post_neighbourhood = $hood_info->hood_name; |
|
| 5362 | - $neighbourhood_latitude = $hood_info->hood_latitude; |
|
| 5363 | - $neighbourhood_longitude = $hood_info->hood_longitude; |
|
| 5364 | - } |
|
| 5365 | - } |
|
| 5366 | - $csv_row[] = stripslashes($post_neighbourhood); // post_neighbourhood |
|
| 5367 | - $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude |
|
| 5368 | - $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude |
|
| 5369 | - } |
|
| 5355 | + if ($neighbourhood_active) {
|
|
| 5356 | + $post_neighbourhood = ''; |
|
| 5357 | + $neighbourhood_latitude = ''; |
|
| 5358 | + $neighbourhood_longitude = ''; |
|
| 5359 | + if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {
|
|
| 5360 | + if (!empty($hood_info)) {
|
|
| 5361 | + $post_neighbourhood = $hood_info->hood_name; |
|
| 5362 | + $neighbourhood_latitude = $hood_info->hood_latitude; |
|
| 5363 | + $neighbourhood_longitude = $hood_info->hood_longitude; |
|
| 5364 | + } |
|
| 5365 | + } |
|
| 5366 | + $csv_row[] = stripslashes($post_neighbourhood); // post_neighbourhood |
|
| 5367 | + $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude |
|
| 5368 | + $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude |
|
| 5369 | + } |
|
| 5370 | 5370 | $csv_row[] = stripslashes($post_info['geodir_timing']); // geodir_timing |
| 5371 | 5371 | $csv_row[] = stripslashes($post_info['geodir_contact']); // geodir_contact |
| 5372 | 5372 | $csv_row[] = stripslashes($post_info['geodir_email']); // geodir_email |
@@ -5409,16 +5409,16 @@ discard block |
||
| 5409 | 5409 | $csv_row[] = (int)$franchise; // franchise id |
| 5410 | 5410 | } |
| 5411 | 5411 | |
| 5412 | - /** |
|
| 5413 | - * Filter columns values of gd export listings csv file |
|
| 5414 | - * |
|
| 5415 | - * @since 1.6.5 |
|
| 5416 | - * @package GeoDirectory |
|
| 5417 | - * |
|
| 5418 | - * @param array $csv_row Field values being exported in csv. |
|
| 5419 | - * @param array $post_info The post info. |
|
| 5420 | - */ |
|
| 5421 | - $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
|
|
| 5412 | + /** |
|
| 5413 | + * Filter columns values of gd export listings csv file |
|
| 5414 | + * |
|
| 5415 | + * @since 1.6.5 |
|
| 5416 | + * @package GeoDirectory |
|
| 5417 | + * |
|
| 5418 | + * @param array $csv_row Field values being exported in csv. |
|
| 5419 | + * @param array $post_info The post info. |
|
| 5420 | + */ |
|
| 5421 | + $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
|
|
| 5422 | 5422 | |
| 5423 | 5423 | for ( $c = 0; $c < $images_count; $c++ ) {
|
| 5424 | 5424 | $csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE |
@@ -5451,64 +5451,64 @@ discard block |
||
| 5451 | 5451 | * @return array Array of posts data. |
| 5452 | 5452 | */ |
| 5453 | 5453 | function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {
|
| 5454 | - global $wpdb, $plugin_prefix; |
|
| 5454 | + global $wpdb, $plugin_prefix; |
|
| 5455 | 5455 | |
| 5456 | - if ( ! post_type_exists( $post_type ) ) |
|
| 5457 | - return new stdClass; |
|
| 5456 | + if ( ! post_type_exists( $post_type ) ) |
|
| 5457 | + return new stdClass; |
|
| 5458 | 5458 | |
| 5459 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5459 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5460 | 5460 | |
| 5461 | - $limit = ''; |
|
| 5462 | - if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5463 | - $offset = ( $page_no - 1 ) * $per_page; |
|
| 5461 | + $limit = ''; |
|
| 5462 | + if ( $per_page > 0 && $page_no > 0 ) {
|
|
| 5463 | + $offset = ( $page_no - 1 ) * $per_page; |
|
| 5464 | 5464 | |
| 5465 | - if ( $offset > 0 ) {
|
|
| 5466 | - $limit = " LIMIT " . $offset . "," . $per_page; |
|
| 5467 | - } else {
|
|
| 5468 | - $limit = " LIMIT " . $per_page; |
|
| 5469 | - } |
|
| 5470 | - } |
|
| 5465 | + if ( $offset > 0 ) {
|
|
| 5466 | + $limit = " LIMIT " . $offset . "," . $per_page; |
|
| 5467 | + } else {
|
|
| 5468 | + $limit = " LIMIT " . $per_page; |
|
| 5469 | + } |
|
| 5470 | + } |
|
| 5471 | 5471 | |
| 5472 | - // Skip listing with statuses trash, auto-draft etc... |
|
| 5473 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5474 | - $where_statuses = ''; |
|
| 5475 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5476 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5477 | - } |
|
| 5472 | + // Skip listing with statuses trash, auto-draft etc... |
|
| 5473 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5474 | + $where_statuses = ''; |
|
| 5475 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5476 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5477 | + } |
|
| 5478 | 5478 | |
| 5479 | - /** |
|
| 5480 | - * Filter the SQL where clause part to filter posts in import/export. |
|
| 5481 | - * |
|
| 5482 | - * @since 1.6.4 |
|
| 5483 | - * @package GeoDirectory |
|
| 5484 | - * |
|
| 5485 | - * @param string $where SQL where clause part. |
|
| 5486 | - */ |
|
| 5487 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5488 | - |
|
| 5489 | - $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );
|
|
| 5490 | - /** |
|
| 5491 | - * Modify returned posts SQL query for the current post type. |
|
| 5492 | - * |
|
| 5493 | - * @since 1.4.6 |
|
| 5494 | - * @package GeoDirectory |
|
| 5495 | - * |
|
| 5496 | - * @param int $query The SQL query. |
|
| 5497 | - * @param string $post_type Post type. |
|
| 5498 | - */ |
|
| 5499 | - $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type ); |
|
| 5500 | - $results = (array)$wpdb->get_results( $query, ARRAY_A ); |
|
| 5501 | - |
|
| 5502 | - /** |
|
| 5503 | - * Modify returned post results for the current post type. |
|
| 5504 | - * |
|
| 5505 | - * @since 1.4.6 |
|
| 5506 | - * @package GeoDirectory |
|
| 5507 | - * |
|
| 5508 | - * @param object $results An object containing all post ids. |
|
| 5509 | - * @param string $post_type Post type. |
|
| 5510 | - */ |
|
| 5511 | - return apply_filters( 'geodir_export_posts', $results, $post_type ); |
|
| 5479 | + /** |
|
| 5480 | + * Filter the SQL where clause part to filter posts in import/export. |
|
| 5481 | + * |
|
| 5482 | + * @since 1.6.4 |
|
| 5483 | + * @package GeoDirectory |
|
| 5484 | + * |
|
| 5485 | + * @param string $where SQL where clause part. |
|
| 5486 | + */ |
|
| 5487 | + $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5488 | + |
|
| 5489 | + $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );
|
|
| 5490 | + /** |
|
| 5491 | + * Modify returned posts SQL query for the current post type. |
|
| 5492 | + * |
|
| 5493 | + * @since 1.4.6 |
|
| 5494 | + * @package GeoDirectory |
|
| 5495 | + * |
|
| 5496 | + * @param int $query The SQL query. |
|
| 5497 | + * @param string $post_type Post type. |
|
| 5498 | + */ |
|
| 5499 | + $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type ); |
|
| 5500 | + $results = (array)$wpdb->get_results( $query, ARRAY_A ); |
|
| 5501 | + |
|
| 5502 | + /** |
|
| 5503 | + * Modify returned post results for the current post type. |
|
| 5504 | + * |
|
| 5505 | + * @since 1.4.6 |
|
| 5506 | + * @package GeoDirectory |
|
| 5507 | + * |
|
| 5508 | + * @param object $results An object containing all post ids. |
|
| 5509 | + * @param string $post_type Post type. |
|
| 5510 | + */ |
|
| 5511 | + return apply_filters( 'geodir_export_posts', $results, $post_type ); |
|
| 5512 | 5512 | } |
| 5513 | 5513 | |
| 5514 | 5514 | /** |
@@ -5527,26 +5527,26 @@ discard block |
||
| 5527 | 5527 | * @return string The SQL query. |
| 5528 | 5528 | */ |
| 5529 | 5529 | function geodir_imex_get_events_query( $query, $post_type ) {
|
| 5530 | - if ( $post_type == 'gd_event' ) {
|
|
| 5531 | - global $wpdb, $plugin_prefix; |
|
| 5530 | + if ( $post_type == 'gd_event' ) {
|
|
| 5531 | + global $wpdb, $plugin_prefix; |
|
| 5532 | 5532 | |
| 5533 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5534 | - $schedule_table = EVENT_SCHEDULE; |
|
| 5533 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 5534 | + $schedule_table = EVENT_SCHEDULE; |
|
| 5535 | 5535 | |
| 5536 | - // Skip listing with statuses trash, auto-draft etc... |
|
| 5537 | - $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5538 | - $where_statuses = ''; |
|
| 5539 | - if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5540 | - $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5541 | - } |
|
| 5536 | + // Skip listing with statuses trash, auto-draft etc... |
|
| 5537 | + $skip_statuses = geodir_imex_export_skip_statuses(); |
|
| 5538 | + $where_statuses = ''; |
|
| 5539 | + if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
|
|
| 5540 | + $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
|
|
| 5541 | + } |
|
| 5542 | 5542 | |
| 5543 | - /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */ |
|
| 5544 | - $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5543 | + /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */ |
|
| 5544 | + $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type ); |
|
| 5545 | 5545 | |
| 5546 | - $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );
|
|
| 5547 | - } |
|
| 5546 | + $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );
|
|
| 5547 | + } |
|
| 5548 | 5548 | |
| 5549 | - return $query; |
|
| 5549 | + return $query; |
|
| 5550 | 5550 | } |
| 5551 | 5551 | |
| 5552 | 5552 | /** |
@@ -5568,36 +5568,36 @@ discard block |
||
| 5568 | 5568 | * @return int Total terms count. |
| 5569 | 5569 | */ |
| 5570 | 5570 | function geodir_get_terms_count( $post_type ) {
|
| 5571 | - $args = array( 'hide_empty' => 0 ); |
|
| 5571 | + $args = array( 'hide_empty' => 0 ); |
|
| 5572 | 5572 | |
| 5573 | - remove_all_filters( 'get_terms' ); |
|
| 5573 | + remove_all_filters( 'get_terms' ); |
|
| 5574 | 5574 | |
| 5575 | - $taxonomy = $post_type . 'category'; |
|
| 5575 | + $taxonomy = $post_type . 'category'; |
|
| 5576 | 5576 | |
| 5577 | - // WPML |
|
| 5578 | - $is_wpml = geodir_is_wpml(); |
|
| 5579 | - $active_lang = 'all'; |
|
| 5580 | - if ( $is_wpml ) {
|
|
| 5581 | - global $sitepress; |
|
| 5582 | - $active_lang = $sitepress->get_current_language(); |
|
| 5577 | + // WPML |
|
| 5578 | + $is_wpml = geodir_is_wpml(); |
|
| 5579 | + $active_lang = 'all'; |
|
| 5580 | + if ( $is_wpml ) {
|
|
| 5581 | + global $sitepress; |
|
| 5582 | + $active_lang = $sitepress->get_current_language(); |
|
| 5583 | 5583 | |
| 5584 | - if ( $active_lang != 'all' ) {
|
|
| 5585 | - $sitepress->switch_lang( 'all', true ); |
|
| 5586 | - } |
|
| 5587 | - } |
|
| 5588 | - // WPML |
|
| 5584 | + if ( $active_lang != 'all' ) {
|
|
| 5585 | + $sitepress->switch_lang( 'all', true ); |
|
| 5586 | + } |
|
| 5587 | + } |
|
| 5588 | + // WPML |
|
| 5589 | 5589 | |
| 5590 | - $count_terms = wp_count_terms( $taxonomy, $args ); |
|
| 5590 | + $count_terms = wp_count_terms( $taxonomy, $args ); |
|
| 5591 | 5591 | |
| 5592 | - // WPML |
|
| 5593 | - if ( $is_wpml && $active_lang !== 'all' ) {
|
|
| 5594 | - global $sitepress; |
|
| 5595 | - $sitepress->switch_lang( $active_lang, true ); |
|
| 5596 | - } |
|
| 5597 | - // WPML |
|
| 5598 | - $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0; |
|
| 5592 | + // WPML |
|
| 5593 | + if ( $is_wpml && $active_lang !== 'all' ) {
|
|
| 5594 | + global $sitepress; |
|
| 5595 | + $sitepress->switch_lang( $active_lang, true ); |
|
| 5596 | + } |
|
| 5597 | + // WPML |
|
| 5598 | + $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0; |
|
| 5599 | 5599 | |
| 5600 | - return $count_terms; |
|
| 5600 | + return $count_terms; |
|
| 5601 | 5601 | } |
| 5602 | 5602 | |
| 5603 | 5603 | /** |
@@ -5636,11 +5636,11 @@ discard block |
||
| 5636 | 5636 | $csv_row[] = 'cat_posttype'; |
| 5637 | 5637 | $csv_row[] = 'cat_parent'; |
| 5638 | 5638 | $csv_row[] = 'cat_schema'; |
| 5639 | - // WPML |
|
| 5639 | + // WPML |
|
| 5640 | 5640 | $is_wpml = geodir_wpml_is_taxonomy_translated( $taxonomy ); |
| 5641 | 5641 | if ($is_wpml) {
|
| 5642 | 5642 | $csv_row[] = 'cat_language'; |
| 5643 | - $csv_row[] = 'cat_id_original'; |
|
| 5643 | + $csv_row[] = 'cat_id_original'; |
|
| 5644 | 5644 | } |
| 5645 | 5645 | // WPML |
| 5646 | 5646 | $csv_row[] = 'cat_description'; |
@@ -5670,10 +5670,10 @@ discard block |
||
| 5670 | 5670 | $csv_row[] = $post_type; |
| 5671 | 5671 | $csv_row[] = $cat_parent; |
| 5672 | 5672 | $csv_row[] = geodir_get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type ); |
| 5673 | - // WPML |
|
| 5673 | + // WPML |
|
| 5674 | 5674 | if ($is_wpml) {
|
| 5675 | 5675 | $csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy ); |
| 5676 | - $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5676 | + $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy ); |
|
| 5677 | 5677 | } |
| 5678 | 5678 | // WPML |
| 5679 | 5679 | $csv_row[] = $term->description; |
@@ -6091,43 +6091,43 @@ discard block |
||
| 6091 | 6091 | * @param string $status Post status. |
| 6092 | 6092 | */ |
| 6093 | 6093 | function geodir_create_page($slug, $option, $page_title = '', $page_content = '', $post_parent = 0, $status = 'publish') {
|
| 6094 | - global $wpdb, $current_user; |
|
| 6095 | - |
|
| 6096 | - $option_value = get_option($option); |
|
| 6097 | - |
|
| 6098 | - if ($option_value > 0) : |
|
| 6099 | - if (get_post($option_value)) : |
|
| 6100 | - // Page exists |
|
| 6101 | - return; |
|
| 6102 | - endif; |
|
| 6103 | - endif; |
|
| 6104 | - |
|
| 6105 | - $page_found = $wpdb->get_var( |
|
| 6106 | - $wpdb->prepare( |
|
| 6107 | - "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 6108 | - array($slug) |
|
| 6109 | - ) |
|
| 6110 | - ); |
|
| 6111 | - |
|
| 6112 | - if ($page_found) : |
|
| 6113 | - // Page exists |
|
| 6114 | - if (!$option_value) update_option($option, $page_found); |
|
| 6115 | - return; |
|
| 6116 | - endif; |
|
| 6117 | - |
|
| 6118 | - $page_data = array( |
|
| 6119 | - 'post_status' => $status, |
|
| 6120 | - 'post_type' => 'page', |
|
| 6121 | - 'post_author' => $current_user->ID, |
|
| 6122 | - 'post_name' => $slug, |
|
| 6123 | - 'post_title' => $page_title, |
|
| 6124 | - 'post_content' => $page_content, |
|
| 6125 | - 'post_parent' => $post_parent, |
|
| 6126 | - 'comment_status' => 'closed' |
|
| 6127 | - ); |
|
| 6128 | - $page_id = wp_insert_post($page_data); |
|
| 6129 | - |
|
| 6130 | - add_option($option, $page_id); |
|
| 6094 | + global $wpdb, $current_user; |
|
| 6095 | + |
|
| 6096 | + $option_value = get_option($option); |
|
| 6097 | + |
|
| 6098 | + if ($option_value > 0) : |
|
| 6099 | + if (get_post($option_value)) : |
|
| 6100 | + // Page exists |
|
| 6101 | + return; |
|
| 6102 | + endif; |
|
| 6103 | + endif; |
|
| 6104 | + |
|
| 6105 | + $page_found = $wpdb->get_var( |
|
| 6106 | + $wpdb->prepare( |
|
| 6107 | + "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 6108 | + array($slug) |
|
| 6109 | + ) |
|
| 6110 | + ); |
|
| 6111 | + |
|
| 6112 | + if ($page_found) : |
|
| 6113 | + // Page exists |
|
| 6114 | + if (!$option_value) update_option($option, $page_found); |
|
| 6115 | + return; |
|
| 6116 | + endif; |
|
| 6117 | + |
|
| 6118 | + $page_data = array( |
|
| 6119 | + 'post_status' => $status, |
|
| 6120 | + 'post_type' => 'page', |
|
| 6121 | + 'post_author' => $current_user->ID, |
|
| 6122 | + 'post_name' => $slug, |
|
| 6123 | + 'post_title' => $page_title, |
|
| 6124 | + 'post_content' => $page_content, |
|
| 6125 | + 'post_parent' => $post_parent, |
|
| 6126 | + 'comment_status' => 'closed' |
|
| 6127 | + ); |
|
| 6128 | + $page_id = wp_insert_post($page_data); |
|
| 6129 | + |
|
| 6130 | + add_option($option, $page_id); |
|
| 6131 | 6131 | |
| 6132 | 6132 | } |
| 6133 | 6133 | |
@@ -6158,9 +6158,9 @@ discard block |
||
| 6158 | 6158 | * @package GeoDirectory |
| 6159 | 6159 | */ |
| 6160 | 6160 | function geodir_admin_upgrade_notice() {
|
| 6161 | - $class = "error"; |
|
| 6162 | - $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
|
|
| 6163 | - echo"<div class=\"$class\"> <p>$message</p></div>"; |
|
| 6161 | + $class = "error"; |
|
| 6162 | + $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
|
|
| 6163 | + echo"<div class=\"$class\"> <p>$message</p></div>"; |
|
| 6164 | 6164 | } |
| 6165 | 6165 | |
| 6166 | 6166 | /** |
@@ -6173,18 +6173,18 @@ discard block |
||
| 6173 | 6173 | */ |
| 6174 | 6174 | function geodire_admin_upgrade_notice( $plugin_data, $r ) |
| 6175 | 6175 | {
|
| 6176 | - // readme contents |
|
| 6177 | - $args = array( |
|
| 6178 | - 'timeout' => 15, |
|
| 6179 | - 'redirection' => 5 |
|
| 6180 | - ); |
|
| 6181 | - $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt"; |
|
| 6182 | - $data = wp_remote_get( $url, $args ); |
|
| 6176 | + // readme contents |
|
| 6177 | + $args = array( |
|
| 6178 | + 'timeout' => 15, |
|
| 6179 | + 'redirection' => 5 |
|
| 6180 | + ); |
|
| 6181 | + $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt"; |
|
| 6182 | + $data = wp_remote_get( $url, $args ); |
|
| 6183 | 6183 | |
| 6184 | - if (!is_wp_error($data) && $data['response']['code'] == 200) {
|
|
| 6184 | + if (!is_wp_error($data) && $data['response']['code'] == 200) {
|
|
| 6185 | 6185 | |
| 6186 | - geodir_in_plugin_update_message($data['body']); |
|
| 6187 | - } |
|
| 6186 | + geodir_in_plugin_update_message($data['body']); |
|
| 6187 | + } |
|
| 6188 | 6188 | } |
| 6189 | 6189 | |
| 6190 | 6190 | |
@@ -6192,28 +6192,28 @@ discard block |
||
| 6192 | 6192 | * @param string $content http response body |
| 6193 | 6193 | */ |
| 6194 | 6194 | function geodir_in_plugin_update_message($content) {
|
| 6195 | - // Output Upgrade Notice |
|
| 6196 | - $matches = null; |
|
| 6197 | - $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis'; |
|
| 6198 | - $upgrade_notice = ''; |
|
| 6199 | - if ( preg_match( $regexp, $content, $matches ) ) {
|
|
| 6200 | - if(empty($matches)){return;}
|
|
| 6201 | - |
|
| 6202 | - $version = trim( $matches[1] ); |
|
| 6203 | - if($version && $version>GEODIRECTORY_VERSION){
|
|
| 6204 | - |
|
| 6205 | - |
|
| 6206 | - $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
|
|
| 6207 | - if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
|
|
| 6208 | - $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">'; |
|
| 6209 | - foreach ( $notices as $index => $line ) {
|
|
| 6210 | - $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
|
|
| 6211 | - } |
|
| 6212 | - $upgrade_notice .= '</div> '; |
|
| 6213 | - } |
|
| 6214 | - } |
|
| 6215 | - } |
|
| 6216 | - echo $upgrade_notice; |
|
| 6195 | + // Output Upgrade Notice |
|
| 6196 | + $matches = null; |
|
| 6197 | + $regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis'; |
|
| 6198 | + $upgrade_notice = ''; |
|
| 6199 | + if ( preg_match( $regexp, $content, $matches ) ) {
|
|
| 6200 | + if(empty($matches)){return;}
|
|
| 6201 | + |
|
| 6202 | + $version = trim( $matches[1] ); |
|
| 6203 | + if($version && $version>GEODIRECTORY_VERSION){
|
|
| 6204 | + |
|
| 6205 | + |
|
| 6206 | + $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
|
|
| 6207 | + if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
|
|
| 6208 | + $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">'; |
|
| 6209 | + foreach ( $notices as $index => $line ) {
|
|
| 6210 | + $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
|
|
| 6211 | + } |
|
| 6212 | + $upgrade_notice .= '</div> '; |
|
| 6213 | + } |
|
| 6214 | + } |
|
| 6215 | + } |
|
| 6216 | + echo $upgrade_notice; |
|
| 6217 | 6217 | } |
| 6218 | 6218 | |
| 6219 | 6219 | /** |
@@ -6246,19 +6246,19 @@ discard block |
||
| 6246 | 6246 | * @param array Listing statuses to be skipped. |
| 6247 | 6247 | */ |
| 6248 | 6248 | function geodir_imex_export_skip_statuses() {
|
| 6249 | - $statuses = array( 'trash', 'auto-draft' ); |
|
| 6249 | + $statuses = array( 'trash', 'auto-draft' ); |
|
| 6250 | 6250 | |
| 6251 | - /** |
|
| 6252 | - * Filter the statuses to skip during GD export listings. |
|
| 6253 | - * |
|
| 6254 | - * @since 1.6.0 |
|
| 6255 | - * @package GeoDirectory |
|
| 6256 | - * |
|
| 6257 | - * @param array $statuses Listing statuses to be skipped. |
|
| 6258 | - */ |
|
| 6259 | - $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses ); |
|
| 6251 | + /** |
|
| 6252 | + * Filter the statuses to skip during GD export listings. |
|
| 6253 | + * |
|
| 6254 | + * @since 1.6.0 |
|
| 6255 | + * @package GeoDirectory |
|
| 6256 | + * |
|
| 6257 | + * @param array $statuses Listing statuses to be skipped. |
|
| 6258 | + */ |
|
| 6259 | + $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses ); |
|
| 6260 | 6260 | |
| 6261 | - return $statuses; |
|
| 6261 | + return $statuses; |
|
| 6262 | 6262 | } |
| 6263 | 6263 | |
| 6264 | 6264 | /** |
@@ -6274,42 +6274,42 @@ discard block |
||
| 6274 | 6274 | * @global string $typenow Current post type. |
| 6275 | 6275 | */ |
| 6276 | 6276 | function geodir_admin_dequeue_scripts() {
|
| 6277 | - global $typenow; |
|
| 6277 | + global $typenow; |
|
| 6278 | 6278 | |
| 6279 | - // EDD |
|
| 6280 | - if (wp_script_is('jquery-chosen', 'enqueued')) {
|
|
| 6281 | - wp_dequeue_script('jquery-chosen');
|
|
| 6282 | - } |
|
| 6279 | + // EDD |
|
| 6280 | + if (wp_script_is('jquery-chosen', 'enqueued')) {
|
|
| 6281 | + wp_dequeue_script('jquery-chosen');
|
|
| 6282 | + } |
|
| 6283 | 6283 | |
| 6284 | - // Ultimate Addons for Visual Composer |
|
| 6285 | - if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {
|
|
| 6286 | - wp_dequeue_script('ultimate-vc-backend-script');
|
|
| 6287 | - } |
|
| 6284 | + // Ultimate Addons for Visual Composer |
|
| 6285 | + if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {
|
|
| 6286 | + wp_dequeue_script('ultimate-vc-backend-script');
|
|
| 6287 | + } |
|
| 6288 | 6288 | |
| 6289 | - // VC editor conflicts |
|
| 6290 | - if (class_exists('Vc_Role_Access_Controller') && wp_script_is('dfd_vc_damin_scripts', 'enqueued')) {
|
|
| 6291 | - wp_dequeue_script('dfd_vc_damin_scripts');
|
|
| 6292 | - } |
|
| 6289 | + // VC editor conflicts |
|
| 6290 | + if (class_exists('Vc_Role_Access_Controller') && wp_script_is('dfd_vc_damin_scripts', 'enqueued')) {
|
|
| 6291 | + wp_dequeue_script('dfd_vc_damin_scripts');
|
|
| 6292 | + } |
|
| 6293 | 6293 | |
| 6294 | - // Ultimate chosen |
|
| 6295 | - if (wp_script_is('ultimate-chosen-script', 'enqueued')) {
|
|
| 6296 | - wp_dequeue_script('ultimate-chosen-script');
|
|
| 6297 | - } |
|
| 6294 | + // Ultimate chosen |
|
| 6295 | + if (wp_script_is('ultimate-chosen-script', 'enqueued')) {
|
|
| 6296 | + wp_dequeue_script('ultimate-chosen-script');
|
|
| 6297 | + } |
|
| 6298 | 6298 | |
| 6299 | - // Crum composer choosen |
|
| 6300 | - if (wp_script_is('crum-composer-choosen', 'enqueued')) {
|
|
| 6301 | - wp_dequeue_script('crum-composer-choosen');
|
|
| 6302 | - } |
|
| 6299 | + // Crum composer choosen |
|
| 6300 | + if (wp_script_is('crum-composer-choosen', 'enqueued')) {
|
|
| 6301 | + wp_dequeue_script('crum-composer-choosen');
|
|
| 6302 | + } |
|
| 6303 | 6303 | |
| 6304 | - // Fix conflict Fusion Builder jquery chosen with GD jquery chosen. |
|
| 6305 | - if (class_exists('FusionBuilder') && wp_script_is('fusion_builder_chosen_js', 'enqueued')) {
|
|
| 6306 | - wp_dequeue_script('fusion_builder_chosen_js');
|
|
| 6307 | - } |
|
| 6304 | + // Fix conflict Fusion Builder jquery chosen with GD jquery chosen. |
|
| 6305 | + if (class_exists('FusionBuilder') && wp_script_is('fusion_builder_chosen_js', 'enqueued')) {
|
|
| 6306 | + wp_dequeue_script('fusion_builder_chosen_js');
|
|
| 6307 | + } |
|
| 6308 | 6308 | |
| 6309 | - // Fix conflicts timepicker & setting date value. |
|
| 6310 | - if (class_exists('acf') && wp_script_is('acf-timepicker', 'enqueued')) {
|
|
| 6311 | - wp_dequeue_script('acf-timepicker');
|
|
| 6312 | - } |
|
| 6309 | + // Fix conflicts timepicker & setting date value. |
|
| 6310 | + if (class_exists('acf') && wp_script_is('acf-timepicker', 'enqueued')) {
|
|
| 6311 | + wp_dequeue_script('acf-timepicker');
|
|
| 6312 | + } |
|
| 6313 | 6313 | } |
| 6314 | 6314 | |
| 6315 | 6315 | /** |
@@ -6325,48 +6325,48 @@ discard block |
||
| 6325 | 6325 | * @return string SQL where clause part. |
| 6326 | 6326 | */ |
| 6327 | 6327 | function geodir_imex_get_filter_where($where = '', $post_type = '') {
|
| 6328 | - global $wpdb; |
|
| 6328 | + global $wpdb; |
|
| 6329 | 6329 | |
| 6330 | - $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6330 | + $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL; |
|
| 6331 | 6331 | |
| 6332 | - if ( !empty( $filters ) ) {
|
|
| 6333 | - foreach ( $filters as $field => $value ) {
|
|
| 6334 | - switch ($field) {
|
|
| 6335 | - case 'start_date': |
|
| 6336 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'"; |
|
| 6337 | - break; |
|
| 6338 | - case 'end_date': |
|
| 6339 | - $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'"; |
|
| 6340 | - break; |
|
| 6341 | - } |
|
| 6342 | - } |
|
| 6343 | - } |
|
| 6332 | + if ( !empty( $filters ) ) {
|
|
| 6333 | + foreach ( $filters as $field => $value ) {
|
|
| 6334 | + switch ($field) {
|
|
| 6335 | + case 'start_date': |
|
| 6336 | + $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'"; |
|
| 6337 | + break; |
|
| 6338 | + case 'end_date': |
|
| 6339 | + $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'"; |
|
| 6340 | + break; |
|
| 6341 | + } |
|
| 6342 | + } |
|
| 6343 | + } |
|
| 6344 | 6344 | |
| 6345 | - return $where; |
|
| 6345 | + return $where; |
|
| 6346 | 6346 | } |
| 6347 | 6347 | add_filter('geodir_get_posts_count', 'geodir_imex_get_filter_where', 10, 2);
|
| 6348 | 6348 | add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);
|
| 6349 | 6349 | |
| 6350 | 6350 | |
| 6351 | 6351 | function geodir_fix_for_primer_theme(){
|
| 6352 | - if(!defined( 'PRIMER_VERSION' )){return;}
|
|
| 6353 | - global $pagenow; |
|
| 6352 | + if(!defined( 'PRIMER_VERSION' )){return;}
|
|
| 6353 | + global $pagenow; |
|
| 6354 | 6354 | |
| 6355 | - if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){
|
|
| 6355 | + if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) ) ){
|
|
| 6356 | 6356 | |
| 6357 | - $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] ); |
|
| 6357 | + $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] ); |
|
| 6358 | 6358 | |
| 6359 | - $post_types = geodir_get_posttypes(); |
|
| 6360 | - if ($post_type && in_array($post_type, $post_types) ) {
|
|
| 6361 | - global $primer_customizer_layouts; |
|
| 6362 | - remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10); |
|
| 6363 | - } |
|
| 6364 | - } |
|
| 6359 | + $post_types = geodir_get_posttypes(); |
|
| 6360 | + if ($post_type && in_array($post_type, $post_types) ) {
|
|
| 6361 | + global $primer_customizer_layouts; |
|
| 6362 | + remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10); |
|
| 6363 | + } |
|
| 6364 | + } |
|
| 6365 | 6365 | |
| 6366 | 6366 | } |
| 6367 | 6367 | |
| 6368 | 6368 | if(is_admin()){
|
| 6369 | - add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
|
|
| 6369 | + add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
|
|
| 6370 | 6370 | } |
| 6371 | 6371 | |
| 6372 | 6372 | |
@@ -6499,96 +6499,96 @@ discard block |
||
| 6499 | 6499 | |
| 6500 | 6500 | function geodir_ga_activation_url() {
|
| 6501 | 6501 | |
| 6502 | - return add_query_arg( array( |
|
| 6503 | - 'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
|
|
| 6504 | - 'scope' => GEODIR_GA_SCOPE, |
|
| 6505 | - 'response_type' => 'code', |
|
| 6506 | - 'redirect_uri' => GEODIR_GA_REDIRECT, |
|
| 6507 | - 'client_id' => GEODIR_GA_CLIENTID, |
|
| 6508 | - ), 'https://accounts.google.com/o/oauth2/auth' ); |
|
| 6502 | + return add_query_arg( array( |
|
| 6503 | + 'next' => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
|
|
| 6504 | + 'scope' => GEODIR_GA_SCOPE, |
|
| 6505 | + 'response_type' => 'code', |
|
| 6506 | + 'redirect_uri' => GEODIR_GA_REDIRECT, |
|
| 6507 | + 'client_id' => GEODIR_GA_CLIENTID, |
|
| 6508 | + ), 'https://accounts.google.com/o/oauth2/auth' ); |
|
| 6509 | 6509 | |
| 6510 | - return $url; |
|
| 6510 | + return $url; |
|
| 6511 | 6511 | } |
| 6512 | 6512 | |
| 6513 | 6513 | function geodir_gd_accounts(){
|
| 6514 | - $accounts = array(); |
|
| 6515 | - $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true ); |
|
| 6516 | - if($useAuth){
|
|
| 6517 | - try {
|
|
| 6518 | - $accounts = geodir_ga_get_analytics_accounts(); |
|
| 6519 | - } catch (Exception $e) {
|
|
| 6520 | - geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 6521 | - } |
|
| 6514 | + $accounts = array(); |
|
| 6515 | + $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true ); |
|
| 6516 | + if($useAuth){
|
|
| 6517 | + try {
|
|
| 6518 | + $accounts = geodir_ga_get_analytics_accounts(); |
|
| 6519 | + } catch (Exception $e) {
|
|
| 6520 | + geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 6521 | + } |
|
| 6522 | 6522 | |
| 6523 | - if(is_array($accounts)){
|
|
| 6524 | - $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
|
|
| 6525 | - }elseif(get_option('geodir_ga_account_id')){
|
|
| 6526 | - $accounts = array(); |
|
| 6527 | - $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6528 | - } |
|
| 6529 | - } |
|
| 6530 | - return $accounts; |
|
| 6523 | + if(is_array($accounts)){
|
|
| 6524 | + $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
|
|
| 6525 | + }elseif(get_option('geodir_ga_account_id')){
|
|
| 6526 | + $accounts = array(); |
|
| 6527 | + $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
|
|
| 6528 | + } |
|
| 6529 | + } |
|
| 6530 | + return $accounts; |
|
| 6531 | 6531 | } |
| 6532 | 6532 | |
| 6533 | 6533 | function geodir_ga_get_analytics_accounts() |
| 6534 | 6534 | {
|
| 6535 | - global $gd_ga_errors; |
|
| 6536 | - $accounts = array(); |
|
| 6535 | + global $gd_ga_errors; |
|
| 6536 | + $accounts = array(); |
|
| 6537 | 6537 | |
| 6538 | - if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
|
|
| 6538 | + if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
|
|
| 6539 | 6539 | |
| 6540 | 6540 | |
| 6541 | - if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
|
|
| 6542 | - return get_option('geodir_gd_uids');
|
|
| 6543 | - } |
|
| 6541 | + if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
|
|
| 6542 | + return get_option('geodir_gd_uids');
|
|
| 6543 | + } |
|
| 6544 | 6544 | |
| 6545 | - # Create a new Gdata call |
|
| 6546 | - if ( trim(get_option('geodir_ga_auth_code')) != '' )
|
|
| 6547 | - $stats = new GDGoogleAnalyticsStats(); |
|
| 6548 | - else |
|
| 6549 | - return false; |
|
| 6545 | + # Create a new Gdata call |
|
| 6546 | + if ( trim(get_option('geodir_ga_auth_code')) != '' )
|
|
| 6547 | + $stats = new GDGoogleAnalyticsStats(); |
|
| 6548 | + else |
|
| 6549 | + return false; |
|
| 6550 | 6550 | |
| 6551 | - # Check if Google sucessfully logged in |
|
| 6552 | - if ( ! $stats->checkLogin() ) |
|
| 6553 | - return false; |
|
| 6551 | + # Check if Google sucessfully logged in |
|
| 6552 | + if ( ! $stats->checkLogin() ) |
|
| 6553 | + return false; |
|
| 6554 | 6554 | |
| 6555 | - # Get a list of accounts |
|
| 6556 | - try {
|
|
| 6557 | - $accounts = $stats->getAllProfiles(); |
|
| 6558 | - } catch (Exception $e) {
|
|
| 6559 | - $gd_ga_errors[] = $e->getMessage(); |
|
| 6560 | - return false; |
|
| 6561 | - } |
|
| 6555 | + # Get a list of accounts |
|
| 6556 | + try {
|
|
| 6557 | + $accounts = $stats->getAllProfiles(); |
|
| 6558 | + } catch (Exception $e) {
|
|
| 6559 | + $gd_ga_errors[] = $e->getMessage(); |
|
| 6560 | + return false; |
|
| 6561 | + } |
|
| 6562 | 6562 | |
| 6563 | 6563 | |
| 6564 | - natcasesort ($accounts); |
|
| 6564 | + natcasesort ($accounts); |
|
| 6565 | 6565 | |
| 6566 | - # Return the account array if there are accounts |
|
| 6567 | - if ( count($accounts) > 0 ){
|
|
| 6568 | - update_option('geodir_gd_uids',$accounts);
|
|
| 6569 | - return $accounts; |
|
| 6570 | - } |
|
| 6571 | - else |
|
| 6572 | - return false; |
|
| 6566 | + # Return the account array if there are accounts |
|
| 6567 | + if ( count($accounts) > 0 ){
|
|
| 6568 | + update_option('geodir_gd_uids',$accounts);
|
|
| 6569 | + return $accounts; |
|
| 6570 | + } |
|
| 6571 | + else |
|
| 6572 | + return false; |
|
| 6573 | 6573 | } |
| 6574 | 6574 | |
| 6575 | 6575 | add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' ); |
| 6576 | 6576 | function geodir_ga_deauthorize(){
|
| 6577 | 6577 | |
| 6578 | - if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
|
|
| 6578 | + if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
|
|
| 6579 | 6579 | |
| 6580 | - die( 'Security check' ); |
|
| 6580 | + die( 'Security check' ); |
|
| 6581 | 6581 | |
| 6582 | - } else {
|
|
| 6583 | - update_option('geodir_ga_auth_token','');
|
|
| 6584 | - update_option('geodir_ga_auth_code','');
|
|
| 6585 | - update_option('geodir_gd_uids','');
|
|
| 6582 | + } else {
|
|
| 6583 | + update_option('geodir_ga_auth_token','');
|
|
| 6584 | + update_option('geodir_ga_auth_code','');
|
|
| 6585 | + update_option('geodir_gd_uids','');
|
|
| 6586 | 6586 | |
| 6587 | 6587 | |
| 6588 | - echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
|
|
| 6589 | - } |
|
| 6588 | + echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
|
|
| 6589 | + } |
|
| 6590 | 6590 | |
| 6591 | - die(); |
|
| 6591 | + die(); |
|
| 6592 | 6592 | } |
| 6593 | 6593 | |
| 6594 | 6594 | |
@@ -6599,14 +6599,14 @@ discard block |
||
| 6599 | 6599 | * @package GeoDirectory |
| 6600 | 6600 | */ |
| 6601 | 6601 | function geodir_post_type_setting_fun() {
|
| 6602 | - $post_type_arr = array(); |
|
| 6602 | + $post_type_arr = array(); |
|
| 6603 | 6603 | |
| 6604 | - $post_types = geodir_get_posttypes('object');
|
|
| 6604 | + $post_types = geodir_get_posttypes('object');
|
|
| 6605 | 6605 | |
| 6606 | - foreach ($post_types as $key => $post_types_obj) {
|
|
| 6607 | - $post_type_arr[$key] = $post_types_obj->labels->singular_name; |
|
| 6608 | - } |
|
| 6609 | - return $post_type_arr; |
|
| 6606 | + foreach ($post_types as $key => $post_types_obj) {
|
|
| 6607 | + $post_type_arr[$key] = $post_types_obj->labels->singular_name; |
|
| 6608 | + } |
|
| 6609 | + return $post_type_arr; |
|
| 6610 | 6610 | } |
| 6611 | 6611 | |
| 6612 | 6612 | /** |
@@ -6617,35 +6617,35 @@ discard block |
||
| 6617 | 6617 | */ |
| 6618 | 6618 | function geodir_listing_image_size_arr(){
|
| 6619 | 6619 | |
| 6620 | - global $_wp_additional_image_sizes; |
|
| 6621 | - |
|
| 6622 | - $sizes = array(); |
|
| 6623 | - |
|
| 6624 | - foreach ( get_intermediate_image_sizes() as $_size ) {
|
|
| 6625 | - if ( in_array( $_size, array('thumbnail', 'medium', 'medium_large', 'large') ) ) {
|
|
| 6626 | - $sizes[ $_size ]['width'] = get_option( "{$_size}_size_w" );
|
|
| 6627 | - $sizes[ $_size ]['height'] = get_option( "{$_size}_size_h" );
|
|
| 6628 | - $sizes[ $_size ]['crop'] = (bool) get_option( "{$_size}_crop" );
|
|
| 6629 | - } elseif ( isset( $_wp_additional_image_sizes[ $_size ] ) ) {
|
|
| 6630 | - $sizes[ $_size ] = array( |
|
| 6631 | - 'width' => $_wp_additional_image_sizes[ $_size ]['width'], |
|
| 6632 | - 'height' => $_wp_additional_image_sizes[ $_size ]['height'], |
|
| 6633 | - 'crop' => $_wp_additional_image_sizes[ $_size ]['crop'], |
|
| 6634 | - ); |
|
| 6635 | - } |
|
| 6636 | - } |
|
| 6620 | + global $_wp_additional_image_sizes; |
|
| 6621 | + |
|
| 6622 | + $sizes = array(); |
|
| 6623 | + |
|
| 6624 | + foreach ( get_intermediate_image_sizes() as $_size ) {
|
|
| 6625 | + if ( in_array( $_size, array('thumbnail', 'medium', 'medium_large', 'large') ) ) {
|
|
| 6626 | + $sizes[ $_size ]['width'] = get_option( "{$_size}_size_w" );
|
|
| 6627 | + $sizes[ $_size ]['height'] = get_option( "{$_size}_size_h" );
|
|
| 6628 | + $sizes[ $_size ]['crop'] = (bool) get_option( "{$_size}_crop" );
|
|
| 6629 | + } elseif ( isset( $_wp_additional_image_sizes[ $_size ] ) ) {
|
|
| 6630 | + $sizes[ $_size ] = array( |
|
| 6631 | + 'width' => $_wp_additional_image_sizes[ $_size ]['width'], |
|
| 6632 | + 'height' => $_wp_additional_image_sizes[ $_size ]['height'], |
|
| 6633 | + 'crop' => $_wp_additional_image_sizes[ $_size ]['crop'], |
|
| 6634 | + ); |
|
| 6635 | + } |
|
| 6636 | + } |
|
| 6637 | 6637 | |
| 6638 | 6638 | |
| 6639 | 6639 | |
| 6640 | - $options = array(); |
|
| 6640 | + $options = array(); |
|
| 6641 | 6641 | |
| 6642 | - $options['default'] = __('GD Default', 'geodirectory');
|
|
| 6642 | + $options['default'] = __('GD Default', 'geodirectory');
|
|
| 6643 | 6643 | |
| 6644 | - if(!empty($sizes)){
|
|
| 6645 | - foreach($sizes as $key=>$val){
|
|
| 6646 | - $options[$key] = $key. ' ( '.$val['width'].' x '.$val['height']. ' )'; |
|
| 6647 | - } |
|
| 6648 | - } |
|
| 6644 | + if(!empty($sizes)){
|
|
| 6645 | + foreach($sizes as $key=>$val){
|
|
| 6646 | + $options[$key] = $key. ' ( '.$val['width'].' x '.$val['height']. ' )'; |
|
| 6647 | + } |
|
| 6648 | + } |
|
| 6649 | 6649 | |
| 6650 | - return $options; |
|
| 6650 | + return $options; |
|
| 6651 | 6651 | } |
| 6652 | 6652 | \ No newline at end of file |
@@ -8,8 +8,8 @@ discard block |
||
| 8 | 8 | |
| 9 | 9 | // Enable map cache if set |
| 10 | 10 | if(get_option('geodir_enable_map_cache')){
|
| 11 | - add_filter('geodir_get_markers_cache','geodir_get_map_cache');
|
|
| 12 | - add_filter('geodir_markers_json','geodir_save_map_cache',10);
|
|
| 11 | + add_filter('geodir_get_markers_cache','geodir_get_map_cache');
|
|
| 12 | + add_filter('geodir_markers_json','geodir_save_map_cache',10);
|
|
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | |
@@ -23,56 +23,56 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | function geodir_get_map_cache($cache){
|
| 25 | 25 | |
| 26 | - // if a search is going on then dont even try to check for cache. |
|
| 27 | - if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){
|
|
| 28 | - return $cache; |
|
| 29 | - } |
|
| 30 | - |
|
| 31 | - $url_params = array(); |
|
| 32 | - $url_params[] = isset($_REQUEST['cat_id']) ? $_REQUEST['cat_id'] : ''; |
|
| 33 | - $url_params[] = isset($_REQUEST['zl']) ? $_REQUEST['zl'] : ''; |
|
| 34 | - $url_params[] = isset($_REQUEST['gd_map_h']) ? $_REQUEST['gd_map_h'] : ''; |
|
| 35 | - $url_params[] = isset($_REQUEST['gd_map_w']) ? $_REQUEST['gd_map_w'] : ''; |
|
| 36 | - $url_params[] = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : ''; |
|
| 37 | - $url_params[] = isset($_REQUEST['lat_ne']) ? $_REQUEST['lat_ne'] : ''; |
|
| 38 | - $url_params[] = isset($_REQUEST['lon_ne']) ? $_REQUEST['lon_ne'] : ''; |
|
| 39 | - $url_params[] = isset($_REQUEST['lat_sw']) ? $_REQUEST['lat_sw'] : ''; |
|
| 40 | - $url_params[] = isset($_REQUEST['lon_sw']) ? $_REQUEST['lon_sw'] : ''; |
|
| 41 | - $url_params[] = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : ''; |
|
| 42 | - $url_params[] = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : ''; |
|
| 43 | - $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : ''; |
|
| 44 | - $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : ''; |
|
| 45 | - |
|
| 46 | - $file_name = sanitize_file_name( md5( implode("-",$url_params) ) );
|
|
| 47 | - |
|
| 48 | - $blog_id = get_current_blog_id(); |
|
| 49 | - if($blog_id>1){
|
|
| 50 | - $file_name = $blog_id."_".$file_name; |
|
| 51 | - } |
|
| 52 | - |
|
| 53 | - $file_path = realpath(dirname(__FILE__))."/map-cache/"; |
|
| 54 | - $file = $file_path . $file_name . ".json"; |
|
| 55 | - |
|
| 56 | - if(file_exists($file)){
|
|
| 57 | - // do the cache delete stuff |
|
| 58 | - $cache_time = get_option('geodir_map_cache');
|
|
| 59 | - if(!$cache_time){
|
|
| 60 | - $cache_time = time(); |
|
| 61 | - update_option('geodir_map_cache', $cache_time);
|
|
| 62 | - } |
|
| 63 | - |
|
| 64 | - if((time() - $cache_time) > 86400){ // delete the cache every 24 hours
|
|
| 65 | - geodir_delete_map_cache(); |
|
| 66 | - } |
|
| 67 | - |
|
| 68 | - if(file_exists($file) && is_readable($file)){
|
|
| 69 | - ob_start(); |
|
| 70 | - readfile($file); // readfile is quicker then file get contents |
|
| 71 | - return ob_get_clean(); |
|
| 72 | - } |
|
| 73 | - } |
|
| 74 | - |
|
| 75 | - return $cache; |
|
| 26 | + // if a search is going on then dont even try to check for cache. |
|
| 27 | + if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){
|
|
| 28 | + return $cache; |
|
| 29 | + } |
|
| 30 | + |
|
| 31 | + $url_params = array(); |
|
| 32 | + $url_params[] = isset($_REQUEST['cat_id']) ? $_REQUEST['cat_id'] : ''; |
|
| 33 | + $url_params[] = isset($_REQUEST['zl']) ? $_REQUEST['zl'] : ''; |
|
| 34 | + $url_params[] = isset($_REQUEST['gd_map_h']) ? $_REQUEST['gd_map_h'] : ''; |
|
| 35 | + $url_params[] = isset($_REQUEST['gd_map_w']) ? $_REQUEST['gd_map_w'] : ''; |
|
| 36 | + $url_params[] = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : ''; |
|
| 37 | + $url_params[] = isset($_REQUEST['lat_ne']) ? $_REQUEST['lat_ne'] : ''; |
|
| 38 | + $url_params[] = isset($_REQUEST['lon_ne']) ? $_REQUEST['lon_ne'] : ''; |
|
| 39 | + $url_params[] = isset($_REQUEST['lat_sw']) ? $_REQUEST['lat_sw'] : ''; |
|
| 40 | + $url_params[] = isset($_REQUEST['lon_sw']) ? $_REQUEST['lon_sw'] : ''; |
|
| 41 | + $url_params[] = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : ''; |
|
| 42 | + $url_params[] = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : ''; |
|
| 43 | + $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : ''; |
|
| 44 | + $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : ''; |
|
| 45 | + |
|
| 46 | + $file_name = sanitize_file_name( md5( implode("-",$url_params) ) );
|
|
| 47 | + |
|
| 48 | + $blog_id = get_current_blog_id(); |
|
| 49 | + if($blog_id>1){
|
|
| 50 | + $file_name = $blog_id."_".$file_name; |
|
| 51 | + } |
|
| 52 | + |
|
| 53 | + $file_path = realpath(dirname(__FILE__))."/map-cache/"; |
|
| 54 | + $file = $file_path . $file_name . ".json"; |
|
| 55 | + |
|
| 56 | + if(file_exists($file)){
|
|
| 57 | + // do the cache delete stuff |
|
| 58 | + $cache_time = get_option('geodir_map_cache');
|
|
| 59 | + if(!$cache_time){
|
|
| 60 | + $cache_time = time(); |
|
| 61 | + update_option('geodir_map_cache', $cache_time);
|
|
| 62 | + } |
|
| 63 | + |
|
| 64 | + if((time() - $cache_time) > 86400){ // delete the cache every 24 hours
|
|
| 65 | + geodir_delete_map_cache(); |
|
| 66 | + } |
|
| 67 | + |
|
| 68 | + if(file_exists($file) && is_readable($file)){
|
|
| 69 | + ob_start(); |
|
| 70 | + readfile($file); // readfile is quicker then file get contents |
|
| 71 | + return ob_get_clean(); |
|
| 72 | + } |
|
| 73 | + } |
|
| 74 | + |
|
| 75 | + return $cache; |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | |
@@ -85,109 +85,109 @@ discard block |
||
| 85 | 85 | */ |
| 86 | 86 | function geodir_save_map_cache($map_json){
|
| 87 | 87 | |
| 88 | - // if a search is going on then dont even try to check for cache. |
|
| 89 | - if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){
|
|
| 90 | - return $map_json; |
|
| 91 | - } |
|
| 92 | - |
|
| 93 | - $url_params = array(); |
|
| 94 | - $url_params[] = isset($_REQUEST['cat_id']) ? $_REQUEST['cat_id'] : ''; |
|
| 95 | - $url_params[] = isset($_REQUEST['zl']) ? $_REQUEST['zl'] : ''; |
|
| 96 | - $url_params[] = isset($_REQUEST['gd_map_h']) ? $_REQUEST['gd_map_h'] : ''; |
|
| 97 | - $url_params[] = isset($_REQUEST['gd_map_w']) ? $_REQUEST['gd_map_w'] : ''; |
|
| 98 | - $url_params[] = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : ''; |
|
| 99 | - $url_params[] = isset($_REQUEST['lat_ne']) ? $_REQUEST['lat_ne'] : ''; |
|
| 100 | - $url_params[] = isset($_REQUEST['lon_ne']) ? $_REQUEST['lon_ne'] : ''; |
|
| 101 | - $url_params[] = isset($_REQUEST['lat_sw']) ? $_REQUEST['lat_sw'] : ''; |
|
| 102 | - $url_params[] = isset($_REQUEST['lon_sw']) ? $_REQUEST['lon_sw'] : ''; |
|
| 103 | - $url_params[] = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : ''; |
|
| 104 | - $url_params[] = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : ''; |
|
| 105 | - $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : ''; |
|
| 106 | - $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : ''; |
|
| 107 | - |
|
| 108 | - $file_name = sanitize_file_name( md5( implode("-",$url_params) ) );
|
|
| 109 | - |
|
| 110 | - $blog_id = get_current_blog_id(); |
|
| 111 | - if($blog_id>1){
|
|
| 112 | - $file_name = $blog_id."_".$file_name; |
|
| 113 | - } |
|
| 114 | - |
|
| 115 | - $file_path = realpath(dirname(__FILE__))."/map-cache/"; |
|
| 116 | - |
|
| 117 | - |
|
| 118 | - global $wp_filesystem; |
|
| 119 | - if (empty($wp_filesystem)) {
|
|
| 120 | - require_once (ABSPATH . '/wp-admin/includes/file.php'); |
|
| 121 | - WP_Filesystem(); |
|
| 122 | - } |
|
| 123 | - $wp_filesystem->put_contents( |
|
| 124 | - $file_path.$file_name.".json", |
|
| 125 | - $map_json, |
|
| 126 | - FS_CHMOD_FILE // predefined mode settings for WP files |
|
| 127 | - ); |
|
| 128 | - |
|
| 129 | - |
|
| 130 | - return $map_json; |
|
| 88 | + // if a search is going on then dont even try to check for cache. |
|
| 89 | + if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){
|
|
| 90 | + return $map_json; |
|
| 91 | + } |
|
| 92 | + |
|
| 93 | + $url_params = array(); |
|
| 94 | + $url_params[] = isset($_REQUEST['cat_id']) ? $_REQUEST['cat_id'] : ''; |
|
| 95 | + $url_params[] = isset($_REQUEST['zl']) ? $_REQUEST['zl'] : ''; |
|
| 96 | + $url_params[] = isset($_REQUEST['gd_map_h']) ? $_REQUEST['gd_map_h'] : ''; |
|
| 97 | + $url_params[] = isset($_REQUEST['gd_map_w']) ? $_REQUEST['gd_map_w'] : ''; |
|
| 98 | + $url_params[] = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : ''; |
|
| 99 | + $url_params[] = isset($_REQUEST['lat_ne']) ? $_REQUEST['lat_ne'] : ''; |
|
| 100 | + $url_params[] = isset($_REQUEST['lon_ne']) ? $_REQUEST['lon_ne'] : ''; |
|
| 101 | + $url_params[] = isset($_REQUEST['lat_sw']) ? $_REQUEST['lat_sw'] : ''; |
|
| 102 | + $url_params[] = isset($_REQUEST['lon_sw']) ? $_REQUEST['lon_sw'] : ''; |
|
| 103 | + $url_params[] = isset($_REQUEST['gd_country']) ? $_REQUEST['gd_country'] : ''; |
|
| 104 | + $url_params[] = isset($_REQUEST['gd_region']) ? $_REQUEST['gd_region'] : ''; |
|
| 105 | + $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : ''; |
|
| 106 | + $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : ''; |
|
| 107 | + |
|
| 108 | + $file_name = sanitize_file_name( md5( implode("-",$url_params) ) );
|
|
| 109 | + |
|
| 110 | + $blog_id = get_current_blog_id(); |
|
| 111 | + if($blog_id>1){
|
|
| 112 | + $file_name = $blog_id."_".$file_name; |
|
| 113 | + } |
|
| 114 | + |
|
| 115 | + $file_path = realpath(dirname(__FILE__))."/map-cache/"; |
|
| 116 | + |
|
| 117 | + |
|
| 118 | + global $wp_filesystem; |
|
| 119 | + if (empty($wp_filesystem)) {
|
|
| 120 | + require_once (ABSPATH . '/wp-admin/includes/file.php'); |
|
| 121 | + WP_Filesystem(); |
|
| 122 | + } |
|
| 123 | + $wp_filesystem->put_contents( |
|
| 124 | + $file_path.$file_name.".json", |
|
| 125 | + $map_json, |
|
| 126 | + FS_CHMOD_FILE // predefined mode settings for WP files |
|
| 127 | + ); |
|
| 128 | + |
|
| 129 | + |
|
| 130 | + return $map_json; |
|
| 131 | 131 | |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | |
| 135 | 135 | if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'homemap_catlist') {
|
| 136 | - global $gd_session; |
|
| 137 | - $gd_post_type = sanitize_text_field($_REQUEST['post_type']); |
|
| 138 | - $gd_session->set('homemap_catlist_ptype', $gd_post_type);
|
|
| 139 | - $post_taxonomy = geodir_get_taxonomies($gd_post_type); |
|
| 140 | - $map_canvas_name = sanitize_text_field($_REQUEST['map_canvas']); |
|
| 141 | - $child_collapse = (bool)$_REQUEST['child_collapse']; |
|
| 142 | - echo home_map_taxonomy_walker($post_taxonomy, 0, true, 0, $map_canvas_name, $child_collapse, true); |
|
| 143 | - die; |
|
| 136 | + global $gd_session; |
|
| 137 | + $gd_post_type = sanitize_text_field($_REQUEST['post_type']); |
|
| 138 | + $gd_session->set('homemap_catlist_ptype', $gd_post_type);
|
|
| 139 | + $post_taxonomy = geodir_get_taxonomies($gd_post_type); |
|
| 140 | + $map_canvas_name = sanitize_text_field($_REQUEST['map_canvas']); |
|
| 141 | + $child_collapse = (bool)$_REQUEST['child_collapse']; |
|
| 142 | + echo home_map_taxonomy_walker($post_taxonomy, 0, true, 0, $map_canvas_name, $child_collapse, true); |
|
| 143 | + die; |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | // Send the content-type header with correct encoding |
| 147 | 147 | header("Content-type: text/javascript; charset=utf-8");
|
| 148 | 148 | |
| 149 | 149 | if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'cat') { // Retrives markers data for categories
|
| 150 | - echo get_markers(); |
|
| 151 | - exit; |
|
| 150 | + echo get_markers(); |
|
| 151 | + exit; |
|
| 152 | 152 | } else if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'info') { // Retrives marker info window html
|
| 153 | - /** |
|
| 154 | - * @global object $wpdb WordPress Database object. |
|
| 155 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 156 | - * @global object $gd_session GeoDirectory Session object. |
|
| 157 | - */ |
|
| 158 | - global $wpdb, $plugin_prefix, $gd_session; |
|
| 159 | - |
|
| 160 | - if ($_REQUEST['m_id'] != '') {
|
|
| 161 | - $pid = (int)$_REQUEST['m_id']; |
|
| 162 | - } else {
|
|
| 163 | - echo __('No marker data found', 'geodirectory');
|
|
| 164 | - exit; |
|
| 165 | - } |
|
| 166 | - |
|
| 167 | - if (isset($_REQUEST['post_preview']) && $_REQUEST['post_preview'] != '' && $gd_ses_listing = $gd_session->get('listing')) {
|
|
| 168 | - $post = (object)$gd_ses_listing; |
|
| 169 | - echo geodir_get_infowindow_html($post, $_REQUEST['post_preview']); |
|
| 170 | - } else {
|
|
| 171 | - $geodir_post_type = get_post_type($pid); |
|
| 172 | - |
|
| 173 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 174 | - |
|
| 175 | - $sql = $wpdb->prepare("SELECT * FROM " . $table . " WHERE post_id = %d", array($pid));
|
|
| 176 | - |
|
| 177 | - $postinfo = $wpdb->get_results($sql); |
|
| 178 | - |
|
| 179 | - $data_arr = array(); |
|
| 180 | - |
|
| 181 | - if ($postinfo) {
|
|
| 182 | - $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 183 | - $replarr = array("′", "⁄", "–", "“", '');
|
|
| 184 | - |
|
| 185 | - foreach ($postinfo as $postinfo_obj) {
|
|
| 186 | - echo geodir_get_infowindow_html($postinfo_obj); |
|
| 187 | - } |
|
| 188 | - } |
|
| 189 | - } |
|
| 190 | - exit; |
|
| 153 | + /** |
|
| 154 | + * @global object $wpdb WordPress Database object. |
|
| 155 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 156 | + * @global object $gd_session GeoDirectory Session object. |
|
| 157 | + */ |
|
| 158 | + global $wpdb, $plugin_prefix, $gd_session; |
|
| 159 | + |
|
| 160 | + if ($_REQUEST['m_id'] != '') {
|
|
| 161 | + $pid = (int)$_REQUEST['m_id']; |
|
| 162 | + } else {
|
|
| 163 | + echo __('No marker data found', 'geodirectory');
|
|
| 164 | + exit; |
|
| 165 | + } |
|
| 166 | + |
|
| 167 | + if (isset($_REQUEST['post_preview']) && $_REQUEST['post_preview'] != '' && $gd_ses_listing = $gd_session->get('listing')) {
|
|
| 168 | + $post = (object)$gd_ses_listing; |
|
| 169 | + echo geodir_get_infowindow_html($post, $_REQUEST['post_preview']); |
|
| 170 | + } else {
|
|
| 171 | + $geodir_post_type = get_post_type($pid); |
|
| 172 | + |
|
| 173 | + $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 174 | + |
|
| 175 | + $sql = $wpdb->prepare("SELECT * FROM " . $table . " WHERE post_id = %d", array($pid));
|
|
| 176 | + |
|
| 177 | + $postinfo = $wpdb->get_results($sql); |
|
| 178 | + |
|
| 179 | + $data_arr = array(); |
|
| 180 | + |
|
| 181 | + if ($postinfo) {
|
|
| 182 | + $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 183 | + $replarr = array("′", "⁄", "–", "“", '');
|
|
| 184 | + |
|
| 185 | + foreach ($postinfo as $postinfo_obj) {
|
|
| 186 | + echo geodir_get_infowindow_html($postinfo_obj); |
|
| 187 | + } |
|
| 188 | + } |
|
| 189 | + } |
|
| 190 | + exit; |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | /** |
@@ -206,93 +206,93 @@ discard block |
||
| 206 | 206 | */ |
| 207 | 207 | function get_markers() {
|
| 208 | 208 | |
| 209 | - global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes,$gd_session; |
|
| 209 | + global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes,$gd_session; |
|
| 210 | 210 | |
| 211 | 211 | |
| 212 | - /** |
|
| 213 | - * Filter to allow for any map caching to be output before queries. |
|
| 214 | - * |
|
| 215 | - * @since 1.6.22 |
|
| 216 | - */ |
|
| 217 | - $map_cache = apply_filters('geodir_get_markers_cache','');
|
|
| 218 | - if($map_cache){
|
|
| 219 | - return $map_cache; |
|
| 220 | - wp_die(); |
|
| 221 | - } |
|
| 212 | + /** |
|
| 213 | + * Filter to allow for any map caching to be output before queries. |
|
| 214 | + * |
|
| 215 | + * @since 1.6.22 |
|
| 216 | + */ |
|
| 217 | + $map_cache = apply_filters('geodir_get_markers_cache','');
|
|
| 218 | + if($map_cache){
|
|
| 219 | + return $map_cache; |
|
| 220 | + wp_die(); |
|
| 221 | + } |
|
| 222 | 222 | |
| 223 | 223 | |
| 224 | 224 | |
| 225 | - $search = ''; |
|
| 225 | + $search = ''; |
|
| 226 | 226 | |
| 227 | - $srcharr = array("'", "/", "-", '"', '\\', ''');
|
|
| 228 | - $replarr = array("′", "⁄", "–", "“", '', "′");
|
|
| 227 | + $srcharr = array("'", "/", "-", '"', '\\', ''');
|
|
| 228 | + $replarr = array("′", "⁄", "–", "“", '', "′");
|
|
| 229 | 229 | |
| 230 | - $post_type = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : 'gd_place'; |
|
| 230 | + $post_type = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : 'gd_place'; |
|
| 231 | 231 | |
| 232 | - $map_cat_ids_array = array('0');
|
|
| 233 | - $cat_find_array = array(" FIND_IN_SET(%d, pd." . $post_type . "category)");
|
|
| 232 | + $map_cat_ids_array = array('0');
|
|
| 233 | + $cat_find_array = array(" FIND_IN_SET(%d, pd." . $post_type . "category)");
|
|
| 234 | 234 | |
| 235 | 235 | |
| 236 | - $field_default_cat = ''; |
|
| 237 | - if (isset($_REQUEST['cat_id']) && $_REQUEST['cat_id'] != '') {
|
|
| 238 | - $map_cat_arr = trim($_REQUEST['cat_id'], ','); |
|
| 236 | + $field_default_cat = ''; |
|
| 237 | + if (isset($_REQUEST['cat_id']) && $_REQUEST['cat_id'] != '') {
|
|
| 238 | + $map_cat_arr = trim($_REQUEST['cat_id'], ','); |
|
| 239 | 239 | |
| 240 | - if (!empty($map_cat_arr)) {
|
|
| 241 | - $field_default_cat .= "WHEN (default_category IN (" . $map_cat_arr . ")) THEN default_category ";
|
|
| 240 | + if (!empty($map_cat_arr)) {
|
|
| 241 | + $field_default_cat .= "WHEN (default_category IN (" . $map_cat_arr . ")) THEN default_category ";
|
|
| 242 | 242 | |
| 243 | - $map_cat_ids_array = explode(',', $map_cat_arr);
|
|
| 244 | - $cat_find_array = array(); |
|
| 245 | - foreach ($map_cat_ids_array as $cat_id) {
|
|
| 246 | - $field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `" . $post_type . "category`) > 0) THEN $cat_id "; |
|
| 247 | - $cat_find_array[] = " FIND_IN_SET(%d, pd." . $post_type . "category)"; |
|
| 248 | - $main_query_array[] = $cat_id; |
|
| 249 | - } |
|
| 243 | + $map_cat_ids_array = explode(',', $map_cat_arr);
|
|
| 244 | + $cat_find_array = array(); |
|
| 245 | + foreach ($map_cat_ids_array as $cat_id) {
|
|
| 246 | + $field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `" . $post_type . "category`) > 0) THEN $cat_id "; |
|
| 247 | + $cat_find_array[] = " FIND_IN_SET(%d, pd." . $post_type . "category)"; |
|
| 248 | + $main_query_array[] = $cat_id; |
|
| 249 | + } |
|
| 250 | 250 | |
| 251 | - } |
|
| 252 | - } |
|
| 251 | + } |
|
| 252 | + } |
|
| 253 | 253 | |
| 254 | - if (!empty($field_default_cat)) |
|
| 255 | - $field_default_cat = ''; |
|
| 254 | + if (!empty($field_default_cat)) |
|
| 255 | + $field_default_cat = ''; |
|
| 256 | 256 | |
| 257 | - if (!empty($cat_find_array)) |
|
| 258 | - $search .= "AND (" . implode(' OR ', $cat_find_array) . ")";
|
|
| 257 | + if (!empty($cat_find_array)) |
|
| 258 | + $search .= "AND (" . implode(' OR ', $cat_find_array) . ")";
|
|
| 259 | 259 | |
| 260 | - $main_query_array = $map_cat_ids_array; |
|
| 260 | + $main_query_array = $map_cat_ids_array; |
|
| 261 | 261 | |
| 262 | - if (isset($_REQUEST['search']) && !empty($_REQUEST['search']) && $_REQUEST['search'] != __('Title', 'geodirectory')) {
|
|
| 263 | - $search .= " AND p.post_title LIKE %s"; |
|
| 264 | - $main_query_array[] = "%" . $_REQUEST['search'] . "%"; |
|
| 265 | - } |
|
| 266 | - |
|
| 267 | - /** |
|
| 268 | - * Filter the marker query search SQL, values are replaces with %s or %d. |
|
| 269 | - * |
|
| 270 | - * @since 1.5.3 |
|
| 271 | - * |
|
| 272 | - * @param string $search The SQL query for search/where. |
|
| 273 | - */ |
|
| 274 | - $search = apply_filters('geodir_marker_search', $search);
|
|
| 275 | - /** |
|
| 276 | - * Filter the marker query search SQL values %s and %d, this is an array of values. |
|
| 277 | - * |
|
| 278 | - * @since 1.5.3 |
|
| 279 | - * |
|
| 280 | - * @param array $main_query_array The SQL query values for search/where. |
|
| 281 | - */ |
|
| 282 | - $main_query_array = apply_filters('geodir_marker_main_query_array', $main_query_array);
|
|
| 283 | - |
|
| 284 | - $gd_posttype = ''; |
|
| 285 | - if (isset($_REQUEST['gd_posttype']) && $_REQUEST['gd_posttype'] != '') {
|
|
| 286 | - $table = $plugin_prefix . $_REQUEST['gd_posttype'] . '_detail'; |
|
| 287 | - $gd_posttype = " AND p.post_type = %s"; |
|
| 288 | - $main_query_array[] = $_REQUEST['gd_posttype']; |
|
| 289 | - |
|
| 290 | - } else |
|
| 291 | - $table = $plugin_prefix . 'gd_place_detail'; |
|
| 292 | - |
|
| 293 | - $join = ", " . $table . " AS pd "; |
|
| 294 | - |
|
| 295 | - /** |
|
| 262 | + if (isset($_REQUEST['search']) && !empty($_REQUEST['search']) && $_REQUEST['search'] != __('Title', 'geodirectory')) {
|
|
| 263 | + $search .= " AND p.post_title LIKE %s"; |
|
| 264 | + $main_query_array[] = "%" . $_REQUEST['search'] . "%"; |
|
| 265 | + } |
|
| 266 | + |
|
| 267 | + /** |
|
| 268 | + * Filter the marker query search SQL, values are replaces with %s or %d. |
|
| 269 | + * |
|
| 270 | + * @since 1.5.3 |
|
| 271 | + * |
|
| 272 | + * @param string $search The SQL query for search/where. |
|
| 273 | + */ |
|
| 274 | + $search = apply_filters('geodir_marker_search', $search);
|
|
| 275 | + /** |
|
| 276 | + * Filter the marker query search SQL values %s and %d, this is an array of values. |
|
| 277 | + * |
|
| 278 | + * @since 1.5.3 |
|
| 279 | + * |
|
| 280 | + * @param array $main_query_array The SQL query values for search/where. |
|
| 281 | + */ |
|
| 282 | + $main_query_array = apply_filters('geodir_marker_main_query_array', $main_query_array);
|
|
| 283 | + |
|
| 284 | + $gd_posttype = ''; |
|
| 285 | + if (isset($_REQUEST['gd_posttype']) && $_REQUEST['gd_posttype'] != '') {
|
|
| 286 | + $table = $plugin_prefix . $_REQUEST['gd_posttype'] . '_detail'; |
|
| 287 | + $gd_posttype = " AND p.post_type = %s"; |
|
| 288 | + $main_query_array[] = $_REQUEST['gd_posttype']; |
|
| 289 | + |
|
| 290 | + } else |
|
| 291 | + $table = $plugin_prefix . 'gd_place_detail'; |
|
| 292 | + |
|
| 293 | + $join = ", " . $table . " AS pd "; |
|
| 294 | + |
|
| 295 | + /** |
|
| 296 | 296 | * Filter the SQL JOIN clause for the markers data |
| 297 | 297 | * |
| 298 | 298 | * @since 1.0.0 |
@@ -309,16 +309,16 @@ discard block |
||
| 309 | 309 | * @param string $search Row of searched fields to use in WHERE clause. |
| 310 | 310 | */ |
| 311 | 311 | $search = apply_filters('geodir_home_map_listing_where', $search);
|
| 312 | - $search = str_replace(array("'%", "%'"), array("'%%", "%%'"), $search);
|
|
| 313 | - $cat_type = $post_type . 'category'; |
|
| 314 | - if ($post_type == 'gd_event') {
|
|
| 315 | - $event_select = ", pd.recurring_dates, pd.is_recurring"; |
|
| 316 | - } else {
|
|
| 317 | - $event_select = ""; |
|
| 318 | - } |
|
| 319 | - |
|
| 320 | - $sql_select = 'SELECT pd.default_category, pd.' . $cat_type . ', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude' . $event_select; |
|
| 321 | - /** |
|
| 312 | + $search = str_replace(array("'%", "%'"), array("'%%", "%%'"), $search);
|
|
| 313 | + $cat_type = $post_type . 'category'; |
|
| 314 | + if ($post_type == 'gd_event') {
|
|
| 315 | + $event_select = ", pd.recurring_dates, pd.is_recurring"; |
|
| 316 | + } else {
|
|
| 317 | + $event_select = ""; |
|
| 318 | + } |
|
| 319 | + |
|
| 320 | + $sql_select = 'SELECT pd.default_category, pd.' . $cat_type . ', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude' . $event_select; |
|
| 321 | + /** |
|
| 322 | 322 | * Filter the SQL SELECT clause to retrive fields data |
| 323 | 323 | * |
| 324 | 324 | * @since 1.0.0 |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | */ |
| 338 | 338 | $groupby = apply_filters('geodir_home_map_listing_groupby', $groupby);
|
| 339 | 339 | |
| 340 | - $catsql = $wpdb->prepare("$select $field_default_cat FROM " . $wpdb->posts . " as p" . $join . " WHERE p.ID = pd.post_id AND p.post_status = 'publish' " . $search . $gd_posttype . $groupby , $main_query_array);
|
|
| 340 | + $catsql = $wpdb->prepare("$select $field_default_cat FROM " . $wpdb->posts . " as p" . $join . " WHERE p.ID = pd.post_id AND p.post_status = 'publish' " . $search . $gd_posttype . $groupby , $main_query_array);
|
|
| 341 | 341 | |
| 342 | 342 | /** |
| 343 | 343 | * Filter the SQL query to retrive markers data |
@@ -353,276 +353,276 @@ discard block |
||
| 353 | 353 | // print_r($gd_session); |
| 354 | 354 | // print_r($_SESSION); |
| 355 | 355 | |
| 356 | - $catinfo = $wpdb->get_results($catsql); |
|
| 356 | + $catinfo = $wpdb->get_results($catsql); |
|
| 357 | 357 | |
| 358 | - $cat_content_info = array(); |
|
| 359 | - $content_data = array(); |
|
| 360 | - $post_ids = array(); |
|
| 361 | - |
|
| 362 | - /** |
|
| 363 | - * Called before marker data is processed into JSON. |
|
| 364 | - * |
|
| 365 | - * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers. |
|
| 366 | - * |
|
| 367 | - * @since 1.5.3 |
|
| 368 | - * @param object $catinfo The posts object containing all marker data. |
|
| 369 | - * @see 'geodir_after_marker_post_process' |
|
| 370 | - */ |
|
| 371 | - $catinfo = apply_filters('geodir_before_marker_post_process', $catinfo);
|
|
| 372 | - |
|
| 373 | - /** |
|
| 374 | - * Called before marker data is processed into JSON. |
|
| 375 | - * |
|
| 376 | - * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers. |
|
| 377 | - * |
|
| 378 | - * @since 1.4.9 |
|
| 379 | - * @param object $catinfo The posts object containing all marker data. |
|
| 380 | - * @see 'geodir_after_marker_post_process' |
|
| 381 | - */ |
|
| 382 | - do_action('geodir_before_marker_post_process_action', $catinfo);
|
|
| 383 | - |
|
| 384 | - // Sort any posts into a ajax array |
|
| 385 | - if (!empty($catinfo)) {
|
|
| 386 | - $geodir_cat_icons = geodir_get_term_icon(); |
|
| 387 | - global $geodir_date_time_format, $geodir_date_format, $geodir_time_format; |
|
| 388 | - |
|
| 389 | - $today = strtotime(date_i18n('Y-m-d'));
|
|
| 390 | - $show_dates = $post_type == 'gd_event' ? (int)get_option('geodir_event_infowindow_dates_count', 1) : 0;
|
|
| 358 | + $cat_content_info = array(); |
|
| 359 | + $content_data = array(); |
|
| 360 | + $post_ids = array(); |
|
| 361 | + |
|
| 362 | + /** |
|
| 363 | + * Called before marker data is processed into JSON. |
|
| 364 | + * |
|
| 365 | + * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers. |
|
| 366 | + * |
|
| 367 | + * @since 1.5.3 |
|
| 368 | + * @param object $catinfo The posts object containing all marker data. |
|
| 369 | + * @see 'geodir_after_marker_post_process' |
|
| 370 | + */ |
|
| 371 | + $catinfo = apply_filters('geodir_before_marker_post_process', $catinfo);
|
|
| 372 | + |
|
| 373 | + /** |
|
| 374 | + * Called before marker data is processed into JSON. |
|
| 375 | + * |
|
| 376 | + * Called before marker data is processed into JSON, this action can be used to change the format or add/remove markers. |
|
| 377 | + * |
|
| 378 | + * @since 1.4.9 |
|
| 379 | + * @param object $catinfo The posts object containing all marker data. |
|
| 380 | + * @see 'geodir_after_marker_post_process' |
|
| 381 | + */ |
|
| 382 | + do_action('geodir_before_marker_post_process_action', $catinfo);
|
|
| 383 | + |
|
| 384 | + // Sort any posts into a ajax array |
|
| 385 | + if (!empty($catinfo)) {
|
|
| 386 | + $geodir_cat_icons = geodir_get_term_icon(); |
|
| 387 | + global $geodir_date_time_format, $geodir_date_format, $geodir_time_format; |
|
| 388 | + |
|
| 389 | + $today = strtotime(date_i18n('Y-m-d'));
|
|
| 390 | + $show_dates = $post_type == 'gd_event' ? (int)get_option('geodir_event_infowindow_dates_count', 1) : 0;
|
|
| 391 | 391 | |
| 392 | - foreach ($catinfo as $catinfo_obj) {
|
|
| 393 | - $post_title = $catinfo_obj->post_title; |
|
| 392 | + foreach ($catinfo as $catinfo_obj) {
|
|
| 393 | + $post_title = $catinfo_obj->post_title; |
|
| 394 | 394 | |
| 395 | - if ($post_type == 'gd_event' && !empty($catinfo_obj->recurring_dates) && $show_dates > 0) {
|
|
| 396 | - $event_dates = ''; |
|
| 397 | - $recurring_data = isset($catinfo_obj->recurring_dates) ? maybe_unserialize($catinfo_obj->recurring_dates) : array(); |
|
| 395 | + if ($post_type == 'gd_event' && !empty($catinfo_obj->recurring_dates) && $show_dates > 0) {
|
|
| 396 | + $event_dates = ''; |
|
| 397 | + $recurring_data = isset($catinfo_obj->recurring_dates) ? maybe_unserialize($catinfo_obj->recurring_dates) : array(); |
|
| 398 | 398 | |
| 399 | - $post_info = geodir_get_post_info($catinfo_obj->post_id); |
|
| 399 | + $post_info = geodir_get_post_info($catinfo_obj->post_id); |
|
| 400 | 400 | |
| 401 | - if (!empty($catinfo_obj->is_recurring) && !empty($recurring_data) && !empty($recurring_data['is_recurring']) && geodir_event_recurring_pkg($post_info)) {
|
|
| 402 | - $starttimes = ''; |
|
| 403 | - $endtimes = ''; |
|
| 404 | - $astarttimes = array(); |
|
| 405 | - $aendtimes = array(); |
|
| 406 | - if ( !isset( $recurring_data['repeat_type'] ) ) {
|
|
| 407 | - $recurring_data['repeat_type'] = 'custom'; |
|
| 408 | - } |
|
| 409 | - $repeat_type = isset( $recurring_data['repeat_type'] ) && in_array( $recurring_data['repeat_type'], array( 'day', 'week', 'month', 'year', 'custom' ) ) ? $recurring_data['repeat_type'] : 'year'; // day, week, month, year, custom |
|
| 410 | - $different_times = isset( $recurring_data['different_times'] ) && !empty( $recurring_data['different_times'] ) ? true : false; |
|
| 401 | + if (!empty($catinfo_obj->is_recurring) && !empty($recurring_data) && !empty($recurring_data['is_recurring']) && geodir_event_recurring_pkg($post_info)) {
|
|
| 402 | + $starttimes = ''; |
|
| 403 | + $endtimes = ''; |
|
| 404 | + $astarttimes = array(); |
|
| 405 | + $aendtimes = array(); |
|
| 406 | + if ( !isset( $recurring_data['repeat_type'] ) ) {
|
|
| 407 | + $recurring_data['repeat_type'] = 'custom'; |
|
| 408 | + } |
|
| 409 | + $repeat_type = isset( $recurring_data['repeat_type'] ) && in_array( $recurring_data['repeat_type'], array( 'day', 'week', 'month', 'year', 'custom' ) ) ? $recurring_data['repeat_type'] : 'year'; // day, week, month, year, custom |
|
| 410 | + $different_times = isset( $recurring_data['different_times'] ) && !empty( $recurring_data['different_times'] ) ? true : false; |
|
| 411 | 411 | |
| 412 | - $recurring_dates = explode(',', $recurring_data['event_recurring_dates']);
|
|
| 412 | + $recurring_dates = explode(',', $recurring_data['event_recurring_dates']);
|
|
| 413 | 413 | |
| 414 | - if ( !empty( $recurring_dates ) ) {
|
|
| 415 | - if ( empty( $recurring_data['all_day'] ) ) {
|
|
| 416 | - if ( $repeat_type == 'custom' && $different_times ) {
|
|
| 417 | - $astarttimes = isset( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array(); |
|
| 418 | - $aendtimes = isset( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array(); |
|
| 419 | - } else {
|
|
| 420 | - $starttimes = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : ''; |
|
| 421 | - $endtimes = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : ''; |
|
| 422 | - } |
|
| 423 | - } |
|
| 414 | + if ( !empty( $recurring_dates ) ) {
|
|
| 415 | + if ( empty( $recurring_data['all_day'] ) ) {
|
|
| 416 | + if ( $repeat_type == 'custom' && $different_times ) {
|
|
| 417 | + $astarttimes = isset( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array(); |
|
| 418 | + $aendtimes = isset( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array(); |
|
| 419 | + } else {
|
|
| 420 | + $starttimes = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : ''; |
|
| 421 | + $endtimes = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : ''; |
|
| 422 | + } |
|
| 423 | + } |
|
| 424 | 424 | |
| 425 | - $e = 0; |
|
| 426 | - foreach( $recurring_dates as $key => $date ) {
|
|
| 427 | - if ( $repeat_type == 'custom' && $different_times ) {
|
|
| 428 | - if ( !empty( $astarttimes ) && isset( $astarttimes[$key] ) ) {
|
|
| 429 | - $starttimes = $astarttimes[$key]; |
|
| 430 | - $endtimes = $aendtimes[$key]; |
|
| 431 | - } else {
|
|
| 432 | - $starttimes = ''; |
|
| 433 | - $endtimes = ''; |
|
| 434 | - } |
|
| 435 | - } |
|
| 425 | + $e = 0; |
|
| 426 | + foreach( $recurring_dates as $key => $date ) {
|
|
| 427 | + if ( $repeat_type == 'custom' && $different_times ) {
|
|
| 428 | + if ( !empty( $astarttimes ) && isset( $astarttimes[$key] ) ) {
|
|
| 429 | + $starttimes = $astarttimes[$key]; |
|
| 430 | + $endtimes = $aendtimes[$key]; |
|
| 431 | + } else {
|
|
| 432 | + $starttimes = ''; |
|
| 433 | + $endtimes = ''; |
|
| 434 | + } |
|
| 435 | + } |
|
| 436 | 436 | |
| 437 | - $duration = isset( $recurring_data['duration_x'] ) && (int)$recurring_data['duration_x'] > 0 ? (int)$recurring_data['duration_x'] : 1; |
|
| 438 | - $duration--; |
|
| 439 | - $enddate = date_i18n( 'Y-m-d', strtotime( $date . ' + ' . $duration . ' day' ) ); |
|
| 437 | + $duration = isset( $recurring_data['duration_x'] ) && (int)$recurring_data['duration_x'] > 0 ? (int)$recurring_data['duration_x'] : 1; |
|
| 438 | + $duration--; |
|
| 439 | + $enddate = date_i18n( 'Y-m-d', strtotime( $date . ' + ' . $duration . ' day' ) ); |
|
| 440 | 440 | |
| 441 | - // Hide past dates |
|
| 442 | - if ( strtotime( $enddate ) < $today ) {
|
|
| 443 | - continue; |
|
| 444 | - } |
|
| 441 | + // Hide past dates |
|
| 442 | + if ( strtotime( $enddate ) < $today ) {
|
|
| 443 | + continue; |
|
| 444 | + } |
|
| 445 | 445 | |
| 446 | - $sdate = strtotime( $date . ' ' . $starttimes ); |
|
| 447 | - $edate = strtotime( $enddate . ' ' . $endtimes ); |
|
| 446 | + $sdate = strtotime( $date . ' ' . $starttimes ); |
|
| 447 | + $edate = strtotime( $enddate . ' ' . $endtimes ); |
|
| 448 | 448 | |
| 449 | - $start_date = date_i18n( $geodir_date_time_format, $sdate ); |
|
| 450 | - $end_date = date_i18n( $geodir_date_time_format, $edate ); |
|
| 449 | + $start_date = date_i18n( $geodir_date_time_format, $sdate ); |
|
| 450 | + $end_date = date_i18n( $geodir_date_time_format, $edate ); |
|
| 451 | 451 | |
| 452 | - $same_day = false; |
|
| 453 | - $full_day = false; |
|
| 454 | - $same_datetime = false; |
|
| 452 | + $same_day = false; |
|
| 453 | + $full_day = false; |
|
| 454 | + $same_datetime = false; |
|
| 455 | 455 | |
| 456 | - if ( $starttimes == $endtimes && ( $starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00' ) ) {
|
|
| 457 | - $full_day = true; |
|
| 458 | - } |
|
| 456 | + if ( $starttimes == $endtimes && ( $starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00' ) ) {
|
|
| 457 | + $full_day = true; |
|
| 458 | + } |
|
| 459 | 459 | |
| 460 | - if ( $start_date == $end_date && $full_day ) {
|
|
| 461 | - $same_datetime = true; |
|
| 462 | - } |
|
| 463 | - |
|
| 464 | - $link_date = date_i18n( 'Y-m-d', $sdate ); |
|
| 465 | - $title_date = date_i18n( $geodir_date_format, $sdate ); |
|
| 466 | - if ( $full_day ) {
|
|
| 467 | - $start_date = $title_date; |
|
| 468 | - $end_date = date_i18n( $geodir_date_format, $edate ); |
|
| 469 | - } |
|
| 460 | + if ( $start_date == $end_date && $full_day ) {
|
|
| 461 | + $same_datetime = true; |
|
| 462 | + } |
|
| 463 | + |
|
| 464 | + $link_date = date_i18n( 'Y-m-d', $sdate ); |
|
| 465 | + $title_date = date_i18n( $geodir_date_format, $sdate ); |
|
| 466 | + if ( $full_day ) {
|
|
| 467 | + $start_date = $title_date; |
|
| 468 | + $end_date = date_i18n( $geodir_date_format, $edate ); |
|
| 469 | + } |
|
| 470 | 470 | |
| 471 | - if ( !$same_datetime && !$full_day && date_i18n( 'Y-m-d', $sdate ) == date_i18n( 'Y-m-d', $edate ) ) {
|
|
| 472 | - $same_day = true; |
|
| 471 | + if ( !$same_datetime && !$full_day && date_i18n( 'Y-m-d', $sdate ) == date_i18n( 'Y-m-d', $edate ) ) {
|
|
| 472 | + $same_day = true; |
|
| 473 | 473 | |
| 474 | - $start_date .= ' - ' . date_i18n( $geodir_time_format, $edate ); |
|
| 475 | - } |
|
| 474 | + $start_date .= ' - ' . date_i18n( $geodir_time_format, $edate ); |
|
| 475 | + } |
|
| 476 | 476 | |
| 477 | - $event_dates .= ' :: ' . $start_date; |
|
| 477 | + $event_dates .= ' :: ' . $start_date; |
|
| 478 | 478 | |
| 479 | - if ( !$same_day && !$same_datetime ) {
|
|
| 480 | - $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date; |
|
| 481 | - } |
|
| 479 | + if ( !$same_day && !$same_datetime ) {
|
|
| 480 | + $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date; |
|
| 481 | + } |
|
| 482 | 482 | |
| 483 | - $e++; |
|
| 483 | + $e++; |
|
| 484 | 484 | |
| 485 | - if ($show_dates > 0 && $e == $show_dates) { // only show 3 event dates
|
|
| 486 | - break; |
|
| 487 | - } |
|
| 488 | - } |
|
| 489 | - } |
|
| 490 | - } else {
|
|
| 491 | - $start_date = isset( $recurring_data['event_start'] ) ? $recurring_data['event_start'] : ''; |
|
| 492 | - $end_date = isset( $recurring_data['event_end'] ) ? $recurring_data['event_end'] : $start_date; |
|
| 493 | - $all_day = isset( $recurring_data['all_day'] ) && !empty( $recurring_data['all_day'] ) ? true : false; |
|
| 494 | - $starttime = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : ''; |
|
| 495 | - $endtime = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : ''; |
|
| 485 | + if ($show_dates > 0 && $e == $show_dates) { // only show 3 event dates
|
|
| 486 | + break; |
|
| 487 | + } |
|
| 488 | + } |
|
| 489 | + } |
|
| 490 | + } else {
|
|
| 491 | + $start_date = isset( $recurring_data['event_start'] ) ? $recurring_data['event_start'] : ''; |
|
| 492 | + $end_date = isset( $recurring_data['event_end'] ) ? $recurring_data['event_end'] : $start_date; |
|
| 493 | + $all_day = isset( $recurring_data['all_day'] ) && !empty( $recurring_data['all_day'] ) ? true : false; |
|
| 494 | + $starttime = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : ''; |
|
| 495 | + $endtime = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : ''; |
|
| 496 | 496 | |
| 497 | - $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] ); |
|
| 498 | - $starttimes = isset( $recurring_data['starttimes'] ) && !empty( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array(); |
|
| 499 | - $endtimes = isset( $recurring_data['endtimes'] ) && !empty( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array(); |
|
| 497 | + $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] ); |
|
| 498 | + $starttimes = isset( $recurring_data['starttimes'] ) && !empty( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array(); |
|
| 499 | + $endtimes = isset( $recurring_data['endtimes'] ) && !empty( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array(); |
|
| 500 | 500 | |
| 501 | - if ( !geodir_event_is_date( $start_date ) && !empty( $event_recurring_dates ) ) {
|
|
| 502 | - $start_date = $event_recurring_dates[0]; |
|
| 503 | - } |
|
| 501 | + if ( !geodir_event_is_date( $start_date ) && !empty( $event_recurring_dates ) ) {
|
|
| 502 | + $start_date = $event_recurring_dates[0]; |
|
| 503 | + } |
|
| 504 | 504 | |
| 505 | - if ( strtotime( $end_date ) < strtotime( $start_date ) ) {
|
|
| 506 | - $end_date = $start_date; |
|
| 507 | - } |
|
| 505 | + if ( strtotime( $end_date ) < strtotime( $start_date ) ) {
|
|
| 506 | + $end_date = $start_date; |
|
| 507 | + } |
|
| 508 | 508 | |
| 509 | - if ($end_date != '' && strtotime($end_date) >= $today) {
|
|
| 510 | - if ( $starttime == '' && !empty( $starttimes ) ) {
|
|
| 511 | - $starttime = $starttimes[0]; |
|
| 512 | - $endtime = $endtimes[0]; |
|
| 513 | - } |
|
| 509 | + if ($end_date != '' && strtotime($end_date) >= $today) {
|
|
| 510 | + if ( $starttime == '' && !empty( $starttimes ) ) {
|
|
| 511 | + $starttime = $starttimes[0]; |
|
| 512 | + $endtime = $endtimes[0]; |
|
| 513 | + } |
|
| 514 | 514 | |
| 515 | - $same_day = false; |
|
| 516 | - $one_day = false; |
|
| 517 | - if ( $start_date == $end_date && $all_day ) {
|
|
| 518 | - $one_day = true; |
|
| 519 | - } |
|
| 520 | - |
|
| 521 | - if ( $all_day ) {
|
|
| 522 | - $start_datetime = strtotime( $start_date ); |
|
| 523 | - $end_datetime = strtotime( $end_date ); |
|
| 515 | + $same_day = false; |
|
| 516 | + $one_day = false; |
|
| 517 | + if ( $start_date == $end_date && $all_day ) {
|
|
| 518 | + $one_day = true; |
|
| 519 | + } |
|
| 520 | + |
|
| 521 | + if ( $all_day ) {
|
|
| 522 | + $start_datetime = strtotime( $start_date ); |
|
| 523 | + $end_datetime = strtotime( $end_date ); |
|
| 524 | 524 | |
| 525 | - $start_date = date_i18n( $geodir_date_format, $start_datetime ); |
|
| 526 | - $end_date = date_i18n( $geodir_date_format, $end_datetime ); |
|
| 527 | - if ( $start_date == $end_date ) {
|
|
| 528 | - $one_day = true; |
|
| 529 | - } |
|
| 530 | - } else {
|
|
| 531 | - if ( $start_date == $end_date && $starttime == $endtime ) {
|
|
| 532 | - $end_date = date_i18n( 'Y-m-d', strtotime( $start_date . ' ' . $starttime . ' +1 day' ) ); |
|
| 533 | - $one_day = false; |
|
| 534 | - } |
|
| 535 | - $start_datetime = strtotime( $start_date . ' ' . $starttime ); |
|
| 536 | - $end_datetime = strtotime( $end_date . ' ' . $endtime ); |
|
| 525 | + $start_date = date_i18n( $geodir_date_format, $start_datetime ); |
|
| 526 | + $end_date = date_i18n( $geodir_date_format, $end_datetime ); |
|
| 527 | + if ( $start_date == $end_date ) {
|
|
| 528 | + $one_day = true; |
|
| 529 | + } |
|
| 530 | + } else {
|
|
| 531 | + if ( $start_date == $end_date && $starttime == $endtime ) {
|
|
| 532 | + $end_date = date_i18n( 'Y-m-d', strtotime( $start_date . ' ' . $starttime . ' +1 day' ) ); |
|
| 533 | + $one_day = false; |
|
| 534 | + } |
|
| 535 | + $start_datetime = strtotime( $start_date . ' ' . $starttime ); |
|
| 536 | + $end_datetime = strtotime( $end_date . ' ' . $endtime ); |
|
| 537 | 537 | |
| 538 | - $start_date = date_i18n( $geodir_date_time_format, $start_datetime ); |
|
| 539 | - $end_date = date_i18n( $geodir_date_time_format, $end_datetime ); |
|
| 540 | - } |
|
| 538 | + $start_date = date_i18n( $geodir_date_time_format, $start_datetime ); |
|
| 539 | + $end_date = date_i18n( $geodir_date_time_format, $end_datetime ); |
|
| 540 | + } |
|
| 541 | 541 | |
| 542 | - if ( !$one_day && date_i18n( 'Y-m-d', $start_datetime ) == date_i18n( 'Y-m-d', $end_datetime ) ) {
|
|
| 543 | - $same_day = true; |
|
| 542 | + if ( !$one_day && date_i18n( 'Y-m-d', $start_datetime ) == date_i18n( 'Y-m-d', $end_datetime ) ) {
|
|
| 543 | + $same_day = true; |
|
| 544 | 544 | |
| 545 | - $start_date .= ' - ' . date_i18n( $geodir_time_format, $end_datetime ); |
|
| 546 | - } |
|
| 545 | + $start_date .= ' - ' . date_i18n( $geodir_time_format, $end_datetime ); |
|
| 546 | + } |
|
| 547 | 547 | |
| 548 | - $event_dates .= ' :: ' . $start_date; |
|
| 548 | + $event_dates .= ' :: ' . $start_date; |
|
| 549 | 549 | |
| 550 | - if ( !$same_day && !$one_day ) {
|
|
| 551 | - $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date; |
|
| 552 | - } |
|
| 553 | - } |
|
| 554 | - } |
|
| 555 | - |
|
| 556 | - if (empty($event_dates)) {
|
|
| 557 | - continue; |
|
| 558 | - } |
|
| 550 | + if ( !$same_day && !$one_day ) {
|
|
| 551 | + $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date; |
|
| 552 | + } |
|
| 553 | + } |
|
| 554 | + } |
|
| 555 | + |
|
| 556 | + if (empty($event_dates)) {
|
|
| 557 | + continue; |
|
| 558 | + } |
|
| 559 | 559 | |
| 560 | - $post_title .= $event_dates; |
|
| 561 | - } |
|
| 560 | + $post_title .= $event_dates; |
|
| 561 | + } |
|
| 562 | 562 | |
| 563 | - $map_cat_ids_array; |
|
| 564 | - $default_cat = isset($catinfo_obj->default_category) ? $catinfo_obj->default_category : ''; |
|
| 563 | + $map_cat_ids_array; |
|
| 564 | + $default_cat = isset($catinfo_obj->default_category) ? $catinfo_obj->default_category : ''; |
|
| 565 | 565 | |
| 566 | - // if single cat lets just show that icon |
|
| 567 | - if(is_array($map_cat_ids_array) && count($map_cat_ids_array)==1){
|
|
| 568 | - $default_cat = (int)$map_cat_ids_array[0]; |
|
| 569 | - } |
|
| 566 | + // if single cat lets just show that icon |
|
| 567 | + if(is_array($map_cat_ids_array) && count($map_cat_ids_array)==1){
|
|
| 568 | + $default_cat = (int)$map_cat_ids_array[0]; |
|
| 569 | + } |
|
| 570 | 570 | |
| 571 | - $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$default_cat]) ? $geodir_cat_icons[$default_cat] : ''; |
|
| 572 | - $mark_extra = (isset($catinfo_obj->marker_extra)) ? $catinfo_obj->marker_extra : ''; |
|
| 573 | - $title = str_replace($srcharr, $replarr, $post_title); |
|
| 571 | + $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$default_cat]) ? $geodir_cat_icons[$default_cat] : ''; |
|
| 572 | + $mark_extra = (isset($catinfo_obj->marker_extra)) ? $catinfo_obj->marker_extra : ''; |
|
| 573 | + $title = str_replace($srcharr, $replarr, $post_title); |
|
| 574 | 574 | |
| 575 | - if ($icon != '') {
|
|
| 576 | - $gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes; |
|
| 575 | + if ($icon != '') {
|
|
| 576 | + $gd_marker_sizes = empty($gd_marker_sizes) ? array() : $gd_marker_sizes; |
|
| 577 | 577 | |
| 578 | - if (isset($gd_marker_sizes[$icon])) {
|
|
| 579 | - $icon_size = $gd_marker_sizes[$icon]; |
|
| 580 | - } else {
|
|
| 581 | - $icon_size = geodir_get_marker_size($icon); |
|
| 582 | - $gd_marker_sizes[$icon] = $icon_size; |
|
| 583 | - } |
|
| 584 | - } else {
|
|
| 585 | - $icon_size = array('w' => 36, 'h' => 45);
|
|
| 586 | - } |
|
| 587 | - |
|
| 588 | - $content_data[] = '{"id":"' . $catinfo_obj->post_id . '","t": "' . $title . '","lt": "' . $catinfo_obj->post_latitude . '","ln": "' . $catinfo_obj->post_longitude . '","mk_id":"' . $catinfo_obj->post_id . '_' . $default_cat . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"'.$mark_extra.'}';
|
|
| 589 | - $post_ids[] = $catinfo_obj->post_id; |
|
| 590 | - } |
|
| 591 | - } |
|
| 592 | - |
|
| 593 | - /** |
|
| 594 | - * Called after marker data is processed into JSON. |
|
| 595 | - * |
|
| 596 | - * Called after marker data is processed into JSON, this action can be used to change the format or add/remove markers. |
|
| 597 | - * |
|
| 598 | - * @since 1.4.9 |
|
| 599 | - * @param array $content_data The array containing all markers in JSON format. |
|
| 600 | - * @param object $catinfo The posts object containing all marker data. |
|
| 601 | - * @see 'geodir_before_marker_post_process' |
|
| 602 | - */ |
|
| 603 | - do_action('geodir_after_marker_post_process', $content_data, $catinfo);
|
|
| 604 | - |
|
| 605 | - if (!empty($content_data)) {
|
|
| 606 | - $cat_content_info[] = implode(',', $content_data);
|
|
| 607 | - } |
|
| 608 | - |
|
| 609 | - $totalcount = count(array_unique($post_ids)); |
|
| 610 | - |
|
| 611 | - if (!empty($cat_content_info)) {
|
|
| 612 | - $map_json = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';
|
|
| 613 | - } |
|
| 614 | - else {
|
|
| 615 | - $map_json = '[{"totalcount":"0"}]';
|
|
| 616 | - } |
|
| 617 | - |
|
| 618 | - |
|
| 619 | - /** |
|
| 620 | - * Filter the marker json return. |
|
| 621 | - * |
|
| 622 | - * @since 1.6.22 |
|
| 623 | - * @param string $map_json The JSON string of the map markers results. |
|
| 624 | - */ |
|
| 625 | - return apply_filters('geodir_markers_json',$map_json);
|
|
| 578 | + if (isset($gd_marker_sizes[$icon])) {
|
|
| 579 | + $icon_size = $gd_marker_sizes[$icon]; |
|
| 580 | + } else {
|
|
| 581 | + $icon_size = geodir_get_marker_size($icon); |
|
| 582 | + $gd_marker_sizes[$icon] = $icon_size; |
|
| 583 | + } |
|
| 584 | + } else {
|
|
| 585 | + $icon_size = array('w' => 36, 'h' => 45);
|
|
| 586 | + } |
|
| 587 | + |
|
| 588 | + $content_data[] = '{"id":"' . $catinfo_obj->post_id . '","t": "' . $title . '","lt": "' . $catinfo_obj->post_latitude . '","ln": "' . $catinfo_obj->post_longitude . '","mk_id":"' . $catinfo_obj->post_id . '_' . $default_cat . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"'.$mark_extra.'}';
|
|
| 589 | + $post_ids[] = $catinfo_obj->post_id; |
|
| 590 | + } |
|
| 591 | + } |
|
| 592 | + |
|
| 593 | + /** |
|
| 594 | + * Called after marker data is processed into JSON. |
|
| 595 | + * |
|
| 596 | + * Called after marker data is processed into JSON, this action can be used to change the format or add/remove markers. |
|
| 597 | + * |
|
| 598 | + * @since 1.4.9 |
|
| 599 | + * @param array $content_data The array containing all markers in JSON format. |
|
| 600 | + * @param object $catinfo The posts object containing all marker data. |
|
| 601 | + * @see 'geodir_before_marker_post_process' |
|
| 602 | + */ |
|
| 603 | + do_action('geodir_after_marker_post_process', $content_data, $catinfo);
|
|
| 604 | + |
|
| 605 | + if (!empty($content_data)) {
|
|
| 606 | + $cat_content_info[] = implode(',', $content_data);
|
|
| 607 | + } |
|
| 608 | + |
|
| 609 | + $totalcount = count(array_unique($post_ids)); |
|
| 610 | + |
|
| 611 | + if (!empty($cat_content_info)) {
|
|
| 612 | + $map_json = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';
|
|
| 613 | + } |
|
| 614 | + else {
|
|
| 615 | + $map_json = '[{"totalcount":"0"}]';
|
|
| 616 | + } |
|
| 617 | + |
|
| 618 | + |
|
| 619 | + /** |
|
| 620 | + * Filter the marker json return. |
|
| 621 | + * |
|
| 622 | + * @since 1.6.22 |
|
| 623 | + * @param string $map_json The JSON string of the map markers results. |
|
| 624 | + */ |
|
| 625 | + return apply_filters('geodir_markers_json',$map_json);
|
|
| 626 | 626 | } |
| 627 | 627 | |
| 628 | 628 | |
@@ -7,9 +7,9 @@ discard block |
||
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | 9 | // Enable map cache if set |
| 10 | -if(get_option('geodir_enable_map_cache')){
|
|
| 11 | - add_filter('geodir_get_markers_cache','geodir_get_map_cache');
|
|
| 12 | - add_filter('geodir_markers_json','geodir_save_map_cache',10);
|
|
| 10 | +if (get_option('geodir_enable_map_cache')) {
|
|
| 11 | + add_filter('geodir_get_markers_cache', 'geodir_get_map_cache');
|
|
| 12 | + add_filter('geodir_markers_json', 'geodir_save_map_cache', 10);
|
|
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | |
@@ -21,10 +21,10 @@ discard block |
||
| 21 | 21 | * @since 1.6.22 |
| 22 | 22 | * @return string |
| 23 | 23 | */ |
| 24 | -function geodir_get_map_cache($cache){
|
|
| 24 | +function geodir_get_map_cache($cache) {
|
|
| 25 | 25 | |
| 26 | 26 | // if a search is going on then dont even try to check for cache. |
| 27 | - if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){
|
|
| 27 | + if (isset($_REQUEST['search']) && !empty($_REQUEST['search'])) {
|
|
| 28 | 28 | return $cache; |
| 29 | 29 | } |
| 30 | 30 | |
@@ -43,29 +43,29 @@ discard block |
||
| 43 | 43 | $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : ''; |
| 44 | 44 | $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : ''; |
| 45 | 45 | |
| 46 | - $file_name = sanitize_file_name( md5( implode("-",$url_params) ) );
|
|
| 46 | + $file_name = sanitize_file_name(md5(implode("-", $url_params)));
|
|
| 47 | 47 | |
| 48 | 48 | $blog_id = get_current_blog_id(); |
| 49 | - if($blog_id>1){
|
|
| 49 | + if ($blog_id > 1) {
|
|
| 50 | 50 | $file_name = $blog_id."_".$file_name; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | $file_path = realpath(dirname(__FILE__))."/map-cache/"; |
| 54 | - $file = $file_path . $file_name . ".json"; |
|
| 54 | + $file = $file_path.$file_name.".json"; |
|
| 55 | 55 | |
| 56 | - if(file_exists($file)){
|
|
| 56 | + if (file_exists($file)) {
|
|
| 57 | 57 | // do the cache delete stuff |
| 58 | 58 | $cache_time = get_option('geodir_map_cache');
|
| 59 | - if(!$cache_time){
|
|
| 59 | + if (!$cache_time) {
|
|
| 60 | 60 | $cache_time = time(); |
| 61 | 61 | update_option('geodir_map_cache', $cache_time);
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - if((time() - $cache_time) > 86400){ // delete the cache every 24 hours
|
|
| 64 | + if ((time() - $cache_time) > 86400) { // delete the cache every 24 hours
|
|
| 65 | 65 | geodir_delete_map_cache(); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - if(file_exists($file) && is_readable($file)){
|
|
| 68 | + if (file_exists($file) && is_readable($file)) {
|
|
| 69 | 69 | ob_start(); |
| 70 | 70 | readfile($file); // readfile is quicker then file get contents |
| 71 | 71 | return ob_get_clean(); |
@@ -83,10 +83,10 @@ discard block |
||
| 83 | 83 | * @since 1.6.22 |
| 84 | 84 | * @return mixed |
| 85 | 85 | */ |
| 86 | -function geodir_save_map_cache($map_json){
|
|
| 86 | +function geodir_save_map_cache($map_json) {
|
|
| 87 | 87 | |
| 88 | 88 | // if a search is going on then dont even try to check for cache. |
| 89 | - if(isset($_REQUEST['search']) && !empty($_REQUEST['search'])){
|
|
| 89 | + if (isset($_REQUEST['search']) && !empty($_REQUEST['search'])) {
|
|
| 90 | 90 | return $map_json; |
| 91 | 91 | } |
| 92 | 92 | |
@@ -105,10 +105,10 @@ discard block |
||
| 105 | 105 | $url_params[] = isset($_REQUEST['gd_city']) ? $_REQUEST['gd_city'] : ''; |
| 106 | 106 | $url_params[] = isset($_REQUEST['gd_neighbourhood']) ? $_REQUEST['gd_neighbourhood'] : ''; |
| 107 | 107 | |
| 108 | - $file_name = sanitize_file_name( md5( implode("-",$url_params) ) );
|
|
| 108 | + $file_name = sanitize_file_name(md5(implode("-", $url_params)));
|
|
| 109 | 109 | |
| 110 | 110 | $blog_id = get_current_blog_id(); |
| 111 | - if($blog_id>1){
|
|
| 111 | + if ($blog_id > 1) {
|
|
| 112 | 112 | $file_name = $blog_id."_".$file_name; |
| 113 | 113 | } |
| 114 | 114 | |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | global $wp_filesystem; |
| 119 | 119 | if (empty($wp_filesystem)) {
|
| 120 | - require_once (ABSPATH . '/wp-admin/includes/file.php'); |
|
| 120 | + require_once (ABSPATH.'/wp-admin/includes/file.php'); |
|
| 121 | 121 | WP_Filesystem(); |
| 122 | 122 | } |
| 123 | 123 | $wp_filesystem->put_contents( |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | $gd_session->set('homemap_catlist_ptype', $gd_post_type);
|
| 139 | 139 | $post_taxonomy = geodir_get_taxonomies($gd_post_type); |
| 140 | 140 | $map_canvas_name = sanitize_text_field($_REQUEST['map_canvas']); |
| 141 | - $child_collapse = (bool)$_REQUEST['child_collapse']; |
|
| 141 | + $child_collapse = (bool) $_REQUEST['child_collapse']; |
|
| 142 | 142 | echo home_map_taxonomy_walker($post_taxonomy, 0, true, 0, $map_canvas_name, $child_collapse, true); |
| 143 | 143 | die; |
| 144 | 144 | } |
@@ -158,21 +158,21 @@ discard block |
||
| 158 | 158 | global $wpdb, $plugin_prefix, $gd_session; |
| 159 | 159 | |
| 160 | 160 | if ($_REQUEST['m_id'] != '') {
|
| 161 | - $pid = (int)$_REQUEST['m_id']; |
|
| 161 | + $pid = (int) $_REQUEST['m_id']; |
|
| 162 | 162 | } else {
|
| 163 | 163 | echo __('No marker data found', 'geodirectory');
|
| 164 | 164 | exit; |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | if (isset($_REQUEST['post_preview']) && $_REQUEST['post_preview'] != '' && $gd_ses_listing = $gd_session->get('listing')) {
|
| 168 | - $post = (object)$gd_ses_listing; |
|
| 168 | + $post = (object) $gd_ses_listing; |
|
| 169 | 169 | echo geodir_get_infowindow_html($post, $_REQUEST['post_preview']); |
| 170 | 170 | } else {
|
| 171 | 171 | $geodir_post_type = get_post_type($pid); |
| 172 | 172 | |
| 173 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
| 173 | + $table = $plugin_prefix.$geodir_post_type.'_detail'; |
|
| 174 | 174 | |
| 175 | - $sql = $wpdb->prepare("SELECT * FROM " . $table . " WHERE post_id = %d", array($pid));
|
|
| 175 | + $sql = $wpdb->prepare("SELECT * FROM ".$table." WHERE post_id = %d", array($pid));
|
|
| 176 | 176 | |
| 177 | 177 | $postinfo = $wpdb->get_results($sql); |
| 178 | 178 | |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | */ |
| 207 | 207 | function get_markers() {
|
| 208 | 208 | |
| 209 | - global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes,$gd_session; |
|
| 209 | + global $wpdb, $plugin_prefix, $geodir_cat_icons, $gd_marker_sizes, $gd_session; |
|
| 210 | 210 | |
| 211 | 211 | |
| 212 | 212 | /** |
@@ -214,8 +214,8 @@ discard block |
||
| 214 | 214 | * |
| 215 | 215 | * @since 1.6.22 |
| 216 | 216 | */ |
| 217 | - $map_cache = apply_filters('geodir_get_markers_cache','');
|
|
| 218 | - if($map_cache){
|
|
| 217 | + $map_cache = apply_filters('geodir_get_markers_cache', '');
|
|
| 218 | + if ($map_cache) {
|
|
| 219 | 219 | return $map_cache; |
| 220 | 220 | wp_die(); |
| 221 | 221 | } |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | $post_type = isset($_REQUEST['gd_posttype']) ? $_REQUEST['gd_posttype'] : 'gd_place'; |
| 231 | 231 | |
| 232 | 232 | $map_cat_ids_array = array('0');
|
| 233 | - $cat_find_array = array(" FIND_IN_SET(%d, pd." . $post_type . "category)");
|
|
| 233 | + $cat_find_array = array(" FIND_IN_SET(%d, pd.".$post_type."category)");
|
|
| 234 | 234 | |
| 235 | 235 | |
| 236 | 236 | $field_default_cat = ''; |
@@ -238,13 +238,13 @@ discard block |
||
| 238 | 238 | $map_cat_arr = trim($_REQUEST['cat_id'], ','); |
| 239 | 239 | |
| 240 | 240 | if (!empty($map_cat_arr)) {
|
| 241 | - $field_default_cat .= "WHEN (default_category IN (" . $map_cat_arr . ")) THEN default_category ";
|
|
| 241 | + $field_default_cat .= "WHEN (default_category IN (".$map_cat_arr.")) THEN default_category ";
|
|
| 242 | 242 | |
| 243 | 243 | $map_cat_ids_array = explode(',', $map_cat_arr);
|
| 244 | 244 | $cat_find_array = array(); |
| 245 | 245 | foreach ($map_cat_ids_array as $cat_id) {
|
| 246 | - $field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `" . $post_type . "category`) > 0) THEN $cat_id "; |
|
| 247 | - $cat_find_array[] = " FIND_IN_SET(%d, pd." . $post_type . "category)"; |
|
| 246 | + $field_default_cat .= "WHEN (FIND_IN_SET($cat_id, `".$post_type."category`) > 0) THEN $cat_id "; |
|
| 247 | + $cat_find_array[] = " FIND_IN_SET(%d, pd.".$post_type."category)"; |
|
| 248 | 248 | $main_query_array[] = $cat_id; |
| 249 | 249 | } |
| 250 | 250 | |
@@ -255,13 +255,13 @@ discard block |
||
| 255 | 255 | $field_default_cat = ''; |
| 256 | 256 | |
| 257 | 257 | if (!empty($cat_find_array)) |
| 258 | - $search .= "AND (" . implode(' OR ', $cat_find_array) . ")";
|
|
| 258 | + $search .= "AND (".implode(' OR ', $cat_find_array).")";
|
|
| 259 | 259 | |
| 260 | 260 | $main_query_array = $map_cat_ids_array; |
| 261 | 261 | |
| 262 | 262 | if (isset($_REQUEST['search']) && !empty($_REQUEST['search']) && $_REQUEST['search'] != __('Title', 'geodirectory')) {
|
| 263 | 263 | $search .= " AND p.post_title LIKE %s"; |
| 264 | - $main_query_array[] = "%" . $_REQUEST['search'] . "%"; |
|
| 264 | + $main_query_array[] = "%".$_REQUEST['search']."%"; |
|
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | /** |
@@ -283,14 +283,14 @@ discard block |
||
| 283 | 283 | |
| 284 | 284 | $gd_posttype = ''; |
| 285 | 285 | if (isset($_REQUEST['gd_posttype']) && $_REQUEST['gd_posttype'] != '') {
|
| 286 | - $table = $plugin_prefix . $_REQUEST['gd_posttype'] . '_detail'; |
|
| 286 | + $table = $plugin_prefix.$_REQUEST['gd_posttype'].'_detail'; |
|
| 287 | 287 | $gd_posttype = " AND p.post_type = %s"; |
| 288 | 288 | $main_query_array[] = $_REQUEST['gd_posttype']; |
| 289 | 289 | |
| 290 | 290 | } else |
| 291 | - $table = $plugin_prefix . 'gd_place_detail'; |
|
| 291 | + $table = $plugin_prefix.'gd_place_detail'; |
|
| 292 | 292 | |
| 293 | - $join = ", " . $table . " AS pd "; |
|
| 293 | + $join = ", ".$table." AS pd "; |
|
| 294 | 294 | |
| 295 | 295 | /** |
| 296 | 296 | * Filter the SQL JOIN clause for the markers data |
@@ -310,14 +310,14 @@ discard block |
||
| 310 | 310 | */ |
| 311 | 311 | $search = apply_filters('geodir_home_map_listing_where', $search);
|
| 312 | 312 | $search = str_replace(array("'%", "%'"), array("'%%", "%%'"), $search);
|
| 313 | - $cat_type = $post_type . 'category'; |
|
| 313 | + $cat_type = $post_type.'category'; |
|
| 314 | 314 | if ($post_type == 'gd_event') {
|
| 315 | 315 | $event_select = ", pd.recurring_dates, pd.is_recurring"; |
| 316 | 316 | } else {
|
| 317 | 317 | $event_select = ""; |
| 318 | 318 | } |
| 319 | 319 | |
| 320 | - $sql_select = 'SELECT pd.default_category, pd.' . $cat_type . ', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude' . $event_select; |
|
| 320 | + $sql_select = 'SELECT pd.default_category, pd.'.$cat_type.', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude'.$event_select; |
|
| 321 | 321 | /** |
| 322 | 322 | * Filter the SQL SELECT clause to retrive fields data |
| 323 | 323 | * |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | */ |
| 338 | 338 | $groupby = apply_filters('geodir_home_map_listing_groupby', $groupby);
|
| 339 | 339 | |
| 340 | - $catsql = $wpdb->prepare("$select $field_default_cat FROM " . $wpdb->posts . " as p" . $join . " WHERE p.ID = pd.post_id AND p.post_status = 'publish' " . $search . $gd_posttype . $groupby , $main_query_array);
|
|
| 340 | + $catsql = $wpdb->prepare("$select $field_default_cat FROM ".$wpdb->posts." as p".$join." WHERE p.ID = pd.post_id AND p.post_status = 'publish' ".$search.$gd_posttype.$groupby, $main_query_array);
|
|
| 341 | 341 | |
| 342 | 342 | /** |
| 343 | 343 | * Filter the SQL query to retrive markers data |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | global $geodir_date_time_format, $geodir_date_format, $geodir_time_format; |
| 388 | 388 | |
| 389 | 389 | $today = strtotime(date_i18n('Y-m-d'));
|
| 390 | - $show_dates = $post_type == 'gd_event' ? (int)get_option('geodir_event_infowindow_dates_count', 1) : 0;
|
|
| 390 | + $show_dates = $post_type == 'gd_event' ? (int) get_option('geodir_event_infowindow_dates_count', 1) : 0;
|
|
| 391 | 391 | |
| 392 | 392 | foreach ($catinfo as $catinfo_obj) {
|
| 393 | 393 | $post_title = $catinfo_obj->post_title; |
@@ -403,29 +403,29 @@ discard block |
||
| 403 | 403 | $endtimes = ''; |
| 404 | 404 | $astarttimes = array(); |
| 405 | 405 | $aendtimes = array(); |
| 406 | - if ( !isset( $recurring_data['repeat_type'] ) ) {
|
|
| 406 | + if (!isset($recurring_data['repeat_type'])) {
|
|
| 407 | 407 | $recurring_data['repeat_type'] = 'custom'; |
| 408 | 408 | } |
| 409 | - $repeat_type = isset( $recurring_data['repeat_type'] ) && in_array( $recurring_data['repeat_type'], array( 'day', 'week', 'month', 'year', 'custom' ) ) ? $recurring_data['repeat_type'] : 'year'; // day, week, month, year, custom |
|
| 410 | - $different_times = isset( $recurring_data['different_times'] ) && !empty( $recurring_data['different_times'] ) ? true : false; |
|
| 409 | + $repeat_type = isset($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'year'; // day, week, month, year, custom
|
|
| 410 | + $different_times = isset($recurring_data['different_times']) && !empty($recurring_data['different_times']) ? true : false; |
|
| 411 | 411 | |
| 412 | 412 | $recurring_dates = explode(',', $recurring_data['event_recurring_dates']);
|
| 413 | 413 | |
| 414 | - if ( !empty( $recurring_dates ) ) {
|
|
| 415 | - if ( empty( $recurring_data['all_day'] ) ) {
|
|
| 416 | - if ( $repeat_type == 'custom' && $different_times ) {
|
|
| 417 | - $astarttimes = isset( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array(); |
|
| 418 | - $aendtimes = isset( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array(); |
|
| 414 | + if (!empty($recurring_dates)) {
|
|
| 415 | + if (empty($recurring_data['all_day'])) {
|
|
| 416 | + if ($repeat_type == 'custom' && $different_times) {
|
|
| 417 | + $astarttimes = isset($recurring_data['starttimes']) ? $recurring_data['starttimes'] : array(); |
|
| 418 | + $aendtimes = isset($recurring_data['endtimes']) ? $recurring_data['endtimes'] : array(); |
|
| 419 | 419 | } else {
|
| 420 | - $starttimes = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : ''; |
|
| 421 | - $endtimes = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : ''; |
|
| 420 | + $starttimes = isset($recurring_data['starttime']) ? $recurring_data['starttime'] : ''; |
|
| 421 | + $endtimes = isset($recurring_data['endtime']) ? $recurring_data['endtime'] : ''; |
|
| 422 | 422 | } |
| 423 | 423 | } |
| 424 | 424 | |
| 425 | 425 | $e = 0; |
| 426 | - foreach( $recurring_dates as $key => $date ) {
|
|
| 427 | - if ( $repeat_type == 'custom' && $different_times ) {
|
|
| 428 | - if ( !empty( $astarttimes ) && isset( $astarttimes[$key] ) ) {
|
|
| 426 | + foreach ($recurring_dates as $key => $date) {
|
|
| 427 | + if ($repeat_type == 'custom' && $different_times) {
|
|
| 428 | + if (!empty($astarttimes) && isset($astarttimes[$key])) {
|
|
| 429 | 429 | $starttimes = $astarttimes[$key]; |
| 430 | 430 | $endtimes = $aendtimes[$key]; |
| 431 | 431 | } else {
|
@@ -434,50 +434,50 @@ discard block |
||
| 434 | 434 | } |
| 435 | 435 | } |
| 436 | 436 | |
| 437 | - $duration = isset( $recurring_data['duration_x'] ) && (int)$recurring_data['duration_x'] > 0 ? (int)$recurring_data['duration_x'] : 1; |
|
| 437 | + $duration = isset($recurring_data['duration_x']) && (int) $recurring_data['duration_x'] > 0 ? (int) $recurring_data['duration_x'] : 1; |
|
| 438 | 438 | $duration--; |
| 439 | - $enddate = date_i18n( 'Y-m-d', strtotime( $date . ' + ' . $duration . ' day' ) ); |
|
| 439 | + $enddate = date_i18n('Y-m-d', strtotime($date.' + '.$duration.' day'));
|
|
| 440 | 440 | |
| 441 | 441 | // Hide past dates |
| 442 | - if ( strtotime( $enddate ) < $today ) {
|
|
| 442 | + if (strtotime($enddate) < $today) {
|
|
| 443 | 443 | continue; |
| 444 | 444 | } |
| 445 | 445 | |
| 446 | - $sdate = strtotime( $date . ' ' . $starttimes ); |
|
| 447 | - $edate = strtotime( $enddate . ' ' . $endtimes ); |
|
| 446 | + $sdate = strtotime($date.' '.$starttimes); |
|
| 447 | + $edate = strtotime($enddate.' '.$endtimes); |
|
| 448 | 448 | |
| 449 | - $start_date = date_i18n( $geodir_date_time_format, $sdate ); |
|
| 450 | - $end_date = date_i18n( $geodir_date_time_format, $edate ); |
|
| 449 | + $start_date = date_i18n($geodir_date_time_format, $sdate); |
|
| 450 | + $end_date = date_i18n($geodir_date_time_format, $edate); |
|
| 451 | 451 | |
| 452 | 452 | $same_day = false; |
| 453 | 453 | $full_day = false; |
| 454 | 454 | $same_datetime = false; |
| 455 | 455 | |
| 456 | - if ( $starttimes == $endtimes && ( $starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00' ) ) {
|
|
| 456 | + if ($starttimes == $endtimes && ($starttimes == '' || $starttimes == '00:00:00' || $starttimes == '00:00')) {
|
|
| 457 | 457 | $full_day = true; |
| 458 | 458 | } |
| 459 | 459 | |
| 460 | - if ( $start_date == $end_date && $full_day ) {
|
|
| 460 | + if ($start_date == $end_date && $full_day) {
|
|
| 461 | 461 | $same_datetime = true; |
| 462 | 462 | } |
| 463 | 463 | |
| 464 | - $link_date = date_i18n( 'Y-m-d', $sdate ); |
|
| 465 | - $title_date = date_i18n( $geodir_date_format, $sdate ); |
|
| 466 | - if ( $full_day ) {
|
|
| 464 | + $link_date = date_i18n('Y-m-d', $sdate);
|
|
| 465 | + $title_date = date_i18n($geodir_date_format, $sdate); |
|
| 466 | + if ($full_day) {
|
|
| 467 | 467 | $start_date = $title_date; |
| 468 | - $end_date = date_i18n( $geodir_date_format, $edate ); |
|
| 468 | + $end_date = date_i18n($geodir_date_format, $edate); |
|
| 469 | 469 | } |
| 470 | 470 | |
| 471 | - if ( !$same_datetime && !$full_day && date_i18n( 'Y-m-d', $sdate ) == date_i18n( 'Y-m-d', $edate ) ) {
|
|
| 471 | + if (!$same_datetime && !$full_day && date_i18n('Y-m-d', $sdate) == date_i18n('Y-m-d', $edate)) {
|
|
| 472 | 472 | $same_day = true; |
| 473 | 473 | |
| 474 | - $start_date .= ' - ' . date_i18n( $geodir_time_format, $edate ); |
|
| 474 | + $start_date .= ' - '.date_i18n($geodir_time_format, $edate); |
|
| 475 | 475 | } |
| 476 | 476 | |
| 477 | - $event_dates .= ' :: ' . $start_date; |
|
| 477 | + $event_dates .= ' :: '.$start_date; |
|
| 478 | 478 | |
| 479 | - if ( !$same_day && !$same_datetime ) {
|
|
| 480 | - $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date; |
|
| 479 | + if (!$same_day && !$same_datetime) {
|
|
| 480 | + $event_dates .= ' '.__('to', 'geodirectory').' '.$end_date;
|
|
| 481 | 481 | } |
| 482 | 482 | |
| 483 | 483 | $e++; |
@@ -488,67 +488,67 @@ discard block |
||
| 488 | 488 | } |
| 489 | 489 | } |
| 490 | 490 | } else {
|
| 491 | - $start_date = isset( $recurring_data['event_start'] ) ? $recurring_data['event_start'] : ''; |
|
| 492 | - $end_date = isset( $recurring_data['event_end'] ) ? $recurring_data['event_end'] : $start_date; |
|
| 493 | - $all_day = isset( $recurring_data['all_day'] ) && !empty( $recurring_data['all_day'] ) ? true : false; |
|
| 494 | - $starttime = isset( $recurring_data['starttime'] ) ? $recurring_data['starttime'] : ''; |
|
| 495 | - $endtime = isset( $recurring_data['endtime'] ) ? $recurring_data['endtime'] : ''; |
|
| 491 | + $start_date = isset($recurring_data['event_start']) ? $recurring_data['event_start'] : ''; |
|
| 492 | + $end_date = isset($recurring_data['event_end']) ? $recurring_data['event_end'] : $start_date; |
|
| 493 | + $all_day = isset($recurring_data['all_day']) && !empty($recurring_data['all_day']) ? true : false; |
|
| 494 | + $starttime = isset($recurring_data['starttime']) ? $recurring_data['starttime'] : ''; |
|
| 495 | + $endtime = isset($recurring_data['endtime']) ? $recurring_data['endtime'] : ''; |
|
| 496 | 496 | |
| 497 | - $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] ); |
|
| 498 | - $starttimes = isset( $recurring_data['starttimes'] ) && !empty( $recurring_data['starttimes'] ) ? $recurring_data['starttimes'] : array(); |
|
| 499 | - $endtimes = isset( $recurring_data['endtimes'] ) && !empty( $recurring_data['endtimes'] ) ? $recurring_data['endtimes'] : array(); |
|
| 497 | + $event_recurring_dates = explode(',', $recurring_data['event_recurring_dates']);
|
|
| 498 | + $starttimes = isset($recurring_data['starttimes']) && !empty($recurring_data['starttimes']) ? $recurring_data['starttimes'] : array(); |
|
| 499 | + $endtimes = isset($recurring_data['endtimes']) && !empty($recurring_data['endtimes']) ? $recurring_data['endtimes'] : array(); |
|
| 500 | 500 | |
| 501 | - if ( !geodir_event_is_date( $start_date ) && !empty( $event_recurring_dates ) ) {
|
|
| 501 | + if (!geodir_event_is_date($start_date) && !empty($event_recurring_dates)) {
|
|
| 502 | 502 | $start_date = $event_recurring_dates[0]; |
| 503 | 503 | } |
| 504 | 504 | |
| 505 | - if ( strtotime( $end_date ) < strtotime( $start_date ) ) {
|
|
| 505 | + if (strtotime($end_date) < strtotime($start_date)) {
|
|
| 506 | 506 | $end_date = $start_date; |
| 507 | 507 | } |
| 508 | 508 | |
| 509 | 509 | if ($end_date != '' && strtotime($end_date) >= $today) {
|
| 510 | - if ( $starttime == '' && !empty( $starttimes ) ) {
|
|
| 510 | + if ($starttime == '' && !empty($starttimes)) {
|
|
| 511 | 511 | $starttime = $starttimes[0]; |
| 512 | 512 | $endtime = $endtimes[0]; |
| 513 | 513 | } |
| 514 | 514 | |
| 515 | 515 | $same_day = false; |
| 516 | 516 | $one_day = false; |
| 517 | - if ( $start_date == $end_date && $all_day ) {
|
|
| 517 | + if ($start_date == $end_date && $all_day) {
|
|
| 518 | 518 | $one_day = true; |
| 519 | 519 | } |
| 520 | 520 | |
| 521 | - if ( $all_day ) {
|
|
| 522 | - $start_datetime = strtotime( $start_date ); |
|
| 523 | - $end_datetime = strtotime( $end_date ); |
|
| 521 | + if ($all_day) {
|
|
| 522 | + $start_datetime = strtotime($start_date); |
|
| 523 | + $end_datetime = strtotime($end_date); |
|
| 524 | 524 | |
| 525 | - $start_date = date_i18n( $geodir_date_format, $start_datetime ); |
|
| 526 | - $end_date = date_i18n( $geodir_date_format, $end_datetime ); |
|
| 527 | - if ( $start_date == $end_date ) {
|
|
| 525 | + $start_date = date_i18n($geodir_date_format, $start_datetime); |
|
| 526 | + $end_date = date_i18n($geodir_date_format, $end_datetime); |
|
| 527 | + if ($start_date == $end_date) {
|
|
| 528 | 528 | $one_day = true; |
| 529 | 529 | } |
| 530 | 530 | } else {
|
| 531 | - if ( $start_date == $end_date && $starttime == $endtime ) {
|
|
| 532 | - $end_date = date_i18n( 'Y-m-d', strtotime( $start_date . ' ' . $starttime . ' +1 day' ) ); |
|
| 531 | + if ($start_date == $end_date && $starttime == $endtime) {
|
|
| 532 | + $end_date = date_i18n('Y-m-d', strtotime($start_date.' '.$starttime.' +1 day'));
|
|
| 533 | 533 | $one_day = false; |
| 534 | 534 | } |
| 535 | - $start_datetime = strtotime( $start_date . ' ' . $starttime ); |
|
| 536 | - $end_datetime = strtotime( $end_date . ' ' . $endtime ); |
|
| 535 | + $start_datetime = strtotime($start_date.' '.$starttime); |
|
| 536 | + $end_datetime = strtotime($end_date.' '.$endtime); |
|
| 537 | 537 | |
| 538 | - $start_date = date_i18n( $geodir_date_time_format, $start_datetime ); |
|
| 539 | - $end_date = date_i18n( $geodir_date_time_format, $end_datetime ); |
|
| 538 | + $start_date = date_i18n($geodir_date_time_format, $start_datetime); |
|
| 539 | + $end_date = date_i18n($geodir_date_time_format, $end_datetime); |
|
| 540 | 540 | } |
| 541 | 541 | |
| 542 | - if ( !$one_day && date_i18n( 'Y-m-d', $start_datetime ) == date_i18n( 'Y-m-d', $end_datetime ) ) {
|
|
| 542 | + if (!$one_day && date_i18n('Y-m-d', $start_datetime) == date_i18n('Y-m-d', $end_datetime)) {
|
|
| 543 | 543 | $same_day = true; |
| 544 | 544 | |
| 545 | - $start_date .= ' - ' . date_i18n( $geodir_time_format, $end_datetime ); |
|
| 545 | + $start_date .= ' - '.date_i18n($geodir_time_format, $end_datetime); |
|
| 546 | 546 | } |
| 547 | 547 | |
| 548 | - $event_dates .= ' :: ' . $start_date; |
|
| 548 | + $event_dates .= ' :: '.$start_date; |
|
| 549 | 549 | |
| 550 | - if ( !$same_day && !$one_day ) {
|
|
| 551 | - $event_dates .= ' ' . __( 'to', 'geodirectory' ) . ' ' . $end_date; |
|
| 550 | + if (!$same_day && !$one_day) {
|
|
| 551 | + $event_dates .= ' '.__('to', 'geodirectory').' '.$end_date;
|
|
| 552 | 552 | } |
| 553 | 553 | } |
| 554 | 554 | } |
@@ -564,8 +564,8 @@ discard block |
||
| 564 | 564 | $default_cat = isset($catinfo_obj->default_category) ? $catinfo_obj->default_category : ''; |
| 565 | 565 | |
| 566 | 566 | // if single cat lets just show that icon |
| 567 | - if(is_array($map_cat_ids_array) && count($map_cat_ids_array)==1){
|
|
| 568 | - $default_cat = (int)$map_cat_ids_array[0]; |
|
| 567 | + if (is_array($map_cat_ids_array) && count($map_cat_ids_array) == 1) {
|
|
| 568 | + $default_cat = (int) $map_cat_ids_array[0]; |
|
| 569 | 569 | } |
| 570 | 570 | |
| 571 | 571 | $icon = !empty($geodir_cat_icons) && isset($geodir_cat_icons[$default_cat]) ? $geodir_cat_icons[$default_cat] : ''; |
@@ -585,7 +585,7 @@ discard block |
||
| 585 | 585 | $icon_size = array('w' => 36, 'h' => 45);
|
| 586 | 586 | } |
| 587 | 587 | |
| 588 | - $content_data[] = '{"id":"' . $catinfo_obj->post_id . '","t": "' . $title . '","lt": "' . $catinfo_obj->post_latitude . '","ln": "' . $catinfo_obj->post_longitude . '","mk_id":"' . $catinfo_obj->post_id . '_' . $default_cat . '","i":"' . $icon . '","w":"' . $icon_size['w'] . '","h":"' . $icon_size['h'] . '"'.$mark_extra.'}';
|
|
| 588 | + $content_data[] = '{"id":"'.$catinfo_obj->post_id.'","t": "'.$title.'","lt": "'.$catinfo_obj->post_latitude.'","ln": "'.$catinfo_obj->post_longitude.'","mk_id":"'.$catinfo_obj->post_id.'_'.$default_cat.'","i":"'.$icon.'","w":"'.$icon_size['w'].'","h":"'.$icon_size['h'].'"'.$mark_extra.'}';
|
|
| 589 | 589 | $post_ids[] = $catinfo_obj->post_id; |
| 590 | 590 | } |
| 591 | 591 | } |
@@ -609,10 +609,10 @@ discard block |
||
| 609 | 609 | $totalcount = count(array_unique($post_ids)); |
| 610 | 610 | |
| 611 | 611 | if (!empty($cat_content_info)) {
|
| 612 | - $map_json = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';
|
|
| 612 | + $map_json = '[{"totalcount":"'.$totalcount.'",'.substr(implode(',', $cat_content_info), 1).']';
|
|
| 613 | 613 | } |
| 614 | 614 | else {
|
| 615 | - $map_json = '[{"totalcount":"0"}]';
|
|
| 615 | + $map_json = '[{"totalcount":"0"}]';
|
|
| 616 | 616 | } |
| 617 | 617 | |
| 618 | 618 | |
@@ -622,7 +622,7 @@ discard block |
||
| 622 | 622 | * @since 1.6.22 |
| 623 | 623 | * @param string $map_json The JSON string of the map markers results. |
| 624 | 624 | */ |
| 625 | - return apply_filters('geodir_markers_json',$map_json);
|
|
| 625 | + return apply_filters('geodir_markers_json', $map_json);
|
|
| 626 | 626 | } |
| 627 | 627 | |
| 628 | 628 | |
@@ -17,26 +17,26 @@ discard block |
||
| 17 | 17 | function gd_compat_php_genesis() |
| 18 | 18 | { |
| 19 | 19 | // REPLACE GENESIS BREADCRUMBS WITH GD BREADCRUMBS |
| 20 | - remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20); |
|
| 21 | - remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20); |
|
| 22 | - remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20); |
|
| 23 | - remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20); |
|
| 24 | - remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20); |
|
| 25 | - remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20); |
|
| 20 | + remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20); |
|
| 21 | + remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20); |
|
| 22 | + remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20); |
|
| 23 | + remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20); |
|
| 24 | + remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20); |
|
| 25 | + remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20); |
|
| 26 | 26 | |
| 27 | 27 | |
| 28 | - // make top section wide |
|
| 29 | - remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 30 | - remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 31 | - remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10); |
|
| 32 | - remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10); |
|
| 33 | - remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10); |
|
| 34 | - remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10); |
|
| 28 | + // make top section wide |
|
| 29 | + remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 30 | + remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 31 | + remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10); |
|
| 32 | + remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10); |
|
| 33 | + remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10); |
|
| 34 | + remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10); |
|
| 35 | 35 | |
| 36 | - // REMOVE PAGE TITLES |
|
| 37 | - remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10); |
|
| 38 | - remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10); |
|
| 39 | - remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10); |
|
| 36 | + // REMOVE PAGE TITLES |
|
| 37 | + remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10); |
|
| 38 | + remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10); |
|
| 39 | + remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10); |
|
| 40 | 40 | |
| 41 | 41 | |
| 42 | 42 | } |
@@ -53,25 +53,25 @@ discard block |
||
| 53 | 53 | function gd_genesis_compat_left_sidebars() |
| 54 | 54 | { |
| 55 | 55 | |
| 56 | - if (is_page_geodir_home()) { |
|
| 57 | - remove_action('geodir_home_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 58 | - add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 59 | - } elseif (geodir_is_page('location')) { |
|
| 60 | - remove_action('geodir_location_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 61 | - add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 62 | - } elseif (geodir_is_page('listing')) { |
|
| 63 | - remove_action('geodir_listings_sidebar_left', 'geodir_action_listings_sidebar_left', 10); |
|
| 64 | - add_action('geodir_wrapper_close', 'geodir_action_listings_sidebar_left', 11); |
|
| 65 | - } elseif (geodir_is_page('detail') && get_option('geodir_detail_sidebar_left_section')) { |
|
| 66 | - //remove_action( 'geodir_detail_sidebar', 'geodir_action_details_sidebar', 10 ); |
|
| 67 | - //add_action( 'geodir_wrapper_close', 'geodir_action_details_sidebar', 11 ); |
|
| 68 | - } elseif (geodir_is_page('search')) { |
|
| 69 | - remove_action('geodir_search_sidebar_left', 'geodir_action_search_sidebar_left', 10); |
|
| 70 | - add_action('geodir_wrapper_close', 'geodir_action_search_sidebar_left', 11); |
|
| 71 | - } elseif (geodir_is_page('author')) { |
|
| 72 | - remove_action('geodir_author_sidebar_left', 'geodir_action_author_sidebar_left', 10); |
|
| 73 | - add_action('geodir_wrapper_close', 'geodir_action_author_sidebar_left', 11); |
|
| 74 | - } |
|
| 56 | + if (is_page_geodir_home()) { |
|
| 57 | + remove_action('geodir_home_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 58 | + add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 59 | + } elseif (geodir_is_page('location')) { |
|
| 60 | + remove_action('geodir_location_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 61 | + add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 62 | + } elseif (geodir_is_page('listing')) { |
|
| 63 | + remove_action('geodir_listings_sidebar_left', 'geodir_action_listings_sidebar_left', 10); |
|
| 64 | + add_action('geodir_wrapper_close', 'geodir_action_listings_sidebar_left', 11); |
|
| 65 | + } elseif (geodir_is_page('detail') && get_option('geodir_detail_sidebar_left_section')) { |
|
| 66 | + //remove_action( 'geodir_detail_sidebar', 'geodir_action_details_sidebar', 10 ); |
|
| 67 | + //add_action( 'geodir_wrapper_close', 'geodir_action_details_sidebar', 11 ); |
|
| 68 | + } elseif (geodir_is_page('search')) { |
|
| 69 | + remove_action('geodir_search_sidebar_left', 'geodir_action_search_sidebar_left', 10); |
|
| 70 | + add_action('geodir_wrapper_close', 'geodir_action_search_sidebar_left', 11); |
|
| 71 | + } elseif (geodir_is_page('author')) { |
|
| 72 | + remove_action('geodir_author_sidebar_left', 'geodir_action_author_sidebar_left', 10); |
|
| 73 | + add_action('geodir_wrapper_close', 'geodir_action_author_sidebar_left', 11); |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | 76 | |
| 77 | 77 | } |
@@ -88,68 +88,68 @@ discard block |
||
| 88 | 88 | */ |
| 89 | 89 | function geodir_set_body_scs($classes) |
| 90 | 90 | { |
| 91 | - $remove_class = false; |
|
| 92 | - $new_class = ''; |
|
| 93 | - if (is_page_geodir_home() || geodir_is_page('location') || geodir_is_page('home')) { |
|
| 94 | - $remove_class = true; |
|
| 95 | - if (get_option('geodir_show_home_left_section')) { |
|
| 96 | - $new_class .= 'sidebar-'; |
|
| 97 | - } |
|
| 98 | - if (get_option('geodir_show_home_contant_section')) { |
|
| 99 | - $new_class .= 'content'; |
|
| 100 | - } |
|
| 101 | - if (get_option('geodir_show_home_right_section')) { |
|
| 102 | - $new_class .= '-sidebar'; |
|
| 103 | - } |
|
| 104 | - } elseif (geodir_is_page('listing')) { |
|
| 105 | - $remove_class = true; |
|
| 106 | - if (get_option('geodir_show_listing_left_section')) { |
|
| 107 | - $new_class .= 'sidebar-'; |
|
| 108 | - } |
|
| 109 | - $new_class .= 'content'; |
|
| 110 | - if (get_option('geodir_show_listing_right_section')) { |
|
| 111 | - $new_class .= '-sidebar'; |
|
| 112 | - } |
|
| 113 | - } elseif (geodir_is_page('detail')) { |
|
| 114 | - $remove_class = true; |
|
| 115 | - if (get_option('geodir_detail_sidebar_left_section')) { |
|
| 116 | - $new_class .= 'sidebar-content gd-details-sidebar-left'; |
|
| 117 | - } else { |
|
| 118 | - $new_class .= 'content-sidebar'; |
|
| 119 | - } |
|
| 120 | - } elseif (geodir_is_page('search')) { |
|
| 121 | - $remove_class = true; |
|
| 122 | - if (get_option('geodir_show_search_left_section')) { |
|
| 123 | - $new_class .= 'sidebar-'; |
|
| 124 | - } |
|
| 125 | - $new_class .= 'content'; |
|
| 126 | - if (get_option('geodir_show_search_right_section')) { |
|
| 127 | - $new_class .= '-sidebar'; |
|
| 128 | - } |
|
| 129 | - } elseif (geodir_is_page('author')) { |
|
| 130 | - $remove_class = true; |
|
| 131 | - if (get_option('geodir_show_author_left_section')) { |
|
| 132 | - $new_class .= 'sidebar-'; |
|
| 133 | - } |
|
| 134 | - $new_class .= 'content'; |
|
| 135 | - if (get_option('geodir_show_author_right_section')) { |
|
| 136 | - $new_class .= '-sidebar'; |
|
| 137 | - } |
|
| 138 | - } elseif (geodir_is_page('add-listing')) { |
|
| 139 | - $remove_class = true; |
|
| 140 | - $new_class .= 'content-sidebar'; |
|
| 141 | - } |
|
| 142 | - |
|
| 143 | - if ($remove_class) { |
|
| 144 | - $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content')); |
|
| 145 | - if ( $new_class == 'content' ) { |
|
| 146 | - $new_class = 'content-no-sidebar'; |
|
| 147 | - $classes[] = 'full-width-content'; |
|
| 148 | - } |
|
| 149 | - $classes[] = $new_class; |
|
| 150 | - } |
|
| 151 | - |
|
| 152 | - return $classes; |
|
| 91 | + $remove_class = false; |
|
| 92 | + $new_class = ''; |
|
| 93 | + if (is_page_geodir_home() || geodir_is_page('location') || geodir_is_page('home')) { |
|
| 94 | + $remove_class = true; |
|
| 95 | + if (get_option('geodir_show_home_left_section')) { |
|
| 96 | + $new_class .= 'sidebar-'; |
|
| 97 | + } |
|
| 98 | + if (get_option('geodir_show_home_contant_section')) { |
|
| 99 | + $new_class .= 'content'; |
|
| 100 | + } |
|
| 101 | + if (get_option('geodir_show_home_right_section')) { |
|
| 102 | + $new_class .= '-sidebar'; |
|
| 103 | + } |
|
| 104 | + } elseif (geodir_is_page('listing')) { |
|
| 105 | + $remove_class = true; |
|
| 106 | + if (get_option('geodir_show_listing_left_section')) { |
|
| 107 | + $new_class .= 'sidebar-'; |
|
| 108 | + } |
|
| 109 | + $new_class .= 'content'; |
|
| 110 | + if (get_option('geodir_show_listing_right_section')) { |
|
| 111 | + $new_class .= '-sidebar'; |
|
| 112 | + } |
|
| 113 | + } elseif (geodir_is_page('detail')) { |
|
| 114 | + $remove_class = true; |
|
| 115 | + if (get_option('geodir_detail_sidebar_left_section')) { |
|
| 116 | + $new_class .= 'sidebar-content gd-details-sidebar-left'; |
|
| 117 | + } else { |
|
| 118 | + $new_class .= 'content-sidebar'; |
|
| 119 | + } |
|
| 120 | + } elseif (geodir_is_page('search')) { |
|
| 121 | + $remove_class = true; |
|
| 122 | + if (get_option('geodir_show_search_left_section')) { |
|
| 123 | + $new_class .= 'sidebar-'; |
|
| 124 | + } |
|
| 125 | + $new_class .= 'content'; |
|
| 126 | + if (get_option('geodir_show_search_right_section')) { |
|
| 127 | + $new_class .= '-sidebar'; |
|
| 128 | + } |
|
| 129 | + } elseif (geodir_is_page('author')) { |
|
| 130 | + $remove_class = true; |
|
| 131 | + if (get_option('geodir_show_author_left_section')) { |
|
| 132 | + $new_class .= 'sidebar-'; |
|
| 133 | + } |
|
| 134 | + $new_class .= 'content'; |
|
| 135 | + if (get_option('geodir_show_author_right_section')) { |
|
| 136 | + $new_class .= '-sidebar'; |
|
| 137 | + } |
|
| 138 | + } elseif (geodir_is_page('add-listing')) { |
|
| 139 | + $remove_class = true; |
|
| 140 | + $new_class .= 'content-sidebar'; |
|
| 141 | + } |
|
| 142 | + |
|
| 143 | + if ($remove_class) { |
|
| 144 | + $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content')); |
|
| 145 | + if ( $new_class == 'content' ) { |
|
| 146 | + $new_class = 'content-no-sidebar'; |
|
| 147 | + $classes[] = 'full-width-content'; |
|
| 148 | + } |
|
| 149 | + $classes[] = $new_class; |
|
| 150 | + } |
|
| 151 | + |
|
| 152 | + return $classes; |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | add_action('genesis_after_header', 'gd_genesis_compat_add_top_section_back', 11); |
@@ -162,17 +162,17 @@ discard block |
||
| 162 | 162 | function gd_genesis_compat_add_top_section_back() |
| 163 | 163 | { |
| 164 | 164 | |
| 165 | - if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 166 | - geodir_action_geodir_sidebar_home_top(); |
|
| 167 | - } elseif (geodir_is_page('listing')) { |
|
| 168 | - geodir_action_geodir_sidebar_listings_top(); |
|
| 169 | - } elseif (geodir_is_page('detail')) { |
|
| 170 | - geodir_action_geodir_sidebar_detail_top(); |
|
| 171 | - } elseif (geodir_is_page('search')) { |
|
| 172 | - geodir_action_geodir_sidebar_search_top(); |
|
| 173 | - } elseif (geodir_is_page('author')) { |
|
| 174 | - geodir_action_geodir_sidebar_author_top(); |
|
| 175 | - } |
|
| 165 | + if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 166 | + geodir_action_geodir_sidebar_home_top(); |
|
| 167 | + } elseif (geodir_is_page('listing')) { |
|
| 168 | + geodir_action_geodir_sidebar_listings_top(); |
|
| 169 | + } elseif (geodir_is_page('detail')) { |
|
| 170 | + geodir_action_geodir_sidebar_detail_top(); |
|
| 171 | + } elseif (geodir_is_page('search')) { |
|
| 172 | + geodir_action_geodir_sidebar_search_top(); |
|
| 173 | + } elseif (geodir_is_page('author')) { |
|
| 174 | + geodir_action_geodir_sidebar_author_top(); |
|
| 175 | + } |
|
| 176 | 176 | |
| 177 | 177 | |
| 178 | 178 | } |
@@ -185,12 +185,12 @@ discard block |
||
| 185 | 185 | */ |
| 186 | 186 | function geodir_replace_breadcrumb() |
| 187 | 187 | { |
| 188 | - if (is_front_page() && geodir_is_page('home') && !geodir_is_page('login')) { |
|
| 189 | - } else { |
|
| 190 | - echo '<div class="geodir-breadcrumb-bar"><div class="wrap">'; |
|
| 191 | - geodir_breadcrumb(); |
|
| 192 | - echo '</div></div>'; |
|
| 193 | - } |
|
| 188 | + if (is_front_page() && geodir_is_page('home') && !geodir_is_page('login')) { |
|
| 189 | + } else { |
|
| 190 | + echo '<div class="geodir-breadcrumb-bar"><div class="wrap">'; |
|
| 191 | + geodir_breadcrumb(); |
|
| 192 | + echo '</div></div>'; |
|
| 193 | + } |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | // Force Full Width on signup page |
@@ -203,9 +203,9 @@ discard block |
||
| 203 | 203 | */ |
| 204 | 204 | function geodir_genesis_meta() |
| 205 | 205 | { |
| 206 | - if (geodir_is_page('login')) { |
|
| 207 | - add_filter('genesis_pre_get_option_site_layout', '__genesis_return_full_width_content'); |
|
| 208 | - } |
|
| 206 | + if (geodir_is_page('login')) { |
|
| 207 | + add_filter('genesis_pre_get_option_site_layout', '__genesis_return_full_width_content'); |
|
| 208 | + } |
|
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | add_action('geodir_add_listing_page_title', 'geodir_add_listing_page_title_genesis_before', 8); |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | function geodir_add_listing_page_title_genesis_before() |
| 219 | 219 | { |
| 220 | 220 | |
| 221 | - echo "<div class='entry' >"; |
|
| 221 | + echo "<div class='entry' >"; |
|
| 222 | 222 | } |
| 223 | 223 | |
| 224 | 224 | |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | function geodir_add_listing_form_genesis_after() |
| 233 | 233 | { |
| 234 | 234 | |
| 235 | - echo "</div>"; |
|
| 235 | + echo "</div>"; |
|
| 236 | 236 | } |
| 237 | 237 | |
| 238 | 238 | |
@@ -251,38 +251,38 @@ discard block |
||
| 251 | 251 | { |
| 252 | 252 | |
| 253 | 253 | |
| 254 | - $title = ''; |
|
| 255 | - $subtitle = ''; |
|
| 256 | - |
|
| 257 | - if (geodir_is_page('listing')) { |
|
| 258 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 259 | - geodir_action_listings_title(); |
|
| 260 | - echo '</div>'; |
|
| 261 | - } |
|
| 262 | - |
|
| 263 | - if (geodir_is_page('add-listing')) { |
|
| 264 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 265 | - geodir_action_add_listing_page_title(); |
|
| 266 | - echo '</div>'; |
|
| 267 | - } |
|
| 268 | - |
|
| 269 | - if (geodir_is_page('author')) { |
|
| 270 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 271 | - geodir_action_author_page_title(); |
|
| 272 | - echo '</div>'; |
|
| 273 | - } |
|
| 274 | - |
|
| 275 | - if (geodir_is_page('detail') || geodir_is_page('preview')) { |
|
| 276 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 277 | - echo get_the_title(); |
|
| 278 | - echo '</div>'; |
|
| 279 | - } |
|
| 280 | - |
|
| 281 | - if (geodir_is_page('search')) { |
|
| 282 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 283 | - geodir_action_search_page_title(); |
|
| 284 | - echo '</div>'; |
|
| 285 | - } |
|
| 254 | + $title = ''; |
|
| 255 | + $subtitle = ''; |
|
| 256 | + |
|
| 257 | + if (geodir_is_page('listing')) { |
|
| 258 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 259 | + geodir_action_listings_title(); |
|
| 260 | + echo '</div>'; |
|
| 261 | + } |
|
| 262 | + |
|
| 263 | + if (geodir_is_page('add-listing')) { |
|
| 264 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 265 | + geodir_action_add_listing_page_title(); |
|
| 266 | + echo '</div>'; |
|
| 267 | + } |
|
| 268 | + |
|
| 269 | + if (geodir_is_page('author')) { |
|
| 270 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 271 | + geodir_action_author_page_title(); |
|
| 272 | + echo '</div>'; |
|
| 273 | + } |
|
| 274 | + |
|
| 275 | + if (geodir_is_page('detail') || geodir_is_page('preview')) { |
|
| 276 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 277 | + echo get_the_title(); |
|
| 278 | + echo '</div>'; |
|
| 279 | + } |
|
| 280 | + |
|
| 281 | + if (geodir_is_page('search')) { |
|
| 282 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 283 | + geodir_action_search_page_title(); |
|
| 284 | + echo '</div>'; |
|
| 285 | + } |
|
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | |
@@ -295,8 +295,8 @@ discard block |
||
| 295 | 295 | */ |
| 296 | 296 | function gd_genesis_listing_page_title_bar() |
| 297 | 297 | { |
| 298 | - geodir_action_listings_title(); |
|
| 299 | - //geodir_action_listings_description(); |
|
| 298 | + geodir_action_listings_title(); |
|
| 299 | + //geodir_action_listings_description(); |
|
| 300 | 300 | } |
| 301 | 301 | |
| 302 | 302 | |
@@ -309,19 +309,19 @@ discard block |
||
| 309 | 309 | */ |
| 310 | 310 | function gd_compat_php_genesis_geo_1280_fix() |
| 311 | 311 | { |
| 312 | - if (function_exists('geo1280_search_bar')) { |
|
| 313 | - remove_action('genesis_after_header', 'geo1280_search_bar', 20); |
|
| 314 | - add_action('genesis_after_header', 'geo1280_search_bar_fix', 4); |
|
| 312 | + if (function_exists('geo1280_search_bar')) { |
|
| 313 | + remove_action('genesis_after_header', 'geo1280_search_bar', 20); |
|
| 314 | + add_action('genesis_after_header', 'geo1280_search_bar_fix', 4); |
|
| 315 | 315 | |
| 316 | - // |
|
| 316 | + // |
|
| 317 | 317 | |
| 318 | - remove_action('genesis_after_header', 'geodir_replace_breadcrumb', 20); |
|
| 319 | - remove_action('genesis_before_content_sidebar_wrap', 'geodir_replace_breadcrumb', 20); |
|
| 320 | - add_action('geodir_wrapper_open', 'geodir_replace_breadcrumb', 105); |
|
| 318 | + remove_action('genesis_after_header', 'geodir_replace_breadcrumb', 20); |
|
| 319 | + remove_action('genesis_before_content_sidebar_wrap', 'geodir_replace_breadcrumb', 20); |
|
| 320 | + add_action('geodir_wrapper_open', 'geodir_replace_breadcrumb', 105); |
|
| 321 | 321 | |
| 322 | - remove_action('genesis_before_content_sidebar_wrap', 'geo1280_page_title', 10); |
|
| 323 | - add_action('geodir_wrapper_open', 'geo1280_page_title', 101); |
|
| 324 | - } |
|
| 322 | + remove_action('genesis_before_content_sidebar_wrap', 'geo1280_page_title', 10); |
|
| 323 | + add_action('geodir_wrapper_open', 'geo1280_page_title', 101); |
|
| 324 | + } |
|
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | /** |
@@ -333,11 +333,11 @@ discard block |
||
| 333 | 333 | function geo1280_search_bar_fix() |
| 334 | 334 | { |
| 335 | 335 | |
| 336 | - echo '<div class="geo1280-placeholder"></div>'; |
|
| 337 | - if (is_active_sidebar('search-bar')) { |
|
| 338 | - genesis_widget_area('search-bar', array( |
|
| 339 | - 'before' => '<div class="search-bar widget-area"><div class="wrap">', |
|
| 340 | - 'after' => '</div></div>', |
|
| 341 | - )); |
|
| 342 | - } |
|
| 336 | + echo '<div class="geo1280-placeholder"></div>'; |
|
| 337 | + if (is_active_sidebar('search-bar')) { |
|
| 338 | + genesis_widget_area('search-bar', array( |
|
| 339 | + 'before' => '<div class="search-bar widget-area"><div class="wrap">', |
|
| 340 | + 'after' => '</div></div>', |
|
| 341 | + )); |
|
| 342 | + } |
|
| 343 | 343 | } |
@@ -142,7 +142,7 @@ |
||
| 142 | 142 | |
| 143 | 143 | if ($remove_class) { |
| 144 | 144 | $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content')); |
| 145 | - if ( $new_class == 'content' ) { |
|
| 145 | + if ($new_class == 'content') { |
|
| 146 | 146 | $new_class = 'content-no-sidebar'; |
| 147 | 147 | $classes[] = 'full-width-content'; |
| 148 | 148 | } |
@@ -13,34 +13,34 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | function geodir_user_favourite_listing_count($user_id=false) |
| 15 | 15 | { |
| 16 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 16 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 17 | 17 | |
| 18 | - if(!$user_id){$user_id = $current_user->ID;} |
|
| 19 | - if(!$user_id){return array();} |
|
| 18 | + if(!$user_id){$user_id = $current_user->ID;} |
|
| 19 | + if(!$user_id){return array();} |
|
| 20 | 20 | |
| 21 | - $site_id = ''; |
|
| 22 | - if ( is_multisite() ) { |
|
| 23 | - $blog_id = get_current_blog_id(); |
|
| 24 | - if($blog_id && $blog_id!='1'){$site_id = '_' . $blog_id ;} |
|
| 25 | - } |
|
| 21 | + $site_id = ''; |
|
| 22 | + if ( is_multisite() ) { |
|
| 23 | + $blog_id = get_current_blog_id(); |
|
| 24 | + if($blog_id && $blog_id!='1'){$site_id = '_' . $blog_id ;} |
|
| 25 | + } |
|
| 26 | 26 | |
| 27 | - $user_favorites = geodir_get_user_favourites($user_id); |
|
| 28 | - $all_posts = get_option('geodir_favorite_link_user_dashboard'); |
|
| 27 | + $user_favorites = geodir_get_user_favourites($user_id); |
|
| 28 | + $all_posts = get_option('geodir_favorite_link_user_dashboard'); |
|
| 29 | 29 | |
| 30 | - $user_listing = array(); |
|
| 31 | - if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) { |
|
| 32 | - $user_favorites = "'" . implode("','", $user_favorites) . "'"; |
|
| 30 | + $user_listing = array(); |
|
| 31 | + if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) { |
|
| 32 | + $user_favorites = "'" . implode("','", $user_favorites) . "'"; |
|
| 33 | 33 | |
| 34 | - foreach ($all_posts as $ptype) { |
|
| 35 | - $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")"); |
|
| 34 | + foreach ($all_posts as $ptype) { |
|
| 35 | + $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")"); |
|
| 36 | 36 | |
| 37 | - if ($total_posts > 0) { |
|
| 38 | - $user_listing[$ptype] = $total_posts; |
|
| 39 | - } |
|
| 40 | - } |
|
| 41 | - } |
|
| 37 | + if ($total_posts > 0) { |
|
| 38 | + $user_listing[$ptype] = $total_posts; |
|
| 39 | + } |
|
| 40 | + } |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - return $user_listing; |
|
| 43 | + return $user_listing; |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | /** |
@@ -50,48 +50,48 @@ discard block |
||
| 50 | 50 | * @package GeoDirectory |
| 51 | 51 | */ |
| 52 | 52 | function geodir_user_show_favourites( $user_id = '', $output_type = 'select' ) { |
| 53 | - // My Favourites in Dashboard |
|
| 54 | - $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' ); |
|
| 55 | - $user_favourite = geodir_user_favourite_listing_count( $user_id ); |
|
| 56 | - |
|
| 57 | - if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) { |
|
| 58 | - $favourite_links = $output_type == 'link' ? array() : ''; |
|
| 59 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 60 | - |
|
| 61 | - $author_link = get_author_posts_url( $user_id ); |
|
| 62 | - $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false ); |
|
| 63 | - |
|
| 64 | - foreach ( $post_types as $key => $postobj ) { |
|
| 65 | - if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) { |
|
| 66 | - $name = __( $postobj->labels->name, 'geodirectory' ); |
|
| 67 | - $post_type_link = geodir_getlink( $author_link, array( 'stype' => $key, 'list' => 'favourite' ), false ); |
|
| 68 | - |
|
| 69 | - /** |
|
| 70 | - * Filter favorite listing link. |
|
| 71 | - * |
|
| 72 | - * @since 1.0.0 |
|
| 73 | - * @param string $post_type_link Favorite listing link. |
|
| 74 | - * @param string $key Favorite listing array key. |
|
| 75 | - * @param int $current_user->ID Current user ID. |
|
| 76 | - */ |
|
| 77 | - $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id ); |
|
| 78 | - |
|
| 79 | - if ( $output_type == 'select' ) { |
|
| 80 | - $selected = ''; |
|
| 81 | - if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) { |
|
| 82 | - $selected = 'selected="selected"'; |
|
| 83 | - } |
|
| 84 | - |
|
| 85 | - $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . $name . '</option>'; |
|
| 86 | - } elseif ( $output_type == 'link' ) { |
|
| 87 | - $favourite_links[] = '<a href="' . $post_type_link . '">' . $name . '</a>'; |
|
| 88 | - } |
|
| 89 | - } |
|
| 90 | - } |
|
| 91 | - |
|
| 92 | - if ( ! empty( $favourite_links ) ) { |
|
| 93 | - if ( $output_type == 'select' ) { |
|
| 94 | - ?> |
|
| 53 | + // My Favourites in Dashboard |
|
| 54 | + $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' ); |
|
| 55 | + $user_favourite = geodir_user_favourite_listing_count( $user_id ); |
|
| 56 | + |
|
| 57 | + if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) { |
|
| 58 | + $favourite_links = $output_type == 'link' ? array() : ''; |
|
| 59 | + $post_types = geodir_get_posttypes( 'object' ); |
|
| 60 | + |
|
| 61 | + $author_link = get_author_posts_url( $user_id ); |
|
| 62 | + $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false ); |
|
| 63 | + |
|
| 64 | + foreach ( $post_types as $key => $postobj ) { |
|
| 65 | + if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) { |
|
| 66 | + $name = __( $postobj->labels->name, 'geodirectory' ); |
|
| 67 | + $post_type_link = geodir_getlink( $author_link, array( 'stype' => $key, 'list' => 'favourite' ), false ); |
|
| 68 | + |
|
| 69 | + /** |
|
| 70 | + * Filter favorite listing link. |
|
| 71 | + * |
|
| 72 | + * @since 1.0.0 |
|
| 73 | + * @param string $post_type_link Favorite listing link. |
|
| 74 | + * @param string $key Favorite listing array key. |
|
| 75 | + * @param int $current_user->ID Current user ID. |
|
| 76 | + */ |
|
| 77 | + $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id ); |
|
| 78 | + |
|
| 79 | + if ( $output_type == 'select' ) { |
|
| 80 | + $selected = ''; |
|
| 81 | + if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) { |
|
| 82 | + $selected = 'selected="selected"'; |
|
| 83 | + } |
|
| 84 | + |
|
| 85 | + $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . $name . '</option>'; |
|
| 86 | + } elseif ( $output_type == 'link' ) { |
|
| 87 | + $favourite_links[] = '<a href="' . $post_type_link . '">' . $name . '</a>'; |
|
| 88 | + } |
|
| 89 | + } |
|
| 90 | + } |
|
| 91 | + |
|
| 92 | + if ( ! empty( $favourite_links ) ) { |
|
| 93 | + if ( $output_type == 'select' ) { |
|
| 94 | + ?> |
|
| 95 | 95 | <li> |
| 96 | 96 | <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Favorites', 'geodirectory' ); ?>"> |
| 97 | 97 | <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Favorites", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option> |
@@ -99,55 +99,55 @@ discard block |
||
| 99 | 99 | </select> |
| 100 | 100 | </li> |
| 101 | 101 | <?php |
| 102 | - } elseif ( $output_type == 'link' ) { |
|
| 103 | - echo implode( " | ", $favourite_links ); |
|
| 104 | - } |
|
| 105 | - } |
|
| 106 | - } |
|
| 102 | + } elseif ( $output_type == 'link' ) { |
|
| 103 | + echo implode( " | ", $favourite_links ); |
|
| 104 | + } |
|
| 105 | + } |
|
| 106 | + } |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | function geodir_user_show_listings( $user_id = '', $output_type = 'select' ) { |
| 110 | - $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' ); |
|
| 111 | - $user_listing = geodir_user_post_listing_count( $user_id ); |
|
| 112 | - |
|
| 113 | - if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) { |
|
| 114 | - $listing_links = $output_type == 'link' ? array() : ''; |
|
| 115 | - |
|
| 116 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 117 | - |
|
| 118 | - $author_link = get_author_posts_url( $user_id ); |
|
| 119 | - $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false ); |
|
| 120 | - |
|
| 121 | - foreach ( $post_types as $key => $postobj ) { |
|
| 122 | - if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) { |
|
| 123 | - $name = __( $postobj->labels->name, 'geodirectory' ); |
|
| 124 | - $listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false ); |
|
| 125 | - |
|
| 126 | - /** |
|
| 127 | - * Filter my listing link. |
|
| 128 | - * |
|
| 129 | - * @since 1.0.0 |
|
| 130 | - * @param string $listing_link My listing link. |
|
| 131 | - * @param string $key My listing array key. |
|
| 132 | - * @param int $current_user->ID Current user ID. |
|
| 133 | - */ |
|
| 134 | - $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $user_id ); |
|
| 135 | - if ( $output_type == 'select' ) { |
|
| 136 | - $selected = ''; |
|
| 137 | - if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) { |
|
| 138 | - $selected = 'selected="selected"'; |
|
| 139 | - } |
|
| 140 | - |
|
| 141 | - $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . $name . '</option>'; |
|
| 142 | - } elseif ( $output_type == 'link' ) { |
|
| 143 | - $listing_links[] = '<a href="' . $listing_link . '">' . $name . '</a>'; |
|
| 144 | - } |
|
| 145 | - } |
|
| 146 | - } |
|
| 147 | - |
|
| 148 | - if ( ! empty( $listing_links ) ) { |
|
| 149 | - if ( $output_type == 'select' ) { |
|
| 150 | - ?> |
|
| 110 | + $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' ); |
|
| 111 | + $user_listing = geodir_user_post_listing_count( $user_id ); |
|
| 112 | + |
|
| 113 | + if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) { |
|
| 114 | + $listing_links = $output_type == 'link' ? array() : ''; |
|
| 115 | + |
|
| 116 | + $post_types = geodir_get_posttypes( 'object' ); |
|
| 117 | + |
|
| 118 | + $author_link = get_author_posts_url( $user_id ); |
|
| 119 | + $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false ); |
|
| 120 | + |
|
| 121 | + foreach ( $post_types as $key => $postobj ) { |
|
| 122 | + if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) { |
|
| 123 | + $name = __( $postobj->labels->name, 'geodirectory' ); |
|
| 124 | + $listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false ); |
|
| 125 | + |
|
| 126 | + /** |
|
| 127 | + * Filter my listing link. |
|
| 128 | + * |
|
| 129 | + * @since 1.0.0 |
|
| 130 | + * @param string $listing_link My listing link. |
|
| 131 | + * @param string $key My listing array key. |
|
| 132 | + * @param int $current_user->ID Current user ID. |
|
| 133 | + */ |
|
| 134 | + $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $user_id ); |
|
| 135 | + if ( $output_type == 'select' ) { |
|
| 136 | + $selected = ''; |
|
| 137 | + if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) { |
|
| 138 | + $selected = 'selected="selected"'; |
|
| 139 | + } |
|
| 140 | + |
|
| 141 | + $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . $name . '</option>'; |
|
| 142 | + } elseif ( $output_type == 'link' ) { |
|
| 143 | + $listing_links[] = '<a href="' . $listing_link . '">' . $name . '</a>'; |
|
| 144 | + } |
|
| 145 | + } |
|
| 146 | + } |
|
| 147 | + |
|
| 148 | + if ( ! empty( $listing_links ) ) { |
|
| 149 | + if ( $output_type == 'select' ) { |
|
| 150 | + ?> |
|
| 151 | 151 | <li> |
| 152 | 152 | <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Listings', 'geodirectory' ); ?>"> |
| 153 | 153 | <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Listings", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option> |
@@ -155,11 +155,11 @@ discard block |
||
| 155 | 155 | </select> |
| 156 | 156 | </li> |
| 157 | 157 | <?php |
| 158 | - } elseif ( $output_type == 'link' ) { |
|
| 159 | - echo implode( " | ", $listing_links ); |
|
| 160 | - } |
|
| 161 | - } |
|
| 162 | - } |
|
| 158 | + } elseif ( $output_type == 'link' ) { |
|
| 159 | + echo implode( " | ", $listing_links ); |
|
| 160 | + } |
|
| 161 | + } |
|
| 162 | + } |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | /** |
@@ -170,12 +170,12 @@ discard block |
||
| 170 | 170 | * @return mixed |
| 171 | 171 | */ |
| 172 | 172 | function geodir_get_user_favourites($user_id=''){ |
| 173 | - if(!$user_id){$user_id = get_current_user_id();} |
|
| 174 | - $site_id = ''; |
|
| 175 | - if ( is_multisite() ) { |
|
| 176 | - $blog_id = get_current_blog_id(); |
|
| 177 | - if($blog_id && $blog_id!='1'){$site_id = '_' . $blog_id ;} |
|
| 178 | - } |
|
| 179 | - |
|
| 180 | - return get_user_meta($user_id, 'gd_user_favourite_post'.$site_id, true); |
|
| 173 | + if(!$user_id){$user_id = get_current_user_id();} |
|
| 174 | + $site_id = ''; |
|
| 175 | + if ( is_multisite() ) { |
|
| 176 | + $blog_id = get_current_blog_id(); |
|
| 177 | + if($blog_id && $blog_id!='1'){$site_id = '_' . $blog_id ;} |
|
| 178 | + } |
|
| 179 | + |
|
| 180 | + return get_user_meta($user_id, 'gd_user_favourite_post'.$site_id, true); |
|
| 181 | 181 | } |
| 182 | 182 | \ No newline at end of file |
@@ -11,17 +11,17 @@ discard block |
||
| 11 | 11 | * @global string $plugin_prefix Geodirectory plugin table prefix. |
| 12 | 12 | * @return array User listing count for each post type. |
| 13 | 13 | */ |
| 14 | -function geodir_user_favourite_listing_count($user_id=false) |
|
| 14 | +function geodir_user_favourite_listing_count($user_id = false) |
|
| 15 | 15 | { |
| 16 | 16 | global $wpdb, $plugin_prefix, $current_user; |
| 17 | 17 | |
| 18 | - if(!$user_id){$user_id = $current_user->ID;} |
|
| 19 | - if(!$user_id){return array();} |
|
| 18 | + if (!$user_id) {$user_id = $current_user->ID; } |
|
| 19 | + if (!$user_id) {return array(); } |
|
| 20 | 20 | |
| 21 | 21 | $site_id = ''; |
| 22 | - if ( is_multisite() ) { |
|
| 22 | + if (is_multisite()) { |
|
| 23 | 23 | $blog_id = get_current_blog_id(); |
| 24 | - if($blog_id && $blog_id!='1'){$site_id = '_' . $blog_id ;} |
|
| 24 | + if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; } |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | $user_favorites = geodir_get_user_favourites($user_id); |
@@ -29,10 +29,10 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | $user_listing = array(); |
| 31 | 31 | if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) { |
| 32 | - $user_favorites = "'" . implode("','", $user_favorites) . "'"; |
|
| 32 | + $user_favorites = "'".implode("','", $user_favorites)."'"; |
|
| 33 | 33 | |
| 34 | 34 | foreach ($all_posts as $ptype) { |
| 35 | - $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")"); |
|
| 35 | + $total_posts = $wpdb->get_var("SELECT count( ID ) FROM ".$wpdb->prefix."posts WHERE post_type='".$ptype."' AND post_status = 'publish' AND ID IN (".$user_favorites.")"); |
|
| 36 | 36 | |
| 37 | 37 | if ($total_posts > 0) { |
| 38 | 38 | $user_listing[$ptype] = $total_posts; |
@@ -49,22 +49,22 @@ discard block |
||
| 49 | 49 | * @since 1.5.9 |
| 50 | 50 | * @package GeoDirectory |
| 51 | 51 | */ |
| 52 | -function geodir_user_show_favourites( $user_id = '', $output_type = 'select' ) { |
|
| 52 | +function geodir_user_show_favourites($user_id = '', $output_type = 'select') { |
|
| 53 | 53 | // My Favourites in Dashboard |
| 54 | - $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' ); |
|
| 55 | - $user_favourite = geodir_user_favourite_listing_count( $user_id ); |
|
| 54 | + $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard'); |
|
| 55 | + $user_favourite = geodir_user_favourite_listing_count($user_id); |
|
| 56 | 56 | |
| 57 | - if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) { |
|
| 57 | + if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) { |
|
| 58 | 58 | $favourite_links = $output_type == 'link' ? array() : ''; |
| 59 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 59 | + $post_types = geodir_get_posttypes('object'); |
|
| 60 | 60 | |
| 61 | - $author_link = get_author_posts_url( $user_id ); |
|
| 62 | - $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false ); |
|
| 61 | + $author_link = get_author_posts_url($user_id); |
|
| 62 | + $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false); |
|
| 63 | 63 | |
| 64 | - foreach ( $post_types as $key => $postobj ) { |
|
| 65 | - if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) { |
|
| 66 | - $name = __( $postobj->labels->name, 'geodirectory' ); |
|
| 67 | - $post_type_link = geodir_getlink( $author_link, array( 'stype' => $key, 'list' => 'favourite' ), false ); |
|
| 64 | + foreach ($post_types as $key => $postobj) { |
|
| 65 | + if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) { |
|
| 66 | + $name = __($postobj->labels->name, 'geodirectory'); |
|
| 67 | + $post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false); |
|
| 68 | 68 | |
| 69 | 69 | /** |
| 70 | 70 | * Filter favorite listing link. |
@@ -74,54 +74,54 @@ discard block |
||
| 74 | 74 | * @param string $key Favorite listing array key. |
| 75 | 75 | * @param int $current_user->ID Current user ID. |
| 76 | 76 | */ |
| 77 | - $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id ); |
|
| 77 | + $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id); |
|
| 78 | 78 | |
| 79 | - if ( $output_type == 'select' ) { |
|
| 79 | + if ($output_type == 'select') { |
|
| 80 | 80 | $selected = ''; |
| 81 | - if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) { |
|
| 81 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) { |
|
| 82 | 82 | $selected = 'selected="selected"'; |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | - $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . $name . '</option>'; |
|
| 86 | - } elseif ( $output_type == 'link' ) { |
|
| 87 | - $favourite_links[] = '<a href="' . $post_type_link . '">' . $name . '</a>'; |
|
| 85 | + $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.$name.'</option>'; |
|
| 86 | + } elseif ($output_type == 'link') { |
|
| 87 | + $favourite_links[] = '<a href="'.$post_type_link.'">'.$name.'</a>'; |
|
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - if ( ! empty( $favourite_links ) ) { |
|
| 93 | - if ( $output_type == 'select' ) { |
|
| 92 | + if (!empty($favourite_links)) { |
|
| 93 | + if ($output_type == 'select') { |
|
| 94 | 94 | ?> |
| 95 | 95 | <li> |
| 96 | - <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Favorites', 'geodirectory' ); ?>"> |
|
| 97 | - <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Favorites", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option> |
|
| 96 | + <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__('My Favorites', 'geodirectory'); ?>"> |
|
| 97 | + <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr(wp_sprintf(__("%s's Favorites", 'geodirectory'), geodir_get_client_name($user_id))); ?></option> |
|
| 98 | 98 | <?php echo $favourite_links; ?> |
| 99 | 99 | </select> |
| 100 | 100 | </li> |
| 101 | 101 | <?php |
| 102 | - } elseif ( $output_type == 'link' ) { |
|
| 103 | - echo implode( " | ", $favourite_links ); |
|
| 102 | + } elseif ($output_type == 'link') { |
|
| 103 | + echo implode(" | ", $favourite_links); |
|
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | -function geodir_user_show_listings( $user_id = '', $output_type = 'select' ) { |
|
| 110 | - $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' ); |
|
| 111 | - $user_listing = geodir_user_post_listing_count( $user_id ); |
|
| 109 | +function geodir_user_show_listings($user_id = '', $output_type = 'select') { |
|
| 110 | + $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard'); |
|
| 111 | + $user_listing = geodir_user_post_listing_count($user_id); |
|
| 112 | 112 | |
| 113 | - if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) { |
|
| 113 | + if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) { |
|
| 114 | 114 | $listing_links = $output_type == 'link' ? array() : ''; |
| 115 | 115 | |
| 116 | - $post_types = geodir_get_posttypes( 'object' ); |
|
| 116 | + $post_types = geodir_get_posttypes('object'); |
|
| 117 | 117 | |
| 118 | - $author_link = get_author_posts_url( $user_id ); |
|
| 119 | - $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false ); |
|
| 118 | + $author_link = get_author_posts_url($user_id); |
|
| 119 | + $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false); |
|
| 120 | 120 | |
| 121 | - foreach ( $post_types as $key => $postobj ) { |
|
| 122 | - if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) { |
|
| 123 | - $name = __( $postobj->labels->name, 'geodirectory' ); |
|
| 124 | - $listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false ); |
|
| 121 | + foreach ($post_types as $key => $postobj) { |
|
| 122 | + if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) { |
|
| 123 | + $name = __($postobj->labels->name, 'geodirectory'); |
|
| 124 | + $listing_link = geodir_getlink($author_link, array('stype' => $key), false); |
|
| 125 | 125 | |
| 126 | 126 | /** |
| 127 | 127 | * Filter my listing link. |
@@ -131,32 +131,32 @@ discard block |
||
| 131 | 131 | * @param string $key My listing array key. |
| 132 | 132 | * @param int $current_user->ID Current user ID. |
| 133 | 133 | */ |
| 134 | - $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $user_id ); |
|
| 135 | - if ( $output_type == 'select' ) { |
|
| 134 | + $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id); |
|
| 135 | + if ($output_type == 'select') { |
|
| 136 | 136 | $selected = ''; |
| 137 | - if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) { |
|
| 137 | + if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) { |
|
| 138 | 138 | $selected = 'selected="selected"'; |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . $name . '</option>'; |
|
| 142 | - } elseif ( $output_type == 'link' ) { |
|
| 143 | - $listing_links[] = '<a href="' . $listing_link . '">' . $name . '</a>'; |
|
| 141 | + $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.$name.'</option>'; |
|
| 142 | + } elseif ($output_type == 'link') { |
|
| 143 | + $listing_links[] = '<a href="'.$listing_link.'">'.$name.'</a>'; |
|
| 144 | 144 | } |
| 145 | 145 | } |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | - if ( ! empty( $listing_links ) ) { |
|
| 149 | - if ( $output_type == 'select' ) { |
|
| 148 | + if (!empty($listing_links)) { |
|
| 149 | + if ($output_type == 'select') { |
|
| 150 | 150 | ?> |
| 151 | 151 | <li> |
| 152 | - <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Listings', 'geodirectory' ); ?>"> |
|
| 153 | - <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Listings", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option> |
|
| 152 | + <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__('My Listings', 'geodirectory'); ?>"> |
|
| 153 | + <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr(wp_sprintf(__("%s's Listings", 'geodirectory'), geodir_get_client_name($user_id))); ?></option> |
|
| 154 | 154 | <?php echo $listing_links; ?> |
| 155 | 155 | </select> |
| 156 | 156 | </li> |
| 157 | 157 | <?php |
| 158 | - } elseif ( $output_type == 'link' ) { |
|
| 159 | - echo implode( " | ", $listing_links ); |
|
| 158 | + } elseif ($output_type == 'link') { |
|
| 159 | + echo implode(" | ", $listing_links); |
|
| 160 | 160 | } |
| 161 | 161 | } |
| 162 | 162 | } |
@@ -169,12 +169,12 @@ discard block |
||
| 169 | 169 | * @since 1.6.24 |
| 170 | 170 | * @return mixed |
| 171 | 171 | */ |
| 172 | -function geodir_get_user_favourites($user_id=''){ |
|
| 173 | - if(!$user_id){$user_id = get_current_user_id();} |
|
| 172 | +function geodir_get_user_favourites($user_id = '') { |
|
| 173 | + if (!$user_id) {$user_id = get_current_user_id(); } |
|
| 174 | 174 | $site_id = ''; |
| 175 | - if ( is_multisite() ) { |
|
| 175 | + if (is_multisite()) { |
|
| 176 | 176 | $blog_id = get_current_blog_id(); |
| 177 | - if($blog_id && $blog_id!='1'){$site_id = '_' . $blog_id ;} |
|
| 177 | + if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; } |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | return get_user_meta($user_id, 'gd_user_favourite_post'.$site_id, true); |
@@ -13,11 +13,11 @@ discard block |
||
| 13 | 13 | * @since 1.4.6 |
| 14 | 14 | * @return int|null Return the page ID if present or null if not. |
| 15 | 15 | */ |
| 16 | -function geodir_add_listing_page_id(){ |
|
| 16 | +function geodir_add_listing_page_id() { |
|
| 17 | 17 | $gd_page_id = get_option('geodir_add_listing_page'); |
| 18 | 18 | |
| 19 | 19 | if (geodir_is_wpml()) { |
| 20 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 20 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | return $gd_page_id; |
@@ -30,11 +30,11 @@ discard block |
||
| 30 | 30 | * @since 1.4.6 |
| 31 | 31 | * @return int|null Return the page ID if present or null if not. |
| 32 | 32 | */ |
| 33 | -function geodir_preview_page_id(){ |
|
| 33 | +function geodir_preview_page_id() { |
|
| 34 | 34 | $gd_page_id = get_option('geodir_preview_page'); |
| 35 | 35 | |
| 36 | 36 | if (geodir_is_wpml()) { |
| 37 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 37 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | return $gd_page_id; |
@@ -47,11 +47,11 @@ discard block |
||
| 47 | 47 | * @since 1.4.6 |
| 48 | 48 | * @return int|null Return the page ID if present or null if not. |
| 49 | 49 | */ |
| 50 | -function geodir_success_page_id(){ |
|
| 50 | +function geodir_success_page_id() { |
|
| 51 | 51 | $gd_page_id = get_option('geodir_success_page'); |
| 52 | 52 | |
| 53 | 53 | if (geodir_is_wpml()) { |
| 54 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 54 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | return $gd_page_id; |
@@ -64,11 +64,11 @@ discard block |
||
| 64 | 64 | * @since 1.4.6 |
| 65 | 65 | * @return int|null Return the page ID if present or null if not. |
| 66 | 66 | */ |
| 67 | -function geodir_location_page_id(){ |
|
| 67 | +function geodir_location_page_id() { |
|
| 68 | 68 | $gd_page_id = get_option('geodir_location_page'); |
| 69 | 69 | |
| 70 | 70 | if (geodir_is_wpml()) { |
| 71 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 71 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | return $gd_page_id; |
@@ -81,11 +81,11 @@ discard block |
||
| 81 | 81 | * @since 1.5.4 |
| 82 | 82 | * @return int|null Return the page ID if present or null if not. |
| 83 | 83 | */ |
| 84 | -function geodir_home_page_id(){ |
|
| 84 | +function geodir_home_page_id() { |
|
| 85 | 85 | $gd_page_id = get_option('geodir_home_page'); |
| 86 | 86 | |
| 87 | 87 | if (geodir_is_wpml()) { |
| 88 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 88 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | return $gd_page_id; |
@@ -98,11 +98,11 @@ discard block |
||
| 98 | 98 | * @since 1.5.3 |
| 99 | 99 | * @return int|null Return the page ID if present or null if not. |
| 100 | 100 | */ |
| 101 | -function geodir_info_page_id(){ |
|
| 101 | +function geodir_info_page_id() { |
|
| 102 | 102 | $gd_page_id = get_option('geodir_info_page'); |
| 103 | 103 | |
| 104 | 104 | if (geodir_is_wpml()) { |
| 105 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 105 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | return $gd_page_id; |
@@ -115,11 +115,11 @@ discard block |
||
| 115 | 115 | * @since 1.5.3 |
| 116 | 116 | * @return int|null Return the page ID if present or null if not. |
| 117 | 117 | */ |
| 118 | -function geodir_login_page_id(){ |
|
| 118 | +function geodir_login_page_id() { |
|
| 119 | 119 | $gd_page_id = get_option('geodir_login_page'); |
| 120 | 120 | |
| 121 | 121 | if (geodir_is_wpml()) { |
| 122 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 122 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | return $gd_page_id; |
@@ -133,20 +133,20 @@ discard block |
||
| 133 | 133 | * @since 1.5.3 |
| 134 | 134 | * @return int|null Return the page ID if present or null if not. |
| 135 | 135 | */ |
| 136 | -function geodir_login_url($args=array()){ |
|
| 136 | +function geodir_login_url($args = array()) { |
|
| 137 | 137 | $gd_page_id = get_option('geodir_login_page'); |
| 138 | 138 | |
| 139 | 139 | if (geodir_is_wpml()) { |
| 140 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 140 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | if (function_exists('geodir_location_geo_home_link')) { |
| 144 | 144 | remove_filter('home_url', 'geodir_location_geo_home_link', 100000); |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | - if (geodir_is_wpml()){ |
|
| 147 | + if (geodir_is_wpml()) { |
|
| 148 | 148 | $home_url = icl_get_home_url(); |
| 149 | - }else{ |
|
| 149 | + } else { |
|
| 150 | 150 | $home_url = home_url(); |
| 151 | 151 | } |
| 152 | 152 | |
@@ -154,17 +154,17 @@ discard block |
||
| 154 | 154 | add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2); |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - if($gd_page_id){ |
|
| 157 | + if ($gd_page_id) { |
|
| 158 | 158 | $post = get_post($gd_page_id); |
| 159 | 159 | $slug = $post->post_name; |
| 160 | 160 | //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors |
| 161 | 161 | $login_url = trailingslashit($home_url)."$slug/"; |
| 162 | - }else{ |
|
| 162 | + } else { |
|
| 163 | 163 | $login_url = trailingslashit($home_url)."?geodir_signup=true"; |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | - if($args){ |
|
| 167 | - $login_url = add_query_arg($args,$login_url ); |
|
| 166 | + if ($args) { |
|
| 167 | + $login_url = add_query_arg($args, $login_url); |
|
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | /** |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | * @param array $args The array of query args used. |
| 179 | 179 | * @param int $gd_page_id The page id of the GD login page. |
| 180 | 180 | */ |
| 181 | - return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id); |
|
| 181 | + return apply_filters('geodir_login_url', $login_url, $args, $gd_page_id); |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | /** |
@@ -189,20 +189,20 @@ discard block |
||
| 189 | 189 | * @since 1.5.16 Added WPML lang code to url. |
| 190 | 190 | * @return string Info page url. |
| 191 | 191 | */ |
| 192 | -function geodir_info_url($args=array()){ |
|
| 192 | +function geodir_info_url($args = array()) { |
|
| 193 | 193 | $gd_page_id = get_option('geodir_info_page'); |
| 194 | 194 | |
| 195 | 195 | if (geodir_is_wpml()) { |
| 196 | - $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 196 | + $gd_page_id = geodir_wpml_object_id($gd_page_id, 'page', true); |
|
| 197 | 197 | } |
| 198 | 198 | |
| 199 | 199 | if (function_exists('geodir_location_geo_home_link')) { |
| 200 | 200 | remove_filter('home_url', 'geodir_location_geo_home_link', 100000); |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | - if (geodir_is_wpml()){ |
|
| 203 | + if (geodir_is_wpml()) { |
|
| 204 | 204 | $home_url = icl_get_home_url(); |
| 205 | - }else{ |
|
| 205 | + } else { |
|
| 206 | 206 | $home_url = home_url(); |
| 207 | 207 | } |
| 208 | 208 | |
@@ -210,17 +210,17 @@ discard block |
||
| 210 | 210 | add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2); |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | - if($gd_page_id){ |
|
| 213 | + if ($gd_page_id) { |
|
| 214 | 214 | $post = get_post($gd_page_id); |
| 215 | 215 | $slug = $post->post_name; |
| 216 | 216 | //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors |
| 217 | 217 | $info_url = trailingslashit($home_url)."$slug/"; |
| 218 | - }else{ |
|
| 218 | + } else { |
|
| 219 | 219 | $info_url = trailingslashit($home_url); |
| 220 | 220 | } |
| 221 | 221 | |
| 222 | - if($args){ |
|
| 223 | - $info_url = add_query_arg($args,$info_url ); |
|
| 222 | + if ($args) { |
|
| 223 | + $info_url = add_query_arg($args, $info_url); |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | return $info_url; |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | * @param string $charset Character set to use for conversion. |
| 239 | 239 | * @return string Returns converted string. |
| 240 | 240 | */ |
| 241 | -function geodir_ucwords($string, $charset='UTF-8') { |
|
| 241 | +function geodir_ucwords($string, $charset = 'UTF-8') { |
|
| 242 | 242 | if (function_exists('mb_convert_case')) { |
| 243 | 243 | return mb_convert_case($string, MB_CASE_TITLE, $charset); |
| 244 | 244 | } else { |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | * @param string $charset Character set to use for conversion. |
| 259 | 259 | * @return string Returns converted string. |
| 260 | 260 | */ |
| 261 | -function geodir_strtolower($string, $charset='UTF-8') { |
|
| 261 | +function geodir_strtolower($string, $charset = 'UTF-8') { |
|
| 262 | 262 | if (function_exists('mb_convert_case')) { |
| 263 | 263 | return mb_convert_case($string, MB_CASE_LOWER, $charset); |
| 264 | 264 | } else { |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | * @param string $charset Character set to use for conversion. |
| 279 | 279 | * @return string Returns converted string. |
| 280 | 280 | */ |
| 281 | -function geodir_strtoupper($string, $charset='UTF-8') { |
|
| 281 | +function geodir_strtoupper($string, $charset = 'UTF-8') { |
|
| 282 | 282 | if (function_exists('mb_convert_case')) { |
| 283 | 283 | return mb_convert_case($string, MB_CASE_UPPER, $charset); |
| 284 | 284 | } else { |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | |
| 310 | 310 | $url = trim($parts[0]); |
| 311 | 311 | if ($formatted && $url != '') { |
| 312 | - $url = str_replace( ' ', '%20', $url ); |
|
| 312 | + $url = str_replace(' ', '%20', $url); |
|
| 313 | 313 | $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url); |
| 314 | 314 | |
| 315 | 315 | if (0 !== stripos($url, 'mailto:')) { |
@@ -319,8 +319,8 @@ discard block |
||
| 319 | 319 | |
| 320 | 320 | $url = str_replace(';//', '://', $url); |
| 321 | 321 | |
| 322 | - if (strpos($url, ':') === false && ! in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) { |
|
| 323 | - $url = 'http://' . $url; |
|
| 322 | + if (strpos($url, ':') === false && !in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) { |
|
| 323 | + $url = 'http://'.$url; |
|
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | $url = wp_kses_normalize_entities($url); |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | * @package GeoDirectory |
| 463 | 463 | */ |
| 464 | 464 | function _gd_die_handler() { |
| 465 | - if ( defined( 'GD_TESTING_MODE' ) ) { |
|
| 465 | + if (defined('GD_TESTING_MODE')) { |
|
| 466 | 466 | return '_gd_die_handler'; |
| 467 | 467 | } else { |
| 468 | 468 | die(); |
@@ -480,10 +480,10 @@ discard block |
||
| 480 | 480 | * @param string $title Optional. Error title. |
| 481 | 481 | * @param int $status Optional. Status code. |
| 482 | 482 | */ |
| 483 | -function gd_die( $message = '', $title = '', $status = 400 ) { |
|
| 484 | - add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 ); |
|
| 485 | - add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 ); |
|
| 486 | - wp_die( $message, $title, array( 'response' => $status )); |
|
| 483 | +function gd_die($message = '', $title = '', $status = 400) { |
|
| 484 | + add_filter('wp_die_ajax_handler', '_gd_die_handler', 10, 3); |
|
| 485 | + add_filter('wp_die_handler', '_gd_die_handler', 10, 3); |
|
| 486 | + wp_die($message, $title, array('response' => $status)); |
|
| 487 | 487 | } |
| 488 | 488 | |
| 489 | 489 | /* |
@@ -493,7 +493,7 @@ discard block |
||
| 493 | 493 | * @param string $php_format The PHP date format. |
| 494 | 494 | * @return string The jQuery format date string. |
| 495 | 495 | */ |
| 496 | -function geodir_date_format_php_to_jqueryui( $php_format ) { |
|
| 496 | +function geodir_date_format_php_to_jqueryui($php_format) { |
|
| 497 | 497 | $symbols = array( |
| 498 | 498 | // Day |
| 499 | 499 | 'd' => 'dd', |
@@ -533,27 +533,27 @@ discard block |
||
| 533 | 533 | $jqueryui_format = ""; |
| 534 | 534 | $escaping = false; |
| 535 | 535 | |
| 536 | - for ( $i = 0; $i < strlen( $php_format ); $i++ ) { |
|
| 536 | + for ($i = 0; $i < strlen($php_format); $i++) { |
|
| 537 | 537 | $char = $php_format[$i]; |
| 538 | 538 | |
| 539 | 539 | // PHP date format escaping character |
| 540 | - if ( $char === '\\' ) { |
|
| 540 | + if ($char === '\\') { |
|
| 541 | 541 | $i++; |
| 542 | 542 | |
| 543 | - if ( $escaping ) { |
|
| 543 | + if ($escaping) { |
|
| 544 | 544 | $jqueryui_format .= $php_format[$i]; |
| 545 | 545 | } else { |
| 546 | - $jqueryui_format .= '\'' . $php_format[$i]; |
|
| 546 | + $jqueryui_format .= '\''.$php_format[$i]; |
|
| 547 | 547 | } |
| 548 | 548 | |
| 549 | 549 | $escaping = true; |
| 550 | 550 | } else { |
| 551 | - if ( $escaping ) { |
|
| 551 | + if ($escaping) { |
|
| 552 | 552 | $jqueryui_format .= "'"; |
| 553 | 553 | $escaping = false; |
| 554 | 554 | } |
| 555 | 555 | |
| 556 | - if ( isset( $symbols[$char] ) ) { |
|
| 556 | + if (isset($symbols[$char])) { |
|
| 557 | 557 | $jqueryui_format .= $symbols[$char]; |
| 558 | 558 | } else { |
| 559 | 559 | $jqueryui_format .= $char; |
@@ -592,7 +592,7 @@ discard block |
||
| 592 | 592 | 'December', |
| 593 | 593 | ); |
| 594 | 594 | |
| 595 | - $non_english_long_months = array( |
|
| 595 | + $non_english_long_months = array( |
|
| 596 | 596 | __('January'), |
| 597 | 597 | __('February'), |
| 598 | 598 | __('March'), |
@@ -606,10 +606,10 @@ discard block |
||
| 606 | 606 | __('November'), |
| 607 | 607 | __('December'), |
| 608 | 608 | ); |
| 609 | - $date = str_replace($non_english_long_months,$english_long_months,$date,$count); |
|
| 609 | + $date = str_replace($non_english_long_months, $english_long_months, $date, $count); |
|
| 610 | 610 | |
| 611 | - if ( !empty( $wp_locale ) && empty($count) ) { |
|
| 612 | - $date = str_replace( array_values( $wp_locale->month_genitive ), $english_long_months, $date ); |
|
| 611 | + if (!empty($wp_locale) && empty($count)) { |
|
| 612 | + $date = str_replace(array_values($wp_locale->month_genitive), $english_long_months, $date); |
|
| 613 | 613 | } |
| 614 | 614 | |
| 615 | 615 | $english_short_months = array( |
@@ -628,21 +628,21 @@ discard block |
||
| 628 | 628 | ); |
| 629 | 629 | |
| 630 | 630 | $non_english_short_months = array( |
| 631 | - ' '._x( 'Jan', 'January abbreviation' ).' ', |
|
| 632 | - ' '._x( 'Feb', 'February abbreviation' ).' ', |
|
| 633 | - ' '._x( 'Mar', 'March abbreviation' ).' ', |
|
| 634 | - ' '._x( 'Apr', 'April abbreviation' ).' ', |
|
| 635 | - ' '._x( 'May', 'May abbreviation' ).' ', |
|
| 636 | - ' '._x( 'Jun', 'June abbreviation' ).' ', |
|
| 637 | - ' '._x( 'Jul', 'July abbreviation' ).' ', |
|
| 638 | - ' '._x( 'Aug', 'August abbreviation' ).' ', |
|
| 639 | - ' '._x( 'Sep', 'September abbreviation' ).' ', |
|
| 640 | - ' '._x( 'Oct', 'October abbreviation' ).' ', |
|
| 641 | - ' '._x( 'Nov', 'November abbreviation' ).' ', |
|
| 642 | - ' '._x( 'Dec', 'December abbreviation' ).' ', |
|
| 631 | + ' '._x('Jan', 'January abbreviation').' ', |
|
| 632 | + ' '._x('Feb', 'February abbreviation').' ', |
|
| 633 | + ' '._x('Mar', 'March abbreviation').' ', |
|
| 634 | + ' '._x('Apr', 'April abbreviation').' ', |
|
| 635 | + ' '._x('May', 'May abbreviation').' ', |
|
| 636 | + ' '._x('Jun', 'June abbreviation').' ', |
|
| 637 | + ' '._x('Jul', 'July abbreviation').' ', |
|
| 638 | + ' '._x('Aug', 'August abbreviation').' ', |
|
| 639 | + ' '._x('Sep', 'September abbreviation').' ', |
|
| 640 | + ' '._x('Oct', 'October abbreviation').' ', |
|
| 641 | + ' '._x('Nov', 'November abbreviation').' ', |
|
| 642 | + ' '._x('Dec', 'December abbreviation').' ', |
|
| 643 | 643 | ); |
| 644 | 644 | |
| 645 | - $date = str_replace($non_english_short_months,$english_short_months,$date); |
|
| 645 | + $date = str_replace($non_english_short_months, $english_short_months, $date); |
|
| 646 | 646 | |
| 647 | 647 | |
| 648 | 648 | return $date; |
@@ -660,30 +660,30 @@ discard block |
||
| 660 | 660 | * @param bool $locale True to retrieve the date in localized format. Default false. |
| 661 | 661 | * @return string The formatted date. |
| 662 | 662 | */ |
| 663 | -function geodir_date( $date_input, $date_to, $date_from = '', $locale = false ) { |
|
| 664 | - if ( empty( $date_input ) || empty( $date_to ) ) { |
|
| 663 | +function geodir_date($date_input, $date_to, $date_from = '', $locale = false) { |
|
| 664 | + if (empty($date_input) || empty($date_to)) { |
|
| 665 | 665 | return NULL; |
| 666 | 666 | } |
| 667 | 667 | |
| 668 | - $date_input = geodir_maybe_untranslate_date( $date_input ); |
|
| 668 | + $date_input = geodir_maybe_untranslate_date($date_input); |
|
| 669 | 669 | |
| 670 | 670 | $timestamp = 0; |
| 671 | - if (!empty( $date_from ) && function_exists( 'date_create_from_format' ) ) { |
|
| 672 | - $datetime = date_create_from_format( $date_from, $date_input ); |
|
| 673 | - if ( !empty( $datetime ) ) { |
|
| 671 | + if (!empty($date_from) && function_exists('date_create_from_format')) { |
|
| 672 | + $datetime = date_create_from_format($date_from, $date_input); |
|
| 673 | + if (!empty($datetime)) { |
|
| 674 | 674 | $timestamp = $datetime->getTimestamp(); |
| 675 | 675 | } |
| 676 | 676 | } |
| 677 | 677 | |
| 678 | - if ( empty( $timestamp ) ) { |
|
| 679 | - $date = strpos( $date_input, '/' ) !== false ? str_replace( '/', '-', $date_input ) : $date_input; |
|
| 680 | - $timestamp = strtotime( $date ); |
|
| 678 | + if (empty($timestamp)) { |
|
| 679 | + $date = strpos($date_input, '/') !== false ? str_replace('/', '-', $date_input) : $date_input; |
|
| 680 | + $timestamp = strtotime($date); |
|
| 681 | 681 | } |
| 682 | 682 | |
| 683 | - $date = date_i18n( $date_to, $timestamp ); |
|
| 683 | + $date = date_i18n($date_to, $timestamp); |
|
| 684 | 684 | |
| 685 | - if ( !$locale ) { |
|
| 686 | - $date = geodir_maybe_untranslate_date( $date ); |
|
| 685 | + if (!$locale) { |
|
| 686 | + $date = geodir_maybe_untranslate_date($date); |
|
| 687 | 687 | } |
| 688 | 688 | |
| 689 | 689 | /** |
@@ -698,7 +698,7 @@ discard block |
||
| 698 | 698 | * @param string $date_from The source date format. |
| 699 | 699 | * @param bool $locale True to retrieve the date in localized format. |
| 700 | 700 | */ |
| 701 | - return apply_filters( 'geodir_date', $date, $date_input, $date_to, $date_from, $locale ); |
|
| 701 | + return apply_filters('geodir_date', $date, $date_input, $date_to, $date_from, $locale); |
|
| 702 | 702 | } |
| 703 | 703 | |
| 704 | 704 | /** |
@@ -723,7 +723,7 @@ discard block |
||
| 723 | 723 | * @return string Trimmed string. |
| 724 | 724 | */ |
| 725 | 725 | function geodir_excerpt($text, $length = 100, $options = array()) { |
| 726 | - if (!(int)$length > 0) { |
|
| 726 | + if (!(int) $length > 0) { |
|
| 727 | 727 | return $text; |
| 728 | 728 | } |
| 729 | 729 | $default = array( |
@@ -785,7 +785,7 @@ discard block |
||
| 785 | 785 | $length = $truncateLength; |
| 786 | 786 | |
| 787 | 787 | foreach ($openTags as $tag) { |
| 788 | - $suffix .= '</' . $tag . '>'; |
|
| 788 | + $suffix .= '</'.$tag.'>'; |
|
| 789 | 789 | } |
| 790 | 790 | } else { |
| 791 | 791 | if (geodir_strlen($text, $options) <= $length) { |
@@ -807,7 +807,7 @@ discard block |
||
| 807 | 807 | } |
| 808 | 808 | } |
| 809 | 809 | |
| 810 | - return $prefix . $result . $suffix; |
|
| 810 | + return $prefix.$result.$suffix; |
|
| 811 | 811 | } |
| 812 | 812 | |
| 813 | 813 | /** |
@@ -844,7 +844,7 @@ discard block |
||
| 844 | 844 | $pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i'; |
| 845 | 845 | $replace = preg_replace_callback( |
| 846 | 846 | $pattern, |
| 847 | - function ($match) use ($strlen) { |
|
| 847 | + function($match) use ($strlen) { |
|
| 848 | 848 | $utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8'); |
| 849 | 849 | |
| 850 | 850 | return str_repeat(' ', $strlen($utf8, 'UTF-8')); |
@@ -905,7 +905,7 @@ discard block |
||
| 905 | 905 | } |
| 906 | 906 | |
| 907 | 907 | if (empty($options['html'])) { |
| 908 | - return (string)$substr($text, $start, $length); |
|
| 908 | + return (string) $substr($text, $start, $length); |
|
| 909 | 909 | } |
| 910 | 910 | |
| 911 | 911 | $totalOffset = 0; |
@@ -930,7 +930,7 @@ discard block |
||
| 930 | 930 | |
| 931 | 931 | $len = geodir_strlen($part, $options); |
| 932 | 932 | if ($offset !== 0 || $totalLength + $len > $length) { |
| 933 | - if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) { |
|
| 933 | + if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8')) { |
|
| 934 | 934 | // Entities cannot be passed substr. |
| 935 | 935 | continue; |
| 936 | 936 | } |
@@ -976,39 +976,39 @@ discard block |
||
| 976 | 976 | return ''; |
| 977 | 977 | } |
| 978 | 978 | |
| 979 | -function geodir_tool_restore_cpt_from_taxonomies(){ |
|
| 979 | +function geodir_tool_restore_cpt_from_taxonomies() { |
|
| 980 | 980 | |
| 981 | 981 | $cpts = get_option('geodir_post_types'); |
| 982 | 982 | |
| 983 | - if(!empty($cpts)){return;} |
|
| 983 | + if (!empty($cpts)) {return; } |
|
| 984 | 984 | |
| 985 | 985 | $taxonomies = get_option('geodir_taxonomies'); |
| 986 | 986 | |
| 987 | - if(empty($taxonomies)){return;} |
|
| 987 | + if (empty($taxonomies)) {return; } |
|
| 988 | 988 | |
| 989 | 989 | $cpts = array(); |
| 990 | 990 | |
| 991 | - foreach($taxonomies as $key => $val){ |
|
| 991 | + foreach ($taxonomies as $key => $val) { |
|
| 992 | 992 | |
| 993 | - if(strpos($val['listing_slug'], '/') === false) { |
|
| 994 | - $cpts[$val['object_type']] = array('cpt'=>$val['object_type'],'slug'=>$val['listing_slug']); |
|
| 993 | + if (strpos($val['listing_slug'], '/') === false) { |
|
| 994 | + $cpts[$val['object_type']] = array('cpt'=>$val['object_type'], 'slug'=>$val['listing_slug']); |
|
| 995 | 995 | } |
| 996 | 996 | |
| 997 | 997 | } |
| 998 | 998 | |
| 999 | - if(empty($cpts)){return;} |
|
| 999 | + if (empty($cpts)) {return; } |
|
| 1000 | 1000 | |
| 1001 | 1001 | |
| 1002 | 1002 | $cpts_restore = $cpts; |
| 1003 | 1003 | |
| 1004 | - foreach($cpts as $cpt){ |
|
| 1004 | + foreach ($cpts as $cpt) { |
|
| 1005 | 1005 | |
| 1006 | 1006 | |
| 1007 | - $is_custom = $cpt['cpt']=='gd_place' ? 0 : 1; |
|
| 1007 | + $is_custom = $cpt['cpt'] == 'gd_place' ? 0 : 1; |
|
| 1008 | 1008 | |
| 1009 | - $cpts_restore[$cpt['cpt']] = array ( |
|
| 1009 | + $cpts_restore[$cpt['cpt']] = array( |
|
| 1010 | 1010 | 'labels' => |
| 1011 | - array ( |
|
| 1011 | + array( |
|
| 1012 | 1012 | 'name' => $cpt['slug'], |
| 1013 | 1013 | 'singular_name' => $cpt['slug'], |
| 1014 | 1014 | 'add_new' => 'Add New', |
@@ -1036,14 +1036,14 @@ discard block |
||
| 1036 | 1036 | 'public' => true, |
| 1037 | 1037 | 'query_var' => true, |
| 1038 | 1038 | 'rewrite' => |
| 1039 | - array ( |
|
| 1039 | + array( |
|
| 1040 | 1040 | 'slug' => $cpt['slug'], |
| 1041 | 1041 | 'with_front' => false, |
| 1042 | 1042 | 'hierarchical' => true, |
| 1043 | 1043 | 'feeds' => true, |
| 1044 | 1044 | ), |
| 1045 | 1045 | 'supports' => |
| 1046 | - array ( |
|
| 1046 | + array( |
|
| 1047 | 1047 | 0 => 'title', |
| 1048 | 1048 | 1 => 'editor', |
| 1049 | 1049 | 2 => 'author', |
@@ -1053,14 +1053,14 @@ discard block |
||
| 1053 | 1053 | 6 => 'comments', |
| 1054 | 1054 | ), |
| 1055 | 1055 | 'taxonomies' => |
| 1056 | - array ( |
|
| 1056 | + array( |
|
| 1057 | 1057 | 0 => $cpt['cpt'].'category', |
| 1058 | 1058 | 1 => $cpt['cpt'].'_tags', |
| 1059 | 1059 | ), |
| 1060 | 1060 | 'is_custom' => $is_custom, |
| 1061 | 1061 | 'listing_order' => '1', |
| 1062 | 1062 | 'seo' => |
| 1063 | - array ( |
|
| 1063 | + array( |
|
| 1064 | 1064 | 'meta_keyword' => '', |
| 1065 | 1065 | 'meta_description' => '', |
| 1066 | 1066 | ), |
@@ -1072,7 +1072,7 @@ discard block |
||
| 1072 | 1072 | } |
| 1073 | 1073 | |
| 1074 | 1074 | |
| 1075 | - update_option('geodir_post_types',$cpts_restore); |
|
| 1075 | + update_option('geodir_post_types', $cpts_restore); |
|
| 1076 | 1076 | |
| 1077 | 1077 | } |
| 1078 | 1078 | |
@@ -1090,12 +1090,12 @@ discard block |
||
| 1090 | 1090 | * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8". |
| 1091 | 1091 | * @return string |
| 1092 | 1092 | */ |
| 1093 | -function geodir_utf8_strimwidth( $str, $start, $width, $trimmaker = '', $encoding = 'UTF-8' ) { |
|
| 1094 | - if ( function_exists( 'mb_strimwidth' ) ) { |
|
| 1095 | - return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding ); |
|
| 1093 | +function geodir_utf8_strimwidth($str, $start, $width, $trimmaker = '', $encoding = 'UTF-8') { |
|
| 1094 | + if (function_exists('mb_strimwidth')) { |
|
| 1095 | + return mb_strimwidth($str, $start, $width, $trimmaker, $encoding); |
|
| 1096 | 1096 | } |
| 1097 | 1097 | |
| 1098 | - return geodir_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker; |
|
| 1098 | + return geodir_utf8_substr($str, $start, $width, $encoding).$trimmaker; |
|
| 1099 | 1099 | } |
| 1100 | 1100 | |
| 1101 | 1101 | /** |
@@ -1108,12 +1108,12 @@ discard block |
||
| 1108 | 1108 | * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8". |
| 1109 | 1109 | * @return int Returns the number of characters in string. |
| 1110 | 1110 | */ |
| 1111 | -function geodir_utf8_strlen( $str, $encoding = 'UTF-8' ) { |
|
| 1112 | - if ( function_exists( 'mb_strlen' ) ) { |
|
| 1113 | - return mb_strlen( $str, $encoding ); |
|
| 1111 | +function geodir_utf8_strlen($str, $encoding = 'UTF-8') { |
|
| 1112 | + if (function_exists('mb_strlen')) { |
|
| 1113 | + return mb_strlen($str, $encoding); |
|
| 1114 | 1114 | } |
| 1115 | 1115 | |
| 1116 | - return strlen( $str ); |
|
| 1116 | + return strlen($str); |
|
| 1117 | 1117 | } |
| 1118 | 1118 | |
| 1119 | 1119 | /** |
@@ -1128,12 +1128,12 @@ discard block |
||
| 1128 | 1128 | * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8". |
| 1129 | 1129 | * @return int Returns the position of the first occurrence of search in the string. |
| 1130 | 1130 | */ |
| 1131 | -function geodir_utf8_strpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) { |
|
| 1132 | - if ( function_exists( 'mb_strpos' ) ) { |
|
| 1133 | - return mb_strpos( $str, $find, $offset, $encoding ); |
|
| 1131 | +function geodir_utf8_strpos($str, $find, $offset = 0, $encoding = 'UTF-8') { |
|
| 1132 | + if (function_exists('mb_strpos')) { |
|
| 1133 | + return mb_strpos($str, $find, $offset, $encoding); |
|
| 1134 | 1134 | } |
| 1135 | 1135 | |
| 1136 | - return strpos( $str, $find, $offset ); |
|
| 1136 | + return strpos($str, $find, $offset); |
|
| 1137 | 1137 | } |
| 1138 | 1138 | |
| 1139 | 1139 | /** |
@@ -1148,12 +1148,12 @@ discard block |
||
| 1148 | 1148 | * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8". |
| 1149 | 1149 | * @return int Returns the position of the last occurrence of search. |
| 1150 | 1150 | */ |
| 1151 | -function geodir_utf8_strrpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) { |
|
| 1152 | - if ( function_exists( 'mb_strrpos' ) ) { |
|
| 1153 | - return mb_strrpos( $str, $find, $offset, $encoding ); |
|
| 1151 | +function geodir_utf8_strrpos($str, $find, $offset = 0, $encoding = 'UTF-8') { |
|
| 1152 | + if (function_exists('mb_strrpos')) { |
|
| 1153 | + return mb_strrpos($str, $find, $offset, $encoding); |
|
| 1154 | 1154 | } |
| 1155 | 1155 | |
| 1156 | - return strrpos( $str, $find, $offset ); |
|
| 1156 | + return strrpos($str, $find, $offset); |
|
| 1157 | 1157 | } |
| 1158 | 1158 | |
| 1159 | 1159 | /** |
@@ -1169,16 +1169,16 @@ discard block |
||
| 1169 | 1169 | * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8". |
| 1170 | 1170 | * @return string |
| 1171 | 1171 | */ |
| 1172 | -function geodir_utf8_substr( $str, $start, $length = null, $encoding = 'UTF-8' ) { |
|
| 1173 | - if ( function_exists( 'mb_substr' ) ) { |
|
| 1174 | - if ( $length === null ) { |
|
| 1175 | - return mb_substr( $str, $start, geodir_utf8_strlen( $str, $encoding ), $encoding ); |
|
| 1172 | +function geodir_utf8_substr($str, $start, $length = null, $encoding = 'UTF-8') { |
|
| 1173 | + if (function_exists('mb_substr')) { |
|
| 1174 | + if ($length === null) { |
|
| 1175 | + return mb_substr($str, $start, geodir_utf8_strlen($str, $encoding), $encoding); |
|
| 1176 | 1176 | } else { |
| 1177 | - return mb_substr( $str, $start, $length, $encoding ); |
|
| 1177 | + return mb_substr($str, $start, $length, $encoding); |
|
| 1178 | 1178 | } |
| 1179 | 1179 | } |
| 1180 | 1180 | |
| 1181 | - return substr( $str, $start, $length ); |
|
| 1181 | + return substr($str, $start, $length); |
|
| 1182 | 1182 | } |
| 1183 | 1183 | |
| 1184 | 1184 | /** |
@@ -1191,12 +1191,12 @@ discard block |
||
| 1191 | 1191 | * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8". |
| 1192 | 1192 | * @return string The width of string. |
| 1193 | 1193 | */ |
| 1194 | -function geodir_utf8_strwidth( $str, $encoding = 'UTF-8' ) { |
|
| 1195 | - if ( function_exists( 'mb_strwidth' ) ) { |
|
| 1196 | - return mb_strwidth( $str, $encoding ); |
|
| 1194 | +function geodir_utf8_strwidth($str, $encoding = 'UTF-8') { |
|
| 1195 | + if (function_exists('mb_strwidth')) { |
|
| 1196 | + return mb_strwidth($str, $encoding); |
|
| 1197 | 1197 | } |
| 1198 | 1198 | |
| 1199 | - return geodir_utf8_strlen( $str, $encoding ); |
|
| 1199 | + return geodir_utf8_strlen($str, $encoding); |
|
| 1200 | 1200 | } |
| 1201 | 1201 | |
| 1202 | 1202 | /** |
@@ -1210,21 +1210,21 @@ discard block |
||
| 1210 | 1210 | * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8". |
| 1211 | 1211 | * @return string The resulting string. |
| 1212 | 1212 | */ |
| 1213 | -function geodir_utf8_ucfirst( $str, $lower_str_end = false, $encoding = 'UTF-8' ) { |
|
| 1214 | - if ( function_exists( 'mb_strlen' ) ) { |
|
| 1215 | - $first_letter = geodir_strtoupper( geodir_utf8_substr( $str, 0, 1, $encoding ), $encoding ); |
|
| 1213 | +function geodir_utf8_ucfirst($str, $lower_str_end = false, $encoding = 'UTF-8') { |
|
| 1214 | + if (function_exists('mb_strlen')) { |
|
| 1215 | + $first_letter = geodir_strtoupper(geodir_utf8_substr($str, 0, 1, $encoding), $encoding); |
|
| 1216 | 1216 | $str_end = ""; |
| 1217 | 1217 | |
| 1218 | - if ( $lower_str_end ) { |
|
| 1219 | - $str_end = geodir_strtolower( geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding ), $encoding ); |
|
| 1218 | + if ($lower_str_end) { |
|
| 1219 | + $str_end = geodir_strtolower(geodir_utf8_substr($str, 1, geodir_utf8_strlen($str, $encoding), $encoding), $encoding); |
|
| 1220 | 1220 | } else { |
| 1221 | - $str_end = geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding ); |
|
| 1221 | + $str_end = geodir_utf8_substr($str, 1, geodir_utf8_strlen($str, $encoding), $encoding); |
|
| 1222 | 1222 | } |
| 1223 | 1223 | |
| 1224 | - return $first_letter . $str_end; |
|
| 1224 | + return $first_letter.$str_end; |
|
| 1225 | 1225 | } |
| 1226 | 1226 | |
| 1227 | - return ucfirst( $str ); |
|
| 1227 | + return ucfirst($str); |
|
| 1228 | 1228 | } |
| 1229 | 1229 | |
| 1230 | 1230 | function geodir_total_listings_count($post_type = false) |
@@ -1234,13 +1234,13 @@ discard block |
||
| 1234 | 1234 | $count = 0; |
| 1235 | 1235 | |
| 1236 | 1236 | if ($post_type) { |
| 1237 | - $count = $count + $wpdb->get_var("select count(post_id) from " . $wpdb->prefix . "geodir_" . $post_type . "_detail"); |
|
| 1237 | + $count = $count + $wpdb->get_var("select count(post_id) from ".$wpdb->prefix."geodir_".$post_type."_detail"); |
|
| 1238 | 1238 | } else { |
| 1239 | 1239 | $all_postypes = geodir_get_posttypes(); |
| 1240 | 1240 | |
| 1241 | 1241 | if (!empty($all_postypes)) { |
| 1242 | 1242 | foreach ($all_postypes as $key) { |
| 1243 | - $count = $count + $wpdb->get_var("select count(post_id) from " . $wpdb->prefix . "geodir_" . $key . "_detail"); |
|
| 1243 | + $count = $count + $wpdb->get_var("select count(post_id) from ".$wpdb->prefix."geodir_".$key."_detail"); |
|
| 1244 | 1244 | } |
| 1245 | 1245 | } |
| 1246 | 1246 | } |
@@ -18,9 +18,9 @@ discard block |
||
| 18 | 18 | global $post_type; |
| 19 | 19 | |
| 20 | 20 | if (!isset($field_info->post_type)) {
|
| 21 | - $post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 21 | + $post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 22 | 22 | } else |
| 23 | - $post_type = $field_info->post_type; |
|
| 23 | + $post_type = $field_info->post_type; |
|
| 24 | 24 | |
| 25 | 25 | //if(isset($_REQUEST['custom_type']) && $_REQUEST['custom_type']=='predefined'){
|
| 26 | 26 | // $cf_arr = geodir_custom_fields_predefined($post_type); |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | $field_admin_title = ''; |
| 50 | 50 | if (isset($field_info->admin_title)) |
| 51 | - $field_admin_title = $field_info->admin_title; |
|
| 51 | + $field_admin_title = $field_info->admin_title; |
|
| 52 | 52 | |
| 53 | 53 | $default = isset($field_info->is_admin) ? $field_info->is_admin : ''; |
| 54 | 54 | |
@@ -68,21 +68,21 @@ discard block |
||
| 68 | 68 | //print_r($field_info); |
| 69 | 69 | |
| 70 | 70 | if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {
|
| 71 | - $field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>'; |
|
| 71 | + $field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>'; |
|
| 72 | 72 | }elseif(isset($cf['icon']) && $cf['icon']){
|
| 73 | - $field_icon = '<b class="gd-cf-icon" style="background-image: url(\''.$cf['icon'].'\')"></b>'; |
|
| 73 | + $field_icon = '<b class="gd-cf-icon" style="background-image: url(\''.$cf['icon'].'\')"></b>'; |
|
| 74 | 74 | }else{
|
| 75 | - $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 75 | + $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | if(isset($cf['name']) && $cf['name']){
|
| 79 | - $field_type_name = $cf['name']; |
|
| 79 | + $field_type_name = $cf['name']; |
|
| 80 | 80 | }else{
|
| 81 | - $field_type_name = $field_type; |
|
| 81 | + $field_type_name = $field_type; |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | if (isset($field_info->data_type) && $field_info->data_type == 'VARCHAR') {
|
| 85 | - $field_info->data_type = 'XVARCHAR'; |
|
| 85 | + $field_info->data_type = 'XVARCHAR'; |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | ?> |
@@ -92,45 +92,45 @@ discard block |
||
| 92 | 92 | ondblclick="show_hide('field_frm<?php echo $result_str; ?>')" >
|
| 93 | 93 | <?php |
| 94 | 94 | |
| 95 | - $nonce = wp_create_nonce('custom_fields_' . $result_str);
|
|
| 96 | - ?> |
|
| 95 | + $nonce = wp_create_nonce('custom_fields_' . $result_str);
|
|
| 96 | + ?> |
|
| 97 | 97 | |
| 98 | 98 | <?php if (!$default): ?> |
| 99 | 99 | <div title="<?php _e('Click to remove field', 'geodirectory'); ?>"
|
| 100 | 100 | onclick="delete_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>')"
|
| 101 | 101 | class="handlediv close"><i class="fa fa-times" aria-hidden="true"></i></div> |
| 102 | 102 | <?php endif; |
| 103 | - if ($field_type == 'fieldset') {
|
|
| 104 | - ?> |
|
| 103 | + if ($field_type == 'fieldset') {
|
|
| 104 | + ?> |
|
| 105 | 105 | <i class="fa fa-long-arrow-left " aria-hidden="true"></i> |
| 106 | 106 | <i class="fa fa-long-arrow-right " aria-hidden="true"></i> |
| 107 | 107 | <b style="cursor:pointer;" |
| 108 | 108 | onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory') . ' ' . $field_admin_title);?></b>
|
| 109 | 109 | <?php |
| 110 | - } else {echo $field_icon;
|
|
| 111 | - ?> |
|
| 110 | + } else {echo $field_icon;
|
|
| 111 | + ?> |
|
| 112 | 112 | <b style="cursor:pointer;" |
| 113 | 113 | onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(' ' . $field_admin_title . ' (' . $field_type_name . ')');?></b>
|
| 114 | 114 | <?php |
| 115 | - } |
|
| 116 | - ?> |
|
| 115 | + } |
|
| 116 | + ?> |
|
| 117 | 117 | </div> |
| 118 | 118 | |
| 119 | 119 | <form><!-- we need to wrap in a fom so we can use radio buttons with same name --> |
| 120 | 120 | <div id="field_frm<?php echo $result_str; ?>" class="field_frm" |
| 121 | 121 | style="display:<?php if ($field_ins_upd == 'submit') {
|
| 122 | - echo 'block;'; |
|
| 123 | - } else {
|
|
| 124 | - echo 'none;'; |
|
| 125 | - } ?>"> |
|
| 122 | + echo 'block;'; |
|
| 123 | + } else {
|
|
| 124 | + echo 'none;'; |
|
| 125 | + } ?>"> |
|
| 126 | 126 | <input type="hidden" name="_wpnonce" value="<?php echo esc_attr($nonce); ?>"/> |
| 127 | 127 | <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type; ?>"/> |
| 128 | 128 | <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type; ?>"/> |
| 129 | 129 | <input type="hidden" name="field_type_key" id="field_type_key" value="<?php echo $field_type_key; ?>"/> |
| 130 | 130 | <input type="hidden" name="field_id" id="field_id" value="<?php echo esc_attr($result_str); ?>"/> |
| 131 | 131 | <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {
|
| 132 | - echo $field_info->data_type; |
|
| 133 | - } ?>"/> |
|
| 132 | + echo $field_info->data_type; |
|
| 133 | + } ?>"/> |
|
| 134 | 134 | <input type="hidden" name="is_active" id="is_active" value="1"/> |
| 135 | 135 | |
| 136 | 136 | <input type="hidden" name="is_default" value="<?php echo isset($field_info->is_default) ? $field_info->is_default : '';?>" /><?php // show in sidebar value?> |
@@ -142,37 +142,37 @@ discard block |
||
| 142 | 142 | |
| 143 | 143 | <?php |
| 144 | 144 | |
| 145 | - // data_type |
|
| 146 | - if(has_filter("geodir_cfa_data_type_{$field_type}")){
|
|
| 145 | + // data_type |
|
| 146 | + if(has_filter("geodir_cfa_data_type_{$field_type}")){
|
|
| 147 | 147 | |
| 148 | - echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 148 | + echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 149 | 149 | |
| 150 | - }else{
|
|
| 151 | - $value = ''; |
|
| 152 | - if (isset($field_info->data_type)) {
|
|
| 153 | - $value = esc_attr($field_info->data_type); |
|
| 154 | - }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
|
|
| 155 | - $value = $cf['defaults']['data_type']; |
|
| 156 | - } |
|
| 157 | - ?> |
|
| 150 | + }else{
|
|
| 151 | + $value = ''; |
|
| 152 | + if (isset($field_info->data_type)) {
|
|
| 153 | + $value = esc_attr($field_info->data_type); |
|
| 154 | + }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
|
|
| 155 | + $value = $cf['defaults']['data_type']; |
|
| 156 | + } |
|
| 157 | + ?> |
|
| 158 | 158 | <input type="hidden" name="data_type" id="data_type" value="<?php echo $value;?>"/> |
| 159 | 159 | <?php |
| 160 | - } |
|
| 160 | + } |
|
| 161 | 161 | |
| 162 | 162 | |
| 163 | - // admin_title |
|
| 164 | - if(has_filter("geodir_cfa_admin_title_{$field_type}")){
|
|
| 163 | + // admin_title |
|
| 164 | + if(has_filter("geodir_cfa_admin_title_{$field_type}")){
|
|
| 165 | 165 | |
| 166 | - echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 166 | + echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 167 | 167 | |
| 168 | - }else{
|
|
| 169 | - $value = ''; |
|
| 170 | - if (isset($field_info->admin_title)) {
|
|
| 171 | - $value = esc_attr($field_info->admin_title); |
|
| 172 | - }elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){
|
|
| 173 | - $value = $cf['defaults']['admin_title']; |
|
| 174 | - } |
|
| 175 | - ?> |
|
| 168 | + }else{
|
|
| 169 | + $value = ''; |
|
| 170 | + if (isset($field_info->admin_title)) {
|
|
| 171 | + $value = esc_attr($field_info->admin_title); |
|
| 172 | + }elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){
|
|
| 173 | + $value = $cf['defaults']['admin_title']; |
|
| 174 | + } |
|
| 175 | + ?> |
|
| 176 | 176 | <li> |
| 177 | 177 | <label for="admin_title" class="gd-cf-tooltip-wrap"> |
| 178 | 178 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Admin title :', 'geodirectory'); ?>
|
@@ -186,22 +186,22 @@ discard block |
||
| 186 | 186 | </div> |
| 187 | 187 | </li> |
| 188 | 188 | <?php |
| 189 | - } |
|
| 189 | + } |
|
| 190 | 190 | |
| 191 | 191 | |
| 192 | - // site_title |
|
| 193 | - if(has_filter("geodir_cfa_site_title_{$field_type}")){
|
|
| 192 | + // site_title |
|
| 193 | + if(has_filter("geodir_cfa_site_title_{$field_type}")){
|
|
| 194 | 194 | |
| 195 | - echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 195 | + echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 196 | 196 | |
| 197 | - }else{
|
|
| 198 | - $value = ''; |
|
| 199 | - if (isset($field_info->site_title)) {
|
|
| 200 | - $value = esc_attr($field_info->site_title); |
|
| 201 | - }elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){
|
|
| 202 | - $value = $cf['defaults']['site_title']; |
|
| 203 | - } |
|
| 204 | - ?> |
|
| 197 | + }else{
|
|
| 198 | + $value = ''; |
|
| 199 | + if (isset($field_info->site_title)) {
|
|
| 200 | + $value = esc_attr($field_info->site_title); |
|
| 201 | + }elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){
|
|
| 202 | + $value = $cf['defaults']['site_title']; |
|
| 203 | + } |
|
| 204 | + ?> |
|
| 205 | 205 | <li> |
| 206 | 206 | <label for="site_title" class="gd-cf-tooltip-wrap"> <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Frontend title :', 'geodirectory'); ?>
|
| 207 | 207 | <div class="gdcf-tooltip"> |
@@ -214,22 +214,22 @@ discard block |
||
| 214 | 214 | </div> |
| 215 | 215 | </li> |
| 216 | 216 | <?php |
| 217 | - } |
|
| 217 | + } |
|
| 218 | 218 | |
| 219 | 219 | |
| 220 | - // admin_desc |
|
| 221 | - if(has_filter("geodir_cfa_admin_desc_{$field_type}")){
|
|
| 220 | + // admin_desc |
|
| 221 | + if(has_filter("geodir_cfa_admin_desc_{$field_type}")){
|
|
| 222 | 222 | |
| 223 | - echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 223 | + echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 224 | 224 | |
| 225 | - }else{
|
|
| 226 | - $value = ''; |
|
| 227 | - if (isset($field_info->admin_desc)) {
|
|
| 228 | - $value = esc_attr($field_info->admin_desc); |
|
| 229 | - }elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){
|
|
| 230 | - $value = $cf['defaults']['admin_desc']; |
|
| 231 | - } |
|
| 232 | - ?> |
|
| 225 | + }else{
|
|
| 226 | + $value = ''; |
|
| 227 | + if (isset($field_info->admin_desc)) {
|
|
| 228 | + $value = esc_attr($field_info->admin_desc); |
|
| 229 | + }elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){
|
|
| 230 | + $value = $cf['defaults']['admin_desc']; |
|
| 231 | + } |
|
| 232 | + ?> |
|
| 233 | 233 | <li> |
| 234 | 234 | <label for="admin_desc" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Frontend description :', 'geodirectory'); ?>
|
| 235 | 235 | <div class="gdcf-tooltip"> |
@@ -241,23 +241,23 @@ discard block |
||
| 241 | 241 | </div> |
| 242 | 242 | </li> |
| 243 | 243 | <?php |
| 244 | - } |
|
| 244 | + } |
|
| 245 | 245 | |
| 246 | 246 | |
| 247 | 247 | |
| 248 | - // htmlvar_name |
|
| 249 | - if(has_filter("geodir_cfa_htmlvar_name_{$field_type}")){
|
|
| 248 | + // htmlvar_name |
|
| 249 | + if(has_filter("geodir_cfa_htmlvar_name_{$field_type}")){
|
|
| 250 | 250 | |
| 251 | - echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 251 | + echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 252 | 252 | |
| 253 | - }else{
|
|
| 254 | - $value = ''; |
|
| 255 | - if (isset($field_info->htmlvar_name)) {
|
|
| 256 | - $value = esc_attr($field_info->htmlvar_name); |
|
| 257 | - }elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){
|
|
| 258 | - $value = $cf['defaults']['htmlvar_name']; |
|
| 259 | - } |
|
| 260 | - ?> |
|
| 253 | + }else{
|
|
| 254 | + $value = ''; |
|
| 255 | + if (isset($field_info->htmlvar_name)) {
|
|
| 256 | + $value = esc_attr($field_info->htmlvar_name); |
|
| 257 | + }elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){
|
|
| 258 | + $value = $cf['defaults']['htmlvar_name']; |
|
| 259 | + } |
|
| 260 | + ?> |
|
| 261 | 261 | <li> |
| 262 | 262 | <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory');?>
|
| 263 | 263 | <div class="gdcf-tooltip"> |
@@ -267,29 +267,29 @@ discard block |
||
| 267 | 267 | <div class="gd-cf-input-wrap"> |
| 268 | 268 | <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory');?>"
|
| 269 | 269 | value="<?php if ($value) {
|
| 270 | - echo preg_replace('/geodir_/', '', $value, 1);
|
|
| 271 | - }?>" <?php if ($default) {
|
|
| 272 | - echo 'readonly="readonly"'; |
|
| 273 | - }?> /> |
|
| 270 | + echo preg_replace('/geodir_/', '', $value, 1);
|
|
| 271 | + }?>" <?php if ($default) {
|
|
| 272 | + echo 'readonly="readonly"'; |
|
| 273 | + }?> /> |
|
| 274 | 274 | </div> |
| 275 | 275 | </li> |
| 276 | 276 | <?php |
| 277 | - } |
|
| 277 | + } |
|
| 278 | 278 | |
| 279 | 279 | |
| 280 | - // is_active |
|
| 281 | - if(has_filter("geodir_cfa_is_active_{$field_type}")){
|
|
| 280 | + // is_active |
|
| 281 | + if(has_filter("geodir_cfa_is_active_{$field_type}")){
|
|
| 282 | 282 | |
| 283 | - echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 283 | + echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 284 | 284 | |
| 285 | - }else{
|
|
| 286 | - $value = ''; |
|
| 287 | - if (isset($field_info->is_active)) {
|
|
| 288 | - $value = esc_attr($field_info->is_active); |
|
| 289 | - }elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){
|
|
| 290 | - $value = $cf['defaults']['is_active']; |
|
| 291 | - } |
|
| 292 | - ?> |
|
| 285 | + }else{
|
|
| 286 | + $value = ''; |
|
| 287 | + if (isset($field_info->is_active)) {
|
|
| 288 | + $value = esc_attr($field_info->is_active); |
|
| 289 | + }elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){
|
|
| 290 | + $value = $cf['defaults']['is_active']; |
|
| 291 | + } |
|
| 292 | + ?> |
|
| 293 | 293 | <li <?php echo $field_display; ?>> |
| 294 | 294 | <label for="is_active" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is active :', 'geodirectory'); ?>
|
| 295 | 295 | <div class="gdcf-tooltip"> |
@@ -300,35 +300,35 @@ discard block |
||
| 300 | 300 | |
| 301 | 301 | <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled" value="1" |
| 302 | 302 | <?php if ($value == '1') {
|
| 303 | - echo 'checked'; |
|
| 304 | - } ?>/> |
|
| 303 | + echo 'checked'; |
|
| 304 | + } ?>/> |
|
| 305 | 305 | <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 306 | 306 | |
| 307 | 307 | <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0" |
| 308 | 308 | <?php if ($value == '0' || !$value) {
|
| 309 | - echo 'checked'; |
|
| 310 | - } ?>/> |
|
| 309 | + echo 'checked'; |
|
| 310 | + } ?>/> |
|
| 311 | 311 | <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 312 | 312 | |
| 313 | 313 | </div> |
| 314 | 314 | </li> |
| 315 | 315 | <?php |
| 316 | - } |
|
| 316 | + } |
|
| 317 | 317 | |
| 318 | 318 | |
| 319 | - // for_admin_use |
|
| 320 | - if(has_filter("geodir_cfa_for_admin_use_{$field_type}")){
|
|
| 319 | + // for_admin_use |
|
| 320 | + if(has_filter("geodir_cfa_for_admin_use_{$field_type}")){
|
|
| 321 | 321 | |
| 322 | - echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 322 | + echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 323 | 323 | |
| 324 | - }else{
|
|
| 325 | - $value = ''; |
|
| 326 | - if (isset($field_info->for_admin_use)) {
|
|
| 327 | - $value = esc_attr($field_info->for_admin_use); |
|
| 328 | - }elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){
|
|
| 329 | - $value = $cf['defaults']['for_admin_use']; |
|
| 330 | - } |
|
| 331 | - ?> |
|
| 324 | + }else{
|
|
| 325 | + $value = ''; |
|
| 326 | + if (isset($field_info->for_admin_use)) {
|
|
| 327 | + $value = esc_attr($field_info->for_admin_use); |
|
| 328 | + }elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){
|
|
| 329 | + $value = $cf['defaults']['for_admin_use']; |
|
| 330 | + } |
|
| 331 | + ?> |
|
| 332 | 332 | <li> |
| 333 | 333 | <label for="for_admin_use" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('For admin use only? :', 'geodirectory'); ?>
|
| 334 | 334 | <div class="gdcf-tooltip"> |
@@ -339,47 +339,47 @@ discard block |
||
| 339 | 339 | |
| 340 | 340 | <input type="radio" id="for_admin_use_yes<?php echo $radio_id;?>" name="for_admin_use" class="gdri-enabled" value="1" |
| 341 | 341 | <?php if ($value == '1') {
|
| 342 | - echo 'checked'; |
|
| 343 | - } ?>/> |
|
| 342 | + echo 'checked'; |
|
| 343 | + } ?>/> |
|
| 344 | 344 | <label for="for_admin_use_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 345 | 345 | |
| 346 | 346 | <input type="radio" id="for_admin_use_no<?php echo $radio_id;?>" name="for_admin_use" class="gdri-disabled" value="0" |
| 347 | 347 | <?php if ($value == '0' || !$value) {
|
| 348 | - echo 'checked'; |
|
| 349 | - } ?>/> |
|
| 348 | + echo 'checked'; |
|
| 349 | + } ?>/> |
|
| 350 | 350 | <label for="for_admin_use_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 351 | 351 | |
| 352 | 352 | </div> |
| 353 | 353 | </li> |
| 354 | 354 | <?php |
| 355 | - } |
|
| 355 | + } |
|
| 356 | 356 | |
| 357 | 357 | |
| 358 | - // default_value |
|
| 359 | - if(has_filter("geodir_cfa_default_value_{$field_type}")){
|
|
| 358 | + // default_value |
|
| 359 | + if(has_filter("geodir_cfa_default_value_{$field_type}")){
|
|
| 360 | 360 | |
| 361 | - echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 361 | + echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 362 | 362 | |
| 363 | - }else{
|
|
| 364 | - $value = ''; |
|
| 365 | - if (isset($field_info->default_value)) {
|
|
| 366 | - $value = esc_attr($field_info->default_value); |
|
| 367 | - }elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){
|
|
| 368 | - $value = $cf['defaults']['default_value']; |
|
| 369 | - } |
|
| 370 | - ?> |
|
| 363 | + }else{
|
|
| 364 | + $value = ''; |
|
| 365 | + if (isset($field_info->default_value)) {
|
|
| 366 | + $value = esc_attr($field_info->default_value); |
|
| 367 | + }elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){
|
|
| 368 | + $value = $cf['defaults']['default_value']; |
|
| 369 | + } |
|
| 370 | + ?> |
|
| 371 | 371 | <li> |
| 372 | 372 | <label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory');?>
|
| 373 | 373 | <div class="gdcf-tooltip"> |
| 374 | 374 | <?php |
| 375 | - if ($field_type == 'checkbox') {
|
|
| 376 | - _e('Should the checkbox be checked by default?', 'geodirectory');
|
|
| 377 | - } else if ($field_type == 'email') {
|
|
| 378 | - _e('A default value for the field, usually blank. Ex: [email protected]', 'geodirectory');
|
|
| 379 | - } else {
|
|
| 380 | - _e('A default value for the field, usually blank. (for "link" this will be used as the link text)', 'geodirectory');
|
|
| 381 | - } |
|
| 382 | - ?> |
|
| 375 | + if ($field_type == 'checkbox') {
|
|
| 376 | + _e('Should the checkbox be checked by default?', 'geodirectory');
|
|
| 377 | + } else if ($field_type == 'email') {
|
|
| 378 | + _e('A default value for the field, usually blank. Ex: [email protected]', 'geodirectory');
|
|
| 379 | + } else {
|
|
| 380 | + _e('A default value for the field, usually blank. (for "link" this will be used as the link text)', 'geodirectory');
|
|
| 381 | + } |
|
| 382 | + ?> |
|
| 383 | 383 | </div> |
| 384 | 384 | </label> |
| 385 | 385 | <div class="gd-cf-input-wrap"> |
@@ -396,22 +396,22 @@ discard block |
||
| 396 | 396 | </div> |
| 397 | 397 | </li> |
| 398 | 398 | <?php |
| 399 | - } |
|
| 399 | + } |
|
| 400 | 400 | |
| 401 | 401 | |
| 402 | - // show_in |
|
| 403 | - if(has_filter("geodir_cfa_show_in_{$field_type}")){
|
|
| 402 | + // show_in |
|
| 403 | + if(has_filter("geodir_cfa_show_in_{$field_type}")){
|
|
| 404 | 404 | |
| 405 | - echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 405 | + echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 406 | 406 | |
| 407 | - }else{
|
|
| 408 | - $value = ''; |
|
| 409 | - if (isset($field_info->show_in)) {
|
|
| 410 | - $value = esc_attr($field_info->show_in); |
|
| 411 | - }elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){
|
|
| 412 | - $value = esc_attr($cf['defaults']['show_in']); |
|
| 413 | - } |
|
| 414 | - ?> |
|
| 407 | + }else{
|
|
| 408 | + $value = ''; |
|
| 409 | + if (isset($field_info->show_in)) {
|
|
| 410 | + $value = esc_attr($field_info->show_in); |
|
| 411 | + }elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){
|
|
| 412 | + $value = esc_attr($cf['defaults']['show_in']); |
|
| 413 | + } |
|
| 414 | + ?> |
|
| 415 | 415 | <li> |
| 416 | 416 | <label for="show_in" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show in what locations?:', 'geodirectory'); ?>
|
| 417 | 417 | <div class="gdcf-tooltip"> |
@@ -422,41 +422,41 @@ discard block |
||
| 422 | 422 | |
| 423 | 423 | <?php |
| 424 | 424 | |
| 425 | - /* |
|
| 425 | + /* |
|
| 426 | 426 | * We wrap the key values in [] so we can search the DB easier with a LIKE query. |
| 427 | 427 | */ |
| 428 | - $show_in_locations = array( |
|
| 429 | - "[detail]" => __("Details page sidebar", 'geodirectory'),
|
|
| 430 | - "[moreinfo]" => __("More info tab", 'geodirectory'),
|
|
| 431 | - "[listing]" => __("Listings page", 'geodirectory'),
|
|
| 432 | - "[owntab]" => __("Details page own tab", 'geodirectory'),
|
|
| 433 | - "[mapbubble]" => __("Map bubble", 'geodirectory'),
|
|
| 434 | - ); |
|
| 435 | - |
|
| 436 | - /** |
|
| 437 | - * Filter the locations array for where to display custom fields. |
|
| 438 | - * |
|
| 439 | - * @since 1.6.6 |
|
| 440 | - * @param array $show_in_locations The array of locations and descriptions. |
|
| 441 | - * @param object $field_info The field being displayed info. |
|
| 442 | - * @param string $field_info The type of field. |
|
| 443 | - */ |
|
| 444 | - $show_in_locations = apply_filters('geodir_show_in_locations',$show_in_locations,$field_info,$field_type);
|
|
| 445 | - |
|
| 446 | - |
|
| 447 | - // remove some locations for some field types |
|
| 448 | - |
|
| 449 | - // don't show new tab option for some types |
|
| 450 | - if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 451 | - }else{
|
|
| 452 | - unset($show_in_locations['[owntab]']); |
|
| 453 | - } |
|
| 454 | - |
|
| 455 | - if(!$display_on_listing){
|
|
| 456 | - unset($show_in_locations['[listings]']); |
|
| 457 | - } |
|
| 458 | - |
|
| 459 | - ?> |
|
| 428 | + $show_in_locations = array( |
|
| 429 | + "[detail]" => __("Details page sidebar", 'geodirectory'),
|
|
| 430 | + "[moreinfo]" => __("More info tab", 'geodirectory'),
|
|
| 431 | + "[listing]" => __("Listings page", 'geodirectory'),
|
|
| 432 | + "[owntab]" => __("Details page own tab", 'geodirectory'),
|
|
| 433 | + "[mapbubble]" => __("Map bubble", 'geodirectory'),
|
|
| 434 | + ); |
|
| 435 | + |
|
| 436 | + /** |
|
| 437 | + * Filter the locations array for where to display custom fields. |
|
| 438 | + * |
|
| 439 | + * @since 1.6.6 |
|
| 440 | + * @param array $show_in_locations The array of locations and descriptions. |
|
| 441 | + * @param object $field_info The field being displayed info. |
|
| 442 | + * @param string $field_info The type of field. |
|
| 443 | + */ |
|
| 444 | + $show_in_locations = apply_filters('geodir_show_in_locations',$show_in_locations,$field_info,$field_type);
|
|
| 445 | + |
|
| 446 | + |
|
| 447 | + // remove some locations for some field types |
|
| 448 | + |
|
| 449 | + // don't show new tab option for some types |
|
| 450 | + if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 451 | + }else{
|
|
| 452 | + unset($show_in_locations['[owntab]']); |
|
| 453 | + } |
|
| 454 | + |
|
| 455 | + if(!$display_on_listing){
|
|
| 456 | + unset($show_in_locations['[listings]']); |
|
| 457 | + } |
|
| 458 | + |
|
| 459 | + ?> |
|
| 460 | 460 | |
| 461 | 461 | <select multiple="multiple" name="show_in[]" |
| 462 | 462 | id="show_in" |
@@ -466,38 +466,38 @@ discard block |
||
| 466 | 466 | option-ajaxchosen="false"> |
| 467 | 467 | <?php |
| 468 | 468 | |
| 469 | - $show_in_values = explode(',',$value);
|
|
| 469 | + $show_in_values = explode(',',$value);
|
|
| 470 | 470 | |
| 471 | - foreach( $show_in_locations as $key => $val){
|
|
| 472 | - $selected = ''; |
|
| 471 | + foreach( $show_in_locations as $key => $val){
|
|
| 472 | + $selected = ''; |
|
| 473 | 473 | |
| 474 | - if(is_array($show_in_values) && in_array($key,$show_in_values ) ){
|
|
| 475 | - $selected = 'selected'; |
|
| 476 | - } |
|
| 474 | + if(is_array($show_in_values) && in_array($key,$show_in_values ) ){
|
|
| 475 | + $selected = 'selected'; |
|
| 476 | + } |
|
| 477 | 477 | |
| 478 | - ?> |
|
| 478 | + ?> |
|
| 479 | 479 | <option value="<?php echo $key;?>" <?php echo $selected;?>><?php echo $val;?></option> |
| 480 | 480 | <?php |
| 481 | - } |
|
| 482 | - ?> |
|
| 481 | + } |
|
| 482 | + ?> |
|
| 483 | 483 | </select> |
| 484 | 484 | </div> |
| 485 | 485 | </li> |
| 486 | 486 | <?php |
| 487 | - } |
|
| 487 | + } |
|
| 488 | 488 | |
| 489 | 489 | |
| 490 | - // advanced_editor |
|
| 491 | - if(has_filter("geodir_cfa_advanced_editor_{$field_type}")){
|
|
| 490 | + // advanced_editor |
|
| 491 | + if(has_filter("geodir_cfa_advanced_editor_{$field_type}")){
|
|
| 492 | 492 | |
| 493 | - echo apply_filters("geodir_cfa_advanced_editor_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 493 | + echo apply_filters("geodir_cfa_advanced_editor_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 494 | 494 | |
| 495 | - } |
|
| 495 | + } |
|
| 496 | 496 | |
| 497 | 497 | |
| 498 | 498 | |
| 499 | 499 | |
| 500 | - ?> |
|
| 500 | + ?> |
|
| 501 | 501 | |
| 502 | 502 | |
| 503 | 503 | <?php // @todo this does not seem to be used for anything, it can be removed or replaced ?> |
@@ -510,38 +510,38 @@ discard block |
||
| 510 | 510 | |
| 511 | 511 | <?php |
| 512 | 512 | |
| 513 | - $pricearr = array(); |
|
| 514 | - if (isset($field_info->packages) && $field_info->packages != '') {
|
|
| 515 | - $pricearr = explode(',', trim($field_info->packages, ','));
|
|
| 516 | - } else {
|
|
| 517 | - $package_info = array(); |
|
| 513 | + $pricearr = array(); |
|
| 514 | + if (isset($field_info->packages) && $field_info->packages != '') {
|
|
| 515 | + $pricearr = explode(',', trim($field_info->packages, ','));
|
|
| 516 | + } else {
|
|
| 517 | + $package_info = array(); |
|
| 518 | 518 | |
| 519 | - $package_info = geodir_post_package_info($package_info, '', $post_type); |
|
| 520 | - $pricearr[] = $package_info->pid; |
|
| 521 | - } |
|
| 519 | + $package_info = geodir_post_package_info($package_info, '', $post_type); |
|
| 520 | + $pricearr[] = $package_info->pid; |
|
| 521 | + } |
|
| 522 | 522 | |
| 523 | - ob_start() |
|
| 524 | - ?> |
|
| 523 | + ob_start() |
|
| 524 | + ?> |
|
| 525 | 525 | |
| 526 | 526 | <select style="display:none" name="show_on_pkg[]" id="show_on_pkg" multiple="multiple"> |
| 527 | 527 | <?php |
| 528 | - if (!empty($pricearr)) {
|
|
| 529 | - foreach ($pricearr as $val) {
|
|
| 530 | - ?> |
|
| 528 | + if (!empty($pricearr)) {
|
|
| 529 | + foreach ($pricearr as $val) {
|
|
| 530 | + ?> |
|
| 531 | 531 | <option selected="selected" value="<?php echo esc_attr($val); ?>" ><?php echo $val; ?></option><?php |
| 532 | - } |
|
| 533 | - } |
|
| 534 | - ?> |
|
| 532 | + } |
|
| 533 | + } |
|
| 534 | + ?> |
|
| 535 | 535 | </select> |
| 536 | 536 | |
| 537 | 537 | <?php |
| 538 | - $html = ob_get_clean(); |
|
| 538 | + $html = ob_get_clean(); |
|
| 539 | 539 | |
| 540 | 540 | /** |
| 541 | 541 | * Filter the price packages list. |
| 542 | 542 | * |
| 543 | 543 | * Filter the price packages list in custom field form in admin |
| 544 | - * custom fields settings. |
|
| 544 | + * custom fields settings. |
|
| 545 | 545 | * |
| 546 | 546 | * @since 1.0.0 |
| 547 | 547 | * |
@@ -550,25 +550,25 @@ discard block |
||
| 550 | 550 | */ |
| 551 | 551 | echo $html = apply_filters('geodir_packages_list_on_custom_fields', $html, $field_info);
|
| 552 | 552 | |
| 553 | - ?> |
|
| 553 | + ?> |
|
| 554 | 554 | |
| 555 | 555 | |
| 556 | 556 | |
| 557 | 557 | <?php |
| 558 | 558 | |
| 559 | - // is_required |
|
| 560 | - if(has_filter("geodir_cfa_is_required_{$field_type}")){
|
|
| 559 | + // is_required |
|
| 560 | + if(has_filter("geodir_cfa_is_required_{$field_type}")){
|
|
| 561 | 561 | |
| 562 | - echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 562 | + echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 563 | 563 | |
| 564 | - }else{
|
|
| 565 | - $value = ''; |
|
| 566 | - if (isset($field_info->is_required)) {
|
|
| 567 | - $value = esc_attr($field_info->is_required); |
|
| 568 | - }elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){
|
|
| 569 | - $value = $cf['defaults']['is_required']; |
|
| 570 | - } |
|
| 571 | - ?> |
|
| 564 | + }else{
|
|
| 565 | + $value = ''; |
|
| 566 | + if (isset($field_info->is_required)) {
|
|
| 567 | + $value = esc_attr($field_info->is_required); |
|
| 568 | + }elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){
|
|
| 569 | + $value = $cf['defaults']['is_required']; |
|
| 570 | + } |
|
| 571 | + ?> |
|
| 572 | 572 | <li> |
| 573 | 573 | <label for="is_required" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is required :', 'geodirectory'); ?>
|
| 574 | 574 | <div class="gdcf-tooltip"> |
@@ -580,14 +580,14 @@ discard block |
||
| 580 | 580 | |
| 581 | 581 | <input type="radio" id="is_required_yes<?php echo $radio_id;?>" name="is_required" class="gdri-enabled" value="1" |
| 582 | 582 | <?php if ($value == '1') {
|
| 583 | - echo 'checked'; |
|
| 584 | - } ?>/> |
|
| 583 | + echo 'checked'; |
|
| 584 | + } ?>/> |
|
| 585 | 585 | <label onclick="show_hide_radio(this,'show','cf-is-required-msg');" for="is_required_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 586 | 586 | |
| 587 | 587 | <input type="radio" id="is_required_no<?php echo $radio_id;?>" name="is_required" class="gdri-disabled" value="0" |
| 588 | 588 | <?php if ($value == '0' || !$value) {
|
| 589 | - echo 'checked'; |
|
| 590 | - } ?>/> |
|
| 589 | + echo 'checked'; |
|
| 590 | + } ?>/> |
|
| 591 | 591 | <label onclick="show_hide_radio(this,'hide','cf-is-required-msg');" for="is_required_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 592 | 592 | |
| 593 | 593 | </div> |
@@ -595,21 +595,21 @@ discard block |
||
| 595 | 595 | </li> |
| 596 | 596 | |
| 597 | 597 | <?php |
| 598 | - } |
|
| 598 | + } |
|
| 599 | 599 | |
| 600 | - // required_msg |
|
| 601 | - if(has_filter("geodir_cfa_required_msg_{$field_type}")){
|
|
| 600 | + // required_msg |
|
| 601 | + if(has_filter("geodir_cfa_required_msg_{$field_type}")){
|
|
| 602 | 602 | |
| 603 | - echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 603 | + echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 604 | 604 | |
| 605 | - }else{
|
|
| 606 | - $value = ''; |
|
| 607 | - if (isset($field_info->required_msg)) {
|
|
| 608 | - $value = esc_attr($field_info->required_msg); |
|
| 609 | - }elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){
|
|
| 610 | - $value = $cf['defaults']['required_msg']; |
|
| 611 | - } |
|
| 612 | - ?> |
|
| 605 | + }else{
|
|
| 606 | + $value = ''; |
|
| 607 | + if (isset($field_info->required_msg)) {
|
|
| 608 | + $value = esc_attr($field_info->required_msg); |
|
| 609 | + }elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){
|
|
| 610 | + $value = $cf['defaults']['required_msg']; |
|
| 611 | + } |
|
| 612 | + ?> |
|
| 613 | 613 | <li class="cf-is-required-msg" <?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'";}?>>
|
| 614 | 614 | <label for="required_msg" class="gd-cf-tooltip-wrap"> |
| 615 | 615 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Required message:', 'geodirectory'); ?>
|
@@ -623,38 +623,38 @@ discard block |
||
| 623 | 623 | </div> |
| 624 | 624 | </li> |
| 625 | 625 | <?php |
| 626 | - } |
|
| 626 | + } |
|
| 627 | 627 | |
| 628 | 628 | |
| 629 | - // required_msg |
|
| 630 | - if(has_filter("geodir_cfa_validation_pattern_{$field_type}")){
|
|
| 629 | + // required_msg |
|
| 630 | + if(has_filter("geodir_cfa_validation_pattern_{$field_type}")){
|
|
| 631 | 631 | |
| 632 | - echo apply_filters("geodir_cfa_validation_pattern_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 632 | + echo apply_filters("geodir_cfa_validation_pattern_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 633 | 633 | |
| 634 | - } |
|
| 634 | + } |
|
| 635 | 635 | |
| 636 | 636 | |
| 637 | - // extra_fields |
|
| 638 | - if(has_filter("geodir_cfa_extra_fields_{$field_type}")){
|
|
| 637 | + // extra_fields |
|
| 638 | + if(has_filter("geodir_cfa_extra_fields_{$field_type}")){
|
|
| 639 | 639 | |
| 640 | - echo apply_filters("geodir_cfa_extra_fields_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 640 | + echo apply_filters("geodir_cfa_extra_fields_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 641 | 641 | |
| 642 | - } |
|
| 642 | + } |
|
| 643 | 643 | |
| 644 | 644 | |
| 645 | - // field_icon |
|
| 646 | - if(has_filter("geodir_cfa_field_icon_{$field_type}")){
|
|
| 645 | + // field_icon |
|
| 646 | + if(has_filter("geodir_cfa_field_icon_{$field_type}")){
|
|
| 647 | 647 | |
| 648 | - echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 648 | + echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 649 | 649 | |
| 650 | - }else{
|
|
| 651 | - $value = ''; |
|
| 652 | - if (isset($field_info->field_icon)) {
|
|
| 653 | - $value = esc_attr($field_info->field_icon); |
|
| 654 | - }elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){
|
|
| 655 | - $value = $cf['defaults']['field_icon']; |
|
| 656 | - } |
|
| 657 | - ?> |
|
| 650 | + }else{
|
|
| 651 | + $value = ''; |
|
| 652 | + if (isset($field_info->field_icon)) {
|
|
| 653 | + $value = esc_attr($field_info->field_icon); |
|
| 654 | + }elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){
|
|
| 655 | + $value = $cf['defaults']['field_icon']; |
|
| 656 | + } |
|
| 657 | + ?> |
|
| 658 | 658 | <li> |
| 659 | 659 | <h3><?php echo __('Custom css', 'geodirectory'); ?></h3>
|
| 660 | 660 | |
@@ -672,22 +672,22 @@ discard block |
||
| 672 | 672 | |
| 673 | 673 | </li> |
| 674 | 674 | <?php |
| 675 | - } |
|
| 675 | + } |
|
| 676 | 676 | |
| 677 | 677 | |
| 678 | - // css_class |
|
| 679 | - if(has_filter("geodir_cfa_css_class_{$field_type}")){
|
|
| 678 | + // css_class |
|
| 679 | + if(has_filter("geodir_cfa_css_class_{$field_type}")){
|
|
| 680 | 680 | |
| 681 | - echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 681 | + echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 682 | 682 | |
| 683 | - }else{
|
|
| 684 | - $value = ''; |
|
| 685 | - if (isset($field_info->css_class)) {
|
|
| 686 | - $value = esc_attr($field_info->css_class); |
|
| 687 | - }elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){
|
|
| 688 | - $value = $cf['defaults']['css_class']; |
|
| 689 | - } |
|
| 690 | - ?> |
|
| 683 | + }else{
|
|
| 684 | + $value = ''; |
|
| 685 | + if (isset($field_info->css_class)) {
|
|
| 686 | + $value = esc_attr($field_info->css_class); |
|
| 687 | + }elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){
|
|
| 688 | + $value = $cf['defaults']['css_class']; |
|
| 689 | + } |
|
| 690 | + ?> |
|
| 691 | 691 | <li> |
| 692 | 692 | |
| 693 | 693 | <label for="css_class" class="gd-cf-tooltip-wrap"> |
@@ -700,47 +700,47 @@ discard block |
||
| 700 | 700 | <div class="gd-cf-input-wrap"> |
| 701 | 701 | <input type="text" name="css_class" id="css_class" |
| 702 | 702 | value="<?php if (isset($field_info->css_class)) {
|
| 703 | - echo esc_attr($field_info->css_class); |
|
| 704 | - }?>"/> |
|
| 703 | + echo esc_attr($field_info->css_class); |
|
| 704 | + }?>"/> |
|
| 705 | 705 | </div> |
| 706 | 706 | </li> |
| 707 | 707 | <?php |
| 708 | - } |
|
| 708 | + } |
|
| 709 | 709 | |
| 710 | 710 | |
| 711 | - // cat_sort |
|
| 712 | - if(has_filter("geodir_cfa_cat_sort_{$field_type}")){
|
|
| 711 | + // cat_sort |
|
| 712 | + if(has_filter("geodir_cfa_cat_sort_{$field_type}")){
|
|
| 713 | 713 | |
| 714 | - echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 714 | + echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 715 | 715 | |
| 716 | - }else{
|
|
| 717 | - $value = ''; |
|
| 718 | - $hide_cat_sort =''; |
|
| 719 | - if (isset($field_info->cat_sort)) {
|
|
| 720 | - $value = esc_attr($field_info->cat_sort); |
|
| 721 | - }elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){
|
|
| 722 | - $value = $cf['defaults']['cat_sort']; |
|
| 723 | - $hide_cat_sort = ($value===false) ? "style='display:none;'" : ''; |
|
| 724 | - } |
|
| 716 | + }else{
|
|
| 717 | + $value = ''; |
|
| 718 | + $hide_cat_sort =''; |
|
| 719 | + if (isset($field_info->cat_sort)) {
|
|
| 720 | + $value = esc_attr($field_info->cat_sort); |
|
| 721 | + }elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){
|
|
| 722 | + $value = $cf['defaults']['cat_sort']; |
|
| 723 | + $hide_cat_sort = ($value===false) ? "style='display:none;'" : ''; |
|
| 724 | + } |
|
| 725 | 725 | |
| 726 | - $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']===false) ? "style='display:none;'" : ''; |
|
| 727 | - ?> |
|
| 726 | + $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']===false) ? "style='display:none;'" : ''; |
|
| 727 | + ?> |
|
| 728 | 728 | <li <?php echo $hide_cat_sort ;?>> |
| 729 | 729 | <h3><?php |
| 730 | - /** |
|
| 731 | - * Filter the section title. |
|
| 732 | - * |
|
| 733 | - * Filter the section title in custom field form in admin |
|
| 734 | - * custom fields settings. |
|
| 735 | - * |
|
| 736 | - * @since 1.0.0 |
|
| 737 | - * |
|
| 738 | - * @param string $title Title of the section. |
|
| 739 | - * @param string $field_type Current field type. |
|
| 740 | - */ |
|
| 741 | - echo apply_filters('geodir_advance_custom_fields_heading', __('Posts sort options', 'geodirectory'), $field_type);
|
|
| 742 | - |
|
| 743 | - ?></h3> |
|
| 730 | + /** |
|
| 731 | + * Filter the section title. |
|
| 732 | + * |
|
| 733 | + * Filter the section title in custom field form in admin |
|
| 734 | + * custom fields settings. |
|
| 735 | + * |
|
| 736 | + * @since 1.0.0 |
|
| 737 | + * |
|
| 738 | + * @param string $title Title of the section. |
|
| 739 | + * @param string $field_type Current field type. |
|
| 740 | + */ |
|
| 741 | + echo apply_filters('geodir_advance_custom_fields_heading', __('Posts sort options', 'geodirectory'), $field_type);
|
|
| 742 | + |
|
| 743 | + ?></h3> |
|
| 744 | 744 | <label for="cat_sort" class="gd-cf-tooltip-wrap"> |
| 745 | 745 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Include this field in sorting options :', 'geodirectory'); ?>
|
| 746 | 746 | <div class="gdcf-tooltip"> |
@@ -752,42 +752,42 @@ discard block |
||
| 752 | 752 | |
| 753 | 753 | <input type="radio" id="cat_sort_yes<?php echo $radio_id;?>" name="cat_sort" class="gdri-enabled" value="1" |
| 754 | 754 | <?php if ($value == '1') {
|
| 755 | - echo 'checked'; |
|
| 756 | - } ?>/> |
|
| 755 | + echo 'checked'; |
|
| 756 | + } ?>/> |
|
| 757 | 757 | <label for="cat_sort_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 758 | 758 | |
| 759 | 759 | <input type="radio" id="cat_sort_no<?php echo $radio_id;?>" name="cat_sort" class="gdri-disabled" value="0" |
| 760 | 760 | <?php if (!$value) {
|
| 761 | - echo 'checked'; |
|
| 762 | - } ?>/> |
|
| 761 | + echo 'checked'; |
|
| 762 | + } ?>/> |
|
| 763 | 763 | <label for="cat_sort_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 764 | 764 | |
| 765 | 765 | </div> |
| 766 | 766 | </li> |
| 767 | 767 | <?php |
| 768 | - } |
|
| 769 | - |
|
| 770 | - |
|
| 771 | - |
|
| 772 | - switch ($field_type): |
|
| 773 | - case 'html': |
|
| 774 | - case 'file': |
|
| 775 | - case 'url': |
|
| 776 | - case 'fieldset': |
|
| 777 | - break; |
|
| 778 | - default: |
|
| 779 | - |
|
| 780 | - /** |
|
| 781 | - * Called at the end of the advanced custom fields settings page loop. |
|
| 782 | - * |
|
| 783 | - * Can be used to add or deal with different settings types. |
|
| 784 | - * |
|
| 785 | - * @since 1.0.0 |
|
| 786 | - * @since 1.6.6 $cf param added. |
|
| 787 | - * @param object $field_info The current fields info. |
|
| 788 | - * @param array $cf The custom field settings |
|
| 789 | - */ |
|
| 790 | - do_action('geodir_advance_custom_fields', $field_info,$cf);?>
|
|
| 768 | + } |
|
| 769 | + |
|
| 770 | + |
|
| 771 | + |
|
| 772 | + switch ($field_type): |
|
| 773 | + case 'html': |
|
| 774 | + case 'file': |
|
| 775 | + case 'url': |
|
| 776 | + case 'fieldset': |
|
| 777 | + break; |
|
| 778 | + default: |
|
| 779 | + |
|
| 780 | + /** |
|
| 781 | + * Called at the end of the advanced custom fields settings page loop. |
|
| 782 | + * |
|
| 783 | + * Can be used to add or deal with different settings types. |
|
| 784 | + * |
|
| 785 | + * @since 1.0.0 |
|
| 786 | + * @since 1.6.6 $cf param added. |
|
| 787 | + * @param object $field_info The current fields info. |
|
| 788 | + * @param array $cf The custom field settings |
|
| 789 | + */ |
|
| 790 | + do_action('geodir_advance_custom_fields', $field_info,$cf);?>
|
|
| 791 | 791 | |
| 792 | 792 | |
| 793 | 793 | <?php endswitch; ?> |
@@ -39,12 +39,12 @@ discard block |
||
| 39 | 39 | $cf = (isset($cf_arr[$field_type_key])) ? $cf_arr[$field_type_key] : ''; |
| 40 | 40 | |
| 41 | 41 | |
| 42 | -if(isset($field_info->extra_fields)){$extra_fields = $field_info->extra_fields;}
|
|
| 42 | +if (isset($field_info->extra_fields)) {$extra_fields = $field_info->extra_fields; }
|
|
| 43 | 43 | $field_info = stripslashes_deep($field_info); // strip slashes from labels |
| 44 | -if(isset($field_info->extra_fields)){$field_info->extra_fields = $extra_fields;}
|
|
| 44 | +if (isset($field_info->extra_fields)) {$field_info->extra_fields = $extra_fields; }
|
|
| 45 | 45 | |
| 46 | 46 | |
| 47 | -$nonce = wp_create_nonce('custom_fields_' . $result_str);
|
|
| 47 | +$nonce = wp_create_nonce('custom_fields_'.$result_str);
|
|
| 48 | 48 | |
| 49 | 49 | $field_admin_title = ''; |
| 50 | 50 | if (isset($field_info->admin_title)) |
@@ -69,15 +69,15 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {
|
| 71 | 71 | $field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>'; |
| 72 | -}elseif(isset($cf['icon']) && $cf['icon']){
|
|
| 72 | +}elseif (isset($cf['icon']) && $cf['icon']) {
|
|
| 73 | 73 | $field_icon = '<b class="gd-cf-icon" style="background-image: url(\''.$cf['icon'].'\')"></b>'; |
| 74 | -}else{
|
|
| 74 | +} else {
|
|
| 75 | 75 | $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>'; |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | -if(isset($cf['name']) && $cf['name']){
|
|
| 78 | +if (isset($cf['name']) && $cf['name']) {
|
|
| 79 | 79 | $field_type_name = $cf['name']; |
| 80 | -}else{
|
|
| 80 | +} else {
|
|
| 81 | 81 | $field_type_name = $field_type; |
| 82 | 82 | } |
| 83 | 83 | |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | ondblclick="show_hide('field_frm<?php echo $result_str; ?>')" >
|
| 93 | 93 | <?php |
| 94 | 94 | |
| 95 | - $nonce = wp_create_nonce('custom_fields_' . $result_str);
|
|
| 95 | + $nonce = wp_create_nonce('custom_fields_'.$result_str);
|
|
| 96 | 96 | ?> |
| 97 | 97 | |
| 98 | 98 | <?php if (!$default): ?> |
@@ -105,12 +105,12 @@ discard block |
||
| 105 | 105 | <i class="fa fa-long-arrow-left " aria-hidden="true"></i> |
| 106 | 106 | <i class="fa fa-long-arrow-right " aria-hidden="true"></i> |
| 107 | 107 | <b style="cursor:pointer;" |
| 108 | - onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory') . ' ' . $field_admin_title);?></b>
|
|
| 108 | + onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory').' '.$field_admin_title); ?></b>
|
|
| 109 | 109 | <?php |
| 110 | 110 | } else {echo $field_icon;
|
| 111 | 111 | ?> |
| 112 | 112 | <b style="cursor:pointer;" |
| 113 | - onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(' ' . $field_admin_title . ' (' . $field_type_name . ')');?></b>
|
|
| 113 | + onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(' '.$field_admin_title.' ('.$field_type_name.')'); ?></b>
|
|
| 114 | 114 | <?php |
| 115 | 115 | } |
| 116 | 116 | ?> |
@@ -133,43 +133,43 @@ discard block |
||
| 133 | 133 | } ?>"/> |
| 134 | 134 | <input type="hidden" name="is_active" id="is_active" value="1"/> |
| 135 | 135 | |
| 136 | - <input type="hidden" name="is_default" value="<?php echo isset($field_info->is_default) ? $field_info->is_default : '';?>" /><?php // show in sidebar value?> |
|
| 137 | - <input type="hidden" name="show_on_listing" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : '';?>" /> |
|
| 138 | - <input type="hidden" name="show_on_detail" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : '';?>" /> |
|
| 139 | - <input type="hidden" name="show_as_tab" value="<?php echo isset($field_info->show_as_tab) ? $field_info->show_as_tab : '';?>" /> |
|
| 136 | + <input type="hidden" name="is_default" value="<?php echo isset($field_info->is_default) ? $field_info->is_default : ''; ?>" /><?php // show in sidebar value?> |
|
| 137 | + <input type="hidden" name="show_on_listing" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : ''; ?>" /> |
|
| 138 | + <input type="hidden" name="show_on_detail" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : ''; ?>" /> |
|
| 139 | + <input type="hidden" name="show_as_tab" value="<?php echo isset($field_info->show_as_tab) ? $field_info->show_as_tab : ''; ?>" /> |
|
| 140 | 140 | |
| 141 | 141 | <ul class="widefat post fixed" border="0" style="width:100%;"> |
| 142 | 142 | |
| 143 | 143 | <?php |
| 144 | 144 | |
| 145 | 145 | // data_type |
| 146 | - if(has_filter("geodir_cfa_data_type_{$field_type}")){
|
|
| 146 | + if (has_filter("geodir_cfa_data_type_{$field_type}")) {
|
|
| 147 | 147 | |
| 148 | - echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 148 | + echo apply_filters("geodir_cfa_data_type_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 149 | 149 | |
| 150 | - }else{
|
|
| 150 | + } else {
|
|
| 151 | 151 | $value = ''; |
| 152 | 152 | if (isset($field_info->data_type)) {
|
| 153 | 153 | $value = esc_attr($field_info->data_type); |
| 154 | - }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
|
|
| 154 | + }elseif (isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']) {
|
|
| 155 | 155 | $value = $cf['defaults']['data_type']; |
| 156 | 156 | } |
| 157 | 157 | ?> |
| 158 | - <input type="hidden" name="data_type" id="data_type" value="<?php echo $value;?>"/> |
|
| 158 | + <input type="hidden" name="data_type" id="data_type" value="<?php echo $value; ?>"/> |
|
| 159 | 159 | <?php |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | |
| 163 | 163 | // admin_title |
| 164 | - if(has_filter("geodir_cfa_admin_title_{$field_type}")){
|
|
| 164 | + if (has_filter("geodir_cfa_admin_title_{$field_type}")) {
|
|
| 165 | 165 | |
| 166 | - echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 166 | + echo apply_filters("geodir_cfa_admin_title_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 167 | 167 | |
| 168 | - }else{
|
|
| 168 | + } else {
|
|
| 169 | 169 | $value = ''; |
| 170 | 170 | if (isset($field_info->admin_title)) {
|
| 171 | 171 | $value = esc_attr($field_info->admin_title); |
| 172 | - }elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){
|
|
| 172 | + }elseif (isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']) {
|
|
| 173 | 173 | $value = $cf['defaults']['admin_title']; |
| 174 | 174 | } |
| 175 | 175 | ?> |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | </label> |
| 183 | 183 | <div class="gd-cf-input-wrap"> |
| 184 | 184 | <input type="text" name="admin_title" id="admin_title" |
| 185 | - value="<?php echo $value;?>"/> |
|
| 185 | + value="<?php echo $value; ?>"/> |
|
| 186 | 186 | </div> |
| 187 | 187 | </li> |
| 188 | 188 | <?php |
@@ -190,15 +190,15 @@ discard block |
||
| 190 | 190 | |
| 191 | 191 | |
| 192 | 192 | // site_title |
| 193 | - if(has_filter("geodir_cfa_site_title_{$field_type}")){
|
|
| 193 | + if (has_filter("geodir_cfa_site_title_{$field_type}")) {
|
|
| 194 | 194 | |
| 195 | - echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 195 | + echo apply_filters("geodir_cfa_site_title_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 196 | 196 | |
| 197 | - }else{
|
|
| 197 | + } else {
|
|
| 198 | 198 | $value = ''; |
| 199 | 199 | if (isset($field_info->site_title)) {
|
| 200 | 200 | $value = esc_attr($field_info->site_title); |
| 201 | - }elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){
|
|
| 201 | + }elseif (isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']) {
|
|
| 202 | 202 | $value = $cf['defaults']['site_title']; |
| 203 | 203 | } |
| 204 | 204 | ?> |
@@ -218,15 +218,15 @@ discard block |
||
| 218 | 218 | |
| 219 | 219 | |
| 220 | 220 | // admin_desc |
| 221 | - if(has_filter("geodir_cfa_admin_desc_{$field_type}")){
|
|
| 221 | + if (has_filter("geodir_cfa_admin_desc_{$field_type}")) {
|
|
| 222 | 222 | |
| 223 | - echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 223 | + echo apply_filters("geodir_cfa_admin_desc_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 224 | 224 | |
| 225 | - }else{
|
|
| 225 | + } else {
|
|
| 226 | 226 | $value = ''; |
| 227 | 227 | if (isset($field_info->admin_desc)) {
|
| 228 | 228 | $value = esc_attr($field_info->admin_desc); |
| 229 | - }elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){
|
|
| 229 | + }elseif (isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']) {
|
|
| 230 | 230 | $value = $cf['defaults']['admin_desc']; |
| 231 | 231 | } |
| 232 | 232 | ?> |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | </div> |
| 238 | 238 | </label> |
| 239 | 239 | <div class="gd-cf-input-wrap"> |
| 240 | - <input type="text" name="admin_desc" id="admin_desc" value="<?php echo $value;?>"/> |
|
| 240 | + <input type="text" name="admin_desc" id="admin_desc" value="<?php echo $value; ?>"/> |
|
| 241 | 241 | </div> |
| 242 | 242 | </li> |
| 243 | 243 | <?php |
@@ -246,26 +246,26 @@ discard block |
||
| 246 | 246 | |
| 247 | 247 | |
| 248 | 248 | // htmlvar_name |
| 249 | - if(has_filter("geodir_cfa_htmlvar_name_{$field_type}")){
|
|
| 249 | + if (has_filter("geodir_cfa_htmlvar_name_{$field_type}")) {
|
|
| 250 | 250 | |
| 251 | - echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 251 | + echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 252 | 252 | |
| 253 | - }else{
|
|
| 253 | + } else {
|
|
| 254 | 254 | $value = ''; |
| 255 | 255 | if (isset($field_info->htmlvar_name)) {
|
| 256 | 256 | $value = esc_attr($field_info->htmlvar_name); |
| 257 | - }elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){
|
|
| 257 | + }elseif (isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']) {
|
|
| 258 | 258 | $value = $cf['defaults']['htmlvar_name']; |
| 259 | 259 | } |
| 260 | 260 | ?> |
| 261 | 261 | <li> |
| 262 | - <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory');?>
|
|
| 262 | + <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory'); ?>
|
|
| 263 | 263 | <div class="gdcf-tooltip"> |
| 264 | 264 | <?php _e('This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters.', 'geodirectory'); ?>
|
| 265 | 265 | </div> |
| 266 | 266 | </label> |
| 267 | 267 | <div class="gd-cf-input-wrap"> |
| 268 | - <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory');?>"
|
|
| 268 | + <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory'); ?>"
|
|
| 269 | 269 | value="<?php if ($value) {
|
| 270 | 270 | echo preg_replace('/geodir_/', '', $value, 1);
|
| 271 | 271 | }?>" <?php if ($default) {
|
@@ -278,15 +278,15 @@ discard block |
||
| 278 | 278 | |
| 279 | 279 | |
| 280 | 280 | // is_active |
| 281 | - if(has_filter("geodir_cfa_is_active_{$field_type}")){
|
|
| 281 | + if (has_filter("geodir_cfa_is_active_{$field_type}")) {
|
|
| 282 | 282 | |
| 283 | - echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 283 | + echo apply_filters("geodir_cfa_is_active_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 284 | 284 | |
| 285 | - }else{
|
|
| 285 | + } else {
|
|
| 286 | 286 | $value = ''; |
| 287 | 287 | if (isset($field_info->is_active)) {
|
| 288 | 288 | $value = esc_attr($field_info->is_active); |
| 289 | - }elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){
|
|
| 289 | + }elseif (isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']) {
|
|
| 290 | 290 | $value = $cf['defaults']['is_active']; |
| 291 | 291 | } |
| 292 | 292 | ?> |
@@ -298,17 +298,17 @@ discard block |
||
| 298 | 298 | </label> |
| 299 | 299 | <div class="gd-cf-input-wrap gd-switch"> |
| 300 | 300 | |
| 301 | - <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled" value="1" |
|
| 301 | + <input type="radio" id="is_active_yes<?php echo $radio_id; ?>" name="is_active" class="gdri-enabled" value="1" |
|
| 302 | 302 | <?php if ($value == '1') {
|
| 303 | 303 | echo 'checked'; |
| 304 | 304 | } ?>/> |
| 305 | - <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 305 | + <label for="is_active_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 306 | 306 | |
| 307 | - <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0" |
|
| 307 | + <input type="radio" id="is_active_no<?php echo $radio_id; ?>" name="is_active" class="gdri-disabled" value="0" |
|
| 308 | 308 | <?php if ($value == '0' || !$value) {
|
| 309 | 309 | echo 'checked'; |
| 310 | 310 | } ?>/> |
| 311 | - <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 311 | + <label for="is_active_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 312 | 312 | |
| 313 | 313 | </div> |
| 314 | 314 | </li> |
@@ -317,15 +317,15 @@ discard block |
||
| 317 | 317 | |
| 318 | 318 | |
| 319 | 319 | // for_admin_use |
| 320 | - if(has_filter("geodir_cfa_for_admin_use_{$field_type}")){
|
|
| 320 | + if (has_filter("geodir_cfa_for_admin_use_{$field_type}")) {
|
|
| 321 | 321 | |
| 322 | - echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 322 | + echo apply_filters("geodir_cfa_for_admin_use_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 323 | 323 | |
| 324 | - }else{
|
|
| 324 | + } else {
|
|
| 325 | 325 | $value = ''; |
| 326 | 326 | if (isset($field_info->for_admin_use)) {
|
| 327 | 327 | $value = esc_attr($field_info->for_admin_use); |
| 328 | - }elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){
|
|
| 328 | + }elseif (isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']) {
|
|
| 329 | 329 | $value = $cf['defaults']['for_admin_use']; |
| 330 | 330 | } |
| 331 | 331 | ?> |
@@ -337,17 +337,17 @@ discard block |
||
| 337 | 337 | </label> |
| 338 | 338 | <div class="gd-cf-input-wrap gd-switch"> |
| 339 | 339 | |
| 340 | - <input type="radio" id="for_admin_use_yes<?php echo $radio_id;?>" name="for_admin_use" class="gdri-enabled" value="1" |
|
| 340 | + <input type="radio" id="for_admin_use_yes<?php echo $radio_id; ?>" name="for_admin_use" class="gdri-enabled" value="1" |
|
| 341 | 341 | <?php if ($value == '1') {
|
| 342 | 342 | echo 'checked'; |
| 343 | 343 | } ?>/> |
| 344 | - <label for="for_admin_use_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 344 | + <label for="for_admin_use_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 345 | 345 | |
| 346 | - <input type="radio" id="for_admin_use_no<?php echo $radio_id;?>" name="for_admin_use" class="gdri-disabled" value="0" |
|
| 346 | + <input type="radio" id="for_admin_use_no<?php echo $radio_id; ?>" name="for_admin_use" class="gdri-disabled" value="0" |
|
| 347 | 347 | <?php if ($value == '0' || !$value) {
|
| 348 | 348 | echo 'checked'; |
| 349 | 349 | } ?>/> |
| 350 | - <label for="for_admin_use_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 350 | + <label for="for_admin_use_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 351 | 351 | |
| 352 | 352 | </div> |
| 353 | 353 | </li> |
@@ -356,20 +356,20 @@ discard block |
||
| 356 | 356 | |
| 357 | 357 | |
| 358 | 358 | // default_value |
| 359 | - if(has_filter("geodir_cfa_default_value_{$field_type}")){
|
|
| 359 | + if (has_filter("geodir_cfa_default_value_{$field_type}")) {
|
|
| 360 | 360 | |
| 361 | - echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 361 | + echo apply_filters("geodir_cfa_default_value_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 362 | 362 | |
| 363 | - }else{
|
|
| 363 | + } else {
|
|
| 364 | 364 | $value = ''; |
| 365 | 365 | if (isset($field_info->default_value)) {
|
| 366 | 366 | $value = esc_attr($field_info->default_value); |
| 367 | - }elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){
|
|
| 367 | + }elseif (isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']) {
|
|
| 368 | 368 | $value = $cf['defaults']['default_value']; |
| 369 | 369 | } |
| 370 | 370 | ?> |
| 371 | 371 | <li> |
| 372 | - <label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory');?>
|
|
| 372 | + <label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory'); ?>
|
|
| 373 | 373 | <div class="gdcf-tooltip"> |
| 374 | 374 | <?php |
| 375 | 375 | if ($field_type == 'checkbox') {
|
@@ -386,12 +386,12 @@ discard block |
||
| 386 | 386 | <?php if ($field_type == 'checkbox') { ?>
|
| 387 | 387 | <select name="default_value" id="default_value"> |
| 388 | 388 | <option value=""><?php _e('Unchecked', 'geodirectory'); ?></option>
|
| 389 | - <option value="1" <?php selected(true, (int)$value === 1);?>><?php _e('Checked', 'geodirectory'); ?></option>
|
|
| 389 | + <option value="1" <?php selected(true, (int) $value === 1); ?>><?php _e('Checked', 'geodirectory'); ?></option>
|
|
| 390 | 390 | </select> |
| 391 | 391 | <?php } else if ($field_type == 'email') { ?>
|
| 392 | - <input type="email" name="default_value" placeholder="<?php _e('[email protected]', 'geodirectory') ;?>" id="default_value" value="<?php echo esc_attr($value);?>" /><br/>
|
|
| 392 | + <input type="email" name="default_value" placeholder="<?php _e('[email protected]', 'geodirectory'); ?>" id="default_value" value="<?php echo esc_attr($value); ?>" /><br/>
|
|
| 393 | 393 | <?php } else { ?>
|
| 394 | - <input type="text" name="default_value" id="default_value" value="<?php echo esc_attr($value);?>" /><br/> |
|
| 394 | + <input type="text" name="default_value" id="default_value" value="<?php echo esc_attr($value); ?>" /><br/> |
|
| 395 | 395 | <?php } ?> |
| 396 | 396 | </div> |
| 397 | 397 | </li> |
@@ -400,15 +400,15 @@ discard block |
||
| 400 | 400 | |
| 401 | 401 | |
| 402 | 402 | // show_in |
| 403 | - if(has_filter("geodir_cfa_show_in_{$field_type}")){
|
|
| 403 | + if (has_filter("geodir_cfa_show_in_{$field_type}")) {
|
|
| 404 | 404 | |
| 405 | - echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 405 | + echo apply_filters("geodir_cfa_show_in_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 406 | 406 | |
| 407 | - }else{
|
|
| 407 | + } else {
|
|
| 408 | 408 | $value = ''; |
| 409 | 409 | if (isset($field_info->show_in)) {
|
| 410 | 410 | $value = esc_attr($field_info->show_in); |
| 411 | - }elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){
|
|
| 411 | + }elseif (isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']) {
|
|
| 412 | 412 | $value = esc_attr($cf['defaults']['show_in']); |
| 413 | 413 | } |
| 414 | 414 | ?> |
@@ -441,18 +441,18 @@ discard block |
||
| 441 | 441 | * @param object $field_info The field being displayed info. |
| 442 | 442 | * @param string $field_info The type of field. |
| 443 | 443 | */ |
| 444 | - $show_in_locations = apply_filters('geodir_show_in_locations',$show_in_locations,$field_info,$field_type);
|
|
| 444 | + $show_in_locations = apply_filters('geodir_show_in_locations', $show_in_locations, $field_info, $field_type);
|
|
| 445 | 445 | |
| 446 | 446 | |
| 447 | 447 | // remove some locations for some field types |
| 448 | 448 | |
| 449 | 449 | // don't show new tab option for some types |
| 450 | - if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 451 | - }else{
|
|
| 450 | + if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file', 'address', 'taxonomy'))) {
|
|
| 451 | + } else {
|
|
| 452 | 452 | unset($show_in_locations['[owntab]']); |
| 453 | 453 | } |
| 454 | 454 | |
| 455 | - if(!$display_on_listing){
|
|
| 455 | + if (!$display_on_listing) {
|
|
| 456 | 456 | unset($show_in_locations['[listings]']); |
| 457 | 457 | } |
| 458 | 458 | |
@@ -466,17 +466,17 @@ discard block |
||
| 466 | 466 | option-ajaxchosen="false"> |
| 467 | 467 | <?php |
| 468 | 468 | |
| 469 | - $show_in_values = explode(',',$value);
|
|
| 469 | + $show_in_values = explode(',', $value);
|
|
| 470 | 470 | |
| 471 | - foreach( $show_in_locations as $key => $val){
|
|
| 471 | + foreach ($show_in_locations as $key => $val) {
|
|
| 472 | 472 | $selected = ''; |
| 473 | 473 | |
| 474 | - if(is_array($show_in_values) && in_array($key,$show_in_values ) ){
|
|
| 474 | + if (is_array($show_in_values) && in_array($key, $show_in_values)) {
|
|
| 475 | 475 | $selected = 'selected'; |
| 476 | 476 | } |
| 477 | 477 | |
| 478 | 478 | ?> |
| 479 | - <option value="<?php echo $key;?>" <?php echo $selected;?>><?php echo $val;?></option> |
|
| 479 | + <option value="<?php echo $key; ?>" <?php echo $selected; ?>><?php echo $val; ?></option> |
|
| 480 | 480 | <?php |
| 481 | 481 | } |
| 482 | 482 | ?> |
@@ -488,9 +488,9 @@ discard block |
||
| 488 | 488 | |
| 489 | 489 | |
| 490 | 490 | // advanced_editor |
| 491 | - if(has_filter("geodir_cfa_advanced_editor_{$field_type}")){
|
|
| 491 | + if (has_filter("geodir_cfa_advanced_editor_{$field_type}")) {
|
|
| 492 | 492 | |
| 493 | - echo apply_filters("geodir_cfa_advanced_editor_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 493 | + echo apply_filters("geodir_cfa_advanced_editor_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 494 | 494 | |
| 495 | 495 | } |
| 496 | 496 | |
@@ -501,10 +501,10 @@ discard block |
||
| 501 | 501 | |
| 502 | 502 | |
| 503 | 503 | <?php // @todo this does not seem to be used for anything, it can be removed or replaced ?> |
| 504 | - <input type="hidden" name="clabels" id="clabels" value="<?php if (isset($field_info->clabels)) { echo esc_attr($field_info->clabels);} ?>"/>
|
|
| 504 | + <input type="hidden" name="clabels" id="clabels" value="<?php if (isset($field_info->clabels)) { echo esc_attr($field_info->clabels); } ?>"/>
|
|
| 505 | 505 | |
| 506 | 506 | <?php // we dont need to show the sort order ?> |
| 507 | - <input type="hidden" readonly="readonly" name="sort_order" id="sort_order" value="<?php if (isset($field_info->sort_order)) { echo esc_attr($field_info->sort_order);} ?>"/>
|
|
| 507 | + <input type="hidden" readonly="readonly" name="sort_order" id="sort_order" value="<?php if (isset($field_info->sort_order)) { echo esc_attr($field_info->sort_order); } ?>"/>
|
|
| 508 | 508 | |
| 509 | 509 | |
| 510 | 510 | |
@@ -557,15 +557,15 @@ discard block |
||
| 557 | 557 | <?php |
| 558 | 558 | |
| 559 | 559 | // is_required |
| 560 | - if(has_filter("geodir_cfa_is_required_{$field_type}")){
|
|
| 560 | + if (has_filter("geodir_cfa_is_required_{$field_type}")) {
|
|
| 561 | 561 | |
| 562 | - echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 562 | + echo apply_filters("geodir_cfa_is_required_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 563 | 563 | |
| 564 | - }else{
|
|
| 564 | + } else {
|
|
| 565 | 565 | $value = ''; |
| 566 | 566 | if (isset($field_info->is_required)) {
|
| 567 | 567 | $value = esc_attr($field_info->is_required); |
| 568 | - }elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){
|
|
| 568 | + }elseif (isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']) {
|
|
| 569 | 569 | $value = $cf['defaults']['is_required']; |
| 570 | 570 | } |
| 571 | 571 | ?> |
@@ -578,17 +578,17 @@ discard block |
||
| 578 | 578 | |
| 579 | 579 | <div class="gd-cf-input-wrap gd-switch"> |
| 580 | 580 | |
| 581 | - <input type="radio" id="is_required_yes<?php echo $radio_id;?>" name="is_required" class="gdri-enabled" value="1" |
|
| 581 | + <input type="radio" id="is_required_yes<?php echo $radio_id; ?>" name="is_required" class="gdri-enabled" value="1" |
|
| 582 | 582 | <?php if ($value == '1') {
|
| 583 | 583 | echo 'checked'; |
| 584 | 584 | } ?>/> |
| 585 | - <label onclick="show_hide_radio(this,'show','cf-is-required-msg');" for="is_required_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 585 | + <label onclick="show_hide_radio(this,'show','cf-is-required-msg');" for="is_required_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 586 | 586 | |
| 587 | - <input type="radio" id="is_required_no<?php echo $radio_id;?>" name="is_required" class="gdri-disabled" value="0" |
|
| 587 | + <input type="radio" id="is_required_no<?php echo $radio_id; ?>" name="is_required" class="gdri-disabled" value="0" |
|
| 588 | 588 | <?php if ($value == '0' || !$value) {
|
| 589 | 589 | echo 'checked'; |
| 590 | 590 | } ?>/> |
| 591 | - <label onclick="show_hide_radio(this,'hide','cf-is-required-msg');" for="is_required_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 591 | + <label onclick="show_hide_radio(this,'hide','cf-is-required-msg');" for="is_required_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 592 | 592 | |
| 593 | 593 | </div> |
| 594 | 594 | |
@@ -598,19 +598,19 @@ discard block |
||
| 598 | 598 | } |
| 599 | 599 | |
| 600 | 600 | // required_msg |
| 601 | - if(has_filter("geodir_cfa_required_msg_{$field_type}")){
|
|
| 601 | + if (has_filter("geodir_cfa_required_msg_{$field_type}")) {
|
|
| 602 | 602 | |
| 603 | - echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 603 | + echo apply_filters("geodir_cfa_required_msg_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 604 | 604 | |
| 605 | - }else{
|
|
| 605 | + } else {
|
|
| 606 | 606 | $value = ''; |
| 607 | 607 | if (isset($field_info->required_msg)) {
|
| 608 | 608 | $value = esc_attr($field_info->required_msg); |
| 609 | - }elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){
|
|
| 609 | + }elseif (isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']) {
|
|
| 610 | 610 | $value = $cf['defaults']['required_msg']; |
| 611 | 611 | } |
| 612 | 612 | ?> |
| 613 | - <li class="cf-is-required-msg" <?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'";}?>>
|
|
| 613 | + <li class="cf-is-required-msg" <?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'"; }?>>
|
|
| 614 | 614 | <label for="required_msg" class="gd-cf-tooltip-wrap"> |
| 615 | 615 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Required message:', 'geodirectory'); ?>
|
| 616 | 616 | <div class="gdcf-tooltip"> |
@@ -627,31 +627,31 @@ discard block |
||
| 627 | 627 | |
| 628 | 628 | |
| 629 | 629 | // required_msg |
| 630 | - if(has_filter("geodir_cfa_validation_pattern_{$field_type}")){
|
|
| 630 | + if (has_filter("geodir_cfa_validation_pattern_{$field_type}")) {
|
|
| 631 | 631 | |
| 632 | - echo apply_filters("geodir_cfa_validation_pattern_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 632 | + echo apply_filters("geodir_cfa_validation_pattern_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 633 | 633 | |
| 634 | 634 | } |
| 635 | 635 | |
| 636 | 636 | |
| 637 | 637 | // extra_fields |
| 638 | - if(has_filter("geodir_cfa_extra_fields_{$field_type}")){
|
|
| 638 | + if (has_filter("geodir_cfa_extra_fields_{$field_type}")) {
|
|
| 639 | 639 | |
| 640 | - echo apply_filters("geodir_cfa_extra_fields_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 640 | + echo apply_filters("geodir_cfa_extra_fields_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 641 | 641 | |
| 642 | 642 | } |
| 643 | 643 | |
| 644 | 644 | |
| 645 | 645 | // field_icon |
| 646 | - if(has_filter("geodir_cfa_field_icon_{$field_type}")){
|
|
| 646 | + if (has_filter("geodir_cfa_field_icon_{$field_type}")) {
|
|
| 647 | 647 | |
| 648 | - echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 648 | + echo apply_filters("geodir_cfa_field_icon_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 649 | 649 | |
| 650 | - }else{
|
|
| 650 | + } else {
|
|
| 651 | 651 | $value = ''; |
| 652 | 652 | if (isset($field_info->field_icon)) {
|
| 653 | 653 | $value = esc_attr($field_info->field_icon); |
| 654 | - }elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){
|
|
| 654 | + }elseif (isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']) {
|
|
| 655 | 655 | $value = $cf['defaults']['field_icon']; |
| 656 | 656 | } |
| 657 | 657 | ?> |
@@ -662,12 +662,12 @@ discard block |
||
| 662 | 662 | <label for="field_icon" class="gd-cf-tooltip-wrap"> |
| 663 | 663 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Upload icon :', 'geodirectory'); ?>
|
| 664 | 664 | <div class="gdcf-tooltip"> |
| 665 | - <?php _e('Upload icon using media and enter its url path, or enter <a href="http://fortawesome.github.io/Font-Awesome/icons/" target="_blank" >font awesome </a>class eg:"fa fa-home"', 'geodirectory');?>
|
|
| 665 | + <?php _e('Upload icon using media and enter its url path, or enter <a href="http://fortawesome.github.io/Font-Awesome/icons/" target="_blank" >font awesome </a>class eg:"fa fa-home"', 'geodirectory'); ?>
|
|
| 666 | 666 | </div> |
| 667 | 667 | </label> |
| 668 | 668 | <div class="gd-cf-input-wrap"> |
| 669 | 669 | <input type="text" name="field_icon" id="field_icon" |
| 670 | - value="<?php echo $value;?>"/> |
|
| 670 | + value="<?php echo $value; ?>"/> |
|
| 671 | 671 | </div> |
| 672 | 672 | |
| 673 | 673 | </li> |
@@ -676,15 +676,15 @@ discard block |
||
| 676 | 676 | |
| 677 | 677 | |
| 678 | 678 | // css_class |
| 679 | - if(has_filter("geodir_cfa_css_class_{$field_type}")){
|
|
| 679 | + if (has_filter("geodir_cfa_css_class_{$field_type}")) {
|
|
| 680 | 680 | |
| 681 | - echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 681 | + echo apply_filters("geodir_cfa_css_class_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 682 | 682 | |
| 683 | - }else{
|
|
| 683 | + } else {
|
|
| 684 | 684 | $value = ''; |
| 685 | 685 | if (isset($field_info->css_class)) {
|
| 686 | 686 | $value = esc_attr($field_info->css_class); |
| 687 | - }elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){
|
|
| 687 | + }elseif (isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']) {
|
|
| 688 | 688 | $value = $cf['defaults']['css_class']; |
| 689 | 689 | } |
| 690 | 690 | ?> |
@@ -693,8 +693,8 @@ discard block |
||
| 693 | 693 | <label for="css_class" class="gd-cf-tooltip-wrap"> |
| 694 | 694 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Css class :', 'geodirectory'); ?>
|
| 695 | 695 | <div class="gdcf-tooltip"> |
| 696 | - <?php _e('Enter custom css class for field custom style.', 'geodirectory');?>
|
|
| 697 | - <?php if($field_type=='multiselect'){_e('(Enter class `gd-comma-list` to show list as comma separated)', 'geodirectory');}?>
|
|
| 696 | + <?php _e('Enter custom css class for field custom style.', 'geodirectory'); ?>
|
|
| 697 | + <?php if ($field_type == 'multiselect') {_e('(Enter class `gd-comma-list` to show list as comma separated)', 'geodirectory'); }?>
|
|
| 698 | 698 | </div> |
| 699 | 699 | </label> |
| 700 | 700 | <div class="gd-cf-input-wrap"> |
@@ -709,23 +709,23 @@ discard block |
||
| 709 | 709 | |
| 710 | 710 | |
| 711 | 711 | // cat_sort |
| 712 | - if(has_filter("geodir_cfa_cat_sort_{$field_type}")){
|
|
| 712 | + if (has_filter("geodir_cfa_cat_sort_{$field_type}")) {
|
|
| 713 | 713 | |
| 714 | - echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);
|
|
| 714 | + echo apply_filters("geodir_cfa_cat_sort_{$field_type}", '', $result_str, $cf, $field_info);
|
|
| 715 | 715 | |
| 716 | - }else{
|
|
| 716 | + } else {
|
|
| 717 | 717 | $value = ''; |
| 718 | - $hide_cat_sort =''; |
|
| 718 | + $hide_cat_sort = ''; |
|
| 719 | 719 | if (isset($field_info->cat_sort)) {
|
| 720 | 720 | $value = esc_attr($field_info->cat_sort); |
| 721 | - }elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){
|
|
| 721 | + }elseif (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']) {
|
|
| 722 | 722 | $value = $cf['defaults']['cat_sort']; |
| 723 | - $hide_cat_sort = ($value===false) ? "style='display:none;'" : ''; |
|
| 723 | + $hide_cat_sort = ($value === false) ? "style='display:none;'" : ''; |
|
| 724 | 724 | } |
| 725 | 725 | |
| 726 | - $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']===false) ? "style='display:none;'" : ''; |
|
| 726 | + $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort'] === false) ? "style='display:none;'" : ''; |
|
| 727 | 727 | ?> |
| 728 | - <li <?php echo $hide_cat_sort ;?>> |
|
| 728 | + <li <?php echo $hide_cat_sort; ?>> |
|
| 729 | 729 | <h3><?php |
| 730 | 730 | /** |
| 731 | 731 | * Filter the section title. |
@@ -744,23 +744,23 @@ discard block |
||
| 744 | 744 | <label for="cat_sort" class="gd-cf-tooltip-wrap"> |
| 745 | 745 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Include this field in sorting options :', 'geodirectory'); ?>
|
| 746 | 746 | <div class="gdcf-tooltip"> |
| 747 | - <?php _e('Lets you use this filed as a sorting option, set from sorting options above.', 'geodirectory');?>
|
|
| 747 | + <?php _e('Lets you use this filed as a sorting option, set from sorting options above.', 'geodirectory'); ?>
|
|
| 748 | 748 | </div> |
| 749 | 749 | </label> |
| 750 | 750 | |
| 751 | 751 | <div class="gd-cf-input-wrap gd-switch"> |
| 752 | 752 | |
| 753 | - <input type="radio" id="cat_sort_yes<?php echo $radio_id;?>" name="cat_sort" class="gdri-enabled" value="1" |
|
| 753 | + <input type="radio" id="cat_sort_yes<?php echo $radio_id; ?>" name="cat_sort" class="gdri-enabled" value="1" |
|
| 754 | 754 | <?php if ($value == '1') {
|
| 755 | 755 | echo 'checked'; |
| 756 | 756 | } ?>/> |
| 757 | - <label for="cat_sort_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 757 | + <label for="cat_sort_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 758 | 758 | |
| 759 | - <input type="radio" id="cat_sort_no<?php echo $radio_id;?>" name="cat_sort" class="gdri-disabled" value="0" |
|
| 759 | + <input type="radio" id="cat_sort_no<?php echo $radio_id; ?>" name="cat_sort" class="gdri-disabled" value="0" |
|
| 760 | 760 | <?php if (!$value) {
|
| 761 | 761 | echo 'checked'; |
| 762 | 762 | } ?>/> |
| 763 | - <label for="cat_sort_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 763 | + <label for="cat_sort_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 764 | 764 | |
| 765 | 765 | </div> |
| 766 | 766 | </li> |
@@ -787,7 +787,7 @@ discard block |
||
| 787 | 787 | * @param object $field_info The current fields info. |
| 788 | 788 | * @param array $cf The custom field settings |
| 789 | 789 | */ |
| 790 | - do_action('geodir_advance_custom_fields', $field_info,$cf);?>
|
|
| 790 | + do_action('geodir_advance_custom_fields', $field_info, $cf); ?>
|
|
| 791 | 791 | |
| 792 | 792 | |
| 793 | 793 | <?php endswitch; ?> |
@@ -799,10 +799,10 @@ discard block |
||
| 799 | 799 | <h3></h3> |
| 800 | 800 | </label> |
| 801 | 801 | <div class="gd-cf-input-wrap"> |
| 802 | - <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save','geodirectory'));?>"
|
|
| 802 | + <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save', 'geodirectory')); ?>"
|
|
| 803 | 803 | onclick="save_field('<?php echo esc_attr($result_str); ?>')"/>
|
| 804 | 804 | <?php if (!$default): ?> |
| 805 | - <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete','geodirectory'));?>"
|
|
| 805 | + <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete', 'geodirectory')); ?>"
|
|
| 806 | 806 | onclick="delete_field('<?php echo esc_attr($result_str); ?>', '<?php echo $nonce; ?>')"
|
| 807 | 807 | class="button"/></a> |
| 808 | 808 | <?php endif; ?> |
@@ -19,8 +19,9 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | if (!isset($field_info->post_type)) {
|
| 21 | 21 | $post_type = sanitize_text_field($_REQUEST['listing_type']); |
| 22 | -} else |
|
| 23 | - $post_type = $field_info->post_type; |
|
| 22 | +} else { |
|
| 23 | + $post_type = $field_info->post_type; |
|
| 24 | +} |
|
| 24 | 25 | |
| 25 | 26 | //if(isset($_REQUEST['custom_type']) && $_REQUEST['custom_type']=='predefined'){
|
| 26 | 27 | // $cf_arr = geodir_custom_fields_predefined($post_type); |
@@ -47,8 +48,9 @@ discard block |
||
| 47 | 48 | $nonce = wp_create_nonce('custom_fields_' . $result_str);
|
| 48 | 49 | |
| 49 | 50 | $field_admin_title = ''; |
| 50 | -if (isset($field_info->admin_title)) |
|
| 51 | - $field_admin_title = $field_info->admin_title; |
|
| 51 | +if (isset($field_info->admin_title)) { |
|
| 52 | + $field_admin_title = $field_info->admin_title; |
|
| 53 | +} |
|
| 52 | 54 | |
| 53 | 55 | $default = isset($field_info->is_admin) ? $field_info->is_admin : ''; |
| 54 | 56 | |
@@ -69,15 +71,15 @@ discard block |
||
| 69 | 71 | |
| 70 | 72 | if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {
|
| 71 | 73 | $field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>'; |
| 72 | -}elseif(isset($cf['icon']) && $cf['icon']){
|
|
| 74 | +} elseif(isset($cf['icon']) && $cf['icon']){
|
|
| 73 | 75 | $field_icon = '<b class="gd-cf-icon" style="background-image: url(\''.$cf['icon'].'\')"></b>'; |
| 74 | -}else{
|
|
| 76 | +} else{
|
|
| 75 | 77 | $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>'; |
| 76 | 78 | } |
| 77 | 79 | |
| 78 | 80 | if(isset($cf['name']) && $cf['name']){
|
| 79 | 81 | $field_type_name = $cf['name']; |
| 80 | -}else{
|
|
| 82 | +} else{
|
|
| 81 | 83 | $field_type_name = $field_type; |
| 82 | 84 | } |
| 83 | 85 | |
@@ -147,11 +149,11 @@ discard block |
||
| 147 | 149 | |
| 148 | 150 | echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);
|
| 149 | 151 | |
| 150 | - }else{
|
|
| 152 | + } else{
|
|
| 151 | 153 | $value = ''; |
| 152 | 154 | if (isset($field_info->data_type)) {
|
| 153 | 155 | $value = esc_attr($field_info->data_type); |
| 154 | - }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
|
|
| 156 | + } elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
|
|
| 155 | 157 | $value = $cf['defaults']['data_type']; |
| 156 | 158 | } |
| 157 | 159 | ?> |
@@ -165,11 +167,11 @@ discard block |
||
| 165 | 167 | |
| 166 | 168 | echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);
|
| 167 | 169 | |
| 168 | - }else{
|
|
| 170 | + } else{
|
|
| 169 | 171 | $value = ''; |
| 170 | 172 | if (isset($field_info->admin_title)) {
|
| 171 | 173 | $value = esc_attr($field_info->admin_title); |
| 172 | - }elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){
|
|
| 174 | + } elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){
|
|
| 173 | 175 | $value = $cf['defaults']['admin_title']; |
| 174 | 176 | } |
| 175 | 177 | ?> |
@@ -194,11 +196,11 @@ discard block |
||
| 194 | 196 | |
| 195 | 197 | echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);
|
| 196 | 198 | |
| 197 | - }else{
|
|
| 199 | + } else{
|
|
| 198 | 200 | $value = ''; |
| 199 | 201 | if (isset($field_info->site_title)) {
|
| 200 | 202 | $value = esc_attr($field_info->site_title); |
| 201 | - }elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){
|
|
| 203 | + } elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){
|
|
| 202 | 204 | $value = $cf['defaults']['site_title']; |
| 203 | 205 | } |
| 204 | 206 | ?> |
@@ -222,11 +224,11 @@ discard block |
||
| 222 | 224 | |
| 223 | 225 | echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);
|
| 224 | 226 | |
| 225 | - }else{
|
|
| 227 | + } else{
|
|
| 226 | 228 | $value = ''; |
| 227 | 229 | if (isset($field_info->admin_desc)) {
|
| 228 | 230 | $value = esc_attr($field_info->admin_desc); |
| 229 | - }elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){
|
|
| 231 | + } elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){
|
|
| 230 | 232 | $value = $cf['defaults']['admin_desc']; |
| 231 | 233 | } |
| 232 | 234 | ?> |
@@ -250,11 +252,11 @@ discard block |
||
| 250 | 252 | |
| 251 | 253 | echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);
|
| 252 | 254 | |
| 253 | - }else{
|
|
| 255 | + } else{
|
|
| 254 | 256 | $value = ''; |
| 255 | 257 | if (isset($field_info->htmlvar_name)) {
|
| 256 | 258 | $value = esc_attr($field_info->htmlvar_name); |
| 257 | - }elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){
|
|
| 259 | + } elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){
|
|
| 258 | 260 | $value = $cf['defaults']['htmlvar_name']; |
| 259 | 261 | } |
| 260 | 262 | ?> |
@@ -282,11 +284,11 @@ discard block |
||
| 282 | 284 | |
| 283 | 285 | echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);
|
| 284 | 286 | |
| 285 | - }else{
|
|
| 287 | + } else{
|
|
| 286 | 288 | $value = ''; |
| 287 | 289 | if (isset($field_info->is_active)) {
|
| 288 | 290 | $value = esc_attr($field_info->is_active); |
| 289 | - }elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){
|
|
| 291 | + } elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){
|
|
| 290 | 292 | $value = $cf['defaults']['is_active']; |
| 291 | 293 | } |
| 292 | 294 | ?> |
@@ -321,11 +323,11 @@ discard block |
||
| 321 | 323 | |
| 322 | 324 | echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);
|
| 323 | 325 | |
| 324 | - }else{
|
|
| 326 | + } else{
|
|
| 325 | 327 | $value = ''; |
| 326 | 328 | if (isset($field_info->for_admin_use)) {
|
| 327 | 329 | $value = esc_attr($field_info->for_admin_use); |
| 328 | - }elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){
|
|
| 330 | + } elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){
|
|
| 329 | 331 | $value = $cf['defaults']['for_admin_use']; |
| 330 | 332 | } |
| 331 | 333 | ?> |
@@ -360,11 +362,11 @@ discard block |
||
| 360 | 362 | |
| 361 | 363 | echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);
|
| 362 | 364 | |
| 363 | - }else{
|
|
| 365 | + } else{
|
|
| 364 | 366 | $value = ''; |
| 365 | 367 | if (isset($field_info->default_value)) {
|
| 366 | 368 | $value = esc_attr($field_info->default_value); |
| 367 | - }elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){
|
|
| 369 | + } elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){
|
|
| 368 | 370 | $value = $cf['defaults']['default_value']; |
| 369 | 371 | } |
| 370 | 372 | ?> |
@@ -404,11 +406,11 @@ discard block |
||
| 404 | 406 | |
| 405 | 407 | echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);
|
| 406 | 408 | |
| 407 | - }else{
|
|
| 409 | + } else{
|
|
| 408 | 410 | $value = ''; |
| 409 | 411 | if (isset($field_info->show_in)) {
|
| 410 | 412 | $value = esc_attr($field_info->show_in); |
| 411 | - }elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){
|
|
| 413 | + } elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){
|
|
| 412 | 414 | $value = esc_attr($cf['defaults']['show_in']); |
| 413 | 415 | } |
| 414 | 416 | ?> |
@@ -448,7 +450,7 @@ discard block |
||
| 448 | 450 | |
| 449 | 451 | // don't show new tab option for some types |
| 450 | 452 | if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
| 451 | - }else{
|
|
| 453 | + } else{
|
|
| 452 | 454 | unset($show_in_locations['[owntab]']); |
| 453 | 455 | } |
| 454 | 456 | |
@@ -561,11 +563,11 @@ discard block |
||
| 561 | 563 | |
| 562 | 564 | echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);
|
| 563 | 565 | |
| 564 | - }else{
|
|
| 566 | + } else{
|
|
| 565 | 567 | $value = ''; |
| 566 | 568 | if (isset($field_info->is_required)) {
|
| 567 | 569 | $value = esc_attr($field_info->is_required); |
| 568 | - }elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){
|
|
| 570 | + } elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){
|
|
| 569 | 571 | $value = $cf['defaults']['is_required']; |
| 570 | 572 | } |
| 571 | 573 | ?> |
@@ -602,11 +604,11 @@ discard block |
||
| 602 | 604 | |
| 603 | 605 | echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);
|
| 604 | 606 | |
| 605 | - }else{
|
|
| 607 | + } else{
|
|
| 606 | 608 | $value = ''; |
| 607 | 609 | if (isset($field_info->required_msg)) {
|
| 608 | 610 | $value = esc_attr($field_info->required_msg); |
| 609 | - }elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){
|
|
| 611 | + } elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){
|
|
| 610 | 612 | $value = $cf['defaults']['required_msg']; |
| 611 | 613 | } |
| 612 | 614 | ?> |
@@ -647,11 +649,11 @@ discard block |
||
| 647 | 649 | |
| 648 | 650 | echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);
|
| 649 | 651 | |
| 650 | - }else{
|
|
| 652 | + } else{
|
|
| 651 | 653 | $value = ''; |
| 652 | 654 | if (isset($field_info->field_icon)) {
|
| 653 | 655 | $value = esc_attr($field_info->field_icon); |
| 654 | - }elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){
|
|
| 656 | + } elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){
|
|
| 655 | 657 | $value = $cf['defaults']['field_icon']; |
| 656 | 658 | } |
| 657 | 659 | ?> |
@@ -680,11 +682,11 @@ discard block |
||
| 680 | 682 | |
| 681 | 683 | echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);
|
| 682 | 684 | |
| 683 | - }else{
|
|
| 685 | + } else{
|
|
| 684 | 686 | $value = ''; |
| 685 | 687 | if (isset($field_info->css_class)) {
|
| 686 | 688 | $value = esc_attr($field_info->css_class); |
| 687 | - }elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){
|
|
| 689 | + } elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){
|
|
| 688 | 690 | $value = $cf['defaults']['css_class']; |
| 689 | 691 | } |
| 690 | 692 | ?> |
@@ -713,12 +715,12 @@ discard block |
||
| 713 | 715 | |
| 714 | 716 | echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);
|
| 715 | 717 | |
| 716 | - }else{
|
|
| 718 | + } else{
|
|
| 717 | 719 | $value = ''; |
| 718 | 720 | $hide_cat_sort =''; |
| 719 | 721 | if (isset($field_info->cat_sort)) {
|
| 720 | 722 | $value = esc_attr($field_info->cat_sort); |
| 721 | - }elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){
|
|
| 723 | + } elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){
|
|
| 722 | 724 | $value = $cf['defaults']['cat_sort']; |
| 723 | 725 | $hide_cat_sort = ($value===false) ? "style='display:none;'" : ''; |
| 724 | 726 | } |
@@ -10,52 +10,52 @@ discard block |
||
| 10 | 10 | global $wpdb, $table_prefix; |
| 11 | 11 | |
| 12 | 12 | if (!function_exists('geodir_column_exist')) {
|
| 13 | - /** |
|
| 14 | - * Check table column exist or not. |
|
| 15 | - * |
|
| 16 | - * @since 1.0.0 |
|
| 17 | - * @package GeoDirectory |
|
| 18 | - * @global object $wpdb WordPress Database object. |
|
| 19 | - * @param string $db The table name. |
|
| 20 | - * @param string $column The column name. |
|
| 21 | - * @return bool If column exists returns true. Otherwise false. |
|
| 22 | - */ |
|
| 23 | - function geodir_column_exist($db, $column) |
|
| 24 | - {
|
|
| 25 | - global $wpdb; |
|
| 26 | - $exists = false; |
|
| 27 | - $columns = $wpdb->get_col("show columns from $db");
|
|
| 28 | - foreach ($columns as $c) {
|
|
| 29 | - if ($c == $column) {
|
|
| 30 | - $exists = true; |
|
| 31 | - break; |
|
| 32 | - } |
|
| 33 | - } |
|
| 34 | - return $exists; |
|
| 35 | - } |
|
| 13 | + /** |
|
| 14 | + * Check table column exist or not. |
|
| 15 | + * |
|
| 16 | + * @since 1.0.0 |
|
| 17 | + * @package GeoDirectory |
|
| 18 | + * @global object $wpdb WordPress Database object. |
|
| 19 | + * @param string $db The table name. |
|
| 20 | + * @param string $column The column name. |
|
| 21 | + * @return bool If column exists returns true. Otherwise false. |
|
| 22 | + */ |
|
| 23 | + function geodir_column_exist($db, $column) |
|
| 24 | + {
|
|
| 25 | + global $wpdb; |
|
| 26 | + $exists = false; |
|
| 27 | + $columns = $wpdb->get_col("show columns from $db");
|
|
| 28 | + foreach ($columns as $c) {
|
|
| 29 | + if ($c == $column) {
|
|
| 30 | + $exists = true; |
|
| 31 | + break; |
|
| 32 | + } |
|
| 33 | + } |
|
| 34 | + return $exists; |
|
| 35 | + } |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | if (!function_exists('geodir_add_column_if_not_exist')) {
|
| 39 | - /** |
|
| 40 | - * Add column if table column not exist. |
|
| 41 | - * |
|
| 42 | - * @since 1.0.0 |
|
| 43 | - * @package GeoDirectory |
|
| 44 | - * @global object $wpdb WordPress Database object. |
|
| 45 | - * @param string $db The table name. |
|
| 46 | - * @param string $column The column name. |
|
| 47 | - * @param string $column_attr The column attributes. |
|
| 48 | - */ |
|
| 49 | - function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL") |
|
| 50 | - {
|
|
| 51 | - global $wpdb; |
|
| 52 | - $result = 0;// no rows affected |
|
| 53 | - if (!geodir_column_exist($db, $column)) {
|
|
| 54 | - if (!empty($db) && !empty($column)) |
|
| 55 | - $result = $wpdb->query("ALTER TABLE `$db` ADD `$column` $column_attr");
|
|
| 56 | - } |
|
| 57 | - return $result; |
|
| 58 | - } |
|
| 39 | + /** |
|
| 40 | + * Add column if table column not exist. |
|
| 41 | + * |
|
| 42 | + * @since 1.0.0 |
|
| 43 | + * @package GeoDirectory |
|
| 44 | + * @global object $wpdb WordPress Database object. |
|
| 45 | + * @param string $db The table name. |
|
| 46 | + * @param string $column The column name. |
|
| 47 | + * @param string $column_attr The column attributes. |
|
| 48 | + */ |
|
| 49 | + function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL") |
|
| 50 | + {
|
|
| 51 | + global $wpdb; |
|
| 52 | + $result = 0;// no rows affected |
|
| 53 | + if (!geodir_column_exist($db, $column)) {
|
|
| 54 | + if (!empty($db) && !empty($column)) |
|
| 55 | + $result = $wpdb->query("ALTER TABLE `$db` ADD `$column` $column_attr");
|
|
| 56 | + } |
|
| 57 | + return $result; |
|
| 58 | + } |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | /** |
@@ -72,716 +72,716 @@ discard block |
||
| 72 | 72 | */ |
| 73 | 73 | function geodir_post_custom_fields($package_id = '', $default = 'all', $post_type = 'gd_place', $fields_location = 'none') |
| 74 | 74 | {
|
| 75 | - global $wpdb, $geodir_post_custom_fields_cache; |
|
| 76 | - |
|
| 77 | - $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location; |
|
| 78 | - |
|
| 79 | - if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {
|
|
| 80 | - return $geodir_post_custom_fields_cache[$cache_stored]; |
|
| 81 | - } |
|
| 82 | - |
|
| 83 | - $default_query = ''; |
|
| 84 | - |
|
| 85 | - if ($default == 'default') |
|
| 86 | - $default_query .= " and is_admin IN ('1') ";
|
|
| 87 | - elseif ($default == 'custom') |
|
| 88 | - $default_query .= " and is_admin = '0' "; |
|
| 89 | - |
|
| 90 | - if ($fields_location == 'none') {
|
|
| 91 | - } else{
|
|
| 92 | - $fields_location = esc_sql( $fields_location ); |
|
| 93 | - $default_query .= " and show_in LIKE '%%[$fields_location]%%' "; |
|
| 94 | - } |
|
| 95 | - |
|
| 96 | - $post_meta_info = $wpdb->get_results( |
|
| 97 | - $wpdb->prepare( |
|
| 98 | - "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
|
|
| 99 | - array($post_type) |
|
| 100 | - ) |
|
| 101 | - ); |
|
| 102 | - |
|
| 103 | - |
|
| 104 | - $return_arr = array(); |
|
| 105 | - if ($post_meta_info) {
|
|
| 106 | - |
|
| 107 | - foreach ($post_meta_info as $post_meta_info_obj) {
|
|
| 108 | - |
|
| 109 | - $custom_fields = array( |
|
| 110 | - "name" => $post_meta_info_obj->htmlvar_name, |
|
| 111 | - "label" => $post_meta_info_obj->clabels, |
|
| 112 | - "default" => $post_meta_info_obj->default_value, |
|
| 113 | - "type" => $post_meta_info_obj->field_type, |
|
| 114 | - "desc" => $post_meta_info_obj->admin_desc); |
|
| 115 | - |
|
| 116 | - if ($post_meta_info_obj->field_type) {
|
|
| 117 | - $options = explode(',', $post_meta_info_obj->option_values);
|
|
| 118 | - $custom_fields["options"] = $options; |
|
| 119 | - } |
|
| 120 | - |
|
| 121 | - foreach ($post_meta_info_obj as $key => $val) {
|
|
| 122 | - $custom_fields[$key] = $val; |
|
| 123 | - } |
|
| 124 | - |
|
| 125 | - $pricearr = array(); |
|
| 126 | - $pricearr = explode(',', $post_meta_info_obj->packages);
|
|
| 127 | - |
|
| 128 | - if ($package_id != '' && in_array($package_id, $pricearr)) {
|
|
| 129 | - $return_arr[$post_meta_info_obj->sort_order] = $custom_fields; |
|
| 130 | - } elseif ($package_id == '') {
|
|
| 131 | - $return_arr[$post_meta_info_obj->sort_order] = $custom_fields; |
|
| 132 | - } |
|
| 133 | - } |
|
| 134 | - } |
|
| 135 | - $geodir_post_custom_fields_cache[$cache_stored] = $return_arr; |
|
| 136 | - |
|
| 137 | - if (has_filter('geodir_filter_geodir_post_custom_fields')) {
|
|
| 138 | - /** |
|
| 139 | - * Filter the post custom fields array. |
|
| 140 | - * |
|
| 141 | - * @since 1.0.0 |
|
| 142 | - * |
|
| 143 | - * @param array $return_arr Post custom fields array. |
|
| 144 | - * @param int|string $package_id The package ID. |
|
| 145 | - * @param string $post_type Optional. The wordpress post type. |
|
| 146 | - * @param string $fields_location Optional. Where exactly are you going to place this custom fields?. |
|
| 147 | - */ |
|
| 148 | - $return_arr = apply_filters('geodir_filter_geodir_post_custom_fields', $return_arr, $package_id, $post_type, $fields_location);
|
|
| 149 | - } |
|
| 150 | - |
|
| 151 | - return $return_arr; |
|
| 75 | + global $wpdb, $geodir_post_custom_fields_cache; |
|
| 76 | + |
|
| 77 | + $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location; |
|
| 78 | + |
|
| 79 | + if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {
|
|
| 80 | + return $geodir_post_custom_fields_cache[$cache_stored]; |
|
| 81 | + } |
|
| 82 | + |
|
| 83 | + $default_query = ''; |
|
| 84 | + |
|
| 85 | + if ($default == 'default') |
|
| 86 | + $default_query .= " and is_admin IN ('1') ";
|
|
| 87 | + elseif ($default == 'custom') |
|
| 88 | + $default_query .= " and is_admin = '0' "; |
|
| 89 | + |
|
| 90 | + if ($fields_location == 'none') {
|
|
| 91 | + } else{
|
|
| 92 | + $fields_location = esc_sql( $fields_location ); |
|
| 93 | + $default_query .= " and show_in LIKE '%%[$fields_location]%%' "; |
|
| 94 | + } |
|
| 95 | + |
|
| 96 | + $post_meta_info = $wpdb->get_results( |
|
| 97 | + $wpdb->prepare( |
|
| 98 | + "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
|
|
| 99 | + array($post_type) |
|
| 100 | + ) |
|
| 101 | + ); |
|
| 102 | + |
|
| 103 | + |
|
| 104 | + $return_arr = array(); |
|
| 105 | + if ($post_meta_info) {
|
|
| 106 | + |
|
| 107 | + foreach ($post_meta_info as $post_meta_info_obj) {
|
|
| 108 | + |
|
| 109 | + $custom_fields = array( |
|
| 110 | + "name" => $post_meta_info_obj->htmlvar_name, |
|
| 111 | + "label" => $post_meta_info_obj->clabels, |
|
| 112 | + "default" => $post_meta_info_obj->default_value, |
|
| 113 | + "type" => $post_meta_info_obj->field_type, |
|
| 114 | + "desc" => $post_meta_info_obj->admin_desc); |
|
| 115 | + |
|
| 116 | + if ($post_meta_info_obj->field_type) {
|
|
| 117 | + $options = explode(',', $post_meta_info_obj->option_values);
|
|
| 118 | + $custom_fields["options"] = $options; |
|
| 119 | + } |
|
| 120 | + |
|
| 121 | + foreach ($post_meta_info_obj as $key => $val) {
|
|
| 122 | + $custom_fields[$key] = $val; |
|
| 123 | + } |
|
| 124 | + |
|
| 125 | + $pricearr = array(); |
|
| 126 | + $pricearr = explode(',', $post_meta_info_obj->packages);
|
|
| 127 | + |
|
| 128 | + if ($package_id != '' && in_array($package_id, $pricearr)) {
|
|
| 129 | + $return_arr[$post_meta_info_obj->sort_order] = $custom_fields; |
|
| 130 | + } elseif ($package_id == '') {
|
|
| 131 | + $return_arr[$post_meta_info_obj->sort_order] = $custom_fields; |
|
| 132 | + } |
|
| 133 | + } |
|
| 134 | + } |
|
| 135 | + $geodir_post_custom_fields_cache[$cache_stored] = $return_arr; |
|
| 136 | + |
|
| 137 | + if (has_filter('geodir_filter_geodir_post_custom_fields')) {
|
|
| 138 | + /** |
|
| 139 | + * Filter the post custom fields array. |
|
| 140 | + * |
|
| 141 | + * @since 1.0.0 |
|
| 142 | + * |
|
| 143 | + * @param array $return_arr Post custom fields array. |
|
| 144 | + * @param int|string $package_id The package ID. |
|
| 145 | + * @param string $post_type Optional. The wordpress post type. |
|
| 146 | + * @param string $fields_location Optional. Where exactly are you going to place this custom fields?. |
|
| 147 | + */ |
|
| 148 | + $return_arr = apply_filters('geodir_filter_geodir_post_custom_fields', $return_arr, $package_id, $post_type, $fields_location);
|
|
| 149 | + } |
|
| 150 | + |
|
| 151 | + return $return_arr; |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | - /** |
|
| 155 | - * Adds admin html for custom fields. |
|
| 156 | - * |
|
| 157 | - * @since 1.0.0 |
|
| 158 | - * @package GeoDirectory |
|
| 159 | - * @global object $wpdb WordPress Database object. |
|
| 160 | - * @param string $field_type The form field type. |
|
| 161 | - * @param object|int $result_str The custom field results object or row id. |
|
| 162 | - * @param string $field_ins_upd When set to "submit" displays form. |
|
| 163 | - * @param string $field_type_key The key of the custom field. |
|
| 164 | - */ |
|
| 165 | - function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='') |
|
| 166 | - {
|
|
| 167 | - global $wpdb; |
|
| 168 | - $cf = $result_str; |
|
| 169 | - if (!is_object($cf)) {
|
|
| 170 | - |
|
| 171 | - $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));
|
|
| 172 | - |
|
| 173 | - } else {
|
|
| 174 | - $field_info = $cf; |
|
| 175 | - $result_str = $cf->id; |
|
| 176 | - } |
|
| 177 | - /** |
|
| 178 | - * Contains custom field html. |
|
| 179 | - * |
|
| 180 | - * @since 1.0.0 |
|
| 181 | - */ |
|
| 182 | - include('custom_field_html.php');
|
|
| 183 | - |
|
| 184 | - } |
|
| 154 | + /** |
|
| 155 | + * Adds admin html for custom fields. |
|
| 156 | + * |
|
| 157 | + * @since 1.0.0 |
|
| 158 | + * @package GeoDirectory |
|
| 159 | + * @global object $wpdb WordPress Database object. |
|
| 160 | + * @param string $field_type The form field type. |
|
| 161 | + * @param object|int $result_str The custom field results object or row id. |
|
| 162 | + * @param string $field_ins_upd When set to "submit" displays form. |
|
| 163 | + * @param string $field_type_key The key of the custom field. |
|
| 164 | + */ |
|
| 165 | + function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='') |
|
| 166 | + {
|
|
| 167 | + global $wpdb; |
|
| 168 | + $cf = $result_str; |
|
| 169 | + if (!is_object($cf)) {
|
|
| 170 | + |
|
| 171 | + $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));
|
|
| 172 | + |
|
| 173 | + } else {
|
|
| 174 | + $field_info = $cf; |
|
| 175 | + $result_str = $cf->id; |
|
| 176 | + } |
|
| 177 | + /** |
|
| 178 | + * Contains custom field html. |
|
| 179 | + * |
|
| 180 | + * @since 1.0.0 |
|
| 181 | + */ |
|
| 182 | + include('custom_field_html.php');
|
|
| 183 | + |
|
| 184 | + } |
|
| 185 | 185 | |
| 186 | 186 | |
| 187 | 187 | if (!function_exists('geodir_custom_field_delete')) {
|
| 188 | - /** |
|
| 189 | - * Delete custom field using field id. |
|
| 190 | - * |
|
| 191 | - * @since 1.0.0 |
|
| 192 | - * @since 1.5.7 Delete field from sorting fields table when custom field deleted. |
|
| 193 | - * @package GeoDirectory |
|
| 194 | - * @global object $wpdb WordPress Database object. |
|
| 195 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 196 | - * @param string $field_id The custom field ID. |
|
| 197 | - * @return int|string If field deleted successfully, returns field id. Otherwise returns 0. |
|
| 198 | - */ |
|
| 199 | - function geodir_custom_field_delete($field_id = '') {
|
|
| 200 | - global $wpdb, $plugin_prefix; |
|
| 201 | - |
|
| 202 | - if ($field_id != '') {
|
|
| 203 | - $cf = trim($field_id, '_'); |
|
| 204 | - |
|
| 205 | - if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {
|
|
| 206 | - $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));
|
|
| 207 | - |
|
| 208 | - $post_type = $field->post_type; |
|
| 209 | - $htmlvar_name = $field->htmlvar_name; |
|
| 210 | - |
|
| 211 | - if ($post_type != '' && $htmlvar_name != '') {
|
|
| 212 | - $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
|
|
| 213 | - } |
|
| 214 | - |
|
| 215 | - /** |
|
| 216 | - * Called after a custom field is deleted. |
|
| 217 | - * |
|
| 218 | - * @since 1.0.0 |
|
| 219 | - * @param string $cf The fields ID. |
|
| 220 | - * @param string $field->htmlvar_name The html variable name for the field. |
|
| 221 | - * @param string $post_type The post type the field belongs to. |
|
| 222 | - */ |
|
| 223 | - do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);
|
|
| 224 | - |
|
| 225 | - if ($field->field_type == 'address') {
|
|
| 226 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");
|
|
| 227 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");
|
|
| 228 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");
|
|
| 229 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");
|
|
| 230 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");
|
|
| 231 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");
|
|
| 232 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");
|
|
| 233 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");
|
|
| 234 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");
|
|
| 235 | - } else {
|
|
| 236 | - if ($field->field_type != 'fieldset') {
|
|
| 237 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");
|
|
| 238 | - } |
|
| 239 | - } |
|
| 240 | - |
|
| 241 | - return $field_id; |
|
| 242 | - } else |
|
| 243 | - return 0; |
|
| 244 | - } else |
|
| 245 | - return 0; |
|
| 246 | - } |
|
| 188 | + /** |
|
| 189 | + * Delete custom field using field id. |
|
| 190 | + * |
|
| 191 | + * @since 1.0.0 |
|
| 192 | + * @since 1.5.7 Delete field from sorting fields table when custom field deleted. |
|
| 193 | + * @package GeoDirectory |
|
| 194 | + * @global object $wpdb WordPress Database object. |
|
| 195 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 196 | + * @param string $field_id The custom field ID. |
|
| 197 | + * @return int|string If field deleted successfully, returns field id. Otherwise returns 0. |
|
| 198 | + */ |
|
| 199 | + function geodir_custom_field_delete($field_id = '') {
|
|
| 200 | + global $wpdb, $plugin_prefix; |
|
| 201 | + |
|
| 202 | + if ($field_id != '') {
|
|
| 203 | + $cf = trim($field_id, '_'); |
|
| 204 | + |
|
| 205 | + if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {
|
|
| 206 | + $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));
|
|
| 207 | + |
|
| 208 | + $post_type = $field->post_type; |
|
| 209 | + $htmlvar_name = $field->htmlvar_name; |
|
| 210 | + |
|
| 211 | + if ($post_type != '' && $htmlvar_name != '') {
|
|
| 212 | + $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
|
|
| 213 | + } |
|
| 214 | + |
|
| 215 | + /** |
|
| 216 | + * Called after a custom field is deleted. |
|
| 217 | + * |
|
| 218 | + * @since 1.0.0 |
|
| 219 | + * @param string $cf The fields ID. |
|
| 220 | + * @param string $field->htmlvar_name The html variable name for the field. |
|
| 221 | + * @param string $post_type The post type the field belongs to. |
|
| 222 | + */ |
|
| 223 | + do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);
|
|
| 224 | + |
|
| 225 | + if ($field->field_type == 'address') {
|
|
| 226 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");
|
|
| 227 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");
|
|
| 228 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");
|
|
| 229 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");
|
|
| 230 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");
|
|
| 231 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");
|
|
| 232 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");
|
|
| 233 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");
|
|
| 234 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");
|
|
| 235 | + } else {
|
|
| 236 | + if ($field->field_type != 'fieldset') {
|
|
| 237 | + $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");
|
|
| 238 | + } |
|
| 239 | + } |
|
| 240 | + |
|
| 241 | + return $field_id; |
|
| 242 | + } else |
|
| 243 | + return 0; |
|
| 244 | + } else |
|
| 245 | + return 0; |
|
| 246 | + } |
|
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | if (!function_exists('geodir_custom_field_save')) {
|
| 250 | - /** |
|
| 251 | - * Save or Update custom fields into the database. |
|
| 252 | - * |
|
| 253 | - * @since 1.0.0 |
|
| 254 | - * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt. |
|
| 255 | - * @package GeoDirectory |
|
| 256 | - * @global object $wpdb WordPress Database object. |
|
| 257 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 258 | - * @param array $request_field {
|
|
| 259 | - * Attributes of the request field array. |
|
| 260 | - * |
|
| 261 | - * @type string $action Ajax Action name. Default "geodir_ajax_action". |
|
| 262 | - * @type string $manage_field_type Field type Default "custom_fields". |
|
| 263 | - * @type string $create_field Create field Default "true". |
|
| 264 | - * @type string $field_ins_upd Field ins upd Default "submit". |
|
| 265 | - * @type string $_wpnonce WP nonce value. |
|
| 266 | - * @type string $listing_type Listing type Example "gd_place". |
|
| 267 | - * @type string $field_type Field type Example "radio". |
|
| 268 | - * @type string $field_id Field id Example "12". |
|
| 269 | - * @type string $data_type Data type Example "VARCHAR". |
|
| 270 | - * @type string $is_active Either "1" or "0". If "0" is used then the field will not be displayed anywhere. |
|
| 271 | - * @type array $show_on_pkg Package list to display this field. |
|
| 272 | - * @type string $admin_title Personal comment, it would not be displayed anywhere except in custom field settings. |
|
| 273 | - * @type string $site_title Section title which you wish to display in frontend. |
|
| 274 | - * @type string $admin_desc Section description which will appear in frontend. |
|
| 275 | - * @type string $htmlvar_name Html variable name. This should be a unique name. |
|
| 276 | - * @type string $clabels Section Title which will appear in backend. |
|
| 277 | - * @type string $default_value The default value (for "link" this will be used as the link text). |
|
| 278 | - * @type string $sort_order The display order of this field in backend. e.g. 5. |
|
| 279 | - * @type string $is_default Either "1" or "0". If "0" is used then the field will be displayed as main form field or additional field. |
|
| 280 | - * @type string $for_admin_use Either "1" or "0". If "0" is used then only site admin can edit this field. |
|
| 281 | - * @type string $is_required Use "1" to set field as required. |
|
| 282 | - * @type string $required_msg Enter text for error message if field required and have not full fill requirement. |
|
| 283 | - * @type string $show_on_listing Want to show this on listing page?. |
|
| 284 | - * @type string $show_in What locations to show the custom field in. |
|
| 285 | - * @type string $show_on_detail Want to show this in More Info tab on detail page?. |
|
| 286 | - * @type string $show_as_tab Want to display this as a tab on detail page? If "1" then "Show on detail page?" must be Yes. |
|
| 287 | - * @type string $option_values Option Values should be separated by comma. |
|
| 288 | - * @type string $field_icon Upload icon using media and enter its url path, or enter font awesome class. |
|
| 289 | - * @type string $css_class Enter custom css class for field custom style. |
|
| 290 | - * @type array $extra_fields An array of extra fields to store. |
|
| 291 | - * |
|
| 292 | - * } |
|
| 293 | - * @param bool $default Not yet implemented. |
|
| 294 | - * @return int|string If field is unique returns inserted row id. Otherwise returns error string. |
|
| 295 | - */ |
|
| 296 | - function geodir_custom_field_save($request_field = array(), $default = false) |
|
| 297 | - {
|
|
| 298 | - |
|
| 299 | - global $wpdb, $plugin_prefix; |
|
| 300 | - |
|
| 301 | - $old_html_variable = ''; |
|
| 302 | - |
|
| 303 | - $data_type = trim($request_field['data_type']); |
|
| 304 | - |
|
| 305 | - $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : ''; |
|
| 306 | - |
|
| 307 | - // some servers fail if a POST value is VARCHAR so we change it. |
|
| 308 | - if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){
|
|
| 309 | - $request_field['data_type'] = 'VARCHAR'; |
|
| 310 | - } |
|
| 311 | - |
|
| 312 | - $cf = trim($result_str, '_'); |
|
| 313 | - |
|
| 314 | - |
|
| 315 | - /*-------- check duplicate validation --------*/ |
|
| 316 | - |
|
| 317 | - $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; |
|
| 318 | - $post_type = $request_field['listing_type']; |
|
| 319 | - |
|
| 320 | - if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {
|
|
| 321 | - $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name; |
|
| 322 | - } |
|
| 323 | - |
|
| 324 | - $check_html_variable = $wpdb->get_var( |
|
| 325 | - $wpdb->prepare( |
|
| 326 | - "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ", |
|
| 327 | - array($cf, $cehhtmlvar_name, $post_type) |
|
| 328 | - ) |
|
| 329 | - ); |
|
| 330 | - |
|
| 331 | - |
|
| 332 | - if (!$check_html_variable || $request_field['field_type'] == 'fieldset') {
|
|
| 333 | - |
|
| 334 | - if ($cf != '') {
|
|
| 335 | - |
|
| 336 | - $post_meta_info = $wpdb->get_row( |
|
| 337 | - $wpdb->prepare( |
|
| 338 | - "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d", |
|
| 339 | - array($cf) |
|
| 340 | - ) |
|
| 341 | - ); |
|
| 342 | - |
|
| 343 | - } |
|
| 344 | - |
|
| 345 | - if (!empty($post_meta_info)) {
|
|
| 346 | - $post_val = $post_meta_info; |
|
| 347 | - $old_html_variable = $post_val->htmlvar_name; |
|
| 348 | - |
|
| 349 | - } |
|
| 350 | - |
|
| 351 | - |
|
| 352 | - |
|
| 353 | - if ($post_type == '') $post_type = 'gd_place'; |
|
| 354 | - |
|
| 355 | - |
|
| 356 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 357 | - |
|
| 358 | - $admin_title = $request_field['admin_title']; |
|
| 359 | - $site_title = $request_field['site_title']; |
|
| 360 | - $data_type = $request_field['data_type']; |
|
| 361 | - $field_type = $request_field['field_type']; |
|
| 362 | - $field_type_key = isset($request_field['field_type_key']) ? $request_field['field_type_key'] : $field_type; |
|
| 363 | - $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; |
|
| 364 | - $admin_desc = $request_field['admin_desc']; |
|
| 365 | - $clabels = isset($request_field['clabels']) ? $request_field['clabels'] : ''; |
|
| 366 | - $default_value = isset($request_field['default_value']) ? $request_field['default_value'] : ''; |
|
| 367 | - $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : ''; |
|
| 368 | - $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : ''; |
|
| 369 | - $is_required = isset($request_field['is_required']) ? $request_field['is_required'] : ''; |
|
| 370 | - $required_msg = isset($request_field['required_msg']) ? $request_field['required_msg'] : ''; |
|
| 371 | - $css_class = isset($request_field['css_class']) ? $request_field['css_class'] : ''; |
|
| 372 | - $field_icon = isset($request_field['field_icon']) ? $request_field['field_icon'] : ''; |
|
| 373 | - $show_on_listing = isset($request_field['show_on_listing']) ? $request_field['show_on_listing'] : ''; |
|
| 374 | - $show_in = isset($request_field['show_in']) ? $request_field['show_in'] : ''; |
|
| 375 | - $show_on_detail = isset($request_field['show_on_detail']) ? $request_field['show_on_detail'] : ''; |
|
| 376 | - $show_as_tab = isset($request_field['show_as_tab']) ? $request_field['show_as_tab'] : ''; |
|
| 377 | - $decimal_point = isset($request_field['decimal_point']) ? trim($request_field['decimal_point']) : ''; // decimal point for DECIMAL data type |
|
| 378 | - $decimal_point = $decimal_point > 0 ? ($decimal_point > 10 ? 10 : $decimal_point) : ''; |
|
| 379 | - $validation_pattern = isset($request_field['validation_pattern']) ? $request_field['validation_pattern'] : ''; |
|
| 380 | - $validation_msg = isset($request_field['validation_msg']) ? $request_field['validation_msg'] : ''; |
|
| 381 | - $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : ''; |
|
| 250 | + /** |
|
| 251 | + * Save or Update custom fields into the database. |
|
| 252 | + * |
|
| 253 | + * @since 1.0.0 |
|
| 254 | + * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt. |
|
| 255 | + * @package GeoDirectory |
|
| 256 | + * @global object $wpdb WordPress Database object. |
|
| 257 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 258 | + * @param array $request_field {
|
|
| 259 | + * Attributes of the request field array. |
|
| 260 | + * |
|
| 261 | + * @type string $action Ajax Action name. Default "geodir_ajax_action". |
|
| 262 | + * @type string $manage_field_type Field type Default "custom_fields". |
|
| 263 | + * @type string $create_field Create field Default "true". |
|
| 264 | + * @type string $field_ins_upd Field ins upd Default "submit". |
|
| 265 | + * @type string $_wpnonce WP nonce value. |
|
| 266 | + * @type string $listing_type Listing type Example "gd_place". |
|
| 267 | + * @type string $field_type Field type Example "radio". |
|
| 268 | + * @type string $field_id Field id Example "12". |
|
| 269 | + * @type string $data_type Data type Example "VARCHAR". |
|
| 270 | + * @type string $is_active Either "1" or "0". If "0" is used then the field will not be displayed anywhere. |
|
| 271 | + * @type array $show_on_pkg Package list to display this field. |
|
| 272 | + * @type string $admin_title Personal comment, it would not be displayed anywhere except in custom field settings. |
|
| 273 | + * @type string $site_title Section title which you wish to display in frontend. |
|
| 274 | + * @type string $admin_desc Section description which will appear in frontend. |
|
| 275 | + * @type string $htmlvar_name Html variable name. This should be a unique name. |
|
| 276 | + * @type string $clabels Section Title which will appear in backend. |
|
| 277 | + * @type string $default_value The default value (for "link" this will be used as the link text). |
|
| 278 | + * @type string $sort_order The display order of this field in backend. e.g. 5. |
|
| 279 | + * @type string $is_default Either "1" or "0". If "0" is used then the field will be displayed as main form field or additional field. |
|
| 280 | + * @type string $for_admin_use Either "1" or "0". If "0" is used then only site admin can edit this field. |
|
| 281 | + * @type string $is_required Use "1" to set field as required. |
|
| 282 | + * @type string $required_msg Enter text for error message if field required and have not full fill requirement. |
|
| 283 | + * @type string $show_on_listing Want to show this on listing page?. |
|
| 284 | + * @type string $show_in What locations to show the custom field in. |
|
| 285 | + * @type string $show_on_detail Want to show this in More Info tab on detail page?. |
|
| 286 | + * @type string $show_as_tab Want to display this as a tab on detail page? If "1" then "Show on detail page?" must be Yes. |
|
| 287 | + * @type string $option_values Option Values should be separated by comma. |
|
| 288 | + * @type string $field_icon Upload icon using media and enter its url path, or enter font awesome class. |
|
| 289 | + * @type string $css_class Enter custom css class for field custom style. |
|
| 290 | + * @type array $extra_fields An array of extra fields to store. |
|
| 291 | + * |
|
| 292 | + * } |
|
| 293 | + * @param bool $default Not yet implemented. |
|
| 294 | + * @return int|string If field is unique returns inserted row id. Otherwise returns error string. |
|
| 295 | + */ |
|
| 296 | + function geodir_custom_field_save($request_field = array(), $default = false) |
|
| 297 | + {
|
|
| 298 | + |
|
| 299 | + global $wpdb, $plugin_prefix; |
|
| 300 | + |
|
| 301 | + $old_html_variable = ''; |
|
| 302 | + |
|
| 303 | + $data_type = trim($request_field['data_type']); |
|
| 304 | + |
|
| 305 | + $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : ''; |
|
| 306 | + |
|
| 307 | + // some servers fail if a POST value is VARCHAR so we change it. |
|
| 308 | + if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){
|
|
| 309 | + $request_field['data_type'] = 'VARCHAR'; |
|
| 310 | + } |
|
| 311 | + |
|
| 312 | + $cf = trim($result_str, '_'); |
|
| 313 | + |
|
| 314 | + |
|
| 315 | + /*-------- check duplicate validation --------*/ |
|
| 316 | + |
|
| 317 | + $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; |
|
| 318 | + $post_type = $request_field['listing_type']; |
|
| 319 | + |
|
| 320 | + if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {
|
|
| 321 | + $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name; |
|
| 322 | + } |
|
| 323 | + |
|
| 324 | + $check_html_variable = $wpdb->get_var( |
|
| 325 | + $wpdb->prepare( |
|
| 326 | + "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ", |
|
| 327 | + array($cf, $cehhtmlvar_name, $post_type) |
|
| 328 | + ) |
|
| 329 | + ); |
|
| 330 | + |
|
| 331 | + |
|
| 332 | + if (!$check_html_variable || $request_field['field_type'] == 'fieldset') {
|
|
| 333 | + |
|
| 334 | + if ($cf != '') {
|
|
| 335 | + |
|
| 336 | + $post_meta_info = $wpdb->get_row( |
|
| 337 | + $wpdb->prepare( |
|
| 338 | + "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d", |
|
| 339 | + array($cf) |
|
| 340 | + ) |
|
| 341 | + ); |
|
| 342 | + |
|
| 343 | + } |
|
| 344 | + |
|
| 345 | + if (!empty($post_meta_info)) {
|
|
| 346 | + $post_val = $post_meta_info; |
|
| 347 | + $old_html_variable = $post_val->htmlvar_name; |
|
| 348 | + |
|
| 349 | + } |
|
| 350 | + |
|
| 351 | + |
|
| 352 | + |
|
| 353 | + if ($post_type == '') $post_type = 'gd_place'; |
|
| 354 | + |
|
| 355 | + |
|
| 356 | + $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 357 | + |
|
| 358 | + $admin_title = $request_field['admin_title']; |
|
| 359 | + $site_title = $request_field['site_title']; |
|
| 360 | + $data_type = $request_field['data_type']; |
|
| 361 | + $field_type = $request_field['field_type']; |
|
| 362 | + $field_type_key = isset($request_field['field_type_key']) ? $request_field['field_type_key'] : $field_type; |
|
| 363 | + $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; |
|
| 364 | + $admin_desc = $request_field['admin_desc']; |
|
| 365 | + $clabels = isset($request_field['clabels']) ? $request_field['clabels'] : ''; |
|
| 366 | + $default_value = isset($request_field['default_value']) ? $request_field['default_value'] : ''; |
|
| 367 | + $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : ''; |
|
| 368 | + $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : ''; |
|
| 369 | + $is_required = isset($request_field['is_required']) ? $request_field['is_required'] : ''; |
|
| 370 | + $required_msg = isset($request_field['required_msg']) ? $request_field['required_msg'] : ''; |
|
| 371 | + $css_class = isset($request_field['css_class']) ? $request_field['css_class'] : ''; |
|
| 372 | + $field_icon = isset($request_field['field_icon']) ? $request_field['field_icon'] : ''; |
|
| 373 | + $show_on_listing = isset($request_field['show_on_listing']) ? $request_field['show_on_listing'] : ''; |
|
| 374 | + $show_in = isset($request_field['show_in']) ? $request_field['show_in'] : ''; |
|
| 375 | + $show_on_detail = isset($request_field['show_on_detail']) ? $request_field['show_on_detail'] : ''; |
|
| 376 | + $show_as_tab = isset($request_field['show_as_tab']) ? $request_field['show_as_tab'] : ''; |
|
| 377 | + $decimal_point = isset($request_field['decimal_point']) ? trim($request_field['decimal_point']) : ''; // decimal point for DECIMAL data type |
|
| 378 | + $decimal_point = $decimal_point > 0 ? ($decimal_point > 10 ? 10 : $decimal_point) : ''; |
|
| 379 | + $validation_pattern = isset($request_field['validation_pattern']) ? $request_field['validation_pattern'] : ''; |
|
| 380 | + $validation_msg = isset($request_field['validation_msg']) ? $request_field['validation_msg'] : ''; |
|
| 381 | + $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : ''; |
|
| 382 | 382 | |
| 383 | 383 | |
| 384 | - if(is_array($show_in)){
|
|
| 385 | - $show_in = implode(",", $request_field['show_in']);
|
|
| 386 | - } |
|
| 384 | + if(is_array($show_in)){
|
|
| 385 | + $show_in = implode(",", $request_field['show_in']);
|
|
| 386 | + } |
|
| 387 | 387 | |
| 388 | - if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {
|
|
| 389 | - $htmlvar_name = 'geodir_' . $htmlvar_name; |
|
| 390 | - } |
|
| 388 | + if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {
|
|
| 389 | + $htmlvar_name = 'geodir_' . $htmlvar_name; |
|
| 390 | + } |
|
| 391 | 391 | |
| 392 | - $option_values = ''; |
|
| 393 | - if (isset($request_field['option_values'])) |
|
| 394 | - $option_values = $request_field['option_values']; |
|
| 392 | + $option_values = ''; |
|
| 393 | + if (isset($request_field['option_values'])) |
|
| 394 | + $option_values = $request_field['option_values']; |
|
| 395 | 395 | |
| 396 | - $cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0'; |
|
| 396 | + $cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0'; |
|
| 397 | 397 | |
| 398 | - $cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0'; |
|
| 398 | + $cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0'; |
|
| 399 | 399 | |
| 400 | - if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg'])) |
|
| 401 | - $price_pkg = implode(",", $request_field['show_on_pkg']);
|
|
| 402 | - else {
|
|
| 403 | - $package_info = array(); |
|
| 400 | + if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg'])) |
|
| 401 | + $price_pkg = implode(",", $request_field['show_on_pkg']);
|
|
| 402 | + else {
|
|
| 403 | + $package_info = array(); |
|
| 404 | 404 | |
| 405 | - $package_info = geodir_post_package_info($package_info, '', $post_type); |
|
| 406 | - $price_pkg = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 407 | - } |
|
| 405 | + $package_info = geodir_post_package_info($package_info, '', $post_type); |
|
| 406 | + $price_pkg = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 407 | + } |
|
| 408 | 408 | |
| 409 | 409 | |
| 410 | - if (isset($request_field['extra']) && !empty($request_field['extra'])) |
|
| 411 | - $extra_fields = $request_field['extra']; |
|
| 410 | + if (isset($request_field['extra']) && !empty($request_field['extra'])) |
|
| 411 | + $extra_fields = $request_field['extra']; |
|
| 412 | 412 | |
| 413 | - if (isset($request_field['is_default']) && $request_field['is_default'] != '') |
|
| 414 | - $is_default = $request_field['is_default']; |
|
| 415 | - else |
|
| 416 | - $is_default = '0'; |
|
| 413 | + if (isset($request_field['is_default']) && $request_field['is_default'] != '') |
|
| 414 | + $is_default = $request_field['is_default']; |
|
| 415 | + else |
|
| 416 | + $is_default = '0'; |
|
| 417 | 417 | |
| 418 | - if (isset($request_field['is_admin']) && $request_field['is_admin'] != '') |
|
| 419 | - $is_admin = $request_field['is_admin']; |
|
| 420 | - else |
|
| 421 | - $is_admin = '0'; |
|
| 418 | + if (isset($request_field['is_admin']) && $request_field['is_admin'] != '') |
|
| 419 | + $is_admin = $request_field['is_admin']; |
|
| 420 | + else |
|
| 421 | + $is_admin = '0'; |
|
| 422 | 422 | |
| 423 | 423 | |
| 424 | - if ($is_active == '') $is_active = 1; |
|
| 425 | - if ($is_required == '') $is_required = 0; |
|
| 424 | + if ($is_active == '') $is_active = 1; |
|
| 425 | + if ($is_required == '') $is_required = 0; |
|
| 426 | 426 | |
| 427 | 427 | |
| 428 | - if ($sort_order == '') {
|
|
| 428 | + if ($sort_order == '') {
|
|
| 429 | 429 | |
| 430 | - $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);
|
|
| 430 | + $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);
|
|
| 431 | 431 | |
| 432 | - $sort_order = (int)$last_order + 1; |
|
| 433 | - } |
|
| 432 | + $sort_order = (int)$last_order + 1; |
|
| 433 | + } |
|
| 434 | 434 | |
| 435 | - $default_value_add = ''; |
|
| 435 | + $default_value_add = ''; |
|
| 436 | 436 | |
| 437 | 437 | |
| 438 | - if (!empty($post_meta_info)) {
|
|
| 439 | - switch ($field_type): |
|
| 438 | + if (!empty($post_meta_info)) {
|
|
| 439 | + switch ($field_type): |
|
| 440 | 440 | |
| 441 | - case 'address': |
|
| 441 | + case 'address': |
|
| 442 | 442 | |
| 443 | - if ($htmlvar_name != '') {
|
|
| 444 | - $prefix = $htmlvar_name . '_'; |
|
| 445 | - } |
|
| 446 | - $old_prefix = $old_html_variable . '_'; |
|
| 443 | + if ($htmlvar_name != '') {
|
|
| 444 | + $prefix = $htmlvar_name . '_'; |
|
| 445 | + } |
|
| 446 | + $old_prefix = $old_html_variable . '_'; |
|
| 447 | 447 | |
| 448 | 448 | |
| 449 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL"; |
|
| 449 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL"; |
|
| 450 | 450 | |
| 451 | - if ($default_value != '') {
|
|
| 452 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 453 | - } |
|
| 451 | + if ($default_value != '') {
|
|
| 452 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 453 | + } |
|
| 454 | 454 | |
| 455 | - $wpdb->query($meta_field_add); |
|
| 455 | + $wpdb->query($meta_field_add); |
|
| 456 | 456 | |
| 457 | - if ($extra_fields != '') {
|
|
| 457 | + if ($extra_fields != '') {
|
|
| 458 | 458 | |
| 459 | - if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
|
|
| 459 | + if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
|
|
| 460 | 460 | |
| 461 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");
|
|
| 462 | - if ($is_column) {
|
|
| 463 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL"; |
|
| 461 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");
|
|
| 462 | + if ($is_column) {
|
|
| 463 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL"; |
|
| 464 | 464 | |
| 465 | - if ($default_value != '') {
|
|
| 466 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 467 | - } |
|
| 465 | + if ($default_value != '') {
|
|
| 466 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 467 | + } |
|
| 468 | 468 | |
| 469 | - $wpdb->query($meta_field_add); |
|
| 470 | - } else {
|
|
| 469 | + $wpdb->query($meta_field_add); |
|
| 470 | + } else {
|
|
| 471 | 471 | |
| 472 | - $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 473 | - if ($default_value != '') {
|
|
| 474 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 475 | - } |
|
| 476 | - geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add); |
|
| 472 | + $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 473 | + if ($default_value != '') {
|
|
| 474 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 475 | + } |
|
| 476 | + geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add); |
|
| 477 | 477 | |
| 478 | - } |
|
| 478 | + } |
|
| 479 | 479 | |
| 480 | 480 | |
| 481 | - } |
|
| 481 | + } |
|
| 482 | 482 | |
| 483 | 483 | |
| 484 | - if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
|
|
| 484 | + if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
|
|
| 485 | 485 | |
| 486 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");
|
|
| 486 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");
|
|
| 487 | 487 | |
| 488 | - if ($is_column) {
|
|
| 489 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL"; |
|
| 488 | + if ($is_column) {
|
|
| 489 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL"; |
|
| 490 | 490 | |
| 491 | - if ($default_value != '') {
|
|
| 492 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 493 | - } |
|
| 491 | + if ($default_value != '') {
|
|
| 492 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 493 | + } |
|
| 494 | 494 | |
| 495 | - $wpdb->query($meta_field_add); |
|
| 496 | - } else {
|
|
| 497 | - $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 498 | - if ($default_value != '') {
|
|
| 499 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 500 | - } |
|
| 495 | + $wpdb->query($meta_field_add); |
|
| 496 | + } else {
|
|
| 497 | + $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 498 | + if ($default_value != '') {
|
|
| 499 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 500 | + } |
|
| 501 | 501 | |
| 502 | - geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add); |
|
| 503 | - } |
|
| 502 | + geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add); |
|
| 503 | + } |
|
| 504 | 504 | |
| 505 | - } |
|
| 506 | - if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
|
|
| 505 | + } |
|
| 506 | + if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
|
|
| 507 | 507 | |
| 508 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");
|
|
| 508 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");
|
|
| 509 | 509 | |
| 510 | - if ($is_column) {
|
|
| 510 | + if ($is_column) {
|
|
| 511 | 511 | |
| 512 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL"; |
|
| 512 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL"; |
|
| 513 | 513 | |
| 514 | - if ($default_value != '') {
|
|
| 515 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 516 | - } |
|
| 514 | + if ($default_value != '') {
|
|
| 515 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 516 | + } |
|
| 517 | 517 | |
| 518 | - $wpdb->query($meta_field_add); |
|
| 519 | - } else {
|
|
| 518 | + $wpdb->query($meta_field_add); |
|
| 519 | + } else {
|
|
| 520 | 520 | |
| 521 | - $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 522 | - if ($default_value != '') {
|
|
| 523 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 524 | - } |
|
| 521 | + $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 522 | + if ($default_value != '') {
|
|
| 523 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 524 | + } |
|
| 525 | 525 | |
| 526 | - geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add); |
|
| 526 | + geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add); |
|
| 527 | 527 | |
| 528 | - } |
|
| 528 | + } |
|
| 529 | 529 | |
| 530 | - } |
|
| 531 | - if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
|
|
| 530 | + } |
|
| 531 | + if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
|
|
| 532 | 532 | |
| 533 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");
|
|
| 533 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");
|
|
| 534 | 534 | |
| 535 | - if ($is_column) {
|
|
| 535 | + if ($is_column) {
|
|
| 536 | 536 | |
| 537 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL"; |
|
| 537 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL"; |
|
| 538 | 538 | |
| 539 | - if ($default_value != '') {
|
|
| 540 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 541 | - } |
|
| 539 | + if ($default_value != '') {
|
|
| 540 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 541 | + } |
|
| 542 | 542 | |
| 543 | - $wpdb->query($meta_field_add); |
|
| 544 | - } else {
|
|
| 543 | + $wpdb->query($meta_field_add); |
|
| 544 | + } else {
|
|
| 545 | 545 | |
| 546 | - $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 547 | - if ($default_value != '') {
|
|
| 548 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 549 | - } |
|
| 546 | + $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 547 | + if ($default_value != '') {
|
|
| 548 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 549 | + } |
|
| 550 | 550 | |
| 551 | - geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add); |
|
| 551 | + geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add); |
|
| 552 | 552 | |
| 553 | - } |
|
| 553 | + } |
|
| 554 | 554 | |
| 555 | - } |
|
| 556 | - if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
|
|
| 555 | + } |
|
| 556 | + if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
|
|
| 557 | 557 | |
| 558 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");
|
|
| 559 | - if ($is_column) {
|
|
| 558 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");
|
|
| 559 | + if ($is_column) {
|
|
| 560 | 560 | |
| 561 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; |
|
| 561 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; |
|
| 562 | 562 | |
| 563 | - if ($default_value != '') {
|
|
| 564 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 565 | - } |
|
| 563 | + if ($default_value != '') {
|
|
| 564 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 565 | + } |
|
| 566 | 566 | |
| 567 | - $wpdb->query($meta_field_add); |
|
| 568 | - } else {
|
|
| 567 | + $wpdb->query($meta_field_add); |
|
| 568 | + } else {
|
|
| 569 | 569 | |
| 570 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; |
|
| 571 | - $meta_field_add = "VARCHAR( 20 ) NULL"; |
|
| 572 | - if ($default_value != '') {
|
|
| 573 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 574 | - } |
|
| 570 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; |
|
| 571 | + $meta_field_add = "VARCHAR( 20 ) NULL"; |
|
| 572 | + if ($default_value != '') {
|
|
| 573 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 574 | + } |
|
| 575 | 575 | |
| 576 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add); |
|
| 576 | + geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add); |
|
| 577 | 577 | |
| 578 | - } |
|
| 578 | + } |
|
| 579 | 579 | |
| 580 | 580 | |
| 581 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");
|
|
| 581 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");
|
|
| 582 | 582 | |
| 583 | - if ($is_column) {
|
|
| 584 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; |
|
| 583 | + if ($is_column) {
|
|
| 584 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; |
|
| 585 | 585 | |
| 586 | - if ($default_value != '') {
|
|
| 587 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 588 | - } |
|
| 586 | + if ($default_value != '') {
|
|
| 587 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 588 | + } |
|
| 589 | 589 | |
| 590 | - $wpdb->query($meta_field_add); |
|
| 591 | - } else {
|
|
| 590 | + $wpdb->query($meta_field_add); |
|
| 591 | + } else {
|
|
| 592 | 592 | |
| 593 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; |
|
| 594 | - $meta_field_add = "VARCHAR( 20 ) NULL"; |
|
| 595 | - if ($default_value != '') {
|
|
| 596 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 597 | - } |
|
| 593 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; |
|
| 594 | + $meta_field_add = "VARCHAR( 20 ) NULL"; |
|
| 595 | + if ($default_value != '') {
|
|
| 596 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 597 | + } |
|
| 598 | 598 | |
| 599 | - geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add); |
|
| 600 | - } |
|
| 599 | + geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add); |
|
| 600 | + } |
|
| 601 | 601 | |
| 602 | - } |
|
| 603 | - if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
|
|
| 602 | + } |
|
| 603 | + if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
|
|
| 604 | 604 | |
| 605 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");
|
|
| 605 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");
|
|
| 606 | 606 | |
| 607 | - if ($is_column) {
|
|
| 608 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; |
|
| 607 | + if ($is_column) {
|
|
| 608 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; |
|
| 609 | 609 | |
| 610 | - if ($default_value != '') {
|
|
| 611 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 612 | - } |
|
| 610 | + if ($default_value != '') {
|
|
| 611 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 612 | + } |
|
| 613 | 613 | |
| 614 | - $wpdb->query($meta_field_add); |
|
| 615 | - } else {
|
|
| 614 | + $wpdb->query($meta_field_add); |
|
| 615 | + } else {
|
|
| 616 | 616 | |
| 617 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; |
|
| 617 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; |
|
| 618 | 618 | |
| 619 | - $meta_field_add = "VARCHAR( 15 ) NULL"; |
|
| 620 | - if ($default_value != '') {
|
|
| 621 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 622 | - } |
|
| 619 | + $meta_field_add = "VARCHAR( 15 ) NULL"; |
|
| 620 | + if ($default_value != '') {
|
|
| 621 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 622 | + } |
|
| 623 | 623 | |
| 624 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add); |
|
| 625 | - } |
|
| 624 | + geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add); |
|
| 625 | + } |
|
| 626 | 626 | |
| 627 | 627 | |
| 628 | - } |
|
| 629 | - if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
|
|
| 628 | + } |
|
| 629 | + if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
|
|
| 630 | 630 | |
| 631 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");
|
|
| 632 | - if ($is_column) {
|
|
| 633 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; |
|
| 631 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");
|
|
| 632 | + if ($is_column) {
|
|
| 633 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; |
|
| 634 | 634 | |
| 635 | - if ($default_value != '') {
|
|
| 636 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 637 | - } |
|
| 635 | + if ($default_value != '') {
|
|
| 636 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 637 | + } |
|
| 638 | 638 | |
| 639 | - $wpdb->query($meta_field_add); |
|
| 639 | + $wpdb->query($meta_field_add); |
|
| 640 | 640 | |
| 641 | - } else {
|
|
| 641 | + } else {
|
|
| 642 | 642 | |
| 643 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; |
|
| 643 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; |
|
| 644 | 644 | |
| 645 | - $meta_field_add = "VARCHAR( 3 ) NULL"; |
|
| 646 | - if ($default_value != '') {
|
|
| 647 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 648 | - } |
|
| 645 | + $meta_field_add = "VARCHAR( 3 ) NULL"; |
|
| 646 | + if ($default_value != '') {
|
|
| 647 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 648 | + } |
|
| 649 | 649 | |
| 650 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add); |
|
| 651 | - } |
|
| 650 | + geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add); |
|
| 651 | + } |
|
| 652 | 652 | |
| 653 | - } |
|
| 654 | - // show lat lng |
|
| 655 | - if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
|
|
| 656 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");
|
|
| 653 | + } |
|
| 654 | + // show lat lng |
|
| 655 | + if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
|
|
| 656 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");
|
|
| 657 | 657 | |
| 658 | - if ($is_column) {
|
|
| 659 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; |
|
| 660 | - $meta_field_add .= " DEFAULT '1'"; |
|
| 658 | + if ($is_column) {
|
|
| 659 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; |
|
| 660 | + $meta_field_add .= " DEFAULT '1'"; |
|
| 661 | 661 | |
| 662 | - $wpdb->query($meta_field_add); |
|
| 663 | - } else {
|
|
| 664 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; |
|
| 662 | + $wpdb->query($meta_field_add); |
|
| 663 | + } else {
|
|
| 664 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; |
|
| 665 | 665 | |
| 666 | - $meta_field_add = "VARCHAR( 3 ) NULL"; |
|
| 667 | - $meta_field_add .= " DEFAULT '1'"; |
|
| 666 | + $meta_field_add = "VARCHAR( 3 ) NULL"; |
|
| 667 | + $meta_field_add .= " DEFAULT '1'"; |
|
| 668 | 668 | |
| 669 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add); |
|
| 670 | - } |
|
| 669 | + geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add); |
|
| 670 | + } |
|
| 671 | 671 | |
| 672 | - } |
|
| 673 | - }// end extra |
|
| 672 | + } |
|
| 673 | + }// end extra |
|
| 674 | 674 | |
| 675 | - break; |
|
| 675 | + break; |
|
| 676 | 676 | |
| 677 | - case 'checkbox': |
|
| 678 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TINYINT(1) NOT NULL"; |
|
| 677 | + case 'checkbox': |
|
| 678 | + $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TINYINT(1) NOT NULL"; |
|
| 679 | 679 | if ($default_value != '') {
|
| 680 | 680 | $default_value_add .= " DEFAULT '" . $default_value . "'"; |
| 681 | 681 | } |
| 682 | 682 | |
| 683 | - $alter_result = $wpdb->query($default_value_add); |
|
| 684 | - if ( $alter_result === false) {
|
|
| 685 | - return __('Column change failed, you may have too many columns.', 'geodirectory');
|
|
| 686 | - } |
|
| 687 | - break; |
|
| 688 | - case 'multiselect': |
|
| 689 | - case 'select': |
|
| 690 | - case 'taxonomy': |
|
| 691 | - |
|
| 692 | - $op_size = '500'; |
|
| 693 | - |
|
| 694 | - // only make the field as big as it needs to be. |
|
| 695 | - if(isset($option_values) && $option_values && $field_type=='select'){
|
|
| 696 | - $option_values_arr = explode(',',$option_values);
|
|
| 697 | - if(is_array($option_values_arr)){
|
|
| 698 | - $op_max = 0; |
|
| 699 | - foreach($option_values_arr as $op_val){
|
|
| 700 | - if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}
|
|
| 701 | - } |
|
| 702 | - if($op_max){$op_size =$op_max; }
|
|
| 703 | - } |
|
| 704 | - }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
|
|
| 705 | - if(strlen($option_values)){
|
|
| 706 | - $op_size = strlen($option_values); |
|
| 707 | - } |
|
| 708 | - } |
|
| 709 | - |
|
| 710 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL"; |
|
| 711 | - |
|
| 712 | - if ($default_value != '') {
|
|
| 713 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 714 | - } |
|
| 715 | - |
|
| 716 | - $alter_result = $wpdb->query($meta_field_add); |
|
| 717 | - if($alter_result===false){
|
|
| 718 | - return __('Column change failed, you may have too many columns.','geodirectory');
|
|
| 719 | - } |
|
| 720 | - |
|
| 721 | - if (isset($request_field['cat_display_type'])) |
|
| 722 | - $extra_fields = $request_field['cat_display_type']; |
|
| 723 | - |
|
| 724 | - if (isset($request_field['multi_display_type'])) |
|
| 725 | - $extra_fields = $request_field['multi_display_type']; |
|
| 726 | - |
|
| 727 | - |
|
| 728 | - break; |
|
| 729 | - |
|
| 730 | - case 'textarea': |
|
| 731 | - case 'html': |
|
| 732 | - case 'url': |
|
| 733 | - case 'file': |
|
| 734 | - |
|
| 735 | - $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");
|
|
| 736 | - if($alter_result===false){
|
|
| 737 | - return __('Column change failed, you may have too many columns.','geodirectory');
|
|
| 738 | - } |
|
| 739 | - if (isset($request_field['advanced_editor'])) |
|
| 740 | - $extra_fields = $request_field['advanced_editor']; |
|
| 741 | - |
|
| 742 | - break; |
|
| 743 | - |
|
| 744 | - case 'fieldset': |
|
| 745 | - // Nothing happened for fieldset |
|
| 746 | - break; |
|
| 747 | - |
|
| 748 | - default: |
|
| 749 | - if ($data_type != 'VARCHAR' && $data_type != '') {
|
|
| 750 | - if ($data_type == 'FLOAT' && $decimal_point > 0) {
|
|
| 751 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL"; |
|
| 752 | - } else {
|
|
| 753 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL"; |
|
| 754 | - } |
|
| 755 | - |
|
| 756 | - if (is_numeric($default_value) && $default_value != '') {
|
|
| 757 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 758 | - } |
|
| 759 | - } else {
|
|
| 760 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL"; |
|
| 761 | - if ($default_value != '') {
|
|
| 762 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 763 | - } |
|
| 764 | - } |
|
| 765 | - |
|
| 766 | - $alter_result = $wpdb->query($default_value_add); |
|
| 767 | - if($alter_result===false){
|
|
| 768 | - return __('Column change failed, you may have too many columns.','geodirectory');
|
|
| 769 | - } |
|
| 770 | - break; |
|
| 771 | - endswitch; |
|
| 772 | - |
|
| 773 | - $extra_field_query = ''; |
|
| 774 | - if (!empty($extra_fields)) {
|
|
| 775 | - $extra_field_query = serialize($extra_fields); |
|
| 776 | - } |
|
| 777 | - |
|
| 778 | - $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : ''; |
|
| 779 | - |
|
| 780 | - $wpdb->query( |
|
| 781 | - |
|
| 782 | - $wpdb->prepare( |
|
| 783 | - |
|
| 784 | - "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set |
|
| 683 | + $alter_result = $wpdb->query($default_value_add); |
|
| 684 | + if ( $alter_result === false) {
|
|
| 685 | + return __('Column change failed, you may have too many columns.', 'geodirectory');
|
|
| 686 | + } |
|
| 687 | + break; |
|
| 688 | + case 'multiselect': |
|
| 689 | + case 'select': |
|
| 690 | + case 'taxonomy': |
|
| 691 | + |
|
| 692 | + $op_size = '500'; |
|
| 693 | + |
|
| 694 | + // only make the field as big as it needs to be. |
|
| 695 | + if(isset($option_values) && $option_values && $field_type=='select'){
|
|
| 696 | + $option_values_arr = explode(',',$option_values);
|
|
| 697 | + if(is_array($option_values_arr)){
|
|
| 698 | + $op_max = 0; |
|
| 699 | + foreach($option_values_arr as $op_val){
|
|
| 700 | + if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}
|
|
| 701 | + } |
|
| 702 | + if($op_max){$op_size =$op_max; }
|
|
| 703 | + } |
|
| 704 | + }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
|
|
| 705 | + if(strlen($option_values)){
|
|
| 706 | + $op_size = strlen($option_values); |
|
| 707 | + } |
|
| 708 | + } |
|
| 709 | + |
|
| 710 | + $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL"; |
|
| 711 | + |
|
| 712 | + if ($default_value != '') {
|
|
| 713 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 714 | + } |
|
| 715 | + |
|
| 716 | + $alter_result = $wpdb->query($meta_field_add); |
|
| 717 | + if($alter_result===false){
|
|
| 718 | + return __('Column change failed, you may have too many columns.','geodirectory');
|
|
| 719 | + } |
|
| 720 | + |
|
| 721 | + if (isset($request_field['cat_display_type'])) |
|
| 722 | + $extra_fields = $request_field['cat_display_type']; |
|
| 723 | + |
|
| 724 | + if (isset($request_field['multi_display_type'])) |
|
| 725 | + $extra_fields = $request_field['multi_display_type']; |
|
| 726 | + |
|
| 727 | + |
|
| 728 | + break; |
|
| 729 | + |
|
| 730 | + case 'textarea': |
|
| 731 | + case 'html': |
|
| 732 | + case 'url': |
|
| 733 | + case 'file': |
|
| 734 | + |
|
| 735 | + $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");
|
|
| 736 | + if($alter_result===false){
|
|
| 737 | + return __('Column change failed, you may have too many columns.','geodirectory');
|
|
| 738 | + } |
|
| 739 | + if (isset($request_field['advanced_editor'])) |
|
| 740 | + $extra_fields = $request_field['advanced_editor']; |
|
| 741 | + |
|
| 742 | + break; |
|
| 743 | + |
|
| 744 | + case 'fieldset': |
|
| 745 | + // Nothing happened for fieldset |
|
| 746 | + break; |
|
| 747 | + |
|
| 748 | + default: |
|
| 749 | + if ($data_type != 'VARCHAR' && $data_type != '') {
|
|
| 750 | + if ($data_type == 'FLOAT' && $decimal_point > 0) {
|
|
| 751 | + $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL"; |
|
| 752 | + } else {
|
|
| 753 | + $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL"; |
|
| 754 | + } |
|
| 755 | + |
|
| 756 | + if (is_numeric($default_value) && $default_value != '') {
|
|
| 757 | + $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 758 | + } |
|
| 759 | + } else {
|
|
| 760 | + $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL"; |
|
| 761 | + if ($default_value != '') {
|
|
| 762 | + $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 763 | + } |
|
| 764 | + } |
|
| 765 | + |
|
| 766 | + $alter_result = $wpdb->query($default_value_add); |
|
| 767 | + if($alter_result===false){
|
|
| 768 | + return __('Column change failed, you may have too many columns.','geodirectory');
|
|
| 769 | + } |
|
| 770 | + break; |
|
| 771 | + endswitch; |
|
| 772 | + |
|
| 773 | + $extra_field_query = ''; |
|
| 774 | + if (!empty($extra_fields)) {
|
|
| 775 | + $extra_field_query = serialize($extra_fields); |
|
| 776 | + } |
|
| 777 | + |
|
| 778 | + $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : ''; |
|
| 779 | + |
|
| 780 | + $wpdb->query( |
|
| 781 | + |
|
| 782 | + $wpdb->prepare( |
|
| 783 | + |
|
| 784 | + "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set |
|
| 785 | 785 | post_type = %s, |
| 786 | 786 | admin_title = %s, |
| 787 | 787 | site_title = %s, |
@@ -815,308 +815,308 @@ discard block |
||
| 815 | 815 | for_admin_use = %s |
| 816 | 816 | where id = %d", |
| 817 | 817 | |
| 818 | - array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf) |
|
| 819 | - ) |
|
| 818 | + array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf) |
|
| 819 | + ) |
|
| 820 | 820 | |
| 821 | - ); |
|
| 821 | + ); |
|
| 822 | 822 | |
| 823 | - $lastid = trim($cf); |
|
| 823 | + $lastid = trim($cf); |
|
| 824 | 824 | |
| 825 | 825 | |
| 826 | - $wpdb->query( |
|
| 827 | - $wpdb->prepare( |
|
| 828 | - "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 826 | + $wpdb->query( |
|
| 827 | + $wpdb->prepare( |
|
| 828 | + "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 829 | 829 | site_title=%s |
| 830 | 830 | where post_type = %s and htmlvar_name = %s", |
| 831 | - array($site_title, $post_type, $htmlvar_name) |
|
| 832 | - ) |
|
| 833 | - ); |
|
| 834 | - |
|
| 835 | - |
|
| 836 | - if ($cat_sort == '') |
|
| 837 | - $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
|
|
| 838 | - |
|
| 839 | - |
|
| 840 | - /** |
|
| 841 | - * Called after all custom fields are saved for a post. |
|
| 842 | - * |
|
| 843 | - * @since 1.0.0 |
|
| 844 | - * @param int $lastid The post ID. |
|
| 845 | - */ |
|
| 846 | - do_action('geodir_after_custom_fields_updated', $lastid);
|
|
| 847 | - |
|
| 848 | - } else {
|
|
| 849 | - |
|
| 850 | - switch ($field_type): |
|
| 851 | - |
|
| 852 | - case 'address': |
|
| 853 | - |
|
| 854 | - $data_type = ''; |
|
| 855 | - |
|
| 856 | - if ($htmlvar_name != '') {
|
|
| 857 | - $prefix = $htmlvar_name . '_'; |
|
| 858 | - } |
|
| 859 | - $old_prefix = $old_html_variable; |
|
| 860 | - |
|
| 861 | - //$meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."address` VARCHAR( 254 ) NULL"; |
|
| 862 | - |
|
| 863 | - $meta_field_add = "VARCHAR( 254 ) NULL"; |
|
| 864 | - if ($default_value != '') {
|
|
| 865 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 866 | - } |
|
| 867 | - |
|
| 868 | - geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add); |
|
| 869 | - //$wpdb->query($meta_field_add); |
|
| 870 | - |
|
| 871 | - |
|
| 872 | - if (!empty($extra_fields)) {
|
|
| 831 | + array($site_title, $post_type, $htmlvar_name) |
|
| 832 | + ) |
|
| 833 | + ); |
|
| 834 | + |
|
| 835 | + |
|
| 836 | + if ($cat_sort == '') |
|
| 837 | + $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
|
|
| 838 | + |
|
| 839 | + |
|
| 840 | + /** |
|
| 841 | + * Called after all custom fields are saved for a post. |
|
| 842 | + * |
|
| 843 | + * @since 1.0.0 |
|
| 844 | + * @param int $lastid The post ID. |
|
| 845 | + */ |
|
| 846 | + do_action('geodir_after_custom_fields_updated', $lastid);
|
|
| 847 | + |
|
| 848 | + } else {
|
|
| 873 | 849 | |
| 874 | - if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
|
|
| 875 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL"; |
|
| 876 | - $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 877 | - if ($default_value != '') {
|
|
| 878 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 879 | - } |
|
| 880 | - |
|
| 881 | - geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add); |
|
| 882 | - //$wpdb->query($meta_field_add); |
|
| 883 | - } |
|
| 884 | - if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
|
|
| 885 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL"; |
|
| 886 | - $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 887 | - if ($default_value != '') {
|
|
| 888 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 889 | - } |
|
| 890 | - |
|
| 891 | - geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add); |
|
| 892 | - //$wpdb->query($meta_field_add); |
|
| 893 | - } |
|
| 894 | - if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
|
|
| 895 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL"; |
|
| 896 | - |
|
| 897 | - $meta_field_add = "VARCHAR( 30 ) NULL"; |
|
| 898 | - if ($default_value != '') {
|
|
| 899 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 900 | - } |
|
| 901 | - |
|
| 902 | - geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add); |
|
| 903 | - //$wpdb->query($meta_field_add); |
|
| 904 | - } |
|
| 905 | - if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
|
|
| 906 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL"; |
|
| 907 | - $meta_field_add = "VARCHAR( 15 ) NULL"; |
|
| 908 | - if ($default_value != '') {
|
|
| 909 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 910 | - } |
|
| 911 | - |
|
| 912 | - geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add); |
|
| 913 | - //$wpdb->query($meta_field_add); |
|
| 914 | - } |
|
| 915 | - if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
|
|
| 916 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; |
|
| 917 | - $meta_field_add = "VARCHAR( 20 ) NULL"; |
|
| 918 | - if ($default_value != '') {
|
|
| 919 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 920 | - } |
|
| 921 | - |
|
| 922 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add); |
|
| 923 | - //$wpdb->query($meta_field_add); |
|
| 924 | - |
|
| 925 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; |
|
| 926 | - |
|
| 927 | - $meta_field_add = "VARCHAR( 20 ) NULL"; |
|
| 928 | - if ($default_value != '') {
|
|
| 929 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 930 | - } |
|
| 931 | - |
|
| 932 | - geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add); |
|
| 933 | - |
|
| 934 | - //$wpdb->query($meta_field_add); |
|
| 935 | - } |
|
| 936 | - if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
|
|
| 937 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; |
|
| 938 | - |
|
| 939 | - $meta_field_add = "VARCHAR( 15 ) NULL"; |
|
| 940 | - if ($default_value != '') {
|
|
| 941 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 942 | - } |
|
| 943 | - |
|
| 944 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add); |
|
| 945 | - |
|
| 946 | - //$wpdb->query($meta_field_add); |
|
| 947 | - } |
|
| 948 | - if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
|
|
| 949 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; |
|
| 950 | - |
|
| 951 | - $meta_field_add = "VARCHAR( 3 ) NULL"; |
|
| 952 | - if ($default_value != '') {
|
|
| 953 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 954 | - } |
|
| 955 | - |
|
| 956 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add); |
|
| 957 | - |
|
| 958 | - //$wpdb->query($meta_field_add); |
|
| 959 | - } |
|
| 960 | - // show lat lng |
|
| 961 | - if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
|
|
| 962 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; |
|
| 963 | - |
|
| 964 | - $meta_field_add = "VARCHAR( 3 ) NULL"; |
|
| 965 | - $meta_field_add .= " DEFAULT '1'"; |
|
| 966 | - |
|
| 967 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add); |
|
| 968 | - //$wpdb->query($meta_field_add); |
|
| 969 | - } |
|
| 970 | - } |
|
| 971 | - |
|
| 972 | - break; |
|
| 973 | - |
|
| 974 | - case 'checkbox': |
|
| 975 | - $data_type = 'TINYINT'; |
|
| 976 | - |
|
| 977 | - $meta_field_add = $data_type . "( 1 ) NOT NULL "; |
|
| 978 | - if ((int)$default_value === 1) {
|
|
| 979 | - $meta_field_add .= " DEFAULT '1'"; |
|
| 980 | - } |
|
| 981 | - |
|
| 982 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 983 | - if ($add_result === false) {
|
|
| 984 | - return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
|
|
| 985 | - } |
|
| 986 | - break; |
|
| 987 | - case 'multiselect': |
|
| 988 | - case 'select': |
|
| 989 | - $data_type = 'VARCHAR'; |
|
| 990 | - $op_size = '500'; |
|
| 991 | - |
|
| 992 | - // only make the field as big as it needs to be. |
|
| 993 | - if (isset($option_values) && $option_values && $field_type == 'select') {
|
|
| 994 | - $option_values_arr = explode(',', $option_values);
|
|
| 995 | - |
|
| 996 | - if (is_array($option_values_arr)) {
|
|
| 997 | - $op_max = 0; |
|
| 998 | - |
|
| 999 | - foreach ($option_values_arr as $op_val) {
|
|
| 1000 | - if (strlen($op_val) && strlen($op_val) > $op_max) {
|
|
| 1001 | - $op_max = strlen($op_val); |
|
| 1002 | - } |
|
| 1003 | - } |
|
| 1004 | - |
|
| 1005 | - if ($op_max) {
|
|
| 1006 | - $op_size = $op_max; |
|
| 1007 | - } |
|
| 1008 | - } |
|
| 1009 | - } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
|
|
| 1010 | - if (strlen($option_values)) {
|
|
| 1011 | - $op_size = strlen($option_values); |
|
| 1012 | - } |
|
| 1013 | - |
|
| 1014 | - if (isset($request_field['multi_display_type'])) {
|
|
| 1015 | - $extra_fields = $request_field['multi_display_type']; |
|
| 1016 | - } |
|
| 1017 | - } |
|
| 1018 | - |
|
| 1019 | - $meta_field_add = $data_type . "( $op_size ) NULL "; |
|
| 1020 | - if ($default_value != '') {
|
|
| 1021 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1022 | - } |
|
| 1023 | - |
|
| 1024 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1025 | - if ($add_result === false) {
|
|
| 1026 | - return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
|
|
| 1027 | - } |
|
| 1028 | - break; |
|
| 1029 | - case 'textarea': |
|
| 1030 | - case 'html': |
|
| 1031 | - case 'url': |
|
| 1032 | - case 'file': |
|
| 1033 | - |
|
| 1034 | - $data_type = 'TEXT'; |
|
| 1035 | - |
|
| 1036 | - $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; |
|
| 1037 | - |
|
| 1038 | - $meta_field_add = $data_type . " NULL "; |
|
| 1039 | - /*if($default_value != '') |
|
| 850 | + switch ($field_type): |
|
| 851 | + |
|
| 852 | + case 'address': |
|
| 853 | + |
|
| 854 | + $data_type = ''; |
|
| 855 | + |
|
| 856 | + if ($htmlvar_name != '') {
|
|
| 857 | + $prefix = $htmlvar_name . '_'; |
|
| 858 | + } |
|
| 859 | + $old_prefix = $old_html_variable; |
|
| 860 | + |
|
| 861 | + //$meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."address` VARCHAR( 254 ) NULL"; |
|
| 862 | + |
|
| 863 | + $meta_field_add = "VARCHAR( 254 ) NULL"; |
|
| 864 | + if ($default_value != '') {
|
|
| 865 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 866 | + } |
|
| 867 | + |
|
| 868 | + geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add); |
|
| 869 | + //$wpdb->query($meta_field_add); |
|
| 870 | + |
|
| 871 | + |
|
| 872 | + if (!empty($extra_fields)) {
|
|
| 873 | + |
|
| 874 | + if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
|
|
| 875 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL"; |
|
| 876 | + $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 877 | + if ($default_value != '') {
|
|
| 878 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 879 | + } |
|
| 880 | + |
|
| 881 | + geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add); |
|
| 882 | + //$wpdb->query($meta_field_add); |
|
| 883 | + } |
|
| 884 | + if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
|
|
| 885 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL"; |
|
| 886 | + $meta_field_add = "VARCHAR( 50 ) NULL"; |
|
| 887 | + if ($default_value != '') {
|
|
| 888 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 889 | + } |
|
| 890 | + |
|
| 891 | + geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add); |
|
| 892 | + //$wpdb->query($meta_field_add); |
|
| 893 | + } |
|
| 894 | + if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
|
|
| 895 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL"; |
|
| 896 | + |
|
| 897 | + $meta_field_add = "VARCHAR( 30 ) NULL"; |
|
| 898 | + if ($default_value != '') {
|
|
| 899 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 900 | + } |
|
| 901 | + |
|
| 902 | + geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add); |
|
| 903 | + //$wpdb->query($meta_field_add); |
|
| 904 | + } |
|
| 905 | + if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
|
|
| 906 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL"; |
|
| 907 | + $meta_field_add = "VARCHAR( 15 ) NULL"; |
|
| 908 | + if ($default_value != '') {
|
|
| 909 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 910 | + } |
|
| 911 | + |
|
| 912 | + geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add); |
|
| 913 | + //$wpdb->query($meta_field_add); |
|
| 914 | + } |
|
| 915 | + if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
|
|
| 916 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; |
|
| 917 | + $meta_field_add = "VARCHAR( 20 ) NULL"; |
|
| 918 | + if ($default_value != '') {
|
|
| 919 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 920 | + } |
|
| 921 | + |
|
| 922 | + geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add); |
|
| 923 | + //$wpdb->query($meta_field_add); |
|
| 924 | + |
|
| 925 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; |
|
| 926 | + |
|
| 927 | + $meta_field_add = "VARCHAR( 20 ) NULL"; |
|
| 928 | + if ($default_value != '') {
|
|
| 929 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 930 | + } |
|
| 931 | + |
|
| 932 | + geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add); |
|
| 933 | + |
|
| 934 | + //$wpdb->query($meta_field_add); |
|
| 935 | + } |
|
| 936 | + if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
|
|
| 937 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; |
|
| 938 | + |
|
| 939 | + $meta_field_add = "VARCHAR( 15 ) NULL"; |
|
| 940 | + if ($default_value != '') {
|
|
| 941 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 942 | + } |
|
| 943 | + |
|
| 944 | + geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add); |
|
| 945 | + |
|
| 946 | + //$wpdb->query($meta_field_add); |
|
| 947 | + } |
|
| 948 | + if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
|
|
| 949 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; |
|
| 950 | + |
|
| 951 | + $meta_field_add = "VARCHAR( 3 ) NULL"; |
|
| 952 | + if ($default_value != '') {
|
|
| 953 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 954 | + } |
|
| 955 | + |
|
| 956 | + geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add); |
|
| 957 | + |
|
| 958 | + //$wpdb->query($meta_field_add); |
|
| 959 | + } |
|
| 960 | + // show lat lng |
|
| 961 | + if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
|
|
| 962 | + $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; |
|
| 963 | + |
|
| 964 | + $meta_field_add = "VARCHAR( 3 ) NULL"; |
|
| 965 | + $meta_field_add .= " DEFAULT '1'"; |
|
| 966 | + |
|
| 967 | + geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add); |
|
| 968 | + //$wpdb->query($meta_field_add); |
|
| 969 | + } |
|
| 970 | + } |
|
| 971 | + |
|
| 972 | + break; |
|
| 973 | + |
|
| 974 | + case 'checkbox': |
|
| 975 | + $data_type = 'TINYINT'; |
|
| 976 | + |
|
| 977 | + $meta_field_add = $data_type . "( 1 ) NOT NULL "; |
|
| 978 | + if ((int)$default_value === 1) {
|
|
| 979 | + $meta_field_add .= " DEFAULT '1'"; |
|
| 980 | + } |
|
| 981 | + |
|
| 982 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 983 | + if ($add_result === false) {
|
|
| 984 | + return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
|
|
| 985 | + } |
|
| 986 | + break; |
|
| 987 | + case 'multiselect': |
|
| 988 | + case 'select': |
|
| 989 | + $data_type = 'VARCHAR'; |
|
| 990 | + $op_size = '500'; |
|
| 991 | + |
|
| 992 | + // only make the field as big as it needs to be. |
|
| 993 | + if (isset($option_values) && $option_values && $field_type == 'select') {
|
|
| 994 | + $option_values_arr = explode(',', $option_values);
|
|
| 995 | + |
|
| 996 | + if (is_array($option_values_arr)) {
|
|
| 997 | + $op_max = 0; |
|
| 998 | + |
|
| 999 | + foreach ($option_values_arr as $op_val) {
|
|
| 1000 | + if (strlen($op_val) && strlen($op_val) > $op_max) {
|
|
| 1001 | + $op_max = strlen($op_val); |
|
| 1002 | + } |
|
| 1003 | + } |
|
| 1004 | + |
|
| 1005 | + if ($op_max) {
|
|
| 1006 | + $op_size = $op_max; |
|
| 1007 | + } |
|
| 1008 | + } |
|
| 1009 | + } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
|
|
| 1010 | + if (strlen($option_values)) {
|
|
| 1011 | + $op_size = strlen($option_values); |
|
| 1012 | + } |
|
| 1013 | + |
|
| 1014 | + if (isset($request_field['multi_display_type'])) {
|
|
| 1015 | + $extra_fields = $request_field['multi_display_type']; |
|
| 1016 | + } |
|
| 1017 | + } |
|
| 1018 | + |
|
| 1019 | + $meta_field_add = $data_type . "( $op_size ) NULL "; |
|
| 1020 | + if ($default_value != '') {
|
|
| 1021 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1022 | + } |
|
| 1023 | + |
|
| 1024 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1025 | + if ($add_result === false) {
|
|
| 1026 | + return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
|
|
| 1027 | + } |
|
| 1028 | + break; |
|
| 1029 | + case 'textarea': |
|
| 1030 | + case 'html': |
|
| 1031 | + case 'url': |
|
| 1032 | + case 'file': |
|
| 1033 | + |
|
| 1034 | + $data_type = 'TEXT'; |
|
| 1035 | + |
|
| 1036 | + $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; |
|
| 1037 | + |
|
| 1038 | + $meta_field_add = $data_type . " NULL "; |
|
| 1039 | + /*if($default_value != '') |
|
| 1040 | 1040 | { $meta_field_add .= " DEFAULT '".$default_value."'"; }*/
|
| 1041 | 1041 | |
| 1042 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1043 | - if ($add_result === false) {
|
|
| 1044 | - return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
|
|
| 1045 | - } |
|
| 1042 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1043 | + if ($add_result === false) {
|
|
| 1044 | + return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
|
|
| 1045 | + } |
|
| 1046 | 1046 | |
| 1047 | - break; |
|
| 1047 | + break; |
|
| 1048 | 1048 | |
| 1049 | - case 'datepicker': |
|
| 1049 | + case 'datepicker': |
|
| 1050 | 1050 | |
| 1051 | - $data_type = 'DATE'; |
|
| 1051 | + $data_type = 'DATE'; |
|
| 1052 | 1052 | |
| 1053 | - $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; |
|
| 1053 | + $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; |
|
| 1054 | 1054 | |
| 1055 | - $meta_field_add = $data_type . " NULL "; |
|
| 1055 | + $meta_field_add = $data_type . " NULL "; |
|
| 1056 | 1056 | |
| 1057 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1058 | - if ($add_result === false) {
|
|
| 1059 | - return __('Column creation failed, you may have too many columns or the default value might have a invalid date format.', 'geodirectory');
|
|
| 1060 | - } |
|
| 1057 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1058 | + if ($add_result === false) {
|
|
| 1059 | + return __('Column creation failed, you may have too many columns or the default value might have a invalid date format.', 'geodirectory');
|
|
| 1060 | + } |
|
| 1061 | 1061 | |
| 1062 | - break; |
|
| 1062 | + break; |
|
| 1063 | 1063 | |
| 1064 | - case 'time': |
|
| 1064 | + case 'time': |
|
| 1065 | 1065 | |
| 1066 | - $data_type = 'TIME'; |
|
| 1066 | + $data_type = 'TIME'; |
|
| 1067 | 1067 | |
| 1068 | - $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; |
|
| 1068 | + $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; |
|
| 1069 | 1069 | |
| 1070 | - $meta_field_add = $data_type . " NULL "; |
|
| 1070 | + $meta_field_add = $data_type . " NULL "; |
|
| 1071 | 1071 | |
| 1072 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1073 | - if ($add_result === false) {
|
|
| 1074 | - return __('Column creation failed, you may have too many columns or the default value might have a invalid time format.', 'geodirectory');
|
|
| 1075 | - } |
|
| 1072 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1073 | + if ($add_result === false) {
|
|
| 1074 | + return __('Column creation failed, you may have too many columns or the default value might have a invalid time format.', 'geodirectory');
|
|
| 1075 | + } |
|
| 1076 | 1076 | |
| 1077 | - break; |
|
| 1077 | + break; |
|
| 1078 | 1078 | |
| 1079 | - default: |
|
| 1079 | + default: |
|
| 1080 | 1080 | |
| 1081 | - if ($data_type != 'VARCHAR' && $data_type != '') {
|
|
| 1082 | - $meta_field_add = $data_type . " NULL "; |
|
| 1081 | + if ($data_type != 'VARCHAR' && $data_type != '') {
|
|
| 1082 | + $meta_field_add = $data_type . " NULL "; |
|
| 1083 | 1083 | |
| 1084 | - if ($data_type == 'FLOAT' && $decimal_point > 0) {
|
|
| 1085 | - $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL "; |
|
| 1086 | - } |
|
| 1084 | + if ($data_type == 'FLOAT' && $decimal_point > 0) {
|
|
| 1085 | + $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL "; |
|
| 1086 | + } |
|
| 1087 | 1087 | |
| 1088 | - if (is_numeric($default_value) && $default_value != '') {
|
|
| 1089 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1090 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1091 | - } |
|
| 1092 | - } else {
|
|
| 1093 | - $meta_field_add = " VARCHAR( 254 ) NULL "; |
|
| 1088 | + if (is_numeric($default_value) && $default_value != '') {
|
|
| 1089 | + $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1090 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1091 | + } |
|
| 1092 | + } else {
|
|
| 1093 | + $meta_field_add = " VARCHAR( 254 ) NULL "; |
|
| 1094 | 1094 | |
| 1095 | - if ($default_value != '') {
|
|
| 1096 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1097 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1098 | - } |
|
| 1099 | - } |
|
| 1095 | + if ($default_value != '') {
|
|
| 1096 | + $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1097 | + $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1098 | + } |
|
| 1099 | + } |
|
| 1100 | 1100 | |
| 1101 | - $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1102 | - if ($add_result === false) {
|
|
| 1103 | - return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
|
|
| 1104 | - } |
|
| 1105 | - break; |
|
| 1106 | - endswitch; |
|
| 1101 | + $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
|
| 1102 | + if ($add_result === false) {
|
|
| 1103 | + return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
|
|
| 1104 | + } |
|
| 1105 | + break; |
|
| 1106 | + endswitch; |
|
| 1107 | 1107 | |
| 1108 | - $extra_field_query = ''; |
|
| 1109 | - if (!empty($extra_fields)) {
|
|
| 1110 | - $extra_field_query = serialize($extra_fields); |
|
| 1111 | - } |
|
| 1108 | + $extra_field_query = ''; |
|
| 1109 | + if (!empty($extra_fields)) {
|
|
| 1110 | + $extra_field_query = serialize($extra_fields); |
|
| 1111 | + } |
|
| 1112 | 1112 | |
| 1113 | - $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : ''; |
|
| 1113 | + $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : ''; |
|
| 1114 | 1114 | |
| 1115 | - $wpdb->query( |
|
| 1115 | + $wpdb->query( |
|
| 1116 | 1116 | |
| 1117 | - $wpdb->prepare( |
|
| 1117 | + $wpdb->prepare( |
|
| 1118 | 1118 | |
| 1119 | - "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set |
|
| 1119 | + "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set |
|
| 1120 | 1120 | post_type = %s, |
| 1121 | 1121 | admin_title = %s, |
| 1122 | 1122 | site_title = %s, |
@@ -1149,26 +1149,26 @@ discard block |
||
| 1149 | 1149 | validation_msg = %s, |
| 1150 | 1150 | for_admin_use = %s ", |
| 1151 | 1151 | |
| 1152 | - array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use) |
|
| 1152 | + array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use) |
|
| 1153 | 1153 | |
| 1154 | - ) |
|
| 1154 | + ) |
|
| 1155 | 1155 | |
| 1156 | - ); |
|
| 1156 | + ); |
|
| 1157 | 1157 | |
| 1158 | - $lastid = $wpdb->insert_id; |
|
| 1158 | + $lastid = $wpdb->insert_id; |
|
| 1159 | 1159 | |
| 1160 | - $lastid = trim($lastid); |
|
| 1160 | + $lastid = trim($lastid); |
|
| 1161 | 1161 | |
| 1162 | - } |
|
| 1162 | + } |
|
| 1163 | 1163 | |
| 1164 | - return (int)$lastid; |
|
| 1164 | + return (int)$lastid; |
|
| 1165 | 1165 | |
| 1166 | 1166 | |
| 1167 | - } else {
|
|
| 1168 | - return 'HTML Variable Name should be a unique name'; |
|
| 1169 | - } |
|
| 1167 | + } else {
|
|
| 1168 | + return 'HTML Variable Name should be a unique name'; |
|
| 1169 | + } |
|
| 1170 | 1170 | |
| 1171 | - } |
|
| 1171 | + } |
|
| 1172 | 1172 | } |
| 1173 | 1173 | |
| 1174 | 1174 | /** |
@@ -1183,63 +1183,63 @@ discard block |
||
| 1183 | 1183 | function godir_set_field_order($field_ids = array()) |
| 1184 | 1184 | {
|
| 1185 | 1185 | |
| 1186 | - global $wpdb; |
|
| 1186 | + global $wpdb; |
|
| 1187 | 1187 | |
| 1188 | - $count = 0; |
|
| 1189 | - if (!empty($field_ids)): |
|
| 1190 | - $post_meta_info = false; |
|
| 1191 | - foreach ($field_ids as $id) {
|
|
| 1188 | + $count = 0; |
|
| 1189 | + if (!empty($field_ids)): |
|
| 1190 | + $post_meta_info = false; |
|
| 1191 | + foreach ($field_ids as $id) {
|
|
| 1192 | 1192 | |
| 1193 | - $cf = trim($id, '_'); |
|
| 1193 | + $cf = trim($id, '_'); |
|
| 1194 | 1194 | |
| 1195 | - $post_meta_info = $wpdb->query( |
|
| 1196 | - $wpdb->prepare( |
|
| 1197 | - "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set |
|
| 1195 | + $post_meta_info = $wpdb->query( |
|
| 1196 | + $wpdb->prepare( |
|
| 1197 | + "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set |
|
| 1198 | 1198 | sort_order=%d |
| 1199 | 1199 | where id= %d", |
| 1200 | - array($count, $cf) |
|
| 1201 | - ) |
|
| 1202 | - ); |
|
| 1203 | - $count++; |
|
| 1204 | - } |
|
| 1205 | - |
|
| 1206 | - return $post_meta_info; |
|
| 1207 | - else: |
|
| 1208 | - return false; |
|
| 1209 | - endif; |
|
| 1200 | + array($count, $cf) |
|
| 1201 | + ) |
|
| 1202 | + ); |
|
| 1203 | + $count++; |
|
| 1204 | + } |
|
| 1205 | + |
|
| 1206 | + return $post_meta_info; |
|
| 1207 | + else: |
|
| 1208 | + return false; |
|
| 1209 | + endif; |
|
| 1210 | 1210 | } |
| 1211 | 1211 | |
| 1212 | 1212 | function geodir_get_cf_value($cf) {
|
| 1213 | - global $gd_session; |
|
| 1214 | - $value = ''; |
|
| 1215 | - if (is_admin()) {
|
|
| 1216 | - global $post; |
|
| 1217 | - |
|
| 1218 | - if (isset($_REQUEST['post'])) {
|
|
| 1219 | - $_REQUEST['pid'] = (int)$_REQUEST['post']; |
|
| 1220 | - } |
|
| 1221 | - } |
|
| 1222 | - |
|
| 1223 | - if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
|
|
| 1224 | - $post = $gd_ses_listing; |
|
| 1225 | - $value = isset($post[$cf['name']]) ? $post[$cf['name']] : ''; |
|
| 1226 | - } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 1227 | - $value = geodir_get_post_meta($_REQUEST['pid'], $cf['name'], true); |
|
| 1228 | - } else {
|
|
| 1229 | - if ($value == '') {
|
|
| 1230 | - $value = $cf['default']; |
|
| 1231 | - } |
|
| 1232 | - } |
|
| 1213 | + global $gd_session; |
|
| 1214 | + $value = ''; |
|
| 1215 | + if (is_admin()) {
|
|
| 1216 | + global $post; |
|
| 1217 | + |
|
| 1218 | + if (isset($_REQUEST['post'])) {
|
|
| 1219 | + $_REQUEST['pid'] = (int)$_REQUEST['post']; |
|
| 1220 | + } |
|
| 1221 | + } |
|
| 1222 | + |
|
| 1223 | + if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
|
|
| 1224 | + $post = $gd_ses_listing; |
|
| 1225 | + $value = isset($post[$cf['name']]) ? $post[$cf['name']] : ''; |
|
| 1226 | + } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 1227 | + $value = geodir_get_post_meta($_REQUEST['pid'], $cf['name'], true); |
|
| 1228 | + } else {
|
|
| 1229 | + if ($value == '') {
|
|
| 1230 | + $value = $cf['default']; |
|
| 1231 | + } |
|
| 1232 | + } |
|
| 1233 | 1233 | |
| 1234 | - /** |
|
| 1235 | - * Filter the custom field value. |
|
| 1236 | - * |
|
| 1237 | - * @since 1.6.20 |
|
| 1238 | - * |
|
| 1239 | - * @param mixed $value Custom field value. |
|
| 1240 | - * @param array $cf Custom field info. |
|
| 1241 | - */ |
|
| 1242 | - return apply_filters( 'geodir_get_cf_value', $value, $cf ); |
|
| 1234 | + /** |
|
| 1235 | + * Filter the custom field value. |
|
| 1236 | + * |
|
| 1237 | + * @since 1.6.20 |
|
| 1238 | + * |
|
| 1239 | + * @param mixed $value Custom field value. |
|
| 1240 | + * @param array $cf Custom field info. |
|
| 1241 | + */ |
|
| 1242 | + return apply_filters( 'geodir_get_cf_value', $value, $cf ); |
|
| 1243 | 1243 | } |
| 1244 | 1244 | |
| 1245 | 1245 | /** |
@@ -1258,422 +1258,422 @@ discard block |
||
| 1258 | 1258 | * @param string $post_type Optional. The wordpress post type. |
| 1259 | 1259 | */ |
| 1260 | 1260 | function geodir_get_custom_fields_html($package_id = '', $default = 'custom', $post_type = 'gd_place') {
|
| 1261 | - global $is_default, $mapzoom, $gd_session; |
|
| 1261 | + global $is_default, $mapzoom, $gd_session; |
|
| 1262 | 1262 | |
| 1263 | - $listing_type = $post_type; |
|
| 1263 | + $listing_type = $post_type; |
|
| 1264 | 1264 | |
| 1265 | - $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type); |
|
| 1265 | + $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type); |
|
| 1266 | 1266 | |
| 1267 | - foreach ($custom_fields as $key => $val) {
|
|
| 1268 | - if(isset($val['extra_fields'])){$extra_fields = $val['extra_fields'];}
|
|
| 1269 | - $val = stripslashes_deep($val); // strip slashes from labels |
|
| 1270 | - if(isset($val['extra_fields'])){$val['extra_fields'] = $extra_fields;}
|
|
| 1267 | + foreach ($custom_fields as $key => $val) {
|
|
| 1268 | + if(isset($val['extra_fields'])){$extra_fields = $val['extra_fields'];}
|
|
| 1269 | + $val = stripslashes_deep($val); // strip slashes from labels |
|
| 1270 | + if(isset($val['extra_fields'])){$val['extra_fields'] = $extra_fields;}
|
|
| 1271 | 1271 | |
| 1272 | - $name = $val['name']; |
|
| 1273 | - $type = $val['type']; |
|
| 1274 | - $is_default = $val['is_default']; |
|
| 1272 | + $name = $val['name']; |
|
| 1273 | + $type = $val['type']; |
|
| 1274 | + $is_default = $val['is_default']; |
|
| 1275 | 1275 | |
| 1276 | - /* field available to site admin only for edit */ |
|
| 1277 | - $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false; |
|
| 1278 | - if ($for_admin_use && !is_super_admin()) {
|
|
| 1279 | - continue; |
|
| 1280 | - } |
|
| 1276 | + /* field available to site admin only for edit */ |
|
| 1277 | + $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false; |
|
| 1278 | + if ($for_admin_use && !is_super_admin()) {
|
|
| 1279 | + continue; |
|
| 1280 | + } |
|
| 1281 | 1281 | |
| 1282 | - if (is_admin()) {
|
|
| 1283 | - global $post; |
|
| 1282 | + if (is_admin()) {
|
|
| 1283 | + global $post; |
|
| 1284 | 1284 | |
| 1285 | - if (isset($_REQUEST['post'])) |
|
| 1286 | - $_REQUEST['pid'] = $_REQUEST['post']; |
|
| 1287 | - } |
|
| 1285 | + if (isset($_REQUEST['post'])) |
|
| 1286 | + $_REQUEST['pid'] = $_REQUEST['post']; |
|
| 1287 | + } |
|
| 1288 | 1288 | |
| 1289 | 1289 | |
| 1290 | 1290 | |
| 1291 | - /** |
|
| 1292 | - * Called before the custom fields info is output for submitting a post. |
|
| 1293 | - * |
|
| 1294 | - * Used dynamic hook type geodir_before_custom_form_field_$name. |
|
| 1295 | - * |
|
| 1296 | - * @since 1.0.0 |
|
| 1297 | - * @param string $listing_type The post post type. |
|
| 1298 | - * @param int $package_id The price package ID for the post. |
|
| 1299 | - * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
|
|
| 1300 | - * @see 'geodir_after_custom_form_field_$name' |
|
| 1301 | - */ |
|
| 1302 | - do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);
|
|
| 1303 | - |
|
| 1304 | - |
|
| 1305 | - $custom_field = $val; |
|
| 1306 | - $html =''; |
|
| 1307 | - /** |
|
| 1308 | - * Filter the output for custom fields. |
|
| 1309 | - * |
|
| 1310 | - * Here we can remove or add new functions depending on the field type. |
|
| 1311 | - * |
|
| 1312 | - * @param string $html The html to be filtered (blank). |
|
| 1313 | - * @param array $custom_field The custom field array values. |
|
| 1314 | - */ |
|
| 1315 | - echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);
|
|
| 1316 | - |
|
| 1317 | - |
|
| 1318 | - |
|
| 1319 | - /** |
|
| 1320 | - * Called after the custom fields info is output for submitting a post. |
|
| 1321 | - * |
|
| 1322 | - * Used dynamic hook type geodir_after_custom_form_field_$name. |
|
| 1323 | - * |
|
| 1324 | - * @since 1.0.0 |
|
| 1325 | - * @param string $listing_type The post post type. |
|
| 1326 | - * @param int $package_id The price package ID for the post. |
|
| 1327 | - * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
|
|
| 1328 | - * @see 'geodir_before_custom_form_field_$name' |
|
| 1329 | - */ |
|
| 1330 | - do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);
|
|
| 1331 | - |
|
| 1332 | - } |
|
| 1291 | + /** |
|
| 1292 | + * Called before the custom fields info is output for submitting a post. |
|
| 1293 | + * |
|
| 1294 | + * Used dynamic hook type geodir_before_custom_form_field_$name. |
|
| 1295 | + * |
|
| 1296 | + * @since 1.0.0 |
|
| 1297 | + * @param string $listing_type The post post type. |
|
| 1298 | + * @param int $package_id The price package ID for the post. |
|
| 1299 | + * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
|
|
| 1300 | + * @see 'geodir_after_custom_form_field_$name' |
|
| 1301 | + */ |
|
| 1302 | + do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);
|
|
| 1303 | + |
|
| 1304 | + |
|
| 1305 | + $custom_field = $val; |
|
| 1306 | + $html =''; |
|
| 1307 | + /** |
|
| 1308 | + * Filter the output for custom fields. |
|
| 1309 | + * |
|
| 1310 | + * Here we can remove or add new functions depending on the field type. |
|
| 1311 | + * |
|
| 1312 | + * @param string $html The html to be filtered (blank). |
|
| 1313 | + * @param array $custom_field The custom field array values. |
|
| 1314 | + */ |
|
| 1315 | + echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);
|
|
| 1316 | + |
|
| 1317 | + |
|
| 1318 | + |
|
| 1319 | + /** |
|
| 1320 | + * Called after the custom fields info is output for submitting a post. |
|
| 1321 | + * |
|
| 1322 | + * Used dynamic hook type geodir_after_custom_form_field_$name. |
|
| 1323 | + * |
|
| 1324 | + * @since 1.0.0 |
|
| 1325 | + * @param string $listing_type The post post type. |
|
| 1326 | + * @param int $package_id The price package ID for the post. |
|
| 1327 | + * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
|
|
| 1328 | + * @see 'geodir_before_custom_form_field_$name' |
|
| 1329 | + */ |
|
| 1330 | + do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);
|
|
| 1331 | + |
|
| 1332 | + } |
|
| 1333 | 1333 | |
| 1334 | 1334 | } |
| 1335 | 1335 | |
| 1336 | 1336 | |
| 1337 | 1337 | if (!function_exists('geodir_get_field_infoby')) {
|
| 1338 | - /** |
|
| 1339 | - * Get custom field using key and value. |
|
| 1340 | - * |
|
| 1341 | - * @since 1.0.0 |
|
| 1342 | - * @package GeoDirectory |
|
| 1343 | - * @global object $wpdb WordPress Database object. |
|
| 1344 | - * @param string $key The key you want to look for. |
|
| 1345 | - * @param string $value The value of the key you want to look for. |
|
| 1346 | - * @param string $geodir_post_type The post type. |
|
| 1347 | - * @return bool|mixed Returns field info when available. otherwise returns false. |
|
| 1348 | - */ |
|
| 1349 | - function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '') |
|
| 1350 | - {
|
|
| 1351 | - |
|
| 1352 | - global $wpdb; |
|
| 1353 | - |
|
| 1354 | - $filter = $wpdb->get_row( |
|
| 1355 | - $wpdb->prepare( |
|
| 1356 | - "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'", |
|
| 1357 | - array($geodir_post_type) |
|
| 1358 | - ) |
|
| 1359 | - ); |
|
| 1360 | - |
|
| 1361 | - if ($filter) {
|
|
| 1362 | - return $filter; |
|
| 1363 | - } else {
|
|
| 1364 | - return false; |
|
| 1365 | - } |
|
| 1366 | - |
|
| 1367 | - } |
|
| 1338 | + /** |
|
| 1339 | + * Get custom field using key and value. |
|
| 1340 | + * |
|
| 1341 | + * @since 1.0.0 |
|
| 1342 | + * @package GeoDirectory |
|
| 1343 | + * @global object $wpdb WordPress Database object. |
|
| 1344 | + * @param string $key The key you want to look for. |
|
| 1345 | + * @param string $value The value of the key you want to look for. |
|
| 1346 | + * @param string $geodir_post_type The post type. |
|
| 1347 | + * @return bool|mixed Returns field info when available. otherwise returns false. |
|
| 1348 | + */ |
|
| 1349 | + function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '') |
|
| 1350 | + {
|
|
| 1351 | + |
|
| 1352 | + global $wpdb; |
|
| 1353 | + |
|
| 1354 | + $filter = $wpdb->get_row( |
|
| 1355 | + $wpdb->prepare( |
|
| 1356 | + "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'", |
|
| 1357 | + array($geodir_post_type) |
|
| 1358 | + ) |
|
| 1359 | + ); |
|
| 1360 | + |
|
| 1361 | + if ($filter) {
|
|
| 1362 | + return $filter; |
|
| 1363 | + } else {
|
|
| 1364 | + return false; |
|
| 1365 | + } |
|
| 1366 | + |
|
| 1367 | + } |
|
| 1368 | 1368 | } |
| 1369 | 1369 | |
| 1370 | 1370 | |
| 1371 | 1371 | function geodir_field_icon_proccess($cf){
|
| 1372 | 1372 | |
| 1373 | 1373 | |
| 1374 | - if (strpos($cf['field_icon'], 'http') !== false) {
|
|
| 1375 | - $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
|
|
| 1376 | - } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
|
|
| 1377 | - $field_icon = '<i class="' . $cf['field_icon'] . '"></i>'; |
|
| 1378 | - }else{
|
|
| 1379 | - $field_icon = $cf['field_icon']; |
|
| 1380 | - } |
|
| 1374 | + if (strpos($cf['field_icon'], 'http') !== false) {
|
|
| 1375 | + $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
|
|
| 1376 | + } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
|
|
| 1377 | + $field_icon = '<i class="' . $cf['field_icon'] . '"></i>'; |
|
| 1378 | + }else{
|
|
| 1379 | + $field_icon = $cf['field_icon']; |
|
| 1380 | + } |
|
| 1381 | 1381 | |
| 1382 | - return $field_icon; |
|
| 1382 | + return $field_icon; |
|
| 1383 | 1383 | } |
| 1384 | 1384 | |
| 1385 | 1385 | if (!function_exists('geodir_show_listing_info')) {
|
| 1386 | - /** |
|
| 1387 | - * Show listing info depending on field location. |
|
| 1388 | - * |
|
| 1389 | - * @since 1.0.0 |
|
| 1390 | - * @since 1.5.7 Custom fields option values added to db translation. |
|
| 1391 | - * Changes to display url fields title. |
|
| 1392 | - * @package GeoDirectory |
|
| 1393 | - * @global object $wpdb WordPress Database object. |
|
| 1394 | - * @global object $post The current post object. |
|
| 1395 | - * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false. |
|
| 1396 | - * |
|
| 1397 | - * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc. |
|
| 1398 | - * @return string Returns listing info html. |
|
| 1399 | - */ |
|
| 1400 | - function geodir_show_listing_info($fields_location = '') {
|
|
| 1401 | - global $post, $preview, $wpdb, $send_to_friend; |
|
| 1402 | - |
|
| 1403 | - $package_info = array(); |
|
| 1404 | - |
|
| 1405 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 1406 | - $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 1407 | - $p_type = !empty($post->post_type) ? $post->post_type : geodir_get_current_posttype(); |
|
| 1408 | - $send_to_friend = false; |
|
| 1409 | - |
|
| 1410 | - ob_start(); |
|
| 1411 | - $fields_info = geodir_post_custom_fields($post_package_id, 'all', $p_type, $fields_location); |
|
| 1412 | - |
|
| 1413 | - if (!empty($fields_info)) {
|
|
| 1414 | - $post = stripslashes_deep($post); // strip slashes |
|
| 1386 | + /** |
|
| 1387 | + * Show listing info depending on field location. |
|
| 1388 | + * |
|
| 1389 | + * @since 1.0.0 |
|
| 1390 | + * @since 1.5.7 Custom fields option values added to db translation. |
|
| 1391 | + * Changes to display url fields title. |
|
| 1392 | + * @package GeoDirectory |
|
| 1393 | + * @global object $wpdb WordPress Database object. |
|
| 1394 | + * @global object $post The current post object. |
|
| 1395 | + * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false. |
|
| 1396 | + * |
|
| 1397 | + * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc. |
|
| 1398 | + * @return string Returns listing info html. |
|
| 1399 | + */ |
|
| 1400 | + function geodir_show_listing_info($fields_location = '') {
|
|
| 1401 | + global $post, $preview, $wpdb, $send_to_friend; |
|
| 1402 | + |
|
| 1403 | + $package_info = array(); |
|
| 1404 | + |
|
| 1405 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 1406 | + $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 1407 | + $p_type = !empty($post->post_type) ? $post->post_type : geodir_get_current_posttype(); |
|
| 1408 | + $send_to_friend = false; |
|
| 1409 | + |
|
| 1410 | + ob_start(); |
|
| 1411 | + $fields_info = geodir_post_custom_fields($post_package_id, 'all', $p_type, $fields_location); |
|
| 1412 | + |
|
| 1413 | + if (!empty($fields_info)) {
|
|
| 1414 | + $post = stripslashes_deep($post); // strip slashes |
|
| 1415 | 1415 | |
| 1416 | - //echo '<div class="geodir-company_info field-group">'; |
|
| 1417 | - global $field_set_start; |
|
| 1418 | - $field_set_start = 0; |
|
| 1419 | - |
|
| 1420 | - |
|
| 1421 | - |
|
| 1422 | - foreach ($fields_info as $type) {
|
|
| 1423 | - if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 1424 | - $type = stripslashes_deep($type); // strip slashes |
|
| 1425 | - if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 1426 | - $html = ''; |
|
| 1427 | - $field_icon = geodir_field_icon_proccess($type); |
|
| 1428 | - $filed_type = $type['type']; |
|
| 1429 | - $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 1430 | - if($html_var=='post'){$html_var='post_address';}
|
|
| 1431 | - |
|
| 1432 | - /** |
|
| 1433 | - * Filter the output for custom fields. |
|
| 1434 | - * |
|
| 1435 | - * Here we can remove or add new functions depending on the field type. |
|
| 1436 | - * |
|
| 1437 | - * @param string $html The html to be filtered (blank). |
|
| 1438 | - * @param string $fields_location The location the field is to be show. |
|
| 1439 | - * @param array $type The array of field values. |
|
| 1440 | - */ |
|
| 1441 | - $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 1442 | - |
|
| 1443 | - $variables_array = array(); |
|
| 1444 | - |
|
| 1445 | - |
|
| 1446 | - if ($type['type'] != 'fieldset'): |
|
| 1447 | - $variables_array['post_id'] = !empty($post->ID) ? $post->ID : (!empty($post->pid) ? $post->pid : NULL); |
|
| 1448 | - $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 1449 | - $variables_array['value'] = ''; |
|
| 1450 | - if (isset($post->{$type['htmlvar_name']}))
|
|
| 1451 | - $variables_array['value'] = $post->{$type['htmlvar_name']};
|
|
| 1452 | - endif; |
|
| 1453 | - |
|
| 1454 | - |
|
| 1455 | - if ($html): |
|
| 1456 | - |
|
| 1457 | - /** |
|
| 1458 | - * Called before a custom fields is output on the frontend. |
|
| 1459 | - * |
|
| 1460 | - * @since 1.0.0 |
|
| 1461 | - * @param string $html_var The HTML variable name for the field. |
|
| 1462 | - */ |
|
| 1463 | - do_action("geodir_before_show_{$html_var}");
|
|
| 1464 | - /** |
|
| 1465 | - * Filter custom field output. |
|
| 1466 | - * |
|
| 1467 | - * @since 1.0.0 |
|
| 1468 | - * |
|
| 1469 | - * @param string $html_var The HTML variable name for the field. |
|
| 1470 | - * @param string $html Custom field unfiltered HTML. |
|
| 1471 | - * @param array $variables_array Custom field variables array. |
|
| 1472 | - */ |
|
| 1473 | - if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
|
|
| 1474 | - |
|
| 1475 | - /** |
|
| 1476 | - * Called after a custom fields is output on the frontend. |
|
| 1477 | - * |
|
| 1478 | - * @since 1.0.0 |
|
| 1479 | - * @param string $html_var The HTML variable name for the field. |
|
| 1480 | - */ |
|
| 1481 | - do_action("geodir_after_show_{$html_var}");
|
|
| 1482 | - |
|
| 1483 | - endif; |
|
| 1484 | - |
|
| 1485 | - } |
|
| 1486 | - |
|
| 1487 | - //echo '</div>'; |
|
| 1488 | - |
|
| 1489 | - } |
|
| 1490 | - |
|
| 1491 | - |
|
| 1492 | - $html = ob_get_clean(); |
|
| 1493 | - |
|
| 1494 | - /** |
|
| 1495 | - * Filter the custom fields over all output. |
|
| 1496 | - * |
|
| 1497 | - * @param string $html The html of the custom fields. |
|
| 1498 | - * @param string $fields_location The location the fields are being output. |
|
| 1499 | - * @since 1.6.9 |
|
| 1500 | - */ |
|
| 1501 | - return apply_filters('geodir_show_listing_info',$html,$fields_location);
|
|
| 1502 | - |
|
| 1503 | - } |
|
| 1416 | + //echo '<div class="geodir-company_info field-group">'; |
|
| 1417 | + global $field_set_start; |
|
| 1418 | + $field_set_start = 0; |
|
| 1419 | + |
|
| 1420 | + |
|
| 1421 | + |
|
| 1422 | + foreach ($fields_info as $type) {
|
|
| 1423 | + if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 1424 | + $type = stripslashes_deep($type); // strip slashes |
|
| 1425 | + if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 1426 | + $html = ''; |
|
| 1427 | + $field_icon = geodir_field_icon_proccess($type); |
|
| 1428 | + $filed_type = $type['type']; |
|
| 1429 | + $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 1430 | + if($html_var=='post'){$html_var='post_address';}
|
|
| 1431 | + |
|
| 1432 | + /** |
|
| 1433 | + * Filter the output for custom fields. |
|
| 1434 | + * |
|
| 1435 | + * Here we can remove or add new functions depending on the field type. |
|
| 1436 | + * |
|
| 1437 | + * @param string $html The html to be filtered (blank). |
|
| 1438 | + * @param string $fields_location The location the field is to be show. |
|
| 1439 | + * @param array $type The array of field values. |
|
| 1440 | + */ |
|
| 1441 | + $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 1442 | + |
|
| 1443 | + $variables_array = array(); |
|
| 1444 | + |
|
| 1445 | + |
|
| 1446 | + if ($type['type'] != 'fieldset'): |
|
| 1447 | + $variables_array['post_id'] = !empty($post->ID) ? $post->ID : (!empty($post->pid) ? $post->pid : NULL); |
|
| 1448 | + $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 1449 | + $variables_array['value'] = ''; |
|
| 1450 | + if (isset($post->{$type['htmlvar_name']}))
|
|
| 1451 | + $variables_array['value'] = $post->{$type['htmlvar_name']};
|
|
| 1452 | + endif; |
|
| 1453 | + |
|
| 1454 | + |
|
| 1455 | + if ($html): |
|
| 1456 | + |
|
| 1457 | + /** |
|
| 1458 | + * Called before a custom fields is output on the frontend. |
|
| 1459 | + * |
|
| 1460 | + * @since 1.0.0 |
|
| 1461 | + * @param string $html_var The HTML variable name for the field. |
|
| 1462 | + */ |
|
| 1463 | + do_action("geodir_before_show_{$html_var}");
|
|
| 1464 | + /** |
|
| 1465 | + * Filter custom field output. |
|
| 1466 | + * |
|
| 1467 | + * @since 1.0.0 |
|
| 1468 | + * |
|
| 1469 | + * @param string $html_var The HTML variable name for the field. |
|
| 1470 | + * @param string $html Custom field unfiltered HTML. |
|
| 1471 | + * @param array $variables_array Custom field variables array. |
|
| 1472 | + */ |
|
| 1473 | + if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
|
|
| 1474 | + |
|
| 1475 | + /** |
|
| 1476 | + * Called after a custom fields is output on the frontend. |
|
| 1477 | + * |
|
| 1478 | + * @since 1.0.0 |
|
| 1479 | + * @param string $html_var The HTML variable name for the field. |
|
| 1480 | + */ |
|
| 1481 | + do_action("geodir_after_show_{$html_var}");
|
|
| 1482 | + |
|
| 1483 | + endif; |
|
| 1484 | + |
|
| 1485 | + } |
|
| 1486 | + |
|
| 1487 | + //echo '</div>'; |
|
| 1488 | + |
|
| 1489 | + } |
|
| 1490 | + |
|
| 1491 | + |
|
| 1492 | + $html = ob_get_clean(); |
|
| 1493 | + |
|
| 1494 | + /** |
|
| 1495 | + * Filter the custom fields over all output. |
|
| 1496 | + * |
|
| 1497 | + * @param string $html The html of the custom fields. |
|
| 1498 | + * @param string $fields_location The location the fields are being output. |
|
| 1499 | + * @since 1.6.9 |
|
| 1500 | + */ |
|
| 1501 | + return apply_filters('geodir_show_listing_info',$html,$fields_location);
|
|
| 1502 | + |
|
| 1503 | + } |
|
| 1504 | 1504 | } |
| 1505 | 1505 | |
| 1506 | 1506 | if (!function_exists('geodir_default_date_format')) {
|
| 1507 | - /** |
|
| 1508 | - * Returns default date format. |
|
| 1509 | - * |
|
| 1510 | - * @since 1.0.0 |
|
| 1511 | - * @package GeoDirectory |
|
| 1512 | - * @return mixed|string|void Returns default date format. |
|
| 1513 | - */ |
|
| 1514 | - function geodir_default_date_format() |
|
| 1515 | - {
|
|
| 1516 | - if ($format = get_option('date_format'))
|
|
| 1517 | - return $format; |
|
| 1518 | - else |
|
| 1519 | - return 'dd-mm-yy'; |
|
| 1520 | - } |
|
| 1507 | + /** |
|
| 1508 | + * Returns default date format. |
|
| 1509 | + * |
|
| 1510 | + * @since 1.0.0 |
|
| 1511 | + * @package GeoDirectory |
|
| 1512 | + * @return mixed|string|void Returns default date format. |
|
| 1513 | + */ |
|
| 1514 | + function geodir_default_date_format() |
|
| 1515 | + {
|
|
| 1516 | + if ($format = get_option('date_format'))
|
|
| 1517 | + return $format; |
|
| 1518 | + else |
|
| 1519 | + return 'dd-mm-yy'; |
|
| 1520 | + } |
|
| 1521 | 1521 | } |
| 1522 | 1522 | |
| 1523 | 1523 | if (!function_exists('geodir_get_formated_date')) {
|
| 1524 | - /** |
|
| 1525 | - * Returns formatted date. |
|
| 1526 | - * |
|
| 1527 | - * @since 1.0.0 |
|
| 1528 | - * @package GeoDirectory |
|
| 1529 | - * @param string $date Date string to convert. |
|
| 1530 | - * @return bool|int|string Returns formatted date. |
|
| 1531 | - */ |
|
| 1532 | - function geodir_get_formated_date($date) |
|
| 1533 | - {
|
|
| 1534 | - return mysql2date(get_option('date_format'), $date);
|
|
| 1535 | - } |
|
| 1524 | + /** |
|
| 1525 | + * Returns formatted date. |
|
| 1526 | + * |
|
| 1527 | + * @since 1.0.0 |
|
| 1528 | + * @package GeoDirectory |
|
| 1529 | + * @param string $date Date string to convert. |
|
| 1530 | + * @return bool|int|string Returns formatted date. |
|
| 1531 | + */ |
|
| 1532 | + function geodir_get_formated_date($date) |
|
| 1533 | + {
|
|
| 1534 | + return mysql2date(get_option('date_format'), $date);
|
|
| 1535 | + } |
|
| 1536 | 1536 | } |
| 1537 | 1537 | |
| 1538 | 1538 | if (!function_exists('geodir_get_formated_time')) {
|
| 1539 | - /** |
|
| 1540 | - * Returns formatted time. |
|
| 1541 | - * |
|
| 1542 | - * @since 1.0.0 |
|
| 1543 | - * @package GeoDirectory |
|
| 1544 | - * @param string $time Time string to convert. |
|
| 1545 | - * @return bool|int|string Returns formatted time. |
|
| 1546 | - */ |
|
| 1547 | - function geodir_get_formated_time($time) |
|
| 1548 | - {
|
|
| 1549 | - return mysql2date(get_option('time_format'), $time, $translate = true);
|
|
| 1550 | - } |
|
| 1539 | + /** |
|
| 1540 | + * Returns formatted time. |
|
| 1541 | + * |
|
| 1542 | + * @since 1.0.0 |
|
| 1543 | + * @package GeoDirectory |
|
| 1544 | + * @param string $time Time string to convert. |
|
| 1545 | + * @return bool|int|string Returns formatted time. |
|
| 1546 | + */ |
|
| 1547 | + function geodir_get_formated_time($time) |
|
| 1548 | + {
|
|
| 1549 | + return mysql2date(get_option('time_format'), $time, $translate = true);
|
|
| 1550 | + } |
|
| 1551 | 1551 | } |
| 1552 | 1552 | |
| 1553 | 1553 | |
| 1554 | 1554 | if (!function_exists('geodir_save_post_file_fields')) {
|
| 1555 | - /** |
|
| 1556 | - * Save post file fields |
|
| 1557 | - * |
|
| 1558 | - * @since 1.0.0 |
|
| 1559 | - * @since 1.4.7 Added `$extra_fields` parameter. |
|
| 1560 | - * @package GeoDirectory |
|
| 1561 | - * @global object $wpdb WordPress Database object. |
|
| 1562 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 1563 | - * @global object $current_user Current user object. |
|
| 1564 | - * @param int $post_id |
|
| 1565 | - * @param string $field_id |
|
| 1566 | - * @param array $post_image |
|
| 1567 | - * @param array $extra_fields Array of extra fields. |
|
| 1568 | - */ |
|
| 1569 | - function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array()) |
|
| 1570 | - {
|
|
| 1555 | + /** |
|
| 1556 | + * Save post file fields |
|
| 1557 | + * |
|
| 1558 | + * @since 1.0.0 |
|
| 1559 | + * @since 1.4.7 Added `$extra_fields` parameter. |
|
| 1560 | + * @package GeoDirectory |
|
| 1561 | + * @global object $wpdb WordPress Database object. |
|
| 1562 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 1563 | + * @global object $current_user Current user object. |
|
| 1564 | + * @param int $post_id |
|
| 1565 | + * @param string $field_id |
|
| 1566 | + * @param array $post_image |
|
| 1567 | + * @param array $extra_fields Array of extra fields. |
|
| 1568 | + */ |
|
| 1569 | + function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array()) |
|
| 1570 | + {
|
|
| 1571 | 1571 | |
| 1572 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 1572 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 1573 | 1573 | |
| 1574 | - $post_type = get_post_type($post_id); |
|
| 1575 | - //echo $field_id; exit; |
|
| 1576 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1574 | + $post_type = get_post_type($post_id); |
|
| 1575 | + //echo $field_id; exit; |
|
| 1576 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1577 | 1577 | |
| 1578 | - $postcurr_images = array(); |
|
| 1579 | - $postcurr_images = geodir_get_post_meta($post_id, $field_id, true); |
|
| 1580 | - $file_urls = ''; |
|
| 1578 | + $postcurr_images = array(); |
|
| 1579 | + $postcurr_images = geodir_get_post_meta($post_id, $field_id, true); |
|
| 1580 | + $file_urls = ''; |
|
| 1581 | 1581 | |
| 1582 | - if (!empty($post_image)) {
|
|
| 1582 | + if (!empty($post_image)) {
|
|
| 1583 | 1583 | |
| 1584 | - $invalid_files = array(); |
|
| 1584 | + $invalid_files = array(); |
|
| 1585 | 1585 | |
| 1586 | - //Get and remove all old images of post from database to set by new order |
|
| 1587 | - $geodir_uploaddir = ''; |
|
| 1588 | - $uploads = wp_upload_dir(); |
|
| 1589 | - $uploads_dir = $uploads['path']; |
|
| 1586 | + //Get and remove all old images of post from database to set by new order |
|
| 1587 | + $geodir_uploaddir = ''; |
|
| 1588 | + $uploads = wp_upload_dir(); |
|
| 1589 | + $uploads_dir = $uploads['path']; |
|
| 1590 | 1590 | |
| 1591 | - $geodir_uploadpath = $uploads['path']; |
|
| 1592 | - $geodir_uploadurl = $uploads['url']; |
|
| 1593 | - $sub_dir = $uploads['subdir']; |
|
| 1591 | + $geodir_uploadpath = $uploads['path']; |
|
| 1592 | + $geodir_uploadurl = $uploads['url']; |
|
| 1593 | + $sub_dir = $uploads['subdir']; |
|
| 1594 | 1594 | |
| 1595 | - $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
|
|
| 1595 | + $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
|
|
| 1596 | 1596 | |
| 1597 | - for ($m = 0; $m < count($post_image); $m++) {
|
|
| 1597 | + for ($m = 0; $m < count($post_image); $m++) {
|
|
| 1598 | 1598 | |
| 1599 | - /* --------- start ------- */ |
|
| 1599 | + /* --------- start ------- */ |
|
| 1600 | 1600 | |
| 1601 | - if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
|
|
| 1601 | + if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
|
|
| 1602 | 1602 | |
| 1603 | 1603 | |
| 1604 | - $curr_img_url = $post_image[$m]; |
|
| 1605 | - $image_name_arr = explode('/', $curr_img_url);
|
|
| 1606 | - $curr_img_dir = $image_name_arr[count($image_name_arr) - 2]; |
|
| 1607 | - $filename = end($image_name_arr); |
|
| 1608 | - $img_name_arr = explode('.', $filename);
|
|
| 1604 | + $curr_img_url = $post_image[$m]; |
|
| 1605 | + $image_name_arr = explode('/', $curr_img_url);
|
|
| 1606 | + $curr_img_dir = $image_name_arr[count($image_name_arr) - 2]; |
|
| 1607 | + $filename = end($image_name_arr); |
|
| 1608 | + $img_name_arr = explode('.', $filename);
|
|
| 1609 | 1609 | |
| 1610 | - $arr_file_type = wp_check_filetype($filename); |
|
| 1610 | + $arr_file_type = wp_check_filetype($filename); |
|
| 1611 | 1611 | |
| 1612 | - if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
|
|
| 1613 | - continue; |
|
| 1614 | - } |
|
| 1612 | + if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
|
|
| 1613 | + continue; |
|
| 1614 | + } |
|
| 1615 | 1615 | |
| 1616 | - $uploaded_file_type = $arr_file_type['type']; |
|
| 1617 | - $uploaded_file_ext = $arr_file_type['ext']; |
|
| 1616 | + $uploaded_file_type = $arr_file_type['type']; |
|
| 1617 | + $uploaded_file_ext = $arr_file_type['ext']; |
|
| 1618 | 1618 | |
| 1619 | - if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
|
|
| 1620 | - continue; // Invalid file type. |
|
| 1621 | - } |
|
| 1619 | + if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
|
|
| 1620 | + continue; // Invalid file type. |
|
| 1621 | + } |
|
| 1622 | 1622 | |
| 1623 | - // Set an array containing a list of acceptable formats |
|
| 1624 | - //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
|
|
| 1623 | + // Set an array containing a list of acceptable formats |
|
| 1624 | + //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
|
|
| 1625 | 1625 | |
| 1626 | - if (!function_exists('wp_handle_upload'))
|
|
| 1627 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1626 | + if (!function_exists('wp_handle_upload'))
|
|
| 1627 | + require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1628 | 1628 | |
| 1629 | - if (!is_dir($geodir_uploadpath)) |
|
| 1630 | - mkdir($geodir_uploadpath); |
|
| 1629 | + if (!is_dir($geodir_uploadpath)) |
|
| 1630 | + mkdir($geodir_uploadpath); |
|
| 1631 | 1631 | |
| 1632 | - $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1]; |
|
| 1633 | - $explode_sub_dir = explode("/", $sub_dir);
|
|
| 1634 | - if ($curr_img_dir == end($explode_sub_dir)) {
|
|
| 1635 | - $img_path = $geodir_uploadpath . '/' . $filename; |
|
| 1636 | - $img_url = $geodir_uploadurl . '/' . $filename; |
|
| 1637 | - } else {
|
|
| 1638 | - $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1639 | - $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1640 | - } |
|
| 1632 | + $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1]; |
|
| 1633 | + $explode_sub_dir = explode("/", $sub_dir);
|
|
| 1634 | + if ($curr_img_dir == end($explode_sub_dir)) {
|
|
| 1635 | + $img_path = $geodir_uploadpath . '/' . $filename; |
|
| 1636 | + $img_url = $geodir_uploadurl . '/' . $filename; |
|
| 1637 | + } else {
|
|
| 1638 | + $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1639 | + $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1640 | + } |
|
| 1641 | 1641 | |
| 1642 | - $uploaded_file = ''; |
|
| 1643 | - if (file_exists($img_path)) |
|
| 1644 | - $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); |
|
| 1642 | + $uploaded_file = ''; |
|
| 1643 | + if (file_exists($img_path)) |
|
| 1644 | + $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); |
|
| 1645 | 1645 | |
| 1646 | - if ($curr_img_dir != $geodir_uploaddir) {
|
|
| 1647 | - if (file_exists($img_path)) |
|
| 1648 | - unlink($img_path); |
|
| 1649 | - } |
|
| 1646 | + if ($curr_img_dir != $geodir_uploaddir) {
|
|
| 1647 | + if (file_exists($img_path)) |
|
| 1648 | + unlink($img_path); |
|
| 1649 | + } |
|
| 1650 | 1650 | |
| 1651 | - if (!empty($uploaded_file)) |
|
| 1652 | - $file_urls = $geodir_uploadurl . '/' . $new_name; |
|
| 1651 | + if (!empty($uploaded_file)) |
|
| 1652 | + $file_urls = $geodir_uploadurl . '/' . $new_name; |
|
| 1653 | 1653 | |
| 1654 | - } else {
|
|
| 1655 | - $file_urls = $post_image[$m]; |
|
| 1656 | - } |
|
| 1657 | - } |
|
| 1654 | + } else {
|
|
| 1655 | + $file_urls = $post_image[$m]; |
|
| 1656 | + } |
|
| 1657 | + } |
|
| 1658 | 1658 | |
| 1659 | 1659 | |
| 1660 | - } |
|
| 1660 | + } |
|
| 1661 | 1661 | |
| 1662 | - //Remove all old attachments and temp images |
|
| 1663 | - if (!empty($postcurr_images)) {
|
|
| 1662 | + //Remove all old attachments and temp images |
|
| 1663 | + if (!empty($postcurr_images)) {
|
|
| 1664 | 1664 | |
| 1665 | - if ($file_urls != $postcurr_images) {
|
|
| 1666 | - $invalid_files[] = (object)array('src' => $postcurr_images);
|
|
| 1667 | - $invalid_files = (object)$invalid_files; |
|
| 1668 | - } |
|
| 1669 | - } |
|
| 1665 | + if ($file_urls != $postcurr_images) {
|
|
| 1666 | + $invalid_files[] = (object)array('src' => $postcurr_images);
|
|
| 1667 | + $invalid_files = (object)$invalid_files; |
|
| 1668 | + } |
|
| 1669 | + } |
|
| 1670 | 1670 | |
| 1671 | - geodir_save_post_meta($post_id, $field_id, $file_urls); |
|
| 1671 | + geodir_save_post_meta($post_id, $field_id, $file_urls); |
|
| 1672 | 1672 | |
| 1673 | - if (!empty($invalid_files)) |
|
| 1674 | - geodir_remove_attachments($invalid_files); |
|
| 1673 | + if (!empty($invalid_files)) |
|
| 1674 | + geodir_remove_attachments($invalid_files); |
|
| 1675 | 1675 | |
| 1676 | - } |
|
| 1676 | + } |
|
| 1677 | 1677 | } |
| 1678 | 1678 | |
| 1679 | 1679 | |
@@ -1688,76 +1688,76 @@ discard block |
||
| 1688 | 1688 | */ |
| 1689 | 1689 | function geodir_custom_upload_mimes($existing_mimes = array()) |
| 1690 | 1690 | {
|
| 1691 | - $existing_mimes['wif'] = 'text/plain'; |
|
| 1692 | - $existing_mimes['jpg|jpeg'] = 'image/jpeg'; |
|
| 1693 | - $existing_mimes['gif'] = 'image/gif'; |
|
| 1694 | - $existing_mimes['png'] = 'image/png'; |
|
| 1695 | - $existing_mimes['pdf'] = 'application/pdf'; |
|
| 1696 | - $existing_mimes['txt'] = 'text/text'; |
|
| 1697 | - $existing_mimes['csv'] = 'application/octet-stream'; |
|
| 1698 | - $existing_mimes['doc'] = 'application/msword'; |
|
| 1699 | - $existing_mimes['xla|xls|xlt|xlw'] = 'application/vnd.ms-excel'; |
|
| 1700 | - $existing_mimes['docx'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; |
|
| 1701 | - $existing_mimes['xlsx'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; |
|
| 1702 | - return $existing_mimes; |
|
| 1691 | + $existing_mimes['wif'] = 'text/plain'; |
|
| 1692 | + $existing_mimes['jpg|jpeg'] = 'image/jpeg'; |
|
| 1693 | + $existing_mimes['gif'] = 'image/gif'; |
|
| 1694 | + $existing_mimes['png'] = 'image/png'; |
|
| 1695 | + $existing_mimes['pdf'] = 'application/pdf'; |
|
| 1696 | + $existing_mimes['txt'] = 'text/text'; |
|
| 1697 | + $existing_mimes['csv'] = 'application/octet-stream'; |
|
| 1698 | + $existing_mimes['doc'] = 'application/msword'; |
|
| 1699 | + $existing_mimes['xla|xls|xlt|xlw'] = 'application/vnd.ms-excel'; |
|
| 1700 | + $existing_mimes['docx'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; |
|
| 1701 | + $existing_mimes['xlsx'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; |
|
| 1702 | + return $existing_mimes; |
|
| 1703 | 1703 | } |
| 1704 | 1704 | |
| 1705 | 1705 | if (!function_exists('geodir_plupload_action')) {
|
| 1706 | 1706 | |
| 1707 | - /** |
|
| 1708 | - * Get upload directory path details |
|
| 1709 | - * |
|
| 1710 | - * @since 1.0.0 |
|
| 1711 | - * @package GeoDirectory |
|
| 1712 | - * @global object $current_user Current user object. |
|
| 1713 | - * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'. |
|
| 1714 | - * @return mixed Returns upload directory details as an array. |
|
| 1715 | - */ |
|
| 1716 | - function geodir_upload_dir($upload) |
|
| 1717 | - {
|
|
| 1718 | - global $current_user; |
|
| 1719 | - $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID; |
|
| 1720 | - $upload['path'] = $upload['basedir'] . $upload['subdir']; |
|
| 1721 | - $upload['url'] = $upload['baseurl'] . $upload['subdir']; |
|
| 1722 | - return $upload; |
|
| 1723 | - } |
|
| 1724 | - |
|
| 1725 | - /** |
|
| 1726 | - * Handles place file and image upload. |
|
| 1727 | - * |
|
| 1728 | - * @since 1.0.0 |
|
| 1729 | - * @package GeoDirectory |
|
| 1730 | - */ |
|
| 1731 | - function geodir_plupload_action() |
|
| 1732 | - {
|
|
| 1733 | - // check ajax nonce |
|
| 1734 | - $imgid = $_POST["imgid"]; |
|
| 1735 | - |
|
| 1736 | - check_ajax_referer($imgid . 'pluploadan'); |
|
| 1737 | - |
|
| 1738 | - // handle custom file uploaddir |
|
| 1739 | - add_filter('upload_dir', 'geodir_upload_dir');
|
|
| 1740 | - |
|
| 1741 | - // change file orientation if needed |
|
| 1742 | - $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']); |
|
| 1743 | - |
|
| 1744 | - // handle file upload |
|
| 1745 | - $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));
|
|
| 1746 | - // remove handle custom file uploaddir |
|
| 1747 | - remove_filter('upload_dir', 'geodir_upload_dir');
|
|
| 1748 | - |
|
| 1749 | - if(!isset($status['url']) && isset($status['error'])){
|
|
| 1750 | - print_r($status); |
|
| 1751 | - } |
|
| 1752 | - |
|
| 1753 | - // send the uploaded file url in response |
|
| 1754 | - if (isset($status['url'])) {
|
|
| 1755 | - echo $status['url']; |
|
| 1756 | - } else {
|
|
| 1757 | - echo 'x'; |
|
| 1758 | - } |
|
| 1759 | - exit; |
|
| 1760 | - } |
|
| 1707 | + /** |
|
| 1708 | + * Get upload directory path details |
|
| 1709 | + * |
|
| 1710 | + * @since 1.0.0 |
|
| 1711 | + * @package GeoDirectory |
|
| 1712 | + * @global object $current_user Current user object. |
|
| 1713 | + * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'. |
|
| 1714 | + * @return mixed Returns upload directory details as an array. |
|
| 1715 | + */ |
|
| 1716 | + function geodir_upload_dir($upload) |
|
| 1717 | + {
|
|
| 1718 | + global $current_user; |
|
| 1719 | + $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID; |
|
| 1720 | + $upload['path'] = $upload['basedir'] . $upload['subdir']; |
|
| 1721 | + $upload['url'] = $upload['baseurl'] . $upload['subdir']; |
|
| 1722 | + return $upload; |
|
| 1723 | + } |
|
| 1724 | + |
|
| 1725 | + /** |
|
| 1726 | + * Handles place file and image upload. |
|
| 1727 | + * |
|
| 1728 | + * @since 1.0.0 |
|
| 1729 | + * @package GeoDirectory |
|
| 1730 | + */ |
|
| 1731 | + function geodir_plupload_action() |
|
| 1732 | + {
|
|
| 1733 | + // check ajax nonce |
|
| 1734 | + $imgid = $_POST["imgid"]; |
|
| 1735 | + |
|
| 1736 | + check_ajax_referer($imgid . 'pluploadan'); |
|
| 1737 | + |
|
| 1738 | + // handle custom file uploaddir |
|
| 1739 | + add_filter('upload_dir', 'geodir_upload_dir');
|
|
| 1740 | + |
|
| 1741 | + // change file orientation if needed |
|
| 1742 | + $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']); |
|
| 1743 | + |
|
| 1744 | + // handle file upload |
|
| 1745 | + $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));
|
|
| 1746 | + // remove handle custom file uploaddir |
|
| 1747 | + remove_filter('upload_dir', 'geodir_upload_dir');
|
|
| 1748 | + |
|
| 1749 | + if(!isset($status['url']) && isset($status['error'])){
|
|
| 1750 | + print_r($status); |
|
| 1751 | + } |
|
| 1752 | + |
|
| 1753 | + // send the uploaded file url in response |
|
| 1754 | + if (isset($status['url'])) {
|
|
| 1755 | + echo $status['url']; |
|
| 1756 | + } else {
|
|
| 1757 | + echo 'x'; |
|
| 1758 | + } |
|
| 1759 | + exit; |
|
| 1760 | + } |
|
| 1761 | 1761 | } |
| 1762 | 1762 | |
| 1763 | 1763 | /** |
@@ -1772,17 +1772,17 @@ discard block |
||
| 1772 | 1772 | */ |
| 1773 | 1773 | function geodir_get_video($post_id) |
| 1774 | 1774 | {
|
| 1775 | - global $wpdb, $plugin_prefix; |
|
| 1775 | + global $wpdb, $plugin_prefix; |
|
| 1776 | 1776 | |
| 1777 | - $post_type = get_post_type($post_id); |
|
| 1777 | + $post_type = get_post_type($post_id); |
|
| 1778 | 1778 | |
| 1779 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1779 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1780 | 1780 | |
| 1781 | - $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));
|
|
| 1781 | + $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));
|
|
| 1782 | 1782 | |
| 1783 | - if ($results) {
|
|
| 1784 | - return $results[0]->geodir_video; |
|
| 1785 | - } |
|
| 1783 | + if ($results) {
|
|
| 1784 | + return $results[0]->geodir_video; |
|
| 1785 | + } |
|
| 1786 | 1786 | |
| 1787 | 1787 | } |
| 1788 | 1788 | |
@@ -1798,40 +1798,40 @@ discard block |
||
| 1798 | 1798 | */ |
| 1799 | 1799 | function geodir_get_special_offers($post_id) |
| 1800 | 1800 | {
|
| 1801 | - global $wpdb, $plugin_prefix; |
|
| 1801 | + global $wpdb, $plugin_prefix; |
|
| 1802 | 1802 | |
| 1803 | - $post_type = get_post_type($post_id); |
|
| 1803 | + $post_type = get_post_type($post_id); |
|
| 1804 | 1804 | |
| 1805 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1805 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1806 | 1806 | |
| 1807 | - $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));
|
|
| 1807 | + $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));
|
|
| 1808 | 1808 | |
| 1809 | - if ($results) {
|
|
| 1810 | - return $results[0]->geodir_special_offers; |
|
| 1811 | - } |
|
| 1809 | + if ($results) {
|
|
| 1810 | + return $results[0]->geodir_special_offers; |
|
| 1811 | + } |
|
| 1812 | 1812 | |
| 1813 | 1813 | } |
| 1814 | 1814 | |
| 1815 | 1815 | if (!function_exists('geodir_max_upload_size')) {
|
| 1816 | - /** |
|
| 1817 | - * Get max upload file size |
|
| 1818 | - * |
|
| 1819 | - * @since 1.0.0 |
|
| 1820 | - * @package GeoDirectory |
|
| 1821 | - * @return mixed|void Returns max upload file size. |
|
| 1822 | - */ |
|
| 1823 | - function geodir_max_upload_size() |
|
| 1824 | - {
|
|
| 1825 | - $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);
|
|
| 1826 | - |
|
| 1827 | - if ($max_filesize > 0 && $max_filesize < 1) {
|
|
| 1828 | - $max_filesize = (int)($max_filesize * 1024) . 'kb'; |
|
| 1829 | - } else {
|
|
| 1830 | - $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb'; |
|
| 1831 | - } |
|
| 1832 | - /** Filter documented in geodirectory-functions/general_functions.php **/ |
|
| 1833 | - return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
|
|
| 1834 | - } |
|
| 1816 | + /** |
|
| 1817 | + * Get max upload file size |
|
| 1818 | + * |
|
| 1819 | + * @since 1.0.0 |
|
| 1820 | + * @package GeoDirectory |
|
| 1821 | + * @return mixed|void Returns max upload file size. |
|
| 1822 | + */ |
|
| 1823 | + function geodir_max_upload_size() |
|
| 1824 | + {
|
|
| 1825 | + $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);
|
|
| 1826 | + |
|
| 1827 | + if ($max_filesize > 0 && $max_filesize < 1) {
|
|
| 1828 | + $max_filesize = (int)($max_filesize * 1024) . 'kb'; |
|
| 1829 | + } else {
|
|
| 1830 | + $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb'; |
|
| 1831 | + } |
|
| 1832 | + /** Filter documented in geodirectory-functions/general_functions.php **/ |
|
| 1833 | + return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
|
|
| 1834 | + } |
|
| 1835 | 1835 | } |
| 1836 | 1836 | |
| 1837 | 1837 | |
@@ -1849,33 +1849,33 @@ discard block |
||
| 1849 | 1849 | */ |
| 1850 | 1850 | function geodir_add_custom_sort_options($fields, $post_type) |
| 1851 | 1851 | {
|
| 1852 | - global $wpdb; |
|
| 1852 | + global $wpdb; |
|
| 1853 | 1853 | |
| 1854 | - if ($post_type != '') {
|
|
| 1854 | + if ($post_type != '') {
|
|
| 1855 | 1855 | |
| 1856 | - $all_postypes = geodir_get_posttypes(); |
|
| 1856 | + $all_postypes = geodir_get_posttypes(); |
|
| 1857 | 1857 | |
| 1858 | - if (in_array($post_type, $all_postypes)) {
|
|
| 1858 | + if (in_array($post_type, $all_postypes)) {
|
|
| 1859 | 1859 | |
| 1860 | - $custom_fields = $wpdb->get_results( |
|
| 1861 | - $wpdb->prepare( |
|
| 1862 | - "select post_type,data_type,field_type,site_title,admin_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc", |
|
| 1863 | - array($post_type) |
|
| 1864 | - ), 'ARRAY_A' |
|
| 1865 | - ); |
|
| 1860 | + $custom_fields = $wpdb->get_results( |
|
| 1861 | + $wpdb->prepare( |
|
| 1862 | + "select post_type,data_type,field_type,site_title,admin_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc", |
|
| 1863 | + array($post_type) |
|
| 1864 | + ), 'ARRAY_A' |
|
| 1865 | + ); |
|
| 1866 | 1866 | |
| 1867 | - if (!empty($custom_fields)) {
|
|
| 1867 | + if (!empty($custom_fields)) {
|
|
| 1868 | 1868 | |
| 1869 | - foreach ($custom_fields as $val) {
|
|
| 1870 | - $fields[] = $val; |
|
| 1871 | - } |
|
| 1872 | - } |
|
| 1869 | + foreach ($custom_fields as $val) {
|
|
| 1870 | + $fields[] = $val; |
|
| 1871 | + } |
|
| 1872 | + } |
|
| 1873 | 1873 | |
| 1874 | - } |
|
| 1874 | + } |
|
| 1875 | 1875 | |
| 1876 | - } |
|
| 1876 | + } |
|
| 1877 | 1877 | |
| 1878 | - return $fields; |
|
| 1878 | + return $fields; |
|
| 1879 | 1879 | } |
| 1880 | 1880 | |
| 1881 | 1881 | |
@@ -1891,76 +1891,76 @@ discard block |
||
| 1891 | 1891 | function geodir_get_custom_sort_options($post_type = '') |
| 1892 | 1892 | {
|
| 1893 | 1893 | |
| 1894 | - global $wpdb; |
|
| 1895 | - |
|
| 1896 | - if ($post_type != '') {
|
|
| 1897 | - |
|
| 1898 | - $all_postypes = geodir_get_posttypes(); |
|
| 1899 | - |
|
| 1900 | - if (!in_array($post_type, $all_postypes)) |
|
| 1901 | - return false; |
|
| 1902 | - |
|
| 1903 | - $fields = array(); |
|
| 1904 | - |
|
| 1905 | - $fields[] = array( |
|
| 1906 | - 'post_type' => $post_type, |
|
| 1907 | - 'data_type' => '', |
|
| 1908 | - 'field_type' => 'random', |
|
| 1909 | - 'site_title' => 'Random', |
|
| 1910 | - 'htmlvar_name' => 'post_title', |
|
| 1911 | - 'field_icon' => 'fa fa-random', |
|
| 1912 | - 'description' => __('Random sort (not recommended for large sites)', 'geodirectory')
|
|
| 1913 | - ); |
|
| 1914 | - |
|
| 1915 | - $fields[] = array( |
|
| 1916 | - 'post_type' => $post_type, |
|
| 1917 | - 'data_type' => '', |
|
| 1918 | - 'field_type' => 'datetime', |
|
| 1919 | - 'site_title' => __('Add date', 'geodirectory'),
|
|
| 1920 | - 'htmlvar_name' => 'post_date', |
|
| 1921 | - 'field_icon' => 'fa fa-calendar', |
|
| 1922 | - 'description' => __('Sort by date added', 'geodirectory')
|
|
| 1923 | - ); |
|
| 1924 | - $fields[] = array( |
|
| 1925 | - 'post_type' => $post_type, |
|
| 1926 | - 'data_type' => '', |
|
| 1927 | - 'field_type' => 'bigint', |
|
| 1928 | - 'site_title' => __('Review', 'geodirectory'),
|
|
| 1929 | - 'htmlvar_name' => 'comment_count', |
|
| 1930 | - 'field_icon' => 'fa fa-commenting-o', |
|
| 1931 | - 'description' => __('Sort by the number of reviews', 'geodirectory')
|
|
| 1932 | - ); |
|
| 1933 | - $fields[] = array( |
|
| 1934 | - 'post_type' => $post_type, |
|
| 1935 | - 'data_type' => '', |
|
| 1936 | - 'field_type' => 'float', |
|
| 1937 | - 'site_title' => __('Rating', 'geodirectory'),
|
|
| 1938 | - 'htmlvar_name' => 'overall_rating', |
|
| 1939 | - 'field_icon' => 'fa fa-star-o', |
|
| 1940 | - 'description' => __('Sort by the overall rating value', 'geodirectory')
|
|
| 1941 | - ); |
|
| 1942 | - $fields[] = array( |
|
| 1943 | - 'post_type' => $post_type, |
|
| 1944 | - 'data_type' => '', |
|
| 1945 | - 'field_type' => 'text', |
|
| 1946 | - 'site_title' => __('Title', 'geodirectory'),
|
|
| 1947 | - 'htmlvar_name' => 'post_title', |
|
| 1948 | - 'field_icon' => 'fa fa-sort-alpha-desc', |
|
| 1949 | - 'description' => __('Sort alphabetically by title', 'geodirectory')
|
|
| 1950 | - ); |
|
| 1951 | - |
|
| 1952 | - /** |
|
| 1953 | - * Hook to add custom sort options. |
|
| 1954 | - * |
|
| 1955 | - * @since 1.0.0 |
|
| 1956 | - * @param array $fields Unmodified sort options array. |
|
| 1957 | - * @param string $post_type Post type. |
|
| 1958 | - */ |
|
| 1959 | - return $fields = apply_filters('geodir_add_custom_sort_options', $fields, $post_type);
|
|
| 1960 | - |
|
| 1961 | - } |
|
| 1962 | - |
|
| 1963 | - return false; |
|
| 1894 | + global $wpdb; |
|
| 1895 | + |
|
| 1896 | + if ($post_type != '') {
|
|
| 1897 | + |
|
| 1898 | + $all_postypes = geodir_get_posttypes(); |
|
| 1899 | + |
|
| 1900 | + if (!in_array($post_type, $all_postypes)) |
|
| 1901 | + return false; |
|
| 1902 | + |
|
| 1903 | + $fields = array(); |
|
| 1904 | + |
|
| 1905 | + $fields[] = array( |
|
| 1906 | + 'post_type' => $post_type, |
|
| 1907 | + 'data_type' => '', |
|
| 1908 | + 'field_type' => 'random', |
|
| 1909 | + 'site_title' => 'Random', |
|
| 1910 | + 'htmlvar_name' => 'post_title', |
|
| 1911 | + 'field_icon' => 'fa fa-random', |
|
| 1912 | + 'description' => __('Random sort (not recommended for large sites)', 'geodirectory')
|
|
| 1913 | + ); |
|
| 1914 | + |
|
| 1915 | + $fields[] = array( |
|
| 1916 | + 'post_type' => $post_type, |
|
| 1917 | + 'data_type' => '', |
|
| 1918 | + 'field_type' => 'datetime', |
|
| 1919 | + 'site_title' => __('Add date', 'geodirectory'),
|
|
| 1920 | + 'htmlvar_name' => 'post_date', |
|
| 1921 | + 'field_icon' => 'fa fa-calendar', |
|
| 1922 | + 'description' => __('Sort by date added', 'geodirectory')
|
|
| 1923 | + ); |
|
| 1924 | + $fields[] = array( |
|
| 1925 | + 'post_type' => $post_type, |
|
| 1926 | + 'data_type' => '', |
|
| 1927 | + 'field_type' => 'bigint', |
|
| 1928 | + 'site_title' => __('Review', 'geodirectory'),
|
|
| 1929 | + 'htmlvar_name' => 'comment_count', |
|
| 1930 | + 'field_icon' => 'fa fa-commenting-o', |
|
| 1931 | + 'description' => __('Sort by the number of reviews', 'geodirectory')
|
|
| 1932 | + ); |
|
| 1933 | + $fields[] = array( |
|
| 1934 | + 'post_type' => $post_type, |
|
| 1935 | + 'data_type' => '', |
|
| 1936 | + 'field_type' => 'float', |
|
| 1937 | + 'site_title' => __('Rating', 'geodirectory'),
|
|
| 1938 | + 'htmlvar_name' => 'overall_rating', |
|
| 1939 | + 'field_icon' => 'fa fa-star-o', |
|
| 1940 | + 'description' => __('Sort by the overall rating value', 'geodirectory')
|
|
| 1941 | + ); |
|
| 1942 | + $fields[] = array( |
|
| 1943 | + 'post_type' => $post_type, |
|
| 1944 | + 'data_type' => '', |
|
| 1945 | + 'field_type' => 'text', |
|
| 1946 | + 'site_title' => __('Title', 'geodirectory'),
|
|
| 1947 | + 'htmlvar_name' => 'post_title', |
|
| 1948 | + 'field_icon' => 'fa fa-sort-alpha-desc', |
|
| 1949 | + 'description' => __('Sort alphabetically by title', 'geodirectory')
|
|
| 1950 | + ); |
|
| 1951 | + |
|
| 1952 | + /** |
|
| 1953 | + * Hook to add custom sort options. |
|
| 1954 | + * |
|
| 1955 | + * @since 1.0.0 |
|
| 1956 | + * @param array $fields Unmodified sort options array. |
|
| 1957 | + * @param string $post_type Post type. |
|
| 1958 | + */ |
|
| 1959 | + return $fields = apply_filters('geodir_add_custom_sort_options', $fields, $post_type);
|
|
| 1960 | + |
|
| 1961 | + } |
|
| 1962 | + |
|
| 1963 | + return false; |
|
| 1964 | 1964 | } |
| 1965 | 1965 | |
| 1966 | 1966 | |
@@ -1976,117 +1976,117 @@ discard block |
||
| 1976 | 1976 | function godir_set_sort_field_order($field_ids = array()) |
| 1977 | 1977 | {
|
| 1978 | 1978 | |
| 1979 | - global $wpdb; |
|
| 1979 | + global $wpdb; |
|
| 1980 | 1980 | |
| 1981 | - $count = 0; |
|
| 1982 | - if (!empty($field_ids)): |
|
| 1983 | - foreach ($field_ids as $id) {
|
|
| 1981 | + $count = 0; |
|
| 1982 | + if (!empty($field_ids)): |
|
| 1983 | + foreach ($field_ids as $id) {
|
|
| 1984 | 1984 | |
| 1985 | - $cf = trim($id, '_'); |
|
| 1985 | + $cf = trim($id, '_'); |
|
| 1986 | 1986 | |
| 1987 | - $post_meta_info = $wpdb->query( |
|
| 1988 | - $wpdb->prepare( |
|
| 1989 | - "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 1987 | + $post_meta_info = $wpdb->query( |
|
| 1988 | + $wpdb->prepare( |
|
| 1989 | + "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 1990 | 1990 | sort_order=%d |
| 1991 | 1991 | where id= %d", |
| 1992 | - array($count, $cf) |
|
| 1993 | - ) |
|
| 1994 | - ); |
|
| 1995 | - $count++; |
|
| 1996 | - } |
|
| 1997 | - |
|
| 1998 | - return $field_ids; |
|
| 1999 | - else: |
|
| 2000 | - return false; |
|
| 2001 | - endif; |
|
| 1992 | + array($count, $cf) |
|
| 1993 | + ) |
|
| 1994 | + ); |
|
| 1995 | + $count++; |
|
| 1996 | + } |
|
| 1997 | + |
|
| 1998 | + return $field_ids; |
|
| 1999 | + else: |
|
| 2000 | + return false; |
|
| 2001 | + endif; |
|
| 2002 | 2002 | } |
| 2003 | 2003 | |
| 2004 | 2004 | |
| 2005 | 2005 | if (!function_exists('geodir_custom_sort_field_save')) {
|
| 2006 | - /** |
|
| 2007 | - * Save or Update custom sort fields into the database. |
|
| 2008 | - * |
|
| 2009 | - * @since 1.0.0 |
|
| 2010 | - * @package GeoDirectory |
|
| 2011 | - * @global object $wpdb WordPress Database object. |
|
| 2012 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2013 | - * @param array $request_field {
|
|
| 2014 | - * Attributes of the Request field. |
|
| 2015 | - * |
|
| 2016 | - * @type string $action Ajax action name. |
|
| 2017 | - * @type string $manage_field_type Manage field type Default "sorting_options". |
|
| 2018 | - * @type string $create_field Do you want to create this field?. |
|
| 2019 | - * @type string $field_ins_upd Field created or updated?. |
|
| 2020 | - * @type string $_wpnonce Nonce value. |
|
| 2021 | - * @type string $listing_type The Post type. |
|
| 2022 | - * @type string $field_type Field Type. |
|
| 2023 | - * @type string $field_id Field ID. |
|
| 2024 | - * @type string $data_type Data Type. |
|
| 2025 | - * @type string $htmlvar_name HTML variable name. |
|
| 2026 | - * @type string $site_title Section title which you wish to display in frontend. |
|
| 2027 | - * @type string $is_default Is this default sorting?. |
|
| 2028 | - * @type string $is_active If not active then the field will not be displayed anywhere. |
|
| 2029 | - * @type string $sort_order Sort Order. |
|
| 2030 | - * |
|
| 2031 | - * } |
|
| 2032 | - * @param bool $default Not yet implemented. |
|
| 2033 | - * @return int Returns the last affected db table row id. |
|
| 2034 | - */ |
|
| 2035 | - function geodir_custom_sort_field_save($request_field = array(), $default = false) |
|
| 2036 | - {
|
|
| 2037 | - |
|
| 2038 | - global $wpdb, $plugin_prefix; |
|
| 2039 | - |
|
| 2040 | - $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : ''; |
|
| 2041 | - |
|
| 2042 | - $cf = trim($result_str, '_'); |
|
| 2043 | - |
|
| 2044 | - /*-------- check duplicate validation --------*/ |
|
| 2045 | - |
|
| 2046 | - $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : ''; |
|
| 2047 | - $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; |
|
| 2048 | - |
|
| 2049 | - $post_type = $request_field['listing_type']; |
|
| 2050 | - $data_type = isset($request_field['data_type']) ? $request_field['data_type'] : ''; |
|
| 2051 | - $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : ''; |
|
| 2052 | - $site_title = isset($request_field['site_title']) ? $request_field['site_title'] : ''; |
|
| 2053 | - $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; |
|
| 2054 | - $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : 0; |
|
| 2055 | - $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : 0; |
|
| 2056 | - $is_default = isset($request_field['is_default']) ? $request_field['is_default'] : ''; |
|
| 2057 | - $asc = isset($request_field['asc']) ? $request_field['asc'] : 0; |
|
| 2058 | - $desc = isset($request_field['desc']) ? $request_field['desc'] : 0; |
|
| 2059 | - $asc_title = isset($request_field['asc_title']) ? $request_field['asc_title'] : ''; |
|
| 2060 | - $desc_title = isset($request_field['desc_title']) ? $request_field['desc_title'] : ''; |
|
| 2061 | - |
|
| 2062 | - $default_order = ''; |
|
| 2063 | - if ($is_default != '') {
|
|
| 2064 | - $default_order = $is_default; |
|
| 2065 | - $is_default = '1'; |
|
| 2066 | - } |
|
| 2067 | - |
|
| 2068 | - |
|
| 2069 | - $check_html_variable = $wpdb->get_var( |
|
| 2070 | - $wpdb->prepare( |
|
| 2071 | - "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ", |
|
| 2072 | - array($cehhtmlvar_name, $post_type, $field_type) |
|
| 2073 | - ) |
|
| 2074 | - ); |
|
| 2075 | - |
|
| 2076 | - if ($is_default == 1) {
|
|
| 2077 | - |
|
| 2078 | - $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));
|
|
| 2079 | - |
|
| 2080 | - } |
|
| 2081 | - |
|
| 2082 | - |
|
| 2083 | - if (!$check_html_variable) {
|
|
| 2084 | - |
|
| 2085 | - $wpdb->query( |
|
| 2086 | - |
|
| 2087 | - $wpdb->prepare( |
|
| 2088 | - |
|
| 2089 | - "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 2006 | + /** |
|
| 2007 | + * Save or Update custom sort fields into the database. |
|
| 2008 | + * |
|
| 2009 | + * @since 1.0.0 |
|
| 2010 | + * @package GeoDirectory |
|
| 2011 | + * @global object $wpdb WordPress Database object. |
|
| 2012 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2013 | + * @param array $request_field {
|
|
| 2014 | + * Attributes of the Request field. |
|
| 2015 | + * |
|
| 2016 | + * @type string $action Ajax action name. |
|
| 2017 | + * @type string $manage_field_type Manage field type Default "sorting_options". |
|
| 2018 | + * @type string $create_field Do you want to create this field?. |
|
| 2019 | + * @type string $field_ins_upd Field created or updated?. |
|
| 2020 | + * @type string $_wpnonce Nonce value. |
|
| 2021 | + * @type string $listing_type The Post type. |
|
| 2022 | + * @type string $field_type Field Type. |
|
| 2023 | + * @type string $field_id Field ID. |
|
| 2024 | + * @type string $data_type Data Type. |
|
| 2025 | + * @type string $htmlvar_name HTML variable name. |
|
| 2026 | + * @type string $site_title Section title which you wish to display in frontend. |
|
| 2027 | + * @type string $is_default Is this default sorting?. |
|
| 2028 | + * @type string $is_active If not active then the field will not be displayed anywhere. |
|
| 2029 | + * @type string $sort_order Sort Order. |
|
| 2030 | + * |
|
| 2031 | + * } |
|
| 2032 | + * @param bool $default Not yet implemented. |
|
| 2033 | + * @return int Returns the last affected db table row id. |
|
| 2034 | + */ |
|
| 2035 | + function geodir_custom_sort_field_save($request_field = array(), $default = false) |
|
| 2036 | + {
|
|
| 2037 | + |
|
| 2038 | + global $wpdb, $plugin_prefix; |
|
| 2039 | + |
|
| 2040 | + $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : ''; |
|
| 2041 | + |
|
| 2042 | + $cf = trim($result_str, '_'); |
|
| 2043 | + |
|
| 2044 | + /*-------- check duplicate validation --------*/ |
|
| 2045 | + |
|
| 2046 | + $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : ''; |
|
| 2047 | + $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; |
|
| 2048 | + |
|
| 2049 | + $post_type = $request_field['listing_type']; |
|
| 2050 | + $data_type = isset($request_field['data_type']) ? $request_field['data_type'] : ''; |
|
| 2051 | + $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : ''; |
|
| 2052 | + $site_title = isset($request_field['site_title']) ? $request_field['site_title'] : ''; |
|
| 2053 | + $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : ''; |
|
| 2054 | + $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : 0; |
|
| 2055 | + $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : 0; |
|
| 2056 | + $is_default = isset($request_field['is_default']) ? $request_field['is_default'] : ''; |
|
| 2057 | + $asc = isset($request_field['asc']) ? $request_field['asc'] : 0; |
|
| 2058 | + $desc = isset($request_field['desc']) ? $request_field['desc'] : 0; |
|
| 2059 | + $asc_title = isset($request_field['asc_title']) ? $request_field['asc_title'] : ''; |
|
| 2060 | + $desc_title = isset($request_field['desc_title']) ? $request_field['desc_title'] : ''; |
|
| 2061 | + |
|
| 2062 | + $default_order = ''; |
|
| 2063 | + if ($is_default != '') {
|
|
| 2064 | + $default_order = $is_default; |
|
| 2065 | + $is_default = '1'; |
|
| 2066 | + } |
|
| 2067 | + |
|
| 2068 | + |
|
| 2069 | + $check_html_variable = $wpdb->get_var( |
|
| 2070 | + $wpdb->prepare( |
|
| 2071 | + "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ", |
|
| 2072 | + array($cehhtmlvar_name, $post_type, $field_type) |
|
| 2073 | + ) |
|
| 2074 | + ); |
|
| 2075 | + |
|
| 2076 | + if ($is_default == 1) {
|
|
| 2077 | + |
|
| 2078 | + $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));
|
|
| 2079 | + |
|
| 2080 | + } |
|
| 2081 | + |
|
| 2082 | + |
|
| 2083 | + if (!$check_html_variable) {
|
|
| 2084 | + |
|
| 2085 | + $wpdb->query( |
|
| 2086 | + |
|
| 2087 | + $wpdb->prepare( |
|
| 2088 | + |
|
| 2089 | + "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 2090 | 2090 | post_type = %s, |
| 2091 | 2091 | data_type = %s, |
| 2092 | 2092 | field_type = %s, |
@@ -2101,23 +2101,23 @@ discard block |
||
| 2101 | 2101 | asc_title = %s, |
| 2102 | 2102 | desc_title = %s", |
| 2103 | 2103 | |
| 2104 | - array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title) |
|
| 2105 | - ) |
|
| 2104 | + array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title) |
|
| 2105 | + ) |
|
| 2106 | 2106 | |
| 2107 | - ); |
|
| 2107 | + ); |
|
| 2108 | 2108 | |
| 2109 | 2109 | |
| 2110 | - $lastid = $wpdb->insert_id; |
|
| 2110 | + $lastid = $wpdb->insert_id; |
|
| 2111 | 2111 | |
| 2112 | - $lastid = trim($lastid); |
|
| 2112 | + $lastid = trim($lastid); |
|
| 2113 | 2113 | |
| 2114 | - } else {
|
|
| 2114 | + } else {
|
|
| 2115 | 2115 | |
| 2116 | - $wpdb->query( |
|
| 2116 | + $wpdb->query( |
|
| 2117 | 2117 | |
| 2118 | - $wpdb->prepare( |
|
| 2118 | + $wpdb->prepare( |
|
| 2119 | 2119 | |
| 2120 | - "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 2120 | + "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 2121 | 2121 | post_type = %s, |
| 2122 | 2122 | data_type = %s, |
| 2123 | 2123 | field_type = %s, |
@@ -2133,123 +2133,123 @@ discard block |
||
| 2133 | 2133 | desc_title = %s |
| 2134 | 2134 | where id = %d", |
| 2135 | 2135 | |
| 2136 | - array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title, $cf) |
|
| 2137 | - ) |
|
| 2136 | + array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title, $cf) |
|
| 2137 | + ) |
|
| 2138 | 2138 | |
| 2139 | - ); |
|
| 2139 | + ); |
|
| 2140 | 2140 | |
| 2141 | - $lastid = trim($cf); |
|
| 2141 | + $lastid = trim($cf); |
|
| 2142 | 2142 | |
| 2143 | - } |
|
| 2143 | + } |
|
| 2144 | 2144 | |
| 2145 | 2145 | |
| 2146 | - return (int)$lastid; |
|
| 2146 | + return (int)$lastid; |
|
| 2147 | 2147 | |
| 2148 | - } |
|
| 2148 | + } |
|
| 2149 | 2149 | } |
| 2150 | 2150 | |
| 2151 | 2151 | |
| 2152 | 2152 | if (!function_exists('geodir_custom_sort_field_delete')) {
|
| 2153 | - /** |
|
| 2154 | - * Delete a custom sort field using field id. |
|
| 2155 | - * @since 1.0.0 |
|
| 2156 | - * @package GeoDirectory |
|
| 2157 | - * @global object $wpdb WordPress Database object. |
|
| 2158 | - * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2159 | - * @param string $field_id The field ID. |
|
| 2160 | - * @return int|string Returns field id when successful deletion, else returns 0. |
|
| 2161 | - */ |
|
| 2162 | - function geodir_custom_sort_field_delete($field_id = '') |
|
| 2163 | - {
|
|
| 2164 | - |
|
| 2165 | - global $wpdb, $plugin_prefix; |
|
| 2166 | - if ($field_id != '') {
|
|
| 2167 | - $cf = trim($field_id, '_'); |
|
| 2168 | - |
|
| 2169 | - $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));
|
|
| 2170 | - |
|
| 2171 | - return $field_id; |
|
| 2172 | - |
|
| 2173 | - } else |
|
| 2174 | - return 0; |
|
| 2175 | - |
|
| 2176 | - } |
|
| 2153 | + /** |
|
| 2154 | + * Delete a custom sort field using field id. |
|
| 2155 | + * @since 1.0.0 |
|
| 2156 | + * @package GeoDirectory |
|
| 2157 | + * @global object $wpdb WordPress Database object. |
|
| 2158 | + * @global string $plugin_prefix Geodirectory plugin table prefix. |
|
| 2159 | + * @param string $field_id The field ID. |
|
| 2160 | + * @return int|string Returns field id when successful deletion, else returns 0. |
|
| 2161 | + */ |
|
| 2162 | + function geodir_custom_sort_field_delete($field_id = '') |
|
| 2163 | + {
|
|
| 2164 | + |
|
| 2165 | + global $wpdb, $plugin_prefix; |
|
| 2166 | + if ($field_id != '') {
|
|
| 2167 | + $cf = trim($field_id, '_'); |
|
| 2168 | + |
|
| 2169 | + $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));
|
|
| 2170 | + |
|
| 2171 | + return $field_id; |
|
| 2172 | + |
|
| 2173 | + } else |
|
| 2174 | + return 0; |
|
| 2175 | + |
|
| 2176 | + } |
|
| 2177 | 2177 | } |
| 2178 | 2178 | |
| 2179 | 2179 | |
| 2180 | 2180 | if (!function_exists('geodir_custom_sort_field_adminhtml')) {
|
| 2181 | - /** |
|
| 2182 | - * Custom sort field admin html. |
|
| 2183 | - * |
|
| 2184 | - * @since 1.0.0 |
|
| 2185 | - * @package GeoDirectory |
|
| 2186 | - * @global object $wpdb WordPress Database object. |
|
| 2187 | - * @param string $field_type The form field type. |
|
| 2188 | - * @param object|int $result_str The custom field results object or row id. |
|
| 2189 | - * @param string $field_ins_upd When set to "submit" displays form. |
|
| 2190 | - * @param bool $default when set to true field will be for admin use only. |
|
| 2191 | - */ |
|
| 2192 | - function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='') |
|
| 2193 | - {
|
|
| 2194 | - global $wpdb; |
|
| 2195 | - $cf = $result_str; |
|
| 2196 | - if (!is_object($cf)) {
|
|
| 2197 | - $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));
|
|
| 2198 | - } else {
|
|
| 2199 | - $field_info = $cf; |
|
| 2200 | - $result_str = $cf->id; |
|
| 2201 | - } |
|
| 2202 | - |
|
| 2203 | - $field_info = stripslashes_deep($field_info); // strip slashes |
|
| 2204 | - |
|
| 2205 | - if (!isset($field_info->post_type)) {
|
|
| 2206 | - $post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2207 | - } else {
|
|
| 2208 | - $post_type = $field_info->post_type; |
|
| 2209 | - } |
|
| 2210 | - |
|
| 2211 | - |
|
| 2212 | - $htmlvar_name = isset($field_type_key) ? $field_type_key : ''; |
|
| 2213 | - |
|
| 2214 | - $site_title = ''; |
|
| 2215 | - if ($site_title == '') |
|
| 2216 | - $site_title = isset($field_info->site_title) ? $field_info->site_title : ''; |
|
| 2217 | - |
|
| 2218 | - if ($site_title == '') {
|
|
| 2219 | - $fields = geodir_get_custom_sort_options($post_type); |
|
| 2220 | - |
|
| 2221 | - foreach ($fields as $val) {
|
|
| 2222 | - $val = stripslashes_deep($val); // strip slashes |
|
| 2223 | - |
|
| 2224 | - if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {
|
|
| 2225 | - $site_title = isset($val['site_title']) ? $val['site_title'] : ''; |
|
| 2226 | - } |
|
| 2227 | - } |
|
| 2228 | - } |
|
| 2229 | - |
|
| 2230 | - if ($htmlvar_name == '') |
|
| 2231 | - $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : ''; |
|
| 2232 | - |
|
| 2233 | - $nonce = wp_create_nonce('custom_fields_' . $result_str);
|
|
| 2234 | - |
|
| 2235 | - $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 2236 | - $cso_arr = geodir_get_custom_sort_options($post_type); |
|
| 2237 | - |
|
| 2238 | - $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']); |
|
| 2239 | - foreach($cso_arr as $cso){
|
|
| 2240 | - if($cur_field_type==$cso['field_type']){
|
|
| 2241 | - |
|
| 2242 | - if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
|
|
| 2243 | - $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>'; |
|
| 2244 | - }elseif(isset($cso['field_icon']) && $cso['field_icon']){
|
|
| 2245 | - $field_icon = '<b class="gd-cf-icon" style="background-image: url(\''.$cso['field_icon'].'\')"></b>'; |
|
| 2246 | - } |
|
| 2247 | - |
|
| 2248 | - } |
|
| 2249 | - } |
|
| 2250 | - |
|
| 2251 | - $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500); |
|
| 2252 | - ?> |
|
| 2181 | + /** |
|
| 2182 | + * Custom sort field admin html. |
|
| 2183 | + * |
|
| 2184 | + * @since 1.0.0 |
|
| 2185 | + * @package GeoDirectory |
|
| 2186 | + * @global object $wpdb WordPress Database object. |
|
| 2187 | + * @param string $field_type The form field type. |
|
| 2188 | + * @param object|int $result_str The custom field results object or row id. |
|
| 2189 | + * @param string $field_ins_upd When set to "submit" displays form. |
|
| 2190 | + * @param bool $default when set to true field will be for admin use only. |
|
| 2191 | + */ |
|
| 2192 | + function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='') |
|
| 2193 | + {
|
|
| 2194 | + global $wpdb; |
|
| 2195 | + $cf = $result_str; |
|
| 2196 | + if (!is_object($cf)) {
|
|
| 2197 | + $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));
|
|
| 2198 | + } else {
|
|
| 2199 | + $field_info = $cf; |
|
| 2200 | + $result_str = $cf->id; |
|
| 2201 | + } |
|
| 2202 | + |
|
| 2203 | + $field_info = stripslashes_deep($field_info); // strip slashes |
|
| 2204 | + |
|
| 2205 | + if (!isset($field_info->post_type)) {
|
|
| 2206 | + $post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2207 | + } else {
|
|
| 2208 | + $post_type = $field_info->post_type; |
|
| 2209 | + } |
|
| 2210 | + |
|
| 2211 | + |
|
| 2212 | + $htmlvar_name = isset($field_type_key) ? $field_type_key : ''; |
|
| 2213 | + |
|
| 2214 | + $site_title = ''; |
|
| 2215 | + if ($site_title == '') |
|
| 2216 | + $site_title = isset($field_info->site_title) ? $field_info->site_title : ''; |
|
| 2217 | + |
|
| 2218 | + if ($site_title == '') {
|
|
| 2219 | + $fields = geodir_get_custom_sort_options($post_type); |
|
| 2220 | + |
|
| 2221 | + foreach ($fields as $val) {
|
|
| 2222 | + $val = stripslashes_deep($val); // strip slashes |
|
| 2223 | + |
|
| 2224 | + if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {
|
|
| 2225 | + $site_title = isset($val['site_title']) ? $val['site_title'] : ''; |
|
| 2226 | + } |
|
| 2227 | + } |
|
| 2228 | + } |
|
| 2229 | + |
|
| 2230 | + if ($htmlvar_name == '') |
|
| 2231 | + $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : ''; |
|
| 2232 | + |
|
| 2233 | + $nonce = wp_create_nonce('custom_fields_' . $result_str);
|
|
| 2234 | + |
|
| 2235 | + $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 2236 | + $cso_arr = geodir_get_custom_sort_options($post_type); |
|
| 2237 | + |
|
| 2238 | + $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']); |
|
| 2239 | + foreach($cso_arr as $cso){
|
|
| 2240 | + if($cur_field_type==$cso['field_type']){
|
|
| 2241 | + |
|
| 2242 | + if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
|
|
| 2243 | + $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>'; |
|
| 2244 | + }elseif(isset($cso['field_icon']) && $cso['field_icon']){
|
|
| 2245 | + $field_icon = '<b class="gd-cf-icon" style="background-image: url(\''.$cso['field_icon'].'\')"></b>'; |
|
| 2246 | + } |
|
| 2247 | + |
|
| 2248 | + } |
|
| 2249 | + } |
|
| 2250 | + |
|
| 2251 | + $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500); |
|
| 2252 | + ?> |
|
| 2253 | 2253 | |
| 2254 | 2254 | <li class="text" id="licontainer_<?php echo $result_str;?>"> |
| 2255 | 2255 | <form><!-- we need to wrap in a form so we can use radio buttons with same name --> |
@@ -2258,7 +2258,7 @@ discard block |
||
| 2258 | 2258 | ondblclick="show_hide('field_frm<?php echo $result_str;?>')">
|
| 2259 | 2259 | <?php |
| 2260 | 2260 | |
| 2261 | - ?> |
|
| 2261 | + ?> |
|
| 2262 | 2262 | |
| 2263 | 2263 | <div title="<?php _e('Click to remove field', 'geodirectory');?>"
|
| 2264 | 2264 | onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"
|
@@ -2273,17 +2273,17 @@ discard block |
||
| 2273 | 2273 | |
| 2274 | 2274 | <div id="field_frm<?php echo $result_str;?>" class="field_frm" |
| 2275 | 2275 | style="display:<?php if ($field_ins_upd == 'submit') {
|
| 2276 | - echo 'block;'; |
|
| 2277 | - } else {
|
|
| 2278 | - echo 'none;'; |
|
| 2279 | - } ?>"> |
|
| 2276 | + echo 'block;'; |
|
| 2277 | + } else {
|
|
| 2278 | + echo 'none;'; |
|
| 2279 | + } ?>"> |
|
| 2280 | 2280 | <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/> |
| 2281 | 2281 | <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/> |
| 2282 | 2282 | <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/> |
| 2283 | 2283 | <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str;?>"/> |
| 2284 | 2284 | <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {
|
| 2285 | - echo $field_info->data_type; |
|
| 2286 | - }?>"/> |
|
| 2285 | + echo $field_info->data_type; |
|
| 2286 | + }?>"/> |
|
| 2287 | 2287 | <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name;?>"/> |
| 2288 | 2288 | |
| 2289 | 2289 | |
@@ -2306,14 +2306,14 @@ discard block |
||
| 2306 | 2306 | |
| 2307 | 2307 | <input type="radio" id="asc_yes<?php echo $radio_id;?>" name="asc" class="gdri-enabled" value="1" |
| 2308 | 2308 | <?php if ($value == '1') {
|
| 2309 | - echo 'checked'; |
|
| 2310 | - } ?>/> |
|
| 2309 | + echo 'checked'; |
|
| 2310 | + } ?>/> |
|
| 2311 | 2311 | <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 2312 | 2312 | |
| 2313 | 2313 | <input type="radio" id="asc_no<?php echo $radio_id;?>" name="asc" class="gdri-disabled" value="0" |
| 2314 | 2314 | <?php if ($value == '0' || !$value) {
|
| 2315 | - echo 'checked'; |
|
| 2316 | - } ?>/> |
|
| 2315 | + echo 'checked'; |
|
| 2316 | + } ?>/> |
|
| 2317 | 2317 | <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 2318 | 2318 | |
| 2319 | 2319 | </div> |
@@ -2350,8 +2350,8 @@ discard block |
||
| 2350 | 2350 | |
| 2351 | 2351 | <input type="radio" name="is_default" |
| 2352 | 2352 | value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {
|
| 2353 | - echo 'checked="checked"'; |
|
| 2354 | - } ?>/> |
|
| 2353 | + echo 'checked="checked"'; |
|
| 2354 | + } ?>/> |
|
| 2355 | 2355 | </div> |
| 2356 | 2356 | |
| 2357 | 2357 | </li> |
@@ -2371,14 +2371,14 @@ discard block |
||
| 2371 | 2371 | |
| 2372 | 2372 | <input type="radio" id="desc_yes<?php echo $radio_id;?>" name="desc" class="gdri-enabled" value="1" |
| 2373 | 2373 | <?php if ($value == '1') {
|
| 2374 | - echo 'checked'; |
|
| 2375 | - } ?>/> |
|
| 2374 | + echo 'checked'; |
|
| 2375 | + } ?>/> |
|
| 2376 | 2376 | <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 2377 | 2377 | |
| 2378 | 2378 | <input type="radio" id="desc_no<?php echo $radio_id;?>" name="desc" class="gdri-disabled" value="0" |
| 2379 | 2379 | <?php if ($value == '0' || !$value) {
|
| 2380 | - echo 'checked'; |
|
| 2381 | - } ?>/> |
|
| 2380 | + echo 'checked'; |
|
| 2381 | + } ?>/> |
|
| 2382 | 2382 | <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 2383 | 2383 | |
| 2384 | 2384 | </div> |
@@ -2414,8 +2414,8 @@ discard block |
||
| 2414 | 2414 | |
| 2415 | 2415 | <input type="radio" name="is_default" |
| 2416 | 2416 | value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {
|
| 2417 | - echo 'checked="checked"'; |
|
| 2418 | - } ?>/> |
|
| 2417 | + echo 'checked="checked"'; |
|
| 2418 | + } ?>/> |
|
| 2419 | 2419 | </div> |
| 2420 | 2420 | |
| 2421 | 2421 | </li> |
@@ -2457,8 +2457,8 @@ discard block |
||
| 2457 | 2457 | |
| 2458 | 2458 | <input type="checkbox" name="is_default" |
| 2459 | 2459 | value="<?php echo $field_type; ?>" <?php if (isset($value) && $value == '1') {
|
| 2460 | - echo 'checked="checked"'; |
|
| 2461 | - } ?>/> |
|
| 2460 | + echo 'checked="checked"'; |
|
| 2461 | + } ?>/> |
|
| 2462 | 2462 | </div> |
| 2463 | 2463 | |
| 2464 | 2464 | |
@@ -2481,14 +2481,14 @@ discard block |
||
| 2481 | 2481 | |
| 2482 | 2482 | <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled" value="1" |
| 2483 | 2483 | <?php if ($value == '1') {
|
| 2484 | - echo 'checked'; |
|
| 2485 | - } ?>/> |
|
| 2484 | + echo 'checked'; |
|
| 2485 | + } ?>/> |
|
| 2486 | 2486 | <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 2487 | 2487 | |
| 2488 | 2488 | <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0" |
| 2489 | 2489 | <?php if ($value == '0' || !$value) {
|
| 2490 | - echo 'checked'; |
|
| 2491 | - } ?>/> |
|
| 2490 | + echo 'checked'; |
|
| 2491 | + } ?>/> |
|
| 2492 | 2492 | <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 2493 | 2493 | |
| 2494 | 2494 | </div> |
@@ -2498,8 +2498,8 @@ discard block |
||
| 2498 | 2498 | |
| 2499 | 2499 | <input type="hidden" readonly="readonly" name="sort_order" id="sort_order" |
| 2500 | 2500 | value="<?php if (isset($field_info->sort_order)) {
|
| 2501 | - echo esc_attr($field_info->sort_order); |
|
| 2502 | - }?>" size="50"/> |
|
| 2501 | + echo esc_attr($field_info->sort_order); |
|
| 2502 | + }?>" size="50"/> |
|
| 2503 | 2503 | |
| 2504 | 2504 | |
| 2505 | 2505 | |
@@ -2523,38 +2523,38 @@ discard block |
||
| 2523 | 2523 | </form> |
| 2524 | 2524 | </li> <?php |
| 2525 | 2525 | |
| 2526 | - } |
|
| 2526 | + } |
|
| 2527 | 2527 | } |
| 2528 | 2528 | |
| 2529 | 2529 | if (!function_exists('check_field_visibility')) {
|
| 2530 | - /** |
|
| 2531 | - * Check field visibility as per price package. |
|
| 2532 | - * |
|
| 2533 | - * @since 1.0.0 |
|
| 2534 | - * @package GeoDirectory |
|
| 2535 | - * @global object $wpdb WordPress Database object. |
|
| 2536 | - * @global array $geodir_addon_list List of active GeoDirectory extensions. |
|
| 2537 | - * @param int|string $package_id The package ID. |
|
| 2538 | - * @param string $field_name The field name. |
|
| 2539 | - * @param string $post_type Optional. The wordpress post type. |
|
| 2540 | - * @return bool Returns true when field visible, otherwise false. |
|
| 2541 | - */ |
|
| 2542 | - function check_field_visibility($package_id, $field_name, $post_type) |
|
| 2543 | - {
|
|
| 2544 | - global $wpdb, $geodir_addon_list; |
|
| 2545 | - if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {
|
|
| 2546 | - return true; |
|
| 2547 | - } |
|
| 2548 | - if (!$package_id || !$field_name || !$post_type) {
|
|
| 2549 | - return true; |
|
| 2550 | - } |
|
| 2551 | - $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));
|
|
| 2552 | - |
|
| 2553 | - if ($wpdb->get_var($sql)) {
|
|
| 2554 | - return true; |
|
| 2555 | - } |
|
| 2556 | - return false; |
|
| 2557 | - } |
|
| 2530 | + /** |
|
| 2531 | + * Check field visibility as per price package. |
|
| 2532 | + * |
|
| 2533 | + * @since 1.0.0 |
|
| 2534 | + * @package GeoDirectory |
|
| 2535 | + * @global object $wpdb WordPress Database object. |
|
| 2536 | + * @global array $geodir_addon_list List of active GeoDirectory extensions. |
|
| 2537 | + * @param int|string $package_id The package ID. |
|
| 2538 | + * @param string $field_name The field name. |
|
| 2539 | + * @param string $post_type Optional. The wordpress post type. |
|
| 2540 | + * @return bool Returns true when field visible, otherwise false. |
|
| 2541 | + */ |
|
| 2542 | + function check_field_visibility($package_id, $field_name, $post_type) |
|
| 2543 | + {
|
|
| 2544 | + global $wpdb, $geodir_addon_list; |
|
| 2545 | + if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {
|
|
| 2546 | + return true; |
|
| 2547 | + } |
|
| 2548 | + if (!$package_id || !$field_name || !$post_type) {
|
|
| 2549 | + return true; |
|
| 2550 | + } |
|
| 2551 | + $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));
|
|
| 2552 | + |
|
| 2553 | + if ($wpdb->get_var($sql)) {
|
|
| 2554 | + return true; |
|
| 2555 | + } |
|
| 2556 | + return false; |
|
| 2557 | + } |
|
| 2558 | 2558 | } |
| 2559 | 2559 | |
| 2560 | 2560 | /** |
@@ -2570,43 +2570,43 @@ discard block |
||
| 2570 | 2570 | */ |
| 2571 | 2571 | function geodir_string_to_options($input = '', $translated = false) |
| 2572 | 2572 | {
|
| 2573 | - $return = array(); |
|
| 2574 | - if ($input != '') {
|
|
| 2575 | - $input = trim($input); |
|
| 2576 | - $input = rtrim($input, ","); |
|
| 2577 | - $input = ltrim($input, ","); |
|
| 2578 | - $input = trim($input); |
|
| 2579 | - } |
|
| 2580 | - |
|
| 2581 | - $input_arr = explode(',', $input);
|
|
| 2582 | - |
|
| 2583 | - if (!empty($input_arr)) {
|
|
| 2584 | - foreach ($input_arr as $input_str) {
|
|
| 2585 | - $input_str = trim($input_str); |
|
| 2586 | - |
|
| 2587 | - if (strpos($input_str, "/") !== false) {
|
|
| 2588 | - $input_str = explode("/", $input_str, 2);
|
|
| 2589 | - $label = trim($input_str[0]); |
|
| 2590 | - if ($translated && $label != '') {
|
|
| 2591 | - $label = __($label, 'geodirectory'); |
|
| 2592 | - } |
|
| 2593 | - $label = geodir_utf8_ucfirst($label); |
|
| 2594 | - $value = trim($input_str[1]); |
|
| 2595 | - } else {
|
|
| 2596 | - $value = $input_str; |
|
| 2597 | - if ($translated && $input_str != '') {
|
|
| 2598 | - $input_str = __($input_str, 'geodirectory'); |
|
| 2599 | - } |
|
| 2600 | - $label = geodir_utf8_ucfirst($input_str); |
|
| 2601 | - } |
|
| 2602 | - |
|
| 2603 | - if ($label != '') {
|
|
| 2604 | - $return[] = array('label' => $label, 'value' => $value, 'optgroup' => NULL);
|
|
| 2605 | - } |
|
| 2606 | - } |
|
| 2607 | - } |
|
| 2608 | - |
|
| 2609 | - return $return; |
|
| 2573 | + $return = array(); |
|
| 2574 | + if ($input != '') {
|
|
| 2575 | + $input = trim($input); |
|
| 2576 | + $input = rtrim($input, ","); |
|
| 2577 | + $input = ltrim($input, ","); |
|
| 2578 | + $input = trim($input); |
|
| 2579 | + } |
|
| 2580 | + |
|
| 2581 | + $input_arr = explode(',', $input);
|
|
| 2582 | + |
|
| 2583 | + if (!empty($input_arr)) {
|
|
| 2584 | + foreach ($input_arr as $input_str) {
|
|
| 2585 | + $input_str = trim($input_str); |
|
| 2586 | + |
|
| 2587 | + if (strpos($input_str, "/") !== false) {
|
|
| 2588 | + $input_str = explode("/", $input_str, 2);
|
|
| 2589 | + $label = trim($input_str[0]); |
|
| 2590 | + if ($translated && $label != '') {
|
|
| 2591 | + $label = __($label, 'geodirectory'); |
|
| 2592 | + } |
|
| 2593 | + $label = geodir_utf8_ucfirst($label); |
|
| 2594 | + $value = trim($input_str[1]); |
|
| 2595 | + } else {
|
|
| 2596 | + $value = $input_str; |
|
| 2597 | + if ($translated && $input_str != '') {
|
|
| 2598 | + $input_str = __($input_str, 'geodirectory'); |
|
| 2599 | + } |
|
| 2600 | + $label = geodir_utf8_ucfirst($input_str); |
|
| 2601 | + } |
|
| 2602 | + |
|
| 2603 | + if ($label != '') {
|
|
| 2604 | + $return[] = array('label' => $label, 'value' => $value, 'optgroup' => NULL);
|
|
| 2605 | + } |
|
| 2606 | + } |
|
| 2607 | + } |
|
| 2608 | + |
|
| 2609 | + return $return; |
|
| 2610 | 2610 | } |
| 2611 | 2611 | |
| 2612 | 2612 | /** |
@@ -2621,66 +2621,66 @@ discard block |
||
| 2621 | 2621 | */ |
| 2622 | 2622 | function geodir_string_values_to_options($option_values = '', $translated = false) |
| 2623 | 2623 | {
|
| 2624 | - $options = array(); |
|
| 2625 | - if ($option_values == '') {
|
|
| 2626 | - return NULL; |
|
| 2627 | - } |
|
| 2628 | - |
|
| 2629 | - if (strpos($option_values, "{/optgroup}") !== false) {
|
|
| 2630 | - $option_values_arr = explode("{/optgroup}", $option_values);
|
|
| 2631 | - |
|
| 2632 | - foreach ($option_values_arr as $optgroup) {
|
|
| 2633 | - if (strpos($optgroup, "{optgroup}") !== false) {
|
|
| 2634 | - $optgroup_arr = explode("{optgroup}", $optgroup);
|
|
| 2635 | - |
|
| 2636 | - $count = 0; |
|
| 2637 | - foreach ($optgroup_arr as $optgroup_str) {
|
|
| 2638 | - $count++; |
|
| 2639 | - $optgroup_str = trim($optgroup_str); |
|
| 2640 | - |
|
| 2641 | - $optgroup_label = ''; |
|
| 2642 | - if (strpos($optgroup_str, "|") !== false) {
|
|
| 2643 | - $optgroup_str_arr = explode("|", $optgroup_str, 2);
|
|
| 2644 | - $optgroup_label = trim($optgroup_str_arr[0]); |
|
| 2645 | - if ($translated && $optgroup_label != '') {
|
|
| 2646 | - $optgroup_label = __($optgroup_label, 'geodirectory'); |
|
| 2647 | - } |
|
| 2648 | - $optgroup_label = geodir_utf8_ucfirst($optgroup_label); |
|
| 2649 | - $optgroup_str = $optgroup_str_arr[1]; |
|
| 2650 | - } |
|
| 2651 | - |
|
| 2652 | - $optgroup3 = geodir_string_to_options($optgroup_str, $translated); |
|
| 2653 | - |
|
| 2654 | - if ($count > 1 && $optgroup_label != '' && !empty($optgroup3)) {
|
|
| 2655 | - $optgroup_start = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'start'));
|
|
| 2656 | - $optgroup_end = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'end'));
|
|
| 2657 | - $optgroup3 = array_merge($optgroup_start, $optgroup3, $optgroup_end); |
|
| 2658 | - } |
|
| 2659 | - $options = array_merge($options, $optgroup3); |
|
| 2660 | - } |
|
| 2661 | - } else {
|
|
| 2662 | - $optgroup1 = geodir_string_to_options($optgroup, $translated); |
|
| 2663 | - $options = array_merge($options, $optgroup1); |
|
| 2664 | - } |
|
| 2665 | - } |
|
| 2666 | - } else {
|
|
| 2667 | - $options = geodir_string_to_options($option_values, $translated); |
|
| 2668 | - } |
|
| 2669 | - |
|
| 2670 | - return $options; |
|
| 2624 | + $options = array(); |
|
| 2625 | + if ($option_values == '') {
|
|
| 2626 | + return NULL; |
|
| 2627 | + } |
|
| 2628 | + |
|
| 2629 | + if (strpos($option_values, "{/optgroup}") !== false) {
|
|
| 2630 | + $option_values_arr = explode("{/optgroup}", $option_values);
|
|
| 2631 | + |
|
| 2632 | + foreach ($option_values_arr as $optgroup) {
|
|
| 2633 | + if (strpos($optgroup, "{optgroup}") !== false) {
|
|
| 2634 | + $optgroup_arr = explode("{optgroup}", $optgroup);
|
|
| 2635 | + |
|
| 2636 | + $count = 0; |
|
| 2637 | + foreach ($optgroup_arr as $optgroup_str) {
|
|
| 2638 | + $count++; |
|
| 2639 | + $optgroup_str = trim($optgroup_str); |
|
| 2640 | + |
|
| 2641 | + $optgroup_label = ''; |
|
| 2642 | + if (strpos($optgroup_str, "|") !== false) {
|
|
| 2643 | + $optgroup_str_arr = explode("|", $optgroup_str, 2);
|
|
| 2644 | + $optgroup_label = trim($optgroup_str_arr[0]); |
|
| 2645 | + if ($translated && $optgroup_label != '') {
|
|
| 2646 | + $optgroup_label = __($optgroup_label, 'geodirectory'); |
|
| 2647 | + } |
|
| 2648 | + $optgroup_label = geodir_utf8_ucfirst($optgroup_label); |
|
| 2649 | + $optgroup_str = $optgroup_str_arr[1]; |
|
| 2650 | + } |
|
| 2651 | + |
|
| 2652 | + $optgroup3 = geodir_string_to_options($optgroup_str, $translated); |
|
| 2653 | + |
|
| 2654 | + if ($count > 1 && $optgroup_label != '' && !empty($optgroup3)) {
|
|
| 2655 | + $optgroup_start = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'start'));
|
|
| 2656 | + $optgroup_end = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'end'));
|
|
| 2657 | + $optgroup3 = array_merge($optgroup_start, $optgroup3, $optgroup_end); |
|
| 2658 | + } |
|
| 2659 | + $options = array_merge($options, $optgroup3); |
|
| 2660 | + } |
|
| 2661 | + } else {
|
|
| 2662 | + $optgroup1 = geodir_string_to_options($optgroup, $translated); |
|
| 2663 | + $options = array_merge($options, $optgroup1); |
|
| 2664 | + } |
|
| 2665 | + } |
|
| 2666 | + } else {
|
|
| 2667 | + $options = geodir_string_to_options($option_values, $translated); |
|
| 2668 | + } |
|
| 2669 | + |
|
| 2670 | + return $options; |
|
| 2671 | 2671 | } |
| 2672 | 2672 | |
| 2673 | 2673 | |
| 2674 | 2674 | function geodir_cfa_data_type_text($output,$result_str,$cf,$field_info){
|
| 2675 | - ob_start(); |
|
| 2676 | - |
|
| 2677 | - $dt_value = ''; |
|
| 2678 | - if (isset($field_info->data_type)) {
|
|
| 2679 | - $dt_value = esc_attr($field_info->data_type); |
|
| 2680 | - }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
|
|
| 2681 | - $dt_value = $cf['defaults']['data_type']; |
|
| 2682 | - } |
|
| 2683 | - ?> |
|
| 2675 | + ob_start(); |
|
| 2676 | + |
|
| 2677 | + $dt_value = ''; |
|
| 2678 | + if (isset($field_info->data_type)) {
|
|
| 2679 | + $dt_value = esc_attr($field_info->data_type); |
|
| 2680 | + }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
|
|
| 2681 | + $dt_value = $cf['defaults']['data_type']; |
|
| 2682 | + } |
|
| 2683 | + ?> |
|
| 2684 | 2684 | <li> |
| 2685 | 2685 | <label for="data_type"><?php _e('Field Data Type ? :', 'geodirectory'); ?></label>
|
| 2686 | 2686 | <div class="gd-cf-input-wrap"> |
@@ -2689,16 +2689,16 @@ discard block |
||
| 2689 | 2689 | onchange="javascript:gd_data_type_changed(this, '<?php echo $result_str; ?>');"> |
| 2690 | 2690 | <option |
| 2691 | 2691 | value="XVARCHAR" <?php if ($dt_value == 'VARCHAR') {
|
| 2692 | - echo 'selected="selected"'; |
|
| 2693 | - } ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>
|
|
| 2692 | + echo 'selected="selected"'; |
|
| 2693 | + } ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>
|
|
| 2694 | 2694 | <option |
| 2695 | 2695 | value="INT" <?php if ($dt_value == 'INT') {
|
| 2696 | - echo 'selected="selected"'; |
|
| 2697 | - } ?>><?php _e('NUMBER', 'geodirectory'); ?></option>
|
|
| 2696 | + echo 'selected="selected"'; |
|
| 2697 | + } ?>><?php _e('NUMBER', 'geodirectory'); ?></option>
|
|
| 2698 | 2698 | <option |
| 2699 | 2699 | value="FLOAT" <?php if ($dt_value == 'FLOAT') {
|
| 2700 | - echo 'selected="selected"'; |
|
| 2701 | - } ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>
|
|
| 2700 | + echo 'selected="selected"'; |
|
| 2701 | + } ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>
|
|
| 2702 | 2702 | </select> |
| 2703 | 2703 | <br/> <span><?php _e('Select Custom Field type', 'geodirectory'); ?></span>
|
| 2704 | 2704 | |
@@ -2706,13 +2706,13 @@ discard block |
||
| 2706 | 2706 | </li> |
| 2707 | 2707 | |
| 2708 | 2708 | <?php |
| 2709 | - $value = ''; |
|
| 2710 | - if (isset($field_info->decimal_point)) {
|
|
| 2711 | - $value = esc_attr($field_info->decimal_point); |
|
| 2712 | - }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
|
|
| 2713 | - $value = $cf['defaults']['decimal_point']; |
|
| 2714 | - } |
|
| 2715 | - ?> |
|
| 2709 | + $value = ''; |
|
| 2710 | + if (isset($field_info->decimal_point)) {
|
|
| 2711 | + $value = esc_attr($field_info->decimal_point); |
|
| 2712 | + }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
|
|
| 2713 | + $value = $cf['defaults']['decimal_point']; |
|
| 2714 | + } |
|
| 2715 | + ?> |
|
| 2716 | 2716 | |
| 2717 | 2717 | <li class="decimal-point-wrapper" |
| 2718 | 2718 | style="<?php echo ($dt_value == 'FLOAT') ? '' : 'display:none' ?>"> |
@@ -2721,7 +2721,7 @@ discard block |
||
| 2721 | 2721 | <select name="decimal_point" id="decimal_point"> |
| 2722 | 2722 | <option value=""><?php echo _e('Select', 'geodirectory'); ?></option>
|
| 2723 | 2723 | <?php for ($i = 1; $i <= 10; $i++) {
|
| 2724 | - $selected = $i == $value ? 'selected="selected"' : ''; ?> |
|
| 2724 | + $selected = $i == $value ? 'selected="selected"' : ''; ?> |
|
| 2725 | 2725 | <option value="<?php echo $i; ?>" <?php echo $selected; ?>><?php echo $i; ?></option> |
| 2726 | 2726 | <?php } ?> |
| 2727 | 2727 | </select> |
@@ -2730,8 +2730,8 @@ discard block |
||
| 2730 | 2730 | </li> |
| 2731 | 2731 | <?php |
| 2732 | 2732 | |
| 2733 | - $output = ob_get_clean(); |
|
| 2734 | - return $output; |
|
| 2733 | + $output = ob_get_clean(); |
|
| 2734 | + return $output; |
|
| 2735 | 2735 | } |
| 2736 | 2736 | add_filter('geodir_cfa_data_type_text','geodir_cfa_data_type_text',10,4);
|
| 2737 | 2737 | |
@@ -2767,9 +2767,9 @@ discard block |
||
| 2767 | 2767 | |
| 2768 | 2768 | |
| 2769 | 2769 | function geodir_cfa_advanced_editor_geodir_special_offers($output,$result_str,$cf,$field_info){
|
| 2770 | - if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}
|
|
| 2771 | - ob_start(); |
|
| 2772 | - ?> |
|
| 2770 | + if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}
|
|
| 2771 | + ob_start(); |
|
| 2772 | + ?> |
|
| 2773 | 2773 | <li> |
| 2774 | 2774 | <label for="advanced_editor" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show advanced editor :', 'geodirectory'); ?>
|
| 2775 | 2775 | <div class="gdcf-tooltip"> |
@@ -2780,13 +2780,13 @@ discard block |
||
| 2780 | 2780 | <div class="gd-cf-input-wrap"> |
| 2781 | 2781 | |
| 2782 | 2782 | <?php |
| 2783 | - $selected = ''; |
|
| 2784 | - if (isset($field_info->extra_fields)) |
|
| 2785 | - $advanced_editor = unserialize($field_info->extra_fields); |
|
| 2783 | + $selected = ''; |
|
| 2784 | + if (isset($field_info->extra_fields)) |
|
| 2785 | + $advanced_editor = unserialize($field_info->extra_fields); |
|
| 2786 | 2786 | |
| 2787 | - if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))
|
|
| 2788 | - $selected = 'checked="checked"'; |
|
| 2789 | - ?> |
|
| 2787 | + if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))
|
|
| 2788 | + $selected = 'checked="checked"'; |
|
| 2789 | + ?> |
|
| 2790 | 2790 | |
| 2791 | 2791 | <input type="checkbox" name="advanced_editor[]" id="advanced_editor" |
| 2792 | 2792 | value="1" <?php echo $selected; ?>/> |
@@ -2795,22 +2795,22 @@ discard block |
||
| 2795 | 2795 | </li> |
| 2796 | 2796 | <?php |
| 2797 | 2797 | |
| 2798 | - $output = ob_get_clean(); |
|
| 2799 | - return $output; |
|
| 2798 | + $output = ob_get_clean(); |
|
| 2799 | + return $output; |
|
| 2800 | 2800 | } |
| 2801 | 2801 | add_filter('geodir_cfa_advanced_editor_textarea','geodir_cfa_advanced_editor_geodir_special_offers',10,4);
|
| 2802 | 2802 | |
| 2803 | 2803 | |
| 2804 | 2804 | function geodir_cfa_validation_pattern_text($output,$result_str,$cf,$field_info){
|
| 2805 | - ob_start(); |
|
| 2806 | - |
|
| 2807 | - $value = ''; |
|
| 2808 | - if (isset($field_info->validation_pattern)) {
|
|
| 2809 | - $value = esc_attr($field_info->validation_pattern); |
|
| 2810 | - }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
|
|
| 2811 | - $value = esc_attr($cf['defaults']['validation_pattern']); |
|
| 2812 | - } |
|
| 2813 | - ?> |
|
| 2805 | + ob_start(); |
|
| 2806 | + |
|
| 2807 | + $value = ''; |
|
| 2808 | + if (isset($field_info->validation_pattern)) {
|
|
| 2809 | + $value = esc_attr($field_info->validation_pattern); |
|
| 2810 | + }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
|
|
| 2811 | + $value = esc_attr($cf['defaults']['validation_pattern']); |
|
| 2812 | + } |
|
| 2813 | + ?> |
|
| 2814 | 2814 | <li> |
| 2815 | 2815 | <label for="validation_pattern" class="gd-cf-tooltip-wrap"> |
| 2816 | 2816 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Validation Pattern:', 'geodirectory'); ?>
|
@@ -2824,13 +2824,13 @@ discard block |
||
| 2824 | 2824 | </div> |
| 2825 | 2825 | </li> |
| 2826 | 2826 | <?php |
| 2827 | - $value = ''; |
|
| 2828 | - if (isset($field_info->validation_msg)) {
|
|
| 2829 | - $value = esc_attr($field_info->validation_msg); |
|
| 2830 | - }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
|
|
| 2831 | - $value = esc_attr($cf['defaults']['validation_msg']); |
|
| 2832 | - } |
|
| 2833 | - ?> |
|
| 2827 | + $value = ''; |
|
| 2828 | + if (isset($field_info->validation_msg)) {
|
|
| 2829 | + $value = esc_attr($field_info->validation_msg); |
|
| 2830 | + }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
|
|
| 2831 | + $value = esc_attr($cf['defaults']['validation_msg']); |
|
| 2832 | + } |
|
| 2833 | + ?> |
|
| 2834 | 2834 | <li> |
| 2835 | 2835 | <label for="validation_msg" class="gd-cf-tooltip-wrap"> |
| 2836 | 2836 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Validation Message:', 'geodirectory'); ?>
|
@@ -2845,21 +2845,21 @@ discard block |
||
| 2845 | 2845 | </li> |
| 2846 | 2846 | <?php |
| 2847 | 2847 | |
| 2848 | - $output = ob_get_clean(); |
|
| 2849 | - return $output; |
|
| 2848 | + $output = ob_get_clean(); |
|
| 2849 | + return $output; |
|
| 2850 | 2850 | } |
| 2851 | 2851 | add_filter('geodir_cfa_validation_pattern_text','geodir_cfa_validation_pattern_text',10,4);
|
| 2852 | 2852 | |
| 2853 | 2853 | |
| 2854 | 2854 | function geodir_cfa_htmlvar_name_taxonomy($output,$result_str,$cf,$field_info){
|
| 2855 | - ob_start(); |
|
| 2856 | - global $post_type; |
|
| 2857 | - |
|
| 2858 | - if (!isset($field_info->post_type)) {
|
|
| 2859 | - $post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2860 | - } else |
|
| 2861 | - $post_type = $field_info->post_type; |
|
| 2862 | - ?> |
|
| 2855 | + ob_start(); |
|
| 2856 | + global $post_type; |
|
| 2857 | + |
|
| 2858 | + if (!isset($field_info->post_type)) {
|
|
| 2859 | + $post_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2860 | + } else |
|
| 2861 | + $post_type = $field_info->post_type; |
|
| 2862 | + ?> |
|
| 2863 | 2863 | <li style="display: none;"> |
| 2864 | 2864 | <label for="htmlvar_name" class="gd-cf-tooltip-wrap"> |
| 2865 | 2865 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Select taxonomy:', 'geodirectory'); ?>
|
@@ -2870,15 +2870,15 @@ discard block |
||
| 2870 | 2870 | <div class="gd-cf-input-wrap"> |
| 2871 | 2871 | <select name="htmlvar_name" id="htmlvar_name"> |
| 2872 | 2872 | <?php |
| 2873 | - $gd_taxonomy = geodir_get_taxonomies($post_type); |
|
| 2873 | + $gd_taxonomy = geodir_get_taxonomies($post_type); |
|
| 2874 | 2874 | |
| 2875 | - foreach ($gd_taxonomy as $gd_tax) {
|
|
| 2876 | - ?> |
|
| 2875 | + foreach ($gd_taxonomy as $gd_tax) {
|
|
| 2876 | + ?> |
|
| 2877 | 2877 | <option <?php if (isset($field_info->htmlvar_name) && $field_info->htmlvar_name == $gd_tax) {
|
| 2878 | - echo 'selected="selected"'; |
|
| 2879 | - }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php |
|
| 2880 | - } |
|
| 2881 | - ?> |
|
| 2878 | + echo 'selected="selected"'; |
|
| 2879 | + }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php |
|
| 2880 | + } |
|
| 2881 | + ?> |
|
| 2882 | 2882 | </select> |
| 2883 | 2883 | </div> |
| 2884 | 2884 | </li> |
@@ -2894,49 +2894,49 @@ discard block |
||
| 2894 | 2894 | |
| 2895 | 2895 | <select name="cat_display_type" id="cat_display_type"> |
| 2896 | 2896 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'ajax_chained') {
|
| 2897 | - echo 'selected="selected"'; |
|
| 2898 | - }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>
|
|
| 2897 | + echo 'selected="selected"'; |
|
| 2898 | + }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>
|
|
| 2899 | 2899 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
|
| 2900 | - echo 'selected="selected"'; |
|
| 2901 | - }?> value="select"><?php _e('Select', 'geodirectory');?></option>
|
|
| 2900 | + echo 'selected="selected"'; |
|
| 2901 | + }?> value="select"><?php _e('Select', 'geodirectory');?></option>
|
|
| 2902 | 2902 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'multiselect') {
|
| 2903 | - echo 'selected="selected"'; |
|
| 2904 | - }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>
|
|
| 2903 | + echo 'selected="selected"'; |
|
| 2904 | + }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>
|
|
| 2905 | 2905 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
|
| 2906 | - echo 'selected="selected"'; |
|
| 2907 | - }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
|
|
| 2906 | + echo 'selected="selected"'; |
|
| 2907 | + }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
|
|
| 2908 | 2908 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
|
| 2909 | - echo 'selected="selected"'; |
|
| 2910 | - }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
|
|
| 2909 | + echo 'selected="selected"'; |
|
| 2910 | + }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
|
|
| 2911 | 2911 | </select> |
| 2912 | 2912 | </div> |
| 2913 | 2913 | </li> |
| 2914 | 2914 | <?php |
| 2915 | 2915 | |
| 2916 | - $output = ob_get_clean(); |
|
| 2917 | - return $output; |
|
| 2916 | + $output = ob_get_clean(); |
|
| 2917 | + return $output; |
|
| 2918 | 2918 | } |
| 2919 | 2919 | add_filter('geodir_cfa_htmlvar_name_taxonomy','geodir_cfa_htmlvar_name_taxonomy',10,4);
|
| 2920 | 2920 | |
| 2921 | 2921 | |
| 2922 | 2922 | function geodir_cfa_extra_fields_address($output,$result_str,$cf,$field_info){
|
| 2923 | 2923 | |
| 2924 | - ob_start(); |
|
| 2925 | - if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
|
|
| 2926 | - $address = stripslashes_deep(unserialize($field_info->extra_fields)); |
|
| 2927 | - } |
|
| 2924 | + ob_start(); |
|
| 2925 | + if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
|
|
| 2926 | + $address = stripslashes_deep(unserialize($field_info->extra_fields)); |
|
| 2927 | + } |
|
| 2928 | 2928 | |
| 2929 | - $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500); |
|
| 2930 | - ?> |
|
| 2929 | + $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500); |
|
| 2930 | + ?> |
|
| 2931 | 2931 | <?php |
| 2932 | - /** |
|
| 2933 | - * Called on the add custom fields settings page before the address field is output. |
|
| 2934 | - * |
|
| 2935 | - * @since 1.0.0 |
|
| 2936 | - * @param array $address The address settings array. |
|
| 2937 | - * @param object $field_info Extra fields info. |
|
| 2938 | - */ |
|
| 2939 | - do_action('geodir_address_extra_admin_fields', $address, $field_info); ?>
|
|
| 2932 | + /** |
|
| 2933 | + * Called on the add custom fields settings page before the address field is output. |
|
| 2934 | + * |
|
| 2935 | + * @since 1.0.0 |
|
| 2936 | + * @param array $address The address settings array. |
|
| 2937 | + * @param object $field_info Extra fields info. |
|
| 2938 | + */ |
|
| 2939 | + do_action('geodir_address_extra_admin_fields', $address, $field_info); ?>
|
|
| 2940 | 2940 | |
| 2941 | 2941 | <li> |
| 2942 | 2942 | <label for="show_zip" class="gd-cf-tooltip-wrap"> |
@@ -2949,14 +2949,14 @@ discard block |
||
| 2949 | 2949 | |
| 2950 | 2950 | <input type="radio" id="show_zip_yes<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-enabled" value="1" |
| 2951 | 2951 | <?php if (isset($address['show_zip']) && $address['show_zip'] == '1') {
|
| 2952 | - echo 'checked'; |
|
| 2953 | - } ?>/> |
|
| 2952 | + echo 'checked'; |
|
| 2953 | + } ?>/> |
|
| 2954 | 2954 | <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 2955 | 2955 | |
| 2956 | 2956 | <input type="radio" id="show_zip_no<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-disabled" value="0" |
| 2957 | 2957 | <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {
|
| 2958 | - echo 'checked'; |
|
| 2959 | - } ?>/> |
|
| 2958 | + echo 'checked'; |
|
| 2959 | + } ?>/> |
|
| 2960 | 2960 | <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 2961 | 2961 | |
| 2962 | 2962 | |
@@ -2973,8 +2973,8 @@ discard block |
||
| 2973 | 2973 | <div class="gd-cf-input-wrap"> |
| 2974 | 2974 | <input type="text" name="extra[zip_lable]" id="zip_lable" |
| 2975 | 2975 | value="<?php if (isset($address['zip_lable'])) {
|
| 2976 | - echo esc_attr($address['zip_lable']); |
|
| 2977 | - }?>"/> |
|
| 2976 | + echo esc_attr($address['zip_lable']); |
|
| 2977 | + }?>"/> |
|
| 2978 | 2978 | </div> |
| 2979 | 2979 | </li> |
| 2980 | 2980 | |
@@ -2991,8 +2991,8 @@ discard block |
||
| 2991 | 2991 | <div class="gd-cf-input-wrap"> |
| 2992 | 2992 | <input type="text" name="extra[map_lable]" id="map_lable" |
| 2993 | 2993 | value="<?php if (isset($address['map_lable'])) {
|
| 2994 | - echo esc_attr($address['map_lable']); |
|
| 2995 | - }?>"/> |
|
| 2994 | + echo esc_attr($address['map_lable']); |
|
| 2995 | + }?>"/> |
|
| 2996 | 2996 | </div> |
| 2997 | 2997 | </li> |
| 2998 | 2998 | |
@@ -3007,14 +3007,14 @@ discard block |
||
| 3007 | 3007 | |
| 3008 | 3008 | <input type="radio" id="show_mapzoom_yes<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-enabled" value="1" |
| 3009 | 3009 | <?php if (isset($address['show_mapzoom']) && $address['show_mapzoom'] == '1') {
|
| 3010 | - echo 'checked'; |
|
| 3011 | - } ?>/> |
|
| 3010 | + echo 'checked'; |
|
| 3011 | + } ?>/> |
|
| 3012 | 3012 | <label for="show_mapzoom_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 3013 | 3013 | |
| 3014 | 3014 | <input type="radio" id="show_mapzoom_no<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0" |
| 3015 | 3015 | <?php if ((isset($address['show_mapzoom']) && !$address['show_mapzoom']) || !isset($address['show_mapzoom'])) {
|
| 3016 | - echo 'checked'; |
|
| 3017 | - } ?>/> |
|
| 3016 | + echo 'checked'; |
|
| 3017 | + } ?>/> |
|
| 3018 | 3018 | <label for="show_mapzoom_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 3019 | 3019 | |
| 3020 | 3020 | </div> |
@@ -3031,14 +3031,14 @@ discard block |
||
| 3031 | 3031 | |
| 3032 | 3032 | <input type="radio" id="show_mapview_yes<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-enabled" value="1" |
| 3033 | 3033 | <?php if (isset($address['show_mapview']) && $address['show_mapview'] == '1') {
|
| 3034 | - echo 'checked'; |
|
| 3035 | - } ?>/> |
|
| 3034 | + echo 'checked'; |
|
| 3035 | + } ?>/> |
|
| 3036 | 3036 | <label for="show_mapview_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 3037 | 3037 | |
| 3038 | 3038 | <input type="radio" id="show_mapview_no<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-disabled" value="0" |
| 3039 | 3039 | <?php if ((isset($address['show_mapview']) && !$address['show_mapview']) || !isset($address['show_mapview'])) {
|
| 3040 | - echo 'checked'; |
|
| 3041 | - } ?>/> |
|
| 3040 | + echo 'checked'; |
|
| 3041 | + } ?>/> |
|
| 3042 | 3042 | <label for="show_mapview_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 3043 | 3043 | |
| 3044 | 3044 | </div> |
@@ -3055,8 +3055,8 @@ discard block |
||
| 3055 | 3055 | <div class="gd-cf-input-wrap"> |
| 3056 | 3056 | <input type="text" name="extra[mapview_lable]" id="mapview_lable" |
| 3057 | 3057 | value="<?php if (isset($address['mapview_lable'])) {
|
| 3058 | - echo esc_attr($address['mapview_lable']); |
|
| 3059 | - }?>"/> |
|
| 3058 | + echo esc_attr($address['mapview_lable']); |
|
| 3059 | + }?>"/> |
|
| 3060 | 3060 | </div> |
| 3061 | 3061 | </li> |
| 3062 | 3062 | <li> |
@@ -3070,29 +3070,29 @@ discard block |
||
| 3070 | 3070 | |
| 3071 | 3071 | <input type="radio" id="show_latlng_yes<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-enabled" value="1" |
| 3072 | 3072 | <?php if (isset($address['show_latlng']) && $address['show_latlng'] == '1') {
|
| 3073 | - echo 'checked'; |
|
| 3074 | - } ?>/> |
|
| 3073 | + echo 'checked'; |
|
| 3074 | + } ?>/> |
|
| 3075 | 3075 | <label for="show_latlng_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 3076 | 3076 | |
| 3077 | 3077 | <input type="radio" id="show_latlng_no<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-disabled" value="0" |
| 3078 | 3078 | <?php if ((isset($address['show_latlng']) && !$address['show_latlng']) || !isset($address['show_latlng'])) {
|
| 3079 | - echo 'checked'; |
|
| 3080 | - } ?>/> |
|
| 3079 | + echo 'checked'; |
|
| 3080 | + } ?>/> |
|
| 3081 | 3081 | <label for="show_latlng_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 3082 | 3082 | |
| 3083 | 3083 | </div> |
| 3084 | 3084 | </li> |
| 3085 | 3085 | <?php |
| 3086 | 3086 | |
| 3087 | - $html = ob_get_clean(); |
|
| 3088 | - return $output.$html; |
|
| 3087 | + $html = ob_get_clean(); |
|
| 3088 | + return $output.$html; |
|
| 3089 | 3089 | } |
| 3090 | 3090 | add_filter('geodir_cfa_extra_fields_address','geodir_cfa_extra_fields_address',10,4);
|
| 3091 | 3091 | |
| 3092 | 3092 | |
| 3093 | 3093 | function geodir_cfa_extra_fields_multiselect($output,$result_str,$cf,$field_info){
|
| 3094 | - ob_start(); |
|
| 3095 | - ?> |
|
| 3094 | + ob_start(); |
|
| 3095 | + ?> |
|
| 3096 | 3096 | <li> |
| 3097 | 3097 | <label for="multi_display_type" class="gd-cf-tooltip-wrap"> |
| 3098 | 3098 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Multiselect display type :', 'geodirectory'); ?>
|
@@ -3104,14 +3104,14 @@ discard block |
||
| 3104 | 3104 | |
| 3105 | 3105 | <select name="multi_display_type" id="multi_display_type"> |
| 3106 | 3106 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
|
| 3107 | - echo 'selected="selected"'; |
|
| 3108 | - }?> value="select"><?php _e('Select', 'geodirectory');?></option>
|
|
| 3107 | + echo 'selected="selected"'; |
|
| 3108 | + }?> value="select"><?php _e('Select', 'geodirectory');?></option>
|
|
| 3109 | 3109 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
|
| 3110 | - echo 'selected="selected"'; |
|
| 3111 | - }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
|
|
| 3110 | + echo 'selected="selected"'; |
|
| 3111 | + }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
|
|
| 3112 | 3112 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
|
| 3113 | - echo 'selected="selected"'; |
|
| 3114 | - }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
|
|
| 3113 | + echo 'selected="selected"'; |
|
| 3114 | + }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
|
|
| 3115 | 3115 | </select> |
| 3116 | 3116 | |
| 3117 | 3117 | <br/> |
@@ -3119,25 +3119,25 @@ discard block |
||
| 3119 | 3119 | </li> |
| 3120 | 3120 | <?php |
| 3121 | 3121 | |
| 3122 | - $html = ob_get_clean(); |
|
| 3123 | - return $output.$html; |
|
| 3122 | + $html = ob_get_clean(); |
|
| 3123 | + return $output.$html; |
|
| 3124 | 3124 | } |
| 3125 | 3125 | add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_multiselect',10,4);
|
| 3126 | 3126 | |
| 3127 | 3127 | |
| 3128 | 3128 | function geodir_cfa_extra_fields_smr($output,$result_str,$cf,$field_info){
|
| 3129 | 3129 | |
| 3130 | - ob_start(); |
|
| 3130 | + ob_start(); |
|
| 3131 | 3131 | |
| 3132 | - $value = ''; |
|
| 3133 | - if (isset($field_info->option_values)) {
|
|
| 3134 | - $value = esc_attr($field_info->option_values); |
|
| 3135 | - }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
|
|
| 3136 | - $value = esc_attr($cf['defaults']['option_values']); |
|
| 3137 | - } |
|
| 3132 | + $value = ''; |
|
| 3133 | + if (isset($field_info->option_values)) {
|
|
| 3134 | + $value = esc_attr($field_info->option_values); |
|
| 3135 | + }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
|
|
| 3136 | + $value = esc_attr($cf['defaults']['option_values']); |
|
| 3137 | + } |
|
| 3138 | 3138 | |
| 3139 | - $field_type = isset($field_info->field_type) ? $field_info->field_type : ''; |
|
| 3140 | - ?> |
|
| 3139 | + $field_type = isset($field_info->field_type) ? $field_info->field_type : ''; |
|
| 3140 | + ?> |
|
| 3141 | 3141 | <li> |
| 3142 | 3142 | <label for="option_values" class="gd-cf-tooltip-wrap"> |
| 3143 | 3143 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Option Values :', 'geodirectory'); ?>
|
@@ -3164,8 +3164,8 @@ discard block |
||
| 3164 | 3164 | </li> |
| 3165 | 3165 | <?php |
| 3166 | 3166 | |
| 3167 | - $html = ob_get_clean(); |
|
| 3168 | - return $output.$html; |
|
| 3167 | + $html = ob_get_clean(); |
|
| 3168 | + return $output.$html; |
|
| 3169 | 3169 | } |
| 3170 | 3170 | add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_smr',10,4);
|
| 3171 | 3171 | add_filter('geodir_cfa_extra_fields_select','geodir_cfa_extra_fields_smr',10,4);
|
@@ -3173,12 +3173,12 @@ discard block |
||
| 3173 | 3173 | |
| 3174 | 3174 | |
| 3175 | 3175 | function geodir_cfa_extra_fields_datepicker($output,$result_str,$cf,$field_info){
|
| 3176 | - ob_start(); |
|
| 3177 | - $extra = array(); |
|
| 3178 | - if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
|
|
| 3179 | - $extra = unserialize($field_info->extra_fields); |
|
| 3180 | - } |
|
| 3181 | - ?> |
|
| 3176 | + ob_start(); |
|
| 3177 | + $extra = array(); |
|
| 3178 | + if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
|
|
| 3179 | + $extra = unserialize($field_info->extra_fields); |
|
| 3180 | + } |
|
| 3181 | + ?> |
|
| 3182 | 3182 | <li> |
| 3183 | 3183 | <label for="date_format" class="gd-cf-tooltip-wrap"> |
| 3184 | 3184 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Date Format :', 'geodirectory'); ?>
|
@@ -3188,52 +3188,52 @@ discard block |
||
| 3188 | 3188 | </label> |
| 3189 | 3189 | <div class="gd-cf-input-wrap" style="overflow:inherit;"> |
| 3190 | 3190 | <?php |
| 3191 | - $date_formats = array( |
|
| 3192 | - 'm/d/Y', |
|
| 3193 | - 'd/m/Y', |
|
| 3194 | - 'Y/m/d', |
|
| 3195 | - 'm-d-Y', |
|
| 3196 | - 'd-m-Y', |
|
| 3197 | - 'Y-m-d', |
|
| 3198 | - 'F j, Y', |
|
| 3199 | - ); |
|
| 3200 | - /** |
|
| 3201 | - * Filter the custom field date format options. |
|
| 3202 | - * |
|
| 3203 | - * @since 1.6.5 |
|
| 3204 | - * @param array $date_formats The PHP date format array. |
|
| 3205 | - */ |
|
| 3206 | - $date_formats = apply_filters('geodir_date_formats',$date_formats);
|
|
| 3207 | - ?> |
|
| 3191 | + $date_formats = array( |
|
| 3192 | + 'm/d/Y', |
|
| 3193 | + 'd/m/Y', |
|
| 3194 | + 'Y/m/d', |
|
| 3195 | + 'm-d-Y', |
|
| 3196 | + 'd-m-Y', |
|
| 3197 | + 'Y-m-d', |
|
| 3198 | + 'F j, Y', |
|
| 3199 | + ); |
|
| 3200 | + /** |
|
| 3201 | + * Filter the custom field date format options. |
|
| 3202 | + * |
|
| 3203 | + * @since 1.6.5 |
|
| 3204 | + * @param array $date_formats The PHP date format array. |
|
| 3205 | + */ |
|
| 3206 | + $date_formats = apply_filters('geodir_date_formats',$date_formats);
|
|
| 3207 | + ?> |
|
| 3208 | 3208 | <select name="extra[date_format]" id="date_format"> |
| 3209 | 3209 | <?php |
| 3210 | - foreach($date_formats as $format){
|
|
| 3211 | - $selected = ''; |
|
| 3212 | - if(!empty($extra) && esc_attr($extra['date_format'])==$format){
|
|
| 3213 | - $selected = "selected='selected'"; |
|
| 3214 | - } |
|
| 3215 | - echo "<option $selected value='$format'>$format (".date_i18n( $format, time()).")</option>";
|
|
| 3216 | - } |
|
| 3217 | - ?> |
|
| 3210 | + foreach($date_formats as $format){
|
|
| 3211 | + $selected = ''; |
|
| 3212 | + if(!empty($extra) && esc_attr($extra['date_format'])==$format){
|
|
| 3213 | + $selected = "selected='selected'"; |
|
| 3214 | + } |
|
| 3215 | + echo "<option $selected value='$format'>$format (".date_i18n( $format, time()).")</option>";
|
|
| 3216 | + } |
|
| 3217 | + ?> |
|
| 3218 | 3218 | </select> |
| 3219 | 3219 | |
| 3220 | 3220 | </div> |
| 3221 | 3221 | </li> |
| 3222 | 3222 | <?php |
| 3223 | 3223 | |
| 3224 | - $html = ob_get_clean(); |
|
| 3225 | - return $output.$html; |
|
| 3224 | + $html = ob_get_clean(); |
|
| 3225 | + return $output.$html; |
|
| 3226 | 3226 | } |
| 3227 | 3227 | add_filter('geodir_cfa_extra_fields_datepicker','geodir_cfa_extra_fields_datepicker',10,4);
|
| 3228 | 3228 | |
| 3229 | 3229 | |
| 3230 | 3230 | function geodir_cfa_extra_fields_file($output,$result_str,$cf,$field_info){
|
| 3231 | - ob_start(); |
|
| 3232 | - $allowed_file_types = geodir_allowed_mime_types(); |
|
| 3231 | + ob_start(); |
|
| 3232 | + $allowed_file_types = geodir_allowed_mime_types(); |
|
| 3233 | 3233 | |
| 3234 | - $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : ''; |
|
| 3235 | - $gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');
|
|
| 3236 | - ?> |
|
| 3234 | + $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : ''; |
|
| 3235 | + $gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');
|
|
| 3236 | + ?> |
|
| 3237 | 3237 | <li> |
| 3238 | 3238 | <label for="gd_file_types" class="gd-cf-tooltip-wrap"> |
| 3239 | 3239 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Allowed file types :', 'geodirectory'); ?>
|
@@ -3256,33 +3256,33 @@ discard block |
||
| 3256 | 3256 | </li> |
| 3257 | 3257 | <?php |
| 3258 | 3258 | |
| 3259 | - $html = ob_get_clean(); |
|
| 3260 | - return $output.$html; |
|
| 3259 | + $html = ob_get_clean(); |
|
| 3260 | + return $output.$html; |
|
| 3261 | 3261 | } |
| 3262 | 3262 | add_filter('geodir_cfa_extra_fields_file','geodir_cfa_extra_fields_file',10,4);
|
| 3263 | 3263 | |
| 3264 | 3264 | function geodir_cfa_extra_fields_text($output,$result_str,$cf,$field_info){
|
| 3265 | - ob_start(); |
|
| 3265 | + ob_start(); |
|
| 3266 | 3266 | |
| 3267 | - $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : ''; |
|
| 3267 | + $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : ''; |
|
| 3268 | 3268 | // print_r($cf);echo '###'; |
| 3269 | 3269 | |
| 3270 | 3270 | |
| 3271 | 3271 | |
| 3272 | - $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500); |
|
| 3272 | + $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500); |
|
| 3273 | 3273 | |
| 3274 | 3274 | |
| 3275 | - $value = ''; |
|
| 3276 | - if ($extra_fields && isset($extra_fields['is_price'])) {
|
|
| 3277 | - $value = esc_attr($extra_fields['is_price']); |
|
| 3278 | - }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){
|
|
| 3279 | - $value = esc_attr($cf['defaults']['extra_fields']['is_price']); |
|
| 3280 | - } |
|
| 3275 | + $value = ''; |
|
| 3276 | + if ($extra_fields && isset($extra_fields['is_price'])) {
|
|
| 3277 | + $value = esc_attr($extra_fields['is_price']); |
|
| 3278 | + }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){
|
|
| 3279 | + $value = esc_attr($cf['defaults']['extra_fields']['is_price']); |
|
| 3280 | + } |
|
| 3281 | 3281 | |
| 3282 | - $show_price_extra = ($value==1) ? 1 : 0; |
|
| 3282 | + $show_price_extra = ($value==1) ? 1 : 0; |
|
| 3283 | 3283 | |
| 3284 | - $show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0; |
|
| 3285 | - ?> |
|
| 3284 | + $show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0; |
|
| 3285 | + ?> |
|
| 3286 | 3286 | <li class="gdcf-price-extra-set" <?php if(!$show_price){ echo "style='display:none;'";}?>>
|
| 3287 | 3287 | <label for="is_price" class="gd-cf-tooltip-wrap"> |
| 3288 | 3288 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display as price? :', 'geodirectory'); ?>
|
@@ -3294,14 +3294,14 @@ discard block |
||
| 3294 | 3294 | |
| 3295 | 3295 | <input type="radio" id="is_price_yes<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-enabled" value="1" |
| 3296 | 3296 | <?php if ($value == '1') {
|
| 3297 | - echo 'checked'; |
|
| 3298 | - } ?>/> |
|
| 3297 | + echo 'checked'; |
|
| 3298 | + } ?>/> |
|
| 3299 | 3299 | <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
| 3300 | 3300 | |
| 3301 | 3301 | <input type="radio" id="is_price_no<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-disabled" value="0" |
| 3302 | 3302 | <?php if ($value == '0' || !$value) {
|
| 3303 | - echo 'checked'; |
|
| 3304 | - } ?>/> |
|
| 3303 | + echo 'checked'; |
|
| 3304 | + } ?>/> |
|
| 3305 | 3305 | <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
| 3306 | 3306 | |
| 3307 | 3307 | </div> |
@@ -3309,13 +3309,13 @@ discard block |
||
| 3309 | 3309 | |
| 3310 | 3310 | <?php |
| 3311 | 3311 | |
| 3312 | - $value = ''; |
|
| 3313 | - if ($extra_fields && isset($extra_fields['thousand_separator'])) {
|
|
| 3314 | - $value = esc_attr($extra_fields['thousand_separator']); |
|
| 3315 | - }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){
|
|
| 3316 | - $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']); |
|
| 3317 | - } |
|
| 3318 | - ?> |
|
| 3312 | + $value = ''; |
|
| 3313 | + if ($extra_fields && isset($extra_fields['thousand_separator'])) {
|
|
| 3314 | + $value = esc_attr($extra_fields['thousand_separator']); |
|
| 3315 | + }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){
|
|
| 3316 | + $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']); |
|
| 3317 | + } |
|
| 3318 | + ?> |
|
| 3319 | 3319 | <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
|
| 3320 | 3320 | <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory');?>
|
| 3321 | 3321 | <div class="gdcf-tooltip"> |
@@ -3336,13 +3336,13 @@ discard block |
||
| 3336 | 3336 | |
| 3337 | 3337 | <?php |
| 3338 | 3338 | |
| 3339 | - $value = ''; |
|
| 3340 | - if ($extra_fields && isset($extra_fields['decimal_separator'])) {
|
|
| 3341 | - $value = esc_attr($extra_fields['decimal_separator']); |
|
| 3342 | - }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){
|
|
| 3343 | - $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']); |
|
| 3344 | - } |
|
| 3345 | - ?> |
|
| 3339 | + $value = ''; |
|
| 3340 | + if ($extra_fields && isset($extra_fields['decimal_separator'])) {
|
|
| 3341 | + $value = esc_attr($extra_fields['decimal_separator']); |
|
| 3342 | + }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){
|
|
| 3343 | + $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']); |
|
| 3344 | + } |
|
| 3345 | + ?> |
|
| 3346 | 3346 | <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
|
| 3347 | 3347 | <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory');?>
|
| 3348 | 3348 | <div class="gdcf-tooltip"> |
@@ -3359,13 +3359,13 @@ discard block |
||
| 3359 | 3359 | |
| 3360 | 3360 | <?php |
| 3361 | 3361 | |
| 3362 | - $value = ''; |
|
| 3363 | - if ($extra_fields && isset($extra_fields['decimal_display'])) {
|
|
| 3364 | - $value = esc_attr($extra_fields['decimal_display']); |
|
| 3365 | - }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){
|
|
| 3366 | - $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']); |
|
| 3367 | - } |
|
| 3368 | - ?> |
|
| 3362 | + $value = ''; |
|
| 3363 | + if ($extra_fields && isset($extra_fields['decimal_display'])) {
|
|
| 3364 | + $value = esc_attr($extra_fields['decimal_display']); |
|
| 3365 | + }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){
|
|
| 3366 | + $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']); |
|
| 3367 | + } |
|
| 3368 | + ?> |
|
| 3369 | 3369 | <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
|
| 3370 | 3370 | <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory');?>
|
| 3371 | 3371 | <div class="gdcf-tooltip"> |
@@ -3382,13 +3382,13 @@ discard block |
||
| 3382 | 3382 | |
| 3383 | 3383 | <?php |
| 3384 | 3384 | |
| 3385 | - $value = ''; |
|
| 3386 | - if ($extra_fields && isset($extra_fields['currency_symbol'])) {
|
|
| 3387 | - $value = esc_attr($extra_fields['currency_symbol']); |
|
| 3388 | - }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){
|
|
| 3389 | - $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']); |
|
| 3390 | - } |
|
| 3391 | - ?> |
|
| 3385 | + $value = ''; |
|
| 3386 | + if ($extra_fields && isset($extra_fields['currency_symbol'])) {
|
|
| 3387 | + $value = esc_attr($extra_fields['currency_symbol']); |
|
| 3388 | + }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){
|
|
| 3389 | + $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']); |
|
| 3390 | + } |
|
| 3391 | + ?> |
|
| 3392 | 3392 | <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
|
| 3393 | 3393 | <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory');?>
|
| 3394 | 3394 | <div class="gdcf-tooltip"> |
@@ -3403,13 +3403,13 @@ discard block |
||
| 3403 | 3403 | |
| 3404 | 3404 | <?php |
| 3405 | 3405 | |
| 3406 | - $value = ''; |
|
| 3407 | - if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {
|
|
| 3408 | - $value = esc_attr($extra_fields['currency_symbol_placement']); |
|
| 3409 | - }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){
|
|
| 3410 | - $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']); |
|
| 3411 | - } |
|
| 3412 | - ?> |
|
| 3406 | + $value = ''; |
|
| 3407 | + if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {
|
|
| 3408 | + $value = esc_attr($extra_fields['currency_symbol_placement']); |
|
| 3409 | + }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){
|
|
| 3410 | + $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']); |
|
| 3411 | + } |
|
| 3412 | + ?> |
|
| 3413 | 3413 | <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
|
| 3414 | 3414 | <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory');?>
|
| 3415 | 3415 | <div class="gdcf-tooltip"> |
@@ -3427,225 +3427,225 @@ discard block |
||
| 3427 | 3427 | |
| 3428 | 3428 | <?php |
| 3429 | 3429 | |
| 3430 | - $html = ob_get_clean(); |
|
| 3431 | - return $output.$html; |
|
| 3430 | + $html = ob_get_clean(); |
|
| 3431 | + return $output.$html; |
|
| 3432 | 3432 | } |
| 3433 | 3433 | add_filter('geodir_cfa_extra_fields_text','geodir_cfa_extra_fields_text',10,4);
|
| 3434 | 3434 | |
| 3435 | 3435 | function geodir_default_custom_fields($post_type='gd_place',$package_id=''){
|
| 3436 | - $fields = array(); |
|
| 3437 | - $package = ($package_id=='') ? '' : array($package_id); |
|
| 3438 | - |
|
| 3439 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3440 | - 'data_type' => 'VARCHAR', |
|
| 3441 | - 'field_type' => 'taxonomy', |
|
| 3442 | - 'admin_title' => __('Category', 'geodirectory'),
|
|
| 3443 | - 'admin_desc' => __('SELECT listing category FROM here. SELECT at least one CATEGORY', 'geodirectory'),
|
|
| 3444 | - 'site_title' => __('Category', 'geodirectory'),
|
|
| 3445 | - 'htmlvar_name' => $post_type.'category', |
|
| 3446 | - 'default_value' => '', |
|
| 3447 | - 'is_default' => '1', |
|
| 3448 | - 'is_admin' => '1', |
|
| 3449 | - 'is_required' => '1', |
|
| 3450 | - 'show_in' => '[detail]', |
|
| 3451 | - 'show_on_pkg' => $package, |
|
| 3452 | - 'clabels' => __('Category', 'geodirectory'));
|
|
| 3453 | - |
|
| 3454 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3455 | - 'data_type' => 'VARCHAR', |
|
| 3456 | - 'field_type' => 'address', |
|
| 3457 | - 'admin_title' => __('Address', 'geodirectory'),
|
|
| 3458 | - 'admin_desc' => ADDRESS_MSG, |
|
| 3459 | - 'site_title' => __('Address', 'geodirectory'),
|
|
| 3460 | - 'htmlvar_name' => 'post', |
|
| 3461 | - 'default_value' => '', |
|
| 3462 | - 'option_values' => '', |
|
| 3463 | - 'is_default' => '1', |
|
| 3464 | - 'is_admin' => '1', |
|
| 3465 | - 'is_required' => '1', |
|
| 3466 | - 'show_in' => '[detail],[mapbubble]', |
|
| 3467 | - 'show_on_pkg' => $package, |
|
| 3468 | - 'required_msg' => __('Address fields are required', 'geodirectory'),
|
|
| 3469 | - 'clabels' => __('Address', 'geodirectory'),
|
|
| 3470 | - 'extra' => array('show_city' => 1, 'city_lable' => __('City', 'geodirectory'),
|
|
| 3471 | - 'show_region' => 1, 'region_lable' => __('Region', 'geodirectory'),
|
|
| 3472 | - 'show_country' => 1, 'country_lable' => __('Country', 'geodirectory'),
|
|
| 3473 | - 'show_zip' => 1, 'zip_lable' => __('Zip/Post Code', 'geodirectory'),
|
|
| 3474 | - 'show_map' => 1, 'map_lable' => __('Set Address On Map', 'geodirectory'),
|
|
| 3475 | - 'show_mapview' => 1, 'mapview_lable' => __('Select Map View', 'geodirectory'),
|
|
| 3476 | - 'show_mapzoom' => 1, 'mapzoom_lable' => 'hidden', |
|
| 3477 | - 'show_latlng' => 1)); |
|
| 3478 | - |
|
| 3479 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3480 | - 'data_type' => 'VARCHAR', |
|
| 3481 | - 'field_type' => 'text', |
|
| 3482 | - 'admin_title' => __('Time', 'geodirectory'),
|
|
| 3483 | - 'admin_desc' => __('Enter Business or Listing Timing Information.<br/>eg. : 10.00 am to 6 pm every day', 'geodirectory'),
|
|
| 3484 | - 'site_title' => __('Time', 'geodirectory'),
|
|
| 3485 | - 'htmlvar_name' => 'timing', |
|
| 3486 | - 'default_value' => '', |
|
| 3487 | - 'option_values' => '', |
|
| 3488 | - 'is_default' => '1', |
|
| 3489 | - 'is_admin' => '1', |
|
| 3490 | - 'show_in' => '[detail],[mapbubble]', |
|
| 3491 | - 'show_on_pkg' => $package, |
|
| 3492 | - 'clabels' => __('Time', 'geodirectory'));
|
|
| 3493 | - |
|
| 3494 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3495 | - 'data_type' => 'VARCHAR', |
|
| 3496 | - 'field_type' => 'phone', |
|
| 3497 | - 'admin_title' => __('Phone', 'geodirectory'),
|
|
| 3498 | - 'admin_desc' => __('You can enter phone number,cell phone number etc.', 'geodirectory'),
|
|
| 3499 | - 'site_title' => __('Phone', 'geodirectory'),
|
|
| 3500 | - 'htmlvar_name' => 'contact', |
|
| 3501 | - 'default_value' => '', |
|
| 3502 | - 'option_values' => '', |
|
| 3503 | - 'is_default' => '1', |
|
| 3504 | - 'is_admin' => '1', |
|
| 3505 | - 'show_in' => '[detail],[mapbubble]', |
|
| 3506 | - 'show_on_pkg' => $package, |
|
| 3507 | - 'clabels' => __('Phone', 'geodirectory'));
|
|
| 3508 | - |
|
| 3509 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3510 | - 'data_type' => 'VARCHAR', |
|
| 3511 | - 'field_type' => 'email', |
|
| 3512 | - 'admin_title' => __('Email', 'geodirectory'),
|
|
| 3513 | - 'admin_desc' => __('You can enter your business or listing email.', 'geodirectory'),
|
|
| 3514 | - 'site_title' => __('Email', 'geodirectory'),
|
|
| 3515 | - 'htmlvar_name' => 'email', |
|
| 3516 | - 'default_value' => '', |
|
| 3517 | - 'option_values' => '', |
|
| 3518 | - 'is_default' => '1', |
|
| 3519 | - 'is_admin' => '1', |
|
| 3520 | - 'show_in' => '[detail]', |
|
| 3521 | - 'show_on_pkg' => $package, |
|
| 3522 | - 'clabels' => __('Email', 'geodirectory'));
|
|
| 3523 | - |
|
| 3524 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3525 | - 'data_type' => 'VARCHAR', |
|
| 3526 | - 'field_type' => 'url', |
|
| 3527 | - 'admin_title' => __('Website', 'geodirectory'),
|
|
| 3528 | - 'admin_desc' => __('You can enter your business or listing website.', 'geodirectory'),
|
|
| 3529 | - 'site_title' => __('Website', 'geodirectory'),
|
|
| 3530 | - 'htmlvar_name' => 'website', |
|
| 3531 | - 'default_value' => '', |
|
| 3532 | - 'option_values' => '', |
|
| 3533 | - 'is_default' => '1', |
|
| 3534 | - 'is_admin' => '1', |
|
| 3535 | - 'show_in' => '[detail]', |
|
| 3536 | - 'show_on_pkg' => $package, |
|
| 3537 | - 'clabels' => __('Website', 'geodirectory'));
|
|
| 3538 | - |
|
| 3539 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3540 | - 'data_type' => 'VARCHAR', |
|
| 3541 | - 'field_type' => 'url', |
|
| 3542 | - 'admin_title' => __('Twitter', 'geodirectory'),
|
|
| 3543 | - 'admin_desc' => __('You can enter your business or listing twitter url.', 'geodirectory'),
|
|
| 3544 | - 'site_title' => __('Twitter', 'geodirectory'),
|
|
| 3545 | - 'htmlvar_name' => 'twitter', |
|
| 3546 | - 'default_value' => '', |
|
| 3547 | - 'option_values' => '', |
|
| 3548 | - 'is_default' => '1', |
|
| 3549 | - 'is_admin' => '1', |
|
| 3550 | - 'show_in' => '[detail]', |
|
| 3551 | - 'show_on_pkg' => $package, |
|
| 3552 | - 'clabels' => __('Twitter', 'geodirectory'));
|
|
| 3553 | - |
|
| 3554 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3555 | - 'data_type' => 'VARCHAR', |
|
| 3556 | - 'field_type' => 'url', |
|
| 3557 | - 'admin_title' => __('Facebook', 'geodirectory'),
|
|
| 3558 | - 'admin_desc' => __('You can enter your business or listing facebook url.', 'geodirectory'),
|
|
| 3559 | - 'site_title' => __('Facebook', 'geodirectory'),
|
|
| 3560 | - 'htmlvar_name' => 'facebook', |
|
| 3561 | - 'default_value' => '', |
|
| 3562 | - 'option_values' => '', |
|
| 3563 | - 'is_default' => '1', |
|
| 3564 | - 'is_admin' => '1', |
|
| 3565 | - 'show_in' => '[detail]', |
|
| 3566 | - 'show_on_pkg' => $package, |
|
| 3567 | - 'clabels' => __('Facebook', 'geodirectory'));
|
|
| 3568 | - |
|
| 3569 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3570 | - 'data_type' => 'TEXT', |
|
| 3571 | - 'field_type' => 'textarea', |
|
| 3572 | - 'admin_title' => __('Video', 'geodirectory'),
|
|
| 3573 | - 'admin_desc' => __('Add video code here, YouTube etc.', 'geodirectory'),
|
|
| 3574 | - 'site_title' => __('Video', 'geodirectory'),
|
|
| 3575 | - 'htmlvar_name' => 'video', |
|
| 3576 | - 'default_value' => '', |
|
| 3577 | - 'option_values' => '', |
|
| 3578 | - 'is_default' => '0', |
|
| 3579 | - 'is_admin' => '1', |
|
| 3580 | - 'show_in' => '[owntab]', |
|
| 3581 | - 'show_on_pkg' => $package, |
|
| 3582 | - 'clabels' => __('Video', 'geodirectory'));
|
|
| 3583 | - |
|
| 3584 | - $fields[] = array('listing_type' => $post_type,
|
|
| 3585 | - 'data_type' => 'TEXT', |
|
| 3586 | - 'field_type' => 'textarea', |
|
| 3587 | - 'admin_title' => __('Special Offers', 'geodirectory'),
|
|
| 3588 | - 'admin_desc' => __('Note: List out any special offers (optional)', 'geodirectory'),
|
|
| 3589 | - 'site_title' => __('Special Offers', 'geodirectory'),
|
|
| 3590 | - 'htmlvar_name' => 'special_offers', |
|
| 3591 | - 'default_value' => '', |
|
| 3592 | - 'option_values' => '', |
|
| 3593 | - 'is_default' => '0', |
|
| 3594 | - 'is_admin' => '1', |
|
| 3595 | - 'show_in' => '[owntab]', |
|
| 3596 | - 'show_on_pkg' => $package, |
|
| 3597 | - 'clabels' => __('Special Offers', 'geodirectory'));
|
|
| 3598 | - |
|
| 3599 | - /** |
|
| 3600 | - * Filter the array of default custom fields DB table data. |
|
| 3601 | - * |
|
| 3602 | - * @since 1.6.6 |
|
| 3603 | - * @param string $fields The default custom fields as an array. |
|
| 3604 | - */ |
|
| 3605 | - $fields = apply_filters('geodir_default_custom_fields', $fields);
|
|
| 3606 | - |
|
| 3607 | - return $fields; |
|
| 3436 | + $fields = array(); |
|
| 3437 | + $package = ($package_id=='') ? '' : array($package_id); |
|
| 3438 | + |
|
| 3439 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3440 | + 'data_type' => 'VARCHAR', |
|
| 3441 | + 'field_type' => 'taxonomy', |
|
| 3442 | + 'admin_title' => __('Category', 'geodirectory'),
|
|
| 3443 | + 'admin_desc' => __('SELECT listing category FROM here. SELECT at least one CATEGORY', 'geodirectory'),
|
|
| 3444 | + 'site_title' => __('Category', 'geodirectory'),
|
|
| 3445 | + 'htmlvar_name' => $post_type.'category', |
|
| 3446 | + 'default_value' => '', |
|
| 3447 | + 'is_default' => '1', |
|
| 3448 | + 'is_admin' => '1', |
|
| 3449 | + 'is_required' => '1', |
|
| 3450 | + 'show_in' => '[detail]', |
|
| 3451 | + 'show_on_pkg' => $package, |
|
| 3452 | + 'clabels' => __('Category', 'geodirectory'));
|
|
| 3453 | + |
|
| 3454 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3455 | + 'data_type' => 'VARCHAR', |
|
| 3456 | + 'field_type' => 'address', |
|
| 3457 | + 'admin_title' => __('Address', 'geodirectory'),
|
|
| 3458 | + 'admin_desc' => ADDRESS_MSG, |
|
| 3459 | + 'site_title' => __('Address', 'geodirectory'),
|
|
| 3460 | + 'htmlvar_name' => 'post', |
|
| 3461 | + 'default_value' => '', |
|
| 3462 | + 'option_values' => '', |
|
| 3463 | + 'is_default' => '1', |
|
| 3464 | + 'is_admin' => '1', |
|
| 3465 | + 'is_required' => '1', |
|
| 3466 | + 'show_in' => '[detail],[mapbubble]', |
|
| 3467 | + 'show_on_pkg' => $package, |
|
| 3468 | + 'required_msg' => __('Address fields are required', 'geodirectory'),
|
|
| 3469 | + 'clabels' => __('Address', 'geodirectory'),
|
|
| 3470 | + 'extra' => array('show_city' => 1, 'city_lable' => __('City', 'geodirectory'),
|
|
| 3471 | + 'show_region' => 1, 'region_lable' => __('Region', 'geodirectory'),
|
|
| 3472 | + 'show_country' => 1, 'country_lable' => __('Country', 'geodirectory'),
|
|
| 3473 | + 'show_zip' => 1, 'zip_lable' => __('Zip/Post Code', 'geodirectory'),
|
|
| 3474 | + 'show_map' => 1, 'map_lable' => __('Set Address On Map', 'geodirectory'),
|
|
| 3475 | + 'show_mapview' => 1, 'mapview_lable' => __('Select Map View', 'geodirectory'),
|
|
| 3476 | + 'show_mapzoom' => 1, 'mapzoom_lable' => 'hidden', |
|
| 3477 | + 'show_latlng' => 1)); |
|
| 3478 | + |
|
| 3479 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3480 | + 'data_type' => 'VARCHAR', |
|
| 3481 | + 'field_type' => 'text', |
|
| 3482 | + 'admin_title' => __('Time', 'geodirectory'),
|
|
| 3483 | + 'admin_desc' => __('Enter Business or Listing Timing Information.<br/>eg. : 10.00 am to 6 pm every day', 'geodirectory'),
|
|
| 3484 | + 'site_title' => __('Time', 'geodirectory'),
|
|
| 3485 | + 'htmlvar_name' => 'timing', |
|
| 3486 | + 'default_value' => '', |
|
| 3487 | + 'option_values' => '', |
|
| 3488 | + 'is_default' => '1', |
|
| 3489 | + 'is_admin' => '1', |
|
| 3490 | + 'show_in' => '[detail],[mapbubble]', |
|
| 3491 | + 'show_on_pkg' => $package, |
|
| 3492 | + 'clabels' => __('Time', 'geodirectory'));
|
|
| 3493 | + |
|
| 3494 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3495 | + 'data_type' => 'VARCHAR', |
|
| 3496 | + 'field_type' => 'phone', |
|
| 3497 | + 'admin_title' => __('Phone', 'geodirectory'),
|
|
| 3498 | + 'admin_desc' => __('You can enter phone number,cell phone number etc.', 'geodirectory'),
|
|
| 3499 | + 'site_title' => __('Phone', 'geodirectory'),
|
|
| 3500 | + 'htmlvar_name' => 'contact', |
|
| 3501 | + 'default_value' => '', |
|
| 3502 | + 'option_values' => '', |
|
| 3503 | + 'is_default' => '1', |
|
| 3504 | + 'is_admin' => '1', |
|
| 3505 | + 'show_in' => '[detail],[mapbubble]', |
|
| 3506 | + 'show_on_pkg' => $package, |
|
| 3507 | + 'clabels' => __('Phone', 'geodirectory'));
|
|
| 3508 | + |
|
| 3509 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3510 | + 'data_type' => 'VARCHAR', |
|
| 3511 | + 'field_type' => 'email', |
|
| 3512 | + 'admin_title' => __('Email', 'geodirectory'),
|
|
| 3513 | + 'admin_desc' => __('You can enter your business or listing email.', 'geodirectory'),
|
|
| 3514 | + 'site_title' => __('Email', 'geodirectory'),
|
|
| 3515 | + 'htmlvar_name' => 'email', |
|
| 3516 | + 'default_value' => '', |
|
| 3517 | + 'option_values' => '', |
|
| 3518 | + 'is_default' => '1', |
|
| 3519 | + 'is_admin' => '1', |
|
| 3520 | + 'show_in' => '[detail]', |
|
| 3521 | + 'show_on_pkg' => $package, |
|
| 3522 | + 'clabels' => __('Email', 'geodirectory'));
|
|
| 3523 | + |
|
| 3524 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3525 | + 'data_type' => 'VARCHAR', |
|
| 3526 | + 'field_type' => 'url', |
|
| 3527 | + 'admin_title' => __('Website', 'geodirectory'),
|
|
| 3528 | + 'admin_desc' => __('You can enter your business or listing website.', 'geodirectory'),
|
|
| 3529 | + 'site_title' => __('Website', 'geodirectory'),
|
|
| 3530 | + 'htmlvar_name' => 'website', |
|
| 3531 | + 'default_value' => '', |
|
| 3532 | + 'option_values' => '', |
|
| 3533 | + 'is_default' => '1', |
|
| 3534 | + 'is_admin' => '1', |
|
| 3535 | + 'show_in' => '[detail]', |
|
| 3536 | + 'show_on_pkg' => $package, |
|
| 3537 | + 'clabels' => __('Website', 'geodirectory'));
|
|
| 3538 | + |
|
| 3539 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3540 | + 'data_type' => 'VARCHAR', |
|
| 3541 | + 'field_type' => 'url', |
|
| 3542 | + 'admin_title' => __('Twitter', 'geodirectory'),
|
|
| 3543 | + 'admin_desc' => __('You can enter your business or listing twitter url.', 'geodirectory'),
|
|
| 3544 | + 'site_title' => __('Twitter', 'geodirectory'),
|
|
| 3545 | + 'htmlvar_name' => 'twitter', |
|
| 3546 | + 'default_value' => '', |
|
| 3547 | + 'option_values' => '', |
|
| 3548 | + 'is_default' => '1', |
|
| 3549 | + 'is_admin' => '1', |
|
| 3550 | + 'show_in' => '[detail]', |
|
| 3551 | + 'show_on_pkg' => $package, |
|
| 3552 | + 'clabels' => __('Twitter', 'geodirectory'));
|
|
| 3553 | + |
|
| 3554 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3555 | + 'data_type' => 'VARCHAR', |
|
| 3556 | + 'field_type' => 'url', |
|
| 3557 | + 'admin_title' => __('Facebook', 'geodirectory'),
|
|
| 3558 | + 'admin_desc' => __('You can enter your business or listing facebook url.', 'geodirectory'),
|
|
| 3559 | + 'site_title' => __('Facebook', 'geodirectory'),
|
|
| 3560 | + 'htmlvar_name' => 'facebook', |
|
| 3561 | + 'default_value' => '', |
|
| 3562 | + 'option_values' => '', |
|
| 3563 | + 'is_default' => '1', |
|
| 3564 | + 'is_admin' => '1', |
|
| 3565 | + 'show_in' => '[detail]', |
|
| 3566 | + 'show_on_pkg' => $package, |
|
| 3567 | + 'clabels' => __('Facebook', 'geodirectory'));
|
|
| 3568 | + |
|
| 3569 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3570 | + 'data_type' => 'TEXT', |
|
| 3571 | + 'field_type' => 'textarea', |
|
| 3572 | + 'admin_title' => __('Video', 'geodirectory'),
|
|
| 3573 | + 'admin_desc' => __('Add video code here, YouTube etc.', 'geodirectory'),
|
|
| 3574 | + 'site_title' => __('Video', 'geodirectory'),
|
|
| 3575 | + 'htmlvar_name' => 'video', |
|
| 3576 | + 'default_value' => '', |
|
| 3577 | + 'option_values' => '', |
|
| 3578 | + 'is_default' => '0', |
|
| 3579 | + 'is_admin' => '1', |
|
| 3580 | + 'show_in' => '[owntab]', |
|
| 3581 | + 'show_on_pkg' => $package, |
|
| 3582 | + 'clabels' => __('Video', 'geodirectory'));
|
|
| 3583 | + |
|
| 3584 | + $fields[] = array('listing_type' => $post_type,
|
|
| 3585 | + 'data_type' => 'TEXT', |
|
| 3586 | + 'field_type' => 'textarea', |
|
| 3587 | + 'admin_title' => __('Special Offers', 'geodirectory'),
|
|
| 3588 | + 'admin_desc' => __('Note: List out any special offers (optional)', 'geodirectory'),
|
|
| 3589 | + 'site_title' => __('Special Offers', 'geodirectory'),
|
|
| 3590 | + 'htmlvar_name' => 'special_offers', |
|
| 3591 | + 'default_value' => '', |
|
| 3592 | + 'option_values' => '', |
|
| 3593 | + 'is_default' => '0', |
|
| 3594 | + 'is_admin' => '1', |
|
| 3595 | + 'show_in' => '[owntab]', |
|
| 3596 | + 'show_on_pkg' => $package, |
|
| 3597 | + 'clabels' => __('Special Offers', 'geodirectory'));
|
|
| 3598 | + |
|
| 3599 | + /** |
|
| 3600 | + * Filter the array of default custom fields DB table data. |
|
| 3601 | + * |
|
| 3602 | + * @since 1.6.6 |
|
| 3603 | + * @param string $fields The default custom fields as an array. |
|
| 3604 | + */ |
|
| 3605 | + $fields = apply_filters('geodir_default_custom_fields', $fields);
|
|
| 3606 | + |
|
| 3607 | + return $fields; |
|
| 3608 | 3608 | } |
| 3609 | 3609 | |
| 3610 | 3610 | function geodir_currency_format_number($number='',$cf=''){
|
| 3611 | 3611 | |
| 3612 | - $cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : ''; |
|
| 3612 | + $cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : ''; |
|
| 3613 | 3613 | |
| 3614 | - $symbol = isset($cs['currency_symbol']) ? $cs['currency_symbol'] : '$'; |
|
| 3615 | - $decimals = isset($cf['decimal_point']) && $cf['decimal_point'] ? $cf['decimal_point'] : 2; |
|
| 3616 | - $decimal_display = !empty($cf['decimal_display']) ? $cf['decimal_display'] : (!empty($cs['decimal_display']) ? $cs['decimal_display'] : 'if'); |
|
| 3617 | - $decimalpoint = '.'; |
|
| 3614 | + $symbol = isset($cs['currency_symbol']) ? $cs['currency_symbol'] : '$'; |
|
| 3615 | + $decimals = isset($cf['decimal_point']) && $cf['decimal_point'] ? $cf['decimal_point'] : 2; |
|
| 3616 | + $decimal_display = !empty($cf['decimal_display']) ? $cf['decimal_display'] : (!empty($cs['decimal_display']) ? $cs['decimal_display'] : 'if'); |
|
| 3617 | + $decimalpoint = '.'; |
|
| 3618 | 3618 | |
| 3619 | - if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){
|
|
| 3620 | - $decimalpoint = ','; |
|
| 3621 | - } |
|
| 3619 | + if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){
|
|
| 3620 | + $decimalpoint = ','; |
|
| 3621 | + } |
|
| 3622 | 3622 | |
| 3623 | - $separator = ','; |
|
| 3623 | + $separator = ','; |
|
| 3624 | 3624 | |
| 3625 | - if(isset($cs['thousand_separator'])){
|
|
| 3626 | - if($cs['thousand_separator']=='comma'){$separator = ',';}
|
|
| 3627 | - if($cs['thousand_separator']=='slash'){$separator = '\\';}
|
|
| 3628 | - if($cs['thousand_separator']=='period'){$separator = '.';}
|
|
| 3629 | - if($cs['thousand_separator']=='space'){$separator = ' ';}
|
|
| 3630 | - if($cs['thousand_separator']=='none'){$separator = '';}
|
|
| 3631 | - } |
|
| 3625 | + if(isset($cs['thousand_separator'])){
|
|
| 3626 | + if($cs['thousand_separator']=='comma'){$separator = ',';}
|
|
| 3627 | + if($cs['thousand_separator']=='slash'){$separator = '\\';}
|
|
| 3628 | + if($cs['thousand_separator']=='period'){$separator = '.';}
|
|
| 3629 | + if($cs['thousand_separator']=='space'){$separator = ' ';}
|
|
| 3630 | + if($cs['thousand_separator']=='none'){$separator = '';}
|
|
| 3631 | + } |
|
| 3632 | 3632 | |
| 3633 | - $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left'; |
|
| 3633 | + $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left'; |
|
| 3634 | 3634 | |
| 3635 | - if($decimals>0 && $decimal_display=='if'){
|
|
| 3636 | - if(is_int($number) || floor( $number ) == $number) |
|
| 3637 | - $decimals = 0; |
|
| 3638 | - } |
|
| 3635 | + if($decimals>0 && $decimal_display=='if'){
|
|
| 3636 | + if(is_int($number) || floor( $number ) == $number) |
|
| 3637 | + $decimals = 0; |
|
| 3638 | + } |
|
| 3639 | 3639 | |
| 3640 | - $number = number_format($number,$decimals,$decimalpoint,$separator); |
|
| 3640 | + $number = number_format($number,$decimals,$decimalpoint,$separator); |
|
| 3641 | 3641 | |
| 3642 | 3642 | |
| 3643 | 3643 | |
| 3644 | - if($currency_symbol_placement=='left'){
|
|
| 3645 | - $number = $symbol . $number; |
|
| 3646 | - }else{
|
|
| 3647 | - $number = $number . $symbol; |
|
| 3648 | - } |
|
| 3644 | + if($currency_symbol_placement=='left'){
|
|
| 3645 | + $number = $symbol . $number; |
|
| 3646 | + }else{
|
|
| 3647 | + $number = $number . $symbol; |
|
| 3648 | + } |
|
| 3649 | 3649 | |
| 3650 | 3650 | |
| 3651 | 3651 | return $number; |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL") |
| 50 | 50 | {
|
| 51 | 51 | global $wpdb; |
| 52 | - $result = 0;// no rows affected |
|
| 52 | + $result = 0; // no rows affected |
|
| 53 | 53 | if (!geodir_column_exist($db, $column)) {
|
| 54 | 54 | if (!empty($db) && !empty($column)) |
| 55 | 55 | $result = $wpdb->query("ALTER TABLE `$db` ADD `$column` $column_attr");
|
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | {
|
| 75 | 75 | global $wpdb, $geodir_post_custom_fields_cache; |
| 76 | 76 | |
| 77 | - $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location; |
|
| 77 | + $cache_stored = $post_type.'_'.$package_id.'_'.$default.'_'.$fields_location; |
|
| 78 | 78 | |
| 79 | 79 | if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {
|
| 80 | 80 | return $geodir_post_custom_fields_cache[$cache_stored]; |
@@ -88,14 +88,14 @@ discard block |
||
| 88 | 88 | $default_query .= " and is_admin = '0' "; |
| 89 | 89 | |
| 90 | 90 | if ($fields_location == 'none') {
|
| 91 | - } else{
|
|
| 92 | - $fields_location = esc_sql( $fields_location ); |
|
| 91 | + } else {
|
|
| 92 | + $fields_location = esc_sql($fields_location); |
|
| 93 | 93 | $default_query .= " and show_in LIKE '%%[$fields_location]%%' "; |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | $post_meta_info = $wpdb->get_results( |
| 97 | 97 | $wpdb->prepare( |
| 98 | - "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
|
|
| 98 | + "select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
|
|
| 99 | 99 | array($post_type) |
| 100 | 100 | ) |
| 101 | 101 | ); |
@@ -162,13 +162,13 @@ discard block |
||
| 162 | 162 | * @param string $field_ins_upd When set to "submit" displays form. |
| 163 | 163 | * @param string $field_type_key The key of the custom field. |
| 164 | 164 | */ |
| 165 | - function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='') |
|
| 165 | + function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key = '') |
|
| 166 | 166 | {
|
| 167 | 167 | global $wpdb; |
| 168 | 168 | $cf = $result_str; |
| 169 | 169 | if (!is_object($cf)) {
|
| 170 | 170 | |
| 171 | - $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));
|
|
| 171 | + $field_info = $wpdb->get_row($wpdb->prepare("select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d", array($cf)));
|
|
| 172 | 172 | |
| 173 | 173 | } else {
|
| 174 | 174 | $field_info = $cf; |
@@ -202,14 +202,14 @@ discard block |
||
| 202 | 202 | if ($field_id != '') {
|
| 203 | 203 | $cf = trim($field_id, '_'); |
| 204 | 204 | |
| 205 | - if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {
|
|
| 206 | - $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));
|
|
| 205 | + if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d", array($cf)))) {
|
|
| 206 | + $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d ", array($cf)));
|
|
| 207 | 207 | |
| 208 | 208 | $post_type = $field->post_type; |
| 209 | 209 | $htmlvar_name = $field->htmlvar_name; |
| 210 | 210 | |
| 211 | 211 | if ($post_type != '' && $htmlvar_name != '') {
|
| 212 | - $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
|
|
| 212 | + $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
|
|
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | /** |
@@ -223,18 +223,18 @@ discard block |
||
| 223 | 223 | do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);
|
| 224 | 224 | |
| 225 | 225 | if ($field->field_type == 'address') {
|
| 226 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");
|
|
| 227 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");
|
|
| 228 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");
|
|
| 229 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");
|
|
| 230 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");
|
|
| 231 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");
|
|
| 232 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");
|
|
| 233 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");
|
|
| 234 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");
|
|
| 226 | + $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_address`");
|
|
| 227 | + $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_city`");
|
|
| 228 | + $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_region`");
|
|
| 229 | + $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_country`");
|
|
| 230 | + $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_zip`");
|
|
| 231 | + $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_latitude`");
|
|
| 232 | + $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_longitude`");
|
|
| 233 | + $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_mapview`");
|
|
| 234 | + $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_mapzoom`");
|
|
| 235 | 235 | } else {
|
| 236 | 236 | if ($field->field_type != 'fieldset') {
|
| 237 | - $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");
|
|
| 237 | + $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."`");
|
|
| 238 | 238 | } |
| 239 | 239 | } |
| 240 | 240 | |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : ''; |
| 306 | 306 | |
| 307 | 307 | // some servers fail if a POST value is VARCHAR so we change it. |
| 308 | - if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){
|
|
| 308 | + if (isset($request_field['data_type']) && $request_field['data_type'] == 'XVARCHAR') {
|
|
| 309 | 309 | $request_field['data_type'] = 'VARCHAR'; |
| 310 | 310 | } |
| 311 | 311 | |
@@ -318,12 +318,12 @@ discard block |
||
| 318 | 318 | $post_type = $request_field['listing_type']; |
| 319 | 319 | |
| 320 | 320 | if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {
|
| 321 | - $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name; |
|
| 321 | + $cehhtmlvar_name = 'geodir_'.$cehhtmlvar_name; |
|
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | $check_html_variable = $wpdb->get_var( |
| 325 | 325 | $wpdb->prepare( |
| 326 | - "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ", |
|
| 326 | + "select htmlvar_name from ".GEODIR_CUSTOM_FIELDS_TABLE." where id <> %d and htmlvar_name = %s and post_type = %s ", |
|
| 327 | 327 | array($cf, $cehhtmlvar_name, $post_type) |
| 328 | 328 | ) |
| 329 | 329 | ); |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | |
| 336 | 336 | $post_meta_info = $wpdb->get_row( |
| 337 | 337 | $wpdb->prepare( |
| 338 | - "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d", |
|
| 338 | + "select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where id = %d", |
|
| 339 | 339 | array($cf) |
| 340 | 340 | ) |
| 341 | 341 | ); |
@@ -353,7 +353,7 @@ discard block |
||
| 353 | 353 | if ($post_type == '') $post_type = 'gd_place'; |
| 354 | 354 | |
| 355 | 355 | |
| 356 | - $detail_table = $plugin_prefix . $post_type . '_detail'; |
|
| 356 | + $detail_table = $plugin_prefix.$post_type.'_detail'; |
|
| 357 | 357 | |
| 358 | 358 | $admin_title = $request_field['admin_title']; |
| 359 | 359 | $site_title = $request_field['site_title']; |
@@ -381,12 +381,12 @@ discard block |
||
| 381 | 381 | $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : ''; |
| 382 | 382 | |
| 383 | 383 | |
| 384 | - if(is_array($show_in)){
|
|
| 384 | + if (is_array($show_in)) {
|
|
| 385 | 385 | $show_in = implode(",", $request_field['show_in']);
|
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {
|
| 389 | - $htmlvar_name = 'geodir_' . $htmlvar_name; |
|
| 389 | + $htmlvar_name = 'geodir_'.$htmlvar_name; |
|
| 390 | 390 | } |
| 391 | 391 | |
| 392 | 392 | $option_values = ''; |
@@ -427,9 +427,9 @@ discard block |
||
| 427 | 427 | |
| 428 | 428 | if ($sort_order == '') {
|
| 429 | 429 | |
| 430 | - $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);
|
|
| 430 | + $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM ".GEODIR_CUSTOM_FIELDS_TABLE);
|
|
| 431 | 431 | |
| 432 | - $sort_order = (int)$last_order + 1; |
|
| 432 | + $sort_order = (int) $last_order + 1; |
|
| 433 | 433 | } |
| 434 | 434 | |
| 435 | 435 | $default_value_add = ''; |
@@ -441,15 +441,15 @@ discard block |
||
| 441 | 441 | case 'address': |
| 442 | 442 | |
| 443 | 443 | if ($htmlvar_name != '') {
|
| 444 | - $prefix = $htmlvar_name . '_'; |
|
| 444 | + $prefix = $htmlvar_name.'_'; |
|
| 445 | 445 | } |
| 446 | - $old_prefix = $old_html_variable . '_'; |
|
| 446 | + $old_prefix = $old_html_variable.'_'; |
|
| 447 | 447 | |
| 448 | 448 | |
| 449 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL"; |
|
| 449 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."address` `".$prefix."address` VARCHAR( 254 ) NULL"; |
|
| 450 | 450 | |
| 451 | 451 | if ($default_value != '') {
|
| 452 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 452 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 453 | 453 | } |
| 454 | 454 | |
| 455 | 455 | $wpdb->query($meta_field_add); |
@@ -458,12 +458,12 @@ discard block |
||
| 458 | 458 | |
| 459 | 459 | if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
|
| 460 | 460 | |
| 461 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");
|
|
| 461 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."city'");
|
|
| 462 | 462 | if ($is_column) {
|
| 463 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL"; |
|
| 463 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."city` `".$prefix."city` VARCHAR( 50 ) NULL"; |
|
| 464 | 464 | |
| 465 | 465 | if ($default_value != '') {
|
| 466 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 466 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 467 | 467 | } |
| 468 | 468 | |
| 469 | 469 | $wpdb->query($meta_field_add); |
@@ -471,9 +471,9 @@ discard block |
||
| 471 | 471 | |
| 472 | 472 | $meta_field_add = "VARCHAR( 50 ) NULL"; |
| 473 | 473 | if ($default_value != '') {
|
| 474 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 474 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 475 | 475 | } |
| 476 | - geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add); |
|
| 476 | + geodir_add_column_if_not_exist($detail_table, $prefix."city", $meta_field_add); |
|
| 477 | 477 | |
| 478 | 478 | } |
| 479 | 479 | |
@@ -483,36 +483,36 @@ discard block |
||
| 483 | 483 | |
| 484 | 484 | if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
|
| 485 | 485 | |
| 486 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");
|
|
| 486 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."region'");
|
|
| 487 | 487 | |
| 488 | 488 | if ($is_column) {
|
| 489 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL"; |
|
| 489 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."region` `".$prefix."region` VARCHAR( 50 ) NULL"; |
|
| 490 | 490 | |
| 491 | 491 | if ($default_value != '') {
|
| 492 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 492 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 493 | 493 | } |
| 494 | 494 | |
| 495 | 495 | $wpdb->query($meta_field_add); |
| 496 | 496 | } else {
|
| 497 | 497 | $meta_field_add = "VARCHAR( 50 ) NULL"; |
| 498 | 498 | if ($default_value != '') {
|
| 499 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 499 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 500 | 500 | } |
| 501 | 501 | |
| 502 | - geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add); |
|
| 502 | + geodir_add_column_if_not_exist($detail_table, $prefix."region", $meta_field_add); |
|
| 503 | 503 | } |
| 504 | 504 | |
| 505 | 505 | } |
| 506 | 506 | if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
|
| 507 | 507 | |
| 508 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");
|
|
| 508 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."country'");
|
|
| 509 | 509 | |
| 510 | 510 | if ($is_column) {
|
| 511 | 511 | |
| 512 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL"; |
|
| 512 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."country` `".$prefix."country` VARCHAR( 50 ) NULL"; |
|
| 513 | 513 | |
| 514 | 514 | if ($default_value != '') {
|
| 515 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 515 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 516 | 516 | } |
| 517 | 517 | |
| 518 | 518 | $wpdb->query($meta_field_add); |
@@ -520,24 +520,24 @@ discard block |
||
| 520 | 520 | |
| 521 | 521 | $meta_field_add = "VARCHAR( 50 ) NULL"; |
| 522 | 522 | if ($default_value != '') {
|
| 523 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 523 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 524 | 524 | } |
| 525 | 525 | |
| 526 | - geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add); |
|
| 526 | + geodir_add_column_if_not_exist($detail_table, $prefix."country", $meta_field_add); |
|
| 527 | 527 | |
| 528 | 528 | } |
| 529 | 529 | |
| 530 | 530 | } |
| 531 | 531 | if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
|
| 532 | 532 | |
| 533 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");
|
|
| 533 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."zip'");
|
|
| 534 | 534 | |
| 535 | 535 | if ($is_column) {
|
| 536 | 536 | |
| 537 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL"; |
|
| 537 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."zip` `".$prefix."zip` VARCHAR( 50 ) NULL"; |
|
| 538 | 538 | |
| 539 | 539 | if ($default_value != '') {
|
| 540 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 540 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 541 | 541 | } |
| 542 | 542 | |
| 543 | 543 | $wpdb->query($meta_field_add); |
@@ -545,128 +545,128 @@ discard block |
||
| 545 | 545 | |
| 546 | 546 | $meta_field_add = "VARCHAR( 50 ) NULL"; |
| 547 | 547 | if ($default_value != '') {
|
| 548 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 548 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 549 | 549 | } |
| 550 | 550 | |
| 551 | - geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add); |
|
| 551 | + geodir_add_column_if_not_exist($detail_table, $prefix."zip", $meta_field_add); |
|
| 552 | 552 | |
| 553 | 553 | } |
| 554 | 554 | |
| 555 | 555 | } |
| 556 | 556 | if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
|
| 557 | 557 | |
| 558 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");
|
|
| 558 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."latitude'");
|
|
| 559 | 559 | if ($is_column) {
|
| 560 | 560 | |
| 561 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; |
|
| 561 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."latitude` `".$prefix."latitude` VARCHAR( 20 ) NULL"; |
|
| 562 | 562 | |
| 563 | 563 | if ($default_value != '') {
|
| 564 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 564 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 565 | 565 | } |
| 566 | 566 | |
| 567 | 567 | $wpdb->query($meta_field_add); |
| 568 | 568 | } else {
|
| 569 | 569 | |
| 570 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; |
|
| 570 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latitude` VARCHAR( 20 ) NULL"; |
|
| 571 | 571 | $meta_field_add = "VARCHAR( 20 ) NULL"; |
| 572 | 572 | if ($default_value != '') {
|
| 573 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 573 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 574 | 574 | } |
| 575 | 575 | |
| 576 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add); |
|
| 576 | + geodir_add_column_if_not_exist($detail_table, $prefix."latitude", $meta_field_add); |
|
| 577 | 577 | |
| 578 | 578 | } |
| 579 | 579 | |
| 580 | 580 | |
| 581 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");
|
|
| 581 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."longitude'");
|
|
| 582 | 582 | |
| 583 | 583 | if ($is_column) {
|
| 584 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; |
|
| 584 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."longitude` `".$prefix."longitude` VARCHAR( 20 ) NULL"; |
|
| 585 | 585 | |
| 586 | 586 | if ($default_value != '') {
|
| 587 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 587 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 588 | 588 | } |
| 589 | 589 | |
| 590 | 590 | $wpdb->query($meta_field_add); |
| 591 | 591 | } else {
|
| 592 | 592 | |
| 593 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; |
|
| 593 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."longitude` VARCHAR( 20 ) NULL"; |
|
| 594 | 594 | $meta_field_add = "VARCHAR( 20 ) NULL"; |
| 595 | 595 | if ($default_value != '') {
|
| 596 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 596 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 597 | 597 | } |
| 598 | 598 | |
| 599 | - geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add); |
|
| 599 | + geodir_add_column_if_not_exist($detail_table, $prefix."longitude", $meta_field_add); |
|
| 600 | 600 | } |
| 601 | 601 | |
| 602 | 602 | } |
| 603 | 603 | if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
|
| 604 | 604 | |
| 605 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");
|
|
| 605 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."mapview'");
|
|
| 606 | 606 | |
| 607 | 607 | if ($is_column) {
|
| 608 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; |
|
| 608 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."mapview` `".$prefix."mapview` VARCHAR( 15 ) NULL"; |
|
| 609 | 609 | |
| 610 | 610 | if ($default_value != '') {
|
| 611 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 611 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 612 | 612 | } |
| 613 | 613 | |
| 614 | 614 | $wpdb->query($meta_field_add); |
| 615 | 615 | } else {
|
| 616 | 616 | |
| 617 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; |
|
| 617 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapview` VARCHAR( 15 ) NULL"; |
|
| 618 | 618 | |
| 619 | 619 | $meta_field_add = "VARCHAR( 15 ) NULL"; |
| 620 | 620 | if ($default_value != '') {
|
| 621 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 621 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 622 | 622 | } |
| 623 | 623 | |
| 624 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add); |
|
| 624 | + geodir_add_column_if_not_exist($detail_table, $prefix."mapview", $meta_field_add); |
|
| 625 | 625 | } |
| 626 | 626 | |
| 627 | 627 | |
| 628 | 628 | } |
| 629 | 629 | if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
|
| 630 | 630 | |
| 631 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");
|
|
| 631 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."mapzoom'");
|
|
| 632 | 632 | if ($is_column) {
|
| 633 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; |
|
| 633 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."mapzoom` `".$prefix."mapzoom` VARCHAR( 3 ) NULL"; |
|
| 634 | 634 | |
| 635 | 635 | if ($default_value != '') {
|
| 636 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 636 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 637 | 637 | } |
| 638 | 638 | |
| 639 | 639 | $wpdb->query($meta_field_add); |
| 640 | 640 | |
| 641 | 641 | } else {
|
| 642 | 642 | |
| 643 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; |
|
| 643 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapzoom` VARCHAR( 3 ) NULL"; |
|
| 644 | 644 | |
| 645 | 645 | $meta_field_add = "VARCHAR( 3 ) NULL"; |
| 646 | 646 | if ($default_value != '') {
|
| 647 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 647 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 648 | 648 | } |
| 649 | 649 | |
| 650 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add); |
|
| 650 | + geodir_add_column_if_not_exist($detail_table, $prefix."mapzoom", $meta_field_add); |
|
| 651 | 651 | } |
| 652 | 652 | |
| 653 | 653 | } |
| 654 | 654 | // show lat lng |
| 655 | 655 | if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
|
| 656 | - $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");
|
|
| 656 | + $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."latlng'");
|
|
| 657 | 657 | |
| 658 | 658 | if ($is_column) {
|
| 659 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; |
|
| 659 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."latlng` `".$prefix."latlng` VARCHAR( 3 ) NULL"; |
|
| 660 | 660 | $meta_field_add .= " DEFAULT '1'"; |
| 661 | 661 | |
| 662 | 662 | $wpdb->query($meta_field_add); |
| 663 | 663 | } else {
|
| 664 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; |
|
| 664 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latlng` VARCHAR( 3 ) NULL"; |
|
| 665 | 665 | |
| 666 | 666 | $meta_field_add = "VARCHAR( 3 ) NULL"; |
| 667 | 667 | $meta_field_add .= " DEFAULT '1'"; |
| 668 | 668 | |
| 669 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add); |
|
| 669 | + geodir_add_column_if_not_exist($detail_table, $prefix."latlng", $meta_field_add); |
|
| 670 | 670 | } |
| 671 | 671 | |
| 672 | 672 | } |
@@ -675,13 +675,13 @@ discard block |
||
| 675 | 675 | break; |
| 676 | 676 | |
| 677 | 677 | case 'checkbox': |
| 678 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TINYINT(1) NOT NULL"; |
|
| 678 | + $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` TINYINT(1) NOT NULL"; |
|
| 679 | 679 | if ($default_value != '') {
|
| 680 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 680 | + $default_value_add .= " DEFAULT '".$default_value."'"; |
|
| 681 | 681 | } |
| 682 | 682 | |
| 683 | 683 | $alter_result = $wpdb->query($default_value_add); |
| 684 | - if ( $alter_result === false) {
|
|
| 684 | + if ($alter_result === false) {
|
|
| 685 | 685 | return __('Column change failed, you may have too many columns.', 'geodirectory');
|
| 686 | 686 | } |
| 687 | 687 | break; |
@@ -692,30 +692,30 @@ discard block |
||
| 692 | 692 | $op_size = '500'; |
| 693 | 693 | |
| 694 | 694 | // only make the field as big as it needs to be. |
| 695 | - if(isset($option_values) && $option_values && $field_type=='select'){
|
|
| 696 | - $option_values_arr = explode(',',$option_values);
|
|
| 697 | - if(is_array($option_values_arr)){
|
|
| 695 | + if (isset($option_values) && $option_values && $field_type == 'select') {
|
|
| 696 | + $option_values_arr = explode(',', $option_values);
|
|
| 697 | + if (is_array($option_values_arr)) {
|
|
| 698 | 698 | $op_max = 0; |
| 699 | - foreach($option_values_arr as $op_val){
|
|
| 700 | - if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}
|
|
| 699 | + foreach ($option_values_arr as $op_val) {
|
|
| 700 | + if (strlen($op_val) && strlen($op_val) > $op_max) {$op_max = strlen($op_val); }
|
|
| 701 | 701 | } |
| 702 | - if($op_max){$op_size =$op_max; }
|
|
| 702 | + if ($op_max) {$op_size = $op_max; }
|
|
| 703 | 703 | } |
| 704 | - }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
|
|
| 705 | - if(strlen($option_values)){
|
|
| 706 | - $op_size = strlen($option_values); |
|
| 704 | + }elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
|
|
| 705 | + if (strlen($option_values)) {
|
|
| 706 | + $op_size = strlen($option_values); |
|
| 707 | 707 | } |
| 708 | 708 | } |
| 709 | 709 | |
| 710 | - $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL"; |
|
| 710 | + $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."`VARCHAR( $op_size ) NULL"; |
|
| 711 | 711 | |
| 712 | 712 | if ($default_value != '') {
|
| 713 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 713 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 714 | 714 | } |
| 715 | 715 | |
| 716 | 716 | $alter_result = $wpdb->query($meta_field_add); |
| 717 | - if($alter_result===false){
|
|
| 718 | - return __('Column change failed, you may have too many columns.','geodirectory');
|
|
| 717 | + if ($alter_result === false) {
|
|
| 718 | + return __('Column change failed, you may have too many columns.', 'geodirectory');
|
|
| 719 | 719 | } |
| 720 | 720 | |
| 721 | 721 | if (isset($request_field['cat_display_type'])) |
@@ -732,9 +732,9 @@ discard block |
||
| 732 | 732 | case 'url': |
| 733 | 733 | case 'file': |
| 734 | 734 | |
| 735 | - $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");
|
|
| 736 | - if($alter_result===false){
|
|
| 737 | - return __('Column change failed, you may have too many columns.','geodirectory');
|
|
| 735 | + $alter_result = $wpdb->query("ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` TEXT NULL");
|
|
| 736 | + if ($alter_result === false) {
|
|
| 737 | + return __('Column change failed, you may have too many columns.', 'geodirectory');
|
|
| 738 | 738 | } |
| 739 | 739 | if (isset($request_field['advanced_editor'])) |
| 740 | 740 | $extra_fields = $request_field['advanced_editor']; |
@@ -748,24 +748,24 @@ discard block |
||
| 748 | 748 | default: |
| 749 | 749 | if ($data_type != 'VARCHAR' && $data_type != '') {
|
| 750 | 750 | if ($data_type == 'FLOAT' && $decimal_point > 0) {
|
| 751 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL"; |
|
| 751 | + $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` DECIMAL(11, ".(int) $decimal_point.") NULL"; |
|
| 752 | 752 | } else {
|
| 753 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL"; |
|
| 753 | + $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` ".$data_type." NULL"; |
|
| 754 | 754 | } |
| 755 | 755 | |
| 756 | 756 | if (is_numeric($default_value) && $default_value != '') {
|
| 757 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 757 | + $default_value_add .= " DEFAULT '".$default_value."'"; |
|
| 758 | 758 | } |
| 759 | 759 | } else {
|
| 760 | - $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL"; |
|
| 760 | + $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` VARCHAR( 254 ) NULL"; |
|
| 761 | 761 | if ($default_value != '') {
|
| 762 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 762 | + $default_value_add .= " DEFAULT '".$default_value."'"; |
|
| 763 | 763 | } |
| 764 | 764 | } |
| 765 | 765 | |
| 766 | 766 | $alter_result = $wpdb->query($default_value_add); |
| 767 | - if($alter_result===false){
|
|
| 768 | - return __('Column change failed, you may have too many columns.','geodirectory');
|
|
| 767 | + if ($alter_result === false) {
|
|
| 768 | + return __('Column change failed, you may have too many columns.', 'geodirectory');
|
|
| 769 | 769 | } |
| 770 | 770 | break; |
| 771 | 771 | endswitch; |
@@ -781,7 +781,7 @@ discard block |
||
| 781 | 781 | |
| 782 | 782 | $wpdb->prepare( |
| 783 | 783 | |
| 784 | - "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set |
|
| 784 | + "update ".GEODIR_CUSTOM_FIELDS_TABLE." set |
|
| 785 | 785 | post_type = %s, |
| 786 | 786 | admin_title = %s, |
| 787 | 787 | site_title = %s, |
@@ -815,7 +815,7 @@ discard block |
||
| 815 | 815 | for_admin_use = %s |
| 816 | 816 | where id = %d", |
| 817 | 817 | |
| 818 | - array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf) |
|
| 818 | + array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use, $cf) |
|
| 819 | 819 | ) |
| 820 | 820 | |
| 821 | 821 | ); |
@@ -825,7 +825,7 @@ discard block |
||
| 825 | 825 | |
| 826 | 826 | $wpdb->query( |
| 827 | 827 | $wpdb->prepare( |
| 828 | - "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 828 | + "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set |
|
| 829 | 829 | site_title=%s |
| 830 | 830 | where post_type = %s and htmlvar_name = %s", |
| 831 | 831 | array($site_title, $post_type, $htmlvar_name) |
@@ -834,7 +834,7 @@ discard block |
||
| 834 | 834 | |
| 835 | 835 | |
| 836 | 836 | if ($cat_sort == '') |
| 837 | - $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
|
|
| 837 | + $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
|
|
| 838 | 838 | |
| 839 | 839 | |
| 840 | 840 | /** |
@@ -854,7 +854,7 @@ discard block |
||
| 854 | 854 | $data_type = ''; |
| 855 | 855 | |
| 856 | 856 | if ($htmlvar_name != '') {
|
| 857 | - $prefix = $htmlvar_name . '_'; |
|
| 857 | + $prefix = $htmlvar_name.'_'; |
|
| 858 | 858 | } |
| 859 | 859 | $old_prefix = $old_html_variable; |
| 860 | 860 | |
@@ -862,109 +862,109 @@ discard block |
||
| 862 | 862 | |
| 863 | 863 | $meta_field_add = "VARCHAR( 254 ) NULL"; |
| 864 | 864 | if ($default_value != '') {
|
| 865 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 865 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 866 | 866 | } |
| 867 | 867 | |
| 868 | - geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add); |
|
| 868 | + geodir_add_column_if_not_exist($detail_table, $prefix."address", $meta_field_add); |
|
| 869 | 869 | //$wpdb->query($meta_field_add); |
| 870 | 870 | |
| 871 | 871 | |
| 872 | 872 | if (!empty($extra_fields)) {
|
| 873 | 873 | |
| 874 | 874 | if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
|
| 875 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL"; |
|
| 875 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."city` VARCHAR( 30 ) NULL"; |
|
| 876 | 876 | $meta_field_add = "VARCHAR( 50 ) NULL"; |
| 877 | 877 | if ($default_value != '') {
|
| 878 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 878 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 879 | 879 | } |
| 880 | 880 | |
| 881 | - geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add); |
|
| 881 | + geodir_add_column_if_not_exist($detail_table, $prefix."city", $meta_field_add); |
|
| 882 | 882 | //$wpdb->query($meta_field_add); |
| 883 | 883 | } |
| 884 | 884 | if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
|
| 885 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL"; |
|
| 885 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."region` VARCHAR( 30 ) NULL"; |
|
| 886 | 886 | $meta_field_add = "VARCHAR( 50 ) NULL"; |
| 887 | 887 | if ($default_value != '') {
|
| 888 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 888 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 889 | 889 | } |
| 890 | 890 | |
| 891 | - geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add); |
|
| 891 | + geodir_add_column_if_not_exist($detail_table, $prefix."region", $meta_field_add); |
|
| 892 | 892 | //$wpdb->query($meta_field_add); |
| 893 | 893 | } |
| 894 | 894 | if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
|
| 895 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL"; |
|
| 895 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."country` VARCHAR( 30 ) NULL"; |
|
| 896 | 896 | |
| 897 | 897 | $meta_field_add = "VARCHAR( 30 ) NULL"; |
| 898 | 898 | if ($default_value != '') {
|
| 899 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 899 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 900 | 900 | } |
| 901 | 901 | |
| 902 | - geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add); |
|
| 902 | + geodir_add_column_if_not_exist($detail_table, $prefix."country", $meta_field_add); |
|
| 903 | 903 | //$wpdb->query($meta_field_add); |
| 904 | 904 | } |
| 905 | 905 | if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
|
| 906 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL"; |
|
| 906 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."zip` VARCHAR( 15 ) NULL"; |
|
| 907 | 907 | $meta_field_add = "VARCHAR( 15 ) NULL"; |
| 908 | 908 | if ($default_value != '') {
|
| 909 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 909 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 910 | 910 | } |
| 911 | 911 | |
| 912 | - geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add); |
|
| 912 | + geodir_add_column_if_not_exist($detail_table, $prefix."zip", $meta_field_add); |
|
| 913 | 913 | //$wpdb->query($meta_field_add); |
| 914 | 914 | } |
| 915 | 915 | if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
|
| 916 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL"; |
|
| 916 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latitude` VARCHAR( 20 ) NULL"; |
|
| 917 | 917 | $meta_field_add = "VARCHAR( 20 ) NULL"; |
| 918 | 918 | if ($default_value != '') {
|
| 919 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 919 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 920 | 920 | } |
| 921 | 921 | |
| 922 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add); |
|
| 922 | + geodir_add_column_if_not_exist($detail_table, $prefix."latitude", $meta_field_add); |
|
| 923 | 923 | //$wpdb->query($meta_field_add); |
| 924 | 924 | |
| 925 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL"; |
|
| 925 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."longitude` VARCHAR( 20 ) NULL"; |
|
| 926 | 926 | |
| 927 | 927 | $meta_field_add = "VARCHAR( 20 ) NULL"; |
| 928 | 928 | if ($default_value != '') {
|
| 929 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 929 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 930 | 930 | } |
| 931 | 931 | |
| 932 | - geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add); |
|
| 932 | + geodir_add_column_if_not_exist($detail_table, $prefix."longitude", $meta_field_add); |
|
| 933 | 933 | |
| 934 | 934 | //$wpdb->query($meta_field_add); |
| 935 | 935 | } |
| 936 | 936 | if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
|
| 937 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL"; |
|
| 937 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapview` VARCHAR( 15 ) NULL"; |
|
| 938 | 938 | |
| 939 | 939 | $meta_field_add = "VARCHAR( 15 ) NULL"; |
| 940 | 940 | if ($default_value != '') {
|
| 941 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 941 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 942 | 942 | } |
| 943 | 943 | |
| 944 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add); |
|
| 944 | + geodir_add_column_if_not_exist($detail_table, $prefix."mapview", $meta_field_add); |
|
| 945 | 945 | |
| 946 | 946 | //$wpdb->query($meta_field_add); |
| 947 | 947 | } |
| 948 | 948 | if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
|
| 949 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL"; |
|
| 949 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapzoom` VARCHAR( 3 ) NULL"; |
|
| 950 | 950 | |
| 951 | 951 | $meta_field_add = "VARCHAR( 3 ) NULL"; |
| 952 | 952 | if ($default_value != '') {
|
| 953 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 953 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 954 | 954 | } |
| 955 | 955 | |
| 956 | - geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add); |
|
| 956 | + geodir_add_column_if_not_exist($detail_table, $prefix."mapzoom", $meta_field_add); |
|
| 957 | 957 | |
| 958 | 958 | //$wpdb->query($meta_field_add); |
| 959 | 959 | } |
| 960 | 960 | // show lat lng |
| 961 | 961 | if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
|
| 962 | - $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL"; |
|
| 962 | + $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latlng` VARCHAR( 3 ) NULL"; |
|
| 963 | 963 | |
| 964 | 964 | $meta_field_add = "VARCHAR( 3 ) NULL"; |
| 965 | 965 | $meta_field_add .= " DEFAULT '1'"; |
| 966 | 966 | |
| 967 | - geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add); |
|
| 967 | + geodir_add_column_if_not_exist($detail_table, $prefix."latlng", $meta_field_add); |
|
| 968 | 968 | //$wpdb->query($meta_field_add); |
| 969 | 969 | } |
| 970 | 970 | } |
@@ -974,8 +974,8 @@ discard block |
||
| 974 | 974 | case 'checkbox': |
| 975 | 975 | $data_type = 'TINYINT'; |
| 976 | 976 | |
| 977 | - $meta_field_add = $data_type . "( 1 ) NOT NULL "; |
|
| 978 | - if ((int)$default_value === 1) {
|
|
| 977 | + $meta_field_add = $data_type."( 1 ) NOT NULL "; |
|
| 978 | + if ((int) $default_value === 1) {
|
|
| 979 | 979 | $meta_field_add .= " DEFAULT '1'"; |
| 980 | 980 | } |
| 981 | 981 | |
@@ -1008,7 +1008,7 @@ discard block |
||
| 1008 | 1008 | } |
| 1009 | 1009 | } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
|
| 1010 | 1010 | if (strlen($option_values)) {
|
| 1011 | - $op_size = strlen($option_values); |
|
| 1011 | + $op_size = strlen($option_values); |
|
| 1012 | 1012 | } |
| 1013 | 1013 | |
| 1014 | 1014 | if (isset($request_field['multi_display_type'])) {
|
@@ -1016,9 +1016,9 @@ discard block |
||
| 1016 | 1016 | } |
| 1017 | 1017 | } |
| 1018 | 1018 | |
| 1019 | - $meta_field_add = $data_type . "( $op_size ) NULL "; |
|
| 1019 | + $meta_field_add = $data_type."( $op_size ) NULL "; |
|
| 1020 | 1020 | if ($default_value != '') {
|
| 1021 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1021 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 1022 | 1022 | } |
| 1023 | 1023 | |
| 1024 | 1024 | $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
@@ -1033,9 +1033,9 @@ discard block |
||
| 1033 | 1033 | |
| 1034 | 1034 | $data_type = 'TEXT'; |
| 1035 | 1035 | |
| 1036 | - $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; |
|
| 1036 | + $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL "; |
|
| 1037 | 1037 | |
| 1038 | - $meta_field_add = $data_type . " NULL "; |
|
| 1038 | + $meta_field_add = $data_type." NULL "; |
|
| 1039 | 1039 | /*if($default_value != '') |
| 1040 | 1040 | { $meta_field_add .= " DEFAULT '".$default_value."'"; }*/
|
| 1041 | 1041 | |
@@ -1050,9 +1050,9 @@ discard block |
||
| 1050 | 1050 | |
| 1051 | 1051 | $data_type = 'DATE'; |
| 1052 | 1052 | |
| 1053 | - $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; |
|
| 1053 | + $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL "; |
|
| 1054 | 1054 | |
| 1055 | - $meta_field_add = $data_type . " NULL "; |
|
| 1055 | + $meta_field_add = $data_type." NULL "; |
|
| 1056 | 1056 | |
| 1057 | 1057 | $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
| 1058 | 1058 | if ($add_result === false) {
|
@@ -1065,9 +1065,9 @@ discard block |
||
| 1065 | 1065 | |
| 1066 | 1066 | $data_type = 'TIME'; |
| 1067 | 1067 | |
| 1068 | - $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL "; |
|
| 1068 | + $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL "; |
|
| 1069 | 1069 | |
| 1070 | - $meta_field_add = $data_type . " NULL "; |
|
| 1070 | + $meta_field_add = $data_type." NULL "; |
|
| 1071 | 1071 | |
| 1072 | 1072 | $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add); |
| 1073 | 1073 | if ($add_result === false) {
|
@@ -1079,22 +1079,22 @@ discard block |
||
| 1079 | 1079 | default: |
| 1080 | 1080 | |
| 1081 | 1081 | if ($data_type != 'VARCHAR' && $data_type != '') {
|
| 1082 | - $meta_field_add = $data_type . " NULL "; |
|
| 1082 | + $meta_field_add = $data_type." NULL "; |
|
| 1083 | 1083 | |
| 1084 | 1084 | if ($data_type == 'FLOAT' && $decimal_point > 0) {
|
| 1085 | - $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL "; |
|
| 1085 | + $meta_field_add = "DECIMAL(11, ".(int) $decimal_point.") NULL "; |
|
| 1086 | 1086 | } |
| 1087 | 1087 | |
| 1088 | 1088 | if (is_numeric($default_value) && $default_value != '') {
|
| 1089 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1090 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1089 | + $default_value_add .= " DEFAULT '".$default_value."'"; |
|
| 1090 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 1091 | 1091 | } |
| 1092 | 1092 | } else {
|
| 1093 | 1093 | $meta_field_add = " VARCHAR( 254 ) NULL "; |
| 1094 | 1094 | |
| 1095 | 1095 | if ($default_value != '') {
|
| 1096 | - $default_value_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1097 | - $meta_field_add .= " DEFAULT '" . $default_value . "'"; |
|
| 1096 | + $default_value_add .= " DEFAULT '".$default_value."'"; |
|
| 1097 | + $meta_field_add .= " DEFAULT '".$default_value."'"; |
|
| 1098 | 1098 | } |
| 1099 | 1099 | } |
| 1100 | 1100 | |
@@ -1116,7 +1116,7 @@ discard block |
||
| 1116 | 1116 | |
| 1117 | 1117 | $wpdb->prepare( |
| 1118 | 1118 | |
| 1119 | - "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set |
|
| 1119 | + "insert into ".GEODIR_CUSTOM_FIELDS_TABLE." set |
|
| 1120 | 1120 | post_type = %s, |
| 1121 | 1121 | admin_title = %s, |
| 1122 | 1122 | site_title = %s, |
@@ -1149,7 +1149,7 @@ discard block |
||
| 1149 | 1149 | validation_msg = %s, |
| 1150 | 1150 | for_admin_use = %s ", |
| 1151 | 1151 | |
| 1152 | - array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use) |
|
| 1152 | + array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use) |
|
| 1153 | 1153 | |
| 1154 | 1154 | ) |
| 1155 | 1155 | |
@@ -1161,7 +1161,7 @@ discard block |
||
| 1161 | 1161 | |
| 1162 | 1162 | } |
| 1163 | 1163 | |
| 1164 | - return (int)$lastid; |
|
| 1164 | + return (int) $lastid; |
|
| 1165 | 1165 | |
| 1166 | 1166 | |
| 1167 | 1167 | } else {
|
@@ -1194,7 +1194,7 @@ discard block |
||
| 1194 | 1194 | |
| 1195 | 1195 | $post_meta_info = $wpdb->query( |
| 1196 | 1196 | $wpdb->prepare( |
| 1197 | - "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set |
|
| 1197 | + "update ".GEODIR_CUSTOM_FIELDS_TABLE." set |
|
| 1198 | 1198 | sort_order=%d |
| 1199 | 1199 | where id= %d", |
| 1200 | 1200 | array($count, $cf) |
@@ -1216,7 +1216,7 @@ discard block |
||
| 1216 | 1216 | global $post; |
| 1217 | 1217 | |
| 1218 | 1218 | if (isset($_REQUEST['post'])) {
|
| 1219 | - $_REQUEST['pid'] = (int)$_REQUEST['post']; |
|
| 1219 | + $_REQUEST['pid'] = (int) $_REQUEST['post']; |
|
| 1220 | 1220 | } |
| 1221 | 1221 | } |
| 1222 | 1222 | |
@@ -1239,7 +1239,7 @@ discard block |
||
| 1239 | 1239 | * @param mixed $value Custom field value. |
| 1240 | 1240 | * @param array $cf Custom field info. |
| 1241 | 1241 | */ |
| 1242 | - return apply_filters( 'geodir_get_cf_value', $value, $cf ); |
|
| 1242 | + return apply_filters('geodir_get_cf_value', $value, $cf);
|
|
| 1243 | 1243 | } |
| 1244 | 1244 | |
| 1245 | 1245 | /** |
@@ -1265,16 +1265,16 @@ discard block |
||
| 1265 | 1265 | $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type); |
| 1266 | 1266 | |
| 1267 | 1267 | foreach ($custom_fields as $key => $val) {
|
| 1268 | - if(isset($val['extra_fields'])){$extra_fields = $val['extra_fields'];}
|
|
| 1268 | + if (isset($val['extra_fields'])) {$extra_fields = $val['extra_fields']; }
|
|
| 1269 | 1269 | $val = stripslashes_deep($val); // strip slashes from labels |
| 1270 | - if(isset($val['extra_fields'])){$val['extra_fields'] = $extra_fields;}
|
|
| 1270 | + if (isset($val['extra_fields'])) {$val['extra_fields'] = $extra_fields; }
|
|
| 1271 | 1271 | |
| 1272 | 1272 | $name = $val['name']; |
| 1273 | 1273 | $type = $val['type']; |
| 1274 | 1274 | $is_default = $val['is_default']; |
| 1275 | 1275 | |
| 1276 | 1276 | /* field available to site admin only for edit */ |
| 1277 | - $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false; |
|
| 1277 | + $for_admin_use = isset($val['for_admin_use']) && (int) $val['for_admin_use'] == 1 ? true : false; |
|
| 1278 | 1278 | if ($for_admin_use && !is_super_admin()) {
|
| 1279 | 1279 | continue; |
| 1280 | 1280 | } |
@@ -1299,11 +1299,11 @@ discard block |
||
| 1299 | 1299 | * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
|
| 1300 | 1300 | * @see 'geodir_after_custom_form_field_$name' |
| 1301 | 1301 | */ |
| 1302 | - do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);
|
|
| 1302 | + do_action('geodir_before_custom_form_field_'.$name, $listing_type, $package_id, $val);
|
|
| 1303 | 1303 | |
| 1304 | 1304 | |
| 1305 | 1305 | $custom_field = $val; |
| 1306 | - $html =''; |
|
| 1306 | + $html = ''; |
|
| 1307 | 1307 | /** |
| 1308 | 1308 | * Filter the output for custom fields. |
| 1309 | 1309 | * |
@@ -1312,7 +1312,7 @@ discard block |
||
| 1312 | 1312 | * @param string $html The html to be filtered (blank). |
| 1313 | 1313 | * @param array $custom_field The custom field array values. |
| 1314 | 1314 | */ |
| 1315 | - echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);
|
|
| 1315 | + echo apply_filters("geodir_custom_field_input_{$type}", $html, $custom_field);
|
|
| 1316 | 1316 | |
| 1317 | 1317 | |
| 1318 | 1318 | |
@@ -1327,7 +1327,7 @@ discard block |
||
| 1327 | 1327 | * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
|
| 1328 | 1328 | * @see 'geodir_before_custom_form_field_$name' |
| 1329 | 1329 | */ |
| 1330 | - do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);
|
|
| 1330 | + do_action('geodir_after_custom_form_field_'.$name, $listing_type, $package_id, $val);
|
|
| 1331 | 1331 | |
| 1332 | 1332 | } |
| 1333 | 1333 | |
@@ -1353,7 +1353,7 @@ discard block |
||
| 1353 | 1353 | |
| 1354 | 1354 | $filter = $wpdb->get_row( |
| 1355 | 1355 | $wpdb->prepare( |
| 1356 | - "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'", |
|
| 1356 | + "SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND ".$key."='".$value."'", |
|
| 1357 | 1357 | array($geodir_post_type) |
| 1358 | 1358 | ) |
| 1359 | 1359 | ); |
@@ -1368,14 +1368,14 @@ discard block |
||
| 1368 | 1368 | } |
| 1369 | 1369 | |
| 1370 | 1370 | |
| 1371 | -function geodir_field_icon_proccess($cf){
|
|
| 1371 | +function geodir_field_icon_proccess($cf) {
|
|
| 1372 | 1372 | |
| 1373 | 1373 | |
| 1374 | 1374 | if (strpos($cf['field_icon'], 'http') !== false) {
|
| 1375 | - $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
|
|
| 1375 | + $field_icon = ' background: url('.$cf['field_icon'].') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
|
|
| 1376 | 1376 | } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
|
| 1377 | - $field_icon = '<i class="' . $cf['field_icon'] . '"></i>'; |
|
| 1378 | - }else{
|
|
| 1377 | + $field_icon = '<i class="'.$cf['field_icon'].'"></i>'; |
|
| 1378 | + } else {
|
|
| 1379 | 1379 | $field_icon = $cf['field_icon']; |
| 1380 | 1380 | } |
| 1381 | 1381 | |
@@ -1420,14 +1420,14 @@ discard block |
||
| 1420 | 1420 | |
| 1421 | 1421 | |
| 1422 | 1422 | foreach ($fields_info as $type) {
|
| 1423 | - if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 1423 | + if (isset($type['extra_fields'])) {$extra_fields = $type['extra_fields']; }
|
|
| 1424 | 1424 | $type = stripslashes_deep($type); // strip slashes |
| 1425 | - if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 1425 | + if (isset($type['extra_fields'])) {$type['extra_fields'] = $extra_fields; }
|
|
| 1426 | 1426 | $html = ''; |
| 1427 | 1427 | $field_icon = geodir_field_icon_proccess($type); |
| 1428 | 1428 | $filed_type = $type['type']; |
| 1429 | 1429 | $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
| 1430 | - if($html_var=='post'){$html_var='post_address';}
|
|
| 1430 | + if ($html_var == 'post') {$html_var = 'post_address'; }
|
|
| 1431 | 1431 | |
| 1432 | 1432 | /** |
| 1433 | 1433 | * Filter the output for custom fields. |
@@ -1438,7 +1438,7 @@ discard block |
||
| 1438 | 1438 | * @param string $fields_location The location the field is to be show. |
| 1439 | 1439 | * @param array $type The array of field values. |
| 1440 | 1440 | */ |
| 1441 | - $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 1441 | + $html = apply_filters("geodir_custom_field_output_{$filed_type}", $html, $fields_location, $type);
|
|
| 1442 | 1442 | |
| 1443 | 1443 | $variables_array = array(); |
| 1444 | 1444 | |
@@ -1498,7 +1498,7 @@ discard block |
||
| 1498 | 1498 | * @param string $fields_location The location the fields are being output. |
| 1499 | 1499 | * @since 1.6.9 |
| 1500 | 1500 | */ |
| 1501 | - return apply_filters('geodir_show_listing_info',$html,$fields_location);
|
|
| 1501 | + return apply_filters('geodir_show_listing_info', $html, $fields_location);
|
|
| 1502 | 1502 | |
| 1503 | 1503 | } |
| 1504 | 1504 | } |
@@ -1573,7 +1573,7 @@ discard block |
||
| 1573 | 1573 | |
| 1574 | 1574 | $post_type = get_post_type($post_id); |
| 1575 | 1575 | //echo $field_id; exit; |
| 1576 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1576 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 1577 | 1577 | |
| 1578 | 1578 | $postcurr_images = array(); |
| 1579 | 1579 | $postcurr_images = geodir_get_post_meta($post_id, $field_id, true); |
@@ -1592,13 +1592,13 @@ discard block |
||
| 1592 | 1592 | $geodir_uploadurl = $uploads['url']; |
| 1593 | 1593 | $sub_dir = $uploads['subdir']; |
| 1594 | 1594 | |
| 1595 | - $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
|
|
| 1595 | + $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';
|
|
| 1596 | 1596 | |
| 1597 | 1597 | for ($m = 0; $m < count($post_image); $m++) {
|
| 1598 | 1598 | |
| 1599 | 1599 | /* --------- start ------- */ |
| 1600 | 1600 | |
| 1601 | - if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
|
|
| 1601 | + if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM ".$table." WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
|
|
| 1602 | 1602 | |
| 1603 | 1603 | |
| 1604 | 1604 | $curr_img_url = $post_image[$m]; |
@@ -1624,24 +1624,24 @@ discard block |
||
| 1624 | 1624 | //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
|
| 1625 | 1625 | |
| 1626 | 1626 | if (!function_exists('wp_handle_upload'))
|
| 1627 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1627 | + require_once(ABSPATH.'wp-admin/includes/file.php'); |
|
| 1628 | 1628 | |
| 1629 | 1629 | if (!is_dir($geodir_uploadpath)) |
| 1630 | 1630 | mkdir($geodir_uploadpath); |
| 1631 | 1631 | |
| 1632 | - $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1]; |
|
| 1632 | + $new_name = $post_id.'_'.$field_id.'_'.$img_name_arr[0].'.'.$img_name_arr[1]; |
|
| 1633 | 1633 | $explode_sub_dir = explode("/", $sub_dir);
|
| 1634 | 1634 | if ($curr_img_dir == end($explode_sub_dir)) {
|
| 1635 | - $img_path = $geodir_uploadpath . '/' . $filename; |
|
| 1636 | - $img_url = $geodir_uploadurl . '/' . $filename; |
|
| 1635 | + $img_path = $geodir_uploadpath.'/'.$filename; |
|
| 1636 | + $img_url = $geodir_uploadurl.'/'.$filename; |
|
| 1637 | 1637 | } else {
|
| 1638 | - $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1639 | - $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1638 | + $img_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename; |
|
| 1639 | + $img_url = $uploads['url'].'/temp_'.$current_user->data->ID.'/'.$filename; |
|
| 1640 | 1640 | } |
| 1641 | 1641 | |
| 1642 | 1642 | $uploaded_file = ''; |
| 1643 | 1643 | if (file_exists($img_path)) |
| 1644 | - $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); |
|
| 1644 | + $uploaded_file = copy($img_path, $geodir_uploadpath.'/'.$new_name); |
|
| 1645 | 1645 | |
| 1646 | 1646 | if ($curr_img_dir != $geodir_uploaddir) {
|
| 1647 | 1647 | if (file_exists($img_path)) |
@@ -1649,7 +1649,7 @@ discard block |
||
| 1649 | 1649 | } |
| 1650 | 1650 | |
| 1651 | 1651 | if (!empty($uploaded_file)) |
| 1652 | - $file_urls = $geodir_uploadurl . '/' . $new_name; |
|
| 1652 | + $file_urls = $geodir_uploadurl.'/'.$new_name; |
|
| 1653 | 1653 | |
| 1654 | 1654 | } else {
|
| 1655 | 1655 | $file_urls = $post_image[$m]; |
@@ -1663,8 +1663,8 @@ discard block |
||
| 1663 | 1663 | if (!empty($postcurr_images)) {
|
| 1664 | 1664 | |
| 1665 | 1665 | if ($file_urls != $postcurr_images) {
|
| 1666 | - $invalid_files[] = (object)array('src' => $postcurr_images);
|
|
| 1667 | - $invalid_files = (object)$invalid_files; |
|
| 1666 | + $invalid_files[] = (object) array('src' => $postcurr_images);
|
|
| 1667 | + $invalid_files = (object) $invalid_files; |
|
| 1668 | 1668 | } |
| 1669 | 1669 | } |
| 1670 | 1670 | |
@@ -1716,9 +1716,9 @@ discard block |
||
| 1716 | 1716 | function geodir_upload_dir($upload) |
| 1717 | 1717 | {
|
| 1718 | 1718 | global $current_user; |
| 1719 | - $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID; |
|
| 1720 | - $upload['path'] = $upload['basedir'] . $upload['subdir']; |
|
| 1721 | - $upload['url'] = $upload['baseurl'] . $upload['subdir']; |
|
| 1719 | + $upload['subdir'] = $upload['subdir'].'/temp_'.$current_user->data->ID; |
|
| 1720 | + $upload['path'] = $upload['basedir'].$upload['subdir']; |
|
| 1721 | + $upload['url'] = $upload['baseurl'].$upload['subdir']; |
|
| 1722 | 1722 | return $upload; |
| 1723 | 1723 | } |
| 1724 | 1724 | |
@@ -1733,20 +1733,20 @@ discard block |
||
| 1733 | 1733 | // check ajax nonce |
| 1734 | 1734 | $imgid = $_POST["imgid"]; |
| 1735 | 1735 | |
| 1736 | - check_ajax_referer($imgid . 'pluploadan'); |
|
| 1736 | + check_ajax_referer($imgid.'pluploadan'); |
|
| 1737 | 1737 | |
| 1738 | 1738 | // handle custom file uploaddir |
| 1739 | 1739 | add_filter('upload_dir', 'geodir_upload_dir');
|
| 1740 | 1740 | |
| 1741 | 1741 | // change file orientation if needed |
| 1742 | - $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']); |
|
| 1742 | + $fixed_file = geodir_exif($_FILES[$imgid.'async-upload']); |
|
| 1743 | 1743 | |
| 1744 | 1744 | // handle file upload |
| 1745 | 1745 | $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));
|
| 1746 | 1746 | // remove handle custom file uploaddir |
| 1747 | 1747 | remove_filter('upload_dir', 'geodir_upload_dir');
|
| 1748 | 1748 | |
| 1749 | - if(!isset($status['url']) && isset($status['error'])){
|
|
| 1749 | + if (!isset($status['url']) && isset($status['error'])) {
|
|
| 1750 | 1750 | print_r($status); |
| 1751 | 1751 | } |
| 1752 | 1752 | |
@@ -1776,9 +1776,9 @@ discard block |
||
| 1776 | 1776 | |
| 1777 | 1777 | $post_type = get_post_type($post_id); |
| 1778 | 1778 | |
| 1779 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1779 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 1780 | 1780 | |
| 1781 | - $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));
|
|
| 1781 | + $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM ".$table." WHERE post_id=%d", array($post_id)));
|
|
| 1782 | 1782 | |
| 1783 | 1783 | if ($results) {
|
| 1784 | 1784 | return $results[0]->geodir_video; |
@@ -1802,9 +1802,9 @@ discard block |
||
| 1802 | 1802 | |
| 1803 | 1803 | $post_type = get_post_type($post_id); |
| 1804 | 1804 | |
| 1805 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 1805 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 1806 | 1806 | |
| 1807 | - $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));
|
|
| 1807 | + $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM ".$table." WHERE post_id=%d", array($post_id)));
|
|
| 1808 | 1808 | |
| 1809 | 1809 | if ($results) {
|
| 1810 | 1810 | return $results[0]->geodir_special_offers; |
@@ -1822,12 +1822,12 @@ discard block |
||
| 1822 | 1822 | */ |
| 1823 | 1823 | function geodir_max_upload_size() |
| 1824 | 1824 | {
|
| 1825 | - $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);
|
|
| 1825 | + $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);
|
|
| 1826 | 1826 | |
| 1827 | 1827 | if ($max_filesize > 0 && $max_filesize < 1) {
|
| 1828 | - $max_filesize = (int)($max_filesize * 1024) . 'kb'; |
|
| 1828 | + $max_filesize = (int) ($max_filesize * 1024).'kb'; |
|
| 1829 | 1829 | } else {
|
| 1830 | - $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb'; |
|
| 1830 | + $max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb'; |
|
| 1831 | 1831 | } |
| 1832 | 1832 | /** Filter documented in geodirectory-functions/general_functions.php **/ |
| 1833 | 1833 | return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
|
@@ -1859,7 +1859,7 @@ discard block |
||
| 1859 | 1859 | |
| 1860 | 1860 | $custom_fields = $wpdb->get_results( |
| 1861 | 1861 | $wpdb->prepare( |
| 1862 | - "select post_type,data_type,field_type,site_title,admin_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc", |
|
| 1862 | + "select post_type,data_type,field_type,site_title,admin_title,htmlvar_name,field_icon from ".GEODIR_CUSTOM_FIELDS_TABLE." where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc", |
|
| 1863 | 1863 | array($post_type) |
| 1864 | 1864 | ), 'ARRAY_A' |
| 1865 | 1865 | ); |
@@ -1986,7 +1986,7 @@ discard block |
||
| 1986 | 1986 | |
| 1987 | 1987 | $post_meta_info = $wpdb->query( |
| 1988 | 1988 | $wpdb->prepare( |
| 1989 | - "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 1989 | + "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set |
|
| 1990 | 1990 | sort_order=%d |
| 1991 | 1991 | where id= %d", |
| 1992 | 1992 | array($count, $cf) |
@@ -2068,14 +2068,14 @@ discard block |
||
| 2068 | 2068 | |
| 2069 | 2069 | $check_html_variable = $wpdb->get_var( |
| 2070 | 2070 | $wpdb->prepare( |
| 2071 | - "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ", |
|
| 2071 | + "select htmlvar_name from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s and field_type=%s ", |
|
| 2072 | 2072 | array($cehhtmlvar_name, $post_type, $field_type) |
| 2073 | 2073 | ) |
| 2074 | 2074 | ); |
| 2075 | 2075 | |
| 2076 | 2076 | if ($is_default == 1) {
|
| 2077 | 2077 | |
| 2078 | - $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));
|
|
| 2078 | + $wpdb->query($wpdb->prepare("update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set is_default='0', default_order='' where post_type = %s", array($post_type)));
|
|
| 2079 | 2079 | |
| 2080 | 2080 | } |
| 2081 | 2081 | |
@@ -2086,7 +2086,7 @@ discard block |
||
| 2086 | 2086 | |
| 2087 | 2087 | $wpdb->prepare( |
| 2088 | 2088 | |
| 2089 | - "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 2089 | + "insert into ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set |
|
| 2090 | 2090 | post_type = %s, |
| 2091 | 2091 | data_type = %s, |
| 2092 | 2092 | field_type = %s, |
@@ -2117,7 +2117,7 @@ discard block |
||
| 2117 | 2117 | |
| 2118 | 2118 | $wpdb->prepare( |
| 2119 | 2119 | |
| 2120 | - "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set |
|
| 2120 | + "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set |
|
| 2121 | 2121 | post_type = %s, |
| 2122 | 2122 | data_type = %s, |
| 2123 | 2123 | field_type = %s, |
@@ -2143,7 +2143,7 @@ discard block |
||
| 2143 | 2143 | } |
| 2144 | 2144 | |
| 2145 | 2145 | |
| 2146 | - return (int)$lastid; |
|
| 2146 | + return (int) $lastid; |
|
| 2147 | 2147 | |
| 2148 | 2148 | } |
| 2149 | 2149 | } |
@@ -2166,7 +2166,7 @@ discard block |
||
| 2166 | 2166 | if ($field_id != '') {
|
| 2167 | 2167 | $cf = trim($field_id, '_'); |
| 2168 | 2168 | |
| 2169 | - $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));
|
|
| 2169 | + $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where id= %d ", array($cf)));
|
|
| 2170 | 2170 | |
| 2171 | 2171 | return $field_id; |
| 2172 | 2172 | |
@@ -2189,12 +2189,12 @@ discard block |
||
| 2189 | 2189 | * @param string $field_ins_upd When set to "submit" displays form. |
| 2190 | 2190 | * @param bool $default when set to true field will be for admin use only. |
| 2191 | 2191 | */ |
| 2192 | - function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='') |
|
| 2192 | + function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key = '') |
|
| 2193 | 2193 | {
|
| 2194 | 2194 | global $wpdb; |
| 2195 | 2195 | $cf = $result_str; |
| 2196 | 2196 | if (!is_object($cf)) {
|
| 2197 | - $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));
|
|
| 2197 | + $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE id = %d", array($cf)));
|
|
| 2198 | 2198 | } else {
|
| 2199 | 2199 | $field_info = $cf; |
| 2200 | 2200 | $result_str = $cf->id; |
@@ -2230,18 +2230,18 @@ discard block |
||
| 2230 | 2230 | if ($htmlvar_name == '') |
| 2231 | 2231 | $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : ''; |
| 2232 | 2232 | |
| 2233 | - $nonce = wp_create_nonce('custom_fields_' . $result_str);
|
|
| 2233 | + $nonce = wp_create_nonce('custom_fields_'.$result_str);
|
|
| 2234 | 2234 | |
| 2235 | 2235 | $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>'; |
| 2236 | 2236 | $cso_arr = geodir_get_custom_sort_options($post_type); |
| 2237 | 2237 | |
| 2238 | 2238 | $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']); |
| 2239 | - foreach($cso_arr as $cso){
|
|
| 2240 | - if($cur_field_type==$cso['field_type']){
|
|
| 2239 | + foreach ($cso_arr as $cso) {
|
|
| 2240 | + if ($cur_field_type == $cso['field_type']) {
|
|
| 2241 | 2241 | |
| 2242 | 2242 | if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
|
| 2243 | 2243 | $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>'; |
| 2244 | - }elseif(isset($cso['field_icon']) && $cso['field_icon']){
|
|
| 2244 | + }elseif (isset($cso['field_icon']) && $cso['field_icon']) {
|
|
| 2245 | 2245 | $field_icon = '<b class="gd-cf-icon" style="background-image: url(\''.$cso['field_icon'].'\')"></b>'; |
| 2246 | 2246 | } |
| 2247 | 2247 | |
@@ -2251,40 +2251,40 @@ discard block |
||
| 2251 | 2251 | $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500); |
| 2252 | 2252 | ?> |
| 2253 | 2253 | |
| 2254 | - <li class="text" id="licontainer_<?php echo $result_str;?>"> |
|
| 2254 | + <li class="text" id="licontainer_<?php echo $result_str; ?>"> |
|
| 2255 | 2255 | <form><!-- we need to wrap in a form so we can use radio buttons with same name --> |
| 2256 | - <div class="title title<?php echo $result_str;?> gt-fieldset" |
|
| 2257 | - title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory');?>"
|
|
| 2258 | - ondblclick="show_hide('field_frm<?php echo $result_str;?>')">
|
|
| 2256 | + <div class="title title<?php echo $result_str; ?> gt-fieldset" |
|
| 2257 | + title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory'); ?>"
|
|
| 2258 | + ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">
|
|
| 2259 | 2259 | <?php |
| 2260 | 2260 | |
| 2261 | 2261 | ?> |
| 2262 | 2262 | |
| 2263 | - <div title="<?php _e('Click to remove field', 'geodirectory');?>"
|
|
| 2264 | - onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"
|
|
| 2263 | + <div title="<?php _e('Click to remove field', 'geodirectory'); ?>"
|
|
| 2264 | + onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"
|
|
| 2265 | 2265 | class="handlediv close"><i class="fa fa-times" aria-hidden="true"></i></div> |
| 2266 | 2266 | |
| 2267 | 2267 | |
| 2268 | - <?php echo $field_icon;?> |
|
| 2268 | + <?php echo $field_icon; ?> |
|
| 2269 | 2269 | <b style="cursor:pointer;" |
| 2270 | - onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory') . ' (' . $site_title . ')');?></b>
|
|
| 2270 | + onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory').' ('.$site_title.')'); ?></b>
|
|
| 2271 | 2271 | |
| 2272 | 2272 | </div> |
| 2273 | 2273 | |
| 2274 | - <div id="field_frm<?php echo $result_str;?>" class="field_frm" |
|
| 2274 | + <div id="field_frm<?php echo $result_str; ?>" class="field_frm" |
|
| 2275 | 2275 | style="display:<?php if ($field_ins_upd == 'submit') {
|
| 2276 | 2276 | echo 'block;'; |
| 2277 | 2277 | } else {
|
| 2278 | 2278 | echo 'none;'; |
| 2279 | 2279 | } ?>"> |
| 2280 | 2280 | <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/> |
| 2281 | - <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/> |
|
| 2282 | - <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/> |
|
| 2283 | - <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str;?>"/> |
|
| 2281 | + <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type; ?>"/> |
|
| 2282 | + <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type; ?>"/> |
|
| 2283 | + <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str; ?>"/> |
|
| 2284 | 2284 | <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {
|
| 2285 | 2285 | echo $field_info->data_type; |
| 2286 | 2286 | }?>"/> |
| 2287 | - <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name;?>"/> |
|
| 2287 | + <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name; ?>"/> |
|
| 2288 | 2288 | |
| 2289 | 2289 | |
| 2290 | 2290 | <ul class="widefat post fixed" border="0" style="width:100%;"> |
@@ -2294,7 +2294,7 @@ discard block |
||
| 2294 | 2294 | <input type="hidden" name="site_title" id="site_title" value="<?php echo esc_attr($site_title); ?>"/> |
| 2295 | 2295 | |
| 2296 | 2296 | <li> |
| 2297 | - <?php $value = (isset($field_info->sort_asc) && $field_info->sort_asc) ? $field_info->sort_asc : 0;?> |
|
| 2297 | + <?php $value = (isset($field_info->sort_asc) && $field_info->sort_asc) ? $field_info->sort_asc : 0; ?> |
|
| 2298 | 2298 | |
| 2299 | 2299 | <label for="asc" class="gd-cf-tooltip-wrap"> |
| 2300 | 2300 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show Ascending Sort (low to high)', 'geodirectory'); ?>
|
@@ -2304,24 +2304,24 @@ discard block |
||
| 2304 | 2304 | </label> |
| 2305 | 2305 | <div class="gd-cf-input-wrap gd-switch"> |
| 2306 | 2306 | |
| 2307 | - <input type="radio" id="asc_yes<?php echo $radio_id;?>" name="asc" class="gdri-enabled" value="1" |
|
| 2307 | + <input type="radio" id="asc_yes<?php echo $radio_id; ?>" name="asc" class="gdri-enabled" value="1" |
|
| 2308 | 2308 | <?php if ($value == '1') {
|
| 2309 | 2309 | echo 'checked'; |
| 2310 | 2310 | } ?>/> |
| 2311 | - <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 2311 | + <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 2312 | 2312 | |
| 2313 | - <input type="radio" id="asc_no<?php echo $radio_id;?>" name="asc" class="gdri-disabled" value="0" |
|
| 2313 | + <input type="radio" id="asc_no<?php echo $radio_id; ?>" name="asc" class="gdri-disabled" value="0" |
|
| 2314 | 2314 | <?php if ($value == '0' || !$value) {
|
| 2315 | 2315 | echo 'checked'; |
| 2316 | 2316 | } ?>/> |
| 2317 | - <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 2317 | + <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 2318 | 2318 | |
| 2319 | 2319 | </div> |
| 2320 | 2320 | |
| 2321 | 2321 | </li> |
| 2322 | 2322 | |
| 2323 | - <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'";}?>>
|
|
| 2324 | - <?php $value = (isset($field_info->asc_title) && $field_info->asc_title) ? esc_attr($field_info->asc_title) : '';?> |
|
| 2323 | + <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'"; }?>>
|
|
| 2324 | + <?php $value = (isset($field_info->asc_title) && $field_info->asc_title) ? esc_attr($field_info->asc_title) : ''; ?> |
|
| 2325 | 2325 | |
| 2326 | 2326 | <label for="asc_title" class="gd-cf-tooltip-wrap"> |
| 2327 | 2327 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Ascending title', 'geodirectory'); ?>
|
@@ -2331,14 +2331,14 @@ discard block |
||
| 2331 | 2331 | </label> |
| 2332 | 2332 | <div class="gd-cf-input-wrap"> |
| 2333 | 2333 | |
| 2334 | - <input type="text" name="asc_title" id="asc_title" value="<?php echo $value;?>" /> |
|
| 2334 | + <input type="text" name="asc_title" id="asc_title" value="<?php echo $value; ?>" /> |
|
| 2335 | 2335 | </div> |
| 2336 | 2336 | |
| 2337 | 2337 | |
| 2338 | 2338 | </li> |
| 2339 | 2339 | |
| 2340 | 2340 | |
| 2341 | - <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'";}?>>
|
|
| 2341 | + <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'"; }?>>
|
|
| 2342 | 2342 | |
| 2343 | 2343 | <label for="is_default" class="gd-cf-tooltip-wrap"> |
| 2344 | 2344 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>
|
@@ -2349,7 +2349,7 @@ discard block |
||
| 2349 | 2349 | <div class="gd-cf-input-wrap"> |
| 2350 | 2350 | |
| 2351 | 2351 | <input type="radio" name="is_default" |
| 2352 | - value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {
|
|
| 2352 | + value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name.'_asc') {
|
|
| 2353 | 2353 | echo 'checked="checked"'; |
| 2354 | 2354 | } ?>/> |
| 2355 | 2355 | </div> |
@@ -2359,7 +2359,7 @@ discard block |
||
| 2359 | 2359 | |
| 2360 | 2360 | |
| 2361 | 2361 | <li> |
| 2362 | - <?php $value = (isset($field_info->sort_desc) && $field_info->sort_desc) ? $field_info->sort_desc : 0;?> |
|
| 2362 | + <?php $value = (isset($field_info->sort_desc) && $field_info->sort_desc) ? $field_info->sort_desc : 0; ?> |
|
| 2363 | 2363 | |
| 2364 | 2364 | <label for="desc" class="gd-cf-tooltip-wrap"> |
| 2365 | 2365 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show Descending Sort (high to low)', 'geodirectory'); ?>
|
@@ -2369,24 +2369,24 @@ discard block |
||
| 2369 | 2369 | </label> |
| 2370 | 2370 | <div class="gd-cf-input-wrap gd-switch"> |
| 2371 | 2371 | |
| 2372 | - <input type="radio" id="desc_yes<?php echo $radio_id;?>" name="desc" class="gdri-enabled" value="1" |
|
| 2372 | + <input type="radio" id="desc_yes<?php echo $radio_id; ?>" name="desc" class="gdri-enabled" value="1" |
|
| 2373 | 2373 | <?php if ($value == '1') {
|
| 2374 | 2374 | echo 'checked'; |
| 2375 | 2375 | } ?>/> |
| 2376 | - <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 2376 | + <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 2377 | 2377 | |
| 2378 | - <input type="radio" id="desc_no<?php echo $radio_id;?>" name="desc" class="gdri-disabled" value="0" |
|
| 2378 | + <input type="radio" id="desc_no<?php echo $radio_id; ?>" name="desc" class="gdri-disabled" value="0" |
|
| 2379 | 2379 | <?php if ($value == '0' || !$value) {
|
| 2380 | 2380 | echo 'checked'; |
| 2381 | 2381 | } ?>/> |
| 2382 | - <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 2382 | + <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 2383 | 2383 | |
| 2384 | 2384 | </div> |
| 2385 | 2385 | |
| 2386 | 2386 | </li> |
| 2387 | 2387 | |
| 2388 | - <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'";}?>>
|
|
| 2389 | - <?php $value = (isset($field_info->desc_title) && $field_info->desc_title) ? esc_attr($field_info->desc_title) : '';?> |
|
| 2388 | + <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'"; }?>>
|
|
| 2389 | + <?php $value = (isset($field_info->desc_title) && $field_info->desc_title) ? esc_attr($field_info->desc_title) : ''; ?> |
|
| 2390 | 2390 | |
| 2391 | 2391 | <label for="desc_title" class="gd-cf-tooltip-wrap"> |
| 2392 | 2392 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Descending title', 'geodirectory'); ?>
|
@@ -2396,13 +2396,13 @@ discard block |
||
| 2396 | 2396 | </label> |
| 2397 | 2397 | <div class="gd-cf-input-wrap"> |
| 2398 | 2398 | |
| 2399 | - <input type="text" name="desc_title" id="desc_title" value="<?php echo $value;?>" /> |
|
| 2399 | + <input type="text" name="desc_title" id="desc_title" value="<?php echo $value; ?>" /> |
|
| 2400 | 2400 | </div> |
| 2401 | 2401 | |
| 2402 | 2402 | |
| 2403 | 2403 | </li> |
| 2404 | 2404 | |
| 2405 | - <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'";}?>>
|
|
| 2405 | + <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'"; }?>>
|
|
| 2406 | 2406 | |
| 2407 | 2407 | <label for="is_default" class="gd-cf-tooltip-wrap"> |
| 2408 | 2408 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>
|
@@ -2413,7 +2413,7 @@ discard block |
||
| 2413 | 2413 | <div class="gd-cf-input-wrap"> |
| 2414 | 2414 | |
| 2415 | 2415 | <input type="radio" name="is_default" |
| 2416 | - value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {
|
|
| 2416 | + value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name.'_desc') {
|
|
| 2417 | 2417 | echo 'checked="checked"'; |
| 2418 | 2418 | } ?>/> |
| 2419 | 2419 | </div> |
@@ -2438,14 +2438,14 @@ discard block |
||
| 2438 | 2438 | </label> |
| 2439 | 2439 | <div class="gd-cf-input-wrap"> |
| 2440 | 2440 | |
| 2441 | - <input type="text" name="site_title" id="site_title" value="<?php echo $value;?>" /> |
|
| 2441 | + <input type="text" name="site_title" id="site_title" value="<?php echo $value; ?>" /> |
|
| 2442 | 2442 | </div> |
| 2443 | 2443 | |
| 2444 | 2444 | |
| 2445 | 2445 | </li> |
| 2446 | 2446 | |
| 2447 | 2447 | <li> |
| 2448 | - <?php $value = (isset($field_info->is_default) && $field_info->is_default) ? esc_attr($field_info->is_default) : '';?> |
|
| 2448 | + <?php $value = (isset($field_info->is_default) && $field_info->is_default) ? esc_attr($field_info->is_default) : ''; ?> |
|
| 2449 | 2449 | |
| 2450 | 2450 | <label for="is_default" class="gd-cf-tooltip-wrap"> |
| 2451 | 2451 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>
|
@@ -2469,7 +2469,7 @@ discard block |
||
| 2469 | 2469 | |
| 2470 | 2470 | |
| 2471 | 2471 | <li> |
| 2472 | - <?php $value = (isset($field_info->is_active) && $field_info->is_active) ? $field_info->is_active: 0;?> |
|
| 2472 | + <?php $value = (isset($field_info->is_active) && $field_info->is_active) ? $field_info->is_active : 0; ?> |
|
| 2473 | 2473 | |
| 2474 | 2474 | <label for="is_active" class="gd-cf-tooltip-wrap"> |
| 2475 | 2475 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is active', 'geodirectory'); ?>
|
@@ -2479,17 +2479,17 @@ discard block |
||
| 2479 | 2479 | </label> |
| 2480 | 2480 | <div class="gd-cf-input-wrap gd-switch"> |
| 2481 | 2481 | |
| 2482 | - <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled" value="1" |
|
| 2482 | + <input type="radio" id="is_active_yes<?php echo $radio_id; ?>" name="is_active" class="gdri-enabled" value="1" |
|
| 2483 | 2483 | <?php if ($value == '1') {
|
| 2484 | 2484 | echo 'checked'; |
| 2485 | 2485 | } ?>/> |
| 2486 | - <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 2486 | + <label for="is_active_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 2487 | 2487 | |
| 2488 | - <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0" |
|
| 2488 | + <input type="radio" id="is_active_no<?php echo $radio_id; ?>" name="is_active" class="gdri-disabled" value="0" |
|
| 2489 | 2489 | <?php if ($value == '0' || !$value) {
|
| 2490 | 2490 | echo 'checked'; |
| 2491 | 2491 | } ?>/> |
| 2492 | - <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 2492 | + <label for="is_active_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 2493 | 2493 | |
| 2494 | 2494 | </div> |
| 2495 | 2495 | |
@@ -2510,10 +2510,10 @@ discard block |
||
| 2510 | 2510 | <h3></h3> |
| 2511 | 2511 | </label> |
| 2512 | 2512 | <div class="gd-cf-input-wrap"> |
| 2513 | - <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save','geodirectory'));?>"
|
|
| 2513 | + <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save', 'geodirectory')); ?>"
|
|
| 2514 | 2514 | onclick="save_sort_field('<?php echo esc_attr($result_str); ?>')"/>
|
| 2515 | - <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete','geodirectory'));?>"
|
|
| 2516 | - onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"
|
|
| 2515 | + <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete', 'geodirectory')); ?>"
|
|
| 2516 | + onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"
|
|
| 2517 | 2517 | class="button"/></a> |
| 2518 | 2518 | </div> |
| 2519 | 2519 | </li> |
@@ -2548,7 +2548,7 @@ discard block |
||
| 2548 | 2548 | if (!$package_id || !$field_name || !$post_type) {
|
| 2549 | 2549 | return true; |
| 2550 | 2550 | } |
| 2551 | - $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));
|
|
| 2551 | + $sql = $wpdb->prepare("SELECT id FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int) $package_id));
|
|
| 2552 | 2552 | |
| 2553 | 2553 | if ($wpdb->get_var($sql)) {
|
| 2554 | 2554 | return true; |
@@ -2671,13 +2671,13 @@ discard block |
||
| 2671 | 2671 | } |
| 2672 | 2672 | |
| 2673 | 2673 | |
| 2674 | -function geodir_cfa_data_type_text($output,$result_str,$cf,$field_info){
|
|
| 2674 | +function geodir_cfa_data_type_text($output, $result_str, $cf, $field_info) {
|
|
| 2675 | 2675 | ob_start(); |
| 2676 | 2676 | |
| 2677 | 2677 | $dt_value = ''; |
| 2678 | 2678 | if (isset($field_info->data_type)) {
|
| 2679 | 2679 | $dt_value = esc_attr($field_info->data_type); |
| 2680 | - }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
|
|
| 2680 | + }elseif (isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']) {
|
|
| 2681 | 2681 | $dt_value = $cf['defaults']['data_type']; |
| 2682 | 2682 | } |
| 2683 | 2683 | ?> |
@@ -2688,15 +2688,15 @@ discard block |
||
| 2688 | 2688 | <select name="data_type" id="data_type" |
| 2689 | 2689 | onchange="javascript:gd_data_type_changed(this, '<?php echo $result_str; ?>');"> |
| 2690 | 2690 | <option |
| 2691 | - value="XVARCHAR" <?php if ($dt_value == 'VARCHAR') {
|
|
| 2691 | + value="XVARCHAR" <?php if ($dt_value == 'VARCHAR') {
|
|
| 2692 | 2692 | echo 'selected="selected"'; |
| 2693 | 2693 | } ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>
|
| 2694 | 2694 | <option |
| 2695 | - value="INT" <?php if ($dt_value == 'INT') {
|
|
| 2695 | + value="INT" <?php if ($dt_value == 'INT') {
|
|
| 2696 | 2696 | echo 'selected="selected"'; |
| 2697 | 2697 | } ?>><?php _e('NUMBER', 'geodirectory'); ?></option>
|
| 2698 | 2698 | <option |
| 2699 | - value="FLOAT" <?php if ($dt_value == 'FLOAT') {
|
|
| 2699 | + value="FLOAT" <?php if ($dt_value == 'FLOAT') {
|
|
| 2700 | 2700 | echo 'selected="selected"'; |
| 2701 | 2701 | } ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>
|
| 2702 | 2702 | </select> |
@@ -2709,13 +2709,13 @@ discard block |
||
| 2709 | 2709 | $value = ''; |
| 2710 | 2710 | if (isset($field_info->decimal_point)) {
|
| 2711 | 2711 | $value = esc_attr($field_info->decimal_point); |
| 2712 | - }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
|
|
| 2712 | + }elseif (isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']) {
|
|
| 2713 | 2713 | $value = $cf['defaults']['decimal_point']; |
| 2714 | 2714 | } |
| 2715 | 2715 | ?> |
| 2716 | 2716 | |
| 2717 | 2717 | <li class="decimal-point-wrapper" |
| 2718 | - style="<?php echo ($dt_value == 'FLOAT') ? '' : 'display:none' ?>"> |
|
| 2718 | + style="<?php echo ($dt_value == 'FLOAT') ? '' : 'display:none' ?>"> |
|
| 2719 | 2719 | <label for="decimal_point"><?php _e('Select decimal point :', 'geodirectory'); ?></label>
|
| 2720 | 2720 | <div class="gd-cf-input-wrap"> |
| 2721 | 2721 | <select name="decimal_point" id="decimal_point"> |
@@ -2733,41 +2733,41 @@ discard block |
||
| 2733 | 2733 | $output = ob_get_clean(); |
| 2734 | 2734 | return $output; |
| 2735 | 2735 | } |
| 2736 | -add_filter('geodir_cfa_data_type_text','geodir_cfa_data_type_text',10,4);
|
|
| 2736 | +add_filter('geodir_cfa_data_type_text', 'geodir_cfa_data_type_text', 10, 4);
|
|
| 2737 | 2737 | |
| 2738 | 2738 | // htmlvar not needed for fieldset and taxonomy |
| 2739 | -add_filter('geodir_cfa_htmlvar_name_fieldset','__return_empty_string',10,4);
|
|
| 2740 | -add_filter('geodir_cfa_htmlvar_name_taxonomy','__return_empty_string',10,4);
|
|
| 2739 | +add_filter('geodir_cfa_htmlvar_name_fieldset', '__return_empty_string', 10, 4);
|
|
| 2740 | +add_filter('geodir_cfa_htmlvar_name_taxonomy', '__return_empty_string', 10, 4);
|
|
| 2741 | 2741 | |
| 2742 | 2742 | |
| 2743 | 2743 | // default_value not needed for textarea, html, file, fieldset, taxonomy, address |
| 2744 | -add_filter('geodir_cfa_default_value_file','__return_empty_string',10,4);
|
|
| 2745 | -add_filter('geodir_cfa_default_value_taxonomy','__return_empty_string',10,4);
|
|
| 2746 | -add_filter('geodir_cfa_default_value_address','__return_empty_string',10,4);
|
|
| 2747 | -add_filter('geodir_cfa_default_value_fieldset','__return_empty_string',10,4);
|
|
| 2744 | +add_filter('geodir_cfa_default_value_file', '__return_empty_string', 10, 4);
|
|
| 2745 | +add_filter('geodir_cfa_default_value_taxonomy', '__return_empty_string', 10, 4);
|
|
| 2746 | +add_filter('geodir_cfa_default_value_address', '__return_empty_string', 10, 4);
|
|
| 2747 | +add_filter('geodir_cfa_default_value_fieldset', '__return_empty_string', 10, 4);
|
|
| 2748 | 2748 | |
| 2749 | 2749 | // is_required not needed for fieldset |
| 2750 | -add_filter('geodir_cfa_is_required_fieldset','__return_empty_string',10,4);
|
|
| 2751 | -add_filter('geodir_cfa_required_msg_fieldset','__return_empty_string',10,4);
|
|
| 2750 | +add_filter('geodir_cfa_is_required_fieldset', '__return_empty_string', 10, 4);
|
|
| 2751 | +add_filter('geodir_cfa_required_msg_fieldset', '__return_empty_string', 10, 4);
|
|
| 2752 | 2752 | |
| 2753 | 2753 | // field_icon not needed for fieldset |
| 2754 | -add_filter('geodir_cfa_field_icon_fieldset','__return_empty_string',10,4);
|
|
| 2755 | -add_filter('geodir_cfa_css_class_fieldset','__return_empty_string',10,4);
|
|
| 2754 | +add_filter('geodir_cfa_field_icon_fieldset', '__return_empty_string', 10, 4);
|
|
| 2755 | +add_filter('geodir_cfa_css_class_fieldset', '__return_empty_string', 10, 4);
|
|
| 2756 | 2756 | |
| 2757 | 2757 | // cat_sort not needed for some fields |
| 2758 | -add_filter('geodir_cfa_cat_sort_html','__return_empty_string',10,4);
|
|
| 2759 | -add_filter('geodir_cfa_cat_sort_file','__return_empty_string',10,4);
|
|
| 2760 | -add_filter('geodir_cfa_cat_sort_url','__return_empty_string',10,4);
|
|
| 2761 | -add_filter('geodir_cfa_cat_sort_fieldset','__return_empty_string',10,4);
|
|
| 2762 | -add_filter('geodir_cfa_cat_sort_multiselect','__return_empty_string',10,4);
|
|
| 2763 | -add_filter('geodir_cfa_cat_sort_textarea','__return_empty_string',10,4);
|
|
| 2764 | -add_filter('geodir_cfa_cat_sort_taxonomy','__return_empty_string',10,4);
|
|
| 2765 | -add_filter('geodir_cfa_cat_sort_address','__return_empty_string',10,4);
|
|
| 2758 | +add_filter('geodir_cfa_cat_sort_html', '__return_empty_string', 10, 4);
|
|
| 2759 | +add_filter('geodir_cfa_cat_sort_file', '__return_empty_string', 10, 4);
|
|
| 2760 | +add_filter('geodir_cfa_cat_sort_url', '__return_empty_string', 10, 4);
|
|
| 2761 | +add_filter('geodir_cfa_cat_sort_fieldset', '__return_empty_string', 10, 4);
|
|
| 2762 | +add_filter('geodir_cfa_cat_sort_multiselect', '__return_empty_string', 10, 4);
|
|
| 2763 | +add_filter('geodir_cfa_cat_sort_textarea', '__return_empty_string', 10, 4);
|
|
| 2764 | +add_filter('geodir_cfa_cat_sort_taxonomy', '__return_empty_string', 10, 4);
|
|
| 2765 | +add_filter('geodir_cfa_cat_sort_address', '__return_empty_string', 10, 4);
|
|
| 2766 | 2766 | |
| 2767 | 2767 | |
| 2768 | 2768 | |
| 2769 | -function geodir_cfa_advanced_editor_geodir_special_offers($output,$result_str,$cf,$field_info){
|
|
| 2770 | - if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}
|
|
| 2769 | +function geodir_cfa_advanced_editor_geodir_special_offers($output, $result_str, $cf, $field_info) {
|
|
| 2770 | + if ($field_info->htmlvar_name != 'geodir_special_offers') {return ''; }
|
|
| 2771 | 2771 | ob_start(); |
| 2772 | 2772 | ?> |
| 2773 | 2773 | <li> |
@@ -2798,16 +2798,16 @@ discard block |
||
| 2798 | 2798 | $output = ob_get_clean(); |
| 2799 | 2799 | return $output; |
| 2800 | 2800 | } |
| 2801 | -add_filter('geodir_cfa_advanced_editor_textarea','geodir_cfa_advanced_editor_geodir_special_offers',10,4);
|
|
| 2801 | +add_filter('geodir_cfa_advanced_editor_textarea', 'geodir_cfa_advanced_editor_geodir_special_offers', 10, 4);
|
|
| 2802 | 2802 | |
| 2803 | 2803 | |
| 2804 | -function geodir_cfa_validation_pattern_text($output,$result_str,$cf,$field_info){
|
|
| 2804 | +function geodir_cfa_validation_pattern_text($output, $result_str, $cf, $field_info) {
|
|
| 2805 | 2805 | ob_start(); |
| 2806 | 2806 | |
| 2807 | 2807 | $value = ''; |
| 2808 | 2808 | if (isset($field_info->validation_pattern)) {
|
| 2809 | 2809 | $value = esc_attr($field_info->validation_pattern); |
| 2810 | - }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
|
|
| 2810 | + }elseif (isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']) {
|
|
| 2811 | 2811 | $value = esc_attr($cf['defaults']['validation_pattern']); |
| 2812 | 2812 | } |
| 2813 | 2813 | ?> |
@@ -2827,7 +2827,7 @@ discard block |
||
| 2827 | 2827 | $value = ''; |
| 2828 | 2828 | if (isset($field_info->validation_msg)) {
|
| 2829 | 2829 | $value = esc_attr($field_info->validation_msg); |
| 2830 | - }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
|
|
| 2830 | + }elseif (isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']) {
|
|
| 2831 | 2831 | $value = esc_attr($cf['defaults']['validation_msg']); |
| 2832 | 2832 | } |
| 2833 | 2833 | ?> |
@@ -2848,10 +2848,10 @@ discard block |
||
| 2848 | 2848 | $output = ob_get_clean(); |
| 2849 | 2849 | return $output; |
| 2850 | 2850 | } |
| 2851 | -add_filter('geodir_cfa_validation_pattern_text','geodir_cfa_validation_pattern_text',10,4);
|
|
| 2851 | +add_filter('geodir_cfa_validation_pattern_text', 'geodir_cfa_validation_pattern_text', 10, 4);
|
|
| 2852 | 2852 | |
| 2853 | 2853 | |
| 2854 | -function geodir_cfa_htmlvar_name_taxonomy($output,$result_str,$cf,$field_info){
|
|
| 2854 | +function geodir_cfa_htmlvar_name_taxonomy($output, $result_str, $cf, $field_info) {
|
|
| 2855 | 2855 | ob_start(); |
| 2856 | 2856 | global $post_type; |
| 2857 | 2857 | |
@@ -2876,7 +2876,7 @@ discard block |
||
| 2876 | 2876 | ?> |
| 2877 | 2877 | <option <?php if (isset($field_info->htmlvar_name) && $field_info->htmlvar_name == $gd_tax) {
|
| 2878 | 2878 | echo 'selected="selected"'; |
| 2879 | - }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php |
|
| 2879 | + }?> id="<?php echo $gd_tax; ?>"><?php echo $gd_tax; ?></option><?php |
|
| 2880 | 2880 | } |
| 2881 | 2881 | ?> |
| 2882 | 2882 | </select> |
@@ -2887,7 +2887,7 @@ discard block |
||
| 2887 | 2887 | <label for="cat_display_type" class="gd-cf-tooltip-wrap"> |
| 2888 | 2888 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Category display type :', 'geodirectory'); ?>
|
| 2889 | 2889 | <div class="gdcf-tooltip"> |
| 2890 | - <?php _e('Show categories list as select, multiselect, checkbox or radio', 'geodirectory');?>
|
|
| 2890 | + <?php _e('Show categories list as select, multiselect, checkbox or radio', 'geodirectory'); ?>
|
|
| 2891 | 2891 | </div> |
| 2892 | 2892 | </label> |
| 2893 | 2893 | <div class="gd-cf-input-wrap"> |
@@ -2895,19 +2895,19 @@ discard block |
||
| 2895 | 2895 | <select name="cat_display_type" id="cat_display_type"> |
| 2896 | 2896 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'ajax_chained') {
|
| 2897 | 2897 | echo 'selected="selected"'; |
| 2898 | - }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>
|
|
| 2898 | + }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory'); ?></option>
|
|
| 2899 | 2899 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
|
| 2900 | 2900 | echo 'selected="selected"'; |
| 2901 | - }?> value="select"><?php _e('Select', 'geodirectory');?></option>
|
|
| 2901 | + }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>
|
|
| 2902 | 2902 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'multiselect') {
|
| 2903 | 2903 | echo 'selected="selected"'; |
| 2904 | - }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>
|
|
| 2904 | + }?> value="multiselect"><?php _e('Multiselect', 'geodirectory'); ?></option>
|
|
| 2905 | 2905 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
|
| 2906 | 2906 | echo 'selected="selected"'; |
| 2907 | - }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
|
|
| 2907 | + }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>
|
|
| 2908 | 2908 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
|
| 2909 | 2909 | echo 'selected="selected"'; |
| 2910 | - }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
|
|
| 2910 | + }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>
|
|
| 2911 | 2911 | </select> |
| 2912 | 2912 | </div> |
| 2913 | 2913 | </li> |
@@ -2916,10 +2916,10 @@ discard block |
||
| 2916 | 2916 | $output = ob_get_clean(); |
| 2917 | 2917 | return $output; |
| 2918 | 2918 | } |
| 2919 | -add_filter('geodir_cfa_htmlvar_name_taxonomy','geodir_cfa_htmlvar_name_taxonomy',10,4);
|
|
| 2919 | +add_filter('geodir_cfa_htmlvar_name_taxonomy', 'geodir_cfa_htmlvar_name_taxonomy', 10, 4);
|
|
| 2920 | 2920 | |
| 2921 | 2921 | |
| 2922 | -function geodir_cfa_extra_fields_address($output,$result_str,$cf,$field_info){
|
|
| 2922 | +function geodir_cfa_extra_fields_address($output, $result_str, $cf, $field_info) {
|
|
| 2923 | 2923 | |
| 2924 | 2924 | ob_start(); |
| 2925 | 2925 | if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
|
@@ -2942,32 +2942,32 @@ discard block |
||
| 2942 | 2942 | <label for="show_zip" class="gd-cf-tooltip-wrap"> |
| 2943 | 2943 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display zip/post code :', 'geodirectory'); ?>
|
| 2944 | 2944 | <div class="gdcf-tooltip"> |
| 2945 | - <?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory');?>
|
|
| 2945 | + <?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory'); ?>
|
|
| 2946 | 2946 | </div> |
| 2947 | 2947 | </label> |
| 2948 | 2948 | <div class="gd-cf-input-wrap gd-switch"> |
| 2949 | 2949 | |
| 2950 | - <input type="radio" id="show_zip_yes<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-enabled" value="1" |
|
| 2950 | + <input type="radio" id="show_zip_yes<?php echo $radio_id; ?>" name="extra[show_zip]" class="gdri-enabled" value="1" |
|
| 2951 | 2951 | <?php if (isset($address['show_zip']) && $address['show_zip'] == '1') {
|
| 2952 | 2952 | echo 'checked'; |
| 2953 | 2953 | } ?>/> |
| 2954 | - <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 2954 | + <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 2955 | 2955 | |
| 2956 | - <input type="radio" id="show_zip_no<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-disabled" value="0" |
|
| 2956 | + <input type="radio" id="show_zip_no<?php echo $radio_id; ?>" name="extra[show_zip]" class="gdri-disabled" value="0" |
|
| 2957 | 2957 | <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {
|
| 2958 | 2958 | echo 'checked'; |
| 2959 | 2959 | } ?>/> |
| 2960 | - <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 2960 | + <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 2961 | 2961 | |
| 2962 | 2962 | |
| 2963 | 2963 | </div> |
| 2964 | 2964 | </li> |
| 2965 | 2965 | |
| 2966 | - <li class="cf-zip-lable" <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {echo "style='display:none;'";}?> >
|
|
| 2966 | + <li class="cf-zip-lable" <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {echo "style='display:none;'"; }?> >
|
|
| 2967 | 2967 | <label for="zip_lable" class="gd-cf-tooltip-wrap"> |
| 2968 | 2968 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Zip/Post code label :', 'geodirectory'); ?>
|
| 2969 | 2969 | <div class="gdcf-tooltip"> |
| 2970 | - <?php _e('Enter zip/post code field label in address section.', 'geodirectory');?>
|
|
| 2970 | + <?php _e('Enter zip/post code field label in address section.', 'geodirectory'); ?>
|
|
| 2971 | 2971 | </div> |
| 2972 | 2972 | </label> |
| 2973 | 2973 | <div class="gd-cf-input-wrap"> |
@@ -2985,7 +2985,7 @@ discard block |
||
| 2985 | 2985 | <label for="map_lable" class="gd-cf-tooltip-wrap"> |
| 2986 | 2986 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Map button label :', 'geodirectory'); ?>
|
| 2987 | 2987 | <div class="gdcf-tooltip"> |
| 2988 | - <?php _e('Enter text for `set address on map` button in address section.', 'geodirectory');?>
|
|
| 2988 | + <?php _e('Enter text for `set address on map` button in address section.', 'geodirectory'); ?>
|
|
| 2989 | 2989 | </div> |
| 2990 | 2990 | </label> |
| 2991 | 2991 | <div class="gd-cf-input-wrap"> |
@@ -3000,22 +3000,22 @@ discard block |
||
| 3000 | 3000 | <label for="show_mapzoom" class="gd-cf-tooltip-wrap"> |
| 3001 | 3001 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Use user zoom level:', 'geodirectory'); ?>
|
| 3002 | 3002 | <div class="gdcf-tooltip"> |
| 3003 | - <?php _e('Do you want to use the user defined map zoom level from the add listing page?', 'geodirectory');?>
|
|
| 3003 | + <?php _e('Do you want to use the user defined map zoom level from the add listing page?', 'geodirectory'); ?>
|
|
| 3004 | 3004 | </div> |
| 3005 | 3005 | </label> |
| 3006 | 3006 | <div class="gd-cf-input-wrap gd-switch"> |
| 3007 | 3007 | |
| 3008 | - <input type="radio" id="show_mapzoom_yes<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-enabled" value="1" |
|
| 3008 | + <input type="radio" id="show_mapzoom_yes<?php echo $radio_id; ?>" name="extra[show_mapzoom]" class="gdri-enabled" value="1" |
|
| 3009 | 3009 | <?php if (isset($address['show_mapzoom']) && $address['show_mapzoom'] == '1') {
|
| 3010 | 3010 | echo 'checked'; |
| 3011 | 3011 | } ?>/> |
| 3012 | - <label for="show_mapzoom_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 3012 | + <label for="show_mapzoom_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 3013 | 3013 | |
| 3014 | - <input type="radio" id="show_mapzoom_no<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0" |
|
| 3014 | + <input type="radio" id="show_mapzoom_no<?php echo $radio_id; ?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0" |
|
| 3015 | 3015 | <?php if ((isset($address['show_mapzoom']) && !$address['show_mapzoom']) || !isset($address['show_mapzoom'])) {
|
| 3016 | 3016 | echo 'checked'; |
| 3017 | 3017 | } ?>/> |
| 3018 | - <label for="show_mapzoom_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 3018 | + <label for="show_mapzoom_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 3019 | 3019 | |
| 3020 | 3020 | </div> |
| 3021 | 3021 | </li> |
@@ -3024,22 +3024,22 @@ discard block |
||
| 3024 | 3024 | <label for="show_mapview" class="gd-cf-tooltip-wrap"> |
| 3025 | 3025 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display map view:', 'geodirectory'); ?>
|
| 3026 | 3026 | <div class="gdcf-tooltip"> |
| 3027 | - <?php _e('Select if you want to `set default map` options in address section. ( Satellite Map, Hybrid Map, Terrain Map)', 'geodirectory');?>
|
|
| 3027 | + <?php _e('Select if you want to `set default map` options in address section. ( Satellite Map, Hybrid Map, Terrain Map)', 'geodirectory'); ?>
|
|
| 3028 | 3028 | </div> |
| 3029 | 3029 | </label> |
| 3030 | 3030 | <div class="gd-cf-input-wrap gd-switch"> |
| 3031 | 3031 | |
| 3032 | - <input type="radio" id="show_mapview_yes<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-enabled" value="1" |
|
| 3032 | + <input type="radio" id="show_mapview_yes<?php echo $radio_id; ?>" name="extra[show_mapview]" class="gdri-enabled" value="1" |
|
| 3033 | 3033 | <?php if (isset($address['show_mapview']) && $address['show_mapview'] == '1') {
|
| 3034 | 3034 | echo 'checked'; |
| 3035 | 3035 | } ?>/> |
| 3036 | - <label for="show_mapview_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 3036 | + <label for="show_mapview_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 3037 | 3037 | |
| 3038 | - <input type="radio" id="show_mapview_no<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-disabled" value="0" |
|
| 3038 | + <input type="radio" id="show_mapview_no<?php echo $radio_id; ?>" name="extra[show_mapview]" class="gdri-disabled" value="0" |
|
| 3039 | 3039 | <?php if ((isset($address['show_mapview']) && !$address['show_mapview']) || !isset($address['show_mapview'])) {
|
| 3040 | 3040 | echo 'checked'; |
| 3041 | 3041 | } ?>/> |
| 3042 | - <label for="show_mapview_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 3042 | + <label for="show_mapview_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 3043 | 3043 | |
| 3044 | 3044 | </div> |
| 3045 | 3045 | </li> |
@@ -3049,7 +3049,7 @@ discard block |
||
| 3049 | 3049 | <label for="mapview_lable" class="gd-cf-tooltip-wrap"> |
| 3050 | 3050 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Map view label:', 'geodirectory'); ?>
|
| 3051 | 3051 | <div class="gdcf-tooltip"> |
| 3052 | - <?php _e('Enter mapview field label in address section.', 'geodirectory');?>
|
|
| 3052 | + <?php _e('Enter mapview field label in address section.', 'geodirectory'); ?>
|
|
| 3053 | 3053 | </div> |
| 3054 | 3054 | </label> |
| 3055 | 3055 | <div class="gd-cf-input-wrap"> |
@@ -3063,22 +3063,22 @@ discard block |
||
| 3063 | 3063 | <label for="show_latlng" class="gd-cf-tooltip-wrap"> |
| 3064 | 3064 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show latitude and longitude', 'geodirectory'); ?>
|
| 3065 | 3065 | <div class="gdcf-tooltip"> |
| 3066 | - <?php _e('This will show/hide the longitude fields in the address section add listing form.', 'geodirectory');?>
|
|
| 3066 | + <?php _e('This will show/hide the longitude fields in the address section add listing form.', 'geodirectory'); ?>
|
|
| 3067 | 3067 | </div> |
| 3068 | 3068 | </label> |
| 3069 | 3069 | <div class="gd-cf-input-wrap gd-switch"> |
| 3070 | 3070 | |
| 3071 | - <input type="radio" id="show_latlng_yes<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-enabled" value="1" |
|
| 3071 | + <input type="radio" id="show_latlng_yes<?php echo $radio_id; ?>" name="extra[show_latlng]" class="gdri-enabled" value="1" |
|
| 3072 | 3072 | <?php if (isset($address['show_latlng']) && $address['show_latlng'] == '1') {
|
| 3073 | 3073 | echo 'checked'; |
| 3074 | 3074 | } ?>/> |
| 3075 | - <label for="show_latlng_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 3075 | + <label for="show_latlng_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 3076 | 3076 | |
| 3077 | - <input type="radio" id="show_latlng_no<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-disabled" value="0" |
|
| 3077 | + <input type="radio" id="show_latlng_no<?php echo $radio_id; ?>" name="extra[show_latlng]" class="gdri-disabled" value="0" |
|
| 3078 | 3078 | <?php if ((isset($address['show_latlng']) && !$address['show_latlng']) || !isset($address['show_latlng'])) {
|
| 3079 | 3079 | echo 'checked'; |
| 3080 | 3080 | } ?>/> |
| 3081 | - <label for="show_latlng_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 3081 | + <label for="show_latlng_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 3082 | 3082 | |
| 3083 | 3083 | </div> |
| 3084 | 3084 | </li> |
@@ -3087,17 +3087,17 @@ discard block |
||
| 3087 | 3087 | $html = ob_get_clean(); |
| 3088 | 3088 | return $output.$html; |
| 3089 | 3089 | } |
| 3090 | -add_filter('geodir_cfa_extra_fields_address','geodir_cfa_extra_fields_address',10,4);
|
|
| 3090 | +add_filter('geodir_cfa_extra_fields_address', 'geodir_cfa_extra_fields_address', 10, 4);
|
|
| 3091 | 3091 | |
| 3092 | 3092 | |
| 3093 | -function geodir_cfa_extra_fields_multiselect($output,$result_str,$cf,$field_info){
|
|
| 3093 | +function geodir_cfa_extra_fields_multiselect($output, $result_str, $cf, $field_info) {
|
|
| 3094 | 3094 | ob_start(); |
| 3095 | 3095 | ?> |
| 3096 | 3096 | <li> |
| 3097 | 3097 | <label for="multi_display_type" class="gd-cf-tooltip-wrap"> |
| 3098 | 3098 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Multiselect display type :', 'geodirectory'); ?>
|
| 3099 | 3099 | <div class="gdcf-tooltip"> |
| 3100 | - <?php _e('Show multiselect list as multiselect,checkbox or radio.', 'geodirectory');?>
|
|
| 3100 | + <?php _e('Show multiselect list as multiselect,checkbox or radio.', 'geodirectory'); ?>
|
|
| 3101 | 3101 | </div> |
| 3102 | 3102 | </label> |
| 3103 | 3103 | <div class="gd-cf-input-wrap"> |
@@ -3105,13 +3105,13 @@ discard block |
||
| 3105 | 3105 | <select name="multi_display_type" id="multi_display_type"> |
| 3106 | 3106 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
|
| 3107 | 3107 | echo 'selected="selected"'; |
| 3108 | - }?> value="select"><?php _e('Select', 'geodirectory');?></option>
|
|
| 3108 | + }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>
|
|
| 3109 | 3109 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
|
| 3110 | 3110 | echo 'selected="selected"'; |
| 3111 | - }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
|
|
| 3111 | + }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>
|
|
| 3112 | 3112 | <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
|
| 3113 | 3113 | echo 'selected="selected"'; |
| 3114 | - }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
|
|
| 3114 | + }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>
|
|
| 3115 | 3115 | </select> |
| 3116 | 3116 | |
| 3117 | 3117 | <br/> |
@@ -3122,17 +3122,17 @@ discard block |
||
| 3122 | 3122 | $html = ob_get_clean(); |
| 3123 | 3123 | return $output.$html; |
| 3124 | 3124 | } |
| 3125 | -add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_multiselect',10,4);
|
|
| 3125 | +add_filter('geodir_cfa_extra_fields_multiselect', 'geodir_cfa_extra_fields_multiselect', 10, 4);
|
|
| 3126 | 3126 | |
| 3127 | 3127 | |
| 3128 | -function geodir_cfa_extra_fields_smr($output,$result_str,$cf,$field_info){
|
|
| 3128 | +function geodir_cfa_extra_fields_smr($output, $result_str, $cf, $field_info) {
|
|
| 3129 | 3129 | |
| 3130 | 3130 | ob_start(); |
| 3131 | 3131 | |
| 3132 | 3132 | $value = ''; |
| 3133 | 3133 | if (isset($field_info->option_values)) {
|
| 3134 | 3134 | $value = esc_attr($field_info->option_values); |
| 3135 | - }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
|
|
| 3135 | + }elseif (isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']) {
|
|
| 3136 | 3136 | $value = esc_attr($cf['defaults']['option_values']); |
| 3137 | 3137 | } |
| 3138 | 3138 | |
@@ -3142,11 +3142,11 @@ discard block |
||
| 3142 | 3142 | <label for="option_values" class="gd-cf-tooltip-wrap"> |
| 3143 | 3143 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Option Values :', 'geodirectory'); ?>
|
| 3144 | 3144 | <div class="gdcf-tooltip"> |
| 3145 | - <span><?php _e('Option Values should be separated by comma.', 'geodirectory');?></span>
|
|
| 3145 | + <span><?php _e('Option Values should be separated by comma.', 'geodirectory'); ?></span>
|
|
| 3146 | 3146 | <br/> |
| 3147 | - <small><span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory');?></span>
|
|
| 3147 | + <small><span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory'); ?></span>
|
|
| 3148 | 3148 | <br/> |
| 3149 | - <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory');?></span>
|
|
| 3149 | + <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory'); ?></span>
|
|
| 3150 | 3150 | <?php if ($field_type == 'multiselect' || $field_type == 'select') { ?>
|
| 3151 | 3151 | <br/> |
| 3152 | 3152 | <span><?php _e('- If using OPTGROUP tag to grouping options, use "{optgroup}OPTGROUP-LABEL|OPTION-1,OPTION-2{/optgroup}"', 'geodirectory'); ?></span>
|
@@ -3157,7 +3157,7 @@ discard block |
||
| 3157 | 3157 | </label> |
| 3158 | 3158 | <div class="gd-cf-input-wrap"> |
| 3159 | 3159 | <input type="text" name="option_values" id="option_values" |
| 3160 | - value="<?php echo $value;?>"/> |
|
| 3160 | + value="<?php echo $value; ?>"/> |
|
| 3161 | 3161 | <br/> |
| 3162 | 3162 | |
| 3163 | 3163 | </div> |
@@ -3167,12 +3167,12 @@ discard block |
||
| 3167 | 3167 | $html = ob_get_clean(); |
| 3168 | 3168 | return $output.$html; |
| 3169 | 3169 | } |
| 3170 | -add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_smr',10,4);
|
|
| 3171 | -add_filter('geodir_cfa_extra_fields_select','geodir_cfa_extra_fields_smr',10,4);
|
|
| 3172 | -add_filter('geodir_cfa_extra_fields_radio','geodir_cfa_extra_fields_smr',10,4);
|
|
| 3170 | +add_filter('geodir_cfa_extra_fields_multiselect', 'geodir_cfa_extra_fields_smr', 10, 4);
|
|
| 3171 | +add_filter('geodir_cfa_extra_fields_select', 'geodir_cfa_extra_fields_smr', 10, 4);
|
|
| 3172 | +add_filter('geodir_cfa_extra_fields_radio', 'geodir_cfa_extra_fields_smr', 10, 4);
|
|
| 3173 | 3173 | |
| 3174 | 3174 | |
| 3175 | -function geodir_cfa_extra_fields_datepicker($output,$result_str,$cf,$field_info){
|
|
| 3175 | +function geodir_cfa_extra_fields_datepicker($output, $result_str, $cf, $field_info) {
|
|
| 3176 | 3176 | ob_start(); |
| 3177 | 3177 | $extra = array(); |
| 3178 | 3178 | if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
|
@@ -3183,7 +3183,7 @@ discard block |
||
| 3183 | 3183 | <label for="date_format" class="gd-cf-tooltip-wrap"> |
| 3184 | 3184 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Date Format :', 'geodirectory'); ?>
|
| 3185 | 3185 | <div class="gdcf-tooltip"> |
| 3186 | - <?php _e('Select the date format.', 'geodirectory');?>
|
|
| 3186 | + <?php _e('Select the date format.', 'geodirectory'); ?>
|
|
| 3187 | 3187 | </div> |
| 3188 | 3188 | </label> |
| 3189 | 3189 | <div class="gd-cf-input-wrap" style="overflow:inherit;"> |
@@ -3203,16 +3203,16 @@ discard block |
||
| 3203 | 3203 | * @since 1.6.5 |
| 3204 | 3204 | * @param array $date_formats The PHP date format array. |
| 3205 | 3205 | */ |
| 3206 | - $date_formats = apply_filters('geodir_date_formats',$date_formats);
|
|
| 3206 | + $date_formats = apply_filters('geodir_date_formats', $date_formats);
|
|
| 3207 | 3207 | ?> |
| 3208 | 3208 | <select name="extra[date_format]" id="date_format"> |
| 3209 | 3209 | <?php |
| 3210 | - foreach($date_formats as $format){
|
|
| 3210 | + foreach ($date_formats as $format) {
|
|
| 3211 | 3211 | $selected = ''; |
| 3212 | - if(!empty($extra) && esc_attr($extra['date_format'])==$format){
|
|
| 3212 | + if (!empty($extra) && esc_attr($extra['date_format']) == $format) {
|
|
| 3213 | 3213 | $selected = "selected='selected'"; |
| 3214 | 3214 | } |
| 3215 | - echo "<option $selected value='$format'>$format (".date_i18n( $format, time()).")</option>";
|
|
| 3215 | + echo "<option $selected value='$format'>$format (".date_i18n($format, time()).")</option>";
|
|
| 3216 | 3216 | } |
| 3217 | 3217 | ?> |
| 3218 | 3218 | </select> |
@@ -3224,10 +3224,10 @@ discard block |
||
| 3224 | 3224 | $html = ob_get_clean(); |
| 3225 | 3225 | return $output.$html; |
| 3226 | 3226 | } |
| 3227 | -add_filter('geodir_cfa_extra_fields_datepicker','geodir_cfa_extra_fields_datepicker',10,4);
|
|
| 3227 | +add_filter('geodir_cfa_extra_fields_datepicker', 'geodir_cfa_extra_fields_datepicker', 10, 4);
|
|
| 3228 | 3228 | |
| 3229 | 3229 | |
| 3230 | -function geodir_cfa_extra_fields_file($output,$result_str,$cf,$field_info){
|
|
| 3230 | +function geodir_cfa_extra_fields_file($output, $result_str, $cf, $field_info) {
|
|
| 3231 | 3231 | ob_start(); |
| 3232 | 3232 | $allowed_file_types = geodir_allowed_mime_types(); |
| 3233 | 3233 | |
@@ -3238,16 +3238,16 @@ discard block |
||
| 3238 | 3238 | <label for="gd_file_types" class="gd-cf-tooltip-wrap"> |
| 3239 | 3239 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Allowed file types :', 'geodirectory'); ?>
|
| 3240 | 3240 | <div class="gdcf-tooltip"> |
| 3241 | - <?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', 'geodirectory');?>
|
|
| 3241 | + <?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', 'geodirectory'); ?>
|
|
| 3242 | 3242 | </div> |
| 3243 | 3243 | </label> |
| 3244 | 3244 | <div class="gd-cf-input-wrap"> |
| 3245 | 3245 | <select name="extra[gd_file_types][]" id="gd_file_types" multiple="multiple" style="height:100px;width:90%;"> |
| 3246 | - <option value="*" <?php selected(true, in_array('*', $gd_file_types));?>><?php _e('All types', 'geodirectory') ;?></option>
|
|
| 3247 | - <?php foreach ( $allowed_file_types as $format => $types ) { ?>
|
|
| 3248 | - <optgroup label="<?php echo esc_attr( wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory') ) ) ;?>">
|
|
| 3249 | - <?php foreach ( $types as $ext => $type ) { ?>
|
|
| 3250 | - <option value="<?php echo esc_attr($ext) ;?>" <?php selected(true, in_array($ext, $gd_file_types));?>><?php echo '.' . $ext ;?></option> |
|
| 3246 | + <option value="*" <?php selected(true, in_array('*', $gd_file_types)); ?>><?php _e('All types', 'geodirectory'); ?></option>
|
|
| 3247 | + <?php foreach ($allowed_file_types as $format => $types) { ?>
|
|
| 3248 | + <optgroup label="<?php echo esc_attr(wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory'))); ?>">
|
|
| 3249 | + <?php foreach ($types as $ext => $type) { ?>
|
|
| 3250 | + <option value="<?php echo esc_attr($ext); ?>" <?php selected(true, in_array($ext, $gd_file_types)); ?>><?php echo '.'.$ext; ?></option> |
|
| 3251 | 3251 | <?php } ?> |
| 3252 | 3252 | </optgroup> |
| 3253 | 3253 | <?php } ?> |
@@ -3259,9 +3259,9 @@ discard block |
||
| 3259 | 3259 | $html = ob_get_clean(); |
| 3260 | 3260 | return $output.$html; |
| 3261 | 3261 | } |
| 3262 | -add_filter('geodir_cfa_extra_fields_file','geodir_cfa_extra_fields_file',10,4);
|
|
| 3262 | +add_filter('geodir_cfa_extra_fields_file', 'geodir_cfa_extra_fields_file', 10, 4);
|
|
| 3263 | 3263 | |
| 3264 | -function geodir_cfa_extra_fields_text($output,$result_str,$cf,$field_info){
|
|
| 3264 | +function geodir_cfa_extra_fields_text($output, $result_str, $cf, $field_info) {
|
|
| 3265 | 3265 | ob_start(); |
| 3266 | 3266 | |
| 3267 | 3267 | $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : ''; |
@@ -3275,15 +3275,15 @@ discard block |
||
| 3275 | 3275 | $value = ''; |
| 3276 | 3276 | if ($extra_fields && isset($extra_fields['is_price'])) {
|
| 3277 | 3277 | $value = esc_attr($extra_fields['is_price']); |
| 3278 | - }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){
|
|
| 3278 | + }elseif (isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']) {
|
|
| 3279 | 3279 | $value = esc_attr($cf['defaults']['extra_fields']['is_price']); |
| 3280 | 3280 | } |
| 3281 | 3281 | |
| 3282 | - $show_price_extra = ($value==1) ? 1 : 0; |
|
| 3282 | + $show_price_extra = ($value == 1) ? 1 : 0; |
|
| 3283 | 3283 | |
| 3284 | - $show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0; |
|
| 3284 | + $show_price = (isset($field_info->data_type) && ($field_info->data_type == 'INT' && $field_info->data_type == 'FLOAT')) ? 1 : 0; |
|
| 3285 | 3285 | ?> |
| 3286 | - <li class="gdcf-price-extra-set" <?php if(!$show_price){ echo "style='display:none;'";}?>>
|
|
| 3286 | + <li class="gdcf-price-extra-set" <?php if (!$show_price) { echo "style='display:none;'"; }?>>
|
|
| 3287 | 3287 | <label for="is_price" class="gd-cf-tooltip-wrap"> |
| 3288 | 3288 | <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display as price? :', 'geodirectory'); ?>
|
| 3289 | 3289 | <div class="gdcf-tooltip"> |
@@ -3292,17 +3292,17 @@ discard block |
||
| 3292 | 3292 | </label> |
| 3293 | 3293 | <div class="gd-cf-input-wrap gd-switch"> |
| 3294 | 3294 | |
| 3295 | - <input type="radio" id="is_price_yes<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-enabled" value="1" |
|
| 3295 | + <input type="radio" id="is_price_yes<?php echo $radio_id; ?>" name="extra[is_price]" class="gdri-enabled" value="1" |
|
| 3296 | 3296 | <?php if ($value == '1') {
|
| 3297 | 3297 | echo 'checked'; |
| 3298 | 3298 | } ?>/> |
| 3299 | - <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 3299 | + <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
|
|
| 3300 | 3300 | |
| 3301 | - <input type="radio" id="is_price_no<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-disabled" value="0" |
|
| 3301 | + <input type="radio" id="is_price_no<?php echo $radio_id; ?>" name="extra[is_price]" class="gdri-disabled" value="0" |
|
| 3302 | 3302 | <?php if ($value == '0' || !$value) {
|
| 3303 | 3303 | echo 'checked'; |
| 3304 | 3304 | } ?>/> |
| 3305 | - <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 3305 | + <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
|
|
| 3306 | 3306 | |
| 3307 | 3307 | </div> |
| 3308 | 3308 | </li> |
@@ -3312,23 +3312,23 @@ discard block |
||
| 3312 | 3312 | $value = ''; |
| 3313 | 3313 | if ($extra_fields && isset($extra_fields['thousand_separator'])) {
|
| 3314 | 3314 | $value = esc_attr($extra_fields['thousand_separator']); |
| 3315 | - }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){
|
|
| 3315 | + }elseif (isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']) {
|
|
| 3316 | 3316 | $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']); |
| 3317 | 3317 | } |
| 3318 | 3318 | ?> |
| 3319 | - <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
|
|
| 3320 | - <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory');?>
|
|
| 3319 | + <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>
|
|
| 3320 | + <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory'); ?>
|
|
| 3321 | 3321 | <div class="gdcf-tooltip"> |
| 3322 | 3322 | <?php _e('Select the thousand separator.', 'geodirectory'); ?>
|
| 3323 | 3323 | </div> |
| 3324 | 3324 | </label> |
| 3325 | 3325 | <div class="gd-cf-input-wrap"> |
| 3326 | 3326 | <select name="extra[thousand_separator]" id="thousand_separator"> |
| 3327 | - <option value="comma" <?php selected(true, $value == 'comma');?>><?php _e(', (comma)', 'geodirectory'); ?></option>
|
|
| 3328 | - <option value="slash" <?php selected(true, $value == "slash");?>><?php _e('\ (slash)', 'geodirectory'); ?></option>
|
|
| 3329 | - <option value="period" <?php selected(true, $value == 'period');?>><?php _e('. (period)', 'geodirectory'); ?></option>
|
|
| 3330 | - <option value="space" <?php selected(true, $value == 'space');?>><?php _e(' (space)', 'geodirectory'); ?></option>
|
|
| 3331 | - <option value="none" <?php selected(true, $value == 'none');?>><?php _e('(none)', 'geodirectory'); ?></option>
|
|
| 3327 | + <option value="comma" <?php selected(true, $value == 'comma'); ?>><?php _e(', (comma)', 'geodirectory'); ?></option>
|
|
| 3328 | + <option value="slash" <?php selected(true, $value == "slash"); ?>><?php _e('\ (slash)', 'geodirectory'); ?></option>
|
|
| 3329 | + <option value="period" <?php selected(true, $value == 'period'); ?>><?php _e('. (period)', 'geodirectory'); ?></option>
|
|
| 3330 | + <option value="space" <?php selected(true, $value == 'space'); ?>><?php _e(' (space)', 'geodirectory'); ?></option>
|
|
| 3331 | + <option value="none" <?php selected(true, $value == 'none'); ?>><?php _e('(none)', 'geodirectory'); ?></option>
|
|
| 3332 | 3332 | </select> |
| 3333 | 3333 | </div> |
| 3334 | 3334 | </li> |
@@ -3339,20 +3339,20 @@ discard block |
||
| 3339 | 3339 | $value = ''; |
| 3340 | 3340 | if ($extra_fields && isset($extra_fields['decimal_separator'])) {
|
| 3341 | 3341 | $value = esc_attr($extra_fields['decimal_separator']); |
| 3342 | - }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){
|
|
| 3342 | + }elseif (isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']) {
|
|
| 3343 | 3343 | $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']); |
| 3344 | 3344 | } |
| 3345 | 3345 | ?> |
| 3346 | - <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
|
|
| 3347 | - <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory');?>
|
|
| 3346 | + <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>
|
|
| 3347 | + <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory'); ?>
|
|
| 3348 | 3348 | <div class="gdcf-tooltip"> |
| 3349 | 3349 | <?php _e('Select the decimal separator.', 'geodirectory'); ?>
|
| 3350 | 3350 | </div> |
| 3351 | 3351 | </label> |
| 3352 | 3352 | <div class="gd-cf-input-wrap"> |
| 3353 | 3353 | <select name="extra[decimal_separator]" id="decimal_separator"> |
| 3354 | - <option value="period" <?php selected(true, $value == 'period');?>><?php _e('. (period)', 'geodirectory'); ?></option>
|
|
| 3355 | - <option value="comma" <?php selected(true, $value == "comma");?>><?php _e(', (comma)', 'geodirectory'); ?></option>
|
|
| 3354 | + <option value="period" <?php selected(true, $value == 'period'); ?>><?php _e('. (period)', 'geodirectory'); ?></option>
|
|
| 3355 | + <option value="comma" <?php selected(true, $value == "comma"); ?>><?php _e(', (comma)', 'geodirectory'); ?></option>
|
|
| 3356 | 3356 | </select> |
| 3357 | 3357 | </div> |
| 3358 | 3358 | </li> |
@@ -3362,20 +3362,20 @@ discard block |
||
| 3362 | 3362 | $value = ''; |
| 3363 | 3363 | if ($extra_fields && isset($extra_fields['decimal_display'])) {
|
| 3364 | 3364 | $value = esc_attr($extra_fields['decimal_display']); |
| 3365 | - }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){
|
|
| 3365 | + }elseif (isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']) {
|
|
| 3366 | 3366 | $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']); |
| 3367 | 3367 | } |
| 3368 | 3368 | ?> |
| 3369 | - <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
|
|
| 3370 | - <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory');?>
|
|
| 3369 | + <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>
|
|
| 3370 | + <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory'); ?>
|
|
| 3371 | 3371 | <div class="gdcf-tooltip"> |
| 3372 | 3372 | <?php _e('Select how the decimal is displayed', 'geodirectory'); ?>
|
| 3373 | 3373 | </div> |
| 3374 | 3374 | </label> |
| 3375 | 3375 | <div class="gd-cf-input-wrap"> |
| 3376 | 3376 | <select name="extra[decimal_display]" id="decimal_display"> |
| 3377 | - <option value="if" <?php selected(true, $value == 'if');?>><?php _e('If used (not .00)', 'geodirectory'); ?></option>
|
|
| 3378 | - <option value="allways" <?php selected(true, $value == "allways");?>><?php _e('Always (.00)', 'geodirectory'); ?></option>
|
|
| 3377 | + <option value="if" <?php selected(true, $value == 'if'); ?>><?php _e('If used (not .00)', 'geodirectory'); ?></option>
|
|
| 3378 | + <option value="allways" <?php selected(true, $value == "allways"); ?>><?php _e('Always (.00)', 'geodirectory'); ?></option>
|
|
| 3379 | 3379 | </select> |
| 3380 | 3380 | </div> |
| 3381 | 3381 | </li> |
@@ -3385,12 +3385,12 @@ discard block |
||
| 3385 | 3385 | $value = ''; |
| 3386 | 3386 | if ($extra_fields && isset($extra_fields['currency_symbol'])) {
|
| 3387 | 3387 | $value = esc_attr($extra_fields['currency_symbol']); |
| 3388 | - }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){
|
|
| 3388 | + }elseif (isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']) {
|
|
| 3389 | 3389 | $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']); |
| 3390 | 3390 | } |
| 3391 | 3391 | ?> |
| 3392 | - <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
|
|
| 3393 | - <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory');?>
|
|
| 3392 | + <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>
|
|
| 3393 | + <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory'); ?>
|
|
| 3394 | 3394 | <div class="gdcf-tooltip"> |
| 3395 | 3395 | <?php _e('Select the currency symbol.', 'geodirectory'); ?>
|
| 3396 | 3396 | </div> |
@@ -3406,20 +3406,20 @@ discard block |
||
| 3406 | 3406 | $value = ''; |
| 3407 | 3407 | if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {
|
| 3408 | 3408 | $value = esc_attr($extra_fields['currency_symbol_placement']); |
| 3409 | - }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){
|
|
| 3409 | + }elseif (isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']) {
|
|
| 3410 | 3410 | $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']); |
| 3411 | 3411 | } |
| 3412 | 3412 | ?> |
| 3413 | - <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
|
|
| 3414 | - <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory');?>
|
|
| 3413 | + <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>
|
|
| 3414 | + <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory'); ?>
|
|
| 3415 | 3415 | <div class="gdcf-tooltip"> |
| 3416 | 3416 | <?php _e('Select the currency symbol placement.', 'geodirectory'); ?>
|
| 3417 | 3417 | </div> |
| 3418 | 3418 | </label> |
| 3419 | 3419 | <div class="gd-cf-input-wrap"> |
| 3420 | 3420 | <select name="extra[currency_symbol_placement]" id="currency_symbol_placement"> |
| 3421 | - <option value="left" <?php selected(true, $value == 'left');?>><?php _e('Left', 'geodirectory'); ?></option>
|
|
| 3422 | - <option value="right" <?php selected(true, $value == "right");?>><?php _e('Right', 'geodirectory'); ?></option>
|
|
| 3421 | + <option value="left" <?php selected(true, $value == 'left'); ?>><?php _e('Left', 'geodirectory'); ?></option>
|
|
| 3422 | + <option value="right" <?php selected(true, $value == "right"); ?>><?php _e('Right', 'geodirectory'); ?></option>
|
|
| 3423 | 3423 | </select> |
| 3424 | 3424 | </div> |
| 3425 | 3425 | </li> |
@@ -3430,11 +3430,11 @@ discard block |
||
| 3430 | 3430 | $html = ob_get_clean(); |
| 3431 | 3431 | return $output.$html; |
| 3432 | 3432 | } |
| 3433 | -add_filter('geodir_cfa_extra_fields_text','geodir_cfa_extra_fields_text',10,4);
|
|
| 3433 | +add_filter('geodir_cfa_extra_fields_text', 'geodir_cfa_extra_fields_text', 10, 4);
|
|
| 3434 | 3434 | |
| 3435 | -function geodir_default_custom_fields($post_type='gd_place',$package_id=''){
|
|
| 3435 | +function geodir_default_custom_fields($post_type = 'gd_place', $package_id = '') {
|
|
| 3436 | 3436 | $fields = array(); |
| 3437 | - $package = ($package_id=='') ? '' : array($package_id); |
|
| 3437 | + $package = ($package_id == '') ? '' : array($package_id); |
|
| 3438 | 3438 | |
| 3439 | 3439 | $fields[] = array('listing_type' => $post_type,
|
| 3440 | 3440 | 'data_type' => 'VARCHAR', |
@@ -3607,7 +3607,7 @@ discard block |
||
| 3607 | 3607 | return $fields; |
| 3608 | 3608 | } |
| 3609 | 3609 | |
| 3610 | -function geodir_currency_format_number($number='',$cf=''){
|
|
| 3610 | +function geodir_currency_format_number($number = '', $cf = '') {
|
|
| 3611 | 3611 | |
| 3612 | 3612 | $cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : ''; |
| 3613 | 3613 | |
@@ -3616,35 +3616,35 @@ discard block |
||
| 3616 | 3616 | $decimal_display = !empty($cf['decimal_display']) ? $cf['decimal_display'] : (!empty($cs['decimal_display']) ? $cs['decimal_display'] : 'if'); |
| 3617 | 3617 | $decimalpoint = '.'; |
| 3618 | 3618 | |
| 3619 | - if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){
|
|
| 3619 | + if (isset($cs['decimal_separator']) && $cs['decimal_separator'] == 'comma') {
|
|
| 3620 | 3620 | $decimalpoint = ','; |
| 3621 | 3621 | } |
| 3622 | 3622 | |
| 3623 | 3623 | $separator = ','; |
| 3624 | 3624 | |
| 3625 | - if(isset($cs['thousand_separator'])){
|
|
| 3626 | - if($cs['thousand_separator']=='comma'){$separator = ',';}
|
|
| 3627 | - if($cs['thousand_separator']=='slash'){$separator = '\\';}
|
|
| 3628 | - if($cs['thousand_separator']=='period'){$separator = '.';}
|
|
| 3629 | - if($cs['thousand_separator']=='space'){$separator = ' ';}
|
|
| 3630 | - if($cs['thousand_separator']=='none'){$separator = '';}
|
|
| 3625 | + if (isset($cs['thousand_separator'])) {
|
|
| 3626 | + if ($cs['thousand_separator'] == 'comma') {$separator = ','; }
|
|
| 3627 | + if ($cs['thousand_separator'] == 'slash') {$separator = '\\'; }
|
|
| 3628 | + if ($cs['thousand_separator'] == 'period') {$separator = '.'; }
|
|
| 3629 | + if ($cs['thousand_separator'] == 'space') {$separator = ' '; }
|
|
| 3630 | + if ($cs['thousand_separator'] == 'none') {$separator = ''; }
|
|
| 3631 | 3631 | } |
| 3632 | 3632 | |
| 3633 | 3633 | $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left'; |
| 3634 | 3634 | |
| 3635 | - if($decimals>0 && $decimal_display=='if'){
|
|
| 3636 | - if(is_int($number) || floor( $number ) == $number) |
|
| 3635 | + if ($decimals > 0 && $decimal_display == 'if') {
|
|
| 3636 | + if (is_int($number) || floor($number) == $number) |
|
| 3637 | 3637 | $decimals = 0; |
| 3638 | 3638 | } |
| 3639 | 3639 | |
| 3640 | - $number = number_format($number,$decimals,$decimalpoint,$separator); |
|
| 3640 | + $number = number_format($number, $decimals, $decimalpoint, $separator); |
|
| 3641 | 3641 | |
| 3642 | 3642 | |
| 3643 | 3643 | |
| 3644 | - if($currency_symbol_placement=='left'){
|
|
| 3645 | - $number = $symbol . $number; |
|
| 3646 | - }else{
|
|
| 3647 | - $number = $number . $symbol; |
|
| 3644 | + if ($currency_symbol_placement == 'left') {
|
|
| 3645 | + $number = $symbol.$number; |
|
| 3646 | + } else {
|
|
| 3647 | + $number = $number.$symbol; |
|
| 3648 | 3648 | } |
| 3649 | 3649 | |
| 3650 | 3650 | |
@@ -51,8 +51,9 @@ discard block |
||
| 51 | 51 | global $wpdb; |
| 52 | 52 | $result = 0;// no rows affected |
| 53 | 53 | if (!geodir_column_exist($db, $column)) {
|
| 54 | - if (!empty($db) && !empty($column)) |
|
| 55 | - $result = $wpdb->query("ALTER TABLE `$db` ADD `$column` $column_attr");
|
|
| 54 | + if (!empty($db) && !empty($column)) { |
|
| 55 | + $result = $wpdb->query("ALTER TABLE `$db` ADD `$column` $column_attr"); |
|
| 56 | + } |
|
| 56 | 57 | } |
| 57 | 58 | return $result; |
| 58 | 59 | } |
@@ -82,10 +83,11 @@ discard block |
||
| 82 | 83 | |
| 83 | 84 | $default_query = ''; |
| 84 | 85 | |
| 85 | - if ($default == 'default') |
|
| 86 | - $default_query .= " and is_admin IN ('1') ";
|
|
| 87 | - elseif ($default == 'custom') |
|
| 88 | - $default_query .= " and is_admin = '0' "; |
|
| 86 | + if ($default == 'default') { |
|
| 87 | + $default_query .= " and is_admin IN ('1') "; |
|
| 88 | + } elseif ($default == 'custom') { |
|
| 89 | + $default_query .= " and is_admin = '0' "; |
|
| 90 | + } |
|
| 89 | 91 | |
| 90 | 92 | if ($fields_location == 'none') {
|
| 91 | 93 | } else{
|
@@ -239,10 +241,12 @@ discard block |
||
| 239 | 241 | } |
| 240 | 242 | |
| 241 | 243 | return $field_id; |
| 242 | - } else |
|
| 243 | - return 0; |
|
| 244 | - } else |
|
| 245 | - return 0; |
|
| 244 | + } else { |
|
| 245 | + return 0; |
|
| 246 | + } |
|
| 247 | + } else { |
|
| 248 | + return 0; |
|
| 249 | + } |
|
| 246 | 250 | } |
| 247 | 251 | } |
| 248 | 252 | |
@@ -350,7 +354,9 @@ discard block |
||
| 350 | 354 | |
| 351 | 355 | |
| 352 | 356 | |
| 353 | - if ($post_type == '') $post_type = 'gd_place'; |
|
| 357 | + if ($post_type == '') { |
|
| 358 | + $post_type = 'gd_place'; |
|
| 359 | + } |
|
| 354 | 360 | |
| 355 | 361 | |
| 356 | 362 | $detail_table = $plugin_prefix . $post_type . '_detail'; |
@@ -390,16 +396,17 @@ discard block |
||
| 390 | 396 | } |
| 391 | 397 | |
| 392 | 398 | $option_values = ''; |
| 393 | - if (isset($request_field['option_values'])) |
|
| 394 | - $option_values = $request_field['option_values']; |
|
| 399 | + if (isset($request_field['option_values'])) { |
|
| 400 | + $option_values = $request_field['option_values']; |
|
| 401 | + } |
|
| 395 | 402 | |
| 396 | 403 | $cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0'; |
| 397 | 404 | |
| 398 | 405 | $cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0'; |
| 399 | 406 | |
| 400 | - if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg'])) |
|
| 401 | - $price_pkg = implode(",", $request_field['show_on_pkg']);
|
|
| 402 | - else {
|
|
| 407 | + if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg'])) { |
|
| 408 | + $price_pkg = implode(",", $request_field['show_on_pkg']); |
|
| 409 | + } else {
|
|
| 403 | 410 | $package_info = array(); |
| 404 | 411 | |
| 405 | 412 | $package_info = geodir_post_package_info($package_info, '', $post_type); |
@@ -407,22 +414,29 @@ discard block |
||
| 407 | 414 | } |
| 408 | 415 | |
| 409 | 416 | |
| 410 | - if (isset($request_field['extra']) && !empty($request_field['extra'])) |
|
| 411 | - $extra_fields = $request_field['extra']; |
|
| 417 | + if (isset($request_field['extra']) && !empty($request_field['extra'])) { |
|
| 418 | + $extra_fields = $request_field['extra']; |
|
| 419 | + } |
|
| 412 | 420 | |
| 413 | - if (isset($request_field['is_default']) && $request_field['is_default'] != '') |
|
| 414 | - $is_default = $request_field['is_default']; |
|
| 415 | - else |
|
| 416 | - $is_default = '0'; |
|
| 421 | + if (isset($request_field['is_default']) && $request_field['is_default'] != '') { |
|
| 422 | + $is_default = $request_field['is_default']; |
|
| 423 | + } else { |
|
| 424 | + $is_default = '0'; |
|
| 425 | + } |
|
| 417 | 426 | |
| 418 | - if (isset($request_field['is_admin']) && $request_field['is_admin'] != '') |
|
| 419 | - $is_admin = $request_field['is_admin']; |
|
| 420 | - else |
|
| 421 | - $is_admin = '0'; |
|
| 427 | + if (isset($request_field['is_admin']) && $request_field['is_admin'] != '') { |
|
| 428 | + $is_admin = $request_field['is_admin']; |
|
| 429 | + } else { |
|
| 430 | + $is_admin = '0'; |
|
| 431 | + } |
|
| 422 | 432 | |
| 423 | 433 | |
| 424 | - if ($is_active == '') $is_active = 1; |
|
| 425 | - if ($is_required == '') $is_required = 0; |
|
| 434 | + if ($is_active == '') { |
|
| 435 | + $is_active = 1; |
|
| 436 | + } |
|
| 437 | + if ($is_required == '') { |
|
| 438 | + $is_required = 0; |
|
| 439 | + } |
|
| 426 | 440 | |
| 427 | 441 | |
| 428 | 442 | if ($sort_order == '') {
|
@@ -701,7 +715,7 @@ discard block |
||
| 701 | 715 | } |
| 702 | 716 | if($op_max){$op_size =$op_max; }
|
| 703 | 717 | } |
| 704 | - }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
|
|
| 718 | + } elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
|
|
| 705 | 719 | if(strlen($option_values)){
|
| 706 | 720 | $op_size = strlen($option_values); |
| 707 | 721 | } |
@@ -718,11 +732,13 @@ discard block |
||
| 718 | 732 | return __('Column change failed, you may have too many columns.','geodirectory');
|
| 719 | 733 | } |
| 720 | 734 | |
| 721 | - if (isset($request_field['cat_display_type'])) |
|
| 722 | - $extra_fields = $request_field['cat_display_type']; |
|
| 735 | + if (isset($request_field['cat_display_type'])) { |
|
| 736 | + $extra_fields = $request_field['cat_display_type']; |
|
| 737 | + } |
|
| 723 | 738 | |
| 724 | - if (isset($request_field['multi_display_type'])) |
|
| 725 | - $extra_fields = $request_field['multi_display_type']; |
|
| 739 | + if (isset($request_field['multi_display_type'])) { |
|
| 740 | + $extra_fields = $request_field['multi_display_type']; |
|
| 741 | + } |
|
| 726 | 742 | |
| 727 | 743 | |
| 728 | 744 | break; |
@@ -736,8 +752,9 @@ discard block |
||
| 736 | 752 | if($alter_result===false){
|
| 737 | 753 | return __('Column change failed, you may have too many columns.','geodirectory');
|
| 738 | 754 | } |
| 739 | - if (isset($request_field['advanced_editor'])) |
|
| 740 | - $extra_fields = $request_field['advanced_editor']; |
|
| 755 | + if (isset($request_field['advanced_editor'])) { |
|
| 756 | + $extra_fields = $request_field['advanced_editor']; |
|
| 757 | + } |
|
| 741 | 758 | |
| 742 | 759 | break; |
| 743 | 760 | |
@@ -833,8 +850,9 @@ discard block |
||
| 833 | 850 | ); |
| 834 | 851 | |
| 835 | 852 | |
| 836 | - if ($cat_sort == '') |
|
| 837 | - $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
|
|
| 853 | + if ($cat_sort == '') { |
|
| 854 | + $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name))); |
|
| 855 | + } |
|
| 838 | 856 | |
| 839 | 857 | |
| 840 | 858 | /** |
@@ -1204,8 +1222,10 @@ discard block |
||
| 1204 | 1222 | } |
| 1205 | 1223 | |
| 1206 | 1224 | return $post_meta_info; |
| 1207 | - else: |
|
| 1208 | - return false; |
|
| 1225 | + else { |
|
| 1226 | + : |
|
| 1227 | + return false; |
|
| 1228 | + } |
|
| 1209 | 1229 | endif; |
| 1210 | 1230 | } |
| 1211 | 1231 | |
@@ -1282,8 +1302,9 @@ discard block |
||
| 1282 | 1302 | if (is_admin()) {
|
| 1283 | 1303 | global $post; |
| 1284 | 1304 | |
| 1285 | - if (isset($_REQUEST['post'])) |
|
| 1286 | - $_REQUEST['pid'] = $_REQUEST['post']; |
|
| 1305 | + if (isset($_REQUEST['post'])) { |
|
| 1306 | + $_REQUEST['pid'] = $_REQUEST['post']; |
|
| 1307 | + } |
|
| 1287 | 1308 | } |
| 1288 | 1309 | |
| 1289 | 1310 | |
@@ -1375,7 +1396,7 @@ discard block |
||
| 1375 | 1396 | $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
|
| 1376 | 1397 | } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
|
| 1377 | 1398 | $field_icon = '<i class="' . $cf['field_icon'] . '"></i>'; |
| 1378 | - }else{
|
|
| 1399 | + } else{
|
|
| 1379 | 1400 | $field_icon = $cf['field_icon']; |
| 1380 | 1401 | } |
| 1381 | 1402 | |
@@ -1447,8 +1468,9 @@ discard block |
||
| 1447 | 1468 | $variables_array['post_id'] = !empty($post->ID) ? $post->ID : (!empty($post->pid) ? $post->pid : NULL); |
| 1448 | 1469 | $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
| 1449 | 1470 | $variables_array['value'] = ''; |
| 1450 | - if (isset($post->{$type['htmlvar_name']}))
|
|
| 1451 | - $variables_array['value'] = $post->{$type['htmlvar_name']};
|
|
| 1471 | + if (isset($post->{$type['htmlvar_name']})) { |
|
| 1472 | + $variables_array['value'] = $post->{$type['htmlvar_name']}; |
|
| 1473 | + } |
|
| 1452 | 1474 | endif; |
| 1453 | 1475 | |
| 1454 | 1476 | |
@@ -1470,7 +1492,9 @@ discard block |
||
| 1470 | 1492 | * @param string $html Custom field unfiltered HTML. |
| 1471 | 1493 | * @param array $variables_array Custom field variables array. |
| 1472 | 1494 | */ |
| 1473 | - if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
|
|
| 1495 | + if ($html) { |
|
| 1496 | + echo apply_filters("geodir_show_{$html_var}", $html, $variables_array); |
|
| 1497 | + } |
|
| 1474 | 1498 | |
| 1475 | 1499 | /** |
| 1476 | 1500 | * Called after a custom fields is output on the frontend. |
@@ -1513,10 +1537,11 @@ discard block |
||
| 1513 | 1537 | */ |
| 1514 | 1538 | function geodir_default_date_format() |
| 1515 | 1539 | {
|
| 1516 | - if ($format = get_option('date_format'))
|
|
| 1517 | - return $format; |
|
| 1518 | - else |
|
| 1519 | - return 'dd-mm-yy'; |
|
| 1540 | + if ($format = get_option('date_format')) { |
|
| 1541 | + return $format; |
|
| 1542 | + } else { |
|
| 1543 | + return 'dd-mm-yy'; |
|
| 1544 | + } |
|
| 1520 | 1545 | } |
| 1521 | 1546 | } |
| 1522 | 1547 | |
@@ -1623,11 +1648,13 @@ discard block |
||
| 1623 | 1648 | // Set an array containing a list of acceptable formats |
| 1624 | 1649 | //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
|
| 1625 | 1650 | |
| 1626 | - if (!function_exists('wp_handle_upload'))
|
|
| 1627 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1651 | + if (!function_exists('wp_handle_upload')) { |
|
| 1652 | + require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1653 | + } |
|
| 1628 | 1654 | |
| 1629 | - if (!is_dir($geodir_uploadpath)) |
|
| 1630 | - mkdir($geodir_uploadpath); |
|
| 1655 | + if (!is_dir($geodir_uploadpath)) { |
|
| 1656 | + mkdir($geodir_uploadpath); |
|
| 1657 | + } |
|
| 1631 | 1658 | |
| 1632 | 1659 | $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1]; |
| 1633 | 1660 | $explode_sub_dir = explode("/", $sub_dir);
|
@@ -1640,16 +1667,19 @@ discard block |
||
| 1640 | 1667 | } |
| 1641 | 1668 | |
| 1642 | 1669 | $uploaded_file = ''; |
| 1643 | - if (file_exists($img_path)) |
|
| 1644 | - $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); |
|
| 1670 | + if (file_exists($img_path)) { |
|
| 1671 | + $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name); |
|
| 1672 | + } |
|
| 1645 | 1673 | |
| 1646 | 1674 | if ($curr_img_dir != $geodir_uploaddir) {
|
| 1647 | - if (file_exists($img_path)) |
|
| 1648 | - unlink($img_path); |
|
| 1675 | + if (file_exists($img_path)) { |
|
| 1676 | + unlink($img_path); |
|
| 1677 | + } |
|
| 1649 | 1678 | } |
| 1650 | 1679 | |
| 1651 | - if (!empty($uploaded_file)) |
|
| 1652 | - $file_urls = $geodir_uploadurl . '/' . $new_name; |
|
| 1680 | + if (!empty($uploaded_file)) { |
|
| 1681 | + $file_urls = $geodir_uploadurl . '/' . $new_name; |
|
| 1682 | + } |
|
| 1653 | 1683 | |
| 1654 | 1684 | } else {
|
| 1655 | 1685 | $file_urls = $post_image[$m]; |
@@ -1670,8 +1700,9 @@ discard block |
||
| 1670 | 1700 | |
| 1671 | 1701 | geodir_save_post_meta($post_id, $field_id, $file_urls); |
| 1672 | 1702 | |
| 1673 | - if (!empty($invalid_files)) |
|
| 1674 | - geodir_remove_attachments($invalid_files); |
|
| 1703 | + if (!empty($invalid_files)) { |
|
| 1704 | + geodir_remove_attachments($invalid_files); |
|
| 1705 | + } |
|
| 1675 | 1706 | |
| 1676 | 1707 | } |
| 1677 | 1708 | } |
@@ -1897,8 +1928,9 @@ discard block |
||
| 1897 | 1928 | |
| 1898 | 1929 | $all_postypes = geodir_get_posttypes(); |
| 1899 | 1930 | |
| 1900 | - if (!in_array($post_type, $all_postypes)) |
|
| 1901 | - return false; |
|
| 1931 | + if (!in_array($post_type, $all_postypes)) { |
|
| 1932 | + return false; |
|
| 1933 | + } |
|
| 1902 | 1934 | |
| 1903 | 1935 | $fields = array(); |
| 1904 | 1936 | |
@@ -1996,8 +2028,10 @@ discard block |
||
| 1996 | 2028 | } |
| 1997 | 2029 | |
| 1998 | 2030 | return $field_ids; |
| 1999 | - else: |
|
| 2000 | - return false; |
|
| 2031 | + else { |
|
| 2032 | + : |
|
| 2033 | + return false; |
|
| 2034 | + } |
|
| 2001 | 2035 | endif; |
| 2002 | 2036 | } |
| 2003 | 2037 | |
@@ -2170,8 +2204,9 @@ discard block |
||
| 2170 | 2204 | |
| 2171 | 2205 | return $field_id; |
| 2172 | 2206 | |
| 2173 | - } else |
|
| 2174 | - return 0; |
|
| 2207 | + } else { |
|
| 2208 | + return 0; |
|
| 2209 | + } |
|
| 2175 | 2210 | |
| 2176 | 2211 | } |
| 2177 | 2212 | } |
@@ -2212,8 +2247,9 @@ discard block |
||
| 2212 | 2247 | $htmlvar_name = isset($field_type_key) ? $field_type_key : ''; |
| 2213 | 2248 | |
| 2214 | 2249 | $site_title = ''; |
| 2215 | - if ($site_title == '') |
|
| 2216 | - $site_title = isset($field_info->site_title) ? $field_info->site_title : ''; |
|
| 2250 | + if ($site_title == '') { |
|
| 2251 | + $site_title = isset($field_info->site_title) ? $field_info->site_title : ''; |
|
| 2252 | + } |
|
| 2217 | 2253 | |
| 2218 | 2254 | if ($site_title == '') {
|
| 2219 | 2255 | $fields = geodir_get_custom_sort_options($post_type); |
@@ -2227,8 +2263,9 @@ discard block |
||
| 2227 | 2263 | } |
| 2228 | 2264 | } |
| 2229 | 2265 | |
| 2230 | - if ($htmlvar_name == '') |
|
| 2231 | - $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : ''; |
|
| 2266 | + if ($htmlvar_name == '') { |
|
| 2267 | + $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : ''; |
|
| 2268 | + } |
|
| 2232 | 2269 | |
| 2233 | 2270 | $nonce = wp_create_nonce('custom_fields_' . $result_str);
|
| 2234 | 2271 | |
@@ -2241,7 +2278,7 @@ discard block |
||
| 2241 | 2278 | |
| 2242 | 2279 | if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
|
| 2243 | 2280 | $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>'; |
| 2244 | - }elseif(isset($cso['field_icon']) && $cso['field_icon']){
|
|
| 2281 | + } elseif(isset($cso['field_icon']) && $cso['field_icon']){
|
|
| 2245 | 2282 | $field_icon = '<b class="gd-cf-icon" style="background-image: url(\''.$cso['field_icon'].'\')"></b>'; |
| 2246 | 2283 | } |
| 2247 | 2284 | |
@@ -2677,7 +2714,7 @@ discard block |
||
| 2677 | 2714 | $dt_value = ''; |
| 2678 | 2715 | if (isset($field_info->data_type)) {
|
| 2679 | 2716 | $dt_value = esc_attr($field_info->data_type); |
| 2680 | - }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
|
|
| 2717 | + } elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
|
|
| 2681 | 2718 | $dt_value = $cf['defaults']['data_type']; |
| 2682 | 2719 | } |
| 2683 | 2720 | ?> |
@@ -2709,7 +2746,7 @@ discard block |
||
| 2709 | 2746 | $value = ''; |
| 2710 | 2747 | if (isset($field_info->decimal_point)) {
|
| 2711 | 2748 | $value = esc_attr($field_info->decimal_point); |
| 2712 | - }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
|
|
| 2749 | + } elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
|
|
| 2713 | 2750 | $value = $cf['defaults']['decimal_point']; |
| 2714 | 2751 | } |
| 2715 | 2752 | ?> |
@@ -2781,11 +2818,13 @@ discard block |
||
| 2781 | 2818 | |
| 2782 | 2819 | <?php |
| 2783 | 2820 | $selected = ''; |
| 2784 | - if (isset($field_info->extra_fields)) |
|
| 2785 | - $advanced_editor = unserialize($field_info->extra_fields); |
|
| 2821 | + if (isset($field_info->extra_fields)) { |
|
| 2822 | + $advanced_editor = unserialize($field_info->extra_fields); |
|
| 2823 | + } |
|
| 2786 | 2824 | |
| 2787 | - if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))
|
|
| 2788 | - $selected = 'checked="checked"'; |
|
| 2825 | + if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor)) { |
|
| 2826 | + $selected = 'checked="checked"'; |
|
| 2827 | + } |
|
| 2789 | 2828 | ?> |
| 2790 | 2829 | |
| 2791 | 2830 | <input type="checkbox" name="advanced_editor[]" id="advanced_editor" |
@@ -2807,7 +2846,7 @@ discard block |
||
| 2807 | 2846 | $value = ''; |
| 2808 | 2847 | if (isset($field_info->validation_pattern)) {
|
| 2809 | 2848 | $value = esc_attr($field_info->validation_pattern); |
| 2810 | - }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
|
|
| 2849 | + } elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
|
|
| 2811 | 2850 | $value = esc_attr($cf['defaults']['validation_pattern']); |
| 2812 | 2851 | } |
| 2813 | 2852 | ?> |
@@ -2827,7 +2866,7 @@ discard block |
||
| 2827 | 2866 | $value = ''; |
| 2828 | 2867 | if (isset($field_info->validation_msg)) {
|
| 2829 | 2868 | $value = esc_attr($field_info->validation_msg); |
| 2830 | - }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
|
|
| 2869 | + } elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
|
|
| 2831 | 2870 | $value = esc_attr($cf['defaults']['validation_msg']); |
| 2832 | 2871 | } |
| 2833 | 2872 | ?> |
@@ -2857,8 +2896,9 @@ discard block |
||
| 2857 | 2896 | |
| 2858 | 2897 | if (!isset($field_info->post_type)) {
|
| 2859 | 2898 | $post_type = sanitize_text_field($_REQUEST['listing_type']); |
| 2860 | - } else |
|
| 2861 | - $post_type = $field_info->post_type; |
|
| 2899 | + } else { |
|
| 2900 | + $post_type = $field_info->post_type; |
|
| 2901 | + } |
|
| 2862 | 2902 | ?> |
| 2863 | 2903 | <li style="display: none;"> |
| 2864 | 2904 | <label for="htmlvar_name" class="gd-cf-tooltip-wrap"> |
@@ -3132,7 +3172,7 @@ discard block |
||
| 3132 | 3172 | $value = ''; |
| 3133 | 3173 | if (isset($field_info->option_values)) {
|
| 3134 | 3174 | $value = esc_attr($field_info->option_values); |
| 3135 | - }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
|
|
| 3175 | + } elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
|
|
| 3136 | 3176 | $value = esc_attr($cf['defaults']['option_values']); |
| 3137 | 3177 | } |
| 3138 | 3178 | |
@@ -3275,7 +3315,7 @@ discard block |
||
| 3275 | 3315 | $value = ''; |
| 3276 | 3316 | if ($extra_fields && isset($extra_fields['is_price'])) {
|
| 3277 | 3317 | $value = esc_attr($extra_fields['is_price']); |
| 3278 | - }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){
|
|
| 3318 | + } elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){
|
|
| 3279 | 3319 | $value = esc_attr($cf['defaults']['extra_fields']['is_price']); |
| 3280 | 3320 | } |
| 3281 | 3321 | |
@@ -3312,7 +3352,7 @@ discard block |
||
| 3312 | 3352 | $value = ''; |
| 3313 | 3353 | if ($extra_fields && isset($extra_fields['thousand_separator'])) {
|
| 3314 | 3354 | $value = esc_attr($extra_fields['thousand_separator']); |
| 3315 | - }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){
|
|
| 3355 | + } elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){
|
|
| 3316 | 3356 | $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']); |
| 3317 | 3357 | } |
| 3318 | 3358 | ?> |
@@ -3339,7 +3379,7 @@ discard block |
||
| 3339 | 3379 | $value = ''; |
| 3340 | 3380 | if ($extra_fields && isset($extra_fields['decimal_separator'])) {
|
| 3341 | 3381 | $value = esc_attr($extra_fields['decimal_separator']); |
| 3342 | - }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){
|
|
| 3382 | + } elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){
|
|
| 3343 | 3383 | $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']); |
| 3344 | 3384 | } |
| 3345 | 3385 | ?> |
@@ -3362,7 +3402,7 @@ discard block |
||
| 3362 | 3402 | $value = ''; |
| 3363 | 3403 | if ($extra_fields && isset($extra_fields['decimal_display'])) {
|
| 3364 | 3404 | $value = esc_attr($extra_fields['decimal_display']); |
| 3365 | - }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){
|
|
| 3405 | + } elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){
|
|
| 3366 | 3406 | $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']); |
| 3367 | 3407 | } |
| 3368 | 3408 | ?> |
@@ -3385,7 +3425,7 @@ discard block |
||
| 3385 | 3425 | $value = ''; |
| 3386 | 3426 | if ($extra_fields && isset($extra_fields['currency_symbol'])) {
|
| 3387 | 3427 | $value = esc_attr($extra_fields['currency_symbol']); |
| 3388 | - }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){
|
|
| 3428 | + } elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){
|
|
| 3389 | 3429 | $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']); |
| 3390 | 3430 | } |
| 3391 | 3431 | ?> |
@@ -3406,7 +3446,7 @@ discard block |
||
| 3406 | 3446 | $value = ''; |
| 3407 | 3447 | if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {
|
| 3408 | 3448 | $value = esc_attr($extra_fields['currency_symbol_placement']); |
| 3409 | - }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){
|
|
| 3449 | + } elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){
|
|
| 3410 | 3450 | $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']); |
| 3411 | 3451 | } |
| 3412 | 3452 | ?> |
@@ -3633,8 +3673,9 @@ discard block |
||
| 3633 | 3673 | $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left'; |
| 3634 | 3674 | |
| 3635 | 3675 | if($decimals>0 && $decimal_display=='if'){
|
| 3636 | - if(is_int($number) || floor( $number ) == $number) |
|
| 3637 | - $decimals = 0; |
|
| 3676 | + if(is_int($number) || floor( $number ) == $number) { |
|
| 3677 | + $decimals = 0; |
|
| 3678 | + } |
|
| 3638 | 3679 | } |
| 3639 | 3680 | |
| 3640 | 3681 | $number = number_format($number,$decimals,$decimalpoint,$separator); |
@@ -3643,7 +3684,7 @@ discard block |
||
| 3643 | 3684 | |
| 3644 | 3685 | if($currency_symbol_placement=='left'){
|
| 3645 | 3686 | $number = $symbol . $number; |
| 3646 | - }else{
|
|
| 3687 | + } else{
|
|
| 3647 | 3688 | $number = $number . $symbol; |
| 3648 | 3689 | } |
| 3649 | 3690 | |
@@ -10,33 +10,33 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | add_action('admin_init', 'geodir_admin_init');
|
| 12 | 12 | if (!function_exists('geodir_admin_init')) {
|
| 13 | - /** |
|
| 14 | - * Adds GD setting pages in admin. |
|
| 15 | - * |
|
| 16 | - * @since 1.0.0 |
|
| 17 | - * @package GeoDirectory |
|
| 18 | - * @global string $current_tab The current settings tab name. |
|
| 19 | - */ |
|
| 20 | - function geodir_admin_init() |
|
| 21 | - {
|
|
| 22 | - |
|
| 23 | - if (is_admin()): |
|
| 24 | - global $current_tab; |
|
| 25 | - geodir_redirect_to_admin_panel_on_installed(); |
|
| 26 | - $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings'; |
|
| 27 | - if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests |
|
| 28 | - geodir_handle_option_form_submit($current_tab); // located in admin function.php |
|
| 29 | - /** |
|
| 30 | - * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area. |
|
| 31 | - * |
|
| 32 | - * @since 1.0.0 |
|
| 33 | - */ |
|
| 34 | - do_action('admin_panel_init');
|
|
| 35 | - add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);
|
|
| 36 | - |
|
| 37 | - |
|
| 38 | - endif; |
|
| 39 | - } |
|
| 13 | + /** |
|
| 14 | + * Adds GD setting pages in admin. |
|
| 15 | + * |
|
| 16 | + * @since 1.0.0 |
|
| 17 | + * @package GeoDirectory |
|
| 18 | + * @global string $current_tab The current settings tab name. |
|
| 19 | + */ |
|
| 20 | + function geodir_admin_init() |
|
| 21 | + {
|
|
| 22 | + |
|
| 23 | + if (is_admin()): |
|
| 24 | + global $current_tab; |
|
| 25 | + geodir_redirect_to_admin_panel_on_installed(); |
|
| 26 | + $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings'; |
|
| 27 | + if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests |
|
| 28 | + geodir_handle_option_form_submit($current_tab); // located in admin function.php |
|
| 29 | + /** |
|
| 30 | + * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area. |
|
| 31 | + * |
|
| 32 | + * @since 1.0.0 |
|
| 33 | + */ |
|
| 34 | + do_action('admin_panel_init');
|
|
| 35 | + add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);
|
|
| 36 | + |
|
| 37 | + |
|
| 38 | + endif; |
|
| 39 | + } |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** |
@@ -47,10 +47,10 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | function geodir_redirect_to_admin_panel_on_installed() |
| 49 | 49 | {
|
| 50 | - if (get_option('geodir_installation_redirect', false)) {
|
|
| 51 | - delete_option('geodir_installation_redirect');
|
|
| 52 | - wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));
|
|
| 53 | - } |
|
| 50 | + if (get_option('geodir_installation_redirect', false)) {
|
|
| 51 | + delete_option('geodir_installation_redirect');
|
|
| 52 | + wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));
|
|
| 53 | + } |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | /** |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | function geodir_get_admin_option_form($current_tab) |
| 64 | 64 | {
|
| 65 | - geodir_admin_option_form($current_tab);// defined in admin template tags.php |
|
| 65 | + geodir_admin_option_form($current_tab);// defined in admin template tags.php |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | |
@@ -86,24 +86,24 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | function geodir_conditional_admin_script_load() |
| 88 | 88 | {
|
| 89 | - global $pagenow; |
|
| 89 | + global $pagenow; |
|
| 90 | 90 | |
| 91 | 91 | // Get the current post type |
| 92 | 92 | $post_type = geodir_admin_current_post_type(); |
| 93 | 93 | $geodir_post_types = geodir_get_posttypes(); |
| 94 | 94 | |
| 95 | 95 | if ((isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') || (($pagenow == 'post.php' || $pagenow == 'post-new.php' || $pagenow == 'edit.php') && $post_type && in_array($post_type, $geodir_post_types)) || ($pagenow == 'edit-tags.php' || $pagenow == 'term.php' || $pagenow == 'edit-comments.php' || $pagenow == 'comment.php')) {
|
| 96 | - add_action('admin_enqueue_scripts', 'geodir_admin_scripts');
|
|
| 97 | - add_action('admin_enqueue_scripts', 'geodir_admin_styles');
|
|
| 98 | - add_action('admin_enqueue_scripts', 'geodir_admin_dequeue_scripts', 100);
|
|
| 96 | + add_action('admin_enqueue_scripts', 'geodir_admin_scripts');
|
|
| 97 | + add_action('admin_enqueue_scripts', 'geodir_admin_styles');
|
|
| 98 | + add_action('admin_enqueue_scripts', 'geodir_admin_dequeue_scripts', 100);
|
|
| 99 | 99 | |
| 100 | - // Disable VC editor for GD post types. |
|
| 101 | - if (class_exists('Vc_Role_Access_Controller')) {
|
|
| 102 | - add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 ); |
|
| 103 | - } |
|
| 104 | - } |
|
| 100 | + // Disable VC editor for GD post types. |
|
| 101 | + if (class_exists('Vc_Role_Access_Controller')) {
|
|
| 102 | + add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 ); |
|
| 103 | + } |
|
| 104 | + } |
|
| 105 | 105 | |
| 106 | - add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');
|
|
| 106 | + add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');
|
|
| 107 | 107 | |
| 108 | 108 | } |
| 109 | 109 | |
@@ -138,12 +138,12 @@ discard block |
||
| 138 | 138 | */ |
| 139 | 139 | function create_default_admin_main_nav() |
| 140 | 140 | {
|
| 141 | - add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);
|
|
| 142 | - add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);
|
|
| 143 | - add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);
|
|
| 144 | - add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);
|
|
| 145 | - add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);
|
|
| 146 | - //add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);
|
|
| 141 | + add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);
|
|
| 142 | + add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);
|
|
| 143 | + add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);
|
|
| 144 | + add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);
|
|
| 145 | + add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);
|
|
| 146 | + //add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);
|
|
| 147 | 147 | |
| 148 | 148 | } |
| 149 | 149 | |
@@ -157,19 +157,19 @@ discard block |
||
| 157 | 157 | */ |
| 158 | 158 | function geodir_admin_list_columns() |
| 159 | 159 | {
|
| 160 | - if ($post_types = geodir_get_posttypes()) {
|
|
| 160 | + if ($post_types = geodir_get_posttypes()) {
|
|
| 161 | 161 | |
| 162 | - foreach ($post_types as $post_type): |
|
| 163 | - add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);
|
|
| 164 | - //Filter-Payment-Manager to show Package |
|
| 165 | - add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);
|
|
| 162 | + foreach ($post_types as $post_type): |
|
| 163 | + add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);
|
|
| 164 | + //Filter-Payment-Manager to show Package |
|
| 165 | + add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);
|
|
| 166 | 166 | |
| 167 | - add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');
|
|
| 167 | + add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');
|
|
| 168 | 168 | |
| 169 | - // Filter bulk actions |
|
| 170 | - add_filter("bulk_actions-edit-{$post_type}", 'geodir_filter_bulk_actions', 10, 1);
|
|
| 171 | - endforeach; |
|
| 172 | - } |
|
| 169 | + // Filter bulk actions |
|
| 170 | + add_filter("bulk_actions-edit-{$post_type}", 'geodir_filter_bulk_actions', 10, 1);
|
|
| 171 | + endforeach; |
|
| 172 | + } |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | /** |
@@ -182,15 +182,15 @@ discard block |
||
| 182 | 182 | */ |
| 183 | 183 | function geodir_default_admin_main_tabs($tabs) |
| 184 | 184 | {
|
| 185 | - return $tabs = array( |
|
| 186 | - 'general_settings' => array('label' => __('General', 'geodirectory')),
|
|
| 187 | - 'design_settings' => array('label' => __('Design', 'geodirectory')),
|
|
| 188 | - 'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),
|
|
| 189 | - 'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),
|
|
| 190 | - 'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),
|
|
| 191 | - 'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),
|
|
| 192 | - |
|
| 193 | - ); |
|
| 185 | + return $tabs = array( |
|
| 186 | + 'general_settings' => array('label' => __('General', 'geodirectory')),
|
|
| 187 | + 'design_settings' => array('label' => __('Design', 'geodirectory')),
|
|
| 188 | + 'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),
|
|
| 189 | + 'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),
|
|
| 190 | + 'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),
|
|
| 191 | + 'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),
|
|
| 192 | + |
|
| 193 | + ); |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | add_action('do_meta_boxes', 'geodir_remove_image_box');
|
@@ -203,16 +203,16 @@ discard block |
||
| 203 | 203 | */ |
| 204 | 204 | function geodir_remove_image_box() |
| 205 | 205 | {
|
| 206 | - global $post; |
|
| 206 | + global $post; |
|
| 207 | 207 | |
| 208 | - $geodir_posttypes = geodir_get_posttypes(); |
|
| 208 | + $geodir_posttypes = geodir_get_posttypes(); |
|
| 209 | 209 | |
| 210 | - if (isset($post) && in_array($post->post_type, $geodir_posttypes)): |
|
| 210 | + if (isset($post) && in_array($post->post_type, $geodir_posttypes)): |
|
| 211 | 211 | |
| 212 | - remove_meta_box('postimagediv', $post->post_type, 'side');
|
|
| 213 | - remove_meta_box('revisionsdiv', $post->post_type, 'normal');
|
|
| 212 | + remove_meta_box('postimagediv', $post->post_type, 'side');
|
|
| 213 | + remove_meta_box('revisionsdiv', $post->post_type, 'normal');
|
|
| 214 | 214 | |
| 215 | - endif; |
|
| 215 | + endif; |
|
| 216 | 216 | |
| 217 | 217 | } |
| 218 | 218 | |
@@ -227,27 +227,27 @@ discard block |
||
| 227 | 227 | */ |
| 228 | 228 | function geodir_meta_box_add() |
| 229 | 229 | {
|
| 230 | - global $post; |
|
| 230 | + global $post; |
|
| 231 | 231 | |
| 232 | - $geodir_post_types = geodir_get_posttypes('array');
|
|
| 233 | - $geodir_posttypes = array_keys($geodir_post_types); |
|
| 232 | + $geodir_post_types = geodir_get_posttypes('array');
|
|
| 233 | + $geodir_posttypes = array_keys($geodir_post_types); |
|
| 234 | 234 | |
| 235 | - if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)): |
|
| 235 | + if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)): |
|
| 236 | 236 | |
| 237 | - $geodir_posttype = $post->post_type; |
|
| 238 | - $post_typename = __($geodir_post_types[$geodir_posttype]['labels']['singular_name'], 'geodirectory'); |
|
| 239 | - $post_typename = geodir_ucwords($post_typename); |
|
| 237 | + $geodir_posttype = $post->post_type; |
|
| 238 | + $post_typename = __($geodir_post_types[$geodir_posttype]['labels']['singular_name'], 'geodirectory'); |
|
| 239 | + $post_typename = geodir_ucwords($post_typename); |
|
| 240 | 240 | |
| 241 | - // Filter-Payment-Manager |
|
| 241 | + // Filter-Payment-Manager |
|
| 242 | 242 | |
| 243 | - add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
|
|
| 243 | + add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
|
|
| 244 | 244 | |
| 245 | - add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
|
|
| 245 | + add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
|
|
| 246 | 246 | |
| 247 | - // no need of this box as all fields moved to main information box |
|
| 248 | - //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );
|
|
| 247 | + // no need of this box as all fields moved to main information box |
|
| 248 | + //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );
|
|
| 249 | 249 | |
| 250 | - endif; |
|
| 250 | + endif; |
|
| 251 | 251 | |
| 252 | 252 | } |
| 253 | 253 | |
@@ -271,23 +271,23 @@ discard block |
||
| 271 | 271 | function geodir_hide_post_taxonomy_meta_boxes() |
| 272 | 272 | {
|
| 273 | 273 | |
| 274 | - $geodir_post_types = get_option('geodir_post_types');
|
|
| 274 | + $geodir_post_types = get_option('geodir_post_types');
|
|
| 275 | 275 | |
| 276 | - if (!empty($geodir_post_types)) {
|
|
| 277 | - foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info) {
|
|
| 276 | + if (!empty($geodir_post_types)) {
|
|
| 277 | + foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info) {
|
|
| 278 | 278 | |
| 279 | - $gd_taxonomy = geodir_get_taxonomies($geodir_post_type); |
|
| 279 | + $gd_taxonomy = geodir_get_taxonomies($geodir_post_type); |
|
| 280 | 280 | |
| 281 | - if(!empty($gd_taxonomy)) {
|
|
| 282 | - foreach ($gd_taxonomy as $tax) {
|
|
| 281 | + if(!empty($gd_taxonomy)) {
|
|
| 282 | + foreach ($gd_taxonomy as $tax) {
|
|
| 283 | 283 | |
| 284 | - remove_meta_box($tax . 'div', $geodir_post_type, 'normal'); |
|
| 284 | + remove_meta_box($tax . 'div', $geodir_post_type, 'normal'); |
|
| 285 | 285 | |
| 286 | - } |
|
| 287 | - } |
|
| 286 | + } |
|
| 287 | + } |
|
| 288 | 288 | |
| 289 | - } |
|
| 290 | - } |
|
| 289 | + } |
|
| 290 | + } |
|
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | add_filter('geodir_add_listing_map_restrict', 'geodir_add_listing_map_restrict');
|
@@ -301,12 +301,12 @@ discard block |
||
| 301 | 301 | */ |
| 302 | 302 | function geodir_add_listing_map_restrict($map_restirct) |
| 303 | 303 | {
|
| 304 | - if (is_admin()) {
|
|
| 305 | - if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'default_location_settings') {
|
|
| 306 | - $map_restirct = false; |
|
| 307 | - } |
|
| 308 | - } |
|
| 309 | - return $map_restirct; |
|
| 304 | + if (is_admin()) {
|
|
| 305 | + if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'default_location_settings') {
|
|
| 306 | + $map_restirct = false; |
|
| 307 | + } |
|
| 308 | + } |
|
| 309 | + return $map_restirct; |
|
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | |
@@ -325,16 +325,16 @@ discard block |
||
| 325 | 325 | function geodir_enable_editor_on_notifications($notification) |
| 326 | 326 | {
|
| 327 | 327 | |
| 328 | - if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {
|
|
| 328 | + if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {
|
|
| 329 | 329 | |
| 330 | - foreach ($notification as $key => $value) {
|
|
| 331 | - if ($value['type'] == 'textarea') |
|
| 332 | - $notification[$key]['type'] = 'editor'; |
|
| 333 | - } |
|
| 330 | + foreach ($notification as $key => $value) {
|
|
| 331 | + if ($value['type'] == 'textarea') |
|
| 332 | + $notification[$key]['type'] = 'editor'; |
|
| 333 | + } |
|
| 334 | 334 | |
| 335 | - } |
|
| 335 | + } |
|
| 336 | 336 | |
| 337 | - return $notification; |
|
| 337 | + return $notification; |
|
| 338 | 338 | } |
| 339 | 339 | |
| 340 | 340 | |
@@ -351,16 +351,16 @@ discard block |
||
| 351 | 351 | function geodir_enable_editor_on_design_settings($design_setting) |
| 352 | 352 | {
|
| 353 | 353 | |
| 354 | - if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {
|
|
| 354 | + if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {
|
|
| 355 | 355 | |
| 356 | - foreach ($design_setting as $key => $value) {
|
|
| 357 | - if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content') |
|
| 358 | - $design_setting[$key]['type'] = 'editor'; |
|
| 359 | - } |
|
| 356 | + foreach ($design_setting as $key => $value) {
|
|
| 357 | + if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content') |
|
| 358 | + $design_setting[$key]['type'] = 'editor'; |
|
| 359 | + } |
|
| 360 | 360 | |
| 361 | - } |
|
| 361 | + } |
|
| 362 | 362 | |
| 363 | - return $design_setting; |
|
| 363 | + return $design_setting; |
|
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | /* ----------- START MANAGE CUSTOM FIELDS ---------------- */ |
@@ -368,15 +368,15 @@ discard block |
||
| 368 | 368 | add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');
|
| 369 | 369 | |
| 370 | 370 | function geodir_manage_available_fields_predefined($sub_tab){
|
| 371 | - if($sub_tab=='custom_fields'){
|
|
| 372 | - geodir_custom_available_fields('predefined');
|
|
| 373 | - } |
|
| 371 | + if($sub_tab=='custom_fields'){
|
|
| 372 | + geodir_custom_available_fields('predefined');
|
|
| 373 | + } |
|
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | function geodir_manage_available_fields_custom($sub_tab){
|
| 377 | - if($sub_tab=='custom_fields'){
|
|
| 378 | - geodir_custom_available_fields('custom');
|
|
| 379 | - } |
|
| 377 | + if($sub_tab=='custom_fields'){
|
|
| 378 | + geodir_custom_available_fields('custom');
|
|
| 379 | + } |
|
| 380 | 380 | } |
| 381 | 381 | |
| 382 | 382 | |
@@ -395,16 +395,16 @@ discard block |
||
| 395 | 395 | function geodir_manage_available_fields($sub_tab) |
| 396 | 396 | {
|
| 397 | 397 | |
| 398 | - switch ($sub_tab) {
|
|
| 399 | - case 'custom_fields': |
|
| 400 | - geodir_custom_available_fields(); |
|
| 401 | - break; |
|
| 398 | + switch ($sub_tab) {
|
|
| 399 | + case 'custom_fields': |
|
| 400 | + geodir_custom_available_fields(); |
|
| 401 | + break; |
|
| 402 | 402 | |
| 403 | - case 'sorting_options': |
|
| 404 | - geodir_sorting_options_available_fields(); |
|
| 405 | - break; |
|
| 403 | + case 'sorting_options': |
|
| 404 | + geodir_sorting_options_available_fields(); |
|
| 405 | + break; |
|
| 406 | 406 | |
| 407 | - } |
|
| 407 | + } |
|
| 408 | 408 | } |
| 409 | 409 | |
| 410 | 410 | |
@@ -420,16 +420,16 @@ discard block |
||
| 420 | 420 | function geodir_manage_selected_fields($sub_tab) |
| 421 | 421 | {
|
| 422 | 422 | |
| 423 | - switch ($sub_tab) {
|
|
| 424 | - case 'custom_fields': |
|
| 425 | - geodir_custom_selected_fields(); |
|
| 426 | - break; |
|
| 423 | + switch ($sub_tab) {
|
|
| 424 | + case 'custom_fields': |
|
| 425 | + geodir_custom_selected_fields(); |
|
| 426 | + break; |
|
| 427 | 427 | |
| 428 | - case 'sorting_options': |
|
| 429 | - geodir_sorting_options_selected_fields(); |
|
| 430 | - break; |
|
| 428 | + case 'sorting_options': |
|
| 429 | + geodir_sorting_options_selected_fields(); |
|
| 430 | + break; |
|
| 431 | 431 | |
| 432 | - } |
|
| 432 | + } |
|
| 433 | 433 | } |
| 434 | 434 | |
| 435 | 435 | /** |
@@ -441,52 +441,52 @@ discard block |
||
| 441 | 441 | */ |
| 442 | 442 | function geodir_sorting_options_available_fields() |
| 443 | 443 | {
|
| 444 | - global $wpdb; |
|
| 445 | - $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 446 | - ?> |
|
| 444 | + global $wpdb; |
|
| 445 | + $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 446 | + ?> |
|
| 447 | 447 | <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/> |
| 448 | 448 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/> |
| 449 | 449 | <ul> |
| 450 | 450 | <?php |
| 451 | - $sort_options = geodir_get_custom_sort_options($listing_type); |
|
| 451 | + $sort_options = geodir_get_custom_sort_options($listing_type); |
|
| 452 | 452 | |
| 453 | - foreach ($sort_options as $key => $val) {
|
|
| 454 | - $val = stripslashes_deep($val); // strip slashes |
|
| 455 | - |
|
| 456 | - $check_html_variable = $wpdb->get_var( |
|
| 457 | - $wpdb->prepare( |
|
| 458 | - "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s", |
|
| 459 | - array($val['htmlvar_name'], $listing_type, $val['field_type']) |
|
| 460 | - ) |
|
| 461 | - ); |
|
| 453 | + foreach ($sort_options as $key => $val) {
|
|
| 454 | + $val = stripslashes_deep($val); // strip slashes |
|
| 455 | + |
|
| 456 | + $check_html_variable = $wpdb->get_var( |
|
| 457 | + $wpdb->prepare( |
|
| 458 | + "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s", |
|
| 459 | + array($val['htmlvar_name'], $listing_type, $val['field_type']) |
|
| 460 | + ) |
|
| 461 | + ); |
|
| 462 | 462 | |
| 463 | - $display = $check_html_variable ? ' style="display:none;"' : ''; |
|
| 464 | - ?> |
|
| 463 | + $display = $check_html_variable ? ' style="display:none;"' : ''; |
|
| 464 | + ?> |
|
| 465 | 465 | |
| 466 | 466 | <li class="gd-cf-tooltip-wrap" <?php echo $display;?>> |
| 467 | 467 | <?php |
| 468 | - if(isset($val['description']) && $val['description']){
|
|
| 469 | - echo '<div class="gdcf-tooltip">'.$val['description'].'</div>'; |
|
| 470 | - }?> |
|
| 468 | + if(isset($val['description']) && $val['description']){
|
|
| 469 | + echo '<div class="gdcf-tooltip">'.$val['description'].'</div>'; |
|
| 470 | + }?> |
|
| 471 | 471 | |
| 472 | 472 | <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>" data-field-type="<?php echo $val['field_type'];?>" |
| 473 | 473 | title="<?php echo $val['site_title'];?>" |
| 474 | 474 | class="gd-draggable-form-items gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);"> |
| 475 | 475 | <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {
|
| 476 | - echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>'; |
|
| 477 | - }elseif(isset($val['field_icon']) && $val['field_icon'] ){
|
|
| 478 | - echo '<b class="gd-cf-icon" style="background-image: url(\''.$val['field_icon'].'\')"></b>'; |
|
| 479 | - }else{
|
|
| 480 | - echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 481 | - }?> |
|
| 476 | + echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>'; |
|
| 477 | + }elseif(isset($val['field_icon']) && $val['field_icon'] ){
|
|
| 478 | + echo '<b class="gd-cf-icon" style="background-image: url(\''.$val['field_icon'].'\')"></b>'; |
|
| 479 | + }else{
|
|
| 480 | + echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 481 | + }?> |
|
| 482 | 482 | <?php echo (! empty( $val['admin_title'] ) ? $val['admin_title'] : $val['site_title'] );?> |
| 483 | 483 | </a> |
| 484 | 484 | </li> |
| 485 | 485 | |
| 486 | 486 | |
| 487 | 487 | <?php |
| 488 | - } |
|
| 489 | - ?> |
|
| 488 | + } |
|
| 489 | + ?> |
|
| 490 | 490 | </ul> |
| 491 | 491 | <?php |
| 492 | 492 | } |
@@ -500,28 +500,28 @@ discard block |
||
| 500 | 500 | */ |
| 501 | 501 | function geodir_sorting_options_selected_fields() |
| 502 | 502 | {
|
| 503 | - $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 504 | - ?> |
|
| 503 | + $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 504 | + ?> |
|
| 505 | 505 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/> |
| 506 | 506 | <ul class="core"> |
| 507 | 507 | <?php |
| 508 | - global $wpdb; |
|
| 508 | + global $wpdb; |
|
| 509 | 509 | |
| 510 | - $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
|
|
| 510 | + $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
|
|
| 511 | 511 | |
| 512 | - if (!empty($fields)) {
|
|
| 513 | - foreach ($fields as $field) {
|
|
| 514 | - //$result_str = $field->id; |
|
| 515 | - $result_str = $field; |
|
| 516 | - $field_type = $field->field_type; |
|
| 517 | - $field_ins_upd = 'display'; |
|
| 512 | + if (!empty($fields)) {
|
|
| 513 | + foreach ($fields as $field) {
|
|
| 514 | + //$result_str = $field->id; |
|
| 515 | + $result_str = $field; |
|
| 516 | + $field_type = $field->field_type; |
|
| 517 | + $field_ins_upd = 'display'; |
|
| 518 | 518 | |
| 519 | - $default = false; |
|
| 519 | + $default = false; |
|
| 520 | 520 | |
| 521 | - geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default); |
|
| 522 | - } |
|
| 523 | - } |
|
| 524 | - ?> |
|
| 521 | + geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default); |
|
| 522 | + } |
|
| 523 | + } |
|
| 524 | + ?> |
|
| 525 | 525 | </ul> |
| 526 | 526 | <?php |
| 527 | 527 | } |
@@ -534,12 +534,12 @@ discard block |
||
| 534 | 534 | */ |
| 535 | 535 | function geodir_custom_fields_custom($post_type=''){
|
| 536 | 536 | |
| 537 | - $custom_fields = array(); |
|
| 537 | + $custom_fields = array(); |
|
| 538 | 538 | |
| 539 | - /** |
|
| 540 | - * @see `geodir_custom_fields` |
|
| 541 | - */ |
|
| 542 | - return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);
|
|
| 539 | + /** |
|
| 540 | + * @see `geodir_custom_fields` |
|
| 541 | + */ |
|
| 542 | + return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);
|
|
| 543 | 543 | } |
| 544 | 544 | |
| 545 | 545 | |
@@ -552,140 +552,140 @@ discard block |
||
| 552 | 552 | */ |
| 553 | 553 | function geodir_custom_fields($post_type=''){
|
| 554 | 554 | |
| 555 | - $custom_fields = array( |
|
| 556 | - 'text' => array( |
|
| 557 | - 'field_type' => 'text', |
|
| 558 | - 'class' => 'gd-text', |
|
| 559 | - 'icon' => 'fa fa-minus', |
|
| 560 | - 'name' => __('Text', 'geodirectory'),
|
|
| 561 | - 'description' => __('Add any sort of text field, text or numbers', 'geodirectory')
|
|
| 562 | - ), |
|
| 563 | - 'datepicker' => array( |
|
| 564 | - 'field_type' => 'datepicker', |
|
| 565 | - 'class' => 'gd-datepicker', |
|
| 566 | - 'icon' => 'fa fa-calendar', |
|
| 567 | - 'name' => __('Date', 'geodirectory'),
|
|
| 568 | - 'description' => __('Adds a date picker.', 'geodirectory')
|
|
| 569 | - ), |
|
| 570 | - 'textarea' => array( |
|
| 571 | - 'field_type' => 'textarea', |
|
| 572 | - 'class' => 'gd-textarea', |
|
| 573 | - 'icon' => 'fa fa-bars', |
|
| 574 | - 'name' => __('Textarea', 'geodirectory'),
|
|
| 575 | - 'description' => __('Adds a textarea', 'geodirectory')
|
|
| 576 | - ), |
|
| 577 | - 'time' => array( |
|
| 578 | - 'field_type' => 'time', |
|
| 579 | - 'class' => 'gd-time', |
|
| 580 | - 'icon' => 'fa fa-clock-o', |
|
| 581 | - 'name' => __('Time', 'geodirectory'),
|
|
| 582 | - 'description' => __('Adds a time picker', 'geodirectory')
|
|
| 583 | - ), |
|
| 584 | - 'checkbox' => array( |
|
| 585 | - 'field_type' => 'checkbox', |
|
| 586 | - 'class' => 'gd-checkbox', |
|
| 587 | - 'icon' => 'fa fa-check-square-o', |
|
| 588 | - 'name' => __('Checkbox', 'geodirectory'),
|
|
| 589 | - 'description' => __('Adds a checkbox', 'geodirectory')
|
|
| 590 | - ), |
|
| 591 | - 'phone' => array( |
|
| 592 | - 'field_type' => 'phone', |
|
| 593 | - 'class' => 'gd-phone', |
|
| 594 | - 'icon' => 'fa fa-phone', |
|
| 595 | - 'name' => __('Phone', 'geodirectory'),
|
|
| 596 | - 'description' => __('Adds a phone input', 'geodirectory')
|
|
| 597 | - ), |
|
| 598 | - 'radio' => array( |
|
| 599 | - 'field_type' => 'radio', |
|
| 600 | - 'class' => 'gd-radio', |
|
| 601 | - 'icon' => 'fa fa-dot-circle-o', |
|
| 602 | - 'name' => __('Radio', 'geodirectory'),
|
|
| 603 | - 'description' => __('Adds a radio input', 'geodirectory')
|
|
| 604 | - ), |
|
| 605 | - 'email' => array( |
|
| 606 | - 'field_type' => 'email', |
|
| 607 | - 'class' => 'gd-email', |
|
| 608 | - 'icon' => 'fa fa-envelope-o', |
|
| 609 | - 'name' => __('Email', 'geodirectory'),
|
|
| 610 | - 'description' => __('Adds a email input', 'geodirectory')
|
|
| 611 | - ), |
|
| 612 | - 'select' => array( |
|
| 613 | - 'field_type' => 'select', |
|
| 614 | - 'class' => 'gd-select', |
|
| 615 | - 'icon' => 'fa fa-caret-square-o-down', |
|
| 616 | - 'name' => __('Select', 'geodirectory'),
|
|
| 617 | - 'description' => __('Adds a select input', 'geodirectory')
|
|
| 618 | - ), |
|
| 619 | - 'multiselect' => array( |
|
| 620 | - 'field_type' => 'multiselect', |
|
| 621 | - 'class' => 'gd-multiselect', |
|
| 622 | - 'icon' => 'fa fa-caret-square-o-down', |
|
| 623 | - 'name' => __('Multi Select', 'geodirectory'),
|
|
| 624 | - 'description' => __('Adds a multiselect input', 'geodirectory')
|
|
| 625 | - ), |
|
| 626 | - 'url' => array( |
|
| 627 | - 'field_type' => 'url', |
|
| 628 | - 'class' => 'gd-url', |
|
| 629 | - 'icon' => 'fa fa-link', |
|
| 630 | - 'name' => __('URL', 'geodirectory'),
|
|
| 631 | - 'description' => __('Adds a url input', 'geodirectory')
|
|
| 632 | - ), |
|
| 633 | - 'html' => array( |
|
| 634 | - 'field_type' => 'html', |
|
| 635 | - 'class' => 'gd-html', |
|
| 636 | - 'icon' => 'fa fa-code', |
|
| 637 | - 'name' => __('HTML', 'geodirectory'),
|
|
| 638 | - 'description' => __('Adds a html input textarea', 'geodirectory')
|
|
| 639 | - ), |
|
| 640 | - 'file' => array( |
|
| 641 | - 'field_type' => 'file', |
|
| 642 | - 'class' => 'gd-file', |
|
| 643 | - 'icon' => 'fa fa-file', |
|
| 644 | - 'name' => __('File Upload', 'geodirectory'),
|
|
| 645 | - 'description' => __('Adds a file input', 'geodirectory')
|
|
| 646 | - ) |
|
| 647 | - ); |
|
| 648 | - |
|
| 649 | - /** |
|
| 650 | - * Filter the custom fields array to be able to add or remove items. |
|
| 651 | - * |
|
| 652 | - * @since 1.6.6 |
|
| 653 | - * |
|
| 654 | - * @param array $custom_fields {
|
|
| 655 | - * The custom fields array to be filtered. |
|
| 656 | - * |
|
| 657 | - * @type string $field_type The type of field, eg: text, datepicker, textarea, time, checkbox, phone, radio, email, select, multiselect, url, html, file. |
|
| 658 | - * @type string $class The class for the field in backend. |
|
| 659 | - * @type string $icon Can be font-awesome class name or icon image url. |
|
| 660 | - * @type string $name The name of the field. |
|
| 661 | - * @type string $description A short description about the field. |
|
| 662 | - * @type array $defaults {
|
|
| 663 | - * Optional. Used to set the default value of the field. |
|
| 664 | - * |
|
| 665 | - * @type string data_type The SQL data type for the field. VARCHAR, TEXT, TIME, TINYINT, INT, FLOAT, DATE |
|
| 666 | - * @type int decimal_point limit if using FLOAT data_type |
|
| 667 | - * @type string admin_title The admin title for the field. |
|
| 668 | - * @type string site_title This will be the title for the field on the frontend. |
|
| 669 | - * @type string admin_desc This will be shown below the field on the add listing form. |
|
| 670 | - * @type string htmlvar_name This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters. |
|
| 671 | - * @type bool is_active If false the field will not be displayed anywhere. |
|
| 672 | - * @type bool for_admin_use If true then only site admin can see and edit this field. |
|
| 673 | - * @type string default_value The default value for the input on the add listing page. |
|
| 674 | - * @type string show_in The locations to show in. [detail],[moreinfo],[listing],[owntab],[mapbubble] |
|
| 675 | - * @type bool is_required If true the field will be required on the add listing page. |
|
| 676 | - * @type string option_values The option values for select and multiselect only |
|
| 677 | - * @type string validation_pattern HTML5 validation pattern (text input only by default). |
|
| 678 | - * @type string validation_msg HTML5 validation message (text input only by default). |
|
| 679 | - * @type string required_msg Required warning message. |
|
| 680 | - * @type string field_icon Icon url or font awesome class. |
|
| 681 | - * @type string css_class Field custom css class for field custom style. |
|
| 682 | - * @type bool cat_sort If true the field will appear in the category sort options, if false the field will be hidden, leave blank to show option. |
|
| 683 | - * @type bool cat_sort If true the field will appear in the advanced search sort options, if false the field will be hidden, leave blank to show option. (advanced search addon required) |
|
| 684 | - * } |
|
| 685 | - * } |
|
| 686 | - * @param string $post_type The post type requested. |
|
| 687 | - */ |
|
| 688 | - return apply_filters('geodir_custom_fields',$custom_fields,$post_type);
|
|
| 555 | + $custom_fields = array( |
|
| 556 | + 'text' => array( |
|
| 557 | + 'field_type' => 'text', |
|
| 558 | + 'class' => 'gd-text', |
|
| 559 | + 'icon' => 'fa fa-minus', |
|
| 560 | + 'name' => __('Text', 'geodirectory'),
|
|
| 561 | + 'description' => __('Add any sort of text field, text or numbers', 'geodirectory')
|
|
| 562 | + ), |
|
| 563 | + 'datepicker' => array( |
|
| 564 | + 'field_type' => 'datepicker', |
|
| 565 | + 'class' => 'gd-datepicker', |
|
| 566 | + 'icon' => 'fa fa-calendar', |
|
| 567 | + 'name' => __('Date', 'geodirectory'),
|
|
| 568 | + 'description' => __('Adds a date picker.', 'geodirectory')
|
|
| 569 | + ), |
|
| 570 | + 'textarea' => array( |
|
| 571 | + 'field_type' => 'textarea', |
|
| 572 | + 'class' => 'gd-textarea', |
|
| 573 | + 'icon' => 'fa fa-bars', |
|
| 574 | + 'name' => __('Textarea', 'geodirectory'),
|
|
| 575 | + 'description' => __('Adds a textarea', 'geodirectory')
|
|
| 576 | + ), |
|
| 577 | + 'time' => array( |
|
| 578 | + 'field_type' => 'time', |
|
| 579 | + 'class' => 'gd-time', |
|
| 580 | + 'icon' => 'fa fa-clock-o', |
|
| 581 | + 'name' => __('Time', 'geodirectory'),
|
|
| 582 | + 'description' => __('Adds a time picker', 'geodirectory')
|
|
| 583 | + ), |
|
| 584 | + 'checkbox' => array( |
|
| 585 | + 'field_type' => 'checkbox', |
|
| 586 | + 'class' => 'gd-checkbox', |
|
| 587 | + 'icon' => 'fa fa-check-square-o', |
|
| 588 | + 'name' => __('Checkbox', 'geodirectory'),
|
|
| 589 | + 'description' => __('Adds a checkbox', 'geodirectory')
|
|
| 590 | + ), |
|
| 591 | + 'phone' => array( |
|
| 592 | + 'field_type' => 'phone', |
|
| 593 | + 'class' => 'gd-phone', |
|
| 594 | + 'icon' => 'fa fa-phone', |
|
| 595 | + 'name' => __('Phone', 'geodirectory'),
|
|
| 596 | + 'description' => __('Adds a phone input', 'geodirectory')
|
|
| 597 | + ), |
|
| 598 | + 'radio' => array( |
|
| 599 | + 'field_type' => 'radio', |
|
| 600 | + 'class' => 'gd-radio', |
|
| 601 | + 'icon' => 'fa fa-dot-circle-o', |
|
| 602 | + 'name' => __('Radio', 'geodirectory'),
|
|
| 603 | + 'description' => __('Adds a radio input', 'geodirectory')
|
|
| 604 | + ), |
|
| 605 | + 'email' => array( |
|
| 606 | + 'field_type' => 'email', |
|
| 607 | + 'class' => 'gd-email', |
|
| 608 | + 'icon' => 'fa fa-envelope-o', |
|
| 609 | + 'name' => __('Email', 'geodirectory'),
|
|
| 610 | + 'description' => __('Adds a email input', 'geodirectory')
|
|
| 611 | + ), |
|
| 612 | + 'select' => array( |
|
| 613 | + 'field_type' => 'select', |
|
| 614 | + 'class' => 'gd-select', |
|
| 615 | + 'icon' => 'fa fa-caret-square-o-down', |
|
| 616 | + 'name' => __('Select', 'geodirectory'),
|
|
| 617 | + 'description' => __('Adds a select input', 'geodirectory')
|
|
| 618 | + ), |
|
| 619 | + 'multiselect' => array( |
|
| 620 | + 'field_type' => 'multiselect', |
|
| 621 | + 'class' => 'gd-multiselect', |
|
| 622 | + 'icon' => 'fa fa-caret-square-o-down', |
|
| 623 | + 'name' => __('Multi Select', 'geodirectory'),
|
|
| 624 | + 'description' => __('Adds a multiselect input', 'geodirectory')
|
|
| 625 | + ), |
|
| 626 | + 'url' => array( |
|
| 627 | + 'field_type' => 'url', |
|
| 628 | + 'class' => 'gd-url', |
|
| 629 | + 'icon' => 'fa fa-link', |
|
| 630 | + 'name' => __('URL', 'geodirectory'),
|
|
| 631 | + 'description' => __('Adds a url input', 'geodirectory')
|
|
| 632 | + ), |
|
| 633 | + 'html' => array( |
|
| 634 | + 'field_type' => 'html', |
|
| 635 | + 'class' => 'gd-html', |
|
| 636 | + 'icon' => 'fa fa-code', |
|
| 637 | + 'name' => __('HTML', 'geodirectory'),
|
|
| 638 | + 'description' => __('Adds a html input textarea', 'geodirectory')
|
|
| 639 | + ), |
|
| 640 | + 'file' => array( |
|
| 641 | + 'field_type' => 'file', |
|
| 642 | + 'class' => 'gd-file', |
|
| 643 | + 'icon' => 'fa fa-file', |
|
| 644 | + 'name' => __('File Upload', 'geodirectory'),
|
|
| 645 | + 'description' => __('Adds a file input', 'geodirectory')
|
|
| 646 | + ) |
|
| 647 | + ); |
|
| 648 | + |
|
| 649 | + /** |
|
| 650 | + * Filter the custom fields array to be able to add or remove items. |
|
| 651 | + * |
|
| 652 | + * @since 1.6.6 |
|
| 653 | + * |
|
| 654 | + * @param array $custom_fields {
|
|
| 655 | + * The custom fields array to be filtered. |
|
| 656 | + * |
|
| 657 | + * @type string $field_type The type of field, eg: text, datepicker, textarea, time, checkbox, phone, radio, email, select, multiselect, url, html, file. |
|
| 658 | + * @type string $class The class for the field in backend. |
|
| 659 | + * @type string $icon Can be font-awesome class name or icon image url. |
|
| 660 | + * @type string $name The name of the field. |
|
| 661 | + * @type string $description A short description about the field. |
|
| 662 | + * @type array $defaults {
|
|
| 663 | + * Optional. Used to set the default value of the field. |
|
| 664 | + * |
|
| 665 | + * @type string data_type The SQL data type for the field. VARCHAR, TEXT, TIME, TINYINT, INT, FLOAT, DATE |
|
| 666 | + * @type int decimal_point limit if using FLOAT data_type |
|
| 667 | + * @type string admin_title The admin title for the field. |
|
| 668 | + * @type string site_title This will be the title for the field on the frontend. |
|
| 669 | + * @type string admin_desc This will be shown below the field on the add listing form. |
|
| 670 | + * @type string htmlvar_name This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters. |
|
| 671 | + * @type bool is_active If false the field will not be displayed anywhere. |
|
| 672 | + * @type bool for_admin_use If true then only site admin can see and edit this field. |
|
| 673 | + * @type string default_value The default value for the input on the add listing page. |
|
| 674 | + * @type string show_in The locations to show in. [detail],[moreinfo],[listing],[owntab],[mapbubble] |
|
| 675 | + * @type bool is_required If true the field will be required on the add listing page. |
|
| 676 | + * @type string option_values The option values for select and multiselect only |
|
| 677 | + * @type string validation_pattern HTML5 validation pattern (text input only by default). |
|
| 678 | + * @type string validation_msg HTML5 validation message (text input only by default). |
|
| 679 | + * @type string required_msg Required warning message. |
|
| 680 | + * @type string field_icon Icon url or font awesome class. |
|
| 681 | + * @type string css_class Field custom css class for field custom style. |
|
| 682 | + * @type bool cat_sort If true the field will appear in the category sort options, if false the field will be hidden, leave blank to show option. |
|
| 683 | + * @type bool cat_sort If true the field will appear in the advanced search sort options, if false the field will be hidden, leave blank to show option. (advanced search addon required) |
|
| 684 | + * } |
|
| 685 | + * } |
|
| 686 | + * @param string $post_type The post type requested. |
|
| 687 | + */ |
|
| 688 | + return apply_filters('geodir_custom_fields',$custom_fields,$post_type);
|
|
| 689 | 689 | } |
| 690 | 690 | |
| 691 | 691 | /** |
@@ -698,19 +698,19 @@ discard block |
||
| 698 | 698 | */ |
| 699 | 699 | function geodir_custom_available_fields($type='') |
| 700 | 700 | {
|
| 701 | - $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 702 | - ?> |
|
| 701 | + $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 702 | + ?> |
|
| 703 | 703 | <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/> |
| 704 | 704 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>" /> |
| 705 | 705 | |
| 706 | 706 | <?php |
| 707 | - if($type=='predefined'){
|
|
| 708 | - $cfs = geodir_custom_fields_predefined($listing_type); |
|
| 709 | - }elseif($type=='custom'){
|
|
| 710 | - $cfs = geodir_custom_fields_custom($listing_type); |
|
| 711 | - }else{
|
|
| 712 | - $cfs = geodir_custom_fields($listing_type); |
|
| 713 | - ?> |
|
| 707 | + if($type=='predefined'){
|
|
| 708 | + $cfs = geodir_custom_fields_predefined($listing_type); |
|
| 709 | + }elseif($type=='custom'){
|
|
| 710 | + $cfs = geodir_custom_fields_custom($listing_type); |
|
| 711 | + }else{
|
|
| 712 | + $cfs = geodir_custom_fields($listing_type); |
|
| 713 | + ?> |
|
| 714 | 714 | <ul class="full gd-cf-tooltip-wrap"> |
| 715 | 715 | <li> |
| 716 | 716 | <div class="gdcf-tooltip"> |
@@ -731,18 +731,18 @@ discard block |
||
| 731 | 731 | </ul> |
| 732 | 732 | |
| 733 | 733 | <?php |
| 734 | - } |
|
| 734 | + } |
|
| 735 | 735 | |
| 736 | - if(!empty($cfs)) {
|
|
| 737 | - echo '<ul>'; |
|
| 738 | - foreach ( $cfs as $id => $cf ) {
|
|
| 739 | - ?> |
|
| 736 | + if(!empty($cfs)) {
|
|
| 737 | + echo '<ul>'; |
|
| 738 | + foreach ( $cfs as $id => $cf ) {
|
|
| 739 | + ?> |
|
| 740 | 740 | |
| 741 | 741 | <li class="gd-cf-tooltip-wrap"> |
| 742 | 742 | <?php |
| 743 | - if ( isset( $cf['description'] ) && $cf['description'] ) {
|
|
| 744 | - echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>'; |
|
| 745 | - } ?> |
|
| 743 | + if ( isset( $cf['description'] ) && $cf['description'] ) {
|
|
| 744 | + echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>'; |
|
| 745 | + } ?> |
|
| 746 | 746 | |
| 747 | 747 | <a id="gd-<?php echo $id; ?>" |
| 748 | 748 | data-field-custom-type="<?php echo $type; ?>" |
@@ -752,21 +752,21 @@ discard block |
||
| 752 | 752 | href="javascript:void(0);"> |
| 753 | 753 | |
| 754 | 754 | <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {
|
| 755 | - echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>'; |
|
| 756 | - } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {
|
|
| 757 | - echo '<b class="gd-cf-icon" style="background-image: url(\'' . $cf['icon'] . '\')"></b>'; |
|
| 758 | - } else {
|
|
| 759 | - echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 760 | - } ?> |
|
| 755 | + echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>'; |
|
| 756 | + } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {
|
|
| 757 | + echo '<b class="gd-cf-icon" style="background-image: url(\'' . $cf['icon'] . '\')"></b>'; |
|
| 758 | + } else {
|
|
| 759 | + echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
|
| 760 | + } ?> |
|
| 761 | 761 | <?php echo $cf['name']; ?> |
| 762 | 762 | </a> |
| 763 | 763 | </li> |
| 764 | 764 | <?php |
| 765 | - } |
|
| 766 | - }else{
|
|
| 767 | - _e('There are no custom fields here yet.', 'geodirectory');
|
|
| 768 | - } |
|
| 769 | - ?> |
|
| 765 | + } |
|
| 766 | + }else{
|
|
| 767 | + _e('There are no custom fields here yet.', 'geodirectory');
|
|
| 768 | + } |
|
| 769 | + ?> |
|
| 770 | 770 | |
| 771 | 771 | |
| 772 | 772 | </ul> |
@@ -785,26 +785,26 @@ discard block |
||
| 785 | 785 | */ |
| 786 | 786 | function geodir_custom_selected_fields() |
| 787 | 787 | {
|
| 788 | - $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 789 | - ?> |
|
| 788 | + $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
|
| 789 | + ?> |
|
| 790 | 790 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/> |
| 791 | 791 | <ul class="core"> |
| 792 | 792 | <?php |
| 793 | - global $wpdb; |
|
| 794 | - $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
|
|
| 795 | - |
|
| 796 | - if (!empty($fields)) {
|
|
| 797 | - foreach ($fields as $field) {
|
|
| 798 | - //$result_str = $field->id; |
|
| 799 | - $result_str = $field; |
|
| 800 | - $field_type = $field->field_type; |
|
| 801 | - $field_type_key = $field->field_type_key; |
|
| 802 | - $field_ins_upd = 'display'; |
|
| 803 | - |
|
| 804 | - geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key); |
|
| 805 | - } |
|
| 806 | - } |
|
| 807 | - ?></ul> |
|
| 793 | + global $wpdb; |
|
| 794 | + $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
|
|
| 795 | + |
|
| 796 | + if (!empty($fields)) {
|
|
| 797 | + foreach ($fields as $field) {
|
|
| 798 | + //$result_str = $field->id; |
|
| 799 | + $result_str = $field; |
|
| 800 | + $field_type = $field->field_type; |
|
| 801 | + $field_type_key = $field->field_type_key; |
|
| 802 | + $field_ins_upd = 'display'; |
|
| 803 | + |
|
| 804 | + geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key); |
|
| 805 | + } |
|
| 806 | + } |
|
| 807 | + ?></ul> |
|
| 808 | 808 | <?php |
| 809 | 809 | |
| 810 | 810 | } |
@@ -823,16 +823,16 @@ discard block |
||
| 823 | 823 | function geodir_custom_fields_panel_head($heading, $sub_tab, $listing_type) |
| 824 | 824 | {
|
| 825 | 825 | |
| 826 | - switch ($sub_tab) {
|
|
| 827 | - case 'custom_fields': |
|
| 828 | - $heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 829 | - break; |
|
| 826 | + switch ($sub_tab) {
|
|
| 827 | + case 'custom_fields': |
|
| 828 | + $heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 829 | + break; |
|
| 830 | 830 | |
| 831 | - case 'sorting_options': |
|
| 832 | - $heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 833 | - break; |
|
| 834 | - } |
|
| 835 | - return $heading; |
|
| 831 | + case 'sorting_options': |
|
| 832 | + $heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 833 | + break; |
|
| 834 | + } |
|
| 835 | + return $heading; |
|
| 836 | 836 | } |
| 837 | 837 | |
| 838 | 838 | |
@@ -850,16 +850,16 @@ discard block |
||
| 850 | 850 | function geodir_cf_panel_available_fields_head($heading, $sub_tab, $listing_type) |
| 851 | 851 | {
|
| 852 | 852 | |
| 853 | - switch ($sub_tab) {
|
|
| 854 | - case 'custom_fields': |
|
| 855 | - $heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 856 | - break; |
|
| 853 | + switch ($sub_tab) {
|
|
| 854 | + case 'custom_fields': |
|
| 855 | + $heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 856 | + break; |
|
| 857 | 857 | |
| 858 | - case 'sorting_options': |
|
| 859 | - $heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 860 | - break; |
|
| 861 | - } |
|
| 862 | - return $heading; |
|
| 858 | + case 'sorting_options': |
|
| 859 | + $heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 860 | + break; |
|
| 861 | + } |
|
| 862 | + return $heading; |
|
| 863 | 863 | } |
| 864 | 864 | |
| 865 | 865 | |
@@ -877,16 +877,16 @@ discard block |
||
| 877 | 877 | function geodir_cf_panel_available_fields_note($note, $sub_tab, $listing_type) |
| 878 | 878 | {
|
| 879 | 879 | |
| 880 | - switch ($sub_tab) {
|
|
| 881 | - case 'custom_fields': |
|
| 882 | - $note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 883 | - break; |
|
| 880 | + switch ($sub_tab) {
|
|
| 881 | + case 'custom_fields': |
|
| 882 | + $note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 883 | + break; |
|
| 884 | 884 | |
| 885 | - case 'sorting_options': |
|
| 886 | - $note = sprintf(__('Click on any box below to make it appear in the sorting option dropdown on %s listing and search results.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 887 | - break; |
|
| 888 | - } |
|
| 889 | - return $note; |
|
| 885 | + case 'sorting_options': |
|
| 886 | + $note = sprintf(__('Click on any box below to make it appear in the sorting option dropdown on %s listing and search results.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 887 | + break; |
|
| 888 | + } |
|
| 889 | + return $note; |
|
| 890 | 890 | } |
| 891 | 891 | |
| 892 | 892 | |
@@ -904,16 +904,16 @@ discard block |
||
| 904 | 904 | function geodir_cf_panel_selected_fields_head($heading, $sub_tab, $listing_type) |
| 905 | 905 | {
|
| 906 | 906 | |
| 907 | - switch ($sub_tab) {
|
|
| 908 | - case 'custom_fields': |
|
| 909 | - $heading = sprintf(__('List of fields that will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 910 | - break; |
|
| 907 | + switch ($sub_tab) {
|
|
| 908 | + case 'custom_fields': |
|
| 909 | + $heading = sprintf(__('List of fields that will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 910 | + break; |
|
| 911 | 911 | |
| 912 | - case 'sorting_options': |
|
| 913 | - $heading = sprintf(__('List of fields that will appear in %s listing and search results sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 914 | - break; |
|
| 915 | - } |
|
| 916 | - return $heading; |
|
| 912 | + case 'sorting_options': |
|
| 913 | + $heading = sprintf(__('List of fields that will appear in %s listing and search results sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 914 | + break; |
|
| 915 | + } |
|
| 916 | + return $heading; |
|
| 917 | 917 | } |
| 918 | 918 | |
| 919 | 919 | |
@@ -931,16 +931,16 @@ discard block |
||
| 931 | 931 | function geodir_cf_panel_selected_fields_note($note, $sub_tab, $listing_type) |
| 932 | 932 | {
|
| 933 | 933 | |
| 934 | - switch ($sub_tab) {
|
|
| 935 | - case 'custom_fields': |
|
| 936 | - $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 937 | - break; |
|
| 934 | + switch ($sub_tab) {
|
|
| 935 | + case 'custom_fields': |
|
| 936 | + $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 937 | + break; |
|
| 938 | 938 | |
| 939 | - case 'sorting_options': |
|
| 940 | - $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing and search results page.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 941 | - break; |
|
| 942 | - } |
|
| 943 | - return $note; |
|
| 939 | + case 'sorting_options': |
|
| 940 | + $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing and search results page.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
|
|
| 941 | + break; |
|
| 942 | + } |
|
| 943 | + return $note; |
|
| 944 | 944 | } |
| 945 | 945 | |
| 946 | 946 | |
@@ -956,16 +956,16 @@ discard block |
||
| 956 | 956 | */ |
| 957 | 957 | function geodir_remove_unnecessary_fields() |
| 958 | 958 | {
|
| 959 | - global $wpdb, $plugin_prefix; |
|
| 959 | + global $wpdb, $plugin_prefix; |
|
| 960 | 960 | |
| 961 | - if (!get_option('geodir_remove_unnecessary_fields')) {
|
|
| 961 | + if (!get_option('geodir_remove_unnecessary_fields')) {
|
|
| 962 | 962 | |
| 963 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
|
|
| 964 | - $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
|
|
| 963 | + if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
|
|
| 964 | + $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
|
|
| 965 | 965 | |
| 966 | - update_option('geodir_remove_unnecessary_fields', '1');
|
|
| 966 | + update_option('geodir_remove_unnecessary_fields', '1');
|
|
| 967 | 967 | |
| 968 | - } |
|
| 968 | + } |
|
| 969 | 969 | |
| 970 | 970 | } |
| 971 | 971 | |
@@ -983,28 +983,28 @@ discard block |
||
| 983 | 983 | */ |
| 984 | 984 | function geodir_admin_ajax_handler() |
| 985 | 985 | {
|
| 986 | - if (isset($_REQUEST['geodir_admin_ajax_action']) && $_REQUEST['geodir_admin_ajax_action'] != '') {
|
|
| 987 | - $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action']; |
|
| 988 | - $diagnose_this = ""; |
|
| 989 | - switch ($geodir_admin_ajax_action) {
|
|
| 990 | - case 'diagnosis' : |
|
| 991 | - if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
|
|
| 992 | - $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
|
| 993 | - call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 994 | - |
|
| 995 | - } |
|
| 996 | - exit(); |
|
| 997 | - break; |
|
| 998 | - |
|
| 999 | - case 'diagnosis-fix' : |
|
| 1000 | - if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') |
|
| 1001 | - $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
|
| 1002 | - call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 1003 | - exit(); |
|
| 1004 | - break; |
|
| 1005 | - } |
|
| 1006 | - } |
|
| 1007 | - exit(); |
|
| 986 | + if (isset($_REQUEST['geodir_admin_ajax_action']) && $_REQUEST['geodir_admin_ajax_action'] != '') {
|
|
| 987 | + $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action']; |
|
| 988 | + $diagnose_this = ""; |
|
| 989 | + switch ($geodir_admin_ajax_action) {
|
|
| 990 | + case 'diagnosis' : |
|
| 991 | + if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
|
|
| 992 | + $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
|
| 993 | + call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 994 | + |
|
| 995 | + } |
|
| 996 | + exit(); |
|
| 997 | + break; |
|
| 998 | + |
|
| 999 | + case 'diagnosis-fix' : |
|
| 1000 | + if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') |
|
| 1001 | + $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
|
| 1002 | + call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 1003 | + exit(); |
|
| 1004 | + break; |
|
| 1005 | + } |
|
| 1006 | + } |
|
| 1007 | + exit(); |
|
| 1008 | 1008 | } |
| 1009 | 1009 | |
| 1010 | 1010 | |
@@ -1022,127 +1022,127 @@ discard block |
||
| 1022 | 1022 | */ |
| 1023 | 1023 | function geodir_diagnose_multisite_table($filter_arr, $table, $tabel_name, $fix) |
| 1024 | 1024 | {
|
| 1025 | - global $wpdb; |
|
| 1026 | - //$filter_arr['output_str'] .='###'.$table.'###'; |
|
| 1027 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {
|
|
| 1028 | - $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";
|
|
| 1029 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1030 | - |
|
| 1031 | - } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1032 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1033 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1034 | - $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";
|
|
| 1035 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1036 | - |
|
| 1037 | - if ($fix) {
|
|
| 1038 | - $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count
|
|
| 1039 | - $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count
|
|
| 1040 | - |
|
| 1041 | - if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2
|
|
| 1042 | - //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;
|
|
| 1043 | - |
|
| 1044 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table
|
|
| 1045 | - |
|
| 1046 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1047 | - $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";
|
|
| 1048 | - } else {
|
|
| 1049 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1050 | - } |
|
| 1051 | - |
|
| 1052 | - } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it
|
|
| 1053 | - |
|
| 1054 | - $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2
|
|
| 1055 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table
|
|
| 1056 | - |
|
| 1057 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1058 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1059 | - } else {
|
|
| 1060 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1061 | - } |
|
| 1062 | - |
|
| 1063 | - } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors
|
|
| 1064 | - |
|
| 1065 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2
|
|
| 1066 | - |
|
| 1067 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1068 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";
|
|
| 1069 | - } else {
|
|
| 1070 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1071 | - } |
|
| 1072 | - |
|
| 1073 | - } |
|
| 1074 | - |
|
| 1075 | - } |
|
| 1076 | - |
|
| 1077 | - |
|
| 1078 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1079 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1080 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1081 | - |
|
| 1082 | - if ($fix) {
|
|
| 1083 | - if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it
|
|
| 1084 | - if ($wpdb->query("DROP TABLE IF EXISTS $table")) {
|
|
| 1085 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1086 | - } else {
|
|
| 1087 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";
|
|
| 1088 | - } |
|
| 1089 | - |
|
| 1090 | - } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original
|
|
| 1091 | - if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {
|
|
| 1092 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1093 | - } else {
|
|
| 1094 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1095 | - } |
|
| 1096 | - if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1097 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1098 | - } else {
|
|
| 1099 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1100 | - } |
|
| 1101 | - } else {// else rename the original table to _ms_bak
|
|
| 1102 | - if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1103 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1104 | - } else {
|
|
| 1105 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1106 | - } |
|
| 1107 | - } |
|
| 1108 | - } |
|
| 1109 | - |
|
| 1110 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1111 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1112 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1113 | - |
|
| 1114 | - if ($fix) {
|
|
| 1115 | - // if original table exists but new does not, rename |
|
| 1116 | - if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1117 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1118 | - } else {
|
|
| 1119 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1120 | - } |
|
| 1121 | - |
|
| 1122 | - } |
|
| 1123 | - |
|
| 1124 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1125 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1126 | - $filter_arr['is_error_during_diagnose'] = true; |
|
| 1127 | - |
|
| 1128 | - if ($fix) {
|
|
| 1129 | - // if original table does not exist try deleting db_vers of all addons so the initial db_install scripts run; |
|
| 1130 | - delete_option('geodirlocation_db_version');
|
|
| 1131 | - delete_option('geodirevents_db_version');
|
|
| 1132 | - delete_option('geodir_reviewrating_db_version');
|
|
| 1133 | - delete_option('gdevents_db_version');
|
|
| 1134 | - delete_option('geodirectory_db_version');
|
|
| 1135 | - delete_option('geodirclaim_db_version');
|
|
| 1136 | - delete_option('geodir_custom_posts_db_version');
|
|
| 1137 | - delete_option('geodir_reviewratings_db_version');
|
|
| 1138 | - delete_option('geodiradvancesearch_db_version');
|
|
| 1139 | - $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";
|
|
| 1140 | - } |
|
| 1141 | - |
|
| 1142 | - } else {
|
|
| 1143 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1144 | - } |
|
| 1145 | - return $filter_arr; |
|
| 1025 | + global $wpdb; |
|
| 1026 | + //$filter_arr['output_str'] .='###'.$table.'###'; |
|
| 1027 | + if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {
|
|
| 1028 | + $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";
|
|
| 1029 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1030 | + |
|
| 1031 | + } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1032 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1033 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1034 | + $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";
|
|
| 1035 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1036 | + |
|
| 1037 | + if ($fix) {
|
|
| 1038 | + $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count
|
|
| 1039 | + $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count
|
|
| 1040 | + |
|
| 1041 | + if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2
|
|
| 1042 | + //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;
|
|
| 1043 | + |
|
| 1044 | + $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table
|
|
| 1045 | + |
|
| 1046 | + if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1047 | + $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";
|
|
| 1048 | + } else {
|
|
| 1049 | + $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1050 | + } |
|
| 1051 | + |
|
| 1052 | + } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it
|
|
| 1053 | + |
|
| 1054 | + $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2
|
|
| 1055 | + $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table
|
|
| 1056 | + |
|
| 1057 | + if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1058 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1059 | + } else {
|
|
| 1060 | + $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1061 | + } |
|
| 1062 | + |
|
| 1063 | + } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors
|
|
| 1064 | + |
|
| 1065 | + $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2
|
|
| 1066 | + |
|
| 1067 | + if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1068 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";
|
|
| 1069 | + } else {
|
|
| 1070 | + $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1071 | + } |
|
| 1072 | + |
|
| 1073 | + } |
|
| 1074 | + |
|
| 1075 | + } |
|
| 1076 | + |
|
| 1077 | + |
|
| 1078 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1079 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1080 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1081 | + |
|
| 1082 | + if ($fix) {
|
|
| 1083 | + if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it
|
|
| 1084 | + if ($wpdb->query("DROP TABLE IF EXISTS $table")) {
|
|
| 1085 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1086 | + } else {
|
|
| 1087 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";
|
|
| 1088 | + } |
|
| 1089 | + |
|
| 1090 | + } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original
|
|
| 1091 | + if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {
|
|
| 1092 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1093 | + } else {
|
|
| 1094 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1095 | + } |
|
| 1096 | + if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1097 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1098 | + } else {
|
|
| 1099 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1100 | + } |
|
| 1101 | + } else {// else rename the original table to _ms_bak
|
|
| 1102 | + if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1103 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1104 | + } else {
|
|
| 1105 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1106 | + } |
|
| 1107 | + } |
|
| 1108 | + } |
|
| 1109 | + |
|
| 1110 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1111 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1112 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1113 | + |
|
| 1114 | + if ($fix) {
|
|
| 1115 | + // if original table exists but new does not, rename |
|
| 1116 | + if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1117 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1118 | + } else {
|
|
| 1119 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1120 | + } |
|
| 1121 | + |
|
| 1122 | + } |
|
| 1123 | + |
|
| 1124 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1125 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1126 | + $filter_arr['is_error_during_diagnose'] = true; |
|
| 1127 | + |
|
| 1128 | + if ($fix) {
|
|
| 1129 | + // if original table does not exist try deleting db_vers of all addons so the initial db_install scripts run; |
|
| 1130 | + delete_option('geodirlocation_db_version');
|
|
| 1131 | + delete_option('geodirevents_db_version');
|
|
| 1132 | + delete_option('geodir_reviewrating_db_version');
|
|
| 1133 | + delete_option('gdevents_db_version');
|
|
| 1134 | + delete_option('geodirectory_db_version');
|
|
| 1135 | + delete_option('geodirclaim_db_version');
|
|
| 1136 | + delete_option('geodir_custom_posts_db_version');
|
|
| 1137 | + delete_option('geodir_reviewratings_db_version');
|
|
| 1138 | + delete_option('geodiradvancesearch_db_version');
|
|
| 1139 | + $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";
|
|
| 1140 | + } |
|
| 1141 | + |
|
| 1142 | + } else {
|
|
| 1143 | + $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1144 | + } |
|
| 1145 | + return $filter_arr; |
|
| 1146 | 1146 | } |
| 1147 | 1147 | |
| 1148 | 1148 | |
@@ -1156,111 +1156,111 @@ discard block |
||
| 1156 | 1156 | */ |
| 1157 | 1157 | function geodir_diagnose_tags_sync() |
| 1158 | 1158 | {
|
| 1159 | - global $wpdb, $plugin_prefix; |
|
| 1160 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1161 | - $step = isset($_POST['step']) ? strip_tags(esc_sql($_POST['step'])) : 0; |
|
| 1162 | - $step_max_items = geodir_get_diagnose_step_max_items(); |
|
| 1163 | - $offset = (int) $step * $step_max_items; |
|
| 1164 | - $ptype = isset($_POST['ptype']) ? strip_tags(esc_sql($_POST['ptype'])) : false; |
|
| 1165 | - |
|
| 1166 | - $total_listings = geodir_total_listings_count(); |
|
| 1167 | - $total_ptype_listings = 0; |
|
| 1168 | - if ($ptype) {
|
|
| 1169 | - $total_ptype_listings = geodir_total_listings_count($ptype); |
|
| 1170 | - } |
|
| 1171 | - $max_step = ceil($total_ptype_listings / $step_max_items) - 1; |
|
| 1159 | + global $wpdb, $plugin_prefix; |
|
| 1160 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1161 | + $step = isset($_POST['step']) ? strip_tags(esc_sql($_POST['step'])) : 0; |
|
| 1162 | + $step_max_items = geodir_get_diagnose_step_max_items(); |
|
| 1163 | + $offset = (int) $step * $step_max_items; |
|
| 1164 | + $ptype = isset($_POST['ptype']) ? strip_tags(esc_sql($_POST['ptype'])) : false; |
|
| 1165 | + |
|
| 1166 | + $total_listings = geodir_total_listings_count(); |
|
| 1167 | + $total_ptype_listings = 0; |
|
| 1168 | + if ($ptype) {
|
|
| 1169 | + $total_ptype_listings = geodir_total_listings_count($ptype); |
|
| 1170 | + } |
|
| 1171 | + $max_step = ceil($total_ptype_listings / $step_max_items) - 1; |
|
| 1172 | 1172 | |
| 1173 | - //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1174 | - $is_error_during_diagnose = false; |
|
| 1175 | - $output_str = ''; |
|
| 1173 | + //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1174 | + $is_error_during_diagnose = false; |
|
| 1175 | + $output_str = ''; |
|
| 1176 | 1176 | |
| 1177 | - if ($ptype && !empty($ptype) && $total_listings > $step_max_items) {
|
|
| 1178 | - $stepped_process = true; |
|
| 1179 | - } else {
|
|
| 1180 | - $stepped_process = false; |
|
| 1181 | - } |
|
| 1182 | - |
|
| 1183 | - if ($stepped_process) {
|
|
| 1184 | - $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset ); |
|
| 1185 | - $posts = $wpdb->get_results( $sql ); |
|
| 1186 | - |
|
| 1187 | - if (!empty($posts)) {
|
|
| 1188 | - |
|
| 1189 | - foreach ($posts as $p) {
|
|
| 1190 | - $p->post_type = $ptype; |
|
| 1191 | - $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1192 | - if (empty($raw_tags)) {
|
|
| 1193 | - $post_tags = ''; |
|
| 1194 | - } else {
|
|
| 1195 | - $post_tags = implode(",", $raw_tags);
|
|
| 1196 | - } |
|
| 1197 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1198 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1199 | - |
|
| 1200 | - } |
|
| 1201 | - if ($step >= $max_step) {
|
|
| 1202 | - $output_str = "done"; |
|
| 1203 | - } else {
|
|
| 1204 | - $output_str = $step + 1; |
|
| 1205 | - } |
|
| 1206 | - } |
|
| 1207 | - |
|
| 1208 | - } else {
|
|
| 1209 | - $all_postypes = geodir_get_posttypes(); |
|
| 1210 | - |
|
| 1211 | - if (!empty($all_postypes)) {
|
|
| 1212 | - foreach ($all_postypes as $key) {
|
|
| 1213 | - // update each GD CPT |
|
| 1214 | - $posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail"); |
|
| 1215 | - |
|
| 1216 | - if (!empty($posts)) {
|
|
| 1217 | - |
|
| 1218 | - foreach ($posts as $p) {
|
|
| 1219 | - $p->post_type = $key; |
|
| 1220 | - $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1221 | - if (empty($raw_tags)) {
|
|
| 1222 | - $post_tags = ''; |
|
| 1223 | - } else {
|
|
| 1224 | - $post_tags = implode(",", $raw_tags);
|
|
| 1225 | - } |
|
| 1226 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1227 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1228 | - |
|
| 1229 | - } |
|
| 1230 | - $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1231 | - } |
|
| 1232 | - |
|
| 1233 | - } |
|
| 1234 | - |
|
| 1235 | - } |
|
| 1236 | - } |
|
| 1237 | - |
|
| 1238 | - |
|
| 1239 | - if ($is_error_during_diagnose) {
|
|
| 1240 | - $info_div_class = "geodir_problem_info"; |
|
| 1241 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1242 | - } else {
|
|
| 1243 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1244 | - $fix_button_txt = ''; |
|
| 1245 | - } |
|
| 1246 | - |
|
| 1247 | - if ($stepped_process) {
|
|
| 1248 | - $percent = ($step/$max_step) * 100; |
|
| 1249 | - if ($output_str == 'done') {
|
|
| 1250 | - echo $output_str; |
|
| 1251 | - } else {
|
|
| 1252 | - $output = array( |
|
| 1253 | - 'step' => $output_str, |
|
| 1254 | - 'percent' => $percent |
|
| 1255 | - ); |
|
| 1256 | - echo json_encode($output); |
|
| 1257 | - } |
|
| 1258 | - } else {
|
|
| 1259 | - echo "<ul class='$info_div_class'>"; |
|
| 1260 | - echo $output_str; |
|
| 1261 | - echo $fix_button_txt; |
|
| 1262 | - echo "</ul>"; |
|
| 1263 | - } |
|
| 1177 | + if ($ptype && !empty($ptype) && $total_listings > $step_max_items) {
|
|
| 1178 | + $stepped_process = true; |
|
| 1179 | + } else {
|
|
| 1180 | + $stepped_process = false; |
|
| 1181 | + } |
|
| 1182 | + |
|
| 1183 | + if ($stepped_process) {
|
|
| 1184 | + $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset ); |
|
| 1185 | + $posts = $wpdb->get_results( $sql ); |
|
| 1186 | + |
|
| 1187 | + if (!empty($posts)) {
|
|
| 1188 | + |
|
| 1189 | + foreach ($posts as $p) {
|
|
| 1190 | + $p->post_type = $ptype; |
|
| 1191 | + $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1192 | + if (empty($raw_tags)) {
|
|
| 1193 | + $post_tags = ''; |
|
| 1194 | + } else {
|
|
| 1195 | + $post_tags = implode(",", $raw_tags);
|
|
| 1196 | + } |
|
| 1197 | + $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1198 | + $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1199 | + |
|
| 1200 | + } |
|
| 1201 | + if ($step >= $max_step) {
|
|
| 1202 | + $output_str = "done"; |
|
| 1203 | + } else {
|
|
| 1204 | + $output_str = $step + 1; |
|
| 1205 | + } |
|
| 1206 | + } |
|
| 1207 | + |
|
| 1208 | + } else {
|
|
| 1209 | + $all_postypes = geodir_get_posttypes(); |
|
| 1210 | + |
|
| 1211 | + if (!empty($all_postypes)) {
|
|
| 1212 | + foreach ($all_postypes as $key) {
|
|
| 1213 | + // update each GD CPT |
|
| 1214 | + $posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail"); |
|
| 1215 | + |
|
| 1216 | + if (!empty($posts)) {
|
|
| 1217 | + |
|
| 1218 | + foreach ($posts as $p) {
|
|
| 1219 | + $p->post_type = $key; |
|
| 1220 | + $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1221 | + if (empty($raw_tags)) {
|
|
| 1222 | + $post_tags = ''; |
|
| 1223 | + } else {
|
|
| 1224 | + $post_tags = implode(",", $raw_tags);
|
|
| 1225 | + } |
|
| 1226 | + $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1227 | + $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1228 | + |
|
| 1229 | + } |
|
| 1230 | + $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1231 | + } |
|
| 1232 | + |
|
| 1233 | + } |
|
| 1234 | + |
|
| 1235 | + } |
|
| 1236 | + } |
|
| 1237 | + |
|
| 1238 | + |
|
| 1239 | + if ($is_error_during_diagnose) {
|
|
| 1240 | + $info_div_class = "geodir_problem_info"; |
|
| 1241 | + $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1242 | + } else {
|
|
| 1243 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1244 | + $fix_button_txt = ''; |
|
| 1245 | + } |
|
| 1246 | + |
|
| 1247 | + if ($stepped_process) {
|
|
| 1248 | + $percent = ($step/$max_step) * 100; |
|
| 1249 | + if ($output_str == 'done') {
|
|
| 1250 | + echo $output_str; |
|
| 1251 | + } else {
|
|
| 1252 | + $output = array( |
|
| 1253 | + 'step' => $output_str, |
|
| 1254 | + 'percent' => $percent |
|
| 1255 | + ); |
|
| 1256 | + echo json_encode($output); |
|
| 1257 | + } |
|
| 1258 | + } else {
|
|
| 1259 | + echo "<ul class='$info_div_class'>"; |
|
| 1260 | + echo $output_str; |
|
| 1261 | + echo $fix_button_txt; |
|
| 1262 | + echo "</ul>"; |
|
| 1263 | + } |
|
| 1264 | 1264 | } |
| 1265 | 1265 | |
| 1266 | 1266 | /** |
@@ -1275,75 +1275,75 @@ discard block |
||
| 1275 | 1275 | */ |
| 1276 | 1276 | function geodir_diagnose_cats_sync() |
| 1277 | 1277 | {
|
| 1278 | - global $wpdb, $plugin_prefix; |
|
| 1279 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1278 | + global $wpdb, $plugin_prefix; |
|
| 1279 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1280 | 1280 | |
| 1281 | - //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1282 | - $is_error_during_diagnose = false; |
|
| 1283 | - $output_str = ''; |
|
| 1281 | + //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1282 | + $is_error_during_diagnose = false; |
|
| 1283 | + $output_str = ''; |
|
| 1284 | 1284 | |
| 1285 | 1285 | |
| 1286 | - $all_postypes = geodir_get_posttypes(); |
|
| 1286 | + $all_postypes = geodir_get_posttypes(); |
|
| 1287 | 1287 | |
| 1288 | - if (!empty($all_postypes)) {
|
|
| 1289 | - foreach ($all_postypes as $key) {
|
|
| 1290 | - // update each GD CTP |
|
| 1291 | - $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");
|
|
| 1288 | + if (!empty($all_postypes)) {
|
|
| 1289 | + foreach ($all_postypes as $key) {
|
|
| 1290 | + // update each GD CTP |
|
| 1291 | + $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");
|
|
| 1292 | 1292 | |
| 1293 | - if (!empty($posts)) {
|
|
| 1293 | + if (!empty($posts)) {
|
|
| 1294 | 1294 | |
| 1295 | - foreach ($posts as $p) {
|
|
| 1296 | - $p->post_type = $key; |
|
| 1297 | - $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));
|
|
| 1295 | + foreach ($posts as $p) {
|
|
| 1296 | + $p->post_type = $key; |
|
| 1297 | + $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));
|
|
| 1298 | 1298 | |
| 1299 | - if (empty($raw_cats)) {
|
|
| 1300 | - $post_categories = get_post_meta($p->post_id, 'post_categories', true); |
|
| 1299 | + if (empty($raw_cats)) {
|
|
| 1300 | + $post_categories = get_post_meta($p->post_id, 'post_categories', true); |
|
| 1301 | 1301 | |
| 1302 | - if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {
|
|
| 1303 | - $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);
|
|
| 1304 | - foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {
|
|
| 1305 | - if (is_numeric($cat_part)) {
|
|
| 1306 | - $raw_cats[] = (int)$cat_part; |
|
| 1307 | - } |
|
| 1308 | - } |
|
| 1302 | + if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {
|
|
| 1303 | + $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);
|
|
| 1304 | + foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {
|
|
| 1305 | + if (is_numeric($cat_part)) {
|
|
| 1306 | + $raw_cats[] = (int)$cat_part; |
|
| 1307 | + } |
|
| 1308 | + } |
|
| 1309 | 1309 | |
| 1310 | - } |
|
| 1310 | + } |
|
| 1311 | 1311 | |
| 1312 | - if (!empty($raw_cats)) {
|
|
| 1313 | - $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category'); |
|
| 1312 | + if (!empty($raw_cats)) {
|
|
| 1313 | + $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category'); |
|
| 1314 | 1314 | |
| 1315 | - } |
|
| 1315 | + } |
|
| 1316 | 1316 | |
| 1317 | - } |
|
| 1317 | + } |
|
| 1318 | 1318 | |
| 1319 | 1319 | |
| 1320 | - if (empty($raw_cats)) {
|
|
| 1321 | - $post_cats = ''; |
|
| 1322 | - } else {
|
|
| 1323 | - $post_cats = ',' . implode(",", $raw_cats) . ',';
|
|
| 1324 | - } |
|
| 1325 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1326 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));
|
|
| 1327 | - } |
|
| 1320 | + if (empty($raw_cats)) {
|
|
| 1321 | + $post_cats = ''; |
|
| 1322 | + } else {
|
|
| 1323 | + $post_cats = ',' . implode(",", $raw_cats) . ',';
|
|
| 1324 | + } |
|
| 1325 | + $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1326 | + $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));
|
|
| 1327 | + } |
|
| 1328 | 1328 | |
| 1329 | - } |
|
| 1330 | - $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1329 | + } |
|
| 1330 | + $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1331 | 1331 | |
| 1332 | - } |
|
| 1332 | + } |
|
| 1333 | 1333 | |
| 1334 | - } |
|
| 1334 | + } |
|
| 1335 | 1335 | |
| 1336 | - if ($is_error_during_diagnose) {
|
|
| 1337 | - $info_div_class = "geodir_problem_info"; |
|
| 1338 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1339 | - } else {
|
|
| 1340 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1341 | - $fix_button_txt = ''; |
|
| 1342 | - } |
|
| 1343 | - echo "<ul class='$info_div_class'>"; |
|
| 1344 | - echo $output_str; |
|
| 1345 | - echo $fix_button_txt; |
|
| 1346 | - echo "</ul>"; |
|
| 1336 | + if ($is_error_during_diagnose) {
|
|
| 1337 | + $info_div_class = "geodir_problem_info"; |
|
| 1338 | + $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1339 | + } else {
|
|
| 1340 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1341 | + $fix_button_txt = ''; |
|
| 1342 | + } |
|
| 1343 | + echo "<ul class='$info_div_class'>"; |
|
| 1344 | + echo $output_str; |
|
| 1345 | + echo $fix_button_txt; |
|
| 1346 | + echo "</ul>"; |
|
| 1347 | 1347 | |
| 1348 | 1348 | } |
| 1349 | 1349 | |
@@ -1357,61 +1357,61 @@ discard block |
||
| 1357 | 1357 | */ |
| 1358 | 1358 | function geodir_diagnose_version_clear() |
| 1359 | 1359 | {
|
| 1360 | - global $wpdb, $plugin_prefix; |
|
| 1361 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1362 | - |
|
| 1363 | - //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1364 | - $is_error_during_diagnose = false; |
|
| 1365 | - $output_str = ''; |
|
| 1366 | - |
|
| 1367 | - |
|
| 1368 | - $gd_arr = array('GeoDirectory' => 'geodirectory_db_version',
|
|
| 1369 | - 'Payment Manager' => 'geodir_payments_db_version', |
|
| 1370 | - 'GeoDirectory Framework' => 'gdf_db_version', |
|
| 1371 | - 'Advanced Search' => 'geodiradvancesearch_db_version', |
|
| 1372 | - 'Review Rating Manager' => 'geodir_reviewratings_db_version', |
|
| 1373 | - 'Claim Manager' => 'geodirclaim_db_version', |
|
| 1374 | - 'CPT Manager' => 'geodir_custom_posts_db_version', |
|
| 1375 | - 'Location Manager' => 'geodirlocation_db_version', |
|
| 1376 | - 'Payment Manager' => 'geodir_payments_db_version', |
|
| 1377 | - 'Events Manager' => 'geodirevents_db_version', |
|
| 1378 | - ); |
|
| 1379 | - |
|
| 1380 | - /** |
|
| 1381 | - * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers. |
|
| 1382 | - * |
|
| 1383 | - * @since 1.0.0 |
|
| 1384 | - * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...
|
|
| 1385 | - */ |
|
| 1386 | - $ver_arr = apply_filters('geodir_db_version_name', $gd_arr);
|
|
| 1387 | - |
|
| 1388 | - if (!empty($ver_arr)) {
|
|
| 1389 | - foreach ($ver_arr as $key => $val) {
|
|
| 1390 | - if (delete_option($val)) {
|
|
| 1391 | - $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";
|
|
| 1392 | - } else {
|
|
| 1393 | - $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";
|
|
| 1394 | - } |
|
| 1395 | - |
|
| 1396 | - } |
|
| 1397 | - |
|
| 1398 | - if ($output_str) {
|
|
| 1399 | - $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";
|
|
| 1400 | - } |
|
| 1401 | - |
|
| 1402 | - } |
|
| 1403 | - |
|
| 1404 | - if ($is_error_during_diagnose) {
|
|
| 1405 | - $info_div_class = "geodir_problem_info"; |
|
| 1406 | - $fix_button_txt = ""; |
|
| 1407 | - } else {
|
|
| 1408 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1409 | - $fix_button_txt = ''; |
|
| 1410 | - } |
|
| 1411 | - echo "<ul class='$info_div_class'>"; |
|
| 1412 | - echo $output_str; |
|
| 1413 | - echo $fix_button_txt; |
|
| 1414 | - echo "</ul>"; |
|
| 1360 | + global $wpdb, $plugin_prefix; |
|
| 1361 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1362 | + |
|
| 1363 | + //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1364 | + $is_error_during_diagnose = false; |
|
| 1365 | + $output_str = ''; |
|
| 1366 | + |
|
| 1367 | + |
|
| 1368 | + $gd_arr = array('GeoDirectory' => 'geodirectory_db_version',
|
|
| 1369 | + 'Payment Manager' => 'geodir_payments_db_version', |
|
| 1370 | + 'GeoDirectory Framework' => 'gdf_db_version', |
|
| 1371 | + 'Advanced Search' => 'geodiradvancesearch_db_version', |
|
| 1372 | + 'Review Rating Manager' => 'geodir_reviewratings_db_version', |
|
| 1373 | + 'Claim Manager' => 'geodirclaim_db_version', |
|
| 1374 | + 'CPT Manager' => 'geodir_custom_posts_db_version', |
|
| 1375 | + 'Location Manager' => 'geodirlocation_db_version', |
|
| 1376 | + 'Payment Manager' => 'geodir_payments_db_version', |
|
| 1377 | + 'Events Manager' => 'geodirevents_db_version', |
|
| 1378 | + ); |
|
| 1379 | + |
|
| 1380 | + /** |
|
| 1381 | + * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers. |
|
| 1382 | + * |
|
| 1383 | + * @since 1.0.0 |
|
| 1384 | + * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...
|
|
| 1385 | + */ |
|
| 1386 | + $ver_arr = apply_filters('geodir_db_version_name', $gd_arr);
|
|
| 1387 | + |
|
| 1388 | + if (!empty($ver_arr)) {
|
|
| 1389 | + foreach ($ver_arr as $key => $val) {
|
|
| 1390 | + if (delete_option($val)) {
|
|
| 1391 | + $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";
|
|
| 1392 | + } else {
|
|
| 1393 | + $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";
|
|
| 1394 | + } |
|
| 1395 | + |
|
| 1396 | + } |
|
| 1397 | + |
|
| 1398 | + if ($output_str) {
|
|
| 1399 | + $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";
|
|
| 1400 | + } |
|
| 1401 | + |
|
| 1402 | + } |
|
| 1403 | + |
|
| 1404 | + if ($is_error_during_diagnose) {
|
|
| 1405 | + $info_div_class = "geodir_problem_info"; |
|
| 1406 | + $fix_button_txt = ""; |
|
| 1407 | + } else {
|
|
| 1408 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1409 | + $fix_button_txt = ''; |
|
| 1410 | + } |
|
| 1411 | + echo "<ul class='$info_div_class'>"; |
|
| 1412 | + echo $output_str; |
|
| 1413 | + echo $fix_button_txt; |
|
| 1414 | + echo "</ul>"; |
|
| 1415 | 1415 | |
| 1416 | 1416 | } |
| 1417 | 1417 | |
@@ -1425,59 +1425,59 @@ discard block |
||
| 1425 | 1425 | */ |
| 1426 | 1426 | function geodir_diagnose_ratings() |
| 1427 | 1427 | {
|
| 1428 | - global $wpdb; |
|
| 1429 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1430 | - |
|
| 1431 | - //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1432 | - $is_error_during_diagnose = false; |
|
| 1433 | - $output_str = ''; |
|
| 1434 | - |
|
| 1435 | - // check review locations |
|
| 1436 | - if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
|
|
| 1437 | - $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";
|
|
| 1438 | - $is_error_during_diagnose = true; |
|
| 1439 | - |
|
| 1440 | - if ($fix) {
|
|
| 1441 | - if (geodir_fix_review_location()) {
|
|
| 1442 | - $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";
|
|
| 1443 | - } else {
|
|
| 1444 | - $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1445 | - } |
|
| 1446 | - } |
|
| 1447 | - |
|
| 1448 | - } else {
|
|
| 1449 | - $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";
|
|
| 1450 | - } |
|
| 1451 | - |
|
| 1452 | - // check review content |
|
| 1453 | - if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {
|
|
| 1454 | - $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";
|
|
| 1455 | - $is_error_during_diagnose = true; |
|
| 1456 | - |
|
| 1457 | - if ($fix) {
|
|
| 1458 | - if (geodir_fix_review_content()) {
|
|
| 1459 | - $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";
|
|
| 1460 | - } else {
|
|
| 1461 | - $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1462 | - } |
|
| 1463 | - } |
|
| 1464 | - |
|
| 1465 | - } else {
|
|
| 1466 | - $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";
|
|
| 1467 | - } |
|
| 1468 | - |
|
| 1469 | - |
|
| 1470 | - if ($is_error_during_diagnose) {
|
|
| 1471 | - $info_div_class = "geodir_problem_info"; |
|
| 1472 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1473 | - } else {
|
|
| 1474 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1475 | - $fix_button_txt = ''; |
|
| 1476 | - } |
|
| 1477 | - echo "<ul class='$info_div_class'>"; |
|
| 1478 | - echo $output_str; |
|
| 1479 | - echo $fix_button_txt; |
|
| 1480 | - echo "</ul>"; |
|
| 1428 | + global $wpdb; |
|
| 1429 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1430 | + |
|
| 1431 | + //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1432 | + $is_error_during_diagnose = false; |
|
| 1433 | + $output_str = ''; |
|
| 1434 | + |
|
| 1435 | + // check review locations |
|
| 1436 | + if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
|
|
| 1437 | + $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";
|
|
| 1438 | + $is_error_during_diagnose = true; |
|
| 1439 | + |
|
| 1440 | + if ($fix) {
|
|
| 1441 | + if (geodir_fix_review_location()) {
|
|
| 1442 | + $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";
|
|
| 1443 | + } else {
|
|
| 1444 | + $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1445 | + } |
|
| 1446 | + } |
|
| 1447 | + |
|
| 1448 | + } else {
|
|
| 1449 | + $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";
|
|
| 1450 | + } |
|
| 1451 | + |
|
| 1452 | + // check review content |
|
| 1453 | + if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {
|
|
| 1454 | + $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";
|
|
| 1455 | + $is_error_during_diagnose = true; |
|
| 1456 | + |
|
| 1457 | + if ($fix) {
|
|
| 1458 | + if (geodir_fix_review_content()) {
|
|
| 1459 | + $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";
|
|
| 1460 | + } else {
|
|
| 1461 | + $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1462 | + } |
|
| 1463 | + } |
|
| 1464 | + |
|
| 1465 | + } else {
|
|
| 1466 | + $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";
|
|
| 1467 | + } |
|
| 1468 | + |
|
| 1469 | + |
|
| 1470 | + if ($is_error_during_diagnose) {
|
|
| 1471 | + $info_div_class = "geodir_problem_info"; |
|
| 1472 | + $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1473 | + } else {
|
|
| 1474 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1475 | + $fix_button_txt = ''; |
|
| 1476 | + } |
|
| 1477 | + echo "<ul class='$info_div_class'>"; |
|
| 1478 | + echo $output_str; |
|
| 1479 | + echo $fix_button_txt; |
|
| 1480 | + echo "</ul>"; |
|
| 1481 | 1481 | |
| 1482 | 1482 | } |
| 1483 | 1483 | |
@@ -1491,57 +1491,57 @@ discard block |
||
| 1491 | 1491 | */ |
| 1492 | 1492 | function geodir_diagnose_multisite_conversion() |
| 1493 | 1493 | {
|
| 1494 | - global $wpdb; |
|
| 1495 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1496 | - //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1497 | - $is_error_during_diagnose = false; |
|
| 1498 | - $output_str = ''; |
|
| 1499 | - |
|
| 1500 | - $filter_arr = array(); |
|
| 1501 | - $filter_arr['output_str'] = $output_str; |
|
| 1502 | - $filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose; |
|
| 1503 | - $table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),
|
|
| 1504 | - 'geodir_custom_fields' => __('Custom fields', 'geodirectory'),
|
|
| 1505 | - 'geodir_post_icon' => __('Post icon', 'geodirectory'),
|
|
| 1506 | - 'geodir_attachments' => __('Attachments', 'geodirectory'),
|
|
| 1507 | - 'geodir_post_review' => __('Reviews', 'geodirectory'),
|
|
| 1508 | - 'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),
|
|
| 1509 | - 'geodir_gd_place_detail' => __('Place detail', 'geodirectory')
|
|
| 1510 | - ); |
|
| 1511 | - |
|
| 1512 | - // allow other addons to hook in and add their checks |
|
| 1513 | - |
|
| 1514 | - /** |
|
| 1515 | - * Filter the array of tables. |
|
| 1516 | - * |
|
| 1517 | - * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows addons to add their DB tables to the checks. |
|
| 1518 | - * |
|
| 1519 | - * @since 1.0.0 |
|
| 1520 | - * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...
|
|
| 1521 | - */ |
|
| 1522 | - $table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);
|
|
| 1523 | - |
|
| 1524 | - foreach ($table_arr as $table => $table_name) {
|
|
| 1525 | - // Diagnose table |
|
| 1526 | - $filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix); |
|
| 1527 | - } |
|
| 1528 | - |
|
| 1529 | - |
|
| 1530 | - $output_str = $filter_arr['output_str']; |
|
| 1531 | - $is_error_during_diagnose = $filter_arr['is_error_during_diagnose']; |
|
| 1532 | - |
|
| 1533 | - |
|
| 1534 | - if ($is_error_during_diagnose) {
|
|
| 1535 | - $info_div_class = "geodir_problem_info"; |
|
| 1536 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
|
|
| 1537 | - } else {
|
|
| 1538 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1539 | - $fix_button_txt = ''; |
|
| 1540 | - } |
|
| 1541 | - echo "<ul class='$info_div_class'>"; |
|
| 1542 | - echo $output_str; |
|
| 1543 | - echo $fix_button_txt; |
|
| 1544 | - echo "</ul>"; |
|
| 1494 | + global $wpdb; |
|
| 1495 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1496 | + //if($fix){echo 'true';}else{echo 'false';}
|
|
| 1497 | + $is_error_during_diagnose = false; |
|
| 1498 | + $output_str = ''; |
|
| 1499 | + |
|
| 1500 | + $filter_arr = array(); |
|
| 1501 | + $filter_arr['output_str'] = $output_str; |
|
| 1502 | + $filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose; |
|
| 1503 | + $table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),
|
|
| 1504 | + 'geodir_custom_fields' => __('Custom fields', 'geodirectory'),
|
|
| 1505 | + 'geodir_post_icon' => __('Post icon', 'geodirectory'),
|
|
| 1506 | + 'geodir_attachments' => __('Attachments', 'geodirectory'),
|
|
| 1507 | + 'geodir_post_review' => __('Reviews', 'geodirectory'),
|
|
| 1508 | + 'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),
|
|
| 1509 | + 'geodir_gd_place_detail' => __('Place detail', 'geodirectory')
|
|
| 1510 | + ); |
|
| 1511 | + |
|
| 1512 | + // allow other addons to hook in and add their checks |
|
| 1513 | + |
|
| 1514 | + /** |
|
| 1515 | + * Filter the array of tables. |
|
| 1516 | + * |
|
| 1517 | + * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows addons to add their DB tables to the checks. |
|
| 1518 | + * |
|
| 1519 | + * @since 1.0.0 |
|
| 1520 | + * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...
|
|
| 1521 | + */ |
|
| 1522 | + $table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);
|
|
| 1523 | + |
|
| 1524 | + foreach ($table_arr as $table => $table_name) {
|
|
| 1525 | + // Diagnose table |
|
| 1526 | + $filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix); |
|
| 1527 | + } |
|
| 1528 | + |
|
| 1529 | + |
|
| 1530 | + $output_str = $filter_arr['output_str']; |
|
| 1531 | + $is_error_during_diagnose = $filter_arr['is_error_during_diagnose']; |
|
| 1532 | + |
|
| 1533 | + |
|
| 1534 | + if ($is_error_during_diagnose) {
|
|
| 1535 | + $info_div_class = "geodir_problem_info"; |
|
| 1536 | + $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
|
|
| 1537 | + } else {
|
|
| 1538 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1539 | + $fix_button_txt = ''; |
|
| 1540 | + } |
|
| 1541 | + echo "<ul class='$info_div_class'>"; |
|
| 1542 | + echo $output_str; |
|
| 1543 | + echo $fix_button_txt; |
|
| 1544 | + echo "</ul>"; |
|
| 1545 | 1545 | } |
| 1546 | 1546 | |
| 1547 | 1547 | /** |
@@ -1559,39 +1559,39 @@ discard block |
||
| 1559 | 1559 | */ |
| 1560 | 1560 | function geodir_fix_virtual_page($slug, $page_title, $old_id, $option) |
| 1561 | 1561 | {
|
| 1562 | - global $wpdb, $current_user; |
|
| 1563 | - |
|
| 1564 | - if (!empty($old_id)) {
|
|
| 1565 | - wp_delete_post($old_id, true); |
|
| 1566 | - }//delete post if already there |
|
| 1567 | - else {
|
|
| 1568 | - $page_found = $wpdb->get_var( |
|
| 1569 | - $wpdb->prepare( |
|
| 1570 | - "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 1571 | - array($slug) |
|
| 1572 | - ) |
|
| 1573 | - ); |
|
| 1574 | - wp_delete_post($page_found, true); |
|
| 1575 | - |
|
| 1576 | - } |
|
| 1577 | - |
|
| 1578 | - $page_data = array( |
|
| 1579 | - 'post_status' => 'publish', |
|
| 1580 | - 'post_type' => 'page', |
|
| 1581 | - 'post_author' => $current_user->ID, |
|
| 1582 | - 'post_name' => $slug, |
|
| 1583 | - 'post_title' => $page_title, |
|
| 1584 | - 'post_content' => '', |
|
| 1585 | - 'post_parent' => 0, |
|
| 1586 | - 'comment_status' => 'closed' |
|
| 1587 | - ); |
|
| 1588 | - $page_id = wp_insert_post($page_data); |
|
| 1589 | - update_option($option, $page_id); |
|
| 1590 | - if ($page_id) {
|
|
| 1591 | - return true; |
|
| 1592 | - } else {
|
|
| 1593 | - return false; |
|
| 1594 | - } |
|
| 1562 | + global $wpdb, $current_user; |
|
| 1563 | + |
|
| 1564 | + if (!empty($old_id)) {
|
|
| 1565 | + wp_delete_post($old_id, true); |
|
| 1566 | + }//delete post if already there |
|
| 1567 | + else {
|
|
| 1568 | + $page_found = $wpdb->get_var( |
|
| 1569 | + $wpdb->prepare( |
|
| 1570 | + "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 1571 | + array($slug) |
|
| 1572 | + ) |
|
| 1573 | + ); |
|
| 1574 | + wp_delete_post($page_found, true); |
|
| 1575 | + |
|
| 1576 | + } |
|
| 1577 | + |
|
| 1578 | + $page_data = array( |
|
| 1579 | + 'post_status' => 'publish', |
|
| 1580 | + 'post_type' => 'page', |
|
| 1581 | + 'post_author' => $current_user->ID, |
|
| 1582 | + 'post_name' => $slug, |
|
| 1583 | + 'post_title' => $page_title, |
|
| 1584 | + 'post_content' => '', |
|
| 1585 | + 'post_parent' => 0, |
|
| 1586 | + 'comment_status' => 'closed' |
|
| 1587 | + ); |
|
| 1588 | + $page_id = wp_insert_post($page_data); |
|
| 1589 | + update_option($option, $page_id); |
|
| 1590 | + if ($page_id) {
|
|
| 1591 | + return true; |
|
| 1592 | + } else {
|
|
| 1593 | + return false; |
|
| 1594 | + } |
|
| 1595 | 1595 | } |
| 1596 | 1596 | |
| 1597 | 1597 | /** |
@@ -1603,212 +1603,212 @@ discard block |
||
| 1603 | 1603 | */ |
| 1604 | 1604 | function geodir_diagnose_default_pages() |
| 1605 | 1605 | {
|
| 1606 | - global $wpdb; |
|
| 1607 | - $is_error_during_diagnose = false; |
|
| 1608 | - $output_str = ''; |
|
| 1609 | - $fix = isset($_POST['fix']) ? true : false; |
|
| 1610 | - |
|
| 1611 | - ////////////////////////////////// |
|
| 1612 | - /* Diagnose GD Home Page Starts */ |
|
| 1613 | - ////////////////////////////////// |
|
| 1614 | - $option_value = get_option('geodir_home_page');
|
|
| 1615 | - $page = get_post($option_value); |
|
| 1616 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1617 | - |
|
| 1618 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1619 | - $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1620 | - else {
|
|
| 1621 | - $is_error_during_diagnose = true; |
|
| 1622 | - $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1623 | - if ($fix) {
|
|
| 1624 | - if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {
|
|
| 1625 | - $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1626 | - } else {
|
|
| 1627 | - $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1628 | - } |
|
| 1629 | - } |
|
| 1630 | - } |
|
| 1631 | - |
|
| 1632 | - //////////////////////////////// |
|
| 1633 | - /* Diagnose GD Home Page Ends */ |
|
| 1634 | - //////////////////////////////// |
|
| 1635 | - |
|
| 1636 | - ////////////////////////////////// |
|
| 1637 | - /* Diagnose Add Listing Page Starts */ |
|
| 1638 | - ////////////////////////////////// |
|
| 1639 | - $option_value = get_option('geodir_add_listing_page');
|
|
| 1640 | - $page = get_post($option_value); |
|
| 1641 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1642 | - |
|
| 1643 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1644 | - $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1645 | - else {
|
|
| 1646 | - $is_error_during_diagnose = true; |
|
| 1647 | - $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1648 | - if ($fix) {
|
|
| 1649 | - if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {
|
|
| 1650 | - $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1651 | - } else {
|
|
| 1652 | - $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1653 | - } |
|
| 1654 | - } |
|
| 1655 | - } |
|
| 1656 | - |
|
| 1657 | - //////////////////////////////// |
|
| 1658 | - /* Diagnose Add Listing Page Ends */ |
|
| 1659 | - //////////////////////////////// |
|
| 1660 | - |
|
| 1661 | - |
|
| 1662 | - ////////////////////////////////// |
|
| 1663 | - /* Diagnose Listing Preview Page Starts */ |
|
| 1664 | - ////////////////////////////////// |
|
| 1665 | - $option_value = get_option('geodir_preview_page');
|
|
| 1666 | - $page = get_post($option_value); |
|
| 1667 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1668 | - |
|
| 1669 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1670 | - $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1671 | - else {
|
|
| 1672 | - $is_error_during_diagnose = true; |
|
| 1673 | - $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1674 | - if ($fix) {
|
|
| 1675 | - if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {
|
|
| 1676 | - $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1677 | - } else {
|
|
| 1678 | - $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1679 | - } |
|
| 1680 | - } |
|
| 1681 | - } |
|
| 1682 | - |
|
| 1683 | - //////////////////////////////// |
|
| 1684 | - /* Diagnose Listing Preview Page Ends */ |
|
| 1685 | - //////////////////////////////// |
|
| 1686 | - |
|
| 1687 | - ////////////////////////////////// |
|
| 1688 | - /* Diagnose Listing Success Page Starts */ |
|
| 1689 | - ////////////////////////////////// |
|
| 1690 | - $option_value = get_option('geodir_success_page');
|
|
| 1691 | - $page = get_post($option_value); |
|
| 1692 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1693 | - |
|
| 1694 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1695 | - $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1696 | - else {
|
|
| 1697 | - $is_error_during_diagnose = true; |
|
| 1698 | - $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1699 | - if ($fix) {
|
|
| 1700 | - if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {
|
|
| 1701 | - $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1702 | - } else {
|
|
| 1703 | - $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1704 | - } |
|
| 1705 | - } |
|
| 1706 | - } |
|
| 1707 | - |
|
| 1708 | - //////////////////////////////// |
|
| 1709 | - /* Diagnose Listing Sucess Page Ends */ |
|
| 1710 | - //////////////////////////////// |
|
| 1711 | - |
|
| 1712 | - ////////////////////////////////// |
|
| 1713 | - /* Diagnose Info Page Starts */ |
|
| 1714 | - ////////////////////////////////// |
|
| 1715 | - $option_value = get_option('geodir_info_page');
|
|
| 1716 | - $page = get_post($option_value); |
|
| 1717 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1718 | - |
|
| 1719 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1720 | - $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1721 | - else {
|
|
| 1722 | - $is_error_during_diagnose = true; |
|
| 1723 | - $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1724 | - if ($fix) {
|
|
| 1725 | - if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {
|
|
| 1726 | - $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1727 | - } else {
|
|
| 1728 | - $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1729 | - } |
|
| 1730 | - } |
|
| 1731 | - } |
|
| 1732 | - |
|
| 1733 | - //////////////////////////////// |
|
| 1734 | - /* Diagnose Info Page Ends */ |
|
| 1735 | - //////////////////////////////// |
|
| 1736 | - |
|
| 1737 | - ////////////////////////////////// |
|
| 1738 | - /* Diagnose Login Page Starts */ |
|
| 1739 | - ////////////////////////////////// |
|
| 1740 | - $option_value = get_option('geodir_login_page');
|
|
| 1741 | - $page = get_post($option_value); |
|
| 1742 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1743 | - |
|
| 1744 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1745 | - $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1746 | - else {
|
|
| 1747 | - $is_error_during_diagnose = true; |
|
| 1748 | - $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1749 | - if ($fix) {
|
|
| 1750 | - if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {
|
|
| 1751 | - $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1752 | - } else {
|
|
| 1753 | - $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1754 | - } |
|
| 1755 | - } |
|
| 1756 | - } |
|
| 1757 | - |
|
| 1758 | - //////////////////////////////// |
|
| 1759 | - /* Diagnose Info Page Ends */ |
|
| 1760 | - //////////////////////////////// |
|
| 1761 | - |
|
| 1762 | - ////////////////////////////////// |
|
| 1763 | - /* Diagnose Location Page Starts */ |
|
| 1764 | - ////////////////////////////////// |
|
| 1765 | - $option_value = get_option('geodir_location_page');
|
|
| 1766 | - $page = get_post($option_value); |
|
| 1767 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1768 | - |
|
| 1769 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1770 | - $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1771 | - else {
|
|
| 1772 | - $is_error_during_diagnose = true; |
|
| 1773 | - $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1774 | - if ($fix) {
|
|
| 1775 | - if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {
|
|
| 1776 | - $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1777 | - } else {
|
|
| 1778 | - $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1779 | - } |
|
| 1780 | - } |
|
| 1781 | - } |
|
| 1782 | - |
|
| 1783 | - //////////////////////////////// |
|
| 1784 | - /* Diagnose Location Page Ends */ |
|
| 1785 | - //////////////////////////////// |
|
| 1786 | - |
|
| 1787 | - $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );
|
|
| 1788 | - /** |
|
| 1789 | - * This action is called at the end of the GD Tools page check function. |
|
| 1790 | - * |
|
| 1791 | - * @since 1.5.2 |
|
| 1792 | - */ |
|
| 1793 | - $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);
|
|
| 1794 | - |
|
| 1795 | - $output_str = $page_chk_arr['output_str']; |
|
| 1796 | - $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose']; |
|
| 1797 | - |
|
| 1798 | - if ($is_error_during_diagnose) {
|
|
| 1799 | - if ($fix) {
|
|
| 1800 | - flush_rewrite_rules(); |
|
| 1801 | - } |
|
| 1802 | - $info_div_class = "geodir_problem_info"; |
|
| 1803 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
|
|
| 1804 | - } else {
|
|
| 1805 | - $info_div_class = "geodir_noproblem_info"; |
|
| 1806 | - $fix_button_txt = ''; |
|
| 1807 | - } |
|
| 1808 | - echo "<ul class='$info_div_class'>"; |
|
| 1809 | - echo $output_str; |
|
| 1810 | - echo $fix_button_txt; |
|
| 1811 | - echo "</ul>"; |
|
| 1606 | + global $wpdb; |
|
| 1607 | + $is_error_during_diagnose = false; |
|
| 1608 | + $output_str = ''; |
|
| 1609 | + $fix = isset($_POST['fix']) ? true : false; |
|
| 1610 | + |
|
| 1611 | + ////////////////////////////////// |
|
| 1612 | + /* Diagnose GD Home Page Starts */ |
|
| 1613 | + ////////////////////////////////// |
|
| 1614 | + $option_value = get_option('geodir_home_page');
|
|
| 1615 | + $page = get_post($option_value); |
|
| 1616 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1617 | + |
|
| 1618 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1619 | + $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1620 | + else {
|
|
| 1621 | + $is_error_during_diagnose = true; |
|
| 1622 | + $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1623 | + if ($fix) {
|
|
| 1624 | + if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {
|
|
| 1625 | + $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1626 | + } else {
|
|
| 1627 | + $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1628 | + } |
|
| 1629 | + } |
|
| 1630 | + } |
|
| 1631 | + |
|
| 1632 | + //////////////////////////////// |
|
| 1633 | + /* Diagnose GD Home Page Ends */ |
|
| 1634 | + //////////////////////////////// |
|
| 1635 | + |
|
| 1636 | + ////////////////////////////////// |
|
| 1637 | + /* Diagnose Add Listing Page Starts */ |
|
| 1638 | + ////////////////////////////////// |
|
| 1639 | + $option_value = get_option('geodir_add_listing_page');
|
|
| 1640 | + $page = get_post($option_value); |
|
| 1641 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1642 | + |
|
| 1643 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1644 | + $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1645 | + else {
|
|
| 1646 | + $is_error_during_diagnose = true; |
|
| 1647 | + $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1648 | + if ($fix) {
|
|
| 1649 | + if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {
|
|
| 1650 | + $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1651 | + } else {
|
|
| 1652 | + $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1653 | + } |
|
| 1654 | + } |
|
| 1655 | + } |
|
| 1656 | + |
|
| 1657 | + //////////////////////////////// |
|
| 1658 | + /* Diagnose Add Listing Page Ends */ |
|
| 1659 | + //////////////////////////////// |
|
| 1660 | + |
|
| 1661 | + |
|
| 1662 | + ////////////////////////////////// |
|
| 1663 | + /* Diagnose Listing Preview Page Starts */ |
|
| 1664 | + ////////////////////////////////// |
|
| 1665 | + $option_value = get_option('geodir_preview_page');
|
|
| 1666 | + $page = get_post($option_value); |
|
| 1667 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1668 | + |
|
| 1669 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1670 | + $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1671 | + else {
|
|
| 1672 | + $is_error_during_diagnose = true; |
|
| 1673 | + $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1674 | + if ($fix) {
|
|
| 1675 | + if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {
|
|
| 1676 | + $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1677 | + } else {
|
|
| 1678 | + $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1679 | + } |
|
| 1680 | + } |
|
| 1681 | + } |
|
| 1682 | + |
|
| 1683 | + //////////////////////////////// |
|
| 1684 | + /* Diagnose Listing Preview Page Ends */ |
|
| 1685 | + //////////////////////////////// |
|
| 1686 | + |
|
| 1687 | + ////////////////////////////////// |
|
| 1688 | + /* Diagnose Listing Success Page Starts */ |
|
| 1689 | + ////////////////////////////////// |
|
| 1690 | + $option_value = get_option('geodir_success_page');
|
|
| 1691 | + $page = get_post($option_value); |
|
| 1692 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1693 | + |
|
| 1694 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1695 | + $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1696 | + else {
|
|
| 1697 | + $is_error_during_diagnose = true; |
|
| 1698 | + $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1699 | + if ($fix) {
|
|
| 1700 | + if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {
|
|
| 1701 | + $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1702 | + } else {
|
|
| 1703 | + $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1704 | + } |
|
| 1705 | + } |
|
| 1706 | + } |
|
| 1707 | + |
|
| 1708 | + //////////////////////////////// |
|
| 1709 | + /* Diagnose Listing Sucess Page Ends */ |
|
| 1710 | + //////////////////////////////// |
|
| 1711 | + |
|
| 1712 | + ////////////////////////////////// |
|
| 1713 | + /* Diagnose Info Page Starts */ |
|
| 1714 | + ////////////////////////////////// |
|
| 1715 | + $option_value = get_option('geodir_info_page');
|
|
| 1716 | + $page = get_post($option_value); |
|
| 1717 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1718 | + |
|
| 1719 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1720 | + $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1721 | + else {
|
|
| 1722 | + $is_error_during_diagnose = true; |
|
| 1723 | + $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1724 | + if ($fix) {
|
|
| 1725 | + if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {
|
|
| 1726 | + $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1727 | + } else {
|
|
| 1728 | + $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1729 | + } |
|
| 1730 | + } |
|
| 1731 | + } |
|
| 1732 | + |
|
| 1733 | + //////////////////////////////// |
|
| 1734 | + /* Diagnose Info Page Ends */ |
|
| 1735 | + //////////////////////////////// |
|
| 1736 | + |
|
| 1737 | + ////////////////////////////////// |
|
| 1738 | + /* Diagnose Login Page Starts */ |
|
| 1739 | + ////////////////////////////////// |
|
| 1740 | + $option_value = get_option('geodir_login_page');
|
|
| 1741 | + $page = get_post($option_value); |
|
| 1742 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1743 | + |
|
| 1744 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1745 | + $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1746 | + else {
|
|
| 1747 | + $is_error_during_diagnose = true; |
|
| 1748 | + $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1749 | + if ($fix) {
|
|
| 1750 | + if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {
|
|
| 1751 | + $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1752 | + } else {
|
|
| 1753 | + $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1754 | + } |
|
| 1755 | + } |
|
| 1756 | + } |
|
| 1757 | + |
|
| 1758 | + //////////////////////////////// |
|
| 1759 | + /* Diagnose Info Page Ends */ |
|
| 1760 | + //////////////////////////////// |
|
| 1761 | + |
|
| 1762 | + ////////////////////////////////// |
|
| 1763 | + /* Diagnose Location Page Starts */ |
|
| 1764 | + ////////////////////////////////// |
|
| 1765 | + $option_value = get_option('geodir_location_page');
|
|
| 1766 | + $page = get_post($option_value); |
|
| 1767 | + if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1768 | + |
|
| 1769 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1770 | + $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1771 | + else {
|
|
| 1772 | + $is_error_during_diagnose = true; |
|
| 1773 | + $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1774 | + if ($fix) {
|
|
| 1775 | + if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {
|
|
| 1776 | + $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1777 | + } else {
|
|
| 1778 | + $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1779 | + } |
|
| 1780 | + } |
|
| 1781 | + } |
|
| 1782 | + |
|
| 1783 | + //////////////////////////////// |
|
| 1784 | + /* Diagnose Location Page Ends */ |
|
| 1785 | + //////////////////////////////// |
|
| 1786 | + |
|
| 1787 | + $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );
|
|
| 1788 | + /** |
|
| 1789 | + * This action is called at the end of the GD Tools page check function. |
|
| 1790 | + * |
|
| 1791 | + * @since 1.5.2 |
|
| 1792 | + */ |
|
| 1793 | + $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);
|
|
| 1794 | + |
|
| 1795 | + $output_str = $page_chk_arr['output_str']; |
|
| 1796 | + $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose']; |
|
| 1797 | + |
|
| 1798 | + if ($is_error_during_diagnose) {
|
|
| 1799 | + if ($fix) {
|
|
| 1800 | + flush_rewrite_rules(); |
|
| 1801 | + } |
|
| 1802 | + $info_div_class = "geodir_problem_info"; |
|
| 1803 | + $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
|
|
| 1804 | + } else {
|
|
| 1805 | + $info_div_class = "geodir_noproblem_info"; |
|
| 1806 | + $fix_button_txt = ''; |
|
| 1807 | + } |
|
| 1808 | + echo "<ul class='$info_div_class'>"; |
|
| 1809 | + echo $output_str; |
|
| 1810 | + echo $fix_button_txt; |
|
| 1811 | + echo "</ul>"; |
|
| 1812 | 1812 | |
| 1813 | 1813 | } |
| 1814 | 1814 | |
@@ -1820,26 +1820,26 @@ discard block |
||
| 1820 | 1820 | * @global object $wpdb WordPress Database object. |
| 1821 | 1821 | */ |
| 1822 | 1822 | function geodir_diagnose_load_db_language() {
|
| 1823 | - global $wpdb; |
|
| 1823 | + global $wpdb; |
|
| 1824 | 1824 | |
| 1825 | 1825 | $is_error_during_diagnose = geodirectory_load_db_language(); |
| 1826 | 1826 | |
| 1827 | - $output_str = ''; |
|
| 1828 | - $fix_button_txt = ''; |
|
| 1827 | + $output_str = ''; |
|
| 1828 | + $fix_button_txt = ''; |
|
| 1829 | 1829 | |
| 1830 | - if ($is_error_during_diagnose) {
|
|
| 1831 | - $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";
|
|
| 1830 | + if ($is_error_during_diagnose) {
|
|
| 1831 | + $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";
|
|
| 1832 | 1832 | $info_div_class = "geodir_problem_info"; |
| 1833 | - } else {
|
|
| 1834 | - $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";
|
|
| 1833 | + } else {
|
|
| 1834 | + $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";
|
|
| 1835 | 1835 | $info_div_class = "geodir_noproblem_info"; |
| 1836 | - $fix_button_txt = ''; |
|
| 1837 | - } |
|
| 1836 | + $fix_button_txt = ''; |
|
| 1837 | + } |
|
| 1838 | 1838 | |
| 1839 | 1839 | echo "<ul class='$info_div_class'>"; |
| 1840 | - echo $output_str; |
|
| 1841 | - echo $fix_button_txt; |
|
| 1842 | - echo "</ul>"; |
|
| 1840 | + echo $output_str; |
|
| 1841 | + echo $fix_button_txt; |
|
| 1842 | + echo "</ul>"; |
|
| 1843 | 1843 | |
| 1844 | 1844 | } |
| 1845 | 1845 | |
@@ -1870,23 +1870,23 @@ discard block |
||
| 1870 | 1870 | */ |
| 1871 | 1871 | function geodir_posts_clauses_request($clauses) |
| 1872 | 1872 | {
|
| 1873 | - global $wpdb, $wp_query, $plugin_prefix; |
|
| 1873 | + global $wpdb, $wp_query, $plugin_prefix; |
|
| 1874 | 1874 | |
| 1875 | - if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {
|
|
| 1876 | - $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail'; |
|
| 1875 | + if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {
|
|
| 1876 | + $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail'; |
|
| 1877 | 1877 | |
| 1878 | - $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)'; |
|
| 1879 | - $clauses['join'] = $join; |
|
| 1878 | + $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)'; |
|
| 1879 | + $clauses['join'] = $join; |
|
| 1880 | 1880 | |
| 1881 | - $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : ''; |
|
| 1882 | - $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire'; |
|
| 1883 | - $clauses['fields'] = $fields; |
|
| 1881 | + $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : ''; |
|
| 1882 | + $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire'; |
|
| 1883 | + $clauses['fields'] = $fields; |
|
| 1884 | 1884 | |
| 1885 | - $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC'; |
|
| 1886 | - $orderby = 'gd_expire ' . $order; |
|
| 1887 | - $clauses['orderby'] = $orderby; |
|
| 1888 | - } |
|
| 1889 | - return $clauses; |
|
| 1885 | + $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC'; |
|
| 1886 | + $orderby = 'gd_expire ' . $order; |
|
| 1887 | + $clauses['orderby'] = $orderby; |
|
| 1888 | + } |
|
| 1889 | + return $clauses; |
|
| 1890 | 1890 | } |
| 1891 | 1891 | |
| 1892 | 1892 | |
@@ -1907,7 +1907,7 @@ discard block |
||
| 1907 | 1907 | */ |
| 1908 | 1908 | function gd_theme_switch_compat_check() |
| 1909 | 1909 | {
|
| 1910 | - gd_set_theme_compat(); |
|
| 1910 | + gd_set_theme_compat(); |
|
| 1911 | 1911 | } |
| 1912 | 1912 | |
| 1913 | 1913 | /** |
@@ -1920,27 +1920,27 @@ discard block |
||
| 1920 | 1920 | */ |
| 1921 | 1921 | function geodir_str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\") |
| 1922 | 1922 | {
|
| 1923 | - if (function_exists('str_getcsv')) {
|
|
| 1924 | - $fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape); |
|
| 1925 | - } else {
|
|
| 1926 | - global $current_user; |
|
| 1927 | - $upload_dir = wp_upload_dir(); |
|
| 1928 | - |
|
| 1929 | - $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv'; |
|
| 1930 | - $handle = fopen($file, 'w'); |
|
| 1931 | - |
|
| 1932 | - fwrite($handle, $input); |
|
| 1933 | - fclose($handle); |
|
| 1934 | - |
|
| 1935 | - $handle = fopen($file, 'rt'); |
|
| 1936 | - if (PHP_VERSION >= '5.3.0') {
|
|
| 1937 | - $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape); |
|
| 1938 | - } else {
|
|
| 1939 | - $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure); |
|
| 1940 | - } |
|
| 1941 | - fclose($handle); |
|
| 1942 | - } |
|
| 1943 | - return $fgetcsv; |
|
| 1923 | + if (function_exists('str_getcsv')) {
|
|
| 1924 | + $fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape); |
|
| 1925 | + } else {
|
|
| 1926 | + global $current_user; |
|
| 1927 | + $upload_dir = wp_upload_dir(); |
|
| 1928 | + |
|
| 1929 | + $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv'; |
|
| 1930 | + $handle = fopen($file, 'w'); |
|
| 1931 | + |
|
| 1932 | + fwrite($handle, $input); |
|
| 1933 | + fclose($handle); |
|
| 1934 | + |
|
| 1935 | + $handle = fopen($file, 'rt'); |
|
| 1936 | + if (PHP_VERSION >= '5.3.0') {
|
|
| 1937 | + $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape); |
|
| 1938 | + } else {
|
|
| 1939 | + $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure); |
|
| 1940 | + } |
|
| 1941 | + fclose($handle); |
|
| 1942 | + } |
|
| 1943 | + return $fgetcsv; |
|
| 1944 | 1944 | } |
| 1945 | 1945 | |
| 1946 | 1946 | add_action('wp_ajax_gdImportCsv', 'geodir_ajax_import_csv');
|
@@ -1955,375 +1955,375 @@ discard block |
||
| 1955 | 1955 | */ |
| 1956 | 1956 | function geodir_ajax_import_csv() |
| 1957 | 1957 | {
|
| 1958 | - error_reporting(0); // hide error to get clean json response |
|
| 1958 | + error_reporting(0); // hide error to get clean json response |
|
| 1959 | 1959 | |
| 1960 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 1961 | - $uploads = wp_upload_dir(); |
|
| 1962 | - ini_set('auto_detect_line_endings', true);
|
|
| 1960 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 1961 | + $uploads = wp_upload_dir(); |
|
| 1962 | + ini_set('auto_detect_line_endings', true);
|
|
| 1963 | 1963 | |
| 1964 | 1964 | $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses. |
| 1965 | 1965 | |
| 1966 | - $task = isset($_POST['task']) ? $_POST['task'] : ''; |
|
| 1967 | - $uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL; |
|
| 1968 | - $filename = $uploadedFile; |
|
| 1969 | - |
|
| 1970 | - $uploads = wp_upload_dir(); |
|
| 1971 | - $uploads_dir = $uploads['path']; |
|
| 1972 | - $image_name_arr = explode('/', $filename);
|
|
| 1973 | - $filename = end($image_name_arr); |
|
| 1974 | - $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1975 | - $return = array(); |
|
| 1976 | - $return['file'] = $uploadedFile; |
|
| 1977 | - $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
|
|
| 1978 | - |
|
| 1979 | - if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {
|
|
| 1980 | - $wp_filetype = wp_check_filetype_and_ext($target_path, $filename); |
|
| 1981 | - |
|
| 1982 | - if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
| 1983 | - $return['error'] = NULL; |
|
| 1984 | - |
|
| 1985 | - $return['rows'] = 0; |
|
| 1986 | - |
|
| 1987 | - |
|
| 1988 | - |
|
| 1989 | - if (($handle = fopen($target_path, "r")) !== FALSE) {
|
|
| 1990 | - while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
|
|
| 1991 | - if(is_array($data) && !empty($data)) {
|
|
| 1992 | - $file[] = '"' . implode('","', $data) . '"';
|
|
| 1993 | - } |
|
| 1994 | - } |
|
| 1995 | - fclose($handle); |
|
| 1996 | - $file = $file; |
|
| 1997 | - } |
|
| 1998 | - |
|
| 1999 | - |
|
| 2000 | - |
|
| 2001 | - $return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
| 2002 | - |
|
| 2003 | - |
|
| 2004 | - if (!$return['rows'] > 0) {
|
|
| 2005 | - $return['error'] = __('No data found in csv file.', 'geodirectory');
|
|
| 2006 | - } |
|
| 2007 | - } |
|
| 2008 | - } |
|
| 2009 | - if ($task == 'prepare' || !empty($return['error'])) {
|
|
| 2010 | - echo json_encode($return); |
|
| 2011 | - exit; |
|
| 2012 | - } |
|
| 2013 | - |
|
| 2014 | - $totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL; |
|
| 2015 | - $importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1; |
|
| 2016 | - $count = $importlimit; |
|
| 2017 | - $requested_limit = $importlimit; |
|
| 2018 | - $tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0; |
|
| 2019 | - |
|
| 2020 | - if ($count < $totRecords) {
|
|
| 2021 | - $count = $tmpCnt + $count; |
|
| 2022 | - if ($count > $totRecords) {
|
|
| 2023 | - $count = $totRecords; |
|
| 2024 | - } |
|
| 2025 | - } else {
|
|
| 2026 | - $count = $totRecords; |
|
| 2027 | - } |
|
| 2028 | - |
|
| 2029 | - $total_records = 0; |
|
| 2030 | - $rowcount = 0; |
|
| 2031 | - $address_invalid = 0; |
|
| 2032 | - $blank_address = 0; |
|
| 2033 | - $upload_files = 0; |
|
| 2034 | - $invalid_post_type = 0; |
|
| 2035 | - $invalid_title = 0; |
|
| 2036 | - $customKeyarray = array(); |
|
| 2037 | - $gd_post_info = array(); |
|
| 2038 | - $post_location = array(); |
|
| 2039 | - $countpost = 0; |
|
| 2040 | - |
|
| 2041 | - if (!empty($file)) {
|
|
| 2042 | - $columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL; |
|
| 2043 | - $customKeyarray = $columns; |
|
| 2044 | - |
|
| 2045 | - if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 2046 | - $return['error'] = CSV_INVAILD_FILE; |
|
| 2047 | - echo json_encode($return); |
|
| 2048 | - exit; |
|
| 2049 | - } |
|
| 2050 | - |
|
| 2051 | - for ($i = 1; $i <= $importlimit; $i++) {
|
|
| 2052 | - $current_index = $tmpCnt + $i; |
|
| 2053 | - if (isset($file[$current_index])) {
|
|
| 2054 | - $total_records++; |
|
| 2055 | - |
|
| 2056 | - $buffer = geodir_str_getcsv($file[$current_index]); |
|
| 2057 | - $post_title = addslashes($buffer[0]); |
|
| 2058 | - $current_post_author = $buffer[1]; |
|
| 2059 | - $post_desc = addslashes($buffer[2]); |
|
| 2060 | - $post_cat = array(); |
|
| 2061 | - $catids_arr = array(); |
|
| 2062 | - $post_cat = trim($buffer[3]); // comma seperated category name |
|
| 2063 | - |
|
| 2064 | - if ($post_cat) {
|
|
| 2065 | - $post_cat_arr = explode(',', $post_cat);
|
|
| 2066 | - |
|
| 2067 | - for ($c = 0; $c < count($post_cat_arr); $c++) {
|
|
| 2068 | - $catid = wp_kses_normalize_entities(trim($post_cat_arr[$c])); |
|
| 2069 | - |
|
| 2070 | - if (!empty($buffer[5])) {
|
|
| 2071 | - if (in_array($buffer[5], geodir_get_posttypes())) {
|
|
| 2072 | - |
|
| 2073 | - $p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5])); |
|
| 2074 | - |
|
| 2075 | - if (get_term_by('name', $catid, $p_taxonomy[0])) {
|
|
| 2076 | - $cat = get_term_by('name', $catid, $p_taxonomy[0]);
|
|
| 2077 | - $catids_arr[] = $cat->slug; |
|
| 2078 | - } else if (get_term_by('slug', $catid, $p_taxonomy[0])) {
|
|
| 2079 | - $cat = get_term_by('slug', $catid, $p_taxonomy[0]);
|
|
| 2080 | - $catids_arr[] = $cat->slug; |
|
| 2081 | - } else {
|
|
| 2082 | - $ret = wp_insert_term($catid, $p_taxonomy[0]); |
|
| 2083 | - if ($ret && !is_wp_error($ret)) {
|
|
| 2084 | - if (get_term_by('name', $catid, $p_taxonomy[0])) {
|
|
| 2085 | - $cat = get_term_by('name', $catid, $p_taxonomy[0]);
|
|
| 2086 | - $catids_arr[] = $cat->slug; |
|
| 2087 | - } elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {
|
|
| 2088 | - $cat = get_term_by('slug', $catid, $p_taxonomy[0]);
|
|
| 2089 | - $catids_arr[] = $cat->slug; |
|
| 2090 | - } |
|
| 2091 | - } |
|
| 2092 | - } |
|
| 2093 | - } |
|
| 2094 | - } |
|
| 2095 | - } |
|
| 2096 | - } |
|
| 2097 | - |
|
| 2098 | - if (!$catids_arr) {
|
|
| 2099 | - $catids_arr[] = 1; |
|
| 2100 | - } |
|
| 2101 | - |
|
| 2102 | - $post_tags = trim($buffer[4]); // comma seperated tags |
|
| 2103 | - |
|
| 2104 | - $tag_arr = ''; |
|
| 2105 | - if ($post_tags) {
|
|
| 2106 | - $tag_arr = explode(',', $post_tags);
|
|
| 2107 | - } |
|
| 2108 | - |
|
| 2109 | - $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database |
|
| 2110 | - |
|
| 2111 | - $error = ''; |
|
| 2112 | - if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {
|
|
| 2113 | - $invalid_post_type++; |
|
| 2114 | - continue; |
|
| 2115 | - } |
|
| 2116 | - |
|
| 2117 | - if ($post_title != '') {
|
|
| 2118 | - $menu_order = 0; |
|
| 2119 | - $image_folder_name = 'uplaod/'; |
|
| 2120 | - |
|
| 2121 | - $image_names = array(); |
|
| 2122 | - |
|
| 2123 | - for ($c = 5; $c < count($customKeyarray); $c++) {
|
|
| 2124 | - $gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]); |
|
| 2125 | - |
|
| 2126 | - if ($customKeyarray[$c] == 'IMAGE') {
|
|
| 2127 | - $buffer[$c] = trim($buffer[$c]); |
|
| 2128 | - |
|
| 2129 | - if (!empty($buffer[$c])) {
|
|
| 2130 | - $image_names[] = $buffer[$c]; |
|
| 2131 | - } |
|
| 2132 | - } |
|
| 2133 | - |
|
| 2134 | - if ($customKeyarray[$c] == 'alive_days') {
|
|
| 2135 | - if ($buffer[$c] != '0' && $buffer[$c] != '') {
|
|
| 2136 | - $submitdata = date('Y-m-d');
|
|
| 2137 | - |
|
| 2138 | - $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));
|
|
| 2139 | - } else {
|
|
| 2140 | - $gd_post_info['expire_date'] = 'Never'; |
|
| 2141 | - } |
|
| 2142 | - } |
|
| 2143 | - |
|
| 2144 | - if ($customKeyarray[$c] == 'post_city') {
|
|
| 2145 | - $post_city = addslashes($buffer[$c]); |
|
| 2146 | - } |
|
| 2147 | - |
|
| 2148 | - if ($customKeyarray[$c] == 'post_region') {
|
|
| 2149 | - $post_region = addslashes($buffer[$c]); |
|
| 2150 | - } |
|
| 2151 | - |
|
| 2152 | - if ($customKeyarray[$c] == 'post_country') {
|
|
| 2153 | - $post_country = addslashes($buffer[$c]); |
|
| 2154 | - } |
|
| 2155 | - |
|
| 2156 | - if ($customKeyarray[$c] == 'post_latitude') {
|
|
| 2157 | - $post_latitude = addslashes($buffer[$c]); |
|
| 2158 | - } |
|
| 2159 | - |
|
| 2160 | - if ($customKeyarray[$c] == 'post_longitude') {
|
|
| 2161 | - $post_longitude = addslashes($buffer[$c]); |
|
| 2162 | - } |
|
| 1966 | + $task = isset($_POST['task']) ? $_POST['task'] : ''; |
|
| 1967 | + $uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL; |
|
| 1968 | + $filename = $uploadedFile; |
|
| 1969 | + |
|
| 1970 | + $uploads = wp_upload_dir(); |
|
| 1971 | + $uploads_dir = $uploads['path']; |
|
| 1972 | + $image_name_arr = explode('/', $filename);
|
|
| 1973 | + $filename = end($image_name_arr); |
|
| 1974 | + $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1975 | + $return = array(); |
|
| 1976 | + $return['file'] = $uploadedFile; |
|
| 1977 | + $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
|
|
| 1978 | + |
|
| 1979 | + if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {
|
|
| 1980 | + $wp_filetype = wp_check_filetype_and_ext($target_path, $filename); |
|
| 1981 | + |
|
| 1982 | + if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
|
|
| 1983 | + $return['error'] = NULL; |
|
| 1984 | + |
|
| 1985 | + $return['rows'] = 0; |
|
| 1986 | + |
|
| 1987 | + |
|
| 1988 | + |
|
| 1989 | + if (($handle = fopen($target_path, "r")) !== FALSE) {
|
|
| 1990 | + while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
|
|
| 1991 | + if(is_array($data) && !empty($data)) {
|
|
| 1992 | + $file[] = '"' . implode('","', $data) . '"';
|
|
| 1993 | + } |
|
| 1994 | + } |
|
| 1995 | + fclose($handle); |
|
| 1996 | + $file = $file; |
|
| 1997 | + } |
|
| 1998 | + |
|
| 1999 | + |
|
| 2000 | + |
|
| 2001 | + $return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0; |
|
| 2002 | + |
|
| 2003 | + |
|
| 2004 | + if (!$return['rows'] > 0) {
|
|
| 2005 | + $return['error'] = __('No data found in csv file.', 'geodirectory');
|
|
| 2006 | + } |
|
| 2007 | + } |
|
| 2008 | + } |
|
| 2009 | + if ($task == 'prepare' || !empty($return['error'])) {
|
|
| 2010 | + echo json_encode($return); |
|
| 2011 | + exit; |
|
| 2012 | + } |
|
| 2013 | + |
|
| 2014 | + $totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL; |
|
| 2015 | + $importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1; |
|
| 2016 | + $count = $importlimit; |
|
| 2017 | + $requested_limit = $importlimit; |
|
| 2018 | + $tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0; |
|
| 2019 | + |
|
| 2020 | + if ($count < $totRecords) {
|
|
| 2021 | + $count = $tmpCnt + $count; |
|
| 2022 | + if ($count > $totRecords) {
|
|
| 2023 | + $count = $totRecords; |
|
| 2024 | + } |
|
| 2025 | + } else {
|
|
| 2026 | + $count = $totRecords; |
|
| 2027 | + } |
|
| 2028 | + |
|
| 2029 | + $total_records = 0; |
|
| 2030 | + $rowcount = 0; |
|
| 2031 | + $address_invalid = 0; |
|
| 2032 | + $blank_address = 0; |
|
| 2033 | + $upload_files = 0; |
|
| 2034 | + $invalid_post_type = 0; |
|
| 2035 | + $invalid_title = 0; |
|
| 2036 | + $customKeyarray = array(); |
|
| 2037 | + $gd_post_info = array(); |
|
| 2038 | + $post_location = array(); |
|
| 2039 | + $countpost = 0; |
|
| 2040 | + |
|
| 2041 | + if (!empty($file)) {
|
|
| 2042 | + $columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL; |
|
| 2043 | + $customKeyarray = $columns; |
|
| 2044 | + |
|
| 2045 | + if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
|
|
| 2046 | + $return['error'] = CSV_INVAILD_FILE; |
|
| 2047 | + echo json_encode($return); |
|
| 2048 | + exit; |
|
| 2049 | + } |
|
| 2050 | + |
|
| 2051 | + for ($i = 1; $i <= $importlimit; $i++) {
|
|
| 2052 | + $current_index = $tmpCnt + $i; |
|
| 2053 | + if (isset($file[$current_index])) {
|
|
| 2054 | + $total_records++; |
|
| 2055 | + |
|
| 2056 | + $buffer = geodir_str_getcsv($file[$current_index]); |
|
| 2057 | + $post_title = addslashes($buffer[0]); |
|
| 2058 | + $current_post_author = $buffer[1]; |
|
| 2059 | + $post_desc = addslashes($buffer[2]); |
|
| 2060 | + $post_cat = array(); |
|
| 2061 | + $catids_arr = array(); |
|
| 2062 | + $post_cat = trim($buffer[3]); // comma seperated category name |
|
| 2063 | + |
|
| 2064 | + if ($post_cat) {
|
|
| 2065 | + $post_cat_arr = explode(',', $post_cat);
|
|
| 2066 | + |
|
| 2067 | + for ($c = 0; $c < count($post_cat_arr); $c++) {
|
|
| 2068 | + $catid = wp_kses_normalize_entities(trim($post_cat_arr[$c])); |
|
| 2069 | + |
|
| 2070 | + if (!empty($buffer[5])) {
|
|
| 2071 | + if (in_array($buffer[5], geodir_get_posttypes())) {
|
|
| 2072 | + |
|
| 2073 | + $p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5])); |
|
| 2074 | + |
|
| 2075 | + if (get_term_by('name', $catid, $p_taxonomy[0])) {
|
|
| 2076 | + $cat = get_term_by('name', $catid, $p_taxonomy[0]);
|
|
| 2077 | + $catids_arr[] = $cat->slug; |
|
| 2078 | + } else if (get_term_by('slug', $catid, $p_taxonomy[0])) {
|
|
| 2079 | + $cat = get_term_by('slug', $catid, $p_taxonomy[0]);
|
|
| 2080 | + $catids_arr[] = $cat->slug; |
|
| 2081 | + } else {
|
|
| 2082 | + $ret = wp_insert_term($catid, $p_taxonomy[0]); |
|
| 2083 | + if ($ret && !is_wp_error($ret)) {
|
|
| 2084 | + if (get_term_by('name', $catid, $p_taxonomy[0])) {
|
|
| 2085 | + $cat = get_term_by('name', $catid, $p_taxonomy[0]);
|
|
| 2086 | + $catids_arr[] = $cat->slug; |
|
| 2087 | + } elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {
|
|
| 2088 | + $cat = get_term_by('slug', $catid, $p_taxonomy[0]);
|
|
| 2089 | + $catids_arr[] = $cat->slug; |
|
| 2090 | + } |
|
| 2091 | + } |
|
| 2092 | + } |
|
| 2093 | + } |
|
| 2094 | + } |
|
| 2095 | + } |
|
| 2096 | + } |
|
| 2097 | + |
|
| 2098 | + if (!$catids_arr) {
|
|
| 2099 | + $catids_arr[] = 1; |
|
| 2100 | + } |
|
| 2101 | + |
|
| 2102 | + $post_tags = trim($buffer[4]); // comma seperated tags |
|
| 2103 | + |
|
| 2104 | + $tag_arr = ''; |
|
| 2105 | + if ($post_tags) {
|
|
| 2106 | + $tag_arr = explode(',', $post_tags);
|
|
| 2107 | + } |
|
| 2108 | + |
|
| 2109 | + $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database |
|
| 2110 | + |
|
| 2111 | + $error = ''; |
|
| 2112 | + if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {
|
|
| 2113 | + $invalid_post_type++; |
|
| 2114 | + continue; |
|
| 2115 | + } |
|
| 2116 | + |
|
| 2117 | + if ($post_title != '') {
|
|
| 2118 | + $menu_order = 0; |
|
| 2119 | + $image_folder_name = 'uplaod/'; |
|
| 2120 | + |
|
| 2121 | + $image_names = array(); |
|
| 2122 | + |
|
| 2123 | + for ($c = 5; $c < count($customKeyarray); $c++) {
|
|
| 2124 | + $gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]); |
|
| 2125 | + |
|
| 2126 | + if ($customKeyarray[$c] == 'IMAGE') {
|
|
| 2127 | + $buffer[$c] = trim($buffer[$c]); |
|
| 2128 | + |
|
| 2129 | + if (!empty($buffer[$c])) {
|
|
| 2130 | + $image_names[] = $buffer[$c]; |
|
| 2131 | + } |
|
| 2132 | + } |
|
| 2133 | + |
|
| 2134 | + if ($customKeyarray[$c] == 'alive_days') {
|
|
| 2135 | + if ($buffer[$c] != '0' && $buffer[$c] != '') {
|
|
| 2136 | + $submitdata = date('Y-m-d');
|
|
| 2137 | + |
|
| 2138 | + $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));
|
|
| 2139 | + } else {
|
|
| 2140 | + $gd_post_info['expire_date'] = 'Never'; |
|
| 2141 | + } |
|
| 2142 | + } |
|
| 2143 | + |
|
| 2144 | + if ($customKeyarray[$c] == 'post_city') {
|
|
| 2145 | + $post_city = addslashes($buffer[$c]); |
|
| 2146 | + } |
|
| 2147 | + |
|
| 2148 | + if ($customKeyarray[$c] == 'post_region') {
|
|
| 2149 | + $post_region = addslashes($buffer[$c]); |
|
| 2150 | + } |
|
| 2151 | + |
|
| 2152 | + if ($customKeyarray[$c] == 'post_country') {
|
|
| 2153 | + $post_country = addslashes($buffer[$c]); |
|
| 2154 | + } |
|
| 2155 | + |
|
| 2156 | + if ($customKeyarray[$c] == 'post_latitude') {
|
|
| 2157 | + $post_latitude = addslashes($buffer[$c]); |
|
| 2158 | + } |
|
| 2159 | + |
|
| 2160 | + if ($customKeyarray[$c] == 'post_longitude') {
|
|
| 2161 | + $post_longitude = addslashes($buffer[$c]); |
|
| 2162 | + } |
|
| 2163 | 2163 | |
| 2164 | 2164 | // Post status |
| 2165 | 2165 | if ($customKeyarray[$c] == 'post_status') {
|
| 2166 | - $post_status = sanitize_key( $buffer[$c] ); |
|
| 2167 | - } |
|
| 2168 | - } |
|
| 2169 | - |
|
| 2170 | - /* ================ before array create ============== */ |
|
| 2171 | - $location_result = geodir_get_default_location(); |
|
| 2172 | - if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {
|
|
| 2173 | - $blank_address++; |
|
| 2174 | - continue; |
|
| 2175 | - } else if ($location_result->location_id == 0) {
|
|
| 2176 | - if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {
|
|
| 2177 | - $address_invalid++; |
|
| 2178 | - continue; |
|
| 2179 | - } |
|
| 2180 | - } |
|
| 2166 | + $post_status = sanitize_key( $buffer[$c] ); |
|
| 2167 | + } |
|
| 2168 | + } |
|
| 2169 | + |
|
| 2170 | + /* ================ before array create ============== */ |
|
| 2171 | + $location_result = geodir_get_default_location(); |
|
| 2172 | + if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {
|
|
| 2173 | + $blank_address++; |
|
| 2174 | + continue; |
|
| 2175 | + } else if ($location_result->location_id == 0) {
|
|
| 2176 | + if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {
|
|
| 2177 | + $address_invalid++; |
|
| 2178 | + continue; |
|
| 2179 | + } |
|
| 2180 | + } |
|
| 2181 | 2181 | |
| 2182 | 2182 | // Default post status |
| 2183 | 2183 | $default_status = 'publish'; |
| 2184 | 2184 | $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
| 2185 | 2185 | $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
| 2186 | 2186 | |
| 2187 | - $my_post['post_title'] = $post_title; |
|
| 2188 | - $my_post['post_content'] = $post_desc; |
|
| 2189 | - $my_post['post_type'] = addslashes($buffer[5]); |
|
| 2190 | - $my_post['post_author'] = $current_post_author; |
|
| 2191 | - $my_post['post_status'] = $post_status; |
|
| 2192 | - $my_post['post_category'] = $catids_arr; |
|
| 2193 | - $my_post['post_tags'] = $tag_arr; |
|
| 2194 | - |
|
| 2195 | - $gd_post_info['post_tags'] = $tag_arr; |
|
| 2196 | - $gd_post_info['post_title'] = $post_title; |
|
| 2197 | - $gd_post_info['post_status'] = $post_status; |
|
| 2198 | - $gd_post_info['submit_time'] = time(); |
|
| 2199 | - $gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
| 2200 | - |
|
| 2201 | - $last_postid = wp_insert_post($my_post); |
|
| 2202 | - $countpost++; |
|
| 2203 | - |
|
| 2204 | - // Check if we need to save post location as new location |
|
| 2205 | - if ($location_result->location_id > 0) {
|
|
| 2206 | - if (isset($post_city) && isset($post_region)) {
|
|
| 2207 | - $request_info['post_location'] = array( |
|
| 2208 | - 'city' => $post_city, |
|
| 2209 | - 'region' => $post_region, |
|
| 2210 | - 'country' => $post_country, |
|
| 2211 | - 'geo_lat' => $post_latitude, |
|
| 2212 | - 'geo_lng' => $post_longitude |
|
| 2213 | - ); |
|
| 2214 | - |
|
| 2215 | - $post_location_info = $request_info['post_location']; |
|
| 2216 | - if ($location_id = geodir_add_new_location($post_location_info)) |
|
| 2217 | - $post_location_id = $location_id; |
|
| 2218 | - } else {
|
|
| 2219 | - $post_location_id = 0; |
|
| 2220 | - } |
|
| 2221 | - } else {
|
|
| 2222 | - $post_location_id = 0; |
|
| 2223 | - } |
|
| 2224 | - |
|
| 2225 | - /* ------- get default package info ----- */ |
|
| 2226 | - $payment_info = array(); |
|
| 2227 | - $package_info = array(); |
|
| 2228 | - |
|
| 2229 | - $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]); |
|
| 2230 | - $package_id = ''; |
|
| 2231 | - if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {
|
|
| 2232 | - $package_id = $gd_post_info['package_id']; |
|
| 2233 | - } |
|
| 2234 | - |
|
| 2235 | - if (!empty($package_info)) {
|
|
| 2236 | - $payment_info['package_id'] = $package_info['pid']; |
|
| 2237 | - |
|
| 2238 | - if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {
|
|
| 2239 | - $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));
|
|
| 2240 | - } else {
|
|
| 2241 | - $payment_info['expire_date'] = 'Never'; |
|
| 2242 | - } |
|
| 2243 | - |
|
| 2244 | - $gd_post_info = array_merge($gd_post_info, $payment_info); |
|
| 2245 | - } |
|
| 2246 | - |
|
| 2247 | - $gd_post_info['post_location_id'] = $post_location_id; |
|
| 2248 | - |
|
| 2249 | - $post_type = get_post_type($last_postid); |
|
| 2250 | - |
|
| 2251 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2252 | - |
|
| 2253 | - geodir_save_post_info($last_postid, $gd_post_info); |
|
| 2254 | - |
|
| 2255 | - if (!empty($image_names)) {
|
|
| 2256 | - $upload_files++; |
|
| 2257 | - $menu_order = 1; |
|
| 2258 | - |
|
| 2259 | - foreach ($image_names as $image_name) {
|
|
| 2260 | - $img_name_arr = explode('.', $image_name);
|
|
| 2261 | - |
|
| 2262 | - $uploads = wp_upload_dir(); |
|
| 2263 | - $sub_dir = $uploads['subdir']; |
|
| 2264 | - |
|
| 2265 | - $arr_file_type = wp_check_filetype($image_name); |
|
| 2266 | - $uploaded_file_type = $arr_file_type['type']; |
|
| 2267 | - |
|
| 2268 | - $attachment = array(); |
|
| 2269 | - $attachment['post_id'] = $last_postid; |
|
| 2270 | - $attachment['title'] = $img_name_arr[0]; |
|
| 2271 | - $attachment['content'] = ''; |
|
| 2272 | - $attachment['file'] = $sub_dir . '/' . $image_name; |
|
| 2273 | - $attachment['mime_type'] = $uploaded_file_type; |
|
| 2274 | - $attachment['menu_order'] = $menu_order; |
|
| 2275 | - $attachment['is_featured'] = 0; |
|
| 2276 | - |
|
| 2277 | - $attachment_set = ''; |
|
| 2278 | - |
|
| 2279 | - foreach ($attachment as $key => $val) {
|
|
| 2280 | - if ($val != '') |
|
| 2281 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 2282 | - } |
|
| 2283 | - $attachment_set = trim($attachment_set, ", "); |
|
| 2284 | - |
|
| 2285 | - $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 2286 | - |
|
| 2287 | - if ($menu_order == 1) {
|
|
| 2288 | - $post_type = get_post_type($last_postid); |
|
| 2289 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));
|
|
| 2290 | - } |
|
| 2291 | - $menu_order++; |
|
| 2292 | - } |
|
| 2293 | - } |
|
| 2294 | - |
|
| 2295 | - $gd_post_info['package_id'] = $package_id; |
|
| 2296 | - |
|
| 2297 | - /** This action is documented in geodirectory-functions/post-functions.php */ |
|
| 2298 | - do_action('geodir_after_save_listing', $last_postid, $gd_post_info);
|
|
| 2299 | - |
|
| 2300 | - if (!empty($buffer[5])) {
|
|
| 2301 | - if (in_array($buffer[5], geodir_get_posttypes())) {
|
|
| 2302 | - $taxonomies = geodir_get_posttype_info(addslashes($buffer[5])); |
|
| 2303 | - wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]); |
|
| 2304 | - wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]); |
|
| 2305 | - |
|
| 2306 | - $post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : ''; |
|
| 2307 | - $post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : ''; |
|
| 2308 | - geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str); |
|
| 2309 | - } |
|
| 2310 | - } |
|
| 2311 | - } else {
|
|
| 2312 | - $invalid_title++; |
|
| 2313 | - } |
|
| 2314 | - } |
|
| 2315 | - } |
|
| 2316 | - } |
|
| 2317 | - $return['rowcount'] = $countpost; |
|
| 2318 | - $return['invalidcount'] = $address_invalid; |
|
| 2319 | - $return['blank_address'] = $blank_address; |
|
| 2320 | - $return['upload_files'] = $upload_files; |
|
| 2321 | - $return['invalid_post_type'] = $invalid_post_type; |
|
| 2322 | - $return['invalid_title'] = $invalid_title; |
|
| 2323 | - $return['total_records'] = $total_records; |
|
| 2324 | - |
|
| 2325 | - echo json_encode($return); |
|
| 2326 | - exit; |
|
| 2187 | + $my_post['post_title'] = $post_title; |
|
| 2188 | + $my_post['post_content'] = $post_desc; |
|
| 2189 | + $my_post['post_type'] = addslashes($buffer[5]); |
|
| 2190 | + $my_post['post_author'] = $current_post_author; |
|
| 2191 | + $my_post['post_status'] = $post_status; |
|
| 2192 | + $my_post['post_category'] = $catids_arr; |
|
| 2193 | + $my_post['post_tags'] = $tag_arr; |
|
| 2194 | + |
|
| 2195 | + $gd_post_info['post_tags'] = $tag_arr; |
|
| 2196 | + $gd_post_info['post_title'] = $post_title; |
|
| 2197 | + $gd_post_info['post_status'] = $post_status; |
|
| 2198 | + $gd_post_info['submit_time'] = time(); |
|
| 2199 | + $gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR']; |
|
| 2200 | + |
|
| 2201 | + $last_postid = wp_insert_post($my_post); |
|
| 2202 | + $countpost++; |
|
| 2203 | + |
|
| 2204 | + // Check if we need to save post location as new location |
|
| 2205 | + if ($location_result->location_id > 0) {
|
|
| 2206 | + if (isset($post_city) && isset($post_region)) {
|
|
| 2207 | + $request_info['post_location'] = array( |
|
| 2208 | + 'city' => $post_city, |
|
| 2209 | + 'region' => $post_region, |
|
| 2210 | + 'country' => $post_country, |
|
| 2211 | + 'geo_lat' => $post_latitude, |
|
| 2212 | + 'geo_lng' => $post_longitude |
|
| 2213 | + ); |
|
| 2214 | + |
|
| 2215 | + $post_location_info = $request_info['post_location']; |
|
| 2216 | + if ($location_id = geodir_add_new_location($post_location_info)) |
|
| 2217 | + $post_location_id = $location_id; |
|
| 2218 | + } else {
|
|
| 2219 | + $post_location_id = 0; |
|
| 2220 | + } |
|
| 2221 | + } else {
|
|
| 2222 | + $post_location_id = 0; |
|
| 2223 | + } |
|
| 2224 | + |
|
| 2225 | + /* ------- get default package info ----- */ |
|
| 2226 | + $payment_info = array(); |
|
| 2227 | + $package_info = array(); |
|
| 2228 | + |
|
| 2229 | + $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]); |
|
| 2230 | + $package_id = ''; |
|
| 2231 | + if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {
|
|
| 2232 | + $package_id = $gd_post_info['package_id']; |
|
| 2233 | + } |
|
| 2234 | + |
|
| 2235 | + if (!empty($package_info)) {
|
|
| 2236 | + $payment_info['package_id'] = $package_info['pid']; |
|
| 2237 | + |
|
| 2238 | + if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {
|
|
| 2239 | + $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));
|
|
| 2240 | + } else {
|
|
| 2241 | + $payment_info['expire_date'] = 'Never'; |
|
| 2242 | + } |
|
| 2243 | + |
|
| 2244 | + $gd_post_info = array_merge($gd_post_info, $payment_info); |
|
| 2245 | + } |
|
| 2246 | + |
|
| 2247 | + $gd_post_info['post_location_id'] = $post_location_id; |
|
| 2248 | + |
|
| 2249 | + $post_type = get_post_type($last_postid); |
|
| 2250 | + |
|
| 2251 | + $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2252 | + |
|
| 2253 | + geodir_save_post_info($last_postid, $gd_post_info); |
|
| 2254 | + |
|
| 2255 | + if (!empty($image_names)) {
|
|
| 2256 | + $upload_files++; |
|
| 2257 | + $menu_order = 1; |
|
| 2258 | + |
|
| 2259 | + foreach ($image_names as $image_name) {
|
|
| 2260 | + $img_name_arr = explode('.', $image_name);
|
|
| 2261 | + |
|
| 2262 | + $uploads = wp_upload_dir(); |
|
| 2263 | + $sub_dir = $uploads['subdir']; |
|
| 2264 | + |
|
| 2265 | + $arr_file_type = wp_check_filetype($image_name); |
|
| 2266 | + $uploaded_file_type = $arr_file_type['type']; |
|
| 2267 | + |
|
| 2268 | + $attachment = array(); |
|
| 2269 | + $attachment['post_id'] = $last_postid; |
|
| 2270 | + $attachment['title'] = $img_name_arr[0]; |
|
| 2271 | + $attachment['content'] = ''; |
|
| 2272 | + $attachment['file'] = $sub_dir . '/' . $image_name; |
|
| 2273 | + $attachment['mime_type'] = $uploaded_file_type; |
|
| 2274 | + $attachment['menu_order'] = $menu_order; |
|
| 2275 | + $attachment['is_featured'] = 0; |
|
| 2276 | + |
|
| 2277 | + $attachment_set = ''; |
|
| 2278 | + |
|
| 2279 | + foreach ($attachment as $key => $val) {
|
|
| 2280 | + if ($val != '') |
|
| 2281 | + $attachment_set .= $key . " = '" . $val . "', "; |
|
| 2282 | + } |
|
| 2283 | + $attachment_set = trim($attachment_set, ", "); |
|
| 2284 | + |
|
| 2285 | + $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 2286 | + |
|
| 2287 | + if ($menu_order == 1) {
|
|
| 2288 | + $post_type = get_post_type($last_postid); |
|
| 2289 | + $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));
|
|
| 2290 | + } |
|
| 2291 | + $menu_order++; |
|
| 2292 | + } |
|
| 2293 | + } |
|
| 2294 | + |
|
| 2295 | + $gd_post_info['package_id'] = $package_id; |
|
| 2296 | + |
|
| 2297 | + /** This action is documented in geodirectory-functions/post-functions.php */ |
|
| 2298 | + do_action('geodir_after_save_listing', $last_postid, $gd_post_info);
|
|
| 2299 | + |
|
| 2300 | + if (!empty($buffer[5])) {
|
|
| 2301 | + if (in_array($buffer[5], geodir_get_posttypes())) {
|
|
| 2302 | + $taxonomies = geodir_get_posttype_info(addslashes($buffer[5])); |
|
| 2303 | + wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]); |
|
| 2304 | + wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]); |
|
| 2305 | + |
|
| 2306 | + $post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : ''; |
|
| 2307 | + $post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : ''; |
|
| 2308 | + geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str); |
|
| 2309 | + } |
|
| 2310 | + } |
|
| 2311 | + } else {
|
|
| 2312 | + $invalid_title++; |
|
| 2313 | + } |
|
| 2314 | + } |
|
| 2315 | + } |
|
| 2316 | + } |
|
| 2317 | + $return['rowcount'] = $countpost; |
|
| 2318 | + $return['invalidcount'] = $address_invalid; |
|
| 2319 | + $return['blank_address'] = $blank_address; |
|
| 2320 | + $return['upload_files'] = $upload_files; |
|
| 2321 | + $return['invalid_post_type'] = $invalid_post_type; |
|
| 2322 | + $return['invalid_title'] = $invalid_title; |
|
| 2323 | + $return['total_records'] = $total_records; |
|
| 2324 | + |
|
| 2325 | + echo json_encode($return); |
|
| 2326 | + exit; |
|
| 2327 | 2327 | } |
| 2328 | 2328 | |
| 2329 | 2329 | // Add the tab in left sidebar menu fro import & export page. |
@@ -2343,9 +2343,9 @@ discard block |
||
| 2343 | 2343 | * @param $post object $post The post object of the post being saved. |
| 2344 | 2344 | */ |
| 2345 | 2345 | function geodir_update_location_prefix($post_id,$post){
|
| 2346 | - if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){
|
|
| 2347 | - update_option('geodir_location_prefix',$post->post_name);
|
|
| 2348 | - } |
|
| 2346 | + if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){
|
|
| 2347 | + update_option('geodir_location_prefix',$post->post_name);
|
|
| 2348 | + } |
|
| 2349 | 2349 | |
| 2350 | 2350 | } |
| 2351 | 2351 | |
@@ -2356,50 +2356,50 @@ discard block |
||
| 2356 | 2356 | function geodir_ga_callback(){
|
| 2357 | 2357 | |
| 2358 | 2358 | if(isset($_REQUEST['code']) && $_REQUEST['code']) {
|
| 2359 | - $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?"; |
|
| 2360 | - $code = "code=".$_REQUEST['code']; |
|
| 2361 | - $grant_type = "&grant_type=authorization_code"; |
|
| 2362 | - $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 2363 | - $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
| 2364 | - $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
|
|
| 2359 | + $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?"; |
|
| 2360 | + $code = "code=".$_REQUEST['code']; |
|
| 2361 | + $grant_type = "&grant_type=authorization_code"; |
|
| 2362 | + $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 2363 | + $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
|
| 2364 | + $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
|
|
| 2365 | 2365 | |
| 2366 | - $auth_url = $oAuthURL . $code . $redirect_uri . $grant_type . $client_id .$client_secret; |
|
| 2366 | + $auth_url = $oAuthURL . $code . $redirect_uri . $grant_type . $client_id .$client_secret; |
|
| 2367 | 2367 | |
| 2368 | - $response = wp_remote_post($auth_url, array('timeout' => 15));
|
|
| 2368 | + $response = wp_remote_post($auth_url, array('timeout' => 15));
|
|
| 2369 | 2369 | |
| 2370 | - //print_r($response); |
|
| 2370 | + //print_r($response); |
|
| 2371 | 2371 | |
| 2372 | - $error_msg = __('Something went wrong','geodirectory');
|
|
| 2373 | - if(!empty($response['response']['code']) && $response['response']['code']==200){
|
|
| 2372 | + $error_msg = __('Something went wrong','geodirectory');
|
|
| 2373 | + if(!empty($response['response']['code']) && $response['response']['code']==200){
|
|
| 2374 | 2374 | |
| 2375 | - $parts = json_decode($response['body']); |
|
| 2376 | - //print_r($parts); |
|
| 2377 | - if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
|
|
| 2378 | - else{
|
|
| 2375 | + $parts = json_decode($response['body']); |
|
| 2376 | + //print_r($parts); |
|
| 2377 | + if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
|
|
| 2378 | + else{
|
|
| 2379 | 2379 | |
| 2380 | - update_option('gd_ga_access_token', $parts->access_token);
|
|
| 2381 | - update_option('gd_ga_refresh_token', $parts->refresh_token);
|
|
| 2382 | - ?><script>window.close();</script><?php |
|
| 2383 | - } |
|
| 2380 | + update_option('gd_ga_access_token', $parts->access_token);
|
|
| 2381 | + update_option('gd_ga_refresh_token', $parts->refresh_token);
|
|
| 2382 | + ?><script>window.close();</script><?php |
|
| 2383 | + } |
|
| 2384 | 2384 | |
| 2385 | 2385 | |
| 2386 | - } |
|
| 2387 | - elseif(!empty($response['response']['code'])) {
|
|
| 2388 | - $parts = json_decode($response['body']); |
|
| 2386 | + } |
|
| 2387 | + elseif(!empty($response['response']['code'])) {
|
|
| 2388 | + $parts = json_decode($response['body']); |
|
| 2389 | 2389 | |
| 2390 | - if(isset($parts->error)){
|
|
| 2391 | - echo $parts->error.": ".$parts->error_description;exit; |
|
| 2392 | - }else{
|
|
| 2393 | - echo $error_msg." - #2";exit; |
|
| 2394 | - } |
|
| 2390 | + if(isset($parts->error)){
|
|
| 2391 | + echo $parts->error.": ".$parts->error_description;exit; |
|
| 2392 | + }else{
|
|
| 2393 | + echo $error_msg." - #2";exit; |
|
| 2394 | + } |
|
| 2395 | 2395 | |
| 2396 | - }else{
|
|
| 2396 | + }else{
|
|
| 2397 | 2397 | |
| 2398 | - echo $error_msg." - #3";exit; |
|
| 2398 | + echo $error_msg." - #3";exit; |
|
| 2399 | 2399 | |
| 2400 | - } |
|
| 2400 | + } |
|
| 2401 | 2401 | } |
| 2402 | - exit; |
|
| 2402 | + exit; |
|
| 2403 | 2403 | } |
| 2404 | 2404 | |
| 2405 | 2405 | if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {
|
@@ -2415,45 +2415,45 @@ discard block |
||
| 2415 | 2415 | * @return array Array of settings. |
| 2416 | 2416 | */ |
| 2417 | 2417 | function geodir_uninstall_settings($general_settings) {
|
| 2418 | - $settings = array(); |
|
| 2419 | - $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));
|
|
| 2420 | - $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));
|
|
| 2418 | + $settings = array(); |
|
| 2419 | + $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));
|
|
| 2420 | + $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));
|
|
| 2421 | 2421 | |
| 2422 | - $plugins = get_plugins(); |
|
| 2423 | - $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());
|
|
| 2422 | + $plugins = get_plugins(); |
|
| 2423 | + $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());
|
|
| 2424 | 2424 | |
| 2425 | - if (!empty($plugins) && !empty($un_plugins)) {
|
|
| 2426 | - foreach ($plugins as $plugin => $data) {
|
|
| 2427 | - $plugin_name = plugin_basename(dirname($plugin)); |
|
| 2425 | + if (!empty($plugins) && !empty($un_plugins)) {
|
|
| 2426 | + foreach ($plugins as $plugin => $data) {
|
|
| 2427 | + $plugin_name = plugin_basename(dirname($plugin)); |
|
| 2428 | 2428 | |
| 2429 | - if (in_array($plugin_name, $un_plugins)) {
|
|
| 2430 | - $settings[] = array( |
|
| 2431 | - 'type' => 'checkbox', |
|
| 2432 | - 'id' => 'geodir_un_' . $plugin_name, |
|
| 2433 | - 'name' => $data['Name'], |
|
| 2434 | - 'desc' => __('Remove all data when deleted?', 'geodirectory'),
|
|
| 2435 | - 'std' => '0' |
|
| 2436 | - ); |
|
| 2437 | - } |
|
| 2438 | - } |
|
| 2439 | - } |
|
| 2429 | + if (in_array($plugin_name, $un_plugins)) {
|
|
| 2430 | + $settings[] = array( |
|
| 2431 | + 'type' => 'checkbox', |
|
| 2432 | + 'id' => 'geodir_un_' . $plugin_name, |
|
| 2433 | + 'name' => $data['Name'], |
|
| 2434 | + 'desc' => __('Remove all data when deleted?', 'geodirectory'),
|
|
| 2435 | + 'std' => '0' |
|
| 2436 | + ); |
|
| 2437 | + } |
|
| 2438 | + } |
|
| 2439 | + } |
|
| 2440 | 2440 | |
| 2441 | - $settings[] = array('type' => 'sectionend', 'id' => 'uninstall_settings_main');
|
|
| 2441 | + $settings[] = array('type' => 'sectionend', 'id' => 'uninstall_settings_main');
|
|
| 2442 | 2442 | |
| 2443 | - /** |
|
| 2444 | - * Filter the uninstall settings array. |
|
| 2445 | - * |
|
| 2446 | - * @since 1.6.9 |
|
| 2447 | - * |
|
| 2448 | - * @param array $settings The settings array. |
|
| 2449 | - */ |
|
| 2450 | - $settings = apply_filters('geodir_uninstall_settings', $settings);
|
|
| 2443 | + /** |
|
| 2444 | + * Filter the uninstall settings array. |
|
| 2445 | + * |
|
| 2446 | + * @since 1.6.9 |
|
| 2447 | + * |
|
| 2448 | + * @param array $settings The settings array. |
|
| 2449 | + */ |
|
| 2450 | + $settings = apply_filters('geodir_uninstall_settings', $settings);
|
|
| 2451 | 2451 | |
| 2452 | - if (!empty($settings) && count($settings) > 3) {
|
|
| 2453 | - return array_merge($general_settings, $settings); |
|
| 2454 | - } |
|
| 2452 | + if (!empty($settings) && count($settings) > 3) {
|
|
| 2453 | + return array_merge($general_settings, $settings); |
|
| 2454 | + } |
|
| 2455 | 2455 | |
| 2456 | - return $general_settings; |
|
| 2456 | + return $general_settings; |
|
| 2457 | 2457 | } |
| 2458 | 2458 | add_filter('geodir_general_settings', 'geodir_uninstall_settings', 100, 1);
|
| 2459 | 2459 | |
@@ -2463,7 +2463,7 @@ discard block |
||
| 2463 | 2463 | * @since 1.6.9 |
| 2464 | 2464 | */ |
| 2465 | 2465 | function geodir_uninstall_settings_desc() {
|
| 2466 | - echo '<p class="gd-un-settings-desc">' . __('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory') . '</p>';
|
|
| 2466 | + echo '<p class="gd-un-settings-desc">' . __('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory') . '</p>';
|
|
| 2467 | 2467 | } |
| 2468 | 2468 | add_action('geodir_settings_uninstall_settings_main_start', 'geodir_uninstall_settings_desc');
|
| 2469 | 2469 | |
@@ -2479,18 +2479,18 @@ discard block |
||
| 2479 | 2479 | * @return array The settings array. |
| 2480 | 2480 | */ |
| 2481 | 2481 | function geodir_resave_settings($settings = array()) {
|
| 2482 | - if (!empty($settings) && is_array($settings)) {
|
|
| 2483 | - $c = 0; |
|
| 2482 | + if (!empty($settings) && is_array($settings)) {
|
|
| 2483 | + $c = 0; |
|
| 2484 | 2484 | |
| 2485 | - foreach ($settings as $setting) {
|
|
| 2486 | - if (!empty($setting['id']) && false !== ($value = get_option($setting['id']))) {
|
|
| 2487 | - $settings[$c]['std'] = $value; |
|
| 2488 | - } |
|
| 2489 | - $c++; |
|
| 2490 | - } |
|
| 2491 | - } |
|
| 2492 | - |
|
| 2493 | - return $settings; |
|
| 2485 | + foreach ($settings as $setting) {
|
|
| 2486 | + if (!empty($setting['id']) && false !== ($value = get_option($setting['id']))) {
|
|
| 2487 | + $settings[$c]['std'] = $value; |
|
| 2488 | + } |
|
| 2489 | + $c++; |
|
| 2490 | + } |
|
| 2491 | + } |
|
| 2492 | + |
|
| 2493 | + return $settings; |
|
| 2494 | 2494 | } |
| 2495 | 2495 | |
| 2496 | 2496 | /** |
@@ -2502,9 +2502,9 @@ discard block |
||
| 2502 | 2502 | * @return array The modified settings. |
| 2503 | 2503 | */ |
| 2504 | 2504 | function geodir_core_uninstall_settings($settings) {
|
| 2505 | - $settings[] = plugin_basename(dirname(dirname(__FILE__))); |
|
| 2505 | + $settings[] = plugin_basename(dirname(dirname(__FILE__))); |
|
| 2506 | 2506 | |
| 2507 | - return $settings; |
|
| 2507 | + return $settings; |
|
| 2508 | 2508 | } |
| 2509 | 2509 | add_filter('geodir_plugins_uninstall_settings', 'geodir_core_uninstall_settings', 10, 1);
|
| 2510 | 2510 | |
@@ -2518,34 +2518,34 @@ discard block |
||
| 2518 | 2518 | */ |
| 2519 | 2519 | function geodir_diagnose_reload_db_countries() |
| 2520 | 2520 | {
|
| 2521 | - global $wpdb, $plugin_prefix; |
|
| 2522 | - |
|
| 2523 | - $is_error_during_diagnose = false; |
|
| 2524 | - $output_str = ''; |
|
| 2525 | - |
|
| 2526 | - $delete = $wpdb->query("TRUNCATE TABLE ".GEODIR_COUNTRIES_TABLE);
|
|
| 2527 | - |
|
| 2528 | - |
|
| 2529 | - if ($delete) {
|
|
| 2530 | - $output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";
|
|
| 2531 | - ob_start(); |
|
| 2532 | - geodir_diagnose_version_clear(); |
|
| 2533 | - ob_end_clean(); |
|
| 2534 | - }else{
|
|
| 2535 | - $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";
|
|
| 2536 | - } |
|
| 2537 | - |
|
| 2538 | - if ($is_error_during_diagnose) {
|
|
| 2539 | - $info_div_class = "geodir_problem_info"; |
|
| 2540 | - $fix_button_txt = ""; |
|
| 2541 | - } else {
|
|
| 2542 | - $info_div_class = "geodir_noproblem_info"; |
|
| 2543 | - $fix_button_txt = ''; |
|
| 2544 | - } |
|
| 2545 | - echo "<ul class='$info_div_class'>"; |
|
| 2546 | - echo $output_str; |
|
| 2547 | - echo $fix_button_txt; |
|
| 2548 | - echo "</ul>"; |
|
| 2521 | + global $wpdb, $plugin_prefix; |
|
| 2522 | + |
|
| 2523 | + $is_error_during_diagnose = false; |
|
| 2524 | + $output_str = ''; |
|
| 2525 | + |
|
| 2526 | + $delete = $wpdb->query("TRUNCATE TABLE ".GEODIR_COUNTRIES_TABLE);
|
|
| 2527 | + |
|
| 2528 | + |
|
| 2529 | + if ($delete) {
|
|
| 2530 | + $output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";
|
|
| 2531 | + ob_start(); |
|
| 2532 | + geodir_diagnose_version_clear(); |
|
| 2533 | + ob_end_clean(); |
|
| 2534 | + }else{
|
|
| 2535 | + $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";
|
|
| 2536 | + } |
|
| 2537 | + |
|
| 2538 | + if ($is_error_during_diagnose) {
|
|
| 2539 | + $info_div_class = "geodir_problem_info"; |
|
| 2540 | + $fix_button_txt = ""; |
|
| 2541 | + } else {
|
|
| 2542 | + $info_div_class = "geodir_noproblem_info"; |
|
| 2543 | + $fix_button_txt = ''; |
|
| 2544 | + } |
|
| 2545 | + echo "<ul class='$info_div_class'>"; |
|
| 2546 | + echo $output_str; |
|
| 2547 | + echo $fix_button_txt; |
|
| 2548 | + echo "</ul>"; |
|
| 2549 | 2549 | } |
| 2550 | 2550 | |
| 2551 | 2551 | /** |
@@ -2558,11 +2558,11 @@ discard block |
||
| 2558 | 2558 | * @return array Filtered actions. |
| 2559 | 2559 | */ |
| 2560 | 2560 | function geodir_disable_quick_edit( $actions = array(), $row = null ) {
|
| 2561 | - if ( isset( $actions['inline hide-if-no-js'] ) ) {
|
|
| 2562 | - unset( $actions['inline hide-if-no-js'] ); |
|
| 2563 | - } |
|
| 2561 | + if ( isset( $actions['inline hide-if-no-js'] ) ) {
|
|
| 2562 | + unset( $actions['inline hide-if-no-js'] ); |
|
| 2563 | + } |
|
| 2564 | 2564 | |
| 2565 | - return $actions; |
|
| 2565 | + return $actions; |
|
| 2566 | 2566 | } |
| 2567 | 2567 | |
| 2568 | 2568 | /** |
@@ -2576,26 +2576,26 @@ discard block |
||
| 2576 | 2576 | * @global bool $gd_cpt_screen True if current scrrrn has GD post type. |
| 2577 | 2577 | */ |
| 2578 | 2578 | function geodir_check_quick_edit() {
|
| 2579 | - global $pagenow, $current_screen, $gd_cpt_screen; |
|
| 2580 | - |
|
| 2581 | - if ( ( $pagenow == 'edit.php' || $pagenow == 'edit-tags.php' ) && !empty( $current_screen->post_type ) ) {
|
|
| 2582 | - if ( empty( $gd_cpt_screen ) ) {
|
|
| 2583 | - if ( in_array( $current_screen->post_type, geodir_get_posttypes() ) ) {
|
|
| 2584 | - $gd_cpt_screen = 'y'; |
|
| 2585 | - } else {
|
|
| 2586 | - $gd_cpt_screen = 'n'; |
|
| 2587 | - } |
|
| 2588 | - } |
|
| 2589 | - |
|
| 2590 | - if ( $gd_cpt_screen == 'y' ) {
|
|
| 2591 | - if ( $pagenow == 'edit.php' ) {
|
|
| 2592 | - add_filter( 'post_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2593 | - add_filter( 'page_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2594 | - } elseif ( $pagenow == 'edit-tags.php' && !empty( $current_screen->taxonomy ) ) {
|
|
| 2595 | - add_filter( $current_screen->taxonomy . '_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2596 | - } |
|
| 2597 | - } |
|
| 2598 | - } |
|
| 2579 | + global $pagenow, $current_screen, $gd_cpt_screen; |
|
| 2580 | + |
|
| 2581 | + if ( ( $pagenow == 'edit.php' || $pagenow == 'edit-tags.php' ) && !empty( $current_screen->post_type ) ) {
|
|
| 2582 | + if ( empty( $gd_cpt_screen ) ) {
|
|
| 2583 | + if ( in_array( $current_screen->post_type, geodir_get_posttypes() ) ) {
|
|
| 2584 | + $gd_cpt_screen = 'y'; |
|
| 2585 | + } else {
|
|
| 2586 | + $gd_cpt_screen = 'n'; |
|
| 2587 | + } |
|
| 2588 | + } |
|
| 2589 | + |
|
| 2590 | + if ( $gd_cpt_screen == 'y' ) {
|
|
| 2591 | + if ( $pagenow == 'edit.php' ) {
|
|
| 2592 | + add_filter( 'post_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2593 | + add_filter( 'page_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2594 | + } elseif ( $pagenow == 'edit-tags.php' && !empty( $current_screen->taxonomy ) ) {
|
|
| 2595 | + add_filter( $current_screen->taxonomy . '_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2596 | + } |
|
| 2597 | + } |
|
| 2598 | + } |
|
| 2599 | 2599 | } |
| 2600 | 2600 | add_action( 'admin_head', 'geodir_check_quick_edit', 10 ); |
| 2601 | 2601 | |
@@ -2609,9 +2609,9 @@ discard block |
||
| 2609 | 2609 | * @return array Filtered bulk actions. |
| 2610 | 2610 | */ |
| 2611 | 2611 | function geodir_filter_bulk_actions( $actions ) {
|
| 2612 | - if ( isset( $actions['edit'] ) ) {
|
|
| 2613 | - unset( $actions['edit'] ); |
|
| 2614 | - } |
|
| 2612 | + if ( isset( $actions['edit'] ) ) {
|
|
| 2613 | + unset( $actions['edit'] ); |
|
| 2614 | + } |
|
| 2615 | 2615 | |
| 2616 | - return $actions; |
|
| 2616 | + return $actions; |
|
| 2617 | 2617 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | */ |
| 63 | 63 | function geodir_get_admin_option_form($current_tab) |
| 64 | 64 | {
|
| 65 | - geodir_admin_option_form($current_tab);// defined in admin template tags.php |
|
| 65 | + geodir_admin_option_form($current_tab); // defined in admin template tags.php |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | add_action('geodir_update_options_compatibility_settings', 'geodir_update_options_compatibility_settings');
|
| 71 | 71 | add_action('geodir_update_options_default_location_settings', 'geodir_location_form_submit');
|
| 72 | 72 | add_action('geodir_before_admin_panel', 'geodir_before_admin_panel'); // this function is in admin_functions.php
|
| 73 | -add_action('geodir_before_update_options', 'geodir_before_update_options',10,2);
|
|
| 73 | +add_action('geodir_before_update_options', 'geodir_before_update_options', 10, 2);
|
|
| 74 | 74 | |
| 75 | 75 | //add_action('geodir_before_admin_panel', 'geodir_autoinstall_admin_header');
|
| 76 | 76 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | // Disable VC editor for GD post types. |
| 101 | 101 | if (class_exists('Vc_Role_Access_Controller')) {
|
| 102 | - add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 ); |
|
| 102 | + add_filter('vc_role_access_with_post_types_can', '__return_false', 100);
|
|
| 103 | 103 | } |
| 104 | 104 | } |
| 105 | 105 | |
@@ -126,8 +126,8 @@ discard block |
||
| 126 | 126 | add_action('admin_panel_init', 'geodir_admin_list_columns', 2);
|
| 127 | 127 | |
| 128 | 128 | /* --- insert dummy post action ---*/ |
| 129 | -add_action('geodir_insert_dummy_posts', 'geodir_insert_dummy_posts', 1,3);
|
|
| 130 | -add_action('geodir_delete_dummy_posts', 'geodir_delete_dummy_posts', 1,3);
|
|
| 129 | +add_action('geodir_insert_dummy_posts', 'geodir_insert_dummy_posts', 1, 3);
|
|
| 130 | +add_action('geodir_delete_dummy_posts', 'geodir_delete_dummy_posts', 1, 3);
|
|
| 131 | 131 | |
| 132 | 132 | |
| 133 | 133 | /** |
@@ -240,9 +240,9 @@ discard block |
||
| 240 | 240 | |
| 241 | 241 | // Filter-Payment-Manager |
| 242 | 242 | |
| 243 | - add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
|
|
| 243 | + add_meta_box('geodir_post_images', $post_typename.' '.__('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
|
|
| 244 | 244 | |
| 245 | - add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
|
|
| 245 | + add_meta_box('geodir_post_info', $post_typename.' '.__('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
|
|
| 246 | 246 | |
| 247 | 247 | // no need of this box as all fields moved to main information box |
| 248 | 248 | //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );
|
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | |
| 252 | 252 | } |
| 253 | 253 | |
| 254 | -add_action('save_post', 'geodir_post_information_save',10,2);
|
|
| 254 | +add_action('save_post', 'geodir_post_information_save', 10, 2);
|
|
| 255 | 255 | |
| 256 | 256 | |
| 257 | 257 | |
@@ -278,10 +278,10 @@ discard block |
||
| 278 | 278 | |
| 279 | 279 | $gd_taxonomy = geodir_get_taxonomies($geodir_post_type); |
| 280 | 280 | |
| 281 | - if(!empty($gd_taxonomy)) {
|
|
| 281 | + if (!empty($gd_taxonomy)) {
|
|
| 282 | 282 | foreach ($gd_taxonomy as $tax) {
|
| 283 | 283 | |
| 284 | - remove_meta_box($tax . 'div', $geodir_post_type, 'normal'); |
|
| 284 | + remove_meta_box($tax.'div', $geodir_post_type, 'normal'); |
|
| 285 | 285 | |
| 286 | 286 | } |
| 287 | 287 | } |
@@ -367,14 +367,14 @@ discard block |
||
| 367 | 367 | add_action('geodir_manage_available_fields_predefined', 'geodir_manage_available_fields_predefined');
|
| 368 | 368 | add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');
|
| 369 | 369 | |
| 370 | -function geodir_manage_available_fields_predefined($sub_tab){
|
|
| 371 | - if($sub_tab=='custom_fields'){
|
|
| 370 | +function geodir_manage_available_fields_predefined($sub_tab) {
|
|
| 371 | + if ($sub_tab == 'custom_fields') {
|
|
| 372 | 372 | geodir_custom_available_fields('predefined');
|
| 373 | 373 | } |
| 374 | 374 | } |
| 375 | 375 | |
| 376 | -function geodir_manage_available_fields_custom($sub_tab){
|
|
| 377 | - if($sub_tab=='custom_fields'){
|
|
| 376 | +function geodir_manage_available_fields_custom($sub_tab) {
|
|
| 377 | + if ($sub_tab == 'custom_fields') {
|
|
| 378 | 378 | geodir_custom_available_fields('custom');
|
| 379 | 379 | } |
| 380 | 380 | } |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | global $wpdb; |
| 445 | 445 | $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
| 446 | 446 | ?> |
| 447 | - <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/> |
|
| 447 | + <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/> |
|
| 448 | 448 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/> |
| 449 | 449 | <ul> |
| 450 | 450 | <?php |
@@ -455,7 +455,7 @@ discard block |
||
| 455 | 455 | |
| 456 | 456 | $check_html_variable = $wpdb->get_var( |
| 457 | 457 | $wpdb->prepare( |
| 458 | - "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s", |
|
| 458 | + "SELECT htmlvar_name FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s", |
|
| 459 | 459 | array($val['htmlvar_name'], $listing_type, $val['field_type']) |
| 460 | 460 | ) |
| 461 | 461 | ); |
@@ -463,23 +463,23 @@ discard block |
||
| 463 | 463 | $display = $check_html_variable ? ' style="display:none;"' : ''; |
| 464 | 464 | ?> |
| 465 | 465 | |
| 466 | - <li class="gd-cf-tooltip-wrap" <?php echo $display;?>> |
|
| 466 | + <li class="gd-cf-tooltip-wrap" <?php echo $display; ?>> |
|
| 467 | 467 | <?php |
| 468 | - if(isset($val['description']) && $val['description']){
|
|
| 468 | + if (isset($val['description']) && $val['description']) {
|
|
| 469 | 469 | echo '<div class="gdcf-tooltip">'.$val['description'].'</div>'; |
| 470 | 470 | }?> |
| 471 | 471 | |
| 472 | - <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>" data-field-type="<?php echo $val['field_type'];?>" |
|
| 473 | - title="<?php echo $val['site_title'];?>" |
|
| 474 | - class="gd-draggable-form-items gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);"> |
|
| 472 | + <a id="gd-<?php echo $val['field_type']; ?>-_-<?php echo $val['htmlvar_name']; ?>" data-field-type-key="<?php echo $val['htmlvar_name']; ?>" data-field-type="<?php echo $val['field_type']; ?>" |
|
| 473 | + title="<?php echo $val['site_title']; ?>" |
|
| 474 | + class="gd-draggable-form-items gd-<?php echo $val['field_type']; ?> geodir-sort-<?php echo $val['htmlvar_name']; ?>" href="javascript:void(0);"> |
|
| 475 | 475 | <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {
|
| 476 | 476 | echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>'; |
| 477 | - }elseif(isset($val['field_icon']) && $val['field_icon'] ){
|
|
| 477 | + }elseif (isset($val['field_icon']) && $val['field_icon']) {
|
|
| 478 | 478 | echo '<b class="gd-cf-icon" style="background-image: url(\''.$val['field_icon'].'\')"></b>'; |
| 479 | - }else{
|
|
| 479 | + } else {
|
|
| 480 | 480 | echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
| 481 | 481 | }?> |
| 482 | - <?php echo (! empty( $val['admin_title'] ) ? $val['admin_title'] : $val['site_title'] );?> |
|
| 482 | + <?php echo (!empty($val['admin_title']) ? $val['admin_title'] : $val['site_title']); ?> |
|
| 483 | 483 | </a> |
| 484 | 484 | </li> |
| 485 | 485 | |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | <?php |
| 508 | 508 | global $wpdb; |
| 509 | 509 | |
| 510 | - $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
|
|
| 510 | + $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
|
|
| 511 | 511 | |
| 512 | 512 | if (!empty($fields)) {
|
| 513 | 513 | foreach ($fields as $field) {
|
@@ -532,14 +532,14 @@ discard block |
||
| 532 | 532 | * @since 1.6.9 |
| 533 | 533 | * @package GeoDirectory |
| 534 | 534 | */ |
| 535 | -function geodir_custom_fields_custom($post_type=''){
|
|
| 535 | +function geodir_custom_fields_custom($post_type = '') {
|
|
| 536 | 536 | |
| 537 | 537 | $custom_fields = array(); |
| 538 | 538 | |
| 539 | 539 | /** |
| 540 | 540 | * @see `geodir_custom_fields` |
| 541 | 541 | */ |
| 542 | - return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);
|
|
| 542 | + return apply_filters('geodir_custom_fields_custom', $custom_fields, $post_type);
|
|
| 543 | 543 | } |
| 544 | 544 | |
| 545 | 545 | |
@@ -550,7 +550,7 @@ discard block |
||
| 550 | 550 | * @since 1.6.6 |
| 551 | 551 | * @package GeoDirectory |
| 552 | 552 | */ |
| 553 | -function geodir_custom_fields($post_type=''){
|
|
| 553 | +function geodir_custom_fields($post_type = '') {
|
|
| 554 | 554 | |
| 555 | 555 | $custom_fields = array( |
| 556 | 556 | 'text' => array( |
@@ -685,7 +685,7 @@ discard block |
||
| 685 | 685 | * } |
| 686 | 686 | * @param string $post_type The post type requested. |
| 687 | 687 | */ |
| 688 | - return apply_filters('geodir_custom_fields',$custom_fields,$post_type);
|
|
| 688 | + return apply_filters('geodir_custom_fields', $custom_fields, $post_type);
|
|
| 689 | 689 | } |
| 690 | 690 | |
| 691 | 691 | /** |
@@ -696,25 +696,25 @@ discard block |
||
| 696 | 696 | * @param string $type The custom field type, predefined, custom or blank for default |
| 697 | 697 | * @package GeoDirectory |
| 698 | 698 | */ |
| 699 | -function geodir_custom_available_fields($type='') |
|
| 699 | +function geodir_custom_available_fields($type = '') |
|
| 700 | 700 | {
|
| 701 | 701 | $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place'; |
| 702 | 702 | ?> |
| 703 | - <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/> |
|
| 703 | + <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/> |
|
| 704 | 704 | <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>" /> |
| 705 | 705 | |
| 706 | 706 | <?php |
| 707 | - if($type=='predefined'){
|
|
| 707 | + if ($type == 'predefined') {
|
|
| 708 | 708 | $cfs = geodir_custom_fields_predefined($listing_type); |
| 709 | - }elseif($type=='custom'){
|
|
| 709 | + }elseif ($type == 'custom') {
|
|
| 710 | 710 | $cfs = geodir_custom_fields_custom($listing_type); |
| 711 | - }else{
|
|
| 711 | + } else {
|
|
| 712 | 712 | $cfs = geodir_custom_fields($listing_type); |
| 713 | 713 | ?> |
| 714 | 714 | <ul class="full gd-cf-tooltip-wrap"> |
| 715 | 715 | <li> |
| 716 | 716 | <div class="gdcf-tooltip"> |
| 717 | - <?php _e('This adds a section separator with a title.', 'geodirectory');?>
|
|
| 717 | + <?php _e('This adds a section separator with a title.', 'geodirectory'); ?>
|
|
| 718 | 718 | </div> |
| 719 | 719 | <a id="gt-fieldset" |
| 720 | 720 | class="gd-draggable-form-items gt-fieldset" |
@@ -725,7 +725,7 @@ discard block |
||
| 725 | 725 | |
| 726 | 726 | <i class="fa fa-long-arrow-left " aria-hidden="true"></i> |
| 727 | 727 | <i class="fa fa-long-arrow-right " aria-hidden="true"></i> |
| 728 | - <?php _e('Fieldset (section separator)', 'geodirectory');?>
|
|
| 728 | + <?php _e('Fieldset (section separator)', 'geodirectory'); ?>
|
|
| 729 | 729 | </a> |
| 730 | 730 | </li> |
| 731 | 731 | </ul> |
@@ -733,15 +733,15 @@ discard block |
||
| 733 | 733 | <?php |
| 734 | 734 | } |
| 735 | 735 | |
| 736 | - if(!empty($cfs)) {
|
|
| 736 | + if (!empty($cfs)) {
|
|
| 737 | 737 | echo '<ul>'; |
| 738 | - foreach ( $cfs as $id => $cf ) {
|
|
| 738 | + foreach ($cfs as $id => $cf) {
|
|
| 739 | 739 | ?> |
| 740 | 740 | |
| 741 | 741 | <li class="gd-cf-tooltip-wrap"> |
| 742 | 742 | <?php |
| 743 | - if ( isset( $cf['description'] ) && $cf['description'] ) {
|
|
| 744 | - echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>'; |
|
| 743 | + if (isset($cf['description']) && $cf['description']) {
|
|
| 744 | + echo '<div class="gdcf-tooltip">'.$cf['description'].'</div>'; |
|
| 745 | 745 | } ?> |
| 746 | 746 | |
| 747 | 747 | <a id="gd-<?php echo $id; ?>" |
@@ -751,10 +751,10 @@ discard block |
||
| 751 | 751 | class="gd-draggable-form-items <?php echo $cf['class']; ?>" |
| 752 | 752 | href="javascript:void(0);"> |
| 753 | 753 | |
| 754 | - <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {
|
|
| 755 | - echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>'; |
|
| 756 | - } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {
|
|
| 757 | - echo '<b class="gd-cf-icon" style="background-image: url(\'' . $cf['icon'] . '\')"></b>'; |
|
| 754 | + <?php if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {
|
|
| 755 | + echo '<i class="'.$cf['icon'].'" aria-hidden="true"></i>'; |
|
| 756 | + } elseif (isset($cf['icon']) && $cf['icon']) {
|
|
| 757 | + echo '<b class="gd-cf-icon" style="background-image: url(\''.$cf['icon'].'\')"></b>'; |
|
| 758 | 758 | } else {
|
| 759 | 759 | echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
| 760 | 760 | } ?> |
@@ -763,7 +763,7 @@ discard block |
||
| 763 | 763 | </li> |
| 764 | 764 | <?php |
| 765 | 765 | } |
| 766 | - }else{
|
|
| 766 | + } else {
|
|
| 767 | 767 | _e('There are no custom fields here yet.', 'geodirectory');
|
| 768 | 768 | } |
| 769 | 769 | ?> |
@@ -791,7 +791,7 @@ discard block |
||
| 791 | 791 | <ul class="core"> |
| 792 | 792 | <?php |
| 793 | 793 | global $wpdb; |
| 794 | - $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
|
|
| 794 | + $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
|
|
| 795 | 795 | |
| 796 | 796 | if (!empty($fields)) {
|
| 797 | 797 | foreach ($fields as $field) {
|
@@ -801,7 +801,7 @@ discard block |
||
| 801 | 801 | $field_type_key = $field->field_type_key; |
| 802 | 802 | $field_ins_upd = 'display'; |
| 803 | 803 | |
| 804 | - geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key); |
|
| 804 | + geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd, $field_type_key); |
|
| 805 | 805 | } |
| 806 | 806 | } |
| 807 | 807 | ?></ul> |
@@ -960,8 +960,8 @@ discard block |
||
| 960 | 960 | |
| 961 | 961 | if (!get_option('geodir_remove_unnecessary_fields')) {
|
| 962 | 962 | |
| 963 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
|
|
| 964 | - $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
|
|
| 963 | + if ($wpdb->get_var("SHOW COLUMNS FROM ".$plugin_prefix."gd_place_detail WHERE field = 'categories'"))
|
|
| 964 | + $wpdb->query("ALTER TABLE `".$plugin_prefix."gd_place_detail` DROP `categories`");
|
|
| 965 | 965 | |
| 966 | 966 | update_option('geodir_remove_unnecessary_fields', '1');
|
| 967 | 967 | |
@@ -990,7 +990,7 @@ discard block |
||
| 990 | 990 | case 'diagnosis' : |
| 991 | 991 | if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
|
| 992 | 992 | $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
| 993 | - call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 993 | + call_user_func('geodir_diagnose_'.$diagnose_this);
|
|
| 994 | 994 | |
| 995 | 995 | } |
| 996 | 996 | exit(); |
@@ -999,7 +999,7 @@ discard block |
||
| 999 | 999 | case 'diagnosis-fix' : |
| 1000 | 1000 | if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') |
| 1001 | 1001 | $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
| 1002 | - call_user_func('geodir_diagnose_' . $diagnose_this);
|
|
| 1002 | + call_user_func('geodir_diagnose_'.$diagnose_this);
|
|
| 1003 | 1003 | exit(); |
| 1004 | 1004 | break; |
| 1005 | 1005 | } |
@@ -1024,50 +1024,50 @@ discard block |
||
| 1024 | 1024 | {
|
| 1025 | 1025 | global $wpdb; |
| 1026 | 1026 | //$filter_arr['output_str'] .='###'.$table.'###'; |
| 1027 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {
|
|
| 1028 | - $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";
|
|
| 1027 | + if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0) {
|
|
| 1028 | + $filter_arr['output_str'] .= "<li>".__('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory')."</li>";
|
|
| 1029 | 1029 | $filter_arr['is_error_during_diagnose'] = true; |
| 1030 | 1030 | |
| 1031 | - } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1032 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1031 | + } elseif ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {
|
|
| 1032 | + $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name)."</li>";
|
|
| 1033 | 1033 | $filter_arr['is_error_during_diagnose'] = true; |
| 1034 | - $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";
|
|
| 1034 | + $filter_arr['output_str'] .= "<li>".__('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory')."</li>";
|
|
| 1035 | 1035 | $filter_arr['is_error_during_diagnose'] = true; |
| 1036 | 1036 | |
| 1037 | 1037 | if ($fix) {
|
| 1038 | - $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count
|
|
| 1039 | - $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count
|
|
| 1038 | + $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$table."_ms_bak"); // get backup table count
|
|
| 1039 | + $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table"); // get new table count
|
|
| 1040 | 1040 | |
| 1041 | 1041 | if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2
|
| 1042 | 1042 | //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;
|
| 1043 | 1043 | |
| 1044 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table
|
|
| 1044 | + $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename bak table to new table
|
|
| 1045 | 1045 | |
| 1046 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1047 | - $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";
|
|
| 1046 | + if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {
|
|
| 1047 | + $filter_arr['output_str'] .= "<li>".__('-->FIXED: Renamed and backed up the tables', 'geodirectory')."</li>";
|
|
| 1048 | 1048 | } else {
|
| 1049 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1049 | + $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";
|
|
| 1050 | 1050 | } |
| 1051 | 1051 | |
| 1052 | 1052 | } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it
|
| 1053 | 1053 | |
| 1054 | - $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2
|
|
| 1055 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table
|
|
| 1054 | + $wpdb->query("RENAME TABLE ".$wpdb->prefix."$table TO ".$table."_ms_bak2"); // rename new table to bak2
|
|
| 1055 | + $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$wpdb->prefix."$table"); // rename bak table to new table
|
|
| 1056 | 1056 | |
| 1057 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1058 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1057 | + if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1058 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table)."</li>";
|
|
| 1059 | 1059 | } else {
|
| 1060 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1060 | + $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";
|
|
| 1061 | 1061 | } |
| 1062 | 1062 | |
| 1063 | 1063 | } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors
|
| 1064 | 1064 | |
| 1065 | - $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2
|
|
| 1065 | + $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename ms_bak table to ms_bak2
|
|
| 1066 | 1066 | |
| 1067 | - if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
|
|
| 1068 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";
|
|
| 1067 | + if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {
|
|
| 1068 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table)."</li>";
|
|
| 1069 | 1069 | } else {
|
| 1070 | - $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
|
|
| 1070 | + $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";
|
|
| 1071 | 1071 | } |
| 1072 | 1072 | |
| 1073 | 1073 | } |
@@ -1075,54 +1075,54 @@ discard block |
||
| 1075 | 1075 | } |
| 1076 | 1076 | |
| 1077 | 1077 | |
| 1078 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
|
|
| 1079 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1078 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {
|
|
| 1079 | + $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name)."</li>";
|
|
| 1080 | 1080 | $filter_arr['is_error_during_diagnose'] = true; |
| 1081 | 1081 | |
| 1082 | 1082 | if ($fix) {
|
| 1083 | 1083 | if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it
|
| 1084 | 1084 | if ($wpdb->query("DROP TABLE IF EXISTS $table")) {
|
| 1085 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";
|
|
| 1085 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table)."</li>";
|
|
| 1086 | 1086 | } else {
|
| 1087 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";
|
|
| 1087 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table)."</li>";
|
|
| 1088 | 1088 | } |
| 1089 | 1089 | |
| 1090 | - } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original
|
|
| 1091 | - if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {
|
|
| 1092 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1090 | + } elseif ($wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table") == 0) {// if main table is empty but original is not, delete main and rename original
|
|
| 1091 | + if ($wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."$table")) {
|
|
| 1092 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix.$table)."</li>";
|
|
| 1093 | 1093 | } else {
|
| 1094 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
|
|
| 1094 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix.$table)."</li>";
|
|
| 1095 | 1095 | } |
| 1096 | - if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1097 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1096 | + if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1097 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
|
|
| 1098 | 1098 | } else {
|
| 1099 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1099 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
|
|
| 1100 | 1100 | } |
| 1101 | 1101 | } else {// else rename the original table to _ms_bak
|
| 1102 | - if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1103 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1102 | + if ($wpdb->query("RENAME TABLE $table TO ".$table."_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1103 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table."_ms_bak")."</li>";
|
|
| 1104 | 1104 | } else {
|
| 1105 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
|
|
| 1105 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table."_ms_bak")."</li>";
|
|
| 1106 | 1106 | } |
| 1107 | 1107 | } |
| 1108 | 1108 | } |
| 1109 | 1109 | |
| 1110 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1111 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1110 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {
|
|
| 1111 | + $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name)."</li>";
|
|
| 1112 | 1112 | $filter_arr['is_error_during_diagnose'] = true; |
| 1113 | 1113 | |
| 1114 | 1114 | if ($fix) {
|
| 1115 | 1115 | // if original table exists but new does not, rename |
| 1116 | - if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1117 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1116 | + if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
|
|
| 1117 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
|
|
| 1118 | 1118 | } else {
|
| 1119 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
|
|
| 1119 | + $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
|
|
| 1120 | 1120 | } |
| 1121 | 1121 | |
| 1122 | 1122 | } |
| 1123 | 1123 | |
| 1124 | - } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
|
|
| 1125 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1124 | + } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {
|
|
| 1125 | + $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name)."</li>";
|
|
| 1126 | 1126 | $filter_arr['is_error_during_diagnose'] = true; |
| 1127 | 1127 | |
| 1128 | 1128 | if ($fix) {
|
@@ -1136,11 +1136,11 @@ discard block |
||
| 1136 | 1136 | delete_option('geodir_custom_posts_db_version');
|
| 1137 | 1137 | delete_option('geodir_reviewratings_db_version');
|
| 1138 | 1138 | delete_option('geodiradvancesearch_db_version');
|
| 1139 | - $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";
|
|
| 1139 | + $filter_arr['output_str'] .= "<li>".__('-->TRY: Please refresh page to run table install functions', 'geodirectory')."</li>";
|
|
| 1140 | 1140 | } |
| 1141 | 1141 | |
| 1142 | 1142 | } else {
|
| 1143 | - $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";
|
|
| 1143 | + $filter_arr['output_str'] .= "<li>".sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name)."</li>";
|
|
| 1144 | 1144 | } |
| 1145 | 1145 | return $filter_arr; |
| 1146 | 1146 | } |
@@ -1181,21 +1181,21 @@ discard block |
||
| 1181 | 1181 | } |
| 1182 | 1182 | |
| 1183 | 1183 | if ($stepped_process) {
|
| 1184 | - $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset ); |
|
| 1185 | - $posts = $wpdb->get_results( $sql ); |
|
| 1184 | + $sql = $wpdb->prepare("SELECT * FROM ".$wpdb->prefix."geodir_".$ptype."_detail LIMIT %d OFFSET %d", $step_max_items, $offset);
|
|
| 1185 | + $posts = $wpdb->get_results($sql); |
|
| 1186 | 1186 | |
| 1187 | 1187 | if (!empty($posts)) {
|
| 1188 | 1188 | |
| 1189 | 1189 | foreach ($posts as $p) {
|
| 1190 | 1190 | $p->post_type = $ptype; |
| 1191 | - $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1191 | + $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));
|
|
| 1192 | 1192 | if (empty($raw_tags)) {
|
| 1193 | 1193 | $post_tags = ''; |
| 1194 | 1194 | } else {
|
| 1195 | 1195 | $post_tags = implode(",", $raw_tags);
|
| 1196 | 1196 | } |
| 1197 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1198 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1197 | + $tablename = $plugin_prefix.$p->post_type.'_detail'; |
|
| 1198 | + $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1199 | 1199 | |
| 1200 | 1200 | } |
| 1201 | 1201 | if ($step >= $max_step) {
|
@@ -1211,23 +1211,23 @@ discard block |
||
| 1211 | 1211 | if (!empty($all_postypes)) {
|
| 1212 | 1212 | foreach ($all_postypes as $key) {
|
| 1213 | 1213 | // update each GD CPT |
| 1214 | - $posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail"); |
|
| 1214 | + $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail");
|
|
| 1215 | 1215 | |
| 1216 | 1216 | if (!empty($posts)) {
|
| 1217 | 1217 | |
| 1218 | 1218 | foreach ($posts as $p) {
|
| 1219 | 1219 | $p->post_type = $key; |
| 1220 | - $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
|
|
| 1220 | + $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));
|
|
| 1221 | 1221 | if (empty($raw_tags)) {
|
| 1222 | 1222 | $post_tags = ''; |
| 1223 | 1223 | } else {
|
| 1224 | 1224 | $post_tags = implode(",", $raw_tags);
|
| 1225 | 1225 | } |
| 1226 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1227 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1226 | + $tablename = $plugin_prefix.$p->post_type.'_detail'; |
|
| 1227 | + $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
|
|
| 1228 | 1228 | |
| 1229 | 1229 | } |
| 1230 | - $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1230 | + $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";
|
|
| 1231 | 1231 | } |
| 1232 | 1232 | |
| 1233 | 1233 | } |
@@ -1238,14 +1238,14 @@ discard block |
||
| 1238 | 1238 | |
| 1239 | 1239 | if ($is_error_during_diagnose) {
|
| 1240 | 1240 | $info_div_class = "geodir_problem_info"; |
| 1241 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1241 | + $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1242 | 1242 | } else {
|
| 1243 | 1243 | $info_div_class = "geodir_noproblem_info"; |
| 1244 | 1244 | $fix_button_txt = ''; |
| 1245 | 1245 | } |
| 1246 | 1246 | |
| 1247 | 1247 | if ($stepped_process) {
|
| 1248 | - $percent = ($step/$max_step) * 100; |
|
| 1248 | + $percent = ($step / $max_step) * 100; |
|
| 1249 | 1249 | if ($output_str == 'done') {
|
| 1250 | 1250 | echo $output_str; |
| 1251 | 1251 | } else {
|
@@ -1288,29 +1288,29 @@ discard block |
||
| 1288 | 1288 | if (!empty($all_postypes)) {
|
| 1289 | 1289 | foreach ($all_postypes as $key) {
|
| 1290 | 1290 | // update each GD CTP |
| 1291 | - $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");
|
|
| 1291 | + $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail d WHERE d.".$key."category='' ");
|
|
| 1292 | 1292 | |
| 1293 | 1293 | if (!empty($posts)) {
|
| 1294 | 1294 | |
| 1295 | 1295 | foreach ($posts as $p) {
|
| 1296 | 1296 | $p->post_type = $key; |
| 1297 | - $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));
|
|
| 1297 | + $raw_cats = wp_get_object_terms($p->post_id, $p->post_type.'category', array('fields' => 'ids'));
|
|
| 1298 | 1298 | |
| 1299 | 1299 | if (empty($raw_cats)) {
|
| 1300 | 1300 | $post_categories = get_post_meta($p->post_id, 'post_categories', true); |
| 1301 | 1301 | |
| 1302 | - if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {
|
|
| 1303 | - $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);
|
|
| 1304 | - foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {
|
|
| 1302 | + if (!empty($post_categories) && !empty($post_categories[$p->post_type.'category'])) {
|
|
| 1303 | + $post_categories[$p->post_type.'category'] = str_replace("d:", "", $post_categories[$p->post_type.'category']);
|
|
| 1304 | + foreach (explode(",", $post_categories[$p->post_type.'category']) as $cat_part) {
|
|
| 1305 | 1305 | if (is_numeric($cat_part)) {
|
| 1306 | - $raw_cats[] = (int)$cat_part; |
|
| 1306 | + $raw_cats[] = (int) $cat_part; |
|
| 1307 | 1307 | } |
| 1308 | 1308 | } |
| 1309 | 1309 | |
| 1310 | 1310 | } |
| 1311 | 1311 | |
| 1312 | 1312 | if (!empty($raw_cats)) {
|
| 1313 | - $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category'); |
|
| 1313 | + $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type.'category'); |
|
| 1314 | 1314 | |
| 1315 | 1315 | } |
| 1316 | 1316 | |
@@ -1320,14 +1320,14 @@ discard block |
||
| 1320 | 1320 | if (empty($raw_cats)) {
|
| 1321 | 1321 | $post_cats = ''; |
| 1322 | 1322 | } else {
|
| 1323 | - $post_cats = ',' . implode(",", $raw_cats) . ',';
|
|
| 1323 | + $post_cats = ','.implode(",", $raw_cats).',';
|
|
| 1324 | 1324 | } |
| 1325 | - $tablename = $plugin_prefix . $p->post_type . '_detail'; |
|
| 1326 | - $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));
|
|
| 1325 | + $tablename = $plugin_prefix.$p->post_type.'_detail'; |
|
| 1326 | + $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET ".$p->post_type."category=%s WHERE post_id =%d", $post_cats, $p->post_id));
|
|
| 1327 | 1327 | } |
| 1328 | 1328 | |
| 1329 | 1329 | } |
| 1330 | - $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
|
|
| 1330 | + $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";
|
|
| 1331 | 1331 | |
| 1332 | 1332 | } |
| 1333 | 1333 | |
@@ -1335,7 +1335,7 @@ discard block |
||
| 1335 | 1335 | |
| 1336 | 1336 | if ($is_error_during_diagnose) {
|
| 1337 | 1337 | $info_div_class = "geodir_problem_info"; |
| 1338 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1338 | + $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1339 | 1339 | } else {
|
| 1340 | 1340 | $info_div_class = "geodir_noproblem_info"; |
| 1341 | 1341 | $fix_button_txt = ''; |
@@ -1388,15 +1388,15 @@ discard block |
||
| 1388 | 1388 | if (!empty($ver_arr)) {
|
| 1389 | 1389 | foreach ($ver_arr as $key => $val) {
|
| 1390 | 1390 | if (delete_option($val)) {
|
| 1391 | - $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";
|
|
| 1391 | + $output_str .= "<li>".$key.__(' Version: Deleted', 'geodirectory')."</li>";
|
|
| 1392 | 1392 | } else {
|
| 1393 | - $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";
|
|
| 1393 | + $output_str .= "<li>".$key.__(' Version: Not Found', 'geodirectory')."</li>";
|
|
| 1394 | 1394 | } |
| 1395 | 1395 | |
| 1396 | 1396 | } |
| 1397 | 1397 | |
| 1398 | 1398 | if ($output_str) {
|
| 1399 | - $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";
|
|
| 1399 | + $output_str .= "<li><strong>".__(' Upgrade/install scripts will run on next page reload.', 'geodirectory')."</strong></li>";
|
|
| 1400 | 1400 | } |
| 1401 | 1401 | |
| 1402 | 1402 | } |
@@ -1433,43 +1433,43 @@ discard block |
||
| 1433 | 1433 | $output_str = ''; |
| 1434 | 1434 | |
| 1435 | 1435 | // check review locations |
| 1436 | - if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
|
|
| 1437 | - $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";
|
|
| 1436 | + if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
|
|
| 1437 | + $output_str .= "<li>".__('Review locations missing or broken', 'geodirectory')."</li>";
|
|
| 1438 | 1438 | $is_error_during_diagnose = true; |
| 1439 | 1439 | |
| 1440 | 1440 | if ($fix) {
|
| 1441 | 1441 | if (geodir_fix_review_location()) {
|
| 1442 | - $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";
|
|
| 1442 | + $output_str .= "<li><strong>".__('-->FIXED: Review locations fixed', 'geodirectory')."</strong></li>";
|
|
| 1443 | 1443 | } else {
|
| 1444 | - $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1444 | + $output_str .= "<li><strong>".__('-->FAILED: Review locations fix failed', 'geodirectory')."</strong></li>";
|
|
| 1445 | 1445 | } |
| 1446 | 1446 | } |
| 1447 | 1447 | |
| 1448 | 1448 | } else {
|
| 1449 | - $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";
|
|
| 1449 | + $output_str .= "<li>".__('Review locations ok', 'geodirectory')."</li>";
|
|
| 1450 | 1450 | } |
| 1451 | 1451 | |
| 1452 | 1452 | // check review content |
| 1453 | - if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {
|
|
| 1454 | - $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";
|
|
| 1453 | + if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_content IS NULL")) {
|
|
| 1454 | + $output_str .= "<li>".__('Review content missing or broken', 'geodirectory')."</li>";
|
|
| 1455 | 1455 | $is_error_during_diagnose = true; |
| 1456 | 1456 | |
| 1457 | 1457 | if ($fix) {
|
| 1458 | 1458 | if (geodir_fix_review_content()) {
|
| 1459 | - $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";
|
|
| 1459 | + $output_str .= "<li><strong>".__('-->FIXED: Review content fixed', 'geodirectory')."</strong></li>";
|
|
| 1460 | 1460 | } else {
|
| 1461 | - $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1461 | + $output_str .= "<li><strong>".__('-->FAILED: Review content fix failed', 'geodirectory')."</strong></li>";
|
|
| 1462 | 1462 | } |
| 1463 | 1463 | } |
| 1464 | 1464 | |
| 1465 | 1465 | } else {
|
| 1466 | - $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";
|
|
| 1466 | + $output_str .= "<li>".__('Review content ok', 'geodirectory')."</li>";
|
|
| 1467 | 1467 | } |
| 1468 | 1468 | |
| 1469 | 1469 | |
| 1470 | 1470 | if ($is_error_during_diagnose) {
|
| 1471 | 1471 | $info_div_class = "geodir_problem_info"; |
| 1472 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1472 | + $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
|
|
| 1473 | 1473 | } else {
|
| 1474 | 1474 | $info_div_class = "geodir_noproblem_info"; |
| 1475 | 1475 | $fix_button_txt = ''; |
@@ -1533,7 +1533,7 @@ discard block |
||
| 1533 | 1533 | |
| 1534 | 1534 | if ($is_error_during_diagnose) {
|
| 1535 | 1535 | $info_div_class = "geodir_problem_info"; |
| 1536 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
|
|
| 1536 | + $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
|
|
| 1537 | 1537 | } else {
|
| 1538 | 1538 | $info_div_class = "geodir_noproblem_info"; |
| 1539 | 1539 | $fix_button_txt = ''; |
@@ -1567,7 +1567,7 @@ discard block |
||
| 1567 | 1567 | else {
|
| 1568 | 1568 | $page_found = $wpdb->get_var( |
| 1569 | 1569 | $wpdb->prepare( |
| 1570 | - "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;", |
|
| 1570 | + "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;", |
|
| 1571 | 1571 | array($slug) |
| 1572 | 1572 | ) |
| 1573 | 1573 | ); |
@@ -1613,18 +1613,18 @@ discard block |
||
| 1613 | 1613 | ////////////////////////////////// |
| 1614 | 1614 | $option_value = get_option('geodir_home_page');
|
| 1615 | 1615 | $page = get_post($option_value); |
| 1616 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1616 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1617 | 1617 | |
| 1618 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1619 | - $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1618 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1619 | + $output_str .= "<li>".__('GD Home page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1620 | 1620 | else {
|
| 1621 | 1621 | $is_error_during_diagnose = true; |
| 1622 | - $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1622 | + $output_str .= "<li><strong>".__('GD Home page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1623 | 1623 | if ($fix) {
|
| 1624 | 1624 | if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {
|
| 1625 | - $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1625 | + $output_str .= "<li><strong>".__('-->FIXED: GD Home page fixed', 'geodirectory')."</strong></li>";
|
|
| 1626 | 1626 | } else {
|
| 1627 | - $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1627 | + $output_str .= "<li><strong>".__('-->FAILED: GD Home page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1628 | 1628 | } |
| 1629 | 1629 | } |
| 1630 | 1630 | } |
@@ -1638,18 +1638,18 @@ discard block |
||
| 1638 | 1638 | ////////////////////////////////// |
| 1639 | 1639 | $option_value = get_option('geodir_add_listing_page');
|
| 1640 | 1640 | $page = get_post($option_value); |
| 1641 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1641 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1642 | 1642 | |
| 1643 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1644 | - $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1643 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1644 | + $output_str .= "<li>".__('Add Listing page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1645 | 1645 | else {
|
| 1646 | 1646 | $is_error_during_diagnose = true; |
| 1647 | - $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1647 | + $output_str .= "<li><strong>".__('Add Listing page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1648 | 1648 | if ($fix) {
|
| 1649 | 1649 | if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {
|
| 1650 | - $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1650 | + $output_str .= "<li><strong>".__('-->FIXED: Add Listing page fixed', 'geodirectory')."</strong></li>";
|
|
| 1651 | 1651 | } else {
|
| 1652 | - $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1652 | + $output_str .= "<li><strong>".__('-->FAILED: Add Listing page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1653 | 1653 | } |
| 1654 | 1654 | } |
| 1655 | 1655 | } |
@@ -1664,18 +1664,18 @@ discard block |
||
| 1664 | 1664 | ////////////////////////////////// |
| 1665 | 1665 | $option_value = get_option('geodir_preview_page');
|
| 1666 | 1666 | $page = get_post($option_value); |
| 1667 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1667 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1668 | 1668 | |
| 1669 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1670 | - $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1669 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1670 | + $output_str .= "<li>".__('Listing Preview page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1671 | 1671 | else {
|
| 1672 | 1672 | $is_error_during_diagnose = true; |
| 1673 | - $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1673 | + $output_str .= "<li><strong>".__('Listing Preview page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1674 | 1674 | if ($fix) {
|
| 1675 | 1675 | if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {
|
| 1676 | - $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1676 | + $output_str .= "<li><strong>".__('-->FIXED: Listing Preview page fixed', 'geodirectory')."</strong></li>";
|
|
| 1677 | 1677 | } else {
|
| 1678 | - $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1678 | + $output_str .= "<li><strong>".__('-->FAILED: Listing Preview page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1679 | 1679 | } |
| 1680 | 1680 | } |
| 1681 | 1681 | } |
@@ -1689,18 +1689,18 @@ discard block |
||
| 1689 | 1689 | ////////////////////////////////// |
| 1690 | 1690 | $option_value = get_option('geodir_success_page');
|
| 1691 | 1691 | $page = get_post($option_value); |
| 1692 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1692 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1693 | 1693 | |
| 1694 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1695 | - $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1694 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1695 | + $output_str .= "<li>".__('Listing Success page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1696 | 1696 | else {
|
| 1697 | 1697 | $is_error_during_diagnose = true; |
| 1698 | - $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1698 | + $output_str .= "<li><strong>".__('Listing Success page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1699 | 1699 | if ($fix) {
|
| 1700 | 1700 | if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {
|
| 1701 | - $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1701 | + $output_str .= "<li><strong>".__('-->FIXED: Listing Success page fixed', 'geodirectory')."</strong></li>";
|
|
| 1702 | 1702 | } else {
|
| 1703 | - $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1703 | + $output_str .= "<li><strong>".__('-->FAILED: Listing Success page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1704 | 1704 | } |
| 1705 | 1705 | } |
| 1706 | 1706 | } |
@@ -1714,18 +1714,18 @@ discard block |
||
| 1714 | 1714 | ////////////////////////////////// |
| 1715 | 1715 | $option_value = get_option('geodir_info_page');
|
| 1716 | 1716 | $page = get_post($option_value); |
| 1717 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1717 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1718 | 1718 | |
| 1719 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1720 | - $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1719 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1720 | + $output_str .= "<li>".__('Info page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1721 | 1721 | else {
|
| 1722 | 1722 | $is_error_during_diagnose = true; |
| 1723 | - $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1723 | + $output_str .= "<li><strong>".__('Info page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1724 | 1724 | if ($fix) {
|
| 1725 | 1725 | if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {
|
| 1726 | - $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1726 | + $output_str .= "<li><strong>".__('-->FIXED: Info page fixed', 'geodirectory')."</strong></li>";
|
|
| 1727 | 1727 | } else {
|
| 1728 | - $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1728 | + $output_str .= "<li><strong>".__('-->FAILED: Info page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1729 | 1729 | } |
| 1730 | 1730 | } |
| 1731 | 1731 | } |
@@ -1739,18 +1739,18 @@ discard block |
||
| 1739 | 1739 | ////////////////////////////////// |
| 1740 | 1740 | $option_value = get_option('geodir_login_page');
|
| 1741 | 1741 | $page = get_post($option_value); |
| 1742 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1742 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1743 | 1743 | |
| 1744 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1745 | - $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1744 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1745 | + $output_str .= "<li>".__('Login page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1746 | 1746 | else {
|
| 1747 | 1747 | $is_error_during_diagnose = true; |
| 1748 | - $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1748 | + $output_str .= "<li><strong>".__('Login page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1749 | 1749 | if ($fix) {
|
| 1750 | 1750 | if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {
|
| 1751 | - $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1751 | + $output_str .= "<li><strong>".__('-->FIXED: Login page fixed', 'geodirectory')."</strong></li>";
|
|
| 1752 | 1752 | } else {
|
| 1753 | - $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1753 | + $output_str .= "<li><strong>".__('-->FAILED: Login page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1754 | 1754 | } |
| 1755 | 1755 | } |
| 1756 | 1756 | } |
@@ -1764,18 +1764,18 @@ discard block |
||
| 1764 | 1764 | ////////////////////////////////// |
| 1765 | 1765 | $option_value = get_option('geodir_location_page');
|
| 1766 | 1766 | $page = get_post($option_value); |
| 1767 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1767 | + if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
|
|
| 1768 | 1768 | |
| 1769 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1770 | - $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1769 | + if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish') |
|
| 1770 | + $output_str .= "<li>".__('Location page exists with proper setting.', 'geodirectory')."</li>";
|
|
| 1771 | 1771 | else {
|
| 1772 | 1772 | $is_error_during_diagnose = true; |
| 1773 | - $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
|
|
| 1773 | + $output_str .= "<li><strong>".__('Location page is missing.', 'geodirectory')."</strong></li>";
|
|
| 1774 | 1774 | if ($fix) {
|
| 1775 | 1775 | if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {
|
| 1776 | - $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";
|
|
| 1776 | + $output_str .= "<li><strong>".__('-->FIXED: Location page fixed', 'geodirectory')."</strong></li>";
|
|
| 1777 | 1777 | } else {
|
| 1778 | - $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";
|
|
| 1778 | + $output_str .= "<li><strong>".__('-->FAILED: Location page fix failed', 'geodirectory')."</strong></li>";
|
|
| 1779 | 1779 | } |
| 1780 | 1780 | } |
| 1781 | 1781 | } |
@@ -1784,13 +1784,13 @@ discard block |
||
| 1784 | 1784 | /* Diagnose Location Page Ends */ |
| 1785 | 1785 | //////////////////////////////// |
| 1786 | 1786 | |
| 1787 | - $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );
|
|
| 1787 | + $page_chk_arr = array('output_str'=>$output_str, 'is_error_during_diagnose'=>$is_error_during_diagnose);
|
|
| 1788 | 1788 | /** |
| 1789 | 1789 | * This action is called at the end of the GD Tools page check function. |
| 1790 | 1790 | * |
| 1791 | 1791 | * @since 1.5.2 |
| 1792 | 1792 | */ |
| 1793 | - $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);
|
|
| 1793 | + $page_chk_arr = apply_filters('geodir_diagnose_default_pages', $page_chk_arr);
|
|
| 1794 | 1794 | |
| 1795 | 1795 | $output_str = $page_chk_arr['output_str']; |
| 1796 | 1796 | $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose']; |
@@ -1800,7 +1800,7 @@ discard block |
||
| 1800 | 1800 | flush_rewrite_rules(); |
| 1801 | 1801 | } |
| 1802 | 1802 | $info_div_class = "geodir_problem_info"; |
| 1803 | - $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
|
|
| 1803 | + $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
|
|
| 1804 | 1804 | } else {
|
| 1805 | 1805 | $info_div_class = "geodir_noproblem_info"; |
| 1806 | 1806 | $fix_button_txt = ''; |
@@ -1828,10 +1828,10 @@ discard block |
||
| 1828 | 1828 | $fix_button_txt = ''; |
| 1829 | 1829 | |
| 1830 | 1830 | if ($is_error_during_diagnose) {
|
| 1831 | - $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";
|
|
| 1831 | + $output_str .= "<li>".__('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory').' '.geodir_plugin_path().'/db-language.php'."</li>";
|
|
| 1832 | 1832 | $info_div_class = "geodir_problem_info"; |
| 1833 | 1833 | } else {
|
| 1834 | - $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";
|
|
| 1834 | + $output_str .= "<li>".__('Load custom fields in to file for translation: ok', 'geodirectory')."</li>";
|
|
| 1835 | 1835 | $info_div_class = "geodir_noproblem_info"; |
| 1836 | 1836 | $fix_button_txt = ''; |
| 1837 | 1837 | } |
@@ -1873,17 +1873,17 @@ discard block |
||
| 1873 | 1873 | global $wpdb, $wp_query, $plugin_prefix; |
| 1874 | 1874 | |
| 1875 | 1875 | if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {
|
| 1876 | - $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail'; |
|
| 1876 | + $table = $plugin_prefix.$wp_query->query_vars['post_type'].'_detail'; |
|
| 1877 | 1877 | |
| 1878 | - $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)'; |
|
| 1878 | + $join = $clauses['join'].' INNER JOIN '.$table.' AS gd_posts ON (gd_posts.post_id = '.$wpdb->posts.'.ID)'; |
|
| 1879 | 1879 | $clauses['join'] = $join; |
| 1880 | 1880 | |
| 1881 | - $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : ''; |
|
| 1881 | + $fields = $clauses['fields'] != '' ? $clauses['fields'].', ' : ''; |
|
| 1882 | 1882 | $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire'; |
| 1883 | 1883 | $clauses['fields'] = $fields; |
| 1884 | 1884 | |
| 1885 | 1885 | $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC'; |
| 1886 | - $orderby = 'gd_expire ' . $order; |
|
| 1886 | + $orderby = 'gd_expire '.$order; |
|
| 1887 | 1887 | $clauses['orderby'] = $orderby; |
| 1888 | 1888 | } |
| 1889 | 1889 | return $clauses; |
@@ -1926,7 +1926,7 @@ discard block |
||
| 1926 | 1926 | global $current_user; |
| 1927 | 1927 | $upload_dir = wp_upload_dir(); |
| 1928 | 1928 | |
| 1929 | - $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv'; |
|
| 1929 | + $file = $upload_dir['path'].'/temp_'.$current_user->data->ID.'/geodir_tmp.csv'; |
|
| 1930 | 1930 | $handle = fopen($file, 'w'); |
| 1931 | 1931 | |
| 1932 | 1932 | fwrite($handle, $input); |
@@ -1971,7 +1971,7 @@ discard block |
||
| 1971 | 1971 | $uploads_dir = $uploads['path']; |
| 1972 | 1972 | $image_name_arr = explode('/', $filename);
|
| 1973 | 1973 | $filename = end($image_name_arr); |
| 1974 | - $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename; |
|
| 1974 | + $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename; |
|
| 1975 | 1975 | $return = array(); |
| 1976 | 1976 | $return['file'] = $uploadedFile; |
| 1977 | 1977 | $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
|
@@ -1988,8 +1988,8 @@ discard block |
||
| 1988 | 1988 | |
| 1989 | 1989 | if (($handle = fopen($target_path, "r")) !== FALSE) {
|
| 1990 | 1990 | while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
|
| 1991 | - if(is_array($data) && !empty($data)) {
|
|
| 1992 | - $file[] = '"' . implode('","', $data) . '"';
|
|
| 1991 | + if (is_array($data) && !empty($data)) {
|
|
| 1992 | + $file[] = '"'.implode('","', $data).'"';
|
|
| 1993 | 1993 | } |
| 1994 | 1994 | } |
| 1995 | 1995 | fclose($handle); |
@@ -2106,10 +2106,10 @@ discard block |
||
| 2106 | 2106 | $tag_arr = explode(',', $post_tags);
|
| 2107 | 2107 | } |
| 2108 | 2108 | |
| 2109 | - $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database |
|
| 2109 | + $table = $plugin_prefix.$buffer[5].'_detail'; // check table in database |
|
| 2110 | 2110 | |
| 2111 | 2111 | $error = ''; |
| 2112 | - if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {
|
|
| 2112 | + if ($wpdb->get_var("SHOW TABLES LIKE '".$table."'") != $table) {
|
|
| 2113 | 2113 | $invalid_post_type++; |
| 2114 | 2114 | continue; |
| 2115 | 2115 | } |
@@ -2135,7 +2135,7 @@ discard block |
||
| 2135 | 2135 | if ($buffer[$c] != '0' && $buffer[$c] != '') {
|
| 2136 | 2136 | $submitdata = date('Y-m-d');
|
| 2137 | 2137 | |
| 2138 | - $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));
|
|
| 2138 | + $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata."+".addslashes($buffer[$c])." days"));
|
|
| 2139 | 2139 | } else {
|
| 2140 | 2140 | $gd_post_info['expire_date'] = 'Never'; |
| 2141 | 2141 | } |
@@ -2163,7 +2163,7 @@ discard block |
||
| 2163 | 2163 | |
| 2164 | 2164 | // Post status |
| 2165 | 2165 | if ($customKeyarray[$c] == 'post_status') {
|
| 2166 | - $post_status = sanitize_key( $buffer[$c] ); |
|
| 2166 | + $post_status = sanitize_key($buffer[$c]); |
|
| 2167 | 2167 | } |
| 2168 | 2168 | } |
| 2169 | 2169 | |
@@ -2181,8 +2181,8 @@ discard block |
||
| 2181 | 2181 | |
| 2182 | 2182 | // Default post status |
| 2183 | 2183 | $default_status = 'publish'; |
| 2184 | - $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status; |
|
| 2185 | - $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status; |
|
| 2184 | + $post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status; |
|
| 2185 | + $post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status; |
|
| 2186 | 2186 | |
| 2187 | 2187 | $my_post['post_title'] = $post_title; |
| 2188 | 2188 | $my_post['post_content'] = $post_desc; |
@@ -2226,7 +2226,7 @@ discard block |
||
| 2226 | 2226 | $payment_info = array(); |
| 2227 | 2227 | $package_info = array(); |
| 2228 | 2228 | |
| 2229 | - $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]); |
|
| 2229 | + $package_info = (array) geodir_post_package_info($package_info, '', $buffer[5]); |
|
| 2230 | 2230 | $package_id = ''; |
| 2231 | 2231 | if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {
|
| 2232 | 2232 | $package_id = $gd_post_info['package_id']; |
@@ -2236,7 +2236,7 @@ discard block |
||
| 2236 | 2236 | $payment_info['package_id'] = $package_info['pid']; |
| 2237 | 2237 | |
| 2238 | 2238 | if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {
|
| 2239 | - $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));
|
|
| 2239 | + $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['alive_days']." days"));
|
|
| 2240 | 2240 | } else {
|
| 2241 | 2241 | $payment_info['expire_date'] = 'Never'; |
| 2242 | 2242 | } |
@@ -2248,7 +2248,7 @@ discard block |
||
| 2248 | 2248 | |
| 2249 | 2249 | $post_type = get_post_type($last_postid); |
| 2250 | 2250 | |
| 2251 | - $table = $plugin_prefix . $post_type . '_detail'; |
|
| 2251 | + $table = $plugin_prefix.$post_type.'_detail'; |
|
| 2252 | 2252 | |
| 2253 | 2253 | geodir_save_post_info($last_postid, $gd_post_info); |
| 2254 | 2254 | |
@@ -2269,7 +2269,7 @@ discard block |
||
| 2269 | 2269 | $attachment['post_id'] = $last_postid; |
| 2270 | 2270 | $attachment['title'] = $img_name_arr[0]; |
| 2271 | 2271 | $attachment['content'] = ''; |
| 2272 | - $attachment['file'] = $sub_dir . '/' . $image_name; |
|
| 2272 | + $attachment['file'] = $sub_dir.'/'.$image_name; |
|
| 2273 | 2273 | $attachment['mime_type'] = $uploaded_file_type; |
| 2274 | 2274 | $attachment['menu_order'] = $menu_order; |
| 2275 | 2275 | $attachment['is_featured'] = 0; |
@@ -2278,15 +2278,15 @@ discard block |
||
| 2278 | 2278 | |
| 2279 | 2279 | foreach ($attachment as $key => $val) {
|
| 2280 | 2280 | if ($val != '') |
| 2281 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 2281 | + $attachment_set .= $key." = '".$val."', "; |
|
| 2282 | 2282 | } |
| 2283 | 2283 | $attachment_set = trim($attachment_set, ", "); |
| 2284 | 2284 | |
| 2285 | - $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
|
|
| 2285 | + $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
|
|
| 2286 | 2286 | |
| 2287 | 2287 | if ($menu_order == 1) {
|
| 2288 | 2288 | $post_type = get_post_type($last_postid); |
| 2289 | - $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));
|
|
| 2289 | + $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($sub_dir.'/'.$image_name, $last_postid)));
|
|
| 2290 | 2290 | } |
| 2291 | 2291 | $menu_order++; |
| 2292 | 2292 | } |
@@ -2327,11 +2327,11 @@ discard block |
||
| 2327 | 2327 | } |
| 2328 | 2328 | |
| 2329 | 2329 | // Add the tab in left sidebar menu fro import & export page. |
| 2330 | -add_filter( 'geodir_settings_tabs_array', 'geodir_import_export_tab', 94 ); |
|
| 2330 | +add_filter('geodir_settings_tabs_array', 'geodir_import_export_tab', 94);
|
|
| 2331 | 2331 | |
| 2332 | 2332 | // Handle ajax request for import/export. |
| 2333 | -add_action( 'wp_ajax_geodir_import_export', 'geodir_ajax_import_export' ); |
|
| 2334 | -add_action( 'wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export' ); |
|
| 2333 | +add_action('wp_ajax_geodir_import_export', 'geodir_ajax_import_export');
|
|
| 2334 | +add_action('wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export');
|
|
| 2335 | 2335 | |
| 2336 | 2336 | |
| 2337 | 2337 | /** |
@@ -2342,40 +2342,40 @@ discard block |
||
| 2342 | 2342 | * @param $post_id int $post_id The post ID of the post being saved. |
| 2343 | 2343 | * @param $post object $post The post object of the post being saved. |
| 2344 | 2344 | */ |
| 2345 | -function geodir_update_location_prefix($post_id,$post){
|
|
| 2346 | - if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){
|
|
| 2347 | - update_option('geodir_location_prefix',$post->post_name);
|
|
| 2345 | +function geodir_update_location_prefix($post_id, $post) {
|
|
| 2346 | + if ($post->post_type == 'page' && $post->post_name && $post_id == get_option('geodir_location_page')) {
|
|
| 2347 | + update_option('geodir_location_prefix', $post->post_name);
|
|
| 2348 | 2348 | } |
| 2349 | 2349 | |
| 2350 | 2350 | } |
| 2351 | 2351 | |
| 2352 | -add_action('save_post', 'geodir_update_location_prefix',10,2);
|
|
| 2352 | +add_action('save_post', 'geodir_update_location_prefix', 10, 2);
|
|
| 2353 | 2353 | |
| 2354 | -add_action( 'wp_ajax_geodir_ga_callback', 'geodir_ga_callback' ); |
|
| 2354 | +add_action('wp_ajax_geodir_ga_callback', 'geodir_ga_callback');
|
|
| 2355 | 2355 | |
| 2356 | -function geodir_ga_callback(){
|
|
| 2356 | +function geodir_ga_callback() {
|
|
| 2357 | 2357 | |
| 2358 | -if(isset($_REQUEST['code']) && $_REQUEST['code']) {
|
|
| 2358 | +if (isset($_REQUEST['code']) && $_REQUEST['code']) {
|
|
| 2359 | 2359 | $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?"; |
| 2360 | 2360 | $code = "code=".$_REQUEST['code']; |
| 2361 | 2361 | $grant_type = "&grant_type=authorization_code"; |
| 2362 | - $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
|
|
| 2362 | + $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";
|
|
| 2363 | 2363 | $client_id = "&client_id=".get_option('geodir_ga_client_id');
|
| 2364 | 2364 | $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
|
| 2365 | 2365 | |
| 2366 | - $auth_url = $oAuthURL . $code . $redirect_uri . $grant_type . $client_id .$client_secret; |
|
| 2366 | + $auth_url = $oAuthURL.$code.$redirect_uri.$grant_type.$client_id.$client_secret; |
|
| 2367 | 2367 | |
| 2368 | 2368 | $response = wp_remote_post($auth_url, array('timeout' => 15));
|
| 2369 | 2369 | |
| 2370 | 2370 | //print_r($response); |
| 2371 | 2371 | |
| 2372 | - $error_msg = __('Something went wrong','geodirectory');
|
|
| 2373 | - if(!empty($response['response']['code']) && $response['response']['code']==200){
|
|
| 2372 | + $error_msg = __('Something went wrong', 'geodirectory');
|
|
| 2373 | + if (!empty($response['response']['code']) && $response['response']['code'] == 200) {
|
|
| 2374 | 2374 | |
| 2375 | 2375 | $parts = json_decode($response['body']); |
| 2376 | 2376 | //print_r($parts); |
| 2377 | - if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
|
|
| 2378 | - else{
|
|
| 2377 | + if (!isset($parts->access_token)) {echo $error_msg." - #1"; exit; }
|
|
| 2378 | + else {
|
|
| 2379 | 2379 | |
| 2380 | 2380 | update_option('gd_ga_access_token', $parts->access_token);
|
| 2381 | 2381 | update_option('gd_ga_refresh_token', $parts->refresh_token);
|
@@ -2384,18 +2384,18 @@ discard block |
||
| 2384 | 2384 | |
| 2385 | 2385 | |
| 2386 | 2386 | } |
| 2387 | - elseif(!empty($response['response']['code'])) {
|
|
| 2387 | + elseif (!empty($response['response']['code'])) {
|
|
| 2388 | 2388 | $parts = json_decode($response['body']); |
| 2389 | 2389 | |
| 2390 | - if(isset($parts->error)){
|
|
| 2391 | - echo $parts->error.": ".$parts->error_description;exit; |
|
| 2392 | - }else{
|
|
| 2393 | - echo $error_msg." - #2";exit; |
|
| 2390 | + if (isset($parts->error)) {
|
|
| 2391 | + echo $parts->error.": ".$parts->error_description; exit; |
|
| 2392 | + } else {
|
|
| 2393 | + echo $error_msg." - #2"; exit; |
|
| 2394 | 2394 | } |
| 2395 | 2395 | |
| 2396 | - }else{
|
|
| 2396 | + } else {
|
|
| 2397 | 2397 | |
| 2398 | - echo $error_msg." - #3";exit; |
|
| 2398 | + echo $error_msg." - #3"; exit; |
|
| 2399 | 2399 | |
| 2400 | 2400 | } |
| 2401 | 2401 | } |
@@ -2417,7 +2417,7 @@ discard block |
||
| 2417 | 2417 | function geodir_uninstall_settings($general_settings) {
|
| 2418 | 2418 | $settings = array(); |
| 2419 | 2419 | $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));
|
| 2420 | - $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));
|
|
| 2420 | + $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory'));
|
|
| 2421 | 2421 | |
| 2422 | 2422 | $plugins = get_plugins(); |
| 2423 | 2423 | $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());
|
@@ -2429,7 +2429,7 @@ discard block |
||
| 2429 | 2429 | if (in_array($plugin_name, $un_plugins)) {
|
| 2430 | 2430 | $settings[] = array( |
| 2431 | 2431 | 'type' => 'checkbox', |
| 2432 | - 'id' => 'geodir_un_' . $plugin_name, |
|
| 2432 | + 'id' => 'geodir_un_'.$plugin_name, |
|
| 2433 | 2433 | 'name' => $data['Name'], |
| 2434 | 2434 | 'desc' => __('Remove all data when deleted?', 'geodirectory'),
|
| 2435 | 2435 | 'std' => '0' |
@@ -2463,7 +2463,7 @@ discard block |
||
| 2463 | 2463 | * @since 1.6.9 |
| 2464 | 2464 | */ |
| 2465 | 2465 | function geodir_uninstall_settings_desc() {
|
| 2466 | - echo '<p class="gd-un-settings-desc">' . __('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory') . '</p>';
|
|
| 2466 | + echo '<p class="gd-un-settings-desc">'.__('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory').'</p>';
|
|
| 2467 | 2467 | } |
| 2468 | 2468 | add_action('geodir_settings_uninstall_settings_main_start', 'geodir_uninstall_settings_desc');
|
| 2469 | 2469 | |
@@ -2527,12 +2527,12 @@ discard block |
||
| 2527 | 2527 | |
| 2528 | 2528 | |
| 2529 | 2529 | if ($delete) {
|
| 2530 | - $output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";
|
|
| 2530 | + $output_str .= "<li><strong>".__('Table dropped, refresh page to reinstall.', 'geodirectory')."</strong></li>";
|
|
| 2531 | 2531 | ob_start(); |
| 2532 | 2532 | geodir_diagnose_version_clear(); |
| 2533 | 2533 | ob_end_clean(); |
| 2534 | - }else{
|
|
| 2535 | - $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";
|
|
| 2534 | + } else {
|
|
| 2535 | + $output_str .= "<li><strong>".__('Something went wrong.', 'geodirectory')."</strong></li>";
|
|
| 2536 | 2536 | } |
| 2537 | 2537 | |
| 2538 | 2538 | if ($is_error_during_diagnose) {
|
@@ -2557,9 +2557,9 @@ discard block |
||
| 2557 | 2557 | * @param object $row The post|taxonomy object. |
| 2558 | 2558 | * @return array Filtered actions. |
| 2559 | 2559 | */ |
| 2560 | -function geodir_disable_quick_edit( $actions = array(), $row = null ) {
|
|
| 2561 | - if ( isset( $actions['inline hide-if-no-js'] ) ) {
|
|
| 2562 | - unset( $actions['inline hide-if-no-js'] ); |
|
| 2560 | +function geodir_disable_quick_edit($actions = array(), $row = null) {
|
|
| 2561 | + if (isset($actions['inline hide-if-no-js'])) {
|
|
| 2562 | + unset($actions['inline hide-if-no-js']); |
|
| 2563 | 2563 | } |
| 2564 | 2564 | |
| 2565 | 2565 | return $actions; |
@@ -2578,26 +2578,26 @@ discard block |
||
| 2578 | 2578 | function geodir_check_quick_edit() {
|
| 2579 | 2579 | global $pagenow, $current_screen, $gd_cpt_screen; |
| 2580 | 2580 | |
| 2581 | - if ( ( $pagenow == 'edit.php' || $pagenow == 'edit-tags.php' ) && !empty( $current_screen->post_type ) ) {
|
|
| 2582 | - if ( empty( $gd_cpt_screen ) ) {
|
|
| 2583 | - if ( in_array( $current_screen->post_type, geodir_get_posttypes() ) ) {
|
|
| 2581 | + if (($pagenow == 'edit.php' || $pagenow == 'edit-tags.php') && !empty($current_screen->post_type)) {
|
|
| 2582 | + if (empty($gd_cpt_screen)) {
|
|
| 2583 | + if (in_array($current_screen->post_type, geodir_get_posttypes())) {
|
|
| 2584 | 2584 | $gd_cpt_screen = 'y'; |
| 2585 | 2585 | } else {
|
| 2586 | 2586 | $gd_cpt_screen = 'n'; |
| 2587 | 2587 | } |
| 2588 | 2588 | } |
| 2589 | 2589 | |
| 2590 | - if ( $gd_cpt_screen == 'y' ) {
|
|
| 2591 | - if ( $pagenow == 'edit.php' ) {
|
|
| 2592 | - add_filter( 'post_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2593 | - add_filter( 'page_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2594 | - } elseif ( $pagenow == 'edit-tags.php' && !empty( $current_screen->taxonomy ) ) {
|
|
| 2595 | - add_filter( $current_screen->taxonomy . '_row_actions', 'geodir_disable_quick_edit', 10, 2 ); |
|
| 2590 | + if ($gd_cpt_screen == 'y') {
|
|
| 2591 | + if ($pagenow == 'edit.php') {
|
|
| 2592 | + add_filter('post_row_actions', 'geodir_disable_quick_edit', 10, 2);
|
|
| 2593 | + add_filter('page_row_actions', 'geodir_disable_quick_edit', 10, 2);
|
|
| 2594 | + } elseif ($pagenow == 'edit-tags.php' && !empty($current_screen->taxonomy)) {
|
|
| 2595 | + add_filter($current_screen->taxonomy.'_row_actions', 'geodir_disable_quick_edit', 10, 2); |
|
| 2596 | 2596 | } |
| 2597 | 2597 | } |
| 2598 | 2598 | } |
| 2599 | 2599 | } |
| 2600 | -add_action( 'admin_head', 'geodir_check_quick_edit', 10 ); |
|
| 2600 | +add_action('admin_head', 'geodir_check_quick_edit', 10);
|
|
| 2601 | 2601 | |
| 2602 | 2602 | /** |
| 2603 | 2603 | * Filter the bulk actions for GD CPT. |
@@ -2608,9 +2608,9 @@ discard block |
||
| 2608 | 2608 | * @param array $actions An array of the available bulk actions. |
| 2609 | 2609 | * @return array Filtered bulk actions. |
| 2610 | 2610 | */ |
| 2611 | -function geodir_filter_bulk_actions( $actions ) {
|
|
| 2612 | - if ( isset( $actions['edit'] ) ) {
|
|
| 2613 | - unset( $actions['edit'] ); |
|
| 2611 | +function geodir_filter_bulk_actions($actions) {
|
|
| 2612 | + if (isset($actions['edit'])) {
|
|
| 2613 | + unset($actions['edit']); |
|
| 2614 | 2614 | } |
| 2615 | 2615 | |
| 2616 | 2616 | return $actions; |
@@ -24,8 +24,11 @@ discard block |
||
| 24 | 24 | global $current_tab; |
| 25 | 25 | geodir_redirect_to_admin_panel_on_installed(); |
| 26 | 26 | $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings'; |
| 27 | - if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests |
|
| 28 | - geodir_handle_option_form_submit($current_tab); // located in admin function.php |
|
| 27 | + if (!(isset($_REQUEST['action']))) { |
|
| 28 | + // this will avoid Ajax requests |
|
| 29 | + geodir_handle_option_form_submit($current_tab); |
|
| 30 | + } |
|
| 31 | + // located in admin function.php |
|
| 29 | 32 | /** |
| 30 | 33 | * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area. |
| 31 | 34 | * |
@@ -328,8 +331,9 @@ discard block |
||
| 328 | 331 | if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {
|
| 329 | 332 | |
| 330 | 333 | foreach ($notification as $key => $value) {
|
| 331 | - if ($value['type'] == 'textarea') |
|
| 332 | - $notification[$key]['type'] = 'editor'; |
|
| 334 | + if ($value['type'] == 'textarea') { |
|
| 335 | + $notification[$key]['type'] = 'editor'; |
|
| 336 | + } |
|
| 333 | 337 | } |
| 334 | 338 | |
| 335 | 339 | } |
@@ -354,8 +358,9 @@ discard block |
||
| 354 | 358 | if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {
|
| 355 | 359 | |
| 356 | 360 | foreach ($design_setting as $key => $value) {
|
| 357 | - if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content') |
|
| 358 | - $design_setting[$key]['type'] = 'editor'; |
|
| 361 | + if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content') { |
|
| 362 | + $design_setting[$key]['type'] = 'editor'; |
|
| 363 | + } |
|
| 359 | 364 | } |
| 360 | 365 | |
| 361 | 366 | } |
@@ -474,9 +479,9 @@ discard block |
||
| 474 | 479 | class="gd-draggable-form-items gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);"> |
| 475 | 480 | <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {
|
| 476 | 481 | echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>'; |
| 477 | - }elseif(isset($val['field_icon']) && $val['field_icon'] ){
|
|
| 482 | + } elseif(isset($val['field_icon']) && $val['field_icon'] ){
|
|
| 478 | 483 | echo '<b class="gd-cf-icon" style="background-image: url(\''.$val['field_icon'].'\')"></b>'; |
| 479 | - }else{
|
|
| 484 | + } else{
|
|
| 480 | 485 | echo '<i class="fa fa-cog" aria-hidden="true"></i>'; |
| 481 | 486 | }?> |
| 482 | 487 | <?php echo (! empty( $val['admin_title'] ) ? $val['admin_title'] : $val['site_title'] );?> |
@@ -706,9 +711,9 @@ discard block |
||
| 706 | 711 | <?php |
| 707 | 712 | if($type=='predefined'){
|
| 708 | 713 | $cfs = geodir_custom_fields_predefined($listing_type); |
| 709 | - }elseif($type=='custom'){
|
|
| 714 | + } elseif($type=='custom'){
|
|
| 710 | 715 | $cfs = geodir_custom_fields_custom($listing_type); |
| 711 | - }else{
|
|
| 716 | + } else{
|
|
| 712 | 717 | $cfs = geodir_custom_fields($listing_type); |
| 713 | 718 | ?> |
| 714 | 719 | <ul class="full gd-cf-tooltip-wrap"> |
@@ -763,7 +768,7 @@ discard block |
||
| 763 | 768 | </li> |
| 764 | 769 | <?php |
| 765 | 770 | } |
| 766 | - }else{
|
|
| 771 | + } else{
|
|
| 767 | 772 | _e('There are no custom fields here yet.', 'geodirectory');
|
| 768 | 773 | } |
| 769 | 774 | ?> |
@@ -960,8 +965,9 @@ discard block |
||
| 960 | 965 | |
| 961 | 966 | if (!get_option('geodir_remove_unnecessary_fields')) {
|
| 962 | 967 | |
| 963 | - if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
|
|
| 964 | - $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
|
|
| 968 | + if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'")) { |
|
| 969 | + $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`"); |
|
| 970 | + } |
|
| 965 | 971 | |
| 966 | 972 | update_option('geodir_remove_unnecessary_fields', '1');
|
| 967 | 973 | |
@@ -997,8 +1003,9 @@ discard block |
||
| 997 | 1003 | break; |
| 998 | 1004 | |
| 999 | 1005 | case 'diagnosis-fix' : |
| 1000 | - if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') |
|
| 1001 | - $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
|
| 1006 | + if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') { |
|
| 1007 | + $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']); |
|
| 1008 | + } |
|
| 1002 | 1009 | call_user_func('geodir_diagnose_' . $diagnose_this);
|
| 1003 | 1010 | exit(); |
| 1004 | 1011 | break; |
@@ -1613,11 +1620,11 @@ discard block |
||
| 1613 | 1620 | ////////////////////////////////// |
| 1614 | 1621 | $option_value = get_option('geodir_home_page');
|
| 1615 | 1622 | $page = get_post($option_value); |
| 1616 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1623 | + if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
|
|
| 1617 | 1624 | |
| 1618 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1619 | - $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1620 | - else {
|
|
| 1625 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') { |
|
| 1626 | + $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>"; |
|
| 1627 | + } else {
|
|
| 1621 | 1628 | $is_error_during_diagnose = true; |
| 1622 | 1629 | $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
|
| 1623 | 1630 | if ($fix) {
|
@@ -1638,11 +1645,11 @@ discard block |
||
| 1638 | 1645 | ////////////////////////////////// |
| 1639 | 1646 | $option_value = get_option('geodir_add_listing_page');
|
| 1640 | 1647 | $page = get_post($option_value); |
| 1641 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1648 | + if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
|
|
| 1642 | 1649 | |
| 1643 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1644 | - $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1645 | - else {
|
|
| 1650 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') { |
|
| 1651 | + $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>"; |
|
| 1652 | + } else {
|
|
| 1646 | 1653 | $is_error_during_diagnose = true; |
| 1647 | 1654 | $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
|
| 1648 | 1655 | if ($fix) {
|
@@ -1664,11 +1671,11 @@ discard block |
||
| 1664 | 1671 | ////////////////////////////////// |
| 1665 | 1672 | $option_value = get_option('geodir_preview_page');
|
| 1666 | 1673 | $page = get_post($option_value); |
| 1667 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1674 | + if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
|
|
| 1668 | 1675 | |
| 1669 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1670 | - $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1671 | - else {
|
|
| 1676 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') { |
|
| 1677 | + $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>"; |
|
| 1678 | + } else {
|
|
| 1672 | 1679 | $is_error_during_diagnose = true; |
| 1673 | 1680 | $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
|
| 1674 | 1681 | if ($fix) {
|
@@ -1689,11 +1696,11 @@ discard block |
||
| 1689 | 1696 | ////////////////////////////////// |
| 1690 | 1697 | $option_value = get_option('geodir_success_page');
|
| 1691 | 1698 | $page = get_post($option_value); |
| 1692 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1699 | + if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
|
|
| 1693 | 1700 | |
| 1694 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1695 | - $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1696 | - else {
|
|
| 1701 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') { |
|
| 1702 | + $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>"; |
|
| 1703 | + } else {
|
|
| 1697 | 1704 | $is_error_during_diagnose = true; |
| 1698 | 1705 | $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
|
| 1699 | 1706 | if ($fix) {
|
@@ -1714,11 +1721,11 @@ discard block |
||
| 1714 | 1721 | ////////////////////////////////// |
| 1715 | 1722 | $option_value = get_option('geodir_info_page');
|
| 1716 | 1723 | $page = get_post($option_value); |
| 1717 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1724 | + if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
|
|
| 1718 | 1725 | |
| 1719 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1720 | - $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1721 | - else {
|
|
| 1726 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') { |
|
| 1727 | + $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>"; |
|
| 1728 | + } else {
|
|
| 1722 | 1729 | $is_error_during_diagnose = true; |
| 1723 | 1730 | $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
|
| 1724 | 1731 | if ($fix) {
|
@@ -1739,11 +1746,11 @@ discard block |
||
| 1739 | 1746 | ////////////////////////////////// |
| 1740 | 1747 | $option_value = get_option('geodir_login_page');
|
| 1741 | 1748 | $page = get_post($option_value); |
| 1742 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1749 | + if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
|
|
| 1743 | 1750 | |
| 1744 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1745 | - $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1746 | - else {
|
|
| 1751 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') { |
|
| 1752 | + $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>"; |
|
| 1753 | + } else {
|
|
| 1747 | 1754 | $is_error_during_diagnose = true; |
| 1748 | 1755 | $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
|
| 1749 | 1756 | if ($fix) {
|
@@ -1764,11 +1771,11 @@ discard block |
||
| 1764 | 1771 | ////////////////////////////////// |
| 1765 | 1772 | $option_value = get_option('geodir_location_page');
|
| 1766 | 1773 | $page = get_post($option_value); |
| 1767 | - if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
|
|
| 1774 | + if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
|
|
| 1768 | 1775 | |
| 1769 | - if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') |
|
| 1770 | - $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
|
|
| 1771 | - else {
|
|
| 1776 | + if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') { |
|
| 1777 | + $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>"; |
|
| 1778 | + } else {
|
|
| 1772 | 1779 | $is_error_during_diagnose = true; |
| 1773 | 1780 | $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
|
| 1774 | 1781 | if ($fix) {
|
@@ -2213,8 +2220,9 @@ discard block |
||
| 2213 | 2220 | ); |
| 2214 | 2221 | |
| 2215 | 2222 | $post_location_info = $request_info['post_location']; |
| 2216 | - if ($location_id = geodir_add_new_location($post_location_info)) |
|
| 2217 | - $post_location_id = $location_id; |
|
| 2223 | + if ($location_id = geodir_add_new_location($post_location_info)) { |
|
| 2224 | + $post_location_id = $location_id; |
|
| 2225 | + } |
|
| 2218 | 2226 | } else {
|
| 2219 | 2227 | $post_location_id = 0; |
| 2220 | 2228 | } |
@@ -2277,8 +2285,9 @@ discard block |
||
| 2277 | 2285 | $attachment_set = ''; |
| 2278 | 2286 | |
| 2279 | 2287 | foreach ($attachment as $key => $val) {
|
| 2280 | - if ($val != '') |
|
| 2281 | - $attachment_set .= $key . " = '" . $val . "', "; |
|
| 2288 | + if ($val != '') { |
|
| 2289 | + $attachment_set .= $key . " = '" . $val . "', "; |
|
| 2290 | + } |
|
| 2282 | 2291 | } |
| 2283 | 2292 | $attachment_set = trim($attachment_set, ", "); |
| 2284 | 2293 | |
@@ -2374,8 +2383,7 @@ discard block |
||
| 2374 | 2383 | |
| 2375 | 2384 | $parts = json_decode($response['body']); |
| 2376 | 2385 | //print_r($parts); |
| 2377 | - if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
|
|
| 2378 | - else{
|
|
| 2386 | + if(!isset($parts->access_token)){echo $error_msg." - #1";exit;} else{
|
|
| 2379 | 2387 | |
| 2380 | 2388 | update_option('gd_ga_access_token', $parts->access_token);
|
| 2381 | 2389 | update_option('gd_ga_refresh_token', $parts->refresh_token);
|
@@ -2383,17 +2391,16 @@ discard block |
||
| 2383 | 2391 | } |
| 2384 | 2392 | |
| 2385 | 2393 | |
| 2386 | - } |
|
| 2387 | - elseif(!empty($response['response']['code'])) {
|
|
| 2394 | + } elseif(!empty($response['response']['code'])) {
|
|
| 2388 | 2395 | $parts = json_decode($response['body']); |
| 2389 | 2396 | |
| 2390 | 2397 | if(isset($parts->error)){
|
| 2391 | 2398 | echo $parts->error.": ".$parts->error_description;exit; |
| 2392 | - }else{
|
|
| 2399 | + } else{
|
|
| 2393 | 2400 | echo $error_msg." - #2";exit; |
| 2394 | 2401 | } |
| 2395 | 2402 | |
| 2396 | - }else{
|
|
| 2403 | + } else{
|
|
| 2397 | 2404 | |
| 2398 | 2405 | echo $error_msg." - #3";exit; |
| 2399 | 2406 | |
@@ -2531,7 +2538,7 @@ discard block |
||
| 2531 | 2538 | ob_start(); |
| 2532 | 2539 | geodir_diagnose_version_clear(); |
| 2533 | 2540 | ob_end_clean(); |
| 2534 | - }else{
|
|
| 2541 | + } else{
|
|
| 2535 | 2542 | $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";
|
| 2536 | 2543 | } |
| 2537 | 2544 | |
@@ -17,10 +17,10 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | function gd_compat_styles() |
| 19 | 19 | {
|
| 20 | - $tc = get_option('theme_compatibility_setting');
|
|
| 21 | - echo "<style id='gd-compat-styles' type='text/css'>"; |
|
| 22 | - echo $tc['geodir_theme_compat_css']; |
|
| 23 | - echo "</style>"; |
|
| 20 | + $tc = get_option('theme_compatibility_setting');
|
|
| 21 | + echo "<style id='gd-compat-styles' type='text/css'>"; |
|
| 22 | + echo $tc['geodir_theme_compat_css']; |
|
| 23 | + echo "</style>"; |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | function gd_compat_script() |
| 33 | 33 | {
|
| 34 | - $tc = get_option('theme_compatibility_setting');
|
|
| 35 | - echo "<script>"; |
|
| 36 | - echo $tc['geodir_theme_compat_js']; |
|
| 37 | - echo " </script>"; |
|
| 34 | + $tc = get_option('theme_compatibility_setting');
|
|
| 35 | + echo "<script>"; |
|
| 36 | + echo $tc['geodir_theme_compat_js']; |
|
| 37 | + echo " </script>"; |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | /** |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | function geodir_top_content_add_dynamic() |
| 49 | 49 | {
|
| 50 | - $tc = get_option('theme_compatibility_setting');
|
|
| 51 | - echo $tc['geodir_top_content_add']; |
|
| 50 | + $tc = get_option('theme_compatibility_setting');
|
|
| 51 | + echo $tc['geodir_top_content_add']; |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -61,8 +61,8 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | function geodir_before_main_content_add_dynamic() |
| 63 | 63 | {
|
| 64 | - $tc = get_option('theme_compatibility_setting');
|
|
| 65 | - echo $tc['geodir_before_main_content_add']; |
|
| 64 | + $tc = get_option('theme_compatibility_setting');
|
|
| 65 | + echo $tc['geodir_before_main_content_add']; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | /** |
@@ -75,8 +75,8 @@ discard block |
||
| 75 | 75 | */ |
| 76 | 76 | function geodir_full_page_class_dynamic() |
| 77 | 77 | {
|
| 78 | - $tc = get_option('theme_compatibility_setting');
|
|
| 79 | - return $tc['geodir_full_page_class_filter']; |
|
| 78 | + $tc = get_option('theme_compatibility_setting');
|
|
| 79 | + return $tc['geodir_full_page_class_filter']; |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | /** |
@@ -89,8 +89,8 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | function geodir_before_widget_dynamic() |
| 91 | 91 | {
|
| 92 | - $tc = get_option('theme_compatibility_setting');
|
|
| 93 | - return $tc['geodir_before_widget_filter']; |
|
| 92 | + $tc = get_option('theme_compatibility_setting');
|
|
| 93 | + return $tc['geodir_before_widget_filter']; |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | /** |
@@ -103,8 +103,8 @@ discard block |
||
| 103 | 103 | */ |
| 104 | 104 | function geodir_after_widget_dynamic() |
| 105 | 105 | {
|
| 106 | - $tc = get_option('theme_compatibility_setting');
|
|
| 107 | - return $tc['geodir_after_widget_filter']; |
|
| 106 | + $tc = get_option('theme_compatibility_setting');
|
|
| 107 | + return $tc['geodir_after_widget_filter']; |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | /** |
@@ -117,8 +117,8 @@ discard block |
||
| 117 | 117 | */ |
| 118 | 118 | function geodir_before_title_dynamic() |
| 119 | 119 | {
|
| 120 | - $tc = get_option('theme_compatibility_setting');
|
|
| 121 | - return $tc['geodir_before_title_filter']; |
|
| 120 | + $tc = get_option('theme_compatibility_setting');
|
|
| 121 | + return $tc['geodir_before_title_filter']; |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | /** |
@@ -131,8 +131,8 @@ discard block |
||
| 131 | 131 | */ |
| 132 | 132 | function geodir_after_title_dynamic() |
| 133 | 133 | {
|
| 134 | - $tc = get_option('theme_compatibility_setting');
|
|
| 135 | - return $tc['geodir_after_title_filter']; |
|
| 134 | + $tc = get_option('theme_compatibility_setting');
|
|
| 135 | + return $tc['geodir_after_title_filter']; |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | /** |
@@ -145,8 +145,8 @@ discard block |
||
| 145 | 145 | */ |
| 146 | 146 | function geodir_menu_li_class_dynamic() |
| 147 | 147 | {
|
| 148 | - $tc = get_option('theme_compatibility_setting');
|
|
| 149 | - return $tc['geodir_menu_li_class_filter']; |
|
| 148 | + $tc = get_option('theme_compatibility_setting');
|
|
| 149 | + return $tc['geodir_menu_li_class_filter']; |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | /** |
@@ -159,8 +159,8 @@ discard block |
||
| 159 | 159 | */ |
| 160 | 160 | function geodir_sub_menu_ul_class_dynamic() |
| 161 | 161 | {
|
| 162 | - $tc = get_option('theme_compatibility_setting');
|
|
| 163 | - return $tc['geodir_sub_menu_ul_class_filter']; |
|
| 162 | + $tc = get_option('theme_compatibility_setting');
|
|
| 163 | + return $tc['geodir_sub_menu_ul_class_filter']; |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | /** |
@@ -173,8 +173,8 @@ discard block |
||
| 173 | 173 | */ |
| 174 | 174 | function geodir_sub_menu_li_class_dynamic() |
| 175 | 175 | {
|
| 176 | - $tc = get_option('theme_compatibility_setting');
|
|
| 177 | - return $tc['geodir_sub_menu_li_class_filter']; |
|
| 176 | + $tc = get_option('theme_compatibility_setting');
|
|
| 177 | + return $tc['geodir_sub_menu_li_class_filter']; |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | /** |
@@ -187,8 +187,8 @@ discard block |
||
| 187 | 187 | */ |
| 188 | 188 | function geodir_menu_a_class_dynamic() |
| 189 | 189 | {
|
| 190 | - $tc = get_option('theme_compatibility_setting');
|
|
| 191 | - return $tc['geodir_menu_a_class_filter']; |
|
| 190 | + $tc = get_option('theme_compatibility_setting');
|
|
| 191 | + return $tc['geodir_menu_a_class_filter']; |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | /** |
@@ -201,8 +201,8 @@ discard block |
||
| 201 | 201 | */ |
| 202 | 202 | function geodir_sub_menu_a_class_dynamic() |
| 203 | 203 | {
|
| 204 | - $tc = get_option('theme_compatibility_setting');
|
|
| 205 | - return $tc['geodir_sub_menu_a_class_filter']; |
|
| 204 | + $tc = get_option('theme_compatibility_setting');
|
|
| 205 | + return $tc['geodir_sub_menu_a_class_filter']; |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | /** |
@@ -215,8 +215,8 @@ discard block |
||
| 215 | 215 | */ |
| 216 | 216 | function geodir_location_switcher_menu_li_class_dynamic() |
| 217 | 217 | {
|
| 218 | - $tc = get_option('theme_compatibility_setting');
|
|
| 219 | - return $tc['geodir_location_switcher_menu_li_class_filter']; |
|
| 218 | + $tc = get_option('theme_compatibility_setting');
|
|
| 219 | + return $tc['geodir_location_switcher_menu_li_class_filter']; |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | /** |
@@ -229,8 +229,8 @@ discard block |
||
| 229 | 229 | */ |
| 230 | 230 | function geodir_location_switcher_menu_a_class_dynamic() |
| 231 | 231 | {
|
| 232 | - $tc = get_option('theme_compatibility_setting');
|
|
| 233 | - return $tc['geodir_location_switcher_menu_a_class_filter']; |
|
| 232 | + $tc = get_option('theme_compatibility_setting');
|
|
| 233 | + return $tc['geodir_location_switcher_menu_a_class_filter']; |
|
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | /** |
@@ -243,8 +243,8 @@ discard block |
||
| 243 | 243 | */ |
| 244 | 244 | function geodir_location_switcher_menu_sub_ul_class_dynamic() |
| 245 | 245 | {
|
| 246 | - $tc = get_option('theme_compatibility_setting');
|
|
| 247 | - return $tc['geodir_location_switcher_menu_sub_ul_class_filter']; |
|
| 246 | + $tc = get_option('theme_compatibility_setting');
|
|
| 247 | + return $tc['geodir_location_switcher_menu_sub_ul_class_filter']; |
|
| 248 | 248 | } |
| 249 | 249 | |
| 250 | 250 | /** |
@@ -257,8 +257,8 @@ discard block |
||
| 257 | 257 | */ |
| 258 | 258 | function geodir_location_switcher_menu_sub_li_class_dynamic() |
| 259 | 259 | {
|
| 260 | - $tc = get_option('theme_compatibility_setting');
|
|
| 261 | - return $tc['geodir_location_switcher_menu_sub_li_class_filter']; |
|
| 260 | + $tc = get_option('theme_compatibility_setting');
|
|
| 261 | + return $tc['geodir_location_switcher_menu_sub_li_class_filter']; |
|
| 262 | 262 | } |
| 263 | 263 | |
| 264 | 264 | |
@@ -275,107 +275,107 @@ discard block |
||
| 275 | 275 | function geodir_content_actions_dynamic() |
| 276 | 276 | {
|
| 277 | 277 | |
| 278 | - $tc = get_option('theme_compatibility_setting');
|
|
| 278 | + $tc = get_option('theme_compatibility_setting');
|
|
| 279 | 279 | //print_r($tc); |
| 280 | - if (empty($tc)) {
|
|
| 281 | - return; |
|
| 282 | - } |
|
| 283 | - |
|
| 284 | - //php |
|
| 285 | - if (!empty($tc['geodir_theme_compat_code'])) {
|
|
| 286 | - include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');
|
|
| 287 | - } |
|
| 288 | - |
|
| 289 | - //geodir_full_page_class |
|
| 290 | - if (!empty($tc['geodir_full_page_class_filter'])) {
|
|
| 291 | - add_filter('geodir_full_page_class', 'geodir_full_page_class_dynamic', 10);
|
|
| 292 | - } |
|
| 293 | - |
|
| 294 | - //widget before filter |
|
| 295 | - if (!empty($tc['geodir_before_widget_filter'])) {
|
|
| 296 | - add_filter('geodir_before_widget', 'geodir_before_widget_dynamic', 10);
|
|
| 297 | - } |
|
| 298 | - |
|
| 299 | - //widget after filter |
|
| 300 | - if (!empty($tc['geodir_after_widget_filter'])) {
|
|
| 301 | - add_filter('geodir_after_widget', 'geodir_after_widget_dynamic', 10);
|
|
| 302 | - } |
|
| 303 | - |
|
| 304 | - //widget before title filter |
|
| 305 | - if (!empty($tc['geodir_before_title_filter'])) {
|
|
| 306 | - add_filter('geodir_before_title', 'geodir_before_title_dynamic', 10);
|
|
| 307 | - } |
|
| 308 | - |
|
| 309 | - //widget before title filter |
|
| 310 | - if (!empty($tc['geodir_after_title_filter'])) {
|
|
| 311 | - add_filter('geodir_after_title', 'geodir_after_title_dynamic', 10);
|
|
| 312 | - } |
|
| 313 | - |
|
| 314 | - //menu li class |
|
| 315 | - if (!empty($tc['geodir_menu_li_class_filter'])) {
|
|
| 316 | - add_filter('geodir_menu_li_class', 'geodir_menu_li_class_dynamic', 10);
|
|
| 317 | - } |
|
| 318 | - |
|
| 319 | - //menu ul class |
|
| 320 | - if (!empty($tc['geodir_sub_menu_ul_class_filter'])) {
|
|
| 321 | - add_filter('geodir_sub_menu_ul_class', 'geodir_sub_menu_ul_class_dynamic', 10);
|
|
| 322 | - } |
|
| 323 | - |
|
| 324 | - //menu sub li class |
|
| 325 | - if (!empty($tc['geodir_sub_menu_li_class_filter'])) {
|
|
| 326 | - add_filter('geodir_sub_menu_li_class', 'geodir_sub_menu_li_class_dynamic', 10);
|
|
| 327 | - } |
|
| 328 | - |
|
| 329 | - //menu a class |
|
| 330 | - if (!empty($tc['geodir_menu_a_class_filter'])) {
|
|
| 331 | - add_filter('geodir_menu_a_class', 'geodir_menu_a_class_dynamic', 10);
|
|
| 332 | - } |
|
| 333 | - |
|
| 334 | - //menu sub a class |
|
| 335 | - if (!empty($tc['geodir_sub_menu_a_class_filter'])) {
|
|
| 336 | - add_filter('geodir_sub_menu_a_class', 'geodir_sub_menu_a_class_dynamic', 10);
|
|
| 337 | - } |
|
| 338 | - |
|
| 339 | - //location menu li class |
|
| 340 | - if (!empty($tc['geodir_location_switcher_menu_li_class_filter'])) {
|
|
| 341 | - add_filter('geodir_location_switcher_menu_li_class', 'geodir_location_switcher_menu_li_class_dynamic', 10);
|
|
| 342 | - } |
|
| 343 | - |
|
| 344 | - //location menu sub ul class |
|
| 345 | - if (!empty($tc['geodir_location_switcher_menu_sub_ul_class_filter'])) {
|
|
| 346 | - add_filter('geodir_location_switcher_menu_sub_ul_class', 'geodir_location_switcher_menu_sub_ul_class_dynamic', 10);
|
|
| 347 | - } |
|
| 348 | - |
|
| 349 | - //location menu sub li class |
|
| 350 | - if (!empty($tc['geodir_location_switcher_menu_sub_li_class_filter'])) {
|
|
| 351 | - add_filter('geodir_location_switcher_menu_sub_li_class', 'geodir_location_switcher_menu_sub_li_class_dynamic', 10);
|
|
| 352 | - } |
|
| 353 | - |
|
| 354 | - //location menu a class |
|
| 355 | - if (!empty($tc['geodir_location_switcher_menu_a_class_filter'])) {
|
|
| 356 | - add_filter('geodir_location_switcher_menu_a_class', 'geodir_location_switcher_menu_a_class_dynamic', 10);
|
|
| 357 | - } |
|
| 358 | - |
|
| 359 | - // compat styles |
|
| 360 | - if (!empty($tc['geodir_theme_compat_css'])) {
|
|
| 361 | - add_action('wp_head', 'gd_compat_styles');
|
|
| 362 | - } |
|
| 363 | - |
|
| 364 | - // compat js |
|
| 365 | - if (!empty($tc['geodir_theme_compat_js'])) {
|
|
| 366 | - add_action('wp_footer', 'gd_compat_script');
|
|
| 367 | - } |
|
| 368 | - |
|
| 369 | - |
|
| 370 | - // geodir_top_content_add |
|
| 371 | - if (!empty($tc['geodir_top_content_add'])) {
|
|
| 372 | - add_action('geodir_top_content', 'geodir_top_content_add_dynamic', 10, 1);
|
|
| 373 | - } |
|
| 374 | - |
|
| 375 | - // geodir_before_main_content_add |
|
| 376 | - if (!empty($tc['geodir_before_main_content_add'])) {
|
|
| 377 | - add_action('geodir_before_main_content', 'geodir_before_main_content_add_dynamic', 10, 1);
|
|
| 378 | - } |
|
| 280 | + if (empty($tc)) {
|
|
| 281 | + return; |
|
| 282 | + } |
|
| 283 | + |
|
| 284 | + //php |
|
| 285 | + if (!empty($tc['geodir_theme_compat_code'])) {
|
|
| 286 | + include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');
|
|
| 287 | + } |
|
| 288 | + |
|
| 289 | + //geodir_full_page_class |
|
| 290 | + if (!empty($tc['geodir_full_page_class_filter'])) {
|
|
| 291 | + add_filter('geodir_full_page_class', 'geodir_full_page_class_dynamic', 10);
|
|
| 292 | + } |
|
| 293 | + |
|
| 294 | + //widget before filter |
|
| 295 | + if (!empty($tc['geodir_before_widget_filter'])) {
|
|
| 296 | + add_filter('geodir_before_widget', 'geodir_before_widget_dynamic', 10);
|
|
| 297 | + } |
|
| 298 | + |
|
| 299 | + //widget after filter |
|
| 300 | + if (!empty($tc['geodir_after_widget_filter'])) {
|
|
| 301 | + add_filter('geodir_after_widget', 'geodir_after_widget_dynamic', 10);
|
|
| 302 | + } |
|
| 303 | + |
|
| 304 | + //widget before title filter |
|
| 305 | + if (!empty($tc['geodir_before_title_filter'])) {
|
|
| 306 | + add_filter('geodir_before_title', 'geodir_before_title_dynamic', 10);
|
|
| 307 | + } |
|
| 308 | + |
|
| 309 | + //widget before title filter |
|
| 310 | + if (!empty($tc['geodir_after_title_filter'])) {
|
|
| 311 | + add_filter('geodir_after_title', 'geodir_after_title_dynamic', 10);
|
|
| 312 | + } |
|
| 313 | + |
|
| 314 | + //menu li class |
|
| 315 | + if (!empty($tc['geodir_menu_li_class_filter'])) {
|
|
| 316 | + add_filter('geodir_menu_li_class', 'geodir_menu_li_class_dynamic', 10);
|
|
| 317 | + } |
|
| 318 | + |
|
| 319 | + //menu ul class |
|
| 320 | + if (!empty($tc['geodir_sub_menu_ul_class_filter'])) {
|
|
| 321 | + add_filter('geodir_sub_menu_ul_class', 'geodir_sub_menu_ul_class_dynamic', 10);
|
|
| 322 | + } |
|
| 323 | + |
|
| 324 | + //menu sub li class |
|
| 325 | + if (!empty($tc['geodir_sub_menu_li_class_filter'])) {
|
|
| 326 | + add_filter('geodir_sub_menu_li_class', 'geodir_sub_menu_li_class_dynamic', 10);
|
|
| 327 | + } |
|
| 328 | + |
|
| 329 | + //menu a class |
|
| 330 | + if (!empty($tc['geodir_menu_a_class_filter'])) {
|
|
| 331 | + add_filter('geodir_menu_a_class', 'geodir_menu_a_class_dynamic', 10);
|
|
| 332 | + } |
|
| 333 | + |
|
| 334 | + //menu sub a class |
|
| 335 | + if (!empty($tc['geodir_sub_menu_a_class_filter'])) {
|
|
| 336 | + add_filter('geodir_sub_menu_a_class', 'geodir_sub_menu_a_class_dynamic', 10);
|
|
| 337 | + } |
|
| 338 | + |
|
| 339 | + //location menu li class |
|
| 340 | + if (!empty($tc['geodir_location_switcher_menu_li_class_filter'])) {
|
|
| 341 | + add_filter('geodir_location_switcher_menu_li_class', 'geodir_location_switcher_menu_li_class_dynamic', 10);
|
|
| 342 | + } |
|
| 343 | + |
|
| 344 | + //location menu sub ul class |
|
| 345 | + if (!empty($tc['geodir_location_switcher_menu_sub_ul_class_filter'])) {
|
|
| 346 | + add_filter('geodir_location_switcher_menu_sub_ul_class', 'geodir_location_switcher_menu_sub_ul_class_dynamic', 10);
|
|
| 347 | + } |
|
| 348 | + |
|
| 349 | + //location menu sub li class |
|
| 350 | + if (!empty($tc['geodir_location_switcher_menu_sub_li_class_filter'])) {
|
|
| 351 | + add_filter('geodir_location_switcher_menu_sub_li_class', 'geodir_location_switcher_menu_sub_li_class_dynamic', 10);
|
|
| 352 | + } |
|
| 353 | + |
|
| 354 | + //location menu a class |
|
| 355 | + if (!empty($tc['geodir_location_switcher_menu_a_class_filter'])) {
|
|
| 356 | + add_filter('geodir_location_switcher_menu_a_class', 'geodir_location_switcher_menu_a_class_dynamic', 10);
|
|
| 357 | + } |
|
| 358 | + |
|
| 359 | + // compat styles |
|
| 360 | + if (!empty($tc['geodir_theme_compat_css'])) {
|
|
| 361 | + add_action('wp_head', 'gd_compat_styles');
|
|
| 362 | + } |
|
| 363 | + |
|
| 364 | + // compat js |
|
| 365 | + if (!empty($tc['geodir_theme_compat_js'])) {
|
|
| 366 | + add_action('wp_footer', 'gd_compat_script');
|
|
| 367 | + } |
|
| 368 | + |
|
| 369 | + |
|
| 370 | + // geodir_top_content_add |
|
| 371 | + if (!empty($tc['geodir_top_content_add'])) {
|
|
| 372 | + add_action('geodir_top_content', 'geodir_top_content_add_dynamic', 10, 1);
|
|
| 373 | + } |
|
| 374 | + |
|
| 375 | + // geodir_before_main_content_add |
|
| 376 | + if (!empty($tc['geodir_before_main_content_add'])) {
|
|
| 377 | + add_action('geodir_before_main_content', 'geodir_before_main_content_add_dynamic', 10, 1);
|
|
| 378 | + } |
|
| 379 | 379 | |
| 380 | 380 | |
| 381 | 381 | } |
@@ -398,23 +398,23 @@ discard block |
||
| 398 | 398 | */ |
| 399 | 399 | function geodir_action_wrapper_open($type = '', $id = '', $class = '') |
| 400 | 400 | {
|
| 401 | - $tc = get_option('theme_compatibility_setting');
|
|
| 402 | - if (!empty($tc['geodir_wrapper_open_replace'])) {
|
|
| 403 | - $text = $tc['geodir_wrapper_open_replace']; |
|
| 404 | - } else {
|
|
| 405 | - $text = '<div id="[id]" class="[class]">'; |
|
| 406 | - } |
|
| 401 | + $tc = get_option('theme_compatibility_setting');
|
|
| 402 | + if (!empty($tc['geodir_wrapper_open_replace'])) {
|
|
| 403 | + $text = $tc['geodir_wrapper_open_replace']; |
|
| 404 | + } else {
|
|
| 405 | + $text = '<div id="[id]" class="[class]">'; |
|
| 406 | + } |
|
| 407 | 407 | |
| 408 | - if (!empty($tc['geodir_wrapper_open_id'])) {
|
|
| 409 | - $id = $tc['geodir_wrapper_open_id']; |
|
| 410 | - } |
|
| 411 | - if (!empty($tc['geodir_wrapper_open_class'])) {
|
|
| 412 | - $class = $tc['geodir_wrapper_open_class']; |
|
| 413 | - } |
|
| 408 | + if (!empty($tc['geodir_wrapper_open_id'])) {
|
|
| 409 | + $id = $tc['geodir_wrapper_open_id']; |
|
| 410 | + } |
|
| 411 | + if (!empty($tc['geodir_wrapper_open_class'])) {
|
|
| 412 | + $class = $tc['geodir_wrapper_open_class']; |
|
| 413 | + } |
|
| 414 | 414 | |
| 415 | - $text = str_replace(array("[id]", "[class]"), array($id, $class), $text);
|
|
| 415 | + $text = str_replace(array("[id]", "[class]"), array($id, $class), $text);
|
|
| 416 | 416 | |
| 417 | - echo $text; |
|
| 417 | + echo $text; |
|
| 418 | 418 | } |
| 419 | 419 | |
| 420 | 420 | // action for adding the wrapperdiv closing tag |
@@ -429,14 +429,14 @@ discard block |
||
| 429 | 429 | */ |
| 430 | 430 | function geodir_action_wrapper_close($type = '') |
| 431 | 431 | {
|
| 432 | - $tc = get_option('theme_compatibility_setting');
|
|
| 433 | - if (!empty($tc['geodir_wrapper_close_replace'])) {
|
|
| 434 | - $text = $tc['geodir_wrapper_close_replace']; |
|
| 435 | - } else {
|
|
| 436 | - $text = '</div><!-- wrapper ends here-->'; |
|
| 437 | - } |
|
| 432 | + $tc = get_option('theme_compatibility_setting');
|
|
| 433 | + if (!empty($tc['geodir_wrapper_close_replace'])) {
|
|
| 434 | + $text = $tc['geodir_wrapper_close_replace']; |
|
| 435 | + } else {
|
|
| 436 | + $text = '</div><!-- wrapper ends here-->'; |
|
| 437 | + } |
|
| 438 | 438 | |
| 439 | - echo $text; |
|
| 439 | + echo $text; |
|
| 440 | 440 | } |
| 441 | 441 | |
| 442 | 442 | // action for adding the content div opening tag |
@@ -452,35 +452,35 @@ discard block |
||
| 452 | 452 | */ |
| 453 | 453 | function geodir_action_wrapper_content_open($type = '', $id = '', $class = '') |
| 454 | 454 | {
|
| 455 | - if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {
|
|
| 456 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 457 | - } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {
|
|
| 458 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 459 | - } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {
|
|
| 460 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 461 | - } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {
|
|
| 462 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 463 | - } else {
|
|
| 464 | - $width_css = ''; |
|
| 465 | - } |
|
| 466 | - |
|
| 467 | - $tc = get_option('theme_compatibility_setting');
|
|
| 468 | - if (!empty($tc['geodir_wrapper_content_open_replace'])) {
|
|
| 469 | - $text = $tc['geodir_wrapper_content_open_replace']; |
|
| 470 | - } else {
|
|
| 471 | - $text = '<div id="[id]" class="[class]" role="main" [width_css]>'; |
|
| 472 | - } |
|
| 473 | - |
|
| 474 | - if (!empty($tc['geodir_wrapper_content_open_id'])) {
|
|
| 475 | - $id = $tc['geodir_wrapper_content_open_id']; |
|
| 476 | - } |
|
| 477 | - if (!empty($tc['geodir_wrapper_content_open_class'])) {
|
|
| 478 | - $class = $tc['geodir_wrapper_content_open_class']; |
|
| 479 | - } |
|
| 480 | - |
|
| 481 | - $text = str_replace(array("[id]", "[class]", "[width_css]"), array($id, $class, $width_css), $text);
|
|
| 482 | - |
|
| 483 | - echo $text; |
|
| 455 | + if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {
|
|
| 456 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 457 | + } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {
|
|
| 458 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 459 | + } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {
|
|
| 460 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 461 | + } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {
|
|
| 462 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 463 | + } else {
|
|
| 464 | + $width_css = ''; |
|
| 465 | + } |
|
| 466 | + |
|
| 467 | + $tc = get_option('theme_compatibility_setting');
|
|
| 468 | + if (!empty($tc['geodir_wrapper_content_open_replace'])) {
|
|
| 469 | + $text = $tc['geodir_wrapper_content_open_replace']; |
|
| 470 | + } else {
|
|
| 471 | + $text = '<div id="[id]" class="[class]" role="main" [width_css]>'; |
|
| 472 | + } |
|
| 473 | + |
|
| 474 | + if (!empty($tc['geodir_wrapper_content_open_id'])) {
|
|
| 475 | + $id = $tc['geodir_wrapper_content_open_id']; |
|
| 476 | + } |
|
| 477 | + if (!empty($tc['geodir_wrapper_content_open_class'])) {
|
|
| 478 | + $class = $tc['geodir_wrapper_content_open_class']; |
|
| 479 | + } |
|
| 480 | + |
|
| 481 | + $text = str_replace(array("[id]", "[class]", "[width_css]"), array($id, $class, $width_css), $text);
|
|
| 482 | + |
|
| 483 | + echo $text; |
|
| 484 | 484 | } |
| 485 | 485 | |
| 486 | 486 | // action for adding the primary div closing tag |
@@ -494,13 +494,13 @@ discard block |
||
| 494 | 494 | */ |
| 495 | 495 | function geodir_action_wrapper_content_close($type = '') |
| 496 | 496 | {
|
| 497 | - $tc = get_option('theme_compatibility_setting');
|
|
| 498 | - if (!empty($tc['geodir_wrapper_content_close_replace'])) {
|
|
| 499 | - $text = $tc['geodir_wrapper_content_close_replace']; |
|
| 500 | - } else {
|
|
| 501 | - $text = '</div><!-- content ends here-->'; |
|
| 502 | - } |
|
| 503 | - echo $text; |
|
| 497 | + $tc = get_option('theme_compatibility_setting');
|
|
| 498 | + if (!empty($tc['geodir_wrapper_content_close_replace'])) {
|
|
| 499 | + $text = $tc['geodir_wrapper_content_close_replace']; |
|
| 500 | + } else {
|
|
| 501 | + $text = '</div><!-- content ends here-->'; |
|
| 502 | + } |
|
| 503 | + echo $text; |
|
| 504 | 504 | } |
| 505 | 505 | |
| 506 | 506 | // action for adding the <article> opening tag |
@@ -518,24 +518,24 @@ discard block |
||
| 518 | 518 | */ |
| 519 | 519 | function geodir_action_article_open($type = '', $id = '', $class = '', $itemtype = '') |
| 520 | 520 | {
|
| 521 | - $class = implode(" ", $class);
|
|
| 522 | - $tc = get_option('theme_compatibility_setting');
|
|
| 523 | - if (!empty($tc['geodir_article_open_replace'])) {
|
|
| 524 | - $text = $tc['geodir_article_open_replace']; |
|
| 525 | - } else {
|
|
| 526 | - $text = '<article id="[id]" class="[class]" >'; |
|
| 527 | - } |
|
| 521 | + $class = implode(" ", $class);
|
|
| 522 | + $tc = get_option('theme_compatibility_setting');
|
|
| 523 | + if (!empty($tc['geodir_article_open_replace'])) {
|
|
| 524 | + $text = $tc['geodir_article_open_replace']; |
|
| 525 | + } else {
|
|
| 526 | + $text = '<article id="[id]" class="[class]" >'; |
|
| 527 | + } |
|
| 528 | 528 | |
| 529 | - if (!empty($tc['geodir_article_open_id'])) {
|
|
| 530 | - $id = $tc['geodir_article_open_id']; |
|
| 531 | - } |
|
| 532 | - if (!empty($tc['geodir_article_open_class'])) {
|
|
| 533 | - $class = $tc['geodir_article_open_class']; |
|
| 534 | - } |
|
| 529 | + if (!empty($tc['geodir_article_open_id'])) {
|
|
| 530 | + $id = $tc['geodir_article_open_id']; |
|
| 531 | + } |
|
| 532 | + if (!empty($tc['geodir_article_open_class'])) {
|
|
| 533 | + $class = $tc['geodir_article_open_class']; |
|
| 534 | + } |
|
| 535 | 535 | |
| 536 | - $text = str_replace(array("[id]", "[class]", "[itemtype]"), array($id, $class, $itemtype), $text);
|
|
| 536 | + $text = str_replace(array("[id]", "[class]", "[itemtype]"), array($id, $class, $itemtype), $text);
|
|
| 537 | 537 | |
| 538 | - echo $text; |
|
| 538 | + echo $text; |
|
| 539 | 539 | } |
| 540 | 540 | |
| 541 | 541 | // action for adding the primary div closing tag |
@@ -549,13 +549,13 @@ discard block |
||
| 549 | 549 | */ |
| 550 | 550 | function geodir_action_article_close($type = '') |
| 551 | 551 | {
|
| 552 | - $tc = get_option('theme_compatibility_setting');
|
|
| 553 | - if (!empty($tc['geodir_article_close_replace'])) {
|
|
| 554 | - $text = $tc['geodir_article_close_replace']; |
|
| 555 | - } else {
|
|
| 556 | - $text = '</article><!-- article ends here-->'; |
|
| 557 | - } |
|
| 558 | - echo $text; |
|
| 552 | + $tc = get_option('theme_compatibility_setting');
|
|
| 553 | + if (!empty($tc['geodir_article_close_replace'])) {
|
|
| 554 | + $text = $tc['geodir_article_close_replace']; |
|
| 555 | + } else {
|
|
| 556 | + $text = '</article><!-- article ends here-->'; |
|
| 557 | + } |
|
| 558 | + echo $text; |
|
| 559 | 559 | } |
| 560 | 560 | |
| 561 | 561 | // action for adding the sidebar opening tag |
@@ -572,35 +572,35 @@ discard block |
||
| 572 | 572 | */ |
| 573 | 573 | function geodir_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '') |
| 574 | 574 | {
|
| 575 | - if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {
|
|
| 576 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 577 | - } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {
|
|
| 578 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 579 | - } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {
|
|
| 580 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 581 | - } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {
|
|
| 582 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 583 | - } else {
|
|
| 584 | - $width_css = ''; |
|
| 585 | - } |
|
| 586 | - |
|
| 587 | - $tc = get_option('theme_compatibility_setting');
|
|
| 588 | - if (!empty($tc['geodir_sidebar_right_open_replace'])) {
|
|
| 589 | - $text = $tc['geodir_sidebar_right_open_replace']; |
|
| 590 | - } else {
|
|
| 591 | - $text = '<aside id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>'; |
|
| 592 | - } |
|
| 593 | - |
|
| 594 | - if (!empty($tc['geodir_sidebar_right_open_id'])) {
|
|
| 595 | - $id = $tc['geodir_sidebar_right_open_id']; |
|
| 596 | - } |
|
| 597 | - if (!empty($tc['geodir_sidebar_right_open_class'])) {
|
|
| 598 | - $class = $tc['geodir_sidebar_right_open_class']; |
|
| 599 | - } |
|
| 600 | - |
|
| 601 | - $text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);
|
|
| 602 | - |
|
| 603 | - echo $text; |
|
| 575 | + if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {
|
|
| 576 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 577 | + } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {
|
|
| 578 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 579 | + } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {
|
|
| 580 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 581 | + } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {
|
|
| 582 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 583 | + } else {
|
|
| 584 | + $width_css = ''; |
|
| 585 | + } |
|
| 586 | + |
|
| 587 | + $tc = get_option('theme_compatibility_setting');
|
|
| 588 | + if (!empty($tc['geodir_sidebar_right_open_replace'])) {
|
|
| 589 | + $text = $tc['geodir_sidebar_right_open_replace']; |
|
| 590 | + } else {
|
|
| 591 | + $text = '<aside id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>'; |
|
| 592 | + } |
|
| 593 | + |
|
| 594 | + if (!empty($tc['geodir_sidebar_right_open_id'])) {
|
|
| 595 | + $id = $tc['geodir_sidebar_right_open_id']; |
|
| 596 | + } |
|
| 597 | + if (!empty($tc['geodir_sidebar_right_open_class'])) {
|
|
| 598 | + $class = $tc['geodir_sidebar_right_open_class']; |
|
| 599 | + } |
|
| 600 | + |
|
| 601 | + $text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);
|
|
| 602 | + |
|
| 603 | + echo $text; |
|
| 604 | 604 | } |
| 605 | 605 | |
| 606 | 606 | // action for adding the primary div closing tag |
@@ -614,13 +614,13 @@ discard block |
||
| 614 | 614 | */ |
| 615 | 615 | function geodir_action_sidebar_right_close($type = '') |
| 616 | 616 | {
|
| 617 | - $tc = get_option('theme_compatibility_setting');
|
|
| 618 | - if (!empty($tc['geodir_sidebar_right_close_replace'])) {
|
|
| 619 | - $text = $tc['geodir_sidebar_right_close_replace']; |
|
| 620 | - } else {
|
|
| 621 | - $text = '</aside><!-- sidebar ends here-->'; |
|
| 622 | - } |
|
| 623 | - echo $text; |
|
| 617 | + $tc = get_option('theme_compatibility_setting');
|
|
| 618 | + if (!empty($tc['geodir_sidebar_right_close_replace'])) {
|
|
| 619 | + $text = $tc['geodir_sidebar_right_close_replace']; |
|
| 620 | + } else {
|
|
| 621 | + $text = '</aside><!-- sidebar ends here-->'; |
|
| 622 | + } |
|
| 623 | + echo $text; |
|
| 624 | 624 | } |
| 625 | 625 | |
| 626 | 626 | |
@@ -641,120 +641,120 @@ discard block |
||
| 641 | 641 | */ |
| 642 | 642 | function geodir_action_geodir_set_preview_post() |
| 643 | 643 | {
|
| 644 | - global $post, $preview, $gd_session; |
|
| 645 | - $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend |
|
| 646 | - if (!$preview || $is_backend_preview) {
|
|
| 647 | - return; |
|
| 648 | - }// bail if not previewing |
|
| 649 | - |
|
| 650 | - $listing_type = isset($_REQUEST['listing_type']) ? sanitize_text_field($_REQUEST['listing_type']) : ''; |
|
| 651 | - |
|
| 652 | - $fields_info = geodir_get_custom_fields_type($listing_type); |
|
| 653 | - |
|
| 654 | - foreach ($_REQUEST as $pkey => $pval) {
|
|
| 655 | - if ($pkey == 'geodir_video') {
|
|
| 656 | - $tags = '<iframe>'; |
|
| 657 | - } else if ($pkey == 'post_desc') {
|
|
| 658 | - $tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'; |
|
| 659 | - } else if (is_array($fields_info) && isset($fields_info[$pkey]) && ($fields_info[$pkey] == 'textarea' || $fields_info[$pkey] == 'html')) {
|
|
| 660 | - $tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'; |
|
| 661 | - } else if (is_array($_REQUEST[$pkey])) {
|
|
| 662 | - $tags = 'skip_field'; |
|
| 663 | - } else {
|
|
| 664 | - $tags = ''; |
|
| 665 | - } |
|
| 666 | - /** |
|
| 667 | - * Allows the filtering of the allowed HTML tags per field when submitting from frontend add listing page. |
|
| 668 | - * |
|
| 669 | - * @since 1.0.0 |
|
| 670 | - * @param string $tags The allowed HTML tags for the field. Can be many things, for example the description allows these tags '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'. |
|
| 671 | - * @param string|array $pkey The field id/name. If array then value is set as "skip_field". |
|
| 672 | - */ |
|
| 673 | - $tags = apply_filters('geodir_save_post_key', $tags, $pkey);
|
|
| 674 | - |
|
| 675 | - if ($tags != 'skip_field') {
|
|
| 676 | - $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags); |
|
| 677 | - } |
|
| 678 | - } |
|
| 644 | + global $post, $preview, $gd_session; |
|
| 645 | + $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend |
|
| 646 | + if (!$preview || $is_backend_preview) {
|
|
| 647 | + return; |
|
| 648 | + }// bail if not previewing |
|
| 649 | + |
|
| 650 | + $listing_type = isset($_REQUEST['listing_type']) ? sanitize_text_field($_REQUEST['listing_type']) : ''; |
|
| 651 | + |
|
| 652 | + $fields_info = geodir_get_custom_fields_type($listing_type); |
|
| 653 | + |
|
| 654 | + foreach ($_REQUEST as $pkey => $pval) {
|
|
| 655 | + if ($pkey == 'geodir_video') {
|
|
| 656 | + $tags = '<iframe>'; |
|
| 657 | + } else if ($pkey == 'post_desc') {
|
|
| 658 | + $tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'; |
|
| 659 | + } else if (is_array($fields_info) && isset($fields_info[$pkey]) && ($fields_info[$pkey] == 'textarea' || $fields_info[$pkey] == 'html')) {
|
|
| 660 | + $tags = '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'; |
|
| 661 | + } else if (is_array($_REQUEST[$pkey])) {
|
|
| 662 | + $tags = 'skip_field'; |
|
| 663 | + } else {
|
|
| 664 | + $tags = ''; |
|
| 665 | + } |
|
| 666 | + /** |
|
| 667 | + * Allows the filtering of the allowed HTML tags per field when submitting from frontend add listing page. |
|
| 668 | + * |
|
| 669 | + * @since 1.0.0 |
|
| 670 | + * @param string $tags The allowed HTML tags for the field. Can be many things, for example the description allows these tags '<p><a><b><i><em><h1><h2><h3><h4><h5><ul><ol><li><img><div><del><ins><span><cite><code><strike><strong><blockquote>'. |
|
| 671 | + * @param string|array $pkey The field id/name. If array then value is set as "skip_field". |
|
| 672 | + */ |
|
| 673 | + $tags = apply_filters('geodir_save_post_key', $tags, $pkey);
|
|
| 674 | + |
|
| 675 | + if ($tags != 'skip_field') {
|
|
| 676 | + $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags); |
|
| 677 | + } |
|
| 678 | + } |
|
| 679 | 679 | |
| 680 | - $post = (object)$_REQUEST; |
|
| 680 | + $post = (object)$_REQUEST; |
|
| 681 | 681 | |
| 682 | 682 | |
| 683 | - if (isset($post->video)) {
|
|
| 684 | - $post->video = stripslashes($post->video); |
|
| 685 | - } |
|
| 683 | + if (isset($post->video)) {
|
|
| 684 | + $post->video = stripslashes($post->video); |
|
| 685 | + } |
|
| 686 | 686 | |
| 687 | - if (isset($post->Video2)) {
|
|
| 688 | - $post->Video2 = stripslashes($post->Video2); |
|
| 689 | - } |
|
| 687 | + if (isset($post->Video2)) {
|
|
| 688 | + $post->Video2 = stripslashes($post->Video2); |
|
| 689 | + } |
|
| 690 | 690 | |
| 691 | - $post_type = $post->listing_type; |
|
| 692 | - $post_type_info = get_post_type_object($post_type); |
|
| 691 | + $post_type = $post->listing_type; |
|
| 692 | + $post_type_info = get_post_type_object($post_type); |
|
| 693 | 693 | |
| 694 | - $listing_label = $post_type_info->labels->singular_name; |
|
| 694 | + $listing_label = $post_type_info->labels->singular_name; |
|
| 695 | 695 | |
| 696 | - $term_icon = ''; |
|
| 696 | + $term_icon = ''; |
|
| 697 | 697 | |
| 698 | - if (!empty($post->post_category)) {
|
|
| 699 | - foreach ($post->post_category as $post_taxonomy => $post_term) {
|
|
| 698 | + if (!empty($post->post_category)) {
|
|
| 699 | + foreach ($post->post_category as $post_taxonomy => $post_term) {
|
|
| 700 | 700 | |
| 701 | - if ($post_term != '' && !is_array($post_term)) {
|
|
| 702 | - $post_term = explode(',', trim($post_term, ','));
|
|
| 703 | - } |
|
| 701 | + if ($post_term != '' && !is_array($post_term)) {
|
|
| 702 | + $post_term = explode(',', trim($post_term, ','));
|
|
| 703 | + } |
|
| 704 | 704 | |
| 705 | - if (is_array($post_term)) {
|
|
| 706 | - $post_term = array_unique($post_term); |
|
| 707 | - } |
|
| 705 | + if (is_array($post_term)) {
|
|
| 706 | + $post_term = array_unique($post_term); |
|
| 707 | + } |
|
| 708 | 708 | |
| 709 | - if (!empty($post_term)) {
|
|
| 710 | - foreach ($post_term as $cat_id) {
|
|
| 711 | - $cat_id = trim($cat_id); |
|
| 712 | - |
|
| 713 | - if ($cat_id != '') {
|
|
| 714 | - $term_icon = get_option('geodir_default_marker_icon');
|
|
| 715 | - |
|
| 716 | - if (isset($post->post_default_category) && $post->post_default_category == $cat_id) {
|
|
| 717 | - if ($term_icon_url = geodir_get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type)) {
|
|
| 718 | - if (isset($term_icon_url['src']) && $term_icon_url['src'] != '') |
|
| 719 | - $term_icon = $term_icon_url['src']; |
|
| 720 | - break; |
|
| 721 | - } |
|
| 722 | - } |
|
| 723 | - } |
|
| 724 | - } |
|
| 725 | - } |
|
| 726 | - } |
|
| 727 | - } |
|
| 709 | + if (!empty($post_term)) {
|
|
| 710 | + foreach ($post_term as $cat_id) {
|
|
| 711 | + $cat_id = trim($cat_id); |
|
| 712 | + |
|
| 713 | + if ($cat_id != '') {
|
|
| 714 | + $term_icon = get_option('geodir_default_marker_icon');
|
|
| 715 | + |
|
| 716 | + if (isset($post->post_default_category) && $post->post_default_category == $cat_id) {
|
|
| 717 | + if ($term_icon_url = geodir_get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type)) {
|
|
| 718 | + if (isset($term_icon_url['src']) && $term_icon_url['src'] != '') |
|
| 719 | + $term_icon = $term_icon_url['src']; |
|
| 720 | + break; |
|
| 721 | + } |
|
| 722 | + } |
|
| 723 | + } |
|
| 724 | + } |
|
| 725 | + } |
|
| 726 | + } |
|
| 727 | + } |
|
| 728 | 728 | |
| 729 | - $post_latitude = isset($post->post_latitude) ? $post->post_latitude : ''; |
|
| 730 | - $post_longitude = isset($post->post_longitude) ? $post->post_longitude : ''; |
|
| 729 | + $post_latitude = isset($post->post_latitude) ? $post->post_latitude : ''; |
|
| 730 | + $post_longitude = isset($post->post_longitude) ? $post->post_longitude : ''; |
|
| 731 | 731 | |
| 732 | - $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 733 | - $replarr = array("′", "⁄", "–", "“", '');
|
|
| 732 | + $srcharr = array("'", "/", "-", '"', '\\');
|
|
| 733 | + $replarr = array("′", "⁄", "–", "“", '');
|
|
| 734 | 734 | |
| 735 | - $json_title = str_replace($srcharr, $replarr, $post->post_title); |
|
| 735 | + $json_title = str_replace($srcharr, $replarr, $post->post_title); |
|
| 736 | 736 | |
| 737 | - $json = '{';
|
|
| 738 | - $json .= '"post_preview": "1",'; |
|
| 739 | - $json .= '"t": "' . $json_title . '",'; |
|
| 740 | - $json .= '"lt": "' . $post_latitude . '",'; |
|
| 741 | - $json .= '"ln": "' . $post_longitude . '",'; |
|
| 742 | - $json .= '"i":"' . $term_icon . '"'; |
|
| 743 | - $json .= '}'; |
|
| 737 | + $json = '{';
|
|
| 738 | + $json .= '"post_preview": "1",'; |
|
| 739 | + $json .= '"t": "' . $json_title . '",'; |
|
| 740 | + $json .= '"lt": "' . $post_latitude . '",'; |
|
| 741 | + $json .= '"ln": "' . $post_longitude . '",'; |
|
| 742 | + $json .= '"i":"' . $term_icon . '"'; |
|
| 743 | + $json .= '}'; |
|
| 744 | 744 | |
| 745 | - $post->marker_json = $json; |
|
| 745 | + $post->marker_json = $json; |
|
| 746 | 746 | |
| 747 | - $gd_session->set('listing', $_REQUEST);
|
|
| 747 | + $gd_session->set('listing', $_REQUEST);
|
|
| 748 | 748 | |
| 749 | - // we need to define a few things to trick the setup_postdata |
|
| 750 | - if (!isset($post->ID)) {
|
|
| 751 | - $post->ID = ''; |
|
| 752 | - $post->post_author = ''; |
|
| 753 | - $post->post_date = ''; |
|
| 754 | - $post->post_content = ''; |
|
| 755 | - $post->default_category = ''; |
|
| 756 | - $post->post_type = ''; |
|
| 757 | - } |
|
| 749 | + // we need to define a few things to trick the setup_postdata |
|
| 750 | + if (!isset($post->ID)) {
|
|
| 751 | + $post->ID = ''; |
|
| 752 | + $post->post_author = ''; |
|
| 753 | + $post->post_date = ''; |
|
| 754 | + $post->post_content = ''; |
|
| 755 | + $post->default_category = ''; |
|
| 756 | + $post->post_type = ''; |
|
| 757 | + } |
|
| 758 | 758 | if (empty($post->default_category) && ! empty($post->post_default_category)) {
|
| 759 | 759 | $post->default_category = $post->post_default_category; |
| 760 | 760 | } |
@@ -766,7 +766,7 @@ discard block |
||
| 766 | 766 | if (!empty($post_type) && empty($post->{$cat_taxonomy}) && !empty($post->post_category) && !empty($post->post_category[$cat_taxonomy])) {
|
| 767 | 767 | $post->{$cat_taxonomy} = $post->post_category[$cat_taxonomy];
|
| 768 | 768 | } |
| 769 | - setup_postdata($post); |
|
| 769 | + setup_postdata($post); |
|
| 770 | 770 | } |
| 771 | 771 | |
| 772 | 772 | /** |
@@ -778,15 +778,15 @@ discard block |
||
| 778 | 778 | */ |
| 779 | 779 | function geodir_action_geodir_preview_code() |
| 780 | 780 | {
|
| 781 | - global $preview; |
|
| 781 | + global $preview; |
|
| 782 | 782 | |
| 783 | - $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend |
|
| 783 | + $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend |
|
| 784 | 784 | |
| 785 | - if (!$preview || $is_backend_preview) {
|
|
| 786 | - return; |
|
| 787 | - }// bail if not previewing |
|
| 785 | + if (!$preview || $is_backend_preview) {
|
|
| 786 | + return; |
|
| 787 | + }// bail if not previewing |
|
| 788 | 788 | |
| 789 | - geodir_get_template_part('preview', 'buttons');
|
|
| 789 | + geodir_get_template_part('preview', 'buttons');
|
|
| 790 | 790 | } |
| 791 | 791 | |
| 792 | 792 | // action for adding the details page top widget area |
@@ -802,20 +802,20 @@ discard block |
||
| 802 | 802 | */ |
| 803 | 803 | function geodir_action_geodir_sidebar_detail_top($class = '') |
| 804 | 804 | {
|
| 805 | - if (get_option('geodir_show_detail_top_section')) { ?>
|
|
| 805 | + if (get_option('geodir_show_detail_top_section')) { ?>
|
|
| 806 | 806 | <div |
| 807 | 807 | class="<?php |
| 808 | - /** |
|
| 809 | - * Filter the div class for the wrapper of the full width widget areas. |
|
| 810 | - * |
|
| 811 | - * Allows you to filter the class of the div for the HTML Container wrapper for the full width widget areas referred to as "Top Section" or "Bottom Section" in the widget areas. |
|
| 812 | - * |
|
| 813 | - * @since 1.0.0 |
|
| 814 | - * @param string $class The class of the div. |
|
| 815 | - * @param string $type The page type the widget area is being used on. Values can be 'geodir_detail_top', 'geodir_detail_bottom', 'geodir_listing_top', 'geodir_listing_bottom', 'Reg/Login Top Section', |
|
| 816 | - * 'geodir_author_top','geodir_author_bottom', 'geodir_search_top', 'geodir_search_bottom', 'geodir_home_top' or 'geodir_home_bottom'. |
|
| 817 | - */ |
|
| 818 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_top'); ?> <?php echo $class; ?>">
|
|
| 808 | + /** |
|
| 809 | + * Filter the div class for the wrapper of the full width widget areas. |
|
| 810 | + * |
|
| 811 | + * Allows you to filter the class of the div for the HTML Container wrapper for the full width widget areas referred to as "Top Section" or "Bottom Section" in the widget areas. |
|
| 812 | + * |
|
| 813 | + * @since 1.0.0 |
|
| 814 | + * @param string $class The class of the div. |
|
| 815 | + * @param string $type The page type the widget area is being used on. Values can be 'geodir_detail_top', 'geodir_detail_bottom', 'geodir_listing_top', 'geodir_listing_bottom', 'Reg/Login Top Section', |
|
| 816 | + * 'geodir_author_top','geodir_author_bottom', 'geodir_search_top', 'geodir_search_bottom', 'geodir_home_top' or 'geodir_home_bottom'. |
|
| 817 | + */ |
|
| 818 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_top'); ?> <?php echo $class; ?>">
|
|
| 819 | 819 | <?php dynamic_sidebar('geodir_detail_top'); ?>
|
| 820 | 820 | </div> |
| 821 | 821 | <?php } |
@@ -839,11 +839,11 @@ discard block |
||
| 839 | 839 | */ |
| 840 | 840 | function geodir_action_geodir_sidebar_detail_bottom_section($class = '') |
| 841 | 841 | {
|
| 842 | - if (get_option('geodir_show_detail_bottom_section')) { ?>
|
|
| 842 | + if (get_option('geodir_show_detail_bottom_section')) { ?>
|
|
| 843 | 843 | <div |
| 844 | 844 | class="<?php |
| 845 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 846 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_bottom'); ?> <?php echo $class; ?>">
|
|
| 845 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 846 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_detail_bottom'); ?> <?php echo $class; ?>">
|
|
| 847 | 847 | <?php dynamic_sidebar('geodir_detail_bottom'); ?>
|
| 848 | 848 | </div><!-- clearfix ends here--> |
| 849 | 849 | <?php } |
@@ -857,7 +857,7 @@ discard block |
||
| 857 | 857 | */ |
| 858 | 858 | function geodir_details_sidebar_widget_area() |
| 859 | 859 | {
|
| 860 | - dynamic_sidebar('geodir_detail_sidebar');
|
|
| 860 | + dynamic_sidebar('geodir_detail_sidebar');
|
|
| 861 | 861 | } |
| 862 | 862 | |
| 863 | 863 | /** |
@@ -868,12 +868,12 @@ discard block |
||
| 868 | 868 | */ |
| 869 | 869 | function geodir_details_sidebar_place_details() |
| 870 | 870 | {
|
| 871 | - /** |
|
| 872 | - * Used to add items to the details page sidebar. |
|
| 873 | - * |
|
| 874 | - * @since 1.0.0 |
|
| 875 | - */ |
|
| 876 | - do_action('geodir_detail_page_sidebar');
|
|
| 871 | + /** |
|
| 872 | + * Used to add items to the details page sidebar. |
|
| 873 | + * |
|
| 874 | + * @since 1.0.0 |
|
| 875 | + */ |
|
| 876 | + do_action('geodir_detail_page_sidebar');
|
|
| 877 | 877 | } |
| 878 | 878 | |
| 879 | 879 | add_action('geodir_detail_sidebar_inside', 'geodir_details_sidebar_place_details', 10);
|
@@ -888,68 +888,68 @@ discard block |
||
| 888 | 888 | */ |
| 889 | 889 | function geodir_action_details_sidebar() |
| 890 | 890 | {
|
| 891 | - // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='') |
|
| 892 | - if (get_option('geodir_detail_sidebar_left_section')) {
|
|
| 893 | - /** |
|
| 894 | - * Called before the details page left sidebar is opened. |
|
| 895 | - * |
|
| 896 | - * This is used to add opening wrapper HTML to the details page left sidebar. |
|
| 897 | - * |
|
| 898 | - * @since 1.0.0 |
|
| 899 | - * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 900 | - * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-left'. |
|
| 901 | - * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-left geodir-details-sidebar-left'. |
|
| 902 | - * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'. |
|
| 903 | - */ |
|
| 904 | - do_action('geodir_sidebar_left_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-left geodir-details-sidebar-left', 'https://schema.org/WPSideBar');
|
|
| 905 | - ?> |
|
| 891 | + // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='') |
|
| 892 | + if (get_option('geodir_detail_sidebar_left_section')) {
|
|
| 893 | + /** |
|
| 894 | + * Called before the details page left sidebar is opened. |
|
| 895 | + * |
|
| 896 | + * This is used to add opening wrapper HTML to the details page left sidebar. |
|
| 897 | + * |
|
| 898 | + * @since 1.0.0 |
|
| 899 | + * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 900 | + * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-left'. |
|
| 901 | + * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-left geodir-details-sidebar-left'. |
|
| 902 | + * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'. |
|
| 903 | + */ |
|
| 904 | + do_action('geodir_sidebar_left_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-left geodir-details-sidebar-left', 'https://schema.org/WPSideBar');
|
|
| 905 | + ?> |
|
| 906 | 906 | <div class="geodir-content-left geodir-sidebar-wrap"><?php |
| 907 | - /** |
|
| 908 | - * Called inside the HTML wrapper of the details sidebar for either the left and right sidebar. |
|
| 909 | - * |
|
| 910 | - * This is used to add all info to the details page sidebars. |
|
| 911 | - * |
|
| 912 | - * @since 1.0.0 |
|
| 913 | - */ |
|
| 914 | - do_action('geodir_detail_sidebar_inside');
|
|
| 915 | - ?></div><!-- end geodir-content-left --><?php |
|
| 916 | - /** |
|
| 917 | - * Called after the details page left sidebar. |
|
| 918 | - * |
|
| 919 | - * This is used to add closing wrapper HTML to the details page left sidebar. |
|
| 920 | - * |
|
| 921 | - * @since 1.0.0 |
|
| 922 | - * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 923 | - */ |
|
| 924 | - do_action('geodir_sidebar_left_close', 'details-page');
|
|
| 925 | - } else {
|
|
| 926 | - /** |
|
| 927 | - * Called before the details page right sidebar is opened. |
|
| 928 | - * |
|
| 929 | - * This is used to add opening wrapper HTML to the details page right sidebar. |
|
| 930 | - * |
|
| 931 | - * @since 1.0.0 |
|
| 932 | - * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'add-listing-page', 'author-page', 'search-page' or 'home-page'. |
|
| 933 | - * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-right'. |
|
| 934 | - * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-right geodir-details-sidebar-right'. |
|
| 935 | - * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'. |
|
| 936 | - */ |
|
| 937 | - do_action('geodir_sidebar_right_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-right geodir-details-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 938 | - ?> |
|
| 907 | + /** |
|
| 908 | + * Called inside the HTML wrapper of the details sidebar for either the left and right sidebar. |
|
| 909 | + * |
|
| 910 | + * This is used to add all info to the details page sidebars. |
|
| 911 | + * |
|
| 912 | + * @since 1.0.0 |
|
| 913 | + */ |
|
| 914 | + do_action('geodir_detail_sidebar_inside');
|
|
| 915 | + ?></div><!-- end geodir-content-left --><?php |
|
| 916 | + /** |
|
| 917 | + * Called after the details page left sidebar. |
|
| 918 | + * |
|
| 919 | + * This is used to add closing wrapper HTML to the details page left sidebar. |
|
| 920 | + * |
|
| 921 | + * @since 1.0.0 |
|
| 922 | + * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 923 | + */ |
|
| 924 | + do_action('geodir_sidebar_left_close', 'details-page');
|
|
| 925 | + } else {
|
|
| 926 | + /** |
|
| 927 | + * Called before the details page right sidebar is opened. |
|
| 928 | + * |
|
| 929 | + * This is used to add opening wrapper HTML to the details page right sidebar. |
|
| 930 | + * |
|
| 931 | + * @since 1.0.0 |
|
| 932 | + * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'add-listing-page', 'author-page', 'search-page' or 'home-page'. |
|
| 933 | + * @param string $id Usually the ID of the sidebar wrapper. Values can be 'geodir-sidebar' or 'geodir-sidebar-right'. |
|
| 934 | + * @param string $class The class of the sidebar wrapper. 'geodir-sidebar-right geodir-details-sidebar-right'. |
|
| 935 | + * @param string $itemtype HTML itemtype 'http://schema.org/WPSideBar'. |
|
| 936 | + */ |
|
| 937 | + do_action('geodir_sidebar_right_open', 'details-page', 'geodir-sidebar', 'geodir-sidebar-right geodir-details-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 938 | + ?> |
|
| 939 | 939 | <div class="geodir-content-right geodir-sidebar-wrap"><?php |
| 940 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 941 | - do_action('geodir_detail_sidebar_inside');
|
|
| 942 | - ?></div><!-- end geodir-content-right --><?php |
|
| 943 | - /** |
|
| 944 | - * Called after the details page right sidebar. |
|
| 945 | - * |
|
| 946 | - * This is used to add closing wrapper HTML to the details page right sidebar. |
|
| 947 | - * |
|
| 948 | - * @since 1.0.0 |
|
| 949 | - * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 950 | - */ |
|
| 951 | - do_action('geodir_sidebar_right_close', 'details-page');
|
|
| 952 | - } |
|
| 940 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 941 | + do_action('geodir_detail_sidebar_inside');
|
|
| 942 | + ?></div><!-- end geodir-content-right --><?php |
|
| 943 | + /** |
|
| 944 | + * Called after the details page right sidebar. |
|
| 945 | + * |
|
| 946 | + * This is used to add closing wrapper HTML to the details page right sidebar. |
|
| 947 | + * |
|
| 948 | + * @since 1.0.0 |
|
| 949 | + * @param string $type The current page type. Values can be 'details-page', 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 950 | + */ |
|
| 951 | + do_action('geodir_sidebar_right_close', 'details-page');
|
|
| 952 | + } |
|
| 953 | 953 | } |
| 954 | 954 | |
| 955 | 955 | add_action('geodir_page_title', 'geodir_action_page_title', 10);
|
@@ -963,21 +963,21 @@ discard block |
||
| 963 | 963 | */ |
| 964 | 964 | function geodir_action_page_title() |
| 965 | 965 | {
|
| 966 | - /** |
|
| 967 | - * Filter the page title HTML h1 class. |
|
| 968 | - * |
|
| 969 | - * @since 1.0.0 |
|
| 970 | - * @param string $class The class to use. Default is 'entry-title fn'. |
|
| 971 | - */ |
|
| 972 | - $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 973 | - /** |
|
| 974 | - * Filter the page title HTML header wrapper class. |
|
| 975 | - * |
|
| 976 | - * @since 1.0.0 |
|
| 977 | - * @param string $class The class to use. Default is 'entry-header'. |
|
| 978 | - */ |
|
| 979 | - $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 980 | - echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>'; |
|
| 966 | + /** |
|
| 967 | + * Filter the page title HTML h1 class. |
|
| 968 | + * |
|
| 969 | + * @since 1.0.0 |
|
| 970 | + * @param string $class The class to use. Default is 'entry-title fn'. |
|
| 971 | + */ |
|
| 972 | + $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 973 | + /** |
|
| 974 | + * Filter the page title HTML header wrapper class. |
|
| 975 | + * |
|
| 976 | + * @since 1.0.0 |
|
| 977 | + * @param string $class The class to use. Default is 'entry-header'. |
|
| 978 | + */ |
|
| 979 | + $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 980 | + echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>'; |
|
| 981 | 981 | } |
| 982 | 982 | |
| 983 | 983 | |
@@ -994,106 +994,106 @@ discard block |
||
| 994 | 994 | */ |
| 995 | 995 | function geodir_action_details_slider() |
| 996 | 996 | {
|
| 997 | - global $preview, $post; |
|
| 997 | + global $preview, $post; |
|
| 998 | 998 | |
| 999 | - $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // preview from backend |
|
| 999 | + $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // preview from backend |
|
| 1000 | 1000 | |
| 1001 | - if ($is_backend_preview && !empty($post) && !empty($post->ID) && !isset($post->post_images)) {
|
|
| 1002 | - $preview_get_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
|
|
| 1001 | + if ($is_backend_preview && !empty($post) && !empty($post->ID) && !isset($post->post_images)) {
|
|
| 1002 | + $preview_get_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
|
|
| 1003 | 1003 | |
| 1004 | - $preview_post_images = array(); |
|
| 1005 | - if ($preview_get_images) {
|
|
| 1006 | - foreach ($preview_get_images as $row) {
|
|
| 1007 | - $preview_post_images[] = $row->src; |
|
| 1008 | - } |
|
| 1009 | - } |
|
| 1010 | - if (!empty($preview_post_images)) {
|
|
| 1011 | - $post->post_images = implode(',', $preview_post_images);
|
|
| 1012 | - } |
|
| 1013 | - } |
|
| 1004 | + $preview_post_images = array(); |
|
| 1005 | + if ($preview_get_images) {
|
|
| 1006 | + foreach ($preview_get_images as $row) {
|
|
| 1007 | + $preview_post_images[] = $row->src; |
|
| 1008 | + } |
|
| 1009 | + } |
|
| 1010 | + if (!empty($preview_post_images)) {
|
|
| 1011 | + $post->post_images = implode(',', $preview_post_images);
|
|
| 1012 | + } |
|
| 1013 | + } |
|
| 1014 | 1014 | |
| 1015 | - $package_info = geodir_post_package_info(array(), $post, (!empty($post->post_type) ? $post->post_type : '')); |
|
| 1016 | - $image_limit = ''; |
|
| 1017 | - if (defined('GEODIRPAYMENT_VERSION') && !empty($package_info) && isset($package_info->image_limit) && $package_info->image_limit !== '') {
|
|
| 1018 | - $image_limit = (int)$package_info->image_limit; |
|
| 1019 | - } |
|
| 1020 | - |
|
| 1021 | - if ($preview) {
|
|
| 1022 | - $post_images = array(); |
|
| 1023 | - if (isset($post->post_images) && !empty($post->post_images)) {
|
|
| 1024 | - $post->post_images = trim($post->post_images, ","); |
|
| 1025 | - $post_images = explode(",", $post->post_images);
|
|
| 1026 | - } |
|
| 1015 | + $package_info = geodir_post_package_info(array(), $post, (!empty($post->post_type) ? $post->post_type : '')); |
|
| 1016 | + $image_limit = ''; |
|
| 1017 | + if (defined('GEODIRPAYMENT_VERSION') && !empty($package_info) && isset($package_info->image_limit) && $package_info->image_limit !== '') {
|
|
| 1018 | + $image_limit = (int)$package_info->image_limit; |
|
| 1019 | + } |
|
| 1027 | 1020 | |
| 1028 | - $main_slides = ''; |
|
| 1029 | - $nav_slides = ''; |
|
| 1030 | - $slides = 0; |
|
| 1031 | - |
|
| 1032 | - if (!empty($post_images)) {
|
|
| 1033 | - foreach ($post_images as $image) {
|
|
| 1034 | - if ($image_limit !== '' && ($slides+1) > $image_limit) {
|
|
| 1035 | - break; |
|
| 1036 | - } |
|
| 1037 | - if (!empty($image)) {
|
|
| 1038 | - $sizes = getimagesize(trim($image)); |
|
| 1039 | - $width = !empty($sizes) && isset($sizes[0]) ? $sizes[0] : 0; |
|
| 1040 | - $height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0; |
|
| 1041 | - |
|
| 1042 | - if ($image && $width && $height) {
|
|
| 1043 | - $image = (object)array('src' => $image, 'width' => $width, 'height' => $height);
|
|
| 1044 | - } |
|
| 1045 | - |
|
| 1046 | - if (isset($image->src)) {
|
|
| 1047 | - if ($image->height >= 400) {
|
|
| 1048 | - $spacer_height = 0; |
|
| 1049 | - } else {
|
|
| 1050 | - $spacer_height = ((400 - $image->height) / 2); |
|
| 1051 | - } |
|
| 1052 | - |
|
| 1053 | - $image_title = isset($image->title) ? $image->title : ''; |
|
| 1054 | - |
|
| 1055 | - $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />'; |
|
| 1056 | - $main_slides .= '<img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:400px;margin:0 auto;" /></li>'; |
|
| 1057 | - $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 1058 | - $slides++; |
|
| 1059 | - } |
|
| 1060 | - } |
|
| 1061 | - }// endfore |
|
| 1062 | - } //end if |
|
| 1063 | - } else {
|
|
| 1064 | - $main_slides = ''; |
|
| 1065 | - $nav_slides = ''; |
|
| 1066 | - /** |
|
| 1067 | - * Filter if default images should show on the details page. |
|
| 1068 | - * |
|
| 1069 | - * @param bool $use_default_image Default false. |
|
| 1070 | - * @since 1.6.16 |
|
| 1071 | - */ |
|
| 1072 | - $use_default_image = apply_filters('geodir_details_default_image_show', false);
|
|
| 1073 | - $post_images = geodir_get_images($post->ID, 'thumbnail', $use_default_image); // Hide default image on listing preview/detail page. |
|
| 1074 | - $slides = 0; |
|
| 1075 | - |
|
| 1076 | - if (!empty($post_images)) {
|
|
| 1077 | - foreach ($post_images as $image) {
|
|
| 1078 | - if ($image_limit !== '' && ($slides+1) > $image_limit) {
|
|
| 1079 | - break; |
|
| 1080 | - } |
|
| 1081 | - if ($image->height >= 400) {
|
|
| 1082 | - $spacer_height = 0; |
|
| 1083 | - } else {
|
|
| 1084 | - $spacer_height = ((400 - $image->height) / 2); |
|
| 1085 | - } |
|
| 1086 | - |
|
| 1087 | - $caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : ''; |
|
| 1088 | - $main_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>'; |
|
| 1089 | - $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 1090 | - $slides++; |
|
| 1091 | - } |
|
| 1092 | - }// endfore |
|
| 1093 | - } |
|
| 1021 | + if ($preview) {
|
|
| 1022 | + $post_images = array(); |
|
| 1023 | + if (isset($post->post_images) && !empty($post->post_images)) {
|
|
| 1024 | + $post->post_images = trim($post->post_images, ","); |
|
| 1025 | + $post_images = explode(",", $post->post_images);
|
|
| 1026 | + } |
|
| 1027 | + |
|
| 1028 | + $main_slides = ''; |
|
| 1029 | + $nav_slides = ''; |
|
| 1030 | + $slides = 0; |
|
| 1031 | + |
|
| 1032 | + if (!empty($post_images)) {
|
|
| 1033 | + foreach ($post_images as $image) {
|
|
| 1034 | + if ($image_limit !== '' && ($slides+1) > $image_limit) {
|
|
| 1035 | + break; |
|
| 1036 | + } |
|
| 1037 | + if (!empty($image)) {
|
|
| 1038 | + $sizes = getimagesize(trim($image)); |
|
| 1039 | + $width = !empty($sizes) && isset($sizes[0]) ? $sizes[0] : 0; |
|
| 1040 | + $height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0; |
|
| 1041 | + |
|
| 1042 | + if ($image && $width && $height) {
|
|
| 1043 | + $image = (object)array('src' => $image, 'width' => $width, 'height' => $height);
|
|
| 1044 | + } |
|
| 1045 | + |
|
| 1046 | + if (isset($image->src)) {
|
|
| 1047 | + if ($image->height >= 400) {
|
|
| 1048 | + $spacer_height = 0; |
|
| 1049 | + } else {
|
|
| 1050 | + $spacer_height = ((400 - $image->height) / 2); |
|
| 1051 | + } |
|
| 1052 | + |
|
| 1053 | + $image_title = isset($image->title) ? $image->title : ''; |
|
| 1054 | + |
|
| 1055 | + $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />'; |
|
| 1056 | + $main_slides .= '<img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:400px;margin:0 auto;" /></li>'; |
|
| 1057 | + $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 1058 | + $slides++; |
|
| 1059 | + } |
|
| 1060 | + } |
|
| 1061 | + }// endfore |
|
| 1062 | + } //end if |
|
| 1063 | + } else {
|
|
| 1064 | + $main_slides = ''; |
|
| 1065 | + $nav_slides = ''; |
|
| 1066 | + /** |
|
| 1067 | + * Filter if default images should show on the details page. |
|
| 1068 | + * |
|
| 1069 | + * @param bool $use_default_image Default false. |
|
| 1070 | + * @since 1.6.16 |
|
| 1071 | + */ |
|
| 1072 | + $use_default_image = apply_filters('geodir_details_default_image_show', false);
|
|
| 1073 | + $post_images = geodir_get_images($post->ID, 'thumbnail', $use_default_image); // Hide default image on listing preview/detail page. |
|
| 1074 | + $slides = 0; |
|
| 1075 | + |
|
| 1076 | + if (!empty($post_images)) {
|
|
| 1077 | + foreach ($post_images as $image) {
|
|
| 1078 | + if ($image_limit !== '' && ($slides+1) > $image_limit) {
|
|
| 1079 | + break; |
|
| 1080 | + } |
|
| 1081 | + if ($image->height >= 400) {
|
|
| 1082 | + $spacer_height = 0; |
|
| 1083 | + } else {
|
|
| 1084 | + $spacer_height = ((400 - $image->height) / 2); |
|
| 1085 | + } |
|
| 1086 | + |
|
| 1087 | + $caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : ''; |
|
| 1088 | + $main_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>'; |
|
| 1089 | + $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 1090 | + $slides++; |
|
| 1091 | + } |
|
| 1092 | + }// endfore |
|
| 1093 | + } |
|
| 1094 | 1094 | |
| 1095 | - if (!empty($post_images)) {
|
|
| 1096 | - ?> |
|
| 1095 | + if (!empty($post_images)) {
|
|
| 1096 | + ?> |
|
| 1097 | 1097 | <div class="geodir_flex-container"> |
| 1098 | 1098 | <div class="geodir_flex-loader"><i class="fa fa-refresh fa-spin"></i></div> |
| 1099 | 1099 | <div id="geodir_slider" class="geodir_flexslider "> |
@@ -1106,7 +1106,7 @@ discard block |
||
| 1106 | 1106 | <?php } ?> |
| 1107 | 1107 | </div> |
| 1108 | 1108 | <?php |
| 1109 | - } |
|
| 1109 | + } |
|
| 1110 | 1110 | } |
| 1111 | 1111 | |
| 1112 | 1112 | add_action('geodir_details_taxonomies', 'geodir_action_details_taxonomies', 10);
|
@@ -1121,177 +1121,177 @@ discard block |
||
| 1121 | 1121 | */ |
| 1122 | 1122 | function geodir_action_details_taxonomies() |
| 1123 | 1123 | {
|
| 1124 | - global $preview, $post;?> |
|
| 1124 | + global $preview, $post;?> |
|
| 1125 | 1125 | <p class="geodir_post_taxomomies clearfix"> |
| 1126 | 1126 | <?php |
| 1127 | - $taxonomies = array(); |
|
| 1128 | - |
|
| 1129 | - $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend |
|
| 1130 | - |
|
| 1131 | - if ($preview && !$is_backend_preview) {
|
|
| 1132 | - $post_type = $post->listing_type; |
|
| 1133 | - $post_taxonomy = $post_type . 'category'; |
|
| 1134 | - $post->{$post_taxonomy} = $post->post_category[$post_taxonomy];
|
|
| 1135 | - } else {
|
|
| 1136 | - $post_type = $post->post_type; |
|
| 1137 | - $post_taxonomy = $post_type . 'category'; |
|
| 1138 | - } |
|
| 1127 | + $taxonomies = array(); |
|
| 1128 | + |
|
| 1129 | + $is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend |
|
| 1130 | + |
|
| 1131 | + if ($preview && !$is_backend_preview) {
|
|
| 1132 | + $post_type = $post->listing_type; |
|
| 1133 | + $post_taxonomy = $post_type . 'category'; |
|
| 1134 | + $post->{$post_taxonomy} = $post->post_category[$post_taxonomy];
|
|
| 1135 | + } else {
|
|
| 1136 | + $post_type = $post->post_type; |
|
| 1137 | + $post_taxonomy = $post_type . 'category'; |
|
| 1138 | + } |
|
| 1139 | 1139 | //{
|
| 1140 | - $post_type_info = get_post_type_object($post_type); |
|
| 1141 | - $listing_label = __($post_type_info->labels->singular_name, 'geodirectory'); |
|
| 1142 | - |
|
| 1143 | - if (!empty($post->post_tags)) {
|
|
| 1144 | - |
|
| 1145 | - if (taxonomy_exists($post_type . '_tags')): |
|
| 1146 | - $links = array(); |
|
| 1147 | - $terms = array(); |
|
| 1148 | - // to limit post tags |
|
| 1149 | - $post_tags = trim($post->post_tags, ","); |
|
| 1150 | - $post_id = isset($post->ID) ? $post->ID : ''; |
|
| 1151 | - /** |
|
| 1152 | - * Filter the post tags. |
|
| 1153 | - * |
|
| 1154 | - * Allows you to filter the post tags output on the details page of a post. |
|
| 1155 | - * |
|
| 1156 | - * @since 1.0.0 |
|
| 1157 | - * @param string $post_tags A comma seperated list of tags. |
|
| 1158 | - * @param int $post_id The current post id. |
|
| 1159 | - */ |
|
| 1160 | - $post_tags = apply_filters('geodir_action_details_post_tags', $post_tags, $post_id);
|
|
| 1161 | - |
|
| 1162 | - $post->post_tags = $post_tags; |
|
| 1163 | - $post_tags = explode(",", trim($post->post_tags, ","));
|
|
| 1164 | - |
|
| 1165 | - |
|
| 1166 | - foreach ($post_tags as $post_term) {
|
|
| 1167 | - |
|
| 1168 | - // fix slug creation order for tags & location |
|
| 1169 | - $post_term = trim($post_term); |
|
| 1170 | - |
|
| 1171 | - $priority_location = false; |
|
| 1172 | - if ($insert_term = term_exists($post_term, $post_type . '_tags')) {
|
|
| 1173 | - $term = get_term_by('id', $insert_term['term_id'], $post_type . '_tags');
|
|
| 1174 | - } else {
|
|
| 1175 | - $post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL; |
|
| 1176 | - $post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL; |
|
| 1177 | - $post_city = isset($_REQUEST['post_city']) && $_REQUEST['post_city'] != '' ? sanitize_text_field($_REQUEST['post_city']) : NULL; |
|
| 1178 | - $match_country = $post_country && sanitize_title($post_term) == sanitize_title($post_country) ? true : false; |
|
| 1179 | - $match_region = $post_region && sanitize_title($post_term) == sanitize_title($post_region) ? true : false; |
|
| 1180 | - $match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false; |
|
| 1181 | - if ($match_country || $match_region || $match_city) {
|
|
| 1182 | - $priority_location = true; |
|
| 1183 | - $term = get_term_by('name', $post_term, $post_type . '_tags');
|
|
| 1184 | - } else {
|
|
| 1185 | - $insert_term = wp_insert_term($post_term, $post_type . '_tags'); |
|
| 1186 | - $term = get_term_by('name', $post_term, $post_type . '_tags');
|
|
| 1187 | - } |
|
| 1188 | - } |
|
| 1189 | - |
|
| 1190 | - if (!is_wp_error($term) && is_object($term)) {
|
|
| 1191 | - |
|
| 1192 | - // fix tag link on detail page |
|
| 1193 | - if ($priority_location) {
|
|
| 1194 | - |
|
| 1195 | - $tag_link = "<a href=''>$post_term</a>"; |
|
| 1196 | - /** |
|
| 1197 | - * Filter the tag name on the details page. |
|
| 1198 | - * |
|
| 1199 | - * @since 1.5.6 |
|
| 1200 | - * @param string $tag_link The tag link html. |
|
| 1201 | - * @param object $term The tag term object. |
|
| 1202 | - */ |
|
| 1203 | - $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);
|
|
| 1204 | - $links[] = $tag_link; |
|
| 1205 | - } else {
|
|
| 1206 | - $tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>"; |
|
| 1207 | - /** This action is documented in geodirectory-template_actions.php */ |
|
| 1208 | - $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);
|
|
| 1209 | - $links[] = $tag_link; |
|
| 1210 | - } |
|
| 1211 | - $terms[] = $term; |
|
| 1212 | - } |
|
| 1213 | - // |
|
| 1214 | - } |
|
| 1215 | - if (!isset($listing_label)) {
|
|
| 1216 | - $listing_label = ''; |
|
| 1217 | - } |
|
| 1218 | - $taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);
|
|
| 1219 | - endif; |
|
| 1220 | - |
|
| 1221 | - } |
|
| 1222 | - |
|
| 1223 | - if (!empty($post->{$post_taxonomy})) {
|
|
| 1224 | - $links = array(); |
|
| 1225 | - $terms = array(); |
|
| 1226 | - $termsOrdered = array(); |
|
| 1227 | - if (!is_array($post->{$post_taxonomy})) {
|
|
| 1228 | - $post_term = explode(",", trim($post->{$post_taxonomy}, ","));
|
|
| 1229 | - } else {
|
|
| 1230 | - $post_term = $post->{$post_taxonomy};
|
|
| 1140 | + $post_type_info = get_post_type_object($post_type); |
|
| 1141 | + $listing_label = __($post_type_info->labels->singular_name, 'geodirectory'); |
|
| 1142 | + |
|
| 1143 | + if (!empty($post->post_tags)) {
|
|
| 1144 | + |
|
| 1145 | + if (taxonomy_exists($post_type . '_tags')): |
|
| 1146 | + $links = array(); |
|
| 1147 | + $terms = array(); |
|
| 1148 | + // to limit post tags |
|
| 1149 | + $post_tags = trim($post->post_tags, ","); |
|
| 1150 | + $post_id = isset($post->ID) ? $post->ID : ''; |
|
| 1151 | + /** |
|
| 1152 | + * Filter the post tags. |
|
| 1153 | + * |
|
| 1154 | + * Allows you to filter the post tags output on the details page of a post. |
|
| 1155 | + * |
|
| 1156 | + * @since 1.0.0 |
|
| 1157 | + * @param string $post_tags A comma seperated list of tags. |
|
| 1158 | + * @param int $post_id The current post id. |
|
| 1159 | + */ |
|
| 1160 | + $post_tags = apply_filters('geodir_action_details_post_tags', $post_tags, $post_id);
|
|
| 1161 | + |
|
| 1162 | + $post->post_tags = $post_tags; |
|
| 1163 | + $post_tags = explode(",", trim($post->post_tags, ","));
|
|
| 1164 | + |
|
| 1165 | + |
|
| 1166 | + foreach ($post_tags as $post_term) {
|
|
| 1167 | + |
|
| 1168 | + // fix slug creation order for tags & location |
|
| 1169 | + $post_term = trim($post_term); |
|
| 1170 | + |
|
| 1171 | + $priority_location = false; |
|
| 1172 | + if ($insert_term = term_exists($post_term, $post_type . '_tags')) {
|
|
| 1173 | + $term = get_term_by('id', $insert_term['term_id'], $post_type . '_tags');
|
|
| 1174 | + } else {
|
|
| 1175 | + $post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL; |
|
| 1176 | + $post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL; |
|
| 1177 | + $post_city = isset($_REQUEST['post_city']) && $_REQUEST['post_city'] != '' ? sanitize_text_field($_REQUEST['post_city']) : NULL; |
|
| 1178 | + $match_country = $post_country && sanitize_title($post_term) == sanitize_title($post_country) ? true : false; |
|
| 1179 | + $match_region = $post_region && sanitize_title($post_term) == sanitize_title($post_region) ? true : false; |
|
| 1180 | + $match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false; |
|
| 1181 | + if ($match_country || $match_region || $match_city) {
|
|
| 1182 | + $priority_location = true; |
|
| 1183 | + $term = get_term_by('name', $post_term, $post_type . '_tags');
|
|
| 1184 | + } else {
|
|
| 1185 | + $insert_term = wp_insert_term($post_term, $post_type . '_tags'); |
|
| 1186 | + $term = get_term_by('name', $post_term, $post_type . '_tags');
|
|
| 1187 | + } |
|
| 1188 | + } |
|
| 1189 | + |
|
| 1190 | + if (!is_wp_error($term) && is_object($term)) {
|
|
| 1191 | + |
|
| 1192 | + // fix tag link on detail page |
|
| 1193 | + if ($priority_location) {
|
|
| 1194 | + |
|
| 1195 | + $tag_link = "<a href=''>$post_term</a>"; |
|
| 1196 | + /** |
|
| 1197 | + * Filter the tag name on the details page. |
|
| 1198 | + * |
|
| 1199 | + * @since 1.5.6 |
|
| 1200 | + * @param string $tag_link The tag link html. |
|
| 1201 | + * @param object $term The tag term object. |
|
| 1202 | + */ |
|
| 1203 | + $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);
|
|
| 1204 | + $links[] = $tag_link; |
|
| 1205 | + } else {
|
|
| 1206 | + $tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>"; |
|
| 1207 | + /** This action is documented in geodirectory-template_actions.php */ |
|
| 1208 | + $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);
|
|
| 1209 | + $links[] = $tag_link; |
|
| 1210 | + } |
|
| 1211 | + $terms[] = $term; |
|
| 1212 | + } |
|
| 1213 | + // |
|
| 1214 | + } |
|
| 1215 | + if (!isset($listing_label)) {
|
|
| 1216 | + $listing_label = ''; |
|
| 1217 | + } |
|
| 1218 | + $taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);
|
|
| 1219 | + endif; |
|
| 1220 | + |
|
| 1221 | + } |
|
| 1222 | + |
|
| 1223 | + if (!empty($post->{$post_taxonomy})) {
|
|
| 1224 | + $links = array(); |
|
| 1225 | + $terms = array(); |
|
| 1226 | + $termsOrdered = array(); |
|
| 1227 | + if (!is_array($post->{$post_taxonomy})) {
|
|
| 1228 | + $post_term = explode(",", trim($post->{$post_taxonomy}, ","));
|
|
| 1229 | + } else {
|
|
| 1230 | + $post_term = $post->{$post_taxonomy};
|
|
| 1231 | 1231 | |
| 1232 | 1232 | if ($preview && !$is_backend_preview) {
|
| 1233 | 1233 | $post_term = geodir_add_parent_terms($post_term, $post_taxonomy); |
| 1234 | 1234 | } |
| 1235 | - } |
|
| 1236 | - |
|
| 1237 | - $post_term = array_unique($post_term); |
|
| 1238 | - if (!empty($post_term)) {
|
|
| 1239 | - foreach ($post_term as $post_term) {
|
|
| 1240 | - $post_term = trim($post_term); |
|
| 1241 | - |
|
| 1242 | - if ($post_term != ''): |
|
| 1243 | - $term = get_term_by('id', $post_term, $post_taxonomy);
|
|
| 1244 | - |
|
| 1245 | - if (is_object($term)) {
|
|
| 1246 | - $term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>"; |
|
| 1247 | - /** |
|
| 1248 | - * Filter the category name on the details page. |
|
| 1249 | - * |
|
| 1250 | - * @since 1.5.6 |
|
| 1251 | - * @param string $term_link The link html to the category. |
|
| 1252 | - * @param object $term The category term object. |
|
| 1253 | - */ |
|
| 1254 | - $term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);
|
|
| 1255 | - $links[] = $term_link; |
|
| 1256 | - $terms[] = $term; |
|
| 1257 | - } |
|
| 1258 | - endif; |
|
| 1259 | - } |
|
| 1260 | - // order alphabetically |
|
| 1261 | - asort($links); |
|
| 1262 | - foreach (array_keys($links) as $key) {
|
|
| 1263 | - $termsOrdered[$key] = $terms[$key]; |
|
| 1264 | - } |
|
| 1265 | - $terms = $termsOrdered; |
|
| 1266 | - |
|
| 1267 | - } |
|
| 1235 | + } |
|
| 1236 | + |
|
| 1237 | + $post_term = array_unique($post_term); |
|
| 1238 | + if (!empty($post_term)) {
|
|
| 1239 | + foreach ($post_term as $post_term) {
|
|
| 1240 | + $post_term = trim($post_term); |
|
| 1241 | + |
|
| 1242 | + if ($post_term != ''): |
|
| 1243 | + $term = get_term_by('id', $post_term, $post_taxonomy);
|
|
| 1244 | + |
|
| 1245 | + if (is_object($term)) {
|
|
| 1246 | + $term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>"; |
|
| 1247 | + /** |
|
| 1248 | + * Filter the category name on the details page. |
|
| 1249 | + * |
|
| 1250 | + * @since 1.5.6 |
|
| 1251 | + * @param string $term_link The link html to the category. |
|
| 1252 | + * @param object $term The category term object. |
|
| 1253 | + */ |
|
| 1254 | + $term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);
|
|
| 1255 | + $links[] = $term_link; |
|
| 1256 | + $terms[] = $term; |
|
| 1257 | + } |
|
| 1258 | + endif; |
|
| 1259 | + } |
|
| 1260 | + // order alphabetically |
|
| 1261 | + asort($links); |
|
| 1262 | + foreach (array_keys($links) as $key) {
|
|
| 1263 | + $termsOrdered[$key] = $terms[$key]; |
|
| 1264 | + } |
|
| 1265 | + $terms = $termsOrdered; |
|
| 1268 | 1266 | |
| 1269 | - if (!isset($listing_label)) {
|
|
| 1270 | - $listing_label = ''; |
|
| 1271 | - } |
|
| 1272 | - $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);
|
|
| 1267 | + } |
|
| 1273 | 1268 | |
| 1274 | - } |
|
| 1269 | + if (!isset($listing_label)) {
|
|
| 1270 | + $listing_label = ''; |
|
| 1271 | + } |
|
| 1272 | + $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);
|
|
| 1275 | 1273 | |
| 1276 | - /** |
|
| 1277 | - * Filter the taxonomies array before output. |
|
| 1278 | - * |
|
| 1279 | - * @since 1.5.9 |
|
| 1280 | - * @param array $taxonomies The array of cats and tags. |
|
| 1281 | - * @param string $post_type The post type being output. |
|
| 1282 | - * @param string $listing_label The post type label. |
|
| 1283 | - * @param string $listing_label The post type label with ucwords function. |
|
| 1284 | - */ |
|
| 1285 | - $taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));
|
|
| 1274 | + } |
|
| 1286 | 1275 | |
| 1287 | - if (isset($taxonomies[$post_taxonomy])) {
|
|
| 1288 | - echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>'; |
|
| 1289 | - } |
|
| 1276 | + /** |
|
| 1277 | + * Filter the taxonomies array before output. |
|
| 1278 | + * |
|
| 1279 | + * @since 1.5.9 |
|
| 1280 | + * @param array $taxonomies The array of cats and tags. |
|
| 1281 | + * @param string $post_type The post type being output. |
|
| 1282 | + * @param string $listing_label The post type label. |
|
| 1283 | + * @param string $listing_label The post type label with ucwords function. |
|
| 1284 | + */ |
|
| 1285 | + $taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));
|
|
| 1286 | + |
|
| 1287 | + if (isset($taxonomies[$post_taxonomy])) {
|
|
| 1288 | + echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>'; |
|
| 1289 | + } |
|
| 1290 | 1290 | |
| 1291 | - if (isset($taxonomies[$post_type . '_tags'])) |
|
| 1292 | - echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>'; |
|
| 1291 | + if (isset($taxonomies[$post_type . '_tags'])) |
|
| 1292 | + echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>'; |
|
| 1293 | 1293 | |
| 1294 | - ?> |
|
| 1294 | + ?> |
|
| 1295 | 1295 | </p><?php |
| 1296 | 1296 | } |
| 1297 | 1297 | |
@@ -1313,144 +1313,144 @@ discard block |
||
| 1313 | 1313 | function geodir_action_details_micordata($post='') |
| 1314 | 1314 | {
|
| 1315 | 1315 | |
| 1316 | - global $preview; |
|
| 1317 | - if(empty($post)){global $post;}
|
|
| 1318 | - if ($preview || !geodir_is_page('detail')) {
|
|
| 1319 | - return; |
|
| 1320 | - } |
|
| 1321 | - |
|
| 1322 | - // url |
|
| 1323 | - $c_url = geodir_curPageURL(); |
|
| 1324 | - |
|
| 1325 | - // post reviews |
|
| 1326 | - $post_reviews = get_comments(array('post_id' => $post->ID, 'status' => 'approve'));
|
|
| 1327 | - if (empty($post_reviews)) {
|
|
| 1328 | - $reviews = ''; |
|
| 1329 | - } else {
|
|
| 1330 | - foreach ($post_reviews as $review) {
|
|
| 1331 | - |
|
| 1332 | - if($rating_value = geodir_get_commentoverall($review->comment_ID)){
|
|
| 1333 | - $reviews[] = array( |
|
| 1334 | - "@type" => "Review", |
|
| 1335 | - "author" => $review->comment_author, |
|
| 1336 | - "datePublished" => $review->comment_date, |
|
| 1337 | - "description" => $review->comment_content, |
|
| 1338 | - "reviewRating" => array( |
|
| 1339 | - "@type" => "Rating", |
|
| 1340 | - "bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score. |
|
| 1341 | - "ratingValue" => $rating_value, |
|
| 1342 | - "worstRating" => "1" |
|
| 1343 | - ) |
|
| 1344 | - ); |
|
| 1345 | - } |
|
| 1316 | + global $preview; |
|
| 1317 | + if(empty($post)){global $post;}
|
|
| 1318 | + if ($preview || !geodir_is_page('detail')) {
|
|
| 1319 | + return; |
|
| 1320 | + } |
|
| 1346 | 1321 | |
| 1347 | - } |
|
| 1322 | + // url |
|
| 1323 | + $c_url = geodir_curPageURL(); |
|
| 1324 | + |
|
| 1325 | + // post reviews |
|
| 1326 | + $post_reviews = get_comments(array('post_id' => $post->ID, 'status' => 'approve'));
|
|
| 1327 | + if (empty($post_reviews)) {
|
|
| 1328 | + $reviews = ''; |
|
| 1329 | + } else {
|
|
| 1330 | + foreach ($post_reviews as $review) {
|
|
| 1331 | + |
|
| 1332 | + if($rating_value = geodir_get_commentoverall($review->comment_ID)){
|
|
| 1333 | + $reviews[] = array( |
|
| 1334 | + "@type" => "Review", |
|
| 1335 | + "author" => $review->comment_author, |
|
| 1336 | + "datePublished" => $review->comment_date, |
|
| 1337 | + "description" => $review->comment_content, |
|
| 1338 | + "reviewRating" => array( |
|
| 1339 | + "@type" => "Rating", |
|
| 1340 | + "bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score. |
|
| 1341 | + "ratingValue" => $rating_value, |
|
| 1342 | + "worstRating" => "1" |
|
| 1343 | + ) |
|
| 1344 | + ); |
|
| 1345 | + } |
|
| 1348 | 1346 | |
| 1349 | - } |
|
| 1347 | + } |
|
| 1350 | 1348 | |
| 1351 | - // post images |
|
| 1352 | - $post_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
|
|
| 1353 | - if (empty($post_images)) {
|
|
| 1354 | - $images = ''; |
|
| 1355 | - } else {
|
|
| 1356 | - $i_arr = array(); |
|
| 1357 | - foreach ($post_images as $img) {
|
|
| 1358 | - $i_arr[] = $img->src; |
|
| 1359 | - } |
|
| 1349 | + } |
|
| 1360 | 1350 | |
| 1361 | - if (count($i_arr) == 1) {
|
|
| 1362 | - $images = $i_arr[0]; |
|
| 1363 | - } else {
|
|
| 1364 | - $images = $i_arr; |
|
| 1365 | - } |
|
| 1351 | + // post images |
|
| 1352 | + $post_images = geodir_get_images($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));
|
|
| 1353 | + if (empty($post_images)) {
|
|
| 1354 | + $images = ''; |
|
| 1355 | + } else {
|
|
| 1356 | + $i_arr = array(); |
|
| 1357 | + foreach ($post_images as $img) {
|
|
| 1358 | + $i_arr[] = $img->src; |
|
| 1359 | + } |
|
| 1360 | + |
|
| 1361 | + if (count($i_arr) == 1) {
|
|
| 1362 | + $images = $i_arr[0]; |
|
| 1363 | + } else {
|
|
| 1364 | + $images = $i_arr; |
|
| 1365 | + } |
|
| 1366 | 1366 | |
| 1367 | - } |
|
| 1368 | - //print_r($post); |
|
| 1369 | - // external links |
|
| 1370 | - $external_links = array(); |
|
| 1371 | - $external_links[] = $post->geodir_website; |
|
| 1372 | - $external_links[] = $post->geodir_twitter; |
|
| 1373 | - $external_links[] = $post->geodir_facebook; |
|
| 1374 | - $external_links = array_filter($external_links); |
|
| 1375 | - |
|
| 1376 | - if(!empty($external_links)){
|
|
| 1377 | - $external_links = array_values($external_links); |
|
| 1378 | - } |
|
| 1379 | - |
|
| 1380 | - // reviews |
|
| 1381 | - $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1382 | - $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1383 | - |
|
| 1384 | - // schema type |
|
| 1385 | - $schema_type = 'LocalBusiness'; |
|
| 1386 | - if(isset($post->default_category) && $post->default_category){
|
|
| 1387 | - $cat_schema = geodir_get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type); |
|
| 1388 | - if($cat_schema){$schema_type = $cat_schema;}
|
|
| 1389 | - if(!$cat_schema && $schema_type=='LocalBusiness' && $post->post_type=='gd_event'){$schema_type = 'Event';}
|
|
| 1390 | - } |
|
| 1391 | - |
|
| 1392 | - $schema = array(); |
|
| 1393 | - $schema['@context'] = "https://schema.org"; |
|
| 1394 | - $schema['@type'] = $schema_type; |
|
| 1395 | - $schema['name'] = $post->post_title; |
|
| 1396 | - $schema['description'] = wp_strip_all_tags( $post->post_content, true ); |
|
| 1397 | - $schema['telephone'] = $post->geodir_contact; |
|
| 1398 | - $schema['url'] = $c_url; |
|
| 1399 | - $schema['sameAs'] = $external_links; |
|
| 1400 | - $schema['image'] = $images; |
|
| 1401 | - $schema['address'] = array( |
|
| 1402 | - "@type" => "PostalAddress", |
|
| 1403 | - "streetAddress" => $post->post_address, |
|
| 1404 | - "addressLocality" => $post->post_city, |
|
| 1405 | - "addressRegion" => $post->post_region, |
|
| 1406 | - "addressCountry" => $post->post_country, |
|
| 1407 | - "postalCode" => $post->post_zip |
|
| 1408 | - ); |
|
| 1409 | - |
|
| 1410 | - if($post->post_latitude && $post->post_longitude) {
|
|
| 1411 | - $schema['geo'] = array( |
|
| 1412 | - "@type" => "GeoCoordinates", |
|
| 1413 | - "latitude" => $post->post_latitude, |
|
| 1414 | - "longitude" => $post->post_longitude |
|
| 1415 | - ); |
|
| 1416 | - } |
|
| 1417 | - |
|
| 1418 | - if($post_avgratings) {
|
|
| 1419 | - $schema['aggregateRating'] = array( |
|
| 1420 | - "@type" => "AggregateRating", |
|
| 1421 | - "ratingValue" => $post_avgratings, |
|
| 1422 | - "bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score. |
|
| 1423 | - "worstRating" => "1", |
|
| 1424 | - "ratingCount" => $comment_count |
|
| 1425 | - ); |
|
| 1426 | - } |
|
| 1427 | - $schema['review'] = $reviews; |
|
| 1428 | - |
|
| 1429 | - /** |
|
| 1430 | - * Allow the schema JSON-LD info to be filtered. |
|
| 1431 | - * |
|
| 1432 | - * @since 1.5.4 |
|
| 1433 | - * @since 1.5.7 Added $post variable. |
|
| 1434 | - * @param array $schema The array of schema data to be filtered. |
|
| 1435 | - * @param object $post The post object. |
|
| 1436 | - */ |
|
| 1437 | - $schema = apply_filters('geodir_details_schema', $schema,$post);
|
|
| 1438 | - |
|
| 1439 | - |
|
| 1440 | - echo '<script type="application/ld+json">' . json_encode($schema) . '</script>'; |
|
| 1441 | - |
|
| 1442 | - |
|
| 1443 | - $uploads = wp_upload_dir(); |
|
| 1444 | - $facebook_og = (isset($post->featured_image) && $post->featured_image) ? '<meta property="og:image" content="'.$uploads['baseurl'].$post->featured_image.'"/>' : ''; |
|
| 1445 | - |
|
| 1446 | - /** |
|
| 1447 | - * Show facebook open graph meta info |
|
| 1448 | - * |
|
| 1449 | - * @since 1.6.6 |
|
| 1450 | - * @param string $facebook_og The open graph html to be filtered. |
|
| 1451 | - * @param object $post The post object. |
|
| 1452 | - */ |
|
| 1453 | - echo apply_filters('geodir_details_facebook_og', $facebook_og,$post);
|
|
| 1367 | + } |
|
| 1368 | + //print_r($post); |
|
| 1369 | + // external links |
|
| 1370 | + $external_links = array(); |
|
| 1371 | + $external_links[] = $post->geodir_website; |
|
| 1372 | + $external_links[] = $post->geodir_twitter; |
|
| 1373 | + $external_links[] = $post->geodir_facebook; |
|
| 1374 | + $external_links = array_filter($external_links); |
|
| 1375 | + |
|
| 1376 | + if(!empty($external_links)){
|
|
| 1377 | + $external_links = array_values($external_links); |
|
| 1378 | + } |
|
| 1379 | + |
|
| 1380 | + // reviews |
|
| 1381 | + $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1382 | + $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1383 | + |
|
| 1384 | + // schema type |
|
| 1385 | + $schema_type = 'LocalBusiness'; |
|
| 1386 | + if(isset($post->default_category) && $post->default_category){
|
|
| 1387 | + $cat_schema = geodir_get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type); |
|
| 1388 | + if($cat_schema){$schema_type = $cat_schema;}
|
|
| 1389 | + if(!$cat_schema && $schema_type=='LocalBusiness' && $post->post_type=='gd_event'){$schema_type = 'Event';}
|
|
| 1390 | + } |
|
| 1391 | + |
|
| 1392 | + $schema = array(); |
|
| 1393 | + $schema['@context'] = "https://schema.org"; |
|
| 1394 | + $schema['@type'] = $schema_type; |
|
| 1395 | + $schema['name'] = $post->post_title; |
|
| 1396 | + $schema['description'] = wp_strip_all_tags( $post->post_content, true ); |
|
| 1397 | + $schema['telephone'] = $post->geodir_contact; |
|
| 1398 | + $schema['url'] = $c_url; |
|
| 1399 | + $schema['sameAs'] = $external_links; |
|
| 1400 | + $schema['image'] = $images; |
|
| 1401 | + $schema['address'] = array( |
|
| 1402 | + "@type" => "PostalAddress", |
|
| 1403 | + "streetAddress" => $post->post_address, |
|
| 1404 | + "addressLocality" => $post->post_city, |
|
| 1405 | + "addressRegion" => $post->post_region, |
|
| 1406 | + "addressCountry" => $post->post_country, |
|
| 1407 | + "postalCode" => $post->post_zip |
|
| 1408 | + ); |
|
| 1409 | + |
|
| 1410 | + if($post->post_latitude && $post->post_longitude) {
|
|
| 1411 | + $schema['geo'] = array( |
|
| 1412 | + "@type" => "GeoCoordinates", |
|
| 1413 | + "latitude" => $post->post_latitude, |
|
| 1414 | + "longitude" => $post->post_longitude |
|
| 1415 | + ); |
|
| 1416 | + } |
|
| 1417 | + |
|
| 1418 | + if($post_avgratings) {
|
|
| 1419 | + $schema['aggregateRating'] = array( |
|
| 1420 | + "@type" => "AggregateRating", |
|
| 1421 | + "ratingValue" => $post_avgratings, |
|
| 1422 | + "bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score. |
|
| 1423 | + "worstRating" => "1", |
|
| 1424 | + "ratingCount" => $comment_count |
|
| 1425 | + ); |
|
| 1426 | + } |
|
| 1427 | + $schema['review'] = $reviews; |
|
| 1428 | + |
|
| 1429 | + /** |
|
| 1430 | + * Allow the schema JSON-LD info to be filtered. |
|
| 1431 | + * |
|
| 1432 | + * @since 1.5.4 |
|
| 1433 | + * @since 1.5.7 Added $post variable. |
|
| 1434 | + * @param array $schema The array of schema data to be filtered. |
|
| 1435 | + * @param object $post The post object. |
|
| 1436 | + */ |
|
| 1437 | + $schema = apply_filters('geodir_details_schema', $schema,$post);
|
|
| 1438 | + |
|
| 1439 | + |
|
| 1440 | + echo '<script type="application/ld+json">' . json_encode($schema) . '</script>'; |
|
| 1441 | + |
|
| 1442 | + |
|
| 1443 | + $uploads = wp_upload_dir(); |
|
| 1444 | + $facebook_og = (isset($post->featured_image) && $post->featured_image) ? '<meta property="og:image" content="'.$uploads['baseurl'].$post->featured_image.'"/>' : ''; |
|
| 1445 | + |
|
| 1446 | + /** |
|
| 1447 | + * Show facebook open graph meta info |
|
| 1448 | + * |
|
| 1449 | + * @since 1.6.6 |
|
| 1450 | + * @param string $facebook_og The open graph html to be filtered. |
|
| 1451 | + * @param object $post The post object. |
|
| 1452 | + */ |
|
| 1453 | + echo apply_filters('geodir_details_facebook_og', $facebook_og,$post);
|
|
| 1454 | 1454 | |
| 1455 | 1455 | |
| 1456 | 1456 | |
@@ -1470,7 +1470,7 @@ discard block |
||
| 1470 | 1470 | */ |
| 1471 | 1471 | function geodir_action_details_next_prev() |
| 1472 | 1472 | {
|
| 1473 | - ?> |
|
| 1473 | + ?> |
|
| 1474 | 1474 | <div class="geodir-pos_navigation clearfix"> |
| 1475 | 1475 | <div |
| 1476 | 1476 | class="geodir-post_left"><?php previous_post_link('%link', '' . __('Previous', 'geodirectory'), false) ?></div>
|
@@ -1488,15 +1488,15 @@ discard block |
||
| 1488 | 1488 | */ |
| 1489 | 1489 | function geodir_action_before_single_post() |
| 1490 | 1490 | {
|
| 1491 | - global $post; |
|
| 1492 | - /** |
|
| 1493 | - * Called at the very start of the details page output, before the title section. |
|
| 1494 | - * |
|
| 1495 | - * @since 1.0.0 |
|
| 1496 | - * @param object $post The current post object. |
|
| 1497 | - * @global WP_Post|null $post The current post, if available. |
|
| 1498 | - */ |
|
| 1499 | - do_action('geodir_before_single_post', $post); // extra action
|
|
| 1491 | + global $post; |
|
| 1492 | + /** |
|
| 1493 | + * Called at the very start of the details page output, before the title section. |
|
| 1494 | + * |
|
| 1495 | + * @since 1.0.0 |
|
| 1496 | + * @param object $post The current post object. |
|
| 1497 | + * @global WP_Post|null $post The current post, if available. |
|
| 1498 | + */ |
|
| 1499 | + do_action('geodir_before_single_post', $post); // extra action
|
|
| 1500 | 1500 | } |
| 1501 | 1501 | |
| 1502 | 1502 | /** |
@@ -1507,13 +1507,13 @@ discard block |
||
| 1507 | 1507 | */ |
| 1508 | 1508 | function geodir_action_after_single_post($post) |
| 1509 | 1509 | {
|
| 1510 | - /** |
|
| 1511 | - * Called on the details page after the details page tabs section and before the next/prev buttons. |
|
| 1512 | - * |
|
| 1513 | - * @since 1.0.0 |
|
| 1514 | - * @param object $post The current post object. |
|
| 1515 | - */ |
|
| 1516 | - do_action('geodir_after_single_post', $post); // extra action
|
|
| 1510 | + /** |
|
| 1511 | + * Called on the details page after the details page tabs section and before the next/prev buttons. |
|
| 1512 | + * |
|
| 1513 | + * @since 1.0.0 |
|
| 1514 | + * @param object $post The current post object. |
|
| 1515 | + */ |
|
| 1516 | + do_action('geodir_after_single_post', $post); // extra action
|
|
| 1517 | 1517 | } |
| 1518 | 1518 | |
| 1519 | 1519 | add_action('geodir_details_main_content', 'geodir_action_before_single_post', 10);
|
@@ -1539,168 +1539,168 @@ discard block |
||
| 1539 | 1539 | */ |
| 1540 | 1540 | function geodir_action_listings_title() |
| 1541 | 1541 | {
|
| 1542 | - global $wp, $term; |
|
| 1543 | - |
|
| 1544 | - $gd_post_type = geodir_get_current_posttype(); |
|
| 1545 | - $post_type_info = get_post_type_object($gd_post_type); |
|
| 1542 | + global $wp, $term; |
|
| 1546 | 1543 | |
| 1547 | - $add_string_in_title = __('All', 'geodirectory') . ' ';
|
|
| 1548 | - if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 1549 | - $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';
|
|
| 1550 | - } |
|
| 1544 | + $gd_post_type = geodir_get_current_posttype(); |
|
| 1545 | + $post_type_info = get_post_type_object($gd_post_type); |
|
| 1551 | 1546 | |
| 1552 | - $list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory'); |
|
| 1553 | - $single_name = $post_type_info->labels->singular_name; |
|
| 1547 | + $add_string_in_title = __('All', 'geodirectory') . ' ';
|
|
| 1548 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 1549 | + $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';
|
|
| 1550 | + } |
|
| 1554 | 1551 | |
| 1555 | - $taxonomy = geodir_get_taxonomies($gd_post_type, true); |
|
| 1552 | + $list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory'); |
|
| 1553 | + $single_name = $post_type_info->labels->singular_name; |
|
| 1556 | 1554 | |
| 1557 | - $gd_country = get_query_var('gd_country');
|
|
| 1558 | - $gd_region = get_query_var('gd_region');
|
|
| 1559 | - $gd_city = get_query_var('gd_city');
|
|
| 1555 | + $taxonomy = geodir_get_taxonomies($gd_post_type, true); |
|
| 1560 | 1556 | |
| 1561 | - if (!empty($term)) {
|
|
| 1562 | - $location_name = ''; |
|
| 1563 | - if ($gd_country != '' || $gd_region != '' || $gd_city != '') {
|
|
| 1564 | - if ($gd_country != '') {
|
|
| 1565 | - $location_name = geodir_sanitize_location_name('gd_country', $gd_country);
|
|
| 1566 | - } |
|
| 1557 | + $gd_country = get_query_var('gd_country');
|
|
| 1558 | + $gd_region = get_query_var('gd_region');
|
|
| 1559 | + $gd_city = get_query_var('gd_city');
|
|
| 1567 | 1560 | |
| 1568 | - if ($gd_region != '') {
|
|
| 1569 | - $location_name = geodir_sanitize_location_name('gd_region', $gd_region);
|
|
| 1570 | - } |
|
| 1571 | - |
|
| 1572 | - if ($gd_city != '') {
|
|
| 1573 | - $location_name = geodir_sanitize_location_name('gd_city', $gd_city);
|
|
| 1574 | - } |
|
| 1575 | - } |
|
| 1561 | + if (!empty($term)) {
|
|
| 1562 | + $location_name = ''; |
|
| 1563 | + if ($gd_country != '' || $gd_region != '' || $gd_city != '') {
|
|
| 1564 | + if ($gd_country != '') {
|
|
| 1565 | + $location_name = geodir_sanitize_location_name('gd_country', $gd_country);
|
|
| 1566 | + } |
|
| 1576 | 1567 | |
| 1577 | - $current_term = get_term_by('slug', $term, $taxonomy[0]);
|
|
| 1578 | - if (!empty($current_term)) {
|
|
| 1579 | - $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory'); |
|
| 1580 | - if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {
|
|
| 1581 | - $location_last_char = substr($location_name, -1); |
|
| 1582 | - $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');
|
|
| 1583 | - $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;
|
|
| 1584 | - } else {
|
|
| 1585 | - $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";
|
|
| 1586 | - } |
|
| 1587 | - } else {
|
|
| 1588 | - if (count($taxonomy) > 1) {
|
|
| 1589 | - $current_term = get_term_by('slug', $term, $taxonomy[1]);
|
|
| 1590 | - |
|
| 1591 | - if (!empty($current_term)) {
|
|
| 1592 | - $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory'); |
|
| 1593 | - if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {
|
|
| 1594 | - $location_last_char = substr($location_name, -1); |
|
| 1595 | - $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');
|
|
| 1596 | - $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;
|
|
| 1597 | - } else {
|
|
| 1598 | - $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";
|
|
| 1599 | - } |
|
| 1600 | - } |
|
| 1601 | - } |
|
| 1602 | - } |
|
| 1568 | + if ($gd_region != '') {
|
|
| 1569 | + $location_name = geodir_sanitize_location_name('gd_region', $gd_region);
|
|
| 1570 | + } |
|
| 1603 | 1571 | |
| 1604 | - } else {
|
|
| 1605 | - $gd_country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : ''; |
|
| 1606 | - $gd_region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : ''; |
|
| 1607 | - $gd_city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : ''; |
|
| 1572 | + if ($gd_city != '') {
|
|
| 1573 | + $location_name = geodir_sanitize_location_name('gd_city', $gd_city);
|
|
| 1574 | + } |
|
| 1575 | + } |
|
| 1576 | + |
|
| 1577 | + $current_term = get_term_by('slug', $term, $taxonomy[0]);
|
|
| 1578 | + if (!empty($current_term)) {
|
|
| 1579 | + $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory'); |
|
| 1580 | + if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {
|
|
| 1581 | + $location_last_char = substr($location_name, -1); |
|
| 1582 | + $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');
|
|
| 1583 | + $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;
|
|
| 1584 | + } else {
|
|
| 1585 | + $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";
|
|
| 1586 | + } |
|
| 1587 | + } else {
|
|
| 1588 | + if (count($taxonomy) > 1) {
|
|
| 1589 | + $current_term = get_term_by('slug', $term, $taxonomy[1]);
|
|
| 1590 | + |
|
| 1591 | + if (!empty($current_term)) {
|
|
| 1592 | + $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory'); |
|
| 1593 | + if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {
|
|
| 1594 | + $location_last_char = substr($location_name, -1); |
|
| 1595 | + $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');
|
|
| 1596 | + $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;
|
|
| 1597 | + } else {
|
|
| 1598 | + $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";
|
|
| 1599 | + } |
|
| 1600 | + } |
|
| 1601 | + } |
|
| 1602 | + } |
|
| 1603 | + |
|
| 1604 | + } else {
|
|
| 1605 | + $gd_country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : ''; |
|
| 1606 | + $gd_region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : ''; |
|
| 1607 | + $gd_city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : ''; |
|
| 1608 | + |
|
| 1609 | + $gd_country_actual = $gd_region_actual = $gd_city_actual = ''; |
|
| 1610 | + |
|
| 1611 | + if (function_exists('get_actual_location_name')) {
|
|
| 1612 | + $gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;
|
|
| 1613 | + $gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;
|
|
| 1614 | + $gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;
|
|
| 1615 | + } |
|
| 1616 | + |
|
| 1617 | + if ($gd_city != '') {
|
|
| 1618 | + if ($gd_city_actual != '') {
|
|
| 1619 | + $gd_city = $gd_city_actual; |
|
| 1620 | + } else {
|
|
| 1621 | + $gd_city = preg_replace('/-(\d+)$/', '', $gd_city);
|
|
| 1622 | + $gd_city = preg_replace('/[_-]/', ' ', $gd_city);
|
|
| 1623 | + $gd_city = __(geodir_ucwords($gd_city), 'geodirectory'); |
|
| 1624 | + } |
|
| 1608 | 1625 | |
| 1609 | - $gd_country_actual = $gd_region_actual = $gd_city_actual = ''; |
|
| 1626 | + $list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";
|
|
| 1627 | + } else if ($gd_region != '') {
|
|
| 1628 | + if ($gd_region_actual != '') {
|
|
| 1629 | + $gd_region = $gd_region_actual; |
|
| 1630 | + } else {
|
|
| 1631 | + $gd_region = preg_replace('/-(\d+)$/', '', $gd_region);
|
|
| 1632 | + $gd_region = preg_replace('/[_-]/', ' ', $gd_region);
|
|
| 1633 | + $gd_region = __(geodir_ucwords($gd_region), 'geodirectory'); |
|
| 1634 | + } |
|
| 1610 | 1635 | |
| 1611 | - if (function_exists('get_actual_location_name')) {
|
|
| 1612 | - $gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;
|
|
| 1613 | - $gd_region_actual = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;
|
|
| 1614 | - $gd_city_actual = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;
|
|
| 1615 | - } |
|
| 1636 | + $list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";
|
|
| 1637 | + } else if ($gd_country != '') {
|
|
| 1638 | + if ($gd_country_actual != '') {
|
|
| 1639 | + $gd_country = $gd_country_actual; |
|
| 1640 | + } else {
|
|
| 1641 | + $gd_country = preg_replace('/-(\d+)$/', '', $gd_country);
|
|
| 1642 | + $gd_country = preg_replace('/[_-]/', ' ', $gd_country);
|
|
| 1643 | + $gd_country = __(geodir_ucwords($gd_country), 'geodirectory'); |
|
| 1644 | + } |
|
| 1616 | 1645 | |
| 1617 | - if ($gd_city != '') {
|
|
| 1618 | - if ($gd_city_actual != '') {
|
|
| 1619 | - $gd_city = $gd_city_actual; |
|
| 1620 | - } else {
|
|
| 1621 | - $gd_city = preg_replace('/-(\d+)$/', '', $gd_city);
|
|
| 1622 | - $gd_city = preg_replace('/[_-]/', ' ', $gd_city);
|
|
| 1623 | - $gd_city = __(geodir_ucwords($gd_city), 'geodirectory'); |
|
| 1624 | - } |
|
| 1646 | + $list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";
|
|
| 1647 | + } |
|
| 1648 | + } |
|
| 1625 | 1649 | |
| 1626 | - $list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";
|
|
| 1627 | - } else if ($gd_region != '') {
|
|
| 1628 | - if ($gd_region_actual != '') {
|
|
| 1629 | - $gd_region = $gd_region_actual; |
|
| 1630 | - } else {
|
|
| 1631 | - $gd_region = preg_replace('/-(\d+)$/', '', $gd_region);
|
|
| 1632 | - $gd_region = preg_replace('/[_-]/', ' ', $gd_region);
|
|
| 1633 | - $gd_region = __(geodir_ucwords($gd_region), 'geodirectory'); |
|
| 1634 | - } |
|
| 1650 | + if (is_search()) {
|
|
| 1651 | + $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";
|
|
| 1652 | + } |
|
| 1653 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1654 | + $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 1655 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1656 | + $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 1635 | 1657 | |
| 1636 | - $list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";
|
|
| 1637 | - } else if ($gd_country != '') {
|
|
| 1638 | - if ($gd_country_actual != '') {
|
|
| 1639 | - $gd_country = $gd_country_actual; |
|
| 1640 | - } else {
|
|
| 1641 | - $gd_country = preg_replace('/-(\d+)$/', '', $gd_country);
|
|
| 1642 | - $gd_country = preg_replace('/[_-]/', ' ', $gd_country);
|
|
| 1643 | - $gd_country = __(geodir_ucwords($gd_country), 'geodirectory'); |
|
| 1644 | - } |
|
| 1645 | 1658 | |
| 1646 | - $list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";
|
|
| 1647 | - } |
|
| 1648 | - } |
|
| 1649 | - |
|
| 1650 | - if (is_search()) {
|
|
| 1651 | - $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";
|
|
| 1652 | - } |
|
| 1653 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1654 | - $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 1655 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1656 | - $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 1657 | - |
|
| 1658 | - |
|
| 1659 | - $title = $list_title; |
|
| 1660 | - $gd_page = ''; |
|
| 1661 | - if(geodir_is_page('pt')){
|
|
| 1662 | - $gd_page = 'pt'; |
|
| 1663 | - $title = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;
|
|
| 1664 | - } |
|
| 1665 | - elseif(geodir_is_page('listing')){
|
|
| 1666 | - $gd_page = 'listing'; |
|
| 1667 | - global $wp_query; |
|
| 1668 | - $current_term = $wp_query->get_queried_object(); |
|
| 1669 | - if (strpos($current_term->taxonomy,'_tags') !== false) {
|
|
| 1670 | - $title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;
|
|
| 1671 | - }else{
|
|
| 1672 | - $title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;
|
|
| 1673 | - } |
|
| 1659 | + $title = $list_title; |
|
| 1660 | + $gd_page = ''; |
|
| 1661 | + if(geodir_is_page('pt')){
|
|
| 1662 | + $gd_page = 'pt'; |
|
| 1663 | + $title = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;
|
|
| 1664 | + } |
|
| 1665 | + elseif(geodir_is_page('listing')){
|
|
| 1666 | + $gd_page = 'listing'; |
|
| 1667 | + global $wp_query; |
|
| 1668 | + $current_term = $wp_query->get_queried_object(); |
|
| 1669 | + if (strpos($current_term->taxonomy,'_tags') !== false) {
|
|
| 1670 | + $title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;
|
|
| 1671 | + }else{
|
|
| 1672 | + $title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;
|
|
| 1673 | + } |
|
| 1674 | 1674 | |
| 1675 | - } |
|
| 1676 | - elseif(geodir_is_page('author')){
|
|
| 1677 | - $gd_page = 'author'; |
|
| 1678 | - if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){
|
|
| 1679 | - $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;
|
|
| 1680 | - }else{
|
|
| 1681 | - $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;
|
|
| 1682 | - } |
|
| 1675 | + } |
|
| 1676 | + elseif(geodir_is_page('author')){
|
|
| 1677 | + $gd_page = 'author'; |
|
| 1678 | + if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){
|
|
| 1679 | + $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;
|
|
| 1680 | + }else{
|
|
| 1681 | + $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;
|
|
| 1682 | + } |
|
| 1683 | 1683 | |
| 1684 | - } |
|
| 1684 | + } |
|
| 1685 | 1685 | |
| 1686 | 1686 | |
| 1687 | - /** |
|
| 1688 | - * Filter page title to replace variables. |
|
| 1689 | - * |
|
| 1690 | - * @since 1.5.4 |
|
| 1691 | - * @param string $title The page title including variables. |
|
| 1692 | - * @param string $gd_page The GeoDirectory page type if any. |
|
| 1693 | - */ |
|
| 1694 | - $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 1687 | + /** |
|
| 1688 | + * Filter page title to replace variables. |
|
| 1689 | + * |
|
| 1690 | + * @since 1.5.4 |
|
| 1691 | + * @param string $title The page title including variables. |
|
| 1692 | + * @param string $gd_page The GeoDirectory page type if any. |
|
| 1693 | + */ |
|
| 1694 | + $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 1695 | 1695 | |
| 1696 | - echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . |
|
| 1697 | - /** |
|
| 1698 | - * Filter the listing page title. |
|
| 1699 | - * |
|
| 1700 | - * @since 1.0.0 |
|
| 1701 | - * @param string $list_title The title for the category page. |
|
| 1702 | - */ |
|
| 1703 | - apply_filters('geodir_listing_page_title', $title) . '</h1></header>';
|
|
| 1696 | + echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . |
|
| 1697 | + /** |
|
| 1698 | + * Filter the listing page title. |
|
| 1699 | + * |
|
| 1700 | + * @since 1.0.0 |
|
| 1701 | + * @param string $list_title The title for the category page. |
|
| 1702 | + */ |
|
| 1703 | + apply_filters('geodir_listing_page_title', $title) . '</h1></header>';
|
|
| 1704 | 1704 | } |
| 1705 | 1705 | |
| 1706 | 1706 | add_action('geodir_listings_page_description', 'geodir_action_listings_description', 10);
|
@@ -1713,46 +1713,46 @@ discard block |
||
| 1713 | 1713 | */ |
| 1714 | 1714 | function geodir_action_listings_description() |
| 1715 | 1715 | {
|
| 1716 | - global $wp_query; |
|
| 1717 | - $current_term = $wp_query->get_queried_object(); |
|
| 1716 | + global $wp_query; |
|
| 1717 | + $current_term = $wp_query->get_queried_object(); |
|
| 1718 | 1718 | |
| 1719 | - $gd_post_type = geodir_get_current_posttype(); |
|
| 1720 | - if (isset($current_term->term_id) && $current_term->term_id != '') {
|
|
| 1719 | + $gd_post_type = geodir_get_current_posttype(); |
|
| 1720 | + if (isset($current_term->term_id) && $current_term->term_id != '') {
|
|
| 1721 | 1721 | |
| 1722 | - $term_desc = term_description($current_term->term_id, $gd_post_type . '_tags'); |
|
| 1723 | - $saved_data = stripslashes(geodir_get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type)); |
|
| 1724 | - if ($term_desc && !$saved_data) {
|
|
| 1725 | - $saved_data = $term_desc; |
|
| 1726 | - } |
|
| 1722 | + $term_desc = term_description($current_term->term_id, $gd_post_type . '_tags'); |
|
| 1723 | + $saved_data = stripslashes(geodir_get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type)); |
|
| 1724 | + if ($term_desc && !$saved_data) {
|
|
| 1725 | + $saved_data = $term_desc; |
|
| 1726 | + } |
|
| 1727 | 1727 | |
| 1728 | - // stop payment manager filtering content length |
|
| 1729 | - $filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' ); |
|
| 1730 | - if ( false !== $filter_priority ) {
|
|
| 1731 | - remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority ); |
|
| 1732 | - } |
|
| 1728 | + // stop payment manager filtering content length |
|
| 1729 | + $filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' ); |
|
| 1730 | + if ( false !== $filter_priority ) {
|
|
| 1731 | + remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority ); |
|
| 1732 | + } |
|
| 1733 | 1733 | |
| 1734 | - /** |
|
| 1735 | - * Apply the core filter `the_content` filter to the variable string. |
|
| 1736 | - * |
|
| 1737 | - * This is a WordPress core filter that does many things. |
|
| 1738 | - * |
|
| 1739 | - * @since 1.0.0 |
|
| 1740 | - * @param string $var The string to apply the filter to. |
|
| 1741 | - */ |
|
| 1742 | - $cat_description = apply_filters('the_content', $saved_data);
|
|
| 1734 | + /** |
|
| 1735 | + * Apply the core filter `the_content` filter to the variable string. |
|
| 1736 | + * |
|
| 1737 | + * This is a WordPress core filter that does many things. |
|
| 1738 | + * |
|
| 1739 | + * @since 1.0.0 |
|
| 1740 | + * @param string $var The string to apply the filter to. |
|
| 1741 | + */ |
|
| 1742 | + $cat_description = apply_filters('the_content', $saved_data);
|
|
| 1743 | 1743 | |
| 1744 | 1744 | |
| 1745 | - if ( false !== $filter_priority ) {
|
|
| 1746 | - add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority ); |
|
| 1747 | - } |
|
| 1745 | + if ( false !== $filter_priority ) {
|
|
| 1746 | + add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority ); |
|
| 1747 | + } |
|
| 1748 | 1748 | |
| 1749 | - if ($cat_description) {
|
|
| 1750 | - ?> |
|
| 1749 | + if ($cat_description) {
|
|
| 1750 | + ?> |
|
| 1751 | 1751 | |
| 1752 | 1752 | <div class="term_description"><?php echo $cat_description;?></div> <?php |
| 1753 | - } |
|
| 1753 | + } |
|
| 1754 | 1754 | |
| 1755 | - } |
|
| 1755 | + } |
|
| 1756 | 1756 | } |
| 1757 | 1757 | |
| 1758 | 1758 | // action for adding the listings page top widget area |
@@ -1771,11 +1771,11 @@ discard block |
||
| 1771 | 1771 | */ |
| 1772 | 1772 | function geodir_action_geodir_sidebar_listings_top() |
| 1773 | 1773 | {
|
| 1774 | - if (get_option('geodir_show_listing_top_section')) { ?>
|
|
| 1774 | + if (get_option('geodir_show_listing_top_section')) { ?>
|
|
| 1775 | 1775 | <div |
| 1776 | 1776 | class="<?php |
| 1777 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1778 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_top'); ?>">
|
|
| 1777 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1778 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_top'); ?>">
|
|
| 1779 | 1779 | <?php dynamic_sidebar('geodir_listing_top'); ?>
|
| 1780 | 1780 | </div><!-- clearfix ends here--> |
| 1781 | 1781 | <?php } |
@@ -1798,35 +1798,35 @@ discard block |
||
| 1798 | 1798 | */ |
| 1799 | 1799 | function geodir_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '') |
| 1800 | 1800 | {
|
| 1801 | - if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {
|
|
| 1802 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 1803 | - } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {
|
|
| 1804 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 1805 | - } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {
|
|
| 1806 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 1807 | - } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {
|
|
| 1808 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 1809 | - } else {
|
|
| 1810 | - $width_css = ''; |
|
| 1811 | - } |
|
| 1812 | - |
|
| 1813 | - $tc = get_option('theme_compatibility_setting');
|
|
| 1814 | - if (!empty($tc['geodir_sidebar_left_open_replace'])) {
|
|
| 1815 | - $text = $tc['geodir_sidebar_left_open_replace']; |
|
| 1816 | - } else {
|
|
| 1817 | - $text = '<aside id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>'; |
|
| 1818 | - } |
|
| 1819 | - |
|
| 1820 | - if (!empty($tc['geodir_sidebar_left_open_id'])) {
|
|
| 1821 | - $id = $tc['geodir_sidebar_left_open_id']; |
|
| 1822 | - } |
|
| 1823 | - if (!empty($tc['geodir_sidebar_left_open_class'])) {
|
|
| 1824 | - $class = $tc['geodir_sidebar_left_open_class']; |
|
| 1825 | - } |
|
| 1826 | - |
|
| 1827 | - $text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);
|
|
| 1828 | - |
|
| 1829 | - echo $text; |
|
| 1801 | + if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {
|
|
| 1802 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 1803 | + } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {
|
|
| 1804 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 1805 | + } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {
|
|
| 1806 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 1807 | + } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {
|
|
| 1808 | + $width_css = 'style="width:' . $width . '%;"'; |
|
| 1809 | + } else {
|
|
| 1810 | + $width_css = ''; |
|
| 1811 | + } |
|
| 1812 | + |
|
| 1813 | + $tc = get_option('theme_compatibility_setting');
|
|
| 1814 | + if (!empty($tc['geodir_sidebar_left_open_replace'])) {
|
|
| 1815 | + $text = $tc['geodir_sidebar_left_open_replace']; |
|
| 1816 | + } else {
|
|
| 1817 | + $text = '<aside id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>'; |
|
| 1818 | + } |
|
| 1819 | + |
|
| 1820 | + if (!empty($tc['geodir_sidebar_left_open_id'])) {
|
|
| 1821 | + $id = $tc['geodir_sidebar_left_open_id']; |
|
| 1822 | + } |
|
| 1823 | + if (!empty($tc['geodir_sidebar_left_open_class'])) {
|
|
| 1824 | + $class = $tc['geodir_sidebar_left_open_class']; |
|
| 1825 | + } |
|
| 1826 | + |
|
| 1827 | + $text = str_replace(array("[id]", "[class]", "[itemtype]", "[width_css]"), array($id, $class, $itemtype, $width_css), $text);
|
|
| 1828 | + |
|
| 1829 | + echo $text; |
|
| 1830 | 1830 | } |
| 1831 | 1831 | |
| 1832 | 1832 | // action for adding the primary div closing tag |
@@ -1842,13 +1842,13 @@ discard block |
||
| 1842 | 1842 | */ |
| 1843 | 1843 | function geodir_action_sidebar_left_close($type = '') |
| 1844 | 1844 | {
|
| 1845 | - $tc = get_option('theme_compatibility_setting');
|
|
| 1846 | - if (!empty($tc['geodir_sidebar_left_close_replace'])) {
|
|
| 1847 | - $text = $tc['geodir_sidebar_left_close_replace']; |
|
| 1848 | - } else {
|
|
| 1849 | - $text = '</aside><!-- sidebar ends here-->'; |
|
| 1850 | - } |
|
| 1851 | - echo $text; |
|
| 1845 | + $tc = get_option('theme_compatibility_setting');
|
|
| 1846 | + if (!empty($tc['geodir_sidebar_left_close_replace'])) {
|
|
| 1847 | + $text = $tc['geodir_sidebar_left_close_replace']; |
|
| 1848 | + } else {
|
|
| 1849 | + $text = '</aside><!-- sidebar ends here-->'; |
|
| 1850 | + } |
|
| 1851 | + echo $text; |
|
| 1852 | 1852 | } |
| 1853 | 1853 | |
| 1854 | 1854 | /** |
@@ -1861,7 +1861,7 @@ discard block |
||
| 1861 | 1861 | */ |
| 1862 | 1862 | function geodir_listing_left_section() |
| 1863 | 1863 | {
|
| 1864 | - if (get_option('geodir_show_listing_left_section')) { ?>
|
|
| 1864 | + if (get_option('geodir_show_listing_left_section')) { ?>
|
|
| 1865 | 1865 | <div class="geodir-content-left geodir-sidebar-wrap"> |
| 1866 | 1866 | <?php dynamic_sidebar('geodir_listing_left_sidebar'); ?>
|
| 1867 | 1867 | </div><!-- end geodir-content-left --> |
@@ -1879,20 +1879,20 @@ discard block |
||
| 1879 | 1879 | */ |
| 1880 | 1880 | function geodir_action_listings_sidebar_left() |
| 1881 | 1881 | {
|
| 1882 | - if (get_option('geodir_show_listing_left_section')) {
|
|
| 1883 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1884 | - do_action('geodir_sidebar_left_open', 'listings-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'https://schema.org/WPSideBar');
|
|
| 1885 | - /** |
|
| 1886 | - * Calls the listings page (category) left sidebar content. |
|
| 1887 | - * |
|
| 1888 | - * All the content for the listings page left sidebar is added via this hook. |
|
| 1889 | - * |
|
| 1890 | - * @since 1.0.0 |
|
| 1891 | - */ |
|
| 1892 | - do_action('geodir_listings_sidebar_left_inside');
|
|
| 1893 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1894 | - do_action('geodir_sidebar_left_close', 'listings-page');
|
|
| 1895 | - } |
|
| 1882 | + if (get_option('geodir_show_listing_left_section')) {
|
|
| 1883 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1884 | + do_action('geodir_sidebar_left_open', 'listings-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'https://schema.org/WPSideBar');
|
|
| 1885 | + /** |
|
| 1886 | + * Calls the listings page (category) left sidebar content. |
|
| 1887 | + * |
|
| 1888 | + * All the content for the listings page left sidebar is added via this hook. |
|
| 1889 | + * |
|
| 1890 | + * @since 1.0.0 |
|
| 1891 | + */ |
|
| 1892 | + do_action('geodir_listings_sidebar_left_inside');
|
|
| 1893 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1894 | + do_action('geodir_sidebar_left_close', 'listings-page');
|
|
| 1895 | + } |
|
| 1896 | 1896 | } |
| 1897 | 1897 | |
| 1898 | 1898 | /** |
@@ -1905,7 +1905,7 @@ discard block |
||
| 1905 | 1905 | */ |
| 1906 | 1906 | function geodir_listing_right_section() |
| 1907 | 1907 | {
|
| 1908 | - if (get_option('geodir_show_listing_right_section')) { ?>
|
|
| 1908 | + if (get_option('geodir_show_listing_right_section')) { ?>
|
|
| 1909 | 1909 | <div class="geodir-content-right geodir-sidebar-wrap"> |
| 1910 | 1910 | <?php dynamic_sidebar('geodir_listing_right_sidebar'); ?>
|
| 1911 | 1911 | </div><!-- end geodir-content-right --> |
@@ -1923,20 +1923,20 @@ discard block |
||
| 1923 | 1923 | */ |
| 1924 | 1924 | function geodir_action_listings_sidebar_right() |
| 1925 | 1925 | {
|
| 1926 | - if (get_option('geodir_show_listing_right_section')) {
|
|
| 1927 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1928 | - do_action('geodir_sidebar_right_open', 'listings-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 1929 | - /** |
|
| 1930 | - * Calls the listings page (category) right sidebar content. |
|
| 1931 | - * |
|
| 1932 | - * All the content for the listings page right sidebar is added via this hook. |
|
| 1933 | - * |
|
| 1934 | - * @since 1.0.0 |
|
| 1935 | - */ |
|
| 1936 | - do_action('geodir_listings_sidebar_right_inside');
|
|
| 1937 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1938 | - do_action('geodir_sidebar_right_close', 'listings-page');
|
|
| 1939 | - } |
|
| 1926 | + if (get_option('geodir_show_listing_right_section')) {
|
|
| 1927 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1928 | + do_action('geodir_sidebar_right_open', 'listings-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 1929 | + /** |
|
| 1930 | + * Calls the listings page (category) right sidebar content. |
|
| 1931 | + * |
|
| 1932 | + * All the content for the listings page right sidebar is added via this hook. |
|
| 1933 | + * |
|
| 1934 | + * @since 1.0.0 |
|
| 1935 | + */ |
|
| 1936 | + do_action('geodir_listings_sidebar_right_inside');
|
|
| 1937 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1938 | + do_action('geodir_sidebar_right_close', 'listings-page');
|
|
| 1939 | + } |
|
| 1940 | 1940 | } |
| 1941 | 1941 | |
| 1942 | 1942 | |
@@ -1953,23 +1953,23 @@ discard block |
||
| 1953 | 1953 | */ |
| 1954 | 1954 | function geodir_action_main_content_open($type = '', $id = '', $class = '') |
| 1955 | 1955 | {
|
| 1956 | - $tc = get_option('theme_compatibility_setting');
|
|
| 1957 | - if (!empty($tc['geodir_main_content_open_replace'])) {
|
|
| 1958 | - $text = $tc['geodir_main_content_open_replace']; |
|
| 1959 | - } else {
|
|
| 1960 | - $text = '<main id="[id]" class="[class]" role="main">'; |
|
| 1961 | - } |
|
| 1956 | + $tc = get_option('theme_compatibility_setting');
|
|
| 1957 | + if (!empty($tc['geodir_main_content_open_replace'])) {
|
|
| 1958 | + $text = $tc['geodir_main_content_open_replace']; |
|
| 1959 | + } else {
|
|
| 1960 | + $text = '<main id="[id]" class="[class]" role="main">'; |
|
| 1961 | + } |
|
| 1962 | 1962 | |
| 1963 | - if (!empty($tc['geodir_main_content_open_id'])) {
|
|
| 1964 | - $id = $tc['geodir_main_content_open_id']; |
|
| 1965 | - } |
|
| 1966 | - if (!empty($tc['geodir_main_content_open_class'])) {
|
|
| 1967 | - $class = $tc['geodir_main_content_open_class']; |
|
| 1968 | - } |
|
| 1963 | + if (!empty($tc['geodir_main_content_open_id'])) {
|
|
| 1964 | + $id = $tc['geodir_main_content_open_id']; |
|
| 1965 | + } |
|
| 1966 | + if (!empty($tc['geodir_main_content_open_class'])) {
|
|
| 1967 | + $class = $tc['geodir_main_content_open_class']; |
|
| 1968 | + } |
|
| 1969 | 1969 | |
| 1970 | - $text = str_replace(array("[id]", "[class]"), array($id, $class), $text);
|
|
| 1970 | + $text = str_replace(array("[id]", "[class]"), array($id, $class), $text);
|
|
| 1971 | 1971 | |
| 1972 | - echo $text; |
|
| 1972 | + echo $text; |
|
| 1973 | 1973 | } |
| 1974 | 1974 | |
| 1975 | 1975 | // action for adding the primary div closing tag |
@@ -1982,13 +1982,13 @@ discard block |
||
| 1982 | 1982 | */ |
| 1983 | 1983 | function geodir_action_main_content_close() |
| 1984 | 1984 | {
|
| 1985 | - $tc = get_option('theme_compatibility_setting');
|
|
| 1986 | - if (!empty($tc['geodir_main_content_close_replace'])) {
|
|
| 1987 | - $text = $tc['geodir_main_content_close_replace']; |
|
| 1988 | - } else {
|
|
| 1989 | - $text = '</main><!-- main ends here-->'; |
|
| 1990 | - } |
|
| 1991 | - echo $text; |
|
| 1985 | + $tc = get_option('theme_compatibility_setting');
|
|
| 1986 | + if (!empty($tc['geodir_main_content_close_replace'])) {
|
|
| 1987 | + $text = $tc['geodir_main_content_close_replace']; |
|
| 1988 | + } else {
|
|
| 1989 | + $text = '</main><!-- main ends here-->'; |
|
| 1990 | + } |
|
| 1991 | + echo $text; |
|
| 1992 | 1992 | } |
| 1993 | 1993 | |
| 1994 | 1994 | /** |
@@ -2000,14 +2000,14 @@ discard block |
||
| 2000 | 2000 | */ |
| 2001 | 2001 | function geodir_action_listings_content_inside() |
| 2002 | 2002 | {
|
| 2003 | - global $gridview_columns; |
|
| 2004 | - $listing_view = get_option('geodir_listing_view');
|
|
| 2005 | - if (strstr($listing_view, 'gridview')) {
|
|
| 2006 | - $gridview_columns = $listing_view; |
|
| 2007 | - $listing_view_exp = explode('_', $listing_view);
|
|
| 2008 | - $listing_view = $listing_view_exp[0]; |
|
| 2009 | - } |
|
| 2010 | - geodir_get_template_part('listing', 'listview');
|
|
| 2003 | + global $gridview_columns; |
|
| 2004 | + $listing_view = get_option('geodir_listing_view');
|
|
| 2005 | + if (strstr($listing_view, 'gridview')) {
|
|
| 2006 | + $gridview_columns = $listing_view; |
|
| 2007 | + $listing_view_exp = explode('_', $listing_view);
|
|
| 2008 | + $listing_view = $listing_view_exp[0]; |
|
| 2009 | + } |
|
| 2010 | + geodir_get_template_part('listing', 'listview');
|
|
| 2011 | 2011 | } |
| 2012 | 2012 | |
| 2013 | 2013 | add_action('geodir_listings_content_inside', 'geodir_action_listings_content_inside', 10);
|
@@ -2023,47 +2023,47 @@ discard block |
||
| 2023 | 2023 | */ |
| 2024 | 2024 | function geodir_action_listings_content() |
| 2025 | 2025 | {
|
| 2026 | - /** |
|
| 2027 | - * This is used to add HTML opening wrappers to the main content of most pages including listings, author, search, home etc. |
|
| 2028 | - * |
|
| 2029 | - * @since 1.0.0 |
|
| 2030 | - * @param string $type The page type. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 2031 | - * @param string $id The id for the div. Usually 'geodir-main-content'. |
|
| 2032 | - * @param string $class The class for the div. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 2033 | - * @see 'geodir_main_content_close' Where the oposing closing tag is added. |
|
| 2034 | - */ |
|
| 2035 | - do_action('geodir_main_content_open', 'listings-page', 'geodir-main-content', 'listings-page');
|
|
| 2036 | - $extra_class = apply_filters('geodir_before_listing_wrapper_extra_class', '', 'listings-page');
|
|
| 2037 | - echo '<div class="clearfix '.$extra_class.'">'; |
|
| 2038 | - /** |
|
| 2039 | - * Called before the listings page content, inside the outer wrapper. Used on listings pages and search and author pages. |
|
| 2040 | - * |
|
| 2041 | - * @since 1.0.0 |
|
| 2042 | - */ |
|
| 2043 | - do_action('geodir_before_listing');
|
|
| 2044 | - echo '</div>'; |
|
| 2045 | - |
|
| 2046 | - /** |
|
| 2047 | - * This actions calls the listings list content. Used on listings pages and search and author pages. |
|
| 2048 | - * |
|
| 2049 | - * @since 1.0.0 |
|
| 2050 | - */ |
|
| 2051 | - do_action('geodir_listings_content_inside');
|
|
| 2052 | - |
|
| 2053 | - /** |
|
| 2054 | - * Called after the listings content, inside the outer wrapper HTML. Used on listings pages and search and author pages. |
|
| 2055 | - * |
|
| 2056 | - * @since 1.0.0 |
|
| 2057 | - */ |
|
| 2058 | - do_action('geodir_after_listing');
|
|
| 2059 | - |
|
| 2060 | - /** |
|
| 2061 | - * This is used to add HTML closing wrappers to the main content of most pages including listings, author, search, home etc. |
|
| 2062 | - * |
|
| 2063 | - * @since 1.0.0 |
|
| 2064 | - * @see 'geodir_main_content_open' Where the oposing opening tag is added. |
|
| 2065 | - */ |
|
| 2066 | - do_action('geodir_main_content_close', 'listings-page');
|
|
| 2026 | + /** |
|
| 2027 | + * This is used to add HTML opening wrappers to the main content of most pages including listings, author, search, home etc. |
|
| 2028 | + * |
|
| 2029 | + * @since 1.0.0 |
|
| 2030 | + * @param string $type The page type. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 2031 | + * @param string $id The id for the div. Usually 'geodir-main-content'. |
|
| 2032 | + * @param string $class The class for the div. Values can be 'listings-page', 'author-page', 'search-page' or 'home-page'. |
|
| 2033 | + * @see 'geodir_main_content_close' Where the oposing closing tag is added. |
|
| 2034 | + */ |
|
| 2035 | + do_action('geodir_main_content_open', 'listings-page', 'geodir-main-content', 'listings-page');
|
|
| 2036 | + $extra_class = apply_filters('geodir_before_listing_wrapper_extra_class', '', 'listings-page');
|
|
| 2037 | + echo '<div class="clearfix '.$extra_class.'">'; |
|
| 2038 | + /** |
|
| 2039 | + * Called before the listings page content, inside the outer wrapper. Used on listings pages and search and author pages. |
|
| 2040 | + * |
|
| 2041 | + * @since 1.0.0 |
|
| 2042 | + */ |
|
| 2043 | + do_action('geodir_before_listing');
|
|
| 2044 | + echo '</div>'; |
|
| 2045 | + |
|
| 2046 | + /** |
|
| 2047 | + * This actions calls the listings list content. Used on listings pages and search and author pages. |
|
| 2048 | + * |
|
| 2049 | + * @since 1.0.0 |
|
| 2050 | + */ |
|
| 2051 | + do_action('geodir_listings_content_inside');
|
|
| 2052 | + |
|
| 2053 | + /** |
|
| 2054 | + * Called after the listings content, inside the outer wrapper HTML. Used on listings pages and search and author pages. |
|
| 2055 | + * |
|
| 2056 | + * @since 1.0.0 |
|
| 2057 | + */ |
|
| 2058 | + do_action('geodir_after_listing');
|
|
| 2059 | + |
|
| 2060 | + /** |
|
| 2061 | + * This is used to add HTML closing wrappers to the main content of most pages including listings, author, search, home etc. |
|
| 2062 | + * |
|
| 2063 | + * @since 1.0.0 |
|
| 2064 | + * @see 'geodir_main_content_open' Where the oposing opening tag is added. |
|
| 2065 | + */ |
|
| 2066 | + do_action('geodir_main_content_close', 'listings-page');
|
|
| 2067 | 2067 | } |
| 2068 | 2068 | |
| 2069 | 2069 | |
@@ -2078,10 +2078,10 @@ discard block |
||
| 2078 | 2078 | */ |
| 2079 | 2079 | function geodir_action_sidebar_listings_bottom_section() |
| 2080 | 2080 | {
|
| 2081 | - if (get_option('geodir_show_listing_bottom_section')) { ?>
|
|
| 2081 | + if (get_option('geodir_show_listing_bottom_section')) { ?>
|
|
| 2082 | 2082 | <div class="<?php |
| 2083 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2084 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_bottom'); ?>">
|
|
| 2083 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2084 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_listing_bottom'); ?>">
|
|
| 2085 | 2085 | <?php dynamic_sidebar('geodir_listing_bottom'); ?>
|
| 2086 | 2086 | </div><!-- clearfix ends here--> |
| 2087 | 2087 | <?php } |
@@ -2101,38 +2101,38 @@ discard block |
||
| 2101 | 2101 | */ |
| 2102 | 2102 | function geodir_action_add_listing_page_title() |
| 2103 | 2103 | {
|
| 2104 | - if (isset($_REQUEST['listing_type']) && $_REQUEST['listing_type'] != '') |
|
| 2105 | - $listing_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2106 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2107 | - $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 2108 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2109 | - $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 2110 | - |
|
| 2111 | - $title = apply_filters('geodir_add_listing_page_title_text', get_the_title());
|
|
| 2112 | - |
|
| 2113 | - if(geodir_is_page('add-listing')){
|
|
| 2114 | - $gd_page = 'add-listing'; |
|
| 2115 | - if(isset($_REQUEST['pid']) && $_REQUEST['pid'] != ''){
|
|
| 2116 | - $title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;
|
|
| 2117 | - }elseif(isset($listing_type)){
|
|
| 2118 | - $title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;
|
|
| 2119 | - } |
|
| 2104 | + if (isset($_REQUEST['listing_type']) && $_REQUEST['listing_type'] != '') |
|
| 2105 | + $listing_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2106 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2107 | + $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 2108 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2109 | + $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 2120 | 2110 | |
| 2121 | - } |
|
| 2111 | + $title = apply_filters('geodir_add_listing_page_title_text', get_the_title());
|
|
| 2122 | 2112 | |
| 2113 | + if(geodir_is_page('add-listing')){
|
|
| 2114 | + $gd_page = 'add-listing'; |
|
| 2115 | + if(isset($_REQUEST['pid']) && $_REQUEST['pid'] != ''){
|
|
| 2116 | + $title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;
|
|
| 2117 | + }elseif(isset($listing_type)){
|
|
| 2118 | + $title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;
|
|
| 2119 | + } |
|
| 2120 | + |
|
| 2121 | + } |
|
| 2123 | 2122 | |
| 2124 | - /** |
|
| 2125 | - * Filter page title to replace variables. |
|
| 2126 | - * |
|
| 2127 | - * @since 1.5.4 |
|
| 2128 | - * @param string $title The page title including variables. |
|
| 2129 | - * @param string $gd_page The GeoDirectory page type if any. |
|
| 2130 | - */ |
|
| 2131 | - $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 2132 | 2123 | |
| 2133 | - echo '<header class="' . $class_header . '"><h1 class="' . $class . '">'; |
|
| 2134 | - echo $title; |
|
| 2135 | - echo '</h1></header>'; |
|
| 2124 | + /** |
|
| 2125 | + * Filter page title to replace variables. |
|
| 2126 | + * |
|
| 2127 | + * @since 1.5.4 |
|
| 2128 | + * @param string $title The page title including variables. |
|
| 2129 | + * @param string $gd_page The GeoDirectory page type if any. |
|
| 2130 | + */ |
|
| 2131 | + $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 2132 | + |
|
| 2133 | + echo '<header class="' . $class_header . '"><h1 class="' . $class . '">'; |
|
| 2134 | + echo $title; |
|
| 2135 | + echo '</h1></header>'; |
|
| 2136 | 2136 | } |
| 2137 | 2137 | |
| 2138 | 2138 | add_action('geodir_add_listing_page_mandatory', 'geodir_action_add_listing_page_mandatory', 10);
|
@@ -2163,61 +2163,61 @@ discard block |
||
| 2163 | 2163 | */ |
| 2164 | 2164 | function geodir_action_add_listing_form() |
| 2165 | 2165 | {
|
| 2166 | - global $cat_display, $post_cat, $current_user, $gd_session; |
|
| 2167 | - $page_id = get_the_ID(); |
|
| 2168 | - $post = ''; |
|
| 2169 | - $title = ''; |
|
| 2170 | - $desc = ''; |
|
| 2171 | - $kw_tags = ''; |
|
| 2172 | - $required_msg = ''; |
|
| 2173 | - $submit_button = ''; |
|
| 2174 | - |
|
| 2175 | - $ajax_action = isset($_REQUEST['ajax_action']) ? $_REQUEST['ajax_action'] : 'add'; |
|
| 2176 | - |
|
| 2177 | - $thumb_img_arr = array(); |
|
| 2178 | - $curImages = ''; |
|
| 2179 | - |
|
| 2180 | - if (isset($_REQUEST['backandedit'])) {
|
|
| 2181 | - global $post; |
|
| 2182 | - $post = (object)$gd_session->get('listing');
|
|
| 2183 | - $listing_type = $post->listing_type; |
|
| 2184 | - $title = $post->post_title; |
|
| 2185 | - $desc = $post->post_desc; |
|
| 2186 | - $post_cat = isset($post->post_category) ? $post->post_category : ''; |
|
| 2187 | - |
|
| 2188 | - $kw_tags = $post->post_tags; |
|
| 2189 | - $curImages = isset($post->post_images) ? $post->post_images : ''; |
|
| 2190 | - } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 2191 | - global $post, $post_images; |
|
| 2192 | - |
|
| 2193 | - $post = geodir_get_post_info($_REQUEST['pid']); |
|
| 2194 | - $thumb_img_arr = geodir_get_images($post->ID); |
|
| 2195 | - if ($thumb_img_arr) {
|
|
| 2196 | - foreach ($thumb_img_arr as $post_img) {
|
|
| 2197 | - $curImages .= $post_img->src . ','; |
|
| 2198 | - } |
|
| 2199 | - } |
|
| 2200 | - |
|
| 2201 | - $listing_type = $post->post_type; |
|
| 2202 | - $title = $post->post_title; |
|
| 2203 | - $desc = $post->post_content; |
|
| 2204 | - $kw_tags = $post->post_tags; |
|
| 2205 | - $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));
|
|
| 2206 | - } else {
|
|
| 2207 | - $listing_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2208 | - } |
|
| 2166 | + global $cat_display, $post_cat, $current_user, $gd_session; |
|
| 2167 | + $page_id = get_the_ID(); |
|
| 2168 | + $post = ''; |
|
| 2169 | + $title = ''; |
|
| 2170 | + $desc = ''; |
|
| 2171 | + $kw_tags = ''; |
|
| 2172 | + $required_msg = ''; |
|
| 2173 | + $submit_button = ''; |
|
| 2174 | + |
|
| 2175 | + $ajax_action = isset($_REQUEST['ajax_action']) ? $_REQUEST['ajax_action'] : 'add'; |
|
| 2176 | + |
|
| 2177 | + $thumb_img_arr = array(); |
|
| 2178 | + $curImages = ''; |
|
| 2179 | + |
|
| 2180 | + if (isset($_REQUEST['backandedit'])) {
|
|
| 2181 | + global $post; |
|
| 2182 | + $post = (object)$gd_session->get('listing');
|
|
| 2183 | + $listing_type = $post->listing_type; |
|
| 2184 | + $title = $post->post_title; |
|
| 2185 | + $desc = $post->post_desc; |
|
| 2186 | + $post_cat = isset($post->post_category) ? $post->post_category : ''; |
|
| 2187 | + |
|
| 2188 | + $kw_tags = $post->post_tags; |
|
| 2189 | + $curImages = isset($post->post_images) ? $post->post_images : ''; |
|
| 2190 | + } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 2191 | + global $post, $post_images; |
|
| 2192 | + |
|
| 2193 | + $post = geodir_get_post_info($_REQUEST['pid']); |
|
| 2194 | + $thumb_img_arr = geodir_get_images($post->ID); |
|
| 2195 | + if ($thumb_img_arr) {
|
|
| 2196 | + foreach ($thumb_img_arr as $post_img) {
|
|
| 2197 | + $curImages .= $post_img->src . ','; |
|
| 2198 | + } |
|
| 2199 | + } |
|
| 2200 | + |
|
| 2201 | + $listing_type = $post->post_type; |
|
| 2202 | + $title = $post->post_title; |
|
| 2203 | + $desc = $post->post_content; |
|
| 2204 | + $kw_tags = $post->post_tags; |
|
| 2205 | + $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));
|
|
| 2206 | + } else {
|
|
| 2207 | + $listing_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2208 | + } |
|
| 2209 | 2209 | |
| 2210 | - if ($current_user->ID != '0') {
|
|
| 2211 | - $user_login = true; |
|
| 2212 | - } |
|
| 2210 | + if ($current_user->ID != '0') {
|
|
| 2211 | + $user_login = true; |
|
| 2212 | + } |
|
| 2213 | 2213 | |
| 2214 | - $post_type_info = geodir_get_posttype_info($listing_type); |
|
| 2214 | + $post_type_info = geodir_get_posttype_info($listing_type); |
|
| 2215 | 2215 | |
| 2216 | - $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing','geodirectory');
|
|
| 2216 | + $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing','geodirectory');
|
|
| 2217 | 2217 | |
| 2218 | - $package_info = array(); |
|
| 2219 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 2220 | - ?> |
|
| 2218 | + $package_info = array(); |
|
| 2219 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 2220 | + ?> |
|
| 2221 | 2221 | <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id());?>" method="post" enctype="multipart/form-data"> |
| 2222 | 2222 | <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type);?>"/> |
| 2223 | 2223 | <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type);?>"/> |
@@ -2228,114 +2228,114 @@ discard block |
||
| 2228 | 2228 | <?php } if (isset($_REQUEST['backandedit'])) { ?>
|
| 2229 | 2229 | <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']);?>"/> |
| 2230 | 2230 | <?php |
| 2231 | - } |
|
| 2232 | - /** |
|
| 2233 | - * Called at the very top of the add listing page form for frontend. |
|
| 2234 | - * |
|
| 2235 | - * This is called just before the "Enter Listing Details" text. |
|
| 2236 | - * |
|
| 2237 | - * @since 1.0.0 |
|
| 2238 | - */ |
|
| 2239 | - do_action('geodir_before_detail_fields');
|
|
| 2240 | - ?> |
|
| 2231 | + } |
|
| 2232 | + /** |
|
| 2233 | + * Called at the very top of the add listing page form for frontend. |
|
| 2234 | + * |
|
| 2235 | + * This is called just before the "Enter Listing Details" text. |
|
| 2236 | + * |
|
| 2237 | + * @since 1.0.0 |
|
| 2238 | + */ |
|
| 2239 | + do_action('geodir_before_detail_fields');
|
|
| 2240 | + ?> |
|
| 2241 | 2241 | <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT;?></h5> |
| 2242 | 2242 | <?php |
| 2243 | - /** |
|
| 2244 | - * Called at the top of the add listing page form for frontend. |
|
| 2245 | - * |
|
| 2246 | - * This is called after the "Enter Listing Details" text. |
|
| 2247 | - * |
|
| 2248 | - * @since 1.0.0 |
|
| 2249 | - */ |
|
| 2250 | - do_action('geodir_before_main_form_fields');
|
|
| 2251 | - ?> |
|
| 2243 | + /** |
|
| 2244 | + * Called at the top of the add listing page form for frontend. |
|
| 2245 | + * |
|
| 2246 | + * This is called after the "Enter Listing Details" text. |
|
| 2247 | + * |
|
| 2248 | + * @since 1.0.0 |
|
| 2249 | + */ |
|
| 2250 | + do_action('geodir_before_main_form_fields');
|
|
| 2251 | + ?> |
|
| 2252 | 2252 | <div id="geodir_post_title_row" class="required_field geodir_form_row clearfix gd-fieldset-details"> |
| 2253 | 2253 | <label><?php |
| 2254 | - /** |
|
| 2255 | - * Filter the add listing page title input label. |
|
| 2256 | - * |
|
| 2257 | - * @since 1.6.11 |
|
| 2258 | - * @param string $title The title to be output. |
|
| 2259 | - * @param string $cpt_singular_name The singular title of the curent CPT. |
|
| 2260 | - * @param string $listing_type The CPT being requested. ie: gd_place. |
|
| 2261 | - */ |
|
| 2262 | - echo apply_filters('geodir_add_listing_title_label', sprintf( __('%s Title', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span>*</span> </label>
|
|
| 2254 | + /** |
|
| 2255 | + * Filter the add listing page title input label. |
|
| 2256 | + * |
|
| 2257 | + * @since 1.6.11 |
|
| 2258 | + * @param string $title The title to be output. |
|
| 2259 | + * @param string $cpt_singular_name The singular title of the curent CPT. |
|
| 2260 | + * @param string $listing_type The CPT being requested. ie: gd_place. |
|
| 2261 | + */ |
|
| 2262 | + echo apply_filters('geodir_add_listing_title_label', sprintf( __('%s Title', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span>*</span> </label>
|
|
| 2263 | 2263 | <input type="text" field_type="text" name="post_title" id="post_title" class="geodir_textfield" |
| 2264 | 2264 | value="<?php echo esc_attr(stripslashes($title)); ?>"/> |
| 2265 | 2265 | <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory');?></span> |
| 2266 | 2266 | </div> |
| 2267 | 2267 | <?php |
| 2268 | - $show_editor = get_option('geodir_tiny_editor_on_add_listing');
|
|
| 2269 | - $show_editor = !empty($show_editor) && in_array($listing_type, $show_editor) ? true : false; |
|
| 2270 | - /** |
|
| 2271 | - * Filter whether to show or don't show the editor. |
|
| 2272 | - * |
|
| 2273 | - * @since 1.6.16 |
|
| 2274 | - * @param bool $show_editor If true the editor will be available for description field. |
|
| 2275 | - * @param object $package_info The listing package. |
|
| 2276 | - * @param string $listing_type The current post type. |
|
| 2277 | - * @param object $post The current post object. |
|
| 2278 | - */ |
|
| 2279 | - $show_editor = apply_filters('geodir_description_field_show_editor', $show_editor, $package_info, $listing_type, $post);
|
|
| 2280 | - |
|
| 2281 | - $desc = $show_editor ? stripslashes($desc) : esc_attr(stripslashes($desc)); |
|
| 2282 | - $desc_limit = ''; |
|
| 2283 | - /** |
|
| 2284 | - * Filter the add listing description field character limit number. |
|
| 2285 | - * |
|
| 2286 | - * @since 1.0.0 |
|
| 2287 | - * @param int $desc_limit The amount of characters to limit the description to. |
|
| 2288 | - */ |
|
| 2289 | - $desc_limit = apply_filters('geodir_description_field_desc_limit', $desc_limit);
|
|
| 2290 | - /** |
|
| 2291 | - * Filter the add listing description field text. |
|
| 2292 | - * |
|
| 2293 | - * @since 1.0.0 |
|
| 2294 | - * @param string $desc The text for the description field. |
|
| 2295 | - * @param int $desc_limit The character limit number if any. |
|
| 2296 | - */ |
|
| 2297 | - $desc = apply_filters('geodir_description_field_desc', $desc, $desc_limit);
|
|
| 2298 | - $desc_limit_msg = ''; |
|
| 2299 | - /** |
|
| 2300 | - * Filter the add listing description limit message. |
|
| 2301 | - * |
|
| 2302 | - * This is the message shown if there is a limit applied to the amount of characters the description can use. |
|
| 2303 | - * |
|
| 2304 | - * @since 1.0.0 |
|
| 2305 | - * @param string $desc_limit_msg The limit message string if any. |
|
| 2306 | - * @param int $desc_limit The character limit numer if any. |
|
| 2307 | - */ |
|
| 2308 | - $desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);
|
|
| 2268 | + $show_editor = get_option('geodir_tiny_editor_on_add_listing');
|
|
| 2269 | + $show_editor = !empty($show_editor) && in_array($listing_type, $show_editor) ? true : false; |
|
| 2270 | + /** |
|
| 2271 | + * Filter whether to show or don't show the editor. |
|
| 2272 | + * |
|
| 2273 | + * @since 1.6.16 |
|
| 2274 | + * @param bool $show_editor If true the editor will be available for description field. |
|
| 2275 | + * @param object $package_info The listing package. |
|
| 2276 | + * @param string $listing_type The current post type. |
|
| 2277 | + * @param object $post The current post object. |
|
| 2278 | + */ |
|
| 2279 | + $show_editor = apply_filters('geodir_description_field_show_editor', $show_editor, $package_info, $listing_type, $post);
|
|
| 2280 | + |
|
| 2281 | + $desc = $show_editor ? stripslashes($desc) : esc_attr(stripslashes($desc)); |
|
| 2282 | + $desc_limit = ''; |
|
| 2283 | + /** |
|
| 2284 | + * Filter the add listing description field character limit number. |
|
| 2285 | + * |
|
| 2286 | + * @since 1.0.0 |
|
| 2287 | + * @param int $desc_limit The amount of characters to limit the description to. |
|
| 2288 | + */ |
|
| 2289 | + $desc_limit = apply_filters('geodir_description_field_desc_limit', $desc_limit);
|
|
| 2290 | + /** |
|
| 2291 | + * Filter the add listing description field text. |
|
| 2292 | + * |
|
| 2293 | + * @since 1.0.0 |
|
| 2294 | + * @param string $desc The text for the description field. |
|
| 2295 | + * @param int $desc_limit The character limit number if any. |
|
| 2296 | + */ |
|
| 2297 | + $desc = apply_filters('geodir_description_field_desc', $desc, $desc_limit);
|
|
| 2298 | + $desc_limit_msg = ''; |
|
| 2299 | + /** |
|
| 2300 | + * Filter the add listing description limit message. |
|
| 2301 | + * |
|
| 2302 | + * This is the message shown if there is a limit applied to the amount of characters the description can use. |
|
| 2303 | + * |
|
| 2304 | + * @since 1.0.0 |
|
| 2305 | + * @param string $desc_limit_msg The limit message string if any. |
|
| 2306 | + * @param int $desc_limit The character limit numer if any. |
|
| 2307 | + */ |
|
| 2308 | + $desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);
|
|
| 2309 | 2309 | |
| 2310 | - $desc_class = ''; |
|
| 2311 | - if ($desc_limit === '' || (int)$desc_limit > 0) {
|
|
| 2312 | - /** |
|
| 2313 | - * Called on the add listing page form for frontend just before the description field. |
|
| 2314 | - * |
|
| 2315 | - * @since 1.0.0 |
|
| 2316 | - */ |
|
| 2317 | - do_action('geodir_before_description_field');
|
|
| 2310 | + $desc_class = ''; |
|
| 2311 | + if ($desc_limit === '' || (int)$desc_limit > 0) {
|
|
| 2312 | + /** |
|
| 2313 | + * Called on the add listing page form for frontend just before the description field. |
|
| 2314 | + * |
|
| 2315 | + * @since 1.0.0 |
|
| 2316 | + */ |
|
| 2317 | + do_action('geodir_before_description_field');
|
|
| 2318 | 2318 | |
| 2319 | - $desc_class = ' required_field'; |
|
| 2320 | - } else {
|
|
| 2321 | - $desc_class = ' hidden'; |
|
| 2322 | - } |
|
| 2323 | - ?> |
|
| 2319 | + $desc_class = ' required_field'; |
|
| 2320 | + } else {
|
|
| 2321 | + $desc_class = ' hidden'; |
|
| 2322 | + } |
|
| 2323 | + ?> |
|
| 2324 | 2324 | <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class;?>"> |
| 2325 | 2325 | <label><?php |
| 2326 | - /** |
|
| 2327 | - * Filter the add listing page description input label. |
|
| 2328 | - * |
|
| 2329 | - * @since 1.6.11 |
|
| 2330 | - * @param string $title The title to be output. |
|
| 2331 | - * @param string $cpt_singular_name The singular title of the curent CPT. |
|
| 2332 | - * @param string $listing_type The CPT being requested. ie: gd_place. |
|
| 2333 | - */ |
|
| 2334 | - echo apply_filters('geodir_add_listing_description_label',sprintf( __('%s Description', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>
|
|
| 2326 | + /** |
|
| 2327 | + * Filter the add listing page description input label. |
|
| 2328 | + * |
|
| 2329 | + * @since 1.6.11 |
|
| 2330 | + * @param string $title The title to be output. |
|
| 2331 | + * @param string $cpt_singular_name The singular title of the curent CPT. |
|
| 2332 | + * @param string $listing_type The CPT being requested. ie: gd_place. |
|
| 2333 | + */ |
|
| 2334 | + echo apply_filters('geodir_add_listing_description_label',sprintf( __('%s Description', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>
|
|
| 2335 | 2335 | <?php |
| 2336 | - if ($show_editor) {
|
|
| 2337 | - $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
|
|
| 2338 | - ?> |
|
| 2336 | + if ($show_editor) {
|
|
| 2337 | + $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
|
|
| 2338 | + ?> |
|
| 2339 | 2339 | <div class="editor" field_id="post_desc" field_type="editor"> |
| 2340 | 2340 | <?php wp_editor($desc, "post_desc", $editor_settings); ?> |
| 2341 | 2341 | </div> |
@@ -2349,56 +2349,56 @@ discard block |
||
| 2349 | 2349 | <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory');?></span> |
| 2350 | 2350 | </div> |
| 2351 | 2351 | <?php |
| 2352 | - if ($desc_limit === '' || (int)$desc_limit > 0) {
|
|
| 2353 | - /** |
|
| 2354 | - * Called on the add listing page form for frontend just after the description field. |
|
| 2355 | - * |
|
| 2356 | - * @since 1.0.0 |
|
| 2357 | - */ |
|
| 2358 | - do_action('geodir_after_description_field');
|
|
| 2359 | - } |
|
| 2352 | + if ($desc_limit === '' || (int)$desc_limit > 0) {
|
|
| 2353 | + /** |
|
| 2354 | + * Called on the add listing page form for frontend just after the description field. |
|
| 2355 | + * |
|
| 2356 | + * @since 1.0.0 |
|
| 2357 | + */ |
|
| 2358 | + do_action('geodir_after_description_field');
|
|
| 2359 | + } |
|
| 2360 | 2360 | |
| 2361 | - $kw_tags = esc_attr(stripslashes($kw_tags)); |
|
| 2362 | - $kw_tags_count = TAGKW_TEXT_COUNT; |
|
| 2363 | - $kw_tags_msg = TAGKW_MSG; |
|
| 2364 | - /** |
|
| 2365 | - * Filter the add listing tags character limit. |
|
| 2366 | - * |
|
| 2367 | - * @since 1.0.0 |
|
| 2368 | - * @param int $kw_tags_count The character count limit if any. |
|
| 2369 | - */ |
|
| 2370 | - $kw_tags_count = apply_filters('geodir_listing_tags_field_tags_count', $kw_tags_count);
|
|
| 2371 | - /** |
|
| 2372 | - * Filter the add listing tags field value. |
|
| 2373 | - * |
|
| 2374 | - * You can use the $_REQUEST values to check if this is a go back and edit value etc. |
|
| 2375 | - * |
|
| 2376 | - * @since 1.0.0 |
|
| 2377 | - * @param string $kw_tags The tag field value, usually a comma separated list of tags. |
|
| 2378 | - * @param int $kw_tags_count The character count limit if any. |
|
| 2379 | - */ |
|
| 2380 | - $kw_tags = apply_filters('geodir_listing_tags_field_tags', $kw_tags, $kw_tags_count);
|
|
| 2381 | - /** |
|
| 2382 | - * Filter the add listing tags field message text. |
|
| 2383 | - * |
|
| 2384 | - * @since 1.0.0 |
|
| 2385 | - * @param string $kw_tags_msg The message shown under the field. |
|
| 2386 | - * @param int $kw_tags_count The character count limit if any. |
|
| 2387 | - */ |
|
| 2388 | - $kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);
|
|
| 2361 | + $kw_tags = esc_attr(stripslashes($kw_tags)); |
|
| 2362 | + $kw_tags_count = TAGKW_TEXT_COUNT; |
|
| 2363 | + $kw_tags_msg = TAGKW_MSG; |
|
| 2364 | + /** |
|
| 2365 | + * Filter the add listing tags character limit. |
|
| 2366 | + * |
|
| 2367 | + * @since 1.0.0 |
|
| 2368 | + * @param int $kw_tags_count The character count limit if any. |
|
| 2369 | + */ |
|
| 2370 | + $kw_tags_count = apply_filters('geodir_listing_tags_field_tags_count', $kw_tags_count);
|
|
| 2371 | + /** |
|
| 2372 | + * Filter the add listing tags field value. |
|
| 2373 | + * |
|
| 2374 | + * You can use the $_REQUEST values to check if this is a go back and edit value etc. |
|
| 2375 | + * |
|
| 2376 | + * @since 1.0.0 |
|
| 2377 | + * @param string $kw_tags The tag field value, usually a comma separated list of tags. |
|
| 2378 | + * @param int $kw_tags_count The character count limit if any. |
|
| 2379 | + */ |
|
| 2380 | + $kw_tags = apply_filters('geodir_listing_tags_field_tags', $kw_tags, $kw_tags_count);
|
|
| 2381 | + /** |
|
| 2382 | + * Filter the add listing tags field message text. |
|
| 2383 | + * |
|
| 2384 | + * @since 1.0.0 |
|
| 2385 | + * @param string $kw_tags_msg The message shown under the field. |
|
| 2386 | + * @param int $kw_tags_count The character count limit if any. |
|
| 2387 | + */ |
|
| 2388 | + $kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);
|
|
| 2389 | 2389 | |
| 2390 | - $tags_class = ''; |
|
| 2391 | - if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {
|
|
| 2392 | - /** |
|
| 2393 | - * Called on the add listing page form for frontend just before the tags field. |
|
| 2394 | - * |
|
| 2395 | - * @since 1.0.0 |
|
| 2396 | - */ |
|
| 2397 | - do_action('geodir_before_listing_tags_field');
|
|
| 2398 | - } else {
|
|
| 2399 | - $tags_class = ' hidden'; |
|
| 2400 | - } |
|
| 2401 | - ?> |
|
| 2390 | + $tags_class = ''; |
|
| 2391 | + if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {
|
|
| 2392 | + /** |
|
| 2393 | + * Called on the add listing page form for frontend just before the tags field. |
|
| 2394 | + * |
|
| 2395 | + * @since 1.0.0 |
|
| 2396 | + */ |
|
| 2397 | + do_action('geodir_before_listing_tags_field');
|
|
| 2398 | + } else {
|
|
| 2399 | + $tags_class = ' hidden'; |
|
| 2400 | + } |
|
| 2401 | + ?> |
|
| 2402 | 2402 | <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class;?>"> |
| 2403 | 2403 | <label><?php echo TAGKW_TEXT; ?></label> |
| 2404 | 2404 | <input name="post_tags" id="post_tags" value="<?php echo $kw_tags; ?>" type="text" class="geodir_textfield" |
@@ -2406,90 +2406,90 @@ discard block |
||
| 2406 | 2406 | <span class="geodir_message_note"><?php echo $kw_tags_msg;?></span> |
| 2407 | 2407 | </div> |
| 2408 | 2408 | <?php |
| 2409 | - if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {
|
|
| 2410 | - /** |
|
| 2411 | - * Called on the add listing page form for frontend just after the tags field. |
|
| 2412 | - * |
|
| 2413 | - * @since 1.0.0 |
|
| 2414 | - */ |
|
| 2415 | - do_action('geodir_after_listing_tags_field');
|
|
| 2416 | - } |
|
| 2409 | + if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {
|
|
| 2410 | + /** |
|
| 2411 | + * Called on the add listing page form for frontend just after the tags field. |
|
| 2412 | + * |
|
| 2413 | + * @since 1.0.0 |
|
| 2414 | + */ |
|
| 2415 | + do_action('geodir_after_listing_tags_field');
|
|
| 2416 | + } |
|
| 2417 | 2417 | |
| 2418 | - $package_info = array(); |
|
| 2419 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 2418 | + $package_info = array(); |
|
| 2419 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 2420 | 2420 | |
| 2421 | - geodir_get_custom_fields_html($package_info->pid, 'all', $listing_type); |
|
| 2421 | + geodir_get_custom_fields_html($package_info->pid, 'all', $listing_type); |
|
| 2422 | 2422 | |
| 2423 | - // adjust values here |
|
| 2424 | - $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 |
|
| 2423 | + // adjust values here |
|
| 2424 | + $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 |
|
| 2425 | 2425 | |
| 2426 | - $multiple = true; // allow multiple files upload |
|
| 2426 | + $multiple = true; // allow multiple files upload |
|
| 2427 | 2427 | |
| 2428 | - $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels) |
|
| 2428 | + $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels) |
|
| 2429 | 2429 | |
| 2430 | - $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels) |
|
| 2430 | + $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels) |
|
| 2431 | 2431 | |
| 2432 | - $thumb_img_arr = array(); |
|
| 2433 | - $totImg = 0; |
|
| 2434 | - if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {
|
|
| 2435 | - $post = (object)$gd_session->get('listing');
|
|
| 2436 | - if (isset($post->post_images)) |
|
| 2437 | - $curImages = trim($post->post_images, ","); |
|
| 2432 | + $thumb_img_arr = array(); |
|
| 2433 | + $totImg = 0; |
|
| 2434 | + if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {
|
|
| 2435 | + $post = (object)$gd_session->get('listing');
|
|
| 2436 | + if (isset($post->post_images)) |
|
| 2437 | + $curImages = trim($post->post_images, ","); |
|
| 2438 | 2438 | |
| 2439 | 2439 | |
| 2440 | - if ($curImages != '') {
|
|
| 2441 | - $curImages_array = explode(',', $curImages);
|
|
| 2442 | - $totImg = count($curImages_array); |
|
| 2443 | - } |
|
| 2444 | - |
|
| 2445 | - $listing_type = $post->listing_type; |
|
| 2440 | + if ($curImages != '') {
|
|
| 2441 | + $curImages_array = explode(',', $curImages);
|
|
| 2442 | + $totImg = count($curImages_array); |
|
| 2443 | + } |
|
| 2446 | 2444 | |
| 2447 | - } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 2448 | - $post = geodir_get_post_info((int)$_REQUEST['pid']); |
|
| 2449 | - $listing_type = $post->post_type; |
|
| 2450 | - $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
| 2445 | + $listing_type = $post->listing_type; |
|
| 2451 | 2446 | |
| 2452 | - } else {
|
|
| 2453 | - $listing_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2454 | - } |
|
| 2447 | + } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 2448 | + $post = geodir_get_post_info((int)$_REQUEST['pid']); |
|
| 2449 | + $listing_type = $post->post_type; |
|
| 2450 | + $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
|
| 2455 | 2451 | |
| 2452 | + } else {
|
|
| 2453 | + $listing_type = sanitize_text_field($_REQUEST['listing_type']); |
|
| 2454 | + } |
|
| 2456 | 2455 | |
| 2457 | - if (!empty($thumb_img_arr)) {
|
|
| 2458 | - foreach ($thumb_img_arr as $img) {
|
|
| 2459 | - //$curImages = $img->src.","; |
|
| 2460 | - } |
|
| 2461 | 2456 | |
| 2462 | - $totImg = count((array)$thumb_img_arr); |
|
| 2463 | - } |
|
| 2457 | + if (!empty($thumb_img_arr)) {
|
|
| 2458 | + foreach ($thumb_img_arr as $img) {
|
|
| 2459 | + //$curImages = $img->src.","; |
|
| 2460 | + } |
|
| 2464 | 2461 | |
| 2465 | - if ($curImages != '') |
|
| 2466 | - $svalue = $curImages; // this will be initial value of the above form field. Image urls. |
|
| 2467 | - else |
|
| 2468 | - $svalue = ''; |
|
| 2469 | - |
|
| 2470 | - $image_limit = isset($package_info->image_limit) ? $package_info->image_limit : '0'; |
|
| 2471 | - $show_image_input_box = ($image_limit != '0'); |
|
| 2472 | - /** |
|
| 2473 | - * Filter to be able to show/hide the image upload section of the add listing form. |
|
| 2474 | - * |
|
| 2475 | - * @since 1.0.0 |
|
| 2476 | - * @param bool $show_image_input_box Set true to show. Set false to not show. |
|
| 2477 | - * @param string $listing_type The custom post type slug. |
|
| 2478 | - */ |
|
| 2479 | - $show_image_input_box = apply_filters('geodir_image_uploader_on_add_listing', $show_image_input_box, $listing_type);
|
|
| 2480 | - if ($show_image_input_box) {
|
|
| 2481 | - ?> |
|
| 2462 | + $totImg = count((array)$thumb_img_arr); |
|
| 2463 | + } |
|
| 2464 | + |
|
| 2465 | + if ($curImages != '') |
|
| 2466 | + $svalue = $curImages; // this will be initial value of the above form field. Image urls. |
|
| 2467 | + else |
|
| 2468 | + $svalue = ''; |
|
| 2469 | + |
|
| 2470 | + $image_limit = isset($package_info->image_limit) ? $package_info->image_limit : '0'; |
|
| 2471 | + $show_image_input_box = ($image_limit != '0'); |
|
| 2472 | + /** |
|
| 2473 | + * Filter to be able to show/hide the image upload section of the add listing form. |
|
| 2474 | + * |
|
| 2475 | + * @since 1.0.0 |
|
| 2476 | + * @param bool $show_image_input_box Set true to show. Set false to not show. |
|
| 2477 | + * @param string $listing_type The custom post type slug. |
|
| 2478 | + */ |
|
| 2479 | + $show_image_input_box = apply_filters('geodir_image_uploader_on_add_listing', $show_image_input_box, $listing_type);
|
|
| 2480 | + if ($show_image_input_box) {
|
|
| 2481 | + ?> |
|
| 2482 | 2482 | |
| 2483 | 2483 | <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT;?> |
| 2484 | 2484 | <?php if ($image_limit == 1) {
|
| 2485 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 2486 | - } ?> |
|
| 2485 | + echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 2486 | + } ?> |
|
| 2487 | 2487 | <?php if ($image_limit > 1) {
|
| 2488 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 2489 | - } ?> |
|
| 2488 | + echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 2489 | + } ?> |
|
| 2490 | 2490 | <?php if ($image_limit == '') {
|
| 2491 | - echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 2492 | - } ?> |
|
| 2491 | + echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 2492 | + } ?> |
|
| 2493 | 2493 | </h5> |
| 2494 | 2494 | |
| 2495 | 2495 | <div class="geodir_form_row clearfix" id="<?php echo $id; ?>dropbox" |
@@ -2527,12 +2527,12 @@ discard block |
||
| 2527 | 2527 | <?php } ?> |
| 2528 | 2528 | |
| 2529 | 2529 | <?php |
| 2530 | - /** |
|
| 2531 | - * Called on the add listing page form for frontend just after the image upload field. |
|
| 2532 | - * |
|
| 2533 | - * @since 1.0.0 |
|
| 2534 | - */ |
|
| 2535 | - do_action('geodir_after_main_form_fields');?>
|
|
| 2530 | + /** |
|
| 2531 | + * Called on the add listing page form for frontend just after the image upload field. |
|
| 2532 | + * |
|
| 2533 | + * @since 1.0.0 |
|
| 2534 | + */ |
|
| 2535 | + do_action('geodir_after_main_form_fields');?>
|
|
| 2536 | 2536 | |
| 2537 | 2537 | |
| 2538 | 2538 | <!-- add captcha code --> |
@@ -2561,7 +2561,7 @@ discard block |
||
| 2561 | 2561 | |
| 2562 | 2562 | </form> |
| 2563 | 2563 | <?php |
| 2564 | - wp_reset_query(); |
|
| 2564 | + wp_reset_query(); |
|
| 2565 | 2565 | } |
| 2566 | 2566 | |
| 2567 | 2567 | /** |
@@ -2572,7 +2572,7 @@ discard block |
||
| 2572 | 2572 | */ |
| 2573 | 2573 | function geodir_add_listing_sidebar_widget_area() |
| 2574 | 2574 | {
|
| 2575 | - dynamic_sidebar('geodir_add_listing_sidebar');
|
|
| 2575 | + dynamic_sidebar('geodir_add_listing_sidebar');
|
|
| 2576 | 2576 | } |
| 2577 | 2577 | |
| 2578 | 2578 | add_action('geodir_add_listing_sidebar_inside', 'geodir_add_listing_sidebar_widget_area', 10);
|
@@ -2587,16 +2587,16 @@ discard block |
||
| 2587 | 2587 | */ |
| 2588 | 2588 | function geodir_action_add_listing_sidebar() |
| 2589 | 2589 | {
|
| 2590 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2591 | - do_action('geodir_sidebar_right_open', 'add-listing-page', 'geodir-sidebar', 'geodir-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 2592 | - /** |
|
| 2593 | - * This is used to add the content to the add listing page sidebar. |
|
| 2594 | - * |
|
| 2595 | - * @since 1.0.0 |
|
| 2596 | - */ |
|
| 2597 | - do_action('geodir_add_listing_sidebar_inside');
|
|
| 2598 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2599 | - do_action('geodir_sidebar_right_close', 'details-page');
|
|
| 2590 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2591 | + do_action('geodir_sidebar_right_open', 'add-listing-page', 'geodir-sidebar', 'geodir-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 2592 | + /** |
|
| 2593 | + * This is used to add the content to the add listing page sidebar. |
|
| 2594 | + * |
|
| 2595 | + * @since 1.0.0 |
|
| 2596 | + */ |
|
| 2597 | + do_action('geodir_add_listing_sidebar_inside');
|
|
| 2598 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2599 | + do_action('geodir_sidebar_right_close', 'details-page');
|
|
| 2600 | 2600 | } |
| 2601 | 2601 | |
| 2602 | 2602 | ############################################### |
@@ -2613,11 +2613,11 @@ discard block |
||
| 2613 | 2613 | */ |
| 2614 | 2614 | function geodir_action_geodir_sidebar_signup_top() |
| 2615 | 2615 | {
|
| 2616 | - ?> |
|
| 2616 | + ?> |
|
| 2617 | 2617 | <div |
| 2618 | 2618 | class="<?php |
| 2619 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2620 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">
|
|
| 2619 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2620 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">
|
|
| 2621 | 2621 | <?php dynamic_sidebar('Reg/Login Top Section');?>
|
| 2622 | 2622 | </div><!-- clearfix ends here--> |
| 2623 | 2623 | <?php |
@@ -2636,11 +2636,11 @@ discard block |
||
| 2636 | 2636 | function geodir_action_signup_forms() |
| 2637 | 2637 | {
|
| 2638 | 2638 | |
| 2639 | - global $user_login; |
|
| 2639 | + global $user_login; |
|
| 2640 | 2640 | |
| 2641 | - $is_enable_signup = get_option( 'users_can_register' ); |
|
| 2641 | + $is_enable_signup = get_option( 'users_can_register' ); |
|
| 2642 | 2642 | |
| 2643 | - ?> |
|
| 2643 | + ?> |
|
| 2644 | 2644 | <script type="text/javascript"> |
| 2645 | 2645 | <?php if ( $user_login ) { ?>
|
| 2646 | 2646 | setTimeout(function () {
|
@@ -2676,67 +2676,67 @@ discard block |
||
| 2676 | 2676 | <?php } ?> |
| 2677 | 2677 | </script><?php |
| 2678 | 2678 | |
| 2679 | - global $errors; |
|
| 2680 | - if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim') |
|
| 2681 | - $errors->add('claim_login', LOGIN_CLAIM);
|
|
| 2682 | - |
|
| 2683 | - if (!empty($errors)) {
|
|
| 2684 | - foreach ($errors as $errorsObj) {
|
|
| 2685 | - foreach ($errorsObj as $key => $val) {
|
|
| 2686 | - for ($i = 0; $i < count($val); $i++) {
|
|
| 2687 | - echo "<div class=error_msg_fix>" . $val[$i] . '</div>'; |
|
| 2688 | - $registration_error_msg = 1; |
|
| 2689 | - } |
|
| 2690 | - } |
|
| 2691 | - } |
|
| 2692 | - } |
|
| 2679 | + global $errors; |
|
| 2680 | + if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim') |
|
| 2681 | + $errors->add('claim_login', LOGIN_CLAIM);
|
|
| 2682 | + |
|
| 2683 | + if (!empty($errors)) {
|
|
| 2684 | + foreach ($errors as $errorsObj) {
|
|
| 2685 | + foreach ($errorsObj as $key => $val) {
|
|
| 2686 | + for ($i = 0; $i < count($val); $i++) {
|
|
| 2687 | + echo "<div class=error_msg_fix>" . $val[$i] . '</div>'; |
|
| 2688 | + $registration_error_msg = 1; |
|
| 2689 | + } |
|
| 2690 | + } |
|
| 2691 | + } |
|
| 2692 | + } |
|
| 2693 | 2693 | |
| 2694 | - if (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_in') {
|
|
| 2695 | - ?> |
|
| 2694 | + if (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_in') {
|
|
| 2695 | + ?> |
|
| 2696 | 2696 | |
| 2697 | 2697 | <div class="login_form"> |
| 2698 | 2698 | <?php |
| 2699 | - /** |
|
| 2700 | - * Contains login form template. |
|
| 2701 | - * |
|
| 2702 | - * @since 1.0.0 |
|
| 2703 | - */ |
|
| 2704 | - include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?> |
|
| 2699 | + /** |
|
| 2700 | + * Contains login form template. |
|
| 2701 | + * |
|
| 2702 | + * @since 1.0.0 |
|
| 2703 | + */ |
|
| 2704 | + include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?> |
|
| 2705 | 2705 | </div> |
| 2706 | 2706 | |
| 2707 | 2707 | <?php } elseif (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_up' && $is_enable_signup ) { ?>
|
| 2708 | 2708 | |
| 2709 | 2709 | <div class="registration_form"> |
| 2710 | 2710 | <?php |
| 2711 | - /** |
|
| 2712 | - * Contains registration form template. |
|
| 2713 | - * |
|
| 2714 | - * @since 1.0.0 |
|
| 2715 | - */ |
|
| 2716 | - include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?> |
|
| 2711 | + /** |
|
| 2712 | + * Contains registration form template. |
|
| 2713 | + * |
|
| 2714 | + * @since 1.0.0 |
|
| 2715 | + */ |
|
| 2716 | + include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?> |
|
| 2717 | 2717 | </div> |
| 2718 | 2718 | |
| 2719 | 2719 | <?php } else { ?>
|
| 2720 | 2720 | |
| 2721 | 2721 | <div class="login_form_l"> |
| 2722 | 2722 | <?php |
| 2723 | - /** |
|
| 2724 | - * Contains login form template. |
|
| 2725 | - * |
|
| 2726 | - * @since 1.0.0 |
|
| 2727 | - */ |
|
| 2728 | - include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?> |
|
| 2723 | + /** |
|
| 2724 | + * Contains login form template. |
|
| 2725 | + * |
|
| 2726 | + * @since 1.0.0 |
|
| 2727 | + */ |
|
| 2728 | + include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?> |
|
| 2729 | 2729 | </div> |
| 2730 | 2730 | |
| 2731 | 2731 | <?php if ( $is_enable_signup ) { ?>
|
| 2732 | 2732 | <div class="registration_form_r"> |
| 2733 | 2733 | <?php |
| 2734 | - /** |
|
| 2735 | - * Contains registration form template. |
|
| 2736 | - * |
|
| 2737 | - * @since 1.0.0 |
|
| 2738 | - */ |
|
| 2739 | - include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?> |
|
| 2734 | + /** |
|
| 2735 | + * Contains registration form template. |
|
| 2736 | + * |
|
| 2737 | + * @since 1.0.0 |
|
| 2738 | + */ |
|
| 2739 | + include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?> |
|
| 2740 | 2740 | </div> |
| 2741 | 2741 | <?php } ?> |
| 2742 | 2742 | |
@@ -2768,66 +2768,66 @@ discard block |
||
| 2768 | 2768 | */ |
| 2769 | 2769 | function geodir_action_author_page_title() |
| 2770 | 2770 | {
|
| 2771 | - global $term; |
|
| 2772 | - |
|
| 2773 | - $gd_post_type = geodir_get_current_posttype(); |
|
| 2774 | - $post_type_info = get_post_type_object($gd_post_type); |
|
| 2771 | + global $term; |
|
| 2775 | 2772 | |
| 2776 | - $add_string_in_title = __('All', 'geodirectory') . ' ';
|
|
| 2777 | - if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 2778 | - $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';
|
|
| 2779 | - } |
|
| 2773 | + $gd_post_type = geodir_get_current_posttype(); |
|
| 2774 | + $post_type_info = get_post_type_object($gd_post_type); |
|
| 2780 | 2775 | |
| 2781 | - $list_title = $add_string_in_title . $post_type_info->labels->name; |
|
| 2782 | - $single_name = $post_type_info->labels->singular_name; |
|
| 2776 | + $add_string_in_title = __('All', 'geodirectory') . ' ';
|
|
| 2777 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 2778 | + $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';
|
|
| 2779 | + } |
|
| 2783 | 2780 | |
| 2784 | - $taxonomy = geodir_get_taxonomies($gd_post_type); |
|
| 2781 | + $list_title = $add_string_in_title . $post_type_info->labels->name; |
|
| 2782 | + $single_name = $post_type_info->labels->singular_name; |
|
| 2785 | 2783 | |
| 2786 | - if (!empty($term)) {
|
|
| 2787 | - $current_term = get_term_by('slug', $term, $taxonomy[0]);
|
|
| 2788 | - if (!empty($current_term)) |
|
| 2789 | - $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";
|
|
| 2790 | - } |
|
| 2784 | + $taxonomy = geodir_get_taxonomies($gd_post_type); |
|
| 2791 | 2785 | |
| 2786 | + if (!empty($term)) {
|
|
| 2787 | + $current_term = get_term_by('slug', $term, $taxonomy[0]);
|
|
| 2788 | + if (!empty($current_term)) |
|
| 2789 | + $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";
|
|
| 2790 | + } |
|
| 2792 | 2791 | |
| 2793 | - if (is_search()) {
|
|
| 2794 | - $list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";
|
|
| 2795 | 2792 | |
| 2796 | - } |
|
| 2797 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2798 | - $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 2799 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2800 | - $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 2793 | + if (is_search()) {
|
|
| 2794 | + $list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";
|
|
| 2801 | 2795 | |
| 2802 | - $title = $list_title; |
|
| 2803 | - if(geodir_is_page('author')){
|
|
| 2804 | - $gd_page = 'author'; |
|
| 2805 | - if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){
|
|
| 2806 | - $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;
|
|
| 2807 | - }else{
|
|
| 2808 | - $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;
|
|
| 2809 | - } |
|
| 2796 | + } |
|
| 2797 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2798 | + $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 2799 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2800 | + $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 2801 | + |
|
| 2802 | + $title = $list_title; |
|
| 2803 | + if(geodir_is_page('author')){
|
|
| 2804 | + $gd_page = 'author'; |
|
| 2805 | + if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){
|
|
| 2806 | + $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;
|
|
| 2807 | + }else{
|
|
| 2808 | + $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;
|
|
| 2809 | + } |
|
| 2810 | 2810 | |
| 2811 | - } |
|
| 2811 | + } |
|
| 2812 | 2812 | |
| 2813 | 2813 | |
| 2814 | - /** |
|
| 2815 | - * Filter page title to replace variables. |
|
| 2816 | - * |
|
| 2817 | - * @since 1.5.4 |
|
| 2818 | - * @param string $title The page title including variables. |
|
| 2819 | - * @param string $gd_page The GeoDirectory page type if any. |
|
| 2820 | - */ |
|
| 2821 | - $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 2814 | + /** |
|
| 2815 | + * Filter page title to replace variables. |
|
| 2816 | + * |
|
| 2817 | + * @since 1.5.4 |
|
| 2818 | + * @param string $title The page title including variables. |
|
| 2819 | + * @param string $gd_page The GeoDirectory page type if any. |
|
| 2820 | + */ |
|
| 2821 | + $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 2822 | 2822 | |
| 2823 | - echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . |
|
| 2824 | - /** |
|
| 2825 | - * Filter the author page title text. |
|
| 2826 | - * |
|
| 2827 | - * @since 1.0.0 |
|
| 2828 | - * @param string $list_title The title for the page. |
|
| 2829 | - */ |
|
| 2830 | - apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';
|
|
| 2823 | + echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . |
|
| 2824 | + /** |
|
| 2825 | + * Filter the author page title text. |
|
| 2826 | + * |
|
| 2827 | + * @since 1.0.0 |
|
| 2828 | + * @param string $list_title The title for the page. |
|
| 2829 | + */ |
|
| 2830 | + apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';
|
|
| 2831 | 2831 | } |
| 2832 | 2832 | |
| 2833 | 2833 | |
@@ -2845,11 +2845,11 @@ discard block |
||
| 2845 | 2845 | */ |
| 2846 | 2846 | function geodir_action_geodir_sidebar_author_top() |
| 2847 | 2847 | {
|
| 2848 | - if (get_option('geodir_show_author_top_section')) { ?>
|
|
| 2848 | + if (get_option('geodir_show_author_top_section')) { ?>
|
|
| 2849 | 2849 | <div |
| 2850 | 2850 | class="<?php |
| 2851 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2852 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_top'); ?>">
|
|
| 2851 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2852 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_top'); ?>">
|
|
| 2853 | 2853 | <?php dynamic_sidebar('geodir_author_top'); ?>
|
| 2854 | 2854 | </div><!-- clearfix ends here--> |
| 2855 | 2855 | <?php } |
@@ -2865,7 +2865,7 @@ discard block |
||
| 2865 | 2865 | */ |
| 2866 | 2866 | function geodir_author_left_section() |
| 2867 | 2867 | {
|
| 2868 | - if (get_option('geodir_show_author_left_section')) { ?>
|
|
| 2868 | + if (get_option('geodir_show_author_left_section')) { ?>
|
|
| 2869 | 2869 | <div class="geodir-content-left geodir-sidebar-wrap"> |
| 2870 | 2870 | <?php dynamic_sidebar('geodir_author_left_sidebar'); ?>
|
| 2871 | 2871 | </div><!-- end geodir-content-left --> |
@@ -2886,19 +2886,19 @@ discard block |
||
| 2886 | 2886 | */ |
| 2887 | 2887 | function geodir_action_author_sidebar_left() |
| 2888 | 2888 | {
|
| 2889 | - if (get_option('geodir_show_author_left_section')) {
|
|
| 2889 | + if (get_option('geodir_show_author_left_section')) {
|
|
| 2890 | 2890 | // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='') |
| 2891 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2892 | - do_action('geodir_sidebar_left_open', 'author-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');
|
|
| 2893 | - /** |
|
| 2894 | - * This is used to add the content to the author page left sidebar (if active). |
|
| 2895 | - * |
|
| 2896 | - * @since 1.0.0 |
|
| 2897 | - */ |
|
| 2898 | - do_action('geodir_author_sidebar_left_inside');
|
|
| 2899 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2900 | - do_action('geodir_sidebar_left_close', 'author-page');
|
|
| 2901 | - } |
|
| 2891 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2892 | + do_action('geodir_sidebar_left_open', 'author-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');
|
|
| 2893 | + /** |
|
| 2894 | + * This is used to add the content to the author page left sidebar (if active). |
|
| 2895 | + * |
|
| 2896 | + * @since 1.0.0 |
|
| 2897 | + */ |
|
| 2898 | + do_action('geodir_author_sidebar_left_inside');
|
|
| 2899 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2900 | + do_action('geodir_sidebar_left_close', 'author-page');
|
|
| 2901 | + } |
|
| 2902 | 2902 | } |
| 2903 | 2903 | |
| 2904 | 2904 | /** |
@@ -2911,7 +2911,7 @@ discard block |
||
| 2911 | 2911 | */ |
| 2912 | 2912 | function geodir_author_right_section() |
| 2913 | 2913 | {
|
| 2914 | - if (get_option('geodir_show_author_right_section')) { ?>
|
|
| 2914 | + if (get_option('geodir_show_author_right_section')) { ?>
|
|
| 2915 | 2915 | <div class="geodir-content-right geodir-sidebar-wrap"> |
| 2916 | 2916 | <?php dynamic_sidebar('geodir_author_right_sidebar'); ?>
|
| 2917 | 2917 | </div><!-- end geodir-content-right --> |
@@ -2931,18 +2931,18 @@ discard block |
||
| 2931 | 2931 | */ |
| 2932 | 2932 | function geodir_action_author_sidebar_right() |
| 2933 | 2933 | {
|
| 2934 | - if (get_option('geodir_show_author_right_section')) {
|
|
| 2935 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2936 | - do_action('geodir_sidebar_right_open', 'author-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 2937 | - /** |
|
| 2938 | - * This is used to add the content to the author page right sidebar (if active). |
|
| 2939 | - * |
|
| 2940 | - * @since 1.0.0 |
|
| 2941 | - */ |
|
| 2942 | - do_action('geodir_author_sidebar_right_inside');
|
|
| 2943 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2944 | - do_action('geodir_sidebar_right_close', 'author-page');
|
|
| 2945 | - } |
|
| 2934 | + if (get_option('geodir_show_author_right_section')) {
|
|
| 2935 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2936 | + do_action('geodir_sidebar_right_open', 'author-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 2937 | + /** |
|
| 2938 | + * This is used to add the content to the author page right sidebar (if active). |
|
| 2939 | + * |
|
| 2940 | + * @since 1.0.0 |
|
| 2941 | + */ |
|
| 2942 | + do_action('geodir_author_sidebar_right_inside');
|
|
| 2943 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2944 | + do_action('geodir_sidebar_right_close', 'author-page');
|
|
| 2945 | + } |
|
| 2946 | 2946 | } |
| 2947 | 2947 | |
| 2948 | 2948 | /** |
@@ -2954,14 +2954,14 @@ discard block |
||
| 2954 | 2954 | */ |
| 2955 | 2955 | function geodir_action_author_content_inside() |
| 2956 | 2956 | {
|
| 2957 | - global $gridview_columns; |
|
| 2958 | - $listing_view = get_option('geodir_author_view');
|
|
| 2959 | - if (strstr($listing_view, 'gridview')) {
|
|
| 2960 | - $gridview_columns = $listing_view; |
|
| 2961 | - $listing_view_exp = explode('_', $listing_view);
|
|
| 2962 | - $listing_view = $listing_view_exp[0]; |
|
| 2963 | - } |
|
| 2964 | - geodir_get_template_part('listing', 'listview');
|
|
| 2957 | + global $gridview_columns; |
|
| 2958 | + $listing_view = get_option('geodir_author_view');
|
|
| 2959 | + if (strstr($listing_view, 'gridview')) {
|
|
| 2960 | + $gridview_columns = $listing_view; |
|
| 2961 | + $listing_view_exp = explode('_', $listing_view);
|
|
| 2962 | + $listing_view = $listing_view_exp[0]; |
|
| 2963 | + } |
|
| 2964 | + geodir_get_template_part('listing', 'listview');
|
|
| 2965 | 2965 | } |
| 2966 | 2966 | |
| 2967 | 2967 | add_action('geodir_author_content_inside', 'geodir_action_author_content_inside', 10);
|
@@ -2976,22 +2976,22 @@ discard block |
||
| 2976 | 2976 | */ |
| 2977 | 2977 | function geodir_action_author_content() |
| 2978 | 2978 | {
|
| 2979 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2980 | - do_action('geodir_main_content_open', 'author-page', 'geodir-main-content', 'author-page');
|
|
| 2981 | - echo '<div class="clearfix">'; |
|
| 2982 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2983 | - do_action('geodir_before_listing');
|
|
| 2984 | - echo '</div>'; |
|
| 2985 | - /** |
|
| 2986 | - * This is used to add the content to the author page main content. |
|
| 2987 | - * |
|
| 2988 | - * @since 1.0.0 |
|
| 2989 | - */ |
|
| 2990 | - do_action('geodir_author_content_inside');
|
|
| 2991 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2992 | - do_action('geodir_after_listing');
|
|
| 2993 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 2994 | - do_action('geodir_main_content_close', 'author-page');
|
|
| 2979 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2980 | + do_action('geodir_main_content_open', 'author-page', 'geodir-main-content', 'author-page');
|
|
| 2981 | + echo '<div class="clearfix">'; |
|
| 2982 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2983 | + do_action('geodir_before_listing');
|
|
| 2984 | + echo '</div>'; |
|
| 2985 | + /** |
|
| 2986 | + * This is used to add the content to the author page main content. |
|
| 2987 | + * |
|
| 2988 | + * @since 1.0.0 |
|
| 2989 | + */ |
|
| 2990 | + do_action('geodir_author_content_inside');
|
|
| 2991 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2992 | + do_action('geodir_after_listing');
|
|
| 2993 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 2994 | + do_action('geodir_main_content_close', 'author-page');
|
|
| 2995 | 2995 | } |
| 2996 | 2996 | |
| 2997 | 2997 | add_action('geodir_sidebar_author_bottom_section', 'geodir_action_sidebar_author_bottom_section', 10);
|
@@ -3005,11 +3005,11 @@ discard block |
||
| 3005 | 3005 | */ |
| 3006 | 3006 | function geodir_action_sidebar_author_bottom_section() |
| 3007 | 3007 | {
|
| 3008 | - if (get_option('geodir_show_author_bottom_section')) { ?>
|
|
| 3008 | + if (get_option('geodir_show_author_bottom_section')) { ?>
|
|
| 3009 | 3009 | <div |
| 3010 | 3010 | class="<?php |
| 3011 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3012 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_bottom'); ?>">
|
|
| 3011 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3012 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_author_bottom'); ?>">
|
|
| 3013 | 3013 | <?php dynamic_sidebar('geodir_author_bottom'); ?>
|
| 3014 | 3014 | </div><!-- clearfix ends here--> |
| 3015 | 3015 | <?php } |
@@ -3028,23 +3028,23 @@ discard block |
||
| 3028 | 3028 | */ |
| 3029 | 3029 | function geodir_action_search_page_title() |
| 3030 | 3030 | {
|
| 3031 | - $gd_post_type = geodir_get_current_posttype(); |
|
| 3032 | - $post_type_info = get_post_type_object($gd_post_type); |
|
| 3031 | + $gd_post_type = geodir_get_current_posttype(); |
|
| 3032 | + $post_type_info = get_post_type_object($gd_post_type); |
|
| 3033 | 3033 | |
| 3034 | - $pt_name = ''; |
|
| 3035 | - if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}
|
|
| 3034 | + $pt_name = ''; |
|
| 3035 | + if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}
|
|
| 3036 | 3036 | |
| 3037 | - if (is_search()) {
|
|
| 3038 | - $list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";
|
|
| 3037 | + if (is_search()) {
|
|
| 3038 | + $list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";
|
|
| 3039 | 3039 | |
| 3040 | - } |
|
| 3041 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3042 | - $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 3043 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3044 | - $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 3045 | - echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . |
|
| 3046 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3047 | - apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';
|
|
| 3040 | + } |
|
| 3041 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3042 | + $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
|
| 3043 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3044 | + $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
|
| 3045 | + echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . |
|
| 3046 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3047 | + apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';
|
|
| 3048 | 3048 | } |
| 3049 | 3049 | |
| 3050 | 3050 | // action for adding the listings page top widget area |
@@ -3060,11 +3060,11 @@ discard block |
||
| 3060 | 3060 | */ |
| 3061 | 3061 | function geodir_action_geodir_sidebar_search_top() |
| 3062 | 3062 | {
|
| 3063 | - if (get_option('geodir_show_search_top_section')) { ?>
|
|
| 3063 | + if (get_option('geodir_show_search_top_section')) { ?>
|
|
| 3064 | 3064 | <div |
| 3065 | 3065 | class="<?php |
| 3066 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3067 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_top'); ?>">
|
|
| 3066 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3067 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_top'); ?>">
|
|
| 3068 | 3068 | <?php dynamic_sidebar('geodir_search_top'); ?>
|
| 3069 | 3069 | </div><!-- clearfix ends here--> |
| 3070 | 3070 | <?php } |
@@ -3080,7 +3080,7 @@ discard block |
||
| 3080 | 3080 | */ |
| 3081 | 3081 | function geodir_search_left_section() |
| 3082 | 3082 | {
|
| 3083 | - if (get_option('geodir_show_search_left_section')) { ?>
|
|
| 3083 | + if (get_option('geodir_show_search_left_section')) { ?>
|
|
| 3084 | 3084 | <div class="geodir-content-left geodir-sidebar-wrap"> |
| 3085 | 3085 | <?php dynamic_sidebar('geodir_search_left_sidebar'); ?>
|
| 3086 | 3086 | </div><!-- end geodir-content-left --> |
@@ -3100,19 +3100,19 @@ discard block |
||
| 3100 | 3100 | */ |
| 3101 | 3101 | function geodir_action_search_sidebar_left() |
| 3102 | 3102 | {
|
| 3103 | - if (get_option('geodir_show_search_left_section')) {
|
|
| 3103 | + if (get_option('geodir_show_search_left_section')) {
|
|
| 3104 | 3104 | // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='') |
| 3105 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3106 | - do_action('geodir_sidebar_left_open', 'search-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');
|
|
| 3107 | - /** |
|
| 3108 | - * This is used to add the content to the search page left sidebar (if active). |
|
| 3109 | - * |
|
| 3110 | - * @since 1.0.0 |
|
| 3111 | - */ |
|
| 3112 | - do_action('geodir_search_sidebar_left_inside');
|
|
| 3113 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3114 | - do_action('geodir_sidebar_left_close', 'search-page');
|
|
| 3115 | - } |
|
| 3105 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3106 | + do_action('geodir_sidebar_left_open', 'search-page', 'geodir-sidebar-left', 'geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');
|
|
| 3107 | + /** |
|
| 3108 | + * This is used to add the content to the search page left sidebar (if active). |
|
| 3109 | + * |
|
| 3110 | + * @since 1.0.0 |
|
| 3111 | + */ |
|
| 3112 | + do_action('geodir_search_sidebar_left_inside');
|
|
| 3113 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3114 | + do_action('geodir_sidebar_left_close', 'search-page');
|
|
| 3115 | + } |
|
| 3116 | 3116 | } |
| 3117 | 3117 | |
| 3118 | 3118 | /** |
@@ -3125,7 +3125,7 @@ discard block |
||
| 3125 | 3125 | */ |
| 3126 | 3126 | function geodir_search_right_section() |
| 3127 | 3127 | {
|
| 3128 | - if (get_option('geodir_show_search_right_section')) { ?>
|
|
| 3128 | + if (get_option('geodir_show_search_right_section')) { ?>
|
|
| 3129 | 3129 | <div class="geodir-content-right geodir-sidebar-wrap"> |
| 3130 | 3130 | <?php dynamic_sidebar('geodir_search_right_sidebar'); ?>
|
| 3131 | 3131 | </div><!-- end geodir-content-right --> |
@@ -3145,18 +3145,18 @@ discard block |
||
| 3145 | 3145 | */ |
| 3146 | 3146 | function geodir_action_search_sidebar_right() |
| 3147 | 3147 | {
|
| 3148 | - if (get_option('geodir_show_search_right_section')) {
|
|
| 3149 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3150 | - do_action('geodir_sidebar_right_open', 'search-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 3151 | - /** |
|
| 3152 | - * This is used to add the content to the search page right sidebar (if active). |
|
| 3153 | - * |
|
| 3154 | - * @since 1.0.0 |
|
| 3155 | - */ |
|
| 3156 | - do_action('geodir_search_sidebar_right_inside');
|
|
| 3157 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3158 | - do_action('geodir_sidebar_right_close', 'search-page');
|
|
| 3159 | - } |
|
| 3148 | + if (get_option('geodir_show_search_right_section')) {
|
|
| 3149 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3150 | + do_action('geodir_sidebar_right_open', 'search-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 3151 | + /** |
|
| 3152 | + * This is used to add the content to the search page right sidebar (if active). |
|
| 3153 | + * |
|
| 3154 | + * @since 1.0.0 |
|
| 3155 | + */ |
|
| 3156 | + do_action('geodir_search_sidebar_right_inside');
|
|
| 3157 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3158 | + do_action('geodir_sidebar_right_close', 'search-page');
|
|
| 3159 | + } |
|
| 3160 | 3160 | } |
| 3161 | 3161 | |
| 3162 | 3162 | |
@@ -3171,11 +3171,11 @@ discard block |
||
| 3171 | 3171 | */ |
| 3172 | 3172 | function geodir_action_sidebar_search_bottom_section() |
| 3173 | 3173 | {
|
| 3174 | - if (get_option('geodir_show_search_bottom_section')) { ?>
|
|
| 3174 | + if (get_option('geodir_show_search_bottom_section')) { ?>
|
|
| 3175 | 3175 | <div |
| 3176 | 3176 | class="<?php |
| 3177 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3178 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_bottom'); ?>">
|
|
| 3177 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3178 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_search_bottom'); ?>">
|
|
| 3179 | 3179 | <?php dynamic_sidebar('geodir_search_bottom'); ?>
|
| 3180 | 3180 | </div><!-- clearfix ends here--> |
| 3181 | 3181 | <?php } |
@@ -3190,14 +3190,14 @@ discard block |
||
| 3190 | 3190 | */ |
| 3191 | 3191 | function geodir_action_search_content_inside() |
| 3192 | 3192 | {
|
| 3193 | - global $gridview_columns; |
|
| 3194 | - $listing_view = get_option('geodir_search_view');
|
|
| 3195 | - if (strstr($listing_view, 'gridview')) {
|
|
| 3196 | - $gridview_columns = $listing_view; |
|
| 3197 | - $listing_view_exp = explode('_', $listing_view);
|
|
| 3198 | - $listing_view = $listing_view_exp[0]; |
|
| 3199 | - } |
|
| 3200 | - geodir_get_template_part('listing', 'listview');
|
|
| 3193 | + global $gridview_columns; |
|
| 3194 | + $listing_view = get_option('geodir_search_view');
|
|
| 3195 | + if (strstr($listing_view, 'gridview')) {
|
|
| 3196 | + $gridview_columns = $listing_view; |
|
| 3197 | + $listing_view_exp = explode('_', $listing_view);
|
|
| 3198 | + $listing_view = $listing_view_exp[0]; |
|
| 3199 | + } |
|
| 3200 | + geodir_get_template_part('listing', 'listview');
|
|
| 3201 | 3201 | } |
| 3202 | 3202 | |
| 3203 | 3203 | add_action('geodir_search_content_inside', 'geodir_action_search_content_inside', 10);
|
@@ -3213,22 +3213,22 @@ discard block |
||
| 3213 | 3213 | */ |
| 3214 | 3214 | function geodir_action_search_content() |
| 3215 | 3215 | {
|
| 3216 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3217 | - do_action('geodir_main_content_open', 'search-page', 'geodir-main-content', 'search-page');
|
|
| 3218 | - echo '<div class="clearfix">'; |
|
| 3219 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3220 | - do_action('geodir_before_listing');
|
|
| 3221 | - echo '</div>'; |
|
| 3222 | - /** |
|
| 3223 | - * This is used to add the content to the search page main content. |
|
| 3224 | - * |
|
| 3225 | - * @since 1.0.0 |
|
| 3226 | - */ |
|
| 3227 | - do_action('geodir_search_content_inside');
|
|
| 3228 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3229 | - do_action('geodir_after_listing');
|
|
| 3230 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3231 | - do_action('geodir_main_content_close', 'search-page');
|
|
| 3216 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3217 | + do_action('geodir_main_content_open', 'search-page', 'geodir-main-content', 'search-page');
|
|
| 3218 | + echo '<div class="clearfix">'; |
|
| 3219 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3220 | + do_action('geodir_before_listing');
|
|
| 3221 | + echo '</div>'; |
|
| 3222 | + /** |
|
| 3223 | + * This is used to add the content to the search page main content. |
|
| 3224 | + * |
|
| 3225 | + * @since 1.0.0 |
|
| 3226 | + */ |
|
| 3227 | + do_action('geodir_search_content_inside');
|
|
| 3228 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3229 | + do_action('geodir_after_listing');
|
|
| 3230 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3231 | + do_action('geodir_main_content_close', 'search-page');
|
|
| 3232 | 3232 | } |
| 3233 | 3233 | |
| 3234 | 3234 | ############################################### |
@@ -3251,11 +3251,11 @@ discard block |
||
| 3251 | 3251 | */ |
| 3252 | 3252 | function geodir_action_geodir_sidebar_home_top() |
| 3253 | 3253 | {
|
| 3254 | - if (get_option('geodir_show_home_top_section')) { ?>
|
|
| 3254 | + if (get_option('geodir_show_home_top_section')) { ?>
|
|
| 3255 | 3255 | <div |
| 3256 | 3256 | class="<?php |
| 3257 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3258 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_top'); ?>">
|
|
| 3257 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3258 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_top'); ?>">
|
|
| 3259 | 3259 | <?php dynamic_sidebar('geodir_home_top'); ?>
|
| 3260 | 3260 | </div><!-- clearfix ends here--> |
| 3261 | 3261 | <?php } |
@@ -3271,7 +3271,7 @@ discard block |
||
| 3271 | 3271 | */ |
| 3272 | 3272 | function geodir_home_left_section() |
| 3273 | 3273 | {
|
| 3274 | - if (get_option('geodir_show_home_left_section')) { ?>
|
|
| 3274 | + if (get_option('geodir_show_home_left_section')) { ?>
|
|
| 3275 | 3275 | <div class="geodir-content-left geodir-sidebar-wrap"> |
| 3276 | 3276 | <?php dynamic_sidebar('geodir_home_left'); ?>
|
| 3277 | 3277 | </div><!-- end geodir-content-left --> |
@@ -3293,19 +3293,19 @@ discard block |
||
| 3293 | 3293 | */ |
| 3294 | 3294 | function geodir_action_home_sidebar_left() |
| 3295 | 3295 | {
|
| 3296 | - if (get_option('geodir_show_home_left_section')) {
|
|
| 3296 | + if (get_option('geodir_show_home_left_section')) {
|
|
| 3297 | 3297 | // this adds the opening html tags to the primary div, this required the closing tag below :: ($type='',$id='',$class='',$itemtype='') |
| 3298 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3299 | - do_action('geodir_sidebar_left_open', 'home-page', 'geodir-sidebar-left', 'geodir-sidebar geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');
|
|
| 3300 | - /** |
|
| 3301 | - * This is used to add the content to the home page left sidebar (if active). |
|
| 3302 | - * |
|
| 3303 | - * @since 1.0.0 |
|
| 3304 | - */ |
|
| 3305 | - do_action('geodir_home_sidebar_left_inside');
|
|
| 3306 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3307 | - do_action('geodir_sidebar_left_close', 'home-page');
|
|
| 3308 | - } |
|
| 3298 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3299 | + do_action('geodir_sidebar_left_open', 'home-page', 'geodir-sidebar-left', 'geodir-sidebar geodir-sidebar-left geodir-listings-sidebar-left', 'http://schema.org/WPSideBar');
|
|
| 3300 | + /** |
|
| 3301 | + * This is used to add the content to the home page left sidebar (if active). |
|
| 3302 | + * |
|
| 3303 | + * @since 1.0.0 |
|
| 3304 | + */ |
|
| 3305 | + do_action('geodir_home_sidebar_left_inside');
|
|
| 3306 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3307 | + do_action('geodir_sidebar_left_close', 'home-page');
|
|
| 3308 | + } |
|
| 3309 | 3309 | } |
| 3310 | 3310 | |
| 3311 | 3311 | /** |
@@ -3318,7 +3318,7 @@ discard block |
||
| 3318 | 3318 | */ |
| 3319 | 3319 | function geodir_home_right_section() |
| 3320 | 3320 | {
|
| 3321 | - if (get_option('geodir_show_home_right_section')) { ?>
|
|
| 3321 | + if (get_option('geodir_show_home_right_section')) { ?>
|
|
| 3322 | 3322 | <div class="geodir-content-right geodir-sidebar-wrap"> |
| 3323 | 3323 | <?php dynamic_sidebar('geodir_home_right'); ?>
|
| 3324 | 3324 | </div><!-- end geodir-content-right --> |
@@ -3339,18 +3339,18 @@ discard block |
||
| 3339 | 3339 | */ |
| 3340 | 3340 | function geodir_action_home_sidebar_right() |
| 3341 | 3341 | {
|
| 3342 | - if (get_option('geodir_show_home_right_section')) {
|
|
| 3343 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3344 | - do_action('geodir_sidebar_right_open', 'home-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 3345 | - /** |
|
| 3346 | - * This is used to add the content to the home page right sidebar (if active). |
|
| 3347 | - * |
|
| 3348 | - * @since 1.0.0 |
|
| 3349 | - */ |
|
| 3350 | - do_action('geodir_home_sidebar_right_inside');
|
|
| 3351 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3352 | - do_action('geodir_sidebar_right_close', 'home-page');
|
|
| 3353 | - } |
|
| 3342 | + if (get_option('geodir_show_home_right_section')) {
|
|
| 3343 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3344 | + do_action('geodir_sidebar_right_open', 'home-page', 'geodir-sidebar-right', 'geodir-sidebar-right geodir-listings-sidebar-right', 'http://schema.org/WPSideBar');
|
|
| 3345 | + /** |
|
| 3346 | + * This is used to add the content to the home page right sidebar (if active). |
|
| 3347 | + * |
|
| 3348 | + * @since 1.0.0 |
|
| 3349 | + */ |
|
| 3350 | + do_action('geodir_home_sidebar_right_inside');
|
|
| 3351 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3352 | + do_action('geodir_sidebar_right_close', 'home-page');
|
|
| 3353 | + } |
|
| 3354 | 3354 | } |
| 3355 | 3355 | |
| 3356 | 3356 | /** |
@@ -3361,7 +3361,7 @@ discard block |
||
| 3361 | 3361 | */ |
| 3362 | 3362 | function geodir_action_home_content_inside() |
| 3363 | 3363 | {
|
| 3364 | - dynamic_sidebar('geodir_home_content');
|
|
| 3364 | + dynamic_sidebar('geodir_home_content');
|
|
| 3365 | 3365 | } |
| 3366 | 3366 | |
| 3367 | 3367 | add_action('geodir_home_content_inside', 'geodir_action_home_content_inside', 10);
|
@@ -3376,28 +3376,28 @@ discard block |
||
| 3376 | 3376 | */ |
| 3377 | 3377 | function geodir_action_home_content() |
| 3378 | 3378 | {
|
| 3379 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3380 | - do_action('geodir_main_content_open', 'home-page', 'geodir-main-content', 'home-page');
|
|
| 3381 | - /** |
|
| 3382 | - * This called before the home page main content. |
|
| 3383 | - * |
|
| 3384 | - * @since 1.0.0 |
|
| 3385 | - */ |
|
| 3386 | - do_action('geodir_before_home_content');
|
|
| 3387 | - /** |
|
| 3388 | - * This is used to add the content to the home page main content. |
|
| 3389 | - * |
|
| 3390 | - * @since 1.0.0 |
|
| 3391 | - */ |
|
| 3392 | - do_action('geodir_home_content_inside');
|
|
| 3393 | - /** |
|
| 3394 | - * This is called after the homepage main content. |
|
| 3395 | - * |
|
| 3396 | - * @since 1.0.0 |
|
| 3397 | - */ |
|
| 3398 | - do_action('geodir_after_home_content');
|
|
| 3399 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3400 | - do_action('geodir_main_content_close', 'home-page');
|
|
| 3379 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3380 | + do_action('geodir_main_content_open', 'home-page', 'geodir-main-content', 'home-page');
|
|
| 3381 | + /** |
|
| 3382 | + * This called before the home page main content. |
|
| 3383 | + * |
|
| 3384 | + * @since 1.0.0 |
|
| 3385 | + */ |
|
| 3386 | + do_action('geodir_before_home_content');
|
|
| 3387 | + /** |
|
| 3388 | + * This is used to add the content to the home page main content. |
|
| 3389 | + * |
|
| 3390 | + * @since 1.0.0 |
|
| 3391 | + */ |
|
| 3392 | + do_action('geodir_home_content_inside');
|
|
| 3393 | + /** |
|
| 3394 | + * This is called after the homepage main content. |
|
| 3395 | + * |
|
| 3396 | + * @since 1.0.0 |
|
| 3397 | + */ |
|
| 3398 | + do_action('geodir_after_home_content');
|
|
| 3399 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3400 | + do_action('geodir_main_content_close', 'home-page');
|
|
| 3401 | 3401 | } |
| 3402 | 3402 | |
| 3403 | 3403 | add_action('geodir_sidebar_location_bottom_section', 'geodir_action_sidebar_home_bottom_section', 10);
|
@@ -3412,11 +3412,11 @@ discard block |
||
| 3412 | 3412 | */ |
| 3413 | 3413 | function geodir_action_sidebar_home_bottom_section() |
| 3414 | 3414 | {
|
| 3415 | - if (get_option('geodir_show_home_bottom_section')) { ?>
|
|
| 3415 | + if (get_option('geodir_show_home_bottom_section')) { ?>
|
|
| 3416 | 3416 | <div |
| 3417 | 3417 | class="<?php |
| 3418 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 3419 | - echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_bottom'); ?>">
|
|
| 3418 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 3419 | + echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'geodir_home_bottom'); ?>">
|
|
| 3420 | 3420 | <?php dynamic_sidebar('geodir_home_bottom'); ?>
|
| 3421 | 3421 | </div><!-- clearfix ends here--> |
| 3422 | 3422 | <?php } |
@@ -3444,13 +3444,13 @@ discard block |
||
| 3444 | 3444 | */ |
| 3445 | 3445 | function geodir_filter_listing_page_title($list_title) |
| 3446 | 3446 | {
|
| 3447 | - if (is_search() && trim(get_search_query()) == '') {
|
|
| 3448 | - $gd_post_type = geodir_get_current_posttype(); |
|
| 3449 | - $post_type_info = get_post_type_object($gd_post_type); |
|
| 3447 | + if (is_search() && trim(get_search_query()) == '') {
|
|
| 3448 | + $gd_post_type = geodir_get_current_posttype(); |
|
| 3449 | + $post_type_info = get_post_type_object($gd_post_type); |
|
| 3450 | 3450 | |
| 3451 | - $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');
|
|
| 3452 | - } |
|
| 3453 | - return $list_title; |
|
| 3451 | + $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');
|
|
| 3452 | + } |
|
| 3453 | + return $list_title; |
|
| 3454 | 3454 | } |
| 3455 | 3455 | |
| 3456 | 3456 | add_action('geodir_message_not_found_on_listing', 'geodir_display_message_not_found_on_listing');
|
@@ -3466,63 +3466,63 @@ discard block |
||
| 3466 | 3466 | * @param string $gd_page The geodirectory page type. Default null. |
| 3467 | 3467 | */ |
| 3468 | 3468 | function geodir_add_page_content( $position = 'before', $gd_page = '' ) {
|
| 3469 | - global $post; |
|
| 3470 | - |
|
| 3471 | - $gd_page_id = NULL; |
|
| 3472 | - if ($gd_page == 'home-page' && geodir_is_page('home')) {
|
|
| 3473 | - $gd_page_id = geodir_home_page_id(); |
|
| 3474 | - } else if ($gd_page == 'details-page' && geodir_is_page('preview')) {
|
|
| 3475 | - $gd_page_id = geodir_preview_page_id(); |
|
| 3476 | - } else if ($gd_page == 'add-listing-page' && geodir_is_page('add-listing')) {
|
|
| 3477 | - $gd_page_id = geodir_add_listing_page_id(); |
|
| 3478 | - } else if ($gd_page == 'success-page' && geodir_is_page('listing-success')) {
|
|
| 3479 | - $gd_page_id = geodir_success_page_id(); |
|
| 3480 | - } else if ($gd_page == 'location-page' && geodir_is_page('location')) {
|
|
| 3481 | - $gd_page_id = geodir_location_page_id(); |
|
| 3482 | - } else if ($gd_page == 'info-page' && geodir_is_page('info')) {
|
|
| 3483 | - $gd_page_id = geodir_info_page_id(); |
|
| 3484 | - } else if ($gd_page == 'signup-page' && geodir_is_page('login')) {
|
|
| 3485 | - $gd_page_id = geodir_login_page_id(); |
|
| 3486 | - } else if ($gd_page == 'checkout-page' && geodir_is_page('checkout')) {
|
|
| 3487 | - $gd_page_id = geodir_payment_checkout_page_id(); |
|
| 3488 | - } else if ($gd_page == 'invoices-page' && geodir_is_page('invoices')) {
|
|
| 3489 | - $gd_page_id = geodir_payment_invoices_page_id(); |
|
| 3490 | - } |
|
| 3491 | - |
|
| 3492 | - if (!$gd_page_id > 0) {
|
|
| 3493 | - return; |
|
| 3494 | - } |
|
| 3469 | + global $post; |
|
| 3470 | + |
|
| 3471 | + $gd_page_id = NULL; |
|
| 3472 | + if ($gd_page == 'home-page' && geodir_is_page('home')) {
|
|
| 3473 | + $gd_page_id = geodir_home_page_id(); |
|
| 3474 | + } else if ($gd_page == 'details-page' && geodir_is_page('preview')) {
|
|
| 3475 | + $gd_page_id = geodir_preview_page_id(); |
|
| 3476 | + } else if ($gd_page == 'add-listing-page' && geodir_is_page('add-listing')) {
|
|
| 3477 | + $gd_page_id = geodir_add_listing_page_id(); |
|
| 3478 | + } else if ($gd_page == 'success-page' && geodir_is_page('listing-success')) {
|
|
| 3479 | + $gd_page_id = geodir_success_page_id(); |
|
| 3480 | + } else if ($gd_page == 'location-page' && geodir_is_page('location')) {
|
|
| 3481 | + $gd_page_id = geodir_location_page_id(); |
|
| 3482 | + } else if ($gd_page == 'info-page' && geodir_is_page('info')) {
|
|
| 3483 | + $gd_page_id = geodir_info_page_id(); |
|
| 3484 | + } else if ($gd_page == 'signup-page' && geodir_is_page('login')) {
|
|
| 3485 | + $gd_page_id = geodir_login_page_id(); |
|
| 3486 | + } else if ($gd_page == 'checkout-page' && geodir_is_page('checkout')) {
|
|
| 3487 | + $gd_page_id = geodir_payment_checkout_page_id(); |
|
| 3488 | + } else if ($gd_page == 'invoices-page' && geodir_is_page('invoices')) {
|
|
| 3489 | + $gd_page_id = geodir_payment_invoices_page_id(); |
|
| 3490 | + } |
|
| 3491 | + |
|
| 3492 | + if (!$gd_page_id > 0) {
|
|
| 3493 | + return; |
|
| 3494 | + } |
|
| 3495 | 3495 | |
| 3496 | - $display = 'before'; |
|
| 3497 | - /** |
|
| 3498 | - * Filter the position to display the page content. |
|
| 3499 | - * |
|
| 3500 | - * @since 1.6.3 |
|
| 3501 | - * |
|
| 3502 | - * @param string $display Position to add the post content. |
|
| 3503 | - * @param string $gd_page The geodirectory page type. |
|
| 3504 | - */ |
|
| 3505 | - $display = apply_filters('geodir_add_page_content_position', $display, $gd_page);
|
|
| 3506 | - |
|
| 3507 | - if ($position !== $display) {
|
|
| 3508 | - return; |
|
| 3509 | - } |
|
| 3510 | - |
|
| 3511 | - $gd_post = $post; |
|
| 3512 | - $post = get_post($gd_page_id); |
|
| 3513 | - |
|
| 3514 | - setup_postdata($post); |
|
| 3515 | - |
|
| 3516 | - if (get_the_content()) {
|
|
| 3517 | - ?> |
|
| 3496 | + $display = 'before'; |
|
| 3497 | + /** |
|
| 3498 | + * Filter the position to display the page content. |
|
| 3499 | + * |
|
| 3500 | + * @since 1.6.3 |
|
| 3501 | + * |
|
| 3502 | + * @param string $display Position to add the post content. |
|
| 3503 | + * @param string $gd_page The geodirectory page type. |
|
| 3504 | + */ |
|
| 3505 | + $display = apply_filters('geodir_add_page_content_position', $display, $gd_page);
|
|
| 3506 | + |
|
| 3507 | + if ($position !== $display) {
|
|
| 3508 | + return; |
|
| 3509 | + } |
|
| 3510 | + |
|
| 3511 | + $gd_post = $post; |
|
| 3512 | + $post = get_post($gd_page_id); |
|
| 3513 | + |
|
| 3514 | + setup_postdata($post); |
|
| 3515 | + |
|
| 3516 | + if (get_the_content()) {
|
|
| 3517 | + ?> |
|
| 3518 | 3518 | <section class="entry-content clearfix" itemprop="articleBody"><?php the_content(); ?></section> |
| 3519 | 3519 | <?php |
| 3520 | - } |
|
| 3520 | + } |
|
| 3521 | 3521 | |
| 3522 | - $post = $gd_post; |
|
| 3523 | - if (!empty($gd_post) && is_object($gd_post)) {
|
|
| 3524 | - setup_postdata($gd_post); |
|
| 3525 | - } |
|
| 3522 | + $post = $gd_post; |
|
| 3523 | + if (!empty($gd_post) && is_object($gd_post)) {
|
|
| 3524 | + setup_postdata($gd_post); |
|
| 3525 | + } |
|
| 3526 | 3526 | |
| 3527 | 3527 | } |
| 3528 | 3528 | add_action('geodir_add_page_content', 'geodir_add_page_content', 10, 2);
|
@@ -3543,13 +3543,13 @@ discard block |
||
| 3543 | 3543 | * @return string Filtered SQL JOIN clause. |
| 3544 | 3544 | */ |
| 3545 | 3545 | function geodir_previous_next_post_join( $join, $in_same_term, $excluded_terms, $taxonomy, $post ) {
|
| 3546 | - global $plugin_prefix; |
|
| 3546 | + global $plugin_prefix; |
|
| 3547 | 3547 | |
| 3548 | - if ( !empty($post->post_type) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 3549 | - $join .= " INNER JOIN " . $plugin_prefix . $post->post_type . "_detail AS gd ON gd.post_id = p.ID"; |
|
| 3550 | - } |
|
| 3548 | + if ( !empty($post->post_type) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 3549 | + $join .= " INNER JOIN " . $plugin_prefix . $post->post_type . "_detail AS gd ON gd.post_id = p.ID"; |
|
| 3550 | + } |
|
| 3551 | 3551 | |
| 3552 | - return $join; |
|
| 3552 | + return $join; |
|
| 3553 | 3553 | } |
| 3554 | 3554 | add_filter( 'get_previous_post_join', 'geodir_previous_next_post_join', 10, 5 ); |
| 3555 | 3555 | add_filter( 'get_next_post_join', 'geodir_previous_next_post_join', 10, 5 ); |
@@ -3571,31 +3571,31 @@ discard block |
||
| 3571 | 3571 | * @return string Filtered SQL WHERE clause. |
| 3572 | 3572 | */ |
| 3573 | 3573 | function geodir_previous_next_post_where( $where, $in_same_term, $excluded_terms, $taxonomy, $post ) {
|
| 3574 | - global $wpdb, $plugin_prefix; |
|
| 3574 | + global $wpdb, $plugin_prefix; |
|
| 3575 | 3575 | |
| 3576 | - if ( !empty($post->post_type) && ( !empty( $post->country_slug ) || !empty( $post->region_slug ) || !empty( $post->city_slug ) ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 3577 | - $post_locations = ''; |
|
| 3578 | - $post_locations_var = array(); |
|
| 3576 | + if ( !empty($post->post_type) && ( !empty( $post->country_slug ) || !empty( $post->region_slug ) || !empty( $post->city_slug ) ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 3577 | + $post_locations = ''; |
|
| 3578 | + $post_locations_var = array(); |
|
| 3579 | 3579 | |
| 3580 | - if ( !empty( $post->country_slug ) ) {
|
|
| 3581 | - $post_locations .= " AND post_locations LIKE %s"; |
|
| 3582 | - $post_locations_var[] = "%,[" . $post->country_slug . "]"; |
|
| 3583 | - } |
|
| 3584 | - |
|
| 3585 | - if ( !empty( $post->region_slug ) ) {
|
|
| 3586 | - $post_locations .= " AND post_locations LIKE %s"; |
|
| 3587 | - $post_locations_var[] = "%,[" . $post->region_slug . "],%"; |
|
| 3588 | - } |
|
| 3589 | - |
|
| 3590 | - if ( !empty( $post->city_slug ) ) {
|
|
| 3591 | - $post_locations .= " AND post_locations LIKE %s"; |
|
| 3592 | - $post_locations_var[] = "[" . $post->city_slug . "],%"; |
|
| 3593 | - } |
|
| 3580 | + if ( !empty( $post->country_slug ) ) {
|
|
| 3581 | + $post_locations .= " AND post_locations LIKE %s"; |
|
| 3582 | + $post_locations_var[] = "%,[" . $post->country_slug . "]"; |
|
| 3583 | + } |
|
| 3584 | + |
|
| 3585 | + if ( !empty( $post->region_slug ) ) {
|
|
| 3586 | + $post_locations .= " AND post_locations LIKE %s"; |
|
| 3587 | + $post_locations_var[] = "%,[" . $post->region_slug . "],%"; |
|
| 3588 | + } |
|
| 3589 | + |
|
| 3590 | + if ( !empty( $post->city_slug ) ) {
|
|
| 3591 | + $post_locations .= " AND post_locations LIKE %s"; |
|
| 3592 | + $post_locations_var[] = "[" . $post->city_slug . "],%"; |
|
| 3593 | + } |
|
| 3594 | 3594 | |
| 3595 | - $where .= $wpdb->prepare( $post_locations, $post_locations_var ); |
|
| 3596 | - } |
|
| 3595 | + $where .= $wpdb->prepare( $post_locations, $post_locations_var ); |
|
| 3596 | + } |
|
| 3597 | 3597 | |
| 3598 | - return $where; |
|
| 3598 | + return $where; |
|
| 3599 | 3599 | } |
| 3600 | 3600 | add_filter( 'get_previous_post_where', 'geodir_previous_next_post_where', 10, 5 ); |
| 3601 | 3601 | add_filter( 'get_next_post_where', 'geodir_previous_next_post_where', 10, 5 ); |
| 3602 | 3602 | \ No newline at end of file |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | |
| 284 | 284 | //php |
| 285 | 285 | if (!empty($tc['geodir_theme_compat_code'])) {
|
| 286 | - include_once('geodirectory-functions/compatibility/' . $tc['geodir_theme_compat_code'] . '.php');
|
|
| 286 | + include_once('geodirectory-functions/compatibility/'.$tc['geodir_theme_compat_code'].'.php');
|
|
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | //geodir_full_page_class |
@@ -453,13 +453,13 @@ discard block |
||
| 453 | 453 | function geodir_action_wrapper_content_open($type = '', $id = '', $class = '') |
| 454 | 454 | {
|
| 455 | 455 | if ($type == 'home-page' && $width = get_option('geodir_width_home_contant_section')) {
|
| 456 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 456 | + $width_css = 'style="width:'.$width.'%;"'; |
|
| 457 | 457 | } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_contant_section')) {
|
| 458 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 458 | + $width_css = 'style="width:'.$width.'%;"'; |
|
| 459 | 459 | } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_contant_section')) {
|
| 460 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 460 | + $width_css = 'style="width:'.$width.'%;"'; |
|
| 461 | 461 | } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_contant_section')) {
|
| 462 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 462 | + $width_css = 'style="width:'.$width.'%;"'; |
|
| 463 | 463 | } else {
|
| 464 | 464 | $width_css = ''; |
| 465 | 465 | } |
@@ -573,13 +573,13 @@ discard block |
||
| 573 | 573 | function geodir_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '') |
| 574 | 574 | {
|
| 575 | 575 | if ($type == 'home-page' && $width = get_option('geodir_width_home_right_section')) {
|
| 576 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 576 | + $width_css = 'style="width:'.$width.'%;"'; |
|
| 577 | 577 | } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_right_section')) {
|
| 578 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 578 | + $width_css = 'style="width:'.$width.'%;"'; |
|
| 579 | 579 | } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_right_section')) {
|
| 580 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 580 | + $width_css = 'style="width:'.$width.'%;"'; |
|
| 581 | 581 | } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_right_section')) {
|
| 582 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 582 | + $width_css = 'style="width:'.$width.'%;"'; |
|
| 583 | 583 | } else {
|
| 584 | 584 | $width_css = ''; |
| 585 | 585 | } |
@@ -677,7 +677,7 @@ discard block |
||
| 677 | 677 | } |
| 678 | 678 | } |
| 679 | 679 | |
| 680 | - $post = (object)$_REQUEST; |
|
| 680 | + $post = (object) $_REQUEST; |
|
| 681 | 681 | |
| 682 | 682 | |
| 683 | 683 | if (isset($post->video)) {
|
@@ -736,10 +736,10 @@ discard block |
||
| 736 | 736 | |
| 737 | 737 | $json = '{';
|
| 738 | 738 | $json .= '"post_preview": "1",'; |
| 739 | - $json .= '"t": "' . $json_title . '",'; |
|
| 740 | - $json .= '"lt": "' . $post_latitude . '",'; |
|
| 741 | - $json .= '"ln": "' . $post_longitude . '",'; |
|
| 742 | - $json .= '"i":"' . $term_icon . '"'; |
|
| 739 | + $json .= '"t": "'.$json_title.'",'; |
|
| 740 | + $json .= '"lt": "'.$post_latitude.'",'; |
|
| 741 | + $json .= '"ln": "'.$post_longitude.'",'; |
|
| 742 | + $json .= '"i":"'.$term_icon.'"'; |
|
| 743 | 743 | $json .= '}'; |
| 744 | 744 | |
| 745 | 745 | $post->marker_json = $json; |
@@ -755,14 +755,14 @@ discard block |
||
| 755 | 755 | $post->default_category = ''; |
| 756 | 756 | $post->post_type = ''; |
| 757 | 757 | } |
| 758 | - if (empty($post->default_category) && ! empty($post->post_default_category)) {
|
|
| 758 | + if (empty($post->default_category) && !empty($post->post_default_category)) {
|
|
| 759 | 759 | $post->default_category = $post->post_default_category; |
| 760 | 760 | } |
| 761 | 761 | if (empty($post->post_type) && !empty($post->listing_type)) {
|
| 762 | 762 | $post->post_type = $post->listing_type; |
| 763 | 763 | } |
| 764 | 764 | $post_type = $post->post_type; |
| 765 | - $cat_taxonomy = $post_type . "category"; |
|
| 765 | + $cat_taxonomy = $post_type."category"; |
|
| 766 | 766 | if (!empty($post_type) && empty($post->{$cat_taxonomy}) && !empty($post->post_category) && !empty($post->post_category[$cat_taxonomy])) {
|
| 767 | 767 | $post->{$cat_taxonomy} = $post->post_category[$cat_taxonomy];
|
| 768 | 768 | } |
@@ -977,7 +977,7 @@ discard block |
||
| 977 | 977 | * @param string $class The class to use. Default is 'entry-header'. |
| 978 | 978 | */ |
| 979 | 979 | $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
| 980 | - echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . stripslashes(get_the_title()) . '</h1></header>'; |
|
| 980 | + echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'.stripslashes(get_the_title()).'</h1></header>'; |
|
| 981 | 981 | } |
| 982 | 982 | |
| 983 | 983 | |
@@ -1015,7 +1015,7 @@ discard block |
||
| 1015 | 1015 | $package_info = geodir_post_package_info(array(), $post, (!empty($post->post_type) ? $post->post_type : '')); |
| 1016 | 1016 | $image_limit = ''; |
| 1017 | 1017 | if (defined('GEODIRPAYMENT_VERSION') && !empty($package_info) && isset($package_info->image_limit) && $package_info->image_limit !== '') {
|
| 1018 | - $image_limit = (int)$package_info->image_limit; |
|
| 1018 | + $image_limit = (int) $package_info->image_limit; |
|
| 1019 | 1019 | } |
| 1020 | 1020 | |
| 1021 | 1021 | if ($preview) {
|
@@ -1031,7 +1031,7 @@ discard block |
||
| 1031 | 1031 | |
| 1032 | 1032 | if (!empty($post_images)) {
|
| 1033 | 1033 | foreach ($post_images as $image) {
|
| 1034 | - if ($image_limit !== '' && ($slides+1) > $image_limit) {
|
|
| 1034 | + if ($image_limit !== '' && ($slides + 1) > $image_limit) {
|
|
| 1035 | 1035 | break; |
| 1036 | 1036 | } |
| 1037 | 1037 | if (!empty($image)) {
|
@@ -1040,7 +1040,7 @@ discard block |
||
| 1040 | 1040 | $height = !empty($sizes) && isset($sizes[1]) ? $sizes[1] : 0; |
| 1041 | 1041 | |
| 1042 | 1042 | if ($image && $width && $height) {
|
| 1043 | - $image = (object)array('src' => $image, 'width' => $width, 'height' => $height);
|
|
| 1043 | + $image = (object) array('src' => $image, 'width' => $width, 'height' => $height);
|
|
| 1044 | 1044 | } |
| 1045 | 1045 | |
| 1046 | 1046 | if (isset($image->src)) {
|
@@ -1052,9 +1052,9 @@ discard block |
||
| 1052 | 1052 | |
| 1053 | 1053 | $image_title = isset($image->title) ? $image->title : ''; |
| 1054 | 1054 | |
| 1055 | - $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />'; |
|
| 1056 | - $main_slides .= '<img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:400px;margin:0 auto;" /></li>'; |
|
| 1057 | - $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image_title . '" title="' . $image_title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 1055 | + $main_slides .= '<li><img src="'.geodir_plugin_url()."/geodirectory-assets/images/spacer.gif".'" alt="'.$image_title.'" title="'.$image_title.'" style="max-height:'.$spacer_height.'px;margin:0 auto;" />'; |
|
| 1056 | + $main_slides .= '<img src="'.$image->src.'" alt="'.$image_title.'" title="'.$image_title.'" style="max-height:400px;margin:0 auto;" /></li>'; |
|
| 1057 | + $nav_slides .= '<li><img src="'.$image->src.'" alt="'.$image_title.'" title="'.$image_title.'" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 1058 | 1058 | $slides++; |
| 1059 | 1059 | } |
| 1060 | 1060 | } |
@@ -1075,7 +1075,7 @@ discard block |
||
| 1075 | 1075 | |
| 1076 | 1076 | if (!empty($post_images)) {
|
| 1077 | 1077 | foreach ($post_images as $image) {
|
| 1078 | - if ($image_limit !== '' && ($slides+1) > $image_limit) {
|
|
| 1078 | + if ($image_limit !== '' && ($slides + 1) > $image_limit) {
|
|
| 1079 | 1079 | break; |
| 1080 | 1080 | } |
| 1081 | 1081 | if ($image->height >= 400) {
|
@@ -1084,9 +1084,9 @@ discard block |
||
| 1084 | 1084 | $spacer_height = ((400 - $image->height) / 2); |
| 1085 | 1085 | } |
| 1086 | 1086 | |
| 1087 | - $caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : ''; |
|
| 1088 | - $main_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>'; |
|
| 1089 | - $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 1087 | + $caption = ''; //(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : ''; |
|
| 1088 | + $main_slides .= '<li><img src="'.$image->src.'" alt="'.$image->title.'" title="'.$image->title.'" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>'; |
|
| 1089 | + $nav_slides .= '<li><img src="'.$image->src.'" alt="'.$image->title.'" title="'.$image->title.'" style="max-height:48px;margin:0 auto;" /></li>'; |
|
| 1090 | 1090 | $slides++; |
| 1091 | 1091 | } |
| 1092 | 1092 | }// endfore |
@@ -1121,7 +1121,7 @@ discard block |
||
| 1121 | 1121 | */ |
| 1122 | 1122 | function geodir_action_details_taxonomies() |
| 1123 | 1123 | {
|
| 1124 | - global $preview, $post;?> |
|
| 1124 | + global $preview, $post; ?> |
|
| 1125 | 1125 | <p class="geodir_post_taxomomies clearfix"> |
| 1126 | 1126 | <?php |
| 1127 | 1127 | $taxonomies = array(); |
@@ -1130,11 +1130,11 @@ discard block |
||
| 1130 | 1130 | |
| 1131 | 1131 | if ($preview && !$is_backend_preview) {
|
| 1132 | 1132 | $post_type = $post->listing_type; |
| 1133 | - $post_taxonomy = $post_type . 'category'; |
|
| 1133 | + $post_taxonomy = $post_type.'category'; |
|
| 1134 | 1134 | $post->{$post_taxonomy} = $post->post_category[$post_taxonomy];
|
| 1135 | 1135 | } else {
|
| 1136 | 1136 | $post_type = $post->post_type; |
| 1137 | - $post_taxonomy = $post_type . 'category'; |
|
| 1137 | + $post_taxonomy = $post_type.'category'; |
|
| 1138 | 1138 | } |
| 1139 | 1139 | //{
|
| 1140 | 1140 | $post_type_info = get_post_type_object($post_type); |
@@ -1142,7 +1142,7 @@ discard block |
||
| 1142 | 1142 | |
| 1143 | 1143 | if (!empty($post->post_tags)) {
|
| 1144 | 1144 | |
| 1145 | - if (taxonomy_exists($post_type . '_tags')): |
|
| 1145 | + if (taxonomy_exists($post_type.'_tags')): |
|
| 1146 | 1146 | $links = array(); |
| 1147 | 1147 | $terms = array(); |
| 1148 | 1148 | // to limit post tags |
@@ -1169,8 +1169,8 @@ discard block |
||
| 1169 | 1169 | $post_term = trim($post_term); |
| 1170 | 1170 | |
| 1171 | 1171 | $priority_location = false; |
| 1172 | - if ($insert_term = term_exists($post_term, $post_type . '_tags')) {
|
|
| 1173 | - $term = get_term_by('id', $insert_term['term_id'], $post_type . '_tags');
|
|
| 1172 | + if ($insert_term = term_exists($post_term, $post_type.'_tags')) {
|
|
| 1173 | + $term = get_term_by('id', $insert_term['term_id'], $post_type.'_tags');
|
|
| 1174 | 1174 | } else {
|
| 1175 | 1175 | $post_country = isset($_REQUEST['post_country']) && $_REQUEST['post_country'] != '' ? sanitize_text_field($_REQUEST['post_country']) : NULL; |
| 1176 | 1176 | $post_region = isset($_REQUEST['post_region']) && $_REQUEST['post_region'] != '' ? sanitize_text_field($_REQUEST['post_region']) : NULL; |
@@ -1180,10 +1180,10 @@ discard block |
||
| 1180 | 1180 | $match_city = $post_city && sanitize_title($post_term) == sanitize_title($post_city) ? true : false; |
| 1181 | 1181 | if ($match_country || $match_region || $match_city) {
|
| 1182 | 1182 | $priority_location = true; |
| 1183 | - $term = get_term_by('name', $post_term, $post_type . '_tags');
|
|
| 1183 | + $term = get_term_by('name', $post_term, $post_type.'_tags');
|
|
| 1184 | 1184 | } else {
|
| 1185 | - $insert_term = wp_insert_term($post_term, $post_type . '_tags'); |
|
| 1186 | - $term = get_term_by('name', $post_term, $post_type . '_tags');
|
|
| 1185 | + $insert_term = wp_insert_term($post_term, $post_type.'_tags'); |
|
| 1186 | + $term = get_term_by('name', $post_term, $post_type.'_tags');
|
|
| 1187 | 1187 | } |
| 1188 | 1188 | } |
| 1189 | 1189 | |
@@ -1200,12 +1200,12 @@ discard block |
||
| 1200 | 1200 | * @param string $tag_link The tag link html. |
| 1201 | 1201 | * @param object $term The tag term object. |
| 1202 | 1202 | */ |
| 1203 | - $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);
|
|
| 1203 | + $tag_link = apply_filters('geodir_details_taxonomies_tag_link', $tag_link, $term);
|
|
| 1204 | 1204 | $links[] = $tag_link; |
| 1205 | 1205 | } else {
|
| 1206 | - $tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>"; |
|
| 1206 | + $tag_link = "<a href='".esc_attr(get_term_link($term->term_id, $term->taxonomy))."'>$term->name</a>"; |
|
| 1207 | 1207 | /** This action is documented in geodirectory-template_actions.php */ |
| 1208 | - $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);
|
|
| 1208 | + $tag_link = apply_filters('geodir_details_taxonomies_tag_link', $tag_link, $term);
|
|
| 1209 | 1209 | $links[] = $tag_link; |
| 1210 | 1210 | } |
| 1211 | 1211 | $terms[] = $term; |
@@ -1215,7 +1215,7 @@ discard block |
||
| 1215 | 1215 | if (!isset($listing_label)) {
|
| 1216 | 1216 | $listing_label = ''; |
| 1217 | 1217 | } |
| 1218 | - $taxonomies[$post_type . '_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);
|
|
| 1218 | + $taxonomies[$post_type.'_tags'] = wp_sprintf(__('%s Tags: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object) $terms);
|
|
| 1219 | 1219 | endif; |
| 1220 | 1220 | |
| 1221 | 1221 | } |
@@ -1243,7 +1243,7 @@ discard block |
||
| 1243 | 1243 | $term = get_term_by('id', $post_term, $post_taxonomy);
|
| 1244 | 1244 | |
| 1245 | 1245 | if (is_object($term)) {
|
| 1246 | - $term_link = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>$term->name</a>"; |
|
| 1246 | + $term_link = "<a href='".esc_attr(get_term_link($term, $post_taxonomy))."'>$term->name</a>"; |
|
| 1247 | 1247 | /** |
| 1248 | 1248 | * Filter the category name on the details page. |
| 1249 | 1249 | * |
@@ -1251,7 +1251,7 @@ discard block |
||
| 1251 | 1251 | * @param string $term_link The link html to the category. |
| 1252 | 1252 | * @param object $term The category term object. |
| 1253 | 1253 | */ |
| 1254 | - $term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);
|
|
| 1254 | + $term_link = apply_filters('geodir_details_taxonomies_cat_link', $term_link, $term);
|
|
| 1255 | 1255 | $links[] = $term_link; |
| 1256 | 1256 | $terms[] = $term; |
| 1257 | 1257 | } |
@@ -1269,7 +1269,7 @@ discard block |
||
| 1269 | 1269 | if (!isset($listing_label)) {
|
| 1270 | 1270 | $listing_label = ''; |
| 1271 | 1271 | } |
| 1272 | - $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object)$terms);
|
|
| 1272 | + $taxonomies[$post_taxonomy] = wp_sprintf(__('%s Category: %l', 'geodirectory'), geodir_ucwords($listing_label), $links, (object) $terms);
|
|
| 1273 | 1273 | |
| 1274 | 1274 | } |
| 1275 | 1275 | |
@@ -1282,14 +1282,14 @@ discard block |
||
| 1282 | 1282 | * @param string $listing_label The post type label. |
| 1283 | 1283 | * @param string $listing_label The post type label with ucwords function. |
| 1284 | 1284 | */ |
| 1285 | - $taxonomies = apply_filters('geodir_details_taxonomies_output',$taxonomies,$post_type,$listing_label,geodir_ucwords($listing_label));
|
|
| 1285 | + $taxonomies = apply_filters('geodir_details_taxonomies_output', $taxonomies, $post_type, $listing_label, geodir_ucwords($listing_label));
|
|
| 1286 | 1286 | |
| 1287 | 1287 | if (isset($taxonomies[$post_taxonomy])) {
|
| 1288 | - echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>'; |
|
| 1288 | + echo '<span class="geodir-category">'.$taxonomies[$post_taxonomy].'</span>'; |
|
| 1289 | 1289 | } |
| 1290 | 1290 | |
| 1291 | - if (isset($taxonomies[$post_type . '_tags'])) |
|
| 1292 | - echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>'; |
|
| 1291 | + if (isset($taxonomies[$post_type.'_tags'])) |
|
| 1292 | + echo '<span class="geodir-tags">'.$taxonomies[$post_type.'_tags'].'</span>'; |
|
| 1293 | 1293 | |
| 1294 | 1294 | ?> |
| 1295 | 1295 | </p><?php |
@@ -1310,11 +1310,11 @@ discard block |
||
| 1310 | 1310 | * @param object $post Optional. The post object or blank. |
| 1311 | 1311 | * @package GeoDirectory |
| 1312 | 1312 | */ |
| 1313 | -function geodir_action_details_micordata($post='') |
|
| 1313 | +function geodir_action_details_micordata($post = '') |
|
| 1314 | 1314 | {
|
| 1315 | 1315 | |
| 1316 | 1316 | global $preview; |
| 1317 | - if(empty($post)){global $post;}
|
|
| 1317 | + if (empty($post)) {global $post; }
|
|
| 1318 | 1318 | if ($preview || !geodir_is_page('detail')) {
|
| 1319 | 1319 | return; |
| 1320 | 1320 | } |
@@ -1329,7 +1329,7 @@ discard block |
||
| 1329 | 1329 | } else {
|
| 1330 | 1330 | foreach ($post_reviews as $review) {
|
| 1331 | 1331 | |
| 1332 | - if($rating_value = geodir_get_commentoverall($review->comment_ID)){
|
|
| 1332 | + if ($rating_value = geodir_get_commentoverall($review->comment_ID)) {
|
|
| 1333 | 1333 | $reviews[] = array( |
| 1334 | 1334 | "@type" => "Review", |
| 1335 | 1335 | "author" => $review->comment_author, |
@@ -1337,7 +1337,7 @@ discard block |
||
| 1337 | 1337 | "description" => $review->comment_content, |
| 1338 | 1338 | "reviewRating" => array( |
| 1339 | 1339 | "@type" => "Rating", |
| 1340 | - "bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score. |
|
| 1340 | + "bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score. |
|
| 1341 | 1341 | "ratingValue" => $rating_value, |
| 1342 | 1342 | "worstRating" => "1" |
| 1343 | 1343 | ) |
@@ -1367,13 +1367,13 @@ discard block |
||
| 1367 | 1367 | } |
| 1368 | 1368 | //print_r($post); |
| 1369 | 1369 | // external links |
| 1370 | - $external_links = array(); |
|
| 1370 | + $external_links = array(); |
|
| 1371 | 1371 | $external_links[] = $post->geodir_website; |
| 1372 | 1372 | $external_links[] = $post->geodir_twitter; |
| 1373 | 1373 | $external_links[] = $post->geodir_facebook; |
| 1374 | 1374 | $external_links = array_filter($external_links); |
| 1375 | 1375 | |
| 1376 | - if(!empty($external_links)){
|
|
| 1376 | + if (!empty($external_links)) {
|
|
| 1377 | 1377 | $external_links = array_values($external_links); |
| 1378 | 1378 | } |
| 1379 | 1379 | |
@@ -1383,17 +1383,17 @@ discard block |
||
| 1383 | 1383 | |
| 1384 | 1384 | // schema type |
| 1385 | 1385 | $schema_type = 'LocalBusiness'; |
| 1386 | - if(isset($post->default_category) && $post->default_category){
|
|
| 1386 | + if (isset($post->default_category) && $post->default_category) {
|
|
| 1387 | 1387 | $cat_schema = geodir_get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type); |
| 1388 | - if($cat_schema){$schema_type = $cat_schema;}
|
|
| 1389 | - if(!$cat_schema && $schema_type=='LocalBusiness' && $post->post_type=='gd_event'){$schema_type = 'Event';}
|
|
| 1388 | + if ($cat_schema) {$schema_type = $cat_schema; }
|
|
| 1389 | + if (!$cat_schema && $schema_type == 'LocalBusiness' && $post->post_type == 'gd_event') {$schema_type = 'Event'; }
|
|
| 1390 | 1390 | } |
| 1391 | 1391 | |
| 1392 | 1392 | $schema = array(); |
| 1393 | 1393 | $schema['@context'] = "https://schema.org"; |
| 1394 | 1394 | $schema['@type'] = $schema_type; |
| 1395 | 1395 | $schema['name'] = $post->post_title; |
| 1396 | - $schema['description'] = wp_strip_all_tags( $post->post_content, true ); |
|
| 1396 | + $schema['description'] = wp_strip_all_tags($post->post_content, true); |
|
| 1397 | 1397 | $schema['telephone'] = $post->geodir_contact; |
| 1398 | 1398 | $schema['url'] = $c_url; |
| 1399 | 1399 | $schema['sameAs'] = $external_links; |
@@ -1407,7 +1407,7 @@ discard block |
||
| 1407 | 1407 | "postalCode" => $post->post_zip |
| 1408 | 1408 | ); |
| 1409 | 1409 | |
| 1410 | - if($post->post_latitude && $post->post_longitude) {
|
|
| 1410 | + if ($post->post_latitude && $post->post_longitude) {
|
|
| 1411 | 1411 | $schema['geo'] = array( |
| 1412 | 1412 | "@type" => "GeoCoordinates", |
| 1413 | 1413 | "latitude" => $post->post_latitude, |
@@ -1415,7 +1415,7 @@ discard block |
||
| 1415 | 1415 | ); |
| 1416 | 1416 | } |
| 1417 | 1417 | |
| 1418 | - if($post_avgratings) {
|
|
| 1418 | + if ($post_avgratings) {
|
|
| 1419 | 1419 | $schema['aggregateRating'] = array( |
| 1420 | 1420 | "@type" => "AggregateRating", |
| 1421 | 1421 | "ratingValue" => $post_avgratings, |
@@ -1434,10 +1434,10 @@ discard block |
||
| 1434 | 1434 | * @param array $schema The array of schema data to be filtered. |
| 1435 | 1435 | * @param object $post The post object. |
| 1436 | 1436 | */ |
| 1437 | - $schema = apply_filters('geodir_details_schema', $schema,$post);
|
|
| 1437 | + $schema = apply_filters('geodir_details_schema', $schema, $post);
|
|
| 1438 | 1438 | |
| 1439 | 1439 | |
| 1440 | - echo '<script type="application/ld+json">' . json_encode($schema) . '</script>'; |
|
| 1440 | + echo '<script type="application/ld+json">'.json_encode($schema).'</script>'; |
|
| 1441 | 1441 | |
| 1442 | 1442 | |
| 1443 | 1443 | $uploads = wp_upload_dir(); |
@@ -1450,7 +1450,7 @@ discard block |
||
| 1450 | 1450 | * @param string $facebook_og The open graph html to be filtered. |
| 1451 | 1451 | * @param object $post The post object. |
| 1452 | 1452 | */ |
| 1453 | - echo apply_filters('geodir_details_facebook_og', $facebook_og,$post);
|
|
| 1453 | + echo apply_filters('geodir_details_facebook_og', $facebook_og, $post);
|
|
| 1454 | 1454 | |
| 1455 | 1455 | |
| 1456 | 1456 | |
@@ -1473,9 +1473,9 @@ discard block |
||
| 1473 | 1473 | ?> |
| 1474 | 1474 | <div class="geodir-pos_navigation clearfix"> |
| 1475 | 1475 | <div |
| 1476 | - class="geodir-post_left"><?php previous_post_link('%link', '' . __('Previous', 'geodirectory'), false) ?></div>
|
|
| 1476 | + class="geodir-post_left"><?php previous_post_link('%link', ''.__('Previous', 'geodirectory'), false) ?></div>
|
|
| 1477 | 1477 | <div |
| 1478 | - class="geodir-post_right"><?php next_post_link('%link', __('Next', 'geodirectory') . '', false) ?></div>
|
|
| 1478 | + class="geodir-post_right"><?php next_post_link('%link', __('Next', 'geodirectory').'', false) ?></div>
|
|
| 1479 | 1479 | </div><?php |
| 1480 | 1480 | } |
| 1481 | 1481 | |
@@ -1544,12 +1544,12 @@ discard block |
||
| 1544 | 1544 | $gd_post_type = geodir_get_current_posttype(); |
| 1545 | 1545 | $post_type_info = get_post_type_object($gd_post_type); |
| 1546 | 1546 | |
| 1547 | - $add_string_in_title = __('All', 'geodirectory') . ' ';
|
|
| 1547 | + $add_string_in_title = __('All', 'geodirectory').' ';
|
|
| 1548 | 1548 | if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
| 1549 | - $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';
|
|
| 1549 | + $add_string_in_title = __('My Favorite', 'geodirectory').' ';
|
|
| 1550 | 1550 | } |
| 1551 | 1551 | |
| 1552 | - $list_title = $add_string_in_title . __($post_type_info->labels->name, 'geodirectory'); |
|
| 1552 | + $list_title = $add_string_in_title.__($post_type_info->labels->name, 'geodirectory'); |
|
| 1553 | 1553 | $single_name = $post_type_info->labels->singular_name; |
| 1554 | 1554 | |
| 1555 | 1555 | $taxonomy = geodir_get_taxonomies($gd_post_type, true); |
@@ -1577,12 +1577,12 @@ discard block |
||
| 1577 | 1577 | $current_term = get_term_by('slug', $term, $taxonomy[0]);
|
| 1578 | 1578 | if (!empty($current_term)) {
|
| 1579 | 1579 | $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory'); |
| 1580 | - if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {
|
|
| 1580 | + if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type.'category') {
|
|
| 1581 | 1581 | $location_last_char = substr($location_name, -1); |
| 1582 | 1582 | $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');
|
| 1583 | - $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;
|
|
| 1583 | + $list_title .= __(' in', 'geodirectory').' '.$location_name.$location_name_attach.' '.$current_term_name;
|
|
| 1584 | 1584 | } else {
|
| 1585 | - $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";
|
|
| 1585 | + $list_title .= __(' in', 'geodirectory')." '".$current_term_name."'";
|
|
| 1586 | 1586 | } |
| 1587 | 1587 | } else {
|
| 1588 | 1588 | if (count($taxonomy) > 1) {
|
@@ -1590,12 +1590,12 @@ discard block |
||
| 1590 | 1590 | |
| 1591 | 1591 | if (!empty($current_term)) {
|
| 1592 | 1592 | $current_term_name = __(geodir_utf8_ucfirst($current_term->name), 'geodirectory'); |
| 1593 | - if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type . 'category') {
|
|
| 1593 | + if ($current_term_name != '' && $location_name != '' && isset($current_term->taxonomy) && $current_term->taxonomy == $gd_post_type.'category') {
|
|
| 1594 | 1594 | $location_last_char = substr($location_name, -1); |
| 1595 | 1595 | $location_name_attach = geodir_strtolower($location_last_char) == 's' ? __("'", 'geodirectory') : __("'s", 'geodirectory');
|
| 1596 | - $list_title .= __(' in', 'geodirectory') . ' ' . $location_name . $location_name_attach . ' ' . $current_term_name;
|
|
| 1596 | + $list_title .= __(' in', 'geodirectory').' '.$location_name.$location_name_attach.' '.$current_term_name;
|
|
| 1597 | 1597 | } else {
|
| 1598 | - $list_title .= __(' in', 'geodirectory') . " '" . $current_term_name . "'";
|
|
| 1598 | + $list_title .= __(' in', 'geodirectory')." '".$current_term_name."'";
|
|
| 1599 | 1599 | } |
| 1600 | 1600 | } |
| 1601 | 1601 | } |
@@ -1623,7 +1623,7 @@ discard block |
||
| 1623 | 1623 | $gd_city = __(geodir_ucwords($gd_city), 'geodirectory'); |
| 1624 | 1624 | } |
| 1625 | 1625 | |
| 1626 | - $list_title .= __(' in', 'geodirectory') . " '" . $gd_city . "'";
|
|
| 1626 | + $list_title .= __(' in', 'geodirectory')." '".$gd_city."'";
|
|
| 1627 | 1627 | } else if ($gd_region != '') {
|
| 1628 | 1628 | if ($gd_region_actual != '') {
|
| 1629 | 1629 | $gd_region = $gd_region_actual; |
@@ -1633,7 +1633,7 @@ discard block |
||
| 1633 | 1633 | $gd_region = __(geodir_ucwords($gd_region), 'geodirectory'); |
| 1634 | 1634 | } |
| 1635 | 1635 | |
| 1636 | - $list_title .= __(' in', 'geodirectory') . " '" . $gd_region . "'";
|
|
| 1636 | + $list_title .= __(' in', 'geodirectory')." '".$gd_region."'";
|
|
| 1637 | 1637 | } else if ($gd_country != '') {
|
| 1638 | 1638 | if ($gd_country_actual != '') {
|
| 1639 | 1639 | $gd_country = $gd_country_actual; |
@@ -1643,12 +1643,12 @@ discard block |
||
| 1643 | 1643 | $gd_country = __(geodir_ucwords($gd_country), 'geodirectory'); |
| 1644 | 1644 | } |
| 1645 | 1645 | |
| 1646 | - $list_title .= __(' in', 'geodirectory') . " '" . $gd_country . "'";
|
|
| 1646 | + $list_title .= __(' in', 'geodirectory')." '".$gd_country."'";
|
|
| 1647 | 1647 | } |
| 1648 | 1648 | } |
| 1649 | 1649 | |
| 1650 | 1650 | if (is_search()) {
|
| 1651 | - $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";
|
|
| 1651 | + $list_title = __('Search', 'geodirectory').' '.__(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory').__(' For :', 'geodirectory')." '".get_search_query()."'";
|
|
| 1652 | 1652 | } |
| 1653 | 1653 | /** This action is documented in geodirectory_template_actions.php */ |
| 1654 | 1654 | $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
@@ -1658,26 +1658,26 @@ discard block |
||
| 1658 | 1658 | |
| 1659 | 1659 | $title = $list_title; |
| 1660 | 1660 | $gd_page = ''; |
| 1661 | - if(geodir_is_page('pt')){
|
|
| 1661 | + if (geodir_is_page('pt')) {
|
|
| 1662 | 1662 | $gd_page = 'pt'; |
| 1663 | - $title = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;
|
|
| 1663 | + $title = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;
|
|
| 1664 | 1664 | } |
| 1665 | - elseif(geodir_is_page('listing')){
|
|
| 1665 | + elseif (geodir_is_page('listing')) {
|
|
| 1666 | 1666 | $gd_page = 'listing'; |
| 1667 | 1667 | global $wp_query; |
| 1668 | 1668 | $current_term = $wp_query->get_queried_object(); |
| 1669 | - if (strpos($current_term->taxonomy,'_tags') !== false) {
|
|
| 1669 | + if (strpos($current_term->taxonomy, '_tags') !== false) {
|
|
| 1670 | 1670 | $title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;
|
| 1671 | - }else{
|
|
| 1671 | + } else {
|
|
| 1672 | 1672 | $title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;
|
| 1673 | 1673 | } |
| 1674 | 1674 | |
| 1675 | 1675 | } |
| 1676 | - elseif(geodir_is_page('author')){
|
|
| 1676 | + elseif (geodir_is_page('author')) {
|
|
| 1677 | 1677 | $gd_page = 'author'; |
| 1678 | - if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){
|
|
| 1678 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 1679 | 1679 | $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;
|
| 1680 | - }else{
|
|
| 1680 | + } else {
|
|
| 1681 | 1681 | $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;
|
| 1682 | 1682 | } |
| 1683 | 1683 | |
@@ -1691,16 +1691,16 @@ discard block |
||
| 1691 | 1691 | * @param string $title The page title including variables. |
| 1692 | 1692 | * @param string $gd_page The GeoDirectory page type if any. |
| 1693 | 1693 | */ |
| 1694 | - $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 1694 | + $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 1695 | 1695 | |
| 1696 | - echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . |
|
| 1696 | + echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'. |
|
| 1697 | 1697 | /** |
| 1698 | 1698 | * Filter the listing page title. |
| 1699 | 1699 | * |
| 1700 | 1700 | * @since 1.0.0 |
| 1701 | 1701 | * @param string $list_title The title for the category page. |
| 1702 | 1702 | */ |
| 1703 | - apply_filters('geodir_listing_page_title', $title) . '</h1></header>';
|
|
| 1703 | + apply_filters('geodir_listing_page_title', $title).'</h1></header>';
|
|
| 1704 | 1704 | } |
| 1705 | 1705 | |
| 1706 | 1706 | add_action('geodir_listings_page_description', 'geodir_action_listings_description', 10);
|
@@ -1719,16 +1719,16 @@ discard block |
||
| 1719 | 1719 | $gd_post_type = geodir_get_current_posttype(); |
| 1720 | 1720 | if (isset($current_term->term_id) && $current_term->term_id != '') {
|
| 1721 | 1721 | |
| 1722 | - $term_desc = term_description($current_term->term_id, $gd_post_type . '_tags'); |
|
| 1722 | + $term_desc = term_description($current_term->term_id, $gd_post_type.'_tags'); |
|
| 1723 | 1723 | $saved_data = stripslashes(geodir_get_tax_meta($current_term->term_id, 'ct_cat_top_desc', false, $gd_post_type)); |
| 1724 | 1724 | if ($term_desc && !$saved_data) {
|
| 1725 | 1725 | $saved_data = $term_desc; |
| 1726 | 1726 | } |
| 1727 | 1727 | |
| 1728 | 1728 | // stop payment manager filtering content length |
| 1729 | - $filter_priority = has_filter( 'the_content', 'geodir_payments_the_content' ); |
|
| 1730 | - if ( false !== $filter_priority ) {
|
|
| 1731 | - remove_filter( 'the_content', 'geodir_payments_the_content', $filter_priority ); |
|
| 1729 | + $filter_priority = has_filter('the_content', 'geodir_payments_the_content');
|
|
| 1730 | + if (false !== $filter_priority) {
|
|
| 1731 | + remove_filter('the_content', 'geodir_payments_the_content', $filter_priority);
|
|
| 1732 | 1732 | } |
| 1733 | 1733 | |
| 1734 | 1734 | /** |
@@ -1742,14 +1742,14 @@ discard block |
||
| 1742 | 1742 | $cat_description = apply_filters('the_content', $saved_data);
|
| 1743 | 1743 | |
| 1744 | 1744 | |
| 1745 | - if ( false !== $filter_priority ) {
|
|
| 1746 | - add_filter( 'the_content', 'geodir_payments_the_content', $filter_priority ); |
|
| 1745 | + if (false !== $filter_priority) {
|
|
| 1746 | + add_filter('the_content', 'geodir_payments_the_content', $filter_priority);
|
|
| 1747 | 1747 | } |
| 1748 | 1748 | |
| 1749 | 1749 | if ($cat_description) {
|
| 1750 | 1750 | ?> |
| 1751 | 1751 | |
| 1752 | - <div class="term_description"><?php echo $cat_description;?></div> <?php |
|
| 1752 | + <div class="term_description"><?php echo $cat_description; ?></div> <?php |
|
| 1753 | 1753 | } |
| 1754 | 1754 | |
| 1755 | 1755 | } |
@@ -1799,13 +1799,13 @@ discard block |
||
| 1799 | 1799 | function geodir_action_sidebar_left_open($type = '', $id = '', $class = '', $itemtype = '') |
| 1800 | 1800 | {
|
| 1801 | 1801 | if ($type == 'home-page' && $width = get_option('geodir_width_home_left_section')) {
|
| 1802 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 1802 | + $width_css = 'style="width:'.$width.'%;"'; |
|
| 1803 | 1803 | } elseif ($type == 'listings-page' && $width = get_option('geodir_width_listing_left_section')) {
|
| 1804 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 1804 | + $width_css = 'style="width:'.$width.'%;"'; |
|
| 1805 | 1805 | } elseif ($type == 'search-page' && $width = get_option('geodir_width_search_left_section')) {
|
| 1806 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 1806 | + $width_css = 'style="width:'.$width.'%;"'; |
|
| 1807 | 1807 | } elseif ($type == 'author-page' && $width = get_option('geodir_width_author_left_section')) {
|
| 1808 | - $width_css = 'style="width:' . $width . '%;"'; |
|
| 1808 | + $width_css = 'style="width:'.$width.'%;"'; |
|
| 1809 | 1809 | } else {
|
| 1810 | 1810 | $width_css = ''; |
| 1811 | 1811 | } |
@@ -2110,11 +2110,11 @@ discard block |
||
| 2110 | 2110 | |
| 2111 | 2111 | $title = apply_filters('geodir_add_listing_page_title_text', get_the_title());
|
| 2112 | 2112 | |
| 2113 | - if(geodir_is_page('add-listing')){
|
|
| 2113 | + if (geodir_is_page('add-listing')) {
|
|
| 2114 | 2114 | $gd_page = 'add-listing'; |
| 2115 | - if(isset($_REQUEST['pid']) && $_REQUEST['pid'] != ''){
|
|
| 2115 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 2116 | 2116 | $title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;
|
| 2117 | - }elseif(isset($listing_type)){
|
|
| 2117 | + }elseif (isset($listing_type)) {
|
|
| 2118 | 2118 | $title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;
|
| 2119 | 2119 | } |
| 2120 | 2120 | |
@@ -2128,9 +2128,9 @@ discard block |
||
| 2128 | 2128 | * @param string $title The page title including variables. |
| 2129 | 2129 | * @param string $gd_page The GeoDirectory page type if any. |
| 2130 | 2130 | */ |
| 2131 | - $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 2131 | + $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 2132 | 2132 | |
| 2133 | - echo '<header class="' . $class_header . '"><h1 class="' . $class . '">'; |
|
| 2133 | + echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'; |
|
| 2134 | 2134 | echo $title; |
| 2135 | 2135 | echo '</h1></header>'; |
| 2136 | 2136 | } |
@@ -2144,7 +2144,7 @@ discard block |
||
| 2144 | 2144 | */ |
| 2145 | 2145 | function geodir_action_add_listing_page_mandatory() |
| 2146 | 2146 | {?>
|
| 2147 | - <p class="geodir-note "><span class="geodir-required">*</span> <?php echo INDICATES_MANDATORY_FIELDS_TEXT;?></p> |
|
| 2147 | + <p class="geodir-note "><span class="geodir-required">*</span> <?php echo INDICATES_MANDATORY_FIELDS_TEXT; ?></p> |
|
| 2148 | 2148 | <?php |
| 2149 | 2149 | } |
| 2150 | 2150 | |
@@ -2179,7 +2179,7 @@ discard block |
||
| 2179 | 2179 | |
| 2180 | 2180 | if (isset($_REQUEST['backandedit'])) {
|
| 2181 | 2181 | global $post; |
| 2182 | - $post = (object)$gd_session->get('listing');
|
|
| 2182 | + $post = (object) $gd_session->get('listing');
|
|
| 2183 | 2183 | $listing_type = $post->listing_type; |
| 2184 | 2184 | $title = $post->post_title; |
| 2185 | 2185 | $desc = $post->post_desc; |
@@ -2194,7 +2194,7 @@ discard block |
||
| 2194 | 2194 | $thumb_img_arr = geodir_get_images($post->ID); |
| 2195 | 2195 | if ($thumb_img_arr) {
|
| 2196 | 2196 | foreach ($thumb_img_arr as $post_img) {
|
| 2197 | - $curImages .= $post_img->src . ','; |
|
| 2197 | + $curImages .= $post_img->src.','; |
|
| 2198 | 2198 | } |
| 2199 | 2199 | } |
| 2200 | 2200 | |
@@ -2202,7 +2202,7 @@ discard block |
||
| 2202 | 2202 | $title = $post->post_title; |
| 2203 | 2203 | $desc = $post->post_content; |
| 2204 | 2204 | $kw_tags = $post->post_tags; |
| 2205 | - $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type . '_tags', array('fields' => 'names')));
|
|
| 2205 | + $kw_tags = implode(",", wp_get_object_terms($post->ID, $listing_type.'_tags', array('fields' => 'names')));
|
|
| 2206 | 2206 | } else {
|
| 2207 | 2207 | $listing_type = sanitize_text_field($_REQUEST['listing_type']); |
| 2208 | 2208 | } |
@@ -2213,20 +2213,20 @@ discard block |
||
| 2213 | 2213 | |
| 2214 | 2214 | $post_type_info = geodir_get_posttype_info($listing_type); |
| 2215 | 2215 | |
| 2216 | - $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing','geodirectory');
|
|
| 2216 | + $cpt_singular_name = (isset($post_type_info['labels']['singular_name']) && $post_type_info['labels']['singular_name']) ? __($post_type_info['labels']['singular_name'], 'geodirectory') : __('Listing', 'geodirectory');
|
|
| 2217 | 2217 | |
| 2218 | 2218 | $package_info = array(); |
| 2219 | 2219 | $package_info = geodir_post_package_info($package_info, $post); |
| 2220 | 2220 | ?> |
| 2221 | - <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id());?>" method="post" enctype="multipart/form-data"> |
|
| 2222 | - <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type);?>"/> |
|
| 2223 | - <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type);?>"/> |
|
| 2221 | + <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id()); ?>" method="post" enctype="multipart/form-data"> |
|
| 2222 | + <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type); ?>"/> |
|
| 2223 | + <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type); ?>"/> |
|
| 2224 | 2224 | <?php if ($page_id) { ?>
|
| 2225 | - <input type="hidden" name="add_listing_page_id" value="<?php echo $page_id;?>"/> |
|
| 2225 | + <input type="hidden" name="add_listing_page_id" value="<?php echo $page_id; ?>"/> |
|
| 2226 | 2226 | <?php } if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') { ?>
|
| 2227 | - <input type="hidden" name="pid" value="<?php echo sanitize_text_field($_REQUEST['pid']);?>"/> |
|
| 2227 | + <input type="hidden" name="pid" value="<?php echo sanitize_text_field($_REQUEST['pid']); ?>"/> |
|
| 2228 | 2228 | <?php } if (isset($_REQUEST['backandedit'])) { ?>
|
| 2229 | - <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']);?>"/> |
|
| 2229 | + <input type="hidden" name="backandedit" value="<?php echo sanitize_text_field($_REQUEST['backandedit']); ?>"/> |
|
| 2230 | 2230 | <?php |
| 2231 | 2231 | } |
| 2232 | 2232 | /** |
@@ -2238,7 +2238,7 @@ discard block |
||
| 2238 | 2238 | */ |
| 2239 | 2239 | do_action('geodir_before_detail_fields');
|
| 2240 | 2240 | ?> |
| 2241 | - <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT;?></h5> |
|
| 2241 | + <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT; ?></h5> |
|
| 2242 | 2242 | <?php |
| 2243 | 2243 | /** |
| 2244 | 2244 | * Called at the top of the add listing page form for frontend. |
@@ -2259,10 +2259,10 @@ discard block |
||
| 2259 | 2259 | * @param string $cpt_singular_name The singular title of the curent CPT. |
| 2260 | 2260 | * @param string $listing_type The CPT being requested. ie: gd_place. |
| 2261 | 2261 | */ |
| 2262 | - echo apply_filters('geodir_add_listing_title_label', sprintf( __('%s Title', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span>*</span> </label>
|
|
| 2262 | + echo apply_filters('geodir_add_listing_title_label', sprintf(__('%s Title', 'geodirectory'), $cpt_singular_name), $cpt_singular_name, $listing_type); ?><span>*</span> </label>
|
|
| 2263 | 2263 | <input type="text" field_type="text" name="post_title" id="post_title" class="geodir_textfield" |
| 2264 | 2264 | value="<?php echo esc_attr(stripslashes($title)); ?>"/> |
| 2265 | - <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory');?></span> |
|
| 2265 | + <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span> |
|
| 2266 | 2266 | </div> |
| 2267 | 2267 | <?php |
| 2268 | 2268 | $show_editor = get_option('geodir_tiny_editor_on_add_listing');
|
@@ -2308,7 +2308,7 @@ discard block |
||
| 2308 | 2308 | $desc_limit_msg = apply_filters('geodir_description_field_desc_limit_msg', $desc_limit_msg, $desc_limit);
|
| 2309 | 2309 | |
| 2310 | 2310 | $desc_class = ''; |
| 2311 | - if ($desc_limit === '' || (int)$desc_limit > 0) {
|
|
| 2311 | + if ($desc_limit === '' || (int) $desc_limit > 0) {
|
|
| 2312 | 2312 | /** |
| 2313 | 2313 | * Called on the add listing page form for frontend just before the description field. |
| 2314 | 2314 | * |
@@ -2321,7 +2321,7 @@ discard block |
||
| 2321 | 2321 | $desc_class = ' hidden'; |
| 2322 | 2322 | } |
| 2323 | 2323 | ?> |
| 2324 | - <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class;?>"> |
|
| 2324 | + <div id="geodir_post_desc_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $desc_class; ?>"> |
|
| 2325 | 2325 | <label><?php |
| 2326 | 2326 | /** |
| 2327 | 2327 | * Filter the add listing page description input label. |
@@ -2331,7 +2331,7 @@ discard block |
||
| 2331 | 2331 | * @param string $cpt_singular_name The singular title of the curent CPT. |
| 2332 | 2332 | * @param string $listing_type The CPT being requested. ie: gd_place. |
| 2333 | 2333 | */ |
| 2334 | - echo apply_filters('geodir_add_listing_description_label',sprintf( __('%s Description', 'geodirectory'), $cpt_singular_name ),$cpt_singular_name,$listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>
|
|
| 2334 | + echo apply_filters('geodir_add_listing_description_label', sprintf(__('%s Description', 'geodirectory'), $cpt_singular_name), $cpt_singular_name, $listing_type); ?><span><?php if ($desc_limit != '0') { echo '*'; } ?></span> </label>
|
|
| 2335 | 2335 | <?php |
| 2336 | 2336 | if ($show_editor) {
|
| 2337 | 2337 | $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
|
@@ -2340,16 +2340,16 @@ discard block |
||
| 2340 | 2340 | <?php wp_editor($desc, "post_desc", $editor_settings); ?> |
| 2341 | 2341 | </div> |
| 2342 | 2342 | <?php if ($desc_limit != '') { ?>
|
| 2343 | - <script type="text/javascript">jQuery('textarea#post_desc').attr('maxlength', "<?php echo $desc_limit;?>");</script>
|
|
| 2343 | + <script type="text/javascript">jQuery('textarea#post_desc').attr('maxlength', "<?php echo $desc_limit; ?>");</script>
|
|
| 2344 | 2344 | <?php } } else { ?>
|
| 2345 | 2345 | <textarea field_type="textarea" name="post_desc" id="post_desc" class="geodir_textarea" maxlength="<?php echo $desc_limit; ?>"><?php echo $desc; ?></textarea> |
| 2346 | 2346 | <?php } if ($desc_limit_msg != '') { ?>
|
| 2347 | 2347 | <span class="geodir_message_note"><?php echo $desc_limit_msg; ?></span> |
| 2348 | 2348 | <?php } ?> |
| 2349 | - <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory');?></span> |
|
| 2349 | + <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory'); ?></span> |
|
| 2350 | 2350 | </div> |
| 2351 | 2351 | <?php |
| 2352 | - if ($desc_limit === '' || (int)$desc_limit > 0) {
|
|
| 2352 | + if ($desc_limit === '' || (int) $desc_limit > 0) {
|
|
| 2353 | 2353 | /** |
| 2354 | 2354 | * Called on the add listing page form for frontend just after the description field. |
| 2355 | 2355 | * |
@@ -2388,7 +2388,7 @@ discard block |
||
| 2388 | 2388 | $kw_tags_msg = apply_filters('geodir_listing_tags_field_tags_msg', $kw_tags_msg, $kw_tags_count);
|
| 2389 | 2389 | |
| 2390 | 2390 | $tags_class = ''; |
| 2391 | - if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {
|
|
| 2391 | + if ($kw_tags_count === '' || (int) $kw_tags_count > 0) {
|
|
| 2392 | 2392 | /** |
| 2393 | 2393 | * Called on the add listing page form for frontend just before the tags field. |
| 2394 | 2394 | * |
@@ -2399,14 +2399,14 @@ discard block |
||
| 2399 | 2399 | $tags_class = ' hidden'; |
| 2400 | 2400 | } |
| 2401 | 2401 | ?> |
| 2402 | - <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class;?>"> |
|
| 2402 | + <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details<?php echo $tags_class; ?>"> |
|
| 2403 | 2403 | <label><?php echo TAGKW_TEXT; ?></label> |
| 2404 | 2404 | <input name="post_tags" id="post_tags" value="<?php echo $kw_tags; ?>" type="text" class="geodir_textfield" |
| 2405 | - maxlength="<?php echo $kw_tags_count;?>"/> |
|
| 2406 | - <span class="geodir_message_note"><?php echo $kw_tags_msg;?></span> |
|
| 2405 | + maxlength="<?php echo $kw_tags_count; ?>"/> |
|
| 2406 | + <span class="geodir_message_note"><?php echo $kw_tags_msg; ?></span> |
|
| 2407 | 2407 | </div> |
| 2408 | 2408 | <?php |
| 2409 | - if ($kw_tags_count === '' || (int)$kw_tags_count > 0) {
|
|
| 2409 | + if ($kw_tags_count === '' || (int) $kw_tags_count > 0) {
|
|
| 2410 | 2410 | /** |
| 2411 | 2411 | * Called on the add listing page form for frontend just after the tags field. |
| 2412 | 2412 | * |
@@ -2432,7 +2432,7 @@ discard block |
||
| 2432 | 2432 | $thumb_img_arr = array(); |
| 2433 | 2433 | $totImg = 0; |
| 2434 | 2434 | if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {
|
| 2435 | - $post = (object)$gd_session->get('listing');
|
|
| 2435 | + $post = (object) $gd_session->get('listing');
|
|
| 2436 | 2436 | if (isset($post->post_images)) |
| 2437 | 2437 | $curImages = trim($post->post_images, ","); |
| 2438 | 2438 | |
@@ -2445,7 +2445,7 @@ discard block |
||
| 2445 | 2445 | $listing_type = $post->listing_type; |
| 2446 | 2446 | |
| 2447 | 2447 | } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
| 2448 | - $post = geodir_get_post_info((int)$_REQUEST['pid']); |
|
| 2448 | + $post = geodir_get_post_info((int) $_REQUEST['pid']); |
|
| 2449 | 2449 | $listing_type = $post->post_type; |
| 2450 | 2450 | $thumb_img_arr = geodir_get_images($_REQUEST['pid']); |
| 2451 | 2451 | |
@@ -2459,7 +2459,7 @@ discard block |
||
| 2459 | 2459 | //$curImages = $img->src.","; |
| 2460 | 2460 | } |
| 2461 | 2461 | |
| 2462 | - $totImg = count((array)$thumb_img_arr); |
|
| 2462 | + $totImg = count((array) $thumb_img_arr); |
|
| 2463 | 2463 | } |
| 2464 | 2464 | |
| 2465 | 2465 | if ($curImages != '') |
@@ -2480,15 +2480,15 @@ discard block |
||
| 2480 | 2480 | if ($show_image_input_box) {
|
| 2481 | 2481 | ?> |
| 2482 | 2482 | |
| 2483 | - <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT;?> |
|
| 2483 | + <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT; ?> |
|
| 2484 | 2484 | <?php if ($image_limit == 1) {
|
| 2485 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
|
|
| 2485 | + echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('image with this package', 'geodirectory').')</small>';
|
|
| 2486 | 2486 | } ?> |
| 2487 | 2487 | <?php if ($image_limit > 1) {
|
| 2488 | - echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
|
|
| 2488 | + echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('images with this package', 'geodirectory').')</small>';
|
|
| 2489 | 2489 | } ?> |
| 2490 | 2490 | <?php if ($image_limit == '') {
|
| 2491 | - echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
|
|
| 2491 | + echo '<br /><small>('.__('You can upload unlimited images with this package', 'geodirectory').')</small>';
|
|
| 2492 | 2492 | } ?> |
| 2493 | 2493 | </h5> |
| 2494 | 2494 | |
@@ -2503,11 +2503,11 @@ discard block |
||
| 2503 | 2503 | <div |
| 2504 | 2504 | class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>" |
| 2505 | 2505 | id="<?php echo $id; ?>plupload-upload-ui"> |
| 2506 | - <h4><?php _e('Drop files to upload', 'geodirectory');?></h4><br/>
|
|
| 2506 | + <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4><br/>
|
|
| 2507 | 2507 | <input id="<?php echo $id; ?>plupload-browse-button" type="button" |
| 2508 | 2508 | value="<?php esc_attr_e('Select Files', 'geodirectory'); ?>" class="geodir_button"/>
|
| 2509 | 2509 | <span class="ajaxnonceplu" |
| 2510 | - id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span> |
|
| 2510 | + id="ajaxnonceplu<?php echo wp_create_nonce($id.'pluploadan'); ?>"></span> |
|
| 2511 | 2511 | <?php if ($width && $height): ?> |
| 2512 | 2512 | <span class="plupload-resize"></span> |
| 2513 | 2513 | <span class="plupload-width" id="plupload-width<?php echo $width; ?>"></span> |
@@ -2520,7 +2520,7 @@ discard block |
||
| 2520 | 2520 | id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;"> |
| 2521 | 2521 | </div> |
| 2522 | 2522 | <span |
| 2523 | - id="upload-msg"><?php _e('Please drag & drop the images to rearrange the order', 'geodirectory');?></span>
|
|
| 2523 | + id="upload-msg"><?php _e('Please drag & drop the images to rearrange the order', 'geodirectory'); ?></span>
|
|
| 2524 | 2524 | <span id="<?php echo $id; ?>upload-error" style="display:none"></span> |
| 2525 | 2525 | </div> |
| 2526 | 2526 | |
@@ -2532,7 +2532,7 @@ discard block |
||
| 2532 | 2532 | * |
| 2533 | 2533 | * @since 1.0.0 |
| 2534 | 2534 | */ |
| 2535 | - do_action('geodir_after_main_form_fields');?>
|
|
| 2535 | + do_action('geodir_after_main_form_fields'); ?>
|
|
| 2536 | 2536 | |
| 2537 | 2537 | |
| 2538 | 2538 | <!-- add captcha code --> |
@@ -2543,7 +2543,7 @@ discard block |
||
| 2543 | 2543 | </script> |
| 2544 | 2544 | <noscript> |
| 2545 | 2545 | <div> |
| 2546 | - <label><?php _e('Type 64 into this box', 'geodirectory');?></label>
|
|
| 2546 | + <label><?php _e('Type 64 into this box', 'geodirectory'); ?></label>
|
|
| 2547 | 2547 | <input type="text" id="geodir_spamblocker_top_form" name="geodir_spamblocker" value="" maxlength="10"/> |
| 2548 | 2548 | </div> |
| 2549 | 2549 | </noscript> |
@@ -2553,10 +2553,10 @@ discard block |
||
| 2553 | 2553 | <!-- end captcha code --> |
| 2554 | 2554 | |
| 2555 | 2555 | <div id="geodir-add-listing-submit" class="geodir_form_row clear_both" style="padding:2px;text-align:center;"> |
| 2556 | - <input type="submit" value="<?php echo PRO_PREVIEW_BUTTON;?>" |
|
| 2557 | - class="geodir_button" <?php echo $submit_button;?>/> |
|
| 2556 | + <input type="submit" value="<?php echo PRO_PREVIEW_BUTTON; ?>" |
|
| 2557 | + class="geodir_button" <?php echo $submit_button; ?>/> |
|
| 2558 | 2558 | <span class="geodir_message_note" |
| 2559 | - style="padding-left:0px;"> <?php _e('Note: You will be able to see a preview in the next page', 'geodirectory');?></span>
|
|
| 2559 | + style="padding-left:0px;"> <?php _e('Note: You will be able to see a preview in the next page', 'geodirectory'); ?></span>
|
|
| 2560 | 2560 | </div> |
| 2561 | 2561 | |
| 2562 | 2562 | </form> |
@@ -2618,7 +2618,7 @@ discard block |
||
| 2618 | 2618 | class="<?php |
| 2619 | 2619 | /** This action is documented in geodirectory_template_actions.php */ |
| 2620 | 2620 | echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">
|
| 2621 | - <?php dynamic_sidebar('Reg/Login Top Section');?>
|
|
| 2621 | + <?php dynamic_sidebar('Reg/Login Top Section'); ?>
|
|
| 2622 | 2622 | </div><!-- clearfix ends here--> |
| 2623 | 2623 | <?php |
| 2624 | 2624 | } |
@@ -2638,11 +2638,11 @@ discard block |
||
| 2638 | 2638 | |
| 2639 | 2639 | global $user_login; |
| 2640 | 2640 | |
| 2641 | - $is_enable_signup = get_option( 'users_can_register' ); |
|
| 2641 | + $is_enable_signup = get_option('users_can_register');
|
|
| 2642 | 2642 | |
| 2643 | 2643 | ?> |
| 2644 | 2644 | <script type="text/javascript"> |
| 2645 | - <?php if ( $user_login ) { ?>
|
|
| 2645 | + <?php if ($user_login) { ?>
|
|
| 2646 | 2646 | setTimeout(function () {
|
| 2647 | 2647 | try {
|
| 2648 | 2648 | d = document.getElementById('user_pass');
|
@@ -2659,7 +2659,7 @@ discard block |
||
| 2659 | 2659 | <?php } ?> |
| 2660 | 2660 | </script> |
| 2661 | 2661 | <script type="text/javascript"> |
| 2662 | - <?php if ( $user_login ) { ?>
|
|
| 2662 | + <?php if ($user_login) { ?>
|
|
| 2663 | 2663 | setTimeout(function () {
|
| 2664 | 2664 | try {
|
| 2665 | 2665 | d = document.getElementById('user_pass');
|
@@ -2684,7 +2684,7 @@ discard block |
||
| 2684 | 2684 | foreach ($errors as $errorsObj) {
|
| 2685 | 2685 | foreach ($errorsObj as $key => $val) {
|
| 2686 | 2686 | for ($i = 0; $i < count($val); $i++) {
|
| 2687 | - echo "<div class=error_msg_fix>" . $val[$i] . '</div>'; |
|
| 2687 | + echo "<div class=error_msg_fix>".$val[$i].'</div>'; |
|
| 2688 | 2688 | $registration_error_msg = 1; |
| 2689 | 2689 | } |
| 2690 | 2690 | } |
@@ -2701,10 +2701,10 @@ discard block |
||
| 2701 | 2701 | * |
| 2702 | 2702 | * @since 1.0.0 |
| 2703 | 2703 | */ |
| 2704 | - include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?> |
|
| 2704 | + include(geodir_plugin_path()."/geodirectory-templates/login_frm.php"); ?> |
|
| 2705 | 2705 | </div> |
| 2706 | 2706 | |
| 2707 | - <?php } elseif (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_up' && $is_enable_signup ) { ?>
|
|
| 2707 | + <?php } elseif (isset($_REQUEST['page']) && $_REQUEST['page'] == 'login' && isset($_REQUEST['page1']) && $_REQUEST['page1'] == 'sign_up' && $is_enable_signup) { ?>
|
|
| 2708 | 2708 | |
| 2709 | 2709 | <div class="registration_form"> |
| 2710 | 2710 | <?php |
@@ -2713,7 +2713,7 @@ discard block |
||
| 2713 | 2713 | * |
| 2714 | 2714 | * @since 1.0.0 |
| 2715 | 2715 | */ |
| 2716 | - include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?> |
|
| 2716 | + include(geodir_plugin_path()."/geodirectory-templates/reg_frm.php"); ?> |
|
| 2717 | 2717 | </div> |
| 2718 | 2718 | |
| 2719 | 2719 | <?php } else { ?>
|
@@ -2725,10 +2725,10 @@ discard block |
||
| 2725 | 2725 | * |
| 2726 | 2726 | * @since 1.0.0 |
| 2727 | 2727 | */ |
| 2728 | - include(geodir_plugin_path() . "/geodirectory-templates/login_frm.php"); ?> |
|
| 2728 | + include(geodir_plugin_path()."/geodirectory-templates/login_frm.php"); ?> |
|
| 2729 | 2729 | </div> |
| 2730 | 2730 | |
| 2731 | - <?php if ( $is_enable_signup ) { ?>
|
|
| 2731 | + <?php if ($is_enable_signup) { ?>
|
|
| 2732 | 2732 | <div class="registration_form_r"> |
| 2733 | 2733 | <?php |
| 2734 | 2734 | /** |
@@ -2736,7 +2736,7 @@ discard block |
||
| 2736 | 2736 | * |
| 2737 | 2737 | * @since 1.0.0 |
| 2738 | 2738 | */ |
| 2739 | - include(geodir_plugin_path() . "/geodirectory-templates/reg_frm.php"); ?> |
|
| 2739 | + include(geodir_plugin_path()."/geodirectory-templates/reg_frm.php"); ?> |
|
| 2740 | 2740 | </div> |
| 2741 | 2741 | <?php } ?> |
| 2742 | 2742 | |
@@ -2773,12 +2773,12 @@ discard block |
||
| 2773 | 2773 | $gd_post_type = geodir_get_current_posttype(); |
| 2774 | 2774 | $post_type_info = get_post_type_object($gd_post_type); |
| 2775 | 2775 | |
| 2776 | - $add_string_in_title = __('All', 'geodirectory') . ' ';
|
|
| 2776 | + $add_string_in_title = __('All', 'geodirectory').' ';
|
|
| 2777 | 2777 | if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
| 2778 | - $add_string_in_title = __('My Favorite', 'geodirectory') . ' ';
|
|
| 2778 | + $add_string_in_title = __('My Favorite', 'geodirectory').' ';
|
|
| 2779 | 2779 | } |
| 2780 | 2780 | |
| 2781 | - $list_title = $add_string_in_title . $post_type_info->labels->name; |
|
| 2781 | + $list_title = $add_string_in_title.$post_type_info->labels->name; |
|
| 2782 | 2782 | $single_name = $post_type_info->labels->singular_name; |
| 2783 | 2783 | |
| 2784 | 2784 | $taxonomy = geodir_get_taxonomies($gd_post_type); |
@@ -2786,12 +2786,12 @@ discard block |
||
| 2786 | 2786 | if (!empty($term)) {
|
| 2787 | 2787 | $current_term = get_term_by('slug', $term, $taxonomy[0]);
|
| 2788 | 2788 | if (!empty($current_term)) |
| 2789 | - $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";
|
|
| 2789 | + $list_title .= __(' in', 'geodirectory')." '".geodir_ucwords($current_term->name)."'";
|
|
| 2790 | 2790 | } |
| 2791 | 2791 | |
| 2792 | 2792 | |
| 2793 | 2793 | if (is_search()) {
|
| 2794 | - $list_title = __('Search', 'geodirectory') . ' ' . __($post_type_info->labels->name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";
|
|
| 2794 | + $list_title = __('Search', 'geodirectory').' '.__($post_type_info->labels->name, 'geodirectory').__(' For :', 'geodirectory')." '".get_search_query()."'";
|
|
| 2795 | 2795 | |
| 2796 | 2796 | } |
| 2797 | 2797 | /** This action is documented in geodirectory_template_actions.php */ |
@@ -2800,11 +2800,11 @@ discard block |
||
| 2800 | 2800 | $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
| 2801 | 2801 | |
| 2802 | 2802 | $title = $list_title; |
| 2803 | - if(geodir_is_page('author')){
|
|
| 2803 | + if (geodir_is_page('author')) {
|
|
| 2804 | 2804 | $gd_page = 'author'; |
| 2805 | - if(isset($_REQUEST['list']) && $_REQUEST['list']=='favourite'){
|
|
| 2805 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 2806 | 2806 | $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;
|
| 2807 | - }else{
|
|
| 2807 | + } else {
|
|
| 2808 | 2808 | $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;
|
| 2809 | 2809 | } |
| 2810 | 2810 | |
@@ -2818,16 +2818,16 @@ discard block |
||
| 2818 | 2818 | * @param string $title The page title including variables. |
| 2819 | 2819 | * @param string $gd_page The GeoDirectory page type if any. |
| 2820 | 2820 | */ |
| 2821 | - $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 2821 | + $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);
|
|
| 2822 | 2822 | |
| 2823 | - echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . |
|
| 2823 | + echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'. |
|
| 2824 | 2824 | /** |
| 2825 | 2825 | * Filter the author page title text. |
| 2826 | 2826 | * |
| 2827 | 2827 | * @since 1.0.0 |
| 2828 | 2828 | * @param string $list_title The title for the page. |
| 2829 | 2829 | */ |
| 2830 | - apply_filters('geodir_author_page_title_text', $title) . '</h1></header>';
|
|
| 2830 | + apply_filters('geodir_author_page_title_text', $title).'</h1></header>';
|
|
| 2831 | 2831 | } |
| 2832 | 2832 | |
| 2833 | 2833 | |
@@ -3032,19 +3032,19 @@ discard block |
||
| 3032 | 3032 | $post_type_info = get_post_type_object($gd_post_type); |
| 3033 | 3033 | |
| 3034 | 3034 | $pt_name = ''; |
| 3035 | - if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}
|
|
| 3035 | + if (isset($post_type_info->labels->name)) {$pt_name = $post_type_info->labels->name; }
|
|
| 3036 | 3036 | |
| 3037 | 3037 | if (is_search()) {
|
| 3038 | - $list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";
|
|
| 3038 | + $list_title = __('Search', 'geodirectory').' '.__($pt_name, 'geodirectory').__(' For :', 'geodirectory')." '".get_search_query()."'";
|
|
| 3039 | 3039 | |
| 3040 | 3040 | } |
| 3041 | 3041 | /** This action is documented in geodirectory_template_actions.php */ |
| 3042 | 3042 | $class = apply_filters('geodir_page_title_class', 'entry-title fn');
|
| 3043 | 3043 | /** This action is documented in geodirectory_template_actions.php */ |
| 3044 | 3044 | $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');
|
| 3045 | - echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' . |
|
| 3045 | + echo '<header class="'.$class_header.'"><h1 class="'.$class.'">'. |
|
| 3046 | 3046 | /** This action is documented in geodirectory_template_actions.php */ |
| 3047 | - apply_filters('geodir_listing_page_title', wptexturize($list_title)) . '</h1></header>';
|
|
| 3047 | + apply_filters('geodir_listing_page_title', wptexturize($list_title)).'</h1></header>';
|
|
| 3048 | 3048 | } |
| 3049 | 3049 | |
| 3050 | 3050 | // action for adding the listings page top widget area |
@@ -3448,7 +3448,7 @@ discard block |
||
| 3448 | 3448 | $gd_post_type = geodir_get_current_posttype(); |
| 3449 | 3449 | $post_type_info = get_post_type_object($gd_post_type); |
| 3450 | 3450 | |
| 3451 | - $list_title = __('Search', 'geodirectory') . ' ' . __(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory') . __(' :', 'geodirectory');
|
|
| 3451 | + $list_title = __('Search', 'geodirectory').' '.__(geodir_utf8_ucfirst($post_type_info->labels->name), 'geodirectory').__(' :', 'geodirectory');
|
|
| 3452 | 3452 | } |
| 3453 | 3453 | return $list_title; |
| 3454 | 3454 | } |
@@ -3465,7 +3465,7 @@ discard block |
||
| 3465 | 3465 | * @param string $position Position to add the post content. 'before' or 'after'. Default 'before'. |
| 3466 | 3466 | * @param string $gd_page The geodirectory page type. Default null. |
| 3467 | 3467 | */ |
| 3468 | -function geodir_add_page_content( $position = 'before', $gd_page = '' ) {
|
|
| 3468 | +function geodir_add_page_content($position = 'before', $gd_page = '') {
|
|
| 3469 | 3469 | global $post; |
| 3470 | 3470 | |
| 3471 | 3471 | $gd_page_id = NULL; |
@@ -3542,17 +3542,17 @@ discard block |
||
| 3542 | 3542 | * @param WP_Post $post WP_Post object. |
| 3543 | 3543 | * @return string Filtered SQL JOIN clause. |
| 3544 | 3544 | */ |
| 3545 | -function geodir_previous_next_post_join( $join, $in_same_term, $excluded_terms, $taxonomy, $post ) {
|
|
| 3545 | +function geodir_previous_next_post_join($join, $in_same_term, $excluded_terms, $taxonomy, $post) {
|
|
| 3546 | 3546 | global $plugin_prefix; |
| 3547 | 3547 | |
| 3548 | - if ( !empty($post->post_type) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 3549 | - $join .= " INNER JOIN " . $plugin_prefix . $post->post_type . "_detail AS gd ON gd.post_id = p.ID"; |
|
| 3548 | + if (!empty($post->post_type) && in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 3549 | + $join .= " INNER JOIN ".$plugin_prefix.$post->post_type."_detail AS gd ON gd.post_id = p.ID"; |
|
| 3550 | 3550 | } |
| 3551 | 3551 | |
| 3552 | 3552 | return $join; |
| 3553 | 3553 | } |
| 3554 | -add_filter( 'get_previous_post_join', 'geodir_previous_next_post_join', 10, 5 ); |
|
| 3555 | -add_filter( 'get_next_post_join', 'geodir_previous_next_post_join', 10, 5 ); |
|
| 3554 | +add_filter('get_previous_post_join', 'geodir_previous_next_post_join', 10, 5);
|
|
| 3555 | +add_filter('get_next_post_join', 'geodir_previous_next_post_join', 10, 5);
|
|
| 3556 | 3556 | |
| 3557 | 3557 | /** |
| 3558 | 3558 | * Filters the WHERE clause in the SQL for an adjacent post query. |
@@ -3570,32 +3570,32 @@ discard block |
||
| 3570 | 3570 | * @param WP_Post $post WP_Post object. |
| 3571 | 3571 | * @return string Filtered SQL WHERE clause. |
| 3572 | 3572 | */ |
| 3573 | -function geodir_previous_next_post_where( $where, $in_same_term, $excluded_terms, $taxonomy, $post ) {
|
|
| 3573 | +function geodir_previous_next_post_where($where, $in_same_term, $excluded_terms, $taxonomy, $post) {
|
|
| 3574 | 3574 | global $wpdb, $plugin_prefix; |
| 3575 | 3575 | |
| 3576 | - if ( !empty($post->post_type) && ( !empty( $post->country_slug ) || !empty( $post->region_slug ) || !empty( $post->city_slug ) ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {
|
|
| 3576 | + if (!empty($post->post_type) && (!empty($post->country_slug) || !empty($post->region_slug) || !empty($post->city_slug)) && in_array($post->post_type, geodir_get_posttypes())) {
|
|
| 3577 | 3577 | $post_locations = ''; |
| 3578 | 3578 | $post_locations_var = array(); |
| 3579 | 3579 | |
| 3580 | - if ( !empty( $post->country_slug ) ) {
|
|
| 3580 | + if (!empty($post->country_slug)) {
|
|
| 3581 | 3581 | $post_locations .= " AND post_locations LIKE %s"; |
| 3582 | - $post_locations_var[] = "%,[" . $post->country_slug . "]"; |
|
| 3582 | + $post_locations_var[] = "%,[".$post->country_slug."]"; |
|
| 3583 | 3583 | } |
| 3584 | 3584 | |
| 3585 | - if ( !empty( $post->region_slug ) ) {
|
|
| 3585 | + if (!empty($post->region_slug)) {
|
|
| 3586 | 3586 | $post_locations .= " AND post_locations LIKE %s"; |
| 3587 | - $post_locations_var[] = "%,[" . $post->region_slug . "],%"; |
|
| 3587 | + $post_locations_var[] = "%,[".$post->region_slug."],%"; |
|
| 3588 | 3588 | } |
| 3589 | 3589 | |
| 3590 | - if ( !empty( $post->city_slug ) ) {
|
|
| 3590 | + if (!empty($post->city_slug)) {
|
|
| 3591 | 3591 | $post_locations .= " AND post_locations LIKE %s"; |
| 3592 | - $post_locations_var[] = "[" . $post->city_slug . "],%"; |
|
| 3592 | + $post_locations_var[] = "[".$post->city_slug."],%"; |
|
| 3593 | 3593 | } |
| 3594 | 3594 | |
| 3595 | - $where .= $wpdb->prepare( $post_locations, $post_locations_var ); |
|
| 3595 | + $where .= $wpdb->prepare($post_locations, $post_locations_var); |
|
| 3596 | 3596 | } |
| 3597 | 3597 | |
| 3598 | 3598 | return $where; |
| 3599 | 3599 | } |
| 3600 | -add_filter( 'get_previous_post_where', 'geodir_previous_next_post_where', 10, 5 ); |
|
| 3601 | -add_filter( 'get_next_post_where', 'geodir_previous_next_post_where', 10, 5 ); |
|
| 3602 | 3600 | \ No newline at end of file |
| 3601 | +add_filter('get_previous_post_where', 'geodir_previous_next_post_where', 10, 5);
|
|
| 3602 | +add_filter('get_next_post_where', 'geodir_previous_next_post_where', 10, 5); |
|
| 3603 | 3603 | \ No newline at end of file |
