GeoDirectory / geodirectory

geodirectory-functions/post_functions.php

Doc Comments +3 added lines, -3 removed lines

@@ -721,7 +721,7 @@ 
      * @param int $post_id The post ID.

      * @param string $postmeta Detail table column name.

      * @param string $meta_value Detail table column value.

-     * @return void|bool

+     * @return null|false

      */

     function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '')

     {

@@ -775,7 +775,7 @@ 
      * @param string $postmeta Detail table column name.

      * @todo check if this is depreciated

      * @todo Fix unknown variable mval

-     * @return bool

+     * @return boolean|null

      */

     function geodir_delete_post_meta($post_id, $postmeta)

     {

@@ -2140,7 +2140,7 @@ 
      * @global string $plugin_prefix Geodirectory plugin table prefix.

      * @param int $deleted_postid The post ID.

      * @param bool $force Optional. Do you want to force delete it? Default: false.

-     * @return bool|void

+     * @return null|false

      */

     function geodir_delete_listing_info($deleted_postid, $force = false)

     {

Indentation +4 added lines, -4 removed lines

@@ -79,7 +79,7 @@ 
      * @global object $wpdb WordPress Database object.

      * @global object $post The current post object.

      * @global object $current_user Current user object.

-	 * @global object $gd_session GeoDirectory Session object.

+     * @global object $gd_session GeoDirectory Session object.

      * @param array $request_info {

      *    Array of request info arguments.

      *

@@ -2554,9 +2554,9 @@ 
 function geodir_excerpt_length($length)

 {

     global $wp_query, $geodir_is_widget_listing;

-	if ($geodir_is_widget_listing) {

-		return $length;

-	}

+    if ($geodir_is_widget_listing) {

+        return $length;

+    }

 	

     if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))

         $length = get_option('geodir_desc_word_limit');

Spacing +54 added lines, -54 removed lines

@@ -26,11 +26,11 @@ 
 

     if (!isset($default_cat) || empty($default_cat)) {

         $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';

-    }else{

-        if(!is_int($default_cat)){

+    } else {

+        if (!is_int($default_cat)) {

             $category = get_term_by('name', $default_cat, $taxonomy);

-            if(isset($category->term_id)){

-                $default_cat =  $category->term_id;

+            if (isset($category->term_id)) {

+                $default_cat = $category->term_id;

             }

         }

 

@@ -227,7 +227,7 @@ 
         $send_post_submit_mail = false;

 

         // unhook this function so it doesn't loop infinitely

-        remove_action('save_post', 'geodir_post_information_save',10,2);

+        remove_action('save_post', 'geodir_post_information_save', 10, 2);

 

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

             $post['ID'] = $request_info['pid'];

@@ -251,7 +251,7 @@ 
         }

 

         // re-hook this function

-        add_action('save_post', 'geodir_post_information_save',10,2);

+        add_action('save_post', 'geodir_post_information_save', 10, 2);

 

         $post_tags = '';

         if (!isset($request_info['post_tags'])) {

@@ -275,7 +275,7 @@ 
         $payment_info = array();

         $package_info = array();

 

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

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

 

         $post_package_id = geodir_get_post_meta($last_post_id, 'package_id');

 

@@ -474,7 +474,7 @@ 
                 $tmpimgArr = trim($request_info['post_images'], ",");

                 $tmpimgArr = explode(",", $tmpimgArr);

                 geodir_save_post_images($last_post_id, $tmpimgArr, $dummy);

-            } else{

+            } else {

                 geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy);

             }

 

@@ -658,7 +658,7 @@ 
 

             $post_meta_set_query = trim($post_meta_set_query, ", ");

 

-            $post_meta_set_query = str_replace('%', '%%', $post_meta_set_query);// escape %

+            $post_meta_set_query = str_replace('%', '%%', $post_meta_set_query); // escape %

 

             /**

              * Called before saving the listing info.

@@ -928,7 +928,7 @@ 
                 $file_path = '';

                 /* --------- start ------- */

 

-                $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));

+                $split_img_path = explode(str_replace(array('http://', 'https://'), '', $uploads['baseurl']), str_replace(array('http://', 'https://'), '', $post_image[$m]));

 

                 $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

 

@@ -985,20 +985,20 @@ 
                         }

 

                         $external_img = false;

-                        if (strpos(str_replace(array('http://','https://'),'',$curr_img_url), str_replace(array('http://','https://'),'',$uploads['baseurl'])) !== false) {

+                        if (strpos(str_replace(array('http://', 'https://'), '', $curr_img_url), str_replace(array('http://', 'https://'), '', $uploads['baseurl'])) !== false) {

                         } else {

                             $external_img = true;

                         }

 

                         if ($dummy || $external_img) {

                             $uploaded_file = array();

-                            $uploaded = (array)fetch_remote_file($curr_img_url);

+                            $uploaded = (array) fetch_remote_file($curr_img_url);

 

                             if (isset($uploaded['error']) && empty($uploaded['error'])) {

                                 $new_name = basename($uploaded['file']);

                                 $uploaded_file = $uploaded;

-                            }else{

-                                print_r($uploaded);exit;

+                            } else {

+                                print_r($uploaded); exit;

                             }

                             $external_img = false;

                         } else {

@@ -1031,7 +1031,7 @@ 
                                 $file_path = $sub_dir . '/' . $new_name;

                             }

 

-                            $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);

+                            $postcurr_images[] = str_replace(array('http://', 'https://'), '', $uploads['baseurl'] . $file_path);

 

                             if ($menu_order == 1) {

 

@@ -1069,7 +1069,7 @@ 
                 } else {

                     $valid_file_ids[] = $find_image;

 

-                    $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);

+                    $postcurr_images[] = str_replace(array('http://', 'https://'), '', $post_image[$m]);

 

                     $wpdb->query(

                         $wpdb->prepare(

@@ -1103,9 +1103,9 @@ 
 

                 foreach ($post_images as $img) {

 

-                    if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {

+                    if (!in_array(str_replace(array('http://', 'https://'), '', $img->src), $postcurr_images)) {

 

-                        $invalid_files[] = (object)array('src' => $img->src);

+                        $invalid_files[] = (object) array('src' => $img->src);

 

                     }

 

@@ -1113,7 +1113,7 @@ 
 

             }

 

-            $invalid_files = (object)$invalid_files;

+            $invalid_files = (object) $invalid_files;

         }

 

         $remove_files[] = $post_id;

@@ -1248,7 +1248,7 @@ 
         }

 

         if (!in_array($post_type, geodir_get_posttypes())) {

-            return false;// if not a GD CPT return;

+            return false; // if not a GD CPT return;

         }

 

         $table = $plugin_prefix . $post_type . '_detail';

@@ -1287,7 +1287,7 @@ 
              * @param string $uploads_url The server upload directory url.

              * @param string $uploads_baseurl The uploads dir base url.

              */

-            $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

+            $img_arr['src'] = apply_filters('geodir_get_featured_image_src', $uploads_url . '/' . $file_name, $file_name, $uploads_url, $uploads_baseurl);

             $img_arr['path'] = $uploads_path . '/' . $file_name;

             @list($width, $height) = getimagesize($img_arr['path']);

             $img_arr['width'] = $width;

@@ -1344,7 +1344,7 @@ 
         }

 

         if (!empty($img_arr))

-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );

+            return (object) $img_arr; //return (object)array( 'src' => $file_url, 'path' => $file_path );

         else

             return false;

 

@@ -1450,7 +1450,7 @@ 
                 * @param string $uploads_url The server upload directory url.

                 * @param string $uploads_baseurl The uploads dir base url.

                 */

-                $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

+                $img_arr['src'] = apply_filters('geodir_get_images_src', $uploads_url . '/' . $file_name, $file_name, $uploads_url, $uploads_baseurl);

                 $img_arr['path'] = $uploads_path . '/' . $file_name;

                 @list($width, $height) = getimagesize($img_arr['path']);

                 $img_arr['width'] = $width;

@@ -1462,13 +1462,13 @@ 
                 $img_arr['content'] = $attechment->content; // add the description to the array

                 $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.

 

-                $return_arr[] = (object)$img_arr;

+                $return_arr[] = (object) $img_arr;

 

 

                 $counter++;

 

             }

-            return (object)$return_arr;

+            return (object) $return_arr;

         } else if ($no_images) {

             $default_img = '';

             $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

@@ -1502,7 +1502,7 @@ 
                 $img_arr['title'] = $file_name; // add the title to the array

                 $img_arr['content'] = $file_name; // add the description to the array

 

-                $return_arr[] = (object)$img_arr;

+                $return_arr[] = (object) $img_arr;

 

                 return $return_arr;

 

@@ -1535,21 +1535,21 @@ 
         $html = '';

         if (!empty($request)) {

 

-            if (!is_object($request)){

-                $request = (object)$request;

+            if (!is_object($request)) {

+                $request = (object) $request;

             }

 

 

-            if(isset($request->src) && !isset($request->path)){$request->path = $request->src;}

+            if (isset($request->src) && !isset($request->path)) {$request->path = $request->src; }

 

             /*

              * getimagesize() works faster from path than url so we try and get path if we can.

              */

             $upload_dir = wp_upload_dir();

-            $img_no_http = str_replace(array("http://","https://"),"",$request->path);

-            $upload_no_http = str_replace(array("http://","https://"),"",$upload_dir['baseurl']);

-            if (strpos($img_no_http ,$upload_no_http ) !== false) {

-                $request->path = str_replace( $img_no_http,$upload_dir['basedir'],$request->path);

+            $img_no_http = str_replace(array("http://", "https://"), "", $request->path);

+            $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);

+            if (strpos($img_no_http, $upload_no_http) !== false) {

+                $request->path = str_replace($img_no_http, $upload_dir['basedir'], $request->path);

             }

 

             @list($width, $height) = getimagesize($request->path);

@@ -1557,7 +1557,7 @@ 
             $image->width = $width;

             $image->height = $height;

 

-            $max_size = (object)geodir_get_imagesize($size);

+            $max_size = (object) geodir_get_imagesize($size);

 

             if (!is_wp_error($max_size)) {

 

@@ -1571,10 +1571,10 @@ 
                         $width_per = 100;

                 }

 

-                if (is_admin() && !isset($_REQUEST['geodir_ajax'])){

+                if (is_admin() && !isset($_REQUEST['geodir_ajax'])) {

                     $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';

                 }

-                else{

+                else {

                     $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

                 }

 

@@ -1903,7 +1903,7 @@ 
                                     } ?>"><img alt="bubble image" style="max-height:50px;"

                                                src="<?php echo $post_images[0]; ?>"/></a></div>

                             <?php

-                            }else{

+                            } else {

                                 echo '<div class="geodir-bubble_image"></div>';

                             }

                         } else {

@@ -1911,7 +1911,7 @@ 
                                 ?>

                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>

                             <?php

-                            }else{

+                            } else {

                                 echo '<div class="geodir-bubble_image"></div>';

                             }

                         }

@@ -1945,7 +1945,7 @@ 
                              * @param object $postinfo_obj The posts info as an object.

                              * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *

                              */

-                            do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );

+                            do_action('geodir_infowindow_meta_after', $postinfo_obj, $post_preview);

                             ?>

                         </div>

                         <?php

@@ -1957,10 +1957,10 @@ 
                             <div class="geodir-bubble-meta-fade"></div>

 

                             <div class="geodir-bubble-meta-bottom">

-                                <span class="geodir-bubble-rating"><?php echo $rating_star;?></span>

+                                <span class="geodir-bubble-rating"><?php echo $rating_star; ?></span>

 

                                 <span

-                                    class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID);?></span>

+                                    class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID); ?></span>

                   <span class="geodir-bubble-reviews"><a href="<?php echo get_comments_link($ID); ?>"

                                                          class="geodir-pcomments"><i class="fa fa-comments"></i>

                           <?php echo get_comments_number($ID); ?>

@@ -2255,7 +2255,7 @@ 
          */

         do_action('geodir_before_add_from_favorite', $post_id);

 

-        echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-addtofav geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>';

+        echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-addtofav geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="' . $favourite_icon . '"></i> ' . $unfavourite_text . '</a>';

 

         /**

          * Called after adding the post from favourites.

@@ -2335,7 +2335,7 @@ 
          */

         do_action('geodir_before_remove_from_favorite', $post_id);

 

-        echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>';

+        echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="' . $favourite_icon . '"></i> ' . $favourite_text . '</a>';

 

         /**

          * Called after removing the post from favourites.

@@ -2430,10 +2430,10 @@ 
             $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

 

         if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {

-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a

+            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"  ><a

                 class="geodir-removetofav-icon" href="javascript:void(0);"

-                onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');"

-                title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?>

+                onclick="javascript:addToFavourite(<?php echo $post_id; ?>,'remove');"

+                title="<?php echo $remove_favourite_text; ?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text; ?>

             </a>   </span><?php

 

         } else {

@@ -2443,11 +2443,11 @@ 
             } else

                 $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';

 

-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"

+            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"><a class="geodir-addtofav-icon"

                                                                                         href="javascript:void(0);"

-                                                                                        onclick="<?php echo $script_text;?>"

-                                                                                        title="<?php echo $add_favourite_text;?>"><i

-                    class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span>

+                                                                                        onclick="<?php echo $script_text; ?>"

+                                                                                        title="<?php echo $add_favourite_text; ?>"><i

+                    class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text; ?></a></span>

         <?php }

     }

 }

@@ -3046,15 +3046,15 @@ 
  * @since 1.4.9

  * @package GeoDirectory

  */

-function geodir_fb_like_thumbnail(){

+function geodir_fb_like_thumbnail() {

 

     // return if not a single post

-    if(!is_single()){return;}

+    if (!is_single()) {return; }

 

     global $post;

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

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

         $upload_dir = wp_upload_dir();

-        $thumb = $upload_dir['baseurl'].$post->featured_image;

+        $thumb = $upload_dir['baseurl'] . $post->featured_image;

         echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";

 

     }

Braces +176 added lines, -125 removed lines

@@ -21,12 +21,13 @@ 
 {

 

     $post_cat_ids = geodir_get_post_meta($post_id, $taxonomy);

-    if (!empty($post_cat_ids))

-        $post_cat_array = explode(",", trim($post_cat_ids, ","));

+    if (!empty($post_cat_ids)) {
+            $post_cat_array = explode(",", trim($post_cat_ids, ","));
+    }
 

     if (!isset($default_cat) || empty($default_cat)) {

         $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';

-    }else{

+    } else{

         if(!is_int($default_cat)){

             $category = get_term_by('name', $default_cat, $taxonomy);

             if(isset($category->term_id)){

@@ -372,8 +373,9 @@ 
             } elseif (trim($type) == 'file') {

                 if (isset($request_info[$name])) {

                     $request_files = array();

-                    if ($request_info[$name] != '')

-                        $request_files = explode(",", $request_info[$name]);

+                    if ($request_info[$name] != '') {
+                                            $request_files = explode(",", $request_info[$name]);
+                    }
 

                     $extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL;

                     geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields);

@@ -428,15 +430,17 @@ 
 

             foreach ($request_info['post_category'] as $taxonomy => $cat) {

 

-                if ($dummy)

-                    $post_category = $cat;

-                else {

+                if ($dummy) {
+                                    $post_category = $cat;
+                } else {

 

-                    if (!is_array($cat) && strstr($cat, ','))

-                        $cat = explode(',', $cat);

+                    if (!is_array($cat) && strstr($cat, ',')) {
+                                            $cat = explode(',', $cat);
+                    }
 

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

-                        $post_category = array_map('intval', $cat);

+                    if (!empty($cat) && is_array($cat)) {
+                                            $post_category = array_map('intval', $cat);
+                    }
                 }

 

                 wp_set_object_terms($last_post_id, $post_category, $taxonomy);

@@ -454,11 +458,13 @@ 
         if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {

             $post_tags = explode(",", $request_info['post_tags']);

         } elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {

-            if ($dummy)

-                $post_tags = $request_info['post_tags'];

+            if ($dummy) {
+                            $post_tags = $request_info['post_tags'];
+            }
         } else {

-            if ($dummy)

-                $post_tags = array($request_info['post_title']);

+            if ($dummy) {
+                            $post_tags = array($request_info['post_title']);
+            }
         }

 

         if (is_array($post_tags)) {

@@ -545,15 +551,17 @@ 
 

     global $wpdb, $plugin_prefix, $post, $post_info;

 

-    if ($post_id == '' && !empty($post))

-        $post_id = $post->ID;

+    if ($post_id == '' && !empty($post)) {
+            $post_id = $post->ID;
+    }
 

     $post_type = get_post_type($post_id);

 

     $all_postypes = geodir_get_posttypes();

 

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

-        return false;

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

     $table = $plugin_prefix . $post_type . '_detail';

 

@@ -703,8 +711,9 @@ 
             do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);

 

             return true;

-        } else

-            return false;

+        } else {
+                    return false;
+        }
 

     }

 }

@@ -758,8 +767,9 @@ 
             }

 

 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 }

 

@@ -790,8 +800,9 @@ 
             $post_meta_set_query = '';

 

             foreach ($postmeta as $mkey) {

-                if ($mval != '')

-                    $post_meta_set_query .= $mkey . " = '', ";

+                if ($mval != '') {
+                                    $post_meta_set_query .= $mkey . " = '', ";
+                }
             }

 

             $post_meta_set_query = trim($post_meta_set_query, ", ");

@@ -821,8 +832,9 @@ 
                 return true;

             }

 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 }

 

@@ -852,8 +864,9 @@ 
 

         $post_type = get_post_type($post_id);

 

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

-            return false;

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

         $table = $plugin_prefix . $post_type . '_detail';

 

@@ -862,11 +875,13 @@ 
             if ($meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)))) {

                 $meta_value = maybe_serialize($meta_value);

                 return $meta_value;

-            } else

-                return false;

+            } else {
+                            return false;
+            }
 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 }

 

@@ -997,7 +1012,7 @@ 
                             if (isset($uploaded['error']) && empty($uploaded['error'])) {

                                 $new_name = basename($uploaded['file']);

                                 $uploaded_file = $uploaded;

-                            }else{

+                            } else{

                                 print_r($uploaded);exit;

                             }

                             $external_img = false;

@@ -1022,8 +1037,9 @@ 
                                 $file_path = $curr_img_dir . '/' . $filename;

                             }

 

-                            if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))

-                                unlink($img_path);

+                            if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path)) {
+                                                            unlink($img_path);
+                            }
                         }

 

                         if (!empty($uploaded_file)) {

@@ -1052,8 +1068,9 @@ 
                             $attachment_set = '';

 

                             foreach ($attachment as $key => $val) {

-                                if ($val != '')

-                                    $attachment_set .= $key . " = '" . $val . "', ";

+                                if ($val != '') {
+                                                                    $attachment_set .= $key . " = '" . $val . "', ";
+                                }
                             }

 

                             $attachment_set = trim($attachment_set, ", ");

@@ -1078,8 +1095,9 @@ 
                         )

                     );

 

-                    if ($menu_order == 1)

-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));

