GeoDirectory / geodirectory

geodirectory-functions/compatibility/Enfold.php

Indentation +12 added lines, -12 removed lines

@@ -1,19 +1,19 @@
 <?php
 /**
- * Enfold theme compatibility functions.
- *
- * This file lets the GeoDirectory Plugin use the Enfold theme HTML wrappers to fit and work perfectly.
- *
- * @since 1.0.0
- * @package GeoDirectory
- */
+     * Enfold theme compatibility functions.
+     *
+     * This file lets the GeoDirectory Plugin use the Enfold theme HTML wrappers to fit and work perfectly.
+     *
+     * @since 1.0.0
+     * @package GeoDirectory
+     */
 add_action('after_setup_theme', 'enfold_action_calls', 11);
 /**
- * Action calls for enfold theme compatibility.
- *
- * @since 1.0.0
- * @package GeoDirectory
- */
+     * Action calls for enfold theme compatibility.
+     *
+     * @since 1.0.0
+     * @package GeoDirectory
+     */
 function enfold_action_calls()
 {
 

Doc Comments +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
  * @since 1.0.0
  * @package GeoDirectory
  * @param array $classes Class array.
- * @return array Modified class array.
+ * @return string[] Modified class array.
  */
 function geodir_x_body_class($classes)
 {

geodirectory-functions/compatibility/Jupiter.php

Indentation +12 added lines, -12 removed lines

@@ -1,19 +1,19 @@
 <?php
 /**
- * Jupiter theme compatibility functions.
- *
- * This file lets the GeoDirectory Plugin use the Jupiter theme HTML wrappers to fit and work perfectly.
- *
- * @since 1.0.0
- * @package GeoDirectory
- */
+     * Jupiter theme compatibility functions.
+     *
+     * This file lets the GeoDirectory Plugin use the Jupiter theme HTML wrappers to fit and work perfectly.
+     *
+     * @since 1.0.0
+     * @package GeoDirectory
+     */
 add_action('after_setup_theme', 'jupiter_action_calls', 11);
 /**
- * Action calls for jupiter theme compatibility.
- *
- * @since 1.0.0
- * @package GeoDirectory
- */
+     * Action calls for jupiter theme compatibility.
+     *
+     * @since 1.0.0
+     * @package GeoDirectory
+     */
 function jupiter_action_calls()
 {
     // REMOVE BREADCRUMB

geodirectory-functions/compatibility/Multi_News.php

Braces +4 added lines, -2 removed lines

@@ -126,8 +126,10 @@
     $regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>";
     if (preg_match_all("/$regexp/siU", $crums, $matches)) {
         return $matches[0];
-    } else return '';
-}
+    } else {
+        return '';
+    }
+    }
 
 
 /**

geodirectory-functions/custom_field_html.php

Indentation +73 added lines, -73 removed lines

@@ -1,11 +1,11 @@ 
 <?php

 /**

- * Admin custom field form

- *

- * @since 1.0.0

- *

- * @package GeoDirectory

- */

+     * Admin custom field form

+     *

+     * @since 1.0.0

+     *

+     * @package GeoDirectory

+     */

  

 /**

  * Displays the custom field form content.

@@ -36,8 +36,8 @@ 
 // Remove Send Enquiry | Send To Friend from listings page

 $htmlvar_name = isset($field_info->htmlvar_name) && $field_info->htmlvar_name != '' ? $field_info->htmlvar_name : '';

 if ($htmlvar_name == 'geodir_email') {

-	$field_info->show_on_listing = 0;

-	$display_on_listing = false;

+    $field_info->show_on_listing = 0;

+    $display_on_listing = false;

 }

 $field_data_type = isset($field_info->data_type) ? $field_info->data_type : '';

 ?>

@@ -74,10 +74,10 @@ 
 

     <div id="field_frm<?php echo $result_str; ?>" class="field_frm"

          style="display:<?php if ($field_ins_upd == 'submit') {

-             echo 'block;';

-         } else {

-             echo 'none;';

-         } ?>">

+                echo 'block;';

+            } else {

+                echo 'none;';

+            } ?>">

         <input type="hidden" name="_wpnonce" value="<?php echo esc_attr($nonce); ?>"/>

         <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type; ?>"/>

         <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type; ?>"/>

@@ -143,8 +143,8 @@ 
                 <td align="left">

                     <input type="text" name="admin_title" id="admin_title"

                            value="<?php if (isset($field_info->admin_title)) {

-                               echo esc_attr($field_info->admin_title);

-                           } ?>"/>

+                                echo esc_attr($field_info->admin_title);

+                            } ?>"/>

                     <br/><span><?php _e('Personal comment, it would not be displayed anywhere except in custom field settings', 'geodirectory'); ?></span>

                 </td>

             </tr>

@@ -153,8 +153,8 @@ 
                 <td align="left">

                     <input type="text" name="site_title" id="site_title"

                            value="<?php if (isset($field_info->site_title)) {

-                               echo esc_attr($field_info->site_title);

-                           } ?>"/>

+                                echo esc_attr($field_info->site_title);

+                            } ?>"/>

                     <br/><span><?php _e('Section title which you wish to display in frontend', 'geodirectory'); ?></span>

                 </td>

             </tr>

@@ -163,8 +163,8 @@ 
                 <td align="left">

                     <input type="text" name="admin_desc" id="admin_desc"

                            value="<?php if (isset($field_info->admin_desc)) {

-                               echo esc_attr($field_info->admin_desc);

-                           } ?>"/>

+                                echo esc_attr($field_info->admin_desc);

+                            } ?>"/>

                     <br/><span><?php _e('Section description which will appear in frontend', 'geodirectory'); ?></span>

                 </td>

             </tr>

@@ -176,8 +176,8 @@ 
                     <td align="left">

                         <input type="text" name="htmlvar_name" id="htmlvar_name"

                                value="<?php if (isset($field_info->htmlvar_name)) {

-                                   echo preg_replace('/geodir_/', '', $field_info->htmlvar_name, 1);

-                               }?>" <?php if ($default) {

+                                    echo preg_replace('/geodir_/', '', $field_info->htmlvar_name, 1);

+                                }?>" <?php if ($default) {

                             echo 'readonly="readonly"';

                         }?> />

                         <br/> <span><?php _e('HTML variable name must not be blank', 'geodirectory');?></span>

@@ -198,9 +198,9 @@ 
                 </td>

             </tr>

             <?php 

-			if ($field_type != 'textarea' && $field_type != 'html' && $field_type != 'file' && $field_type != 'fieldset' && $field_type != 'taxonomy' && $field_type != 'address') {

-				$default_value = isset($field_info->default_value) ? $field_info->default_value : '';

-			?>

+            if ($field_type != 'textarea' && $field_type != 'html' && $field_type != 'file' && $field_type != 'fieldset' && $field_type != 'taxonomy' && $field_type != 'address') {

+                $default_value = isset($field_info->default_value) ? $field_info->default_value : '';

+            ?>

 			<tr>

 				<td><strong><?php _e('Default value :', 'geodirectory');?></strong></td>

 				<td align="left">

@@ -299,18 +299,18 @@ 
             <?php

             $html = ob_get_clean();

 

-			/**

-			 * Filter the price packages list.

-			 *

-			 * Filter the price packages list in custom field form in admin

+            /**

+             * Filter the price packages list.

+             *

+             * Filter the price packages list in custom field form in admin

              * custom fields settings.

-			 *

-			 * @since 1.0.0

-			 *

-			 * @param string $html The price packages content.

-			 * @param object $field_info Current field object.

-			 */

-			echo $html = apply_filters('geodir_packages_list_on_custom_fields', $html, $field_info);

+             *

+             * @since 1.0.0

+             *

+             * @param string $html The price packages content.

+             * @param object $field_info Current field object.

+             */

+            echo $html = apply_filters('geodir_packages_list_on_custom_fields', $html, $field_info);

 

             ?>

 

@@ -370,8 +370,8 @@ 
                 <td align="left">

                     <input type="text" name="required_msg" id="required_msg"

                            value="<?php if (isset($field_info->required_msg)) {

-                               echo esc_attr($field_info->required_msg);

-                           } ?>"/>

+                                echo esc_attr($field_info->required_msg);

+                            } ?>"/>

                     <span>

                         <?php _e('Enter text for error message if field required and have not full fill requirement.', 'geodirectory'); ?>

                     </span>

@@ -385,8 +385,8 @@ 
                 <td align="left">

                     <input type="text" name="validation_pattern" id="validation_pattern"

                            value="<?php if (isset($field_info->validation_pattern)) {

-                               echo esc_attr($field_info->validation_pattern);

-                           } ?>"/>

+                                echo esc_attr($field_info->validation_pattern);

+                            } ?>"/>

                     <span>

                         <?php _e('Enter regex expression for HTML5 pattern validation.', 'geodirectory'); ?>

                     </span>

@@ -399,8 +399,8 @@ 
                 <td align="left">

                     <input type="text" name="validation_msg" id="validation_msg"

                            value="<?php if (isset($field_info->validation_msg)) {

-                               echo esc_attr($field_info->validation_msg);

-                           } ?>"/>

+                                echo esc_attr($field_info->validation_msg);

+                            } ?>"/>

                     <span>

                         <?php _e('Enter a extra validation message to show to the user if validation fails.', 'geodirectory'); ?>

                     </span>

@@ -547,8 +547,8 @@ 
                         <td align="left">

                             <input type="text" name="extra[zip_lable]" id="zip_lable"

                                    value="<?php if (isset($address['zip_lable'])) {

-                                       echo esc_attr($address['zip_lable']);

-                                   }?>"/>

+                                        echo esc_attr($address['zip_lable']);

+                                    }?>"/>

                             <span><?php _e('Enter zip/post code field label in address section.', 'geodirectory');?></span>

                         </td>

                     </tr>

@@ -569,8 +569,8 @@ 
                         <td align="left">

                             <input type="text" name="extra[map_lable]" id="map_lable"

                                    value="<?php if (isset($address['map_lable'])) {

