GeoDirectory / geodirectory

geodirectory_template_actions.php

Indentation +9 added lines, -9 removed lines

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

 /**

- * Template functions that affect the output of most GeoDirectory pages

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * Template functions that affect the output of most GeoDirectory pages

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 ###############################################

 ########### DYNAMIC CONTENT ###################

 ###############################################

@@ -1002,7 +1002,7 @@ 
 

     if ($preview) {

         $post_images = array();

-		if (isset($post->post_images) && !empty($post->post_images)) {

+        if (isset($post->post_images) && !empty($post->post_images)) {

             $post->post_images = trim($post->post_images, ",");

             $post_images = explode(",", $post->post_images);

         }

@@ -1195,9 +1195,9 @@ 
         } else {

             $post_term = $post->$post_taxonomy;

 			

-			if ($preview && !$is_backend_preview) {

-				$post_term = geodir_add_parent_terms($post_term, $post_taxonomy);

-			}

+            if ($preview && !$is_backend_preview) {

+                $post_term = geodir_add_parent_terms($post_term, $post_taxonomy);

+            }

         }

 

         $post_term = array_unique($post_term);

Braces +36 added lines, -25 removed lines

@@ -714,8 +714,9 @@ 
 

                         if (isset($post->post_default_category) && $post->post_default_category == $cat_id) {

                             if ($term_icon_url = get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type)) {

-                                if (isset($term_icon_url['src']) && $term_icon_url['src'] != '')

-                                    $term_icon = $term_icon_url['src'];

+                                if (isset($term_icon_url['src']) && $term_icon_url['src'] != '') {
+                                                                    $term_icon = $term_icon_url['src'];
+                                }
                                 break;

                             }

                         }

@@ -1244,8 +1245,9 @@ 
         echo '<span class="geodir-category">' . $taxonomies[$post_taxonomy] . '</span>';

     }

 

-    if (isset($taxonomies[$post_type . '_tags']))

-        echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';

+    if (isset($taxonomies[$post_type . '_tags'])) {
+            echo '<span class="geodir-tags">' . $taxonomies[$post_type . '_tags'] . '</span>';
+    }
 

     ?>

     </p><?php

@@ -1596,23 +1598,21 @@ 
     if(geodir_is_page('pt')){

         $gd_page = 'pt';

         $title  = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

-    }

-    elseif(geodir_is_page('listing')){

+    } elseif(geodir_is_page('listing')){

         $gd_page = 'listing';

         global $wp_query;

         $current_term = $wp_query->get_queried_object();

         if (strpos($current_term->taxonomy,'_tags') !== false) {

             $title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;

-        }else{

+        } else{

             $title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;

         }

 

-    }

-    elseif(geodir_is_page('author')){

+    } elseif(geodir_is_page('author')){

         $gd_page = 'author';

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

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else{

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -2023,8 +2023,9 @@ 
  */

 function geodir_action_add_listing_page_title()

 {

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

-        $listing_type = $_REQUEST['listing_type'];

+    if (isset($_REQUEST['listing_type']) && $_REQUEST['listing_type'] != '') {
+            $listing_type = $_REQUEST['listing_type'];
+    }
     /** This action is documented in geodirectory_template_actions.php */

     $class = apply_filters('geodir_page_title_class', 'entry-title fn');

     /** This action is documented in geodirectory_template_actions.php */

@@ -2036,7 +2037,7 @@ 
         $gd_page = 'add-listing';

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

             $title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;

-        }elseif(isset($listing_type)){

+        } elseif(isset($listing_type)){

             $title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;

         }

 

@@ -2094,7 +2095,11 @@ 
     $required_msg = '';

     $submit_button = '';

 

-    if (isset($_REQUEST['ajax_action'])) $ajax_action = $_REQUEST['ajax_action']; else $ajax_action = 'add';

+    if (isset($_REQUEST['ajax_action'])) {
+        $ajax_action = $_REQUEST['ajax_action'];
+    } else {
+        $ajax_action = 'add';
+    }
 

     $thumb_img_arr = array();

     $curImages = '';

