Inspection of "New core WP 4.9 plupload JS breaks drop and upload..." - GeoDirectory/geodirectory - Measure and Improve Code Quality continuously with Scrutinizer

Test Setup Failed

Pull Request — master (#454)

by Kiran

created 2017-12-27 05:17 UTC

Status

Indentation +122 added lines, -122 removed lines patch added patch discarded remove patch

@@ -13,34 +13,34 @@  discard block
 block discarded – undo
  */
 function geodir_user_favourite_listing_count($user_id=false)
 {
-    global $wpdb, $plugin_prefix, $current_user;
+	global $wpdb, $plugin_prefix, $current_user;
 
-    if(!$user_id){$user_id = $current_user->ID;}
-    if(!$user_id){return array();}
+	if(!$user_id){$user_id = $current_user->ID;}
+	if(!$user_id){return array();}
 
-    $site_id = '';
-    if ( is_multisite() ) {
-        $blog_id = get_current_blog_id();
-        if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
-    }
+	$site_id = '';
+	if ( is_multisite() ) {
+		$blog_id = get_current_blog_id();
+		if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+	}
 
-    $user_favorites = geodir_get_user_favourites($user_id);
-    $all_posts = get_option('geodir_favorite_link_user_dashboard');
+	$user_favorites = geodir_get_user_favourites($user_id);
+	$all_posts = get_option('geodir_favorite_link_user_dashboard');
 
-    $user_listing = array();
-    if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
-        $user_favorites = "'" . implode("','", $user_favorites) . "'";
+	$user_listing = array();
+	if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
+		$user_favorites = "'" . implode("','", $user_favorites) . "'";
 
-        foreach ($all_posts as $ptype) {
-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE  post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
+		foreach ($all_posts as $ptype) {
+			$total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE  post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
 
-            if ($total_posts > 0) {
-                $user_listing[$ptype] = $total_posts;
-            }
-        }
-    }
+			if ($total_posts > 0) {
+				$user_listing[$ptype] = $total_posts;
+			}
+		}
+	}
 
