GeoDirectory / geodirectory

geodirectory-functions/taxonomy_functions.php

Braces +170 added lines, -122 removed lines

@@ -39,8 +39,9 @@ 
     if (get_option('geodir_show_listing_nav')) {

 

         $menu_class = '';

-        if (geodir_is_page('listing'))

-            $menu_class = 'current-menu-item';

+        if (geodir_is_page('listing')) {
+                    $menu_class = 'current-menu-item';
+        }
 

 

         //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION

@@ -52,8 +53,9 @@ 
                     if (in_array($post_type, $show_post_type_main_nav)) {

                         if (get_post_type_archive_link($post_type)) {

                             $menu_class = '';

-                            if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

-                                $menu_class = 'current-menu-item';

+                            if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing')) {
+                                                            $menu_class = 'current-menu-item';
+                            }
                             /**

                              * Filter the menu li class.

                              *

@@ -130,8 +132,9 @@ 
                             if (get_post_type_archive_link($post_type)) {

 

                                 $menu_class = '';

-                                if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

-                                    $menu_class = 'current-menu-item';

+                                if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing')) {
+                                                                    $menu_class = 'current-menu-item';
+                                }
 

                                 $items .= '<li class="' . $sub_li_class . '">

 														<a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '">

@@ -159,8 +162,9 @@ 
     if (get_option('geodir_show_addlisting_nav')) {

 

         $menu_class = '';

-        if (geodir_is_page('add-listing'))

-            $menu_class = 'current-menu-item';

+        if (geodir_is_page('add-listing')) {
+                    $menu_class = 'current-menu-item';
+        }
 

         //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

         $post_types = geodir_get_posttypes('object');

@@ -176,8 +180,9 @@ 
                                 if (geodir_get_addlisting_link($post_type)) {

 

                                     $menu_class = '';

-                                    if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

-                                        $menu_class = 'current-menu-item';

+                                    if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing')) {
+                                                                            $menu_class = 'current-menu-item';
+                                    }
                                     /**

                                      * Filter the menu li class.

                                      *

@@ -261,8 +266,9 @@ 
                                     if (geodir_get_addlisting_link($post_type)) {

 

                                         $menu_class = '';

-                                        if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

-                                            $menu_class = 'current-menu-item';

+                                        if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing')) {
+                                                                                    $menu_class = 'current-menu-item';
+                                        }
                                         /**

                                          * Filter the menu li class.

                                          *

@@ -319,8 +325,9 @@ 
     }

     //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet.

 //		$menu = str_replace("</ul></div>",geodir_add_nav_menu_items()."</ul></div>",$menu);

-    else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location))

-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);

+    else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location)) {
+            $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
+    }
 

     return $menu;

 

@@ -406,24 +413,28 @@ 
     $geodir_post_type = get_query_var('post_type');

 

     if (geodir_is_page('add-listing') || geodir_is_page('preview')) {

-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')

-            $geodir_post_type = get_post_type((int)$_REQUEST['pid']);

-        elseif (isset($_REQUEST['listing_type']))

-            $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']);

+        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+                    $geodir_post_type = get_post_type((int)$_REQUEST['pid']);
+        } elseif (isset($_REQUEST['listing_type'])) {
+                    $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']);
+        }
     }

 

-    if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))

-        $geodir_post_type = sanitize_text_field($_REQUEST['stype']);

+    if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype'])) {
+            $geodir_post_type = sanitize_text_field($_REQUEST['stype']);
+    }
 

-    if (is_tax())

-        $geodir_post_type = geodir_get_taxonomy_posttype();

+    if (is_tax()) {
+            $geodir_post_type = geodir_get_taxonomy_posttype();
+    }
 

 

     $all_postypes = geodir_get_posttypes();

     $all_postypes = stripslashes_deep($all_postypes);

 

-    if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))

-        $geodir_post_type = '';

+    if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) {
+            $geodir_post_type = '';
+    }
 

     if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){

         $geodir_post_type = sanitize_text_field($_REQUEST['stype']);

@@ -508,11 +519,12 @@ 
         endswitch;

     }

 

-    if (!empty($post_types))

-        return $post_types;

-    else

-        return array();

-}

+    if (!empty($post_types)) {
+            return $post_types;
+    } else {
+            return array();
+    }
+    }

 

 /**

  * Get Custom Post Type info.

@@ -529,9 +541,10 @@ 
     $post_types = stripslashes_deep($post_types);

     if (!empty($post_types) && $post_type != '') {

         return $post_types[$post_type];

-    } else

-        return false;

-}

+    } else {
+            return false;
+    }
+    }

 

 if (!function_exists('geodir_get_taxonomies')) {

     /**

@@ -555,18 +568,21 @@ 
             $gd_taxonomies = array_keys($taxonomies);

 

 

-            if ($post_type != '')

-                $gd_taxonomies = array();

+            if ($post_type != '') {
+                            $gd_taxonomies = array();
+            }
 

             $i = 0;

             foreach ($taxonomies as $taxonomy => $args) {

 

-                if ($post_type != '' && $args['object_type'] == $post_type)

-                    $gd_taxonomies[] = $taxonomy;

+                if ($post_type != '' && $args['object_type'] == $post_type) {
+                                    $gd_taxonomies[] = $taxonomy;
+                }
 

                 if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {

-                    if (array_search($taxonomy, $gd_taxonomies) !== false)

-                        unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);

+                    if (array_search($taxonomy, $gd_taxonomies) !== false) {
+                                            unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);
+                    }
                 }

 

             }

@@ -621,10 +637,11 @@ 
                 . ucfirst($category_obj->name) . '</option>';

         }

 

-        if ($echo)

-            echo $html;

-        else

-            return $html;

+        if ($echo) {
+                    echo $html;
+        } else {
+                    return $html;
+        }
     }

 }

 

@@ -658,11 +675,12 @@ 
 

     }

 

-    if (!empty($listing_slug))

-        return $listing_slug;

-    else

-        return false;

-}

+    if (!empty($listing_slug)) {
+            return $listing_slug;
+    } else {
+            return false;
+    }
+    }

 

 

 /**

@@ -693,16 +711,18 @@ 
     if (!empty($taxonomies)) {

         foreach (geodir_get_posttypes() as $pt) {

             $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt);

-            if (array_intersect($taxonomies, $object_taxonomies))

-                $post_type[] = $pt;

+            if (array_intersect($taxonomies, $object_taxonomies)) {
+                            $post_type[] = $pt;
+            }
         }

     }

 

-    if (!empty($post_type))

-        return $post_type[0];

-    else

-        return false;

-}

+    if (!empty($post_type)) {
+            return $post_type[0];
+    } else {
+            return false;
+    }
+    }

 

 if (!function_exists('geodir_custom_taxonomy_walker')) {

     /**

@@ -758,18 +778,18 @@ 
                 $checked = '';

 

                 if (in_array($cat_term->term_id, $search_terms)) {

-                    if ($cat_display == 'select' || $cat_display == 'multiselect')

-                        $checked = 'selected="selected"';

-                    else

-                        $checked = 'checked="checked"';

+                    if ($cat_display == 'select' || $cat_display == 'multiselect') {
+                                            $checked = 'selected="selected"';
+                    } else {
+                                            $checked = 'checked="checked"';
+                    }
                 }

 

-                if ($cat_display == 'radio')

-                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>';

-                elseif ($cat_display == 'select' || $cat_display == 'multiselect')

-                    $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>';

-

-                else {

+                if ($cat_display == 'radio') {
+                                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>';
+                } elseif ($cat_display == 'select' || $cat_display == 'multiselect') {
+                                    $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>';
+                } else {

                     $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>';

                 }

 

@@ -778,8 +798,9 @@ 
 

             }

 

-            if ($cat_display == 'checkbox' || $cat_display == 'radio')

-                $out .= '</div>';

+            if ($cat_display == 'checkbox' || $cat_display == 'radio') {
+                            $out .= '</div>';
+            }
 

             return $out;

         }

@@ -805,18 +826,21 @@ 
         global $exclude_cats, $gd_session;

 

         $cat_exclude = '';

-        if (is_array($exclude_cats) && !empty($exclude_cats))

-            $cat_exclude = serialize($exclude_cats);

+        if (is_array($exclude_cats) && !empty($exclude_cats)) {
+                    $cat_exclude = serialize($exclude_cats);
+        }
 

         if (isset($_REQUEST['backandedit'])) {

             $post = (object)$gd_session->get('listing');

 

-            if (!is_array($post->post_category[$cat_taxonomy]))

-                $post_category = $post->post_category[$cat_taxonomy];

+            if (!is_array($post->post_category[$cat_taxonomy])) {
+                            $post_category = $post->post_category[$cat_taxonomy];
+            }
 

             $post_categories = $post->post_category_str;

-            if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories))

-                $post_category_str = $post_categories[$cat_taxonomy];

+            if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
+                            $post_category_str = $post_categories[$cat_taxonomy];
+            }
 

         } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {

             global $post;

@@ -1007,8 +1031,9 @@ 
         if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

             $post_cat_str = $post_categories[$cat_taxonomy];

             $post_cat_array = explode("#", $post_cat_str);

-            if (count($post_cat_array) >= $cat_limit && $cat_limit != 0)

-                $style = "display:none;";

+            if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) {
+                            $style = "display:none;";
+            }
         }

         ?>

         <div class="main_cat_list" style=" <?php if (isset($style)) {

@@ -1043,7 +1068,7 @@ 
 

         if(is_array( $exclude_cats)){

             $exclude_cats = array_map( 'intval', $exclude_cats );

-        }else{

+        } else{

             $exclude_cats = intval($exclude_cats);

         }

 

@@ -1073,7 +1098,10 @@ 
 

             <div class="post_default_category">

                 <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id;?>"

-                       onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" ';?>   />

+                       onchange="update_listing_cat()" <?php if ($default) {
+	echo ' checked="checked" ';
+}
+?>   />

         <span> 

         <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name));?>

         </span>

@@ -1173,8 +1201,9 @@ 
         $onchange = ' onchange="show_subcatlist(this.value, this)" ';

 

         $option_selected = '';

-        if (!$selected)

-            $option_slected = ' selected="selected" ';

+        if (!$selected) {
+                    $option_slected = ' selected="selected" ';
+        }
 

         echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >';

 

@@ -1182,8 +1211,9 @@ 
 

         foreach ($cat_terms as $cat_term) {

             $option_selected = '';

-            if ($selected == $cat_term->term_id)

-                $option_selected = ' selected="selected" ';

+            if ($selected == $cat_term->term_id) {
+                            $option_selected = ' selected="selected" ';
+            }
 

             // Count child terms

             $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) );

@@ -1248,8 +1278,9 @@ 
 

     $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico';

 

-    if (!$listing_slug = get_option('geodir_listing_prefix'))

-        $listing_slug = 'places';

+    if (!$listing_slug = get_option('geodir_listing_prefix')) {
+            $listing_slug = 'places';
+    }
 

     /**

      * Taxonomies

@@ -1553,8 +1584,9 @@ 
                             'city_slug' => $post->city_slug

                         );

 

-                    } else

-                        $post_location = geodir_get_location();

+                    } else {
+                                            $post_location = geodir_get_location();
+                    }
 

 

                 } else {

@@ -1583,8 +1615,9 @@ 
                             );

 

                         }

-                    } else

-                        $post_location = geodir_get_location();

+                    } else {
+                                            $post_location = geodir_get_location();
+                    }
                 }

 

 

@@ -1624,16 +1657,17 @@ 
 

                     if(isset($_POST['post_default_category']) && $_POST['post_default_category']){

                         $post_terms = absint($_POST['post_default_category']);

-                    }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]){

+                    } elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]){

                         $post_terms = explode(",", trim($_POST['post_category'][$taxonomies], ","));

                         $post_terms = absint($post_terms[0]);

-                    }elseif (isset($post->{$taxonomies})) {

+                    } elseif (isset($post->{$taxonomies})) {

                         $post_terms = explode(",", trim($post->{$taxonomies}, ","));

                         $post_terms = $post_terms[0];

                     }

 

-                    if (!$post_terms)

-                        $post_terms = geodir_get_post_meta($post->ID, 'default_category', true);

+                    if (!$post_terms) {
+                                            $post_terms = geodir_get_post_meta($post->ID, 'default_category', true);
+                    }
 

                     if (!$post_terms) {

                         $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true);

@@ -1647,8 +1681,9 @@ 
 

                 $term = get_term_by('id', $post_terms, $taxonomies);

 

-                if (!empty($term))

-                    $term_request = $term->slug;

+                if (!empty($term)) {
+                                    $term_request = $term->slug;
+                }
                 //$term_request = $term->slug.'/';

             }

 

@@ -1663,9 +1698,13 @@ 
                 $request_term .= $term_request;

 

             } else {

-                if (isset($location_request) && $location_request != '') $request_term = $location_request;

+                if (isset($location_request) && $location_request != '') {
+                	$request_term = $location_request;
+                }
 

-                if (isset($term_request) && $term_request != '') $request_term .= $term_request;

+                if (isset($term_request) && $term_request != '') {
+                	$request_term .= $term_request;
+                }
             }

             $request_term = trim($request_term, '/');

             

@@ -1674,10 +1713,11 @@ 
                 $post_link = str_replace('%gd_taxonomy%/', '', $post_link);

             }

             

-            if (!empty($request_term))

-                $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

-            else

-                $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

+            if (!empty($request_term)) {
+                            $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
+            } else {
+                            $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
+            }
             //echo $post_link ;

         }

         // temp cache the permalink

@@ -1869,11 +1909,12 @@ 
     

     $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name;

     

-    if ($echo)

-        echo $label;

-    else

-        return $label;

-}

+    if ($echo) {
+            echo $label;
+    } else {
+            return $label;
+    }
+    }

 

 /**

  * Print or Get post type plural label.

@@ -1889,18 +1930,20 @@ 
 function get_post_type_plural_label($post_type, $echo = false, $translate = false) {

     $all_postypes = geodir_get_posttypes();

 

-    if (!in_array($post_type, $all_postypes))

-        return false;

+    if (!in_array($post_type, $all_postypes)) {
+            return false;
+    }
 

     $obj_post_type = get_post_type_object($post_type);

     

     $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name;

     

-    if ($echo)

-        echo $label;

-    else

-        return $label;

-}

+    if ($echo) {
+            echo $label;
+    } else {
+            return $label;
+    }
+    }

 

 /**

  * Checks whether a term exists or not.

@@ -1923,19 +1966,22 @@ 
     $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";

 

     if (is_int($term)) {

-        if (0 == $term)

-            return 0;

+        if (0 == $term) {
+                    return 0;
+        }
         $where = 't.term_id = %d';

-        if (!empty($taxonomy))

-            return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);

-        else

-            return $wpdb->get_var($wpdb->prepare($select . $where, $term));

+        if (!empty($taxonomy)) {
+                    return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
+        } else {
+                    return $wpdb->get_var($wpdb->prepare($select . $where, $term));
+        }
     }

 

     $term = trim(wp_unslash($term));

 

-    if ('' === $slug = sanitize_title($term))

-        return 0;

+    if ('' === $slug = sanitize_title($term)) {
+            return 0;
+    }
 

     $where = 't.slug = %s';

 

@@ -1952,14 +1998,16 @@ 
         $where_fields[] = $taxonomy;

 

 

-        if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))

-            return $result;

+        if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A)) {
+                    return $result;
+        }
 

         return false;

     }

 

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))

-        return $result;

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields))) {
+            return $result;
+    }
 

     return false;

 }