@@ -2333,8 +2338,9 @@ 
         $totImg = 0;

         if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {

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

-            if (isset($post->post_images))

-                $curImages = trim($post->post_images, ",");

+            if (isset($post->post_images)) {
+                            $curImages = trim($post->post_images, ",");
+            }
 

 

             if ($curImages != '') {

@@ -2362,10 +2368,13 @@ 
             $totImg = count((array)$thumb_img_arr);

         }

 

-        if ($curImages != '')

-            $svalue = $curImages; // this will be initial value of the above form field. Image urls.

-        else

-            $svalue = '';

+        if ($curImages != '') {
+                    $svalue = $curImages;
+        }
+        // this will be initial value of the above form field. Image urls.

+        else {
+                    $svalue = '';
+        }
 

         $image_limit = $package_info->image_limit;

         $show_image_input_box = ($image_limit != '0');

@@ -2575,8 +2584,9 @@ 
     </script><?php

 

     global $errors;

-    if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim')

-        $errors->add('claim_login', LOGIN_CLAIM);

+    if (isset($_REQUEST['msg']) && $_REQUEST['msg'] == 'claim') {
+            $errors->add('claim_login', LOGIN_CLAIM);
+    }
 

     if (!empty($errors)) {

         foreach ($errors as $errorsObj) {

@@ -2680,8 +2690,9 @@ 
 

     if (!empty($term)) {

         $current_term = get_term_by('slug', $term, $taxonomy[0]);

-        if (!empty($current_term))

-            $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";

+        if (!empty($current_term)) {
+                    $list_title .= __(' in', 'geodirectory') . " '" . geodir_ucwords($current_term->name) . "'";
+        }
     }

 

 

@@ -2699,7 +2710,7 @@ 
         $gd_page = 'author';

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

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else{

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

Spacing +71 added lines, -71 removed lines

@@ -676,7 +676,7 @@ 
         }

     }

 

-    $post = (object)$_REQUEST;

+    $post = (object) $_REQUEST;

 

 

     if (isset($post->video)) {

@@ -1017,7 +1017,7 @@ 
                     @list($width, $height) = getimagesize(trim($image));

 

                     if ($image && $width && $height) {

-                        $image = (object)array('src' => $image, 'width' => $width, 'height' => $height);

+                        $image = (object) array('src' => $image, 'width' => $width, 'height' => $height);

                     }

 

                     if (isset($image->src)) {

@@ -1050,9 +1050,9 @@ 
                 } else {

                     $spacer_height = ((400 - $image->height) / 2);

                 }

-                $caption = '';//(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

+                $caption = ''; //(!empty($image->caption)) ? '<p class="flex-caption">'.$image->caption.'</p>' : '';

                 $main_slides .= '<li><img src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:' . $spacer_height . 'px;margin:0 auto;" />';

-                $main_slides .= '<img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />'.$caption.'</li>';

+                $main_slides .= '<img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:400px;margin:0 auto;" />' . $caption . '</li>';

                 $nav_slides .= '<li><img src="' . $image->src . '" alt="' . $image->title . '" title="' . $image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

                 $slides++;

             }

@@ -1088,7 +1088,7 @@ 
  */

 function geodir_action_details_taxonomies()

 {

-    global $preview, $post;?>

+    global $preview, $post; ?>

     <p class="geodir_post_taxomomies clearfix">

     <?php

     $taxonomies = array();

@@ -1166,12 +1166,12 @@ 
                          * @param string $tag_link The tag link html.

                          * @param object $term The tag term object.

                          */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link', $tag_link, $term);

                         $links[] = $tag_link;

                     } else {

                         $tag_link = "<a href='" . esc_attr(get_term_link($term->term_id, $term->taxonomy)) . "'>$term->name</a>";

                         /** This action is documented in geodirectory-template_actions.php */

-                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link',$tag_link,$term);

+                        $tag_link = apply_filters('geodir_details_taxonomies_tag_link', $tag_link, $term);

                         $links[] = $tag_link;

                     }

                     $terms[] = $term;

@@ -1181,7 +1181,7 @@ 
             if (!isset($listing_label)) {

                 $listing_label = '';

             }

-            $taxonomies[$post_type . '_tags'] = wp_sprintf('%s: %l', geodir_ucwords($listing_label . ' ' . __('Tags', 'geodirectory')), $links, (object)$terms);

+            $taxonomies[$post_type . '_tags'] = wp_sprintf('%s: %l', geodir_ucwords($listing_label . ' ' . __('Tags', 'geodirectory')), $links, (object) $terms);

         endif;

 

     }

@@ -1217,7 +1217,7 @@ 
                          * @param string $term_link The link html to the category.

                          * @param object $term The category term object.

                          */

-                        $term_link = apply_filters('geodir_details_taxonomies_cat_link',$term_link,$term);

+                        $term_link = apply_filters('geodir_details_taxonomies_cat_link', $term_link, $term);

                         $links[] = $term_link;

                         $terms[] = $term;

                     }

@@ -1235,7 +1235,7 @@ 
         if (!isset($listing_label)) {

             $listing_label = '';

         }

-        $taxonomies[$post_taxonomy] = wp_sprintf('%s: %l', geodir_ucwords($listing_label . ' ' . __('Category', 'geodirectory')), $links, (object)$terms);

+        $taxonomies[$post_taxonomy] = wp_sprintf('%s: %l', geodir_ucwords($listing_label . ' ' . __('Category', 'geodirectory')), $links, (object) $terms);

 

     }

 

@@ -1266,11 +1266,11 @@ 
  * @param object $post Optional. The post object or blank.

  * @package GeoDirectory

  */

-function geodir_action_details_micordata($post='')

+function geodir_action_details_micordata($post = '')

 {

 

     global $preview;

-    if(empty($post)){global $post;}

+    if (empty($post)) {global $post; }

     if ($preview || !geodir_is_page('detail')) {

         return;

     }

@@ -1291,7 +1291,7 @@ 
                 "description" => $review->comment_content,

                 "reviewRating" => array(

                     "@type" => "Rating",

-                    "bestRating" => "5",// @todo this will need to be filtered for review manager if user changes the score.

+                    "bestRating" => "5", // @todo this will need to be filtered for review manager if user changes the score.

                     "ratingValue" => geodir_get_commentoverall($review->comment_ID),

                     "worstRating" => "1"

                 )

@@ -1319,13 +1319,13 @@ 
     }

     //print_r($post);

     // external links

-    $external_links =  array();

+    $external_links = array();

     $external_links[] = $post->geodir_website;

     $external_links[] = $post->geodir_twitter;

     $external_links[] = $post->geodir_facebook;

     $external_links = array_filter($external_links);

 

