@@ -40,8 +40,9 @@ |
||
40 | 40 | $geodir_active_nav_locations = get_nav_menu_locations(); |
41 | 41 | if (!empty($geodir_active_nav_locations) && is_array($geodir_active_nav_locations)) { |
42 | 42 | foreach ($geodir_active_nav_locations as $key => $theme_location) { |
43 | - if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations)) |
|
44 | - $post_type_arr[$key] = $geodir_all_nav_locations[$key]; |
|
43 | + if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations)) { |
|
44 | + $post_type_arr[$key] = $geodir_all_nav_locations[$key]; |
|
45 | + } |
|
45 | 46 | } |
46 | 47 | } |
47 | 48 |
@@ -204,8 +204,9 @@ discard block |
||
204 | 204 | ############################################################# |
205 | 205 | function manage_category_custom_fields($deprecated, $column_name, $term_id) |
206 | 206 | { |
207 | - if ($column_name == 'cat_ID_num') |
|
208 | - echo $term_id; |
|
207 | + if ($column_name == 'cat_ID_num') { |
|
208 | + echo $term_id; |
|
209 | + } |
|
209 | 210 | |
210 | 211 | if ($column_name == 'cat_icon') { |
211 | 212 | $term_icon_url = get_tax_meta($term_id, 'ct_cat_icon'); |
@@ -214,9 +215,9 @@ discard block |
||
214 | 215 | |
215 | 216 | $file_info = pathinfo($term_icon_url['src']); |
216 | 217 | |
217 | - if (isset($file_info['dirname'] ) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
218 | - $sub_dir = $file_info['dirname']; |
|
219 | - else{$sub_dir = '';} |
|
218 | + if (isset($file_info['dirname'] ) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..') { |
|
219 | + $sub_dir = $file_info['dirname']; |
|
220 | + } else{$sub_dir = '';} |
|
220 | 221 | |
221 | 222 | $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
222 | 223 | $uploads_baseurl = $uploads['baseurl']; |
@@ -236,8 +237,9 @@ discard block |
||
236 | 237 | |
237 | 238 | if ($column_name == 'cat_default_img') { |
238 | 239 | $cat_default_img = get_tax_meta($term_id, 'ct_cat_default_img'); |
239 | - if ($cat_default_img != '') |
|
240 | - echo '<img src="' . $cat_default_img['src'] . '" style="max-height:60px;max-width:60px;"/>'; |
|
240 | + if ($cat_default_img != '') { |
|
241 | + echo '<img src="' . $cat_default_img['src'] . '" style="max-height:60px;max-width:60px;"/>'; |
|
242 | + } |
|
241 | 243 | |
242 | 244 | } |
243 | 245 | } |
@@ -245,11 +247,12 @@ discard block |
||
245 | 247 | function geodir_get_default_catimage($term_id, $post_type = 'gd_place') |
246 | 248 | { |
247 | 249 | |
248 | - if ($cat_default_img = get_tax_meta($term_id, 'ct_cat_default_img', '', $post_type)) |
|
249 | - return $cat_default_img; |
|
250 | - else |
|
251 | - return false; |
|
252 | -} |
|
250 | + if ($cat_default_img = get_tax_meta($term_id, 'ct_cat_default_img', '', $post_type)) { |
|
251 | + return $cat_default_img; |
|
252 | + } else { |
|
253 | + return false; |
|
254 | + } |
|
255 | + } |
|
253 | 256 | |
254 | 257 | //Clear custom fields |
255 | 258 | add_action('in_admin_footer', 'geodir_tax_meta_clear_custom_field'); |
@@ -106,24 +106,30 @@ discard block |
||
106 | 106 | $listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix'])); |
107 | 107 | |
108 | 108 | if ($post_type == 'gd_place') { |
109 | - if (array_key_exists('has_archive', $args)) |
|
110 | - $args['has_archive'] = $listing_slug; |
|
109 | + if (array_key_exists('has_archive', $args)) { |
|
110 | + $args['has_archive'] = $listing_slug; |
|
111 | + } |
|
111 | 112 | |
112 | 113 | if (array_key_exists('rewrite', $args)) { |
113 | - if (array_key_exists('slug', $args['rewrite'])) |
|
114 | - $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%'; |
|
114 | + if (array_key_exists('slug', $args['rewrite'])) { |
|
115 | + $args['rewrite']['slug'] = $listing_slug; |
|
116 | + } |
|
117 | + // . '/%gd_taxonomy%'; |
|
115 | 118 | } |
116 | 119 | |
117 | 120 | $geodir_post_types = get_option('geodir_post_types'); |
118 | 121 | |
119 | 122 | if (array_key_exists($post_type, $geodir_post_types)) { |
120 | 123 | |
121 | - if (array_key_exists('has_archive', $geodir_post_types[$post_type])) |
|
122 | - $geodir_post_types[$post_type]['has_archive'] = $listing_slug; |
|
124 | + if (array_key_exists('has_archive', $geodir_post_types[$post_type])) { |
|
125 | + $geodir_post_types[$post_type]['has_archive'] = $listing_slug; |
|
126 | + } |
|
123 | 127 | |
124 | - if (array_key_exists('rewrite', $geodir_post_types[$post_type])) |
|
125 | - if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite'])) |
|
126 | - $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%'; |
|
128 | + if (array_key_exists('rewrite', $geodir_post_types[$post_type])) { |
|
129 | + if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite'])) |
|
130 | + $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug; |
|
131 | + } |
|
132 | + // . '/%gd_taxonomy%'; |
|
127 | 133 | |
128 | 134 | update_option('geodir_post_types', $geodir_post_types); |
129 | 135 | |
@@ -138,10 +144,11 @@ discard block |
||
138 | 144 | if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) { |
139 | 145 | $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug; |
140 | 146 | |
141 | - if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category'])) |
|
142 | - if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args'])) |
|
147 | + if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category'])) { |
|
148 | + if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args'])) |
|
143 | 149 | if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite'])) |
144 | - $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug; |
|
150 | + $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug; |
|
151 | + } |
|
145 | 152 | |
146 | 153 | update_option('geodir_taxonomies', $geodir_taxonomies); |
147 | 154 | |
@@ -152,10 +159,11 @@ discard block |
||
152 | 159 | if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) { |
153 | 160 | $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags'; |
154 | 161 | |
155 | - if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags'])) |
|
156 | - if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args'])) |
|
162 | + if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags'])) { |
|
163 | + if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args'])) |
|
157 | 164 | if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite'])) |
158 | - $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags'; |
|
165 | + $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags'; |
|
166 | + } |
|
159 | 167 | |
160 | 168 | update_option('geodir_taxonomies', $geodir_taxonomies_tag); |
161 | 169 | |
@@ -221,8 +229,9 @@ discard block |
||
221 | 229 | global $wpdb; |
222 | 230 | $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page)); |
223 | 231 | } |
224 | - if (!isset($location_prefix)) |
|
225 | - $location_prefix = 'location'; |
|
232 | + if (!isset($location_prefix)) { |
|
233 | + $location_prefix = 'location'; |
|
234 | + } |
|
226 | 235 | |
227 | 236 | $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active. |
228 | 237 | if ($location_manager) { |
@@ -441,14 +450,17 @@ discard block |
||
441 | 450 | $gd_country = ''; |
442 | 451 | $gd_region = ''; |
443 | 452 | $gd_city = ''; |
444 | - if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') |
|
445 | - $gd_country = urldecode($wp->query_vars['gd_country']); |
|
453 | + if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') { |
|
454 | + $gd_country = urldecode($wp->query_vars['gd_country']); |
|
455 | + } |
|
446 | 456 | |
447 | - if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') |
|
448 | - $gd_region = urldecode($wp->query_vars['gd_region']); |
|
457 | + if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') { |
|
458 | + $gd_region = urldecode($wp->query_vars['gd_region']); |
|
459 | + } |
|
449 | 460 | |
450 | - if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') |
|
451 | - $gd_city = urldecode($wp->query_vars['gd_city']); |
|
461 | + if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') { |
|
462 | + $gd_city = urldecode($wp->query_vars['gd_city']); |
|
463 | + } |
|
452 | 464 | |
453 | 465 | if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) { |
454 | 466 | $default_location = geodir_get_default_location(); |
@@ -456,17 +468,19 @@ discard block |
||
456 | 468 | if (get_option('geodir_add_location_url')) { |
457 | 469 | if ($geodir_show_location_url != 'all') { |
458 | 470 | if ($gd_region == '') { |
459 | - if ($gd_ses_region = $gd_session->get('gd_region')) |
|
460 | - $gd_region = $gd_ses_region; |
|
461 | - else |
|
462 | - $gd_region = $default_location->region_slug; |
|
471 | + if ($gd_ses_region = $gd_session->get('gd_region')) { |
|
472 | + $gd_region = $gd_ses_region; |
|
473 | + } else { |
|
474 | + $gd_region = $default_location->region_slug; |
|
475 | + } |
|
463 | 476 | } |
464 | 477 | |
465 | 478 | if ($gd_city == '') { |
466 | - if ($gd_ses_city = $gd_session->get('gd_city')) |
|
467 | - $gd_city = $gd_ses_city; |
|
468 | - else |
|
469 | - $gd_city = $default_location->city_slug; |
|
479 | + if ($gd_ses_city = $gd_session->get('gd_city')) { |
|
480 | + $gd_city = $gd_ses_city; |
|
481 | + } else { |
|
482 | + $gd_city = $default_location->city_slug; |
|
483 | + } |
|
470 | 484 | |
471 | 485 | $base_location_link = geodir_get_location_link('base'); |
472 | 486 | wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city); |
@@ -585,8 +599,9 @@ discard block |
||
585 | 599 | |
586 | 600 | |
587 | 601 | $geodir_term = str_replace('/' . $geodir_last_term, '', $geodir_term, $post_title_replace_count); |
588 | - if (!$post_title_replace_count) |
|
589 | - $geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count); |
|
602 | + if (!$post_title_replace_count) { |
|
603 | + $geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count); |
|
604 | + } |
|
590 | 605 | $geodir_terms = explode('/', $geodir_term); |
591 | 606 | $geodir_last_term = end($geodir_terms); |
592 | 607 | |
@@ -622,8 +637,9 @@ discard block |
||
622 | 637 | if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && |
623 | 638 | geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && |
624 | 639 | geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city) |
625 | - ) |
|
626 | - $is_geodir_location_found = true; |
|
640 | + ) { |
|
641 | + $is_geodir_location_found = true; |
|
642 | + } |
|
627 | 643 | |
628 | 644 | // if location has not been found for country , region and city then search for country and region only |
629 | 645 | |
@@ -631,8 +647,9 @@ discard block |
||
631 | 647 | $gd_city = ''; |
632 | 648 | if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && |
633 | 649 | geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) |
634 | - ) |
|
635 | - $is_geodir_location_found = true; |
|
650 | + ) { |
|
651 | + $is_geodir_location_found = true; |
|
652 | + } |
|
636 | 653 | |
637 | 654 | } |
638 | 655 | |
@@ -640,8 +657,9 @@ discard block |
||
640 | 657 | if (!$is_geodir_location_found) { |
641 | 658 | $gd_city = ''; |
642 | 659 | $gd_region = ''; |
643 | - if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) |
|
644 | - $is_geodir_location_found = true; |
|
660 | + if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) { |
|
661 | + $is_geodir_location_found = true; |
|
662 | + } |
|
645 | 663 | } |
646 | 664 | } else if ($geodir_show_location_url == 'country_city') { |
647 | 665 | if (count($geodir_terms) >= 2) { |
@@ -651,17 +669,19 @@ discard block |
||
651 | 669 | $gd_country = urldecode($geodir_terms[0]); |
652 | 670 | } |
653 | 671 | |
654 | - if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) |
|
655 | - $is_geodir_location_found = true; |
|
672 | + if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) { |
|
673 | + $is_geodir_location_found = true; |
|
674 | + } |
|
656 | 675 | |
657 | 676 | // if location has not been found for country and city then search for country only |
658 | 677 | if (!$is_geodir_location_found) { |
659 | 678 | $gd_city = ''; |
660 | 679 | |
661 | - if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) |
|
662 | - $is_geodir_location_found = true; |
|
680 | + if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) { |
|
681 | + $is_geodir_location_found = true; |
|
682 | + } |
|
663 | 683 | } |
664 | - } else if ($geodir_show_location_url == 'region_city') { |
|
684 | + } else if ($geodir_show_location_url == 'region_city') { |
|
665 | 685 | if (count($geodir_terms) >= 2) { |
666 | 686 | $gd_region = urldecode($geodir_terms[0]); |
667 | 687 | $gd_city = urldecode($geodir_terms[1]); |
@@ -669,15 +689,17 @@ discard block |
||
669 | 689 | $gd_region = urldecode($geodir_terms[0]); |
670 | 690 | } |
671 | 691 | |
672 | - if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) |
|
673 | - $is_geodir_location_found = true; |
|
692 | + if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) { |
|
693 | + $is_geodir_location_found = true; |
|
694 | + } |
|
674 | 695 | |
675 | 696 | // if location has not been found for region and city then search for region only |
676 | 697 | if (!$is_geodir_location_found) { |
677 | 698 | $gd_city = ''; |
678 | 699 | |
679 | - if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)) |
|
680 | - $is_geodir_location_found = true; |
|
700 | + if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)) { |
|
701 | + $is_geodir_location_found = true; |
|
702 | + } |
|
681 | 703 | } |
682 | 704 | } else { |
683 | 705 | $gd_city = $geodir_terms[0]; |
@@ -719,14 +741,17 @@ discard block |
||
719 | 741 | |
720 | 742 | $wp->query_vars[$geodir_taxonomy] = $geodir_term; |
721 | 743 | // eliminate location related terms from taxonomy term |
722 | - if ($gd_country != '') |
|
723 | - $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1); |
|
744 | + if ($gd_country != '') { |
|
745 | + $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1); |
|
746 | + } |
|
724 | 747 | |
725 | - if ($gd_region != '') |
|
726 | - $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1); |
|
748 | + if ($gd_region != '') { |
|
749 | + $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1); |
|
750 | + } |
|
727 | 751 | |
728 | - if ($gd_city != '') |
|
729 | - $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1); |
|
752 | + if ($gd_city != '') { |
|
753 | + $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1); |
|
754 | + } |
|
730 | 755 | |
731 | 756 | |
732 | 757 | $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]); |
@@ -762,27 +787,34 @@ discard block |
||
762 | 787 | if (get_option('geodir_add_location_url')) { |
763 | 788 | if ($geodir_show_location_url == 'all') { |
764 | 789 | } else if ($geodir_show_location_url == 'country_city') { |
765 | - if (isset($wp->query_vars['gd_region'])) |
|
766 | - $wp->query_vars['gd_region'] = ''; |
|
790 | + if (isset($wp->query_vars['gd_region'])) { |
|
791 | + $wp->query_vars['gd_region'] = ''; |
|
792 | + } |
|
767 | 793 | } else if ($geodir_show_location_url == 'region_city') { |
768 | - if (isset($wp->query_vars['gd_country'])) |
|
769 | - $wp->query_vars['gd_country'] = ''; |
|
794 | + if (isset($wp->query_vars['gd_country'])) { |
|
795 | + $wp->query_vars['gd_country'] = ''; |
|
796 | + } |
|
770 | 797 | } else { |
771 | - if (isset($wp->query_vars['gd_country'])) |
|
772 | - $wp->query_vars['gd_country'] = ''; |
|
798 | + if (isset($wp->query_vars['gd_country'])) { |
|
799 | + $wp->query_vars['gd_country'] = ''; |
|
800 | + } |
|
773 | 801 | |
774 | - if (isset($wp->query_vars['gd_region'])) |
|
775 | - $wp->query_vars['gd_region'] = ''; |
|
802 | + if (isset($wp->query_vars['gd_region'])) { |
|
803 | + $wp->query_vars['gd_region'] = ''; |
|
804 | + } |
|
776 | 805 | } |
777 | 806 | } else { |
778 | - if (isset($wp->query_vars['gd_country'])) |
|
779 | - $wp->query_vars['gd_country'] = ''; |
|
807 | + if (isset($wp->query_vars['gd_country'])) { |
|
808 | + $wp->query_vars['gd_country'] = ''; |
|
809 | + } |
|
780 | 810 | |
781 | - if (isset($wp->query_vars['gd_region'])) |
|
782 | - $wp->query_vars['gd_region'] = ''; |
|
811 | + if (isset($wp->query_vars['gd_region'])) { |
|
812 | + $wp->query_vars['gd_region'] = ''; |
|
813 | + } |
|
783 | 814 | |
784 | - if (isset($wp->query_vars['gd_city'])) |
|
785 | - $wp->query_vars['gd_city'] = ''; |
|
815 | + if (isset($wp->query_vars['gd_city'])) { |
|
816 | + $wp->query_vars['gd_city'] = ''; |
|
817 | + } |
|
786 | 818 | } |
787 | 819 | } |
788 | 820 | |
@@ -894,8 +926,9 @@ discard block |
||
894 | 926 | function geodir_exclude_page_where($where) |
895 | 927 | { |
896 | 928 | global $wpdb; |
897 | - if (is_admin()) |
|
898 | - $where .= " AND $wpdb->posts.post_status != 'virtual'"; |
|
929 | + if (is_admin()) { |
|
930 | + $where .= " AND $wpdb->posts.post_status != 'virtual'"; |
|
931 | + } |
|
899 | 932 | |
900 | 933 | return $where; |
901 | 934 | } |
@@ -16,8 +16,9 @@ |
||
16 | 16 | * the visitor has not yet entered the password we will |
17 | 17 | * return early without loading the comments. |
18 | 18 | */ |
19 | -if (post_password_required()) |
|
20 | - return; |
|
19 | +if (post_password_required()) { |
|
20 | + return; |
|
21 | +} |
|
21 | 22 | ?> |
22 | 23 | |
23 | 24 | <div id="comments" class="comments-area"> |
@@ -61,10 +61,11 @@ |
||
61 | 61 | ob_start(); |
62 | 62 | echo '<h5 class="geodir_information">'; |
63 | 63 | |
64 | - if (!isset($_REQUEST['pid'])) |
|
65 | - printf(GOING_TO_FREE_MSG, $type_title, $alive_days); |
|
66 | - else |
|
67 | - printf(GOING_TO_UPDATE_MSG, $type_title, $alive_days); |
|
64 | + if (!isset($_REQUEST['pid'])) { |
|
65 | + printf(GOING_TO_FREE_MSG, $type_title, $alive_days); |
|
66 | + } else { |
|
67 | + printf(GOING_TO_UPDATE_MSG, $type_title, $alive_days); |
|
68 | + } |
|
68 | 69 | |
69 | 70 | echo '</h5>'; |
70 | 71 | $publish_listing_form_message = ob_get_clean(); |
@@ -353,7 +353,7 @@ |
||
353 | 353 | |
354 | 354 | if(!$cpt_left){ |
355 | 355 | $cpt_left = "gd-cpt-flat"; |
356 | - }else{ |
|
356 | + } else{ |
|
357 | 357 | $cpt_left = ''; |
358 | 358 | } |
359 | 359 |
@@ -192,8 +192,9 @@ |
||
192 | 192 | |
193 | 193 | foreach ($map_zoom_level as $level) { |
194 | 194 | $selected = ''; |
195 | - if ($level == $zoom) |
|
196 | - $selected = 'selected="selected"'; |
|
195 | + if ($level == $zoom) { |
|
196 | + $selected = 'selected="selected"'; |
|
197 | + } |
|
197 | 198 | |
198 | 199 | echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>'; |
199 | 200 |
@@ -23,8 +23,12 @@ |
||
23 | 23 | |
24 | 24 | $collate = ''; |
25 | 25 | if ($wpdb->has_cap('collation')) { |
26 | - if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset"; |
|
27 | - if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate"; |
|
26 | + if (!empty($wpdb->charset)) { |
|
27 | + $collate = "DEFAULT CHARACTER SET $wpdb->charset"; |
|
28 | + } |
|
29 | + if (!empty($wpdb->collate)) { |
|
30 | + $collate .= " COLLATE $wpdb->collate"; |
|
31 | + } |
|
28 | 32 | } |
29 | 33 | |
30 | 34 | /** |
@@ -102,8 +102,9 @@ discard block |
||
102 | 102 | { |
103 | 103 | |
104 | 104 | // If we are not in admin area exit. |
105 | - if (!is_admin()) |
|
106 | - return; |
|
105 | + if (!is_admin()) { |
|
106 | + return; |
|
107 | + } |
|
107 | 108 | |
108 | 109 | // Assign meta box values to local variables and add it's missed values. |
109 | 110 | $this->_meta_box = $meta_box; |
@@ -111,15 +112,15 @@ discard block |
||
111 | 112 | $this->_fields = &$this->_meta_box['fields']; |
112 | 113 | $this->_Local_images = (isset($meta_box['local_images'])) ? true : false; |
113 | 114 | $this->add_missed_values(); |
114 | - if (isset($meta_box['use_with_theme'])) |
|
115 | - if ($meta_box['use_with_theme'] === true) { |
|
115 | + if (isset($meta_box['use_with_theme'])) { |
|
116 | + if ($meta_box['use_with_theme'] === true) { |
|
116 | 117 | $this->SelfPath = get_stylesheet_directory_uri() . '/library/cat-meta'; |
118 | + } |
|
117 | 119 | } elseif ($meta_box['use_with_theme'] === false) { |
118 | 120 | $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__))); |
119 | 121 | } else { |
120 | 122 | $this->SelfPath = $meta_box['use_with_theme']; |
121 | - } |
|
122 | - else { |
|
123 | + } else { |
|
123 | 124 | $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__))); |
124 | 125 | } |
125 | 126 | |
@@ -190,8 +191,9 @@ discard block |
||
190 | 191 | { |
191 | 192 | |
192 | 193 | // Check if the field is an image or file. If not, return. |
193 | - if (!$this->has_field('image') && !$this->has_field('file')) |
|
194 | - return; |
|
194 | + if (!$this->has_field('image') && !$this->has_field('file')) { |
|
195 | + return; |
|
196 | + } |
|
195 | 197 | |
196 | 198 | |
197 | 199 | add_action('wp_enqueue_scripts', array(&$this, 'enqueue_tax_meta_scripts'), 100); |
@@ -235,8 +237,9 @@ discard block |
||
235 | 237 | { |
236 | 238 | |
237 | 239 | // If post variables are empty, return. |
238 | - if (!isset($_POST['at-insert']) || empty($_POST['attachments'])) |
|
239 | - return; |
|
240 | + if (!isset($_POST['at-insert']) || empty($_POST['attachments'])) { |
|
241 | + return; |
|
242 | + } |
|
240 | 243 | |
241 | 244 | // Security Check |
242 | 245 | check_admin_referer('media-form'); |
@@ -256,8 +259,9 @@ discard block |
||
256 | 259 | $attachment = stripslashes_deep($attachment); |
257 | 260 | |
258 | 261 | // If not selected or url is empty, continue in loop. |
259 | - if (empty($attachment['selected']) || empty($attachment['url'])) |
|
260 | - continue; |
|
262 | + if (empty($attachment['selected']) || empty($attachment['url'])) { |
|
263 | + continue; |
|
264 | + } |
|
261 | 265 | |
262 | 266 | $li = "<li id='item_{$attachment_id}'>"; |
263 | 267 | $li .= "<img src='{$attachment['url']}' alt='image_{$attachment_id}' />"; |
@@ -308,13 +312,15 @@ discard block |
||
308 | 312 | |
309 | 313 | |
310 | 314 | // If data is not set, die. |
311 | - if (!isset($_POST['data'])) |
|
312 | - die(); |
|
315 | + if (!isset($_POST['data'])) { |
|
316 | + die(); |
|
317 | + } |
|
313 | 318 | |
314 | 319 | list($nonce, $term_id, $key, $attach_id) = explode('|', $_POST['data']); |
315 | 320 | |
316 | - if (!wp_verify_nonce($nonce, 'at_ajax_delete')) |
|
317 | - die('1'); |
|
321 | + if (!wp_verify_nonce($nonce, 'at_ajax_delete')) { |
|
322 | + die('1'); |
|
323 | + } |
|
318 | 324 | |
319 | 325 | $this->delete_tax_meta($term_id, $key, $attach_id); |
320 | 326 | |
@@ -336,8 +342,9 @@ discard block |
||
336 | 342 | $ok = false; |
337 | 343 | if (strpos($field_id, '[') === false) { |
338 | 344 | check_admin_referer("at-delete-mupload_" . urldecode($field_id)); |
339 | - if ($term_id > 0) |
|
340 | - $this->delete_tax_meta($term_id, $field_id); |
|
345 | + if ($term_id > 0) { |
|
346 | + $this->delete_tax_meta($term_id, $field_id); |
|
347 | + } |
|
341 | 348 | //$ok = wp_delete_attachment( $attachment_id ); |
342 | 349 | $ok = 1; |
343 | 350 | } else { |
@@ -349,8 +356,9 @@ discard block |
||
349 | 356 | $saved = $this->get_tax_meta($term_id, $f[0], true); |
350 | 357 | if (isset($saved[$f[1]][$f[2]])) { |
351 | 358 | unset($saved[$f[1]][$f[2]]); |
352 | - if ($term_id > 0) |
|
353 | - update_post_meta($term_id, $f[0], $saved); |
|
359 | + if ($term_id > 0) { |
|
360 | + update_post_meta($term_id, $f[0], $saved); |
|
361 | + } |
|
354 | 362 | //$ok = wp_delete_attachment( $attachment_id ); |
355 | 363 | $ok = 1; |
356 | 364 | } |
@@ -375,13 +383,15 @@ discard block |
||
375 | 383 | public function reorder_images() |
376 | 384 | { |
377 | 385 | |
378 | - if (!isset($_POST['data'])) |
|
379 | - die(); |
|
386 | + if (!isset($_POST['data'])) { |
|
387 | + die(); |
|
388 | + } |
|
380 | 389 | |
381 | 390 | list($order, $term_id, $key, $nonce) = explode('|', $_POST['data']); |
382 | 391 | |
383 | - if (!wp_verify_nonce($nonce, 'at_ajax_reorder')) |
|
384 | - die('1'); |
|
392 | + if (!wp_verify_nonce($nonce, 'at_ajax_reorder')) { |
|
393 | + die('1'); |
|
394 | + } |
|
385 | 395 | |
386 | 396 | parse_str($order, $items); |
387 | 397 | $items = $items['item']; |
@@ -513,8 +523,9 @@ discard block |
||
513 | 523 | foreach ($this->_fields as $field) { |
514 | 524 | $meta = $this->get_tax_meta($term_id, $field['id'], !$field['multiple']); |
515 | 525 | $meta = ($meta !== '') ? $meta : $field['std']; |
516 | - if ('image' != $field['type'] && $field['type'] != 'repeater') |
|
517 | - $meta = is_array($meta) ? array_map('esc_attr', $meta) : esc_attr($meta); |
|
526 | + if ('image' != $field['type'] && $field['type'] != 'repeater') { |
|
527 | + $meta = is_array($meta) ? array_map('esc_attr', $meta) : esc_attr($meta); |
|
528 | + } |
|
518 | 529 | |
519 | 530 | if ($field['validate_func']) { |
520 | 531 | echo '<tr class="form-field form-required ' . $field['style'] . '">'; |
@@ -560,8 +571,9 @@ discard block |
||
560 | 571 | $id = $field['id'] . '[' . $c . '][' . $f['id'] . ']'; |
561 | 572 | $m = $me[$f['id']]; |
562 | 573 | $m = ($m !== '') ? $m : $f['std']; |
563 | - if ('image' != $f['type'] && $f['type'] != 'repeater') |
|
564 | - $m = is_array($m) ? array_map('esc_attr', $m) : esc_attr($m); |
|
574 | + if ('image' != $f['type'] && $f['type'] != 'repeater') { |
|
575 | + $m = is_array($m) ? array_map('esc_attr', $m) : esc_attr($m); |
|
576 | + } |
|
565 | 577 | //set new id for field in array format |
566 | 578 | $f['id'] = $id; |
567 | 579 | if (!$field['inline']) { |
@@ -802,8 +814,9 @@ discard block |
||
802 | 814 | public function show_field_select($field, $meta) |
803 | 815 | { |
804 | 816 | |
805 | - if (!is_array($meta)) |
|
806 | - $meta = (array)$meta; |
|
817 | + if (!is_array($meta)) { |
|
818 | + $meta = (array)$meta; |
|
819 | + } |
|
807 | 820 | |
808 | 821 | $this->show_field_begin($field, $meta); |
809 | 822 | echo "<select class='at-select' name='{$field['id']}" . ($field['multiple'] ? "[]' id='{$field['id']}' multiple='multiple'" : "'") . ">"; |
@@ -826,8 +839,9 @@ discard block |
||
826 | 839 | public function show_field_radio($field, $meta) |
827 | 840 | { |
828 | 841 | |
829 | - if (!is_array($meta)) |
|
830 | - $meta = (array)$meta; |
|
842 | + if (!is_array($meta)) { |
|
843 | + $meta = (array)$meta; |
|
844 | + } |
|
831 | 845 | |
832 | 846 | $this->show_field_begin($field, $meta); |
833 | 847 | foreach ($field['options'] as $key => $value) { |
@@ -889,8 +903,9 @@ discard block |
||
889 | 903 | |
890 | 904 | global $post; |
891 | 905 | |
892 | - if (!is_array($meta)) |
|
893 | - $meta = (array)$meta; |
|
906 | + if (!is_array($meta)) { |
|
907 | + $meta = (array)$meta; |
|
908 | + } |
|
894 | 909 | |
895 | 910 | $this->show_field_begin($field, $meta); |
896 | 911 | echo "{$field['desc']}<br />"; |
@@ -934,8 +949,9 @@ discard block |
||
934 | 949 | $this->show_field_begin($field, $meta); |
935 | 950 | $html = wp_nonce_field("at-delete-mupload_{$field['id']}", "nonce-delete-mupload_" . $field['id'], false, false); |
936 | 951 | if (is_array($meta)) { |
937 | - if (isset($meta[0]) && is_array($meta[0])) |
|
938 | - $meta = $meta[0]; |
|
952 | + if (isset($meta[0]) && is_array($meta[0])) { |
|
953 | + $meta = $meta[0]; |
|
954 | + } |
|
939 | 955 | } |
940 | 956 | |
941 | 957 | $uploads = wp_upload_dir(); |
@@ -947,8 +963,9 @@ discard block |
||
947 | 963 | //print_r($uploads); |
948 | 964 | //print_r($file_info); |
949 | 965 | |
950 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
951 | - $sub_dir = $file_info['dirname']; |
|
966 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') { |
|
967 | + $sub_dir = $file_info['dirname']; |
|
968 | + } |
|
952 | 969 | |
953 | 970 | $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
954 | 971 | $uploads_baseurl = $uploads['baseurl']; |
@@ -988,8 +1005,9 @@ discard block |
||
988 | 1005 | public function show_field_color($field, $meta) |
989 | 1006 | { |
990 | 1007 | |
991 | - if (empty($meta)) |
|
992 | - $meta = '#'; |
|
1008 | + if (empty($meta)) { |
|
1009 | + $meta = '#'; |
|
1010 | + } |
|
993 | 1011 | |
994 | 1012 | $this->show_field_begin($field, $meta); |
995 | 1013 | |
@@ -1012,8 +1030,9 @@ discard block |
||
1012 | 1030 | public function show_field_checkbox_list($field, $meta) |
1013 | 1031 | { |
1014 | 1032 | |
1015 | - if (!is_array($meta)) |
|
1016 | - $meta = (array)$meta; |
|
1033 | + if (!is_array($meta)) { |
|
1034 | + $meta = (array)$meta; |
|
1035 | + } |
|
1017 | 1036 | |
1018 | 1037 | $this->show_field_begin($field, $meta); |
1019 | 1038 | |
@@ -1073,7 +1092,9 @@ discard block |
||
1073 | 1092 | { |
1074 | 1093 | global $post; |
1075 | 1094 | |
1076 | - if (!is_array($meta)) $meta = (array)$meta; |
|
1095 | + if (!is_array($meta)) { |
|
1096 | + $meta = (array)$meta; |
|
1097 | + } |
|
1077 | 1098 | $this->show_field_begin($field, $meta); |
1078 | 1099 | $options = $field['options']; |
1079 | 1100 | $posts = get_posts($options['args']); |
@@ -1111,7 +1132,9 @@ discard block |
||
1111 | 1132 | { |
1112 | 1133 | global $post; |
1113 | 1134 | |
1114 | - if (!is_array($meta)) $meta = (array)$meta; |
|
1135 | + if (!is_array($meta)) { |
|
1136 | + $meta = (array)$meta; |
|
1137 | + } |
|
1115 | 1138 | $this->show_field_begin($field, $meta); |
1116 | 1139 | $options = $field['options']; |
1117 | 1140 | $terms = get_terms($options['taxonomy'], $options['args']); |
@@ -1145,17 +1168,20 @@ discard block |
||
1145 | 1168 | { |
1146 | 1169 | |
1147 | 1170 | $taxnow = ''; |
1148 | - if (isset($_POST['taxonomy'])) |
|
1149 | - $taxnow = $_POST['taxonomy']; |
|
1171 | + if (isset($_POST['taxonomy'])) { |
|
1172 | + $taxnow = $_POST['taxonomy']; |
|
1173 | + } |
|
1150 | 1174 | |
1151 | 1175 | if (!isset($term_id) // Check Revision |
1152 | 1176 | || (!in_array($taxnow, $this->_meta_box['pages'])) // Check if current taxonomy type is supported. |
1153 | 1177 | || (!check_admin_referer(basename(__FILE__), 'tax_meta_class_nonce')) // Check nonce - Security |
1154 | 1178 | || (!current_user_can('manage_categories')) |
1155 | - ) // Check permission |
|
1179 | + ) { |
|
1180 | + // Check permission |
|
1156 | 1181 | { |
1157 | 1182 | return $term_id; |
1158 | 1183 | } |
1184 | + } |
|
1159 | 1185 | |
1160 | 1186 | |
1161 | 1187 | foreach ($this->_fields as $field) { |
@@ -1249,8 +1275,9 @@ discard block |
||
1249 | 1275 | { |
1250 | 1276 | $name = $field['id']; |
1251 | 1277 | $this->delete_tax_meta($term_id, $name); |
1252 | - if ($new === '' || $new === array()) |
|
1253 | - return; |
|
1278 | + if ($new === '' || $new === array()) { |
|
1279 | + return; |
|
1280 | + } |
|
1254 | 1281 | |
1255 | 1282 | $this->update_tax_meta($term_id, $name, $new); |
1256 | 1283 | } |
@@ -1270,8 +1297,9 @@ discard block |
||
1270 | 1297 | $name = $field['id']; |
1271 | 1298 | |
1272 | 1299 | $this->delete_tax_meta($term_id, $name); |
1273 | - if ($new === '' || $new === array() || $new['id'] == '' || $new['src'] == '') |
|
1274 | - return; |
|
1300 | + if ($new === '' || $new === array() || $new['id'] == '' || $new['src'] == '') { |
|
1301 | + return; |
|
1302 | + } |
|
1275 | 1303 | |
1276 | 1304 | $this->update_tax_meta($term_id, $name, $new); |
1277 | 1305 | } |
@@ -1318,8 +1346,9 @@ discard block |
||
1318 | 1346 | break; |
1319 | 1347 | } |
1320 | 1348 | } |
1321 | - if (!$this->is_array_empty($n)) |
|
1322 | - $temp[] = $n; |
|
1349 | + if (!$this->is_array_empty($n)) { |
|
1350 | + $temp[] = $n; |
|
1351 | + } |
|
1323 | 1352 | } |
1324 | 1353 | if (isset($temp) && count($temp) > 0 && !$this->is_array_empty($temp)) { |
1325 | 1354 | $this->update_tax_meta($term_id, $field['id'], $temp); |
@@ -1347,14 +1376,16 @@ discard block |
||
1347 | 1376 | { |
1348 | 1377 | |
1349 | 1378 | $name = $field['id']; |
1350 | - if (empty($_FILES[$name])) |
|
1351 | - return; |
|
1379 | + if (empty($_FILES[$name])) { |
|
1380 | + return; |
|
1381 | + } |
|
1352 | 1382 | $this->fix_file_array($_FILES[$name]); |
1353 | 1383 | foreach ($_FILES[$name] as $position => $fileitem) { |
1354 | 1384 | |
1355 | 1385 | $file = wp_handle_upload($fileitem, array('test_form' => false)); |
1356 | - if (empty($file['file'])) |
|
1357 | - continue; |
|
1386 | + if (empty($file['file'])) { |
|
1387 | + continue; |
|
1388 | + } |
|
1358 | 1389 | $filename = $file['file']; |
1359 | 1390 | |
1360 | 1391 | $attachment = array( |
@@ -1392,14 +1423,16 @@ discard block |
||
1392 | 1423 | { |
1393 | 1424 | |
1394 | 1425 | $name = $field['id']; |
1395 | - if (empty($_FILES[$name])) |
|
1396 | - return; |
|
1426 | + if (empty($_FILES[$name])) { |
|
1427 | + return; |
|
1428 | + } |
|
1397 | 1429 | $this->fix_file_array($_FILES[$name]); |
1398 | 1430 | foreach ($_FILES[$name] as $position => $fileitem) { |
1399 | 1431 | |
1400 | 1432 | $file = wp_handle_upload($fileitem, array('test_form' => false)); |
1401 | - if (empty($file['file'])) |
|
1402 | - continue; |
|
1433 | + if (empty($file['file'])) { |
|
1434 | + continue; |
|
1435 | + } |
|
1403 | 1436 | $filename = $file['file']; |
1404 | 1437 | |
1405 | 1438 | $attachment = array( |
@@ -1454,8 +1487,9 @@ discard block |
||
1454 | 1487 | { |
1455 | 1488 | if(is_array($this->_fields)) { |
1456 | 1489 | foreach ($this->_fields as $field) { |
1457 | - if ($type == $field['type']) |
|
1458 | - return true; |
|
1490 | + if ($type == $field['type']) { |
|
1491 | + return true; |
|
1492 | + } |
|
1459 | 1493 | } |
1460 | 1494 | } |
1461 | 1495 | return false; |
@@ -1993,18 +2027,21 @@ discard block |
||
1993 | 2027 | */ |
1994 | 2028 | public function is_array_empty($array) |
1995 | 2029 | { |
1996 | - if (!is_array($array)) |
|
1997 | - return true; |
|
2030 | + if (!is_array($array)) { |
|
2031 | + return true; |
|
2032 | + } |
|
1998 | 2033 | |
1999 | 2034 | foreach ($array as $a) { |
2000 | 2035 | if (is_array($a)) { |
2001 | 2036 | foreach ($a as $sub_a) { |
2002 | - if (!empty($sub_a) && $sub_a != '') |
|
2003 | - return false; |
|
2037 | + if (!empty($sub_a) && $sub_a != '') { |
|
2038 | + return false; |
|
2039 | + } |
|
2004 | 2040 | } |
2005 | 2041 | } else { |
2006 | - if (!empty($a) && $a != '') |
|
2007 | - return false; |
|
2042 | + if (!empty($a) && $a != '') { |
|
2043 | + return false; |
|
2044 | + } |
|
2008 | 2045 | } |
2009 | 2046 | } |
2010 | 2047 | return true; |