-                                       echo esc_attr($address['map_lable']);

-                                   }?>"/>

+                                        echo esc_attr($address['map_lable']);

+                                    }?>"/>

                             <span><?php _e('Enter text for  `set address on map` button in address section.', 'geodirectory');?></span>

                         </td>

                     </tr>

@@ -603,8 +603,8 @@ 
                         <td align="left">

                             <input type="text" name="extra[mapview_lable]" id="mapview_lable"

                                    value="<?php if (isset($address['mapview_lable'])) {

-                                       echo esc_attr($address['mapview_lable']);

-                                   }?>"/>

+                                        echo esc_attr($address['mapview_lable']);

+                                    }?>"/>

                             <span><?php _e('Enter mapview field label in address section.', 'geodirectory');?></span>

                         </td>

                     </tr>

@@ -656,8 +656,8 @@ 
                         <td align="left">

                             <input type="text" name="option_values" id="option_values"

                                    value="<?php if (isset($field_info->option_values)) {

-                                       echo esc_attr($field_info->option_values);

-                                   }?>"/>

+                                        echo esc_attr($field_info->option_values);

+                                    }?>"/>

                             <br/>

                             <span><?php _e('Option Values should be separated by comma.', 'geodirectory');?></span>

                             <br/>

@@ -685,8 +685,8 @@ 
                         <td align="left" style="overflow:inherit;">

                             <input type="text" name="extra[date_format]" id="date_format"

                                    value="<?php if (isset($extra['date_format'])) {

-                                       echo esc_attr($extra['date_format']);

-                                   }else{echo "mm/dd/yy";}?>"/>

+                                        echo esc_attr($extra['date_format']);

+                                    }else{echo "mm/dd/yy";}?>"/>

 

                             <div style="position:relative; cursor:pointer;">

                         <span onclick="jQuery('#show_dateformat').toggle();">

@@ -770,12 +770,12 @@ 
                 <?php

                 }

                     break;

-				case 'file': {

-					$allowed_file_types = geodir_allowed_mime_types();

+                case 'file': {

+                    $allowed_file_types = geodir_allowed_mime_types();

 					

-					$extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';

-					$gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');

-					?>

+                    $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';

+                    $gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');

+                    ?>

 					<tr>

 					  <td><strong><?php _e('Allowed file types:', 'geodirectory');?></strong></td>

 						<td align="left">

@@ -794,8 +794,8 @@ 
 						</td>

 					</tr>

 					<?php 

-					}

-					break;

+                    }

+                    break;

 

             endswitch; ?>

             <?php if ($field_type != 'fieldset') {

@@ -809,8 +809,8 @@ 
                     <td align="left">

                         <input type="text" name="field_icon" id="field_icon"

                                value="<?php if (isset($field_info->field_icon)) {

-                                   echo $field_info->field_icon;

-                               }?>"/>

+                                    echo $field_info->field_icon;

+                                }?>"/>

                     <span>

                         <?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');?>

                     </span>

@@ -823,8 +823,8 @@ 
                     <td align="left">

                         <input type="text" name="css_class" id="css_class"

                                value="<?php if (isset($field_info->css_class)) {

-                                   echo esc_attr($field_info->css_class);

-                               }?>"/>

+                                    echo esc_attr($field_info->css_class);

+                                }?>"/>

                     <span>

                         <?php _e('Enter custom css class for field custom style.', 'geodirectory');?>

                     </span>

@@ -849,18 +849,18 @@ 
                     <tr>

                         <td colspan="2" align="left">

                             <h3><?php

-								/**

-								 * Filter the section title.

-								 *

-								 * Filter the section title in custom field form in admin

-								 * custom fields settings.

-								 *

-								 * @since 1.0.0

-								 *

-								 * @param string $title Title of the section.

-								 * @param string $field_type Current field type.

-								 */

-								echo apply_filters('geodir_advance_custom_fields_heading', __('Posts sort options', 'geodirectory'), $field_type);

+                                /**

+                                 * Filter the section title.

+                                 *

+                                 * Filter the section title in custom field form in admin

+                                 * custom fields settings.

+                                 *

+                                 * @since 1.0.0

+                                 *

+                                 * @param string $title Title of the section.

+                                 * @param string $field_type Current field type.

+                                 */

+                                echo apply_filters('geodir_advance_custom_fields_heading', __('Posts sort options', 'geodirectory'), $field_type);

 

                                 ?></h3>

                         </td>

Spacing +66 added lines, -66 removed lines

@@ -61,12 +61,12 @@ 
             ?>

 

             <b style="cursor:pointer;"

-               onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory') . ' ' . $field_admin_title);?></b>

+               onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory') . ' ' . $field_admin_title); ?></b>

         <?php

         } else {

             ?>

             <b style="cursor:pointer;"

-               onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory') . ' ' . $field_admin_title . ' (' . $field_type . ')');?></b>

+               onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory') . ' ' . $field_admin_title . ' (' . $field_type . ')'); ?></b>

         <?php

         }

         ?>

@@ -172,7 +172,7 @@ 
                 ?>

 

                 <tr>

-                    <td><strong><?php _e('HTML variable name :', 'geodirectory');?></strong></td>

+                    <td><strong><?php _e('HTML variable name :', 'geodirectory'); ?></strong></td>

                     <td align="left">

                         <input type="text" name="htmlvar_name" id="htmlvar_name"

                                value="<?php if (isset($field_info->htmlvar_name)) {

@@ -180,10 +180,10 @@ 
                                }?>" <?php if ($default) {

                             echo 'readonly="readonly"';

                         }?> />

-                        <br/> <span><?php _e('HTML variable name must not be blank', 'geodirectory');?></span>

-                        <br/> <span><?php _e('This should be a unique name', 'geodirectory');?></span>

+                        <br/> <span><?php _e('HTML variable name must not be blank', 'geodirectory'); ?></span>

+                        <br/> <span><?php _e('This should be a unique name', 'geodirectory'); ?></span>

                         <br/>

-                        <span><?php _e('HTML variable name not use spaces, special characters', 'geodirectory');?></span>

+                        <span><?php _e('HTML variable name not use spaces, special characters', 'geodirectory'); ?></span>

                     </td>

                 </tr>

             <?php } ?>

@@ -202,19 +202,19 @@ 
 				$default_value = isset($field_info->default_value) ? $field_info->default_value : '';

 			?>

 			<tr>

-				<td><strong><?php _e('Default value :', 'geodirectory');?></strong></td>

+				<td><strong><?php _e('Default value :', 'geodirectory'); ?></strong></td>

 				<td align="left">

 				<?php if ($field_type == 'checkbox') { ?>

 				<select name="default_value" id="default_value">

 					<option value=""><?php _e('Unchecked', 'geodirectory'); ?></option>

-					<option value="1" <?php selected(true, (int)$default_value === 1);?>><?php _e('Checked', 'geodirectory'); ?></option>

+					<option value="1" <?php selected(true, (int) $default_value === 1); ?>><?php _e('Checked', 'geodirectory'); ?></option>

 				</select>

 				<?php } else if ($field_type == 'email') { ?>

-				<input type="email" name="default_value" placeholder="<?php _e('info@mysite.com', 'geodirectory') ;?>" id="default_value" value="<?php echo esc_attr($default_value);?>" /><br/>

-				<span><?php _e('Enter the default value. Ex: info@mysite.com', 'geodirectory');?></span>

+				<input type="email" name="default_value" placeholder="<?php _e('info@mysite.com', 'geodirectory'); ?>" id="default_value" value="<?php echo esc_attr($default_value); ?>" /><br/>

+				<span><?php _e('Enter the default value. Ex: info@mysite.com', 'geodirectory'); ?></span>

 				<?php } else { ?>

-				<input type="text" name="default_value" id="default_value" value="<?php echo esc_attr($default_value);?>" /><br/>

-				<span><?php _e('Enter the default value (for "link" this will be used as the link text)', 'geodirectory');?></span>

+				<input type="text" name="default_value" id="default_value" value="<?php echo esc_attr($default_value); ?>" /><br/>

+				<span><?php _e('Enter the default value (for "link" this will be used as the link text)', 'geodirectory'); ?></span>

 				<?php } ?>

 				</td>

 			</tr>

@@ -379,7 +379,7 @@ 
                 </td>

             </tr>

 