-    if(!empty($external_links)){

+    if (!empty($external_links)) {

         $external_links = array_values($external_links);

     }

 

@@ -1335,16 +1335,16 @@ 
 

     // schema type

     $schema_type = 'LocalBusiness';

-    if(isset($post->default_category) && $post->default_category){

+    if (isset($post->default_category) && $post->default_category) {

         $schema_type = get_tax_meta($post->default_category, 'ct_cat_schema', false, $post->post_type);

-        if(!$schema_type && $post->post_type=='gd_event'){$schema_type = 'Event';}

+        if (!$schema_type && $post->post_type == 'gd_event') {$schema_type = 'Event'; }

     }

 

     $schema = array();

     $schema['@context'] = "http://schema.org";

     $schema['@type'] = $schema_type;

     $schema['name'] = $post->post_name;

-    $schema['description'] = wp_strip_all_tags( $post->post_content, true );

+    $schema['description'] = wp_strip_all_tags($post->post_content, true);

     $schema['telephone'] = $post->geodir_contact;

     $schema['url'] = $c_url;

     $schema['sameAs'] = $external_links;

@@ -1358,7 +1358,7 @@ 
         "postalCode" => $post->post_zip

     );

 

-    if($post->post_latitude && $post->post_longitude) {

+    if ($post->post_latitude && $post->post_longitude) {

         $schema['geo'] = array(

             "@type" => "GeoCoordinates",

             "latitude" => $post->post_latitude,

@@ -1366,7 +1366,7 @@ 
         );

     }

 

-    if($post_avgratings) {

+    if ($post_avgratings) {

         $schema['aggregateRating'] = array(

             "@type" => "AggregateRating",

             "ratingValue" => $post_avgratings,

@@ -1385,7 +1385,7 @@ 
      * @param array $schema The array of schema data to be filtered.

      * @param object $post The post object.

      */

-    $schema = apply_filters('geodir_details_schema', $schema,$post);

+    $schema = apply_filters('geodir_details_schema', $schema, $post);

 

 

     echo '<script type="application/ld+json">' . json_encode($schema) . '</script>';

@@ -1593,26 +1593,26 @@ 
 

 

     $title = $list_title;

-    if(geodir_is_page('pt')){

+    if (geodir_is_page('pt')) {

         $gd_page = 'pt';

-        $title  = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

+        $title = (get_option('geodir_page_title_pt')) ? get_option('geodir_page_title_pt') : $title;

     }

-    elseif(geodir_is_page('listing')){

+    elseif (geodir_is_page('listing')) {

         $gd_page = 'listing';

         global $wp_query;

         $current_term = $wp_query->get_queried_object();

-        if (strpos($current_term->taxonomy,'_tags') !== false) {

+        if (strpos($current_term->taxonomy, '_tags') !== false) {

             $title = (get_option('geodir_page_title_tag-listing')) ? get_option('geodir_page_title_tag-listing') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_cat-listing')) ? get_option('geodir_page_title_cat-listing') : $title;

         }

 

     }

-    elseif(geodir_is_page('author')){

+    elseif (geodir_is_page('author')) {

         $gd_page = 'author';

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

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

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -1626,7 +1626,7 @@ 
      * @param string $title The page title including variables.

      * @param string $gd_page The GeoDirectory page type if any.

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

     echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

         /**

@@ -1671,7 +1671,7 @@ 
         if ($cat_description) {

             ?>

 

-            <div class="term_description"><?php echo $cat_description;?></div> <?php

+            <div class="term_description"><?php echo $cat_description; ?></div> <?php

         }

 

     }

@@ -1956,7 +1956,7 @@ 
      */

     do_action('geodir_main_content_open', 'listings-page', 'geodir-main-content', 'listings-page');

     $extra_class = apply_filters('geodir_before_listing_wrapper_extra_class', '', 'listings-page');

-    echo '<div class="clearfix '.$extra_class.'">';

+    echo '<div class="clearfix ' . $extra_class . '">';

     /**

      * Called before the listings page content, inside the outer wrapper. Used on listings pages and search and author pages.

      *

@@ -2032,11 +2032,11 @@ 
 

     $title = apply_filters('geodir_add_listing_page_title_text', get_the_title());

 

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

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

         $gd_page = 'add-listing';

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

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

             $title = (get_option('geodir_page_title_edit-listing')) ? get_option('geodir_page_title_edit-listing') : $title;

-        }elseif(isset($listing_type)){

+        }elseif (isset($listing_type)) {

             $title = (get_option('geodir_page_title_add-listing')) ? get_option('geodir_page_title_add-listing') : $title;

         }

 

@@ -2050,7 +2050,7 @@ 
      * @param string $title The page title including variables.

      * @param string $gd_page The GeoDirectory page type if any.

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

     echo '<header class="' . $class_header . '"><h1 class="' . $class . '">';

     echo $title;

@@ -2066,7 +2066,7 @@ 
  */

 function geodir_action_add_listing_page_mandatory()

 {?>

-    <p class="geodir-note "><span class="geodir-required">*</span>&nbsp;<?php echo INDICATES_MANDATORY_FIELDS_TEXT;?></p>

+    <p class="geodir-note "><span class="geodir-required">*</span>&nbsp;<?php echo INDICATES_MANDATORY_FIELDS_TEXT; ?></p>

 <?php

 }

 

@@ -2101,7 +2101,7 @@ 
 

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

         global $post;

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

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

         $listing_type = $post->listing_type;

         $title = $post->post_title;

         $desc = $post->post_desc;

@@ -2143,10 +2143,10 @@ 
 

 

     ?>

-    <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id());?>"

+    <form name="propertyform" id="propertyform" action="<?php echo get_page_link(geodir_preview_page_id()); ?>"

           method="post" enctype="multipart/form-data">

-        <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type);?>"/>

-        <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type);?>"/>

+        <input type="hidden" name="preview" value="<?php echo sanitize_text_field($listing_type); ?>"/>

+        <input type="hidden" name="listing_type" value="<?php echo sanitize_text_field($listing_type); ?>"/>

         <?php if ($page_id) { ?><input type="hidden" name="add_listing_page_id"

                                        value="<?php echo $page_id; ?>" /><?php }?>

         <?php if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') { ?>

@@ -2163,9 +2163,9 @@ 
          *

          * @since 1.0.0

          */

-        do_action('geodir_before_detail_fields');?>

+        do_action('geodir_before_detail_fields'); ?>

 

-        <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT;?></h5>

+        <h5 id="geodir_fieldset_details" class="geodir-fieldset-row" gd-fieldset="details"><?php echo LISTING_DETAILS_TEXT; ?></h5>

 

         <?php

         /**

@@ -2175,13 +2175,13 @@ 
          *

          * @since 1.0.0

          */

-        do_action('geodir_before_main_form_fields');?>

+        do_action('geodir_before_main_form_fields'); ?>

 

         <div id="geodir_post_title_row" class="required_field geodir_form_row clearfix gd-fieldset-details">

-            <label><?php echo PLACE_TITLE_TEXT;?><span>*</span> </label>

+            <label><?php echo PLACE_TITLE_TEXT; ?><span>*</span> </label>

             <input type="text" field_type="text" name="post_title" id="post_title" class="geodir_textfield"

                    value="<?php echo esc_attr(stripslashes($title)); ?>"/>

-            <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory');?></span>

+            <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

         </div>

 

         <?php

@@ -2226,20 +2226,20 @@ 
         <div id="geodir_post_desc_row" class="<?php if ($desc_limit != '0') {

             echo 'required_field';

         }?> geodir_form_row clearfix gd-fieldset-details">

-            <label><?php echo PLACE_DESC_TEXT;?><span><?php if ($desc_limit != '0') {

+            <label><?php echo PLACE_DESC_TEXT; ?><span><?php if ($desc_limit != '0') {

                         echo '*';

                     }?></span> </label>

             <?php

             if (!empty($show_editor) && in_array($listing_type, $show_editor)) {

 

-                $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);?>

+                $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10); ?>

 

                 <div class="editor" field_id="post_desc" field_type="editor">

                     <?php wp_editor($desc, "post_desc", $editor_settings); ?>

                 </div>

             <?php if ($desc_limit != '') { ?>

                 <script

-                    type="text/javascript">jQuery('textarea#post_desc').attr('maxlength', "<?php echo $desc_limit;?>");</script>

+                    type="text/javascript">jQuery('textarea#post_desc').attr('maxlength', "<?php echo $desc_limit; ?>");</script>

             <?php } ?>

             <?php } else { ?>

                 <textarea field_type="textarea" name="post_desc" id="post_desc" class="geodir_textarea"

@@ -2248,7 +2248,7 @@ 
             <?php if ($desc_limit_msg != '') { ?>

                 <span class="geodir_message_note"><?php echo $desc_limit_msg; ?></span>

             <?php } ?>

-            <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory');?></span>

+            <span class="geodir_message_error"><?php echo _e($required_msg, 'geodirectory'); ?></span>

         </div>

         <?php

         /**

@@ -2298,8 +2298,8 @@ 
         <div id="geodir_post_tags_row" class="geodir_form_row clearfix gd-fieldset-details">

             <label><?php echo TAGKW_TEXT; ?></label>

             <input name="post_tags" id="post_tags" value="<?php echo $kw_tags; ?>" type="text" class="geodir_textfield"

-                   maxlength="<?php echo $kw_tags_count;?>"/>

-            <span class="geodir_message_note"><?php echo $kw_tags_msg;?></span>

+                   maxlength="<?php echo $kw_tags_count; ?>"/>

+            <span class="geodir_message_note"><?php echo $kw_tags_msg; ?></span>

         </div>

         <?php

         /**

@@ -2316,7 +2316,7 @@ 
 

         $package_info = geodir_post_package_info($package_info, $post);

 

-        geodir_get_custom_fields_html($package_info->pid, 'all', $listing_type);?>

+        geodir_get_custom_fields_html($package_info->pid, 'all', $listing_type); ?>

 

 

         <?php

@@ -2332,7 +2332,7 @@ 
         $thumb_img_arr = array();

         $totImg = 0;

         if (isset($_REQUEST['backandedit']) && empty($_REQUEST['pid'])) {

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

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

             if (isset($post->post_images))

                 $curImages = trim($post->post_images, ",");

 

@@ -2359,7 +2359,7 @@ 
                 //$curImages = $img->src.",";

             }

 

-            $totImg = count((array)$thumb_img_arr);

+            $totImg = count((array) $thumb_img_arr);

         }

 

         if ($curImages != '')

@@ -2380,7 +2380,7 @@ 
         if ($show_image_input_box) {

             ?>

 

-            <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT;?>

+            <h5 id="geodir_form_title_row" class="geodir-form_title"> <?php echo PRO_PHOTO_TEXT; ?>

                 <?php if ($image_limit == 1) {

                     echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

                 } ?>

@@ -2403,7 +2403,7 @@ 
                 <div

                     class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"

                     id="<?php echo $id; ?>plupload-upload-ui">

-                    <h4><?php _e('Drop files to upload', 'geodirectory');?></h4><br/>

+                    <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4><br/>

                     <input id="<?php echo $id; ?>plupload-browse-button" type="button"

                            value="<?php esc_attr_e('Select Files', 'geodirectory'); ?>" class="geodir_button"/>

                     <span class="ajaxnonceplu"

@@ -2420,7 +2420,7 @@ 
                      id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;">

                 </div>

                 <span

-                    id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory');?></span>

+                    id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory'); ?></span>

                 <span id="<?php echo $id; ?>upload-error" style="display:none"></span>

             </div>

 

@@ -2432,7 +2432,7 @@ 
          *

          * @since 1.0.0

          */

-        do_action('geodir_after_main_form_fields');?>

+        do_action('geodir_after_main_form_fields'); ?>

 

 

         <!-- add captcha code -->

@@ -2443,7 +2443,7 @@ 
         </script>

         <noscript>

             <div>

-                <label><?php _e('Type 64 into this box', 'geodirectory');?></label>

+                <label><?php _e('Type 64 into this box', 'geodirectory'); ?></label>

                 <input type="text" id="geodir_spamblocker_top_form" name="geodir_spamblocker" value="" maxlength="10"/>

             </div>

         </noscript>

@@ -2453,10 +2453,10 @@ 
         <!-- end captcha code -->

 

         <div id="geodir-add-listing-submit" class="geodir_form_row clear_both" style="padding:2px;text-align:center;">

-            <input type="submit" value="<?php echo PRO_PREVIEW_BUTTON;?>"

-                   class="geodir_button" <?php echo $submit_button;?>/>

+            <input type="submit" value="<?php echo PRO_PREVIEW_BUTTON; ?>"

+                   class="geodir_button" <?php echo $submit_button; ?>/>

             <span class="geodir_message_note"

-                  style="padding-left:0px;"> <?php _e('Note: You will be able to see a preview in the next page', 'geodirectory');?></span>

+                  style="padding-left:0px;"> <?php _e('Note: You will be able to see a preview in the next page', 'geodirectory'); ?></span>

         </div>

 

     </form>

@@ -2518,7 +2518,7 @@ 
         class="<?php

         /** This action is documented in geodirectory_template_actions.php */

         echo apply_filters('geodir_full_page_class', 'geodir_full_page clearfix', 'Reg/Login Top Section'); ?>">

-        <?php dynamic_sidebar('Reg/Login Top Section');?>

+        <?php dynamic_sidebar('Reg/Login Top Section'); ?>

     </div><!-- clearfix ends here-->

 <?php

 }

@@ -2540,7 +2540,7 @@ 
 

     ?>

     <script type="text/javascript">

-        <?php if ( $user_login ) { ?>

+        <?php if ($user_login) { ?>

         setTimeout(function () {

             try {

                 d = document.getElementById('user_pass');

@@ -2557,7 +2557,7 @@ 
         <?php } ?>

     </script>

     <script type="text/javascript">

-        <?php if ( $user_login ) { ?>

+        <?php if ($user_login) { ?>

         setTimeout(function () {

             try {

                 d = document.getElementById('user_pass');

@@ -2695,11 +2695,11 @@ 
     $class_header = apply_filters('geodir_page_title_header_class', 'entry-header');

 

     $title = $list_title;

-    if(geodir_is_page('author')){

+    if (geodir_is_page('author')) {

         $gd_page = 'author';

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

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

             $title = (get_option('geodir_page_title_favorite')) ? get_option('geodir_page_title_favorite') : $title;

-        }else{

+        } else {

             $title = (get_option('geodir_page_title_author')) ? get_option('geodir_page_title_author') : $title;

         }

 

@@ -2713,7 +2713,7 @@ 
      * @param string $title The page title including variables.

      * @param string $gd_page The GeoDirectory page type if any.

      */

-    $title =  apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

+    $title = apply_filters('geodir_seo_page_title', __($title, 'geodirectory'), $gd_page);

 

     echo '<header class="' . $class_header . '"><h1 class="' . $class . '">' .

         /**

@@ -2927,7 +2927,7 @@ 
     $post_type_info = get_post_type_object($gd_post_type);

 

     $pt_name = '';

-    if(isset($post_type_info->labels->name)){$pt_name=$post_type_info->labels->name;}

+    if (isset($post_type_info->labels->name)) {$pt_name = $post_type_info->labels->name; }

 

     if (is_search()) {

         $list_title = __('Search', 'geodirectory') . ' ' . __($pt_name, 'geodirectory') . __(' For :', 'geodirectory') . " '" . get_search_query() . "'";

geodirectory_template_tags.php

Braces +38 added lines, -20 removed lines

@@ -247,13 +247,14 @@ 
  */

 function geodir_add_async_forscript($url)

 {

-    if (strpos($url, '#asyncload')===false)

-        return $url;

-    else if (is_admin())

-        return str_replace('#asyncload', '', $url);

-    else

-        return str_replace('#asyncload', '', $url)."' async='async";

-}

+    if (strpos($url, '#asyncload')===false) {
+            return $url;
+    } else if (is_admin()) {
+            return str_replace('#asyncload', '', $url);
+    } else {
+            return str_replace('#asyncload', '', $url)."' async='async";
+    }
+    }

 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);

 

 /**

@@ -300,7 +301,7 @@ 
         wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-chosen-style');

 

-    }else{

+    } else{

         wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-core-scss');

 

@@ -361,8 +362,10 @@ 
 

     $half_pages_to_show = round($pages_to_show / 2);

 

-    if (geodir_is_page('home') || (get_option('geodir_set_as_home') && is_home())) // dont apply default  pagination for geodirectory home page.

-        return;

+    if (geodir_is_page('home') || (get_option('geodir_set_as_home') && is_home())) {
+        // dont apply default  pagination for geodirectory home page.

+        return;
+    }
 

     if (!is_single()) {

 		if (function_exists('geodir_location_geo_home_link')) {

@@ -435,11 +438,21 @@ 
     }

     $dist_dif = 1000;

 

-    if ($dist <= 5000) $dist_dif = 500;

-    if ($dist <= 1000) $dist_dif = 100;

-    if ($dist <= 500) $dist_dif = 50;

-    if ($dist <= 100) $dist_dif = 10;

-    if ($dist <= 50) $dist_dif = 5;

+    if ($dist <= 5000) {
+        $dist_dif = 500;
+    }
+    if ($dist <= 1000) {
+        $dist_dif = 100;
+    }
+    if ($dist <= 500) {
+        $dist_dif = 50;
+    }
+    if ($dist <= 100) {
+        $dist_dif = 10;
+    }
+    if ($dist <= 50) {
+        $dist_dif = 5;
+    }
 

     ?>

     <script type="text/javascript">

@@ -501,18 +514,23 @@ 
 {

 

     $default_search_for_text = SEARCH_FOR_TEXT;

-    if (get_option('geodir_search_field_default_text'))

-        $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

+    if (get_option('geodir_search_field_default_text')) {
+            $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
+    }
 

     $default_near_text = NEAR_TEXT;

-    if (get_option('geodir_near_field_default_text'))

-        $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

+    if (get_option('geodir_near_field_default_text')) {
+            $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
+    }
 

     ?>

 

 

     <script type="text/javascript">

-        var default_location = '<?php if($search_location = geodir_get_default_location())  echo $search_location->city ;?>';

+        var default_location = '<?php if($search_location = geodir_get_default_location()) {
+    echo $search_location->city ;
+}
+?>';

         var latlng;

         var Sgeocoder;

         var address;

Indentation +29 added lines, -29 removed lines

@@ -184,17 +184,17 @@ 
 

     wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

     if ($is_detail_page) {

-		wp_enqueue_script('geodirectory-post-custom-js');

-	}

+        wp_enqueue_script('geodirectory-post-custom-js');

+    }

 

     // font awesome rating script

-	if (get_option('geodir_reviewrating_enable_font_awesome')) {

-		wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);

-		wp_enqueue_script('geodir-barrating-js');

-	} else { // default rating script

-		wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);

-		wp_enqueue_script('geodir-jRating-js');

-	}

+    if (get_option('geodir_reviewrating_enable_font_awesome')) {

+        wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);

+        wp_enqueue_script('geodir-barrating-js');

+    } else { // default rating script

+        wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);

+        wp_enqueue_script('geodir-jRating-js');

+    }

 

     wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.js#asyncload', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodir-on-document-load');

@@ -230,7 +230,7 @@ 
  */

 function geodir_footer_scripts()

 {	

-	echo stripslashes(get_option('geodir_ga_tracking_code'));

+    echo stripslashes(get_option('geodir_ga_tracking_code'));

     echo stripslashes(get_option('geodir_footer_scripts'));

 }

 

@@ -363,9 +363,9 @@ 
         return;

 

     if (!is_single()) {

-		if (function_exists('geodir_location_geo_home_link')) {

-			remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

-		}

+        if (function_exists('geodir_location_geo_home_link')) {

+            remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

+        }

         $numposts = $wp_query->found_posts;

 

 

@@ -376,22 +376,22 @@ 
         }

 

         if ($max_page > 1 || $always_show) {

-			// Extra pagination info

-			$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

-			$start_no = ( $paged - 1 ) * $posts_per_page + 1;

-			$end_no = min($paged * $posts_per_page, $numposts);

+            // Extra pagination info

+            $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

+            $start_no = ( $paged - 1 ) * $posts_per_page + 1;

+            $end_no = min($paged * $posts_per_page, $numposts);

 			

-			if ($geodir_pagination_more_info != '') {

-				$pagination_info = '<div class="gd-pagination-details">' . wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts) . '</div>';

+            if ($geodir_pagination_more_info != '') {

+                $pagination_info = '<div class="gd-pagination-details">' . wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts) . '</div>';

 				

-				if ($geodir_pagination_more_info == 'before') {

-					$before = $before . $pagination_info;

-				} else if ($geodir_pagination_more_info == 'after') {

-					$after = $pagination_info . $after;

-				}

-			}

+                if ($geodir_pagination_more_info == 'before') {

+                    $before = $before . $pagination_info;

+                } else if ($geodir_pagination_more_info == 'after') {

+                    $after = $pagination_info . $after;

+                }

+            }

 			

-			echo "$before <div class='Navi'>";

+            echo "$before <div class='Navi'>";

             if ($paged >= ($pages_to_show - 1)) {

                 echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';

             }

@@ -412,9 +412,9 @@ 
             echo "</div> $after";

         }

 		

-		if (function_exists('geodir_location_geo_home_link')) {

-			add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

-		}

+        if (function_exists('geodir_location_geo_home_link')) {

+            add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

+        }

     }

 }

 

Spacing +35 added lines, -35 removed lines

@@ -37,7 +37,7 @@ 
 {

     $is_detail_page = false;

 

-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {

+    if ((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview'))) {

         $is_detail_page = true;

     }

 

@@ -51,7 +51,7 @@ 
         'siteurl' => get_option('siteurl'),

         'geodir_plugin_url' => geodir_plugin_url(),

         'geodir_ajax_url' => geodir_get_ajax_url(),

-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),

+        'geodir_gd_modal' => (int) get_option('geodir_disable_gb_modal'),

         'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue

     );

 

@@ -72,25 +72,25 @@ 
      *

      * }

      */

-    $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);

+    $geodir_vars_data = apply_filters('geodir_vars_data', $geodir_vars_data);

 

     wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);

 

 

 

 

-    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);

-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}

+    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION, true);

+    if ($is_detail_page) {wp_enqueue_script('geodirectory-jquery-flexslider-js'); }

 

 

 

-    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);

+    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodirectory-lightbox-jquery');

 

 

 

-    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);

-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-simplemodal');}

+    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION, true);

+    if ($is_detail_page) {wp_enqueue_script('geodirectory-jquery-simplemodal'); }

 

 

     //if( get_option('geodir_enqueue_google_api_script')==1)

@@ -111,7 +111,7 @@ 
             wp_enqueue_script( 'geodirectory-googlemap-script' );

            }

         */