+                    if ($menu_order == 1) {
+                                            $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
+                    }
 

                 }

 

@@ -1120,8 +1138,9 @@ 
 

         $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));

 

-        if (!empty($invalid_files))

-            geodir_remove_attachments($invalid_files);

+        if (!empty($invalid_files)) {
+                    geodir_remove_attachments($invalid_files);
+        }
     }

 

 }

@@ -1174,16 +1193,19 @@ 
 function geodir_delete_directory($dirname)

 {

     $dir_handle = '';

-    if (is_dir($dirname))

-        $dir_handle = opendir($dirname);

-    if (!$dir_handle)

-        return false;

+    if (is_dir($dirname)) {
+            $dir_handle = opendir($dirname);
+    }
+    if (!$dir_handle) {
+            return false;
+    }
     while ($file = readdir($dir_handle)) {

         if ($file != "." && $file != "..") {

-            if (!is_dir($dirname . "/" . $file))

-                unlink($dirname . "/" . $file);

-            else

-                geodir_delete_directory($dirname . '/' . $file);

+            if (!is_dir($dirname . "/" . $file)) {
+                            unlink($dirname . "/" . $file);
+            } else {
+                            geodir_delete_directory($dirname . '/' . $file);
+            }
         }

     }

     closedir($dir_handle);

@@ -1212,8 +1234,9 @@ 
             foreach ($postcurr_images as $postimg) {

                 $image_name_arr = explode('/', $postimg->src);

                 $filename = end($image_name_arr);

-                if (file_exists($uploads_dir . '/' . $filename))

-                    unlink($uploads_dir . '/' . $filename);

+                if (file_exists($uploads_dir . '/' . $filename)) {
+                                    unlink($uploads_dir . '/' . $filename);
+                }
             }

 

         } // endif

@@ -1267,8 +1290,9 @@ 
 

             $file_info = pathinfo($file);

             $sub_dir = '';

-            if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

-                $sub_dir = stripslashes_deep($file_info['dirname']);

+            if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
+                            $sub_dir = stripslashes_deep($file_info['dirname']);
+            }
 

             $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

             $uploads_baseurl = $uploads['baseurl'];

@@ -1312,9 +1336,9 @@ 
                 $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

             }

 

-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

-                $default_img = $default_catimg['src'];

-            elseif ($no_image) {

+            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) {
+                            $default_img = $default_catimg['src'];
+            } elseif ($no_image) {

                 $default_img = get_option('geodir_listing_no_img');

             }

 

@@ -1343,10 +1367,13 @@ 
 

         }

 

-        if (!empty($img_arr))

-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );

-        else

-            return false;

+        if (!empty($img_arr)) {
+                    return (object)$img_arr;
+        }
+        //return (object)array( 'src' => $file_url, 'path' => $file_path );

+        else {
+                    return false;
+        }
 

     }

 }

@@ -1376,8 +1403,9 @@ 
             echo $html;

         } elseif (!empty($html)) {

             return $html;

-        } else

-            return false;

+        } else {
+                    return false;
+        }
 

     }

 }

@@ -1407,8 +1435,9 @@ 
         }

         $not_featured = '';

         $sub_dir = '';

-        if (!$add_featured)

-            $not_featured = " AND is_featured = 0 ";

+        if (!$add_featured) {
+                    $not_featured = " AND is_featured = 0 ";
+        }
 

         $arrImages = $wpdb->get_results(

             $wpdb->prepare(

@@ -1430,8 +1459,9 @@ 
 

                 $file_info = pathinfo($attechment->file);

 

-                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

-                    $sub_dir = stripslashes_deep($file_info['dirname']);

+                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
+                                    $sub_dir = stripslashes_deep($file_info['dirname']);
+                }
 

                 $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

                 $uploads_baseurl = $uploads['baseurl'];

@@ -1473,9 +1503,9 @@ 
             $default_img = '';

             $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

             $post_type = get_post_type($post_id);

-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

-                $default_img = $default_catimg['src'];

-            elseif ($no_images) {

+            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) {
+                            $default_img = $default_catimg['src'];
+            } elseif ($no_images) {

                 $default_img = get_option('geodir_listing_no_img');

             }

 

@@ -1506,8 +1536,9 @@ 
 

                 return $return_arr;

 

-            } else

-                return false;

+            } else {
+                            return false;
+            }
 

         }

 

@@ -1567,14 +1598,14 @@ 
                         $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2);

                     } elseif ($image->width < ($max_size->h)) {

                         $width_per = round((($image->width / $max_size->w) * 100), 2);

-                    } else

-                        $width_per = 100;

+                    } else {
+                                            $width_per = 100;
+                    }
                 }

 

                 if (is_admin() && !isset($_REQUEST['geodir_ajax'])){

                     $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';

-                }

-                else{

+                } else{

                     $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

                 }

 

@@ -1586,8 +1617,9 @@ 
             echo $html;

         } elseif (!empty($html)) {

             return $html;

-        } else

-            return false;

+        } else {
+                    return false;
+        }
 

     }

 }

@@ -1626,8 +1658,9 @@ 
                 $post_obj = get_post($post_id);

 

                 $cat_ids = array('0');

-                if (is_array($tt_ids))

-                    $cat_ids = $tt_ids;

+                if (is_array($tt_ids)) {
+                                    $cat_ids = $tt_ids;
+                }
 

 

                 if (!empty($cat_ids)) {

@@ -1684,8 +1717,9 @@ 
                         $json .= '}';

 

 

-                        if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true))

-                            $post_marker_json = $json;

+                        if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true)) {
+                                                    $post_marker_json = $json;
+                        }
 

 

                         if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {

@@ -1716,10 +1750,13 @@ 
                 if (!empty($post_term) && is_array($post_term)) {

                     $categories = implode(',', $post_term);

 

-                    if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';

+                    if ($categories != '' && $categories != 0) {
+                        $categories = ',' . $categories . ',';
+                    }
 

-                    if (empty($post_marker_json))

-                        $post_marker_json = isset($json) ? $json : '';

+                    if (empty($post_marker_json)) {
+                                            $post_marker_json = isset($json) ? $json : '';
+                    }
 

                     if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

 

@@ -1758,8 +1795,9 @@ 
 

                                 }

 

-                                if ($default_category == '')

-                                    $default_category = $categories[0];

+                                if ($default_category == '') {
+                                                                    $default_category = $categories[0];
+                                }
 

                                 geodir_set_postcat_structure($post_id, $taxonomy, $default_category, '');

 

@@ -1903,7 +1941,7 @@ 
                                     } ?>"><img alt="bubble image" style="max-height:50px;"

                                                src="<?php echo $post_images[0]; ?>"/></a></div>

                             <?php

-                            }else{

+                            } else{

                                 echo '<div class="geodir-bubble_image"></div>';

                             }

                         } else {

@@ -1911,7 +1949,7 @@ 
                                 ?>

                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>

                             <?php

-                            }else{

+                            } else{

                                 echo '<div class="geodir-bubble_image"></div>';

                             }

                         }

@@ -2002,10 +2040,11 @@ 
      */

     function geodir_new_post_default_status()

     {

-        if (get_option('geodir_new_post_default_status'))

-            return get_option('geodir_new_post_default_status');

-        else

-            return 'publish';

+        if (get_option('geodir_new_post_default_status')) {
+                    return get_option('geodir_new_post_default_status');
+        } else {
+                    return 'publish';
+        }
 

     }

 }

@@ -2156,8 +2195,9 @@ 
 

         $all_postypes = geodir_get_posttypes();

 

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

-            return false;

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

         $table = $plugin_prefix . $post_type . '_detail';

 

@@ -2426,8 +2466,9 @@ 
         $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');

 

         $user_meta_data = '';

-        if (isset($current_user->data->ID))

-            $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

+        if (isset($current_user->data->ID)) {
+                    $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);
+        }
 

         if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {

             ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a

@@ -2440,8 +2481,9 @@ 
 

             if (!isset($current_user->data->ID) || $current_user->data->ID == '') {

                 $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';

-            } else

-                $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';

+            } else {
+                            $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
+            }
 

             ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"

                                                                                         href="javascript:void(0);"

@@ -2504,14 +2546,16 @@ 
 							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;

 

             $cat_post_count = $wpdb->get_var($count_query);

-            if (empty($cat_post_count) || is_wp_error($cat_post_count))

-                $cat_post_count = 0;

+            if (empty($cat_post_count) || is_wp_error($cat_post_count)) {
+                            $cat_post_count = 0;
+            }
 

             return $cat_post_count;

 

-        } else

-

-            return $term->count;

+        } else {
+        

+            return $term->count;
+        }
     }

     return false;

 

@@ -2558,13 +2602,15 @@ 
 		return $length;

 	}

 	

-    if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))

-        $length = get_option('geodir_desc_word_limit');

-    elseif (get_query_var('excerpt_length'))

-        $length = get_query_var('excerpt_length');

+    if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit')) {
+            $length = get_option('geodir_desc_word_limit');
+    } elseif (get_query_var('excerpt_length')) {
+            $length = get_query_var('excerpt_length');
+    }
 

-    if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))

-        $length = get_option('geodir_author_desc_word_limit');

+    if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit')) {
+            $length = get_option('geodir_author_desc_word_limit');
+    }
 

     return $length;

 }

@@ -2697,10 +2743,11 @@ 
 function geodir_lisiting_belong_to_user($listing_id, $user_id)

 {

     $listing_author_id = geodir_get_listing_author($listing_id);

-    if ($listing_author_id == $user_id)

-        return true;

-    else

-        return false;

+    if ($listing_author_id == $user_id) {
+            return true;
+    } else {
+            return false;
+    }
 

 }

 

@@ -2749,10 +2796,11 @@ 
     $pattern = '/-\d+x\d+\./';

     preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);

 

-    if (empty($matches))

-        return '';

-    else

-        return $file;

+    if (empty($matches)) {
+            return '';
+    } else {
+            return $file;
+    }
 

 }

 

@@ -2837,8 +2885,9 @@ 
     } else {

         //set_post_thumbnail($post_id,-1);

 

-        if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))

-            wp_delete_attachment($post_thumbnail_id);

+        if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
+                    wp_delete_attachment($post_thumbnail_id);
+        }
 

     }

 }

@@ -2923,8 +2972,9 @@ 
 

     global $wpdb;

 

-    if ($listing_type == '')

-        $listing_type = 'gd_place';

+    if ($listing_type == '') {
+            $listing_type = 'gd_place';
+    }
 

     $fields_info = array();

 

@@ -2947,8 +2997,9 @@ 
 

                 $fields_info[$prefix . 'address'] = $data->field_type;

 

-                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])

-                    $fields_info[$prefix . 'zip'] = $data->field_type;