-            <?php if ($field_type == 'text'){?>

+            <?php if ($field_type == 'text') {?>

             <tr>

                 <td><strong><?php _e('Validation Pattern:', 'geodirectory'); ?></strong></td>

                 <td align="left">

@@ -409,7 +409,7 @@ 
             </tr>

             <?php } ?>

 

-            <tr <?php echo (!$display_on_listing ? 'style="display:none"' : '') ;?>>

+            <tr <?php echo (!$display_on_listing ? 'style="display:none"' : ''); ?>>

                 <td><strong><?php _e('Show on listing page ? :', 'geodirectory'); ?></strong></td>

                 <td align="left">

                     <select name="show_on_listing" id="show_on_listing">

@@ -468,7 +468,7 @@ 
                 case 'taxonomy': {

                     ?>

                     <tr>

-                        <td><strong><?php _e('Select taxonomy:', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Select taxonomy:', 'geodirectory'); ?></strong></td>

                         <td align="left">

                             <select name="htmlvar_name" id="htmlvar_name">

                                 <?php

@@ -478,40 +478,40 @@ 
                                     ?>

                                     <option <?php if (isset($field_info->htmlvar_name) && $field_info->htmlvar_name == $gd_tax) {

                                         echo 'selected="selected"';

-                                    }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php

+                                    }?> id="<?php echo $gd_tax; ?>"><?php echo $gd_tax; ?></option><?php

                                 }

                                 ?>

                             </select>

 

                             <br/>

-                            <span><?php _e('Selected taxonomy name use as field name index. ex:-( post_category[gd_placecategory] )', 'geodirectory');?></span>

+                            <span><?php _e('Selected taxonomy name use as field name index. ex:-( post_category[gd_placecategory] )', 'geodirectory'); ?></span>

                         </td>

                     </tr>

 

                     <tr>

-                        <td><strong><?php _e('Category display type :', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Category display type :', 'geodirectory'); ?></strong></td>

                         <td align="left">

 

                             <select name="cat_display_type" id="cat_display_type">

                                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'ajax_chained') {

                                     echo 'selected="selected"';

-                                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>

+                                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory'); ?></option>

                                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {

                                     echo 'selected="selected"';

-                                }?> value="select"><?php _e('Select', 'geodirectory');?></option>

+                                }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>

                                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'multiselect') {

                                     echo 'selected="selected"';

-                                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>

+                                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory'); ?></option>

                                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {

                                     echo 'selected="selected"';

-                                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>

+                                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>

                                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {

                                     echo 'selected="selected"';

-                                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>

+                                }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>

                             </select>

 

                             <br/>

-                            <span><?php _e('Show categories list as select,multiselect,checkbox or radio', 'geodirectory');?></span>

+                            <span><?php _e('Show categories list as select,multiselect,checkbox or radio', 'geodirectory'); ?></span>

                         </td>

                     </tr>

                 <?php } // end of additional field for taxonomy field type

@@ -532,92 +532,92 @@ 
                     do_action('geodir_address_extra_admin_fields', $address, $field_info); ?>

 

                     <tr>

-                        <td><strong><?php _e('Display zip/post code :', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Display zip/post code :', 'geodirectory'); ?></strong></td>

                         <td align="left">

                             <input type="checkbox" name="extra[show_zip]" id="show_zip"

                                    value="1" <?php if (isset($address['show_zip']) && $address['show_zip'] == '1') {

                                 echo 'checked="checked"';

                             }?>/>

-                            <span><?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory');?></span>

+                            <span><?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory'); ?></span>

                         </td>

                     </tr>

 

                     <tr>

-                        <td><strong><?php _e('Zip/Post code label :', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Zip/Post code label :', 'geodirectory'); ?></strong></td>

                         <td align="left">

                             <input type="text" name="extra[zip_lable]" id="zip_lable"

                                    value="<?php if (isset($address['zip_lable'])) {

                                        echo esc_attr($address['zip_lable']);

                                    }?>"/>

-                            <span><?php _e('Enter zip/post code field label in address section.', 'geodirectory');?></span>

+                            <span><?php _e('Enter zip/post code field label in address section.', 'geodirectory'); ?></span>

                         </td>

                     </tr>

 

                     <tr style="display:none;">

-                        <td><strong><?php _e('Display map :', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Display map :', 'geodirectory'); ?></strong></td>

                         <td align="left">

                             <input type="checkbox" name="extra[show_map]" id="show_map"

                                    value="1" <?php if (isset($address['show_map']) && $address['show_map'] == '1') {

                                 echo 'checked="checked"';

                             }?>/>

-                            <span><?php _e('Select if you want to `set address on map` field in address section.', 'geodirectory');?></span>

+                            <span><?php _e('Select if you want to `set address on map` field in address section.', 'geodirectory'); ?></span>

                         </td>

                     </tr>

 

                     <tr>

-                        <td><strong><?php _e('Map button label :', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Map button label :', 'geodirectory'); ?></strong></td>

                         <td align="left">

                             <input type="text" name="extra[map_lable]" id="map_lable"

                                    value="<?php if (isset($address['map_lable'])) {

                                        echo esc_attr($address['map_lable']);

                                    }?>"/>

-                            <span><?php _e('Enter text for  `set address on map` button in address section.', 'geodirectory');?></span>

+                            <span><?php _e('Enter text for  `set address on map` button in address section.', 'geodirectory'); ?></span>

                         </td>

                     </tr>

 

                     <tr>

-                        <td><strong><?php _e('Use user zoom level:', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Use user zoom level:', 'geodirectory'); ?></strong></td>

                         <td align="left">

                             <input type="checkbox" name="extra[show_mapzoom]" id="show_mapzoom"

                                    value="1" <?php if (isset($address['show_mapzoom']) && $address['show_mapzoom'] == '1') {

                                 echo 'checked="checked"';

                             }?>/>

-                            <span><?php _e('Select if you want to use the user defined map zoom level.', 'geodirectory');?></span>

+                            <span><?php _e('Select if you want to use the user defined map zoom level.', 'geodirectory'); ?></span>

                         </td>

                     </tr>

 

                     <tr>

-                        <td><strong><?php _e('Display map view:', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Display map view:', 'geodirectory'); ?></strong></td>

                         <td align="left">

                             <input type="checkbox" name="extra[show_mapview]" id="show_mapview"

                                    value="1" <?php if (isset($address['show_mapview']) && $address['show_mapview'] == '1') {

                                 echo 'checked="checked"';

                             }?>/>

-                            <span><?php _e('Select if you want to `set default map` options in address section.', 'geodirectory');?></span>

+                            <span><?php _e('Select if you want to `set default map` options in address section.', 'geodirectory'); ?></span>

                         </td>

                     </tr>

 

 

                     <tr>

-                        <td><strong><?php _e('Map view label :', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Map view label :', 'geodirectory'); ?></strong></td>

                         <td align="left">

                             <input type="text" name="extra[mapview_lable]" id="mapview_lable"

                                    value="<?php if (isset($address['mapview_lable'])) {

                                        echo esc_attr($address['mapview_lable']);

                                    }?>"/>

-                            <span><?php _e('Enter mapview field label in address section.', 'geodirectory');?></span>

+                            <span><?php _e('Enter mapview field label in address section.', 'geodirectory'); ?></span>

                         </td>

                     </tr>

                     <tr>

                         <td>

-                            <strong><?php _e('Show latitude and longitude from front-end :', 'geodirectory');?></strong>

+                            <strong><?php _e('Show latitude and longitude from front-end :', 'geodirectory'); ?></strong>

                         </td>

                         <td align="left">

                             <input type="checkbox" name="extra[show_latlng]" id="show_latlng"

                                    value="1" <?php if (isset($address['show_latlng']) && $address['show_latlng'] == '1') {

                                 echo 'checked="checked"';

                             }?>/>

-                            <span><?php _e('Select if you want to show latitude and logatude fields in address section from front-end.', 'geodirectory');?></span>

+                            <span><?php _e('Select if you want to show latitude and logatude fields in address section from front-end.', 'geodirectory'); ?></span>

                         </td>

                     </tr>

                 <?php } // end of extra fields for address field type

@@ -629,41 +629,41 @@ 
 

                         ?>

                         <tr>

-                            <td><strong><?php _e('Multiselect display type :', 'geodirectory');?></strong></td>

+                            <td><strong><?php _e('Multiselect display type :', 'geodirectory'); ?></strong></td>

                             <td align="left">

 

                                 <select name="multi_display_type" id="multi_display_type">

                                     <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {

                                         echo 'selected="selected"';

-                                    }?> value="select"><?php _e('Select', 'geodirectory');?></option>

+                                    }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>

                                     <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {

                                         echo 'selected="selected"';

-                                    }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>

+                                    }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>

                                     <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {

                                         echo 'selected="selected"';

-                                    }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>

+                                    }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>

                                 </select>

 

                                 <br/>

-                                <span><?php _e('Show multiselect list as multiselect,checkbox or radio', 'geodirectory');?></span>

+                                <span><?php _e('Show multiselect list as multiselect,checkbox or radio', 'geodirectory'); ?></span>

                             </td>

                         </tr>

                     <?php

                     }

                     ?>

                     <tr>

-                        <td><strong><?php _e('Option Values :', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Option Values :', 'geodirectory'); ?></strong></td>

                         <td align="left">

                             <input type="text" name="option_values" id="option_values"

                                    value="<?php if (isset($field_info->option_values)) {

                                        echo esc_attr($field_info->option_values);

                                    }?>"/>

                             <br/>

-                            <span><?php _e('Option Values should be separated by comma.', 'geodirectory');?></span>

+                            <span><?php _e('Option Values should be separated by comma.', 'geodirectory'); ?></span>

                             <br/>

-                            <span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory');?></span>

+                            <span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory'); ?></span>

                             <br/>

-                            <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory');?></span>

+                            <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory'); ?></span>

                             <?php if ($field_type == 'multiselect' || $field_type == 'select') { ?>

                                 <br/>

                                 <span><?php _e('- If using OPTGROUP tag to grouping options, use "{optgroup}OPTGROUP-LABEL|OPTION-1,OPTION-2{/optgroup}"', 'geodirectory'); ?></span>

@@ -681,12 +681,12 @@ 
                     }

                     ?>

                     <tr>

-                        <td><strong><?php _e('Date Format :', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Date Format :', 'geodirectory'); ?></strong></td>

                         <td align="left" style="overflow:inherit;">

                             <input type="text" name="extra[date_format]" id="date_format"

                                    value="<?php if (isset($extra['date_format'])) {

                                        echo esc_attr($extra['date_format']);

-                                   }else{echo "mm/dd/yy";}?>"/>

+                                   } else {echo "mm/dd/yy"; }?>"/>

 

                             <div style="position:relative; cursor:pointer;">

                         <span onclick="jQuery('#show_dateformat').toggle();">

@@ -764,7 +764,7 @@ 
 

                             </div>

                             <br/>

-                            <span><?php _e('Enter the date format.', 'geodirectory');?></span>

+                            <span><?php _e('Enter the date format.', 'geodirectory'); ?></span>

                         </td>

                     </tr>

                 <?php

@@ -777,20 +777,20 @@ 
 					$gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');

 					?>

 					<tr>

-					  <td><strong><?php _e('Allowed file types:', 'geodirectory');?></strong></td>

+					  <td><strong><?php _e('Allowed file types:', 'geodirectory'); ?></strong></td>

 						<td align="left">

 							<select name="extra[gd_file_types][]" id="gd_file_types" multiple="multiple" style="height:100px;width:90%;">