-    return $user_listing;
+	return $user_listing;
 }
 
 /**
@@ -50,48 +50,48 @@  discard block
 block discarded – undo
  * @package GeoDirectory
  */
 function geodir_user_show_favourites( $user_id = '', $output_type = 'select' ) {
-    // My Favourites in Dashboard
-    $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' );
-    $user_favourite = geodir_user_favourite_listing_count( $user_id );
-
-    if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
-        $favourite_links = $output_type == 'link' ? array() : '';
-        $post_types = geodir_get_posttypes( 'object' );
-
-        $author_link = get_author_posts_url( $user_id );
-        $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
-
-        foreach ( $post_types as $key => $postobj ) {
-            if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
-                $name = __( $postobj->labels->name, 'geodirectory' );
-                $post_type_link = geodir_getlink( $author_link, array( 'stype' => $key, 'list' => 'favourite' ), false );
-
-                /**
-                 * Filter favorite listing link.
-                 *
-                 * @since 1.0.0
-                 * @param string $post_type_link Favorite listing link.
-                 * @param string $key Favorite listing array key.
-                 * @param int $current_user->ID Current user ID.
-                 */
-                $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id );
-
-                if ( $output_type == 'select' ) {
-                    $selected = '';
-                    if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
-                        $selected = 'selected="selected"';
-                    }
-
-                    $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . $name . '</option>';
-                } elseif ( $output_type == 'link' ) {
-                    $favourite_links[] = '<a href="' . $post_type_link . '">' . $name . '</a>';
-                }
-            }
-        }
-
-        if ( ! empty( $favourite_links ) ) {
-            if ( $output_type == 'select' ) {
-                ?>
+	// My Favourites in Dashboard
+	$show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' );
+	$user_favourite = geodir_user_favourite_listing_count( $user_id );
+
+	if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
+		$favourite_links = $output_type == 'link' ? array() : '';
+		$post_types = geodir_get_posttypes( 'object' );
+
+		$author_link = get_author_posts_url( $user_id );
+		$author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
+
+		foreach ( $post_types as $key => $postobj ) {
+			if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
+				$name = __( $postobj->labels->name, 'geodirectory' );
+				$post_type_link = geodir_getlink( $author_link, array( 'stype' => $key, 'list' => 'favourite' ), false );
+
+				/**
+				 * Filter favorite listing link.
+				 *
+				 * @since 1.0.0
+				 * @param string $post_type_link Favorite listing link.
+				 * @param string $key Favorite listing array key.
+				 * @param int $current_user->ID Current user ID.
+				 */
+				$post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id );
+
+				if ( $output_type == 'select' ) {
+					$selected = '';
+					if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
+						$selected = 'selected="selected"';
+					}
+
+					$favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . $name . '</option>';
+				} elseif ( $output_type == 'link' ) {
+					$favourite_links[] = '<a href="' . $post_type_link . '">' . $name . '</a>';
+				}
+			}
+		}
+
+		if ( ! empty( $favourite_links ) ) {
+			if ( $output_type == 'select' ) {
+				?>
                 <li>
                     <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Favorites', 'geodirectory' ); ?>">
                         <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Favorites", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option>
@@ -99,55 +99,55 @@  discard block
 block discarded – undo
                     </select>
                 </li>
             <?php
-            } elseif ( $output_type == 'link' ) {
-                echo implode( " | ", $favourite_links );
-            }
-        }
-    }
+			} elseif ( $output_type == 'link' ) {
+				echo implode( " | ", $favourite_links );
+			}
+		}
+	}
 }
 
 function geodir_user_show_listings( $user_id = '', $output_type = 'select' ) {
-    $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' );
-    $user_listing = geodir_user_post_listing_count( $user_id );
-
-    if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
-        $listing_links = $output_type == 'link' ? array() : '';
-
-        $post_types = geodir_get_posttypes( 'object' );
-
-        $author_link = get_author_posts_url( $user_id );
-        $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
-
-        foreach ( $post_types as $key => $postobj ) {
-            if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
-                $name = __( $postobj->labels->name, 'geodirectory' );
-                $listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false );
-
-                /**
-                 * Filter my listing link.
-                 *
-                 * @since 1.0.0
-                 * @param string $listing_link My listing link.
-                 * @param string $key My listing array key.
-                 * @param int $current_user->ID Current user ID.
-                 */
-                $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $user_id );
-                if ( $output_type == 'select' ) {
-                    $selected = '';
-                    if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
-                        $selected = 'selected="selected"';
-                    }
-
-                    $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . $name . '</option>';
-                } elseif ( $output_type == 'link' ) {
-                    $listing_links[] = '<a href="' . $listing_link . '">' . $name . '</a>';
-                }
-            }
-        }
-
-        if ( ! empty( $listing_links ) ) {
-            if ( $output_type == 'select' ) {
-                ?>
+	$show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' );
+	$user_listing = geodir_user_post_listing_count( $user_id );
+
+	if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
+		$listing_links = $output_type == 'link' ? array() : '';
+
+		$post_types = geodir_get_posttypes( 'object' );
+
+		$author_link = get_author_posts_url( $user_id );
+		$author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
+
+		foreach ( $post_types as $key => $postobj ) {
+			if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
+				$name = __( $postobj->labels->name, 'geodirectory' );
+				$listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false );
+
+				/**
+				 * Filter my listing link.
+				 *
+				 * @since 1.0.0
+				 * @param string $listing_link My listing link.
+				 * @param string $key My listing array key.
+				 * @param int $current_user->ID Current user ID.
+				 */
+				$listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $user_id );
+				if ( $output_type == 'select' ) {
+					$selected = '';
+					if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
+						$selected = 'selected="selected"';
+					}
+
+					$listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . $name . '</option>';
+				} elseif ( $output_type == 'link' ) {
+					$listing_links[] = '<a href="' . $listing_link . '">' . $name . '</a>';
+				}
+			}
+		}
+
+		if ( ! empty( $listing_links ) ) {
+			if ( $output_type == 'select' ) {
+				?>
                 <li>
                     <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Listings', 'geodirectory' ); ?>">
                         <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Listings", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option>
@@ -155,11 +155,11 @@  discard block
 block discarded – undo
                     </select>
                 </li>
             <?php
-            } elseif ( $output_type == 'link' ) {
-                echo implode( " | ", $listing_links );
-            }
-        }
-    }
+			} elseif ( $output_type == 'link' ) {
+				echo implode( " | ", $listing_links );
+			}
+		}
+	}
 }
 
 /**
@@ -170,12 +170,12 @@  discard block
 block discarded – undo
  * @return mixed
  */
 function geodir_get_user_favourites($user_id=''){
-    if(!$user_id){$user_id = get_current_user_id();}
-    $site_id = '';
-    if ( is_multisite() ) {
-        $blog_id = get_current_blog_id();
-        if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
-    }
-
-    return get_user_meta($user_id, 'gd_user_favourite_post'.$site_id, true);
+	if(!$user_id){$user_id = get_current_user_id();}
+	$site_id = '';
+	if ( is_multisite() ) {
+		$blog_id = get_current_blog_id();
+		if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+	}
+
+	return get_user_meta($user_id, 'gd_user_favourite_post'.$site_id, true);
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +57 added lines, -57 removed lines patch added patch discarded remove patch

@@ -11,17 +11,17 @@  discard block
 block discarded – undo
  * @global string $plugin_prefix Geodirectory plugin table prefix.
  * @return array User listing count for each post type.
  */
-function geodir_user_favourite_listing_count($user_id=false)
+function geodir_user_favourite_listing_count($user_id = false)
 {
     global $wpdb, $plugin_prefix, $current_user;
 
-    if(!$user_id){$user_id = $current_user->ID;}
-    if(!$user_id){return array();}
+    if (!$user_id) {$user_id = $current_user->ID; }
+    if (!$user_id) {return array(); }
 
     $site_id = '';
-    if ( is_multisite() ) {
+    if (is_multisite()) {
         $blog_id = get_current_blog_id();
-        if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+        if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }
     }
 
     $user_favorites = geodir_get_user_favourites($user_id);
@@ -29,10 +29,10 @@  discard block
 block discarded – undo
 
     $user_listing = array();
     if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
-        $user_favorites = "'" . implode("','", $user_favorites) . "'";
+        $user_favorites = "'".implode("','", $user_favorites)."'";
 
         foreach ($all_posts as $ptype) {
-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE  post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
+            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM ".$wpdb->prefix."posts WHERE  post_type='".$ptype."' AND post_status = 'publish' AND ID IN (".$user_favorites.")");
 
             if ($total_posts > 0) {
                 $user_listing[$ptype] = $total_posts;
@@ -49,22 +49,22 @@  discard block
 block discarded – undo
  * @since 1.5.9
  * @package GeoDirectory
  */
-function geodir_user_show_favourites( $user_id = '', $output_type = 'select' ) {
+function geodir_user_show_favourites($user_id = '', $output_type = 'select') {
     // My Favourites in Dashboard
-    $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' );
-    $user_favourite = geodir_user_favourite_listing_count( $user_id );
+    $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
+    $user_favourite = geodir_user_favourite_listing_count($user_id);
 
-    if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
+    if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
         $favourite_links = $output_type == 'link' ? array() : '';
-        $post_types = geodir_get_posttypes( 'object' );
+        $post_types = geodir_get_posttypes('object');
 
-        $author_link = get_author_posts_url( $user_id );
-        $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
+        $author_link = get_author_posts_url($user_id);
+        $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
 
-        foreach ( $post_types as $key => $postobj ) {
-            if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
-                $name = __( $postobj->labels->name, 'geodirectory' );
-                $post_type_link = geodir_getlink( $author_link, array( 'stype' => $key, 'list' => 'favourite' ), false );
+        foreach ($post_types as $key => $postobj) {
+            if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
+                $name = __($postobj->labels->name, 'geodirectory');
+                $post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false);
 
                 /**
                  * Filter favorite listing link.
@@ -74,54 +74,54 @@  discard block
 block discarded – undo
                  * @param string $key Favorite listing array key.
                  * @param int $current_user->ID Current user ID.
                  */
-                $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id );
+                $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id);
 
-                if ( $output_type == 'select' ) {
+                if ($output_type == 'select') {
                     $selected = '';
-                    if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
+                    if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
                         $selected = 'selected="selected"';
                     }
 
-                    $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . $name . '</option>';
-                } elseif ( $output_type == 'link' ) {
-                    $favourite_links[] = '<a href="' . $post_type_link . '">' . $name . '</a>';
+                    $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.$name.'</option>';
+                } elseif ($output_type == 'link') {
+                    $favourite_links[] = '<a href="'.$post_type_link.'">'.$name.'</a>';
                 }
             }
         }
 
-        if ( ! empty( $favourite_links ) ) {
-            if ( $output_type == 'select' ) {
+        if (!empty($favourite_links)) {
+            if ($output_type == 'select') {
                 ?>
                 <li>
-                    <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Favorites', 'geodirectory' ); ?>">
-                        <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Favorites", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option>
+                    <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__('My Favorites', 'geodirectory'); ?>">
+                        <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr(wp_sprintf(__("%s's Favorites", 'geodirectory'), geodir_get_client_name($user_id))); ?></option>
                         <?php echo $favourite_links; ?>
                     </select>
                 </li>
             <?php
-            } elseif ( $output_type == 'link' ) {
-                echo implode( " | ", $favourite_links );
+            } elseif ($output_type == 'link') {
+                echo implode(" | ", $favourite_links);
             }
         }
     }
 }
 
-function geodir_user_show_listings( $user_id = '', $output_type = 'select' ) {
-    $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' );
-    $user_listing = geodir_user_post_listing_count( $user_id );
+function geodir_user_show_listings($user_id = '', $output_type = 'select') {
+    $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
+    $user_listing = geodir_user_post_listing_count($user_id);
 
-    if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
+    if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
         $listing_links = $output_type == 'link' ? array() : '';
 
-        $post_types = geodir_get_posttypes( 'object' );
+        $post_types = geodir_get_posttypes('object');
 
-        $author_link = get_author_posts_url( $user_id );
-        $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
+        $author_link = get_author_posts_url($user_id);
+        $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
 
-        foreach ( $post_types as $key => $postobj ) {
-            if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
-                $name = __( $postobj->labels->name, 'geodirectory' );
-                $listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false );
+        foreach ($post_types as $key => $postobj) {
+            if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
+                $name = __($postobj->labels->name, 'geodirectory');
+                $listing_link = geodir_getlink($author_link, array('stype' => $key), false);
 
                 /**
                  * Filter my listing link.
@@ -131,32 +131,32 @@  discard block
 block discarded – undo
                  * @param string $key My listing array key.
                  * @param int $current_user->ID Current user ID.
                  */
-                $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $user_id );
-                if ( $output_type == 'select' ) {
+                $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id);
+                if ($output_type == 'select') {
                     $selected = '';
-                    if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
+                    if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
                         $selected = 'selected="selected"';
                     }
 
-                    $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . $name . '</option>';
-                } elseif ( $output_type == 'link' ) {
-                    $listing_links[] = '<a href="' . $listing_link . '">' . $name . '</a>';
+                    $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.$name.'</option>';
+                } elseif ($output_type == 'link') {
+                    $listing_links[] = '<a href="'.$listing_link.'">'.$name.'</a>';
                 }
             }
         }
 
-        if ( ! empty( $listing_links ) ) {
-            if ( $output_type == 'select' ) {
+        if (!empty($listing_links)) {
+            if ($output_type == 'select') {
                 ?>
                 <li>
-                    <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Listings', 'geodirectory' ); ?>">
-                        <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Listings", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option>
+                    <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__('My Listings', 'geodirectory'); ?>">
+                        <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr(wp_sprintf(__("%s's Listings", 'geodirectory'), geodir_get_client_name($user_id))); ?></option>
                         <?php echo $listing_links; ?>
                     </select>
                 </li>
             <?php
-            } elseif ( $output_type == 'link' ) {
-                echo implode( " | ", $listing_links );
+            } elseif ($output_type == 'link') {
+                echo implode(" | ", $listing_links);
             }
         }
     }
@@ -169,12 +169,12 @@  discard block
 block discarded – undo
  * @since 1.6.24
  * @return mixed
  */
-function geodir_get_user_favourites($user_id=''){
-    if(!$user_id){$user_id = get_current_user_id();}
+function geodir_get_user_favourites($user_id = '') {
+    if (!$user_id) {$user_id = get_current_user_id(); }
     $site_id = '';
-    if ( is_multisite() ) {
+    if (is_multisite()) {
         $blog_id = get_current_blog_id();
-        if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}
+        if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }
     }
 
     return get_user_meta($user_id, 'gd_user_favourite_post'.$site_id, true);

Please login to merge, or discard this patch.

		@@ -13,34 +13,34 @@ discard block
		block discarded – undo
13	13	*/
14	14	function geodir_user_favourite_listing_count($user_id=false)
15	15	{
16		- global $wpdb, $plugin_prefix, $current_user;
	16	+ global $wpdb, $plugin_prefix, $current_user;
17	17
18		- if(!$user_id){$user_id = $current_user->ID;}
19		- if(!$user_id){return array();}
	18	+ if(!$user_id){$user_id = $current_user->ID;}
	19	+ if(!$user_id){return array();}
20	20
21		- $site_id = '';
22		- if ( is_multisite() ) {
23		- $blog_id = get_current_blog_id();
24		- if($blog_id && $blog_id!='1'){$site_id = '_' . $blog_id ;}
25		- }
	21	+ $site_id = '';
	22	+ if ( is_multisite() ) {
	23	+ $blog_id = get_current_blog_id();
	24	+ if($blog_id && $blog_id!='1'){$site_id = '_' . $blog_id ;}
	25	+ }
26	26
27		- $user_favorites = geodir_get_user_favourites($user_id);
28		- $all_posts = get_option('geodir_favorite_link_user_dashboard');
	27	+ $user_favorites = geodir_get_user_favourites($user_id);
	28	+ $all_posts = get_option('geodir_favorite_link_user_dashboard');
29	29
30		- $user_listing = array();
31		- if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
32		- $user_favorites = "'" . implode("','", $user_favorites) . "'";
	30	+ $user_listing = array();
	31	+ if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
	32	+ $user_favorites = "'" . implode("','", $user_favorites) . "'";
33	33
34		- foreach ($all_posts as $ptype) {
35		- $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
	34	+ foreach ($all_posts as $ptype) {
	35	+ $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
36	36
37		- if ($total_posts > 0) {
38		- $user_listing[$ptype] = $total_posts;
39		- }
40		- }
41		- }
	37	+ if ($total_posts > 0) {
	38	+ $user_listing[$ptype] = $total_posts;
	39	+ }
	40	+ }
	41	+ }
42	42
43		- return $user_listing;
	43	+ return $user_listing;
44	44	}
45	45
46	46	/**
		@@ -50,48 +50,48 @@ discard block
		block discarded – undo
50	50	* @package GeoDirectory
51	51	*/
52	52	function geodir_user_show_favourites( $user_id = '', $output_type = 'select' ) {
53		- // My Favourites in Dashboard
54		- $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' );
55		- $user_favourite = geodir_user_favourite_listing_count( $user_id );
56		-
57		- if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
58		- $favourite_links = $output_type == 'link' ? array() : '';
59		- $post_types = geodir_get_posttypes( 'object' );
60		-
61		- $author_link = get_author_posts_url( $user_id );
62		- $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
63		-
64		- foreach ( $post_types as $key => $postobj ) {
65		- if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
66		- $name = __( $postobj->labels->name, 'geodirectory' );
67		- $post_type_link = geodir_getlink( $author_link, array( 'stype' => $key, 'list' => 'favourite' ), false );
68		-
69		- /**
70		- * Filter favorite listing link.
71		- *
72		- * @since 1.0.0
73		- * @param string $post_type_link Favorite listing link.
74		- * @param string $key Favorite listing array key.
75		- * @param int $current_user->ID Current user ID.
76		- */
77		- $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id );
78		-
79		- if ( $output_type == 'select' ) {
80		- $selected = '';
81		- if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
82		- $selected = 'selected="selected"';
83		- }
84		-
85		- $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . $name . '</option>';
86		- } elseif ( $output_type == 'link' ) {
87		- $favourite_links[] = '<a href="' . $post_type_link . '">' . $name . '</a>';
88		- }
89		- }
90		- }
91		-
92		- if ( ! empty( $favourite_links ) ) {
93		- if ( $output_type == 'select' ) {
94		- ?>
	53	+ // My Favourites in Dashboard
	54	+ $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' );
	55	+ $user_favourite = geodir_user_favourite_listing_count( $user_id );
	56	+
	57	+ if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
	58	+ $favourite_links = $output_type == 'link' ? array() : '';
	59	+ $post_types = geodir_get_posttypes( 'object' );
	60	+
	61	+ $author_link = get_author_posts_url( $user_id );
	62	+ $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
	63	+
	64	+ foreach ( $post_types as $key => $postobj ) {
	65	+ if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
	66	+ $name = __( $postobj->labels->name, 'geodirectory' );
	67	+ $post_type_link = geodir_getlink( $author_link, array( 'stype' => $key, 'list' => 'favourite' ), false );
	68	+
	69	+ /**
	70	+ * Filter favorite listing link.
	71	+ *
	72	+ * @since 1.0.0
	73	+ * @param string $post_type_link Favorite listing link.
	74	+ * @param string $key Favorite listing array key.
	75	+ * @param int $current_user->ID Current user ID.
	76	+ */
	77	+ $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id );
	78	+
	79	+ if ( $output_type == 'select' ) {
	80	+ $selected = '';
	81	+ if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
	82	+ $selected = 'selected="selected"';
	83	+ }
	84	+
	85	+ $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . $name . '</option>';
	86	+ } elseif ( $output_type == 'link' ) {
	87	+ $favourite_links[] = '<a href="' . $post_type_link . '">' . $name . '</a>';
	88	+ }
	89	+ }
	90	+ }
	91	+
	92	+ if ( ! empty( $favourite_links ) ) {
	93	+ if ( $output_type == 'select' ) {
	94	+ ?>
95	95	<li>
96	96	<select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Favorites', 'geodirectory' ); ?>">
97	97	<option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Favorites", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option>
		@@ -99,55 +99,55 @@ discard block
		block discarded – undo
99	99	</select>
100	100	</li>
101	101	<?php
102		- } elseif ( $output_type == 'link' ) {
103		- echo implode( " \| ", $favourite_links );
104		- }
105		- }
106		- }
	102	+ } elseif ( $output_type == 'link' ) {
	103	+ echo implode( " \| ", $favourite_links );
	104	+ }
	105	+ }
	106	+ }