-    wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);

+    wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodirectory-goMap-script');

 

 

@@ -133,7 +133,7 @@ 
         wp_enqueue_script('plupload-all');

         wp_enqueue_script('jquery-ui-sortable');

 

-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);

+        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

         wp_enqueue_script('geodirectory-plupload-script');

 

         // SCRIPT FOR UPLOAD END

@@ -245,12 +245,12 @@ 
  */

 function geodir_add_async_forscript($url)

 {

-    if (strpos($url, '#asyncload')===false)

+    if (strpos($url, '#asyncload') === false)

         return $url;

     else if (is_admin())

         return str_replace('#asyncload', '', $url);

     else

-        return str_replace('#asyncload', '', $url)."' async='async";

+        return str_replace('#asyncload', '', $url) . "' async='async";

 }

 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);

 

@@ -264,7 +264,7 @@ 
 {

 

 

-    if(get_option('geodir_scss_core')) {

+    if (get_option('geodir_scss_core')) {

 

 

         wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

@@ -298,7 +298,7 @@ 
         wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-chosen-style');

 

-    }else{

+    } else {

         wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-core-scss');

 

@@ -306,7 +306,7 @@ 
 

     }

 

-    if(is_rtl()){

+    if (is_rtl()) {

     wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);

     wp_enqueue_style('geodirectory-frontend-rtl-style');

     }

@@ -378,7 +378,7 @@ 
         if ($max_page > 1 || $always_show) {

 			// Extra pagination info

 			$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

-			$start_no = ( $paged - 1 ) * $posts_per_page + 1;

+			$start_no = ($paged - 1) * $posts_per_page + 1;

 			$end_no = min($paged * $posts_per_page, $numposts);

 			

 			if ($geodir_pagination_more_info != '') {

@@ -445,7 +445,7 @@ 
         jQuery(function ($) {

             $("#distance_slider").slider({

                 range: true,

-                values: [0, <?php echo ($_REQUEST['sdist']!='') ? $_REQUEST['sdist'] : "0"; ?>],

+                values: [0, <?php echo ($_REQUEST['sdist'] != '') ? $_REQUEST['sdist'] : "0"; ?>],

                 min: 0,

                 max: <?php echo $dist; ?>,

                 step: <?php echo $dist_dif; ?>,

@@ -510,7 +510,7 @@ 
 

 

     <script type="text/javascript">

-        var default_location = '<?php if($search_location = geodir_get_default_location())  echo $search_location->city ;?>';

+        var default_location = '<?php if ($search_location = geodir_get_default_location())  echo $search_location->city; ?>';

         var latlng;

         var Sgeocoder;

         var address;

@@ -523,7 +523,7 @@ 
 				var $form = jQuery(this).closest('form');

 				

 				if (jQuery("#sdist input[type='radio']:checked").length != 0) dist = jQuery("#sdist input[type='radio']:checked").val();

-				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text;?>') jQuery('.search_text', $form).val(s);

+				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text; ?>') jQuery('.search_text', $form).val(s);

 				

 				// Disable location based search for disabled location post type.

 				if (jQuery('.search_by_post', $form).val() != '' && typeof gd_cpt_no_location == 'function') {

@@ -537,7 +537,7 @@ 
 					}

 				}

 				

-				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text;?>')) {

+				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text; ?>')) {

 					geodir_setsearch($form);

 				} else {

 					jQuery(".snear", $form).val('');

@@ -557,7 +557,7 @@ 
 		});

         

 		function geodir_setsearch($form) {

-			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text;?>')) jQuery(".snear", $form).val(default_location);

+			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text; ?>')) jQuery(".snear", $form).val(default_location);

 			geocodeAddress($form);

 		}

 

@@ -570,8 +570,8 @@ 
         function geocodeAddress($form) {

             Sgeocoder = new google.maps.Geocoder(); // Call the geocode function

 

-            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {

-                if (jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {

+            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {

+                if (jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {

                     jQuery(".snear", $form).val('');

                 }

                 jQuery($form).submit();

@@ -579,24 +579,24 @@ 
 

                 var address = jQuery(".snear", $form).val();

 

-                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text;?>') {

+                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text; ?>') {

                     initialise2();

                 } else {

 

                     Sgeocoder.geocode({'address': address<?php

-                    if($near_add = get_option('geodir_search_near_addition')){echo '+", '.$near_add.'"';}

-                    if($near_add2 =

+                    if ($near_add = get_option('geodir_search_near_addition')) {echo '+", ' . $near_add . '"'; }

+                    if ($near_add2 =

                     /**

                      * Adds any extra info to the near search box query when trying to geolocate it via google api.

                      *

                      * @since 1.0.0

                      */

-                    apply_filters('geodir_search_near_addition','')){echo $near_add2;}//gt_advanced_near_search();?>},

+                    apply_filters('geodir_search_near_addition', '')) {echo $near_add2; }//gt_advanced_near_search();?>},

                         function (results, status) {

                             if (status == google.maps.GeocoderStatus.OK) {

                                 updateSearchPosition(results[0].geometry.location, $form);

                             } else {

-                                alert("<?php _e('Search was not successful for the following reason:','geodirectory');?>" + status);

+                                alert("<?php _e('Search was not successful for the following reason:', 'geodirectory'); ?>" + status);

                             }

                         });

                 }

@@ -627,19 +627,19 @@ 
             var msg;

             switch (err.code) {

                 case err.UNKNOWN_ERROR:

-                    msg = "<?php _e('Unable to find your location','geodirectory');?>";

+                    msg = "<?php _e('Unable to find your location', 'geodirectory'); ?>";

                     break;

                 case err.PERMISSION_DENINED:

-                    msg = "<?php _e('Permission denied in finding your location','geodirectory');?>";

+                    msg = "<?php _e('Permission denied in finding your location', 'geodirectory'); ?>";

                     break;

                 case err.POSITION_UNAVAILABLE:

-                    msg = "<?php _e('Your location is currently unknown','geodirectory');?>";

+                    msg = "<?php _e('Your location is currently unknown', 'geodirectory'); ?>";

                     break;

                 case err.BREAK:

-                    msg = "<?php _e('Attempt to find location took too long','geodirectory');?>";

+                    msg = "<?php _e('Attempt to find location took too long', 'geodirectory'); ?>";

                     break;

                 default:

-                    msg = "<?php _e('Location detection not supported in browser','geodirectory');?>";

+                    msg = "<?php _e('Location detection not supported in browser', 'geodirectory'); ?>";

             }

             jQuery('#info').html(msg);

         }

@@ -679,7 +679,7 @@ 
              * @param object $post The post object.

              * @param string $link The link to the post.

              */

-            return apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);

+            return apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>', $post, $link);

             break;

         case 'new' :

             /**

@@ -689,7 +689,7 @@ 
              * @param object $post The post object.

              * @param string $link The link to the post.

              */

-            return apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);

+            return apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>', $post, $link);

             break;

 

     }

geodirectory_widgets.php

Indentation +1 added lines, -1 removed lines

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

          */

         include_once('geodirectory-widgets/geodirectory_bestof_widget.php');

-		/**

+        /**

          * Contains all functions for cpt categories widget.

          *

          * @since 1.5.4

Spacing +15 added lines, -15 removed lines

@@ -301,7 +301,7 @@ 
             public function form($instance)

             {

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

                 $title = strip_tags($instance['title']);

 

                 ?>

@@ -373,7 +373,7 @@ 
                 ?>

 

                 <a href="http://twitter.com/share"

-                   class="twitter-share-button"><?php _e('Tweet', 'geodirectory');?></a>

+                   class="twitter-share-button"><?php _e('Tweet', 'geodirectory'); ?></a>

 

                 <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>

 

@@ -443,7 +443,7 @@ 
             public function form($instance)

             {

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => ''));

                 $title = strip_tags($instance['title']);

                 ?>

                 <p>No settings for this widget</p>

@@ -519,7 +519,7 @@ 
                 echo 'http://feeds2.feedburner.com/' . $id;

             } else {

                 bloginfo('rss_url');

-            } ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title;?>

+            } ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title; ?>

 

                 <?php if ($text <> "") { ?>

 

@@ -584,7 +584,7 @@ 
             public function form($instance)

             {

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));

 

                 $id = strip_tags($instance['id']);

 

@@ -596,19 +596,19 @@ 
 

                 ?>

                 <p><label

-                        for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title', 'geodirectory');?>:

+                        for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title', 'geodirectory'); ?>:

                         <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"

                                name="<?php echo $this->get_field_name('title'); ?>" type="text"

                                value="<?php echo esc_attr($title); ?>"/></label></p>

 

                 <p><label

-                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Feedburner ID (ex :- geotheme)', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Feedburner ID (ex :- geotheme)', 'geodirectory'); ?>

                         : <input class="widefat" id="<?php echo $this->get_field_id('id'); ?>"

                                  name="<?php echo $this->get_field_name('id'); ?>" type="text"

                                  value="<?php echo esc_attr($id); ?>"/></label></p>

 

                 <p><label

-                        for="<?php echo $this->get_field_id('text'); ?>"><?php _e('Short Description', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('text'); ?>"><?php _e('Short Description', 'geodirectory'); ?>

                         <textarea class="widefat" rows="6" cols="20" id="<?php echo $this->get_field_id('text'); ?>"

                                   name="<?php echo $this->get_field_name('text'); ?>"><?php echo esc_attr($text); ?></textarea></label>

                 </p>

@@ -704,12 +704,12 @@ 
             public function form($instance)

             {

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

 

                 $desc1 = ($instance['desc1']);

                 ?>

                 <p><label

-                        for="<?php echo $this->get_field_id('desc1'); ?>"><?php _e('Your Advt code (ex.google adsense, etc.)', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('desc1'); ?>"><?php _e('Your Advt code (ex.google adsense, etc.)', 'geodirectory'); ?>

                         <textarea class="widefat" rows="6" cols="20" id="<?php echo $this->get_field_id('desc1'); ?>"

                                   name="<?php echo $this->get_field_name('desc1'); ?>"><?php echo esc_attr($desc1); ?></textarea></label>

                 </p>

@@ -819,14 +819,14 @@ 
             {

 

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'number' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => '', 'id' => '', 'number' => ''));

                 $id = strip_tags($instance['id']);

                 $number = strip_tags($instance['number']);

                 ?>

 

                 <p>

                     <label

-                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Flickr ID', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Flickr ID', 'geodirectory'); ?>

                         (<a href="http://www.idgettr.com">idGettr</a>):

                         <input class="widefat" id="<?php echo $this->get_field_id('id'); ?>"

                                name="<?php echo $this->get_field_name('id'); ?>" type="text"

@@ -836,7 +836,7 @@ 
 

                 <p>

                     <label

-                        for="<?php echo $this->get_field_id('number'); ?>"><?php _e('Number of photos:', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('number'); ?>"><?php _e('Number of photos:', 'geodirectory'); ?>

                         <input class="widefat" id="<?php echo $this->get_field_id('number'); ?>"

                                name="<?php echo $this->get_field_name('number'); ?>" type="text"

                                value="<?php echo esc_attr($number); ?>"/>

@@ -932,12 +932,12 @@ 
             public function form($instance)

             {

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));

 

                 $desc1 = ($instance['gd_tw_desc1']);

                 ?>

                 <p><label

-                        for="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"><?php _e('Your twitter code', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"><?php _e('Your twitter code', 'geodirectory'); ?>

                         <textarea class="widefat" rows="6" cols="20"

                                   id="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"

                                   name="<?php echo $this->get_field_name('gd_tw_desc1'); ?>"><?php echo esc_attr($desc1); ?></textarea></label>

upgrade.php

Spacing +29 added lines, -29 removed lines

@@ -47,7 +47,7 @@ 
     }

 

 

-    add_action('init', 'gd_fix_cpt_rewrite_slug', 11);// this needs to be kept for a few versions

+    add_action('init', 'gd_fix_cpt_rewrite_slug', 11); // this needs to be kept for a few versions

 

     update_option('geodirectory' . '_db_version', GEODIRECTORY_VERSION);

 

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

  * @package GeoDirectory

  */

-function geodir_upgrade_146(){

+function geodir_upgrade_146() {

     gd_convert_virtual_pages();

 }

 

@@ -94,7 +94,7 @@ 
  * @since 1.5.0

  * @package GeoDirectory

  */

-function geodir_upgrade_150(){

+function geodir_upgrade_150() {

     gd_fix_cpt_rewrite_slug();

 }

 

@@ -106,12 +106,12 @@ 
  * @since 1.4.8

  * @package GeoDirectory

  */

-function geodir_upgrade_148(){

+function geodir_upgrade_148() {

     /*

      * Blank the users google password if present as we now use oAuth 2.0

      */

-    update_option('geodir_ga_pass','');

-    update_option('geodir_ga_user','');

+    update_option('geodir_ga_pass', '');

+    update_option('geodir_ga_user', '');

 

 }

 

@@ -122,7 +122,7 @@ 
  * @since 1.5.3

  * @package GeoDirectory

  */

-function geodir_upgrade_153(){

+function geodir_upgrade_153() {

     geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

     geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

 }

@@ -133,7 +133,7 @@ 
  * @since 1.5.3

  * @package GeoDirectory

  */

-function geodir_upgrade_154(){

+function geodir_upgrade_154() {

     geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

 }

 

@@ -143,7 +143,7 @@ 
  * @since 1.5.2

  * @package GeoDirectory

  */

-function geodir_upgrade_152(){

+function geodir_upgrade_152() {

     gd_fix_address_detail_table_limit();

 }

 

@@ -641,7 +641,7 @@ 
 

     update_option('gd_theme_compats', $theme_compat);

 

-    gd_set_theme_compat();// set the compat pack if avail

+    gd_set_theme_compat(); // set the compat pack if avail

 }

 

 

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

  * @global object $wpdb WordPress Database object.

  */

-function gd_convert_virtual_pages(){

+function gd_convert_virtual_pages() {

     global $wpdb;

 

     // Update the add listing page settings

@@ -663,9 +663,9 @@ 
         )

     );

 

-    if($add_listing_page){

-        wp_update_post( array('ID' => $add_listing_page, 'post_status' => 'publish') );

-        update_option( 'geodir_add_listing_page', $add_listing_page);

+    if ($add_listing_page) {

+        wp_update_post(array('ID' => $add_listing_page, 'post_status' => 'publish'));

+        update_option('geodir_add_listing_page', $add_listing_page);

     }

 

     // Update the listing preview page settings

@@ -676,9 +676,9 @@ 
         )

     );

 

-    if($listing_preview_page){

-        wp_update_post( array('ID' => $listing_preview_page, 'post_status' => 'publish') );

-        update_option( 'geodir_preview_page', $listing_preview_page);

+    if ($listing_preview_page) {

+        wp_update_post(array('ID' => $listing_preview_page, 'post_status' => 'publish'));

+        update_option('geodir_preview_page', $listing_preview_page);

     }

 

     // Update the listing success page settings

@@ -689,9 +689,9 @@ 
         )

     );

 

-    if($listing_success_page){

-        wp_update_post( array('ID' => $listing_success_page, 'post_status' => 'publish') );

-        update_option( 'geodir_success_page', $listing_success_page);

+    if ($listing_success_page) {

+        wp_update_post(array('ID' => $listing_success_page, 'post_status' => 'publish'));

+        update_option('geodir_success_page', $listing_success_page);

     }

 

     // Update the listing success page settings

@@ -702,11 +702,11 @@ 
         )

     );

 

-    if($location_page){

+    if ($location_page) {

         $location_slug = get_option('geodir_location_prefix');

-        if(!$location_slug ){$location_slug  = 'location';}

-        wp_update_post( array('ID' => $location_page, 'post_status' => 'publish','post_name' => $location_slug) );

-        update_option( 'geodir_location_page', $location_page);

+        if (!$location_slug) {$location_slug = 'location'; }

+        wp_update_post(array('ID' => $location_page, 'post_status' => 'publish', 'post_name' => $location_slug));

+        update_option('geodir_location_page', $location_page);

     }

 

 }

@@ -725,13 +725,13 @@ 
     $post_types = get_option('geodir_post_types');

 

 

-    if (is_array($post_types)){

+    if (is_array($post_types)) {

 

         foreach ($post_types as $post_type => $args) {

 

 

-            if(isset($args['rewrite']['slug'])){

-                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%","",$args['rewrite']['slug']);

+            if (isset($args['rewrite']['slug'])) {

+                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%", "", $args['rewrite']['slug']);

             }

 

                 $alt_post_types[$post_type] = $args;

@@ -739,8 +739,8 @@ 
         }

     }

 

-    if(!empty($alt_post_types)) {

-        update_option('geodir_post_types',$alt_post_types);

+    if (!empty($alt_post_types)) {

+        update_option('geodir_post_types', $alt_post_types);

         }