-								<option value="*" <?php selected(true, in_array('*', $gd_file_types));?>><?php _e('All types', 'geodirectory') ;?></option>

-								<?php foreach ( $allowed_file_types as $format => $types ) { ?>

-								<optgroup label="<?php echo esc_attr( wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory') ) ) ;?>">

-									<?php foreach ( $types as $ext => $type ) { ?>

-									<option value="<?php echo esc_attr($ext) ;?>" <?php selected(true, in_array($ext, $gd_file_types));?>><?php echo '.' . $ext ;?></option>

+								<option value="*" <?php selected(true, in_array('*', $gd_file_types)); ?>><?php _e('All types', 'geodirectory'); ?></option>

+								<?php foreach ($allowed_file_types as $format => $types) { ?>

+								<optgroup label="<?php echo esc_attr(wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory'))); ?>">

+									<?php foreach ($types as $ext => $type) { ?>

+									<option value="<?php echo esc_attr($ext); ?>" <?php selected(true, in_array($ext, $gd_file_types)); ?>><?php echo '.' . $ext; ?></option>

 									<?php } ?>

 								</optgroup>

 								<?php } ?>

 							</select>			

 							<br />

-							<span><?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', GEODIRPAYMENT_TEXTDOMAIN);?></span>				

+							<span><?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', GEODIRPAYMENT_TEXTDOMAIN); ?></span>				

 						</td>

 					</tr>

 					<?php 

@@ -805,28 +805,28 @@ 
                 </tr>

 

                 <tr>

-                    <td><strong><?php _e('Upload icon:', 'geodirectory');?></strong></td>

+                    <td><strong><?php _e('Upload icon:', 'geodirectory'); ?></strong></td>

                     <td align="left">

                         <input type="text" name="field_icon" id="field_icon"

                                value="<?php if (isset($field_info->field_icon)) {

                                    echo $field_info->field_icon;

                                }?>"/>

                     <span>

-                        <?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');?>

+                        <?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'); ?>

                     </span>

                     </td>

                     </td>

                 </tr>

 

                 <tr>

-                    <td><strong><?php _e('Css class:', 'geodirectory');?></strong></td>

+                    <td><strong><?php _e('Css class:', 'geodirectory'); ?></strong></td>

                     <td align="left">

                         <input type="text" name="css_class" id="css_class"

                                value="<?php if (isset($field_info->css_class)) {

                                    echo esc_attr($field_info->css_class);

                                }?>"/>

                     <span>

-                        <?php _e('Enter custom css class for field custom style.', 'geodirectory');?>

+                        <?php _e('Enter custom css class for field custom style.', 'geodirectory'); ?>

                     </span>

                     </td>

                     </td>

@@ -888,7 +888,7 @@ 
                      * @since 1.0.0

                      * @param object $field_info The current fields info.

                      */

-                    do_action('geodir_advance_custom_fields', $field_info);?>