107	107	}
108	108
109	109	function geodir_user_show_listings( $user_id = '', $output_type = 'select' ) {
110		- $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' );
111		- $user_listing = geodir_user_post_listing_count( $user_id );
112		-
113		- if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
114		- $listing_links = $output_type == 'link' ? array() : '';
115		-
116		- $post_types = geodir_get_posttypes( 'object' );
117		-
118		- $author_link = get_author_posts_url( $user_id );
119		- $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
120		-
121		- foreach ( $post_types as $key => $postobj ) {
122		- if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
123		- $name = __( $postobj->labels->name, 'geodirectory' );
124		- $listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false );
125		-
126		- /**
127		- * Filter my listing link.
128		- *
129		- * @since 1.0.0
130		- * @param string $listing_link My listing link.
131		- * @param string $key My listing array key.
132		- * @param int $current_user->ID Current user ID.
133		- */
134		- $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $user_id );
135		- if ( $output_type == 'select' ) {
136		- $selected = '';
137		- if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
138		- $selected = 'selected="selected"';
139		- }
140		-
141		- $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . $name . '</option>';
142		- } elseif ( $output_type == 'link' ) {
143		- $listing_links[] = '<a href="' . $listing_link . '">' . $name . '</a>';
144		- }
145		- }
146		- }
147		-
148		- if ( ! empty( $listing_links ) ) {
149		- if ( $output_type == 'select' ) {
150		- ?>
	110	+ $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' );
	111	+ $user_listing = geodir_user_post_listing_count( $user_id );
	112	+
	113	+ if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
	114	+ $listing_links = $output_type == 'link' ? array() : '';
	115	+
	116	+ $post_types = geodir_get_posttypes( 'object' );
	117	+
	118	+ $author_link = get_author_posts_url( $user_id );
	119	+ $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
	120	+
	121	+ foreach ( $post_types as $key => $postobj ) {
	122	+ if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
	123	+ $name = __( $postobj->labels->name, 'geodirectory' );
	124	+ $listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false );
	125	+
	126	+ /**
	127	+ * Filter my listing link.
	128	+ *
	129	+ * @since 1.0.0
	130	+ * @param string $listing_link My listing link.
	131	+ * @param string $key My listing array key.
	132	+ * @param int $current_user->ID Current user ID.
	133	+ */
	134	+ $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $user_id );
	135	+ if ( $output_type == 'select' ) {
	136	+ $selected = '';
	137	+ if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
	138	+ $selected = 'selected="selected"';
	139	+ }
	140	+
	141	+ $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . $name . '</option>';
	142	+ } elseif ( $output_type == 'link' ) {
	143	+ $listing_links[] = '<a href="' . $listing_link . '">' . $name . '</a>';
	144	+ }
	145	+ }
	146	+ }
	147	+
	148	+ if ( ! empty( $listing_links ) ) {
	149	+ if ( $output_type == 'select' ) {
	150	+ ?>
151	151	<li>
152	152	<select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Listings', 'geodirectory' ); ?>">
153	153	<option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Listings", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option>
		@@ -155,11 +155,11 @@ discard block
		block discarded – undo
155	155	</select>
156	156	</li>
157	157	<?php
158		- } elseif ( $output_type == 'link' ) {
159		- echo implode( " \| ", $listing_links );
160		- }
161		- }
162		- }
	158	+ } elseif ( $output_type == 'link' ) {
	159	+ echo implode( " \| ", $listing_links );
	160	+ }
	161	+ }
	162	+ }