+                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
+                                    $fields_info[$prefix . 'zip'] = $data->field_type;
+                }
 

             } else {

 

geodirectory-functions/shortcode_functions.php

Doc Comments +1 added lines, -2 removed lines

@@ -46,7 +46,6 @@ 
  * @since 1.0.0
  * @since 1.5.2 Added TERRAIN map type.
  *
- * @param string $value Input value to validate measurement.
  * @return string The measurement valud in valid format.
  */
 function gdsc_validate_map_args($params)
@@ -95,7 +94,7 @@ 
  * @param mixed $in The variable to check
  * @param bool $strict If set to false, consider everything that is not false to be true.
  *
- * @return bool The boolean equivalent or null
+ * @return null|boolean The boolean equivalent or null
  */
 function gdsc_to_bool_val($in, $strict = false)
 {

Indentation +118 added lines, -118 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * All shortcode related functions
- *
- * @since 1.0.0
- *
- * @package GeoDirectory
- */
+     * All shortcode related functions
+     *
+     * @since 1.0.0
+     *
+     * @package GeoDirectory
+     */
  
 // If this file is called directly, abort.
 if (!defined('WPINC')) {
@@ -284,13 +284,13 @@ 
 // @todo: Extract this
 // This is wrong, it should be in JS and CSS files.
 if (!(function_exists('geodir_home_map_add_script'))) {
-	/**
-	 * Adds the script in the page footer for the home page google map.
-	 *
-	 * @since 1.0.0
+    /**
+     * Adds the script in the page footer for the home page google map.
+     *
+     * @since 1.0.0
      * @return string Print the script in page footer.
-	 */
-	function geodir_home_map_add_script()
+     */
+    function geodir_home_map_add_script()
     {
         ?>
         <script type="text/javascript">
@@ -554,32 +554,32 @@ 
  */
 function geodir_sc_gd_listings_output($args = array()) {
     $title				 = !empty($args['title']) ? __($args['title'], 'geodirectory') : '';
-	$post_type 			 = !empty($args['post_type']) ? $args['post_type'] : 'gd_place';
-	$category 			 = !empty($args['category']) ? $args['category'] : '0';
-	$post_number		 = !empty($args['post_number']) ? $args['post_number'] : 10;
-	$add_location_filter = !empty($args['add_location_filter']) ? true : false;
-	$list_sort 			 = !empty($args['list_sort']) ? $args['list_sort'] : 'latest';
-	$character_count	 = isset($args['character_count']) ? $args['character_count'] : '';
-	$layout 			 = !empty($args['layout']) ? $args['layout'] : 'gridview_onehalf';
-	$with_pagination 	 = !empty($args['with_pagination']) ? true : false;
-	$event_type 	 	 = !empty($args['event_type']) ? $args['event_type'] : '';
+    $post_type 			 = !empty($args['post_type']) ? $args['post_type'] : 'gd_place';
+    $category 			 = !empty($args['category']) ? $args['category'] : '0';
+    $post_number		 = !empty($args['post_number']) ? $args['post_number'] : 10;
+    $add_location_filter = !empty($args['add_location_filter']) ? true : false;
+    $list_sort 			 = !empty($args['list_sort']) ? $args['list_sort'] : 'latest';
+    $character_count	 = isset($args['character_count']) ? $args['character_count'] : '';
+    $layout 			 = !empty($args['layout']) ? $args['layout'] : 'gridview_onehalf';
+    $with_pagination 	 = !empty($args['with_pagination']) ? true : false;
+    $event_type 	 	 = !empty($args['event_type']) ? $args['event_type'] : '';
 		
-	$top_pagination 	 = $with_pagination && !empty($args['top_pagination']) ? true : false;
-	$bottom_pagination 	 = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
+    $top_pagination 	 = $with_pagination && !empty($args['top_pagination']) ? true : false;
+    $bottom_pagination 	 = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
 	
-	$shortcode_atts		 = !empty($args['shortcode_atts']) ? $args['shortcode_atts'] : array();
+    $shortcode_atts		 = !empty($args['shortcode_atts']) ? $args['shortcode_atts'] : array();
 
-	// ajax mode
-	$geodir_ajax		 = !empty($args['geodir_ajax']) ? true : false;
-	$pageno 	 		 = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
+    // ajax mode
+    $geodir_ajax		 = !empty($args['geodir_ajax']) ? true : false;
+    $pageno 	 		 = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
 	
-	$query_args = array(
+    $query_args = array(
         'posts_per_page' => $post_number,
         'is_geodir_loop' => true,
         'gd_location' => $add_location_filter,
         'post_type' => $post_type,
         'order_by' => $list_sort,
-		'pageno' => $pageno
+        'pageno' => $pageno
     );
 
     if ($character_count >= 0) {
@@ -625,32 +625,32 @@ 
     global $gridview_columns_widget, $geodir_is_widget_listing;
 
     if ($post_type == 'gd_event' && function_exists('geodir_event_get_widget_events')) {
-		global $geodir_event_widget_listview;
-		$geodir_event_widget_listview = true;
+        global $geodir_event_widget_listview;
+        $geodir_event_widget_listview = true;
 		
-		if ($event_type && in_array($event_type, array('past', 'today', 'upcoming'))) {
-			$query_args['geodir_event_type'] = $event_type;
-		}
+        if ($event_type && in_array($event_type, array('past', 'today', 'upcoming'))) {
+            $query_args['geodir_event_type'] = $event_type;
+        }
 				
-		$total_posts = geodir_event_get_widget_events($query_args, true);
-		$widget_listings = $total_posts > 0 ? geodir_event_get_widget_events($query_args) : array();
+        $total_posts = geodir_event_get_widget_events($query_args, true);
+        $widget_listings = $total_posts > 0 ? geodir_event_get_widget_events($query_args) : array();
 		
-	} else {
-		$total_posts = geodir_get_widget_listings($query_args, true);
-		$widget_listings = $total_posts > 0 ? geodir_get_widget_listings($query_args) : array();
-	}
-	$current_gridview_columns_widget = $gridview_columns_widget;
+    } else {
+        $total_posts = geodir_get_widget_listings($query_args, true);
+        $widget_listings = $total_posts > 0 ? geodir_get_widget_listings($query_args) : array();
+    }
+    $current_gridview_columns_widget = $gridview_columns_widget;
 
     ob_start();
-	if (!empty($widget_listings) || $with_no_results) {
-		if (!$geodir_ajax) {
+    if (!empty($widget_listings) || $with_no_results) {
+        if (!$geodir_ajax) {
         /**
          * Called before the shortcode [gd_listings] content is output.
          *
          * @since 1.0.0
          */
         do_action('geodir_before_sc_gd_listings');
-		?>
+        ?>
         <div class="geodir_locations geodir_location_listing geodir-sc-gd-listings">
 		<?php } ?>
             <?php if ($title != '') { ?>
@@ -668,13 +668,13 @@ 
             }
 
             /**
-			 * Filter the widget listing listview template.
-			 *
-			 * @since 1.0.0
-			 *
-			 * @param string The template file to display listing.
-			 */
-			$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
+             * Filter the widget listing listview template.
+             *
+             * @since 1.0.0
+             *
+             * @param string The template file to display listing.
+             */
+            $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
             			
             global $post, $map_jason, $map_canvas_arr, $gd_session;
 
@@ -682,38 +682,38 @@ 
             $current_map_jason = $map_jason;
             $current_map_canvas_arr = $map_canvas_arr;
             $geodir_is_widget_listing = true;
-			$gd_session->un_set('gd_listing_view');
+            $gd_session->un_set('gd_listing_view');
 
             if ($with_pagination && $top_pagination) {				
-				echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
-			}
+                echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
+            }
 
             /**
              * Includes listing listview template.
              *
              * @since 1.0.0
              */
-			include($template);
+            include($template);
 			
-			if ($with_pagination && $bottom_pagination) {				
-				echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
-			}
+            if ($with_pagination && $bottom_pagination) {				
+                echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
+            }
 
             $geodir_is_widget_listing = false;
 
             $GLOBALS['post'] = $current_post;
-			if (!empty($current_post)) {
-            	setup_postdata($current_post);
-			}
+            if (!empty($current_post)) {
+                setup_postdata($current_post);
+            }
             $map_jason = $current_map_jason;
             $map_canvas_arr = $current_map_canvas_arr;
-			global $gridview_columns_widget;
-			$gridview_columns_widget = $current_gridview_columns_widget;
-			?>
+            global $gridview_columns_widget;
+            $gridview_columns_widget = $current_gridview_columns_widget;
+            ?>
 			<p class="geodir-sclisting-loading" style="display:none;"><i class="fa fa-cog fa-spin"></i></p>
 			<?php
             if (!$geodir_ajax) { 
-			?>
+            ?>
         </div>
 		<script type="text/javascript">
 		  function gd_sc_gopage(obj, pid) {
@@ -750,7 +750,7 @@ 
 		<?php } ?>
     <?php
     }
-	$output = ob_get_contents();
+    $output = ob_get_contents();
     ob_end_clean();
 
     return trim($output);
@@ -790,60 +790,60 @@ 
 
     $half_pages_to_show = round($pages_to_show / 2);
 
-	$numposts = $total_posts;
+    $numposts = $total_posts;
 
-	$max_page = ceil($numposts / $posts_per_page);
+    $max_page = ceil($numposts / $posts_per_page);
 
-	if (empty($pageno)) {
-		$pageno = 1;
-	}
+    if (empty($pageno)) {
+        $pageno = 1;
+    }
 
-	ob_start();
-	if ($max_page > 1 || $always_show) {
-		// Extra pagination info
-		$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
-		$start_no = ( $pageno - 1 ) * $posts_per_page + 1;
-		$end_no = min($pageno * $posts_per_page, $numposts);
+    ob_start();
+    if ($max_page > 1 || $always_show) {
+        // Extra pagination info
+        $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
+        $start_no = ( $pageno - 1 ) * $posts_per_page + 1;
+        $end_no = min($pageno * $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 geodir-ajax-pagination'>";		
-		if ($pageno > 1) {
-			echo '<a class="gd-page-sc-fst" href="javascript:void(0);" onclick="gd_sc_gopage(this, 1);">&laquo;</a>&nbsp;';
-		}
+        echo "$before <div class='Navi geodir-ajax-pagination'>";		
+        if ($pageno > 1) {
+            echo '<a class="gd-page-sc-fst" href="javascript:void(0);" onclick="gd_sc_gopage(this, 1);">&laquo;</a>&nbsp;';
+        }
 		
-		if (($pageno - 1) > 0) {
-			echo '<a class="gd-page-sc-prev" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int)($pageno - 1) . ');">' . $prelabel . '</a>&nbsp;';
-		}
+        if (($pageno - 1) > 0) {
+            echo '<a class="gd-page-sc-prev" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int)($pageno - 1) . ');">' . $prelabel . '</a>&nbsp;';
+        }
 		
-		for ($i = $pageno - $half_pages_to_show; $i <= $pageno + $half_pages_to_show; $i++) {
-			if ($i >= 1 && $i <= $max_page) {
-				if ($i == $pageno) {
-					echo "<strong class='on' class='gd-page-sc-act'>$i</strong>";
-				} else {
-					echo ' <a class="gd-page-sc-no" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int)$i . ');">' . $i . '</a> ';
-				}
-			}
-		}
+        for ($i = $pageno - $half_pages_to_show; $i <= $pageno + $half_pages_to_show; $i++) {
+            if ($i >= 1 && $i <= $max_page) {
+                if ($i == $pageno) {
+                    echo "<strong class='on' class='gd-page-sc-act'>$i</strong>";
+                } else {
+                    echo ' <a class="gd-page-sc-no" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int)$i . ');">' . $i . '</a> ';
+                }
+            }
+        }
 		
-		if (($pageno + 1) <= $max_page) {
-			echo '&nbsp;<a class="gd-page-sc-nxt" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int)($pageno + 1) . ');">' . $nxtlabel . '</a>';
-		}
+        if (($pageno + 1) <= $max_page) {
+            echo '&nbsp;<a class="gd-page-sc-nxt" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int)($pageno + 1) . ');">' . $nxtlabel . '</a>';
+        }
 		
-		if ($pageno < $max_page) {
-			echo '&nbsp;<a class="gd-page-sc-lst" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int)$max_page . ');">&raquo;</a>';
-		}
-		echo "</div> $after";
-	}
-	$output = ob_get_contents();
+        if ($pageno < $max_page) {
+            echo '&nbsp;<a class="gd-page-sc-lst" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int)$max_page . ');">&raquo;</a>';
+        }
+        echo "</div> $after";
+    }
+    $output = ob_get_contents();
     ob_end_clean();
 
     return trim($output);
@@ -862,16 +862,16 @@ 
     $scatts = isset($_POST['scatts']) ? $_POST['scatts'] : NULL;
     $pageno = isset($_POST['pageno']) ? absint($_POST['pageno']) : 1;
 	
-	$shortcode_atts = !empty($scatts) ? (array)json_decode(stripslashes_deep($scatts)) : NULL;
+    $shortcode_atts = !empty($scatts) ? (array)json_decode(stripslashes_deep($scatts)) : NULL;
 	
-	if (!empty($shortcode_atts) && is_array($shortcode_atts)) {
-		$shortcode_atts['pageno'] = $pageno;
-		$shortcode_atts['geodir_ajax'] = true;
+    if (!empty($shortcode_atts) && is_array($shortcode_atts)) {
+        $shortcode_atts['pageno'] = $pageno;
+        $shortcode_atts['geodir_ajax'] = true;
 		
-		echo geodir_sc_gd_listings($shortcode_atts);
-	} else {
-		echo 0;
-	}
+        echo geodir_sc_gd_listings($shortcode_atts);
+    } else {
+        echo 0;
+    }
     wp_die();
 }
 add_action('wp_ajax_geodir_sclistings', 'geodir_sclistings_callback');

Spacing +14 added lines, -14 removed lines

@@ -559,19 +559,19 @@ 
 	$post_number		 = !empty($args['post_number']) ? $args['post_number'] : 10;
 	$add_location_filter = !empty($args['add_location_filter']) ? true : false;
 	$list_sort 			 = !empty($args['list_sort']) ? $args['list_sort'] : 'latest';
-	$character_count	 = isset($args['character_count']) ? $args['character_count'] : '';
-	$layout 			 = !empty($args['layout']) ? $args['layout'] : 'gridview_onehalf';
-	$with_pagination 	 = !empty($args['with_pagination']) ? true : false;
-	$event_type 	 	 = !empty($args['event_type']) ? $args['event_type'] : '';
+	$character_count = isset($args['character_count']) ? $args['character_count'] : '';
+	$layout = !empty($args['layout']) ? $args['layout'] : 'gridview_onehalf';
+	$with_pagination = !empty($args['with_pagination']) ? true : false;
+	$event_type = !empty($args['event_type']) ? $args['event_type'] : '';
 		
 	$top_pagination 	 = $with_pagination && !empty($args['top_pagination']) ? true : false;
-	$bottom_pagination 	 = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
+	$bottom_pagination = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
 	
 	$shortcode_atts		 = !empty($args['shortcode_atts']) ? $args['shortcode_atts'] : array();
 
 	// ajax mode
-	$geodir_ajax		 = !empty($args['geodir_ajax']) ? true : false;
-	$pageno 	 		 = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
+	$geodir_ajax = !empty($args['geodir_ajax']) ? true : false;
+	$pageno = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
 	
 	$query_args = array(
         'posts_per_page' => $post_number,
@@ -722,7 +722,7 @@ 
 			if(!pid > 0 || !(container && typeof container != 'undefined')) {
 			  return false;
 			}
-			var scatts = "<?php echo addslashes(json_encode($shortcode_atts));?>";
+			var scatts = "<?php echo addslashes(json_encode($shortcode_atts)); ?>";
 			
 			var data = {
 			  'action': 'geodir_sclistings',
@@ -802,7 +802,7 @@ 
 	if ($max_page > 1 || $always_show) {
 		// Extra pagination info
 		$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
-		$start_no = ( $pageno - 1 ) * $posts_per_page + 1;
+		$start_no = ($pageno - 1) * $posts_per_page + 1;
 		$end_no = min($pageno * $posts_per_page, $numposts);
 		
 		if ($geodir_pagination_more_info != '') {
@@ -821,7 +821,7 @@ 
 		}
 		
 		if (($pageno - 1) > 0) {
-			echo '<a class="gd-page-sc-prev" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int)($pageno - 1) . ');">' . $prelabel . '</a>&nbsp;';
+			echo '<a class="gd-page-sc-prev" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int) ($pageno - 1) . ');">' . $prelabel . '</a>&nbsp;';
 		}
 		
 		for ($i = $pageno - $half_pages_to_show; $i <= $pageno + $half_pages_to_show; $i++) {
@@ -829,17 +829,17 @@ 
 				if ($i == $pageno) {
 					echo "<strong class='on' class='gd-page-sc-act'>$i</strong>";
 				} else {
-					echo ' <a class="gd-page-sc-no" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int)$i . ');">' . $i . '</a> ';
+					echo ' <a class="gd-page-sc-no" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int) $i . ');">' . $i . '</a> ';
 				}
 			}
 		}
 		
 		if (($pageno + 1) <= $max_page) {
-			echo '&nbsp;<a class="gd-page-sc-nxt" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int)($pageno + 1) . ');">' . $nxtlabel . '</a>';
+			echo '&nbsp;<a class="gd-page-sc-nxt" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int) ($pageno + 1) . ');">' . $nxtlabel . '</a>';
 		}
 		
 		if ($pageno < $max_page) {
-			echo '&nbsp;<a class="gd-page-sc-lst" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int)$max_page . ');">&raquo;</a>';
+			echo '&nbsp;<a class="gd-page-sc-lst" href="javascript:void(0);" onclick="gd_sc_gopage(this, ' . (int) $max_page . ');">&raquo;</a>';
 		}
 		echo "</div> $after";
 	}
@@ -862,7 +862,7 @@ 
     $scatts = isset($_POST['scatts']) ? $_POST['scatts'] : NULL;
     $pageno = isset($_POST['pageno']) ? absint($_POST['pageno']) : 1;
 	
-	$shortcode_atts = !empty($scatts) ? (array)json_decode(stripslashes_deep($scatts)) : NULL;
+	$shortcode_atts = !empty($scatts) ? (array) json_decode(stripslashes_deep($scatts)) : NULL;
 	
 	if (!empty($shortcode_atts) && is_array($shortcode_atts)) {
 		$shortcode_atts['pageno'] = $pageno;

geodirectory-functions/signup_function.php

Doc Comments +2 added lines, -2 removed lines

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

  * @global object $current_user Current user object.

  * @param bool $redirect Optional. Do you want to redirect to signup page, if user not logged in? Default: false.

- * @return bool

+ * @return null|boolean

  */

 function geodir_is_login($redirect = false)

 {

@@ -69,7 +69,7 @@ 
  *

  * @since 1.0.0

  * @package GeoDirectory

- * @return string|mixed|void The email ID.

+ * @return string The email ID.

  */

 function geodir_get_site_email_id()

 {

Indentation +5 added lines, -5 removed lines

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

 /**

- * Account Signup functions.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * Account Signup functions.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 

 /**

  * Check whether the user is logged in or not.

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
         if ($redirect) {

             ?>

             <script type="text/javascript">

-                window.location.href = '<?php echo geodir_login_url();?>';

+                window.location.href = '<?php echo geodir_login_url(); ?>';

             </script>

         <?php

         } else

@@ -236,7 +236,7 @@ 
      */

     $message = apply_filters('password_reset_message', $message, $new_pass);

     //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$user_name,$title,$message,$extra='');///forgot password email

-    geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID);///forgot password email

+    geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID); ///forgot password email

 

     return true;

 }

@@ -396,7 +396,7 @@ 
 

         /////////////customer email//////////////

         //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$userName,$subject,$client_message,$extra='');///To client email

-        geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id);/// registration email

+        geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id); /// registration email

         //////REGISTRATION EMAIL END////////

     }

 

@@ -507,7 +507,7 @@ 
                 exit();

             }

 

-            wp_redirect(geodir_login_url(array('error'=>'invalidkey','action'=>'lostpassword')));

+            wp_redirect(geodir_login_url(array('error'=>'invalidkey', 'action'=>'lostpassword')));

             exit();

 

             break;

@@ -725,7 +725,7 @@ 
                 if (isset($_REQUEST['pagetype']) && $_REQUEST['pagetype'] != '') {

                     wp_redirect($_REQUEST['pagetype'] . '&emsg=1');

                 } else {

-                    wp_redirect(geodir_login_url(array('logemsg'=>'1','redirect_to'=>urlencode($_REQUEST['redirect_to']))));

+                    wp_redirect(geodir_login_url(array('logemsg'=>'1', 'redirect_to'=>urlencode($_REQUEST['redirect_to']))));

                 }

                 exit;

             }

Braces +74 added lines, -48 removed lines

@@ -25,11 +25,13 @@ 
                 window.location.href = '<?php echo geodir_login_url();?>';

             </script>

         <?php

-        } else

-            return false;

-    } else

-        return true;

-}

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

 

 /**

  * Redirect to SSL url, if SSL is being used.

@@ -60,7 +62,9 @@ 
      * @param string $message Login message.

      */

     $message = apply_filters('login_message', $message);

-    if (!empty($message)) echo $message . "\n";

+    if (!empty($message)) {
+        echo $message . "\n";
+    }
 

 }

 

@@ -141,14 +145,16 @@ 
     global $wpdb;

 

     $errors = new WP_Error();

-    if (empty($_POST['user_login']) && empty($_POST['user_email']))

-        $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));

+    if (empty($_POST['user_login']) && empty($_POST['user_email'])) {
+            $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));
+    }
 

     if (strpos($_POST['user_login'], '@')) {

         //$user_data = get_user_by_email(trim($_POST['user_login']));

         $user_data = get_user_by('email', trim($_POST['user_login']));

-        if (empty($user_data))

-            $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));

+        if (empty($user_data)) {
+                    $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));
+        }
     } else {

         $login = trim($_POST['user_login']);

         $user_data = get_user_by('email', $login);

@@ -161,8 +167,9 @@ 
      */

     do_action('lostpassword_post');

 

-    if ($errors->get_error_code())

-        return $errors;

+    if ($errors->get_error_code()) {
+            return $errors;
+    }
 

     if (!$user_data) {

         $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.', 'geodirectory'));

@@ -192,8 +199,9 @@ 
         )

     );

 

-    if (empty($user))

-        return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));

+    if (empty($user)) {
+            return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));
+    }
 

     $new_pass = wp_generate_password(12, false);

 

@@ -282,13 +290,14 @@ 
     }

 

     // Check the username

-    if ($user_login == '')

-        $errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));

-    elseif (!validate_username($user_login)) {

+    if ($user_login == '') {
+            $errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));
+    } elseif (!validate_username($user_login)) {

         $errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.', 'geodirectory'));

         $user_login = '';

-    } elseif (username_exists($user_login))

-        $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));

+    } elseif (username_exists($user_login)) {
+            $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));
+    }
 

     // Check the e-mail address

     if ($user_email == '') {

@@ -296,8 +305,9 @@ 
     } elseif (!is_email($user_email)) {

         $errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.', 'geodirectory'));

         $user_email = '';

-    } elseif (email_exists($user_email))

-        $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));

+    } elseif (email_exists($user_email)) {
+            $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));
+    }
 

     /**

      * Called when registering a new user.

@@ -317,8 +327,9 @@ 
      */

     $errors = apply_filters('registration_errors', $errors);

 

-    if ($errors->get_error_code())

-        return $errors;

+    if ($errors->get_error_code()) {
+            return $errors;
+    }
 

 

     if (!isset($user_pass) || $user_pass == '') {

@@ -423,28 +434,33 @@ 
 

     $errors = new WP_Error();

 

-    if (isset($_GET['key']))

-        $action = 'resetpass';

+    if (isset($_GET['key'])) {
+            $action = 'resetpass';
+    }
 

     // validate action so as to default to the login screen

-    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action))

-        $action = 'login';

+    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action)) {
+            $action = 'login';
+    }
 

     nocache_headers();

 

     if (defined('RELOCATE')) { // Move flag is set

-        if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']))

-            $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);

+        if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF'])) {
+                    $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);
+        }
 

         $schema = (isset($_SERVER['HTTPS']) && geodir_strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';

-        if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url())

-            update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));

+        if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url()) {
+                    update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));
+        }
     }

 

     //Set a cookie now to see if they are supported by the browser.

     //setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);

-    if (SITECOOKIEPATH != COOKIEPATH)

-        setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);