+                    do_action('geodir_advance_custom_fields', $field_info); ?>

 

                     <?php /*if(!in_array($field_type,array() )){?>

 				<tr>

@@ -907,10 +907,10 @@ 
                 <td>&nbsp;</td>

                 <td align="left">

 

-                    <input type="button" class="button" name="save" id="save" value="<?php echo esc_attr(__('Save','geodirectory'));?>"

+                    <input type="button" class="button" name="save" id="save" value="<?php echo esc_attr(__('Save', 'geodirectory')); ?>"

                            onclick="save_field('<?php echo esc_attr($result_str); ?>')"/>

                     <?php if (!$default): ?>

-                        <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete','geodirectory'));?>"

+                        <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete', 'geodirectory')); ?>"

                                                             onclick="delete_field('<?php echo esc_attr($result_str); ?>', '<?php echo $nonce; ?>')"

                                                             class="button_n"/></a>

                     <?php endif; ?>

Braces +18 added lines, -11 removed lines

@@ -19,16 +19,18 @@ 
 

 if (!isset($field_info->post_type)) {

     $post_type = $_REQUEST['listing_type'];

-} else

-    $post_type = $field_info->post_type;

+} else {
+    $post_type = $field_info->post_type;
+}
 

 $field_info = stripslashes_deep($field_info); // strip slashes from labels

 

 $nonce = wp_create_nonce('custom_fields_' . $result_str);

 

 $field_admin_title = '';

-if (isset($field_info->admin_title))

-    $field_admin_title = $field_info->admin_title;

+if (isset($field_info->admin_title)) {
+    $field_admin_title = $field_info->admin_title;
+}
 

 $default = isset($field_info->is_admin) ? $field_info->is_admin : '';

 

@@ -52,8 +54,11 @@ 
 

         <?php if ($default): ?>

             <div title="<?php _e('Drag and drop to sort', 'geodirectory'); ?>" class="handlediv move"></div>

-        <?php else: ?>

-            <div title="<?php _e('Click to remove field', 'geodirectory'); ?>"

+        <?php else {
+    : ?>

+            <div title="<?php _e('Click to remove field', 'geodirectory');
+}
+?>"

                  onclick="delete_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>')"

                  class="handlediv close"></div>

         <?php endif;

@@ -255,11 +260,13 @@ 
 

                     <?php

                     $selected = '';

-                    if (isset($field_info->extra_fields))

-                        $advanced_editor = unserialize($field_info->extra_fields);

+                    if (isset($field_info->extra_fields)) {
+                                            $advanced_editor = unserialize($field_info->extra_fields);
+                    }
 

-                    if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))

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

+                    if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor)) {
+                                            $selected = 'checked="checked"';
+                    }
                     ?>

 

                     <input type="checkbox" name="advanced_editor[]" id="advanced_editor"

@@ -686,7 +693,7 @@ 
                             <input type="text" name="extra[date_format]" id="date_format"

                                    value="<?php if (isset($extra['date_format'])) {

                                        echo esc_attr($extra['date_format']);

-                                   }else{echo "mm/dd/yy";}?>"/>

+                                   } else{echo "mm/dd/yy";}?>"/>

 

                             <div style="position:relative; cursor:pointer;">

                         <span onclick="jQuery('#show_dateformat').toggle();">

geodirectory-functions/google_analytics.php

Spacing +44 added lines, -44 removed lines

@@ -72,58 +72,58 @@ 
 

     $start_date = '';

     $end_date = '';

-    if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){

-        if(!$ga_start){$ga_start = date('Y-m-d', strtotime("-6 day"));}

-        if(!$ga_end){$ga_end = date('Y-m-d');}

+    if (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'thisweek') {

+        if (!$ga_start) {$ga_start = date('Y-m-d', strtotime("-6 day")); }

+        if (!$ga_end) {$ga_end = date('Y-m-d'); }

         $dimensions = "&dimensions=ga:date,ga:nthDay";

-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){

-        if(!$ga_start){$ga_start = date('Y-m-d', strtotime("-13 day"));}

-        if(!$ga_end){$ga_end = date('Y-m-d', strtotime("-7 day"));}

+    }elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'lastweek') {

+        if (!$ga_start) {$ga_start = date('Y-m-d', strtotime("-13 day")); }

+        if (!$ga_end) {$ga_end = date('Y-m-d', strtotime("-7 day")); }

         $dimensions = "&dimensions=ga:date,ga:nthDay";

     }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){

-        if(!$ga_start){$ga_start = date('Y')."-01-01";}

-        if(!$ga_end){$ga_end = date('Y-m-d');}

+    elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'thisyear') {

+        if (!$ga_start) {$ga_start = date('Y') . "-01-01"; }

+        if (!$ga_end) {$ga_end = date('Y-m-d'); }

         $dimensions = "&dimensions=ga:month,ga:nthMonth";

     }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){

-        if(!$ga_start){$ga_start = date('Y', strtotime("-1 year"))."-01-01";}

-        if(!$ga_end){$ga_end = date('Y', strtotime("-1 year"))."-12-31";}

+    elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'lastyear') {

+        if (!$ga_start) {$ga_start = date('Y', strtotime("-1 year")) . "-01-01"; }

+        if (!$ga_end) {$ga_end = date('Y', strtotime("-1 year")) . "-12-31"; }

         $dimensions = "&dimensions=ga:month,ga:nthMonth";

     }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

-        if(!$ga_start){$ga_start = "14daysAgo";}

-        if(!$ga_end){$ga_end = "yesterday";}

+    elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'country') {

+        if (!$ga_start) {$ga_start = "14daysAgo"; }

+        if (!$ga_end) {$ga_end = "yesterday"; }

         $dimensions = "&dimensions=ga:country&sort=-ga:pageviews&max-results=5";

     }

 

 

     $APIURL = "https://www.googleapis.com/analytics/v3/data/ga?";

-    $ids = "ids=".$id;

-    if(!$start_date){$start_date = "&start-date=".$ga_start;}

-    if(!$end_date){$end_date = "&end-date=".$ga_end;}

+    $ids = "ids=" . $id;

+    if (!$start_date) {$start_date = "&start-date=" . $ga_start; }

+    if (!$end_date) {$end_date = "&end-date=" . $ga_end; }

     $metrics = "&metrics=ga:pageviews";

-    $filters = "&filters=ga:pagePath==".$page;

-    $access_token = "&access_token=".$at;

+    $filters = "&filters=ga:pagePath==" . $page;

+    $access_token = "&access_token=" . $at;

 

-    $use_url = $APIURL.$ids.$start_date.$end_date.$dimensions.$metrics.$filters.$access_token;

+    $use_url = $APIURL . $ids . $start_date . $end_date . $dimensions . $metrics . $filters . $access_token;

 

-    if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){

+    if (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'realtime') {

         $metrics = "&metrics=rt:activeUsers";

-        $dimensions = "&filters=ga:pagePath==".$page;

+        $dimensions = "&filters=ga:pagePath==" . $page;

 

-        $use_url = "https://www.googleapis.com/analytics/v3/data/realtime?".$ids.$access_token.$metrics.$dimensions;

+        $use_url = "https://www.googleapis.com/analytics/v3/data/realtime?" . $ids . $access_token . $metrics . $dimensions;

     }

 

-    $response =  wp_remote_get($use_url,array('timeout' => 15));

+    $response = wp_remote_get($use_url, array('timeout' => 15));

 

     // Make countries translatable

-    if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

+    if (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'country') {

         $c_arr = json_decode($response['body']);

-        if(is_array($c_arr->rows)){

+        if (is_array($c_arr->rows)) {

             $new_rows = array();

-            foreach($c_arr->rows as $wow){

-                $new_rows[] = array(__($wow[0],'geodirectory'),$wow[1]);

+            foreach ($c_arr->rows as $wow) {

+                $new_rows[] = array(__($wow[0], 'geodirectory'), $wow[1]);

             }

             $c_arr->rows = $new_rows;

         }

@@ -136,39 +136,39 @@ 
 }// end GA function

 

 

-function geodir_ga_get_token(){

+function geodir_ga_get_token() {

     $at = get_option('gd_ga_access_token');

-    $use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at;

-    $response =  wp_remote_get($use_url,array('timeout' => 15));

+    $use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=" . $at;

+    $response = wp_remote_get($use_url, array('timeout' => 15));

 

-    if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid

+    if (!empty($response['response']['code']) && $response['response']['code'] == 200) {//access token is valid

 

     return $at;

-    }else{//else get new access token

+    } else {//else get new access token

 

         $refresh_at = get_option('gd_ga_refresh_token');

-        if(!$refresh_at){

-            echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;

+        if (!$refresh_at) {

+            echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory'))); exit;

         }

 

         $rat_url = "https://www.googleapis.com/oauth2/v3/token?";

-        $client_id = "client_id=".get_option('geodir_ga_client_id');

-        $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

-        $refresh_token = "&refresh_token=".$refresh_at;

+        $client_id = "client_id=" . get_option('geodir_ga_client_id');

+        $client_secret = "&client_secret=" . get_option('geodir_ga_client_secret');

+        $refresh_token = "&refresh_token=" . $refresh_at;

         $grant_type = "&grant_type=refresh_token";

 

-        $rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type;

+        $rat_url_use = $rat_url . $client_id . $client_secret . $refresh_token . $grant_type;

 

-        $rat_response =  wp_remote_post($rat_url_use,array('timeout' => 15));

-        if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {

+        $rat_response = wp_remote_post($rat_url_use, array('timeout' => 15));

+        if (!empty($rat_response['response']['code']) && $rat_response['response']['code'] == 200) {

             $parts = json_decode($rat_response['body']);

 

 

             update_option('gd_ga_access_token', $parts->access_token);

             return $parts->access_token;

 

-        }else{

-            echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;

+        } else {

+            echo json_encode(array('error'=>__('Login failed', 'geodirectory'))); exit;

         }

 

 

Braces +6 added lines, -9 removed lines

@@ -76,22 +76,19 @@ 
         if(!$ga_start){$ga_start = date('Y-m-d', strtotime("-6 day"));}

         if(!$ga_end){$ga_end = date('Y-m-d');}

         $dimensions = "&dimensions=ga:date,ga:nthDay";

-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){

         if(!$ga_start){$ga_start = date('Y-m-d', strtotime("-13 day"));}

         if(!$ga_end){$ga_end = date('Y-m-d', strtotime("-7 day"));}

         $dimensions = "&dimensions=ga:date,ga:nthDay";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){

         if(!$ga_start){$ga_start = date('Y')."-01-01";}

         if(!$ga_end){$ga_end = date('Y-m-d');}

         $dimensions = "&dimensions=ga:month,ga:nthMonth";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){

         if(!$ga_start){$ga_start = date('Y', strtotime("-1 year"))."-01-01";}

         if(!$ga_end){$ga_end = date('Y', strtotime("-1 year"))."-12-31";}

         $dimensions = "&dimensions=ga:month,ga:nthMonth";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

         if(!$ga_start){$ga_start = "14daysAgo";}

         if(!$ga_end){$ga_end = "yesterday";}

         $dimensions = "&dimensions=ga:country&sort=-ga:pageviews&max-results=5";

@@ -144,7 +141,7 @@ 
     if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid

 

     return $at;

-    }else{//else get new access token

+    } else{//else get new access token

 

         $refresh_at = get_option('gd_ga_refresh_token');

         if(!$refresh_at){

@@ -167,7 +164,7 @@ 
             update_option('gd_ga_access_token', $parts->access_token);

             return $parts->access_token;

 

-        }else{

+        } else{

             echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;

         }

 

geodirectory-functions/helper_functions.php

Indentation +85 added lines, -85 removed lines

@@ -286,42 +286,42 @@ 
  * @return array Parsed url and title.
  */
 function geodir_parse_custom_field_url($url, $formatted = true) {
-	if ($url == '' || !is_string($url)) {
-		return NULL;
-	}
-	$original_url = $url;
+    if ($url == '' || !is_string($url)) {
+        return NULL;
+    }
+    $original_url = $url;
 	
-	$url = stripcslashes($url);
-	$parts = explode('|', $url, 2);
+    $url = stripcslashes($url);
+    $parts = explode('|', $url, 2);
 	
-	$url = trim($parts[0]);
-	if ($formatted && $url != '') {
-		$url = str_replace( ' ', '%20', $url );
-		$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
+    $url = trim($parts[0]);
+    if ($formatted && $url != '') {
+        $url = str_replace( ' ', '%20', $url );
+        $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
 		
-		if (0 !== stripos($url, 'mailto:')) {
-			$strip = array('%0d', '%0a', '%0D', '%0A');
-			$url = _deep_replace($strip, $url);
-		}
+        if (0 !== stripos($url, 'mailto:')) {
+            $strip = array('%0d', '%0a', '%0D', '%0A');
+            $url = _deep_replace($strip, $url);
+        }
 		
-		$url = str_replace(';//', '://', $url);
+        $url = str_replace(';//', '://', $url);
 		
-		if (strpos($url, ':') === false && ! in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
-			$url = 'http://' . $url;
-		}
+        if (strpos($url, ':') === false && ! in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
+            $url = 'http://' . $url;
+        }
 		
-		$url = wp_kses_normalize_entities($url);
-		$url = str_replace('&', '&', $url);
-		$url = str_replace("'", ''', $url);
-	}
+        $url = wp_kses_normalize_entities($url);
+        $url = str_replace('&', '&', $url);
+        $url = str_replace("'", ''', $url);
+    }
 	
-	$return = array();
-	$return['url'] = $url;
-	if (!empty($parts[1]) && trim($parts[1]) != '') {
-		$return['label'] = trim($parts[1]);
-	}
+    $return = array();
+    $return['url'] = $url;
+    if (!empty($parts[1]) && trim($parts[1]) != '') {
+        $return['label'] = trim($parts[1]);
+    }
 
-	return $return;
+    return $return;
 }
 
 /**
@@ -334,24 +334,24 @@ 
  * @return array Modified listing request info.
  */
 function geodir_attach_parent_categories($request_info) {
-	if (!empty($request_info['post_category']) && is_array($request_info['post_category'])) {
-		foreach ($request_info['post_category'] as $taxomony => $term_ids) {			
-			$attach_term_ids = array();
+    if (!empty($request_info['post_category']) && is_array($request_info['post_category'])) {
+        foreach ($request_info['post_category'] as $taxomony => $term_ids) {			
+            $attach_term_ids = array();
 			
-			if (!empty($term_ids) && is_array($term_ids) && taxonomy_exists($taxomony) && strpos($taxomony, 'category') !== false) {
-				$attach_term_ids = geodir_add_parent_terms($term_ids, $taxomony);
+            if (!empty($term_ids) && is_array($term_ids) && taxonomy_exists($taxomony) && strpos($taxomony, 'category') !== false) {
+                $attach_term_ids = geodir_add_parent_terms($term_ids, $taxomony);
 				
-				if (!empty($attach_term_ids)) {
-					if (!isset($request_info['post_default_category'])) {
-						$request_info['post_default_category'] = $attach_term_ids[0];
-					}
-					$request_info['post_category'][$taxomony] = $attach_term_ids;
-				}
-			}
-		}
-	}
+                if (!empty($attach_term_ids)) {
+                    if (!isset($request_info['post_default_category'])) {
+                        $request_info['post_default_category'] = $attach_term_ids[0];
+                    }
+                    $request_info['post_category'][$taxomony] = $attach_term_ids;
+                }
+            }
+        }
+    }
 	
-	return $request_info;
+    return $request_info;
 }
 
 /**
@@ -365,22 +365,22 @@ 
  * @return array Modified term ids.
  */
 function geodir_add_parent_terms($term_ids, $taxomony) {	
-	if (is_int($term_ids)) {
-		$term_ids = array($term_ids);
-	}
+    if (is_int($term_ids)) {
+        $term_ids = array($term_ids);
+    }
 	
-	$parent_terms = array();
+    $parent_terms = array();
 	
-	foreach ($term_ids as $term_id) {
-		$parent_terms[] = $term_id;
-		$term_parents = geodir_get_category_parents($term_id, $taxomony, $parent_terms);
+    foreach ($term_ids as $term_id) {
+        $parent_terms[] = $term_id;
+        $term_parents = geodir_get_category_parents($term_id, $taxomony, $parent_terms);
 		
-		if (!empty($term_parents)) {
-			$parent_terms = array_merge($parent_terms, $term_parents);
-		}
-	}
+        if (!empty($term_parents)) {
+            $parent_terms = array_merge($parent_terms, $term_parents);
+        }
+    }
 
-	return $parent_terms;
+    return $parent_terms;
 }
 
 /**
@@ -396,18 +396,18 @@ 
  * @return array Category ids.
  */
 function geodir_get_category_parents($id, $taxomony, $visited = array(), $parents = array()) {
-	$parent = get_term($id, $taxomony);
-	if (is_wp_error($parent)) {
-		return $parents;
-	}
-
-	if ($parent->parent && ($parent->parent != $parent->term_id) && !in_array($parent->parent, $visited)) {
-		$visited[] = $parent->parent;
-		$parents[] = $parent->parent;
-		$parents = geodir_get_category_parents($parent->parent, $taxomony, $visited, $parents);
-	}
-
-	return $parents;
+    $parent = get_term($id, $taxomony);
+    if (is_wp_error($parent)) {
+        return $parents;
+    }
+
+    if ($parent->parent && ($parent->parent != $parent->term_id) && !in_array($parent->parent, $visited)) {
+        $visited[] = $parent->parent;
+        $parents[] = $parent->parent;
+        $parents = geodir_get_category_parents($parent->parent, $taxomony, $visited, $parents);
+    }
+
+    return $parents;
 }
 
 if (!function_exists('geodir_get_ip')) {
@@ -420,24 +420,24 @@ 
  * @return string The IP address.
  */
 function geodir_get_ip() {
-	if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
-		//check ip from share internet
-		$ip = $_SERVER['HTTP_CLIENT_IP'];
-	} elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-		//to check ip is pass from proxy
-		$ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
-	} else {
-		$ip = $_SERVER['REMOTE_ADDR'];
-	}
+    if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+        //check ip from share internet
+        $ip = $_SERVER['HTTP_CLIENT_IP'];
+    } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+        //to check ip is pass from proxy
+        $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+    } else {
+        $ip = $_SERVER['REMOTE_ADDR'];
+    }
 	