163	163	}
164	164
165	165	/**
		@@ -170,12 +170,12 @@ discard block
		block discarded – undo
170	170	* @return mixed
171	171	*/
172	172	function geodir_get_user_favourites($user_id=''){
173		- if(!$user_id){$user_id = get_current_user_id();}
174		- $site_id = '';
175		- if ( is_multisite() ) {
176		- $blog_id = get_current_blog_id();
177		- if($blog_id && $blog_id!='1'){$site_id = '_' . $blog_id ;}
178		- }
179		-
180		- return get_user_meta($user_id, 'gd_user_favourite_post'.$site_id, true);
	173	+ if(!$user_id){$user_id = get_current_user_id();}
	174	+ $site_id = '';
	175	+ if ( is_multisite() ) {
	176	+ $blog_id = get_current_blog_id();
	177	+ if($blog_id && $blog_id!='1'){$site_id = '_' . $blog_id ;}
	178	+ }
	179	+
	180	+ return get_user_meta($user_id, 'gd_user_favourite_post'.$site_id, true);
181	181	}
182	182	\ No newline at end of file

		@@ -11,17 +11,17 @@ discard block
		block discarded – undo
11	11	* @global string $plugin_prefix Geodirectory plugin table prefix.
12	12	* @return array User listing count for each post type.
13	13	*/
14		-function geodir_user_favourite_listing_count($user_id=false)
	14	+function geodir_user_favourite_listing_count($user_id = false)