+    if (SITECOOKIEPATH != COOKIEPATH) {
+            setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);
+    }
 

     /**

      * Allow plugins to override the default actions, and to add extra actions if they want on the register/signin page.

@@ -465,8 +481,9 @@ 
 

             $redirect_to = $_SERVER['HTTP_REFERER'];

             //$redirect_to = home_url().'/?ptype=login&loggedout=true';

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

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

+            if (isset($_REQUEST['redirect_to'])) {
+                            $redirect_to = $_REQUEST['redirect_to'];
+            }
             $redirect_to = home_url();

             wp_safe_redirect($redirect_to);

             exit();

@@ -486,7 +503,9 @@ 
                     exit();

                 }

             }

-            if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));

+            if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) {
+                $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));
+            }
         /**

          * Called in the geodir_user_signup() function during the lostpassword case.

          *

@@ -582,8 +601,9 @@ 
                     }

 

 

-                    if (!$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                        $secure_cookie = false;

+                    if (!$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http'))) {
+                                            $secure_cookie = false;
+                    }
 

                     $user = wp_signon('', $secure_cookie);

 

@@ -652,22 +672,26 @@ 
                     $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_ID);

 

                     $_REQUEST['redirect_to'] = $default_author_link;

-                else:

-                    $_REQUEST['redirect_to'] = home_url();

+                else {
+                    :

+                    $_REQUEST['redirect_to'] = home_url();
+                }
                 endif;

 

             }

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

                 $redirect_to = $_REQUEST['redirect_to'];

                 // Redirect to https if user wants ssl

-                if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin'))

-                    $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);

+                if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin')) {
+                                    $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);
+                }
             } else {

                 $redirect_to = admin_url();

             }

 

-            if (!$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                $secure_cookie = false;

+            if (!$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http'))) {
+                            $secure_cookie = false;
+            }
             $user = wp_signon('', $secure_cookie);

 

 

@@ -702,11 +726,13 @@ 
             $errors = $user;

 

             // Clear errors if loggedout is set.

-            if (!empty($_GET['loggedout']))

-                $errors = new WP_Error();

+            if (!empty($_GET['loggedout'])) {
+                            $errors = new WP_Error();
+            }
             // If cookies are disabled we can't log in even with a valid user+pass

-            if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]))

-                $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));

+            if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE])) {
+                            $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));
+            }
 

             // Some parts of this script use the main login form to display a message

             if (isset($_GET['loggedout']) && TRUE == $_GET['loggedout']) {

geodirectory-functions/template_functions.php

Doc Comments +1 added lines, -1 removed lines

@@ -393,7 +393,7 @@
  * @global object $post The current post object.

  * @global object $geodirectory Not yet implemented.

  * @param string $slug The template slug.

- * @param null $name The template name.

+ * @param string $name The template name.

  */

 function geodir_get_template_part($slug = '', $name = NULL)

 {

Braces +58 added lines, -26 removed lines

@@ -47,16 +47,19 @@ 
 

             if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

                 && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

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

+            ) {
+                            $post_type = $_REQUEST['listing_type'];
+            }
             if (empty($post_type) && !isset($_REQUEST['pid'])) {

                 $pagename = $wp->query_vars['pagename'];

                 $post_types = geodir_get_posttypes();

-                if (!empty($post_types))

-                    $post_type = $post_types[0];

+                if (!empty($post_types)) {
+                                    $post_type = $post_types[0];
+                }
 					

-				if($sc_post_type != '' )

-					$post_type = $sc_post_type;

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

                 if ($is_wpml && !empty($wp->query_vars['page_id'])) {

 					wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

@@ -71,14 +74,16 @@ 
             $success_page_id = geodir_success_page_id();

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

                 && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

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

+            ) {
+                            $post_type = $_REQUEST['listing_type'];
+            }
             return $template = locate_template(array("geodirectory/{$post_type}-success.php", "geodirectory/listing-success.php"));

             break;

         case 'detail':

         case 'preview':

-            if (in_array(get_post_type(), geodir_get_posttypes()))

-                $post_type = get_post_type();

+            if (in_array(get_post_type(), geodir_get_posttypes())) {
+                            $post_type = get_post_type();
+            }
             return $template = locate_template(array("geodirectory/single-{$post_type}.php", "geodirectory/listing-detail.php"));

             break;

         case 'listing':

@@ -184,7 +189,9 @@ 
 

         $template = geodir_locate_template('signup');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

+        if (!$template) {
+            $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';
+        }
 

         /**

          * Filter the signup template path.

@@ -202,7 +209,9 @@ 
 

             $template = geodir_locate_template('information');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+            if (!$template) {
+                $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
+            }
             /**

              * Filter the information template path.

              *

@@ -219,7 +228,9 @@ 
             if (!$is_current_user_owner) {

                 $template = geodir_locate_template('information');

 

-                if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+                if (!$template) {
+                    $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
+                }
                 /**

                  * Filter the information template path.

                  *

@@ -241,7 +252,9 @@ 
 

         $template = geodir_locate_template('add-listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

+        if (!$template) {
+            $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';
+        }
         /**

          * Filter the add listing template path.

          *

@@ -258,7 +271,9 @@ 
 

         $template = geodir_locate_template('preview');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) {
+            $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';
+        }
         /**

          * Filter the preview template path.

          *

@@ -274,7 +289,9 @@ 
 

         $template = geodir_locate_template('success');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

+        if (!$template) {
+            $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';
+        }
         /**

          * Filter the success template path.

          *

@@ -289,7 +306,9 @@ 
 

         $template = geodir_locate_template('detail');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) {
+            $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';
+        }
         /**

          * Filter the detail template path.

          *

@@ -304,7 +323,9 @@ 
 

         $template = geodir_locate_template('listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

+        if (!$template) {
+            $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';
+        }
         /**

          * Filter the listing template path.

          *

@@ -319,7 +340,9 @@ 
 

         $template = geodir_locate_template('search');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

+        if (!$template) {
+            $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';
+        }
         /**

          * Filter the search template path.

          *

@@ -334,7 +357,9 @@ 
 

         $template = geodir_locate_template('author');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

+        if (!$template) {
+            $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';
+        }
         /**

          * Filter the author template path.

          *

@@ -355,7 +380,9 @@ 
 

             $template = geodir_locate_template('geodir-home');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

+            if (!$template) {
+                $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';
+            }
             /**

              * Filter the home page template path.

              *

@@ -368,7 +395,9 @@ 
 

             $template = geodir_locate_template('location');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

+            if (!$template) {
+                $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';
+            }
             /**

              * Filter the location template path.

              *

@@ -377,8 +406,9 @@ 
              */

             return $template = apply_filters('geodir_template_location', $template);

 

-        } else

-            return $template;

+        } else {
+                    return $template;
+        }
 

     }

 

@@ -432,8 +462,10 @@ 
          * @since 1.0.0

          */

         include($template);

-    else:

-        locate_template(array("geodirectory/" . $template_name), true, false);

+    else {
+        :

+        locate_template(array("geodirectory/" . $template_name), true, false);
+    }
     endif;

 

 }

Indentation +105 added lines, -105 removed lines

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

 /**

- * Template functions

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * Template functions

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 

 /**

  * Locates template based on the template type.

@@ -29,21 +29,21 @@ 
         case 'add-listing':

 

             $sc_post_type = '';

-			if (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {

+            if (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {

                 $listing_page_id = $post->ID;

 				

-				$regex_pattern = get_shortcode_regex();

-				preg_match('/'.$regex_pattern.'/s', $post->post_content, $regex_matches);

+                $regex_pattern = get_shortcode_regex();

+                preg_match('/'.$regex_pattern.'/s', $post->post_content, $regex_matches);

 				

-				if (!empty($regex_matches) && isset($regex_matches[2]) == 'gd_add_listing' && isset($regex_matches[3])) {

-					$shortcode_atts = shortcode_parse_atts($regex_matches[3]);

-					$sc_post_type = !empty($shortcode_atts) && isset($shortcode_atts['listing_type']) && !empty($shortcode_atts['listing_type']) ? $shortcode_atts['listing_type'] : '';

-				}

+                if (!empty($regex_matches) && isset($regex_matches[2]) == 'gd_add_listing' && isset($regex_matches[3])) {

+                    $shortcode_atts = shortcode_parse_atts($regex_matches[3]);

+                    $sc_post_type = !empty($shortcode_atts) && isset($shortcode_atts['listing_type']) && !empty($shortcode_atts['listing_type']) ? $shortcode_atts['listing_type'] : '';

+                }

             } else {

                 $listing_page_id = geodir_add_listing_page_id();

             }

 			

-			$is_wpml = function_exists('icl_object_id') ? true : false;

+            $is_wpml = function_exists('icl_object_id') ? true : false;

 

             if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

                 && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

@@ -55,14 +55,14 @@ 
                 if (!empty($post_types))

                     $post_type = $post_types[0];

 					

-				if($sc_post_type != '' )

-					$post_type = $sc_post_type;

+                if($sc_post_type != '' )

+                    $post_type = $sc_post_type;

 				

                 if ($is_wpml && !empty($wp->query_vars['page_id'])) {

-					wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

-				} else {

-					wp_redirect(trailingslashit(get_site_url()) . $pagename . '/?listing_type=' . $post_type);

-				}

+                    wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

+                } else {

+                    wp_redirect(trailingslashit(get_site_url()) . $pagename . '/?listing_type=' . $post_type);

+                }

                 exit();

             }

             return $template = locate_template(array("geodirectory/add-{$post_type}.php", "geodirectory/add-listing.php"));

@@ -481,21 +481,21 @@ 
  */

 function geodir_display_message_not_found_on_listing($template_listview = 'listing-listview', $favorite = false) {

     if ($favorite) {

-		$message = __('No favorite listings found which match your selection.', 'geodirectory');

-	} else {

-		$message = __('No listings found which match your selection.', 'geodirectory');

-	}

+        $message = __('No favorite listings found which match your selection.', 'geodirectory');

+    } else {

+        $message = __('No listings found which match your selection.', 'geodirectory');

+    }

 	

-	/**

-	 * Filter the no listing found message.

-	 *

-	 * @since 1.5.5

-	 * @param string $template_listview Listing listview template.

-	 * @param bool $favorite Are favorite listings results?

-	 */

-	$message = apply_filters('geodir_message_listing_not_found', $message, $template_listview, $favorite);

+    /**

+     * Filter the no listing found message.

+     *

+     * @since 1.5.5

+     * @param string $template_listview Listing listview template.

+     * @param bool $favorite Are favorite listings results?

+     */

+    $message = apply_filters('geodir_message_listing_not_found', $message, $template_listview, $favorite);

 	

-	echo '<li class="no-listing">' . $message . '</li>';

+    echo '<li class="no-listing">' . $message . '</li>';

 }

 

 /**

@@ -509,9 +509,9 @@ 
  * @return string Breadcrumb HTML.

  */

 function geodir_strip_breadcrumb_li_wrappers($breadcrumb, $separator) {

-	$breadcrumb = str_replace(array('</li><li>', '</li> <li>'), '', $breadcrumb);

+    $breadcrumb = str_replace(array('</li><li>', '</li> <li>'), '', $breadcrumb);

 	

-	return $breadcrumb;

+    return $breadcrumb;

 }

 

 /**

@@ -522,30 +522,30 @@ 
  * @return string Listing listview class.

  */

 function geodir_convert_listing_view_class($columns = '') {

-	$class = '';

+    $class = '';

 	

-	switch ((int)$columns) {

-		case 1:

-			$class = '';

-		break;

-		case 2:

-			$class = 'gridview_onehalf';

-		break;

-		case 3:

-			$class = 'gridview_onethird';

-		break;

-		case 4:

-			$class = 'gridview_onefourth';

-		break;

-		case 5:

-			$class = 'gridview_onefifth';

-		break;

-		default:

-			$class = '';

-		break;

-	}

+    switch ((int)$columns) {

+        case 1:

+            $class = '';

+        break;

+        case 2:

+            $class = 'gridview_onehalf';

+        break;

+        case 3:

+            $class = 'gridview_onethird';

+        break;

+        case 4:

+            $class = 'gridview_onefourth';

+        break;

+        case 5:

+            $class = 'gridview_onefifth';

+        break;

+        default:

+            $class = '';

+        break;

+    }

 	

-	return $class;

+    return $class;

 }

 

 /**

@@ -558,18 +558,18 @@ 
  * @return bool Modified value for display the excerpt.

  */

 function geodir_show_listing_post_excerpt($display, $view, $post) {

-	if ($view == 'listview') {

-		if (geodir_is_page('author')) {

-			$word_limit = get_option('geodir_author_desc_word_limit');

-		} else {

-			$word_limit = get_option('geodir_desc_word_limit');

-		}

+    if ($view == 'listview') {

+        if (geodir_is_page('author')) {

+            $word_limit = get_option('geodir_author_desc_word_limit');

+        } else {

+            $word_limit = get_option('geodir_desc_word_limit');

+        }

 		

-		if ($word_limit !== '' && ($word_limit == 0 || $word_limit == '0')) {

-			$display = false;

-		}

-	}

-	return $display;

+        if ($word_limit !== '' && ($word_limit == 0 || $word_limit == '0')) {

+            $display = false;

+        }

+    }

+    return $display;

 }

 

 /**

@@ -584,24 +584,24 @@ 
  * @return string Rating icons html content.

  */

 function geodir_font_awesome_rating_form_html($html, $star_texts = array(), $default = '') {

-	if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

-		$html = '<select class="gd-fa-rating">';

-		$html .= '<option value=""></option>';

-		if (!empty($star_texts) && is_array($star_texts)) {

-			foreach ($star_texts as $i => $text) {

-				$html .= '<option ' . selected((int)($i + 1), (int)$default, false) . ' value="' . (int)($i + 1) . '">' . $text . '</option>';

-			}

-		} else {

-			$html .= '<option value="1">1</option>';

-			$html .= '<option value="2">2</option>';

-			$html .= '<option value="3">3</option>';

-			$html .= '<option value="4">4</option>';

-			$html .= '<option value="5">5</option>';

-		}

-		$html .= '</select>';

-	}

-

-	return $html;

+    if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

+        $html = '<select class="gd-fa-rating">';

+        $html .= '<option value=""></option>';

+        if (!empty($star_texts) && is_array($star_texts)) {

+            foreach ($star_texts as $i => $text) {

+                $html .= '<option ' . selected((int)($i + 1), (int)$default, false) . ' value="' . (int)($i + 1) . '">' . $text . '</option>';

+            }

+        } else {

+            $html .= '<option value="1">1</option>';

+            $html .= '<option value="2">2</option>';

+            $html .= '<option value="3">3</option>';

+            $html .= '<option value="4">4</option>';

+            $html .= '<option value="5">5</option>';

+        }

+        $html .= '</select>';

+    }

+