-	/**
-	 * Filter the the visitor's IP address.
-	 *
-	 * @since 1.5.7
-	 * @package GeoDirectory
-	 *
-	 * @param string $ip The IP address.
-	 */
-	return apply_filters('geodir_get_ip', $ip);
+    /**
+     * Filter the the visitor's IP address.
+     *
+     * @since 1.5.7
+     * @package GeoDirectory
+     *
+     * @param string $ip The IP address.
+     */
+    return apply_filters('geodir_get_ip', $ip);
 }
 }
\ No newline at end of file

Spacing +35 added lines, -35 removed lines

@@ -13,11 +13,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_add_listing_page_id(){
+function geodir_add_listing_page_id() {
     $gd_page_id = get_option('geodir_add_listing_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -30,11 +30,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_preview_page_id(){
+function geodir_preview_page_id() {
     $gd_page_id = get_option('geodir_preview_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -47,11 +47,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_success_page_id(){
+function geodir_success_page_id() {
     $gd_page_id = get_option('geodir_success_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -64,11 +64,11 @@ 
  * @since 1.4.6
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_location_page_id(){
+function geodir_location_page_id() {
     $gd_page_id = get_option('geodir_location_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -81,11 +81,11 @@ 
  * @since 1.5.4
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_home_page_id(){
+function geodir_home_page_id() {
     $gd_page_id = get_option('geodir_home_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -98,11 +98,11 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_info_page_id(){
+function geodir_info_page_id() {
     $gd_page_id = get_option('geodir_info_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -115,11 +115,11 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_login_page_id(){
+function geodir_login_page_id() {
     $gd_page_id = get_option('geodir_login_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     return $gd_page_id;
@@ -133,11 +133,11 @@ 
  * @since 1.5.3
  * @return int|null Return the page ID if present or null if not.
  */
-function geodir_login_url($args=array()){
+function geodir_login_url($args = array()) {
     $gd_page_id = get_option('geodir_login_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     if (function_exists('geodir_location_geo_home_link')) {
@@ -148,17 +148,17 @@ 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
     }
 
-    if($gd_page_id){
+    if ($gd_page_id) {
         $post = get_post($gd_page_id);
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
-        $login_url = trailingslashit($home_url)."$slug/";
-    }else{
-        $login_url = trailingslashit($home_url)."?geodir_signup=true";
+        $login_url = trailingslashit($home_url) . "$slug/";
+    } else {
+        $login_url = trailingslashit($home_url) . "?geodir_signup=true";
     }
 
-    if($args){
-        $login_url = add_query_arg($args,$login_url );
+    if ($args) {
+        $login_url = add_query_arg($args, $login_url);
     }
 
     /**
@@ -172,7 +172,7 @@ 
      * @param array $args The array of query args used.
      * @param int $gd_page_id The page id of the GD login page.
      */
-    return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
+    return apply_filters('geodir_login_url', $login_url, $args, $gd_page_id);
 }
 
 /**
@@ -182,11 +182,11 @@ 
  * @since 1.5.4
  * @return string Info page url.
  */
-function geodir_info_url($args=array()){
+function geodir_info_url($args = array()) {
     $gd_page_id = get_option('geodir_info_page');
 
     if (function_exists('icl_object_id')) {
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
     }
 
     if (function_exists('geodir_location_geo_home_link')) {
@@ -197,17 +197,17 @@ 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
     }
 
-    if($gd_page_id){
+    if ($gd_page_id) {
         $post = get_post($gd_page_id);
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
-        $info_url = trailingslashit($home_url)."$slug/";
-    }else{
+        $info_url = trailingslashit($home_url) . "$slug/";
+    } else {
         $info_url = trailingslashit($home_url);
     }
 
-    if($args){
-        $info_url = add_query_arg($args,$info_url );
+    if ($args) {
+        $info_url = add_query_arg($args, $info_url);
     }
 
     return $info_url;
@@ -225,7 +225,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_ucwords($string, $charset='UTF-8') {
+function geodir_ucwords($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_TITLE, $charset);
     } else {
@@ -245,7 +245,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_strtolower($string, $charset='UTF-8') {
+function geodir_strtolower($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_LOWER, $charset);
     } else {
@@ -265,7 +265,7 @@ 
  * @param string $charset Character set to use for conversion.
  * @return string Returns converted string.
  */
-function geodir_strtoupper($string, $charset='UTF-8') {
+function geodir_strtoupper($string, $charset = 'UTF-8') {
     if (function_exists('mb_convert_case')) {
         return mb_convert_case($string, MB_CASE_UPPER, $charset);
     } else {
@@ -296,7 +296,7 @@ 
 	
 	$url = trim($parts[0]);
 	if ($formatted && $url != '') {
-		$url = str_replace( ' ', '%20', $url );
+		$url = str_replace(' ', '%20', $url);
 		$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
 		
 		if (0 !== stripos($url, 'mailto:')) {
@@ -306,7 +306,7 @@ 
 		
 		$url = str_replace(';//', '://', $url);
 		
-		if (strpos($url, ':') === false && ! in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
+		if (strpos($url, ':') === false && !in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
 			$url = 'http://' . $url;
 		}
 		

Braces +2 added lines, -2 removed lines

@@ -153,7 +153,7 @@ 
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
         $login_url = trailingslashit($home_url)."$slug/";
-    }else{
+    } else{
         $login_url = trailingslashit($home_url)."?geodir_signup=true";
     }
 
@@ -202,7 +202,7 @@ 
         $slug = $post->post_name;
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
         $info_url = trailingslashit($home_url)."$slug/";
-    }else{
+    } else{
         $info_url = trailingslashit($home_url);
     }
 

geodirectory-functions/listing_filters.php

Spacing +22 added lines, -22 removed lines

@@ -99,15 +99,15 @@ 
         } //  Distance

 

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

-            $mylat = (float)esc_attr($_REQUEST['sgeo_lat']);

+            $mylat = (float) esc_attr($_REQUEST['sgeo_lat']);

         } else {

-            $mylat = (float)geodir_get_current_city_lat();

+            $mylat = (float) geodir_get_current_city_lat();

         } //  Latatude

 

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

-            $mylon = (float)esc_attr($_REQUEST['sgeo_lon']);

+            $mylon = (float) esc_attr($_REQUEST['sgeo_lon']);

         } else {

-            $mylon = (float)geodir_get_current_city_lng();

+            $mylon = (float) geodir_get_current_city_lng();

         } //  Distance

 

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

@@ -250,9 +250,9 @@ 
     if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

         $keywords = explode(" ", $s);

 

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (mb_strlen($kword, 'UTF-8') <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

@@ -438,9 +438,9 @@ 
 

     if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

         $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (mb_strlen($kword, 'UTF-8') <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

@@ -509,7 +509,7 @@ 
                 case 'post_date':

                 case 'comment_count':

 

-                    $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", ";

+                    $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", " . $table . ".overall_rating " . $order . ", ";

                     break;

 

                 case 'distance':

@@ -572,7 +572,7 @@ 
         }

 

         //if (!geodir_is_page('detail'))

-            add_filter('posts_where', 'geodir_default_where', 1);/**/

+            add_filter('posts_where', 'geodir_default_where', 1); /**/

 

         //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts

 

@@ -736,9 +736,9 @@ 
 

     if ($s != '') {

         $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(mb_strlen($kword, 'UTF-8')<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (mb_strlen($kword, 'UTF-8') <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

@@ -757,10 +757,10 @@ 
 

     /* get taxonomy */

     $taxonomies = geodir_get_taxonomies($post_types, true);

-    if($taxonomies) {

+    if ($taxonomies) {

         $taxonomies = implode("','", $taxonomies);

         $taxonomies = "'" . $taxonomies . "'";

-    }else{$taxonomies='';}

+    } else {$taxonomies = ''; }

 

     $content_where = $terms_where = '';

 	if ($s != '') {

@@ -771,7 +771,7 @@ 
          * @package GeoDirectory

          * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`.

          */

-		$content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");

+		$content_where = apply_filters("geodir_search_content_where", " OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");

         /**

          * Filter the search query term values.

          *

@@ -779,7 +779,7 @@ 
          * @package GeoDirectory

          * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`.

          */

-        $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

+        $terms_where = apply_filters("geodir_search_terms_where", " AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

 	}

 		

     if ($snear != '') {

@@ -836,11 +836,11 @@ 
     }

 	

 	########### WPML ###########

-    if ( function_exists( 'icl_object_id' ) ) {       

+    if (function_exists('icl_object_id')) {       

 		$lang_code = ICL_LANGUAGE_CODE;

 		

 		if ($lang_code && $post_types) {

-            $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";

+            $where .= " AND icl_t.language_code = '" . $lang_code . "' AND icl_t.element_type IN('post_" . $post_types . "') ";

         }

     }

     ########### WPML ###########

@@ -869,7 +869,7 @@ 
     //$user_id = get_current_user_id();

     $user_id = $curauth->ID;

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

-        $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);

+        $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ", $_REQUEST['stype']);

     } else {

         $where = " AND $wpdb->posts.post_type IN ('gd_place') ";

     }

Braces +33 added lines, -21 removed lines

@@ -16,7 +16,9 @@ 
  */

 function geodir_session_start()

 {

-    if (!session_id()) session_start();

+    if (!session_id()) {
+        session_start();
+    }
     global $geodir_add_location_url;

 

     $geodir_add_location_url = NULL;

@@ -86,7 +88,9 @@ 
 

     if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')):

 

-        if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = '';

+        if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') {
+            $_REQUEST['scat'] = '';
+        }
         //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = '';

 

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

@@ -198,8 +202,9 @@ 
         add_filter('posts_fields', 'geodir_posts_fields', 1);

         add_filter('posts_join', 'geodir_posts_join', 1);

         geodir_post_where();

-        if (!is_admin())

-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);

+        if (!is_admin()) {
+                    add_filter('posts_orderby', 'geodir_posts_orderby', 1);
+        }
 

         // advanced filter for popular post view widget

         global $wp_query;

@@ -346,8 +351,9 @@ 
     $sort_by = '';

     $orderby = ' ';

 

-    if (get_query_var('order_by'))

-        $sort_by = get_query_var('order_by');

+    if (get_query_var('order_by')) {
+            $sort_by = get_query_var('order_by');
+    }
 

     /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){

         $current_term = $wp_query->get_queried_object();

@@ -367,14 +373,16 @@ 
         $orderby .= " distance,";

     }

 

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

-        $sort_by = esc_attr($_REQUEST['sort_by']);

+    if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) {
+            $sort_by = esc_attr($_REQUEST['sort_by']);
+    }
 

 

     if ($sort_by == '') {

         $default_sort = geodir_get_posts_default_sort($geodir_post_type);

-        if (!empty($default_sort))

-            $sort_by = $default_sort;

+        if (!empty($default_sort)) {
+                    $sort_by = $default_sort;
+        }
     }

 

     /*

@@ -560,8 +568,9 @@ 
 

             add_filter('posts_where', 'searching_filter_where', 1);

 

-            if ($snear != '')

-                add_filter('posts_where', 'searching_filter_where', 1);

+            if ($snear != '') {
+                            add_filter('posts_where', 'searching_filter_where', 1);
+            }
 

             add_filter('posts_orderby', 'geodir_posts_orderby', 1);

 

@@ -729,10 +738,11 @@ 
     }

 

     $better_search_terms = '';

-    if (isset($_REQUEST['stype']))

-        $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype']));

-    else

-        $post_types = 'gd_place';

+    if (isset($_REQUEST['stype'])) {
+            $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype']));
+    } else {
+            $post_types = 'gd_place';
+    }
 

     if ($s != '') {

         $keywords = explode(" ", $s);

@@ -760,7 +770,7 @@ 
     if($taxonomies) {

         $taxonomies = implode("','", $taxonomies);

         $taxonomies = "'" . $taxonomies . "'";

-    }else{$taxonomies='';}

+    } else{$taxonomies='';}

 

     $content_where = $terms_where = '';

 	if ($s != '') {

@@ -875,11 +885,13 @@ 
     }

 

     if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {

-        if ($user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true))

-            $user_fav_posts = implode("','", $user_fav_posts);

+        if ($user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true)) {
+                    $user_fav_posts = implode("','", $user_fav_posts);
+        }
         $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')  ";

-    } else

-        $where .= " AND $wpdb->posts.post_author = $user_id ";

+    } else {
+            $where .= " AND $wpdb->posts.post_author = $user_id ";
+    }
 

     $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

 

Indentation +29 added lines, -29 removed lines

@@ -1,10 +1,10 @@ 
 <?php

 /**

- * Contains all function for filtering listing.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * Contains all function for filtering listing.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

  

 /**

  * Starts session if not started.

@@ -235,10 +235,10 @@ 
     // Filter-Location-Manager to add location table.

     $fields .= ", " . $table . ".* ";

     

-	if ($snear != '' || $gd_session->get('all_near_me')) {

+    if ($snear != '' || $gd_session->get('all_near_me')) {

         $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

         

-		if ($gd_session->get('all_near_me')) {

+        if ($gd_session->get('all_near_me')) {

             $mylat = $gd_session->get('user_lat');

             $mylon = $gd_session->get('user_lon');

         }

@@ -270,13 +270,13 @@ 
                 $count = 0;

                 foreach ($keywords as $keyword) {

                     $keyword = trim($keyword);

-					$count++;

+                    $count++;

                     if ($count < count($keywords)) {

-                       // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " ";

-						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " ";

+                        // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " ";

+                        $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " ";

                     } else {

                         //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' ";

-						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) ";

+                        $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) ";

                     }

                 }

                 $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ",";

@@ -285,7 +285,7 @@ 
             $gd_titlematch_part = "";

         }

         //$fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title=%s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN " . $wpdb->posts . ".post_content LIKE %s THEN 1 ELSE 0 END AS gd_content", array($s, '%' . $s . '%', '%' . $s . '%'));

-		$fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));

+        $fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s));

     }

     return $fields;

 }

@@ -406,7 +406,7 @@ 
             break;

         case 'high_review':

         case 'rating_count_desc':

-			$orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, ";

+            $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, ";

             break;

         case 'low_rating':

             $orderby = "( " . $table . ".overall_rating  ) ASC, " . $table . ".rating_count ASC,  ";

@@ -526,8 +526,8 @@ 
 

                 default:

                     if (geodir_column_exist($table, $sort_by)) {

-						$orderby = $table . "." . $sort_by . " " . $order . ", ";

-					}

+                        $orderby = $table . "." . $sort_by . " " . $order . ", ";

+                    }

                     break;

 

             endswitch;

@@ -704,14 +704,14 @@ 
     $category_search_range = '';

 

     if (is_single() && get_query_var('post_type')) {

-		return $where;

-	}

+        return $where;

+    }

 

     if (is_tax()) {

-		return $where;

-	}

+        return $where;

+    }

 	

-	$s = trim($s);

+    $s = trim($s);

 

     $where = '';

 

@@ -722,7 +722,7 @@ 
         foreach ($s_SA as $s_term) {

             //$s_term = esc_attr($s_term);

             //$better_search[] = " OR $wpdb->posts.post_title LIKE\"%$s_term%\" ";

-			$better_search[] = " OR ( $wpdb->posts.post_title LIKE \"$s_term\" OR $wpdb->posts.post_title LIKE \"$s_term%\" OR $wpdb->posts.post_title LIKE \"% $s_term%\" ) ";

+            $better_search[] = " OR ( $wpdb->posts.post_title LIKE \"$s_term\" OR $wpdb->posts.post_title LIKE \"$s_term%\" OR $wpdb->posts.post_title LIKE \"% $s_term%\" ) ";

         }

     }

 

@@ -751,7 +751,7 @@ 
                 $keyword = trim($keyword);

                 if ($keyword != '') {

                     //$better_search_terms .= ' OR ' . $wpdb->posts . '.post_title LIKE "%' . $adv_search_val . '%"';

-					$better_search_terms .= ' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )';

+                    $better_search_terms .= ' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )';

                 }

             }

         }

@@ -765,7 +765,7 @@ 
     }else{$taxonomies='';}

 

     $content_where = $terms_where = '';

-	if ($s != '') {

+    if ($s != '') {

         /**

          * Filter the search query content where values.

          *

@@ -773,7 +773,7 @@ 
          * @package GeoDirectory

          * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`.

          */

-		$content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");

+        $content_where = apply_filters("geodir_search_content_where"," OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ");

         /**

          * Filter the search query term values.

          *

@@ -782,7 +782,7 @@ 
          * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`.

          */

         $terms_where = apply_filters("geodir_search_terms_where"," AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) ");

-	}

+    }

 		

     if ($snear != '') {

         if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {

@@ -798,7 +798,7 @@ 
         $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : '';

         $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : '';

 

-	    $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

+        $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms)

 			                    $content_where 

 								OR ($wpdb->posts.ID IN( 

 										SELECT $wpdb->term_relationships.object_id as post_id 

@@ -837,11 +837,11 @@ 
 				AND ($wpdb->posts.post_status = 'publish') ";

     }

 	

-	########### WPML ###########

+    ########### WPML ###########

     if ( function_exists( 'icl_object_id' ) ) {       

-		$lang_code = ICL_LANGUAGE_CODE;

+        $lang_code = ICL_LANGUAGE_CODE;

 		

-		if ($lang_code && $post_types) {

+        if ($lang_code && $post_types) {

             $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";

         }

     }

geodirectory-functions/map-functions/get_markers.php

Braces +10 added lines, -8 removed lines

@@ -107,11 +107,13 @@ 
         }

     }

 

-    if (!empty($field_default_cat))

-        $field_default_cat = '';

+    if (!empty($field_default_cat)) {
+            $field_default_cat = '';
+    }
 

-    if (!empty($cat_find_array))

-        $search .= "AND (" . implode(' OR ', $cat_find_array) . ")";

+    if (!empty($cat_find_array)) {
+            $search .= "AND (" . implode(' OR ', $cat_find_array) . ")";
+    }
 

     $main_query_array = $map_cat_ids_array;

   

@@ -143,8 +145,9 @@ 
         $gd_posttype = " AND p.post_type = %s";

         $main_query_array[] = $_REQUEST['gd_posttype'];

 

-    } else

-        $table = $plugin_prefix . 'gd_place_detail';

+    } else {
+            $table = $plugin_prefix . 'gd_place_detail';
+    }
 

     $join = ", " . $table . " AS pd ";

 

@@ -309,8 +312,7 @@ 
 

     if (!empty($cat_content_info)) {

 		return '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';

-    }

-    else {

+    } else {

 		return '[{"totalcount":"0"}]';

 	}

 }
\ No newline at end of file

Indentation +40 added lines, -40 removed lines

@@ -149,22 +149,22 @@ 
     $join = ", " . $table . " AS pd ";

 

     /**

-	 * Filter the SQL JOIN clause for the markers data

-	 *

-	 * @since 1.0.0

-	 *

-	 * @param string $join Row of SQL JOIN clause to join table.

-	 */

-	$join = apply_filters('geodir_home_map_listing_join', $join);

+     * Filter the SQL JOIN clause for the markers data

+     *

+     * @since 1.0.0

+     *

+     * @param string $join Row of SQL JOIN clause to join table.

+     */

+    $join = apply_filters('geodir_home_map_listing_join', $join);

     

-	/**

-	 * Filter the searched fields for the markers data

-	 *

-	 * @since 1.0.0

-	 *

-	 * @param string $search Row of searched fields to use in WHERE clause.

-	 */

-	$search = apply_filters('geodir_home_map_listing_where', $search);

+    /**

+     * Filter the searched fields for the markers data

+     *

+     * @since 1.0.0

+     *

+     * @param string $search Row of searched fields to use in WHERE clause.

+     */

+    $search = apply_filters('geodir_home_map_listing_where', $search);

     $search = str_replace(array("'%", "%'"), array("'%%", "%%'"), $search);

     $cat_type = $post_type . 'category';

     if ($post_type == 'gd_event') {

@@ -175,35 +175,35 @@ 
 

     $sql_select = 'SELECT pd.default_category, pd.' . $cat_type . ', pd.post_title, pd.post_id, pd.post_latitude, pd.post_longitude' . $event_select;

     /**

-	 * Filter the SQL SELECT clause to retrive fields data

-	 *

-	 * @since 1.0.0

-	 *

-	 * @param string $sql_select Row of SQL SELECT clause.

-	 */

-	$select = apply_filters('geodir_home_map_listing_select', $sql_select);

+     * Filter the SQL SELECT clause to retrive fields data

+     *

+     * @since 1.0.0

+     *

+     * @param string $sql_select Row of SQL SELECT clause.

+     */

+    $select = apply_filters('geodir_home_map_listing_select', $sql_select);

 	

-	$groupby = " GROUP BY pd.post_id";

-	/**

-	 * Filter the SQL GROUP BY clause to retrive map markers data.

-	 *

-	 * @since 1.5.7

-	 *

-	 * @param string $groupby Row of SQL GROUP BY clause.

-	 */

-	$groupby = apply_filters('geodir_home_map_listing_groupby', $groupby);

+    $groupby = " GROUP BY pd.post_id";

+    /**

+     * Filter the SQL GROUP BY clause to retrive map markers data.

+     *

+     * @since 1.5.7

+     *

+     * @param string $groupby Row of SQL GROUP BY clause.

+     */

+    $groupby = apply_filters('geodir_home_map_listing_groupby', $groupby);

 

     $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);

     

-	/**

-	 * Filter the SQL query to retrive markers data

-	 *

-	 * @since 1.0.0

-	 *

-	 * @param string $catsql Row of SQL query.

-	 * @param string $search Row of searched fields to use in WHERE clause.

-	 */

-	$catsql = apply_filters('geodir_home_map_listing_query', $catsql, $search);

+    /**

+     * Filter the SQL query to retrive markers data

+     *

+     * @since 1.0.0

+     *

+     * @param string $catsql Row of SQL query.

+     * @param string $search Row of searched fields to use in WHERE clause.

+     */

+    $catsql = apply_filters('geodir_home_map_listing_query', $catsql, $search);

 	

     $catinfo = $wpdb->get_results($catsql);

 	

Spacing +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
     $gd_post_type = sanitize_text_field($_REQUEST['post_type']);

     $post_taxonomy = geodir_get_taxonomies($gd_post_type);

     $map_canvas_name = sanitize_text_field($_REQUEST['map_canvas']);

-    $child_collapse = (int)$_REQUEST['child_collapse'];

+    $child_collapse = (int) $_REQUEST['child_collapse'];

     echo home_map_taxonomy_walker($post_taxonomy, 0, true, 0, $map_canvas_name, $child_collapse, true);

     die;

 }

@@ -30,14 +30,14 @@ 
     global $wpdb, $plugin_prefix, $gd_session;

 

     if ($_REQUEST['m_id'] != '') {

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

+        $pid = (int) $_REQUEST['m_id'];

     } else {

         echo __('No marker data found', 'geodirectory');

         exit;

     }

 

     if (isset($_REQUEST['post_preview']) && $_REQUEST['post_preview'] != '' && $gd_ses_listing = $gd_session->get('listing')) {

-        $post = (object)$gd_ses_listing;

+        $post = (object) $gd_ses_listing;

         echo geodir_get_infowindow_html($post, $_REQUEST['post_preview']);

     } else {

         $geodir_post_type = get_post_type($pid);

@@ -193,7 +193,7 @@ 
 	 */

 	$groupby = apply_filters('geodir_home_map_listing_groupby', $groupby);

 

-    $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);

+    $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);

     

 	/**

 	 * Filter the SQL query to retrive markers data

@@ -269,7 +269,7 @@ 
                     $end_date = !empty($recurring_data['event_end']) && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? $recurring_data['event_end'] : $start_date;

                 

                     if ($end_date != '' && strtotime($end_date) >= $today) {

-                        $event_dates .= ' :: ' . date_i18n($geodir_date_format, strtotime($start_date)) .' -> ' . date_i18n($geodir_date_format, strtotime($end_date));

+                        $event_dates .= ' :: ' . date_i18n($geodir_date_format, strtotime($start_date)) . ' -> ' . date_i18n($geodir_date_format, strtotime($end_date));

                     }

                 }

 

@@ -284,7 +284,7 @@ 
             $mark_extra = (isset($catinfo_obj->marker_extra)) ? $catinfo_obj->marker_extra : '';

             $title = str_replace($srcharr, $replarr, $post_title);

 

-            $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 . '_' . $catinfo_obj->default_category . '","i":"' . $icon . '"'.$mark_extra.'}';

+            $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 . '_' . $catinfo_obj->default_category . '","i":"' . $icon . '"' . $mark_extra . '}';

             $post_ids[] = $catinfo_obj->post_id;

         }

     }

geodirectory-functions/map-functions/map_functions.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php

 /**

- * Google Map related functions.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * Google Map related functions.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 

 /**

  * Creates a global variable for storing map json data.

Spacing +4 added lines, -4 removed lines

@@ -61,7 +61,7 @@ 
         $title = str_replace($srcharr, $replarr, $post_title);

 

         if (is_ssl()) {

-            $icon = str_replace("http:","https:",$icon );

+            $icon = str_replace("http:", "https:", $icon);

         }

 

         $post_json = '{"id":"' . $post->ID . '","t": "' . $title . '","lt": "' . $post->post_latitude . '","ln": "' . $post->post_longitude . '","mk_id":"' . $post->ID . '_' . $post->default_category . '","i":"' . $icon . '"}';

@@ -73,7 +73,7 @@ 
          * @param string $post_json JSON representation of the post marker info.

          * @param object $post The post object.

          */

-        $map_jason[] = apply_filters('geodir_create_marker_jason_of_posts',$post_json, $post);

+        $map_jason[] = apply_filters('geodir_create_marker_jason_of_posts', $post_json, $post);

     }

 }

 

@@ -212,11 +212,11 @@ 
                     }

                 }

 

-                $term_check = '<input type="checkbox" ' . $checked . ' id="' .$map_canvas_name.'_tick_cat_'. $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"';

+                $term_check = '<input type="checkbox" ' . $checked . ' id="' . $map_canvas_name . '_tick_cat_' . $cat_term->term_id . '" class="group_selector ' . $main_list_class . '"';

                 $term_check .= ' name="' . $map_canvas_name . '_cat[]" ';

                 $term_check .= '  title="' . esc_attr(ucfirst($cat_term->name)) . '" value="' . $cat_term->term_id . '" onclick="javascript:build_map_ajax_search_param(\'' . $map_canvas_name . '\',false, this)">';

                 $term_img = '<img height="15" width="15" alt="' . $cat_term->taxonomy . '" src="' . $icon . '" title="' . ucfirst($cat_term->name) . '"/>';

-                $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name.'_tick_cat_'. $cat_term->term_id . '">' . $term_img . ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>';

+                $out .= '<li>' . $term_check . '<label for="' . $map_canvas_name . '_tick_cat_' . $cat_term->term_id . '">' . $term_img . ucfirst($cat_term->name) . '</label><i class="fa fa-long-arrow-down"></i>';

 

             endif;

 

Braces +8 added lines, -6 removed lines

@@ -98,10 +98,11 @@ 
                 unset($cat_content_info);

                 $cat_content_info[] = implode(',', $map_canvas_arr[$canvas]);

                 $totalcount = count(array_unique($map_jason));

-                if (!empty($cat_content_info))

-                    $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';

-                else

-                    $canvas_jason = '[{"totalcount":"0"}]';

+                if (!empty($cat_content_info)) {
+                                    $canvas_jason = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';
+                } else {
+                                    $canvas_jason = '[{"totalcount":"0"}]';
+                }
 

                 $map_canvas_jason_args = array($canvas . '_jason' => $canvas_jason);

 

@@ -232,8 +233,9 @@ 
 

         return $out;

     } else {

-        if ($cat_parent == 0)

-            return _e('No category', 'geodirectory');

+        if ($cat_parent == 0) {
+                    return _e('No category', 'geodirectory');
+        }
     }

     return;

 }