15	15	{
16	16	global $wpdb, $plugin_prefix, $current_user;
17	17
18		- if(!$user_id){$user_id = $current_user->ID;}
19		- if(!$user_id){return array();}
	18	+ if (!$user_id) {$user_id = $current_user->ID; }
	19	+ if (!$user_id) {return array(); }
20	20
21	21	$site_id = '';
22		- if ( is_multisite() ) {
	22	+ if (is_multisite()) {
23	23	$blog_id = get_current_blog_id();
24		- if($blog_id && $blog_id!='1'){$site_id = '_' . $blog_id ;}
	24	+ if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }
25	25	}
26	26
27	27	$user_favorites = geodir_get_user_favourites($user_id);
		@@ -29,10 +29,10 @@ discard block
		block discarded – undo
29	29
30	30	$user_listing = array();
31	31	if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
32		- $user_favorites = "'" . implode("','", $user_favorites) . "'";
	32	+ $user_favorites = "'".implode("','", $user_favorites)."'";
33	33
34	34	foreach ($all_posts as $ptype) {
35		- $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
	35	+ $total_posts = $wpdb->get_var("SELECT count( ID ) FROM ".$wpdb->prefix."posts WHERE post_type='".$ptype."' AND post_status = 'publish' AND ID IN (".$user_favorites.")");
36	36
37	37	if ($total_posts > 0) {
38	38	$user_listing[$ptype] = $total_posts;
		@@ -49,22 +49,22 @@ discard block
		block discarded – undo
49	49	* @since 1.5.9
50	50	* @package GeoDirectory
51	51	*/
52		-function geodir_user_show_favourites( $user_id = '', $output_type = 'select' ) {
	52	+function geodir_user_show_favourites($user_id = '', $output_type = 'select') {
53	53	// My Favourites in Dashboard
54		- $show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' );
55		- $user_favourite = geodir_user_favourite_listing_count( $user_id );
	54	+ $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
	55	+ $user_favourite = geodir_user_favourite_listing_count($user_id);
56	56
57		- if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {
	57	+ if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
58	58	$favourite_links = $output_type == 'link' ? array() : '';
59		- $post_types = geodir_get_posttypes( 'object' );
	59	+ $post_types = geodir_get_posttypes('object');
60	60
61		- $author_link = get_author_posts_url( $user_id );
62		- $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
	61	+ $author_link = get_author_posts_url($user_id);
	62	+ $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
63	63
64		- foreach ( $post_types as $key => $postobj ) {
65		- if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {
66		- $name = __( $postobj->labels->name, 'geodirectory' );
67		- $post_type_link = geodir_getlink( $author_link, array( 'stype' => $key, 'list' => 'favourite' ), false );
	64	+ foreach ($post_types as $key => $postobj) {
	65	+ if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
	66	+ $name = __($postobj->labels->name, 'geodirectory');
	67	+ $post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false);
68	68
69	69	/**
70	70	* Filter favorite listing link.
		@@ -74,54 +74,54 @@ discard block
		block discarded – undo
74	74	* @param string $key Favorite listing array key.
75	75	* @param int $current_user->ID Current user ID.
76	76	*/
77		- $post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id );
	77	+ $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id);
78	78
79		- if ( $output_type == 'select' ) {
	79	+ if ($output_type == 'select') {
80	80	$selected = '';
81		- if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {
	81	+ if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
82	82	$selected = 'selected="selected"';
83	83	}
84	84
85		- $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . $name . '</option>';
86		- } elseif ( $output_type == 'link' ) {
87		- $favourite_links[] = '<a href="' . $post_type_link . '">' . $name . '</a>';
	85	+ $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.$name.'</option>';
	86	+ } elseif ($output_type == 'link') {
	87	+ $favourite_links[] = '<a href="'.$post_type_link.'">'.$name.'</a>';
88	88	}
89	89	}
90	90	}
91	91
92		- if ( ! empty( $favourite_links ) ) {
93		- if ( $output_type == 'select' ) {
	92	+ if (!empty($favourite_links)) {
	93	+ if ($output_type == 'select') {
94	94	?>
95	95	<li>
96		- <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Favorites', 'geodirectory' ); ?>">
97		- <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Favorites", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option>
	96	+ <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__('My Favorites', 'geodirectory'); ?>">
	97	+ <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr(wp_sprintf(__("%s's Favorites", 'geodirectory'), geodir_get_client_name($user_id))); ?></option>
98	98	<?php echo $favourite_links; ?>
99	99	</select>
100	100	</li>
101	101	<?php
102		- } elseif ( $output_type == 'link' ) {
103		- echo implode( " \| ", $favourite_links );
	102	+ } elseif ($output_type == 'link') {
	103	+ echo implode(" \| ", $favourite_links);
104	104	}
105	105	}
106	106	}
107	107	}
108	108
109		-function geodir_user_show_listings( $user_id = '', $output_type = 'select' ) {
110		- $show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' );
111		- $user_listing = geodir_user_post_listing_count( $user_id );
	109	+function geodir_user_show_listings($user_id = '', $output_type = 'select') {
	110	+ $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
	111	+ $user_listing = geodir_user_post_listing_count($user_id);
112	112
113		- if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {
	113	+ if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
114	114	$listing_links = $output_type == 'link' ? array() : '';
115	115
116		- $post_types = geodir_get_posttypes( 'object' );
	116	+ $post_types = geodir_get_posttypes('object');
117	117
118		- $author_link = get_author_posts_url( $user_id );
119		- $author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );
	118	+ $author_link = get_author_posts_url($user_id);
	119	+ $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
120	120
121		- foreach ( $post_types as $key => $postobj ) {
122		- if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {
123		- $name = __( $postobj->labels->name, 'geodirectory' );
124		- $listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false );
	121	+ foreach ($post_types as $key => $postobj) {
	122	+ if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
	123	+ $name = __($postobj->labels->name, 'geodirectory');
	124	+ $listing_link = geodir_getlink($author_link, array('stype' => $key), false);
125	125
126	126	/**
127	127	* Filter my listing link.
		@@ -131,32 +131,32 @@ discard block
		block discarded – undo
131	131	* @param string $key My listing array key.
132	132	* @param int $current_user->ID Current user ID.
133	133	*/
134		- $listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $user_id );
135		- if ( $output_type == 'select' ) {
	134	+ $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id);
	135	+ if ($output_type == 'select') {
136	136	$selected = '';
137		- if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {
	137	+ if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
138	138	$selected = 'selected="selected"';
139	139	}
140	140
141		- $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . $name . '</option>';
142		- } elseif ( $output_type == 'link' ) {
143		- $listing_links[] = '<a href="' . $listing_link . '">' . $name . '</a>';
	141	+ $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.$name.'</option>';
	142	+ } elseif ($output_type == 'link') {
	143	+ $listing_links[] = '<a href="'.$listing_link.'">'.$name.'</a>';
144	144	}
145	145	}
146	146	}
147	147
148		- if ( ! empty( $listing_links ) ) {
149		- if ( $output_type == 'select' ) {
	148	+ if (!empty($listing_links)) {
	149	+ if ($output_type == 'select') {
150	150	?>
151	151	<li>
152		- <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__( 'My Listings', 'geodirectory' ); ?>">
153		- <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr( wp_sprintf( __( "%s's Listings", 'geodirectory' ), geodir_get_client_name( $user_id ) ) ); ?></option>
	152	+ <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value" option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false" data-placeholder="<?php echo esc_attr__('My Listings', 'geodirectory'); ?>">
	153	+ <option value="" disabled="disabled" selected="selected" style='display:none;'><?php echo esc_attr(wp_sprintf(__("%s's Listings", 'geodirectory'), geodir_get_client_name($user_id))); ?></option>
154	154	<?php echo $listing_links; ?>
155	155	</select>
156	156	</li>
157	157	<?php
158		- } elseif ( $output_type == 'link' ) {
159		- echo implode( " \| ", $listing_links );
	158	+ } elseif ($output_type == 'link') {
	159	+ echo implode(" \| ", $listing_links);
160	160	}
161	161	}
162	162	}
		@@ -169,12 +169,12 @@ discard block
		block discarded – undo
169	169	* @since 1.6.24
170	170	* @return mixed
171	171	*/
172		-function geodir_get_user_favourites($user_id=''){
173		- if(!$user_id){$user_id = get_current_user_id();}
	172	+function geodir_get_user_favourites($user_id = '') {
	173	+ if (!$user_id) {$user_id = get_current_user_id(); }
174	174	$site_id = '';
175		- if ( is_multisite() ) {
	175	+ if (is_multisite()) {
176	176	$blog_id = get_current_blog_id();
177		- if($blog_id && $blog_id!='1'){$site_id = '_' . $blog_id ;}
	177	+ if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }
178	178	}
179	179
180	180	return get_user_meta($user_id, 'gd_user_favourite_post'.$site_id, true);

GeoDirectory / geodirectory

Pull Request — master (#454)

Status

Category

Indentation +122 added lines, -122 removed lines patch added patch discarded remove patch

Spacing +57 added lines, -57 removed lines patch added patch discarded remove patch