+    return $html;

 }

 

 /**

@@ -616,20 +616,20 @@ 
  * @return string Rating icons html content.

  */

 function geodir_font_awesome_rating_stars_html($html, $rating, $star_count = 5) {

-	if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

-		$rating = min($rating, $star_count);

-		$full_stars = floor( $rating );

-		$half_stars = ceil( $rating - $full_stars );

-		$empty_stars = $star_count - $full_stars - $half_stars;

+    if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

+        $rating = min($rating, $star_count);

+        $full_stars = floor( $rating );

+        $half_stars = ceil( $rating - $full_stars );

+        $empty_stars = $star_count - $full_stars - $half_stars;

 		

-		$html = '<div class="gd-star-rating gd-fa-star-rating">';

-		$html .= str_repeat( '<i class="fa fa-star gd-full-star"></i>', $full_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

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

-	}

-

-	return $html;

+        $html = '<div class="gd-star-rating gd-fa-star-rating">';

+        $html .= str_repeat( '<i class="fa fa-star gd-full-star"></i>', $full_stars );

+        $html .= str_repeat( '<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars );

+        $html .= str_repeat( '<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

+        $html .= '</div>';

+    }

+

+    return $html;

 }

 

 /**

@@ -639,12 +639,12 @@ 
  * @package GeoDirectory

  */

 function geodir_font_awesome_rating_css() {

-	// Font awesome rating style

-	if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

-		$full_color = get_option('geodir_reviewrating_fa_full_rating_color', '#757575');

-		if ($full_color != '#757575') {

-			echo '<style type="text/css">.br-theme-fontawesome-stars .br-widget a.br-active:after,.br-theme-fontawesome-stars .br-widget a.br-selected:after,

+    // Font awesome rating style

+    if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

+        $full_color = get_option('geodir_reviewrating_fa_full_rating_color', '#757575');

+        if ($full_color != '#757575') {

+            echo '<style type="text/css">.br-theme-fontawesome-stars .br-widget a.br-active:after,.br-theme-fontawesome-stars .br-widget a.br-selected:after,

 			.gd-star-rating i.fa {color:' . stripslashes($full_color) . '!important;</style>';

-		}

-	}

+        }

+    }

 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -33,7 +33,7 @@ 
                 $listing_page_id = $post->ID;

 				

 				$regex_pattern = get_shortcode_regex();

-				preg_match('/'.$regex_pattern.'/s', $post->post_content, $regex_matches);

+				preg_match('/' . $regex_pattern . '/s', $post->post_content, $regex_matches);

 				

 				if (!empty($regex_matches) && isset($regex_matches[2]) == 'gd_add_listing' && isset($regex_matches[3])) {

 					$shortcode_atts = shortcode_parse_atts($regex_matches[3]);

@@ -55,7 +55,7 @@ 
                 if (!empty($post_types))

                     $post_type = $post_types[0];

 					

-				if($sc_post_type != '' )

+				if ($sc_post_type != '')

 					$post_type = $sc_post_type;

 				

                 if ($is_wpml && !empty($wp->query_vars['page_id'])) {

@@ -410,7 +410,7 @@ 
      */

     do_action("geodir_get_template_part_{$slug}", $slug, $name);

     $templates = array();

-    $name = (string)$name;

+    $name = (string) $name;

     if ('' !== $name) {

         $template_name = "{$slug}-{$name}.php";

 

@@ -524,7 +524,7 @@ 
 function geodir_convert_listing_view_class($columns = '') {

 	$class = '';

 	

-	switch ((int)$columns) {

+	switch ((int) $columns) {

 		case 1:

 			$class = '';

 		break;

@@ -589,7 +589,7 @@ 
 		$html .= '<option value=""></option>';

 		if (!empty($star_texts) && is_array($star_texts)) {

 			foreach ($star_texts as $i => $text) {

-				$html .= '<option ' . selected((int)($i + 1), (int)$default, false) . ' value="' . (int)($i + 1) . '">' . $text . '</option>';

+				$html .= '<option ' . selected((int) ($i + 1), (int) $default, false) . ' value="' . (int) ($i + 1) . '">' . $text . '</option>';

 			}

 		} else {

 			$html .= '<option value="1">1</option>';

@@ -618,14 +618,14 @@ 
 function geodir_font_awesome_rating_stars_html($html, $rating, $star_count = 5) {

 	if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

 		$rating = min($rating, $star_count);

-		$full_stars = floor( $rating );

-		$half_stars = ceil( $rating - $full_stars );

+		$full_stars = floor($rating);

+		$half_stars = ceil($rating - $full_stars);

 		$empty_stars = $star_count - $full_stars - $half_stars;

 		

 		$html = '<div class="gd-star-rating gd-fa-star-rating">';

-		$html .= str_repeat( '<i class="fa fa-star gd-full-star"></i>', $full_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

+		$html .= str_repeat('<i class="fa fa-star gd-full-star"></i>', $full_stars);

+		$html .= str_repeat('<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars);

+		$html .= str_repeat('<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

 		$html .= '</div>';

 	}

 

geodirectory-functions/wp-session/class-recursive-arrayaccess.php

Doc Comments -1 removed lines

@@ -107,7 +107,6 @@
 	 * @link http://php.net/manual/en/arrayaccess.offsetset.php
 	 *
 	 * @param mixed $offset The offset to assign the value to.
-	 * @param mixed $value  The value to set.
 	 *
 	 * @return void
 	 */

Indentation +115 added lines, -115 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 /**
- * Multidimensional ArrayAccess
- *
- * Allows ArrayAccess-like functionality with multidimensional arrays.  Fully supports
- * both sets and unsets.
- *
- * @package WordPress
- * @subpackage Session
- * @since 3.6.0
- */
+     * Multidimensional ArrayAccess
+     *
+     * Allows ArrayAccess-like functionality with multidimensional arrays.  Fully supports
+     * both sets and unsets.
+     *
+     * @package WordPress
+     * @subpackage Session
+     * @since 3.6.0
+     */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
@@ -20,120 +20,120 @@ 
  * @since 3.6.0
  */
 class Recursive_ArrayAccess implements ArrayAccess {
-	/**
-	 * Internal data collection.
-	 *
-	 * @var array
-	 */
-	protected $container = array();
+    /**
+     * Internal data collection.
+     *
+     * @var array
+     */
+    protected $container = array();
 
-	/**
-	 * Flag whether or not the internal collection has been changed.
-	 *
-	 * @var bool
-	 */
-	protected $dirty = false;
+    /**
+     * Flag whether or not the internal collection has been changed.
+     *
+     * @var bool
+     */
+    protected $dirty = false;
 
-	/**
-	 * Default object constructor.
-	 *
-	 * @param array $data
-	 */
-	protected function __construct( $data = array() ) {
-		foreach ( $data as $key => $value ) {
-			$this[ $key ] = $value;
-		}
-	}
+    /**
+     * Default object constructor.
+     *
+     * @param array $data
+     */
+    protected function __construct( $data = array() ) {
+        foreach ( $data as $key => $value ) {
+            $this[ $key ] = $value;
+        }
+    }
 
-	/**
-	 * Allow deep copies of objects
-	 */
-	public function __clone() {
-		foreach ( $this->container as $key => $value ) {
-			if ( $value instanceof self ) {
-				$this[ $key ] = clone $value;
-			}
-		}
-	}
+    /**
+     * Allow deep copies of objects
+     */
+    public function __clone() {
+        foreach ( $this->container as $key => $value ) {
+            if ( $value instanceof self ) {
+                $this[ $key ] = clone $value;
+            }
+        }
+    }
 
-	/**
-	 * Output the data container as a multidimensional array.
-	 *
-	 * @return array
-	 */
-	public function toArray() {
-		$data = $this->container;
-		foreach ( $data as $key => $value ) {
-			if ( $value instanceof self ) {
-				$data[ $key ] = $value->toArray();
-			}
-		}
-		return $data;
-	}
+    /**
+     * Output the data container as a multidimensional array.
+     *
+     * @return array
+     */
+    public function toArray() {
+        $data = $this->container;
+        foreach ( $data as $key => $value ) {
+            if ( $value instanceof self ) {
+                $data[ $key ] = $value->toArray();
+            }
+        }
+        return $data;
+    }
 
-	/**
-	* ArrayAccess Implementation
-	**/
+    /**
+     * ArrayAccess Implementation
+     **/
 
-	/**
-	 * Whether a offset exists
-	 *
-	 * @link http://php.net/manual/en/arrayaccess.offsetexists.php
-	 *
-	 * @param mixed $offset An offset to check for.
-	 *
-	 * @return boolean true on success or false on failure.
-	 */
-	public function offsetExists( $offset ) {
-		return isset( $this->container[ $offset ]) ;
-	}
+    /**
+     * Whether a offset exists
+     *
+     * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+     *
+     * @param mixed $offset An offset to check for.
+     *
+     * @return boolean true on success or false on failure.
+     */
+    public function offsetExists( $offset ) {
+        return isset( $this->container[ $offset ]) ;
+    }
 
-	/**
-	 * Offset to retrieve
-	 *
-	 * @link http://php.net/manual/en/arrayaccess.offsetget.php
-	 *
-	 * @param mixed $offset The offset to retrieve.
-	 *
-	 * @return mixed Can return all value types.
-	 */
-	public function offsetGet( $offset ) {
-		return isset( $this->container[ $offset ] ) ? $this->container[ $offset ] : null;
-	}
+    /**
+     * Offset to retrieve
+     *
+     * @link http://php.net/manual/en/arrayaccess.offsetget.php
+     *
+     * @param mixed $offset The offset to retrieve.
+     *
+     * @return mixed Can return all value types.
+     */
+    public function offsetGet( $offset ) {
+        return isset( $this->container[ $offset ] ) ? $this->container[ $offset ] : null;
+    }
 
-	/**
-	 * Offset to set
-	 *
-	 * @link http://php.net/manual/en/arrayaccess.offsetset.php
-	 *
-	 * @param mixed $offset The offset to assign the value to.
-	 * @param mixed $value  The value to set.
-	 *
-	 * @return void
-	 */
-	public function offsetSet( $offset, $data ) {
-		if ( is_array( $data ) ) {
-			$data = new self( $data );
-		}
-		if ( $offset === null ) { // don't forget this!
-			$this->container[] = $data;
-		} else {
-			$this->container[ $offset ] = $data;
-		}
+    /**
+     * Offset to set
+     *
+     * @link http://php.net/manual/en/arrayaccess.offsetset.php
+     *
+     * @param mixed $offset The offset to assign the value to.
+     * @param mixed $value  The value to set.
+     *
+     * @return void
+     */
+    public function offsetSet( $offset, $data ) {
+        if ( is_array( $data ) ) {
+            $data = new self( $data );
+        }
+        if ( $offset === null ) { // don't forget this!
+            $this->container[] = $data;
+        } else {
+            $this->container[ $offset ] = $data;
+        }
 
-		$this->dirty = true;
-	}
+        $this->dirty = true;
+    }
 
-	/**
-	 * Offset to unset
-	 *
-	 * @link http://php.net/manual/en/arrayaccess.offsetunset.php
-	 *
-	 * @param mixed $offset The offset to unset.
-	 *
-	 * @return void
-	 */
-	public function offsetUnset( $offset ) {
-		unset( $this->container[ $offset ] );
-	}
+    /**
+     * Offset to unset
+     *
+     * @link http://php.net/manual/en/arrayaccess.offsetunset.php
+     *
+     * @param mixed $offset The offset to unset.
+     *
+     * @return void
+     */
+    public function offsetUnset( $offset ) {
+        unset( $this->container[ $offset ] );
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * Recursive array class to allow multidimensional array access.
@@ -39,9 +39,9 @@ 
 	 *
 	 * @param array $data
 	 */
-	protected function __construct( $data = array() ) {
-		foreach ( $data as $key => $value ) {
-			$this[ $key ] = $value;
+	protected function __construct($data = array()) {
+		foreach ($data as $key => $value) {
+			$this[$key] = $value;
 		}
 	}
 
@@ -49,9 +49,9 @@ 
 	 * Allow deep copies of objects
 	 */
 	public function __clone() {
-		foreach ( $this->container as $key => $value ) {
-			if ( $value instanceof self ) {
-				$this[ $key ] = clone $value;
+		foreach ($this->container as $key => $value) {
+			if ($value instanceof self) {
+				$this[$key] = clone $value;
 			}
 		}
 	}
@@ -63,9 +63,9 @@ 
 	 */
 	public function toArray() {
 		$data = $this->container;
-		foreach ( $data as $key => $value ) {
-			if ( $value instanceof self ) {
-				$data[ $key ] = $value->toArray();
+		foreach ($data as $key => $value) {
+			if ($value instanceof self) {
+				$data[$key] = $value->toArray();
 			}
 		}
 		return $data;
@@ -84,8 +84,8 @@ 
 	 *
 	 * @return boolean true on success or false on failure.
 	 */
-	public function offsetExists( $offset ) {
-		return isset( $this->container[ $offset ]) ;
+	public function offsetExists($offset) {
+		return isset($this->container[$offset]);
 	}
 
 	/**
@@ -97,8 +97,8 @@ 
 	 *
 	 * @return mixed Can return all value types.
 	 */
-	public function offsetGet( $offset ) {
-		return isset( $this->container[ $offset ] ) ? $this->container[ $offset ] : null;
+	public function offsetGet($offset) {
+		return isset($this->container[$offset]) ? $this->container[$offset] : null;
 	}
 
 	/**
@@ -111,14 +111,14 @@ 
 	 *
 	 * @return void
 	 */
-	public function offsetSet( $offset, $data ) {
-		if ( is_array( $data ) ) {
-			$data = new self( $data );
+	public function offsetSet($offset, $data) {
+		if (is_array($data)) {
+			$data = new self($data);
 		}
-		if ( $offset === null ) { // don't forget this!
+		if ($offset === null) { // don't forget this!
 			$this->container[] = $data;
 		} else {
-			$this->container[ $offset ] = $data;
+			$this->container[$offset] = $data;
 		}
 
 		$this->dirty = true;
@@ -133,7 +133,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function offsetUnset( $offset ) {
-		unset( $this->container[ $offset ] );
+	public function offsetUnset($offset) {
+		unset($this->container[$offset]);
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -11,7 +11,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 /**
  * Return the current cache expire setting.

geodirectory-functions/wp-session/class-wp-session.php

Doc Comments -1 removed lines

@@ -51,7 +51,6 @@
 	/**
 	 * Retrieve the current session instance.
 	 *
-	 * @param bool $session_id Session ID from which to populate data.
 	 *
 	 * @return bool|WP_Session
 	 */

Indentation +318 added lines, -318 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 /**
- * WordPress session managment.
- *
- * Standardizes WordPress session data using database-backed options for storage.
- * for storing user session information.
- *
- * @package WordPress
- * @subpackage Session
- * @since   3.7.0
- */
+     * WordPress session managment.
+     *
+     * Standardizes WordPress session data using database-backed options for storage.
+     * for storing user session information.
+     *
+     * @package WordPress
+     * @subpackage Session
+     * @since   3.7.0
+     */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) exit;
@@ -20,313 +20,313 @@ 
  * @since   3.7.0
  */
 final class WP_Session extends Recursive_ArrayAccess implements Iterator, Countable {
-	/**
-	 * ID of the current session.
-	 *
-	 * @var string
-	 */
-	public $session_id;
-
-	/**
-	 * Unix timestamp when session expires.
-	 *
-	 * @var int
-	 */
-	protected $expires;
-
-	/**
-	 * Unix timestamp indicating when the expiration time needs to be reset.
-	 *
-	 * @var int
-	 */
-	protected $exp_variant;
-
-	/**
-	 * Singleton instance.
-	 *
-	 * @var bool|WP_Session
-	 */
-	private static $instance = false;
-
-	/**
-	 * Retrieve the current session instance.
-	 *
-	 * @param bool $session_id Session ID from which to populate data.
-	 *
-	 * @return bool|WP_Session
-	 */
-	public static function get_instance() {
-		if ( ! self::$instance ) {
-			self::$instance = new self();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Default constructor.
-	 * Will rebuild the session collection from the given session ID if it exists. Otherwise, will
-	 * create a new session with that ID.
-	 *
-	 * @param $session_id
-	 * @uses apply_filters Calls `wp_session_expiration` to determine how long until sessions expire.
-	 */
-	protected function __construct() {
-		if ( isset( $_COOKIE[WP_SESSION_COOKIE] ) ) {
-			$cookie = stripslashes( $_COOKIE[WP_SESSION_COOKIE] );
-			$cookie_crumbs = explode( '||', $cookie );
-
-			if( $this->is_valid_md5( $cookie_crumbs[0] ) ) {
-
-				$this->session_id = $cookie_crumbs[0];
-
-			} else {
-
-				$this->regenerate_id( true );
-
-			}
-
-			$this->expires     = $cookie_crumbs[1];
-			$this->exp_variant = $cookie_crumbs[2];
-
-			// Update the session expiration if we're past the variant time
-			if ( time() > $this->exp_variant ) {
-				$this->set_expiration();
-				delete_option( "_wp_session_expires_{$this->session_id}" );
-				add_option( "_wp_session_expires_{$this->session_id}", $this->expires, '', 'no' );
-			}
-		} else {
-			$this->session_id = $this->generate_id();
-			$this->set_expiration();
-		}
-
-		$this->read_data();
-
-		$this->set_cookie();
-
-	}
-
-	/**
-	 * Set both the expiration time and the expiration variant.
-	 *
-	 * If the current time is below the variant, we don't update the session's expiration time. If it's
-	 * greater than the variant, then we update the expiration time in the database.  This prevents
-	 * writing to the database on every page load for active sessions and only updates the expiration
-	 * time if we're nearing when the session actually expires.
-	 *
-	 * By default, the expiration time is set to 30 minutes.
-	 * By default, the expiration variant is set to 24 minutes.
-	 *
-	 * As a result, the session expiration time - at a maximum - will only be written to the database once
-	 * every 24 minutes.  After 30 minutes, the session will have been expired. No cookie will be sent by
-	 * the browser, and the old session will be queued for deletion by the garbage collector.
-	 *
-	 * @uses apply_filters Calls `wp_session_expiration_variant` to get the max update window for session data.
-	 * @uses apply_filters Calls `wp_session_expiration` to get the standard expiration time for sessions.
-	 */
-	protected function set_expiration() {
-		$this->exp_variant = time() + (int) apply_filters( 'wp_session_expiration_variant', 24 * 60 );
-		$this->expires = time() + (int) apply_filters( 'wp_session_expiration', 30 * 60 );
-	}
-
-	/**
-	 * Set the session cookie
-	 */
-	protected function set_cookie() {
-		@setcookie( WP_SESSION_COOKIE, $this->session_id . '||' . $this->expires . '||' . $this->exp_variant , $this->expires, COOKIEPATH, COOKIE_DOMAIN );
-	}
-
-	/**
-	 * Generate a cryptographically strong unique ID for the session token.
-	 *
-	 * @return string
-	 */
-	protected function generate_id() {
-		require_once( ABSPATH . 'wp-includes/class-phpass.php');
-		$hasher = new PasswordHash( 8, false );
-
-		return md5( $hasher->get_random_bytes( 32 ) );
-	}
-
-	/**
-	 * Checks if is valid md5 string
-	 *
-	 * @param string $md5
-	 * @return int
-	 */
-	protected function is_valid_md5( $md5 = '' ){
-		return preg_match( '/^[a-f0-9]{32}$/', $md5 );
-	}
-
-	/**
-	 * Read data from a transient for the current session.
-	 *
-	 * Automatically resets the expiration time for the session transient to some time in the future.
-	 *
-	 * @return array
-	 */
-	protected function read_data() {
-		$this->container = get_option( "_wp_session_{$this->session_id}", array() );
-
-		return $this->container;
-	}
-
-	/**
-	 * Write the data from the current session to the data storage system.
-	 */
-	public function write_data() {
-		$option_key = "_wp_session_{$this->session_id}";
-
-		// Only write the collection to the DB if it's changed.
-		if ( $this->dirty ) {
-			if ( false === get_option( $option_key ) ) {
-				add_option( "_wp_session_{$this->session_id}", $this->container, '', 'no' );
-				add_option( "_wp_session_expires_{$this->session_id}", $this->expires, '', 'no' );
-			} else {
-				delete_option( "_wp_session_{$this->session_id}" );
-				add_option( "_wp_session_{$this->session_id}", $this->container, '', 'no' );
-			}
-		}
-	}
-
-	/**
-	 * Output the current container contents as a JSON-encoded string.
-	 *
-	 * @return string
-	 */
-	public function json_out() {
-		return json_encode( $this->container );
-	}
-
-	/**
-	 * Decodes a JSON string and, if the object is an array, overwrites the session container with its contents.
-	 *
-	 * @param string $data
-	 *
-	 * @return bool
-	 */
-	public function json_in( $data ) {
-		$array = json_decode( $data );
-
-		if ( is_array( $array ) ) {
-			$this->container = $array;
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Regenerate the current session's ID.
-	 *
-	 * @param bool $delete_old Flag whether or not to delete the old session data from the server.
-	 */
-	public function regenerate_id( $delete_old = false ) {
-		if ( $delete_old ) {
-			delete_option( "_wp_session_{$this->session_id}" );
-		}
-
-		$this->session_id = $this->generate_id();
-
-		$this->set_cookie();
-	}
-
-	/**
-	 * Check if a session has been initialized.
-	 *
-	 * @return bool
-	 */
-	public function session_started() {
-		return !!self::$instance;
-	}
-
-	/**
-	 * Return the read-only cache expiration value.
-	 *
-	 * @return int
-	 */
-	public function cache_expiration() {
-		return $this->expires;
-	}
-
-	/**
-	 * Flushes all session variables.
-	 */
-	public function reset() {
-		$this->container = array();
-	}
-
-	/*****************************************************************/
-	/*                     Iterator Implementation                   */
-	/*****************************************************************/
-
-	/**
-	 * Current position of the array.
-	 *
-	 * @link http://php.net/manual/en/iterator.current.php
-	 *
-	 * @return mixed
-	 */
-	public function current() {
-		return current( $this->container );
-	}
-
-	/**
-	 * Key of the current element.
-	 *
-	 * @link http://php.net/manual/en/iterator.key.php
-	 *
-	 * @return mixed
-	 */
-	public function key() {
-		return key( $this->container );
-	}
-
-	/**
-	 * Move the internal point of the container array to the next item
-	 *
-	 * @link http://php.net/manual/en/iterator.next.php
-	 *
-	 * @return void
-	 */
-	public function next() {
-		next( $this->container );
-	}
-
-	/**
-	 * Rewind the internal point of the container array.
-	 *
-	 * @link http://php.net/manual/en/iterator.rewind.php
-	 *
-	 * @return void
-	 */
-	public function rewind() {
-		reset( $this->container );
-	}
-
-	/**
-	 * Is the current key valid?
-	 *
-	 * @link http://php.net/manual/en/iterator.rewind.php
-	 *
-	 * @return bool
-	 */
-	public function valid() {
-		return $this->offsetExists( $this->key() );
-	}
-
-	/*****************************************************************/
-	/*                    Countable Implementation                   */
-	/*****************************************************************/
-
-	/**
-	 * Get the count of elements in the container array.
-	 *
-	 * @link http://php.net/manual/en/countable.count.php
-	 *
-	 * @return int
-	 */
-	public function count() {
-		return count( $this->container );
-	}
+    /**
+     * ID of the current session.
+     *
+     * @var string
+     */
+    public $session_id;
+
+    /**
+     * Unix timestamp when session expires.
+     *
+     * @var int
+     */
+    protected $expires;
+
+    /**
+     * Unix timestamp indicating when the expiration time needs to be reset.
+     *
+     * @var int
+     */
+    protected $exp_variant;
+
+    /**
+     * Singleton instance.
+     *
+     * @var bool|WP_Session
+     */
+    private static $instance = false;
+
+    /**
+     * Retrieve the current session instance.
+     *
+     * @param bool $session_id Session ID from which to populate data.
+     *
+     * @return bool|WP_Session
+     */
+    public static function get_instance() {
+        if ( ! self::$instance ) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Default constructor.
+     * Will rebuild the session collection from the given session ID if it exists. Otherwise, will
+     * create a new session with that ID.
+     *
+     * @param $session_id
+     * @uses apply_filters Calls `wp_session_expiration` to determine how long until sessions expire.
+     */
+    protected function __construct() {
+        if ( isset( $_COOKIE[WP_SESSION_COOKIE] ) ) {
+            $cookie = stripslashes( $_COOKIE[WP_SESSION_COOKIE] );
+            $cookie_crumbs = explode( '||', $cookie );
+
+            if( $this->is_valid_md5( $cookie_crumbs[0] ) ) {
+
+                $this->session_id = $cookie_crumbs[0];
+
+            } else {
+
+                $this->regenerate_id( true );
+
+            }
+
+            $this->expires     = $cookie_crumbs[1];
+            $this->exp_variant = $cookie_crumbs[2];
+
+            // Update the session expiration if we're past the variant time
+            if ( time() > $this->exp_variant ) {
+                $this->set_expiration();
+                delete_option( "_wp_session_expires_{$this->session_id}" );
+                add_option( "_wp_session_expires_{$this->session_id}", $this->expires, '', 'no' );
+            }
+        } else {
+            $this->session_id = $this->generate_id();
+            $this->set_expiration();
+        }
+
+        $this->read_data();
+
+        $this->set_cookie();
+
+    }
+
+    /**
+     * Set both the expiration time and the expiration variant.
+     *
+     * If the current time is below the variant, we don't update the session's expiration time. If it's
+     * greater than the variant, then we update the expiration time in the database.  This prevents
+     * writing to the database on every page load for active sessions and only updates the expiration
+     * time if we're nearing when the session actually expires.
+     *
+     * By default, the expiration time is set to 30 minutes.
+     * By default, the expiration variant is set to 24 minutes.
+     *
+     * As a result, the session expiration time - at a maximum - will only be written to the database once
+     * every 24 minutes.  After 30 minutes, the session will have been expired. No cookie will be sent by
+     * the browser, and the old session will be queued for deletion by the garbage collector.
+     *
+     * @uses apply_filters Calls `wp_session_expiration_variant` to get the max update window for session data.
+     * @uses apply_filters Calls `wp_session_expiration` to get the standard expiration time for sessions.
+     */
+    protected function set_expiration() {
+        $this->exp_variant = time() + (int) apply_filters( 'wp_session_expiration_variant', 24 * 60 );
+        $this->expires = time() + (int) apply_filters( 'wp_session_expiration', 30 * 60 );
+    }
+
+    /**
+     * Set the session cookie
+     */
+    protected function set_cookie() {
+        @setcookie( WP_SESSION_COOKIE, $this->session_id . '||' . $this->expires . '||' . $this->exp_variant , $this->expires, COOKIEPATH, COOKIE_DOMAIN );
+    }
+
+    /**
+     * Generate a cryptographically strong unique ID for the session token.
+     *
+     * @return string
+     */
+    protected function generate_id() {
+        require_once( ABSPATH . 'wp-includes/class-phpass.php');
+        $hasher = new PasswordHash( 8, false );
+
+        return md5( $hasher->get_random_bytes( 32 ) );
+    }
+
+    /**
+     * Checks if is valid md5 string
+     *
+     * @param string $md5
+     * @return int
+     */
+    protected function is_valid_md5( $md5 = '' ){
+        return preg_match( '/^[a-f0-9]{32}$/', $md5 );
+    }
+
+    /**
+     * Read data from a transient for the current session.
+     *
+     * Automatically resets the expiration time for the session transient to some time in the future.
+     *
+     * @return array
+     */
+    protected function read_data() {
+        $this->container = get_option( "_wp_session_{$this->session_id}", array() );
+
+        return $this->container;
+    }
+
+    /**
+     * Write the data from the current session to the data storage system.
+     */
+    public function write_data() {
+        $option_key = "_wp_session_{$this->session_id}";
+
+        // Only write the collection to the DB if it's changed.
+        if ( $this->dirty ) {
+            if ( false === get_option( $option_key ) ) {
+                add_option( "_wp_session_{$this->session_id}", $this->container, '', 'no' );
+                add_option( "_wp_session_expires_{$this->session_id}", $this->expires, '', 'no' );
+            } else {
+                delete_option( "_wp_session_{$this->session_id}" );
+                add_option( "_wp_session_{$this->session_id}", $this->container, '', 'no' );
+            }
+        }
+    }
+
+    /**
+     * Output the current container contents as a JSON-encoded string.
+     *
+     * @return string
+     */
+    public function json_out() {
+        return json_encode( $this->container );
+    }
+
+    /**
+     * Decodes a JSON string and, if the object is an array, overwrites the session container with its contents.
+     *
+     * @param string $data
+     *
+     * @return bool
+     */
+    public function json_in( $data ) {
+        $array = json_decode( $data );
+
+        if ( is_array( $array ) ) {
+            $this->container = $array;
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Regenerate the current session's ID.
+     *
+     * @param bool $delete_old Flag whether or not to delete the old session data from the server.
+     */
+    public function regenerate_id( $delete_old = false ) {
+        if ( $delete_old ) {
+            delete_option( "_wp_session_{$this->session_id}" );
+        }
+
+        $this->session_id = $this->generate_id();
+
+        $this->set_cookie();
+    }
+
+    /**
+     * Check if a session has been initialized.
+     *
+     * @return bool
+     */
+    public function session_started() {
+        return !!self::$instance;
+    }
+
+    /**
+     * Return the read-only cache expiration value.
+     *
+     * @return int
+     */
+    public function cache_expiration() {
+        return $this->expires;
+    }
+
+    /**
+     * Flushes all session variables.
+     */
+    public function reset() {
+        $this->container = array();
+    }
+
+    /*****************************************************************/
+    /*                     Iterator Implementation                   */
+    /*****************************************************************/
+
+    /**
+     * Current position of the array.
+     *
+     * @link http://php.net/manual/en/iterator.current.php
+     *
+     * @return mixed
+     */
+    public function current() {
+        return current( $this->container );
+    }
+
+    /**
+     * Key of the current element.
+     *
+     * @link http://php.net/manual/en/iterator.key.php
+     *
+     * @return mixed
+     */
+    public function key() {
+        return key( $this->container );
+    }
+
+    /**
+     * Move the internal point of the container array to the next item
+     *
+     * @link http://php.net/manual/en/iterator.next.php
+     *
+     * @return void
+     */
+    public function next() {
+        next( $this->container );
+    }
+
+    /**
+     * Rewind the internal point of the container array.
+     *
+     * @link http://php.net/manual/en/iterator.rewind.php
+     *
+     * @return void
+     */
+    public function rewind() {
+        reset( $this->container );
+    }
+
+    /**
+     * Is the current key valid?
+     *
+     * @link http://php.net/manual/en/iterator.rewind.php
+     *
+     * @return bool
+     */
+    public function valid() {
+        return $this->offsetExists( $this->key() );
+    }
+
+    /*****************************************************************/
+    /*                    Countable Implementation                   */
+    /*****************************************************************/
+
+    /**
+     * Get the count of elements in the container array.
+     *
+     * @link http://php.net/manual/en/countable.count.php
+     *
+     * @return int
+     */
+    public function count() {
+        return count( $this->container );
+    }
 }

Spacing +38 added lines, -38 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * WordPress Session class for managing user session data.
@@ -56,7 +56,7 @@ 
 	 * @return bool|WP_Session
 	 */
 	public static function get_instance() {
-		if ( ! self::$instance ) {
+		if (!self::$instance) {
 			self::$instance = new self();
 		}
 
@@ -72,17 +72,17 @@ 
 	 * @uses apply_filters Calls `wp_session_expiration` to determine how long until sessions expire.
 	 */
 	protected function __construct() {
-		if ( isset( $_COOKIE[WP_SESSION_COOKIE] ) ) {
-			$cookie = stripslashes( $_COOKIE[WP_SESSION_COOKIE] );
-			$cookie_crumbs = explode( '||', $cookie );
+		if (isset($_COOKIE[WP_SESSION_COOKIE])) {
+			$cookie = stripslashes($_COOKIE[WP_SESSION_COOKIE]);
+			$cookie_crumbs = explode('||', $cookie);
 
-			if( $this->is_valid_md5( $cookie_crumbs[0] ) ) {
+			if ($this->is_valid_md5($cookie_crumbs[0])) {
 
 				$this->session_id = $cookie_crumbs[0];
 
 			} else {
 
-				$this->regenerate_id( true );
+				$this->regenerate_id(true);
 
 			}
 
@@ -90,10 +90,10 @@ 
 			$this->exp_variant = $cookie_crumbs[2];
 
 			// Update the session expiration if we're past the variant time
-			if ( time() > $this->exp_variant ) {
+			if (time() > $this->exp_variant) {
 				$this->set_expiration();
-				delete_option( "_wp_session_expires_{$this->session_id}" );
-				add_option( "_wp_session_expires_{$this->session_id}", $this->expires, '', 'no' );
+				delete_option("_wp_session_expires_{$this->session_id}");
+				add_option("_wp_session_expires_{$this->session_id}", $this->expires, '', 'no');
 			}
 		} else {
 			$this->session_id = $this->generate_id();
@@ -125,15 +125,15 @@ 
 	 * @uses apply_filters Calls `wp_session_expiration` to get the standard expiration time for sessions.
 	 */
 	protected function set_expiration() {
-		$this->exp_variant = time() + (int) apply_filters( 'wp_session_expiration_variant', 24 * 60 );
-		$this->expires = time() + (int) apply_filters( 'wp_session_expiration', 30 * 60 );
+		$this->exp_variant = time() + (int) apply_filters('wp_session_expiration_variant', 24 * 60);
+		$this->expires = time() + (int) apply_filters('wp_session_expiration', 30 * 60);
 	}
 
 	/**
 	 * Set the session cookie
 	 */
 	protected function set_cookie() {
-		@setcookie( WP_SESSION_COOKIE, $this->session_id . '||' . $this->expires . '||' . $this->exp_variant , $this->expires, COOKIEPATH, COOKIE_DOMAIN );
+		@setcookie(WP_SESSION_COOKIE, $this->session_id . '||' . $this->expires . '||' . $this->exp_variant, $this->expires, COOKIEPATH, COOKIE_DOMAIN);
 	}
 
 	/**
@@ -142,10 +142,10 @@ 
 	 * @return string
 	 */
 	protected function generate_id() {
-		require_once( ABSPATH . 'wp-includes/class-phpass.php');
-		$hasher = new PasswordHash( 8, false );
+		require_once(ABSPATH . 'wp-includes/class-phpass.php');
+		$hasher = new PasswordHash(8, false);
 
-		return md5( $hasher->get_random_bytes( 32 ) );
+		return md5($hasher->get_random_bytes(32));
 	}
 
 	/**
@@ -154,8 +154,8 @@ 
 	 * @param string $md5
 	 * @return int
 	 */
-	protected function is_valid_md5( $md5 = '' ){
-		return preg_match( '/^[a-f0-9]{32}$/', $md5 );
+	protected function is_valid_md5($md5 = '') {
+		return preg_match('/^[a-f0-9]{32}$/', $md5);
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 	 * @return array
 	 */
 	protected function read_data() {
-		$this->container = get_option( "_wp_session_{$this->session_id}", array() );
+		$this->container = get_option("_wp_session_{$this->session_id}", array());
 
 		return $this->container;
 	}
@@ -178,13 +178,13 @@ 
 		$option_key = "_wp_session_{$this->session_id}";
 
 		// Only write the collection to the DB if it's changed.
-		if ( $this->dirty ) {
-			if ( false === get_option( $option_key ) ) {
-				add_option( "_wp_session_{$this->session_id}", $this->container, '', 'no' );
-				add_option( "_wp_session_expires_{$this->session_id}", $this->expires, '', 'no' );
+		if ($this->dirty) {
+			if (false === get_option($option_key)) {
+				add_option("_wp_session_{$this->session_id}", $this->container, '', 'no');
+				add_option("_wp_session_expires_{$this->session_id}", $this->expires, '', 'no');
 			} else {
-				delete_option( "_wp_session_{$this->session_id}" );
-				add_option( "_wp_session_{$this->session_id}", $this->container, '', 'no' );
+				delete_option("_wp_session_{$this->session_id}");
+				add_option("_wp_session_{$this->session_id}", $this->container, '', 'no');
 			}
 		}
 	}
@@ -195,7 +195,7 @@ 
 	 * @return string
 	 */
 	public function json_out() {
-		return json_encode( $this->container );
+		return json_encode($this->container);
 	}
 
 	/**
@@ -205,10 +205,10 @@ 
 	 *
 	 * @return bool
 	 */
-	public function json_in( $data ) {
-		$array = json_decode( $data );
+	public function json_in($data) {
+		$array = json_decode($data);
 
-		if ( is_array( $array ) ) {
+		if (is_array($array)) {
 			$this->container = $array;
 			return true;
 		}
@@ -221,9 +221,9 @@ 
 	 *
 	 * @param bool $delete_old Flag whether or not to delete the old session data from the server.
 	 */
-	public function regenerate_id( $delete_old = false ) {
-		if ( $delete_old ) {
-			delete_option( "_wp_session_{$this->session_id}" );
+	public function regenerate_id($delete_old = false) {
+		if ($delete_old) {
+			delete_option("_wp_session_{$this->session_id}");
 		}
 
 		$this->session_id = $this->generate_id();
@@ -268,7 +268,7 @@ 
 	 * @return mixed
 	 */
 	public function current() {
-		return current( $this->container );
+		return current($this->container);
 	}
 
 	/**
@@ -279,7 +279,7 @@ 
 	 * @return mixed
 	 */
 	public function key() {
-		return key( $this->container );
+		return key($this->container);
 	}
 
 	/**
@@ -290,7 +290,7 @@ 
 	 * @return void
 	 */
 	public function next() {
-		next( $this->container );
+		next($this->container);
 	}
 
 	/**
@@ -301,7 +301,7 @@ 
 	 * @return void
 	 */
 	public function rewind() {
-		reset( $this->container );
+		reset($this->container);
 	}
 
 	/**
@@ -312,7 +312,7 @@ 
 	 * @return bool
 	 */
 	public function valid() {
-		return $this->offsetExists( $this->key() );
+		return $this->offsetExists($this->key());
 	}
 
 	/*****************************************************************/
@@ -327,6 +327,6 @@ 
 	 * @return int
 	 */
 	public function count() {
-		return count( $this->container );
+		return count($this->container);
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -11,7 +11,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 /**
  * Return the current cache expire setting.

geodirectory_hooks_actions.php

Doc Comments +1 added lines, -1 removed lines

@@ -2203,7 +2203,7 @@
  * @global object $wpdb WordPress Database object.

  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @param int $attachment_id Attachment ID.

- * @return bool|void Returns false on failure.

+ * @return false|null Returns false on failure.

  */

 function geodirectory_before_featured_image_delete($attachment_id)

 {

Braces +93 added lines, -75 removed lines

@@ -86,8 +86,9 @@ 
 add_filter('query_vars', 'geodir_add_location_var');

 add_filter('query_vars', 'geodir_add_geodir_page_var');

 add_action('wp', 'geodir_add_page_id_in_query_var'); // problem fix in wordpress 3.8

-if (get_option('permalink_structure') != '')

-    add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');

+if (get_option('permalink_structure') != '') {
+    add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
+}
 

 add_filter('parse_query', 'geodir_modified_query');

 

@@ -420,8 +421,9 @@ 
      */

     do_action('geodir_after_social_sharing_buttons');

     $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';

+    if (trim($content_html) != '') {
+            $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';
+    }
     if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {

         /**

          * Filter the geodir_social_sharing_buttons() function content.

@@ -467,8 +469,9 @@ 
      */

     do_action('geodir_after_share_this_button');

     $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-sharethis">' . $content_html . '</div>';

+    if (trim($content_html) != '') {
+            $content_html = '<div class="geodir-company_info geodir-details-sidebar-sharethis">' . $content_html . '</div>';
+    }
     if ((int)get_option('geodir_disable_sharethis_button_section') != 1) {

         /**

          * Filter the geodir_share_this_button() function content.

@@ -526,8 +529,9 @@ 
      */

     do_action('geodir_after_edit_post_link');

     $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';

+    if (trim($content_html) != '') {
+            $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';
+    }
     if ((int)get_option('geodir_disable_user_links_section') != 1) {

         /**

          * Filter the geodir_edit_post_link() function content.

@@ -1080,8 +1084,9 @@ 
      */

     do_action('geodir_after_google_analytics');

     $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';

+    if (trim($content_html) != '') {
+            $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';
+    }
     if ((int)get_option('geodir_disable_google_analytics_section') != 1) {

         /**

          * Filter the geodir_edit_post_link() function content.

@@ -1216,8 +1221,9 @@ 
     do_action('geodir_after_detail_page_more_info');

 

     $content_html = ob_get_clean();

-    if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';

+    if (trim($content_html) != '') {
+            $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';
+    }
     if ((int)get_option('geodir_disable_listing_info_section') != 1) {

         /**

          * Filter the output html for function geodir_detail_page_more_info().

@@ -1322,8 +1328,9 @@ 
     $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);

 

     foreach ($arr_alert_msg as $key => $value) {

-        if (!is_scalar($value))

-            continue;

+        if (!is_scalar($value)) {
+                    continue;
+        }
         $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8');

     }

 

@@ -1377,17 +1384,19 @@ 
     global $geodir_sidebars;

     global $sidebars_widgets;

 

-    if (!is_array($sidebars_widgets))

-        $sidebars_widgets = wp_get_sidebars_widgets();

+    if (!is_array($sidebars_widgets)) {
+            $sidebars_widgets = wp_get_sidebars_widgets();
+    }
     $geodir_old_sidebars = array();

 

     if (is_array($geodir_sidebars)) {

         foreach ($geodir_sidebars as $val) {

             if (is_array($sidebars_widgets)) {

-                if (array_key_exists($val, $sidebars_widgets))

-                    $geodir_old_sidebars[$val] = $sidebars_widgets[$val];

-                else

-                    $geodir_old_sidebars[$val] = array();

+                if (array_key_exists($val, $sidebars_widgets)) {
+                                    $geodir_old_sidebars[$val] = $sidebars_widgets[$val];
+                } else {
+                                    $geodir_old_sidebars[$val] = array();
+                }
             }

         }

     }

@@ -1408,8 +1417,9 @@ 
 {

     global $sidebars_widgets;

 

-    if (!is_array($sidebars_widgets))

-        $sidebars_widgets = wp_get_sidebars_widgets();

+    if (!is_array($sidebars_widgets)) {
+            $sidebars_widgets = wp_get_sidebars_widgets();
+    }
 

     if (is_array($sidebars_widgets)) {

         $geodir_old_sidebars = get_option('geodir_sidebars');

@@ -1551,20 +1561,25 @@ 
 

     global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields;

 

-    if ($tab == 'post_info')

-        $is_display = (!empty($geodir_post_detail_fields)) ? true : false;

+    if ($tab == 'post_info') {
+            $is_display = (!empty($geodir_post_detail_fields)) ? true : false;
+    }
 

-    if ($tab == 'post_images')

-        $is_display = (!empty($post_images)) ? true : false;

+    if ($tab == 'post_images') {
+            $is_display = (!empty($post_images)) ? true : false;
+    }
 

-    if ($tab == 'post_video')

-        $is_display = (!empty($video)) ? true : false;

+    if ($tab == 'post_video') {
+            $is_display = (!empty($video)) ? true : false;
+    }
 

-    if ($tab == 'special_offers')

-        $is_display = (!empty($special_offers)) ? true : false;

+    if ($tab == 'special_offers') {
+            $is_display = (!empty($special_offers)) ? true : false;
+    }
 

-    if ($tab == 'reviews')

-        $is_display = (geodir_is_page('detail')) ? true : false;

+    if ($tab == 'reviews') {
+            $is_display = (geodir_is_page('detail')) ? true : false;
+    }
 

     if ($tab == 'related_listing') {

        $message = __('No listings found which match your selection.', 'geodirectory');

@@ -1840,11 +1855,13 @@ 
     $region_slug = $default_location->region_slug;

     $city_slug = $default_location->city_slug;

 

-    if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug)

-        return $slug_exists = true;

+    if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) {
+            return $slug_exists = true;
+    }
 

-    if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))

-        return $slug_exists = true;

+    if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id)))) {
+            return $slug_exists = true;
+    }
 

     return $slug_exists;

 }

@@ -1886,40 +1903,31 @@ 
     if(geodir_is_page('home')){

         $gd_page = 'home';

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

-    }

-    elseif(geodir_is_page('detail')){

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

         $gd_page = 'detail';

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

-    }

-    elseif(geodir_is_page('pt')){

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

         $gd_page = 'pt';

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

-    }

-    elseif(geodir_is_page('listing')){

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

         $gd_page = 'listing';

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

-    }

-    elseif(geodir_is_page('location')){

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

         $gd_page = 'location';

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

-    }

-    elseif(geodir_is_page('search')){

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

         $gd_page = 'search';

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

-    }

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

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

         $gd_page = 'add-listing';

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

-    }

-    elseif(geodir_is_page('author')){

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

         $gd_page = 'author';

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

-    }

-    elseif(geodir_is_page('login')){

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

         $gd_page = 'login';

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

-    }

-    elseif(geodir_is_page('listing-success')){

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

         $gd_page = 'listing-success';

         $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;

     }

@@ -1994,11 +2002,13 @@ 
 

     if (!get_option('geodir_remove_url_seperator')) {

 

-        if (get_option('geodir_listingurl_separator'))

-            delete_option('geodir_listingurl_separator');

+        if (get_option('geodir_listingurl_separator')) {
+                    delete_option('geodir_listingurl_separator');
+        }
 

-        if (get_option('geodir_detailurl_separator'))

-            delete_option('geodir_detailurl_separator');

+        if (get_option('geodir_detailurl_separator')) {
+                    delete_option('geodir_detailurl_separator');
+        }
 

         flush_rewrite_rules(false);

 

@@ -2022,8 +2032,9 @@ 
 {

     foreach ($permalink_arr as $key => $value) {

 

-        if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator')

-            unset($permalink_arr[$key]);

+        if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') {
+                    unset($permalink_arr[$key]);
+        }
 

     }

 

@@ -2156,16 +2167,18 @@ 
 

             $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));

 

-            if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '')

-                $tabs_arr['post_video']['heading_text'] = $field_title;

+            if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') {
+                            $tabs_arr['post_video']['heading_text'] = $field_title;
+            }
         }

 

         if (array_key_exists('special_offers', $tabs_arr)) {

 

             $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));

 

-            if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '')

-                $tabs_arr['special_offers']['heading_text'] = $field_title;

+            if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') {
+                            $tabs_arr['special_offers']['heading_text'] = $field_title;
+            }
         }

 

     }

@@ -2220,8 +2233,9 @@ 
 

         $all_postypes = geodir_get_posttypes();

 

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

-            return false;

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

         $uploads = wp_upload_dir();

 

@@ -2295,8 +2309,9 @@ 
                         $file_info = pathinfo($attach->file);

 

                         $sub_dir = '';

-                        if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

-                            $sub_dir = stripslashes_deep($file_info['dirname']);

+                        if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
+                                                    $sub_dir = stripslashes_deep($file_info['dirname']);
+                        }
 

                         $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

                         $uploads_baseurl = $uploads['baseurl'];

@@ -2318,8 +2333,9 @@ 
 

                     if (!empty($attachment_data)) {

 

-                        if ($attachment_data->ID)

-                            $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

+                        if ($attachment_data->ID) {
+                                                    $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
+                        }
 

                     } else {

 

@@ -2605,9 +2621,10 @@ 
                             break;

                         case 'time': {

                             $value = '';

-                            if ($post->$type['htmlvar_name'] != '')

-                                //$value = date('h:i',strtotime($post->$type['htmlvar_name']));

-                                $value = date(get_option('time_format'), strtotime($post->$type['htmlvar_name']));

+                            if ($post->$type['htmlvar_name'] != '') {
+                                                            //$value = date('h:i',strtotime($post->$type['htmlvar_name']));

+                                $value = date(get_option('time_format'), strtotime($post->$type['htmlvar_name']));
+                            }
 

                             if (strpos($field_icon, 'http') !== false) {

                                 $field_icon_af = '';

@@ -2642,8 +2659,9 @@ 
                             $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $post->$type['htmlvar_name']) : $post->$type['htmlvar_name']; // PHP doesn't work well with dd/mm/yyyy format

 

                             $value = '';

-                            if ($post->$type['htmlvar_name'] != '')

-                                $value = date($date_format, strtotime($post_htmlvar_value));

+                            if ($post->$type['htmlvar_name'] != '') {
+                                                            $value = date($date_format, strtotime($post_htmlvar_value));
+                            }
 

                             if (strpos($field_icon, 'http') !== false) {

                                 $field_icon_af = '';

Indentation +130 added lines, -130 removed lines

@@ -1134,9 +1134,9 @@ 
         $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">';

         $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings;

        

-	   $reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');

+        $reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');

 	   

-	   $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';

+        $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';

 

         $html .= '<span class="item">';

         $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>';

@@ -1250,13 +1250,13 @@ 
         $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));

     }

 	

-	/**

-	 * Filter the allowed image type extensions for post images.

-	 *

-	 * @since 1.4.7.1

-	 * @param string $allowed_img_types The image type extensions array.

-	 */

-	$allowed_img_types = apply_filters('geodir_allowed_post_image_exts', array('jpg', 'jpeg', 'jpe', 'gif', 'png'));

+    /**

+     * Filter the allowed image type extensions for post images.

+     *

+     * @since 1.4.7.1

+     * @param string $allowed_img_types The image type extensions array.

+     */

+    $allowed_img_types = apply_filters('geodir_allowed_post_image_exts', array('jpg', 'jpeg', 'jpe', 'gif', 'png'));

 	

     $arr_alert_msg = array(

         'geodir_plugin_url' => geodir_plugin_url(),

@@ -1304,13 +1304,13 @@ 
         'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),

         'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),

         'geodir_action_remove' => __('Remove', 'geodirectory'),

-		'geodir_txt_all_files' => __('Allowed files', 'geodirectory'),

-		'geodir_err_file_type' => __('File type error. Allowed file types: %s', 'geodirectory'),

-		'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',

-		'geodir_txt_form_wait' => __('Wait...', 'geodirectory'),

-		'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),

-		'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',

-		'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',

+        'geodir_txt_all_files' => __('Allowed files', 'geodirectory'),

+        'geodir_err_file_type' => __('File type error. Allowed file types: %s', 'geodirectory'),

+        'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',

+        'geodir_txt_form_wait' => __('Wait...', 'geodirectory'),

+        'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),

+        'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',

+        'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',

     );

 

     /**

@@ -1496,7 +1496,7 @@ 
  * @global object $gd_session GeoDirectory Session object.

  */

 function geodir_after_main_form_fields() {

-	global $gd_session;

+    global $gd_session;

 	

     if (get_option('geodir_accept_term_condition')) {

         global $post;

@@ -1569,13 +1569,13 @@ 
         $is_display = (geodir_is_page('detail')) ? true : false;

 

     if ($tab == 'related_listing') {

-       $message = __('No listings found which match your selection.', 'geodirectory');

+        $message = __('No listings found which match your selection.', 'geodirectory');

 	   

-	   /** This action is documented in geodirectory-functions/template_functions.php */

-	   $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);

+        /** This action is documented in geodirectory-functions/template_functions.php */

+        $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);

 	   

-	   $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;

-	}

+        $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;

+    }

 

 

     return $is_display;

@@ -1622,12 +1622,12 @@ 
 function geodir_changes_in_custom_fields_table() {

     global $wpdb, $plugin_prefix;

 	

-	// Remove unused virtual page

-	$listings_page_id = (int)get_option('geodir_listing_page');

-	if ($listings_page_id) {

-		$wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));

+    // Remove unused virtual page

+    $listings_page_id = (int)get_option('geodir_listing_page');

+    if ($listings_page_id) {

+        $wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));

         delete_option('geodir_listing_page');

-	}

+    }

 

     // updated custom field table(add field to show custom field as a tab)

     /*if (!$wpdb->get_var("SHOW COLUMNS FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE field = 'show_as_tab'")) {

@@ -1795,26 +1795,26 @@ 
 

     }

 	

-	// Update tag in detail table.

-	$taxonomy_obj = get_taxonomy($taxonomy);

-	$post_type = !empty($taxonomy_obj) ? $taxonomy_obj->object_type[0] : NULL;

+    // Update tag in detail table.

+    $taxonomy_obj = get_taxonomy($taxonomy);

+    $post_type = !empty($taxonomy_obj) ? $taxonomy_obj->object_type[0] : NULL;

 	

-	$post_types = geodir_get_posttypes();

-	if ($post_type && in_array($post_type, $post_types) && $post_type . '_tags' == $taxonomy) {		

-		$posts_obj = $wpdb->get_results($wpdb->prepare("SELECT object_id FROM " . $wpdb->term_relationships . " WHERE term_taxonomy_id = %d", array($tt_id)));

+    $post_types = geodir_get_posttypes();

+    if ($post_type && in_array($post_type, $post_types) && $post_type . '_tags' == $taxonomy) {		

+        $posts_obj = $wpdb->get_results($wpdb->prepare("SELECT object_id FROM " . $wpdb->term_relationships . " WHERE term_taxonomy_id = %d", array($tt_id)));

 		

-		if (!empty($posts_obj)) {

-			foreach ($posts_obj as $post_obj) {

-				$post_id = $post_obj->object_id;

+        if (!empty($posts_obj)) {

+            foreach ($posts_obj as $post_obj) {

+                $post_id = $post_obj->object_id;

 				

-				$raw_tags = wp_get_object_terms($post_id, $post_type . '_tags', array('fields' => 'names'));

-				$post_tags = !empty($raw_tags) ? implode(',', $raw_tags) : '';

+                $raw_tags = wp_get_object_terms($post_id, $post_type . '_tags', array('fields' => 'names'));

+                $post_tags = !empty($raw_tags) ? implode(',', $raw_tags) : '';

 				

-				$listing_table = $plugin_prefix . $post_type . '_detail';

-				$wpdb->query($wpdb->prepare("UPDATE " . $listing_table . " SET post_tags=%s WHERE post_id =%d", array($post_tags, $post_id)));

-			}

-		}

-	}

+                $listing_table = $plugin_prefix . $post_type . '_detail';

+                $wpdb->query($wpdb->prepare("UPDATE " . $listing_table . " SET post_tags=%s WHERE post_id =%d", array($post_tags, $post_id)));

+            }

+        }

+    }

 }

 

 

@@ -2037,14 +2037,14 @@ 
     add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');

 }

 /**

- * Set status from draft to publish.

- *

- * @since 1.0.0

- * @package GeoDirectory

- * @global object $wp WordPress object.

- * @param object $post Post object.

- * @return object Modified post object.

- */

+     * Set status from draft to publish.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     * @global object $wp WordPress object.

+     * @param object $post Post object.

+     * @return object Modified post object.

+     */

 function geodir_set_status_draft_to_publish_for_own_post($post)

 {

     global $wp;

@@ -2475,7 +2475,7 @@ 
             foreach ($custom_fields as $field) {

                 $field = stripslashes_deep($field); // strip slashes

 				

-				$type = $field;

+                $type = $field;

                 $field_name = $field['htmlvar_name'];

                 if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->$field_name) && isset($_REQUEST[$field_name])) {

                     $post->$field_name = $_REQUEST[$field_name];

@@ -2563,11 +2563,11 @@ 
                                 $field_icon = '';

                             }

 							

-							$a_url = geodir_parse_custom_field_url($post->$type['htmlvar_name']);

+                            $a_url = geodir_parse_custom_field_url($post->$type['htmlvar_name']);

 

-							$website = !empty($a_url['url']) ? $a_url['url'] : '';

-							$title = !empty($a_url['label']) ? $a_url['label'] : $type['site_title'];

-							$title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';

+                            $website = !empty($a_url['url']) ? $a_url['url'] : '';

+                            $title = !empty($a_url['label']) ? $a_url['label'] : $type['site_title'];

+                            $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';

 

                             $geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

 

@@ -2686,26 +2686,26 @@ 
                             break;

                         case 'radio': {

 

-							if ($post->$type['htmlvar_name'] != '') {

-								if ($post->$type['htmlvar_name'] == 'f' || $post->$type['htmlvar_name'] == '0') {

+                            if ($post->$type['htmlvar_name'] != '') {

+                                if ($post->$type['htmlvar_name'] == 'f' || $post->$type['htmlvar_name'] == '0') {

                                     $html_val = __('No', 'geodirectory');

                                 } else if ($post->$type['htmlvar_name'] == 't' || $post->$type['htmlvar_name'] == '1') {

                                     $html_val = __('Yes', 'geodirectory');

                                 } else {

-									$html_val = __($post->$type['htmlvar_name'], 'geodirectory');

+                                    $html_val = __($post->$type['htmlvar_name'], 'geodirectory');

 									

-									if (!empty($type['option_values'])) {

-										$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+                                    if (!empty($type['option_values'])) {

+                                        $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

 										

-										if (!empty($cf_option_values)) {

-											foreach ($cf_option_values as $cf_option_value) {

-												if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->$type['htmlvar_name']) {

-													$html_val = $cf_option_value['label'];

-												}

-											}

-										}

-									}

-								}

+                                        if (!empty($cf_option_values)) {

+                                            foreach ($cf_option_values as $cf_option_value) {

+                                                if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->$type['htmlvar_name']) {

+                                                    $html_val = $cf_option_value['label'];

+                                                }

+                                            }

+                                        }

+                                    }

+                                }

 

                                 if (strpos($field_icon, 'http') !== false) {

                                     $field_icon_af = '';

@@ -2771,19 +2771,19 @@ 
                                 $field_icon = '';

                             }

 							

-							$field_value = __($post->$type['htmlvar_name'], 'geodirectory');

+                            $field_value = __($post->$type['htmlvar_name'], 'geodirectory');

 							

-							if (!empty($type['option_values'])) {

-								$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+                            if (!empty($type['option_values'])) {

+                                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

 								

-								if (!empty($cf_option_values)) {

-									foreach ($cf_option_values as $cf_option_value) {

-										if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->$type['htmlvar_name']) {

-											$field_value = $cf_option_value['label'];

-										}

-									}

-								}

-							}

+                                if (!empty($cf_option_values)) {

+                                    foreach ($cf_option_values as $cf_option_value) {

+                                        if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->$type['htmlvar_name']) {

+                                            $field_value = $cf_option_value['label'];

+                                        }

+                                    }

+                                }

+                            }

 

                             $geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

 

@@ -2811,16 +2811,16 @@ 
                             $field_values = explode(',', trim($post->$type['htmlvar_name'], ","));

 

                             $option_values = array();

-							if (!empty($type['option_values'])) {

-								$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+                            if (!empty($type['option_values'])) {

+                                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

 								

-								if (!empty($cf_option_values)) {

-									foreach ($cf_option_values as $cf_option_value) {

-										if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {

-											$option_values[] = $cf_option_value['label'];

-										}

-									}

-								}

+                                if (!empty($cf_option_values)) {

+                                    foreach ($cf_option_values as $cf_option_value) {

+                                        if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {

+                                            $option_values[] = $cf_option_value['label'];

+                                        }

+                                    }

+                                }

                             }

 

                             $geodir_odd_even = $field_set_start == 1 && $i % 2 == 0 ? 'geodir_more_info_even' : 'geodir_more_info_odd';

@@ -2908,9 +2908,9 @@ 
 

                                 if (!empty($files)) {

                                     $extra_fields = !empty($type['extra_fields']) ? maybe_unserialize($type['extra_fields']) : NULL;

-							   		$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+                                        $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

 							   

-									$file_paths = '';

+                                    $file_paths = '';

                                     foreach ($files as $file) {

                                         if (!empty($file)) {

                                             $filetype = wp_check_filetype($file);

@@ -2921,29 +2921,29 @@ 
 

                                             $arr_file_type = wp_check_filetype($filename);

                                             if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

-												continue;

-											}

-											$uploaded_file_type = $arr_file_type['type'];

-											$uploaded_file_ext = $arr_file_type['ext'];

+                                                continue;

+                                            }

+                                            $uploaded_file_type = $arr_file_type['type'];

+                                            $uploaded_file_ext = $arr_file_type['ext'];

 											

-											if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

-												continue; // Invalid file type.

-											}

+                                            if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

+                                                continue; // Invalid file type.

+                                            }

 

                                             //$allowed_file_types = array('application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

-											$image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');

+                                            $image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');

 

                                             // If the uploaded file is image

                                             if (in_array($uploaded_file_type, $image_file_types)) {

                                                 $file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';

-												$file_paths .= '<a href="'.$file.'">';

-												$file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);

-												$file_paths .= '</a>';

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

+                                                $file_paths .= '<a href="'.$file.'">';

+                                                $file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);

+                                                $file_paths .= '</a>';

+                                                $file_paths .= '</div>';

                                             } else {

-                                               $ext_path = '_' . $html_var . '_';

-                                               $filename = explode($ext_path, $filename);

-                                               $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';

+                                                $ext_path = '_' . $html_var . '_';

+                                                $filename = explode($ext_path, $filename);

+                                                $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';

                                             }

                                         }

                                     }

@@ -3286,34 +3286,34 @@ 
  * @return array Translation texts.

  */

 function geodir_load_gd_options_text_translation($translation_texts = array()) {

-	$translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array();

+    $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array();

 	

-	$gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content');

+    $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content');

 	

-	/**

-	 * Filters the geodirectory option names that requires to add for translation.

-	 *

-	 * @since 1.5.7

-	 * @package GeoDirectory

-	 *

-	 * @param  array $gd_options Array of option names.

-	 */

-	$gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);

-	$gd_options = array_unique($gd_options);

+    /**

+     * Filters the geodirectory option names that requires to add for translation.

+     *

+     * @since 1.5.7

+     * @package GeoDirectory

+     *

+     * @param  array $gd_options Array of option names.

+     */

+    $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);

+    $gd_options = array_unique($gd_options);

 	

-	if (!empty($gd_options)) {

-		foreach ($gd_options as $gd_option) {

-			if ($gd_option != '' && $option_value = get_option($gd_option)) {

-				$option_value = is_string($option_value) ? stripslashes_deep($option_value) : '';

+    if (!empty($gd_options)) {

+        foreach ($gd_options as $gd_option) {

+            if ($gd_option != '' && $option_value = get_option($gd_option)) {

+                $option_value = is_string($option_value) ? stripslashes_deep($option_value) : '';

 				

-				if ($option_value != '' && !in_array($option_value, $translation_texts)) {

-					$translation_texts[] = stripslashes_deep($option_value);

-				}

-			}

-		}

-	}

+                if ($option_value != '' && !in_array($option_value, $translation_texts)) {

+                    $translation_texts[] = stripslashes_deep($option_value);

+                }

+            }

+        }

+    }

 	

-	$translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

+    $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

 

     return $translation_texts;

 }

Spacing +76 added lines, -76 removed lines

@@ -136,7 +136,7 @@ 
 /* ON TEMPLATE INCLUDE */

 /////////////////////////

 

-add_filter('template_include', 'geodir_template_loader',9);

+add_filter('template_include', 'geodir_template_loader', 9);

 

 /////////////////////////

 /* CATEGORY / TAXONOMY / CUSTOM POST ACTIONS */

@@ -177,7 +177,7 @@ 
 ////////////////////////

 

 add_action('geodir_update_postrating', 'geodir_term_review_count_force_update', 100);

-add_action('transition_post_status', 'geodir_term_review_count_force_update', 100,3);

+add_action('transition_post_status', 'geodir_term_review_count_force_update', 100, 3);

 add_action('created_term', 'geodir_term_review_count_force_update', 100);

 add_action('edited_term', 'geodir_term_review_count_force_update', 100);

 add_action('delete_term', 'geodir_term_review_count_force_update', 100);

@@ -319,8 +319,8 @@ 
 

 /////// GEO DIRECOTORY CUSTOM HOOKS ///

 

-add_action('geodir_before_tab_content', 'geodir_before_tab_content');// this function is in custom_functions.php and it is used to wrap detail page tab content 

-add_action('geodir_after_tab_content', 'geodir_after_tab_content');// this function is in custom_functions.php and it is used to wrap detail page tab content

+add_action('geodir_before_tab_content', 'geodir_before_tab_content'); // this function is in custom_functions.php and it is used to wrap detail page tab content 

+add_action('geodir_after_tab_content', 'geodir_after_tab_content'); // this function is in custom_functions.php and it is used to wrap detail page tab content

 

 // Detail page sidebar content 

 add_action('geodir_detail_page_sidebar', 'geodir_detail_page_sidebar_content_sorting', 1);

@@ -422,7 +422,7 @@ 
     $content_html = ob_get_clean();

     if (trim($content_html) != '')

         $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {

+    if ((int) get_option('geodir_disable_tfg_buttons_section') != 1) {

         /**

          * Filter the geodir_social_sharing_buttons() function content.

          *

@@ -469,7 +469,7 @@ 
     $content_html = ob_get_clean();

     if (trim($content_html) != '')

         $content_html = '<div class="geodir-company_info geodir-details-sidebar-sharethis">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_sharethis_button_section') != 1) {

+    if ((int) get_option('geodir_disable_sharethis_button_section') != 1) {

         /**

          * Filter the geodir_share_this_button() function content.

          *

@@ -528,7 +528,7 @@ 
     $content_html = ob_get_clean();

     if (trim($content_html) != '')

         $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_user_links_section') != 1) {

+    if ((int) get_option('geodir_disable_user_links_section') != 1) {

         /**

          * Filter the geodir_edit_post_link() function content.

          *

@@ -557,7 +557,7 @@ 
 

     $id = trim(get_option('geodir_ga_id'));

 

-    if(!$id){return;}//if no Google Analytics ID then bail.

+    if (!$id) {return; }//if no Google Analytics ID then bail.

 

     ob_start(); // Start buffering;

     /**

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

      */

     do_action('geodir_before_google_analytics');

-    if (get_option('geodir_ga_stats') && is_user_logged_in() &&  (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {

+    if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id() == $post->post_author || current_user_can('manage_options'))) {

         $page_url = $_SERVER['REQUEST_URI'];

         //$page_url = "/";

         ?>

@@ -594,13 +594,13 @@ 
 

             function gdga_weekVSweek(){

 

-                jQuery.ajax({url: "<?php echo get_bloginfo('url').'/?ptype=ga&ga_page='.$page_url; ?>&ga_type=thisweek", success: function(result){

+                jQuery.ajax({url: "<?php echo get_bloginfo('url') . '/?ptype=ga&ga_page=' . $page_url; ?>&ga_type=thisweek", success: function(result){

                     ga_data1 = jQuery.parseJSON(result);

                     if(ga_data1.error){jQuery('#ga_stats').html(result);return;}

                     gd_renderWeekOverWeekChart();

                 }});

 

-                jQuery.ajax({url: "<?php echo get_bloginfo('url').'/?ptype=ga&ga_page='.$page_url; ?>&ga_type=lastweek", success: function(result){

+                jQuery.ajax({url: "<?php echo get_bloginfo('url') . '/?ptype=ga&ga_page=' . $page_url; ?>&ga_type=lastweek", success: function(result){

                     ga_data2 = jQuery.parseJSON(result);

                     gd_renderWeekOverWeekChart();

                 }});

@@ -610,14 +610,14 @@ 
 

             function gdga_yearVSyear(){

 

-                jQuery.ajax({url: "<?php echo get_bloginfo('url').'/?ptype=ga&ga_page='.$page_url; ?>&ga_type=thisyear", success: function(result){

+                jQuery.ajax({url: "<?php echo get_bloginfo('url') . '/?ptype=ga&ga_page=' . $page_url; ?>&ga_type=thisyear", success: function(result){

                     ga_data3 = jQuery.parseJSON(result);

                     if(ga_data3.error){jQuery('#ga_stats').html(result);return;}

 

                     gd_renderYearOverYearChart()

                 }});

 

-                jQuery.ajax({url: "<?php echo get_bloginfo('url').'/?ptype=ga&ga_page='.$page_url; ?>&ga_type=lastyear", success: function(result){

+                jQuery.ajax({url: "<?php echo get_bloginfo('url') . '/?ptype=ga&ga_page=' . $page_url; ?>&ga_type=lastyear", success: function(result){

                     ga_data4 = jQuery.parseJSON(result);

                     gd_renderYearOverYearChart()

                 }});

@@ -627,7 +627,7 @@ 
 

             function gdga_country(){

 

-                jQuery.ajax({url: "<?php echo get_bloginfo('url').'/?ptype=ga&ga_page='.$page_url; ?>&ga_type=country", success: function(result){

+                jQuery.ajax({url: "<?php echo get_bloginfo('url') . '/?ptype=ga&ga_page=' . $page_url; ?>&ga_type=country", success: function(result){

                     ga_data5 = jQuery.parseJSON(result);

                     if(ga_data5.error){jQuery('#ga_stats').html(result);return;}

                     gd_renderTopCountriesChart();

@@ -637,7 +637,7 @@ 
 

             function gdga_realtime(){

 

-                jQuery.ajax({url: "<?php echo get_bloginfo('url').'/?ptype=ga&ga_page='.$page_url; ?>&ga_type=realtime", success: function(result){

+                jQuery.ajax({url: "<?php echo get_bloginfo('url') . '/?ptype=ga&ga_page=' . $page_url; ?>&ga_type=realtime", success: function(result){

                     ga_data6 = jQuery.parseJSON(result);

                     if(ga_data6.error){jQuery('#ga_stats').html(result);return;}

                     gd_renderRealTime();

@@ -708,7 +708,7 @@ 
             }

 

             function gdga_noResults(){

-                jQuery('#gdga-chart-container').html('<?php _e('No results available','geodirectory');?>');

+                jQuery('#gdga-chart-container').html('<?php _e('No results available', 'geodirectory'); ?>');

                 jQuery('#gdga-legend-container').html('');

             }

 

@@ -746,18 +746,18 @@ 
 

 

 

-                    var labels = ['<?php _e('Jan', 'geodirectory');?>',

-                        '<?php _e('Feb', 'geodirectory');?>',

-                        '<?php _e('Mar', 'geodirectory');?>',

-                        '<?php _e('Apr', 'geodirectory');?>',

-                        '<?php _e('May', 'geodirectory');?>',

-                        '<?php _e('Jun', 'geodirectory');?>',

-                        '<?php _e('Jul', 'geodirectory');?>',

-                        '<?php _e('Aug', 'geodirectory');?>',

-                        '<?php _e('Sep', 'geodirectory');?>',

-                        '<?php _e('Oct', 'geodirectory');?>',

-                        '<?php _e('Nov', 'geodirectory');?>',

-                        '<?php _e('Dec', 'geodirectory');?>'];

+                    var labels = ['<?php _e('Jan', 'geodirectory'); ?>',

+                        '<?php _e('Feb', 'geodirectory'); ?>',

+                        '<?php _e('Mar', 'geodirectory'); ?>',

+                        '<?php _e('Apr', 'geodirectory'); ?>',

+                        '<?php _e('May', 'geodirectory'); ?>',

+                        '<?php _e('Jun', 'geodirectory'); ?>',

+                        '<?php _e('Jul', 'geodirectory'); ?>',

+                        '<?php _e('Aug', 'geodirectory'); ?>',

+                        '<?php _e('Sep', 'geodirectory'); ?>',

+                        '<?php _e('Oct', 'geodirectory'); ?>',

+                        '<?php _e('Nov', 'geodirectory'); ?>',

+                        '<?php _e('Dec', 'geodirectory'); ?>'];

 

 

                     // Ensure the data arrays are at least as long as the labels array.

@@ -772,13 +772,13 @@ 
                         labels : labels,

                         datasets : [

                             {

-                                label: '<?php _e('Last Year', 'geodirectory');?>',

+                                label: '<?php _e('Last Year', 'geodirectory'); ?>',

                                 fillColor : "rgba(220,220,220,0.5)",

                                 strokeColor : "rgba(220,220,220,1)",

                                 data : data2

                             },

                             {

-                                label: '<?php _e('This Year', 'geodirectory');?>',

+                                label: '<?php _e('This Year', 'geodirectory'); ?>',

                                 fillColor : "rgba(151,187,205,0.5)",

                                 strokeColor : "rgba(151,187,205,1)",

                                 data : data1

@@ -828,23 +828,23 @@ 
 

                     <?php

                     // Here we list the shorthand days of the week so it can be used in translation.

-                    __("Mon",'geodirectory');

-                    __("Tue",'geodirectory');

-                    __("Wed",'geodirectory');

-                    __("Thu",'geodirectory');

-                    __("Fri",'geodirectory');

-                    __("Sat",'geodirectory');

-                    __("Sun",'geodirectory');

+                    __("Mon", 'geodirectory');

+                    __("Tue", 'geodirectory');

+                    __("Wed", 'geodirectory');

+                    __("Thu", 'geodirectory');

+                    __("Fri", 'geodirectory');

+                    __("Sat", 'geodirectory');

+                    __("Sun", 'geodirectory');

                     ?>

 

                     labels = [

-                        "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+2 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+3 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+4 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+5 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+6 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+7 day")),'geodirectory'); ?>"

+                        "<?php _e(date('D', strtotime("+1 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+2 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+3 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+4 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+5 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+6 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+7 day")), 'geodirectory'); ?>"

                     ];

 

 

@@ -853,7 +853,7 @@ 
                         labels : labels,

                         datasets : [

                             {

-                                label: '<?php _e('Last Week', 'geodirectory');?>',

+                                label: '<?php _e('Last Week', 'geodirectory'); ?>',

                                 fillColor : "rgba(220,220,220,0.5)",

                                 strokeColor : "rgba(220,220,220,1)",

                                 pointColor : "rgba(220,220,220,1)",

@@ -861,7 +861,7 @@ 
                                 data : data2

                             },

                             {

-                                label: '<?php _e('This Week', 'geodirectory');?>',

+                                label: '<?php _e('This Week', 'geodirectory'); ?>',

                                 fillColor : "rgba(151,187,205,0.5)",

                                 strokeColor : "rgba(151,187,205,1)",

                                 pointColor : "rgba(151,187,205,1)",

@@ -1053,18 +1053,18 @@ 
 

 

         <span id="ga_stats">

-            <div id="ga-analytics-title"><?php _e("Analytics", 'geodirectory');?></div>

+            <div id="ga-analytics-title"><?php _e("Analytics", 'geodirectory'); ?></div>

 

             <div id="gd-active-users-container">

-                <div class="gd-ActiveUsers"><?php _e("Active Users:", 'geodirectory');?>

+                <div class="gd-ActiveUsers"><?php _e("Active Users:", 'geodirectory'); ?>

                     <b class="gd-ActiveUsers-value">0</b>

                 </div>

             </div>

 

             <select id="gdga-select-analytic" onchange="gdga_select_option();" style="display: none;">

-                <option value="weeks"><?php _e("Last Week vs This Week", 'geodirectory');?></option>

-                <option value="years"><?php _e("This Year vs Last Year", 'geodirectory');?></option>

-                <option value="country"><?php _e("Top Countries", 'geodirectory');?></option>

+                <option value="weeks"><?php _e("Last Week vs This Week", 'geodirectory'); ?></option>

+                <option value="years"><?php _e("This Year vs Last Year", 'geodirectory'); ?></option>

+                <option value="country"><?php _e("Top Countries", 'geodirectory'); ?></option>

             </select>

             <img alt="loader icon" id="gdga-loader-icon" src="<?php echo geodir_plugin_url() . '/geodirectory-assets/images/ajax-loader.gif'; ?>" />

             <div class="Chartjs-figure" id="gdga-chart-container"></div>

@@ -1082,7 +1082,7 @@ 
     $content_html = ob_get_clean();

     if (trim($content_html) != '')

         $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_google_analytics_section') != 1) {

+    if ((int) get_option('geodir_disable_google_analytics_section') != 1) {

         /**

          * Filter the geodir_edit_post_link() function content.

          *

@@ -1178,7 +1178,7 @@ 
     if (trim($content_html) != '') {

         $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>';

     }

-    if ((int)get_option('geodir_disable_rating_info_section') != 1) {

+    if ((int) get_option('geodir_disable_rating_info_section') != 1) {

         /**

          * Filter the geodir_detail_page_review_rating() function content.

          *

@@ -1218,7 +1218,7 @@ 
     $content_html = ob_get_clean();

     if (trim($content_html) != '')

         $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_listing_info_section') != 1) {

+    if ((int) get_option('geodir_disable_listing_info_section') != 1) {

         /**

          * Filter the output html for function geodir_detail_page_more_info().

          *

@@ -1309,7 +1309,7 @@ 
 		'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',

 		'geodir_txt_form_wait' => __('Wait...', 'geodirectory'),

 		'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),

-		'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',

+		'fa_rating' => (int) get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',

 		'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',

     );

 

@@ -1326,7 +1326,7 @@ 
     foreach ($arr_alert_msg as $key => $value) {

         if (!is_scalar($value))

             continue;

-        $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8');

+        $arr_alert_msg[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');

     }

 

     $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';';

@@ -1502,7 +1502,7 @@ 
         global $post;

         $term_condition = '';

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

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

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

             $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : '';

         }

 

@@ -1516,7 +1516,7 @@ 
                     echo 'checked="checked"';

                 } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition"

                        class="geodir_textfield" value="1"

-                       style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>

+                       style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if ($terms_page) { echo get_permalink($terms_page); }?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>

 				</span>

             </div>

             <span class="geodir_message_error"><?php if (isset($required_msg)) {

@@ -1623,7 +1623,7 @@ 
     global $wpdb, $plugin_prefix;

 	

 	// Remove unused virtual page

-	$listings_page_id = (int)get_option('geodir_listing_page');

+	$listings_page_id = (int) get_option('geodir_listing_page');

 	if ($listings_page_id) {

 		$wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));

         delete_option('geodir_listing_page');

@@ -1885,43 +1885,43 @@ 
 

 

     $gd_page = '';

-    if(geodir_is_page('home')){

+    if (geodir_is_page('home')) {

         $gd_page = 'home';

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

     }

-    elseif(geodir_is_page('detail')){

+    elseif (geodir_is_page('detail')) {

         $gd_page = 'detail';

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

     }

-    elseif(geodir_is_page('pt')){

+    elseif (geodir_is_page('pt')) {

         $gd_page = 'pt';

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

     }

-    elseif(geodir_is_page('listing')){

+    elseif (geodir_is_page('listing')) {

         $gd_page = 'listing';

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

     }

-    elseif(geodir_is_page('location')){

+    elseif (geodir_is_page('location')) {

         $gd_page = 'location';

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

     }

-    elseif(geodir_is_page('search')){

+    elseif (geodir_is_page('search')) {

         $gd_page = 'search';

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

     }

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

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

         $gd_page = 'add-listing';

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

     }

-    elseif(geodir_is_page('author')){

+    elseif (geodir_is_page('author')) {

         $gd_page = 'author';

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

     }

-    elseif(geodir_is_page('login')){

+    elseif (geodir_is_page('login')) {

         $gd_page = 'login';

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

     }

-    elseif(geodir_is_page('listing-success')){

+    elseif (geodir_is_page('listing-success')) {

         $gd_page = 'listing-success';

         $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;

     }

@@ -2185,7 +2185,7 @@ 
  */

 function geodir_remove_template_redirect_actions()

 {

-    if (geodir_is_page('login')){

+    if (geodir_is_page('login')) {

         remove_all_actions('template_redirect');

         remove_action('init', 'avia_modify_front', 10);

     }

@@ -2636,8 +2636,8 @@ 
                                 $date_format = $date_format['date_format'];

                             }

 

-                            $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format

-                            $replace = array('d','j','l','m','n','F','Y');//PHP date format

+                            $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format

+                            $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format

 

                             $date_format = str_replace($search, $replace, $date_format);

 

@@ -2732,7 +2732,7 @@ 
                             $html_var = $type['htmlvar_name'];

                             $html_val = $type['htmlvar_name'];

 

-                            if ((int)$post->$html_var == 1) {

+                            if ((int) $post->$html_var == 1) {

 

                                 if ($post->$type['htmlvar_name'] == '1') {

                                     $html_val = __('Yes', 'geodirectory');

@@ -2908,7 +2908,7 @@ 
 

                                 if (!empty($files)) {

                                     $extra_fields = !empty($type['extra_fields']) ? maybe_unserialize($type['extra_fields']) : NULL;

-							   		$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+							   		$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';

 							   

 									$file_paths = '';

                                     foreach ($files as $file) {

@@ -2936,7 +2936,7 @@ 
                                             // If the uploaded file is image

                                             if (in_array($uploaded_file_type, $image_file_types)) {

                                                 $file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';

-												$file_paths .= '<a href="'.$file.'">';

+												$file_paths .= '<a href="' . $file . '">';

 												$file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);

 												$file_paths .= '</a>';

 												$file_paths .= '</div>';

@@ -3286,7 +3286,7 @@ 
  * @return array Translation texts.

  */

 function geodir_load_gd_options_text_translation($translation_texts = array()) {

-	$translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array();

+	$translation_texts = !empty($translation_texts) && is_array($translation_texts) ? $translation_texts : array();

 	

 	$gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content');

 	

geodirectory-admin/admin_db_install.php

Indentation +6 added lines, -6 removed lines

@@ -27,12 +27,12 @@
             if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";

         }

 

-		/**

-		 * Include any functions needed for upgrades.

-		 *

-		 * @since 1.0.0

-		 */

-		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');

+        /**

+         * Include any functions needed for upgrades.

+         *

+         * @since 1.0.0

+         */

+        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');

 

 

 // rename tables if we need to

Braces +6 added lines, -2 removed lines

@@ -23,8 +23,12 @@
 

         $collate = '';

         if ($wpdb->has_cap('collation')) {

-            if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";

-            if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";

+            if (!empty($wpdb->charset)) {
+                $collate = "DEFAULT CHARACTER SET $wpdb->charset";
+            }
+            if (!empty($wpdb->collate)) {
+                $collate .= " COLLATE $wpdb->collate";
+            }
         }

 

 		/**

geodirectory-admin/admin_install.php

Indentation +7 added lines, -7 removed lines

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

 /**

- * GeoDirectory Installation related functions.

- *

- * Plugin install script which adds default pages, taxonomies, and database tables.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * GeoDirectory Installation related functions.

+     *

+     * Plugin install script which adds default pages, taxonomies, and database tables.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 

 /**

  * Include custom database table related functions.